From de33a39a9db727aee46e913afba6066d87377895 Mon Sep 17 00:00:00 2001
From: Noble Mittal <62551163+beingnoble03@users.noreply.github.com>
Date: Tue, 28 Jan 2025 02:43:47 +0530
Subject: [PATCH 01/68] test: Add unit tests for `vtctl/workflow` (#17618)

Signed-off-by: Noble Mittal <noblemittal@outlook.com>
---
 go/vt/vtctl/workflow/framework_test.go        |  31 +++--
 go/vt/vtctl/workflow/server_test.go           |  82 ++++++++++++
 go/vt/vtctl/workflow/traffic_switcher_test.go | 121 ++++++++++++++++++
 go/vt/vtctl/workflow/utils_test.go            |  76 +++++++++++
 4 files changed, 302 insertions(+), 8 deletions(-)

diff --git a/go/vt/vtctl/workflow/framework_test.go b/go/vt/vtctl/workflow/framework_test.go
index a2c1b2ef8e3..fad48e31e0c 100644
--- a/go/vt/vtctl/workflow/framework_test.go
+++ b/go/vt/vtctl/workflow/framework_test.go
@@ -272,7 +272,7 @@ type testTMClient struct {
 	createVReplicationWorkflowRequests map[uint32]*createVReplicationWorkflowRequestResponse
 	readVReplicationWorkflowRequests   map[uint32]*readVReplicationWorkflowRequestResponse
 	updateVReplicationWorklowsRequests map[uint32]*tabletmanagerdatapb.UpdateVReplicationWorkflowsRequest
-	applySchemaRequests                map[uint32]*applySchemaRequestResponse
+	applySchemaRequests                map[uint32][]*applySchemaRequestResponse
 	primaryPositions                   map[uint32]string
 	vdiffRequests                      map[uint32]*vdiffRequestResponse
 	refreshStateErrors                 map[uint32]error
@@ -296,7 +296,7 @@ func newTestTMClient(env *testEnv) *testTMClient {
 		createVReplicationWorkflowRequests: make(map[uint32]*createVReplicationWorkflowRequestResponse),
 		readVReplicationWorkflowRequests:   make(map[uint32]*readVReplicationWorkflowRequestResponse),
 		updateVReplicationWorklowsRequests: make(map[uint32]*tabletmanagerdatapb.UpdateVReplicationWorkflowsRequest),
-		applySchemaRequests:                make(map[uint32]*applySchemaRequestResponse),
+		applySchemaRequests:                make(map[uint32][]*applySchemaRequestResponse),
 		readVReplicationWorkflowsResponses: make(map[string][]*tabletmanagerdatapb.ReadVReplicationWorkflowsResponse),
 		primaryPositions:                   make(map[uint32]string),
 		vdiffRequests:                      make(map[uint32]*vdiffRequestResponse),
@@ -398,10 +398,9 @@ func (tmc *testTMClient) GetSchema(ctx context.Context, tablet *topodatapb.Table
 	schemaDefn := &tabletmanagerdatapb.SchemaDefinition{}
 	for _, table := range req.Tables {
 		if table == "/.*/" {
-			// Special case of all tables in keyspace.
-			for key, tableDefn := range tmc.schema {
+			for key, schemaDefinition := range tmc.schema {
 				if strings.HasPrefix(key, tablet.Keyspace+".") {
-					schemaDefn.TableDefinitions = append(schemaDefn.TableDefinitions, tableDefn.TableDefinitions...)
+					schemaDefn.TableDefinitions = append(schemaDefn.TableDefinitions, schemaDefinition.TableDefinitions...)
 				}
 			}
 			break
@@ -414,6 +413,12 @@ func (tmc *testTMClient) GetSchema(ctx context.Context, tablet *topodatapb.Table
 		}
 		schemaDefn.TableDefinitions = append(schemaDefn.TableDefinitions, tableDefn.TableDefinitions...)
 	}
+	for key, schemaDefinition := range tmc.schema {
+		if strings.HasPrefix(key, tablet.Keyspace) {
+			schemaDefn.DatabaseSchema = schemaDefinition.DatabaseSchema
+			break
+		}
+	}
 	return schemaDefn, nil
 }
 
@@ -508,10 +513,10 @@ func (tmc *testTMClient) expectApplySchemaRequest(tabletID uint32, req *applySch
 	defer tmc.mu.Unlock()
 
 	if tmc.applySchemaRequests == nil {
-		tmc.applySchemaRequests = make(map[uint32]*applySchemaRequestResponse)
+		tmc.applySchemaRequests = make(map[uint32][]*applySchemaRequestResponse)
 	}
 
-	tmc.applySchemaRequests[tabletID] = req
+	tmc.applySchemaRequests[tabletID] = append(tmc.applySchemaRequests[tabletID], req)
 }
 
 // Note: ONLY breaks up change.SQL into individual statements and executes it. Does NOT fully implement ApplySchema.
@@ -519,11 +524,17 @@ func (tmc *testTMClient) ApplySchema(ctx context.Context, tablet *topodatapb.Tab
 	tmc.mu.Lock()
 	defer tmc.mu.Unlock()
 
-	if expect, ok := tmc.applySchemaRequests[tablet.Alias.Uid]; ok {
+	if requests, ok := tmc.applySchemaRequests[tablet.Alias.Uid]; ok {
+		if len(requests) == 0 {
+			return nil, vterrors.Errorf(vtrpcpb.Code_INVALID_ARGUMENT, "unexpected ApplySchema request on tablet %s: got %+v",
+				topoproto.TabletAliasString(tablet.Alias), change)
+		}
+		expect := requests[0]
 		if !reflect.DeepEqual(change, expect.change) {
 			return nil, vterrors.Errorf(vtrpcpb.Code_INVALID_ARGUMENT, "unexpected ApplySchema request on tablet %s: got %+v, want %+v",
 				topoproto.TabletAliasString(tablet.Alias), change, expect.change)
 		}
+		tmc.applySchemaRequests[tablet.Alias.Uid] = tmc.applySchemaRequests[tablet.Alias.Uid][1:]
 		return expect.res, expect.err
 	}
 
@@ -779,6 +790,10 @@ func (tmc *testTMClient) getVReplicationWorkflowsResponse(key string) *tabletman
 	return resp
 }
 
+func (tmc *testTMClient) ReloadSchema(ctx context.Context, tablet *topodatapb.Tablet, waitPosition string) error {
+	return nil
+}
+
 //
 // Utility / helper functions.
 //
diff --git a/go/vt/vtctl/workflow/server_test.go b/go/vt/vtctl/workflow/server_test.go
index ae34dabfc19..4676b732245 100644
--- a/go/vt/vtctl/workflow/server_test.go
+++ b/go/vt/vtctl/workflow/server_test.go
@@ -34,10 +34,12 @@ import (
 	"vitess.io/vitess/go/sqltypes"
 	"vitess.io/vitess/go/test/utils"
 	"vitess.io/vitess/go/vt/logutil"
+	"vitess.io/vitess/go/vt/mysqlctl/tmutils"
 	"vitess.io/vitess/go/vt/topo"
 	"vitess.io/vitess/go/vt/topo/topoproto"
 	"vitess.io/vitess/go/vt/topotools"
 	"vitess.io/vitess/go/vt/vtenv"
+	"vitess.io/vitess/go/vt/vttablet/tabletmanager/vreplication"
 	"vitess.io/vitess/go/vt/vttablet/tmclient"
 
 	binlogdatapb "vitess.io/vitess/go/vt/proto/binlogdata"
@@ -2315,3 +2317,83 @@ func TestWorkflowStatus(t *testing.T) {
 	assert.Equal(t, float32(50), stateTable1.RowsPercentage)
 	assert.Equal(t, float32(50), stateTable2.RowsPercentage)
 }
+
+func TestDeleteShard(t *testing.T) {
+	ctx := context.Background()
+
+	sourceKeyspace := &testKeyspace{"source_keyspace", []string{"-"}}
+	targetKeyspace := &testKeyspace{"target_keyspace", []string{"-"}}
+
+	te := newTestEnv(t, ctx, defaultCellName, sourceKeyspace, targetKeyspace)
+	defer te.close()
+
+	// Verify that shard exists.
+	si, err := te.ts.GetShard(ctx, targetKeyspace.KeyspaceName, targetKeyspace.ShardNames[0])
+	require.NoError(t, err)
+	require.NotNil(t, si)
+
+	// Expect to fail if recursive is false.
+	err = te.ws.DeleteShard(ctx, targetKeyspace.KeyspaceName, targetKeyspace.ShardNames[0], false, true)
+	assert.ErrorContains(t, err, "shard target_keyspace/- still has 1 tablets in cell")
+
+	// Should not throw error if given keyspace or shard is invalid.
+	err = te.ws.DeleteShard(ctx, "invalid_keyspace", "-", false, true)
+	assert.NoError(t, err)
+
+	// Successful shard delete.
+	err = te.ws.DeleteShard(ctx, targetKeyspace.KeyspaceName, targetKeyspace.ShardNames[0], true, true)
+	assert.NoError(t, err)
+
+	// Check if the shard was deleted.
+	_, err = te.ts.GetShard(ctx, targetKeyspace.KeyspaceName, targetKeyspace.ShardNames[0])
+	assert.ErrorContains(t, err, "node doesn't exist")
+}
+
+func TestCopySchemaShard(t *testing.T) {
+	ctx := context.Background()
+
+	sourceKeyspace := &testKeyspace{"source_keyspace", []string{"-"}}
+	targetKeyspace := &testKeyspace{"target_keyspace", []string{"-"}}
+
+	te := newTestEnv(t, ctx, defaultCellName, sourceKeyspace, targetKeyspace)
+	defer te.close()
+
+	sqlSchema := `create table t1(id bigint(20) unsigned auto_increment, msg varchar(64), primary key (id)) Engine=InnoDB;`
+	te.tmc.schema[fmt.Sprintf("%s.t1", sourceKeyspace.KeyspaceName)] = &tabletmanagerdatapb.SchemaDefinition{
+		DatabaseSchema: "CREATE DATABASE {{.DatabaseName}}",
+		TableDefinitions: []*tabletmanagerdatapb.TableDefinition{
+			{
+				Name:   "t1",
+				Schema: sqlSchema,
+				Columns: []string{
+					"id",
+					"msg",
+				},
+				Type: tmutils.TableBaseTable,
+			},
+		},
+	}
+
+	// Expect queries on target shards
+	te.tmc.expectApplySchemaRequest(200, &applySchemaRequestResponse{
+		change: &tmutils.SchemaChange{
+			SQL:              "CREATE DATABASE `vt_target_keyspace`",
+			Force:            false,
+			AllowReplication: true,
+			SQLMode:          vreplication.SQLMode,
+		},
+	})
+	te.tmc.expectApplySchemaRequest(200, &applySchemaRequestResponse{
+		change: &tmutils.SchemaChange{
+			SQL:              sqlSchema,
+			Force:            false,
+			AllowReplication: true,
+			SQLMode:          vreplication.SQLMode,
+		},
+	})
+
+	sourceTablet := te.tablets[sourceKeyspace.KeyspaceName][100]
+	err := te.ws.CopySchemaShard(ctx, sourceTablet.Alias, []string{"/.*/"}, nil, false, targetKeyspace.KeyspaceName, "-", 1*time.Second, true)
+	assert.NoError(t, err)
+	assert.Empty(t, te.tmc.applySchemaRequests[200])
+}
diff --git a/go/vt/vtctl/workflow/traffic_switcher_test.go b/go/vt/vtctl/workflow/traffic_switcher_test.go
index 2cf998eb8e4..a7da91174b9 100644
--- a/go/vt/vtctl/workflow/traffic_switcher_test.go
+++ b/go/vt/vtctl/workflow/traffic_switcher_test.go
@@ -30,6 +30,7 @@ import (
 	"vitess.io/vitess/go/sqlescape"
 	"vitess.io/vitess/go/sqltypes"
 	"vitess.io/vitess/go/vt/mysqlctl/tmutils"
+	"vitess.io/vitess/go/vt/proto/binlogdata"
 	"vitess.io/vitess/go/vt/proto/vschema"
 	"vitess.io/vitess/go/vt/sqlparser"
 	"vitess.io/vitess/go/vt/topo"
@@ -912,3 +913,123 @@ func TestAddParticipatingTablesToKeyspace(t *testing.T) {
 	assert.Len(t, vs.Tables["t1"].ColumnVindexes, 2)
 	assert.Len(t, vs.Tables["t2"].ColumnVindexes, 1)
 }
+
+func TestCancelMigration_TABLES(t *testing.T) {
+	ctx, cancel := context.WithTimeout(context.Background(), 60*time.Second)
+	defer cancel()
+
+	workflowName := "wf1"
+	tableName := "t1"
+
+	sourceKeyspace := &testKeyspace{
+		KeyspaceName: "sourceks",
+		ShardNames:   []string{"0"},
+	}
+	targetKeyspace := &testKeyspace{
+		KeyspaceName: "targetks",
+		ShardNames:   []string{"0"},
+	}
+
+	schema := map[string]*tabletmanagerdatapb.SchemaDefinition{
+		tableName: {
+			TableDefinitions: []*tabletmanagerdatapb.TableDefinition{
+				{
+					Name:   tableName,
+					Schema: fmt.Sprintf("CREATE TABLE %s (id BIGINT, name VARCHAR(64), PRIMARY KEY (id))", tableName),
+				},
+			},
+		},
+	}
+
+	env := newTestEnv(t, ctx, defaultCellName, sourceKeyspace, targetKeyspace)
+	defer env.close()
+	env.tmc.schema = schema
+
+	ts, _, err := env.ws.getWorkflowState(ctx, targetKeyspace.KeyspaceName, workflowName)
+	require.NoError(t, err)
+
+	sm, err := BuildStreamMigrator(ctx, ts, false, sqlparser.NewTestParser())
+	require.NoError(t, err)
+
+	env.tmc.expectVRQuery(200, "update _vt.vreplication set state='Running', message='' where db_name='vt_targetks' and workflow='wf1'", &sqltypes.Result{})
+	env.tmc.expectVRQuery(100, "delete from _vt.vreplication where db_name = 'vt_sourceks' and workflow = 'wf1_reverse'", &sqltypes.Result{})
+
+	ctx, _, err = env.ts.LockKeyspace(ctx, targetKeyspace.KeyspaceName, "test")
+	require.NoError(t, err)
+
+	ctx, _, err = env.ts.LockKeyspace(ctx, sourceKeyspace.KeyspaceName, "test")
+	require.NoError(t, err)
+
+	err = topo.CheckKeyspaceLocked(ctx, ts.targetKeyspace)
+	require.NoError(t, err)
+
+	err = topo.CheckKeyspaceLocked(ctx, ts.sourceKeyspace)
+	require.NoError(t, err)
+
+	ts.cancelMigration(ctx, sm)
+
+	// Expect the queries to be cleared
+	assert.Empty(t, env.tmc.vrQueries[100])
+	assert.Empty(t, env.tmc.vrQueries[200])
+}
+
+func TestCancelMigration_SHARDS(t *testing.T) {
+	ctx, cancel := context.WithTimeout(context.Background(), 60*time.Second)
+	defer cancel()
+
+	workflowName := "wf1"
+	tableName := "t1"
+
+	sourceKeyspace := &testKeyspace{
+		KeyspaceName: "sourceks",
+		ShardNames:   []string{"0"},
+	}
+	targetKeyspace := &testKeyspace{
+		KeyspaceName: "targetks",
+		ShardNames:   []string{"0"},
+	}
+
+	schema := map[string]*tabletmanagerdatapb.SchemaDefinition{
+		tableName: {
+			TableDefinitions: []*tabletmanagerdatapb.TableDefinition{
+				{
+					Name:   tableName,
+					Schema: fmt.Sprintf("CREATE TABLE %s (id BIGINT, name VARCHAR(64), PRIMARY KEY (id))", tableName),
+				},
+			},
+		},
+	}
+
+	env := newTestEnv(t, ctx, defaultCellName, sourceKeyspace, targetKeyspace)
+	defer env.close()
+	env.tmc.schema = schema
+
+	ts, _, err := env.ws.getWorkflowState(ctx, targetKeyspace.KeyspaceName, workflowName)
+	require.NoError(t, err)
+	ts.migrationType = binlogdata.MigrationType_SHARDS
+
+	sm, err := BuildStreamMigrator(ctx, ts, false, sqlparser.NewTestParser())
+	require.NoError(t, err)
+
+	env.tmc.expectVRQuery(100, "update /*vt+ ALLOW_UNSAFE_VREPLICATION_WRITE */ _vt.vreplication set state='Running', stop_pos=null, message='' where db_name='vt_sourceks' and workflow != 'wf1_reverse'", &sqltypes.Result{})
+	env.tmc.expectVRQuery(200, "update _vt.vreplication set state='Running', message='' where db_name='vt_targetks' and workflow='wf1'", &sqltypes.Result{})
+	env.tmc.expectVRQuery(100, "delete from _vt.vreplication where db_name = 'vt_sourceks' and workflow = 'wf1_reverse'", &sqltypes.Result{})
+
+	ctx, _, err = env.ts.LockKeyspace(ctx, targetKeyspace.KeyspaceName, "test")
+	require.NoError(t, err)
+
+	ctx, _, err = env.ts.LockKeyspace(ctx, sourceKeyspace.KeyspaceName, "test")
+	require.NoError(t, err)
+
+	err = topo.CheckKeyspaceLocked(ctx, ts.targetKeyspace)
+	require.NoError(t, err)
+
+	err = topo.CheckKeyspaceLocked(ctx, ts.sourceKeyspace)
+	require.NoError(t, err)
+
+	ts.cancelMigration(ctx, sm)
+
+	// Expect the queries to be cleared
+	assert.Empty(t, env.tmc.vrQueries[100])
+	assert.Empty(t, env.tmc.vrQueries[200])
+}
diff --git a/go/vt/vtctl/workflow/utils_test.go b/go/vt/vtctl/workflow/utils_test.go
index eecbfd6269b..99850639ac5 100644
--- a/go/vt/vtctl/workflow/utils_test.go
+++ b/go/vt/vtctl/workflow/utils_test.go
@@ -15,6 +15,7 @@ import (
 	"github.com/stretchr/testify/require"
 	clientv3 "go.etcd.io/etcd/client/v3"
 
+	"vitess.io/vitess/go/sqltypes"
 	"vitess.io/vitess/go/testfiles"
 	"vitess.io/vitess/go/vt/log"
 	"vitess.io/vitess/go/vt/topo"
@@ -22,6 +23,7 @@ import (
 	"vitess.io/vitess/go/vt/topo/memorytopo"
 	"vitess.io/vitess/go/vt/topotools"
 
+	tabletmanagerdatapb "vitess.io/vitess/go/vt/proto/tabletmanagerdata"
 	"vitess.io/vitess/go/vt/proto/vtctldata"
 )
 
@@ -280,3 +282,77 @@ func TestValidateSourceTablesExist(t *testing.T) {
 		})
 	}
 }
+
+func TestLegacyBuildTargets(t *testing.T) {
+	ctx, cancel := context.WithTimeout(context.Background(), 60*time.Second)
+	defer cancel()
+
+	workflowName := "wf1"
+	tableName := "t1"
+
+	sourceKeyspace := &testKeyspace{
+		KeyspaceName: "sourceks",
+		ShardNames:   []string{"0"},
+	}
+	targetKeyspace := &testKeyspace{
+		KeyspaceName: "targetks",
+		ShardNames:   []string{"-80", "80-"},
+	}
+
+	schema := map[string]*tabletmanagerdatapb.SchemaDefinition{
+		tableName: {
+			TableDefinitions: []*tabletmanagerdatapb.TableDefinition{
+				{
+					Name:   tableName,
+					Schema: fmt.Sprintf("CREATE TABLE %s (id BIGINT, name VARCHAR(64), PRIMARY KEY (id))", tableName),
+				},
+			},
+		},
+	}
+
+	env := newTestEnv(t, ctx, defaultCellName, sourceKeyspace, targetKeyspace)
+	defer env.close()
+	env.tmc.schema = schema
+
+	result1 := sqltypes.MakeTestResult(sqltypes.MakeTestFields(
+		"id|source|message|cell|tablet_types|workflow_type|workflow_sub_type|defer_secondary_keys",
+		"int64|varchar|varchar|varchar|varchar|int64|int64|int64"),
+		"1|keyspace:\"source\" shard:\"-80\" filter:{rules:{match:\"t1\"} rules:{match:\"t2\"}}||||0|0|0",
+	)
+	result2 := sqltypes.MakeTestResult(sqltypes.MakeTestFields(
+		"id|source|message|cell|tablet_types|workflow_type|workflow_sub_type|defer_secondary_keys",
+		"int64|varchar|varchar|varchar|varchar|int64|int64|int64"),
+		"1|keyspace:\"source\" shard:\"80-\" filter:{rules:{match:\"t1\"} rules:{match:\"t2\"}}||||0|0|0",
+		"2|keyspace:\"source\" shard:\"80-\" filter:{rules:{match:\"t3\"} rules:{match:\"t4\"}}||||0|0|0",
+	)
+	env.tmc.expectVRQuery(200, "select id, source, message, cell, tablet_types, workflow_type, workflow_sub_type, defer_secondary_keys from _vt.vreplication where workflow='wf1' and db_name='vt_targetks'", result1)
+	env.tmc.expectVRQuery(210, "select id, source, message, cell, tablet_types, workflow_type, workflow_sub_type, defer_secondary_keys from _vt.vreplication where workflow='wf1' and db_name='vt_targetks'", result2)
+
+	ti, err := LegacyBuildTargets(ctx, env.ts, env.tmc, targetKeyspace.KeyspaceName, workflowName, targetKeyspace.ShardNames)
+	require.NoError(t, err)
+	// Expect 2 targets as there are 2 target shards.
+	assert.Len(t, ti.Targets, 2)
+
+	assert.NotNil(t, ti.Targets["-80"])
+	assert.NotNil(t, ti.Targets["80-"])
+
+	t1 := ti.Targets["-80"]
+	t2 := ti.Targets["80-"]
+	assert.Len(t, t1.Sources, 1)
+	assert.Len(t, t2.Sources, 2)
+	assert.Len(t, t1.Sources[1].Filter.Rules, 2)
+
+	assert.Equal(t, t1.Sources[1].Filter.Rules[0].Match, "t1")
+	assert.Equal(t, t1.Sources[1].Filter.Rules[1].Match, "t2")
+	assert.Equal(t, t1.Sources[1].Shard, "-80")
+
+	assert.Len(t, t2.Sources[1].Filter.Rules, 2)
+	assert.Len(t, t2.Sources[2].Filter.Rules, 2)
+
+	assert.Equal(t, t2.Sources[1].Shard, "80-")
+	assert.Equal(t, t2.Sources[2].Shard, "80-")
+	assert.Equal(t, t2.Sources[1].Filter.Rules[0].Match, "t1")
+	assert.Equal(t, t2.Sources[1].Filter.Rules[1].Match, "t2")
+	assert.Equal(t, t2.Sources[2].Filter.Rules[0].Match, "t3")
+	assert.Equal(t, t2.Sources[2].Filter.Rules[1].Match, "t4")
+}

From 489fd05eda9e90f8583a2e81e8fa5c7417759fe8 Mon Sep 17 00:00:00 2001
From: jwang <121262788+jwangace@users.noreply.github.com>
Date: Mon, 27 Jan 2025 15:36:39 -0800
Subject: [PATCH 02/68] --consolidator-query-waiter-cap to set the max number
 of waiter for consolidated query (#17244)

Signed-off-by: Jun Wang <jun.wang@demonware.net>
Co-authored-by: Jun Wang <jun.wang@demonware.net>
---
 changelog/22.0/22.0.0/summary.md              |  2 ++
 go/flags/endtoend/vtcombo.txt                 |  1 +
 go/flags/endtoend/vttablet.txt                |  1 +
 go/sync2/consolidator.go                      | 10 +++++-
 go/sync2/consolidator_test.go                 | 31 +++++++++++++++++++
 go/sync2/fake_consolidator.go                 |  5 +++
 go/vt/vttablet/tabletserver/query_executor.go | 12 ++++---
 .../vttablet/tabletserver/tabletenv/config.go |  2 ++
 8 files changed, 59 insertions(+), 5 deletions(-)

diff --git a/changelog/22.0/22.0.0/summary.md b/changelog/22.0/22.0.0/summary.md
index b2c5c029851..7375077dced 100644
--- a/changelog/22.0/22.0.0/summary.md
+++ b/changelog/22.0/22.0.0/summary.md
@@ -147,6 +147,8 @@ The `querylog-mode` setting can be configured to `error` to log only queries tha
 While the flag will continue to accept float values (interpreted as seconds) for backward compatibility, 
 **float inputs are deprecated** and will be removed in a future release.
 
+- `--consolidator-query-waiter-cap` flag to set the maximum number of clients allowed to wait on the consolidator. The default value is set to 0 for unlimited wait. Users can adjust  this value based on the performance of VTTablet to avoid excessive memory usage and the risk of being OOMKilled, particularly in Kubernetes deployments.
+
 ### <a id="topo-read-concurrency-changes"/>`--topo_read_concurrency` behaviour changes
 
 The `--topo_read_concurrency` flag was added to all components that access the topology and the provided limit is now applied separately for each global or local cell _(default `32`)_.
diff --git a/go/flags/endtoend/vtcombo.txt b/go/flags/endtoend/vtcombo.txt
index 561f6048ce6..3ae0cbc9b77 100644
--- a/go/flags/endtoend/vtcombo.txt
+++ b/go/flags/endtoend/vtcombo.txt
@@ -44,6 +44,7 @@ Flags:
       --config-path strings                                              Paths to search for config files in. (default [{{ .Workdir }}])
       --config-persistence-min-interval duration                         minimum interval between persisting dynamic config changes back to disk (if no change has occurred, nothing is done). (default 1s)
       --config-type string                                               Config file type (omit to infer config type from file extension).
+      --consolidator-query-waiter-cap int                                Configure the maximum number of clients allowed to wait on the consolidator.
       --consolidator-stream-query-size int                               Configure the stream consolidator query size in bytes. Setting to 0 disables the stream consolidator. (default 2097152)
       --consolidator-stream-total-size int                               Configure the stream consolidator total size in bytes. Setting to 0 disables the stream consolidator. (default 134217728)
       --consul_auth_static_file string                                   JSON File to read the topos/tokens from.
diff --git a/go/flags/endtoend/vttablet.txt b/go/flags/endtoend/vttablet.txt
index 398d10afd7c..0a9a0ef99ce 100644
--- a/go/flags/endtoend/vttablet.txt
+++ b/go/flags/endtoend/vttablet.txt
@@ -78,6 +78,7 @@ Flags:
       --config-path strings                                              Paths to search for config files in. (default [{{ .Workdir }}])
       --config-persistence-min-interval duration                         minimum interval between persisting dynamic config changes back to disk (if no change has occurred, nothing is done). (default 1s)
       --config-type string                                               Config file type (omit to infer config type from file extension).
+      --consolidator-query-waiter-cap int                                Configure the maximum number of clients allowed to wait on the consolidator.
       --consolidator-stream-query-size int                               Configure the stream consolidator query size in bytes. Setting to 0 disables the stream consolidator. (default 2097152)
       --consolidator-stream-total-size int                               Configure the stream consolidator total size in bytes. Setting to 0 disables the stream consolidator. (default 134217728)
       --consul_auth_static_file string                                   JSON File to read the topos/tokens from.
diff --git a/go/sync2/consolidator.go b/go/sync2/consolidator.go
index 401daaef1f1..df900625abb 100644
--- a/go/sync2/consolidator.go
+++ b/go/sync2/consolidator.go
@@ -40,6 +40,7 @@ type PendingResult interface {
 	SetResult(*sqltypes.Result)
 	Result() *sqltypes.Result
 	Wait()
+	AddWaiterCounter(int64) *int64
 }
 
 type consolidator struct {
@@ -77,6 +78,7 @@ func (co *consolidator) Create(query string) (PendingResult, bool) {
 	defer co.mu.Unlock()
 	var r *pendingResult
 	if r, ok := co.queries[query]; ok {
+		r.AddWaiterCounter(1)
 		return r, false
 	}
 	r = &pendingResult{consolidator: co, query: query}
@@ -122,17 +124,23 @@ func (rs *pendingResult) Wait() {
 	rs.executing.RLock()
 }
 
+func (rs *pendingResult) AddWaiterCounter(c int64) *int64 {
+	atomic.AddInt64(rs.consolidator.totalWaiterCount, c)
+	return rs.consolidator.totalWaiterCount
+}
+
 // ConsolidatorCache is a thread-safe object used for counting how often recent
 // queries have been consolidated.
 // It is also used by the txserializer package to count how often transactions
 // have been queued and had to wait because they targeted the same row (range).
 type ConsolidatorCache struct {
 	*cache.LRUCache[*ccount]
+	totalWaiterCount *int64
 }
 
 // NewConsolidatorCache creates a new cache with the given capacity.
 func NewConsolidatorCache(capacity int64) *ConsolidatorCache {
-	return &ConsolidatorCache{cache.NewLRUCache[*ccount](capacity)}
+	return &ConsolidatorCache{cache.NewLRUCache[*ccount](capacity), new(int64)}
 }
 
 // Record increments the count for "query" by 1.
diff --git a/go/sync2/consolidator_test.go b/go/sync2/consolidator_test.go
index 132a253ba29..5437bb335a6 100644
--- a/go/sync2/consolidator_test.go
+++ b/go/sync2/consolidator_test.go
@@ -18,11 +18,42 @@ package sync2
 
 import (
 	"reflect"
+	"sync"
 	"testing"
 
 	"vitess.io/vitess/go/sqltypes"
 )
 
+func TestAddWaiterCount(t *testing.T) {
+	con := NewConsolidator()
+	sql := "select * from SomeTable"
+	pr, _ := con.Create(sql)
+	var wgAdd sync.WaitGroup
+	var wgSub sync.WaitGroup
+
+	var concurrent = 1000
+
+	for i := 0; i < concurrent; i++ {
+		wgAdd.Add(1)
+		wgSub.Add(1)
+		go func() {
+			defer wgAdd.Done()
+			pr.AddWaiterCounter(1)
+		}()
+		go func() {
+			defer wgSub.Done()
+			pr.AddWaiterCounter(-1)
+		}()
+	}
+
+	wgAdd.Wait()
+	wgSub.Wait()
+
+	if *pr.AddWaiterCounter(0) != 0 {
+		t.Fatalf("Expect 0 totalWaiterCount but got: %v", *pr.AddWaiterCounter(0))
+	}
+}
+
 func TestConsolidator(t *testing.T) {
 	con := NewConsolidator()
 	sql := "select * from SomeTable"
diff --git a/go/sync2/fake_consolidator.go b/go/sync2/fake_consolidator.go
index 64c59e78a5a..aadee1d37ce 100644
--- a/go/sync2/fake_consolidator.go
+++ b/go/sync2/fake_consolidator.go
@@ -112,3 +112,8 @@ func (fr *FakePendingResult) SetResult(result *sqltypes.Result) {
 func (fr *FakePendingResult) Wait() {
 	fr.WaitCalls++
 }
+
+// AddWaiterCounter is currently a no-op.
+func (fr *FakePendingResult) AddWaiterCounter(int64) *int64 {
+	return new(int64)
+}
diff --git a/go/vt/vttablet/tabletserver/query_executor.go b/go/vt/vttablet/tabletserver/query_executor.go
index e4a165960fd..755394723f3 100644
--- a/go/vt/vttablet/tabletserver/query_executor.go
+++ b/go/vt/vttablet/tabletserver/query_executor.go
@@ -718,10 +718,14 @@ func (qre *QueryExecutor) execSelect() (*sqltypes.Result, error) {
 				q.SetErr(err)
 			}
 		} else {
-			qre.logStats.QuerySources |= tabletenv.QuerySourceConsolidator
-			startTime := time.Now()
-			q.Wait()
-			qre.tsv.stats.WaitTimings.Record("Consolidations", startTime)
+			waiterCap := qre.tsv.config.ConsolidatorQueryWaiterCap
+			if waiterCap == 0 || *q.AddWaiterCounter(0) <= waiterCap {
+				qre.logStats.QuerySources |= tabletenv.QuerySourceConsolidator
+				startTime := time.Now()
+				q.Wait()
+				qre.tsv.stats.WaitTimings.Record("Consolidations", startTime)
+			}
+			q.AddWaiterCounter(-1)
 		}
 		if q.Err() != nil {
 			return nil, q.Err()
diff --git a/go/vt/vttablet/tabletserver/tabletenv/config.go b/go/vt/vttablet/tabletserver/tabletenv/config.go
index 08bf0b1d7c8..ddab935d393 100644
--- a/go/vt/vttablet/tabletserver/tabletenv/config.go
+++ b/go/vt/vttablet/tabletserver/tabletenv/config.go
@@ -198,6 +198,7 @@ func registerTabletEnvFlags(fs *pflag.FlagSet) {
 	fs.Int64Var(&currentConfig.ConsolidatorStreamQuerySize, "consolidator-stream-query-size", defaultConfig.ConsolidatorStreamQuerySize, "Configure the stream consolidator query size in bytes. Setting to 0 disables the stream consolidator.")
 	fs.Int64Var(&currentConfig.ConsolidatorStreamTotalSize, "consolidator-stream-total-size", defaultConfig.ConsolidatorStreamTotalSize, "Configure the stream consolidator total size in bytes. Setting to 0 disables the stream consolidator.")
 
+	fs.Int64Var(&currentConfig.ConsolidatorQueryWaiterCap, "consolidator-query-waiter-cap", 0, "Configure the maximum number of clients allowed to wait on the consolidator.")
 	fs.DurationVar(&healthCheckInterval, "health_check_interval", defaultConfig.Healthcheck.Interval, "Interval between health checks")
 	fs.DurationVar(&degradedThreshold, "degraded_threshold", defaultConfig.Healthcheck.DegradedThreshold, "replication lag after which a replica is considered degraded")
 	fs.DurationVar(&unhealthyThreshold, "unhealthy_threshold", defaultConfig.Healthcheck.UnhealthyThreshold, "replication lag after which a replica is considered unhealthy")
@@ -324,6 +325,7 @@ type TabletConfig struct {
 	StreamBufferSize            int           `json:"streamBufferSize,omitempty"`
 	ConsolidatorStreamTotalSize int64         `json:"consolidatorStreamTotalSize,omitempty"`
 	ConsolidatorStreamQuerySize int64         `json:"consolidatorStreamQuerySize,omitempty"`
+	ConsolidatorQueryWaiterCap  int64         `json:"consolidatorMaxQueryWait,omitempty"`
 	QueryCacheMemory            int64         `json:"queryCacheMemory,omitempty"`
 	QueryCacheDoorkeeper        bool          `json:"queryCacheDoorkeeper,omitempty"`
 	SchemaReloadInterval        time.Duration `json:"schemaReloadIntervalSeconds,omitempty"`

From 8921bce64b732c48ca6bb52037fa9b2796e36d1d Mon Sep 17 00:00:00 2001
From: Manan Gupta <35839558+GuptaManan100@users.noreply.github.com>
Date: Tue, 28 Jan 2025 11:59:34 +0530
Subject: [PATCH 03/68] Support KeyRange in `--clusters_to_watch` flag (#17604)

Signed-off-by: Manan Gupta <manan@planetscale.com>
---
 changelog/22.0/22.0.0/summary.md              |   6 +
 go/flags/endtoend/vtorc.txt                   |   2 +-
 go/vt/key/key.go                              |   8 +
 go/vt/topo/shard_test.go                      |   8 +
 go/vt/vtorc/logic/keyspace_shard_discovery.go |  26 +--
 .../logic/keyspace_shard_discovery_test.go    |   5 +-
 go/vt/vtorc/logic/tablet_discovery.go         |  90 ++++----
 go/vt/vtorc/logic/tablet_discovery_test.go    | 200 +++++++++++++++---
 go/vt/vtorc/logic/vtorc.go                    |   6 -
 9 files changed, 258 insertions(+), 93 deletions(-)

diff --git a/changelog/22.0/22.0.0/summary.md b/changelog/22.0/22.0.0/summary.md
index 7375077dced..f773df2b10c 100644
--- a/changelog/22.0/22.0.0/summary.md
+++ b/changelog/22.0/22.0.0/summary.md
@@ -15,6 +15,7 @@
   - **[Stalled Disk Recovery in VTOrc](#stall-disk-recovery)**
   - **[Update default MySQL version to 8.0.40](#mysql-8-0-40)**
   - **[Update lite images to Debian Bookworm](#debian-bookworm)**
+  - **[KeyRanges in `--clusters_to_watch` in VTOrc](#key-range-vtorc)**
   - **[Support for Filtering Query logs on Error](#query-logs)**
 - **[Minor Changes](#minor-changes)**
   - **[VTTablet Flags](#flags-vttablet)**
@@ -135,6 +136,11 @@ This is the last time this will be needed in the `8.0.x` series, as starting wit
 
 The base system now uses Debian Bookworm instead of Debian Bullseye for the `vitess/lite` images. This change was brought by [Pull Request #17552].
 
+### <a id="key-range-vtorc"/>KeyRanges in `--clusters_to_watch` in VTOrc</a>
+VTOrc now supports specifying keyranges in the `--clusters_to_watch` flag. This means that there is no need to restart a VTOrc instance with a different flag value when you reshard a keyspace.
+For example, if a VTOrc is configured to watch `ks/-80`, then it would watch all the shards that fall under the keyrange `-80`. If a reshard is performed and `-80` is split into new shards `-40` and `40-80`, the VTOrc instance will automatically start watching the new shards without needing a restart. In the previous logic, specifying `ks/-80` for the flag would mean that VTOrc would watch only 1 (or no) shard. In the new system, since we interpret `-80` as a key range, it can watch multiple shards as described in the example.
+Users can continue to specify exact keyranges. The new feature is backward compatible.
+
 ### <a id="query-logs"/>Support for Filtering Query logs on Error</a>
 
 The `querylog-mode` setting can be configured to `error` to log only queries that result in errors. This option is supported in both VTGate and VTTablet.
diff --git a/go/flags/endtoend/vtorc.txt b/go/flags/endtoend/vtorc.txt
index ca8083709e5..57eb907cf4d 100644
--- a/go/flags/endtoend/vtorc.txt
+++ b/go/flags/endtoend/vtorc.txt
@@ -24,7 +24,7 @@ Flags:
       --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.
       --catch-sigpipe                                               catch and ignore SIGPIPE on stdout and stderr if specified
       --change-tablets-with-errant-gtid-to-drained                  Whether VTOrc should be changing the type of tablets with errant GTIDs to DRAINED
-      --clusters_to_watch strings                                   Comma-separated list of keyspaces or keyspace/shards that this instance will monitor and repair. Defaults to all clusters in the topology. Example: "ks1,ks2/-80"
+      --clusters_to_watch strings                                   Comma-separated list of keyspaces or keyspace/keyranges that this instance will monitor and repair. Defaults to all clusters in the topology. Example: "ks1,ks2/-80"
       --config-file string                                          Full path of the config file (with extension) to use. If set, --config-path, --config-type, and --config-name are ignored.
       --config-file-not-found-handling ConfigFileNotFoundHandling   Behavior when a config file is not found. (Options: error, exit, ignore, warn) (default warn)
       --config-name string                                          Name of the config file (without extension) to search for. (default "vtconfig")
diff --git a/go/vt/key/key.go b/go/vt/key/key.go
index 89d956bd433..82852daa16e 100644
--- a/go/vt/key/key.go
+++ b/go/vt/key/key.go
@@ -95,6 +95,14 @@ func NewKeyRange(start []byte, end []byte) *topodatapb.KeyRange {
 	return &topodatapb.KeyRange{Start: start, End: end}
 }
 
+// NewCompleteKeyRange returns a complete key range.
+func NewCompleteKeyRange() *topodatapb.KeyRange {
+	return &topodatapb.KeyRange{
+		Start: nil,
+		End:   nil,
+	}
+}
+
 // 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/topo/shard_test.go b/go/vt/topo/shard_test.go
index 6bd4aae5b62..915bcd18e3c 100644
--- a/go/vt/topo/shard_test.go
+++ b/go/vt/topo/shard_test.go
@@ -323,6 +323,14 @@ func TestValidateShardName(t *testing.T) {
 			},
 			valid: true,
 		},
+		{
+			name: "-",
+			expectedRange: &topodatapb.KeyRange{
+				Start: []byte{},
+				End:   []byte{},
+			},
+			valid: true,
+		},
 		{
 			name: "40-80",
 			expectedRange: &topodatapb.KeyRange{
diff --git a/go/vt/vtorc/logic/keyspace_shard_discovery.go b/go/vt/vtorc/logic/keyspace_shard_discovery.go
index 0dd17cb65fd..8115e614418 100644
--- a/go/vt/vtorc/logic/keyspace_shard_discovery.go
+++ b/go/vt/vtorc/logic/keyspace_shard_discovery.go
@@ -18,10 +18,10 @@ package logic
 
 import (
 	"context"
-	"sort"
-	"strings"
 	"sync"
 
+	"golang.org/x/exp/maps"
+
 	"vitess.io/vitess/go/vt/log"
 
 	"vitess.io/vitess/go/vt/topo"
@@ -31,7 +31,7 @@ import (
 // RefreshAllKeyspacesAndShards reloads the keyspace and shard information for the keyspaces that vtorc is concerned with.
 func RefreshAllKeyspacesAndShards(ctx context.Context) error {
 	var keyspaces []string
-	if len(clustersToWatch) == 0 { // all known keyspaces
+	if len(shardsToWatch) == 0 { // all known keyspaces
 		ctx, cancel := context.WithTimeout(ctx, topo.RemoteOperationTimeout)
 		defer cancel()
 		var err error
@@ -41,26 +41,10 @@ func RefreshAllKeyspacesAndShards(ctx context.Context) error {
 			return err
 		}
 	} else {
-		// Parse input and build list of keyspaces
-		for _, ks := range clustersToWatch {
-			if strings.Contains(ks, "/") {
-				// This is a keyspace/shard specification
-				input := strings.Split(ks, "/")
-				keyspaces = append(keyspaces, input[0])
-			} else {
-				// Assume this is a keyspace
-				keyspaces = append(keyspaces, ks)
-			}
-		}
-		if len(keyspaces) == 0 {
-			log.Errorf("Found no keyspaces for input: %+v", clustersToWatch)
-			return nil
-		}
+		// Get keyspaces to watch from the list of known keyspaces.
+		keyspaces = maps.Keys(shardsToWatch)
 	}
 
-	// Sort the list of keyspaces.
-	// The list can have duplicates because the input to clusters to watch may have multiple shards of the same keyspace
-	sort.Strings(keyspaces)
 	refreshCtx, refreshCancel := context.WithTimeout(ctx, topo.RemoteOperationTimeout)
 	defer refreshCancel()
 	var wg sync.WaitGroup
diff --git a/go/vt/vtorc/logic/keyspace_shard_discovery_test.go b/go/vt/vtorc/logic/keyspace_shard_discovery_test.go
index 8218af45db6..f05295416d0 100644
--- a/go/vt/vtorc/logic/keyspace_shard_discovery_test.go
+++ b/go/vt/vtorc/logic/keyspace_shard_discovery_test.go
@@ -93,6 +93,8 @@ func TestRefreshAllKeyspaces(t *testing.T) {
 	// Set clusters to watch to only watch ks1 and ks3
 	onlyKs1and3 := []string{"ks1/-80", "ks3/-80", "ks3/80-"}
 	clustersToWatch = onlyKs1and3
+	err := initializeShardsToWatch()
+	require.NoError(t, err)
 	require.NoError(t, RefreshAllKeyspacesAndShards(context.Background()))
 
 	// Verify that we only have ks1 and ks3 in vtorc's db.
@@ -106,6 +108,8 @@ func TestRefreshAllKeyspaces(t *testing.T) {
 
 	// Set clusters to watch to watch all keyspaces
 	clustersToWatch = nil
+	err = initializeShardsToWatch()
+	require.NoError(t, err)
 	// Change the durability policy of ks1
 	reparenttestutil.SetKeyspaceDurability(ctx, t, ts, "ks1", policy.DurabilitySemiSync)
 	require.NoError(t, RefreshAllKeyspacesAndShards(context.Background()))
@@ -119,7 +123,6 @@ func TestRefreshAllKeyspaces(t *testing.T) {
 	verifyPrimaryAlias(t, "ks3", "80-", "zone_ks3-0000000101", "")
 	verifyKeyspaceInfo(t, "ks4", keyspaceDurabilityTest, "")
 	verifyPrimaryAlias(t, "ks4", "80-", "zone_ks4-0000000101", "")
-
 }
 
 func TestRefreshKeyspace(t *testing.T) {
diff --git a/go/vt/vtorc/logic/tablet_discovery.go b/go/vt/vtorc/logic/tablet_discovery.go
index eb10bb2a667..c5c23df0cd0 100644
--- a/go/vt/vtorc/logic/tablet_discovery.go
+++ b/go/vt/vtorc/logic/tablet_discovery.go
@@ -32,6 +32,7 @@ import (
 	"google.golang.org/protobuf/proto"
 
 	"vitess.io/vitess/go/vt/external/golib/sqlutils"
+	"vitess.io/vitess/go/vt/key"
 	"vitess.io/vitess/go/vt/log"
 	topodatapb "vitess.io/vitess/go/vt/proto/topodata"
 	"vitess.io/vitess/go/vt/topo"
@@ -48,8 +49,10 @@ var (
 	clustersToWatch   []string
 	shutdownWaitTime  = 30 * time.Second
 	shardsLockCounter int32
-	shardsToWatch     map[string][]string
-	shardsToWatchMu   sync.Mutex
+	// shardsToWatch is a map storing the shards for a given keyspace that need to be watched.
+	// We store the key range for all the shards that we want to watch.
+	// This is populated by parsing `--clusters_to_watch` flag.
+	shardsToWatch map[string][]*topodatapb.KeyRange
 
 	// ErrNoPrimaryTablet is a fixed error message.
 	ErrNoPrimaryTablet = errors.New("no primary tablet found")
@@ -57,18 +60,18 @@ var (
 
 // RegisterFlags registers the flags required by VTOrc
 func RegisterFlags(fs *pflag.FlagSet) {
-	fs.StringSliceVar(&clustersToWatch, "clusters_to_watch", clustersToWatch, "Comma-separated list of keyspaces or keyspace/shards that this instance will monitor and repair. Defaults to all clusters in the topology. Example: \"ks1,ks2/-80\"")
+	fs.StringSliceVar(&clustersToWatch, "clusters_to_watch", clustersToWatch, "Comma-separated list of keyspaces or keyspace/keyranges that this instance will monitor and repair. Defaults to all clusters in the topology. Example: \"ks1,ks2/-80\"")
 	fs.DurationVar(&shutdownWaitTime, "shutdown_wait_time", shutdownWaitTime, "Maximum time to wait for VTOrc to release all the locks that it is holding before shutting down on SIGTERM")
 }
 
-// updateShardsToWatch parses the --clusters_to_watch flag-value
+// initializeShardsToWatch parses the --clusters_to_watch flag-value
 // into a map of keyspace/shards.
-func updateShardsToWatch() {
+func initializeShardsToWatch() error {
+	shardsToWatch = make(map[string][]*topodatapb.KeyRange)
 	if len(clustersToWatch) == 0 {
-		return
+		return nil
 	}
 
-	newShardsToWatch := make(map[string][]string, 0)
 	for _, ks := range clustersToWatch {
 		if strings.Contains(ks, "/") && !strings.HasSuffix(ks, "/") {
 			// Validate keyspace/shard parses.
@@ -77,34 +80,50 @@ func updateShardsToWatch() {
 				log.Errorf("Could not parse keyspace/shard %q: %+v", ks, err)
 				continue
 			}
-			newShardsToWatch[k] = append(newShardsToWatch[k], s)
+			if !key.IsValidKeyRange(s) {
+				return fmt.Errorf("invalid key range %q while parsing clusters to watch", s)
+			}
+			// Parse the shard name into key range value.
+			keyRanges, err := key.ParseShardingSpec(s)
+			if err != nil {
+				return fmt.Errorf("could not parse shard name %q: %+v", s, err)
+			}
+			shardsToWatch[k] = append(shardsToWatch[k], keyRanges...)
 		} else {
-			ctx, cancel := context.WithTimeout(context.Background(), topo.RemoteOperationTimeout)
-			defer cancel()
-			// Assume this is a keyspace and find all shards in keyspace.
 			// Remove trailing slash if exists.
 			ks = strings.TrimSuffix(ks, "/")
-			shards, err := ts.GetShardNames(ctx, ks)
-			if err != nil {
-				// Log the err and continue.
-				log.Errorf("Error fetching shards for keyspace: %v", ks)
-				continue
-			}
-			if len(shards) == 0 {
-				log.Errorf("Topo has no shards for ks: %v", ks)
-				continue
-			}
-			newShardsToWatch[ks] = shards
+			// We store the entire range of key range if nothing is specified.
+			shardsToWatch[ks] = []*topodatapb.KeyRange{key.NewCompleteKeyRange()}
 		}
 	}
-	if len(newShardsToWatch) == 0 {
-		log.Error("No keyspace/shards to watch")
-		return
+
+	if len(shardsToWatch) == 0 {
+		log.Error("No keyspace/shards to watch, watching all keyspaces")
 	}
+	return nil
+}
 
-	shardsToWatchMu.Lock()
-	defer shardsToWatchMu.Unlock()
-	shardsToWatch = newShardsToWatch
+// shouldWatchTablet checks if the given tablet is part of the watch list.
+func shouldWatchTablet(tablet *topodatapb.Tablet) bool {
+	// If we are watching all keyspaces, then we want to watch this tablet too.
+	if len(shardsToWatch) == 0 {
+		return true
+	}
+	shardRanges, ok := shardsToWatch[tablet.GetKeyspace()]
+	// If we don't have the keyspace in our map, then this tablet
+	// doesn't need to be watched.
+	if !ok {
+		return false
+	}
+	// Get the tablet's key range, and check if
+	// it is part of the shard ranges we are watching.
+	kr := tablet.GetKeyRange()
+	for _, shardRange := range shardRanges {
+		if key.KeyRangeContainsKeyRange(shardRange, kr) {
+			return true
+		}
+	}
+	return false
 }
 
 // OpenTabletDiscovery opens the vitess topo if enables and returns a ticker
@@ -117,7 +136,10 @@ func OpenTabletDiscovery() <-chan time.Time {
 		log.Error(err)
 	}
 	// Parse --clusters_to_watch into a filter.
-	updateShardsToWatch()
+	err := initializeShardsToWatch()
+	if err != nil {
+		log.Fatalf("Error parsing --clusters-to-watch: %v", err)
+	}
 	// We refresh all information from the topo once before we start the ticks to do
 	// it on a timer.
 	ctx, cancel := context.WithTimeout(context.Background(), topo.RemoteOperationTimeout)
@@ -179,16 +201,10 @@ func refreshTabletsUsing(ctx context.Context, loader func(tabletAlias string), f
 	// Filter tablets that should not be watched using shardsToWatch map.
 	matchedTablets := make([]*topo.TabletInfo, 0, len(tablets))
 	func() {
-		shardsToWatchMu.Lock()
-		defer shardsToWatchMu.Unlock()
 		for _, t := range tablets {
-			if len(shardsToWatch) > 0 {
-				_, ok := shardsToWatch[t.Tablet.Keyspace]
-				if !ok || !slices.Contains(shardsToWatch[t.Tablet.Keyspace], t.Tablet.Shard) {
-					continue // filter
-				}
+			if shouldWatchTablet(t.Tablet) {
+				matchedTablets = append(matchedTablets, t)
 			}
-			matchedTablets = append(matchedTablets, t)
 		}
 	}()
 
diff --git a/go/vt/vtorc/logic/tablet_discovery_test.go b/go/vt/vtorc/logic/tablet_discovery_test.go
index 54284e8a017..4514ef81724 100644
--- a/go/vt/vtorc/logic/tablet_discovery_test.go
+++ b/go/vt/vtorc/logic/tablet_discovery_test.go
@@ -30,6 +30,7 @@ import (
 	"google.golang.org/protobuf/proto"
 
 	"vitess.io/vitess/go/vt/external/golib/sqlutils"
+	"vitess.io/vitess/go/vt/key"
 	topodatapb "vitess.io/vitess/go/vt/proto/topodata"
 	"vitess.io/vitess/go/vt/proto/vttime"
 	"vitess.io/vitess/go/vt/topo"
@@ -102,60 +103,200 @@ var (
 	}
 )
 
-func TestUpdateShardsToWatch(t *testing.T) {
+func TestShouldWatchTablet(t *testing.T) {
 	oldClustersToWatch := clustersToWatch
-	oldTs := ts
 	defer func() {
 		clustersToWatch = oldClustersToWatch
 		shardsToWatch = nil
-		ts = oldTs
 	}()
 
-	// Create a memory topo-server and create the keyspace and shard records
-	ctx, cancel := context.WithCancel(context.Background())
-	defer cancel()
+	testCases := []struct {
+		in                  []string
+		tablet              *topodatapb.Tablet
+		expectedShouldWatch bool
+	}{
+		{
+			in: []string{},
+			tablet: &topodatapb.Tablet{
+				Keyspace: keyspace,
+				Shard:    shard,
+			},
+			expectedShouldWatch: true,
+		},
+		{
+			in: []string{keyspace},
+			tablet: &topodatapb.Tablet{
+				Keyspace: keyspace,
+				Shard:    shard,
+			},
+			expectedShouldWatch: true,
+		},
+		{
+			in: []string{keyspace + "/-"},
+			tablet: &topodatapb.Tablet{
+				Keyspace: keyspace,
+				Shard:    shard,
+			},
+			expectedShouldWatch: true,
+		},
+		{
+			in: []string{keyspace + "/" + shard},
+			tablet: &topodatapb.Tablet{
+				Keyspace: keyspace,
+				Shard:    shard,
+			},
+			expectedShouldWatch: true,
+		},
+		{
+			in: []string{"ks/-70", "ks/70-"},
+			tablet: &topodatapb.Tablet{
+				Keyspace: "ks",
+				KeyRange: key.NewKeyRange([]byte{0x50}, []byte{0x70}),
+			},
+			expectedShouldWatch: true,
+		},
+		{
+			in: []string{"ks/-70", "ks/70-"},
+			tablet: &topodatapb.Tablet{
+				Keyspace: "ks",
+				KeyRange: key.NewKeyRange([]byte{0x40}, []byte{0x50}),
+			},
+			expectedShouldWatch: true,
+		},
+		{
+			in: []string{"ks/-70", "ks/70-"},
+			tablet: &topodatapb.Tablet{
+				Keyspace: "ks",
+				KeyRange: key.NewKeyRange([]byte{0x70}, []byte{0x90}),
+			},
+			expectedShouldWatch: true,
+		},
+		{
+			in: []string{"ks/-70", "ks/70-"},
+			tablet: &topodatapb.Tablet{
+				Keyspace: "ks",
+				KeyRange: key.NewKeyRange([]byte{0x60}, []byte{0x90}),
+			},
+			expectedShouldWatch: false,
+		},
+		{
+			in: []string{"ks/50-70"},
+			tablet: &topodatapb.Tablet{
+				Keyspace: "ks",
+				KeyRange: key.NewKeyRange([]byte{0x50}, []byte{0x70}),
+			},
+			expectedShouldWatch: true,
+		},
+		{
+			in: []string{"ks2/-70", "ks2/70-", "unknownKs/-", "ks/-80"},
+			tablet: &topodatapb.Tablet{
+				Keyspace: "ks",
+				KeyRange: key.NewKeyRange([]byte{0x60}, []byte{0x80}),
+			},
+			expectedShouldWatch: true,
+		},
+		{
+			in: []string{"ks2/-70", "ks2/70-", "unknownKs/-", "ks/-80"},
+			tablet: &topodatapb.Tablet{
+				Keyspace: "ks",
+				KeyRange: key.NewKeyRange([]byte{0x80}, []byte{0x90}),
+			},
+			expectedShouldWatch: false,
+		},
+		{
+			in: []string{"ks2/-70", "ks2/70-", "unknownKs/-", "ks/-80"},
+			tablet: &topodatapb.Tablet{
+				Keyspace: "ks",
+				KeyRange: key.NewKeyRange([]byte{0x90}, []byte{0xa0}),
+			},
+			expectedShouldWatch: false,
+		},
+	}
 
-	ts = memorytopo.NewServer(ctx, cell1)
-	_, err := ts.GetOrCreateShard(context.Background(), keyspace, shard)
-	require.NoError(t, err)
+	for _, tt := range testCases {
+		t.Run(fmt.Sprintf("%v-Tablet-%v-%v", strings.Join(tt.in, ","), tt.tablet.GetKeyspace(), tt.tablet.GetShard()), func(t *testing.T) {
+			clustersToWatch = tt.in
+			err := initializeShardsToWatch()
+			require.NoError(t, err)
+			assert.Equal(t, tt.expectedShouldWatch, shouldWatchTablet(tt.tablet))
+		})
+	}
+}
+
+// TestInitializeShardsToWatch tests that we initialize the shardsToWatch map correctly
+// using the `--clusters_to_watch` flag.
+func TestInitializeShardsToWatch(t *testing.T) {
+	oldClustersToWatch := clustersToWatch
+	defer func() {
+		clustersToWatch = oldClustersToWatch
+		shardsToWatch = nil
+	}()
 
 	testCases := []struct {
-		in       []string
-		expected map[string][]string
+		in          []string
+		expected    map[string][]*topodatapb.KeyRange
+		expectedErr string
 	}{
 		{
 			in:       []string{},
-			expected: nil,
+			expected: map[string][]*topodatapb.KeyRange{},
 		},
 		{
-			in:       []string{""},
-			expected: map[string][]string{},
+			in: []string{"unknownKs"},
+			expected: map[string][]*topodatapb.KeyRange{
+				"unknownKs": {
+					key.NewCompleteKeyRange(),
+				},
+			},
 		},
 		{
 			in: []string{"test/-"},
-			expected: map[string][]string{
-				"test": {"-"},
+			expected: map[string][]*topodatapb.KeyRange{
+				"test": {
+					key.NewCompleteKeyRange(),
+				},
+			},
+		},
+		{
+			in:          []string{"test/324"},
+			expectedErr: `invalid key range "324" while parsing clusters to watch`,
+		},
+		{
+			in: []string{"test/0"},
+			expected: map[string][]*topodatapb.KeyRange{
+				"test": {
+					key.NewCompleteKeyRange(),
+				},
 			},
 		},
 		{
 			in: []string{"test/-", "test2/-80", "test2/80-"},
-			expected: map[string][]string{
-				"test":  {"-"},
-				"test2": {"-80", "80-"},
+			expected: map[string][]*topodatapb.KeyRange{
+				"test": {
+					key.NewCompleteKeyRange(),
+				},
+				"test2": {
+					key.NewKeyRange(nil, []byte{0x80}),
+					key.NewKeyRange([]byte{0x80}, nil),
+				},
 			},
 		},
 		{
-			// confirm shards fetch from topo
+			// known keyspace
 			in: []string{keyspace},
-			expected: map[string][]string{
-				keyspace: {shard},
+			expected: map[string][]*topodatapb.KeyRange{
+				keyspace: {
+					key.NewCompleteKeyRange(),
+				},
 			},
 		},
 		{
-			// confirm shards fetch from topo when keyspace has trailing-slash
+			// keyspace with trailing-slash
 			in: []string{keyspace + "/"},
-			expected: map[string][]string{
-				keyspace: {shard},
+			expected: map[string][]*topodatapb.KeyRange{
+				keyspace: {
+					key.NewCompleteKeyRange(),
+				},
 			},
 		},
 	}
@@ -163,10 +304,15 @@ func TestUpdateShardsToWatch(t *testing.T) {
 	for _, testCase := range testCases {
 		t.Run(strings.Join(testCase.in, ","), func(t *testing.T) {
 			defer func() {
-				shardsToWatch = make(map[string][]string, 0)
+				shardsToWatch = make(map[string][]*topodatapb.KeyRange, 0)
 			}()
 			clustersToWatch = testCase.in
-			updateShardsToWatch()
+			err := initializeShardsToWatch()
+			if testCase.expectedErr != "" {
+				require.EqualError(t, err, testCase.expectedErr)
+				return
+			}
+			require.NoError(t, err)
 			require.Equal(t, testCase.expected, shardsToWatch)
 		})
 	}
diff --git a/go/vt/vtorc/logic/vtorc.go b/go/vt/vtorc/logic/vtorc.go
index 1fde6e31c0d..5ac5af50d47 100644
--- a/go/vt/vtorc/logic/vtorc.go
+++ b/go/vt/vtorc/logic/vtorc.go
@@ -326,12 +326,6 @@ func refreshAllInformation(ctx context.Context) error {
 		return RefreshAllKeyspacesAndShards(ctx)
 	})
 
-	// Refresh shards to watch.
-	eg.Go(func() error {
-		updateShardsToWatch()
-		return nil
-	})
-
 	// Refresh all tablets.
 	eg.Go(func() error {
 		return refreshAllTablets(ctx)

From c2f4dcf80a86e092ca7ce43bd3eb5d5eb66cc999 Mon Sep 17 00:00:00 2001
From: Manan Gupta <35839558+GuptaManan100@users.noreply.github.com>
Date: Tue, 28 Jan 2025 11:59:45 +0530
Subject: [PATCH 04/68] Refactor Disk Stall implementation and mark tablet not
 serving if disk is stalled (#17624)

Signed-off-by: Manan Gupta <manan@planetscale.com>
---
 .../replicationdata/replicationdata.pb.go     | 30 ++++++---
 .../replicationdata_vtproto.pb.go             | 36 +++++++++++
 go/vt/vtorc/inst/instance_dao.go              |  7 ++-
 .../vttablet/tabletmanager/rpc_replication.go | 12 ++--
 go/vt/vttablet/tabletmanager/tm_init.go       | 12 +---
 go/vt/vttablet/tabletserver/controller.go     |  3 +
 .../disk_health_monitor.go                    | 39 +++++++++++-
 .../disk_health_monitor_test.go               | 18 +++++-
 go/vt/vttablet/tabletserver/state_manager.go  |  3 +-
 .../tabletserver/state_manager_test.go        | 62 +++++++++++++------
 go/vt/vttablet/tabletserver/tabletserver.go   | 40 +++++++-----
 go/vt/vttablet/tabletservermock/controller.go |  6 ++
 proto/replicationdata.proto                   |  1 +
 web/vtadmin/src/proto/vtadmin.d.ts            |  6 ++
 web/vtadmin/src/proto/vtadmin.js              | 23 +++++++
 15 files changed, 232 insertions(+), 66 deletions(-)
 rename go/vt/vttablet/{tabletmanager => tabletserver}/disk_health_monitor.go (67%)
 rename go/vt/vttablet/{tabletmanager => tabletserver}/disk_health_monitor_test.go (85%)

diff --git a/go/vt/proto/replicationdata/replicationdata.pb.go b/go/vt/proto/replicationdata/replicationdata.pb.go
index d5462e1ea2b..bb973577d55 100644
--- a/go/vt/proto/replicationdata/replicationdata.pb.go
+++ b/go/vt/proto/replicationdata/replicationdata.pb.go
@@ -509,6 +509,7 @@ type FullStatus struct {
 	SemiSyncWaitForReplicaCount uint32         `protobuf:"varint,20,opt,name=semi_sync_wait_for_replica_count,json=semiSyncWaitForReplicaCount,proto3" json:"semi_sync_wait_for_replica_count,omitempty"`
 	SuperReadOnly               bool           `protobuf:"varint,21,opt,name=super_read_only,json=superReadOnly,proto3" json:"super_read_only,omitempty"`
 	ReplicationConfiguration    *Configuration `protobuf:"bytes,22,opt,name=replication_configuration,json=replicationConfiguration,proto3" json:"replication_configuration,omitempty"`
+	DiskStalled                 bool           `protobuf:"varint,23,opt,name=disk_stalled,json=diskStalled,proto3" json:"disk_stalled,omitempty"`
 }
 
 func (x *FullStatus) Reset() {
@@ -695,6 +696,13 @@ func (x *FullStatus) GetReplicationConfiguration() *Configuration {
 	return nil
 }
 
+func (x *FullStatus) GetDiskStalled() bool {
+	if x != nil {
+		return x.DiskStalled
+	}
+	return false
+}
+
 var File_replicationdata_proto protoreflect.FileDescriptor
 
 var file_replicationdata_proto_rawDesc = []byte{
@@ -782,7 +790,7 @@ var file_replicationdata_proto_rawDesc = []byte{
 	0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x66, 0x69, 0x6c, 0x65, 0x50, 0x6f, 0x73, 0x69, 0x74,
 	0x69, 0x6f, 0x6e, 0x12, 0x1f, 0x0a, 0x0b, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72, 0x5f, 0x75, 0x75,
 	0x69, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72,
-	0x55, 0x75, 0x69, 0x64, 0x22, 0xc8, 0x08, 0x0a, 0x0a, 0x46, 0x75, 0x6c, 0x6c, 0x53, 0x74, 0x61,
+	0x55, 0x75, 0x69, 0x64, 0x22, 0xeb, 0x08, 0x0a, 0x0a, 0x46, 0x75, 0x6c, 0x6c, 0x53, 0x74, 0x61,
 	0x74, 0x75, 0x73, 0x12, 0x1b, 0x0a, 0x09, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72, 0x5f, 0x69, 0x64,
 	0x18, 0x01, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x08, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72, 0x49, 0x64,
 	0x12, 0x1f, 0x0a, 0x0b, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72, 0x5f, 0x75, 0x75, 0x69, 0x64, 0x18,
@@ -850,15 +858,17 @@ var file_replicationdata_proto_rawDesc = []byte{
 	0x16, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1e, 0x2e, 0x72, 0x65, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74,
 	0x69, 0x6f, 0x6e, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x75, 0x72,
 	0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x18, 0x72, 0x65, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74, 0x69,
-	0x6f, 0x6e, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2a,
-	0x3b, 0x0a, 0x13, 0x53, 0x74, 0x6f, 0x70, 0x52, 0x65, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74, 0x69,
-	0x6f, 0x6e, 0x4d, 0x6f, 0x64, 0x65, 0x12, 0x12, 0x0a, 0x0e, 0x49, 0x4f, 0x41, 0x4e, 0x44, 0x53,
-	0x51, 0x4c, 0x54, 0x48, 0x52, 0x45, 0x41, 0x44, 0x10, 0x00, 0x12, 0x10, 0x0a, 0x0c, 0x49, 0x4f,
-	0x54, 0x48, 0x52, 0x45, 0x41, 0x44, 0x4f, 0x4e, 0x4c, 0x59, 0x10, 0x01, 0x42, 0x2e, 0x5a, 0x2c,
-	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, 0x72, 0x65, 0x70,
-	0x6c, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x64, 0x61, 0x74, 0x61, 0x62, 0x06, 0x70, 0x72,
-	0x6f, 0x74, 0x6f, 0x33,
+	0x6f, 0x6e, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12,
+	0x21, 0x0a, 0x0c, 0x64, 0x69, 0x73, 0x6b, 0x5f, 0x73, 0x74, 0x61, 0x6c, 0x6c, 0x65, 0x64, 0x18,
+	0x17, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0b, 0x64, 0x69, 0x73, 0x6b, 0x53, 0x74, 0x61, 0x6c, 0x6c,
+	0x65, 0x64, 0x2a, 0x3b, 0x0a, 0x13, 0x53, 0x74, 0x6f, 0x70, 0x52, 0x65, 0x70, 0x6c, 0x69, 0x63,
+	0x61, 0x74, 0x69, 0x6f, 0x6e, 0x4d, 0x6f, 0x64, 0x65, 0x12, 0x12, 0x0a, 0x0e, 0x49, 0x4f, 0x41,
+	0x4e, 0x44, 0x53, 0x51, 0x4c, 0x54, 0x48, 0x52, 0x45, 0x41, 0x44, 0x10, 0x00, 0x12, 0x10, 0x0a,
+	0x0c, 0x49, 0x4f, 0x54, 0x48, 0x52, 0x45, 0x41, 0x44, 0x4f, 0x4e, 0x4c, 0x59, 0x10, 0x01, 0x42,
+	0x2e, 0x5a, 0x2c, 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,
+	0x72, 0x65, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x64, 0x61, 0x74, 0x61, 0x62,
+	0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
diff --git a/go/vt/proto/replicationdata/replicationdata_vtproto.pb.go b/go/vt/proto/replicationdata/replicationdata_vtproto.pb.go
index b3d638a1327..a515397c065 100644
--- a/go/vt/proto/replicationdata/replicationdata_vtproto.pb.go
+++ b/go/vt/proto/replicationdata/replicationdata_vtproto.pb.go
@@ -142,6 +142,7 @@ func (m *FullStatus) CloneVT() *FullStatus {
 	r.SemiSyncWaitForReplicaCount = m.SemiSyncWaitForReplicaCount
 	r.SuperReadOnly = m.SuperReadOnly
 	r.ReplicationConfiguration = m.ReplicationConfiguration.CloneVT()
+	r.DiskStalled = m.DiskStalled
 	if len(m.unknownFields) > 0 {
 		r.unknownFields = make([]byte, len(m.unknownFields))
 		copy(r.unknownFields, m.unknownFields)
@@ -552,6 +553,18 @@ func (m *FullStatus) MarshalToSizedBufferVT(dAtA []byte) (int, error) {
 		i -= len(m.unknownFields)
 		copy(dAtA[i:], m.unknownFields)
 	}
+	if m.DiskStalled {
+		i--
+		if m.DiskStalled {
+			dAtA[i] = 1
+		} else {
+			dAtA[i] = 0
+		}
+		i--
+		dAtA[i] = 0x1
+		i--
+		dAtA[i] = 0xb8
+	}
 	if m.ReplicationConfiguration != nil {
 		size, err := m.ReplicationConfiguration.MarshalToSizedBufferVT(dAtA[:i])
 		if err != nil {
@@ -975,6 +988,9 @@ func (m *FullStatus) SizeVT() (n int) {
 		l = m.ReplicationConfiguration.SizeVT()
 		n += 2 + l + protohelpers.SizeOfVarint(uint64(l))
 	}
+	if m.DiskStalled {
+		n += 3
+	}
 	n += len(m.unknownFields)
 	return n
 }
@@ -2551,6 +2567,26 @@ func (m *FullStatus) UnmarshalVT(dAtA []byte) error {
 				return err
 			}
 			iNdEx = postIndex
+		case 23:
+			if wireType != 0 {
+				return fmt.Errorf("proto: wrong wireType = %d for field DiskStalled", 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.DiskStalled = bool(v != 0)
 		default:
 			iNdEx = preIndex
 			skippy, err := protohelpers.Skip(dAtA[iNdEx:])
diff --git a/go/vt/vtorc/inst/instance_dao.go b/go/vt/vtorc/inst/instance_dao.go
index f92a15079dd..9e35e6e3e0b 100644
--- a/go/vt/vtorc/inst/instance_dao.go
+++ b/go/vt/vtorc/inst/instance_dao.go
@@ -206,9 +206,10 @@ func ReadTopologyInstanceBufferable(tabletAlias string, latency *stopwatch.Named
 
 	fs, err = fullStatus(tabletAlias)
 	if err != nil {
-		if config.GetStalledDiskPrimaryRecovery() && strings.Contains(err.Error(), "stalled disk") {
-			stalledDisk = true
-		}
+		goto Cleanup
+	}
+	if config.GetStalledDiskPrimaryRecovery() && fs.DiskStalled {
+		stalledDisk = true
 		goto Cleanup
 	}
 	partialSuccess = true // We at least managed to read something from the server.
diff --git a/go/vt/vttablet/tabletmanager/rpc_replication.go b/go/vt/vttablet/tabletmanager/rpc_replication.go
index b27b25d87c6..dec94ee6f16 100644
--- a/go/vt/vttablet/tabletmanager/rpc_replication.go
+++ b/go/vt/vttablet/tabletmanager/rpc_replication.go
@@ -18,7 +18,6 @@ package tabletmanager
 
 import (
 	"context"
-	"errors"
 	"fmt"
 	"runtime"
 	"strings"
@@ -62,10 +61,13 @@ func (tm *TabletManager) FullStatus(ctx context.Context) (*replicationdatapb.Ful
 		return nil, err
 	}
 
-	// Return error if the disk is stalled or rejecting writes.
-	// Noop by default, must be enabled with the flag "disk-write-dir".
-	if tm.dhMonitor.IsDiskStalled() {
-		return nil, errors.New("stalled disk")
+	// Return if the disk is stalled or rejecting writes.
+	// If the disk is stalled, we can't be sure if reads will go through
+	// or not, so we should not run any reads either.
+	if tm.QueryServiceControl.IsDiskStalled() {
+		return &replicationdatapb.FullStatus{
+			DiskStalled: true,
+		}, nil
 	}
 
 	// Server ID - "select @@global.server_id"
diff --git a/go/vt/vttablet/tabletmanager/tm_init.go b/go/vt/vttablet/tabletmanager/tm_init.go
index c22ea0a6e51..fbef04de357 100644
--- a/go/vt/vttablet/tabletmanager/tm_init.go
+++ b/go/vt/vttablet/tabletmanager/tm_init.go
@@ -95,11 +95,8 @@ var (
 	skipBuildInfoTags  = "/.*/"
 	initTags           flagutil.StringMapValue
 
-	initTimeout              = 1 * time.Minute
-	mysqlShutdownTimeout     = mysqlctl.DefaultShutdownTimeout
-	stalledDiskWriteDir      = ""
-	stalledDiskWriteTimeout  = 30 * time.Second
-	stalledDiskWriteInterval = 5 * time.Second
+	initTimeout          = 1 * time.Minute
+	mysqlShutdownTimeout = mysqlctl.DefaultShutdownTimeout
 )
 
 func registerInitFlags(fs *pflag.FlagSet) {
@@ -112,9 +109,6 @@ func registerInitFlags(fs *pflag.FlagSet) {
 	fs.Var(&initTags, "init_tags", "(init parameter) comma separated list of key:value pairs used to tag the tablet")
 	fs.DurationVar(&initTimeout, "init_timeout", initTimeout, "(init parameter) timeout to use for the init phase.")
 	fs.DurationVar(&mysqlShutdownTimeout, "mysql-shutdown-timeout", mysqlShutdownTimeout, "timeout to use when MySQL is being shut down.")
-	fs.StringVar(&stalledDiskWriteDir, "disk-write-dir", stalledDiskWriteDir, "if provided, tablet will attempt to write a file to this directory to check if the disk is stalled")
-	fs.DurationVar(&stalledDiskWriteTimeout, "disk-write-timeout", stalledDiskWriteTimeout, "if writes exceed this duration, the disk is considered stalled")
-	fs.DurationVar(&stalledDiskWriteInterval, "disk-write-interval", stalledDiskWriteInterval, "how often to write to the disk to check whether it is stalled")
 }
 
 var (
@@ -170,7 +164,6 @@ type TabletManager struct {
 	VREngine            *vreplication.Engine
 	VDiffEngine         *vdiff.Engine
 	Env                 *vtenv.Environment
-	dhMonitor           DiskHealthMonitor
 
 	// tmc is used to run an RPC against other vttablets.
 	tmc tmclient.TabletManagerClient
@@ -379,7 +372,6 @@ func (tm *TabletManager) Start(tablet *topodatapb.Tablet, config *tabletenv.Tabl
 	tm.tmc = tmclient.NewTabletManagerClient()
 	tm.tmState = newTMState(tm, tablet)
 	tm.actionSema = semaphore.NewWeighted(1)
-	tm.dhMonitor = newDiskHealthMonitor(tm.BatchCtx)
 	tm._waitForGrantsComplete = make(chan struct{})
 
 	tm.baseTabletType = tablet.Type
diff --git a/go/vt/vttablet/tabletserver/controller.go b/go/vt/vttablet/tabletserver/controller.go
index c4a4bef99fc..ab2875ae27b 100644
--- a/go/vt/vttablet/tabletserver/controller.go
+++ b/go/vt/vttablet/tabletserver/controller.go
@@ -122,6 +122,9 @@ type Controller interface {
 
 	// SetDemotePrimaryStalled marks that demote primary is stalled in the state manager.
 	SetDemotePrimaryStalled()
+
+	// IsDiskStalled returns if the disk is stalled.
+	IsDiskStalled() bool
 }
 
 // Ensure TabletServer satisfies Controller interface.
diff --git a/go/vt/vttablet/tabletmanager/disk_health_monitor.go b/go/vt/vttablet/tabletserver/disk_health_monitor.go
similarity index 67%
rename from go/vt/vttablet/tabletmanager/disk_health_monitor.go
rename to go/vt/vttablet/tabletserver/disk_health_monitor.go
index e35bc662a12..f477f7fd30c 100644
--- a/go/vt/vttablet/tabletmanager/disk_health_monitor.go
+++ b/go/vt/vttablet/tabletserver/disk_health_monitor.go
@@ -1,4 +1,20 @@
-package tabletmanager
+/*
+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 tabletserver
 
 import (
 	"context"
@@ -7,8 +23,29 @@ import (
 	"strconv"
 	"sync"
 	"time"
+
+	"github.com/spf13/pflag"
+
+	"vitess.io/vitess/go/vt/servenv"
 )
 
+var (
+	stalledDiskWriteDir      = ""
+	stalledDiskWriteTimeout  = 30 * time.Second
+	stalledDiskWriteInterval = 5 * time.Second
+)
+
+func init() {
+	servenv.OnParseFor("vtcombo", registerInitFlags)
+	servenv.OnParseFor("vttablet", registerInitFlags)
+}
+
+func registerInitFlags(fs *pflag.FlagSet) {
+	fs.StringVar(&stalledDiskWriteDir, "disk-write-dir", stalledDiskWriteDir, "if provided, tablet will attempt to write a file to this directory to check if the disk is stalled")
+	fs.DurationVar(&stalledDiskWriteTimeout, "disk-write-timeout", stalledDiskWriteTimeout, "if writes exceed this duration, the disk is considered stalled")
+	fs.DurationVar(&stalledDiskWriteInterval, "disk-write-interval", stalledDiskWriteInterval, "how often to write to the disk to check whether it is stalled")
+}
+
 type DiskHealthMonitor interface {
 	// IsDiskStalled returns true if the disk is stalled or rejecting writes.
 	IsDiskStalled() bool
diff --git a/go/vt/vttablet/tabletmanager/disk_health_monitor_test.go b/go/vt/vttablet/tabletserver/disk_health_monitor_test.go
similarity index 85%
rename from go/vt/vttablet/tabletmanager/disk_health_monitor_test.go
rename to go/vt/vttablet/tabletserver/disk_health_monitor_test.go
index 68930f3061d..8b47e40ee79 100644
--- a/go/vt/vttablet/tabletmanager/disk_health_monitor_test.go
+++ b/go/vt/vttablet/tabletserver/disk_health_monitor_test.go
@@ -1,4 +1,20 @@
-package tabletmanager
+/*
+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 tabletserver
 
 import (
 	"context"
diff --git a/go/vt/vttablet/tabletserver/state_manager.go b/go/vt/vttablet/tabletserver/state_manager.go
index 4512b26f177..0ccd0e42735 100644
--- a/go/vt/vttablet/tabletserver/state_manager.go
+++ b/go/vt/vttablet/tabletserver/state_manager.go
@@ -97,6 +97,7 @@ type stateManager struct {
 	replHealthy          bool
 	demotePrimaryStalled bool
 	lameduck             bool
+	diskHealthMonitor    DiskHealthMonitor
 	alsoAllow            []topodatapb.TabletType
 	reason               string
 	transitionErr        error
@@ -777,7 +778,7 @@ func (sm *stateManager) IsServing() bool {
 }
 
 func (sm *stateManager) isServingLocked() bool {
-	return sm.state == StateServing && sm.wantState == StateServing && sm.replHealthy && !sm.demotePrimaryStalled && !sm.lameduck
+	return sm.state == StateServing && sm.wantState == StateServing && sm.replHealthy && !sm.demotePrimaryStalled && !sm.lameduck && !sm.diskHealthMonitor.IsDiskStalled()
 }
 
 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 f8059d6edea..99a3e7e681d 100644
--- a/go/vt/vttablet/tabletserver/state_manager_test.go
+++ b/go/vt/vttablet/tabletserver/state_manager_test.go
@@ -41,7 +41,9 @@ import (
 var testNow = time.Now()
 
 func TestStateManagerStateByName(t *testing.T) {
-	sm := &stateManager{}
+	sm := &stateManager{
+		diskHealthMonitor: newNoopDiskHealthMonitor(),
+	}
 
 	sm.replHealthy = true
 	sm.wantState = StateServing
@@ -147,6 +149,29 @@ func TestStateManagerUnservePrimary(t *testing.T) {
 	assert.Equal(t, StateNotServing, sm.state)
 }
 
+type testDiskMonitor struct {
+	isDiskStalled bool
+}
+
+func (t *testDiskMonitor) IsDiskStalled() bool {
+	return t.isDiskStalled
+}
+
+// TestIsServingLocked tests isServingLocked() functionality.
+func TestIsServingLocked(t *testing.T) {
+	sm := newTestStateManager()
+	defer sm.StopService()
+	tdm := &testDiskMonitor{isDiskStalled: false}
+	sm.diskHealthMonitor = tdm
+
+	err := sm.SetServingType(topodatapb.TabletType_REPLICA, testNow, StateServing, "")
+	require.NoError(t, err)
+	require.True(t, sm.isServingLocked())
+
+	tdm.isDiskStalled = true
+	require.False(t, sm.isServingLocked())
+}
+
 func TestStateManagerUnserveNonPrimary(t *testing.T) {
 	sm := newTestStateManager()
 	defer sm.StopService()
@@ -778,23 +803,24 @@ func newTestStateManager() *stateManager {
 	parser := sqlparser.NewTestParser()
 	env := tabletenv.NewEnv(vtenv.NewTestEnv(), cfg, "StateManagerTest")
 	sm := &stateManager{
-		statelessql: NewQueryList("stateless", parser),
-		statefulql:  NewQueryList("stateful", parser),
-		olapql:      NewQueryList("olap", parser),
-		hs:          newHealthStreamer(env, &topodatapb.TabletAlias{}, schema.NewEngine(env)),
-		se:          &testSchemaEngine{},
-		rt:          &testReplTracker{lag: 1 * time.Second},
-		vstreamer:   &testSubcomponent{},
-		tracker:     &testSubcomponent{},
-		watcher:     &testSubcomponent{},
-		qe:          &testQueryEngine{},
-		txThrottler: &testTxThrottler{},
-		te:          &testTxEngine{},
-		messager:    &testSubcomponent{},
-		ddle:        &testOnlineDDLExecutor{},
-		throttler:   &testLagThrottler{},
-		tableGC:     &testTableGC{},
-		rw:          newRequestsWaiter(),
+		statelessql:       NewQueryList("stateless", parser),
+		statefulql:        NewQueryList("stateful", parser),
+		olapql:            NewQueryList("olap", parser),
+		hs:                newHealthStreamer(env, &topodatapb.TabletAlias{}, schema.NewEngine(env)),
+		se:                &testSchemaEngine{},
+		rt:                &testReplTracker{lag: 1 * time.Second},
+		vstreamer:         &testSubcomponent{},
+		tracker:           &testSubcomponent{},
+		watcher:           &testSubcomponent{},
+		qe:                &testQueryEngine{},
+		txThrottler:       &testTxThrottler{},
+		te:                &testTxEngine{},
+		messager:          &testSubcomponent{},
+		ddle:              &testOnlineDDLExecutor{},
+		diskHealthMonitor: newNoopDiskHealthMonitor(),
+		throttler:         &testLagThrottler{},
+		tableGC:           &testTableGC{},
+		rw:                newRequestsWaiter(),
 	}
 	sm.Init(env, &querypb.Target{})
 	sm.hs.InitDBConfig(&querypb.Target{})
diff --git a/go/vt/vttablet/tabletserver/tabletserver.go b/go/vt/vttablet/tabletserver/tabletserver.go
index 30f73d2d818..b65b3949354 100644
--- a/go/vt/vttablet/tabletserver/tabletserver.go
+++ b/go/vt/vttablet/tabletserver/tabletserver.go
@@ -190,23 +190,24 @@ func NewTabletServer(ctx context.Context, env *vtenv.Environment, name string, c
 	tsv.onlineDDLExecutor = onlineddl.NewExecutor(tsv, alias, topoServer, tsv.lagThrottler, tabletTypeFunc, tsv.onlineDDLExecutorToggleTableBuffer, tsv.tableGC.RequestChecks, tsv.te.preparedPool.IsEmptyForTable)
 
 	tsv.sm = &stateManager{
-		statelessql: tsv.statelessql,
-		statefulql:  tsv.statefulql,
-		olapql:      tsv.olapql,
-		hs:          tsv.hs,
-		se:          tsv.se,
-		rt:          tsv.rt,
-		vstreamer:   tsv.vstreamer,
-		tracker:     tsv.tracker,
-		watcher:     tsv.watcher,
-		qe:          tsv.qe,
-		txThrottler: tsv.txThrottler,
-		te:          tsv.te,
-		messager:    tsv.messager,
-		ddle:        tsv.onlineDDLExecutor,
-		throttler:   tsv.lagThrottler,
-		tableGC:     tsv.tableGC,
-		rw:          newRequestsWaiter(),
+		statelessql:       tsv.statelessql,
+		statefulql:        tsv.statefulql,
+		olapql:            tsv.olapql,
+		hs:                tsv.hs,
+		se:                tsv.se,
+		rt:                tsv.rt,
+		vstreamer:         tsv.vstreamer,
+		tracker:           tsv.tracker,
+		watcher:           tsv.watcher,
+		qe:                tsv.qe,
+		txThrottler:       tsv.txThrottler,
+		te:                tsv.te,
+		messager:          tsv.messager,
+		ddle:              tsv.onlineDDLExecutor,
+		throttler:         tsv.lagThrottler,
+		tableGC:           tsv.tableGC,
+		rw:                newRequestsWaiter(),
+		diskHealthMonitor: newDiskHealthMonitor(ctx),
 	}
 
 	tsv.exporter.NewGaugeFunc("TabletState", "Tablet server state", func() int64 { return int64(tsv.sm.State()) })
@@ -767,6 +768,11 @@ func (tsv *TabletServer) SetDemotePrimaryStalled() {
 	tsv.BroadcastHealth()
 }
 
+// IsDiskStalled returns if the disk is stalled or not.
+func (tsv *TabletServer) IsDiskStalled() bool {
+	return tsv.sm.diskHealthMonitor.IsDiskStalled()
+}
+
 // 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/tabletservermock/controller.go b/go/vt/vttablet/tabletservermock/controller.go
index a5242751454..21b38755302 100644
--- a/go/vt/vttablet/tabletservermock/controller.go
+++ b/go/vt/vttablet/tabletservermock/controller.go
@@ -279,6 +279,12 @@ func (tqsc *Controller) SetDemotePrimaryStalled() {
 	tqsc.MethodCalled["SetDemotePrimaryStalled"] = true
 }
 
+// IsDiskStalled is part of the tabletserver.Controller interface
+func (tqsc *Controller) IsDiskStalled() bool {
+	tqsc.MethodCalled["IsDiskStalled"] = true
+	return false
+}
+
 // EnterLameduck implements tabletserver.Controller.
 func (tqsc *Controller) EnterLameduck() {
 	tqsc.mu.Lock()
diff --git a/proto/replicationdata.proto b/proto/replicationdata.proto
index e788fc64bc3..eba4d323ee6 100644
--- a/proto/replicationdata.proto
+++ b/proto/replicationdata.proto
@@ -105,4 +105,5 @@ message FullStatus {
   uint32 semi_sync_wait_for_replica_count = 20;
   bool super_read_only = 21;
   replicationdata.Configuration replication_configuration = 22;
+  bool disk_stalled = 23;
 }
diff --git a/web/vtadmin/src/proto/vtadmin.d.ts b/web/vtadmin/src/proto/vtadmin.d.ts
index 4411c436083..5a8859b90e7 100644
--- a/web/vtadmin/src/proto/vtadmin.d.ts
+++ b/web/vtadmin/src/proto/vtadmin.d.ts
@@ -48595,6 +48595,9 @@ export namespace replicationdata {
 
         /** FullStatus replication_configuration */
         replication_configuration?: (replicationdata.IConfiguration|null);
+
+        /** FullStatus disk_stalled */
+        disk_stalled?: (boolean|null);
     }
 
     /** Represents a FullStatus. */
@@ -48672,6 +48675,9 @@ export namespace replicationdata {
         /** FullStatus replication_configuration. */
         public replication_configuration?: (replicationdata.IConfiguration|null);
 
+        /** FullStatus disk_stalled. */
+        public disk_stalled: boolean;
+
         /**
          * Creates a new FullStatus 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 457ae6e4214..cafe51c0058 100644
--- a/web/vtadmin/src/proto/vtadmin.js
+++ b/web/vtadmin/src/proto/vtadmin.js
@@ -118108,6 +118108,7 @@ export const replicationdata = $root.replicationdata = (() => {
          * @property {number|null} [semi_sync_wait_for_replica_count] FullStatus semi_sync_wait_for_replica_count
          * @property {boolean|null} [super_read_only] FullStatus super_read_only
          * @property {replicationdata.IConfiguration|null} [replication_configuration] FullStatus replication_configuration
+         * @property {boolean|null} [disk_stalled] FullStatus disk_stalled
          */
 
         /**
@@ -118301,6 +118302,14 @@ export const replicationdata = $root.replicationdata = (() => {
          */
         FullStatus.prototype.replication_configuration = null;
 
+        /**
+         * FullStatus disk_stalled.
+         * @member {boolean} disk_stalled
+         * @memberof replicationdata.FullStatus
+         * @instance
+         */
+        FullStatus.prototype.disk_stalled = false;
+
         /**
          * Creates a new FullStatus instance using the specified properties.
          * @function create
@@ -118369,6 +118378,8 @@ export const replicationdata = $root.replicationdata = (() => {
                 writer.uint32(/* id 21, wireType 0 =*/168).bool(message.super_read_only);
             if (message.replication_configuration != null && Object.hasOwnProperty.call(message, "replication_configuration"))
                 $root.replicationdata.Configuration.encode(message.replication_configuration, writer.uint32(/* id 22, wireType 2 =*/178).fork()).ldelim();
+            if (message.disk_stalled != null && Object.hasOwnProperty.call(message, "disk_stalled"))
+                writer.uint32(/* id 23, wireType 0 =*/184).bool(message.disk_stalled);
             return writer;
         };
 
@@ -118491,6 +118502,10 @@ export const replicationdata = $root.replicationdata = (() => {
                         message.replication_configuration = $root.replicationdata.Configuration.decode(reader, reader.uint32());
                         break;
                     }
+                case 23: {
+                        message.disk_stalled = reader.bool();
+                        break;
+                    }
                 default:
                     reader.skipType(tag & 7);
                     break;
@@ -118598,6 +118613,9 @@ export const replicationdata = $root.replicationdata = (() => {
                 if (error)
                     return "replication_configuration." + error;
             }
+            if (message.disk_stalled != null && message.hasOwnProperty("disk_stalled"))
+                if (typeof message.disk_stalled !== "boolean")
+                    return "disk_stalled: boolean expected";
             return null;
         };
 
@@ -118673,6 +118691,8 @@ export const replicationdata = $root.replicationdata = (() => {
                     throw TypeError(".replicationdata.FullStatus.replication_configuration: object expected");
                 message.replication_configuration = $root.replicationdata.Configuration.fromObject(object.replication_configuration);
             }
+            if (object.disk_stalled != null)
+                message.disk_stalled = Boolean(object.disk_stalled);
             return message;
         };
 
@@ -118716,6 +118736,7 @@ export const replicationdata = $root.replicationdata = (() => {
                 object.semi_sync_wait_for_replica_count = 0;
                 object.super_read_only = false;
                 object.replication_configuration = null;
+                object.disk_stalled = false;
             }
             if (message.server_id != null && message.hasOwnProperty("server_id"))
                 object.server_id = message.server_id;
@@ -118764,6 +118785,8 @@ export const replicationdata = $root.replicationdata = (() => {
                 object.super_read_only = message.super_read_only;
             if (message.replication_configuration != null && message.hasOwnProperty("replication_configuration"))
                 object.replication_configuration = $root.replicationdata.Configuration.toObject(message.replication_configuration, options);
+            if (message.disk_stalled != null && message.hasOwnProperty("disk_stalled"))
+                object.disk_stalled = message.disk_stalled;
             return object;
         };
 

From 19890cfb8ef7bd486e475b58a713d89fc2c29282 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9s=20Taylor?= <andres@planetscale.com>
Date: Tue, 28 Jan 2025 11:09:53 +0100
Subject: [PATCH 05/68] Optimise AST rewriting (#17623)

Signed-off-by: Andres Taylor <andres@planetscale.com>
Signed-off-by: Harshit Gangal <harshit@planetscale.com>
Co-authored-by: Harshit Gangal <harshit@planetscale.com>
---
 go/vt/sqlparser/ast_rewriting.go            | 557 --------------
 go/vt/sqlparser/ast_rewriting_test.go       | 565 --------------
 go/vt/sqlparser/bind_var_needs.go           |  18 +-
 go/vt/sqlparser/normalizer.go               | 786 ++++++++++++++++----
 go/vt/sqlparser/normalizer_test.go          | 612 ++++++++++++++-
 go/vt/sqlparser/redact_query.go             |   4 +-
 go/vt/sqlparser/utils.go                    |   5 +-
 go/vt/vtgate/executor_test.go               |  24 +
 go/vt/vtgate/planbuilder/builder.go         |   6 +-
 go/vt/vtgate/planbuilder/simplifier_test.go |  12 +-
 go/vt/vtgate/semantics/typer_test.go        |  17 +-
 11 files changed, 1279 insertions(+), 1327 deletions(-)
 delete mode 100644 go/vt/sqlparser/ast_rewriting.go
 delete mode 100644 go/vt/sqlparser/ast_rewriting_test.go

diff --git a/go/vt/sqlparser/ast_rewriting.go b/go/vt/sqlparser/ast_rewriting.go
deleted file mode 100644
index 05e7e290fc1..00000000000
--- a/go/vt/sqlparser/ast_rewriting.go
+++ /dev/null
@@ -1,557 +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 sqlparser
-
-import (
-	"strconv"
-	"strings"
-
-	querypb "vitess.io/vitess/go/vt/proto/query"
-	vtrpcpb "vitess.io/vitess/go/vt/proto/vtrpc"
-	"vitess.io/vitess/go/vt/sysvars"
-	"vitess.io/vitess/go/vt/vterrors"
-)
-
-var HasValueSubQueryBaseName = []byte("__sq_has_values")
-
-// SQLSelectLimitUnset default value for sql_select_limit not set.
-const SQLSelectLimitUnset = -1
-
-// RewriteASTResult contains the rewritten ast and meta information about it
-type RewriteASTResult struct {
-	*BindVarNeeds
-	AST Statement // The rewritten AST
-}
-
-type VSchemaViews interface {
-	FindView(name TableName) TableStatement
-}
-
-// PrepareAST will normalize the query
-func PrepareAST(
-	in Statement,
-	reservedVars *ReservedVars,
-	bindVars map[string]*querypb.BindVariable,
-	parameterize bool,
-	keyspace string,
-	selectLimit int,
-	setVarComment string,
-	sysVars map[string]string,
-	fkChecksState *bool,
-	views VSchemaViews,
-) (*RewriteASTResult, error) {
-	if parameterize {
-		err := Normalize(in, reservedVars, bindVars)
-		if err != nil {
-			return nil, err
-		}
-	}
-	return RewriteAST(in, keyspace, selectLimit, setVarComment, sysVars, fkChecksState, views)
-}
-
-// RewriteAST rewrites the whole AST, replacing function calls and adding column aliases to queries.
-// SET_VAR comments are also added to the AST if required.
-func RewriteAST(
-	in Statement,
-	keyspace string,
-	selectLimit int,
-	setVarComment string,
-	sysVars map[string]string,
-	fkChecksState *bool,
-	views VSchemaViews,
-) (*RewriteASTResult, error) {
-	er := newASTRewriter(keyspace, selectLimit, setVarComment, sysVars, fkChecksState, views)
-	er.shouldRewriteDatabaseFunc = shouldRewriteDatabaseFunc(in)
-	result := SafeRewrite(in, er.rewriteDown, er.rewriteUp)
-	if er.err != nil {
-		return nil, er.err
-	}
-
-	out, ok := result.(Statement)
-	if !ok {
-		return nil, vterrors.Errorf(vtrpcpb.Code_INTERNAL, "statement rewriting returned a non statement: %s", String(out))
-	}
-
-	r := &RewriteASTResult{
-		AST:          out,
-		BindVarNeeds: er.bindVars,
-	}
-	return r, nil
-}
-
-func shouldRewriteDatabaseFunc(in Statement) bool {
-	selct, ok := in.(*Select)
-	if !ok {
-		return false
-	}
-	if len(selct.From) != 1 {
-		return false
-	}
-	aliasedTable, ok := selct.From[0].(*AliasedTableExpr)
-	if !ok {
-		return false
-	}
-	tableName, ok := aliasedTable.Expr.(TableName)
-	if !ok {
-		return false
-	}
-	return tableName.Name.String() == "dual"
-}
-
-type astRewriter struct {
-	bindVars                  *BindVarNeeds
-	shouldRewriteDatabaseFunc bool
-	err                       error
-
-	// we need to know this to make a decision if we can safely rewrite JOIN USING => JOIN ON
-	hasStarInSelect bool
-
-	keyspace      string
-	selectLimit   int
-	setVarComment string
-	fkChecksState *bool
-	sysVars       map[string]string
-	views         VSchemaViews
-}
-
-func newASTRewriter(keyspace string, selectLimit int, setVarComment string, sysVars map[string]string, fkChecksState *bool, views VSchemaViews) *astRewriter {
-	return &astRewriter{
-		bindVars:      &BindVarNeeds{},
-		keyspace:      keyspace,
-		selectLimit:   selectLimit,
-		setVarComment: setVarComment,
-		fkChecksState: fkChecksState,
-		sysVars:       sysVars,
-		views:         views,
-	}
-}
-
-const (
-	// LastInsertIDName is a reserved bind var name for last_insert_id()
-	LastInsertIDName = "__lastInsertId"
-
-	// DBVarName is a reserved bind var name for database()
-	DBVarName = "__vtdbname"
-
-	// FoundRowsName is a reserved bind var name for found_rows()
-	FoundRowsName = "__vtfrows"
-
-	// RowCountName is a reserved bind var name for row_count()
-	RowCountName = "__vtrcount"
-
-	// UserDefinedVariableName is what we prepend bind var names for user defined variables
-	UserDefinedVariableName = "__vtudv"
-)
-
-func (er *astRewriter) rewriteAliasedExpr(node *AliasedExpr) (*BindVarNeeds, error) {
-	inner := newASTRewriter(er.keyspace, er.selectLimit, er.setVarComment, er.sysVars, nil, er.views)
-	inner.shouldRewriteDatabaseFunc = er.shouldRewriteDatabaseFunc
-	tmp := SafeRewrite(node.Expr, inner.rewriteDown, inner.rewriteUp)
-	newExpr, ok := tmp.(Expr)
-	if !ok {
-		return nil, vterrors.Errorf(vtrpcpb.Code_INTERNAL, "failed to rewrite AST. function expected to return Expr returned a %s", String(tmp))
-	}
-	node.Expr = newExpr
-	return inner.bindVars, nil
-}
-
-func (er *astRewriter) rewriteDown(node SQLNode, _ SQLNode) bool {
-	switch node := node.(type) {
-	case *Select:
-		er.visitSelect(node)
-	case *PrepareStmt, *ExecuteStmt:
-		return false // nothing to rewrite here.
-	}
-	return true
-}
-
-func (er *astRewriter) rewriteUp(cursor *Cursor) bool {
-	// Add SET_VAR comment to this node if it supports it and is needed
-	if supportOptimizerHint, supportsOptimizerHint := cursor.Node().(SupportOptimizerHint); supportsOptimizerHint {
-		if er.setVarComment != "" {
-			newComments, err := supportOptimizerHint.GetParsedComments().AddQueryHint(er.setVarComment)
-			if err != nil {
-				er.err = err
-				return false
-			}
-			supportOptimizerHint.SetComments(newComments)
-		}
-		if er.fkChecksState != nil {
-			newComments := supportOptimizerHint.GetParsedComments().SetMySQLSetVarValue(sysvars.ForeignKeyChecks, FkChecksStateString(er.fkChecksState))
-			supportOptimizerHint.SetComments(newComments)
-		}
-	}
-
-	switch node := cursor.Node().(type) {
-	case *Union:
-		er.rewriteUnion(node)
-	case *FuncExpr:
-		er.funcRewrite(cursor, node)
-	case *Variable:
-		er.rewriteVariable(cursor, node)
-	case *Subquery:
-		er.unnestSubQueries(cursor, node)
-	case *NotExpr:
-		er.rewriteNotExpr(cursor, node)
-	case *AliasedTableExpr:
-		er.rewriteAliasedTable(cursor, node)
-	case *ShowBasic:
-		er.rewriteShowBasic(node)
-	case *ExistsExpr:
-		er.existsRewrite(cursor, node)
-	case DistinctableAggr:
-		er.rewriteDistinctableAggr(cursor, node)
-	}
-	return true
-}
-
-func (er *astRewriter) rewriteUnion(node *Union) {
-	// set select limit if explicitly not set when sql_select_limit is set on the connection.
-	if er.selectLimit > 0 && node.Limit == nil {
-		node.Limit = &Limit{Rowcount: NewIntLiteral(strconv.Itoa(er.selectLimit))}
-	}
-}
-
-func (er *astRewriter) rewriteAliasedTable(cursor *Cursor, node *AliasedTableExpr) {
-	aliasTableName, ok := node.Expr.(TableName)
-	if !ok {
-		return
-	}
-
-	// Qualifier should not be added to dual table
-	tblName := aliasTableName.Name.String()
-	if tblName == "dual" {
-		return
-	}
-
-	if SystemSchema(er.keyspace) {
-		if aliasTableName.Qualifier.IsEmpty() {
-			aliasTableName.Qualifier = NewIdentifierCS(er.keyspace)
-			node.Expr = aliasTableName
-			cursor.Replace(node)
-		}
-		return
-	}
-
-	// Could we be dealing with a view?
-	if er.views == nil {
-		return
-	}
-	view := er.views.FindView(aliasTableName)
-	if view == nil {
-		return
-	}
-
-	// Aha! It's a view. Let's replace it with a derived table
-	node.Expr = &DerivedTable{Select: Clone(view)} // TODO: this is a bit hacky. We want to update the schema def so it contains new types
-	if node.As.IsEmpty() {
-		node.As = NewIdentifierCS(tblName)
-	}
-}
-
-func (er *astRewriter) rewriteShowBasic(node *ShowBasic) {
-	if node.Command == VariableGlobal || node.Command == VariableSession {
-		varsToAdd := sysvars.GetInterestingVariables()
-		for _, sysVar := range varsToAdd {
-			er.bindVars.AddSysVar(sysVar)
-		}
-	}
-}
-
-func (er *astRewriter) rewriteNotExpr(cursor *Cursor, node *NotExpr) {
-	switch inner := node.Expr.(type) {
-	case *ComparisonExpr:
-		// not col = 42 => col != 42
-		// not col > 42 => col <= 42
-		// etc
-		canChange, inverse := inverseOp(inner.Operator)
-		if canChange {
-			inner.Operator = inverse
-			cursor.Replace(inner)
-		}
-	case *NotExpr:
-		// not not true => true
-		cursor.Replace(inner.Expr)
-	case BoolVal:
-		// not true => false
-		inner = !inner
-		cursor.Replace(inner)
-	}
-}
-
-func (er *astRewriter) rewriteVariable(cursor *Cursor, node *Variable) {
-	// Iff we are in SET, we want to change the scope of variables if a modifier has been set
-	// and only on the lhs of the assignment:
-	// set session sql_mode = @someElse
-	// here we need to change the scope of `sql_mode` and not of `@someElse`
-	if v, isSet := cursor.Parent().(*SetExpr); isSet && v.Var == node {
-		return
-	}
-	// no rewriting for global scope variable.
-	// this should be returned from the underlying database.
-	switch node.Scope {
-	case VariableScope:
-		er.udvRewrite(cursor, node)
-	case SessionScope, NextTxScope:
-		er.sysVarRewrite(cursor, node)
-	}
-}
-
-func (er *astRewriter) visitSelect(node *Select) {
-	for _, col := range node.SelectExprs {
-		if _, hasStar := col.(*StarExpr); hasStar {
-			er.hasStarInSelect = true
-			continue
-		}
-
-		aliasedExpr, ok := col.(*AliasedExpr)
-		if !ok || aliasedExpr.As.NotEmpty() {
-			continue
-		}
-		buf := NewTrackedBuffer(nil)
-		aliasedExpr.Expr.Format(buf)
-		// select last_insert_id() -> select :__lastInsertId as `last_insert_id()`
-		innerBindVarNeeds, err := er.rewriteAliasedExpr(aliasedExpr)
-		if err != nil {
-			er.err = err
-			return
-		}
-		if innerBindVarNeeds.HasRewrites() {
-			aliasedExpr.As = NewIdentifierCI(buf.String())
-		}
-		er.bindVars.MergeWith(innerBindVarNeeds)
-
-	}
-	// set select limit if explicitly not set when sql_select_limit is set on the connection.
-	if er.selectLimit > 0 && node.Limit == nil {
-		node.Limit = &Limit{Rowcount: NewIntLiteral(strconv.Itoa(er.selectLimit))}
-	}
-}
-
-func inverseOp(i ComparisonExprOperator) (bool, ComparisonExprOperator) {
-	switch i {
-	case EqualOp:
-		return true, NotEqualOp
-	case LessThanOp:
-		return true, GreaterEqualOp
-	case GreaterThanOp:
-		return true, LessEqualOp
-	case LessEqualOp:
-		return true, GreaterThanOp
-	case GreaterEqualOp:
-		return true, LessThanOp
-	case NotEqualOp:
-		return true, EqualOp
-	case InOp:
-		return true, NotInOp
-	case NotInOp:
-		return true, InOp
-	case LikeOp:
-		return true, NotLikeOp
-	case NotLikeOp:
-		return true, LikeOp
-	case RegexpOp:
-		return true, NotRegexpOp
-	case NotRegexpOp:
-		return true, RegexpOp
-	}
-
-	return false, i
-}
-
-func (er *astRewriter) sysVarRewrite(cursor *Cursor, node *Variable) {
-	lowered := node.Name.Lowered()
-
-	var found bool
-	if er.sysVars != nil {
-		_, found = er.sysVars[lowered]
-	}
-
-	switch lowered {
-	case sysvars.Autocommit.Name,
-		sysvars.Charset.Name,
-		sysvars.ClientFoundRows.Name,
-		sysvars.DDLStrategy.Name,
-		sysvars.MigrationContext.Name,
-		sysvars.Names.Name,
-		sysvars.TransactionMode.Name,
-		sysvars.ReadAfterWriteGTID.Name,
-		sysvars.ReadAfterWriteTimeOut.Name,
-		sysvars.SessionEnableSystemSettings.Name,
-		sysvars.SessionTrackGTIDs.Name,
-		sysvars.SessionUUID.Name,
-		sysvars.SkipQueryPlanCache.Name,
-		sysvars.Socket.Name,
-		sysvars.SQLSelectLimit.Name,
-		sysvars.Version.Name,
-		sysvars.VersionComment.Name,
-		sysvars.QueryTimeout.Name,
-		sysvars.Workload.Name:
-		found = true
-	}
-
-	if found {
-		cursor.Replace(bindVarExpression("__vt" + lowered))
-		er.bindVars.AddSysVar(lowered)
-	}
-}
-
-func (er *astRewriter) udvRewrite(cursor *Cursor, node *Variable) {
-	udv := strings.ToLower(node.Name.CompliantName())
-	cursor.Replace(bindVarExpression(UserDefinedVariableName + udv))
-	er.bindVars.AddUserDefVar(udv)
-}
-
-var funcRewrites = map[string]string{
-	"last_insert_id": LastInsertIDName,
-	"database":       DBVarName,
-	"schema":         DBVarName,
-	"found_rows":     FoundRowsName,
-	"row_count":      RowCountName,
-}
-
-func (er *astRewriter) funcRewrite(cursor *Cursor, node *FuncExpr) {
-	lowered := node.Name.Lowered()
-	if lowered == "last_insert_id" && len(node.Exprs) > 0 {
-		// if we are dealing with is LAST_INSERT_ID() with an argument, we don't need to rewrite it.
-		// with an argument, this is an identity function that will update the session state and
-		// sets the correct fields in the OK TCP packet that we send back
-		return
-	}
-	bindVar, found := funcRewrites[lowered]
-	if !found || (bindVar == DBVarName && !er.shouldRewriteDatabaseFunc) {
-		return
-	}
-	if len(node.Exprs) > 0 {
-		er.err = vterrors.Errorf(vtrpcpb.Code_UNIMPLEMENTED, "Argument to %s() not supported", lowered)
-		return
-	}
-	cursor.Replace(bindVarExpression(bindVar))
-	er.bindVars.AddFuncResult(bindVar)
-}
-
-func (er *astRewriter) unnestSubQueries(cursor *Cursor, subquery *Subquery) {
-	if _, isExists := cursor.Parent().(*ExistsExpr); isExists {
-		return
-	}
-	sel, isSimpleSelect := subquery.Select.(*Select)
-	if !isSimpleSelect {
-		return
-	}
-
-	if len(sel.SelectExprs) != 1 ||
-		len(sel.OrderBy) != 0 ||
-		sel.GroupBy != nil ||
-		len(sel.From) != 1 ||
-		sel.Where != nil ||
-		sel.Having != nil ||
-		sel.Limit != nil || sel.Lock != NoLock {
-		return
-	}
-
-	aliasedTable, ok := sel.From[0].(*AliasedTableExpr)
-	if !ok {
-		return
-	}
-	table, ok := aliasedTable.Expr.(TableName)
-	if !ok || table.Name.String() != "dual" {
-		return
-	}
-	expr, ok := sel.SelectExprs[0].(*AliasedExpr)
-	if !ok {
-		return
-	}
-	_, isColName := expr.Expr.(*ColName)
-	if isColName {
-		// If we find a single col-name in a `dual` subquery, we can be pretty sure the user is returning a column
-		// already projected.
-		// `select 1 as x, (select x)`
-		// is perfectly valid - any aliased columns to the left are available inside subquery scopes
-		return
-	}
-	er.bindVars.NoteRewrite()
-	// we need to make sure that the inner expression also gets rewritten,
-	// so we fire off another rewriter traversal here
-	rewritten := SafeRewrite(expr.Expr, er.rewriteDown, er.rewriteUp)
-
-	// Here we need to handle the subquery rewrite in case in occurs in an IN clause
-	// For example, SELECT id FROM user WHERE id IN (SELECT 1 FROM DUAL)
-	// Here we cannot rewrite the query to SELECT id FROM user WHERE id IN 1, since that is syntactically wrong
-	// We must rewrite it to SELECT id FROM user WHERE id IN (1)
-	// Find more cases in the test file
-	rewrittenExpr, isExpr := rewritten.(Expr)
-	_, isColTuple := rewritten.(ColTuple)
-	comparisonExpr, isCompExpr := cursor.Parent().(*ComparisonExpr)
-	// Check that the parent is a comparison operator with IN or NOT IN operation.
-	// Also, if rewritten is already a ColTuple (like a subquery), then we do not need this
-	// We also need to check that rewritten is an Expr, if it is then we can rewrite it as a ValTuple
-	if isCompExpr && (comparisonExpr.Operator == InOp || comparisonExpr.Operator == NotInOp) && !isColTuple && isExpr {
-		cursor.Replace(ValTuple{rewrittenExpr})
-		return
-	}
-
-	cursor.Replace(rewritten)
-}
-
-func (er *astRewriter) existsRewrite(cursor *Cursor, node *ExistsExpr) {
-	sel, ok := node.Subquery.Select.(*Select)
-	if !ok {
-		return
-	}
-
-	if sel.Having != nil {
-		// If the query has HAVING, we can't take any shortcuts
-		return
-	}
-
-	if sel.GroupBy == nil && sel.SelectExprs.AllAggregation() {
-		// in these situations, we are guaranteed to always get a non-empty result,
-		// so we can replace the EXISTS with a literal true
-		cursor.Replace(BoolVal(true))
-	}
-
-	// If we are not doing HAVING, we can safely replace all select expressions with a
-	// single `1` and remove any grouping
-	sel.SelectExprs = SelectExprs{
-		&AliasedExpr{Expr: NewIntLiteral("1")},
-	}
-	sel.GroupBy = nil
-}
-
-// rewriteDistinctableAggr removed Distinct from Max and Min Aggregations as it does not impact the result. But, makes the plan simpler.
-func (er *astRewriter) rewriteDistinctableAggr(cursor *Cursor, node DistinctableAggr) {
-	if !node.IsDistinct() {
-		return
-	}
-	switch aggr := node.(type) {
-	case *Max, *Min:
-		aggr.SetDistinct(false)
-		er.bindVars.NoteRewrite()
-	}
-}
-
-func bindVarExpression(name string) Expr {
-	return NewArgument(name)
-}
-
-// SystemSchema returns true if the schema passed is system schema
-func SystemSchema(schema string) bool {
-	return strings.EqualFold(schema, "information_schema") ||
-		strings.EqualFold(schema, "performance_schema") ||
-		strings.EqualFold(schema, "sys") ||
-		strings.EqualFold(schema, "mysql")
-}
diff --git a/go/vt/sqlparser/ast_rewriting_test.go b/go/vt/sqlparser/ast_rewriting_test.go
deleted file mode 100644
index 8b3e3d44c54..00000000000
--- a/go/vt/sqlparser/ast_rewriting_test.go
+++ /dev/null
@@ -1,565 +0,0 @@
-/*
-Copyright 2019 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 sqlparser
-
-import (
-	"fmt"
-	"testing"
-
-	"github.com/stretchr/testify/assert"
-
-	"vitess.io/vitess/go/vt/sysvars"
-
-	"github.com/stretchr/testify/require"
-)
-
-type testCaseSetVar struct {
-	in, expected, setVarComment string
-}
-
-type testCaseSysVar struct {
-	in, expected string
-	sysVar       map[string]string
-}
-
-type myTestCase struct {
-	in, expected                                                                            string
-	liid, db, foundRows, rowCount, rawGTID, rawTimeout, sessTrackGTID                       bool
-	ddlStrategy, migrationContext, sessionUUID, sessionEnableSystemSettings                 bool
-	udv                                                                                     int
-	autocommit, foreignKeyChecks, clientFoundRows, skipQueryPlanCache, socket, queryTimeout bool
-	sqlSelectLimit, transactionMode, workload, version, versionComment                      bool
-}
-
-func TestRewrites(in *testing.T) {
-	tests := []myTestCase{{
-		in:       "SELECT 42",
-		expected: "SELECT 42",
-		// no bindvar needs
-	}, {
-		in:       "SELECT @@version",
-		expected: "SELECT :__vtversion as `@@version`",
-		version:  true,
-	}, {
-		in:           "SELECT @@query_timeout",
-		expected:     "SELECT :__vtquery_timeout as `@@query_timeout`",
-		queryTimeout: true,
-	}, {
-		in:             "SELECT @@version_comment",
-		expected:       "SELECT :__vtversion_comment as `@@version_comment`",
-		versionComment: true,
-	}, {
-		in:                          "SELECT @@enable_system_settings",
-		expected:                    "SELECT :__vtenable_system_settings as `@@enable_system_settings`",
-		sessionEnableSystemSettings: true,
-	}, {
-		in:       "SELECT last_insert_id()",
-		expected: "SELECT :__lastInsertId as `last_insert_id()`",
-		liid:     true,
-	}, {
-		in:       "SELECT database()",
-		expected: "SELECT :__vtdbname as `database()`",
-		db:       true,
-	}, {
-		in:       "SELECT database() from test",
-		expected: "SELECT database() from test",
-		// no bindvar needs
-	}, {
-		in:       "SELECT last_insert_id() as test",
-		expected: "SELECT :__lastInsertId as test",
-		liid:     true,
-	}, {
-		in:       "SELECT last_insert_id() + database()",
-		expected: "SELECT :__lastInsertId + :__vtdbname as `last_insert_id() + database()`",
-		db:       true, liid: true,
-	}, {
-		// unnest database() call
-		in:       "select (select database()) from test",
-		expected: "select database() as `(select database() from dual)` from test",
-		// no bindvar needs
-	}, {
-		// unnest database() call
-		in:       "select (select database() from dual) from test",
-		expected: "select database() as `(select database() from dual)` from test",
-		// no bindvar needs
-	}, {
-		in:       "select (select database() from dual) from dual",
-		expected: "select :__vtdbname as `(select database() from dual)` from dual",
-		db:       true,
-	}, {
-		// don't unnest solo columns
-		in:       "select 1 as foobar, (select foobar)",
-		expected: "select 1 as foobar, (select foobar from dual) from dual",
-	}, {
-		in:       "select id from user where database()",
-		expected: "select id from user where database()",
-		// no bindvar needs
-	}, {
-		in:       "select table_name from information_schema.tables where table_schema = database()",
-		expected: "select table_name from information_schema.tables where table_schema = database()",
-		// no bindvar needs
-	}, {
-		in:       "select schema()",
-		expected: "select :__vtdbname as `schema()`",
-		db:       true,
-	}, {
-		in:        "select found_rows()",
-		expected:  "select :__vtfrows as `found_rows()`",
-		foundRows: true,
-	}, {
-		in:       "select @`x y`",
-		expected: "select :__vtudvx_y as `@``x y``` from dual",
-		udv:      1,
-	}, {
-		in:       "select id from t where id = @x and val = @y",
-		expected: "select id from t where id = :__vtudvx and val = :__vtudvy",
-		db:       false, udv: 2,
-	}, {
-		in:       "insert into t(id) values(@xyx)",
-		expected: "insert into t(id) values(:__vtudvxyx)",
-		db:       false, udv: 1,
-	}, {
-		in:       "select row_count()",
-		expected: "select :__vtrcount as `row_count()`",
-		rowCount: true,
-	}, {
-		in:       "SELECT lower(database())",
-		expected: "SELECT lower(:__vtdbname) as `lower(database())`",
-		db:       true,
-	}, {
-		in:         "SELECT @@autocommit",
-		expected:   "SELECT :__vtautocommit as `@@autocommit`",
-		autocommit: true,
-	}, {
-		in:              "SELECT @@client_found_rows",
-		expected:        "SELECT :__vtclient_found_rows as `@@client_found_rows`",
-		clientFoundRows: true,
-	}, {
-		in:                 "SELECT @@skip_query_plan_cache",
-		expected:           "SELECT :__vtskip_query_plan_cache as `@@skip_query_plan_cache`",
-		skipQueryPlanCache: true,
-	}, {
-		in:             "SELECT @@sql_select_limit",
-		expected:       "SELECT :__vtsql_select_limit as `@@sql_select_limit`",
-		sqlSelectLimit: true,
-	}, {
-		in:              "SELECT @@transaction_mode",
-		expected:        "SELECT :__vttransaction_mode as `@@transaction_mode`",
-		transactionMode: true,
-	}, {
-		in:       "SELECT @@workload",
-		expected: "SELECT :__vtworkload as `@@workload`",
-		workload: true,
-	}, {
-		in:       "SELECT @@socket",
-		expected: "SELECT :__vtsocket as `@@socket`",
-		socket:   true,
-	}, {
-		in:       "select (select 42) from dual",
-		expected: "select 42 as `(select 42 from dual)` from dual",
-	}, {
-		in:       "select * from user where col = (select 42)",
-		expected: "select * from user where col = 42",
-	}, {
-		in:       "select * from (select 42) as t", // this is not an expression, and should not be rewritten
-		expected: "select * from (select 42) as t",
-	}, {
-		in:       `select (select (select (select (select (select last_insert_id()))))) as x`,
-		expected: "select :__lastInsertId as x from dual",
-		liid:     true,
-	}, {
-		in:          `select * from user where col = @@ddl_strategy`,
-		expected:    "select * from user where col = :__vtddl_strategy",
-		ddlStrategy: true,
-	}, {
-		in:               `select * from user where col = @@migration_context`,
-		expected:         "select * from user where col = :__vtmigration_context",
-		migrationContext: true,
-	}, {
-		in:       `select * from user where col = @@read_after_write_gtid OR col = @@read_after_write_timeout OR col = @@session_track_gtids`,
-		expected: "select * from user where col = :__vtread_after_write_gtid or col = :__vtread_after_write_timeout or col = :__vtsession_track_gtids",
-		rawGTID:  true, rawTimeout: true, sessTrackGTID: true,
-	}, {
-		in:       "SELECT * FROM tbl WHERE id IN (SELECT 1 FROM dual)",
-		expected: "SELECT * FROM tbl WHERE id IN (1)",
-	}, {
-		in:       "SELECT * FROM tbl WHERE id IN (SELECT last_insert_id() FROM dual)",
-		expected: "SELECT * FROM tbl WHERE id IN (:__lastInsertId)",
-		liid:     true,
-	}, {
-		in:       "SELECT * FROM tbl WHERE id IN (SELECT (SELECT 1 FROM dual WHERE 1 = 0) FROM dual)",
-		expected: "SELECT * FROM tbl WHERE id IN (SELECT 1 FROM dual WHERE 1 = 0)",
-	}, {
-		in:       "SELECT * FROM tbl WHERE id IN (SELECT 1 FROM dual WHERE 1 = 0)",
-		expected: "SELECT * FROM tbl WHERE id IN (SELECT 1 FROM dual WHERE 1 = 0)",
-	}, {
-		in:       "SELECT * FROM tbl WHERE id IN (SELECT 1,2 FROM dual)",
-		expected: "SELECT * FROM tbl WHERE id IN (SELECT 1,2 FROM dual)",
-	}, {
-		in:       "SELECT * FROM tbl WHERE id IN (SELECT 1 FROM dual ORDER BY 1)",
-		expected: "SELECT * FROM tbl WHERE id IN (SELECT 1 FROM dual ORDER BY 1)",
-	}, {
-		in:       "SELECT * FROM tbl WHERE id IN (SELECT id FROM user GROUP BY id)",
-		expected: "SELECT * FROM tbl WHERE id IN (SELECT id FROM user GROUP BY id)",
-	}, {
-		in:       "SELECT * FROM tbl WHERE id IN (SELECT 1 FROM dual, user)",
-		expected: "SELECT * FROM tbl WHERE id IN (SELECT 1 FROM dual, user)",
-	}, {
-		in:       "SELECT * FROM tbl WHERE id IN (SELECT 1 FROM dual limit 1)",
-		expected: "SELECT * FROM tbl WHERE id IN (SELECT 1 FROM dual limit 1)",
-	}, {
-		// SELECT * behaves different depending the join type used, so if that has been used, we won't rewrite
-		in:       "SELECT * FROM A JOIN B USING (id1,id2,id3)",
-		expected: "SELECT * FROM A JOIN B USING (id1,id2,id3)",
-	}, {
-		in:       "CALL proc(@foo)",
-		expected: "CALL proc(:__vtudvfoo)",
-		udv:      1,
-	}, {
-		in:       "SELECT * FROM tbl WHERE NOT id = 42",
-		expected: "SELECT * FROM tbl WHERE id != 42",
-	}, {
-		in:       "SELECT * FROM tbl WHERE not id < 12",
-		expected: "SELECT * FROM tbl WHERE id >= 12",
-	}, {
-		in:       "SELECT * FROM tbl WHERE not id > 12",
-		expected: "SELECT * FROM tbl WHERE id <= 12",
-	}, {
-		in:       "SELECT * FROM tbl WHERE not id <= 33",
-		expected: "SELECT * FROM tbl WHERE id > 33",
-	}, {
-		in:       "SELECT * FROM tbl WHERE not id >= 33",
-		expected: "SELECT * FROM tbl WHERE id < 33",
-	}, {
-		in:       "SELECT * FROM tbl WHERE not id != 33",
-		expected: "SELECT * FROM tbl WHERE id = 33",
-	}, {
-		in:       "SELECT * FROM tbl WHERE not id in (1,2,3)",
-		expected: "SELECT * FROM tbl WHERE id not in (1,2,3)",
-	}, {
-		in:       "SELECT * FROM tbl WHERE not id not in (1,2,3)",
-		expected: "SELECT * FROM tbl WHERE id in (1,2,3)",
-	}, {
-		in:       "SELECT * FROM tbl WHERE not id not in (1,2,3)",
-		expected: "SELECT * FROM tbl WHERE id in (1,2,3)",
-	}, {
-		in:       "SELECT * FROM tbl WHERE not id like '%foobar'",
-		expected: "SELECT * FROM tbl WHERE id not like '%foobar'",
-	}, {
-		in:       "SELECT * FROM tbl WHERE not id not like '%foobar'",
-		expected: "SELECT * FROM tbl WHERE id like '%foobar'",
-	}, {
-		in:       "SELECT * FROM tbl WHERE not id regexp '%foobar'",
-		expected: "SELECT * FROM tbl WHERE id not regexp '%foobar'",
-	}, {
-		in:       "SELECT * FROM tbl WHERE not id not regexp '%foobar'",
-		expected: "select * from tbl where id regexp '%foobar'",
-	}, {
-		in:       "SELECT * FROM tbl WHERE exists(select col1, col2 from other_table where foo > bar)",
-		expected: "SELECT * FROM tbl WHERE exists(select 1 from other_table where foo > bar)",
-	}, {
-		in:       "SELECT * FROM tbl WHERE exists(select col1, col2 from other_table where foo > bar limit 100 offset 34)",
-		expected: "SELECT * FROM tbl WHERE exists(select 1 from other_table where foo > bar limit 100 offset 34)",
-	}, {
-		in:       "SELECT * FROM tbl WHERE exists(select col1, col2, count(*) from other_table where foo > bar group by col1, col2)",
-		expected: "SELECT * FROM tbl WHERE exists(select 1 from other_table where foo > bar)",
-	}, {
-		in:       "SELECT * FROM tbl WHERE exists(select col1, col2 from other_table where foo > bar group by col1, col2)",
-		expected: "SELECT * FROM tbl WHERE exists(select 1 from other_table where foo > bar)",
-	}, {
-		in:       "SELECT * FROM tbl WHERE exists(select count(*) from other_table where foo > bar)",
-		expected: "SELECT * FROM tbl WHERE true",
-	}, {
-		in:       "SELECT * FROM tbl WHERE exists(select col1, col2, count(*) from other_table where foo > bar group by col1, col2 having count(*) > 3)",
-		expected: "SELECT * FROM tbl WHERE exists(select col1, col2, count(*) from other_table where foo > bar group by col1, col2 having count(*) > 3)",
-	}, {
-		in:       "SELECT id, name, salary FROM user_details",
-		expected: "SELECT id, name, salary FROM (select user.id, user.name, user_extra.salary from user join user_extra where user.id = user_extra.user_id) as user_details",
-	}, {
-		in:       "select max(distinct c1), min(distinct c2), avg(distinct c3), sum(distinct c4), count(distinct c5), group_concat(distinct c6) from tbl",
-		expected: "select max(c1) as `max(distinct c1)`, min(c2) as `min(distinct c2)`, avg(distinct c3), sum(distinct c4), count(distinct c5), group_concat(distinct c6) from tbl",
-	}, {
-		in:                          "SHOW VARIABLES",
-		expected:                    "SHOW VARIABLES",
-		autocommit:                  true,
-		foreignKeyChecks:            true,
-		clientFoundRows:             true,
-		skipQueryPlanCache:          true,
-		sqlSelectLimit:              true,
-		transactionMode:             true,
-		workload:                    true,
-		version:                     true,
-		versionComment:              true,
-		ddlStrategy:                 true,
-		migrationContext:            true,
-		sessionUUID:                 true,
-		sessionEnableSystemSettings: true,
-		rawGTID:                     true,
-		rawTimeout:                  true,
-		sessTrackGTID:               true,
-		socket:                      true,
-		queryTimeout:                true,
-	}, {
-		in:                          "SHOW GLOBAL VARIABLES",
-		expected:                    "SHOW GLOBAL VARIABLES",
-		autocommit:                  true,
-		foreignKeyChecks:            true,
-		clientFoundRows:             true,
-		skipQueryPlanCache:          true,
-		sqlSelectLimit:              true,
-		transactionMode:             true,
-		workload:                    true,
-		version:                     true,
-		versionComment:              true,
-		ddlStrategy:                 true,
-		migrationContext:            true,
-		sessionUUID:                 true,
-		sessionEnableSystemSettings: true,
-		rawGTID:                     true,
-		rawTimeout:                  true,
-		sessTrackGTID:               true,
-		socket:                      true,
-		queryTimeout:                true,
-	}}
-	parser := NewTestParser()
-	for _, tc := range tests {
-		in.Run(tc.in, func(t *testing.T) {
-			require := require.New(t)
-			stmt, err := parser.Parse(tc.in)
-			require.NoError(err)
-
-			result, err := RewriteAST(
-				stmt,
-				"ks", // passing `ks` just to test that no rewriting happens as it is not system schema
-				SQLSelectLimitUnset,
-				"",
-				nil,
-				nil,
-				&fakeViews{},
-			)
-			require.NoError(err)
-
-			expected, err := parser.Parse(tc.expected)
-			require.NoError(err, "test expectation does not parse [%s]", tc.expected)
-
-			s := String(expected)
-			assert := assert.New(t)
-			assert.Equal(s, String(result.AST))
-			assert.Equal(tc.liid, result.NeedsFuncResult(LastInsertIDName), "should need last insert id")
-			assert.Equal(tc.db, result.NeedsFuncResult(DBVarName), "should need database name")
-			assert.Equal(tc.foundRows, result.NeedsFuncResult(FoundRowsName), "should need found rows")
-			assert.Equal(tc.rowCount, result.NeedsFuncResult(RowCountName), "should need row count")
-			assert.Equal(tc.udv, len(result.NeedUserDefinedVariables), "count of user defined variables")
-			assert.Equal(tc.autocommit, result.NeedsSysVar(sysvars.Autocommit.Name), "should need :__vtautocommit")
-			assert.Equal(tc.foreignKeyChecks, result.NeedsSysVar(sysvars.ForeignKeyChecks), "should need :__vtforeignKeyChecks")
-			assert.Equal(tc.clientFoundRows, result.NeedsSysVar(sysvars.ClientFoundRows.Name), "should need :__vtclientFoundRows")
-			assert.Equal(tc.skipQueryPlanCache, result.NeedsSysVar(sysvars.SkipQueryPlanCache.Name), "should need :__vtskipQueryPlanCache")
-			assert.Equal(tc.sqlSelectLimit, result.NeedsSysVar(sysvars.SQLSelectLimit.Name), "should need :__vtsqlSelectLimit")
-			assert.Equal(tc.transactionMode, result.NeedsSysVar(sysvars.TransactionMode.Name), "should need :__vttransactionMode")
-			assert.Equal(tc.workload, result.NeedsSysVar(sysvars.Workload.Name), "should need :__vtworkload")
-			assert.Equal(tc.queryTimeout, result.NeedsSysVar(sysvars.QueryTimeout.Name), "should need :__vtquery_timeout")
-			assert.Equal(tc.ddlStrategy, result.NeedsSysVar(sysvars.DDLStrategy.Name), "should need ddlStrategy")
-			assert.Equal(tc.migrationContext, result.NeedsSysVar(sysvars.MigrationContext.Name), "should need migrationContext")
-			assert.Equal(tc.sessionUUID, result.NeedsSysVar(sysvars.SessionUUID.Name), "should need sessionUUID")
-			assert.Equal(tc.sessionEnableSystemSettings, result.NeedsSysVar(sysvars.SessionEnableSystemSettings.Name), "should need sessionEnableSystemSettings")
-			assert.Equal(tc.rawGTID, result.NeedsSysVar(sysvars.ReadAfterWriteGTID.Name), "should need rawGTID")
-			assert.Equal(tc.rawTimeout, result.NeedsSysVar(sysvars.ReadAfterWriteTimeOut.Name), "should need rawTimeout")
-			assert.Equal(tc.sessTrackGTID, result.NeedsSysVar(sysvars.SessionTrackGTIDs.Name), "should need sessTrackGTID")
-			assert.Equal(tc.version, result.NeedsSysVar(sysvars.Version.Name), "should need Vitess version")
-			assert.Equal(tc.versionComment, result.NeedsSysVar(sysvars.VersionComment.Name), "should need Vitess version")
-			assert.Equal(tc.socket, result.NeedsSysVar(sysvars.Socket.Name), "should need :__vtsocket")
-		})
-	}
-}
-
-type fakeViews struct{}
-
-func (*fakeViews) FindView(name TableName) TableStatement {
-	if name.Name.String() != "user_details" {
-		return nil
-	}
-	parser := NewTestParser()
-	statement, err := parser.Parse("select user.id, user.name, user_extra.salary from user join user_extra where user.id = user_extra.user_id")
-	if err != nil {
-		return nil
-	}
-	return statement.(TableStatement)
-}
-
-func TestRewritesWithSetVarComment(in *testing.T) {
-	tests := []testCaseSetVar{{
-		in:            "select 1",
-		expected:      "select 1",
-		setVarComment: "",
-	}, {
-		in:            "select 1",
-		expected:      "select /*+ AA(a) */ 1",
-		setVarComment: "AA(a)",
-	}, {
-		in:            "insert /* toto */ into t(id) values(1)",
-		expected:      "insert /*+ AA(a) */ /* toto */ into t(id) values(1)",
-		setVarComment: "AA(a)",
-	}, {
-		in:            "select  /* toto */ * from t union select * from s",
-		expected:      "select /*+ AA(a) */ /* toto */ * from t union select /*+ AA(a) */ * from s",
-		setVarComment: "AA(a)",
-	}, {
-		in:            "vstream /* toto */ * from t1",
-		expected:      "vstream /*+ AA(a) */ /* toto */ * from t1",
-		setVarComment: "AA(a)",
-	}, {
-		in:            "stream /* toto */ t from t1",
-		expected:      "stream /*+ AA(a) */ /* toto */ t from t1",
-		setVarComment: "AA(a)",
-	}, {
-		in:            "update /* toto */ t set id = 1",
-		expected:      "update /*+ AA(a) */ /* toto */ t set id = 1",
-		setVarComment: "AA(a)",
-	}, {
-		in:            "delete /* toto */ from t",
-		expected:      "delete /*+ AA(a) */ /* toto */ from t",
-		setVarComment: "AA(a)",
-	}}
-
-	parser := NewTestParser()
-	for _, tc := range tests {
-		in.Run(tc.in, func(t *testing.T) {
-			require := require.New(t)
-			stmt, err := parser.Parse(tc.in)
-			require.NoError(err)
-
-			result, err := RewriteAST(stmt, "ks", SQLSelectLimitUnset, tc.setVarComment, nil, nil, &fakeViews{})
-			require.NoError(err)
-
-			expected, err := parser.Parse(tc.expected)
-			require.NoError(err, "test expectation does not parse [%s]", tc.expected)
-
-			assert.Equal(t, String(expected), String(result.AST))
-		})
-	}
-}
-
-func TestRewritesSysVar(in *testing.T) {
-	tests := []testCaseSysVar{{
-		in:       "select @x = @@sql_mode",
-		expected: "select :__vtudvx = @@sql_mode as `@x = @@sql_mode` from dual",
-	}, {
-		in:       "select @x = @@sql_mode",
-		expected: "select :__vtudvx = :__vtsql_mode as `@x = @@sql_mode` from dual",
-		sysVar:   map[string]string{"sql_mode": "' '"},
-	}, {
-		in:       "SELECT @@tx_isolation",
-		expected: "select @@tx_isolation from dual",
-	}, {
-		in:       "SELECT @@transaction_isolation",
-		expected: "select @@transaction_isolation from dual",
-	}, {
-		in:       "SELECT @@session.transaction_isolation",
-		expected: "select @@session.transaction_isolation from dual",
-	}, {
-		in:       "SELECT @@tx_isolation",
-		sysVar:   map[string]string{"tx_isolation": "'READ-COMMITTED'"},
-		expected: "select :__vttx_isolation as `@@tx_isolation` from dual",
-	}, {
-		in:       "SELECT @@transaction_isolation",
-		sysVar:   map[string]string{"transaction_isolation": "'READ-COMMITTED'"},
-		expected: "select :__vttransaction_isolation as `@@transaction_isolation` from dual",
-	}, {
-		in:       "SELECT @@session.transaction_isolation",
-		sysVar:   map[string]string{"transaction_isolation": "'READ-COMMITTED'"},
-		expected: "select :__vttransaction_isolation as `@@session.transaction_isolation` from dual",
-	}}
-
-	parser := NewTestParser()
-	for _, tc := range tests {
-		in.Run(tc.in, func(t *testing.T) {
-			require := require.New(t)
-			stmt, err := parser.Parse(tc.in)
-			require.NoError(err)
-
-			result, err := RewriteAST(stmt, "ks", SQLSelectLimitUnset, "", tc.sysVar, nil, &fakeViews{})
-			require.NoError(err)
-
-			expected, err := parser.Parse(tc.expected)
-			require.NoError(err, "test expectation does not parse [%s]", tc.expected)
-
-			assert.Equal(t, String(expected), String(result.AST))
-		})
-	}
-}
-
-func TestRewritesWithDefaultKeyspace(in *testing.T) {
-	tests := []myTestCase{{
-		in:       "SELECT 1 from x.test",
-		expected: "SELECT 1 from x.test", // no change
-	}, {
-		in:       "SELECT x.col as c from x.test",
-		expected: "SELECT x.col as c from x.test", // no change
-	}, {
-		in:       "SELECT 1 from test",
-		expected: "SELECT 1 from sys.test",
-	}, {
-		in:       "SELECT 1 from test as t",
-		expected: "SELECT 1 from sys.test as t",
-	}, {
-		in:       "SELECT 1 from `test 24` as t",
-		expected: "SELECT 1 from sys.`test 24` as t",
-	}, {
-		in:       "SELECT 1, (select 1 from test) from x.y",
-		expected: "SELECT 1, (select 1 from sys.test) from x.y",
-	}, {
-		in:       "SELECT 1 from (select 2 from test) t",
-		expected: "SELECT 1 from (select 2 from sys.test) t",
-	}, {
-		in:       "SELECT 1 from test where exists(select 2 from test)",
-		expected: "SELECT 1 from sys.test where exists(select 1 from sys.test)",
-	}, {
-		in:       "SELECT 1 from dual",
-		expected: "SELECT 1 from dual",
-	}, {
-		in:       "SELECT (select 2 from dual) from DUAL",
-		expected: "SELECT 2 as `(select 2 from dual)` from DUAL",
-	}}
-
-	parser := NewTestParser()
-	for _, tc := range tests {
-		in.Run(tc.in, func(t *testing.T) {
-			require := require.New(t)
-			stmt, err := parser.Parse(tc.in)
-			require.NoError(err)
-
-			result, err := RewriteAST(stmt, "sys", SQLSelectLimitUnset, "", nil, nil, &fakeViews{})
-			require.NoError(err)
-
-			expected, err := parser.Parse(tc.expected)
-			require.NoError(err, "test expectation does not parse [%s]", tc.expected)
-
-			assert.Equal(t, String(expected), String(result.AST))
-		})
-	}
-}
-
-func TestReservedVars(t *testing.T) {
-	for _, prefix := range []string{"vtg", "bv"} {
-		t.Run("prefix_"+prefix, func(t *testing.T) {
-			reserved := NewReservedVars(prefix, make(BindVars))
-			for i := 1; i < 1000; i++ {
-				require.Equal(t, fmt.Sprintf("%s%d", prefix, i), reserved.nextUnusedVar())
-			}
-		})
-	}
-}
diff --git a/go/vt/sqlparser/bind_var_needs.go b/go/vt/sqlparser/bind_var_needs.go
index 1b26919ca03..64e5c528e97 100644
--- a/go/vt/sqlparser/bind_var_needs.go
+++ b/go/vt/sqlparser/bind_var_needs.go
@@ -22,14 +22,7 @@ type BindVarNeeds struct {
 	NeedSystemVariable,
 	// NeedUserDefinedVariables keeps track of all user defined variables a query is using
 	NeedUserDefinedVariables []string
-	otherRewrites bool
-}
-
-// MergeWith adds bind vars needs coming from sub scopes
-func (bvn *BindVarNeeds) MergeWith(other *BindVarNeeds) {
-	bvn.NeedFunctionResult = append(bvn.NeedFunctionResult, other.NeedFunctionResult...)
-	bvn.NeedSystemVariable = append(bvn.NeedSystemVariable, other.NeedSystemVariable...)
-	bvn.NeedUserDefinedVariables = append(bvn.NeedUserDefinedVariables, other.NeedUserDefinedVariables...)
+	otherRewrites int
 }
 
 // AddFuncResult adds a function bindvar need
@@ -58,14 +51,11 @@ func (bvn *BindVarNeeds) NeedsSysVar(name string) bool {
 }
 
 func (bvn *BindVarNeeds) NoteRewrite() {
-	bvn.otherRewrites = true
+	bvn.otherRewrites++
 }
 
-func (bvn *BindVarNeeds) HasRewrites() bool {
-	return bvn.otherRewrites ||
-		len(bvn.NeedFunctionResult) > 0 ||
-		len(bvn.NeedUserDefinedVariables) > 0 ||
-		len(bvn.NeedSystemVariable) > 0
+func (bvn *BindVarNeeds) NumberOfRewrites() int {
+	return len(bvn.NeedFunctionResult) + len(bvn.NeedUserDefinedVariables) + len(bvn.NeedSystemVariable) + bvn.otherRewrites
 }
 
 func contains(strings []string, name string) bool {
diff --git a/go/vt/sqlparser/normalizer.go b/go/vt/sqlparser/normalizer.go
index 02cb11e2a97..fb3813b7019 100644
--- a/go/vt/sqlparser/normalizer.go
+++ b/go/vt/sqlparser/normalizer.go
@@ -18,107 +18,277 @@ package sqlparser
 
 import (
 	"bytes"
+	"fmt"
+	"strconv"
+	"strings"
 
 	"vitess.io/vitess/go/mysql/datetime"
 	"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/sysvars"
 	"vitess.io/vitess/go/vt/vterrors"
+)
 
-	querypb "vitess.io/vitess/go/vt/proto/query"
+type (
+	// BindVars represents a set of reserved bind variables extracted from a SQL statement.
+	BindVars map[string]struct{}
+	// normalizer transforms SQL statements to support parameterization and streamline query planning.
+	//
+	// It serves two primary purposes:
+	//  1. **Parameterization:** Allows multiple invocations of the same query with different literals by converting literals
+	//     to bind variables. This enables efficient reuse of execution plans with varying parameters.
+	//  2. **Simplified Planning:** Reduces the complexity for the query planner by standardizing SQL patterns. For example,
+	//     it ensures that table columns are consistently placed on the left side of comparison expressions. This uniformity
+	//     minimizes the number of distinct patterns the planner must handle, enhancing planning efficiency.
+	normalizer struct {
+		bindVars  map[string]*querypb.BindVariable
+		reserved  *ReservedVars
+		vals      map[Literal]string
+		err       error
+		inDerived int
+		inSelect  int
+
+		bindVarNeeds              *BindVarNeeds
+		shouldRewriteDatabaseFunc bool
+		hasStarInSelect           bool
+
+		keyspace      string
+		selectLimit   int
+		setVarComment string
+		fkChecksState *bool
+		sysVars       map[string]string
+		views         VSchemaViews
+
+		onLeave      map[*AliasedExpr]func(*AliasedExpr)
+		parameterize bool
+	}
+	// RewriteASTResult holds the result of rewriting the AST, including bind variable needs.
+	RewriteASTResult struct {
+		*BindVarNeeds
+		AST Statement // The rewritten AST
+	}
+	// VSchemaViews provides access to view definitions within the VSchema.
+	VSchemaViews interface {
+		FindView(name TableName) TableStatement
+	}
 )
 
-// BindVars is a set of reserved bind variables from a SQL statement
-type BindVars map[string]struct{}
+const (
+	// SQLSelectLimitUnset indicates that sql_select_limit is not set.
+	SQLSelectLimitUnset = -1
+	// LastInsertIDName is the bind variable name for LAST_INSERT_ID().
+	LastInsertIDName = "__lastInsertId"
+	// DBVarName is the bind variable name for DATABASE().
+	DBVarName = "__vtdbname"
+	// FoundRowsName is the bind variable name for FOUND_ROWS().
+	FoundRowsName = "__vtfrows"
+	// RowCountName is the bind variable name for ROW_COUNT().
+	RowCountName = "__vtrcount"
+	// UserDefinedVariableName is the prefix for user-defined variable bind names.
+	UserDefinedVariableName = "__vtudv"
+)
 
-// Normalize changes the statement to use bind values, and
-// updates the bind vars to those values. The supplied prefix
-// is used to generate the bind var names. The function ensures
-// that there are no collisions with existing bind vars.
-// Within Select constructs, bind vars are deduped. This allows
-// us to identify vindex equality. Otherwise, every value is
-// treated as distinct.
-func Normalize(stmt Statement, reserved *ReservedVars, bindVars map[string]*querypb.BindVariable) error {
-	nz := newNormalizer(reserved, bindVars)
-	_ = SafeRewrite(stmt, nz.walkStatementDown, nz.walkStatementUp)
-	return nz.err
+// funcRewrites lists all functions that must be rewritten. we don't want these to make it down to mysql,
+// we need to handle these in the vtgate
+var funcRewrites = map[string]string{
+	"last_insert_id": LastInsertIDName,
+	"database":       DBVarName,
+	"schema":         DBVarName,
+	"found_rows":     FoundRowsName,
+	"row_count":      RowCountName,
 }
 
-type normalizer struct {
-	bindVars  map[string]*querypb.BindVariable
-	reserved  *ReservedVars
-	vals      map[Literal]string
-	err       error
-	inDerived int
-	inSelect  int
-}
+// PrepareAST normalizes the input SQL statement and returns the rewritten AST along with bind variable information.
+func PrepareAST(
+	in Statement,
+	reservedVars *ReservedVars,
+	bindVars map[string]*querypb.BindVariable,
+	parameterize bool,
+	keyspace string,
+	selectLimit int,
+	setVarComment string,
+	sysVars map[string]string,
+	fkChecksState *bool,
+	views VSchemaViews,
+) (*RewriteASTResult, error) {
+	nz := newNormalizer(reservedVars, bindVars, keyspace, selectLimit, setVarComment, sysVars, fkChecksState, views, parameterize)
+	nz.shouldRewriteDatabaseFunc = shouldRewriteDatabaseFunc(in)
+	out := SafeRewrite(in, nz.walkDown, nz.walkUp)
+	if nz.err != nil {
+		return nil, nz.err
+	}
 
-func newNormalizer(reserved *ReservedVars, bindVars map[string]*querypb.BindVariable) *normalizer {
-	return &normalizer{
-		bindVars: bindVars,
-		reserved: reserved,
-		vals:     make(map[Literal]string),
+	r := &RewriteASTResult{
+		AST:          out.(Statement),
+		BindVarNeeds: nz.bindVarNeeds,
 	}
+	return r, nil
 }
 
-// walkStatementUp is one half of the top level walk function.
-func (nz *normalizer) walkStatementUp(cursor *Cursor) bool {
-	if nz.err != nil {
-		return false
-	}
-	switch node := cursor.node.(type) {
-	case *DerivedTable:
-		nz.inDerived--
-	case *Select:
-		nz.inSelect--
-	case *Literal:
-		if nz.inSelect == 0 {
-			nz.convertLiteral(node, cursor)
-			return nz.err == nil
-		}
-		parent := cursor.Parent()
-		switch parent.(type) {
-		case *Order, *GroupBy:
-			return true
-		case *Limit:
-			nz.convertLiteral(node, cursor)
-		default:
-			nz.convertLiteralDedup(node, cursor)
-		}
+func newNormalizer(
+	reserved *ReservedVars,
+	bindVars map[string]*querypb.BindVariable,
+	keyspace string,
+	selectLimit int,
+	setVarComment string,
+	sysVars map[string]string,
+	fkChecksState *bool,
+	views VSchemaViews,
+	parameterize bool,
+) *normalizer {
+	return &normalizer{
+		bindVars:      bindVars,
+		reserved:      reserved,
+		vals:          make(map[Literal]string),
+		bindVarNeeds:  &BindVarNeeds{},
+		keyspace:      keyspace,
+		selectLimit:   selectLimit,
+		setVarComment: setVarComment,
+		fkChecksState: fkChecksState,
+		sysVars:       sysVars,
+		views:         views,
+		onLeave:       make(map[*AliasedExpr]func(*AliasedExpr)),
+		parameterize:  parameterize,
 	}
-	return nz.err == nil // only continue if we haven't found any errors
 }
 
-// walkStatementDown is the top level walk function.
-// If it encounters a Select, it switches to a mode
-// where variables are deduped.
-func (nz *normalizer) walkStatementDown(node, _ SQLNode) bool {
+// walkDown processes nodes when traversing down the AST.
+// It handles normalization logic based on node types.
+func (nz *normalizer) walkDown(node, _ SQLNode) bool {
 	switch node := node.(type) {
-	// no need to normalize the statement types
-	case *Set, *Show, *Begin, *Commit, *Rollback, *Savepoint, DDLStatement, *SRollback, *Release, *OtherAdmin, *Analyze:
+	case *Begin, *Commit, *Rollback, *Savepoint, *SRollback, *Release, *OtherAdmin, *Analyze, *AssignmentExpr,
+		*PrepareStmt, *ExecuteStmt, *FramePoint, *ColName, TableName, *ConvertType:
+		// These statement don't need normalizing
 		return false
+	case *Set:
+		// Disable parameterization within SET statements.
+		nz.parameterize = false
 	case *DerivedTable:
 		nz.inDerived++
 	case *Select:
 		nz.inSelect++
-	case SelectExprs:
-		return nz.inDerived == 0
+		if nz.selectLimit > 0 && node.Limit == nil {
+			node.Limit = &Limit{Rowcount: NewIntLiteral(strconv.Itoa(nz.selectLimit))}
+		}
+	case *AliasedExpr:
+		nz.noteAliasedExprName(node)
 	case *ComparisonExpr:
 		nz.convertComparison(node)
 	case *UpdateExpr:
 		nz.convertUpdateExpr(node)
-	case *ColName, TableName:
-		// Common node types that never contain Literal or ListArgs but create a lot of object
-		// allocations.
-		return false
-	case *ConvertType: // we should not rewrite the type description
+	case *StarExpr:
+		nz.hasStarInSelect = true
+		// No rewriting needed for prepare or execute statements.
 		return false
-	case *FramePoint:
-		// do not make a bind var for rows and range
+	case *ShowBasic:
+		if node.Command != VariableGlobal && node.Command != VariableSession {
+			break
+		}
+		varsToAdd := sysvars.GetInterestingVariables()
+		for _, sysVar := range varsToAdd {
+			nz.bindVarNeeds.AddSysVar(sysVar)
+		}
+	}
+	b := nz.err == nil
+	if !b {
+		fmt.Println(1)
+	}
+	return b
+}
+
+// noteAliasedExprName tracks expressions without aliases to add alias if expression is rewritten
+func (nz *normalizer) noteAliasedExprName(node *AliasedExpr) {
+	if node.As.NotEmpty() {
+		return
+	}
+	buf := NewTrackedBuffer(nil)
+	node.Expr.Format(buf)
+	rewrites := nz.bindVarNeeds.NumberOfRewrites()
+	nz.onLeave[node] = func(newAliasedExpr *AliasedExpr) {
+		if nz.bindVarNeeds.NumberOfRewrites() > rewrites {
+			newAliasedExpr.As = NewIdentifierCI(buf.String())
+		}
+	}
+}
+
+// walkUp processes nodes when traversing up the AST.
+// It finalizes normalization logic based on node types.
+func (nz *normalizer) walkUp(cursor *Cursor) bool {
+	// Add SET_VAR comments if applicable.
+	if supportOptimizerHint, supports := cursor.Node().(SupportOptimizerHint); supports {
+		if nz.setVarComment != "" {
+			newComments, err := supportOptimizerHint.GetParsedComments().AddQueryHint(nz.setVarComment)
+			if err != nil {
+				nz.err = err
+				return false
+			}
+			supportOptimizerHint.SetComments(newComments)
+		}
+		if nz.fkChecksState != nil {
+			newComments := supportOptimizerHint.GetParsedComments().SetMySQLSetVarValue(sysvars.ForeignKeyChecks, FkChecksStateString(nz.fkChecksState))
+			supportOptimizerHint.SetComments(newComments)
+		}
+	}
+
+	if nz.err != nil {
 		return false
 	}
-	return nz.err == nil // only continue if we haven't found any errors
+
+	switch node := cursor.node.(type) {
+	case *DerivedTable:
+		nz.inDerived--
+	case *Select:
+		nz.inSelect--
+	case *AliasedExpr:
+		// if we are tracking this node for changes, this is the time to add the alias if needed
+		if onLeave, ok := nz.onLeave[node]; ok {
+			onLeave(node)
+			delete(nz.onLeave, node)
+		}
+	case *Union:
+		nz.rewriteUnion(node)
+	case *FuncExpr:
+		nz.funcRewrite(cursor, node)
+	case *Variable:
+		nz.rewriteVariable(cursor, node)
+	case *Subquery:
+		nz.unnestSubQueries(cursor, node)
+	case *NotExpr:
+		nz.rewriteNotExpr(cursor, node)
+	case *AliasedTableExpr:
+		nz.rewriteAliasedTable(cursor, node)
+	case *ShowBasic:
+		nz.rewriteShowBasic(node)
+	case *ExistsExpr:
+		nz.existsRewrite(cursor, node)
+	case DistinctableAggr:
+		nz.rewriteDistinctableAggr(node)
+	case *Literal:
+		nz.visitLiteral(cursor, node)
+	}
+	return nz.err == nil
 }
 
+func (nz *normalizer) visitLiteral(cursor *Cursor, node *Literal) {
+	if !nz.shouldParameterize() {
+		return
+	}
+	if nz.inSelect == 0 {
+		nz.convertLiteral(node, cursor)
+		return
+	}
+	switch cursor.Parent().(type) {
+	case *Order, *GroupBy:
+		return
+	case *Limit:
+		nz.convertLiteral(node, cursor)
+	default:
+		nz.convertLiteralDedup(node, cursor)
+	}
+}
+
+// validateLiteral ensures that a Literal node has a valid value based on its type.
 func validateLiteral(node *Literal) error {
 	switch node.Type {
 	case DateVal:
@@ -137,37 +307,31 @@ func validateLiteral(node *Literal) error {
 	return nil
 }
 
+// convertLiteralDedup converts a Literal node to a bind variable with deduplication.
 func (nz *normalizer) convertLiteralDedup(node *Literal, cursor *Cursor) {
-	err := validateLiteral(node)
-	if err != nil {
+	if err := validateLiteral(node); err != nil {
 		nz.err = err
+		return
 	}
 
-	// If value is too long, don't dedup.
-	// Such values are most likely not for vindexes.
-	// We save a lot of CPU because we avoid building
-	// the key for them.
+	// Skip deduplication for long values.
 	if len(node.Val) > 256 {
 		nz.convertLiteral(node, cursor)
 		return
 	}
 
-	// Make the bindvar
-	bval := SQLToBindvar(node)
+	bval := literalToBindvar(node)
 	if bval == nil {
 		return
 	}
 
-	// Check if there's a bindvar for that value already.
-	bvname, ok := nz.vals[*node]
-	if !ok {
-		// If there's no such bindvar, make a new one.
+	bvname, exists := nz.vals[*node]
+	if !exists {
 		bvname = nz.reserved.nextUnusedVar()
 		nz.vals[*node] = bvname
 		nz.bindVars[bvname] = bval
 	}
 
-	// Modify the AST node to a bindvar.
 	arg, err := NewTypedArgumentFromLiteral(bvname, node)
 	if err != nil {
 		nz.err = err
@@ -176,14 +340,14 @@ func (nz *normalizer) convertLiteralDedup(node *Literal, cursor *Cursor) {
 	cursor.Replace(arg)
 }
 
-// convertLiteral converts an Literal without the dedup.
+// convertLiteral converts a Literal node to a bind variable without deduplication.
 func (nz *normalizer) convertLiteral(node *Literal, cursor *Cursor) {
-	err := validateLiteral(node)
-	if err != nil {
+	if err := validateLiteral(node); err != nil {
 		nz.err = err
+		return
 	}
 
-	bval := SQLToBindvar(node)
+	bval := literalToBindvar(node)
 	if bval == nil {
 		return
 	}
@@ -198,11 +362,7 @@ func (nz *normalizer) convertLiteral(node *Literal, cursor *Cursor) {
 	cursor.Replace(arg)
 }
 
-// convertComparison attempts to convert IN clauses to
-// use the list bind var construct. If it fails, it returns
-// with no change made. The walk function will then continue
-// and iterate on converting each individual value into separate
-// bind vars.
+// convertComparison handles the conversion of comparison expressions to use bind variables.
 func (nz *normalizer) convertComparison(node *ComparisonExpr) {
 	switch node.Operator {
 	case InOp, NotInOp:
@@ -212,14 +372,19 @@ func (nz *normalizer) convertComparison(node *ComparisonExpr) {
 	}
 }
 
+// rewriteOtherComparisons parameterizes non-IN comparison expressions.
 func (nz *normalizer) rewriteOtherComparisons(node *ComparisonExpr) {
-	newR := nz.parameterize(node.Left, node.Right)
+	newR := nz.normalizeComparisonWithBindVar(node.Left, node.Right)
 	if newR != nil {
 		node.Right = newR
 	}
 }
 
-func (nz *normalizer) parameterize(left, right Expr) Expr {
+// normalizeComparisonWithBindVar attempts to replace a literal in a comparison with a bind variable.
+func (nz *normalizer) normalizeComparisonWithBindVar(left, right Expr) Expr {
+	if !nz.shouldParameterize() {
+		return nil
+	}
 	col, ok := left.(*ColName)
 	if !ok {
 		return nil
@@ -228,13 +393,12 @@ func (nz *normalizer) parameterize(left, right Expr) Expr {
 	if !ok {
 		return nil
 	}
-	err := validateLiteral(lit)
-	if err != nil {
+	if err := validateLiteral(lit); err != nil {
 		nz.err = err
 		return nil
 	}
 
-	bval := SQLToBindvar(lit)
+	bval := literalToBindvar(lit)
 	if bval == nil {
 		return nil
 	}
@@ -247,18 +411,14 @@ func (nz *normalizer) parameterize(left, right Expr) Expr {
 	return arg
 }
 
+// decideBindVarName determines the appropriate bind variable name for a given literal and column.
 func (nz *normalizer) decideBindVarName(lit *Literal, col *ColName, bval *querypb.BindVariable) string {
 	if len(lit.Val) <= 256 {
-		// first we check if we already have a bindvar for this value. if we do, we re-use that bindvar name
-		bvname, ok := nz.vals[*lit]
-		if ok {
+		if bvname, ok := nz.vals[*lit]; ok {
 			return bvname
 		}
 	}
 
-	// If there's no such bindvar, or we have a big value, make a new one.
-	// Big values are most likely not for vindexes.
-	// We save a lot of CPU because we avoid building
 	bvname := nz.reserved.ReserveColName(col)
 	nz.vals[*lit] = bvname
 	nz.bindVars[bvname] = bval
@@ -266,19 +426,22 @@ func (nz *normalizer) decideBindVarName(lit *Literal, col *ColName, bval *queryp
 	return bvname
 }
 
+// rewriteInComparisons converts IN and NOT IN expressions to use list bind variables.
 func (nz *normalizer) rewriteInComparisons(node *ComparisonExpr) {
+	if !nz.shouldParameterize() {
+		return
+	}
 	tupleVals, ok := node.Right.(ValTuple)
 	if !ok {
 		return
 	}
 
-	// The RHS is a tuple of values.
-	// Make a list bindvar.
+	// Create a list bind variable for the tuple.
 	bvals := &querypb.BindVariable{
 		Type: querypb.Type_TUPLE,
 	}
 	for _, val := range tupleVals {
-		bval := SQLToBindvar(val)
+		bval := literalToBindvar(val)
 		if bval == nil {
 			return
 		}
@@ -289,76 +452,74 @@ func (nz *normalizer) rewriteInComparisons(node *ComparisonExpr) {
 	}
 	bvname := nz.reserved.nextUnusedVar()
 	nz.bindVars[bvname] = bvals
-	// Modify RHS to be a list bindvar.
 	node.Right = ListArg(bvname)
 }
 
+// convertUpdateExpr parameterizes expressions in UPDATE statements.
 func (nz *normalizer) convertUpdateExpr(node *UpdateExpr) {
-	newR := nz.parameterize(node.Name, node.Expr)
+	newR := nz.normalizeComparisonWithBindVar(node.Name, node.Expr)
 	if newR != nil {
 		node.Expr = newR
 	}
 }
 
-func SQLToBindvar(node SQLNode) *querypb.BindVariable {
-	if node, ok := node.(*Literal); ok {
-		var v sqltypes.Value
-		var err error
-		switch node.Type {
-		case StrVal:
-			v, err = sqltypes.NewValue(sqltypes.VarChar, node.Bytes())
-		case IntVal:
-			v, err = sqltypes.NewValue(sqltypes.Int64, node.Bytes())
-		case FloatVal:
-			v, err = sqltypes.NewValue(sqltypes.Float64, node.Bytes())
-		case DecimalVal:
-			v, err = sqltypes.NewValue(sqltypes.Decimal, node.Bytes())
-		case HexNum:
-			buf := make([]byte, 0, len(node.Bytes()))
-			buf = append(buf, "0x"...)
-			buf = append(buf, bytes.ToUpper(node.Bytes()[2:])...)
-			v, err = sqltypes.NewValue(sqltypes.HexNum, buf)
-		case HexVal:
-			// We parse the `x'7b7d'` string literal into a hex encoded string of `7b7d` in the parser
-			// We need to re-encode it back to the original MySQL query format before passing it on as a bindvar value to MySQL
-			buf := make([]byte, 0, len(node.Bytes())+3)
-			buf = append(buf, 'x', '\'')
-			buf = append(buf, bytes.ToUpper(node.Bytes())...)
-			buf = append(buf, '\'')
-			v, err = sqltypes.NewValue(sqltypes.HexVal, buf)
-		case BitNum:
-			out := make([]byte, 0, len(node.Bytes())+2)
-			out = append(out, '0', 'b')
-			out = append(out, node.Bytes()[2:]...)
-			v, err = sqltypes.NewValue(sqltypes.BitNum, out)
-		case DateVal:
-			v, err = sqltypes.NewValue(sqltypes.Date, node.Bytes())
-		case TimeVal:
-			v, err = sqltypes.NewValue(sqltypes.Time, node.Bytes())
-		case TimestampVal:
-			// This is actually a DATETIME MySQL type. The timestamp literal
-			// syntax is part of the SQL standard and MySQL DATETIME matches
-			// the type best.
-			v, err = sqltypes.NewValue(sqltypes.Datetime, node.Bytes())
-		default:
-			return nil
-		}
-		if err != nil {
-			return nil
-		}
-		return sqltypes.ValueBindVariable(v)
+// literalToBindvar converts a SQLNode to a BindVariable if possible.
+func literalToBindvar(node SQLNode) *querypb.BindVariable {
+	lit, ok := node.(*Literal)
+	if !ok {
+		return nil
 	}
-	return nil
+	var v sqltypes.Value
+	var err error
+	switch lit.Type {
+	case StrVal:
+		v, err = sqltypes.NewValue(sqltypes.VarChar, lit.Bytes())
+	case IntVal:
+		v, err = sqltypes.NewValue(sqltypes.Int64, lit.Bytes())
+	case FloatVal:
+		v, err = sqltypes.NewValue(sqltypes.Float64, lit.Bytes())
+	case DecimalVal:
+		v, err = sqltypes.NewValue(sqltypes.Decimal, lit.Bytes())
+	case HexNum:
+		buf := make([]byte, 0, len(lit.Bytes()))
+		buf = append(buf, "0x"...)
+		buf = append(buf, bytes.ToUpper(lit.Bytes()[2:])...)
+		v, err = sqltypes.NewValue(sqltypes.HexNum, buf)
+	case HexVal:
+		// Re-encode hex string literals to original MySQL format.
+		buf := make([]byte, 0, len(lit.Bytes())+3)
+		buf = append(buf, 'x', '\'')
+		buf = append(buf, bytes.ToUpper(lit.Bytes())...)
+		buf = append(buf, '\'')
+		v, err = sqltypes.NewValue(sqltypes.HexVal, buf)
+	case BitNum:
+		out := make([]byte, 0, len(lit.Bytes())+2)
+		out = append(out, '0', 'b')
+		out = append(out, lit.Bytes()[2:]...)
+		v, err = sqltypes.NewValue(sqltypes.BitNum, out)
+	case DateVal:
+		v, err = sqltypes.NewValue(sqltypes.Date, lit.Bytes())
+	case TimeVal:
+		v, err = sqltypes.NewValue(sqltypes.Time, lit.Bytes())
+	case TimestampVal:
+		// Use DATETIME type for TIMESTAMP literals.
+		v, err = sqltypes.NewValue(sqltypes.Datetime, lit.Bytes())
+	default:
+		return nil
+	}
+	if err != nil {
+		return nil
+	}
+	return sqltypes.ValueBindVariable(v)
 }
 
-// GetBindvars returns a map of the bind vars referenced in the statement.
-func GetBindvars(stmt Statement) map[string]struct{} {
+// getBindvars extracts bind variables from a SQL statement.
+func getBindvars(stmt Statement) map[string]struct{} {
 	bindvars := make(map[string]struct{})
 	_ = Walk(func(node SQLNode) (kontinue bool, err error) {
 		switch node := node.(type) {
 		case *ColName, TableName:
-			// Common node types that never contain expressions but create a lot of object
-			// allocations.
+			// These node types do not contain expressions.
 			return false, nil
 		case *Argument:
 			bindvars[node.Name] = struct{}{}
@@ -369,3 +530,312 @@ func GetBindvars(stmt Statement) map[string]struct{} {
 	}, stmt)
 	return bindvars
 }
+
+var HasValueSubQueryBaseName = []byte("__sq_has_values")
+
+// shouldRewriteDatabaseFunc determines if the database function should be rewritten based on the statement.
+func shouldRewriteDatabaseFunc(in Statement) bool {
+	selct, ok := in.(*Select)
+	if !ok {
+		return false
+	}
+	if len(selct.From) != 1 {
+		return false
+	}
+	aliasedTable, ok := selct.From[0].(*AliasedTableExpr)
+	if !ok {
+		return false
+	}
+	tableName, ok := aliasedTable.Expr.(TableName)
+	if !ok {
+		return false
+	}
+	return tableName.Name.String() == "dual"
+}
+
+// rewriteUnion sets the SELECT limit for UNION statements if not already set.
+func (nz *normalizer) rewriteUnion(node *Union) {
+	if nz.selectLimit > 0 && node.Limit == nil {
+		node.Limit = &Limit{Rowcount: NewIntLiteral(strconv.Itoa(nz.selectLimit))}
+	}
+}
+
+// rewriteAliasedTable handles the rewriting of aliased tables, including view substitutions.
+func (nz *normalizer) rewriteAliasedTable(cursor *Cursor, node *AliasedTableExpr) {
+	aliasTableName, ok := node.Expr.(TableName)
+	if !ok {
+		return
+	}
+
+	// Do not add qualifiers to the dual table.
+	tblName := aliasTableName.Name.String()
+	if tblName == "dual" {
+		return
+	}
+
+	if SystemSchema(nz.keyspace) {
+		if aliasTableName.Qualifier.IsEmpty() {
+			aliasTableName.Qualifier = NewIdentifierCS(nz.keyspace)
+			node.Expr = aliasTableName
+			cursor.Replace(node)
+		}
+		return
+	}
+
+	// Replace views with their underlying definitions.
+	if nz.views == nil {
+		return
+	}
+	view := nz.views.FindView(aliasTableName)
+	if view == nil {
+		return
+	}
+
+	// Substitute the view with a derived table.
+	node.Expr = &DerivedTable{Select: Clone(view)}
+	if node.As.IsEmpty() {
+		node.As = NewIdentifierCS(tblName)
+	}
+}
+
+// rewriteShowBasic handles the rewriting of SHOW statements, particularly for system variables.
+func (nz *normalizer) rewriteShowBasic(node *ShowBasic) {
+	if node.Command == VariableGlobal || node.Command == VariableSession {
+		varsToAdd := sysvars.GetInterestingVariables()
+		for _, sysVar := range varsToAdd {
+			nz.bindVarNeeds.AddSysVar(sysVar)
+		}
+	}
+}
+
+// rewriteNotExpr simplifies NOT expressions where possible.
+func (nz *normalizer) rewriteNotExpr(cursor *Cursor, node *NotExpr) {
+	switch inner := node.Expr.(type) {
+	case *ComparisonExpr:
+		// Invert comparison operators.
+		if canChange, inverse := inverseOp(inner.Operator); canChange {
+			inner.Operator = inverse
+			cursor.Replace(inner)
+		}
+	case *NotExpr:
+		// Simplify double negation.
+		cursor.Replace(inner.Expr)
+	case BoolVal:
+		// Negate boolean values.
+		cursor.Replace(!inner)
+	}
+}
+
+// rewriteVariable handles the rewriting of variable expressions to bind variables.
+func (nz *normalizer) rewriteVariable(cursor *Cursor, node *Variable) {
+	// Do not rewrite variables on the left side of SET assignments.
+	if v, isSet := cursor.Parent().(*SetExpr); isSet && v.Var == node {
+		return
+	}
+	switch node.Scope {
+	case VariableScope:
+		nz.udvRewrite(cursor, node)
+	case SessionScope, NextTxScope:
+		nz.sysVarRewrite(cursor, node)
+	}
+}
+
+// inverseOp returns the inverse operator for a given comparison operator.
+func inverseOp(i ComparisonExprOperator) (bool, ComparisonExprOperator) {
+	switch i {
+	case EqualOp:
+		return true, NotEqualOp
+	case LessThanOp:
+		return true, GreaterEqualOp
+	case GreaterThanOp:
+		return true, LessEqualOp
+	case LessEqualOp:
+		return true, GreaterThanOp
+	case GreaterEqualOp:
+		return true, LessThanOp
+	case NotEqualOp:
+		return true, EqualOp
+	case InOp:
+		return true, NotInOp
+	case NotInOp:
+		return true, InOp
+	case LikeOp:
+		return true, NotLikeOp
+	case NotLikeOp:
+		return true, LikeOp
+	case RegexpOp:
+		return true, NotRegexpOp
+	case NotRegexpOp:
+		return true, RegexpOp
+	}
+	return false, i
+}
+
+// sysVarRewrite replaces system variables with corresponding bind variables.
+func (nz *normalizer) sysVarRewrite(cursor *Cursor, node *Variable) {
+	lowered := node.Name.Lowered()
+
+	var found bool
+	if nz.sysVars != nil {
+		_, found = nz.sysVars[lowered]
+	}
+
+	switch lowered {
+	case sysvars.Autocommit.Name,
+		sysvars.Charset.Name,
+		sysvars.ClientFoundRows.Name,
+		sysvars.DDLStrategy.Name,
+		sysvars.MigrationContext.Name,
+		sysvars.Names.Name,
+		sysvars.TransactionMode.Name,
+		sysvars.ReadAfterWriteGTID.Name,
+		sysvars.ReadAfterWriteTimeOut.Name,
+		sysvars.SessionEnableSystemSettings.Name,
+		sysvars.SessionTrackGTIDs.Name,
+		sysvars.SessionUUID.Name,
+		sysvars.SkipQueryPlanCache.Name,
+		sysvars.Socket.Name,
+		sysvars.SQLSelectLimit.Name,
+		sysvars.Version.Name,
+		sysvars.VersionComment.Name,
+		sysvars.QueryTimeout.Name,
+		sysvars.Workload.Name:
+		found = true
+	}
+
+	if found {
+		cursor.Replace(NewArgument("__vt" + lowered))
+		nz.bindVarNeeds.AddSysVar(lowered)
+	}
+}
+
+// udvRewrite replaces user-defined variables with corresponding bind variables.
+func (nz *normalizer) udvRewrite(cursor *Cursor, node *Variable) {
+	udv := strings.ToLower(node.Name.CompliantName())
+	cursor.Replace(NewArgument(UserDefinedVariableName + udv))
+	nz.bindVarNeeds.AddUserDefVar(udv)
+}
+
+// funcRewrite replaces certain function expressions with bind variables.
+func (nz *normalizer) funcRewrite(cursor *Cursor, node *FuncExpr) {
+	lowered := node.Name.Lowered()
+	if lowered == "last_insert_id" && len(node.Exprs) > 0 {
+		// Do not rewrite LAST_INSERT_ID() when it has arguments.
+		return
+	}
+	bindVar, found := funcRewrites[lowered]
+	if !found || (bindVar == DBVarName && !nz.shouldRewriteDatabaseFunc) {
+		return
+	}
+	if len(node.Exprs) > 0 {
+		nz.err = vterrors.Errorf(vtrpcpb.Code_UNIMPLEMENTED, "Argument to %s() not supported", lowered)
+		return
+	}
+	cursor.Replace(NewArgument(bindVar))
+	nz.bindVarNeeds.AddFuncResult(bindVar)
+}
+
+// unnestSubQueries attempts to simplify dual subqueries where possible.
+// select (select database() from dual) from test
+// =>
+// select database() from test
+func (nz *normalizer) unnestSubQueries(cursor *Cursor, subquery *Subquery) {
+	if _, isExists := cursor.Parent().(*ExistsExpr); isExists {
+		return
+	}
+	sel, isSimpleSelect := subquery.Select.(*Select)
+	if !isSimpleSelect {
+		return
+	}
+
+	if len(sel.SelectExprs) != 1 ||
+		len(sel.OrderBy) != 0 ||
+		sel.GroupBy != nil ||
+		len(sel.From) != 1 ||
+		sel.Where != nil ||
+		sel.Having != nil ||
+		sel.Limit != nil || sel.Lock != NoLock {
+		return
+	}
+
+	aliasedTable, ok := sel.From[0].(*AliasedTableExpr)
+	if !ok {
+		return
+	}
+	table, ok := aliasedTable.Expr.(TableName)
+	if !ok || table.Name.String() != "dual" {
+		return
+	}
+	expr, ok := sel.SelectExprs[0].(*AliasedExpr)
+	if !ok {
+		return
+	}
+	_, isColName := expr.Expr.(*ColName)
+	if isColName {
+		// Skip if the subquery already returns a column name.
+		return
+	}
+	nz.bindVarNeeds.NoteRewrite()
+	rewritten := SafeRewrite(expr.Expr, nz.walkDown, nz.walkUp)
+
+	// Handle special cases for IN clauses.
+	rewrittenExpr, isExpr := rewritten.(Expr)
+	_, isColTuple := rewritten.(ColTuple)
+	comparisonExpr, isCompExpr := cursor.Parent().(*ComparisonExpr)
+	if isCompExpr && (comparisonExpr.Operator == InOp || comparisonExpr.Operator == NotInOp) && !isColTuple && isExpr {
+		cursor.Replace(ValTuple{rewrittenExpr})
+		return
+	}
+
+	cursor.Replace(rewritten)
+}
+
+// existsRewrite optimizes EXISTS expressions where possible.
+func (nz *normalizer) existsRewrite(cursor *Cursor, node *ExistsExpr) {
+	sel, ok := node.Subquery.Select.(*Select)
+	if !ok {
+		return
+	}
+
+	if sel.Having != nil {
+		// Cannot optimize if HAVING clause is present.
+		return
+	}
+
+	if sel.GroupBy == nil && sel.SelectExprs.AllAggregation() {
+		// Replace EXISTS with a boolean true if guaranteed to be non-empty.
+		cursor.Replace(BoolVal(true))
+		return
+	}
+
+	// Simplify the subquery by selecting a constant.
+	// WHERE EXISTS(SELECT 1 FROM ...)
+	sel.SelectExprs = SelectExprs{
+		&AliasedExpr{Expr: NewIntLiteral("1")},
+	}
+	sel.GroupBy = nil
+}
+
+// rewriteDistinctableAggr removes DISTINCT from certain aggregations to simplify the plan.
+func (nz *normalizer) rewriteDistinctableAggr(node DistinctableAggr) {
+	if !node.IsDistinct() {
+		return
+	}
+	switch aggr := node.(type) {
+	case *Max, *Min:
+		aggr.SetDistinct(false)
+		nz.bindVarNeeds.NoteRewrite()
+	}
+}
+
+func (nz *normalizer) shouldParameterize() bool {
+	return !(nz.inDerived > 0 && len(nz.onLeave) > 0) && nz.parameterize
+}
+
+// SystemSchema checks if the given schema is a system schema.
+func SystemSchema(schema string) bool {
+	return strings.EqualFold(schema, "information_schema") ||
+		strings.EqualFold(schema, "performance_schema") ||
+		strings.EqualFold(schema, "sys") ||
+		strings.EqualFold(schema, "mysql")
+}
diff --git a/go/vt/sqlparser/normalizer_test.go b/go/vt/sqlparser/normalizer_test.go
index 7919a321c91..7c3e660ac9d 100644
--- a/go/vt/sqlparser/normalizer_test.go
+++ b/go/vt/sqlparser/normalizer_test.go
@@ -25,8 +25,9 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/stretchr/testify/assert"
+	"vitess.io/vitess/go/vt/sysvars"
 
+	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
 	"vitess.io/vitess/go/sqltypes"
@@ -448,10 +449,11 @@ func TestNormalize(t *testing.T) {
 		t.Run(tc.in, func(t *testing.T) {
 			stmt, err := parser.Parse(tc.in)
 			require.NoError(t, err)
-			known := GetBindvars(stmt)
+			known := getBindvars(stmt)
 			bv := make(map[string]*querypb.BindVariable)
-			require.NoError(t, Normalize(stmt, NewReservedVars(prefix, known), bv))
-			assert.Equal(t, tc.outstmt, String(stmt))
+			out, err := PrepareAST(stmt, NewReservedVars(prefix, known), bv, true, "ks", 0, "", map[string]string{}, nil, nil)
+			require.NoError(t, err)
+			assert.Equal(t, tc.outstmt, String(out.AST))
 			assert.Equal(t, tc.outbv, bv)
 		})
 	}
@@ -476,9 +478,10 @@ func TestNormalizeInvalidDates(t *testing.T) {
 		t.Run(tc.in, func(t *testing.T) {
 			stmt, err := parser.Parse(tc.in)
 			require.NoError(t, err)
-			known := GetBindvars(stmt)
+			known := getBindvars(stmt)
 			bv := make(map[string]*querypb.BindVariable)
-			require.EqualError(t, Normalize(stmt, NewReservedVars("bv", known), bv), tc.err.Error())
+			_, err = PrepareAST(stmt, NewReservedVars("bv", known), bv, true, "ks", 0, "", map[string]string{}, nil, nil)
+			require.EqualError(t, err, tc.err.Error())
 		})
 	}
 }
@@ -498,9 +501,10 @@ func TestNormalizeValidSQL(t *testing.T) {
 			}
 			bv := make(map[string]*querypb.BindVariable)
 			known := make(BindVars)
-			err = Normalize(tree, NewReservedVars("vtg", known), bv)
+
+			out, err := PrepareAST(tree, NewReservedVars("vtg", known), bv, true, "ks", 0, "", map[string]string{}, nil, nil)
 			require.NoError(t, err)
-			normalizerOutput := String(tree)
+			normalizerOutput := String(out.AST)
 			if normalizerOutput == "otheradmin" || normalizerOutput == "otherread" {
 				return
 			}
@@ -529,9 +533,9 @@ func TestNormalizeOneCasae(t *testing.T) {
 	}
 	bv := make(map[string]*querypb.BindVariable)
 	known := make(BindVars)
-	err = Normalize(tree, NewReservedVars("vtg", known), bv)
+	out, err := PrepareAST(tree, NewReservedVars("vtg", known), bv, true, "ks", 0, "", map[string]string{}, nil, nil)
 	require.NoError(t, err)
-	normalizerOutput := String(tree)
+	normalizerOutput := String(out.AST)
 	require.EqualValues(t, testOne.output, normalizerOutput)
 	if normalizerOutput == "otheradmin" || normalizerOutput == "otherread" {
 		return
@@ -546,7 +550,7 @@ func TestGetBindVars(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
-	got := GetBindvars(stmt)
+	got := getBindvars(stmt)
 	want := map[string]struct{}{
 		"v1": {},
 		"v2": {},
@@ -559,6 +563,586 @@ func TestGetBindVars(t *testing.T) {
 	}
 }
 
+type testCaseSetVar struct {
+	in, expected, setVarComment string
+}
+
+type testCaseSysVar struct {
+	in, expected string
+	sysVar       map[string]string
+}
+
+type myTestCase struct {
+	in, expected                                                                            string
+	liid, db, foundRows, rowCount, rawGTID, rawTimeout, sessTrackGTID                       bool
+	ddlStrategy, migrationContext, sessionUUID, sessionEnableSystemSettings                 bool
+	udv                                                                                     int
+	autocommit, foreignKeyChecks, clientFoundRows, skipQueryPlanCache, socket, queryTimeout bool
+	sqlSelectLimit, transactionMode, workload, version, versionComment                      bool
+}
+
+func TestRewrites(in *testing.T) {
+	tests := []myTestCase{{
+		in:       "SELECT 42",
+		expected: "SELECT 42",
+		// no bindvar needs
+	}, {
+		in:       "SELECT @@version",
+		expected: "SELECT :__vtversion as `@@version`",
+		version:  true,
+	}, {
+		in:           "SELECT @@query_timeout",
+		expected:     "SELECT :__vtquery_timeout as `@@query_timeout`",
+		queryTimeout: true,
+	}, {
+		in:             "SELECT @@version_comment",
+		expected:       "SELECT :__vtversion_comment as `@@version_comment`",
+		versionComment: true,
+	}, {
+		in:                          "SELECT @@enable_system_settings",
+		expected:                    "SELECT :__vtenable_system_settings as `@@enable_system_settings`",
+		sessionEnableSystemSettings: true,
+	}, {
+		in:       "SELECT last_insert_id()",
+		expected: "SELECT :__lastInsertId as `last_insert_id()`",
+		liid:     true,
+	}, {
+		in:       "SELECT database()",
+		expected: "SELECT :__vtdbname as `database()`",
+		db:       true,
+	}, {
+		in:       "SELECT database() from test",
+		expected: "SELECT database() from test",
+		// no bindvar needs
+	}, {
+		in:       "SELECT last_insert_id() as test",
+		expected: "SELECT :__lastInsertId as test",
+		liid:     true,
+	}, {
+		in:       "SELECT last_insert_id() + database()",
+		expected: "SELECT :__lastInsertId + :__vtdbname as `last_insert_id() + database()`",
+		db:       true, liid: true,
+	}, {
+		// unnest database() call
+		in:       "select (select database()) from test",
+		expected: "select database() as `(select database() from dual)` from test",
+		// no bindvar needs
+	}, {
+		// unnest database() call
+		in:       "select (select database() from dual) from test",
+		expected: "select database() as `(select database() from dual)` from test",
+		// no bindvar needs
+	}, {
+		in:       "select (select database() from dual) from dual",
+		expected: "select :__vtdbname as `(select database() from dual)` from dual",
+		db:       true,
+	}, {
+		// don't unnest solo columns
+		in:       "select 1 as foobar, (select foobar)",
+		expected: "select 1 as foobar, (select foobar from dual) from dual",
+	}, {
+		in:       "select id from user where database()",
+		expected: "select id from user where database()",
+		// no bindvar needs
+	}, {
+		in:       "select table_name from information_schema.tables where table_schema = database()",
+		expected: "select table_name from information_schema.tables where table_schema = database()",
+		// no bindvar needs
+	}, {
+		in:       "select schema()",
+		expected: "select :__vtdbname as `schema()`",
+		db:       true,
+	}, {
+		in:        "select found_rows()",
+		expected:  "select :__vtfrows as `found_rows()`",
+		foundRows: true,
+	}, {
+		in:       "select @`x y`",
+		expected: "select :__vtudvx_y as `@``x y``` from dual",
+		udv:      1,
+	}, {
+		in:       "select id from t where id = @x and val = @y",
+		expected: "select id from t where id = :__vtudvx and val = :__vtudvy",
+		db:       false, udv: 2,
+	}, {
+		in:       "insert into t(id) values(@xyx)",
+		expected: "insert into t(id) values(:__vtudvxyx)",
+		db:       false, udv: 1,
+	}, {
+		in:       "select row_count()",
+		expected: "select :__vtrcount as `row_count()`",
+		rowCount: true,
+	}, {
+		in:       "SELECT lower(database())",
+		expected: "SELECT lower(:__vtdbname) as `lower(database())`",
+		db:       true,
+	}, {
+		in:         "SELECT @@autocommit",
+		expected:   "SELECT :__vtautocommit as `@@autocommit`",
+		autocommit: true,
+	}, {
+		in:              "SELECT @@client_found_rows",
+		expected:        "SELECT :__vtclient_found_rows as `@@client_found_rows`",
+		clientFoundRows: true,
+	}, {
+		in:                 "SELECT @@skip_query_plan_cache",
+		expected:           "SELECT :__vtskip_query_plan_cache as `@@skip_query_plan_cache`",
+		skipQueryPlanCache: true,
+	}, {
+		in:             "SELECT @@sql_select_limit",
+		expected:       "SELECT :__vtsql_select_limit as `@@sql_select_limit`",
+		sqlSelectLimit: true,
+	}, {
+		in:              "SELECT @@transaction_mode",
+		expected:        "SELECT :__vttransaction_mode as `@@transaction_mode`",
+		transactionMode: true,
+	}, {
+		in:       "SELECT @@workload",
+		expected: "SELECT :__vtworkload as `@@workload`",
+		workload: true,
+	}, {
+		in:       "SELECT @@socket",
+		expected: "SELECT :__vtsocket as `@@socket`",
+		socket:   true,
+	}, {
+		in:       "select (select 42) from dual",
+		expected: "select 42 as `(select 42 from dual)` from dual",
+	}, {
+		in:       "select * from user where col = (select 42)",
+		expected: "select * from user where col = 42",
+	}, {
+		in:       "select * from (select 42) as t", // this is not an expression, and should not be rewritten
+		expected: "select * from (select 42) as t",
+	}, {
+		in:       `select (select (select (select (select (select last_insert_id()))))) as x`,
+		expected: "select :__lastInsertId as x from dual",
+		liid:     true,
+	}, {
+		in:       `select * from (select last_insert_id()) as t`,
+		expected: "select * from (select :__lastInsertId as `last_insert_id()` from dual) as t",
+		liid:     true,
+	}, {
+		in:          `select * from user where col = @@ddl_strategy`,
+		expected:    "select * from user where col = :__vtddl_strategy",
+		ddlStrategy: true,
+	}, {
+		in:               `select * from user where col = @@migration_context`,
+		expected:         "select * from user where col = :__vtmigration_context",
+		migrationContext: true,
+	}, {
+		in:       `select * from user where col = @@read_after_write_gtid OR col = @@read_after_write_timeout OR col = @@session_track_gtids`,
+		expected: "select * from user where col = :__vtread_after_write_gtid or col = :__vtread_after_write_timeout or col = :__vtsession_track_gtids",
+		rawGTID:  true, rawTimeout: true, sessTrackGTID: true,
+	}, {
+		in:       "SELECT * FROM tbl WHERE id IN (SELECT 1 FROM dual)",
+		expected: "SELECT * FROM tbl WHERE id IN (1)",
+	}, {
+		in:       "SELECT * FROM tbl WHERE id IN (SELECT last_insert_id() FROM dual)",
+		expected: "SELECT * FROM tbl WHERE id IN (:__lastInsertId)",
+		liid:     true,
+	}, {
+		in:       "SELECT * FROM tbl WHERE id IN (SELECT (SELECT 1 FROM dual WHERE 1 = 0) FROM dual)",
+		expected: "SELECT * FROM tbl WHERE id IN (SELECT 1 FROM dual WHERE 1 = 0)",
+	}, {
+		in:       "SELECT * FROM tbl WHERE id IN (SELECT 1 FROM dual WHERE 1 = 0)",
+		expected: "SELECT * FROM tbl WHERE id IN (SELECT 1 FROM dual WHERE 1 = 0)",
+	}, {
+		in:       "SELECT * FROM tbl WHERE id IN (SELECT 1,2 FROM dual)",
+		expected: "SELECT * FROM tbl WHERE id IN (SELECT 1,2 FROM dual)",
+	}, {
+		in:       "SELECT * FROM tbl WHERE id IN (SELECT 1 FROM dual ORDER BY 1)",
+		expected: "SELECT * FROM tbl WHERE id IN (SELECT 1 FROM dual ORDER BY 1)",
+	}, {
+		in:       "SELECT * FROM tbl WHERE id IN (SELECT id FROM user GROUP BY id)",
+		expected: "SELECT * FROM tbl WHERE id IN (SELECT id FROM user GROUP BY id)",
+	}, {
+		in:       "SELECT * FROM tbl WHERE id IN (SELECT 1 FROM dual, user)",
+		expected: "SELECT * FROM tbl WHERE id IN (SELECT 1 FROM dual, user)",
+	}, {
+		in:       "SELECT * FROM tbl WHERE id IN (SELECT 1 FROM dual limit 1)",
+		expected: "SELECT * FROM tbl WHERE id IN (SELECT 1 FROM dual limit 1)",
+	}, {
+		// SELECT * behaves different depending the join type used, so if that has been used, we won't rewrite
+		in:       "SELECT * FROM A JOIN B USING (id1,id2,id3)",
+		expected: "SELECT * FROM A JOIN B USING (id1,id2,id3)",
+	}, {
+		in:       "CALL proc(@foo)",
+		expected: "CALL proc(:__vtudvfoo)",
+		udv:      1,
+	}, {
+		in:       "SELECT * FROM tbl WHERE NOT id = 42",
+		expected: "SELECT * FROM tbl WHERE id != 42",
+	}, {
+		in:       "SELECT * FROM tbl WHERE not id < 12",
+		expected: "SELECT * FROM tbl WHERE id >= 12",
+	}, {
+		in:       "SELECT * FROM tbl WHERE not id > 12",
+		expected: "SELECT * FROM tbl WHERE id <= 12",
+	}, {
+		in:       "SELECT * FROM tbl WHERE not id <= 33",
+		expected: "SELECT * FROM tbl WHERE id > 33",
+	}, {
+		in:       "SELECT * FROM tbl WHERE not id >= 33",
+		expected: "SELECT * FROM tbl WHERE id < 33",
+	}, {
+		in:       "SELECT * FROM tbl WHERE not id != 33",
+		expected: "SELECT * FROM tbl WHERE id = 33",
+	}, {
+		in:       "SELECT * FROM tbl WHERE not id in (1,2,3)",
+		expected: "SELECT * FROM tbl WHERE id not in (1,2,3)",
+	}, {
+		in:       "SELECT * FROM tbl WHERE not id not in (1,2,3)",
+		expected: "SELECT * FROM tbl WHERE id in (1,2,3)",
+	}, {
+		in:       "SELECT * FROM tbl WHERE not id not in (1,2,3)",
+		expected: "SELECT * FROM tbl WHERE id in (1,2,3)",
+	}, {
+		in:       "SELECT * FROM tbl WHERE not id like '%foobar'",
+		expected: "SELECT * FROM tbl WHERE id not like '%foobar'",
+	}, {
+		in:       "SELECT * FROM tbl WHERE not id not like '%foobar'",
+		expected: "SELECT * FROM tbl WHERE id like '%foobar'",
+	}, {
+		in:       "SELECT * FROM tbl WHERE not id regexp '%foobar'",
+		expected: "SELECT * FROM tbl WHERE id not regexp '%foobar'",
+	}, {
+		in:       "SELECT * FROM tbl WHERE not id not regexp '%foobar'",
+		expected: "select * from tbl where id regexp '%foobar'",
+	}, {
+		in:       "SELECT * FROM tbl WHERE exists(select col1, col2 from other_table where foo > bar)",
+		expected: "SELECT * FROM tbl WHERE exists(select 1 from other_table where foo > bar)",
+	}, {
+		in:       "SELECT * FROM tbl WHERE exists(select col1, col2 from other_table where foo > bar limit 100 offset 34)",
+		expected: "SELECT * FROM tbl WHERE exists(select 1 from other_table where foo > bar limit 100 offset 34)",
+	}, {
+		in:       "SELECT * FROM tbl WHERE exists(select col1, col2, count(*) from other_table where foo > bar group by col1, col2)",
+		expected: "SELECT * FROM tbl WHERE exists(select 1 from other_table where foo > bar)",
+	}, {
+		in:       "SELECT * FROM tbl WHERE exists(select col1, col2 from other_table where foo > bar group by col1, col2)",
+		expected: "SELECT * FROM tbl WHERE exists(select 1 from other_table where foo > bar)",
+	}, {
+		in:       "SELECT * FROM tbl WHERE exists(select count(*) from other_table where foo > bar)",
+		expected: "SELECT * FROM tbl WHERE true",
+	}, {
+		in:       "SELECT * FROM tbl WHERE exists(select col1, col2, count(*) from other_table where foo > bar group by col1, col2 having count(*) > 3)",
+		expected: "SELECT * FROM tbl WHERE exists(select col1, col2, count(*) from other_table where foo > bar group by col1, col2 having count(*) > 3)",
+	}, {
+		in:       "SELECT id, name, salary FROM user_details",
+		expected: "SELECT id, name, salary FROM (select user.id, user.name, user_extra.salary from user join user_extra where user.id = user_extra.user_id) as user_details",
+	}, {
+		in:       "select max(distinct c1), min(distinct c2), avg(distinct c3), sum(distinct c4), count(distinct c5), group_concat(distinct c6) from tbl",
+		expected: "select max(c1) as `max(distinct c1)`, min(c2) as `min(distinct c2)`, avg(distinct c3), sum(distinct c4), count(distinct c5), group_concat(distinct c6) from tbl",
+	}, {
+		in:                          "SHOW VARIABLES",
+		expected:                    "SHOW VARIABLES",
+		autocommit:                  true,
+		foreignKeyChecks:            true,
+		clientFoundRows:             true,
+		skipQueryPlanCache:          true,
+		sqlSelectLimit:              true,
+		transactionMode:             true,
+		workload:                    true,
+		version:                     true,
+		versionComment:              true,
+		ddlStrategy:                 true,
+		migrationContext:            true,
+		sessionUUID:                 true,
+		sessionEnableSystemSettings: true,
+		rawGTID:                     true,
+		rawTimeout:                  true,
+		sessTrackGTID:               true,
+		socket:                      true,
+		queryTimeout:                true,
+	}, {
+		in:                          "SHOW GLOBAL VARIABLES",
+		expected:                    "SHOW GLOBAL VARIABLES",
+		autocommit:                  true,
+		foreignKeyChecks:            true,
+		clientFoundRows:             true,
+		skipQueryPlanCache:          true,
+		sqlSelectLimit:              true,
+		transactionMode:             true,
+		workload:                    true,
+		version:                     true,
+		versionComment:              true,
+		ddlStrategy:                 true,
+		migrationContext:            true,
+		sessionUUID:                 true,
+		sessionEnableSystemSettings: true,
+		rawGTID:                     true,
+		rawTimeout:                  true,
+		sessTrackGTID:               true,
+		socket:                      true,
+		queryTimeout:                true,
+	}}
+	parser := NewTestParser()
+	for _, tc := range tests {
+		in.Run(tc.in, func(t *testing.T) {
+			require := require.New(t)
+			stmt, known, err := parser.Parse2(tc.in)
+			require.NoError(err)
+			vars := NewReservedVars("v", known)
+			result, err := PrepareAST(
+				stmt,
+				vars,
+				map[string]*querypb.BindVariable{},
+				false,
+				"ks",
+				0,
+				"",
+				map[string]string{},
+				nil,
+				&fakeViews{},
+			)
+			require.NoError(err)
+
+			expected, err := parser.Parse(tc.expected)
+			require.NoError(err, "test expectation does not parse [%s]", tc.expected)
+
+			s := String(expected)
+			assert := assert.New(t)
+			assert.Equal(s, String(result.AST))
+			assert.Equal(tc.liid, result.NeedsFuncResult(LastInsertIDName), "should need last insert id")
+			assert.Equal(tc.db, result.NeedsFuncResult(DBVarName), "should need database name")
+			assert.Equal(tc.foundRows, result.NeedsFuncResult(FoundRowsName), "should need found rows")
+			assert.Equal(tc.rowCount, result.NeedsFuncResult(RowCountName), "should need row count")
+			assert.Equal(tc.udv, len(result.NeedUserDefinedVariables), "count of user defined variables")
+			assert.Equal(tc.autocommit, result.NeedsSysVar(sysvars.Autocommit.Name), "should need :__vtautocommit")
+			assert.Equal(tc.foreignKeyChecks, result.NeedsSysVar(sysvars.ForeignKeyChecks), "should need :__vtforeignKeyChecks")
+			assert.Equal(tc.clientFoundRows, result.NeedsSysVar(sysvars.ClientFoundRows.Name), "should need :__vtclientFoundRows")
+			assert.Equal(tc.skipQueryPlanCache, result.NeedsSysVar(sysvars.SkipQueryPlanCache.Name), "should need :__vtskipQueryPlanCache")
+			assert.Equal(tc.sqlSelectLimit, result.NeedsSysVar(sysvars.SQLSelectLimit.Name), "should need :__vtsqlSelectLimit")
+			assert.Equal(tc.transactionMode, result.NeedsSysVar(sysvars.TransactionMode.Name), "should need :__vttransactionMode")
+			assert.Equal(tc.workload, result.NeedsSysVar(sysvars.Workload.Name), "should need :__vtworkload")
+			assert.Equal(tc.queryTimeout, result.NeedsSysVar(sysvars.QueryTimeout.Name), "should need :__vtquery_timeout")
+			assert.Equal(tc.ddlStrategy, result.NeedsSysVar(sysvars.DDLStrategy.Name), "should need ddlStrategy")
+			assert.Equal(tc.migrationContext, result.NeedsSysVar(sysvars.MigrationContext.Name), "should need migrationContext")
+			assert.Equal(tc.sessionUUID, result.NeedsSysVar(sysvars.SessionUUID.Name), "should need sessionUUID")
+			assert.Equal(tc.sessionEnableSystemSettings, result.NeedsSysVar(sysvars.SessionEnableSystemSettings.Name), "should need sessionEnableSystemSettings")
+			assert.Equal(tc.rawGTID, result.NeedsSysVar(sysvars.ReadAfterWriteGTID.Name), "should need rawGTID")
+			assert.Equal(tc.rawTimeout, result.NeedsSysVar(sysvars.ReadAfterWriteTimeOut.Name), "should need rawTimeout")
+			assert.Equal(tc.sessTrackGTID, result.NeedsSysVar(sysvars.SessionTrackGTIDs.Name), "should need sessTrackGTID")
+			assert.Equal(tc.version, result.NeedsSysVar(sysvars.Version.Name), "should need Vitess version")
+			assert.Equal(tc.versionComment, result.NeedsSysVar(sysvars.VersionComment.Name), "should need Vitess version")
+			assert.Equal(tc.socket, result.NeedsSysVar(sysvars.Socket.Name), "should need :__vtsocket")
+		})
+	}
+}
+
+type fakeViews struct{}
+
+func (*fakeViews) FindView(name TableName) TableStatement {
+	if name.Name.String() != "user_details" {
+		return nil
+	}
+	parser := NewTestParser()
+	statement, err := parser.Parse("select user.id, user.name, user_extra.salary from user join user_extra where user.id = user_extra.user_id")
+	if err != nil {
+		return nil
+	}
+	return statement.(TableStatement)
+}
+
+func TestRewritesWithSetVarComment(in *testing.T) {
+	tests := []testCaseSetVar{{
+		in:            "select 1",
+		expected:      "select 1",
+		setVarComment: "",
+	}, {
+		in:            "select 1",
+		expected:      "select /*+ AA(a) */ 1",
+		setVarComment: "AA(a)",
+	}, {
+		in:            "insert /* toto */ into t(id) values(1)",
+		expected:      "insert /*+ AA(a) */ /* toto */ into t(id) values(1)",
+		setVarComment: "AA(a)",
+	}, {
+		in:            "select  /* toto */ * from t union select * from s",
+		expected:      "select /*+ AA(a) */ /* toto */ * from t union select /*+ AA(a) */ * from s",
+		setVarComment: "AA(a)",
+	}, {
+		in:            "vstream /* toto */ * from t1",
+		expected:      "vstream /*+ AA(a) */ /* toto */ * from t1",
+		setVarComment: "AA(a)",
+	}, {
+		in:            "stream /* toto */ t from t1",
+		expected:      "stream /*+ AA(a) */ /* toto */ t from t1",
+		setVarComment: "AA(a)",
+	}, {
+		in:            "update /* toto */ t set id = 1",
+		expected:      "update /*+ AA(a) */ /* toto */ t set id = 1",
+		setVarComment: "AA(a)",
+	}, {
+		in:            "delete /* toto */ from t",
+		expected:      "delete /*+ AA(a) */ /* toto */ from t",
+		setVarComment: "AA(a)",
+	}}
+
+	parser := NewTestParser()
+	for _, tc := range tests {
+		in.Run(tc.in, func(t *testing.T) {
+			require := require.New(t)
+			stmt, err := parser.Parse(tc.in)
+			require.NoError(err)
+			vars := NewReservedVars("v", nil)
+			result, err := PrepareAST(
+				stmt,
+				vars,
+				map[string]*querypb.BindVariable{},
+				false,
+				"ks",
+				0,
+				tc.setVarComment,
+				map[string]string{},
+				nil,
+				&fakeViews{},
+			)
+
+			require.NoError(err)
+
+			expected, err := parser.Parse(tc.expected)
+			require.NoError(err, "test expectation does not parse [%s]", tc.expected)
+
+			assert.Equal(t, String(expected), String(result.AST))
+		})
+	}
+}
+
+func TestRewritesSysVar(in *testing.T) {
+	tests := []testCaseSysVar{{
+		in:       "select @x = @@sql_mode",
+		expected: "select :__vtudvx = @@sql_mode as `@x = @@sql_mode` from dual",
+	}, {
+		in:       "select @x = @@sql_mode",
+		expected: "select :__vtudvx = :__vtsql_mode as `@x = @@sql_mode` from dual",
+		sysVar:   map[string]string{"sql_mode": "' '"},
+	}, {
+		in:       "SELECT @@tx_isolation",
+		expected: "select @@tx_isolation from dual",
+	}, {
+		in:       "SELECT @@transaction_isolation",
+		expected: "select @@transaction_isolation from dual",
+	}, {
+		in:       "SELECT @@session.transaction_isolation",
+		expected: "select @@session.transaction_isolation from dual",
+	}, {
+		in:       "SELECT @@tx_isolation",
+		sysVar:   map[string]string{"tx_isolation": "'READ-COMMITTED'"},
+		expected: "select :__vttx_isolation as `@@tx_isolation` from dual",
+	}, {
+		in:       "SELECT @@transaction_isolation",
+		sysVar:   map[string]string{"transaction_isolation": "'READ-COMMITTED'"},
+		expected: "select :__vttransaction_isolation as `@@transaction_isolation` from dual",
+	}, {
+		in:       "SELECT @@session.transaction_isolation",
+		sysVar:   map[string]string{"transaction_isolation": "'READ-COMMITTED'"},
+		expected: "select :__vttransaction_isolation as `@@session.transaction_isolation` from dual",
+	}}
+
+	parser := NewTestParser()
+	for _, tc := range tests {
+		in.Run(tc.in, func(t *testing.T) {
+			require := require.New(t)
+			stmt, err := parser.Parse(tc.in)
+			require.NoError(err)
+			vars := NewReservedVars("v", nil)
+			result, err := PrepareAST(
+				stmt,
+				vars,
+				map[string]*querypb.BindVariable{},
+				false,
+				"ks",
+				0,
+				"",
+				tc.sysVar,
+				nil,
+				&fakeViews{},
+			)
+
+			require.NoError(err)
+
+			expected, err := parser.Parse(tc.expected)
+			require.NoError(err, "test expectation does not parse [%s]", tc.expected)
+
+			assert.Equal(t, String(expected), String(result.AST))
+		})
+	}
+}
+
+func TestRewritesWithDefaultKeyspace(in *testing.T) {
+	tests := []myTestCase{{
+		in:       "SELECT 1 from x.test",
+		expected: "SELECT 1 from x.test", // no change
+	}, {
+		in:       "SELECT x.col as c from x.test",
+		expected: "SELECT x.col as c from x.test", // no change
+	}, {
+		in:       "SELECT 1 from test",
+		expected: "SELECT 1 from sys.test",
+	}, {
+		in:       "SELECT 1 from test as t",
+		expected: "SELECT 1 from sys.test as t",
+	}, {
+		in:       "SELECT 1 from `test 24` as t",
+		expected: "SELECT 1 from sys.`test 24` as t",
+	}, {
+		in:       "SELECT 1, (select 1 from test) from x.y",
+		expected: "SELECT 1, (select 1 from sys.test) from x.y",
+	}, {
+		in:       "SELECT 1 from (select 2 from test) t",
+		expected: "SELECT 1 from (select 2 from sys.test) t",
+	}, {
+		in:       "SELECT 1 from test where exists(select 2 from test)",
+		expected: "SELECT 1 from sys.test where exists(select 1 from sys.test)",
+	}, {
+		in:       "SELECT 1 from dual",
+		expected: "SELECT 1 from dual",
+	}, {
+		in:       "SELECT (select 2 from dual) from DUAL",
+		expected: "SELECT 2 as `(select 2 from dual)` from DUAL",
+	}}
+
+	parser := NewTestParser()
+	for _, tc := range tests {
+		in.Run(tc.in, func(t *testing.T) {
+			require := require.New(t)
+			stmt, err := parser.Parse(tc.in)
+			require.NoError(err)
+			vars := NewReservedVars("v", nil)
+			result, err := PrepareAST(
+				stmt,
+				vars,
+				map[string]*querypb.BindVariable{},
+				false,
+				"sys",
+				0,
+				"",
+				map[string]string{},
+				nil,
+				&fakeViews{},
+			)
+
+			require.NoError(err)
+
+			expected, err := parser.Parse(tc.expected)
+			require.NoError(err, "test expectation does not parse [%s]", tc.expected)
+
+			assert.Equal(t, String(expected), String(result.AST))
+		})
+	}
+}
+
+func TestReservedVars(t *testing.T) {
+	for _, prefix := range []string{"vtg", "bv"} {
+		t.Run("prefix_"+prefix, func(t *testing.T) {
+			reserved := NewReservedVars(prefix, make(BindVars))
+			for i := 1; i < 1000; i++ {
+				require.Equal(t, fmt.Sprintf("%s%d", prefix, i), reserved.nextUnusedVar())
+			}
+		})
+	}
+}
+
 /*
 Skipping ColName, TableName:
 BenchmarkNormalize-8     1000000              2205 ns/op             821 B/op         27 allocs/op
@@ -573,7 +1157,8 @@ func BenchmarkNormalize(b *testing.B) {
 		b.Fatal(err)
 	}
 	for i := 0; i < b.N; i++ {
-		require.NoError(b, Normalize(ast, NewReservedVars("", reservedVars), map[string]*querypb.BindVariable{}))
+		_, err := PrepareAST(ast, NewReservedVars("", reservedVars), map[string]*querypb.BindVariable{}, true, "ks", 0, "", map[string]string{}, nil, nil)
+		require.NoError(b, err)
 	}
 }
 
@@ -602,7 +1187,8 @@ func BenchmarkNormalizeTraces(b *testing.B) {
 
 			for i := 0; i < b.N; i++ {
 				for i, query := range parsed {
-					_ = Normalize(query, NewReservedVars("", reservedVars[i]), map[string]*querypb.BindVariable{})
+					_, err := PrepareAST(query, NewReservedVars("", reservedVars[i]), map[string]*querypb.BindVariable{}, true, "ks", 0, "", map[string]string{}, nil, nil)
+					require.NoError(b, err)
 				}
 			}
 		})
diff --git a/go/vt/sqlparser/redact_query.go b/go/vt/sqlparser/redact_query.go
index e6b8c009c68..2d018d7c0eb 100644
--- a/go/vt/sqlparser/redact_query.go
+++ b/go/vt/sqlparser/redact_query.go
@@ -28,10 +28,10 @@ func (p *Parser) RedactSQLQuery(sql string) (string, error) {
 		return "", err
 	}
 
-	err = Normalize(stmt, NewReservedVars("redacted", reservedVars), bv)
+	out, err := PrepareAST(stmt, NewReservedVars("redacted", reservedVars), bv, true, "ks", 0, "", map[string]string{}, nil, nil)
 	if err != nil {
 		return "", err
 	}
 
-	return comments.Leading + String(stmt) + comments.Trailing, nil
+	return comments.Leading + String(out.AST) + comments.Trailing, nil
 }
diff --git a/go/vt/sqlparser/utils.go b/go/vt/sqlparser/utils.go
index b785128917f..c56e7740fc5 100644
--- a/go/vt/sqlparser/utils.go
+++ b/go/vt/sqlparser/utils.go
@@ -41,11 +41,12 @@ func (p *Parser) QueryMatchesTemplates(query string, queryTemplates []string) (m
 		if err != nil {
 			return "", err
 		}
-		err = Normalize(stmt, NewReservedVars("", reservedVars), bv)
+
+		out, err := PrepareAST(stmt, NewReservedVars("", reservedVars), bv, true, "ks", 0, "", map[string]string{}, nil, nil)
 		if err != nil {
 			return "", err
 		}
-		normalized := CanonicalString(stmt)
+		normalized := CanonicalString(out.AST)
 		return normalized, nil
 	}
 
diff --git a/go/vt/vtgate/executor_test.go b/go/vt/vtgate/executor_test.go
index 904805e789b..5e7e5c2a07d 100644
--- a/go/vt/vtgate/executor_test.go
+++ b/go/vt/vtgate/executor_test.go
@@ -1860,6 +1860,30 @@ func TestPassthroughDDL(t *testing.T) {
 	sbc2.Queries = nil
 }
 
+func TestShowStatus(t *testing.T) {
+	executor, sbc1, _, _, ctx := createExecutorEnvWithConfig(t, createExecutorConfigWithNormalizer())
+	session := &vtgatepb.Session{
+		TargetString: "TestExecutor",
+	}
+
+	sql1 := "show slave status"
+	_, err := executorExec(ctx, executor, session, sql1, nil)
+	require.NoError(t, err)
+
+	sql2 := "show replica status"
+	_, err = executorExec(ctx, executor, session, sql2, nil)
+	require.NoError(t, err)
+
+	wantQueries := []*querypb.BoundQuery{{
+		Sql:           sql1,
+		BindVariables: map[string]*querypb.BindVariable{},
+	}, {
+		Sql:           sql2,
+		BindVariables: map[string]*querypb.BindVariable{},
+	}}
+	assert.Equal(t, wantQueries, sbc1.Queries)
+}
+
 func TestParseEmptyTargetSingleKeyspace(t *testing.T) {
 	r, _, _, _, _ := createExecutorEnv(t)
 
diff --git a/go/vt/vtgate/planbuilder/builder.go b/go/vt/vtgate/planbuilder/builder.go
index 065c50a6dfa..85d9f5f94ea 100644
--- a/go/vt/vtgate/planbuilder/builder.go
+++ b/go/vt/vtgate/planbuilder/builder.go
@@ -73,7 +73,7 @@ func (staticConfig) DirectEnabled() bool {
 // TestBuilder builds a plan for a query based on the specified vschema.
 // This method is only used from tests
 func TestBuilder(query string, vschema plancontext.VSchema, keyspace string) (*engine.Plan, error) {
-	stmt, reserved, err := vschema.Environment().Parser().Parse2(query)
+	stmt, known, err := vschema.Environment().Parser().Parse2(query)
 	if err != nil {
 		return nil, err
 	}
@@ -93,12 +93,12 @@ func TestBuilder(query string, vschema plancontext.VSchema, keyspace string) (*e
 			}()
 		}
 	}
-	result, err := sqlparser.RewriteAST(stmt, keyspace, sqlparser.SQLSelectLimitUnset, "", nil, vschema.GetForeignKeyChecksState(), vschema)
+	reservedVars := sqlparser.NewReservedVars("vtg", known)
+	result, err := sqlparser.PrepareAST(stmt, reservedVars, map[string]*querypb.BindVariable{}, false, keyspace, sqlparser.SQLSelectLimitUnset, "", nil, vschema.GetForeignKeyChecksState(), vschema)
 	if err != nil {
 		return nil, err
 	}
 
-	reservedVars := sqlparser.NewReservedVars("vtg", reserved)
 	return BuildFromStmt(context.Background(), query, result.AST, reservedVars, vschema, result.BindVarNeeds, staticConfig{})
 }
 
diff --git a/go/vt/vtgate/planbuilder/simplifier_test.go b/go/vt/vtgate/planbuilder/simplifier_test.go
index 5aeb0565f9b..012475ba021 100644
--- a/go/vt/vtgate/planbuilder/simplifier_test.go
+++ b/go/vt/vtgate/planbuilder/simplifier_test.go
@@ -21,6 +21,8 @@ import (
 	"fmt"
 	"testing"
 
+	querypb "vitess.io/vitess/go/vt/proto/query"
+
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
@@ -45,8 +47,8 @@ func TestSimplifyBuggyQuery(t *testing.T) {
 
 	stmt, reserved, err := sqlparser.NewTestParser().Parse2(query)
 	require.NoError(t, err)
-	rewritten, _ := sqlparser.RewriteAST(sqlparser.Clone(stmt), vw.CurrentDb(), sqlparser.SQLSelectLimitUnset, "", nil, nil, nil)
 	reservedVars := sqlparser.NewReservedVars("vtg", reserved)
+	rewritten, _ := sqlparser.PrepareAST(sqlparser.Clone(stmt), reservedVars, map[string]*querypb.BindVariable{}, false, vw.CurrentDb(), sqlparser.SQLSelectLimitUnset, "", nil, nil, nil)
 
 	simplified := simplifier.SimplifyStatement(
 		stmt.(sqlparser.TableStatement),
@@ -69,8 +71,8 @@ func TestSimplifyPanic(t *testing.T) {
 
 	stmt, reserved, err := sqlparser.NewTestParser().Parse2(query)
 	require.NoError(t, err)
-	rewritten, _ := sqlparser.RewriteAST(sqlparser.Clone(stmt), vw.CurrentDb(), sqlparser.SQLSelectLimitUnset, "", nil, nil, nil)
 	reservedVars := sqlparser.NewReservedVars("vtg", reserved)
+	rewritten, _ := sqlparser.PrepareAST(sqlparser.Clone(stmt), reservedVars, map[string]*querypb.BindVariable{}, false, vw.CurrentDb(), sqlparser.SQLSelectLimitUnset, "", nil, nil, nil)
 
 	simplified := simplifier.SimplifyStatement(
 		stmt.(sqlparser.TableStatement),
@@ -100,12 +102,12 @@ func TestUnsupportedFile(t *testing.T) {
 				t.Skip()
 				return
 			}
-			rewritten, err := sqlparser.RewriteAST(stmt, vw.CurrentDb(), sqlparser.SQLSelectLimitUnset, "", nil, nil, nil)
+			reservedVars := sqlparser.NewReservedVars("vtg", reserved)
+			rewritten, err := sqlparser.PrepareAST(stmt, reservedVars, map[string]*querypb.BindVariable{}, false, vw.CurrentDb(), sqlparser.SQLSelectLimitUnset, "", nil, nil, nil)
 			if err != nil {
 				t.Skip()
 			}
 
-			reservedVars := sqlparser.NewReservedVars("vtg", reserved)
 			ast := rewritten.AST
 			origQuery := sqlparser.String(ast)
 			stmt, _, _ = sqlparser.NewTestParser().Parse2(tcase.Query)
@@ -133,7 +135,7 @@ func keepSameError(query string, reservedVars *sqlparser.ReservedVars, vschema *
 	if err != nil {
 		panic(err)
 	}
-	rewritten, _ := sqlparser.RewriteAST(stmt, vschema.CurrentDb(), sqlparser.SQLSelectLimitUnset, "", nil, nil, nil)
+	rewritten, _ := sqlparser.PrepareAST(stmt, reservedVars, map[string]*querypb.BindVariable{}, false, vschema.CurrentDb(), sqlparser.SQLSelectLimitUnset, "", nil, nil, nil)
 	ast := rewritten.AST
 	_, expected := BuildFromStmt(context.Background(), query, ast, reservedVars, vschema, rewritten.BindVarNeeds, staticConfig{})
 	if expected == nil {
diff --git a/go/vt/vtgate/semantics/typer_test.go b/go/vt/vtgate/semantics/typer_test.go
index 7de5ecf1340..1ec642b8168 100644
--- a/go/vt/vtgate/semantics/typer_test.go
+++ b/go/vt/vtgate/semantics/typer_test.go
@@ -41,15 +41,16 @@ func TestNormalizerAndSemanticAnalysisIntegration(t *testing.T) {
 
 	for _, test := range tests {
 		t.Run(test.query, func(t *testing.T) {
-			parse, err := sqlparser.NewTestParser().Parse(test.query)
+			parse, known, err := sqlparser.NewTestParser().Parse2(test.query)
 			require.NoError(t, err)
 
-			err = sqlparser.Normalize(parse, sqlparser.NewReservedVars("bv", sqlparser.BindVars{}), map[string]*querypb.BindVariable{})
+			rv := sqlparser.NewReservedVars("", known)
+			out, err := sqlparser.PrepareAST(parse, rv, map[string]*querypb.BindVariable{}, true, "d", 0, "", map[string]string{}, nil, nil)
 			require.NoError(t, err)
 
-			st, err := Analyze(parse, "d", fakeSchemaInfo())
+			st, err := Analyze(out.AST, "d", fakeSchemaInfo())
 			require.NoError(t, err)
-			bv := parse.(*sqlparser.Select).SelectExprs[0].(*sqlparser.AliasedExpr).Expr.(*sqlparser.Argument)
+			bv := out.AST.(*sqlparser.Select).SelectExprs[0].(*sqlparser.AliasedExpr).Expr.(*sqlparser.Argument)
 			typ, found := st.ExprTypes[bv]
 			require.True(t, found, "bindvar was not typed")
 			require.Equal(t, test.typ, typ.Type().String())
@@ -68,15 +69,15 @@ func TestColumnCollations(t *testing.T) {
 
 	for _, test := range tests {
 		t.Run(test.query, func(t *testing.T) {
-			parse, err := sqlparser.NewTestParser().Parse(test.query)
+			ast, err := sqlparser.NewTestParser().Parse(test.query)
 			require.NoError(t, err)
 
-			err = sqlparser.Normalize(parse, sqlparser.NewReservedVars("bv", sqlparser.BindVars{}), map[string]*querypb.BindVariable{})
+			out, err := sqlparser.PrepareAST(ast, sqlparser.NewReservedVars("bv", sqlparser.BindVars{}), map[string]*querypb.BindVariable{}, true, "d", 0, "", map[string]string{}, nil, nil)
 			require.NoError(t, err)
 
-			st, err := Analyze(parse, "d", fakeSchemaInfo())
+			st, err := Analyze(out.AST, "d", fakeSchemaInfo())
 			require.NoError(t, err)
-			col := extract(parse.(*sqlparser.Select), 0)
+			col := extract(out.AST.(*sqlparser.Select), 0)
 			typ, found := st.TypeForExpr(col)
 			require.True(t, found, "column was not typed")
 

From fd1186c6a92ce41c663fe3b45b58e0299e99173d Mon Sep 17 00:00:00 2001
From: Chaitanya Rangavajhala <crangavajha1@bloomberg.net>
Date: Tue, 28 Jan 2025 08:48:29 -0500
Subject: [PATCH 06/68] VTAdmin to use VTGate's vexplain (#17508)

Signed-off-by: c-r-dev <crangavajha1@bloomberg.net>
---
 go/vt/proto/vtadmin/vtadmin.pb.go             | 641 +++++++++++-------
 go/vt/proto/vtadmin/vtadmin_grpc.pb.go        |  40 ++
 go/vt/proto/vtadmin/vtadmin_vtproto.pb.go     | 396 +++++++++++
 go/vt/vtadmin/api.go                          |  54 ++
 go/vt/vtadmin/api_test.go                     | 180 +++++
 go/vt/vtadmin/http/vexplain.go                |  34 +
 go/vt/vtadmin/rbac/rbac.go                    |   2 +
 go/vt/vtadmin/vtsql/fakevtsql/conn.go         |  11 +
 go/vt/vtadmin/vtsql/vtsql.go                  |  74 ++
 proto/vtadmin.proto                           |  13 +
 web/vtadmin/src/api/http.ts                   |  16 +
 web/vtadmin/src/components/App.tsx            |   5 +
 web/vtadmin/src/components/NavRail.tsx        |   3 +
 .../src/components/routes/VExplain.tsx        | 153 +++++
 .../components/routes/VTExplain.module.scss   |   2 +-
 web/vtadmin/src/hooks/api.ts                  |   8 +
 web/vtadmin/src/proto/vtadmin.d.ts            | 227 +++++++
 web/vtadmin/src/proto/vtadmin.js              | 486 +++++++++++++
 18 files changed, 2085 insertions(+), 260 deletions(-)
 create mode 100644 go/vt/vtadmin/http/vexplain.go
 create mode 100644 web/vtadmin/src/components/routes/VExplain.tsx

diff --git a/go/vt/proto/vtadmin/vtadmin.pb.go b/go/vt/proto/vtadmin/vtadmin.pb.go
index 8b6a6997c8d..c086eb01443 100644
--- a/go/vt/proto/vtadmin/vtadmin.pb.go
+++ b/go/vt/proto/vtadmin/vtadmin.pb.go
@@ -7200,6 +7200,112 @@ func (x *VTExplainResponse) GetResponse() string {
 	return ""
 }
 
+type VExplainRequest struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	ClusterId string `protobuf:"bytes,1,opt,name=cluster_id,json=clusterId,proto3" json:"cluster_id,omitempty"`
+	Keyspace  string `protobuf:"bytes,2,opt,name=keyspace,proto3" json:"keyspace,omitempty"`
+	Sql       string `protobuf:"bytes,3,opt,name=sql,proto3" json:"sql,omitempty"`
+}
+
+func (x *VExplainRequest) Reset() {
+	*x = VExplainRequest{}
+	mi := &file_vtadmin_proto_msgTypes[126]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
+}
+
+func (x *VExplainRequest) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*VExplainRequest) ProtoMessage() {}
+
+func (x *VExplainRequest) ProtoReflect() protoreflect.Message {
+	mi := &file_vtadmin_proto_msgTypes[126]
+	if x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use VExplainRequest.ProtoReflect.Descriptor instead.
+func (*VExplainRequest) Descriptor() ([]byte, []int) {
+	return file_vtadmin_proto_rawDescGZIP(), []int{126}
+}
+
+func (x *VExplainRequest) GetClusterId() string {
+	if x != nil {
+		return x.ClusterId
+	}
+	return ""
+}
+
+func (x *VExplainRequest) GetKeyspace() string {
+	if x != nil {
+		return x.Keyspace
+	}
+	return ""
+}
+
+func (x *VExplainRequest) GetSql() string {
+	if x != nil {
+		return x.Sql
+	}
+	return ""
+}
+
+type VExplainResponse struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Response string `protobuf:"bytes,1,opt,name=response,proto3" json:"response,omitempty"`
+}
+
+func (x *VExplainResponse) Reset() {
+	*x = VExplainResponse{}
+	mi := &file_vtadmin_proto_msgTypes[127]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
+}
+
+func (x *VExplainResponse) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*VExplainResponse) ProtoMessage() {}
+
+func (x *VExplainResponse) ProtoReflect() protoreflect.Message {
+	mi := &file_vtadmin_proto_msgTypes[127]
+	if x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use VExplainResponse.ProtoReflect.Descriptor instead.
+func (*VExplainResponse) Descriptor() ([]byte, []int) {
+	return file_vtadmin_proto_rawDescGZIP(), []int{127}
+}
+
+func (x *VExplainResponse) GetResponse() string {
+	if x != nil {
+		return x.Response
+	}
+	return ""
+}
+
 type Schema_ShardTableSize struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -7211,7 +7317,7 @@ type Schema_ShardTableSize struct {
 
 func (x *Schema_ShardTableSize) Reset() {
 	*x = Schema_ShardTableSize{}
-	mi := &file_vtadmin_proto_msgTypes[129]
+	mi := &file_vtadmin_proto_msgTypes[131]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -7223,7 +7329,7 @@ func (x *Schema_ShardTableSize) String() string {
 func (*Schema_ShardTableSize) ProtoMessage() {}
 
 func (x *Schema_ShardTableSize) ProtoReflect() protoreflect.Message {
-	mi := &file_vtadmin_proto_msgTypes[129]
+	mi := &file_vtadmin_proto_msgTypes[131]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -7267,7 +7373,7 @@ type Schema_TableSize struct {
 
 func (x *Schema_TableSize) Reset() {
 	*x = Schema_TableSize{}
-	mi := &file_vtadmin_proto_msgTypes[130]
+	mi := &file_vtadmin_proto_msgTypes[132]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -7279,7 +7385,7 @@ func (x *Schema_TableSize) String() string {
 func (*Schema_TableSize) ProtoMessage() {}
 
 func (x *Schema_TableSize) ProtoReflect() protoreflect.Message {
-	mi := &file_vtadmin_proto_msgTypes[130]
+	mi := &file_vtadmin_proto_msgTypes[132]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -7327,7 +7433,7 @@ type GetSchemaMigrationsRequest_ClusterRequest struct {
 
 func (x *GetSchemaMigrationsRequest_ClusterRequest) Reset() {
 	*x = GetSchemaMigrationsRequest_ClusterRequest{}
-	mi := &file_vtadmin_proto_msgTypes[132]
+	mi := &file_vtadmin_proto_msgTypes[134]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -7339,7 +7445,7 @@ func (x *GetSchemaMigrationsRequest_ClusterRequest) String() string {
 func (*GetSchemaMigrationsRequest_ClusterRequest) ProtoMessage() {}
 
 func (x *GetSchemaMigrationsRequest_ClusterRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_vtadmin_proto_msgTypes[132]
+	mi := &file_vtadmin_proto_msgTypes[134]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -7386,7 +7492,7 @@ type ReloadSchemasResponse_KeyspaceResult struct {
 
 func (x *ReloadSchemasResponse_KeyspaceResult) Reset() {
 	*x = ReloadSchemasResponse_KeyspaceResult{}
-	mi := &file_vtadmin_proto_msgTypes[135]
+	mi := &file_vtadmin_proto_msgTypes[137]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -7398,7 +7504,7 @@ func (x *ReloadSchemasResponse_KeyspaceResult) String() string {
 func (*ReloadSchemasResponse_KeyspaceResult) ProtoMessage() {}
 
 func (x *ReloadSchemasResponse_KeyspaceResult) ProtoReflect() protoreflect.Message {
-	mi := &file_vtadmin_proto_msgTypes[135]
+	mi := &file_vtadmin_proto_msgTypes[137]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -7445,7 +7551,7 @@ type ReloadSchemasResponse_ShardResult struct {
 
 func (x *ReloadSchemasResponse_ShardResult) Reset() {
 	*x = ReloadSchemasResponse_ShardResult{}
-	mi := &file_vtadmin_proto_msgTypes[136]
+	mi := &file_vtadmin_proto_msgTypes[138]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -7457,7 +7563,7 @@ func (x *ReloadSchemasResponse_ShardResult) String() string {
 func (*ReloadSchemasResponse_ShardResult) ProtoMessage() {}
 
 func (x *ReloadSchemasResponse_ShardResult) ProtoReflect() protoreflect.Message {
-	mi := &file_vtadmin_proto_msgTypes[136]
+	mi := &file_vtadmin_proto_msgTypes[138]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -7505,7 +7611,7 @@ type ReloadSchemasResponse_TabletResult struct {
 
 func (x *ReloadSchemasResponse_TabletResult) Reset() {
 	*x = ReloadSchemasResponse_TabletResult{}
-	mi := &file_vtadmin_proto_msgTypes[137]
+	mi := &file_vtadmin_proto_msgTypes[139]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -7517,7 +7623,7 @@ func (x *ReloadSchemasResponse_TabletResult) String() string {
 func (*ReloadSchemasResponse_TabletResult) ProtoMessage() {}
 
 func (x *ReloadSchemasResponse_TabletResult) ProtoReflect() protoreflect.Message {
-	mi := &file_vtadmin_proto_msgTypes[137]
+	mi := &file_vtadmin_proto_msgTypes[139]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -8545,7 +8651,16 @@ var file_vtadmin_proto_rawDesc = []byte{
 	0x52, 0x03, 0x73, 0x71, 0x6c, 0x22, 0x2f, 0x0a, 0x11, 0x56, 0x54, 0x45, 0x78, 0x70, 0x6c, 0x61,
 	0x69, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x72, 0x65,
 	0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x72, 0x65,
-	0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x32, 0xbd, 0x31, 0x0a, 0x07, 0x56, 0x54, 0x41, 0x64, 0x6d,
+	0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x5e, 0x0a, 0x0f, 0x56, 0x45, 0x78, 0x70, 0x6c, 0x61,
+	0x69, 0x6e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x1d, 0x0a, 0x0a, 0x63, 0x6c, 0x75,
+	0x73, 0x74, 0x65, 0x72, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x63,
+	0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x49, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x6b, 0x65, 0x79, 0x73,
+	0x70, 0x61, 0x63, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x6b, 0x65, 0x79, 0x73,
+	0x70, 0x61, 0x63, 0x65, 0x12, 0x10, 0x0a, 0x03, 0x73, 0x71, 0x6c, 0x18, 0x03, 0x20, 0x01, 0x28,
+	0x09, 0x52, 0x03, 0x73, 0x71, 0x6c, 0x22, 0x2e, 0x0a, 0x10, 0x56, 0x45, 0x78, 0x70, 0x6c, 0x61,
+	0x69, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x72, 0x65,
+	0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x72, 0x65,
+	0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x32, 0x80, 0x32, 0x0a, 0x07, 0x56, 0x54, 0x41, 0x64, 0x6d,
 	0x69, 0x6e, 0x12, 0x4c, 0x0a, 0x0b, 0x41, 0x70, 0x70, 0x6c, 0x79, 0x53, 0x63, 0x68, 0x65, 0x6d,
 	0x61, 0x12, 0x1b, 0x2e, 0x76, 0x74, 0x61, 0x64, 0x6d, 0x69, 0x6e, 0x2e, 0x41, 0x70, 0x70, 0x6c,
 	0x79, 0x53, 0x63, 0x68, 0x65, 0x6d, 0x61, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1e,
@@ -8929,22 +9044,26 @@ var file_vtadmin_proto_rawDesc = []byte{
 	0x64, 0x6d, 0x69, 0x6e, 0x2e, 0x56, 0x54, 0x45, 0x78, 0x70, 0x6c, 0x61, 0x69, 0x6e, 0x52, 0x65,
 	0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1a, 0x2e, 0x76, 0x74, 0x61, 0x64, 0x6d, 0x69, 0x6e, 0x2e,
 	0x56, 0x54, 0x45, 0x78, 0x70, 0x6c, 0x61, 0x69, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73,
-	0x65, 0x22, 0x00, 0x12, 0x55, 0x0a, 0x0e, 0x57, 0x6f, 0x72, 0x6b, 0x66, 0x6c, 0x6f, 0x77, 0x44,
-	0x65, 0x6c, 0x65, 0x74, 0x65, 0x12, 0x1e, 0x2e, 0x76, 0x74, 0x61, 0x64, 0x6d, 0x69, 0x6e, 0x2e,
-	0x57, 0x6f, 0x72, 0x6b, 0x66, 0x6c, 0x6f, 0x77, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x52, 0x65,
-	0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x21, 0x2e, 0x76, 0x74, 0x63, 0x74, 0x6c, 0x64, 0x61, 0x74,
-	0x61, 0x2e, 0x57, 0x6f, 0x72, 0x6b, 0x66, 0x6c, 0x6f, 0x77, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65,
-	0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x6a, 0x0a, 0x15, 0x57, 0x6f,
-	0x72, 0x6b, 0x66, 0x6c, 0x6f, 0x77, 0x53, 0x77, 0x69, 0x74, 0x63, 0x68, 0x54, 0x72, 0x61, 0x66,
-	0x66, 0x69, 0x63, 0x12, 0x25, 0x2e, 0x76, 0x74, 0x61, 0x64, 0x6d, 0x69, 0x6e, 0x2e, 0x57, 0x6f,
-	0x72, 0x6b, 0x66, 0x6c, 0x6f, 0x77, 0x53, 0x77, 0x69, 0x74, 0x63, 0x68, 0x54, 0x72, 0x61, 0x66,
-	0x66, 0x69, 0x63, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x28, 0x2e, 0x76, 0x74, 0x63,
-	0x74, 0x6c, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x57, 0x6f, 0x72, 0x6b, 0x66, 0x6c, 0x6f, 0x77, 0x53,
-	0x77, 0x69, 0x74, 0x63, 0x68, 0x54, 0x72, 0x61, 0x66, 0x66, 0x69, 0x63, 0x52, 0x65, 0x73, 0x70,
-	0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x42, 0x26, 0x5a, 0x24, 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, 0x76, 0x74, 0x61, 0x64, 0x6d, 0x69, 0x6e, 0x62, 0x06,
-	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x65, 0x22, 0x00, 0x12, 0x41, 0x0a, 0x08, 0x56, 0x45, 0x78, 0x70, 0x6c, 0x61, 0x69, 0x6e, 0x12,
+	0x18, 0x2e, 0x76, 0x74, 0x61, 0x64, 0x6d, 0x69, 0x6e, 0x2e, 0x56, 0x45, 0x78, 0x70, 0x6c, 0x61,
+	0x69, 0x6e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x19, 0x2e, 0x76, 0x74, 0x61, 0x64,
+	0x6d, 0x69, 0x6e, 0x2e, 0x56, 0x45, 0x78, 0x70, 0x6c, 0x61, 0x69, 0x6e, 0x52, 0x65, 0x73, 0x70,
+	0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x55, 0x0a, 0x0e, 0x57, 0x6f, 0x72, 0x6b, 0x66, 0x6c,
+	0x6f, 0x77, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x12, 0x1e, 0x2e, 0x76, 0x74, 0x61, 0x64, 0x6d,
+	0x69, 0x6e, 0x2e, 0x57, 0x6f, 0x72, 0x6b, 0x66, 0x6c, 0x6f, 0x77, 0x44, 0x65, 0x6c, 0x65, 0x74,
+	0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x21, 0x2e, 0x76, 0x74, 0x63, 0x74, 0x6c,
+	0x64, 0x61, 0x74, 0x61, 0x2e, 0x57, 0x6f, 0x72, 0x6b, 0x66, 0x6c, 0x6f, 0x77, 0x44, 0x65, 0x6c,
+	0x65, 0x74, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x6a, 0x0a,
+	0x15, 0x57, 0x6f, 0x72, 0x6b, 0x66, 0x6c, 0x6f, 0x77, 0x53, 0x77, 0x69, 0x74, 0x63, 0x68, 0x54,
+	0x72, 0x61, 0x66, 0x66, 0x69, 0x63, 0x12, 0x25, 0x2e, 0x76, 0x74, 0x61, 0x64, 0x6d, 0x69, 0x6e,
+	0x2e, 0x57, 0x6f, 0x72, 0x6b, 0x66, 0x6c, 0x6f, 0x77, 0x53, 0x77, 0x69, 0x74, 0x63, 0x68, 0x54,
+	0x72, 0x61, 0x66, 0x66, 0x69, 0x63, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x28, 0x2e,
+	0x76, 0x74, 0x63, 0x74, 0x6c, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x57, 0x6f, 0x72, 0x6b, 0x66, 0x6c,
+	0x6f, 0x77, 0x53, 0x77, 0x69, 0x74, 0x63, 0x68, 0x54, 0x72, 0x61, 0x66, 0x66, 0x69, 0x63, 0x52,
+	0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x42, 0x26, 0x5a, 0x24, 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, 0x76, 0x74, 0x61, 0x64, 0x6d, 0x69,
+	0x6e, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
@@ -8960,7 +9079,7 @@ func file_vtadmin_proto_rawDescGZIP() []byte {
 }
 
 var file_vtadmin_proto_enumTypes = make([]protoimpl.EnumInfo, 1)
-var file_vtadmin_proto_msgTypes = make([]protoimpl.MessageInfo, 139)
+var file_vtadmin_proto_msgTypes = make([]protoimpl.MessageInfo, 141)
 var file_vtadmin_proto_goTypes = []any{
 	(Tablet_ServingState)(0),                          // 0: vtadmin.Tablet.ServingState
 	(*Cluster)(nil),                                   // 1: vtadmin.Cluster
@@ -9089,207 +9208,209 @@ var file_vtadmin_proto_goTypes = []any{
 	(*VDiffShowResponse)(nil),                         // 124: vtadmin.VDiffShowResponse
 	(*VTExplainRequest)(nil),                          // 125: vtadmin.VTExplainRequest
 	(*VTExplainResponse)(nil),                         // 126: vtadmin.VTExplainResponse
-	nil,                                               // 127: vtadmin.ClusterCellsAliases.AliasesEntry
-	nil,                                               // 128: vtadmin.Keyspace.ShardsEntry
-	nil,                                               // 129: vtadmin.Schema.TableSizesEntry
-	(*Schema_ShardTableSize)(nil),                     // 130: vtadmin.Schema.ShardTableSize
-	(*Schema_TableSize)(nil),                          // 131: vtadmin.Schema.TableSize
-	nil,                                               // 132: vtadmin.Schema.TableSize.ByShardEntry
-	(*GetSchemaMigrationsRequest_ClusterRequest)(nil), // 133: vtadmin.GetSchemaMigrationsRequest.ClusterRequest
-	nil, // 134: vtadmin.GetSrvKeyspacesResponse.SrvKeyspacesEntry
-	nil, // 135: vtadmin.GetWorkflowsResponse.WorkflowsByClusterEntry
-	(*ReloadSchemasResponse_KeyspaceResult)(nil), // 136: vtadmin.ReloadSchemasResponse.KeyspaceResult
-	(*ReloadSchemasResponse_ShardResult)(nil),    // 137: vtadmin.ReloadSchemasResponse.ShardResult
-	(*ReloadSchemasResponse_TabletResult)(nil),   // 138: vtadmin.ReloadSchemasResponse.TabletResult
-	nil,                         // 139: vtadmin.VDiffShowResponse.ShardReportEntry
-	(*mysqlctl.BackupInfo)(nil), // 140: mysqlctl.BackupInfo
-	(*topodata.CellInfo)(nil),   // 141: topodata.CellInfo
-	(*vtctldata.ShardReplicationPositionsResponse)(nil), // 142: vtctldata.ShardReplicationPositionsResponse
-	(*vtctldata.Keyspace)(nil),                          // 143: vtctldata.Keyspace
-	(*tabletmanagerdata.TableDefinition)(nil),           // 144: tabletmanagerdata.TableDefinition
-	(*vtctldata.SchemaMigration)(nil),                   // 145: vtctldata.SchemaMigration
-	(*vtctldata.Shard)(nil),                             // 146: vtctldata.Shard
-	(*vschema.SrvVSchema)(nil),                          // 147: vschema.SrvVSchema
-	(*topodata.Tablet)(nil),                             // 148: topodata.Tablet
-	(*vschema.Keyspace)(nil),                            // 149: vschema.Keyspace
-	(*vtctldata.Workflow)(nil),                          // 150: vtctldata.Workflow
-	(*vtctldata.WorkflowDeleteRequest)(nil),             // 151: vtctldata.WorkflowDeleteRequest
-	(*vtctldata.WorkflowSwitchTrafficRequest)(nil),      // 152: vtctldata.WorkflowSwitchTrafficRequest
-	(*vtctldata.ApplySchemaRequest)(nil),                // 153: vtctldata.ApplySchemaRequest
-	(*vtctldata.CancelSchemaMigrationRequest)(nil),      // 154: vtctldata.CancelSchemaMigrationRequest
-	(*vtctldata.CleanupSchemaMigrationRequest)(nil),     // 155: vtctldata.CleanupSchemaMigrationRequest
-	(*vtctldata.CompleteSchemaMigrationRequest)(nil),    // 156: vtctldata.CompleteSchemaMigrationRequest
-	(*vtctldata.CreateKeyspaceRequest)(nil),             // 157: vtctldata.CreateKeyspaceRequest
-	(*vtctldata.CreateShardRequest)(nil),                // 158: vtctldata.CreateShardRequest
-	(*vtctldata.DeleteKeyspaceRequest)(nil),             // 159: vtctldata.DeleteKeyspaceRequest
-	(*vtctldata.DeleteShardsRequest)(nil),               // 160: vtctldata.DeleteShardsRequest
-	(*topodata.TabletAlias)(nil),                        // 161: topodata.TabletAlias
-	(*vtctldata.EmergencyReparentShardRequest)(nil),     // 162: vtctldata.EmergencyReparentShardRequest
-	(*logutil.Event)(nil),                               // 163: logutil.Event
-	(*vtctldata.GetBackupsRequest)(nil),                 // 164: vtctldata.GetBackupsRequest
-	(*vtctldata.GetTransactionInfoRequest)(nil),         // 165: vtctldata.GetTransactionInfoRequest
-	(*vtctldata.LaunchSchemaMigrationRequest)(nil),      // 166: vtctldata.LaunchSchemaMigrationRequest
-	(*vtctldata.MaterializeCreateRequest)(nil),          // 167: vtctldata.MaterializeCreateRequest
-	(*vtctldata.MoveTablesCompleteRequest)(nil),         // 168: vtctldata.MoveTablesCompleteRequest
-	(*vtctldata.MoveTablesCreateRequest)(nil),           // 169: vtctldata.MoveTablesCreateRequest
-	(*vtctldata.PlannedReparentShardRequest)(nil),       // 170: vtctldata.PlannedReparentShardRequest
-	(*vtctldata.RetrySchemaMigrationRequest)(nil),       // 171: vtctldata.RetrySchemaMigrationRequest
-	(*vtctldata.ReshardCreateRequest)(nil),              // 172: vtctldata.ReshardCreateRequest
-	(*vtctldata.VDiffCreateRequest)(nil),                // 173: vtctldata.VDiffCreateRequest
-	(*vtctldata.VDiffShowRequest)(nil),                  // 174: vtctldata.VDiffShowRequest
-	(*topodata.CellsAlias)(nil),                         // 175: topodata.CellsAlias
-	(*vtctldata.GetSchemaMigrationsRequest)(nil),        // 176: vtctldata.GetSchemaMigrationsRequest
-	(*vtctldata.GetSrvKeyspacesResponse)(nil),           // 177: vtctldata.GetSrvKeyspacesResponse
-	(*vtctldata.ApplySchemaResponse)(nil),               // 178: vtctldata.ApplySchemaResponse
-	(*vtctldata.CancelSchemaMigrationResponse)(nil),     // 179: vtctldata.CancelSchemaMigrationResponse
-	(*vtctldata.CleanupSchemaMigrationResponse)(nil),    // 180: vtctldata.CleanupSchemaMigrationResponse
-	(*vtctldata.CompleteSchemaMigrationResponse)(nil),   // 181: vtctldata.CompleteSchemaMigrationResponse
-	(*vtctldata.ConcludeTransactionResponse)(nil),       // 182: vtctldata.ConcludeTransactionResponse
-	(*vtctldata.CreateShardResponse)(nil),               // 183: vtctldata.CreateShardResponse
-	(*vtctldata.DeleteKeyspaceResponse)(nil),            // 184: vtctldata.DeleteKeyspaceResponse
-	(*vtctldata.DeleteShardsResponse)(nil),              // 185: vtctldata.DeleteShardsResponse
-	(*vtctldata.GetFullStatusResponse)(nil),             // 186: vtctldata.GetFullStatusResponse
-	(*vtctldata.GetTopologyPathResponse)(nil),           // 187: vtctldata.GetTopologyPathResponse
-	(*vtctldata.GetTransactionInfoResponse)(nil),        // 188: vtctldata.GetTransactionInfoResponse
-	(*vtctldata.GetUnresolvedTransactionsResponse)(nil), // 189: vtctldata.GetUnresolvedTransactionsResponse
-	(*vtctldata.WorkflowStatusResponse)(nil),            // 190: vtctldata.WorkflowStatusResponse
-	(*vtctldata.WorkflowUpdateResponse)(nil),            // 191: vtctldata.WorkflowUpdateResponse
-	(*vtctldata.LaunchSchemaMigrationResponse)(nil),     // 192: vtctldata.LaunchSchemaMigrationResponse
-	(*vtctldata.MoveTablesCompleteResponse)(nil),        // 193: vtctldata.MoveTablesCompleteResponse
-	(*vtctldata.MaterializeCreateResponse)(nil),         // 194: vtctldata.MaterializeCreateResponse
-	(*vtctldata.RetrySchemaMigrationResponse)(nil),      // 195: vtctldata.RetrySchemaMigrationResponse
-	(*vtctldata.ValidateResponse)(nil),                  // 196: vtctldata.ValidateResponse
-	(*vtctldata.ValidateKeyspaceResponse)(nil),          // 197: vtctldata.ValidateKeyspaceResponse
-	(*vtctldata.ValidateSchemaKeyspaceResponse)(nil),    // 198: vtctldata.ValidateSchemaKeyspaceResponse
-	(*vtctldata.ValidateShardResponse)(nil),             // 199: vtctldata.ValidateShardResponse
-	(*vtctldata.ValidateVersionKeyspaceResponse)(nil),   // 200: vtctldata.ValidateVersionKeyspaceResponse
-	(*vtctldata.ValidateVersionShardResponse)(nil),      // 201: vtctldata.ValidateVersionShardResponse
-	(*vtctldata.VDiffCreateResponse)(nil),               // 202: vtctldata.VDiffCreateResponse
-	(*vtctldata.WorkflowDeleteResponse)(nil),            // 203: vtctldata.WorkflowDeleteResponse
-	(*vtctldata.WorkflowSwitchTrafficResponse)(nil),     // 204: vtctldata.WorkflowSwitchTrafficResponse
+	(*VExplainRequest)(nil),                           // 127: vtadmin.VExplainRequest
+	(*VExplainResponse)(nil),                          // 128: vtadmin.VExplainResponse
+	nil,                                               // 129: vtadmin.ClusterCellsAliases.AliasesEntry
+	nil,                                               // 130: vtadmin.Keyspace.ShardsEntry
+	nil,                                               // 131: vtadmin.Schema.TableSizesEntry
+	(*Schema_ShardTableSize)(nil),                     // 132: vtadmin.Schema.ShardTableSize
+	(*Schema_TableSize)(nil),                          // 133: vtadmin.Schema.TableSize
+	nil,                                               // 134: vtadmin.Schema.TableSize.ByShardEntry
+	(*GetSchemaMigrationsRequest_ClusterRequest)(nil), // 135: vtadmin.GetSchemaMigrationsRequest.ClusterRequest
+	nil, // 136: vtadmin.GetSrvKeyspacesResponse.SrvKeyspacesEntry
+	nil, // 137: vtadmin.GetWorkflowsResponse.WorkflowsByClusterEntry
+	(*ReloadSchemasResponse_KeyspaceResult)(nil), // 138: vtadmin.ReloadSchemasResponse.KeyspaceResult
+	(*ReloadSchemasResponse_ShardResult)(nil),    // 139: vtadmin.ReloadSchemasResponse.ShardResult
+	(*ReloadSchemasResponse_TabletResult)(nil),   // 140: vtadmin.ReloadSchemasResponse.TabletResult
+	nil,                         // 141: vtadmin.VDiffShowResponse.ShardReportEntry
+	(*mysqlctl.BackupInfo)(nil), // 142: mysqlctl.BackupInfo
+	(*topodata.CellInfo)(nil),   // 143: topodata.CellInfo
+	(*vtctldata.ShardReplicationPositionsResponse)(nil), // 144: vtctldata.ShardReplicationPositionsResponse
+	(*vtctldata.Keyspace)(nil),                          // 145: vtctldata.Keyspace
+	(*tabletmanagerdata.TableDefinition)(nil),           // 146: tabletmanagerdata.TableDefinition
+	(*vtctldata.SchemaMigration)(nil),                   // 147: vtctldata.SchemaMigration
+	(*vtctldata.Shard)(nil),                             // 148: vtctldata.Shard
+	(*vschema.SrvVSchema)(nil),                          // 149: vschema.SrvVSchema
+	(*topodata.Tablet)(nil),                             // 150: topodata.Tablet
+	(*vschema.Keyspace)(nil),                            // 151: vschema.Keyspace
+	(*vtctldata.Workflow)(nil),                          // 152: vtctldata.Workflow
+	(*vtctldata.WorkflowDeleteRequest)(nil),             // 153: vtctldata.WorkflowDeleteRequest
+	(*vtctldata.WorkflowSwitchTrafficRequest)(nil),      // 154: vtctldata.WorkflowSwitchTrafficRequest
+	(*vtctldata.ApplySchemaRequest)(nil),                // 155: vtctldata.ApplySchemaRequest
+	(*vtctldata.CancelSchemaMigrationRequest)(nil),      // 156: vtctldata.CancelSchemaMigrationRequest
+	(*vtctldata.CleanupSchemaMigrationRequest)(nil),     // 157: vtctldata.CleanupSchemaMigrationRequest
+	(*vtctldata.CompleteSchemaMigrationRequest)(nil),    // 158: vtctldata.CompleteSchemaMigrationRequest
+	(*vtctldata.CreateKeyspaceRequest)(nil),             // 159: vtctldata.CreateKeyspaceRequest
+	(*vtctldata.CreateShardRequest)(nil),                // 160: vtctldata.CreateShardRequest
+	(*vtctldata.DeleteKeyspaceRequest)(nil),             // 161: vtctldata.DeleteKeyspaceRequest
+	(*vtctldata.DeleteShardsRequest)(nil),               // 162: vtctldata.DeleteShardsRequest
+	(*topodata.TabletAlias)(nil),                        // 163: topodata.TabletAlias
+	(*vtctldata.EmergencyReparentShardRequest)(nil),     // 164: vtctldata.EmergencyReparentShardRequest
+	(*logutil.Event)(nil),                               // 165: logutil.Event
+	(*vtctldata.GetBackupsRequest)(nil),                 // 166: vtctldata.GetBackupsRequest
+	(*vtctldata.GetTransactionInfoRequest)(nil),         // 167: vtctldata.GetTransactionInfoRequest
+	(*vtctldata.LaunchSchemaMigrationRequest)(nil),      // 168: vtctldata.LaunchSchemaMigrationRequest
+	(*vtctldata.MaterializeCreateRequest)(nil),          // 169: vtctldata.MaterializeCreateRequest
+	(*vtctldata.MoveTablesCompleteRequest)(nil),         // 170: vtctldata.MoveTablesCompleteRequest
+	(*vtctldata.MoveTablesCreateRequest)(nil),           // 171: vtctldata.MoveTablesCreateRequest
+	(*vtctldata.PlannedReparentShardRequest)(nil),       // 172: vtctldata.PlannedReparentShardRequest
+	(*vtctldata.RetrySchemaMigrationRequest)(nil),       // 173: vtctldata.RetrySchemaMigrationRequest
+	(*vtctldata.ReshardCreateRequest)(nil),              // 174: vtctldata.ReshardCreateRequest
+	(*vtctldata.VDiffCreateRequest)(nil),                // 175: vtctldata.VDiffCreateRequest
+	(*vtctldata.VDiffShowRequest)(nil),                  // 176: vtctldata.VDiffShowRequest
+	(*topodata.CellsAlias)(nil),                         // 177: topodata.CellsAlias
+	(*vtctldata.GetSchemaMigrationsRequest)(nil),        // 178: vtctldata.GetSchemaMigrationsRequest
+	(*vtctldata.GetSrvKeyspacesResponse)(nil),           // 179: vtctldata.GetSrvKeyspacesResponse
+	(*vtctldata.ApplySchemaResponse)(nil),               // 180: vtctldata.ApplySchemaResponse
+	(*vtctldata.CancelSchemaMigrationResponse)(nil),     // 181: vtctldata.CancelSchemaMigrationResponse
+	(*vtctldata.CleanupSchemaMigrationResponse)(nil),    // 182: vtctldata.CleanupSchemaMigrationResponse
+	(*vtctldata.CompleteSchemaMigrationResponse)(nil),   // 183: vtctldata.CompleteSchemaMigrationResponse
+	(*vtctldata.ConcludeTransactionResponse)(nil),       // 184: vtctldata.ConcludeTransactionResponse
+	(*vtctldata.CreateShardResponse)(nil),               // 185: vtctldata.CreateShardResponse
+	(*vtctldata.DeleteKeyspaceResponse)(nil),            // 186: vtctldata.DeleteKeyspaceResponse
+	(*vtctldata.DeleteShardsResponse)(nil),              // 187: vtctldata.DeleteShardsResponse
+	(*vtctldata.GetFullStatusResponse)(nil),             // 188: vtctldata.GetFullStatusResponse
+	(*vtctldata.GetTopologyPathResponse)(nil),           // 189: vtctldata.GetTopologyPathResponse
+	(*vtctldata.GetTransactionInfoResponse)(nil),        // 190: vtctldata.GetTransactionInfoResponse
+	(*vtctldata.GetUnresolvedTransactionsResponse)(nil), // 191: vtctldata.GetUnresolvedTransactionsResponse
+	(*vtctldata.WorkflowStatusResponse)(nil),            // 192: vtctldata.WorkflowStatusResponse
+	(*vtctldata.WorkflowUpdateResponse)(nil),            // 193: vtctldata.WorkflowUpdateResponse
+	(*vtctldata.LaunchSchemaMigrationResponse)(nil),     // 194: vtctldata.LaunchSchemaMigrationResponse
+	(*vtctldata.MoveTablesCompleteResponse)(nil),        // 195: vtctldata.MoveTablesCompleteResponse
+	(*vtctldata.MaterializeCreateResponse)(nil),         // 196: vtctldata.MaterializeCreateResponse
+	(*vtctldata.RetrySchemaMigrationResponse)(nil),      // 197: vtctldata.RetrySchemaMigrationResponse
+	(*vtctldata.ValidateResponse)(nil),                  // 198: vtctldata.ValidateResponse
+	(*vtctldata.ValidateKeyspaceResponse)(nil),          // 199: vtctldata.ValidateKeyspaceResponse
+	(*vtctldata.ValidateSchemaKeyspaceResponse)(nil),    // 200: vtctldata.ValidateSchemaKeyspaceResponse
+	(*vtctldata.ValidateShardResponse)(nil),             // 201: vtctldata.ValidateShardResponse
+	(*vtctldata.ValidateVersionKeyspaceResponse)(nil),   // 202: vtctldata.ValidateVersionKeyspaceResponse
+	(*vtctldata.ValidateVersionShardResponse)(nil),      // 203: vtctldata.ValidateVersionShardResponse
+	(*vtctldata.VDiffCreateResponse)(nil),               // 204: vtctldata.VDiffCreateResponse
+	(*vtctldata.WorkflowDeleteResponse)(nil),            // 205: vtctldata.WorkflowDeleteResponse
+	(*vtctldata.WorkflowSwitchTrafficResponse)(nil),     // 206: vtctldata.WorkflowSwitchTrafficResponse
 }
 var file_vtadmin_proto_depIdxs = []int32{
 	1,   // 0: vtadmin.ClusterBackup.cluster:type_name -> vtadmin.Cluster
-	140, // 1: vtadmin.ClusterBackup.backup:type_name -> mysqlctl.BackupInfo
+	142, // 1: vtadmin.ClusterBackup.backup:type_name -> mysqlctl.BackupInfo
 	1,   // 2: vtadmin.ClusterCellsAliases.cluster:type_name -> vtadmin.Cluster
-	127, // 3: vtadmin.ClusterCellsAliases.aliases:type_name -> vtadmin.ClusterCellsAliases.AliasesEntry
+	129, // 3: vtadmin.ClusterCellsAliases.aliases:type_name -> vtadmin.ClusterCellsAliases.AliasesEntry
 	1,   // 4: vtadmin.ClusterCellInfo.cluster:type_name -> vtadmin.Cluster
-	141, // 5: vtadmin.ClusterCellInfo.cell_info:type_name -> topodata.CellInfo
+	143, // 5: vtadmin.ClusterCellInfo.cell_info:type_name -> topodata.CellInfo
 	1,   // 6: vtadmin.ClusterShardReplicationPosition.cluster:type_name -> vtadmin.Cluster
-	142, // 7: vtadmin.ClusterShardReplicationPosition.position_info:type_name -> vtctldata.ShardReplicationPositionsResponse
+	144, // 7: vtadmin.ClusterShardReplicationPosition.position_info:type_name -> vtctldata.ShardReplicationPositionsResponse
 	16,  // 8: vtadmin.ClusterWorkflows.workflows:type_name -> vtadmin.Workflow
 	1,   // 9: vtadmin.Keyspace.cluster:type_name -> vtadmin.Cluster
-	143, // 10: vtadmin.Keyspace.keyspace:type_name -> vtctldata.Keyspace
-	128, // 11: vtadmin.Keyspace.shards:type_name -> vtadmin.Keyspace.ShardsEntry
+	145, // 10: vtadmin.Keyspace.keyspace:type_name -> vtctldata.Keyspace
+	130, // 11: vtadmin.Keyspace.shards:type_name -> vtadmin.Keyspace.ShardsEntry
 	1,   // 12: vtadmin.Schema.cluster:type_name -> vtadmin.Cluster
-	144, // 13: vtadmin.Schema.table_definitions:type_name -> tabletmanagerdata.TableDefinition
-	129, // 14: vtadmin.Schema.table_sizes:type_name -> vtadmin.Schema.TableSizesEntry
+	146, // 13: vtadmin.Schema.table_definitions:type_name -> tabletmanagerdata.TableDefinition
+	131, // 14: vtadmin.Schema.table_sizes:type_name -> vtadmin.Schema.TableSizesEntry
 	1,   // 15: vtadmin.SchemaMigration.cluster:type_name -> vtadmin.Cluster
-	145, // 16: vtadmin.SchemaMigration.schema_migration:type_name -> vtctldata.SchemaMigration
+	147, // 16: vtadmin.SchemaMigration.schema_migration:type_name -> vtctldata.SchemaMigration
 	1,   // 17: vtadmin.Shard.cluster:type_name -> vtadmin.Cluster
-	146, // 18: vtadmin.Shard.shard:type_name -> vtctldata.Shard
+	148, // 18: vtadmin.Shard.shard:type_name -> vtctldata.Shard
 	1,   // 19: vtadmin.SrvVSchema.cluster:type_name -> vtadmin.Cluster
-	147, // 20: vtadmin.SrvVSchema.srv_v_schema:type_name -> vschema.SrvVSchema
+	149, // 20: vtadmin.SrvVSchema.srv_v_schema:type_name -> vschema.SrvVSchema
 	1,   // 21: vtadmin.Tablet.cluster:type_name -> vtadmin.Cluster
-	148, // 22: vtadmin.Tablet.tablet:type_name -> topodata.Tablet
+	150, // 22: vtadmin.Tablet.tablet:type_name -> topodata.Tablet
 	0,   // 23: vtadmin.Tablet.state:type_name -> vtadmin.Tablet.ServingState
 	1,   // 24: vtadmin.VSchema.cluster:type_name -> vtadmin.Cluster
-	149, // 25: vtadmin.VSchema.v_schema:type_name -> vschema.Keyspace
+	151, // 25: vtadmin.VSchema.v_schema:type_name -> vschema.Keyspace
 	1,   // 26: vtadmin.Vtctld.cluster:type_name -> vtadmin.Cluster
 	1,   // 27: vtadmin.VTGate.cluster:type_name -> vtadmin.Cluster
 	1,   // 28: vtadmin.Workflow.cluster:type_name -> vtadmin.Cluster
-	150, // 29: vtadmin.Workflow.workflow:type_name -> vtctldata.Workflow
-	151, // 30: vtadmin.WorkflowDeleteRequest.request:type_name -> vtctldata.WorkflowDeleteRequest
-	152, // 31: vtadmin.WorkflowSwitchTrafficRequest.request:type_name -> vtctldata.WorkflowSwitchTrafficRequest
-	153, // 32: vtadmin.ApplySchemaRequest.request:type_name -> vtctldata.ApplySchemaRequest
-	154, // 33: vtadmin.CancelSchemaMigrationRequest.request:type_name -> vtctldata.CancelSchemaMigrationRequest
-	155, // 34: vtadmin.CleanupSchemaMigrationRequest.request:type_name -> vtctldata.CleanupSchemaMigrationRequest
-	156, // 35: vtadmin.CompleteSchemaMigrationRequest.request:type_name -> vtctldata.CompleteSchemaMigrationRequest
-	157, // 36: vtadmin.CreateKeyspaceRequest.options:type_name -> vtctldata.CreateKeyspaceRequest
+	152, // 29: vtadmin.Workflow.workflow:type_name -> vtctldata.Workflow
+	153, // 30: vtadmin.WorkflowDeleteRequest.request:type_name -> vtctldata.WorkflowDeleteRequest
+	154, // 31: vtadmin.WorkflowSwitchTrafficRequest.request:type_name -> vtctldata.WorkflowSwitchTrafficRequest
+	155, // 32: vtadmin.ApplySchemaRequest.request:type_name -> vtctldata.ApplySchemaRequest
+	156, // 33: vtadmin.CancelSchemaMigrationRequest.request:type_name -> vtctldata.CancelSchemaMigrationRequest
+	157, // 34: vtadmin.CleanupSchemaMigrationRequest.request:type_name -> vtctldata.CleanupSchemaMigrationRequest
+	158, // 35: vtadmin.CompleteSchemaMigrationRequest.request:type_name -> vtctldata.CompleteSchemaMigrationRequest
+	159, // 36: vtadmin.CreateKeyspaceRequest.options:type_name -> vtctldata.CreateKeyspaceRequest
 	7,   // 37: vtadmin.CreateKeyspaceResponse.keyspace:type_name -> vtadmin.Keyspace
-	158, // 38: vtadmin.CreateShardRequest.options:type_name -> vtctldata.CreateShardRequest
-	159, // 39: vtadmin.DeleteKeyspaceRequest.options:type_name -> vtctldata.DeleteKeyspaceRequest
-	160, // 40: vtadmin.DeleteShardsRequest.options:type_name -> vtctldata.DeleteShardsRequest
-	161, // 41: vtadmin.DeleteTabletRequest.alias:type_name -> topodata.TabletAlias
+	160, // 38: vtadmin.CreateShardRequest.options:type_name -> vtctldata.CreateShardRequest
+	161, // 39: vtadmin.DeleteKeyspaceRequest.options:type_name -> vtctldata.DeleteKeyspaceRequest
+	162, // 40: vtadmin.DeleteShardsRequest.options:type_name -> vtctldata.DeleteShardsRequest
+	163, // 41: vtadmin.DeleteTabletRequest.alias:type_name -> topodata.TabletAlias
 	1,   // 42: vtadmin.DeleteTabletResponse.cluster:type_name -> vtadmin.Cluster
-	162, // 43: vtadmin.EmergencyFailoverShardRequest.options:type_name -> vtctldata.EmergencyReparentShardRequest
+	164, // 43: vtadmin.EmergencyFailoverShardRequest.options:type_name -> vtctldata.EmergencyReparentShardRequest
 	1,   // 44: vtadmin.EmergencyFailoverShardResponse.cluster:type_name -> vtadmin.Cluster
-	161, // 45: vtadmin.EmergencyFailoverShardResponse.promoted_primary:type_name -> topodata.TabletAlias
-	163, // 46: vtadmin.EmergencyFailoverShardResponse.events:type_name -> logutil.Event
+	163, // 45: vtadmin.EmergencyFailoverShardResponse.promoted_primary:type_name -> topodata.TabletAlias
+	165, // 46: vtadmin.EmergencyFailoverShardResponse.events:type_name -> logutil.Event
 	61,  // 47: vtadmin.FindSchemaRequest.table_size_options:type_name -> vtadmin.GetSchemaTableSizeOptions
-	164, // 48: vtadmin.GetBackupsRequest.request_options:type_name -> vtctldata.GetBackupsRequest
+	166, // 48: vtadmin.GetBackupsRequest.request_options:type_name -> vtctldata.GetBackupsRequest
 	2,   // 49: vtadmin.GetBackupsResponse.backups:type_name -> vtadmin.ClusterBackup
 	4,   // 50: vtadmin.GetCellInfosResponse.cell_infos:type_name -> vtadmin.ClusterCellInfo
 	3,   // 51: vtadmin.GetCellsAliasesResponse.aliases:type_name -> vtadmin.ClusterCellsAliases
 	1,   // 52: vtadmin.GetClustersResponse.clusters:type_name -> vtadmin.Cluster
-	161, // 53: vtadmin.GetFullStatusRequest.alias:type_name -> topodata.TabletAlias
+	163, // 53: vtadmin.GetFullStatusRequest.alias:type_name -> topodata.TabletAlias
 	15,  // 54: vtadmin.GetGatesResponse.gates:type_name -> vtadmin.VTGate
 	7,   // 55: vtadmin.GetKeyspacesResponse.keyspaces:type_name -> vtadmin.Keyspace
 	61,  // 56: vtadmin.GetSchemaRequest.table_size_options:type_name -> vtadmin.GetSchemaTableSizeOptions
 	61,  // 57: vtadmin.GetSchemasRequest.table_size_options:type_name -> vtadmin.GetSchemaTableSizeOptions
 	8,   // 58: vtadmin.GetSchemasResponse.schemas:type_name -> vtadmin.Schema
-	133, // 59: vtadmin.GetSchemaMigrationsRequest.cluster_requests:type_name -> vtadmin.GetSchemaMigrationsRequest.ClusterRequest
+	135, // 59: vtadmin.GetSchemaMigrationsRequest.cluster_requests:type_name -> vtadmin.GetSchemaMigrationsRequest.ClusterRequest
 	9,   // 60: vtadmin.GetSchemaMigrationsResponse.schema_migrations:type_name -> vtadmin.SchemaMigration
 	5,   // 61: vtadmin.GetShardReplicationPositionsResponse.replication_positions:type_name -> vtadmin.ClusterShardReplicationPosition
-	134, // 62: vtadmin.GetSrvKeyspacesResponse.srv_keyspaces:type_name -> vtadmin.GetSrvKeyspacesResponse.SrvKeyspacesEntry
+	136, // 62: vtadmin.GetSrvKeyspacesResponse.srv_keyspaces:type_name -> vtadmin.GetSrvKeyspacesResponse.SrvKeyspacesEntry
 	11,  // 63: vtadmin.GetSrvVSchemasResponse.srv_v_schemas:type_name -> vtadmin.SrvVSchema
-	161, // 64: vtadmin.GetTabletRequest.alias:type_name -> topodata.TabletAlias
+	163, // 64: vtadmin.GetTabletRequest.alias:type_name -> topodata.TabletAlias
 	12,  // 65: vtadmin.GetTabletsResponse.tablets:type_name -> vtadmin.Tablet
-	165, // 66: vtadmin.GetTransactionInfoRequest.request:type_name -> vtctldata.GetTransactionInfoRequest
+	167, // 66: vtadmin.GetTransactionInfoRequest.request:type_name -> vtctldata.GetTransactionInfoRequest
 	13,  // 67: vtadmin.GetVSchemasResponse.v_schemas:type_name -> vtadmin.VSchema
 	14,  // 68: vtadmin.GetVtctldsResponse.vtctlds:type_name -> vtadmin.Vtctld
-	135, // 69: vtadmin.GetWorkflowsResponse.workflows_by_cluster:type_name -> vtadmin.GetWorkflowsResponse.WorkflowsByClusterEntry
-	166, // 70: vtadmin.LaunchSchemaMigrationRequest.request:type_name -> vtctldata.LaunchSchemaMigrationRequest
-	167, // 71: vtadmin.MaterializeCreateRequest.request:type_name -> vtctldata.MaterializeCreateRequest
-	168, // 72: vtadmin.MoveTablesCompleteRequest.request:type_name -> vtctldata.MoveTablesCompleteRequest
-	169, // 73: vtadmin.MoveTablesCreateRequest.request:type_name -> vtctldata.MoveTablesCreateRequest
-	161, // 74: vtadmin.PingTabletRequest.alias:type_name -> topodata.TabletAlias
+	137, // 69: vtadmin.GetWorkflowsResponse.workflows_by_cluster:type_name -> vtadmin.GetWorkflowsResponse.WorkflowsByClusterEntry
+	168, // 70: vtadmin.LaunchSchemaMigrationRequest.request:type_name -> vtctldata.LaunchSchemaMigrationRequest
+	169, // 71: vtadmin.MaterializeCreateRequest.request:type_name -> vtctldata.MaterializeCreateRequest
+	170, // 72: vtadmin.MoveTablesCompleteRequest.request:type_name -> vtctldata.MoveTablesCompleteRequest
+	171, // 73: vtadmin.MoveTablesCreateRequest.request:type_name -> vtctldata.MoveTablesCreateRequest
+	163, // 74: vtadmin.PingTabletRequest.alias:type_name -> topodata.TabletAlias
 	1,   // 75: vtadmin.PingTabletResponse.cluster:type_name -> vtadmin.Cluster
-	170, // 76: vtadmin.PlannedFailoverShardRequest.options:type_name -> vtctldata.PlannedReparentShardRequest
+	172, // 76: vtadmin.PlannedFailoverShardRequest.options:type_name -> vtctldata.PlannedReparentShardRequest
 	1,   // 77: vtadmin.PlannedFailoverShardResponse.cluster:type_name -> vtadmin.Cluster
-	161, // 78: vtadmin.PlannedFailoverShardResponse.promoted_primary:type_name -> topodata.TabletAlias
-	163, // 79: vtadmin.PlannedFailoverShardResponse.events:type_name -> logutil.Event
-	161, // 80: vtadmin.RefreshStateRequest.alias:type_name -> topodata.TabletAlias
+	163, // 78: vtadmin.PlannedFailoverShardResponse.promoted_primary:type_name -> topodata.TabletAlias
+	165, // 79: vtadmin.PlannedFailoverShardResponse.events:type_name -> logutil.Event
+	163, // 80: vtadmin.RefreshStateRequest.alias:type_name -> topodata.TabletAlias
 	1,   // 81: vtadmin.RefreshStateResponse.cluster:type_name -> vtadmin.Cluster
-	161, // 82: vtadmin.ReloadSchemasRequest.tablets:type_name -> topodata.TabletAlias
-	136, // 83: vtadmin.ReloadSchemasResponse.keyspace_results:type_name -> vtadmin.ReloadSchemasResponse.KeyspaceResult
-	137, // 84: vtadmin.ReloadSchemasResponse.shard_results:type_name -> vtadmin.ReloadSchemasResponse.ShardResult
-	138, // 85: vtadmin.ReloadSchemasResponse.tablet_results:type_name -> vtadmin.ReloadSchemasResponse.TabletResult
-	163, // 86: vtadmin.ReloadSchemaShardResponse.events:type_name -> logutil.Event
-	161, // 87: vtadmin.RefreshTabletReplicationSourceRequest.alias:type_name -> topodata.TabletAlias
-	161, // 88: vtadmin.RefreshTabletReplicationSourceResponse.primary:type_name -> topodata.TabletAlias
+	163, // 82: vtadmin.ReloadSchemasRequest.tablets:type_name -> topodata.TabletAlias
+	138, // 83: vtadmin.ReloadSchemasResponse.keyspace_results:type_name -> vtadmin.ReloadSchemasResponse.KeyspaceResult
+	139, // 84: vtadmin.ReloadSchemasResponse.shard_results:type_name -> vtadmin.ReloadSchemasResponse.ShardResult
+	140, // 85: vtadmin.ReloadSchemasResponse.tablet_results:type_name -> vtadmin.ReloadSchemasResponse.TabletResult
+	165, // 86: vtadmin.ReloadSchemaShardResponse.events:type_name -> logutil.Event
+	163, // 87: vtadmin.RefreshTabletReplicationSourceRequest.alias:type_name -> topodata.TabletAlias
+	163, // 88: vtadmin.RefreshTabletReplicationSourceResponse.primary:type_name -> topodata.TabletAlias
 	1,   // 89: vtadmin.RefreshTabletReplicationSourceResponse.cluster:type_name -> vtadmin.Cluster
-	171, // 90: vtadmin.RetrySchemaMigrationRequest.request:type_name -> vtctldata.RetrySchemaMigrationRequest
-	161, // 91: vtadmin.RunHealthCheckRequest.alias:type_name -> topodata.TabletAlias
+	173, // 90: vtadmin.RetrySchemaMigrationRequest.request:type_name -> vtctldata.RetrySchemaMigrationRequest
+	163, // 91: vtadmin.RunHealthCheckRequest.alias:type_name -> topodata.TabletAlias
 	1,   // 92: vtadmin.RunHealthCheckResponse.cluster:type_name -> vtadmin.Cluster
-	172, // 93: vtadmin.ReshardCreateRequest.request:type_name -> vtctldata.ReshardCreateRequest
-	161, // 94: vtadmin.SetReadOnlyRequest.alias:type_name -> topodata.TabletAlias
-	161, // 95: vtadmin.SetReadWriteRequest.alias:type_name -> topodata.TabletAlias
-	161, // 96: vtadmin.StartReplicationRequest.alias:type_name -> topodata.TabletAlias
+	174, // 93: vtadmin.ReshardCreateRequest.request:type_name -> vtctldata.ReshardCreateRequest
+	163, // 94: vtadmin.SetReadOnlyRequest.alias:type_name -> topodata.TabletAlias
+	163, // 95: vtadmin.SetReadWriteRequest.alias:type_name -> topodata.TabletAlias
+	163, // 96: vtadmin.StartReplicationRequest.alias:type_name -> topodata.TabletAlias
 	1,   // 97: vtadmin.StartReplicationResponse.cluster:type_name -> vtadmin.Cluster
-	161, // 98: vtadmin.StopReplicationRequest.alias:type_name -> topodata.TabletAlias
+	163, // 98: vtadmin.StopReplicationRequest.alias:type_name -> topodata.TabletAlias
 	1,   // 99: vtadmin.StopReplicationResponse.cluster:type_name -> vtadmin.Cluster
-	161, // 100: vtadmin.TabletExternallyPromotedRequest.alias:type_name -> topodata.TabletAlias
+	163, // 100: vtadmin.TabletExternallyPromotedRequest.alias:type_name -> topodata.TabletAlias
 	1,   // 101: vtadmin.TabletExternallyPromotedResponse.cluster:type_name -> vtadmin.Cluster
-	161, // 102: vtadmin.TabletExternallyPromotedResponse.new_primary:type_name -> topodata.TabletAlias
-	161, // 103: vtadmin.TabletExternallyPromotedResponse.old_primary:type_name -> topodata.TabletAlias
-	161, // 104: vtadmin.TabletExternallyReparentedRequest.alias:type_name -> topodata.TabletAlias
-	173, // 105: vtadmin.VDiffCreateRequest.request:type_name -> vtctldata.VDiffCreateRequest
-	174, // 106: vtadmin.VDiffShowRequest.request:type_name -> vtctldata.VDiffShowRequest
+	163, // 102: vtadmin.TabletExternallyPromotedResponse.new_primary:type_name -> topodata.TabletAlias
+	163, // 103: vtadmin.TabletExternallyPromotedResponse.old_primary:type_name -> topodata.TabletAlias
+	163, // 104: vtadmin.TabletExternallyReparentedRequest.alias:type_name -> topodata.TabletAlias
+	175, // 105: vtadmin.VDiffCreateRequest.request:type_name -> vtctldata.VDiffCreateRequest
+	176, // 106: vtadmin.VDiffShowRequest.request:type_name -> vtctldata.VDiffShowRequest
 	122, // 107: vtadmin.VDiffShardReport.progress:type_name -> vtadmin.VDiffProgress
-	139, // 108: vtadmin.VDiffShowResponse.shard_report:type_name -> vtadmin.VDiffShowResponse.ShardReportEntry
-	175, // 109: vtadmin.ClusterCellsAliases.AliasesEntry.value:type_name -> topodata.CellsAlias
-	146, // 110: vtadmin.Keyspace.ShardsEntry.value:type_name -> vtctldata.Shard
-	131, // 111: vtadmin.Schema.TableSizesEntry.value:type_name -> vtadmin.Schema.TableSize
-	132, // 112: vtadmin.Schema.TableSize.by_shard:type_name -> vtadmin.Schema.TableSize.ByShardEntry
-	130, // 113: vtadmin.Schema.TableSize.ByShardEntry.value:type_name -> vtadmin.Schema.ShardTableSize
-	176, // 114: vtadmin.GetSchemaMigrationsRequest.ClusterRequest.request:type_name -> vtctldata.GetSchemaMigrationsRequest
-	177, // 115: vtadmin.GetSrvKeyspacesResponse.SrvKeyspacesEntry.value:type_name -> vtctldata.GetSrvKeyspacesResponse
+	141, // 108: vtadmin.VDiffShowResponse.shard_report:type_name -> vtadmin.VDiffShowResponse.ShardReportEntry
+	177, // 109: vtadmin.ClusterCellsAliases.AliasesEntry.value:type_name -> topodata.CellsAlias
+	148, // 110: vtadmin.Keyspace.ShardsEntry.value:type_name -> vtctldata.Shard
+	133, // 111: vtadmin.Schema.TableSizesEntry.value:type_name -> vtadmin.Schema.TableSize
+	134, // 112: vtadmin.Schema.TableSize.by_shard:type_name -> vtadmin.Schema.TableSize.ByShardEntry
+	132, // 113: vtadmin.Schema.TableSize.ByShardEntry.value:type_name -> vtadmin.Schema.ShardTableSize
+	178, // 114: vtadmin.GetSchemaMigrationsRequest.ClusterRequest.request:type_name -> vtctldata.GetSchemaMigrationsRequest
+	179, // 115: vtadmin.GetSrvKeyspacesResponse.SrvKeyspacesEntry.value:type_name -> vtctldata.GetSrvKeyspacesResponse
 	6,   // 116: vtadmin.GetWorkflowsResponse.WorkflowsByClusterEntry.value:type_name -> vtadmin.ClusterWorkflows
 	7,   // 117: vtadmin.ReloadSchemasResponse.KeyspaceResult.keyspace:type_name -> vtadmin.Keyspace
-	163, // 118: vtadmin.ReloadSchemasResponse.KeyspaceResult.events:type_name -> logutil.Event
+	165, // 118: vtadmin.ReloadSchemasResponse.KeyspaceResult.events:type_name -> logutil.Event
 	10,  // 119: vtadmin.ReloadSchemasResponse.ShardResult.shard:type_name -> vtadmin.Shard
-	163, // 120: vtadmin.ReloadSchemasResponse.ShardResult.events:type_name -> logutil.Event
+	165, // 120: vtadmin.ReloadSchemasResponse.ShardResult.events:type_name -> logutil.Event
 	12,  // 121: vtadmin.ReloadSchemasResponse.TabletResult.tablet:type_name -> vtadmin.Tablet
 	123, // 122: vtadmin.VDiffShowResponse.ShardReportEntry.value:type_name -> vtadmin.VDiffShardReport
 	19,  // 123: vtadmin.VTAdmin.ApplySchema:input_type -> vtadmin.ApplySchemaRequest
@@ -9362,82 +9483,84 @@ var file_vtadmin_proto_depIdxs = []int32{
 	120, // 190: vtadmin.VTAdmin.VDiffCreate:input_type -> vtadmin.VDiffCreateRequest
 	121, // 191: vtadmin.VTAdmin.VDiffShow:input_type -> vtadmin.VDiffShowRequest
 	125, // 192: vtadmin.VTAdmin.VTExplain:input_type -> vtadmin.VTExplainRequest
-	17,  // 193: vtadmin.VTAdmin.WorkflowDelete:input_type -> vtadmin.WorkflowDeleteRequest
-	18,  // 194: vtadmin.VTAdmin.WorkflowSwitchTraffic:input_type -> vtadmin.WorkflowSwitchTrafficRequest
-	178, // 195: vtadmin.VTAdmin.ApplySchema:output_type -> vtctldata.ApplySchemaResponse
-	179, // 196: vtadmin.VTAdmin.CancelSchemaMigration:output_type -> vtctldata.CancelSchemaMigrationResponse
-	180, // 197: vtadmin.VTAdmin.CleanupSchemaMigration:output_type -> vtctldata.CleanupSchemaMigrationResponse
-	181, // 198: vtadmin.VTAdmin.CompleteSchemaMigration:output_type -> vtctldata.CompleteSchemaMigrationResponse
-	182, // 199: vtadmin.VTAdmin.ConcludeTransaction:output_type -> vtctldata.ConcludeTransactionResponse
-	25,  // 200: vtadmin.VTAdmin.CreateKeyspace:output_type -> vtadmin.CreateKeyspaceResponse
-	183, // 201: vtadmin.VTAdmin.CreateShard:output_type -> vtctldata.CreateShardResponse
-	184, // 202: vtadmin.VTAdmin.DeleteKeyspace:output_type -> vtctldata.DeleteKeyspaceResponse
-	185, // 203: vtadmin.VTAdmin.DeleteShards:output_type -> vtctldata.DeleteShardsResponse
-	30,  // 204: vtadmin.VTAdmin.DeleteTablet:output_type -> vtadmin.DeleteTabletResponse
-	32,  // 205: vtadmin.VTAdmin.EmergencyFailoverShard:output_type -> vtadmin.EmergencyFailoverShardResponse
-	8,   // 206: vtadmin.VTAdmin.FindSchema:output_type -> vtadmin.Schema
-	35,  // 207: vtadmin.VTAdmin.GetBackups:output_type -> vtadmin.GetBackupsResponse
-	37,  // 208: vtadmin.VTAdmin.GetCellInfos:output_type -> vtadmin.GetCellInfosResponse
-	39,  // 209: vtadmin.VTAdmin.GetCellsAliases:output_type -> vtadmin.GetCellsAliasesResponse
-	41,  // 210: vtadmin.VTAdmin.GetClusters:output_type -> vtadmin.GetClustersResponse
-	186, // 211: vtadmin.VTAdmin.GetFullStatus:output_type -> vtctldata.GetFullStatusResponse
-	44,  // 212: vtadmin.VTAdmin.GetGates:output_type -> vtadmin.GetGatesResponse
-	7,   // 213: vtadmin.VTAdmin.GetKeyspace:output_type -> vtadmin.Keyspace
-	47,  // 214: vtadmin.VTAdmin.GetKeyspaces:output_type -> vtadmin.GetKeyspacesResponse
-	8,   // 215: vtadmin.VTAdmin.GetSchema:output_type -> vtadmin.Schema
-	50,  // 216: vtadmin.VTAdmin.GetSchemas:output_type -> vtadmin.GetSchemasResponse
-	52,  // 217: vtadmin.VTAdmin.GetSchemaMigrations:output_type -> vtadmin.GetSchemaMigrationsResponse
-	54,  // 218: vtadmin.VTAdmin.GetShardReplicationPositions:output_type -> vtadmin.GetShardReplicationPositionsResponse
-	177, // 219: vtadmin.VTAdmin.GetSrvKeyspace:output_type -> vtctldata.GetSrvKeyspacesResponse
-	57,  // 220: vtadmin.VTAdmin.GetSrvKeyspaces:output_type -> vtadmin.GetSrvKeyspacesResponse
-	11,  // 221: vtadmin.VTAdmin.GetSrvVSchema:output_type -> vtadmin.SrvVSchema
-	60,  // 222: vtadmin.VTAdmin.GetSrvVSchemas:output_type -> vtadmin.GetSrvVSchemasResponse
-	12,  // 223: vtadmin.VTAdmin.GetTablet:output_type -> vtadmin.Tablet
-	64,  // 224: vtadmin.VTAdmin.GetTablets:output_type -> vtadmin.GetTabletsResponse
-	187, // 225: vtadmin.VTAdmin.GetTopologyPath:output_type -> vtctldata.GetTopologyPathResponse
-	188, // 226: vtadmin.VTAdmin.GetTransactionInfo:output_type -> vtctldata.GetTransactionInfoResponse
-	189, // 227: vtadmin.VTAdmin.GetUnresolvedTransactions:output_type -> vtctldata.GetUnresolvedTransactionsResponse
-	13,  // 228: vtadmin.VTAdmin.GetVSchema:output_type -> vtadmin.VSchema
-	70,  // 229: vtadmin.VTAdmin.GetVSchemas:output_type -> vtadmin.GetVSchemasResponse
-	72,  // 230: vtadmin.VTAdmin.GetVtctlds:output_type -> vtadmin.GetVtctldsResponse
-	16,  // 231: vtadmin.VTAdmin.GetWorkflow:output_type -> vtadmin.Workflow
-	78,  // 232: vtadmin.VTAdmin.GetWorkflows:output_type -> vtadmin.GetWorkflowsResponse
-	190, // 233: vtadmin.VTAdmin.GetWorkflowStatus:output_type -> vtctldata.WorkflowStatusResponse
-	191, // 234: vtadmin.VTAdmin.StartWorkflow:output_type -> vtctldata.WorkflowUpdateResponse
-	191, // 235: vtadmin.VTAdmin.StopWorkflow:output_type -> vtctldata.WorkflowUpdateResponse
-	192, // 236: vtadmin.VTAdmin.LaunchSchemaMigration:output_type -> vtctldata.LaunchSchemaMigrationResponse
-	193, // 237: vtadmin.VTAdmin.MoveTablesComplete:output_type -> vtctldata.MoveTablesCompleteResponse
-	190, // 238: vtadmin.VTAdmin.MoveTablesCreate:output_type -> vtctldata.WorkflowStatusResponse
-	194, // 239: vtadmin.VTAdmin.MaterializeCreate:output_type -> vtctldata.MaterializeCreateResponse
-	84,  // 240: vtadmin.VTAdmin.PingTablet:output_type -> vtadmin.PingTabletResponse
-	86,  // 241: vtadmin.VTAdmin.PlannedFailoverShard:output_type -> vtadmin.PlannedFailoverShardResponse
-	88,  // 242: vtadmin.VTAdmin.RebuildKeyspaceGraph:output_type -> vtadmin.RebuildKeyspaceGraphResponse
-	90,  // 243: vtadmin.VTAdmin.RefreshState:output_type -> vtadmin.RefreshStateResponse
-	96,  // 244: vtadmin.VTAdmin.RefreshTabletReplicationSource:output_type -> vtadmin.RefreshTabletReplicationSourceResponse
-	92,  // 245: vtadmin.VTAdmin.ReloadSchemas:output_type -> vtadmin.ReloadSchemasResponse
-	94,  // 246: vtadmin.VTAdmin.ReloadSchemaShard:output_type -> vtadmin.ReloadSchemaShardResponse
-	98,  // 247: vtadmin.VTAdmin.RemoveKeyspaceCell:output_type -> vtadmin.RemoveKeyspaceCellResponse
-	195, // 248: vtadmin.VTAdmin.RetrySchemaMigration:output_type -> vtctldata.RetrySchemaMigrationResponse
-	101, // 249: vtadmin.VTAdmin.RunHealthCheck:output_type -> vtadmin.RunHealthCheckResponse
-	190, // 250: vtadmin.VTAdmin.ReshardCreate:output_type -> vtctldata.WorkflowStatusResponse
-	104, // 251: vtadmin.VTAdmin.SetReadOnly:output_type -> vtadmin.SetReadOnlyResponse
-	106, // 252: vtadmin.VTAdmin.SetReadWrite:output_type -> vtadmin.SetReadWriteResponse
-	108, // 253: vtadmin.VTAdmin.StartReplication:output_type -> vtadmin.StartReplicationResponse
-	110, // 254: vtadmin.VTAdmin.StopReplication:output_type -> vtadmin.StopReplicationResponse
-	112, // 255: vtadmin.VTAdmin.TabletExternallyPromoted:output_type -> vtadmin.TabletExternallyPromotedResponse
-	196, // 256: vtadmin.VTAdmin.Validate:output_type -> vtctldata.ValidateResponse
-	197, // 257: vtadmin.VTAdmin.ValidateKeyspace:output_type -> vtctldata.ValidateKeyspaceResponse
-	198, // 258: vtadmin.VTAdmin.ValidateSchemaKeyspace:output_type -> vtctldata.ValidateSchemaKeyspaceResponse
-	199, // 259: vtadmin.VTAdmin.ValidateShard:output_type -> vtctldata.ValidateShardResponse
-	200, // 260: vtadmin.VTAdmin.ValidateVersionKeyspace:output_type -> vtctldata.ValidateVersionKeyspaceResponse
-	201, // 261: vtadmin.VTAdmin.ValidateVersionShard:output_type -> vtctldata.ValidateVersionShardResponse
-	202, // 262: vtadmin.VTAdmin.VDiffCreate:output_type -> vtctldata.VDiffCreateResponse
-	124, // 263: vtadmin.VTAdmin.VDiffShow:output_type -> vtadmin.VDiffShowResponse
-	126, // 264: vtadmin.VTAdmin.VTExplain:output_type -> vtadmin.VTExplainResponse
-	203, // 265: vtadmin.VTAdmin.WorkflowDelete:output_type -> vtctldata.WorkflowDeleteResponse
-	204, // 266: vtadmin.VTAdmin.WorkflowSwitchTraffic:output_type -> vtctldata.WorkflowSwitchTrafficResponse
-	195, // [195:267] is the sub-list for method output_type
-	123, // [123:195] is the sub-list for method input_type
+	127, // 193: vtadmin.VTAdmin.VExplain:input_type -> vtadmin.VExplainRequest
+	17,  // 194: vtadmin.VTAdmin.WorkflowDelete:input_type -> vtadmin.WorkflowDeleteRequest
+	18,  // 195: vtadmin.VTAdmin.WorkflowSwitchTraffic:input_type -> vtadmin.WorkflowSwitchTrafficRequest
+	180, // 196: vtadmin.VTAdmin.ApplySchema:output_type -> vtctldata.ApplySchemaResponse
+	181, // 197: vtadmin.VTAdmin.CancelSchemaMigration:output_type -> vtctldata.CancelSchemaMigrationResponse
+	182, // 198: vtadmin.VTAdmin.CleanupSchemaMigration:output_type -> vtctldata.CleanupSchemaMigrationResponse
+	183, // 199: vtadmin.VTAdmin.CompleteSchemaMigration:output_type -> vtctldata.CompleteSchemaMigrationResponse
+	184, // 200: vtadmin.VTAdmin.ConcludeTransaction:output_type -> vtctldata.ConcludeTransactionResponse
+	25,  // 201: vtadmin.VTAdmin.CreateKeyspace:output_type -> vtadmin.CreateKeyspaceResponse
+	185, // 202: vtadmin.VTAdmin.CreateShard:output_type -> vtctldata.CreateShardResponse
+	186, // 203: vtadmin.VTAdmin.DeleteKeyspace:output_type -> vtctldata.DeleteKeyspaceResponse
+	187, // 204: vtadmin.VTAdmin.DeleteShards:output_type -> vtctldata.DeleteShardsResponse
+	30,  // 205: vtadmin.VTAdmin.DeleteTablet:output_type -> vtadmin.DeleteTabletResponse
+	32,  // 206: vtadmin.VTAdmin.EmergencyFailoverShard:output_type -> vtadmin.EmergencyFailoverShardResponse
+	8,   // 207: vtadmin.VTAdmin.FindSchema:output_type -> vtadmin.Schema
+	35,  // 208: vtadmin.VTAdmin.GetBackups:output_type -> vtadmin.GetBackupsResponse
+	37,  // 209: vtadmin.VTAdmin.GetCellInfos:output_type -> vtadmin.GetCellInfosResponse
+	39,  // 210: vtadmin.VTAdmin.GetCellsAliases:output_type -> vtadmin.GetCellsAliasesResponse
+	41,  // 211: vtadmin.VTAdmin.GetClusters:output_type -> vtadmin.GetClustersResponse
+	188, // 212: vtadmin.VTAdmin.GetFullStatus:output_type -> vtctldata.GetFullStatusResponse
+	44,  // 213: vtadmin.VTAdmin.GetGates:output_type -> vtadmin.GetGatesResponse
+	7,   // 214: vtadmin.VTAdmin.GetKeyspace:output_type -> vtadmin.Keyspace
+	47,  // 215: vtadmin.VTAdmin.GetKeyspaces:output_type -> vtadmin.GetKeyspacesResponse
+	8,   // 216: vtadmin.VTAdmin.GetSchema:output_type -> vtadmin.Schema
+	50,  // 217: vtadmin.VTAdmin.GetSchemas:output_type -> vtadmin.GetSchemasResponse
+	52,  // 218: vtadmin.VTAdmin.GetSchemaMigrations:output_type -> vtadmin.GetSchemaMigrationsResponse
+	54,  // 219: vtadmin.VTAdmin.GetShardReplicationPositions:output_type -> vtadmin.GetShardReplicationPositionsResponse
+	179, // 220: vtadmin.VTAdmin.GetSrvKeyspace:output_type -> vtctldata.GetSrvKeyspacesResponse
+	57,  // 221: vtadmin.VTAdmin.GetSrvKeyspaces:output_type -> vtadmin.GetSrvKeyspacesResponse
+	11,  // 222: vtadmin.VTAdmin.GetSrvVSchema:output_type -> vtadmin.SrvVSchema
+	60,  // 223: vtadmin.VTAdmin.GetSrvVSchemas:output_type -> vtadmin.GetSrvVSchemasResponse
+	12,  // 224: vtadmin.VTAdmin.GetTablet:output_type -> vtadmin.Tablet
+	64,  // 225: vtadmin.VTAdmin.GetTablets:output_type -> vtadmin.GetTabletsResponse
+	189, // 226: vtadmin.VTAdmin.GetTopologyPath:output_type -> vtctldata.GetTopologyPathResponse
+	190, // 227: vtadmin.VTAdmin.GetTransactionInfo:output_type -> vtctldata.GetTransactionInfoResponse
+	191, // 228: vtadmin.VTAdmin.GetUnresolvedTransactions:output_type -> vtctldata.GetUnresolvedTransactionsResponse
+	13,  // 229: vtadmin.VTAdmin.GetVSchema:output_type -> vtadmin.VSchema
+	70,  // 230: vtadmin.VTAdmin.GetVSchemas:output_type -> vtadmin.GetVSchemasResponse
+	72,  // 231: vtadmin.VTAdmin.GetVtctlds:output_type -> vtadmin.GetVtctldsResponse
+	16,  // 232: vtadmin.VTAdmin.GetWorkflow:output_type -> vtadmin.Workflow
+	78,  // 233: vtadmin.VTAdmin.GetWorkflows:output_type -> vtadmin.GetWorkflowsResponse
+	192, // 234: vtadmin.VTAdmin.GetWorkflowStatus:output_type -> vtctldata.WorkflowStatusResponse
+	193, // 235: vtadmin.VTAdmin.StartWorkflow:output_type -> vtctldata.WorkflowUpdateResponse
+	193, // 236: vtadmin.VTAdmin.StopWorkflow:output_type -> vtctldata.WorkflowUpdateResponse
+	194, // 237: vtadmin.VTAdmin.LaunchSchemaMigration:output_type -> vtctldata.LaunchSchemaMigrationResponse
+	195, // 238: vtadmin.VTAdmin.MoveTablesComplete:output_type -> vtctldata.MoveTablesCompleteResponse
+	192, // 239: vtadmin.VTAdmin.MoveTablesCreate:output_type -> vtctldata.WorkflowStatusResponse
+	196, // 240: vtadmin.VTAdmin.MaterializeCreate:output_type -> vtctldata.MaterializeCreateResponse
+	84,  // 241: vtadmin.VTAdmin.PingTablet:output_type -> vtadmin.PingTabletResponse
+	86,  // 242: vtadmin.VTAdmin.PlannedFailoverShard:output_type -> vtadmin.PlannedFailoverShardResponse
+	88,  // 243: vtadmin.VTAdmin.RebuildKeyspaceGraph:output_type -> vtadmin.RebuildKeyspaceGraphResponse
+	90,  // 244: vtadmin.VTAdmin.RefreshState:output_type -> vtadmin.RefreshStateResponse
+	96,  // 245: vtadmin.VTAdmin.RefreshTabletReplicationSource:output_type -> vtadmin.RefreshTabletReplicationSourceResponse
+	92,  // 246: vtadmin.VTAdmin.ReloadSchemas:output_type -> vtadmin.ReloadSchemasResponse
+	94,  // 247: vtadmin.VTAdmin.ReloadSchemaShard:output_type -> vtadmin.ReloadSchemaShardResponse
+	98,  // 248: vtadmin.VTAdmin.RemoveKeyspaceCell:output_type -> vtadmin.RemoveKeyspaceCellResponse
+	197, // 249: vtadmin.VTAdmin.RetrySchemaMigration:output_type -> vtctldata.RetrySchemaMigrationResponse
+	101, // 250: vtadmin.VTAdmin.RunHealthCheck:output_type -> vtadmin.RunHealthCheckResponse
+	192, // 251: vtadmin.VTAdmin.ReshardCreate:output_type -> vtctldata.WorkflowStatusResponse
+	104, // 252: vtadmin.VTAdmin.SetReadOnly:output_type -> vtadmin.SetReadOnlyResponse
+	106, // 253: vtadmin.VTAdmin.SetReadWrite:output_type -> vtadmin.SetReadWriteResponse
+	108, // 254: vtadmin.VTAdmin.StartReplication:output_type -> vtadmin.StartReplicationResponse
+	110, // 255: vtadmin.VTAdmin.StopReplication:output_type -> vtadmin.StopReplicationResponse
+	112, // 256: vtadmin.VTAdmin.TabletExternallyPromoted:output_type -> vtadmin.TabletExternallyPromotedResponse
+	198, // 257: vtadmin.VTAdmin.Validate:output_type -> vtctldata.ValidateResponse
+	199, // 258: vtadmin.VTAdmin.ValidateKeyspace:output_type -> vtctldata.ValidateKeyspaceResponse
+	200, // 259: vtadmin.VTAdmin.ValidateSchemaKeyspace:output_type -> vtctldata.ValidateSchemaKeyspaceResponse
+	201, // 260: vtadmin.VTAdmin.ValidateShard:output_type -> vtctldata.ValidateShardResponse
+	202, // 261: vtadmin.VTAdmin.ValidateVersionKeyspace:output_type -> vtctldata.ValidateVersionKeyspaceResponse
+	203, // 262: vtadmin.VTAdmin.ValidateVersionShard:output_type -> vtctldata.ValidateVersionShardResponse
+	204, // 263: vtadmin.VTAdmin.VDiffCreate:output_type -> vtctldata.VDiffCreateResponse
+	124, // 264: vtadmin.VTAdmin.VDiffShow:output_type -> vtadmin.VDiffShowResponse
+	126, // 265: vtadmin.VTAdmin.VTExplain:output_type -> vtadmin.VTExplainResponse
+	128, // 266: vtadmin.VTAdmin.VExplain:output_type -> vtadmin.VExplainResponse
+	205, // 267: vtadmin.VTAdmin.WorkflowDelete:output_type -> vtctldata.WorkflowDeleteResponse
+	206, // 268: vtadmin.VTAdmin.WorkflowSwitchTraffic:output_type -> vtctldata.WorkflowSwitchTrafficResponse
+	196, // [196:269] is the sub-list for method output_type
+	123, // [123:196] is the sub-list for method input_type
 	123, // [123:123] is the sub-list for extension type_name
 	123, // [123:123] is the sub-list for extension extendee
 	0,   // [0:123] is the sub-list for field type_name
@@ -9454,7 +9577,7 @@ func file_vtadmin_proto_init() {
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
 			RawDescriptor: file_vtadmin_proto_rawDesc,
 			NumEnums:      1,
-			NumMessages:   139,
+			NumMessages:   141,
 			NumExtensions: 0,
 			NumServices:   1,
 		},
diff --git a/go/vt/proto/vtadmin/vtadmin_grpc.pb.go b/go/vt/proto/vtadmin/vtadmin_grpc.pb.go
index 89fffccd424..b1b84e6c2db 100644
--- a/go/vt/proto/vtadmin/vtadmin_grpc.pb.go
+++ b/go/vt/proto/vtadmin/vtadmin_grpc.pb.go
@@ -215,6 +215,9 @@ type VTAdminClient interface {
 	// VTExplain provides information on how Vitess plans to execute a
 	// particular query.
 	VTExplain(ctx context.Context, in *VTExplainRequest, opts ...grpc.CallOption) (*VTExplainResponse, error)
+	// VExplain provides information on how Vitess plans to execute a
+	// particular query.
+	VExplain(ctx context.Context, in *VExplainRequest, opts ...grpc.CallOption) (*VExplainResponse, error)
 	// WorkflowDelete deletes a vreplication workflow.
 	WorkflowDelete(ctx context.Context, in *WorkflowDeleteRequest, opts ...grpc.CallOption) (*vtctldata.WorkflowDeleteResponse, error)
 	// WorkflowSwitchTraffic switches traffic for a VReplication workflow.
@@ -859,6 +862,15 @@ func (c *vTAdminClient) VTExplain(ctx context.Context, in *VTExplainRequest, opt
 	return out, nil
 }
 
+func (c *vTAdminClient) VExplain(ctx context.Context, in *VExplainRequest, opts ...grpc.CallOption) (*VExplainResponse, error) {
+	out := new(VExplainResponse)
+	err := c.cc.Invoke(ctx, "/vtadmin.VTAdmin/VExplain", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
 func (c *vTAdminClient) WorkflowDelete(ctx context.Context, in *WorkflowDeleteRequest, opts ...grpc.CallOption) (*vtctldata.WorkflowDeleteResponse, error) {
 	out := new(vtctldata.WorkflowDeleteResponse)
 	err := c.cc.Invoke(ctx, "/vtadmin.VTAdmin/WorkflowDelete", in, out, opts...)
@@ -1073,6 +1085,9 @@ type VTAdminServer interface {
 	// VTExplain provides information on how Vitess plans to execute a
 	// particular query.
 	VTExplain(context.Context, *VTExplainRequest) (*VTExplainResponse, error)
+	// VExplain provides information on how Vitess plans to execute a
+	// particular query.
+	VExplain(context.Context, *VExplainRequest) (*VExplainResponse, error)
 	// WorkflowDelete deletes a vreplication workflow.
 	WorkflowDelete(context.Context, *WorkflowDeleteRequest) (*vtctldata.WorkflowDeleteResponse, error)
 	// WorkflowSwitchTraffic switches traffic for a VReplication workflow.
@@ -1294,6 +1309,9 @@ func (UnimplementedVTAdminServer) VDiffShow(context.Context, *VDiffShowRequest)
 func (UnimplementedVTAdminServer) VTExplain(context.Context, *VTExplainRequest) (*VTExplainResponse, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method VTExplain not implemented")
 }
+func (UnimplementedVTAdminServer) VExplain(context.Context, *VExplainRequest) (*VExplainResponse, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method VExplain not implemented")
+}
 func (UnimplementedVTAdminServer) WorkflowDelete(context.Context, *WorkflowDeleteRequest) (*vtctldata.WorkflowDeleteResponse, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method WorkflowDelete not implemented")
 }
@@ -2573,6 +2591,24 @@ func _VTAdmin_VTExplain_Handler(srv interface{}, ctx context.Context, dec func(i
 	return interceptor(ctx, in, info, handler)
 }
 
+func _VTAdmin_VExplain_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(VExplainRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(VTAdminServer).VExplain(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/vtadmin.VTAdmin/VExplain",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(VTAdminServer).VExplain(ctx, req.(*VExplainRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
 func _VTAdmin_WorkflowDelete_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
 	in := new(WorkflowDeleteRequest)
 	if err := dec(in); err != nil {
@@ -2896,6 +2932,10 @@ var VTAdmin_ServiceDesc = grpc.ServiceDesc{
 			MethodName: "VTExplain",
 			Handler:    _VTAdmin_VTExplain_Handler,
 		},
+		{
+			MethodName: "VExplain",
+			Handler:    _VTAdmin_VExplain_Handler,
+		},
 		{
 			MethodName: "WorkflowDelete",
 			Handler:    _VTAdmin_WorkflowDelete_Handler,
diff --git a/go/vt/proto/vtadmin/vtadmin_vtproto.pb.go b/go/vt/proto/vtadmin/vtadmin_vtproto.pb.go
index 82cca2cea06..31cfd018921 100644
--- a/go/vt/proto/vtadmin/vtadmin_vtproto.pb.go
+++ b/go/vt/proto/vtadmin/vtadmin_vtproto.pb.go
@@ -2801,6 +2801,42 @@ func (m *VTExplainResponse) CloneMessageVT() proto.Message {
 	return m.CloneVT()
 }
 
+func (m *VExplainRequest) CloneVT() *VExplainRequest {
+	if m == nil {
+		return (*VExplainRequest)(nil)
+	}
+	r := new(VExplainRequest)
+	r.ClusterId = m.ClusterId
+	r.Keyspace = m.Keyspace
+	r.Sql = m.Sql
+	if len(m.unknownFields) > 0 {
+		r.unknownFields = make([]byte, len(m.unknownFields))
+		copy(r.unknownFields, m.unknownFields)
+	}
+	return r
+}
+
+func (m *VExplainRequest) CloneMessageVT() proto.Message {
+	return m.CloneVT()
+}
+
+func (m *VExplainResponse) CloneVT() *VExplainResponse {
+	if m == nil {
+		return (*VExplainResponse)(nil)
+	}
+	r := new(VExplainResponse)
+	r.Response = m.Response
+	if len(m.unknownFields) > 0 {
+		r.unknownFields = make([]byte, len(m.unknownFields))
+		copy(r.unknownFields, m.unknownFields)
+	}
+	return r
+}
+
+func (m *VExplainResponse) CloneMessageVT() proto.Message {
+	return m.CloneVT()
+}
+
 func (m *Cluster) MarshalVT() (dAtA []byte, err error) {
 	if m == nil {
 		return nil, nil
@@ -9860,6 +9896,100 @@ func (m *VTExplainResponse) MarshalToSizedBufferVT(dAtA []byte) (int, error) {
 	return len(dAtA) - i, nil
 }
 
+func (m *VExplainRequest) MarshalVT() (dAtA []byte, err error) {
+	if m == nil {
+		return nil, nil
+	}
+	size := m.SizeVT()
+	dAtA = make([]byte, size)
+	n, err := m.MarshalToSizedBufferVT(dAtA[:size])
+	if err != nil {
+		return nil, err
+	}
+	return dAtA[:n], nil
+}
+
+func (m *VExplainRequest) MarshalToVT(dAtA []byte) (int, error) {
+	size := m.SizeVT()
+	return m.MarshalToSizedBufferVT(dAtA[:size])
+}
+
+func (m *VExplainRequest) MarshalToSizedBufferVT(dAtA []byte) (int, error) {
+	if m == nil {
+		return 0, nil
+	}
+	i := len(dAtA)
+	_ = i
+	var l int
+	_ = l
+	if m.unknownFields != nil {
+		i -= len(m.unknownFields)
+		copy(dAtA[i:], m.unknownFields)
+	}
+	if len(m.Sql) > 0 {
+		i -= len(m.Sql)
+		copy(dAtA[i:], m.Sql)
+		i = protohelpers.EncodeVarint(dAtA, i, uint64(len(m.Sql)))
+		i--
+		dAtA[i] = 0x1a
+	}
+	if len(m.Keyspace) > 0 {
+		i -= len(m.Keyspace)
+		copy(dAtA[i:], m.Keyspace)
+		i = protohelpers.EncodeVarint(dAtA, i, uint64(len(m.Keyspace)))
+		i--
+		dAtA[i] = 0x12
+	}
+	if len(m.ClusterId) > 0 {
+		i -= len(m.ClusterId)
+		copy(dAtA[i:], m.ClusterId)
+		i = protohelpers.EncodeVarint(dAtA, i, uint64(len(m.ClusterId)))
+		i--
+		dAtA[i] = 0xa
+	}
+	return len(dAtA) - i, nil
+}
+
+func (m *VExplainResponse) MarshalVT() (dAtA []byte, err error) {
+	if m == nil {
+		return nil, nil
+	}
+	size := m.SizeVT()
+	dAtA = make([]byte, size)
+	n, err := m.MarshalToSizedBufferVT(dAtA[:size])
+	if err != nil {
+		return nil, err
+	}
+	return dAtA[:n], nil
+}
+
+func (m *VExplainResponse) MarshalToVT(dAtA []byte) (int, error) {
+	size := m.SizeVT()
+	return m.MarshalToSizedBufferVT(dAtA[:size])
+}
+
+func (m *VExplainResponse) MarshalToSizedBufferVT(dAtA []byte) (int, error) {
+	if m == nil {
+		return 0, nil
+	}
+	i := len(dAtA)
+	_ = i
+	var l int
+	_ = l
+	if m.unknownFields != nil {
+		i -= len(m.unknownFields)
+		copy(dAtA[i:], m.unknownFields)
+	}
+	if len(m.Response) > 0 {
+		i -= len(m.Response)
+		copy(dAtA[i:], m.Response)
+		i = protohelpers.EncodeVarint(dAtA, i, uint64(len(m.Response)))
+		i--
+		dAtA[i] = 0xa
+	}
+	return len(dAtA) - i, nil
+}
+
 func (m *Cluster) SizeVT() (n int) {
 	if m == nil {
 		return 0
@@ -12560,6 +12690,42 @@ func (m *VTExplainResponse) SizeVT() (n int) {
 	return n
 }
 
+func (m *VExplainRequest) SizeVT() (n int) {
+	if m == nil {
+		return 0
+	}
+	var l int
+	_ = l
+	l = len(m.ClusterId)
+	if l > 0 {
+		n += 1 + l + protohelpers.SizeOfVarint(uint64(l))
+	}
+	l = len(m.Keyspace)
+	if l > 0 {
+		n += 1 + l + protohelpers.SizeOfVarint(uint64(l))
+	}
+	l = len(m.Sql)
+	if l > 0 {
+		n += 1 + l + protohelpers.SizeOfVarint(uint64(l))
+	}
+	n += len(m.unknownFields)
+	return n
+}
+
+func (m *VExplainResponse) SizeVT() (n int) {
+	if m == nil {
+		return 0
+	}
+	var l int
+	_ = l
+	l = len(m.Response)
+	if l > 0 {
+		n += 1 + l + protohelpers.SizeOfVarint(uint64(l))
+	}
+	n += len(m.unknownFields)
+	return n
+}
+
 func (m *Cluster) UnmarshalVT(dAtA []byte) error {
 	l := len(dAtA)
 	iNdEx := 0
@@ -29699,3 +29865,233 @@ func (m *VTExplainResponse) UnmarshalVT(dAtA []byte) error {
 	}
 	return nil
 }
+func (m *VExplainRequest) UnmarshalVT(dAtA []byte) error {
+	l := len(dAtA)
+	iNdEx := 0
+	for iNdEx < l {
+		preIndex := iNdEx
+		var wire uint64
+		for shift := uint(0); ; shift += 7 {
+			if shift >= 64 {
+				return protohelpers.ErrIntOverflow
+			}
+			if iNdEx >= l {
+				return io.ErrUnexpectedEOF
+			}
+			b := dAtA[iNdEx]
+			iNdEx++
+			wire |= uint64(b&0x7F) << shift
+			if b < 0x80 {
+				break
+			}
+		}
+		fieldNum := int32(wire >> 3)
+		wireType := int(wire & 0x7)
+		if wireType == 4 {
+			return fmt.Errorf("proto: VExplainRequest: wiretype end group for non-group")
+		}
+		if fieldNum <= 0 {
+			return fmt.Errorf("proto: VExplainRequest: illegal tag %d (wire type %d)", fieldNum, wire)
+		}
+		switch fieldNum {
+		case 1:
+			if wireType != 2 {
+				return fmt.Errorf("proto: wrong wireType = %d for field ClusterId", wireType)
+			}
+			var stringLen uint64
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return protohelpers.ErrIntOverflow
+				}
+				if iNdEx >= l {
+					return io.ErrUnexpectedEOF
+				}
+				b := dAtA[iNdEx]
+				iNdEx++
+				stringLen |= uint64(b&0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
+			intStringLen := int(stringLen)
+			if intStringLen < 0 {
+				return protohelpers.ErrInvalidLength
+			}
+			postIndex := iNdEx + intStringLen
+			if postIndex < 0 {
+				return protohelpers.ErrInvalidLength
+			}
+			if postIndex > l {
+				return io.ErrUnexpectedEOF
+			}
+			m.ClusterId = string(dAtA[iNdEx:postIndex])
+			iNdEx = postIndex
+		case 2:
+			if wireType != 2 {
+				return fmt.Errorf("proto: wrong wireType = %d for field Keyspace", wireType)
+			}
+			var stringLen uint64
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return protohelpers.ErrIntOverflow
+				}
+				if iNdEx >= l {
+					return io.ErrUnexpectedEOF
+				}
+				b := dAtA[iNdEx]
+				iNdEx++
+				stringLen |= uint64(b&0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
+			intStringLen := int(stringLen)
+			if intStringLen < 0 {
+				return protohelpers.ErrInvalidLength
+			}
+			postIndex := iNdEx + intStringLen
+			if postIndex < 0 {
+				return protohelpers.ErrInvalidLength
+			}
+			if postIndex > l {
+				return io.ErrUnexpectedEOF
+			}
+			m.Keyspace = string(dAtA[iNdEx:postIndex])
+			iNdEx = postIndex
+		case 3:
+			if wireType != 2 {
+				return fmt.Errorf("proto: wrong wireType = %d for field Sql", wireType)
+			}
+			var stringLen uint64
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return protohelpers.ErrIntOverflow
+				}
+				if iNdEx >= l {
+					return io.ErrUnexpectedEOF
+				}
+				b := dAtA[iNdEx]
+				iNdEx++
+				stringLen |= uint64(b&0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
+			intStringLen := int(stringLen)
+			if intStringLen < 0 {
+				return protohelpers.ErrInvalidLength
+			}
+			postIndex := iNdEx + intStringLen
+			if postIndex < 0 {
+				return protohelpers.ErrInvalidLength
+			}
+			if postIndex > l {
+				return io.ErrUnexpectedEOF
+			}
+			m.Sql = string(dAtA[iNdEx:postIndex])
+			iNdEx = postIndex
+		default:
+			iNdEx = preIndex
+			skippy, err := protohelpers.Skip(dAtA[iNdEx:])
+			if err != nil {
+				return err
+			}
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
+				return protohelpers.ErrInvalidLength
+			}
+			if (iNdEx + skippy) > l {
+				return io.ErrUnexpectedEOF
+			}
+			m.unknownFields = append(m.unknownFields, dAtA[iNdEx:iNdEx+skippy]...)
+			iNdEx += skippy
+		}
+	}
+
+	if iNdEx > l {
+		return io.ErrUnexpectedEOF
+	}
+	return nil
+}
+func (m *VExplainResponse) UnmarshalVT(dAtA []byte) error {
+	l := len(dAtA)
+	iNdEx := 0
+	for iNdEx < l {
+		preIndex := iNdEx
+		var wire uint64
+		for shift := uint(0); ; shift += 7 {
+			if shift >= 64 {
+				return protohelpers.ErrIntOverflow
+			}
+			if iNdEx >= l {
+				return io.ErrUnexpectedEOF
+			}
+			b := dAtA[iNdEx]
+			iNdEx++
+			wire |= uint64(b&0x7F) << shift
+			if b < 0x80 {
+				break
+			}
+		}
+		fieldNum := int32(wire >> 3)
+		wireType := int(wire & 0x7)
+		if wireType == 4 {
+			return fmt.Errorf("proto: VExplainResponse: wiretype end group for non-group")
+		}
+		if fieldNum <= 0 {
+			return fmt.Errorf("proto: VExplainResponse: illegal tag %d (wire type %d)", fieldNum, wire)
+		}
+		switch fieldNum {
+		case 1:
+			if wireType != 2 {
+				return fmt.Errorf("proto: wrong wireType = %d for field Response", wireType)
+			}
+			var stringLen uint64
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return protohelpers.ErrIntOverflow
+				}
+				if iNdEx >= l {
+					return io.ErrUnexpectedEOF
+				}
+				b := dAtA[iNdEx]
+				iNdEx++
+				stringLen |= uint64(b&0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
+			intStringLen := int(stringLen)
+			if intStringLen < 0 {
+				return protohelpers.ErrInvalidLength
+			}
+			postIndex := iNdEx + intStringLen
+			if postIndex < 0 {
+				return protohelpers.ErrInvalidLength
+			}
+			if postIndex > l {
+				return io.ErrUnexpectedEOF
+			}
+			m.Response = string(dAtA[iNdEx:postIndex])
+			iNdEx = postIndex
+		default:
+			iNdEx = preIndex
+			skippy, err := protohelpers.Skip(dAtA[iNdEx:])
+			if err != nil {
+				return err
+			}
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
+				return protohelpers.ErrInvalidLength
+			}
+			if (iNdEx + skippy) > l {
+				return io.ErrUnexpectedEOF
+			}
+			m.unknownFields = append(m.unknownFields, dAtA[iNdEx:iNdEx+skippy]...)
+			iNdEx += skippy
+		}
+	}
+
+	if iNdEx > l {
+		return io.ErrUnexpectedEOF
+	}
+	return nil
+}
diff --git a/go/vt/vtadmin/api.go b/go/vt/vtadmin/api.go
index a54090bb044..1182d694e19 100644
--- a/go/vt/vtadmin/api.go
+++ b/go/vt/vtadmin/api.go
@@ -433,6 +433,7 @@ func (api *API) Handler() http.Handler {
 	router.HandleFunc("/vdiff/{cluster_id}/show", httpAPI.Adapt(vtadminhttp.VDiffShow)).Name("API.VDiffShow")
 	router.HandleFunc("/vtctlds", httpAPI.Adapt(vtadminhttp.GetVtctlds)).Name("API.GetVtctlds")
 	router.HandleFunc("/vtexplain", httpAPI.Adapt(vtadminhttp.VTExplain)).Name("API.VTExplain")
+	router.HandleFunc("/vexplain", httpAPI.Adapt(vtadminhttp.VExplain)).Name("API.VExplain")
 	router.HandleFunc("/workflow/{cluster_id}/{keyspace}/{name}", httpAPI.Adapt(vtadminhttp.GetWorkflow)).Name("API.GetWorkflow")
 	router.HandleFunc("/workflows", httpAPI.Adapt(vtadminhttp.GetWorkflows)).Name("API.GetWorkflows")
 	router.HandleFunc("/workflow/{cluster_id}/{keyspace}/{name}/status", httpAPI.Adapt(vtadminhttp.GetWorkflowStatus)).Name("API.GetWorkflowStatus")
@@ -2616,6 +2617,59 @@ func (api *API) ValidateVersionShard(ctx context.Context, req *vtadminpb.Validat
 	return res, nil
 }
 
+// VExplain is part of the vtadminpb.VTAdminServer interface.
+func (api *API) VExplain(ctx context.Context, req *vtadminpb.VExplainRequest) (*vtadminpb.VExplainResponse, error) {
+	span, ctx := trace.NewSpan(ctx, "API.VExplain")
+	defer span.Finish()
+
+	if req.ClusterId == "" {
+		return nil, fmt.Errorf("%w: clusterID is required", errors.ErrInvalidRequest)
+	}
+
+	if req.Keyspace == "" {
+		return nil, fmt.Errorf("%w: keyspace name is required", errors.ErrInvalidRequest)
+	}
+
+	if req.Sql == "" {
+		return nil, fmt.Errorf("%w: SQL query is required", errors.ErrInvalidRequest)
+	}
+
+	c, err := api.getClusterForRequest(req.ClusterId)
+	if err != nil {
+		return nil, err
+	}
+
+	if !api.authz.IsAuthorized(ctx, c.ID, rbac.VExplainResource, rbac.GetAction) {
+		return nil, nil
+	}
+
+	// Parser with default options. New() itself initializes with default MySQL version.
+	parser, err := sqlparser.New(sqlparser.Options{
+		TruncateUILen:  512,
+		TruncateErrLen: 0,
+	})
+	if err != nil {
+		return nil, err
+	}
+
+	stmt, err := parser.Parse(req.GetSql())
+	if err != nil {
+		return nil, err
+	}
+
+	if _, ok := stmt.(*sqlparser.VExplainStmt); !ok {
+		return nil, vterrors.VT09017("Invalid VExplain statement")
+	}
+
+	response, err := c.DB.VExplain(ctx, req.GetSql(), stmt.(*sqlparser.VExplainStmt))
+
+	if err != nil {
+		return nil, err
+	}
+
+	return response, nil
+}
+
 // VTExplain is part of the vtadminpb.VTAdminServer interface.
 func (api *API) VTExplain(ctx context.Context, req *vtadminpb.VTExplainRequest) (*vtadminpb.VTExplainResponse, error) {
 	// TODO (andrew): https://github.com/vitessio/vitess/issues/12161.
diff --git a/go/vt/vtadmin/api_test.go b/go/vt/vtadmin/api_test.go
index 82c744b95db..011acdf3e59 100644
--- a/go/vt/vtadmin/api_test.go
+++ b/go/vt/vtadmin/api_test.go
@@ -5136,6 +5136,186 @@ func TestVTExplain(t *testing.T) {
 	}
 }
 
+func TestVExplain(t *testing.T) {
+	tests := []struct {
+		name          string
+		keyspaces     []*vtctldatapb.Keyspace
+		shards        []*vtctldatapb.Shard
+		srvVSchema    *vschemapb.SrvVSchema
+		tabletSchemas map[string]*tabletmanagerdatapb.SchemaDefinition
+		tablets       []*vtadminpb.Tablet
+		req           *vtadminpb.VExplainRequest
+		expectedError error
+	}{
+		{
+			name: "returns an error if cluster unspecified in request",
+			req: &vtadminpb.VExplainRequest{
+				Keyspace: "commerce",
+				Sql:      "vexplain all select * from customers",
+			},
+			expectedError: vtadminerrors.ErrInvalidRequest,
+		},
+		{
+			name: "returns an error if keyspace unspecified in request",
+			req: &vtadminpb.VExplainRequest{
+				ClusterId: "c0",
+				Sql:       "vexplain all select * from customers",
+			},
+			expectedError: vtadminerrors.ErrInvalidRequest,
+		},
+		{
+			name: "returns an error if SQL unspecified in request",
+			req: &vtadminpb.VExplainRequest{
+				ClusterId: "c0",
+				Keyspace:  "commerce",
+			},
+			expectedError: vtadminerrors.ErrInvalidRequest,
+		},
+		{
+			name: "runs VExplain given a valid request in a valid topology",
+			keyspaces: []*vtctldatapb.Keyspace{
+				{
+					Name:     "commerce",
+					Keyspace: &topodatapb.Keyspace{},
+				},
+			},
+			shards: []*vtctldatapb.Shard{
+				{
+					Name:     "-",
+					Keyspace: "commerce",
+				},
+			},
+			srvVSchema: &vschemapb.SrvVSchema{
+				Keyspaces: map[string]*vschemapb.Keyspace{
+					"commerce": {
+						Sharded: false,
+						Tables: map[string]*vschemapb.Table{
+							"customers": {},
+						},
+					},
+				},
+				RoutingRules: &vschemapb.RoutingRules{
+					Rules: []*vschemapb.RoutingRule{},
+				},
+			},
+			tabletSchemas: map[string]*tabletmanagerdatapb.SchemaDefinition{
+				"c0_cell1-0000000100": {
+					DatabaseSchema: "CREATE DATABASE commerce",
+					TableDefinitions: []*tabletmanagerdatapb.TableDefinition{
+						{
+							Name:       "t1",
+							Schema:     `CREATE TABLE customers (id int(11) not null,PRIMARY KEY (id));`,
+							Type:       "BASE",
+							Columns:    []string{"id"},
+							DataLength: 100,
+							RowCount:   50,
+							Fields: []*querypb.Field{
+								{
+									Name: "id",
+									Type: querypb.Type_INT32,
+								},
+							},
+						},
+					},
+				},
+			},
+			tablets: []*vtadminpb.Tablet{
+				{
+					Cluster: &vtadminpb.Cluster{
+						Id:   "c0",
+						Name: "cluster0",
+					},
+					State: vtadminpb.Tablet_SERVING,
+					Tablet: &topodatapb.Tablet{
+						Alias: &topodatapb.TabletAlias{
+							Uid:  100,
+							Cell: "c0_cell1",
+						},
+						Hostname: "tablet-cell1-a",
+						Keyspace: "commerce",
+						Shard:    "-",
+						Type:     topodatapb.TabletType_REPLICA,
+					},
+				},
+			},
+			req: &vtadminpb.VExplainRequest{
+				ClusterId: "c0",
+				Keyspace:  "commerce",
+				Sql:       "vexplain all select * from customers",
+			},
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			ctx, cancel := context.WithCancel(context.Background())
+			defer cancel()
+			toposerver := memorytopo.NewServer(ctx, "c0_cell1")
+
+			tmc := testutil.TabletManagerClient{
+				GetSchemaResults: map[string]struct {
+					Schema *tabletmanagerdatapb.SchemaDefinition
+					Error  error
+				}{},
+			}
+
+			vtctldserver := testutil.NewVtctldServerWithTabletManagerClient(t, toposerver, &tmc, func(ts *topo.Server) vtctlservicepb.VtctldServer {
+				return grpcvtctldserver.NewVtctldServer(vtenv.NewTestEnv(), ts)
+			})
+
+			testutil.WithTestServer(ctx, t, vtctldserver, func(t *testing.T, vtctldClient vtctldclient.VtctldClient) {
+				if tt.srvVSchema != nil {
+					err := toposerver.UpdateSrvVSchema(ctx, "c0_cell1", tt.srvVSchema)
+					require.NoError(t, err)
+				}
+				testutil.AddKeyspaces(ctx, t, toposerver, tt.keyspaces...)
+				testutil.AddShards(ctx, t, toposerver, tt.shards...)
+
+				for _, tablet := range tt.tablets {
+					testutil.AddTablet(ctx, t, toposerver, tablet.Tablet, nil)
+
+					// Adds each SchemaDefinition to the fake TabletManagerClient, or nil
+					// if there are no schemas for that tablet. (All tablet aliases must
+					// exist in the map. Otherwise, TabletManagerClient will return an error when
+					// looking up the schema with tablet alias that doesn't exist.)
+					alias := topoproto.TabletAliasString(tablet.Tablet.Alias)
+					tmc.GetSchemaResults[alias] = struct {
+						Schema *tabletmanagerdatapb.SchemaDefinition
+						Error  error
+					}{
+						Schema: tt.tabletSchemas[alias],
+						Error:  nil,
+					}
+				}
+
+				clusters := []*cluster.Cluster{
+					vtadmintestutil.BuildCluster(t, vtadmintestutil.TestClusterConfig{
+						Cluster: &vtadminpb.Cluster{
+							Id:   "c0",
+							Name: "cluster0",
+						},
+						VtctldClient: vtctldClient,
+						Tablets:      tt.tablets,
+					}),
+				}
+
+				api := NewAPI(vtenv.NewTestEnv(), clusters, Options{})
+				resp, err := api.VExplain(ctx, tt.req)
+
+				if tt.expectedError != nil {
+					assert.True(t, errors.Is(err, tt.expectedError), "expected error type %w does not match actual error type %w", err, tt.expectedError)
+				} else {
+					require.NoError(t, err)
+
+					// We don't particularly care to test the contents of the VExplain response,
+					// just that it exists.
+					assert.NotEmpty(t, resp.Response)
+				}
+			})
+		})
+	}
+}
+
 type ServeHTTPVtctldResponse struct {
 	Result ServeHTTPVtctldResult `json:"result"`
 	Ok     bool                  `json:"ok"`
diff --git a/go/vt/vtadmin/http/vexplain.go b/go/vt/vtadmin/http/vexplain.go
new file mode 100644
index 00000000000..32b705e062a
--- /dev/null
+++ b/go/vt/vtadmin/http/vexplain.go
@@ -0,0 +1,34 @@
+/*
+Copyright 2025 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 http
+
+import (
+	"context"
+
+	vtadminpb "vitess.io/vitess/go/vt/proto/vtadmin"
+)
+
+// VExplain implements the http wrapper for /vexplain?cluster_id=&keyspace=&sql=
+func VExplain(ctx context.Context, r Request, api *API) *JSONResponse {
+	query := r.URL.Query()
+	res, err := api.server.VExplain(ctx, &vtadminpb.VExplainRequest{
+		ClusterId: query.Get("cluster_id"),
+		Keyspace:  query.Get("keyspace"),
+		Sql:       query.Get("sql"),
+	})
+	return NewJSONResponse(res, err)
+}
diff --git a/go/vt/vtadmin/rbac/rbac.go b/go/vt/vtadmin/rbac/rbac.go
index 038db46fbd5..1184b57f7ab 100644
--- a/go/vt/vtadmin/rbac/rbac.go
+++ b/go/vt/vtadmin/rbac/rbac.go
@@ -136,5 +136,7 @@ const (
 
 	VTExplainResource Resource = "VTExplain"
 
+	VExplainResource Resource = "VExplain"
+
 	TabletFullStatusResource Resource = "TabletFullStatus"
 )
diff --git a/go/vt/vtadmin/vtsql/fakevtsql/conn.go b/go/vt/vtadmin/vtsql/fakevtsql/conn.go
index af9ac44ad0d..62e3ba7277a 100644
--- a/go/vt/vtadmin/vtsql/fakevtsql/conn.go
+++ b/go/vt/vtadmin/vtsql/fakevtsql/conn.go
@@ -90,6 +90,17 @@ func (c *conn) QueryContext(ctx context.Context, query string, args []driver.Nam
 			})
 		}
 
+		return &rows{
+			cols:   columns,
+			vals:   vals,
+			pos:    0,
+			closed: false,
+		}, nil
+	case "vexplain all select * from customers":
+		columns := []string{"VExplain"}
+		vals := [][]any{}
+		vals = append(vals, []any{"{'Table' : 'customer, 'TestPlan' : 'TestPlan'}"})
+
 		return &rows{
 			cols:   columns,
 			vals:   vals,
diff --git a/go/vt/vtadmin/vtsql/vtsql.go b/go/vt/vtadmin/vtsql/vtsql.go
index 9f23eb70443..d923730192a 100644
--- a/go/vt/vtadmin/vtsql/vtsql.go
+++ b/go/vt/vtadmin/vtsql/vtsql.go
@@ -17,10 +17,13 @@ limitations under the License.
 package vtsql
 
 import (
+	"bytes"
 	"context"
 	"database/sql"
 	"fmt"
+	"strings"
 	"sync"
+	"text/tabwriter"
 	"time"
 
 	"google.golang.org/grpc/credentials/insecure"
@@ -31,6 +34,7 @@ import (
 	"vitess.io/vitess/go/trace"
 	"vitess.io/vitess/go/vt/callerid"
 	"vitess.io/vitess/go/vt/log"
+	"vitess.io/vitess/go/vt/sqlparser"
 	"vitess.io/vitess/go/vt/vitessdriver"
 	"vitess.io/vitess/go/vt/vtadmin/cluster/resolver"
 	"vitess.io/vitess/go/vt/vtadmin/debug"
@@ -45,6 +49,9 @@ type DB interface {
 	// ShowTablets executes `SHOW vitess_tablets` and returns the result.
 	ShowTablets(ctx context.Context) (*sql.Rows, error)
 
+	// VExplain executes query - `vexplain [ALL|PLAN|QUERIES|TRACE|KEYS] query` and returns the results
+	VExplain(ctx context.Context, query string, vexplainStmt *sqlparser.VExplainStmt) (*vtadminpb.VExplainResponse, error)
+
 	// Ping behaves like (*sql.DB).Ping.
 	Ping() error
 	// PingContext behaves like (*sql.DB).PingContext.
@@ -174,6 +181,73 @@ func (vtgate *VTGateProxy) ShowTablets(ctx context.Context) (*sql.Rows, error) {
 	return vtgate.conn.QueryContext(vtgate.getQueryContext(ctx), "SHOW vitess_tablets")
 }
 
+// VExplain is part of the DB interface.
+func (vtgate *VTGateProxy) VExplain(ctx context.Context, query string, vexplainStmt *sqlparser.VExplainStmt) (*vtadminpb.VExplainResponse, error) {
+	span, ctx := trace.NewSpan(ctx, "VTGateProxy.VExplain")
+	defer span.Finish()
+
+	vtadminproto.AnnotateClusterSpan(vtgate.cluster, span)
+
+	rows, err := vtgate.conn.QueryContext(vtgate.getQueryContext(ctx), query)
+
+	if err != nil {
+		return nil, err
+	}
+	switch vexplainStmt.Type {
+	case sqlparser.QueriesVExplainType:
+		return convertVExplainQueriesResultToString(rows)
+	case sqlparser.AllVExplainType, sqlparser.TraceVExplainType, sqlparser.PlanVExplainType, sqlparser.KeysVExplainType:
+		return convertVExplainResultToString(rows)
+	default:
+		return nil, nil
+	}
+}
+
+func convertVExplainResultToString(rows *sql.Rows) (*vtadminpb.VExplainResponse, error) {
+	var queryPlan string
+	for rows.Next() {
+		if err := rows.Scan(&queryPlan); err != nil {
+			return nil, err
+		}
+	}
+	return &vtadminpb.VExplainResponse{
+		Response: queryPlan,
+	}, nil
+}
+
+func convertVExplainQueriesResultToString(rows *sql.Rows) (*vtadminpb.VExplainResponse, error) {
+	var buf bytes.Buffer
+	w := tabwriter.NewWriter(&buf, 0, 0, 0, ' ', tabwriter.AlignRight)
+
+	sep := []byte("|")
+	newLine := []byte("\n")
+	cols, _ := rows.Columns()
+
+	if _, err := w.Write([]byte(strings.Join(cols, string(sep)) + string(newLine))); err != nil {
+		return nil, err
+	}
+
+	row := make([][]byte, len(cols))
+	rowPtr := make([]any, len(cols))
+	for i := range row {
+		rowPtr[i] = &row[i]
+	}
+
+	for rows.Next() {
+		if err := rows.Scan(rowPtr...); err != nil {
+			return nil, err
+		}
+		if _, err := w.Write(append(bytes.Join(row, sep), newLine...)); err != nil {
+			return nil, err
+		}
+	}
+	w.Flush()
+
+	return &vtadminpb.VExplainResponse{
+		Response: buf.String(),
+	}, nil
+}
+
 // Ping is part of the DB interface.
 func (vtgate *VTGateProxy) Ping() error {
 	return vtgate.pingContext(context.Background())
diff --git a/proto/vtadmin.proto b/proto/vtadmin.proto
index 963d1fa5779..1485cb485c2 100644
--- a/proto/vtadmin.proto
+++ b/proto/vtadmin.proto
@@ -225,6 +225,9 @@ service VTAdmin {
     // VTExplain provides information on how Vitess plans to execute a
     // particular query.
     rpc VTExplain(VTExplainRequest) returns (VTExplainResponse) {};
+    // VExplain provides information on how Vitess plans to execute a
+    // particular query.
+    rpc VExplain(VExplainRequest) returns (VExplainResponse) {};
     // WorkflowDelete deletes a vreplication workflow.
     rpc WorkflowDelete(WorkflowDeleteRequest) returns (vtctldata.WorkflowDeleteResponse) {};
     // WorkflowSwitchTraffic switches traffic for a VReplication workflow.
@@ -1097,3 +1100,13 @@ message VTExplainRequest {
 message VTExplainResponse {
     string response = 1;
 }
+
+message VExplainRequest {
+    string cluster_id = 1;
+    string keyspace = 2;
+    string sql = 3;
+}
+
+message VExplainResponse {
+    string response = 1;
+}
diff --git a/web/vtadmin/src/api/http.ts b/web/vtadmin/src/api/http.ts
index 674df961ef0..846f929ec52 100644
--- a/web/vtadmin/src/api/http.ts
+++ b/web/vtadmin/src/api/http.ts
@@ -636,6 +636,22 @@ export const fetchVTExplain = async <R extends pb.IVTExplainRequest>({ cluster,
     return pb.VTExplainResponse.create(result);
 };
 
+export const fetchVExplain = async <R extends pb.IVExplainRequest>({ cluster_id, keyspace, sql }: R) => {
+    // As an easy enhancement for later, we can also validate the request parameters on the front-end
+    // instead of defaulting to '', to save a round trip.
+    const req = new URLSearchParams();
+    req.append('cluster_id', cluster_id || '');
+    req.append('keyspace', keyspace || '');
+    req.append('sql', sql || '');
+
+    const { result } = await vtfetch(`/api/vexplain?${req}`);
+
+    const err = pb.VExplainResponse.verify(result);
+    if (err) throw Error(err);
+
+    return pb.VExplainResponse.create(result);
+};
+
 export interface ValidateKeyspaceParams {
     clusterID: string;
     keyspace: string;
diff --git a/web/vtadmin/src/components/App.tsx b/web/vtadmin/src/components/App.tsx
index fd0f772ae19..e9f4bbb1844 100644
--- a/web/vtadmin/src/components/App.tsx
+++ b/web/vtadmin/src/components/App.tsx
@@ -30,6 +30,7 @@ import { Stream } from './routes/stream/Stream';
 import { Workflows } from './routes/Workflows';
 import { Workflow } from './routes/workflow/Workflow';
 import { VTExplain } from './routes/VTExplain';
+import { VExplain } from './routes/VExplain';
 import { Keyspace } from './routes/keyspace/Keyspace';
 import { Tablet } from './routes/tablet/Tablet';
 import { Backups } from './routes/Backups';
@@ -113,6 +114,10 @@ export const App = () => {
                             <VTExplain />
                         </Route>
 
+                        <Route path="/vexplain">
+                            <VExplain />
+                        </Route>
+
                         <Route exact path="/workflows">
                             <Workflows />
                         </Route>
diff --git a/web/vtadmin/src/components/NavRail.tsx b/web/vtadmin/src/components/NavRail.tsx
index b30cd165684..c5e0c528bdd 100644
--- a/web/vtadmin/src/components/NavRail.tsx
+++ b/web/vtadmin/src/components/NavRail.tsx
@@ -77,6 +77,9 @@ export const NavRail = () => {
                     <li>
                         <NavRailLink icon={Icons.runQuery} text="VTExplain" to="/vtexplain" />
                     </li>
+                    <li>
+                        <NavRailLink icon={Icons.runQuery} text="VExplain" to="/vexplain" />
+                    </li>
                     <li>
                         <NavRailLink icon={Icons.topology} text="Topology" to="/topology" />
                     </li>
diff --git a/web/vtadmin/src/components/routes/VExplain.tsx b/web/vtadmin/src/components/routes/VExplain.tsx
new file mode 100644
index 00000000000..06969e63ca3
--- /dev/null
+++ b/web/vtadmin/src/components/routes/VExplain.tsx
@@ -0,0 +1,153 @@
+/**
+ * Copyright 2025 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.
+ */
+import React, { useMemo } from 'react';
+import { orderBy } from 'lodash-es';
+
+import { vtadmin as pb } from '../../proto/vtadmin';
+import { useKeyspaces, useVExplain } from '../../hooks/api';
+import { Select } from '../inputs/Select';
+import { ContentContainer } from '../layout/ContentContainer';
+import { WorkspaceHeader } from '../layout/WorkspaceHeader';
+import { WorkspaceTitle } from '../layout/WorkspaceTitle';
+import style from './VTExplain.module.scss';
+import { Code } from '../Code';
+import { useDocumentTitle } from '../../hooks/useDocumentTitle';
+import { Label } from '../inputs/Label';
+
+export const VExplain = () => {
+    useDocumentTitle('VExplain');
+
+    const { data: keyspaces = [] } = useKeyspaces();
+
+    const [clusterID, updateCluster] = React.useState<string | null | undefined>(null);
+    const [keyspaceName, updateKeyspace] = React.useState<string | null | undefined>(null);
+    const [sql, updateSQL] = React.useState<string | null | undefined>(null);
+    const [vexplainOption, updateVExplainOption] = React.useState<string | null | undefined>('ALL');
+
+    const fetchVExplainRequestSql = function () {
+        return 'VEXPLAIN ' + vexplainOption + ' ' + sql;
+    };
+
+    const selectedKeyspace =
+        clusterID && keyspaceName
+            ? keyspaces?.find((k) => k.cluster?.id === clusterID && k.keyspace?.name === keyspaceName)
+            : null;
+
+    const { data, error, refetch } = useVExplain(
+        { cluster_id: clusterID, keyspace: keyspaceName, sql: fetchVExplainRequestSql() },
+        {
+            // Never cache, never refetch.
+            cacheTime: 0,
+            enabled: false,
+            refetchOnWindowFocus: false,
+            retry: false,
+        }
+    );
+
+    const onChangeKeyspace = (selectedKeyspace: pb.Keyspace | null | undefined) => {
+        updateCluster(selectedKeyspace?.cluster?.id);
+        updateKeyspace(selectedKeyspace?.keyspace?.name);
+        updateSQL(null);
+    };
+
+    const onChangeSQL: React.ChangeEventHandler<HTMLTextAreaElement> = (e) => {
+        updateSQL(e.target.value);
+    };
+
+    const onSubmit: React.FormEventHandler<HTMLFormElement> = (e) => {
+        e.preventDefault();
+        refetch();
+    };
+
+    const VEXPLAIN_OPTIONS = ['ALL', 'PLAN', 'QUERIES', 'TRACE', 'KEYS'];
+
+    const isReadyForSubmit = useMemo(() => {
+        return (
+            typeof keyspaceName !== 'undefined' &&
+            keyspaceName !== null &&
+            keyspaceName !== '' &&
+            typeof sql !== 'undefined' &&
+            sql !== null &&
+            sql !== ''
+        );
+    }, [keyspaceName, sql]);
+
+    return (
+        <div>
+            <WorkspaceHeader>
+                <WorkspaceTitle>VExplain</WorkspaceTitle>
+            </WorkspaceHeader>
+            <ContentContainer className={style.container}>
+                <section className={style.panel}>
+                    <form className={style.form} onSubmit={onSubmit}>
+                        <div>
+                            <Select
+                                itemToString={(keyspace) => keyspace?.keyspace?.name || ''}
+                                items={orderBy(keyspaces, ['keyspace.name', 'cluster.id'])}
+                                label="Keyspace"
+                                onChange={onChangeKeyspace}
+                                placeholder="Choose a keyspace"
+                                renderItem={(keyspace) => `${keyspace?.keyspace?.name} (${keyspace?.cluster?.id})`}
+                                selectedItem={selectedKeyspace || null}
+                            />
+                        </div>
+                        <div>
+                            <Label label="SQL">
+                                <textarea
+                                    className={style.sqlInput}
+                                    onChange={onChangeSQL}
+                                    rows={10}
+                                    value={sql || ''}
+                                />
+                            </Label>
+                        </div>
+                        <div className="flex flex-row gap-4 ">
+                            <Select
+                                items={VEXPLAIN_OPTIONS}
+                                label="Select VExplain Option"
+                                helpText={'VEXPLAIN [ALL|PLAN|QUERIES|TRACE|KEYS] <SQL> '}
+                                onChange={updateVExplainOption}
+                                placeholder="Select VExplain option"
+                                required={true}
+                                disableClearSelection={true}
+                                selectedItem={vexplainOption || null}
+                            />
+                            <div className={style.buttons}>
+                                <button className="btn align-bottom" disabled={!isReadyForSubmit} type="submit">
+                                    Run VExplain {vexplainOption}
+                                </button>
+                            </div>
+                        </div>
+                    </form>
+                </section>
+
+                {error && (
+                    <section className={style.errorPanel}>
+                        <Code code={JSON.stringify(error, null, 2)} />
+                    </section>
+                )}
+
+                {data?.response && (
+                    <section className={style.panel}>
+                        <div className={style.codeContainer}>
+                            <Code code={data?.response} />
+                        </div>
+                    </section>
+                )}
+            </ContentContainer>
+        </div>
+    );
+};
diff --git a/web/vtadmin/src/components/routes/VTExplain.module.scss b/web/vtadmin/src/components/routes/VTExplain.module.scss
index 98420c848c4..3debd62db61 100644
--- a/web/vtadmin/src/components/routes/VTExplain.module.scss
+++ b/web/vtadmin/src/components/routes/VTExplain.module.scss
@@ -54,5 +54,5 @@
 }
 
 .buttons {
-    margin: 1.6rem 0 0.8rem 0;
+    margin: 3.1rem 0 0.8rem 0;
 }
diff --git a/web/vtadmin/src/hooks/api.ts b/web/vtadmin/src/hooks/api.ts
index c2e1209f128..27642cdfad0 100644
--- a/web/vtadmin/src/hooks/api.ts
+++ b/web/vtadmin/src/hooks/api.ts
@@ -40,6 +40,7 @@ import {
     FetchVSchemaParams,
     fetchVtctlds,
     fetchVTExplain,
+    fetchVExplain,
     fetchWorkflow,
     fetchWorkflowStatus,
     fetchWorkflows,
@@ -460,6 +461,13 @@ export const useVTExplain = (
     return useQuery(['vtexplain', params], () => fetchVTExplain(params), { ...options });
 };
 
+export const useVExplain = (
+    params: Parameters<typeof fetchVExplain>[0],
+    options?: UseQueryOptions<pb.VExplainResponse, Error> | undefined
+) => {
+    return useQuery(['vexplain', params], () => fetchVExplain(params), { ...options });
+};
+
 /**
  * useWorkflow is a query hook that fetches a single workflow for the given parameters.
  */
diff --git a/web/vtadmin/src/proto/vtadmin.d.ts b/web/vtadmin/src/proto/vtadmin.d.ts
index 5a8859b90e7..0a946386995 100644
--- a/web/vtadmin/src/proto/vtadmin.d.ts
+++ b/web/vtadmin/src/proto/vtadmin.d.ts
@@ -1003,6 +1003,20 @@ export namespace vtadmin {
          */
         public vTExplain(request: vtadmin.IVTExplainRequest): Promise<vtadmin.VTExplainResponse>;
 
+        /**
+         * Calls VExplain.
+         * @param request VExplainRequest message or plain object
+         * @param callback Node-style callback called with the error, if any, and VExplainResponse
+         */
+        public vExplain(request: vtadmin.IVExplainRequest, callback: vtadmin.VTAdmin.VExplainCallback): void;
+
+        /**
+         * Calls VExplain.
+         * @param request VExplainRequest message or plain object
+         * @returns Promise
+         */
+        public vExplain(request: vtadmin.IVExplainRequest): Promise<vtadmin.VExplainResponse>;
+
         /**
          * Calls WorkflowDelete.
          * @param request WorkflowDeleteRequest message or plain object
@@ -1524,6 +1538,13 @@ export namespace vtadmin {
          */
         type VTExplainCallback = (error: (Error|null), response?: vtadmin.VTExplainResponse) => void;
 
+        /**
+         * Callback as used by {@link vtadmin.VTAdmin#vExplain}.
+         * @param error Error, if any
+         * @param [response] VExplainResponse
+         */
+        type VExplainCallback = (error: (Error|null), response?: vtadmin.VExplainResponse) => void;
+
         /**
          * Callback as used by {@link vtadmin.VTAdmin#workflowDelete}.
          * @param error Error, if any
@@ -15381,6 +15402,212 @@ export namespace vtadmin {
          */
         public static getTypeUrl(typeUrlPrefix?: string): string;
     }
+
+    /** Properties of a VExplainRequest. */
+    interface IVExplainRequest {
+
+        /** VExplainRequest cluster_id */
+        cluster_id?: (string|null);
+
+        /** VExplainRequest keyspace */
+        keyspace?: (string|null);
+
+        /** VExplainRequest sql */
+        sql?: (string|null);
+    }
+
+    /** Represents a VExplainRequest. */
+    class VExplainRequest implements IVExplainRequest {
+
+        /**
+         * Constructs a new VExplainRequest.
+         * @param [properties] Properties to set
+         */
+        constructor(properties?: vtadmin.IVExplainRequest);
+
+        /** VExplainRequest cluster_id. */
+        public cluster_id: string;
+
+        /** VExplainRequest keyspace. */
+        public keyspace: string;
+
+        /** VExplainRequest sql. */
+        public sql: string;
+
+        /**
+         * Creates a new VExplainRequest instance using the specified properties.
+         * @param [properties] Properties to set
+         * @returns VExplainRequest instance
+         */
+        public static create(properties?: vtadmin.IVExplainRequest): vtadmin.VExplainRequest;
+
+        /**
+         * Encodes the specified VExplainRequest message. Does not implicitly {@link vtadmin.VExplainRequest.verify|verify} messages.
+         * @param message VExplainRequest message or plain object to encode
+         * @param [writer] Writer to encode to
+         * @returns Writer
+         */
+        public static encode(message: vtadmin.IVExplainRequest, writer?: $protobuf.Writer): $protobuf.Writer;
+
+        /**
+         * Encodes the specified VExplainRequest message, length delimited. Does not implicitly {@link vtadmin.VExplainRequest.verify|verify} messages.
+         * @param message VExplainRequest message or plain object to encode
+         * @param [writer] Writer to encode to
+         * @returns Writer
+         */
+        public static encodeDelimited(message: vtadmin.IVExplainRequest, writer?: $protobuf.Writer): $protobuf.Writer;
+
+        /**
+         * Decodes a VExplainRequest message from the specified reader or buffer.
+         * @param reader Reader or buffer to decode from
+         * @param [length] Message length if known beforehand
+         * @returns VExplainRequest
+         * @throws {Error} If the payload is not a reader or valid buffer
+         * @throws {$protobuf.util.ProtocolError} If required fields are missing
+         */
+        public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): vtadmin.VExplainRequest;
+
+        /**
+         * Decodes a VExplainRequest message from the specified reader or buffer, length delimited.
+         * @param reader Reader or buffer to decode from
+         * @returns VExplainRequest
+         * @throws {Error} If the payload is not a reader or valid buffer
+         * @throws {$protobuf.util.ProtocolError} If required fields are missing
+         */
+        public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): vtadmin.VExplainRequest;
+
+        /**
+         * Verifies a VExplainRequest message.
+         * @param message Plain object to verify
+         * @returns `null` if valid, otherwise the reason why it is not
+         */
+        public static verify(message: { [k: string]: any }): (string|null);
+
+        /**
+         * Creates a VExplainRequest message from a plain object. Also converts values to their respective internal types.
+         * @param object Plain object
+         * @returns VExplainRequest
+         */
+        public static fromObject(object: { [k: string]: any }): vtadmin.VExplainRequest;
+
+        /**
+         * Creates a plain object from a VExplainRequest message. Also converts values to other types if specified.
+         * @param message VExplainRequest
+         * @param [options] Conversion options
+         * @returns Plain object
+         */
+        public static toObject(message: vtadmin.VExplainRequest, options?: $protobuf.IConversionOptions): { [k: string]: any };
+
+        /**
+         * Converts this VExplainRequest to JSON.
+         * @returns JSON object
+         */
+        public toJSON(): { [k: string]: any };
+
+        /**
+         * Gets the default type url for VExplainRequest
+         * @param [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com")
+         * @returns The default type url
+         */
+        public static getTypeUrl(typeUrlPrefix?: string): string;
+    }
+
+    /** Properties of a VExplainResponse. */
+    interface IVExplainResponse {
+
+        /** VExplainResponse response */
+        response?: (string|null);
+    }
+
+    /** Represents a VExplainResponse. */
+    class VExplainResponse implements IVExplainResponse {
+
+        /**
+         * Constructs a new VExplainResponse.
+         * @param [properties] Properties to set
+         */
+        constructor(properties?: vtadmin.IVExplainResponse);
+
+        /** VExplainResponse response. */
+        public response: string;
+
+        /**
+         * Creates a new VExplainResponse instance using the specified properties.
+         * @param [properties] Properties to set
+         * @returns VExplainResponse instance
+         */
+        public static create(properties?: vtadmin.IVExplainResponse): vtadmin.VExplainResponse;
+
+        /**
+         * Encodes the specified VExplainResponse message. Does not implicitly {@link vtadmin.VExplainResponse.verify|verify} messages.
+         * @param message VExplainResponse message or plain object to encode
+         * @param [writer] Writer to encode to
+         * @returns Writer
+         */
+        public static encode(message: vtadmin.IVExplainResponse, writer?: $protobuf.Writer): $protobuf.Writer;
+
+        /**
+         * Encodes the specified VExplainResponse message, length delimited. Does not implicitly {@link vtadmin.VExplainResponse.verify|verify} messages.
+         * @param message VExplainResponse message or plain object to encode
+         * @param [writer] Writer to encode to
+         * @returns Writer
+         */
+        public static encodeDelimited(message: vtadmin.IVExplainResponse, writer?: $protobuf.Writer): $protobuf.Writer;
+
+        /**
+         * Decodes a VExplainResponse message from the specified reader or buffer.
+         * @param reader Reader or buffer to decode from
+         * @param [length] Message length if known beforehand
+         * @returns VExplainResponse
+         * @throws {Error} If the payload is not a reader or valid buffer
+         * @throws {$protobuf.util.ProtocolError} If required fields are missing
+         */
+        public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): vtadmin.VExplainResponse;
+
+        /**
+         * Decodes a VExplainResponse message from the specified reader or buffer, length delimited.
+         * @param reader Reader or buffer to decode from
+         * @returns VExplainResponse
+         * @throws {Error} If the payload is not a reader or valid buffer
+         * @throws {$protobuf.util.ProtocolError} If required fields are missing
+         */
+        public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): vtadmin.VExplainResponse;
+
+        /**
+         * Verifies a VExplainResponse message.
+         * @param message Plain object to verify
+         * @returns `null` if valid, otherwise the reason why it is not
+         */
+        public static verify(message: { [k: string]: any }): (string|null);
+
+        /**
+         * Creates a VExplainResponse message from a plain object. Also converts values to their respective internal types.
+         * @param object Plain object
+         * @returns VExplainResponse
+         */
+        public static fromObject(object: { [k: string]: any }): vtadmin.VExplainResponse;
+
+        /**
+         * Creates a plain object from a VExplainResponse message. Also converts values to other types if specified.
+         * @param message VExplainResponse
+         * @param [options] Conversion options
+         * @returns Plain object
+         */
+        public static toObject(message: vtadmin.VExplainResponse, options?: $protobuf.IConversionOptions): { [k: string]: any };
+
+        /**
+         * Converts this VExplainResponse to JSON.
+         * @returns JSON object
+         */
+        public toJSON(): { [k: string]: any };
+
+        /**
+         * Gets the default type url for VExplainResponse
+         * @param [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com")
+         * @returns The default type url
+         */
+        public static getTypeUrl(typeUrlPrefix?: string): string;
+    }
 }
 
 /** Namespace logutil. */
diff --git a/web/vtadmin/src/proto/vtadmin.js b/web/vtadmin/src/proto/vtadmin.js
index cafe51c0058..cc3ef73ced6 100644
--- a/web/vtadmin/src/proto/vtadmin.js
+++ b/web/vtadmin/src/proto/vtadmin.js
@@ -2358,6 +2358,39 @@ export const vtadmin = $root.vtadmin = (() => {
          * @variation 2
          */
 
+        /**
+         * Callback as used by {@link vtadmin.VTAdmin#vExplain}.
+         * @memberof vtadmin.VTAdmin
+         * @typedef VExplainCallback
+         * @type {function}
+         * @param {Error|null} error Error, if any
+         * @param {vtadmin.VExplainResponse} [response] VExplainResponse
+         */
+
+        /**
+         * Calls VExplain.
+         * @function vExplain
+         * @memberof vtadmin.VTAdmin
+         * @instance
+         * @param {vtadmin.IVExplainRequest} request VExplainRequest message or plain object
+         * @param {vtadmin.VTAdmin.VExplainCallback} callback Node-style callback called with the error, if any, and VExplainResponse
+         * @returns {undefined}
+         * @variation 1
+         */
+        Object.defineProperty(VTAdmin.prototype.vExplain = function vExplain(request, callback) {
+            return this.rpcCall(vExplain, $root.vtadmin.VExplainRequest, $root.vtadmin.VExplainResponse, request, callback);
+        }, "name", { value: "VExplain" });
+
+        /**
+         * Calls VExplain.
+         * @function vExplain
+         * @memberof vtadmin.VTAdmin
+         * @instance
+         * @param {vtadmin.IVExplainRequest} request VExplainRequest message or plain object
+         * @returns {Promise<vtadmin.VExplainResponse>} Promise
+         * @variation 2
+         */
+
         /**
          * Callback as used by {@link vtadmin.VTAdmin#workflowDelete}.
          * @memberof vtadmin.VTAdmin
@@ -35265,6 +35298,459 @@ export const vtadmin = $root.vtadmin = (() => {
         return VTExplainResponse;
     })();
 
+    vtadmin.VExplainRequest = (function() {
+
+        /**
+         * Properties of a VExplainRequest.
+         * @memberof vtadmin
+         * @interface IVExplainRequest
+         * @property {string|null} [cluster_id] VExplainRequest cluster_id
+         * @property {string|null} [keyspace] VExplainRequest keyspace
+         * @property {string|null} [sql] VExplainRequest sql
+         */
+
+        /**
+         * Constructs a new VExplainRequest.
+         * @memberof vtadmin
+         * @classdesc Represents a VExplainRequest.
+         * @implements IVExplainRequest
+         * @constructor
+         * @param {vtadmin.IVExplainRequest=} [properties] Properties to set
+         */
+        function VExplainRequest(properties) {
+            if (properties)
+                for (let keys = Object.keys(properties), i = 0; i < keys.length; ++i)
+                    if (properties[keys[i]] != null)
+                        this[keys[i]] = properties[keys[i]];
+        }
+
+        /**
+         * VExplainRequest cluster_id.
+         * @member {string} cluster_id
+         * @memberof vtadmin.VExplainRequest
+         * @instance
+         */
+        VExplainRequest.prototype.cluster_id = "";
+
+        /**
+         * VExplainRequest keyspace.
+         * @member {string} keyspace
+         * @memberof vtadmin.VExplainRequest
+         * @instance
+         */
+        VExplainRequest.prototype.keyspace = "";
+
+        /**
+         * VExplainRequest sql.
+         * @member {string} sql
+         * @memberof vtadmin.VExplainRequest
+         * @instance
+         */
+        VExplainRequest.prototype.sql = "";
+
+        /**
+         * Creates a new VExplainRequest instance using the specified properties.
+         * @function create
+         * @memberof vtadmin.VExplainRequest
+         * @static
+         * @param {vtadmin.IVExplainRequest=} [properties] Properties to set
+         * @returns {vtadmin.VExplainRequest} VExplainRequest instance
+         */
+        VExplainRequest.create = function create(properties) {
+            return new VExplainRequest(properties);
+        };
+
+        /**
+         * Encodes the specified VExplainRequest message. Does not implicitly {@link vtadmin.VExplainRequest.verify|verify} messages.
+         * @function encode
+         * @memberof vtadmin.VExplainRequest
+         * @static
+         * @param {vtadmin.IVExplainRequest} message VExplainRequest message or plain object to encode
+         * @param {$protobuf.Writer} [writer] Writer to encode to
+         * @returns {$protobuf.Writer} Writer
+         */
+        VExplainRequest.encode = function encode(message, writer) {
+            if (!writer)
+                writer = $Writer.create();
+            if (message.cluster_id != null && Object.hasOwnProperty.call(message, "cluster_id"))
+                writer.uint32(/* id 1, wireType 2 =*/10).string(message.cluster_id);
+            if (message.keyspace != null && Object.hasOwnProperty.call(message, "keyspace"))
+                writer.uint32(/* id 2, wireType 2 =*/18).string(message.keyspace);
+            if (message.sql != null && Object.hasOwnProperty.call(message, "sql"))
+                writer.uint32(/* id 3, wireType 2 =*/26).string(message.sql);
+            return writer;
+        };
+
+        /**
+         * Encodes the specified VExplainRequest message, length delimited. Does not implicitly {@link vtadmin.VExplainRequest.verify|verify} messages.
+         * @function encodeDelimited
+         * @memberof vtadmin.VExplainRequest
+         * @static
+         * @param {vtadmin.IVExplainRequest} message VExplainRequest message or plain object to encode
+         * @param {$protobuf.Writer} [writer] Writer to encode to
+         * @returns {$protobuf.Writer} Writer
+         */
+        VExplainRequest.encodeDelimited = function encodeDelimited(message, writer) {
+            return this.encode(message, writer).ldelim();
+        };
+
+        /**
+         * Decodes a VExplainRequest message from the specified reader or buffer.
+         * @function decode
+         * @memberof vtadmin.VExplainRequest
+         * @static
+         * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from
+         * @param {number} [length] Message length if known beforehand
+         * @returns {vtadmin.VExplainRequest} VExplainRequest
+         * @throws {Error} If the payload is not a reader or valid buffer
+         * @throws {$protobuf.util.ProtocolError} If required fields are missing
+         */
+        VExplainRequest.decode = function decode(reader, length) {
+            if (!(reader instanceof $Reader))
+                reader = $Reader.create(reader);
+            let end = length === undefined ? reader.len : reader.pos + length, message = new $root.vtadmin.VExplainRequest();
+            while (reader.pos < end) {
+                let tag = reader.uint32();
+                switch (tag >>> 3) {
+                case 1: {
+                        message.cluster_id = reader.string();
+                        break;
+                    }
+                case 2: {
+                        message.keyspace = reader.string();
+                        break;
+                    }
+                case 3: {
+                        message.sql = reader.string();
+                        break;
+                    }
+                default:
+                    reader.skipType(tag & 7);
+                    break;
+                }
+            }
+            return message;
+        };
+
+        /**
+         * Decodes a VExplainRequest message from the specified reader or buffer, length delimited.
+         * @function decodeDelimited
+         * @memberof vtadmin.VExplainRequest
+         * @static
+         * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from
+         * @returns {vtadmin.VExplainRequest} VExplainRequest
+         * @throws {Error} If the payload is not a reader or valid buffer
+         * @throws {$protobuf.util.ProtocolError} If required fields are missing
+         */
+        VExplainRequest.decodeDelimited = function decodeDelimited(reader) {
+            if (!(reader instanceof $Reader))
+                reader = new $Reader(reader);
+            return this.decode(reader, reader.uint32());
+        };
+
+        /**
+         * Verifies a VExplainRequest message.
+         * @function verify
+         * @memberof vtadmin.VExplainRequest
+         * @static
+         * @param {Object.<string,*>} message Plain object to verify
+         * @returns {string|null} `null` if valid, otherwise the reason why it is not
+         */
+        VExplainRequest.verify = function verify(message) {
+            if (typeof message !== "object" || message === null)
+                return "object expected";
+            if (message.cluster_id != null && message.hasOwnProperty("cluster_id"))
+                if (!$util.isString(message.cluster_id))
+                    return "cluster_id: string expected";
+            if (message.keyspace != null && message.hasOwnProperty("keyspace"))
+                if (!$util.isString(message.keyspace))
+                    return "keyspace: string expected";
+            if (message.sql != null && message.hasOwnProperty("sql"))
+                if (!$util.isString(message.sql))
+                    return "sql: string expected";
+            return null;
+        };
+
+        /**
+         * Creates a VExplainRequest message from a plain object. Also converts values to their respective internal types.
+         * @function fromObject
+         * @memberof vtadmin.VExplainRequest
+         * @static
+         * @param {Object.<string,*>} object Plain object
+         * @returns {vtadmin.VExplainRequest} VExplainRequest
+         */
+        VExplainRequest.fromObject = function fromObject(object) {
+            if (object instanceof $root.vtadmin.VExplainRequest)
+                return object;
+            let message = new $root.vtadmin.VExplainRequest();
+            if (object.cluster_id != null)
+                message.cluster_id = String(object.cluster_id);
+            if (object.keyspace != null)
+                message.keyspace = String(object.keyspace);
+            if (object.sql != null)
+                message.sql = String(object.sql);
+            return message;
+        };
+
+        /**
+         * Creates a plain object from a VExplainRequest message. Also converts values to other types if specified.
+         * @function toObject
+         * @memberof vtadmin.VExplainRequest
+         * @static
+         * @param {vtadmin.VExplainRequest} message VExplainRequest
+         * @param {$protobuf.IConversionOptions} [options] Conversion options
+         * @returns {Object.<string,*>} Plain object
+         */
+        VExplainRequest.toObject = function toObject(message, options) {
+            if (!options)
+                options = {};
+            let object = {};
+            if (options.defaults) {
+                object.cluster_id = "";
+                object.keyspace = "";
+                object.sql = "";
+            }
+            if (message.cluster_id != null && message.hasOwnProperty("cluster_id"))
+                object.cluster_id = message.cluster_id;
+            if (message.keyspace != null && message.hasOwnProperty("keyspace"))
+                object.keyspace = message.keyspace;
+            if (message.sql != null && message.hasOwnProperty("sql"))
+                object.sql = message.sql;
+            return object;
+        };
+
+        /**
+         * Converts this VExplainRequest to JSON.
+         * @function toJSON
+         * @memberof vtadmin.VExplainRequest
+         * @instance
+         * @returns {Object.<string,*>} JSON object
+         */
+        VExplainRequest.prototype.toJSON = function toJSON() {
+            return this.constructor.toObject(this, $protobuf.util.toJSONOptions);
+        };
+
+        /**
+         * Gets the default type url for VExplainRequest
+         * @function getTypeUrl
+         * @memberof vtadmin.VExplainRequest
+         * @static
+         * @param {string} [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com")
+         * @returns {string} The default type url
+         */
+        VExplainRequest.getTypeUrl = function getTypeUrl(typeUrlPrefix) {
+            if (typeUrlPrefix === undefined) {
+                typeUrlPrefix = "type.googleapis.com";
+            }
+            return typeUrlPrefix + "/vtadmin.VExplainRequest";
+        };
+
+        return VExplainRequest;
+    })();
+
+    vtadmin.VExplainResponse = (function() {
+
+        /**
+         * Properties of a VExplainResponse.
+         * @memberof vtadmin
+         * @interface IVExplainResponse
+         * @property {string|null} [response] VExplainResponse response
+         */
+
+        /**
+         * Constructs a new VExplainResponse.
+         * @memberof vtadmin
+         * @classdesc Represents a VExplainResponse.
+         * @implements IVExplainResponse
+         * @constructor
+         * @param {vtadmin.IVExplainResponse=} [properties] Properties to set
+         */
+        function VExplainResponse(properties) {
+            if (properties)
+                for (let keys = Object.keys(properties), i = 0; i < keys.length; ++i)
+                    if (properties[keys[i]] != null)
+                        this[keys[i]] = properties[keys[i]];
+        }
+
+        /**
+         * VExplainResponse response.
+         * @member {string} response
+         * @memberof vtadmin.VExplainResponse
+         * @instance
+         */
+        VExplainResponse.prototype.response = "";
+
+        /**
+         * Creates a new VExplainResponse instance using the specified properties.
+         * @function create
+         * @memberof vtadmin.VExplainResponse
+         * @static
+         * @param {vtadmin.IVExplainResponse=} [properties] Properties to set
+         * @returns {vtadmin.VExplainResponse} VExplainResponse instance
+         */
+        VExplainResponse.create = function create(properties) {
+            return new VExplainResponse(properties);
+        };
+
+        /**
+         * Encodes the specified VExplainResponse message. Does not implicitly {@link vtadmin.VExplainResponse.verify|verify} messages.
+         * @function encode
+         * @memberof vtadmin.VExplainResponse
+         * @static
+         * @param {vtadmin.IVExplainResponse} message VExplainResponse message or plain object to encode
+         * @param {$protobuf.Writer} [writer] Writer to encode to
+         * @returns {$protobuf.Writer} Writer
+         */
+        VExplainResponse.encode = function encode(message, writer) {
+            if (!writer)
+                writer = $Writer.create();
+            if (message.response != null && Object.hasOwnProperty.call(message, "response"))
+                writer.uint32(/* id 1, wireType 2 =*/10).string(message.response);
+            return writer;
+        };
+
+        /**
+         * Encodes the specified VExplainResponse message, length delimited. Does not implicitly {@link vtadmin.VExplainResponse.verify|verify} messages.
+         * @function encodeDelimited
+         * @memberof vtadmin.VExplainResponse
+         * @static
+         * @param {vtadmin.IVExplainResponse} message VExplainResponse message or plain object to encode
+         * @param {$protobuf.Writer} [writer] Writer to encode to
+         * @returns {$protobuf.Writer} Writer
+         */
+        VExplainResponse.encodeDelimited = function encodeDelimited(message, writer) {
+            return this.encode(message, writer).ldelim();
+        };
+
+        /**
+         * Decodes a VExplainResponse message from the specified reader or buffer.
+         * @function decode
+         * @memberof vtadmin.VExplainResponse
+         * @static
+         * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from
+         * @param {number} [length] Message length if known beforehand
+         * @returns {vtadmin.VExplainResponse} VExplainResponse
+         * @throws {Error} If the payload is not a reader or valid buffer
+         * @throws {$protobuf.util.ProtocolError} If required fields are missing
+         */
+        VExplainResponse.decode = function decode(reader, length) {
+            if (!(reader instanceof $Reader))
+                reader = $Reader.create(reader);
+            let end = length === undefined ? reader.len : reader.pos + length, message = new $root.vtadmin.VExplainResponse();
+            while (reader.pos < end) {
+                let tag = reader.uint32();
+                switch (tag >>> 3) {
+                case 1: {
+                        message.response = reader.string();
+                        break;
+                    }
+                default:
+                    reader.skipType(tag & 7);
+                    break;
+                }
+            }
+            return message;
+        };
+
+        /**
+         * Decodes a VExplainResponse message from the specified reader or buffer, length delimited.
+         * @function decodeDelimited
+         * @memberof vtadmin.VExplainResponse
+         * @static
+         * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from
+         * @returns {vtadmin.VExplainResponse} VExplainResponse
+         * @throws {Error} If the payload is not a reader or valid buffer
+         * @throws {$protobuf.util.ProtocolError} If required fields are missing
+         */
+        VExplainResponse.decodeDelimited = function decodeDelimited(reader) {
+            if (!(reader instanceof $Reader))
+                reader = new $Reader(reader);
+            return this.decode(reader, reader.uint32());
+        };
+
+        /**
+         * Verifies a VExplainResponse message.
+         * @function verify
+         * @memberof vtadmin.VExplainResponse
+         * @static
+         * @param {Object.<string,*>} message Plain object to verify
+         * @returns {string|null} `null` if valid, otherwise the reason why it is not
+         */
+        VExplainResponse.verify = function verify(message) {
+            if (typeof message !== "object" || message === null)
+                return "object expected";
+            if (message.response != null && message.hasOwnProperty("response"))
+                if (!$util.isString(message.response))
+                    return "response: string expected";
+            return null;
+        };
+
+        /**
+         * Creates a VExplainResponse message from a plain object. Also converts values to their respective internal types.
+         * @function fromObject
+         * @memberof vtadmin.VExplainResponse
+         * @static
+         * @param {Object.<string,*>} object Plain object
+         * @returns {vtadmin.VExplainResponse} VExplainResponse
+         */
+        VExplainResponse.fromObject = function fromObject(object) {
+            if (object instanceof $root.vtadmin.VExplainResponse)
+                return object;
+            let message = new $root.vtadmin.VExplainResponse();
+            if (object.response != null)
+                message.response = String(object.response);
+            return message;
+        };
+
+        /**
+         * Creates a plain object from a VExplainResponse message. Also converts values to other types if specified.
+         * @function toObject
+         * @memberof vtadmin.VExplainResponse
+         * @static
+         * @param {vtadmin.VExplainResponse} message VExplainResponse
+         * @param {$protobuf.IConversionOptions} [options] Conversion options
+         * @returns {Object.<string,*>} Plain object
+         */
+        VExplainResponse.toObject = function toObject(message, options) {
+            if (!options)
+                options = {};
+            let object = {};
+            if (options.defaults)
+                object.response = "";
+            if (message.response != null && message.hasOwnProperty("response"))
+                object.response = message.response;
+            return object;
+        };
+
+        /**
+         * Converts this VExplainResponse to JSON.
+         * @function toJSON
+         * @memberof vtadmin.VExplainResponse
+         * @instance
+         * @returns {Object.<string,*>} JSON object
+         */
+        VExplainResponse.prototype.toJSON = function toJSON() {
+            return this.constructor.toObject(this, $protobuf.util.toJSONOptions);
+        };
+
+        /**
+         * Gets the default type url for VExplainResponse
+         * @function getTypeUrl
+         * @memberof vtadmin.VExplainResponse
+         * @static
+         * @param {string} [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com")
+         * @returns {string} The default type url
+         */
+        VExplainResponse.getTypeUrl = function getTypeUrl(typeUrlPrefix) {
+            if (typeUrlPrefix === undefined) {
+                typeUrlPrefix = "type.googleapis.com";
+            }
+            return typeUrlPrefix + "/vtadmin.VExplainResponse";
+        };
+
+        return VExplainResponse;
+    })();
+
     return vtadmin;
 })();
 

From 39a0ddde8f27431f890662d3de8c62fcda530f7e Mon Sep 17 00:00:00 2001
From: Matt Lord <mattalord@gmail.com>
Date: Tue, 28 Jan 2025 14:08:04 -0500
Subject: [PATCH 07/68] VReplication: Address SwitchTraffic bugs around
 replication lag and cancel on error (#17616)

Signed-off-by: Matt Lord <mattalord@gmail.com>
---
 go/test/endtoend/vreplication/cluster_test.go |   2 +-
 .../vreplication/vreplication_test.go         | 146 ++++++++++++++++++
 go/vt/vtctl/workflow/server.go                |  45 ++++--
 go/vt/vtctl/workflow/stream_migrator.go       |  14 +-
 go/vt/vtctl/workflow/switcher.go              |   4 +-
 go/vt/vtctl/workflow/switcher_dry_run.go      |   3 +-
 go/vt/vtctl/workflow/switcher_interface.go    |   2 +-
 go/vt/vtctl/workflow/traffic_switcher.go      |  53 +++++--
 go/vt/vtctl/workflow/workflows.go             |  72 +++++----
 9 files changed, 276 insertions(+), 65 deletions(-)

diff --git a/go/test/endtoend/vreplication/cluster_test.go b/go/test/endtoend/vreplication/cluster_test.go
index bcf50d43702..1cf44e1d4c7 100644
--- a/go/test/endtoend/vreplication/cluster_test.go
+++ b/go/test/endtoend/vreplication/cluster_test.go
@@ -856,7 +856,7 @@ func (vc *VitessCluster) getVttabletsInKeyspace(t *testing.T, cell *Cell, ksName
 	tablets := make(map[string]*cluster.VttabletProcess)
 	for _, shard := range keyspace.Shards {
 		for _, tablet := range shard.Tablets {
-			if tablet.Vttablet.GetTabletStatus() == "SERVING" {
+			if tablet.Vttablet.GetTabletStatus() == "SERVING" && (tabletType == "" || strings.EqualFold(tablet.Vttablet.GetTabletType(), tabletType)) {
 				log.Infof("Serving status of tablet %s is %s, %s", tablet.Name, tablet.Vttablet.ServingStatus, tablet.Vttablet.GetTabletStatus())
 				tablets[tablet.Name] = tablet.Vttablet
 			}
diff --git a/go/test/endtoend/vreplication/vreplication_test.go b/go/test/endtoend/vreplication/vreplication_test.go
index 617e5f79f6a..f12e8edc759 100644
--- a/go/test/endtoend/vreplication/vreplication_test.go
+++ b/go/test/endtoend/vreplication/vreplication_test.go
@@ -826,6 +826,11 @@ func shardCustomer(t *testing.T, testReverse bool, cells []*Cell, sourceCellOrAl
 			shardNames = append(shardNames, shardName)
 		}
 		testSwitchTrafficPermissionChecks(t, workflowType, sourceKs, shardNames, targetKs, workflow)
+
+		testSwitchWritesErrorHandling(t, []*cluster.VttabletProcess{productTab}, []*cluster.VttabletProcess{customerTab1, customerTab2},
+			workflow, workflowType)
+
+		// Now let's confirm that it works as expected with an error.
 		switchWrites(t, workflowType, ksWorkflow, false)
 
 		checkThatVDiffFails(t, targetKs, workflow)
@@ -1057,6 +1062,7 @@ func reshard(t *testing.T, ksName string, tableName string, workflow string, sou
 		require.NoError(t, vc.AddShards(t, cells, keyspace, targetShards, defaultReplicas, defaultRdonly, tabletIDBase, targetKsOpts))
 
 		tablets := vc.getVttabletsInKeyspace(t, defaultCell, ksName, "primary")
+		var sourceTablets, targetTablets []*cluster.VttabletProcess
 
 		// Test multi-primary setups, like a Galera cluster, which have auto increment steps > 1.
 		for _, tablet := range tablets {
@@ -1069,9 +1075,11 @@ func reshard(t *testing.T, ksName string, tableName string, workflow string, sou
 		targetShards = "," + targetShards + ","
 		for _, tab := range tablets {
 			if strings.Contains(targetShards, ","+tab.Shard+",") {
+				targetTablets = append(targetTablets, tab)
 				log.Infof("Waiting for vrepl to catch up on %s since it IS a target shard", tab.Shard)
 				catchup(t, tab, workflow, "Reshard")
 			} else {
+				sourceTablets = append(sourceTablets, tab)
 				log.Infof("Not waiting for vrepl to catch up on %s since it is NOT a target shard", tab.Shard)
 				continue
 			}
@@ -1085,6 +1093,10 @@ func reshard(t *testing.T, ksName string, tableName string, workflow string, sou
 		if dryRunResultSwitchWrites != nil {
 			reshardAction(t, "SwitchTraffic", workflow, ksName, "", "", callNames, "primary", "--dry-run")
 		}
+		if tableName == "customer" {
+			testSwitchWritesErrorHandling(t, sourceTablets, targetTablets, workflow, "reshard")
+		}
+		// Now let's confirm that it works as expected with an error.
 		reshardAction(t, "SwitchTraffic", workflow, ksName, "", "", callNames, "primary")
 		reshardAction(t, "Complete", workflow, ksName, "", "", "", "")
 		for tabletName, count := range counts {
@@ -1656,6 +1668,140 @@ func testSwitchTrafficPermissionChecks(t *testing.T, workflowType, sourceKeyspac
 	})
 }
 
+// testSwitchWritesErrorHandling confirms that switching writes works as expected
+// in the face of vreplication lag (canSwitch() precheck) and when canceling the
+// switch due to replication failing to catch up in time.
+// The workflow MUST be migrating the customer table from the source to the
+// target keyspace AND the workflow must currently have reads switched but not
+// writes.
+func testSwitchWritesErrorHandling(t *testing.T, sourceTablets, targetTablets []*cluster.VttabletProcess, workflow, workflowType string) {
+	t.Run("validate switch writes error handling", func(t *testing.T) {
+		vtgateConn := getConnection(t, vc.ClusterConfig.hostname, vc.ClusterConfig.vtgateMySQLPort)
+		defer vtgateConn.Close()
+		require.NotZero(t, len(sourceTablets), "no source tablets provided")
+		require.NotZero(t, len(targetTablets), "no target tablets provided")
+		sourceKs := sourceTablets[0].Keyspace
+		targetKs := targetTablets[0].Keyspace
+		ksWorkflow := fmt.Sprintf("%s.%s", targetKs, workflow)
+		var err error
+		sourceConns := make([]*mysql.Conn, len(sourceTablets))
+		for i, tablet := range sourceTablets {
+			sourceConns[i], err = tablet.TabletConn(tablet.Keyspace, true)
+			require.NoError(t, err)
+			defer sourceConns[i].Close()
+		}
+		targetConns := make([]*mysql.Conn, len(targetTablets))
+		for i, tablet := range targetTablets {
+			targetConns[i], err = tablet.TabletConn(tablet.Keyspace, true)
+			require.NoError(t, err)
+			defer targetConns[i].Close()
+		}
+		startingTestRowID := 10000000
+		numTestRows := 100
+		addTestRows := func() {
+			for i := 0; i < numTestRows; i++ {
+				execVtgateQuery(t, vtgateConn, sourceTablets[0].Keyspace, fmt.Sprintf("insert into customer (cid, name) values (%d, 'laggingCustomer')",
+					startingTestRowID+i))
+			}
+		}
+		deleteTestRows := func() {
+			execVtgateQuery(t, vtgateConn, sourceTablets[0].Keyspace, fmt.Sprintf("delete from customer where cid >= %d", startingTestRowID))
+		}
+		addIndex := func() {
+			for _, targetConn := range targetConns {
+				execQuery(t, targetConn, "set session sql_mode=''")
+				execQuery(t, targetConn, "alter table customer add unique index name_idx (name)")
+			}
+		}
+		dropIndex := func() {
+			for _, targetConn := range targetConns {
+				execQuery(t, targetConn, "alter table customer drop index name_idx")
+			}
+		}
+		lockTargetTable := func() {
+			for _, targetConn := range targetConns {
+				execQuery(t, targetConn, "lock table customer read")
+			}
+		}
+		unlockTargetTable := func() {
+			for _, targetConn := range targetConns {
+				execQuery(t, targetConn, "unlock tables")
+			}
+		}
+		cleanupTestData := func() {
+			dropIndex()
+			deleteTestRows()
+		}
+		restartWorkflow := func() {
+			err = vc.VtctldClient.ExecuteCommand("workflow", "--keyspace", targetKs, "start", "--workflow", workflow)
+			require.NoError(t, err, "failed to start workflow: %v", err)
+		}
+		waitForTargetToCatchup := func() {
+			waitForWorkflowState(t, vc, ksWorkflow, binlogdatapb.VReplicationWorkflowState_Running.String())
+			waitForNoWorkflowLag(t, vc, targetKs, workflow)
+		}
+
+		// First let's test that the prechecks work as expected. We ALTER
+		// the table on the target shards to add a unique index on the name
+		// field.
+		addIndex()
+		// Then we replicate some test rows across the target shards by
+		// inserting them in the source keyspace.
+		addTestRows()
+		// Now the workflow should go into the error state and the lag should
+		// start to climb. So we sleep for twice the max lag duration that we
+		// will set for the SwitchTraffic call.
+		lagDuration := 3 * time.Second
+		time.Sleep(lagDuration * 3)
+		out, err := vc.VtctldClient.ExecuteCommandWithOutput(workflowType, "--workflow", workflow, "--target-keyspace", targetKs,
+			"SwitchTraffic", "--tablet-types=primary", "--timeout=30s", "--max-replication-lag-allowed", lagDuration.String())
+		// It should fail in the canSwitch() precheck.
+		require.Error(t, err)
+		require.Regexp(t, fmt.Sprintf(".*cannot switch traffic for workflow %s at this time: replication lag [0-9]+s is higher than allowed lag %s.*",
+			workflow, lagDuration.String()), out)
+		require.NotContains(t, out, "cancel migration failed")
+		// Confirm that queries still work fine.
+		execVtgateQuery(t, vtgateConn, sourceKs, "select * from customer limit 1")
+		cleanupTestData()
+		// We have to restart the workflow again as the duplicate key error
+		// is a permanent/terminal one.
+		restartWorkflow()
+		waitForTargetToCatchup()
+
+		// Now let's test that the cancel works by setting the command timeout
+		// to a fraction (6s) of the default max repl lag duration (30s). First
+		// we lock the customer table on the target tablets so that we cannot
+		// apply the INSERTs and catch up.
+		lockTargetTable()
+		addTestRows()
+		timeout := lagDuration * 2 // 6s
+		// Use the default max-replication-lag-allowed value of 30s.
+		// We run the command in a goroutine so that we can unblock things
+		// after the timeout is reached -- as the vplayer query is blocking
+		// on the table lock in the MySQL layer.
+		wg := sync.WaitGroup{}
+		wg.Add(1)
+		go func() {
+			defer wg.Done()
+			out, err = vc.VtctldClient.ExecuteCommandWithOutput(workflowType, "--workflow", workflow, "--target-keyspace", targetKs,
+				"SwitchTraffic", "--tablet-types=primary", "--timeout", timeout.String())
+		}()
+		time.Sleep(timeout)
+		// Now we can unblock things and let it continue.
+		unlockTargetTable()
+		wg.Wait()
+		// It should fail due to the command context timeout and we should
+		// successfully cancel.
+		require.Error(t, err)
+		require.Contains(t, out, "failed to sync up replication between the source and target")
+		require.NotContains(t, out, "cancel migration failed")
+		// Confirm that queries still work fine.
+		execVtgateQuery(t, vtgateConn, sourceKs, "select * from customer limit 1")
+		deleteTestRows()
+		waitForTargetToCatchup()
+	})
+}
+
 // restartWorkflow confirms that a workflow can be successfully
 // stopped and started.
 func restartWorkflow(t *testing.T, ksWorkflow string) {
diff --git a/go/vt/vtctl/workflow/server.go b/go/vt/vtctl/workflow/server.go
index 68eeb31d0d0..4a1fb2e461a 100644
--- a/go/vt/vtctl/workflow/server.go
+++ b/go/vt/vtctl/workflow/server.go
@@ -2920,8 +2920,10 @@ func (s *Server) switchWrites(ctx context.Context, req *vtctldatapb.WorkflowSwit
 			return handleError("failed to migrate the workflow streams", err)
 		}
 		if cancel {
-			sw.cancelMigration(ctx, sm)
-			return 0, sw.logs(), nil
+			if cerr := sw.cancelMigration(ctx, sm); cerr != nil {
+				err = vterrors.Errorf(vtrpcpb.Code_CANCELED, "%v\n\n%v", err, cerr)
+			}
+			return 0, sw.logs(), err
 		}
 
 		// We stop writes on the source before stopping the source streams so that the catchup time
@@ -2933,7 +2935,9 @@ func (s *Server) switchWrites(ctx context.Context, req *vtctldatapb.WorkflowSwit
 		// we actually stop them.
 		ts.Logger().Infof("Stopping source writes")
 		if err := sw.stopSourceWrites(ctx); err != nil {
-			sw.cancelMigration(ctx, sm)
+			if cerr := sw.cancelMigration(ctx, sm); cerr != nil {
+				err = vterrors.Errorf(vtrpcpb.Code_CANCELED, "%v\n\n%v", err, cerr)
+			}
 			return handleError(fmt.Sprintf("failed to stop writes in the %s keyspace", ts.SourceKeyspaceName()), err)
 		}
 
@@ -2951,7 +2955,9 @@ func (s *Server) switchWrites(ctx context.Context, req *vtctldatapb.WorkflowSwit
 					ts.Logger().Errorf("stream in stopStreams: key %s shard %s stream %+v", key, stream.BinlogSource.Shard, stream.BinlogSource)
 				}
 			}
-			sw.cancelMigration(ctx, sm)
+			if cerr := sw.cancelMigration(ctx, sm); cerr != nil {
+				err = vterrors.Errorf(vtrpcpb.Code_CANCELED, "%v\n\n%v", err, cerr)
+			}
 			return handleError(fmt.Sprintf("failed to stop the workflow streams in the %s keyspace", ts.SourceKeyspaceName()), err)
 		}
 
@@ -2961,7 +2967,9 @@ func (s *Server) switchWrites(ctx context.Context, req *vtctldatapb.WorkflowSwit
 			// the tablet's deny list check and the first mysqld side table lock.
 			for cnt := 1; cnt <= lockTablesCycles; cnt++ {
 				if err := ts.executeLockTablesOnSource(ctx); err != nil {
-					sw.cancelMigration(ctx, sm)
+					if cerr := sw.cancelMigration(ctx, sm); cerr != nil {
+						err = vterrors.Errorf(vtrpcpb.Code_CANCELED, "%v\n\n%v", err, cerr)
+					}
 					return handleError(fmt.Sprintf("failed to execute LOCK TABLES (attempt %d of %d) on sources", cnt, lockTablesCycles), err)
 				}
 				// No need to UNLOCK the tables as the connection was closed once the locks were acquired
@@ -2982,7 +2990,9 @@ func (s *Server) switchWrites(ctx context.Context, req *vtctldatapb.WorkflowSwit
 		}
 		ts.Logger().Infof("Waiting for streams to catchup")
 		if err := sw.waitForCatchup(ctx, waitTimeout); err != nil {
-			sw.cancelMigration(ctx, sm)
+			if cerr := sw.cancelMigration(ctx, sm); cerr != nil {
+				err = vterrors.Errorf(vtrpcpb.Code_CANCELED, "%v\n\n%v", err, cerr)
+			}
 			return handleError("failed to sync up replication between the source and target", err)
 		}
 
@@ -2991,7 +3001,9 @@ func (s *Server) switchWrites(ctx context.Context, req *vtctldatapb.WorkflowSwit
 		}
 		ts.Logger().Infof("Migrating streams")
 		if err := sw.migrateStreams(ctx, sm); err != nil {
-			sw.cancelMigration(ctx, sm)
+			if cerr := sw.cancelMigration(ctx, sm); cerr != nil {
+				err = vterrors.Errorf(vtrpcpb.Code_CANCELED, "%v\n\n%v", err, cerr)
+			}
 			return handleError("failed to migrate the workflow streams", err)
 		}
 
@@ -3000,7 +3012,9 @@ func (s *Server) switchWrites(ctx context.Context, req *vtctldatapb.WorkflowSwit
 		}
 		ts.Logger().Infof("Resetting sequences")
 		if err := sw.resetSequences(ctx); err != nil {
-			sw.cancelMigration(ctx, sm)
+			if cerr := sw.cancelMigration(ctx, sm); cerr != nil {
+				err = vterrors.Errorf(vtrpcpb.Code_CANCELED, "%v\n\n%v", err, cerr)
+			}
 			return handleError("failed to reset the sequences", err)
 		}
 
@@ -3009,7 +3023,9 @@ func (s *Server) switchWrites(ctx context.Context, req *vtctldatapb.WorkflowSwit
 		}
 		ts.Logger().Infof("Creating reverse streams")
 		if err := sw.createReverseVReplication(ctx); err != nil {
-			sw.cancelMigration(ctx, sm)
+			if cerr := sw.cancelMigration(ctx, sm); cerr != nil {
+				err = vterrors.Errorf(vtrpcpb.Code_CANCELED, "%v\n\n%v", err, cerr)
+			}
 			return handleError("failed to create the reverse vreplication streams", err)
 		}
 
@@ -3024,7 +3040,9 @@ func (s *Server) switchWrites(ctx context.Context, req *vtctldatapb.WorkflowSwit
 			initSeqCtx, cancel := context.WithTimeout(ctx, waitTimeout/2)
 			defer cancel()
 			if err := sw.initializeTargetSequences(initSeqCtx, sequenceMetadata); err != nil {
-				sw.cancelMigration(ctx, sm)
+				if cerr := sw.cancelMigration(ctx, sm); cerr != nil {
+					err = vterrors.Errorf(vtrpcpb.Code_CANCELED, "%v\n\n%v", err, cerr)
+				}
 				return handleError(fmt.Sprintf("failed to initialize the sequences used in the %s keyspace", ts.TargetKeyspaceName()), err)
 			}
 		}
@@ -3074,15 +3092,14 @@ func (s *Server) canSwitch(ctx context.Context, ts *trafficSwitcher, maxAllowedR
 	if err != nil {
 		return "", err
 	}
+	if wf.MaxVReplicationTransactionLag > maxAllowedReplLagSecs {
+		return fmt.Sprintf(cannotSwitchHighLag, wf.MaxVReplicationTransactionLag, maxAllowedReplLagSecs), nil
+	}
 	for _, stream := range wf.ShardStreams {
 		for _, st := range stream.GetStreams() {
 			if st.Message == Frozen {
 				return cannotSwitchFrozen, nil
 			}
-			// If no new events have been replicated after the copy phase then it will be 0.
-			if vreplLag := time.Now().Unix() - st.TimeUpdated.Seconds; vreplLag > maxAllowedReplLagSecs {
-				return fmt.Sprintf(cannotSwitchHighLag, vreplLag, maxAllowedReplLagSecs), nil
-			}
 			switch st.State {
 			case binlogdatapb.VReplicationWorkflowState_Copying.String():
 				return cannotSwitchCopyIncomplete, nil
diff --git a/go/vt/vtctl/workflow/stream_migrator.go b/go/vt/vtctl/workflow/stream_migrator.go
index a700a1338dd..7b4fe69074f 100644
--- a/go/vt/vtctl/workflow/stream_migrator.go
+++ b/go/vt/vtctl/workflow/stream_migrator.go
@@ -203,12 +203,15 @@ func (sm *StreamMigrator) Templates() []*VReplicationStream {
 }
 
 // CancelStreamMigrations cancels the stream migrations.
-func (sm *StreamMigrator) CancelStreamMigrations(ctx context.Context) {
+func (sm *StreamMigrator) CancelStreamMigrations(ctx context.Context) error {
 	if sm.streams == nil {
-		return
+		return nil
 	}
+	errs := &concurrency.AllErrorRecorder{}
 
-	_ = sm.deleteTargetStreams(ctx)
+	if err := sm.deleteTargetStreams(ctx); err != nil {
+		errs.RecordError(fmt.Errorf("could not delete target streams: %v", err))
+	}
 
 	// Restart the source streams, but leave the Reshard workflow's reverse
 	// variant stopped.
@@ -221,8 +224,13 @@ func (sm *StreamMigrator) CancelStreamMigrations(ctx context.Context) {
 		return err
 	})
 	if err != nil {
+		errs.RecordError(fmt.Errorf("could not restart source streams: %v", err))
 		sm.logger.Errorf("Cancel stream migrations failed: could not restart source streams: %v", err)
 	}
+	if errs.HasErrors() {
+		return errs.AggrError(vterrors.Aggregate)
+	}
+	return nil
 }
 
 // MigrateStreams migrates N streams
diff --git a/go/vt/vtctl/workflow/switcher.go b/go/vt/vtctl/workflow/switcher.go
index 789822b5be9..03d1a413e98 100644
--- a/go/vt/vtctl/workflow/switcher.go
+++ b/go/vt/vtctl/workflow/switcher.go
@@ -124,8 +124,8 @@ func (r *switcher) stopStreams(ctx context.Context, sm *StreamMigrator) ([]strin
 	return sm.StopStreams(ctx)
 }
 
-func (r *switcher) cancelMigration(ctx context.Context, sm *StreamMigrator) {
-	r.ts.cancelMigration(ctx, sm)
+func (r *switcher) cancelMigration(ctx context.Context, sm *StreamMigrator) error {
+	return r.ts.cancelMigration(ctx, sm)
 }
 
 func (r *switcher) lockKeyspace(ctx context.Context, keyspace, action string, opts ...topo.LockOption) (context.Context, func(*error), error) {
diff --git a/go/vt/vtctl/workflow/switcher_dry_run.go b/go/vt/vtctl/workflow/switcher_dry_run.go
index 29c40f85a69..c7f66b93e14 100644
--- a/go/vt/vtctl/workflow/switcher_dry_run.go
+++ b/go/vt/vtctl/workflow/switcher_dry_run.go
@@ -301,8 +301,9 @@ func (dr *switcherDryRun) stopStreams(ctx context.Context, sm *StreamMigrator) (
 	return nil, nil
 }
 
-func (dr *switcherDryRun) cancelMigration(ctx context.Context, sm *StreamMigrator) {
+func (dr *switcherDryRun) cancelMigration(ctx context.Context, sm *StreamMigrator) error {
 	dr.drLog.Log("Cancel migration as requested")
+	return nil
 }
 
 func (dr *switcherDryRun) lockKeyspace(ctx context.Context, keyspace, _ string, _ ...topo.LockOption) (context.Context, func(*error), error) {
diff --git a/go/vt/vtctl/workflow/switcher_interface.go b/go/vt/vtctl/workflow/switcher_interface.go
index 560b7a695fd..e780add1a2c 100644
--- a/go/vt/vtctl/workflow/switcher_interface.go
+++ b/go/vt/vtctl/workflow/switcher_interface.go
@@ -27,7 +27,7 @@ import (
 
 type iswitcher interface {
 	lockKeyspace(ctx context.Context, keyspace, action string, opts ...topo.LockOption) (context.Context, func(*error), error)
-	cancelMigration(ctx context.Context, sm *StreamMigrator)
+	cancelMigration(ctx context.Context, sm *StreamMigrator) error
 	stopStreams(ctx context.Context, sm *StreamMigrator) ([]string, error)
 	stopSourceWrites(ctx context.Context) error
 	waitForCatchup(ctx context.Context, filteredReplicationWaitTime time.Duration) error
diff --git a/go/vt/vtctl/workflow/traffic_switcher.go b/go/vt/vtctl/workflow/traffic_switcher.go
index 3b151103d7f..af55415bcdc 100644
--- a/go/vt/vtctl/workflow/traffic_switcher.go
+++ b/go/vt/vtctl/workflow/traffic_switcher.go
@@ -754,7 +754,7 @@ func (ts *trafficSwitcher) changeShardsAccess(ctx context.Context, keyspace stri
 
 func (ts *trafficSwitcher) allowTargetWrites(ctx context.Context) error {
 	if ts.MigrationType() == binlogdatapb.MigrationType_TABLES {
-		return ts.switchDeniedTables(ctx)
+		return ts.switchDeniedTables(ctx, false)
 	}
 	return ts.changeShardsAccess(ctx, ts.TargetKeyspaceName(), ts.TargetShards(), allowWrites)
 }
@@ -1062,7 +1062,7 @@ func (ts *trafficSwitcher) waitForCatchup(ctx context.Context, filteredReplicati
 func (ts *trafficSwitcher) stopSourceWrites(ctx context.Context) error {
 	var err error
 	if ts.MigrationType() == binlogdatapb.MigrationType_TABLES {
-		err = ts.switchDeniedTables(ctx)
+		err = ts.switchDeniedTables(ctx, false)
 	} else {
 		err = ts.changeShardsAccess(ctx, ts.SourceKeyspaceName(), ts.SourceShards(), disallowWrites)
 	}
@@ -1074,17 +1074,27 @@ func (ts *trafficSwitcher) stopSourceWrites(ctx context.Context) error {
 }
 
 // switchDeniedTables switches the denied tables rules for the traffic switch.
-// They are removed on the source side and added on the target side.
-func (ts *trafficSwitcher) switchDeniedTables(ctx context.Context) error {
+// They are added on the source side and removed on the target side.
+// If backward is true, then we swap this logic, removing on the source side
+// and adding on the target side. You would want to do that e.g. when canceling
+// a failed (and currently partial) traffic switch as we may have already
+// switched the denied tables entries and in any event we need to go back to
+// the original state.
+func (ts *trafficSwitcher) switchDeniedTables(ctx context.Context, backward bool) error {
 	if ts.MigrationType() != binlogdatapb.MigrationType_TABLES {
 		return nil
 	}
 
+	rmsource, rmtarget := false, true
+	if backward {
+		rmsource, rmtarget = true, false
+	}
+
 	egrp, ectx := errgroup.WithContext(ctx)
 	egrp.Go(func() error {
 		return ts.ForAllSources(func(source *MigrationSource) error {
 			if _, err := ts.TopoServer().UpdateShardFields(ctx, ts.SourceKeyspaceName(), source.GetShard().ShardName(), func(si *topo.ShardInfo) error {
-				return si.UpdateDeniedTables(ectx, topodatapb.TabletType_PRIMARY, nil, false, ts.Tables())
+				return si.UpdateDeniedTables(ectx, topodatapb.TabletType_PRIMARY, nil, rmsource, ts.Tables())
 			}); err != nil {
 				return err
 			}
@@ -1107,7 +1117,7 @@ func (ts *trafficSwitcher) switchDeniedTables(ctx context.Context) error {
 	egrp.Go(func() error {
 		return ts.ForAllTargets(func(target *MigrationTarget) error {
 			if _, err := ts.TopoServer().UpdateShardFields(ectx, ts.TargetKeyspaceName(), target.GetShard().ShardName(), func(si *topo.ShardInfo) error {
-				return si.UpdateDeniedTables(ctx, topodatapb.TabletType_PRIMARY, nil, true, ts.Tables())
+				return si.UpdateDeniedTables(ctx, topodatapb.TabletType_PRIMARY, nil, rmtarget, ts.Tables())
 			}); err != nil {
 				return err
 			}
@@ -1137,8 +1147,9 @@ func (ts *trafficSwitcher) switchDeniedTables(ctx context.Context) error {
 
 // cancelMigration attempts to revert all changes made during the migration so that we can get back to the
 // state when traffic switching (or reversing) was initiated.
-func (ts *trafficSwitcher) cancelMigration(ctx context.Context, sm *StreamMigrator) {
+func (ts *trafficSwitcher) cancelMigration(ctx context.Context, sm *StreamMigrator) error {
 	var err error
+	cancelErrs := &concurrency.AllErrorRecorder{}
 
 	if ctx.Err() != nil {
 		// Even though we create a new context later on we still record any context error:
@@ -1147,21 +1158,29 @@ func (ts *trafficSwitcher) cancelMigration(ctx context.Context, sm *StreamMigrat
 	}
 
 	// We create a new context while canceling the migration, so that we are independent of the original
-	// context being cancelled prior to or during the cancel operation.
-	cmTimeout := 60 * time.Second
-	cmCtx, cmCancel := context.WithTimeout(context.Background(), cmTimeout)
+	// context being canceled prior to or during the cancel operation itself.
+	// First we create a copy of the parent context, so that we maintain the locks, but which cannot be
+	// canceled by the parent context.
+	wcCtx := context.WithoutCancel(ctx)
+	// Now we create a child context from that which has a timeout.
+	cmTimeout := 2 * time.Minute
+	cmCtx, cmCancel := context.WithTimeout(wcCtx, cmTimeout)
 	defer cmCancel()
 
 	if ts.MigrationType() == binlogdatapb.MigrationType_TABLES {
-		err = ts.switchDeniedTables(cmCtx)
+		err = ts.switchDeniedTables(cmCtx, true /* revert */)
 	} else {
 		err = ts.changeShardsAccess(cmCtx, ts.SourceKeyspaceName(), ts.SourceShards(), allowWrites)
 	}
 	if err != nil {
+		cancelErrs.RecordError(fmt.Errorf("could not revert denied tables / shard access: %v", err))
 		ts.Logger().Errorf("Cancel migration failed: could not revert denied tables / shard access: %v", err)
 	}
 
-	sm.CancelStreamMigrations(cmCtx)
+	if err := sm.CancelStreamMigrations(cmCtx); err != nil {
+		cancelErrs.RecordError(fmt.Errorf("could not cancel stream migrations: %v", err))
+		ts.Logger().Errorf("Cancel migration failed: could not cancel stream migrations: %v", err)
+	}
 
 	err = ts.ForAllTargets(func(target *MigrationTarget) error {
 		query := fmt.Sprintf("update _vt.vreplication set state='Running', message='' where db_name=%s and workflow=%s",
@@ -1170,13 +1189,19 @@ func (ts *trafficSwitcher) cancelMigration(ctx context.Context, sm *StreamMigrat
 		return err
 	})
 	if err != nil {
+		cancelErrs.RecordError(fmt.Errorf("could not restart vreplication: %v", err))
 		ts.Logger().Errorf("Cancel migration failed: could not restart vreplication: %v", err)
 	}
 
-	err = ts.deleteReverseVReplication(cmCtx)
-	if err != nil {
+	if err := ts.deleteReverseVReplication(cmCtx); err != nil {
+		cancelErrs.RecordError(fmt.Errorf("could not delete reverse vreplication streams: %v", err))
 		ts.Logger().Errorf("Cancel migration failed: could not delete reverse vreplication streams: %v", err)
 	}
+
+	if cancelErrs.HasErrors() {
+		return vterrors.Wrap(cancelErrs.AggrError(vterrors.Aggregate), "cancel migration failed, manual cleanup work may be necessary")
+	}
+	return nil
 }
 
 func (ts *trafficSwitcher) freezeTargetVReplication(ctx context.Context) error {
diff --git a/go/vt/vtctl/workflow/workflows.go b/go/vt/vtctl/workflow/workflows.go
index da0ee5dfec7..a1b4393f2c0 100644
--- a/go/vt/vtctl/workflow/workflows.go
+++ b/go/vt/vtctl/workflow/workflows.go
@@ -446,35 +446,11 @@ func (wf *workflowFetcher) scanWorkflow(
 		workflow.WorkflowSubType = res.WorkflowSubType.String()
 		workflow.DeferSecondaryKeys = res.DeferSecondaryKeys
 
-		// MaxVReplicationTransactionLag estimates the actual statement processing lag
-		// between the source and the target. If we are still processing source events it
-		// is the difference b/w current time and the timestamp of the last event. If
-		// heartbeats are more recent than the last event, then the lag is the time since
-		// the last heartbeat as there can be an actual event immediately after the
-		// heartbeat, but which has not yet been processed on the target.
-		// We don't allow switching during the copy phase, so in that case we just return
-		// a large lag. All timestamps are in seconds since epoch.
-		if rstream.TransactionTimestamp == nil {
-			rstream.TransactionTimestamp = &vttimepb.Time{}
-		}
-		lastTransactionTime := rstream.TransactionTimestamp.Seconds
-		if rstream.TimeHeartbeat == nil {
-			rstream.TimeHeartbeat = &vttimepb.Time{}
-		}
-		lastHeartbeatTime := rstream.TimeHeartbeat.Seconds
-		if stream.State == binlogdatapb.VReplicationWorkflowState_Copying.String() {
-			meta.maxVReplicationTransactionLag = math.MaxInt64
-		} else {
-			if lastTransactionTime == 0 /* no new events after copy */ ||
-				lastHeartbeatTime > lastTransactionTime /* no recent transactions, so all caught up */ {
-
-				lastTransactionTime = lastHeartbeatTime
-			}
-			now := time.Now().Unix() /* seconds since epoch */
-			transactionReplicationLag := float64(now - lastTransactionTime)
-			if transactionReplicationLag > meta.maxVReplicationTransactionLag {
-				meta.maxVReplicationTransactionLag = transactionReplicationLag
-			}
+		// MaxVReplicationTransactionLag estimates the max statement processing lag
+		// between the source and the target across all of the workflow streams.
+		transactionReplicationLag := getVReplicationTrxLag(rstream.TransactionTimestamp, rstream.TimeUpdated, rstream.TimeHeartbeat, rstream.State)
+		if transactionReplicationLag > meta.maxVReplicationTransactionLag {
+			meta.maxVReplicationTransactionLag = transactionReplicationLag
 		}
 	}
 
@@ -670,3 +646,41 @@ func getStreamState(stream *vtctldatapb.Workflow_Stream, rstream *tabletmanagerd
 	}
 	return rstream.State.String()
 }
+
+// getVReplicationTrxLag estimates the actual statement processing lag between the
+// source and the target. If we are still processing source events it is the
+// difference between current time and the timestamp of the last event. If
+// heartbeats are more recent than the last event, then the lag is the time since
+// the last heartbeat as there can be an actual event immediately after the
+// heartbeat, but which has not yet been processed on the target. We don't allow
+// switching during the copy phase, so in that case we just return a large lag.
+// All timestamps are in seconds since epoch.
+func getVReplicationTrxLag(trxTs, updatedTs, heartbeatTs *vttimepb.Time, state binlogdatapb.VReplicationWorkflowState) float64 {
+	if state == binlogdatapb.VReplicationWorkflowState_Copying {
+		return math.MaxInt64
+	}
+	if trxTs == nil {
+		trxTs = &vttimepb.Time{}
+	}
+	lastTransactionTime := trxTs.Seconds
+	if updatedTs == nil {
+		updatedTs = &vttimepb.Time{}
+	}
+	lastUpdatedTime := updatedTs.Seconds
+	if heartbeatTs == nil {
+		heartbeatTs = &vttimepb.Time{}
+	}
+	lastHeartbeatTime := heartbeatTs.Seconds
+	// We do NOT update the heartbeat timestamp when we are regularly updating the
+	// position as we replicate transactions (GTIDs).
+	// When we DO record a heartbeat, we set the updated time to the same value.
+	// When recording that we are throttled, we update the updated time but NOT
+	// the heartbeat time.
+	if lastTransactionTime == 0 /* No replicated events after copy */ ||
+		(lastUpdatedTime == lastHeartbeatTime && /* The last update was from a heartbeat */
+			lastUpdatedTime > lastTransactionTime /* No recent transactions, only heartbeats, so all caught up */) {
+		lastTransactionTime = lastUpdatedTime
+	}
+	now := time.Now().Unix() // Seconds since epoch
+	return float64(now - lastTransactionTime)
+}

From 9c6c38007c25cf3ff24031e32febad4103c7fb78 Mon Sep 17 00:00:00 2001
From: Matt Lord <mattalord@gmail.com>
Date: Tue, 28 Jan 2025 16:48:01 -0500
Subject: [PATCH 08/68] VReplication: CODEOWNERS and unit test housekeeping
 (#17646)

Signed-off-by: Matt Lord <mattalord@gmail.com>
---
 .github/CODEOWNERS                            | 1 +
 go/vt/vtctl/workflow/traffic_switcher_test.go | 6 ++++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 7b9b54a19bb..dc2968add81 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -72,6 +72,7 @@ go.sum @ajm188 @deepthi @harshit-gangal @mattlord @rohit-nayak-ps @systay @froui
 /go/vt/vttablet/tabletmanager/rpc_throttler.go @shlomi-noach @mattlord @timvaillancourt
 /go/vt/vttablet/tabletserver/throttle @shlomi-noach @mattlord @timvaillancourt
 /go/vt/vttablet/tabletmanager/vreplication @rohit-nayak-ps @mattlord
+/go/vt/vttablet/tabletmanager/vdiff @rohit-nayak-ps @mattlord
 /go/vt/vttablet/tabletmanager/vstreamer @rohit-nayak-ps @mattlord
 /go/vt/vttablet/tabletserver* @harshit-gangal @systay @shlomi-noach @rohit-nayak-ps @timvaillancourt
 /go/vt/vttablet/tabletserver/messager @mattlord @rohit-nayak-ps @derekperkins
diff --git a/go/vt/vtctl/workflow/traffic_switcher_test.go b/go/vt/vtctl/workflow/traffic_switcher_test.go
index a7da91174b9..eb8c877e255 100644
--- a/go/vt/vtctl/workflow/traffic_switcher_test.go
+++ b/go/vt/vtctl/workflow/traffic_switcher_test.go
@@ -966,7 +966,8 @@ func TestCancelMigration_TABLES(t *testing.T) {
 	err = topo.CheckKeyspaceLocked(ctx, ts.sourceKeyspace)
 	require.NoError(t, err)
 
-	ts.cancelMigration(ctx, sm)
+	err = ts.cancelMigration(ctx, sm)
+	require.NoError(t, err)
 
 	// Expect the queries to be cleared
 	assert.Empty(t, env.tmc.vrQueries[100])
@@ -1027,7 +1028,8 @@ func TestCancelMigration_SHARDS(t *testing.T) {
 	err = topo.CheckKeyspaceLocked(ctx, ts.sourceKeyspace)
 	require.NoError(t, err)
 
-	ts.cancelMigration(ctx, sm)
+	err = ts.cancelMigration(ctx, sm)
+	require.NoError(t, err)
 
 	// Expect the queries to be cleared
 	assert.Empty(t, env.tmc.vrQueries[100])

From 53396cdb1c2d096ff452786b2e0110b73c6d02da Mon Sep 17 00:00:00 2001
From: Deepthi Sigireddi <deepthi@planetscale.com>
Date: Wed, 29 Jan 2025 16:32:15 -0800
Subject: [PATCH 09/68] Improve vtgate logging for buffering (#17654)

Signed-off-by: deepthi <deepthi@planetscale.com>
---
 go/vt/discovery/keyspace_events.go  | 3 ++-
 go/vt/vtgate/buffer/shard_buffer.go | 6 +++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/go/vt/discovery/keyspace_events.go b/go/vt/discovery/keyspace_events.go
index 1cb44184778..147606c553b 100644
--- a/go/vt/discovery/keyspace_events.go
+++ b/go/vt/discovery/keyspace_events.go
@@ -318,6 +318,7 @@ func (kss *keyspaceState) ensureConsistentLocked() {
 	// watcher. this means the ongoing availability event has been resolved, so we can broadcast
 	// a resolution event to all listeners
 	kss.consistent = true
+	log.Infof("keyspace %s is now consistent", kss.keyspace)
 
 	kss.moveTablesState = nil
 
@@ -328,7 +329,7 @@ func (kss *keyspaceState) ensureConsistentLocked() {
 			Serving: sstate.serving,
 		})
 
-		log.Infof("keyspace event resolved: %s is now consistent (serving: %t)",
+		log.V(2).Infof("keyspace event resolved: %s is now consistent (serving: %t)",
 			topoproto.KeyspaceShardString(sstate.target.Keyspace, sstate.target.Shard),
 			sstate.serving,
 		)
diff --git a/go/vt/vtgate/buffer/shard_buffer.go b/go/vt/vtgate/buffer/shard_buffer.go
index 66c6ee702e6..f3196a16415 100644
--- a/go/vt/vtgate/buffer/shard_buffer.go
+++ b/go/vt/vtgate/buffer/shard_buffer.go
@@ -286,7 +286,7 @@ func (sb *shardBuffer) startBufferingLocked(ctx context.Context, kev *discovery.
 		msg = "Dry-run: Would have started buffering"
 	}
 	starts.Add(sb.statsKey, 1)
-	log.V(2).Infof("%v for shard: %s (window: %v, size: %v, max failover duration: %v) (A failover was detected by this seen error: %v.)",
+	log.Infof("%v for shard: %s (window: %v, size: %v, max failover duration: %v) (A failover was detected by this seen error: %v.)",
 		msg,
 		topoproto.KeyspaceShardString(sb.keyspace, sb.shard),
 		sb.buf.config.Window,
@@ -562,7 +562,7 @@ func (sb *shardBuffer) stopBufferingLocked(reason stopReason, details string) {
 	if sb.mode == bufferModeDryRun {
 		msg = "Dry-run: Would have stopped buffering"
 	}
-	log.V(2).Infof("%v for shard: %s after: %.1f seconds due to: %v. Draining %d buffered requests now.",
+	log.Infof("%v for shard: %s after: %.1f seconds due to: %v. Draining %d buffered requests now.",
 		msg, topoproto.KeyspaceShardString(sb.keyspace, sb.shard), d.Seconds(), details, len(q))
 
 	var clientEntryError error
@@ -622,7 +622,7 @@ func (sb *shardBuffer) drain(q []*entry, err error) {
 	wg.Wait()
 
 	d := sb.timeNow().Sub(start)
-	log.V(2).Infof("Draining finished for shard: %s Took: %v for: %d requests.", topoproto.KeyspaceShardString(sb.keyspace, sb.shard), d, len(q))
+	log.Infof("Draining finished for shard: %s Took: %v for: %d requests.", topoproto.KeyspaceShardString(sb.keyspace, sb.shard), d, len(q))
 	requestsDrained.Add(sb.statsKey, int64(len(q)))
 
 	// Draining is done. Change state from "draining" to "idle".

From 10d36cbdbc66d80194ac1dcdf7f2fdb41e35a44c Mon Sep 17 00:00:00 2001
From: Dirkjan Bussink <d.bussink@gmail.com>
Date: Thu, 30 Jan 2025 09:33:57 +0100
Subject: [PATCH 10/68] Always make sure to escape all strings (#17649)

Signed-off-by: Dirkjan Bussink <d.bussink@gmail.com>
---
 .../vreplication/vdiff_helper_test.go         |  4 +---
 go/vt/binlog/binlogplayer/binlog_player.go    | 22 +++++++++----------
 go/vt/vtctl/vdiff_env_test.go                 |  2 +-
 go/vt/vtctl/workflow/resharder.go             |  1 -
 go/vt/vtctl/workflow/traffic_switcher.go      | 10 ++++-----
 go/vt/vtctl/workflow/utils.go                 |  5 +----
 go/vt/vttablet/endtoend/vstreamer_test.go     |  5 +----
 go/vt/vttablet/onlineddl/executor.go          |  4 ++--
 go/vt/vttablet/tabletmanager/vdiff/utils.go   |  5 +----
 .../vreplication/insert_generator.go          |  8 +++----
 .../tabletmanager/vreplication/vreplicator.go |  6 ++---
 go/vt/vttablet/tabletserver/schema/tracker.go | 13 ++++++-----
 .../tabletserver/vstreamer/vstreamer.go       |  4 +---
 .../tabletserver/vstreamer/vstreamer_test.go  |  9 +++++++-
 go/vt/wrangler/keyspace.go                    |  5 +----
 15 files changed, 46 insertions(+), 57 deletions(-)

diff --git a/go/test/endtoend/vreplication/vdiff_helper_test.go b/go/test/endtoend/vreplication/vdiff_helper_test.go
index fcc112b670b..49fe4c45f6a 100644
--- a/go/test/endtoend/vreplication/vdiff_helper_test.go
+++ b/go/test/endtoend/vreplication/vdiff_helper_test.go
@@ -274,9 +274,7 @@ func getVDiffInfo(json string) *vdiffInfo {
 }
 
 func encodeString(in string) string {
-	var buf strings.Builder
-	sqltypes.NewVarChar(in).EncodeSQL(&buf)
-	return buf.String()
+	return sqltypes.EncodeStringSQL(in)
 }
 
 // generateMoreCustomers creates additional test data for better tests
diff --git a/go/vt/binlog/binlogplayer/binlog_player.go b/go/vt/binlog/binlogplayer/binlog_player.go
index 92718a4b5ed..29264cf54b9 100644
--- a/go/vt/binlog/binlogplayer/binlog_player.go
+++ b/go/vt/binlog/binlogplayer/binlog_player.go
@@ -549,7 +549,7 @@ func (blp *BinlogPlayer) setVReplicationState(state binlogdatapb.VReplicationWor
 		})
 	}
 	blp.blplStats.State.Store(state.String())
-	query := fmt.Sprintf("update _vt.vreplication set state='%v', message=%v where id=%v", state.String(), encodeString(MessageTruncate(message)), blp.uid)
+	query := fmt.Sprintf("update _vt.vreplication set state=%v, message=%v where id=%v", encodeString(state.String()), encodeString(MessageTruncate(message)), blp.uid)
 	if _, err := blp.dbClient.ExecuteFetch(query, 1); err != nil {
 		return fmt.Errorf("could not set state: %v: %v", query, err)
 	}
@@ -637,9 +637,9 @@ func CreateVReplication(workflow string, source *binlogdatapb.BinlogSource, posi
 	protoutil.SortBinlogSourceTables(source)
 	return fmt.Sprintf("insert into _vt.vreplication "+
 		"(workflow, source, pos, max_tps, max_replication_lag, time_updated, transaction_timestamp, state, db_name, workflow_type, workflow_sub_type, defer_secondary_keys, options) "+
-		"values (%v, %v, %v, %v, %v, %v, 0, '%v', %v, %d, %d, %v, %s)",
+		"values (%v, %v, %v, %v, %v, %v, 0, %v, %v, %d, %d, %v, %s)",
 		encodeString(workflow), encodeString(source.String()), encodeString(position), maxTPS, maxReplicationLag,
-		timeUpdated, binlogdatapb.VReplicationWorkflowState_Running.String(), encodeString(dbName), workflowType,
+		timeUpdated, encodeString(binlogdatapb.VReplicationWorkflowState_Running.String()), encodeString(dbName), workflowType,
 		workflowSubType, deferSecondaryKeys, encodeString("{}"))
 }
 
@@ -649,9 +649,9 @@ func CreateVReplicationState(workflow string, source *binlogdatapb.BinlogSource,
 	protoutil.SortBinlogSourceTables(source)
 	return fmt.Sprintf("insert into _vt.vreplication "+
 		"(workflow, source, pos, max_tps, max_replication_lag, time_updated, transaction_timestamp, state, db_name, workflow_type, workflow_sub_type, options) "+
-		"values (%v, %v, %v, %v, %v, %v, 0, '%v', %v, %d, %d, %s)",
+		"values (%v, %v, %v, %v, %v, %v, 0, %v, %v, %d, %d, %s)",
 		encodeString(workflow), encodeString(source.String()), encodeString(position), throttler.MaxRateModuleDisabled,
-		throttler.ReplicationLagModuleDisabled, time.Now().Unix(), state.String(), encodeString(dbName),
+		throttler.ReplicationLagModuleDisabled, time.Now().Unix(), encodeString(state.String()), encodeString(dbName),
 		workflowType, workflowSubType, encodeString("{}"))
 }
 
@@ -694,15 +694,15 @@ func GenerateUpdateTimeThrottled(uid int32, timeThrottledUnix int64, componentTh
 // StartVReplicationUntil returns a statement to start the replication with a stop position.
 func StartVReplicationUntil(uid int32, pos string) string {
 	return fmt.Sprintf(
-		"update _vt.vreplication set state='%v', stop_pos=%v where id=%v",
-		binlogdatapb.VReplicationWorkflowState_Running.String(), encodeString(pos), uid)
+		"update _vt.vreplication set state=%v, stop_pos=%v where id=%v",
+		encodeString(binlogdatapb.VReplicationWorkflowState_Running.String()), encodeString(pos), uid)
 }
 
 // StopVReplication returns a statement to stop the replication.
 func StopVReplication(uid int32, message string) string {
 	return fmt.Sprintf(
-		"update _vt.vreplication set state='%v', message=%v where id=%v",
-		binlogdatapb.VReplicationWorkflowState_Stopped.String(), encodeString(MessageTruncate(message)), uid)
+		"update _vt.vreplication set state=%v, message=%v where id=%v",
+		encodeString(binlogdatapb.VReplicationWorkflowState_Stopped.String()), encodeString(MessageTruncate(message)), uid)
 }
 
 // DeleteVReplication returns a statement to delete the replication.
@@ -717,9 +717,7 @@ func MessageTruncate(msg string) string {
 }
 
 func encodeString(in string) string {
-	buf := bytes.NewBuffer(nil)
-	sqltypes.NewVarChar(in).EncodeSQL(buf)
-	return buf.String()
+	return sqltypes.EncodeStringSQL(in)
 }
 
 // ReadVReplicationPos returns a statement to query the gtid for a
diff --git a/go/vt/vtctl/vdiff_env_test.go b/go/vt/vtctl/vdiff_env_test.go
index fdcf29367cc..9b2fade3204 100644
--- a/go/vt/vtctl/vdiff_env_test.go
+++ b/go/vt/vtctl/vdiff_env_test.go
@@ -128,7 +128,7 @@ func newTestVDiffEnv(t testing.TB, ctx context.Context, sourceShards, targetShar
 			// But this is one statement per stream.
 			env.tmc.setVRResults(
 				primary.tablet,
-				fmt.Sprintf("update _vt.vreplication set state='Running', stop_pos='%s', message='synchronizing for vdiff' where id=%d", vdiffSourceGtid, j+1),
+				fmt.Sprintf("update _vt.vreplication set state='Running', stop_pos=%s, message='synchronizing for vdiff' where id=%d", sqltypes.EncodeStringSQL(vdiffSourceGtid), j+1),
 				&sqltypes.Result{},
 			)
 		}
diff --git a/go/vt/vtctl/workflow/resharder.go b/go/vt/vtctl/workflow/resharder.go
index c270a9a6f0b..81261f3e39e 100644
--- a/go/vt/vtctl/workflow/resharder.go
+++ b/go/vt/vtctl/workflow/resharder.go
@@ -296,7 +296,6 @@ func (rs *resharder) createStreams(ctx context.Context) error {
 		if err != nil {
 			return err
 		}
-		optionsJSON = fmt.Sprintf("'%s'", optionsJSON)
 		for _, source := range rs.sourceShards {
 			if !key.KeyRangeIntersect(target.KeyRange, source.KeyRange) {
 				continue
diff --git a/go/vt/vtctl/workflow/traffic_switcher.go b/go/vt/vtctl/workflow/traffic_switcher.go
index af55415bcdc..4463e30b711 100644
--- a/go/vt/vtctl/workflow/traffic_switcher.go
+++ b/go/vt/vtctl/workflow/traffic_switcher.go
@@ -858,8 +858,8 @@ func (ts *trafficSwitcher) getReverseVReplicationUpdateQuery(targetCell string,
 	}
 
 	if ts.optCells != "" || ts.optTabletTypes != "" {
-		query := fmt.Sprintf("update _vt.vreplication set cell = '%s', tablet_types = '%s', options = '%s' where workflow = '%s' and db_name = '%s'",
-			ts.optCells, ts.optTabletTypes, options, ts.ReverseWorkflowName(), dbname)
+		query := fmt.Sprintf("update _vt.vreplication set cell = %s, tablet_types = %s, options = %s where workflow = %s and db_name = %s",
+			sqltypes.EncodeStringSQL(ts.optCells), sqltypes.EncodeStringSQL(ts.optTabletTypes), sqltypes.EncodeStringSQL(options), sqltypes.EncodeStringSQL(ts.ReverseWorkflowName()), sqltypes.EncodeStringSQL(dbname))
 		return query
 	}
 	return ""
@@ -941,8 +941,8 @@ func (ts *trafficSwitcher) createReverseVReplication(ctx context.Context) error
 						// For non-reference tables we return an error if there's no primary
 						// vindex as it's not clear what to do.
 						if len(vtable.ColumnVindexes) > 0 && len(vtable.ColumnVindexes[0].Columns) > 0 {
-							inKeyrange = fmt.Sprintf(" where in_keyrange(%s, '%s.%s', '%s')", sqlparser.String(vtable.ColumnVindexes[0].Columns[0]),
-								ts.SourceKeyspaceName(), vtable.ColumnVindexes[0].Name, key.KeyRangeString(source.GetShard().KeyRange))
+							inKeyrange = fmt.Sprintf(" where in_keyrange(%s, '%s.%s', %s)", sqlparser.String(vtable.ColumnVindexes[0].Columns[0]),
+								ts.SourceKeyspaceName(), vtable.ColumnVindexes[0].Name, encodeString(key.KeyRangeString(source.GetShard().KeyRange)))
 						} else {
 							return vterrors.Errorf(vtrpcpb.Code_INTERNAL, "no primary vindex found for the %s table in the %s keyspace",
 								vtable.Name.String(), ts.SourceKeyspaceName())
@@ -1209,7 +1209,7 @@ func (ts *trafficSwitcher) freezeTargetVReplication(ctx context.Context) error {
 	// re-invoked after a freeze, it will skip all the previous steps
 	err := ts.ForAllTargets(func(target *MigrationTarget) error {
 		ts.Logger().Infof("Marking target streams frozen for workflow %s db_name %s", ts.WorkflowName(), target.GetPrimary().DbName())
-		query := fmt.Sprintf("update _vt.vreplication set message = '%s' where db_name=%s and workflow=%s", Frozen,
+		query := fmt.Sprintf("update _vt.vreplication set message = %s where db_name=%s and workflow=%s", encodeString(Frozen),
 			encodeString(target.GetPrimary().DbName()), encodeString(ts.WorkflowName()))
 		_, err := ts.TabletManagerClient().VReplicationExec(ctx, target.GetPrimary().Tablet, query)
 		return err
diff --git a/go/vt/vtctl/workflow/utils.go b/go/vt/vtctl/workflow/utils.go
index 3c33ef25560..571c40b474f 100644
--- a/go/vt/vtctl/workflow/utils.go
+++ b/go/vt/vtctl/workflow/utils.go
@@ -17,7 +17,6 @@ limitations under the License.
 package workflow
 
 import (
-	"bytes"
 	"context"
 	"encoding/json"
 	"fmt"
@@ -627,9 +626,7 @@ func ReverseWorkflowName(workflow string) string {
 // this public, but it doesn't belong in package workflow. Maybe package sqltypes,
 // or maybe package sqlescape?
 func encodeString(in string) string {
-	buf := bytes.NewBuffer(nil)
-	sqltypes.NewVarChar(in).EncodeSQL(buf)
-	return buf.String()
+	return sqltypes.EncodeStringSQL(in)
 }
 
 func getRenameFileName(tableName string) string {
diff --git a/go/vt/vttablet/endtoend/vstreamer_test.go b/go/vt/vttablet/endtoend/vstreamer_test.go
index 997ab222255..92980ff9e44 100644
--- a/go/vt/vttablet/endtoend/vstreamer_test.go
+++ b/go/vt/vttablet/endtoend/vstreamer_test.go
@@ -17,7 +17,6 @@ limitations under the License.
 package endtoend
 
 import (
-	"bytes"
 	"context"
 	"errors"
 	"fmt"
@@ -472,9 +471,7 @@ func expectLogs(ctx context.Context, t *testing.T, query string, eventCh chan []
 }
 
 func encodeString(in string) string {
-	buf := bytes.NewBuffer(nil)
-	sqltypes.NewVarChar(in).EncodeSQL(buf)
-	return buf.String()
+	return sqltypes.EncodeStringSQL(in)
 }
 
 func validateSchemaInserted(client *framework.QueryClient, ddl string) bool {
diff --git a/go/vt/vttablet/onlineddl/executor.go b/go/vt/vttablet/onlineddl/executor.go
index 76c7af7fc2e..07119263399 100644
--- a/go/vt/vttablet/onlineddl/executor.go
+++ b/go/vt/vttablet/onlineddl/executor.go
@@ -1571,8 +1571,8 @@ func (e *Executor) ExecuteWithVReplication(ctx context.Context, onlineDDL *schem
 
 		{
 			// temporary hack. todo: this should be done when inserting any _vt.vreplication record across all workflow types
-			query := fmt.Sprintf("update _vt.vreplication set workflow_type = %d where workflow = '%s'",
-				binlogdatapb.VReplicationWorkflowType_OnlineDDL, v.workflow)
+			query := fmt.Sprintf("update _vt.vreplication set workflow_type = %d where workflow = %s",
+				binlogdatapb.VReplicationWorkflowType_OnlineDDL, sqltypes.EncodeStringSQL(v.workflow))
 			if _, err := e.vreplicationExec(ctx, tablet.Tablet, query); err != nil {
 				return vterrors.Wrapf(err, "VReplicationExec(%v, %s)", tablet.Tablet, query)
 			}
diff --git a/go/vt/vttablet/tabletmanager/vdiff/utils.go b/go/vt/vttablet/tabletmanager/vdiff/utils.go
index 68e8a6acb57..e56df52c5cc 100644
--- a/go/vt/vttablet/tabletmanager/vdiff/utils.go
+++ b/go/vt/vttablet/tabletmanager/vdiff/utils.go
@@ -19,7 +19,6 @@ package vdiff
 import (
 	"context"
 	"fmt"
-	"strings"
 
 	"vitess.io/vitess/go/vt/sqlparser"
 	"vitess.io/vitess/go/vt/vtgate/evalengine"
@@ -59,9 +58,7 @@ func newMergeSorter(participants map[string]*shardStreamer, comparePKs []compare
 // Utility functions
 
 func encodeString(in string) string {
-	var buf strings.Builder
-	sqltypes.NewVarChar(in).EncodeSQL(&buf)
-	return buf.String()
+	return sqltypes.EncodeStringSQL(in)
 }
 
 func pkColsToGroupByParams(pkCols []int, collationEnv *collations.Environment) []*engine.GroupByParams {
diff --git a/go/vt/vttablet/tabletmanager/vreplication/insert_generator.go b/go/vt/vttablet/tabletmanager/vreplication/insert_generator.go
index a43278d783c..86753456af1 100644
--- a/go/vt/vttablet/tabletmanager/vreplication/insert_generator.go
+++ b/go/vt/vttablet/tabletmanager/vreplication/insert_generator.go
@@ -53,10 +53,10 @@ func NewInsertGenerator(state binlogdatapb.VReplicationWorkflowState, dbname str
 func (ig *InsertGenerator) AddRow(workflow string, bls *binlogdatapb.BinlogSource, pos, cell, tabletTypes string,
 	workflowType binlogdatapb.VReplicationWorkflowType, workflowSubType binlogdatapb.VReplicationWorkflowSubType, deferSecondaryKeys bool, options string) {
 	if options == "" {
-		options = "'{}'"
+		options = "{}"
 	}
 	protoutil.SortBinlogSourceTables(bls)
-	fmt.Fprintf(ig.buf, "%s(%v, %v, %v, %v, %v, %v, %v, %v, 0, '%v', %v, %d, %d, %v, %v)",
+	fmt.Fprintf(ig.buf, "%s(%v, %v, %v, %v, %v, %v, %v, %v, 0, %v, %v, %d, %d, %v, %v)",
 		ig.prefix,
 		encodeString(workflow),
 		encodeString(bls.String()),
@@ -66,12 +66,12 @@ func (ig *InsertGenerator) AddRow(workflow string, bls *binlogdatapb.BinlogSourc
 		encodeString(cell),
 		encodeString(tabletTypes),
 		ig.now,
-		ig.state,
+		encodeString(ig.state),
 		encodeString(ig.dbname),
 		workflowType,
 		workflowSubType,
 		deferSecondaryKeys,
-		options,
+		encodeString(options),
 	)
 	ig.prefix = ", "
 }
diff --git a/go/vt/vttablet/tabletmanager/vreplication/vreplicator.go b/go/vt/vttablet/tabletmanager/vreplication/vreplicator.go
index 76177b56b5b..54e76efa092 100644
--- a/go/vt/vttablet/tabletmanager/vreplication/vreplicator.go
+++ b/go/vt/vttablet/tabletmanager/vreplication/vreplicator.go
@@ -508,7 +508,7 @@ func (vr *vreplicator) setState(state binlogdatapb.VReplicationWorkflowState, me
 		})
 	}
 	vr.stats.State.Store(state.String())
-	query := fmt.Sprintf("update _vt.vreplication set state='%v', message=%v where id=%v", state, encodeString(binlogplayer.MessageTruncate(message)), vr.id)
+	query := fmt.Sprintf("update _vt.vreplication set state=%v, message=%v where id=%v", encodeString(state.String()), encodeString(binlogplayer.MessageTruncate(message)), vr.id)
 	// If we're batching a transaction, then include the state update
 	// in the current transaction batch.
 	if vr.dbClient.InTransaction && vr.dbClient.maxBatchSize > 0 {
@@ -528,9 +528,7 @@ func (vr *vreplicator) setState(state binlogdatapb.VReplicationWorkflowState, me
 }
 
 func encodeString(in string) string {
-	var buf strings.Builder
-	sqltypes.NewVarChar(in).EncodeSQL(&buf)
-	return buf.String()
+	return sqltypes.EncodeStringSQL(in)
 }
 
 func (vr *vreplicator) getSettingFKCheck() error {
diff --git a/go/vt/vttablet/tabletserver/schema/tracker.go b/go/vt/vttablet/tabletserver/schema/tracker.go
index 252a81f3493..84f8346ae0b 100644
--- a/go/vt/vttablet/tabletserver/schema/tracker.go
+++ b/go/vt/vttablet/tabletserver/schema/tracker.go
@@ -17,12 +17,12 @@ limitations under the License.
 package schema
 
 import (
-	"bytes"
 	"context"
 	"fmt"
 	"sync"
 	"time"
 
+	"vitess.io/vitess/go/bytes2"
 	"vitess.io/vitess/go/constants/sidecar"
 	"vitess.io/vitess/go/mysql/replication"
 	"vitess.io/vitess/go/sqltypes"
@@ -231,10 +231,15 @@ func (tr *Tracker) saveCurrentSchemaToDb(ctx context.Context, gtid, ddl string,
 	}
 	defer conn.Recycle()
 
+	// We serialize a blob here, encodeString is for strings only
+	// and should not be used for binary data.
+	blobVal := sqltypes.MakeTrusted(sqltypes.VarBinary, blob)
+	buf := bytes2.Buffer{}
+	blobVal.EncodeSQLBytes2(&buf)
 	query := sqlparser.BuildParsedQuery("insert into %s.schema_version "+
 		"(pos, ddl, schemax, time_updated) "+
 		"values (%s, %s, %s, %d)", sidecar.GetIdentifier(), encodeString(gtid),
-		encodeString(ddl), encodeString(string(blob)), timestamp).Query
+		encodeString(ddl), buf.String(), timestamp).Query
 	_, err = conn.Conn.Exec(ctx, query, 1, false)
 	if err != nil {
 		return err
@@ -243,9 +248,7 @@ func (tr *Tracker) saveCurrentSchemaToDb(ctx context.Context, gtid, ddl string,
 }
 
 func encodeString(in string) string {
-	buf := bytes.NewBuffer(nil)
-	sqltypes.NewVarChar(in).EncodeSQL(buf)
-	return buf.String()
+	return sqltypes.EncodeStringSQL(in)
 }
 
 // MustReloadSchemaOnDDL returns true if the ddl is for the db which is part of the workflow and is not an online ddl artifact
diff --git a/go/vt/vttablet/tabletserver/vstreamer/vstreamer.go b/go/vt/vttablet/tabletserver/vstreamer/vstreamer.go
index fb4cb324047..237b2e78386 100644
--- a/go/vt/vttablet/tabletserver/vstreamer/vstreamer.go
+++ b/go/vt/vttablet/tabletserver/vstreamer/vstreamer.go
@@ -960,9 +960,7 @@ type extColInfo struct {
 }
 
 func encodeString(in string) string {
-	buf := bytes.NewBuffer(nil)
-	sqltypes.NewVarChar(in).EncodeSQL(buf)
-	return buf.String()
+	return sqltypes.EncodeStringSQL(in)
 }
 
 func (vs *vstreamer) processJournalEvent(vevents []*binlogdatapb.VEvent, plan *streamerPlan, rows mysql.Rows) ([]*binlogdatapb.VEvent, error) {
diff --git a/go/vt/vttablet/tabletserver/vstreamer/vstreamer_test.go b/go/vt/vttablet/tabletserver/vstreamer/vstreamer_test.go
index 5282b5f372d..7281be1d60c 100644
--- a/go/vt/vttablet/tabletserver/vstreamer/vstreamer_test.go
+++ b/go/vt/vttablet/tabletserver/vstreamer/vstreamer_test.go
@@ -32,6 +32,7 @@ import (
 	"github.com/stretchr/testify/require"
 	"google.golang.org/protobuf/proto"
 
+	"vitess.io/vitess/go/bytes2"
 	"vitess.io/vitess/go/mysql"
 	"vitess.io/vitess/go/mysql/collations"
 	"vitess.io/vitess/go/sqltypes"
@@ -371,9 +372,15 @@ func TestVersion(t *testing.T) {
 	}
 	blob, _ := dbSchema.MarshalVT()
 	gtid := "MariaDB/0-41983-20"
+	// We serialize a blob here, encodeString is for strings only
+	// and should not be used for binary data.
+	blobVal := sqltypes.MakeTrusted(sqltypes.VarBinary, blob)
+	buf := bytes2.Buffer{}
+	blobVal.EncodeSQLBytes2(&buf)
+
 	testcases := []testcase{{
 		input: []string{
-			fmt.Sprintf("insert into _vt.schema_version values(1, '%s', 123, 'create table t1', %v)", gtid, encodeString(string(blob))),
+			fmt.Sprintf("insert into _vt.schema_version values(1, '%s', 123, 'create table t1', %v)", gtid, buf.String()),
 		},
 		// External table events don't get sent.
 		output: [][]string{{
diff --git a/go/vt/wrangler/keyspace.go b/go/vt/wrangler/keyspace.go
index 98551a084c9..6fce73b1f0f 100644
--- a/go/vt/wrangler/keyspace.go
+++ b/go/vt/wrangler/keyspace.go
@@ -17,7 +17,6 @@ limitations under the License.
 package wrangler
 
 import (
-	"bytes"
 	"context"
 	"errors"
 	"fmt"
@@ -125,7 +124,5 @@ func (wr *Wrangler) updateShardRecords(ctx context.Context, keyspace string, sha
 }
 
 func encodeString(in string) string {
-	buf := bytes.NewBuffer(nil)
-	sqltypes.NewVarChar(in).EncodeSQL(buf)
-	return buf.String()
+	return sqltypes.EncodeStringSQL(in)
 }

From 92fe3011a8ec7970774fee9f14fac3f1c5b6e462 Mon Sep 17 00:00:00 2001
From: Graham Campbell <GrahamCampbell@users.noreply.github.com>
Date: Thu, 30 Jan 2025 08:36:08 +0000
Subject: [PATCH 11/68] Upgrade default etcd version to 3.5.17 (#17653)

Signed-off-by: Graham Campbell <hello@gjcampbell.co.uk>
---
 .github/workflows/codecov.yml                      | 4 ++--
 .github/workflows/unit_race.yml                    | 4 ++--
 .github/workflows/unit_race_evalengine.yml         | 4 ++--
 .github/workflows/unit_test_evalengine_mysql57.yml | 4 ++--
 .github/workflows/unit_test_evalengine_mysql80.yml | 4 ++--
 .github/workflows/unit_test_evalengine_mysql84.yml | 4 ++--
 .github/workflows/unit_test_mysql57.yml            | 4 ++--
 .github/workflows/unit_test_mysql80.yml            | 4 ++--
 .github/workflows/unit_test_mysql84.yml            | 4 ++--
 build.env                                          | 2 +-
 docker/mini/install_mini_dependencies.sh           | 2 +-
 test/templates/unit_test.tpl                       | 4 ++--
 12 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/.github/workflows/codecov.yml b/.github/workflows/codecov.yml
index 35517c4f6c5..c8d4d5704e1 100644
--- a/.github/workflows/codecov.yml
+++ b/.github/workflows/codecov.yml
@@ -80,8 +80,8 @@ jobs:
         sudo apparmor_parser -R /etc/apparmor.d/usr.sbin.mysqld || echo "could not remove mysqld profile"
 
         mkdir -p dist bin
-        curl -L https://github.com/coreos/etcd/releases/download/v3.3.10/etcd-v3.3.10-linux-amd64.tar.gz | tar -zxC dist
-        mv dist/etcd-v3.3.10-linux-amd64/{etcd,etcdctl} bin/
+        curl -s -L https://github.com/coreos/etcd/releases/download/v3.5.17/etcd-v3.5.17-linux-amd64.tar.gz | tar -zxC dist
+        mv dist/etcd-v3.5.17-linux-amd64/{etcd,etcdctl} bin/
 
         go mod download
         go install golang.org/x/tools/cmd/goimports@latest
diff --git a/.github/workflows/unit_race.yml b/.github/workflows/unit_race.yml
index 77f47a6c083..3e89b3739fd 100644
--- a/.github/workflows/unit_race.yml
+++ b/.github/workflows/unit_race.yml
@@ -99,8 +99,8 @@ jobs:
         sudo apparmor_parser -R /etc/apparmor.d/usr.sbin.mysqld || echo "could not remove mysqld profile"
 
         mkdir -p dist bin
-        curl -s -L https://github.com/coreos/etcd/releases/download/v3.3.10/etcd-v3.3.10-linux-amd64.tar.gz | tar -zxC dist
-        mv dist/etcd-v3.3.10-linux-amd64/{etcd,etcdctl} bin/
+        curl -s -L https://github.com/coreos/etcd/releases/download/v3.5.17/etcd-v3.5.17-linux-amd64.tar.gz | tar -zxC dist
+        mv dist/etcd-v3.5.17-linux-amd64/{etcd,etcdctl} bin/
 
         go mod download
         go install golang.org/x/tools/cmd/goimports@latest
diff --git a/.github/workflows/unit_race_evalengine.yml b/.github/workflows/unit_race_evalengine.yml
index 9654209f2a9..a08c33d5fbe 100644
--- a/.github/workflows/unit_race_evalengine.yml
+++ b/.github/workflows/unit_race_evalengine.yml
@@ -99,8 +99,8 @@ jobs:
         sudo apparmor_parser -R /etc/apparmor.d/usr.sbin.mysqld || echo "could not remove mysqld profile"
 
         mkdir -p dist bin
-        curl -s -L https://github.com/coreos/etcd/releases/download/v3.3.10/etcd-v3.3.10-linux-amd64.tar.gz | tar -zxC dist
-        mv dist/etcd-v3.3.10-linux-amd64/{etcd,etcdctl} bin/
+        curl -s -L https://github.com/coreos/etcd/releases/download/v3.5.17/etcd-v3.5.17-linux-amd64.tar.gz | tar -zxC dist
+        mv dist/etcd-v3.5.17-linux-amd64/{etcd,etcdctl} bin/
 
         go mod download
         go install golang.org/x/tools/cmd/goimports@latest
diff --git a/.github/workflows/unit_test_evalengine_mysql57.yml b/.github/workflows/unit_test_evalengine_mysql57.yml
index eea3a5aad57..2edcfa58955 100644
--- a/.github/workflows/unit_test_evalengine_mysql57.yml
+++ b/.github/workflows/unit_test_evalengine_mysql57.yml
@@ -129,8 +129,8 @@ jobs:
         sudo apparmor_parser -R /etc/apparmor.d/usr.sbin.mysqld || echo "could not remove mysqld profile"
 
         mkdir -p dist bin
-        curl -s -L https://github.com/coreos/etcd/releases/download/v3.3.10/etcd-v3.3.10-linux-amd64.tar.gz | tar -zxC dist
-        mv dist/etcd-v3.3.10-linux-amd64/{etcd,etcdctl} bin/
+        curl -s -L https://github.com/coreos/etcd/releases/download/v3.5.17/etcd-v3.5.17-linux-amd64.tar.gz | tar -zxC dist
+        mv dist/etcd-v3.5.17-linux-amd64/{etcd,etcdctl} bin/
 
         go mod download
         go install golang.org/x/tools/cmd/goimports@latest
diff --git a/.github/workflows/unit_test_evalengine_mysql80.yml b/.github/workflows/unit_test_evalengine_mysql80.yml
index f48e224808d..be389de1452 100644
--- a/.github/workflows/unit_test_evalengine_mysql80.yml
+++ b/.github/workflows/unit_test_evalengine_mysql80.yml
@@ -119,8 +119,8 @@ jobs:
         sudo apparmor_parser -R /etc/apparmor.d/usr.sbin.mysqld || echo "could not remove mysqld profile"
 
         mkdir -p dist bin
-        curl -s -L https://github.com/coreos/etcd/releases/download/v3.3.10/etcd-v3.3.10-linux-amd64.tar.gz | tar -zxC dist
-        mv dist/etcd-v3.3.10-linux-amd64/{etcd,etcdctl} bin/
+        curl -s -L https://github.com/coreos/etcd/releases/download/v3.5.17/etcd-v3.5.17-linux-amd64.tar.gz | tar -zxC dist
+        mv dist/etcd-v3.5.17-linux-amd64/{etcd,etcdctl} bin/
 
         go mod download
         go install golang.org/x/tools/cmd/goimports@latest
diff --git a/.github/workflows/unit_test_evalengine_mysql84.yml b/.github/workflows/unit_test_evalengine_mysql84.yml
index 6b373d96812..d96e68a857d 100644
--- a/.github/workflows/unit_test_evalengine_mysql84.yml
+++ b/.github/workflows/unit_test_evalengine_mysql84.yml
@@ -119,8 +119,8 @@ jobs:
         sudo apparmor_parser -R /etc/apparmor.d/usr.sbin.mysqld || echo "could not remove mysqld profile"
 
         mkdir -p dist bin
-        curl -s -L https://github.com/coreos/etcd/releases/download/v3.3.10/etcd-v3.3.10-linux-amd64.tar.gz | tar -zxC dist
-        mv dist/etcd-v3.3.10-linux-amd64/{etcd,etcdctl} bin/
+        curl -s -L https://github.com/coreos/etcd/releases/download/v3.5.17/etcd-v3.5.17-linux-amd64.tar.gz | tar -zxC dist
+        mv dist/etcd-v3.5.17-linux-amd64/{etcd,etcdctl} bin/
 
         go mod download
         go install golang.org/x/tools/cmd/goimports@latest
diff --git a/.github/workflows/unit_test_mysql57.yml b/.github/workflows/unit_test_mysql57.yml
index 3644170ebdc..41727bfc53c 100644
--- a/.github/workflows/unit_test_mysql57.yml
+++ b/.github/workflows/unit_test_mysql57.yml
@@ -129,8 +129,8 @@ jobs:
         sudo apparmor_parser -R /etc/apparmor.d/usr.sbin.mysqld || echo "could not remove mysqld profile"
 
         mkdir -p dist bin
-        curl -s -L https://github.com/coreos/etcd/releases/download/v3.3.10/etcd-v3.3.10-linux-amd64.tar.gz | tar -zxC dist
-        mv dist/etcd-v3.3.10-linux-amd64/{etcd,etcdctl} bin/
+        curl -s -L https://github.com/coreos/etcd/releases/download/v3.5.17/etcd-v3.5.17-linux-amd64.tar.gz | tar -zxC dist
+        mv dist/etcd-v3.5.17-linux-amd64/{etcd,etcdctl} bin/
 
         go mod download
         go install golang.org/x/tools/cmd/goimports@latest
diff --git a/.github/workflows/unit_test_mysql80.yml b/.github/workflows/unit_test_mysql80.yml
index 18bfa546124..0ac43a1da01 100644
--- a/.github/workflows/unit_test_mysql80.yml
+++ b/.github/workflows/unit_test_mysql80.yml
@@ -119,8 +119,8 @@ jobs:
         sudo apparmor_parser -R /etc/apparmor.d/usr.sbin.mysqld || echo "could not remove mysqld profile"
 
         mkdir -p dist bin
-        curl -s -L https://github.com/coreos/etcd/releases/download/v3.3.10/etcd-v3.3.10-linux-amd64.tar.gz | tar -zxC dist
-        mv dist/etcd-v3.3.10-linux-amd64/{etcd,etcdctl} bin/
+        curl -s -L https://github.com/coreos/etcd/releases/download/v3.5.17/etcd-v3.5.17-linux-amd64.tar.gz | tar -zxC dist
+        mv dist/etcd-v3.5.17-linux-amd64/{etcd,etcdctl} bin/
 
         go mod download
         go install golang.org/x/tools/cmd/goimports@latest
diff --git a/.github/workflows/unit_test_mysql84.yml b/.github/workflows/unit_test_mysql84.yml
index 10b3c2b8a6c..8371bf13826 100644
--- a/.github/workflows/unit_test_mysql84.yml
+++ b/.github/workflows/unit_test_mysql84.yml
@@ -119,8 +119,8 @@ jobs:
         sudo apparmor_parser -R /etc/apparmor.d/usr.sbin.mysqld || echo "could not remove mysqld profile"
 
         mkdir -p dist bin
-        curl -s -L https://github.com/coreos/etcd/releases/download/v3.3.10/etcd-v3.3.10-linux-amd64.tar.gz | tar -zxC dist
-        mv dist/etcd-v3.3.10-linux-amd64/{etcd,etcdctl} bin/
+        curl -s -L https://github.com/coreos/etcd/releases/download/v3.5.17/etcd-v3.5.17-linux-amd64.tar.gz | tar -zxC dist
+        mv dist/etcd-v3.5.17-linux-amd64/{etcd,etcdctl} bin/
 
         go mod download
         go install golang.org/x/tools/cmd/goimports@latest
diff --git a/build.env b/build.env
index 12431842b6e..6818975103f 100755
--- a/build.env
+++ b/build.env
@@ -29,7 +29,7 @@ export VTDATAROOT="${VTDATAROOT:-${VTROOT}/vtdataroot}"
 export PATH="$PWD/bin:$PATH"
 export PROTOC_VER=21.3
 export ZK_VER=${ZK_VERSION:-3.8.0}
-export ETCD_VER=v3.5.6
+export ETCD_VER=v3.5.17
 export CONSUL_VER=1.11.4
 export TOXIPROXY_VER=v2.7.0
 
diff --git a/docker/mini/install_mini_dependencies.sh b/docker/mini/install_mini_dependencies.sh
index 03a97cc0962..754249b7d49 100755
--- a/docker/mini/install_mini_dependencies.sh
+++ b/docker/mini/install_mini_dependencies.sh
@@ -8,7 +8,7 @@
 set -euo pipefail
 
 # Install etcd
-ETCD_VER=v3.4.9
+ETCD_VER=v3.5.17
 DOWNLOAD_URL=https://storage.googleapis.com/etcd
 
 curl -k -L ${DOWNLOAD_URL}/${ETCD_VER}/etcd-${ETCD_VER}-linux-amd64.tar.gz -o /tmp/etcd-${ETCD_VER}-linux-amd64.tar.gz
diff --git a/test/templates/unit_test.tpl b/test/templates/unit_test.tpl
index 10c3b8c0c6a..be71af987ed 100644
--- a/test/templates/unit_test.tpl
+++ b/test/templates/unit_test.tpl
@@ -143,8 +143,8 @@ jobs:
         sudo apparmor_parser -R /etc/apparmor.d/usr.sbin.mysqld || echo "could not remove mysqld profile"
 
         mkdir -p dist bin
-        curl -s -L https://github.com/coreos/etcd/releases/download/v3.3.10/etcd-v3.3.10-linux-amd64.tar.gz | tar -zxC dist
-        mv dist/etcd-v3.3.10-linux-amd64/{etcd,etcdctl} bin/
+        curl -s -L https://github.com/coreos/etcd/releases/download/v3.5.17/etcd-v3.5.17-linux-amd64.tar.gz | tar -zxC dist
+        mv dist/etcd-v3.5.17-linux-amd64/{etcd,etcdctl} bin/
 
         go mod download
         go install golang.org/x/tools/cmd/goimports@latest

From f7ea3a3c03e7269f27543fa732779ec0a953f0b8 Mon Sep 17 00:00:00 2001
From: Max Englander <max@planetscale.com>
Date: Thu, 30 Jan 2025 09:43:26 -0500
Subject: [PATCH 12/68] go/vt/mysqlctl: add postflight_mysqld_start and
 preflight_mysqld_shutdown hooks (#17652)

Signed-off-by: Max Englander <max@planetscale.com>
---
 go/vt/mysqlctl/mysqld.go | 24 ++++++++++++++++++++++--
 1 file changed, 22 insertions(+), 2 deletions(-)

diff --git a/go/vt/mysqlctl/mysqld.go b/go/vt/mysqlctl/mysqld.go
index d7435705a8a..19e4f62bf25 100644
--- a/go/vt/mysqlctl/mysqld.go
+++ b/go/vt/mysqlctl/mysqld.go
@@ -454,6 +454,15 @@ func (mysqld *Mysqld) startNoWait(cnf *Mycnf, mysqldArgs ...string) error {
 		return fmt.Errorf("mysqld_start hook failed: %v", hr.String())
 	}
 
+	// try the postflight mysqld start hook, if any
+	switch hr := hook.NewHook("postflight_mysqld_start", mysqldArgs).Execute(); hr.ExitStatus {
+	case hook.HOOK_SUCCESS, hook.HOOK_DOES_NOT_EXIST:
+		// hook exists and worked, or does not exist, we can keep going
+	default:
+		// hook failed, we report error
+		return fmt.Errorf("postflight_mysqld_start hook failed: %v", hr.String())
+	}
+
 	return nil
 }
 
@@ -624,10 +633,21 @@ func (mysqld *Mysqld) Shutdown(ctx context.Context, cnf *Mycnf, waitForMysqld bo
 		return nil
 	}
 
-	// try the mysqld shutdown hook, if any
-	h := hook.NewSimpleHook("mysqld_shutdown")
+	// try the preflight mysqld shutdown hook, if any
+	h := hook.NewSimpleHook("preflight_mysqld_shutdown")
 	hr := h.ExecuteContext(ctx)
 	switch hr.ExitStatus {
+	case hook.HOOK_SUCCESS, hook.HOOK_DOES_NOT_EXIST:
+		// hook exists and worked, or else does not exist.
+	default:
+		// hook failed, we report error
+		return fmt.Errorf("preflight_mysqld_shutdown hook failed: %v", hr.String())
+	}
+
+	// try the mysqld shutdown hook, if any
+	h = hook.NewSimpleHook("mysqld_shutdown")
+	hr = h.ExecuteContext(ctx)
+	switch hr.ExitStatus {
 	case hook.HOOK_SUCCESS:
 		// hook exists and worked, we can keep going
 	case hook.HOOK_DOES_NOT_EXIST:

From be677efe5f49e72f9e5a83ec4c8abef185a3bc18 Mon Sep 17 00:00:00 2001
From: Dirkjan Bussink <d.bussink@gmail.com>
Date: Thu, 30 Jan 2025 15:54:58 +0100
Subject: [PATCH 13/68] Fix integer parsing logic (#17650)

Signed-off-by: Dirkjan Bussink <d.bussink@gmail.com>
---
 go/vt/vtcombo/tablet_map.go                   |  2 +-
 go/vt/vtctl/grpcvtctldserver/server.go        |  7 +++++
 .../testutil/test_tmclient.go                 |  4 +--
 .../reparentutil/emergency_reparenter.go      |  8 +++---
 .../reparentutil/emergency_reparenter_test.go | 28 +++++++++----------
 go/vt/vttablet/common/config.go               | 28 +++++++++----------
 go/vt/vttablet/faketmclient/fake_client.go    |  2 +-
 go/vt/vttablet/grpctmclient/client.go         |  4 +--
 go/vt/vttablet/grpctmserver/server.go         |  2 +-
 go/vt/vttablet/tabletmanager/rpc_agent.go     |  2 +-
 .../vttablet/tabletmanager/rpc_replication.go |  4 +--
 go/vt/vttablet/tabletserver/twopc.go          |  2 +-
 go/vt/vttablet/tmclient/rpc_client_api.go     |  2 +-
 go/vt/vttablet/tmrpctest/test_tm_rpc.go       |  4 +--
 14 files changed, 53 insertions(+), 46 deletions(-)

diff --git a/go/vt/vtcombo/tablet_map.go b/go/vt/vtcombo/tablet_map.go
index 64b49ae2bed..e8c8935f989 100644
--- a/go/vt/vtcombo/tablet_map.go
+++ b/go/vt/vtcombo/tablet_map.go
@@ -1005,7 +1005,7 @@ func (itmc *internalTabletManagerClient) PopulateReparentJournal(context.Context
 }
 
 // ReadReparentJournalInfo is part of the tmclient.TabletManagerClient interface.
-func (itmc *internalTabletManagerClient) ReadReparentJournalInfo(ctx context.Context, tablet *topodatapb.Tablet) (int, error) {
+func (itmc *internalTabletManagerClient) ReadReparentJournalInfo(ctx context.Context, tablet *topodatapb.Tablet) (int32, error) {
 	return 0, fmt.Errorf("not implemented in vtcombo")
 }
 
diff --git a/go/vt/vtctl/grpcvtctldserver/server.go b/go/vt/vtctl/grpcvtctldserver/server.go
index baac17dea85..ec9fd80db89 100644
--- a/go/vt/vtctl/grpcvtctldserver/server.go
+++ b/go/vt/vtctl/grpcvtctldserver/server.go
@@ -22,6 +22,7 @@ import (
 	"errors"
 	"fmt"
 	"io"
+	"math"
 	"net/http"
 	"path/filepath"
 	"runtime/debug"
@@ -1509,11 +1510,17 @@ func (s *VtctldServer) GetBackups(ctx context.Context, req *vtctldatapb.GetBacku
 
 	totalBackups := len(bhs)
 	if req.Limit > 0 {
+		if int(req.Limit) < 0 {
+			return nil, fmt.Errorf("limit %v exceeds maximum allowed value %v", req.DetailedLimit, math.MaxInt)
+		}
 		totalBackups = int(req.Limit)
 	}
 
 	totalDetailedBackups := len(bhs)
 	if req.DetailedLimit > 0 {
+		if int(req.DetailedLimit) < 0 {
+			return nil, fmt.Errorf("detailed_limit %v exceeds maximum allowed value %v", req.DetailedLimit, math.MaxInt)
+		}
 		totalDetailedBackups = int(req.DetailedLimit)
 	}
 
diff --git a/go/vt/vtctl/grpcvtctldserver/testutil/test_tmclient.go b/go/vt/vtctl/grpcvtctldserver/testutil/test_tmclient.go
index 768fae5bff4..3b6af754d4e 100644
--- a/go/vt/vtctl/grpcvtctldserver/testutil/test_tmclient.go
+++ b/go/vt/vtctl/grpcvtctldserver/testutil/test_tmclient.go
@@ -295,7 +295,7 @@ type TabletManagerClient struct {
 	// keyed by tablet alias
 	PopulateReparentJournalResults map[string]error
 	// keyed by tablet alias
-	ReadReparentJournalInfoResults map[string]int
+	ReadReparentJournalInfoResults map[string]int32
 	// keyed by tablet alias.
 	PromoteReplicaDelays map[string]time.Duration
 	// keyed by tablet alias. injects a sleep to the end of the function
@@ -974,7 +974,7 @@ func (fake *TabletManagerClient) PopulateReparentJournal(ctx context.Context, ta
 }
 
 // ReadReparentJournalInfo is part of the tmclient.TabletManagerClient interface.
-func (fake *TabletManagerClient) ReadReparentJournalInfo(ctx context.Context, tablet *topodatapb.Tablet) (int, error) {
+func (fake *TabletManagerClient) ReadReparentJournalInfo(ctx context.Context, tablet *topodatapb.Tablet) (int32, error) {
 	if fake.ReadReparentJournalInfoResults == nil {
 		return 1, nil
 	}
diff --git a/go/vt/vtctl/reparentutil/emergency_reparenter.go b/go/vt/vtctl/reparentutil/emergency_reparenter.go
index 5f7d3140c7b..513076b8f68 100644
--- a/go/vt/vtctl/reparentutil/emergency_reparenter.go
+++ b/go/vt/vtctl/reparentutil/emergency_reparenter.go
@@ -805,7 +805,7 @@ func (erp *EmergencyReparenter) findErrantGTIDs(
 	}
 
 	// Find the maximum length of the reparent journal among all the candidates.
-	var maxLen int
+	var maxLen int32
 	for _, length := range reparentJournalLen {
 		maxLen = max(maxLen, length)
 	}
@@ -902,8 +902,8 @@ func (erp *EmergencyReparenter) gatherReparenJournalInfo(
 	validCandidates map[string]replication.Position,
 	tabletMap map[string]*topo.TabletInfo,
 	waitReplicasTimeout time.Duration,
-) (map[string]int, error) {
-	reparentJournalLen := make(map[string]int)
+) (map[string]int32, error) {
+	reparentJournalLen := make(map[string]int32)
 	var mu sync.Mutex
 	errCh := make(chan concurrency.Error)
 	defer close(errCh)
@@ -916,7 +916,7 @@ func (erp *EmergencyReparenter) gatherReparenJournalInfo(
 	for candidate := range validCandidates {
 		go func(alias string) {
 			var err error
-			var length int
+			var length int32
 			defer func() {
 				errCh <- concurrency.Error{
 					Err: err,
diff --git a/go/vt/vtctl/reparentutil/emergency_reparenter_test.go b/go/vt/vtctl/reparentutil/emergency_reparenter_test.go
index 840df41d6e2..529c2a8f366 100644
--- a/go/vt/vtctl/reparentutil/emergency_reparenter_test.go
+++ b/go/vt/vtctl/reparentutil/emergency_reparenter_test.go
@@ -4637,7 +4637,7 @@ func TestEmergencyReparenterFindErrantGTIDs(t *testing.T) {
 		{
 			name: "Case 1a: No Errant GTIDs. This is the first reparent. A replica is the most advanced.",
 			tmc: &testutil.TabletManagerClient{
-				ReadReparentJournalInfoResults: map[string]int{
+				ReadReparentJournalInfoResults: map[string]int32{
 					"zone1-0000000102": 1,
 					"zone1-0000000103": 1,
 					"zone1-0000000104": 1,
@@ -4733,7 +4733,7 @@ func TestEmergencyReparenterFindErrantGTIDs(t *testing.T) {
 				},
 			},
 			tmc: &testutil.TabletManagerClient{
-				ReadReparentJournalInfoResults: map[string]int{
+				ReadReparentJournalInfoResults: map[string]int32{
 					"zone1-0000000102": 2,
 					"zone1-0000000103": 2,
 					"zone1-0000000104": 2,
@@ -4797,7 +4797,7 @@ func TestEmergencyReparenterFindErrantGTIDs(t *testing.T) {
 				},
 			},
 			tmc: &testutil.TabletManagerClient{
-				ReadReparentJournalInfoResults: map[string]int{
+				ReadReparentJournalInfoResults: map[string]int32{
 					"zone1-0000000102": 2,
 					"zone1-0000000103": 2,
 					"zone1-0000000104": 2,
@@ -4861,7 +4861,7 @@ func TestEmergencyReparenterFindErrantGTIDs(t *testing.T) {
 				},
 			},
 			tmc: &testutil.TabletManagerClient{
-				ReadReparentJournalInfoResults: map[string]int{
+				ReadReparentJournalInfoResults: map[string]int32{
 					"zone1-0000000102": 3,
 					"zone1-0000000103": 2,
 					"zone1-0000000104": 1,
@@ -4925,7 +4925,7 @@ func TestEmergencyReparenterFindErrantGTIDs(t *testing.T) {
 				},
 			},
 			tmc: &testutil.TabletManagerClient{
-				ReadReparentJournalInfoResults: map[string]int{
+				ReadReparentJournalInfoResults: map[string]int32{
 					"zone1-0000000102": 2,
 					"zone1-0000000103": 2,
 					"zone1-0000000104": 1,
@@ -4989,7 +4989,7 @@ func TestEmergencyReparenterFindErrantGTIDs(t *testing.T) {
 				},
 			},
 			tmc: &testutil.TabletManagerClient{
-				ReadReparentJournalInfoResults: map[string]int{
+				ReadReparentJournalInfoResults: map[string]int32{
 					"zone1-0000000102": 2,
 					"zone1-0000000103": 3,
 					"zone1-0000000104": 3,
@@ -5052,7 +5052,7 @@ func TestEmergencyReparenterFindErrantGTIDs(t *testing.T) {
 				},
 			},
 			tmc: &testutil.TabletManagerClient{
-				ReadReparentJournalInfoResults: map[string]int{
+				ReadReparentJournalInfoResults: map[string]int32{
 					"zone1-0000000102": 2,
 					"zone1-0000000103": 3,
 					"zone1-0000000104": 2,
@@ -5116,7 +5116,7 @@ func TestEmergencyReparenterFindErrantGTIDs(t *testing.T) {
 				},
 			},
 			tmc: &testutil.TabletManagerClient{
-				ReadReparentJournalInfoResults: map[string]int{
+				ReadReparentJournalInfoResults: map[string]int32{
 					"zone1-0000000102": 2,
 					"zone1-0000000103": 3,
 					"zone1-0000000104": 2,
@@ -5179,7 +5179,7 @@ func TestEmergencyReparenterFindErrantGTIDs(t *testing.T) {
 				},
 			},
 			tmc: &testutil.TabletManagerClient{
-				ReadReparentJournalInfoResults: map[string]int{
+				ReadReparentJournalInfoResults: map[string]int32{
 					"zone1-0000000102": 3,
 					"zone1-0000000103": 3,
 					"zone1-0000000104": 3,
@@ -5243,7 +5243,7 @@ func TestEmergencyReparenterFindErrantGTIDs(t *testing.T) {
 				},
 			},
 			tmc: &testutil.TabletManagerClient{
-				ReadReparentJournalInfoResults: map[string]int{
+				ReadReparentJournalInfoResults: map[string]int32{
 					"zone1-0000000102": 3,
 					"zone1-0000000103": 3,
 					"zone1-0000000104": 2,
@@ -5297,7 +5297,7 @@ func TestEmergencyReparenterFindErrantGTIDs(t *testing.T) {
 				},
 			},
 			tmc: &testutil.TabletManagerClient{
-				ReadReparentJournalInfoResults: map[string]int{
+				ReadReparentJournalInfoResults: map[string]int32{
 					"zone1-0000000102": 3,
 					"zone1-0000000103": 3,
 				},
@@ -5354,7 +5354,7 @@ func TestEmergencyReparenterFindErrantGTIDs(t *testing.T) {
 				},
 			},
 			tmc: &testutil.TabletManagerClient{
-				ReadReparentJournalInfoResults: map[string]int{
+				ReadReparentJournalInfoResults: map[string]int32{
 					"zone1-0000000102": 3,
 					"zone1-0000000103": 3,
 					"zone1-0000000104": 3,
@@ -5418,7 +5418,7 @@ func TestEmergencyReparenterFindErrantGTIDs(t *testing.T) {
 				},
 			},
 			tmc: &testutil.TabletManagerClient{
-				ReadReparentJournalInfoResults: map[string]int{
+				ReadReparentJournalInfoResults: map[string]int32{
 					"zone1-0000000102": 2,
 					"zone1-0000000103": 3,
 					"zone1-0000000104": 2,
@@ -5481,7 +5481,7 @@ func TestEmergencyReparenterFindErrantGTIDs(t *testing.T) {
 				},
 			},
 			tmc: &testutil.TabletManagerClient{
-				ReadReparentJournalInfoResults: map[string]int{},
+				ReadReparentJournalInfoResults: map[string]int32{},
 			},
 			statusMap: map[string]*replicationdatapb.StopReplicationStatus{
 				"zone1-0000000103": {
diff --git a/go/vt/vttablet/common/config.go b/go/vt/vttablet/common/config.go
index 72047ce4580..05a989d4cf2 100644
--- a/go/vt/vttablet/common/config.go
+++ b/go/vt/vttablet/common/config.go
@@ -142,18 +142,18 @@ func NewVReplicationConfig(overrides map[string]string) (*VReplicationConfig, er
 				c.ExperimentalFlags = value
 			}
 		case "vreplication_net_read_timeout":
-			value, err := strconv.ParseInt(v, 10, 64)
+			value, err := strconv.Atoi(v)
 			if err != nil {
 				errors = append(errors, getError(k, v))
 			} else {
-				c.NetReadTimeout = int(value)
+				c.NetReadTimeout = value
 			}
 		case "vreplication_net_write_timeout":
-			value, err := strconv.ParseInt(v, 10, 64)
+			value, err := strconv.Atoi(v)
 			if err != nil {
 				errors = append(errors, getError(k, v))
 			} else {
-				c.NetWriteTimeout = int(value)
+				c.NetWriteTimeout = value
 			}
 		case "vreplication_copy_phase_duration":
 			value, err := time.ParseDuration(v)
@@ -177,18 +177,18 @@ func NewVReplicationConfig(overrides map[string]string) (*VReplicationConfig, er
 				c.MaxTimeToRetryError = value
 			}
 		case "relay_log_max_size":
-			value, err := strconv.ParseInt(v, 10, 64)
+			value, err := strconv.Atoi(v)
 			if err != nil {
 				errors = append(errors, getError(k, v))
 			} else {
-				c.RelayLogMaxSize = int(value)
+				c.RelayLogMaxSize = value
 			}
 		case "relay_log_max_items":
-			value, err := strconv.ParseInt(v, 10, 64)
+			value, err := strconv.Atoi(v)
 			if err != nil {
 				errors = append(errors, getError(k, v))
 			} else {
-				c.RelayLogMaxItems = int(value)
+				c.RelayLogMaxItems = value
 			}
 		case "vreplication_replica_lag_tolerance":
 			value, err := time.ParseDuration(v)
@@ -198,11 +198,11 @@ func NewVReplicationConfig(overrides map[string]string) (*VReplicationConfig, er
 				c.ReplicaLagTolerance = value
 			}
 		case "vreplication_heartbeat_update_interval":
-			value, err := strconv.ParseInt(v, 10, 64)
+			value, err := strconv.Atoi(v)
 			if err != nil {
 				errors = append(errors, getError(k, v))
 			} else {
-				c.HeartbeatUpdateInterval = int(value)
+				c.HeartbeatUpdateInterval = value
 			}
 		case "vreplication_store_compressed_gtid":
 			value, err := strconv.ParseBool(v)
@@ -212,19 +212,19 @@ func NewVReplicationConfig(overrides map[string]string) (*VReplicationConfig, er
 				c.StoreCompressedGTID = value
 			}
 		case "vreplication-parallel-insert-workers":
-			value, err := strconv.ParseInt(v, 10, 64)
+			value, err := strconv.Atoi(v)
 			if err != nil {
 				errors = append(errors, getError(k, v))
 			} else {
-				c.ParallelInsertWorkers = int(value)
+				c.ParallelInsertWorkers = value
 			}
 		case "vstream_packet_size":
-			value, err := strconv.ParseInt(v, 10, 64)
+			value, err := strconv.Atoi(v)
 			if err != nil {
 				errors = append(errors, getError(k, v))
 			} else {
 				c.VStreamPacketSizeOverride = true
-				c.VStreamPacketSize = int(value)
+				c.VStreamPacketSize = value
 			}
 		case "vstream_dynamic_packet_size":
 			value, err := strconv.ParseBool(v)
diff --git a/go/vt/vttablet/faketmclient/fake_client.go b/go/vt/vttablet/faketmclient/fake_client.go
index 78c87d142a9..5a5cd33535f 100644
--- a/go/vt/vttablet/faketmclient/fake_client.go
+++ b/go/vt/vttablet/faketmclient/fake_client.go
@@ -358,7 +358,7 @@ func (client *FakeTabletManagerClient) PopulateReparentJournal(ctx context.Conte
 }
 
 // ReadReparentJournalInfo is part of the tmclient.TabletManagerClient interface.
-func (client *FakeTabletManagerClient) ReadReparentJournalInfo(ctx context.Context, tablet *topodatapb.Tablet) (int, error) {
+func (client *FakeTabletManagerClient) ReadReparentJournalInfo(ctx context.Context, tablet *topodatapb.Tablet) (int32, error) {
 	return 10, nil
 }
 
diff --git a/go/vt/vttablet/grpctmclient/client.go b/go/vt/vttablet/grpctmclient/client.go
index 01d51e2993a..f6d154570eb 100644
--- a/go/vt/vttablet/grpctmclient/client.go
+++ b/go/vt/vttablet/grpctmclient/client.go
@@ -1124,7 +1124,7 @@ func (client *Client) PopulateReparentJournal(ctx context.Context, tablet *topod
 }
 
 // ReadReparentJournalInfo is part of the tmclient.TabletManagerClient interface.
-func (client *Client) ReadReparentJournalInfo(ctx context.Context, tablet *topodatapb.Tablet) (int, error) {
+func (client *Client) ReadReparentJournalInfo(ctx context.Context, tablet *topodatapb.Tablet) (int32, error) {
 	c, closer, err := client.dialer.dial(ctx, tablet)
 	if err != nil {
 		return 0, err
@@ -1134,7 +1134,7 @@ func (client *Client) ReadReparentJournalInfo(ctx context.Context, tablet *topod
 	if err != nil {
 		return 0, err
 	}
-	return int(resp.Length), nil
+	return resp.Length, nil
 }
 
 // InitReplica is part of the tmclient.TabletManagerClient interface.
diff --git a/go/vt/vttablet/grpctmserver/server.go b/go/vt/vttablet/grpctmserver/server.go
index 6f0fd2aa4dc..be1b8ae9372 100644
--- a/go/vt/vttablet/grpctmserver/server.go
+++ b/go/vt/vttablet/grpctmserver/server.go
@@ -570,7 +570,7 @@ func (s *server) ReadReparentJournalInfo(ctx context.Context, request *tabletman
 	response = &tabletmanagerdatapb.ReadReparentJournalInfoResponse{}
 	length, err := s.tm.ReadReparentJournalInfo(ctx)
 	if err == nil {
-		response.Length = int32(length)
+		response.Length = length
 	}
 	return response, err
 }
diff --git a/go/vt/vttablet/tabletmanager/rpc_agent.go b/go/vt/vttablet/tabletmanager/rpc_agent.go
index 445d74cb930..e779cfa8ff5 100644
--- a/go/vt/vttablet/tabletmanager/rpc_agent.go
+++ b/go/vt/vttablet/tabletmanager/rpc_agent.go
@@ -140,7 +140,7 @@ type RPCTM interface {
 
 	PopulateReparentJournal(ctx context.Context, timeCreatedNS int64, actionName string, tabletAlias *topodatapb.TabletAlias, pos string) error
 
-	ReadReparentJournalInfo(ctx context.Context) (int, error)
+	ReadReparentJournalInfo(ctx context.Context) (int32, error)
 
 	InitReplica(ctx context.Context, parent *topodatapb.TabletAlias, replicationPosition string, timeCreatedNS int64, semiSync bool) error
 
diff --git a/go/vt/vttablet/tabletmanager/rpc_replication.go b/go/vt/vttablet/tabletmanager/rpc_replication.go
index dec94ee6f16..7ac37515b67 100644
--- a/go/vt/vttablet/tabletmanager/rpc_replication.go
+++ b/go/vt/vttablet/tabletmanager/rpc_replication.go
@@ -428,7 +428,7 @@ func (tm *TabletManager) PopulateReparentJournal(ctx context.Context, timeCreate
 }
 
 // ReadReparentJournalInfo reads the information from reparent journal.
-func (tm *TabletManager) ReadReparentJournalInfo(ctx context.Context) (int, error) {
+func (tm *TabletManager) ReadReparentJournalInfo(ctx context.Context) (int32, error) {
 	log.Infof("ReadReparentJournalInfo")
 	if err := tm.waitForGrantsToHaveApplied(ctx); err != nil {
 		return 0, err
@@ -442,7 +442,7 @@ func (tm *TabletManager) ReadReparentJournalInfo(ctx context.Context) (int, erro
 	if len(res.Rows) != 1 {
 		return 0, vterrors.Errorf(vtrpc.Code_INTERNAL, "unexpected rows when reading reparent journal, got %v", len(res.Rows))
 	}
-	return res.Rows[0][0].ToInt()
+	return res.Rows[0][0].ToInt32()
 }
 
 // InitReplica sets replication primary and position, and waits for the
diff --git a/go/vt/vttablet/tabletserver/twopc.go b/go/vt/vttablet/tabletserver/twopc.go
index e1212ebe627..67cf3f894cf 100644
--- a/go/vt/vttablet/tabletserver/twopc.go
+++ b/go/vt/vttablet/tabletserver/twopc.go
@@ -569,7 +569,7 @@ func (tpc *TwoPC) UnresolvedTransactions(ctx context.Context, abandonTime time.T
 			appendCurrentTx()
 
 			// Extract the transaction state and initialize a new TransactionMetadata
-			stateID, _ := row[1].ToInt()
+			stateID, _ := row[1].ToInt32()
 			timeCreated, _ := row[2].ToCastInt64()
 			currentTx = &querypb.TransactionMetadata{
 				Dtid:         dtid,
diff --git a/go/vt/vttablet/tmclient/rpc_client_api.go b/go/vt/vttablet/tmclient/rpc_client_api.go
index 2b5cc967e9f..7ce4c7f0bf4 100644
--- a/go/vt/vttablet/tmclient/rpc_client_api.go
+++ b/go/vt/vttablet/tmclient/rpc_client_api.go
@@ -239,7 +239,7 @@ type TabletManagerClient interface {
 	PopulateReparentJournal(ctx context.Context, tablet *topodatapb.Tablet, timeCreatedNS int64, actionName string, tabletAlias *topodatapb.TabletAlias, pos string) error
 
 	// ReadReparentJournalInfo reads the information from reparent journal
-	ReadReparentJournalInfo(ctx context.Context, tablet *topodatapb.Tablet) (int, error)
+	ReadReparentJournalInfo(ctx context.Context, tablet *topodatapb.Tablet) (int32, error)
 
 	// InitReplica tells a tablet to start replicating from the
 	// passed in primary tablet alias, and wait for the row in the
diff --git a/go/vt/vttablet/tmrpctest/test_tm_rpc.go b/go/vt/vttablet/tmrpctest/test_tm_rpc.go
index a106b43bf2c..0ec380882cc 100644
--- a/go/vt/vttablet/tmrpctest/test_tm_rpc.go
+++ b/go/vt/vttablet/tmrpctest/test_tm_rpc.go
@@ -1179,9 +1179,9 @@ func (fra *fakeRPCTM) PopulateReparentJournal(ctx context.Context, timeCreatedNS
 	return nil
 }
 
-var testReparentJournalLen = 10
+var testReparentJournalLen int32 = 10
 
-func (fra *fakeRPCTM) ReadReparentJournalInfo(context.Context) (int, error) {
+func (fra *fakeRPCTM) ReadReparentJournalInfo(context.Context) (int32, error) {
 	if fra.panics {
 		panic(fmt.Errorf("test-triggered panic"))
 	}

From 770dcf0914e1bf8d3931f1d6b2e4cf7892955367 Mon Sep 17 00:00:00 2001
From: Matt Robenolt <matt@ydekproductions.com>
Date: Thu, 30 Jan 2025 09:42:56 -0800
Subject: [PATCH 14/68] Replace uses of os.Create with os2.Create within
 backup/restore workflows (#17648)

Signed-off-by: Matt Robenolt <matt@ydekproductions.com>
Signed-off-by: Matt Lord <mattalord@gmail.com>
Co-authored-by: Matt Lord <mattalord@gmail.com>
---
 go/os2/file.go                                | 50 ++++++++++++++++
 .../backup/vtctlbackup/backup_utils.go        | 12 ++++
 go/test/endtoend/cluster/vttablet_process.go  | 60 +++++++++++++++++++
 go/vt/mysqlctl/backupengine.go                |  3 +-
 go/vt/mysqlctl/blackbox/utils.go              |  3 +-
 go/vt/mysqlctl/builtinbackupengine.go         |  5 +-
 go/vt/mysqlctl/filebackupstorage/file.go      |  7 ++-
 go/vt/mysqlctl/mysqld.go                      | 11 ++--
 8 files changed, 139 insertions(+), 12 deletions(-)
 create mode 100644 go/os2/file.go

diff --git a/go/os2/file.go b/go/os2/file.go
new file mode 100644
index 00000000000..7c284ed1fc1
--- /dev/null
+++ b/go/os2/file.go
@@ -0,0 +1,50 @@
+/*
+Copyright 2025 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 os2
+
+import (
+	"io/fs"
+	"os"
+)
+
+const (
+	// PermFile is a FileMode for regular files without world permission bits.
+	PermFile fs.FileMode = 0660
+	// PermDirectory is a FileMode for directories without world permission bits.
+	PermDirectory fs.FileMode = 0770
+)
+
+// Create is identical to os.Create except uses 0660 permission
+// rather than 0666, to exclude world read/write bit.
+func Create(name string) (*os.File, error) {
+	return os.OpenFile(name, os.O_RDWR|os.O_CREATE|os.O_TRUNC, PermFile)
+}
+
+// WriteFile is identical to os.WriteFile except permission of 0660 is used.
+func WriteFile(name string, data []byte) error {
+	return os.WriteFile(name, data, PermFile)
+}
+
+// Mkdir is identical to os.Mkdir except permission of 0770 is used.
+func Mkdir(path string) error {
+	return os.Mkdir(path, PermDirectory)
+}
+
+// MkdirAll is identical to os.MkdirAll except permission of 0770 is used.
+func MkdirAll(path string) error {
+	return os.MkdirAll(path, PermDirectory)
+}
diff --git a/go/test/endtoend/backup/vtctlbackup/backup_utils.go b/go/test/endtoend/backup/vtctlbackup/backup_utils.go
index afa5023a047..f7e013f4ce4 100644
--- a/go/test/endtoend/backup/vtctlbackup/backup_utils.go
+++ b/go/test/endtoend/backup/vtctlbackup/backup_utils.go
@@ -425,6 +425,18 @@ func TestBackup(t *testing.T, setupType int, streamMode string, stripes int, cDe
 			return vterrors.Errorf(vtrpc.Code_UNKNOWN, "test failure: %s", test.name)
 		}
 	}
+
+	t.Run("check for files created with global permissions", func(t *testing.T) {
+		t.Logf("Confirming that none of the MySQL data directories that we've created have files with global permissions")
+		for _, ks := range localCluster.Keyspaces {
+			for _, shard := range ks.Shards {
+				for _, tablet := range shard.Vttablets {
+					tablet.VttabletProcess.ConfirmDataDirHasNoGlobalPerms(t)
+				}
+			}
+		}
+	})
+
 	return nil
 }
 
diff --git a/go/test/endtoend/cluster/vttablet_process.go b/go/test/endtoend/cluster/vttablet_process.go
index 65c6fbeec26..8fbe4be54d9 100644
--- a/go/test/endtoend/cluster/vttablet_process.go
+++ b/go/test/endtoend/cluster/vttablet_process.go
@@ -24,6 +24,7 @@ import (
 	"errors"
 	"fmt"
 	"io"
+	"io/fs"
 	"net/http"
 	"os"
 	"os/exec"
@@ -35,6 +36,8 @@ import (
 	"testing"
 	"time"
 
+	"github.com/stretchr/testify/require"
+
 	"vitess.io/vitess/go/constants/sidecar"
 	"vitess.io/vitess/go/mysql"
 	"vitess.io/vitess/go/sqltypes"
@@ -711,6 +714,63 @@ func (vttablet *VttabletProcess) IsShutdown() bool {
 	return vttablet.proc == nil
 }
 
+// ConfirmDataDirHasNoGlobalPerms confirms that no files in the tablet's data directory
+// have any global/world/other permissions enabled.
+func (vttablet *VttabletProcess) ConfirmDataDirHasNoGlobalPerms(t *testing.T) {
+	datadir := vttablet.Directory
+	if _, err := os.Stat(datadir); errors.Is(err, os.ErrNotExist) {
+		t.Logf("Data directory %s no longer exists, skipping permissions check", datadir)
+		return
+	}
+
+	var allowedFiles = []string{
+		// These are intentionally created with the world/other read bit set by mysqld itself
+		// during the --initialize[-insecure] step.
+		// See: https://dev.mysql.com/doc/mysql-security-excerpt/en/creating-ssl-rsa-files-using-mysql.html
+		// "On Unix and Unix-like systems, the file access mode is 644 for certificate files
+		// (that is, world readable) and 600 for key files (that is, accessible only by the
+		// account that runs the server)."
+		path.Join("data", "ca.pem"),
+		path.Join("data", "client-cert.pem"),
+		path.Join("data", "public_key.pem"),
+		path.Join("data", "server-cert.pem"),
+		// The domain socket must have global perms for anyone to use it.
+		"mysql.sock",
+		// These files are created by xtrabackup.
+		path.Join("tmp", "xtrabackup_checkpoints"),
+		path.Join("tmp", "xtrabackup_info"),
+	}
+
+	var matches []string
+	fsys := os.DirFS(datadir)
+	err := fs.WalkDir(fsys, ".", func(p string, d fs.DirEntry, _ error) error {
+		// first check if the file should be skipped
+		for _, name := range allowedFiles {
+			if strings.HasSuffix(p, name) {
+				return nil
+			}
+		}
+
+		info, err := d.Info()
+		if err != nil {
+			return err
+		}
+
+		// check if any global bit is on the filemode
+		if info.Mode()&0007 != 0 {
+			matches = append(matches, fmt.Sprintf(
+				"%s (%s)",
+				path.Join(datadir, p),
+				info.Mode(),
+			))
+		}
+		return nil
+	})
+
+	require.NoError(t, err, "Error walking directory")
+	require.Empty(t, matches, "Found files with global permissions: %s\n", strings.Join(matches, "\n"))
+}
+
 // VttabletProcessInstance returns a VttabletProcess handle for vttablet process
 // configured with the given Config.
 // The process must be manually started by calling setup()
diff --git a/go/vt/mysqlctl/backupengine.go b/go/vt/mysqlctl/backupengine.go
index eeb14039d01..c5700a3cfd4 100644
--- a/go/vt/mysqlctl/backupengine.go
+++ b/go/vt/mysqlctl/backupengine.go
@@ -31,6 +31,7 @@ import (
 
 	"vitess.io/vitess/go/mysql"
 	"vitess.io/vitess/go/mysql/replication"
+	"vitess.io/vitess/go/os2"
 	"vitess.io/vitess/go/vt/logutil"
 	"vitess.io/vitess/go/vt/mysqlctl/backupstats"
 	"vitess.io/vitess/go/vt/mysqlctl/backupstorage"
@@ -723,7 +724,7 @@ func createStateFile(cnf *Mycnf) error {
 	// rename func to openStateFile
 	// change to return a *File
 	fname := filepath.Join(cnf.TabletDir(), RestoreState)
-	fd, err := os.Create(fname)
+	fd, err := os2.Create(fname)
 	if err != nil {
 		return fmt.Errorf("unable to create file: %v", err)
 	}
diff --git a/go/vt/mysqlctl/blackbox/utils.go b/go/vt/mysqlctl/blackbox/utils.go
index c7d34ae3cf6..ff7236a41b8 100644
--- a/go/vt/mysqlctl/blackbox/utils.go
+++ b/go/vt/mysqlctl/blackbox/utils.go
@@ -30,6 +30,7 @@ import (
 
 	"vitess.io/vitess/go/mysql"
 	"vitess.io/vitess/go/mysql/capabilities"
+	"vitess.io/vitess/go/os2"
 	"vitess.io/vitess/go/vt/logutil"
 	"vitess.io/vitess/go/vt/mysqlctl"
 	"vitess.io/vitess/go/vt/mysqlctl/backupstats"
@@ -182,7 +183,7 @@ func createBackupDir(root string, dirs ...string) error {
 
 func createBackupFiles(root string, fileCount int, ext string) error {
 	for i := 0; i < fileCount; i++ {
-		f, err := os.Create(path.Join(root, fmt.Sprintf("%d.%s", i, ext)))
+		f, err := os2.Create(path.Join(root, fmt.Sprintf("%d.%s", i, ext)))
 		if err != nil {
 			return err
 		}
diff --git a/go/vt/mysqlctl/builtinbackupengine.go b/go/vt/mysqlctl/builtinbackupengine.go
index 2046a238400..491a2f2b35c 100644
--- a/go/vt/mysqlctl/builtinbackupengine.go
+++ b/go/vt/mysqlctl/builtinbackupengine.go
@@ -39,6 +39,7 @@ import (
 	"vitess.io/vitess/go/ioutil"
 	"vitess.io/vitess/go/mysql"
 	"vitess.io/vitess/go/mysql/replication"
+	"vitess.io/vitess/go/os2"
 	"vitess.io/vitess/go/protoutil"
 	"vitess.io/vitess/go/vt/log"
 	"vitess.io/vitess/go/vt/logutil"
@@ -206,10 +207,10 @@ func (fe *FileEntry) open(cnf *Mycnf, readOnly bool) (*os.File, error) {
 		}
 	} else {
 		dir := path.Dir(name)
-		if err := os.MkdirAll(dir, os.ModePerm); err != nil {
+		if err := os2.MkdirAll(dir); err != nil {
 			return nil, vterrors.Wrapf(err, "cannot create destination directory %v", dir)
 		}
-		if fd, err = os.Create(name); err != nil {
+		if fd, err = os2.Create(name); err != nil {
 			return nil, vterrors.Wrapf(err, "cannot create destination file %v", name)
 		}
 	}
diff --git a/go/vt/mysqlctl/filebackupstorage/file.go b/go/vt/mysqlctl/filebackupstorage/file.go
index bd73c55e70c..a2e4175d11d 100644
--- a/go/vt/mysqlctl/filebackupstorage/file.go
+++ b/go/vt/mysqlctl/filebackupstorage/file.go
@@ -27,6 +27,7 @@ import (
 
 	"github.com/spf13/pflag"
 
+	"vitess.io/vitess/go/os2"
 	"vitess.io/vitess/go/vt/mysqlctl/errors"
 
 	"vitess.io/vitess/go/ioutil"
@@ -96,7 +97,7 @@ func (fbh *FileBackupHandle) AddFile(ctx context.Context, filename string, files
 		return nil, fmt.Errorf("AddFile cannot be called on read-only backup")
 	}
 	p := path.Join(FileBackupStorageRoot, fbh.dir, fbh.name, filename)
-	f, err := os.Create(p)
+	f, err := os2.Create(p)
 	if err != nil {
 		return nil, err
 	}
@@ -172,13 +173,13 @@ func (fbs *FileBackupStorage) ListBackups(ctx context.Context, dir string) ([]ba
 func (fbs *FileBackupStorage) StartBackup(ctx context.Context, dir, name string) (backupstorage.BackupHandle, error) {
 	// Make sure the directory exists.
 	p := path.Join(FileBackupStorageRoot, dir)
-	if err := os.MkdirAll(p, os.ModePerm); err != nil {
+	if err := os2.MkdirAll(p); err != nil {
 		return nil, err
 	}
 
 	// Create the subdirectory for this named backup.
 	p = path.Join(p, name)
-	if err := os.Mkdir(p, os.ModePerm); err != nil {
+	if err := os2.Mkdir(p); err != nil {
 		return nil, err
 	}
 
diff --git a/go/vt/mysqlctl/mysqld.go b/go/vt/mysqlctl/mysqld.go
index 19e4f62bf25..9dc66392779 100644
--- a/go/vt/mysqlctl/mysqld.go
+++ b/go/vt/mysqlctl/mysqld.go
@@ -47,6 +47,7 @@ import (
 	"vitess.io/vitess/config"
 	"vitess.io/vitess/go/mysql"
 	"vitess.io/vitess/go/mysql/sqlerror"
+	"vitess.io/vitess/go/os2"
 	"vitess.io/vitess/go/osutil"
 	"vitess.io/vitess/go/protoutil"
 	"vitess.io/vitess/go/sqltypes"
@@ -921,7 +922,7 @@ func (mysqld *Mysqld) initConfig(cnf *Mycnf, outFile string) error {
 		return err
 	}
 
-	return os.WriteFile(outFile, []byte(configData), 0o664)
+	return os2.WriteFile(outFile, []byte(configData))
 }
 
 func (mysqld *Mysqld) getMycnfTemplate() string {
@@ -1071,7 +1072,7 @@ func (mysqld *Mysqld) ReinitConfig(ctx context.Context, cnf *Mycnf) error {
 func (mysqld *Mysqld) createDirs(cnf *Mycnf) error {
 	tabletDir := cnf.TabletDir()
 	log.Infof("creating directory %s", tabletDir)
-	if err := os.MkdirAll(tabletDir, os.ModePerm); err != nil {
+	if err := os2.MkdirAll(tabletDir); err != nil {
 		return err
 	}
 	for _, dir := range TopLevelDirs() {
@@ -1081,7 +1082,7 @@ func (mysqld *Mysqld) createDirs(cnf *Mycnf) error {
 	}
 	for _, dir := range cnf.directoryList() {
 		log.Infof("creating directory %s", dir)
-		if err := os.MkdirAll(dir, os.ModePerm); err != nil {
+		if err := os2.MkdirAll(dir); err != nil {
 			return err
 		}
 		// FIXME(msolomon) validate permissions?
@@ -1105,14 +1106,14 @@ func (mysqld *Mysqld) createTopDir(cnf *Mycnf, dir string) error {
 		if os.IsNotExist(err) {
 			topdir := path.Join(tabletDir, dir)
 			log.Infof("creating directory %s", topdir)
-			return os.MkdirAll(topdir, os.ModePerm)
+			return os2.MkdirAll(topdir)
 		}
 		return err
 	}
 	linkto := path.Join(target, vtname)
 	source := path.Join(tabletDir, dir)
 	log.Infof("creating directory %s", linkto)
-	err = os.MkdirAll(linkto, os.ModePerm)
+	err = os2.MkdirAll(linkto)
 	if err != nil {
 		return err
 	}

From 92c25af2d6e2f34de28beb5fefa68d94a6960bd4 Mon Sep 17 00:00:00 2001
From: Dirkjan Bussink <d.bussink@gmail.com>
Date: Fri, 31 Jan 2025 12:45:30 +0100
Subject: [PATCH 15/68] Fix panic inside schema tracker (#17659)

---
 go/vt/vtgate/schema/tracker.go      |  4 ++--
 go/vt/vtgate/schema/tracker_test.go | 21 +++++++++++++++++++++
 go/vt/wrangler/vdiff.go             |  2 +-
 go/vt/wrangler/vdiff_test.go        |  7 +++++++
 4 files changed, 31 insertions(+), 3 deletions(-)

diff --git a/go/vt/vtgate/schema/tracker.go b/go/vt/vtgate/schema/tracker.go
index 8fa41712223..4dae11cded9 100644
--- a/go/vt/vtgate/schema/tracker.go
+++ b/go/vt/vtgate/schema/tracker.go
@@ -353,7 +353,7 @@ func (t *Tracker) updatedTableSchema(th *discovery.TabletHealth) bool {
 
 func (t *Tracker) updateTables(keyspace string, res map[string]string) {
 	for tableName, tableDef := range res {
-		stmt, err := t.parser.Parse(tableDef)
+		stmt, err := t.parser.ParseStrictDDL(tableDef)
 		if err != nil {
 			log.Warningf("error parsing table definition for %s: %v", tableName, err)
 			continue
@@ -535,7 +535,7 @@ func (vm *viewMap) set(ks, tbl, sql string) {
 		m = make(map[tableNameStr]sqlparser.TableStatement)
 		vm.m[ks] = m
 	}
-	stmt, err := vm.parser.Parse(sql)
+	stmt, err := vm.parser.ParseStrictDDL(sql)
 	if err != nil {
 		log.Warningf("ignoring view '%s', parsing error in view definition: '%s'", tbl, sql)
 		return
diff --git a/go/vt/vtgate/schema/tracker_test.go b/go/vt/vtgate/schema/tracker_test.go
index 1ee15ba99cb..e5280c78ed8 100644
--- a/go/vt/vtgate/schema/tracker_test.go
+++ b/go/vt/vtgate/schema/tracker_test.go
@@ -202,6 +202,9 @@ func TestTableTracking(t *testing.T) {
 		tables(
 			tbl("t4", "create table t4(name varchar(50) primary key)"),
 		),
+		tables(
+			tbl("t5", "create table t5(name varchar(50) primary key with broken syntax)"),
+		),
 	}
 
 	testcases := []testCases{{
@@ -234,6 +237,15 @@ func TestTableTracking(t *testing.T) {
 			"t3": {{Name: sqlparser.NewIdentifierCI("id"), Type: querypb.Type_DATETIME, CollationName: "binary", Size: 0, Nullable: true}},
 			"t4": {{Name: sqlparser.NewIdentifierCI("name"), Type: querypb.Type_VARCHAR, Size: 50, Nullable: true}},
 		},
+	}, {
+		testName: "new broken table",
+		updTbl:   []string{"t5"},
+		expTbl: map[string][]vindexes.Column{
+			"t1": {{Name: sqlparser.NewIdentifierCI("id"), Type: querypb.Type_INT64, CollationName: "binary", Nullable: true}, {Name: sqlparser.NewIdentifierCI("name"), Type: querypb.Type_VARCHAR, Size: 50, Nullable: true}, {Name: sqlparser.NewIdentifierCI("email"), Type: querypb.Type_VARCHAR, Size: 50, Nullable: false, Default: &sqlparser.Literal{Val: "a@b.com"}}},
+			"T1": {{Name: sqlparser.NewIdentifierCI("id"), Type: querypb.Type_VARCHAR, Size: 50, Nullable: true}, {Name: sqlparser.NewIdentifierCI("name"), Type: querypb.Type_VARCHAR, Size: 50, Nullable: true}},
+			"t3": {{Name: sqlparser.NewIdentifierCI("id"), Type: querypb.Type_DATETIME, CollationName: "binary", Size: 0, Nullable: true}},
+			"t4": {{Name: sqlparser.NewIdentifierCI("name"), Type: querypb.Type_VARCHAR, Size: 50, Nullable: true}},
+		},
 	}}
 
 	testTracker(t, false, schemaResponse, testcases)
@@ -253,6 +265,7 @@ func TestViewsTracking(t *testing.T) {
 			tbl("t3", "create view t3 as select 1 from tbl3"),
 		),
 		tables(tbl("t4", "create view t4 as select 1 from tbl4")),
+		tables(tbl("t4", "create view t5 as select 1 from tbl4 with broken syntax")),
 	}
 
 	testcases := []testCases{{
@@ -281,6 +294,14 @@ func TestViewsTracking(t *testing.T) {
 			"V1": "select 1, 2 from tbl2",
 			"t3": "select 1 from tbl3",
 			"t4": "select 1 from tbl4"},
+	}, {
+		testName: "new broken t5",
+		updView:  []string{"t5"},
+		expView: map[string]string{
+			"t1": "select 1 from tbl1",
+			"V1": "select 1, 2 from tbl2",
+			"t3": "select 1 from tbl3",
+			"t4": "select 1 from tbl4"},
 	}}
 
 	testTracker(t, false, schemaDefResult, testcases)
diff --git a/go/vt/wrangler/vdiff.go b/go/vt/wrangler/vdiff.go
index 2e9fc5f508d..9991b5bd633 100644
--- a/go/vt/wrangler/vdiff.go
+++ b/go/vt/wrangler/vdiff.go
@@ -542,7 +542,7 @@ func findPKs(env *vtenv.Environment, table *tabletmanagerdatapb.TableDefinition,
 // column in the table definition leveraging MySQL's collation inheritance
 // rules.
 func getColumnCollations(venv *vtenv.Environment, table *tabletmanagerdatapb.TableDefinition) (map[string]collations.ID, map[string]*evalengine.EnumSetValues, error) {
-	createstmt, err := venv.Parser().Parse(table.Schema)
+	createstmt, err := venv.Parser().ParseStrictDDL(table.Schema)
 	if err != nil {
 		return nil, nil, err
 	}
diff --git a/go/vt/wrangler/vdiff_test.go b/go/vt/wrangler/vdiff_test.go
index 3ac6edb373c..44c3a22a336 100644
--- a/go/vt/wrangler/vdiff_test.go
+++ b/go/vt/wrangler/vdiff_test.go
@@ -1311,6 +1311,13 @@ func TestGetColumnCollations(t *testing.T) {
 				"size": {"'small'", "'medium'", "'large'"},
 			},
 		},
+		{
+			name: "invalid schema",
+			table: &tabletmanagerdatapb.TableDefinition{
+				Schema: "create table t1 (c1 varchar(10), size set('small', 'medium', 'large'), primary key(c1) with syntax error)",
+			},
+			wantErr: true,
+		},
 	}
 	env := vtenv.NewTestEnv()
 	for _, tt := range tests {

From cb7d61a4782d9e45d2101c714f6b4e725fb04dba Mon Sep 17 00:00:00 2001
From: Dirkjan Bussink <d.bussink@gmail.com>
Date: Fri, 31 Jan 2025 13:03:50 +0100
Subject: [PATCH 16/68] Handle Percona compressed column extension (#17660)

Signed-off-by: Dirkjan Bussink <d.bussink@gmail.com>
---
 go/vt/sqlparser/ast_funcs.go  |     2 +
 go/vt/sqlparser/constants.go  |     1 +
 go/vt/sqlparser/parse_test.go |    13 +-
 go/vt/sqlparser/sql.go        | 10103 ++++++++++++++++----------------
 go/vt/sqlparser/sql.y         |     4 +
 5 files changed, 5056 insertions(+), 5067 deletions(-)

diff --git a/go/vt/sqlparser/ast_funcs.go b/go/vt/sqlparser/ast_funcs.go
index e28c17a4745..fbf5a346c98 100644
--- a/go/vt/sqlparser/ast_funcs.go
+++ b/go/vt/sqlparser/ast_funcs.go
@@ -2261,6 +2261,8 @@ func (columnFormat ColumnFormat) ToString() string {
 		return keywordStrings[DYNAMIC]
 	case DefaultFormat:
 		return keywordStrings[DEFAULT]
+	case CompressedFormat:
+		return keywordStrings[COMPRESSED]
 	default:
 		return "Unknown column format type"
 	}
diff --git a/go/vt/sqlparser/constants.go b/go/vt/sqlparser/constants.go
index bdf35a2654d..49955b8d4d8 100644
--- a/go/vt/sqlparser/constants.go
+++ b/go/vt/sqlparser/constants.go
@@ -930,6 +930,7 @@ const (
 	FixedFormat
 	DynamicFormat
 	DefaultFormat
+	CompressedFormat
 )
 
 // Transaction access mode
diff --git a/go/vt/sqlparser/parse_test.go b/go/vt/sqlparser/parse_test.go
index 5e075d51baa..6e9a26fe152 100644
--- a/go/vt/sqlparser/parse_test.go
+++ b/go/vt/sqlparser/parse_test.go
@@ -6347,6 +6347,17 @@ func TestParseVersionedComments(t *testing.T) {
 partition by range (id)
 (partition x values less than (5) engine InnoDB,
  partition t values less than (20) engine InnoDB)`,
+		}, {
+			input:        "CREATE TABLE `TABLE_NAME` (\n  `col1` longblob /*!50633 COLUMN_FORMAT COMPRESSED */,\n  `id` bigint unsigned NOT NULL,\n  PRIMARY KEY (`id`)) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin ROW_FORMAT=COMPRESSED",
+			mysqlVersion: "8.0.1",
+			output: `create table TABLE_NAME (
+	col1 longblob column_format compressed,
+	id bigint unsigned not null,
+	primary key (id)
+) ENGINE InnoDB,
+  CHARSET utf8mb4,
+  COLLATE utf8mb4_bin,
+  ROW_FORMAT COMPRESSED`,
 		},
 	}
 
@@ -6354,7 +6365,7 @@ partition by range (id)
 		t.Run(testcase.input+":"+testcase.mysqlVersion, func(t *testing.T) {
 			parser, err := New(Options{MySQLServerVersion: testcase.mysqlVersion})
 			require.NoError(t, err)
-			tree, err := parser.Parse(testcase.input)
+			tree, err := parser.ParseStrictDDL(testcase.input)
 			require.NoError(t, err, testcase.input)
 			out := String(tree)
 			require.Equal(t, testcase.output, out)
diff --git a/go/vt/sqlparser/sql.go b/go/vt/sqlparser/sql.go
index 4569fbc7686..5d6db513503 100644
--- a/go/vt/sqlparser/sql.go
+++ b/go/vt/sqlparser/sql.go
@@ -1553,239 +1553,239 @@ var yyExca = [...]int{
 	149, 168,
 	191, 168,
 	364, 168,
-	-2, 526,
+	-2, 527,
 	-1, 61,
-	38, 787,
-	254, 787,
-	265, 787,
-	300, 801,
-	301, 801,
-	-2, 789,
+	38, 788,
+	254, 788,
+	265, 788,
+	300, 802,
+	301, 802,
+	-2, 790,
 	-1, 66,
-	256, 825,
-	-2, 823,
+	256, 826,
+	-2, 824,
 	-1, 124,
-	253, 1630,
+	253, 1631,
 	-2, 134,
 	-1, 126,
 	1, 161,
 	756, 161,
 	-2, 168,
 	-1, 137,
-	150, 411,
-	259, 411,
-	-2, 515,
+	150, 412,
+	259, 412,
+	-2, 516,
 	-1, 156,
 	149, 168,
 	191, 168,
 	364, 168,
-	-2, 535,
+	-2, 536,
 	-1, 755,
 	177, 41,
 	-2, 43,
 	-1, 964,
-	95, 1647,
-	-2, 1485,
-	-1, 965,
 	95, 1648,
-	236, 1652,
 	-2, 1486,
+	-1, 965,
+	95, 1649,
+	236, 1653,
+	-2, 1487,
 	-1, 966,
-	236, 1651,
+	236, 1652,
 	-2, 42,
 	-1, 1052,
-	65, 899,
-	-2, 912,
+	65, 900,
+	-2, 913,
 	-1, 1141,
-	264, 1112,
-	269, 1112,
-	-2, 422,
+	264, 1113,
+	269, 1113,
+	-2, 423,
 	-1, 1226,
-	1, 583,
-	756, 583,
+	1, 584,
+	756, 584,
 	-2, 168,
 	-1, 1537,
-	236, 1652,
-	-2, 1486,
+	236, 1653,
+	-2, 1487,
 	-1, 1750,
-	65, 900,
-	-2, 916,
-	-1, 1751,
 	65, 901,
 	-2, 917,
+	-1, 1751,
+	65, 902,
+	-2, 918,
 	-1, 1816,
 	149, 168,
 	191, 168,
 	364, 168,
-	-2, 461,
+	-2, 462,
 	-1, 1899,
-	150, 411,
-	259, 411,
-	-2, 515,
+	150, 412,
+	259, 412,
+	-2, 516,
 	-1, 1908,
-	264, 1113,
-	269, 1113,
-	-2, 423,
+	264, 1114,
+	269, 1114,
+	-2, 424,
 	-1, 2357,
-	236, 1656,
-	-2, 1650,
+	236, 1657,
+	-2, 1651,
 	-1, 2358,
-	236, 1652,
-	-2, 1648,
+	236, 1653,
+	-2, 1649,
 	-1, 2463,
 	149, 168,
 	191, 168,
 	364, 168,
-	-2, 462,
+	-2, 463,
 	-1, 2470,
 	28, 189,
 	-2, 191,
 	-1, 2936,
 	86, 99,
 	96, 99,
-	-2, 979,
+	-2, 980,
 	-1, 3004,
-	731, 705,
-	-2, 679,
+	731, 706,
+	-2, 680,
 	-1, 3229,
-	55, 1589,
-	-2, 1583,
-	-1, 4066,
-	731, 705,
-	-2, 693,
-	-1, 4158,
-	98, 637,
-	104, 637,
-	114, 637,
-	193, 637,
-	194, 637,
-	195, 637,
-	196, 637,
-	197, 637,
-	198, 637,
-	199, 637,
-	200, 637,
-	201, 637,
-	202, 637,
-	203, 637,
-	204, 637,
-	205, 637,
-	206, 637,
-	207, 637,
-	208, 637,
-	209, 637,
-	210, 637,
-	211, 637,
-	212, 637,
-	213, 637,
-	214, 637,
-	215, 637,
-	216, 637,
-	217, 637,
-	218, 637,
-	219, 637,
-	220, 637,
-	221, 637,
-	222, 637,
-	223, 637,
-	224, 637,
-	225, 637,
-	226, 637,
-	227, 637,
-	228, 637,
-	229, 637,
-	230, 637,
-	231, 637,
-	232, 637,
-	233, 637,
-	234, 637,
-	-2, 2029,
+	55, 1590,
+	-2, 1584,
+	-1, 4067,
+	731, 706,
+	-2, 694,
+	-1, 4159,
+	98, 638,
+	104, 638,
+	114, 638,
+	193, 638,
+	194, 638,
+	195, 638,
+	196, 638,
+	197, 638,
+	198, 638,
+	199, 638,
+	200, 638,
+	201, 638,
+	202, 638,
+	203, 638,
+	204, 638,
+	205, 638,
+	206, 638,
+	207, 638,
+	208, 638,
+	209, 638,
+	210, 638,
+	211, 638,
+	212, 638,
+	213, 638,
+	214, 638,
+	215, 638,
+	216, 638,
+	217, 638,
+	218, 638,
+	219, 638,
+	220, 638,
+	221, 638,
+	222, 638,
+	223, 638,
+	224, 638,
+	225, 638,
+	226, 638,
+	227, 638,
+	228, 638,
+	229, 638,
+	230, 638,
+	231, 638,
+	232, 638,
+	233, 638,
+	234, 638,
+	-2, 2030,
 }
 
 const yyPrivate = 57344
 
-const yyLast = 56577
+const yyLast = 56209
 
 var yyAct = [...]int{
-	980, 3716, 975, 87, 4246, 2162, 3717, 4233, 3718, 3380,
-	4125, 968, 4137, 4200, 3281, 967, 4201, 2150, 4047, 3516,
-	2460, 3288, 1292, 4156, 2386, 3952, 3242, 4029, 3338, 2185,
-	3343, 3340, 3339, 3337, 3342, 1819, 3341, 4027, 3653, 2388,
-	1294, 3666, 3095, 3358, 2029, 4098, 3296, 3329, 2088, 3180,
-	2535, 5, 3357, 759, 3246, 3243, 3562, 3556, 3759, 3069,
-	3094, 2896, 3230, 2498, 754, 2434, 3051, 1770, 929, 787,
-	3546, 3387, 933, 753, 928, 42, 3360, 3001, 2970, 2522,
-	2503, 2415, 3584, 2971, 2566, 1103, 1050, 2972, 87, 165,
-	2448, 2431, 1876, 2921, 1071, 1924, 1047, 2436, 2902, 1078,
-	2435, 1149, 3240, 2886, 749, 1173, 2870, 2310, 41, 1050,
-	43, 2342, 2146, 2184, 2544, 3042, 151, 2309, 1906, 2096,
-	2521, 2423, 2583, 2505, 1113, 2963, 1136, 1808, 1131, 2938,
-	982, 1788, 1774, 102, 1550, 2190, 2438, 106, 1731, 107,
-	2121, 2110, 1475, 1458, 2025, 1913, 3245, 1110, 1107, 769,
-	1070, 1142, 1885, 2909, 1111, 2005, 756, 2494, 1049, 1137,
-	1053, 1139, 1138, 1807, 1088, 1793, 1090, 101, 3754, 2198,
-	2217, 2868, 2495, 1059, 1753, 1533, 109, 1509, 2087, 1282,
-	3746, 1073, 2416, 3573, 1056, 764, 2037, 85, 169, 129,
-	127, 128, 3517, 1898, 1045, 134, 1054, 135, 1055, 757,
-	1222, 1083, 1057, 930, 1554, 100, 4234, 1290, 3654, 3326,
-	1268, 4082, 2537, 84, 1082, 93, 1559, 2537, 2538, 2539,
-	3024, 3023, 108, 2992, 2581, 1476, 3646, 4183, 1044, 3609,
-	1776, 3059, 3060, 4078, 4077, 1063, 2103, 4083, 746, 1990,
-	1153, 130, 2102, 2101, 689, 2100, 1178, 136, 1104, 2099,
-	2098, 2383, 2384, 2068, 1238, 686, 2866, 687, 2635, 1175,
-	3226, 2570, 1186, 4177, 4204, 3184, 4256, 3721, 4199, 3721,
-	1064, 4224, 1192, 1193, 1194, 3520, 1197, 1198, 1199, 1200,
-	2898, 3519, 1203, 1204, 1205, 1206, 1207, 1208, 1209, 1210,
+	980, 975, 3717, 87, 2162, 3718, 4234, 3719, 4247, 4048,
+	968, 4138, 4201, 967, 3667, 4202, 2150, 4157, 4126, 1294,
+	2460, 3281, 3288, 3516, 2386, 3953, 4030, 1292, 3329, 4028,
+	3242, 3338, 3343, 3340, 1819, 3339, 3337, 3342, 3341, 2088,
+	3654, 2029, 5, 3358, 3180, 3095, 3296, 2535, 2388, 3357,
+	759, 3246, 3760, 3562, 3069, 3556, 3094, 2415, 3230, 787,
+	928, 3243, 2498, 3360, 754, 2434, 2896, 1770, 4099, 2431,
+	3546, 1876, 2970, 3387, 929, 3051, 3001, 933, 2972, 2522,
+	42, 2503, 2971, 2566, 2448, 165, 1050, 1103, 87, 3380,
+	1071, 1047, 3584, 43, 2902, 1173, 2921, 2436, 2886, 1078,
+	2870, 2184, 2310, 3240, 1924, 3042, 2435, 2096, 2342, 1050,
+	2544, 2146, 1906, 41, 151, 2521, 2423, 2583, 2505, 2963,
+	1131, 2938, 1136, 1808, 1113, 1788, 982, 1774, 1731, 2438,
+	1550, 2190, 2121, 106, 107, 2110, 1475, 753, 1458, 102,
+	2025, 2309, 1110, 1107, 1913, 1142, 1885, 3245, 1111, 769,
+	2005, 1139, 2494, 2909, 1137, 1138, 1807, 1088, 1149, 1090,
+	1793, 1059, 1533, 1049, 1509, 1053, 2495, 1753, 3755, 2217,
+	2868, 1056, 2416, 764, 85, 2087, 2037, 1282, 169, 3573,
+	129, 1055, 109, 3517, 1898, 127, 1073, 128, 134, 3747,
+	1222, 2198, 135, 1070, 1083, 1045, 101, 746, 100, 1057,
+	757, 1054, 1554, 84, 4235, 3655, 93, 1290, 3326, 4083,
+	1268, 2537, 2538, 2539, 1082, 930, 108, 2537, 3024, 3023,
+	1559, 2992, 2581, 1476, 3647, 1044, 756, 4184, 1776, 3059,
+	3609, 130, 3060, 4078, 689, 4084, 4079, 2103, 136, 3722,
+	2102, 1063, 1178, 1990, 1104, 2383, 2384, 2101, 2100, 1175,
+	2099, 2098, 2068, 1238, 686, 2866, 687, 2635, 3226, 4178,
+	2570, 3184, 1192, 1193, 1194, 4205, 1197, 1198, 1199, 1200,
+	747, 4257, 1203, 1204, 1205, 1206, 1207, 1208, 1209, 1210,
 	1211, 1212, 1213, 1214, 1215, 1216, 1217, 1218, 1219, 1048,
-	1152, 1098, 2407, 2412, 1097, 2569, 731, 1046, 1239, 1061,
-	2, 747, 4239, 1128, 4056, 130, 1127, 1126, 1125, 1179,
-	1182, 1183, 3348, 1779, 1072, 1115, 1772, 2994, 3348, 1472,
-	1764, 2411, 1469, 1486, 1492, 1120, 3017, 4238, 731, 4078,
-	4030, 3345, 725, 2831, 1777, 2108, 981, 4187, 3406, 4152,
-	3948, 3947, 1195, 1780, 113, 114, 115, 1043, 118, 1177,
-	1176, 124, 192, 3720, 193, 3720, 3014, 681, 984, 985,
-	986, 4214, 4186, 95, 1778, 1096, 1100, 932, 3958, 744,
-	745, 4185, 3346, 130, 1129, 131, 4181, 725, 3346, 1038,
-	1039, 1040, 1041, 3678, 3667, 1460, 1052, 984, 985, 986,
-	4126, 174, 4134, 1096, 1100, 932, 4184, 3659, 2563, 3957,
-	3660, 3352, 86, 2155, 4161, 3432, 1887, 3352, 3278, 3279,
-	2455, 2456, 4138, 2867, 725, 2947, 1085, 1086, 2946, 3277,
-	720, 2948, 3031, 3058, 3032, 4166, 2639, 1471, 86, 2080,
-	2081, 1809, 3041, 1810, 2454, 2642, 1482, 2952, 1258, 1474,
-	86, 1036, 725, 1035, 1287, 4164, 4048, 1246, 3677, 2995,
-	1259, 171, 1247, 97, 172, 4170, 4171, 1263, 1264, 2033,
-	2514, 2959, 1252, 2912, 3414, 3298, 3299, 725, 705, 2473,
-	2472, 3412, 4165, 1489, 3384, 1490, 1491, 1488, 1453, 3773,
-	191, 703, 2633, 2568, 2508, 95, 739, 1246, 4142, 2905,
-	2906, 2913, 1247, 3382, 1124, 86, 1231, 1232, 88, 725,
-	1245, 2226, 1244, 2079, 2083, 2640, 743, 737, 4205, 1476,
-	725, 95, 725, 1805, 3388, 3116, 3349, 4142, 2385, 1221,
-	3043, 700, 3349, 95, 1735, 4000, 1980, 4001, 1234, 4206,
-	715, 3002, 1470, 2545, 3027, 3375, 2609, 4236, 2610, 2588,
-	2611, 1196, 1275, 3376, 1277, 710, 97, 726, 1459, 1260,
-	2584, 2590, 1122, 2419, 2006, 2419, 1279, 713, 1286, 1452,
-	723, 1253, 3046, 1284, 1285, 1227, 1265, 1267, 724, 3648,
-	1981, 3385, 1982, 3647, 3297, 2612, 1266, 2636, 95, 2637,
-	1202, 2587, 1274, 1276, 1261, 1262, 3300, 1151, 1201, 2586,
-	3383, 3932, 726, 3644, 2589, 175, 1162, 1089, 1160, 1132,
-	2218, 2034, 2548, 1133, 181, 2220, 2591, 1738, 3725, 2225,
-	2221, 3300, 1151, 2222, 2223, 2224, 2432, 1486, 2219, 2227,
-	2228, 2229, 2230, 2231, 2232, 2233, 2234, 2235, 690, 726,
-	692, 706, 1133, 728, 1171, 727, 696, 2507, 694, 698,
-	707, 699, 1170, 693, 1169, 704, 1168, 1510, 695, 708,
-	709, 712, 716, 717, 718, 714, 711, 726, 702, 729,
-	4178, 1167, 1166, 3559, 1165, 1164, 1159, 1891, 1172, 3403,
-	3183, 1511, 1512, 1513, 1514, 1515, 1516, 1517, 1519, 1518,
-	1520, 1521, 726, 1108, 3117, 1123, 4257, 1524, 1145, 4211,
-	1150, 1108, 1144, 1272, 1099, 1093, 1091, 1273, 2597, 2593,
-	2595, 2596, 2594, 2598, 2599, 2600, 2601, 1278, 3643, 2026,
-	1291, 1886, 1291, 1291, 726, 1150, 1108, 1084, 3047, 2574,
-	1106, 2573, 1099, 1093, 1091, 726, 2022, 726, 1461, 1189,
-	1482, 3211, 1271, 166, 3320, 3026, 1481, 1478, 1479, 1480,
-	1485, 1487, 1484, 1884, 1483, 1806, 1163, 3012, 1161, 2417,
-	2418, 2417, 2418, 1883, 1477, 2996, 3209, 1882, 2023, 1880,
-	1237, 680, 1050, 1534, 1539, 1540, 4179, 1543, 1545, 1546,
-	1547, 1548, 1549, 3063, 1552, 1553, 1555, 1555, 3029, 1555,
+	1152, 1098, 1097, 2898, 1061, 2, 1779, 1153, 3348, 1064,
+	3348, 1046, 1764, 1128, 2569, 130, 3722, 1127, 1115, 1179,
+	1182, 1183, 1126, 3345, 1125, 1072, 4200, 4225, 1777, 1186,
+	3520, 1492, 3519, 2412, 1120, 2407, 1780, 4057, 2994, 2411,
+	4240, 1486, 1239, 1772, 731, 3721, 3017, 725, 4079, 113,
+	114, 115, 1195, 118, 4188, 95, 124, 1472, 1778, 193,
+	1469, 981, 681, 4186, 1043, 4239, 4031, 731, 3346, 2831,
+	3346, 984, 985, 986, 744, 745, 3014, 2108, 3406, 4187,
+	4153, 3949, 3948, 130, 1038, 1039, 1040, 1041, 4185, 1129,
+	1177, 1052, 3660, 725, 1176, 3661, 4215, 3352, 3959, 3352,
+	984, 985, 986, 4182, 3679, 1460, 3668, 4127, 4135, 1096,
+	1100, 932, 3721, 2563, 1096, 1100, 932, 2642, 3958, 2155,
+	86, 1085, 1086, 4162, 3432, 4139, 1887, 1809, 2947, 1810,
+	3031, 2946, 3032, 2867, 2948, 1275, 720, 1277, 3278, 3279,
+	3277, 86, 3678, 2912, 2455, 2456, 3058, 1124, 4167, 1231,
+	1232, 2080, 2081, 2568, 1482, 2639, 86, 1474, 725, 2454,
+	3041, 1258, 1036, 725, 1035, 1471, 1263, 1264, 4165, 1246,
+	1119, 2913, 2995, 1121, 1247, 1274, 1276, 4049, 4171, 4172,
+	1489, 1234, 1490, 1491, 705, 1246, 1476, 2640, 3298, 3299,
+	1247, 2959, 97, 1259, 1252, 4166, 1488, 703, 1245, 3414,
+	1244, 4143, 3384, 95, 3382, 1122, 3412, 3774, 2033, 1453,
+	2514, 2633, 3349, 1287, 3349, 2473, 2472, 2905, 2906, 725,
+	739, 725, 3116, 2079, 95, 2083, 743, 3043, 1221, 4206,
+	4143, 737, 2385, 1805, 2508, 725, 3388, 700, 4001, 95,
+	4002, 3002, 1735, 2545, 2011, 3375, 715, 3027, 2584, 2006,
+	4207, 2590, 4237, 3376, 86, 1261, 1262, 88, 1980, 3046,
+	1279, 710, 726, 1196, 1452, 1284, 2586, 1227, 1459, 1267,
+	1470, 3649, 1124, 713, 1116, 1265, 723, 3648, 2419, 3933,
+	2226, 1118, 1117, 2612, 724, 1266, 1272, 2588, 1202, 1510,
+	1273, 1162, 1260, 1253, 1486, 1891, 2636, 3297, 2637, 3385,
+	1278, 3383, 1981, 1201, 1982, 97, 2591, 2548, 726, 3300,
+	2182, 3403, 3726, 1511, 1512, 1513, 1514, 1515, 1516, 1517,
+	1519, 1518, 1520, 1521, 2609, 1271, 2610, 1286, 2611, 2587,
+	1122, 3645, 1151, 1285, 2432, 1132, 1133, 95, 1123, 1133,
+	1171, 1089, 2589, 1160, 690, 1170, 692, 706, 1169, 728,
+	2034, 727, 696, 1168, 694, 698, 707, 699, 1167, 693,
+	1166, 704, 1165, 1164, 695, 708, 709, 712, 716, 717,
+	718, 714, 711, 726, 702, 729, 4179, 1159, 726, 2218,
+	1738, 1172, 3300, 4258, 2220, 1108, 3183, 2507, 2225, 2221,
+	1145, 3117, 2222, 2223, 2224, 4212, 1108, 2219, 2227, 2228,
+	2229, 2230, 2231, 2232, 2233, 2234, 2235, 1482, 1144, 2174,
+	2163, 2164, 2165, 2166, 2176, 2167, 2168, 2169, 2181, 2177,
+	2170, 2171, 2178, 2179, 2180, 2172, 2173, 2175, 2026, 3559,
+	1291, 1886, 1291, 1291, 726, 1150, 726, 1084, 1099, 1093,
+	1091, 1163, 1181, 1099, 1093, 1091, 3644, 1108, 1144, 3047,
+	726, 1106, 1180, 2574, 1481, 1478, 1479, 1480, 1485, 1487,
+	1484, 2573, 1483, 1123, 2015, 1806, 2013, 2014, 2012, 2016,
+	2017, 2018, 1477, 2022, 2417, 2418, 3211, 1461, 2996, 1189,
+	3320, 3026, 1050, 1534, 1539, 1540, 3029, 1543, 1545, 1546,
+	1547, 1548, 1549, 1161, 1552, 1553, 1555, 1555, 1884, 1555,
 	1555, 1560, 1560, 1560, 1563, 1564, 1565, 1566, 1567, 1568,
 	1569, 1570, 1571, 1572, 1573, 1574, 1575, 1576, 1577, 1578,
 	1579, 1580, 1581, 1582, 1583, 1584, 1585, 1586, 1587, 1588,
@@ -1798,1059 +1798,1014 @@ var yyAct = [...]int{
 	1649, 1650, 1651, 1652, 1653, 1654, 1655, 1656, 1657, 1658,
 	1659, 1660, 1661, 1662, 1663, 1664, 1665, 1666, 1667, 1668,
 	1669, 1670, 1671, 1672, 1673, 1674, 1675, 1676, 1677, 1678,
-	1679, 1680, 1681, 1682, 1683, 1684, 1685, 1686, 4055, 1449,
-	1280, 1531, 1687, 1130, 1689, 1690, 1691, 1692, 1693, 1450,
-	1451, 2993, 3607, 3608, 1544, 1776, 1560, 1560, 1560, 1560,
-	1560, 1560, 1992, 1991, 1993, 1994, 1995, 3719, 730, 3719,
-	4140, 1700, 1701, 1702, 1703, 1704, 1705, 1706, 1707, 1708,
-	1709, 1710, 1711, 1712, 1713, 1527, 1528, 1529, 1530, 721,
-	4169, 3676, 1243, 2567, 1225, 1541, 1535, 3016, 2961, 4140,
-	89, 2511, 167, 3560, 722, 1092, 4139, 95, 4101, 179,
-	1524, 1556, 1912, 1557, 1558, 2871, 2873, 94, 2565, 1242,
-	1468, 1248, 1249, 1250, 1251, 3350, 3351, 1230, 1561, 1562,
-	1726, 3350, 3351, 1092, 4168, 4139, 2641, 1233, 3354, 2640,
-	3504, 3015, 2512, 94, 3354, 1288, 1289, 3050, 1151, 2510,
-	187, 4043, 1728, 3040, 1763, 94, 3039, 3598, 1734, 3580,
-	1481, 1478, 1479, 1480, 1485, 1487, 1484, 1050, 1483, 4250,
-	1181, 1050, 3192, 1724, 1525, 1526, 1144, 1050, 1477, 1119,
-	1180, 2943, 1121, 2513, 1151, 2908, 1256, 2843, 2158, 1797,
-	1688, 1236, 3191, 2509, 2903, 688, 2657, 168, 173, 170,
-	176, 177, 178, 180, 182, 183, 184, 185, 126, 1725,
-	94, 2010, 2461, 186, 188, 189, 190, 1524, 1521, 3276,
-	3404, 1911, 1511, 1512, 1513, 1514, 1515, 1516, 1517, 1519,
-	1518, 1520, 1521, 2011, 2668, 1151, 1764, 1269, 2199, 1742,
-	2038, 1504, 1067, 1746, 1283, 4069, 1241, 1174, 121, 1049,
-	3639, 1150, 3572, 2585, 2092, 2200, 1124, 1220, 1516, 1517,
-	1519, 1518, 1520, 1521, 1744, 2019, 1745, 1811, 106, 3090,
-	107, 2191, 1694, 1695, 1696, 1697, 1698, 1699, 2191, 1725,
-	2677, 1124, 2527, 1116, 1490, 1491, 4215, 1150, 1188, 2872,
-	1118, 1117, 1732, 1144, 1147, 1148, 1491, 1108, 3768, 4207,
-	4061, 1141, 1145, 1510, 2557, 3614, 3613, 109, 3070, 2552,
-	3053, 1921, 1775, 1492, 1920, 3052, 1740, 1910, 3053, 2557,
-	2668, 1224, 1140, 3052, 2562, 2564, 122, 1511, 1512, 1513,
-	1514, 1515, 1516, 1517, 1519, 1518, 1520, 1521, 1150, 1122,
-	2560, 1162, 1766, 1154, 1144, 1904, 1160, 2561, 1156, 1062,
-	3599, 4252, 1157, 1155, 1888, 1889, 1890, 3940, 2114, 2115,
-	2647, 2648, 2559, 1743, 3939, 1975, 2007, 3284, 2008, 1914,
-	1914, 2009, 1897, 1158, 4258, 1926, 1151, 1927, 3930, 1929,
-	1931, 1769, 1741, 1935, 1937, 1939, 1941, 1943, 1916, 1957,
-	1048, 1046, 3072, 1729, 2197, 1270, 4102, 2031, 2039, 1291,
-	1240, 4248, 1255, 1226, 4249, 3962, 4247, 1802, 1803, 1151,
-	95, 1151, 4035, 1257, 1915, 1492, 731, 1764, 3285, 1871,
-	2347, 1965, 1966, 2126, 2344, 2196, 2000, 1971, 1972, 3690,
-	2124, 1223, 1492, 2346, 3673, 1879, 3674, 2127, 1522, 1523,
-	2125, 2182, 1998, 3287, 1987, 4103, 2714, 1123, 1894, 979,
-	1895, 3689, 1893, 2015, 1907, 2013, 2014, 2012, 2016, 2017,
-	2018, 4036, 1489, 3282, 1490, 1491, 3082, 3081, 3080, 3621,
-	4259, 3074, 1123, 3078, 3620, 3073, 1918, 3071, 3610, 1150,
-	3327, 1747, 3076, 3298, 3299, 1144, 1147, 1148, 3316, 1108,
-	3283, 3075, 1961, 1141, 1145, 1492, 2968, 1999, 2027, 2967,
-	192, 1492, 2966, 1953, 2517, 2001, 1956, 1492, 1958, 2182,
-	3077, 3079, 1150, 1997, 1150, 1986, 1187, 1154, 1144, 1985,
-	1184, 1984, 1156, 131, 3289, 1764, 1157, 1155, 1983, 3421,
-	984, 985, 986, 1492, 1973, 130, 1127, 1126, 1125, 174,
-	2174, 2163, 2164, 2165, 2166, 2176, 2167, 2168, 2169, 2181,
-	2177, 2170, 2171, 2178, 2179, 2180, 2172, 2173, 2175, 2424,
-	2425, 2044, 1967, 1964, 1489, 1963, 1490, 1491, 1962, 1291,
-	1291, 1933, 1739, 3092, 2347, 2040, 2041, 2666, 3604, 2066,
-	731, 1489, 3379, 1490, 1491, 87, 1455, 2665, 87, 2045,
-	1805, 4208, 3297, 4220, 1764, 1764, 2052, 2053, 2054, 171,
-	1764, 4057, 172, 4064, 3300, 1510, 2065, 3062, 2174, 2163,
-	2164, 2165, 2166, 2176, 2167, 2168, 2169, 2181, 2177, 2170,
-	2171, 2178, 2179, 2180, 2172, 2173, 2175, 3967, 191, 1511,
-	1512, 1513, 1514, 1515, 1516, 1517, 1519, 1518, 1520, 1521,
-	2950, 1510, 731, 2533, 1489, 2532, 1490, 1491, 2153, 2153,
-	1489, 1492, 1490, 1491, 4063, 1782, 1489, 42, 1490, 1491,
-	42, 2151, 2151, 2718, 2154, 1511, 1512, 1513, 1514, 1515,
-	1516, 1517, 1519, 1518, 1520, 1521, 2114, 2115, 2112, 2113,
-	2116, 2042, 1489, 4039, 1490, 1491, 1510, 2531, 2046, 2530,
-	2048, 2049, 2050, 2051, 2529, 1726, 2528, 2055, 2892, 4235,
-	4195, 1764, 1510, 2111, 1783, 1506, 4038, 1507, 2237, 2067,
-	1511, 1512, 1513, 1514, 1515, 1516, 1517, 1519, 1518, 1520,
-	1521, 1508, 1522, 1523, 1505, 3286, 1511, 1512, 1513, 1514,
-	1515, 1516, 1517, 1519, 1518, 1520, 1521, 4037, 1724, 3935,
-	1492, 3919, 2251, 175, 1514, 1515, 1516, 1517, 1519, 1518,
-	1520, 1521, 181, 1512, 1513, 1514, 1515, 1516, 1517, 1519,
-	1518, 1520, 1521, 2892, 1764, 3966, 2093, 3918, 2716, 85,
-	1488, 1764, 85, 3767, 1725, 2123, 2073, 2074, 1488, 1764,
-	3923, 2186, 3765, 1510, 2129, 2656, 2131, 2132, 2133, 2134,
-	2135, 2136, 2138, 2140, 2141, 2142, 2143, 2144, 2145, 3686,
-	1489, 1492, 1490, 1491, 2128, 1492, 1723, 1511, 1512, 1513,
-	1514, 1515, 1516, 1517, 1519, 1518, 1520, 1521, 2892, 4133,
-	2892, 4112, 2334, 2335, 2336, 2337, 2338, 1722, 2130, 1721,
-	2157, 2355, 4218, 1764, 1492, 3618, 2261, 3603, 1492, 2359,
-	3389, 103, 2362, 2363, 2892, 4108, 3922, 105, 1552, 2357,
-	1492, 104, 3386, 2356, 2201, 2202, 2203, 2204, 1535, 1498,
-	1499, 1500, 1501, 1502, 1503, 1497, 1494, 103, 2215, 2343,
-	1720, 2253, 2236, 3319, 2345, 1718, 2192, 104, 2380, 3318,
-	1716, 166, 3044, 1717, 1715, 2977, 1719, 4020, 1764, 1489,
-	112, 1490, 1491, 4148, 1764, 112, 2964, 2410, 1764, 1492,
-	1720, 111, 1714, 110, 3657, 4054, 111, 2630, 110, 3943,
-	1764, 105, 1764, 3665, 1492, 2892, 3931, 3657, 1764, 2892,
-	3655, 2354, 2622, 2440, 2360, 2361, 4146, 1764, 2557, 1764,
-	4144, 1764, 1492, 3578, 1764, 105, 1492, 2939, 1764, 106,
-	2355, 107, 4013, 1764, 2798, 1764, 3309, 3308, 3306, 3307,
-	1489, 2621, 1490, 1491, 1489, 2579, 1490, 1491, 2357, 2578,
-	2470, 106, 2429, 107, 3304, 3305, 2889, 3290, 2390, 2402,
-	2414, 3294, 2122, 2391, 1492, 2069, 1764, 2939, 3293, 1492,
-	105, 1764, 3003, 1489, 1492, 1490, 1491, 1489, 2035, 1490,
-	1491, 4011, 1764, 3304, 3303, 2442, 1113, 2918, 1764, 1489,
-	1764, 1490, 1491, 2640, 3025, 2940, 4008, 1764, 1875, 3006,
-	2999, 3000, 3295, 2378, 2396, 2942, 2397, 3291, 2892, 2891,
-	1063, 1492, 3292, 2465, 3990, 1764, 2464, 1996, 3545, 1764,
-	1113, 1988, 2479, 2480, 2481, 2482, 1978, 2474, 1974, 2475,
-	2476, 2477, 2478, 2446, 2887, 2940, 2982, 2403, 1489, 1970,
-	1490, 1491, 1492, 2484, 2500, 2640, 2486, 2487, 2488, 2489,
-	2156, 1764, 2405, 1489, 2468, 1490, 1491, 4209, 111, 2546,
-	1969, 3538, 1764, 3575, 2506, 1968, 3535, 1764, 1875, 1874,
-	2427, 1489, 1784, 1490, 1491, 1489, 1281, 1490, 1491, 2451,
-	2452, 2450, 3271, 1492, 1817, 1816, 2469, 2467, 1492, 2917,
-	2466, 3241, 2640, 1492, 2910, 2910, 3571, 1098, 1488, 2543,
-	1097, 2558, 3571, 3533, 1764, 1492, 4096, 4068, 2516, 1492,
-	167, 2892, 2918, 1489, 1153, 1490, 1491, 179, 1489, 3524,
-	1490, 1491, 1492, 1489, 1914, 1490, 1491, 3306, 3214, 2453,
-	2501, 3574, 1488, 1492, 3496, 1764, 2497, 1492, 2798, 2551,
-	2515, 2701, 2554, 2520, 2555, 2519, 2704, 2490, 2492, 2493,
-	2918, 2700, 2571, 1051, 1492, 2557, 2540, 2422, 187, 1492,
-	1489, 2664, 1490, 1491, 2409, 2557, 2501, 2550, 2553, 2549,
-	1492, 2918, 3571, 1768, 1152, 3494, 1764, 1492, 2381, 2156,
-	3490, 1764, 2572, 2094, 2575, 3487, 1764, 2078, 2576, 2577,
-	2021, 1489, 1804, 1490, 1491, 1135, 1134, 3485, 1764, 1765,
-	1767, 3483, 1764, 95, 97, 168, 173, 170, 176, 177,
-	178, 180, 182, 183, 184, 185, 4174, 4115, 3954, 2645,
-	1771, 186, 188, 189, 190, 3481, 1764, 3920, 1050, 1050,
-	1050, 1492, 1489, 2582, 1490, 1491, 95, 1489, 1492, 1490,
-	1491, 3780, 1489, 3622, 1490, 1491, 3479, 1764, 1545, 1492,
-	1545, 3477, 1764, 3638, 1489, 3635, 1490, 1491, 1489, 1492,
-	1490, 1491, 3475, 1764, 1492, 3616, 2660, 3437, 1492, 3473,
-	1764, 1489, 1492, 1490, 1491, 3436, 1492, 1877, 2615, 2499,
-	1492, 3377, 1489, 3332, 1490, 1491, 1489, 1949, 1490, 1491,
-	3328, 2663, 3007, 2496, 2491, 1492, 2485, 2483, 2003, 1492,
-	3623, 3624, 3625, 1489, 1492, 1490, 1491, 1909, 1489, 2357,
-	1490, 1491, 1905, 2356, 1873, 123, 3330, 2973, 2974, 1489,
-	1492, 1490, 1491, 3471, 1764, 1225, 1489, 3381, 1490, 1491,
-	3469, 1764, 2632, 3955, 2673, 3585, 3586, 1492, 2683, 4072,
-	2514, 3467, 1764, 2394, 1950, 1951, 1952, 2638, 1492, 3591,
-	4230, 3465, 1764, 3590, 4228, 2698, 3463, 1764, 4202, 2071,
-	3461, 1764, 4076, 2646, 3459, 1764, 3956, 3995, 3457, 1764,
-	1492, 2974, 3443, 1764, 3588, 1492, 2652, 2649, 2650, 2651,
-	1489, 3324, 1490, 1491, 1492, 2123, 3323, 1489, 4052, 1490,
-	1491, 3419, 1764, 2653, 3322, 2655, 2863, 1764, 1489, 3241,
-	1490, 1491, 2986, 2616, 2658, 3260, 2659, 3259, 1489, 1492,
-	1490, 1491, 2672, 1489, 1492, 1490, 1491, 1489, 1492, 1490,
-	1491, 1489, 1492, 1490, 1491, 1489, 2072, 1490, 1491, 1489,
-	3927, 1490, 1491, 3263, 3261, 2676, 1492, 2654, 3264, 3262,
-	2861, 1764, 685, 2413, 1489, 1492, 1490, 1491, 1489, 1781,
-	1490, 1491, 1492, 1489, 2400, 1490, 1491, 3579, 1065, 2624,
-	2625, 1492, 2836, 1764, 2627, 3219, 2842, 2813, 1764, 1489,
-	2661, 1490, 1491, 2628, 3218, 4034, 2805, 1764, 3758, 3760,
-	1492, 3265, 1786, 2927, 2928, 3567, 1489, 1492, 1490, 1491,
-	3228, 2712, 1492, 2830, 3626, 2020, 1034, 1489, 2874, 1490,
-	1491, 2796, 1764, 3231, 3233, 2153, 2794, 1764, 3302, 1066,
-	2781, 1764, 3234, 2957, 2779, 1764, 748, 1050, 2151, 1489,
-	2877, 1490, 1491, 3564, 1489, 1492, 1490, 1491, 2777, 1764,
-	2978, 3563, 1492, 1489, 2608, 1490, 1491, 2775, 1764, 2875,
-	2199, 1492, 2915, 2916, 2773, 1764, 2607, 3627, 3628, 3629,
-	2380, 2440, 2606, 1785, 1050, 2935, 1068, 2200, 1489, 2605,
-	1490, 1491, 1492, 1489, 1069, 1490, 1491, 1489, 1492, 1490,
-	1491, 1489, 3593, 1490, 1491, 1077, 2878, 2604, 2880, 2771,
-	1764, 2603, 2122, 2602, 3540, 1489, 3397, 1490, 1491, 1076,
-	2914, 1191, 1190, 1492, 1489, 2973, 1490, 1491, 3745, 3056,
-	3744, 1489, 1454, 1490, 1491, 103, 2895, 2119, 2117, 2118,
-	1489, 105, 1490, 1491, 42, 104, 2933, 2769, 1764, 3013,
-	131, 3569, 105, 2932, 2767, 1764, 2934, 2904, 1732, 1489,
-	2865, 1490, 1491, 2765, 1764, 4244, 1489, 103, 1490, 1491,
-	1492, 1489, 2990, 1490, 1491, 2885, 2619, 104, 1492, 4151,
-	1775, 4053, 2893, 3743, 2763, 1764, 1492, 2424, 2425, 1725,
-	2761, 1764, 3950, 2953, 2907, 1492, 2890, 2960, 2962, 3011,
-	1492, 1945, 3547, 3301, 1489, 2937, 1490, 1491, 1492, 2931,
-	3217, 1489, 2406, 1490, 1491, 2759, 1764, 2941, 3216, 2644,
-	1489, 2944, 1490, 1491, 2506, 1492, 2077, 112, 2076, 110,
-	2194, 2951, 2954, 1492, 4019, 2195, 3022, 4018, 111, 111,
-	110, 1489, 3998, 1490, 1491, 3766, 3764, 1489, 105, 1490,
-	1491, 2965, 3755, 2976, 1946, 1947, 1948, 3763, 2979, 2980,
-	3756, 1492, 2757, 1764, 3636, 3568, 3566, 3333, 2975, 2541,
-	2755, 1764, 1489, 2257, 1490, 1491, 1492, 1892, 2753, 1764,
-	2983, 1492, 2984, 1075, 2987, 2988, 2989, 2751, 1764, 3557,
-	3019, 112, 2749, 1764, 1492, 112, 3729, 1897, 2910, 2889,
-	2747, 1764, 111, 3120, 3066, 3067, 111, 2702, 110, 2392,
-	1492, 3008, 3009, 4232, 4231, 1492, 1798, 2742, 1764, 1489,
-	1790, 1490, 1491, 116, 117, 3536, 3018, 1489, 4232, 1490,
-	1491, 1492, 4231, 4040, 3602, 1489, 1492, 1490, 1491, 3086,
-	2091, 3, 2089, 10, 1489, 9, 1490, 1491, 99, 1489,
-	1492, 1490, 1491, 2340, 3640, 2090, 1492, 1489, 8, 1490,
-	1491, 3064, 3045, 1492, 1, 3083, 1042, 1457, 2738, 1764,
-	1456, 1492, 3606, 3502, 1489, 3048, 1490, 1491, 4163, 701,
-	2382, 1730, 1489, 2372, 1490, 1491, 2736, 1764, 4203, 3101,
-	3102, 3103, 3104, 3105, 3106, 3107, 3108, 3109, 3110, 4159,
-	1765, 2379, 2729, 1764, 4160, 1989, 1492, 2727, 1764, 3118,
-	1489, 1979, 1490, 1491, 3668, 2308, 3951, 3020, 1492, 3084,
-	3336, 2547, 3634, 3498, 2504, 1489, 1143, 1490, 1491, 2969,
-	1489, 156, 1490, 1491, 2462, 2463, 4128, 120, 1101, 119,
-	1492, 2404, 3434, 1489, 1146, 1490, 1491, 1254, 3433, 2542,
-	3658, 2958, 2471, 1823, 1821, 3425, 1822, 3068, 1820, 1489,
-	1492, 1490, 1491, 3423, 1489, 3085, 1490, 1491, 1825, 3122,
-	1824, 3160, 3178, 3162, 3054, 4100, 3405, 3055, 2703, 3503,
-	1489, 2082, 1490, 1491, 2998, 1489, 738, 1490, 1491, 3173,
-	3174, 3175, 3176, 2930, 732, 194, 1812, 3065, 2859, 1489,
-	1791, 1490, 1491, 2075, 1185, 1489, 3196, 1490, 1491, 691,
-	2858, 3310, 1489, 2580, 1490, 1491, 3185, 697, 1542, 2070,
-	1489, 3215, 1490, 1491, 2945, 3187, 1492, 1095, 1087, 2393,
-	2440, 2879, 2854, 3111, 1492, 1094, 3928, 3249, 1492, 3561,
-	3227, 3229, 2897, 2343, 3232, 2343, 3158, 3225, 2345, 4033,
-	2345, 3757, 2853, 2518, 3248, 1489, 87, 1490, 1491, 2440,
-	2440, 2440, 2440, 2440, 1492, 4113, 2955, 1489, 1787, 1490,
-	1491, 3196, 3168, 3169, 3170, 3171, 3172, 3523, 2675, 2440,
-	2189, 1532, 2440, 763, 3253, 2439, 3186, 934, 3188, 1489,
-	1773, 1490, 1491, 3724, 2109, 3223, 3195, 761, 760, 1492,
-	758, 3270, 2442, 2881, 2911, 1496, 1495, 969, 2869, 1489,
-	3213, 1490, 1491, 3208, 3210, 3212, 3207, 1799, 2852, 2922,
-	1492, 2920, 2919, 2617, 2031, 1492, 2851, 3222, 1053, 3220,
-	2850, 2442, 2442, 2442, 2442, 2442, 1492, 2447, 3235, 3236,
-	1492, 3587, 3583, 4155, 3272, 3353, 2441, 3273, 2437, 2888,
-	920, 2442, 3252, 919, 2442, 3361, 2849, 3255, 3256, 3254,
-	3258, 770, 3257, 3266, 1054, 762, 1055, 106, 1492, 107,
-	752, 983, 1492, 3274, 918, 1489, 917, 1490, 1491, 3363,
-	3221, 3364, 3280, 1489, 3028, 1490, 1491, 1489, 1492, 1490,
-	1491, 2840, 1492, 3378, 3311, 3030, 3313, 2956, 3374, 3312,
-	3238, 1473, 1492, 2923, 2926, 2927, 2928, 2924, 1749, 2925,
-	2929, 1752, 2839, 1489, 2401, 1490, 1491, 2838, 1114, 3314,
-	3315, 3402, 4059, 3365, 3362, 3334, 2506, 3355, 2837, 3366,
-	2643, 3431, 2834, 1748, 4066, 3344, 3372, 3652, 3325, 3004,
-	2534, 1492, 69, 46, 4028, 4097, 1492, 912, 1489, 909,
-	1490, 1491, 3726, 1492, 3727, 3392, 3244, 3390, 3728, 3181,
-	2829, 3244, 3182, 4079, 2822, 4080, 908, 3400, 3393, 1489,
-	4081, 1490, 1491, 2246, 1489, 1467, 1490, 1491, 3410, 1464,
-	2821, 4176, 2084, 98, 2820, 1489, 36, 1490, 1491, 1489,
-	35, 1490, 1491, 34, 2819, 33, 32, 3426, 3427, 3428,
-	3429, 3430, 26, 3407, 3408, 25, 3409, 24, 23, 3411,
-	22, 3413, 29, 3415, 19, 21, 20, 1489, 18, 1490,
-	1491, 1489, 3347, 1490, 1491, 4198, 4243, 125, 55, 52,
-	1545, 50, 2662, 2818, 1545, 133, 2667, 1489, 2817, 1490,
-	1491, 1489, 132, 1490, 1491, 2816, 3335, 53, 49, 1228,
-	3548, 1489, 3550, 1490, 1491, 47, 96, 31, 30, 2670,
-	17, 2671, 16, 3518, 15, 14, 13, 2679, 12, 11,
-	3522, 2681, 2682, 7, 6, 39, 38, 37, 28, 27,
+	1679, 1680, 1681, 1682, 1683, 1684, 1685, 1686, 1130, 3720,
+	1280, 1531, 1687, 2567, 1689, 1690, 1691, 1692, 1693, 1450,
+	1451, 4056, 2993, 3607, 3608, 3610, 1560, 1560, 1560, 1560,
+	1560, 1560, 1776, 4141, 730, 3677, 1992, 1991, 1993, 1994,
+	1995, 1700, 1701, 1702, 1703, 1704, 1705, 1706, 1707, 1708,
+	1709, 1710, 1711, 1712, 1713, 721, 1527, 1528, 1529, 1530,
+	1449, 1151, 4141, 4170, 95, 1225, 1541, 3016, 2641, 4140,
+	722, 3350, 3351, 3350, 3351, 1243, 3720, 4102, 1535, 1556,
+	1230, 1557, 1558, 1524, 3354, 94, 3354, 1481, 1478, 1479,
+	1480, 1485, 1487, 1484, 1544, 1483, 1233, 3504, 4140, 1092,
+	1151, 2511, 1561, 1562, 1092, 1477, 94, 4169, 1468, 89,
+	1883, 3015, 3404, 1242, 1524, 1248, 1249, 1250, 1251, 3560,
+	3284, 94, 1728, 1912, 1763, 1882, 2640, 3012, 1734, 2023,
+	922, 1880, 1237, 3050, 725, 680, 3070, 1050, 4180, 1288,
+	1289, 1050, 2512, 3040, 2565, 4044, 3039, 1050, 1724, 2510,
+	2597, 2593, 2595, 2596, 2594, 2598, 2599, 2600, 2601, 1256,
+	1525, 1526, 1151, 3598, 1150, 3580, 4251, 2943, 2908, 3063,
+	2843, 3285, 2158, 1151, 1797, 1688, 1236, 2419, 3192, 2871,
+	2873, 3191, 126, 2513, 1725, 2903, 195, 688, 2461, 684,
+	1524, 1521, 3276, 2509, 2668, 1504, 3287, 1067, 1188, 1283,
+	2657, 1764, 3090, 1150, 2199, 3209, 121, 4070, 1174, 684,
+	1269, 3640, 3572, 1241, 1742, 1151, 3282, 2585, 1746, 94,
+	3072, 2200, 2092, 2019, 1049, 1060, 2038, 1124, 1220, 2527,
+	1744, 1745, 1911, 1811, 106, 107, 3298, 3299, 2191, 2191,
+	2677, 4216, 3769, 3283, 1081, 1081, 1694, 1695, 1696, 1697,
+	1698, 1699, 2126, 684, 1725, 1732, 1492, 4062, 1491, 2010,
+	2114, 2115, 2112, 2113, 3615, 1150, 2127, 1522, 1523, 2125,
+	3614, 1144, 1147, 1148, 2552, 1108, 1150, 3289, 1775, 1141,
+	1145, 1154, 1144, 109, 122, 2668, 1156, 2111, 1490, 1491,
+	1157, 1155, 1224, 1921, 3082, 3081, 3080, 3053, 1492, 3074,
+	1140, 3078, 3052, 3073, 3053, 3071, 1920, 1910, 4208, 3052,
+	3076, 1158, 2562, 3599, 1888, 1889, 1890, 1904, 1150, 3075,
+	1151, 1151, 1729, 2560, 1144, 1147, 1148, 1162, 1108, 1740,
+	1160, 1062, 1141, 1145, 1743, 1492, 2557, 4253, 3077, 3079,
+	1897, 1766, 1492, 1741, 1975, 3297, 2031, 2185, 1769, 726,
+	1048, 2564, 1916, 2872, 1926, 1046, 1927, 3300, 1929, 1931,
+	2197, 1957, 1935, 1937, 1939, 1941, 1943, 1240, 1270, 1291,
+	1802, 1803, 3941, 2417, 2418, 1255, 3674, 1226, 3675, 2561,
+	1871, 1965, 1966, 1915, 2039, 1492, 1257, 1971, 1972, 1516,
+	1517, 1519, 1518, 1520, 1521, 1879, 1914, 1914, 4249, 1492,
+	2557, 4250, 1223, 4248, 4103, 1489, 1786, 1490, 1491, 1894,
+	4036, 1492, 95, 1895, 2007, 1907, 2008, 1893, 1123, 2009,
+	4259, 3421, 749, 1150, 1150, 2673, 1187, 3963, 1154, 1144,
+	1184, 1764, 2124, 1156, 4221, 1764, 1747, 1157, 1155, 2196,
+	1492, 1510, 3940, 2559, 1506, 3931, 1507, 1489, 2000, 1490,
+	1491, 3691, 1961, 4104, 2714, 3690, 3092, 3622, 1918, 4037,
+	1508, 1522, 1523, 1505, 2027, 1511, 1512, 1513, 1514, 1515,
+	1516, 1517, 1519, 1518, 1520, 1521, 3621, 1785, 3286, 3611,
+	3327, 1510, 3316, 3062, 1489, 1953, 1490, 1491, 1956, 2968,
+	1958, 1489, 1764, 1490, 1491, 130, 2967, 1127, 1510, 984,
+	985, 986, 1126, 2672, 1125, 1511, 1512, 1513, 1514, 1515,
+	1516, 1517, 1519, 1518, 1520, 1521, 4260, 1492, 2966, 1999,
+	2718, 2044, 1511, 1512, 1513, 1514, 1515, 1516, 1517, 1519,
+	1518, 1520, 1521, 1764, 1489, 2517, 1490, 1491, 2001, 1291,
+	1291, 1492, 1985, 2424, 2425, 2040, 2041, 2066, 1489, 1492,
+	1490, 1491, 1984, 1492, 1510, 87, 2656, 1983, 87, 2045,
+	1489, 1973, 1490, 1491, 1967, 1964, 2052, 2053, 2054, 1510,
+	1492, 1963, 1962, 2704, 1933, 1739, 2065, 1998, 1511, 1512,
+	1513, 1514, 1515, 1516, 1517, 1519, 1518, 1520, 1521, 1489,
+	2961, 1490, 1491, 1511, 1512, 1513, 1514, 1515, 1516, 1517,
+	1519, 1518, 1520, 1521, 1511, 1512, 1513, 1514, 1515, 1516,
+	1517, 1519, 1518, 1520, 1521, 1492, 2347, 2153, 2153, 1512,
+	1513, 1514, 1515, 1516, 1517, 1519, 1518, 1520, 1521, 2151,
+	2151, 1492, 42, 2154, 1764, 42, 1514, 1515, 1516, 1517,
+	1519, 1518, 1520, 1521, 1492, 4219, 1764, 3379, 1997, 1455,
+	2116, 1498, 1499, 1500, 1501, 1502, 1503, 1497, 1494, 1987,
+	731, 1805, 4149, 1764, 1764, 1492, 1489, 4209, 1490, 1491,
+	1492, 2114, 2115, 2647, 2648, 2042, 3604, 2237, 731, 2950,
+	4065, 731, 2046, 4064, 2048, 2049, 2050, 2051, 4040, 103,
+	1489, 2055, 1490, 1491, 2533, 2531, 2532, 2530, 1489, 104,
+	1490, 1491, 1489, 2067, 1490, 1491, 103, 4147, 1764, 4058,
+	1492, 3968, 105, 1724, 2347, 4039, 104, 1492, 2344, 1489,
+	3290, 1490, 1491, 3593, 3294, 1782, 85, 2346, 4038, 85,
+	1986, 3293, 2529, 2093, 2528, 3936, 4145, 1764, 3967, 2186,
+	3920, 2716, 3919, 979, 3768, 2123, 2073, 2074, 3766, 1725,
+	1492, 1488, 1764, 2892, 4236, 4196, 1764, 4014, 1764, 3924,
+	1764, 2128, 4012, 1764, 1489, 3295, 1490, 1491, 112, 3687,
+	3291, 1492, 1723, 1722, 1783, 3292, 1721, 1764, 3923, 111,
+	1489, 110, 1490, 1491, 1492, 2892, 1764, 2157, 3619, 105,
+	1488, 1764, 1492, 1489, 2261, 1490, 1491, 1492, 2357, 2130,
+	2892, 4134, 4009, 1764, 1492, 3603, 2355, 2892, 4113, 3991,
+	1764, 684, 3389, 684, 1489, 3386, 1490, 1491, 1552, 1489,
+	2356, 1490, 1491, 3319, 2129, 1492, 2131, 2132, 2133, 2134,
+	2135, 2136, 2138, 2140, 2141, 2142, 2143, 2144, 2145, 3318,
+	1535, 2236, 3545, 1764, 3666, 2343, 2201, 2202, 2203, 2204,
+	2892, 4109, 4021, 1764, 1764, 3658, 4055, 3003, 2192, 1489,
+	2215, 1490, 1491, 3538, 1764, 1492, 1489, 2410, 1490, 1491,
+	1492, 3944, 1764, 2892, 3932, 684, 3535, 1764, 3271, 2354,
+	3044, 112, 2360, 2361, 3533, 1764, 3658, 1764, 2640, 3496,
+	1764, 1492, 111, 2440, 110, 2977, 3494, 1764, 2982, 1489,
+	2964, 1490, 1491, 1538, 1720, 106, 107, 2357, 2345, 2892,
+	3656, 2253, 2557, 1764, 2469, 2355, 1714, 3490, 1764, 95,
+	1489, 2630, 1490, 1491, 2622, 1492, 2390, 106, 107, 2429,
+	2470, 3578, 1764, 1489, 2621, 1490, 1491, 2798, 1764, 2402,
+	1492, 1489, 2579, 1490, 1491, 1492, 1489, 2122, 1490, 1491,
+	2578, 1492, 2414, 1489, 2391, 1490, 1491, 3487, 1764, 3309,
+	3308, 105, 3485, 1764, 3306, 3307, 1113, 1764, 3304, 3305,
+	2442, 3304, 3303, 2939, 1489, 2664, 1490, 1491, 2479, 2480,
+	2481, 2482, 2939, 3483, 1764, 3571, 2474, 1492, 2475, 2476,
+	2477, 2478, 2464, 2918, 1764, 2465, 1063, 2640, 3025, 1488,
+	1113, 2446, 2484, 1492, 2069, 2486, 2487, 2488, 2489, 2035,
+	2403, 1996, 2378, 1988, 1489, 1978, 1490, 1491, 4210, 1489,
+	2405, 1490, 1491, 2500, 1875, 3006, 1764, 2396, 1974, 2397,
+	2468, 1970, 3481, 1764, 1492, 2999, 3000, 3479, 1764, 2546,
+	1489, 2940, 1490, 1491, 2506, 2427, 2892, 2891, 2156, 1764,
+	2940, 2942, 2451, 2452, 2450, 1492, 1969, 2889, 1968, 1784,
+	2640, 1281, 2467, 2466, 1492, 1875, 1874, 1098, 1097, 1817,
+	1816, 105, 1492, 3241, 1489, 111, 1490, 1491, 4097, 3477,
+	1764, 2543, 2910, 2516, 3571, 1492, 4069, 2892, 2918, 1489,
+	3524, 1490, 1491, 2910, 1489, 3540, 1490, 1491, 1492, 3306,
+	1489, 3575, 1490, 1491, 3214, 2501, 2453, 2798, 2558, 2701,
+	2917, 2497, 2700, 2551, 2515, 2557, 2554, 2520, 2555, 2540,
+	2519, 2490, 2492, 2493, 2422, 2409, 3475, 1764, 1768, 2381,
+	2156, 2094, 2078, 1492, 2571, 2887, 1489, 1051, 1490, 1491,
+	2021, 2501, 2550, 2549, 1152, 1804, 1492, 2553, 4053, 1488,
+	1492, 1153, 1489, 1135, 1490, 1491, 3473, 1764, 2572, 2918,
+	1492, 1914, 1134, 2575, 3471, 1764, 684, 2576, 2577, 3574,
+	3571, 2918, 2557, 4175, 1492, 4116, 3330, 3469, 1764, 1765,
+	1767, 1492, 3955, 1489, 1771, 1490, 1491, 3921, 97, 1060,
+	3467, 1764, 3781, 3639, 1492, 3636, 3617, 3437, 1492, 2645,
+	3436, 2582, 1877, 2499, 1489, 3377, 1490, 1491, 1050, 1050,
+	1050, 1492, 3623, 1489, 684, 1490, 1491, 3332, 3328, 3007,
+	95, 1489, 2496, 1490, 1491, 3465, 1764, 1492, 1545, 2491,
+	1545, 1510, 2485, 684, 1489, 1949, 1490, 1491, 3463, 1764,
+	2483, 2974, 3461, 1764, 2003, 1492, 2660, 1489, 1909, 1490,
+	1491, 2973, 3459, 1764, 2615, 1511, 1512, 1513, 1514, 1515,
+	1516, 1517, 1519, 1518, 1520, 1521, 3457, 1764, 2357, 3624,
+	3625, 3626, 1225, 3443, 1764, 1905, 2663, 1492, 1873, 123,
+	4231, 1492, 1489, 1538, 1490, 1491, 3419, 1764, 3381, 1492,
+	2356, 3928, 1950, 1951, 1952, 1489, 3956, 1490, 1491, 1489,
+	1492, 1490, 1491, 2863, 1764, 2974, 1492, 2632, 2514, 1489,
+	1538, 1490, 1491, 1538, 2394, 1538, 684, 3585, 3586, 2861,
+	1764, 2638, 1492, 1489, 4229, 1490, 1491, 4203, 1726, 4077,
+	1489, 1492, 1490, 1491, 3627, 3996, 1976, 2646, 3641, 3588,
+	3324, 3323, 1492, 1489, 3322, 1490, 1491, 1489, 2652, 1490,
+	1491, 684, 2071, 3241, 2986, 1492, 2616, 2649, 2650, 2651,
+	1489, 3263, 1490, 1491, 3591, 2123, 3264, 2030, 684, 2836,
+	1764, 4073, 3261, 2813, 1764, 3957, 1489, 3262, 1490, 1491,
+	3590, 2805, 1764, 3265, 684, 2927, 2928, 3628, 3629, 3630,
+	3260, 684, 2796, 1764, 1489, 3259, 1490, 1491, 2794, 1764,
+	2056, 2057, 684, 684, 684, 684, 684, 684, 684, 2413,
+	1065, 2676, 685, 1781, 2781, 1764, 3579, 1492, 2654, 2072,
+	3746, 1492, 3745, 2779, 1764, 1492, 1489, 2400, 1490, 1491,
+	1489, 3219, 1490, 1491, 2777, 1764, 1492, 2182, 1489, 3218,
+	1490, 1491, 3564, 2653, 4035, 2655, 2842, 2775, 1764, 1489,
+	3563, 1490, 1491, 3761, 2658, 1489, 2659, 1490, 1491, 3567,
+	3759, 1066, 2661, 2624, 2625, 1492, 3228, 2712, 2627, 2020,
+	1034, 1489, 1945, 1490, 1491, 3744, 2830, 2628, 2874, 1068,
+	1489, 3302, 1490, 1491, 2153, 2957, 748, 1069, 2978, 3231,
+	3233, 1489, 2608, 1490, 1491, 2607, 2151, 1050, 3234, 2877,
+	2606, 1492, 2199, 2605, 1489, 1492, 1490, 1491, 2604, 2773,
+	1764, 2603, 1492, 2771, 1764, 2602, 1077, 2769, 1764, 2200,
+	1492, 1191, 2915, 2916, 1190, 1946, 1947, 1948, 2875, 2969,
+	1076, 2440, 3397, 1454, 1050, 2935, 2174, 2163, 2164, 2165,
+	2166, 2176, 2167, 2168, 2169, 2181, 2177, 2170, 2171, 2178,
+	2179, 2180, 2172, 2173, 2175, 1492, 2973, 2767, 1764, 3056,
+	3013, 2914, 2895, 2119, 2117, 2118, 1489, 2122, 1490, 1491,
+	1489, 103, 1490, 1491, 1489, 131, 1490, 1491, 4245, 3569,
+	103, 104, 105, 1492, 2990, 1489, 105, 1490, 1491, 1492,
+	104, 2424, 2425, 2765, 1764, 1492, 2933, 2763, 1764, 42,
+	2865, 1732, 2619, 2904, 3536, 684, 4152, 3547, 2932, 1492,
+	4054, 2934, 2761, 1764, 1489, 3951, 1490, 1491, 1492, 112,
+	2878, 3301, 2880, 2960, 2962, 1492, 1775, 2893, 2931, 1492,
+	111, 2885, 110, 110, 1492, 2406, 2644, 3217, 2907, 2953,
+	105, 1492, 2077, 2937, 1725, 3216, 2890, 2759, 1764, 3011,
+	1489, 4020, 1490, 1491, 1489, 2076, 1490, 1491, 4019, 2941,
+	111, 1489, 3999, 1490, 1491, 1538, 3767, 2944, 3765, 1489,
+	3764, 1490, 1491, 2951, 2506, 2757, 1764, 3757, 2954, 1492,
+	2194, 2755, 1764, 1538, 3637, 2195, 3022, 2753, 1764, 3568,
+	3566, 3333, 2541, 2976, 1892, 2965, 1492, 112, 2979, 2980,
+	1075, 2751, 1764, 3756, 1489, 1492, 1490, 1491, 111, 1492,
+	2749, 1764, 2910, 2975, 1492, 3557, 2666, 2747, 1764, 4232,
+	1492, 2742, 1764, 2257, 1492, 2983, 2665, 2984, 4233, 2987,
+	2988, 2989, 1489, 3502, 1490, 1491, 3730, 1492, 1489, 3019,
+	1490, 1491, 4233, 4232, 1489, 1897, 1490, 1491, 2889, 3120,
+	2702, 112, 2392, 3066, 3067, 3008, 3009, 1492, 1489, 1798,
+	1490, 1491, 111, 1790, 110, 116, 117, 1489, 4041, 1490,
+	1491, 3498, 3018, 3602, 1489, 3, 1490, 1491, 1489, 2091,
+	1490, 1491, 10, 1489, 2089, 1490, 1491, 9, 2738, 1764,
+	1489, 2090, 1490, 1491, 8, 1492, 99, 2736, 1764, 1,
+	1492, 3434, 3045, 2340, 1492, 1042, 2729, 1764, 1457, 1456,
+	3083, 3064, 3433, 3048, 3606, 1492, 2727, 1764, 4164, 2030,
+	701, 2382, 1492, 1730, 4204, 4160, 4161, 1492, 1489, 3425,
+	1490, 1491, 1989, 2372, 1979, 3101, 3102, 3103, 3104, 3105,
+	3106, 3107, 3108, 3109, 3110, 1489, 1492, 1490, 1491, 3423,
+	1765, 2379, 3669, 2308, 1489, 3118, 1490, 1491, 1489, 3952,
+	1490, 1491, 3336, 1489, 1976, 1490, 1491, 2547, 3084, 1489,
+	3635, 1490, 1491, 1489, 2504, 1490, 1491, 1143, 156, 3020,
+	1081, 2462, 2463, 4129, 120, 1101, 1489, 2859, 1490, 1491,
+	119, 2404, 2858, 1726, 1146, 1254, 2854, 2542, 3659, 1060,
+	2958, 2471, 1823, 1821, 1822, 1820, 1489, 2853, 1490, 1491,
+	1825, 1824, 4101, 3405, 2852, 2703, 1492, 3503, 3122, 2851,
+	2082, 684, 3178, 738, 3054, 2930, 732, 3055, 2030, 684,
+	194, 684, 1812, 684, 2449, 1791, 2075, 1185, 2850, 691,
+	2251, 3310, 2580, 697, 1489, 1542, 1490, 1491, 3065, 1489,
+	2070, 1490, 1491, 1489, 3215, 1490, 1491, 2998, 2945, 1095,
+	1087, 3196, 2393, 2879, 1489, 1094, 1490, 1491, 3929, 3185,
+	3187, 1489, 3249, 1490, 1491, 3561, 1489, 3068, 1490, 1491,
+	2440, 3227, 3229, 2897, 3111, 3085, 1492, 3232, 3225, 4034,
+	3758, 3158, 4114, 2955, 1787, 1489, 3523, 1490, 1491, 2343,
+	2675, 2343, 2189, 2518, 3248, 1532, 87, 763, 2849, 2440,
+	2440, 2440, 2440, 2440, 2439, 934, 2526, 1773, 3725, 2109,
+	2334, 2335, 2336, 2337, 2338, 761, 3196, 760, 758, 2440,
+	2881, 1492, 2440, 3186, 3195, 3188, 2911, 2359, 3253, 1492,
+	2362, 2363, 1496, 1495, 969, 3223, 3168, 3169, 3170, 3171,
+	3172, 3270, 2869, 2031, 1492, 1799, 2922, 2442, 2920, 2919,
+	3207, 2617, 2345, 2447, 2345, 1489, 3587, 1490, 1491, 3213,
+	1492, 3583, 4156, 2441, 3220, 2437, 2380, 3222, 2840, 1492,
+	2888, 920, 919, 1053, 3235, 3236, 2442, 2442, 2442, 2442,
+	2442, 770, 762, 752, 3272, 3353, 983, 3273, 918, 1055,
+	1492, 917, 3363, 3364, 1492, 3361, 2442, 3255, 3256, 2442,
+	3258, 3252, 1492, 106, 107, 3254, 3266, 3274, 3257, 1054,
+	3208, 3210, 3212, 2839, 1492, 3028, 3378, 3030, 3280, 2956,
+	3221, 2838, 3374, 1473, 684, 1489, 1749, 1490, 1491, 1752,
+	3312, 684, 1492, 3311, 2401, 3313, 2837, 1492, 1114, 3402,
+	4060, 2643, 684, 684, 3431, 1748, 684, 4067, 2620, 3314,
+	3315, 3344, 2834, 3653, 3362, 3366, 3325, 3004, 684, 2534,
+	69, 2829, 46, 4029, 4098, 684, 2506, 3334, 3355, 3365,
+	1489, 912, 1490, 1491, 909, 3372, 3727, 3728, 1489, 3729,
+	1490, 1491, 2822, 3238, 3181, 3182, 2821, 1720, 1492, 4080,
+	4081, 684, 1718, 1489, 2820, 1490, 1491, 1716, 2631, 3390,
+	1717, 1715, 3393, 1719, 3392, 908, 2819, 3400, 3244, 1489,
+	4082, 1490, 1491, 3244, 2246, 1467, 1464, 3410, 1489, 4177,
+	1490, 1491, 3407, 3408, 2818, 3409, 2084, 98, 3411, 2817,
+	3413, 36, 3415, 3426, 3427, 3428, 3429, 3430, 35, 1489,
+	34, 1490, 1491, 1489, 33, 1490, 1491, 32, 26, 25,
+	24, 1489, 23, 1490, 1491, 2923, 2926, 2927, 2928, 2924,
+	22, 2925, 2929, 1489, 29, 1490, 1491, 19, 21, 20,
+	1545, 18, 2662, 3347, 1545, 4199, 2667, 1538, 4244, 2030,
+	2816, 1489, 125, 1490, 1491, 55, 1489, 52, 1490, 1491,
+	3548, 50, 3550, 133, 132, 53, 49, 1228, 3335, 2670,
+	47, 2671, 96, 31, 30, 17, 3518, 2679, 16, 15,
+	14, 2681, 2682, 3522, 13, 12, 11, 7, 6, 39,
 	2688, 2689, 2690, 2691, 2692, 2693, 2694, 2695, 2696, 2697,
-	1489, 2699, 1490, 1491, 40, 1489, 4, 1490, 1491, 2991,
-	3247, 2536, 1489, 3401, 1490, 1491, 0, 0, 0, 0,
-	0, 0, 2440, 0, 2705, 2706, 2707, 2708, 1726, 2710,
-	2711, 3549, 2713, 3551, 0, 3600, 2715, 3558, 3553, 0,
-	2720, 2721, 3565, 2722, 0, 0, 2725, 2726, 2728, 2730,
+	38, 2699, 37, 28, 27, 40, 4, 1489, 2991, 1490,
+	1491, 2536, 0, 0, 3401, 3247, 0, 0, 0, 0,
+	0, 0, 2440, 0, 2705, 2706, 2707, 2708, 0, 2710,
+	2711, 3549, 2713, 3551, 0, 3600, 2715, 0, 3565, 0,
+	2720, 2721, 3558, 2722, 0, 0, 2725, 2726, 2728, 2730,
 	2731, 2732, 2733, 2734, 2735, 2737, 2739, 2740, 2741, 2743,
-	3356, 2745, 2746, 2748, 2750, 2752, 2754, 2756, 2758, 2760,
+	1492, 2745, 2746, 2748, 2750, 2752, 2754, 2756, 2758, 2760,
 	2762, 2764, 2766, 2768, 2770, 2772, 2774, 2776, 2778, 2780,
-	2782, 2783, 2784, 750, 2786, 3592, 2788, 3595, 2790, 2791,
-	3589, 2793, 2795, 2797, 2442, 3570, 3525, 2800, 3527, 3528,
-	3529, 2804, 0, 3365, 3362, 2809, 2810, 2811, 2812, 3366,
-	1733, 3601, 3594, 3395, 3396, 0, 0, 1492, 2823, 2824,
-	2825, 2826, 2827, 2828, 3555, 1492, 2832, 2833, 0, 3662,
-	3663, 0, 0, 0, 2835, 3617, 0, 3619, 1492, 2841,
-	0, 0, 1492, 0, 2844, 2845, 2846, 2847, 2848, 0,
-	3611, 3612, 1492, 0, 0, 2855, 2856, 3582, 2857, 1492,
-	0, 2860, 2862, 2404, 1492, 2864, 0, 0, 1492, 683,
-	0, 0, 1492, 0, 0, 2876, 3596, 3597, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 1492, 0, 1037,
-	0, 3664, 0, 0, 1074, 2894, 1492, 1080, 1080, 0,
-	1492, 0, 3645, 0, 1492, 0, 3649, 3650, 3651, 2815,
-	0, 0, 0, 0, 0, 1492, 0, 2814, 2923, 2926,
-	2927, 2928, 2924, 0, 2925, 2929, 0, 0, 3585, 3586,
-	2808, 0, 0, 1109, 2807, 0, 0, 0, 0, 1492,
-	3680, 0, 0, 0, 2806, 1492, 0, 0, 0, 3691,
-	1492, 2803, 0, 0, 0, 0, 2802, 0, 1492, 0,
-	2801, 0, 1492, 0, 2799, 0, 1489, 0, 1490, 1491,
-	1492, 0, 0, 0, 1489, 0, 1490, 1491, 3713, 2792,
-	1492, 3732, 0, 3733, 3734, 3735, 0, 1489, 2789, 1490,
-	1491, 1489, 2787, 1490, 1491, 1492, 2785, 3742, 0, 0,
-	3749, 1489, 3751, 1490, 1491, 0, 0, 2744, 1489, 0,
-	1490, 1491, 0, 1489, 3722, 1490, 1491, 1489, 0, 1490,
-	1491, 1489, 0, 1490, 1491, 3248, 0, 3752, 87, 0,
-	3248, 2724, 3685, 0, 0, 0, 1489, 2723, 1490, 1491,
-	0, 0, 2719, 0, 0, 1489, 2153, 1490, 1491, 1489,
-	2717, 1490, 1491, 1489, 2709, 1490, 1491, 0, 0, 2151,
-	0, 3782, 2680, 3753, 1489, 3772, 1490, 1491, 3762, 3761,
-	0, 0, 2674, 0, 0, 0, 3774, 3769, 0, 3771,
-	0, 0, 0, 0, 0, 3641, 3642, 2669, 1489, 0,
-	1490, 1491, 0, 0, 1489, 3934, 1490, 1491, 0, 1489,
-	42, 1490, 1491, 0, 0, 0, 3786, 1489, 0, 1490,
-	1491, 1489, 0, 1490, 1491, 0, 0, 0, 0, 1489,
-	0, 1490, 1491, 0, 0, 0, 0, 0, 0, 1489,
-	0, 1490, 1491, 0, 0, 0, 0, 3926, 3925, 0,
-	3953, 3941, 0, 0, 1489, 0, 1490, 1491, 3924, 0,
-	0, 3946, 3945, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 1754, 0, 0, 0, 0, 3096, 3097,
-	3098, 3099, 3100, 3992, 2153, 3993, 3776, 1762, 0, 0,
-	1755, 3750, 0, 0, 0, 0, 0, 2151, 3115, 3996,
-	0, 0, 0, 0, 0, 0, 0, 0, 3783, 3784,
-	0, 0, 3936, 3937, 3938, 2398, 2399, 1761, 1759, 1760,
-	1756, 0, 1757, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 4041, 3248, 3244, 3999, 3778, 0, 0,
-	4002, 0, 0, 0, 0, 1758, 4032, 0, 1563, 1564,
-	1565, 1566, 1567, 1568, 1569, 1570, 1571, 1572, 1573, 1574,
-	1575, 1576, 1577, 1578, 1579, 1580, 1581, 1583, 1584, 1585,
-	1586, 1587, 1588, 1589, 1590, 1591, 1592, 1593, 1594, 1595,
-	1596, 1597, 1598, 1599, 1600, 1601, 1602, 1603, 1604, 1605,
-	1606, 1607, 1608, 1609, 1610, 1611, 1612, 1613, 1614, 1615,
-	1616, 1617, 1618, 1619, 1620, 1621, 1622, 1623, 1624, 1625,
-	1626, 1627, 1628, 1629, 1630, 1631, 1632, 1633, 1634, 1635,
-	1636, 1637, 1638, 1639, 1640, 1641, 1642, 1643, 1644, 1645,
-	1646, 1647, 1648, 1649, 1650, 1651, 1652, 1653, 1654, 1655,
-	1656, 1657, 1658, 1659, 1660, 1662, 1663, 1664, 1665, 1666,
-	1667, 1668, 1669, 1670, 1671, 1672, 1673, 1674, 1675, 1676,
-	1677, 1683, 1684, 1685, 1686, 1700, 1701, 1702, 1703, 1704,
-	1705, 1706, 1707, 1708, 1709, 1710, 1711, 1712, 1713, 3997,
-	4042, 3247, 4026, 4016, 4025, 0, 3247, 0, 1754, 4045,
-	4022, 0, 4024, 4060, 0, 0, 0, 0, 0, 0,
-	0, 3929, 1762, 0, 0, 1755, 0, 0, 0, 0,
-	3250, 87, 0, 0, 0, 0, 0, 0, 0, 0,
-	4044, 0, 0, 0, 1726, 0, 0, 0, 3268, 0,
-	1750, 1751, 1761, 1759, 1760, 1756, 4062, 1757, 4049, 0,
-	0, 0, 4065, 0, 0, 0, 0, 0, 0, 0,
-	0, 3933, 0, 0, 0, 0, 0, 0, 0, 4067,
-	1758, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	4074, 0, 0, 42, 0, 0, 0, 0, 4084, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 1229, 4085, 1235, 0, 4086, 0, 0, 0, 4110,
-	0, 0, 0, 0, 87, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 4095, 0, 0, 4104, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 4046, 0, 1493, 0, 0, 0, 0,
-	1726, 3953, 4130, 4141, 4127, 4119, 3399, 4124, 4121, 4120,
-	4118, 4123, 4114, 4122, 4116, 1463, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 1551, 0, 3416, 3417,
-	3247, 3418, 3420, 3422, 4149, 4172, 42, 0, 4162, 0,
-	0, 0, 0, 0, 4154, 4167, 0, 0, 0, 0,
-	0, 0, 0, 4180, 0, 0, 0, 0, 0, 3435,
-	4141, 4182, 4193, 0, 3438, 0, 3440, 3441, 3442, 3444,
+	2782, 2783, 2784, 3356, 2786, 3592, 2788, 3595, 2790, 2791,
+	3594, 2793, 2795, 2797, 3362, 3366, 3570, 2800, 3601, 2442,
+	3589, 2804, 3553, 0, 0, 2809, 2810, 2811, 2812, 3365,
+	1492, 3618, 0, 3620, 0, 1492, 0, 0, 2823, 2824,
+	2825, 2826, 2827, 2828, 3555, 1492, 2832, 2833, 3663, 3664,
+	0, 0, 0, 0, 2835, 0, 1492, 3395, 3396, 2841,
+	3612, 3613, 1492, 0, 2844, 2845, 2846, 2847, 2848, 0,
+	0, 0, 2815, 0, 1492, 2855, 2856, 3582, 2857, 0,
+	0, 2860, 2862, 2404, 1492, 2864, 3525, 0, 3527, 3528,
+	3529, 1492, 684, 0, 0, 2876, 3596, 3597, 0, 0,
+	1976, 0, 0, 1492, 0, 0, 0, 1492, 0, 0,
+	0, 3665, 3646, 0, 0, 2894, 3650, 3651, 3652, 0,
+	1492, 0, 2814, 0, 1492, 0, 2683, 2808, 0, 1489,
+	0, 1490, 1491, 0, 0, 0, 3681, 2807, 0, 0,
+	1492, 0, 0, 2698, 0, 0, 0, 0, 2806, 0,
+	0, 684, 0, 0, 2803, 0, 684, 1492, 0, 0,
+	0, 1492, 0, 0, 0, 3692, 2802, 0, 1492, 0,
+	0, 0, 0, 0, 0, 0, 2801, 0, 0, 1489,
+	0, 1490, 1491, 2799, 1489, 0, 1490, 1491, 0, 0,
+	1492, 0, 0, 0, 1489, 2792, 1490, 1491, 1492, 2789,
+	3733, 0, 3734, 3735, 3736, 1489, 0, 1490, 1491, 0,
+	0, 1489, 2787, 1490, 1491, 0, 2785, 3743, 0, 0,
+	3750, 0, 3752, 1489, 0, 1490, 1491, 0, 0, 3723,
+	1492, 684, 2744, 1489, 0, 1490, 1491, 0, 0, 0,
+	1489, 0, 1490, 1491, 0, 3248, 0, 3753, 87, 2724,
+	3248, 1492, 1489, 2723, 1490, 1491, 1489, 0, 1490, 1491,
+	2719, 0, 0, 0, 0, 2153, 0, 0, 0, 1489,
+	0, 1490, 1491, 1489, 0, 1490, 1491, 2151, 1492, 0,
+	3783, 3754, 2717, 3762, 1538, 3763, 0, 3775, 0, 1489,
+	2709, 1490, 1491, 0, 3773, 3686, 3772, 684, 684, 684,
+	684, 684, 684, 3770, 0, 0, 1489, 0, 1490, 1491,
+	1489, 0, 1490, 1491, 0, 0, 3935, 1489, 0, 1490,
+	1491, 0, 2680, 3787, 0, 42, 684, 684, 3642, 3643,
+	0, 0, 0, 0, 0, 0, 0, 0, 2380, 1489,
+	0, 1490, 1491, 2674, 0, 0, 0, 1489, 0, 1490,
+	1491, 684, 0, 0, 0, 3927, 3926, 2923, 2926, 2927,
+	2928, 2924, 0, 2925, 2929, 0, 3954, 3585, 3586, 3925,
+	2669, 3942, 3947, 3946, 0, 0, 0, 0, 0, 1489,
+	0, 1490, 1491, 0, 0, 0, 0, 0, 3096, 3097,
+	3098, 3099, 3100, 3993, 2153, 3994, 0, 3777, 0, 0,
+	1489, 0, 1490, 1491, 0, 0, 2151, 0, 3115, 3997,
+	3751, 0, 0, 3937, 3938, 3939, 0, 0, 3784, 3785,
+	0, 0, 0, 0, 0, 0, 0, 1489, 0, 1490,
+	1491, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 4000, 0, 4042, 3248, 4003, 0, 3779, 0,
+	0, 0, 0, 0, 0, 0, 0, 3244, 0, 1563,
+	1564, 1565, 1566, 1567, 1568, 1569, 1570, 1571, 1572, 1573,
+	1574, 1575, 1576, 1577, 1578, 1579, 1580, 1581, 1583, 1584,
+	1585, 1586, 1587, 1588, 1589, 1590, 1591, 1592, 1593, 1594,
+	1595, 1596, 1597, 1598, 1599, 1600, 1601, 1602, 1603, 1604,
+	1605, 1606, 1607, 1608, 1609, 1610, 1611, 1612, 1613, 1614,
+	1615, 1616, 1617, 1618, 1619, 1620, 1621, 1622, 1623, 1624,
+	1625, 1626, 1627, 1628, 1629, 1630, 1631, 1632, 1633, 1634,
+	1635, 1636, 1637, 1638, 1639, 1640, 1641, 1642, 1643, 1644,
+	1645, 1646, 1647, 1648, 1649, 1650, 1651, 1652, 1653, 1654,
+	1655, 1656, 1657, 1658, 1659, 1660, 1662, 1663, 1664, 1665,
+	1666, 1667, 1668, 1669, 1670, 1671, 1672, 1673, 1674, 1675,
+	1676, 1677, 1683, 1684, 1685, 1686, 1700, 1701, 1702, 1703,
+	1704, 1705, 1706, 1707, 1708, 1709, 1710, 1711, 1712, 1713,
+	750, 3998, 4043, 4027, 4026, 0, 3247, 3086, 1081, 0,
+	684, 3247, 0, 4017, 4061, 0, 0, 0, 0, 0,
+	4023, 0, 4025, 0, 0, 0, 0, 0, 0, 0,
+	3250, 0, 87, 1538, 0, 0, 0, 4045, 1538, 684,
+	684, 684, 684, 684, 1754, 3930, 0, 0, 3268, 0,
+	0, 3267, 0, 4046, 0, 1754, 0, 1976, 1762, 684,
+	4050, 1755, 684, 3275, 2030, 4066, 4063, 0, 0, 1762,
+	0, 4068, 1755, 0, 0, 0, 0, 3934, 0, 0,
+	0, 0, 0, 0, 0, 0, 2398, 2399, 1761, 1759,
+	1760, 1756, 0, 1757, 0, 0, 0, 1750, 1751, 1761,
+	1759, 1760, 1756, 0, 1757, 0, 0, 684, 0, 42,
+	0, 1074, 0, 0, 1080, 1080, 1758, 0, 0, 0,
+	0, 0, 0, 1538, 0, 0, 4086, 1758, 0, 4087,
+	4111, 0, 0, 684, 0, 87, 0, 4096, 0, 3160,
+	0, 3162, 0, 0, 0, 0, 0, 684, 0, 0,
+	0, 0, 4105, 0, 0, 0, 0, 3173, 3174, 3175,
+	3176, 0, 0, 0, 0, 0, 4117, 0, 684, 0,
+	0, 684, 0, 4142, 4115, 4128, 3399, 3954, 4131, 4120,
+	4125, 4122, 0, 4121, 4119, 4124, 4123, 4047, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 3416, 3417,
+	0, 3418, 3420, 3422, 4150, 0, 3247, 0, 0, 0,
+	0, 0, 42, 0, 4173, 4155, 4163, 4168, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 3435,
+	4142, 4183, 0, 4194, 3438, 0, 3440, 3441, 3442, 3444,
 	3445, 3446, 3447, 3448, 3449, 3450, 3451, 3452, 3453, 3454,
 	3455, 3456, 3458, 3460, 3462, 3464, 3466, 3468, 3470, 3472,
 	3474, 3476, 3478, 3480, 3482, 3484, 3486, 3488, 3489, 3491,
-	3492, 3493, 3495, 4197, 4216, 3497, 4192, 3499, 3500, 3501,
-	4111, 2153, 3505, 3506, 3507, 3508, 3509, 3510, 3511, 3512,
-	3513, 3514, 3515, 4222, 2151, 4229, 4226, 4227, 4225, 4223,
-	2031, 3521, 4213, 4051, 4212, 3526, 4106, 4141, 4237, 3530,
-	3531, 0, 3532, 3534, 0, 3537, 3539, 4251, 3541, 3542,
-	3543, 3544, 0, 4253, 3244, 4245, 0, 0, 3552, 0,
-	1032, 0, 0, 2347, 0, 0, 1033, 4070, 0, 2153,
-	0, 0, 4261, 0, 0, 0, 2152, 4262, 4263, 0,
-	3993, 0, 2151, 0, 4260, 0, 0, 0, 0, 4058,
-	0, 0, 0, 3576, 3577, 0, 0, 3581, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 4188,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	4196, 0, 0, 0, 0, 0, 0, 0, 0, 1841,
-	0, 0, 0, 0, 4105, 989, 990, 991, 992, 993,
-	994, 995, 996, 997, 998, 999, 1000, 1001, 1002, 1003,
-	1004, 1005, 1006, 1007, 1008, 1009, 1010, 1011, 1012, 1013,
-	1014, 1015, 1016, 1017, 1018, 1019, 1020, 1021, 1022, 1023,
-	1024, 1025, 1026, 1027, 1028, 1029, 1030, 0, 0, 0,
-	0, 0, 3656, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 1789,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 3675, 0, 0,
-	3679, 0, 0, 0, 1801, 0, 0, 1878, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 1818, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 3692, 0, 0, 4210, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 1828, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	965, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 3715, 0,
-	0, 0, 0, 0, 0, 0, 1959, 0, 0, 0,
-	0, 3723, 0, 0, 0, 0, 0, 0, 3730, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 2036, 197, 0, 0, 197,
-	1842, 2004, 0, 736, 0, 0, 0, 0, 742, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 2032, 197,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 2043, 197, 0, 0, 0, 0,
-	0, 2047, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 2058, 2059, 2060, 2061, 2062, 2063, 2064, 0,
-	0, 0, 742, 197, 742, 0, 1855, 1858, 1859, 1860,
-	1861, 1862, 1863, 0, 1864, 1865, 1867, 1868, 1866, 1869,
-	1870, 1843, 1844, 1845, 1846, 1826, 1827, 1856, 0, 1829,
-	0, 1830, 1831, 1832, 1833, 1834, 1835, 1836, 1837, 1838,
-	0, 0, 1839, 1847, 1848, 1849, 1850, 3942, 1851, 1852,
-	1853, 1854, 0, 0, 1840, 0, 3949, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 3959, 3960, 3961, 0,
-	3963, 0, 3964, 3965, 0, 0, 0, 0, 3968, 3969,
+	3492, 3493, 3495, 4198, 4217, 3497, 4214, 3499, 3500, 3501,
+	2031, 2153, 3505, 3506, 3507, 3508, 3509, 3510, 3511, 3512,
+	3513, 3514, 3515, 2151, 4224, 4230, 4227, 4228, 4223, 4226,
+	4193, 3521, 4213, 4107, 4181, 3526, 192, 4142, 4238, 3530,
+	3531, 0, 3532, 3534, 0, 3537, 3539, 4246, 3541, 3542,
+	3543, 3544, 4252, 4254, 4112, 0, 0, 4052, 3552, 131,
+	192, 0, 0, 0, 0, 0, 684, 3244, 0, 2153,
+	0, 2997, 0, 0, 4262, 174, 0, 4263, 4264, 0,
+	3994, 2151, 0, 131, 4261, 153, 0, 0, 0, 0,
+	0, 4071, 0, 3576, 3577, 4059, 0, 3581, 0, 174,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 2952, 684, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 164, 0, 171, 0, 0, 172, 152,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 684, 0, 0, 0, 0, 0, 0, 0, 171,
+	0, 0, 172, 0, 191, 0, 0, 0, 0, 0,
+	0, 684, 0, 684, 684, 684, 0, 0, 4106, 0,
+	4189, 0, 0, 0, 1900, 1901, 163, 162, 191, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 3657, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 192, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 131, 0, 0, 3676, 0, 0,
+	3680, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	174, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 175,
+	0, 0, 0, 0, 3693, 0, 0, 0, 181, 0,
+	157, 1902, 160, 0, 1899, 0, 158, 159, 0, 0,
+	0, 0, 0, 175, 0, 0, 0, 0, 0, 0,
+	0, 4211, 181, 0, 0, 0, 1726, 0, 0, 0,
+	171, 0, 0, 172, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 3716, 191,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 3724, 0, 0, 0, 0, 0, 0, 3731, 0,
+	0, 0, 0, 0, 0, 0, 0, 86, 44, 45,
+	88, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 92, 0, 0, 0,
+	48, 76, 77, 1976, 74, 78, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 75, 166, 0, 0,
+	0, 0, 1538, 0, 0, 0, 1976, 0, 97, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 166, 0, 0, 0, 0, 0, 0, 62, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	95, 0, 0, 0, 175, 0, 0, 0, 0, 0,
+	0, 0, 0, 181, 0, 0, 0, 0, 0, 0,
+	0, 0, 1493, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 3943, 0,
+	0, 0, 0, 1976, 0, 0, 0, 3950, 0, 0,
+	83, 0, 0, 1551, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 3960, 3961, 3962,
+	0, 3964, 0, 3965, 3966, 0, 0, 161, 0, 3969,
 	3970, 3971, 3972, 3973, 3974, 3975, 3976, 3977, 3978, 3979,
 	3980, 3981, 3982, 3983, 3984, 3985, 3986, 3987, 3988, 3989,
-	0, 3991, 3994, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 4003, 4004, 4005,
-	4006, 4007, 4009, 4010, 4012, 4014, 4015, 4017, 0, 0,
-	0, 4021, 0, 0, 0, 4023, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	4050, 0, 2104, 2105, 2106, 2107, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 2097, 0, 0, 2120, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 2159, 2160, 0, 0, 0, 0, 2183,
-	0, 0, 2187, 2188, 0, 0, 0, 2193, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 1857,
-	0, 0, 2205, 2206, 2207, 2208, 2209, 2210, 2211, 2212,
-	2213, 2214, 0, 2216, 0, 0, 0, 2238, 2239, 2240,
-	2241, 2242, 2243, 2244, 2245, 2247, 0, 2252, 0, 2254,
-	2255, 2256, 0, 2258, 2259, 2260, 0, 2262, 2263, 2264,
-	2265, 2266, 2267, 2268, 2269, 2270, 2271, 2272, 2273, 2274,
-	2275, 2276, 2277, 2278, 2279, 2280, 2281, 2282, 2283, 2284,
-	2285, 2286, 2287, 2288, 2289, 2290, 2291, 2292, 2293, 2294,
-	2295, 2296, 2297, 2298, 2299, 2300, 2301, 2302, 2303, 2304,
-	2305, 2306, 2307, 2311, 2312, 2313, 2314, 2315, 2316, 2317,
-	2318, 2319, 2320, 2321, 2322, 2323, 2324, 2325, 2326, 2327,
-	2328, 2329, 2330, 2331, 2332, 2333, 0, 0, 0, 0,
-	0, 2339, 0, 2341, 0, 2348, 2349, 2350, 2351, 2352,
-	2353, 0, 0, 0, 0, 0, 0, 4075, 0, 0,
-	0, 0, 0, 0, 2364, 2365, 2366, 2367, 2368, 2369,
-	2370, 2371, 0, 2373, 2374, 2375, 2376, 2377, 0, 0,
-	0, 4090, 0, 0, 0, 0, 0, 4093, 0, 4094,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 4109, 1080, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 192, 4135, 4136,
-	0, 0, 0, 0, 0, 0, 0, 0, 2997, 2420,
-	2421, 0, 4143, 4145, 4147, 0, 0, 0, 0, 0,
-	131, 0, 153, 0, 0, 0, 0, 0, 0, 0,
-	4153, 0, 192, 0, 0, 2459, 174, 0, 0, 0,
-	0, 2426, 4175, 0, 0, 0, 0, 0, 0, 2430,
-	0, 2433, 0, 0, 2097, 131, 0, 153, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	164, 174, 0, 0, 0, 0, 152, 0, 0, 0,
-	4194, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 197, 0, 197, 0, 0, 171, 2502, 0, 172,
-	0, 0, 0, 0, 0, 164, 0, 0, 0, 0,
-	0, 152, 0, 0, 4217, 4219, 4221, 0, 0, 0,
-	0, 1900, 1901, 163, 162, 191, 0, 0, 0, 0,
-	742, 171, 742, 742, 172, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 4242, 0, 0,
-	0, 0, 0, 0, 742, 197, 140, 141, 163, 162,
-	191, 0, 0, 0, 0, 4254, 4255, 0, 0, 0,
-	0, 0, 0, 0, 86, 44, 45, 88, 0, 0,
-	0, 0, 0, 1537, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 92, 0, 0, 0, 48, 76, 77,
-	0, 74, 78, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 75, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 97, 0, 157, 1902, 160,
-	1032, 1899, 0, 158, 159, 0, 1033, 0, 0, 0,
-	175, 0, 0, 0, 0, 62, 2152, 0, 0, 181,
-	0, 0, 0, 0, 2097, 0, 0, 95, 0, 0,
-	0, 2592, 157, 138, 160, 145, 137, 0, 158, 159,
-	0, 0, 2613, 2614, 0, 175, 2618, 0, 0, 0,
-	0, 0, 0, 0, 181, 146, 0, 0, 2623, 0,
-	0, 0, 0, 0, 0, 2626, 0, 0, 0, 149,
-	147, 142, 143, 144, 148, 0, 0, 83, 0, 0,
-	0, 139, 0, 0, 0, 0, 0, 0, 0, 0,
-	150, 2629, 0, 0, 0, 989, 990, 991, 992, 993,
-	994, 995, 996, 997, 998, 999, 1000, 1001, 1002, 1003,
-	1004, 1005, 1006, 1007, 1008, 1009, 1010, 1011, 1012, 1013,
-	1014, 1015, 1016, 1017, 1018, 1019, 1020, 1021, 1022, 1023,
-	1024, 1025, 1026, 1027, 1028, 1029, 1030, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 166, 0,
+	3990, 0, 3992, 3995, 0, 0, 3714, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 4004, 4005,
+	4006, 4007, 4008, 4010, 4011, 4013, 4015, 4016, 4018, 0,
+	0, 0, 4022, 0, 0, 0, 4024, 0, 0, 0,
+	0, 0, 166, 0, 0, 51, 54, 57, 56, 59,
+	0, 73, 0, 0, 82, 79, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 4051, 0, 0, 0, 0, 0, 0, 61, 91,
+	90, 0, 0, 71, 72, 58, 154, 0, 0, 155,
+	0, 80, 81, 0, 0, 0, 167, 0, 0, 0,
+	0, 0, 0, 179, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	167, 0, 0, 0, 0, 0, 0, 179, 0, 0,
+	0, 0, 0, 0, 0, 63, 64, 0, 65, 66,
+	67, 68, 0, 0, 187, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 187, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 168, 173, 170, 176, 177, 178, 180, 182, 183,
+	184, 185, 60, 0, 0, 0, 0, 186, 188, 189,
+	190, 0, 0, 0, 0, 168, 173, 170, 176, 177,
+	178, 180, 182, 183, 184, 185, 0, 0, 1976, 0,
+	0, 186, 188, 189, 190, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 1789, 684, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 4033, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 4076, 0,
+	0, 167, 0, 0, 1878, 0, 0, 0, 179, 0,
+	0, 0, 89, 0, 4197, 0, 0, 0, 0, 0,
+	0, 0, 4091, 1841, 0, 0, 0, 0, 4094, 0,
+	4095, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 187,
+	0, 0, 1538, 4110, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 965, 0, 4136,
+	4137, 4130, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 4144, 4146, 4148, 168, 173, 170, 176,
+	177, 178, 180, 182, 183, 184, 185, 0, 0, 0,
+	0, 4154, 186, 188, 189, 190, 0, 0, 0, 0,
+	0, 1976, 94, 4176, 0, 0, 0, 0, 0, 0,
+	0, 0, 2036, 197, 0, 0, 197, 0, 0, 0,
+	736, 0, 0, 0, 0, 742, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 197, 0, 0, 0,
+	0, 4195, 0, 1726, 0, 0, 0, 0, 0, 0,
+	0, 0, 197, 0, 0, 0, 0, 0, 0, 0,
+	1828, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 2030, 0, 0, 0, 4218, 4220, 4222, 0, 742,
+	197, 742, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 4075,
+	0, 0, 0, 0, 0, 0, 0, 4085, 4243, 0,
+	0, 0, 0, 70, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 4255, 4256, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 964, 0, 0, 1842, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 51, 54, 57, 56, 59, 0, 73, 0,
-	0, 82, 79, 166, 0, 2678, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 2684, 2685, 2686, 2687, 0,
-	0, 0, 0, 0, 0, 61, 91, 90, 0, 0,
-	71, 72, 58, 0, 0, 0, 197, 0, 80, 81,
-	742, 742, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 1841, 0, 0, 0, 197,
-	1551, 0, 0, 0, 161, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 1726,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 742, 63, 64, 197, 65, 66, 67, 68, 0,
-	0, 0, 0, 0, 0, 0, 742, 0, 0, 161,
-	0, 0, 0, 197, 0, 0, 0, 742, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 742, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	742, 0, 742, 0, 0, 0, 0, 0, 0, 60,
-	742, 0, 0, 1537, 742, 0, 0, 742, 742, 742,
-	742, 0, 742, 0, 742, 742, 0, 742, 742, 742,
-	742, 742, 742, 154, 0, 0, 155, 0, 0, 0,
-	1537, 742, 742, 1537, 742, 1537, 197, 742, 0, 0,
+	0, 0, 0, 719, 0, 0, 0, 0, 0, 741,
+	1855, 1858, 1859, 1860, 1861, 1862, 1863, 0, 1864, 1865,
+	1867, 1868, 1866, 1869, 1870, 1843, 1844, 1845, 1846, 1826,
+	1827, 1856, 0, 1829, 0, 1830, 1831, 1832, 1833, 1834,
+	1835, 1836, 1837, 1838, 0, 0, 1839, 1847, 1848, 1849,
+	1850, 0, 1851, 1852, 1853, 1854, 0, 0, 1840, 2104,
+	2105, 2106, 2107, 741, 0, 741, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 2120, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 197, 167, 154, 0,
-	0, 155, 1828, 0, 179, 0, 0, 0, 0, 742,
-	0, 197, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 742, 0, 0, 742, 1789, 197, 197, 89,
-	0, 0, 167, 0, 0, 0, 0, 0, 0, 179,
-	0, 0, 0, 0, 197, 187, 0, 0, 0, 0,
-	0, 197, 0, 0, 0, 0, 0, 0, 0, 0,
-	197, 197, 197, 197, 197, 197, 197, 197, 197, 742,
-	0, 0, 0, 0, 0, 0, 2936, 0, 0, 0,
-	187, 0, 0, 0, 0, 0, 1842, 0, 0, 0,
-	0, 0, 168, 173, 170, 176, 177, 178, 180, 182,
-	183, 184, 185, 0, 0, 0, 0, 0, 186, 188,
-	189, 190, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 168, 173, 170,
-	176, 177, 178, 180, 182, 183, 184, 185, 0, 94,
-	0, 0, 0, 186, 188, 189, 190, 0, 0, 0,
-	0, 2985, 1855, 1858, 1859, 1860, 1861, 1862, 1863, 0,
-	1864, 1865, 1867, 1868, 1866, 1869, 1870, 1843, 1844, 1845,
-	1846, 1826, 1827, 1856, 0, 1829, 0, 1830, 1831, 1832,
-	1833, 1834, 1835, 1836, 1837, 1838, 0, 0, 1839, 1847,
-	1848, 1849, 1850, 0, 1851, 1852, 1853, 1854, 0, 0,
-	1840, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 3033, 3034, 3035,
-	3036, 3037, 3038, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 742,
-	742, 0, 0, 0, 0, 0, 2097, 3049, 0, 3061,
-	70, 0, 0, 0, 742, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 197, 0, 0, 0, 0,
-	0, 3057, 0, 0, 0, 0, 3087, 3088, 3089, 0,
-	0, 3091, 0, 0, 3093, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 3112, 3113, 3114, 0, 0, 0,
-	0, 0, 0, 3119, 0, 742, 0, 0, 3121, 0,
-	0, 3123, 3124, 3125, 0, 1537, 0, 3126, 3127, 0,
-	0, 3128, 0, 3129, 0, 0, 0, 0, 0, 0,
-	3130, 0, 3131, 1537, 0, 0, 3132, 0, 3133, 0,
-	0, 3134, 0, 3135, 0, 3136, 0, 3137, 0, 3138,
-	0, 3139, 0, 3140, 0, 3141, 0, 3142, 0, 3143,
-	0, 3144, 0, 3145, 0, 3146, 0, 3147, 0, 3148,
-	0, 3149, 0, 3150, 0, 3151, 0, 0, 0, 3152,
-	0, 3153, 0, 3154, 0, 0, 3155, 0, 3156, 0,
-	3157, 0, 2311, 3159, 0, 1857, 3161, 0, 0, 3163,
-	3164, 3165, 3166, 0, 0, 0, 0, 3167, 2311, 2311,
-	2311, 2311, 2311, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 3177, 0, 0, 0, 0, 0, 0,
-	0, 3190, 0, 0, 3194, 0, 0, 0, 0, 0,
-	0, 0, 0, 3197, 3198, 3199, 3200, 3201, 3202, 0,
-	0, 0, 3203, 3204, 0, 3205, 0, 3206, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 2358,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 1080, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 964, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 3239, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 197, 0, 0, 0, 0, 742,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 3269,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 197,
-	0, 0, 742, 0, 0, 0, 719, 0, 0, 0,
-	0, 0, 741, 0, 0, 0, 0, 0, 0, 0,
-	0, 197, 0, 0, 0, 742, 0, 0, 2358, 197,
-	0, 197, 0, 197, 197, 0, 0, 0, 0, 3331,
-	0, 0, 0, 0, 0, 0, 0, 0, 742, 0,
-	0, 0, 0, 0, 0, 0, 0, 3321, 0, 0,
-	0, 0, 0, 0, 0, 0, 741, 0, 741, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 3359, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 3373, 0, 0,
-	0, 0, 0, 0, 0, 0, 742, 0, 0, 0,
-	0, 0, 0, 742, 742, 742, 197, 0, 3391, 0,
-	0, 3394, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 742, 0, 3424, 0, 0, 0,
-	742, 742, 0, 0, 742, 0, 742, 0, 0, 0,
-	0, 0, 742, 0, 921, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 3439, 0, 0, 0, 0, 0,
+	2159, 2160, 0, 0, 0, 0, 2183, 0, 0, 2187,
+	2188, 0, 0, 0, 2193, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 2205,
+	2206, 2207, 2208, 2209, 2210, 2211, 2212, 2213, 2214, 0,
+	2216, 0, 0, 0, 2238, 2239, 2240, 2241, 2242, 2243,
+	2244, 2245, 2247, 0, 2252, 0, 2254, 2255, 2256, 0,
+	2258, 2259, 2260, 0, 2262, 2263, 2264, 2265, 2266, 2267,
+	2268, 2269, 2270, 2271, 2272, 2273, 2274, 2275, 2276, 2277,
+	2278, 2279, 2280, 2281, 2282, 2283, 2284, 2285, 2286, 2287,
+	2288, 2289, 2290, 2291, 2292, 2293, 2294, 2295, 2296, 2297,
+	2298, 2299, 2300, 2301, 2302, 2303, 2304, 2305, 2306, 2307,
+	2311, 2312, 2313, 2314, 2315, 2316, 2317, 2318, 2319, 2320,
+	2321, 2322, 2323, 2324, 2325, 2326, 2327, 2328, 2329, 2330,
+	2331, 2332, 2333, 0, 0, 0, 0, 0, 2339, 0,
+	2341, 0, 2348, 2349, 2350, 2351, 2352, 2353, 0, 0,
+	0, 0, 0, 1857, 0, 0, 0, 0, 0, 0,
+	0, 2364, 2365, 2366, 2367, 2368, 2369, 2370, 2371, 0,
+	2373, 2374, 2375, 2376, 2377, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 742, 0, 0,
-	0, 0, 742, 0, 0, 0, 742, 742, 0, 0,
-	0, 0, 0, 0, 192, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 1896, 0, 0, 0, 0,
-	0, 0, 740, 0, 0, 0, 0, 131, 0, 153,
-	0, 0, 0, 0, 197, 0, 0, 0, 0, 0,
-	0, 197, 0, 174, 0, 0, 0, 0, 0, 0,
-	0, 0, 197, 197, 0, 0, 197, 0, 197, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 197, 0,
-	0, 0, 0, 0, 0, 197, 1105, 164, 1112, 0,
-	0, 0, 0, 152, 0, 0, 3554, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 197, 0, 171, 0, 0, 172, 0, 197, 0,
-	0, 0, 0, 742, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 1900, 1901,
-	163, 162, 191, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	1080, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 192, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 2420, 2421, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 131, 0, 153,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 3615, 3637, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 1537, 0, 2358,
-	0, 3630, 0, 3631, 3632, 3633, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 3661, 0, 0, 0, 0,
+	0, 0, 2459, 174, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 157, 1902, 160, 0, 1899, 0,
-	158, 159, 0, 0, 0, 0, 0, 175, 0, 0,
-	0, 0, 0, 0, 0, 0, 181, 0, 0, 0,
-	0, 0, 0, 3681, 0, 3682, 0, 3683, 0, 3684,
-	0, 0, 0, 0, 0, 0, 0, 3687, 3688, 0,
-	0, 0, 0, 0, 0, 0, 0, 3693, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 164, 0, 0,
+	0, 0, 0, 152, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 1032, 0, 197, 2347,
+	197, 0, 1033, 171, 2502, 0, 172, 0, 0, 0,
+	0, 0, 2152, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 140, 141,
+	163, 162, 191, 0, 0, 0, 0, 742, 0, 742,
+	742, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 3694, 0, 3695, 0, 3696, 0, 3697, 0, 3698,
-	0, 3699, 0, 3700, 0, 3701, 0, 3702, 0, 3703,
-	0, 3704, 0, 3705, 0, 3706, 0, 3707, 0, 3708,
-	0, 3709, 0, 0, 3710, 0, 0, 0, 3711, 0,
-	3712, 0, 0, 0, 0, 0, 3714, 0, 0, 0,
+	0, 742, 197, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 3731, 0,
-	0, 0, 0, 0, 0, 0, 0, 3736, 0, 3737,
-	3738, 0, 3739, 0, 3740, 166, 0, 0, 0, 3741,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	1537, 989, 990, 991, 992, 993, 994, 995, 996, 997,
+	998, 999, 1000, 1001, 1002, 1003, 1004, 1005, 1006, 1007,
+	1008, 1009, 1010, 1011, 1012, 1013, 1014, 1015, 1016, 1017,
+	1018, 1019, 1020, 1021, 1022, 1023, 1024, 1025, 1026, 1027,
+	1028, 1029, 1030, 0, 157, 138, 160, 145, 137, 0,
+	158, 159, 0, 0, 0, 0, 0, 175, 0, 0,
+	0, 0, 0, 0, 0, 0, 181, 146, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 197, 0, 0, 0, 3770, 0, 0, 0,
-	197, 0, 0, 0, 0, 0, 0, 0, 0, 3779,
-	0, 742, 3781, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 3785, 0, 0, 742, 0, 0,
+	0, 149, 147, 142, 143, 144, 148, 0, 0, 0,
+	0, 0, 0, 139, 0, 0, 0, 0, 0, 0,
+	0, 0, 150, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	3921, 0, 0, 0, 741, 1448, 741, 741, 0, 0,
-	0, 197, 0, 0, 0, 0, 197, 0, 0, 0,
-	0, 161, 0, 0, 0, 0, 0, 0, 741, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 741, 1448, 741, 741, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 1536, 0, 0,
+	0, 0, 0, 0, 0, 741, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 742, 0, 0, 0, 0,
-	0, 197, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 1536, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 166, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 742, 0, 0, 0, 0, 0, 0, 742,
-	0, 0, 0, 742, 742, 0, 0, 0, 742, 0,
-	154, 0, 0, 155, 0, 0, 0, 0, 0, 4031,
-	0, 0, 0, 0, 1537, 742, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 197, 197, 197,
-	197, 197, 197, 0, 167, 0, 0, 0, 0, 0,
-	0, 179, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 197, 197, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 197, 187, 0, 1293, 0, 1293, 1293, 0, 0,
+	0, 0, 2678, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 2684, 2685, 2686, 2687, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 742, 1462, 0,
+	0, 0, 0, 197, 0, 0, 0, 742, 742, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 168,
+	0, 0, 0, 0, 0, 0, 197, 1551, 0, 0,
+	0, 161, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 742, 0,
+	0, 197, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 742, 0, 0, 0, 0, 0, 0,
+	197, 0, 0, 0, 742, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 742, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 742, 0, 742,
+	0, 0, 0, 0, 0, 0, 0, 742, 0, 0,
+	1537, 742, 0, 0, 742, 742, 742, 742, 0, 742,
+	0, 742, 742, 0, 742, 742, 742, 742, 742, 742,
+	154, 0, 0, 155, 0, 0, 0, 1537, 742, 742,
+	1537, 742, 1537, 197, 742, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 197, 167, 0, 0, 0, 0, 0,
+	0, 179, 0, 0, 0, 0, 742, 0, 197, 0,
+	0, 741, 741, 0, 0, 0, 0, 0, 0, 742,
+	0, 0, 742, 1789, 197, 197, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 197, 187, 0, 0, 0, 0, 0, 197, 0,
+	0, 0, 741, 0, 0, 0, 0, 197, 197, 197,
+	197, 197, 197, 197, 197, 197, 742, 741, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 741, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 741, 168,
 	173, 170, 176, 177, 178, 180, 182, 183, 184, 185,
 	0, 0, 0, 0, 0, 186, 188, 189, 190, 0,
-	0, 0, 0, 0, 0, 0, 0, 742, 0, 0,
+	0, 741, 0, 741, 0, 0, 0, 0, 0, 0,
+	0, 741, 0, 0, 1536, 741, 0, 0, 741, 741,
+	741, 741, 0, 741, 0, 741, 741, 0, 741, 741,
+	741, 741, 741, 741, 0, 0, 0, 0, 0, 0,
+	0, 1536, 741, 741, 1536, 741, 1536, 0, 741, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 1733, 0, 0, 0, 0,
+	741, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 741, 0, 0, 741, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 742, 742, 0, 0,
+	0, 0, 0, 0, 683, 0, 3061, 0, 0, 0,
+	741, 742, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 197, 0, 1037, 0, 0, 0, 0, 0,
+	0, 0, 0, 3087, 3088, 3089, 0, 0, 3091, 0,
+	0, 3093, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 3112, 3113, 3114, 0, 0, 0, 0, 1109, 0,
+	3119, 0, 742, 0, 0, 3121, 0, 0, 3123, 3124,
+	3125, 0, 1537, 0, 3126, 3127, 0, 0, 3128, 0,
+	3129, 0, 0, 0, 0, 0, 0, 3130, 0, 3131,
+	1537, 0, 0, 3132, 0, 3133, 0, 0, 3134, 0,
+	3135, 0, 3136, 0, 3137, 0, 3138, 0, 3139, 0,
+	3140, 0, 3141, 0, 3142, 0, 3143, 0, 3144, 0,
+	3145, 0, 3146, 0, 3147, 0, 3148, 0, 3149, 0,
+	3150, 0, 3151, 0, 0, 0, 3152, 0, 3153, 0,
+	3154, 0, 0, 3155, 0, 3156, 0, 3157, 0, 2311,
+	3159, 0, 0, 3161, 0, 0, 3163, 3164, 3165, 3166,
+	0, 0, 0, 0, 3167, 2311, 2311, 2311, 2311, 2311,
+	741, 741, 0, 0, 0, 0, 0, 0, 0, 0,
+	3177, 0, 0, 0, 0, 741, 0, 0, 3190, 0,
+	0, 3194, 0, 0, 0, 0, 0, 0, 0, 0,
+	3197, 3198, 3199, 3200, 3201, 3202, 0, 0, 0, 3203,
+	3204, 0, 3205, 0, 3206, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 2358, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 1080, 0,
+	0, 0, 0, 0, 0, 0, 741, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 1536, 0, 0, 0,
+	0, 3239, 0, 0, 0, 2161, 0, 0, 0, 0,
+	0, 197, 0, 0, 1536, 0, 742, 192, 0, 0,
+	0, 0, 0, 0, 0, 0, 3269, 0, 1896, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 741, 741, 0, 0, 0, 0,
+	131, 0, 153, 0, 0, 0, 197, 0, 0, 742,
+	0, 0, 0, 0, 0, 0, 174, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 197, 0,
+	0, 0, 742, 0, 0, 2358, 197, 0, 197, 0,
+	197, 197, 0, 0, 0, 0, 3331, 0, 0, 0,
+	164, 0, 0, 0, 0, 742, 152, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 4073, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 171, 0, 0, 172,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 741, 4071, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 1841, 0,
+	0, 1900, 1901, 163, 162, 191, 0, 0, 0, 0,
+	741, 0, 0, 742, 0, 0, 0, 0, 0, 0,
+	742, 742, 742, 197, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 742, 0, 3424, 0, 0, 0, 742, 742, 0,
+	0, 742, 0, 742, 0, 0, 0, 0, 0, 742,
 	741, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 741, 4087, 0, 0, 4088, 0, 4089, 0, 0,
-	0, 741, 742, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 742, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 741, 0, 741, 0, 0, 0,
-	0, 0, 0, 0, 741, 0, 0, 1536, 741, 0,
-	0, 741, 741, 741, 741, 742, 741, 0, 741, 741,
-	0, 741, 741, 741, 741, 741, 741, 0, 0, 0,
-	197, 0, 0, 742, 1536, 741, 741, 1536, 741, 1536,
-	0, 741, 0, 0, 0, 0, 0, 0, 0, 742,
-	0, 0, 0, 1537, 0, 0, 742, 742, 1537, 197,
-	197, 197, 197, 197, 0, 0, 0, 0, 0, 4173,
-	0, 197, 0, 741, 0, 0, 0, 197, 0, 197,
-	0, 0, 197, 197, 197, 0, 741, 0, 0, 741,
-	0, 0, 0, 0, 0, 0, 0, 0, 4189, 0,
-	4190, 0, 4191, 0, 1736, 1737, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 197, 0, 0,
-	0, 0, 0, 741, 0, 0, 0, 0, 0, 0,
-	742, 0, 0, 1537, 0, 1795, 0, 0, 742, 0,
-	0, 0, 0, 197, 0, 0, 0, 0, 0, 0,
-	1813, 0, 0, 0, 0, 0, 0, 197, 0, 0,
-	0, 1872, 4240, 0, 4241, 0, 0, 0, 0, 0,
-	0, 1881, 0, 0, 0, 0, 0, 0, 197, 0,
-	0, 197, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 1105, 0, 1908, 0, 0, 0,
-	0, 0, 0, 0, 1917, 0, 0, 0, 1919, 0,
-	0, 1922, 1923, 1925, 1925, 0, 1925, 0, 1925, 1925,
-	0, 1934, 1925, 1925, 1925, 1925, 1925, 0, 0, 0,
-	0, 0, 0, 0, 0, 1954, 1955, 0, 1105, 0,
-	0, 1960, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	922, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 2002, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 2024, 0, 0, 2028,
-	0, 0, 0, 741, 741, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 741, 742,
-	0, 0, 0, 0, 0, 0, 195, 0, 0, 684,
+	0, 3439, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 1293, 0, 0, 0, 0, 0, 684,
-	0, 0, 0, 0, 0, 0, 197, 0, 0, 0,
-	0, 0, 0, 0, 0, 1060, 0, 0, 0, 0,
+	0, 0, 0, 741, 742, 0, 0, 0, 0, 742,
+	0, 0, 0, 742, 742, 0, 0, 157, 1902, 160,
+	0, 1899, 0, 158, 159, 0, 741, 0, 0, 741,
+	175, 0, 0, 0, 0, 0, 0, 0, 0, 181,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 741,
-	0, 0, 0, 0, 1081, 1081, 0, 0, 0, 1536,
-	0, 0, 0, 684, 0, 0, 0, 0, 2161, 0,
-	0, 0, 0, 0, 0, 0, 0, 1536, 0, 0,
+	0, 197, 0, 0, 0, 0, 0, 0, 197, 0,
+	0, 0, 0, 0, 0, 1828, 0, 0, 0, 197,
+	197, 0, 0, 197, 0, 197, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 197, 0, 0, 0, 0,
 	0, 0, 197, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 741, 0, 0,
+	0, 0, 0, 0, 741, 741, 741, 0, 197, 0,
+	0, 0, 0, 0, 0, 197, 1229, 0, 1235, 0,
+	742, 0, 0, 0, 0, 741, 0, 0, 0, 0,
+	0, 741, 741, 0, 921, 741, 0, 741, 0, 1842,
+	0, 0, 0, 741, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 166, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 741, 3638,
+	1463, 0, 0, 741, 0, 0, 0, 741, 741, 0,
+	0, 0, 0, 0, 1537, 0, 2358, 0, 0, 0,
+	0, 0, 740, 0, 0, 1855, 1858, 1859, 1860, 1861,
+	1862, 1863, 3662, 1864, 1865, 1867, 1868, 1866, 1869, 1870,
+	1843, 1844, 1845, 1846, 1826, 1827, 1856, 0, 1829, 0,
+	1830, 1831, 1832, 1833, 1834, 1835, 1836, 1837, 1838, 0,
+	0, 1839, 1847, 1848, 1849, 1850, 0, 1851, 1852, 1853,
+	1854, 0, 0, 1840, 161, 0, 1105, 0, 1112, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	3682, 0, 3683, 0, 3684, 0, 3685, 0, 0, 0,
+	0, 0, 0, 0, 3688, 3689, 0, 0, 0, 0,
+	0, 0, 0, 0, 3694, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 741, 0, 0, 0, 3695, 0,
+	3696, 0, 3697, 0, 3698, 0, 3699, 0, 3700, 0,
+	3701, 0, 3702, 0, 3703, 0, 3704, 0, 3705, 0,
+	3706, 0, 3707, 0, 3708, 0, 3709, 0, 3710, 0,
+	0, 3711, 0, 0, 0, 3712, 0, 3713, 0, 0,
+	0, 0, 0, 3715, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 154, 0, 0, 155, 0, 0, 0,
+	0, 0, 0, 0, 0, 3732, 0, 0, 1536, 0,
+	741, 0, 0, 0, 3737, 0, 3738, 3739, 0, 3740,
+	0, 3741, 0, 0, 0, 0, 3742, 167, 0, 0,
+	0, 0, 0, 0, 179, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 197,
+	0, 0, 0, 3771, 0, 0, 0, 197, 0, 0,
+	0, 0, 0, 0, 0, 0, 3780, 0, 742, 3782,
+	0, 0, 0, 0, 0, 187, 0, 0, 0, 0,
+	0, 3786, 0, 0, 742, 0, 0, 0, 1857, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 3922, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 197, 0,
+	0, 0, 0, 197, 0, 0, 0, 0, 0, 0,
+	0, 0, 168, 173, 170, 176, 177, 178, 180, 182,
+	183, 184, 185, 0, 0, 0, 0, 0, 186, 188,
+	189, 190, 0, 0, 0, 0, 0, 0, 0, 1801,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 197, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 197, 0, 197, 197, 197, 0, 0, 0, 0,
-	0, 0, 0, 742, 742, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 1818, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 742, 0, 0, 0, 0, 0, 197, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 1293, 1293, 0, 0, 0, 0, 0,
-	0, 0, 742, 742, 742, 742, 0, 0, 2085, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 742,
+	0, 0, 0, 0, 0, 0, 742, 0, 0, 0,
+	742, 742, 0, 0, 0, 742, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 4032, 0, 0,
+	0, 1537, 742, 0, 0, 0, 0, 0, 0, 0,
+	0, 1959, 741, 0, 197, 197, 197, 197, 197, 197,
+	0, 0, 0, 0, 0, 0, 0, 0, 741, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 741, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 197, 197, 0, 2004, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 2032, 0, 0, 0, 0, 197, 0,
+	0, 0, 0, 2949, 0, 0, 0, 0, 0, 2043,
+	0, 0, 0, 0, 0, 0, 2047, 0, 0, 0,
+	0, 0, 0, 0, 742, 0, 0, 2058, 2059, 2060,
+	2061, 2062, 2063, 2064, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 741, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 2147,
+	0, 0, 0, 0, 742, 0, 0, 0, 0, 0,
 	0, 0, 0, 741, 0, 0, 0, 0, 0, 0,
+	741, 0, 0, 0, 741, 741, 0, 0, 0, 741,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 1536, 741, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 741, 0, 0, 0,
+	0, 0, 0, 0, 4074, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 741,
-	0, 0, 741, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 741, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 742,
-	0, 742, 0, 197, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 1537, 0, 0, 0, 197, 0, 0, 742,
-	0, 742, 0, 0, 0, 0, 0, 0, 0, 0,
-	741, 0, 0, 0, 0, 0, 0, 741, 741, 741,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 1293, 0, 0, 0, 0, 741, 0,
-	0, 0, 0, 0, 741, 741, 0, 0, 741, 0,
-	741, 0, 0, 0, 0, 0, 741, 0, 0, 742,
+	0, 0, 0, 0, 1293, 0, 1293, 1293, 0, 0,
+	4088, 0, 0, 4089, 0, 4090, 0, 0, 0, 742,
+	0, 0, 0, 0, 0, 0, 0, 0, 1462, 0,
+	0, 742, 0, 0, 0, 0, 0, 0, 741, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 197, 0, 0, 742, 0, 0, 0, 0,
-	0, 0, 0, 2395, 0, 0, 0, 0, 742, 0,
-	0, 741, 0, 0, 0, 0, 741, 0, 0, 0,
-	741, 741, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 2408, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 1795,
-	0, 0, 1293, 0, 0, 0, 0, 0, 0, 0,
+	2097, 0, 742, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 197, 0, 0,
+	742, 0, 0, 0, 0, 0, 0, 0, 741, 0,
+	0, 0, 0, 0, 0, 0, 742, 0, 0, 0,
+	1537, 0, 0, 742, 742, 1537, 197, 197, 197, 197,
+	197, 0, 0, 0, 0, 0, 0, 4174, 197, 0,
+	0, 0, 0, 0, 197, 0, 197, 0, 0, 197,
+	197, 197, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 4190, 0, 4191, 0,
+	4192, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 1105, 742, 0, 0, 0, 0, 0, 0,
-	742, 0, 742, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 197, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 742, 0, 0,
+	1537, 0, 0, 0, 0, 742, 0, 0, 0, 0,
+	197, 0, 0, 741, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 197, 741, 0, 0, 0, 0,
+	4241, 0, 4242, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 197, 0, 0, 197, 0,
+	0, 0, 0, 0, 0, 0, 741, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 741, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 742, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 741, 0, 0,
-	1112, 0, 0, 0, 0, 0, 0, 2523, 2524, 2525,
-	0, 684, 0, 684, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 1105, 0,
-	0, 0, 0, 0, 1112, 1917, 0, 0, 1917, 0,
-	1917, 0, 0, 0, 0, 0, 2556, 0, 0, 0,
+	741, 0, 0, 0, 1536, 0, 0, 741, 741, 1536,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 1536, 0, 741, 0, 684, 0, 0, 0, 0,
-	0, 1105, 0, 0, 0, 0, 2147, 0, 0, 0,
-	2147, 2147, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 1538, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 742, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 197, 0, 0,
+	0, 0, 0, 0, 1736, 1737, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 742, 197, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	3317, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 1795, 742, 0, 0, 0,
+	0, 741, 0, 0, 1536, 0, 2426, 0, 0, 741,
+	1813, 0, 0, 0, 2430, 0, 2433, 0, 0, 2097,
+	0, 1872, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 1881, 0, 197, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 1105, 0, 1908, 0, 0, 0,
+	0, 0, 3398, 0, 1917, 0, 0, 0, 1919, 0,
+	0, 1922, 1923, 1925, 1925, 0, 1925, 0, 1925, 1925,
+	0, 1934, 1925, 1925, 1925, 1925, 1925, 0, 0, 197,
+	0, 0, 0, 0, 0, 1954, 1955, 0, 1105, 0,
+	0, 1960, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 197, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 2002, 0, 0, 0, 0, 197, 0,
+	197, 197, 197, 0, 0, 0, 2024, 0, 0, 2028,
+	742, 742, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 2634, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 742, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 742, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 1537, 742, 0, 742, 0, 0, 0, 0, 0,
+	741, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 1293, 0, 0, 0, 1032, 0, 742,
+	742, 742, 742, 1033, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 2152, 0, 0, 0, 0, 0, 2097,
+	0, 0, 0, 0, 0, 0, 2592, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 2613, 2614, 0,
+	0, 2618, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 2623, 0, 0, 0, 0, 0, 0,
+	2626, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 2629, 0, 0, 0,
+	0, 3605, 989, 990, 991, 992, 993, 994, 995, 996,
+	997, 998, 999, 1000, 1001, 1002, 1003, 1004, 1005, 1006,
+	1007, 1008, 1009, 1010, 1011, 1012, 1013, 1014, 1015, 1016,
+	1017, 1018, 1019, 1020, 1021, 1022, 1023, 1024, 1025, 1026,
+	1027, 1028, 1029, 1030, 741, 741, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 1293, 1293, 0, 742, 0, 742, 0,
+	197, 0, 0, 0, 0, 0, 0, 0, 2085, 0,
+	0, 0, 0, 741, 741, 741, 741, 0, 0, 1537,
+	0, 0, 0, 197, 0, 0, 742, 0, 742, 0,
+	0, 0, 0, 95, 0, 0, 1032, 0, 0, 0,
+	0, 970, 1033, 984, 985, 986, 971, 0, 0, 972,
+	973, 0, 974, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 979, 2147,
+	987, 988, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 742, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	197, 0, 0, 742, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 742, 0, 0, 3367,
+	3368, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 989, 990, 991, 992, 993, 994, 995, 996, 997,
+	998, 999, 1000, 1001, 1002, 1003, 1004, 1005, 1006, 1007,
+	1008, 1009, 1010, 1011, 1012, 1013, 1014, 1015, 1016, 1017,
+	1018, 1019, 1020, 1021, 1022, 1023, 1024, 1025, 1026, 1027,
+	1028, 1029, 1030, 0, 0, 0, 0, 0, 0, 0,
+	741, 0, 741, 0, 0, 0, 0, 0, 0, 0,
+	0, 742, 0, 0, 0, 0, 0, 0, 742, 0,
+	742, 0, 0, 1536, 0, 0, 0, 0, 0, 0,
+	741, 0, 741, 0, 3369, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 742,
-	2358, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 1293, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	197, 742, 0, 0, 0, 741, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 741, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 742, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 684, 0, 0, 0,
-	0, 0, 0, 0, 0, 742, 2949, 0, 0, 0,
-	197, 0, 0, 0, 0, 0, 0, 0, 0, 1060,
-	0, 0, 0, 0, 742, 0, 742, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 684, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 741,
-	0, 0, 0, 684, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 741, 0, 0, 0,
-	0, 0, 0, 741, 0, 0, 0, 741, 741, 0,
-	0, 0, 741, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 1538, 0, 0, 0, 0, 1536, 741,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	1538, 0, 0, 1538, 0, 1538, 684, 0, 0, 0,
-	0, 0, 0, 0, 0, 2882, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 1976, 0, 0, 0,
-	0, 2899, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 684, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 2030, 684, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 741, 0, 0, 684, 0, 0, 0, 0, 0,
-	0, 684, 0, 0, 0, 0, 0, 0, 0, 0,
-	2056, 2057, 684, 684, 684, 684, 684, 684, 684, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 741, 0, 0, 0, 0, 0, 0, 0, 2981,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 2395, 0, 0, 0, 741, 0, 0,
+	0, 2936, 0, 0, 0, 3370, 3371, 0, 0, 0,
+	741, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 2408, 0, 0, 0,
-	0, 0, 0, 3005, 0, 0, 0, 1917, 1917, 0,
-	0, 0, 3010, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 3021,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 1795,
+	0, 0, 1293, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 1105, 0, 0, 0, 2985, 0, 0, 742,
+	0, 0, 0, 0, 0, 741, 0, 0, 0, 0,
+	935, 0, 741, 0, 741, 197, 939, 0, 0, 0,
+	936, 937, 0, 0, 0, 938, 940, 0, 0, 0,
+	0, 0, 0, 742, 197, 0, 0, 0, 0, 0,
+	0, 0, 0, 741, 0, 0, 0, 0, 0, 0,
+	1112, 0, 0, 0, 0, 0, 0, 2523, 2524, 2525,
+	0, 0, 3033, 3034, 3035, 3036, 3037, 3038, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 1105, 0,
+	0, 0, 0, 0, 1112, 1917, 0, 0, 1917, 0,
+	1917, 2097, 3049, 0, 0, 0, 2556, 0, 0, 742,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 742,
+	0, 0, 0, 0, 0, 0, 3057, 0, 0, 1537,
+	742, 0, 742, 0, 0, 0, 0, 0, 0, 0,
+	0, 1105, 0, 0, 0, 0, 2147, 0, 0, 0,
+	2147, 2147, 0, 0, 0, 0, 0, 742, 2358, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 741, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 741, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 741, 0, 0, 0, 0, 197, 742,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 741,
-	0, 2147, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 684, 0, 741, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 741, 0, 0, 0, 1536, 0, 0,
-	741, 741, 1536, 0, 0, 0, 0, 0, 0, 0,
-	0, 2147, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 741, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 742,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 1538, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 1538, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 3317, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 742, 0, 0, 0, 2634, 197, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 741, 0, 0, 1536, 0, 0,
-	0, 0, 741, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 742, 0, 742, 0, 0, 0, 0, 0,
+	0, 0, 0, 741, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 741, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 1536, 741, 0, 741, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 3179, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 1293, 0,
-	0, 0, 0, 0, 0, 3398, 0, 0, 0, 0,
+	0, 741, 741, 1293, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 1925,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 3224, 0, 2030,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 1293, 0, 0, 0, 0, 0, 0,
-	3251, 1925, 0, 0, 0, 0, 0, 0, 0, 95,
-	0, 0, 1032, 0, 0, 0, 0, 970, 1033, 984,
-	985, 986, 971, 0, 1976, 972, 973, 0, 974, 0,
+	0, 0, 0, 741, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	1081, 0, 0, 0, 979, 0, 987, 988, 0, 0,
-	0, 0, 0, 741, 0, 0, 0, 0, 0, 1060,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 684, 0, 0, 1105, 0, 0, 0, 2030, 684,
-	0, 684, 2408, 684, 2449, 3367, 3368, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 989, 990, 991,
-	992, 993, 994, 995, 996, 997, 998, 999, 1000, 1001,
-	1002, 1003, 1004, 1005, 1006, 1007, 1008, 1009, 1010, 1011,
-	1012, 1013, 1014, 1015, 1016, 1017, 1018, 1019, 1020, 1021,
-	1022, 1023, 1024, 1025, 1026, 1027, 1028, 1029, 1030, 0,
+	0, 0, 0, 741, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 3605, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 2526, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 741, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	3369, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 741, 741, 0,
+	0, 0, 0, 0, 0, 0, 741, 0, 741, 0,
+	0, 0, 3321, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 3359, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 3373, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 3391, 0, 0, 3394, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 741, 741, 741, 741,
-	0, 0, 0, 1872, 0, 0, 0, 0, 0, 0,
-	0, 3370, 3371, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 684, 0, 0, 0, 0, 0,
-	0, 684, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 684, 684, 0, 0, 684, 0, 2620, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 684, 0,
-	0, 0, 0, 0, 0, 684, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 935, 0, 0, 0,
-	0, 684, 939, 0, 0, 0, 936, 937, 2631, 0,
-	0, 938, 940, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 2882, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 2899, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 2408, 2408, 0,
-	0, 0, 0, 741, 0, 741, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 1536, 1538, 0, 2030,
-	0, 0, 0, 741, 0, 741, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 3669, 3670, 3671, 3672,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 741, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 741,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 741, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 2981,
+	0, 3554, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 2408, 0, 0, 0,
+	0, 0, 0, 3005, 0, 0, 0, 1917, 1917, 0,
+	0, 0, 3010, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 3021,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 3616, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 3631, 0, 3632, 3633,
+	3634, 0, 0, 0, 0, 0, 3808, 3810, 3809, 3875,
+	3876, 3877, 3878, 3879, 3880, 3881, 3811, 3812, 812, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 741, 0, 0,
-	0, 0, 0, 0, 741, 0, 741, 0, 0, 0,
-	0, 0, 0, 3747, 0, 3747, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 741, 0, 0, 0, 0,
-	0, 0, 0, 3775, 0, 3777, 0, 0, 0, 0,
-	0, 0, 684, 0, 0, 0, 0, 0, 0, 0,
-	1976, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 2147, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 2408, 0, 0, 0, 0, 0, 0,
-	0, 684, 0, 0, 0, 0, 684, 0, 0, 3944,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 1293, 0, 0, 0, 0, 0, 0, 0,
+	0, 2147, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 741, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 684, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 3747, 0, 741,
-	0, 0, 0, 0, 3747, 0, 3747, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 1538, 2408, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 684, 684, 684,
-	684, 684, 684, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 741, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 741, 684, 684, 0, 0,
-	0, 0, 0, 0, 0, 1536, 741, 0, 741, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 684, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 741, 741, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 741, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 3179, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 1293, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 2408, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 741, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 2408,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 741,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 1925,
+	3816, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 3824, 3825, 3224, 0, 3900,
+	3899, 3898, 0, 0, 3896, 3897, 3895, 0, 0, 0,
+	0, 0, 0, 1293, 0, 0, 0, 0, 0, 0,
+	3251, 1925, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 741, 0,
-	741, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 4091, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 4099, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 2408, 0, 4107, 0,
+	3901, 935, 0, 788, 789, 3902, 3903, 939, 3904, 791,
+	792, 936, 937, 0, 786, 790, 938, 940, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 1293, 1293, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 1105, 0, 0, 0, 0, 0,
+	0, 0, 2408, 3805, 3806, 3807, 3813, 3814, 3815, 3826,
+	3873, 3874, 3882, 3884, 891, 3883, 3885, 3886, 3887, 3890,
+	3891, 3892, 3893, 3888, 3889, 3894, 3788, 3792, 3789, 3790,
+	3791, 3803, 3793, 3794, 3795, 3796, 3797, 3798, 3799, 3800,
+	3801, 3802, 3804, 3905, 3906, 3907, 3908, 3909, 3910, 3819,
+	3823, 3822, 3820, 3821, 3817, 3818, 3845, 3844, 3846, 3847,
+	3848, 3849, 3850, 3851, 3853, 3852, 3854, 3855, 3856, 3857,
+	3858, 3859, 3827, 3828, 3831, 3832, 3830, 3829, 3833, 3842,
+	3843, 3834, 3835, 3836, 3837, 3838, 3839, 3841, 3840, 3860,
+	3861, 3862, 3863, 3864, 3866, 3865, 3869, 3870, 3868, 3867,
+	3872, 3871, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 941, 0, 942, 0, 0,
+	946, 0, 0, 0, 948, 947, 0, 949, 911, 910,
+	0, 0, 943, 944, 0, 945, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 1081, 0,
-	684, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 4157, 0, 0, 0, 0,
-	0, 0, 0, 1538, 0, 0, 0, 0, 1538, 684,
-	684, 684, 684, 684, 0, 0, 0, 0, 0, 0,
-	0, 3267, 0, 0, 0, 0, 0, 1976, 0, 684,
-	0, 0, 684, 3275, 2030, 4099, 0, 0, 0, 3807,
-	3809, 3808, 3874, 3875, 3876, 3877, 3878, 3879, 3880, 3810,
-	3811, 812, 0, 0, 0, 0, 0, 0, 0, 2408,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 684, 1872, 0,
-	4157, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 1538, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 684, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 684, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 684, 0,
-	0, 684, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 1872, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 3911, 3912, 3913, 3914, 3915, 3916,
+	3917, 3918, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 4072, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 2408, 2408, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 3815, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 3823, 3824,
-	0, 0, 3899, 3898, 3897, 0, 684, 3895, 3896, 3894,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 3670, 3671, 3672, 3673,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 684, 3900, 935, 0, 788, 789, 3901, 3902,
-	939, 3903, 791, 792, 936, 937, 0, 786, 790, 938,
-	940, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 684, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 684, 0, 684, 684, 684, 3804, 3805, 3806, 3812,
-	3813, 3814, 3825, 3872, 3873, 3881, 3883, 891, 3882, 3884,
-	3885, 3886, 3889, 3890, 3891, 3892, 3887, 3888, 3893, 3787,
-	3791, 3788, 3789, 3790, 3802, 3792, 3793, 3794, 3795, 3796,
-	3797, 3798, 3799, 3800, 3801, 3803, 3904, 3905, 3906, 3907,
-	3908, 3909, 3818, 3822, 3821, 3819, 3820, 3816, 3817, 3844,
-	3843, 3845, 3846, 3847, 3848, 3849, 3850, 3852, 3851, 3853,
-	3854, 3855, 3856, 3857, 3858, 3826, 3827, 3830, 3831, 3829,
-	3828, 3832, 3841, 3842, 3833, 3834, 3835, 3836, 3837, 3838,
-	3840, 3839, 3859, 3860, 3861, 3862, 3863, 3865, 3864, 3868,
-	3869, 3867, 3866, 3871, 3870, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 941, 0,
-	942, 0, 0, 946, 0, 0, 0, 948, 947, 0,
-	949, 911, 910, 0, 0, 943, 944, 0, 945, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 3910, 3911, 3912,
-	3913, 3914, 3915, 3916, 3917, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 1976, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 1538, 0, 0, 0, 1976, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 3748, 0, 3748, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 3776, 0, 3778, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 1976, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 2408, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	3945, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 1293, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 3748, 0,
+	0, 0, 0, 0, 0, 3748, 0, 3748, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 2408, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -2864,102 +2819,35 @@ var yyAct = [...]int{
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 2408, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 1976, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 684, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	2408, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 4092, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 4100, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 2408, 0, 4108,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 1538, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 1293, 1293, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	4129, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 4158, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	1976, 0, 0, 400, 0, 0, 0, 0, 0, 0,
-	1431, 1415, 534, 0, 1357, 1434, 1325, 1344, 1444, 1347,
-	1350, 1394, 1303, 1372, 420, 1341, 1329, 1298, 1336, 1299,
-	1327, 1359, 273, 1324, 1417, 1376, 1433, 369, 270, 1305,
-	1296, 206, 511, 1330, 435, 1346, 205, 1396, 493, 255,
-	380, 377, 590, 285, 276, 272, 252, 320, 389, 432,
-	524, 426, 1440, 373, 1382, 0, 503, 405, 0, 0,
-	2030, 1421, 1420, 1351, 1361, 1423, 1370, 1408, 1356, 1395,
-	1313, 1381, 1435, 1342, 1391, 1436, 326, 250, 328, 204,
-	417, 504, 289, 0, 0, 0, 0, 4131, 513, 966,
-	0, 0, 0, 0, 4132, 0, 0, 0, 0, 240,
-	0, 0, 247, 0, 0, 0, 354, 363, 362, 342,
-	343, 345, 347, 353, 360, 366, 339, 348, 1338, 1388,
-	616, 1430, 1339, 1390, 268, 324, 275, 267, 587, 1441,
-	1422, 1302, 1369, 1429, 1364, 603, 0, 0, 231, 1432,
-	1363, 0, 1393, 0, 1447, 1297, 1384, 0, 1300, 1304,
-	1443, 1427, 1333, 278, 0, 0, 0, 0, 0, 0,
-	0, 1360, 1371, 1405, 1409, 1354, 0, 0, 0, 0,
-	0, 0, 0, 0, 1331, 0, 1380, 0, 0, 0,
-	1309, 1301, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 4100, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 1358, 0, 0, 0, 0, 1312,
-	0, 1332, 1406, 0, 1295, 300, 1306, 406, 260, 0,
-	459, 1413, 1426, 1355, 636, 1428, 1353, 1352, 1400, 1310,
-	1419, 1345, 368, 1308, 333, 199, 227, 0, 1343, 416,
-	467, 479, 1418, 1328, 1337, 256, 1335, 477, 430, 611,
-	235, 287, 464, 437, 475, 445, 290, 1379, 1398, 476,
-	375, 592, 455, 608, 637, 638, 266, 410, 622, 528,
-	630, 655, 228, 263, 424, 512, 614, 500, 401, 588,
-	589, 332, 499, 298, 203, 372, 643, 226, 485, 374,
-	244, 233, 594, 619, 302, 254, 292, 462, 650, 215,
-	523, 605, 241, 489, 0, 0, 658, 249, 510, 617,
-	606, 217, 601, 509, 397, 329, 330, 216, 0, 463,
-	271, 296, 0, 0, 261, 419, 596, 597, 259, 659,
-	230, 629, 222, 1307, 628, 412, 591, 602, 398, 386,
-	221, 600, 396, 385, 337, 358, 359, 283, 310, 452,
-	378, 453, 309, 311, 408, 407, 409, 209, 615, 633,
-	0, 210, 0, 505, 618, 660, 457, 214, 236, 237,
-	239, 1323, 282, 286, 294, 297, 306, 307, 316, 370,
-	423, 451, 447, 456, 1414, 585, 609, 623, 635, 641,
-	642, 644, 645, 646, 647, 648, 651, 649, 411, 314,
-	501, 336, 376, 1403, 1446, 429, 478, 242, 613, 502,
-	201, 1317, 1322, 1315, 0, 257, 258, 1385, 581, 1318,
-	1316, 1374, 1375, 1319, 1437, 1438, 1439, 1424, 661, 662,
-	663, 664, 665, 666, 667, 668, 669, 670, 671, 672,
-	673, 674, 675, 676, 677, 678, 656, 514, 520, 515,
-	516, 517, 518, 519, 0, 521, 1407, 1311, 0, 1320,
-	1321, 402, 1416, 598, 599, 679, 387, 492, 610, 338,
-	352, 355, 344, 364, 0, 365, 340, 341, 346, 349,
-	350, 351, 356, 357, 361, 367, 251, 212, 394, 403,
-	584, 315, 218, 219, 220, 530, 531, 532, 533, 626,
-	627, 631, 207, 468, 469, 470, 471, 295, 621, 312,
-	474, 473, 334, 335, 382, 454, 546, 548, 559, 563,
-	565, 567, 573, 576, 547, 549, 560, 564, 566, 568,
-	574, 577, 536, 538, 540, 542, 555, 554, 551, 579,
-	580, 557, 562, 541, 553, 558, 571, 578, 575, 535,
-	539, 543, 552, 570, 569, 550, 561, 572, 556, 544,
-	537, 545, 1378, 198, 223, 371, 1442, 460, 291, 657,
-	625, 490, 620, 208, 225, 1314, 265, 1326, 1334, 0,
-	1340, 1348, 1349, 1362, 1365, 1366, 1367, 1368, 1386, 1387,
-	1389, 1397, 1399, 1402, 1404, 1411, 1425, 1445, 200, 202,
-	211, 224, 234, 238, 245, 264, 279, 281, 288, 301,
-	313, 321, 322, 325, 331, 383, 390, 391, 392, 393,
-	413, 414, 415, 418, 421, 422, 425, 427, 428, 431,
-	436, 440, 441, 442, 444, 446, 448, 461, 466, 480,
-	481, 482, 483, 484, 487, 488, 494, 495, 496, 497,
-	498, 506, 507, 522, 593, 595, 612, 632, 639, 486,
-	388, 434, 458, 586, 304, 305, 449, 450, 317, 318,
-	653, 654, 303, 607, 640, 604, 652, 634, 443, 381,
-	1377, 1383, 384, 284, 308, 323, 1392, 624, 508, 229,
-	472, 293, 253, 1410, 1412, 213, 248, 232, 262, 277,
-	280, 327, 395, 404, 433, 439, 299, 274, 246, 465,
-	243, 491, 525, 526, 527, 529, 399, 269, 438, 1373,
-	1401, 379, 582, 583, 319, 400, 0, 0, 0, 0,
-	0, 0, 1431, 1415, 534, 0, 1357, 1434, 1325, 1344,
+	2408, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 400, 0, 0, 0, 1872,
+	0, 4158, 1431, 1415, 534, 0, 1357, 1434, 1325, 1344,
 	1444, 1347, 1350, 1394, 1303, 1372, 420, 1341, 1329, 1298,
 	1336, 1299, 1327, 1359, 273, 1324, 1417, 1376, 1433, 369,
 	270, 1305, 1296, 206, 511, 1330, 435, 1346, 205, 1396,
@@ -2967,8 +2855,8 @@ var yyAct = [...]int{
 	389, 432, 524, 426, 1440, 373, 1382, 0, 503, 405,
 	0, 0, 0, 1421, 1420, 1351, 1361, 1423, 1370, 1408,
 	1356, 1395, 1313, 1381, 1435, 1342, 1391, 1436, 326, 250,
-	328, 204, 417, 504, 289, 0, 0, 0, 0, 0,
-	513, 196, 0, 0, 0, 0, 0, 0, 0, 0,
+	328, 204, 417, 504, 289, 0, 0, 0, 0, 4132,
+	513, 966, 0, 0, 0, 0, 4133, 0, 0, 0,
 	0, 240, 0, 0, 247, 0, 0, 0, 354, 363,
 	362, 342, 343, 345, 347, 353, 360, 366, 339, 348,
 	1338, 1388, 616, 1430, 1339, 1390, 268, 324, 275, 267,
@@ -2976,7 +2864,7 @@ var yyAct = [...]int{
 	231, 1432, 1363, 0, 1393, 0, 1447, 1297, 1384, 0,
 	1300, 1304, 1443, 1427, 1333, 278, 0, 0, 0, 0,
 	0, 0, 0, 1360, 1371, 1405, 1409, 1354, 0, 0,
-	0, 0, 0, 0, 3276, 0, 1331, 0, 1380, 0,
+	0, 0, 0, 0, 0, 0, 1331, 0, 1380, 0,
 	0, 0, 1309, 1301, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -3043,7 +2931,7 @@ var yyAct = [...]int{
 	503, 405, 0, 0, 0, 1421, 1420, 1351, 1361, 1423,
 	1370, 1408, 1356, 1395, 1313, 1381, 1435, 1342, 1391, 1436,
 	326, 250, 328, 204, 417, 504, 289, 0, 0, 0,
-	0, 0, 513, 731, 0, 0, 0, 0, 0, 0,
+	0, 0, 513, 196, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 240, 0, 0, 247, 0, 0, 0,
 	354, 363, 362, 342, 343, 345, 347, 353, 360, 366,
 	339, 348, 1338, 1388, 616, 1430, 1339, 1390, 268, 324,
@@ -3051,7 +2939,7 @@ var yyAct = [...]int{
 	0, 0, 231, 1432, 1363, 0, 1393, 0, 1447, 1297,
 	1384, 0, 1300, 1304, 1443, 1427, 1333, 278, 0, 0,
 	0, 0, 0, 0, 0, 1360, 1371, 1405, 1409, 1354,
-	0, 0, 0, 0, 0, 0, 3237, 0, 1331, 0,
+	0, 0, 0, 0, 0, 0, 3276, 0, 1331, 0,
 	1380, 0, 0, 0, 1309, 1301, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -3118,7 +3006,7 @@ var yyAct = [...]int{
 	1382, 0, 503, 405, 0, 0, 0, 1421, 1420, 1351,
 	1361, 1423, 1370, 1408, 1356, 1395, 1313, 1381, 1435, 1342,
 	1391, 1436, 326, 250, 328, 204, 417, 504, 289, 0,
-	0, 0, 0, 0, 513, 966, 0, 0, 0, 0,
+	0, 0, 0, 0, 513, 731, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 240, 0, 0, 247, 0,
 	0, 0, 354, 363, 362, 342, 343, 345, 347, 353,
 	360, 366, 339, 348, 1338, 1388, 616, 1430, 1339, 1390,
@@ -3126,7 +3014,7 @@ var yyAct = [...]int{
 	1364, 603, 0, 0, 231, 1432, 1363, 0, 1393, 0,
 	1447, 1297, 1384, 0, 1300, 1304, 1443, 1427, 1333, 278,
 	0, 0, 0, 0, 0, 0, 0, 1360, 1371, 1405,
-	1409, 1354, 0, 0, 0, 0, 0, 0, 2428, 0,
+	1409, 1354, 0, 0, 0, 0, 0, 0, 3237, 0,
 	1331, 0, 1380, 0, 0, 0, 1309, 1301, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -3193,7 +3081,7 @@ var yyAct = [...]int{
 	1440, 373, 1382, 0, 503, 405, 0, 0, 0, 1421,
 	1420, 1351, 1361, 1423, 1370, 1408, 1356, 1395, 1313, 1381,
 	1435, 1342, 1391, 1436, 326, 250, 328, 204, 417, 504,
-	289, 0, 95, 0, 0, 0, 513, 731, 0, 0,
+	289, 0, 0, 0, 0, 0, 513, 966, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 240, 0, 0,
 	247, 0, 0, 0, 354, 363, 362, 342, 343, 345,
 	347, 353, 360, 366, 339, 348, 1338, 1388, 616, 1430,
@@ -3202,7 +3090,7 @@ var yyAct = [...]int{
 	1393, 0, 1447, 1297, 1384, 0, 1300, 1304, 1443, 1427,
 	1333, 278, 0, 0, 0, 0, 0, 0, 0, 1360,
 	1371, 1405, 1409, 1354, 0, 0, 0, 0, 0, 0,
-	0, 0, 1331, 0, 1380, 0, 0, 0, 1309, 1301,
+	2428, 0, 1331, 0, 1380, 0, 0, 0, 1309, 1301,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -3268,7 +3156,7 @@ var yyAct = [...]int{
 	524, 426, 1440, 373, 1382, 0, 503, 405, 0, 0,
 	0, 1421, 1420, 1351, 1361, 1423, 1370, 1408, 1356, 1395,
 	1313, 1381, 1435, 1342, 1391, 1436, 326, 250, 328, 204,
-	417, 504, 289, 0, 0, 0, 0, 0, 513, 196,
+	417, 504, 289, 0, 95, 0, 0, 0, 513, 731,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 240,
 	0, 0, 247, 0, 0, 0, 354, 363, 362, 342,
 	343, 345, 347, 353, 360, 366, 339, 348, 1338, 1388,
@@ -3344,7 +3232,7 @@ var yyAct = [...]int{
 	0, 0, 0, 1421, 1420, 1351, 1361, 1423, 1370, 1408,
 	1356, 1395, 1313, 1381, 1435, 1342, 1391, 1436, 326, 250,
 	328, 204, 417, 504, 289, 0, 0, 0, 0, 0,
-	513, 731, 0, 0, 0, 0, 0, 0, 0, 0,
+	513, 196, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 240, 0, 0, 247, 0, 0, 0, 354, 363,
 	362, 342, 343, 345, 347, 353, 360, 366, 339, 348,
 	1338, 1388, 616, 1430, 1339, 1390, 268, 324, 275, 267,
@@ -3419,7 +3307,7 @@ var yyAct = [...]int{
 	503, 405, 0, 0, 0, 1421, 1420, 1351, 1361, 1423,
 	1370, 1408, 1356, 1395, 1313, 1381, 1435, 1342, 1391, 1436,
 	326, 250, 328, 204, 417, 504, 289, 0, 0, 0,
-	0, 0, 513, 966, 0, 0, 0, 0, 0, 0,
+	0, 0, 513, 731, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 240, 0, 0, 247, 0, 0, 0,
 	354, 363, 362, 342, 343, 345, 347, 353, 360, 366,
 	339, 348, 1338, 1388, 616, 1430, 1339, 1390, 268, 324,
@@ -3485,170 +3373,96 @@ var yyAct = [...]int{
 	248, 232, 262, 277, 280, 327, 395, 404, 433, 439,
 	299, 274, 246, 465, 243, 491, 525, 526, 527, 529,
 	399, 269, 438, 1373, 1401, 379, 582, 583, 319, 400,
-	0, 0, 0, 0, 0, 0, 0, 0, 534, 0,
-	784, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	420, 0, 0, 0, 771, 0, 0, 0, 273, 776,
-	0, 0, 0, 369, 270, 0, 0, 206, 511, 0,
-	435, 0, 205, 0, 493, 255, 380, 377, 590, 285,
-	276, 272, 252, 320, 389, 432, 524, 426, 783, 373,
-	0, 0, 503, 405, 0, 0, 0, 0, 0, 0,
-	0, 0, 778, 779, 0, 0, 0, 0, 0, 0,
-	0, 0, 326, 250, 328, 204, 417, 504, 289, 0,
-	95, 0, 0, 1032, 513, 966, 755, 932, 970, 1033,
-	984, 985, 986, 971, 0, 240, 972, 973, 247, 974,
-	0, 931, 814, 816, 815, 881, 882, 883, 884, 885,
-	886, 887, 817, 818, 812, 979, 616, 987, 988, 0,
-	268, 324, 275, 267, 587, 0, 0, 2248, 2249, 2250,
-	0, 603, 0, 0, 231, 0, 0, 0, 0, 0,
-	0, 0, 751, 768, 0, 782, 0, 0, 0, 278,
+	0, 0, 0, 0, 0, 0, 1431, 1415, 534, 0,
+	1357, 1434, 1325, 1344, 1444, 1347, 1350, 1394, 1303, 1372,
+	420, 1341, 1329, 1298, 1336, 1299, 1327, 1359, 273, 1324,
+	1417, 1376, 1433, 369, 270, 1305, 1296, 206, 511, 1330,
+	435, 1346, 205, 1396, 493, 255, 380, 377, 590, 285,
+	276, 272, 252, 320, 389, 432, 524, 426, 1440, 373,
+	1382, 0, 503, 405, 0, 0, 0, 1421, 1420, 1351,
+	1361, 1423, 1370, 1408, 1356, 1395, 1313, 1381, 1435, 1342,
+	1391, 1436, 326, 250, 328, 204, 417, 504, 289, 0,
+	0, 0, 0, 0, 513, 966, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 240, 0, 0, 247, 0,
+	0, 0, 354, 363, 362, 342, 343, 345, 347, 353,
+	360, 366, 339, 348, 1338, 1388, 616, 1430, 1339, 1390,
+	268, 324, 275, 267, 587, 1441, 1422, 1302, 1369, 1429,
+	1364, 603, 0, 0, 231, 1432, 1363, 0, 1393, 0,
+	1447, 1297, 1384, 0, 1300, 1304, 1443, 1427, 1333, 278,
+	0, 0, 0, 0, 0, 0, 0, 1360, 1371, 1405,
+	1409, 1354, 0, 0, 0, 0, 0, 0, 0, 0,
+	1331, 0, 1380, 0, 0, 0, 1309, 1301, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 765, 766, 0, 0,
-	0, 0, 926, 0, 767, 0, 0, 775, 989, 990,
-	991, 992, 993, 994, 995, 996, 997, 998, 999, 1000,
-	1001, 1002, 1003, 1004, 1005, 1006, 1007, 1008, 1009, 1010,
-	1011, 1012, 1013, 1014, 1015, 1016, 1017, 1018, 1019, 1020,
-	1021, 1022, 1023, 1024, 1025, 1026, 1027, 1028, 1029, 1030,
-	777, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 300, 0, 406, 260, 0, 459, 925, 0, 0,
-	636, 0, 0, 923, 0, 0, 0, 0, 368, 0,
-	333, 199, 227, 0, 0, 416, 467, 479, 0, 0,
-	0, 976, 0, 477, 430, 611, 235, 287, 464, 437,
-	475, 445, 290, 0, 0, 476, 375, 592, 455, 608,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	1358, 0, 0, 0, 0, 1312, 0, 1332, 1406, 0,
+	1295, 300, 1306, 406, 260, 0, 459, 1413, 1426, 1355,
+	636, 1428, 1353, 1352, 1400, 1310, 1419, 1345, 368, 1308,
+	333, 199, 227, 0, 1343, 416, 467, 479, 1418, 1328,
+	1337, 256, 1335, 477, 430, 611, 235, 287, 464, 437,
+	475, 445, 290, 1379, 1398, 476, 375, 592, 455, 608,
 	637, 638, 266, 410, 622, 528, 630, 655, 228, 263,
 	424, 512, 614, 500, 401, 588, 589, 332, 499, 298,
 	203, 372, 643, 226, 485, 374, 244, 233, 594, 619,
 	302, 254, 292, 462, 650, 215, 523, 605, 241, 489,
 	0, 0, 658, 249, 510, 617, 606, 217, 601, 509,
 	397, 329, 330, 216, 0, 463, 271, 296, 0, 0,
-	261, 419, 977, 978, 259, 659, 822, 629, 222, 0,
+	261, 419, 596, 597, 259, 659, 230, 629, 222, 1307,
 	628, 412, 591, 602, 398, 386, 221, 600, 396, 385,
-	337, 830, 831, 283, 310, 907, 906, 905, 309, 311,
-	903, 904, 902, 209, 615, 633, 0, 210, 0, 505,
-	618, 660, 457, 214, 236, 237, 239, 0, 282, 286,
+	337, 358, 359, 283, 310, 452, 378, 453, 309, 311,
+	408, 407, 409, 209, 615, 633, 0, 210, 0, 505,
+	618, 660, 457, 214, 236, 237, 239, 1323, 282, 286,
 	294, 297, 306, 307, 316, 370, 423, 451, 447, 456,
-	0, 585, 609, 623, 635, 641, 642, 644, 645, 646,
-	647, 648, 651, 649, 411, 314, 501, 336, 376, 0,
-	0, 429, 478, 242, 613, 502, 913, 935, 924, 788,
-	789, 914, 915, 939, 916, 791, 792, 936, 937, 785,
-	786, 790, 938, 940, 661, 662, 663, 664, 665, 666,
+	1414, 585, 609, 623, 635, 641, 642, 644, 645, 646,
+	647, 648, 651, 649, 411, 314, 501, 336, 376, 1403,
+	1446, 429, 478, 242, 613, 502, 201, 1317, 1322, 1315,
+	0, 257, 258, 1385, 581, 1318, 1316, 1374, 1375, 1319,
+	1437, 1438, 1439, 1424, 661, 662, 663, 664, 665, 666,
 	667, 668, 669, 670, 671, 672, 673, 674, 675, 676,
 	677, 678, 656, 514, 520, 515, 516, 517, 518, 519,
-	0, 521, 927, 774, 773, 0, 780, 781, 0, 810,
-	811, 813, 819, 820, 821, 832, 879, 880, 888, 890,
-	891, 889, 892, 893, 894, 897, 898, 899, 900, 895,
-	896, 901, 793, 797, 794, 795, 796, 808, 798, 799,
-	800, 801, 802, 803, 804, 805, 806, 807, 809, 950,
-	951, 952, 953, 954, 955, 825, 829, 828, 826, 827,
-	823, 824, 851, 850, 852, 853, 854, 855, 856, 857,
-	859, 858, 860, 861, 862, 863, 864, 865, 833, 834,
-	837, 838, 836, 835, 839, 848, 849, 840, 841, 842,
-	843, 844, 845, 847, 846, 866, 867, 868, 869, 870,
-	872, 871, 875, 876, 874, 873, 878, 877, 772, 198,
-	223, 371, 0, 460, 291, 657, 625, 490, 620, 208,
-	225, 941, 265, 942, 0, 0, 946, 0, 0, 0,
-	948, 947, 0, 949, 911, 910, 0, 0, 943, 944,
-	0, 945, 0, 0, 200, 202, 211, 224, 234, 238,
+	0, 521, 1407, 1311, 0, 1320, 1321, 402, 1416, 598,
+	599, 679, 387, 492, 610, 338, 352, 355, 344, 364,
+	0, 365, 340, 341, 346, 349, 350, 351, 356, 357,
+	361, 367, 251, 212, 394, 403, 584, 315, 218, 219,
+	220, 530, 531, 532, 533, 626, 627, 631, 207, 468,
+	469, 470, 471, 295, 621, 312, 474, 473, 334, 335,
+	382, 454, 546, 548, 559, 563, 565, 567, 573, 576,
+	547, 549, 560, 564, 566, 568, 574, 577, 536, 538,
+	540, 542, 555, 554, 551, 579, 580, 557, 562, 541,
+	553, 558, 571, 578, 575, 535, 539, 543, 552, 570,
+	569, 550, 561, 572, 556, 544, 537, 545, 1378, 198,
+	223, 371, 1442, 460, 291, 657, 625, 490, 620, 208,
+	225, 1314, 265, 1326, 1334, 0, 1340, 1348, 1349, 1362,
+	1365, 1366, 1367, 1368, 1386, 1387, 1389, 1397, 1399, 1402,
+	1404, 1411, 1425, 1445, 200, 202, 211, 224, 234, 238,
 	245, 264, 279, 281, 288, 301, 313, 321, 322, 325,
 	331, 383, 390, 391, 392, 393, 413, 414, 415, 418,
 	421, 422, 425, 427, 428, 431, 436, 440, 441, 442,
 	444, 446, 448, 461, 466, 480, 481, 482, 483, 484,
 	487, 488, 494, 495, 496, 497, 498, 506, 507, 522,
 	593, 595, 612, 632, 639, 486, 388, 434, 458, 586,
-	956, 957, 958, 959, 960, 961, 962, 963, 303, 607,
-	640, 604, 652, 634, 443, 381, 0, 0, 384, 284,
-	308, 323, 0, 624, 508, 229, 472, 293, 253, 1031,
-	0, 213, 248, 232, 262, 277, 280, 327, 395, 404,
+	304, 305, 449, 450, 317, 318, 653, 654, 303, 607,
+	640, 604, 652, 634, 443, 381, 1377, 1383, 384, 284,
+	308, 323, 1392, 624, 508, 229, 472, 293, 253, 1410,
+	1412, 213, 248, 232, 262, 277, 280, 327, 395, 404,
 	433, 439, 299, 274, 246, 465, 243, 491, 525, 526,
-	527, 529, 399, 269, 438, 400, 0, 379, 582, 583,
-	319, 0, 0, 0, 534, 0, 784, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 420, 0, 0, 0,
-	771, 0, 0, 0, 273, 776, 0, 0, 0, 369,
-	270, 0, 0, 206, 511, 0, 435, 0, 205, 0,
-	493, 255, 380, 377, 590, 285, 276, 272, 252, 320,
-	389, 432, 524, 426, 783, 373, 0, 0, 503, 405,
-	0, 0, 0, 0, 0, 0, 0, 0, 778, 779,
-	0, 0, 0, 0, 0, 0, 2457, 0, 326, 250,
-	328, 204, 417, 504, 289, 0, 95, 0, 0, 1032,
-	513, 966, 755, 932, 970, 1033, 984, 985, 986, 971,
-	0, 240, 972, 973, 247, 974, 0, 931, 814, 816,
-	815, 881, 882, 883, 884, 885, 886, 887, 817, 818,
-	812, 979, 616, 987, 988, 2458, 268, 324, 275, 267,
-	587, 0, 0, 0, 0, 0, 0, 603, 0, 0,
-	231, 0, 0, 0, 0, 0, 0, 0, 751, 768,
-	0, 782, 0, 0, 0, 278, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 765, 766, 0, 0, 0, 0, 926, 0,
-	767, 0, 0, 775, 989, 990, 991, 992, 993, 994,
-	995, 996, 997, 998, 999, 1000, 1001, 1002, 1003, 1004,
-	1005, 1006, 1007, 1008, 1009, 1010, 1011, 1012, 1013, 1014,
-	1015, 1016, 1017, 1018, 1019, 1020, 1021, 1022, 1023, 1024,
-	1025, 1026, 1027, 1028, 1029, 1030, 777, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 300, 0, 406,
-	260, 0, 459, 925, 0, 0, 636, 0, 0, 923,
-	0, 0, 0, 0, 368, 0, 333, 199, 227, 0,
-	0, 416, 467, 479, 0, 0, 0, 976, 0, 477,
-	430, 611, 235, 287, 464, 437, 475, 445, 290, 0,
-	0, 476, 375, 592, 455, 608, 637, 638, 266, 410,
-	622, 528, 630, 655, 228, 263, 424, 512, 614, 500,
-	401, 588, 589, 332, 499, 298, 203, 372, 643, 226,
-	485, 374, 244, 233, 594, 619, 302, 254, 292, 462,
-	650, 215, 523, 605, 241, 489, 0, 0, 658, 249,
-	510, 617, 606, 217, 601, 509, 397, 329, 330, 216,
-	0, 463, 271, 296, 0, 0, 261, 419, 977, 978,
-	259, 659, 822, 629, 222, 0, 628, 412, 591, 602,
-	398, 386, 221, 600, 396, 385, 337, 830, 831, 283,
-	310, 907, 906, 905, 309, 311, 903, 904, 902, 209,
-	615, 633, 0, 210, 0, 505, 618, 660, 457, 214,
-	236, 237, 239, 0, 282, 286, 294, 297, 306, 307,
-	316, 370, 423, 451, 447, 456, 0, 585, 609, 623,
-	635, 641, 642, 644, 645, 646, 647, 648, 651, 649,
-	411, 314, 501, 336, 376, 0, 0, 429, 478, 242,
-	613, 502, 913, 935, 924, 788, 789, 914, 915, 939,
-	916, 791, 792, 936, 937, 785, 786, 790, 938, 940,
-	661, 662, 663, 664, 665, 666, 667, 668, 669, 670,
-	671, 672, 673, 674, 675, 676, 677, 678, 656, 514,
-	520, 515, 516, 517, 518, 519, 0, 521, 927, 774,
-	773, 0, 780, 781, 0, 810, 811, 813, 819, 820,
-	821, 832, 879, 880, 888, 890, 891, 889, 892, 893,
-	894, 897, 898, 899, 900, 895, 896, 901, 793, 797,
-	794, 795, 796, 808, 798, 799, 800, 801, 802, 803,
-	804, 805, 806, 807, 809, 950, 951, 952, 953, 954,
-	955, 825, 829, 828, 826, 827, 823, 824, 851, 850,
-	852, 853, 854, 855, 856, 857, 859, 858, 860, 861,
-	862, 863, 864, 865, 833, 834, 837, 838, 836, 835,
-	839, 848, 849, 840, 841, 842, 843, 844, 845, 847,
-	846, 866, 867, 868, 869, 870, 872, 871, 875, 876,
-	874, 873, 878, 877, 772, 198, 223, 371, 0, 460,
-	291, 657, 625, 490, 620, 208, 225, 941, 265, 942,
-	0, 0, 946, 0, 0, 0, 948, 947, 0, 949,
-	911, 910, 0, 0, 943, 944, 0, 945, 0, 0,
-	200, 202, 211, 224, 234, 238, 245, 264, 279, 281,
-	288, 301, 313, 321, 322, 325, 331, 383, 390, 391,
-	392, 393, 413, 414, 415, 418, 421, 422, 425, 427,
-	428, 431, 436, 440, 441, 442, 444, 446, 448, 461,
-	466, 480, 481, 482, 483, 484, 487, 488, 494, 495,
-	496, 497, 498, 506, 507, 522, 593, 595, 612, 632,
-	639, 486, 388, 434, 458, 586, 956, 957, 958, 959,
-	960, 961, 962, 963, 303, 607, 640, 604, 652, 634,
-	443, 381, 0, 0, 384, 284, 308, 323, 0, 624,
-	508, 229, 472, 293, 253, 1031, 0, 213, 248, 232,
-	262, 277, 280, 327, 395, 404, 433, 439, 299, 274,
-	246, 465, 243, 491, 525, 526, 527, 529, 399, 269,
-	438, 400, 0, 379, 582, 583, 319, 0, 0, 86,
+	527, 529, 399, 269, 438, 1373, 1401, 379, 582, 583,
+	319, 400, 0, 0, 0, 0, 0, 0, 0, 0,
 	534, 0, 784, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 420, 0, 0, 0, 771, 0, 0, 0,
 	273, 776, 0, 0, 0, 369, 270, 0, 0, 206,
 	511, 0, 435, 0, 205, 0, 493, 255, 380, 377,
 	590, 285, 276, 272, 252, 320, 389, 432, 524, 426,
-	1727, 373, 0, 0, 503, 405, 0, 0, 0, 0,
+	783, 373, 0, 0, 503, 405, 0, 0, 0, 0,
 	0, 0, 0, 0, 778, 779, 0, 0, 0, 0,
 	0, 0, 0, 0, 326, 250, 328, 204, 417, 504,
 	289, 0, 95, 0, 0, 1032, 513, 966, 755, 932,
 	970, 1033, 984, 985, 986, 971, 0, 240, 972, 973,
 	247, 974, 0, 931, 814, 816, 815, 881, 882, 883,
 	884, 885, 886, 887, 817, 818, 812, 979, 616, 987,
-	988, 0, 268, 324, 275, 267, 587, 0, 0, 0,
-	0, 0, 0, 603, 0, 0, 231, 0, 0, 0,
+	988, 0, 268, 324, 275, 267, 587, 0, 0, 2248,
+	2249, 2250, 0, 603, 0, 0, 231, 0, 0, 0,
 	0, 0, 0, 0, 751, 768, 0, 782, 0, 0,
 	0, 278, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 765, 766,
@@ -3693,7 +3507,7 @@ var yyAct = [...]int{
 	833, 834, 837, 838, 836, 835, 839, 848, 849, 840,
 	841, 842, 843, 844, 845, 847, 846, 866, 867, 868,
 	869, 870, 872, 871, 875, 876, 874, 873, 878, 877,
-	772, 198, 223, 371, 94, 460, 291, 657, 625, 490,
+	772, 198, 223, 371, 0, 460, 291, 657, 625, 490,
 	620, 208, 225, 941, 265, 942, 0, 0, 946, 0,
 	0, 0, 948, 947, 0, 949, 911, 910, 0, 0,
 	943, 944, 0, 945, 0, 0, 200, 202, 211, 224,
@@ -3716,12 +3530,12 @@ var yyAct = [...]int{
 	205, 0, 493, 255, 380, 377, 590, 285, 276, 272,
 	252, 320, 389, 432, 524, 426, 783, 373, 0, 0,
 	503, 405, 0, 0, 0, 0, 0, 0, 0, 0,
-	778, 779, 0, 0, 0, 0, 0, 0, 0, 0,
+	778, 779, 0, 0, 0, 0, 0, 0, 2457, 0,
 	326, 250, 328, 204, 417, 504, 289, 0, 95, 0,
 	0, 1032, 513, 966, 755, 932, 970, 1033, 984, 985,
 	986, 971, 0, 240, 972, 973, 247, 974, 0, 931,
 	814, 816, 815, 881, 882, 883, 884, 885, 886, 887,
-	817, 818, 812, 979, 616, 987, 988, 0, 268, 324,
+	817, 818, 812, 979, 616, 987, 988, 2458, 268, 324,
 	275, 267, 587, 0, 0, 0, 0, 0, 0, 603,
 	0, 0, 231, 0, 0, 0, 0, 0, 0, 0,
 	751, 768, 0, 782, 0, 0, 0, 278, 0, 0,
@@ -3737,7 +3551,7 @@ var yyAct = [...]int{
 	0, 923, 0, 0, 0, 0, 368, 0, 333, 199,
 	227, 0, 0, 416, 467, 479, 0, 0, 0, 976,
 	0, 477, 430, 611, 235, 287, 464, 437, 475, 445,
-	290, 4117, 0, 476, 375, 592, 455, 608, 637, 638,
+	290, 0, 0, 476, 375, 592, 455, 608, 637, 638,
 	266, 410, 622, 528, 630, 655, 228, 263, 424, 512,
 	614, 500, 401, 588, 589, 332, 499, 298, 203, 372,
 	643, 226, 485, 374, 244, 233, 594, 619, 302, 254,
@@ -3784,15 +3598,15 @@ var yyAct = [...]int{
 	248, 232, 262, 277, 280, 327, 395, 404, 433, 439,
 	299, 274, 246, 465, 243, 491, 525, 526, 527, 529,
 	399, 269, 438, 400, 0, 379, 582, 583, 319, 0,
-	0, 0, 534, 0, 784, 0, 0, 0, 0, 0,
+	0, 86, 534, 0, 784, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 420, 0, 0, 0, 771, 0,
 	0, 0, 273, 776, 0, 0, 0, 369, 270, 0,
 	0, 206, 511, 0, 435, 0, 205, 0, 493, 255,
 	380, 377, 590, 285, 276, 272, 252, 320, 389, 432,
-	524, 426, 783, 373, 0, 0, 503, 405, 0, 0,
+	524, 426, 1727, 373, 0, 0, 503, 405, 0, 0,
 	0, 0, 0, 0, 0, 0, 778, 779, 0, 0,
 	0, 0, 0, 0, 0, 0, 326, 250, 328, 204,
-	417, 504, 289, 0, 95, 0, 1764, 1032, 513, 966,
+	417, 504, 289, 0, 95, 0, 0, 1032, 513, 966,
 	755, 932, 970, 1033, 984, 985, 986, 971, 0, 240,
 	972, 973, 247, 974, 0, 931, 814, 816, 815, 881,
 	882, 883, 884, 885, 886, 887, 817, 818, 812, 979,
@@ -3842,7 +3656,7 @@ var yyAct = [...]int{
 	864, 865, 833, 834, 837, 838, 836, 835, 839, 848,
 	849, 840, 841, 842, 843, 844, 845, 847, 846, 866,
 	867, 868, 869, 870, 872, 871, 875, 876, 874, 873,
-	878, 877, 772, 198, 223, 371, 0, 460, 291, 657,
+	878, 877, 772, 198, 223, 371, 94, 460, 291, 657,
 	625, 490, 620, 208, 225, 941, 265, 942, 0, 0,
 	946, 0, 0, 0, 948, 947, 0, 949, 911, 910,
 	0, 0, 943, 944, 0, 945, 0, 0, 200, 202,
@@ -3875,7 +3689,7 @@ var yyAct = [...]int{
 	0, 603, 0, 0, 231, 0, 0, 0, 0, 0,
 	0, 0, 751, 768, 0, 782, 0, 0, 0, 278,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 765, 766, 1079, 0,
+	0, 0, 0, 0, 0, 0, 765, 766, 0, 0,
 	0, 0, 926, 0, 767, 0, 0, 775, 989, 990,
 	991, 992, 993, 994, 995, 996, 997, 998, 999, 1000,
 	1001, 1002, 1003, 1004, 1005, 1006, 1007, 1008, 1009, 1010,
@@ -3886,7 +3700,7 @@ var yyAct = [...]int{
 	636, 0, 0, 923, 0, 0, 0, 0, 368, 0,
 	333, 199, 227, 0, 0, 416, 467, 479, 0, 0,
 	0, 976, 0, 477, 430, 611, 235, 287, 464, 437,
-	475, 445, 290, 0, 0, 476, 375, 592, 455, 608,
+	475, 445, 290, 4118, 0, 476, 375, 592, 455, 608,
 	637, 638, 266, 410, 622, 528, 630, 655, 228, 263,
 	424, 512, 614, 500, 401, 588, 589, 332, 499, 298,
 	203, 372, 643, 226, 485, 374, 244, 233, 594, 619,
@@ -3941,7 +3755,7 @@ var yyAct = [...]int{
 	389, 432, 524, 426, 783, 373, 0, 0, 503, 405,
 	0, 0, 0, 0, 0, 0, 0, 0, 778, 779,
 	0, 0, 0, 0, 0, 0, 0, 0, 326, 250,
-	328, 204, 417, 504, 289, 0, 95, 0, 0, 1032,
+	328, 204, 417, 504, 289, 0, 95, 0, 1764, 1032,
 	513, 966, 755, 932, 970, 1033, 984, 985, 986, 971,
 	0, 240, 972, 973, 247, 974, 0, 931, 814, 816,
 	815, 881, 882, 883, 884, 885, 886, 887, 817, 818,
@@ -4025,12 +3839,12 @@ var yyAct = [...]int{
 	0, 0, 0, 0, 751, 768, 0, 782, 0, 0,
 	0, 278, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 765, 766,
-	0, 0, 0, 0, 926, 0, 767, 0, 0, 775,
+	1079, 0, 0, 0, 926, 0, 767, 0, 0, 775,
 	989, 990, 991, 992, 993, 994, 995, 996, 997, 998,
 	999, 1000, 1001, 1002, 1003, 1004, 1005, 1006, 1007, 1008,
 	1009, 1010, 1011, 1012, 1013, 1014, 1015, 1016, 1017, 1018,
 	1019, 1020, 1021, 1022, 1023, 1024, 1025, 1026, 1027, 1028,
-	1029, 1030, 3193, 0, 0, 0, 0, 0, 0, 0,
+	1029, 1030, 777, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 300, 0, 406, 260, 0, 459, 925,
 	0, 0, 636, 0, 0, 923, 0, 0, 0, 0,
 	368, 0, 333, 199, 227, 0, 0, 416, 467, 479,
@@ -4104,7 +3918,7 @@ var yyAct = [...]int{
 	993, 994, 995, 996, 997, 998, 999, 1000, 1001, 1002,
 	1003, 1004, 1005, 1006, 1007, 1008, 1009, 1010, 1011, 1012,
 	1013, 1014, 1015, 1016, 1017, 1018, 1019, 1020, 1021, 1022,
-	1023, 1024, 1025, 1026, 1027, 1028, 1029, 1030, 3189, 0,
+	1023, 1024, 1025, 1026, 1027, 1028, 1029, 1030, 777, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 300,
 	0, 406, 260, 0, 459, 925, 0, 0, 636, 0,
 	0, 923, 0, 0, 0, 0, 368, 0, 333, 199,
@@ -4166,12 +3980,12 @@ var yyAct = [...]int{
 	0, 0, 0, 0, 0, 0, 778, 779, 0, 0,
 	0, 0, 0, 0, 0, 0, 326, 250, 328, 204,
 	417, 504, 289, 0, 95, 0, 0, 1032, 513, 966,
-	1100, 932, 970, 1033, 984, 985, 986, 971, 0, 240,
+	755, 932, 970, 1033, 984, 985, 986, 971, 0, 240,
 	972, 973, 247, 974, 0, 931, 814, 816, 815, 881,
 	882, 883, 884, 885, 886, 887, 817, 818, 812, 979,
 	616, 987, 988, 0, 268, 324, 275, 267, 587, 0,
 	0, 0, 0, 0, 0, 603, 0, 0, 231, 0,
-	0, 0, 0, 0, 0, 0, 0, 768, 0, 782,
+	0, 0, 0, 0, 0, 0, 751, 768, 0, 782,
 	0, 0, 0, 278, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	765, 766, 0, 0, 0, 0, 926, 0, 767, 0,
@@ -4179,7 +3993,7 @@ var yyAct = [...]int{
 	997, 998, 999, 1000, 1001, 1002, 1003, 1004, 1005, 1006,
 	1007, 1008, 1009, 1010, 1011, 1012, 1013, 1014, 1015, 1016,
 	1017, 1018, 1019, 1020, 1021, 1022, 1023, 1024, 1025, 1026,
-	1027, 1028, 1029, 1030, 777, 0, 0, 0, 0, 0,
+	1027, 1028, 1029, 1030, 3193, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 300, 0, 406, 260, 0,
 	459, 925, 0, 0, 636, 0, 0, 923, 0, 0,
 	0, 0, 368, 0, 333, 199, 227, 0, 0, 416,
@@ -4240,13 +4054,13 @@ var yyAct = [...]int{
 	0, 0, 503, 405, 0, 0, 0, 0, 0, 0,
 	0, 0, 778, 779, 0, 0, 0, 0, 0, 0,
 	0, 0, 326, 250, 328, 204, 417, 504, 289, 0,
-	95, 0, 0, 1032, 513, 966, 1100, 932, 970, 1033,
+	95, 0, 0, 1032, 513, 966, 755, 932, 970, 1033,
 	984, 985, 986, 971, 0, 240, 972, 973, 247, 974,
 	0, 931, 814, 816, 815, 881, 882, 883, 884, 885,
 	886, 887, 817, 818, 812, 979, 616, 987, 988, 0,
 	268, 324, 275, 267, 587, 0, 0, 0, 0, 0,
 	0, 603, 0, 0, 231, 0, 0, 0, 0, 0,
-	0, 0, 0, 768, 0, 782, 0, 0, 0, 278,
+	0, 0, 751, 768, 0, 782, 0, 0, 0, 278,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 765, 766, 0, 0,
 	0, 0, 926, 0, 767, 0, 0, 775, 989, 990,
@@ -4254,7 +4068,7 @@ var yyAct = [...]int{
 	1001, 1002, 1003, 1004, 1005, 1006, 1007, 1008, 1009, 1010,
 	1011, 1012, 1013, 1014, 1015, 1016, 1017, 1018, 1019, 1020,
 	1021, 1022, 1023, 1024, 1025, 1026, 1027, 1028, 1029, 1030,
-	2139, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	3189, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 300, 0, 406, 260, 0, 459, 925, 0, 0,
 	636, 0, 0, 923, 0, 0, 0, 0, 368, 0,
 	333, 199, 227, 0, 0, 416, 467, 479, 0, 0,
@@ -4328,7 +4142,7 @@ var yyAct = [...]int{
 	995, 996, 997, 998, 999, 1000, 1001, 1002, 1003, 1004,
 	1005, 1006, 1007, 1008, 1009, 1010, 1011, 1012, 1013, 1014,
 	1015, 1016, 1017, 1018, 1019, 1020, 1021, 1022, 1023, 1024,
-	1025, 1026, 1027, 1028, 1029, 1030, 2137, 0, 0, 0,
+	1025, 1026, 1027, 1028, 1029, 1030, 777, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 300, 0, 406,
 	260, 0, 459, 925, 0, 0, 636, 0, 0, 923,
 	0, 0, 0, 0, 368, 0, 333, 199, 227, 0,
@@ -4381,33 +4195,33 @@ var yyAct = [...]int{
 	262, 277, 280, 327, 395, 404, 433, 439, 299, 274,
 	246, 465, 243, 491, 525, 526, 527, 529, 399, 269,
 	438, 400, 0, 379, 582, 583, 319, 0, 0, 0,
-	534, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 420, 0, 0, 0, 0, 0, 0, 0,
-	273, 0, 0, 0, 0, 369, 270, 0, 0, 206,
+	534, 0, 784, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 420, 0, 0, 0, 771, 0, 0, 0,
+	273, 776, 0, 0, 0, 369, 270, 0, 0, 206,
 	511, 0, 435, 0, 205, 0, 493, 255, 380, 377,
 	590, 285, 276, 272, 252, 320, 389, 432, 524, 426,
-	0, 373, 0, 0, 503, 405, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	783, 373, 0, 0, 503, 405, 0, 0, 0, 0,
+	0, 0, 0, 0, 778, 779, 0, 0, 0, 0,
 	0, 0, 0, 0, 326, 250, 328, 204, 417, 504,
-	289, 0, 0, 0, 0, 0, 513, 731, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 240, 0, 0,
-	247, 0, 0, 0, 354, 363, 362, 342, 343, 345,
-	347, 353, 360, 366, 339, 348, 0, 0, 616, 0,
-	0, 0, 268, 324, 275, 267, 587, 0, 0, 0,
-	0, 0, 0, 603, 0, 0, 231, 0, 1151, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	289, 0, 95, 0, 0, 1032, 513, 966, 1100, 932,
+	970, 1033, 984, 985, 986, 971, 0, 240, 972, 973,
+	247, 974, 0, 931, 814, 816, 815, 881, 882, 883,
+	884, 885, 886, 887, 817, 818, 812, 979, 616, 987,
+	988, 0, 268, 324, 275, 267, 587, 0, 0, 0,
+	0, 0, 0, 603, 0, 0, 231, 0, 0, 0,
+	0, 0, 0, 0, 0, 768, 0, 782, 0, 0,
 	0, 278, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 300, 0, 406, 260, 0, 459, 0,
-	0, 1150, 636, 0, 0, 0, 0, 0, 1147, 1148,
-	368, 1108, 333, 199, 227, 1141, 1145, 416, 467, 479,
-	0, 0, 0, 256, 0, 477, 430, 611, 235, 287,
+	0, 0, 0, 0, 0, 0, 0, 0, 765, 766,
+	0, 0, 0, 0, 926, 0, 767, 0, 0, 775,
+	989, 990, 991, 992, 993, 994, 995, 996, 997, 998,
+	999, 1000, 1001, 1002, 1003, 1004, 1005, 1006, 1007, 1008,
+	1009, 1010, 1011, 1012, 1013, 1014, 1015, 1016, 1017, 1018,
+	1019, 1020, 1021, 1022, 1023, 1024, 1025, 1026, 1027, 1028,
+	1029, 1030, 2139, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 300, 0, 406, 260, 0, 459, 925,
+	0, 0, 636, 0, 0, 923, 0, 0, 0, 0,
+	368, 0, 333, 199, 227, 0, 0, 416, 467, 479,
+	0, 0, 0, 976, 0, 477, 430, 611, 235, 287,
 	464, 437, 475, 445, 290, 0, 0, 476, 375, 592,
 	455, 608, 637, 638, 266, 410, 622, 528, 630, 655,
 	228, 263, 424, 512, 614, 500, 401, 588, 589, 332,
@@ -4415,73 +4229,73 @@ var yyAct = [...]int{
 	594, 619, 302, 254, 292, 462, 650, 215, 523, 605,
 	241, 489, 0, 0, 658, 249, 510, 617, 606, 217,
 	601, 509, 397, 329, 330, 216, 0, 463, 271, 296,
-	0, 0, 261, 419, 596, 597, 259, 659, 230, 629,
+	0, 0, 261, 419, 977, 978, 259, 659, 822, 629,
 	222, 0, 628, 412, 591, 602, 398, 386, 221, 600,
-	396, 385, 337, 358, 359, 283, 310, 452, 378, 453,
-	309, 311, 408, 407, 409, 209, 615, 633, 0, 210,
+	396, 385, 337, 830, 831, 283, 310, 907, 906, 905,
+	309, 311, 903, 904, 902, 209, 615, 633, 0, 210,
 	0, 505, 618, 660, 457, 214, 236, 237, 239, 0,
 	282, 286, 294, 297, 306, 307, 316, 370, 423, 451,
 	447, 456, 0, 585, 609, 623, 635, 641, 642, 644,
 	645, 646, 647, 648, 651, 649, 411, 314, 501, 336,
-	376, 0, 0, 429, 478, 242, 613, 502, 201, 0,
-	0, 0, 0, 257, 258, 0, 581, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 661, 662, 663, 664,
+	376, 0, 0, 429, 478, 242, 613, 502, 913, 935,
+	924, 788, 789, 914, 915, 939, 916, 791, 792, 936,
+	937, 785, 786, 790, 938, 940, 661, 662, 663, 664,
 	665, 666, 667, 668, 669, 670, 671, 672, 673, 674,
 	675, 676, 677, 678, 656, 514, 520, 515, 516, 517,
-	518, 519, 0, 521, 0, 0, 0, 0, 0, 402,
-	0, 598, 599, 679, 387, 492, 610, 338, 352, 355,
-	344, 364, 0, 365, 340, 341, 346, 349, 350, 351,
-	356, 357, 361, 367, 251, 212, 394, 403, 584, 315,
-	218, 219, 220, 530, 531, 532, 533, 626, 627, 631,
-	207, 468, 469, 470, 471, 295, 621, 312, 474, 473,
-	334, 335, 382, 454, 546, 548, 559, 563, 565, 567,
-	573, 576, 547, 549, 560, 564, 566, 568, 574, 577,
-	536, 538, 540, 542, 555, 554, 551, 579, 580, 557,
-	562, 541, 553, 558, 571, 578, 575, 535, 539, 543,
-	552, 570, 569, 550, 561, 572, 556, 544, 537, 545,
-	0, 198, 223, 371, 0, 460, 291, 657, 625, 490,
-	620, 208, 225, 0, 265, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 200, 202, 211, 224,
+	518, 519, 0, 521, 927, 774, 773, 0, 780, 781,
+	0, 810, 811, 813, 819, 820, 821, 832, 879, 880,
+	888, 890, 891, 889, 892, 893, 894, 897, 898, 899,
+	900, 895, 896, 901, 793, 797, 794, 795, 796, 808,
+	798, 799, 800, 801, 802, 803, 804, 805, 806, 807,
+	809, 950, 951, 952, 953, 954, 955, 825, 829, 828,
+	826, 827, 823, 824, 851, 850, 852, 853, 854, 855,
+	856, 857, 859, 858, 860, 861, 862, 863, 864, 865,
+	833, 834, 837, 838, 836, 835, 839, 848, 849, 840,
+	841, 842, 843, 844, 845, 847, 846, 866, 867, 868,
+	869, 870, 872, 871, 875, 876, 874, 873, 878, 877,
+	772, 198, 223, 371, 0, 460, 291, 657, 625, 490,
+	620, 208, 225, 941, 265, 942, 0, 0, 946, 0,
+	0, 0, 948, 947, 0, 949, 911, 910, 0, 0,
+	943, 944, 0, 945, 0, 0, 200, 202, 211, 224,
 	234, 238, 245, 264, 279, 281, 288, 301, 313, 321,
 	322, 325, 331, 383, 390, 391, 392, 393, 413, 414,
 	415, 418, 421, 422, 425, 427, 428, 431, 436, 440,
 	441, 442, 444, 446, 448, 461, 466, 480, 481, 482,
 	483, 484, 487, 488, 494, 495, 496, 497, 498, 506,
 	507, 522, 593, 595, 612, 632, 639, 486, 388, 434,
-	458, 586, 304, 305, 449, 450, 317, 318, 653, 654,
+	458, 586, 956, 957, 958, 959, 960, 961, 962, 963,
 	303, 607, 640, 604, 652, 634, 443, 381, 0, 0,
 	384, 284, 308, 323, 0, 624, 508, 229, 472, 293,
-	253, 0, 0, 213, 248, 232, 262, 277, 280, 327,
+	253, 1031, 0, 213, 248, 232, 262, 277, 280, 327,
 	395, 404, 433, 439, 299, 274, 246, 465, 243, 491,
 	525, 526, 527, 529, 399, 269, 438, 400, 0, 379,
-	582, 583, 319, 0, 0, 86, 534, 0, 0, 0,
+	582, 583, 319, 0, 0, 0, 534, 0, 784, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 420, 0,
-	0, 0, 0, 0, 0, 0, 273, 0, 0, 0,
+	0, 0, 771, 0, 0, 0, 273, 776, 0, 0,
 	0, 369, 270, 0, 0, 206, 511, 0, 435, 0,
 	205, 0, 493, 255, 380, 377, 590, 285, 276, 272,
-	252, 320, 389, 432, 524, 426, 97, 373, 0, 0,
+	252, 320, 389, 432, 524, 426, 783, 373, 0, 0,
 	503, 405, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	778, 779, 0, 0, 0, 0, 0, 0, 0, 0,
 	326, 250, 328, 204, 417, 504, 289, 0, 95, 0,
-	0, 0, 513, 196, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 240, 0, 0, 247, 0, 0, 0,
-	354, 363, 362, 342, 343, 345, 347, 353, 360, 366,
-	339, 348, 0, 0, 616, 0, 0, 0, 268, 324,
+	0, 1032, 513, 966, 1100, 932, 970, 1033, 984, 985,
+	986, 971, 0, 240, 972, 973, 247, 974, 0, 931,
+	814, 816, 815, 881, 882, 883, 884, 885, 886, 887,
+	817, 818, 812, 979, 616, 987, 988, 0, 268, 324,
 	275, 267, 587, 0, 0, 0, 0, 0, 0, 603,
 	0, 0, 231, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 278, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 768, 0, 782, 0, 0, 0, 278, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 765, 766, 0, 0, 0, 0,
+	926, 0, 767, 0, 0, 775, 989, 990, 991, 992,
+	993, 994, 995, 996, 997, 998, 999, 1000, 1001, 1002,
+	1003, 1004, 1005, 1006, 1007, 1008, 1009, 1010, 1011, 1012,
+	1013, 1014, 1015, 1016, 1017, 1018, 1019, 1020, 1021, 1022,
+	1023, 1024, 1025, 1026, 1027, 1028, 1029, 1030, 2137, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 300,
-	0, 406, 260, 0, 459, 0, 0, 0, 636, 0,
-	0, 0, 0, 0, 0, 0, 368, 0, 333, 199,
-	227, 0, 0, 416, 467, 479, 0, 0, 0, 256,
+	0, 406, 260, 0, 459, 925, 0, 0, 636, 0,
+	0, 923, 0, 0, 0, 0, 368, 0, 333, 199,
+	227, 0, 0, 416, 467, 479, 0, 0, 0, 976,
 	0, 477, 430, 611, 235, 287, 464, 437, 475, 445,
 	290, 0, 0, 476, 375, 592, 455, 608, 637, 638,
 	266, 410, 622, 528, 630, 655, 228, 263, 424, 512,
@@ -4490,61 +4304,61 @@ var yyAct = [...]int{
 	292, 462, 650, 215, 523, 605, 241, 489, 0, 0,
 	658, 249, 510, 617, 606, 217, 601, 509, 397, 329,
 	330, 216, 0, 463, 271, 296, 0, 0, 261, 419,
-	596, 597, 259, 659, 230, 629, 222, 0, 628, 412,
-	591, 602, 398, 386, 221, 600, 396, 385, 337, 358,
-	359, 283, 310, 452, 378, 453, 309, 311, 408, 407,
-	409, 209, 615, 633, 0, 210, 0, 505, 618, 660,
+	977, 978, 259, 659, 822, 629, 222, 0, 628, 412,
+	591, 602, 398, 386, 221, 600, 396, 385, 337, 830,
+	831, 283, 310, 907, 906, 905, 309, 311, 903, 904,
+	902, 209, 615, 633, 0, 210, 0, 505, 618, 660,
 	457, 214, 236, 237, 239, 0, 282, 286, 294, 297,
 	306, 307, 316, 370, 423, 451, 447, 456, 0, 585,
 	609, 623, 635, 641, 642, 644, 645, 646, 647, 648,
 	651, 649, 411, 314, 501, 336, 376, 0, 0, 429,
-	478, 242, 613, 502, 201, 0, 0, 0, 0, 257,
-	258, 0, 581, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 661, 662, 663, 664, 665, 666, 667, 668,
-	669, 670, 671, 672, 673, 674, 675, 676, 677, 678,
-	656, 514, 520, 515, 516, 517, 518, 519, 0, 521,
-	0, 0, 0, 0, 0, 402, 0, 598, 599, 679,
-	387, 492, 610, 338, 352, 355, 344, 364, 0, 365,
-	340, 341, 346, 349, 350, 351, 356, 357, 361, 367,
-	251, 212, 394, 403, 584, 315, 218, 219, 220, 530,
-	531, 532, 533, 626, 627, 631, 207, 468, 469, 470,
-	471, 295, 621, 312, 474, 473, 334, 335, 382, 454,
-	546, 548, 559, 563, 565, 567, 573, 576, 547, 549,
-	560, 564, 566, 568, 574, 577, 536, 538, 540, 542,
-	555, 554, 551, 579, 580, 557, 562, 541, 553, 558,
-	571, 578, 575, 535, 539, 543, 552, 570, 569, 550,
-	561, 572, 556, 544, 537, 545, 0, 198, 223, 371,
-	94, 460, 291, 657, 625, 490, 620, 208, 225, 0,
-	265, 0, 0, 0, 0, 0, 0, 2444, 0, 0,
-	2443, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	478, 242, 613, 502, 913, 935, 924, 788, 789, 914,
+	915, 939, 916, 791, 792, 936, 937, 785, 786, 790,
+	938, 940, 661, 662, 663, 664, 665, 666, 667, 668,
+	669, 670, 671, 672, 673, 674, 675, 676, 677, 678,
+	656, 514, 520, 515, 516, 517, 518, 519, 0, 521,
+	927, 774, 773, 0, 780, 781, 0, 810, 811, 813,
+	819, 820, 821, 832, 879, 880, 888, 890, 891, 889,
+	892, 893, 894, 897, 898, 899, 900, 895, 896, 901,
+	793, 797, 794, 795, 796, 808, 798, 799, 800, 801,
+	802, 803, 804, 805, 806, 807, 809, 950, 951, 952,
+	953, 954, 955, 825, 829, 828, 826, 827, 823, 824,
+	851, 850, 852, 853, 854, 855, 856, 857, 859, 858,
+	860, 861, 862, 863, 864, 865, 833, 834, 837, 838,
+	836, 835, 839, 848, 849, 840, 841, 842, 843, 844,
+	845, 847, 846, 866, 867, 868, 869, 870, 872, 871,
+	875, 876, 874, 873, 878, 877, 772, 198, 223, 371,
+	0, 460, 291, 657, 625, 490, 620, 208, 225, 941,
+	265, 942, 0, 0, 946, 0, 0, 0, 948, 947,
+	0, 949, 911, 910, 0, 0, 943, 944, 0, 945,
 	0, 0, 200, 202, 211, 224, 234, 238, 245, 264,
 	279, 281, 288, 301, 313, 321, 322, 325, 331, 383,
 	390, 391, 392, 393, 413, 414, 415, 418, 421, 422,
 	425, 427, 428, 431, 436, 440, 441, 442, 444, 446,
 	448, 461, 466, 480, 481, 482, 483, 484, 487, 488,
 	494, 495, 496, 497, 498, 506, 507, 522, 593, 595,
-	612, 632, 639, 486, 388, 434, 458, 586, 304, 305,
-	449, 450, 317, 318, 653, 654, 303, 607, 640, 604,
+	612, 632, 639, 486, 388, 434, 458, 586, 956, 957,
+	958, 959, 960, 961, 962, 963, 303, 607, 640, 604,
 	652, 634, 443, 381, 0, 0, 384, 284, 308, 323,
-	0, 624, 508, 229, 472, 293, 253, 0, 0, 213,
+	0, 624, 508, 229, 472, 293, 253, 1031, 0, 213,
 	248, 232, 262, 277, 280, 327, 395, 404, 433, 439,
 	299, 274, 246, 465, 243, 491, 525, 526, 527, 529,
 	399, 269, 438, 400, 0, 379, 582, 583, 319, 0,
-	0, 86, 534, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 534, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 420, 0, 0, 0, 0, 0,
 	0, 0, 273, 0, 0, 0, 0, 369, 270, 0,
 	0, 206, 511, 0, 435, 0, 205, 0, 493, 255,
 	380, 377, 590, 285, 276, 272, 252, 320, 389, 432,
-	524, 426, 97, 373, 0, 0, 503, 405, 0, 0,
+	524, 426, 0, 373, 0, 0, 503, 405, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 326, 250, 328, 204,
-	417, 504, 289, 0, 95, 0, 1764, 0, 513, 731,
+	417, 504, 289, 0, 0, 0, 0, 0, 513, 731,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 240,
 	0, 0, 247, 0, 0, 0, 354, 363, 362, 342,
 	343, 345, 347, 353, 360, 366, 339, 348, 0, 0,
 	616, 0, 0, 0, 268, 324, 275, 267, 587, 0,
 	0, 0, 0, 0, 0, 603, 0, 0, 231, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	1151, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 278, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -4554,8 +4368,8 @@ var yyAct = [...]int{
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 300, 0, 406, 260, 0,
-	459, 0, 0, 0, 636, 0, 0, 0, 0, 0,
-	0, 0, 368, 0, 333, 199, 227, 0, 0, 416,
+	459, 0, 0, 1150, 636, 0, 0, 0, 0, 0,
+	1147, 1148, 368, 1108, 333, 199, 227, 1141, 1145, 416,
 	467, 479, 0, 0, 0, 256, 0, 477, 430, 611,
 	235, 287, 464, 437, 475, 445, 290, 0, 0, 476,
 	375, 592, 455, 608, 637, 638, 266, 410, 622, 528,
@@ -4588,7 +4402,7 @@ var yyAct = [...]int{
 	574, 577, 536, 538, 540, 542, 555, 554, 551, 579,
 	580, 557, 562, 541, 553, 558, 571, 578, 575, 535,
 	539, 543, 552, 570, 569, 550, 561, 572, 556, 544,
-	537, 545, 0, 198, 223, 371, 94, 460, 291, 657,
+	537, 545, 0, 198, 223, 371, 0, 460, 291, 657,
 	625, 490, 620, 208, 225, 0, 265, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 200, 202,
@@ -4603,23 +4417,23 @@ var yyAct = [...]int{
 	0, 0, 384, 284, 308, 323, 0, 624, 508, 229,
 	472, 293, 253, 0, 0, 213, 248, 232, 262, 277,
 	280, 327, 395, 404, 433, 439, 299, 274, 246, 465,
-	243, 491, 525, 526, 527, 529, 399, 269, 438, 1792,
-	0, 379, 582, 583, 319, 0, 0, 0, 534, 0,
+	243, 491, 525, 526, 527, 529, 399, 269, 438, 400,
+	0, 379, 582, 583, 319, 0, 0, 86, 534, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	420, 0, 0, 1794, 0, 0, 0, 0, 273, 0,
+	420, 0, 0, 0, 0, 0, 0, 0, 273, 0,
 	0, 0, 0, 369, 270, 0, 0, 206, 511, 0,
 	435, 0, 205, 0, 493, 255, 380, 377, 590, 285,
-	276, 272, 252, 320, 389, 432, 524, 426, 0, 373,
+	276, 272, 252, 320, 389, 432, 524, 426, 97, 373,
 	0, 0, 503, 405, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 326, 250, 328, 204, 417, 504, 289, 0,
-	0, 0, 0, 1796, 513, 731, 0, 0, 0, 0,
+	95, 0, 0, 0, 513, 196, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 240, 0, 0, 247, 0,
 	0, 0, 354, 363, 362, 342, 343, 345, 347, 353,
 	360, 366, 339, 348, 0, 0, 616, 0, 0, 0,
 	268, 324, 275, 267, 587, 0, 0, 0, 0, 0,
-	0, 603, 0, 0, 231, 0, 0, 0, 1489, 0,
-	1490, 1491, 0, 0, 0, 0, 0, 0, 0, 278,
+	0, 603, 0, 0, 231, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 278,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -4663,9 +4477,9 @@ var yyAct = [...]int{
 	540, 542, 555, 554, 551, 579, 580, 557, 562, 541,
 	553, 558, 571, 578, 575, 535, 539, 543, 552, 570,
 	569, 550, 561, 572, 556, 544, 537, 545, 0, 198,
-	223, 371, 0, 460, 291, 657, 625, 490, 620, 208,
-	225, 0, 265, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	223, 371, 94, 460, 291, 657, 625, 490, 620, 208,
+	225, 0, 265, 0, 0, 0, 0, 0, 0, 2444,
+	0, 0, 2443, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 200, 202, 211, 224, 234, 238,
 	245, 264, 279, 281, 288, 301, 313, 321, 322, 325,
 	331, 383, 390, 391, 392, 393, 413, 414, 415, 418,
@@ -4679,16 +4493,16 @@ var yyAct = [...]int{
 	0, 213, 248, 232, 262, 277, 280, 327, 395, 404,
 	433, 439, 299, 274, 246, 465, 243, 491, 525, 526,
 	527, 529, 399, 269, 438, 400, 0, 379, 582, 583,
-	319, 0, 0, 0, 534, 0, 0, 0, 0, 0,
+	319, 0, 0, 86, 534, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 420, 0, 0, 0,
 	0, 0, 0, 0, 273, 0, 0, 0, 0, 369,
 	270, 0, 0, 206, 511, 0, 435, 0, 205, 0,
 	493, 255, 380, 377, 590, 285, 276, 272, 252, 320,
-	389, 432, 524, 426, 0, 373, 0, 0, 503, 405,
+	389, 432, 524, 426, 97, 373, 0, 0, 503, 405,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 326, 250,
-	328, 204, 417, 504, 289, 0, 95, 0, 0, 0,
-	513, 196, 0, 0, 0, 0, 0, 0, 0, 0,
+	328, 204, 417, 504, 289, 0, 95, 0, 1764, 0,
+	513, 731, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 240, 0, 0, 247, 0, 0, 0, 354, 363,
 	362, 342, 343, 345, 347, 353, 360, 366, 339, 348,
 	0, 0, 616, 0, 0, 0, 268, 324, 275, 267,
@@ -4737,9 +4551,9 @@ var yyAct = [...]int{
 	566, 568, 574, 577, 536, 538, 540, 542, 555, 554,
 	551, 579, 580, 557, 562, 541, 553, 558, 571, 578,
 	575, 535, 539, 543, 552, 570, 569, 550, 561, 572,
-	556, 544, 537, 545, 0, 198, 223, 371, 0, 460,
+	556, 544, 537, 545, 0, 198, 223, 371, 94, 460,
 	291, 657, 625, 490, 620, 208, 225, 0, 265, 0,
-	0, 0, 0, 0, 0, 2444, 0, 0, 2443, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	200, 202, 211, 224, 234, 238, 245, 264, 279, 281,
 	288, 301, 313, 321, 322, 325, 331, 383, 390, 391,
@@ -4753,22 +4567,22 @@ var yyAct = [...]int{
 	508, 229, 472, 293, 253, 0, 0, 213, 248, 232,
 	262, 277, 280, 327, 395, 404, 433, 439, 299, 274,
 	246, 465, 243, 491, 525, 526, 527, 529, 399, 269,
-	438, 400, 0, 379, 582, 583, 319, 0, 0, 0,
+	438, 1792, 0, 379, 582, 583, 319, 0, 0, 0,
 	534, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 420, 0, 0, 2389, 0, 0, 0, 0,
+	0, 0, 420, 0, 0, 1794, 0, 0, 0, 0,
 	273, 0, 0, 0, 0, 369, 270, 0, 0, 206,
 	511, 0, 435, 0, 205, 0, 493, 255, 380, 377,
 	590, 285, 276, 272, 252, 320, 389, 432, 524, 426,
 	0, 373, 0, 0, 503, 405, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 326, 250, 328, 204, 417, 504,
-	289, 0, 0, 0, 0, 1977, 513, 196, 0, 0,
+	289, 0, 0, 0, 0, 1796, 513, 731, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 240, 0, 0,
 	247, 0, 0, 0, 354, 363, 362, 342, 343, 345,
 	347, 353, 360, 366, 339, 348, 0, 0, 616, 0,
 	0, 0, 268, 324, 275, 267, 587, 0, 0, 0,
 	0, 0, 0, 603, 0, 0, 231, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	1489, 0, 1490, 1491, 0, 0, 0, 0, 0, 0,
 	0, 278, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -4781,7 +4595,7 @@ var yyAct = [...]int{
 	0, 0, 636, 0, 0, 0, 0, 0, 0, 0,
 	368, 0, 333, 199, 227, 0, 0, 416, 467, 479,
 	0, 0, 0, 256, 0, 477, 430, 611, 235, 287,
-	464, 437, 475, 445, 290, 0, 2387, 476, 375, 592,
+	464, 437, 475, 445, 290, 0, 0, 476, 375, 592,
 	455, 608, 637, 638, 266, 410, 622, 528, 630, 655,
 	228, 263, 424, 512, 614, 500, 401, 588, 589, 332,
 	499, 298, 203, 372, 643, 226, 485, 374, 244, 233,
@@ -4836,15 +4650,15 @@ var yyAct = [...]int{
 	252, 320, 389, 432, 524, 426, 0, 373, 0, 0,
 	503, 405, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	326, 250, 328, 204, 417, 504, 289, 0, 0, 0,
-	0, 0, 513, 731, 0, 0, 0, 0, 0, 0,
+	326, 250, 328, 204, 417, 504, 289, 0, 95, 0,
+	0, 0, 513, 196, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 240, 0, 0, 247, 0, 0, 0,
 	354, 363, 362, 342, 343, 345, 347, 353, 360, 366,
 	339, 348, 0, 0, 616, 0, 0, 0, 268, 324,
 	275, 267, 587, 0, 0, 0, 0, 0, 0, 603,
 	0, 0, 231, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 278, 0, 0,
-	0, 0, 0, 0, 0, 0, 1102, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -4853,8 +4667,8 @@ var yyAct = [...]int{
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 300,
 	0, 406, 260, 0, 459, 0, 0, 0, 636, 0,
-	0, 0, 0, 0, 0, 0, 368, 1108, 333, 199,
-	227, 1106, 0, 416, 467, 479, 0, 0, 0, 256,
+	0, 0, 0, 0, 0, 0, 368, 0, 333, 199,
+	227, 0, 0, 416, 467, 479, 0, 0, 0, 256,
 	0, 477, 430, 611, 235, 287, 464, 437, 475, 445,
 	290, 0, 0, 476, 375, 592, 455, 608, 637, 638,
 	266, 410, 622, 528, 630, 655, 228, 263, 424, 512,
@@ -4888,8 +4702,8 @@ var yyAct = [...]int{
 	571, 578, 575, 535, 539, 543, 552, 570, 569, 550,
 	561, 572, 556, 544, 537, 545, 0, 198, 223, 371,
 	0, 460, 291, 657, 625, 490, 620, 208, 225, 0,
-	265, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	265, 0, 0, 0, 0, 0, 0, 2444, 0, 0,
+	2443, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 200, 202, 211, 224, 234, 238, 245, 264,
 	279, 281, 288, 301, 313, 321, 322, 325, 331, 383,
 	390, 391, 392, 393, 413, 414, 415, 418, 421, 422,
@@ -4930,7 +4744,7 @@ var yyAct = [...]int{
 	459, 0, 0, 0, 636, 0, 0, 0, 0, 0,
 	0, 0, 368, 0, 333, 199, 227, 0, 0, 416,
 	467, 479, 0, 0, 0, 256, 0, 477, 430, 611,
-	235, 287, 464, 437, 475, 445, 290, 0, 0, 476,
+	235, 287, 464, 437, 475, 445, 290, 0, 2387, 476,
 	375, 592, 455, 608, 637, 638, 266, 410, 622, 528,
 	630, 655, 228, 263, 424, 512, 614, 500, 401, 588,
 	589, 332, 499, 298, 203, 372, 643, 226, 485, 374,
@@ -4986,14 +4800,14 @@ var yyAct = [...]int{
 	0, 0, 503, 405, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 326, 250, 328, 204, 417, 504, 289, 0,
-	0, 0, 1764, 0, 513, 731, 0, 0, 0, 0,
+	0, 0, 0, 0, 513, 731, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 240, 0, 0, 247, 0,
 	0, 0, 354, 363, 362, 342, 343, 345, 347, 353,
 	360, 366, 339, 348, 0, 0, 616, 0, 0, 0,
 	268, 324, 275, 267, 587, 0, 0, 0, 0, 0,
 	0, 603, 0, 0, 231, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 278,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 1102, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -5002,8 +4816,8 @@ var yyAct = [...]int{
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 300, 0, 406, 260, 0, 459, 0, 0, 0,
-	636, 0, 0, 0, 3748, 0, 0, 0, 368, 0,
-	333, 199, 227, 0, 0, 416, 467, 479, 0, 0,
+	636, 0, 0, 0, 0, 0, 0, 0, 368, 1108,
+	333, 199, 227, 1106, 0, 416, 467, 479, 0, 0,
 	0, 256, 0, 477, 430, 611, 235, 287, 464, 437,
 	475, 445, 290, 0, 0, 476, 375, 592, 455, 608,
 	637, 638, 266, 410, 622, 528, 630, 655, 228, 263,
@@ -5053,15 +4867,15 @@ var yyAct = [...]int{
 	433, 439, 299, 274, 246, 465, 243, 491, 525, 526,
 	527, 529, 399, 269, 438, 400, 0, 379, 582, 583,
 	319, 0, 0, 0, 534, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 420, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 420, 0, 0, 2389,
 	0, 0, 0, 0, 273, 0, 0, 0, 0, 369,
 	270, 0, 0, 206, 511, 0, 435, 0, 205, 0,
 	493, 255, 380, 377, 590, 285, 276, 272, 252, 320,
 	389, 432, 524, 426, 0, 373, 0, 0, 503, 405,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 326, 250,
-	328, 204, 417, 504, 289, 0, 0, 0, 0, 2148,
-	513, 731, 0, 0, 0, 0, 0, 0, 0, 0,
+	328, 204, 417, 504, 289, 0, 0, 0, 0, 1977,
+	513, 196, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 240, 0, 0, 247, 0, 0, 0, 354, 363,
 	362, 342, 343, 345, 347, 353, 360, 366, 339, 348,
 	0, 0, 616, 0, 0, 0, 268, 324, 275, 267,
@@ -5070,7 +4884,7 @@ var yyAct = [...]int{
 	0, 0, 0, 0, 0, 278, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 2149, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -5135,7 +4949,7 @@ var yyAct = [...]int{
 	0, 373, 0, 0, 503, 405, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 326, 250, 328, 204, 417, 504,
-	289, 0, 0, 0, 0, 2900, 513, 731, 0, 0,
+	289, 0, 0, 0, 1764, 0, 513, 731, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 240, 0, 0,
 	247, 0, 0, 0, 354, 363, 362, 342, 343, 345,
 	347, 353, 360, 366, 339, 348, 0, 0, 616, 0,
@@ -5144,14 +4958,14 @@ var yyAct = [...]int{
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 278, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 2901,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 300, 0, 406, 260, 0, 459, 0,
-	0, 0, 636, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 636, 0, 0, 0, 3749, 0, 0, 0,
 	368, 0, 333, 199, 227, 0, 0, 416, 467, 479,
 	0, 0, 0, 256, 0, 477, 430, 611, 235, 287,
 	464, 437, 475, 445, 290, 0, 0, 476, 375, 592,
@@ -5210,8 +5024,8 @@ var yyAct = [...]int{
 	503, 405, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	326, 250, 328, 204, 417, 504, 289, 0, 0, 0,
-	0, 0, 513, 731, 0, 0, 0, 0, 2883, 0,
-	0, 0, 0, 240, 0, 0, 247, 2884, 0, 0,
+	0, 2148, 513, 731, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 240, 0, 0, 247, 0, 0, 0,
 	354, 363, 362, 342, 343, 345, 347, 353, 360, 366,
 	339, 348, 0, 0, 616, 0, 0, 0, 268, 324,
 	275, 267, 587, 0, 0, 0, 0, 0, 0, 603,
@@ -5219,7 +5033,7 @@ var yyAct = [...]int{
 	0, 0, 0, 0, 0, 0, 0, 278, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 2149, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -5278,13 +5092,13 @@ var yyAct = [...]int{
 	399, 269, 438, 400, 0, 379, 582, 583, 319, 0,
 	0, 0, 534, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 420, 0, 0, 0, 0, 0,
-	0, 0, 273, 1815, 0, 0, 0, 369, 270, 0,
+	0, 0, 273, 0, 0, 0, 0, 369, 270, 0,
 	0, 206, 511, 0, 435, 0, 205, 0, 493, 255,
 	380, 377, 590, 285, 276, 272, 252, 320, 389, 432,
 	524, 426, 0, 373, 0, 0, 503, 405, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 326, 250, 328, 204,
-	417, 504, 289, 0, 0, 0, 0, 1814, 513, 731,
+	417, 504, 289, 0, 0, 0, 0, 2900, 513, 731,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 240,
 	0, 0, 247, 0, 0, 0, 354, 363, 362, 342,
 	343, 345, 347, 353, 360, 366, 339, 348, 0, 0,
@@ -5294,7 +5108,7 @@ var yyAct = [...]int{
 	0, 0, 0, 278, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 2901, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -5359,8 +5173,8 @@ var yyAct = [...]int{
 	0, 0, 503, 405, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 326, 250, 328, 204, 417, 504, 289, 0,
-	0, 0, 0, 0, 513, 733, 734, 735, 0, 0,
-	0, 0, 0, 0, 0, 240, 0, 0, 247, 0,
+	0, 0, 0, 0, 513, 731, 0, 0, 0, 0,
+	2883, 0, 0, 0, 0, 240, 0, 0, 247, 2884,
 	0, 0, 354, 363, 362, 342, 343, 345, 347, 353,
 	360, 366, 339, 348, 0, 0, 616, 0, 0, 0,
 	268, 324, 275, 267, 587, 0, 0, 0, 0, 0,
@@ -5427,13 +5241,13 @@ var yyAct = [...]int{
 	527, 529, 399, 269, 438, 400, 0, 379, 582, 583,
 	319, 0, 0, 0, 534, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 420, 0, 0, 0,
-	0, 0, 0, 0, 273, 0, 0, 0, 0, 369,
+	0, 0, 0, 0, 273, 1815, 0, 0, 0, 369,
 	270, 0, 0, 206, 511, 0, 435, 0, 205, 0,
 	493, 255, 380, 377, 590, 285, 276, 272, 252, 320,
 	389, 432, 524, 426, 0, 373, 0, 0, 503, 405,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 326, 250,
-	328, 204, 417, 504, 289, 0, 0, 0, 0, 0,
+	328, 204, 417, 504, 289, 0, 0, 0, 0, 1814,
 	513, 731, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 240, 0, 0, 247, 0, 0, 0, 354, 363,
 	362, 342, 343, 345, 347, 353, 360, 366, 339, 348,
@@ -5450,7 +5264,7 @@ var yyAct = [...]int{
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 300, 0, 406,
 	260, 0, 459, 0, 0, 0, 636, 0, 0, 0,
-	4092, 0, 0, 0, 368, 0, 333, 199, 227, 0,
+	0, 0, 0, 0, 368, 0, 333, 199, 227, 0,
 	0, 416, 467, 479, 0, 0, 0, 256, 0, 477,
 	430, 611, 235, 287, 464, 437, 475, 445, 290, 0,
 	0, 476, 375, 592, 455, 608, 637, 638, 266, 410,
@@ -5508,7 +5322,7 @@ var yyAct = [...]int{
 	0, 373, 0, 0, 503, 405, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 326, 250, 328, 204, 417, 504,
-	289, 0, 0, 0, 0, 1977, 513, 196, 0, 0,
+	289, 0, 0, 0, 0, 0, 513, 733, 734, 735,
 	0, 0, 0, 0, 0, 0, 0, 240, 0, 0,
 	247, 0, 0, 0, 354, 363, 362, 342, 343, 345,
 	347, 353, 360, 366, 339, 348, 0, 0, 616, 0,
@@ -5599,7 +5413,7 @@ var yyAct = [...]int{
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 300,
 	0, 406, 260, 0, 459, 0, 0, 0, 636, 0,
-	0, 0, 3748, 0, 0, 0, 368, 0, 333, 199,
+	0, 0, 4093, 0, 0, 0, 368, 0, 333, 199,
 	227, 0, 0, 416, 467, 479, 0, 0, 0, 256,
 	0, 477, 430, 611, 235, 287, 464, 437, 475, 445,
 	290, 0, 0, 476, 375, 592, 455, 608, 637, 638,
@@ -5657,7 +5471,7 @@ var yyAct = [...]int{
 	524, 426, 0, 373, 0, 0, 503, 405, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 326, 250, 328, 204,
-	417, 504, 289, 0, 95, 0, 0, 0, 513, 731,
+	417, 504, 289, 0, 0, 0, 0, 1977, 513, 196,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 240,
 	0, 0, 247, 0, 0, 0, 354, 363, 362, 342,
 	343, 345, 347, 353, 360, 366, 339, 348, 0, 0,
@@ -5724,7 +5538,7 @@ var yyAct = [...]int{
 	280, 327, 395, 404, 433, 439, 299, 274, 246, 465,
 	243, 491, 525, 526, 527, 529, 399, 269, 438, 400,
 	0, 379, 582, 583, 319, 0, 0, 0, 534, 0,
-	0, 0, 0, 2445, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	420, 0, 0, 0, 0, 0, 0, 0, 273, 0,
 	0, 0, 0, 369, 270, 0, 0, 206, 511, 0,
 	435, 0, 205, 0, 493, 255, 380, 377, 590, 285,
@@ -5732,7 +5546,7 @@ var yyAct = [...]int{
 	0, 0, 503, 405, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 326, 250, 328, 204, 417, 504, 289, 0,
-	0, 0, 0, 0, 513, 196, 0, 0, 0, 0,
+	0, 0, 0, 0, 513, 731, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 240, 0, 0, 247, 0,
 	0, 0, 354, 363, 362, 342, 343, 345, 347, 353,
 	360, 366, 339, 348, 0, 0, 616, 0, 0, 0,
@@ -5748,7 +5562,7 @@ var yyAct = [...]int{
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 300, 0, 406, 260, 0, 459, 0, 0, 0,
-	636, 0, 0, 0, 0, 0, 0, 0, 368, 0,
+	636, 0, 0, 0, 3749, 0, 0, 0, 368, 0,
 	333, 199, 227, 0, 0, 416, 467, 479, 0, 0,
 	0, 256, 0, 477, 430, 611, 235, 287, 464, 437,
 	475, 445, 290, 0, 0, 476, 375, 592, 455, 608,
@@ -5806,7 +5620,7 @@ var yyAct = [...]int{
 	389, 432, 524, 426, 0, 373, 0, 0, 503, 405,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 326, 250,
-	328, 204, 417, 504, 289, 0, 0, 0, 0, 1796,
+	328, 204, 417, 504, 289, 0, 95, 0, 0, 0,
 	513, 731, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 240, 0, 0, 247, 0, 0, 0, 354, 363,
 	362, 342, 343, 345, 347, 353, 360, 366, 339, 348,
@@ -5873,7 +5687,7 @@ var yyAct = [...]int{
 	262, 277, 280, 327, 395, 404, 433, 439, 299, 274,
 	246, 465, 243, 491, 525, 526, 527, 529, 399, 269,
 	438, 400, 0, 379, 582, 583, 319, 0, 0, 0,
-	534, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	534, 0, 0, 0, 0, 2445, 0, 0, 0, 0,
 	0, 0, 420, 0, 0, 0, 0, 0, 0, 0,
 	273, 0, 0, 0, 0, 369, 270, 0, 0, 206,
 	511, 0, 435, 0, 205, 0, 493, 255, 380, 377,
@@ -5931,7 +5745,7 @@ var yyAct = [...]int{
 	536, 538, 540, 542, 555, 554, 551, 579, 580, 557,
 	562, 541, 553, 558, 571, 578, 575, 535, 539, 543,
 	552, 570, 569, 550, 561, 572, 556, 544, 537, 545,
-	0, 198, 223, 371, 2095, 460, 291, 657, 625, 490,
+	0, 198, 223, 371, 0, 460, 291, 657, 625, 490,
 	620, 208, 225, 0, 265, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 200, 202, 211, 224,
@@ -5956,7 +5770,7 @@ var yyAct = [...]int{
 	503, 405, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	326, 250, 328, 204, 417, 504, 289, 0, 0, 0,
-	0, 2086, 513, 731, 0, 0, 0, 0, 0, 0,
+	0, 1796, 513, 731, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 240, 0, 0, 247, 0, 0, 0,
 	354, 363, 362, 342, 343, 345, 347, 353, 360, 366,
 	339, 348, 0, 0, 616, 0, 0, 0, 268, 324,
@@ -6025,12 +5839,12 @@ var yyAct = [...]int{
 	0, 0, 534, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 420, 0, 0, 0, 0, 0,
 	0, 0, 273, 0, 0, 0, 0, 369, 270, 0,
-	1944, 206, 511, 0, 435, 0, 205, 0, 493, 255,
+	0, 206, 511, 0, 435, 0, 205, 0, 493, 255,
 	380, 377, 590, 285, 276, 272, 252, 320, 389, 432,
 	524, 426, 0, 373, 0, 0, 503, 405, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 326, 250, 328, 204,
-	417, 504, 289, 0, 0, 0, 0, 0, 513, 731,
+	417, 504, 289, 0, 0, 0, 0, 0, 513, 196,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 240,
 	0, 0, 247, 0, 0, 0, 354, 363, 362, 342,
 	343, 345, 347, 353, 360, 366, 339, 348, 0, 0,
@@ -6080,7 +5894,7 @@ var yyAct = [...]int{
 	574, 577, 536, 538, 540, 542, 555, 554, 551, 579,
 	580, 557, 562, 541, 553, 558, 571, 578, 575, 535,
 	539, 543, 552, 570, 569, 550, 561, 572, 556, 544,
-	537, 545, 0, 198, 223, 371, 0, 460, 291, 657,
+	537, 545, 0, 198, 223, 371, 2095, 460, 291, 657,
 	625, 490, 620, 208, 225, 0, 265, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 200, 202,
@@ -6099,13 +5913,13 @@ var yyAct = [...]int{
 	0, 379, 582, 583, 319, 0, 0, 0, 534, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	420, 0, 0, 0, 0, 0, 0, 0, 273, 0,
-	0, 0, 0, 369, 270, 0, 1942, 206, 511, 0,
+	0, 0, 0, 369, 270, 0, 0, 206, 511, 0,
 	435, 0, 205, 0, 493, 255, 380, 377, 590, 285,
 	276, 272, 252, 320, 389, 432, 524, 426, 0, 373,
 	0, 0, 503, 405, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 326, 250, 328, 204, 417, 504, 289, 0,
-	0, 0, 0, 0, 513, 731, 0, 0, 0, 0,
+	0, 0, 0, 2086, 513, 731, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 240, 0, 0, 247, 0,
 	0, 0, 354, 363, 362, 342, 343, 345, 347, 353,
 	360, 366, 339, 348, 0, 0, 616, 0, 0, 0,
@@ -6174,7 +5988,7 @@ var yyAct = [...]int{
 	319, 0, 0, 0, 534, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 420, 0, 0, 0,
 	0, 0, 0, 0, 273, 0, 0, 0, 0, 369,
-	270, 0, 1940, 206, 511, 0, 435, 0, 205, 0,
+	270, 0, 1944, 206, 511, 0, 435, 0, 205, 0,
 	493, 255, 380, 377, 590, 285, 276, 272, 252, 320,
 	389, 432, 524, 426, 0, 373, 0, 0, 503, 405,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -6248,7 +6062,7 @@ var yyAct = [...]int{
 	438, 400, 0, 379, 582, 583, 319, 0, 0, 0,
 	534, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 420, 0, 0, 0, 0, 0, 0, 0,
-	273, 0, 0, 0, 0, 369, 270, 0, 1938, 206,
+	273, 0, 0, 0, 0, 369, 270, 0, 1942, 206,
 	511, 0, 435, 0, 205, 0, 493, 255, 380, 377,
 	590, 285, 276, 272, 252, 320, 389, 432, 524, 426,
 	0, 373, 0, 0, 503, 405, 0, 0, 0, 0,
@@ -6323,7 +6137,7 @@ var yyAct = [...]int{
 	582, 583, 319, 0, 0, 0, 534, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 420, 0,
 	0, 0, 0, 0, 0, 0, 273, 0, 0, 0,
-	0, 369, 270, 0, 1936, 206, 511, 0, 435, 0,
+	0, 369, 270, 0, 1940, 206, 511, 0, 435, 0,
 	205, 0, 493, 255, 380, 377, 590, 285, 276, 272,
 	252, 320, 389, 432, 524, 426, 0, 373, 0, 0,
 	503, 405, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -6398,7 +6212,7 @@ var yyAct = [...]int{
 	0, 0, 534, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 420, 0, 0, 0, 0, 0,
 	0, 0, 273, 0, 0, 0, 0, 369, 270, 0,
-	1932, 206, 511, 0, 435, 0, 205, 0, 493, 255,
+	1938, 206, 511, 0, 435, 0, 205, 0, 493, 255,
 	380, 377, 590, 285, 276, 272, 252, 320, 389, 432,
 	524, 426, 0, 373, 0, 0, 503, 405, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -6472,7 +6286,7 @@ var yyAct = [...]int{
 	0, 379, 582, 583, 319, 0, 0, 0, 534, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	420, 0, 0, 0, 0, 0, 0, 0, 273, 0,
-	0, 0, 0, 369, 270, 0, 1930, 206, 511, 0,
+	0, 0, 0, 369, 270, 0, 1936, 206, 511, 0,
 	435, 0, 205, 0, 493, 255, 380, 377, 590, 285,
 	276, 272, 252, 320, 389, 432, 524, 426, 0, 373,
 	0, 0, 503, 405, 0, 0, 0, 0, 0, 0,
@@ -6547,7 +6361,7 @@ var yyAct = [...]int{
 	319, 0, 0, 0, 534, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 420, 0, 0, 0,
 	0, 0, 0, 0, 273, 0, 0, 0, 0, 369,
-	270, 0, 1928, 206, 511, 0, 435, 0, 205, 0,
+	270, 0, 1932, 206, 511, 0, 435, 0, 205, 0,
 	493, 255, 380, 377, 590, 285, 276, 272, 252, 320,
 	389, 432, 524, 426, 0, 373, 0, 0, 503, 405,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -6621,13 +6435,13 @@ var yyAct = [...]int{
 	438, 400, 0, 379, 582, 583, 319, 0, 0, 0,
 	534, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 420, 0, 0, 0, 0, 0, 0, 0,
-	273, 0, 0, 0, 0, 369, 270, 0, 0, 206,
+	273, 0, 0, 0, 0, 369, 270, 0, 1930, 206,
 	511, 0, 435, 0, 205, 0, 493, 255, 380, 377,
 	590, 285, 276, 272, 252, 320, 389, 432, 524, 426,
 	0, 373, 0, 0, 503, 405, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 326, 250, 328, 204, 417, 504,
-	289, 0, 1903, 0, 0, 0, 513, 731, 0, 0,
+	289, 0, 0, 0, 0, 0, 513, 731, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 240, 0, 0,
 	247, 0, 0, 0, 354, 363, 362, 342, 343, 345,
 	347, 353, 360, 366, 339, 348, 0, 0, 616, 0,
@@ -6695,14 +6509,14 @@ var yyAct = [...]int{
 	525, 526, 527, 529, 399, 269, 438, 400, 0, 379,
 	582, 583, 319, 0, 0, 0, 534, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 420, 0,
-	0, 0, 0, 0, 0, 1800, 273, 0, 0, 0,
-	0, 369, 270, 0, 0, 206, 511, 0, 435, 0,
+	0, 0, 0, 0, 0, 0, 273, 0, 0, 0,
+	0, 369, 270, 0, 1928, 206, 511, 0, 435, 0,
 	205, 0, 493, 255, 380, 377, 590, 285, 276, 272,
 	252, 320, 389, 432, 524, 426, 0, 373, 0, 0,
 	503, 405, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	326, 250, 328, 204, 417, 504, 289, 0, 0, 0,
-	0, 0, 513, 196, 0, 0, 0, 0, 0, 0,
+	0, 0, 513, 731, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 240, 0, 0, 247, 0, 0, 0,
 	354, 363, 362, 342, 343, 345, 347, 353, 360, 366,
 	339, 348, 0, 0, 616, 0, 0, 0, 268, 324,
@@ -6776,7 +6590,7 @@ var yyAct = [...]int{
 	524, 426, 0, 373, 0, 0, 503, 405, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 326, 250, 328, 204,
-	417, 504, 289, 0, 95, 0, 0, 0, 513, 966,
+	417, 504, 289, 0, 1903, 0, 0, 0, 513, 731,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 240,
 	0, 0, 247, 0, 0, 0, 354, 363, 362, 342,
 	343, 345, 347, 353, 360, 366, 339, 348, 0, 0,
@@ -6844,7 +6658,7 @@ var yyAct = [...]int{
 	243, 491, 525, 526, 527, 529, 399, 269, 438, 400,
 	0, 379, 582, 583, 319, 0, 0, 0, 534, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	420, 0, 0, 0, 0, 0, 0, 0, 273, 0,
+	420, 0, 0, 0, 0, 0, 0, 1800, 273, 0,
 	0, 0, 0, 369, 270, 0, 0, 206, 511, 0,
 	435, 0, 205, 0, 493, 255, 380, 377, 590, 285,
 	276, 272, 252, 320, 389, 432, 524, 426, 0, 373,
@@ -6865,7 +6679,7 @@ var yyAct = [...]int{
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 1466,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 300, 0, 406, 260, 0, 459, 0, 0, 0,
 	636, 0, 0, 0, 0, 0, 0, 0, 368, 0,
 	333, 199, 227, 0, 0, 416, 467, 479, 0, 0,
@@ -6911,7 +6725,7 @@ var yyAct = [...]int{
 	444, 446, 448, 461, 466, 480, 481, 482, 483, 484,
 	487, 488, 494, 495, 496, 497, 498, 506, 507, 522,
 	593, 595, 612, 632, 639, 486, 388, 434, 458, 586,
-	304, 305, 449, 450, 317, 318, 653, 654, 1465, 607,
+	304, 305, 449, 450, 317, 318, 653, 654, 303, 607,
 	640, 604, 652, 634, 443, 381, 0, 0, 384, 284,
 	308, 323, 0, 624, 508, 229, 472, 293, 253, 0,
 	0, 213, 248, 232, 262, 277, 280, 327, 395, 404,
@@ -6925,8 +6739,8 @@ var yyAct = [...]int{
 	389, 432, 524, 426, 0, 373, 0, 0, 503, 405,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 326, 250,
-	328, 204, 417, 504, 289, 0, 0, 0, 0, 0,
-	513, 196, 0, 0, 0, 0, 0, 0, 0, 0,
+	328, 204, 417, 504, 289, 0, 95, 0, 0, 0,
+	513, 966, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 240, 0, 0, 247, 0, 0, 0, 354, 363,
 	362, 342, 343, 345, 347, 353, 360, 366, 339, 348,
 	0, 0, 616, 0, 0, 0, 268, 324, 275, 267,
@@ -6978,7 +6792,7 @@ var yyAct = [...]int{
 	556, 544, 537, 545, 0, 198, 223, 371, 0, 460,
 	291, 657, 625, 490, 620, 208, 225, 0, 265, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 1058, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	200, 202, 211, 224, 234, 238, 245, 264, 279, 281,
 	288, 301, 313, 321, 322, 325, 331, 383, 390, 391,
 	392, 393, 413, 414, 415, 418, 421, 422, 425, 427,
@@ -7015,8 +6829,8 @@ var yyAct = [...]int{
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 300, 0, 406, 260, 0, 459, 0,
-	682, 0, 636, 0, 0, 0, 0, 0, 0, 0,
+	0, 1466, 0, 300, 0, 406, 260, 0, 459, 0,
+	0, 0, 636, 0, 0, 0, 0, 0, 0, 0,
 	368, 0, 333, 199, 227, 0, 0, 416, 467, 479,
 	0, 0, 0, 256, 0, 477, 430, 611, 235, 287,
 	464, 437, 475, 445, 290, 0, 0, 476, 375, 592,
@@ -7061,7 +6875,7 @@ var yyAct = [...]int{
 	483, 484, 487, 488, 494, 495, 496, 497, 498, 506,
 	507, 522, 593, 595, 612, 632, 639, 486, 388, 434,
 	458, 586, 304, 305, 449, 450, 317, 318, 653, 654,
-	303, 607, 640, 604, 652, 634, 443, 381, 0, 0,
+	1465, 607, 640, 604, 652, 634, 443, 381, 0, 0,
 	384, 284, 308, 323, 0, 624, 508, 229, 472, 293,
 	253, 0, 0, 213, 248, 232, 262, 277, 280, 327,
 	395, 404, 433, 439, 299, 274, 246, 465, 243, 491,
@@ -7075,7 +6889,7 @@ var yyAct = [...]int{
 	503, 405, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	326, 250, 328, 204, 417, 504, 289, 0, 0, 0,
-	0, 0, 513, 731, 0, 0, 0, 0, 0, 0,
+	0, 0, 513, 196, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 240, 0, 0, 247, 0, 0, 0,
 	354, 363, 362, 342, 343, 345, 347, 353, 360, 366,
 	339, 348, 0, 0, 616, 0, 0, 0, 268, 324,
@@ -7127,10 +6941,10 @@ var yyAct = [...]int{
 	561, 572, 556, 544, 537, 545, 0, 198, 223, 371,
 	0, 460, 291, 657, 625, 490, 620, 208, 225, 0,
 	265, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 1058, 0,
 	0, 0, 200, 202, 211, 224, 234, 238, 245, 264,
 	279, 281, 288, 301, 313, 321, 322, 325, 331, 383,
-	390, 391, 392, 393, 4158, 414, 415, 418, 421, 422,
+	390, 391, 392, 393, 413, 414, 415, 418, 421, 422,
 	425, 427, 428, 431, 436, 440, 441, 442, 444, 446,
 	448, 461, 466, 480, 481, 482, 483, 484, 487, 488,
 	494, 495, 496, 497, 498, 506, 507, 522, 593, 595,
@@ -7149,7 +6963,7 @@ var yyAct = [...]int{
 	524, 426, 0, 373, 0, 0, 503, 405, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 326, 250, 328, 204,
-	417, 504, 289, 0, 0, 0, 0, 0, 513, 731,
+	417, 504, 289, 0, 0, 0, 0, 0, 513, 196,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 240,
 	0, 0, 247, 0, 0, 0, 354, 363, 362, 342,
 	343, 345, 347, 353, 360, 366, 339, 348, 0, 0,
@@ -7165,7 +6979,7 @@ var yyAct = [...]int{
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 300, 0, 406, 260, 0,
-	459, 0, 0, 0, 636, 0, 0, 0, 0, 0,
+	459, 0, 682, 0, 636, 0, 0, 0, 0, 0,
 	0, 0, 368, 0, 333, 199, 227, 0, 0, 416,
 	467, 479, 0, 0, 0, 256, 0, 477, 430, 611,
 	235, 287, 464, 437, 475, 445, 290, 0, 0, 476,
@@ -7224,7 +7038,7 @@ var yyAct = [...]int{
 	0, 0, 503, 405, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 326, 250, 328, 204, 417, 504, 289, 0,
-	0, 0, 0, 0, 513, 966, 0, 0, 0, 0,
+	0, 0, 0, 0, 513, 731, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 240, 0, 0, 247, 0,
 	0, 0, 354, 363, 362, 342, 343, 345, 347, 353,
 	360, 366, 339, 348, 0, 0, 616, 0, 0, 0,
@@ -7279,7 +7093,7 @@ var yyAct = [...]int{
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 200, 202, 211, 224, 234, 238,
 	245, 264, 279, 281, 288, 301, 313, 321, 322, 325,
-	331, 383, 390, 391, 392, 393, 413, 414, 415, 418,
+	331, 383, 390, 391, 392, 393, 4159, 414, 415, 418,
 	421, 422, 425, 427, 428, 431, 436, 440, 441, 442,
 	444, 446, 448, 461, 466, 480, 481, 482, 483, 484,
 	487, 488, 494, 495, 496, 497, 498, 506, 507, 522,
@@ -7299,7 +7113,7 @@ var yyAct = [...]int{
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 326, 250,
 	328, 204, 417, 504, 289, 0, 0, 0, 0, 0,
-	513, 196, 0, 0, 0, 0, 0, 0, 0, 0,
+	513, 731, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 240, 0, 0, 247, 0, 0, 0, 354, 363,
 	362, 342, 343, 345, 347, 353, 360, 366, 339, 348,
 	0, 0, 616, 0, 0, 0, 268, 324, 275, 267,
@@ -7364,30 +7178,179 @@ var yyAct = [...]int{
 	508, 229, 472, 293, 253, 0, 0, 213, 248, 232,
 	262, 277, 280, 327, 395, 404, 433, 439, 299, 274,
 	246, 465, 243, 491, 525, 526, 527, 529, 399, 269,
-	438, 0, 0, 379, 582, 583, 319,
+	438, 400, 0, 379, 582, 583, 319, 0, 0, 0,
+	534, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 420, 0, 0, 0, 0, 0, 0, 0,
+	273, 0, 0, 0, 0, 369, 270, 0, 0, 206,
+	511, 0, 435, 0, 205, 0, 493, 255, 380, 377,
+	590, 285, 276, 272, 252, 320, 389, 432, 524, 426,
+	0, 373, 0, 0, 503, 405, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 326, 250, 328, 204, 417, 504,
+	289, 0, 0, 0, 0, 0, 513, 966, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 240, 0, 0,
+	247, 0, 0, 0, 354, 363, 362, 342, 343, 345,
+	347, 353, 360, 366, 339, 348, 0, 0, 616, 0,
+	0, 0, 268, 324, 275, 267, 587, 0, 0, 0,
+	0, 0, 0, 603, 0, 0, 231, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 278, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 300, 0, 406, 260, 0, 459, 0,
+	0, 0, 636, 0, 0, 0, 0, 0, 0, 0,
+	368, 0, 333, 199, 227, 0, 0, 416, 467, 479,
+	0, 0, 0, 256, 0, 477, 430, 611, 235, 287,
+	464, 437, 475, 445, 290, 0, 0, 476, 375, 592,
+	455, 608, 637, 638, 266, 410, 622, 528, 630, 655,
+	228, 263, 424, 512, 614, 500, 401, 588, 589, 332,
+	499, 298, 203, 372, 643, 226, 485, 374, 244, 233,
+	594, 619, 302, 254, 292, 462, 650, 215, 523, 605,
+	241, 489, 0, 0, 658, 249, 510, 617, 606, 217,
+	601, 509, 397, 329, 330, 216, 0, 463, 271, 296,
+	0, 0, 261, 419, 596, 597, 259, 659, 230, 629,
+	222, 0, 628, 412, 591, 602, 398, 386, 221, 600,
+	396, 385, 337, 358, 359, 283, 310, 452, 378, 453,
+	309, 311, 408, 407, 409, 209, 615, 633, 0, 210,
+	0, 505, 618, 660, 457, 214, 236, 237, 239, 0,
+	282, 286, 294, 297, 306, 307, 316, 370, 423, 451,
+	447, 456, 0, 585, 609, 623, 635, 641, 642, 644,
+	645, 646, 647, 648, 651, 649, 411, 314, 501, 336,
+	376, 0, 0, 429, 478, 242, 613, 502, 201, 0,
+	0, 0, 0, 257, 258, 0, 581, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 661, 662, 663, 664,
+	665, 666, 667, 668, 669, 670, 671, 672, 673, 674,
+	675, 676, 677, 678, 656, 514, 520, 515, 516, 517,
+	518, 519, 0, 521, 0, 0, 0, 0, 0, 402,
+	0, 598, 599, 679, 387, 492, 610, 338, 352, 355,
+	344, 364, 0, 365, 340, 341, 346, 349, 350, 351,
+	356, 357, 361, 367, 251, 212, 394, 403, 584, 315,
+	218, 219, 220, 530, 531, 532, 533, 626, 627, 631,
+	207, 468, 469, 470, 471, 295, 621, 312, 474, 473,
+	334, 335, 382, 454, 546, 548, 559, 563, 565, 567,
+	573, 576, 547, 549, 560, 564, 566, 568, 574, 577,
+	536, 538, 540, 542, 555, 554, 551, 579, 580, 557,
+	562, 541, 553, 558, 571, 578, 575, 535, 539, 543,
+	552, 570, 569, 550, 561, 572, 556, 544, 537, 545,
+	0, 198, 223, 371, 0, 460, 291, 657, 625, 490,
+	620, 208, 225, 0, 265, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 200, 202, 211, 224,
+	234, 238, 245, 264, 279, 281, 288, 301, 313, 321,
+	322, 325, 331, 383, 390, 391, 392, 393, 413, 414,
+	415, 418, 421, 422, 425, 427, 428, 431, 436, 440,
+	441, 442, 444, 446, 448, 461, 466, 480, 481, 482,
+	483, 484, 487, 488, 494, 495, 496, 497, 498, 506,
+	507, 522, 593, 595, 612, 632, 639, 486, 388, 434,
+	458, 586, 304, 305, 449, 450, 317, 318, 653, 654,
+	303, 607, 640, 604, 652, 634, 443, 381, 0, 0,
+	384, 284, 308, 323, 0, 624, 508, 229, 472, 293,
+	253, 0, 0, 213, 248, 232, 262, 277, 280, 327,
+	395, 404, 433, 439, 299, 274, 246, 465, 243, 491,
+	525, 526, 527, 529, 399, 269, 438, 400, 0, 379,
+	582, 583, 319, 0, 0, 0, 534, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 420, 0,
+	0, 0, 0, 0, 0, 0, 273, 0, 0, 0,
+	0, 369, 270, 0, 0, 206, 511, 0, 435, 0,
+	205, 0, 493, 255, 380, 377, 590, 285, 276, 272,
+	252, 320, 389, 432, 524, 426, 0, 373, 0, 0,
+	503, 405, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	326, 250, 328, 204, 417, 504, 289, 0, 0, 0,
+	0, 0, 513, 196, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 240, 0, 0, 247, 0, 0, 0,
+	354, 363, 362, 342, 343, 345, 347, 353, 360, 366,
+	339, 348, 0, 0, 616, 0, 0, 0, 268, 324,
+	275, 267, 587, 0, 0, 0, 0, 0, 0, 603,
+	0, 0, 231, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 278, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 300,
+	0, 406, 260, 0, 459, 0, 0, 0, 636, 0,
+	0, 0, 0, 0, 0, 0, 368, 0, 333, 199,
+	227, 0, 0, 416, 467, 479, 0, 0, 0, 256,
+	0, 477, 430, 611, 235, 287, 464, 437, 475, 445,
+	290, 0, 0, 476, 375, 592, 455, 608, 637, 638,
+	266, 410, 622, 528, 630, 655, 228, 263, 424, 512,
+	614, 500, 401, 588, 589, 332, 499, 298, 203, 372,
+	643, 226, 485, 374, 244, 233, 594, 619, 302, 254,
+	292, 462, 650, 215, 523, 605, 241, 489, 0, 0,
+	658, 249, 510, 617, 606, 217, 601, 509, 397, 329,
+	330, 216, 0, 463, 271, 296, 0, 0, 261, 419,
+	596, 597, 259, 659, 230, 629, 222, 0, 628, 412,
+	591, 602, 398, 386, 221, 600, 396, 385, 337, 358,
+	359, 283, 310, 452, 378, 453, 309, 311, 408, 407,
+	409, 209, 615, 633, 0, 210, 0, 505, 618, 660,
+	457, 214, 236, 237, 239, 0, 282, 286, 294, 297,
+	306, 307, 316, 370, 423, 451, 447, 456, 0, 585,
+	609, 623, 635, 641, 642, 644, 645, 646, 647, 648,
+	651, 649, 411, 314, 501, 336, 376, 0, 0, 429,
+	478, 242, 613, 502, 201, 0, 0, 0, 0, 257,
+	258, 0, 581, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 661, 662, 663, 664, 665, 666, 667, 668,
+	669, 670, 671, 672, 673, 674, 675, 676, 677, 678,
+	656, 514, 520, 515, 516, 517, 518, 519, 0, 521,
+	0, 0, 0, 0, 0, 402, 0, 598, 599, 679,
+	387, 492, 610, 338, 352, 355, 344, 364, 0, 365,
+	340, 341, 346, 349, 350, 351, 356, 357, 361, 367,
+	251, 212, 394, 403, 584, 315, 218, 219, 220, 530,
+	531, 532, 533, 626, 627, 631, 207, 468, 469, 470,
+	471, 295, 621, 312, 474, 473, 334, 335, 382, 454,
+	546, 548, 559, 563, 565, 567, 573, 576, 547, 549,
+	560, 564, 566, 568, 574, 577, 536, 538, 540, 542,
+	555, 554, 551, 579, 580, 557, 562, 541, 553, 558,
+	571, 578, 575, 535, 539, 543, 552, 570, 569, 550,
+	561, 572, 556, 544, 537, 545, 0, 198, 223, 371,
+	0, 460, 291, 657, 625, 490, 620, 208, 225, 0,
+	265, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 200, 202, 211, 224, 234, 238, 245, 264,
+	279, 281, 288, 301, 313, 321, 322, 325, 331, 383,
+	390, 391, 392, 393, 413, 414, 415, 418, 421, 422,
+	425, 427, 428, 431, 436, 440, 441, 442, 444, 446,
+	448, 461, 466, 480, 481, 482, 483, 484, 487, 488,
+	494, 495, 496, 497, 498, 506, 507, 522, 593, 595,
+	612, 632, 639, 486, 388, 434, 458, 586, 304, 305,
+	449, 450, 317, 318, 653, 654, 303, 607, 640, 604,
+	652, 634, 443, 381, 0, 0, 384, 284, 308, 323,
+	0, 624, 508, 229, 472, 293, 253, 0, 0, 213,
+	248, 232, 262, 277, 280, 327, 395, 404, 433, 439,
+	299, 274, 246, 465, 243, 491, 525, 526, 527, 529,
+	399, 269, 438, 0, 0, 379, 582, 583, 319,
 }
 
 var yyPact = [...]int{
-	-1000, -1000, 5272, -1000, -551, -1000, -1000, -1000, -1000, -1000,
+	-1000, -1000, 4555, -1000, -558, -1000, -1000, -1000, -1000, -1000,
 	-1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000,
 	-1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000,
 	-1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000,
-	-1000, 2469, 2576, -1000, -1000, -1000, -1000, 2667, -1000, 1033,
-	2110, -1000, 2476, 5131, -1000, 55821, 518, -1000, 52837, -455,
-	883, 238, 36425, -1000, 185, -1000, 159, 54329, 181, -1000,
-	-1000, -1000, -1000, -455, 22251, 2336, 37, 35, 55821, -1000,
-	-1000, -1000, -1000, -370, 2640, 2031, -1000, 400, -1000, -1000,
-	-1000, -1000, -1000, -1000, 52091, -1000, -1000, -1000, 1120, -1000,
-	-1000, 2480, 2501, 2332, 946, 2398, -1000, 2565, 2031, -1000,
-	22251, 2620, 2438, 21505, 21505, 470, -1000, -1000, 275, -1000,
-	-1000, 31203, 55821, 39409, 909, -1000, 2476, -1000, -1000, -1000,
-	193, -1000, 324, 1990, -1000, 1989, -1000, 913, 964, 387,
-	469, 467, 386, 385, 383, 382, 367, 365, 363, 355,
-	394, -1000, 962, 962, -241, -242, 1369, 796, 442, 442,
-	1140, 483, 2444, 2443, -1000, -1000, 962, 962, 962, 360,
-	962, 962, 962, 962, 301, 293, 962, 962, 962, 962,
-	962, 962, 962, 962, 962, 962, 962, 962, 962, 962,
-	962, 962, 962, 884, 2476, 276, -1000, -1000, -1000, -1000,
+	-1000, 2464, 2518, -1000, -1000, -1000, -1000, 2659, -1000, 1021,
+	2094, -1000, 2451, 5683, -1000, 55453, 792, -1000, 52469, -456,
+	905, 234, 36057, -1000, 189, -1000, 173, 53961, 181, -1000,
+	-1000, -1000, -1000, -456, 21883, 2330, 38, 36, 55453, -1000,
+	-1000, -1000, -1000, -373, 2596, 2035, -1000, 419, -1000, -1000,
+	-1000, -1000, -1000, -1000, 51723, -1000, -1000, -1000, 1132, -1000,
+	-1000, 2460, 2455, 2304, 931, 2341, -1000, 2519, 2035, -1000,
+	21883, 2587, 2399, 21137, 21137, 470, -1000, -1000, 299, -1000,
+	-1000, 30835, 55453, 39041, 310, -1000, 2451, -1000, -1000, -1000,
+	188, -1000, 340, 1976, -1000, 1967, -1000, 921, 932, 378,
+	494, 442, 364, 363, 361, 359, 354, 349, 346, 341,
+	387, -1000, 953, 953, -217, -221, 4400, 478, 438, 438,
+	1080, 513, 2396, 2393, -1000, -1000, 953, 953, 953, 362,
+	953, 953, 953, 953, 296, 281, 953, 953, 953, 953,
+	953, 953, 953, 953, 953, 953, 953, 953, 953, 953,
+	953, 953, 953, 885, 2451, 258, -1000, -1000, -1000, -1000,
 	-1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000,
 	-1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000,
 	-1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000,
@@ -7436,67 +7399,67 @@ var yyPact = [...]int{
 	-1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000,
 	-1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000,
 	-1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000,
-	55821, 252, 55821, -1000, 835, 517, -1000, -1000, -459, 1107,
-	1107, 96, 1107, 1107, 1107, 1107, 172, 1028, 32, -1000,
-	160, 294, 167, 277, 1099, 299, -1000, -1000, 265, 1099,
-	1868, -1000, 951, 273, 158, -1000, 1107, 1107, -1000, 14767,
-	206, 14767, 14767, 269, 147, -1000, 2457, -1000, -1000, -1000,
-	-1000, -1000, 1365, -1000, -1000, -1000, -1000, -39, 482, -1000,
-	-1000, -1000, -1000, 54329, 51345, 291, -1000, -1000, 33, 1892,
-	1527, 22251, 1574, 944, -1000, -1000, 1428, 906, -1000, -1000,
-	-1000, -1000, -1000, 816, -1000, 24489, 24489, 24489, 24489, -1000,
-	-1000, 1998, 50599, 1998, 1998, 24489, 1998, 24489, 1998, 1998,
-	1998, 1998, 22251, 1998, 1998, 1998, 1998, -1000, 1998, 1998,
-	1998, 1998, 1998, 1998, 1998, 1998, 1998, 1998, 1998, 1998,
-	1998, 1998, 1998, 1998, 1998, 1998, 1998, 1998, 1998, 1998,
-	1998, 1998, 1998, 1998, 1998, 1998, 1998, 1998, 1998, 1998,
-	1998, 1998, 1998, 1998, 1998, 1998, 1998, 1998, 1998, 1998,
-	1998, 1998, 1998, 1998, 1998, 1998, 1998, 1998, 1998, 1998,
-	1998, 1998, 1998, 1998, 1998, 1998, 1998, 1998, 1998, 1998,
-	1998, 1998, 1998, 1998, 1998, 1998, 1998, 1998, 1998, 1998,
-	1998, 1998, 1998, 1998, 1998, 1998, 1998, 1998, 1998, 1998,
-	1998, 1998, 1998, 1998, 1998, 1998, 1998, 1998, 1998, 1998,
-	1998, 1998, 1998, 1998, 1998, 1998, 1998, 1998, 1998, 1998,
-	1998, 1998, 1998, 1998, 1998, 1998, 1998, 1998, 1998, 1998,
-	1998, 1998, 1998, 1998, 1998, 1998, 1998, 1998, 1998, 1998,
-	1998, 1998, 1998, 1998, 1998, 1998, 1998, -1000, -1000, -1000,
-	-1000, 1998, 834, 1998, 1998, 1998, 1998, 1998, -1000, -1000,
-	-1000, -1000, -1000, -1000, -1000, 1998, 1998, 1998, 1998, 1998,
-	1998, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000,
-	1998, 1998, 1998, 1998, 1998, 1998, 1998, 1998, 1998, 1998,
-	1998, 1998, 1998, 1998, -1000, -1000, -1000, 1684, -1000, -1000,
-	-1000, -1000, -1000, -1000, -1000, 1652, 1611, 1609, 1588, -1000,
-	19267, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000,
+	55453, 185, 55453, -1000, 850, 789, -1000, -1000, -460, 1104,
+	1104, 74, 1104, 1104, 1104, 1104, 184, 1031, 35, -1000,
+	183, 245, 156, 259, 1102, 172, -1000, -1000, 249, 1102,
+	1873, -1000, 936, 255, 207, -1000, 1104, 1104, -1000, 14399,
+	257, 14399, 14399, 254, 158, -1000, 2408, -1000, -1000, -1000,
+	-1000, -1000, 1458, -1000, -1000, -1000, -1000, -39, 511, -1000,
+	-1000, -1000, -1000, 53961, 50977, 309, -1000, -1000, 31, 1813,
+	1162, 21883, 1396, 928, -1000, -1000, 1197, 909, -1000, -1000,
+	-1000, -1000, -1000, 832, -1000, 24121, 24121, 24121, 24121, -1000,
+	-1000, 1734, 50231, 1734, 1734, 24121, 1734, 24121, 1734, 1734,
+	1734, 1734, 21883, 1734, 1734, 1734, 1734, -1000, 1734, 1734,
+	1734, 1734, 1734, 1734, 1734, 1734, 1734, 1734, 1734, 1734,
+	1734, 1734, 1734, 1734, 1734, 1734, 1734, 1734, 1734, 1734,
+	1734, 1734, 1734, 1734, 1734, 1734, 1734, 1734, 1734, 1734,
+	1734, 1734, 1734, 1734, 1734, 1734, 1734, 1734, 1734, 1734,
+	1734, 1734, 1734, 1734, 1734, 1734, 1734, 1734, 1734, 1734,
+	1734, 1734, 1734, 1734, 1734, 1734, 1734, 1734, 1734, 1734,
+	1734, 1734, 1734, 1734, 1734, 1734, 1734, 1734, 1734, 1734,
+	1734, 1734, 1734, 1734, 1734, 1734, 1734, 1734, 1734, 1734,
+	1734, 1734, 1734, 1734, 1734, 1734, 1734, 1734, 1734, 1734,
+	1734, 1734, 1734, 1734, 1734, 1734, 1734, 1734, 1734, 1734,
+	1734, 1734, 1734, 1734, 1734, 1734, 1734, 1734, 1734, 1734,
+	1734, 1734, 1734, 1734, 1734, 1734, 1734, 1734, 1734, 1734,
+	1734, 1734, 1734, 1734, 1734, 1734, 1734, -1000, -1000, -1000,
+	-1000, 1734, 849, 1734, 1734, 1734, 1734, 1734, -1000, -1000,
+	-1000, -1000, -1000, -1000, -1000, 1734, 1734, 1734, 1734, 1734,
+	1734, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000,
+	1734, 1734, 1734, 1734, 1734, 1734, 1734, 1734, 1734, 1734,
+	1734, 1734, 1734, 1734, -1000, -1000, -1000, 1728, -1000, -1000,
+	-1000, -1000, -1000, -1000, -1000, 3009, 1588, 1585, 1584, -1000,
+	18899, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000,
 	-1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000,
 	-1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000,
 	-1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000,
 	-1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000,
-	-1000, 1998, -1000, -1000, -1000, 55821, -1000, 1998, 217, 54329,
-	54329, 331, 1347, -1000, -1000, 2565, 2031, -1000, 2640, 2644,
-	400, -1000, 3901, 1759, 1695, 1378, 2031, 1967, 55821, -1000,
-	2015, 211, -1000, -1000, -1000, -309, -330, 2272, 1486, 1864,
-	-1000, -1000, -1000, -1000, 2347, 22251, -1000, -1000, 2662, -1000,
-	28965, 833, 2658, 49853, -1000, 470, 470, 1986, 423, 9,
-	-1000, -1000, -1000, -1000, 982, 35679, -1000, -1000, -1000, -1000,
-	-1000, 1878, 55821, -1000, -1000, 5540, 54329, -1000, 2109, -1000,
-	1862, -1000, 2072, 22251, 2125, 516, 54329, 513, 509, 499,
-	463, -71, -1000, -1000, -1000, -1000, -1000, -1000, 962, 962,
-	962, -1000, 393, 2614, 5131, 6483, -1000, -1000, -1000, 49107,
-	2107, 54329, -1000, 2102, -1000, 1046, 842, 877, 877, 54329,
-	-1000, -1000, 55075, 54329, 1043, 1040, 54329, 54329, 54329, 54329,
-	-1000, 48361, -1000, 47615, 46869, 1346, 54329, 46123, 45377, 44631,
-	43885, 43139, -1000, 2527, -1000, 2143, -1000, -1000, -1000, 55075,
-	54329, 54329, 55075, 54329, 55075, 55821, 54329, -1000, -1000, 328,
-	-1000, -1000, 1343, 1340, 1338, 962, 962, 1337, 1857, 1852,
-	1831, 962, 962, 1309, 1820, 37917, 1818, 266, 1303, 1296,
-	1294, 1290, 1813, 205, 1809, 1288, 1272, 1280, 54329, 2093,
-	55821, -1000, 260, 1006, 1015, 980, 2476, 2335, 1984, 480,
-	515, 54329, 461, 461, 54329, -1000, 15519, 55821, 213, -1000,
-	1770, 22251, -1000, 1102, 1099, 1099, -1000, -1000, -1000, -1000,
-	-1000, -1000, 1107, 55821, 1102, -1000, -1000, -1000, 1099, 1107,
-	55821, 1107, 1107, 1107, 1107, 1099, 1099, 1099, 1107, 55821,
-	55821, 55821, 55821, 55821, 55821, 55821, 55821, 55821, 14767, 951,
-	1107, -460, -1000, 1757, -1000, -1000, -1000, 2231, -1000, -1000,
+	-1000, 1734, -1000, -1000, -1000, 55453, -1000, 1734, 215, 53961,
+	53961, 384, 1380, -1000, -1000, 2519, 2035, -1000, 2596, 2650,
+	419, -1000, 3948, 1667, 1590, 1477, 2035, 1942, 55453, -1000,
+	1999, 218, -1000, -1000, -1000, -335, -357, 2256, 1586, 1871,
+	-1000, -1000, -1000, -1000, 1291, 21883, -1000, -1000, 2655, -1000,
+	28597, 848, 2651, 49485, -1000, 470, 470, 1959, 423, -15,
+	-1000, -1000, -1000, -1000, 978, 35311, -1000, -1000, -1000, -1000,
+	-1000, 1883, 55453, -1000, -1000, 6933, 53961, -1000, 2093, -1000,
+	1879, -1000, 2017, 21883, 2092, 788, 53961, 781, 766, 534,
+	463, -71, -1000, -1000, -1000, -1000, -1000, -1000, 953, 953,
+	953, -1000, 301, 2581, 5683, 6836, -1000, -1000, -1000, 48739,
+	2090, 53961, -1000, 2063, -1000, 1066, 883, 859, 859, 53961,
+	-1000, -1000, 54707, 53961, 1065, 1052, 53961, 53961, 53961, 53961,
+	-1000, 47993, -1000, 47247, 46501, 1379, 53961, 45755, 45009, 44263,
+	43517, 42771, -1000, 2348, -1000, 2111, -1000, -1000, -1000, 54707,
+	53961, 53961, 54707, 53961, 54707, 55453, 53961, -1000, -1000, 360,
+	-1000, -1000, 1377, 1376, 1370, 953, 953, 1369, 1870, 1868,
+	1843, 953, 953, 1366, 1840, 37549, 1827, 278, 1362, 1357,
+	1347, 1535, 1825, 209, 1823, 1453, 1324, 1343, 53961, 2059,
+	55453, -1000, 235, 1084, 436, 968, 2451, 2329, 1954, 507,
+	786, 53961, 460, 460, 53961, -1000, 15151, 55453, 242, -1000,
+	1821, 21883, -1000, 1118, 1102, 1102, -1000, -1000, -1000, -1000,
+	-1000, -1000, 1104, 55453, 1118, -1000, -1000, -1000, 1102, 1104,
+	55453, 1104, 1104, 1104, 1104, 1102, 1102, 1102, 1104, 55453,
+	55453, 55453, 55453, 55453, 55453, 55453, 55453, 55453, 14399, 936,
+	1104, -461, -1000, 1816, -1000, -1000, -1000, 2244, -1000, -1000,
 	-1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000,
 	-1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000,
 	-1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000,
@@ -7512,338 +7475,338 @@ var yyPact = [...]int{
 	-1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000,
 	-1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000,
 	-1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000,
-	-1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, 14767, 14767,
-	-1000, -1000, 2562, 2560, -1000, -1000, -1000, 1981, -1000, 175,
-	4, 179, -1000, 42393, 493, 969, -1000, 493, -1000, -1000,
-	-1000, -1000, -1000, 1977, 41647, -1000, -463, -464, -468, -470,
-	-1000, -1000, -1000, -471, -477, -1000, -1000, -1000, 22251, 22251,
-	22251, 22251, -276, -1000, 1426, 24489, 2456, -1000, -1000, -1000,
-	-1000, -1000, -1000, -1000, 22251, 1195, 1144, 24489, 24489, 24489,
-	24489, 24489, 24489, 24489, 25981, 25235, 24489, 24489, 24489, 24489,
-	24489, 24489, -1000, -1000, 33441, 5242, 5242, 906, 906, 906,
-	906, -1000, -181, 1973, 55075, -1000, -1000, -1000, 832, 22251,
-	22251, 906, -1000, 1196, 1029, 19267, 22251, 22251, 22251, 22251,
-	990, 1527, 55075, 22251, -1000, 1378, -1000, -1000, -1000, -1000,
-	1200, -1000, -1000, 1091, 2403, 2403, 2403, 2403, 22251, 22251,
-	22251, 22251, 22251, 22251, 22251, 22251, 22251, 22251, 2403, 22251,
-	151, 151, 961, 22251, 22251, 22251, 22251, 22251, 22251, 22251,
-	22251, 17775, 22251, 22251, 24489, 22251, 22251, 22251, 1378, 22251,
-	22251, 22251, 22251, 22251, 22251, 22251, 22251, 22251, 22251, 22251,
-	22251, 22251, 22251, 22251, 22251, 22251, 22251, 22251, 22251, 22251,
-	22251, 22251, 22251, 22251, 22251, 22251, 22251, 22251, 22251, 22251,
-	22251, 22251, 22251, 22251, 22251, 22251, 22251, 22251, 22251, 22251,
-	22251, 22251, 22251, 22251, 22251, 22251, 22251, 22251, 22251, 22251,
-	22251, 22251, 22251, 22251, 22251, 22251, 22251, 22251, 22251, 22251,
-	22251, 22251, 22251, 22251, 22251, 22251, 22251, 22251, 22251, 22251,
-	22251, 22251, 22251, 22251, 22251, 22251, 22251, 22251, 1378, 22251,
-	1199, 22251, 22251, 22251, 22251, 22251, 22251, 22251, 17023, 22251,
-	22251, 22251, 22251, 22251, -1000, -1000, -1000, -1000, -1000, -1000,
-	22251, 22251, 22251, 22251, 22251, 22251, 22251, 22251, 1378, 22251,
-	22251, 22251, 22251, 22251, -1000, -1000, -1000, -1000, -1000, -1000,
-	-1000, -1000, -1000, -1000, 1764, 1721, 1554, 1998, 22251, -1000,
-	1972, -1000, -183, 30457, 22251, 1755, 2651, 2147, 54329, -1000,
-	-1000, -1000, -1000, 2565, -1000, 2565, 1764, 3686, 2279, 21505,
-	-1000, -1000, 3686, -1000, -1000, -1000, -1000, -1000, -1000, -1000,
-	-1000, -1000, -1000, -1000, -1000, -1000, 1783, -1000, 55821, 1967,
-	2544, 54329, -1000, 1958, -1000, -1000, 1998, -1000, -315, -1000,
-	-343, 2265, 1752, 371, -1000, 22251, 22251, 1951, -1000, 1409,
-	55821, -1000, -276, -1000, 40901, -1000, -1000, 14015, 55821, 337,
-	55821, -1000, 29711, 40155, 303, -1000, 9, 1923, -1000, 11,
-	-15, 18521, 901, -1000, -1000, -1000, 1369, 26727, 1879, 901,
-	85, -1000, -1000, -1000, 2072, -1000, 2072, 2072, 2072, 2072,
-	371, 371, 371, 371, -1000, -1000, -1000, -1000, -1000, 2092,
-	2072, 2091, -1000, 2072, 2072, 2072, 2072, -1000, -1000, -1000,
+	-1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, 14399, 14399,
+	-1000, -1000, 2539, 2526, -1000, -1000, -1000, 1946, -1000, 175,
+	6, 180, -1000, 42025, 532, 967, -1000, 532, -1000, -1000,
+	-1000, -1000, -1000, 1945, 41279, -1000, -462, -463, -465, -466,
+	-1000, -1000, -1000, -473, -476, -1000, -1000, -1000, 21883, 21883,
+	21883, 21883, -254, -1000, 1040, 24121, 2432, -1000, -1000, -1000,
+	-1000, -1000, -1000, -1000, 21883, 1227, 1003, 24121, 24121, 24121,
+	24121, 24121, 24121, 24121, 25613, 24867, 24121, 24121, 24121, 24121,
+	24121, 24121, -1000, -1000, 33073, 8389, 8389, 909, 909, 909,
+	909, -1000, -185, 1944, 54707, -1000, -1000, -1000, 846, 21883,
+	21883, 909, -1000, 1470, 1987, 18899, 21883, 21883, 21883, 21883,
+	988, 1162, 54707, 21883, -1000, 1477, -1000, -1000, -1000, -1000,
+	1244, -1000, -1000, 1087, 2385, 2385, 2385, 2385, 21883, 21883,
+	21883, 21883, 21883, 21883, 21883, 21883, 21883, 21883, 2385, 21883,
+	210, 210, 240, 21883, 21883, 21883, 21883, 21883, 21883, 21883,
+	21883, 17407, 21883, 21883, 24121, 21883, 21883, 21883, 1477, 21883,
+	21883, 21883, 21883, 21883, 21883, 21883, 21883, 21883, 21883, 21883,
+	21883, 21883, 21883, 21883, 21883, 21883, 21883, 21883, 21883, 21883,
+	21883, 21883, 21883, 21883, 21883, 21883, 21883, 21883, 21883, 21883,
+	21883, 21883, 21883, 21883, 21883, 21883, 21883, 21883, 21883, 21883,
+	21883, 21883, 21883, 21883, 21883, 21883, 21883, 21883, 21883, 21883,
+	21883, 21883, 21883, 21883, 21883, 21883, 21883, 21883, 21883, 21883,
+	21883, 21883, 21883, 21883, 21883, 21883, 21883, 21883, 21883, 21883,
+	21883, 21883, 21883, 21883, 21883, 21883, 21883, 21883, 1477, 21883,
+	1523, 21883, 21883, 21883, 21883, 21883, 21883, 21883, 16655, 21883,
+	21883, 21883, 21883, 21883, -1000, -1000, -1000, -1000, -1000, -1000,
+	21883, 21883, 21883, 21883, 21883, 21883, 21883, 21883, 1477, 21883,
+	21883, 21883, 21883, 21883, -1000, -1000, -1000, -1000, -1000, -1000,
+	-1000, -1000, -1000, -1000, 1780, 1573, 1604, 1734, 21883, -1000,
+	1943, -1000, -189, 30089, 21883, 1766, 2644, 2138, 53961, -1000,
+	-1000, -1000, -1000, 2519, -1000, 2519, 1780, 3937, 2272, 21137,
+	-1000, -1000, 3937, -1000, -1000, -1000, -1000, -1000, -1000, -1000,
+	-1000, -1000, -1000, -1000, -1000, -1000, 1839, -1000, 55453, 1942,
+	2517, 53961, -1000, 1939, -1000, -1000, 1734, -1000, -317, -1000,
+	-323, 2251, 1764, 376, -1000, 21883, 21883, 1938, -1000, 1423,
+	55453, -1000, -254, -1000, 40533, -1000, -1000, 13647, 55453, 335,
+	55453, -1000, 29343, 39787, 304, -1000, -15, 1920, -1000, 16,
+	-1, 18153, 907, -1000, -1000, -1000, 4400, 26359, 1727, 907,
+	111, -1000, -1000, -1000, 2017, -1000, 2017, 2017, 2017, 2017,
+	376, 376, 376, 376, -1000, -1000, -1000, -1000, -1000, 2055,
+	2017, 2047, -1000, 2017, 2017, 2017, 2017, -1000, -1000, -1000,
 	-1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000,
-	-1000, -1000, -1000, -1000, 2089, 2089, 2089, 2088, 2088, 2074,
-	2074, 437, -1000, 22251, 384, 39409, 2517, 1279, 1681, 260,
-	463, 2144, 54329, 54329, 54329, 55821, 1005, -1000, 1476, 1469,
-	1425, -1000, -533, 1950, -1000, -1000, 2606, -1000, -1000, 1105,
-	1087, 1082, 1138, 54329, 229, 323, -1000, 429, -1000, 39409,
-	54329, 1038, 877, 54329, -1000, 54329, -1000, -1000, -1000, -1000,
-	-1000, 54329, -1000, -1000, 1949, -1000, 1959, 1103, 1081, 1088,
-	1065, 1949, -1000, -1000, -189, 1949, -1000, 1949, -1000, 1949,
-	-1000, 1949, -1000, 1949, -1000, -1000, -1000, -1000, -1000, -1000,
-	-1000, -1000, -1000, 963, 336, -384, 54329, 229, 475, -1000,
-	473, 33441, -1000, -1000, -1000, 33441, 33441, -1000, -1000, -1000,
-	-1000, 1741, 1737, -1000, -1000, -1000, -1000, -1000, -1000, -1000,
+	-1000, -1000, -1000, -1000, 2044, 2044, 2044, 2037, 2037, 2018,
+	2018, 422, -1000, 21883, 414, 39041, 2471, 1340, 1447, 235,
+	463, 2132, 53961, 53961, 53961, 55453, 982, -1000, 1544, 1507,
+	1506, -1000, -539, 1933, -1000, -1000, 2579, -1000, -1000, 974,
+	1101, 1098, 1079, 53961, 219, 308, -1000, 411, -1000, 39041,
+	53961, 1033, 859, 53961, -1000, 53961, -1000, -1000, -1000, -1000,
+	-1000, 53961, -1000, -1000, 1929, -1000, 1986, 1214, 1094, 1150,
+	1083, 1929, -1000, -1000, -194, 1929, -1000, 1929, -1000, 1929,
+	-1000, 1929, -1000, 1929, -1000, -1000, -1000, -1000, -1000, -1000,
+	-1000, -1000, -1000, 1019, 286, -385, 53961, 219, 495, -1000,
+	487, 33073, -1000, -1000, -1000, 33073, 33073, -1000, -1000, -1000,
+	-1000, 1762, 1754, -1000, -1000, -1000, -1000, -1000, -1000, -1000,
 	-1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000,
 	-1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000,
-	-1000, -1000, -522, 55821, -1000, 254, 968, 304, 296, 308,
-	55821, 390, 2432, 2430, 2426, 2408, 2401, 2395, 2383, 239,
-	288, 55821, 55821, 461, 2208, 55821, 2507, 55821, -1000, -1000,
-	-1000, -1000, -1000, 1733, 1704, -1000, 1527, 55821, -1000, -1000,
-	1107, 1107, -1000, -1000, 55821, 1107, -1000, -1000, -1000, -1000,
-	-1000, -1000, -1000, -1000, 1107, -1000, -1000, -1000, -1000, -1000,
+	-1000, -1000, -524, 55453, -1000, 232, 962, 261, 324, 288,
+	55453, 742, 2384, 2380, 2377, 2372, 2369, 2364, 2361, 307,
+	276, 55453, 55453, 460, 2181, 55453, 2483, 55453, -1000, -1000,
+	-1000, -1000, -1000, 1746, 1736, -1000, 1162, 55453, -1000, -1000,
+	1104, 1104, -1000, -1000, 55453, 1104, -1000, -1000, -1000, -1000,
+	-1000, -1000, -1000, -1000, 1104, -1000, -1000, -1000, -1000, -1000,
 	-1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000,
-	55821, -1000, -1000, -1000, -1000, 1689, -1000, 55821, -39, 153,
-	-1000, -1000, 54329, -1000, -1000, -1000, -1000, -1000, -1000, -1000,
-	-1000, -1000, -117, -1000, 327, 2, 419, -1000, -1000, -1000,
-	-1000, -1000, 2553, -1000, 1527, 1009, 1020, -1000, 1998, -1000,
-	-1000, 1108, -1000, -1000, -1000, -1000, -1000, 1998, 1998, 1998,
-	-1000, -1000, -1000, -1000, -1000, 1195, 24489, 24489, 24489, 1509,
-	799, 1412, 924, 1454, 1443, 1443, 955, 24489, 955, 24489,
-	910, 910, 910, 910, 910, -1000, -1000, -1000, -1000, -1000,
-	-1000, 1684, -1000, 1682, -1000, 1998, 55075, 1844, 17023, 2023,
-	1371, 1378, 933, -1000, -1000, -1000, -1000, -1000, -1000, -1000,
+	55453, -1000, -1000, -1000, -1000, 1733, -1000, 55453, -39, 162,
+	-1000, -1000, 53961, -1000, -1000, -1000, -1000, -1000, -1000, -1000,
+	-1000, -1000, -118, -1000, 284, 11, 381, -1000, -1000, -1000,
+	-1000, -1000, 2520, -1000, 1162, 1043, 1012, -1000, 1734, -1000,
+	-1000, 1451, -1000, -1000, -1000, -1000, -1000, 1734, 1734, 1734,
+	-1000, -1000, -1000, -1000, -1000, 1227, 24121, 24121, 24121, 1310,
+	833, 1325, 1336, 1350, 1365, 1365, 1116, 24121, 1116, 24121,
+	913, 913, 913, 913, 913, -1000, -1000, -1000, -1000, -1000,
+	-1000, 1728, -1000, 1716, -1000, 1734, 54707, 1862, 16655, 1857,
+	2540, 1477, 923, -1000, -1000, -1000, -1000, -1000, -1000, -1000,
 	-1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000,
-	-1000, -1000, -1000, 3541, 1378, 1892, 1378, 2206, 3526, 997,
-	-1000, 22251, 1378, 3516, -1000, -1000, 1378, 1378, 22251, -1000,
-	-1000, 22251, 22251, 22251, 22251, 1681, 1681, 1681, 1681, 1681,
-	1681, 1681, 1681, 1681, 1681, 22251, 1681, 1945, -1000, -1000,
+	-1000, -1000, -1000, 3604, 1477, 1813, 1477, 1317, 3577, 987,
+	-1000, 21883, 1477, 3556, -1000, -1000, 1477, 1477, 21883, -1000,
+	-1000, 21883, 21883, 21883, 21883, 1447, 1447, 1447, 1447, 1447,
+	1447, 1447, 1447, 1447, 1447, 21883, 1447, 1926, -1000, -1000,
 	-1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000,
-	-1000, -1000, -1000, -1000, -1000, -1000, 1935, 2649, 2008, 1681,
-	1681, 1681, 1681, 3508, 1681, 1681, 22251, 1308, -1000, -1000,
-	-1000, 1562, 3504, 1367, 3496, 1681, 1681, -1000, 1681, 3491,
-	3485, 1378, 2671, 2666, 1681, 1681, 1681, 1681, 1681, 2650,
-	2632, 1681, 1681, 2581, 1681, 3461, 1681, 2564, 2556, 2551,
-	2542, 2534, 2526, 2479, 2454, 2448, 2427, 2418, 2411, 2373,
-	2338, 2331, 2322, 2308, 2304, 1681, 1681, 1681, 3450, 1681,
-	3446, 1681, 3442, 1681, 1681, 3433, 2300, 2295, 1378, 1932,
-	-1000, 3418, 1681, 3414, 3410, 3405, 2270, 3398, 3388, 3384,
-	1681, 1681, 1681, 2261, 3371, 3363, 3109, 3102, 3097, 3058,
-	3048, 3044, 3028, 1681, 1554, 1554, 1554, 1554, 1554, 3024,
-	-279, 1681, 1378, -1000, -1000, -1000, -1000, -1000, 2996, 2256,
-	2992, 2981, 2976, 2955, 1378, 1998, 831, -1000, -1000, 1554,
-	1378, 1378, 1554, 1554, 2920, 2894, 2890, 2882, 2816, 2796,
-	1681, 1681, -1000, 1681, 2774, 2762, 2234, 2190, 1378, -1000,
-	1554, 55821, -1000, -454, -1000, -12, 912, 1998, -1000, 37917,
-	1378, -1000, 4152, -1000, 1353, -1000, -1000, -1000, -1000, -1000,
-	34933, 1828, -1000, -1000, -1000, -1000, 1998, 1802, -1000, -494,
-	20759, -1000, -1000, -1000, 371, 56, 34187, 882, 882, 111,
-	1527, 1527, 22251, -1000, -1000, -1000, -1000, -1000, -1000, 829,
-	2639, 438, 1998, -1000, 1944, 2988, -1000, -1000, -1000, 2541,
-	27473, -1000, -1000, 1998, 1998, 55821, 1839, 1799, -1000, 825,
-	-1000, 1370, 1923, 9, -9, -1000, -1000, -1000, -1000, 1527,
-	-1000, 1422, 353, 351, -1000, 462, -1000, -1000, -1000, -1000,
-	2357, 75, -1000, -1000, -1000, 373, 371, -1000, -1000, -1000,
-	-1000, -1000, -1000, 1678, -1000, 1678, -1000, -1000, -1000, -1000,
-	-1000, 1277, -1000, -1000, -1000, -1000, 1274, -1000, -1000, 1271,
-	-1000, -1000, 2692, 2171, 384, -1000, -1000, 962, 1667, -1000,
-	-1000, 2375, 962, 962, 54329, -1000, -1000, 1829, 2517, 254,
-	55821, 2207, -1000, 2144, 2144, 2144, -1000, 2503, -1000, -1000,
-	-1000, -1000, -1000, -1000, -526, 176, 364, -1000, -1000, -1000,
-	5096, 54329, 1794, -1000, 226, -1000, 1765, -1000, 54329, -1000,
-	1792, 2087, 54329, 54329, -1000, -1000, -1000, 54329, 1998, -1000,
-	-1000, -1000, -1000, 504, 2475, 332, -1000, -1000, -301, -1000,
-	-1000, 229, 226, 55075, 54329, 901, -1000, -1000, -1000, -1000,
-	-1000, -527, 1787, 490, 231, 334, 55821, 55821, 55821, 55821,
-	55821, 55821, 791, -1000, -1000, 18, -1000, -1000, 203, -1000,
-	-1000, 1664, -1000, -1000, -1000, -1000, 203, -1000, -1000, -1000,
-	-1000, -1000, 274, 472, -1000, 55821, 55821, 931, -1000, -1000,
-	-1000, -1000, -1000, 1099, -1000, -1000, 1099, -1000, -1000, -1000,
-	-1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, 2453,
-	55821, -1, -491, -1000, -488, 22251, -1000, -1000, -1000, -1000,
-	-1000, -1000, -1000, 1331, 506, 1412, 24489, 24489, 1029, 1029,
-	24489, -1000, -1000, -1000, 996, 996, 33441, -1000, 24489, 22251,
-	-1000, -1000, 22251, 22251, 22251, 985, -1000, 22251, 1291, -1000,
-	22251, -1000, -279, 1554, 1681, 1681, 1681, 1681, -279, -279,
-	-279, -279, -279, -279, -279, -279, -279, -279, 1926, -1000,
-	22251, 22251, 22251, 1378, 333, -1000, -1000, -1000, -279, 22251,
-	-1000, -1000, 2645, -1000, 22251, -1000, 33441, 22251, 22251, 22251,
-	-1000, -1000, -1000, 22251, 22251, -1000, -1000, 22251, -1000, 22251,
-	-1000, -1000, -1000, -1000, -1000, -1000, 22251, -1000, 22251, -1000,
-	-1000, -1000, 22251, -1000, 22251, -1000, -1000, 22251, -1000, 22251,
-	-1000, 22251, -1000, 22251, -1000, 22251, -1000, 22251, -1000, 22251,
-	-1000, 22251, -1000, 22251, -1000, 22251, -1000, 22251, -1000, 22251,
-	-1000, 22251, -1000, 22251, -1000, 22251, -1000, 22251, -1000, 22251,
-	-1000, 22251, -1000, -1000, -1000, 22251, -1000, 22251, -1000, 22251,
-	-1000, -1000, 22251, -1000, 22251, -1000, 22251, -1000, 22251, 22251,
-	-1000, 22251, 22251, 22251, -1000, 22251, 22251, 22251, 22251, -1000,
-	-1000, -1000, -1000, 22251, 22251, 22251, 22251, 22251, 22251, 22251,
-	22251, 22251, 22251, -1000, -1000, -1000, -1000, -1000, -1000, 22251,
-	-1000, 39409, 8, -279, 1199, 8, 1199, 23743, 837, 817,
-	22997, -1000, 22251, 16271, -1000, -1000, -1000, -1000, -1000, 22251,
-	22251, 22251, 22251, 22251, 22251, -1000, -1000, -1000, 22251, 22251,
-	-1000, 22251, -1000, 22251, -1000, -1000, -1000, -1000, -1000, 912,
-	-1000, 471, 446, 877, 54329, -1000, -1000, -1000, -1000, 1922,
-	-1000, 2552, -1000, 2301, 2292, 2641, 2639, 21505, -1000, 29711,
-	-1000, -1000, 54329, -1000, -1000, -443, -1000, 2328, 2340, 882,
-	882, -1000, -1000, -1000, -1000, -1000, -1000, -1000, 13263, 2565,
-	22251, 2204, 55075, 1998, -1000, 28219, 54329, 55075, 29711, 29711,
-	29711, 29711, 29711, -1000, 2222, 2220, -1000, 2249, 2248, 2296,
-	55821, -1000, 1764, 1781, -1000, 22251, 31949, 1886, 29711, -1000,
-	-1000, 29711, 55821, 12511, -1000, -1000, -5, -20, -1000, -1000,
-	-1000, -1000, 1369, -1000, -1000, 1213, 2535, 2351, -1000, -1000,
-	-1000, -1000, -1000, 1777, -1000, 1748, 1921, 1732, 1730, 336,
-	-1000, 2118, 2449, 962, 962, -1000, 1263, -1000, 1196, 1661,
-	1655, -1000, -1000, -1000, 489, -1000, 55821, 2199, 2191, 2186,
-	-1000, -544, 1255, 2085, 2116, 22251, 2078, 2604, 1905, 54329,
-	-1000, -1000, 55075, -1000, 278, -1000, 384, 54329, -1000, -1000,
-	-1000, 323, 55821, -1000, 9274, -1000, -1000, -1000, 226, -1000,
-	-1000, -1000, -1000, -1000, -1000, -1000, 55821, 241, -1000, 2076,
-	1361, -1000, -1000, 2131, -1000, -1000, -1000, -1000, -1000, 208,
-	189, 1634, 196, 1622, -1000, 196, -1000, 55821, 923, 2171,
-	55821, -1000, -1000, -1000, 1107, 1107, -1000, -1000, 2440, -1000,
-	1196, 1681, 24489, 24489, -1000, 906, -1000, -1000, 503, -256,
-	2072, 2072, -1000, 2072, 2074, -1000, 2072, 134, 2072, 127,
-	2072, -1000, -1000, 1378, 1378, -1000, 1554, 2185, 1383, 2727,
-	-1000, 1527, 22251, 2719, -1000, -1000, -279, -279, -279, -279,
-	-279, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000,
-	-1000, -78, 2712, 2706, 1681, -1000, 2070, 2062, -1000, 1681,
-	22251, 1681, 1378, 2166, 1681, 1681, 1681, 1681, 1681, 1681,
-	1681, 1681, 1681, 1681, 1681, 1681, 2162, 2158, 2154, 2150,
-	2145, 2135, 2124, 2117, 2063, 2056, 2045, 2040, 2019, 1995,
-	1991, 1979, 1681, 1681, 1974, 1681, 1969, 1928, -1000, 1527,
-	1554, 2687, 1554, 1681, 1681, 2637, 330, 1681, 1728, 1728,
-	1728, 1728, 1728, 1554, 1554, 1554, 1554, 1681, 54329, -1000,
-	-279, -1000, -1000, -373, -379, -1000, 1378, -279, 1913, 24489,
-	1681, 24489, 24489, 24489, 1681, 1378, -1000, 1897, 1860, 2589,
-	1855, 1681, 2378, 1681, 1681, 1681, 1812, -1000, 2536, 1998,
-	2536, 1998, 2536, 1712, 1353, 55821, -1000, -1000, -1000, -1000,
-	2639, 2629, -1000, 1906, -1000, 56, 616, -1000, 2360, 2340,
-	-1000, 2603, 2320, 2602, -1000, -1000, -1000, -1000, -1000, 1527,
-	-1000, 2478, 1896, -1000, 967, 1925, -1000, -1000, 20759, 1717,
-	2284, 803, 1712, 1966, 2988, 2140, 2179, 3393, -1000, -1000,
-	-1000, -1000, 2168, -1000, 2164, -1000, -1000, 2015, -1000, 2366,
-	337, 29711, 1965, 1965, -1000, 801, -1000, -1000, -1000, -1000,
-	-1000, -1000, -1000, 1100, 9274, 2678, -1000, 1619, -1000, 1360,
-	195, 1253, -1000, -1000, 962, 962, -1000, 1035, 1034, -1000,
-	55821, 2060, -1000, 371, 1617, 371, 1249, -1000, -1000, 1244,
-	-1000, -1000, -1000, -1000, 2099, 2350, -1000, -1000, -1000, -1000,
-	55821, -1000, 55821, 55821, 55821, 2050, 2601, -1000, 22251, 2048,
-	965, 2617, 54329, 54329, -1000, -1000, -1000, -1000, -1000, -1000,
-	-1000, -1000, -1000, -1000, -1000, 427, 962, -505, 286, 282,
-	962, 962, 962, -545, -1000, -1000, 1703, 1701, -1000, -190,
-	-1000, 22251, -1000, -1000, -1000, -1000, -1000, 1305, 1305, 1611,
-	1609, 1588, -1000, 2015, -1000, -1000, -1000, 1696, -1000, -1000,
-	-203, 54329, 54329, 54329, 54329, -1000, -1000, -1000, 1209, -1000,
+	-1000, -1000, -1000, -1000, -1000, -1000, 1923, 2642, 1455, 1447,
+	1447, 1447, 1447, 3524, 1447, 1447, 21883, 1346, -1000, -1000,
+	-1000, 1565, 3516, 1254, 3494, 1447, 1447, -1000, 1447, 3487,
+	3483, 1477, 2630, 2620, 1447, 1447, 1447, 1447, 1447, 2611,
+	2602, 1447, 1447, 2535, 1447, 3466, 1447, 2531, 2524, 2515,
+	2501, 2495, 2489, 2461, 2426, 2411, 2407, 2371, 2331, 2327,
+	2323, 2261, 2248, 2237, 2228, 1447, 1447, 1447, 3450, 1447,
+	3446, 1447, 3433, 1447, 1447, 3429, 2212, 2206, 1477, 1921,
+	-1000, 3417, 1447, 3410, 3400, 3388, 2195, 3382, 3371, 3361,
+	1447, 1447, 1447, 2187, 3356, 3306, 3104, 3053, 3048, 3030,
+	3018, 3010, 3006, 1447, 1604, 1604, 1604, 1604, 1604, 2985,
+	-263, 1447, 1477, -1000, -1000, -1000, -1000, -1000, 2976, 2183,
+	2960, 2945, 2937, 2892, 1477, 1734, 844, -1000, -1000, 1604,
+	1477, 1477, 1604, 1604, 2822, 2752, 2733, 2728, 2721, 2710,
+	1447, 1447, -1000, 1447, 2706, 2701, 2133, 2117, 1477, -1000,
+	1604, 55453, -1000, -455, -1000, -12, 1006, 1734, -1000, 37549,
+	1477, -1000, 5688, -1000, 1425, -1000, -1000, -1000, -1000, -1000,
+	34565, 1949, -1000, -1000, -1000, -1000, 1734, 1860, -1000, -496,
+	20391, -1000, -1000, -1000, 376, 58, 33819, 903, 903, 119,
+	1162, 1162, 21883, -1000, -1000, -1000, -1000, -1000, -1000, 842,
+	2603, 398, 1734, -1000, 1985, 3100, -1000, -1000, -1000, 2510,
+	27105, -1000, -1000, 1734, 1734, 55453, 1874, 1865, -1000, 841,
+	-1000, 1471, 1920, -15, -16, -1000, -1000, -1000, -1000, 1162,
+	-1000, 1491, 337, 4215, -1000, 473, -1000, -1000, -1000, -1000,
+	2349, 85, -1000, -1000, -1000, 895, 376, -1000, -1000, -1000,
+	-1000, -1000, -1000, 1712, -1000, 1712, -1000, -1000, -1000, -1000,
+	-1000, 1323, -1000, -1000, -1000, -1000, 1301, -1000, -1000, 1294,
+	-1000, -1000, 2342, 2125, 414, -1000, -1000, 953, 1707, -1000,
+	-1000, 2353, 953, 953, 53961, -1000, -1000, 1711, 2471, 232,
+	55453, 2179, -1000, 2132, 2132, 2132, -1000, 2465, -1000, -1000,
+	-1000, -1000, -1000, -1000, -528, 177, 367, -1000, -1000, -1000,
+	4239, 53961, 1849, -1000, 216, -1000, 1670, -1000, 53961, -1000,
+	1838, 2034, 53961, 53961, -1000, -1000, -1000, 53961, 1734, -1000,
+	-1000, -1000, -1000, 784, 2436, 332, -1000, -1000, -301, -1000,
+	-1000, 219, 216, 54707, 53961, 907, -1000, -1000, -1000, -1000,
+	-1000, -529, 1811, 516, 224, 322, 55453, 55453, 55453, 55453,
+	55453, 55453, 811, -1000, -1000, 26, -1000, -1000, 190, -1000,
+	-1000, 1692, -1000, -1000, -1000, -1000, 190, -1000, -1000, -1000,
+	-1000, -1000, 251, 483, -1000, 55453, 55453, 947, -1000, -1000,
+	-1000, -1000, -1000, 1102, -1000, -1000, 1102, -1000, -1000, -1000,
+	-1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, 2433,
+	55453, 2, -493, -1000, -488, 21883, -1000, -1000, -1000, -1000,
+	-1000, -1000, -1000, 1237, 802, 1325, 24121, 24121, 1987, 1987,
+	24121, -1000, -1000, -1000, 854, 854, 33073, -1000, 24121, 21883,
+	-1000, -1000, 21883, 21883, 21883, 948, -1000, 21883, 1204, -1000,
+	21883, -1000, -263, 1604, 1447, 1447, 1447, 1447, -263, -263,
+	-263, -263, -263, -263, -263, -263, -263, -263, 1963, -1000,
+	21883, 21883, 21883, 1477, 320, -1000, -1000, -1000, -263, 21883,
+	-1000, -1000, 2641, -1000, 21883, -1000, 33073, 21883, 21883, 21883,
+	-1000, -1000, -1000, 21883, 21883, -1000, -1000, 21883, -1000, 21883,
+	-1000, -1000, -1000, -1000, -1000, -1000, 21883, -1000, 21883, -1000,
+	-1000, -1000, 21883, -1000, 21883, -1000, -1000, 21883, -1000, 21883,
+	-1000, 21883, -1000, 21883, -1000, 21883, -1000, 21883, -1000, 21883,
+	-1000, 21883, -1000, 21883, -1000, 21883, -1000, 21883, -1000, 21883,
+	-1000, 21883, -1000, 21883, -1000, 21883, -1000, 21883, -1000, 21883,
+	-1000, 21883, -1000, -1000, -1000, 21883, -1000, 21883, -1000, 21883,
+	-1000, -1000, 21883, -1000, 21883, -1000, 21883, -1000, 21883, 21883,
+	-1000, 21883, 21883, 21883, -1000, 21883, 21883, 21883, 21883, -1000,
+	-1000, -1000, -1000, 21883, 21883, 21883, 21883, 21883, 21883, 21883,
+	21883, 21883, 21883, -1000, -1000, -1000, -1000, -1000, -1000, 21883,
+	-1000, 39041, 4, -263, 1523, 4, 1523, 23375, 856, 853,
+	22629, -1000, 21883, 15903, -1000, -1000, -1000, -1000, -1000, 21883,
+	21883, 21883, 21883, 21883, 21883, -1000, -1000, -1000, 21883, 21883,
+	-1000, 21883, -1000, 21883, -1000, -1000, -1000, -1000, -1000, 1006,
+	-1000, 820, 471, 859, 53961, -1000, -1000, -1000, -1000, 1918,
+	-1000, 2529, -1000, 2286, 2278, 2640, 2603, 21137, -1000, 29343,
+	-1000, -1000, 53961, -1000, -1000, -445, -1000, 2324, 2346, 903,
+	903, -1000, -1000, -1000, -1000, -1000, -1000, -1000, 12895, 2519,
+	21883, 2178, 54707, 1734, -1000, 27851, 53961, 54707, 29343, 29343,
+	29343, 29343, 29343, -1000, 2230, 2225, -1000, 2207, 2196, 2218,
+	55453, -1000, 1780, 1807, -1000, 21883, 31581, 1702, 29343, -1000,
+	-1000, 29343, 55453, 12143, -1000, -1000, -4, -10, -1000, -1000,
+	-1000, -1000, 4400, -1000, -1000, 996, 2503, 2344, -1000, -1000,
+	-1000, -1000, -1000, 1785, -1000, 1782, 1913, 1778, 1773, 286,
+	-1000, 2061, 2430, 953, 953, -1000, 1287, -1000, 1470, 1651,
+	1635, -1000, -1000, -1000, 515, -1000, 55453, 2169, 2166, 2165,
+	-1000, -545, 1285, 2033, 1996, 21883, 2032, 2578, 1901, 53961,
+	-1000, -1000, 54707, -1000, 250, -1000, 414, 53961, -1000, -1000,
+	-1000, 308, 55453, -1000, 8598, -1000, -1000, -1000, 216, -1000,
+	-1000, -1000, -1000, -1000, -1000, -1000, 55453, 231, -1000, 2020,
+	1456, -1000, -1000, 2112, -1000, -1000, -1000, -1000, -1000, 199,
+	197, 1627, 198, 1624, -1000, 198, -1000, 55453, 940, 2125,
+	55453, -1000, -1000, -1000, 1104, 1104, -1000, -1000, 2406, -1000,
+	1470, 1447, 24121, 24121, -1000, 909, -1000, -1000, 425, -236,
+	2017, 2017, -1000, 2017, 2018, -1000, 2017, 149, 2017, 142,
+	2017, -1000, -1000, 1477, 1477, -1000, 1604, 2100, 1305, 2663,
+	-1000, 1162, 21883, 2643, -1000, -1000, -263, -263, -263, -263,
+	-263, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000,
+	-1000, -79, 2626, 2615, 1447, -1000, 2015, 2012, -1000, 1447,
+	21883, 1447, 1477, 2087, 1447, 1447, 1447, 1447, 1447, 1447,
+	1447, 1447, 1447, 1447, 1447, 1447, 2080, 2066, 2056, 2052,
+	2039, 2004, 1991, 1978, 1970, 1940, 1893, 1851, 1846, 1797,
+	1776, 1771, 1447, 1447, 1731, 1447, 1710, 1703, -1000, 1162,
+	1604, 2585, 1604, 1447, 1447, 2547, 317, 1447, 1751, 1751,
+	1751, 1751, 1751, 1604, 1604, 1604, 1604, 1447, 53961, -1000,
+	-263, -1000, -1000, -332, -334, -1000, 1477, -263, 1904, 24121,
+	1447, 24121, 24121, 24121, 1447, 1477, -1000, 1698, 1690, 2418,
+	1677, 1447, 1909, 1447, 1447, 1447, 1656, -1000, 2491, 1734,
+	2491, 1734, 2491, 1726, 1425, 55453, -1000, -1000, -1000, -1000,
+	2603, 2605, -1000, 1902, -1000, 58, 662, -1000, 2299, 2346,
+	-1000, 2577, 2314, 2576, -1000, -1000, -1000, -1000, -1000, 1162,
+	-1000, 2456, 1898, -1000, 957, 1983, -1000, -1000, 20391, 1745,
+	2263, 839, 1726, 1984, 3100, 2142, 2164, 3612, -1000, -1000,
+	-1000, -1000, 2215, -1000, 2199, -1000, -1000, 1999, -1000, 1537,
+	335, 29343, 1973, 1973, -1000, 837, -1000, -1000, -1000, -1000,
+	-1000, -1000, -1000, 1093, 8598, 2667, -1000, 1617, -1000, 1488,
+	196, 1284, -1000, -1000, 953, 953, -1000, 1029, 1023, -1000,
+	55453, 2011, -1000, 376, 1600, 376, 1281, -1000, -1000, 1262,
+	-1000, -1000, -1000, -1000, 2088, 2210, -1000, -1000, -1000, -1000,
+	55453, -1000, 55453, 55453, 55453, 2010, 2571, -1000, 21883, 2008,
+	956, 2151, 53961, 53961, -1000, -1000, -1000, -1000, -1000, -1000,
+	-1000, -1000, -1000, -1000, -1000, 445, 953, -507, 270, 264,
+	953, 953, 953, -548, -1000, -1000, 1723, 1700, -1000, -215,
+	-1000, 21883, -1000, -1000, -1000, -1000, -1000, 1304, 1304, 1588,
+	1585, 1584, -1000, 1999, -1000, -1000, -1000, 1657, -1000, -1000,
+	-201, 53961, 53961, 53961, 53961, -1000, -1000, -1000, 1181, -1000,
 	-1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000,
-	-1000, 906, 1378, 376, -205, 1378, -1000, -1000, 371, -1000,
-	-1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, 22251,
-	-1000, 22251, -1000, 22251, 1527, 22251, -1000, -1000, -1000, -1000,
-	-1000, 2565, 1581, 22251, 22251, -1000, 1226, 1204, -279, 1681,
-	-1000, -1000, -1000, 22251, -1000, -1000, -1000, -1000, -1000, -1000,
-	-1000, -1000, -1000, -1000, -1000, -1000, -1000, 22251, -1000, 22251,
-	-1000, 22251, -1000, 22251, -1000, 22251, -1000, 22251, -1000, 22251,
-	-1000, 22251, -1000, 22251, -1000, 22251, -1000, 22251, -1000, 22251,
-	-1000, 22251, -1000, 22251, -1000, 22251, -1000, 22251, -1000, -1000,
-	22251, -1000, -1000, -1000, 22251, -1000, 22251, -1000, 22251, -1000,
-	-1000, -1000, 22251, 233, 996, -1000, -1000, -1000, -1000, -1000,
-	-1000, -1000, -1000, -1000, -1000, -1000, 1378, 329, -1000, -1000,
-	-1000, 2638, -1000, 1378, 22251, 1029, -1000, 1029, 1029, 1029,
-	-1000, -1000, -1000, 22251, -1000, 22251, 22251, -1000, 22251, -1000,
-	22251, -1000, -1000, -1000, -1000, 22251, 1998, 2468, 38663, 1998,
-	38663, 1998, 31949, -1000, -1000, 2629, 2591, 2597, 2309, 2311,
-	2311, 2360, -1000, 2594, 2583, -1000, 1564, 2582, 1555, 1027,
-	-1000, 55075, 22251, -1000, 1998, 37917, -1000, 426, 54329, 1998,
-	54329, -1000, 2577, -1000, -1000, 22251, 2036, -1000, 22251, -1000,
-	-1000, -1000, -1000, 5242, 2639, 1965, -1000, -1000, 916, -1000,
-	22251, -1000, 10482, -1000, -1000, -1000, -1000, -1000, -1000, -1000,
-	-1000, 1549, 1523, -1000, -1000, 2022, 22251, -1000, -1000, -1000,
-	1629, 1563, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000,
-	2015, -1000, -1000, -1000, -1000, 323, -538, 2223, 54329, 1153,
-	-1000, 1699, 1905, 309, 1998, 1521, 962, 962, 962, 1139,
-	1132, 37917, 1693, -1000, 54329, 350, -1000, 323, -1000, -250,
-	-251, 1681, -1000, -1000, 2524, -1000, -1000, 16271, -1000, -1000,
-	2013, 2137, -1000, -1000, -1000, -1000, 2188, -187, -221, -1000,
-	-1000, 1681, 1681, 1681, 1189, 1378, -1000, 1681, 1681, 1548,
-	1410, -1000, -1000, 1681, 1681, 1681, 1681, 1681, 1681, 1681,
-	1681, 1681, 1681, 1681, 1681, 1681, 1681, 1681, 1681, 1681,
-	1681, 1681, 1681, 1554, 1808, -1000, 233, 1378, 2172, -1000,
-	-1000, 5242, -1000, -1000, 2577, 2579, 8, -1000, -1000, 221,
-	8, 1527, 1019, 1378, 1378, 1019, 1790, 1681, 1775, 1726,
-	1681, 1681, 32695, -1000, 2574, 2571, 1671, -1000, -1000, 38663,
-	1671, 38663, 912, 2591, -288, 22251, 22251, 2305, 1207, -1000,
-	-1000, -1000, -1000, 1519, 1488, -1000, 1465, -1000, 2677, -1000,
-	1527, -1000, 1998, 1998, -1000, 795, 1925, -1000, 2565, 1527,
-	54329, 1527, 55, 2577, -1000, 1681, -1000, 1998, 1998, 1998,
-	1998, 1998, 1998, 1998, 1998, 1998, 1998, 1998, 1998, 1998,
-	1998, 1998, 1998, 1998, 1998, 1998, 1998, 1998, 1998, 1998,
-	1998, 1998, 1998, 1998, 1998, 1998, 1998, 1998, 1998, 1998,
-	1998, 1998, 1998, 1998, 1998, 1998, 1998, 1998, 1998, 1998,
-	1998, 1998, 1998, 1998, 1998, 1998, 1998, 1998, 1998, 1998,
-	1998, 1998, 1998, 1998, 1998, 1998, 1998, 1998, 1998, 1998,
-	1998, 1998, 1998, 1998, 1998, 1998, 1998, 1998, 1998, 1998,
-	1998, 1998, 1998, 1998, 1998, 1998, 1998, 1998, 1998, 1998,
-	1998, 1998, 1998, 1998, 1998, 1998, 1998, 1998, 1998, 1998,
-	1998, 1998, 1998, 1998, 1998, 1998, 1998, 1998, 1998, 1998,
-	1998, 1998, 1998, 1998, 1998, 1998, 1998, 1998, 1998, 1998,
-	1998, 1998, 1998, 1998, 1998, 1998, 1998, 1998, 1998, 1998,
-	1998, 1998, 1998, 1998, 1998, 1998, 1998, 1998, -1000, -1000,
-	54329, 2181, -1000, -1000, 2513, 1688, 163, -1000, 1384, 1905,
-	-1000, -1000, 892, -1000, 22251, -1000, 37917, 1436, 1385, -1000,
-	-1000, -1000, -1000, -545, -1000, -1000, -1000, -1000, -1000, -1000,
-	400, 1901, -1000, 960, 54329, 55821, -1000, 2161, -1000, -1000,
-	-1000, -1000, 22251, -1000, -1000, -1000, -1000, -1000, -1000, -1000,
+	-1000, 909, 1477, 350, -204, 1477, -1000, -1000, 376, -1000,
+	-1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, 21883,
+	-1000, 21883, -1000, 21883, 1162, 21883, -1000, -1000, -1000, -1000,
+	-1000, 2519, 1581, 21883, 21883, -1000, 1260, 1256, -263, 1447,
+	-1000, -1000, -1000, 21883, -1000, -1000, -1000, -1000, -1000, -1000,
+	-1000, -1000, -1000, -1000, -1000, -1000, -1000, 21883, -1000, 21883,
+	-1000, 21883, -1000, 21883, -1000, 21883, -1000, 21883, -1000, 21883,
+	-1000, 21883, -1000, 21883, -1000, 21883, -1000, 21883, -1000, 21883,
+	-1000, 21883, -1000, 21883, -1000, 21883, -1000, 21883, -1000, -1000,
+	21883, -1000, -1000, -1000, 21883, -1000, 21883, -1000, 21883, -1000,
+	-1000, -1000, 21883, 205, 854, -1000, -1000, -1000, -1000, -1000,
+	-1000, -1000, -1000, -1000, -1000, -1000, 1477, 313, -1000, -1000,
+	-1000, 2628, -1000, 1477, 21883, 1987, -1000, 1987, 1987, 1987,
+	-1000, -1000, -1000, 21883, -1000, 21883, 21883, -1000, 21883, -1000,
+	21883, -1000, -1000, -1000, -1000, 21883, 1734, 2310, 38295, 1734,
+	38295, 1734, 31581, -1000, -1000, 2605, 2592, 2564, 2311, 2305,
+	2305, 2299, -1000, 2557, 2555, -1000, 1560, 2553, 1556, 1001,
+	-1000, 54707, 21883, -1000, 1734, 37549, -1000, 434, 53961, 1734,
+	53961, -1000, 2548, -1000, -1000, 21883, 2007, -1000, 21883, -1000,
+	-1000, -1000, -1000, 8389, 2603, 1973, -1000, -1000, 919, -1000,
+	21883, -1000, 9719, -1000, -1000, -1000, -1000, -1000, -1000, -1000,
+	-1000, -1000, 1554, 1552, -1000, -1000, 2002, 21883, -1000, -1000,
+	-1000, 1591, 1572, -1000, -1000, -1000, -1000, -1000, -1000, -1000,
+	-1000, 1999, -1000, -1000, -1000, -1000, 308, -533, 2104, 53961,
+	1250, -1000, 1687, 1901, 277, 1734, 1547, 953, 953, 953,
+	1247, 1177, 37549, 1685, -1000, 53961, 401, -1000, 308, -1000,
+	-229, -230, 1447, -1000, -1000, 2497, -1000, -1000, 15903, -1000,
+	-1000, 1997, 2120, -1000, -1000, -1000, -1000, 2217, -188, -211,
+	-1000, -1000, 1447, 1447, 1447, 1241, 1477, -1000, 1447, 1447,
+	1551, 1524, -1000, -1000, 1447, 1447, 1447, 1447, 1447, 1447,
+	1447, 1447, 1447, 1447, 1447, 1447, 1447, 1447, 1447, 1447,
+	1447, 1447, 1447, 1447, 1604, 1623, -1000, 205, 1477, 2160,
+	-1000, -1000, 8389, -1000, -1000, 2548, 2549, 4, -1000, -1000,
+	214, 4, 1162, 1014, 1477, 1477, 1014, 1616, 1447, 1576,
+	1571, 1447, 1447, 32327, -1000, 2545, 2538, 1666, -1000, -1000,
+	38295, 1666, 38295, 1006, 2592, -272, 21883, 21883, 2294, 1235,
+	-1000, -1000, -1000, -1000, 1540, 1527, -1000, 1500, -1000, 2662,
+	-1000, 1162, -1000, 1734, 1734, -1000, 819, 1983, -1000, 2519,
+	1162, 53961, 1162, 66, 2548, -1000, 1447, -1000, 1734, 1734,
+	1734, 1734, 1734, 1734, 1734, 1734, 1734, 1734, 1734, 1734,
+	1734, 1734, 1734, 1734, 1734, 1734, 1734, 1734, 1734, 1734,
+	1734, 1734, 1734, 1734, 1734, 1734, 1734, 1734, 1734, 1734,
+	1734, 1734, 1734, 1734, 1734, 1734, 1734, 1734, 1734, 1734,
+	1734, 1734, 1734, 1734, 1734, 1734, 1734, 1734, 1734, 1734,
+	1734, 1734, 1734, 1734, 1734, 1734, 1734, 1734, 1734, 1734,
+	1734, 1734, 1734, 1734, 1734, 1734, 1734, 1734, 1734, 1734,
+	1734, 1734, 1734, 1734, 1734, 1734, 1734, 1734, 1734, 1734,
+	1734, 1734, 1734, 1734, 1734, 1734, 1734, 1734, 1734, 1734,
+	1734, 1734, 1734, 1734, 1734, 1734, 1734, 1734, 1734, 1734,
+	1734, 1734, 1734, 1734, 1734, 1734, 1734, 1734, 1734, 1734,
+	1734, 1734, 1734, 1734, 1734, 1734, 1734, 1734, 1734, 1734,
+	1734, 1734, 1734, 1734, 1734, 1734, 1734, 1734, 1734, -1000,
+	-1000, 53961, 1961, -1000, -1000, 2492, 1669, 176, -1000, 1522,
+	1901, -1000, -1000, 879, -1000, 21883, -1000, 37549, 1495, 1492,
+	-1000, -1000, -1000, -1000, -548, -1000, -1000, -1000, -1000, -1000,
+	-1000, 419, 1900, -1000, 952, 53961, 55453, -1000, 2213, -1000,
+	-1000, -1000, -1000, 21883, -1000, -1000, -1000, -1000, -1000, -1000,
 	-1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000,
 	-1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000,
-	22251, -1000, 1378, 2167, -1000, -375, -1000, -514, 22251, -279,
-	-1000, -1000, -279, -1000, -1000, -1000, -1000, -1000, 22251, -1000,
-	-1000, 22251, -1000, 22251, -1000, -1000, 1671, -1000, -1000, -1000,
-	37171, -1000, 1671, -1000, 1671, -1000, -288, -1000, 1900, -1000,
-	54329, 1527, 391, -1000, 1191, -1000, -1000, -1000, -1000, -1000,
-	55075, 54329, 1925, 54329, -1000, -1000, 1628, 1378, 1998, 2565,
-	-1000, 1604, -1000, 400, -1000, 2012, 2116, -1000, -1000, -1000,
-	20013, -1000, -1000, -1000, -1000, -1000, 272, -197, 16271, 11759,
-	1602, -1000, -195, 1681, 1554, -1000, -481, -1000, -1000, -1000,
-	-1000, 263, -1000, -1000, 1892, -1000, -1000, 1714, 1710, 1677,
-	-1000, -1000, -1000, -1000, -1000, -1000, -288, -1000, -1000, 2511,
-	-1000, -253, -1000, -1000, 1890, 1547, -1000, -1000, -1000, 31949,
-	53583, -1000, -179, 325, -197, 22251, 2011, 1378, -1000, -1000,
-	-1000, -1000, -1000, -1000, -1000, -1000, -40, -1000, -1000, 540,
-	-1000, -1000, -1000, 2131, -212, -1000, -1000, -1000, 292, -497,
-	-259, -293, 24489, -1000, 22251, -1000, 22251, -1000, 22251, -1000,
-	54329, 1998, -1000, -1000, -1000, 1484, -1000, 4304, -394, 2163,
-	-1000, -143, -1000, -1000, -1000, 1049, 1373, -1000, -1000, -1000,
-	-1000, -1000, -1000, 1850, 54329, -1000, 435, -1000, -1000, 15519,
-	-203, -228, 1010, -1000, -1000, -1000, -1000, -1000, 1029, 1616,
-	1377, 1681, -1000, 54329, -1000, 53583, -387, 901, 5242, -1000,
-	2159, 2155, 2657, -1000, -1000, -1000, -1000, -1000, -1000, -548,
-	1482, 242, -1000, -1000, -1000, 292, -328, -1000, 22251, -1000,
-	22251, -1000, 1378, -1000, -1000, 2496, 55, -1000, 2672, -1000,
-	2675, 1014, 1014, -1000, 1126, -548, -1000, -1000, -1000, -1000,
-	1681, 1681, -1000, -396, -1000, -1000, -1000, -1000, -1000, 430,
-	1220, -1000, -1000, -1000, -1000, -1000, 5242, -1000, -1000, -1000,
-	235, 235, -1000, -1000,
+	-1000, 21883, -1000, 1477, 2154, -1000, -376, -1000, -516, 21883,
+	-263, -1000, -1000, -263, -1000, -1000, -1000, -1000, -1000, 21883,
+	-1000, -1000, 21883, -1000, 21883, -1000, -1000, 1666, -1000, -1000,
+	-1000, 36803, -1000, 1666, -1000, 1666, -1000, -272, -1000, 1892,
+	-1000, 53961, 1162, 390, -1000, 1229, -1000, -1000, -1000, -1000,
+	-1000, 54707, 53961, 1983, 53961, -1000, -1000, 1664, 1477, 1734,
+	2519, -1000, 1621, -1000, 419, -1000, 1990, 1996, -1000, -1000,
+	-1000, 19645, -1000, -1000, -1000, -1000, -1000, 248, -200, 15903,
+	11391, 1614, -1000, -199, 1447, 1604, -1000, -478, -1000, -1000,
+	-1000, -1000, 256, -1000, -1000, 1813, -1000, -1000, 1550, 1521,
+	1476, -1000, -1000, -1000, -1000, -1000, -1000, -272, -1000, -1000,
+	2488, -1000, -232, -1000, -1000, 1799, 1599, -1000, -1000, -1000,
+	31581, 53215, -1000, -180, 328, -200, 21883, 1988, 1477, -1000,
+	-1000, -1000, -1000, -1000, -1000, -1000, -1000, -44, -1000, -1000,
+	812, -1000, -1000, -1000, 2112, -205, -1000, -1000, -1000, 285,
+	-497, -287, -296, 24121, -1000, 21883, -1000, 21883, -1000, 21883,
+	-1000, 53961, 1734, -1000, -1000, -1000, 1569, -1000, 5018, -346,
+	2152, -1000, -142, -1000, -1000, -1000, 1088, 1479, -1000, -1000,
+	-1000, -1000, -1000, -1000, 1831, 53961, -1000, 421, -1000, -1000,
+	15151, -201, -213, 995, -1000, -1000, -1000, -1000, -1000, 1987,
+	1459, 1248, 1447, -1000, 53961, -1000, 53215, -341, 907, 8389,
+	-1000, 2149, 2105, 2636, -1000, -1000, -1000, -1000, -1000, -1000,
+	-550, 1567, 237, -1000, -1000, -1000, 285, -310, -1000, 21883,
+	-1000, 21883, -1000, 1477, -1000, -1000, 2459, 66, -1000, 2622,
+	-1000, 2612, 1041, 1041, -1000, 1142, -550, -1000, -1000, -1000,
+	-1000, 1447, 1447, -1000, -391, -1000, -1000, -1000, -1000, -1000,
+	407, 1296, -1000, -1000, -1000, -1000, -1000, 8389, -1000, -1000,
+	-1000, 272, 272, -1000, -1000,
 }
 
 var yyPgo = [...]int{
-	0, 3261, 3259, 47, 7, 36, 34, 3256, 3254, 3239,
-	178, 3238, 3237, 3236, 3235, 3234, 3233, 2715, 2702, 2700,
-	3229, 3228, 3226, 3225, 3224, 3222, 3220, 3218, 3217, 48,
-	110, 72, 108, 213, 215, 3216, 3215, 184, 173, 202,
-	3209, 3208, 3207, 116, 193, 83, 87, 197, 3202, 3195,
-	78, 3191, 3189, 3188, 191, 190, 189, 1088, 3187, 188,
-	114, 50, 3186, 3185, 3182, 3178, 3176, 3175, 3174, 3172,
-	3170, 3168, 3167, 3165, 3162, 3156, 3155, 3153, 3150, 3146,
-	309, 3143, 3142, 10, 3141, 66, 3139, 3135, 3133, 3130,
-	3126, 12, 3125, 3123, 19, 42, 60, 3122, 3119, 49,
-	3118, 3114, 3112, 3109, 3107, 45, 3105, 27, 3104, 37,
-	3103, 3102, 128, 3100, 3099, 3098, 38, 3097, 3095, 3094,
-	5, 170, 3093, 3091, 142, 3090, 3082, 3081, 169, 222,
-	3078, 2332, 3074, 99, 3071, 3068, 3061, 174, 200, 3058,
-	122, 3057, 3055, 3053, 155, 3044, 3333, 3041, 3039, 68,
-	76, 156, 3036, 3034, 199, 74, 11, 3031, 15, 17,
-	3030, 3025, 69, 64, 3021, 111, 3013, 3010, 103, 65,
-	3009, 100, 97, 3008, 3006, 23, 18, 3003, 6, 1,
-	8, 82, 3002, 3001, 119, 2997, 2983, 2982, 93, 2981,
-	2979, 3360, 2977, 90, 136, 106, 70, 2968, 171, 153,
-	2967, 2966, 2965, 2964, 2963, 2960, 53, 2958, 2957, 2954,
-	140, 29, 113, 2953, 2950, 146, 346, 130, 54, 132,
-	2947, 149, 2945, 203, 77, 2943, 175, 2941, 2940, 135,
-	134, 2938, 2937, 57, 168, 194, 2928, 96, 131, 121,
-	150, 94, 133, 2926, 2925, 58, 61, 2911, 2909, 2907,
-	2904, 177, 2902, 2901, 62, 2900, 56, 2899, 167, 2897,
-	302, 67, 2896, 180, 185, 2895, 73, 2891, 2889, 91,
-	95, 102, 26, 2888, 163, 166, 127, 182, 2887, 2884,
-	55, 2881, 2879, 2878, 201, 280, 2877, 2873, 308, 179,
-	144, 152, 84, 2871, 325, 2869, 2864, 2863, 40, 4520,
-	6444, 192, 22, 165, 2860, 2856, 7650, 44, 39, 24,
-	2855, 210, 2854, 183, 2853, 2846, 2841, 238, 207, 112,
-	164, 59, 2839, 2838, 2836, 2835, 35, 2830, 2828, 2818,
-	2816, 2814, 2813, 33, 32, 31, 92, 216, 81, 20,
-	98, 172, 157, 63, 2812, 2811, 2810, 125, 85, 2809,
-	162, 159, 126, 101, 2807, 186, 145, 118, 2804, 105,
-	30, 2799, 2798, 2797, 2796, 89, 2795, 2794, 2791, 2786,
-	154, 147, 123, 79, 2784, 80, 120, 151, 148, 52,
-	2782, 43, 2781, 2780, 28, 195, 25, 2776, 41, 107,
-	117, 2775, 6234, 2774, 9, 335, 161, 2771, 2765, 4,
-	13, 16, 2764, 2759, 2748, 2741, 138, 2740, 2739, 2738,
-	2732, 21, 46, 14, 2, 115, 141, 71, 2730, 2727,
-	143, 2726, 2724, 2708, 0, 1034, 129, 2701, 204,
+	0, 3261, 3258, 28, 6, 38, 37, 3256, 3255, 3254,
+	175, 3253, 3252, 3250, 3239, 3238, 3237, 2701, 2694, 2689,
+	3236, 3235, 3234, 3230, 3229, 3228, 3225, 3224, 3223, 39,
+	93, 77, 113, 203, 206, 3222, 3220, 171, 161, 199,
+	3217, 3216, 3215, 114, 184, 82, 78, 192, 3214, 3213,
+	72, 3211, 3207, 3205, 187, 185, 180, 1092, 3202, 178,
+	110, 47, 3198, 3195, 3193, 3191, 3189, 3188, 3187, 3184,
+	3180, 3172, 3170, 3169, 3168, 3167, 3164, 3160, 3158, 3151,
+	294, 3147, 3146, 18, 3139, 75, 3136, 3135, 3134, 3130,
+	3125, 11, 3110, 3109, 23, 45, 56, 3105, 3104, 44,
+	3099, 3097, 3096, 3094, 3091, 68, 3084, 26, 3083, 29,
+	3082, 3080, 120, 3079, 3077, 3076, 40, 3073, 3071, 3067,
+	4, 169, 3065, 3064, 136, 3061, 3060, 3059, 191, 216,
+	3058, 2322, 3054, 99, 3049, 3046, 3043, 167, 190, 3042,
+	117, 3039, 3037, 3036, 150, 3035, 3920, 3013, 3012, 74,
+	63, 226, 3011, 3008, 200, 60, 10, 3006, 13, 16,
+	3003, 3002, 59, 64, 3001, 108, 2992, 2991, 98, 65,
+	2990, 106, 97, 2985, 2983, 17, 9, 2982, 5, 2,
+	7, 92, 2981, 2976, 107, 2973, 2971, 2969, 96, 2968,
+	2966, 6505, 2965, 84, 129, 100, 70, 2962, 170, 153,
+	2954, 2953, 2952, 2946, 2940, 2938, 50, 2937, 2935, 2929,
+	132, 1257, 101, 2928, 2927, 147, 351, 126, 51, 127,
+	2925, 149, 2924, 215, 76, 2917, 162, 2915, 2912, 131,
+	130, 2910, 2906, 55, 168, 195, 2904, 91, 125, 116,
+	193, 90, 139, 2903, 2902, 52, 66, 2900, 2899, 2898,
+	2897, 164, 2893, 2892, 58, 2891, 53, 2885, 196, 2882,
+	325, 67, 2878, 189, 173, 2875, 137, 2873, 2872, 69,
+	104, 103, 30, 2870, 156, 159, 123, 172, 2869, 2868,
+	61, 2864, 2860, 2855, 194, 293, 2853, 2852, 332, 177,
+	140, 146, 83, 2851, 308, 2849, 2847, 2846, 19, 5107,
+	7204, 183, 27, 160, 2845, 2842, 1040, 41, 48, 24,
+	2840, 210, 2836, 179, 2835, 2833, 2830, 197, 207, 111,
+	157, 54, 2827, 2825, 2823, 2822, 34, 2821, 2820, 2815,
+	2814, 2813, 2812, 36, 35, 33, 71, 220, 57, 20,
+	94, 166, 152, 62, 2811, 2810, 2808, 119, 87, 2807,
+	155, 154, 122, 158, 2805, 176, 144, 112, 2804, 95,
+	32, 2800, 2795, 2794, 2793, 85, 2792, 2791, 2788, 2787,
+	148, 142, 118, 79, 2784, 81, 115, 145, 143, 49,
+	2780, 43, 2777, 2772, 31, 188, 25, 2769, 14, 102,
+	141, 2763, 5291, 2762, 89, 324, 151, 2744, 2742, 8,
+	12, 15, 2736, 2735, 2734, 2733, 128, 2731, 2730, 2728,
+	2724, 22, 46, 21, 1, 105, 135, 73, 2719, 2718,
+	138, 2715, 2709, 2706, 0, 1034, 121, 2685, 202,
 }
 
-//line sql.y:8811
+//line sql.y:8815
 type yySymType struct {
 	union             any
 	empty             struct{}
@@ -8569,103 +8532,103 @@ var yyR1 = [...]int{
 	362, 362, 362, 362, 362, 362, 362, 348, 348, 141,
 	141, 243, 243, 243, 243, 243, 243, 243, 243, 243,
 	243, 243, 243, 243, 243, 243, 243, 243, 410, 410,
-	410, 409, 409, 244, 244, 244, 244, 244, 244, 244,
-	244, 150, 150, 162, 162, 162, 162, 162, 162, 148,
-	148, 149, 147, 147, 147, 155, 155, 155, 155, 155,
+	410, 410, 409, 409, 244, 244, 244, 244, 244, 244,
+	244, 244, 150, 150, 162, 162, 162, 162, 162, 162,
+	148, 148, 149, 147, 147, 147, 155, 155, 155, 155,
 	155, 155, 155, 155, 155, 155, 155, 155, 155, 155,
-	155, 414, 414, 414, 414, 414, 414, 414, 414, 414,
+	155, 155, 414, 414, 414, 414, 414, 414, 414, 414,
 	414, 414, 414, 414, 414, 414, 414, 414, 414, 414,
 	414, 414, 414, 414, 414, 414, 414, 414, 414, 414,
 	414, 414, 414, 414, 414, 414, 414, 414, 414, 414,
-	414, 414, 414, 161, 161, 156, 156, 156, 158, 158,
-	157, 157, 157, 159, 159, 411, 411, 411, 411, 326,
-	326, 326, 326, 329, 329, 327, 327, 327, 327, 327,
-	327, 327, 327, 327, 328, 328, 328, 328, 328, 328,
-	328, 330, 330, 330, 330, 330, 331, 331, 331, 331,
+	414, 414, 414, 414, 161, 161, 156, 156, 156, 158,
+	158, 157, 157, 157, 159, 159, 411, 411, 411, 411,
+	326, 326, 326, 326, 329, 329, 327, 327, 327, 327,
+	327, 327, 327, 327, 327, 328, 328, 328, 328, 328,
+	328, 328, 330, 330, 330, 330, 330, 331, 331, 331,
 	331, 331, 331, 331, 331, 331, 331, 331, 331, 331,
-	331, 331, 331, 332, 332, 332, 332, 332, 332, 332,
-	332, 347, 347, 336, 336, 341, 341, 342, 342, 343,
-	343, 343, 344, 344, 344, 345, 345, 338, 338, 338,
-	338, 338, 338, 338, 338, 338, 340, 340, 339, 339,
-	339, 350, 375, 375, 374, 374, 372, 372, 372, 372,
-	372, 372, 372, 372, 359, 359, 369, 369, 369, 369,
-	369, 358, 358, 354, 354, 354, 355, 355, 356, 356,
-	353, 353, 357, 357, 371, 371, 370, 370, 351, 351,
-	352, 352, 377, 412, 412, 412, 412, 412, 413, 413,
-	378, 402, 404, 404, 404, 403, 403, 400, 401, 399,
-	399, 399, 399, 399, 85, 85, 85, 292, 292, 293,
-	293, 367, 367, 366, 366, 366, 368, 368, 365, 365,
+	331, 331, 331, 331, 332, 332, 332, 332, 332, 332,
+	332, 332, 347, 347, 336, 336, 341, 341, 342, 342,
+	343, 343, 343, 344, 344, 344, 345, 345, 338, 338,
+	338, 338, 338, 338, 338, 338, 338, 340, 340, 339,
+	339, 339, 350, 375, 375, 374, 374, 372, 372, 372,
+	372, 372, 372, 372, 372, 359, 359, 369, 369, 369,
+	369, 369, 358, 358, 354, 354, 354, 355, 355, 356,
+	356, 353, 353, 357, 357, 371, 371, 370, 370, 351,
+	351, 352, 352, 377, 412, 412, 412, 412, 412, 413,
+	413, 378, 402, 404, 404, 404, 403, 403, 400, 401,
+	399, 399, 399, 399, 399, 85, 85, 85, 292, 292,
+	293, 293, 367, 367, 366, 366, 366, 368, 368, 365,
+	365, 365, 365, 365, 365, 365, 365, 365, 365, 365,
 	365, 365, 365, 365, 365, 365, 365, 365, 365, 365,
 	365, 365, 365, 365, 365, 365, 365, 365, 365, 365,
-	365, 365, 365, 365, 365, 365, 365, 365, 365, 287,
-	287, 287, 398, 398, 398, 398, 398, 398, 397, 397,
-	397, 364, 364, 364, 364, 396, 396, 60, 60, 224,
-	224, 415, 415, 417, 417, 417, 48, 48, 48, 48,
-	48, 48, 47, 47, 47, 43, 43, 43, 43, 43,
+	287, 287, 287, 398, 398, 398, 398, 398, 398, 397,
+	397, 397, 364, 364, 364, 364, 396, 396, 60, 60,
+	224, 224, 415, 415, 417, 417, 417, 48, 48, 48,
+	48, 48, 48, 47, 47, 47, 43, 43, 43, 43,
 	43, 43, 43, 43, 43, 43, 43, 43, 43, 43,
 	43, 43, 43, 43, 43, 43, 43, 43, 43, 43,
-	43, 43, 43, 43, 43, 43, 49, 49, 44, 44,
-	44, 44, 44, 44, 44, 44, 44, 44, 23, 23,
+	43, 43, 43, 43, 43, 43, 43, 49, 49, 44,
+	44, 44, 44, 44, 44, 44, 44, 44, 44, 23,
 	23, 23, 23, 23, 23, 23, 23, 23, 23, 23,
 	23, 23, 23, 23, 23, 23, 23, 23, 23, 23,
 	23, 23, 23, 23, 23, 23, 23, 23, 23, 23,
-	23, 23, 112, 112, 113, 113, 113, 113, 115, 115,
-	115, 380, 380, 61, 61, 3, 3, 174, 176, 177,
-	177, 175, 175, 175, 175, 175, 175, 63, 63, 62,
-	62, 179, 178, 180, 180, 180, 1, 1, 2, 2,
-	4, 4, 385, 385, 385, 385, 385, 385, 385, 385,
+	23, 23, 23, 112, 112, 113, 113, 113, 113, 115,
+	115, 115, 380, 380, 61, 61, 3, 3, 174, 176,
+	177, 177, 175, 175, 175, 175, 175, 175, 63, 63,
+	62, 62, 179, 178, 180, 180, 180, 1, 1, 2,
+	2, 4, 4, 385, 385, 385, 385, 385, 385, 385,
 	385, 385, 385, 385, 385, 385, 385, 385, 385, 385,
-	385, 385, 385, 385, 346, 346, 346, 379, 379, 381,
-	114, 114, 114, 114, 114, 114, 114, 114, 114, 114,
-	118, 117, 117, 116, 119, 119, 119, 119, 119, 119,
-	119, 119, 383, 383, 383, 64, 64, 384, 333, 334,
-	335, 5, 6, 360, 382, 126, 126, 24, 40, 40,
-	25, 25, 25, 25, 26, 26, 65, 68, 68, 66,
+	385, 385, 385, 385, 385, 346, 346, 346, 379, 379,
+	381, 114, 114, 114, 114, 114, 114, 114, 114, 114,
+	114, 118, 117, 117, 116, 119, 119, 119, 119, 119,
+	119, 119, 119, 383, 383, 383, 64, 64, 384, 333,
+	334, 335, 5, 6, 360, 382, 126, 126, 24, 40,
+	40, 25, 25, 25, 25, 26, 26, 65, 68, 68,
 	66, 66, 66, 66, 66, 66, 66, 66, 66, 66,
 	66, 66, 66, 66, 66, 66, 66, 66, 66, 66,
 	66, 66, 66, 66, 66, 66, 66, 66, 66, 66,
 	66, 66, 66, 66, 66, 66, 66, 66, 66, 66,
 	66, 66, 66, 66, 66, 66, 66, 66, 66, 66,
-	66, 66, 66, 66, 66, 297, 297, 286, 286, 295,
-	295, 285, 285, 311, 311, 311, 288, 288, 288, 289,
-	289, 408, 408, 408, 282, 282, 67, 67, 67, 312,
-	312, 312, 312, 70, 70, 418, 418, 419, 419, 420,
-	420, 420, 71, 72, 72, 315, 315, 316, 316, 73,
-	74, 86, 86, 86, 86, 86, 87, 87, 87, 87,
-	87, 87, 111, 111, 111, 10, 10, 10, 10, 82,
-	82, 82, 9, 9, 11, 69, 69, 76, 405, 405,
-	406, 407, 407, 407, 407, 77, 79, 27, 27, 27,
-	27, 27, 27, 136, 136, 124, 124, 124, 124, 124,
-	124, 124, 124, 124, 124, 124, 124, 131, 131, 131,
-	125, 125, 427, 80, 81, 81, 129, 129, 129, 122,
-	122, 122, 128, 128, 128, 12, 12, 13, 268, 268,
-	14, 14, 135, 135, 134, 134, 137, 137, 137, 137,
-	137, 137, 137, 137, 137, 137, 137, 132, 132, 133,
-	133, 133, 133, 304, 304, 304, 303, 303, 168, 168,
-	170, 169, 169, 171, 171, 172, 172, 172, 172, 222,
-	222, 194, 194, 261, 261, 262, 262, 260, 260, 267,
-	267, 263, 263, 263, 263, 270, 270, 173, 173, 173,
-	173, 181, 181, 182, 182, 183, 183, 314, 314, 309,
-	309, 309, 308, 308, 187, 187, 187, 189, 188, 188,
-	188, 188, 190, 190, 192, 192, 191, 191, 193, 198,
-	198, 197, 197, 195, 195, 195, 195, 195, 195, 196,
-	196, 196, 196, 199, 199, 146, 146, 146, 146, 146,
-	146, 146, 146, 416, 416, 160, 160, 160, 160, 160,
-	160, 160, 163, 163, 163, 163, 163, 163, 163, 163,
-	163, 163, 163, 251, 251, 151, 151, 151, 151, 151,
+	66, 66, 66, 66, 66, 66, 297, 297, 286, 286,
+	295, 295, 285, 285, 311, 311, 311, 288, 288, 288,
+	289, 289, 408, 408, 408, 282, 282, 67, 67, 67,
+	312, 312, 312, 312, 70, 70, 418, 418, 419, 419,
+	420, 420, 420, 71, 72, 72, 315, 315, 316, 316,
+	73, 74, 86, 86, 86, 86, 86, 87, 87, 87,
+	87, 87, 87, 111, 111, 111, 10, 10, 10, 10,
+	82, 82, 82, 9, 9, 11, 69, 69, 76, 405,
+	405, 406, 407, 407, 407, 407, 77, 79, 27, 27,
+	27, 27, 27, 27, 136, 136, 124, 124, 124, 124,
+	124, 124, 124, 124, 124, 124, 124, 124, 131, 131,
+	131, 125, 125, 427, 80, 81, 81, 129, 129, 129,
+	122, 122, 122, 128, 128, 128, 12, 12, 13, 268,
+	268, 14, 14, 135, 135, 134, 134, 137, 137, 137,
+	137, 137, 137, 137, 137, 137, 137, 137, 132, 132,
+	133, 133, 133, 133, 304, 304, 304, 303, 303, 168,
+	168, 170, 169, 169, 171, 171, 172, 172, 172, 172,
+	222, 222, 194, 194, 261, 261, 262, 262, 260, 260,
+	267, 267, 263, 263, 263, 263, 270, 270, 173, 173,
+	173, 173, 181, 181, 182, 182, 183, 183, 314, 314,
+	309, 309, 309, 308, 308, 187, 187, 187, 189, 188,
+	188, 188, 188, 190, 190, 192, 192, 191, 191, 193,
+	198, 198, 197, 197, 195, 195, 195, 195, 195, 195,
+	196, 196, 196, 196, 199, 199, 146, 146, 146, 146,
+	146, 146, 146, 146, 416, 416, 160, 160, 160, 160,
+	160, 160, 160, 163, 163, 163, 163, 163, 163, 163,
+	163, 163, 163, 163, 251, 251, 151, 151, 151, 151,
 	151, 151, 151, 151, 151, 151, 151, 151, 151, 151,
+	151, 154, 154, 154, 154, 154, 154, 154, 154, 154,
 	154, 154, 154, 154, 154, 154, 154, 154, 154, 154,
-	154, 154, 154, 154, 154, 154, 154, 154, 154, 154,
-	154, 154, 154, 154, 154, 227, 227, 226, 226, 88,
-	88, 88, 89, 89, 90, 90, 90, 90, 90, 91,
-	91, 91, 91, 91, 91, 91, 93, 93, 92, 92,
-	213, 213, 301, 301, 94, 95, 95, 96, 96, 99,
-	99, 98, 97, 97, 103, 103, 100, 100, 102, 102,
-	101, 104, 104, 105, 106, 106, 283, 283, 200, 200,
-	209, 209, 209, 209, 201, 201, 202, 202, 202, 202,
-	202, 202, 210, 210, 210, 221, 211, 211, 207, 207,
-	205, 205, 205, 205, 205, 205, 205, 205, 205, 205,
-	205, 206, 206, 206, 206, 206, 206, 206, 206, 206,
+	154, 154, 154, 154, 154, 154, 227, 227, 226, 226,
+	88, 88, 88, 89, 89, 90, 90, 90, 90, 90,
+	91, 91, 91, 91, 91, 91, 91, 93, 93, 92,
+	92, 213, 213, 301, 301, 94, 95, 95, 96, 96,
+	99, 99, 98, 97, 97, 103, 103, 100, 100, 102,
+	102, 101, 104, 104, 105, 106, 106, 283, 283, 200,
+	200, 209, 209, 209, 209, 201, 201, 202, 202, 202,
+	202, 202, 202, 210, 210, 210, 221, 211, 211, 207,
+	207, 205, 205, 205, 205, 205, 205, 205, 205, 205,
+	205, 205, 206, 206, 206, 206, 206, 206, 206, 206,
 	206, 206, 206, 206, 206, 206, 206, 206, 206, 206,
 	206, 206, 206, 206, 206, 206, 206, 206, 206, 206,
 	206, 206, 206, 206, 206, 206, 206, 206, 206, 206,
@@ -8684,37 +8647,37 @@ var yyR1 = [...]int{
 	206, 206, 206, 206, 206, 206, 206, 206, 206, 206,
 	206, 206, 206, 206, 206, 206, 206, 206, 206, 206,
 	206, 206, 206, 206, 206, 206, 206, 206, 206, 206,
-	206, 206, 206, 206, 165, 165, 165, 165, 232, 232,
-	152, 152, 152, 152, 152, 152, 152, 152, 152, 152,
-	152, 152, 152, 152, 152, 153, 153, 166, 166, 166,
-	166, 167, 167, 167, 167, 167, 167, 167, 322, 322,
-	120, 120, 120, 120, 120, 120, 120, 120, 120, 120,
+	206, 206, 206, 206, 206, 165, 165, 165, 165, 232,
+	232, 152, 152, 152, 152, 152, 152, 152, 152, 152,
+	152, 152, 152, 152, 152, 152, 153, 153, 166, 166,
+	166, 166, 167, 167, 167, 167, 167, 167, 167, 322,
+	322, 120, 120, 120, 120, 120, 120, 120, 120, 120,
 	120, 120, 120, 120, 120, 120, 120, 120, 120, 120,
-	121, 121, 121, 121, 121, 121, 121, 121, 121, 121,
-	121, 121, 121, 121, 121, 121, 121, 121, 428, 428,
-	337, 337, 337, 208, 208, 208, 208, 208, 127, 127,
-	127, 127, 127, 319, 319, 319, 323, 323, 323, 321,
+	120, 121, 121, 121, 121, 121, 121, 121, 121, 121,
+	121, 121, 121, 121, 121, 121, 121, 121, 121, 428,
+	428, 337, 337, 337, 208, 208, 208, 208, 208, 127,
+	127, 127, 127, 127, 319, 319, 319, 323, 323, 323,
 	321, 321, 321, 321, 321, 321, 321, 321, 321, 321,
-	321, 321, 321, 321, 324, 324, 230, 230, 123, 123,
-	228, 228, 229, 231, 231, 223, 223, 223, 223, 225,
-	225, 204, 204, 204, 233, 233, 325, 325, 234, 234,
-	107, 108, 108, 109, 109, 235, 235, 237, 236, 236,
-	238, 239, 239, 239, 240, 240, 241, 241, 241, 50,
-	50, 50, 50, 50, 45, 45, 45, 45, 46, 46,
-	46, 46, 138, 138, 138, 138, 140, 140, 139, 139,
-	83, 83, 84, 84, 84, 144, 144, 145, 145, 145,
-	142, 142, 143, 143, 258, 258, 258, 258, 258, 258,
-	258, 242, 242, 242, 249, 249, 249, 245, 245, 247,
-	247, 247, 248, 248, 248, 246, 255, 255, 257, 257,
-	256, 256, 252, 252, 253, 253, 254, 254, 254, 250,
-	250, 203, 203, 203, 203, 203, 259, 259, 259, 259,
-	313, 313, 313, 271, 271, 214, 214, 215, 215, 219,
-	219, 218, 218, 216, 217, 220, 220, 164, 272, 272,
-	280, 277, 277, 278, 278, 305, 305, 305, 281, 281,
-	294, 294, 290, 290, 291, 291, 284, 284, 296, 296,
-	296, 78, 212, 212, 376, 376, 373, 300, 300, 302,
-	302, 306, 306, 310, 310, 307, 307, 8, 421, 421,
-	421, 298, 298, 298, 298, 298, 298, 298, 298, 298,
+	321, 321, 321, 321, 321, 324, 324, 230, 230, 123,
+	123, 228, 228, 229, 231, 231, 223, 223, 223, 223,
+	225, 225, 204, 204, 204, 233, 233, 325, 325, 234,
+	234, 107, 108, 108, 109, 109, 235, 235, 237, 236,
+	236, 238, 239, 239, 239, 240, 240, 241, 241, 241,
+	50, 50, 50, 50, 50, 45, 45, 45, 45, 46,
+	46, 46, 46, 138, 138, 138, 138, 140, 140, 139,
+	139, 83, 83, 84, 84, 84, 144, 144, 145, 145,
+	145, 142, 142, 143, 143, 258, 258, 258, 258, 258,
+	258, 258, 242, 242, 242, 249, 249, 249, 245, 245,
+	247, 247, 247, 248, 248, 248, 246, 255, 255, 257,
+	257, 256, 256, 252, 252, 253, 253, 254, 254, 254,
+	250, 250, 203, 203, 203, 203, 203, 259, 259, 259,
+	259, 313, 313, 313, 271, 271, 214, 214, 215, 215,
+	219, 219, 218, 218, 216, 217, 220, 220, 164, 272,
+	272, 280, 277, 277, 278, 278, 305, 305, 305, 281,
+	281, 294, 294, 290, 290, 291, 291, 284, 284, 296,
+	296, 296, 78, 212, 212, 376, 376, 373, 300, 300,
+	302, 302, 306, 306, 310, 310, 307, 307, 8, 421,
+	421, 421, 298, 298, 298, 298, 298, 298, 298, 298,
 	298, 298, 298, 298, 298, 298, 298, 298, 298, 298,
 	298, 298, 298, 298, 298, 298, 298, 298, 298, 298,
 	298, 298, 298, 298, 298, 298, 298, 298, 298, 298,
@@ -8729,7 +8692,7 @@ var yyR1 = [...]int{
 	298, 298, 298, 298, 298, 298, 298, 298, 298, 298,
 	298, 298, 298, 298, 298, 298, 298, 298, 298, 298,
 	298, 298, 298, 298, 298, 298, 298, 298, 298, 298,
-	298, 298, 298, 298, 299, 299, 299, 299, 299, 299,
+	298, 298, 298, 298, 298, 299, 299, 299, 299, 299,
 	299, 299, 299, 299, 299, 299, 299, 299, 299, 299,
 	299, 299, 299, 299, 299, 299, 299, 299, 299, 299,
 	299, 299, 299, 299, 299, 299, 299, 299, 299, 299,
@@ -8777,8 +8740,8 @@ var yyR1 = [...]int{
 	299, 299, 299, 299, 299, 299, 299, 299, 299, 299,
 	299, 299, 299, 299, 299, 299, 299, 299, 299, 299,
 	299, 299, 299, 299, 299, 299, 299, 299, 299, 299,
-	299, 299, 299, 299, 299, 299, 424, 425, 317, 318,
-	318, 318,
+	299, 299, 299, 299, 299, 299, 299, 424, 425, 317,
+	318, 318, 318,
 }
 
 var yyR2 = [...]int{
@@ -8803,151 +8766,151 @@ var yyR2 = [...]int{
 	1, 1, 3, 4, 3, 3, 3, 5, 10, 0,
 	2, 0, 2, 3, 5, 3, 4, 2, 3, 2,
 	3, 3, 3, 3, 2, 2, 4, 4, 1, 1,
-	1, 1, 1, 0, 2, 2, 3, 3, 2, 2,
-	2, 1, 1, 2, 2, 2, 2, 2, 2, 1,
-	1, 1, 1, 2, 2, 1, 1, 1, 1, 1,
-	1, 1, 1, 2, 2, 2, 2, 2, 2, 2,
-	2, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+	1, 1, 1, 1, 0, 2, 2, 3, 3, 2,
+	2, 2, 1, 1, 2, 2, 2, 2, 2, 2,
+	1, 1, 1, 1, 2, 2, 1, 1, 1, 1,
+	1, 1, 1, 1, 2, 2, 2, 2, 2, 2,
+	2, 2, 1, 1, 1, 1, 1, 1, 1, 1,
 	1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
 	1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
 	1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-	1, 1, 1, 1, 1, 1, 1, 1, 1, 2,
-	1, 1, 2, 1, 1, 2, 1, 2, 1, 3,
-	1, 1, 1, 2, 1, 1, 1, 1, 1, 1,
-	1, 1, 1, 1, 2, 2, 2, 2, 2, 2,
-	2, 1, 2, 2, 2, 2, 3, 3, 3, 2,
-	2, 2, 2, 2, 2, 1, 1, 1, 1, 1,
-	5, 2, 5, 1, 1, 1, 1, 1, 1, 1,
-	1, 1, 3, 0, 3, 0, 5, 1, 3, 0,
-	3, 5, 0, 1, 1, 0, 1, 0, 3, 3,
-	2, 2, 2, 1, 2, 2, 0, 1, 0, 2,
-	2, 5, 0, 1, 1, 2, 1, 3, 2, 1,
-	1, 3, 3, 3, 0, 1, 4, 3, 3, 4,
-	2, 0, 2, 1, 1, 1, 1, 1, 0, 1,
-	1, 1, 0, 1, 1, 3, 3, 4, 3, 1,
-	3, 1, 7, 6, 7, 7, 8, 8, 0, 1,
-	5, 2, 1, 1, 1, 0, 1, 3, 3, 1,
-	1, 2, 2, 2, 0, 1, 1, 1, 2, 0,
-	1, 0, 1, 1, 3, 2, 1, 2, 3, 3,
-	3, 4, 4, 3, 3, 3, 3, 4, 4, 3,
+	1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+	2, 1, 1, 2, 1, 1, 2, 1, 2, 1,
+	3, 1, 1, 1, 2, 1, 1, 1, 1, 1,
+	1, 1, 1, 1, 1, 2, 2, 2, 2, 2,
+	2, 2, 1, 2, 2, 2, 2, 3, 3, 3,
+	2, 2, 2, 2, 2, 2, 1, 1, 1, 1,
+	1, 5, 2, 5, 1, 1, 1, 1, 1, 1,
+	1, 1, 1, 3, 0, 3, 0, 5, 1, 3,
+	0, 3, 5, 0, 1, 1, 0, 1, 0, 3,
+	3, 2, 2, 2, 1, 2, 2, 0, 1, 0,
+	2, 2, 5, 0, 1, 1, 2, 1, 3, 2,
+	1, 1, 3, 3, 3, 0, 1, 4, 3, 3,
+	4, 2, 0, 2, 1, 1, 1, 1, 1, 0,
+	1, 1, 1, 0, 1, 1, 3, 3, 4, 3,
+	1, 3, 1, 7, 6, 7, 7, 8, 8, 0,
+	1, 5, 2, 1, 1, 1, 0, 1, 3, 3,
+	1, 1, 2, 2, 2, 0, 1, 1, 1, 2,
+	0, 1, 0, 1, 1, 3, 2, 1, 2, 3,
+	3, 3, 4, 4, 3, 3, 3, 3, 4, 4,
 	3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
-	3, 3, 3, 3, 3, 3, 3, 4, 5, 0,
-	2, 2, 1, 1, 1, 1, 1, 1, 1, 1,
-	1, 3, 1, 1, 1, 0, 1, 0, 1, 0,
-	2, 0, 2, 0, 2, 2, 0, 1, 5, 1,
-	3, 7, 1, 3, 3, 1, 2, 2, 2, 5,
-	5, 5, 6, 8, 5, 5, 4, 4, 4, 6,
-	5, 5, 5, 2, 2, 2, 2, 3, 3, 3,
-	4, 3, 3, 1, 3, 5, 1, 3, 3, 3,
-	3, 3, 3, 3, 3, 3, 2, 2, 3, 4,
-	4, 2, 11, 3, 6, 8, 6, 6, 6, 13,
-	8, 6, 6, 10, 7, 5, 5, 5, 5, 7,
-	5, 5, 5, 5, 5, 7, 7, 5, 5, 5,
-	5, 6, 0, 6, 5, 6, 4, 5, 0, 8,
-	9, 0, 3, 0, 1, 0, 3, 8, 4, 1,
-	3, 3, 6, 7, 7, 8, 4, 0, 1, 0,
-	1, 3, 3, 1, 1, 2, 1, 1, 0, 2,
-	0, 2, 5, 3, 7, 4, 4, 4, 4, 3,
-	3, 3, 7, 3, 3, 3, 3, 3, 3, 3,
-	3, 3, 3, 2, 0, 2, 2, 1, 3, 2,
-	0, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-	3, 1, 3, 3, 0, 2, 2, 2, 2, 2,
-	2, 2, 4, 4, 3, 0, 1, 4, 3, 4,
-	4, 3, 3, 3, 2, 1, 3, 3, 3, 5,
-	7, 7, 6, 5, 3, 2, 4, 5, 5, 3,
-	3, 7, 3, 3, 3, 3, 4, 7, 5, 2,
-	4, 4, 4, 4, 4, 5, 5, 4, 4, 4,
-	4, 4, 4, 4, 4, 2, 2, 4, 4, 4,
-	4, 4, 2, 3, 3, 3, 3, 3, 5, 2,
-	3, 3, 2, 3, 4, 4, 4, 3, 4, 4,
-	5, 3, 5, 3, 5, 0, 1, 0, 1, 0,
-	1, 1, 1, 0, 2, 2, 0, 2, 2, 0,
-	2, 0, 1, 1, 1, 1, 2, 1, 3, 1,
-	1, 1, 1, 1, 3, 0, 1, 1, 3, 3,
-	2, 2, 1, 1, 5, 0, 1, 0, 1, 2,
-	3, 0, 3, 3, 3, 1, 0, 1, 1, 1,
-	1, 1, 1, 1, 1, 1, 1, 1, 1, 0,
-	1, 1, 4, 4, 4, 2, 2, 3, 1, 3,
-	2, 1, 2, 1, 2, 2, 4, 3, 3, 6,
-	4, 7, 6, 1, 3, 2, 2, 2, 2, 1,
-	1, 1, 3, 2, 1, 1, 1, 0, 1, 1,
-	0, 3, 0, 2, 0, 2, 1, 2, 2, 0,
-	1, 1, 0, 1, 1, 5, 5, 4, 0, 2,
-	4, 4, 0, 1, 1, 2, 1, 1, 1, 1,
-	1, 1, 1, 1, 1, 1, 1, 1, 3, 1,
-	2, 3, 5, 0, 1, 2, 1, 1, 0, 1,
-	2, 1, 3, 1, 1, 1, 4, 3, 1, 1,
-	2, 3, 7, 0, 3, 0, 1, 1, 3, 1,
-	3, 1, 1, 3, 3, 1, 3, 4, 4, 4,
-	3, 2, 4, 0, 1, 0, 2, 0, 1, 0,
-	1, 2, 1, 1, 1, 2, 2, 1, 2, 3,
-	2, 3, 2, 2, 2, 1, 1, 3, 3, 0,
-	1, 1, 2, 6, 5, 6, 6, 5, 5, 0,
-	2, 3, 3, 0, 2, 3, 3, 3, 2, 3,
-	1, 3, 6, 1, 1, 3, 4, 3, 4, 4,
-	4, 1, 3, 4, 5, 6, 3, 4, 5, 6,
-	3, 4, 1, 1, 1, 3, 3, 3, 3, 3,
-	3, 5, 5, 3, 3, 3, 3, 3, 3, 1,
-	1, 1, 1, 1, 3, 1, 1, 1, 2, 2,
-	2, 2, 1, 1, 2, 7, 7, 6, 6, 2,
-	2, 5, 6, 3, 3, 1, 3, 1, 3, 1,
-	1, 1, 1, 1, 1, 1, 1, 1, 1, 2,
-	2, 2, 2, 4, 2, 4, 0, 1, 2, 5,
-	0, 3, 0, 1, 4, 4, 2, 1, 0, 0,
-	1, 1, 2, 2, 1, 1, 2, 2, 0, 1,
-	1, 1, 1, 5, 1, 3, 0, 3, 1, 1,
-	1, 2, 1, 2, 1, 1, 1, 1, 1, 1,
-	1, 1, 1, 1, 1, 1, 1, 3, 4, 6,
-	4, 4, 8, 8, 6, 8, 6, 5, 4, 10,
-	2, 2, 1, 2, 2, 2, 2, 2, 5, 6,
-	6, 6, 6, 6, 5, 5, 5, 5, 5, 5,
-	5, 5, 5, 5, 8, 4, 8, 8, 6, 5,
-	4, 4, 4, 5, 7, 4, 4, 7, 4, 4,
-	6, 6, 6, 8, 6, 6, 4, 4, 3, 4,
-	6, 6, 4, 4, 6, 4, 6, 4, 4, 4,
-	4, 4, 4, 6, 4, 6, 4, 4, 4, 6,
-	4, 6, 4, 4, 6, 4, 6, 4, 6, 8,
+	3, 3, 3, 3, 3, 3, 3, 3, 4, 5,
+	0, 2, 2, 1, 1, 1, 1, 1, 1, 1,
+	1, 1, 3, 1, 1, 1, 0, 1, 0, 1,
+	0, 2, 0, 2, 0, 2, 2, 0, 1, 5,
+	1, 3, 7, 1, 3, 3, 1, 2, 2, 2,
+	5, 5, 5, 6, 8, 5, 5, 4, 4, 4,
+	6, 5, 5, 5, 2, 2, 2, 2, 3, 3,
+	3, 4, 3, 3, 1, 3, 5, 1, 3, 3,
+	3, 3, 3, 3, 3, 3, 3, 2, 2, 3,
+	4, 4, 2, 11, 3, 6, 8, 6, 6, 6,
+	13, 8, 6, 6, 10, 7, 5, 5, 5, 5,
+	7, 5, 5, 5, 5, 5, 7, 7, 5, 5,
+	5, 5, 6, 0, 6, 5, 6, 4, 5, 0,
+	8, 9, 0, 3, 0, 1, 0, 3, 8, 4,
+	1, 3, 3, 6, 7, 7, 8, 4, 0, 1,
+	0, 1, 3, 3, 1, 1, 2, 1, 1, 0,
+	2, 0, 2, 5, 3, 7, 4, 4, 4, 4,
+	3, 3, 3, 7, 3, 3, 3, 3, 3, 3,
+	3, 3, 3, 3, 2, 0, 2, 2, 1, 3,
+	2, 0, 2, 2, 2, 2, 2, 2, 2, 2,
+	2, 3, 1, 3, 3, 0, 2, 2, 2, 2,
+	2, 2, 2, 4, 4, 3, 0, 1, 4, 3,
+	4, 4, 3, 3, 3, 2, 1, 3, 3, 3,
+	5, 7, 7, 6, 5, 3, 2, 4, 5, 5,
+	3, 3, 7, 3, 3, 3, 3, 4, 7, 5,
+	2, 4, 4, 4, 4, 4, 5, 5, 4, 4,
+	4, 4, 4, 4, 4, 4, 2, 2, 4, 4,
+	4, 4, 4, 2, 3, 3, 3, 3, 3, 5,
+	2, 3, 3, 2, 3, 4, 4, 4, 3, 4,
+	4, 5, 3, 5, 3, 5, 0, 1, 0, 1,
+	0, 1, 1, 1, 0, 2, 2, 0, 2, 2,
+	0, 2, 0, 1, 1, 1, 1, 2, 1, 3,
+	1, 1, 1, 1, 1, 3, 0, 1, 1, 3,
+	3, 2, 2, 1, 1, 5, 0, 1, 0, 1,
+	2, 3, 0, 3, 3, 3, 1, 0, 1, 1,
+	1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+	0, 1, 1, 4, 4, 4, 2, 2, 3, 1,
+	3, 2, 1, 2, 1, 2, 2, 4, 3, 3,
+	6, 4, 7, 6, 1, 3, 2, 2, 2, 2,
+	1, 1, 1, 3, 2, 1, 1, 1, 0, 1,
+	1, 0, 3, 0, 2, 0, 2, 1, 2, 2,
+	0, 1, 1, 0, 1, 1, 5, 5, 4, 0,
+	2, 4, 4, 0, 1, 1, 2, 1, 1, 1,
+	1, 1, 1, 1, 1, 1, 1, 1, 1, 3,
+	1, 2, 3, 5, 0, 1, 2, 1, 1, 0,
+	1, 2, 1, 3, 1, 1, 1, 4, 3, 1,
+	1, 2, 3, 7, 0, 3, 0, 1, 1, 3,
+	1, 3, 1, 1, 3, 3, 1, 3, 4, 4,
+	4, 3, 2, 4, 0, 1, 0, 2, 0, 1,
+	0, 1, 2, 1, 1, 1, 2, 2, 1, 2,
+	3, 2, 3, 2, 2, 2, 1, 1, 3, 3,
+	0, 1, 1, 2, 6, 5, 6, 6, 5, 5,
+	0, 2, 3, 3, 0, 2, 3, 3, 3, 2,
+	3, 1, 3, 6, 1, 1, 3, 4, 3, 4,
+	4, 4, 1, 3, 4, 5, 6, 3, 4, 5,
+	6, 3, 4, 1, 1, 1, 3, 3, 3, 3,
+	3, 3, 5, 5, 3, 3, 3, 3, 3, 3,
+	1, 1, 1, 1, 1, 3, 1, 1, 1, 2,
+	2, 2, 2, 1, 1, 2, 7, 7, 6, 6,
+	2, 2, 5, 6, 3, 3, 1, 3, 1, 3,
+	1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+	2, 2, 2, 2, 4, 2, 4, 0, 1, 2,
+	5, 0, 3, 0, 1, 4, 4, 2, 1, 0,
+	0, 1, 1, 2, 2, 1, 1, 2, 2, 0,
+	1, 1, 1, 1, 5, 1, 3, 0, 3, 1,
+	1, 1, 2, 1, 2, 1, 1, 1, 1, 1,
+	1, 1, 1, 1, 1, 1, 1, 1, 3, 4,
+	6, 4, 4, 8, 8, 6, 8, 6, 5, 4,
+	10, 2, 2, 1, 2, 2, 2, 2, 2, 5,
+	6, 6, 6, 6, 6, 5, 5, 5, 5, 5,
+	5, 5, 5, 5, 5, 8, 4, 8, 8, 6,
+	5, 4, 4, 4, 5, 7, 4, 4, 7, 4,
+	4, 6, 6, 6, 8, 6, 6, 4, 4, 3,
+	4, 6, 6, 4, 4, 6, 4, 6, 4, 4,
+	4, 4, 4, 4, 6, 4, 6, 4, 4, 4,
+	6, 4, 6, 4, 4, 6, 4, 6, 4, 6,
+	8, 4, 6, 8, 4, 6, 8, 4, 6, 8,
 	4, 6, 8, 4, 6, 8, 4, 6, 8, 4,
 	6, 8, 4, 6, 8, 4, 6, 8, 4, 6,
 	8, 4, 6, 8, 4, 6, 8, 4, 6, 8,
-	4, 6, 8, 4, 6, 8, 4, 6, 8, 4,
-	6, 8, 4, 6, 8, 4, 4, 4, 6, 4,
-	6, 4, 8, 6, 4, 4, 6, 4, 6, 8,
-	4, 6, 8, 4, 4, 6, 8, 6, 4, 6,
-	6, 8, 10, 7, 8, 8, 9, 4, 4, 4,
-	4, 6, 6, 6, 6, 6, 6, 6, 6, 6,
-	6, 4, 4, 4, 4, 4, 4, 6, 4, 6,
-	5, 9, 6, 9, 8, 6, 8, 8, 8, 6,
-	1, 1, 1, 1, 1, 1, 1, 1, 0, 2,
-	6, 8, 10, 12, 14, 6, 8, 8, 10, 12,
-	14, 6, 8, 10, 12, 6, 8, 4, 4, 3,
-	4, 6, 6, 4, 6, 4, 6, 8, 0, 2,
-	1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+	4, 6, 8, 4, 6, 8, 4, 4, 4, 6,
+	4, 6, 4, 8, 6, 4, 4, 6, 4, 6,
+	8, 4, 6, 8, 4, 4, 6, 8, 6, 4,
+	6, 6, 8, 10, 7, 8, 8, 9, 4, 4,
+	4, 4, 6, 6, 6, 6, 6, 6, 6, 6,
+	6, 6, 4, 4, 4, 4, 4, 4, 6, 4,
+	6, 5, 9, 6, 9, 8, 6, 8, 8, 8,
+	6, 1, 1, 1, 1, 1, 1, 1, 1, 0,
+	2, 6, 8, 10, 12, 14, 6, 8, 8, 10,
+	12, 14, 6, 8, 10, 12, 6, 8, 4, 4,
+	3, 4, 6, 6, 4, 6, 4, 6, 8, 0,
+	2, 1, 1, 1, 1, 1, 1, 1, 1, 1,
 	1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
 	1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-	1, 1, 1, 1, 1, 1, 1, 1, 0, 2,
-	0, 2, 3, 4, 4, 4, 4, 4, 0, 3,
-	4, 7, 3, 1, 1, 1, 0, 5, 5, 2,
-	3, 1, 2, 2, 1, 2, 1, 2, 2, 1,
-	2, 2, 1, 1, 0, 1, 0, 1, 0, 2,
-	1, 2, 4, 0, 2, 1, 1, 3, 5, 1,
-	1, 1, 2, 2, 0, 4, 0, 2, 0, 2,
-	2, 1, 3, 0, 1, 0, 1, 3, 1, 3,
-	2, 0, 1, 1, 0, 1, 2, 4, 4, 0,
-	2, 2, 1, 1, 3, 3, 3, 3, 3, 3,
-	3, 3, 0, 3, 3, 3, 0, 3, 1, 1,
-	0, 4, 0, 1, 1, 0, 3, 1, 3, 2,
-	1, 1, 0, 1, 2, 3, 4, 2, 3, 4,
-	4, 9, 3, 5, 0, 3, 3, 0, 1, 0,
-	2, 2, 0, 2, 2, 2, 0, 2, 1, 2,
-	3, 3, 0, 2, 1, 2, 3, 4, 3, 0,
-	1, 3, 1, 6, 5, 4, 1, 3, 3, 5,
-	0, 2, 5, 0, 5, 1, 3, 1, 3, 1,
-	3, 1, 2, 3, 4, 1, 1, 1, 1, 3,
-	3, 1, 2, 1, 1, 1, 1, 1, 1, 1,
-	0, 1, 0, 2, 0, 3, 0, 1, 0, 1,
-	1, 5, 0, 1, 0, 1, 2, 1, 1, 1,
-	1, 1, 1, 0, 1, 1, 1, 3, 0, 1,
+	1, 1, 1, 1, 1, 1, 1, 1, 1, 0,
+	2, 0, 2, 3, 4, 4, 4, 4, 4, 0,
+	3, 4, 7, 3, 1, 1, 1, 0, 5, 5,
+	2, 3, 1, 2, 2, 1, 2, 1, 2, 2,
+	1, 2, 2, 1, 1, 0, 1, 0, 1, 0,
+	2, 1, 2, 4, 0, 2, 1, 1, 3, 5,
+	1, 1, 1, 2, 2, 0, 4, 0, 2, 0,
+	2, 2, 1, 3, 0, 1, 0, 1, 3, 1,
+	3, 2, 0, 1, 1, 0, 1, 2, 4, 4,
+	0, 2, 2, 1, 1, 3, 3, 3, 3, 3,
+	3, 3, 3, 0, 3, 3, 3, 0, 3, 1,
+	1, 0, 4, 0, 1, 1, 0, 3, 1, 3,
+	2, 1, 1, 0, 1, 2, 3, 4, 2, 3,
+	4, 4, 9, 3, 5, 0, 3, 3, 0, 1,
+	0, 2, 2, 0, 2, 2, 2, 0, 2, 1,
+	2, 3, 3, 0, 2, 1, 2, 3, 4, 3,
+	0, 1, 3, 1, 6, 5, 4, 1, 3, 3,
+	5, 0, 2, 5, 0, 5, 1, 3, 1, 3,
+	1, 3, 1, 2, 3, 4, 1, 1, 1, 1,
+	3, 3, 1, 2, 1, 1, 1, 1, 1, 1,
+	1, 0, 1, 0, 2, 0, 3, 0, 1, 0,
+	1, 1, 5, 0, 1, 0, 1, 2, 1, 1,
+	1, 1, 1, 1, 0, 1, 1, 1, 3, 0,
 	1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
 	1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
 	1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
@@ -9011,8 +8974,8 @@ var yyR2 = [...]int{
 	1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
 	1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
 	1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-	1, 1, 1, 1, 1, 1, 1, 1, 0, 0,
-	1, 1,
+	1, 1, 1, 1, 1, 1, 1, 1, 1, 0,
+	0, 1, 1,
 }
 
 var yyChk = [...]int{
@@ -9377,236 +9340,236 @@ var yyChk = [...]int{
 	236, -425, -199, -182, -181, 85, 86, -183, 85, -181,
 	75, 75, -261, 96, -269, -169, -199, -199, 236, 130,
 	-424, -150, 16, 98, 98, -392, -410, 737, 738, 34,
-	105, -359, -359, 151, 151, -191, 95, -338, 98, -338,
-	105, 105, 34, 91, 92, 93, 34, 87, 88, 89,
-	-191, -191, -191, -191, -380, 95, 23, -146, 95, 165,
-	97, -260, -260, 291, 176, -359, 731, 297, 297, -359,
-	-359, -359, -117, -116, 753, 97, -425, 96, -346, 597,
-	600, -146, -156, -156, -261, 97, -388, 597, -393, -300,
-	-300, -300, -300, 105, 107, -425, 595, 82, 598, -425,
-	-338, -146, -146, -146, -146, -240, 98, -146, -146, 105,
-	105, -96, -425, -146, -146, -146, -146, -146, -146, -146,
+	739, 105, -359, -359, 151, 151, -191, 95, -338, 98,
+	-338, 105, 105, 34, 91, 92, 93, 34, 87, 88,
+	89, -191, -191, -191, -191, -380, 95, 23, -146, 95,
+	165, 97, -260, -260, 291, 176, -359, 731, 297, 297,
+	-359, -359, -359, -117, -116, 753, 97, -425, 96, -346,
+	597, 600, -146, -156, -156, -261, 97, -388, 597, -393,
+	-300, -300, -300, -300, 105, 107, -425, 595, 82, 598,
+	-425, -338, -146, -146, -146, -146, -240, 98, -146, -146,
+	105, 105, -96, -425, -146, -146, -146, -146, -146, -146,
 	-146, -146, -146, -146, -146, -146, -146, -146, -146, -146,
-	-146, -146, -146, -211, -146, -425, -179, -178, -180, 714,
-	130, 34, -321, -425, -213, 289, -102, -101, -100, 18,
-	-425, -146, -120, -120, -120, -120, -146, -146, -146, -146,
-	-146, -146, -424, 75, 22, 20, -263, -300, 259, -424,
-	-263, -424, -309, -233, -234, 21, 23, -247, 59, -245,
-	58, -245, -256, 23, 23, 98, 23, 98, 151, -280,
-	-146, -218, -308, 63, -29, -300, -215, -300, -235, -146,
-	95, -146, -159, -199, -199, -146, -206, 517, 519, 520,
-	521, 518, 523, 524, 525, 526, 527, 528, 529, 530,
-	531, 532, 522, 533, 494, 495, 496, 117, 119, 118,
-	127, 128, 497, 498, 499, 361, 545, 546, 540, 543,
-	544, 542, 541, 376, 377, 500, 563, 564, 568, 567,
-	565, 566, 569, 572, 573, 574, 575, 576, 577, 579,
-	578, 570, 571, 548, 547, 549, 550, 551, 552, 553,
-	554, 556, 555, 557, 558, 559, 560, 561, 562, 580,
-	581, 582, 583, 584, 586, 585, 590, 589, 587, 588,
-	592, 591, 501, 502, 120, 121, 122, 123, 124, 125,
-	126, 503, 506, 504, 507, 508, 509, 514, 515, 510,
-	511, 512, 513, 516, 387, 385, 386, 382, 381, 380,
-	441, 446, 447, 449, 534, 535, 536, 537, 538, 539,
-	695, 696, 697, 698, 699, 700, 701, 702, 98, 98,
-	95, -146, 97, 97, -261, -379, -61, 97, -262, -260,
-	105, 97, 292, -216, -424, 98, -359, -359, -359, 105,
-	105, -308, -425, 96, -300, -412, -381, 601, 601, -425,
-	28, -387, -386, -302, 95, 86, 68, 596, 599, -425,
-	-425, -425, 96, -425, -425, -425, 97, 97, -425, -425,
+	-146, -146, -146, -146, -211, -146, -425, -179, -178, -180,
+	714, 130, 34, -321, -425, -213, 289, -102, -101, -100,
+	18, -425, -146, -120, -120, -120, -120, -146, -146, -146,
+	-146, -146, -146, -424, 75, 22, 20, -263, -300, 259,
+	-424, -263, -424, -309, -233, -234, 21, 23, -247, 59,
+	-245, 58, -245, -256, 23, 23, 98, 23, 98, 151,
+	-280, -146, -218, -308, 63, -29, -300, -215, -300, -235,
+	-146, 95, -146, -159, -199, -199, -146, -206, 517, 519,
+	520, 521, 518, 523, 524, 525, 526, 527, 528, 529,
+	530, 531, 532, 522, 533, 494, 495, 496, 117, 119,
+	118, 127, 128, 497, 498, 499, 361, 545, 546, 540,
+	543, 544, 542, 541, 376, 377, 500, 563, 564, 568,
+	567, 565, 566, 569, 572, 573, 574, 575, 576, 577,
+	579, 578, 570, 571, 548, 547, 549, 550, 551, 552,
+	553, 554, 556, 555, 557, 558, 559, 560, 561, 562,
+	580, 581, 582, 583, 584, 586, 585, 590, 589, 587,
+	588, 592, 591, 501, 502, 120, 121, 122, 123, 124,
+	125, 126, 503, 506, 504, 507, 508, 509, 514, 515,
+	510, 511, 512, 513, 516, 387, 385, 386, 382, 381,
+	380, 441, 446, 447, 449, 534, 535, 536, 537, 538,
+	539, 695, 696, 697, 698, 699, 700, 701, 702, 98,
+	98, 95, -146, 97, 97, -261, -379, -61, 97, -262,
+	-260, 105, 97, 292, -216, -424, 98, -359, -359, -359,
+	105, 105, -308, -425, 96, -300, -412, -381, 601, 601,
+	-425, 28, -387, -386, -302, 95, 86, 68, 596, 599,
+	-425, -425, -425, 96, -425, -425, -425, 97, 97, -425,
 	-425, -425, -425, -425, -425, -425, -425, -425, -425, -425,
 	-425, -425, -425, -425, -425, -425, -425, -425, -425, -425,
-	96, -425, -178, -180, -425, 85, -159, -235, 23, -99,
-	314, 316, -99, -425, -425, -425, -425, -425, 96, -425,
-	-425, 96, -425, 96, -425, -425, -263, -425, 23, 23,
-	96, -425, -263, -425, -263, -198, -234, -109, -108, -107,
-	628, -146, -211, -248, 60, 85, 134, 98, 98, 98,
-	16, -424, -215, 236, -313, -240, -260, -176, 401, -235,
-	-425, -260, 97, 28, 97, 755, 151, 97, -216, -126,
-	-424, 288, -308, 98, 98, -116, -119, -29, 96, 165,
-	-260, -191, 68, -146, -211, -425, 85, 609, 714, -93,
-	-92, -89, 725, 751, -211, -95, -95, -146, -146, -146,
-	-425, -300, 259, -425, -425, -109, 96, -106, -105, -300,
-	-325, 597, 85, 134, -272, -260, -313, -300, 97, -425,
-	-424, -240, 97, -244, -29, 95, -3, 288, -333, -384,
-	-334, -335, -5, -6, -360, -83, 597, -386, -364, -306,
-	-302, 98, 105, 97, 597, -425, -425, -91, 159, 723,
-	687, -156, 235, -425, 96, -425, 96, -425, 96, -107,
-	96, 28, 602, -425, -309, -177, -175, -300, 651, -403,
-	-402, 593, -413, -409, 130, 157, 110, -411, 689, 645,
-	140, 141, -83, -146, 95, -425, -84, 303, 710, 236,
-	-394, 598, -91, 724, 665, 640, 665, 640, -151, -146,
-	-146, -146, -105, -424, -425, 96, 26, -326, -63, 662,
-	-400, -401, 85, -404, 407, 661, 682, 130, 98, 97,
-	-260, 264, -307, -388, 599, 156, -120, -425, 96, -425,
-	96, -425, -94, -175, 658, -339, -159, -401, 85, -400,
-	85, 17, 16, -4, 754, 97, 305, -91, 665, 640,
-	-146, -146, -425, -62, 29, -176, -399, 272, 267, 270,
-	35, -399, 105, -4, -425, -425, 662, 266, 34, 130,
-	-159, -179, -178, -178,
+	-425, 96, -425, -178, -180, -425, 85, -159, -235, 23,
+	-99, 314, 316, -99, -425, -425, -425, -425, -425, 96,
+	-425, -425, 96, -425, 96, -425, -425, -263, -425, 23,
+	23, 96, -425, -263, -425, -263, -198, -234, -109, -108,
+	-107, 628, -146, -211, -248, 60, 85, 134, 98, 98,
+	98, 16, -424, -215, 236, -313, -240, -260, -176, 401,
+	-235, -425, -260, 97, 28, 97, 755, 151, 97, -216,
+	-126, -424, 288, -308, 98, 98, -116, -119, -29, 96,
+	165, -260, -191, 68, -146, -211, -425, 85, 609, 714,
+	-93, -92, -89, 725, 751, -211, -95, -95, -146, -146,
+	-146, -425, -300, 259, -425, -425, -109, 96, -106, -105,
+	-300, -325, 597, 85, 134, -272, -260, -313, -300, 97,
+	-425, -424, -240, 97, -244, -29, 95, -3, 288, -333,
+	-384, -334, -335, -5, -6, -360, -83, 597, -386, -364,
+	-306, -302, 98, 105, 97, 597, -425, -425, -91, 159,
+	723, 687, -156, 235, -425, 96, -425, 96, -425, 96,
+	-107, 96, 28, 602, -425, -309, -177, -175, -300, 651,
+	-403, -402, 593, -413, -409, 130, 157, 110, -411, 689,
+	645, 140, 141, -83, -146, 95, -425, -84, 303, 710,
+	236, -394, 598, -91, 724, 665, 640, 665, 640, -151,
+	-146, -146, -146, -105, -424, -425, 96, 26, -326, -63,
+	662, -400, -401, 85, -404, 407, 661, 682, 130, 98,
+	97, -260, 264, -307, -388, 599, 156, -120, -425, 96,
+	-425, 96, -425, -94, -175, 658, -339, -159, -401, 85,
+	-400, 85, 17, 16, -4, 754, 97, 305, -91, 665,
+	640, -146, -146, -425, -62, 29, -176, -399, 272, 267,
+	270, 35, -399, 105, -4, -425, -425, 662, 266, 34,
+	130, -159, -179, -178, -178,
 }
 
 var yyDef = [...]int{
-	892, -2, -2, 894, 2, 4, 5, 6, 7, 8,
+	893, -2, -2, 895, 2, 4, 5, 6, 7, 8,
 	9, 10, 11, 12, 13, 14, 15, 16, 17, 18,
 	19, 20, 21, 22, 23, 24, 25, 26, 27, 28,
 	29, 30, 31, 32, 33, 34, 35, 36, 37, 38,
-	39, 70, 72, 73, 892, 892, 892, 0, 892, 0,
-	0, 892, -2, -2, 892, 1653, 0, 892, 0, 887,
-	0, -2, 807, 813, 0, 822, -2, 0, 0, 892,
-	892, 2298, 2298, 887, 0, 0, 0, 0, 0, 892,
-	892, 892, 892, 1658, 1505, 50, 892, 0, 88, 89,
-	842, 843, 844, 65, 0, 2296, 85, 892, 893, 1,
-	3, 71, 75, 0, 0, 0, 58, 1514, 0, 78,
-	0, 0, 896, 0, 0, 1636, 892, 892, 0, 129,
+	39, 70, 72, 73, 893, 893, 893, 0, 893, 0,
+	0, 893, -2, -2, 893, 1654, 0, 893, 0, 888,
+	0, -2, 808, 814, 0, 823, -2, 0, 0, 893,
+	893, 2299, 2299, 888, 0, 0, 0, 0, 0, 893,
+	893, 893, 893, 1659, 1506, 50, 893, 0, 88, 89,
+	843, 844, 845, 65, 0, 2297, 85, 893, 894, 1,
+	3, 71, 75, 0, 0, 0, 58, 1515, 0, 78,
+	0, 0, 897, 0, 0, 1637, 893, 893, 0, 129,
 	130, 0, 0, 0, -2, 133, -2, 162, 163, 164,
-	0, 169, 612, 529, 581, 527, 566, -2, 515, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 532, 404, 404, 0, 0, -2, 515, 515, 515,
-	1638, 0, 0, 0, 563, 466, 404, 404, 404, 0,
-	404, 404, 404, 404, 0, 0, 404, 404, 404, 404,
-	404, 404, 404, 404, 404, 404, 404, 404, 404, 404,
-	404, 404, 404, 1532, 168, 1654, 1651, 1652, 1814, 1815,
-	1816, 1817, 1818, 1819, 1820, 1821, 1822, 1823, 1824, 1825,
-	1826, 1827, 1828, 1829, 1830, 1831, 1832, 1833, 1834, 1835,
-	1836, 1837, 1838, 1839, 1840, 1841, 1842, 1843, 1844, 1845,
-	1846, 1847, 1848, 1849, 1850, 1851, 1852, 1853, 1854, 1855,
-	1856, 1857, 1858, 1859, 1860, 1861, 1862, 1863, 1864, 1865,
-	1866, 1867, 1868, 1869, 1870, 1871, 1872, 1873, 1874, 1875,
-	1876, 1877, 1878, 1879, 1880, 1881, 1882, 1883, 1884, 1885,
-	1886, 1887, 1888, 1889, 1890, 1891, 1892, 1893, 1894, 1895,
-	1896, 1897, 1898, 1899, 1900, 1901, 1902, 1903, 1904, 1905,
-	1906, 1907, 1908, 1909, 1910, 1911, 1912, 1913, 1914, 1915,
-	1916, 1917, 1918, 1919, 1920, 1921, 1922, 1923, 1924, 1925,
-	1926, 1927, 1928, 1929, 1930, 1931, 1932, 1933, 1934, 1935,
-	1936, 1937, 1938, 1939, 1940, 1941, 1942, 1943, 1944, 1945,
-	1946, 1947, 1948, 1949, 1950, 1951, 1952, 1953, 1954, 1955,
-	1956, 1957, 1958, 1959, 1960, 1961, 1962, 1963, 1964, 1965,
-	1966, 1967, 1968, 1969, 1970, 1971, 1972, 1973, 1974, 1975,
-	1976, 1977, 1978, 1979, 1980, 1981, 1982, 1983, 1984, 1985,
-	1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995,
-	1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
-	2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015,
-	2016, 2017, 2018, 2019, 2020, 2021, 2022, 2023, 2024, 2025,
-	2026, 2027, 2028, 2029, 2030, 2031, 2032, 2033, 2034, 2035,
-	2036, 2037, 2038, 2039, 2040, 2041, 2042, 2043, 2044, 2045,
-	2046, 2047, 2048, 2049, 2050, 2051, 2052, 2053, 2054, 2055,
-	2056, 2057, 2058, 2059, 2060, 2061, 2062, 2063, 2064, 2065,
-	2066, 2067, 2068, 2069, 2070, 2071, 2072, 2073, 2074, 2075,
-	2076, 2077, 2078, 2079, 2080, 2081, 2082, 2083, 2084, 2085,
-	2086, 2087, 2088, 2089, 2090, 2091, 2092, 2093, 2094, 2095,
-	2096, 2097, 2098, 2099, 2100, 2101, 2102, 2103, 2104, 2105,
-	2106, 2107, 2108, 2109, 2110, 2111, 2112, 2113, 2114, 2115,
-	2116, 2117, 2118, 2119, 2120, 2121, 2122, 2123, 2124, 2125,
-	2126, 2127, 2128, 2129, 2130, 2131, 2132, 2133, 2134, 2135,
-	2136, 2137, 2138, 2139, 2140, 2141, 2142, 2143, 2144, 2145,
-	2146, 2147, 2148, 2149, 2150, 2151, 2152, 2153, 2154, 2155,
-	2156, 2157, 2158, 2159, 2160, 2161, 2162, 2163, 2164, 2165,
-	2166, 2167, 2168, 2169, 2170, 2171, 2172, 2173, 2174, 2175,
-	2176, 2177, 2178, 2179, 2180, 2181, 2182, 2183, 2184, 2185,
-	2186, 2187, 2188, 2189, 2190, 2191, 2192, 2193, 2194, 2195,
-	2196, 2197, 2198, 2199, 2200, 2201, 2202, 2203, 2204, 2205,
-	2206, 2207, 2208, 2209, 2210, 2211, 2212, 2213, 2214, 2215,
-	2216, 2217, 2218, 2219, 2220, 2221, 2222, 2223, 2224, 2225,
-	2226, 2227, 2228, 2229, 2230, 2231, 2232, 2233, 2234, 2235,
-	2236, 2237, 2238, 2239, 2240, 2241, 2242, 2243, 2244, 2245,
-	2246, 2247, 2248, 2249, 2250, 2251, 2252, 2253, 2254, 2255,
-	2256, 2257, 2258, 2259, 2260, 2261, 2262, 2263, 2264, 2265,
-	2266, 2267, 2268, 2269, 2270, 2271, 2272, 2273, 2274, 2275,
-	2276, 2277, 2278, 2279, 2280, 2281, 2282, 2283, 2284, 2285,
-	2286, 2287, 2288, 2289, 2290, 2291, 2292, 2293, 2294, 2295,
-	0, 1630, 0, 725, 996, 0, 888, 889, 0, 796,
-	796, 0, 796, 796, 796, 796, 0, 0, 0, 739,
-	0, 0, 0, 0, 793, 0, 755, 756, 0, 793,
-	0, 762, 799, 0, 0, 769, 796, 796, 772, 2299,
-	0, 2299, 2299, 0, 0, 1621, 0, 790, 788, 802,
-	803, 42, 806, 809, 810, 811, 812, 815, 0, 826,
-	829, 1647, 1648, 0, 831, 836, 855, 856, 0, 45,
-	1156, 0, 1020, 0, 1031, -2, 1042, 1059, 1060, 1061,
-	1062, 1063, 1065, 1066, 1067, 0, 0, 0, 0, 1072,
-	1073, 0, 0, 0, 0, 0, 1136, 0, 0, 0,
-	0, 2018, 1476, 0, 0, 1438, 1438, 1172, 1438, 1438,
-	1440, 1440, 1440, 1867, 2010, 2019, 2200, 1828, 1834, 1835,
-	1836, 2146, 2147, 2148, 2149, 2242, 2243, 2247, 1931, 1823,
-	2214, 2215, 0, 2295, 1970, 1978, 1979, 1955, 1964, 2003,
-	2108, 2226, 1846, 1998, 2070, 1928, 1950, 1951, 2089, 2090,
-	1974, 1975, 1954, 2152, 2154, 2170, 2171, 2156, 2158, 2167,
-	2173, 2178, 2157, 2169, 2174, 2187, 2191, 2194, 2195, 2196,
-	2164, 2162, 2175, 2179, 2181, 2183, 2189, 2192, 2165, 2163,
-	2176, 2180, 2182, 2184, 2190, 2193, 2151, 2155, 2159, 2168,
-	2186, 2166, 2185, 2160, 2172, 2177, 2188, 2161, 2153, 1968,
-	1971, 1958, 1959, 1961, 1963, 1969, 1976, 1982, 1960, 1981,
-	1980, 0, 1956, 1957, 1962, 1973, 1977, 1965, 1966, 1967,
-	1972, 1983, 2025, 2024, 2023, 2069, 1994, 2068, 0, 0,
-	0, 0, 0, 1817, 1873, 1874, 2197, 1360, 1361, 1362,
-	1363, 0, 0, 0, 0, 0, 0, 0, 293, 294,
-	1489, 1490, 44, 1155, 1617, 1440, 1440, 1440, 1440, 1440,
-	1440, 1094, 1095, 1096, 1097, 1098, 1124, 1125, 1131, 1132,
-	2084, 2085, 2086, 2087, 1911, 2237, 1920, 1921, 2065, 2066,
-	1933, 1934, 2269, 2270, -2, -2, -2, 235, 236, 237,
-	238, 239, 240, 241, 242, 0, 1872, 2212, 2213, 231,
-	0, 1615, 1616, 298, 295, 296, 297, 1138, 1139, 251,
-	252, 253, 254, 255, 256, 257, 258, 259, 260, 261,
-	262, 263, 264, 265, 266, 267, 268, 269, 270, 271,
-	272, 273, 274, 275, 276, 277, 278, 279, 280, 281,
-	282, 283, 284, 285, 286, 287, 288, 289, 290, 291,
-	292, 0, 300, 301, 2298, 0, 865, 0, 0, 0,
-	0, 0, 0, 1659, 1660, 1514, 0, 1506, 1505, 63,
-	0, 892, -2, 0, 0, 0, 0, 47, 0, 52,
-	953, 0, 895, 77, 76, 1554, 1557, 0, 0, 0,
-	59, 1515, 67, 69, 1516, 0, 897, 898, 0, 929,
-	933, 0, 0, 0, 1637, 1636, 1636, 105, 0, 0,
-	106, 126, 127, 128, 0, 0, 112, 113, 1623, 1624,
-	43, 0, 0, 180, 181, 0, 1112, 431, 0, 176,
-	0, 424, 363, 0, 1532, 0, 0, 0, 0, 0,
-	1634, 0, 1631, 157, 158, 165, 166, 167, 404, 404,
-	404, 578, 0, 0, 168, 168, 536, 537, 538, 0,
-	0, -2, 429, 0, 516, 0, 0, 418, 418, 422,
-	420, 421, 0, 0, 0, 0, 0, 0, 0, 0,
-	555, 0, 556, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 673, 0, 405, 0, 576, 577, 467, 0,
-	0, 0, 0, 0, 0, 0, 0, 1639, 1640, 0,
-	553, 554, 0, 0, 0, 404, 404, 0, 0, 0,
-	0, 404, 404, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 156, 1545, 0, 0, 0, -2, 0, 717, 0,
-	0, 0, 1632, 1632, 0, 724, 0, 0, 0, 729,
-	0, 0, 730, 0, 793, 793, 791, 792, 732, 733,
-	734, 735, 796, 0, 0, 413, 414, 415, 793, 796,
-	0, 796, 796, 796, 796, 793, 793, 793, 796, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 2299, 799,
-	796, 0, 763, 0, 764, 765, 766, 767, 770, 771,
-	773, 2300, 2301, 1649, 1650, 1661, 1662, 1663, 1664, 1665,
-	1666, 1667, 1668, 1669, 1670, 1671, 1672, 1673, 1674, 1675,
-	1676, 1677, 1678, 1679, 1680, 1681, 1682, 1683, 1684, 1685,
-	1686, 1687, 1688, 1689, 1690, 1691, 1692, 1693, 1694, 1695,
-	1696, 1697, 1698, 1699, 1700, 1701, 1702, 1703, 1704, 1705,
-	1706, 1707, 1708, 1709, 1710, 1711, 1712, 1713, 1714, 1715,
-	1716, 1717, 1718, 1719, 1720, 1721, 1722, 1723, 1724, 1725,
-	1726, 1727, 1728, 1729, 1730, 1731, 1732, 1733, 1734, 1735,
-	1736, 1737, 1738, 1739, 1740, 1741, 1742, 1743, 1744, 1745,
-	1746, 1747, 1748, 1749, 1750, 1751, 1752, 1753, 1754, 1755,
-	1756, 1757, 1758, 1759, 1760, 1761, 1762, 1763, 1764, 1765,
-	1766, 1767, 1768, 1769, 1770, 1771, 1772, 1773, 1774, 1775,
-	1776, 1777, 1778, 1779, 1780, 1781, 1782, 1783, 1784, 1785,
-	1786, 1787, 1788, 1789, 1790, 1791, 1792, 1793, 1794, 1795,
-	1796, 1797, 1798, 1799, 1800, 1801, 1802, 1803, 1804, 1805,
-	1806, 1807, 1808, 1809, 1810, 1811, 1812, 1813, 2299, 2299,
-	777, 781, 785, 783, 1622, 808, 814, 816, 817, 0,
-	0, 827, 830, 849, 49, 1919, 835, 49, 837, 838,
-	839, 840, 841, 867, 868, 873, 0, 0, 0, 0,
-	879, 880, 881, 0, 0, 884, 885, 886, 0, 0,
-	0, 0, 0, 1018, 0, 0, 1144, 1145, 1146, 1147,
-	1148, 1149, 1150, 1151, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 1043, 1044, 0, 0, 0, 1068, 1069, 1070,
-	1071, 1074, 0, 1085, 0, 1087, 1485, -2, 0, 0,
-	0, 1079, 1080, 0, 0, 0, 1642, 1642, 0, 0,
-	0, 1477, 0, 0, 1170, 0, 1171, 1173, 1174, 1175,
-	0, 1176, 1177, 902, 902, 902, 902, 902, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 902, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 1642, 0, 0, 0, 0, 0, 0, 0,
+	0, 169, 613, 530, 582, 528, 567, -2, 516, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 533, 405, 405, 0, 0, -2, 516, 516, 516,
+	1639, 0, 0, 0, 564, 467, 405, 405, 405, 0,
+	405, 405, 405, 405, 0, 0, 405, 405, 405, 405,
+	405, 405, 405, 405, 405, 405, 405, 405, 405, 405,
+	405, 405, 405, 1533, 168, 1655, 1652, 1653, 1815, 1816,
+	1817, 1818, 1819, 1820, 1821, 1822, 1823, 1824, 1825, 1826,
+	1827, 1828, 1829, 1830, 1831, 1832, 1833, 1834, 1835, 1836,
+	1837, 1838, 1839, 1840, 1841, 1842, 1843, 1844, 1845, 1846,
+	1847, 1848, 1849, 1850, 1851, 1852, 1853, 1854, 1855, 1856,
+	1857, 1858, 1859, 1860, 1861, 1862, 1863, 1864, 1865, 1866,
+	1867, 1868, 1869, 1870, 1871, 1872, 1873, 1874, 1875, 1876,
+	1877, 1878, 1879, 1880, 1881, 1882, 1883, 1884, 1885, 1886,
+	1887, 1888, 1889, 1890, 1891, 1892, 1893, 1894, 1895, 1896,
+	1897, 1898, 1899, 1900, 1901, 1902, 1903, 1904, 1905, 1906,
+	1907, 1908, 1909, 1910, 1911, 1912, 1913, 1914, 1915, 1916,
+	1917, 1918, 1919, 1920, 1921, 1922, 1923, 1924, 1925, 1926,
+	1927, 1928, 1929, 1930, 1931, 1932, 1933, 1934, 1935, 1936,
+	1937, 1938, 1939, 1940, 1941, 1942, 1943, 1944, 1945, 1946,
+	1947, 1948, 1949, 1950, 1951, 1952, 1953, 1954, 1955, 1956,
+	1957, 1958, 1959, 1960, 1961, 1962, 1963, 1964, 1965, 1966,
+	1967, 1968, 1969, 1970, 1971, 1972, 1973, 1974, 1975, 1976,
+	1977, 1978, 1979, 1980, 1981, 1982, 1983, 1984, 1985, 1986,
+	1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996,
+	1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+	2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016,
+	2017, 2018, 2019, 2020, 2021, 2022, 2023, 2024, 2025, 2026,
+	2027, 2028, 2029, 2030, 2031, 2032, 2033, 2034, 2035, 2036,
+	2037, 2038, 2039, 2040, 2041, 2042, 2043, 2044, 2045, 2046,
+	2047, 2048, 2049, 2050, 2051, 2052, 2053, 2054, 2055, 2056,
+	2057, 2058, 2059, 2060, 2061, 2062, 2063, 2064, 2065, 2066,
+	2067, 2068, 2069, 2070, 2071, 2072, 2073, 2074, 2075, 2076,
+	2077, 2078, 2079, 2080, 2081, 2082, 2083, 2084, 2085, 2086,
+	2087, 2088, 2089, 2090, 2091, 2092, 2093, 2094, 2095, 2096,
+	2097, 2098, 2099, 2100, 2101, 2102, 2103, 2104, 2105, 2106,
+	2107, 2108, 2109, 2110, 2111, 2112, 2113, 2114, 2115, 2116,
+	2117, 2118, 2119, 2120, 2121, 2122, 2123, 2124, 2125, 2126,
+	2127, 2128, 2129, 2130, 2131, 2132, 2133, 2134, 2135, 2136,
+	2137, 2138, 2139, 2140, 2141, 2142, 2143, 2144, 2145, 2146,
+	2147, 2148, 2149, 2150, 2151, 2152, 2153, 2154, 2155, 2156,
+	2157, 2158, 2159, 2160, 2161, 2162, 2163, 2164, 2165, 2166,
+	2167, 2168, 2169, 2170, 2171, 2172, 2173, 2174, 2175, 2176,
+	2177, 2178, 2179, 2180, 2181, 2182, 2183, 2184, 2185, 2186,
+	2187, 2188, 2189, 2190, 2191, 2192, 2193, 2194, 2195, 2196,
+	2197, 2198, 2199, 2200, 2201, 2202, 2203, 2204, 2205, 2206,
+	2207, 2208, 2209, 2210, 2211, 2212, 2213, 2214, 2215, 2216,
+	2217, 2218, 2219, 2220, 2221, 2222, 2223, 2224, 2225, 2226,
+	2227, 2228, 2229, 2230, 2231, 2232, 2233, 2234, 2235, 2236,
+	2237, 2238, 2239, 2240, 2241, 2242, 2243, 2244, 2245, 2246,
+	2247, 2248, 2249, 2250, 2251, 2252, 2253, 2254, 2255, 2256,
+	2257, 2258, 2259, 2260, 2261, 2262, 2263, 2264, 2265, 2266,
+	2267, 2268, 2269, 2270, 2271, 2272, 2273, 2274, 2275, 2276,
+	2277, 2278, 2279, 2280, 2281, 2282, 2283, 2284, 2285, 2286,
+	2287, 2288, 2289, 2290, 2291, 2292, 2293, 2294, 2295, 2296,
+	0, 1631, 0, 726, 997, 0, 889, 890, 0, 797,
+	797, 0, 797, 797, 797, 797, 0, 0, 0, 740,
+	0, 0, 0, 0, 794, 0, 756, 757, 0, 794,
+	0, 763, 800, 0, 0, 770, 797, 797, 773, 2300,
+	0, 2300, 2300, 0, 0, 1622, 0, 791, 789, 803,
+	804, 42, 807, 810, 811, 812, 813, 816, 0, 827,
+	830, 1648, 1649, 0, 832, 837, 856, 857, 0, 45,
+	1157, 0, 1021, 0, 1032, -2, 1043, 1060, 1061, 1062,
+	1063, 1064, 1066, 1067, 1068, 0, 0, 0, 0, 1073,
+	1074, 0, 0, 0, 0, 0, 1137, 0, 0, 0,
+	0, 2019, 1477, 0, 0, 1439, 1439, 1173, 1439, 1439,
+	1441, 1441, 1441, 1868, 2011, 2020, 2201, 1829, 1835, 1836,
+	1837, 2147, 2148, 2149, 2150, 2243, 2244, 2248, 1932, 1824,
+	2215, 2216, 0, 2296, 1971, 1979, 1980, 1956, 1965, 2004,
+	2109, 2227, 1847, 1999, 2071, 1929, 1951, 1952, 2090, 2091,
+	1975, 1976, 1955, 2153, 2155, 2171, 2172, 2157, 2159, 2168,
+	2174, 2179, 2158, 2170, 2175, 2188, 2192, 2195, 2196, 2197,
+	2165, 2163, 2176, 2180, 2182, 2184, 2190, 2193, 2166, 2164,
+	2177, 2181, 2183, 2185, 2191, 2194, 2152, 2156, 2160, 2169,
+	2187, 2167, 2186, 2161, 2173, 2178, 2189, 2162, 2154, 1969,
+	1972, 1959, 1960, 1962, 1964, 1970, 1977, 1983, 1961, 1982,
+	1981, 0, 1957, 1958, 1963, 1974, 1978, 1966, 1967, 1968,
+	1973, 1984, 2026, 2025, 2024, 2070, 1995, 2069, 0, 0,
+	0, 0, 0, 1818, 1874, 1875, 2198, 1361, 1362, 1363,
+	1364, 0, 0, 0, 0, 0, 0, 0, 294, 295,
+	1490, 1491, 44, 1156, 1618, 1441, 1441, 1441, 1441, 1441,
+	1441, 1095, 1096, 1097, 1098, 1099, 1125, 1126, 1132, 1133,
+	2085, 2086, 2087, 2088, 1912, 2238, 1921, 1922, 2066, 2067,
+	1934, 1935, 2270, 2271, -2, -2, -2, 236, 237, 238,
+	239, 240, 241, 242, 243, 0, 1873, 2213, 2214, 232,
+	0, 1616, 1617, 299, 296, 297, 298, 1139, 1140, 252,
+	253, 254, 255, 256, 257, 258, 259, 260, 261, 262,
+	263, 264, 265, 266, 267, 268, 269, 270, 271, 272,
+	273, 274, 275, 276, 277, 278, 279, 280, 281, 282,
+	283, 284, 285, 286, 287, 288, 289, 290, 291, 292,
+	293, 0, 301, 302, 2299, 0, 866, 0, 0, 0,
+	0, 0, 0, 1660, 1661, 1515, 0, 1507, 1506, 63,
+	0, 893, -2, 0, 0, 0, 0, 47, 0, 52,
+	954, 0, 896, 77, 76, 1555, 1558, 0, 0, 0,
+	59, 1516, 67, 69, 1517, 0, 898, 899, 0, 930,
+	934, 0, 0, 0, 1638, 1637, 1637, 105, 0, 0,
+	106, 126, 127, 128, 0, 0, 112, 113, 1624, 1625,
+	43, 0, 0, 180, 181, 0, 1113, 432, 0, 176,
+	0, 425, 364, 0, 1533, 0, 0, 0, 0, 0,
+	1635, 0, 1632, 157, 158, 165, 166, 167, 405, 405,
+	405, 579, 0, 0, 168, 168, 537, 538, 539, 0,
+	0, -2, 430, 0, 517, 0, 0, 419, 419, 423,
+	421, 422, 0, 0, 0, 0, 0, 0, 0, 0,
+	556, 0, 557, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 674, 0, 406, 0, 577, 578, 468, 0,
+	0, 0, 0, 0, 0, 0, 0, 1640, 1641, 0,
+	554, 555, 0, 0, 0, 405, 405, 0, 0, 0,
+	0, 405, 405, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 156, 1546, 0, 0, 0, -2, 0, 718, 0,
+	0, 0, 1633, 1633, 0, 725, 0, 0, 0, 730,
+	0, 0, 731, 0, 794, 794, 792, 793, 733, 734,
+	735, 736, 797, 0, 0, 414, 415, 416, 794, 797,
+	0, 797, 797, 797, 797, 794, 794, 794, 797, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 2300, 800,
+	797, 0, 764, 0, 765, 766, 767, 768, 771, 772,
+	774, 2301, 2302, 1650, 1651, 1662, 1663, 1664, 1665, 1666,
+	1667, 1668, 1669, 1670, 1671, 1672, 1673, 1674, 1675, 1676,
+	1677, 1678, 1679, 1680, 1681, 1682, 1683, 1684, 1685, 1686,
+	1687, 1688, 1689, 1690, 1691, 1692, 1693, 1694, 1695, 1696,
+	1697, 1698, 1699, 1700, 1701, 1702, 1703, 1704, 1705, 1706,
+	1707, 1708, 1709, 1710, 1711, 1712, 1713, 1714, 1715, 1716,
+	1717, 1718, 1719, 1720, 1721, 1722, 1723, 1724, 1725, 1726,
+	1727, 1728, 1729, 1730, 1731, 1732, 1733, 1734, 1735, 1736,
+	1737, 1738, 1739, 1740, 1741, 1742, 1743, 1744, 1745, 1746,
+	1747, 1748, 1749, 1750, 1751, 1752, 1753, 1754, 1755, 1756,
+	1757, 1758, 1759, 1760, 1761, 1762, 1763, 1764, 1765, 1766,
+	1767, 1768, 1769, 1770, 1771, 1772, 1773, 1774, 1775, 1776,
+	1777, 1778, 1779, 1780, 1781, 1782, 1783, 1784, 1785, 1786,
+	1787, 1788, 1789, 1790, 1791, 1792, 1793, 1794, 1795, 1796,
+	1797, 1798, 1799, 1800, 1801, 1802, 1803, 1804, 1805, 1806,
+	1807, 1808, 1809, 1810, 1811, 1812, 1813, 1814, 2300, 2300,
+	778, 782, 786, 784, 1623, 809, 815, 817, 818, 0,
+	0, 828, 831, 850, 49, 1920, 836, 49, 838, 839,
+	840, 841, 842, 868, 869, 874, 0, 0, 0, 0,
+	880, 881, 882, 0, 0, 885, 886, 887, 0, 0,
+	0, 0, 0, 1019, 0, 0, 1145, 1146, 1147, 1148,
+	1149, 1150, 1151, 1152, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 1044, 1045, 0, 0, 0, 1069, 1070, 1071,
+	1072, 1075, 0, 1086, 0, 1088, 1486, -2, 0, 0,
+	0, 1080, 1081, 0, 0, 0, 1643, 1643, 0, 0,
+	0, 1478, 0, 0, 1171, 0, 1172, 1174, 1175, 1176,
+	0, 1177, 1178, 903, 903, 903, 903, 903, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 903, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 1643, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -9614,64 +9577,64 @@ var yyDef = [...]int{
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 1642, 0, 0,
-	1642, 1642, 0, 0, 223, 224, 225, 226, 227, 228,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 299, 243, 244, 245, 246, 247,
-	302, 248, 249, 250, 1155, 0, 0, 892, 0, 46,
-	857, 858, 0, 979, 1642, 0, 0, 908, 0, 1657,
-	57, 66, 68, 1514, 61, 1514, 0, 912, 0, 0,
-	-2, -2, 913, 914, 918, 919, 920, 921, 922, 923,
-	924, 925, 926, 54, 2297, 55, 0, 74, 0, 48,
-	0, 0, 79, 80, 1605, 1609, 0, 1555, 0, 1558,
-	0, 0, 0, 377, 1562, 0, 0, 1507, 1508, 1511,
-	0, 930, 2016, 934, 0, 936, 937, 0, 0, 103,
-	0, 995, 0, 0, 0, 114, 0, 116, 117, 0,
-	0, 0, 388, 1625, 1626, 1627, -2, 411, 0, 388,
-	372, 310, 311, 312, 363, 314, 363, 363, 363, 363,
-	377, 377, 377, 377, 345, 346, 347, 348, 349, 0,
-	363, 0, 331, 363, 363, 363, 363, 353, 354, 355,
-	356, 357, 358, 359, 360, 315, 316, 317, 318, 319,
-	320, 321, 322, 323, 365, 365, 365, 365, 365, 369,
-	369, 0, 1113, 0, 392, 0, 1511, 0, 0, 1545,
-	1634, 1644, 0, 0, 0, 0, 0, 135, 0, 0,
-	0, 579, 623, 530, 567, 580, 0, 533, 534, -2,
-	0, 0, 515, 0, 517, 0, 412, 0, -2, 0,
-	422, 0, 418, 422, 419, 422, 410, 423, 557, 558,
-	559, 0, 561, 562, 653, 965, 0, 0, 0, 0,
-	0, 659, 660, 661, 0, 663, 664, 665, 666, 667,
-	668, 669, 670, 671, 672, 568, 569, 570, 571, 572,
-	573, 574, 575, 0, 0, 0, 0, 517, 0, 564,
-	0, 0, 468, 469, 470, 0, 0, 473, 474, 475,
-	476, 0, 0, 479, 480, 481, 982, 983, 482, 483,
-	508, 509, 510, 484, 485, 486, 487, 488, 489, 490,
-	502, 503, 504, 505, 506, 507, 491, 492, 493, 494,
-	495, 496, 499, 0, 150, 1536, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 1632, 0, 0, 0, 0, 911, 997,
-	1655, 1656, 726, 0, 0, 797, 798, 0, 416, 417,
-	796, 796, 736, 778, 0, 796, 740, 779, 741, 743,
-	742, 744, 757, 758, 796, 747, 794, 795, 748, 749,
-	750, 751, 752, 753, 754, 774, 759, 760, 761, 800,
-	0, 804, 805, 775, 776, 0, 786, 0, 0, 0,
-	820, 821, 0, 828, 852, 850, 851, 853, 845, 846,
-	847, 848, 0, 854, 0, 0, 870, 99, 875, 876,
-	877, 878, 890, 883, 1157, 1015, 1016, 1017, 0, 1019,
-	1025, 0, 1140, 1142, 1023, 1024, 1027, 0, 0, 0,
-	1021, 1032, 1152, 1153, 1154, 0, 0, 0, 0, 0,
-	1036, 1040, 1045, 1046, 1047, 1048, 1049, 0, 1050, 0,
-	1053, 1054, 1055, 1056, 1057, 1058, 1064, 1453, 1454, 1455,
-	1083, 303, 304, 0, 1084, 0, 0, 0, 0, 0,
-	0, 0, 0, 1400, 1401, 1402, 1403, 1404, 1405, 1406,
-	1407, 1408, 1409, 1410, 1411, 1412, 1413, 1414, 1415, 1416,
-	1417, 1418, 1419, 1156, 0, 1643, 0, 0, 0, 1483,
-	1480, 0, 0, 0, 1439, 1441, 0, 0, 0, 903,
-	904, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 1420, 1421,
-	1422, 1423, 1424, 1425, 1426, 1427, 1428, 1429, 1430, 1431,
-	1432, 1433, 1434, 1435, 1436, 1437, 0, 0, 1456, 0,
-	0, 0, 0, 0, 0, 0, 1476, 0, 1089, 1090,
-	1091, 0, 0, 0, 0, 0, 0, 1218, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 1643, 0, 0,
+	1643, 1643, 0, 0, 224, 225, 226, 227, 228, 229,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 300, 244, 245, 246, 247, 248,
+	303, 249, 250, 251, 1156, 0, 0, 893, 0, 46,
+	858, 859, 0, 980, 1643, 0, 0, 909, 0, 1658,
+	57, 66, 68, 1515, 61, 1515, 0, 913, 0, 0,
+	-2, -2, 914, 915, 919, 920, 921, 922, 923, 924,
+	925, 926, 927, 54, 2298, 55, 0, 74, 0, 48,
+	0, 0, 79, 80, 1606, 1610, 0, 1556, 0, 1559,
+	0, 0, 0, 378, 1563, 0, 0, 1508, 1509, 1512,
+	0, 931, 2017, 935, 0, 937, 938, 0, 0, 103,
+	0, 996, 0, 0, 0, 114, 0, 116, 117, 0,
+	0, 0, 389, 1626, 1627, 1628, -2, 412, 0, 389,
+	373, 311, 312, 313, 364, 315, 364, 364, 364, 364,
+	378, 378, 378, 378, 346, 347, 348, 349, 350, 0,
+	364, 0, 332, 364, 364, 364, 364, 354, 355, 356,
+	357, 358, 359, 360, 361, 316, 317, 318, 319, 320,
+	321, 322, 323, 324, 366, 366, 366, 366, 366, 370,
+	370, 0, 1114, 0, 393, 0, 1512, 0, 0, 1546,
+	1635, 1645, 0, 0, 0, 0, 0, 135, 0, 0,
+	0, 580, 624, 531, 568, 581, 0, 534, 535, -2,
+	0, 0, 516, 0, 518, 0, 413, 0, -2, 0,
+	423, 0, 419, 423, 420, 423, 411, 424, 558, 559,
+	560, 0, 562, 563, 654, 966, 0, 0, 0, 0,
+	0, 660, 661, 662, 0, 664, 665, 666, 667, 668,
+	669, 670, 671, 672, 673, 569, 570, 571, 572, 573,
+	574, 575, 576, 0, 0, 0, 0, 518, 0, 565,
+	0, 0, 469, 470, 471, 0, 0, 474, 475, 476,
+	477, 0, 0, 480, 481, 482, 983, 984, 483, 484,
+	509, 510, 511, 485, 486, 487, 488, 489, 490, 491,
+	503, 504, 505, 506, 507, 508, 492, 493, 494, 495,
+	496, 497, 500, 0, 150, 1537, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 1633, 0, 0, 0, 0, 912, 998,
+	1656, 1657, 727, 0, 0, 798, 799, 0, 417, 418,
+	797, 797, 737, 779, 0, 797, 741, 780, 742, 744,
+	743, 745, 758, 759, 797, 748, 795, 796, 749, 750,
+	751, 752, 753, 754, 755, 775, 760, 761, 762, 801,
+	0, 805, 806, 776, 777, 0, 787, 0, 0, 0,
+	821, 822, 0, 829, 853, 851, 852, 854, 846, 847,
+	848, 849, 0, 855, 0, 0, 871, 99, 876, 877,
+	878, 879, 891, 884, 1158, 1016, 1017, 1018, 0, 1020,
+	1026, 0, 1141, 1143, 1024, 1025, 1028, 0, 0, 0,
+	1022, 1033, 1153, 1154, 1155, 0, 0, 0, 0, 0,
+	1037, 1041, 1046, 1047, 1048, 1049, 1050, 0, 1051, 0,
+	1054, 1055, 1056, 1057, 1058, 1059, 1065, 1454, 1455, 1456,
+	1084, 304, 305, 0, 1085, 0, 0, 0, 0, 0,
+	0, 0, 0, 1401, 1402, 1403, 1404, 1405, 1406, 1407,
+	1408, 1409, 1410, 1411, 1412, 1413, 1414, 1415, 1416, 1417,
+	1418, 1419, 1420, 1157, 0, 1644, 0, 0, 0, 1484,
+	1481, 0, 0, 0, 1440, 1442, 0, 0, 0, 904,
+	905, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 1421, 1422,
+	1423, 1424, 1425, 1426, 1427, 1428, 1429, 1430, 1431, 1432,
+	1433, 1434, 1435, 1436, 1437, 1438, 0, 0, 1457, 0,
+	0, 0, 0, 0, 0, 0, 1477, 0, 1090, 1091,
+	1092, 0, 0, 0, 0, 0, 0, 1219, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -9680,199 +9643,199 @@ var yyDef = [...]int{
 	146, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 1364, 1365, 1366, 1367, 41, 0, 0,
-	0, 0, 0, 0, 0, 1487, 0, -2, -2, 0,
+	0, 0, 0, 1365, 1366, 1367, 1368, 41, 0, 0,
+	0, 0, 0, 0, 0, 1488, 0, -2, -2, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 1389, 0, 0, 0, 0, 0, 0, 1613,
-	0, 0, 860, 861, 863, 0, 999, 0, 980, 0,
-	0, 866, 0, 907, 0, 910, 60, 62, 916, 917,
-	0, 938, 927, 915, 56, 51, 0, 0, 957, 0,
-	0, 1556, 1559, 1560, 377, 1582, 0, 386, 386, 383,
-	1517, 1518, 0, 1510, 1512, 1513, 81, 935, 931, 0,
-	1013, 0, 0, 994, 0, 941, 943, 944, 945, 977,
-	0, 948, 949, 0, 0, 0, 0, 0, 101, 996,
+	0, 0, 1390, 0, 0, 0, 0, 0, 0, 1614,
+	0, 0, 861, 862, 864, 0, 1000, 0, 981, 0,
+	0, 867, 0, 908, 0, 911, 60, 62, 917, 918,
+	0, 939, 928, 916, 56, 51, 0, 0, 958, 0,
+	0, 1557, 1560, 1561, 378, 1583, 0, 387, 387, 384,
+	1518, 1519, 0, 1511, 1513, 1514, 81, 936, 932, 0,
+	1014, 0, 0, 995, 0, 942, 944, 945, 946, 978,
+	0, 949, 950, 0, 0, 0, 0, 0, 101, 997,
 	107, 0, 115, 0, 0, 120, 121, 108, 109, 110,
-	111, 0, 612, -2, 463, 182, 184, 185, 186, 177,
-	-2, 375, 373, 374, 313, 377, 377, 339, 340, 341,
-	342, 343, 344, 0, 351, 0, 332, 333, 334, 335,
-	324, 0, 325, 326, 327, 367, 0, 328, 329, 0,
-	330, 430, 0, 1519, 393, 394, 396, 404, 0, 399,
-	400, 0, 404, 404, 0, 425, 426, 0, 1511, 1536,
-	0, 0, 1645, 1644, 1644, 1644, 155, 0, 170, 171,
-	172, 173, 174, 175, 648, 0, 0, 624, 646, 647,
-	168, 0, 0, 178, 519, 518, 0, 680, 0, 428,
-	0, 0, 422, 422, 407, 408, 560, 0, 0, 655,
-	656, 657, 658, 0, 0, 0, 546, 457, 0, 547,
-	548, 517, 519, 0, 0, 388, 471, 472, 477, 478,
-	497, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 595, 596, 598, 601, 603, 521, 607,
-	609, 0, 597, 600, 602, 604, 521, 608, 610, 1533,
-	1534, 1535, 0, 0, 718, 0, 0, 454, 97, 1633,
-	723, 727, 728, 793, 746, 780, 793, 738, 745, 768,
-	782, 784, 818, 819, 824, 832, 833, 834, 874, 0,
-	0, 0, 0, 882, 0, 0, 1026, 1141, 1143, 1028,
-	1029, 1030, 1033, 0, 1037, 1041, 0, 0, 0, 0,
-	0, 1088, 1086, 1487, 0, 0, 0, 1137, 0, 0,
-	1160, 1161, 0, 0, 0, 0, 1481, 0, 0, 1168,
-	0, 1442, 1118, 0, 0, 0, 0, 0, 1118, 1118,
-	1118, 1118, 1118, 1118, 1118, 1118, 1118, 1118, 1505, 1195,
-	0, 0, 0, 0, 0, 1200, 1201, 1202, 1118, 0,
-	1205, 1206, 0, 1208, 0, 1209, 0, 0, 0, 0,
-	1216, 1217, 1219, 0, 0, 1222, 1223, 0, 1225, 0,
-	1227, 1228, 1229, 1230, 1231, 1232, 0, 1234, 0, 1236,
-	1237, 1238, 0, 1240, 0, 1242, 1243, 0, 1245, 0,
-	1247, 0, 1250, 0, 1253, 0, 1256, 0, 1259, 0,
-	1262, 0, 1265, 0, 1268, 0, 1271, 0, 1274, 0,
-	1277, 0, 1280, 0, 1283, 0, 1286, 0, 1289, 0,
-	1292, 0, 1295, 1296, 1297, 0, 1299, 0, 1301, 0,
-	1304, 1305, 0, 1307, 0, 1310, 0, 1313, 0, 0,
-	1314, 0, 0, 0, 1318, 0, 0, 0, 0, 1327,
-	1328, 1329, 1330, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 1341, 1342, 1343, 1344, 1345, 1346, 0,
-	1348, 0, 1119, 0, 0, 1119, 0, 0, 0, 0,
-	0, 1158, 1642, 0, 1443, 1444, 1445, 1446, 1447, 0,
-	0, 0, 0, 0, 0, 1387, 1388, 1390, 0, 0,
-	1393, 0, 1395, 0, 1614, 859, 862, 864, 951, 1000,
-	1001, 0, 0, 0, 0, 981, 1641, 905, 906, 909,
-	959, 0, 1491, 0, 0, 938, 1013, 0, 939, 0,
-	53, 954, 0, 1606, 1610, 1564, 1563, 1576, 1589, 386,
-	386, 380, 381, 387, 382, 384, 385, 1509, 0, 1514,
-	0, 1603, 0, 892, 1592, 0, 0, 0, 0, 0,
-	0, 0, 0, 984, 0, 0, 987, 0, 0, 0,
-	0, 978, 949, 0, 950, 0, -2, 0, 0, 95,
-	96, 0, 0, 0, 118, 119, 0, 0, 125, 389,
-	390, 159, 168, 465, 183, 438, 0, 0, 309, 376,
-	336, 337, 338, 0, 361, 0, 0, 0, 0, 459,
-	131, 1523, 1522, 404, 404, 395, 0, 398, 0, 0,
-	0, 1646, 364, 427, 0, 149, 0, 0, 0, 0,
-	1635, 618, 0, 0, 625, 0, 0, 0, 528, 0,
-	539, 540, 0, 652, -2, 714, 392, 0, 406, 409,
-	966, 0, 0, 541, 0, 544, 545, 458, 519, 550,
-	551, 565, 552, 500, 501, 498, 0, 0, 1546, 1547,
-	1552, 1550, 1551, 136, 586, 588, 592, 587, 591, 0,
-	0, 0, 523, 0, 611, 523, 584, 0, 454, 1519,
-	0, 722, 455, 456, 796, 796, 869, 100, 0, 872,
-	0, 0, 0, 0, 1034, 1038, 1051, 1052, 1448, 1474,
-	363, 363, 1461, 363, 369, 1464, 363, 1466, 363, 1469,
-	363, 1472, 1473, 0, 0, 1081, 0, 0, 0, 0,
-	1167, 1484, 0, 0, 1178, 1117, 1118, 1118, 1118, 1118,
-	1118, 1184, 1185, 1186, 1187, 1188, 1189, 1190, 1191, 1192,
-	1193, 1478, 0, 0, 0, 1199, 0, 0, 1203, 0,
+	111, 0, 613, -2, 464, 182, 184, 185, 186, 177,
+	-2, 376, 374, 375, 314, 378, 378, 340, 341, 342,
+	343, 344, 345, 0, 352, 0, 333, 334, 335, 336,
+	325, 0, 326, 327, 328, 368, 0, 329, 330, 0,
+	331, 431, 0, 1520, 394, 395, 397, 405, 0, 400,
+	401, 0, 405, 405, 0, 426, 427, 0, 1512, 1537,
+	0, 0, 1646, 1645, 1645, 1645, 155, 0, 170, 171,
+	172, 173, 174, 175, 649, 0, 0, 625, 647, 648,
+	168, 0, 0, 178, 520, 519, 0, 681, 0, 429,
+	0, 0, 423, 423, 408, 409, 561, 0, 0, 656,
+	657, 658, 659, 0, 0, 0, 547, 458, 0, 548,
+	549, 518, 520, 0, 0, 389, 472, 473, 478, 479,
+	498, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 596, 597, 599, 602, 604, 522, 608,
+	610, 0, 598, 601, 603, 605, 522, 609, 611, 1534,
+	1535, 1536, 0, 0, 719, 0, 0, 455, 97, 1634,
+	724, 728, 729, 794, 747, 781, 794, 739, 746, 769,
+	783, 785, 819, 820, 825, 833, 834, 835, 875, 0,
+	0, 0, 0, 883, 0, 0, 1027, 1142, 1144, 1029,
+	1030, 1031, 1034, 0, 1038, 1042, 0, 0, 0, 0,
+	0, 1089, 1087, 1488, 0, 0, 0, 1138, 0, 0,
+	1161, 1162, 0, 0, 0, 0, 1482, 0, 0, 1169,
+	0, 1443, 1119, 0, 0, 0, 0, 0, 1119, 1119,
+	1119, 1119, 1119, 1119, 1119, 1119, 1119, 1119, 1506, 1196,
+	0, 0, 0, 0, 0, 1201, 1202, 1203, 1119, 0,
+	1206, 1207, 0, 1209, 0, 1210, 0, 0, 0, 0,
+	1217, 1218, 1220, 0, 0, 1223, 1224, 0, 1226, 0,
+	1228, 1229, 1230, 1231, 1232, 1233, 0, 1235, 0, 1237,
+	1238, 1239, 0, 1241, 0, 1243, 1244, 0, 1246, 0,
+	1248, 0, 1251, 0, 1254, 0, 1257, 0, 1260, 0,
+	1263, 0, 1266, 0, 1269, 0, 1272, 0, 1275, 0,
+	1278, 0, 1281, 0, 1284, 0, 1287, 0, 1290, 0,
+	1293, 0, 1296, 1297, 1298, 0, 1300, 0, 1302, 0,
+	1305, 1306, 0, 1308, 0, 1311, 0, 1314, 0, 0,
+	1315, 0, 0, 0, 1319, 0, 0, 0, 0, 1328,
+	1329, 1330, 1331, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 1342, 1343, 1344, 1345, 1346, 1347, 0,
+	1349, 0, 1120, 0, 0, 1120, 0, 0, 0, 0,
+	0, 1159, 1643, 0, 1444, 1445, 1446, 1447, 1448, 0,
+	0, 0, 0, 0, 0, 1388, 1389, 1391, 0, 0,
+	1394, 0, 1396, 0, 1615, 860, 863, 865, 952, 1001,
+	1002, 0, 0, 0, 0, 982, 1642, 906, 907, 910,
+	960, 0, 1492, 0, 0, 939, 1014, 0, 940, 0,
+	53, 955, 0, 1607, 1611, 1565, 1564, 1577, 1590, 387,
+	387, 381, 382, 388, 383, 385, 386, 1510, 0, 1515,
+	0, 1604, 0, 893, 1593, 0, 0, 0, 0, 0,
+	0, 0, 0, 985, 0, 0, 988, 0, 0, 0,
+	0, 979, 950, 0, 951, 0, -2, 0, 0, 95,
+	96, 0, 0, 0, 118, 119, 0, 0, 125, 390,
+	391, 159, 168, 466, 183, 439, 0, 0, 310, 377,
+	337, 338, 339, 0, 362, 0, 0, 0, 0, 460,
+	131, 1524, 1523, 405, 405, 396, 0, 399, 0, 0,
+	0, 1647, 365, 428, 0, 149, 0, 0, 0, 0,
+	1636, 619, 0, 0, 626, 0, 0, 0, 529, 0,
+	540, 541, 0, 653, -2, 715, 393, 0, 407, 410,
+	967, 0, 0, 542, 0, 545, 546, 459, 520, 551,
+	552, 566, 553, 501, 502, 499, 0, 0, 1547, 1548,
+	1553, 1551, 1552, 136, 587, 589, 593, 588, 592, 0,
+	0, 0, 524, 0, 612, 524, 585, 0, 455, 1520,
+	0, 723, 456, 457, 797, 797, 870, 100, 0, 873,
+	0, 0, 0, 0, 1035, 1039, 1052, 1053, 1449, 1475,
+	364, 364, 1462, 364, 370, 1465, 364, 1467, 364, 1470,
+	364, 1473, 1474, 0, 0, 1082, 0, 0, 0, 0,
+	1168, 1485, 0, 0, 1179, 1118, 1119, 1119, 1119, 1119,
+	1119, 1185, 1186, 1187, 1188, 1189, 1190, 1191, 1192, 1193,
+	1194, 1479, 0, 0, 0, 1200, 0, 0, 1204, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 147, 148,
-	0, 0, 0, 0, 0, 0, 1398, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 1112, 1116,
-	0, 1120, 1121, 0, 0, 1350, 0, 0, 1368, 0,
-	0, 0, 0, 0, 0, 0, 1488, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 1002, 1009, 0,
-	1009, 0, 1009, 0, 0, 0, 1628, 1629, 1492, 1493,
-	1013, 1494, 928, 940, 958, 1582, 0, 1575, 0, -2,
-	1584, 0, 0, 0, 1590, 378, 379, 932, 82, 1014,
-	86, 0, 1603, 1618, 0, 1600, 1607, 1611, 0, 0,
-	0, 1596, 0, 1013, 942, 973, 975, 0, 970, 985,
-	986, 988, 0, 990, 0, 992, 993, 953, 947, 0,
-	103, 0, 1013, 1013, 102, 0, 998, 122, 123, 124,
-	464, 187, 192, 0, 0, 0, 197, 0, 199, 0,
-	0, 0, 204, 205, 404, 404, 439, 0, 306, 308,
-	0, 0, 190, 377, 0, 377, 0, 368, 370, 0,
-	440, 460, 1520, 1521, 0, 0, 397, 401, 402, 403,
-	0, 151, 0, 0, 0, 621, 0, 649, 0, 0,
-	0, 0, 0, 0, 179, 520, 681, 682, 683, 684,
-	685, 686, 687, 688, 689, 0, 404, 0, 0, 0,
-	404, 404, 404, 0, 706, 391, 0, 0, 677, 674,
-	542, 0, 221, 222, 229, 230, 232, 0, 0, 0,
-	0, 0, 549, 953, 1537, 1538, 1539, 0, 1549, 1553,
-	139, 0, 0, 0, 0, 594, 599, 605, 0, 522,
-	606, 719, 720, 721, 98, 731, 737, 871, 891, 1022,
-	1035, 1039, 0, 0, 0, 0, 1475, 1459, 377, 1462,
-	1463, 1465, 1467, 1468, 1470, 1471, 1077, 1078, 1082, 0,
-	1164, 0, 1166, 0, 1482, 0, 1179, 1180, 1181, 1182,
-	1183, 1514, 0, 0, 0, 1198, 0, 0, 1118, 0,
-	1211, 1210, 1212, 0, 1214, 1215, 1220, 1221, 1224, 1226,
-	1233, 1235, 1239, 1241, 1244, 1246, 1248, 0, 1251, 0,
-	1254, 0, 1257, 0, 1260, 0, 1263, 0, 1266, 0,
-	1269, 0, 1272, 0, 1275, 0, 1278, 0, 1281, 0,
-	1284, 0, 1287, 0, 1290, 0, 1293, 0, 1298, 1300,
-	0, 1303, 1306, 1308, 0, 1311, 0, 1315, 0, 1317,
-	1319, 1320, 0, 0, 0, 1331, 1332, 1333, 1334, 1335,
-	1336, 1337, 1338, 1339, 1340, 1347, 0, 1110, 1349, 1122,
-	1123, 1128, 1352, 0, 0, 0, 1355, 0, 0, 0,
-	1359, 1159, 1370, 0, 1375, 0, 0, 1381, 0, 1385,
-	0, 1391, 1392, 1394, 1396, 0, 0, 0, 0, 0,
-	0, 0, 979, 960, 64, 1494, 1498, 0, 1569, 1567,
-	1567, 1577, 1578, 0, 0, 1585, 0, 0, 0, 0,
-	87, 0, 0, 1591, 0, 0, 1612, 0, 0, 0,
-	0, 104, 1505, 967, 974, 0, 0, 968, 0, 969,
-	989, 991, 946, 0, 1013, 1013, 93, 94, 0, 193,
+	0, 0, 0, 0, 0, 0, 1399, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 1113, 1117,
+	0, 1121, 1122, 0, 0, 1351, 0, 0, 1369, 0,
+	0, 0, 0, 0, 0, 0, 1489, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 1003, 1010, 0,
+	1010, 0, 1010, 0, 0, 0, 1629, 1630, 1493, 1494,
+	1014, 1495, 929, 941, 959, 1583, 0, 1576, 0, -2,
+	1585, 0, 0, 0, 1591, 379, 380, 933, 82, 1015,
+	86, 0, 1604, 1619, 0, 1601, 1608, 1612, 0, 0,
+	0, 1597, 0, 1014, 943, 974, 976, 0, 971, 986,
+	987, 989, 0, 991, 0, 993, 994, 954, 948, 0,
+	103, 0, 1014, 1014, 102, 0, 999, 122, 123, 124,
+	465, 187, 192, 0, 0, 0, 197, 0, 199, 0,
+	0, 0, 204, 205, 405, 405, 440, 0, 307, 309,
+	0, 0, 190, 378, 0, 378, 0, 369, 371, 0,
+	441, 461, 1521, 1522, 0, 0, 398, 402, 403, 404,
+	0, 151, 0, 0, 0, 622, 0, 650, 0, 0,
+	0, 0, 0, 0, 179, 521, 682, 683, 684, 685,
+	686, 687, 688, 689, 690, 0, 405, 0, 0, 0,
+	405, 405, 405, 0, 707, 392, 0, 0, 678, 675,
+	543, 0, 222, 223, 230, 231, 233, 0, 0, 0,
+	0, 0, 550, 954, 1538, 1539, 1540, 0, 1550, 1554,
+	139, 0, 0, 0, 0, 595, 600, 606, 0, 523,
+	607, 720, 721, 722, 98, 732, 738, 872, 892, 1023,
+	1036, 1040, 0, 0, 0, 0, 1476, 1460, 378, 1463,
+	1464, 1466, 1468, 1469, 1471, 1472, 1078, 1079, 1083, 0,
+	1165, 0, 1167, 0, 1483, 0, 1180, 1181, 1182, 1183,
+	1184, 1515, 0, 0, 0, 1199, 0, 0, 1119, 0,
+	1212, 1211, 1213, 0, 1215, 1216, 1221, 1222, 1225, 1227,
+	1234, 1236, 1240, 1242, 1245, 1247, 1249, 0, 1252, 0,
+	1255, 0, 1258, 0, 1261, 0, 1264, 0, 1267, 0,
+	1270, 0, 1273, 0, 1276, 0, 1279, 0, 1282, 0,
+	1285, 0, 1288, 0, 1291, 0, 1294, 0, 1299, 1301,
+	0, 1304, 1307, 1309, 0, 1312, 0, 1316, 0, 1318,
+	1320, 1321, 0, 0, 0, 1332, 1333, 1334, 1335, 1336,
+	1337, 1338, 1339, 1340, 1341, 1348, 0, 1111, 1350, 1123,
+	1124, 1129, 1353, 0, 0, 0, 1356, 0, 0, 0,
+	1360, 1160, 1371, 0, 1376, 0, 0, 1382, 0, 1386,
+	0, 1392, 1393, 1395, 1397, 0, 0, 0, 0, 0,
+	0, 0, 980, 961, 64, 1495, 1499, 0, 1570, 1568,
+	1568, 1578, 1579, 0, 0, 1586, 0, 0, 0, 0,
+	87, 0, 0, 1592, 0, 0, 1613, 0, 0, 0,
+	0, 104, 1506, 968, 975, 0, 0, 969, 0, 970,
+	990, 992, 947, 0, 1014, 1014, 93, 94, 0, 193,
 	0, 195, 0, 198, 200, 201, 202, 208, 209, 210,
-	203, 0, 0, 305, 307, 0, 0, 350, 362, 352,
-	0, 0, 1524, 1525, 1526, 1527, 1528, 1529, 1530, 1531,
-	953, 152, 153, 154, 613, 0, 623, 0, 955, 0,
-	616, 0, 531, 0, 0, 0, 404, 404, 404, 0,
-	0, 0, 0, 691, 0, 0, 654, 0, 662, 0,
-	0, 0, 233, 234, 0, 1548, 585, 0, 137, 138,
-	0, 0, 590, 524, 525, 1075, 0, 0, 0, 1076,
-	1460, 0, 0, 0, 0, 0, 1479, 0, 0, 0,
-	0, 1204, 1207, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 1323, 0, 0, 0, 643,
-	644, 0, 1399, 1115, 1505, 0, 1119, 1129, 1130, 0,
-	1119, 1369, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 1010, 0, 0, 0, 961, 962, 0,
-	0, 0, 999, 1498, 1503, 0, 0, 1572, 0, 1565,
-	1568, 1566, 1579, 0, 0, 1586, 0, 1588, 0, 1619,
-	1620, 1608, 1601, 892, 1595, 1598, 1600, 1597, 1514, 971,
-	0, 976, 0, 1505, 92, 0, 196, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 206, 207,
-	0, 0, 366, 371, 0, 0, 0, 614, 0, 956,
-	626, 617, 0, 704, 0, 708, 0, 0, 0, 711,
-	712, 713, 690, 0, 694, 432, 678, 675, 676, 543,
-	0, 140, 141, 0, 0, 0, 1449, 0, 1452, 1162,
-	1165, 1163, 0, 1194, 1196, 1197, 1457, 1458, 1213, 1249,
-	1252, 1255, 1258, 1261, 1264, 1267, 1270, 1273, 1276, 1279,
-	1282, 1285, 1288, 1291, 1294, 1302, 1309, 1312, 1316, 1321,
-	0, 1324, 0, 0, 1325, 0, 645, 1106, 0, 0,
-	1126, 1127, 0, 1354, 1356, 1357, 1358, 1371, 0, 1376,
-	1377, 0, 1382, 0, 1386, 1397, 0, 1004, 1011, 1012,
-	0, 1007, 0, 1008, 0, 952, 1503, 84, 1504, 1501,
-	0, 1499, 1496, 1561, 0, 1570, 1571, 1580, 1581, 1587,
-	0, 0, 1600, 0, 1594, 90, 0, 0, 0, 1514,
-	194, 0, 213, 0, 622, 0, 625, 615, 702, 703,
-	0, 715, 707, 709, 710, 692, -2, 1540, 0, 0,
-	0, 593, 1450, 0, 0, 1326, 0, 641, 642, 1114,
-	1107, 0, 1092, 1093, 1111, 1351, 1353, 0, 0, 0,
-	1003, 963, 964, 1005, 1006, 83, 0, 1500, 1134, 0,
-	1495, 0, 1573, 1574, 1604, 0, 1593, 1599, 972, 979,
-	0, 91, 445, 438, 1540, 0, 0, 0, 695, 696,
-	697, 698, 699, 700, 701, 582, 1542, 142, 143, 0,
-	512, 513, 514, 136, 0, 1169, 1322, 1108, 0, 0,
-	0, 0, 0, 1372, 0, 1378, 0, 1383, 0, 1502,
-	0, 0, 1497, 1602, 627, 0, 629, 0, -2, 433,
-	446, 0, 188, 214, 215, 0, 0, 218, 219, 220,
-	211, 212, 132, 0, 0, 716, 0, 1543, 1544, 0,
-	139, 0, 0, 1099, 1100, 1101, 1102, 1104, 0, 0,
-	0, 0, 1135, 1112, 628, 0, 0, 388, 0, 638,
-	434, 435, 0, 441, 442, 443, 444, 216, 217, 650,
-	0, 0, 511, 589, 1451, 0, 0, 1373, 0, 1379,
-	0, 1384, 0, 630, 631, 639, 0, 436, 0, 437,
-	0, 0, 0, 619, 0, 650, 1541, 1109, 1103, 1105,
-	0, 0, 1133, 0, 640, 636, 447, 449, 450, 0,
-	0, 448, 651, 620, 1374, 1380, 0, 451, 452, 453,
-	632, 633, 634, 635,
+	211, 203, 0, 0, 306, 308, 0, 0, 351, 363,
+	353, 0, 0, 1525, 1526, 1527, 1528, 1529, 1530, 1531,
+	1532, 954, 152, 153, 154, 614, 0, 624, 0, 956,
+	0, 617, 0, 532, 0, 0, 0, 405, 405, 405,
+	0, 0, 0, 0, 692, 0, 0, 655, 0, 663,
+	0, 0, 0, 234, 235, 0, 1549, 586, 0, 137,
+	138, 0, 0, 591, 525, 526, 1076, 0, 0, 0,
+	1077, 1461, 0, 0, 0, 0, 0, 1480, 0, 0,
+	0, 0, 1205, 1208, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 1324, 0, 0, 0,
+	644, 645, 0, 1400, 1116, 1506, 0, 1120, 1130, 1131,
+	0, 1120, 1370, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 1011, 0, 0, 0, 962, 963,
+	0, 0, 0, 1000, 1499, 1504, 0, 0, 1573, 0,
+	1566, 1569, 1567, 1580, 0, 0, 1587, 0, 1589, 0,
+	1620, 1621, 1609, 1602, 893, 1596, 1599, 1601, 1598, 1515,
+	972, 0, 977, 0, 1506, 92, 0, 196, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 206,
+	207, 0, 0, 367, 372, 0, 0, 0, 615, 0,
+	957, 627, 618, 0, 705, 0, 709, 0, 0, 0,
+	712, 713, 714, 691, 0, 695, 433, 679, 676, 677,
+	544, 0, 140, 141, 0, 0, 0, 1450, 0, 1453,
+	1163, 1166, 1164, 0, 1195, 1197, 1198, 1458, 1459, 1214,
+	1250, 1253, 1256, 1259, 1262, 1265, 1268, 1271, 1274, 1277,
+	1280, 1283, 1286, 1289, 1292, 1295, 1303, 1310, 1313, 1317,
+	1322, 0, 1325, 0, 0, 1326, 0, 646, 1107, 0,
+	0, 1127, 1128, 0, 1355, 1357, 1358, 1359, 1372, 0,
+	1377, 1378, 0, 1383, 0, 1387, 1398, 0, 1005, 1012,
+	1013, 0, 1008, 0, 1009, 0, 953, 1504, 84, 1505,
+	1502, 0, 1500, 1497, 1562, 0, 1571, 1572, 1581, 1582,
+	1588, 0, 0, 1601, 0, 1595, 90, 0, 0, 0,
+	1515, 194, 0, 214, 0, 623, 0, 626, 616, 703,
+	704, 0, 716, 708, 710, 711, 693, -2, 1541, 0,
+	0, 0, 594, 1451, 0, 0, 1327, 0, 642, 643,
+	1115, 1108, 0, 1093, 1094, 1112, 1352, 1354, 0, 0,
+	0, 1004, 964, 965, 1006, 1007, 83, 0, 1501, 1135,
+	0, 1496, 0, 1574, 1575, 1605, 0, 1594, 1600, 973,
+	980, 0, 91, 446, 439, 1541, 0, 0, 0, 696,
+	697, 698, 699, 700, 701, 702, 583, 1543, 142, 143,
+	0, 513, 514, 515, 136, 0, 1170, 1323, 1109, 0,
+	0, 0, 0, 0, 1373, 0, 1379, 0, 1384, 0,
+	1503, 0, 0, 1498, 1603, 628, 0, 630, 0, -2,
+	434, 447, 0, 188, 215, 216, 0, 0, 219, 220,
+	221, 212, 213, 132, 0, 0, 717, 0, 1544, 1545,
+	0, 139, 0, 0, 1100, 1101, 1102, 1103, 1105, 0,
+	0, 0, 0, 1136, 1113, 629, 0, 0, 389, 0,
+	639, 435, 436, 0, 442, 443, 444, 445, 217, 218,
+	651, 0, 0, 512, 590, 1452, 0, 0, 1374, 0,
+	1380, 0, 1385, 0, 631, 632, 640, 0, 437, 0,
+	438, 0, 0, 0, 620, 0, 651, 1542, 1110, 1104,
+	1106, 0, 0, 1134, 0, 641, 637, 448, 450, 451,
+	0, 0, 449, 652, 621, 1375, 1381, 0, 452, 453,
+	454, 633, 634, 635, 636,
 }
 
 var yyTok1 = [...]int{
@@ -11759,10 +11722,10 @@ yydefault:
 		yyVAL.union = yyLOCAL
 	case 211:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		var yyLOCAL ColumnStorage
-//line sql.y:1598
+		var yyLOCAL ColumnFormat
+//line sql.y:1596
 		{
-			yyLOCAL = VirtualStorage
+			yyLOCAL = CompressedFormat
 		}
 		yyVAL.union = yyLOCAL
 	case 212:
@@ -11770,102 +11733,102 @@ yydefault:
 		var yyLOCAL ColumnStorage
 //line sql.y:1602
 		{
-			yyLOCAL = StoredStorage
+			yyLOCAL = VirtualStorage
 		}
 		yyVAL.union = yyLOCAL
 	case 213:
+		yyDollar = yyS[yypt-1 : yypt+1]
+		var yyLOCAL ColumnStorage
+//line sql.y:1606
+		{
+			yyLOCAL = StoredStorage
+		}
+		yyVAL.union = yyLOCAL
+	case 214:
 		yyDollar = yyS[yypt-0 : yypt+1]
 		var yyLOCAL *ColumnTypeOptions
-//line sql.y:1607
+//line sql.y:1611
 		{
 			yyLOCAL = &ColumnTypeOptions{}
 		}
 		yyVAL.union = yyLOCAL
-	case 214:
+	case 215:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL *ColumnTypeOptions
-//line sql.y:1611
+//line sql.y:1615
 		{
 			yyDollar[1].columnTypeOptionsUnion().Storage = yyDollar[2].columnStorageUnion()
 			yyLOCAL = yyDollar[1].columnTypeOptionsUnion()
 		}
 		yyVAL.union = yyLOCAL
-	case 215:
+	case 216:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL *ColumnTypeOptions
-//line sql.y:1616
+//line sql.y:1620
 		{
 			yyDollar[1].columnTypeOptionsUnion().Null = ptr.Of(true)
 			yyLOCAL = yyDollar[1].columnTypeOptionsUnion()
 		}
 		yyVAL.union = yyLOCAL
-	case 216:
+	case 217:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL *ColumnTypeOptions
-//line sql.y:1621
+//line sql.y:1625
 		{
 			yyDollar[1].columnTypeOptionsUnion().Null = ptr.Of(false)
 			yyLOCAL = yyDollar[1].columnTypeOptionsUnion()
 		}
 		yyVAL.union = yyLOCAL
-	case 217:
+	case 218:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL *ColumnTypeOptions
-//line sql.y:1626
+//line sql.y:1630
 		{
 			yyDollar[1].columnTypeOptionsUnion().Comment = NewStrLiteral(yyDollar[3].str)
 			yyLOCAL = yyDollar[1].columnTypeOptionsUnion()
 		}
 		yyVAL.union = yyLOCAL
-	case 218:
+	case 219:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL *ColumnTypeOptions
-//line sql.y:1631
+//line sql.y:1635
 		{
 			yyDollar[1].columnTypeOptionsUnion().KeyOpt = yyDollar[2].colKeyOptUnion()
 			yyLOCAL = yyDollar[1].columnTypeOptionsUnion()
 		}
 		yyVAL.union = yyLOCAL
-	case 219:
+	case 220:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL *ColumnTypeOptions
-//line sql.y:1636
+//line sql.y:1640
 		{
 			yyDollar[1].columnTypeOptionsUnion().Invisible = ptr.Of(false)
 			yyLOCAL = yyDollar[1].columnTypeOptionsUnion()
 		}
 		yyVAL.union = yyLOCAL
-	case 220:
+	case 221:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL *ColumnTypeOptions
-//line sql.y:1641
+//line sql.y:1645
 		{
 			yyDollar[1].columnTypeOptionsUnion().Invisible = ptr.Of(true)
 			yyLOCAL = yyDollar[1].columnTypeOptionsUnion()
 		}
 		yyVAL.union = yyLOCAL
-	case 221:
+	case 222:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:1648
+//line sql.y:1652
 		{
 			yyLOCAL = yyDollar[1].exprUnion()
 		}
 		yyVAL.union = yyLOCAL
-	case 223:
-		yyDollar = yyS[yypt-2 : yypt+1]
-		var yyLOCAL Expr
-//line sql.y:1655
-		{
-			yyLOCAL = &CurTimeFuncExpr{Name: NewIdentifierCI("current_timestamp"), Fsp: yyDollar[2].integerUnion()}
-		}
-		yyVAL.union = yyLOCAL
 	case 224:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL Expr
 //line sql.y:1659
 		{
-			yyLOCAL = &CurTimeFuncExpr{Name: NewIdentifierCI("localtime"), Fsp: yyDollar[2].integerUnion()}
+			yyLOCAL = &CurTimeFuncExpr{Name: NewIdentifierCI("current_timestamp"), Fsp: yyDollar[2].integerUnion()}
 		}
 		yyVAL.union = yyLOCAL
 	case 225:
@@ -11873,7 +11836,7 @@ yydefault:
 		var yyLOCAL Expr
 //line sql.y:1663
 		{
-			yyLOCAL = &CurTimeFuncExpr{Name: NewIdentifierCI("localtimestamp"), Fsp: yyDollar[2].integerUnion()}
+			yyLOCAL = &CurTimeFuncExpr{Name: NewIdentifierCI("localtime"), Fsp: yyDollar[2].integerUnion()}
 		}
 		yyVAL.union = yyLOCAL
 	case 226:
@@ -11881,7 +11844,7 @@ yydefault:
 		var yyLOCAL Expr
 //line sql.y:1667
 		{
-			yyLOCAL = &CurTimeFuncExpr{Name: NewIdentifierCI("utc_timestamp"), Fsp: yyDollar[2].integerUnion()}
+			yyLOCAL = &CurTimeFuncExpr{Name: NewIdentifierCI("localtimestamp"), Fsp: yyDollar[2].integerUnion()}
 		}
 		yyVAL.union = yyLOCAL
 	case 227:
@@ -11889,7 +11852,7 @@ yydefault:
 		var yyLOCAL Expr
 //line sql.y:1671
 		{
-			yyLOCAL = &CurTimeFuncExpr{Name: NewIdentifierCI("now"), Fsp: yyDollar[2].integerUnion()}
+			yyLOCAL = &CurTimeFuncExpr{Name: NewIdentifierCI("utc_timestamp"), Fsp: yyDollar[2].integerUnion()}
 		}
 		yyVAL.union = yyLOCAL
 	case 228:
@@ -11897,23 +11860,23 @@ yydefault:
 		var yyLOCAL Expr
 //line sql.y:1675
 		{
-			yyLOCAL = &CurTimeFuncExpr{Name: NewIdentifierCI("sysdate"), Fsp: yyDollar[2].integerUnion()}
+			yyLOCAL = &CurTimeFuncExpr{Name: NewIdentifierCI("now"), Fsp: yyDollar[2].integerUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 231:
-		yyDollar = yyS[yypt-1 : yypt+1]
+	case 229:
+		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:1685
+//line sql.y:1679
 		{
-			yyLOCAL = &NullVal{}
+			yyLOCAL = &CurTimeFuncExpr{Name: NewIdentifierCI("sysdate"), Fsp: yyDollar[2].integerUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 233:
-		yyDollar = yyS[yypt-2 : yypt+1]
+	case 232:
+		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:1692
+//line sql.y:1689
 		{
-			yyLOCAL = yyDollar[2].exprUnion()
+			yyLOCAL = &NullVal{}
 		}
 		yyVAL.union = yyLOCAL
 	case 234:
@@ -11921,15 +11884,15 @@ yydefault:
 		var yyLOCAL Expr
 //line sql.y:1696
 		{
-			yyLOCAL = &UnaryExpr{Operator: UMinusOp, Expr: yyDollar[2].exprUnion()}
+			yyLOCAL = yyDollar[2].exprUnion()
 		}
 		yyVAL.union = yyLOCAL
 	case 235:
-		yyDollar = yyS[yypt-1 : yypt+1]
+		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:1702
+//line sql.y:1700
 		{
-			yyLOCAL = yyDollar[1].exprUnion()
+			yyLOCAL = &UnaryExpr{Operator: UMinusOp, Expr: yyDollar[2].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
 	case 236:
@@ -11945,7 +11908,7 @@ yydefault:
 		var yyLOCAL Expr
 //line sql.y:1710
 		{
-			yyLOCAL = yyDollar[1].boolValUnion()
+			yyLOCAL = yyDollar[1].exprUnion()
 		}
 		yyVAL.union = yyLOCAL
 	case 238:
@@ -11953,7 +11916,7 @@ yydefault:
 		var yyLOCAL Expr
 //line sql.y:1714
 		{
-			yyLOCAL = NewHexLiteral(yyDollar[1].str)
+			yyLOCAL = yyDollar[1].boolValUnion()
 		}
 		yyVAL.union = yyLOCAL
 	case 239:
@@ -11961,7 +11924,7 @@ yydefault:
 		var yyLOCAL Expr
 //line sql.y:1718
 		{
-			yyLOCAL = NewHexNumLiteral(yyDollar[1].str)
+			yyLOCAL = NewHexLiteral(yyDollar[1].str)
 		}
 		yyVAL.union = yyLOCAL
 	case 240:
@@ -11969,7 +11932,7 @@ yydefault:
 		var yyLOCAL Expr
 //line sql.y:1722
 		{
-			yyLOCAL = NewBitLiteral(yyDollar[1].str)
+			yyLOCAL = NewHexNumLiteral(yyDollar[1].str)
 		}
 		yyVAL.union = yyLOCAL
 	case 241:
@@ -11977,7 +11940,7 @@ yydefault:
 		var yyLOCAL Expr
 //line sql.y:1726
 		{
-			yyLOCAL = NewBitLiteral("0b" + yyDollar[1].str)
+			yyLOCAL = NewBitLiteral(yyDollar[1].str)
 		}
 		yyVAL.union = yyLOCAL
 	case 242:
@@ -11985,15 +11948,15 @@ yydefault:
 		var yyLOCAL Expr
 //line sql.y:1730
 		{
-			yyLOCAL = parseBindVariable(yylex, yyDollar[1].str[1:])
+			yyLOCAL = NewBitLiteral("0b" + yyDollar[1].str)
 		}
 		yyVAL.union = yyLOCAL
 	case 243:
-		yyDollar = yyS[yypt-2 : yypt+1]
+		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL Expr
 //line sql.y:1734
 		{
-			yyLOCAL = &IntroducerExpr{CharacterSet: yyDollar[1].str, Expr: NewBitLiteral("0b" + yyDollar[2].str)}
+			yyLOCAL = parseBindVariable(yylex, yyDollar[1].str[1:])
 		}
 		yyVAL.union = yyLOCAL
 	case 244:
@@ -12001,7 +11964,7 @@ yydefault:
 		var yyLOCAL Expr
 //line sql.y:1738
 		{
-			yyLOCAL = &IntroducerExpr{CharacterSet: yyDollar[1].str, Expr: NewHexNumLiteral(yyDollar[2].str)}
+			yyLOCAL = &IntroducerExpr{CharacterSet: yyDollar[1].str, Expr: NewBitLiteral("0b" + yyDollar[2].str)}
 		}
 		yyVAL.union = yyLOCAL
 	case 245:
@@ -12009,7 +11972,7 @@ yydefault:
 		var yyLOCAL Expr
 //line sql.y:1742
 		{
-			yyLOCAL = &IntroducerExpr{CharacterSet: yyDollar[1].str, Expr: NewBitLiteral(yyDollar[2].str)}
+			yyLOCAL = &IntroducerExpr{CharacterSet: yyDollar[1].str, Expr: NewHexNumLiteral(yyDollar[2].str)}
 		}
 		yyVAL.union = yyLOCAL
 	case 246:
@@ -12017,7 +11980,7 @@ yydefault:
 		var yyLOCAL Expr
 //line sql.y:1746
 		{
-			yyLOCAL = &IntroducerExpr{CharacterSet: yyDollar[1].str, Expr: NewHexLiteral(yyDollar[2].str)}
+			yyLOCAL = &IntroducerExpr{CharacterSet: yyDollar[1].str, Expr: NewBitLiteral(yyDollar[2].str)}
 		}
 		yyVAL.union = yyLOCAL
 	case 247:
@@ -12025,16 +11988,16 @@ yydefault:
 		var yyLOCAL Expr
 //line sql.y:1750
 		{
-			arg := parseBindVariable(yylex, yyDollar[2].str[1:])
-			yyLOCAL = &IntroducerExpr{CharacterSet: yyDollar[1].str, Expr: arg}
+			yyLOCAL = &IntroducerExpr{CharacterSet: yyDollar[1].str, Expr: NewHexLiteral(yyDollar[2].str)}
 		}
 		yyVAL.union = yyLOCAL
 	case 248:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:1755
+//line sql.y:1754
 		{
-			yyLOCAL = NewDateLiteral(yyDollar[2].str)
+			arg := parseBindVariable(yylex, yyDollar[2].str[1:])
+			yyLOCAL = &IntroducerExpr{CharacterSet: yyDollar[1].str, Expr: arg}
 		}
 		yyVAL.union = yyLOCAL
 	case 249:
@@ -12042,7 +12005,7 @@ yydefault:
 		var yyLOCAL Expr
 //line sql.y:1759
 		{
-			yyLOCAL = NewTimeLiteral(yyDollar[2].str)
+			yyLOCAL = NewDateLiteral(yyDollar[2].str)
 		}
 		yyVAL.union = yyLOCAL
 	case 250:
@@ -12050,399 +12013,401 @@ yydefault:
 		var yyLOCAL Expr
 //line sql.y:1763
 		{
-			yyLOCAL = NewTimestampLiteral(yyDollar[2].str)
+			yyLOCAL = NewTimeLiteral(yyDollar[2].str)
 		}
 		yyVAL.union = yyLOCAL
 	case 251:
-		yyDollar = yyS[yypt-1 : yypt+1]
-//line sql.y:1769
+		yyDollar = yyS[yypt-2 : yypt+1]
+		var yyLOCAL Expr
+//line sql.y:1767
 		{
-			yyVAL.str = Armscii8Str
+			yyLOCAL = NewTimestampLiteral(yyDollar[2].str)
 		}
+		yyVAL.union = yyLOCAL
 	case 252:
 		yyDollar = yyS[yypt-1 : yypt+1]
 //line sql.y:1773
 		{
-			yyVAL.str = ASCIIStr
+			yyVAL.str = Armscii8Str
 		}
 	case 253:
 		yyDollar = yyS[yypt-1 : yypt+1]
 //line sql.y:1777
 		{
-			yyVAL.str = Big5Str
+			yyVAL.str = ASCIIStr
 		}
 	case 254:
 		yyDollar = yyS[yypt-1 : yypt+1]
 //line sql.y:1781
 		{
-			yyVAL.str = UBinaryStr
+			yyVAL.str = Big5Str
 		}
 	case 255:
 		yyDollar = yyS[yypt-1 : yypt+1]
 //line sql.y:1785
 		{
-			yyVAL.str = Cp1250Str
+			yyVAL.str = UBinaryStr
 		}
 	case 256:
 		yyDollar = yyS[yypt-1 : yypt+1]
 //line sql.y:1789
 		{
-			yyVAL.str = Cp1251Str
+			yyVAL.str = Cp1250Str
 		}
 	case 257:
 		yyDollar = yyS[yypt-1 : yypt+1]
 //line sql.y:1793
 		{
-			yyVAL.str = Cp1256Str
+			yyVAL.str = Cp1251Str
 		}
 	case 258:
 		yyDollar = yyS[yypt-1 : yypt+1]
 //line sql.y:1797
 		{
-			yyVAL.str = Cp1257Str
+			yyVAL.str = Cp1256Str
 		}
 	case 259:
 		yyDollar = yyS[yypt-1 : yypt+1]
 //line sql.y:1801
 		{
-			yyVAL.str = Cp850Str
+			yyVAL.str = Cp1257Str
 		}
 	case 260:
 		yyDollar = yyS[yypt-1 : yypt+1]
 //line sql.y:1805
 		{
-			yyVAL.str = Cp852Str
+			yyVAL.str = Cp850Str
 		}
 	case 261:
 		yyDollar = yyS[yypt-1 : yypt+1]
 //line sql.y:1809
 		{
-			yyVAL.str = Cp866Str
+			yyVAL.str = Cp852Str
 		}
 	case 262:
 		yyDollar = yyS[yypt-1 : yypt+1]
 //line sql.y:1813
 		{
-			yyVAL.str = Cp932Str
+			yyVAL.str = Cp866Str
 		}
 	case 263:
 		yyDollar = yyS[yypt-1 : yypt+1]
 //line sql.y:1817
 		{
-			yyVAL.str = Dec8Str
+			yyVAL.str = Cp932Str
 		}
 	case 264:
 		yyDollar = yyS[yypt-1 : yypt+1]
 //line sql.y:1821
 		{
-			yyVAL.str = EucjpmsStr
+			yyVAL.str = Dec8Str
 		}
 	case 265:
 		yyDollar = yyS[yypt-1 : yypt+1]
 //line sql.y:1825
 		{
-			yyVAL.str = EuckrStr
+			yyVAL.str = EucjpmsStr
 		}
 	case 266:
 		yyDollar = yyS[yypt-1 : yypt+1]
 //line sql.y:1829
 		{
-			yyVAL.str = Gb18030Str
+			yyVAL.str = EuckrStr
 		}
 	case 267:
 		yyDollar = yyS[yypt-1 : yypt+1]
 //line sql.y:1833
 		{
-			yyVAL.str = Gb2312Str
+			yyVAL.str = Gb18030Str
 		}
 	case 268:
 		yyDollar = yyS[yypt-1 : yypt+1]
 //line sql.y:1837
 		{
-			yyVAL.str = GbkStr
+			yyVAL.str = Gb2312Str
 		}
 	case 269:
 		yyDollar = yyS[yypt-1 : yypt+1]
 //line sql.y:1841
 		{
-			yyVAL.str = Geostd8Str
+			yyVAL.str = GbkStr
 		}
 	case 270:
 		yyDollar = yyS[yypt-1 : yypt+1]
 //line sql.y:1845
 		{
-			yyVAL.str = GreekStr
+			yyVAL.str = Geostd8Str
 		}
 	case 271:
 		yyDollar = yyS[yypt-1 : yypt+1]
 //line sql.y:1849
 		{
-			yyVAL.str = HebrewStr
+			yyVAL.str = GreekStr
 		}
 	case 272:
 		yyDollar = yyS[yypt-1 : yypt+1]
 //line sql.y:1853
 		{
-			yyVAL.str = Hp8Str
+			yyVAL.str = HebrewStr
 		}
 	case 273:
 		yyDollar = yyS[yypt-1 : yypt+1]
 //line sql.y:1857
 		{
-			yyVAL.str = Keybcs2Str
+			yyVAL.str = Hp8Str
 		}
 	case 274:
 		yyDollar = yyS[yypt-1 : yypt+1]
 //line sql.y:1861
 		{
-			yyVAL.str = Koi8rStr
+			yyVAL.str = Keybcs2Str
 		}
 	case 275:
 		yyDollar = yyS[yypt-1 : yypt+1]
 //line sql.y:1865
 		{
-			yyVAL.str = Koi8uStr
+			yyVAL.str = Koi8rStr
 		}
 	case 276:
 		yyDollar = yyS[yypt-1 : yypt+1]
 //line sql.y:1869
 		{
-			yyVAL.str = Latin1Str
+			yyVAL.str = Koi8uStr
 		}
 	case 277:
 		yyDollar = yyS[yypt-1 : yypt+1]
 //line sql.y:1873
 		{
-			yyVAL.str = Latin2Str
+			yyVAL.str = Latin1Str
 		}
 	case 278:
 		yyDollar = yyS[yypt-1 : yypt+1]
 //line sql.y:1877
 		{
-			yyVAL.str = Latin5Str
+			yyVAL.str = Latin2Str
 		}
 	case 279:
 		yyDollar = yyS[yypt-1 : yypt+1]
 //line sql.y:1881
 		{
-			yyVAL.str = Latin7Str
+			yyVAL.str = Latin5Str
 		}
 	case 280:
 		yyDollar = yyS[yypt-1 : yypt+1]
 //line sql.y:1885
 		{
-			yyVAL.str = MacceStr
+			yyVAL.str = Latin7Str
 		}
 	case 281:
 		yyDollar = yyS[yypt-1 : yypt+1]
 //line sql.y:1889
 		{
-			yyVAL.str = MacromanStr
+			yyVAL.str = MacceStr
 		}
 	case 282:
 		yyDollar = yyS[yypt-1 : yypt+1]
 //line sql.y:1893
 		{
-			yyVAL.str = SjisStr
+			yyVAL.str = MacromanStr
 		}
 	case 283:
 		yyDollar = yyS[yypt-1 : yypt+1]
 //line sql.y:1897
 		{
-			yyVAL.str = Swe7Str
+			yyVAL.str = SjisStr
 		}
 	case 284:
 		yyDollar = yyS[yypt-1 : yypt+1]
 //line sql.y:1901
 		{
-			yyVAL.str = Tis620Str
+			yyVAL.str = Swe7Str
 		}
 	case 285:
 		yyDollar = yyS[yypt-1 : yypt+1]
 //line sql.y:1905
 		{
-			yyVAL.str = Ucs2Str
+			yyVAL.str = Tis620Str
 		}
 	case 286:
 		yyDollar = yyS[yypt-1 : yypt+1]
 //line sql.y:1909
 		{
-			yyVAL.str = UjisStr
+			yyVAL.str = Ucs2Str
 		}
 	case 287:
 		yyDollar = yyS[yypt-1 : yypt+1]
 //line sql.y:1913
 		{
-			yyVAL.str = Utf16Str
+			yyVAL.str = UjisStr
 		}
 	case 288:
 		yyDollar = yyS[yypt-1 : yypt+1]
 //line sql.y:1917
 		{
-			yyVAL.str = Utf16leStr
+			yyVAL.str = Utf16Str
 		}
 	case 289:
 		yyDollar = yyS[yypt-1 : yypt+1]
 //line sql.y:1921
 		{
-			yyVAL.str = Utf32Str
+			yyVAL.str = Utf16leStr
 		}
 	case 290:
 		yyDollar = yyS[yypt-1 : yypt+1]
 //line sql.y:1925
 		{
-			yyVAL.str = Utf8mb3Str
+			yyVAL.str = Utf32Str
 		}
 	case 291:
 		yyDollar = yyS[yypt-1 : yypt+1]
 //line sql.y:1929
 		{
-			yyVAL.str = Utf8mb4Str
+			yyVAL.str = Utf8mb3Str
 		}
 	case 292:
 		yyDollar = yyS[yypt-1 : yypt+1]
 //line sql.y:1933
+		{
+			yyVAL.str = Utf8mb4Str
+		}
+	case 293:
+		yyDollar = yyS[yypt-1 : yypt+1]
+//line sql.y:1937
 		{
 			yyVAL.str = Utf8mb3Str
 		}
-	case 295:
+	case 296:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:1943
+//line sql.y:1947
 		{
 			yyLOCAL = NewIntLiteral(yyDollar[1].str)
 		}
 		yyVAL.union = yyLOCAL
-	case 296:
+	case 297:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:1947
+//line sql.y:1951
 		{
 			yyLOCAL = NewFloatLiteral(yyDollar[1].str)
 		}
 		yyVAL.union = yyLOCAL
-	case 297:
+	case 298:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:1951
+//line sql.y:1955
 		{
 			yyLOCAL = NewDecimalLiteral(yyDollar[1].str)
 		}
 		yyVAL.union = yyLOCAL
-	case 298:
+	case 299:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:1957
+//line sql.y:1961
 		{
 			yyLOCAL = yyDollar[1].exprUnion()
 		}
 		yyVAL.union = yyLOCAL
-	case 299:
+	case 300:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:1961
+//line sql.y:1965
 		{
 			yyLOCAL = AppendString(yyDollar[1].exprUnion(), yyDollar[2].str)
 		}
 		yyVAL.union = yyLOCAL
-	case 300:
+	case 301:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:1967
+//line sql.y:1971
 		{
 			yyLOCAL = NewStrLiteral(yyDollar[1].str)
 		}
 		yyVAL.union = yyLOCAL
-	case 301:
+	case 302:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:1971
+//line sql.y:1975
 		{
 			yyLOCAL = &UnaryExpr{Operator: NStringOp, Expr: NewStrLiteral(yyDollar[1].str)}
 		}
 		yyVAL.union = yyLOCAL
-	case 302:
+	case 303:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:1975
+//line sql.y:1979
 		{
 			yyLOCAL = &IntroducerExpr{CharacterSet: yyDollar[1].str, Expr: NewStrLiteral(yyDollar[2].str)}
 		}
 		yyVAL.union = yyLOCAL
-	case 303:
+	case 304:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:1981
+//line sql.y:1985
 		{
 			yyLOCAL = yyDollar[1].exprUnion()
 		}
 		yyVAL.union = yyLOCAL
-	case 304:
+	case 305:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:1985
+//line sql.y:1989
 		{
 			yyLOCAL = parseBindVariable(yylex, yyDollar[1].str[1:])
 		}
 		yyVAL.union = yyLOCAL
-	case 305:
+	case 306:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL ColumnKeyOption
-//line sql.y:1991
+//line sql.y:1995
 		{
 			yyLOCAL = ColKeyPrimary
 		}
 		yyVAL.union = yyLOCAL
-	case 306:
+	case 307:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL ColumnKeyOption
-//line sql.y:1995
+//line sql.y:1999
 		{
 			yyLOCAL = ColKeyUnique
 		}
 		yyVAL.union = yyLOCAL
-	case 307:
+	case 308:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL ColumnKeyOption
-//line sql.y:1999
+//line sql.y:2003
 		{
 			yyLOCAL = ColKeyUniqueKey
 		}
 		yyVAL.union = yyLOCAL
-	case 308:
+	case 309:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL ColumnKeyOption
-//line sql.y:2003
+//line sql.y:2007
 		{
 			yyLOCAL = ColKey
 		}
 		yyVAL.union = yyLOCAL
-	case 309:
+	case 310:
 		yyDollar = yyS[yypt-3 : yypt+1]
-//line sql.y:2009
+//line sql.y:2013
 		{
 			yyVAL.columnType = yyDollar[1].columnType
 			yyVAL.columnType.Unsigned = yyDollar[2].booleanUnion()
 			yyVAL.columnType.Zerofill = yyDollar[3].booleanUnion()
 		}
-	case 313:
+	case 314:
 		yyDollar = yyS[yypt-2 : yypt+1]
-//line sql.y:2020
+//line sql.y:2024
 		{
 			yyVAL.columnType = yyDollar[1].columnType
 			yyVAL.columnType.Length = yyDollar[2].intPtrUnion()
 		}
-	case 314:
-		yyDollar = yyS[yypt-1 : yypt+1]
-//line sql.y:2025
-		{
-			yyVAL.columnType = yyDollar[1].columnType
-		}
 	case 315:
 		yyDollar = yyS[yypt-1 : yypt+1]
-//line sql.y:2031
+//line sql.y:2029
 		{
-			yyVAL.columnType = &ColumnType{Type: string(yyDollar[1].str)}
+			yyVAL.columnType = yyDollar[1].columnType
 		}
 	case 316:
 		yyDollar = yyS[yypt-1 : yypt+1]
@@ -12493,16 +12458,14 @@ yydefault:
 			yyVAL.columnType = &ColumnType{Type: string(yyDollar[1].str)}
 		}
 	case 324:
-		yyDollar = yyS[yypt-2 : yypt+1]
-//line sql.y:2069
+		yyDollar = yyS[yypt-1 : yypt+1]
+//line sql.y:2067
 		{
 			yyVAL.columnType = &ColumnType{Type: string(yyDollar[1].str)}
-			yyVAL.columnType.Length = yyDollar[2].LengthScaleOption.Length
-			yyVAL.columnType.Scale = yyDollar[2].LengthScaleOption.Scale
 		}
 	case 325:
 		yyDollar = yyS[yypt-2 : yypt+1]
-//line sql.y:2075
+//line sql.y:2073
 		{
 			yyVAL.columnType = &ColumnType{Type: string(yyDollar[1].str)}
 			yyVAL.columnType.Length = yyDollar[2].LengthScaleOption.Length
@@ -12510,7 +12473,7 @@ yydefault:
 		}
 	case 326:
 		yyDollar = yyS[yypt-2 : yypt+1]
-//line sql.y:2081
+//line sql.y:2079
 		{
 			yyVAL.columnType = &ColumnType{Type: string(yyDollar[1].str)}
 			yyVAL.columnType.Length = yyDollar[2].LengthScaleOption.Length
@@ -12518,7 +12481,7 @@ yydefault:
 		}
 	case 327:
 		yyDollar = yyS[yypt-2 : yypt+1]
-//line sql.y:2087
+//line sql.y:2085
 		{
 			yyVAL.columnType = &ColumnType{Type: string(yyDollar[1].str)}
 			yyVAL.columnType.Length = yyDollar[2].LengthScaleOption.Length
@@ -12526,7 +12489,7 @@ yydefault:
 		}
 	case 328:
 		yyDollar = yyS[yypt-2 : yypt+1]
-//line sql.y:2093
+//line sql.y:2091
 		{
 			yyVAL.columnType = &ColumnType{Type: string(yyDollar[1].str)}
 			yyVAL.columnType.Length = yyDollar[2].LengthScaleOption.Length
@@ -12534,7 +12497,7 @@ yydefault:
 		}
 	case 329:
 		yyDollar = yyS[yypt-2 : yypt+1]
-//line sql.y:2099
+//line sql.y:2097
 		{
 			yyVAL.columnType = &ColumnType{Type: string(yyDollar[1].str)}
 			yyVAL.columnType.Length = yyDollar[2].LengthScaleOption.Length
@@ -12542,23 +12505,25 @@ yydefault:
 		}
 	case 330:
 		yyDollar = yyS[yypt-2 : yypt+1]
-//line sql.y:2105
+//line sql.y:2103
 		{
 			yyVAL.columnType = &ColumnType{Type: string(yyDollar[1].str)}
 			yyVAL.columnType.Length = yyDollar[2].LengthScaleOption.Length
 			yyVAL.columnType.Scale = yyDollar[2].LengthScaleOption.Scale
 		}
 	case 331:
-		yyDollar = yyS[yypt-1 : yypt+1]
-//line sql.y:2113
+		yyDollar = yyS[yypt-2 : yypt+1]
+//line sql.y:2109
 		{
 			yyVAL.columnType = &ColumnType{Type: string(yyDollar[1].str)}
+			yyVAL.columnType.Length = yyDollar[2].LengthScaleOption.Length
+			yyVAL.columnType.Scale = yyDollar[2].LengthScaleOption.Scale
 		}
 	case 332:
-		yyDollar = yyS[yypt-2 : yypt+1]
+		yyDollar = yyS[yypt-1 : yypt+1]
 //line sql.y:2117
 		{
-			yyVAL.columnType = &ColumnType{Type: string(yyDollar[1].str), Length: yyDollar[2].intPtrUnion()}
+			yyVAL.columnType = &ColumnType{Type: string(yyDollar[1].str)}
 		}
 	case 333:
 		yyDollar = yyS[yypt-2 : yypt+1]
@@ -12579,30 +12544,30 @@ yydefault:
 			yyVAL.columnType = &ColumnType{Type: string(yyDollar[1].str), Length: yyDollar[2].intPtrUnion()}
 		}
 	case 336:
-		yyDollar = yyS[yypt-3 : yypt+1]
-//line sql.y:2135
+		yyDollar = yyS[yypt-2 : yypt+1]
+//line sql.y:2133
 		{
-			yyVAL.columnType = &ColumnType{Type: string(yyDollar[1].str), Length: yyDollar[2].intPtrUnion(), Charset: yyDollar[3].columnCharset}
+			yyVAL.columnType = &ColumnType{Type: string(yyDollar[1].str), Length: yyDollar[2].intPtrUnion()}
 		}
 	case 337:
 		yyDollar = yyS[yypt-3 : yypt+1]
 //line sql.y:2139
 		{
-			// CHAR BYTE is an alias for binary. See also:
-			// https://dev.mysql.com/doc/refman/8.0/en/string-type-syntax.html
-			yyVAL.columnType = &ColumnType{Type: "binary", Length: yyDollar[2].intPtrUnion()}
+			yyVAL.columnType = &ColumnType{Type: string(yyDollar[1].str), Length: yyDollar[2].intPtrUnion(), Charset: yyDollar[3].columnCharset}
 		}
 	case 338:
 		yyDollar = yyS[yypt-3 : yypt+1]
-//line sql.y:2145
+//line sql.y:2143
 		{
-			yyVAL.columnType = &ColumnType{Type: string(yyDollar[1].str), Length: yyDollar[2].intPtrUnion(), Charset: yyDollar[3].columnCharset}
+			// CHAR BYTE is an alias for binary. See also:
+			// https://dev.mysql.com/doc/refman/8.0/en/string-type-syntax.html
+			yyVAL.columnType = &ColumnType{Type: "binary", Length: yyDollar[2].intPtrUnion()}
 		}
 	case 339:
-		yyDollar = yyS[yypt-2 : yypt+1]
+		yyDollar = yyS[yypt-3 : yypt+1]
 //line sql.y:2149
 		{
-			yyVAL.columnType = &ColumnType{Type: string(yyDollar[1].str), Length: yyDollar[2].intPtrUnion()}
+			yyVAL.columnType = &ColumnType{Type: string(yyDollar[1].str), Length: yyDollar[2].intPtrUnion(), Charset: yyDollar[3].columnCharset}
 		}
 	case 340:
 		yyDollar = yyS[yypt-2 : yypt+1]
@@ -12614,7 +12579,7 @@ yydefault:
 		yyDollar = yyS[yypt-2 : yypt+1]
 //line sql.y:2157
 		{
-			yyVAL.columnType = &ColumnType{Type: string(yyDollar[1].str), Charset: yyDollar[2].columnCharset}
+			yyVAL.columnType = &ColumnType{Type: string(yyDollar[1].str), Length: yyDollar[2].intPtrUnion()}
 		}
 	case 342:
 		yyDollar = yyS[yypt-2 : yypt+1]
@@ -12635,10 +12600,10 @@ yydefault:
 			yyVAL.columnType = &ColumnType{Type: string(yyDollar[1].str), Charset: yyDollar[2].columnCharset}
 		}
 	case 345:
-		yyDollar = yyS[yypt-1 : yypt+1]
+		yyDollar = yyS[yypt-2 : yypt+1]
 //line sql.y:2173
 		{
-			yyVAL.columnType = &ColumnType{Type: string(yyDollar[1].str)}
+			yyVAL.columnType = &ColumnType{Type: string(yyDollar[1].str), Charset: yyDollar[2].columnCharset}
 		}
 	case 346:
 		yyDollar = yyS[yypt-1 : yypt+1]
@@ -12665,28 +12630,28 @@ yydefault:
 			yyVAL.columnType = &ColumnType{Type: string(yyDollar[1].str)}
 		}
 	case 350:
-		yyDollar = yyS[yypt-5 : yypt+1]
+		yyDollar = yyS[yypt-1 : yypt+1]
 //line sql.y:2193
 		{
-			yyVAL.columnType = &ColumnType{Type: string(yyDollar[1].str), EnumValues: yyDollar[3].strs, Charset: yyDollar[5].columnCharset}
+			yyVAL.columnType = &ColumnType{Type: string(yyDollar[1].str)}
 		}
 	case 351:
-		yyDollar = yyS[yypt-2 : yypt+1]
+		yyDollar = yyS[yypt-5 : yypt+1]
 //line sql.y:2197
 		{
-			yyVAL.columnType = &ColumnType{Type: string(yyDollar[1].str), Length: yyDollar[2].intPtrUnion()}
+			yyVAL.columnType = &ColumnType{Type: string(yyDollar[1].str), EnumValues: yyDollar[3].strs, Charset: yyDollar[5].columnCharset}
 		}
 	case 352:
-		yyDollar = yyS[yypt-5 : yypt+1]
-//line sql.y:2202
+		yyDollar = yyS[yypt-2 : yypt+1]
+//line sql.y:2201
 		{
-			yyVAL.columnType = &ColumnType{Type: string(yyDollar[1].str), EnumValues: yyDollar[3].strs, Charset: yyDollar[5].columnCharset}
+			yyVAL.columnType = &ColumnType{Type: string(yyDollar[1].str), Length: yyDollar[2].intPtrUnion()}
 		}
 	case 353:
-		yyDollar = yyS[yypt-1 : yypt+1]
-//line sql.y:2208
+		yyDollar = yyS[yypt-5 : yypt+1]
+//line sql.y:2206
 		{
-			yyVAL.columnType = &ColumnType{Type: string(yyDollar[1].str)}
+			yyVAL.columnType = &ColumnType{Type: string(yyDollar[1].str), EnumValues: yyDollar[3].strs, Charset: yyDollar[5].columnCharset}
 		}
 	case 354:
 		yyDollar = yyS[yypt-1 : yypt+1]
@@ -12732,288 +12697,286 @@ yydefault:
 		}
 	case 361:
 		yyDollar = yyS[yypt-1 : yypt+1]
-//line sql.y:2242
+//line sql.y:2240
+		{
+			yyVAL.columnType = &ColumnType{Type: string(yyDollar[1].str)}
+		}
+	case 362:
+		yyDollar = yyS[yypt-1 : yypt+1]
+//line sql.y:2246
 		{
 			yyVAL.strs = make([]string, 0, 4)
 			yyVAL.strs = append(yyVAL.strs, encodeSQLString(yyDollar[1].str))
 		}
-	case 362:
+	case 363:
 		yyDollar = yyS[yypt-3 : yypt+1]
-//line sql.y:2247
+//line sql.y:2251
 		{
 			yyVAL.strs = append(yyDollar[1].strs, encodeSQLString(yyDollar[3].str))
 		}
-	case 363:
+	case 364:
 		yyDollar = yyS[yypt-0 : yypt+1]
 		var yyLOCAL *int
-//line sql.y:2252
+//line sql.y:2256
 		{
 			yyLOCAL = nil
 		}
 		yyVAL.union = yyLOCAL
-	case 364:
+	case 365:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL *int
-//line sql.y:2256
+//line sql.y:2260
 		{
 			yyLOCAL = ptr.Of(convertStringToInt(yyDollar[2].str))
 		}
 		yyVAL.union = yyLOCAL
-	case 365:
+	case 366:
 		yyDollar = yyS[yypt-0 : yypt+1]
-//line sql.y:2261
+//line sql.y:2265
 		{
 			yyVAL.LengthScaleOption = LengthScaleOption{}
 		}
-	case 366:
+	case 367:
 		yyDollar = yyS[yypt-5 : yypt+1]
-//line sql.y:2265
+//line sql.y:2269
 		{
 			yyVAL.LengthScaleOption = LengthScaleOption{
 				Length: ptr.Of(convertStringToInt(yyDollar[2].str)),
 				Scale:  ptr.Of(convertStringToInt(yyDollar[4].str)),
 			}
 		}
-	case 367:
+	case 368:
 		yyDollar = yyS[yypt-1 : yypt+1]
-//line sql.y:2274
+//line sql.y:2278
 		{
 			yyVAL.LengthScaleOption = yyDollar[1].LengthScaleOption
 		}
-	case 368:
+	case 369:
 		yyDollar = yyS[yypt-3 : yypt+1]
-//line sql.y:2278
+//line sql.y:2282
 		{
 			yyVAL.LengthScaleOption = LengthScaleOption{
 				Length: ptr.Of(convertStringToInt(yyDollar[2].str)),
 			}
 		}
-	case 369:
+	case 370:
 		yyDollar = yyS[yypt-0 : yypt+1]
-//line sql.y:2285
+//line sql.y:2289
 		{
 			yyVAL.LengthScaleOption = LengthScaleOption{}
 		}
-	case 370:
+	case 371:
 		yyDollar = yyS[yypt-3 : yypt+1]
-//line sql.y:2289
+//line sql.y:2293
 		{
 			yyVAL.LengthScaleOption = LengthScaleOption{
 				Length: ptr.Of(convertStringToInt(yyDollar[2].str)),
 			}
 		}
-	case 371:
+	case 372:
 		yyDollar = yyS[yypt-5 : yypt+1]
-//line sql.y:2295
+//line sql.y:2299
 		{
 			yyVAL.LengthScaleOption = LengthScaleOption{
 				Length: ptr.Of(convertStringToInt(yyDollar[2].str)),
 				Scale:  ptr.Of(convertStringToInt(yyDollar[4].str)),
 			}
 		}
-	case 372:
+	case 373:
 		yyDollar = yyS[yypt-0 : yypt+1]
 		var yyLOCAL bool
-//line sql.y:2303
+//line sql.y:2307
 		{
 			yyLOCAL = false
 		}
 		yyVAL.union = yyLOCAL
-	case 373:
+	case 374:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL bool
-//line sql.y:2307
+//line sql.y:2311
 		{
 			yyLOCAL = true
 		}
 		yyVAL.union = yyLOCAL
-	case 374:
+	case 375:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL bool
-//line sql.y:2311
+//line sql.y:2315
 		{
 			yyLOCAL = false
 		}
 		yyVAL.union = yyLOCAL
-	case 375:
+	case 376:
 		yyDollar = yyS[yypt-0 : yypt+1]
 		var yyLOCAL bool
-//line sql.y:2316
+//line sql.y:2320
 		{
 			yyLOCAL = false
 		}
 		yyVAL.union = yyLOCAL
-	case 376:
+	case 377:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL bool
-//line sql.y:2320
+//line sql.y:2324
 		{
 			yyLOCAL = true
 		}
 		yyVAL.union = yyLOCAL
-	case 377:
+	case 378:
 		yyDollar = yyS[yypt-0 : yypt+1]
-//line sql.y:2325
+//line sql.y:2329
 		{
 			yyVAL.columnCharset = ColumnCharset{}
 		}
-	case 378:
+	case 379:
 		yyDollar = yyS[yypt-3 : yypt+1]
-//line sql.y:2329
+//line sql.y:2333
 		{
 			yyVAL.columnCharset = ColumnCharset{Name: string(yyDollar[2].identifierCI.String()), Binary: yyDollar[3].booleanUnion()}
 		}
-	case 379:
+	case 380:
 		yyDollar = yyS[yypt-3 : yypt+1]
-//line sql.y:2333
+//line sql.y:2337
 		{
 			yyVAL.columnCharset = ColumnCharset{Name: encodeSQLString(yyDollar[2].str), Binary: yyDollar[3].booleanUnion()}
 		}
-	case 380:
+	case 381:
 		yyDollar = yyS[yypt-2 : yypt+1]
-//line sql.y:2337
+//line sql.y:2341
 		{
 			yyVAL.columnCharset = ColumnCharset{Name: string(yyDollar[2].str)}
 		}
-	case 381:
+	case 382:
 		yyDollar = yyS[yypt-2 : yypt+1]
-//line sql.y:2341
+//line sql.y:2345
 		{
 			// ASCII: Shorthand for CHARACTER SET latin1.
 			yyVAL.columnCharset = ColumnCharset{Name: "latin1", Binary: yyDollar[2].booleanUnion()}
 		}
-	case 382:
+	case 383:
 		yyDollar = yyS[yypt-2 : yypt+1]
-//line sql.y:2346
+//line sql.y:2350
 		{
 			// UNICODE: Shorthand for CHARACTER SET ucs2.
 			yyVAL.columnCharset = ColumnCharset{Name: "ucs2", Binary: yyDollar[2].booleanUnion()}
 		}
-	case 383:
+	case 384:
 		yyDollar = yyS[yypt-1 : yypt+1]
-//line sql.y:2351
+//line sql.y:2355
 		{
 			// BINARY: Shorthand for default CHARACTER SET but with binary collation
 			yyVAL.columnCharset = ColumnCharset{Name: "", Binary: true}
 		}
-	case 384:
+	case 385:
 		yyDollar = yyS[yypt-2 : yypt+1]
-//line sql.y:2356
+//line sql.y:2360
 		{
 			// BINARY ASCII: Shorthand for CHARACTER SET latin1 with binary collation
 			yyVAL.columnCharset = ColumnCharset{Name: "latin1", Binary: true}
 		}
-	case 385:
+	case 386:
 		yyDollar = yyS[yypt-2 : yypt+1]
-//line sql.y:2361
+//line sql.y:2365
 		{
 			// BINARY UNICODE: Shorthand for CHARACTER SET ucs2 with binary collation
 			yyVAL.columnCharset = ColumnCharset{Name: "ucs2", Binary: true}
 		}
-	case 386:
+	case 387:
 		yyDollar = yyS[yypt-0 : yypt+1]
 		var yyLOCAL bool
-//line sql.y:2367
+//line sql.y:2371
 		{
 			yyLOCAL = false
 		}
 		yyVAL.union = yyLOCAL
-	case 387:
+	case 388:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL bool
-//line sql.y:2371
+//line sql.y:2375
 		{
 			yyLOCAL = true
 		}
 		yyVAL.union = yyLOCAL
-	case 388:
+	case 389:
 		yyDollar = yyS[yypt-0 : yypt+1]
-//line sql.y:2376
+//line sql.y:2380
 		{
 			yyVAL.str = ""
 		}
-	case 389:
+	case 390:
 		yyDollar = yyS[yypt-2 : yypt+1]
-//line sql.y:2380
+//line sql.y:2384
 		{
 			yyVAL.str = string(yyDollar[2].identifierCI.String())
 		}
-	case 390:
+	case 391:
 		yyDollar = yyS[yypt-2 : yypt+1]
-//line sql.y:2384
+//line sql.y:2388
 		{
 			yyVAL.str = encodeSQLString(yyDollar[2].str)
 		}
-	case 391:
+	case 392:
 		yyDollar = yyS[yypt-5 : yypt+1]
 		var yyLOCAL *IndexDefinition
-//line sql.y:2390
+//line sql.y:2394
 		{
 			yyLOCAL = &IndexDefinition{Info: yyDollar[1].indexInfoUnion(), Columns: yyDollar[3].indexColumnsUnion(), Options: yyDollar[5].indexOptionsUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 392:
+	case 393:
 		yyDollar = yyS[yypt-0 : yypt+1]
 		var yyLOCAL []*IndexOption
-//line sql.y:2395
+//line sql.y:2399
 		{
 			yyLOCAL = nil
 		}
 		yyVAL.union = yyLOCAL
-	case 393:
+	case 394:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL []*IndexOption
-//line sql.y:2399
+//line sql.y:2403
 		{
 			yyLOCAL = yyDollar[1].indexOptionsUnion()
 		}
 		yyVAL.union = yyLOCAL
-	case 394:
+	case 395:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL []*IndexOption
-//line sql.y:2405
+//line sql.y:2409
 		{
 			yyLOCAL = []*IndexOption{yyDollar[1].indexOptionUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 395:
+	case 396:
 		yyDollar = yyS[yypt-2 : yypt+1]
-//line sql.y:2409
+//line sql.y:2413
 		{
 			yySLICE := (*[]*IndexOption)(yyIaddr(yyVAL.union))
 			*yySLICE = append(*yySLICE, yyDollar[2].indexOptionUnion())
 		}
-	case 396:
+	case 397:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL *IndexOption
-//line sql.y:2415
+//line sql.y:2419
 		{
 			yyLOCAL = yyDollar[1].indexOptionUnion()
 		}
 		yyVAL.union = yyLOCAL
-	case 397:
+	case 398:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL *IndexOption
-//line sql.y:2419
+//line sql.y:2423
 		{
 			// should not be string
 			yyLOCAL = &IndexOption{Name: string(yyDollar[1].str), Value: NewIntLiteral(yyDollar[3].str)}
 		}
 		yyVAL.union = yyLOCAL
-	case 398:
-		yyDollar = yyS[yypt-2 : yypt+1]
-		var yyLOCAL *IndexOption
-//line sql.y:2424
-		{
-			yyLOCAL = &IndexOption{Name: string(yyDollar[1].str), Value: NewStrLiteral(yyDollar[2].str)}
-		}
-		yyVAL.union = yyLOCAL
 	case 399:
-		yyDollar = yyS[yypt-1 : yypt+1]
+		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL *IndexOption
 //line sql.y:2428
 		{
-			yyLOCAL = &IndexOption{Name: string(yyDollar[1].str)}
+			yyLOCAL = &IndexOption{Name: string(yyDollar[1].str), Value: NewStrLiteral(yyDollar[2].str)}
 		}
 		yyVAL.union = yyLOCAL
 	case 400:
@@ -13025,11 +12988,11 @@ yydefault:
 		}
 		yyVAL.union = yyLOCAL
 	case 401:
-		yyDollar = yyS[yypt-3 : yypt+1]
+		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL *IndexOption
 //line sql.y:2436
 		{
-			yyLOCAL = &IndexOption{Name: string(yyDollar[1].str) + " " + string(yyDollar[2].str), String: yyDollar[3].identifierCI.String()}
+			yyLOCAL = &IndexOption{Name: string(yyDollar[1].str)}
 		}
 		yyVAL.union = yyLOCAL
 	case 402:
@@ -13037,7 +13000,7 @@ yydefault:
 		var yyLOCAL *IndexOption
 //line sql.y:2440
 		{
-			yyLOCAL = &IndexOption{Name: string(yyDollar[1].str), Value: NewStrLiteral(yyDollar[3].str)}
+			yyLOCAL = &IndexOption{Name: string(yyDollar[1].str) + " " + string(yyDollar[2].str), String: yyDollar[3].identifierCI.String()}
 		}
 		yyVAL.union = yyLOCAL
 	case 403:
@@ -13049,75 +13012,77 @@ yydefault:
 		}
 		yyVAL.union = yyLOCAL
 	case 404:
+		yyDollar = yyS[yypt-3 : yypt+1]
+		var yyLOCAL *IndexOption
+//line sql.y:2448
+		{
+			yyLOCAL = &IndexOption{Name: string(yyDollar[1].str), Value: NewStrLiteral(yyDollar[3].str)}
+		}
+		yyVAL.union = yyLOCAL
+	case 405:
 		yyDollar = yyS[yypt-0 : yypt+1]
-//line sql.y:2450
+//line sql.y:2454
 		{
 			yyVAL.str = ""
 		}
-	case 405:
+	case 406:
 		yyDollar = yyS[yypt-1 : yypt+1]
-//line sql.y:2454
+//line sql.y:2458
 		{
 			yyVAL.str = string(yyDollar[1].str)
 		}
-	case 406:
+	case 407:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL *IndexInfo
-//line sql.y:2460
+//line sql.y:2464
 		{
 			yyLOCAL = &IndexInfo{Type: IndexTypePrimary, ConstraintName: NewIdentifierCI(yyDollar[1].str), Name: NewIdentifierCI("PRIMARY")}
 		}
 		yyVAL.union = yyLOCAL
-	case 407:
+	case 408:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL *IndexInfo
-//line sql.y:2464
+//line sql.y:2468
 		{
 			yyLOCAL = &IndexInfo{Type: IndexTypeSpatial, Name: NewIdentifierCI(yyDollar[3].str)}
 		}
 		yyVAL.union = yyLOCAL
-	case 408:
+	case 409:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL *IndexInfo
-//line sql.y:2468
+//line sql.y:2472
 		{
 			yyLOCAL = &IndexInfo{Type: IndexTypeFullText, Name: NewIdentifierCI(yyDollar[3].str)}
 		}
 		yyVAL.union = yyLOCAL
-	case 409:
+	case 410:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL *IndexInfo
-//line sql.y:2472
+//line sql.y:2476
 		{
 			yyLOCAL = &IndexInfo{Type: IndexTypeUnique, ConstraintName: NewIdentifierCI(yyDollar[1].str), Name: NewIdentifierCI(yyDollar[4].str)}
 		}
 		yyVAL.union = yyLOCAL
-	case 410:
+	case 411:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL *IndexInfo
-//line sql.y:2476
+//line sql.y:2480
 		{
 			yyLOCAL = &IndexInfo{Type: IndexTypeDefault, Name: NewIdentifierCI(yyDollar[2].str)}
 		}
 		yyVAL.union = yyLOCAL
-	case 411:
+	case 412:
 		yyDollar = yyS[yypt-0 : yypt+1]
-//line sql.y:2481
+//line sql.y:2485
 		{
 			yyVAL.str = ""
 		}
-	case 412:
+	case 413:
 		yyDollar = yyS[yypt-2 : yypt+1]
-//line sql.y:2485
+//line sql.y:2489
 		{
 			yyVAL.str = yyDollar[2].str
 		}
-	case 413:
-		yyDollar = yyS[yypt-1 : yypt+1]
-//line sql.y:2491
-		{
-			yyVAL.str = string(yyDollar[1].str)
-		}
 	case 414:
 		yyDollar = yyS[yypt-1 : yypt+1]
 //line sql.y:2495
@@ -13132,7 +13097,7 @@ yydefault:
 		}
 	case 416:
 		yyDollar = yyS[yypt-1 : yypt+1]
-//line sql.y:2505
+//line sql.y:2503
 		{
 			yyVAL.str = string(yyDollar[1].str)
 		}
@@ -13143,22 +13108,22 @@ yydefault:
 			yyVAL.str = string(yyDollar[1].str)
 		}
 	case 418:
-		yyDollar = yyS[yypt-0 : yypt+1]
-//line sql.y:2514
+		yyDollar = yyS[yypt-1 : yypt+1]
+//line sql.y:2513
 		{
-			yyVAL.str = ""
+			yyVAL.str = string(yyDollar[1].str)
 		}
 	case 419:
-		yyDollar = yyS[yypt-1 : yypt+1]
+		yyDollar = yyS[yypt-0 : yypt+1]
 //line sql.y:2518
 		{
-			yyVAL.str = yyDollar[1].str
+			yyVAL.str = ""
 		}
 	case 420:
 		yyDollar = yyS[yypt-1 : yypt+1]
-//line sql.y:2524
+//line sql.y:2522
 		{
-			yyVAL.str = string(yyDollar[1].str)
+			yyVAL.str = yyDollar[1].str
 		}
 	case 421:
 		yyDollar = yyS[yypt-1 : yypt+1]
@@ -13167,367 +13132,365 @@ yydefault:
 			yyVAL.str = string(yyDollar[1].str)
 		}
 	case 422:
+		yyDollar = yyS[yypt-1 : yypt+1]
+//line sql.y:2532
+		{
+			yyVAL.str = string(yyDollar[1].str)
+		}
+	case 423:
 		yyDollar = yyS[yypt-0 : yypt+1]
-//line sql.y:2533
+//line sql.y:2537
 		{
 			yyVAL.str = ""
 		}
-	case 423:
+	case 424:
 		yyDollar = yyS[yypt-1 : yypt+1]
-//line sql.y:2537
+//line sql.y:2541
 		{
 			yyVAL.str = string(yyDollar[1].identifierCI.String())
 		}
-	case 424:
+	case 425:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL []*IndexColumn
-//line sql.y:2543
+//line sql.y:2547
 		{
 			yyLOCAL = []*IndexColumn{yyDollar[1].indexColumnUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 425:
+	case 426:
 		yyDollar = yyS[yypt-3 : yypt+1]
-//line sql.y:2547
+//line sql.y:2551
 		{
 			yySLICE := (*[]*IndexColumn)(yyIaddr(yyVAL.union))
 			*yySLICE = append(*yySLICE, yyDollar[3].indexColumnUnion())
 		}
-	case 426:
+	case 427:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL *IndexColumn
-//line sql.y:2553
+//line sql.y:2557
 		{
 			yyLOCAL = &IndexColumn{Column: yyDollar[1].identifierCI, Length: yyDollar[2].intPtrUnion(), Direction: yyDollar[3].orderDirectionUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 427:
+	case 428:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL *IndexColumn
-//line sql.y:2557
+//line sql.y:2561
 		{
 			yyLOCAL = &IndexColumn{Expression: yyDollar[2].exprUnion(), Direction: yyDollar[4].orderDirectionUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 428:
+	case 429:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL *ConstraintDefinition
-//line sql.y:2563
+//line sql.y:2567
 		{
 			yyLOCAL = &ConstraintDefinition{Name: yyDollar[2].identifierCI, Details: yyDollar[3].constraintInfoUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 429:
+	case 430:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL *ConstraintDefinition
-//line sql.y:2567
+//line sql.y:2571
 		{
 			yyLOCAL = &ConstraintDefinition{Details: yyDollar[1].constraintInfoUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 430:
+	case 431:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL *ConstraintDefinition
-//line sql.y:2573
+//line sql.y:2577
 		{
 			yyLOCAL = &ConstraintDefinition{Name: yyDollar[2].identifierCI, Details: yyDollar[3].constraintInfoUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 431:
+	case 432:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL *ConstraintDefinition
-//line sql.y:2577
+//line sql.y:2581
 		{
 			yyLOCAL = &ConstraintDefinition{Details: yyDollar[1].constraintInfoUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 432:
+	case 433:
 		yyDollar = yyS[yypt-7 : yypt+1]
 		var yyLOCAL ConstraintInfo
-//line sql.y:2583
+//line sql.y:2587
 		{
 			yyLOCAL = &ForeignKeyDefinition{IndexName: NewIdentifierCI(yyDollar[3].str), Source: yyDollar[5].columnsUnion(), ReferenceDefinition: yyDollar[7].referenceDefinitionUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 433:
+	case 434:
 		yyDollar = yyS[yypt-6 : yypt+1]
 		var yyLOCAL *ReferenceDefinition
-//line sql.y:2589
+//line sql.y:2593
 		{
 			yyLOCAL = &ReferenceDefinition{ReferencedTable: yyDollar[2].tableName, ReferencedColumns: yyDollar[4].columnsUnion(), Match: yyDollar[6].matchActionUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 434:
+	case 435:
 		yyDollar = yyS[yypt-7 : yypt+1]
 		var yyLOCAL *ReferenceDefinition
-//line sql.y:2593
+//line sql.y:2597
 		{
 			yyLOCAL = &ReferenceDefinition{ReferencedTable: yyDollar[2].tableName, ReferencedColumns: yyDollar[4].columnsUnion(), Match: yyDollar[6].matchActionUnion(), OnDelete: yyDollar[7].referenceActionUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 435:
+	case 436:
 		yyDollar = yyS[yypt-7 : yypt+1]
 		var yyLOCAL *ReferenceDefinition
-//line sql.y:2597
+//line sql.y:2601
 		{
 			yyLOCAL = &ReferenceDefinition{ReferencedTable: yyDollar[2].tableName, ReferencedColumns: yyDollar[4].columnsUnion(), Match: yyDollar[6].matchActionUnion(), OnUpdate: yyDollar[7].referenceActionUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 436:
+	case 437:
 		yyDollar = yyS[yypt-8 : yypt+1]
 		var yyLOCAL *ReferenceDefinition
-//line sql.y:2601
+//line sql.y:2605
 		{
 			yyLOCAL = &ReferenceDefinition{ReferencedTable: yyDollar[2].tableName, ReferencedColumns: yyDollar[4].columnsUnion(), Match: yyDollar[6].matchActionUnion(), OnDelete: yyDollar[7].referenceActionUnion(), OnUpdate: yyDollar[8].referenceActionUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 437:
+	case 438:
 		yyDollar = yyS[yypt-8 : yypt+1]
 		var yyLOCAL *ReferenceDefinition
-//line sql.y:2605
+//line sql.y:2609
 		{
 			yyLOCAL = &ReferenceDefinition{ReferencedTable: yyDollar[2].tableName, ReferencedColumns: yyDollar[4].columnsUnion(), Match: yyDollar[6].matchActionUnion(), OnUpdate: yyDollar[7].referenceActionUnion(), OnDelete: yyDollar[8].referenceActionUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 438:
+	case 439:
 		yyDollar = yyS[yypt-0 : yypt+1]
 		var yyLOCAL *ReferenceDefinition
-//line sql.y:2610
+//line sql.y:2614
 		{
 			yyLOCAL = nil
 		}
 		yyVAL.union = yyLOCAL
-	case 439:
+	case 440:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL *ReferenceDefinition
-//line sql.y:2614
+//line sql.y:2618
 		{
 			yyLOCAL = yyDollar[1].referenceDefinitionUnion()
 		}
 		yyVAL.union = yyLOCAL
-	case 440:
+	case 441:
 		yyDollar = yyS[yypt-5 : yypt+1]
 		var yyLOCAL ConstraintInfo
-//line sql.y:2620
+//line sql.y:2624
 		{
 			yyLOCAL = &CheckConstraintDefinition{Expr: yyDollar[3].exprUnion(), Enforced: yyDollar[5].booleanUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 441:
+	case 442:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL MatchAction
-//line sql.y:2626
+//line sql.y:2630
 		{
 			yyLOCAL = yyDollar[2].matchActionUnion()
 		}
 		yyVAL.union = yyLOCAL
-	case 442:
+	case 443:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL MatchAction
-//line sql.y:2632
+//line sql.y:2636
 		{
 			yyLOCAL = Full
 		}
 		yyVAL.union = yyLOCAL
-	case 443:
+	case 444:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL MatchAction
-//line sql.y:2636
+//line sql.y:2640
 		{
 			yyLOCAL = Partial
 		}
 		yyVAL.union = yyLOCAL
-	case 444:
+	case 445:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL MatchAction
-//line sql.y:2640
+//line sql.y:2644
 		{
 			yyLOCAL = Simple
 		}
 		yyVAL.union = yyLOCAL
-	case 445:
+	case 446:
 		yyDollar = yyS[yypt-0 : yypt+1]
 		var yyLOCAL MatchAction
-//line sql.y:2645
+//line sql.y:2649
 		{
 			yyLOCAL = DefaultMatch
 		}
 		yyVAL.union = yyLOCAL
-	case 446:
+	case 447:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL MatchAction
-//line sql.y:2649
+//line sql.y:2653
 		{
 			yyLOCAL = yyDollar[1].matchActionUnion()
 		}
 		yyVAL.union = yyLOCAL
-	case 447:
+	case 448:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL ReferenceAction
-//line sql.y:2655
+//line sql.y:2659
 		{
 			yyLOCAL = yyDollar[3].referenceActionUnion()
 		}
 		yyVAL.union = yyLOCAL
-	case 448:
+	case 449:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL ReferenceAction
-//line sql.y:2661
+//line sql.y:2665
 		{
 			yyLOCAL = yyDollar[3].referenceActionUnion()
 		}
 		yyVAL.union = yyLOCAL
-	case 449:
+	case 450:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL ReferenceAction
-//line sql.y:2667
+//line sql.y:2671
 		{
 			yyLOCAL = Restrict
 		}
 		yyVAL.union = yyLOCAL
-	case 450:
+	case 451:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL ReferenceAction
-//line sql.y:2671
+//line sql.y:2675
 		{
 			yyLOCAL = Cascade
 		}
 		yyVAL.union = yyLOCAL
-	case 451:
+	case 452:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL ReferenceAction
-//line sql.y:2675
+//line sql.y:2679
 		{
 			yyLOCAL = NoAction
 		}
 		yyVAL.union = yyLOCAL
-	case 452:
+	case 453:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL ReferenceAction
-//line sql.y:2679
+//line sql.y:2683
 		{
 			yyLOCAL = SetDefault
 		}
 		yyVAL.union = yyLOCAL
-	case 453:
+	case 454:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL ReferenceAction
-//line sql.y:2683
+//line sql.y:2687
 		{
 			yyLOCAL = SetNull
 		}
 		yyVAL.union = yyLOCAL
-	case 454:
+	case 455:
 		yyDollar = yyS[yypt-0 : yypt+1]
-//line sql.y:2688
+//line sql.y:2692
 		{
 			yyVAL.str = ""
 		}
-	case 455:
+	case 456:
 		yyDollar = yyS[yypt-1 : yypt+1]
-//line sql.y:2692
+//line sql.y:2696
 		{
 			yyVAL.str = string(yyDollar[1].str)
 		}
-	case 456:
+	case 457:
 		yyDollar = yyS[yypt-1 : yypt+1]
-//line sql.y:2696
+//line sql.y:2700
 		{
 			yyVAL.str = string(yyDollar[1].str)
 		}
-	case 457:
+	case 458:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL bool
-//line sql.y:2702
+//line sql.y:2706
 		{
 			yyLOCAL = true
 		}
 		yyVAL.union = yyLOCAL
-	case 458:
+	case 459:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL bool
-//line sql.y:2706
+//line sql.y:2710
 		{
 			yyLOCAL = false
 		}
 		yyVAL.union = yyLOCAL
-	case 459:
+	case 460:
 		yyDollar = yyS[yypt-0 : yypt+1]
 		var yyLOCAL bool
-//line sql.y:2711
+//line sql.y:2715
 		{
 			yyLOCAL = true
 		}
 		yyVAL.union = yyLOCAL
-	case 460:
+	case 461:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL bool
-//line sql.y:2715
+//line sql.y:2719
 		{
 			yyLOCAL = yyDollar[1].booleanUnion()
 		}
 		yyVAL.union = yyLOCAL
-	case 461:
+	case 462:
 		yyDollar = yyS[yypt-0 : yypt+1]
 		var yyLOCAL TableOptions
-//line sql.y:2720
+//line sql.y:2724
 		{
 			yyLOCAL = nil
 		}
 		yyVAL.union = yyLOCAL
-	case 462:
+	case 463:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL TableOptions
-//line sql.y:2724
+//line sql.y:2728
 		{
 			yyLOCAL = yyDollar[1].tableOptionsUnion()
 		}
 		yyVAL.union = yyLOCAL
-	case 463:
+	case 464:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL TableOptions
-//line sql.y:2730
+//line sql.y:2734
 		{
 			yyLOCAL = TableOptions{yyDollar[1].tableOptionUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 464:
+	case 465:
 		yyDollar = yyS[yypt-3 : yypt+1]
-//line sql.y:2734
+//line sql.y:2738
 		{
 			yySLICE := (*TableOptions)(yyIaddr(yyVAL.union))
 			*yySLICE = append(*yySLICE, yyDollar[3].tableOptionUnion())
 		}
-	case 465:
+	case 466:
 		yyDollar = yyS[yypt-2 : yypt+1]
-//line sql.y:2738
+//line sql.y:2742
 		{
 			yySLICE := (*TableOptions)(yyIaddr(yyVAL.union))
 			*yySLICE = append(*yySLICE, yyDollar[2].tableOptionUnion())
 		}
-	case 466:
+	case 467:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL TableOptions
-//line sql.y:2744
+//line sql.y:2748
 		{
 			yyLOCAL = TableOptions{yyDollar[1].tableOptionUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 467:
+	case 468:
 		yyDollar = yyS[yypt-2 : yypt+1]
-//line sql.y:2748
+//line sql.y:2752
 		{
 			yySLICE := (*TableOptions)(yyIaddr(yyVAL.union))
 			*yySLICE = append(*yySLICE, yyDollar[2].tableOptionUnion())
 		}
-	case 468:
-		yyDollar = yyS[yypt-3 : yypt+1]
-		var yyLOCAL *TableOption
-//line sql.y:2754
-		{
-			yyLOCAL = &TableOption{Name: string(yyDollar[1].str), Value: NewIntLiteral(yyDollar[3].str)}
-		}
-		yyVAL.union = yyLOCAL
 	case 469:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL *TableOption
@@ -13545,11 +13508,11 @@ yydefault:
 		}
 		yyVAL.union = yyLOCAL
 	case 471:
-		yyDollar = yyS[yypt-4 : yypt+1]
+		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL *TableOption
 //line sql.y:2766
 		{
-			yyLOCAL = &TableOption{Name: (string(yyDollar[2].str)), String: yyDollar[4].str, CaseSensitive: true}
+			yyLOCAL = &TableOption{Name: string(yyDollar[1].str), Value: NewIntLiteral(yyDollar[3].str)}
 		}
 		yyVAL.union = yyLOCAL
 	case 472:
@@ -13557,15 +13520,15 @@ yydefault:
 		var yyLOCAL *TableOption
 //line sql.y:2770
 		{
-			yyLOCAL = &TableOption{Name: string(yyDollar[2].str), String: yyDollar[4].str, CaseSensitive: true}
+			yyLOCAL = &TableOption{Name: (string(yyDollar[2].str)), String: yyDollar[4].str, CaseSensitive: true}
 		}
 		yyVAL.union = yyLOCAL
 	case 473:
-		yyDollar = yyS[yypt-3 : yypt+1]
+		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL *TableOption
 //line sql.y:2774
 		{
-			yyLOCAL = &TableOption{Name: string(yyDollar[1].str), Value: NewIntLiteral(yyDollar[3].str)}
+			yyLOCAL = &TableOption{Name: string(yyDollar[2].str), String: yyDollar[4].str, CaseSensitive: true}
 		}
 		yyVAL.union = yyLOCAL
 	case 474:
@@ -13573,7 +13536,7 @@ yydefault:
 		var yyLOCAL *TableOption
 //line sql.y:2778
 		{
-			yyLOCAL = &TableOption{Name: string(yyDollar[1].str), Value: NewStrLiteral(yyDollar[3].str)}
+			yyLOCAL = &TableOption{Name: string(yyDollar[1].str), Value: NewIntLiteral(yyDollar[3].str)}
 		}
 		yyVAL.union = yyLOCAL
 	case 475:
@@ -13593,11 +13556,11 @@ yydefault:
 		}
 		yyVAL.union = yyLOCAL
 	case 477:
-		yyDollar = yyS[yypt-4 : yypt+1]
+		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL *TableOption
 //line sql.y:2790
 		{
-			yyLOCAL = &TableOption{Name: (string(yyDollar[1].str) + " " + string(yyDollar[2].str)), Value: NewStrLiteral(yyDollar[4].str)}
+			yyLOCAL = &TableOption{Name: string(yyDollar[1].str), Value: NewStrLiteral(yyDollar[3].str)}
 		}
 		yyVAL.union = yyLOCAL
 	case 478:
@@ -13609,11 +13572,11 @@ yydefault:
 		}
 		yyVAL.union = yyLOCAL
 	case 479:
-		yyDollar = yyS[yypt-3 : yypt+1]
+		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL *TableOption
 //line sql.y:2798
 		{
-			yyLOCAL = &TableOption{Name: string(yyDollar[1].str), Value: NewIntLiteral(yyDollar[3].str)}
+			yyLOCAL = &TableOption{Name: (string(yyDollar[1].str) + " " + string(yyDollar[2].str)), Value: NewStrLiteral(yyDollar[4].str)}
 		}
 		yyVAL.union = yyLOCAL
 	case 480:
@@ -13621,7 +13584,7 @@ yydefault:
 		var yyLOCAL *TableOption
 //line sql.y:2802
 		{
-			yyLOCAL = &TableOption{Name: string(yyDollar[1].str), Value: NewStrLiteral(yyDollar[3].str)}
+			yyLOCAL = &TableOption{Name: string(yyDollar[1].str), Value: NewIntLiteral(yyDollar[3].str)}
 		}
 		yyVAL.union = yyLOCAL
 	case 481:
@@ -13629,7 +13592,7 @@ yydefault:
 		var yyLOCAL *TableOption
 //line sql.y:2806
 		{
-			yyLOCAL = &TableOption{Name: string(yyDollar[1].str), String: yyDollar[3].identifierCS.String(), CaseSensitive: true}
+			yyLOCAL = &TableOption{Name: string(yyDollar[1].str), Value: NewStrLiteral(yyDollar[3].str)}
 		}
 		yyVAL.union = yyLOCAL
 	case 482:
@@ -13637,7 +13600,7 @@ yydefault:
 		var yyLOCAL *TableOption
 //line sql.y:2810
 		{
-			yyLOCAL = &TableOption{Name: string(yyDollar[1].str), Value: NewStrLiteral(yyDollar[3].str)}
+			yyLOCAL = &TableOption{Name: string(yyDollar[1].str), String: yyDollar[3].identifierCS.String(), CaseSensitive: true}
 		}
 		yyVAL.union = yyLOCAL
 	case 483:
@@ -13645,7 +13608,7 @@ yydefault:
 		var yyLOCAL *TableOption
 //line sql.y:2814
 		{
-			yyLOCAL = &TableOption{Name: string(yyDollar[1].str), String: string(yyDollar[3].str)}
+			yyLOCAL = &TableOption{Name: string(yyDollar[1].str), Value: NewStrLiteral(yyDollar[3].str)}
 		}
 		yyVAL.union = yyLOCAL
 	case 484:
@@ -13653,7 +13616,7 @@ yydefault:
 		var yyLOCAL *TableOption
 //line sql.y:2818
 		{
-			yyLOCAL = &TableOption{Name: string(yyDollar[1].str), Value: NewIntLiteral(yyDollar[3].str)}
+			yyLOCAL = &TableOption{Name: string(yyDollar[1].str), String: string(yyDollar[3].str)}
 		}
 		yyVAL.union = yyLOCAL
 	case 485:
@@ -13685,7 +13648,7 @@ yydefault:
 		var yyLOCAL *TableOption
 //line sql.y:2834
 		{
-			yyLOCAL = &TableOption{Name: string(yyDollar[1].str), String: string(yyDollar[3].str)}
+			yyLOCAL = &TableOption{Name: string(yyDollar[1].str), Value: NewIntLiteral(yyDollar[3].str)}
 		}
 		yyVAL.union = yyLOCAL
 	case 489:
@@ -13693,7 +13656,7 @@ yydefault:
 		var yyLOCAL *TableOption
 //line sql.y:2838
 		{
-			yyLOCAL = &TableOption{Name: string(yyDollar[1].str), Value: NewStrLiteral(yyDollar[3].str)}
+			yyLOCAL = &TableOption{Name: string(yyDollar[1].str), String: string(yyDollar[3].str)}
 		}
 		yyVAL.union = yyLOCAL
 	case 490:
@@ -13701,7 +13664,7 @@ yydefault:
 		var yyLOCAL *TableOption
 //line sql.y:2842
 		{
-			yyLOCAL = &TableOption{Name: string(yyDollar[1].str), String: string(yyDollar[3].str)}
+			yyLOCAL = &TableOption{Name: string(yyDollar[1].str), Value: NewStrLiteral(yyDollar[3].str)}
 		}
 		yyVAL.union = yyLOCAL
 	case 491:
@@ -13709,7 +13672,7 @@ yydefault:
 		var yyLOCAL *TableOption
 //line sql.y:2846
 		{
-			yyLOCAL = &TableOption{Name: string(yyDollar[1].str), Value: NewStrLiteral(yyDollar[3].str)}
+			yyLOCAL = &TableOption{Name: string(yyDollar[1].str), String: string(yyDollar[3].str)}
 		}
 		yyVAL.union = yyLOCAL
 	case 492:
@@ -13717,7 +13680,7 @@ yydefault:
 		var yyLOCAL *TableOption
 //line sql.y:2850
 		{
-			yyLOCAL = &TableOption{Name: string(yyDollar[1].str), Value: NewIntLiteral(yyDollar[3].str)}
+			yyLOCAL = &TableOption{Name: string(yyDollar[1].str), Value: NewStrLiteral(yyDollar[3].str)}
 		}
 		yyVAL.union = yyLOCAL
 	case 493:
@@ -13725,7 +13688,7 @@ yydefault:
 		var yyLOCAL *TableOption
 //line sql.y:2854
 		{
-			yyLOCAL = &TableOption{Name: string(yyDollar[1].str), String: string(yyDollar[3].str)}
+			yyLOCAL = &TableOption{Name: string(yyDollar[1].str), Value: NewIntLiteral(yyDollar[3].str)}
 		}
 		yyVAL.union = yyLOCAL
 	case 494:
@@ -13733,7 +13696,7 @@ yydefault:
 		var yyLOCAL *TableOption
 //line sql.y:2858
 		{
-			yyLOCAL = &TableOption{Name: string(yyDollar[1].str), Value: NewIntLiteral(yyDollar[3].str)}
+			yyLOCAL = &TableOption{Name: string(yyDollar[1].str), String: string(yyDollar[3].str)}
 		}
 		yyVAL.union = yyLOCAL
 	case 495:
@@ -13741,7 +13704,7 @@ yydefault:
 		var yyLOCAL *TableOption
 //line sql.y:2862
 		{
-			yyLOCAL = &TableOption{Name: string(yyDollar[1].str), String: string(yyDollar[3].str)}
+			yyLOCAL = &TableOption{Name: string(yyDollar[1].str), Value: NewIntLiteral(yyDollar[3].str)}
 		}
 		yyVAL.union = yyLOCAL
 	case 496:
@@ -13749,36 +13712,38 @@ yydefault:
 		var yyLOCAL *TableOption
 //line sql.y:2866
 		{
-			yyLOCAL = &TableOption{Name: string(yyDollar[1].str), Value: NewIntLiteral(yyDollar[3].str)}
+			yyLOCAL = &TableOption{Name: string(yyDollar[1].str), String: string(yyDollar[3].str)}
 		}
 		yyVAL.union = yyLOCAL
 	case 497:
-		yyDollar = yyS[yypt-4 : yypt+1]
+		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL *TableOption
 //line sql.y:2870
 		{
-			yyLOCAL = &TableOption{Name: string(yyDollar[1].str), String: (yyDollar[3].identifierCI.String() + yyDollar[4].str), CaseSensitive: true}
+			yyLOCAL = &TableOption{Name: string(yyDollar[1].str), Value: NewIntLiteral(yyDollar[3].str)}
 		}
 		yyVAL.union = yyLOCAL
 	case 498:
-		yyDollar = yyS[yypt-5 : yypt+1]
+		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL *TableOption
 //line sql.y:2874
 		{
-			yyLOCAL = &TableOption{Name: string(yyDollar[1].str), Tables: yyDollar[4].tableNamesUnion()}
+			yyLOCAL = &TableOption{Name: string(yyDollar[1].str), String: (yyDollar[3].identifierCI.String() + yyDollar[4].str), CaseSensitive: true}
 		}
 		yyVAL.union = yyLOCAL
 	case 499:
-		yyDollar = yyS[yypt-0 : yypt+1]
-//line sql.y:2879
+		yyDollar = yyS[yypt-5 : yypt+1]
+		var yyLOCAL *TableOption
+//line sql.y:2878
 		{
-			yyVAL.str = ""
+			yyLOCAL = &TableOption{Name: string(yyDollar[1].str), Tables: yyDollar[4].tableNamesUnion()}
 		}
+		yyVAL.union = yyLOCAL
 	case 500:
-		yyDollar = yyS[yypt-2 : yypt+1]
+		yyDollar = yyS[yypt-0 : yypt+1]
 //line sql.y:2883
 		{
-			yyVAL.str = " " + string(yyDollar[1].str) + " " + string(yyDollar[2].str)
+			yyVAL.str = ""
 		}
 	case 501:
 		yyDollar = yyS[yypt-2 : yypt+1]
@@ -13786,165 +13751,164 @@ yydefault:
 		{
 			yyVAL.str = " " + string(yyDollar[1].str) + " " + string(yyDollar[2].str)
 		}
-	case 511:
-		yyDollar = yyS[yypt-3 : yypt+1]
-//line sql.y:2906
+	case 502:
+		yyDollar = yyS[yypt-2 : yypt+1]
+//line sql.y:2891
 		{
-			yyVAL.str = String(TableName{Qualifier: yyDollar[1].identifierCS, Name: yyDollar[3].identifierCS})
+			yyVAL.str = " " + string(yyDollar[1].str) + " " + string(yyDollar[2].str)
 		}
 	case 512:
-		yyDollar = yyS[yypt-1 : yypt+1]
+		yyDollar = yyS[yypt-3 : yypt+1]
 //line sql.y:2910
 		{
-			yyVAL.str = yyDollar[1].identifierCI.String()
+			yyVAL.str = String(TableName{Qualifier: yyDollar[1].identifierCS, Name: yyDollar[3].identifierCS})
 		}
 	case 513:
 		yyDollar = yyS[yypt-1 : yypt+1]
 //line sql.y:2914
 		{
-			yyVAL.str = encodeSQLString(yyDollar[1].str)
+			yyVAL.str = yyDollar[1].identifierCI.String()
 		}
 	case 514:
 		yyDollar = yyS[yypt-1 : yypt+1]
 //line sql.y:2918
 		{
-			yyVAL.str = string(yyDollar[1].str)
+			yyVAL.str = encodeSQLString(yyDollar[1].str)
 		}
 	case 515:
+		yyDollar = yyS[yypt-1 : yypt+1]
+//line sql.y:2922
+		{
+			yyVAL.str = string(yyDollar[1].str)
+		}
+	case 516:
 		yyDollar = yyS[yypt-0 : yypt+1]
-//line sql.y:2923
+//line sql.y:2927
 		{
 			yyVAL.str = ""
 		}
-	case 517:
+	case 518:
 		yyDollar = yyS[yypt-0 : yypt+1]
 		var yyLOCAL bool
-//line sql.y:2929
+//line sql.y:2933
 		{
 			yyLOCAL = false
 		}
 		yyVAL.union = yyLOCAL
-	case 518:
+	case 519:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL bool
-//line sql.y:2933
+//line sql.y:2937
 		{
 			yyLOCAL = true
 		}
 		yyVAL.union = yyLOCAL
-	case 519:
+	case 520:
 		yyDollar = yyS[yypt-0 : yypt+1]
 		var yyLOCAL *ColName
-//line sql.y:2938
+//line sql.y:2942
 		{
 			yyLOCAL = nil
 		}
 		yyVAL.union = yyLOCAL
-	case 520:
+	case 521:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL *ColName
-//line sql.y:2942
+//line sql.y:2946
 		{
 			yyLOCAL = yyDollar[2].colNameUnion()
 		}
 		yyVAL.union = yyLOCAL
-	case 521:
+	case 522:
 		yyDollar = yyS[yypt-0 : yypt+1]
-//line sql.y:2947
+//line sql.y:2951
 		{
 			yyVAL.str = ""
 		}
-	case 522:
+	case 523:
 		yyDollar = yyS[yypt-2 : yypt+1]
-//line sql.y:2951
+//line sql.y:2955
 		{
 			yyVAL.str = string(yyDollar[2].str)
 		}
-	case 523:
+	case 524:
 		yyDollar = yyS[yypt-0 : yypt+1]
 		var yyLOCAL *Literal
-//line sql.y:2956
+//line sql.y:2960
 		{
 			yyLOCAL = nil
 		}
 		yyVAL.union = yyLOCAL
-	case 524:
+	case 525:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL *Literal
-//line sql.y:2960
+//line sql.y:2964
 		{
 			yyLOCAL = NewIntLiteral(yyDollar[2].str)
 		}
 		yyVAL.union = yyLOCAL
-	case 525:
+	case 526:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL *Literal
-//line sql.y:2964
+//line sql.y:2968
 		{
 			yyLOCAL = NewDecimalLiteral(yyDollar[2].str)
 		}
 		yyVAL.union = yyLOCAL
-	case 526:
+	case 527:
 		yyDollar = yyS[yypt-0 : yypt+1]
 		var yyLOCAL []AlterOption
-//line sql.y:2969
+//line sql.y:2973
 		{
 			yyLOCAL = nil
 		}
 		yyVAL.union = yyLOCAL
-	case 527:
+	case 528:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL []AlterOption
-//line sql.y:2973
+//line sql.y:2977
 		{
 			yyLOCAL = yyDollar[1].alterOptionsUnion()
 		}
 		yyVAL.union = yyLOCAL
-	case 528:
+	case 529:
 		yyDollar = yyS[yypt-5 : yypt+1]
-//line sql.y:2977
+//line sql.y:2981
 		{
 			yySLICE := (*[]AlterOption)(yyIaddr(yyVAL.union))
 			*yySLICE = append(*yySLICE, &OrderByOption{Cols: yyDollar[5].columnsUnion()})
 		}
-	case 529:
+	case 530:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL []AlterOption
-//line sql.y:2981
+//line sql.y:2985
 		{
 			yyLOCAL = yyDollar[1].alterOptionsUnion()
 		}
 		yyVAL.union = yyLOCAL
-	case 530:
+	case 531:
 		yyDollar = yyS[yypt-3 : yypt+1]
-//line sql.y:2985
+//line sql.y:2989
 		{
 			yySLICE := (*[]AlterOption)(yyIaddr(yyVAL.union))
 			*yySLICE = append(*yySLICE, yyDollar[3].alterOptionsUnion()...)
 		}
-	case 531:
+	case 532:
 		yyDollar = yyS[yypt-7 : yypt+1]
 		var yyLOCAL []AlterOption
-//line sql.y:2989
+//line sql.y:2993
 		{
 			yyLOCAL = append(append(yyDollar[1].alterOptionsUnion(), yyDollar[3].alterOptionsUnion()...), &OrderByOption{Cols: yyDollar[7].columnsUnion()})
 		}
 		yyVAL.union = yyLOCAL
-	case 532:
+	case 533:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL []AlterOption
-//line sql.y:2995
+//line sql.y:2999
 		{
 			yyLOCAL = []AlterOption{yyDollar[1].alterOptionUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 533:
-		yyDollar = yyS[yypt-3 : yypt+1]
-//line sql.y:2999
-		{
-			yySLICE := (*[]AlterOption)(yyIaddr(yyVAL.union))
-			*yySLICE = append(*yySLICE, yyDollar[3].alterOptionUnion())
-		}
 	case 534:
 		yyDollar = yyS[yypt-3 : yypt+1]
 //line sql.y:3003
@@ -13953,19 +13917,18 @@ yydefault:
 			*yySLICE = append(*yySLICE, yyDollar[3].alterOptionUnion())
 		}
 	case 535:
-		yyDollar = yyS[yypt-1 : yypt+1]
-		var yyLOCAL AlterOption
-//line sql.y:3009
+		yyDollar = yyS[yypt-3 : yypt+1]
+//line sql.y:3007
 		{
-			yyLOCAL = yyDollar[1].tableOptionsUnion()
+			yySLICE := (*[]AlterOption)(yyIaddr(yyVAL.union))
+			*yySLICE = append(*yySLICE, yyDollar[3].alterOptionUnion())
 		}
-		yyVAL.union = yyLOCAL
 	case 536:
-		yyDollar = yyS[yypt-2 : yypt+1]
+		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL AlterOption
 //line sql.y:3013
 		{
-			yyLOCAL = &AddConstraintDefinition{ConstraintDefinition: yyDollar[2].constraintDefinitionUnion()}
+			yyLOCAL = yyDollar[1].tableOptionsUnion()
 		}
 		yyVAL.union = yyLOCAL
 	case 537:
@@ -13981,15 +13944,15 @@ yydefault:
 		var yyLOCAL AlterOption
 //line sql.y:3021
 		{
-			yyLOCAL = &AddIndexDefinition{IndexDefinition: yyDollar[2].indexDefinitionUnion()}
+			yyLOCAL = &AddConstraintDefinition{ConstraintDefinition: yyDollar[2].constraintDefinitionUnion()}
 		}
 		yyVAL.union = yyLOCAL
 	case 539:
-		yyDollar = yyS[yypt-5 : yypt+1]
+		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL AlterOption
 //line sql.y:3025
 		{
-			yyLOCAL = &AddColumns{Columns: yyDollar[4].columnDefinitionsUnion()}
+			yyLOCAL = &AddIndexDefinition{IndexDefinition: yyDollar[2].indexDefinitionUnion()}
 		}
 		yyVAL.union = yyLOCAL
 	case 540:
@@ -13997,7 +13960,7 @@ yydefault:
 		var yyLOCAL AlterOption
 //line sql.y:3029
 		{
-			yyLOCAL = &AddColumns{Columns: []*ColumnDefinition{yyDollar[3].columnDefinitionUnion()}, First: yyDollar[4].booleanUnion(), After: yyDollar[5].colNameUnion()}
+			yyLOCAL = &AddColumns{Columns: yyDollar[4].columnDefinitionsUnion()}
 		}
 		yyVAL.union = yyLOCAL
 	case 541:
@@ -14005,31 +13968,31 @@ yydefault:
 		var yyLOCAL AlterOption
 //line sql.y:3033
 		{
-			yyLOCAL = &AlterColumn{Column: yyDollar[3].colNameUnion(), DropDefault: true}
+			yyLOCAL = &AddColumns{Columns: []*ColumnDefinition{yyDollar[3].columnDefinitionUnion()}, First: yyDollar[4].booleanUnion(), After: yyDollar[5].colNameUnion()}
 		}
 		yyVAL.union = yyLOCAL
 	case 542:
-		yyDollar = yyS[yypt-6 : yypt+1]
+		yyDollar = yyS[yypt-5 : yypt+1]
 		var yyLOCAL AlterOption
 //line sql.y:3037
 		{
-			yyLOCAL = &AlterColumn{Column: yyDollar[3].colNameUnion(), DropDefault: false, DefaultVal: yyDollar[6].exprUnion(), DefaultLiteral: true}
+			yyLOCAL = &AlterColumn{Column: yyDollar[3].colNameUnion(), DropDefault: true}
 		}
 		yyVAL.union = yyLOCAL
 	case 543:
-		yyDollar = yyS[yypt-8 : yypt+1]
+		yyDollar = yyS[yypt-6 : yypt+1]
 		var yyLOCAL AlterOption
 //line sql.y:3041
 		{
-			yyLOCAL = &AlterColumn{Column: yyDollar[3].colNameUnion(), DropDefault: false, DefaultVal: yyDollar[7].exprUnion()}
+			yyLOCAL = &AlterColumn{Column: yyDollar[3].colNameUnion(), DropDefault: false, DefaultVal: yyDollar[6].exprUnion(), DefaultLiteral: true}
 		}
 		yyVAL.union = yyLOCAL
 	case 544:
-		yyDollar = yyS[yypt-5 : yypt+1]
+		yyDollar = yyS[yypt-8 : yypt+1]
 		var yyLOCAL AlterOption
 //line sql.y:3045
 		{
-			yyLOCAL = &AlterColumn{Column: yyDollar[3].colNameUnion(), Invisible: ptr.Of(false)}
+			yyLOCAL = &AlterColumn{Column: yyDollar[3].colNameUnion(), DropDefault: false, DefaultVal: yyDollar[7].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
 	case 545:
@@ -14037,15 +14000,15 @@ yydefault:
 		var yyLOCAL AlterOption
 //line sql.y:3049
 		{
-			yyLOCAL = &AlterColumn{Column: yyDollar[3].colNameUnion(), Invisible: ptr.Of(true)}
+			yyLOCAL = &AlterColumn{Column: yyDollar[3].colNameUnion(), Invisible: ptr.Of(false)}
 		}
 		yyVAL.union = yyLOCAL
 	case 546:
-		yyDollar = yyS[yypt-4 : yypt+1]
+		yyDollar = yyS[yypt-5 : yypt+1]
 		var yyLOCAL AlterOption
 //line sql.y:3053
 		{
-			yyLOCAL = &AlterCheck{Name: yyDollar[3].identifierCI, Enforced: yyDollar[4].booleanUnion()}
+			yyLOCAL = &AlterColumn{Column: yyDollar[3].colNameUnion(), Invisible: ptr.Of(true)}
 		}
 		yyVAL.union = yyLOCAL
 	case 547:
@@ -14053,7 +14016,7 @@ yydefault:
 		var yyLOCAL AlterOption
 //line sql.y:3057
 		{
-			yyLOCAL = &AlterIndex{Name: yyDollar[3].identifierCI, Invisible: false}
+			yyLOCAL = &AlterCheck{Name: yyDollar[3].identifierCI, Enforced: yyDollar[4].booleanUnion()}
 		}
 		yyVAL.union = yyLOCAL
 	case 548:
@@ -14061,23 +14024,23 @@ yydefault:
 		var yyLOCAL AlterOption
 //line sql.y:3061
 		{
-			yyLOCAL = &AlterIndex{Name: yyDollar[3].identifierCI, Invisible: true}
+			yyLOCAL = &AlterIndex{Name: yyDollar[3].identifierCI, Invisible: false}
 		}
 		yyVAL.union = yyLOCAL
 	case 549:
-		yyDollar = yyS[yypt-6 : yypt+1]
+		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL AlterOption
 //line sql.y:3065
 		{
-			yyLOCAL = &ChangeColumn{OldColumn: yyDollar[3].colNameUnion(), NewColDefinition: yyDollar[4].columnDefinitionUnion(), First: yyDollar[5].booleanUnion(), After: yyDollar[6].colNameUnion()}
+			yyLOCAL = &AlterIndex{Name: yyDollar[3].identifierCI, Invisible: true}
 		}
 		yyVAL.union = yyLOCAL
 	case 550:
-		yyDollar = yyS[yypt-5 : yypt+1]
+		yyDollar = yyS[yypt-6 : yypt+1]
 		var yyLOCAL AlterOption
 //line sql.y:3069
 		{
-			yyLOCAL = &ModifyColumn{NewColDefinition: yyDollar[3].columnDefinitionUnion(), First: yyDollar[4].booleanUnion(), After: yyDollar[5].colNameUnion()}
+			yyLOCAL = &ChangeColumn{OldColumn: yyDollar[3].colNameUnion(), NewColDefinition: yyDollar[4].columnDefinitionUnion(), First: yyDollar[5].booleanUnion(), After: yyDollar[6].colNameUnion()}
 		}
 		yyVAL.union = yyLOCAL
 	case 551:
@@ -14085,7 +14048,7 @@ yydefault:
 		var yyLOCAL AlterOption
 //line sql.y:3073
 		{
-			yyLOCAL = &RenameColumn{OldName: yyDollar[3].colNameUnion(), NewName: yyDollar[5].colNameUnion()}
+			yyLOCAL = &ModifyColumn{NewColDefinition: yyDollar[3].columnDefinitionUnion(), First: yyDollar[4].booleanUnion(), After: yyDollar[5].colNameUnion()}
 		}
 		yyVAL.union = yyLOCAL
 	case 552:
@@ -14093,15 +14056,15 @@ yydefault:
 		var yyLOCAL AlterOption
 //line sql.y:3077
 		{
-			yyLOCAL = &AlterCharset{CharacterSet: yyDollar[4].str, Collate: yyDollar[5].str}
+			yyLOCAL = &RenameColumn{OldName: yyDollar[3].colNameUnion(), NewName: yyDollar[5].colNameUnion()}
 		}
 		yyVAL.union = yyLOCAL
 	case 553:
-		yyDollar = yyS[yypt-2 : yypt+1]
+		yyDollar = yyS[yypt-5 : yypt+1]
 		var yyLOCAL AlterOption
 //line sql.y:3081
 		{
-			yyLOCAL = &KeyState{Enable: false}
+			yyLOCAL = &AlterCharset{CharacterSet: yyDollar[4].str, Collate: yyDollar[5].str}
 		}
 		yyVAL.union = yyLOCAL
 	case 554:
@@ -14109,7 +14072,7 @@ yydefault:
 		var yyLOCAL AlterOption
 //line sql.y:3085
 		{
-			yyLOCAL = &KeyState{Enable: true}
+			yyLOCAL = &KeyState{Enable: false}
 		}
 		yyVAL.union = yyLOCAL
 	case 555:
@@ -14117,7 +14080,7 @@ yydefault:
 		var yyLOCAL AlterOption
 //line sql.y:3089
 		{
-			yyLOCAL = &TablespaceOperation{Import: false}
+			yyLOCAL = &KeyState{Enable: true}
 		}
 		yyVAL.union = yyLOCAL
 	case 556:
@@ -14125,15 +14088,15 @@ yydefault:
 		var yyLOCAL AlterOption
 //line sql.y:3093
 		{
-			yyLOCAL = &TablespaceOperation{Import: true}
+			yyLOCAL = &TablespaceOperation{Import: false}
 		}
 		yyVAL.union = yyLOCAL
 	case 557:
-		yyDollar = yyS[yypt-3 : yypt+1]
+		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL AlterOption
 //line sql.y:3097
 		{
-			yyLOCAL = &DropColumn{Name: yyDollar[3].colNameUnion()}
+			yyLOCAL = &TablespaceOperation{Import: true}
 		}
 		yyVAL.union = yyLOCAL
 	case 558:
@@ -14141,7 +14104,7 @@ yydefault:
 		var yyLOCAL AlterOption
 //line sql.y:3101
 		{
-			yyLOCAL = &DropKey{Type: NormalKeyType, Name: yyDollar[3].identifierCI}
+			yyLOCAL = &DropColumn{Name: yyDollar[3].colNameUnion()}
 		}
 		yyVAL.union = yyLOCAL
 	case 559:
@@ -14149,23 +14112,23 @@ yydefault:
 		var yyLOCAL AlterOption
 //line sql.y:3105
 		{
-			yyLOCAL = &DropKey{Type: PrimaryKeyType}
+			yyLOCAL = &DropKey{Type: NormalKeyType, Name: yyDollar[3].identifierCI}
 		}
 		yyVAL.union = yyLOCAL
 	case 560:
-		yyDollar = yyS[yypt-4 : yypt+1]
+		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL AlterOption
 //line sql.y:3109
 		{
-			yyLOCAL = &DropKey{Type: ForeignKeyType, Name: yyDollar[4].identifierCI}
+			yyLOCAL = &DropKey{Type: PrimaryKeyType}
 		}
 		yyVAL.union = yyLOCAL
 	case 561:
-		yyDollar = yyS[yypt-3 : yypt+1]
+		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL AlterOption
 //line sql.y:3113
 		{
-			yyLOCAL = &DropKey{Type: CheckKeyType, Name: yyDollar[3].identifierCI}
+			yyLOCAL = &DropKey{Type: ForeignKeyType, Name: yyDollar[4].identifierCI}
 		}
 		yyVAL.union = yyLOCAL
 	case 562:
@@ -14177,52 +14140,52 @@ yydefault:
 		}
 		yyVAL.union = yyLOCAL
 	case 563:
-		yyDollar = yyS[yypt-1 : yypt+1]
+		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL AlterOption
 //line sql.y:3121
 		{
-			yyLOCAL = &Force{}
+			yyLOCAL = &DropKey{Type: CheckKeyType, Name: yyDollar[3].identifierCI}
 		}
 		yyVAL.union = yyLOCAL
 	case 564:
-		yyDollar = yyS[yypt-3 : yypt+1]
+		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL AlterOption
 //line sql.y:3125
 		{
-			yyLOCAL = &RenameTableName{Table: yyDollar[3].tableName}
+			yyLOCAL = &Force{}
 		}
 		yyVAL.union = yyLOCAL
 	case 565:
-		yyDollar = yyS[yypt-5 : yypt+1]
+		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL AlterOption
 //line sql.y:3129
 		{
-			yyLOCAL = &RenameIndex{OldName: yyDollar[3].identifierCI, NewName: yyDollar[5].identifierCI}
+			yyLOCAL = &RenameTableName{Table: yyDollar[3].tableName}
 		}
 		yyVAL.union = yyLOCAL
 	case 566:
-		yyDollar = yyS[yypt-1 : yypt+1]
-		var yyLOCAL []AlterOption
-//line sql.y:3135
+		yyDollar = yyS[yypt-5 : yypt+1]
+		var yyLOCAL AlterOption
+//line sql.y:3133
 		{
-			yyLOCAL = []AlterOption{yyDollar[1].alterOptionUnion()}
+			yyLOCAL = &RenameIndex{OldName: yyDollar[3].identifierCI, NewName: yyDollar[5].identifierCI}
 		}
 		yyVAL.union = yyLOCAL
 	case 567:
-		yyDollar = yyS[yypt-3 : yypt+1]
+		yyDollar = yyS[yypt-1 : yypt+1]
+		var yyLOCAL []AlterOption
 //line sql.y:3139
 		{
-			yySLICE := (*[]AlterOption)(yyIaddr(yyVAL.union))
-			*yySLICE = append(*yySLICE, yyDollar[3].alterOptionUnion())
+			yyLOCAL = []AlterOption{yyDollar[1].alterOptionUnion()}
 		}
+		yyVAL.union = yyLOCAL
 	case 568:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		var yyLOCAL AlterOption
-//line sql.y:3145
+//line sql.y:3143
 		{
-			yyLOCAL = AlgorithmValue(string(yyDollar[3].str))
+			yySLICE := (*[]AlterOption)(yyIaddr(yyVAL.union))
+			*yySLICE = append(*yySLICE, yyDollar[3].alterOptionUnion())
 		}
-		yyVAL.union = yyLOCAL
 	case 569:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL AlterOption
@@ -14252,7 +14215,7 @@ yydefault:
 		var yyLOCAL AlterOption
 //line sql.y:3161
 		{
-			yyLOCAL = &LockOption{Type: DefaultType}
+			yyLOCAL = AlgorithmValue(string(yyDollar[3].str))
 		}
 		yyVAL.union = yyLOCAL
 	case 573:
@@ -14260,7 +14223,7 @@ yydefault:
 		var yyLOCAL AlterOption
 //line sql.y:3165
 		{
-			yyLOCAL = &LockOption{Type: NoneType}
+			yyLOCAL = &LockOption{Type: DefaultType}
 		}
 		yyVAL.union = yyLOCAL
 	case 574:
@@ -14268,7 +14231,7 @@ yydefault:
 		var yyLOCAL AlterOption
 //line sql.y:3169
 		{
-			yyLOCAL = &LockOption{Type: SharedType}
+			yyLOCAL = &LockOption{Type: NoneType}
 		}
 		yyVAL.union = yyLOCAL
 	case 575:
@@ -14276,15 +14239,15 @@ yydefault:
 		var yyLOCAL AlterOption
 //line sql.y:3173
 		{
-			yyLOCAL = &LockOption{Type: ExclusiveType}
+			yyLOCAL = &LockOption{Type: SharedType}
 		}
 		yyVAL.union = yyLOCAL
 	case 576:
-		yyDollar = yyS[yypt-2 : yypt+1]
+		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL AlterOption
 //line sql.y:3177
 		{
-			yyLOCAL = &Validation{With: true}
+			yyLOCAL = &LockOption{Type: ExclusiveType}
 		}
 		yyVAL.union = yyLOCAL
 	case 577:
@@ -14292,13 +14255,21 @@ yydefault:
 		var yyLOCAL AlterOption
 //line sql.y:3181
 		{
-			yyLOCAL = &Validation{With: false}
+			yyLOCAL = &Validation{With: true}
 		}
 		yyVAL.union = yyLOCAL
 	case 578:
+		yyDollar = yyS[yypt-2 : yypt+1]
+		var yyLOCAL AlterOption
+//line sql.y:3185
+		{
+			yyLOCAL = &Validation{With: false}
+		}
+		yyVAL.union = yyLOCAL
+	case 579:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL Statement
-//line sql.y:3187
+//line sql.y:3191
 		{
 			yyDollar[1].alterTableUnion().FullyParsed = true
 			yyDollar[1].alterTableUnion().AlterOptions = yyDollar[2].alterOptionsUnion()
@@ -14306,10 +14277,10 @@ yydefault:
 			yyLOCAL = yyDollar[1].alterTableUnion()
 		}
 		yyVAL.union = yyLOCAL
-	case 579:
+	case 580:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Statement
-//line sql.y:3194
+//line sql.y:3198
 		{
 			yyDollar[1].alterTableUnion().FullyParsed = true
 			yyDollar[1].alterTableUnion().AlterOptions = yyDollar[2].alterOptionsUnion()
@@ -14317,10 +14288,10 @@ yydefault:
 			yyLOCAL = yyDollar[1].alterTableUnion()
 		}
 		yyVAL.union = yyLOCAL
-	case 580:
+	case 581:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Statement
-//line sql.y:3201
+//line sql.y:3205
 		{
 			yyDollar[1].alterTableUnion().FullyParsed = true
 			yyDollar[1].alterTableUnion().AlterOptions = yyDollar[2].alterOptionsUnion()
@@ -14328,28 +14299,28 @@ yydefault:
 			yyLOCAL = yyDollar[1].alterTableUnion()
 		}
 		yyVAL.union = yyLOCAL
-	case 581:
+	case 582:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL Statement
-//line sql.y:3208
+//line sql.y:3212
 		{
 			yyDollar[1].alterTableUnion().FullyParsed = true
 			yyDollar[1].alterTableUnion().PartitionSpec = yyDollar[2].partSpecUnion()
 			yyLOCAL = yyDollar[1].alterTableUnion()
 		}
 		yyVAL.union = yyLOCAL
-	case 582:
+	case 583:
 		yyDollar = yyS[yypt-11 : yypt+1]
 		var yyLOCAL Statement
-//line sql.y:3214
+//line sql.y:3218
 		{
 			yyLOCAL = &AlterView{ViewName: yyDollar[7].tableName, Comments: Comments(yyDollar[2].strs).Parsed(), Algorithm: yyDollar[3].str, Definer: yyDollar[4].definerUnion(), Security: yyDollar[5].str, Columns: yyDollar[8].columnsUnion(), Select: yyDollar[10].tableStmtUnion(), CheckOption: yyDollar[11].str}
 		}
 		yyVAL.union = yyLOCAL
-	case 583:
+	case 584:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL Statement
-//line sql.y:3224
+//line sql.y:3228
 		{
 			yyDollar[1].alterDatabaseUnion().FullyParsed = true
 			yyDollar[1].alterDatabaseUnion().DBName = yyDollar[2].identifierCS
@@ -14357,10 +14328,10 @@ yydefault:
 			yyLOCAL = yyDollar[1].alterDatabaseUnion()
 		}
 		yyVAL.union = yyLOCAL
-	case 584:
+	case 585:
 		yyDollar = yyS[yypt-6 : yypt+1]
 		var yyLOCAL Statement
-//line sql.y:3231
+//line sql.y:3235
 		{
 			yyDollar[1].alterDatabaseUnion().FullyParsed = true
 			yyDollar[1].alterDatabaseUnion().DBName = yyDollar[2].identifierCS
@@ -14368,10 +14339,10 @@ yydefault:
 			yyLOCAL = yyDollar[1].alterDatabaseUnion()
 		}
 		yyVAL.union = yyLOCAL
-	case 585:
+	case 586:
 		yyDollar = yyS[yypt-8 : yypt+1]
 		var yyLOCAL Statement
-//line sql.y:3238
+//line sql.y:3242
 		{
 			yyLOCAL = &AlterVschema{
 				Action: CreateVindexDDLAction,
@@ -14384,10 +14355,10 @@ yydefault:
 			}
 		}
 		yyVAL.union = yyLOCAL
-	case 586:
+	case 587:
 		yyDollar = yyS[yypt-6 : yypt+1]
 		var yyLOCAL Statement
-//line sql.y:3250
+//line sql.y:3254
 		{
 			yyLOCAL = &AlterVschema{
 				Action: DropVindexDDLAction,
@@ -14398,26 +14369,26 @@ yydefault:
 			}
 		}
 		yyVAL.union = yyLOCAL
-	case 587:
+	case 588:
 		yyDollar = yyS[yypt-6 : yypt+1]
 		var yyLOCAL Statement
-//line sql.y:3260
+//line sql.y:3264
 		{
 			yyLOCAL = &AlterVschema{Action: AddVschemaTableDDLAction, Table: yyDollar[6].tableName}
 		}
 		yyVAL.union = yyLOCAL
-	case 588:
+	case 589:
 		yyDollar = yyS[yypt-6 : yypt+1]
 		var yyLOCAL Statement
-//line sql.y:3264
+//line sql.y:3268
 		{
 			yyLOCAL = &AlterVschema{Action: DropVschemaTableDDLAction, Table: yyDollar[6].tableName}
 		}
 		yyVAL.union = yyLOCAL
-	case 589:
+	case 590:
 		yyDollar = yyS[yypt-13 : yypt+1]
 		var yyLOCAL Statement
-//line sql.y:3268
+//line sql.y:3272
 		{
 			yyLOCAL = &AlterVschema{
 				Action: AddColVindexDDLAction,
@@ -14431,10 +14402,10 @@ yydefault:
 			}
 		}
 		yyVAL.union = yyLOCAL
-	case 590:
+	case 591:
 		yyDollar = yyS[yypt-8 : yypt+1]
 		var yyLOCAL Statement
-//line sql.y:3281
+//line sql.y:3285
 		{
 			yyLOCAL = &AlterVschema{
 				Action: DropColVindexDDLAction,
@@ -14445,26 +14416,26 @@ yydefault:
 			}
 		}
 		yyVAL.union = yyLOCAL
-	case 591:
+	case 592:
 		yyDollar = yyS[yypt-6 : yypt+1]
 		var yyLOCAL Statement
-//line sql.y:3291
+//line sql.y:3295
 		{
 			yyLOCAL = &AlterVschema{Action: AddSequenceDDLAction, Table: yyDollar[6].tableName}
 		}
 		yyVAL.union = yyLOCAL
-	case 592:
+	case 593:
 		yyDollar = yyS[yypt-6 : yypt+1]
 		var yyLOCAL Statement
-//line sql.y:3295
+//line sql.y:3299
 		{
 			yyLOCAL = &AlterVschema{Action: DropSequenceDDLAction, Table: yyDollar[6].tableName}
 		}
 		yyVAL.union = yyLOCAL
-	case 593:
+	case 594:
 		yyDollar = yyS[yypt-10 : yypt+1]
 		var yyLOCAL Statement
-//line sql.y:3299
+//line sql.y:3303
 		{
 			yyLOCAL = &AlterVschema{
 				Action: AddAutoIncDDLAction,
@@ -14476,10 +14447,10 @@ yydefault:
 			}
 		}
 		yyVAL.union = yyLOCAL
-	case 594:
+	case 595:
 		yyDollar = yyS[yypt-7 : yypt+1]
 		var yyLOCAL Statement
-//line sql.y:3310
+//line sql.y:3314
 		{
 			yyLOCAL = &AlterVschema{
 				Action: DropAutoIncDDLAction,
@@ -14487,10 +14458,10 @@ yydefault:
 			}
 		}
 		yyVAL.union = yyLOCAL
-	case 595:
+	case 596:
 		yyDollar = yyS[yypt-5 : yypt+1]
 		var yyLOCAL Statement
-//line sql.y:3317
+//line sql.y:3321
 		{
 			yyLOCAL = &AlterMigration{
 				Type: RetryMigrationType,
@@ -14498,10 +14469,10 @@ yydefault:
 			}
 		}
 		yyVAL.union = yyLOCAL
-	case 596:
+	case 597:
 		yyDollar = yyS[yypt-5 : yypt+1]
 		var yyLOCAL Statement
-//line sql.y:3324
+//line sql.y:3328
 		{
 			yyLOCAL = &AlterMigration{
 				Type: CleanupMigrationType,
@@ -14509,20 +14480,20 @@ yydefault:
 			}
 		}
 		yyVAL.union = yyLOCAL
-	case 597:
+	case 598:
 		yyDollar = yyS[yypt-5 : yypt+1]
 		var yyLOCAL Statement
-//line sql.y:3331
+//line sql.y:3335
 		{
 			yyLOCAL = &AlterMigration{
 				Type: CleanupAllMigrationType,
 			}
 		}
 		yyVAL.union = yyLOCAL
-	case 598:
+	case 599:
 		yyDollar = yyS[yypt-5 : yypt+1]
 		var yyLOCAL Statement
-//line sql.y:3337
+//line sql.y:3341
 		{
 			yyLOCAL = &AlterMigration{
 				Type: LaunchMigrationType,
@@ -14530,10 +14501,10 @@ yydefault:
 			}
 		}
 		yyVAL.union = yyLOCAL
-	case 599:
+	case 600:
 		yyDollar = yyS[yypt-7 : yypt+1]
 		var yyLOCAL Statement
-//line sql.y:3344
+//line sql.y:3348
 		{
 			yyLOCAL = &AlterMigration{
 				Type:   LaunchMigrationType,
@@ -14542,20 +14513,20 @@ yydefault:
 			}
 		}
 		yyVAL.union = yyLOCAL
-	case 600:
+	case 601:
 		yyDollar = yyS[yypt-5 : yypt+1]
 		var yyLOCAL Statement
-//line sql.y:3352
+//line sql.y:3356
 		{
 			yyLOCAL = &AlterMigration{
 				Type: LaunchAllMigrationType,
 			}
 		}
 		yyVAL.union = yyLOCAL
-	case 601:
+	case 602:
 		yyDollar = yyS[yypt-5 : yypt+1]
 		var yyLOCAL Statement
-//line sql.y:3358
+//line sql.y:3362
 		{
 			yyLOCAL = &AlterMigration{
 				Type: CompleteMigrationType,
@@ -14563,20 +14534,20 @@ yydefault:
 			}
 		}
 		yyVAL.union = yyLOCAL
-	case 602:
+	case 603:
 		yyDollar = yyS[yypt-5 : yypt+1]
 		var yyLOCAL Statement
-//line sql.y:3365
+//line sql.y:3369
 		{
 			yyLOCAL = &AlterMigration{
 				Type: CompleteAllMigrationType,
 			}
 		}
 		yyVAL.union = yyLOCAL
-	case 603:
+	case 604:
 		yyDollar = yyS[yypt-5 : yypt+1]
 		var yyLOCAL Statement
-//line sql.y:3371
+//line sql.y:3375
 		{
 			yyLOCAL = &AlterMigration{
 				Type: CancelMigrationType,
@@ -14584,20 +14555,20 @@ yydefault:
 			}
 		}
 		yyVAL.union = yyLOCAL
-	case 604:
+	case 605:
 		yyDollar = yyS[yypt-5 : yypt+1]
 		var yyLOCAL Statement
-//line sql.y:3378
+//line sql.y:3382
 		{
 			yyLOCAL = &AlterMigration{
 				Type: CancelAllMigrationType,
 			}
 		}
 		yyVAL.union = yyLOCAL
-	case 605:
+	case 606:
 		yyDollar = yyS[yypt-7 : yypt+1]
 		var yyLOCAL Statement
-//line sql.y:3384
+//line sql.y:3388
 		{
 			yyLOCAL = &AlterMigration{
 				Type:   ThrottleMigrationType,
@@ -14607,10 +14578,10 @@ yydefault:
 			}
 		}
 		yyVAL.union = yyLOCAL
-	case 606:
+	case 607:
 		yyDollar = yyS[yypt-7 : yypt+1]
 		var yyLOCAL Statement
-//line sql.y:3393
+//line sql.y:3397
 		{
 			yyLOCAL = &AlterMigration{
 				Type:   ThrottleAllMigrationType,
@@ -14619,10 +14590,10 @@ yydefault:
 			}
 		}
 		yyVAL.union = yyLOCAL
-	case 607:
+	case 608:
 		yyDollar = yyS[yypt-5 : yypt+1]
 		var yyLOCAL Statement
-//line sql.y:3401
+//line sql.y:3405
 		{
 			yyLOCAL = &AlterMigration{
 				Type: UnthrottleMigrationType,
@@ -14630,20 +14601,20 @@ yydefault:
 			}
 		}
 		yyVAL.union = yyLOCAL
-	case 608:
+	case 609:
 		yyDollar = yyS[yypt-5 : yypt+1]
 		var yyLOCAL Statement
-//line sql.y:3408
+//line sql.y:3412
 		{
 			yyLOCAL = &AlterMigration{
 				Type: UnthrottleAllMigrationType,
 			}
 		}
 		yyVAL.union = yyLOCAL
-	case 609:
+	case 610:
 		yyDollar = yyS[yypt-5 : yypt+1]
 		var yyLOCAL Statement
-//line sql.y:3414
+//line sql.y:3418
 		{
 			yyLOCAL = &AlterMigration{
 				Type: ForceCutOverMigrationType,
@@ -14651,20 +14622,20 @@ yydefault:
 			}
 		}
 		yyVAL.union = yyLOCAL
-	case 610:
+	case 611:
 		yyDollar = yyS[yypt-5 : yypt+1]
 		var yyLOCAL Statement
-//line sql.y:3421
+//line sql.y:3425
 		{
 			yyLOCAL = &AlterMigration{
 				Type: ForceCutOverAllMigrationType,
 			}
 		}
 		yyVAL.union = yyLOCAL
-	case 611:
+	case 612:
 		yyDollar = yyS[yypt-6 : yypt+1]
 		var yyLOCAL Statement
-//line sql.y:3427
+//line sql.y:3431
 		{
 			yyLOCAL = &AlterMigration{
 				Type:      SetCutOverThresholdMigrationType,
@@ -14673,18 +14644,18 @@ yydefault:
 			}
 		}
 		yyVAL.union = yyLOCAL
-	case 612:
+	case 613:
 		yyDollar = yyS[yypt-0 : yypt+1]
 		var yyLOCAL *PartitionOption
-//line sql.y:3436
+//line sql.y:3440
 		{
 			yyLOCAL = nil
 		}
 		yyVAL.union = yyLOCAL
-	case 613:
+	case 614:
 		yyDollar = yyS[yypt-6 : yypt+1]
 		var yyLOCAL *PartitionOption
-//line sql.y:3440
+//line sql.y:3444
 		{
 			yyDollar[3].partitionOptionUnion().Partitions = yyDollar[4].integerUnion()
 			yyDollar[3].partitionOptionUnion().SubPartition = yyDollar[5].subPartitionUnion()
@@ -14692,10 +14663,10 @@ yydefault:
 			yyLOCAL = yyDollar[3].partitionOptionUnion()
 		}
 		yyVAL.union = yyLOCAL
-	case 614:
+	case 615:
 		yyDollar = yyS[yypt-5 : yypt+1]
 		var yyLOCAL *PartitionOption
-//line sql.y:3449
+//line sql.y:3453
 		{
 			yyLOCAL = &PartitionOption{
 				IsLinear: yyDollar[1].booleanUnion(),
@@ -14704,10 +14675,10 @@ yydefault:
 			}
 		}
 		yyVAL.union = yyLOCAL
-	case 615:
+	case 616:
 		yyDollar = yyS[yypt-6 : yypt+1]
 		var yyLOCAL *PartitionOption
-//line sql.y:3457
+//line sql.y:3461
 		{
 			yyLOCAL = &PartitionOption{
 				IsLinear:     yyDollar[1].booleanUnion(),
@@ -14717,10 +14688,10 @@ yydefault:
 			}
 		}
 		yyVAL.union = yyLOCAL
-	case 616:
+	case 617:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL *PartitionOption
-//line sql.y:3466
+//line sql.y:3470
 		{
 			yyLOCAL = &PartitionOption{
 				Type: yyDollar[1].partitionByTypeUnion(),
@@ -14728,10 +14699,10 @@ yydefault:
 			}
 		}
 		yyVAL.union = yyLOCAL
-	case 617:
+	case 618:
 		yyDollar = yyS[yypt-5 : yypt+1]
 		var yyLOCAL *PartitionOption
-//line sql.y:3473
+//line sql.y:3477
 		{
 			yyLOCAL = &PartitionOption{
 				Type:    yyDollar[1].partitionByTypeUnion(),
@@ -14739,18 +14710,18 @@ yydefault:
 			}
 		}
 		yyVAL.union = yyLOCAL
-	case 618:
+	case 619:
 		yyDollar = yyS[yypt-0 : yypt+1]
 		var yyLOCAL *SubPartition
-//line sql.y:3481
+//line sql.y:3485
 		{
 			yyLOCAL = nil
 		}
 		yyVAL.union = yyLOCAL
-	case 619:
+	case 620:
 		yyDollar = yyS[yypt-8 : yypt+1]
 		var yyLOCAL *SubPartition
-//line sql.y:3485
+//line sql.y:3489
 		{
 			yyLOCAL = &SubPartition{
 				IsLinear:      yyDollar[3].booleanUnion(),
@@ -14760,10 +14731,10 @@ yydefault:
 			}
 		}
 		yyVAL.union = yyLOCAL
-	case 620:
+	case 621:
 		yyDollar = yyS[yypt-9 : yypt+1]
 		var yyLOCAL *SubPartition
-//line sql.y:3494
+//line sql.y:3498
 		{
 			yyLOCAL = &SubPartition{
 				IsLinear:      yyDollar[3].booleanUnion(),
@@ -14774,292 +14745,284 @@ yydefault:
 			}
 		}
 		yyVAL.union = yyLOCAL
-	case 621:
+	case 622:
 		yyDollar = yyS[yypt-0 : yypt+1]
 		var yyLOCAL []*PartitionDefinition
-//line sql.y:3505
+//line sql.y:3509
 		{
 			yyLOCAL = nil
 		}
 		yyVAL.union = yyLOCAL
-	case 622:
+	case 623:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL []*PartitionDefinition
-//line sql.y:3509
+//line sql.y:3513
 		{
 			yyLOCAL = yyDollar[2].partDefsUnion()
 		}
 		yyVAL.union = yyLOCAL
-	case 623:
+	case 624:
 		yyDollar = yyS[yypt-0 : yypt+1]
 		var yyLOCAL bool
-//line sql.y:3514
+//line sql.y:3518
 		{
 			yyLOCAL = false
 		}
 		yyVAL.union = yyLOCAL
-	case 624:
+	case 625:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL bool
-//line sql.y:3518
+//line sql.y:3522
 		{
 			yyLOCAL = true
 		}
 		yyVAL.union = yyLOCAL
-	case 625:
+	case 626:
 		yyDollar = yyS[yypt-0 : yypt+1]
 		var yyLOCAL int
-//line sql.y:3523
+//line sql.y:3527
 		{
 			yyLOCAL = 0
 		}
 		yyVAL.union = yyLOCAL
-	case 626:
+	case 627:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL int
-//line sql.y:3527
+//line sql.y:3531
 		{
 			yyLOCAL = convertStringToInt(yyDollar[3].str)
 		}
 		yyVAL.union = yyLOCAL
-	case 627:
+	case 628:
 		yyDollar = yyS[yypt-8 : yypt+1]
 		var yyLOCAL TableExpr
-//line sql.y:3533
+//line sql.y:3537
 		{
 			yyLOCAL = &JSONTableExpr{Expr: yyDollar[3].exprUnion(), Filter: yyDollar[5].exprUnion(), Columns: yyDollar[6].jtColumnListUnion(), Alias: yyDollar[8].identifierCS}
 		}
 		yyVAL.union = yyLOCAL
-	case 628:
+	case 629:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL []*JtColumnDefinition
-//line sql.y:3539
+//line sql.y:3543
 		{
 			yyLOCAL = yyDollar[3].jtColumnListUnion()
 		}
 		yyVAL.union = yyLOCAL
-	case 629:
+	case 630:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL []*JtColumnDefinition
-//line sql.y:3545
+//line sql.y:3549
 		{
 			yyLOCAL = []*JtColumnDefinition{yyDollar[1].jtColumnDefinitionUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 630:
+	case 631:
 		yyDollar = yyS[yypt-3 : yypt+1]
-//line sql.y:3549
+//line sql.y:3553
 		{
 			yySLICE := (*[]*JtColumnDefinition)(yyIaddr(yyVAL.union))
 			*yySLICE = append(*yySLICE, yyDollar[3].jtColumnDefinitionUnion())
 		}
-	case 631:
+	case 632:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL *JtColumnDefinition
-//line sql.y:3555
+//line sql.y:3559
 		{
 			yyLOCAL = &JtColumnDefinition{JtOrdinal: &JtOrdinalColDef{Name: yyDollar[1].identifierCI}}
 		}
 		yyVAL.union = yyLOCAL
-	case 632:
+	case 633:
 		yyDollar = yyS[yypt-6 : yypt+1]
 		var yyLOCAL *JtColumnDefinition
-//line sql.y:3559
+//line sql.y:3563
 		{
 			yyDollar[2].columnType.Options = &ColumnTypeOptions{Collate: yyDollar[3].str}
 			jtPath := &JtPathColDef{Name: yyDollar[1].identifierCI, Type: yyDollar[2].columnType, JtColExists: yyDollar[4].booleanUnion(), Path: yyDollar[6].exprUnion()}
 			yyLOCAL = &JtColumnDefinition{JtPath: jtPath}
 		}
 		yyVAL.union = yyLOCAL
-	case 633:
+	case 634:
 		yyDollar = yyS[yypt-7 : yypt+1]
 		var yyLOCAL *JtColumnDefinition
-//line sql.y:3565
+//line sql.y:3569
 		{
 			yyDollar[2].columnType.Options = &ColumnTypeOptions{Collate: yyDollar[3].str}
 			jtPath := &JtPathColDef{Name: yyDollar[1].identifierCI, Type: yyDollar[2].columnType, JtColExists: yyDollar[4].booleanUnion(), Path: yyDollar[6].exprUnion(), EmptyOnResponse: yyDollar[7].jtOnResponseUnion()}
 			yyLOCAL = &JtColumnDefinition{JtPath: jtPath}
 		}
 		yyVAL.union = yyLOCAL
-	case 634:
+	case 635:
 		yyDollar = yyS[yypt-7 : yypt+1]
 		var yyLOCAL *JtColumnDefinition
-//line sql.y:3571
+//line sql.y:3575
 		{
 			yyDollar[2].columnType.Options = &ColumnTypeOptions{Collate: yyDollar[3].str}
 			jtPath := &JtPathColDef{Name: yyDollar[1].identifierCI, Type: yyDollar[2].columnType, JtColExists: yyDollar[4].booleanUnion(), Path: yyDollar[6].exprUnion(), ErrorOnResponse: yyDollar[7].jtOnResponseUnion()}
 			yyLOCAL = &JtColumnDefinition{JtPath: jtPath}
 		}
 		yyVAL.union = yyLOCAL
-	case 635:
+	case 636:
 		yyDollar = yyS[yypt-8 : yypt+1]
 		var yyLOCAL *JtColumnDefinition
-//line sql.y:3577
+//line sql.y:3581
 		{
 			yyDollar[2].columnType.Options = &ColumnTypeOptions{Collate: yyDollar[3].str}
 			jtPath := &JtPathColDef{Name: yyDollar[1].identifierCI, Type: yyDollar[2].columnType, JtColExists: yyDollar[4].booleanUnion(), Path: yyDollar[6].exprUnion(), EmptyOnResponse: yyDollar[7].jtOnResponseUnion(), ErrorOnResponse: yyDollar[8].jtOnResponseUnion()}
 			yyLOCAL = &JtColumnDefinition{JtPath: jtPath}
 		}
 		yyVAL.union = yyLOCAL
-	case 636:
+	case 637:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL *JtColumnDefinition
-//line sql.y:3583
+//line sql.y:3587
 		{
 			jtNestedPath := &JtNestedPathColDef{Path: yyDollar[3].exprUnion(), Columns: yyDollar[4].jtColumnListUnion()}
 			yyLOCAL = &JtColumnDefinition{JtNestedPath: jtNestedPath}
 		}
 		yyVAL.union = yyLOCAL
-	case 637:
+	case 638:
 		yyDollar = yyS[yypt-0 : yypt+1]
 		var yyLOCAL bool
-//line sql.y:3589
+//line sql.y:3593
 		{
 			yyLOCAL = false
 		}
 		yyVAL.union = yyLOCAL
-	case 638:
+	case 639:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL bool
-//line sql.y:3593
+//line sql.y:3597
 		{
 			yyLOCAL = true
 		}
 		yyVAL.union = yyLOCAL
-	case 639:
+	case 640:
 		yyDollar = yyS[yypt-0 : yypt+1]
 		var yyLOCAL bool
-//line sql.y:3597
+//line sql.y:3601
 		{
 			yyLOCAL = false
 		}
 		yyVAL.union = yyLOCAL
-	case 640:
+	case 641:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL bool
-//line sql.y:3601
+//line sql.y:3605
 		{
 			yyLOCAL = true
 		}
 		yyVAL.union = yyLOCAL
-	case 641:
+	case 642:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL *JtOnResponse
-//line sql.y:3607
+//line sql.y:3611
 		{
 			yyLOCAL = yyDollar[1].jtOnResponseUnion()
 		}
 		yyVAL.union = yyLOCAL
-	case 642:
+	case 643:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL *JtOnResponse
-//line sql.y:3613
+//line sql.y:3617
 		{
 			yyLOCAL = yyDollar[1].jtOnResponseUnion()
 		}
 		yyVAL.union = yyLOCAL
-	case 643:
+	case 644:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL *JtOnResponse
-//line sql.y:3619
+//line sql.y:3623
 		{
 			yyLOCAL = &JtOnResponse{ResponseType: ErrorJSONType}
 		}
 		yyVAL.union = yyLOCAL
-	case 644:
+	case 645:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL *JtOnResponse
-//line sql.y:3623
+//line sql.y:3627
 		{
 			yyLOCAL = &JtOnResponse{ResponseType: NullJSONType}
 		}
 		yyVAL.union = yyLOCAL
-	case 645:
+	case 646:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL *JtOnResponse
-//line sql.y:3627
+//line sql.y:3631
 		{
 			yyLOCAL = &JtOnResponse{ResponseType: DefaultJSONType, Expr: yyDollar[2].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 646:
+	case 647:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL PartitionByType
-//line sql.y:3633
+//line sql.y:3637
 		{
 			yyLOCAL = RangeType
 		}
 		yyVAL.union = yyLOCAL
-	case 647:
+	case 648:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL PartitionByType
-//line sql.y:3637
+//line sql.y:3641
 		{
 			yyLOCAL = ListType
 		}
 		yyVAL.union = yyLOCAL
-	case 648:
+	case 649:
 		yyDollar = yyS[yypt-0 : yypt+1]
 		var yyLOCAL int
-//line sql.y:3642
+//line sql.y:3646
 		{
 			yyLOCAL = -1
 		}
 		yyVAL.union = yyLOCAL
-	case 649:
+	case 650:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL int
-//line sql.y:3646
+//line sql.y:3650
 		{
 			yyLOCAL = convertStringToInt(yyDollar[2].str)
 		}
 		yyVAL.union = yyLOCAL
-	case 650:
+	case 651:
 		yyDollar = yyS[yypt-0 : yypt+1]
 		var yyLOCAL int
-//line sql.y:3651
+//line sql.y:3655
 		{
 			yyLOCAL = -1
 		}
 		yyVAL.union = yyLOCAL
-	case 651:
+	case 652:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL int
-//line sql.y:3655
+//line sql.y:3659
 		{
 			yyLOCAL = convertStringToInt(yyDollar[2].str)
 		}
 		yyVAL.union = yyLOCAL
-	case 652:
-		yyDollar = yyS[yypt-5 : yypt+1]
-		var yyLOCAL *PartitionSpec
-//line sql.y:3661
-		{
-			yyLOCAL = &PartitionSpec{Action: AddAction, Definitions: []*PartitionDefinition{yyDollar[4].partDefUnion()}}
-		}
-		yyVAL.union = yyLOCAL
 	case 653:
-		yyDollar = yyS[yypt-3 : yypt+1]
+		yyDollar = yyS[yypt-5 : yypt+1]
 		var yyLOCAL *PartitionSpec
 //line sql.y:3665
 		{
-			yyLOCAL = &PartitionSpec{Action: DropAction, Names: yyDollar[3].partitionsUnion()}
+			yyLOCAL = &PartitionSpec{Action: AddAction, Definitions: []*PartitionDefinition{yyDollar[4].partDefUnion()}}
 		}
 		yyVAL.union = yyLOCAL
 	case 654:
-		yyDollar = yyS[yypt-7 : yypt+1]
+		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL *PartitionSpec
 //line sql.y:3669
 		{
-			yyLOCAL = &PartitionSpec{Action: ReorganizeAction, Names: yyDollar[3].partitionsUnion(), Definitions: yyDollar[6].partDefsUnion()}
+			yyLOCAL = &PartitionSpec{Action: DropAction, Names: yyDollar[3].partitionsUnion()}
 		}
 		yyVAL.union = yyLOCAL
 	case 655:
-		yyDollar = yyS[yypt-4 : yypt+1]
+		yyDollar = yyS[yypt-7 : yypt+1]
 		var yyLOCAL *PartitionSpec
 //line sql.y:3673
 		{
-			yyLOCAL = &PartitionSpec{Action: DiscardAction, Names: yyDollar[3].partitionsUnion()}
+			yyLOCAL = &PartitionSpec{Action: ReorganizeAction, Names: yyDollar[3].partitionsUnion(), Definitions: yyDollar[6].partDefsUnion()}
 		}
 		yyVAL.union = yyLOCAL
 	case 656:
@@ -15067,7 +15030,7 @@ yydefault:
 		var yyLOCAL *PartitionSpec
 //line sql.y:3677
 		{
-			yyLOCAL = &PartitionSpec{Action: DiscardAction, IsAll: true}
+			yyLOCAL = &PartitionSpec{Action: DiscardAction, Names: yyDollar[3].partitionsUnion()}
 		}
 		yyVAL.union = yyLOCAL
 	case 657:
@@ -15075,7 +15038,7 @@ yydefault:
 		var yyLOCAL *PartitionSpec
 //line sql.y:3681
 		{
-			yyLOCAL = &PartitionSpec{Action: ImportAction, Names: yyDollar[3].partitionsUnion()}
+			yyLOCAL = &PartitionSpec{Action: DiscardAction, IsAll: true}
 		}
 		yyVAL.union = yyLOCAL
 	case 658:
@@ -15083,15 +15046,15 @@ yydefault:
 		var yyLOCAL *PartitionSpec
 //line sql.y:3685
 		{
-			yyLOCAL = &PartitionSpec{Action: ImportAction, IsAll: true}
+			yyLOCAL = &PartitionSpec{Action: ImportAction, Names: yyDollar[3].partitionsUnion()}
 		}
 		yyVAL.union = yyLOCAL
 	case 659:
-		yyDollar = yyS[yypt-3 : yypt+1]
+		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL *PartitionSpec
 //line sql.y:3689
 		{
-			yyLOCAL = &PartitionSpec{Action: TruncateAction, Names: yyDollar[3].partitionsUnion()}
+			yyLOCAL = &PartitionSpec{Action: ImportAction, IsAll: true}
 		}
 		yyVAL.union = yyLOCAL
 	case 660:
@@ -15099,7 +15062,7 @@ yydefault:
 		var yyLOCAL *PartitionSpec
 //line sql.y:3693
 		{
-			yyLOCAL = &PartitionSpec{Action: TruncateAction, IsAll: true}
+			yyLOCAL = &PartitionSpec{Action: TruncateAction, Names: yyDollar[3].partitionsUnion()}
 		}
 		yyVAL.union = yyLOCAL
 	case 661:
@@ -15107,23 +15070,23 @@ yydefault:
 		var yyLOCAL *PartitionSpec
 //line sql.y:3697
 		{
-			yyLOCAL = &PartitionSpec{Action: CoalesceAction, Number: NewIntLiteral(yyDollar[3].str)}
+			yyLOCAL = &PartitionSpec{Action: TruncateAction, IsAll: true}
 		}
 		yyVAL.union = yyLOCAL
 	case 662:
-		yyDollar = yyS[yypt-7 : yypt+1]
+		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL *PartitionSpec
 //line sql.y:3701
 		{
-			yyLOCAL = &PartitionSpec{Action: ExchangeAction, Names: Partitions{yyDollar[3].identifierCI}, TableName: yyDollar[6].tableName, WithoutValidation: yyDollar[7].booleanUnion()}
+			yyLOCAL = &PartitionSpec{Action: CoalesceAction, Number: NewIntLiteral(yyDollar[3].str)}
 		}
 		yyVAL.union = yyLOCAL
 	case 663:
-		yyDollar = yyS[yypt-3 : yypt+1]
+		yyDollar = yyS[yypt-7 : yypt+1]
 		var yyLOCAL *PartitionSpec
 //line sql.y:3705
 		{
-			yyLOCAL = &PartitionSpec{Action: AnalyzeAction, Names: yyDollar[3].partitionsUnion()}
+			yyLOCAL = &PartitionSpec{Action: ExchangeAction, Names: Partitions{yyDollar[3].identifierCI}, TableName: yyDollar[6].tableName, WithoutValidation: yyDollar[7].booleanUnion()}
 		}
 		yyVAL.union = yyLOCAL
 	case 664:
@@ -15131,7 +15094,7 @@ yydefault:
 		var yyLOCAL *PartitionSpec
 //line sql.y:3709
 		{
-			yyLOCAL = &PartitionSpec{Action: AnalyzeAction, IsAll: true}
+			yyLOCAL = &PartitionSpec{Action: AnalyzeAction, Names: yyDollar[3].partitionsUnion()}
 		}
 		yyVAL.union = yyLOCAL
 	case 665:
@@ -15139,7 +15102,7 @@ yydefault:
 		var yyLOCAL *PartitionSpec
 //line sql.y:3713
 		{
-			yyLOCAL = &PartitionSpec{Action: CheckAction, Names: yyDollar[3].partitionsUnion()}
+			yyLOCAL = &PartitionSpec{Action: AnalyzeAction, IsAll: true}
 		}
 		yyVAL.union = yyLOCAL
 	case 666:
@@ -15147,7 +15110,7 @@ yydefault:
 		var yyLOCAL *PartitionSpec
 //line sql.y:3717
 		{
-			yyLOCAL = &PartitionSpec{Action: CheckAction, IsAll: true}
+			yyLOCAL = &PartitionSpec{Action: CheckAction, Names: yyDollar[3].partitionsUnion()}
 		}
 		yyVAL.union = yyLOCAL
 	case 667:
@@ -15155,7 +15118,7 @@ yydefault:
 		var yyLOCAL *PartitionSpec
 //line sql.y:3721
 		{
-			yyLOCAL = &PartitionSpec{Action: OptimizeAction, Names: yyDollar[3].partitionsUnion()}
+			yyLOCAL = &PartitionSpec{Action: CheckAction, IsAll: true}
 		}
 		yyVAL.union = yyLOCAL
 	case 668:
@@ -15163,7 +15126,7 @@ yydefault:
 		var yyLOCAL *PartitionSpec
 //line sql.y:3725
 		{
-			yyLOCAL = &PartitionSpec{Action: OptimizeAction, IsAll: true}
+			yyLOCAL = &PartitionSpec{Action: OptimizeAction, Names: yyDollar[3].partitionsUnion()}
 		}
 		yyVAL.union = yyLOCAL
 	case 669:
@@ -15171,7 +15134,7 @@ yydefault:
 		var yyLOCAL *PartitionSpec
 //line sql.y:3729
 		{
-			yyLOCAL = &PartitionSpec{Action: RebuildAction, Names: yyDollar[3].partitionsUnion()}
+			yyLOCAL = &PartitionSpec{Action: OptimizeAction, IsAll: true}
 		}
 		yyVAL.union = yyLOCAL
 	case 670:
@@ -15179,7 +15142,7 @@ yydefault:
 		var yyLOCAL *PartitionSpec
 //line sql.y:3733
 		{
-			yyLOCAL = &PartitionSpec{Action: RebuildAction, IsAll: true}
+			yyLOCAL = &PartitionSpec{Action: RebuildAction, Names: yyDollar[3].partitionsUnion()}
 		}
 		yyVAL.union = yyLOCAL
 	case 671:
@@ -15187,7 +15150,7 @@ yydefault:
 		var yyLOCAL *PartitionSpec
 //line sql.y:3737
 		{
-			yyLOCAL = &PartitionSpec{Action: RepairAction, Names: yyDollar[3].partitionsUnion()}
+			yyLOCAL = &PartitionSpec{Action: RebuildAction, IsAll: true}
 		}
 		yyVAL.union = yyLOCAL
 	case 672:
@@ -15195,27 +15158,27 @@ yydefault:
 		var yyLOCAL *PartitionSpec
 //line sql.y:3741
 		{
-			yyLOCAL = &PartitionSpec{Action: RepairAction, IsAll: true}
+			yyLOCAL = &PartitionSpec{Action: RepairAction, Names: yyDollar[3].partitionsUnion()}
 		}
 		yyVAL.union = yyLOCAL
 	case 673:
-		yyDollar = yyS[yypt-2 : yypt+1]
+		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL *PartitionSpec
 //line sql.y:3745
 		{
-			yyLOCAL = &PartitionSpec{Action: UpgradeAction}
+			yyLOCAL = &PartitionSpec{Action: RepairAction, IsAll: true}
 		}
 		yyVAL.union = yyLOCAL
 	case 674:
-		yyDollar = yyS[yypt-0 : yypt+1]
-		var yyLOCAL bool
-//line sql.y:3750
+		yyDollar = yyS[yypt-2 : yypt+1]
+		var yyLOCAL *PartitionSpec
+//line sql.y:3749
 		{
-			yyLOCAL = false
+			yyLOCAL = &PartitionSpec{Action: UpgradeAction}
 		}
 		yyVAL.union = yyLOCAL
 	case 675:
-		yyDollar = yyS[yypt-2 : yypt+1]
+		yyDollar = yyS[yypt-0 : yypt+1]
 		var yyLOCAL bool
 //line sql.y:3754
 		{
@@ -15227,225 +15190,233 @@ yydefault:
 		var yyLOCAL bool
 //line sql.y:3758
 		{
-			yyLOCAL = true
+			yyLOCAL = false
 		}
 		yyVAL.union = yyLOCAL
 	case 677:
+		yyDollar = yyS[yypt-2 : yypt+1]
+		var yyLOCAL bool
+//line sql.y:3762
+		{
+			yyLOCAL = true
+		}
+		yyVAL.union = yyLOCAL
+	case 678:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL []*PartitionDefinition
-//line sql.y:3764
+//line sql.y:3768
 		{
 			yyLOCAL = []*PartitionDefinition{yyDollar[1].partDefUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 678:
+	case 679:
 		yyDollar = yyS[yypt-3 : yypt+1]
-//line sql.y:3768
+//line sql.y:3772
 		{
 			yySLICE := (*[]*PartitionDefinition)(yyIaddr(yyVAL.union))
 			*yySLICE = append(*yySLICE, yyDollar[3].partDefUnion())
 		}
-	case 679:
+	case 680:
 		yyDollar = yyS[yypt-2 : yypt+1]
-//line sql.y:3774
+//line sql.y:3778
 		{
 			yyVAL.partDefUnion().Options = yyDollar[2].partitionDefinitionOptionsUnion()
 		}
-	case 680:
+	case 681:
 		yyDollar = yyS[yypt-0 : yypt+1]
 		var yyLOCAL *PartitionDefinitionOptions
-//line sql.y:3779
+//line sql.y:3783
 		{
 			yyLOCAL = &PartitionDefinitionOptions{}
 		}
 		yyVAL.union = yyLOCAL
-	case 681:
+	case 682:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL *PartitionDefinitionOptions
-//line sql.y:3783
+//line sql.y:3787
 		{
 			yyDollar[1].partitionDefinitionOptionsUnion().ValueRange = yyDollar[2].partitionValueRangeUnion()
 			yyLOCAL = yyDollar[1].partitionDefinitionOptionsUnion()
 		}
 		yyVAL.union = yyLOCAL
-	case 682:
+	case 683:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL *PartitionDefinitionOptions
-//line sql.y:3788
+//line sql.y:3792
 		{
 			yyDollar[1].partitionDefinitionOptionsUnion().Comment = yyDollar[2].literalUnion()
 			yyLOCAL = yyDollar[1].partitionDefinitionOptionsUnion()
 		}
 		yyVAL.union = yyLOCAL
-	case 683:
+	case 684:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL *PartitionDefinitionOptions
-//line sql.y:3793
+//line sql.y:3797
 		{
 			yyDollar[1].partitionDefinitionOptionsUnion().Engine = yyDollar[2].partitionEngineUnion()
 			yyLOCAL = yyDollar[1].partitionDefinitionOptionsUnion()
 		}
 		yyVAL.union = yyLOCAL
-	case 684:
+	case 685:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL *PartitionDefinitionOptions
-//line sql.y:3798
+//line sql.y:3802
 		{
 			yyDollar[1].partitionDefinitionOptionsUnion().DataDirectory = yyDollar[2].literalUnion()
 			yyLOCAL = yyDollar[1].partitionDefinitionOptionsUnion()
 		}
 		yyVAL.union = yyLOCAL
-	case 685:
+	case 686:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL *PartitionDefinitionOptions
-//line sql.y:3803
+//line sql.y:3807
 		{
 			yyDollar[1].partitionDefinitionOptionsUnion().IndexDirectory = yyDollar[2].literalUnion()
 			yyLOCAL = yyDollar[1].partitionDefinitionOptionsUnion()
 		}
 		yyVAL.union = yyLOCAL
-	case 686:
+	case 687:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL *PartitionDefinitionOptions
-//line sql.y:3808
+//line sql.y:3812
 		{
 			yyDollar[1].partitionDefinitionOptionsUnion().MaxRows = ptr.Of(yyDollar[2].integerUnion())
 			yyLOCAL = yyDollar[1].partitionDefinitionOptionsUnion()
 		}
 		yyVAL.union = yyLOCAL
-	case 687:
+	case 688:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL *PartitionDefinitionOptions
-//line sql.y:3813
+//line sql.y:3817
 		{
 			yyDollar[1].partitionDefinitionOptionsUnion().MinRows = ptr.Of(yyDollar[2].integerUnion())
 			yyLOCAL = yyDollar[1].partitionDefinitionOptionsUnion()
 		}
 		yyVAL.union = yyLOCAL
-	case 688:
+	case 689:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL *PartitionDefinitionOptions
-//line sql.y:3818
+//line sql.y:3822
 		{
 			yyDollar[1].partitionDefinitionOptionsUnion().TableSpace = yyDollar[2].str
 			yyLOCAL = yyDollar[1].partitionDefinitionOptionsUnion()
 		}
 		yyVAL.union = yyLOCAL
-	case 689:
+	case 690:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL *PartitionDefinitionOptions
-//line sql.y:3823
+//line sql.y:3827
 		{
 			yyDollar[1].partitionDefinitionOptionsUnion().SubPartitionDefinitions = yyDollar[2].subPartitionDefinitionsUnion()
 			yyLOCAL = yyDollar[1].partitionDefinitionOptionsUnion()
 		}
 		yyVAL.union = yyLOCAL
-	case 690:
+	case 691:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL SubPartitionDefinitions
-//line sql.y:3829
+//line sql.y:3833
 		{
 			yyLOCAL = yyDollar[2].subPartitionDefinitionsUnion()
 		}
 		yyVAL.union = yyLOCAL
-	case 691:
+	case 692:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL SubPartitionDefinitions
-//line sql.y:3835
+//line sql.y:3839
 		{
 			yyLOCAL = SubPartitionDefinitions{yyDollar[1].subPartitionDefinitionUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 692:
+	case 693:
 		yyDollar = yyS[yypt-3 : yypt+1]
-//line sql.y:3839
+//line sql.y:3843
 		{
 			yySLICE := (*SubPartitionDefinitions)(yyIaddr(yyVAL.union))
 			*yySLICE = append(*yySLICE, yyDollar[3].subPartitionDefinitionUnion())
 		}
-	case 693:
+	case 694:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL *SubPartitionDefinition
-//line sql.y:3845
+//line sql.y:3849
 		{
 			yyLOCAL = &SubPartitionDefinition{Name: yyDollar[2].identifierCI, Options: yyDollar[3].subPartitionDefinitionOptionsUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 694:
+	case 695:
 		yyDollar = yyS[yypt-0 : yypt+1]
 		var yyLOCAL *SubPartitionDefinitionOptions
-//line sql.y:3850
+//line sql.y:3854
 		{
 			yyLOCAL = &SubPartitionDefinitionOptions{}
 		}
 		yyVAL.union = yyLOCAL
-	case 695:
+	case 696:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL *SubPartitionDefinitionOptions
-//line sql.y:3854
+//line sql.y:3858
 		{
 			yyDollar[1].subPartitionDefinitionOptionsUnion().Comment = yyDollar[2].literalUnion()
 			yyLOCAL = yyDollar[1].subPartitionDefinitionOptionsUnion()
 		}
 		yyVAL.union = yyLOCAL
-	case 696:
+	case 697:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL *SubPartitionDefinitionOptions
-//line sql.y:3859
+//line sql.y:3863
 		{
 			yyDollar[1].subPartitionDefinitionOptionsUnion().Engine = yyDollar[2].partitionEngineUnion()
 			yyLOCAL = yyDollar[1].subPartitionDefinitionOptionsUnion()
 		}
 		yyVAL.union = yyLOCAL
-	case 697:
+	case 698:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL *SubPartitionDefinitionOptions
-//line sql.y:3864
+//line sql.y:3868
 		{
 			yyDollar[1].subPartitionDefinitionOptionsUnion().DataDirectory = yyDollar[2].literalUnion()
 			yyLOCAL = yyDollar[1].subPartitionDefinitionOptionsUnion()
 		}
 		yyVAL.union = yyLOCAL
-	case 698:
+	case 699:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL *SubPartitionDefinitionOptions
-//line sql.y:3869
+//line sql.y:3873
 		{
 			yyDollar[1].subPartitionDefinitionOptionsUnion().IndexDirectory = yyDollar[2].literalUnion()
 			yyLOCAL = yyDollar[1].subPartitionDefinitionOptionsUnion()
 		}
 		yyVAL.union = yyLOCAL
-	case 699:
+	case 700:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL *SubPartitionDefinitionOptions
-//line sql.y:3874
+//line sql.y:3878
 		{
 			yyDollar[1].subPartitionDefinitionOptionsUnion().MaxRows = ptr.Of(yyDollar[2].integerUnion())
 			yyLOCAL = yyDollar[1].subPartitionDefinitionOptionsUnion()
 		}
 		yyVAL.union = yyLOCAL
-	case 700:
+	case 701:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL *SubPartitionDefinitionOptions
-//line sql.y:3879
+//line sql.y:3883
 		{
 			yyDollar[1].subPartitionDefinitionOptionsUnion().MinRows = ptr.Of(yyDollar[2].integerUnion())
 			yyLOCAL = yyDollar[1].subPartitionDefinitionOptionsUnion()
 		}
 		yyVAL.union = yyLOCAL
-	case 701:
+	case 702:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL *SubPartitionDefinitionOptions
-//line sql.y:3884
+//line sql.y:3888
 		{
 			yyDollar[1].subPartitionDefinitionOptionsUnion().TableSpace = yyDollar[2].str
 			yyLOCAL = yyDollar[1].subPartitionDefinitionOptionsUnion()
 		}
 		yyVAL.union = yyLOCAL
-	case 702:
+	case 703:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL *PartitionValueRange
-//line sql.y:3891
+//line sql.y:3895
 		{
 			yyLOCAL = &PartitionValueRange{
 				Type:  LessThanType,
@@ -15453,10 +15424,10 @@ yydefault:
 			}
 		}
 		yyVAL.union = yyLOCAL
-	case 703:
+	case 704:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL *PartitionValueRange
-//line sql.y:3898
+//line sql.y:3902
 		{
 			yyLOCAL = &PartitionValueRange{
 				Type:     LessThanType,
@@ -15464,10 +15435,10 @@ yydefault:
 			}
 		}
 		yyVAL.union = yyLOCAL
-	case 704:
+	case 705:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL *PartitionValueRange
-//line sql.y:3905
+//line sql.y:3909
 		{
 			yyLOCAL = &PartitionValueRange{
 				Type:  InType,
@@ -15475,131 +15446,131 @@ yydefault:
 			}
 		}
 		yyVAL.union = yyLOCAL
-	case 705:
+	case 706:
 		yyDollar = yyS[yypt-0 : yypt+1]
 		var yyLOCAL bool
-//line sql.y:3913
+//line sql.y:3917
 		{
 			yyLOCAL = false
 		}
 		yyVAL.union = yyLOCAL
-	case 706:
+	case 707:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL bool
-//line sql.y:3917
+//line sql.y:3921
 		{
 			yyLOCAL = true
 		}
 		yyVAL.union = yyLOCAL
-	case 707:
+	case 708:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL *PartitionEngine
-//line sql.y:3923
+//line sql.y:3927
 		{
 			yyLOCAL = &PartitionEngine{Storage: yyDollar[1].booleanUnion(), Name: yyDollar[4].identifierCS.String()}
 		}
 		yyVAL.union = yyLOCAL
-	case 708:
+	case 709:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL *Literal
-//line sql.y:3929
+//line sql.y:3933
 		{
 			yyLOCAL = NewStrLiteral(yyDollar[3].str)
 		}
 		yyVAL.union = yyLOCAL
-	case 709:
+	case 710:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL *Literal
-//line sql.y:3935
+//line sql.y:3939
 		{
 			yyLOCAL = NewStrLiteral(yyDollar[4].str)
 		}
 		yyVAL.union = yyLOCAL
-	case 710:
+	case 711:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL *Literal
-//line sql.y:3941
+//line sql.y:3945
 		{
 			yyLOCAL = NewStrLiteral(yyDollar[4].str)
 		}
 		yyVAL.union = yyLOCAL
-	case 711:
+	case 712:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL int
-//line sql.y:3947
+//line sql.y:3951
 		{
 			yyLOCAL = convertStringToInt(yyDollar[3].str)
 		}
 		yyVAL.union = yyLOCAL
-	case 712:
+	case 713:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL int
-//line sql.y:3953
+//line sql.y:3957
 		{
 			yyLOCAL = convertStringToInt(yyDollar[3].str)
 		}
 		yyVAL.union = yyLOCAL
-	case 713:
+	case 714:
 		yyDollar = yyS[yypt-3 : yypt+1]
-//line sql.y:3959
+//line sql.y:3963
 		{
 			yyVAL.str = yyDollar[3].identifierCS.String()
 		}
-	case 714:
+	case 715:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL *PartitionDefinition
-//line sql.y:3965
+//line sql.y:3969
 		{
 			yyLOCAL = &PartitionDefinition{Name: yyDollar[2].identifierCI}
 		}
 		yyVAL.union = yyLOCAL
-	case 715:
+	case 716:
 		yyDollar = yyS[yypt-1 : yypt+1]
-//line sql.y:3971
+//line sql.y:3975
 		{
 			yyVAL.str = ""
 		}
-	case 716:
+	case 717:
 		yyDollar = yyS[yypt-3 : yypt+1]
-//line sql.y:3975
+//line sql.y:3979
 		{
 			yyVAL.str = ""
 		}
-	case 717:
+	case 718:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL Statement
-//line sql.y:3981
+//line sql.y:3985
 		{
 			yyLOCAL = &RenameTable{TablePairs: yyDollar[3].renameTablePairsUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 718:
+	case 719:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL []*RenameTablePair
-//line sql.y:3987
+//line sql.y:3991
 		{
 			yyLOCAL = []*RenameTablePair{{FromTable: yyDollar[1].tableName, ToTable: yyDollar[3].tableName}}
 		}
 		yyVAL.union = yyLOCAL
-	case 719:
+	case 720:
 		yyDollar = yyS[yypt-5 : yypt+1]
-//line sql.y:3991
+//line sql.y:3995
 		{
 			yySLICE := (*[]*RenameTablePair)(yyIaddr(yyVAL.union))
 			*yySLICE = append(*yySLICE, &RenameTablePair{FromTable: yyDollar[3].tableName, ToTable: yyDollar[5].tableName})
 		}
-	case 720:
+	case 721:
 		yyDollar = yyS[yypt-7 : yypt+1]
 		var yyLOCAL Statement
-//line sql.y:3997
+//line sql.y:4001
 		{
 			yyLOCAL = &DropTable{FromTables: yyDollar[6].tableNamesUnion(), IfExists: yyDollar[5].booleanUnion(), Comments: Comments(yyDollar[2].strs).Parsed(), Temp: yyDollar[3].booleanUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 721:
+	case 722:
 		yyDollar = yyS[yypt-7 : yypt+1]
 		var yyLOCAL Statement
-//line sql.y:4001
+//line sql.y:4005
 		{
 			// Change this to an alter statement
 			if yyDollar[4].identifierCI.Lowered() == "primary" {
@@ -15609,68 +15580,60 @@ yydefault:
 			}
 		}
 		yyVAL.union = yyLOCAL
-	case 722:
+	case 723:
 		yyDollar = yyS[yypt-6 : yypt+1]
 		var yyLOCAL Statement
-//line sql.y:4010
+//line sql.y:4014
 		{
 			yyLOCAL = &DropView{FromTables: yyDollar[5].tableNamesUnion(), Comments: Comments(yyDollar[2].strs).Parsed(), IfExists: yyDollar[4].booleanUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 723:
+	case 724:
 		yyDollar = yyS[yypt-5 : yypt+1]
 		var yyLOCAL Statement
-//line sql.y:4014
+//line sql.y:4018
 		{
 			yyLOCAL = &DropDatabase{Comments: Comments(yyDollar[2].strs).Parsed(), DBName: yyDollar[5].identifierCS, IfExists: yyDollar[4].booleanUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 724:
+	case 725:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL Statement
-//line sql.y:4020
+//line sql.y:4024
 		{
 			yyLOCAL = &TruncateTable{Table: yyDollar[3].tableName}
 		}
 		yyVAL.union = yyLOCAL
-	case 725:
+	case 726:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL Statement
-//line sql.y:4024
+//line sql.y:4028
 		{
 			yyLOCAL = &TruncateTable{Table: yyDollar[2].tableName}
 		}
 		yyVAL.union = yyLOCAL
-	case 726:
+	case 727:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Statement
-//line sql.y:4030
+//line sql.y:4034
 		{
 			yyLOCAL = &Analyze{IsLocal: yyDollar[2].booleanUnion(), Table: yyDollar[4].tableName}
 		}
 		yyVAL.union = yyLOCAL
-	case 727:
-		yyDollar = yyS[yypt-5 : yypt+1]
-		var yyLOCAL Statement
-//line sql.y:4036
-		{
-			yyLOCAL = &PurgeBinaryLogs{To: string(yyDollar[5].str)}
-		}
-		yyVAL.union = yyLOCAL
 	case 728:
 		yyDollar = yyS[yypt-5 : yypt+1]
 		var yyLOCAL Statement
 //line sql.y:4040
 		{
-			yyLOCAL = &PurgeBinaryLogs{Before: string(yyDollar[5].str)}
+			yyLOCAL = &PurgeBinaryLogs{To: string(yyDollar[5].str)}
 		}
 		yyVAL.union = yyLOCAL
 	case 729:
-		yyDollar = yyS[yypt-3 : yypt+1]
+		yyDollar = yyS[yypt-5 : yypt+1]
 		var yyLOCAL Statement
-//line sql.y:4046
+//line sql.y:4044
 		{
-			yyLOCAL = &Show{&ShowBasic{Command: Charset, Filter: yyDollar[3].showFilterUnion()}}
+			yyLOCAL = &PurgeBinaryLogs{Before: string(yyDollar[5].str)}
 		}
 		yyVAL.union = yyLOCAL
 	case 730:
@@ -15678,23 +15641,23 @@ yydefault:
 		var yyLOCAL Statement
 //line sql.y:4050
 		{
-			yyLOCAL = &Show{&ShowBasic{Command: Collation, Filter: yyDollar[3].showFilterUnion()}}
+			yyLOCAL = &Show{&ShowBasic{Command: Charset, Filter: yyDollar[3].showFilterUnion()}}
 		}
 		yyVAL.union = yyLOCAL
 	case 731:
-		yyDollar = yyS[yypt-7 : yypt+1]
+		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL Statement
 //line sql.y:4054
 		{
-			yyLOCAL = &Show{&ShowBasic{Full: yyDollar[2].booleanUnion(), Command: Column, Tbl: yyDollar[5].tableName, DbName: yyDollar[6].identifierCS, Filter: yyDollar[7].showFilterUnion()}}
+			yyLOCAL = &Show{&ShowBasic{Command: Collation, Filter: yyDollar[3].showFilterUnion()}}
 		}
 		yyVAL.union = yyLOCAL
 	case 732:
-		yyDollar = yyS[yypt-3 : yypt+1]
+		yyDollar = yyS[yypt-7 : yypt+1]
 		var yyLOCAL Statement
 //line sql.y:4058
 		{
-			yyLOCAL = &Show{&ShowBasic{Command: Database, Filter: yyDollar[3].showFilterUnion()}}
+			yyLOCAL = &Show{&ShowBasic{Full: yyDollar[2].booleanUnion(), Command: Column, Tbl: yyDollar[5].tableName, DbName: yyDollar[6].identifierCS, Filter: yyDollar[7].showFilterUnion()}}
 		}
 		yyVAL.union = yyLOCAL
 	case 733:
@@ -15710,7 +15673,7 @@ yydefault:
 		var yyLOCAL Statement
 //line sql.y:4066
 		{
-			yyLOCAL = &Show{&ShowBasic{Command: Keyspace, Filter: yyDollar[3].showFilterUnion()}}
+			yyLOCAL = &Show{&ShowBasic{Command: Database, Filter: yyDollar[3].showFilterUnion()}}
 		}
 		yyVAL.union = yyLOCAL
 	case 735:
@@ -15722,43 +15685,43 @@ yydefault:
 		}
 		yyVAL.union = yyLOCAL
 	case 736:
-		yyDollar = yyS[yypt-4 : yypt+1]
+		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL Statement
 //line sql.y:4074
 		{
-			yyLOCAL = &Show{&ShowBasic{Command: Function, Filter: yyDollar[4].showFilterUnion()}}
+			yyLOCAL = &Show{&ShowBasic{Command: Keyspace, Filter: yyDollar[3].showFilterUnion()}}
 		}
 		yyVAL.union = yyLOCAL
 	case 737:
-		yyDollar = yyS[yypt-7 : yypt+1]
+		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Statement
 //line sql.y:4078
 		{
-			yyLOCAL = &Show{&ShowBasic{Command: Index, Tbl: yyDollar[5].tableName, DbName: yyDollar[6].identifierCS, Filter: yyDollar[7].showFilterUnion()}}
+			yyLOCAL = &Show{&ShowBasic{Command: Function, Filter: yyDollar[4].showFilterUnion()}}
 		}
 		yyVAL.union = yyLOCAL
 	case 738:
-		yyDollar = yyS[yypt-5 : yypt+1]
+		yyDollar = yyS[yypt-7 : yypt+1]
 		var yyLOCAL Statement
 //line sql.y:4082
 		{
-			yyLOCAL = &Show{&ShowBasic{Command: OpenTable, DbName: yyDollar[4].identifierCS, Filter: yyDollar[5].showFilterUnion()}}
+			yyLOCAL = &Show{&ShowBasic{Command: Index, Tbl: yyDollar[5].tableName, DbName: yyDollar[6].identifierCS, Filter: yyDollar[7].showFilterUnion()}}
 		}
 		yyVAL.union = yyLOCAL
 	case 739:
-		yyDollar = yyS[yypt-2 : yypt+1]
+		yyDollar = yyS[yypt-5 : yypt+1]
 		var yyLOCAL Statement
 //line sql.y:4086
 		{
-			yyLOCAL = &Show{&ShowBasic{Command: Privilege}}
+			yyLOCAL = &Show{&ShowBasic{Command: OpenTable, DbName: yyDollar[4].identifierCS, Filter: yyDollar[5].showFilterUnion()}}
 		}
 		yyVAL.union = yyLOCAL
 	case 740:
-		yyDollar = yyS[yypt-4 : yypt+1]
+		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL Statement
 //line sql.y:4090
 		{
-			yyLOCAL = &Show{&ShowBasic{Command: Procedure, Filter: yyDollar[4].showFilterUnion()}}
+			yyLOCAL = &Show{&ShowBasic{Command: Privilege}}
 		}
 		yyVAL.union = yyLOCAL
 	case 741:
@@ -15766,7 +15729,7 @@ yydefault:
 		var yyLOCAL Statement
 //line sql.y:4094
 		{
-			yyLOCAL = &Show{&ShowBasic{Command: StatusSession, Filter: yyDollar[4].showFilterUnion()}}
+			yyLOCAL = &Show{&ShowBasic{Command: Procedure, Filter: yyDollar[4].showFilterUnion()}}
 		}
 		yyVAL.union = yyLOCAL
 	case 742:
@@ -15774,7 +15737,7 @@ yydefault:
 		var yyLOCAL Statement
 //line sql.y:4098
 		{
-			yyLOCAL = &Show{&ShowBasic{Command: StatusGlobal, Filter: yyDollar[4].showFilterUnion()}}
+			yyLOCAL = &Show{&ShowBasic{Command: StatusSession, Filter: yyDollar[4].showFilterUnion()}}
 		}
 		yyVAL.union = yyLOCAL
 	case 743:
@@ -15782,7 +15745,7 @@ yydefault:
 		var yyLOCAL Statement
 //line sql.y:4102
 		{
-			yyLOCAL = &Show{&ShowBasic{Command: VariableSession, Filter: yyDollar[4].showFilterUnion()}}
+			yyLOCAL = &Show{&ShowBasic{Command: StatusGlobal, Filter: yyDollar[4].showFilterUnion()}}
 		}
 		yyVAL.union = yyLOCAL
 	case 744:
@@ -15790,15 +15753,15 @@ yydefault:
 		var yyLOCAL Statement
 //line sql.y:4106
 		{
-			yyLOCAL = &Show{&ShowBasic{Command: VariableGlobal, Filter: yyDollar[4].showFilterUnion()}}
+			yyLOCAL = &Show{&ShowBasic{Command: VariableSession, Filter: yyDollar[4].showFilterUnion()}}
 		}
 		yyVAL.union = yyLOCAL
 	case 745:
-		yyDollar = yyS[yypt-5 : yypt+1]
+		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Statement
 //line sql.y:4110
 		{
-			yyLOCAL = &Show{&ShowBasic{Command: TableStatus, DbName: yyDollar[4].identifierCS, Filter: yyDollar[5].showFilterUnion()}}
+			yyLOCAL = &Show{&ShowBasic{Command: VariableGlobal, Filter: yyDollar[4].showFilterUnion()}}
 		}
 		yyVAL.union = yyLOCAL
 	case 746:
@@ -15806,15 +15769,15 @@ yydefault:
 		var yyLOCAL Statement
 //line sql.y:4114
 		{
-			yyLOCAL = &Show{&ShowBasic{Command: Table, Full: yyDollar[2].booleanUnion(), DbName: yyDollar[4].identifierCS, Filter: yyDollar[5].showFilterUnion()}}
+			yyLOCAL = &Show{&ShowBasic{Command: TableStatus, DbName: yyDollar[4].identifierCS, Filter: yyDollar[5].showFilterUnion()}}
 		}
 		yyVAL.union = yyLOCAL
 	case 747:
-		yyDollar = yyS[yypt-4 : yypt+1]
+		yyDollar = yyS[yypt-5 : yypt+1]
 		var yyLOCAL Statement
 //line sql.y:4118
 		{
-			yyLOCAL = &Show{&ShowBasic{Command: Trigger, DbName: yyDollar[3].identifierCS, Filter: yyDollar[4].showFilterUnion()}}
+			yyLOCAL = &Show{&ShowBasic{Command: Table, Full: yyDollar[2].booleanUnion(), DbName: yyDollar[4].identifierCS, Filter: yyDollar[5].showFilterUnion()}}
 		}
 		yyVAL.union = yyLOCAL
 	case 748:
@@ -15822,7 +15785,7 @@ yydefault:
 		var yyLOCAL Statement
 //line sql.y:4122
 		{
-			yyLOCAL = &Show{&ShowCreate{Command: CreateDb, Op: yyDollar[4].tableName}}
+			yyLOCAL = &Show{&ShowBasic{Command: Trigger, DbName: yyDollar[3].identifierCS, Filter: yyDollar[4].showFilterUnion()}}
 		}
 		yyVAL.union = yyLOCAL
 	case 749:
@@ -15830,7 +15793,7 @@ yydefault:
 		var yyLOCAL Statement
 //line sql.y:4126
 		{
-			yyLOCAL = &Show{&ShowCreate{Command: CreateE, Op: yyDollar[4].tableName}}
+			yyLOCAL = &Show{&ShowCreate{Command: CreateDb, Op: yyDollar[4].tableName}}
 		}
 		yyVAL.union = yyLOCAL
 	case 750:
@@ -15838,7 +15801,7 @@ yydefault:
 		var yyLOCAL Statement
 //line sql.y:4130
 		{
-			yyLOCAL = &Show{&ShowCreate{Command: CreateF, Op: yyDollar[4].tableName}}
+			yyLOCAL = &Show{&ShowCreate{Command: CreateE, Op: yyDollar[4].tableName}}
 		}
 		yyVAL.union = yyLOCAL
 	case 751:
@@ -15846,7 +15809,7 @@ yydefault:
 		var yyLOCAL Statement
 //line sql.y:4134
 		{
-			yyLOCAL = &Show{&ShowCreate{Command: CreateProc, Op: yyDollar[4].tableName}}
+			yyLOCAL = &Show{&ShowCreate{Command: CreateF, Op: yyDollar[4].tableName}}
 		}
 		yyVAL.union = yyLOCAL
 	case 752:
@@ -15854,7 +15817,7 @@ yydefault:
 		var yyLOCAL Statement
 //line sql.y:4138
 		{
-			yyLOCAL = &Show{&ShowCreate{Command: CreateTbl, Op: yyDollar[4].tableName}}
+			yyLOCAL = &Show{&ShowCreate{Command: CreateProc, Op: yyDollar[4].tableName}}
 		}
 		yyVAL.union = yyLOCAL
 	case 753:
@@ -15862,7 +15825,7 @@ yydefault:
 		var yyLOCAL Statement
 //line sql.y:4142
 		{
-			yyLOCAL = &Show{&ShowCreate{Command: CreateTr, Op: yyDollar[4].tableName}}
+			yyLOCAL = &Show{&ShowCreate{Command: CreateTbl, Op: yyDollar[4].tableName}}
 		}
 		yyVAL.union = yyLOCAL
 	case 754:
@@ -15870,15 +15833,15 @@ yydefault:
 		var yyLOCAL Statement
 //line sql.y:4146
 		{
-			yyLOCAL = &Show{&ShowCreate{Command: CreateV, Op: yyDollar[4].tableName}}
+			yyLOCAL = &Show{&ShowCreate{Command: CreateTr, Op: yyDollar[4].tableName}}
 		}
 		yyVAL.union = yyLOCAL
 	case 755:
-		yyDollar = yyS[yypt-2 : yypt+1]
+		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Statement
 //line sql.y:4150
 		{
-			yyLOCAL = &Show{&ShowBasic{Command: Engines}}
+			yyLOCAL = &Show{&ShowCreate{Command: CreateV, Op: yyDollar[4].tableName}}
 		}
 		yyVAL.union = yyLOCAL
 	case 756:
@@ -15886,15 +15849,15 @@ yydefault:
 		var yyLOCAL Statement
 //line sql.y:4154
 		{
-			yyLOCAL = &Show{&ShowBasic{Command: Plugins}}
+			yyLOCAL = &Show{&ShowBasic{Command: Engines}}
 		}
 		yyVAL.union = yyLOCAL
 	case 757:
-		yyDollar = yyS[yypt-4 : yypt+1]
+		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL Statement
 //line sql.y:4158
 		{
-			yyLOCAL = &Show{&ShowBasic{Command: GtidExecGlobal, DbName: yyDollar[4].identifierCS}}
+			yyLOCAL = &Show{&ShowBasic{Command: Plugins}}
 		}
 		yyVAL.union = yyLOCAL
 	case 758:
@@ -15902,7 +15865,7 @@ yydefault:
 		var yyLOCAL Statement
 //line sql.y:4162
 		{
-			yyLOCAL = &Show{&ShowBasic{Command: VGtidExecGlobal, DbName: yyDollar[4].identifierCS}}
+			yyLOCAL = &Show{&ShowBasic{Command: GtidExecGlobal, DbName: yyDollar[4].identifierCS}}
 		}
 		yyVAL.union = yyLOCAL
 	case 759:
@@ -15910,7 +15873,7 @@ yydefault:
 		var yyLOCAL Statement
 //line sql.y:4166
 		{
-			yyLOCAL = &Show{&ShowBasic{Command: VitessVariables, Filter: yyDollar[4].showFilterUnion()}}
+			yyLOCAL = &Show{&ShowBasic{Command: VGtidExecGlobal, DbName: yyDollar[4].identifierCS}}
 		}
 		yyVAL.union = yyLOCAL
 	case 760:
@@ -15918,7 +15881,7 @@ yydefault:
 		var yyLOCAL Statement
 //line sql.y:4170
 		{
-			yyLOCAL = &Show{&ShowBasic{Command: VitessMigrations, Filter: yyDollar[4].showFilterUnion(), DbName: yyDollar[3].identifierCS}}
+			yyLOCAL = &Show{&ShowBasic{Command: VitessVariables, Filter: yyDollar[4].showFilterUnion()}}
 		}
 		yyVAL.union = yyLOCAL
 	case 761:
@@ -15926,23 +15889,23 @@ yydefault:
 		var yyLOCAL Statement
 //line sql.y:4174
 		{
-			yyLOCAL = &ShowMigrationLogs{UUID: string(yyDollar[3].str)}
+			yyLOCAL = &Show{&ShowBasic{Command: VitessMigrations, Filter: yyDollar[4].showFilterUnion(), DbName: yyDollar[3].identifierCS}}
 		}
 		yyVAL.union = yyLOCAL
 	case 762:
-		yyDollar = yyS[yypt-2 : yypt+1]
+		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Statement
 //line sql.y:4178
 		{
-			yyLOCAL = &ShowThrottledApps{}
+			yyLOCAL = &ShowMigrationLogs{UUID: string(yyDollar[3].str)}
 		}
 		yyVAL.union = yyLOCAL
 	case 763:
-		yyDollar = yyS[yypt-3 : yypt+1]
+		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL Statement
 //line sql.y:4182
 		{
-			yyLOCAL = &Show{&ShowBasic{Command: VitessReplicationStatus, Filter: yyDollar[3].showFilterUnion()}}
+			yyLOCAL = &ShowThrottledApps{}
 		}
 		yyVAL.union = yyLOCAL
 	case 764:
@@ -15950,7 +15913,7 @@ yydefault:
 		var yyLOCAL Statement
 //line sql.y:4186
 		{
-			yyLOCAL = &ShowThrottlerStatus{}
+			yyLOCAL = &Show{&ShowBasic{Command: VitessReplicationStatus, Filter: yyDollar[3].showFilterUnion()}}
 		}
 		yyVAL.union = yyLOCAL
 	case 765:
@@ -15958,7 +15921,7 @@ yydefault:
 		var yyLOCAL Statement
 //line sql.y:4190
 		{
-			yyLOCAL = &Show{&ShowBasic{Command: VschemaTables}}
+			yyLOCAL = &ShowThrottlerStatus{}
 		}
 		yyVAL.union = yyLOCAL
 	case 766:
@@ -15966,7 +15929,7 @@ yydefault:
 		var yyLOCAL Statement
 //line sql.y:4194
 		{
-			yyLOCAL = &Show{&ShowBasic{Command: VschemaKeyspaces}}
+			yyLOCAL = &Show{&ShowBasic{Command: VschemaTables}}
 		}
 		yyVAL.union = yyLOCAL
 	case 767:
@@ -15974,31 +15937,31 @@ yydefault:
 		var yyLOCAL Statement
 //line sql.y:4198
 		{
-			yyLOCAL = &Show{&ShowBasic{Command: VschemaVindexes}}
+			yyLOCAL = &Show{&ShowBasic{Command: VschemaKeyspaces}}
 		}
 		yyVAL.union = yyLOCAL
 	case 768:
-		yyDollar = yyS[yypt-5 : yypt+1]
+		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL Statement
 //line sql.y:4202
 		{
-			yyLOCAL = &Show{&ShowBasic{Command: VschemaVindexes, Tbl: yyDollar[5].tableName}}
+			yyLOCAL = &Show{&ShowBasic{Command: VschemaVindexes}}
 		}
 		yyVAL.union = yyLOCAL
 	case 769:
-		yyDollar = yyS[yypt-2 : yypt+1]
+		yyDollar = yyS[yypt-5 : yypt+1]
 		var yyLOCAL Statement
 //line sql.y:4206
 		{
-			yyLOCAL = &Show{&ShowBasic{Command: Warnings}}
+			yyLOCAL = &Show{&ShowBasic{Command: VschemaVindexes, Tbl: yyDollar[5].tableName}}
 		}
 		yyVAL.union = yyLOCAL
 	case 770:
-		yyDollar = yyS[yypt-3 : yypt+1]
+		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL Statement
 //line sql.y:4210
 		{
-			yyLOCAL = &Show{&ShowBasic{Command: VitessShards, Filter: yyDollar[3].showFilterUnion()}}
+			yyLOCAL = &Show{&ShowBasic{Command: Warnings}}
 		}
 		yyVAL.union = yyLOCAL
 	case 771:
@@ -16006,31 +15969,31 @@ yydefault:
 		var yyLOCAL Statement
 //line sql.y:4214
 		{
-			yyLOCAL = &Show{&ShowBasic{Command: VitessTablets, Filter: yyDollar[3].showFilterUnion()}}
+			yyLOCAL = &Show{&ShowBasic{Command: VitessShards, Filter: yyDollar[3].showFilterUnion()}}
 		}
 		yyVAL.union = yyLOCAL
 	case 772:
-		yyDollar = yyS[yypt-2 : yypt+1]
+		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL Statement
 //line sql.y:4218
 		{
-			yyLOCAL = &Show{&ShowBasic{Command: VitessTarget}}
+			yyLOCAL = &Show{&ShowBasic{Command: VitessTablets, Filter: yyDollar[3].showFilterUnion()}}
 		}
 		yyVAL.union = yyLOCAL
 	case 773:
-		yyDollar = yyS[yypt-3 : yypt+1]
+		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL Statement
-//line sql.y:4225
+//line sql.y:4222
 		{
-			yyLOCAL = &Show{&ShowOther{Command: string(yyDollar[2].identifierCI.String())}}
+			yyLOCAL = &Show{&ShowBasic{Command: VitessTarget}}
 		}
 		yyVAL.union = yyLOCAL
 	case 774:
-		yyDollar = yyS[yypt-4 : yypt+1]
+		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL Statement
 //line sql.y:4229
 		{
-			yyLOCAL = &Show{&ShowOther{Command: string(yyDollar[2].str) + " " + string(yyDollar[3].str)}}
+			yyLOCAL = &Show{&ShowOther{Command: string(yyDollar[2].identifierCI.String())}}
 		}
 		yyVAL.union = yyLOCAL
 	case 775:
@@ -16038,7 +16001,7 @@ yydefault:
 		var yyLOCAL Statement
 //line sql.y:4233
 		{
-			yyLOCAL = &Show{&ShowOther{Command: string(yyDollar[2].str) + " " + yyDollar[3].identifierCI.String()}}
+			yyLOCAL = &Show{&ShowOther{Command: string(yyDollar[2].str) + " " + string(yyDollar[3].str)}}
 		}
 		yyVAL.union = yyLOCAL
 	case 776:
@@ -16046,23 +16009,23 @@ yydefault:
 		var yyLOCAL Statement
 //line sql.y:4237
 		{
-			yyLOCAL = &Show{&ShowOther{Command: string(yyDollar[2].str) + " " + string(yyDollar[3].str)}}
+			yyLOCAL = &Show{&ShowOther{Command: string(yyDollar[2].str) + " " + yyDollar[3].identifierCI.String()}}
 		}
 		yyVAL.union = yyLOCAL
 	case 777:
-		yyDollar = yyS[yypt-3 : yypt+1]
+		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Statement
 //line sql.y:4241
 		{
-			yyLOCAL = &Show{&ShowOther{Command: string(yyDollar[2].str)}}
+			yyLOCAL = &Show{&ShowOther{Command: string(yyDollar[2].str) + " " + string(yyDollar[3].str)}}
 		}
 		yyVAL.union = yyLOCAL
 	case 778:
-		yyDollar = yyS[yypt-4 : yypt+1]
+		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL Statement
 //line sql.y:4245
 		{
-			yyLOCAL = &Show{&ShowOther{Command: string(yyDollar[2].str) + " " + string(yyDollar[3].str) + " " + String(yyDollar[4].tableName)}}
+			yyLOCAL = &Show{&ShowOther{Command: string(yyDollar[2].str)}}
 		}
 		yyVAL.union = yyLOCAL
 	case 779:
@@ -16074,89 +16037,91 @@ yydefault:
 		}
 		yyVAL.union = yyLOCAL
 	case 780:
-		yyDollar = yyS[yypt-5 : yypt+1]
+		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Statement
 //line sql.y:4253
 		{
-			yyLOCAL = &Show{&ShowOther{Command: string(yyDollar[3].str)}}
+			yyLOCAL = &Show{&ShowOther{Command: string(yyDollar[2].str) + " " + string(yyDollar[3].str) + " " + String(yyDollar[4].tableName)}}
 		}
 		yyVAL.union = yyLOCAL
 	case 781:
-		yyDollar = yyS[yypt-3 : yypt+1]
+		yyDollar = yyS[yypt-5 : yypt+1]
 		var yyLOCAL Statement
 //line sql.y:4257
 		{
-			yyLOCAL = &Show{&ShowOther{Command: string(yyDollar[2].str)}}
+			yyLOCAL = &Show{&ShowOther{Command: string(yyDollar[3].str)}}
 		}
 		yyVAL.union = yyLOCAL
 	case 782:
-		yyDollar = yyS[yypt-5 : yypt+1]
+		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL Statement
 //line sql.y:4261
 		{
-			yyLOCAL = &Show{&ShowTransactionStatus{TransactionID: string(yyDollar[5].str)}}
+			yyLOCAL = &Show{&ShowOther{Command: string(yyDollar[2].str)}}
 		}
 		yyVAL.union = yyLOCAL
 	case 783:
-		yyDollar = yyS[yypt-3 : yypt+1]
+		yyDollar = yyS[yypt-5 : yypt+1]
 		var yyLOCAL Statement
 //line sql.y:4265
 		{
-			yyLOCAL = &Show{&ShowTransactionStatus{}}
+			yyLOCAL = &Show{&ShowTransactionStatus{TransactionID: string(yyDollar[5].str)}}
 		}
 		yyVAL.union = yyLOCAL
 	case 784:
-		yyDollar = yyS[yypt-5 : yypt+1]
+		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL Statement
 //line sql.y:4269
 		{
-			yyLOCAL = &Show{&ShowTransactionStatus{Keyspace: yyDollar[5].identifierCS.String()}}
+			yyLOCAL = &Show{&ShowTransactionStatus{}}
 		}
 		yyVAL.union = yyLOCAL
 	case 785:
-		yyDollar = yyS[yypt-0 : yypt+1]
-//line sql.y:4274
+		yyDollar = yyS[yypt-5 : yypt+1]
+		var yyLOCAL Statement
+//line sql.y:4273
 		{
+			yyLOCAL = &Show{&ShowTransactionStatus{Keyspace: yyDollar[5].identifierCS.String()}}
 		}
+		yyVAL.union = yyLOCAL
 	case 786:
-		yyDollar = yyS[yypt-1 : yypt+1]
-//line sql.y:4276
+		yyDollar = yyS[yypt-0 : yypt+1]
+//line sql.y:4278
 		{
 		}
 	case 787:
-		yyDollar = yyS[yypt-0 : yypt+1]
+		yyDollar = yyS[yypt-1 : yypt+1]
 //line sql.y:4280
 		{
-			yyVAL.str = ""
 		}
 	case 788:
-		yyDollar = yyS[yypt-1 : yypt+1]
+		yyDollar = yyS[yypt-0 : yypt+1]
 //line sql.y:4284
 		{
-			yyVAL.str = "extended "
+			yyVAL.str = ""
 		}
 	case 789:
-		yyDollar = yyS[yypt-0 : yypt+1]
-		var yyLOCAL bool
-//line sql.y:4290
+		yyDollar = yyS[yypt-1 : yypt+1]
+//line sql.y:4288
 		{
-			yyLOCAL = false
+			yyVAL.str = "extended "
 		}
-		yyVAL.union = yyLOCAL
 	case 790:
-		yyDollar = yyS[yypt-1 : yypt+1]
+		yyDollar = yyS[yypt-0 : yypt+1]
 		var yyLOCAL bool
 //line sql.y:4294
 		{
-			yyLOCAL = true
+			yyLOCAL = false
 		}
 		yyVAL.union = yyLOCAL
 	case 791:
 		yyDollar = yyS[yypt-1 : yypt+1]
-//line sql.y:4300
+		var yyLOCAL bool
+//line sql.y:4298
 		{
-			yyVAL.str = string(yyDollar[1].str)
+			yyLOCAL = true
 		}
+		yyVAL.union = yyLOCAL
 	case 792:
 		yyDollar = yyS[yypt-1 : yypt+1]
 //line sql.y:4304
@@ -16164,16 +16129,16 @@ yydefault:
 			yyVAL.str = string(yyDollar[1].str)
 		}
 	case 793:
-		yyDollar = yyS[yypt-0 : yypt+1]
-//line sql.y:4310
+		yyDollar = yyS[yypt-1 : yypt+1]
+//line sql.y:4308
 		{
-			yyVAL.identifierCS = NewIdentifierCS("")
+			yyVAL.str = string(yyDollar[1].str)
 		}
 	case 794:
-		yyDollar = yyS[yypt-2 : yypt+1]
+		yyDollar = yyS[yypt-0 : yypt+1]
 //line sql.y:4314
 		{
-			yyVAL.identifierCS = yyDollar[2].identifierCS
+			yyVAL.identifierCS = NewIdentifierCS("")
 		}
 	case 795:
 		yyDollar = yyS[yypt-2 : yypt+1]
@@ -16182,53 +16147,53 @@ yydefault:
 			yyVAL.identifierCS = yyDollar[2].identifierCS
 		}
 	case 796:
+		yyDollar = yyS[yypt-2 : yypt+1]
+//line sql.y:4322
+		{
+			yyVAL.identifierCS = yyDollar[2].identifierCS
+		}
+	case 797:
 		yyDollar = yyS[yypt-0 : yypt+1]
 		var yyLOCAL *ShowFilter
-//line sql.y:4324
+//line sql.y:4328
 		{
 			yyLOCAL = nil
 		}
 		yyVAL.union = yyLOCAL
-	case 797:
+	case 798:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL *ShowFilter
-//line sql.y:4328
+//line sql.y:4332
 		{
 			yyLOCAL = &ShowFilter{Like: string(yyDollar[2].str)}
 		}
 		yyVAL.union = yyLOCAL
-	case 798:
+	case 799:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL *ShowFilter
-//line sql.y:4332
+//line sql.y:4336
 		{
 			yyLOCAL = &ShowFilter{Filter: yyDollar[2].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 799:
+	case 800:
 		yyDollar = yyS[yypt-0 : yypt+1]
 		var yyLOCAL *ShowFilter
-//line sql.y:4338
+//line sql.y:4342
 		{
 			yyLOCAL = nil
 		}
 		yyVAL.union = yyLOCAL
-	case 800:
+	case 801:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL *ShowFilter
-//line sql.y:4342
+//line sql.y:4346
 		{
 			yyLOCAL = &ShowFilter{Like: string(yyDollar[2].str)}
 		}
 		yyVAL.union = yyLOCAL
-	case 801:
-		yyDollar = yyS[yypt-0 : yypt+1]
-//line sql.y:4348
-		{
-			yyVAL.empty = struct{}{}
-		}
 	case 802:
-		yyDollar = yyS[yypt-1 : yypt+1]
+		yyDollar = yyS[yypt-0 : yypt+1]
 //line sql.y:4352
 		{
 			yyVAL.empty = struct{}{}
@@ -16241,9 +16206,9 @@ yydefault:
 		}
 	case 804:
 		yyDollar = yyS[yypt-1 : yypt+1]
-//line sql.y:4362
+//line sql.y:4360
 		{
-			yyVAL.str = string(yyDollar[1].str)
+			yyVAL.empty = struct{}{}
 		}
 	case 805:
 		yyDollar = yyS[yypt-1 : yypt+1]
@@ -16252,202 +16217,200 @@ yydefault:
 			yyVAL.str = string(yyDollar[1].str)
 		}
 	case 806:
+		yyDollar = yyS[yypt-1 : yypt+1]
+//line sql.y:4370
+		{
+			yyVAL.str = string(yyDollar[1].str)
+		}
+	case 807:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL Statement
-//line sql.y:4372
+//line sql.y:4376
 		{
 			yyLOCAL = &Use{DBName: yyDollar[2].identifierCS}
 		}
 		yyVAL.union = yyLOCAL
-	case 807:
+	case 808:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL Statement
-//line sql.y:4376
+//line sql.y:4380
 		{
 			yyLOCAL = &Use{DBName: IdentifierCS{v: ""}}
 		}
 		yyVAL.union = yyLOCAL
-	case 808:
+	case 809:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL Statement
-//line sql.y:4380
+//line sql.y:4384
 		{
 			yyLOCAL = &Use{DBName: NewIdentifierCS(yyDollar[2].identifierCS.String() + "@" + string(yyDollar[3].str))}
 		}
 		yyVAL.union = yyLOCAL
-	case 809:
-		yyDollar = yyS[yypt-1 : yypt+1]
-//line sql.y:4387
-		{
-			yyVAL.identifierCS = NewIdentifierCS(string(yyDollar[1].str))
-		}
 	case 810:
 		yyDollar = yyS[yypt-1 : yypt+1]
 //line sql.y:4391
 		{
-			yyVAL.identifierCS = NewIdentifierCS("@" + string(yyDollar[1].str))
+			yyVAL.identifierCS = NewIdentifierCS(string(yyDollar[1].str))
 		}
 	case 811:
 		yyDollar = yyS[yypt-1 : yypt+1]
 //line sql.y:4395
 		{
-			yyVAL.identifierCS = NewIdentifierCS("@@" + string(yyDollar[1].str))
+			yyVAL.identifierCS = NewIdentifierCS("@" + string(yyDollar[1].str))
 		}
 	case 812:
 		yyDollar = yyS[yypt-1 : yypt+1]
 //line sql.y:4399
 		{
-			yyVAL.identifierCS = NewIdentifierCS(string(yyDollar[1].str))
+			yyVAL.identifierCS = NewIdentifierCS("@@" + string(yyDollar[1].str))
 		}
 	case 813:
 		yyDollar = yyS[yypt-1 : yypt+1]
+//line sql.y:4403
+		{
+			yyVAL.identifierCS = NewIdentifierCS(string(yyDollar[1].str))
+		}
+	case 814:
+		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL Statement
-//line sql.y:4406
+//line sql.y:4410
 		{
 			yyLOCAL = &Begin{}
 		}
 		yyVAL.union = yyLOCAL
-	case 814:
+	case 815:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL Statement
-//line sql.y:4410
+//line sql.y:4414
 		{
 			yyLOCAL = &Begin{TxAccessModes: yyDollar[3].txAccessModesUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 815:
+	case 816:
 		yyDollar = yyS[yypt-0 : yypt+1]
 		var yyLOCAL []TxAccessMode
-//line sql.y:4415
+//line sql.y:4419
 		{
 			yyLOCAL = nil
 		}
 		yyVAL.union = yyLOCAL
-	case 816:
+	case 817:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL []TxAccessMode
-//line sql.y:4419
+//line sql.y:4423
 		{
 			yyLOCAL = yyDollar[1].txAccessModesUnion()
 		}
 		yyVAL.union = yyLOCAL
-	case 817:
+	case 818:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL []TxAccessMode
-//line sql.y:4425
+//line sql.y:4429
 		{
 			yyLOCAL = []TxAccessMode{yyDollar[1].txAccessModeUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 818:
+	case 819:
 		yyDollar = yyS[yypt-3 : yypt+1]
-//line sql.y:4429
+//line sql.y:4433
 		{
 			yySLICE := (*[]TxAccessMode)(yyIaddr(yyVAL.union))
 			*yySLICE = append(*yySLICE, yyDollar[3].txAccessModeUnion())
 		}
-	case 819:
+	case 820:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL TxAccessMode
-//line sql.y:4435
+//line sql.y:4439
 		{
 			yyLOCAL = WithConsistentSnapshot
 		}
 		yyVAL.union = yyLOCAL
-	case 820:
+	case 821:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL TxAccessMode
-//line sql.y:4439
+//line sql.y:4443
 		{
 			yyLOCAL = ReadWrite
 		}
 		yyVAL.union = yyLOCAL
-	case 821:
+	case 822:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL TxAccessMode
-//line sql.y:4443
+//line sql.y:4447
 		{
 			yyLOCAL = ReadOnly
 		}
 		yyVAL.union = yyLOCAL
-	case 822:
+	case 823:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL Statement
-//line sql.y:4450
+//line sql.y:4454
 		{
 			yyLOCAL = &Commit{}
 		}
 		yyVAL.union = yyLOCAL
-	case 823:
+	case 824:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL Statement
-//line sql.y:4456
+//line sql.y:4460
 		{
 			yyLOCAL = &Rollback{}
 		}
 		yyVAL.union = yyLOCAL
-	case 824:
+	case 825:
 		yyDollar = yyS[yypt-5 : yypt+1]
 		var yyLOCAL Statement
-//line sql.y:4460
+//line sql.y:4464
 		{
 			yyLOCAL = &SRollback{Name: yyDollar[5].identifierCI}
 		}
 		yyVAL.union = yyLOCAL
-	case 825:
+	case 826:
 		yyDollar = yyS[yypt-0 : yypt+1]
-//line sql.y:4465
+//line sql.y:4469
 		{
 			yyVAL.empty = struct{}{}
 		}
-	case 826:
+	case 827:
 		yyDollar = yyS[yypt-1 : yypt+1]
-//line sql.y:4467
+//line sql.y:4471
 		{
 			yyVAL.empty = struct{}{}
 		}
-	case 827:
+	case 828:
 		yyDollar = yyS[yypt-0 : yypt+1]
-//line sql.y:4470
+//line sql.y:4474
 		{
 			yyVAL.empty = struct{}{}
 		}
-	case 828:
+	case 829:
 		yyDollar = yyS[yypt-1 : yypt+1]
-//line sql.y:4472
+//line sql.y:4476
 		{
 			yyVAL.empty = struct{}{}
 		}
-	case 829:
+	case 830:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL Statement
-//line sql.y:4476
+//line sql.y:4480
 		{
 			yyLOCAL = &Savepoint{Name: yyDollar[2].identifierCI}
 		}
 		yyVAL.union = yyLOCAL
-	case 830:
+	case 831:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL Statement
-//line sql.y:4482
+//line sql.y:4486
 		{
 			yyLOCAL = &Release{Name: yyDollar[3].identifierCI}
 		}
 		yyVAL.union = yyLOCAL
-	case 831:
-		yyDollar = yyS[yypt-0 : yypt+1]
-		var yyLOCAL ExplainType
-//line sql.y:4487
-		{
-			yyLOCAL = EmptyType
-		}
-		yyVAL.union = yyLOCAL
 	case 832:
-		yyDollar = yyS[yypt-3 : yypt+1]
+		yyDollar = yyS[yypt-0 : yypt+1]
 		var yyLOCAL ExplainType
 //line sql.y:4491
 		{
-			yyLOCAL = JSONType
+			yyLOCAL = EmptyType
 		}
 		yyVAL.union = yyLOCAL
 	case 833:
@@ -16455,7 +16418,7 @@ yydefault:
 		var yyLOCAL ExplainType
 //line sql.y:4495
 		{
-			yyLOCAL = TreeType
+			yyLOCAL = JSONType
 		}
 		yyVAL.union = yyLOCAL
 	case 834:
@@ -16463,27 +16426,27 @@ yydefault:
 		var yyLOCAL ExplainType
 //line sql.y:4499
 		{
-			yyLOCAL = TraditionalType
+			yyLOCAL = TreeType
 		}
 		yyVAL.union = yyLOCAL
 	case 835:
-		yyDollar = yyS[yypt-1 : yypt+1]
+		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL ExplainType
 //line sql.y:4503
 		{
-			yyLOCAL = AnalyzeType
+			yyLOCAL = TraditionalType
 		}
 		yyVAL.union = yyLOCAL
 	case 836:
-		yyDollar = yyS[yypt-0 : yypt+1]
-		var yyLOCAL VExplainType
-//line sql.y:4508
+		yyDollar = yyS[yypt-1 : yypt+1]
+		var yyLOCAL ExplainType
+//line sql.y:4507
 		{
-			yyLOCAL = PlanVExplainType
+			yyLOCAL = AnalyzeType
 		}
 		yyVAL.union = yyLOCAL
 	case 837:
-		yyDollar = yyS[yypt-1 : yypt+1]
+		yyDollar = yyS[yypt-0 : yypt+1]
 		var yyLOCAL VExplainType
 //line sql.y:4512
 		{
@@ -16495,7 +16458,7 @@ yydefault:
 		var yyLOCAL VExplainType
 //line sql.y:4516
 		{
-			yyLOCAL = AllVExplainType
+			yyLOCAL = PlanVExplainType
 		}
 		yyVAL.union = yyLOCAL
 	case 839:
@@ -16503,7 +16466,7 @@ yydefault:
 		var yyLOCAL VExplainType
 //line sql.y:4520
 		{
-			yyLOCAL = QueriesVExplainType
+			yyLOCAL = AllVExplainType
 		}
 		yyVAL.union = yyLOCAL
 	case 840:
@@ -16511,7 +16474,7 @@ yydefault:
 		var yyLOCAL VExplainType
 //line sql.y:4524
 		{
-			yyLOCAL = TraceVExplainType
+			yyLOCAL = QueriesVExplainType
 		}
 		yyVAL.union = yyLOCAL
 	case 841:
@@ -16519,15 +16482,17 @@ yydefault:
 		var yyLOCAL VExplainType
 //line sql.y:4528
 		{
-			yyLOCAL = KeysVExplainType
+			yyLOCAL = TraceVExplainType
 		}
 		yyVAL.union = yyLOCAL
 	case 842:
 		yyDollar = yyS[yypt-1 : yypt+1]
-//line sql.y:4534
+		var yyLOCAL VExplainType
+//line sql.y:4532
 		{
-			yyVAL.str = yyDollar[1].str
+			yyLOCAL = KeysVExplainType
 		}
+		yyVAL.union = yyLOCAL
 	case 843:
 		yyDollar = yyS[yypt-1 : yypt+1]
 //line sql.y:4538
@@ -16542,18 +16507,16 @@ yydefault:
 		}
 	case 845:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		var yyLOCAL Statement
-//line sql.y:4548
+//line sql.y:4546
 		{
-			yyLOCAL = yyDollar[1].tableStmtUnion()
+			yyVAL.str = yyDollar[1].str
 		}
-		yyVAL.union = yyLOCAL
 	case 846:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL Statement
 //line sql.y:4552
 		{
-			yyLOCAL = yyDollar[1].statementUnion()
+			yyLOCAL = yyDollar[1].tableStmtUnion()
 		}
 		yyVAL.union = yyLOCAL
 	case 847:
@@ -16573,208 +16536,210 @@ yydefault:
 		}
 		yyVAL.union = yyLOCAL
 	case 849:
-		yyDollar = yyS[yypt-0 : yypt+1]
-//line sql.y:4565
+		yyDollar = yyS[yypt-1 : yypt+1]
+		var yyLOCAL Statement
+//line sql.y:4564
 		{
-			yyVAL.str = ""
+			yyLOCAL = yyDollar[1].statementUnion()
 		}
+		yyVAL.union = yyLOCAL
 	case 850:
-		yyDollar = yyS[yypt-1 : yypt+1]
+		yyDollar = yyS[yypt-0 : yypt+1]
 //line sql.y:4569
 		{
-			yyVAL.str = yyDollar[1].identifierCI.val
+			yyVAL.str = ""
 		}
 	case 851:
 		yyDollar = yyS[yypt-1 : yypt+1]
 //line sql.y:4573
 		{
-			yyVAL.str = encodeSQLString(yyDollar[1].str)
+			yyVAL.str = yyDollar[1].identifierCI.val
 		}
 	case 852:
+		yyDollar = yyS[yypt-1 : yypt+1]
+//line sql.y:4577
+		{
+			yyVAL.str = encodeSQLString(yyDollar[1].str)
+		}
+	case 853:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Statement
-//line sql.y:4579
+//line sql.y:4583
 		{
 			yyLOCAL = &ExplainTab{Table: yyDollar[3].tableName, Wild: yyDollar[4].str}
 		}
 		yyVAL.union = yyLOCAL
-	case 853:
+	case 854:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Statement
-//line sql.y:4583
+//line sql.y:4587
 		{
 			yyLOCAL = &ExplainStmt{Type: yyDollar[3].explainTypeUnion(), Statement: yyDollar[4].statementUnion(), Comments: Comments(yyDollar[2].strs).Parsed()}
 		}
 		yyVAL.union = yyLOCAL
-	case 854:
+	case 855:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Statement
-//line sql.y:4589
+//line sql.y:4593
 		{
 			yyLOCAL = &VExplainStmt{Type: yyDollar[3].vexplainTypeUnion(), Statement: yyDollar[4].statementUnion(), Comments: Comments(yyDollar[2].strs).Parsed()}
 		}
 		yyVAL.union = yyLOCAL
-	case 855:
+	case 856:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL Statement
-//line sql.y:4595
+//line sql.y:4599
 		{
 			yyLOCAL = &OtherAdmin{}
 		}
 		yyVAL.union = yyLOCAL
-	case 856:
+	case 857:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL Statement
-//line sql.y:4599
+//line sql.y:4603
 		{
 			yyLOCAL = &OtherAdmin{}
 		}
 		yyVAL.union = yyLOCAL
-	case 857:
+	case 858:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL Statement
-//line sql.y:4605
+//line sql.y:4609
 		{
 			yyLOCAL = &LockTables{Tables: yyDollar[3].tableAndLockTypesUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 858:
+	case 859:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL TableAndLockTypes
-//line sql.y:4611
+//line sql.y:4615
 		{
 			yyLOCAL = TableAndLockTypes{yyDollar[1].tableAndLockTypeUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 859:
+	case 860:
 		yyDollar = yyS[yypt-3 : yypt+1]
-//line sql.y:4615
+//line sql.y:4619
 		{
 			yySLICE := (*TableAndLockTypes)(yyIaddr(yyVAL.union))
 			*yySLICE = append(*yySLICE, yyDollar[3].tableAndLockTypeUnion())
 		}
-	case 860:
+	case 861:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL *TableAndLockType
-//line sql.y:4621
+//line sql.y:4625
 		{
 			yyLOCAL = &TableAndLockType{Table: yyDollar[1].aliasedTableNameUnion(), Lock: yyDollar[2].lockTypeUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 861:
+	case 862:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL LockType
-//line sql.y:4627
+//line sql.y:4631
 		{
 			yyLOCAL = Read
 		}
 		yyVAL.union = yyLOCAL
-	case 862:
+	case 863:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL LockType
-//line sql.y:4631
+//line sql.y:4635
 		{
 			yyLOCAL = ReadLocal
 		}
 		yyVAL.union = yyLOCAL
-	case 863:
+	case 864:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL LockType
-//line sql.y:4635
+//line sql.y:4639
 		{
 			yyLOCAL = Write
 		}
 		yyVAL.union = yyLOCAL
-	case 864:
+	case 865:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL LockType
-//line sql.y:4639
+//line sql.y:4643
 		{
 			yyLOCAL = LowPriorityWrite
 		}
 		yyVAL.union = yyLOCAL
-	case 865:
+	case 866:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL Statement
-//line sql.y:4645
+//line sql.y:4649
 		{
 			yyLOCAL = &UnlockTables{}
 		}
 		yyVAL.union = yyLOCAL
-	case 866:
+	case 867:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Statement
-//line sql.y:4651
+//line sql.y:4655
 		{
 			yyLOCAL = &RevertMigration{Comments: Comments(yyDollar[2].strs).Parsed(), UUID: string(yyDollar[4].str)}
 		}
 		yyVAL.union = yyLOCAL
-	case 867:
+	case 868:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL Statement
-//line sql.y:4657
+//line sql.y:4661
 		{
 			yyLOCAL = &Flush{IsLocal: yyDollar[2].booleanUnion(), FlushOptions: yyDollar[3].strs}
 		}
 		yyVAL.union = yyLOCAL
-	case 868:
+	case 869:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL Statement
-//line sql.y:4661
+//line sql.y:4665
 		{
 			yyLOCAL = &Flush{IsLocal: yyDollar[2].booleanUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 869:
+	case 870:
 		yyDollar = yyS[yypt-6 : yypt+1]
 		var yyLOCAL Statement
-//line sql.y:4665
+//line sql.y:4669
 		{
 			yyLOCAL = &Flush{IsLocal: yyDollar[2].booleanUnion(), WithLock: true}
 		}
 		yyVAL.union = yyLOCAL
-	case 870:
+	case 871:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Statement
-//line sql.y:4669
+//line sql.y:4673
 		{
 			yyLOCAL = &Flush{IsLocal: yyDollar[2].booleanUnion(), TableNames: yyDollar[4].tableNamesUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 871:
+	case 872:
 		yyDollar = yyS[yypt-7 : yypt+1]
 		var yyLOCAL Statement
-//line sql.y:4673
+//line sql.y:4677
 		{
 			yyLOCAL = &Flush{IsLocal: yyDollar[2].booleanUnion(), TableNames: yyDollar[4].tableNamesUnion(), WithLock: true}
 		}
 		yyVAL.union = yyLOCAL
-	case 872:
+	case 873:
 		yyDollar = yyS[yypt-6 : yypt+1]
 		var yyLOCAL Statement
-//line sql.y:4677
+//line sql.y:4681
 		{
 			yyLOCAL = &Flush{IsLocal: yyDollar[2].booleanUnion(), TableNames: yyDollar[4].tableNamesUnion(), ForExport: true}
 		}
 		yyVAL.union = yyLOCAL
-	case 873:
+	case 874:
 		yyDollar = yyS[yypt-1 : yypt+1]
-//line sql.y:4683
+//line sql.y:4687
 		{
 			yyVAL.strs = []string{yyDollar[1].str}
 		}
-	case 874:
+	case 875:
 		yyDollar = yyS[yypt-3 : yypt+1]
-//line sql.y:4687
+//line sql.y:4691
 		{
 			yyVAL.strs = append(yyDollar[1].strs, yyDollar[3].str)
 		}
-	case 875:
-		yyDollar = yyS[yypt-2 : yypt+1]
-//line sql.y:4693
-		{
-			yyVAL.str = string(yyDollar[1].str) + " " + string(yyDollar[2].str)
-		}
 	case 876:
 		yyDollar = yyS[yypt-2 : yypt+1]
 //line sql.y:4697
@@ -16794,10 +16759,10 @@ yydefault:
 			yyVAL.str = string(yyDollar[1].str) + " " + string(yyDollar[2].str)
 		}
 	case 879:
-		yyDollar = yyS[yypt-1 : yypt+1]
+		yyDollar = yyS[yypt-2 : yypt+1]
 //line sql.y:4709
 		{
-			yyVAL.str = string(yyDollar[1].str)
+			yyVAL.str = string(yyDollar[1].str) + " " + string(yyDollar[2].str)
 		}
 	case 880:
 		yyDollar = yyS[yypt-1 : yypt+1]
@@ -16812,22 +16777,22 @@ yydefault:
 			yyVAL.str = string(yyDollar[1].str)
 		}
 	case 882:
-		yyDollar = yyS[yypt-3 : yypt+1]
+		yyDollar = yyS[yypt-1 : yypt+1]
 //line sql.y:4721
 		{
-			yyVAL.str = string(yyDollar[1].str) + " " + string(yyDollar[2].str) + yyDollar[3].str
+			yyVAL.str = string(yyDollar[1].str)
 		}
 	case 883:
-		yyDollar = yyS[yypt-2 : yypt+1]
+		yyDollar = yyS[yypt-3 : yypt+1]
 //line sql.y:4725
 		{
-			yyVAL.str = string(yyDollar[1].str) + " " + string(yyDollar[2].str)
+			yyVAL.str = string(yyDollar[1].str) + " " + string(yyDollar[2].str) + yyDollar[3].str
 		}
 	case 884:
-		yyDollar = yyS[yypt-1 : yypt+1]
+		yyDollar = yyS[yypt-2 : yypt+1]
 //line sql.y:4729
 		{
-			yyVAL.str = string(yyDollar[1].str)
+			yyVAL.str = string(yyDollar[1].str) + " " + string(yyDollar[2].str)
 		}
 	case 885:
 		yyDollar = yyS[yypt-1 : yypt+1]
@@ -16842,144 +16807,150 @@ yydefault:
 			yyVAL.str = string(yyDollar[1].str)
 		}
 	case 887:
+		yyDollar = yyS[yypt-1 : yypt+1]
+//line sql.y:4741
+		{
+			yyVAL.str = string(yyDollar[1].str)
+		}
+	case 888:
 		yyDollar = yyS[yypt-0 : yypt+1]
 		var yyLOCAL bool
-//line sql.y:4742
+//line sql.y:4746
 		{
 			yyLOCAL = false
 		}
 		yyVAL.union = yyLOCAL
-	case 888:
+	case 889:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL bool
-//line sql.y:4746
+//line sql.y:4750
 		{
 			yyLOCAL = true
 		}
 		yyVAL.union = yyLOCAL
-	case 889:
+	case 890:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL bool
-//line sql.y:4750
+//line sql.y:4754
 		{
 			yyLOCAL = true
 		}
 		yyVAL.union = yyLOCAL
-	case 890:
+	case 891:
 		yyDollar = yyS[yypt-0 : yypt+1]
-//line sql.y:4755
+//line sql.y:4759
 		{
 			yyVAL.str = ""
 		}
-	case 891:
+	case 892:
 		yyDollar = yyS[yypt-3 : yypt+1]
-//line sql.y:4759
+//line sql.y:4763
 		{
 			yyVAL.str = " " + string(yyDollar[1].str) + " " + string(yyDollar[2].str) + " " + yyDollar[3].identifierCI.String()
 		}
-	case 892:
+	case 893:
 		yyDollar = yyS[yypt-0 : yypt+1]
-//line sql.y:4764
+//line sql.y:4768
 		{
 			setAllowComments(yylex, true)
 		}
-	case 893:
+	case 894:
 		yyDollar = yyS[yypt-2 : yypt+1]
-//line sql.y:4768
+//line sql.y:4772
 		{
 			yyVAL.strs = yyDollar[2].strs
 			setAllowComments(yylex, false)
 		}
-	case 894:
+	case 895:
 		yyDollar = yyS[yypt-0 : yypt+1]
-//line sql.y:4774
+//line sql.y:4778
 		{
 			yyVAL.strs = nil
 		}
-	case 895:
+	case 896:
 		yyDollar = yyS[yypt-2 : yypt+1]
-//line sql.y:4778
+//line sql.y:4782
 		{
 			yyVAL.strs = append(yyDollar[1].strs, yyDollar[2].str)
 		}
-	case 896:
+	case 897:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL bool
-//line sql.y:4784
+//line sql.y:4788
 		{
 			yyLOCAL = true
 		}
 		yyVAL.union = yyLOCAL
-	case 897:
+	case 898:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL bool
-//line sql.y:4788
+//line sql.y:4792
 		{
 			yyLOCAL = false
 		}
 		yyVAL.union = yyLOCAL
-	case 898:
+	case 899:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL bool
-//line sql.y:4792
+//line sql.y:4796
 		{
 			yyLOCAL = true
 		}
 		yyVAL.union = yyLOCAL
-	case 899:
+	case 900:
 		yyDollar = yyS[yypt-0 : yypt+1]
-//line sql.y:4797
+//line sql.y:4801
 		{
 			yyVAL.str = ""
 		}
-	case 900:
+	case 901:
 		yyDollar = yyS[yypt-1 : yypt+1]
-//line sql.y:4801
+//line sql.y:4805
 		{
 			yyVAL.str = SQLNoCacheStr
 		}
-	case 901:
+	case 902:
 		yyDollar = yyS[yypt-1 : yypt+1]
-//line sql.y:4805
+//line sql.y:4809
 		{
 			yyVAL.str = SQLCacheStr
 		}
-	case 902:
+	case 903:
 		yyDollar = yyS[yypt-0 : yypt+1]
 		var yyLOCAL bool
-//line sql.y:4810
+//line sql.y:4814
 		{
 			yyLOCAL = false
 		}
 		yyVAL.union = yyLOCAL
-	case 903:
+	case 904:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL bool
-//line sql.y:4814
+//line sql.y:4818
 		{
 			yyLOCAL = true
 		}
 		yyVAL.union = yyLOCAL
-	case 904:
+	case 905:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL bool
-//line sql.y:4818
+//line sql.y:4822
 		{
 			yyLOCAL = true
 		}
 		yyVAL.union = yyLOCAL
-	case 905:
+	case 906:
 		yyDollar = yyS[yypt-5 : yypt+1]
 		var yyLOCAL Statement
-//line sql.y:4824
+//line sql.y:4828
 		{
 			yyLOCAL = &PrepareStmt{Name: yyDollar[3].identifierCI, Comments: Comments(yyDollar[2].strs).Parsed(), Statement: yyDollar[5].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 906:
+	case 907:
 		yyDollar = yyS[yypt-5 : yypt+1]
 		var yyLOCAL Statement
-//line sql.y:4828
+//line sql.y:4832
 		{
 			yyLOCAL = &PrepareStmt{
 				Name:      yyDollar[3].identifierCI,
@@ -16988,87 +16959,81 @@ yydefault:
 			}
 		}
 		yyVAL.union = yyLOCAL
-	case 907:
+	case 908:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Statement
-//line sql.y:4838
+//line sql.y:4842
 		{
 			yyLOCAL = &ExecuteStmt{Name: yyDollar[3].identifierCI, Comments: Comments(yyDollar[2].strs).Parsed(), Arguments: yyDollar[4].variablesUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 908:
+	case 909:
 		yyDollar = yyS[yypt-0 : yypt+1]
 		var yyLOCAL []*Variable
-//line sql.y:4843
+//line sql.y:4847
 		{
 			yyLOCAL = nil
 		}
 		yyVAL.union = yyLOCAL
-	case 909:
+	case 910:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL []*Variable
-//line sql.y:4847
+//line sql.y:4851
 		{
 			yyLOCAL = yyDollar[2].variablesUnion()
 		}
 		yyVAL.union = yyLOCAL
-	case 910:
+	case 911:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Statement
-//line sql.y:4853
+//line sql.y:4857
 		{
 			yyLOCAL = &DeallocateStmt{Comments: Comments(yyDollar[2].strs).Parsed(), Name: yyDollar[4].identifierCI}
 		}
 		yyVAL.union = yyLOCAL
-	case 911:
+	case 912:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Statement
-//line sql.y:4857
+//line sql.y:4861
 		{
 			yyLOCAL = &DeallocateStmt{Comments: Comments(yyDollar[2].strs).Parsed(), Name: yyDollar[4].identifierCI}
 		}
 		yyVAL.union = yyLOCAL
-	case 912:
+	case 913:
 		yyDollar = yyS[yypt-0 : yypt+1]
-//line sql.y:4862
+//line sql.y:4866
 		{
 			yyVAL.strs = nil
 		}
-	case 913:
+	case 914:
 		yyDollar = yyS[yypt-1 : yypt+1]
-//line sql.y:4866
+//line sql.y:4870
 		{
 			yyVAL.strs = yyDollar[1].strs
 		}
-	case 914:
+	case 915:
 		yyDollar = yyS[yypt-1 : yypt+1]
-//line sql.y:4872
+//line sql.y:4876
 		{
 			yyVAL.strs = []string{yyDollar[1].str}
 		}
-	case 915:
+	case 916:
 		yyDollar = yyS[yypt-2 : yypt+1]
-//line sql.y:4876
+//line sql.y:4880
 		{
 			yyVAL.strs = append(yyDollar[1].strs, yyDollar[2].str)
 		}
-	case 916:
-		yyDollar = yyS[yypt-1 : yypt+1]
-//line sql.y:4882
-		{
-			yyVAL.str = SQLNoCacheStr
-		}
 	case 917:
 		yyDollar = yyS[yypt-1 : yypt+1]
 //line sql.y:4886
 		{
-			yyVAL.str = SQLCacheStr
+			yyVAL.str = SQLNoCacheStr
 		}
 	case 918:
 		yyDollar = yyS[yypt-1 : yypt+1]
 //line sql.y:4890
 		{
-			yyVAL.str = DistinctStr
+			yyVAL.str = SQLCacheStr
 		}
 	case 919:
 		yyDollar = yyS[yypt-1 : yypt+1]
@@ -17080,439 +17045,437 @@ yydefault:
 		yyDollar = yyS[yypt-1 : yypt+1]
 //line sql.y:4898
 		{
-			yyVAL.str = HighPriorityStr
+			yyVAL.str = DistinctStr
 		}
 	case 921:
 		yyDollar = yyS[yypt-1 : yypt+1]
 //line sql.y:4902
 		{
-			yyVAL.str = StraightJoinHint
+			yyVAL.str = HighPriorityStr
 		}
 	case 922:
 		yyDollar = yyS[yypt-1 : yypt+1]
 //line sql.y:4906
 		{
-			yyVAL.str = SQLBufferResultStr
+			yyVAL.str = StraightJoinHint
 		}
 	case 923:
 		yyDollar = yyS[yypt-1 : yypt+1]
 //line sql.y:4910
 		{
-			yyVAL.str = SQLSmallResultStr
+			yyVAL.str = SQLBufferResultStr
 		}
 	case 924:
 		yyDollar = yyS[yypt-1 : yypt+1]
 //line sql.y:4914
 		{
-			yyVAL.str = SQLBigResultStr
+			yyVAL.str = SQLSmallResultStr
 		}
 	case 925:
 		yyDollar = yyS[yypt-1 : yypt+1]
 //line sql.y:4918
 		{
-			yyVAL.str = SQLCalcFoundRowsStr
+			yyVAL.str = SQLBigResultStr
 		}
 	case 926:
 		yyDollar = yyS[yypt-1 : yypt+1]
 //line sql.y:4922
 		{
-			yyVAL.str = AllStr // These are not picked up by NewSelect, and so ALL will be dropped. But this is OK, since it's redundant anyway
+			yyVAL.str = SQLCalcFoundRowsStr
 		}
 	case 927:
 		yyDollar = yyS[yypt-1 : yypt+1]
+//line sql.y:4926
+		{
+			yyVAL.str = AllStr // These are not picked up by NewSelect, and so ALL will be dropped. But this is OK, since it's redundant anyway
+		}
+	case 928:
+		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL SelectExprs
-//line sql.y:4928
+//line sql.y:4932
 		{
 			yyLOCAL = SelectExprs{yyDollar[1].selectExprUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 928:
+	case 929:
 		yyDollar = yyS[yypt-3 : yypt+1]
-//line sql.y:4932
+//line sql.y:4936
 		{
 			yySLICE := (*SelectExprs)(yyIaddr(yyVAL.union))
 			*yySLICE = append(*yySLICE, yyDollar[3].selectExprUnion())
 		}
-	case 929:
+	case 930:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL SelectExpr
-//line sql.y:4938
+//line sql.y:4942
 		{
 			yyLOCAL = &StarExpr{}
 		}
 		yyVAL.union = yyLOCAL
-	case 930:
+	case 931:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL SelectExpr
-//line sql.y:4942
+//line sql.y:4946
 		{
 			yyLOCAL = &AliasedExpr{Expr: yyDollar[1].exprUnion(), As: yyDollar[2].identifierCI}
 		}
 		yyVAL.union = yyLOCAL
-	case 931:
+	case 932:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL SelectExpr
-//line sql.y:4946
+//line sql.y:4950
 		{
 			yyLOCAL = &StarExpr{TableName: TableName{Name: yyDollar[1].identifierCS}}
 		}
 		yyVAL.union = yyLOCAL
-	case 932:
+	case 933:
 		yyDollar = yyS[yypt-5 : yypt+1]
 		var yyLOCAL SelectExpr
-//line sql.y:4950
+//line sql.y:4954
 		{
 			yyLOCAL = &StarExpr{TableName: TableName{Qualifier: yyDollar[1].identifierCS, Name: yyDollar[3].identifierCS}}
 		}
 		yyVAL.union = yyLOCAL
-	case 933:
+	case 934:
 		yyDollar = yyS[yypt-0 : yypt+1]
-//line sql.y:4955
+//line sql.y:4959
 		{
 			yyVAL.identifierCI = IdentifierCI{}
 		}
-	case 934:
+	case 935:
 		yyDollar = yyS[yypt-1 : yypt+1]
-//line sql.y:4959
+//line sql.y:4963
 		{
 			yyVAL.identifierCI = yyDollar[1].identifierCI
 		}
-	case 935:
+	case 936:
 		yyDollar = yyS[yypt-2 : yypt+1]
-//line sql.y:4963
+//line sql.y:4967
 		{
 			yyVAL.identifierCI = yyDollar[2].identifierCI
 		}
-	case 937:
+	case 938:
 		yyDollar = yyS[yypt-1 : yypt+1]
-//line sql.y:4970
+//line sql.y:4974
 		{
 			yyVAL.identifierCI = NewIdentifierCI(string(yyDollar[1].str))
 		}
-	case 938:
+	case 939:
 		yyDollar = yyS[yypt-0 : yypt+1]
 		var yyLOCAL TableExprs
-//line sql.y:4975
+//line sql.y:4979
 		{
 			yyLOCAL = TableExprs{&AliasedTableExpr{Expr: TableName{Name: NewIdentifierCS("dual")}}}
 		}
 		yyVAL.union = yyLOCAL
-	case 939:
+	case 940:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL TableExprs
-//line sql.y:4979
+//line sql.y:4983
 		{
 			yyLOCAL = yyDollar[1].tableExprsUnion()
 		}
 		yyVAL.union = yyLOCAL
-	case 940:
+	case 941:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL TableExprs
-//line sql.y:4985
+//line sql.y:4989
 		{
 			yyLOCAL = yyDollar[2].tableExprsUnion()
 		}
 		yyVAL.union = yyLOCAL
-	case 941:
+	case 942:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL TableExprs
-//line sql.y:4991
+//line sql.y:4995
 		{
 			yyLOCAL = TableExprs{yyDollar[1].tableExprUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 942:
+	case 943:
 		yyDollar = yyS[yypt-3 : yypt+1]
-//line sql.y:4995
+//line sql.y:4999
 		{
 			yySLICE := (*TableExprs)(yyIaddr(yyVAL.union))
 			*yySLICE = append(*yySLICE, yyDollar[3].tableExprUnion())
 		}
-	case 945:
+	case 946:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL TableExpr
-//line sql.y:5005
+//line sql.y:5009
 		{
 			yyLOCAL = yyDollar[1].aliasedTableNameUnion()
 		}
 		yyVAL.union = yyLOCAL
-	case 946:
+	case 947:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL TableExpr
-//line sql.y:5009
+//line sql.y:5013
 		{
 			yyLOCAL = &AliasedTableExpr{Expr: yyDollar[1].derivedTableUnion(), As: yyDollar[3].identifierCS, Columns: yyDollar[4].columnsUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 947:
+	case 948:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL TableExpr
-//line sql.y:5013
+//line sql.y:5017
 		{
 			yyLOCAL = &ParenTableExpr{Exprs: yyDollar[2].tableExprsUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 948:
+	case 949:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL TableExpr
-//line sql.y:5017
+//line sql.y:5021
 		{
 			yyLOCAL = yyDollar[1].tableExprUnion()
 		}
 		yyVAL.union = yyLOCAL
-	case 949:
+	case 950:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL *DerivedTable
-//line sql.y:5023
+//line sql.y:5027
 		{
 			yyLOCAL = &DerivedTable{Lateral: false, Select: yyDollar[1].tableStmtUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 950:
+	case 951:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL *DerivedTable
-//line sql.y:5027
+//line sql.y:5031
 		{
 			yyLOCAL = &DerivedTable{Lateral: true, Select: yyDollar[2].tableStmtUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 951:
+	case 952:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL *AliasedTableExpr
-//line sql.y:5033
+//line sql.y:5037
 		{
 			yyLOCAL = &AliasedTableExpr{Expr: yyDollar[1].tableName, As: yyDollar[2].identifierCS, Hints: yyDollar[3].indexHintsUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 952:
+	case 953:
 		yyDollar = yyS[yypt-7 : yypt+1]
 		var yyLOCAL *AliasedTableExpr
-//line sql.y:5037
+//line sql.y:5041
 		{
 			yyLOCAL = &AliasedTableExpr{Expr: yyDollar[1].tableName, Partitions: yyDollar[4].partitionsUnion(), As: yyDollar[6].identifierCS, Hints: yyDollar[7].indexHintsUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 953:
+	case 954:
 		yyDollar = yyS[yypt-0 : yypt+1]
 		var yyLOCAL Columns
-//line sql.y:5042
+//line sql.y:5046
 		{
 			yyLOCAL = nil
 		}
 		yyVAL.union = yyLOCAL
-	case 954:
+	case 955:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL Columns
-//line sql.y:5046
+//line sql.y:5050
 		{
 			yyLOCAL = yyDollar[2].columnsUnion()
 		}
 		yyVAL.union = yyLOCAL
-	case 955:
+	case 956:
 		yyDollar = yyS[yypt-0 : yypt+1]
 		var yyLOCAL Columns
-//line sql.y:5051
+//line sql.y:5055
 		{
 			yyLOCAL = nil
 		}
 		yyVAL.union = yyLOCAL
-	case 956:
+	case 957:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL Columns
-//line sql.y:5055
+//line sql.y:5059
 		{
 			yyLOCAL = yyDollar[1].columnsUnion()
 		}
 		yyVAL.union = yyLOCAL
-	case 957:
+	case 958:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL Columns
-//line sql.y:5061
+//line sql.y:5065
 		{
 			yyLOCAL = Columns{yyDollar[1].identifierCI}
 		}
 		yyVAL.union = yyLOCAL
-	case 958:
+	case 959:
 		yyDollar = yyS[yypt-3 : yypt+1]
-//line sql.y:5065
+//line sql.y:5069
 		{
 			yySLICE := (*Columns)(yyIaddr(yyVAL.union))
 			*yySLICE = append(*yySLICE, yyDollar[3].identifierCI)
 		}
-	case 959:
+	case 960:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL []*Variable
-//line sql.y:5071
+//line sql.y:5075
 		{
 			yyLOCAL = []*Variable{yyDollar[1].variableUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 960:
+	case 961:
 		yyDollar = yyS[yypt-3 : yypt+1]
-//line sql.y:5075
+//line sql.y:5079
 		{
 			yySLICE := (*[]*Variable)(yyIaddr(yyVAL.union))
 			*yySLICE = append(*yySLICE, yyDollar[3].variableUnion())
 		}
-	case 961:
+	case 962:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL Columns
-//line sql.y:5081
+//line sql.y:5085
 		{
 			yyLOCAL = Columns{yyDollar[1].identifierCI}
 		}
 		yyVAL.union = yyLOCAL
-	case 962:
+	case 963:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL Columns
-//line sql.y:5085
+//line sql.y:5089
 		{
 			yyLOCAL = Columns{NewIdentifierCI(string(yyDollar[1].str))}
 		}
 		yyVAL.union = yyLOCAL
-	case 963:
+	case 964:
 		yyDollar = yyS[yypt-3 : yypt+1]
-//line sql.y:5089
+//line sql.y:5093
 		{
 			yySLICE := (*Columns)(yyIaddr(yyVAL.union))
 			*yySLICE = append(*yySLICE, yyDollar[3].identifierCI)
 		}
-	case 964:
+	case 965:
 		yyDollar = yyS[yypt-3 : yypt+1]
-//line sql.y:5093
+//line sql.y:5097
 		{
 			yySLICE := (*Columns)(yyIaddr(yyVAL.union))
 			*yySLICE = append(*yySLICE, NewIdentifierCI(string(yyDollar[3].str)))
 		}
-	case 965:
+	case 966:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL Partitions
-//line sql.y:5099
+//line sql.y:5103
 		{
 			yyLOCAL = Partitions{yyDollar[1].identifierCI}
 		}
 		yyVAL.union = yyLOCAL
-	case 966:
+	case 967:
 		yyDollar = yyS[yypt-3 : yypt+1]
-//line sql.y:5103
+//line sql.y:5107
 		{
 			yySLICE := (*Partitions)(yyIaddr(yyVAL.union))
 			*yySLICE = append(*yySLICE, yyDollar[3].identifierCI)
 		}
-	case 967:
+	case 968:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL TableExpr
-//line sql.y:5116
+//line sql.y:5120
 		{
 			yyLOCAL = &JoinTableExpr{LeftExpr: yyDollar[1].tableExprUnion(), Join: yyDollar[2].joinTypeUnion(), RightExpr: yyDollar[3].tableExprUnion(), Condition: yyDollar[4].joinCondition}
 		}
 		yyVAL.union = yyLOCAL
-	case 968:
+	case 969:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL TableExpr
-//line sql.y:5120
+//line sql.y:5124
 		{
 			yyLOCAL = &JoinTableExpr{LeftExpr: yyDollar[1].tableExprUnion(), Join: yyDollar[2].joinTypeUnion(), RightExpr: yyDollar[3].tableExprUnion(), Condition: yyDollar[4].joinCondition}
 		}
 		yyVAL.union = yyLOCAL
-	case 969:
+	case 970:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL TableExpr
-//line sql.y:5124
+//line sql.y:5128
 		{
 			yyLOCAL = &JoinTableExpr{LeftExpr: yyDollar[1].tableExprUnion(), Join: yyDollar[2].joinTypeUnion(), RightExpr: yyDollar[3].tableExprUnion(), Condition: yyDollar[4].joinCondition}
 		}
 		yyVAL.union = yyLOCAL
-	case 970:
+	case 971:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL TableExpr
-//line sql.y:5128
+//line sql.y:5132
 		{
 			yyLOCAL = &JoinTableExpr{LeftExpr: yyDollar[1].tableExprUnion(), Join: yyDollar[2].joinTypeUnion(), RightExpr: yyDollar[3].tableExprUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 971:
+	case 972:
 		yyDollar = yyS[yypt-2 : yypt+1]
-//line sql.y:5134
+//line sql.y:5138
 		{
 			yyVAL.joinCondition = &JoinCondition{On: yyDollar[2].exprUnion()}
 		}
-	case 972:
+	case 973:
 		yyDollar = yyS[yypt-4 : yypt+1]
-//line sql.y:5136
+//line sql.y:5140
 		{
 			yyVAL.joinCondition = &JoinCondition{Using: yyDollar[3].columnsUnion()}
 		}
-	case 973:
+	case 974:
 		yyDollar = yyS[yypt-0 : yypt+1]
-//line sql.y:5140
+//line sql.y:5144
 		{
 			yyVAL.joinCondition = &JoinCondition{}
 		}
-	case 974:
+	case 975:
 		yyDollar = yyS[yypt-1 : yypt+1]
-//line sql.y:5142
+//line sql.y:5146
 		{
 			yyVAL.joinCondition = yyDollar[1].joinCondition
 		}
-	case 975:
+	case 976:
 		yyDollar = yyS[yypt-0 : yypt+1]
-//line sql.y:5146
+//line sql.y:5150
 		{
 			yyVAL.joinCondition = &JoinCondition{}
 		}
-	case 976:
+	case 977:
 		yyDollar = yyS[yypt-2 : yypt+1]
-//line sql.y:5148
+//line sql.y:5152
 		{
 			yyVAL.joinCondition = &JoinCondition{On: yyDollar[2].exprUnion()}
 		}
-	case 977:
+	case 978:
 		yyDollar = yyS[yypt-0 : yypt+1]
-//line sql.y:5151
+//line sql.y:5155
 		{
 			yyVAL.empty = struct{}{}
 		}
-	case 978:
+	case 979:
 		yyDollar = yyS[yypt-1 : yypt+1]
-//line sql.y:5153
+//line sql.y:5157
 		{
 			yyVAL.empty = struct{}{}
 		}
-	case 979:
+	case 980:
 		yyDollar = yyS[yypt-0 : yypt+1]
-//line sql.y:5156
+//line sql.y:5160
 		{
 			yyVAL.identifierCS = NewIdentifierCS("")
 		}
-	case 980:
+	case 981:
 		yyDollar = yyS[yypt-1 : yypt+1]
-//line sql.y:5160
+//line sql.y:5164
 		{
 			yyVAL.identifierCS = yyDollar[1].identifierCS
 		}
-	case 981:
+	case 982:
 		yyDollar = yyS[yypt-2 : yypt+1]
-//line sql.y:5164
+//line sql.y:5168
 		{
 			yyVAL.identifierCS = yyDollar[2].identifierCS
 		}
-	case 983:
-		yyDollar = yyS[yypt-1 : yypt+1]
-//line sql.y:5171
-		{
-			yyVAL.identifierCS = NewIdentifierCS(string(yyDollar[1].str))
-		}
 	case 984:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		var yyLOCAL JoinType
-//line sql.y:5177
+//line sql.y:5175
 		{
-			yyLOCAL = NormalJoinType
+			yyVAL.identifierCS = NewIdentifierCS(string(yyDollar[1].str))
 		}
-		yyVAL.union = yyLOCAL
 	case 985:
-		yyDollar = yyS[yypt-2 : yypt+1]
+		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL JoinType
 //line sql.y:5181
 		{
@@ -17528,23 +17491,23 @@ yydefault:
 		}
 		yyVAL.union = yyLOCAL
 	case 987:
-		yyDollar = yyS[yypt-1 : yypt+1]
+		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL JoinType
-//line sql.y:5191
+//line sql.y:5189
 		{
-			yyLOCAL = StraightJoinType
+			yyLOCAL = NormalJoinType
 		}
 		yyVAL.union = yyLOCAL
 	case 988:
-		yyDollar = yyS[yypt-2 : yypt+1]
+		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL JoinType
-//line sql.y:5197
+//line sql.y:5195
 		{
-			yyLOCAL = LeftJoinType
+			yyLOCAL = StraightJoinType
 		}
 		yyVAL.union = yyLOCAL
 	case 989:
-		yyDollar = yyS[yypt-3 : yypt+1]
+		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL JoinType
 //line sql.y:5201
 		{
@@ -17552,15 +17515,15 @@ yydefault:
 		}
 		yyVAL.union = yyLOCAL
 	case 990:
-		yyDollar = yyS[yypt-2 : yypt+1]
+		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL JoinType
 //line sql.y:5205
 		{
-			yyLOCAL = RightJoinType
+			yyLOCAL = LeftJoinType
 		}
 		yyVAL.union = yyLOCAL
 	case 991:
-		yyDollar = yyS[yypt-3 : yypt+1]
+		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL JoinType
 //line sql.y:5209
 		{
@@ -17568,17 +17531,25 @@ yydefault:
 		}
 		yyVAL.union = yyLOCAL
 	case 992:
-		yyDollar = yyS[yypt-2 : yypt+1]
+		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL JoinType
-//line sql.y:5215
+//line sql.y:5213
 		{
-			yyLOCAL = NaturalJoinType
+			yyLOCAL = RightJoinType
 		}
 		yyVAL.union = yyLOCAL
 	case 993:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL JoinType
 //line sql.y:5219
+		{
+			yyLOCAL = NaturalJoinType
+		}
+		yyVAL.union = yyLOCAL
+	case 994:
+		yyDollar = yyS[yypt-2 : yypt+1]
+		var yyLOCAL JoinType
+//line sql.y:5223
 		{
 			if yyDollar[2].joinTypeUnion() == LeftJoinType {
 				yyLOCAL = NaturalLeftJoinType
@@ -17587,267 +17558,259 @@ yydefault:
 			}
 		}
 		yyVAL.union = yyLOCAL
-	case 994:
+	case 995:
 		yyDollar = yyS[yypt-2 : yypt+1]
-//line sql.y:5229
+//line sql.y:5233
 		{
 			yyVAL.tableName = yyDollar[2].tableName
 		}
-	case 995:
+	case 996:
 		yyDollar = yyS[yypt-1 : yypt+1]
-//line sql.y:5233
+//line sql.y:5237
 		{
 			yyVAL.tableName = yyDollar[1].tableName
 		}
-	case 996:
+	case 997:
 		yyDollar = yyS[yypt-1 : yypt+1]
-//line sql.y:5239
+//line sql.y:5243
 		{
 			yyVAL.tableName = TableName{Name: yyDollar[1].identifierCS}
 		}
-	case 997:
+	case 998:
 		yyDollar = yyS[yypt-3 : yypt+1]
-//line sql.y:5243
+//line sql.y:5247
 		{
 			yyVAL.tableName = TableName{Qualifier: yyDollar[1].identifierCS, Name: yyDollar[3].identifierCS}
 		}
-	case 998:
+	case 999:
 		yyDollar = yyS[yypt-3 : yypt+1]
-//line sql.y:5249
+//line sql.y:5253
 		{
 			yyVAL.tableName = TableName{Name: yyDollar[1].identifierCS}
 		}
-	case 999:
+	case 1000:
 		yyDollar = yyS[yypt-0 : yypt+1]
 		var yyLOCAL IndexHints
-//line sql.y:5254
+//line sql.y:5258
 		{
 			yyLOCAL = nil
 		}
 		yyVAL.union = yyLOCAL
-	case 1000:
+	case 1001:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL IndexHints
-//line sql.y:5258
+//line sql.y:5262
 		{
 			yyLOCAL = yyDollar[1].indexHintsUnion()
 		}
 		yyVAL.union = yyLOCAL
-	case 1001:
+	case 1002:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL IndexHints
-//line sql.y:5264
+//line sql.y:5268
 		{
 			yyLOCAL = IndexHints{yyDollar[1].indexHintUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1002:
+	case 1003:
 		yyDollar = yyS[yypt-2 : yypt+1]
-//line sql.y:5268
+//line sql.y:5272
 		{
 			yySLICE := (*IndexHints)(yyIaddr(yyVAL.union))
 			*yySLICE = append(*yySLICE, yyDollar[2].indexHintUnion())
 		}
-	case 1003:
+	case 1004:
 		yyDollar = yyS[yypt-6 : yypt+1]
 		var yyLOCAL *IndexHint
-//line sql.y:5274
+//line sql.y:5278
 		{
 			yyLOCAL = &IndexHint{Type: UseOp, ForType: yyDollar[3].indexHintForTypeUnion(), Indexes: yyDollar[5].columnsUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1004:
+	case 1005:
 		yyDollar = yyS[yypt-5 : yypt+1]
 		var yyLOCAL *IndexHint
-//line sql.y:5278
+//line sql.y:5282
 		{
 			yyLOCAL = &IndexHint{Type: UseOp, ForType: yyDollar[3].indexHintForTypeUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1005:
+	case 1006:
 		yyDollar = yyS[yypt-6 : yypt+1]
 		var yyLOCAL *IndexHint
-//line sql.y:5282
+//line sql.y:5286
 		{
 			yyLOCAL = &IndexHint{Type: IgnoreOp, ForType: yyDollar[3].indexHintForTypeUnion(), Indexes: yyDollar[5].columnsUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1006:
+	case 1007:
 		yyDollar = yyS[yypt-6 : yypt+1]
 		var yyLOCAL *IndexHint
-//line sql.y:5286
+//line sql.y:5290
 		{
 			yyLOCAL = &IndexHint{Type: ForceOp, ForType: yyDollar[3].indexHintForTypeUnion(), Indexes: yyDollar[5].columnsUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1007:
+	case 1008:
 		yyDollar = yyS[yypt-5 : yypt+1]
 		var yyLOCAL *IndexHint
-//line sql.y:5290
+//line sql.y:5294
 		{
 			yyLOCAL = &IndexHint{Type: UseVindexOp, Indexes: yyDollar[4].columnsUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1008:
+	case 1009:
 		yyDollar = yyS[yypt-5 : yypt+1]
 		var yyLOCAL *IndexHint
-//line sql.y:5294
+//line sql.y:5298
 		{
 			yyLOCAL = &IndexHint{Type: IgnoreVindexOp, Indexes: yyDollar[4].columnsUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1009:
+	case 1010:
 		yyDollar = yyS[yypt-0 : yypt+1]
 		var yyLOCAL IndexHintForType
-//line sql.y:5299
+//line sql.y:5303
 		{
 			yyLOCAL = NoForType
 		}
 		yyVAL.union = yyLOCAL
-	case 1010:
+	case 1011:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL IndexHintForType
-//line sql.y:5303
+//line sql.y:5307
 		{
 			yyLOCAL = JoinForType
 		}
 		yyVAL.union = yyLOCAL
-	case 1011:
+	case 1012:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL IndexHintForType
-//line sql.y:5307
+//line sql.y:5311
 		{
 			yyLOCAL = OrderByForType
 		}
 		yyVAL.union = yyLOCAL
-	case 1012:
+	case 1013:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL IndexHintForType
-//line sql.y:5311
+//line sql.y:5315
 		{
 			yyLOCAL = GroupByForType
 		}
 		yyVAL.union = yyLOCAL
-	case 1013:
+	case 1014:
 		yyDollar = yyS[yypt-0 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:5317
+//line sql.y:5321
 		{
 			yyLOCAL = nil
 		}
 		yyVAL.union = yyLOCAL
-	case 1014:
+	case 1015:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:5321
+//line sql.y:5325
 		{
 			yyLOCAL = yyDollar[2].exprUnion()
 		}
 		yyVAL.union = yyLOCAL
-	case 1015:
+	case 1016:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:5328
+//line sql.y:5332
 		{
 			yyLOCAL = &OrExpr{Left: yyDollar[1].exprUnion(), Right: yyDollar[3].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1016:
+	case 1017:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:5332
+//line sql.y:5336
 		{
 			yyLOCAL = &XorExpr{Left: yyDollar[1].exprUnion(), Right: yyDollar[3].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1017:
+	case 1018:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:5336
+//line sql.y:5340
 		{
 			yyLOCAL = &AndExpr{Left: yyDollar[1].exprUnion(), Right: yyDollar[3].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1018:
+	case 1019:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:5340
+//line sql.y:5344
 		{
 			yyLOCAL = &NotExpr{Expr: yyDollar[2].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1019:
+	case 1020:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:5344
+//line sql.y:5348
 		{
 			yyLOCAL = &IsExpr{Left: yyDollar[1].exprUnion(), Right: yyDollar[3].isExprOperatorUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1020:
+	case 1021:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:5348
+//line sql.y:5352
 		{
 			yyLOCAL = yyDollar[1].exprUnion()
 		}
 		yyVAL.union = yyLOCAL
-	case 1021:
+	case 1022:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:5352
+//line sql.y:5356
 		{
 			yyLOCAL = &AssignmentExpr{Left: yyDollar[1].variableUnion(), Right: yyDollar[3].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1022:
+	case 1023:
 		yyDollar = yyS[yypt-6 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:5356
+//line sql.y:5360
 		{
 			yyLOCAL = &MemberOfExpr{Value: yyDollar[1].exprUnion(), JSONArr: yyDollar[5].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1023:
-		yyDollar = yyS[yypt-1 : yypt+1]
-//line sql.y:5362
-		{
-		}
 	case 1024:
 		yyDollar = yyS[yypt-1 : yypt+1]
-//line sql.y:5365
+//line sql.y:5366
 		{
 		}
 	case 1025:
-		yyDollar = yyS[yypt-3 : yypt+1]
-		var yyLOCAL Expr
-//line sql.y:5370
+		yyDollar = yyS[yypt-1 : yypt+1]
+//line sql.y:5369
 		{
-			yyLOCAL = &IsExpr{Left: yyDollar[1].exprUnion(), Right: IsNullOp}
 		}
-		yyVAL.union = yyLOCAL
 	case 1026:
-		yyDollar = yyS[yypt-4 : yypt+1]
+		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL Expr
 //line sql.y:5374
 		{
-			yyLOCAL = &IsExpr{Left: yyDollar[1].exprUnion(), Right: IsNotNullOp}
+			yyLOCAL = &IsExpr{Left: yyDollar[1].exprUnion(), Right: IsNullOp}
 		}
 		yyVAL.union = yyLOCAL
 	case 1027:
-		yyDollar = yyS[yypt-3 : yypt+1]
+		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Expr
 //line sql.y:5378
 		{
-			yyLOCAL = &ComparisonExpr{Left: yyDollar[1].exprUnion(), Operator: yyDollar[2].comparisonExprOperatorUnion(), Right: yyDollar[3].exprUnion()}
+			yyLOCAL = &IsExpr{Left: yyDollar[1].exprUnion(), Right: IsNotNullOp}
 		}
 		yyVAL.union = yyLOCAL
 	case 1028:
-		yyDollar = yyS[yypt-4 : yypt+1]
+		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL Expr
 //line sql.y:5382
 		{
-			yyLOCAL = &ComparisonExpr{Left: yyDollar[1].exprUnion(), Operator: yyDollar[2].comparisonExprOperatorUnion(), Modifier: Any, Right: yyDollar[4].subqueryUnion()}
+			yyLOCAL = &ComparisonExpr{Left: yyDollar[1].exprUnion(), Operator: yyDollar[2].comparisonExprOperatorUnion(), Right: yyDollar[3].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
 	case 1029:
@@ -17863,129 +17826,129 @@ yydefault:
 		var yyLOCAL Expr
 //line sql.y:5390
 		{
-			yyLOCAL = &ComparisonExpr{Left: yyDollar[1].exprUnion(), Operator: yyDollar[2].comparisonExprOperatorUnion(), Modifier: All, Right: yyDollar[4].subqueryUnion()}
+			yyLOCAL = &ComparisonExpr{Left: yyDollar[1].exprUnion(), Operator: yyDollar[2].comparisonExprOperatorUnion(), Modifier: Any, Right: yyDollar[4].subqueryUnion()}
 		}
 		yyVAL.union = yyLOCAL
 	case 1031:
-		yyDollar = yyS[yypt-1 : yypt+1]
+		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Expr
 //line sql.y:5394
 		{
-			yyLOCAL = yyDollar[1].exprUnion()
+			yyLOCAL = &ComparisonExpr{Left: yyDollar[1].exprUnion(), Operator: yyDollar[2].comparisonExprOperatorUnion(), Modifier: All, Right: yyDollar[4].subqueryUnion()}
 		}
 		yyVAL.union = yyLOCAL
 	case 1032:
-		yyDollar = yyS[yypt-3 : yypt+1]
+		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:5400
+//line sql.y:5398
 		{
-			yyLOCAL = &ComparisonExpr{Left: yyDollar[1].exprUnion(), Operator: InOp, Right: yyDollar[3].colTupleUnion()}
+			yyLOCAL = yyDollar[1].exprUnion()
 		}
 		yyVAL.union = yyLOCAL
 	case 1033:
-		yyDollar = yyS[yypt-4 : yypt+1]
+		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL Expr
 //line sql.y:5404
 		{
-			yyLOCAL = &ComparisonExpr{Left: yyDollar[1].exprUnion(), Operator: NotInOp, Right: yyDollar[4].colTupleUnion()}
+			yyLOCAL = &ComparisonExpr{Left: yyDollar[1].exprUnion(), Operator: InOp, Right: yyDollar[3].colTupleUnion()}
 		}
 		yyVAL.union = yyLOCAL
 	case 1034:
-		yyDollar = yyS[yypt-5 : yypt+1]
+		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Expr
 //line sql.y:5408
 		{
-			yyLOCAL = &BetweenExpr{Left: yyDollar[1].exprUnion(), IsBetween: true, From: yyDollar[3].exprUnion(), To: yyDollar[5].exprUnion()}
+			yyLOCAL = &ComparisonExpr{Left: yyDollar[1].exprUnion(), Operator: NotInOp, Right: yyDollar[4].colTupleUnion()}
 		}
 		yyVAL.union = yyLOCAL
 	case 1035:
-		yyDollar = yyS[yypt-6 : yypt+1]
+		yyDollar = yyS[yypt-5 : yypt+1]
 		var yyLOCAL Expr
 //line sql.y:5412
 		{
-			yyLOCAL = &BetweenExpr{Left: yyDollar[1].exprUnion(), IsBetween: false, From: yyDollar[4].exprUnion(), To: yyDollar[6].exprUnion()}
+			yyLOCAL = &BetweenExpr{Left: yyDollar[1].exprUnion(), IsBetween: true, From: yyDollar[3].exprUnion(), To: yyDollar[5].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
 	case 1036:
-		yyDollar = yyS[yypt-3 : yypt+1]
+		yyDollar = yyS[yypt-6 : yypt+1]
 		var yyLOCAL Expr
 //line sql.y:5416
 		{
-			yyLOCAL = &ComparisonExpr{Left: yyDollar[1].exprUnion(), Operator: LikeOp, Right: yyDollar[3].exprUnion()}
+			yyLOCAL = &BetweenExpr{Left: yyDollar[1].exprUnion(), IsBetween: false, From: yyDollar[4].exprUnion(), To: yyDollar[6].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
 	case 1037:
-		yyDollar = yyS[yypt-4 : yypt+1]
+		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL Expr
 //line sql.y:5420
 		{
-			yyLOCAL = &ComparisonExpr{Left: yyDollar[1].exprUnion(), Operator: NotLikeOp, Right: yyDollar[4].exprUnion()}
+			yyLOCAL = &ComparisonExpr{Left: yyDollar[1].exprUnion(), Operator: LikeOp, Right: yyDollar[3].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
 	case 1038:
-		yyDollar = yyS[yypt-5 : yypt+1]
+		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Expr
 //line sql.y:5424
 		{
-			yyLOCAL = &ComparisonExpr{Left: yyDollar[1].exprUnion(), Operator: LikeOp, Right: yyDollar[3].exprUnion(), Escape: yyDollar[5].exprUnion()}
+			yyLOCAL = &ComparisonExpr{Left: yyDollar[1].exprUnion(), Operator: NotLikeOp, Right: yyDollar[4].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
 	case 1039:
-		yyDollar = yyS[yypt-6 : yypt+1]
+		yyDollar = yyS[yypt-5 : yypt+1]
 		var yyLOCAL Expr
 //line sql.y:5428
 		{
-			yyLOCAL = &ComparisonExpr{Left: yyDollar[1].exprUnion(), Operator: NotLikeOp, Right: yyDollar[4].exprUnion(), Escape: yyDollar[6].exprUnion()}
+			yyLOCAL = &ComparisonExpr{Left: yyDollar[1].exprUnion(), Operator: LikeOp, Right: yyDollar[3].exprUnion(), Escape: yyDollar[5].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
 	case 1040:
-		yyDollar = yyS[yypt-3 : yypt+1]
+		yyDollar = yyS[yypt-6 : yypt+1]
 		var yyLOCAL Expr
 //line sql.y:5432
 		{
-			yyLOCAL = &ComparisonExpr{Left: yyDollar[1].exprUnion(), Operator: RegexpOp, Right: yyDollar[3].exprUnion()}
+			yyLOCAL = &ComparisonExpr{Left: yyDollar[1].exprUnion(), Operator: NotLikeOp, Right: yyDollar[4].exprUnion(), Escape: yyDollar[6].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
 	case 1041:
-		yyDollar = yyS[yypt-4 : yypt+1]
+		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL Expr
 //line sql.y:5436
 		{
-			yyLOCAL = &ComparisonExpr{Left: yyDollar[1].exprUnion(), Operator: NotRegexpOp, Right: yyDollar[4].exprUnion()}
+			yyLOCAL = &ComparisonExpr{Left: yyDollar[1].exprUnion(), Operator: RegexpOp, Right: yyDollar[3].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
 	case 1042:
-		yyDollar = yyS[yypt-1 : yypt+1]
+		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Expr
 //line sql.y:5440
 		{
-			yyLOCAL = yyDollar[1].exprUnion()
+			yyLOCAL = &ComparisonExpr{Left: yyDollar[1].exprUnion(), Operator: NotRegexpOp, Right: yyDollar[4].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
 	case 1043:
 		yyDollar = yyS[yypt-1 : yypt+1]
-//line sql.y:5446
+		var yyLOCAL Expr
+//line sql.y:5444
 		{
+			yyLOCAL = yyDollar[1].exprUnion()
 		}
+		yyVAL.union = yyLOCAL
 	case 1044:
 		yyDollar = yyS[yypt-1 : yypt+1]
-//line sql.y:5449
+//line sql.y:5450
 		{
 		}
 	case 1045:
-		yyDollar = yyS[yypt-3 : yypt+1]
-		var yyLOCAL Expr
-//line sql.y:5455
+		yyDollar = yyS[yypt-1 : yypt+1]
+//line sql.y:5453
 		{
-			yyLOCAL = &BinaryExpr{Left: yyDollar[1].exprUnion(), Operator: BitOrOp, Right: yyDollar[3].exprUnion()}
 		}
-		yyVAL.union = yyLOCAL
 	case 1046:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL Expr
 //line sql.y:5459
 		{
-			yyLOCAL = &BinaryExpr{Left: yyDollar[1].exprUnion(), Operator: BitAndOp, Right: yyDollar[3].exprUnion()}
+			yyLOCAL = &BinaryExpr{Left: yyDollar[1].exprUnion(), Operator: BitOrOp, Right: yyDollar[3].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
 	case 1047:
@@ -17993,7 +17956,7 @@ yydefault:
 		var yyLOCAL Expr
 //line sql.y:5463
 		{
-			yyLOCAL = &BinaryExpr{Left: yyDollar[1].exprUnion(), Operator: ShiftLeftOp, Right: yyDollar[3].exprUnion()}
+			yyLOCAL = &BinaryExpr{Left: yyDollar[1].exprUnion(), Operator: BitAndOp, Right: yyDollar[3].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
 	case 1048:
@@ -18001,7 +17964,7 @@ yydefault:
 		var yyLOCAL Expr
 //line sql.y:5467
 		{
-			yyLOCAL = &BinaryExpr{Left: yyDollar[1].exprUnion(), Operator: ShiftRightOp, Right: yyDollar[3].exprUnion()}
+			yyLOCAL = &BinaryExpr{Left: yyDollar[1].exprUnion(), Operator: ShiftLeftOp, Right: yyDollar[3].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
 	case 1049:
@@ -18009,7 +17972,7 @@ yydefault:
 		var yyLOCAL Expr
 //line sql.y:5471
 		{
-			yyLOCAL = &BinaryExpr{Left: yyDollar[1].exprUnion(), Operator: PlusOp, Right: yyDollar[3].exprUnion()}
+			yyLOCAL = &BinaryExpr{Left: yyDollar[1].exprUnion(), Operator: ShiftRightOp, Right: yyDollar[3].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
 	case 1050:
@@ -18017,15 +17980,15 @@ yydefault:
 		var yyLOCAL Expr
 //line sql.y:5475
 		{
-			yyLOCAL = &BinaryExpr{Left: yyDollar[1].exprUnion(), Operator: MinusOp, Right: yyDollar[3].exprUnion()}
+			yyLOCAL = &BinaryExpr{Left: yyDollar[1].exprUnion(), Operator: PlusOp, Right: yyDollar[3].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
 	case 1051:
-		yyDollar = yyS[yypt-5 : yypt+1]
+		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL Expr
 //line sql.y:5479
 		{
-			yyLOCAL = &IntervalDateExpr{Syntax: IntervalDateExprBinaryAdd, Date: yyDollar[1].exprUnion(), Unit: yyDollar[5].intervalTypeUnion(), Interval: yyDollar[4].exprUnion()}
+			yyLOCAL = &BinaryExpr{Left: yyDollar[1].exprUnion(), Operator: MinusOp, Right: yyDollar[3].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
 	case 1052:
@@ -18033,15 +17996,15 @@ yydefault:
 		var yyLOCAL Expr
 //line sql.y:5483
 		{
-			yyLOCAL = &IntervalDateExpr{Syntax: IntervalDateExprBinarySub, Date: yyDollar[1].exprUnion(), Unit: yyDollar[5].intervalTypeUnion(), Interval: yyDollar[4].exprUnion()}
+			yyLOCAL = &IntervalDateExpr{Syntax: IntervalDateExprBinaryAdd, Date: yyDollar[1].exprUnion(), Unit: yyDollar[5].intervalTypeUnion(), Interval: yyDollar[4].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
 	case 1053:
-		yyDollar = yyS[yypt-3 : yypt+1]
+		yyDollar = yyS[yypt-5 : yypt+1]
 		var yyLOCAL Expr
 //line sql.y:5487
 		{
-			yyLOCAL = &BinaryExpr{Left: yyDollar[1].exprUnion(), Operator: MultOp, Right: yyDollar[3].exprUnion()}
+			yyLOCAL = &IntervalDateExpr{Syntax: IntervalDateExprBinarySub, Date: yyDollar[1].exprUnion(), Unit: yyDollar[5].intervalTypeUnion(), Interval: yyDollar[4].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
 	case 1054:
@@ -18049,7 +18012,7 @@ yydefault:
 		var yyLOCAL Expr
 //line sql.y:5491
 		{
-			yyLOCAL = &BinaryExpr{Left: yyDollar[1].exprUnion(), Operator: DivOp, Right: yyDollar[3].exprUnion()}
+			yyLOCAL = &BinaryExpr{Left: yyDollar[1].exprUnion(), Operator: MultOp, Right: yyDollar[3].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
 	case 1055:
@@ -18057,7 +18020,7 @@ yydefault:
 		var yyLOCAL Expr
 //line sql.y:5495
 		{
-			yyLOCAL = &BinaryExpr{Left: yyDollar[1].exprUnion(), Operator: ModOp, Right: yyDollar[3].exprUnion()}
+			yyLOCAL = &BinaryExpr{Left: yyDollar[1].exprUnion(), Operator: DivOp, Right: yyDollar[3].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
 	case 1056:
@@ -18065,7 +18028,7 @@ yydefault:
 		var yyLOCAL Expr
 //line sql.y:5499
 		{
-			yyLOCAL = &BinaryExpr{Left: yyDollar[1].exprUnion(), Operator: IntDivOp, Right: yyDollar[3].exprUnion()}
+			yyLOCAL = &BinaryExpr{Left: yyDollar[1].exprUnion(), Operator: ModOp, Right: yyDollar[3].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
 	case 1057:
@@ -18073,7 +18036,7 @@ yydefault:
 		var yyLOCAL Expr
 //line sql.y:5503
 		{
-			yyLOCAL = &BinaryExpr{Left: yyDollar[1].exprUnion(), Operator: ModOp, Right: yyDollar[3].exprUnion()}
+			yyLOCAL = &BinaryExpr{Left: yyDollar[1].exprUnion(), Operator: IntDivOp, Right: yyDollar[3].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
 	case 1058:
@@ -18081,21 +18044,21 @@ yydefault:
 		var yyLOCAL Expr
 //line sql.y:5507
 		{
-			yyLOCAL = &BinaryExpr{Left: yyDollar[1].exprUnion(), Operator: BitXorOp, Right: yyDollar[3].exprUnion()}
+			yyLOCAL = &BinaryExpr{Left: yyDollar[1].exprUnion(), Operator: ModOp, Right: yyDollar[3].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
 	case 1059:
-		yyDollar = yyS[yypt-1 : yypt+1]
+		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL Expr
 //line sql.y:5511
 		{
-			yyLOCAL = yyDollar[1].exprUnion()
+			yyLOCAL = &BinaryExpr{Left: yyDollar[1].exprUnion(), Operator: BitXorOp, Right: yyDollar[3].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
 	case 1060:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:5517
+//line sql.y:5515
 		{
 			yyLOCAL = yyDollar[1].exprUnion()
 		}
@@ -18125,19 +18088,19 @@ yydefault:
 		}
 		yyVAL.union = yyLOCAL
 	case 1064:
-		yyDollar = yyS[yypt-3 : yypt+1]
+		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL Expr
 //line sql.y:5533
 		{
-			yyLOCAL = &CollateExpr{Expr: yyDollar[1].exprUnion(), Collation: yyDollar[3].str}
+			yyLOCAL = yyDollar[1].exprUnion()
 		}
 		yyVAL.union = yyLOCAL
 	case 1065:
-		yyDollar = yyS[yypt-1 : yypt+1]
+		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL Expr
 //line sql.y:5537
 		{
-			yyLOCAL = yyDollar[1].exprUnion()
+			yyLOCAL = &CollateExpr{Expr: yyDollar[1].exprUnion(), Collation: yyDollar[3].str}
 		}
 		yyVAL.union = yyLOCAL
 	case 1066:
@@ -18153,15 +18116,15 @@ yydefault:
 		var yyLOCAL Expr
 //line sql.y:5545
 		{
-			yyLOCAL = yyDollar[1].variableUnion()
+			yyLOCAL = yyDollar[1].exprUnion()
 		}
 		yyVAL.union = yyLOCAL
 	case 1068:
-		yyDollar = yyS[yypt-2 : yypt+1]
+		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL Expr
 //line sql.y:5549
 		{
-			yyLOCAL = yyDollar[2].exprUnion() // TODO: do we really want to ignore unary '+' before any kind of literals?
+			yyLOCAL = yyDollar[1].variableUnion()
 		}
 		yyVAL.union = yyLOCAL
 	case 1069:
@@ -18169,7 +18132,7 @@ yydefault:
 		var yyLOCAL Expr
 //line sql.y:5553
 		{
-			yyLOCAL = &UnaryExpr{Operator: UMinusOp, Expr: yyDollar[2].exprUnion()}
+			yyLOCAL = yyDollar[2].exprUnion() // TODO: do we really want to ignore unary '+' before any kind of literals?
 		}
 		yyVAL.union = yyLOCAL
 	case 1070:
@@ -18177,7 +18140,7 @@ yydefault:
 		var yyLOCAL Expr
 //line sql.y:5557
 		{
-			yyLOCAL = &UnaryExpr{Operator: TildaOp, Expr: yyDollar[2].exprUnion()}
+			yyLOCAL = &UnaryExpr{Operator: UMinusOp, Expr: yyDollar[2].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
 	case 1071:
@@ -18185,15 +18148,15 @@ yydefault:
 		var yyLOCAL Expr
 //line sql.y:5561
 		{
-			yyLOCAL = &UnaryExpr{Operator: BangOp, Expr: yyDollar[2].exprUnion()}
+			yyLOCAL = &UnaryExpr{Operator: TildaOp, Expr: yyDollar[2].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
 	case 1072:
-		yyDollar = yyS[yypt-1 : yypt+1]
+		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL Expr
 //line sql.y:5565
 		{
-			yyLOCAL = yyDollar[1].subqueryUnion()
+			yyLOCAL = &UnaryExpr{Operator: BangOp, Expr: yyDollar[2].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
 	case 1073:
@@ -18201,23 +18164,23 @@ yydefault:
 		var yyLOCAL Expr
 //line sql.y:5569
 		{
-			yyLOCAL = yyDollar[1].exprUnion()
+			yyLOCAL = yyDollar[1].subqueryUnion()
 		}
 		yyVAL.union = yyLOCAL
 	case 1074:
-		yyDollar = yyS[yypt-2 : yypt+1]
+		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL Expr
 //line sql.y:5573
 		{
-			yyLOCAL = &ExistsExpr{Subquery: yyDollar[2].subqueryUnion()}
+			yyLOCAL = yyDollar[1].exprUnion()
 		}
 		yyVAL.union = yyLOCAL
 	case 1075:
-		yyDollar = yyS[yypt-7 : yypt+1]
+		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL Expr
 //line sql.y:5577
 		{
-			yyLOCAL = &MatchExpr{Columns: yyDollar[2].colNamesUnion(), Expr: yyDollar[5].exprUnion(), Option: yyDollar[6].matchExprOptionUnion()}
+			yyLOCAL = &ExistsExpr{Subquery: yyDollar[2].subqueryUnion()}
 		}
 		yyVAL.union = yyLOCAL
 	case 1076:
@@ -18225,15 +18188,15 @@ yydefault:
 		var yyLOCAL Expr
 //line sql.y:5581
 		{
-			yyLOCAL = &CastExpr{Expr: yyDollar[3].exprUnion(), Type: yyDollar[5].convertTypeUnion(), Array: yyDollar[6].booleanUnion()}
+			yyLOCAL = &MatchExpr{Columns: yyDollar[2].colNamesUnion(), Expr: yyDollar[5].exprUnion(), Option: yyDollar[6].matchExprOptionUnion()}
 		}
 		yyVAL.union = yyLOCAL
 	case 1077:
-		yyDollar = yyS[yypt-6 : yypt+1]
+		yyDollar = yyS[yypt-7 : yypt+1]
 		var yyLOCAL Expr
 //line sql.y:5585
 		{
-			yyLOCAL = &ConvertExpr{Expr: yyDollar[3].exprUnion(), Type: yyDollar[5].convertTypeUnion()}
+			yyLOCAL = &CastExpr{Expr: yyDollar[3].exprUnion(), Type: yyDollar[5].convertTypeUnion(), Array: yyDollar[6].booleanUnion()}
 		}
 		yyVAL.union = yyLOCAL
 	case 1078:
@@ -18241,13 +18204,21 @@ yydefault:
 		var yyLOCAL Expr
 //line sql.y:5589
 		{
-			yyLOCAL = &ConvertUsingExpr{Expr: yyDollar[3].exprUnion(), Type: yyDollar[5].str}
+			yyLOCAL = &ConvertExpr{Expr: yyDollar[3].exprUnion(), Type: yyDollar[5].convertTypeUnion()}
 		}
 		yyVAL.union = yyLOCAL
 	case 1079:
-		yyDollar = yyS[yypt-2 : yypt+1]
+		yyDollar = yyS[yypt-6 : yypt+1]
 		var yyLOCAL Expr
 //line sql.y:5593
+		{
+			yyLOCAL = &ConvertUsingExpr{Expr: yyDollar[3].exprUnion(), Type: yyDollar[5].str}
+		}
+		yyVAL.union = yyLOCAL
+	case 1080:
+		yyDollar = yyS[yypt-2 : yypt+1]
+		var yyLOCAL Expr
+//line sql.y:5597
 		{
 			// From: https://dev.mysql.com/doc/refman/8.0/en/cast-functions.html#operator_binary
 			// To convert a string expression to a binary string, these constructs are equivalent:
@@ -18256,91 +18227,83 @@ yydefault:
 			yyLOCAL = &ConvertExpr{Expr: yyDollar[2].exprUnion(), Type: &ConvertType{Type: yyDollar[1].str}}
 		}
 		yyVAL.union = yyLOCAL
-	case 1080:
+	case 1081:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:5601
+//line sql.y:5605
 		{
 			yyLOCAL = &Default{ColName: yyDollar[2].str}
 		}
 		yyVAL.union = yyLOCAL
-	case 1081:
+	case 1082:
 		yyDollar = yyS[yypt-5 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:5605
+//line sql.y:5609
 		{
 			yyLOCAL = &IntervalDateExpr{Syntax: IntervalDateExprBinaryAddLeft, Date: yyDollar[5].exprUnion(), Unit: yyDollar[3].intervalTypeUnion(), Interval: yyDollar[2].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1082:
+	case 1083:
 		yyDollar = yyS[yypt-6 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:5609
+//line sql.y:5613
 		{
 			yyLOCAL = &IntervalFuncExpr{Expr: yyDollar[3].exprUnion(), Exprs: yyDollar[5].exprsUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1083:
+	case 1084:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:5613
+//line sql.y:5617
 		{
 			yyLOCAL = &JSONExtractExpr{JSONDoc: yyDollar[1].exprUnion(), PathList: []Expr{yyDollar[3].exprUnion()}}
 		}
 		yyVAL.union = yyLOCAL
-	case 1084:
+	case 1085:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:5617
+//line sql.y:5621
 		{
 			yyLOCAL = &JSONUnquoteExpr{JSONValue: &JSONExtractExpr{JSONDoc: yyDollar[1].exprUnion(), PathList: []Expr{yyDollar[3].exprUnion()}}}
 		}
 		yyVAL.union = yyLOCAL
-	case 1085:
+	case 1086:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL []*ColName
-//line sql.y:5623
+//line sql.y:5627
 		{
 			yyLOCAL = yyDollar[1].colNamesUnion()
 		}
 		yyVAL.union = yyLOCAL
-	case 1086:
+	case 1087:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL []*ColName
-//line sql.y:5627
+//line sql.y:5631
 		{
 			yyLOCAL = yyDollar[2].colNamesUnion()
 		}
 		yyVAL.union = yyLOCAL
-	case 1087:
+	case 1088:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL []*ColName
-//line sql.y:5633
+//line sql.y:5637
 		{
 			yyLOCAL = []*ColName{yyDollar[1].colNameUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1088:
+	case 1089:
 		yyDollar = yyS[yypt-3 : yypt+1]
-//line sql.y:5637
+//line sql.y:5641
 		{
 			yySLICE := (*[]*ColName)(yyIaddr(yyVAL.union))
 			*yySLICE = append(*yySLICE, yyDollar[3].colNameUnion())
 		}
-	case 1089:
-		yyDollar = yyS[yypt-1 : yypt+1]
-		var yyLOCAL TrimType
-//line sql.y:5643
-		{
-			yyLOCAL = BothTrimType
-		}
-		yyVAL.union = yyLOCAL
 	case 1090:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL TrimType
 //line sql.y:5647
 		{
-			yyLOCAL = LeadingTrimType
+			yyLOCAL = BothTrimType
 		}
 		yyVAL.union = yyLOCAL
 	case 1091:
@@ -18348,15 +18311,15 @@ yydefault:
 		var yyLOCAL TrimType
 //line sql.y:5651
 		{
-			yyLOCAL = TrailingTrimType
+			yyLOCAL = LeadingTrimType
 		}
 		yyVAL.union = yyLOCAL
 	case 1092:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		var yyLOCAL FrameUnitType
-//line sql.y:5657
+		var yyLOCAL TrimType
+//line sql.y:5655
 		{
-			yyLOCAL = FrameRowsType
+			yyLOCAL = TrailingTrimType
 		}
 		yyVAL.union = yyLOCAL
 	case 1093:
@@ -18364,15 +18327,15 @@ yydefault:
 		var yyLOCAL FrameUnitType
 //line sql.y:5661
 		{
-			yyLOCAL = FrameRangeType
+			yyLOCAL = FrameRowsType
 		}
 		yyVAL.union = yyLOCAL
 	case 1094:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		var yyLOCAL ArgumentLessWindowExprType
-//line sql.y:5668
+		var yyLOCAL FrameUnitType
+//line sql.y:5665
 		{
-			yyLOCAL = CumeDistExprType
+			yyLOCAL = FrameRangeType
 		}
 		yyVAL.union = yyLOCAL
 	case 1095:
@@ -18380,7 +18343,7 @@ yydefault:
 		var yyLOCAL ArgumentLessWindowExprType
 //line sql.y:5672
 		{
-			yyLOCAL = DenseRankExprType
+			yyLOCAL = CumeDistExprType
 		}
 		yyVAL.union = yyLOCAL
 	case 1096:
@@ -18388,7 +18351,7 @@ yydefault:
 		var yyLOCAL ArgumentLessWindowExprType
 //line sql.y:5676
 		{
-			yyLOCAL = PercentRankExprType
+			yyLOCAL = DenseRankExprType
 		}
 		yyVAL.union = yyLOCAL
 	case 1097:
@@ -18396,7 +18359,7 @@ yydefault:
 		var yyLOCAL ArgumentLessWindowExprType
 //line sql.y:5680
 		{
-			yyLOCAL = RankExprType
+			yyLOCAL = PercentRankExprType
 		}
 		yyVAL.union = yyLOCAL
 	case 1098:
@@ -18404,15 +18367,15 @@ yydefault:
 		var yyLOCAL ArgumentLessWindowExprType
 //line sql.y:5684
 		{
-			yyLOCAL = RowNumberExprType
+			yyLOCAL = RankExprType
 		}
 		yyVAL.union = yyLOCAL
 	case 1099:
-		yyDollar = yyS[yypt-2 : yypt+1]
-		var yyLOCAL *FramePoint
-//line sql.y:5690
+		yyDollar = yyS[yypt-1 : yypt+1]
+		var yyLOCAL ArgumentLessWindowExprType
+//line sql.y:5688
 		{
-			yyLOCAL = &FramePoint{Type: CurrentRowType}
+			yyLOCAL = RowNumberExprType
 		}
 		yyVAL.union = yyLOCAL
 	case 1100:
@@ -18420,7 +18383,7 @@ yydefault:
 		var yyLOCAL *FramePoint
 //line sql.y:5694
 		{
-			yyLOCAL = &FramePoint{Type: UnboundedPrecedingType}
+			yyLOCAL = &FramePoint{Type: CurrentRowType}
 		}
 		yyVAL.union = yyLOCAL
 	case 1101:
@@ -18428,7 +18391,7 @@ yydefault:
 		var yyLOCAL *FramePoint
 //line sql.y:5698
 		{
-			yyLOCAL = &FramePoint{Type: UnboundedFollowingType}
+			yyLOCAL = &FramePoint{Type: UnboundedPrecedingType}
 		}
 		yyVAL.union = yyLOCAL
 	case 1102:
@@ -18436,334 +18399,334 @@ yydefault:
 		var yyLOCAL *FramePoint
 //line sql.y:5702
 		{
-			yyLOCAL = &FramePoint{Type: ExprPrecedingType, Expr: yyDollar[1].exprUnion()}
+			yyLOCAL = &FramePoint{Type: UnboundedFollowingType}
 		}
 		yyVAL.union = yyLOCAL
 	case 1103:
-		yyDollar = yyS[yypt-4 : yypt+1]
+		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL *FramePoint
 //line sql.y:5706
 		{
-			yyLOCAL = &FramePoint{Type: ExprPrecedingType, Expr: yyDollar[2].exprUnion(), Unit: yyDollar[3].intervalTypeUnion()}
+			yyLOCAL = &FramePoint{Type: ExprPrecedingType, Expr: yyDollar[1].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
 	case 1104:
-		yyDollar = yyS[yypt-2 : yypt+1]
+		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL *FramePoint
 //line sql.y:5710
 		{
-			yyLOCAL = &FramePoint{Type: ExprFollowingType, Expr: yyDollar[1].exprUnion()}
+			yyLOCAL = &FramePoint{Type: ExprPrecedingType, Expr: yyDollar[2].exprUnion(), Unit: yyDollar[3].intervalTypeUnion()}
 		}
 		yyVAL.union = yyLOCAL
 	case 1105:
-		yyDollar = yyS[yypt-4 : yypt+1]
+		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL *FramePoint
 //line sql.y:5714
 		{
-			yyLOCAL = &FramePoint{Type: ExprFollowingType, Expr: yyDollar[2].exprUnion(), Unit: yyDollar[3].intervalTypeUnion()}
+			yyLOCAL = &FramePoint{Type: ExprFollowingType, Expr: yyDollar[1].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
 	case 1106:
+		yyDollar = yyS[yypt-4 : yypt+1]
+		var yyLOCAL *FramePoint
+//line sql.y:5718
+		{
+			yyLOCAL = &FramePoint{Type: ExprFollowingType, Expr: yyDollar[2].exprUnion(), Unit: yyDollar[3].intervalTypeUnion()}
+		}
+		yyVAL.union = yyLOCAL
+	case 1107:
 		yyDollar = yyS[yypt-0 : yypt+1]
 		var yyLOCAL *FrameClause
-//line sql.y:5719
+//line sql.y:5723
 		{
 			yyLOCAL = nil
 		}
 		yyVAL.union = yyLOCAL
-	case 1107:
+	case 1108:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL *FrameClause
-//line sql.y:5723
+//line sql.y:5727
 		{
 			yyLOCAL = yyDollar[1].frameClauseUnion()
 		}
 		yyVAL.union = yyLOCAL
-	case 1108:
+	case 1109:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL *FrameClause
-//line sql.y:5729
+//line sql.y:5733
 		{
 			yyLOCAL = &FrameClause{Unit: yyDollar[1].frameUnitTypeUnion(), Start: yyDollar[2].framePointUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1109:
+	case 1110:
 		yyDollar = yyS[yypt-5 : yypt+1]
 		var yyLOCAL *FrameClause
-//line sql.y:5733
+//line sql.y:5737
 		{
 			yyLOCAL = &FrameClause{Unit: yyDollar[1].frameUnitTypeUnion(), Start: yyDollar[3].framePointUnion(), End: yyDollar[5].framePointUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1110:
+	case 1111:
 		yyDollar = yyS[yypt-0 : yypt+1]
 		var yyLOCAL Exprs
-//line sql.y:5738
+//line sql.y:5742
 		{
 			yyLOCAL = nil
 		}
 		yyVAL.union = yyLOCAL
-	case 1111:
+	case 1112:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL Exprs
-//line sql.y:5742
+//line sql.y:5746
 		{
 			yyLOCAL = yyDollar[3].exprsUnion()
 		}
 		yyVAL.union = yyLOCAL
-	case 1112:
+	case 1113:
 		yyDollar = yyS[yypt-0 : yypt+1]
-//line sql.y:5747
+//line sql.y:5751
 		{
 			yyVAL.identifierCI = IdentifierCI{}
 		}
-	case 1113:
+	case 1114:
 		yyDollar = yyS[yypt-1 : yypt+1]
-//line sql.y:5751
+//line sql.y:5755
 		{
 			yyVAL.identifierCI = yyDollar[1].identifierCI
 		}
-	case 1114:
+	case 1115:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL *WindowSpecification
-//line sql.y:5757
+//line sql.y:5761
 		{
 			yyLOCAL = &WindowSpecification{Name: yyDollar[1].identifierCI, PartitionClause: yyDollar[2].exprsUnion(), OrderClause: yyDollar[3].orderByUnion(), FrameClause: yyDollar[4].frameClauseUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1115:
+	case 1116:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL *OverClause
-//line sql.y:5763
+//line sql.y:5767
 		{
 			yyLOCAL = &OverClause{WindowSpec: yyDollar[3].windowSpecificationUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1116:
+	case 1117:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL *OverClause
-//line sql.y:5767
+//line sql.y:5771
 		{
 			yyLOCAL = &OverClause{WindowName: yyDollar[2].identifierCI}
 		}
 		yyVAL.union = yyLOCAL
-	case 1117:
+	case 1118:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL *OverClause
-//line sql.y:5773
+//line sql.y:5777
 		{
 			yyLOCAL = yyDollar[1].overClauseUnion()
 		}
 		yyVAL.union = yyLOCAL
-	case 1118:
+	case 1119:
 		yyDollar = yyS[yypt-0 : yypt+1]
 		var yyLOCAL *OverClause
-//line sql.y:5777
+//line sql.y:5781
 		{
 			yyLOCAL = nil
 		}
 		yyVAL.union = yyLOCAL
-	case 1119:
+	case 1120:
 		yyDollar = yyS[yypt-0 : yypt+1]
 		var yyLOCAL *NullTreatmentClause
-//line sql.y:5782
+//line sql.y:5786
 		{
 			yyLOCAL = nil
 		}
 		yyVAL.union = yyLOCAL
-	case 1121:
+	case 1122:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL *NullTreatmentClause
-//line sql.y:5789
+//line sql.y:5793
 		{
 			yyLOCAL = &NullTreatmentClause{yyDollar[1].nullTreatmentTypeUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1122:
+	case 1123:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL NullTreatmentType
-//line sql.y:5795
+//line sql.y:5799
 		{
 			yyLOCAL = RespectNullsType
 		}
 		yyVAL.union = yyLOCAL
-	case 1123:
+	case 1124:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL NullTreatmentType
-//line sql.y:5799
+//line sql.y:5803
 		{
 			yyLOCAL = IgnoreNullsType
 		}
 		yyVAL.union = yyLOCAL
-	case 1124:
+	case 1125:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL FirstOrLastValueExprType
-//line sql.y:5805
+//line sql.y:5809
 		{
 			yyLOCAL = FirstValueExprType
 		}
 		yyVAL.union = yyLOCAL
-	case 1125:
+	case 1126:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL FirstOrLastValueExprType
-//line sql.y:5809
+//line sql.y:5813
 		{
 			yyLOCAL = LastValueExprType
 		}
 		yyVAL.union = yyLOCAL
-	case 1126:
+	case 1127:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL FromFirstLastType
-//line sql.y:5815
+//line sql.y:5819
 		{
 			yyLOCAL = FromFirstType
 		}
 		yyVAL.union = yyLOCAL
-	case 1127:
+	case 1128:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL FromFirstLastType
-//line sql.y:5819
+//line sql.y:5823
 		{
 			yyLOCAL = FromLastType
 		}
 		yyVAL.union = yyLOCAL
-	case 1128:
+	case 1129:
 		yyDollar = yyS[yypt-0 : yypt+1]
 		var yyLOCAL *FromFirstLastClause
-//line sql.y:5824
+//line sql.y:5828
 		{
 			yyLOCAL = nil
 		}
 		yyVAL.union = yyLOCAL
-	case 1130:
+	case 1131:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL *FromFirstLastClause
-//line sql.y:5831
+//line sql.y:5835
 		{
 			yyLOCAL = &FromFirstLastClause{yyDollar[1].fromFirstLastTypeUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1131:
+	case 1132:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL LagLeadExprType
-//line sql.y:5837
+//line sql.y:5841
 		{
 			yyLOCAL = LagExprType
 		}
 		yyVAL.union = yyLOCAL
-	case 1132:
+	case 1133:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL LagLeadExprType
-//line sql.y:5841
+//line sql.y:5845
 		{
 			yyLOCAL = LeadExprType
 		}
 		yyVAL.union = yyLOCAL
-	case 1133:
+	case 1134:
 		yyDollar = yyS[yypt-5 : yypt+1]
 		var yyLOCAL *WindowDefinition
-//line sql.y:5847
+//line sql.y:5851
 		{
 			yyLOCAL = &WindowDefinition{Name: yyDollar[1].identifierCI, WindowSpec: yyDollar[4].windowSpecificationUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1134:
+	case 1135:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL WindowDefinitions
-//line sql.y:5853
+//line sql.y:5857
 		{
 			yyLOCAL = WindowDefinitions{yyDollar[1].windowDefinitionUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1135:
+	case 1136:
 		yyDollar = yyS[yypt-3 : yypt+1]
-//line sql.y:5857
+//line sql.y:5861
 		{
 			yySLICE := (*WindowDefinitions)(yyIaddr(yyVAL.union))
 			*yySLICE = append(*yySLICE, yyDollar[3].windowDefinitionUnion())
 		}
-	case 1136:
+	case 1137:
 		yyDollar = yyS[yypt-0 : yypt+1]
-//line sql.y:5863
+//line sql.y:5867
 		{
 			yyVAL.str = ""
 		}
-	case 1137:
+	case 1138:
 		yyDollar = yyS[yypt-3 : yypt+1]
-//line sql.y:5867
+//line sql.y:5871
 		{
 			yyVAL.str = string(yyDollar[2].identifierCI.String())
 		}
-	case 1138:
+	case 1139:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL BoolVal
-//line sql.y:5873
+//line sql.y:5877
 		{
 			yyLOCAL = BoolVal(true)
 		}
 		yyVAL.union = yyLOCAL
-	case 1139:
+	case 1140:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL BoolVal
-//line sql.y:5877
+//line sql.y:5881
 		{
 			yyLOCAL = BoolVal(false)
 		}
 		yyVAL.union = yyLOCAL
-	case 1140:
+	case 1141:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL IsExprOperator
-//line sql.y:5884
+//line sql.y:5888
 		{
 			yyLOCAL = IsTrueOp
 		}
 		yyVAL.union = yyLOCAL
-	case 1141:
+	case 1142:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL IsExprOperator
-//line sql.y:5888
+//line sql.y:5892
 		{
 			yyLOCAL = IsNotTrueOp
 		}
 		yyVAL.union = yyLOCAL
-	case 1142:
+	case 1143:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL IsExprOperator
-//line sql.y:5892
+//line sql.y:5896
 		{
 			yyLOCAL = IsFalseOp
 		}
 		yyVAL.union = yyLOCAL
-	case 1143:
+	case 1144:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL IsExprOperator
-//line sql.y:5896
+//line sql.y:5900
 		{
 			yyLOCAL = IsNotFalseOp
 		}
 		yyVAL.union = yyLOCAL
-	case 1144:
-		yyDollar = yyS[yypt-1 : yypt+1]
-		var yyLOCAL ComparisonExprOperator
-//line sql.y:5902
-		{
-			yyLOCAL = yyDollar[1].comparisonExprOperatorUnion()
-		}
-		yyVAL.union = yyLOCAL
 	case 1145:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL ComparisonExprOperator
 //line sql.y:5906
 		{
-			yyLOCAL = NullSafeEqualOp
+			yyLOCAL = yyDollar[1].comparisonExprOperatorUnion()
 		}
 		yyVAL.union = yyLOCAL
 	case 1146:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL ComparisonExprOperator
-//line sql.y:5912
+//line sql.y:5910
 		{
-			yyLOCAL = EqualOp
+			yyLOCAL = NullSafeEqualOp
 		}
 		yyVAL.union = yyLOCAL
 	case 1147:
@@ -18771,7 +18734,7 @@ yydefault:
 		var yyLOCAL ComparisonExprOperator
 //line sql.y:5916
 		{
-			yyLOCAL = LessThanOp
+			yyLOCAL = EqualOp
 		}
 		yyVAL.union = yyLOCAL
 	case 1148:
@@ -18779,7 +18742,7 @@ yydefault:
 		var yyLOCAL ComparisonExprOperator
 //line sql.y:5920
 		{
-			yyLOCAL = GreaterThanOp
+			yyLOCAL = LessThanOp
 		}
 		yyVAL.union = yyLOCAL
 	case 1149:
@@ -18787,7 +18750,7 @@ yydefault:
 		var yyLOCAL ComparisonExprOperator
 //line sql.y:5924
 		{
-			yyLOCAL = LessEqualOp
+			yyLOCAL = GreaterThanOp
 		}
 		yyVAL.union = yyLOCAL
 	case 1150:
@@ -18795,7 +18758,7 @@ yydefault:
 		var yyLOCAL ComparisonExprOperator
 //line sql.y:5928
 		{
-			yyLOCAL = GreaterEqualOp
+			yyLOCAL = LessEqualOp
 		}
 		yyVAL.union = yyLOCAL
 	case 1151:
@@ -18803,15 +18766,15 @@ yydefault:
 		var yyLOCAL ComparisonExprOperator
 //line sql.y:5932
 		{
-			yyLOCAL = NotEqualOp
+			yyLOCAL = GreaterEqualOp
 		}
 		yyVAL.union = yyLOCAL
 	case 1152:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		var yyLOCAL ColTuple
-//line sql.y:5938
+		var yyLOCAL ComparisonExprOperator
+//line sql.y:5936
 		{
-			yyLOCAL = yyDollar[1].valTupleUnion()
+			yyLOCAL = NotEqualOp
 		}
 		yyVAL.union = yyLOCAL
 	case 1153:
@@ -18819,79 +18782,79 @@ yydefault:
 		var yyLOCAL ColTuple
 //line sql.y:5942
 		{
-			yyLOCAL = yyDollar[1].subqueryUnion()
+			yyLOCAL = yyDollar[1].valTupleUnion()
 		}
 		yyVAL.union = yyLOCAL
 	case 1154:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL ColTuple
-//line sql.y:5946
+//line sql.y:5946
+		{
+			yyLOCAL = yyDollar[1].subqueryUnion()
+		}
+		yyVAL.union = yyLOCAL
+	case 1155:
+		yyDollar = yyS[yypt-1 : yypt+1]
+		var yyLOCAL ColTuple
+//line sql.y:5950
 		{
 			yyLOCAL = ListArg(yyDollar[1].str[2:])
 			markBindVariable(yylex, yyDollar[1].str[2:])
 		}
 		yyVAL.union = yyLOCAL
-	case 1155:
+	case 1156:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL *Subquery
-//line sql.y:5953
+//line sql.y:5957
 		{
 			yyLOCAL = &Subquery{yyDollar[1].tableStmtUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1156:
+	case 1157:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL Exprs
-//line sql.y:5959
+//line sql.y:5963
 		{
 			yyLOCAL = Exprs{yyDollar[1].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1157:
+	case 1158:
 		yyDollar = yyS[yypt-3 : yypt+1]
-//line sql.y:5963
+//line sql.y:5967
 		{
 			yySLICE := (*Exprs)(yyIaddr(yyVAL.union))
 			*yySLICE = append(*yySLICE, yyDollar[3].exprUnion())
 		}
-	case 1158:
+	case 1159:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:5973
+//line sql.y:5977
 		{
 			yyLOCAL = &FuncExpr{Name: yyDollar[1].identifierCI, Exprs: yyDollar[3].exprsUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1159:
+	case 1160:
 		yyDollar = yyS[yypt-6 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:5977
+//line sql.y:5981
 		{
 			yyLOCAL = &FuncExpr{Qualifier: yyDollar[1].identifierCS, Name: yyDollar[3].identifierCI, Exprs: yyDollar[5].exprsUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1160:
-		yyDollar = yyS[yypt-4 : yypt+1]
-		var yyLOCAL Expr
-//line sql.y:5987
-		{
-			yyLOCAL = &FuncExpr{Name: NewIdentifierCI("left"), Exprs: yyDollar[3].exprsUnion()}
-		}
-		yyVAL.union = yyLOCAL
 	case 1161:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Expr
 //line sql.y:5991
 		{
-			yyLOCAL = &FuncExpr{Name: NewIdentifierCI("right"), Exprs: yyDollar[3].exprsUnion()}
+			yyLOCAL = &FuncExpr{Name: NewIdentifierCI("left"), Exprs: yyDollar[3].exprsUnion()}
 		}
 		yyVAL.union = yyLOCAL
 	case 1162:
-		yyDollar = yyS[yypt-8 : yypt+1]
+		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Expr
 //line sql.y:5995
 		{
-			yyLOCAL = &SubstrExpr{Name: yyDollar[3].exprUnion(), From: yyDollar[5].exprUnion(), To: yyDollar[7].exprUnion()}
+			yyLOCAL = &FuncExpr{Name: NewIdentifierCI("right"), Exprs: yyDollar[3].exprsUnion()}
 		}
 		yyVAL.union = yyLOCAL
 	case 1163:
@@ -18903,83 +18866,83 @@ yydefault:
 		}
 		yyVAL.union = yyLOCAL
 	case 1164:
-		yyDollar = yyS[yypt-6 : yypt+1]
+		yyDollar = yyS[yypt-8 : yypt+1]
 		var yyLOCAL Expr
 //line sql.y:6003
 		{
-			yyLOCAL = &SubstrExpr{Name: yyDollar[3].exprUnion(), From: yyDollar[5].exprUnion()}
+			yyLOCAL = &SubstrExpr{Name: yyDollar[3].exprUnion(), From: yyDollar[5].exprUnion(), To: yyDollar[7].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
 	case 1165:
-		yyDollar = yyS[yypt-8 : yypt+1]
+		yyDollar = yyS[yypt-6 : yypt+1]
 		var yyLOCAL Expr
 //line sql.y:6007
 		{
-			yyLOCAL = &SubstrExpr{Name: yyDollar[3].exprUnion(), From: yyDollar[5].exprUnion(), To: yyDollar[7].exprUnion()}
+			yyLOCAL = &SubstrExpr{Name: yyDollar[3].exprUnion(), From: yyDollar[5].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
 	case 1166:
-		yyDollar = yyS[yypt-6 : yypt+1]
+		yyDollar = yyS[yypt-8 : yypt+1]
 		var yyLOCAL Expr
 //line sql.y:6011
 		{
-			yyLOCAL = &SubstrExpr{Name: yyDollar[3].exprUnion(), From: yyDollar[5].exprUnion()}
+			yyLOCAL = &SubstrExpr{Name: yyDollar[3].exprUnion(), From: yyDollar[5].exprUnion(), To: yyDollar[7].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
 	case 1167:
-		yyDollar = yyS[yypt-5 : yypt+1]
+		yyDollar = yyS[yypt-6 : yypt+1]
 		var yyLOCAL Expr
 //line sql.y:6015
 		{
-			yyLOCAL = &CaseExpr{Expr: yyDollar[2].exprUnion(), Whens: yyDollar[3].whensUnion(), Else: yyDollar[4].exprUnion()}
+			yyLOCAL = &SubstrExpr{Name: yyDollar[3].exprUnion(), From: yyDollar[5].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
 	case 1168:
-		yyDollar = yyS[yypt-4 : yypt+1]
+		yyDollar = yyS[yypt-5 : yypt+1]
 		var yyLOCAL Expr
 //line sql.y:6019
 		{
-			yyLOCAL = &ValuesFuncExpr{Name: yyDollar[3].colNameUnion()}
+			yyLOCAL = &CaseExpr{Expr: yyDollar[2].exprUnion(), Whens: yyDollar[3].whensUnion(), Else: yyDollar[4].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
 	case 1169:
-		yyDollar = yyS[yypt-10 : yypt+1]
+		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Expr
 //line sql.y:6023
 		{
-			yyLOCAL = &InsertExpr{Str: yyDollar[3].exprUnion(), Pos: yyDollar[5].exprUnion(), Len: yyDollar[7].exprUnion(), NewStr: yyDollar[9].exprUnion()}
+			yyLOCAL = &ValuesFuncExpr{Name: yyDollar[3].colNameUnion()}
 		}
 		yyVAL.union = yyLOCAL
 	case 1170:
-		yyDollar = yyS[yypt-2 : yypt+1]
+		yyDollar = yyS[yypt-10 : yypt+1]
 		var yyLOCAL Expr
 //line sql.y:6027
 		{
-			yyLOCAL = &FuncExpr{Name: NewIdentifierCI(yyDollar[1].str)}
+			yyLOCAL = &InsertExpr{Str: yyDollar[3].exprUnion(), Pos: yyDollar[5].exprUnion(), Len: yyDollar[7].exprUnion(), NewStr: yyDollar[9].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
 	case 1171:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6038
+//line sql.y:6031
 		{
-			yyLOCAL = &FuncExpr{Name: NewIdentifierCI("utc_date")}
+			yyLOCAL = &FuncExpr{Name: NewIdentifierCI(yyDollar[1].str)}
 		}
 		yyVAL.union = yyLOCAL
 	case 1172:
-		yyDollar = yyS[yypt-1 : yypt+1]
+		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL Expr
 //line sql.y:6042
 		{
-			yyLOCAL = yyDollar[1].exprUnion()
+			yyLOCAL = &FuncExpr{Name: NewIdentifierCI("utc_date")}
 		}
 		yyVAL.union = yyLOCAL
 	case 1173:
-		yyDollar = yyS[yypt-2 : yypt+1]
+		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6048
+//line sql.y:6046
 		{
-			yyLOCAL = &FuncExpr{Name: NewIdentifierCI("current_date")}
+			yyLOCAL = yyDollar[1].exprUnion()
 		}
 		yyVAL.union = yyLOCAL
 	case 1174:
@@ -18987,7 +18950,7 @@ yydefault:
 		var yyLOCAL Expr
 //line sql.y:6052
 		{
-			yyLOCAL = &FuncExpr{Name: NewIdentifierCI("curdate")}
+			yyLOCAL = &FuncExpr{Name: NewIdentifierCI("current_date")}
 		}
 		yyVAL.union = yyLOCAL
 	case 1175:
@@ -18995,39 +18958,39 @@ yydefault:
 		var yyLOCAL Expr
 //line sql.y:6056
 		{
-			yyLOCAL = &CurTimeFuncExpr{Name: NewIdentifierCI("utc_time"), Fsp: yyDollar[2].integerUnion()}
+			yyLOCAL = &FuncExpr{Name: NewIdentifierCI("curdate")}
 		}
 		yyVAL.union = yyLOCAL
 	case 1176:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6061
+//line sql.y:6060
 		{
-			yyLOCAL = &CurTimeFuncExpr{Name: NewIdentifierCI("curtime"), Fsp: yyDollar[2].integerUnion()}
+			yyLOCAL = &CurTimeFuncExpr{Name: NewIdentifierCI("utc_time"), Fsp: yyDollar[2].integerUnion()}
 		}
 		yyVAL.union = yyLOCAL
 	case 1177:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6066
+//line sql.y:6065
 		{
-			yyLOCAL = &CurTimeFuncExpr{Name: NewIdentifierCI("current_time"), Fsp: yyDollar[2].integerUnion()}
+			yyLOCAL = &CurTimeFuncExpr{Name: NewIdentifierCI("curtime"), Fsp: yyDollar[2].integerUnion()}
 		}
 		yyVAL.union = yyLOCAL
 	case 1178:
-		yyDollar = yyS[yypt-5 : yypt+1]
+		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL Expr
 //line sql.y:6070
 		{
-			yyLOCAL = &CountStar{OverClause: yyDollar[5].overClauseUnion()}
+			yyLOCAL = &CurTimeFuncExpr{Name: NewIdentifierCI("current_time"), Fsp: yyDollar[2].integerUnion()}
 		}
 		yyVAL.union = yyLOCAL
 	case 1179:
-		yyDollar = yyS[yypt-6 : yypt+1]
+		yyDollar = yyS[yypt-5 : yypt+1]
 		var yyLOCAL Expr
 //line sql.y:6074
 		{
-			yyLOCAL = &Count{Distinct: yyDollar[3].booleanUnion(), Args: yyDollar[4].exprsUnion(), OverClause: yyDollar[6].overClauseUnion()}
+			yyLOCAL = &CountStar{OverClause: yyDollar[5].overClauseUnion()}
 		}
 		yyVAL.union = yyLOCAL
 	case 1180:
@@ -19035,7 +18998,7 @@ yydefault:
 		var yyLOCAL Expr
 //line sql.y:6078
 		{
-			yyLOCAL = &Max{Distinct: yyDollar[3].booleanUnion(), Arg: yyDollar[4].exprUnion(), OverClause: yyDollar[6].overClauseUnion()}
+			yyLOCAL = &Count{Distinct: yyDollar[3].booleanUnion(), Args: yyDollar[4].exprsUnion(), OverClause: yyDollar[6].overClauseUnion()}
 		}
 		yyVAL.union = yyLOCAL
 	case 1181:
@@ -19043,7 +19006,7 @@ yydefault:
 		var yyLOCAL Expr
 //line sql.y:6082
 		{
-			yyLOCAL = &Min{Distinct: yyDollar[3].booleanUnion(), Arg: yyDollar[4].exprUnion(), OverClause: yyDollar[6].overClauseUnion()}
+			yyLOCAL = &Max{Distinct: yyDollar[3].booleanUnion(), Arg: yyDollar[4].exprUnion(), OverClause: yyDollar[6].overClauseUnion()}
 		}
 		yyVAL.union = yyLOCAL
 	case 1182:
@@ -19051,7 +19014,7 @@ yydefault:
 		var yyLOCAL Expr
 //line sql.y:6086
 		{
-			yyLOCAL = &Sum{Distinct: yyDollar[3].booleanUnion(), Arg: yyDollar[4].exprUnion(), OverClause: yyDollar[6].overClauseUnion()}
+			yyLOCAL = &Min{Distinct: yyDollar[3].booleanUnion(), Arg: yyDollar[4].exprUnion(), OverClause: yyDollar[6].overClauseUnion()}
 		}
 		yyVAL.union = yyLOCAL
 	case 1183:
@@ -19059,15 +19022,15 @@ yydefault:
 		var yyLOCAL Expr
 //line sql.y:6090
 		{
-			yyLOCAL = &Avg{Distinct: yyDollar[3].booleanUnion(), Arg: yyDollar[4].exprUnion(), OverClause: yyDollar[6].overClauseUnion()}
+			yyLOCAL = &Sum{Distinct: yyDollar[3].booleanUnion(), Arg: yyDollar[4].exprUnion(), OverClause: yyDollar[6].overClauseUnion()}
 		}
 		yyVAL.union = yyLOCAL
 	case 1184:
-		yyDollar = yyS[yypt-5 : yypt+1]
+		yyDollar = yyS[yypt-6 : yypt+1]
 		var yyLOCAL Expr
 //line sql.y:6094
 		{
-			yyLOCAL = &BitAnd{Arg: yyDollar[3].exprUnion(), OverClause: yyDollar[5].overClauseUnion()}
+			yyLOCAL = &Avg{Distinct: yyDollar[3].booleanUnion(), Arg: yyDollar[4].exprUnion(), OverClause: yyDollar[6].overClauseUnion()}
 		}
 		yyVAL.union = yyLOCAL
 	case 1185:
@@ -19075,7 +19038,7 @@ yydefault:
 		var yyLOCAL Expr
 //line sql.y:6098
 		{
-			yyLOCAL = &BitOr{Arg: yyDollar[3].exprUnion(), OverClause: yyDollar[5].overClauseUnion()}
+			yyLOCAL = &BitAnd{Arg: yyDollar[3].exprUnion(), OverClause: yyDollar[5].overClauseUnion()}
 		}
 		yyVAL.union = yyLOCAL
 	case 1186:
@@ -19083,7 +19046,7 @@ yydefault:
 		var yyLOCAL Expr
 //line sql.y:6102
 		{
-			yyLOCAL = &BitXor{Arg: yyDollar[3].exprUnion(), OverClause: yyDollar[5].overClauseUnion()}
+			yyLOCAL = &BitOr{Arg: yyDollar[3].exprUnion(), OverClause: yyDollar[5].overClauseUnion()}
 		}
 		yyVAL.union = yyLOCAL
 	case 1187:
@@ -19091,7 +19054,7 @@ yydefault:
 		var yyLOCAL Expr
 //line sql.y:6106
 		{
-			yyLOCAL = &Std{Arg: yyDollar[3].exprUnion(), OverClause: yyDollar[5].overClauseUnion()}
+			yyLOCAL = &BitXor{Arg: yyDollar[3].exprUnion(), OverClause: yyDollar[5].overClauseUnion()}
 		}
 		yyVAL.union = yyLOCAL
 	case 1188:
@@ -19099,7 +19062,7 @@ yydefault:
 		var yyLOCAL Expr
 //line sql.y:6110
 		{
-			yyLOCAL = &StdDev{Arg: yyDollar[3].exprUnion(), OverClause: yyDollar[5].overClauseUnion()}
+			yyLOCAL = &Std{Arg: yyDollar[3].exprUnion(), OverClause: yyDollar[5].overClauseUnion()}
 		}
 		yyVAL.union = yyLOCAL
 	case 1189:
@@ -19107,7 +19070,7 @@ yydefault:
 		var yyLOCAL Expr
 //line sql.y:6114
 		{
-			yyLOCAL = &StdPop{Arg: yyDollar[3].exprUnion(), OverClause: yyDollar[5].overClauseUnion()}
+			yyLOCAL = &StdDev{Arg: yyDollar[3].exprUnion(), OverClause: yyDollar[5].overClauseUnion()}
 		}
 		yyVAL.union = yyLOCAL
 	case 1190:
@@ -19115,7 +19078,7 @@ yydefault:
 		var yyLOCAL Expr
 //line sql.y:6118
 		{
-			yyLOCAL = &StdSamp{Arg: yyDollar[3].exprUnion(), OverClause: yyDollar[5].overClauseUnion()}
+			yyLOCAL = &StdPop{Arg: yyDollar[3].exprUnion(), OverClause: yyDollar[5].overClauseUnion()}
 		}
 		yyVAL.union = yyLOCAL
 	case 1191:
@@ -19123,7 +19086,7 @@ yydefault:
 		var yyLOCAL Expr
 //line sql.y:6122
 		{
-			yyLOCAL = &VarPop{Arg: yyDollar[3].exprUnion(), OverClause: yyDollar[5].overClauseUnion()}
+			yyLOCAL = &StdSamp{Arg: yyDollar[3].exprUnion(), OverClause: yyDollar[5].overClauseUnion()}
 		}
 		yyVAL.union = yyLOCAL
 	case 1192:
@@ -19131,7 +19094,7 @@ yydefault:
 		var yyLOCAL Expr
 //line sql.y:6126
 		{
-			yyLOCAL = &VarSamp{Arg: yyDollar[3].exprUnion(), OverClause: yyDollar[5].overClauseUnion()}
+			yyLOCAL = &VarPop{Arg: yyDollar[3].exprUnion(), OverClause: yyDollar[5].overClauseUnion()}
 		}
 		yyVAL.union = yyLOCAL
 	case 1193:
@@ -19139,31 +19102,31 @@ yydefault:
 		var yyLOCAL Expr
 //line sql.y:6130
 		{
-			yyLOCAL = &Variance{Arg: yyDollar[3].exprUnion(), OverClause: yyDollar[5].overClauseUnion()}
+			yyLOCAL = &VarSamp{Arg: yyDollar[3].exprUnion(), OverClause: yyDollar[5].overClauseUnion()}
 		}
 		yyVAL.union = yyLOCAL
 	case 1194:
-		yyDollar = yyS[yypt-8 : yypt+1]
+		yyDollar = yyS[yypt-5 : yypt+1]
 		var yyLOCAL Expr
 //line sql.y:6134
 		{
-			yyLOCAL = &GroupConcatExpr{Distinct: yyDollar[3].booleanUnion(), Exprs: yyDollar[4].exprsUnion(), OrderBy: yyDollar[5].orderByUnion(), Separator: yyDollar[6].str, Limit: yyDollar[7].limitUnion()}
+			yyLOCAL = &Variance{Arg: yyDollar[3].exprUnion(), OverClause: yyDollar[5].overClauseUnion()}
 		}
 		yyVAL.union = yyLOCAL
 	case 1195:
-		yyDollar = yyS[yypt-4 : yypt+1]
+		yyDollar = yyS[yypt-8 : yypt+1]
 		var yyLOCAL Expr
 //line sql.y:6138
 		{
-			yyLOCAL = &AnyValue{Arg: yyDollar[3].exprUnion()}
+			yyLOCAL = &GroupConcatExpr{Distinct: yyDollar[3].booleanUnion(), Exprs: yyDollar[4].exprsUnion(), OrderBy: yyDollar[5].orderByUnion(), Separator: yyDollar[6].str, Limit: yyDollar[7].limitUnion()}
 		}
 		yyVAL.union = yyLOCAL
 	case 1196:
-		yyDollar = yyS[yypt-8 : yypt+1]
+		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Expr
 //line sql.y:6142
 		{
-			yyLOCAL = &IntervalDateExpr{Syntax: IntervalDateExprTimestampadd, Date: yyDollar[7].exprUnion(), Interval: yyDollar[5].exprUnion(), Unit: yyDollar[3].intervalTypeUnion()}
+			yyLOCAL = &AnyValue{Arg: yyDollar[3].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
 	case 1197:
@@ -19171,31 +19134,31 @@ yydefault:
 		var yyLOCAL Expr
 //line sql.y:6146
 		{
-			yyLOCAL = &TimestampDiffExpr{Unit: yyDollar[3].intervalTypeUnion(), Expr1: yyDollar[5].exprUnion(), Expr2: yyDollar[7].exprUnion()}
+			yyLOCAL = &IntervalDateExpr{Syntax: IntervalDateExprTimestampadd, Date: yyDollar[7].exprUnion(), Interval: yyDollar[5].exprUnion(), Unit: yyDollar[3].intervalTypeUnion()}
 		}
 		yyVAL.union = yyLOCAL
 	case 1198:
-		yyDollar = yyS[yypt-6 : yypt+1]
+		yyDollar = yyS[yypt-8 : yypt+1]
 		var yyLOCAL Expr
 //line sql.y:6150
 		{
-			yyLOCAL = &ExtractFuncExpr{IntervalType: yyDollar[3].intervalTypeUnion(), Expr: yyDollar[5].exprUnion()}
+			yyLOCAL = &TimestampDiffExpr{Unit: yyDollar[3].intervalTypeUnion(), Expr1: yyDollar[5].exprUnion(), Expr2: yyDollar[7].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
 	case 1199:
-		yyDollar = yyS[yypt-5 : yypt+1]
+		yyDollar = yyS[yypt-6 : yypt+1]
 		var yyLOCAL Expr
 //line sql.y:6154
 		{
-			yyLOCAL = &WeightStringFuncExpr{Expr: yyDollar[3].exprUnion(), As: yyDollar[4].convertTypeUnion()}
+			yyLOCAL = &ExtractFuncExpr{IntervalType: yyDollar[3].intervalTypeUnion(), Expr: yyDollar[5].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
 	case 1200:
-		yyDollar = yyS[yypt-4 : yypt+1]
+		yyDollar = yyS[yypt-5 : yypt+1]
 		var yyLOCAL Expr
 //line sql.y:6158
 		{
-			yyLOCAL = &JSONPrettyExpr{JSONVal: yyDollar[3].exprUnion()}
+			yyLOCAL = &WeightStringFuncExpr{Expr: yyDollar[3].exprUnion(), As: yyDollar[4].convertTypeUnion()}
 		}
 		yyVAL.union = yyLOCAL
 	case 1201:
@@ -19203,7 +19166,7 @@ yydefault:
 		var yyLOCAL Expr
 //line sql.y:6162
 		{
-			yyLOCAL = &JSONStorageFreeExpr{JSONVal: yyDollar[3].exprUnion()}
+			yyLOCAL = &JSONPrettyExpr{JSONVal: yyDollar[3].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
 	case 1202:
@@ -19211,31 +19174,31 @@ yydefault:
 		var yyLOCAL Expr
 //line sql.y:6166
 		{
-			yyLOCAL = &JSONStorageSizeExpr{JSONVal: yyDollar[3].exprUnion()}
+			yyLOCAL = &JSONStorageFreeExpr{JSONVal: yyDollar[3].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
 	case 1203:
-		yyDollar = yyS[yypt-5 : yypt+1]
+		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Expr
 //line sql.y:6170
 		{
-			yyLOCAL = &JSONArrayAgg{Expr: yyDollar[3].exprUnion(), OverClause: yyDollar[5].overClauseUnion()}
+			yyLOCAL = &JSONStorageSizeExpr{JSONVal: yyDollar[3].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
 	case 1204:
-		yyDollar = yyS[yypt-7 : yypt+1]
+		yyDollar = yyS[yypt-5 : yypt+1]
 		var yyLOCAL Expr
 //line sql.y:6174
 		{
-			yyLOCAL = &JSONObjectAgg{Key: yyDollar[3].exprUnion(), Value: yyDollar[5].exprUnion(), OverClause: yyDollar[7].overClauseUnion()}
+			yyLOCAL = &JSONArrayAgg{Expr: yyDollar[3].exprUnion(), OverClause: yyDollar[5].overClauseUnion()}
 		}
 		yyVAL.union = yyLOCAL
 	case 1205:
-		yyDollar = yyS[yypt-4 : yypt+1]
+		yyDollar = yyS[yypt-7 : yypt+1]
 		var yyLOCAL Expr
 //line sql.y:6178
 		{
-			yyLOCAL = &TrimFuncExpr{TrimFuncType: LTrimType, Type: LeadingTrimType, StringArg: yyDollar[3].exprUnion()}
+			yyLOCAL = &JSONObjectAgg{Key: yyDollar[3].exprUnion(), Value: yyDollar[5].exprUnion(), OverClause: yyDollar[7].overClauseUnion()}
 		}
 		yyVAL.union = yyLOCAL
 	case 1206:
@@ -19243,23 +19206,23 @@ yydefault:
 		var yyLOCAL Expr
 //line sql.y:6182
 		{
-			yyLOCAL = &TrimFuncExpr{TrimFuncType: RTrimType, Type: TrailingTrimType, StringArg: yyDollar[3].exprUnion()}
+			yyLOCAL = &TrimFuncExpr{TrimFuncType: LTrimType, Type: LeadingTrimType, StringArg: yyDollar[3].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
 	case 1207:
-		yyDollar = yyS[yypt-7 : yypt+1]
+		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Expr
 //line sql.y:6186
 		{
-			yyLOCAL = &TrimFuncExpr{Type: yyDollar[3].trimTypeUnion(), TrimArg: yyDollar[4].exprUnion(), StringArg: yyDollar[6].exprUnion()}
+			yyLOCAL = &TrimFuncExpr{TrimFuncType: RTrimType, Type: TrailingTrimType, StringArg: yyDollar[3].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
 	case 1208:
-		yyDollar = yyS[yypt-4 : yypt+1]
+		yyDollar = yyS[yypt-7 : yypt+1]
 		var yyLOCAL Expr
 //line sql.y:6190
 		{
-			yyLOCAL = &TrimFuncExpr{StringArg: yyDollar[3].exprUnion()}
+			yyLOCAL = &TrimFuncExpr{Type: yyDollar[3].trimTypeUnion(), TrimArg: yyDollar[4].exprUnion(), StringArg: yyDollar[6].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
 	case 1209:
@@ -19267,15 +19230,15 @@ yydefault:
 		var yyLOCAL Expr
 //line sql.y:6194
 		{
-			yyLOCAL = &CharExpr{Exprs: yyDollar[3].exprsUnion()}
+			yyLOCAL = &TrimFuncExpr{StringArg: yyDollar[3].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
 	case 1210:
-		yyDollar = yyS[yypt-6 : yypt+1]
+		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Expr
 //line sql.y:6198
 		{
-			yyLOCAL = &CharExpr{Exprs: yyDollar[3].exprsUnion(), Charset: yyDollar[5].str}
+			yyLOCAL = &CharExpr{Exprs: yyDollar[3].exprsUnion()}
 		}
 		yyVAL.union = yyLOCAL
 	case 1211:
@@ -19283,7 +19246,7 @@ yydefault:
 		var yyLOCAL Expr
 //line sql.y:6202
 		{
-			yyLOCAL = &TrimFuncExpr{TrimArg: yyDollar[3].exprUnion(), StringArg: yyDollar[5].exprUnion()}
+			yyLOCAL = &CharExpr{Exprs: yyDollar[3].exprsUnion(), Charset: yyDollar[5].str}
 		}
 		yyVAL.union = yyLOCAL
 	case 1212:
@@ -19291,23 +19254,23 @@ yydefault:
 		var yyLOCAL Expr
 //line sql.y:6206
 		{
-			yyLOCAL = &LocateExpr{SubStr: yyDollar[3].exprUnion(), Str: yyDollar[5].exprUnion()}
+			yyLOCAL = &TrimFuncExpr{TrimArg: yyDollar[3].exprUnion(), StringArg: yyDollar[5].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
 	case 1213:
-		yyDollar = yyS[yypt-8 : yypt+1]
+		yyDollar = yyS[yypt-6 : yypt+1]
 		var yyLOCAL Expr
 //line sql.y:6210
 		{
-			yyLOCAL = &LocateExpr{SubStr: yyDollar[3].exprUnion(), Str: yyDollar[5].exprUnion(), Pos: yyDollar[7].exprUnion()}
+			yyLOCAL = &LocateExpr{SubStr: yyDollar[3].exprUnion(), Str: yyDollar[5].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
 	case 1214:
-		yyDollar = yyS[yypt-6 : yypt+1]
+		yyDollar = yyS[yypt-8 : yypt+1]
 		var yyLOCAL Expr
 //line sql.y:6214
 		{
-			yyLOCAL = &LocateExpr{SubStr: yyDollar[3].exprUnion(), Str: yyDollar[5].exprUnion()}
+			yyLOCAL = &LocateExpr{SubStr: yyDollar[3].exprUnion(), Str: yyDollar[5].exprUnion(), Pos: yyDollar[7].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
 	case 1215:
@@ -19315,15 +19278,15 @@ yydefault:
 		var yyLOCAL Expr
 //line sql.y:6218
 		{
-			yyLOCAL = &LockingFunc{Type: GetLock, Name: yyDollar[3].exprUnion(), Timeout: yyDollar[5].exprUnion()}
+			yyLOCAL = &LocateExpr{SubStr: yyDollar[3].exprUnion(), Str: yyDollar[5].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
 	case 1216:
-		yyDollar = yyS[yypt-4 : yypt+1]
+		yyDollar = yyS[yypt-6 : yypt+1]
 		var yyLOCAL Expr
 //line sql.y:6222
 		{
-			yyLOCAL = &LockingFunc{Type: IsFreeLock, Name: yyDollar[3].exprUnion()}
+			yyLOCAL = &LockingFunc{Type: GetLock, Name: yyDollar[3].exprUnion(), Timeout: yyDollar[5].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
 	case 1217:
@@ -19331,31 +19294,31 @@ yydefault:
 		var yyLOCAL Expr
 //line sql.y:6226
 		{
-			yyLOCAL = &LockingFunc{Type: IsUsedLock, Name: yyDollar[3].exprUnion()}
+			yyLOCAL = &LockingFunc{Type: IsFreeLock, Name: yyDollar[3].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
 	case 1218:
-		yyDollar = yyS[yypt-3 : yypt+1]
+		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Expr
 //line sql.y:6230
 		{
-			yyLOCAL = &LockingFunc{Type: ReleaseAllLocks}
+			yyLOCAL = &LockingFunc{Type: IsUsedLock, Name: yyDollar[3].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
 	case 1219:
-		yyDollar = yyS[yypt-4 : yypt+1]
+		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL Expr
 //line sql.y:6234
 		{
-			yyLOCAL = &LockingFunc{Type: ReleaseLock, Name: yyDollar[3].exprUnion()}
+			yyLOCAL = &LockingFunc{Type: ReleaseAllLocks}
 		}
 		yyVAL.union = yyLOCAL
 	case 1220:
-		yyDollar = yyS[yypt-6 : yypt+1]
+		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Expr
 //line sql.y:6238
 		{
-			yyLOCAL = &JSONSchemaValidFuncExpr{Schema: yyDollar[3].exprUnion(), Document: yyDollar[5].exprUnion()}
+			yyLOCAL = &LockingFunc{Type: ReleaseLock, Name: yyDollar[3].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
 	case 1221:
@@ -19363,15 +19326,15 @@ yydefault:
 		var yyLOCAL Expr
 //line sql.y:6242
 		{
-			yyLOCAL = &JSONSchemaValidationReportFuncExpr{Schema: yyDollar[3].exprUnion(), Document: yyDollar[5].exprUnion()}
+			yyLOCAL = &JSONSchemaValidFuncExpr{Schema: yyDollar[3].exprUnion(), Document: yyDollar[5].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
 	case 1222:
-		yyDollar = yyS[yypt-4 : yypt+1]
+		yyDollar = yyS[yypt-6 : yypt+1]
 		var yyLOCAL Expr
 //line sql.y:6246
 		{
-			yyLOCAL = &JSONArrayExpr{Params: yyDollar[3].exprsUnion()}
+			yyLOCAL = &JSONSchemaValidationReportFuncExpr{Schema: yyDollar[3].exprUnion(), Document: yyDollar[5].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
 	case 1223:
@@ -19379,39 +19342,39 @@ yydefault:
 		var yyLOCAL Expr
 //line sql.y:6250
 		{
-			yyLOCAL = &GeomFormatExpr{FormatType: BinaryFormat, Geom: yyDollar[3].exprUnion()}
+			yyLOCAL = &JSONArrayExpr{Params: yyDollar[3].exprsUnion()}
 		}
 		yyVAL.union = yyLOCAL
 	case 1224:
-		yyDollar = yyS[yypt-6 : yypt+1]
+		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Expr
 //line sql.y:6254
 		{
-			yyLOCAL = &GeomFormatExpr{FormatType: BinaryFormat, Geom: yyDollar[3].exprUnion(), AxisOrderOpt: yyDollar[5].exprUnion()}
+			yyLOCAL = &GeomFormatExpr{FormatType: BinaryFormat, Geom: yyDollar[3].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
 	case 1225:
-		yyDollar = yyS[yypt-4 : yypt+1]
+		yyDollar = yyS[yypt-6 : yypt+1]
 		var yyLOCAL Expr
 //line sql.y:6258
 		{
-			yyLOCAL = &GeomFormatExpr{FormatType: TextFormat, Geom: yyDollar[3].exprUnion()}
+			yyLOCAL = &GeomFormatExpr{FormatType: BinaryFormat, Geom: yyDollar[3].exprUnion(), AxisOrderOpt: yyDollar[5].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
 	case 1226:
-		yyDollar = yyS[yypt-6 : yypt+1]
+		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Expr
 //line sql.y:6262
 		{
-			yyLOCAL = &GeomFormatExpr{FormatType: TextFormat, Geom: yyDollar[3].exprUnion(), AxisOrderOpt: yyDollar[5].exprUnion()}
+			yyLOCAL = &GeomFormatExpr{FormatType: TextFormat, Geom: yyDollar[3].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
 	case 1227:
-		yyDollar = yyS[yypt-4 : yypt+1]
+		yyDollar = yyS[yypt-6 : yypt+1]
 		var yyLOCAL Expr
 //line sql.y:6266
 		{
-			yyLOCAL = &GeomPropertyFuncExpr{Property: IsEmpty, Geom: yyDollar[3].exprUnion()}
+			yyLOCAL = &GeomFormatExpr{FormatType: TextFormat, Geom: yyDollar[3].exprUnion(), AxisOrderOpt: yyDollar[5].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
 	case 1228:
@@ -19419,7 +19382,7 @@ yydefault:
 		var yyLOCAL Expr
 //line sql.y:6270
 		{
-			yyLOCAL = &GeomPropertyFuncExpr{Property: IsSimple, Geom: yyDollar[3].exprUnion()}
+			yyLOCAL = &GeomPropertyFuncExpr{Property: IsEmpty, Geom: yyDollar[3].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
 	case 1229:
@@ -19427,7 +19390,7 @@ yydefault:
 		var yyLOCAL Expr
 //line sql.y:6274
 		{
-			yyLOCAL = &GeomPropertyFuncExpr{Property: Dimension, Geom: yyDollar[3].exprUnion()}
+			yyLOCAL = &GeomPropertyFuncExpr{Property: IsSimple, Geom: yyDollar[3].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
 	case 1230:
@@ -19435,7 +19398,7 @@ yydefault:
 		var yyLOCAL Expr
 //line sql.y:6278
 		{
-			yyLOCAL = &GeomPropertyFuncExpr{Property: Envelope, Geom: yyDollar[3].exprUnion()}
+			yyLOCAL = &GeomPropertyFuncExpr{Property: Dimension, Geom: yyDollar[3].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
 	case 1231:
@@ -19443,7 +19406,7 @@ yydefault:
 		var yyLOCAL Expr
 //line sql.y:6282
 		{
-			yyLOCAL = &GeomPropertyFuncExpr{Property: GeometryType, Geom: yyDollar[3].exprUnion()}
+			yyLOCAL = &GeomPropertyFuncExpr{Property: Envelope, Geom: yyDollar[3].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
 	case 1232:
@@ -19451,39 +19414,39 @@ yydefault:
 		var yyLOCAL Expr
 //line sql.y:6286
 		{
-			yyLOCAL = &PointPropertyFuncExpr{Property: Latitude, Point: yyDollar[3].exprUnion()}
+			yyLOCAL = &GeomPropertyFuncExpr{Property: GeometryType, Geom: yyDollar[3].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
 	case 1233:
-		yyDollar = yyS[yypt-6 : yypt+1]
+		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Expr
 //line sql.y:6290
 		{
-			yyLOCAL = &PointPropertyFuncExpr{Property: Latitude, Point: yyDollar[3].exprUnion(), ValueToSet: yyDollar[5].exprUnion()}
+			yyLOCAL = &PointPropertyFuncExpr{Property: Latitude, Point: yyDollar[3].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
 	case 1234:
-		yyDollar = yyS[yypt-4 : yypt+1]
+		yyDollar = yyS[yypt-6 : yypt+1]
 		var yyLOCAL Expr
 //line sql.y:6294
 		{
-			yyLOCAL = &PointPropertyFuncExpr{Property: Longitude, Point: yyDollar[3].exprUnion()}
+			yyLOCAL = &PointPropertyFuncExpr{Property: Latitude, Point: yyDollar[3].exprUnion(), ValueToSet: yyDollar[5].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
 	case 1235:
-		yyDollar = yyS[yypt-6 : yypt+1]
+		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Expr
 //line sql.y:6298
 		{
-			yyLOCAL = &PointPropertyFuncExpr{Property: Longitude, Point: yyDollar[3].exprUnion(), ValueToSet: yyDollar[5].exprUnion()}
+			yyLOCAL = &PointPropertyFuncExpr{Property: Longitude, Point: yyDollar[3].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
 	case 1236:
-		yyDollar = yyS[yypt-4 : yypt+1]
+		yyDollar = yyS[yypt-6 : yypt+1]
 		var yyLOCAL Expr
 //line sql.y:6302
 		{
-			yyLOCAL = &LinestrPropertyFuncExpr{Property: EndPoint, Linestring: yyDollar[3].exprUnion()}
+			yyLOCAL = &PointPropertyFuncExpr{Property: Longitude, Point: yyDollar[3].exprUnion(), ValueToSet: yyDollar[5].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
 	case 1237:
@@ -19491,7 +19454,7 @@ yydefault:
 		var yyLOCAL Expr
 //line sql.y:6306
 		{
-			yyLOCAL = &LinestrPropertyFuncExpr{Property: IsClosed, Linestring: yyDollar[3].exprUnion()}
+			yyLOCAL = &LinestrPropertyFuncExpr{Property: EndPoint, Linestring: yyDollar[3].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
 	case 1238:
@@ -19499,39 +19462,39 @@ yydefault:
 		var yyLOCAL Expr
 //line sql.y:6310
 		{
-			yyLOCAL = &LinestrPropertyFuncExpr{Property: Length, Linestring: yyDollar[3].exprUnion()}
+			yyLOCAL = &LinestrPropertyFuncExpr{Property: IsClosed, Linestring: yyDollar[3].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
 	case 1239:
-		yyDollar = yyS[yypt-6 : yypt+1]
+		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Expr
 //line sql.y:6314
 		{
-			yyLOCAL = &LinestrPropertyFuncExpr{Property: Length, Linestring: yyDollar[3].exprUnion(), PropertyDefArg: yyDollar[5].exprUnion()}
+			yyLOCAL = &LinestrPropertyFuncExpr{Property: Length, Linestring: yyDollar[3].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
 	case 1240:
-		yyDollar = yyS[yypt-4 : yypt+1]
+		yyDollar = yyS[yypt-6 : yypt+1]
 		var yyLOCAL Expr
 //line sql.y:6318
 		{
-			yyLOCAL = &LinestrPropertyFuncExpr{Property: NumPoints, Linestring: yyDollar[3].exprUnion()}
+			yyLOCAL = &LinestrPropertyFuncExpr{Property: Length, Linestring: yyDollar[3].exprUnion(), PropertyDefArg: yyDollar[5].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
 	case 1241:
-		yyDollar = yyS[yypt-6 : yypt+1]
+		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Expr
 //line sql.y:6322
 		{
-			yyLOCAL = &LinestrPropertyFuncExpr{Property: PointN, Linestring: yyDollar[3].exprUnion(), PropertyDefArg: yyDollar[5].exprUnion()}
+			yyLOCAL = &LinestrPropertyFuncExpr{Property: NumPoints, Linestring: yyDollar[3].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
 	case 1242:
-		yyDollar = yyS[yypt-4 : yypt+1]
+		yyDollar = yyS[yypt-6 : yypt+1]
 		var yyLOCAL Expr
 //line sql.y:6326
 		{
-			yyLOCAL = &LinestrPropertyFuncExpr{Property: StartPoint, Linestring: yyDollar[3].exprUnion()}
+			yyLOCAL = &LinestrPropertyFuncExpr{Property: PointN, Linestring: yyDollar[3].exprUnion(), PropertyDefArg: yyDollar[5].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
 	case 1243:
@@ -19539,423 +19502,423 @@ yydefault:
 		var yyLOCAL Expr
 //line sql.y:6330
 		{
-			yyLOCAL = &PointPropertyFuncExpr{Property: XCordinate, Point: yyDollar[3].exprUnion()}
+			yyLOCAL = &LinestrPropertyFuncExpr{Property: StartPoint, Linestring: yyDollar[3].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
 	case 1244:
-		yyDollar = yyS[yypt-6 : yypt+1]
+		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Expr
 //line sql.y:6334
 		{
-			yyLOCAL = &PointPropertyFuncExpr{Property: XCordinate, Point: yyDollar[3].exprUnion(), ValueToSet: yyDollar[5].exprUnion()}
+			yyLOCAL = &PointPropertyFuncExpr{Property: XCordinate, Point: yyDollar[3].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
 	case 1245:
-		yyDollar = yyS[yypt-4 : yypt+1]
+		yyDollar = yyS[yypt-6 : yypt+1]
 		var yyLOCAL Expr
 //line sql.y:6338
 		{
-			yyLOCAL = &PointPropertyFuncExpr{Property: YCordinate, Point: yyDollar[3].exprUnion()}
+			yyLOCAL = &PointPropertyFuncExpr{Property: XCordinate, Point: yyDollar[3].exprUnion(), ValueToSet: yyDollar[5].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
 	case 1246:
-		yyDollar = yyS[yypt-6 : yypt+1]
+		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Expr
 //line sql.y:6342
 		{
-			yyLOCAL = &PointPropertyFuncExpr{Property: YCordinate, Point: yyDollar[3].exprUnion(), ValueToSet: yyDollar[5].exprUnion()}
+			yyLOCAL = &PointPropertyFuncExpr{Property: YCordinate, Point: yyDollar[3].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
 	case 1247:
-		yyDollar = yyS[yypt-4 : yypt+1]
+		yyDollar = yyS[yypt-6 : yypt+1]
 		var yyLOCAL Expr
 //line sql.y:6346
 		{
-			yyLOCAL = &GeomFromTextExpr{Type: GeometryFromText, WktText: yyDollar[3].exprUnion()}
+			yyLOCAL = &PointPropertyFuncExpr{Property: YCordinate, Point: yyDollar[3].exprUnion(), ValueToSet: yyDollar[5].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
 	case 1248:
-		yyDollar = yyS[yypt-6 : yypt+1]
+		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Expr
 //line sql.y:6350
 		{
-			yyLOCAL = &GeomFromTextExpr{Type: GeometryFromText, WktText: yyDollar[3].exprUnion(), Srid: yyDollar[5].exprUnion()}
+			yyLOCAL = &GeomFromTextExpr{Type: GeometryFromText, WktText: yyDollar[3].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
 	case 1249:
-		yyDollar = yyS[yypt-8 : yypt+1]
+		yyDollar = yyS[yypt-6 : yypt+1]
 		var yyLOCAL Expr
 //line sql.y:6354
 		{
-			yyLOCAL = &GeomFromTextExpr{Type: GeometryFromText, WktText: yyDollar[3].exprUnion(), Srid: yyDollar[5].exprUnion(), AxisOrderOpt: yyDollar[7].exprUnion()}
+			yyLOCAL = &GeomFromTextExpr{Type: GeometryFromText, WktText: yyDollar[3].exprUnion(), Srid: yyDollar[5].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
 	case 1250:
-		yyDollar = yyS[yypt-4 : yypt+1]
+		yyDollar = yyS[yypt-8 : yypt+1]
 		var yyLOCAL Expr
 //line sql.y:6358
 		{
-			yyLOCAL = &GeomFromTextExpr{Type: GeometryCollectionFromText, WktText: yyDollar[3].exprUnion()}
+			yyLOCAL = &GeomFromTextExpr{Type: GeometryFromText, WktText: yyDollar[3].exprUnion(), Srid: yyDollar[5].exprUnion(), AxisOrderOpt: yyDollar[7].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
 	case 1251:
-		yyDollar = yyS[yypt-6 : yypt+1]
+		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Expr
 //line sql.y:6362
 		{
-			yyLOCAL = &GeomFromTextExpr{Type: GeometryCollectionFromText, WktText: yyDollar[3].exprUnion(), Srid: yyDollar[5].exprUnion()}
+			yyLOCAL = &GeomFromTextExpr{Type: GeometryCollectionFromText, WktText: yyDollar[3].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
 	case 1252:
-		yyDollar = yyS[yypt-8 : yypt+1]
+		yyDollar = yyS[yypt-6 : yypt+1]
 		var yyLOCAL Expr
 //line sql.y:6366
 		{
-			yyLOCAL = &GeomFromTextExpr{Type: GeometryCollectionFromText, WktText: yyDollar[3].exprUnion(), Srid: yyDollar[5].exprUnion(), AxisOrderOpt: yyDollar[7].exprUnion()}
+			yyLOCAL = &GeomFromTextExpr{Type: GeometryCollectionFromText, WktText: yyDollar[3].exprUnion(), Srid: yyDollar[5].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
 	case 1253:
-		yyDollar = yyS[yypt-4 : yypt+1]
+		yyDollar = yyS[yypt-8 : yypt+1]
 		var yyLOCAL Expr
 //line sql.y:6370
 		{
-			yyLOCAL = &GeomFromTextExpr{Type: LineStringFromText, WktText: yyDollar[3].exprUnion()}
+			yyLOCAL = &GeomFromTextExpr{Type: GeometryCollectionFromText, WktText: yyDollar[3].exprUnion(), Srid: yyDollar[5].exprUnion(), AxisOrderOpt: yyDollar[7].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
 	case 1254:
-		yyDollar = yyS[yypt-6 : yypt+1]
+		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Expr
 //line sql.y:6374
 		{
-			yyLOCAL = &GeomFromTextExpr{Type: LineStringFromText, WktText: yyDollar[3].exprUnion(), Srid: yyDollar[5].exprUnion()}
+			yyLOCAL = &GeomFromTextExpr{Type: LineStringFromText, WktText: yyDollar[3].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
 	case 1255:
-		yyDollar = yyS[yypt-8 : yypt+1]
+		yyDollar = yyS[yypt-6 : yypt+1]
 		var yyLOCAL Expr
 //line sql.y:6378
 		{
-			yyLOCAL = &GeomFromTextExpr{Type: LineStringFromText, WktText: yyDollar[3].exprUnion(), Srid: yyDollar[5].exprUnion(), AxisOrderOpt: yyDollar[7].exprUnion()}
+			yyLOCAL = &GeomFromTextExpr{Type: LineStringFromText, WktText: yyDollar[3].exprUnion(), Srid: yyDollar[5].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
 	case 1256:
-		yyDollar = yyS[yypt-4 : yypt+1]
+		yyDollar = yyS[yypt-8 : yypt+1]
 		var yyLOCAL Expr
 //line sql.y:6382
 		{
-			yyLOCAL = &GeomFromTextExpr{Type: MultiLinestringFromText, WktText: yyDollar[3].exprUnion()}
+			yyLOCAL = &GeomFromTextExpr{Type: LineStringFromText, WktText: yyDollar[3].exprUnion(), Srid: yyDollar[5].exprUnion(), AxisOrderOpt: yyDollar[7].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
 	case 1257:
-		yyDollar = yyS[yypt-6 : yypt+1]
+		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Expr
 //line sql.y:6386
 		{
-			yyLOCAL = &GeomFromTextExpr{Type: MultiLinestringFromText, WktText: yyDollar[3].exprUnion(), Srid: yyDollar[5].exprUnion()}
+			yyLOCAL = &GeomFromTextExpr{Type: MultiLinestringFromText, WktText: yyDollar[3].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
 	case 1258:
-		yyDollar = yyS[yypt-8 : yypt+1]
+		yyDollar = yyS[yypt-6 : yypt+1]
 		var yyLOCAL Expr
 //line sql.y:6390
 		{
-			yyLOCAL = &GeomFromTextExpr{Type: MultiLinestringFromText, WktText: yyDollar[3].exprUnion(), Srid: yyDollar[5].exprUnion(), AxisOrderOpt: yyDollar[7].exprUnion()}
+			yyLOCAL = &GeomFromTextExpr{Type: MultiLinestringFromText, WktText: yyDollar[3].exprUnion(), Srid: yyDollar[5].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
 	case 1259:
-		yyDollar = yyS[yypt-4 : yypt+1]
+		yyDollar = yyS[yypt-8 : yypt+1]
 		var yyLOCAL Expr
 //line sql.y:6394
 		{
-			yyLOCAL = &GeomFromTextExpr{Type: MultiPointFromText, WktText: yyDollar[3].exprUnion()}
+			yyLOCAL = &GeomFromTextExpr{Type: MultiLinestringFromText, WktText: yyDollar[3].exprUnion(), Srid: yyDollar[5].exprUnion(), AxisOrderOpt: yyDollar[7].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
 	case 1260:
-		yyDollar = yyS[yypt-6 : yypt+1]
+		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Expr
 //line sql.y:6398
 		{
-			yyLOCAL = &GeomFromTextExpr{Type: MultiPointFromText, WktText: yyDollar[3].exprUnion(), Srid: yyDollar[5].exprUnion()}
+			yyLOCAL = &GeomFromTextExpr{Type: MultiPointFromText, WktText: yyDollar[3].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
 	case 1261:
-		yyDollar = yyS[yypt-8 : yypt+1]
+		yyDollar = yyS[yypt-6 : yypt+1]
 		var yyLOCAL Expr
 //line sql.y:6402
 		{
-			yyLOCAL = &GeomFromTextExpr{Type: MultiPointFromText, WktText: yyDollar[3].exprUnion(), Srid: yyDollar[5].exprUnion(), AxisOrderOpt: yyDollar[7].exprUnion()}
+			yyLOCAL = &GeomFromTextExpr{Type: MultiPointFromText, WktText: yyDollar[3].exprUnion(), Srid: yyDollar[5].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
 	case 1262:
-		yyDollar = yyS[yypt-4 : yypt+1]
+		yyDollar = yyS[yypt-8 : yypt+1]
 		var yyLOCAL Expr
 //line sql.y:6406
 		{
-			yyLOCAL = &GeomFromTextExpr{Type: MultiPolygonFromText, WktText: yyDollar[3].exprUnion()}
+			yyLOCAL = &GeomFromTextExpr{Type: MultiPointFromText, WktText: yyDollar[3].exprUnion(), Srid: yyDollar[5].exprUnion(), AxisOrderOpt: yyDollar[7].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
 	case 1263:
-		yyDollar = yyS[yypt-6 : yypt+1]
+		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Expr
 //line sql.y:6410
 		{
-			yyLOCAL = &GeomFromTextExpr{Type: MultiPolygonFromText, WktText: yyDollar[3].exprUnion(), Srid: yyDollar[5].exprUnion()}
+			yyLOCAL = &GeomFromTextExpr{Type: MultiPolygonFromText, WktText: yyDollar[3].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
 	case 1264:
-		yyDollar = yyS[yypt-8 : yypt+1]
+		yyDollar = yyS[yypt-6 : yypt+1]
 		var yyLOCAL Expr
 //line sql.y:6414
 		{
-			yyLOCAL = &GeomFromTextExpr{Type: MultiPolygonFromText, WktText: yyDollar[3].exprUnion(), Srid: yyDollar[5].exprUnion(), AxisOrderOpt: yyDollar[7].exprUnion()}
+			yyLOCAL = &GeomFromTextExpr{Type: MultiPolygonFromText, WktText: yyDollar[3].exprUnion(), Srid: yyDollar[5].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
 	case 1265:
-		yyDollar = yyS[yypt-4 : yypt+1]
+		yyDollar = yyS[yypt-8 : yypt+1]
 		var yyLOCAL Expr
 //line sql.y:6418
 		{
-			yyLOCAL = &GeomFromTextExpr{Type: PointFromText, WktText: yyDollar[3].exprUnion()}
+			yyLOCAL = &GeomFromTextExpr{Type: MultiPolygonFromText, WktText: yyDollar[3].exprUnion(), Srid: yyDollar[5].exprUnion(), AxisOrderOpt: yyDollar[7].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
 	case 1266:
-		yyDollar = yyS[yypt-6 : yypt+1]
+		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Expr
 //line sql.y:6422
 		{
-			yyLOCAL = &GeomFromTextExpr{Type: PointFromText, WktText: yyDollar[3].exprUnion(), Srid: yyDollar[5].exprUnion()}
+			yyLOCAL = &GeomFromTextExpr{Type: PointFromText, WktText: yyDollar[3].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
 	case 1267:
-		yyDollar = yyS[yypt-8 : yypt+1]
+		yyDollar = yyS[yypt-6 : yypt+1]
 		var yyLOCAL Expr
 //line sql.y:6426
 		{
-			yyLOCAL = &GeomFromTextExpr{Type: PointFromText, WktText: yyDollar[3].exprUnion(), Srid: yyDollar[5].exprUnion(), AxisOrderOpt: yyDollar[7].exprUnion()}
+			yyLOCAL = &GeomFromTextExpr{Type: PointFromText, WktText: yyDollar[3].exprUnion(), Srid: yyDollar[5].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
 	case 1268:
-		yyDollar = yyS[yypt-4 : yypt+1]
+		yyDollar = yyS[yypt-8 : yypt+1]
 		var yyLOCAL Expr
 //line sql.y:6430
 		{
-			yyLOCAL = &GeomFromTextExpr{Type: PolygonFromText, WktText: yyDollar[3].exprUnion()}
+			yyLOCAL = &GeomFromTextExpr{Type: PointFromText, WktText: yyDollar[3].exprUnion(), Srid: yyDollar[5].exprUnion(), AxisOrderOpt: yyDollar[7].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
 	case 1269:
-		yyDollar = yyS[yypt-6 : yypt+1]
+		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Expr
 //line sql.y:6434
 		{
-			yyLOCAL = &GeomFromTextExpr{Type: PolygonFromText, WktText: yyDollar[3].exprUnion(), Srid: yyDollar[5].exprUnion()}
+			yyLOCAL = &GeomFromTextExpr{Type: PolygonFromText, WktText: yyDollar[3].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
 	case 1270:
-		yyDollar = yyS[yypt-8 : yypt+1]
+		yyDollar = yyS[yypt-6 : yypt+1]
 		var yyLOCAL Expr
 //line sql.y:6438
 		{
-			yyLOCAL = &GeomFromTextExpr{Type: PolygonFromText, WktText: yyDollar[3].exprUnion(), Srid: yyDollar[5].exprUnion(), AxisOrderOpt: yyDollar[7].exprUnion()}
+			yyLOCAL = &GeomFromTextExpr{Type: PolygonFromText, WktText: yyDollar[3].exprUnion(), Srid: yyDollar[5].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
 	case 1271:
-		yyDollar = yyS[yypt-4 : yypt+1]
+		yyDollar = yyS[yypt-8 : yypt+1]
 		var yyLOCAL Expr
 //line sql.y:6442
 		{
-			yyLOCAL = &GeomFromWKBExpr{Type: GeometryFromWKB, WkbBlob: yyDollar[3].exprUnion()}
+			yyLOCAL = &GeomFromTextExpr{Type: PolygonFromText, WktText: yyDollar[3].exprUnion(), Srid: yyDollar[5].exprUnion(), AxisOrderOpt: yyDollar[7].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
 	case 1272:
-		yyDollar = yyS[yypt-6 : yypt+1]
+		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Expr
 //line sql.y:6446
 		{
-			yyLOCAL = &GeomFromWKBExpr{Type: GeometryFromWKB, WkbBlob: yyDollar[3].exprUnion(), Srid: yyDollar[5].exprUnion()}
+			yyLOCAL = &GeomFromWKBExpr{Type: GeometryFromWKB, WkbBlob: yyDollar[3].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
 	case 1273:
-		yyDollar = yyS[yypt-8 : yypt+1]
+		yyDollar = yyS[yypt-6 : yypt+1]
 		var yyLOCAL Expr
 //line sql.y:6450
 		{
-			yyLOCAL = &GeomFromWKBExpr{Type: GeometryFromWKB, WkbBlob: yyDollar[3].exprUnion(), Srid: yyDollar[5].exprUnion(), AxisOrderOpt: yyDollar[7].exprUnion()}
+			yyLOCAL = &GeomFromWKBExpr{Type: GeometryFromWKB, WkbBlob: yyDollar[3].exprUnion(), Srid: yyDollar[5].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
 	case 1274:
-		yyDollar = yyS[yypt-4 : yypt+1]
+		yyDollar = yyS[yypt-8 : yypt+1]
 		var yyLOCAL Expr
 //line sql.y:6454
 		{
-			yyLOCAL = &GeomFromWKBExpr{Type: GeometryCollectionFromWKB, WkbBlob: yyDollar[3].exprUnion()}
+			yyLOCAL = &GeomFromWKBExpr{Type: GeometryFromWKB, WkbBlob: yyDollar[3].exprUnion(), Srid: yyDollar[5].exprUnion(), AxisOrderOpt: yyDollar[7].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
 	case 1275:
-		yyDollar = yyS[yypt-6 : yypt+1]
+		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Expr
 //line sql.y:6458
 		{
-			yyLOCAL = &GeomFromWKBExpr{Type: GeometryCollectionFromWKB, WkbBlob: yyDollar[3].exprUnion(), Srid: yyDollar[5].exprUnion()}
+			yyLOCAL = &GeomFromWKBExpr{Type: GeometryCollectionFromWKB, WkbBlob: yyDollar[3].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
 	case 1276:
-		yyDollar = yyS[yypt-8 : yypt+1]
+		yyDollar = yyS[yypt-6 : yypt+1]
 		var yyLOCAL Expr
 //line sql.y:6462
 		{
-			yyLOCAL = &GeomFromWKBExpr{Type: GeometryCollectionFromWKB, WkbBlob: yyDollar[3].exprUnion(), Srid: yyDollar[5].exprUnion(), AxisOrderOpt: yyDollar[7].exprUnion()}
+			yyLOCAL = &GeomFromWKBExpr{Type: GeometryCollectionFromWKB, WkbBlob: yyDollar[3].exprUnion(), Srid: yyDollar[5].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
 	case 1277:
-		yyDollar = yyS[yypt-4 : yypt+1]
+		yyDollar = yyS[yypt-8 : yypt+1]
 		var yyLOCAL Expr
 //line sql.y:6466
 		{
-			yyLOCAL = &GeomFromWKBExpr{Type: LineStringFromWKB, WkbBlob: yyDollar[3].exprUnion()}
+			yyLOCAL = &GeomFromWKBExpr{Type: GeometryCollectionFromWKB, WkbBlob: yyDollar[3].exprUnion(), Srid: yyDollar[5].exprUnion(), AxisOrderOpt: yyDollar[7].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
 	case 1278:
-		yyDollar = yyS[yypt-6 : yypt+1]
+		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Expr
 //line sql.y:6470
 		{
-			yyLOCAL = &GeomFromWKBExpr{Type: LineStringFromWKB, WkbBlob: yyDollar[3].exprUnion(), Srid: yyDollar[5].exprUnion()}
+			yyLOCAL = &GeomFromWKBExpr{Type: LineStringFromWKB, WkbBlob: yyDollar[3].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
 	case 1279:
-		yyDollar = yyS[yypt-8 : yypt+1]
+		yyDollar = yyS[yypt-6 : yypt+1]
 		var yyLOCAL Expr
 //line sql.y:6474
 		{
-			yyLOCAL = &GeomFromWKBExpr{Type: LineStringFromWKB, WkbBlob: yyDollar[3].exprUnion(), Srid: yyDollar[5].exprUnion(), AxisOrderOpt: yyDollar[7].exprUnion()}
+			yyLOCAL = &GeomFromWKBExpr{Type: LineStringFromWKB, WkbBlob: yyDollar[3].exprUnion(), Srid: yyDollar[5].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
 	case 1280:
-		yyDollar = yyS[yypt-4 : yypt+1]
+		yyDollar = yyS[yypt-8 : yypt+1]
 		var yyLOCAL Expr
 //line sql.y:6478
 		{
-			yyLOCAL = &GeomFromWKBExpr{Type: MultiLinestringFromWKB, WkbBlob: yyDollar[3].exprUnion()}
+			yyLOCAL = &GeomFromWKBExpr{Type: LineStringFromWKB, WkbBlob: yyDollar[3].exprUnion(), Srid: yyDollar[5].exprUnion(), AxisOrderOpt: yyDollar[7].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
 	case 1281:
-		yyDollar = yyS[yypt-6 : yypt+1]
+		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Expr
 //line sql.y:6482
 		{
-			yyLOCAL = &GeomFromWKBExpr{Type: MultiLinestringFromWKB, WkbBlob: yyDollar[3].exprUnion(), Srid: yyDollar[5].exprUnion()}
+			yyLOCAL = &GeomFromWKBExpr{Type: MultiLinestringFromWKB, WkbBlob: yyDollar[3].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
 	case 1282:
-		yyDollar = yyS[yypt-8 : yypt+1]
+		yyDollar = yyS[yypt-6 : yypt+1]
 		var yyLOCAL Expr
 //line sql.y:6486
 		{
-			yyLOCAL = &GeomFromWKBExpr{Type: MultiLinestringFromWKB, WkbBlob: yyDollar[3].exprUnion(), Srid: yyDollar[5].exprUnion(), AxisOrderOpt: yyDollar[7].exprUnion()}
+			yyLOCAL = &GeomFromWKBExpr{Type: MultiLinestringFromWKB, WkbBlob: yyDollar[3].exprUnion(), Srid: yyDollar[5].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
 	case 1283:
-		yyDollar = yyS[yypt-4 : yypt+1]
+		yyDollar = yyS[yypt-8 : yypt+1]
 		var yyLOCAL Expr
 //line sql.y:6490
 		{
-			yyLOCAL = &GeomFromWKBExpr{Type: MultiPointFromWKB, WkbBlob: yyDollar[3].exprUnion()}
+			yyLOCAL = &GeomFromWKBExpr{Type: MultiLinestringFromWKB, WkbBlob: yyDollar[3].exprUnion(), Srid: yyDollar[5].exprUnion(), AxisOrderOpt: yyDollar[7].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
 	case 1284:
-		yyDollar = yyS[yypt-6 : yypt+1]
+		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Expr
 //line sql.y:6494
 		{
-			yyLOCAL = &GeomFromWKBExpr{Type: MultiPointFromWKB, WkbBlob: yyDollar[3].exprUnion(), Srid: yyDollar[5].exprUnion()}
+			yyLOCAL = &GeomFromWKBExpr{Type: MultiPointFromWKB, WkbBlob: yyDollar[3].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
 	case 1285:
-		yyDollar = yyS[yypt-8 : yypt+1]
+		yyDollar = yyS[yypt-6 : yypt+1]
 		var yyLOCAL Expr
 //line sql.y:6498
 		{
-			yyLOCAL = &GeomFromWKBExpr{Type: MultiPointFromWKB, WkbBlob: yyDollar[3].exprUnion(), Srid: yyDollar[5].exprUnion(), AxisOrderOpt: yyDollar[7].exprUnion()}
+			yyLOCAL = &GeomFromWKBExpr{Type: MultiPointFromWKB, WkbBlob: yyDollar[3].exprUnion(), Srid: yyDollar[5].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
 	case 1286:
-		yyDollar = yyS[yypt-4 : yypt+1]
+		yyDollar = yyS[yypt-8 : yypt+1]
 		var yyLOCAL Expr
 //line sql.y:6502
 		{
-			yyLOCAL = &GeomFromWKBExpr{Type: MultiPolygonFromWKB, WkbBlob: yyDollar[3].exprUnion()}
+			yyLOCAL = &GeomFromWKBExpr{Type: MultiPointFromWKB, WkbBlob: yyDollar[3].exprUnion(), Srid: yyDollar[5].exprUnion(), AxisOrderOpt: yyDollar[7].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
 	case 1287:
-		yyDollar = yyS[yypt-6 : yypt+1]
+		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Expr
 //line sql.y:6506
 		{
-			yyLOCAL = &GeomFromWKBExpr{Type: MultiPolygonFromWKB, WkbBlob: yyDollar[3].exprUnion(), Srid: yyDollar[5].exprUnion()}
+			yyLOCAL = &GeomFromWKBExpr{Type: MultiPolygonFromWKB, WkbBlob: yyDollar[3].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
 	case 1288:
-		yyDollar = yyS[yypt-8 : yypt+1]
+		yyDollar = yyS[yypt-6 : yypt+1]
 		var yyLOCAL Expr
 //line sql.y:6510
 		{
-			yyLOCAL = &GeomFromWKBExpr{Type: MultiPolygonFromWKB, WkbBlob: yyDollar[3].exprUnion(), Srid: yyDollar[5].exprUnion(), AxisOrderOpt: yyDollar[7].exprUnion()}
+			yyLOCAL = &GeomFromWKBExpr{Type: MultiPolygonFromWKB, WkbBlob: yyDollar[3].exprUnion(), Srid: yyDollar[5].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
 	case 1289:
-		yyDollar = yyS[yypt-4 : yypt+1]
+		yyDollar = yyS[yypt-8 : yypt+1]
 		var yyLOCAL Expr
 //line sql.y:6514
 		{
-			yyLOCAL = &GeomFromWKBExpr{Type: PointFromWKB, WkbBlob: yyDollar[3].exprUnion()}
+			yyLOCAL = &GeomFromWKBExpr{Type: MultiPolygonFromWKB, WkbBlob: yyDollar[3].exprUnion(), Srid: yyDollar[5].exprUnion(), AxisOrderOpt: yyDollar[7].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
 	case 1290:
-		yyDollar = yyS[yypt-6 : yypt+1]
+		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Expr
 //line sql.y:6518
 		{
-			yyLOCAL = &GeomFromWKBExpr{Type: PointFromWKB, WkbBlob: yyDollar[3].exprUnion(), Srid: yyDollar[5].exprUnion()}
+			yyLOCAL = &GeomFromWKBExpr{Type: PointFromWKB, WkbBlob: yyDollar[3].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
 	case 1291:
-		yyDollar = yyS[yypt-8 : yypt+1]
+		yyDollar = yyS[yypt-6 : yypt+1]
 		var yyLOCAL Expr
 //line sql.y:6522
 		{
-			yyLOCAL = &GeomFromWKBExpr{Type: PointFromWKB, WkbBlob: yyDollar[3].exprUnion(), Srid: yyDollar[5].exprUnion(), AxisOrderOpt: yyDollar[7].exprUnion()}
+			yyLOCAL = &GeomFromWKBExpr{Type: PointFromWKB, WkbBlob: yyDollar[3].exprUnion(), Srid: yyDollar[5].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
 	case 1292:
-		yyDollar = yyS[yypt-4 : yypt+1]
+		yyDollar = yyS[yypt-8 : yypt+1]
 		var yyLOCAL Expr
 //line sql.y:6526
 		{
-			yyLOCAL = &GeomFromWKBExpr{Type: PolygonFromWKB, WkbBlob: yyDollar[3].exprUnion()}
+			yyLOCAL = &GeomFromWKBExpr{Type: PointFromWKB, WkbBlob: yyDollar[3].exprUnion(), Srid: yyDollar[5].exprUnion(), AxisOrderOpt: yyDollar[7].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
 	case 1293:
-		yyDollar = yyS[yypt-6 : yypt+1]
+		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Expr
 //line sql.y:6530
 		{
-			yyLOCAL = &GeomFromWKBExpr{Type: PolygonFromWKB, WkbBlob: yyDollar[3].exprUnion(), Srid: yyDollar[5].exprUnion()}
+			yyLOCAL = &GeomFromWKBExpr{Type: PolygonFromWKB, WkbBlob: yyDollar[3].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
 	case 1294:
-		yyDollar = yyS[yypt-8 : yypt+1]
+		yyDollar = yyS[yypt-6 : yypt+1]
 		var yyLOCAL Expr
 //line sql.y:6534
 		{
-			yyLOCAL = &GeomFromWKBExpr{Type: PolygonFromWKB, WkbBlob: yyDollar[3].exprUnion(), Srid: yyDollar[5].exprUnion(), AxisOrderOpt: yyDollar[7].exprUnion()}
+			yyLOCAL = &GeomFromWKBExpr{Type: PolygonFromWKB, WkbBlob: yyDollar[3].exprUnion(), Srid: yyDollar[5].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
 	case 1295:
-		yyDollar = yyS[yypt-4 : yypt+1]
+		yyDollar = yyS[yypt-8 : yypt+1]
 		var yyLOCAL Expr
 //line sql.y:6538
 		{
-			yyLOCAL = &PolygonPropertyFuncExpr{Property: Area, Polygon: yyDollar[3].exprUnion()}
+			yyLOCAL = &GeomFromWKBExpr{Type: PolygonFromWKB, WkbBlob: yyDollar[3].exprUnion(), Srid: yyDollar[5].exprUnion(), AxisOrderOpt: yyDollar[7].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
 	case 1296:
@@ -19963,7 +19926,7 @@ yydefault:
 		var yyLOCAL Expr
 //line sql.y:6542
 		{
-			yyLOCAL = &PolygonPropertyFuncExpr{Property: Centroid, Polygon: yyDollar[3].exprUnion()}
+			yyLOCAL = &PolygonPropertyFuncExpr{Property: Area, Polygon: yyDollar[3].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
 	case 1297:
@@ -19971,63 +19934,63 @@ yydefault:
 		var yyLOCAL Expr
 //line sql.y:6546
 		{
-			yyLOCAL = &PolygonPropertyFuncExpr{Property: ExteriorRing, Polygon: yyDollar[3].exprUnion()}
+			yyLOCAL = &PolygonPropertyFuncExpr{Property: Centroid, Polygon: yyDollar[3].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
 	case 1298:
-		yyDollar = yyS[yypt-6 : yypt+1]
+		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Expr
 //line sql.y:6550
 		{
-			yyLOCAL = &PolygonPropertyFuncExpr{Property: InteriorRingN, Polygon: yyDollar[3].exprUnion(), PropertyDefArg: yyDollar[5].exprUnion()}
+			yyLOCAL = &PolygonPropertyFuncExpr{Property: ExteriorRing, Polygon: yyDollar[3].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
 	case 1299:
-		yyDollar = yyS[yypt-4 : yypt+1]
+		yyDollar = yyS[yypt-6 : yypt+1]
 		var yyLOCAL Expr
 //line sql.y:6554
 		{
-			yyLOCAL = &PolygonPropertyFuncExpr{Property: NumInteriorRings, Polygon: yyDollar[3].exprUnion()}
+			yyLOCAL = &PolygonPropertyFuncExpr{Property: InteriorRingN, Polygon: yyDollar[3].exprUnion(), PropertyDefArg: yyDollar[5].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
 	case 1300:
-		yyDollar = yyS[yypt-6 : yypt+1]
+		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Expr
 //line sql.y:6558
 		{
-			yyLOCAL = &GeomCollPropertyFuncExpr{Property: GeometryN, GeomColl: yyDollar[3].exprUnion(), PropertyDefArg: yyDollar[5].exprUnion()}
+			yyLOCAL = &PolygonPropertyFuncExpr{Property: NumInteriorRings, Polygon: yyDollar[3].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
 	case 1301:
-		yyDollar = yyS[yypt-4 : yypt+1]
+		yyDollar = yyS[yypt-6 : yypt+1]
 		var yyLOCAL Expr
 //line sql.y:6562
 		{
-			yyLOCAL = &GeomCollPropertyFuncExpr{Property: NumGeometries, GeomColl: yyDollar[3].exprUnion()}
+			yyLOCAL = &GeomCollPropertyFuncExpr{Property: GeometryN, GeomColl: yyDollar[3].exprUnion(), PropertyDefArg: yyDollar[5].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
 	case 1302:
-		yyDollar = yyS[yypt-8 : yypt+1]
+		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Expr
 //line sql.y:6566
 		{
-			yyLOCAL = &GeoHashFromLatLongExpr{Longitude: yyDollar[3].exprUnion(), Latitude: yyDollar[5].exprUnion(), MaxLength: yyDollar[7].exprUnion()}
+			yyLOCAL = &GeomCollPropertyFuncExpr{Property: NumGeometries, GeomColl: yyDollar[3].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
 	case 1303:
-		yyDollar = yyS[yypt-6 : yypt+1]
+		yyDollar = yyS[yypt-8 : yypt+1]
 		var yyLOCAL Expr
 //line sql.y:6570
 		{
-			yyLOCAL = &GeoHashFromPointExpr{Point: yyDollar[3].exprUnion(), MaxLength: yyDollar[5].exprUnion()}
+			yyLOCAL = &GeoHashFromLatLongExpr{Longitude: yyDollar[3].exprUnion(), Latitude: yyDollar[5].exprUnion(), MaxLength: yyDollar[7].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
 	case 1304:
-		yyDollar = yyS[yypt-4 : yypt+1]
+		yyDollar = yyS[yypt-6 : yypt+1]
 		var yyLOCAL Expr
 //line sql.y:6574
 		{
-			yyLOCAL = &GeomFromGeoHashExpr{GeomType: LatitudeFromHash, GeoHash: yyDollar[3].exprUnion()}
+			yyLOCAL = &GeoHashFromPointExpr{Point: yyDollar[3].exprUnion(), MaxLength: yyDollar[5].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
 	case 1305:
@@ -20035,71 +19998,71 @@ yydefault:
 		var yyLOCAL Expr
 //line sql.y:6578
 		{
-			yyLOCAL = &GeomFromGeoHashExpr{GeomType: LongitudeFromHash, GeoHash: yyDollar[3].exprUnion()}
+			yyLOCAL = &GeomFromGeoHashExpr{GeomType: LatitudeFromHash, GeoHash: yyDollar[3].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
 	case 1306:
-		yyDollar = yyS[yypt-6 : yypt+1]
+		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Expr
 //line sql.y:6582
 		{
-			yyLOCAL = &GeomFromGeoHashExpr{GeomType: PointFromHash, GeoHash: yyDollar[3].exprUnion(), SridOpt: yyDollar[5].exprUnion()}
+			yyLOCAL = &GeomFromGeoHashExpr{GeomType: LongitudeFromHash, GeoHash: yyDollar[3].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
 	case 1307:
-		yyDollar = yyS[yypt-4 : yypt+1]
+		yyDollar = yyS[yypt-6 : yypt+1]
 		var yyLOCAL Expr
 //line sql.y:6586
 		{
-			yyLOCAL = &GeomFromGeoJSONExpr{GeoJSON: yyDollar[3].exprUnion()}
+			yyLOCAL = &GeomFromGeoHashExpr{GeomType: PointFromHash, GeoHash: yyDollar[3].exprUnion(), SridOpt: yyDollar[5].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
 	case 1308:
-		yyDollar = yyS[yypt-6 : yypt+1]
+		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Expr
 //line sql.y:6590
 		{
-			yyLOCAL = &GeomFromGeoJSONExpr{GeoJSON: yyDollar[3].exprUnion(), HigherDimHandlerOpt: yyDollar[5].exprUnion()}
+			yyLOCAL = &GeomFromGeoJSONExpr{GeoJSON: yyDollar[3].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
 	case 1309:
-		yyDollar = yyS[yypt-8 : yypt+1]
+		yyDollar = yyS[yypt-6 : yypt+1]
 		var yyLOCAL Expr
 //line sql.y:6594
 		{
-			yyLOCAL = &GeomFromGeoJSONExpr{GeoJSON: yyDollar[3].exprUnion(), HigherDimHandlerOpt: yyDollar[5].exprUnion(), Srid: yyDollar[7].exprUnion()}
+			yyLOCAL = &GeomFromGeoJSONExpr{GeoJSON: yyDollar[3].exprUnion(), HigherDimHandlerOpt: yyDollar[5].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
 	case 1310:
-		yyDollar = yyS[yypt-4 : yypt+1]
+		yyDollar = yyS[yypt-8 : yypt+1]
 		var yyLOCAL Expr
 //line sql.y:6598
 		{
-			yyLOCAL = &GeoJSONFromGeomExpr{Geom: yyDollar[3].exprUnion()}
+			yyLOCAL = &GeomFromGeoJSONExpr{GeoJSON: yyDollar[3].exprUnion(), HigherDimHandlerOpt: yyDollar[5].exprUnion(), Srid: yyDollar[7].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
 	case 1311:
-		yyDollar = yyS[yypt-6 : yypt+1]
+		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Expr
 //line sql.y:6602
 		{
-			yyLOCAL = &GeoJSONFromGeomExpr{Geom: yyDollar[3].exprUnion(), MaxDecimalDigits: yyDollar[5].exprUnion()}
+			yyLOCAL = &GeoJSONFromGeomExpr{Geom: yyDollar[3].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
 	case 1312:
-		yyDollar = yyS[yypt-8 : yypt+1]
+		yyDollar = yyS[yypt-6 : yypt+1]
 		var yyLOCAL Expr
 //line sql.y:6606
 		{
-			yyLOCAL = &GeoJSONFromGeomExpr{Geom: yyDollar[3].exprUnion(), MaxDecimalDigits: yyDollar[5].exprUnion(), Bitmask: yyDollar[7].exprUnion()}
+			yyLOCAL = &GeoJSONFromGeomExpr{Geom: yyDollar[3].exprUnion(), MaxDecimalDigits: yyDollar[5].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
 	case 1313:
-		yyDollar = yyS[yypt-4 : yypt+1]
+		yyDollar = yyS[yypt-8 : yypt+1]
 		var yyLOCAL Expr
 //line sql.y:6610
 		{
-			yyLOCAL = &JSONObjectExpr{Params: yyDollar[3].jsonObjectParamsUnion()}
+			yyLOCAL = &GeoJSONFromGeomExpr{Geom: yyDollar[3].exprUnion(), MaxDecimalDigits: yyDollar[5].exprUnion(), Bitmask: yyDollar[7].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
 	case 1314:
@@ -20107,47 +20070,47 @@ yydefault:
 		var yyLOCAL Expr
 //line sql.y:6614
 		{
-			yyLOCAL = &JSONQuoteExpr{StringArg: yyDollar[3].exprUnion()}
+			yyLOCAL = &JSONObjectExpr{Params: yyDollar[3].jsonObjectParamsUnion()}
 		}
 		yyVAL.union = yyLOCAL
 	case 1315:
-		yyDollar = yyS[yypt-6 : yypt+1]
+		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Expr
 //line sql.y:6618
 		{
-			yyLOCAL = &JSONContainsExpr{Target: yyDollar[3].exprUnion(), Candidate: yyDollar[5].exprsUnion()[0], PathList: yyDollar[5].exprsUnion()[1:]}
+			yyLOCAL = &JSONQuoteExpr{StringArg: yyDollar[3].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
 	case 1316:
-		yyDollar = yyS[yypt-8 : yypt+1]
+		yyDollar = yyS[yypt-6 : yypt+1]
 		var yyLOCAL Expr
 //line sql.y:6622
 		{
-			yyLOCAL = &JSONContainsPathExpr{JSONDoc: yyDollar[3].exprUnion(), OneOrAll: yyDollar[5].exprUnion(), PathList: yyDollar[7].exprsUnion()}
+			yyLOCAL = &JSONContainsExpr{Target: yyDollar[3].exprUnion(), Candidate: yyDollar[5].exprsUnion()[0], PathList: yyDollar[5].exprsUnion()[1:]}
 		}
 		yyVAL.union = yyLOCAL
 	case 1317:
-		yyDollar = yyS[yypt-6 : yypt+1]
+		yyDollar = yyS[yypt-8 : yypt+1]
 		var yyLOCAL Expr
 //line sql.y:6626
 		{
-			yyLOCAL = &JSONExtractExpr{JSONDoc: yyDollar[3].exprUnion(), PathList: yyDollar[5].exprsUnion()}
+			yyLOCAL = &JSONContainsPathExpr{JSONDoc: yyDollar[3].exprUnion(), OneOrAll: yyDollar[5].exprUnion(), PathList: yyDollar[7].exprsUnion()}
 		}
 		yyVAL.union = yyLOCAL
 	case 1318:
-		yyDollar = yyS[yypt-4 : yypt+1]
+		yyDollar = yyS[yypt-6 : yypt+1]
 		var yyLOCAL Expr
 //line sql.y:6630
 		{
-			yyLOCAL = &JSONKeysExpr{JSONDoc: yyDollar[3].exprUnion()}
+			yyLOCAL = &JSONExtractExpr{JSONDoc: yyDollar[3].exprUnion(), PathList: yyDollar[5].exprsUnion()}
 		}
 		yyVAL.union = yyLOCAL
 	case 1319:
-		yyDollar = yyS[yypt-6 : yypt+1]
+		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Expr
 //line sql.y:6634
 		{
-			yyLOCAL = &JSONKeysExpr{JSONDoc: yyDollar[3].exprUnion(), Path: yyDollar[5].exprUnion()}
+			yyLOCAL = &JSONKeysExpr{JSONDoc: yyDollar[3].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
 	case 1320:
@@ -20155,39 +20118,39 @@ yydefault:
 		var yyLOCAL Expr
 //line sql.y:6638
 		{
-			yyLOCAL = &JSONOverlapsExpr{JSONDoc1: yyDollar[3].exprUnion(), JSONDoc2: yyDollar[5].exprUnion()}
+			yyLOCAL = &JSONKeysExpr{JSONDoc: yyDollar[3].exprUnion(), Path: yyDollar[5].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
 	case 1321:
-		yyDollar = yyS[yypt-8 : yypt+1]
+		yyDollar = yyS[yypt-6 : yypt+1]
 		var yyLOCAL Expr
 //line sql.y:6642
 		{
-			yyLOCAL = &JSONSearchExpr{JSONDoc: yyDollar[3].exprUnion(), OneOrAll: yyDollar[5].exprUnion(), SearchStr: yyDollar[7].exprUnion()}
+			yyLOCAL = &JSONOverlapsExpr{JSONDoc1: yyDollar[3].exprUnion(), JSONDoc2: yyDollar[5].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
 	case 1322:
-		yyDollar = yyS[yypt-10 : yypt+1]
+		yyDollar = yyS[yypt-8 : yypt+1]
 		var yyLOCAL Expr
 //line sql.y:6646
 		{
-			yyLOCAL = &JSONSearchExpr{JSONDoc: yyDollar[3].exprUnion(), OneOrAll: yyDollar[5].exprUnion(), SearchStr: yyDollar[7].exprUnion(), EscapeChar: yyDollar[9].exprsUnion()[0], PathList: yyDollar[9].exprsUnion()[1:]}
+			yyLOCAL = &JSONSearchExpr{JSONDoc: yyDollar[3].exprUnion(), OneOrAll: yyDollar[5].exprUnion(), SearchStr: yyDollar[7].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
 	case 1323:
-		yyDollar = yyS[yypt-7 : yypt+1]
+		yyDollar = yyS[yypt-10 : yypt+1]
 		var yyLOCAL Expr
 //line sql.y:6650
 		{
-			yyLOCAL = &JSONValueExpr{JSONDoc: yyDollar[3].exprUnion(), Path: yyDollar[5].exprUnion(), ReturningType: yyDollar[6].convertTypeUnion()}
+			yyLOCAL = &JSONSearchExpr{JSONDoc: yyDollar[3].exprUnion(), OneOrAll: yyDollar[5].exprUnion(), SearchStr: yyDollar[7].exprUnion(), EscapeChar: yyDollar[9].exprsUnion()[0], PathList: yyDollar[9].exprsUnion()[1:]}
 		}
 		yyVAL.union = yyLOCAL
 	case 1324:
-		yyDollar = yyS[yypt-8 : yypt+1]
+		yyDollar = yyS[yypt-7 : yypt+1]
 		var yyLOCAL Expr
 //line sql.y:6654
 		{
-			yyLOCAL = &JSONValueExpr{JSONDoc: yyDollar[3].exprUnion(), Path: yyDollar[5].exprUnion(), ReturningType: yyDollar[6].convertTypeUnion(), EmptyOnResponse: yyDollar[7].jtOnResponseUnion()}
+			yyLOCAL = &JSONValueExpr{JSONDoc: yyDollar[3].exprUnion(), Path: yyDollar[5].exprUnion(), ReturningType: yyDollar[6].convertTypeUnion()}
 		}
 		yyVAL.union = yyLOCAL
 	case 1325:
@@ -20195,23 +20158,23 @@ yydefault:
 		var yyLOCAL Expr
 //line sql.y:6658
 		{
-			yyLOCAL = &JSONValueExpr{JSONDoc: yyDollar[3].exprUnion(), Path: yyDollar[5].exprUnion(), ReturningType: yyDollar[6].convertTypeUnion(), ErrorOnResponse: yyDollar[7].jtOnResponseUnion()}
+			yyLOCAL = &JSONValueExpr{JSONDoc: yyDollar[3].exprUnion(), Path: yyDollar[5].exprUnion(), ReturningType: yyDollar[6].convertTypeUnion(), EmptyOnResponse: yyDollar[7].jtOnResponseUnion()}
 		}
 		yyVAL.union = yyLOCAL
 	case 1326:
-		yyDollar = yyS[yypt-9 : yypt+1]
+		yyDollar = yyS[yypt-8 : yypt+1]
 		var yyLOCAL Expr
 //line sql.y:6662
 		{
-			yyLOCAL = &JSONValueExpr{JSONDoc: yyDollar[3].exprUnion(), Path: yyDollar[5].exprUnion(), ReturningType: yyDollar[6].convertTypeUnion(), EmptyOnResponse: yyDollar[7].jtOnResponseUnion(), ErrorOnResponse: yyDollar[8].jtOnResponseUnion()}
+			yyLOCAL = &JSONValueExpr{JSONDoc: yyDollar[3].exprUnion(), Path: yyDollar[5].exprUnion(), ReturningType: yyDollar[6].convertTypeUnion(), ErrorOnResponse: yyDollar[7].jtOnResponseUnion()}
 		}
 		yyVAL.union = yyLOCAL
 	case 1327:
-		yyDollar = yyS[yypt-4 : yypt+1]
+		yyDollar = yyS[yypt-9 : yypt+1]
 		var yyLOCAL Expr
 //line sql.y:6666
 		{
-			yyLOCAL = &JSONAttributesExpr{Type: DepthAttributeType, JSONDoc: yyDollar[3].exprUnion()}
+			yyLOCAL = &JSONValueExpr{JSONDoc: yyDollar[3].exprUnion(), Path: yyDollar[5].exprUnion(), ReturningType: yyDollar[6].convertTypeUnion(), EmptyOnResponse: yyDollar[7].jtOnResponseUnion(), ErrorOnResponse: yyDollar[8].jtOnResponseUnion()}
 		}
 		yyVAL.union = yyLOCAL
 	case 1328:
@@ -20219,7 +20182,7 @@ yydefault:
 		var yyLOCAL Expr
 //line sql.y:6670
 		{
-			yyLOCAL = &JSONAttributesExpr{Type: ValidAttributeType, JSONDoc: yyDollar[3].exprUnion()}
+			yyLOCAL = &JSONAttributesExpr{Type: DepthAttributeType, JSONDoc: yyDollar[3].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
 	case 1329:
@@ -20227,7 +20190,7 @@ yydefault:
 		var yyLOCAL Expr
 //line sql.y:6674
 		{
-			yyLOCAL = &JSONAttributesExpr{Type: TypeAttributeType, JSONDoc: yyDollar[3].exprUnion()}
+			yyLOCAL = &JSONAttributesExpr{Type: ValidAttributeType, JSONDoc: yyDollar[3].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
 	case 1330:
@@ -20235,15 +20198,15 @@ yydefault:
 		var yyLOCAL Expr
 //line sql.y:6678
 		{
-			yyLOCAL = &JSONAttributesExpr{Type: LengthAttributeType, JSONDoc: yyDollar[3].exprUnion()}
+			yyLOCAL = &JSONAttributesExpr{Type: TypeAttributeType, JSONDoc: yyDollar[3].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
 	case 1331:
-		yyDollar = yyS[yypt-6 : yypt+1]
+		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Expr
 //line sql.y:6682
 		{
-			yyLOCAL = &JSONAttributesExpr{Type: LengthAttributeType, JSONDoc: yyDollar[3].exprUnion(), Path: yyDollar[5].exprUnion()}
+			yyLOCAL = &JSONAttributesExpr{Type: LengthAttributeType, JSONDoc: yyDollar[3].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
 	case 1332:
@@ -20251,7 +20214,7 @@ yydefault:
 		var yyLOCAL Expr
 //line sql.y:6686
 		{
-			yyLOCAL = &JSONValueModifierExpr{Type: JSONArrayAppendType, JSONDoc: yyDollar[3].exprUnion(), Params: yyDollar[5].jsonObjectParamsUnion()}
+			yyLOCAL = &JSONAttributesExpr{Type: LengthAttributeType, JSONDoc: yyDollar[3].exprUnion(), Path: yyDollar[5].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
 	case 1333:
@@ -20259,7 +20222,7 @@ yydefault:
 		var yyLOCAL Expr
 //line sql.y:6690
 		{
-			yyLOCAL = &JSONValueModifierExpr{Type: JSONArrayInsertType, JSONDoc: yyDollar[3].exprUnion(), Params: yyDollar[5].jsonObjectParamsUnion()}
+			yyLOCAL = &JSONValueModifierExpr{Type: JSONArrayAppendType, JSONDoc: yyDollar[3].exprUnion(), Params: yyDollar[5].jsonObjectParamsUnion()}
 		}
 		yyVAL.union = yyLOCAL
 	case 1334:
@@ -20267,7 +20230,7 @@ yydefault:
 		var yyLOCAL Expr
 //line sql.y:6694
 		{
-			yyLOCAL = &JSONValueModifierExpr{Type: JSONInsertType, JSONDoc: yyDollar[3].exprUnion(), Params: yyDollar[5].jsonObjectParamsUnion()}
+			yyLOCAL = &JSONValueModifierExpr{Type: JSONArrayInsertType, JSONDoc: yyDollar[3].exprUnion(), Params: yyDollar[5].jsonObjectParamsUnion()}
 		}
 		yyVAL.union = yyLOCAL
 	case 1335:
@@ -20275,7 +20238,7 @@ yydefault:
 		var yyLOCAL Expr
 //line sql.y:6698
 		{
-			yyLOCAL = &JSONValueModifierExpr{Type: JSONReplaceType, JSONDoc: yyDollar[3].exprUnion(), Params: yyDollar[5].jsonObjectParamsUnion()}
+			yyLOCAL = &JSONValueModifierExpr{Type: JSONInsertType, JSONDoc: yyDollar[3].exprUnion(), Params: yyDollar[5].jsonObjectParamsUnion()}
 		}
 		yyVAL.union = yyLOCAL
 	case 1336:
@@ -20283,7 +20246,7 @@ yydefault:
 		var yyLOCAL Expr
 //line sql.y:6702
 		{
-			yyLOCAL = &JSONValueModifierExpr{Type: JSONSetType, JSONDoc: yyDollar[3].exprUnion(), Params: yyDollar[5].jsonObjectParamsUnion()}
+			yyLOCAL = &JSONValueModifierExpr{Type: JSONReplaceType, JSONDoc: yyDollar[3].exprUnion(), Params: yyDollar[5].jsonObjectParamsUnion()}
 		}
 		yyVAL.union = yyLOCAL
 	case 1337:
@@ -20291,7 +20254,7 @@ yydefault:
 		var yyLOCAL Expr
 //line sql.y:6706
 		{
-			yyLOCAL = &JSONValueMergeExpr{Type: JSONMergeType, JSONDoc: yyDollar[3].exprUnion(), JSONDocList: yyDollar[5].exprsUnion()}
+			yyLOCAL = &JSONValueModifierExpr{Type: JSONSetType, JSONDoc: yyDollar[3].exprUnion(), Params: yyDollar[5].jsonObjectParamsUnion()}
 		}
 		yyVAL.union = yyLOCAL
 	case 1338:
@@ -20299,7 +20262,7 @@ yydefault:
 		var yyLOCAL Expr
 //line sql.y:6710
 		{
-			yyLOCAL = &JSONValueMergeExpr{Type: JSONMergePatchType, JSONDoc: yyDollar[3].exprUnion(), JSONDocList: yyDollar[5].exprsUnion()}
+			yyLOCAL = &JSONValueMergeExpr{Type: JSONMergeType, JSONDoc: yyDollar[3].exprUnion(), JSONDocList: yyDollar[5].exprsUnion()}
 		}
 		yyVAL.union = yyLOCAL
 	case 1339:
@@ -20307,7 +20270,7 @@ yydefault:
 		var yyLOCAL Expr
 //line sql.y:6714
 		{
-			yyLOCAL = &JSONValueMergeExpr{Type: JSONMergePreserveType, JSONDoc: yyDollar[3].exprUnion(), JSONDocList: yyDollar[5].exprsUnion()}
+			yyLOCAL = &JSONValueMergeExpr{Type: JSONMergePatchType, JSONDoc: yyDollar[3].exprUnion(), JSONDocList: yyDollar[5].exprsUnion()}
 		}
 		yyVAL.union = yyLOCAL
 	case 1340:
@@ -20315,15 +20278,15 @@ yydefault:
 		var yyLOCAL Expr
 //line sql.y:6718
 		{
-			yyLOCAL = &JSONRemoveExpr{JSONDoc: yyDollar[3].exprUnion(), PathList: yyDollar[5].exprsUnion()}
+			yyLOCAL = &JSONValueMergeExpr{Type: JSONMergePreserveType, JSONDoc: yyDollar[3].exprUnion(), JSONDocList: yyDollar[5].exprsUnion()}
 		}
 		yyVAL.union = yyLOCAL
 	case 1341:
-		yyDollar = yyS[yypt-4 : yypt+1]
+		yyDollar = yyS[yypt-6 : yypt+1]
 		var yyLOCAL Expr
 //line sql.y:6722
 		{
-			yyLOCAL = &JSONUnquoteExpr{JSONValue: yyDollar[3].exprUnion()}
+			yyLOCAL = &JSONRemoveExpr{JSONDoc: yyDollar[3].exprUnion(), PathList: yyDollar[5].exprsUnion()}
 		}
 		yyVAL.union = yyLOCAL
 	case 1342:
@@ -20331,7 +20294,7 @@ yydefault:
 		var yyLOCAL Expr
 //line sql.y:6726
 		{
-			yyLOCAL = &MultiPolygonExpr{PolygonParams: yyDollar[3].exprsUnion()}
+			yyLOCAL = &JSONUnquoteExpr{JSONValue: yyDollar[3].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
 	case 1343:
@@ -20339,7 +20302,7 @@ yydefault:
 		var yyLOCAL Expr
 //line sql.y:6730
 		{
-			yyLOCAL = &MultiPointExpr{PointParams: yyDollar[3].exprsUnion()}
+			yyLOCAL = &MultiPolygonExpr{PolygonParams: yyDollar[3].exprsUnion()}
 		}
 		yyVAL.union = yyLOCAL
 	case 1344:
@@ -20347,7 +20310,7 @@ yydefault:
 		var yyLOCAL Expr
 //line sql.y:6734
 		{
-			yyLOCAL = &MultiLinestringExpr{LinestringParams: yyDollar[3].exprsUnion()}
+			yyLOCAL = &MultiPointExpr{PointParams: yyDollar[3].exprsUnion()}
 		}
 		yyVAL.union = yyLOCAL
 	case 1345:
@@ -20355,7 +20318,7 @@ yydefault:
 		var yyLOCAL Expr
 //line sql.y:6738
 		{
-			yyLOCAL = &PolygonExpr{LinestringParams: yyDollar[3].exprsUnion()}
+			yyLOCAL = &MultiLinestringExpr{LinestringParams: yyDollar[3].exprsUnion()}
 		}
 		yyVAL.union = yyLOCAL
 	case 1346:
@@ -20363,87 +20326,87 @@ yydefault:
 		var yyLOCAL Expr
 //line sql.y:6742
 		{
-			yyLOCAL = &LineStringExpr{PointParams: yyDollar[3].exprsUnion()}
+			yyLOCAL = &PolygonExpr{LinestringParams: yyDollar[3].exprsUnion()}
 		}
 		yyVAL.union = yyLOCAL
 	case 1347:
-		yyDollar = yyS[yypt-6 : yypt+1]
+		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Expr
 //line sql.y:6746
 		{
-			yyLOCAL = &PointExpr{XCordinate: yyDollar[3].exprUnion(), YCordinate: yyDollar[5].exprUnion()}
+			yyLOCAL = &LineStringExpr{PointParams: yyDollar[3].exprsUnion()}
 		}
 		yyVAL.union = yyLOCAL
 	case 1348:
-		yyDollar = yyS[yypt-4 : yypt+1]
+		yyDollar = yyS[yypt-6 : yypt+1]
 		var yyLOCAL Expr
 //line sql.y:6750
 		{
-			yyLOCAL = &ArgumentLessWindowExpr{Type: yyDollar[1].argumentLessWindowExprTypeUnion(), OverClause: yyDollar[4].overClauseUnion()}
+			yyLOCAL = &PointExpr{XCordinate: yyDollar[3].exprUnion(), YCordinate: yyDollar[5].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
 	case 1349:
-		yyDollar = yyS[yypt-6 : yypt+1]
+		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Expr
 //line sql.y:6754
 		{
-			yyLOCAL = &FirstOrLastValueExpr{Type: yyDollar[1].firstOrLastValueExprTypeUnion(), Expr: yyDollar[3].exprUnion(), NullTreatmentClause: yyDollar[5].nullTreatmentClauseUnion(), OverClause: yyDollar[6].overClauseUnion()}
+			yyLOCAL = &ArgumentLessWindowExpr{Type: yyDollar[1].argumentLessWindowExprTypeUnion(), OverClause: yyDollar[4].overClauseUnion()}
 		}
 		yyVAL.union = yyLOCAL
 	case 1350:
-		yyDollar = yyS[yypt-5 : yypt+1]
+		yyDollar = yyS[yypt-6 : yypt+1]
 		var yyLOCAL Expr
 //line sql.y:6758
 		{
-			yyLOCAL = &NtileExpr{N: yyDollar[3].exprUnion(), OverClause: yyDollar[5].overClauseUnion()}
+			yyLOCAL = &FirstOrLastValueExpr{Type: yyDollar[1].firstOrLastValueExprTypeUnion(), Expr: yyDollar[3].exprUnion(), NullTreatmentClause: yyDollar[5].nullTreatmentClauseUnion(), OverClause: yyDollar[6].overClauseUnion()}
 		}
 		yyVAL.union = yyLOCAL
 	case 1351:
-		yyDollar = yyS[yypt-9 : yypt+1]
+		yyDollar = yyS[yypt-5 : yypt+1]
 		var yyLOCAL Expr
 //line sql.y:6762
 		{
-			yyLOCAL = &NTHValueExpr{Expr: yyDollar[3].exprUnion(), N: yyDollar[5].exprUnion(), FromFirstLastClause: yyDollar[7].fromFirstLastClauseUnion(), NullTreatmentClause: yyDollar[8].nullTreatmentClauseUnion(), OverClause: yyDollar[9].overClauseUnion()}
+			yyLOCAL = &NtileExpr{N: yyDollar[3].exprUnion(), OverClause: yyDollar[5].overClauseUnion()}
 		}
 		yyVAL.union = yyLOCAL
 	case 1352:
-		yyDollar = yyS[yypt-6 : yypt+1]
+		yyDollar = yyS[yypt-9 : yypt+1]
 		var yyLOCAL Expr
 //line sql.y:6766
 		{
-			yyLOCAL = &LagLeadExpr{Type: yyDollar[1].lagLeadExprTypeUnion(), Expr: yyDollar[3].exprUnion(), NullTreatmentClause: yyDollar[5].nullTreatmentClauseUnion(), OverClause: yyDollar[6].overClauseUnion()}
+			yyLOCAL = &NTHValueExpr{Expr: yyDollar[3].exprUnion(), N: yyDollar[5].exprUnion(), FromFirstLastClause: yyDollar[7].fromFirstLastClauseUnion(), NullTreatmentClause: yyDollar[8].nullTreatmentClauseUnion(), OverClause: yyDollar[9].overClauseUnion()}
 		}
 		yyVAL.union = yyLOCAL
 	case 1353:
-		yyDollar = yyS[yypt-9 : yypt+1]
+		yyDollar = yyS[yypt-6 : yypt+1]
 		var yyLOCAL Expr
 //line sql.y:6770
 		{
-			yyLOCAL = &LagLeadExpr{Type: yyDollar[1].lagLeadExprTypeUnion(), Expr: yyDollar[3].exprUnion(), N: yyDollar[5].exprUnion(), Default: yyDollar[6].exprUnion(), NullTreatmentClause: yyDollar[8].nullTreatmentClauseUnion(), OverClause: yyDollar[9].overClauseUnion()}
+			yyLOCAL = &LagLeadExpr{Type: yyDollar[1].lagLeadExprTypeUnion(), Expr: yyDollar[3].exprUnion(), NullTreatmentClause: yyDollar[5].nullTreatmentClauseUnion(), OverClause: yyDollar[6].overClauseUnion()}
 		}
 		yyVAL.union = yyLOCAL
 	case 1354:
-		yyDollar = yyS[yypt-8 : yypt+1]
+		yyDollar = yyS[yypt-9 : yypt+1]
 		var yyLOCAL Expr
 //line sql.y:6774
 		{
-			yyLOCAL = &IntervalDateExpr{Syntax: IntervalDateExprAdddate, Date: yyDollar[3].exprUnion(), Interval: yyDollar[6].exprUnion(), Unit: yyDollar[7].intervalTypeUnion()}
+			yyLOCAL = &LagLeadExpr{Type: yyDollar[1].lagLeadExprTypeUnion(), Expr: yyDollar[3].exprUnion(), N: yyDollar[5].exprUnion(), Default: yyDollar[6].exprUnion(), NullTreatmentClause: yyDollar[8].nullTreatmentClauseUnion(), OverClause: yyDollar[9].overClauseUnion()}
 		}
 		yyVAL.union = yyLOCAL
 	case 1355:
-		yyDollar = yyS[yypt-6 : yypt+1]
+		yyDollar = yyS[yypt-8 : yypt+1]
 		var yyLOCAL Expr
 //line sql.y:6778
 		{
-			yyLOCAL = &IntervalDateExpr{Syntax: IntervalDateExprAdddate, Date: yyDollar[3].exprUnion(), Interval: yyDollar[5].exprUnion(), Unit: IntervalNone}
+			yyLOCAL = &IntervalDateExpr{Syntax: IntervalDateExprAdddate, Date: yyDollar[3].exprUnion(), Interval: yyDollar[6].exprUnion(), Unit: yyDollar[7].intervalTypeUnion()}
 		}
 		yyVAL.union = yyLOCAL
 	case 1356:
-		yyDollar = yyS[yypt-8 : yypt+1]
+		yyDollar = yyS[yypt-6 : yypt+1]
 		var yyLOCAL Expr
 //line sql.y:6782
 		{
-			yyLOCAL = &IntervalDateExpr{Syntax: IntervalDateExprDateAdd, Date: yyDollar[3].exprUnion(), Interval: yyDollar[6].exprUnion(), Unit: yyDollar[7].intervalTypeUnion()}
+			yyLOCAL = &IntervalDateExpr{Syntax: IntervalDateExprAdddate, Date: yyDollar[3].exprUnion(), Interval: yyDollar[5].exprUnion(), Unit: IntervalNone}
 		}
 		yyVAL.union = yyLOCAL
 	case 1357:
@@ -20451,7 +20414,7 @@ yydefault:
 		var yyLOCAL Expr
 //line sql.y:6786
 		{
-			yyLOCAL = &IntervalDateExpr{Syntax: IntervalDateExprDateSub, Date: yyDollar[3].exprUnion(), Interval: yyDollar[6].exprUnion(), Unit: yyDollar[7].intervalTypeUnion()}
+			yyLOCAL = &IntervalDateExpr{Syntax: IntervalDateExprDateAdd, Date: yyDollar[3].exprUnion(), Interval: yyDollar[6].exprUnion(), Unit: yyDollar[7].intervalTypeUnion()}
 		}
 		yyVAL.union = yyLOCAL
 	case 1358:
@@ -20459,23 +20422,23 @@ yydefault:
 		var yyLOCAL Expr
 //line sql.y:6790
 		{
-			yyLOCAL = &IntervalDateExpr{Syntax: IntervalDateExprSubdate, Date: yyDollar[3].exprUnion(), Interval: yyDollar[6].exprUnion(), Unit: yyDollar[7].intervalTypeUnion()}
+			yyLOCAL = &IntervalDateExpr{Syntax: IntervalDateExprDateSub, Date: yyDollar[3].exprUnion(), Interval: yyDollar[6].exprUnion(), Unit: yyDollar[7].intervalTypeUnion()}
 		}
 		yyVAL.union = yyLOCAL
 	case 1359:
-		yyDollar = yyS[yypt-6 : yypt+1]
+		yyDollar = yyS[yypt-8 : yypt+1]
 		var yyLOCAL Expr
 //line sql.y:6794
 		{
-			yyLOCAL = &IntervalDateExpr{Syntax: IntervalDateExprSubdate, Date: yyDollar[3].exprUnion(), Interval: yyDollar[5].exprUnion(), Unit: IntervalNone}
+			yyLOCAL = &IntervalDateExpr{Syntax: IntervalDateExprSubdate, Date: yyDollar[3].exprUnion(), Interval: yyDollar[6].exprUnion(), Unit: yyDollar[7].intervalTypeUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1364:
-		yyDollar = yyS[yypt-1 : yypt+1]
+	case 1360:
+		yyDollar = yyS[yypt-6 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6804
+//line sql.y:6798
 		{
-			yyLOCAL = yyDollar[1].exprUnion()
+			yyLOCAL = &IntervalDateExpr{Syntax: IntervalDateExprSubdate, Date: yyDollar[3].exprUnion(), Interval: yyDollar[5].exprUnion(), Unit: IntervalNone}
 		}
 		yyVAL.union = yyLOCAL
 	case 1365:
@@ -20483,7 +20446,7 @@ yydefault:
 		var yyLOCAL Expr
 //line sql.y:6808
 		{
-			yyLOCAL = NewIntLiteral(yyDollar[1].str)
+			yyLOCAL = yyDollar[1].exprUnion()
 		}
 		yyVAL.union = yyLOCAL
 	case 1366:
@@ -20491,7 +20454,7 @@ yydefault:
 		var yyLOCAL Expr
 //line sql.y:6812
 		{
-			yyLOCAL = yyDollar[1].variableUnion()
+			yyLOCAL = NewIntLiteral(yyDollar[1].str)
 		}
 		yyVAL.union = yyLOCAL
 	case 1367:
@@ -20499,282 +20462,282 @@ yydefault:
 		var yyLOCAL Expr
 //line sql.y:6816
 		{
-			yyLOCAL = parseBindVariable(yylex, yyDollar[1].str[1:])
+			yyLOCAL = yyDollar[1].variableUnion()
 		}
 		yyVAL.union = yyLOCAL
 	case 1368:
+		yyDollar = yyS[yypt-1 : yypt+1]
+		var yyLOCAL Expr
+//line sql.y:6820
+		{
+			yyLOCAL = parseBindVariable(yylex, yyDollar[1].str[1:])
+		}
+		yyVAL.union = yyLOCAL
+	case 1369:
 		yyDollar = yyS[yypt-0 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6821
+//line sql.y:6825
 		{
 			yyLOCAL = nil
 		}
 		yyVAL.union = yyLOCAL
-	case 1369:
+	case 1370:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6825
+//line sql.y:6829
 		{
 			yyLOCAL = yyDollar[2].exprUnion()
 		}
 		yyVAL.union = yyLOCAL
-	case 1370:
+	case 1371:
 		yyDollar = yyS[yypt-6 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6831
+//line sql.y:6835
 		{
 			yyLOCAL = &RegexpInstrExpr{Expr: yyDollar[3].exprUnion(), Pattern: yyDollar[5].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1371:
+	case 1372:
 		yyDollar = yyS[yypt-8 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6835
+//line sql.y:6839
 		{
 			yyLOCAL = &RegexpInstrExpr{Expr: yyDollar[3].exprUnion(), Pattern: yyDollar[5].exprUnion(), Position: yyDollar[7].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1372:
+	case 1373:
 		yyDollar = yyS[yypt-10 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6839
+//line sql.y:6843
 		{
 			yyLOCAL = &RegexpInstrExpr{Expr: yyDollar[3].exprUnion(), Pattern: yyDollar[5].exprUnion(), Position: yyDollar[7].exprUnion(), Occurrence: yyDollar[9].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1373:
+	case 1374:
 		yyDollar = yyS[yypt-12 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6843
+//line sql.y:6847
 		{
 			yyLOCAL = &RegexpInstrExpr{Expr: yyDollar[3].exprUnion(), Pattern: yyDollar[5].exprUnion(), Position: yyDollar[7].exprUnion(), Occurrence: yyDollar[9].exprUnion(), ReturnOption: yyDollar[11].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1374:
+	case 1375:
 		yyDollar = yyS[yypt-14 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6847
+//line sql.y:6851
 		{
 			// Match type is kept expression as TRIM( ' m  ') is accepted
 			yyLOCAL = &RegexpInstrExpr{Expr: yyDollar[3].exprUnion(), Pattern: yyDollar[5].exprUnion(), Position: yyDollar[7].exprUnion(), Occurrence: yyDollar[9].exprUnion(), ReturnOption: yyDollar[11].exprUnion(), MatchType: yyDollar[13].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1375:
+	case 1376:
 		yyDollar = yyS[yypt-6 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6852
+//line sql.y:6856
 		{
 			yyLOCAL = &RegexpLikeExpr{Expr: yyDollar[3].exprUnion(), Pattern: yyDollar[5].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1376:
+	case 1377:
 		yyDollar = yyS[yypt-8 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6856
+//line sql.y:6860
 		{
 			yyLOCAL = &RegexpLikeExpr{Expr: yyDollar[3].exprUnion(), Pattern: yyDollar[5].exprUnion(), MatchType: yyDollar[7].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1377:
+	case 1378:
 		yyDollar = yyS[yypt-8 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6860
+//line sql.y:6864
 		{
 			yyLOCAL = &RegexpReplaceExpr{Expr: yyDollar[3].exprUnion(), Pattern: yyDollar[5].exprUnion(), Repl: yyDollar[7].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1378:
+	case 1379:
 		yyDollar = yyS[yypt-10 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6864
+//line sql.y:6868
 		{
 			yyLOCAL = &RegexpReplaceExpr{Expr: yyDollar[3].exprUnion(), Pattern: yyDollar[5].exprUnion(), Repl: yyDollar[7].exprUnion(), Position: yyDollar[9].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1379:
+	case 1380:
 		yyDollar = yyS[yypt-12 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6868
+//line sql.y:6872
 		{
 			yyLOCAL = &RegexpReplaceExpr{Expr: yyDollar[3].exprUnion(), Pattern: yyDollar[5].exprUnion(), Repl: yyDollar[7].exprUnion(), Position: yyDollar[9].exprUnion(), Occurrence: yyDollar[11].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1380:
+	case 1381:
 		yyDollar = yyS[yypt-14 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6872
+//line sql.y:6876
 		{
 			// Match type is kept expression as TRIM( ' m  ') is accepted
 			yyLOCAL = &RegexpReplaceExpr{Expr: yyDollar[3].exprUnion(), Pattern: yyDollar[5].exprUnion(), Repl: yyDollar[7].exprUnion(), Position: yyDollar[9].exprUnion(), Occurrence: yyDollar[11].exprUnion(), MatchType: yyDollar[13].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1381:
+	case 1382:
 		yyDollar = yyS[yypt-6 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6877
+//line sql.y:6881
 		{
 			yyLOCAL = &RegexpSubstrExpr{Expr: yyDollar[3].exprUnion(), Pattern: yyDollar[5].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1382:
+	case 1383:
 		yyDollar = yyS[yypt-8 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6881
+//line sql.y:6885
 		{
 			yyLOCAL = &RegexpSubstrExpr{Expr: yyDollar[3].exprUnion(), Pattern: yyDollar[5].exprUnion(), Position: yyDollar[7].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1383:
+	case 1384:
 		yyDollar = yyS[yypt-10 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6885
+//line sql.y:6889
 		{
 			yyLOCAL = &RegexpSubstrExpr{Expr: yyDollar[3].exprUnion(), Pattern: yyDollar[5].exprUnion(), Position: yyDollar[7].exprUnion(), Occurrence: yyDollar[9].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1384:
+	case 1385:
 		yyDollar = yyS[yypt-12 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6889
+//line sql.y:6893
 		{
 			// Match type is kept expression as TRIM( ' m  ') is accepted
 			yyLOCAL = &RegexpSubstrExpr{Expr: yyDollar[3].exprUnion(), Pattern: yyDollar[5].exprUnion(), Position: yyDollar[7].exprUnion(), Occurrence: yyDollar[9].exprUnion(), MatchType: yyDollar[11].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1385:
+	case 1386:
 		yyDollar = yyS[yypt-6 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6896
+//line sql.y:6900
 		{
 			yyLOCAL = &ExtractValueExpr{Fragment: yyDollar[3].exprUnion(), XPathExpr: yyDollar[5].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1386:
+	case 1387:
 		yyDollar = yyS[yypt-8 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6900
+//line sql.y:6904
 		{
 			yyLOCAL = &UpdateXMLExpr{Target: yyDollar[3].exprUnion(), XPathExpr: yyDollar[5].exprUnion(), NewXML: yyDollar[7].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1387:
+	case 1388:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6906
+//line sql.y:6910
 		{
 			yyLOCAL = &PerformanceSchemaFuncExpr{Type: FormatBytesType, Argument: yyDollar[3].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1388:
+	case 1389:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6910
+//line sql.y:6914
 		{
 			yyLOCAL = &PerformanceSchemaFuncExpr{Type: FormatPicoTimeType, Argument: yyDollar[3].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1389:
+	case 1390:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6914
+//line sql.y:6918
 		{
 			yyLOCAL = &PerformanceSchemaFuncExpr{Type: PsCurrentThreadIDType}
 		}
 		yyVAL.union = yyLOCAL
-	case 1390:
+	case 1391:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6918
+//line sql.y:6922
 		{
 			yyLOCAL = &PerformanceSchemaFuncExpr{Type: PsThreadIDType, Argument: yyDollar[3].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1391:
+	case 1392:
 		yyDollar = yyS[yypt-6 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6924
+//line sql.y:6928
 		{
 			yyLOCAL = &GTIDFuncExpr{Type: GTIDSubsetType, Set1: yyDollar[3].exprUnion(), Set2: yyDollar[5].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1392:
+	case 1393:
 		yyDollar = yyS[yypt-6 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6928
+//line sql.y:6932
 		{
 			yyLOCAL = &GTIDFuncExpr{Type: GTIDSubtractType, Set1: yyDollar[3].exprUnion(), Set2: yyDollar[5].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1393:
+	case 1394:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6932
+//line sql.y:6936
 		{
 			yyLOCAL = &GTIDFuncExpr{Type: WaitForExecutedGTIDSetType, Set1: yyDollar[3].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1394:
+	case 1395:
 		yyDollar = yyS[yypt-6 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6936
+//line sql.y:6940
 		{
 			yyLOCAL = &GTIDFuncExpr{Type: WaitForExecutedGTIDSetType, Set1: yyDollar[3].exprUnion(), Timeout: yyDollar[5].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1395:
+	case 1396:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6940
+//line sql.y:6944
 		{
 			yyLOCAL = &GTIDFuncExpr{Type: WaitUntilSQLThreadAfterGTIDSType, Set1: yyDollar[3].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1396:
+	case 1397:
 		yyDollar = yyS[yypt-6 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6944
+//line sql.y:6948
 		{
 			yyLOCAL = &GTIDFuncExpr{Type: WaitUntilSQLThreadAfterGTIDSType, Set1: yyDollar[3].exprUnion(), Timeout: yyDollar[5].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1397:
+	case 1398:
 		yyDollar = yyS[yypt-8 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6948
+//line sql.y:6952
 		{
 			yyLOCAL = &GTIDFuncExpr{Type: WaitUntilSQLThreadAfterGTIDSType, Set1: yyDollar[3].exprUnion(), Timeout: yyDollar[5].exprUnion(), Channel: yyDollar[7].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1398:
+	case 1399:
 		yyDollar = yyS[yypt-0 : yypt+1]
 		var yyLOCAL *ConvertType
-//line sql.y:6953
+//line sql.y:6957
 		{
 			yyLOCAL = nil
 		}
 		yyVAL.union = yyLOCAL
-	case 1399:
+	case 1400:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL *ConvertType
-//line sql.y:6957
+//line sql.y:6961
 		{
 			yyLOCAL = yyDollar[2].convertTypeUnion()
 		}
 		yyVAL.union = yyLOCAL
-	case 1400:
-		yyDollar = yyS[yypt-1 : yypt+1]
-		var yyLOCAL IntervalType
-//line sql.y:6963
-		{
-			yyLOCAL = IntervalDayHour
-		}
-		yyVAL.union = yyLOCAL
 	case 1401:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL IntervalType
 //line sql.y:6967
 		{
-			yyLOCAL = IntervalDayMicrosecond
+			yyLOCAL = IntervalDayHour
 		}
 		yyVAL.union = yyLOCAL
 	case 1402:
@@ -20782,7 +20745,7 @@ yydefault:
 		var yyLOCAL IntervalType
 //line sql.y:6971
 		{
-			yyLOCAL = IntervalDayMinute
+			yyLOCAL = IntervalDayMicrosecond
 		}
 		yyVAL.union = yyLOCAL
 	case 1403:
@@ -20790,7 +20753,7 @@ yydefault:
 		var yyLOCAL IntervalType
 //line sql.y:6975
 		{
-			yyLOCAL = IntervalDaySecond
+			yyLOCAL = IntervalDayMinute
 		}
 		yyVAL.union = yyLOCAL
 	case 1404:
@@ -20798,7 +20761,7 @@ yydefault:
 		var yyLOCAL IntervalType
 //line sql.y:6979
 		{
-			yyLOCAL = IntervalHourMicrosecond
+			yyLOCAL = IntervalDaySecond
 		}
 		yyVAL.union = yyLOCAL
 	case 1405:
@@ -20806,7 +20769,7 @@ yydefault:
 		var yyLOCAL IntervalType
 //line sql.y:6983
 		{
-			yyLOCAL = IntervalHourMinute
+			yyLOCAL = IntervalHourMicrosecond
 		}
 		yyVAL.union = yyLOCAL
 	case 1406:
@@ -20814,7 +20777,7 @@ yydefault:
 		var yyLOCAL IntervalType
 //line sql.y:6987
 		{
-			yyLOCAL = IntervalHourSecond
+			yyLOCAL = IntervalHourMinute
 		}
 		yyVAL.union = yyLOCAL
 	case 1407:
@@ -20822,7 +20785,7 @@ yydefault:
 		var yyLOCAL IntervalType
 //line sql.y:6991
 		{
-			yyLOCAL = IntervalMinuteMicrosecond
+			yyLOCAL = IntervalHourSecond
 		}
 		yyVAL.union = yyLOCAL
 	case 1408:
@@ -20830,7 +20793,7 @@ yydefault:
 		var yyLOCAL IntervalType
 //line sql.y:6995
 		{
-			yyLOCAL = IntervalMinuteSecond
+			yyLOCAL = IntervalMinuteMicrosecond
 		}
 		yyVAL.union = yyLOCAL
 	case 1409:
@@ -20838,7 +20801,7 @@ yydefault:
 		var yyLOCAL IntervalType
 //line sql.y:6999
 		{
-			yyLOCAL = IntervalSecondMicrosecond
+			yyLOCAL = IntervalMinuteSecond
 		}
 		yyVAL.union = yyLOCAL
 	case 1410:
@@ -20846,7 +20809,7 @@ yydefault:
 		var yyLOCAL IntervalType
 //line sql.y:7003
 		{
-			yyLOCAL = IntervalYearMonth
+			yyLOCAL = IntervalSecondMicrosecond
 		}
 		yyVAL.union = yyLOCAL
 	case 1411:
@@ -20854,7 +20817,7 @@ yydefault:
 		var yyLOCAL IntervalType
 //line sql.y:7007
 		{
-			yyLOCAL = IntervalDay
+			yyLOCAL = IntervalYearMonth
 		}
 		yyVAL.union = yyLOCAL
 	case 1412:
@@ -20862,7 +20825,7 @@ yydefault:
 		var yyLOCAL IntervalType
 //line sql.y:7011
 		{
-			yyLOCAL = IntervalWeek
+			yyLOCAL = IntervalDay
 		}
 		yyVAL.union = yyLOCAL
 	case 1413:
@@ -20870,7 +20833,7 @@ yydefault:
 		var yyLOCAL IntervalType
 //line sql.y:7015
 		{
-			yyLOCAL = IntervalHour
+			yyLOCAL = IntervalWeek
 		}
 		yyVAL.union = yyLOCAL
 	case 1414:
@@ -20878,7 +20841,7 @@ yydefault:
 		var yyLOCAL IntervalType
 //line sql.y:7019
 		{
-			yyLOCAL = IntervalMinute
+			yyLOCAL = IntervalHour
 		}
 		yyVAL.union = yyLOCAL
 	case 1415:
@@ -20886,7 +20849,7 @@ yydefault:
 		var yyLOCAL IntervalType
 //line sql.y:7023
 		{
-			yyLOCAL = IntervalMonth
+			yyLOCAL = IntervalMinute
 		}
 		yyVAL.union = yyLOCAL
 	case 1416:
@@ -20894,7 +20857,7 @@ yydefault:
 		var yyLOCAL IntervalType
 //line sql.y:7027
 		{
-			yyLOCAL = IntervalQuarter
+			yyLOCAL = IntervalMonth
 		}
 		yyVAL.union = yyLOCAL
 	case 1417:
@@ -20902,7 +20865,7 @@ yydefault:
 		var yyLOCAL IntervalType
 //line sql.y:7031
 		{
-			yyLOCAL = IntervalSecond
+			yyLOCAL = IntervalQuarter
 		}
 		yyVAL.union = yyLOCAL
 	case 1418:
@@ -20910,7 +20873,7 @@ yydefault:
 		var yyLOCAL IntervalType
 //line sql.y:7035
 		{
-			yyLOCAL = IntervalMicrosecond
+			yyLOCAL = IntervalSecond
 		}
 		yyVAL.union = yyLOCAL
 	case 1419:
@@ -20918,15 +20881,15 @@ yydefault:
 		var yyLOCAL IntervalType
 //line sql.y:7039
 		{
-			yyLOCAL = IntervalYear
+			yyLOCAL = IntervalMicrosecond
 		}
 		yyVAL.union = yyLOCAL
 	case 1420:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL IntervalType
-//line sql.y:7045
+//line sql.y:7043
 		{
-			yyLOCAL = IntervalDay
+			yyLOCAL = IntervalYear
 		}
 		yyVAL.union = yyLOCAL
 	case 1421:
@@ -20934,7 +20897,7 @@ yydefault:
 		var yyLOCAL IntervalType
 //line sql.y:7049
 		{
-			yyLOCAL = IntervalWeek
+			yyLOCAL = IntervalDay
 		}
 		yyVAL.union = yyLOCAL
 	case 1422:
@@ -20942,7 +20905,7 @@ yydefault:
 		var yyLOCAL IntervalType
 //line sql.y:7053
 		{
-			yyLOCAL = IntervalHour
+			yyLOCAL = IntervalWeek
 		}
 		yyVAL.union = yyLOCAL
 	case 1423:
@@ -20950,7 +20913,7 @@ yydefault:
 		var yyLOCAL IntervalType
 //line sql.y:7057
 		{
-			yyLOCAL = IntervalMinute
+			yyLOCAL = IntervalHour
 		}
 		yyVAL.union = yyLOCAL
 	case 1424:
@@ -20958,7 +20921,7 @@ yydefault:
 		var yyLOCAL IntervalType
 //line sql.y:7061
 		{
-			yyLOCAL = IntervalMonth
+			yyLOCAL = IntervalMinute
 		}
 		yyVAL.union = yyLOCAL
 	case 1425:
@@ -20966,7 +20929,7 @@ yydefault:
 		var yyLOCAL IntervalType
 //line sql.y:7065
 		{
-			yyLOCAL = IntervalQuarter
+			yyLOCAL = IntervalMonth
 		}
 		yyVAL.union = yyLOCAL
 	case 1426:
@@ -20974,7 +20937,7 @@ yydefault:
 		var yyLOCAL IntervalType
 //line sql.y:7069
 		{
-			yyLOCAL = IntervalSecond
+			yyLOCAL = IntervalQuarter
 		}
 		yyVAL.union = yyLOCAL
 	case 1427:
@@ -20982,7 +20945,7 @@ yydefault:
 		var yyLOCAL IntervalType
 //line sql.y:7073
 		{
-			yyLOCAL = IntervalMicrosecond
+			yyLOCAL = IntervalSecond
 		}
 		yyVAL.union = yyLOCAL
 	case 1428:
@@ -20990,7 +20953,7 @@ yydefault:
 		var yyLOCAL IntervalType
 //line sql.y:7077
 		{
-			yyLOCAL = IntervalYear
+			yyLOCAL = IntervalMicrosecond
 		}
 		yyVAL.union = yyLOCAL
 	case 1429:
@@ -20998,7 +20961,7 @@ yydefault:
 		var yyLOCAL IntervalType
 //line sql.y:7081
 		{
-			yyLOCAL = IntervalDay
+			yyLOCAL = IntervalYear
 		}
 		yyVAL.union = yyLOCAL
 	case 1430:
@@ -21006,7 +20969,7 @@ yydefault:
 		var yyLOCAL IntervalType
 //line sql.y:7085
 		{
-			yyLOCAL = IntervalWeek
+			yyLOCAL = IntervalDay
 		}
 		yyVAL.union = yyLOCAL
 	case 1431:
@@ -21014,7 +20977,7 @@ yydefault:
 		var yyLOCAL IntervalType
 //line sql.y:7089
 		{
-			yyLOCAL = IntervalHour
+			yyLOCAL = IntervalWeek
 		}
 		yyVAL.union = yyLOCAL
 	case 1432:
@@ -21022,7 +20985,7 @@ yydefault:
 		var yyLOCAL IntervalType
 //line sql.y:7093
 		{
-			yyLOCAL = IntervalMinute
+			yyLOCAL = IntervalHour
 		}
 		yyVAL.union = yyLOCAL
 	case 1433:
@@ -21030,7 +20993,7 @@ yydefault:
 		var yyLOCAL IntervalType
 //line sql.y:7097
 		{
-			yyLOCAL = IntervalMonth
+			yyLOCAL = IntervalMinute
 		}
 		yyVAL.union = yyLOCAL
 	case 1434:
@@ -21038,7 +21001,7 @@ yydefault:
 		var yyLOCAL IntervalType
 //line sql.y:7101
 		{
-			yyLOCAL = IntervalQuarter
+			yyLOCAL = IntervalMonth
 		}
 		yyVAL.union = yyLOCAL
 	case 1435:
@@ -21046,7 +21009,7 @@ yydefault:
 		var yyLOCAL IntervalType
 //line sql.y:7105
 		{
-			yyLOCAL = IntervalSecond
+			yyLOCAL = IntervalQuarter
 		}
 		yyVAL.union = yyLOCAL
 	case 1436:
@@ -21054,7 +21017,7 @@ yydefault:
 		var yyLOCAL IntervalType
 //line sql.y:7109
 		{
-			yyLOCAL = IntervalMicrosecond
+			yyLOCAL = IntervalSecond
 		}
 		yyVAL.union = yyLOCAL
 	case 1437:
@@ -21062,19 +21025,19 @@ yydefault:
 		var yyLOCAL IntervalType
 //line sql.y:7113
 		{
-			yyLOCAL = IntervalYear
+			yyLOCAL = IntervalMicrosecond
 		}
 		yyVAL.union = yyLOCAL
-	case 1440:
-		yyDollar = yyS[yypt-0 : yypt+1]
-		var yyLOCAL int
-//line sql.y:7123
+	case 1438:
+		yyDollar = yyS[yypt-1 : yypt+1]
+		var yyLOCAL IntervalType
+//line sql.y:7117
 		{
-			yyLOCAL = 0
+			yyLOCAL = IntervalYear
 		}
 		yyVAL.union = yyLOCAL
 	case 1441:
-		yyDollar = yyS[yypt-2 : yypt+1]
+		yyDollar = yyS[yypt-0 : yypt+1]
 		var yyLOCAL int
 //line sql.y:7127
 		{
@@ -21082,19 +21045,19 @@ yydefault:
 		}
 		yyVAL.union = yyLOCAL
 	case 1442:
-		yyDollar = yyS[yypt-3 : yypt+1]
+		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL int
 //line sql.y:7131
 		{
-			yyLOCAL = convertStringToInt(yyDollar[2].str)
+			yyLOCAL = 0
 		}
 		yyVAL.union = yyLOCAL
 	case 1443:
-		yyDollar = yyS[yypt-4 : yypt+1]
-		var yyLOCAL Expr
-//line sql.y:7141
+		yyDollar = yyS[yypt-3 : yypt+1]
+		var yyLOCAL int
+//line sql.y:7135
 		{
-			yyLOCAL = &FuncExpr{Name: NewIdentifierCI("if"), Exprs: yyDollar[3].exprsUnion()}
+			yyLOCAL = convertStringToInt(yyDollar[2].str)
 		}
 		yyVAL.union = yyLOCAL
 	case 1444:
@@ -21102,7 +21065,7 @@ yydefault:
 		var yyLOCAL Expr
 //line sql.y:7145
 		{
-			yyLOCAL = &FuncExpr{Name: NewIdentifierCI("database"), Exprs: yyDollar[3].exprsUnion()}
+			yyLOCAL = &FuncExpr{Name: NewIdentifierCI("if"), Exprs: yyDollar[3].exprsUnion()}
 		}
 		yyVAL.union = yyLOCAL
 	case 1445:
@@ -21110,7 +21073,7 @@ yydefault:
 		var yyLOCAL Expr
 //line sql.y:7149
 		{
-			yyLOCAL = &FuncExpr{Name: NewIdentifierCI("schema"), Exprs: yyDollar[3].exprsUnion()}
+			yyLOCAL = &FuncExpr{Name: NewIdentifierCI("database"), Exprs: yyDollar[3].exprsUnion()}
 		}
 		yyVAL.union = yyLOCAL
 	case 1446:
@@ -21118,7 +21081,7 @@ yydefault:
 		var yyLOCAL Expr
 //line sql.y:7153
 		{
-			yyLOCAL = &FuncExpr{Name: NewIdentifierCI("mod"), Exprs: yyDollar[3].exprsUnion()}
+			yyLOCAL = &FuncExpr{Name: NewIdentifierCI("schema"), Exprs: yyDollar[3].exprsUnion()}
 		}
 		yyVAL.union = yyLOCAL
 	case 1447:
@@ -21126,60 +21089,62 @@ yydefault:
 		var yyLOCAL Expr
 //line sql.y:7157
 		{
-			yyLOCAL = &FuncExpr{Name: NewIdentifierCI("replace"), Exprs: yyDollar[3].exprsUnion()}
+			yyLOCAL = &FuncExpr{Name: NewIdentifierCI("mod"), Exprs: yyDollar[3].exprsUnion()}
 		}
 		yyVAL.union = yyLOCAL
 	case 1448:
-		yyDollar = yyS[yypt-0 : yypt+1]
-		var yyLOCAL MatchExprOption
-//line sql.y:7163
+		yyDollar = yyS[yypt-4 : yypt+1]
+		var yyLOCAL Expr
+//line sql.y:7161
 		{
-			yyLOCAL = NoOption
+			yyLOCAL = &FuncExpr{Name: NewIdentifierCI("replace"), Exprs: yyDollar[3].exprsUnion()}
 		}
 		yyVAL.union = yyLOCAL
 	case 1449:
-		yyDollar = yyS[yypt-3 : yypt+1]
+		yyDollar = yyS[yypt-0 : yypt+1]
 		var yyLOCAL MatchExprOption
 //line sql.y:7167
 		{
-			yyLOCAL = BooleanModeOpt
+			yyLOCAL = NoOption
 		}
 		yyVAL.union = yyLOCAL
 	case 1450:
-		yyDollar = yyS[yypt-4 : yypt+1]
+		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL MatchExprOption
 //line sql.y:7171
 		{
-			yyLOCAL = NaturalLanguageModeOpt
+			yyLOCAL = BooleanModeOpt
 		}
 		yyVAL.union = yyLOCAL
 	case 1451:
-		yyDollar = yyS[yypt-7 : yypt+1]
+		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL MatchExprOption
 //line sql.y:7175
 		{
-			yyLOCAL = NaturalLanguageModeWithQueryExpansionOpt
+			yyLOCAL = NaturalLanguageModeOpt
 		}
 		yyVAL.union = yyLOCAL
 	case 1452:
-		yyDollar = yyS[yypt-3 : yypt+1]
+		yyDollar = yyS[yypt-7 : yypt+1]
 		var yyLOCAL MatchExprOption
 //line sql.y:7179
 		{
-			yyLOCAL = QueryExpansionOpt
+			yyLOCAL = NaturalLanguageModeWithQueryExpansionOpt
 		}
 		yyVAL.union = yyLOCAL
 	case 1453:
-		yyDollar = yyS[yypt-1 : yypt+1]
-//line sql.y:7185
+		yyDollar = yyS[yypt-3 : yypt+1]
+		var yyLOCAL MatchExprOption
+//line sql.y:7183
 		{
-			yyVAL.str = string(yyDollar[1].identifierCI.String())
+			yyLOCAL = QueryExpansionOpt
 		}
+		yyVAL.union = yyLOCAL
 	case 1454:
 		yyDollar = yyS[yypt-1 : yypt+1]
 //line sql.y:7189
 		{
-			yyVAL.str = string(yyDollar[1].str)
+			yyVAL.str = string(yyDollar[1].identifierCI.String())
 		}
 	case 1455:
 		yyDollar = yyS[yypt-1 : yypt+1]
@@ -21188,19 +21153,17 @@ yydefault:
 			yyVAL.str = string(yyDollar[1].str)
 		}
 	case 1456:
-		yyDollar = yyS[yypt-0 : yypt+1]
-		var yyLOCAL *ConvertType
-//line sql.y:7199
+		yyDollar = yyS[yypt-1 : yypt+1]
+//line sql.y:7197
 		{
-			yyLOCAL = nil
+			yyVAL.str = string(yyDollar[1].str)
 		}
-		yyVAL.union = yyLOCAL
 	case 1457:
-		yyDollar = yyS[yypt-5 : yypt+1]
+		yyDollar = yyS[yypt-0 : yypt+1]
 		var yyLOCAL *ConvertType
 //line sql.y:7203
 		{
-			yyLOCAL = &ConvertType{Type: string(yyDollar[2].str), Length: ptr.Of(convertStringToInt(yyDollar[4].str))}
+			yyLOCAL = nil
 		}
 		yyVAL.union = yyLOCAL
 	case 1458:
@@ -21212,35 +21175,35 @@ yydefault:
 		}
 		yyVAL.union = yyLOCAL
 	case 1459:
-		yyDollar = yyS[yypt-2 : yypt+1]
+		yyDollar = yyS[yypt-5 : yypt+1]
 		var yyLOCAL *ConvertType
-//line sql.y:7213
+//line sql.y:7211
 		{
-			yyLOCAL = &ConvertType{Type: string(yyDollar[1].str), Length: yyDollar[2].intPtrUnion()}
+			yyLOCAL = &ConvertType{Type: string(yyDollar[2].str), Length: ptr.Of(convertStringToInt(yyDollar[4].str))}
 		}
 		yyVAL.union = yyLOCAL
 	case 1460:
-		yyDollar = yyS[yypt-3 : yypt+1]
+		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL *ConvertType
 //line sql.y:7217
 		{
-			yyLOCAL = &ConvertType{Type: string(yyDollar[1].str), Length: yyDollar[2].intPtrUnion(), Charset: yyDollar[3].columnCharset}
+			yyLOCAL = &ConvertType{Type: string(yyDollar[1].str), Length: yyDollar[2].intPtrUnion()}
 		}
 		yyVAL.union = yyLOCAL
 	case 1461:
-		yyDollar = yyS[yypt-1 : yypt+1]
+		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL *ConvertType
 //line sql.y:7221
 		{
-			yyLOCAL = &ConvertType{Type: string(yyDollar[1].str)}
+			yyLOCAL = &ConvertType{Type: string(yyDollar[1].str), Length: yyDollar[2].intPtrUnion(), Charset: yyDollar[3].columnCharset}
 		}
 		yyVAL.union = yyLOCAL
 	case 1462:
-		yyDollar = yyS[yypt-2 : yypt+1]
+		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL *ConvertType
 //line sql.y:7225
 		{
-			yyLOCAL = &ConvertType{Type: string(yyDollar[1].str), Length: yyDollar[2].intPtrUnion()}
+			yyLOCAL = &ConvertType{Type: string(yyDollar[1].str)}
 		}
 		yyVAL.union = yyLOCAL
 	case 1463:
@@ -21248,37 +21211,37 @@ yydefault:
 		var yyLOCAL *ConvertType
 //line sql.y:7229
 		{
-			yyLOCAL = &ConvertType{Type: string(yyDollar[1].str)}
-			yyLOCAL.Length = yyDollar[2].LengthScaleOption.Length
-			yyLOCAL.Scale = yyDollar[2].LengthScaleOption.Scale
+			yyLOCAL = &ConvertType{Type: string(yyDollar[1].str), Length: yyDollar[2].intPtrUnion()}
 		}
 		yyVAL.union = yyLOCAL
 	case 1464:
-		yyDollar = yyS[yypt-1 : yypt+1]
+		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL *ConvertType
-//line sql.y:7235
+//line sql.y:7233
 		{
 			yyLOCAL = &ConvertType{Type: string(yyDollar[1].str)}
+			yyLOCAL.Length = yyDollar[2].LengthScaleOption.Length
+			yyLOCAL.Scale = yyDollar[2].LengthScaleOption.Scale
 		}
 		yyVAL.union = yyLOCAL
 	case 1465:
-		yyDollar = yyS[yypt-2 : yypt+1]
+		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL *ConvertType
 //line sql.y:7239
 		{
-			yyLOCAL = &ConvertType{Type: string(yyDollar[1].str), Length: yyDollar[2].intPtrUnion()}
+			yyLOCAL = &ConvertType{Type: string(yyDollar[1].str)}
 		}
 		yyVAL.union = yyLOCAL
 	case 1466:
-		yyDollar = yyS[yypt-1 : yypt+1]
+		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL *ConvertType
 //line sql.y:7243
 		{
-			yyLOCAL = &ConvertType{Type: string(yyDollar[1].str)}
+			yyLOCAL = &ConvertType{Type: string(yyDollar[1].str), Length: yyDollar[2].intPtrUnion()}
 		}
 		yyVAL.union = yyLOCAL
 	case 1467:
-		yyDollar = yyS[yypt-2 : yypt+1]
+		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL *ConvertType
 //line sql.y:7247
 		{
@@ -21290,19 +21253,19 @@ yydefault:
 		var yyLOCAL *ConvertType
 //line sql.y:7251
 		{
-			yyLOCAL = &ConvertType{Type: string(yyDollar[1].str), Length: yyDollar[2].intPtrUnion()}
+			yyLOCAL = &ConvertType{Type: string(yyDollar[1].str)}
 		}
 		yyVAL.union = yyLOCAL
 	case 1469:
-		yyDollar = yyS[yypt-1 : yypt+1]
+		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL *ConvertType
 //line sql.y:7255
 		{
-			yyLOCAL = &ConvertType{Type: string(yyDollar[1].str)}
+			yyLOCAL = &ConvertType{Type: string(yyDollar[1].str), Length: yyDollar[2].intPtrUnion()}
 		}
 		yyVAL.union = yyLOCAL
 	case 1470:
-		yyDollar = yyS[yypt-2 : yypt+1]
+		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL *ConvertType
 //line sql.y:7259
 		{
@@ -21314,15 +21277,15 @@ yydefault:
 		var yyLOCAL *ConvertType
 //line sql.y:7263
 		{
-			yyLOCAL = &ConvertType{Type: string(yyDollar[1].str), Length: yyDollar[2].intPtrUnion()}
+			yyLOCAL = &ConvertType{Type: string(yyDollar[1].str)}
 		}
 		yyVAL.union = yyLOCAL
 	case 1472:
-		yyDollar = yyS[yypt-1 : yypt+1]
+		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL *ConvertType
 //line sql.y:7267
 		{
-			yyLOCAL = &ConvertType{Type: string(yyDollar[1].str)}
+			yyLOCAL = &ConvertType{Type: string(yyDollar[1].str), Length: yyDollar[2].intPtrUnion()}
 		}
 		yyVAL.union = yyLOCAL
 	case 1473:
@@ -21334,140 +21297,148 @@ yydefault:
 		}
 		yyVAL.union = yyLOCAL
 	case 1474:
+		yyDollar = yyS[yypt-1 : yypt+1]
+		var yyLOCAL *ConvertType
+//line sql.y:7275
+		{
+			yyLOCAL = &ConvertType{Type: string(yyDollar[1].str)}
+		}
+		yyVAL.union = yyLOCAL
+	case 1475:
 		yyDollar = yyS[yypt-0 : yypt+1]
 		var yyLOCAL bool
-//line sql.y:7277
+//line sql.y:7281
 		{
 			yyLOCAL = false
 		}
 		yyVAL.union = yyLOCAL
-	case 1475:
+	case 1476:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL bool
-//line sql.y:7281
+//line sql.y:7285
 		{
 			yyLOCAL = true
 		}
 		yyVAL.union = yyLOCAL
-	case 1476:
+	case 1477:
 		yyDollar = yyS[yypt-0 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:7286
+//line sql.y:7290
 		{
 			yyLOCAL = nil
 		}
 		yyVAL.union = yyLOCAL
-	case 1477:
+	case 1478:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:7290
+//line sql.y:7294
 		{
 			yyLOCAL = yyDollar[1].exprUnion()
 		}
 		yyVAL.union = yyLOCAL
-	case 1478:
+	case 1479:
 		yyDollar = yyS[yypt-0 : yypt+1]
-//line sql.y:7295
+//line sql.y:7299
 		{
 			yyVAL.str = string("")
 		}
-	case 1479:
+	case 1480:
 		yyDollar = yyS[yypt-2 : yypt+1]
-//line sql.y:7299
+//line sql.y:7303
 		{
 			yyVAL.str = encodeSQLString(yyDollar[2].str)
 		}
-	case 1480:
+	case 1481:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL []*When
-//line sql.y:7305
+//line sql.y:7309
 		{
 			yyLOCAL = []*When{yyDollar[1].whenUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1481:
+	case 1482:
 		yyDollar = yyS[yypt-2 : yypt+1]
-//line sql.y:7309
+//line sql.y:7313
 		{
 			yySLICE := (*[]*When)(yyIaddr(yyVAL.union))
 			*yySLICE = append(*yySLICE, yyDollar[2].whenUnion())
 		}
-	case 1482:
+	case 1483:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL *When
-//line sql.y:7315
+//line sql.y:7319
 		{
 			yyLOCAL = &When{Cond: yyDollar[2].exprUnion(), Val: yyDollar[4].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1483:
+	case 1484:
 		yyDollar = yyS[yypt-0 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:7320
+//line sql.y:7324
 		{
 			yyLOCAL = nil
 		}
 		yyVAL.union = yyLOCAL
-	case 1484:
+	case 1485:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:7324
+//line sql.y:7328
 		{
 			yyLOCAL = yyDollar[2].exprUnion()
 		}
 		yyVAL.union = yyLOCAL
-	case 1485:
+	case 1486:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL *ColName
-//line sql.y:7330
+//line sql.y:7334
 		{
 			yyLOCAL = &ColName{Name: yyDollar[1].identifierCI}
 		}
 		yyVAL.union = yyLOCAL
-	case 1486:
+	case 1487:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL *ColName
-//line sql.y:7334
+//line sql.y:7338
 		{
 			yyLOCAL = &ColName{Name: NewIdentifierCI(string(yyDollar[1].str))}
 		}
 		yyVAL.union = yyLOCAL
-	case 1487:
+	case 1488:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL *ColName
-//line sql.y:7338
+//line sql.y:7342
 		{
 			yyLOCAL = &ColName{Qualifier: TableName{Name: yyDollar[1].identifierCS}, Name: yyDollar[3].identifierCI}
 		}
 		yyVAL.union = yyLOCAL
-	case 1488:
+	case 1489:
 		yyDollar = yyS[yypt-5 : yypt+1]
 		var yyLOCAL *ColName
-//line sql.y:7342
+//line sql.y:7346
 		{
 			yyLOCAL = &ColName{Qualifier: TableName{Qualifier: yyDollar[1].identifierCS, Name: yyDollar[3].identifierCS}, Name: yyDollar[5].identifierCI}
 		}
 		yyVAL.union = yyLOCAL
-	case 1489:
+	case 1490:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:7348
+//line sql.y:7352
 		{
 			yyLOCAL = yyDollar[1].colNameUnion()
 		}
 		yyVAL.union = yyLOCAL
-	case 1490:
+	case 1491:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:7352
+//line sql.y:7356
 		{
 			yyLOCAL = &Offset{V: convertStringToInt(yyDollar[1].str)}
 		}
 		yyVAL.union = yyLOCAL
-	case 1491:
+	case 1492:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:7358
+//line sql.y:7362
 		{
 			// TODO(sougou): Deprecate this construct.
 			if yyDollar[1].identifierCI.Lowered() != "value" {
@@ -21477,234 +21448,226 @@ yydefault:
 			yyLOCAL = NewIntLiteral("1")
 		}
 		yyVAL.union = yyLOCAL
-	case 1492:
+	case 1493:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:7367
+//line sql.y:7371
 		{
 			yyLOCAL = NewIntLiteral(yyDollar[1].str)
 		}
 		yyVAL.union = yyLOCAL
-	case 1493:
+	case 1494:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:7371
+//line sql.y:7375
 		{
 			yyLOCAL = parseBindVariable(yylex, yyDollar[1].str[1:])
 		}
 		yyVAL.union = yyLOCAL
-	case 1494:
+	case 1495:
 		yyDollar = yyS[yypt-0 : yypt+1]
 		var yyLOCAL *GroupBy
-//line sql.y:7376
+//line sql.y:7380
 		{
 			yyLOCAL = nil
 		}
 		yyVAL.union = yyLOCAL
-	case 1495:
+	case 1496:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL *GroupBy
-//line sql.y:7380
+//line sql.y:7384
 		{
 			yyLOCAL = &GroupBy{Exprs: yyDollar[3].exprsUnion(), WithRollup: yyDollar[4].booleanUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1496:
+	case 1497:
 		yyDollar = yyS[yypt-0 : yypt+1]
 		var yyLOCAL bool
-//line sql.y:7385
+//line sql.y:7389
 		{
 			yyLOCAL = false
 		}
 		yyVAL.union = yyLOCAL
-	case 1497:
+	case 1498:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL bool
-//line sql.y:7389
+//line sql.y:7393
 		{
 			yyLOCAL = true
 		}
 		yyVAL.union = yyLOCAL
-	case 1498:
+	case 1499:
 		yyDollar = yyS[yypt-0 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:7395
+//line sql.y:7399
 		{
 			yyLOCAL = nil
 		}
 		yyVAL.union = yyLOCAL
-	case 1499:
+	case 1500:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:7399
+//line sql.y:7403
 		{
 			yyLOCAL = yyDollar[2].exprUnion()
 		}
 		yyVAL.union = yyLOCAL
-	case 1500:
+	case 1501:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL *NamedWindow
-//line sql.y:7405
+//line sql.y:7409
 		{
 			yyLOCAL = &NamedWindow{yyDollar[2].windowDefinitionsUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1501:
+	case 1502:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL NamedWindows
-//line sql.y:7411
+//line sql.y:7415
 		{
 			yyLOCAL = NamedWindows{yyDollar[1].namedWindowUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1502:
+	case 1503:
 		yyDollar = yyS[yypt-3 : yypt+1]
-//line sql.y:7415
+//line sql.y:7419
 		{
 			yySLICE := (*NamedWindows)(yyIaddr(yyVAL.union))
 			*yySLICE = append(*yySLICE, yyDollar[3].namedWindowUnion())
 		}
-	case 1503:
+	case 1504:
 		yyDollar = yyS[yypt-0 : yypt+1]
 		var yyLOCAL NamedWindows
-//line sql.y:7420
+//line sql.y:7424
 		{
 			yyLOCAL = nil
 		}
 		yyVAL.union = yyLOCAL
-	case 1504:
+	case 1505:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL NamedWindows
-//line sql.y:7424
+//line sql.y:7428
 		{
 			yyLOCAL = yyDollar[1].namedWindowsUnion()
 		}
 		yyVAL.union = yyLOCAL
-	case 1505:
+	case 1506:
 		yyDollar = yyS[yypt-0 : yypt+1]
 		var yyLOCAL OrderBy
-//line sql.y:7429
+//line sql.y:7433
 		{
 			yyLOCAL = nil
 		}
 		yyVAL.union = yyLOCAL
-	case 1506:
+	case 1507:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL OrderBy
-//line sql.y:7433
+//line sql.y:7437
 		{
 			yyLOCAL = yyDollar[1].orderByUnion()
 		}
 		yyVAL.union = yyLOCAL
-	case 1507:
+	case 1508:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL OrderBy
-//line sql.y:7439
+//line sql.y:7443
 		{
 			yyLOCAL = yyDollar[3].orderByUnion()
 		}
 		yyVAL.union = yyLOCAL
-	case 1508:
+	case 1509:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL OrderBy
-//line sql.y:7445
+//line sql.y:7449
 		{
 			yyLOCAL = OrderBy{yyDollar[1].orderUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1509:
+	case 1510:
 		yyDollar = yyS[yypt-3 : yypt+1]
-//line sql.y:7449
+//line sql.y:7453
 		{
 			yySLICE := (*OrderBy)(yyIaddr(yyVAL.union))
 			*yySLICE = append(*yySLICE, yyDollar[3].orderUnion())
 		}
-	case 1510:
+	case 1511:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL *Order
-//line sql.y:7455
+//line sql.y:7459
 		{
 			yyLOCAL = &Order{Expr: yyDollar[1].exprUnion(), Direction: yyDollar[2].orderDirectionUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1511:
+	case 1512:
 		yyDollar = yyS[yypt-0 : yypt+1]
 		var yyLOCAL OrderDirection
-//line sql.y:7460
+//line sql.y:7464
 		{
 			yyLOCAL = AscOrder
 		}
 		yyVAL.union = yyLOCAL
-	case 1512:
+	case 1513:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL OrderDirection
-//line sql.y:7464
+//line sql.y:7468
 		{
 			yyLOCAL = AscOrder
 		}
 		yyVAL.union = yyLOCAL
-	case 1513:
+	case 1514:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL OrderDirection
-//line sql.y:7468
+//line sql.y:7472
 		{
 			yyLOCAL = DescOrder
 		}
 		yyVAL.union = yyLOCAL
-	case 1514:
+	case 1515:
 		yyDollar = yyS[yypt-0 : yypt+1]
 		var yyLOCAL *Limit
-//line sql.y:7473
+//line sql.y:7477
 		{
 			yyLOCAL = nil
 		}
 		yyVAL.union = yyLOCAL
-	case 1515:
+	case 1516:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL *Limit
-//line sql.y:7477
+//line sql.y:7481
 		{
 			yyLOCAL = yyDollar[1].limitUnion()
 		}
 		yyVAL.union = yyLOCAL
-	case 1516:
+	case 1517:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL *Limit
-//line sql.y:7483
+//line sql.y:7487
 		{
 			yyLOCAL = &Limit{Rowcount: yyDollar[2].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1517:
+	case 1518:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL *Limit
-//line sql.y:7487
+//line sql.y:7491
 		{
 			yyLOCAL = &Limit{Offset: yyDollar[2].exprUnion(), Rowcount: yyDollar[4].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1518:
+	case 1519:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL *Limit
-//line sql.y:7491
+//line sql.y:7495
 		{
 			yyLOCAL = &Limit{Offset: yyDollar[4].exprUnion(), Rowcount: yyDollar[2].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1519:
-		yyDollar = yyS[yypt-0 : yypt+1]
-		var yyLOCAL []AlterOption
-//line sql.y:7496
-		{
-			yyLOCAL = nil
-		}
-		yyVAL.union = yyLOCAL
 	case 1520:
-		yyDollar = yyS[yypt-2 : yypt+1]
+		yyDollar = yyS[yypt-0 : yypt+1]
 		var yyLOCAL []AlterOption
 //line sql.y:7500
 		{
-			yyLOCAL = []AlterOption{yyDollar[1].alterOptionUnion(), yyDollar[2].alterOptionUnion()}
+			yyLOCAL = nil
 		}
 		yyVAL.union = yyLOCAL
 	case 1521:
@@ -21716,11 +21679,11 @@ yydefault:
 		}
 		yyVAL.union = yyLOCAL
 	case 1522:
-		yyDollar = yyS[yypt-1 : yypt+1]
+		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL []AlterOption
 //line sql.y:7508
 		{
-			yyLOCAL = []AlterOption{yyDollar[1].alterOptionUnion()}
+			yyLOCAL = []AlterOption{yyDollar[1].alterOptionUnion(), yyDollar[2].alterOptionUnion()}
 		}
 		yyVAL.union = yyLOCAL
 	case 1523:
@@ -21732,11 +21695,11 @@ yydefault:
 		}
 		yyVAL.union = yyLOCAL
 	case 1524:
-		yyDollar = yyS[yypt-3 : yypt+1]
-		var yyLOCAL AlterOption
-//line sql.y:7519
+		yyDollar = yyS[yypt-1 : yypt+1]
+		var yyLOCAL []AlterOption
+//line sql.y:7516
 		{
-			yyLOCAL = &LockOption{Type: DefaultType}
+			yyLOCAL = []AlterOption{yyDollar[1].alterOptionUnion()}
 		}
 		yyVAL.union = yyLOCAL
 	case 1525:
@@ -21744,7 +21707,7 @@ yydefault:
 		var yyLOCAL AlterOption
 //line sql.y:7523
 		{
-			yyLOCAL = &LockOption{Type: NoneType}
+			yyLOCAL = &LockOption{Type: DefaultType}
 		}
 		yyVAL.union = yyLOCAL
 	case 1526:
@@ -21752,7 +21715,7 @@ yydefault:
 		var yyLOCAL AlterOption
 //line sql.y:7527
 		{
-			yyLOCAL = &LockOption{Type: SharedType}
+			yyLOCAL = &LockOption{Type: NoneType}
 		}
 		yyVAL.union = yyLOCAL
 	case 1527:
@@ -21760,15 +21723,15 @@ yydefault:
 		var yyLOCAL AlterOption
 //line sql.y:7531
 		{
-			yyLOCAL = &LockOption{Type: ExclusiveType}
+			yyLOCAL = &LockOption{Type: SharedType}
 		}
 		yyVAL.union = yyLOCAL
 	case 1528:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL AlterOption
-//line sql.y:7537
+//line sql.y:7535
 		{
-			yyLOCAL = AlgorithmValue(yyDollar[3].str)
+			yyLOCAL = &LockOption{Type: ExclusiveType}
 		}
 		yyVAL.union = yyLOCAL
 	case 1529:
@@ -21796,16 +21759,18 @@ yydefault:
 		}
 		yyVAL.union = yyLOCAL
 	case 1532:
-		yyDollar = yyS[yypt-0 : yypt+1]
-//line sql.y:7554
+		yyDollar = yyS[yypt-3 : yypt+1]
+		var yyLOCAL AlterOption
+//line sql.y:7553
 		{
-			yyVAL.str = ""
+			yyLOCAL = AlgorithmValue(yyDollar[3].str)
 		}
+		yyVAL.union = yyLOCAL
 	case 1533:
-		yyDollar = yyS[yypt-3 : yypt+1]
+		yyDollar = yyS[yypt-0 : yypt+1]
 //line sql.y:7558
 		{
-			yyVAL.str = string(yyDollar[3].str)
+			yyVAL.str = ""
 		}
 	case 1534:
 		yyDollar = yyS[yypt-3 : yypt+1]
@@ -21820,22 +21785,22 @@ yydefault:
 			yyVAL.str = string(yyDollar[3].str)
 		}
 	case 1536:
-		yyDollar = yyS[yypt-0 : yypt+1]
-//line sql.y:7571
+		yyDollar = yyS[yypt-3 : yypt+1]
+//line sql.y:7570
 		{
-			yyVAL.str = ""
+			yyVAL.str = string(yyDollar[3].str)
 		}
 	case 1537:
-		yyDollar = yyS[yypt-3 : yypt+1]
+		yyDollar = yyS[yypt-0 : yypt+1]
 //line sql.y:7575
 		{
-			yyVAL.str = yyDollar[3].str
+			yyVAL.str = ""
 		}
 	case 1538:
-		yyDollar = yyS[yypt-1 : yypt+1]
-//line sql.y:7581
+		yyDollar = yyS[yypt-3 : yypt+1]
+//line sql.y:7579
 		{
-			yyVAL.str = string(yyDollar[1].str)
+			yyVAL.str = yyDollar[3].str
 		}
 	case 1539:
 		yyDollar = yyS[yypt-1 : yypt+1]
@@ -21844,28 +21809,28 @@ yydefault:
 			yyVAL.str = string(yyDollar[1].str)
 		}
 	case 1540:
-		yyDollar = yyS[yypt-0 : yypt+1]
-//line sql.y:7590
+		yyDollar = yyS[yypt-1 : yypt+1]
+//line sql.y:7589
 		{
-			yyVAL.str = ""
+			yyVAL.str = string(yyDollar[1].str)
 		}
 	case 1541:
-		yyDollar = yyS[yypt-4 : yypt+1]
+		yyDollar = yyS[yypt-0 : yypt+1]
 //line sql.y:7594
 		{
-			yyVAL.str = yyDollar[2].str
+			yyVAL.str = ""
 		}
 	case 1542:
-		yyDollar = yyS[yypt-0 : yypt+1]
-//line sql.y:7599
+		yyDollar = yyS[yypt-4 : yypt+1]
+//line sql.y:7598
 		{
-			yyVAL.str = "cascaded"
+			yyVAL.str = yyDollar[2].str
 		}
 	case 1543:
-		yyDollar = yyS[yypt-1 : yypt+1]
+		yyDollar = yyS[yypt-0 : yypt+1]
 //line sql.y:7603
 		{
-			yyVAL.str = string(yyDollar[1].str)
+			yyVAL.str = "cascaded"
 		}
 	case 1544:
 		yyDollar = yyS[yypt-1 : yypt+1]
@@ -21874,45 +21839,51 @@ yydefault:
 			yyVAL.str = string(yyDollar[1].str)
 		}
 	case 1545:
+		yyDollar = yyS[yypt-1 : yypt+1]
+//line sql.y:7611
+		{
+			yyVAL.str = string(yyDollar[1].str)
+		}
+	case 1546:
 		yyDollar = yyS[yypt-0 : yypt+1]
 		var yyLOCAL *Definer
-//line sql.y:7612
+//line sql.y:7616
 		{
 			yyLOCAL = nil
 		}
 		yyVAL.union = yyLOCAL
-	case 1546:
+	case 1547:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL *Definer
-//line sql.y:7616
+//line sql.y:7620
 		{
 			yyLOCAL = yyDollar[3].definerUnion()
 		}
 		yyVAL.union = yyLOCAL
-	case 1547:
+	case 1548:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL *Definer
-//line sql.y:7622
+//line sql.y:7626
 		{
 			yyLOCAL = &Definer{
 				Name: string(yyDollar[1].str),
 			}
 		}
 		yyVAL.union = yyLOCAL
-	case 1548:
+	case 1549:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL *Definer
-//line sql.y:7628
+//line sql.y:7632
 		{
 			yyLOCAL = &Definer{
 				Name: string(yyDollar[1].str),
 			}
 		}
 		yyVAL.union = yyLOCAL
-	case 1549:
+	case 1550:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL *Definer
-//line sql.y:7634
+//line sql.y:7638
 		{
 			yyLOCAL = &Definer{
 				Name:    yyDollar[1].str,
@@ -21920,464 +21891,464 @@ yydefault:
 			}
 		}
 		yyVAL.union = yyLOCAL
-	case 1550:
+	case 1551:
 		yyDollar = yyS[yypt-1 : yypt+1]
-//line sql.y:7643
+//line sql.y:7647
 		{
 			yyVAL.str = encodeSQLString(yyDollar[1].str)
 		}
-	case 1551:
+	case 1552:
 		yyDollar = yyS[yypt-1 : yypt+1]
-//line sql.y:7647
+//line sql.y:7651
 		{
 			yyVAL.str = formatIdentifier(yyDollar[1].str)
 		}
-	case 1552:
+	case 1553:
 		yyDollar = yyS[yypt-0 : yypt+1]
-//line sql.y:7652
+//line sql.y:7656
 		{
 			yyVAL.str = ""
 		}
-	case 1553:
+	case 1554:
 		yyDollar = yyS[yypt-1 : yypt+1]
-//line sql.y:7656
+//line sql.y:7660
 		{
 			yyVAL.str = formatAddress(yyDollar[1].str)
 		}
-	case 1554:
+	case 1555:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL Lock
-//line sql.y:7662
+//line sql.y:7666
 		{
 			yyLOCAL = ForUpdateLock
 		}
 		yyVAL.union = yyLOCAL
-	case 1555:
+	case 1556:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL Lock
-//line sql.y:7666
+//line sql.y:7670
 		{
 			yyLOCAL = ForUpdateLockNoWait
 		}
 		yyVAL.union = yyLOCAL
-	case 1556:
+	case 1557:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Lock
-//line sql.y:7670
+//line sql.y:7674
 		{
 			yyLOCAL = ForUpdateLockSkipLocked
 		}
 		yyVAL.union = yyLOCAL
-	case 1557:
+	case 1558:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL Lock
-//line sql.y:7674
+//line sql.y:7678
 		{
 			yyLOCAL = ForShareLock
 		}
 		yyVAL.union = yyLOCAL
-	case 1558:
+	case 1559:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL Lock
-//line sql.y:7678
+//line sql.y:7682
 		{
 			yyLOCAL = ForShareLockNoWait
 		}
 		yyVAL.union = yyLOCAL
-	case 1559:
+	case 1560:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Lock
-//line sql.y:7682
+//line sql.y:7686
 		{
 			yyLOCAL = ForShareLockSkipLocked
 		}
 		yyVAL.union = yyLOCAL
-	case 1560:
+	case 1561:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Lock
-//line sql.y:7686
+//line sql.y:7690
 		{
 			yyLOCAL = ShareModeLock
 		}
 		yyVAL.union = yyLOCAL
-	case 1561:
+	case 1562:
 		yyDollar = yyS[yypt-9 : yypt+1]
 		var yyLOCAL *SelectInto
-//line sql.y:7692
+//line sql.y:7696
 		{
 			yyLOCAL = &SelectInto{Type: IntoOutfileS3, FileName: encodeSQLString(yyDollar[4].str), Charset: yyDollar[5].columnCharset, FormatOption: yyDollar[6].str, ExportOption: yyDollar[7].str, Manifest: yyDollar[8].str, Overwrite: yyDollar[9].str}
 		}
 		yyVAL.union = yyLOCAL
-	case 1562:
+	case 1563:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL *SelectInto
-//line sql.y:7696
+//line sql.y:7700
 		{
 			yyLOCAL = &SelectInto{Type: IntoDumpfile, FileName: encodeSQLString(yyDollar[3].str), Charset: ColumnCharset{}, FormatOption: "", ExportOption: "", Manifest: "", Overwrite: ""}
 		}
 		yyVAL.union = yyLOCAL
-	case 1563:
+	case 1564:
 		yyDollar = yyS[yypt-5 : yypt+1]
 		var yyLOCAL *SelectInto
-//line sql.y:7700
+//line sql.y:7704
 		{
 			yyLOCAL = &SelectInto{Type: IntoOutfile, FileName: encodeSQLString(yyDollar[3].str), Charset: yyDollar[4].columnCharset, FormatOption: "", ExportOption: yyDollar[5].str, Manifest: "", Overwrite: ""}
 		}
 		yyVAL.union = yyLOCAL
-	case 1564:
+	case 1565:
 		yyDollar = yyS[yypt-0 : yypt+1]
-//line sql.y:7705
+//line sql.y:7709
 		{
 			yyVAL.str = ""
 		}
-	case 1565:
+	case 1566:
 		yyDollar = yyS[yypt-3 : yypt+1]
-//line sql.y:7709
+//line sql.y:7713
 		{
 			yyVAL.str = " format csv" + yyDollar[3].str
 		}
-	case 1566:
+	case 1567:
 		yyDollar = yyS[yypt-3 : yypt+1]
-//line sql.y:7713
+//line sql.y:7717
 		{
 			yyVAL.str = " format text" + yyDollar[3].str
 		}
-	case 1567:
+	case 1568:
 		yyDollar = yyS[yypt-0 : yypt+1]
-//line sql.y:7718
+//line sql.y:7722
 		{
 			yyVAL.str = ""
 		}
-	case 1568:
+	case 1569:
 		yyDollar = yyS[yypt-1 : yypt+1]
-//line sql.y:7722
+//line sql.y:7726
 		{
 			yyVAL.str = " header"
 		}
-	case 1569:
+	case 1570:
 		yyDollar = yyS[yypt-0 : yypt+1]
-//line sql.y:7727
+//line sql.y:7731
 		{
 			yyVAL.str = ""
 		}
-	case 1570:
+	case 1571:
 		yyDollar = yyS[yypt-2 : yypt+1]
-//line sql.y:7731
+//line sql.y:7735
 		{
 			yyVAL.str = " manifest on"
 		}
-	case 1571:
+	case 1572:
 		yyDollar = yyS[yypt-2 : yypt+1]
-//line sql.y:7735
+//line sql.y:7739
 		{
 			yyVAL.str = " manifest off"
 		}
-	case 1572:
+	case 1573:
 		yyDollar = yyS[yypt-0 : yypt+1]
-//line sql.y:7740
+//line sql.y:7744
 		{
 			yyVAL.str = ""
 		}
-	case 1573:
+	case 1574:
 		yyDollar = yyS[yypt-2 : yypt+1]
-//line sql.y:7744
+//line sql.y:7748
 		{
 			yyVAL.str = " overwrite on"
 		}
-	case 1574:
+	case 1575:
 		yyDollar = yyS[yypt-2 : yypt+1]
-//line sql.y:7748
+//line sql.y:7752
 		{
 			yyVAL.str = " overwrite off"
 		}
-	case 1575:
+	case 1576:
 		yyDollar = yyS[yypt-2 : yypt+1]
-//line sql.y:7754
+//line sql.y:7758
 		{
 			yyVAL.str = yyDollar[1].str + yyDollar[2].str
 		}
-	case 1576:
+	case 1577:
 		yyDollar = yyS[yypt-0 : yypt+1]
-//line sql.y:7759
+//line sql.y:7763
 		{
 			yyVAL.str = ""
 		}
-	case 1577:
+	case 1578:
 		yyDollar = yyS[yypt-2 : yypt+1]
-//line sql.y:7763
+//line sql.y:7767
 		{
 			yyVAL.str = " lines" + yyDollar[2].str
 		}
-	case 1578:
+	case 1579:
 		yyDollar = yyS[yypt-1 : yypt+1]
-//line sql.y:7769
+//line sql.y:7773
 		{
 			yyVAL.str = yyDollar[1].str
 		}
-	case 1579:
+	case 1580:
 		yyDollar = yyS[yypt-2 : yypt+1]
-//line sql.y:7773
+//line sql.y:7777
 		{
 			yyVAL.str = yyDollar[1].str + yyDollar[2].str
 		}
-	case 1580:
+	case 1581:
 		yyDollar = yyS[yypt-3 : yypt+1]
-//line sql.y:7779
+//line sql.y:7783
 		{
 			yyVAL.str = " starting by " + encodeSQLString(yyDollar[3].str)
 		}
-	case 1581:
+	case 1582:
 		yyDollar = yyS[yypt-3 : yypt+1]
-//line sql.y:7783
+//line sql.y:7787
 		{
 			yyVAL.str = " terminated by " + encodeSQLString(yyDollar[3].str)
 		}
-	case 1582:
+	case 1583:
 		yyDollar = yyS[yypt-0 : yypt+1]
-//line sql.y:7788
+//line sql.y:7792
 		{
 			yyVAL.str = ""
 		}
-	case 1583:
+	case 1584:
 		yyDollar = yyS[yypt-2 : yypt+1]
-//line sql.y:7792
+//line sql.y:7796
 		{
 			yyVAL.str = " " + yyDollar[1].str + yyDollar[2].str
 		}
-	case 1584:
+	case 1585:
 		yyDollar = yyS[yypt-1 : yypt+1]
-//line sql.y:7798
+//line sql.y:7802
 		{
 			yyVAL.str = yyDollar[1].str
 		}
-	case 1585:
+	case 1586:
 		yyDollar = yyS[yypt-2 : yypt+1]
-//line sql.y:7802
+//line sql.y:7806
 		{
 			yyVAL.str = yyDollar[1].str + yyDollar[2].str
 		}
-	case 1586:
+	case 1587:
 		yyDollar = yyS[yypt-3 : yypt+1]
-//line sql.y:7808
+//line sql.y:7812
 		{
 			yyVAL.str = " terminated by " + encodeSQLString(yyDollar[3].str)
 		}
-	case 1587:
+	case 1588:
 		yyDollar = yyS[yypt-4 : yypt+1]
-//line sql.y:7812
+//line sql.y:7816
 		{
 			yyVAL.str = yyDollar[1].str + " enclosed by " + encodeSQLString(yyDollar[4].str)
 		}
-	case 1588:
+	case 1589:
 		yyDollar = yyS[yypt-3 : yypt+1]
-//line sql.y:7816
+//line sql.y:7820
 		{
 			yyVAL.str = " escaped by " + encodeSQLString(yyDollar[3].str)
 		}
-	case 1589:
+	case 1590:
 		yyDollar = yyS[yypt-0 : yypt+1]
-//line sql.y:7821
+//line sql.y:7825
 		{
 			yyVAL.str = ""
 		}
-	case 1590:
+	case 1591:
 		yyDollar = yyS[yypt-1 : yypt+1]
-//line sql.y:7825
+//line sql.y:7829
 		{
 			yyVAL.str = " optionally"
 		}
-	case 1591:
+	case 1592:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL *Insert
-//line sql.y:7838
+//line sql.y:7842
 		{
 			yyLOCAL = &Insert{Rows: yyDollar[2].valuesUnion(), RowAlias: yyDollar[3].rowAliasUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1592:
+	case 1593:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL *Insert
-//line sql.y:7842
+//line sql.y:7846
 		{
 			yyLOCAL = &Insert{Rows: yyDollar[1].tableStmtUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1593:
+	case 1594:
 		yyDollar = yyS[yypt-6 : yypt+1]
 		var yyLOCAL *Insert
-//line sql.y:7846
+//line sql.y:7850
 		{
 			yyLOCAL = &Insert{Columns: yyDollar[2].columnsUnion(), Rows: yyDollar[5].valuesUnion(), RowAlias: yyDollar[6].rowAliasUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1594:
+	case 1595:
 		yyDollar = yyS[yypt-5 : yypt+1]
 		var yyLOCAL *Insert
-//line sql.y:7850
+//line sql.y:7854
 		{
 			yyLOCAL = &Insert{Columns: []IdentifierCI{}, Rows: yyDollar[4].valuesUnion(), RowAlias: yyDollar[5].rowAliasUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1595:
+	case 1596:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL *Insert
-//line sql.y:7854
+//line sql.y:7858
 		{
 			yyLOCAL = &Insert{Columns: yyDollar[2].columnsUnion(), Rows: yyDollar[4].tableStmtUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1596:
+	case 1597:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL Columns
-//line sql.y:7860
+//line sql.y:7864
 		{
 			yyLOCAL = Columns{yyDollar[1].identifierCI}
 		}
 		yyVAL.union = yyLOCAL
-	case 1597:
+	case 1598:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL Columns
-//line sql.y:7864
+//line sql.y:7868
 		{
 			yyLOCAL = Columns{yyDollar[3].identifierCI}
 		}
 		yyVAL.union = yyLOCAL
-	case 1598:
+	case 1599:
 		yyDollar = yyS[yypt-3 : yypt+1]
-//line sql.y:7868
+//line sql.y:7872
 		{
 			yySLICE := (*Columns)(yyIaddr(yyVAL.union))
 			*yySLICE = append(*yySLICE, yyDollar[3].identifierCI)
 		}
-	case 1599:
+	case 1600:
 		yyDollar = yyS[yypt-5 : yypt+1]
-//line sql.y:7872
+//line sql.y:7876
 		{
 			yySLICE := (*Columns)(yyIaddr(yyVAL.union))
 			*yySLICE = append(*yySLICE, yyDollar[5].identifierCI)
 		}
-	case 1600:
+	case 1601:
 		yyDollar = yyS[yypt-0 : yypt+1]
 		var yyLOCAL *RowAlias
-//line sql.y:7877
+//line sql.y:7881
 		{
 			yyLOCAL = nil
 		}
 		yyVAL.union = yyLOCAL
-	case 1601:
+	case 1602:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL *RowAlias
-//line sql.y:7881
+//line sql.y:7885
 		{
 			yyLOCAL = &RowAlias{TableName: yyDollar[2].identifierCS}
 		}
 		yyVAL.union = yyLOCAL
-	case 1602:
+	case 1603:
 		yyDollar = yyS[yypt-5 : yypt+1]
 		var yyLOCAL *RowAlias
-//line sql.y:7885
+//line sql.y:7889
 		{
 			yyLOCAL = &RowAlias{TableName: yyDollar[2].identifierCS, Columns: yyDollar[4].columnsUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1603:
+	case 1604:
 		yyDollar = yyS[yypt-0 : yypt+1]
 		var yyLOCAL UpdateExprs
-//line sql.y:7890
+//line sql.y:7894
 		{
 			yyLOCAL = nil
 		}
 		yyVAL.union = yyLOCAL
-	case 1604:
+	case 1605:
 		yyDollar = yyS[yypt-5 : yypt+1]
 		var yyLOCAL UpdateExprs
-//line sql.y:7894
+//line sql.y:7898
 		{
 			yyLOCAL = yyDollar[5].updateExprsUnion()
 		}
 		yyVAL.union = yyLOCAL
-	case 1605:
+	case 1606:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL Values
-//line sql.y:7900
+//line sql.y:7904
 		{
 			yyLOCAL = Values{yyDollar[1].valTupleUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1606:
+	case 1607:
 		yyDollar = yyS[yypt-3 : yypt+1]
-//line sql.y:7904
+//line sql.y:7908
 		{
 			yySLICE := (*Values)(yyIaddr(yyVAL.union))
 			*yySLICE = append(*yySLICE, yyDollar[3].valTupleUnion())
 		}
-	case 1607:
+	case 1608:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL Values
-//line sql.y:7910
+//line sql.y:7914
 		{
 			yyLOCAL = Values{yyDollar[1].valTupleUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1608:
+	case 1609:
 		yyDollar = yyS[yypt-3 : yypt+1]
-//line sql.y:7914
+//line sql.y:7918
 		{
 			yySLICE := (*Values)(yyIaddr(yyVAL.union))
 			*yySLICE = append(*yySLICE, yyDollar[3].valTupleUnion())
 		}
-	case 1609:
+	case 1610:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL ValTuple
-//line sql.y:7920
+//line sql.y:7924
 		{
 			yyLOCAL = yyDollar[1].valTupleUnion()
 		}
 		yyVAL.union = yyLOCAL
-	case 1610:
+	case 1611:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL ValTuple
-//line sql.y:7924
+//line sql.y:7928
 		{
 			yyLOCAL = ValTuple{}
 		}
 		yyVAL.union = yyLOCAL
-	case 1611:
+	case 1612:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL ValTuple
-//line sql.y:7930
+//line sql.y:7934
 		{
 			yyLOCAL = yyDollar[1].valTupleUnion()
 		}
 		yyVAL.union = yyLOCAL
-	case 1612:
+	case 1613:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL ValTuple
-//line sql.y:7934
+//line sql.y:7938
 		{
 			yyLOCAL = ValTuple{}
 		}
 		yyVAL.union = yyLOCAL
-	case 1613:
+	case 1614:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL ValTuple
-//line sql.y:7940
+//line sql.y:7944
 		{
 			yyLOCAL = ValTuple(yyDollar[2].exprsUnion())
 		}
 		yyVAL.union = yyLOCAL
-	case 1614:
+	case 1615:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL ValTuple
-//line sql.y:7946
+//line sql.y:7950
 		{
 			yyLOCAL = ValTuple(yyDollar[3].exprsUnion())
 		}
 		yyVAL.union = yyLOCAL
-	case 1617:
+	case 1618:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:7956
+//line sql.y:7960
 		{
 			if len(yyDollar[1].valTupleUnion()) == 1 {
 				yyLOCAL = yyDollar[1].valTupleUnion()[0]
@@ -22386,212 +22357,206 @@ yydefault:
 			}
 		}
 		yyVAL.union = yyLOCAL
-	case 1618:
+	case 1619:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL UpdateExprs
-//line sql.y:7966
+//line sql.y:7970
 		{
 			yyLOCAL = UpdateExprs{yyDollar[1].updateExprUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1619:
+	case 1620:
 		yyDollar = yyS[yypt-3 : yypt+1]
-//line sql.y:7970
+//line sql.y:7974
 		{
 			yySLICE := (*UpdateExprs)(yyIaddr(yyVAL.union))
 			*yySLICE = append(*yySLICE, yyDollar[3].updateExprUnion())
 		}
-	case 1620:
+	case 1621:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL *UpdateExpr
-//line sql.y:7976
+//line sql.y:7980
 		{
 			yyLOCAL = &UpdateExpr{Name: yyDollar[1].colNameUnion(), Expr: yyDollar[3].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1622:
+	case 1623:
 		yyDollar = yyS[yypt-2 : yypt+1]
-//line sql.y:7983
+//line sql.y:7987
 		{
 			yyVAL.str = "charset"
 		}
-	case 1625:
+	case 1626:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:7993
+//line sql.y:7997
 		{
 			yyLOCAL = NewStrLiteral(yyDollar[1].identifierCI.String())
 		}
 		yyVAL.union = yyLOCAL
-	case 1626:
+	case 1627:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:7997
+//line sql.y:8001
 		{
 			yyLOCAL = NewStrLiteral(yyDollar[1].str)
 		}
 		yyVAL.union = yyLOCAL
-	case 1627:
+	case 1628:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:8001
+//line sql.y:8005
 		{
 			yyLOCAL = &Default{}
 		}
 		yyVAL.union = yyLOCAL
-	case 1630:
+	case 1631:
 		yyDollar = yyS[yypt-0 : yypt+1]
 		var yyLOCAL bool
-//line sql.y:8010
+//line sql.y:8014
 		{
 			yyLOCAL = false
 		}
 		yyVAL.union = yyLOCAL
-	case 1631:
+	case 1632:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL bool
-//line sql.y:8012
+//line sql.y:8016
 		{
 			yyLOCAL = true
 		}
 		yyVAL.union = yyLOCAL
-	case 1632:
+	case 1633:
 		yyDollar = yyS[yypt-0 : yypt+1]
 		var yyLOCAL bool
-//line sql.y:8015
+//line sql.y:8019
 		{
 			yyLOCAL = false
 		}
 		yyVAL.union = yyLOCAL
-	case 1633:
+	case 1634:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL bool
-//line sql.y:8017
+//line sql.y:8021
 		{
 			yyLOCAL = true
 		}
 		yyVAL.union = yyLOCAL
-	case 1634:
+	case 1635:
 		yyDollar = yyS[yypt-0 : yypt+1]
 		var yyLOCAL bool
-//line sql.y:8020
+//line sql.y:8024
 		{
 			yyLOCAL = false
 		}
 		yyVAL.union = yyLOCAL
-	case 1635:
+	case 1636:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL bool
-//line sql.y:8022
+//line sql.y:8026
 		{
 			yyLOCAL = true
 		}
 		yyVAL.union = yyLOCAL
-	case 1636:
+	case 1637:
 		yyDollar = yyS[yypt-0 : yypt+1]
 		var yyLOCAL Ignore
-//line sql.y:8025
+//line sql.y:8029
 		{
 			yyLOCAL = false
 		}
 		yyVAL.union = yyLOCAL
-	case 1637:
+	case 1638:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL Ignore
-//line sql.y:8027
+//line sql.y:8031
 		{
 			yyLOCAL = true
 		}
 		yyVAL.union = yyLOCAL
-	case 1638:
+	case 1639:
 		yyDollar = yyS[yypt-0 : yypt+1]
-//line sql.y:8030
+//line sql.y:8034
 		{
 			yyVAL.empty = struct{}{}
 		}
-	case 1639:
+	case 1640:
 		yyDollar = yyS[yypt-1 : yypt+1]
-//line sql.y:8032
+//line sql.y:8036
 		{
 			yyVAL.empty = struct{}{}
 		}
-	case 1640:
+	case 1641:
 		yyDollar = yyS[yypt-1 : yypt+1]
-//line sql.y:8034
+//line sql.y:8038
 		{
 			yyVAL.empty = struct{}{}
 		}
-	case 1641:
+	case 1642:
 		yyDollar = yyS[yypt-5 : yypt+1]
 		var yyLOCAL Statement
-//line sql.y:8038
+//line sql.y:8042
 		{
 			yyLOCAL = &CallProc{Name: yyDollar[2].tableName, Params: yyDollar[4].exprsUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1642:
+	case 1643:
 		yyDollar = yyS[yypt-0 : yypt+1]
 		var yyLOCAL Exprs
-//line sql.y:8043
+//line sql.y:8047
 		{
 			yyLOCAL = nil
 		}
 		yyVAL.union = yyLOCAL
-	case 1643:
+	case 1644:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL Exprs
-//line sql.y:8047
+//line sql.y:8051
 		{
 			yyLOCAL = yyDollar[1].exprsUnion()
 		}
 		yyVAL.union = yyLOCAL
-	case 1644:
+	case 1645:
 		yyDollar = yyS[yypt-0 : yypt+1]
 		var yyLOCAL []*IndexOption
-//line sql.y:8052
+//line sql.y:8056
 		{
 			yyLOCAL = nil
 		}
 		yyVAL.union = yyLOCAL
-	case 1645:
+	case 1646:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL []*IndexOption
-//line sql.y:8054
+//line sql.y:8058
 		{
 			yyLOCAL = []*IndexOption{yyDollar[1].indexOptionUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1646:
+	case 1647:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL *IndexOption
-//line sql.y:8058
+//line sql.y:8062
 		{
 			yyLOCAL = &IndexOption{Name: string(yyDollar[1].str), String: string(yyDollar[2].identifierCI.String())}
 		}
 		yyVAL.union = yyLOCAL
-	case 1647:
-		yyDollar = yyS[yypt-1 : yypt+1]
-//line sql.y:8064
-		{
-			yyVAL.identifierCI = yyDollar[1].identifierCI
-		}
 	case 1648:
 		yyDollar = yyS[yypt-1 : yypt+1]
 //line sql.y:8068
 		{
-			yyVAL.identifierCI = NewIdentifierCI(string(yyDollar[1].str))
+			yyVAL.identifierCI = yyDollar[1].identifierCI
 		}
-	case 1650:
+	case 1649:
 		yyDollar = yyS[yypt-1 : yypt+1]
-//line sql.y:8075
+//line sql.y:8072
 		{
 			yyVAL.identifierCI = NewIdentifierCI(string(yyDollar[1].str))
 		}
 	case 1651:
 		yyDollar = yyS[yypt-1 : yypt+1]
-//line sql.y:8081
+//line sql.y:8079
 		{
-			yyVAL.identifierCS = NewIdentifierCS(string(yyDollar[1].str))
+			yyVAL.identifierCI = NewIdentifierCI(string(yyDollar[1].str))
 		}
 	case 1652:
 		yyDollar = yyS[yypt-1 : yypt+1]
@@ -22600,79 +22565,79 @@ yydefault:
 			yyVAL.identifierCS = NewIdentifierCS(string(yyDollar[1].str))
 		}
 	case 1653:
+		yyDollar = yyS[yypt-1 : yypt+1]
+//line sql.y:8089
+		{
+			yyVAL.identifierCS = NewIdentifierCS(string(yyDollar[1].str))
+		}
+	case 1654:
 		yyDollar = yyS[yypt-0 : yypt+1]
-//line sql.y:8091
+//line sql.y:8095
 		{
 			yyVAL.identifierCS = NewIdentifierCS("")
 		}
-	case 1654:
+	case 1655:
 		yyDollar = yyS[yypt-1 : yypt+1]
-//line sql.y:8095
+//line sql.y:8099
 		{
 			yyVAL.identifierCS = yyDollar[1].identifierCS
 		}
-	case 1656:
+	case 1657:
 		yyDollar = yyS[yypt-1 : yypt+1]
-//line sql.y:8102
+//line sql.y:8106
 		{
 			yyVAL.identifierCS = NewIdentifierCS(string(yyDollar[1].str))
 		}
-	case 1657:
+	case 1658:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL Statement
-//line sql.y:8108
+//line sql.y:8112
 		{
 			yyLOCAL = &Kill{Type: yyDollar[2].killTypeUnion(), ProcesslistID: convertStringToUInt64(yyDollar[3].str)}
 		}
 		yyVAL.union = yyLOCAL
-	case 1658:
+	case 1659:
 		yyDollar = yyS[yypt-0 : yypt+1]
 		var yyLOCAL KillType
-//line sql.y:8114
+//line sql.y:8118
 		{
 			yyLOCAL = ConnectionType
 		}
 		yyVAL.union = yyLOCAL
-	case 1659:
+	case 1660:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL KillType
-//line sql.y:8118
+//line sql.y:8122
 		{
 			yyLOCAL = ConnectionType
 		}
 		yyVAL.union = yyLOCAL
-	case 1660:
+	case 1661:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL KillType
-//line sql.y:8122
+//line sql.y:8126
 		{
 			yyLOCAL = QueryType
 		}
 		yyVAL.union = yyLOCAL
-	case 2296:
-		yyDollar = yyS[yypt-1 : yypt+1]
-//line sql.y:8786
-		{
-		}
 	case 2297:
 		yyDollar = yyS[yypt-1 : yypt+1]
-//line sql.y:8791
+//line sql.y:8790
 		{
 		}
 	case 2298:
-		yyDollar = yyS[yypt-0 : yypt+1]
+		yyDollar = yyS[yypt-1 : yypt+1]
 //line sql.y:8795
 		{
-			skipToEnd(yylex)
 		}
 	case 2299:
 		yyDollar = yyS[yypt-0 : yypt+1]
-//line sql.y:8800
+//line sql.y:8799
 		{
 			skipToEnd(yylex)
 		}
 	case 2300:
-		yyDollar = yyS[yypt-1 : yypt+1]
+		yyDollar = yyS[yypt-0 : yypt+1]
 //line sql.y:8804
 		{
 			skipToEnd(yylex)
@@ -22683,6 +22648,12 @@ yydefault:
 		{
 			skipToEnd(yylex)
 		}
+	case 2302:
+		yyDollar = yyS[yypt-1 : yypt+1]
+//line sql.y:8812
+		{
+			skipToEnd(yylex)
+		}
 	}
 	goto yystack /* stack new state and value */
 }
diff --git a/go/vt/sqlparser/sql.y b/go/vt/sqlparser/sql.y
index b6835ad32a5..772be1e75ec 100644
--- a/go/vt/sqlparser/sql.y
+++ b/go/vt/sqlparser/sql.y
@@ -1592,6 +1592,10 @@ column_format:
 {
     $$ = DefaultFormat
 }
+| COMPRESSED
+{
+    $$ = CompressedFormat
+}
 
 column_storage:
   VIRTUAL

From 78c7470f540e789ec1d43baeae3be8377b646941 Mon Sep 17 00:00:00 2001
From: Dirkjan Bussink <d.bussink@gmail.com>
Date: Sat, 1 Feb 2025 23:09:50 +0100
Subject: [PATCH 17/68] Parse SRID attribute for virtual columns (#17680)

---
 go/vt/sqlparser/parse_test.go |     7 +
 go/vt/sqlparser/sql.go        | 17929 ++++++++++++++++----------------
 go/vt/sqlparser/sql.y         |     5 +
 3 files changed, 8981 insertions(+), 8960 deletions(-)

diff --git a/go/vt/sqlparser/parse_test.go b/go/vt/sqlparser/parse_test.go
index 6e9a26fe152..6c4a6e634ec 100644
--- a/go/vt/sqlparser/parse_test.go
+++ b/go/vt/sqlparser/parse_test.go
@@ -1805,6 +1805,9 @@ var (
 	}, {
 		input:  "alter table a add spatial key indexes (column1)",
 		output: "alter table a add spatial key `indexes` (column1)",
+	}, {
+		input:  "alter table locations add lat_long point as (point(geocode->>'$.geometry.location.lat', geocode->>'$.geometry.location.lng')) SRID 4326 after geocodes",
+		output: "alter table locations add column lat_long point as (point(json_unquote(json_extract(geocode, '$.geometry.location.lat')), json_unquote(json_extract(geocode, '$.geometry.location.lng')))) virtual srid 4326 after geocodes",
 	}, {
 		input:      "create table a",
 		partialDDL: true,
@@ -5975,6 +5978,10 @@ partition by range (YEAR(purchased)) subpartition by hash (TO_DAYS(purchased))
 			input:  "create table t (id int, vec VECTOR(4))",
 			output: "create table t (\n\tid int,\n\tvec VECTOR(4)\n)",
 		},
+		{
+			input:  "CREATE TABLE `locations` (`geocode` json DEFAULT NULL, `lat_long` point GENERATED ALWAYS AS (point(json_unquote(json_extract(`geocode`,_utf8mb4'$.geometry.location.lat')),json_unquote(json_extract(`geocode`,_utf8mb4'$.geometry.location.lng')))) VIRTUAL /*!80003 SRID 4326 */) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci",
+			output: "create table locations (\n\tgeocode json default null,\n\tlat_long point as (point(json_unquote(json_extract(geocode, _utf8mb4 '$.geometry.location.lat')), json_unquote(json_extract(geocode, _utf8mb4 '$.geometry.location.lng')))) virtual srid 4326\n) ENGINE InnoDB,\n  CHARSET utf8mb4,\n  COLLATE utf8mb4_0900_ai_ci",
+		},
 	}
 	parser := NewTestParser()
 	for _, test := range createTableQueries {
diff --git a/go/vt/sqlparser/sql.go b/go/vt/sqlparser/sql.go
index 5d6db513503..ff9bc5cb71f 100644
--- a/go/vt/sqlparser/sql.go
+++ b/go/vt/sqlparser/sql.go
@@ -1553,239 +1553,239 @@ var yyExca = [...]int{
 	149, 168,
 	191, 168,
 	364, 168,
-	-2, 527,
+	-2, 528,
 	-1, 61,
-	38, 788,
-	254, 788,
-	265, 788,
-	300, 802,
-	301, 802,
-	-2, 790,
+	38, 789,
+	254, 789,
+	265, 789,
+	300, 803,
+	301, 803,
+	-2, 791,
 	-1, 66,
-	256, 826,
-	-2, 824,
+	256, 827,
+	-2, 825,
 	-1, 124,
-	253, 1631,
+	253, 1632,
 	-2, 134,
 	-1, 126,
 	1, 161,
 	756, 161,
 	-2, 168,
 	-1, 137,
-	150, 412,
-	259, 412,
-	-2, 516,
+	150, 413,
+	259, 413,
+	-2, 517,
 	-1, 156,
 	149, 168,
 	191, 168,
 	364, 168,
-	-2, 536,
+	-2, 537,
 	-1, 755,
 	177, 41,
 	-2, 43,
 	-1, 964,
-	95, 1648,
-	-2, 1486,
-	-1, 965,
 	95, 1649,
-	236, 1653,
 	-2, 1487,
+	-1, 965,
+	95, 1650,
+	236, 1654,
+	-2, 1488,
 	-1, 966,
-	236, 1652,
+	236, 1653,
 	-2, 42,
 	-1, 1052,
-	65, 900,
-	-2, 913,
+	65, 901,
+	-2, 914,
 	-1, 1141,
-	264, 1113,
-	269, 1113,
-	-2, 423,
+	264, 1114,
+	269, 1114,
+	-2, 424,
 	-1, 1226,
-	1, 584,
-	756, 584,
+	1, 585,
+	756, 585,
 	-2, 168,
 	-1, 1537,
-	236, 1653,
-	-2, 1487,
+	236, 1654,
+	-2, 1488,
 	-1, 1750,
-	65, 901,
-	-2, 917,
-	-1, 1751,
 	65, 902,
 	-2, 918,
+	-1, 1751,
+	65, 903,
+	-2, 919,
 	-1, 1816,
 	149, 168,
 	191, 168,
 	364, 168,
-	-2, 462,
+	-2, 463,
 	-1, 1899,
-	150, 412,
-	259, 412,
-	-2, 516,
+	150, 413,
+	259, 413,
+	-2, 517,
 	-1, 1908,
-	264, 1114,
-	269, 1114,
-	-2, 424,
+	264, 1115,
+	269, 1115,
+	-2, 425,
 	-1, 2357,
-	236, 1657,
-	-2, 1651,
+	236, 1658,
+	-2, 1652,
 	-1, 2358,
-	236, 1653,
-	-2, 1649,
+	236, 1654,
+	-2, 1650,
 	-1, 2463,
 	149, 168,
 	191, 168,
 	364, 168,
-	-2, 463,
+	-2, 464,
 	-1, 2470,
 	28, 189,
 	-2, 191,
 	-1, 2936,
 	86, 99,
 	96, 99,
-	-2, 980,
+	-2, 981,
 	-1, 3004,
-	731, 706,
-	-2, 680,
+	731, 707,
+	-2, 681,
 	-1, 3229,
-	55, 1590,
-	-2, 1584,
+	55, 1591,
+	-2, 1585,
 	-1, 4067,
-	731, 706,
-	-2, 694,
+	731, 707,
+	-2, 695,
 	-1, 4159,
-	98, 638,
-	104, 638,
-	114, 638,
-	193, 638,
-	194, 638,
-	195, 638,
-	196, 638,
-	197, 638,
-	198, 638,
-	199, 638,
-	200, 638,
-	201, 638,
-	202, 638,
-	203, 638,
-	204, 638,
-	205, 638,
-	206, 638,
-	207, 638,
-	208, 638,
-	209, 638,
-	210, 638,
-	211, 638,
-	212, 638,
-	213, 638,
-	214, 638,
-	215, 638,
-	216, 638,
-	217, 638,
-	218, 638,
-	219, 638,
-	220, 638,
-	221, 638,
-	222, 638,
-	223, 638,
-	224, 638,
-	225, 638,
-	226, 638,
-	227, 638,
-	228, 638,
-	229, 638,
-	230, 638,
-	231, 638,
-	232, 638,
-	233, 638,
-	234, 638,
-	-2, 2030,
+	98, 639,
+	104, 639,
+	114, 639,
+	193, 639,
+	194, 639,
+	195, 639,
+	196, 639,
+	197, 639,
+	198, 639,
+	199, 639,
+	200, 639,
+	201, 639,
+	202, 639,
+	203, 639,
+	204, 639,
+	205, 639,
+	206, 639,
+	207, 639,
+	208, 639,
+	209, 639,
+	210, 639,
+	211, 639,
+	212, 639,
+	213, 639,
+	214, 639,
+	215, 639,
+	216, 639,
+	217, 639,
+	218, 639,
+	219, 639,
+	220, 639,
+	221, 639,
+	222, 639,
+	223, 639,
+	224, 639,
+	225, 639,
+	226, 639,
+	227, 639,
+	228, 639,
+	229, 639,
+	230, 639,
+	231, 639,
+	232, 639,
+	233, 639,
+	234, 639,
+	-2, 2031,
 }
 
 const yyPrivate = 57344
 
-const yyLast = 56209
+const yyLast = 56210
 
 var yyAct = [...]int{
-	980, 975, 3717, 87, 2162, 3718, 4234, 3719, 4247, 4048,
-	968, 4138, 4201, 967, 3667, 4202, 2150, 4157, 4126, 1294,
-	2460, 3281, 3288, 3516, 2386, 3953, 4030, 1292, 3329, 4028,
-	3242, 3338, 3343, 3340, 1819, 3339, 3337, 3342, 3341, 2088,
-	3654, 2029, 5, 3358, 3180, 3095, 3296, 2535, 2388, 3357,
-	759, 3246, 3760, 3562, 3069, 3556, 3094, 2415, 3230, 787,
-	928, 3243, 2498, 3360, 754, 2434, 2896, 1770, 4099, 2431,
-	3546, 1876, 2970, 3387, 929, 3051, 3001, 933, 2972, 2522,
-	42, 2503, 2971, 2566, 2448, 165, 1050, 1103, 87, 3380,
-	1071, 1047, 3584, 43, 2902, 1173, 2921, 2436, 2886, 1078,
-	2870, 2184, 2310, 3240, 1924, 3042, 2435, 2096, 2342, 1050,
-	2544, 2146, 1906, 41, 151, 2521, 2423, 2583, 2505, 2963,
-	1131, 2938, 1136, 1808, 1113, 1788, 982, 1774, 1731, 2438,
-	1550, 2190, 2121, 106, 107, 2110, 1475, 753, 1458, 102,
-	2025, 2309, 1110, 1107, 1913, 1142, 1885, 3245, 1111, 769,
-	2005, 1139, 2494, 2909, 1137, 1138, 1807, 1088, 1149, 1090,
-	1793, 1059, 1533, 1049, 1509, 1053, 2495, 1753, 3755, 2217,
-	2868, 1056, 2416, 764, 85, 2087, 2037, 1282, 169, 3573,
-	129, 1055, 109, 3517, 1898, 127, 1073, 128, 134, 3747,
-	1222, 2198, 135, 1070, 1083, 1045, 101, 746, 100, 1057,
-	757, 1054, 1554, 84, 4235, 3655, 93, 1290, 3326, 4083,
-	1268, 2537, 2538, 2539, 1082, 930, 108, 2537, 3024, 3023,
-	1559, 2992, 2581, 1476, 3647, 1044, 756, 4184, 1776, 3059,
-	3609, 130, 3060, 4078, 689, 4084, 4079, 2103, 136, 3722,
-	2102, 1063, 1178, 1990, 1104, 2383, 2384, 2101, 2100, 1175,
-	2099, 2098, 2068, 1238, 686, 2866, 687, 2635, 3226, 4178,
-	2570, 3184, 1192, 1193, 1194, 4205, 1197, 1198, 1199, 1200,
-	747, 4257, 1203, 1204, 1205, 1206, 1207, 1208, 1209, 1210,
-	1211, 1212, 1213, 1214, 1215, 1216, 1217, 1218, 1219, 1048,
-	1152, 1098, 1097, 2898, 1061, 2, 1779, 1153, 3348, 1064,
-	3348, 1046, 1764, 1128, 2569, 130, 3722, 1127, 1115, 1179,
-	1182, 1183, 1126, 3345, 1125, 1072, 4200, 4225, 1777, 1186,
-	3520, 1492, 3519, 2412, 1120, 2407, 1780, 4057, 2994, 2411,
-	4240, 1486, 1239, 1772, 731, 3721, 3017, 725, 4079, 113,
-	114, 115, 1195, 118, 4188, 95, 124, 1472, 1778, 193,
-	1469, 981, 681, 4186, 1043, 4239, 4031, 731, 3346, 2831,
-	3346, 984, 985, 986, 744, 745, 3014, 2108, 3406, 4187,
-	4153, 3949, 3948, 130, 1038, 1039, 1040, 1041, 4185, 1129,
-	1177, 1052, 3660, 725, 1176, 3661, 4215, 3352, 3959, 3352,
-	984, 985, 986, 4182, 3679, 1460, 3668, 4127, 4135, 1096,
-	1100, 932, 3721, 2563, 1096, 1100, 932, 2642, 3958, 2155,
-	86, 1085, 1086, 4162, 3432, 4139, 1887, 1809, 2947, 1810,
-	3031, 2946, 3032, 2867, 2948, 1275, 720, 1277, 3278, 3279,
-	3277, 86, 3678, 2912, 2455, 2456, 3058, 1124, 4167, 1231,
-	1232, 2080, 2081, 2568, 1482, 2639, 86, 1474, 725, 2454,
-	3041, 1258, 1036, 725, 1035, 1471, 1263, 1264, 4165, 1246,
-	1119, 2913, 2995, 1121, 1247, 1274, 1276, 4049, 4171, 4172,
-	1489, 1234, 1490, 1491, 705, 1246, 1476, 2640, 3298, 3299,
-	1247, 2959, 97, 1259, 1252, 4166, 1488, 703, 1245, 3414,
-	1244, 4143, 3384, 95, 3382, 1122, 3412, 3774, 2033, 1453,
-	2514, 2633, 3349, 1287, 3349, 2473, 2472, 2905, 2906, 725,
-	739, 725, 3116, 2079, 95, 2083, 743, 3043, 1221, 4206,
-	4143, 737, 2385, 1805, 2508, 725, 3388, 700, 4001, 95,
-	4002, 3002, 1735, 2545, 2011, 3375, 715, 3027, 2584, 2006,
-	4207, 2590, 4237, 3376, 86, 1261, 1262, 88, 1980, 3046,
-	1279, 710, 726, 1196, 1452, 1284, 2586, 1227, 1459, 1267,
-	1470, 3649, 1124, 713, 1116, 1265, 723, 3648, 2419, 3933,
-	2226, 1118, 1117, 2612, 724, 1266, 1272, 2588, 1202, 1510,
-	1273, 1162, 1260, 1253, 1486, 1891, 2636, 3297, 2637, 3385,
-	1278, 3383, 1981, 1201, 1982, 97, 2591, 2548, 726, 3300,
-	2182, 3403, 3726, 1511, 1512, 1513, 1514, 1515, 1516, 1517,
-	1519, 1518, 1520, 1521, 2609, 1271, 2610, 1286, 2611, 2587,
-	1122, 3645, 1151, 1285, 2432, 1132, 1133, 95, 1123, 1133,
-	1171, 1089, 2589, 1160, 690, 1170, 692, 706, 1169, 728,
-	2034, 727, 696, 1168, 694, 698, 707, 699, 1167, 693,
-	1166, 704, 1165, 1164, 695, 708, 709, 712, 716, 717,
-	718, 714, 711, 726, 702, 729, 4179, 1159, 726, 2218,
-	1738, 1172, 3300, 4258, 2220, 1108, 3183, 2507, 2225, 2221,
-	1145, 3117, 2222, 2223, 2224, 4212, 1108, 2219, 2227, 2228,
-	2229, 2230, 2231, 2232, 2233, 2234, 2235, 1482, 1144, 2174,
-	2163, 2164, 2165, 2166, 2176, 2167, 2168, 2169, 2181, 2177,
-	2170, 2171, 2178, 2179, 2180, 2172, 2173, 2175, 2026, 3559,
-	1291, 1886, 1291, 1291, 726, 1150, 726, 1084, 1099, 1093,
-	1091, 1163, 1181, 1099, 1093, 1091, 3644, 1108, 1144, 3047,
-	726, 1106, 1180, 2574, 1481, 1478, 1479, 1480, 1485, 1487,
-	1484, 2573, 1483, 1123, 2015, 1806, 2013, 2014, 2012, 2016,
-	2017, 2018, 1477, 2022, 2417, 2418, 3211, 1461, 2996, 1189,
-	3320, 3026, 1050, 1534, 1539, 1540, 3029, 1543, 1545, 1546,
-	1547, 1548, 1549, 1161, 1552, 1553, 1555, 1555, 1884, 1555,
+	980, 3717, 2162, 87, 4236, 3718, 3719, 4048, 4249, 3380,
+	4126, 4202, 975, 2150, 1294, 4138, 967, 4203, 2460, 2029,
+	3516, 4157, 3281, 3288, 2386, 3953, 4030, 1292, 3329, 3242,
+	3654, 3338, 3343, 3340, 3339, 1819, 3337, 3342, 3341, 3667,
+	4028, 3095, 3358, 3357, 3180, 3296, 2535, 2388, 2088, 759,
+	3246, 5, 3243, 3562, 3069, 3760, 3556, 3094, 3230, 787,
+	968, 2415, 2970, 3360, 928, 3051, 2431, 1770, 929, 2896,
+	3546, 4099, 753, 2498, 3387, 754, 3001, 2522, 2972, 2971,
+	2434, 2503, 3584, 2566, 1173, 165, 1050, 933, 87, 1876,
+	42, 1103, 2448, 2921, 2902, 1071, 43, 1047, 2435, 1924,
+	2886, 1078, 3240, 2870, 2436, 41, 2342, 2310, 2184, 1050,
+	3042, 2146, 2544, 151, 2521, 1906, 2423, 2096, 2505, 2963,
+	1131, 2583, 1136, 1808, 1113, 2938, 982, 1788, 2438, 1774,
+	1731, 102, 1550, 2190, 2121, 2110, 1475, 2309, 106, 1458,
+	107, 2025, 1913, 1110, 1107, 2005, 769, 3245, 1142, 1885,
+	2494, 1139, 1111, 2909, 1137, 2495, 1138, 1807, 1088, 1149,
+	2416, 764, 1090, 1793, 1533, 1509, 2087, 1282, 3755, 1059,
+	1753, 2868, 2217, 1049, 109, 1053, 1070, 2037, 101, 1056,
+	3747, 169, 85, 3517, 1055, 129, 127, 128, 134, 1898,
+	2198, 135, 93, 1054, 1222, 1045, 1073, 1083, 3573, 1057,
+	757, 100, 1554, 84, 4237, 746, 3655, 3326, 1290, 4083,
+	1268, 2537, 2538, 2539, 2537, 930, 1082, 108, 3024, 3023,
+	1476, 1559, 689, 2992, 2581, 3647, 756, 4185, 1776, 3609,
+	3059, 1476, 3060, 1063, 130, 4084, 1044, 4079, 1175, 2383,
+	2384, 2103, 1178, 136, 1104, 4078, 2102, 2101, 2100, 3722,
+	2099, 1192, 1193, 1194, 2098, 1197, 1198, 1199, 1200, 2068,
+	1238, 1203, 1204, 1205, 1206, 1207, 1208, 1209, 1210, 1211,
+	1212, 1213, 1214, 1215, 1216, 1217, 1218, 1219, 747, 1098,
+	1097, 1064, 686, 4179, 687, 2866, 1061, 2, 3348, 1048,
+	1152, 1128, 2635, 3226, 4206, 3184, 1492, 4242, 1153, 2570,
+	3520, 1072, 1046, 1990, 4259, 1239, 1779, 4201, 130, 1179,
+	1182, 1183, 1127, 1126, 1125, 4057, 1472, 2994, 4227, 1469,
+	1186, 1777, 4241, 3722, 3519, 2407, 1772, 2898, 1486, 731,
+	1195, 113, 114, 115, 731, 118, 1780, 2412, 124, 1486,
+	2411, 193, 725, 2569, 681, 3721, 3348, 4189, 3346, 1120,
+	4079, 1778, 981, 1115, 4187, 3017, 744, 745, 192, 3345,
+	4031, 984, 985, 986, 2831, 1043, 1038, 1039, 1040, 1041,
+	2108, 3406, 4188, 1052, 4153, 3949, 130, 3352, 3948, 4186,
+	1177, 131, 3660, 725, 1129, 3661, 1764, 1176, 86, 4217,
+	3959, 95, 4183, 984, 985, 986, 3679, 174, 86, 2642,
+	3668, 3014, 1460, 1085, 1086, 4127, 3346, 1096, 1100, 932,
+	86, 2912, 4135, 2563, 3958, 4139, 2155, 4162, 3432, 3721,
+	1887, 1809, 2947, 1810, 1471, 2946, 720, 3031, 2948, 3032,
+	3278, 3279, 2455, 2456, 2514, 3352, 1096, 1100, 932, 2913,
+	2867, 1482, 4167, 2952, 1474, 1489, 1488, 1490, 1491, 97,
+	2080, 2081, 1482, 3277, 3058, 2639, 725, 171, 2508, 2454,
+	172, 3774, 4165, 1275, 3041, 1277, 2568, 1258, 1036, 2640,
+	1035, 95, 4172, 4173, 705, 1246, 1124, 3678, 1231, 1232,
+	1247, 95, 3298, 3299, 4049, 725, 191, 703, 1245, 4166,
+	1244, 4143, 3349, 95, 725, 1246, 1263, 1264, 1259, 1287,
+	1247, 1252, 2959, 1274, 1276, 3414, 2033, 2473, 2472, 3384,
+	1234, 3382, 2905, 2906, 725, 3070, 2385, 725, 3116, 86,
+	3412, 1453, 88, 4143, 2633, 2079, 739, 700, 3002, 1470,
+	1805, 737, 2083, 3388, 1122, 743, 715, 2419, 1735, 3043,
+	4001, 2545, 4002, 1221, 3375, 3027, 1980, 2584, 4207, 4239,
+	3349, 710, 3376, 2006, 1510, 1279, 1196, 726, 2609, 1452,
+	2610, 2590, 2611, 713, 1284, 1459, 723, 2588, 1267, 4208,
+	97, 1261, 1262, 1227, 724, 3046, 3403, 3649, 1511, 1512,
+	1513, 1514, 1515, 1516, 1517, 1519, 1518, 1520, 1521, 2586,
+	1981, 3297, 1982, 3933, 3648, 2612, 1151, 1260, 726, 3072,
+	1253, 175, 95, 3300, 1151, 1265, 3385, 1202, 3383, 2587,
+	181, 2507, 1201, 1286, 1272, 1266, 2591, 2548, 1273, 1285,
+	3645, 2636, 2589, 2637, 3726, 1132, 1162, 2432, 1278, 1133,
+	1133, 1171, 1170, 1169, 690, 1168, 692, 706, 3559, 728,
+	1167, 727, 696, 2995, 694, 698, 707, 699, 2034, 693,
+	1166, 704, 1165, 1271, 695, 708, 709, 712, 716, 717,
+	718, 714, 711, 1164, 702, 729, 1159, 1123, 1089, 1738,
+	3300, 726, 1891, 3082, 3081, 3080, 1172, 1524, 3074, 4260,
+	3078, 1108, 3073, 1524, 3071, 1181, 1145, 3117, 1108, 3076,
+	4180, 1144, 1106, 4214, 1144, 1180, 1108, 2026, 3075, 1150,
+	726, 1886, 3320, 1084, 3047, 2574, 2573, 1150, 2022, 726,
+	3183, 1461, 1189, 3026, 1884, 1883, 1882, 3077, 3079, 3012,
+	1291, 2023, 1291, 1291, 1880, 1237, 680, 3040, 3192, 726,
+	3039, 4181, 726, 2417, 2418, 3644, 1099, 1093, 1091, 166,
+	3211, 1481, 1478, 1479, 1480, 1485, 1487, 1484, 3209, 1483,
+	1525, 1526, 1481, 1478, 1479, 1480, 1485, 1487, 1484, 1477,
+	1483, 4044, 1806, 3063, 3598, 1099, 1093, 1091, 3580, 2657,
+	1477, 2943, 1050, 1534, 1539, 1540, 1163, 1543, 1545, 1546,
+	1547, 1548, 1549, 3029, 1552, 1553, 1555, 1555, 2908, 1555,
 	1555, 1560, 1560, 1560, 1563, 1564, 1565, 1566, 1567, 1568,
 	1569, 1570, 1571, 1572, 1573, 1574, 1575, 1576, 1577, 1578,
 	1579, 1580, 1581, 1582, 1583, 1584, 1585, 1586, 1587, 1588,
@@ -1798,293 +1798,293 @@ var yyAct = [...]int{
 	1649, 1650, 1651, 1652, 1653, 1654, 1655, 1656, 1657, 1658,
 	1659, 1660, 1661, 1662, 1663, 1664, 1665, 1666, 1667, 1668,
 	1669, 1670, 1671, 1672, 1673, 1674, 1675, 1676, 1677, 1678,
-	1679, 1680, 1681, 1682, 1683, 1684, 1685, 1686, 1130, 3720,
-	1280, 1531, 1687, 2567, 1689, 1690, 1691, 1692, 1693, 1450,
-	1451, 4056, 2993, 3607, 3608, 3610, 1560, 1560, 1560, 1560,
-	1560, 1560, 1776, 4141, 730, 3677, 1992, 1991, 1993, 1994,
-	1995, 1700, 1701, 1702, 1703, 1704, 1705, 1706, 1707, 1708,
+	1679, 1680, 1681, 1682, 1683, 1684, 1685, 1686, 1531, 4056,
+	1280, 2993, 1687, 1130, 1689, 1690, 1691, 1692, 1693, 3720,
+	1450, 1451, 3607, 3608, 3610, 1776, 1560, 1560, 1560, 1560,
+	1560, 1560, 1449, 4141, 730, 2511, 2567, 4102, 3560, 2996,
+	2961, 1700, 1701, 1702, 1703, 1704, 1705, 1706, 1707, 1708,
 	1709, 1710, 1711, 1712, 1713, 721, 1527, 1528, 1529, 1530,
-	1449, 1151, 4141, 4170, 95, 1225, 1541, 3016, 2641, 4140,
-	722, 3350, 3351, 3350, 3351, 1243, 3720, 4102, 1535, 1556,
-	1230, 1557, 1558, 1524, 3354, 94, 3354, 1481, 1478, 1479,
-	1480, 1485, 1487, 1484, 1544, 1483, 1233, 3504, 4140, 1092,
-	1151, 2511, 1561, 1562, 1092, 1477, 94, 4169, 1468, 89,
-	1883, 3015, 3404, 1242, 1524, 1248, 1249, 1250, 1251, 3560,
-	3284, 94, 1728, 1912, 1763, 1882, 2640, 3012, 1734, 2023,
-	922, 1880, 1237, 3050, 725, 680, 3070, 1050, 4180, 1288,
-	1289, 1050, 2512, 3040, 2565, 4044, 3039, 1050, 1724, 2510,
-	2597, 2593, 2595, 2596, 2594, 2598, 2599, 2600, 2601, 1256,
-	1525, 1526, 1151, 3598, 1150, 3580, 4251, 2943, 2908, 3063,
-	2843, 3285, 2158, 1151, 1797, 1688, 1236, 2419, 3192, 2871,
-	2873, 3191, 126, 2513, 1725, 2903, 195, 688, 2461, 684,
-	1524, 1521, 3276, 2509, 2668, 1504, 3287, 1067, 1188, 1283,
-	2657, 1764, 3090, 1150, 2199, 3209, 121, 4070, 1174, 684,
-	1269, 3640, 3572, 1241, 1742, 1151, 3282, 2585, 1746, 94,
-	3072, 2200, 2092, 2019, 1049, 1060, 2038, 1124, 1220, 2527,
-	1744, 1745, 1911, 1811, 106, 107, 3298, 3299, 2191, 2191,
-	2677, 4216, 3769, 3283, 1081, 1081, 1694, 1695, 1696, 1697,
-	1698, 1699, 2126, 684, 1725, 1732, 1492, 4062, 1491, 2010,
-	2114, 2115, 2112, 2113, 3615, 1150, 2127, 1522, 1523, 2125,
-	3614, 1144, 1147, 1148, 2552, 1108, 1150, 3289, 1775, 1141,
-	1145, 1154, 1144, 109, 122, 2668, 1156, 2111, 1490, 1491,
-	1157, 1155, 1224, 1921, 3082, 3081, 3080, 3053, 1492, 3074,
-	1140, 3078, 3052, 3073, 3053, 3071, 1920, 1910, 4208, 3052,
-	3076, 1158, 2562, 3599, 1888, 1889, 1890, 1904, 1150, 3075,
-	1151, 1151, 1729, 2560, 1144, 1147, 1148, 1162, 1108, 1740,
-	1160, 1062, 1141, 1145, 1743, 1492, 2557, 4253, 3077, 3079,
-	1897, 1766, 1492, 1741, 1975, 3297, 2031, 2185, 1769, 726,
-	1048, 2564, 1916, 2872, 1926, 1046, 1927, 3300, 1929, 1931,
-	2197, 1957, 1935, 1937, 1939, 1941, 1943, 1240, 1270, 1291,
-	1802, 1803, 3941, 2417, 2418, 1255, 3674, 1226, 3675, 2561,
-	1871, 1965, 1966, 1915, 2039, 1492, 1257, 1971, 1972, 1516,
-	1517, 1519, 1518, 1520, 1521, 1879, 1914, 1914, 4249, 1492,
-	2557, 4250, 1223, 4248, 4103, 1489, 1786, 1490, 1491, 1894,
-	4036, 1492, 95, 1895, 2007, 1907, 2008, 1893, 1123, 2009,
-	4259, 3421, 749, 1150, 1150, 2673, 1187, 3963, 1154, 1144,
-	1184, 1764, 2124, 1156, 4221, 1764, 1747, 1157, 1155, 2196,
-	1492, 1510, 3940, 2559, 1506, 3931, 1507, 1489, 2000, 1490,
-	1491, 3691, 1961, 4104, 2714, 3690, 3092, 3622, 1918, 4037,
-	1508, 1522, 1523, 1505, 2027, 1511, 1512, 1513, 1514, 1515,
-	1516, 1517, 1519, 1518, 1520, 1521, 3621, 1785, 3286, 3611,
-	3327, 1510, 3316, 3062, 1489, 1953, 1490, 1491, 1956, 2968,
-	1958, 1489, 1764, 1490, 1491, 130, 2967, 1127, 1510, 984,
-	985, 986, 1126, 2672, 1125, 1511, 1512, 1513, 1514, 1515,
-	1516, 1517, 1519, 1518, 1520, 1521, 4260, 1492, 2966, 1999,
-	2718, 2044, 1511, 1512, 1513, 1514, 1515, 1516, 1517, 1519,
-	1518, 1520, 1521, 1764, 1489, 2517, 1490, 1491, 2001, 1291,
-	1291, 1492, 1985, 2424, 2425, 2040, 2041, 2066, 1489, 1492,
-	1490, 1491, 1984, 1492, 1510, 87, 2656, 1983, 87, 2045,
-	1489, 1973, 1490, 1491, 1967, 1964, 2052, 2053, 2054, 1510,
-	1492, 1963, 1962, 2704, 1933, 1739, 2065, 1998, 1511, 1512,
-	1513, 1514, 1515, 1516, 1517, 1519, 1518, 1520, 1521, 1489,
-	2961, 1490, 1491, 1511, 1512, 1513, 1514, 1515, 1516, 1517,
-	1519, 1518, 1520, 1521, 1511, 1512, 1513, 1514, 1515, 1516,
-	1517, 1519, 1518, 1520, 1521, 1492, 2347, 2153, 2153, 1512,
-	1513, 1514, 1515, 1516, 1517, 1519, 1518, 1520, 1521, 2151,
-	2151, 1492, 42, 2154, 1764, 42, 1514, 1515, 1516, 1517,
-	1519, 1518, 1520, 1521, 1492, 4219, 1764, 3379, 1997, 1455,
-	2116, 1498, 1499, 1500, 1501, 1502, 1503, 1497, 1494, 1987,
-	731, 1805, 4149, 1764, 1764, 1492, 1489, 4209, 1490, 1491,
-	1492, 2114, 2115, 2647, 2648, 2042, 3604, 2237, 731, 2950,
-	4065, 731, 2046, 4064, 2048, 2049, 2050, 2051, 4040, 103,
-	1489, 2055, 1490, 1491, 2533, 2531, 2532, 2530, 1489, 104,
-	1490, 1491, 1489, 2067, 1490, 1491, 103, 4147, 1764, 4058,
-	1492, 3968, 105, 1724, 2347, 4039, 104, 1492, 2344, 1489,
-	3290, 1490, 1491, 3593, 3294, 1782, 85, 2346, 4038, 85,
-	1986, 3293, 2529, 2093, 2528, 3936, 4145, 1764, 3967, 2186,
-	3920, 2716, 3919, 979, 3768, 2123, 2073, 2074, 3766, 1725,
-	1492, 1488, 1764, 2892, 4236, 4196, 1764, 4014, 1764, 3924,
-	1764, 2128, 4012, 1764, 1489, 3295, 1490, 1491, 112, 3687,
-	3291, 1492, 1723, 1722, 1783, 3292, 1721, 1764, 3923, 111,
-	1489, 110, 1490, 1491, 1492, 2892, 1764, 2157, 3619, 105,
-	1488, 1764, 1492, 1489, 2261, 1490, 1491, 1492, 2357, 2130,
-	2892, 4134, 4009, 1764, 1492, 3603, 2355, 2892, 4113, 3991,
-	1764, 684, 3389, 684, 1489, 3386, 1490, 1491, 1552, 1489,
-	2356, 1490, 1491, 3319, 2129, 1492, 2131, 2132, 2133, 2134,
-	2135, 2136, 2138, 2140, 2141, 2142, 2143, 2144, 2145, 3318,
-	1535, 2236, 3545, 1764, 3666, 2343, 2201, 2202, 2203, 2204,
-	2892, 4109, 4021, 1764, 1764, 3658, 4055, 3003, 2192, 1489,
-	2215, 1490, 1491, 3538, 1764, 1492, 1489, 2410, 1490, 1491,
-	1492, 3944, 1764, 2892, 3932, 684, 3535, 1764, 3271, 2354,
-	3044, 112, 2360, 2361, 3533, 1764, 3658, 1764, 2640, 3496,
-	1764, 1492, 111, 2440, 110, 2977, 3494, 1764, 2982, 1489,
-	2964, 1490, 1491, 1538, 1720, 106, 107, 2357, 2345, 2892,
-	3656, 2253, 2557, 1764, 2469, 2355, 1714, 3490, 1764, 95,
-	1489, 2630, 1490, 1491, 2622, 1492, 2390, 106, 107, 2429,
-	2470, 3578, 1764, 1489, 2621, 1490, 1491, 2798, 1764, 2402,
-	1492, 1489, 2579, 1490, 1491, 1492, 1489, 2122, 1490, 1491,
-	2578, 1492, 2414, 1489, 2391, 1490, 1491, 3487, 1764, 3309,
-	3308, 105, 3485, 1764, 3306, 3307, 1113, 1764, 3304, 3305,
-	2442, 3304, 3303, 2939, 1489, 2664, 1490, 1491, 2479, 2480,
-	2481, 2482, 2939, 3483, 1764, 3571, 2474, 1492, 2475, 2476,
-	2477, 2478, 2464, 2918, 1764, 2465, 1063, 2640, 3025, 1488,
-	1113, 2446, 2484, 1492, 2069, 2486, 2487, 2488, 2489, 2035,
-	2403, 1996, 2378, 1988, 1489, 1978, 1490, 1491, 4210, 1489,
-	2405, 1490, 1491, 2500, 1875, 3006, 1764, 2396, 1974, 2397,
-	2468, 1970, 3481, 1764, 1492, 2999, 3000, 3479, 1764, 2546,
-	1489, 2940, 1490, 1491, 2506, 2427, 2892, 2891, 2156, 1764,
-	2940, 2942, 2451, 2452, 2450, 1492, 1969, 2889, 1968, 1784,
-	2640, 1281, 2467, 2466, 1492, 1875, 1874, 1098, 1097, 1817,
-	1816, 105, 1492, 3241, 1489, 111, 1490, 1491, 4097, 3477,
-	1764, 2543, 2910, 2516, 3571, 1492, 4069, 2892, 2918, 1489,
-	3524, 1490, 1491, 2910, 1489, 3540, 1490, 1491, 1492, 3306,
-	1489, 3575, 1490, 1491, 3214, 2501, 2453, 2798, 2558, 2701,
-	2917, 2497, 2700, 2551, 2515, 2557, 2554, 2520, 2555, 2540,
-	2519, 2490, 2492, 2493, 2422, 2409, 3475, 1764, 1768, 2381,
-	2156, 2094, 2078, 1492, 2571, 2887, 1489, 1051, 1490, 1491,
-	2021, 2501, 2550, 2549, 1152, 1804, 1492, 2553, 4053, 1488,
-	1492, 1153, 1489, 1135, 1490, 1491, 3473, 1764, 2572, 2918,
-	1492, 1914, 1134, 2575, 3471, 1764, 684, 2576, 2577, 3574,
-	3571, 2918, 2557, 4175, 1492, 4116, 3330, 3469, 1764, 1765,
-	1767, 1492, 3955, 1489, 1771, 1490, 1491, 3921, 97, 1060,
-	3467, 1764, 3781, 3639, 1492, 3636, 3617, 3437, 1492, 2645,
-	3436, 2582, 1877, 2499, 1489, 3377, 1490, 1491, 1050, 1050,
-	1050, 1492, 3623, 1489, 684, 1490, 1491, 3332, 3328, 3007,
-	95, 1489, 2496, 1490, 1491, 3465, 1764, 1492, 1545, 2491,
-	1545, 1510, 2485, 684, 1489, 1949, 1490, 1491, 3463, 1764,
-	2483, 2974, 3461, 1764, 2003, 1492, 2660, 1489, 1909, 1490,
-	1491, 2973, 3459, 1764, 2615, 1511, 1512, 1513, 1514, 1515,
-	1516, 1517, 1519, 1518, 1520, 1521, 3457, 1764, 2357, 3624,
-	3625, 3626, 1225, 3443, 1764, 1905, 2663, 1492, 1873, 123,
-	4231, 1492, 1489, 1538, 1490, 1491, 3419, 1764, 3381, 1492,
-	2356, 3928, 1950, 1951, 1952, 1489, 3956, 1490, 1491, 1489,
-	1492, 1490, 1491, 2863, 1764, 2974, 1492, 2632, 2514, 1489,
-	1538, 1490, 1491, 1538, 2394, 1538, 684, 3585, 3586, 2861,
-	1764, 2638, 1492, 1489, 4229, 1490, 1491, 4203, 1726, 4077,
-	1489, 1492, 1490, 1491, 3627, 3996, 1976, 2646, 3641, 3588,
-	3324, 3323, 1492, 1489, 3322, 1490, 1491, 1489, 2652, 1490,
-	1491, 684, 2071, 3241, 2986, 1492, 2616, 2649, 2650, 2651,
-	1489, 3263, 1490, 1491, 3591, 2123, 3264, 2030, 684, 2836,
-	1764, 4073, 3261, 2813, 1764, 3957, 1489, 3262, 1490, 1491,
-	3590, 2805, 1764, 3265, 684, 2927, 2928, 3628, 3629, 3630,
-	3260, 684, 2796, 1764, 1489, 3259, 1490, 1491, 2794, 1764,
-	2056, 2057, 684, 684, 684, 684, 684, 684, 684, 2413,
-	1065, 2676, 685, 1781, 2781, 1764, 3579, 1492, 2654, 2072,
-	3746, 1492, 3745, 2779, 1764, 1492, 1489, 2400, 1490, 1491,
-	1489, 3219, 1490, 1491, 2777, 1764, 1492, 2182, 1489, 3218,
-	1490, 1491, 3564, 2653, 4035, 2655, 2842, 2775, 1764, 1489,
-	3563, 1490, 1491, 3761, 2658, 1489, 2659, 1490, 1491, 3567,
-	3759, 1066, 2661, 2624, 2625, 1492, 3228, 2712, 2627, 2020,
-	1034, 1489, 1945, 1490, 1491, 3744, 2830, 2628, 2874, 1068,
-	1489, 3302, 1490, 1491, 2153, 2957, 748, 1069, 2978, 3231,
-	3233, 1489, 2608, 1490, 1491, 2607, 2151, 1050, 3234, 2877,
-	2606, 1492, 2199, 2605, 1489, 1492, 1490, 1491, 2604, 2773,
-	1764, 2603, 1492, 2771, 1764, 2602, 1077, 2769, 1764, 2200,
-	1492, 1191, 2915, 2916, 1190, 1946, 1947, 1948, 2875, 2969,
-	1076, 2440, 3397, 1454, 1050, 2935, 2174, 2163, 2164, 2165,
+	2641, 3350, 3351, 94, 1225, 4141, 1541, 4171, 167, 4140,
+	722, 725, 3504, 94, 3354, 179, 2512, 1468, 1535, 1556,
+	3677, 1557, 1558, 2510, 89, 94, 1242, 3404, 1248, 1249,
+	1250, 1251, 1160, 3720, 1544, 2640, 1992, 1991, 1993, 1994,
+	1995, 4140, 3016, 1561, 1562, 1151, 4169, 1092, 1912, 1243,
+	1151, 4170, 1288, 1289, 2419, 95, 187, 2513, 2565, 3350,
+	3351, 1233, 1728, 2843, 1763, 1230, 2158, 2509, 1734, 1797,
+	922, 4253, 3354, 2871, 2873, 1688, 1092, 1050, 3050, 1236,
+	3191, 1050, 2903, 126, 688, 3276, 3015, 1050, 2461, 1521,
+	2668, 1524, 1764, 1119, 1504, 1067, 1121, 1283, 1724, 1256,
+	2010, 4070, 1188, 168, 173, 170, 176, 177, 178, 180,
+	182, 183, 184, 185, 1174, 2226, 1725, 1269, 3640, 186,
+	188, 189, 190, 2011, 121, 3090, 195, 2038, 3572, 684,
+	2126, 2585, 2092, 1241, 94, 2597, 2593, 2595, 2596, 2594,
+	2598, 2599, 2600, 2601, 2127, 1522, 1523, 2125, 1150, 684,
+	2019, 1811, 2191, 1150, 1144, 1147, 1148, 1911, 1108, 1151,
+	1490, 1491, 1141, 1145, 1742, 1060, 1124, 1220, 1746, 2527,
+	2191, 3769, 2677, 4218, 1049, 1744, 2668, 1745, 1491, 106,
+	2562, 107, 1161, 1140, 1081, 1081, 1725, 1694, 1695, 1696,
+	1697, 1698, 1699, 684, 1732, 1124, 2199, 1116, 3615, 3614,
+	2552, 1921, 122, 1920, 1118, 1117, 3053, 1910, 3284, 2560,
+	1162, 3052, 1160, 2200, 2218, 109, 4261, 4103, 1775, 2220,
+	4209, 3599, 4036, 2225, 2221, 1151, 726, 2222, 2223, 2224,
+	2557, 1224, 2219, 2227, 2228, 2229, 2230, 2231, 2232, 2233,
+	2234, 2235, 1062, 1888, 1889, 1890, 4255, 2872, 4062, 3053,
+	2417, 2418, 1740, 1122, 3052, 2007, 3674, 2008, 3675, 3285,
+	2009, 1904, 1150, 1766, 1151, 2564, 4104, 1154, 1144, 1741,
+	1729, 4037, 1156, 2561, 1743, 1270, 1157, 1155, 1226, 1897,
+	2557, 2031, 1151, 1975, 3287, 2039, 2185, 1240, 1769, 1926,
+	1048, 1927, 4211, 1929, 1931, 1916, 1046, 1935, 1937, 1939,
+	1941, 1943, 95, 4251, 3282, 1957, 4252, 2182, 4250, 1291,
+	1965, 1966, 4262, 1802, 1803, 1255, 1971, 1972, 2000, 1764,
+	1871, 1915, 2124, 2559, 3298, 3299, 1257, 2196, 1150, 3941,
+	1187, 3283, 1492, 3940, 1184, 3931, 3691, 1914, 1914, 1879,
+	3690, 1223, 3622, 2015, 3621, 2013, 2014, 2012, 2016, 2017,
+	2018, 3611, 2197, 1895, 1894, 1907, 1893, 1123, 2424, 2425,
+	1998, 749, 3327, 1492, 3316, 3289, 2968, 1150, 1747, 984,
+	985, 986, 1154, 1144, 2967, 2347, 1987, 1156, 2347, 2344,
+	1961, 1157, 1155, 2966, 2517, 1150, 1123, 2704, 2346, 1999,
+	2001, 1144, 1147, 1148, 1985, 1108, 1984, 1983, 1918, 1141,
+	1145, 1973, 1158, 1967, 979, 2027, 2174, 2163, 2164, 2165,
 	2166, 2176, 2167, 2168, 2169, 2181, 2177, 2170, 2171, 2178,
-	2179, 2180, 2172, 2173, 2175, 1492, 2973, 2767, 1764, 3056,
-	3013, 2914, 2895, 2119, 2117, 2118, 1489, 2122, 1490, 1491,
-	1489, 103, 1490, 1491, 1489, 131, 1490, 1491, 4245, 3569,
-	103, 104, 105, 1492, 2990, 1489, 105, 1490, 1491, 1492,
-	104, 2424, 2425, 2765, 1764, 1492, 2933, 2763, 1764, 42,
-	2865, 1732, 2619, 2904, 3536, 684, 4152, 3547, 2932, 1492,
-	4054, 2934, 2761, 1764, 1489, 3951, 1490, 1491, 1492, 112,
-	2878, 3301, 2880, 2960, 2962, 1492, 1775, 2893, 2931, 1492,
-	111, 2885, 110, 110, 1492, 2406, 2644, 3217, 2907, 2953,
-	105, 1492, 2077, 2937, 1725, 3216, 2890, 2759, 1764, 3011,
-	1489, 4020, 1490, 1491, 1489, 2076, 1490, 1491, 4019, 2941,
-	111, 1489, 3999, 1490, 1491, 1538, 3767, 2944, 3765, 1489,
-	3764, 1490, 1491, 2951, 2506, 2757, 1764, 3757, 2954, 1492,
-	2194, 2755, 1764, 1538, 3637, 2195, 3022, 2753, 1764, 3568,
-	3566, 3333, 2541, 2976, 1892, 2965, 1492, 112, 2979, 2980,
-	1075, 2751, 1764, 3756, 1489, 1492, 1490, 1491, 111, 1492,
-	2749, 1764, 2910, 2975, 1492, 3557, 2666, 2747, 1764, 4232,
-	1492, 2742, 1764, 2257, 1492, 2983, 2665, 2984, 4233, 2987,
-	2988, 2989, 1489, 3502, 1490, 1491, 3730, 1492, 1489, 3019,
-	1490, 1491, 4233, 4232, 1489, 1897, 1490, 1491, 2889, 3120,
-	2702, 112, 2392, 3066, 3067, 3008, 3009, 1492, 1489, 1798,
-	1490, 1491, 111, 1790, 110, 116, 117, 1489, 4041, 1490,
-	1491, 3498, 3018, 3602, 1489, 3, 1490, 1491, 1489, 2091,
-	1490, 1491, 10, 1489, 2089, 1490, 1491, 9, 2738, 1764,
-	1489, 2090, 1490, 1491, 8, 1492, 99, 2736, 1764, 1,
-	1492, 3434, 3045, 2340, 1492, 1042, 2729, 1764, 1457, 1456,
-	3083, 3064, 3433, 3048, 3606, 1492, 2727, 1764, 4164, 2030,
-	701, 2382, 1492, 1730, 4204, 4160, 4161, 1492, 1489, 3425,
-	1490, 1491, 1989, 2372, 1979, 3101, 3102, 3103, 3104, 3105,
-	3106, 3107, 3108, 3109, 3110, 1489, 1492, 1490, 1491, 3423,
-	1765, 2379, 3669, 2308, 1489, 3118, 1490, 1491, 1489, 3952,
-	1490, 1491, 3336, 1489, 1976, 1490, 1491, 2547, 3084, 1489,
-	3635, 1490, 1491, 1489, 2504, 1490, 1491, 1143, 156, 3020,
-	1081, 2462, 2463, 4129, 120, 1101, 1489, 2859, 1490, 1491,
-	119, 2404, 2858, 1726, 1146, 1254, 2854, 2542, 3659, 1060,
-	2958, 2471, 1823, 1821, 1822, 1820, 1489, 2853, 1490, 1491,
-	1825, 1824, 4101, 3405, 2852, 2703, 1492, 3503, 3122, 2851,
-	2082, 684, 3178, 738, 3054, 2930, 732, 3055, 2030, 684,
-	194, 684, 1812, 684, 2449, 1791, 2075, 1185, 2850, 691,
-	2251, 3310, 2580, 697, 1489, 1542, 1490, 1491, 3065, 1489,
-	2070, 1490, 1491, 1489, 3215, 1490, 1491, 2998, 2945, 1095,
-	1087, 3196, 2393, 2879, 1489, 1094, 1490, 1491, 3929, 3185,
-	3187, 1489, 3249, 1490, 1491, 3561, 1489, 3068, 1490, 1491,
-	2440, 3227, 3229, 2897, 3111, 3085, 1492, 3232, 3225, 4034,
-	3758, 3158, 4114, 2955, 1787, 1489, 3523, 1490, 1491, 2343,
-	2675, 2343, 2189, 2518, 3248, 1532, 87, 763, 2849, 2440,
-	2440, 2440, 2440, 2440, 2439, 934, 2526, 1773, 3725, 2109,
-	2334, 2335, 2336, 2337, 2338, 761, 3196, 760, 758, 2440,
-	2881, 1492, 2440, 3186, 3195, 3188, 2911, 2359, 3253, 1492,
-	2362, 2363, 1496, 1495, 969, 3223, 3168, 3169, 3170, 3171,
-	3172, 3270, 2869, 2031, 1492, 1799, 2922, 2442, 2920, 2919,
-	3207, 2617, 2345, 2447, 2345, 1489, 3587, 1490, 1491, 3213,
-	1492, 3583, 4156, 2441, 3220, 2437, 2380, 3222, 2840, 1492,
-	2888, 920, 919, 1053, 3235, 3236, 2442, 2442, 2442, 2442,
-	2442, 770, 762, 752, 3272, 3353, 983, 3273, 918, 1055,
-	1492, 917, 3363, 3364, 1492, 3361, 2442, 3255, 3256, 2442,
-	3258, 3252, 1492, 106, 107, 3254, 3266, 3274, 3257, 1054,
-	3208, 3210, 3212, 2839, 1492, 3028, 3378, 3030, 3280, 2956,
-	3221, 2838, 3374, 1473, 684, 1489, 1749, 1490, 1491, 1752,
-	3312, 684, 1492, 3311, 2401, 3313, 2837, 1492, 1114, 3402,
-	4060, 2643, 684, 684, 3431, 1748, 684, 4067, 2620, 3314,
-	3315, 3344, 2834, 3653, 3362, 3366, 3325, 3004, 684, 2534,
-	69, 2829, 46, 4029, 4098, 684, 2506, 3334, 3355, 3365,
-	1489, 912, 1490, 1491, 909, 3372, 3727, 3728, 1489, 3729,
-	1490, 1491, 2822, 3238, 3181, 3182, 2821, 1720, 1492, 4080,
-	4081, 684, 1718, 1489, 2820, 1490, 1491, 1716, 2631, 3390,
-	1717, 1715, 3393, 1719, 3392, 908, 2819, 3400, 3244, 1489,
-	4082, 1490, 1491, 3244, 2246, 1467, 1464, 3410, 1489, 4177,
-	1490, 1491, 3407, 3408, 2818, 3409, 2084, 98, 3411, 2817,
-	3413, 36, 3415, 3426, 3427, 3428, 3429, 3430, 35, 1489,
-	34, 1490, 1491, 1489, 33, 1490, 1491, 32, 26, 25,
-	24, 1489, 23, 1490, 1491, 2923, 2926, 2927, 2928, 2924,
-	22, 2925, 2929, 1489, 29, 1490, 1491, 19, 21, 20,
-	1545, 18, 2662, 3347, 1545, 4199, 2667, 1538, 4244, 2030,
-	2816, 1489, 125, 1490, 1491, 55, 1489, 52, 1490, 1491,
-	3548, 50, 3550, 133, 132, 53, 49, 1228, 3335, 2670,
-	47, 2671, 96, 31, 30, 17, 3518, 2679, 16, 15,
-	14, 2681, 2682, 3522, 13, 12, 11, 7, 6, 39,
+	2179, 2180, 2172, 2173, 2175, 1953, 1492, 1510, 1956, 3062,
+	1958, 1997, 1964, 3297, 2114, 2115, 2647, 2648, 130, 1963,
+	1962, 1510, 1127, 1126, 1125, 3300, 1933, 1986, 1739, 3379,
+	1455, 1511, 1512, 1513, 1514, 1515, 1516, 1517, 1519, 1518,
+	1520, 1521, 2044, 2718, 731, 1511, 1512, 1513, 1514, 1515,
+	1516, 1517, 1519, 1518, 1520, 1521, 3604, 2066, 731, 1291,
+	1291, 1489, 1805, 1490, 1491, 2040, 2041, 1514, 1515, 1516,
+	1517, 1519, 1518, 1520, 1521, 87, 2892, 4238, 87, 2045,
+	1516, 1517, 1519, 1518, 1520, 1521, 2052, 2053, 2054, 4210,
+	1492, 192, 1489, 4065, 1490, 1491, 1492, 2065, 1498, 1499,
+	1500, 1501, 1502, 1503, 1497, 1494, 2950, 1510, 731, 2533,
+	1506, 2532, 1507, 4064, 131, 1511, 1512, 1513, 1514, 1515,
+	1516, 1517, 1519, 1518, 1520, 1521, 1508, 1522, 1523, 1505,
+	174, 1511, 1512, 1513, 1514, 1515, 1516, 1517, 1519, 1518,
+	1520, 1521, 1492, 2531, 4040, 2530, 3286, 4039, 2153, 2153,
+	2154, 4038, 2151, 2151, 1492, 1489, 1720, 1490, 1491, 1492,
+	3936, 1718, 42, 1492, 3092, 42, 1716, 3920, 2042, 1717,
+	1715, 1492, 1719, 3919, 1510, 2046, 2656, 2048, 2049, 2050,
+	2051, 2116, 4223, 1764, 2055, 2529, 3768, 2528, 4221, 1764,
+	171, 1782, 3766, 172, 3687, 2237, 2067, 1510, 1511, 1512,
+	1513, 1514, 1515, 1516, 1517, 1519, 1518, 1520, 1521, 1512,
+	1513, 1514, 1515, 1516, 1517, 1519, 1518, 1520, 1521, 191,
+	1723, 1511, 1512, 1513, 1514, 1515, 1516, 1517, 1519, 1518,
+	1520, 1521, 1492, 1722, 4149, 1764, 2666, 4197, 1764, 1489,
+	1783, 1490, 1491, 1724, 2093, 1489, 2665, 1490, 1491, 1492,
+	1721, 4147, 1764, 1764, 85, 4145, 1764, 85, 2892, 1764,
+	4058, 1725, 2123, 4014, 1764, 2716, 2186, 2073, 2074, 1492,
+	2114, 2115, 2112, 2113, 103, 1488, 1764, 1492, 1488, 1764,
+	105, 3619, 2128, 3603, 104, 1492, 2892, 4134, 3968, 112,
+	1492, 1489, 3389, 1490, 1491, 2892, 4113, 2111, 1492, 2673,
+	111, 3386, 110, 1489, 3319, 1490, 1491, 3318, 1489, 2157,
+	1490, 1491, 1489, 2357, 1490, 1491, 112, 3044, 2356, 2130,
+	1489, 2261, 1490, 1491, 4012, 1764, 2355, 111, 2977, 110,
+	2964, 684, 1492, 684, 175, 1720, 1492, 105, 1552, 2892,
+	4109, 4009, 1764, 181, 2129, 1764, 2131, 2132, 2133, 2134,
+	2135, 2136, 2138, 2140, 2141, 2142, 2143, 2144, 2145, 2343,
+	1535, 3991, 1764, 2345, 2236, 2201, 2202, 2203, 2204, 3545,
+	1764, 4021, 1764, 3658, 4055, 1764, 3967, 2672, 2192, 2215,
+	1714, 1489, 3963, 1490, 1491, 1492, 103, 2410, 3290, 2630,
+	3538, 1764, 3294, 3944, 1764, 684, 104, 2622, 1489, 3293,
+	1490, 1491, 1764, 3575, 1492, 2621, 2354, 2892, 3932, 2360,
+	2361, 3658, 1764, 2440, 1492, 2892, 3656, 105, 1489, 2579,
+	1490, 1491, 2357, 1538, 3535, 1764, 1489, 2429, 1490, 1491,
+	106, 2253, 107, 3295, 1489, 2355, 1490, 1491, 3291, 1489,
+	2578, 1490, 1491, 3292, 2557, 1764, 1492, 1489, 2470, 1490,
+	1491, 2414, 106, 2390, 107, 1492, 2391, 1764, 3924, 1492,
+	2069, 2402, 3578, 1764, 2798, 1764, 3923, 1492, 2122, 3309,
+	3308, 3574, 166, 3306, 3307, 3666, 1786, 3533, 1764, 3304,
+	3305, 1489, 1764, 1490, 1491, 1489, 1113, 1490, 1491, 3304,
+	3303, 2918, 1764, 1492, 2640, 3025, 3496, 1764, 1492, 2035,
+	2442, 2939, 2479, 2480, 2481, 2482, 3494, 1764, 1063, 1875,
+	3006, 3003, 2464, 1996, 2378, 2999, 3000, 2982, 1492, 2465,
+	1113, 2939, 1492, 1988, 2474, 1978, 2475, 2476, 2477, 2478,
+	2396, 2446, 2397, 2403, 1489, 1974, 1490, 1491, 3490, 1764,
+	2484, 1492, 2664, 2486, 2487, 2488, 2489, 1785, 2405, 111,
+	2468, 3487, 1764, 1489, 2500, 1490, 1491, 1970, 2546, 3485,
+	1764, 1492, 2506, 1489, 1969, 1490, 1491, 1968, 2427, 2940,
+	2892, 2891, 2469, 2451, 2452, 1098, 1097, 2450, 1784, 2942,
+	2156, 1764, 2467, 1281, 2466, 3483, 1764, 2558, 1492, 2940,
+	3481, 1764, 1492, 1875, 1874, 1489, 2917, 1490, 1491, 2640,
+	1817, 1816, 2714, 2516, 1489, 2543, 1490, 1491, 1489, 1492,
+	1490, 1491, 2910, 1492, 3479, 1764, 1489, 3271, 1490, 1491,
+	2910, 3571, 1492, 1488, 1051, 1488, 2501, 2640, 1492, 2497,
+	2490, 2492, 2493, 3477, 1764, 2519, 2551, 3241, 2515, 2554,
+	2520, 2555, 1489, 1492, 1490, 1491, 2889, 1489, 3571, 1490,
+	1491, 2557, 4097, 3475, 1764, 4069, 2892, 2918, 2571, 2918,
+	105, 3524, 2501, 2550, 1152, 2553, 2549, 1489, 3623, 1490,
+	1491, 1489, 1153, 1490, 1491, 97, 3306, 3214, 2453, 2798,
+	2572, 1764, 1914, 2575, 3473, 1764, 684, 2576, 2577, 2918,
+	1489, 2701, 1490, 1491, 1492, 2700, 2557, 3571, 2540, 1765,
+	1767, 3471, 1764, 2422, 2409, 3469, 1764, 95, 95, 1060,
+	1489, 167, 1490, 1491, 3467, 1764, 1768, 2381, 179, 2645,
+	3465, 1764, 2156, 2094, 2887, 3624, 3625, 3626, 1050, 1050,
+	1050, 2582, 2078, 2021, 684, 3463, 1764, 1489, 1804, 1490,
+	1491, 1489, 1949, 1490, 1491, 1492, 1135, 1134, 1545, 4176,
+	1545, 1492, 4116, 684, 3955, 1771, 1492, 3921, 1489, 187,
+	1490, 1491, 1489, 3781, 1490, 1491, 2660, 1492, 3639, 3636,
+	3617, 1489, 3437, 1490, 1491, 2615, 3436, 1489, 1877, 1490,
+	1491, 2499, 3377, 2357, 3332, 1492, 3461, 1764, 2356, 3328,
+	3007, 1492, 1489, 2496, 1490, 1491, 2663, 1492, 2491, 1950,
+	1951, 1952, 2485, 1538, 2483, 2003, 168, 173, 170, 176,
+	177, 178, 180, 182, 183, 184, 185, 1909, 1905, 3421,
+	1492, 1873, 186, 188, 189, 190, 123, 2973, 2632, 3330,
+	1538, 3381, 2974, 1538, 1225, 1538, 684, 3459, 1764, 1492,
+	3956, 2638, 2514, 1489, 1764, 1490, 1491, 1726, 3457, 1764,
+	3585, 3586, 1492, 2394, 4233, 4231, 1976, 2646, 1492, 3443,
+	1764, 4204, 1492, 4077, 3996, 3588, 4073, 3324, 2071, 3323,
+	2652, 684, 3591, 3322, 2649, 2650, 2651, 3419, 1764, 3241,
+	1492, 2974, 2123, 2863, 1764, 1492, 2986, 2030, 684, 2616,
+	1764, 3957, 3590, 3263, 1489, 3260, 1490, 1491, 3264, 3259,
+	1489, 1492, 1490, 1491, 684, 1489, 685, 1490, 1491, 3261,
+	2413, 684, 2861, 1764, 3262, 3579, 1489, 1065, 1490, 1491,
+	2056, 2057, 684, 684, 684, 684, 684, 684, 684, 1492,
+	3627, 2836, 1764, 2676, 1489, 2072, 1490, 1491, 2654, 1781,
+	1489, 3219, 1490, 1491, 2813, 1764, 1489, 1492, 1490, 1491,
+	2805, 1764, 1492, 2400, 2796, 1764, 2624, 2625, 3231, 3233,
+	4035, 2627, 3218, 2653, 1492, 2655, 2842, 3234, 1066, 1489,
+	2628, 1490, 1491, 4212, 2658, 1492, 2659, 2794, 1764, 3564,
+	748, 1492, 2661, 3628, 3629, 3630, 3759, 3563, 1489, 2712,
+	1490, 1491, 2830, 2781, 1764, 3761, 3567, 3265, 2874, 2927,
+	2928, 1489, 1492, 1490, 1491, 3228, 2020, 1489, 1945, 1490,
+	1491, 1489, 1068, 1490, 1491, 2153, 2877, 1050, 1034, 2151,
+	1069, 2779, 1764, 3302, 2957, 1492, 2978, 2608, 2607, 1489,
+	2606, 1490, 1491, 2605, 1489, 1077, 1490, 1491, 2604, 2777,
+	1764, 2199, 2915, 2916, 2775, 1764, 2603, 2875, 2602, 1076,
+	1489, 2440, 1490, 1491, 1050, 2935, 2773, 1764, 2200, 3397,
+	1492, 1946, 1947, 1948, 3746, 1492, 3745, 2771, 1764, 1492,
+	2119, 2117, 2118, 2769, 1764, 2878, 1191, 2880, 1489, 1492,
+	1490, 1491, 1454, 1492, 1190, 2973, 2895, 1492, 2122, 3056,
+	2914, 3013, 103, 131, 2767, 1764, 1489, 3569, 1490, 1491,
+	105, 1489, 104, 1490, 1491, 2923, 2926, 2927, 2928, 2924,
+	4247, 2925, 2929, 1489, 1492, 1490, 1491, 2765, 1764, 3744,
+	1732, 2990, 2865, 2904, 1489, 684, 1490, 1491, 2619, 42,
+	1489, 2933, 1490, 1491, 1492, 2424, 2425, 4152, 2932, 4054,
+	3951, 2934, 3301, 2885, 1492, 2931, 1775, 2960, 2962, 2893,
+	1492, 1489, 3593, 1490, 1491, 1492, 1725, 2763, 1764, 2953,
+	2907, 2761, 1764, 2890, 1492, 2406, 110, 3547, 1492, 3011,
+	2644, 2759, 1764, 2937, 1489, 3540, 1490, 1491, 103, 2757,
+	1764, 2077, 1492, 2941, 105, 1538, 3217, 2944, 104, 1492,
+	4020, 2076, 2506, 2951, 3216, 1492, 4019, 3999, 2954, 1492,
+	2194, 111, 2976, 1538, 3022, 2195, 3536, 2979, 2980, 1489,
+	3767, 1490, 1491, 3765, 1489, 2965, 1490, 1491, 1489, 3764,
+	1490, 1491, 3757, 3637, 3568, 3566, 2755, 1764, 1489, 1492,
+	1490, 1491, 1489, 2975, 1490, 1491, 1489, 4053, 1490, 1491,
+	1492, 3333, 3502, 2257, 1492, 2983, 2541, 3498, 2987, 2988,
+	2989, 2984, 1492, 1892, 1075, 3756, 2753, 1764, 112, 3019,
+	2751, 1764, 3557, 1489, 1897, 1490, 1491, 4234, 2910, 111,
+	3730, 3066, 3067, 2889, 2749, 1764, 1492, 3120, 3008, 3009,
+	1492, 2747, 1764, 1489, 1492, 1490, 1491, 2742, 1764, 4235,
+	4234, 2738, 1764, 1489, 3018, 1490, 1491, 112, 3, 1489,
+	2702, 1490, 1491, 2392, 1489, 1798, 1490, 1491, 111, 1790,
+	110, 116, 117, 1489, 1492, 1490, 1491, 1489, 1492, 1490,
+	1491, 2736, 1764, 2340, 1492, 4235, 99, 3045, 4041, 3602,
+	3083, 1489, 3434, 1490, 1491, 1, 2729, 1764, 1489, 2030,
+	1490, 1491, 3064, 3048, 1489, 3928, 1490, 1491, 1489, 2091,
+	1490, 1491, 10, 2372, 1042, 1457, 3101, 3102, 3103, 3104,
+	3105, 3106, 3107, 3108, 3109, 3110, 1456, 3606, 2727, 1764,
+	1765, 2379, 2089, 3641, 4164, 9, 3118, 2969, 1489, 2090,
+	1490, 1491, 8, 701, 1976, 2382, 1492, 1730, 3084, 1489,
+	4205, 1490, 1491, 1489, 112, 1490, 1491, 4160, 4161, 3020,
+	1081, 1489, 1989, 1490, 1491, 111, 3433, 110, 1979, 3669,
+	3425, 2404, 1726, 2308, 3952, 105, 3423, 3336, 1492, 1060,
+	2547, 3635, 2504, 1143, 156, 1489, 1492, 1490, 1491, 1489,
+	1492, 1490, 1491, 1489, 2462, 1490, 1491, 2463, 3122, 4129,
+	120, 684, 3178, 1101, 3054, 119, 1146, 3055, 2030, 684,
+	1254, 684, 2542, 684, 2449, 3659, 2958, 2471, 1492, 2251,
+	1823, 1821, 1822, 1489, 1820, 1490, 1491, 1489, 3065, 1490,
+	1491, 1825, 1824, 1489, 4101, 1490, 1491, 2998, 2859, 3405,
+	2703, 3196, 3503, 2082, 738, 3185, 2930, 732, 194, 1812,
+	3187, 1791, 2923, 2926, 2927, 2928, 2924, 3068, 2925, 2929,
+	2440, 2075, 3585, 3586, 3111, 3085, 1492, 1185, 691, 3310,
+	2858, 2580, 697, 2343, 1542, 2343, 3158, 2345, 2854, 2345,
+	2070, 3215, 2853, 2518, 3248, 2945, 87, 1095, 1087, 2440,
+	2440, 2440, 2440, 2440, 2393, 1489, 2526, 1490, 1491, 2334,
+	2335, 2336, 2337, 2338, 2879, 1094, 3196, 3929, 3249, 2440,
+	2852, 3186, 2440, 3188, 3561, 1492, 2359, 3253, 3227, 2362,
+	2363, 3195, 3168, 3169, 3170, 3171, 3172, 1489, 2031, 1490,
+	1491, 3270, 3229, 2897, 1492, 1489, 3232, 1490, 1491, 1489,
+	3223, 1490, 1491, 3207, 3213, 1492, 3225, 2442, 4034, 3758,
+	1492, 4114, 2955, 1787, 3523, 2380, 3220, 2675, 2851, 3222,
+	1492, 2189, 1532, 763, 3235, 3236, 2439, 1489, 1492, 1490,
+	1491, 934, 1773, 1053, 3725, 3353, 2442, 2442, 2442, 2442,
+	2442, 2109, 1055, 1492, 761, 3361, 3252, 3254, 760, 3272,
+	3257, 1054, 3273, 3266, 3255, 3256, 2442, 3258, 106, 2442,
+	107, 3208, 3210, 3212, 758, 3274, 2881, 2850, 3280, 2911,
+	3221, 1496, 1495, 969, 684, 1489, 2869, 1490, 1491, 1799,
+	3312, 684, 3313, 3311, 1492, 2922, 2849, 2920, 3314, 3315,
+	2919, 2617, 684, 684, 2447, 3587, 684, 2840, 2620, 3583,
+	4156, 2441, 2839, 2437, 3362, 2888, 920, 919, 684, 3366,
+	770, 762, 2838, 3365, 2506, 684, 3238, 1492, 3355, 752,
+	2837, 3334, 983, 918, 1489, 3372, 1490, 1491, 917, 3363,
+	3364, 1492, 3028, 3378, 3030, 2834, 1492, 2956, 3374, 1473,
+	1492, 684, 3393, 1489, 3392, 1490, 1491, 1749, 2631, 1492,
+	3390, 1752, 2401, 1114, 1489, 3402, 1490, 1491, 3244, 1489,
+	4060, 1490, 1491, 3244, 2643, 3431, 1748, 4067, 3400, 1489,
+	3344, 1490, 1491, 3653, 3325, 3004, 2829, 1489, 3410, 1490,
+	1491, 2534, 69, 46, 3426, 3427, 3428, 3429, 3430, 4029,
+	3407, 3408, 1489, 3409, 1490, 1491, 3411, 4098, 3413, 912,
+	3415, 909, 3727, 3728, 3729, 3181, 3182, 4080, 4081, 2822,
+	908, 4082, 2246, 1467, 1464, 4178, 2084, 98, 36, 35,
+	1545, 34, 2662, 2821, 1545, 33, 2667, 1538, 2820, 2030,
+	32, 26, 2819, 1489, 25, 1490, 1491, 24, 23, 22,
+	3548, 2818, 3550, 29, 19, 21, 20, 18, 3335, 2670,
+	3347, 2671, 3518, 4200, 4246, 125, 55, 2679, 52, 3522,
+	50, 2681, 2682, 133, 132, 53, 1489, 49, 1490, 1491,
 	2688, 2689, 2690, 2691, 2692, 2693, 2694, 2695, 2696, 2697,
-	38, 2699, 37, 28, 27, 40, 4, 1489, 2991, 1490,
-	1491, 2536, 0, 0, 3401, 3247, 0, 0, 0, 0,
-	0, 0, 2440, 0, 2705, 2706, 2707, 2708, 0, 2710,
-	2711, 3549, 2713, 3551, 0, 3600, 2715, 0, 3565, 0,
-	2720, 2721, 3558, 2722, 0, 0, 2725, 2726, 2728, 2730,
+	1489, 2699, 1490, 1491, 1228, 1489, 47, 1490, 1491, 1489,
+	96, 1490, 1491, 31, 3401, 30, 3247, 17, 1489, 16,
+	1490, 1491, 2440, 15, 2705, 2706, 2707, 2708, 14, 2710,
+	2711, 3549, 2713, 3551, 13, 3600, 2715, 3553, 3565, 12,
+	2720, 2721, 11, 2722, 7, 3558, 2725, 2726, 2728, 2730,
 	2731, 2732, 2733, 2734, 2735, 2737, 2739, 2740, 2741, 2743,
 	1492, 2745, 2746, 2748, 2750, 2752, 2754, 2756, 2758, 2760,
 	2762, 2764, 2766, 2768, 2770, 2772, 2774, 2776, 2778, 2780,
-	2782, 2783, 2784, 3356, 2786, 3592, 2788, 3595, 2790, 2791,
-	3594, 2793, 2795, 2797, 3362, 3366, 3570, 2800, 3601, 2442,
-	3589, 2804, 3553, 0, 0, 2809, 2810, 2811, 2812, 3365,
-	1492, 3618, 0, 3620, 0, 1492, 0, 0, 2823, 2824,
-	2825, 2826, 2827, 2828, 3555, 1492, 2832, 2833, 3663, 3664,
-	0, 0, 0, 0, 2835, 0, 1492, 3395, 3396, 2841,
-	3612, 3613, 1492, 0, 2844, 2845, 2846, 2847, 2848, 0,
-	0, 0, 2815, 0, 1492, 2855, 2856, 3582, 2857, 0,
-	0, 2860, 2862, 2404, 1492, 2864, 3525, 0, 3527, 3528,
-	3529, 1492, 684, 0, 0, 2876, 3596, 3597, 0, 0,
-	1976, 0, 0, 1492, 0, 0, 0, 1492, 0, 0,
-	0, 3665, 3646, 0, 0, 2894, 3650, 3651, 3652, 0,
-	1492, 0, 2814, 0, 1492, 0, 2683, 2808, 0, 1489,
-	0, 1490, 1491, 0, 0, 0, 3681, 2807, 0, 0,
-	1492, 0, 0, 2698, 0, 0, 0, 0, 2806, 0,
-	0, 684, 0, 0, 2803, 0, 684, 1492, 0, 0,
-	0, 1492, 0, 0, 0, 3692, 2802, 0, 1492, 0,
-	0, 0, 0, 0, 0, 0, 2801, 0, 0, 1489,
-	0, 1490, 1491, 2799, 1489, 0, 1490, 1491, 0, 0,
-	1492, 0, 0, 0, 1489, 2792, 1490, 1491, 1492, 2789,
-	3733, 0, 3734, 3735, 3736, 1489, 0, 1490, 1491, 0,
-	0, 1489, 2787, 1490, 1491, 0, 2785, 3743, 0, 0,
-	3750, 0, 3752, 1489, 0, 1490, 1491, 0, 0, 3723,
-	1492, 684, 2744, 1489, 0, 1490, 1491, 0, 0, 0,
-	1489, 0, 1490, 1491, 0, 3248, 0, 3753, 87, 2724,
-	3248, 1492, 1489, 2723, 1490, 1491, 1489, 0, 1490, 1491,
-	2719, 0, 0, 0, 0, 2153, 0, 0, 0, 1489,
-	0, 1490, 1491, 1489, 0, 1490, 1491, 2151, 1492, 0,
-	3783, 3754, 2717, 3762, 1538, 3763, 0, 3775, 0, 1489,
-	2709, 1490, 1491, 0, 3773, 3686, 3772, 684, 684, 684,
-	684, 684, 684, 3770, 0, 0, 1489, 0, 1490, 1491,
-	1489, 0, 1490, 1491, 0, 0, 3935, 1489, 0, 1490,
-	1491, 0, 2680, 3787, 0, 42, 684, 684, 3642, 3643,
-	0, 0, 0, 0, 0, 0, 0, 0, 2380, 1489,
-	0, 1490, 1491, 2674, 0, 0, 0, 1489, 0, 1490,
-	1491, 684, 0, 0, 0, 3927, 3926, 2923, 2926, 2927,
-	2928, 2924, 0, 2925, 2929, 0, 3954, 3585, 3586, 3925,
-	2669, 3942, 3947, 3946, 0, 0, 0, 0, 0, 1489,
-	0, 1490, 1491, 0, 0, 0, 0, 0, 3096, 3097,
-	3098, 3099, 3100, 3993, 2153, 3994, 0, 3777, 0, 0,
-	1489, 0, 1490, 1491, 0, 0, 2151, 0, 3115, 3997,
-	3751, 0, 0, 3937, 3938, 3939, 0, 0, 3784, 3785,
-	0, 0, 0, 0, 0, 0, 0, 1489, 0, 1490,
-	1491, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 4000, 0, 4042, 3248, 4003, 0, 3779, 0,
+	2782, 2783, 2784, 3356, 2786, 3592, 2788, 3594, 2790, 2791,
+	3589, 2793, 2795, 2797, 3362, 3570, 1492, 2800, 3601, 3366,
+	1492, 2804, 3595, 3365, 1492, 2809, 2810, 2811, 2812, 2442,
+	3395, 3396, 1492, 6, 39, 3618, 1492, 3620, 2823, 2824,
+	2825, 2826, 2827, 2828, 3555, 1492, 2832, 2833, 38, 3612,
+	3613, 37, 28, 27, 2835, 1492, 40, 4, 2991, 2841,
+	1492, 2536, 0, 0, 2844, 2845, 2846, 2847, 2848, 0,
+	0, 0, 2817, 0, 0, 2855, 2856, 3582, 2857, 0,
+	0, 2860, 2862, 2404, 0, 2864, 3525, 1492, 3527, 3528,
+	3529, 0, 684, 0, 0, 2876, 3596, 3597, 3663, 3664,
+	1976, 3646, 0, 1492, 0, 3650, 3651, 3652, 2816, 0,
+	0, 3665, 2815, 1492, 0, 2894, 2814, 0, 1492, 0,
+	0, 0, 1492, 0, 2808, 2683, 0, 0, 2807, 1489,
+	0, 1490, 1491, 0, 0, 0, 0, 2806, 1492, 0,
+	3681, 0, 2698, 0, 0, 0, 0, 2803, 0, 0,
+	0, 684, 2802, 0, 1492, 0, 684, 0, 0, 1492,
+	0, 0, 0, 0, 0, 1489, 3692, 1490, 1491, 1489,
+	0, 1490, 1491, 1489, 0, 1490, 1491, 0, 0, 2801,
+	0, 1489, 0, 1490, 1491, 1489, 0, 1490, 1491, 1492,
+	0, 0, 0, 0, 1489, 2799, 1490, 1491, 3733, 0,
+	3734, 3735, 3736, 0, 1489, 2792, 1490, 1491, 0, 1489,
+	2789, 1490, 1491, 0, 2787, 0, 0, 3743, 0, 0,
+	3750, 0, 3752, 0, 0, 1492, 0, 0, 0, 3723,
+	2785, 684, 1492, 0, 0, 0, 1489, 0, 1490, 1491,
+	0, 0, 0, 0, 0, 3248, 2744, 3753, 87, 0,
+	3248, 2724, 1489, 0, 1490, 1491, 0, 0, 0, 0,
+	0, 1492, 1489, 0, 1490, 1491, 0, 1489, 0, 1490,
+	1491, 1489, 1492, 1490, 1491, 0, 2153, 3783, 3686, 0,
+	2151, 2723, 3754, 1492, 1538, 3763, 3762, 1489, 1492, 1490,
+	1491, 0, 0, 3773, 3770, 3772, 3775, 684, 684, 684,
+	684, 684, 684, 1489, 0, 1490, 1491, 0, 1489, 0,
+	1490, 1491, 0, 0, 0, 0, 3935, 2719, 0, 0,
+	0, 0, 3787, 0, 2717, 0, 684, 684, 3642, 3643,
+	0, 0, 0, 0, 0, 42, 0, 2380, 1489, 0,
+	1490, 1491, 0, 0, 0, 0, 0, 0, 0, 0,
+	3926, 684, 0, 2709, 3927, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 2680, 0, 3954, 0, 0, 3925,
+	3942, 3947, 3946, 0, 1489, 2674, 1490, 1491, 0, 0,
+	2669, 1489, 0, 1490, 1491, 0, 0, 0, 3096, 3097,
+	3098, 3099, 3100, 3993, 3994, 0, 0, 3777, 0, 0,
+	0, 3751, 3937, 3938, 3939, 2153, 3997, 0, 3115, 2151,
+	1489, 0, 1490, 1491, 0, 0, 0, 0, 3784, 3785,
+	0, 1489, 0, 1490, 1491, 0, 0, 0, 0, 0,
+	0, 0, 1489, 0, 1490, 1491, 0, 1489, 0, 1490,
+	1491, 0, 4000, 0, 4042, 3248, 4003, 0, 3779, 0,
 	0, 0, 0, 0, 0, 0, 0, 3244, 0, 1563,
 	1564, 1565, 1566, 1567, 1568, 1569, 1570, 1571, 1572, 1573,
 	1574, 1575, 1576, 1577, 1578, 1579, 1580, 1581, 1583, 1584,
@@ -2099,149 +2099,149 @@ var yyAct = [...]int{
 	1666, 1667, 1668, 1669, 1670, 1671, 1672, 1673, 1674, 1675,
 	1676, 1677, 1683, 1684, 1685, 1686, 1700, 1701, 1702, 1703,
 	1704, 1705, 1706, 1707, 1708, 1709, 1710, 1711, 1712, 1713,
-	750, 3998, 4043, 4027, 4026, 0, 3247, 3086, 1081, 0,
-	684, 3247, 0, 4017, 4061, 0, 0, 0, 0, 0,
-	4023, 0, 4025, 0, 0, 0, 0, 0, 0, 0,
-	3250, 0, 87, 1538, 0, 0, 0, 4045, 1538, 684,
+	750, 3998, 4043, 4027, 4017, 4026, 3086, 3247, 1081, 0,
+	684, 4023, 3247, 4025, 4061, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	3250, 0, 87, 1538, 0, 0, 4046, 0, 1538, 684,
 	684, 684, 684, 684, 1754, 3930, 0, 0, 3268, 0,
-	0, 3267, 0, 4046, 0, 1754, 0, 1976, 1762, 684,
-	4050, 1755, 684, 3275, 2030, 4066, 4063, 0, 0, 1762,
-	0, 4068, 1755, 0, 0, 0, 0, 3934, 0, 0,
-	0, 0, 0, 0, 0, 0, 2398, 2399, 1761, 1759,
-	1760, 1756, 0, 1757, 0, 0, 0, 1750, 1751, 1761,
-	1759, 1760, 1756, 0, 1757, 0, 0, 684, 0, 42,
-	0, 1074, 0, 0, 1080, 1080, 1758, 0, 0, 0,
-	0, 0, 0, 1538, 0, 0, 4086, 1758, 0, 4087,
-	4111, 0, 0, 684, 0, 87, 0, 4096, 0, 3160,
-	0, 3162, 0, 0, 0, 0, 0, 684, 0, 0,
-	0, 0, 4105, 0, 0, 0, 0, 3173, 3174, 3175,
-	3176, 0, 0, 0, 0, 0, 4117, 0, 684, 0,
-	0, 684, 0, 4142, 4115, 4128, 3399, 3954, 4131, 4120,
-	4125, 4122, 0, 4121, 4119, 4124, 4123, 4047, 0, 0,
+	0, 3267, 1754, 0, 0, 4066, 4045, 1976, 1762, 684,
+	4050, 1755, 684, 3275, 2030, 4063, 1762, 0, 0, 1755,
+	0, 0, 0, 0, 0, 0, 0, 0, 3934, 0,
+	4068, 0, 0, 0, 0, 0, 2398, 2399, 1761, 1759,
+	1760, 1756, 0, 1757, 1750, 1751, 1761, 1759, 1760, 1756,
+	0, 1757, 0, 0, 0, 0, 0, 684, 0, 0,
+	0, 1074, 0, 0, 1080, 1080, 1758, 0, 0, 42,
+	0, 0, 4086, 1538, 1758, 4087, 0, 0, 0, 0,
+	4111, 0, 0, 684, 0, 87, 0, 0, 3160, 0,
+	3162, 0, 0, 0, 0, 0, 0, 684, 4096, 0,
+	0, 4105, 0, 0, 0, 0, 3173, 3174, 3175, 3176,
+	0, 0, 0, 0, 0, 0, 4117, 0, 684, 0,
+	0, 684, 0, 0, 0, 4128, 3399, 3954, 4131, 4120,
+	4125, 4122, 4121, 4115, 4119, 4124, 4123, 4047, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 3416, 3417,
-	0, 3418, 3420, 3422, 4150, 0, 3247, 0, 0, 0,
-	0, 0, 42, 0, 4173, 4155, 4163, 4168, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 3435,
-	4142, 4183, 0, 4194, 3438, 0, 3440, 3441, 3442, 3444,
+	0, 3418, 3420, 3422, 4150, 0, 4174, 3247, 0, 0,
+	0, 0, 0, 0, 0, 4155, 0, 4163, 4168, 0,
+	0, 0, 42, 4142, 4182, 0, 0, 0, 0, 3435,
+	0, 0, 0, 4195, 3438, 4184, 3440, 3441, 3442, 3444,
 	3445, 3446, 3447, 3448, 3449, 3450, 3451, 3452, 3453, 3454,
 	3455, 3456, 3458, 3460, 3462, 3464, 3466, 3468, 3470, 3472,
 	3474, 3476, 3478, 3480, 3482, 3484, 3486, 3488, 3489, 3491,
-	3492, 3493, 3495, 4198, 4217, 3497, 4214, 3499, 3500, 3501,
-	2031, 2153, 3505, 3506, 3507, 3508, 3509, 3510, 3511, 3512,
-	3513, 3514, 3515, 2151, 4224, 4230, 4227, 4228, 4223, 4226,
-	4193, 3521, 4213, 4107, 4181, 3526, 192, 4142, 4238, 3530,
-	3531, 0, 3532, 3534, 0, 3537, 3539, 4246, 3541, 3542,
-	3543, 3544, 4252, 4254, 4112, 0, 0, 4052, 3552, 131,
-	192, 0, 0, 0, 0, 0, 684, 3244, 0, 2153,
-	0, 2997, 0, 0, 4262, 174, 0, 4263, 4264, 0,
-	3994, 2151, 0, 131, 4261, 153, 0, 0, 0, 0,
-	0, 4071, 0, 3576, 3577, 4059, 0, 3581, 0, 174,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 2952, 684, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 164, 0, 171, 0, 0, 172, 152,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 684, 0, 0, 0, 0, 0, 0, 0, 171,
-	0, 0, 172, 0, 191, 0, 0, 0, 0, 0,
+	3492, 3493, 3495, 4219, 4199, 3497, 2031, 3499, 3500, 3501,
+	4142, 4215, 3505, 3506, 3507, 3508, 3509, 3510, 3511, 3512,
+	3513, 3514, 3515, 2153, 4229, 4232, 4225, 2151, 4228, 4226,
+	4230, 3521, 4216, 4194, 0, 3526, 0, 4112, 192, 3530,
+	3531, 0, 3532, 3534, 4240, 3537, 3539, 4248, 3541, 3542,
+	3543, 3544, 4107, 4256, 4254, 0, 0, 4052, 3552, 0,
+	0, 131, 0, 153, 0, 0, 684, 3244, 0, 0,
+	0, 0, 0, 0, 0, 4264, 0, 174, 0, 4265,
+	4266, 3994, 2153, 4263, 0, 0, 2151, 0, 0, 4142,
+	0, 4071, 0, 3576, 3577, 0, 4059, 3581, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 1032,
+	0, 164, 2347, 0, 0, 1033, 0, 152, 0, 0,
+	0, 0, 684, 0, 0, 2152, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 171, 0, 0,
+	172, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 684, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 140, 141, 163, 162, 191, 0, 0, 0,
 	0, 684, 0, 684, 684, 684, 0, 0, 4106, 0,
-	4189, 0, 0, 0, 1900, 1901, 163, 162, 191, 0,
+	4190, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 3657, 0, 989, 990, 991, 992, 993, 994,
+	995, 996, 997, 998, 999, 1000, 1001, 1002, 1003, 1004,
+	1005, 1006, 1007, 1008, 1009, 1010, 1011, 1012, 1013, 1014,
+	1015, 1016, 1017, 1018, 1019, 1020, 1021, 1022, 1023, 1024,
+	1025, 1026, 1027, 1028, 1029, 1030, 0, 3676, 0, 0,
+	3680, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 157, 138,
+	160, 145, 137, 0, 158, 159, 0, 0, 0, 0,
+	0, 175, 0, 0, 3693, 0, 0, 0, 0, 0,
+	181, 146, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 149, 147, 142, 143, 144,
+	148, 0, 4213, 0, 0, 1726, 0, 139, 0, 0,
+	0, 0, 0, 0, 0, 0, 150, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 3657, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 3716, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 192, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 3724, 1510, 0, 0, 0, 0, 0, 3731, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 86, 44, 45, 88, 0, 1511, 1512, 1513, 1514,
+	1515, 1516, 1517, 1519, 1518, 1520, 1521, 0, 0, 0,
+	92, 0, 0, 1976, 48, 76, 77, 0, 74, 78,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 166,
+	75, 0, 1538, 0, 0, 0, 1976, 0, 0, 0,
+	0, 0, 97, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 62, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 95, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 131, 0, 0, 3676, 0, 0,
-	3680, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	174, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 175,
-	0, 0, 0, 0, 3693, 0, 0, 0, 181, 0,
-	157, 1902, 160, 0, 1899, 0, 158, 159, 0, 0,
-	0, 0, 0, 175, 0, 0, 0, 0, 0, 0,
-	0, 4211, 181, 0, 0, 0, 1726, 0, 0, 0,
-	171, 0, 0, 172, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 3716, 191,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 3724, 0, 0, 0, 0, 0, 0, 3731, 0,
-	0, 0, 0, 0, 0, 0, 0, 86, 44, 45,
-	88, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 92, 0, 0, 0,
-	48, 76, 77, 1976, 74, 78, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 75, 166, 0, 0,
-	0, 0, 1538, 0, 0, 0, 1976, 0, 97, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 166, 0, 0, 0, 0, 0, 0, 62, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	95, 0, 0, 0, 175, 0, 0, 0, 0, 0,
-	0, 0, 0, 181, 0, 0, 0, 0, 0, 0,
 	0, 0, 1493, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 3943, 0,
 	0, 0, 0, 1976, 0, 0, 0, 3950, 0, 0,
-	83, 0, 0, 1551, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 1551, 83, 161, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 3960, 3961, 3962,
-	0, 3964, 0, 3965, 3966, 0, 0, 161, 0, 3969,
+	0, 3964, 0, 3965, 3966, 0, 0, 0, 0, 3969,
 	3970, 3971, 3972, 3973, 3974, 3975, 3976, 3977, 3978, 3979,
 	3980, 3981, 3982, 3983, 3984, 3985, 3986, 3987, 3988, 3989,
-	3990, 0, 3992, 3995, 0, 0, 3714, 0, 0, 0,
+	3990, 0, 3992, 3995, 0, 3714, 0, 0, 2182, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 4004, 4005,
 	4006, 4007, 4008, 4010, 4011, 4013, 4015, 4016, 4018, 0,
 	0, 0, 4022, 0, 0, 0, 4024, 0, 0, 0,
-	0, 0, 166, 0, 0, 51, 54, 57, 56, 59,
-	0, 73, 0, 0, 82, 79, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 4051, 0, 0, 0, 0, 0, 0, 61, 91,
-	90, 0, 0, 71, 72, 58, 154, 0, 0, 155,
-	0, 80, 81, 0, 0, 0, 167, 0, 0, 0,
-	0, 0, 0, 179, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	167, 0, 0, 0, 0, 0, 0, 179, 0, 0,
-	0, 0, 0, 0, 0, 63, 64, 0, 65, 66,
-	67, 68, 0, 0, 187, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 187, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 51,
+	54, 57, 56, 59, 1032, 73, 0, 0, 82, 79,
+	1033, 0, 0, 0, 154, 0, 0, 155, 0, 0,
+	2152, 4051, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 61, 91, 90, 0, 0, 71, 72, 58,
+	0, 0, 0, 0, 0, 80, 81, 0, 167, 0,
+	0, 0, 0, 0, 0, 179, 0, 2174, 2163, 2164,
+	2165, 2166, 2176, 2167, 2168, 2169, 2181, 2177, 2170, 2171,
+	2178, 2179, 2180, 2172, 2173, 2175, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 63,
+	64, 0, 65, 66, 67, 68, 187, 0, 0, 989,
+	990, 991, 992, 993, 994, 995, 996, 997, 998, 999,
+	1000, 1001, 1002, 1003, 1004, 1005, 1006, 1007, 1008, 1009,
+	1010, 1011, 1012, 1013, 1014, 1015, 1016, 1017, 1018, 1019,
+	1020, 1021, 1022, 1023, 1024, 1025, 1026, 1027, 1028, 1029,
+	1030, 0, 0, 168, 173, 170, 176, 177, 178, 180,
+	182, 183, 184, 185, 0, 0, 60, 0, 0, 186,
+	188, 189, 190, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 1976, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 168, 173, 170, 176, 177, 178, 180, 182, 183,
-	184, 185, 60, 0, 0, 0, 0, 186, 188, 189,
-	190, 0, 0, 0, 0, 168, 173, 170, 176, 177,
-	178, 180, 182, 183, 184, 185, 0, 0, 1976, 0,
-	0, 186, 188, 189, 190, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 1789, 684, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 4033, 0, 0, 0, 0,
+	0, 0, 0, 0, 4033, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 4076, 0,
-	0, 167, 0, 0, 1878, 0, 0, 0, 179, 0,
-	0, 0, 89, 0, 4197, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 1878, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 4198, 0, 89, 0, 0, 0,
 	0, 0, 4091, 1841, 0, 0, 0, 0, 4094, 0,
 	4095, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 187,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 1538, 4110, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 965, 0, 4136,
 	4137, 4130, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 4144, 4146, 4148, 168, 173, 170, 176,
-	177, 178, 180, 182, 183, 184, 185, 0, 0, 0,
-	0, 4154, 186, 188, 189, 190, 0, 0, 0, 0,
-	0, 1976, 94, 4176, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 4144, 4146, 4148, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 4154, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 1976, 0, 4177, 0, 0, 94, 0, 0, 0,
 	0, 0, 2036, 197, 0, 0, 197, 0, 0, 0,
 	736, 0, 0, 0, 0, 742, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 197, 0, 0, 0,
-	0, 4195, 0, 1726, 0, 0, 0, 0, 0, 0,
+	0, 4196, 1726, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 197, 0, 0, 0, 0, 0, 0, 0,
-	1828, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 2030, 0, 0, 0, 4218, 4220, 4222, 0, 742,
-	197, 742, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 4075,
-	0, 0, 0, 0, 0, 0, 0, 4085, 4243, 0,
-	0, 0, 0, 70, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 4255, 4256, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 964, 0, 0, 1842, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 1726,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	1828, 0, 0, 192, 0, 0, 0, 0, 0, 0,
+	0, 0, 2030, 0, 2997, 0, 4220, 4222, 4224, 742,
+	197, 742, 0, 0, 0, 0, 131, 0, 153, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 4075, 0,
+	0, 0, 174, 0, 0, 0, 4085, 0, 0, 0,
+	4245, 0, 0, 0, 0, 0, 0, 70, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 4257, 4258,
+	0, 0, 0, 0, 0, 0, 164, 0, 0, 0,
+	0, 964, 152, 0, 1842, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 171, 0, 0, 172, 0, 0, 1726, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 1900, 1901, 163,
+	162, 191, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 719, 0, 0, 0, 0, 0, 741,
 	1855, 1858, 1859, 1860, 1861, 1862, 1863, 0, 1864, 1865,
 	1867, 1868, 1866, 1869, 1870, 1843, 1844, 1845, 1846, 1826,
@@ -2251,9 +2251,9 @@ var yyAct = [...]int{
 	2105, 2106, 2107, 741, 0, 741, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 2120, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	2159, 2160, 0, 0, 0, 0, 2183, 0, 0, 2187,
+	0, 0, 0, 157, 1902, 160, 0, 1899, 0, 158,
+	159, 0, 0, 0, 0, 0, 175, 0, 0, 0,
+	2159, 2160, 0, 0, 0, 181, 2183, 0, 0, 2187,
 	2188, 0, 0, 0, 2193, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 2205,
 	2206, 2207, 2208, 2209, 2210, 2211, 2212, 2213, 2214, 0,
@@ -2266,55 +2266,55 @@ var yyAct = [...]int{
 	2298, 2299, 2300, 2301, 2302, 2303, 2304, 2305, 2306, 2307,
 	2311, 2312, 2313, 2314, 2315, 2316, 2317, 2318, 2319, 2320,
 	2321, 2322, 2323, 2324, 2325, 2326, 2327, 2328, 2329, 2330,
-	2331, 2332, 2333, 0, 0, 0, 0, 0, 2339, 0,
+	2331, 2332, 2333, 0, 166, 0, 0, 0, 2339, 0,
 	2341, 0, 2348, 2349, 2350, 2351, 2352, 2353, 0, 0,
 	0, 0, 0, 1857, 0, 0, 0, 0, 0, 0,
 	0, 2364, 2365, 2366, 2367, 2368, 2369, 2370, 2371, 0,
 	2373, 2374, 2375, 2376, 2377, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	1080, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 192, 0, 0, 0, 0, 0,
+	0, 1841, 95, 0, 0, 1032, 0, 0, 0, 0,
+	970, 1033, 984, 985, 986, 971, 0, 0, 972, 973,
+	0, 974, 0, 0, 0, 0, 0, 0, 0, 0,
+	1080, 0, 0, 0, 0, 0, 0, 979, 0, 987,
+	988, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	161, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 2420, 2421, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 131, 0, 153,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 2459, 174, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 3367, 3368,
+	0, 0, 2459, 0, 0, 0, 0, 0, 0, 0,
+	989, 990, 991, 992, 993, 994, 995, 996, 997, 998,
+	999, 1000, 1001, 1002, 1003, 1004, 1005, 1006, 1007, 1008,
+	1009, 1010, 1011, 1012, 1013, 1014, 1015, 1016, 1017, 1018,
+	1019, 1020, 1021, 1022, 1023, 1024, 1025, 1026, 1027, 1028,
+	1029, 1030, 0, 0, 0, 0, 0, 0, 197, 0,
+	197, 0, 0, 0, 2502, 0, 0, 0, 1828, 154,
+	0, 0, 155, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 164, 0, 0,
-	0, 0, 0, 152, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 1032, 0, 197, 2347,
-	197, 0, 1033, 171, 2502, 0, 172, 0, 0, 0,
-	0, 0, 2152, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 140, 141,
-	163, 162, 191, 0, 0, 0, 0, 742, 0, 742,
-	742, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 3369, 0, 0, 0, 742, 0, 742,
+	742, 0, 0, 167, 0, 0, 0, 0, 0, 0,
+	179, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 742, 197, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	1537, 989, 990, 991, 992, 993, 994, 995, 996, 997,
-	998, 999, 1000, 1001, 1002, 1003, 1004, 1005, 1006, 1007,
-	1008, 1009, 1010, 1011, 1012, 1013, 1014, 1015, 1016, 1017,
-	1018, 1019, 1020, 1021, 1022, 1023, 1024, 1025, 1026, 1027,
-	1028, 1029, 1030, 0, 157, 138, 160, 145, 137, 0,
-	158, 159, 0, 0, 0, 0, 0, 175, 0, 0,
-	0, 0, 0, 0, 0, 0, 181, 146, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 149, 147, 142, 143, 144, 148, 0, 0, 0,
-	0, 0, 0, 139, 0, 0, 0, 0, 0, 0,
-	0, 0, 150, 0, 0, 0, 0, 0, 0, 0,
+	1537, 187, 1842, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 3370, 3371, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 168, 173,
+	170, 176, 177, 178, 180, 182, 183, 184, 185, 0,
+	0, 0, 0, 0, 186, 188, 189, 190, 1855, 1858,
+	1859, 1860, 1861, 1862, 1863, 0, 1864, 1865, 1867, 1868,
+	1866, 1869, 1870, 1843, 1844, 1845, 1846, 1826, 1827, 1856,
+	0, 1829, 0, 1830, 1831, 1832, 1833, 1834, 1835, 1836,
+	1837, 1838, 0, 0, 1839, 1847, 1848, 1849, 1850, 935,
+	1851, 1852, 1853, 1854, 0, 939, 1840, 0, 0, 936,
+	937, 0, 0, 0, 938, 940, 0, 0, 0, 0,
 	0, 741, 1448, 741, 741, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 741, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 1536, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 166, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -2324,10 +2324,10 @@ var yyAct = [...]int{
 	0, 0, 0, 197, 0, 0, 0, 742, 742, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 197, 1551, 0, 0,
-	0, 161, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 742, 0,
 	0, 197, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 742, 0, 0, 0, 0, 0, 0,
+	0, 1857, 0, 742, 0, 0, 0, 0, 0, 0,
 	197, 0, 0, 0, 742, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 742, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -2335,21 +2335,21 @@ var yyAct = [...]int{
 	0, 0, 0, 0, 0, 0, 0, 742, 0, 0,
 	1537, 742, 0, 0, 742, 742, 742, 742, 0, 742,
 	0, 742, 742, 0, 742, 742, 742, 742, 742, 742,
-	154, 0, 0, 155, 0, 0, 0, 1537, 742, 742,
+	0, 0, 0, 0, 0, 0, 0, 1537, 742, 742,
 	1537, 742, 1537, 197, 742, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 197, 167, 0, 0, 0, 0, 0,
-	0, 179, 0, 0, 0, 0, 742, 0, 197, 0,
+	0, 0, 0, 197, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 742, 0, 197, 0,
 	0, 741, 741, 0, 0, 0, 0, 0, 0, 742,
 	0, 0, 742, 1789, 197, 197, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 197, 187, 0, 0, 0, 0, 0, 197, 0,
+	0, 197, 0, 0, 0, 0, 0, 0, 197, 0,
 	0, 0, 741, 0, 0, 0, 0, 197, 197, 197,
 	197, 197, 197, 197, 197, 197, 742, 741, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 741, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 741, 168,
-	173, 170, 176, 177, 178, 180, 182, 183, 184, 185,
-	0, 0, 0, 0, 0, 186, 188, 189, 190, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 741, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 741, 0, 741, 0, 0, 0, 0, 0, 0,
 	0, 741, 0, 0, 1536, 741, 0, 0, 741, 741,
 	741, 741, 0, 741, 0, 741, 741, 0, 741, 741,
@@ -2403,7 +2403,7 @@ var yyAct = [...]int{
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 171, 0, 0, 172,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 1841, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 1900, 1901, 163, 162, 191, 0, 0, 0, 0,
 	741, 0, 0, 742, 0, 0, 0, 0, 0, 0,
 	742, 742, 742, 197, 0, 0, 0, 0, 0, 0,
@@ -2419,7 +2419,7 @@ var yyAct = [...]int{
 	175, 0, 0, 0, 0, 0, 0, 0, 0, 181,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 741,
 	0, 197, 0, 0, 0, 0, 0, 0, 197, 0,
-	0, 0, 0, 0, 0, 1828, 0, 0, 0, 197,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 197,
 	197, 0, 0, 197, 0, 197, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 197, 0, 0, 0, 0,
 	0, 0, 197, 0, 0, 0, 0, 0, 0, 0,
@@ -2427,19 +2427,19 @@ var yyAct = [...]int{
 	0, 0, 0, 0, 741, 741, 741, 0, 197, 0,
 	0, 0, 0, 0, 0, 197, 1229, 0, 1235, 0,
 	742, 0, 0, 0, 0, 741, 0, 0, 0, 0,
-	0, 741, 741, 0, 921, 741, 0, 741, 0, 1842,
+	0, 741, 741, 0, 921, 741, 0, 741, 0, 0,
 	0, 0, 0, 741, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 166, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 741, 3638,
 	1463, 0, 0, 741, 0, 0, 0, 741, 741, 0,
 	0, 0, 0, 0, 1537, 0, 2358, 0, 0, 0,
-	0, 0, 740, 0, 0, 1855, 1858, 1859, 1860, 1861,
-	1862, 1863, 3662, 1864, 1865, 1867, 1868, 1866, 1869, 1870,
-	1843, 1844, 1845, 1846, 1826, 1827, 1856, 0, 1829, 0,
-	1830, 1831, 1832, 1833, 1834, 1835, 1836, 1837, 1838, 0,
-	0, 1839, 1847, 1848, 1849, 1850, 0, 1851, 1852, 1853,
-	1854, 0, 0, 1840, 161, 0, 1105, 0, 1112, 0,
+	0, 0, 740, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 3662, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 161, 0, 1105, 0, 1112, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	3682, 0, 3683, 0, 3684, 0, 3685, 0, 0, 0,
 	0, 0, 0, 0, 3688, 3689, 0, 0, 0, 0,
@@ -2459,7 +2459,7 @@ var yyAct = [...]int{
 	0, 0, 0, 3771, 0, 0, 0, 197, 0, 0,
 	0, 0, 0, 0, 0, 0, 3780, 0, 742, 3782,
 	0, 0, 0, 0, 0, 187, 0, 0, 0, 0,
-	0, 3786, 0, 0, 742, 0, 0, 0, 1857, 0,
+	0, 3786, 0, 0, 742, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 3922, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 197, 0,
 	0, 0, 0, 197, 0, 0, 0, 0, 0, 0,
@@ -2510,18 +2510,18 @@ var yyAct = [...]int{
 	742, 0, 0, 0, 0, 0, 0, 0, 741, 0,
 	0, 0, 0, 0, 0, 0, 742, 0, 0, 0,
 	1537, 0, 0, 742, 742, 1537, 197, 197, 197, 197,
-	197, 0, 0, 0, 0, 0, 0, 4174, 197, 0,
+	197, 0, 0, 0, 0, 0, 0, 4175, 197, 0,
 	0, 0, 0, 0, 197, 0, 197, 0, 0, 197,
 	197, 197, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 4190, 0, 4191, 0,
-	4192, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 4191, 0, 4192, 0,
+	4193, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 197, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 742, 0, 0,
 	1537, 0, 0, 0, 0, 742, 0, 0, 0, 0,
 	197, 0, 0, 741, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 197, 741, 0, 0, 0, 0,
-	4241, 0, 4242, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 4243, 0, 4244, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 197, 0, 0, 197, 0,
 	0, 0, 0, 0, 0, 0, 741, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -2555,9 +2555,9 @@ var yyAct = [...]int{
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	741, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 1293, 0, 0, 0, 1032, 0, 742,
-	742, 742, 742, 1033, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 2152, 0, 0, 0, 0, 0, 2097,
+	0, 0, 0, 1293, 0, 0, 0, 0, 0, 742,
+	742, 742, 742, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 2097,
 	0, 0, 0, 0, 0, 0, 2592, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 2613, 2614, 0,
 	0, 2618, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -2565,36 +2565,36 @@ var yyAct = [...]int{
 	2626, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 2629, 0, 0, 0,
-	0, 3605, 989, 990, 991, 992, 993, 994, 995, 996,
-	997, 998, 999, 1000, 1001, 1002, 1003, 1004, 1005, 1006,
-	1007, 1008, 1009, 1010, 1011, 1012, 1013, 1014, 1015, 1016,
-	1017, 1018, 1019, 1020, 1021, 1022, 1023, 1024, 1025, 1026,
-	1027, 1028, 1029, 1030, 741, 741, 0, 0, 0, 0,
+	0, 3605, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 741, 741, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 1293, 1293, 0, 742, 0, 742, 0,
 	197, 0, 0, 0, 0, 0, 0, 0, 2085, 0,
 	0, 0, 0, 741, 741, 741, 741, 0, 0, 1537,
 	0, 0, 0, 197, 0, 0, 742, 0, 742, 0,
-	0, 0, 0, 95, 0, 0, 1032, 0, 0, 0,
-	0, 970, 1033, 984, 985, 986, 971, 0, 0, 972,
-	973, 0, 974, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 979, 2147,
-	987, 988, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 2147,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 742, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	197, 0, 0, 742, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 742, 0, 0, 3367,
-	3368, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 989, 990, 991, 992, 993, 994, 995, 996, 997,
-	998, 999, 1000, 1001, 1002, 1003, 1004, 1005, 1006, 1007,
-	1008, 1009, 1010, 1011, 1012, 1013, 1014, 1015, 1016, 1017,
-	1018, 1019, 1020, 1021, 1022, 1023, 1024, 1025, 1026, 1027,
-	1028, 1029, 1030, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 742, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	741, 0, 741, 0, 0, 0, 0, 0, 0, 0,
 	0, 742, 0, 0, 0, 0, 0, 0, 742, 0,
 	742, 0, 0, 1536, 0, 0, 0, 0, 0, 0,
-	741, 0, 741, 0, 3369, 0, 0, 0, 0, 0,
+	741, 0, 741, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 742,
 	0, 0, 0, 1293, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -2602,7 +2602,7 @@ var yyAct = [...]int{
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 741, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 2395, 0, 0, 0, 741, 0, 0,
-	0, 2936, 0, 0, 0, 3370, 3371, 0, 0, 0,
+	0, 2936, 0, 0, 0, 0, 0, 0, 0, 0,
 	741, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 2408, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -2611,8 +2611,8 @@ var yyAct = [...]int{
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 1105, 0, 0, 0, 2985, 0, 0, 742,
 	0, 0, 0, 0, 0, 741, 0, 0, 0, 0,
-	935, 0, 741, 0, 741, 197, 939, 0, 0, 0,
-	936, 937, 0, 0, 0, 938, 940, 0, 0, 0,
+	0, 0, 741, 0, 741, 197, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 742, 197, 0, 0, 0, 0, 0,
 	0, 0, 0, 741, 0, 0, 0, 0, 0, 0,
 	1112, 0, 0, 0, 0, 0, 0, 2523, 2524, 2525,
@@ -2635,9 +2635,9 @@ var yyAct = [...]int{
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 742,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 742, 0, 0, 0, 2634, 197, 0,
+	0, 0, 0, 0, 742, 0, 0, 2634, 0, 197,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 742, 0, 742, 0, 0, 0, 0, 0,
+	0, 0, 0, 742, 0, 742, 0, 0, 0, 0,
 	0, 0, 0, 741, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 741, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 1536, 741, 0, 741, 0, 0, 0,
@@ -2653,9 +2653,9 @@ var yyAct = [...]int{
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 741, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 741, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 741, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 741, 0, 741, 0,
+	0, 0, 0, 0, 0, 0, 0, 741, 0, 741,
 	0, 0, 3321, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 3359, 0,
@@ -2845,4512 +2845,4512 @@ var yyAct = [...]int{
 	0, 0, 0, 0, 0, 0, 4100, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	2408, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 400, 0, 0, 0, 1872,
-	0, 4158, 1431, 1415, 534, 0, 1357, 1434, 1325, 1344,
-	1444, 1347, 1350, 1394, 1303, 1372, 420, 1341, 1329, 1298,
-	1336, 1299, 1327, 1359, 273, 1324, 1417, 1376, 1433, 369,
-	270, 1305, 1296, 206, 511, 1330, 435, 1346, 205, 1396,
-	493, 255, 380, 377, 590, 285, 276, 272, 252, 320,
-	389, 432, 524, 426, 1440, 373, 1382, 0, 503, 405,
-	0, 0, 0, 1421, 1420, 1351, 1361, 1423, 1370, 1408,
-	1356, 1395, 1313, 1381, 1435, 1342, 1391, 1436, 326, 250,
-	328, 204, 417, 504, 289, 0, 0, 0, 0, 4132,
-	513, 966, 0, 0, 0, 0, 4133, 0, 0, 0,
-	0, 240, 0, 0, 247, 0, 0, 0, 354, 363,
-	362, 342, 343, 345, 347, 353, 360, 366, 339, 348,
-	1338, 1388, 616, 1430, 1339, 1390, 268, 324, 275, 267,
-	587, 1441, 1422, 1302, 1369, 1429, 1364, 603, 0, 0,
-	231, 1432, 1363, 0, 1393, 0, 1447, 1297, 1384, 0,
-	1300, 1304, 1443, 1427, 1333, 278, 0, 0, 0, 0,
-	0, 0, 0, 1360, 1371, 1405, 1409, 1354, 0, 0,
-	0, 0, 0, 0, 0, 0, 1331, 0, 1380, 0,
-	0, 0, 1309, 1301, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 1358, 0, 0, 0,
-	0, 1312, 0, 1332, 1406, 0, 1295, 300, 1306, 406,
-	260, 0, 459, 1413, 1426, 1355, 636, 1428, 1353, 1352,
-	1400, 1310, 1419, 1345, 368, 1308, 333, 199, 227, 0,
-	1343, 416, 467, 479, 1418, 1328, 1337, 256, 1335, 477,
-	430, 611, 235, 287, 464, 437, 475, 445, 290, 1379,
-	1398, 476, 375, 592, 455, 608, 637, 638, 266, 410,
-	622, 528, 630, 655, 228, 263, 424, 512, 614, 500,
-	401, 588, 589, 332, 499, 298, 203, 372, 643, 226,
-	485, 374, 244, 233, 594, 619, 302, 254, 292, 462,
-	650, 215, 523, 605, 241, 489, 0, 0, 658, 249,
-	510, 617, 606, 217, 601, 509, 397, 329, 330, 216,
-	0, 463, 271, 296, 0, 0, 261, 419, 596, 597,
-	259, 659, 230, 629, 222, 1307, 628, 412, 591, 602,
-	398, 386, 221, 600, 396, 385, 337, 358, 359, 283,
-	310, 452, 378, 453, 309, 311, 408, 407, 409, 209,
-	615, 633, 0, 210, 0, 505, 618, 660, 457, 214,
-	236, 237, 239, 1323, 282, 286, 294, 297, 306, 307,
-	316, 370, 423, 451, 447, 456, 1414, 585, 609, 623,
-	635, 641, 642, 644, 645, 646, 647, 648, 651, 649,
-	411, 314, 501, 336, 376, 1403, 1446, 429, 478, 242,
-	613, 502, 201, 1317, 1322, 1315, 0, 257, 258, 1385,
-	581, 1318, 1316, 1374, 1375, 1319, 1437, 1438, 1439, 1424,
-	661, 662, 663, 664, 665, 666, 667, 668, 669, 670,
-	671, 672, 673, 674, 675, 676, 677, 678, 656, 514,
-	520, 515, 516, 517, 518, 519, 0, 521, 1407, 1311,
-	0, 1320, 1321, 402, 1416, 598, 599, 679, 387, 492,
-	610, 338, 352, 355, 344, 364, 0, 365, 340, 341,
-	346, 349, 350, 351, 356, 357, 361, 367, 251, 212,
-	394, 403, 584, 315, 218, 219, 220, 530, 531, 532,
-	533, 626, 627, 631, 207, 468, 469, 470, 471, 295,
-	621, 312, 474, 473, 334, 335, 382, 454, 546, 548,
-	559, 563, 565, 567, 573, 576, 547, 549, 560, 564,
-	566, 568, 574, 577, 536, 538, 540, 542, 555, 554,
-	551, 579, 580, 557, 562, 541, 553, 558, 571, 578,
-	575, 535, 539, 543, 552, 570, 569, 550, 561, 572,
-	556, 544, 537, 545, 1378, 198, 223, 371, 1442, 460,
-	291, 657, 625, 490, 620, 208, 225, 1314, 265, 1326,
-	1334, 0, 1340, 1348, 1349, 1362, 1365, 1366, 1367, 1368,
-	1386, 1387, 1389, 1397, 1399, 1402, 1404, 1411, 1425, 1445,
-	200, 202, 211, 224, 234, 238, 245, 264, 279, 281,
-	288, 301, 313, 321, 322, 325, 331, 383, 390, 391,
-	392, 393, 413, 414, 415, 418, 421, 422, 425, 427,
-	428, 431, 436, 440, 441, 442, 444, 446, 448, 461,
-	466, 480, 481, 482, 483, 484, 487, 488, 494, 495,
-	496, 497, 498, 506, 507, 522, 593, 595, 612, 632,
-	639, 486, 388, 434, 458, 586, 304, 305, 449, 450,
-	317, 318, 653, 654, 303, 607, 640, 604, 652, 634,
-	443, 381, 1377, 1383, 384, 284, 308, 323, 1392, 624,
-	508, 229, 472, 293, 253, 1410, 1412, 213, 248, 232,
-	262, 277, 280, 327, 395, 404, 433, 439, 299, 274,
-	246, 465, 243, 491, 525, 526, 527, 529, 399, 269,
-	438, 1373, 1401, 379, 582, 583, 319, 400, 0, 0,
-	0, 0, 0, 0, 1431, 1415, 534, 0, 1357, 1434,
-	1325, 1344, 1444, 1347, 1350, 1394, 1303, 1372, 420, 1341,
-	1329, 1298, 1336, 1299, 1327, 1359, 273, 1324, 1417, 1376,
-	1433, 369, 270, 1305, 1296, 206, 511, 1330, 435, 1346,
-	205, 1396, 493, 255, 380, 377, 590, 285, 276, 272,
-	252, 320, 389, 432, 524, 426, 1440, 373, 1382, 0,
-	503, 405, 0, 0, 0, 1421, 1420, 1351, 1361, 1423,
-	1370, 1408, 1356, 1395, 1313, 1381, 1435, 1342, 1391, 1436,
-	326, 250, 328, 204, 417, 504, 289, 0, 0, 0,
-	0, 0, 513, 196, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 240, 0, 0, 247, 0, 0, 0,
-	354, 363, 362, 342, 343, 345, 347, 353, 360, 366,
-	339, 348, 1338, 1388, 616, 1430, 1339, 1390, 268, 324,
-	275, 267, 587, 1441, 1422, 1302, 1369, 1429, 1364, 603,
-	0, 0, 231, 1432, 1363, 0, 1393, 0, 1447, 1297,
-	1384, 0, 1300, 1304, 1443, 1427, 1333, 278, 0, 0,
-	0, 0, 0, 0, 0, 1360, 1371, 1405, 1409, 1354,
-	0, 0, 0, 0, 0, 0, 3276, 0, 1331, 0,
-	1380, 0, 0, 0, 1309, 1301, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 1358, 0,
-	0, 0, 0, 1312, 0, 1332, 1406, 0, 1295, 300,
-	1306, 406, 260, 0, 459, 1413, 1426, 1355, 636, 1428,
-	1353, 1352, 1400, 1310, 1419, 1345, 368, 1308, 333, 199,
-	227, 0, 1343, 416, 467, 479, 1418, 1328, 1337, 256,
-	1335, 477, 430, 611, 235, 287, 464, 437, 475, 445,
-	290, 1379, 1398, 476, 375, 592, 455, 608, 637, 638,
-	266, 410, 622, 528, 630, 655, 228, 263, 424, 512,
-	614, 500, 401, 588, 589, 332, 499, 298, 203, 372,
-	643, 226, 485, 374, 244, 233, 594, 619, 302, 254,
-	292, 462, 650, 215, 523, 605, 241, 489, 0, 0,
-	658, 249, 510, 617, 606, 217, 601, 509, 397, 329,
-	330, 216, 0, 463, 271, 296, 0, 0, 261, 419,
-	596, 597, 259, 659, 230, 629, 222, 1307, 628, 412,
-	591, 602, 398, 386, 221, 600, 396, 385, 337, 358,
-	359, 283, 310, 452, 378, 453, 309, 311, 408, 407,
-	409, 209, 615, 633, 0, 210, 0, 505, 618, 660,
-	457, 214, 236, 237, 239, 1323, 282, 286, 294, 297,
-	306, 307, 316, 370, 423, 451, 447, 456, 1414, 585,
-	609, 623, 635, 641, 642, 644, 645, 646, 647, 648,
-	651, 649, 411, 314, 501, 336, 376, 1403, 1446, 429,
-	478, 242, 613, 502, 201, 1317, 1322, 1315, 0, 257,
-	258, 1385, 581, 1318, 1316, 1374, 1375, 1319, 1437, 1438,
-	1439, 1424, 661, 662, 663, 664, 665, 666, 667, 668,
-	669, 670, 671, 672, 673, 674, 675, 676, 677, 678,
-	656, 514, 520, 515, 516, 517, 518, 519, 0, 521,
-	1407, 1311, 0, 1320, 1321, 402, 1416, 598, 599, 679,
-	387, 492, 610, 338, 352, 355, 344, 364, 0, 365,
-	340, 341, 346, 349, 350, 351, 356, 357, 361, 367,
-	251, 212, 394, 403, 584, 315, 218, 219, 220, 530,
-	531, 532, 533, 626, 627, 631, 207, 468, 469, 470,
-	471, 295, 621, 312, 474, 473, 334, 335, 382, 454,
-	546, 548, 559, 563, 565, 567, 573, 576, 547, 549,
-	560, 564, 566, 568, 574, 577, 536, 538, 540, 542,
-	555, 554, 551, 579, 580, 557, 562, 541, 553, 558,
-	571, 578, 575, 535, 539, 543, 552, 570, 569, 550,
-	561, 572, 556, 544, 537, 545, 1378, 198, 223, 371,
-	1442, 460, 291, 657, 625, 490, 620, 208, 225, 1314,
-	265, 1326, 1334, 0, 1340, 1348, 1349, 1362, 1365, 1366,
-	1367, 1368, 1386, 1387, 1389, 1397, 1399, 1402, 1404, 1411,
-	1425, 1445, 200, 202, 211, 224, 234, 238, 245, 264,
-	279, 281, 288, 301, 313, 321, 322, 325, 331, 383,
-	390, 391, 392, 393, 413, 414, 415, 418, 421, 422,
-	425, 427, 428, 431, 436, 440, 441, 442, 444, 446,
-	448, 461, 466, 480, 481, 482, 483, 484, 487, 488,
-	494, 495, 496, 497, 498, 506, 507, 522, 593, 595,
-	612, 632, 639, 486, 388, 434, 458, 586, 304, 305,
-	449, 450, 317, 318, 653, 654, 303, 607, 640, 604,
-	652, 634, 443, 381, 1377, 1383, 384, 284, 308, 323,
-	1392, 624, 508, 229, 472, 293, 253, 1410, 1412, 213,
-	248, 232, 262, 277, 280, 327, 395, 404, 433, 439,
-	299, 274, 246, 465, 243, 491, 525, 526, 527, 529,
-	399, 269, 438, 1373, 1401, 379, 582, 583, 319, 400,
-	0, 0, 0, 0, 0, 0, 1431, 1415, 534, 0,
-	1357, 1434, 1325, 1344, 1444, 1347, 1350, 1394, 1303, 1372,
-	420, 1341, 1329, 1298, 1336, 1299, 1327, 1359, 273, 1324,
-	1417, 1376, 1433, 369, 270, 1305, 1296, 206, 511, 1330,
-	435, 1346, 205, 1396, 493, 255, 380, 377, 590, 285,
-	276, 272, 252, 320, 389, 432, 524, 426, 1440, 373,
-	1382, 0, 503, 405, 0, 0, 0, 1421, 1420, 1351,
-	1361, 1423, 1370, 1408, 1356, 1395, 1313, 1381, 1435, 1342,
-	1391, 1436, 326, 250, 328, 204, 417, 504, 289, 0,
-	0, 0, 0, 0, 513, 731, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 240, 0, 0, 247, 0,
-	0, 0, 354, 363, 362, 342, 343, 345, 347, 353,
-	360, 366, 339, 348, 1338, 1388, 616, 1430, 1339, 1390,
-	268, 324, 275, 267, 587, 1441, 1422, 1302, 1369, 1429,
-	1364, 603, 0, 0, 231, 1432, 1363, 0, 1393, 0,
-	1447, 1297, 1384, 0, 1300, 1304, 1443, 1427, 1333, 278,
-	0, 0, 0, 0, 0, 0, 0, 1360, 1371, 1405,
-	1409, 1354, 0, 0, 0, 0, 0, 0, 3237, 0,
-	1331, 0, 1380, 0, 0, 0, 1309, 1301, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	1358, 0, 0, 0, 0, 1312, 0, 1332, 1406, 0,
-	1295, 300, 1306, 406, 260, 0, 459, 1413, 1426, 1355,
-	636, 1428, 1353, 1352, 1400, 1310, 1419, 1345, 368, 1308,
-	333, 199, 227, 0, 1343, 416, 467, 479, 1418, 1328,
-	1337, 256, 1335, 477, 430, 611, 235, 287, 464, 437,
-	475, 445, 290, 1379, 1398, 476, 375, 592, 455, 608,
-	637, 638, 266, 410, 622, 528, 630, 655, 228, 263,
-	424, 512, 614, 500, 401, 588, 589, 332, 499, 298,
-	203, 372, 643, 226, 485, 374, 244, 233, 594, 619,
-	302, 254, 292, 462, 650, 215, 523, 605, 241, 489,
-	0, 0, 658, 249, 510, 617, 606, 217, 601, 509,
-	397, 329, 330, 216, 0, 463, 271, 296, 0, 0,
-	261, 419, 596, 597, 259, 659, 230, 629, 222, 1307,
-	628, 412, 591, 602, 398, 386, 221, 600, 396, 385,
-	337, 358, 359, 283, 310, 452, 378, 453, 309, 311,
-	408, 407, 409, 209, 615, 633, 0, 210, 0, 505,
-	618, 660, 457, 214, 236, 237, 239, 1323, 282, 286,
-	294, 297, 306, 307, 316, 370, 423, 451, 447, 456,
-	1414, 585, 609, 623, 635, 641, 642, 644, 645, 646,
-	647, 648, 651, 649, 411, 314, 501, 336, 376, 1403,
-	1446, 429, 478, 242, 613, 502, 201, 1317, 1322, 1315,
-	0, 257, 258, 1385, 581, 1318, 1316, 1374, 1375, 1319,
-	1437, 1438, 1439, 1424, 661, 662, 663, 664, 665, 666,
-	667, 668, 669, 670, 671, 672, 673, 674, 675, 676,
-	677, 678, 656, 514, 520, 515, 516, 517, 518, 519,
-	0, 521, 1407, 1311, 0, 1320, 1321, 402, 1416, 598,
-	599, 679, 387, 492, 610, 338, 352, 355, 344, 364,
-	0, 365, 340, 341, 346, 349, 350, 351, 356, 357,
-	361, 367, 251, 212, 394, 403, 584, 315, 218, 219,
-	220, 530, 531, 532, 533, 626, 627, 631, 207, 468,
-	469, 470, 471, 295, 621, 312, 474, 473, 334, 335,
-	382, 454, 546, 548, 559, 563, 565, 567, 573, 576,
-	547, 549, 560, 564, 566, 568, 574, 577, 536, 538,
-	540, 542, 555, 554, 551, 579, 580, 557, 562, 541,
-	553, 558, 571, 578, 575, 535, 539, 543, 552, 570,
-	569, 550, 561, 572, 556, 544, 537, 545, 1378, 198,
-	223, 371, 1442, 460, 291, 657, 625, 490, 620, 208,
-	225, 1314, 265, 1326, 1334, 0, 1340, 1348, 1349, 1362,
-	1365, 1366, 1367, 1368, 1386, 1387, 1389, 1397, 1399, 1402,
-	1404, 1411, 1425, 1445, 200, 202, 211, 224, 234, 238,
-	245, 264, 279, 281, 288, 301, 313, 321, 322, 325,
-	331, 383, 390, 391, 392, 393, 413, 414, 415, 418,
-	421, 422, 425, 427, 428, 431, 436, 440, 441, 442,
-	444, 446, 448, 461, 466, 480, 481, 482, 483, 484,
-	487, 488, 494, 495, 496, 497, 498, 506, 507, 522,
-	593, 595, 612, 632, 639, 486, 388, 434, 458, 586,
-	304, 305, 449, 450, 317, 318, 653, 654, 303, 607,
-	640, 604, 652, 634, 443, 381, 1377, 1383, 384, 284,
-	308, 323, 1392, 624, 508, 229, 472, 293, 253, 1410,
-	1412, 213, 248, 232, 262, 277, 280, 327, 395, 404,
-	433, 439, 299, 274, 246, 465, 243, 491, 525, 526,
-	527, 529, 399, 269, 438, 1373, 1401, 379, 582, 583,
-	319, 400, 0, 0, 0, 0, 0, 0, 1431, 1415,
-	534, 0, 1357, 1434, 1325, 1344, 1444, 1347, 1350, 1394,
-	1303, 1372, 420, 1341, 1329, 1298, 1336, 1299, 1327, 1359,
-	273, 1324, 1417, 1376, 1433, 369, 270, 1305, 1296, 206,
-	511, 1330, 435, 1346, 205, 1396, 493, 255, 380, 377,
-	590, 285, 276, 272, 252, 320, 389, 432, 524, 426,
-	1440, 373, 1382, 0, 503, 405, 0, 0, 0, 1421,
-	1420, 1351, 1361, 1423, 1370, 1408, 1356, 1395, 1313, 1381,
-	1435, 1342, 1391, 1436, 326, 250, 328, 204, 417, 504,
-	289, 0, 0, 0, 0, 0, 513, 966, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 240, 0, 0,
-	247, 0, 0, 0, 354, 363, 362, 342, 343, 345,
-	347, 353, 360, 366, 339, 348, 1338, 1388, 616, 1430,
-	1339, 1390, 268, 324, 275, 267, 587, 1441, 1422, 1302,
-	1369, 1429, 1364, 603, 0, 0, 231, 1432, 1363, 0,
-	1393, 0, 1447, 1297, 1384, 0, 1300, 1304, 1443, 1427,
-	1333, 278, 0, 0, 0, 0, 0, 0, 0, 1360,
-	1371, 1405, 1409, 1354, 0, 0, 0, 0, 0, 0,
-	2428, 0, 1331, 0, 1380, 0, 0, 0, 1309, 1301,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 1358, 0, 0, 0, 0, 1312, 0, 1332,
-	1406, 0, 1295, 300, 1306, 406, 260, 0, 459, 1413,
-	1426, 1355, 636, 1428, 1353, 1352, 1400, 1310, 1419, 1345,
-	368, 1308, 333, 199, 227, 0, 1343, 416, 467, 479,
-	1418, 1328, 1337, 256, 1335, 477, 430, 611, 235, 287,
-	464, 437, 475, 445, 290, 1379, 1398, 476, 375, 592,
-	455, 608, 637, 638, 266, 410, 622, 528, 630, 655,
-	228, 263, 424, 512, 614, 500, 401, 588, 589, 332,
-	499, 298, 203, 372, 643, 226, 485, 374, 244, 233,
-	594, 619, 302, 254, 292, 462, 650, 215, 523, 605,
-	241, 489, 0, 0, 658, 249, 510, 617, 606, 217,
-	601, 509, 397, 329, 330, 216, 0, 463, 271, 296,
-	0, 0, 261, 419, 596, 597, 259, 659, 230, 629,
-	222, 1307, 628, 412, 591, 602, 398, 386, 221, 600,
-	396, 385, 337, 358, 359, 283, 310, 452, 378, 453,
-	309, 311, 408, 407, 409, 209, 615, 633, 0, 210,
-	0, 505, 618, 660, 457, 214, 236, 237, 239, 1323,
-	282, 286, 294, 297, 306, 307, 316, 370, 423, 451,
-	447, 456, 1414, 585, 609, 623, 635, 641, 642, 644,
-	645, 646, 647, 648, 651, 649, 411, 314, 501, 336,
-	376, 1403, 1446, 429, 478, 242, 613, 502, 201, 1317,
-	1322, 1315, 0, 257, 258, 1385, 581, 1318, 1316, 1374,
-	1375, 1319, 1437, 1438, 1439, 1424, 661, 662, 663, 664,
-	665, 666, 667, 668, 669, 670, 671, 672, 673, 674,
-	675, 676, 677, 678, 656, 514, 520, 515, 516, 517,
-	518, 519, 0, 521, 1407, 1311, 0, 1320, 1321, 402,
-	1416, 598, 599, 679, 387, 492, 610, 338, 352, 355,
-	344, 364, 0, 365, 340, 341, 346, 349, 350, 351,
-	356, 357, 361, 367, 251, 212, 394, 403, 584, 315,
-	218, 219, 220, 530, 531, 532, 533, 626, 627, 631,
-	207, 468, 469, 470, 471, 295, 621, 312, 474, 473,
-	334, 335, 382, 454, 546, 548, 559, 563, 565, 567,
-	573, 576, 547, 549, 560, 564, 566, 568, 574, 577,
-	536, 538, 540, 542, 555, 554, 551, 579, 580, 557,
-	562, 541, 553, 558, 571, 578, 575, 535, 539, 543,
-	552, 570, 569, 550, 561, 572, 556, 544, 537, 545,
-	1378, 198, 223, 371, 1442, 460, 291, 657, 625, 490,
-	620, 208, 225, 1314, 265, 1326, 1334, 0, 1340, 1348,
-	1349, 1362, 1365, 1366, 1367, 1368, 1386, 1387, 1389, 1397,
-	1399, 1402, 1404, 1411, 1425, 1445, 200, 202, 211, 224,
-	234, 238, 245, 264, 279, 281, 288, 301, 313, 321,
-	322, 325, 331, 383, 390, 391, 392, 393, 413, 414,
-	415, 418, 421, 422, 425, 427, 428, 431, 436, 440,
-	441, 442, 444, 446, 448, 461, 466, 480, 481, 482,
-	483, 484, 487, 488, 494, 495, 496, 497, 498, 506,
-	507, 522, 593, 595, 612, 632, 639, 486, 388, 434,
-	458, 586, 304, 305, 449, 450, 317, 318, 653, 654,
-	303, 607, 640, 604, 652, 634, 443, 381, 1377, 1383,
-	384, 284, 308, 323, 1392, 624, 508, 229, 472, 293,
-	253, 1410, 1412, 213, 248, 232, 262, 277, 280, 327,
-	395, 404, 433, 439, 299, 274, 246, 465, 243, 491,
-	525, 526, 527, 529, 399, 269, 438, 1373, 1401, 379,
-	582, 583, 319, 400, 0, 0, 0, 0, 0, 0,
-	1431, 1415, 534, 0, 1357, 1434, 1325, 1344, 1444, 1347,
-	1350, 1394, 1303, 1372, 420, 1341, 1329, 1298, 1336, 1299,
-	1327, 1359, 273, 1324, 1417, 1376, 1433, 369, 270, 1305,
-	1296, 206, 511, 1330, 435, 1346, 205, 1396, 493, 255,
-	380, 377, 590, 285, 276, 272, 252, 320, 389, 432,
-	524, 426, 1440, 373, 1382, 0, 503, 405, 0, 0,
-	0, 1421, 1420, 1351, 1361, 1423, 1370, 1408, 1356, 1395,
-	1313, 1381, 1435, 1342, 1391, 1436, 326, 250, 328, 204,
-	417, 504, 289, 0, 95, 0, 0, 0, 513, 731,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 240,
-	0, 0, 247, 0, 0, 0, 354, 363, 362, 342,
-	343, 345, 347, 353, 360, 366, 339, 348, 1338, 1388,
-	616, 1430, 1339, 1390, 268, 324, 275, 267, 587, 1441,
-	1422, 1302, 1369, 1429, 1364, 603, 0, 0, 231, 1432,
-	1363, 0, 1393, 0, 1447, 1297, 1384, 0, 1300, 1304,
-	1443, 1427, 1333, 278, 0, 0, 0, 0, 0, 0,
-	0, 1360, 1371, 1405, 1409, 1354, 0, 0, 0, 0,
-	0, 0, 0, 0, 1331, 0, 1380, 0, 0, 0,
-	1309, 1301, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 1358, 0, 0, 0, 0, 1312,
-	0, 1332, 1406, 0, 1295, 300, 1306, 406, 260, 0,
-	459, 1413, 1426, 1355, 636, 1428, 1353, 1352, 1400, 1310,
-	1419, 1345, 368, 1308, 333, 199, 227, 0, 1343, 416,
-	467, 479, 1418, 1328, 1337, 256, 1335, 477, 430, 611,
-	235, 287, 464, 437, 475, 445, 290, 1379, 1398, 476,
-	375, 592, 455, 608, 637, 638, 266, 410, 622, 528,
-	630, 655, 228, 263, 424, 512, 614, 500, 401, 588,
-	589, 332, 499, 298, 203, 372, 643, 226, 485, 374,
-	244, 233, 594, 619, 302, 254, 292, 462, 650, 215,
-	523, 605, 241, 489, 0, 0, 658, 249, 510, 617,
-	606, 217, 601, 509, 397, 329, 330, 216, 0, 463,
-	271, 296, 0, 0, 261, 419, 596, 597, 259, 659,
-	230, 629, 222, 1307, 628, 412, 591, 602, 398, 386,
-	221, 600, 396, 385, 337, 358, 359, 283, 310, 452,
-	378, 453, 309, 311, 408, 407, 409, 209, 615, 633,
-	0, 210, 0, 505, 618, 660, 457, 214, 236, 237,
-	239, 1323, 282, 286, 294, 297, 306, 307, 316, 370,
-	423, 451, 447, 456, 1414, 585, 609, 623, 635, 641,
-	642, 644, 645, 646, 647, 648, 651, 649, 411, 314,
-	501, 336, 376, 1403, 1446, 429, 478, 242, 613, 502,
-	201, 1317, 1322, 1315, 0, 257, 258, 1385, 581, 1318,
-	1316, 1374, 1375, 1319, 1437, 1438, 1439, 1424, 661, 662,
-	663, 664, 665, 666, 667, 668, 669, 670, 671, 672,
-	673, 674, 675, 676, 677, 678, 656, 514, 520, 515,
-	516, 517, 518, 519, 0, 521, 1407, 1311, 0, 1320,
-	1321, 402, 1416, 598, 599, 679, 387, 492, 610, 338,
-	352, 355, 344, 364, 0, 365, 340, 341, 346, 349,
-	350, 351, 356, 357, 361, 367, 251, 212, 394, 403,
-	584, 315, 218, 219, 220, 530, 531, 532, 533, 626,
-	627, 631, 207, 468, 469, 470, 471, 295, 621, 312,
-	474, 473, 334, 335, 382, 454, 546, 548, 559, 563,
-	565, 567, 573, 576, 547, 549, 560, 564, 566, 568,
-	574, 577, 536, 538, 540, 542, 555, 554, 551, 579,
-	580, 557, 562, 541, 553, 558, 571, 578, 575, 535,
-	539, 543, 552, 570, 569, 550, 561, 572, 556, 544,
-	537, 545, 1378, 198, 223, 371, 1442, 460, 291, 657,
-	625, 490, 620, 208, 225, 1314, 265, 1326, 1334, 0,
-	1340, 1348, 1349, 1362, 1365, 1366, 1367, 1368, 1386, 1387,
-	1389, 1397, 1399, 1402, 1404, 1411, 1425, 1445, 200, 202,
-	211, 224, 234, 238, 245, 264, 279, 281, 288, 301,
-	313, 321, 322, 325, 331, 383, 390, 391, 392, 393,
-	413, 414, 415, 418, 421, 422, 425, 427, 428, 431,
-	436, 440, 441, 442, 444, 446, 448, 461, 466, 480,
-	481, 482, 483, 484, 487, 488, 494, 495, 496, 497,
-	498, 506, 507, 522, 593, 595, 612, 632, 639, 486,
-	388, 434, 458, 586, 304, 305, 449, 450, 317, 318,
-	653, 654, 303, 607, 640, 604, 652, 634, 443, 381,
-	1377, 1383, 384, 284, 308, 323, 1392, 624, 508, 229,
-	472, 293, 253, 1410, 1412, 213, 248, 232, 262, 277,
-	280, 327, 395, 404, 433, 439, 299, 274, 246, 465,
-	243, 491, 525, 526, 527, 529, 399, 269, 438, 1373,
-	1401, 379, 582, 583, 319, 400, 0, 0, 0, 0,
-	0, 0, 1431, 1415, 534, 0, 1357, 1434, 1325, 1344,
-	1444, 1347, 1350, 1394, 1303, 1372, 420, 1341, 1329, 1298,
-	1336, 1299, 1327, 1359, 273, 1324, 1417, 1376, 1433, 369,
-	270, 1305, 1296, 206, 511, 1330, 435, 1346, 205, 1396,
-	493, 255, 380, 377, 590, 285, 276, 272, 252, 320,
-	389, 432, 524, 426, 1440, 373, 1382, 0, 503, 405,
-	0, 0, 0, 1421, 1420, 1351, 1361, 1423, 1370, 1408,
-	1356, 1395, 1313, 1381, 1435, 1342, 1391, 1436, 326, 250,
-	328, 204, 417, 504, 289, 0, 0, 0, 0, 0,
-	513, 196, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 240, 0, 0, 247, 0, 0, 0, 354, 363,
-	362, 342, 343, 345, 347, 353, 360, 366, 339, 348,
-	1338, 1388, 616, 1430, 1339, 1390, 268, 324, 275, 267,
-	587, 1441, 1422, 1302, 1369, 1429, 1364, 603, 0, 0,
-	231, 1432, 1363, 0, 1393, 0, 1447, 1297, 1384, 0,
-	1300, 1304, 1443, 1427, 1333, 278, 0, 0, 0, 0,
-	0, 0, 0, 1360, 1371, 1405, 1409, 1354, 0, 0,
-	0, 0, 0, 0, 0, 0, 1331, 0, 1380, 0,
-	0, 0, 1309, 1301, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 1358, 0, 0, 0,
-	0, 1312, 0, 1332, 1406, 0, 1295, 300, 1306, 406,
-	260, 0, 459, 1413, 1426, 1355, 636, 1428, 1353, 1352,
-	1400, 1310, 1419, 1345, 368, 1308, 333, 199, 227, 0,
-	1343, 416, 467, 479, 1418, 1328, 1337, 256, 1335, 477,
-	430, 611, 235, 287, 464, 437, 475, 445, 290, 1379,
-	1398, 476, 375, 592, 455, 608, 637, 638, 266, 410,
-	622, 528, 630, 655, 228, 263, 424, 512, 614, 500,
-	401, 588, 589, 332, 499, 298, 203, 372, 643, 226,
-	485, 374, 244, 233, 594, 619, 302, 254, 292, 462,
-	650, 215, 523, 605, 241, 489, 0, 0, 658, 249,
-	510, 617, 606, 217, 601, 509, 397, 329, 330, 216,
-	0, 463, 271, 296, 0, 0, 261, 419, 596, 597,
-	259, 659, 230, 629, 222, 1307, 628, 412, 591, 602,
-	398, 386, 221, 600, 396, 385, 337, 358, 359, 283,
-	310, 452, 378, 453, 309, 311, 408, 407, 409, 209,
-	615, 633, 0, 210, 0, 505, 618, 660, 457, 214,
-	236, 237, 239, 1323, 282, 286, 294, 297, 306, 307,
-	316, 370, 423, 451, 447, 456, 1414, 585, 609, 623,
-	635, 641, 642, 644, 645, 646, 647, 648, 651, 649,
-	411, 314, 501, 336, 376, 1403, 1446, 429, 478, 242,
-	613, 502, 201, 1317, 1322, 1315, 0, 257, 258, 1385,
-	581, 1318, 1316, 1374, 1375, 1319, 1437, 1438, 1439, 1424,
-	661, 662, 663, 664, 665, 666, 667, 668, 669, 670,
-	671, 672, 673, 674, 675, 676, 677, 678, 656, 514,
-	520, 515, 516, 517, 518, 519, 0, 521, 1407, 1311,
-	0, 1320, 1321, 402, 1416, 598, 599, 679, 387, 492,
-	610, 338, 352, 355, 344, 364, 0, 365, 340, 341,
-	346, 349, 350, 351, 356, 357, 361, 367, 251, 212,
-	394, 403, 584, 315, 218, 219, 220, 530, 531, 532,
-	533, 626, 627, 631, 207, 468, 469, 470, 471, 295,
-	621, 312, 474, 473, 334, 335, 382, 454, 546, 548,
-	559, 563, 565, 567, 573, 576, 547, 549, 560, 564,
-	566, 568, 574, 577, 536, 538, 540, 542, 555, 554,
-	551, 579, 580, 557, 562, 541, 553, 558, 571, 578,
-	575, 535, 539, 543, 552, 570, 569, 550, 561, 572,
-	556, 544, 537, 545, 1378, 198, 223, 371, 1442, 460,
-	291, 657, 625, 490, 620, 208, 225, 1314, 265, 1326,
-	1334, 0, 1340, 1348, 1349, 1362, 1365, 1366, 1367, 1368,
-	1386, 1387, 1389, 1397, 1399, 1402, 1404, 1411, 1425, 1445,
-	200, 202, 211, 224, 234, 238, 245, 264, 279, 281,
-	288, 301, 313, 321, 322, 325, 331, 383, 390, 391,
-	392, 393, 413, 414, 415, 418, 421, 422, 425, 427,
-	428, 431, 436, 440, 441, 442, 444, 446, 448, 461,
-	466, 480, 481, 482, 483, 484, 487, 488, 494, 495,
-	496, 497, 498, 506, 507, 522, 593, 595, 612, 632,
-	639, 486, 388, 434, 458, 586, 304, 305, 449, 450,
-	317, 318, 653, 654, 303, 607, 640, 604, 652, 634,
-	443, 381, 1377, 1383, 384, 284, 308, 323, 1392, 624,
-	508, 229, 472, 293, 253, 1410, 1412, 213, 248, 232,
-	262, 277, 280, 327, 395, 404, 433, 439, 299, 274,
-	246, 465, 243, 491, 525, 526, 527, 529, 399, 269,
-	438, 1373, 1401, 379, 582, 583, 319, 400, 0, 0,
-	0, 0, 0, 0, 1431, 1415, 534, 0, 1357, 1434,
-	1325, 1344, 1444, 1347, 1350, 1394, 1303, 1372, 420, 1341,
-	1329, 1298, 1336, 1299, 1327, 1359, 273, 1324, 1417, 1376,
-	1433, 369, 270, 1305, 1296, 206, 511, 1330, 435, 1346,
-	205, 1396, 493, 255, 380, 377, 590, 285, 276, 272,
-	252, 320, 389, 432, 524, 426, 1440, 373, 1382, 0,
-	503, 405, 0, 0, 0, 1421, 1420, 1351, 1361, 1423,
-	1370, 1408, 1356, 1395, 1313, 1381, 1435, 1342, 1391, 1436,
-	326, 250, 328, 204, 417, 504, 289, 0, 0, 0,
-	0, 0, 513, 731, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 240, 0, 0, 247, 0, 0, 0,
-	354, 363, 362, 342, 343, 345, 347, 353, 360, 366,
-	339, 348, 1338, 1388, 616, 1430, 1339, 1390, 268, 324,
-	275, 267, 587, 1441, 1422, 1302, 1369, 1429, 1364, 603,
-	0, 0, 231, 1432, 1363, 0, 1393, 0, 1447, 1297,
-	1384, 0, 1300, 1304, 1443, 1427, 1333, 278, 0, 0,
-	0, 0, 0, 0, 0, 1360, 1371, 1405, 1409, 1354,
-	0, 0, 0, 0, 0, 0, 0, 0, 1331, 0,
-	1380, 0, 0, 0, 1309, 1301, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 1358, 0,
-	0, 0, 0, 1312, 0, 1332, 1406, 0, 1295, 300,
-	1306, 406, 260, 0, 459, 1413, 1426, 1355, 636, 1428,
-	1353, 1352, 1400, 1310, 1419, 1345, 368, 1308, 333, 199,
-	227, 0, 1343, 416, 467, 479, 1418, 1328, 1337, 256,
-	1335, 477, 430, 611, 235, 287, 464, 437, 475, 445,
-	290, 1379, 1398, 476, 375, 592, 455, 608, 637, 638,
-	266, 410, 622, 528, 630, 655, 228, 263, 424, 512,
-	614, 500, 401, 588, 589, 332, 499, 298, 203, 372,
-	643, 226, 485, 374, 244, 233, 594, 619, 302, 254,
-	292, 462, 650, 215, 523, 605, 241, 489, 0, 0,
-	658, 249, 510, 617, 606, 217, 601, 509, 397, 329,
-	330, 216, 0, 463, 271, 296, 0, 0, 261, 419,
-	596, 597, 259, 659, 230, 629, 222, 1307, 628, 412,
-	591, 602, 398, 386, 221, 600, 396, 385, 337, 358,
-	359, 283, 310, 452, 378, 453, 309, 311, 408, 407,
-	409, 209, 615, 633, 0, 210, 0, 505, 618, 660,
-	457, 214, 236, 237, 239, 1323, 282, 286, 294, 297,
-	306, 307, 316, 370, 423, 451, 447, 456, 1414, 585,
-	609, 623, 635, 641, 642, 644, 645, 646, 647, 648,
-	651, 649, 411, 314, 501, 336, 376, 1403, 1446, 429,
-	478, 242, 613, 502, 201, 1317, 1322, 1315, 0, 257,
-	258, 1385, 581, 1318, 1316, 1374, 1375, 1319, 1437, 1438,
-	1439, 1424, 661, 662, 663, 664, 665, 666, 667, 668,
-	669, 670, 671, 672, 673, 674, 675, 676, 677, 678,
-	656, 514, 520, 515, 516, 517, 518, 519, 0, 521,
-	1407, 1311, 0, 1320, 1321, 402, 1416, 598, 599, 679,
-	387, 492, 610, 338, 352, 355, 344, 364, 0, 365,
-	340, 341, 346, 349, 350, 351, 356, 357, 361, 367,
-	251, 212, 394, 403, 584, 315, 218, 219, 220, 530,
-	531, 532, 533, 626, 627, 631, 207, 468, 469, 470,
-	471, 295, 621, 312, 474, 473, 334, 335, 382, 454,
-	546, 548, 559, 563, 565, 567, 573, 576, 547, 549,
-	560, 564, 566, 568, 574, 577, 536, 538, 540, 542,
-	555, 554, 551, 579, 580, 557, 562, 541, 553, 558,
-	571, 578, 575, 535, 539, 543, 552, 570, 569, 550,
-	561, 572, 556, 544, 537, 545, 1378, 198, 223, 371,
-	1442, 460, 291, 657, 625, 490, 620, 208, 225, 1314,
-	265, 1326, 1334, 0, 1340, 1348, 1349, 1362, 1365, 1366,
-	1367, 1368, 1386, 1387, 1389, 1397, 1399, 1402, 1404, 1411,
-	1425, 1445, 200, 202, 211, 224, 234, 238, 245, 264,
-	279, 281, 288, 301, 313, 321, 322, 325, 331, 383,
-	390, 391, 392, 393, 413, 414, 415, 418, 421, 422,
-	425, 427, 428, 431, 436, 440, 441, 442, 444, 446,
-	448, 461, 466, 480, 481, 482, 483, 484, 487, 488,
-	494, 495, 496, 497, 498, 506, 507, 522, 593, 595,
-	612, 632, 639, 486, 388, 434, 458, 586, 304, 305,
-	449, 450, 317, 318, 653, 654, 303, 607, 640, 604,
-	652, 634, 443, 381, 1377, 1383, 384, 284, 308, 323,
-	1392, 624, 508, 229, 472, 293, 253, 1410, 1412, 213,
-	248, 232, 262, 277, 280, 327, 395, 404, 433, 439,
-	299, 274, 246, 465, 243, 491, 525, 526, 527, 529,
-	399, 269, 438, 1373, 1401, 379, 582, 583, 319, 400,
-	0, 0, 0, 0, 0, 0, 1431, 1415, 534, 0,
-	1357, 1434, 1325, 1344, 1444, 1347, 1350, 1394, 1303, 1372,
-	420, 1341, 1329, 1298, 1336, 1299, 1327, 1359, 273, 1324,
-	1417, 1376, 1433, 369, 270, 1305, 1296, 206, 511, 1330,
-	435, 1346, 205, 1396, 493, 255, 380, 377, 590, 285,
-	276, 272, 252, 320, 389, 432, 524, 426, 1440, 373,
-	1382, 0, 503, 405, 0, 0, 0, 1421, 1420, 1351,
-	1361, 1423, 1370, 1408, 1356, 1395, 1313, 1381, 1435, 1342,
-	1391, 1436, 326, 250, 328, 204, 417, 504, 289, 0,
-	0, 0, 0, 0, 513, 966, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 240, 0, 0, 247, 0,
-	0, 0, 354, 363, 362, 342, 343, 345, 347, 353,
-	360, 366, 339, 348, 1338, 1388, 616, 1430, 1339, 1390,
-	268, 324, 275, 267, 587, 1441, 1422, 1302, 1369, 1429,
-	1364, 603, 0, 0, 231, 1432, 1363, 0, 1393, 0,
-	1447, 1297, 1384, 0, 1300, 1304, 1443, 1427, 1333, 278,
-	0, 0, 0, 0, 0, 0, 0, 1360, 1371, 1405,
-	1409, 1354, 0, 0, 0, 0, 0, 0, 0, 0,
-	1331, 0, 1380, 0, 0, 0, 1309, 1301, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	1358, 0, 0, 0, 0, 1312, 0, 1332, 1406, 0,
-	1295, 300, 1306, 406, 260, 0, 459, 1413, 1426, 1355,
-	636, 1428, 1353, 1352, 1400, 1310, 1419, 1345, 368, 1308,
-	333, 199, 227, 0, 1343, 416, 467, 479, 1418, 1328,
-	1337, 256, 1335, 477, 430, 611, 235, 287, 464, 437,
-	475, 445, 290, 1379, 1398, 476, 375, 592, 455, 608,
-	637, 638, 266, 410, 622, 528, 630, 655, 228, 263,
-	424, 512, 614, 500, 401, 588, 589, 332, 499, 298,
-	203, 372, 643, 226, 485, 374, 244, 233, 594, 619,
-	302, 254, 292, 462, 650, 215, 523, 605, 241, 489,
-	0, 0, 658, 249, 510, 617, 606, 217, 601, 509,
-	397, 329, 330, 216, 0, 463, 271, 296, 0, 0,
-	261, 419, 596, 597, 259, 659, 230, 629, 222, 1307,
-	628, 412, 591, 602, 398, 386, 221, 600, 396, 385,
-	337, 358, 359, 283, 310, 452, 378, 453, 309, 311,
-	408, 407, 409, 209, 615, 633, 0, 210, 0, 505,
-	618, 660, 457, 214, 236, 237, 239, 1323, 282, 286,
-	294, 297, 306, 307, 316, 370, 423, 451, 447, 456,
-	1414, 585, 609, 623, 635, 641, 642, 644, 645, 646,
-	647, 648, 651, 649, 411, 314, 501, 336, 376, 1403,
-	1446, 429, 478, 242, 613, 502, 201, 1317, 1322, 1315,
-	0, 257, 258, 1385, 581, 1318, 1316, 1374, 1375, 1319,
-	1437, 1438, 1439, 1424, 661, 662, 663, 664, 665, 666,
-	667, 668, 669, 670, 671, 672, 673, 674, 675, 676,
-	677, 678, 656, 514, 520, 515, 516, 517, 518, 519,
-	0, 521, 1407, 1311, 0, 1320, 1321, 402, 1416, 598,
-	599, 679, 387, 492, 610, 338, 352, 355, 344, 364,
-	0, 365, 340, 341, 346, 349, 350, 351, 356, 357,
-	361, 367, 251, 212, 394, 403, 584, 315, 218, 219,
-	220, 530, 531, 532, 533, 626, 627, 631, 207, 468,
-	469, 470, 471, 295, 621, 312, 474, 473, 334, 335,
-	382, 454, 546, 548, 559, 563, 565, 567, 573, 576,
-	547, 549, 560, 564, 566, 568, 574, 577, 536, 538,
-	540, 542, 555, 554, 551, 579, 580, 557, 562, 541,
-	553, 558, 571, 578, 575, 535, 539, 543, 552, 570,
-	569, 550, 561, 572, 556, 544, 537, 545, 1378, 198,
-	223, 371, 1442, 460, 291, 657, 625, 490, 620, 208,
-	225, 1314, 265, 1326, 1334, 0, 1340, 1348, 1349, 1362,
-	1365, 1366, 1367, 1368, 1386, 1387, 1389, 1397, 1399, 1402,
-	1404, 1411, 1425, 1445, 200, 202, 211, 224, 234, 238,
-	245, 264, 279, 281, 288, 301, 313, 321, 322, 325,
-	331, 383, 390, 391, 392, 393, 413, 414, 415, 418,
-	421, 422, 425, 427, 428, 431, 436, 440, 441, 442,
-	444, 446, 448, 461, 466, 480, 481, 482, 483, 484,
-	487, 488, 494, 495, 496, 497, 498, 506, 507, 522,
-	593, 595, 612, 632, 639, 486, 388, 434, 458, 586,
-	304, 305, 449, 450, 317, 318, 653, 654, 303, 607,
-	640, 604, 652, 634, 443, 381, 1377, 1383, 384, 284,
-	308, 323, 1392, 624, 508, 229, 472, 293, 253, 1410,
-	1412, 213, 248, 232, 262, 277, 280, 327, 395, 404,
-	433, 439, 299, 274, 246, 465, 243, 491, 525, 526,
-	527, 529, 399, 269, 438, 1373, 1401, 379, 582, 583,
-	319, 400, 0, 0, 0, 0, 0, 0, 0, 0,
-	534, 0, 784, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 420, 0, 0, 0, 771, 0, 0, 0,
-	273, 776, 0, 0, 0, 369, 270, 0, 0, 206,
-	511, 0, 435, 0, 205, 0, 493, 255, 380, 377,
-	590, 285, 276, 272, 252, 320, 389, 432, 524, 426,
-	783, 373, 0, 0, 503, 405, 0, 0, 0, 0,
-	0, 0, 0, 0, 778, 779, 0, 0, 0, 0,
-	0, 0, 0, 0, 326, 250, 328, 204, 417, 504,
-	289, 0, 95, 0, 0, 1032, 513, 966, 755, 932,
-	970, 1033, 984, 985, 986, 971, 0, 240, 972, 973,
-	247, 974, 0, 931, 814, 816, 815, 881, 882, 883,
-	884, 885, 886, 887, 817, 818, 812, 979, 616, 987,
-	988, 0, 268, 324, 275, 267, 587, 0, 0, 2248,
-	2249, 2250, 0, 603, 0, 0, 231, 0, 0, 0,
-	0, 0, 0, 0, 751, 768, 0, 782, 0, 0,
-	0, 278, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 765, 766,
-	0, 0, 0, 0, 926, 0, 767, 0, 0, 775,
-	989, 990, 991, 992, 993, 994, 995, 996, 997, 998,
-	999, 1000, 1001, 1002, 1003, 1004, 1005, 1006, 1007, 1008,
-	1009, 1010, 1011, 1012, 1013, 1014, 1015, 1016, 1017, 1018,
-	1019, 1020, 1021, 1022, 1023, 1024, 1025, 1026, 1027, 1028,
-	1029, 1030, 777, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 300, 0, 406, 260, 0, 459, 925,
-	0, 0, 636, 0, 0, 923, 0, 0, 0, 0,
-	368, 0, 333, 199, 227, 0, 0, 416, 467, 479,
-	0, 0, 0, 976, 0, 477, 430, 611, 235, 287,
-	464, 437, 475, 445, 290, 0, 0, 476, 375, 592,
-	455, 608, 637, 638, 266, 410, 622, 528, 630, 655,
-	228, 263, 424, 512, 614, 500, 401, 588, 589, 332,
-	499, 298, 203, 372, 643, 226, 485, 374, 244, 233,
-	594, 619, 302, 254, 292, 462, 650, 215, 523, 605,
-	241, 489, 0, 0, 658, 249, 510, 617, 606, 217,
-	601, 509, 397, 329, 330, 216, 0, 463, 271, 296,
-	0, 0, 261, 419, 977, 978, 259, 659, 822, 629,
-	222, 0, 628, 412, 591, 602, 398, 386, 221, 600,
-	396, 385, 337, 830, 831, 283, 310, 907, 906, 905,
-	309, 311, 903, 904, 902, 209, 615, 633, 0, 210,
-	0, 505, 618, 660, 457, 214, 236, 237, 239, 0,
-	282, 286, 294, 297, 306, 307, 316, 370, 423, 451,
-	447, 456, 0, 585, 609, 623, 635, 641, 642, 644,
-	645, 646, 647, 648, 651, 649, 411, 314, 501, 336,
-	376, 0, 0, 429, 478, 242, 613, 502, 913, 935,
-	924, 788, 789, 914, 915, 939, 916, 791, 792, 936,
-	937, 785, 786, 790, 938, 940, 661, 662, 663, 664,
-	665, 666, 667, 668, 669, 670, 671, 672, 673, 674,
-	675, 676, 677, 678, 656, 514, 520, 515, 516, 517,
-	518, 519, 0, 521, 927, 774, 773, 0, 780, 781,
-	0, 810, 811, 813, 819, 820, 821, 832, 879, 880,
-	888, 890, 891, 889, 892, 893, 894, 897, 898, 899,
-	900, 895, 896, 901, 793, 797, 794, 795, 796, 808,
-	798, 799, 800, 801, 802, 803, 804, 805, 806, 807,
-	809, 950, 951, 952, 953, 954, 955, 825, 829, 828,
-	826, 827, 823, 824, 851, 850, 852, 853, 854, 855,
-	856, 857, 859, 858, 860, 861, 862, 863, 864, 865,
-	833, 834, 837, 838, 836, 835, 839, 848, 849, 840,
-	841, 842, 843, 844, 845, 847, 846, 866, 867, 868,
-	869, 870, 872, 871, 875, 876, 874, 873, 878, 877,
-	772, 198, 223, 371, 0, 460, 291, 657, 625, 490,
-	620, 208, 225, 941, 265, 942, 0, 0, 946, 0,
-	0, 0, 948, 947, 0, 949, 911, 910, 0, 0,
-	943, 944, 0, 945, 0, 0, 200, 202, 211, 224,
-	234, 238, 245, 264, 279, 281, 288, 301, 313, 321,
-	322, 325, 331, 383, 390, 391, 392, 393, 413, 414,
-	415, 418, 421, 422, 425, 427, 428, 431, 436, 440,
-	441, 442, 444, 446, 448, 461, 466, 480, 481, 482,
-	483, 484, 487, 488, 494, 495, 496, 497, 498, 506,
-	507, 522, 593, 595, 612, 632, 639, 486, 388, 434,
-	458, 586, 956, 957, 958, 959, 960, 961, 962, 963,
-	303, 607, 640, 604, 652, 634, 443, 381, 0, 0,
-	384, 284, 308, 323, 0, 624, 508, 229, 472, 293,
-	253, 1031, 0, 213, 248, 232, 262, 277, 280, 327,
-	395, 404, 433, 439, 299, 274, 246, 465, 243, 491,
-	525, 526, 527, 529, 399, 269, 438, 400, 0, 379,
-	582, 583, 319, 0, 0, 0, 534, 0, 784, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 420, 0,
-	0, 0, 771, 0, 0, 0, 273, 776, 0, 0,
-	0, 369, 270, 0, 0, 206, 511, 0, 435, 0,
-	205, 0, 493, 255, 380, 377, 590, 285, 276, 272,
-	252, 320, 389, 432, 524, 426, 783, 373, 0, 0,
-	503, 405, 0, 0, 0, 0, 0, 0, 0, 0,
-	778, 779, 0, 0, 0, 0, 0, 0, 2457, 0,
-	326, 250, 328, 204, 417, 504, 289, 0, 95, 0,
-	0, 1032, 513, 966, 755, 932, 970, 1033, 984, 985,
-	986, 971, 0, 240, 972, 973, 247, 974, 0, 931,
-	814, 816, 815, 881, 882, 883, 884, 885, 886, 887,
-	817, 818, 812, 979, 616, 987, 988, 2458, 268, 324,
-	275, 267, 587, 0, 0, 0, 0, 0, 0, 603,
-	0, 0, 231, 0, 0, 0, 0, 0, 0, 0,
-	751, 768, 0, 782, 0, 0, 0, 278, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 765, 766, 0, 0, 0, 0,
-	926, 0, 767, 0, 0, 775, 989, 990, 991, 992,
-	993, 994, 995, 996, 997, 998, 999, 1000, 1001, 1002,
-	1003, 1004, 1005, 1006, 1007, 1008, 1009, 1010, 1011, 1012,
-	1013, 1014, 1015, 1016, 1017, 1018, 1019, 1020, 1021, 1022,
-	1023, 1024, 1025, 1026, 1027, 1028, 1029, 1030, 777, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 300,
-	0, 406, 260, 0, 459, 925, 0, 0, 636, 0,
-	0, 923, 0, 0, 0, 0, 368, 0, 333, 199,
-	227, 0, 0, 416, 467, 479, 0, 0, 0, 976,
-	0, 477, 430, 611, 235, 287, 464, 437, 475, 445,
-	290, 0, 0, 476, 375, 592, 455, 608, 637, 638,
-	266, 410, 622, 528, 630, 655, 228, 263, 424, 512,
-	614, 500, 401, 588, 589, 332, 499, 298, 203, 372,
-	643, 226, 485, 374, 244, 233, 594, 619, 302, 254,
-	292, 462, 650, 215, 523, 605, 241, 489, 0, 0,
-	658, 249, 510, 617, 606, 217, 601, 509, 397, 329,
-	330, 216, 0, 463, 271, 296, 0, 0, 261, 419,
-	977, 978, 259, 659, 822, 629, 222, 0, 628, 412,
-	591, 602, 398, 386, 221, 600, 396, 385, 337, 830,
-	831, 283, 310, 907, 906, 905, 309, 311, 903, 904,
-	902, 209, 615, 633, 0, 210, 0, 505, 618, 660,
-	457, 214, 236, 237, 239, 0, 282, 286, 294, 297,
-	306, 307, 316, 370, 423, 451, 447, 456, 0, 585,
-	609, 623, 635, 641, 642, 644, 645, 646, 647, 648,
-	651, 649, 411, 314, 501, 336, 376, 0, 0, 429,
-	478, 242, 613, 502, 913, 935, 924, 788, 789, 914,
-	915, 939, 916, 791, 792, 936, 937, 785, 786, 790,
-	938, 940, 661, 662, 663, 664, 665, 666, 667, 668,
-	669, 670, 671, 672, 673, 674, 675, 676, 677, 678,
-	656, 514, 520, 515, 516, 517, 518, 519, 0, 521,
-	927, 774, 773, 0, 780, 781, 0, 810, 811, 813,
-	819, 820, 821, 832, 879, 880, 888, 890, 891, 889,
-	892, 893, 894, 897, 898, 899, 900, 895, 896, 901,
-	793, 797, 794, 795, 796, 808, 798, 799, 800, 801,
-	802, 803, 804, 805, 806, 807, 809, 950, 951, 952,
-	953, 954, 955, 825, 829, 828, 826, 827, 823, 824,
-	851, 850, 852, 853, 854, 855, 856, 857, 859, 858,
-	860, 861, 862, 863, 864, 865, 833, 834, 837, 838,
-	836, 835, 839, 848, 849, 840, 841, 842, 843, 844,
-	845, 847, 846, 866, 867, 868, 869, 870, 872, 871,
-	875, 876, 874, 873, 878, 877, 772, 198, 223, 371,
-	0, 460, 291, 657, 625, 490, 620, 208, 225, 941,
-	265, 942, 0, 0, 946, 0, 0, 0, 948, 947,
-	0, 949, 911, 910, 0, 0, 943, 944, 0, 945,
-	0, 0, 200, 202, 211, 224, 234, 238, 245, 264,
-	279, 281, 288, 301, 313, 321, 322, 325, 331, 383,
-	390, 391, 392, 393, 413, 414, 415, 418, 421, 422,
-	425, 427, 428, 431, 436, 440, 441, 442, 444, 446,
-	448, 461, 466, 480, 481, 482, 483, 484, 487, 488,
-	494, 495, 496, 497, 498, 506, 507, 522, 593, 595,
-	612, 632, 639, 486, 388, 434, 458, 586, 956, 957,
-	958, 959, 960, 961, 962, 963, 303, 607, 640, 604,
-	652, 634, 443, 381, 0, 0, 384, 284, 308, 323,
-	0, 624, 508, 229, 472, 293, 253, 1031, 0, 213,
-	248, 232, 262, 277, 280, 327, 395, 404, 433, 439,
-	299, 274, 246, 465, 243, 491, 525, 526, 527, 529,
-	399, 269, 438, 400, 0, 379, 582, 583, 319, 0,
-	0, 86, 534, 0, 784, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 420, 0, 0, 0, 771, 0,
-	0, 0, 273, 776, 0, 0, 0, 369, 270, 0,
-	0, 206, 511, 0, 435, 0, 205, 0, 493, 255,
-	380, 377, 590, 285, 276, 272, 252, 320, 389, 432,
-	524, 426, 1727, 373, 0, 0, 503, 405, 0, 0,
-	0, 0, 0, 0, 0, 0, 778, 779, 0, 0,
-	0, 0, 0, 0, 0, 0, 326, 250, 328, 204,
-	417, 504, 289, 0, 95, 0, 0, 1032, 513, 966,
-	755, 932, 970, 1033, 984, 985, 986, 971, 0, 240,
-	972, 973, 247, 974, 0, 931, 814, 816, 815, 881,
-	882, 883, 884, 885, 886, 887, 817, 818, 812, 979,
-	616, 987, 988, 0, 268, 324, 275, 267, 587, 0,
-	0, 0, 0, 0, 0, 603, 0, 0, 231, 0,
-	0, 0, 0, 0, 0, 0, 751, 768, 0, 782,
-	0, 0, 0, 278, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	765, 766, 0, 0, 0, 0, 926, 0, 767, 0,
-	0, 775, 989, 990, 991, 992, 993, 994, 995, 996,
-	997, 998, 999, 1000, 1001, 1002, 1003, 1004, 1005, 1006,
-	1007, 1008, 1009, 1010, 1011, 1012, 1013, 1014, 1015, 1016,
-	1017, 1018, 1019, 1020, 1021, 1022, 1023, 1024, 1025, 1026,
-	1027, 1028, 1029, 1030, 777, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 300, 0, 406, 260, 0,
-	459, 925, 0, 0, 636, 0, 0, 923, 0, 0,
-	0, 0, 368, 0, 333, 199, 227, 0, 0, 416,
-	467, 479, 0, 0, 0, 976, 0, 477, 430, 611,
-	235, 287, 464, 437, 475, 445, 290, 0, 0, 476,
-	375, 592, 455, 608, 637, 638, 266, 410, 622, 528,
-	630, 655, 228, 263, 424, 512, 614, 500, 401, 588,
-	589, 332, 499, 298, 203, 372, 643, 226, 485, 374,
-	244, 233, 594, 619, 302, 254, 292, 462, 650, 215,
-	523, 605, 241, 489, 0, 0, 658, 249, 510, 617,
-	606, 217, 601, 509, 397, 329, 330, 216, 0, 463,
-	271, 296, 0, 0, 261, 419, 977, 978, 259, 659,
-	822, 629, 222, 0, 628, 412, 591, 602, 398, 386,
-	221, 600, 396, 385, 337, 830, 831, 283, 310, 907,
-	906, 905, 309, 311, 903, 904, 902, 209, 615, 633,
-	0, 210, 0, 505, 618, 660, 457, 214, 236, 237,
-	239, 0, 282, 286, 294, 297, 306, 307, 316, 370,
-	423, 451, 447, 456, 0, 585, 609, 623, 635, 641,
-	642, 644, 645, 646, 647, 648, 651, 649, 411, 314,
-	501, 336, 376, 0, 0, 429, 478, 242, 613, 502,
-	913, 935, 924, 788, 789, 914, 915, 939, 916, 791,
-	792, 936, 937, 785, 786, 790, 938, 940, 661, 662,
-	663, 664, 665, 666, 667, 668, 669, 670, 671, 672,
-	673, 674, 675, 676, 677, 678, 656, 514, 520, 515,
-	516, 517, 518, 519, 0, 521, 927, 774, 773, 0,
-	780, 781, 0, 810, 811, 813, 819, 820, 821, 832,
-	879, 880, 888, 890, 891, 889, 892, 893, 894, 897,
-	898, 899, 900, 895, 896, 901, 793, 797, 794, 795,
-	796, 808, 798, 799, 800, 801, 802, 803, 804, 805,
-	806, 807, 809, 950, 951, 952, 953, 954, 955, 825,
-	829, 828, 826, 827, 823, 824, 851, 850, 852, 853,
-	854, 855, 856, 857, 859, 858, 860, 861, 862, 863,
-	864, 865, 833, 834, 837, 838, 836, 835, 839, 848,
-	849, 840, 841, 842, 843, 844, 845, 847, 846, 866,
-	867, 868, 869, 870, 872, 871, 875, 876, 874, 873,
-	878, 877, 772, 198, 223, 371, 94, 460, 291, 657,
-	625, 490, 620, 208, 225, 941, 265, 942, 0, 0,
-	946, 0, 0, 0, 948, 947, 0, 949, 911, 910,
-	0, 0, 943, 944, 0, 945, 0, 0, 200, 202,
-	211, 224, 234, 238, 245, 264, 279, 281, 288, 301,
-	313, 321, 322, 325, 331, 383, 390, 391, 392, 393,
-	413, 414, 415, 418, 421, 422, 425, 427, 428, 431,
-	436, 440, 441, 442, 444, 446, 448, 461, 466, 480,
-	481, 482, 483, 484, 487, 488, 494, 495, 496, 497,
-	498, 506, 507, 522, 593, 595, 612, 632, 639, 486,
-	388, 434, 458, 586, 956, 957, 958, 959, 960, 961,
-	962, 963, 303, 607, 640, 604, 652, 634, 443, 381,
-	0, 0, 384, 284, 308, 323, 0, 624, 508, 229,
-	472, 293, 253, 1031, 0, 213, 248, 232, 262, 277,
-	280, 327, 395, 404, 433, 439, 299, 274, 246, 465,
-	243, 491, 525, 526, 527, 529, 399, 269, 438, 400,
-	0, 379, 582, 583, 319, 0, 0, 0, 534, 0,
-	784, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	420, 0, 0, 0, 771, 0, 0, 0, 273, 776,
-	0, 0, 0, 369, 270, 0, 0, 206, 511, 0,
-	435, 0, 205, 0, 493, 255, 380, 377, 590, 285,
-	276, 272, 252, 320, 389, 432, 524, 426, 783, 373,
-	0, 0, 503, 405, 0, 0, 0, 0, 0, 0,
-	0, 0, 778, 779, 0, 0, 0, 0, 0, 0,
-	0, 0, 326, 250, 328, 204, 417, 504, 289, 0,
-	95, 0, 0, 1032, 513, 966, 755, 932, 970, 1033,
-	984, 985, 986, 971, 0, 240, 972, 973, 247, 974,
-	0, 931, 814, 816, 815, 881, 882, 883, 884, 885,
-	886, 887, 817, 818, 812, 979, 616, 987, 988, 0,
-	268, 324, 275, 267, 587, 0, 0, 0, 0, 0,
-	0, 603, 0, 0, 231, 0, 0, 0, 0, 0,
-	0, 0, 751, 768, 0, 782, 0, 0, 0, 278,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 765, 766, 0, 0,
-	0, 0, 926, 0, 767, 0, 0, 775, 989, 990,
-	991, 992, 993, 994, 995, 996, 997, 998, 999, 1000,
-	1001, 1002, 1003, 1004, 1005, 1006, 1007, 1008, 1009, 1010,
-	1011, 1012, 1013, 1014, 1015, 1016, 1017, 1018, 1019, 1020,
-	1021, 1022, 1023, 1024, 1025, 1026, 1027, 1028, 1029, 1030,
-	777, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 300, 0, 406, 260, 0, 459, 925, 0, 0,
-	636, 0, 0, 923, 0, 0, 0, 0, 368, 0,
-	333, 199, 227, 0, 0, 416, 467, 479, 0, 0,
-	0, 976, 0, 477, 430, 611, 235, 287, 464, 437,
-	475, 445, 290, 4118, 0, 476, 375, 592, 455, 608,
-	637, 638, 266, 410, 622, 528, 630, 655, 228, 263,
-	424, 512, 614, 500, 401, 588, 589, 332, 499, 298,
-	203, 372, 643, 226, 485, 374, 244, 233, 594, 619,
-	302, 254, 292, 462, 650, 215, 523, 605, 241, 489,
-	0, 0, 658, 249, 510, 617, 606, 217, 601, 509,
-	397, 329, 330, 216, 0, 463, 271, 296, 0, 0,
-	261, 419, 977, 978, 259, 659, 822, 629, 222, 0,
-	628, 412, 591, 602, 398, 386, 221, 600, 396, 385,
-	337, 830, 831, 283, 310, 907, 906, 905, 309, 311,
-	903, 904, 902, 209, 615, 633, 0, 210, 0, 505,
-	618, 660, 457, 214, 236, 237, 239, 0, 282, 286,
-	294, 297, 306, 307, 316, 370, 423, 451, 447, 456,
-	0, 585, 609, 623, 635, 641, 642, 644, 645, 646,
-	647, 648, 651, 649, 411, 314, 501, 336, 376, 0,
-	0, 429, 478, 242, 613, 502, 913, 935, 924, 788,
-	789, 914, 915, 939, 916, 791, 792, 936, 937, 785,
-	786, 790, 938, 940, 661, 662, 663, 664, 665, 666,
-	667, 668, 669, 670, 671, 672, 673, 674, 675, 676,
-	677, 678, 656, 514, 520, 515, 516, 517, 518, 519,
-	0, 521, 927, 774, 773, 0, 780, 781, 0, 810,
-	811, 813, 819, 820, 821, 832, 879, 880, 888, 890,
-	891, 889, 892, 893, 894, 897, 898, 899, 900, 895,
-	896, 901, 793, 797, 794, 795, 796, 808, 798, 799,
-	800, 801, 802, 803, 804, 805, 806, 807, 809, 950,
-	951, 952, 953, 954, 955, 825, 829, 828, 826, 827,
-	823, 824, 851, 850, 852, 853, 854, 855, 856, 857,
-	859, 858, 860, 861, 862, 863, 864, 865, 833, 834,
-	837, 838, 836, 835, 839, 848, 849, 840, 841, 842,
-	843, 844, 845, 847, 846, 866, 867, 868, 869, 870,
-	872, 871, 875, 876, 874, 873, 878, 877, 772, 198,
-	223, 371, 0, 460, 291, 657, 625, 490, 620, 208,
-	225, 941, 265, 942, 0, 0, 946, 0, 0, 0,
-	948, 947, 0, 949, 911, 910, 0, 0, 943, 944,
-	0, 945, 0, 0, 200, 202, 211, 224, 234, 238,
-	245, 264, 279, 281, 288, 301, 313, 321, 322, 325,
-	331, 383, 390, 391, 392, 393, 413, 414, 415, 418,
-	421, 422, 425, 427, 428, 431, 436, 440, 441, 442,
-	444, 446, 448, 461, 466, 480, 481, 482, 483, 484,
-	487, 488, 494, 495, 496, 497, 498, 506, 507, 522,
-	593, 595, 612, 632, 639, 486, 388, 434, 458, 586,
-	956, 957, 958, 959, 960, 961, 962, 963, 303, 607,
-	640, 604, 652, 634, 443, 381, 0, 0, 384, 284,
-	308, 323, 0, 624, 508, 229, 472, 293, 253, 1031,
-	0, 213, 248, 232, 262, 277, 280, 327, 395, 404,
-	433, 439, 299, 274, 246, 465, 243, 491, 525, 526,
-	527, 529, 399, 269, 438, 400, 0, 379, 582, 583,
-	319, 0, 0, 0, 534, 0, 784, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 420, 0, 0, 0,
-	771, 0, 0, 0, 273, 776, 0, 0, 0, 369,
-	270, 0, 0, 206, 511, 0, 435, 0, 205, 0,
-	493, 255, 380, 377, 590, 285, 276, 272, 252, 320,
-	389, 432, 524, 426, 783, 373, 0, 0, 503, 405,
-	0, 0, 0, 0, 0, 0, 0, 0, 778, 779,
-	0, 0, 0, 0, 0, 0, 0, 0, 326, 250,
-	328, 204, 417, 504, 289, 0, 95, 0, 1764, 1032,
-	513, 966, 755, 932, 970, 1033, 984, 985, 986, 971,
-	0, 240, 972, 973, 247, 974, 0, 931, 814, 816,
-	815, 881, 882, 883, 884, 885, 886, 887, 817, 818,
-	812, 979, 616, 987, 988, 0, 268, 324, 275, 267,
-	587, 0, 0, 0, 0, 0, 0, 603, 0, 0,
-	231, 0, 0, 0, 0, 0, 0, 0, 751, 768,
-	0, 782, 0, 0, 0, 278, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 765, 766, 0, 0, 0, 0, 926, 0,
-	767, 0, 0, 775, 989, 990, 991, 992, 993, 994,
-	995, 996, 997, 998, 999, 1000, 1001, 1002, 1003, 1004,
-	1005, 1006, 1007, 1008, 1009, 1010, 1011, 1012, 1013, 1014,
-	1015, 1016, 1017, 1018, 1019, 1020, 1021, 1022, 1023, 1024,
-	1025, 1026, 1027, 1028, 1029, 1030, 777, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 300, 0, 406,
-	260, 0, 459, 925, 0, 0, 636, 0, 0, 923,
-	0, 0, 0, 0, 368, 0, 333, 199, 227, 0,
-	0, 416, 467, 479, 0, 0, 0, 976, 0, 477,
-	430, 611, 235, 287, 464, 437, 475, 445, 290, 0,
-	0, 476, 375, 592, 455, 608, 637, 638, 266, 410,
-	622, 528, 630, 655, 228, 263, 424, 512, 614, 500,
-	401, 588, 589, 332, 499, 298, 203, 372, 643, 226,
-	485, 374, 244, 233, 594, 619, 302, 254, 292, 462,
-	650, 215, 523, 605, 241, 489, 0, 0, 658, 249,
-	510, 617, 606, 217, 601, 509, 397, 329, 330, 216,
-	0, 463, 271, 296, 0, 0, 261, 419, 977, 978,
-	259, 659, 822, 629, 222, 0, 628, 412, 591, 602,
-	398, 386, 221, 600, 396, 385, 337, 830, 831, 283,
-	310, 907, 906, 905, 309, 311, 903, 904, 902, 209,
-	615, 633, 0, 210, 0, 505, 618, 660, 457, 214,
-	236, 237, 239, 0, 282, 286, 294, 297, 306, 307,
-	316, 370, 423, 451, 447, 456, 0, 585, 609, 623,
-	635, 641, 642, 644, 645, 646, 647, 648, 651, 649,
-	411, 314, 501, 336, 376, 0, 0, 429, 478, 242,
-	613, 502, 913, 935, 924, 788, 789, 914, 915, 939,
-	916, 791, 792, 936, 937, 785, 786, 790, 938, 940,
-	661, 662, 663, 664, 665, 666, 667, 668, 669, 670,
-	671, 672, 673, 674, 675, 676, 677, 678, 656, 514,
-	520, 515, 516, 517, 518, 519, 0, 521, 927, 774,
-	773, 0, 780, 781, 0, 810, 811, 813, 819, 820,
-	821, 832, 879, 880, 888, 890, 891, 889, 892, 893,
-	894, 897, 898, 899, 900, 895, 896, 901, 793, 797,
-	794, 795, 796, 808, 798, 799, 800, 801, 802, 803,
-	804, 805, 806, 807, 809, 950, 951, 952, 953, 954,
-	955, 825, 829, 828, 826, 827, 823, 824, 851, 850,
-	852, 853, 854, 855, 856, 857, 859, 858, 860, 861,
-	862, 863, 864, 865, 833, 834, 837, 838, 836, 835,
-	839, 848, 849, 840, 841, 842, 843, 844, 845, 847,
-	846, 866, 867, 868, 869, 870, 872, 871, 875, 876,
-	874, 873, 878, 877, 772, 198, 223, 371, 0, 460,
-	291, 657, 625, 490, 620, 208, 225, 941, 265, 942,
-	0, 0, 946, 0, 0, 0, 948, 947, 0, 949,
-	911, 910, 0, 0, 943, 944, 0, 945, 0, 0,
-	200, 202, 211, 224, 234, 238, 245, 264, 279, 281,
-	288, 301, 313, 321, 322, 325, 331, 383, 390, 391,
-	392, 393, 413, 414, 415, 418, 421, 422, 425, 427,
-	428, 431, 436, 440, 441, 442, 444, 446, 448, 461,
-	466, 480, 481, 482, 483, 484, 487, 488, 494, 495,
-	496, 497, 498, 506, 507, 522, 593, 595, 612, 632,
-	639, 486, 388, 434, 458, 586, 956, 957, 958, 959,
-	960, 961, 962, 963, 303, 607, 640, 604, 652, 634,
-	443, 381, 0, 0, 384, 284, 308, 323, 0, 624,
-	508, 229, 472, 293, 253, 1031, 0, 213, 248, 232,
-	262, 277, 280, 327, 395, 404, 433, 439, 299, 274,
-	246, 465, 243, 491, 525, 526, 527, 529, 399, 269,
-	438, 400, 0, 379, 582, 583, 319, 0, 0, 0,
-	534, 0, 784, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 420, 0, 0, 0, 771, 0, 0, 0,
-	273, 776, 0, 0, 0, 369, 270, 0, 0, 206,
-	511, 0, 435, 0, 205, 0, 493, 255, 380, 377,
-	590, 285, 276, 272, 252, 320, 389, 432, 524, 426,
-	783, 373, 0, 0, 503, 405, 0, 0, 0, 0,
-	0, 0, 0, 0, 778, 779, 0, 0, 0, 0,
-	0, 0, 0, 0, 326, 250, 328, 204, 417, 504,
-	289, 0, 95, 0, 0, 1032, 513, 966, 755, 932,
-	970, 1033, 984, 985, 986, 971, 0, 240, 972, 973,
-	247, 974, 0, 931, 814, 816, 815, 881, 882, 883,
-	884, 885, 886, 887, 817, 818, 812, 979, 616, 987,
-	988, 0, 268, 324, 275, 267, 587, 0, 0, 0,
-	0, 0, 0, 603, 0, 0, 231, 0, 0, 0,
-	0, 0, 0, 0, 751, 768, 0, 782, 0, 0,
-	0, 278, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 765, 766,
-	1079, 0, 0, 0, 926, 0, 767, 0, 0, 775,
-	989, 990, 991, 992, 993, 994, 995, 996, 997, 998,
-	999, 1000, 1001, 1002, 1003, 1004, 1005, 1006, 1007, 1008,
-	1009, 1010, 1011, 1012, 1013, 1014, 1015, 1016, 1017, 1018,
-	1019, 1020, 1021, 1022, 1023, 1024, 1025, 1026, 1027, 1028,
-	1029, 1030, 777, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 300, 0, 406, 260, 0, 459, 925,
-	0, 0, 636, 0, 0, 923, 0, 0, 0, 0,
-	368, 0, 333, 199, 227, 0, 0, 416, 467, 479,
-	0, 0, 0, 976, 0, 477, 430, 611, 235, 287,
-	464, 437, 475, 445, 290, 0, 0, 476, 375, 592,
-	455, 608, 637, 638, 266, 410, 622, 528, 630, 655,
-	228, 263, 424, 512, 614, 500, 401, 588, 589, 332,
-	499, 298, 203, 372, 643, 226, 485, 374, 244, 233,
-	594, 619, 302, 254, 292, 462, 650, 215, 523, 605,
-	241, 489, 0, 0, 658, 249, 510, 617, 606, 217,
-	601, 509, 397, 329, 330, 216, 0, 463, 271, 296,
-	0, 0, 261, 419, 977, 978, 259, 659, 822, 629,
-	222, 0, 628, 412, 591, 602, 398, 386, 221, 600,
-	396, 385, 337, 830, 831, 283, 310, 907, 906, 905,
-	309, 311, 903, 904, 902, 209, 615, 633, 0, 210,
-	0, 505, 618, 660, 457, 214, 236, 237, 239, 0,
-	282, 286, 294, 297, 306, 307, 316, 370, 423, 451,
-	447, 456, 0, 585, 609, 623, 635, 641, 642, 644,
-	645, 646, 647, 648, 651, 649, 411, 314, 501, 336,
-	376, 0, 0, 429, 478, 242, 613, 502, 913, 935,
-	924, 788, 789, 914, 915, 939, 916, 791, 792, 936,
-	937, 785, 786, 790, 938, 940, 661, 662, 663, 664,
-	665, 666, 667, 668, 669, 670, 671, 672, 673, 674,
-	675, 676, 677, 678, 656, 514, 520, 515, 516, 517,
-	518, 519, 0, 521, 927, 774, 773, 0, 780, 781,
-	0, 810, 811, 813, 819, 820, 821, 832, 879, 880,
-	888, 890, 891, 889, 892, 893, 894, 897, 898, 899,
-	900, 895, 896, 901, 793, 797, 794, 795, 796, 808,
-	798, 799, 800, 801, 802, 803, 804, 805, 806, 807,
-	809, 950, 951, 952, 953, 954, 955, 825, 829, 828,
-	826, 827, 823, 824, 851, 850, 852, 853, 854, 855,
-	856, 857, 859, 858, 860, 861, 862, 863, 864, 865,
-	833, 834, 837, 838, 836, 835, 839, 848, 849, 840,
-	841, 842, 843, 844, 845, 847, 846, 866, 867, 868,
-	869, 870, 872, 871, 875, 876, 874, 873, 878, 877,
-	772, 198, 223, 371, 0, 460, 291, 657, 625, 490,
-	620, 208, 225, 941, 265, 942, 0, 0, 946, 0,
-	0, 0, 948, 947, 0, 949, 911, 910, 0, 0,
-	943, 944, 0, 945, 0, 0, 200, 202, 211, 224,
-	234, 238, 245, 264, 279, 281, 288, 301, 313, 321,
-	322, 325, 331, 383, 390, 391, 392, 393, 413, 414,
-	415, 418, 421, 422, 425, 427, 428, 431, 436, 440,
-	441, 442, 444, 446, 448, 461, 466, 480, 481, 482,
-	483, 484, 487, 488, 494, 495, 496, 497, 498, 506,
-	507, 522, 593, 595, 612, 632, 639, 486, 388, 434,
-	458, 586, 956, 957, 958, 959, 960, 961, 962, 963,
-	303, 607, 640, 604, 652, 634, 443, 381, 0, 0,
-	384, 284, 308, 323, 0, 624, 508, 229, 472, 293,
-	253, 1031, 0, 213, 248, 232, 262, 277, 280, 327,
-	395, 404, 433, 439, 299, 274, 246, 465, 243, 491,
-	525, 526, 527, 529, 399, 269, 438, 400, 0, 379,
-	582, 583, 319, 0, 0, 0, 534, 0, 784, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 420, 0,
-	0, 0, 771, 0, 0, 0, 273, 776, 0, 0,
-	0, 369, 270, 0, 0, 206, 511, 0, 435, 0,
-	205, 0, 493, 255, 380, 377, 590, 285, 276, 272,
-	252, 320, 389, 432, 524, 426, 783, 373, 0, 0,
-	503, 405, 0, 0, 0, 0, 0, 0, 0, 0,
-	778, 779, 0, 0, 0, 0, 0, 0, 0, 0,
-	326, 250, 328, 204, 417, 504, 289, 0, 95, 0,
-	0, 1032, 513, 966, 755, 932, 970, 1033, 984, 985,
-	986, 971, 0, 240, 972, 973, 247, 974, 0, 931,
-	814, 816, 815, 881, 882, 883, 884, 885, 886, 887,
-	817, 818, 812, 979, 616, 987, 988, 0, 268, 324,
-	275, 267, 587, 0, 0, 0, 0, 0, 0, 603,
-	0, 0, 231, 0, 0, 0, 0, 0, 0, 0,
-	751, 768, 0, 782, 0, 0, 0, 278, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 765, 766, 0, 0, 0, 0,
-	926, 0, 767, 0, 0, 775, 989, 990, 991, 992,
-	993, 994, 995, 996, 997, 998, 999, 1000, 1001, 1002,
-	1003, 1004, 1005, 1006, 1007, 1008, 1009, 1010, 1011, 1012,
-	1013, 1014, 1015, 1016, 1017, 1018, 1019, 1020, 1021, 1022,
-	1023, 1024, 1025, 1026, 1027, 1028, 1029, 1030, 777, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 300,
-	0, 406, 260, 0, 459, 925, 0, 0, 636, 0,
-	0, 923, 0, 0, 0, 0, 368, 0, 333, 199,
-	227, 0, 0, 416, 467, 479, 0, 0, 0, 976,
-	0, 477, 430, 611, 235, 287, 464, 437, 475, 445,
-	290, 0, 0, 476, 375, 592, 455, 608, 637, 638,
-	266, 410, 622, 528, 630, 655, 228, 263, 424, 512,
-	614, 500, 401, 588, 589, 332, 499, 298, 203, 372,
-	643, 226, 485, 374, 244, 233, 594, 619, 302, 254,
-	292, 462, 650, 215, 523, 605, 241, 489, 0, 0,
-	658, 249, 510, 617, 606, 217, 601, 509, 397, 329,
-	330, 216, 0, 463, 271, 296, 0, 0, 261, 419,
-	977, 978, 259, 659, 822, 629, 222, 0, 628, 412,
-	591, 602, 398, 386, 221, 600, 396, 385, 337, 830,
-	831, 283, 310, 907, 906, 905, 309, 311, 903, 904,
-	902, 209, 615, 633, 0, 210, 0, 505, 618, 660,
-	457, 214, 236, 237, 239, 0, 282, 286, 294, 297,
-	306, 307, 316, 370, 423, 451, 447, 456, 0, 585,
-	609, 623, 635, 641, 642, 644, 645, 646, 647, 648,
-	651, 649, 411, 314, 501, 336, 376, 0, 0, 429,
-	478, 242, 613, 502, 913, 935, 924, 788, 789, 914,
-	915, 939, 916, 791, 792, 936, 937, 785, 786, 790,
-	938, 940, 661, 662, 663, 664, 665, 666, 667, 668,
-	669, 670, 671, 672, 673, 674, 675, 676, 677, 678,
-	656, 514, 520, 515, 516, 517, 518, 519, 0, 521,
-	927, 774, 773, 0, 780, 781, 0, 810, 811, 813,
-	819, 820, 821, 832, 879, 880, 888, 890, 891, 889,
-	892, 893, 894, 897, 898, 899, 900, 895, 896, 901,
-	793, 797, 794, 795, 796, 808, 798, 799, 800, 801,
-	802, 803, 804, 805, 806, 807, 809, 950, 951, 952,
-	953, 954, 955, 825, 829, 828, 826, 827, 823, 824,
-	851, 850, 852, 853, 854, 855, 856, 857, 859, 858,
-	860, 861, 862, 863, 864, 865, 833, 834, 837, 838,
-	836, 835, 839, 848, 849, 840, 841, 842, 843, 844,
-	845, 847, 846, 866, 867, 868, 869, 870, 872, 871,
-	875, 876, 874, 873, 878, 877, 772, 198, 223, 371,
-	0, 460, 291, 657, 625, 490, 620, 208, 225, 941,
-	265, 942, 0, 0, 946, 0, 0, 0, 948, 947,
-	0, 949, 911, 910, 0, 0, 943, 944, 0, 945,
-	0, 0, 200, 202, 211, 224, 234, 238, 245, 264,
-	279, 281, 288, 301, 313, 321, 322, 325, 331, 383,
-	390, 391, 392, 393, 413, 414, 415, 418, 421, 422,
-	425, 427, 428, 431, 436, 440, 441, 442, 444, 446,
-	448, 461, 466, 480, 481, 482, 483, 484, 487, 488,
-	494, 495, 496, 497, 498, 506, 507, 522, 593, 595,
-	612, 632, 639, 486, 388, 434, 458, 586, 956, 957,
-	958, 959, 960, 961, 962, 963, 303, 607, 640, 604,
-	652, 634, 443, 381, 0, 0, 384, 284, 308, 323,
-	0, 624, 508, 229, 472, 293, 253, 1031, 0, 213,
-	248, 232, 262, 277, 280, 327, 395, 404, 433, 439,
-	299, 274, 246, 465, 243, 491, 525, 526, 527, 529,
-	399, 269, 438, 400, 0, 379, 582, 583, 319, 0,
-	0, 0, 534, 0, 784, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 420, 0, 0, 0, 771, 0,
-	0, 0, 273, 776, 0, 0, 0, 369, 270, 0,
-	0, 206, 511, 0, 435, 0, 205, 0, 493, 255,
-	380, 377, 590, 285, 276, 272, 252, 320, 389, 432,
-	524, 426, 783, 373, 0, 0, 503, 405, 0, 0,
-	0, 0, 0, 0, 0, 0, 778, 779, 0, 0,
-	0, 0, 0, 0, 0, 0, 326, 250, 328, 204,
-	417, 504, 289, 0, 95, 0, 0, 1032, 513, 966,
-	755, 932, 970, 1033, 984, 985, 986, 971, 0, 240,
-	972, 973, 247, 974, 0, 931, 814, 816, 815, 881,
-	882, 883, 884, 885, 886, 887, 817, 818, 812, 979,
-	616, 987, 988, 0, 268, 324, 275, 267, 587, 0,
-	0, 0, 0, 0, 0, 603, 0, 0, 231, 0,
-	0, 0, 0, 0, 0, 0, 751, 768, 0, 782,
-	0, 0, 0, 278, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	765, 766, 0, 0, 0, 0, 926, 0, 767, 0,
-	0, 775, 989, 990, 991, 992, 993, 994, 995, 996,
-	997, 998, 999, 1000, 1001, 1002, 1003, 1004, 1005, 1006,
-	1007, 1008, 1009, 1010, 1011, 1012, 1013, 1014, 1015, 1016,
-	1017, 1018, 1019, 1020, 1021, 1022, 1023, 1024, 1025, 1026,
-	1027, 1028, 1029, 1030, 3193, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 300, 0, 406, 260, 0,
-	459, 925, 0, 0, 636, 0, 0, 923, 0, 0,
-	0, 0, 368, 0, 333, 199, 227, 0, 0, 416,
-	467, 479, 0, 0, 0, 976, 0, 477, 430, 611,
-	235, 287, 464, 437, 475, 445, 290, 0, 0, 476,
-	375, 592, 455, 608, 637, 638, 266, 410, 622, 528,
-	630, 655, 228, 263, 424, 512, 614, 500, 401, 588,
-	589, 332, 499, 298, 203, 372, 643, 226, 485, 374,
-	244, 233, 594, 619, 302, 254, 292, 462, 650, 215,
-	523, 605, 241, 489, 0, 0, 658, 249, 510, 617,
-	606, 217, 601, 509, 397, 329, 330, 216, 0, 463,
-	271, 296, 0, 0, 261, 419, 977, 978, 259, 659,
-	822, 629, 222, 0, 628, 412, 591, 602, 398, 386,
-	221, 600, 396, 385, 337, 830, 831, 283, 310, 907,
-	906, 905, 309, 311, 903, 904, 902, 209, 615, 633,
-	0, 210, 0, 505, 618, 660, 457, 214, 236, 237,
-	239, 0, 282, 286, 294, 297, 306, 307, 316, 370,
-	423, 451, 447, 456, 0, 585, 609, 623, 635, 641,
-	642, 644, 645, 646, 647, 648, 651, 649, 411, 314,
-	501, 336, 376, 0, 0, 429, 478, 242, 613, 502,
-	913, 935, 924, 788, 789, 914, 915, 939, 916, 791,
-	792, 936, 937, 785, 786, 790, 938, 940, 661, 662,
-	663, 664, 665, 666, 667, 668, 669, 670, 671, 672,
-	673, 674, 675, 676, 677, 678, 656, 514, 520, 515,
-	516, 517, 518, 519, 0, 521, 927, 774, 773, 0,
-	780, 781, 0, 810, 811, 813, 819, 820, 821, 832,
-	879, 880, 888, 890, 891, 889, 892, 893, 894, 897,
-	898, 899, 900, 895, 896, 901, 793, 797, 794, 795,
-	796, 808, 798, 799, 800, 801, 802, 803, 804, 805,
-	806, 807, 809, 950, 951, 952, 953, 954, 955, 825,
-	829, 828, 826, 827, 823, 824, 851, 850, 852, 853,
-	854, 855, 856, 857, 859, 858, 860, 861, 862, 863,
-	864, 865, 833, 834, 837, 838, 836, 835, 839, 848,
-	849, 840, 841, 842, 843, 844, 845, 847, 846, 866,
-	867, 868, 869, 870, 872, 871, 875, 876, 874, 873,
-	878, 877, 772, 198, 223, 371, 0, 460, 291, 657,
-	625, 490, 620, 208, 225, 941, 265, 942, 0, 0,
-	946, 0, 0, 0, 948, 947, 0, 949, 911, 910,
-	0, 0, 943, 944, 0, 945, 0, 0, 200, 202,
-	211, 224, 234, 238, 245, 264, 279, 281, 288, 301,
-	313, 321, 322, 325, 331, 383, 390, 391, 392, 393,
-	413, 414, 415, 418, 421, 422, 425, 427, 428, 431,
-	436, 440, 441, 442, 444, 446, 448, 461, 466, 480,
-	481, 482, 483, 484, 487, 488, 494, 495, 496, 497,
-	498, 506, 507, 522, 593, 595, 612, 632, 639, 486,
-	388, 434, 458, 586, 956, 957, 958, 959, 960, 961,
-	962, 963, 303, 607, 640, 604, 652, 634, 443, 381,
-	0, 0, 384, 284, 308, 323, 0, 624, 508, 229,
-	472, 293, 253, 1031, 0, 213, 248, 232, 262, 277,
-	280, 327, 395, 404, 433, 439, 299, 274, 246, 465,
-	243, 491, 525, 526, 527, 529, 399, 269, 438, 400,
-	0, 379, 582, 583, 319, 0, 0, 0, 534, 0,
-	784, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	420, 0, 0, 0, 771, 0, 0, 0, 273, 776,
-	0, 0, 0, 369, 270, 0, 0, 206, 511, 0,
-	435, 0, 205, 0, 493, 255, 380, 377, 590, 285,
-	276, 272, 252, 320, 389, 432, 524, 426, 783, 373,
-	0, 0, 503, 405, 0, 0, 0, 0, 0, 0,
-	0, 0, 778, 779, 0, 0, 0, 0, 0, 0,
-	0, 0, 326, 250, 328, 204, 417, 504, 289, 0,
-	95, 0, 0, 1032, 513, 966, 755, 932, 970, 1033,
-	984, 985, 986, 971, 0, 240, 972, 973, 247, 974,
-	0, 931, 814, 816, 815, 881, 882, 883, 884, 885,
-	886, 887, 817, 818, 812, 979, 616, 987, 988, 0,
-	268, 324, 275, 267, 587, 0, 0, 0, 0, 0,
-	0, 603, 0, 0, 231, 0, 0, 0, 0, 0,
-	0, 0, 751, 768, 0, 782, 0, 0, 0, 278,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 765, 766, 0, 0,
-	0, 0, 926, 0, 767, 0, 0, 775, 989, 990,
-	991, 992, 993, 994, 995, 996, 997, 998, 999, 1000,
-	1001, 1002, 1003, 1004, 1005, 1006, 1007, 1008, 1009, 1010,
-	1011, 1012, 1013, 1014, 1015, 1016, 1017, 1018, 1019, 1020,
-	1021, 1022, 1023, 1024, 1025, 1026, 1027, 1028, 1029, 1030,
-	3189, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 300, 0, 406, 260, 0, 459, 925, 0, 0,
-	636, 0, 0, 923, 0, 0, 0, 0, 368, 0,
-	333, 199, 227, 0, 0, 416, 467, 479, 0, 0,
-	0, 976, 0, 477, 430, 611, 235, 287, 464, 437,
-	475, 445, 290, 0, 0, 476, 375, 592, 455, 608,
-	637, 638, 266, 410, 622, 528, 630, 655, 228, 263,
-	424, 512, 614, 500, 401, 588, 589, 332, 499, 298,
-	203, 372, 643, 226, 485, 374, 244, 233, 594, 619,
-	302, 254, 292, 462, 650, 215, 523, 605, 241, 489,
-	0, 0, 658, 249, 510, 617, 606, 217, 601, 509,
-	397, 329, 330, 216, 0, 463, 271, 296, 0, 0,
-	261, 419, 977, 978, 259, 659, 822, 629, 222, 0,
-	628, 412, 591, 602, 398, 386, 221, 600, 396, 385,
-	337, 830, 831, 283, 310, 907, 906, 905, 309, 311,
-	903, 904, 902, 209, 615, 633, 0, 210, 0, 505,
-	618, 660, 457, 214, 236, 237, 239, 0, 282, 286,
-	294, 297, 306, 307, 316, 370, 423, 451, 447, 456,
-	0, 585, 609, 623, 635, 641, 642, 644, 645, 646,
-	647, 648, 651, 649, 411, 314, 501, 336, 376, 0,
-	0, 429, 478, 242, 613, 502, 913, 935, 924, 788,
-	789, 914, 915, 939, 916, 791, 792, 936, 937, 785,
-	786, 790, 938, 940, 661, 662, 663, 664, 665, 666,
-	667, 668, 669, 670, 671, 672, 673, 674, 675, 676,
-	677, 678, 656, 514, 520, 515, 516, 517, 518, 519,
-	0, 521, 927, 774, 773, 0, 780, 781, 0, 810,
-	811, 813, 819, 820, 821, 832, 879, 880, 888, 890,
-	891, 889, 892, 893, 894, 897, 898, 899, 900, 895,
-	896, 901, 793, 797, 794, 795, 796, 808, 798, 799,
-	800, 801, 802, 803, 804, 805, 806, 807, 809, 950,
-	951, 952, 953, 954, 955, 825, 829, 828, 826, 827,
-	823, 824, 851, 850, 852, 853, 854, 855, 856, 857,
-	859, 858, 860, 861, 862, 863, 864, 865, 833, 834,
-	837, 838, 836, 835, 839, 848, 849, 840, 841, 842,
-	843, 844, 845, 847, 846, 866, 867, 868, 869, 870,
-	872, 871, 875, 876, 874, 873, 878, 877, 772, 198,
-	223, 371, 0, 460, 291, 657, 625, 490, 620, 208,
-	225, 941, 265, 942, 0, 0, 946, 0, 0, 0,
-	948, 947, 0, 949, 911, 910, 0, 0, 943, 944,
-	0, 945, 0, 0, 200, 202, 211, 224, 234, 238,
-	245, 264, 279, 281, 288, 301, 313, 321, 322, 325,
-	331, 383, 390, 391, 392, 393, 413, 414, 415, 418,
-	421, 422, 425, 427, 428, 431, 436, 440, 441, 442,
-	444, 446, 448, 461, 466, 480, 481, 482, 483, 484,
-	487, 488, 494, 495, 496, 497, 498, 506, 507, 522,
-	593, 595, 612, 632, 639, 486, 388, 434, 458, 586,
-	956, 957, 958, 959, 960, 961, 962, 963, 303, 607,
-	640, 604, 652, 634, 443, 381, 0, 0, 384, 284,
-	308, 323, 0, 624, 508, 229, 472, 293, 253, 1031,
-	0, 213, 248, 232, 262, 277, 280, 327, 395, 404,
-	433, 439, 299, 274, 246, 465, 243, 491, 525, 526,
-	527, 529, 399, 269, 438, 400, 0, 379, 582, 583,
-	319, 0, 0, 0, 534, 0, 784, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 420, 0, 0, 0,
-	771, 0, 0, 0, 273, 776, 0, 0, 0, 369,
-	270, 0, 0, 206, 511, 0, 435, 0, 205, 0,
-	493, 255, 380, 377, 590, 285, 276, 272, 252, 320,
-	389, 432, 524, 426, 783, 373, 0, 0, 503, 405,
-	0, 0, 0, 0, 0, 0, 0, 0, 778, 779,
-	0, 0, 0, 0, 0, 0, 0, 0, 326, 250,
-	328, 204, 417, 504, 289, 0, 95, 0, 0, 1032,
-	513, 966, 1100, 932, 970, 1033, 984, 985, 986, 971,
-	0, 240, 972, 973, 247, 974, 0, 931, 814, 816,
-	815, 881, 882, 883, 884, 885, 886, 887, 817, 818,
-	812, 979, 616, 987, 988, 0, 268, 324, 275, 267,
-	587, 0, 0, 0, 0, 0, 0, 603, 0, 0,
-	231, 0, 0, 0, 0, 0, 0, 0, 0, 768,
-	0, 782, 0, 0, 0, 278, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 765, 766, 0, 0, 0, 0, 926, 0,
-	767, 0, 0, 775, 989, 990, 991, 992, 993, 994,
-	995, 996, 997, 998, 999, 1000, 1001, 1002, 1003, 1004,
-	1005, 1006, 1007, 1008, 1009, 1010, 1011, 1012, 1013, 1014,
-	1015, 1016, 1017, 1018, 1019, 1020, 1021, 1022, 1023, 1024,
-	1025, 1026, 1027, 1028, 1029, 1030, 777, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 300, 0, 406,
-	260, 0, 459, 925, 0, 0, 636, 0, 0, 923,
-	0, 0, 0, 0, 368, 0, 333, 199, 227, 0,
-	0, 416, 467, 479, 0, 0, 0, 976, 0, 477,
-	430, 611, 235, 287, 464, 437, 475, 445, 290, 0,
-	0, 476, 375, 592, 455, 608, 637, 638, 266, 410,
-	622, 528, 630, 655, 228, 263, 424, 512, 614, 500,
-	401, 588, 589, 332, 499, 298, 203, 372, 643, 226,
-	485, 374, 244, 233, 594, 619, 302, 254, 292, 462,
-	650, 215, 523, 605, 241, 489, 0, 0, 658, 249,
-	510, 617, 606, 217, 601, 509, 397, 329, 330, 216,
-	0, 463, 271, 296, 0, 0, 261, 419, 977, 978,
-	259, 659, 822, 629, 222, 0, 628, 412, 591, 602,
-	398, 386, 221, 600, 396, 385, 337, 830, 831, 283,
-	310, 907, 906, 905, 309, 311, 903, 904, 902, 209,
-	615, 633, 0, 210, 0, 505, 618, 660, 457, 214,
-	236, 237, 239, 0, 282, 286, 294, 297, 306, 307,
-	316, 370, 423, 451, 447, 456, 0, 585, 609, 623,
-	635, 641, 642, 644, 645, 646, 647, 648, 651, 649,
-	411, 314, 501, 336, 376, 0, 0, 429, 478, 242,
-	613, 502, 913, 935, 924, 788, 789, 914, 915, 939,
-	916, 791, 792, 936, 937, 785, 786, 790, 938, 940,
-	661, 662, 663, 664, 665, 666, 667, 668, 669, 670,
-	671, 672, 673, 674, 675, 676, 677, 678, 656, 514,
-	520, 515, 516, 517, 518, 519, 0, 521, 927, 774,
-	773, 0, 780, 781, 0, 810, 811, 813, 819, 820,
-	821, 832, 879, 880, 888, 890, 891, 889, 892, 893,
-	894, 897, 898, 899, 900, 895, 896, 901, 793, 797,
-	794, 795, 796, 808, 798, 799, 800, 801, 802, 803,
-	804, 805, 806, 807, 809, 950, 951, 952, 953, 954,
-	955, 825, 829, 828, 826, 827, 823, 824, 851, 850,
-	852, 853, 854, 855, 856, 857, 859, 858, 860, 861,
-	862, 863, 864, 865, 833, 834, 837, 838, 836, 835,
-	839, 848, 849, 840, 841, 842, 843, 844, 845, 847,
-	846, 866, 867, 868, 869, 870, 872, 871, 875, 876,
-	874, 873, 878, 877, 772, 198, 223, 371, 0, 460,
-	291, 657, 625, 490, 620, 208, 225, 941, 265, 942,
-	0, 0, 946, 0, 0, 0, 948, 947, 0, 949,
-	911, 910, 0, 0, 943, 944, 0, 945, 0, 0,
-	200, 202, 211, 224, 234, 238, 245, 264, 279, 281,
-	288, 301, 313, 321, 322, 325, 331, 383, 390, 391,
-	392, 393, 413, 414, 415, 418, 421, 422, 425, 427,
-	428, 431, 436, 440, 441, 442, 444, 446, 448, 461,
-	466, 480, 481, 482, 483, 484, 487, 488, 494, 495,
-	496, 497, 498, 506, 507, 522, 593, 595, 612, 632,
-	639, 486, 388, 434, 458, 586, 956, 957, 958, 959,
-	960, 961, 962, 963, 303, 607, 640, 604, 652, 634,
-	443, 381, 0, 0, 384, 284, 308, 323, 0, 624,
-	508, 229, 472, 293, 253, 1031, 0, 213, 248, 232,
-	262, 277, 280, 327, 395, 404, 433, 439, 299, 274,
-	246, 465, 243, 491, 525, 526, 527, 529, 399, 269,
-	438, 400, 0, 379, 582, 583, 319, 0, 0, 0,
-	534, 0, 784, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 420, 0, 0, 0, 771, 0, 0, 0,
-	273, 776, 0, 0, 0, 369, 270, 0, 0, 206,
-	511, 0, 435, 0, 205, 0, 493, 255, 380, 377,
-	590, 285, 276, 272, 252, 320, 389, 432, 524, 426,
-	783, 373, 0, 0, 503, 405, 0, 0, 0, 0,
-	0, 0, 0, 0, 778, 779, 0, 0, 0, 0,
-	0, 0, 0, 0, 326, 250, 328, 204, 417, 504,
-	289, 0, 95, 0, 0, 1032, 513, 966, 1100, 932,
-	970, 1033, 984, 985, 986, 971, 0, 240, 972, 973,
-	247, 974, 0, 931, 814, 816, 815, 881, 882, 883,
-	884, 885, 886, 887, 817, 818, 812, 979, 616, 987,
-	988, 0, 268, 324, 275, 267, 587, 0, 0, 0,
-	0, 0, 0, 603, 0, 0, 231, 0, 0, 0,
-	0, 0, 0, 0, 0, 768, 0, 782, 0, 0,
-	0, 278, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 765, 766,
-	0, 0, 0, 0, 926, 0, 767, 0, 0, 775,
-	989, 990, 991, 992, 993, 994, 995, 996, 997, 998,
-	999, 1000, 1001, 1002, 1003, 1004, 1005, 1006, 1007, 1008,
-	1009, 1010, 1011, 1012, 1013, 1014, 1015, 1016, 1017, 1018,
-	1019, 1020, 1021, 1022, 1023, 1024, 1025, 1026, 1027, 1028,
-	1029, 1030, 2139, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 300, 0, 406, 260, 0, 459, 925,
-	0, 0, 636, 0, 0, 923, 0, 0, 0, 0,
-	368, 0, 333, 199, 227, 0, 0, 416, 467, 479,
-	0, 0, 0, 976, 0, 477, 430, 611, 235, 287,
-	464, 437, 475, 445, 290, 0, 0, 476, 375, 592,
-	455, 608, 637, 638, 266, 410, 622, 528, 630, 655,
-	228, 263, 424, 512, 614, 500, 401, 588, 589, 332,
-	499, 298, 203, 372, 643, 226, 485, 374, 244, 233,
-	594, 619, 302, 254, 292, 462, 650, 215, 523, 605,
-	241, 489, 0, 0, 658, 249, 510, 617, 606, 217,
-	601, 509, 397, 329, 330, 216, 0, 463, 271, 296,
-	0, 0, 261, 419, 977, 978, 259, 659, 822, 629,
-	222, 0, 628, 412, 591, 602, 398, 386, 221, 600,
-	396, 385, 337, 830, 831, 283, 310, 907, 906, 905,
-	309, 311, 903, 904, 902, 209, 615, 633, 0, 210,
-	0, 505, 618, 660, 457, 214, 236, 237, 239, 0,
-	282, 286, 294, 297, 306, 307, 316, 370, 423, 451,
-	447, 456, 0, 585, 609, 623, 635, 641, 642, 644,
-	645, 646, 647, 648, 651, 649, 411, 314, 501, 336,
-	376, 0, 0, 429, 478, 242, 613, 502, 913, 935,
-	924, 788, 789, 914, 915, 939, 916, 791, 792, 936,
-	937, 785, 786, 790, 938, 940, 661, 662, 663, 664,
-	665, 666, 667, 668, 669, 670, 671, 672, 673, 674,
-	675, 676, 677, 678, 656, 514, 520, 515, 516, 517,
-	518, 519, 0, 521, 927, 774, 773, 0, 780, 781,
-	0, 810, 811, 813, 819, 820, 821, 832, 879, 880,
-	888, 890, 891, 889, 892, 893, 894, 897, 898, 899,
-	900, 895, 896, 901, 793, 797, 794, 795, 796, 808,
-	798, 799, 800, 801, 802, 803, 804, 805, 806, 807,
-	809, 950, 951, 952, 953, 954, 955, 825, 829, 828,
-	826, 827, 823, 824, 851, 850, 852, 853, 854, 855,
-	856, 857, 859, 858, 860, 861, 862, 863, 864, 865,
-	833, 834, 837, 838, 836, 835, 839, 848, 849, 840,
-	841, 842, 843, 844, 845, 847, 846, 866, 867, 868,
-	869, 870, 872, 871, 875, 876, 874, 873, 878, 877,
-	772, 198, 223, 371, 0, 460, 291, 657, 625, 490,
-	620, 208, 225, 941, 265, 942, 0, 0, 946, 0,
-	0, 0, 948, 947, 0, 949, 911, 910, 0, 0,
-	943, 944, 0, 945, 0, 0, 200, 202, 211, 224,
-	234, 238, 245, 264, 279, 281, 288, 301, 313, 321,
-	322, 325, 331, 383, 390, 391, 392, 393, 413, 414,
-	415, 418, 421, 422, 425, 427, 428, 431, 436, 440,
-	441, 442, 444, 446, 448, 461, 466, 480, 481, 482,
-	483, 484, 487, 488, 494, 495, 496, 497, 498, 506,
-	507, 522, 593, 595, 612, 632, 639, 486, 388, 434,
-	458, 586, 956, 957, 958, 959, 960, 961, 962, 963,
-	303, 607, 640, 604, 652, 634, 443, 381, 0, 0,
-	384, 284, 308, 323, 0, 624, 508, 229, 472, 293,
-	253, 1031, 0, 213, 248, 232, 262, 277, 280, 327,
-	395, 404, 433, 439, 299, 274, 246, 465, 243, 491,
-	525, 526, 527, 529, 399, 269, 438, 400, 0, 379,
-	582, 583, 319, 0, 0, 0, 534, 0, 784, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 420, 0,
-	0, 0, 771, 0, 0, 0, 273, 776, 0, 0,
-	0, 369, 270, 0, 0, 206, 511, 0, 435, 0,
-	205, 0, 493, 255, 380, 377, 590, 285, 276, 272,
-	252, 320, 389, 432, 524, 426, 783, 373, 0, 0,
-	503, 405, 0, 0, 0, 0, 0, 0, 0, 0,
-	778, 779, 0, 0, 0, 0, 0, 0, 0, 0,
-	326, 250, 328, 204, 417, 504, 289, 0, 95, 0,
-	0, 1032, 513, 966, 1100, 932, 970, 1033, 984, 985,
-	986, 971, 0, 240, 972, 973, 247, 974, 0, 931,
-	814, 816, 815, 881, 882, 883, 884, 885, 886, 887,
-	817, 818, 812, 979, 616, 987, 988, 0, 268, 324,
-	275, 267, 587, 0, 0, 0, 0, 0, 0, 603,
-	0, 0, 231, 0, 0, 0, 0, 0, 0, 0,
-	0, 768, 0, 782, 0, 0, 0, 278, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 765, 766, 0, 0, 0, 0,
-	926, 0, 767, 0, 0, 775, 989, 990, 991, 992,
-	993, 994, 995, 996, 997, 998, 999, 1000, 1001, 1002,
-	1003, 1004, 1005, 1006, 1007, 1008, 1009, 1010, 1011, 1012,
-	1013, 1014, 1015, 1016, 1017, 1018, 1019, 1020, 1021, 1022,
-	1023, 1024, 1025, 1026, 1027, 1028, 1029, 1030, 2137, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 300,
-	0, 406, 260, 0, 459, 925, 0, 0, 636, 0,
-	0, 923, 0, 0, 0, 0, 368, 0, 333, 199,
-	227, 0, 0, 416, 467, 479, 0, 0, 0, 976,
-	0, 477, 430, 611, 235, 287, 464, 437, 475, 445,
-	290, 0, 0, 476, 375, 592, 455, 608, 637, 638,
-	266, 410, 622, 528, 630, 655, 228, 263, 424, 512,
-	614, 500, 401, 588, 589, 332, 499, 298, 203, 372,
-	643, 226, 485, 374, 244, 233, 594, 619, 302, 254,
-	292, 462, 650, 215, 523, 605, 241, 489, 0, 0,
-	658, 249, 510, 617, 606, 217, 601, 509, 397, 329,
-	330, 216, 0, 463, 271, 296, 0, 0, 261, 419,
-	977, 978, 259, 659, 822, 629, 222, 0, 628, 412,
-	591, 602, 398, 386, 221, 600, 396, 385, 337, 830,
-	831, 283, 310, 907, 906, 905, 309, 311, 903, 904,
-	902, 209, 615, 633, 0, 210, 0, 505, 618, 660,
-	457, 214, 236, 237, 239, 0, 282, 286, 294, 297,
-	306, 307, 316, 370, 423, 451, 447, 456, 0, 585,
-	609, 623, 635, 641, 642, 644, 645, 646, 647, 648,
-	651, 649, 411, 314, 501, 336, 376, 0, 0, 429,
-	478, 242, 613, 502, 913, 935, 924, 788, 789, 914,
-	915, 939, 916, 791, 792, 936, 937, 785, 786, 790,
-	938, 940, 661, 662, 663, 664, 665, 666, 667, 668,
-	669, 670, 671, 672, 673, 674, 675, 676, 677, 678,
-	656, 514, 520, 515, 516, 517, 518, 519, 0, 521,
-	927, 774, 773, 0, 780, 781, 0, 810, 811, 813,
-	819, 820, 821, 832, 879, 880, 888, 890, 891, 889,
-	892, 893, 894, 897, 898, 899, 900, 895, 896, 901,
-	793, 797, 794, 795, 796, 808, 798, 799, 800, 801,
-	802, 803, 804, 805, 806, 807, 809, 950, 951, 952,
-	953, 954, 955, 825, 829, 828, 826, 827, 823, 824,
-	851, 850, 852, 853, 854, 855, 856, 857, 859, 858,
-	860, 861, 862, 863, 864, 865, 833, 834, 837, 838,
-	836, 835, 839, 848, 849, 840, 841, 842, 843, 844,
-	845, 847, 846, 866, 867, 868, 869, 870, 872, 871,
-	875, 876, 874, 873, 878, 877, 772, 198, 223, 371,
-	0, 460, 291, 657, 625, 490, 620, 208, 225, 941,
-	265, 942, 0, 0, 946, 0, 0, 0, 948, 947,
-	0, 949, 911, 910, 0, 0, 943, 944, 0, 945,
-	0, 0, 200, 202, 211, 224, 234, 238, 245, 264,
-	279, 281, 288, 301, 313, 321, 322, 325, 331, 383,
-	390, 391, 392, 393, 413, 414, 415, 418, 421, 422,
-	425, 427, 428, 431, 436, 440, 441, 442, 444, 446,
-	448, 461, 466, 480, 481, 482, 483, 484, 487, 488,
-	494, 495, 496, 497, 498, 506, 507, 522, 593, 595,
-	612, 632, 639, 486, 388, 434, 458, 586, 956, 957,
-	958, 959, 960, 961, 962, 963, 303, 607, 640, 604,
-	652, 634, 443, 381, 0, 0, 384, 284, 308, 323,
-	0, 624, 508, 229, 472, 293, 253, 1031, 0, 213,
-	248, 232, 262, 277, 280, 327, 395, 404, 433, 439,
-	299, 274, 246, 465, 243, 491, 525, 526, 527, 529,
-	399, 269, 438, 400, 0, 379, 582, 583, 319, 0,
-	0, 0, 534, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 420, 0, 0, 0, 0, 0,
-	0, 0, 273, 0, 0, 0, 0, 369, 270, 0,
-	0, 206, 511, 0, 435, 0, 205, 0, 493, 255,
-	380, 377, 590, 285, 276, 272, 252, 320, 389, 432,
-	524, 426, 0, 373, 0, 0, 503, 405, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 326, 250, 328, 204,
-	417, 504, 289, 0, 0, 0, 0, 0, 513, 731,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 240,
-	0, 0, 247, 0, 0, 0, 354, 363, 362, 342,
-	343, 345, 347, 353, 360, 366, 339, 348, 0, 0,
-	616, 0, 0, 0, 268, 324, 275, 267, 587, 0,
-	0, 0, 0, 0, 0, 603, 0, 0, 231, 0,
-	1151, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 278, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 300, 0, 406, 260, 0,
-	459, 0, 0, 1150, 636, 0, 0, 0, 0, 0,
-	1147, 1148, 368, 1108, 333, 199, 227, 1141, 1145, 416,
-	467, 479, 0, 0, 0, 256, 0, 477, 430, 611,
-	235, 287, 464, 437, 475, 445, 290, 0, 0, 476,
-	375, 592, 455, 608, 637, 638, 266, 410, 622, 528,
-	630, 655, 228, 263, 424, 512, 614, 500, 401, 588,
-	589, 332, 499, 298, 203, 372, 643, 226, 485, 374,
-	244, 233, 594, 619, 302, 254, 292, 462, 650, 215,
-	523, 605, 241, 489, 0, 0, 658, 249, 510, 617,
-	606, 217, 601, 509, 397, 329, 330, 216, 0, 463,
-	271, 296, 0, 0, 261, 419, 596, 597, 259, 659,
-	230, 629, 222, 0, 628, 412, 591, 602, 398, 386,
-	221, 600, 396, 385, 337, 358, 359, 283, 310, 452,
-	378, 453, 309, 311, 408, 407, 409, 209, 615, 633,
-	0, 210, 0, 505, 618, 660, 457, 214, 236, 237,
-	239, 0, 282, 286, 294, 297, 306, 307, 316, 370,
-	423, 451, 447, 456, 0, 585, 609, 623, 635, 641,
-	642, 644, 645, 646, 647, 648, 651, 649, 411, 314,
-	501, 336, 376, 0, 0, 429, 478, 242, 613, 502,
-	201, 0, 0, 0, 0, 257, 258, 0, 581, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 661, 662,
-	663, 664, 665, 666, 667, 668, 669, 670, 671, 672,
-	673, 674, 675, 676, 677, 678, 656, 514, 520, 515,
-	516, 517, 518, 519, 0, 521, 0, 0, 0, 0,
-	0, 402, 0, 598, 599, 679, 387, 492, 610, 338,
-	352, 355, 344, 364, 0, 365, 340, 341, 346, 349,
-	350, 351, 356, 357, 361, 367, 251, 212, 394, 403,
-	584, 315, 218, 219, 220, 530, 531, 532, 533, 626,
-	627, 631, 207, 468, 469, 470, 471, 295, 621, 312,
-	474, 473, 334, 335, 382, 454, 546, 548, 559, 563,
-	565, 567, 573, 576, 547, 549, 560, 564, 566, 568,
-	574, 577, 536, 538, 540, 542, 555, 554, 551, 579,
-	580, 557, 562, 541, 553, 558, 571, 578, 575, 535,
-	539, 543, 552, 570, 569, 550, 561, 572, 556, 544,
-	537, 545, 0, 198, 223, 371, 0, 460, 291, 657,
-	625, 490, 620, 208, 225, 0, 265, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 200, 202,
-	211, 224, 234, 238, 245, 264, 279, 281, 288, 301,
-	313, 321, 322, 325, 331, 383, 390, 391, 392, 393,
-	413, 414, 415, 418, 421, 422, 425, 427, 428, 431,
-	436, 440, 441, 442, 444, 446, 448, 461, 466, 480,
-	481, 482, 483, 484, 487, 488, 494, 495, 496, 497,
-	498, 506, 507, 522, 593, 595, 612, 632, 639, 486,
-	388, 434, 458, 586, 304, 305, 449, 450, 317, 318,
-	653, 654, 303, 607, 640, 604, 652, 634, 443, 381,
-	0, 0, 384, 284, 308, 323, 0, 624, 508, 229,
-	472, 293, 253, 0, 0, 213, 248, 232, 262, 277,
-	280, 327, 395, 404, 433, 439, 299, 274, 246, 465,
-	243, 491, 525, 526, 527, 529, 399, 269, 438, 400,
-	0, 379, 582, 583, 319, 0, 0, 86, 534, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	420, 0, 0, 0, 0, 0, 0, 0, 273, 0,
-	0, 0, 0, 369, 270, 0, 0, 206, 511, 0,
-	435, 0, 205, 0, 493, 255, 380, 377, 590, 285,
-	276, 272, 252, 320, 389, 432, 524, 426, 97, 373,
-	0, 0, 503, 405, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 326, 250, 328, 204, 417, 504, 289, 0,
-	95, 0, 0, 0, 513, 196, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 240, 0, 0, 247, 0,
-	0, 0, 354, 363, 362, 342, 343, 345, 347, 353,
-	360, 366, 339, 348, 0, 0, 616, 0, 0, 0,
-	268, 324, 275, 267, 587, 0, 0, 0, 0, 0,
-	0, 603, 0, 0, 231, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 278,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 300, 0, 406, 260, 0, 459, 0, 0, 0,
-	636, 0, 0, 0, 0, 0, 0, 0, 368, 0,
-	333, 199, 227, 0, 0, 416, 467, 479, 0, 0,
-	0, 256, 0, 477, 430, 611, 235, 287, 464, 437,
-	475, 445, 290, 0, 0, 476, 375, 592, 455, 608,
-	637, 638, 266, 410, 622, 528, 630, 655, 228, 263,
-	424, 512, 614, 500, 401, 588, 589, 332, 499, 298,
-	203, 372, 643, 226, 485, 374, 244, 233, 594, 619,
-	302, 254, 292, 462, 650, 215, 523, 605, 241, 489,
-	0, 0, 658, 249, 510, 617, 606, 217, 601, 509,
-	397, 329, 330, 216, 0, 463, 271, 296, 0, 0,
-	261, 419, 596, 597, 259, 659, 230, 629, 222, 0,
-	628, 412, 591, 602, 398, 386, 221, 600, 396, 385,
-	337, 358, 359, 283, 310, 452, 378, 453, 309, 311,
-	408, 407, 409, 209, 615, 633, 0, 210, 0, 505,
-	618, 660, 457, 214, 236, 237, 239, 0, 282, 286,
-	294, 297, 306, 307, 316, 370, 423, 451, 447, 456,
-	0, 585, 609, 623, 635, 641, 642, 644, 645, 646,
-	647, 648, 651, 649, 411, 314, 501, 336, 376, 0,
-	0, 429, 478, 242, 613, 502, 201, 0, 0, 0,
-	0, 257, 258, 0, 581, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 661, 662, 663, 664, 665, 666,
-	667, 668, 669, 670, 671, 672, 673, 674, 675, 676,
-	677, 678, 656, 514, 520, 515, 516, 517, 518, 519,
-	0, 521, 0, 0, 0, 0, 0, 402, 0, 598,
-	599, 679, 387, 492, 610, 338, 352, 355, 344, 364,
-	0, 365, 340, 341, 346, 349, 350, 351, 356, 357,
-	361, 367, 251, 212, 394, 403, 584, 315, 218, 219,
-	220, 530, 531, 532, 533, 626, 627, 631, 207, 468,
-	469, 470, 471, 295, 621, 312, 474, 473, 334, 335,
-	382, 454, 546, 548, 559, 563, 565, 567, 573, 576,
-	547, 549, 560, 564, 566, 568, 574, 577, 536, 538,
-	540, 542, 555, 554, 551, 579, 580, 557, 562, 541,
-	553, 558, 571, 578, 575, 535, 539, 543, 552, 570,
-	569, 550, 561, 572, 556, 544, 537, 545, 0, 198,
-	223, 371, 94, 460, 291, 657, 625, 490, 620, 208,
-	225, 0, 265, 0, 0, 0, 0, 0, 0, 2444,
-	0, 0, 2443, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 200, 202, 211, 224, 234, 238,
-	245, 264, 279, 281, 288, 301, 313, 321, 322, 325,
-	331, 383, 390, 391, 392, 393, 413, 414, 415, 418,
-	421, 422, 425, 427, 428, 431, 436, 440, 441, 442,
-	444, 446, 448, 461, 466, 480, 481, 482, 483, 484,
-	487, 488, 494, 495, 496, 497, 498, 506, 507, 522,
-	593, 595, 612, 632, 639, 486, 388, 434, 458, 586,
-	304, 305, 449, 450, 317, 318, 653, 654, 303, 607,
-	640, 604, 652, 634, 443, 381, 0, 0, 384, 284,
-	308, 323, 0, 624, 508, 229, 472, 293, 253, 0,
-	0, 213, 248, 232, 262, 277, 280, 327, 395, 404,
-	433, 439, 299, 274, 246, 465, 243, 491, 525, 526,
-	527, 529, 399, 269, 438, 400, 0, 379, 582, 583,
-	319, 0, 0, 86, 534, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 420, 0, 0, 0,
-	0, 0, 0, 0, 273, 0, 0, 0, 0, 369,
-	270, 0, 0, 206, 511, 0, 435, 0, 205, 0,
-	493, 255, 380, 377, 590, 285, 276, 272, 252, 320,
-	389, 432, 524, 426, 97, 373, 0, 0, 503, 405,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 326, 250,
-	328, 204, 417, 504, 289, 0, 95, 0, 1764, 0,
-	513, 731, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 240, 0, 0, 247, 0, 0, 0, 354, 363,
-	362, 342, 343, 345, 347, 353, 360, 366, 339, 348,
-	0, 0, 616, 0, 0, 0, 268, 324, 275, 267,
-	587, 0, 0, 0, 0, 0, 0, 603, 0, 0,
-	231, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 278, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 300, 0, 406,
-	260, 0, 459, 0, 0, 0, 636, 0, 0, 0,
-	0, 0, 0, 0, 368, 0, 333, 199, 227, 0,
-	0, 416, 467, 479, 0, 0, 0, 256, 0, 477,
-	430, 611, 235, 287, 464, 437, 475, 445, 290, 0,
-	0, 476, 375, 592, 455, 608, 637, 638, 266, 410,
-	622, 528, 630, 655, 228, 263, 424, 512, 614, 500,
-	401, 588, 589, 332, 499, 298, 203, 372, 643, 226,
-	485, 374, 244, 233, 594, 619, 302, 254, 292, 462,
-	650, 215, 523, 605, 241, 489, 0, 0, 658, 249,
-	510, 617, 606, 217, 601, 509, 397, 329, 330, 216,
-	0, 463, 271, 296, 0, 0, 261, 419, 596, 597,
-	259, 659, 230, 629, 222, 0, 628, 412, 591, 602,
-	398, 386, 221, 600, 396, 385, 337, 358, 359, 283,
-	310, 452, 378, 453, 309, 311, 408, 407, 409, 209,
-	615, 633, 0, 210, 0, 505, 618, 660, 457, 214,
-	236, 237, 239, 0, 282, 286, 294, 297, 306, 307,
-	316, 370, 423, 451, 447, 456, 0, 585, 609, 623,
-	635, 641, 642, 644, 645, 646, 647, 648, 651, 649,
-	411, 314, 501, 336, 376, 0, 0, 429, 478, 242,
-	613, 502, 201, 0, 0, 0, 0, 257, 258, 0,
-	581, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	661, 662, 663, 664, 665, 666, 667, 668, 669, 670,
-	671, 672, 673, 674, 675, 676, 677, 678, 656, 514,
-	520, 515, 516, 517, 518, 519, 0, 521, 0, 0,
-	0, 0, 0, 402, 0, 598, 599, 679, 387, 492,
-	610, 338, 352, 355, 344, 364, 0, 365, 340, 341,
-	346, 349, 350, 351, 356, 357, 361, 367, 251, 212,
-	394, 403, 584, 315, 218, 219, 220, 530, 531, 532,
-	533, 626, 627, 631, 207, 468, 469, 470, 471, 295,
-	621, 312, 474, 473, 334, 335, 382, 454, 546, 548,
-	559, 563, 565, 567, 573, 576, 547, 549, 560, 564,
-	566, 568, 574, 577, 536, 538, 540, 542, 555, 554,
-	551, 579, 580, 557, 562, 541, 553, 558, 571, 578,
-	575, 535, 539, 543, 552, 570, 569, 550, 561, 572,
-	556, 544, 537, 545, 0, 198, 223, 371, 94, 460,
-	291, 657, 625, 490, 620, 208, 225, 0, 265, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	200, 202, 211, 224, 234, 238, 245, 264, 279, 281,
-	288, 301, 313, 321, 322, 325, 331, 383, 390, 391,
-	392, 393, 413, 414, 415, 418, 421, 422, 425, 427,
-	428, 431, 436, 440, 441, 442, 444, 446, 448, 461,
-	466, 480, 481, 482, 483, 484, 487, 488, 494, 495,
-	496, 497, 498, 506, 507, 522, 593, 595, 612, 632,
-	639, 486, 388, 434, 458, 586, 304, 305, 449, 450,
-	317, 318, 653, 654, 303, 607, 640, 604, 652, 634,
-	443, 381, 0, 0, 384, 284, 308, 323, 0, 624,
-	508, 229, 472, 293, 253, 0, 0, 213, 248, 232,
-	262, 277, 280, 327, 395, 404, 433, 439, 299, 274,
-	246, 465, 243, 491, 525, 526, 527, 529, 399, 269,
-	438, 1792, 0, 379, 582, 583, 319, 0, 0, 0,
-	534, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 420, 0, 0, 1794, 0, 0, 0, 0,
-	273, 0, 0, 0, 0, 369, 270, 0, 0, 206,
-	511, 0, 435, 0, 205, 0, 493, 255, 380, 377,
-	590, 285, 276, 272, 252, 320, 389, 432, 524, 426,
-	0, 373, 0, 0, 503, 405, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 326, 250, 328, 204, 417, 504,
-	289, 0, 0, 0, 0, 1796, 513, 731, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 240, 0, 0,
-	247, 0, 0, 0, 354, 363, 362, 342, 343, 345,
-	347, 353, 360, 366, 339, 348, 0, 0, 616, 0,
-	0, 0, 268, 324, 275, 267, 587, 0, 0, 0,
-	0, 0, 0, 603, 0, 0, 231, 0, 0, 0,
-	1489, 0, 1490, 1491, 0, 0, 0, 0, 0, 0,
-	0, 278, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 300, 0, 406, 260, 0, 459, 0,
-	0, 0, 636, 0, 0, 0, 0, 0, 0, 0,
-	368, 0, 333, 199, 227, 0, 0, 416, 467, 479,
-	0, 0, 0, 256, 0, 477, 430, 611, 235, 287,
-	464, 437, 475, 445, 290, 0, 0, 476, 375, 592,
-	455, 608, 637, 638, 266, 410, 622, 528, 630, 655,
-	228, 263, 424, 512, 614, 500, 401, 588, 589, 332,
-	499, 298, 203, 372, 643, 226, 485, 374, 244, 233,
-	594, 619, 302, 254, 292, 462, 650, 215, 523, 605,
-	241, 489, 0, 0, 658, 249, 510, 617, 606, 217,
-	601, 509, 397, 329, 330, 216, 0, 463, 271, 296,
-	0, 0, 261, 419, 596, 597, 259, 659, 230, 629,
-	222, 0, 628, 412, 591, 602, 398, 386, 221, 600,
-	396, 385, 337, 358, 359, 283, 310, 452, 378, 453,
-	309, 311, 408, 407, 409, 209, 615, 633, 0, 210,
-	0, 505, 618, 660, 457, 214, 236, 237, 239, 0,
-	282, 286, 294, 297, 306, 307, 316, 370, 423, 451,
-	447, 456, 0, 585, 609, 623, 635, 641, 642, 644,
-	645, 646, 647, 648, 651, 649, 411, 314, 501, 336,
-	376, 0, 0, 429, 478, 242, 613, 502, 201, 0,
-	0, 0, 0, 257, 258, 0, 581, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 661, 662, 663, 664,
-	665, 666, 667, 668, 669, 670, 671, 672, 673, 674,
-	675, 676, 677, 678, 656, 514, 520, 515, 516, 517,
-	518, 519, 0, 521, 0, 0, 0, 0, 0, 402,
-	0, 598, 599, 679, 387, 492, 610, 338, 352, 355,
-	344, 364, 0, 365, 340, 341, 346, 349, 350, 351,
-	356, 357, 361, 367, 251, 212, 394, 403, 584, 315,
-	218, 219, 220, 530, 531, 532, 533, 626, 627, 631,
-	207, 468, 469, 470, 471, 295, 621, 312, 474, 473,
-	334, 335, 382, 454, 546, 548, 559, 563, 565, 567,
-	573, 576, 547, 549, 560, 564, 566, 568, 574, 577,
-	536, 538, 540, 542, 555, 554, 551, 579, 580, 557,
-	562, 541, 553, 558, 571, 578, 575, 535, 539, 543,
-	552, 570, 569, 550, 561, 572, 556, 544, 537, 545,
-	0, 198, 223, 371, 0, 460, 291, 657, 625, 490,
-	620, 208, 225, 0, 265, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 200, 202, 211, 224,
-	234, 238, 245, 264, 279, 281, 288, 301, 313, 321,
-	322, 325, 331, 383, 390, 391, 392, 393, 413, 414,
-	415, 418, 421, 422, 425, 427, 428, 431, 436, 440,
-	441, 442, 444, 446, 448, 461, 466, 480, 481, 482,
-	483, 484, 487, 488, 494, 495, 496, 497, 498, 506,
-	507, 522, 593, 595, 612, 632, 639, 486, 388, 434,
-	458, 586, 304, 305, 449, 450, 317, 318, 653, 654,
-	303, 607, 640, 604, 652, 634, 443, 381, 0, 0,
-	384, 284, 308, 323, 0, 624, 508, 229, 472, 293,
-	253, 0, 0, 213, 248, 232, 262, 277, 280, 327,
-	395, 404, 433, 439, 299, 274, 246, 465, 243, 491,
-	525, 526, 527, 529, 399, 269, 438, 400, 0, 379,
-	582, 583, 319, 0, 0, 0, 534, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 420, 0,
-	0, 0, 0, 0, 0, 0, 273, 0, 0, 0,
-	0, 369, 270, 0, 0, 206, 511, 0, 435, 0,
-	205, 0, 493, 255, 380, 377, 590, 285, 276, 272,
-	252, 320, 389, 432, 524, 426, 0, 373, 0, 0,
-	503, 405, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	326, 250, 328, 204, 417, 504, 289, 0, 95, 0,
-	0, 0, 513, 196, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 240, 0, 0, 247, 0, 0, 0,
-	354, 363, 362, 342, 343, 345, 347, 353, 360, 366,
-	339, 348, 0, 0, 616, 0, 0, 0, 268, 324,
-	275, 267, 587, 0, 0, 0, 0, 0, 0, 603,
-	0, 0, 231, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 278, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 300,
-	0, 406, 260, 0, 459, 0, 0, 0, 636, 0,
-	0, 0, 0, 0, 0, 0, 368, 0, 333, 199,
-	227, 0, 0, 416, 467, 479, 0, 0, 0, 256,
-	0, 477, 430, 611, 235, 287, 464, 437, 475, 445,
-	290, 0, 0, 476, 375, 592, 455, 608, 637, 638,
-	266, 410, 622, 528, 630, 655, 228, 263, 424, 512,
-	614, 500, 401, 588, 589, 332, 499, 298, 203, 372,
-	643, 226, 485, 374, 244, 233, 594, 619, 302, 254,
-	292, 462, 650, 215, 523, 605, 241, 489, 0, 0,
-	658, 249, 510, 617, 606, 217, 601, 509, 397, 329,
-	330, 216, 0, 463, 271, 296, 0, 0, 261, 419,
-	596, 597, 259, 659, 230, 629, 222, 0, 628, 412,
-	591, 602, 398, 386, 221, 600, 396, 385, 337, 358,
-	359, 283, 310, 452, 378, 453, 309, 311, 408, 407,
-	409, 209, 615, 633, 0, 210, 0, 505, 618, 660,
-	457, 214, 236, 237, 239, 0, 282, 286, 294, 297,
-	306, 307, 316, 370, 423, 451, 447, 456, 0, 585,
-	609, 623, 635, 641, 642, 644, 645, 646, 647, 648,
-	651, 649, 411, 314, 501, 336, 376, 0, 0, 429,
-	478, 242, 613, 502, 201, 0, 0, 0, 0, 257,
-	258, 0, 581, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 661, 662, 663, 664, 665, 666, 667, 668,
-	669, 670, 671, 672, 673, 674, 675, 676, 677, 678,
-	656, 514, 520, 515, 516, 517, 518, 519, 0, 521,
-	0, 0, 0, 0, 0, 402, 0, 598, 599, 679,
-	387, 492, 610, 338, 352, 355, 344, 364, 0, 365,
-	340, 341, 346, 349, 350, 351, 356, 357, 361, 367,
-	251, 212, 394, 403, 584, 315, 218, 219, 220, 530,
-	531, 532, 533, 626, 627, 631, 207, 468, 469, 470,
-	471, 295, 621, 312, 474, 473, 334, 335, 382, 454,
-	546, 548, 559, 563, 565, 567, 573, 576, 547, 549,
-	560, 564, 566, 568, 574, 577, 536, 538, 540, 542,
-	555, 554, 551, 579, 580, 557, 562, 541, 553, 558,
-	571, 578, 575, 535, 539, 543, 552, 570, 569, 550,
-	561, 572, 556, 544, 537, 545, 0, 198, 223, 371,
-	0, 460, 291, 657, 625, 490, 620, 208, 225, 0,
-	265, 0, 0, 0, 0, 0, 0, 2444, 0, 0,
-	2443, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 200, 202, 211, 224, 234, 238, 245, 264,
-	279, 281, 288, 301, 313, 321, 322, 325, 331, 383,
-	390, 391, 392, 393, 413, 414, 415, 418, 421, 422,
-	425, 427, 428, 431, 436, 440, 441, 442, 444, 446,
-	448, 461, 466, 480, 481, 482, 483, 484, 487, 488,
-	494, 495, 496, 497, 498, 506, 507, 522, 593, 595,
-	612, 632, 639, 486, 388, 434, 458, 586, 304, 305,
-	449, 450, 317, 318, 653, 654, 303, 607, 640, 604,
-	652, 634, 443, 381, 0, 0, 384, 284, 308, 323,
-	0, 624, 508, 229, 472, 293, 253, 0, 0, 213,
-	248, 232, 262, 277, 280, 327, 395, 404, 433, 439,
-	299, 274, 246, 465, 243, 491, 525, 526, 527, 529,
-	399, 269, 438, 400, 0, 379, 582, 583, 319, 0,
-	0, 0, 534, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 420, 0, 0, 2389, 0, 0,
-	0, 0, 273, 0, 0, 0, 0, 369, 270, 0,
-	0, 206, 511, 0, 435, 0, 205, 0, 493, 255,
-	380, 377, 590, 285, 276, 272, 252, 320, 389, 432,
-	524, 426, 0, 373, 0, 0, 503, 405, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 326, 250, 328, 204,
-	417, 504, 289, 0, 0, 0, 0, 1977, 513, 196,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 240,
-	0, 0, 247, 0, 0, 0, 354, 363, 362, 342,
-	343, 345, 347, 353, 360, 366, 339, 348, 0, 0,
-	616, 0, 0, 0, 268, 324, 275, 267, 587, 0,
-	0, 0, 0, 0, 0, 603, 0, 0, 231, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 278, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 300, 0, 406, 260, 0,
-	459, 0, 0, 0, 636, 0, 0, 0, 0, 0,
-	0, 0, 368, 0, 333, 199, 227, 0, 0, 416,
-	467, 479, 0, 0, 0, 256, 0, 477, 430, 611,
-	235, 287, 464, 437, 475, 445, 290, 0, 2387, 476,
-	375, 592, 455, 608, 637, 638, 266, 410, 622, 528,
-	630, 655, 228, 263, 424, 512, 614, 500, 401, 588,
-	589, 332, 499, 298, 203, 372, 643, 226, 485, 374,
-	244, 233, 594, 619, 302, 254, 292, 462, 650, 215,
-	523, 605, 241, 489, 0, 0, 658, 249, 510, 617,
-	606, 217, 601, 509, 397, 329, 330, 216, 0, 463,
-	271, 296, 0, 0, 261, 419, 596, 597, 259, 659,
-	230, 629, 222, 0, 628, 412, 591, 602, 398, 386,
-	221, 600, 396, 385, 337, 358, 359, 283, 310, 452,
-	378, 453, 309, 311, 408, 407, 409, 209, 615, 633,
-	0, 210, 0, 505, 618, 660, 457, 214, 236, 237,
-	239, 0, 282, 286, 294, 297, 306, 307, 316, 370,
-	423, 451, 447, 456, 0, 585, 609, 623, 635, 641,
-	642, 644, 645, 646, 647, 648, 651, 649, 411, 314,
-	501, 336, 376, 0, 0, 429, 478, 242, 613, 502,
-	201, 0, 0, 0, 0, 257, 258, 0, 581, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 661, 662,
-	663, 664, 665, 666, 667, 668, 669, 670, 671, 672,
-	673, 674, 675, 676, 677, 678, 656, 514, 520, 515,
-	516, 517, 518, 519, 0, 521, 0, 0, 0, 0,
-	0, 402, 0, 598, 599, 679, 387, 492, 610, 338,
-	352, 355, 344, 364, 0, 365, 340, 341, 346, 349,
-	350, 351, 356, 357, 361, 367, 251, 212, 394, 403,
-	584, 315, 218, 219, 220, 530, 531, 532, 533, 626,
-	627, 631, 207, 468, 469, 470, 471, 295, 621, 312,
-	474, 473, 334, 335, 382, 454, 546, 548, 559, 563,
-	565, 567, 573, 576, 547, 549, 560, 564, 566, 568,
-	574, 577, 536, 538, 540, 542, 555, 554, 551, 579,
-	580, 557, 562, 541, 553, 558, 571, 578, 575, 535,
-	539, 543, 552, 570, 569, 550, 561, 572, 556, 544,
-	537, 545, 0, 198, 223, 371, 0, 460, 291, 657,
-	625, 490, 620, 208, 225, 0, 265, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 200, 202,
-	211, 224, 234, 238, 245, 264, 279, 281, 288, 301,
-	313, 321, 322, 325, 331, 383, 390, 391, 392, 393,
-	413, 414, 415, 418, 421, 422, 425, 427, 428, 431,
-	436, 440, 441, 442, 444, 446, 448, 461, 466, 480,
-	481, 482, 483, 484, 487, 488, 494, 495, 496, 497,
-	498, 506, 507, 522, 593, 595, 612, 632, 639, 486,
-	388, 434, 458, 586, 304, 305, 449, 450, 317, 318,
-	653, 654, 303, 607, 640, 604, 652, 634, 443, 381,
-	0, 0, 384, 284, 308, 323, 0, 624, 508, 229,
-	472, 293, 253, 0, 0, 213, 248, 232, 262, 277,
-	280, 327, 395, 404, 433, 439, 299, 274, 246, 465,
-	243, 491, 525, 526, 527, 529, 399, 269, 438, 400,
-	0, 379, 582, 583, 319, 0, 0, 0, 534, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	420, 0, 0, 0, 0, 0, 0, 0, 273, 0,
-	0, 0, 0, 369, 270, 0, 0, 206, 511, 0,
-	435, 0, 205, 0, 493, 255, 380, 377, 590, 285,
-	276, 272, 252, 320, 389, 432, 524, 426, 0, 373,
-	0, 0, 503, 405, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 326, 250, 328, 204, 417, 504, 289, 0,
-	0, 0, 0, 0, 513, 731, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 240, 0, 0, 247, 0,
-	0, 0, 354, 363, 362, 342, 343, 345, 347, 353,
-	360, 366, 339, 348, 0, 0, 616, 0, 0, 0,
-	268, 324, 275, 267, 587, 0, 0, 0, 0, 0,
-	0, 603, 0, 0, 231, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 278,
-	0, 0, 0, 0, 0, 0, 0, 0, 1102, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 300, 0, 406, 260, 0, 459, 0, 0, 0,
-	636, 0, 0, 0, 0, 0, 0, 0, 368, 1108,
-	333, 199, 227, 1106, 0, 416, 467, 479, 0, 0,
-	0, 256, 0, 477, 430, 611, 235, 287, 464, 437,
-	475, 445, 290, 0, 0, 476, 375, 592, 455, 608,
-	637, 638, 266, 410, 622, 528, 630, 655, 228, 263,
-	424, 512, 614, 500, 401, 588, 589, 332, 499, 298,
-	203, 372, 643, 226, 485, 374, 244, 233, 594, 619,
-	302, 254, 292, 462, 650, 215, 523, 605, 241, 489,
-	0, 0, 658, 249, 510, 617, 606, 217, 601, 509,
-	397, 329, 330, 216, 0, 463, 271, 296, 0, 0,
-	261, 419, 596, 597, 259, 659, 230, 629, 222, 0,
-	628, 412, 591, 602, 398, 386, 221, 600, 396, 385,
-	337, 358, 359, 283, 310, 452, 378, 453, 309, 311,
-	408, 407, 409, 209, 615, 633, 0, 210, 0, 505,
-	618, 660, 457, 214, 236, 237, 239, 0, 282, 286,
-	294, 297, 306, 307, 316, 370, 423, 451, 447, 456,
-	0, 585, 609, 623, 635, 641, 642, 644, 645, 646,
-	647, 648, 651, 649, 411, 314, 501, 336, 376, 0,
-	0, 429, 478, 242, 613, 502, 201, 0, 0, 0,
-	0, 257, 258, 0, 581, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 661, 662, 663, 664, 665, 666,
-	667, 668, 669, 670, 671, 672, 673, 674, 675, 676,
-	677, 678, 656, 514, 520, 515, 516, 517, 518, 519,
-	0, 521, 0, 0, 0, 0, 0, 402, 0, 598,
-	599, 679, 387, 492, 610, 338, 352, 355, 344, 364,
-	0, 365, 340, 341, 346, 349, 350, 351, 356, 357,
-	361, 367, 251, 212, 394, 403, 584, 315, 218, 219,
-	220, 530, 531, 532, 533, 626, 627, 631, 207, 468,
-	469, 470, 471, 295, 621, 312, 474, 473, 334, 335,
-	382, 454, 546, 548, 559, 563, 565, 567, 573, 576,
-	547, 549, 560, 564, 566, 568, 574, 577, 536, 538,
-	540, 542, 555, 554, 551, 579, 580, 557, 562, 541,
-	553, 558, 571, 578, 575, 535, 539, 543, 552, 570,
-	569, 550, 561, 572, 556, 544, 537, 545, 0, 198,
-	223, 371, 0, 460, 291, 657, 625, 490, 620, 208,
-	225, 0, 265, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 200, 202, 211, 224, 234, 238,
-	245, 264, 279, 281, 288, 301, 313, 321, 322, 325,
-	331, 383, 390, 391, 392, 393, 413, 414, 415, 418,
-	421, 422, 425, 427, 428, 431, 436, 440, 441, 442,
-	444, 446, 448, 461, 466, 480, 481, 482, 483, 484,
-	487, 488, 494, 495, 496, 497, 498, 506, 507, 522,
-	593, 595, 612, 632, 639, 486, 388, 434, 458, 586,
-	304, 305, 449, 450, 317, 318, 653, 654, 303, 607,
-	640, 604, 652, 634, 443, 381, 0, 0, 384, 284,
-	308, 323, 0, 624, 508, 229, 472, 293, 253, 0,
-	0, 213, 248, 232, 262, 277, 280, 327, 395, 404,
-	433, 439, 299, 274, 246, 465, 243, 491, 525, 526,
-	527, 529, 399, 269, 438, 400, 0, 379, 582, 583,
-	319, 0, 0, 0, 534, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 420, 0, 0, 2389,
-	0, 0, 0, 0, 273, 0, 0, 0, 0, 369,
-	270, 0, 0, 206, 511, 0, 435, 0, 205, 0,
-	493, 255, 380, 377, 590, 285, 276, 272, 252, 320,
-	389, 432, 524, 426, 0, 373, 0, 0, 503, 405,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 326, 250,
-	328, 204, 417, 504, 289, 0, 0, 0, 0, 1977,
-	513, 196, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 240, 0, 0, 247, 0, 0, 0, 354, 363,
-	362, 342, 343, 345, 347, 353, 360, 366, 339, 348,
-	0, 0, 616, 0, 0, 0, 268, 324, 275, 267,
-	587, 0, 0, 0, 0, 0, 0, 603, 0, 0,
-	231, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 278, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 300, 0, 406,
-	260, 0, 459, 0, 0, 0, 636, 0, 0, 0,
-	0, 0, 0, 0, 368, 0, 333, 199, 227, 0,
-	0, 416, 467, 479, 0, 0, 0, 256, 0, 477,
-	430, 611, 235, 287, 464, 437, 475, 445, 290, 0,
-	0, 476, 375, 592, 455, 608, 637, 638, 266, 410,
-	622, 528, 630, 655, 228, 263, 424, 512, 614, 500,
-	401, 588, 589, 332, 499, 298, 203, 372, 643, 226,
-	485, 374, 244, 233, 594, 619, 302, 254, 292, 462,
-	650, 215, 523, 605, 241, 489, 0, 0, 658, 249,
-	510, 617, 606, 217, 601, 509, 397, 329, 330, 216,
-	0, 463, 271, 296, 0, 0, 261, 419, 596, 597,
-	259, 659, 230, 629, 222, 0, 628, 412, 591, 602,
-	398, 386, 221, 600, 396, 385, 337, 358, 359, 283,
-	310, 452, 378, 453, 309, 311, 408, 407, 409, 209,
-	615, 633, 0, 210, 0, 505, 618, 660, 457, 214,
-	236, 237, 239, 0, 282, 286, 294, 297, 306, 307,
-	316, 370, 423, 451, 447, 456, 0, 585, 609, 623,
-	635, 641, 642, 644, 645, 646, 647, 648, 651, 649,
-	411, 314, 501, 336, 376, 0, 0, 429, 478, 242,
-	613, 502, 201, 0, 0, 0, 0, 257, 258, 0,
-	581, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	661, 662, 663, 664, 665, 666, 667, 668, 669, 670,
-	671, 672, 673, 674, 675, 676, 677, 678, 656, 514,
-	520, 515, 516, 517, 518, 519, 0, 521, 0, 0,
-	0, 0, 0, 402, 0, 598, 599, 679, 387, 492,
-	610, 338, 352, 355, 344, 364, 0, 365, 340, 341,
-	346, 349, 350, 351, 356, 357, 361, 367, 251, 212,
-	394, 403, 584, 315, 218, 219, 220, 530, 531, 532,
-	533, 626, 627, 631, 207, 468, 469, 470, 471, 295,
-	621, 312, 474, 473, 334, 335, 382, 454, 546, 548,
-	559, 563, 565, 567, 573, 576, 547, 549, 560, 564,
-	566, 568, 574, 577, 536, 538, 540, 542, 555, 554,
-	551, 579, 580, 557, 562, 541, 553, 558, 571, 578,
-	575, 535, 539, 543, 552, 570, 569, 550, 561, 572,
-	556, 544, 537, 545, 0, 198, 223, 371, 0, 460,
-	291, 657, 625, 490, 620, 208, 225, 0, 265, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	200, 202, 211, 224, 234, 238, 245, 264, 279, 281,
-	288, 301, 313, 321, 322, 325, 331, 383, 390, 391,
-	392, 393, 413, 414, 415, 418, 421, 422, 425, 427,
-	428, 431, 436, 440, 441, 442, 444, 446, 448, 461,
-	466, 480, 481, 482, 483, 484, 487, 488, 494, 495,
-	496, 497, 498, 506, 507, 522, 593, 595, 612, 632,
-	639, 486, 388, 434, 458, 586, 304, 305, 449, 450,
-	317, 318, 653, 654, 303, 607, 640, 604, 652, 634,
-	443, 381, 0, 0, 384, 284, 308, 323, 0, 624,
-	508, 229, 472, 293, 253, 0, 0, 213, 248, 232,
-	262, 277, 280, 327, 395, 404, 433, 439, 299, 274,
-	246, 465, 243, 491, 525, 526, 527, 529, 399, 269,
-	438, 400, 0, 379, 582, 583, 319, 0, 0, 0,
-	534, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 420, 0, 0, 0, 0, 0, 0, 0,
-	273, 0, 0, 0, 0, 369, 270, 0, 0, 206,
-	511, 0, 435, 0, 205, 0, 493, 255, 380, 377,
-	590, 285, 276, 272, 252, 320, 389, 432, 524, 426,
-	0, 373, 0, 0, 503, 405, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 326, 250, 328, 204, 417, 504,
-	289, 0, 0, 0, 1764, 0, 513, 731, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 240, 0, 0,
-	247, 0, 0, 0, 354, 363, 362, 342, 343, 345,
-	347, 353, 360, 366, 339, 348, 0, 0, 616, 0,
-	0, 0, 268, 324, 275, 267, 587, 0, 0, 0,
-	0, 0, 0, 603, 0, 0, 231, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 278, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 300, 0, 406, 260, 0, 459, 0,
-	0, 0, 636, 0, 0, 0, 3749, 0, 0, 0,
-	368, 0, 333, 199, 227, 0, 0, 416, 467, 479,
-	0, 0, 0, 256, 0, 477, 430, 611, 235, 287,
-	464, 437, 475, 445, 290, 0, 0, 476, 375, 592,
-	455, 608, 637, 638, 266, 410, 622, 528, 630, 655,
-	228, 263, 424, 512, 614, 500, 401, 588, 589, 332,
-	499, 298, 203, 372, 643, 226, 485, 374, 244, 233,
-	594, 619, 302, 254, 292, 462, 650, 215, 523, 605,
-	241, 489, 0, 0, 658, 249, 510, 617, 606, 217,
-	601, 509, 397, 329, 330, 216, 0, 463, 271, 296,
-	0, 0, 261, 419, 596, 597, 259, 659, 230, 629,
-	222, 0, 628, 412, 591, 602, 398, 386, 221, 600,
-	396, 385, 337, 358, 359, 283, 310, 452, 378, 453,
-	309, 311, 408, 407, 409, 209, 615, 633, 0, 210,
-	0, 505, 618, 660, 457, 214, 236, 237, 239, 0,
-	282, 286, 294, 297, 306, 307, 316, 370, 423, 451,
-	447, 456, 0, 585, 609, 623, 635, 641, 642, 644,
-	645, 646, 647, 648, 651, 649, 411, 314, 501, 336,
-	376, 0, 0, 429, 478, 242, 613, 502, 201, 0,
-	0, 0, 0, 257, 258, 0, 581, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 661, 662, 663, 664,
-	665, 666, 667, 668, 669, 670, 671, 672, 673, 674,
-	675, 676, 677, 678, 656, 514, 520, 515, 516, 517,
-	518, 519, 0, 521, 0, 0, 0, 0, 0, 402,
-	0, 598, 599, 679, 387, 492, 610, 338, 352, 355,
-	344, 364, 0, 365, 340, 341, 346, 349, 350, 351,
-	356, 357, 361, 367, 251, 212, 394, 403, 584, 315,
-	218, 219, 220, 530, 531, 532, 533, 626, 627, 631,
-	207, 468, 469, 470, 471, 295, 621, 312, 474, 473,
-	334, 335, 382, 454, 546, 548, 559, 563, 565, 567,
-	573, 576, 547, 549, 560, 564, 566, 568, 574, 577,
-	536, 538, 540, 542, 555, 554, 551, 579, 580, 557,
-	562, 541, 553, 558, 571, 578, 575, 535, 539, 543,
-	552, 570, 569, 550, 561, 572, 556, 544, 537, 545,
-	0, 198, 223, 371, 0, 460, 291, 657, 625, 490,
-	620, 208, 225, 0, 265, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 200, 202, 211, 224,
-	234, 238, 245, 264, 279, 281, 288, 301, 313, 321,
-	322, 325, 331, 383, 390, 391, 392, 393, 413, 414,
-	415, 418, 421, 422, 425, 427, 428, 431, 436, 440,
-	441, 442, 444, 446, 448, 461, 466, 480, 481, 482,
-	483, 484, 487, 488, 494, 495, 496, 497, 498, 506,
-	507, 522, 593, 595, 612, 632, 639, 486, 388, 434,
-	458, 586, 304, 305, 449, 450, 317, 318, 653, 654,
-	303, 607, 640, 604, 652, 634, 443, 381, 0, 0,
-	384, 284, 308, 323, 0, 624, 508, 229, 472, 293,
-	253, 0, 0, 213, 248, 232, 262, 277, 280, 327,
-	395, 404, 433, 439, 299, 274, 246, 465, 243, 491,
-	525, 526, 527, 529, 399, 269, 438, 400, 0, 379,
-	582, 583, 319, 0, 0, 0, 534, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 420, 0,
-	0, 0, 0, 0, 0, 0, 273, 0, 0, 0,
-	0, 369, 270, 0, 0, 206, 511, 0, 435, 0,
-	205, 0, 493, 255, 380, 377, 590, 285, 276, 272,
-	252, 320, 389, 432, 524, 426, 0, 373, 0, 0,
-	503, 405, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	326, 250, 328, 204, 417, 504, 289, 0, 0, 0,
-	0, 2148, 513, 731, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 240, 0, 0, 247, 0, 0, 0,
-	354, 363, 362, 342, 343, 345, 347, 353, 360, 366,
-	339, 348, 0, 0, 616, 0, 0, 0, 268, 324,
-	275, 267, 587, 0, 0, 0, 0, 0, 0, 603,
-	0, 0, 231, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 278, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 2149, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 300,
-	0, 406, 260, 0, 459, 0, 0, 0, 636, 0,
-	0, 0, 0, 0, 0, 0, 368, 0, 333, 199,
-	227, 0, 0, 416, 467, 479, 0, 0, 0, 256,
-	0, 477, 430, 611, 235, 287, 464, 437, 475, 445,
-	290, 0, 0, 476, 375, 592, 455, 608, 637, 638,
-	266, 410, 622, 528, 630, 655, 228, 263, 424, 512,
-	614, 500, 401, 588, 589, 332, 499, 298, 203, 372,
-	643, 226, 485, 374, 244, 233, 594, 619, 302, 254,
-	292, 462, 650, 215, 523, 605, 241, 489, 0, 0,
-	658, 249, 510, 617, 606, 217, 601, 509, 397, 329,
-	330, 216, 0, 463, 271, 296, 0, 0, 261, 419,
-	596, 597, 259, 659, 230, 629, 222, 0, 628, 412,
-	591, 602, 398, 386, 221, 600, 396, 385, 337, 358,
-	359, 283, 310, 452, 378, 453, 309, 311, 408, 407,
-	409, 209, 615, 633, 0, 210, 0, 505, 618, 660,
-	457, 214, 236, 237, 239, 0, 282, 286, 294, 297,
-	306, 307, 316, 370, 423, 451, 447, 456, 0, 585,
-	609, 623, 635, 641, 642, 644, 645, 646, 647, 648,
-	651, 649, 411, 314, 501, 336, 376, 0, 0, 429,
-	478, 242, 613, 502, 201, 0, 0, 0, 0, 257,
-	258, 0, 581, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 661, 662, 663, 664, 665, 666, 667, 668,
-	669, 670, 671, 672, 673, 674, 675, 676, 677, 678,
-	656, 514, 520, 515, 516, 517, 518, 519, 0, 521,
-	0, 0, 0, 0, 0, 402, 0, 598, 599, 679,
-	387, 492, 610, 338, 352, 355, 344, 364, 0, 365,
-	340, 341, 346, 349, 350, 351, 356, 357, 361, 367,
-	251, 212, 394, 403, 584, 315, 218, 219, 220, 530,
-	531, 532, 533, 626, 627, 631, 207, 468, 469, 470,
-	471, 295, 621, 312, 474, 473, 334, 335, 382, 454,
-	546, 548, 559, 563, 565, 567, 573, 576, 547, 549,
-	560, 564, 566, 568, 574, 577, 536, 538, 540, 542,
-	555, 554, 551, 579, 580, 557, 562, 541, 553, 558,
-	571, 578, 575, 535, 539, 543, 552, 570, 569, 550,
-	561, 572, 556, 544, 537, 545, 0, 198, 223, 371,
-	0, 460, 291, 657, 625, 490, 620, 208, 225, 0,
-	265, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 200, 202, 211, 224, 234, 238, 245, 264,
-	279, 281, 288, 301, 313, 321, 322, 325, 331, 383,
-	390, 391, 392, 393, 413, 414, 415, 418, 421, 422,
-	425, 427, 428, 431, 436, 440, 441, 442, 444, 446,
-	448, 461, 466, 480, 481, 482, 483, 484, 487, 488,
-	494, 495, 496, 497, 498, 506, 507, 522, 593, 595,
-	612, 632, 639, 486, 388, 434, 458, 586, 304, 305,
-	449, 450, 317, 318, 653, 654, 303, 607, 640, 604,
-	652, 634, 443, 381, 0, 0, 384, 284, 308, 323,
-	0, 624, 508, 229, 472, 293, 253, 0, 0, 213,
-	248, 232, 262, 277, 280, 327, 395, 404, 433, 439,
-	299, 274, 246, 465, 243, 491, 525, 526, 527, 529,
-	399, 269, 438, 400, 0, 379, 582, 583, 319, 0,
-	0, 0, 534, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 420, 0, 0, 0, 0, 0,
-	0, 0, 273, 0, 0, 0, 0, 369, 270, 0,
-	0, 206, 511, 0, 435, 0, 205, 0, 493, 255,
-	380, 377, 590, 285, 276, 272, 252, 320, 389, 432,
-	524, 426, 0, 373, 0, 0, 503, 405, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 326, 250, 328, 204,
-	417, 504, 289, 0, 0, 0, 0, 2900, 513, 731,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 240,
-	0, 0, 247, 0, 0, 0, 354, 363, 362, 342,
-	343, 345, 347, 353, 360, 366, 339, 348, 0, 0,
-	616, 0, 0, 0, 268, 324, 275, 267, 587, 0,
-	0, 0, 0, 0, 0, 603, 0, 0, 231, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 278, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 2901, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 300, 0, 406, 260, 0,
-	459, 0, 0, 0, 636, 0, 0, 0, 0, 0,
-	0, 0, 368, 0, 333, 199, 227, 0, 0, 416,
-	467, 479, 0, 0, 0, 256, 0, 477, 430, 611,
-	235, 287, 464, 437, 475, 445, 290, 0, 0, 476,
-	375, 592, 455, 608, 637, 638, 266, 410, 622, 528,
-	630, 655, 228, 263, 424, 512, 614, 500, 401, 588,
-	589, 332, 499, 298, 203, 372, 643, 226, 485, 374,
-	244, 233, 594, 619, 302, 254, 292, 462, 650, 215,
-	523, 605, 241, 489, 0, 0, 658, 249, 510, 617,
-	606, 217, 601, 509, 397, 329, 330, 216, 0, 463,
-	271, 296, 0, 0, 261, 419, 596, 597, 259, 659,
-	230, 629, 222, 0, 628, 412, 591, 602, 398, 386,
-	221, 600, 396, 385, 337, 358, 359, 283, 310, 452,
-	378, 453, 309, 311, 408, 407, 409, 209, 615, 633,
-	0, 210, 0, 505, 618, 660, 457, 214, 236, 237,
-	239, 0, 282, 286, 294, 297, 306, 307, 316, 370,
-	423, 451, 447, 456, 0, 585, 609, 623, 635, 641,
-	642, 644, 645, 646, 647, 648, 651, 649, 411, 314,
-	501, 336, 376, 0, 0, 429, 478, 242, 613, 502,
-	201, 0, 0, 0, 0, 257, 258, 0, 581, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 661, 662,
-	663, 664, 665, 666, 667, 668, 669, 670, 671, 672,
-	673, 674, 675, 676, 677, 678, 656, 514, 520, 515,
-	516, 517, 518, 519, 0, 521, 0, 0, 0, 0,
-	0, 402, 0, 598, 599, 679, 387, 492, 610, 338,
-	352, 355, 344, 364, 0, 365, 340, 341, 346, 349,
-	350, 351, 356, 357, 361, 367, 251, 212, 394, 403,
-	584, 315, 218, 219, 220, 530, 531, 532, 533, 626,
-	627, 631, 207, 468, 469, 470, 471, 295, 621, 312,
-	474, 473, 334, 335, 382, 454, 546, 548, 559, 563,
-	565, 567, 573, 576, 547, 549, 560, 564, 566, 568,
-	574, 577, 536, 538, 540, 542, 555, 554, 551, 579,
-	580, 557, 562, 541, 553, 558, 571, 578, 575, 535,
-	539, 543, 552, 570, 569, 550, 561, 572, 556, 544,
-	537, 545, 0, 198, 223, 371, 0, 460, 291, 657,
-	625, 490, 620, 208, 225, 0, 265, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 200, 202,
-	211, 224, 234, 238, 245, 264, 279, 281, 288, 301,
-	313, 321, 322, 325, 331, 383, 390, 391, 392, 393,
-	413, 414, 415, 418, 421, 422, 425, 427, 428, 431,
-	436, 440, 441, 442, 444, 446, 448, 461, 466, 480,
-	481, 482, 483, 484, 487, 488, 494, 495, 496, 497,
-	498, 506, 507, 522, 593, 595, 612, 632, 639, 486,
-	388, 434, 458, 586, 304, 305, 449, 450, 317, 318,
-	653, 654, 303, 607, 640, 604, 652, 634, 443, 381,
-	0, 0, 384, 284, 308, 323, 0, 624, 508, 229,
-	472, 293, 253, 0, 0, 213, 248, 232, 262, 277,
-	280, 327, 395, 404, 433, 439, 299, 274, 246, 465,
-	243, 491, 525, 526, 527, 529, 399, 269, 438, 400,
-	0, 379, 582, 583, 319, 0, 0, 0, 534, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	420, 0, 0, 0, 0, 0, 0, 0, 273, 0,
-	0, 0, 0, 369, 270, 0, 0, 206, 511, 0,
-	435, 0, 205, 0, 493, 255, 380, 377, 590, 285,
-	276, 272, 252, 320, 389, 432, 524, 426, 0, 373,
-	0, 0, 503, 405, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 326, 250, 328, 204, 417, 504, 289, 0,
-	0, 0, 0, 0, 513, 731, 0, 0, 0, 0,
-	2883, 0, 0, 0, 0, 240, 0, 0, 247, 2884,
-	0, 0, 354, 363, 362, 342, 343, 345, 347, 353,
-	360, 366, 339, 348, 0, 0, 616, 0, 0, 0,
-	268, 324, 275, 267, 587, 0, 0, 0, 0, 0,
-	0, 603, 0, 0, 231, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 278,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 300, 0, 406, 260, 0, 459, 0, 0, 0,
-	636, 0, 0, 0, 0, 0, 0, 0, 368, 0,
-	333, 199, 227, 0, 0, 416, 467, 479, 0, 0,
-	0, 256, 0, 477, 430, 611, 235, 287, 464, 437,
-	475, 445, 290, 0, 0, 476, 375, 592, 455, 608,
-	637, 638, 266, 410, 622, 528, 630, 655, 228, 263,
-	424, 512, 614, 500, 401, 588, 589, 332, 499, 298,
-	203, 372, 643, 226, 485, 374, 244, 233, 594, 619,
-	302, 254, 292, 462, 650, 215, 523, 605, 241, 489,
-	0, 0, 658, 249, 510, 617, 606, 217, 601, 509,
-	397, 329, 330, 216, 0, 463, 271, 296, 0, 0,
-	261, 419, 596, 597, 259, 659, 230, 629, 222, 0,
-	628, 412, 591, 602, 398, 386, 221, 600, 396, 385,
-	337, 358, 359, 283, 310, 452, 378, 453, 309, 311,
-	408, 407, 409, 209, 615, 633, 0, 210, 0, 505,
-	618, 660, 457, 214, 236, 237, 239, 0, 282, 286,
-	294, 297, 306, 307, 316, 370, 423, 451, 447, 456,
-	0, 585, 609, 623, 635, 641, 642, 644, 645, 646,
-	647, 648, 651, 649, 411, 314, 501, 336, 376, 0,
-	0, 429, 478, 242, 613, 502, 201, 0, 0, 0,
-	0, 257, 258, 0, 581, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 661, 662, 663, 664, 665, 666,
-	667, 668, 669, 670, 671, 672, 673, 674, 675, 676,
-	677, 678, 656, 514, 520, 515, 516, 517, 518, 519,
-	0, 521, 0, 0, 0, 0, 0, 402, 0, 598,
-	599, 679, 387, 492, 610, 338, 352, 355, 344, 364,
-	0, 365, 340, 341, 346, 349, 350, 351, 356, 357,
-	361, 367, 251, 212, 394, 403, 584, 315, 218, 219,
-	220, 530, 531, 532, 533, 626, 627, 631, 207, 468,
-	469, 470, 471, 295, 621, 312, 474, 473, 334, 335,
-	382, 454, 546, 548, 559, 563, 565, 567, 573, 576,
-	547, 549, 560, 564, 566, 568, 574, 577, 536, 538,
-	540, 542, 555, 554, 551, 579, 580, 557, 562, 541,
-	553, 558, 571, 578, 575, 535, 539, 543, 552, 570,
-	569, 550, 561, 572, 556, 544, 537, 545, 0, 198,
-	223, 371, 0, 460, 291, 657, 625, 490, 620, 208,
-	225, 0, 265, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 200, 202, 211, 224, 234, 238,
-	245, 264, 279, 281, 288, 301, 313, 321, 322, 325,
-	331, 383, 390, 391, 392, 393, 413, 414, 415, 418,
-	421, 422, 425, 427, 428, 431, 436, 440, 441, 442,
-	444, 446, 448, 461, 466, 480, 481, 482, 483, 484,
-	487, 488, 494, 495, 496, 497, 498, 506, 507, 522,
-	593, 595, 612, 632, 639, 486, 388, 434, 458, 586,
-	304, 305, 449, 450, 317, 318, 653, 654, 303, 607,
-	640, 604, 652, 634, 443, 381, 0, 0, 384, 284,
-	308, 323, 0, 624, 508, 229, 472, 293, 253, 0,
-	0, 213, 248, 232, 262, 277, 280, 327, 395, 404,
-	433, 439, 299, 274, 246, 465, 243, 491, 525, 526,
-	527, 529, 399, 269, 438, 400, 0, 379, 582, 583,
-	319, 0, 0, 0, 534, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 420, 0, 0, 0,
-	0, 0, 0, 0, 273, 1815, 0, 0, 0, 369,
-	270, 0, 0, 206, 511, 0, 435, 0, 205, 0,
-	493, 255, 380, 377, 590, 285, 276, 272, 252, 320,
-	389, 432, 524, 426, 0, 373, 0, 0, 503, 405,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 326, 250,
-	328, 204, 417, 504, 289, 0, 0, 0, 0, 1814,
-	513, 731, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 240, 0, 0, 247, 0, 0, 0, 354, 363,
-	362, 342, 343, 345, 347, 353, 360, 366, 339, 348,
-	0, 0, 616, 0, 0, 0, 268, 324, 275, 267,
-	587, 0, 0, 0, 0, 0, 0, 603, 0, 0,
-	231, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 278, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 300, 0, 406,
-	260, 0, 459, 0, 0, 0, 636, 0, 0, 0,
-	0, 0, 0, 0, 368, 0, 333, 199, 227, 0,
-	0, 416, 467, 479, 0, 0, 0, 256, 0, 477,
-	430, 611, 235, 287, 464, 437, 475, 445, 290, 0,
-	0, 476, 375, 592, 455, 608, 637, 638, 266, 410,
-	622, 528, 630, 655, 228, 263, 424, 512, 614, 500,
-	401, 588, 589, 332, 499, 298, 203, 372, 643, 226,
-	485, 374, 244, 233, 594, 619, 302, 254, 292, 462,
-	650, 215, 523, 605, 241, 489, 0, 0, 658, 249,
-	510, 617, 606, 217, 601, 509, 397, 329, 330, 216,
-	0, 463, 271, 296, 0, 0, 261, 419, 596, 597,
-	259, 659, 230, 629, 222, 0, 628, 412, 591, 602,
-	398, 386, 221, 600, 396, 385, 337, 358, 359, 283,
-	310, 452, 378, 453, 309, 311, 408, 407, 409, 209,
-	615, 633, 0, 210, 0, 505, 618, 660, 457, 214,
-	236, 237, 239, 0, 282, 286, 294, 297, 306, 307,
-	316, 370, 423, 451, 447, 456, 0, 585, 609, 623,
-	635, 641, 642, 644, 645, 646, 647, 648, 651, 649,
-	411, 314, 501, 336, 376, 0, 0, 429, 478, 242,
-	613, 502, 201, 0, 0, 0, 0, 257, 258, 0,
-	581, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	661, 662, 663, 664, 665, 666, 667, 668, 669, 670,
-	671, 672, 673, 674, 675, 676, 677, 678, 656, 514,
-	520, 515, 516, 517, 518, 519, 0, 521, 0, 0,
-	0, 0, 0, 402, 0, 598, 599, 679, 387, 492,
-	610, 338, 352, 355, 344, 364, 0, 365, 340, 341,
-	346, 349, 350, 351, 356, 357, 361, 367, 251, 212,
-	394, 403, 584, 315, 218, 219, 220, 530, 531, 532,
-	533, 626, 627, 631, 207, 468, 469, 470, 471, 295,
-	621, 312, 474, 473, 334, 335, 382, 454, 546, 548,
-	559, 563, 565, 567, 573, 576, 547, 549, 560, 564,
-	566, 568, 574, 577, 536, 538, 540, 542, 555, 554,
-	551, 579, 580, 557, 562, 541, 553, 558, 571, 578,
-	575, 535, 539, 543, 552, 570, 569, 550, 561, 572,
-	556, 544, 537, 545, 0, 198, 223, 371, 0, 460,
-	291, 657, 625, 490, 620, 208, 225, 0, 265, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	200, 202, 211, 224, 234, 238, 245, 264, 279, 281,
-	288, 301, 313, 321, 322, 325, 331, 383, 390, 391,
-	392, 393, 413, 414, 415, 418, 421, 422, 425, 427,
-	428, 431, 436, 440, 441, 442, 444, 446, 448, 461,
-	466, 480, 481, 482, 483, 484, 487, 488, 494, 495,
-	496, 497, 498, 506, 507, 522, 593, 595, 612, 632,
-	639, 486, 388, 434, 458, 586, 304, 305, 449, 450,
-	317, 318, 653, 654, 303, 607, 640, 604, 652, 634,
-	443, 381, 0, 0, 384, 284, 308, 323, 0, 624,
-	508, 229, 472, 293, 253, 0, 0, 213, 248, 232,
-	262, 277, 280, 327, 395, 404, 433, 439, 299, 274,
-	246, 465, 243, 491, 525, 526, 527, 529, 399, 269,
-	438, 400, 0, 379, 582, 583, 319, 0, 0, 0,
-	534, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 420, 0, 0, 0, 0, 0, 0, 0,
-	273, 0, 0, 0, 0, 369, 270, 0, 0, 206,
-	511, 0, 435, 0, 205, 0, 493, 255, 380, 377,
-	590, 285, 276, 272, 252, 320, 389, 432, 524, 426,
-	0, 373, 0, 0, 503, 405, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 326, 250, 328, 204, 417, 504,
-	289, 0, 0, 0, 0, 0, 513, 733, 734, 735,
-	0, 0, 0, 0, 0, 0, 0, 240, 0, 0,
-	247, 0, 0, 0, 354, 363, 362, 342, 343, 345,
-	347, 353, 360, 366, 339, 348, 0, 0, 616, 0,
-	0, 0, 268, 324, 275, 267, 587, 0, 0, 0,
-	0, 0, 0, 603, 0, 0, 231, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 278, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 300, 0, 406, 260, 0, 459, 0,
-	0, 0, 636, 0, 0, 0, 0, 0, 0, 0,
-	368, 0, 333, 199, 227, 0, 0, 416, 467, 479,
-	0, 0, 0, 256, 0, 477, 430, 611, 235, 287,
-	464, 437, 475, 445, 290, 0, 0, 476, 375, 592,
-	455, 608, 637, 638, 266, 410, 622, 528, 630, 655,
-	228, 263, 424, 512, 614, 500, 401, 588, 589, 332,
-	499, 298, 203, 372, 643, 226, 485, 374, 244, 233,
-	594, 619, 302, 254, 292, 462, 650, 215, 523, 605,
-	241, 489, 0, 0, 658, 249, 510, 617, 606, 217,
-	601, 509, 397, 329, 330, 216, 0, 463, 271, 296,
-	0, 0, 261, 419, 596, 597, 259, 659, 230, 629,
-	222, 0, 628, 412, 591, 602, 398, 386, 221, 600,
-	396, 385, 337, 358, 359, 283, 310, 452, 378, 453,
-	309, 311, 408, 407, 409, 209, 615, 633, 0, 210,
-	0, 505, 618, 660, 457, 214, 236, 237, 239, 0,
-	282, 286, 294, 297, 306, 307, 316, 370, 423, 451,
-	447, 456, 0, 585, 609, 623, 635, 641, 642, 644,
-	645, 646, 647, 648, 651, 649, 411, 314, 501, 336,
-	376, 0, 0, 429, 478, 242, 613, 502, 201, 0,
-	0, 0, 0, 257, 258, 0, 581, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 661, 662, 663, 664,
-	665, 666, 667, 668, 669, 670, 671, 672, 673, 674,
-	675, 676, 677, 678, 656, 514, 520, 515, 516, 517,
-	518, 519, 0, 521, 0, 0, 0, 0, 0, 402,
-	0, 598, 599, 679, 387, 492, 610, 338, 352, 355,
-	344, 364, 0, 365, 340, 341, 346, 349, 350, 351,
-	356, 357, 361, 367, 251, 212, 394, 403, 584, 315,
-	218, 219, 220, 530, 531, 532, 533, 626, 627, 631,
-	207, 468, 469, 470, 471, 295, 621, 312, 474, 473,
-	334, 335, 382, 454, 546, 548, 559, 563, 565, 567,
-	573, 576, 547, 549, 560, 564, 566, 568, 574, 577,
-	536, 538, 540, 542, 555, 554, 551, 579, 580, 557,
-	562, 541, 553, 558, 571, 578, 575, 535, 539, 543,
-	552, 570, 569, 550, 561, 572, 556, 544, 537, 545,
-	0, 198, 223, 371, 0, 460, 291, 657, 625, 490,
-	620, 208, 225, 0, 265, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 200, 202, 211, 224,
-	234, 238, 245, 264, 279, 281, 288, 301, 313, 321,
-	322, 325, 331, 383, 390, 391, 392, 393, 413, 414,
-	415, 418, 421, 422, 425, 427, 428, 431, 436, 440,
-	441, 442, 444, 446, 448, 461, 466, 480, 481, 482,
-	483, 484, 487, 488, 494, 495, 496, 497, 498, 506,
-	507, 522, 593, 595, 612, 632, 639, 486, 388, 434,
-	458, 586, 304, 305, 449, 450, 317, 318, 653, 654,
-	303, 607, 640, 604, 652, 634, 443, 381, 0, 0,
-	384, 284, 308, 323, 0, 624, 508, 229, 472, 293,
-	253, 0, 0, 213, 248, 232, 262, 277, 280, 327,
-	395, 404, 433, 439, 299, 274, 246, 465, 243, 491,
-	525, 526, 527, 529, 399, 269, 438, 400, 0, 379,
-	582, 583, 319, 0, 0, 0, 534, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 420, 0,
-	0, 0, 0, 0, 0, 0, 273, 0, 0, 0,
-	0, 369, 270, 0, 0, 206, 511, 0, 435, 0,
-	205, 0, 493, 255, 380, 377, 590, 285, 276, 272,
-	252, 320, 389, 432, 524, 426, 0, 373, 0, 0,
-	503, 405, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	326, 250, 328, 204, 417, 504, 289, 0, 0, 0,
-	0, 0, 513, 731, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 240, 0, 0, 247, 0, 0, 0,
-	354, 363, 362, 342, 343, 345, 347, 353, 360, 366,
-	339, 348, 0, 0, 616, 0, 0, 0, 268, 324,
-	275, 267, 587, 0, 0, 0, 0, 0, 0, 603,
-	0, 0, 231, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 278, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 300,
-	0, 406, 260, 0, 459, 0, 0, 0, 636, 0,
-	0, 0, 4093, 0, 0, 0, 368, 0, 333, 199,
-	227, 0, 0, 416, 467, 479, 0, 0, 0, 256,
-	0, 477, 430, 611, 235, 287, 464, 437, 475, 445,
-	290, 0, 0, 476, 375, 592, 455, 608, 637, 638,
-	266, 410, 622, 528, 630, 655, 228, 263, 424, 512,
-	614, 500, 401, 588, 589, 332, 499, 298, 203, 372,
-	643, 226, 485, 374, 244, 233, 594, 619, 302, 254,
-	292, 462, 650, 215, 523, 605, 241, 489, 0, 0,
-	658, 249, 510, 617, 606, 217, 601, 509, 397, 329,
-	330, 216, 0, 463, 271, 296, 0, 0, 261, 419,
-	596, 597, 259, 659, 230, 629, 222, 0, 628, 412,
-	591, 602, 398, 386, 221, 600, 396, 385, 337, 358,
-	359, 283, 310, 452, 378, 453, 309, 311, 408, 407,
-	409, 209, 615, 633, 0, 210, 0, 505, 618, 660,
-	457, 214, 236, 237, 239, 0, 282, 286, 294, 297,
-	306, 307, 316, 370, 423, 451, 447, 456, 0, 585,
-	609, 623, 635, 641, 642, 644, 645, 646, 647, 648,
-	651, 649, 411, 314, 501, 336, 376, 0, 0, 429,
-	478, 242, 613, 502, 201, 0, 0, 0, 0, 257,
-	258, 0, 581, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 661, 662, 663, 664, 665, 666, 667, 668,
-	669, 670, 671, 672, 673, 674, 675, 676, 677, 678,
-	656, 514, 520, 515, 516, 517, 518, 519, 0, 521,
-	0, 0, 0, 0, 0, 402, 0, 598, 599, 679,
-	387, 492, 610, 338, 352, 355, 344, 364, 0, 365,
-	340, 341, 346, 349, 350, 351, 356, 357, 361, 367,
-	251, 212, 394, 403, 584, 315, 218, 219, 220, 530,
-	531, 532, 533, 626, 627, 631, 207, 468, 469, 470,
-	471, 295, 621, 312, 474, 473, 334, 335, 382, 454,
-	546, 548, 559, 563, 565, 567, 573, 576, 547, 549,
-	560, 564, 566, 568, 574, 577, 536, 538, 540, 542,
-	555, 554, 551, 579, 580, 557, 562, 541, 553, 558,
-	571, 578, 575, 535, 539, 543, 552, 570, 569, 550,
-	561, 572, 556, 544, 537, 545, 0, 198, 223, 371,
-	0, 460, 291, 657, 625, 490, 620, 208, 225, 0,
-	265, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 200, 202, 211, 224, 234, 238, 245, 264,
-	279, 281, 288, 301, 313, 321, 322, 325, 331, 383,
-	390, 391, 392, 393, 413, 414, 415, 418, 421, 422,
-	425, 427, 428, 431, 436, 440, 441, 442, 444, 446,
-	448, 461, 466, 480, 481, 482, 483, 484, 487, 488,
-	494, 495, 496, 497, 498, 506, 507, 522, 593, 595,
-	612, 632, 639, 486, 388, 434, 458, 586, 304, 305,
-	449, 450, 317, 318, 653, 654, 303, 607, 640, 604,
-	652, 634, 443, 381, 0, 0, 384, 284, 308, 323,
-	0, 624, 508, 229, 472, 293, 253, 0, 0, 213,
-	248, 232, 262, 277, 280, 327, 395, 404, 433, 439,
-	299, 274, 246, 465, 243, 491, 525, 526, 527, 529,
-	399, 269, 438, 400, 0, 379, 582, 583, 319, 0,
-	0, 0, 534, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 420, 0, 0, 0, 0, 0,
-	0, 0, 273, 0, 0, 0, 0, 369, 270, 0,
-	0, 206, 511, 0, 435, 0, 205, 0, 493, 255,
-	380, 377, 590, 285, 276, 272, 252, 320, 389, 432,
-	524, 426, 0, 373, 0, 0, 503, 405, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 326, 250, 328, 204,
-	417, 504, 289, 0, 0, 0, 0, 1977, 513, 196,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 240,
-	0, 0, 247, 0, 0, 0, 354, 363, 362, 342,
-	343, 345, 347, 353, 360, 366, 339, 348, 0, 0,
-	616, 0, 0, 0, 268, 324, 275, 267, 587, 0,
-	0, 0, 0, 0, 0, 603, 0, 0, 231, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 278, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 300, 0, 406, 260, 0,
-	459, 0, 0, 0, 636, 0, 0, 0, 0, 0,
-	0, 0, 368, 0, 333, 199, 227, 0, 0, 416,
-	467, 479, 0, 0, 0, 256, 0, 477, 430, 611,
-	235, 287, 464, 437, 475, 445, 290, 0, 0, 476,
-	375, 592, 455, 608, 637, 638, 266, 410, 622, 528,
-	630, 655, 228, 263, 424, 512, 614, 500, 401, 588,
-	589, 332, 499, 298, 203, 372, 643, 226, 485, 374,
-	244, 233, 594, 619, 302, 254, 292, 462, 650, 215,
-	523, 605, 241, 489, 0, 0, 658, 249, 510, 617,
-	606, 217, 601, 509, 397, 329, 330, 216, 0, 463,
-	271, 296, 0, 0, 261, 419, 596, 597, 259, 659,
-	230, 629, 222, 0, 628, 412, 591, 602, 398, 386,
-	221, 600, 396, 385, 337, 358, 359, 283, 310, 452,
-	378, 453, 309, 311, 408, 407, 409, 209, 615, 633,
-	0, 210, 0, 505, 618, 660, 457, 214, 236, 237,
-	239, 0, 282, 286, 294, 297, 306, 307, 316, 370,
-	423, 451, 447, 456, 0, 585, 609, 623, 635, 641,
-	642, 644, 645, 646, 647, 648, 651, 649, 411, 314,
-	501, 336, 376, 0, 0, 429, 478, 242, 613, 502,
-	201, 0, 0, 0, 0, 257, 258, 0, 581, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 661, 662,
-	663, 664, 665, 666, 667, 668, 669, 670, 671, 672,
-	673, 674, 675, 676, 677, 678, 656, 514, 520, 515,
-	516, 517, 518, 519, 0, 521, 0, 0, 0, 0,
-	0, 402, 0, 598, 599, 679, 387, 492, 610, 338,
-	352, 355, 344, 364, 0, 365, 340, 341, 346, 349,
-	350, 351, 356, 357, 361, 367, 251, 212, 394, 403,
-	584, 315, 218, 219, 220, 530, 531, 532, 533, 626,
-	627, 631, 207, 468, 469, 470, 471, 295, 621, 312,
-	474, 473, 334, 335, 382, 454, 546, 548, 559, 563,
-	565, 567, 573, 576, 547, 549, 560, 564, 566, 568,
-	574, 577, 536, 538, 540, 542, 555, 554, 551, 579,
-	580, 557, 562, 541, 553, 558, 571, 578, 575, 535,
-	539, 543, 552, 570, 569, 550, 561, 572, 556, 544,
-	537, 545, 0, 198, 223, 371, 0, 460, 291, 657,
-	625, 490, 620, 208, 225, 0, 265, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 200, 202,
-	211, 224, 234, 238, 245, 264, 279, 281, 288, 301,
-	313, 321, 322, 325, 331, 383, 390, 391, 392, 393,
-	413, 414, 415, 418, 421, 422, 425, 427, 428, 431,
-	436, 440, 441, 442, 444, 446, 448, 461, 466, 480,
-	481, 482, 483, 484, 487, 488, 494, 495, 496, 497,
-	498, 506, 507, 522, 593, 595, 612, 632, 639, 486,
-	388, 434, 458, 586, 304, 305, 449, 450, 317, 318,
-	653, 654, 303, 607, 640, 604, 652, 634, 443, 381,
-	0, 0, 384, 284, 308, 323, 0, 624, 508, 229,
-	472, 293, 253, 0, 0, 213, 248, 232, 262, 277,
-	280, 327, 395, 404, 433, 439, 299, 274, 246, 465,
-	243, 491, 525, 526, 527, 529, 399, 269, 438, 400,
-	0, 379, 582, 583, 319, 0, 0, 0, 534, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	420, 0, 0, 0, 0, 0, 0, 0, 273, 0,
-	0, 0, 0, 369, 270, 0, 0, 206, 511, 0,
-	435, 0, 205, 0, 493, 255, 380, 377, 590, 285,
-	276, 272, 252, 320, 389, 432, 524, 426, 0, 373,
-	0, 0, 503, 405, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 326, 250, 328, 204, 417, 504, 289, 0,
-	0, 0, 0, 0, 513, 731, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 240, 0, 0, 247, 0,
-	0, 0, 354, 363, 362, 342, 343, 345, 347, 353,
-	360, 366, 339, 348, 0, 0, 616, 0, 0, 0,
-	268, 324, 275, 267, 587, 0, 0, 0, 0, 0,
-	0, 603, 0, 0, 231, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 278,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 300, 0, 406, 260, 0, 459, 0, 0, 0,
-	636, 0, 0, 0, 3749, 0, 0, 0, 368, 0,
-	333, 199, 227, 0, 0, 416, 467, 479, 0, 0,
-	0, 256, 0, 477, 430, 611, 235, 287, 464, 437,
-	475, 445, 290, 0, 0, 476, 375, 592, 455, 608,
-	637, 638, 266, 410, 622, 528, 630, 655, 228, 263,
-	424, 512, 614, 500, 401, 588, 589, 332, 499, 298,
-	203, 372, 643, 226, 485, 374, 244, 233, 594, 619,
-	302, 254, 292, 462, 650, 215, 523, 605, 241, 489,
-	0, 0, 658, 249, 510, 617, 606, 217, 601, 509,
-	397, 329, 330, 216, 0, 463, 271, 296, 0, 0,
-	261, 419, 596, 597, 259, 659, 230, 629, 222, 0,
-	628, 412, 591, 602, 398, 386, 221, 600, 396, 385,
-	337, 358, 359, 283, 310, 452, 378, 453, 309, 311,
-	408, 407, 409, 209, 615, 633, 0, 210, 0, 505,
-	618, 660, 457, 214, 236, 237, 239, 0, 282, 286,
-	294, 297, 306, 307, 316, 370, 423, 451, 447, 456,
-	0, 585, 609, 623, 635, 641, 642, 644, 645, 646,
-	647, 648, 651, 649, 411, 314, 501, 336, 376, 0,
-	0, 429, 478, 242, 613, 502, 201, 0, 0, 0,
-	0, 257, 258, 0, 581, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 661, 662, 663, 664, 665, 666,
-	667, 668, 669, 670, 671, 672, 673, 674, 675, 676,
-	677, 678, 656, 514, 520, 515, 516, 517, 518, 519,
-	0, 521, 0, 0, 0, 0, 0, 402, 0, 598,
-	599, 679, 387, 492, 610, 338, 352, 355, 344, 364,
-	0, 365, 340, 341, 346, 349, 350, 351, 356, 357,
-	361, 367, 251, 212, 394, 403, 584, 315, 218, 219,
-	220, 530, 531, 532, 533, 626, 627, 631, 207, 468,
-	469, 470, 471, 295, 621, 312, 474, 473, 334, 335,
-	382, 454, 546, 548, 559, 563, 565, 567, 573, 576,
-	547, 549, 560, 564, 566, 568, 574, 577, 536, 538,
-	540, 542, 555, 554, 551, 579, 580, 557, 562, 541,
-	553, 558, 571, 578, 575, 535, 539, 543, 552, 570,
-	569, 550, 561, 572, 556, 544, 537, 545, 0, 198,
-	223, 371, 0, 460, 291, 657, 625, 490, 620, 208,
-	225, 0, 265, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 200, 202, 211, 224, 234, 238,
-	245, 264, 279, 281, 288, 301, 313, 321, 322, 325,
-	331, 383, 390, 391, 392, 393, 413, 414, 415, 418,
-	421, 422, 425, 427, 428, 431, 436, 440, 441, 442,
-	444, 446, 448, 461, 466, 480, 481, 482, 483, 484,
-	487, 488, 494, 495, 496, 497, 498, 506, 507, 522,
-	593, 595, 612, 632, 639, 486, 388, 434, 458, 586,
-	304, 305, 449, 450, 317, 318, 653, 654, 303, 607,
-	640, 604, 652, 634, 443, 381, 0, 0, 384, 284,
-	308, 323, 0, 624, 508, 229, 472, 293, 253, 0,
-	0, 213, 248, 232, 262, 277, 280, 327, 395, 404,
-	433, 439, 299, 274, 246, 465, 243, 491, 525, 526,
-	527, 529, 399, 269, 438, 400, 0, 379, 582, 583,
-	319, 0, 0, 0, 534, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 420, 0, 0, 0,
-	0, 0, 0, 0, 273, 0, 0, 0, 0, 369,
-	270, 0, 0, 206, 511, 0, 435, 0, 205, 0,
-	493, 255, 380, 377, 590, 285, 276, 272, 252, 320,
-	389, 432, 524, 426, 0, 373, 0, 0, 503, 405,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 326, 250,
-	328, 204, 417, 504, 289, 0, 95, 0, 0, 0,
-	513, 731, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 240, 0, 0, 247, 0, 0, 0, 354, 363,
-	362, 342, 343, 345, 347, 353, 360, 366, 339, 348,
-	0, 0, 616, 0, 0, 0, 268, 324, 275, 267,
-	587, 0, 0, 0, 0, 0, 0, 603, 0, 0,
-	231, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 278, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 300, 0, 406,
-	260, 0, 459, 0, 0, 0, 636, 0, 0, 0,
-	0, 0, 0, 0, 368, 0, 333, 199, 227, 0,
-	0, 416, 467, 479, 0, 0, 0, 256, 0, 477,
-	430, 611, 235, 287, 464, 437, 475, 445, 290, 0,
-	0, 476, 375, 592, 455, 608, 637, 638, 266, 410,
-	622, 528, 630, 655, 228, 263, 424, 512, 614, 500,
-	401, 588, 589, 332, 499, 298, 203, 372, 643, 226,
-	485, 374, 244, 233, 594, 619, 302, 254, 292, 462,
-	650, 215, 523, 605, 241, 489, 0, 0, 658, 249,
-	510, 617, 606, 217, 601, 509, 397, 329, 330, 216,
-	0, 463, 271, 296, 0, 0, 261, 419, 596, 597,
-	259, 659, 230, 629, 222, 0, 628, 412, 591, 602,
-	398, 386, 221, 600, 396, 385, 337, 358, 359, 283,
-	310, 452, 378, 453, 309, 311, 408, 407, 409, 209,
-	615, 633, 0, 210, 0, 505, 618, 660, 457, 214,
-	236, 237, 239, 0, 282, 286, 294, 297, 306, 307,
-	316, 370, 423, 451, 447, 456, 0, 585, 609, 623,
-	635, 641, 642, 644, 645, 646, 647, 648, 651, 649,
-	411, 314, 501, 336, 376, 0, 0, 429, 478, 242,
-	613, 502, 201, 0, 0, 0, 0, 257, 258, 0,
-	581, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	661, 662, 663, 664, 665, 666, 667, 668, 669, 670,
-	671, 672, 673, 674, 675, 676, 677, 678, 656, 514,
-	520, 515, 516, 517, 518, 519, 0, 521, 0, 0,
-	0, 0, 0, 402, 0, 598, 599, 679, 387, 492,
-	610, 338, 352, 355, 344, 364, 0, 365, 340, 341,
-	346, 349, 350, 351, 356, 357, 361, 367, 251, 212,
-	394, 403, 584, 315, 218, 219, 220, 530, 531, 532,
-	533, 626, 627, 631, 207, 468, 469, 470, 471, 295,
-	621, 312, 474, 473, 334, 335, 382, 454, 546, 548,
-	559, 563, 565, 567, 573, 576, 547, 549, 560, 564,
-	566, 568, 574, 577, 536, 538, 540, 542, 555, 554,
-	551, 579, 580, 557, 562, 541, 553, 558, 571, 578,
-	575, 535, 539, 543, 552, 570, 569, 550, 561, 572,
-	556, 544, 537, 545, 0, 198, 223, 371, 0, 460,
-	291, 657, 625, 490, 620, 208, 225, 0, 265, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	200, 202, 211, 224, 234, 238, 245, 264, 279, 281,
-	288, 301, 313, 321, 322, 325, 331, 383, 390, 391,
-	392, 393, 413, 414, 415, 418, 421, 422, 425, 427,
-	428, 431, 436, 440, 441, 442, 444, 446, 448, 461,
-	466, 480, 481, 482, 483, 484, 487, 488, 494, 495,
-	496, 497, 498, 506, 507, 522, 593, 595, 612, 632,
-	639, 486, 388, 434, 458, 586, 304, 305, 449, 450,
-	317, 318, 653, 654, 303, 607, 640, 604, 652, 634,
-	443, 381, 0, 0, 384, 284, 308, 323, 0, 624,
-	508, 229, 472, 293, 253, 0, 0, 213, 248, 232,
-	262, 277, 280, 327, 395, 404, 433, 439, 299, 274,
-	246, 465, 243, 491, 525, 526, 527, 529, 399, 269,
-	438, 400, 0, 379, 582, 583, 319, 0, 0, 0,
-	534, 0, 0, 0, 0, 2445, 0, 0, 0, 0,
-	0, 0, 420, 0, 0, 0, 0, 0, 0, 0,
-	273, 0, 0, 0, 0, 369, 270, 0, 0, 206,
-	511, 0, 435, 0, 205, 0, 493, 255, 380, 377,
-	590, 285, 276, 272, 252, 320, 389, 432, 524, 426,
-	0, 373, 0, 0, 503, 405, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 326, 250, 328, 204, 417, 504,
-	289, 0, 0, 0, 0, 0, 513, 196, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 240, 0, 0,
-	247, 0, 0, 0, 354, 363, 362, 342, 343, 345,
-	347, 353, 360, 366, 339, 348, 0, 0, 616, 0,
-	0, 0, 268, 324, 275, 267, 587, 0, 0, 0,
-	0, 0, 0, 603, 0, 0, 231, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 278, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 300, 0, 406, 260, 0, 459, 0,
-	0, 0, 636, 0, 0, 0, 0, 0, 0, 0,
-	368, 0, 333, 199, 227, 0, 0, 416, 467, 479,
-	0, 0, 0, 256, 0, 477, 430, 611, 235, 287,
-	464, 437, 475, 445, 290, 0, 0, 476, 375, 592,
-	455, 608, 637, 638, 266, 410, 622, 528, 630, 655,
-	228, 263, 424, 512, 614, 500, 401, 588, 589, 332,
-	499, 298, 203, 372, 643, 226, 485, 374, 244, 233,
-	594, 619, 302, 254, 292, 462, 650, 215, 523, 605,
-	241, 489, 0, 0, 658, 249, 510, 617, 606, 217,
-	601, 509, 397, 329, 330, 216, 0, 463, 271, 296,
-	0, 0, 261, 419, 596, 597, 259, 659, 230, 629,
-	222, 0, 628, 412, 591, 602, 398, 386, 221, 600,
-	396, 385, 337, 358, 359, 283, 310, 452, 378, 453,
-	309, 311, 408, 407, 409, 209, 615, 633, 0, 210,
-	0, 505, 618, 660, 457, 214, 236, 237, 239, 0,
-	282, 286, 294, 297, 306, 307, 316, 370, 423, 451,
-	447, 456, 0, 585, 609, 623, 635, 641, 642, 644,
-	645, 646, 647, 648, 651, 649, 411, 314, 501, 336,
-	376, 0, 0, 429, 478, 242, 613, 502, 201, 0,
-	0, 0, 0, 257, 258, 0, 581, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 661, 662, 663, 664,
-	665, 666, 667, 668, 669, 670, 671, 672, 673, 674,
-	675, 676, 677, 678, 656, 514, 520, 515, 516, 517,
-	518, 519, 0, 521, 0, 0, 0, 0, 0, 402,
-	0, 598, 599, 679, 387, 492, 610, 338, 352, 355,
-	344, 364, 0, 365, 340, 341, 346, 349, 350, 351,
-	356, 357, 361, 367, 251, 212, 394, 403, 584, 315,
-	218, 219, 220, 530, 531, 532, 533, 626, 627, 631,
-	207, 468, 469, 470, 471, 295, 621, 312, 474, 473,
-	334, 335, 382, 454, 546, 548, 559, 563, 565, 567,
-	573, 576, 547, 549, 560, 564, 566, 568, 574, 577,
-	536, 538, 540, 542, 555, 554, 551, 579, 580, 557,
-	562, 541, 553, 558, 571, 578, 575, 535, 539, 543,
-	552, 570, 569, 550, 561, 572, 556, 544, 537, 545,
-	0, 198, 223, 371, 0, 460, 291, 657, 625, 490,
-	620, 208, 225, 0, 265, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 200, 202, 211, 224,
-	234, 238, 245, 264, 279, 281, 288, 301, 313, 321,
-	322, 325, 331, 383, 390, 391, 392, 393, 413, 414,
-	415, 418, 421, 422, 425, 427, 428, 431, 436, 440,
-	441, 442, 444, 446, 448, 461, 466, 480, 481, 482,
-	483, 484, 487, 488, 494, 495, 496, 497, 498, 506,
-	507, 522, 593, 595, 612, 632, 639, 486, 388, 434,
-	458, 586, 304, 305, 449, 450, 317, 318, 653, 654,
-	303, 607, 640, 604, 652, 634, 443, 381, 0, 0,
-	384, 284, 308, 323, 0, 624, 508, 229, 472, 293,
-	253, 0, 0, 213, 248, 232, 262, 277, 280, 327,
-	395, 404, 433, 439, 299, 274, 246, 465, 243, 491,
-	525, 526, 527, 529, 399, 269, 438, 400, 0, 379,
-	582, 583, 319, 0, 0, 0, 534, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 420, 0,
-	0, 0, 0, 0, 0, 0, 273, 0, 0, 0,
-	0, 369, 270, 0, 0, 206, 511, 0, 435, 0,
-	205, 0, 493, 255, 380, 377, 590, 285, 276, 272,
-	252, 320, 389, 432, 524, 426, 0, 373, 0, 0,
-	503, 405, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	326, 250, 328, 204, 417, 504, 289, 0, 0, 0,
-	0, 1796, 513, 731, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 240, 0, 0, 247, 0, 0, 0,
-	354, 363, 362, 342, 343, 345, 347, 353, 360, 366,
-	339, 348, 0, 0, 616, 0, 0, 0, 268, 324,
-	275, 267, 587, 0, 0, 0, 0, 0, 0, 603,
-	0, 0, 231, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 278, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 300,
-	0, 406, 260, 0, 459, 0, 0, 0, 636, 0,
-	0, 0, 0, 0, 0, 0, 368, 0, 333, 199,
-	227, 0, 0, 416, 467, 479, 0, 0, 0, 256,
-	0, 477, 430, 611, 235, 287, 464, 437, 475, 445,
-	290, 0, 0, 476, 375, 592, 455, 608, 637, 638,
-	266, 410, 622, 528, 630, 655, 228, 263, 424, 512,
-	614, 500, 401, 588, 589, 332, 499, 298, 203, 372,
-	643, 226, 485, 374, 244, 233, 594, 619, 302, 254,
-	292, 462, 650, 215, 523, 605, 241, 489, 0, 0,
-	658, 249, 510, 617, 606, 217, 601, 509, 397, 329,
-	330, 216, 0, 463, 271, 296, 0, 0, 261, 419,
-	596, 597, 259, 659, 230, 629, 222, 0, 628, 412,
-	591, 602, 398, 386, 221, 600, 396, 385, 337, 358,
-	359, 283, 310, 452, 378, 453, 309, 311, 408, 407,
-	409, 209, 615, 633, 0, 210, 0, 505, 618, 660,
-	457, 214, 236, 237, 239, 0, 282, 286, 294, 297,
-	306, 307, 316, 370, 423, 451, 447, 456, 0, 585,
-	609, 623, 635, 641, 642, 644, 645, 646, 647, 648,
-	651, 649, 411, 314, 501, 336, 376, 0, 0, 429,
-	478, 242, 613, 502, 201, 0, 0, 0, 0, 257,
-	258, 0, 581, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 661, 662, 663, 664, 665, 666, 667, 668,
-	669, 670, 671, 672, 673, 674, 675, 676, 677, 678,
-	656, 514, 520, 515, 516, 517, 518, 519, 0, 521,
-	0, 0, 0, 0, 0, 402, 0, 598, 599, 679,
-	387, 492, 610, 338, 352, 355, 344, 364, 0, 365,
-	340, 341, 346, 349, 350, 351, 356, 357, 361, 367,
-	251, 212, 394, 403, 584, 315, 218, 219, 220, 530,
-	531, 532, 533, 626, 627, 631, 207, 468, 469, 470,
-	471, 295, 621, 312, 474, 473, 334, 335, 382, 454,
-	546, 548, 559, 563, 565, 567, 573, 576, 547, 549,
-	560, 564, 566, 568, 574, 577, 536, 538, 540, 542,
-	555, 554, 551, 579, 580, 557, 562, 541, 553, 558,
-	571, 578, 575, 535, 539, 543, 552, 570, 569, 550,
-	561, 572, 556, 544, 537, 545, 0, 198, 223, 371,
-	0, 460, 291, 657, 625, 490, 620, 208, 225, 0,
-	265, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 200, 202, 211, 224, 234, 238, 245, 264,
-	279, 281, 288, 301, 313, 321, 322, 325, 331, 383,
-	390, 391, 392, 393, 413, 414, 415, 418, 421, 422,
-	425, 427, 428, 431, 436, 440, 441, 442, 444, 446,
-	448, 461, 466, 480, 481, 482, 483, 484, 487, 488,
-	494, 495, 496, 497, 498, 506, 507, 522, 593, 595,
-	612, 632, 639, 486, 388, 434, 458, 586, 304, 305,
-	449, 450, 317, 318, 653, 654, 303, 607, 640, 604,
-	652, 634, 443, 381, 0, 0, 384, 284, 308, 323,
-	0, 624, 508, 229, 472, 293, 253, 0, 0, 213,
-	248, 232, 262, 277, 280, 327, 395, 404, 433, 439,
-	299, 274, 246, 465, 243, 491, 525, 526, 527, 529,
-	399, 269, 438, 400, 0, 379, 582, 583, 319, 0,
-	0, 0, 534, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 420, 0, 0, 0, 0, 0,
-	0, 0, 273, 0, 0, 0, 0, 369, 270, 0,
-	0, 206, 511, 0, 435, 0, 205, 0, 493, 255,
-	380, 377, 590, 285, 276, 272, 252, 320, 389, 432,
-	524, 426, 0, 373, 0, 0, 503, 405, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 326, 250, 328, 204,
-	417, 504, 289, 0, 0, 0, 0, 0, 513, 196,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 240,
-	0, 0, 247, 0, 0, 0, 354, 363, 362, 342,
-	343, 345, 347, 353, 360, 366, 339, 348, 0, 0,
-	616, 0, 0, 0, 268, 324, 275, 267, 587, 0,
-	0, 0, 0, 0, 0, 603, 0, 0, 231, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 278, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 300, 0, 406, 260, 0,
-	459, 0, 0, 0, 636, 0, 0, 0, 0, 0,
-	0, 0, 368, 0, 333, 199, 227, 0, 0, 416,
-	467, 479, 0, 0, 0, 256, 0, 477, 430, 611,
-	235, 287, 464, 437, 475, 445, 290, 0, 0, 476,
-	375, 592, 455, 608, 637, 638, 266, 410, 622, 528,
-	630, 655, 228, 263, 424, 512, 614, 500, 401, 588,
-	589, 332, 499, 298, 203, 372, 643, 226, 485, 374,
-	244, 233, 594, 619, 302, 254, 292, 462, 650, 215,
-	523, 605, 241, 489, 0, 0, 658, 249, 510, 617,
-	606, 217, 601, 509, 397, 329, 330, 216, 0, 463,
-	271, 296, 0, 0, 261, 419, 596, 597, 259, 659,
-	230, 629, 222, 0, 628, 412, 591, 602, 398, 386,
-	221, 600, 396, 385, 337, 358, 359, 283, 310, 452,
-	378, 453, 309, 311, 408, 407, 409, 209, 615, 633,
-	0, 210, 0, 505, 618, 660, 457, 214, 236, 237,
-	239, 0, 282, 286, 294, 297, 306, 307, 316, 370,
-	423, 451, 447, 456, 0, 585, 609, 623, 635, 641,
-	642, 644, 645, 646, 647, 648, 651, 649, 411, 314,
-	501, 336, 376, 0, 0, 429, 478, 242, 613, 502,
-	201, 0, 0, 0, 0, 257, 258, 0, 581, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 661, 662,
-	663, 664, 665, 666, 667, 668, 669, 670, 671, 672,
-	673, 674, 675, 676, 677, 678, 656, 514, 520, 515,
-	516, 517, 518, 519, 0, 521, 0, 0, 0, 0,
-	0, 402, 0, 598, 599, 679, 387, 492, 610, 338,
-	352, 355, 344, 364, 0, 365, 340, 341, 346, 349,
-	350, 351, 356, 357, 361, 367, 251, 212, 394, 403,
-	584, 315, 218, 219, 220, 530, 531, 532, 533, 626,
-	627, 631, 207, 468, 469, 470, 471, 295, 621, 312,
-	474, 473, 334, 335, 382, 454, 546, 548, 559, 563,
-	565, 567, 573, 576, 547, 549, 560, 564, 566, 568,
-	574, 577, 536, 538, 540, 542, 555, 554, 551, 579,
-	580, 557, 562, 541, 553, 558, 571, 578, 575, 535,
-	539, 543, 552, 570, 569, 550, 561, 572, 556, 544,
-	537, 545, 0, 198, 223, 371, 2095, 460, 291, 657,
-	625, 490, 620, 208, 225, 0, 265, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 200, 202,
-	211, 224, 234, 238, 245, 264, 279, 281, 288, 301,
-	313, 321, 322, 325, 331, 383, 390, 391, 392, 393,
-	413, 414, 415, 418, 421, 422, 425, 427, 428, 431,
-	436, 440, 441, 442, 444, 446, 448, 461, 466, 480,
-	481, 482, 483, 484, 487, 488, 494, 495, 496, 497,
-	498, 506, 507, 522, 593, 595, 612, 632, 639, 486,
-	388, 434, 458, 586, 304, 305, 449, 450, 317, 318,
-	653, 654, 303, 607, 640, 604, 652, 634, 443, 381,
-	0, 0, 384, 284, 308, 323, 0, 624, 508, 229,
-	472, 293, 253, 0, 0, 213, 248, 232, 262, 277,
-	280, 327, 395, 404, 433, 439, 299, 274, 246, 465,
-	243, 491, 525, 526, 527, 529, 399, 269, 438, 400,
-	0, 379, 582, 583, 319, 0, 0, 0, 534, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	420, 0, 0, 0, 0, 0, 0, 0, 273, 0,
-	0, 0, 0, 369, 270, 0, 0, 206, 511, 0,
-	435, 0, 205, 0, 493, 255, 380, 377, 590, 285,
-	276, 272, 252, 320, 389, 432, 524, 426, 0, 373,
-	0, 0, 503, 405, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 326, 250, 328, 204, 417, 504, 289, 0,
-	0, 0, 0, 2086, 513, 731, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 240, 0, 0, 247, 0,
-	0, 0, 354, 363, 362, 342, 343, 345, 347, 353,
-	360, 366, 339, 348, 0, 0, 616, 0, 0, 0,
-	268, 324, 275, 267, 587, 0, 0, 0, 0, 0,
-	0, 603, 0, 0, 231, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 278,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 300, 0, 406, 260, 0, 459, 0, 0, 0,
-	636, 0, 0, 0, 0, 0, 0, 0, 368, 0,
-	333, 199, 227, 0, 0, 416, 467, 479, 0, 0,
-	0, 256, 0, 477, 430, 611, 235, 287, 464, 437,
-	475, 445, 290, 0, 0, 476, 375, 592, 455, 608,
-	637, 638, 266, 410, 622, 528, 630, 655, 228, 263,
-	424, 512, 614, 500, 401, 588, 589, 332, 499, 298,
-	203, 372, 643, 226, 485, 374, 244, 233, 594, 619,
-	302, 254, 292, 462, 650, 215, 523, 605, 241, 489,
-	0, 0, 658, 249, 510, 617, 606, 217, 601, 509,
-	397, 329, 330, 216, 0, 463, 271, 296, 0, 0,
-	261, 419, 596, 597, 259, 659, 230, 629, 222, 0,
-	628, 412, 591, 602, 398, 386, 221, 600, 396, 385,
-	337, 358, 359, 283, 310, 452, 378, 453, 309, 311,
-	408, 407, 409, 209, 615, 633, 0, 210, 0, 505,
-	618, 660, 457, 214, 236, 237, 239, 0, 282, 286,
-	294, 297, 306, 307, 316, 370, 423, 451, 447, 456,
-	0, 585, 609, 623, 635, 641, 642, 644, 645, 646,
-	647, 648, 651, 649, 411, 314, 501, 336, 376, 0,
-	0, 429, 478, 242, 613, 502, 201, 0, 0, 0,
-	0, 257, 258, 0, 581, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 661, 662, 663, 664, 665, 666,
-	667, 668, 669, 670, 671, 672, 673, 674, 675, 676,
-	677, 678, 656, 514, 520, 515, 516, 517, 518, 519,
-	0, 521, 0, 0, 0, 0, 0, 402, 0, 598,
-	599, 679, 387, 492, 610, 338, 352, 355, 344, 364,
-	0, 365, 340, 341, 346, 349, 350, 351, 356, 357,
-	361, 367, 251, 212, 394, 403, 584, 315, 218, 219,
-	220, 530, 531, 532, 533, 626, 627, 631, 207, 468,
-	469, 470, 471, 295, 621, 312, 474, 473, 334, 335,
-	382, 454, 546, 548, 559, 563, 565, 567, 573, 576,
-	547, 549, 560, 564, 566, 568, 574, 577, 536, 538,
-	540, 542, 555, 554, 551, 579, 580, 557, 562, 541,
-	553, 558, 571, 578, 575, 535, 539, 543, 552, 570,
-	569, 550, 561, 572, 556, 544, 537, 545, 0, 198,
-	223, 371, 0, 460, 291, 657, 625, 490, 620, 208,
-	225, 0, 265, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 200, 202, 211, 224, 234, 238,
-	245, 264, 279, 281, 288, 301, 313, 321, 322, 325,
-	331, 383, 390, 391, 392, 393, 413, 414, 415, 418,
-	421, 422, 425, 427, 428, 431, 436, 440, 441, 442,
-	444, 446, 448, 461, 466, 480, 481, 482, 483, 484,
-	487, 488, 494, 495, 496, 497, 498, 506, 507, 522,
-	593, 595, 612, 632, 639, 486, 388, 434, 458, 586,
-	304, 305, 449, 450, 317, 318, 653, 654, 303, 607,
-	640, 604, 652, 634, 443, 381, 0, 0, 384, 284,
-	308, 323, 0, 624, 508, 229, 472, 293, 253, 0,
-	0, 213, 248, 232, 262, 277, 280, 327, 395, 404,
-	433, 439, 299, 274, 246, 465, 243, 491, 525, 526,
-	527, 529, 399, 269, 438, 400, 0, 379, 582, 583,
-	319, 0, 0, 0, 534, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 420, 0, 0, 0,
-	0, 0, 0, 0, 273, 0, 0, 0, 0, 369,
-	270, 0, 1944, 206, 511, 0, 435, 0, 205, 0,
-	493, 255, 380, 377, 590, 285, 276, 272, 252, 320,
-	389, 432, 524, 426, 0, 373, 0, 0, 503, 405,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 326, 250,
-	328, 204, 417, 504, 289, 0, 0, 0, 0, 0,
-	513, 731, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 240, 0, 0, 247, 0, 0, 0, 354, 363,
-	362, 342, 343, 345, 347, 353, 360, 366, 339, 348,
-	0, 0, 616, 0, 0, 0, 268, 324, 275, 267,
-	587, 0, 0, 0, 0, 0, 0, 603, 0, 0,
-	231, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 278, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 300, 0, 406,
-	260, 0, 459, 0, 0, 0, 636, 0, 0, 0,
-	0, 0, 0, 0, 368, 0, 333, 199, 227, 0,
-	0, 416, 467, 479, 0, 0, 0, 256, 0, 477,
-	430, 611, 235, 287, 464, 437, 475, 445, 290, 0,
-	0, 476, 375, 592, 455, 608, 637, 638, 266, 410,
-	622, 528, 630, 655, 228, 263, 424, 512, 614, 500,
-	401, 588, 589, 332, 499, 298, 203, 372, 643, 226,
-	485, 374, 244, 233, 594, 619, 302, 254, 292, 462,
-	650, 215, 523, 605, 241, 489, 0, 0, 658, 249,
-	510, 617, 606, 217, 601, 509, 397, 329, 330, 216,
-	0, 463, 271, 296, 0, 0, 261, 419, 596, 597,
-	259, 659, 230, 629, 222, 0, 628, 412, 591, 602,
-	398, 386, 221, 600, 396, 385, 337, 358, 359, 283,
-	310, 452, 378, 453, 309, 311, 408, 407, 409, 209,
-	615, 633, 0, 210, 0, 505, 618, 660, 457, 214,
-	236, 237, 239, 0, 282, 286, 294, 297, 306, 307,
-	316, 370, 423, 451, 447, 456, 0, 585, 609, 623,
-	635, 641, 642, 644, 645, 646, 647, 648, 651, 649,
-	411, 314, 501, 336, 376, 0, 0, 429, 478, 242,
-	613, 502, 201, 0, 0, 0, 0, 257, 258, 0,
-	581, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	661, 662, 663, 664, 665, 666, 667, 668, 669, 670,
-	671, 672, 673, 674, 675, 676, 677, 678, 656, 514,
-	520, 515, 516, 517, 518, 519, 0, 521, 0, 0,
-	0, 0, 0, 402, 0, 598, 599, 679, 387, 492,
-	610, 338, 352, 355, 344, 364, 0, 365, 340, 341,
-	346, 349, 350, 351, 356, 357, 361, 367, 251, 212,
-	394, 403, 584, 315, 218, 219, 220, 530, 531, 532,
-	533, 626, 627, 631, 207, 468, 469, 470, 471, 295,
-	621, 312, 474, 473, 334, 335, 382, 454, 546, 548,
-	559, 563, 565, 567, 573, 576, 547, 549, 560, 564,
-	566, 568, 574, 577, 536, 538, 540, 542, 555, 554,
-	551, 579, 580, 557, 562, 541, 553, 558, 571, 578,
-	575, 535, 539, 543, 552, 570, 569, 550, 561, 572,
-	556, 544, 537, 545, 0, 198, 223, 371, 0, 460,
-	291, 657, 625, 490, 620, 208, 225, 0, 265, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	200, 202, 211, 224, 234, 238, 245, 264, 279, 281,
-	288, 301, 313, 321, 322, 325, 331, 383, 390, 391,
-	392, 393, 413, 414, 415, 418, 421, 422, 425, 427,
-	428, 431, 436, 440, 441, 442, 444, 446, 448, 461,
-	466, 480, 481, 482, 483, 484, 487, 488, 494, 495,
-	496, 497, 498, 506, 507, 522, 593, 595, 612, 632,
-	639, 486, 388, 434, 458, 586, 304, 305, 449, 450,
-	317, 318, 653, 654, 303, 607, 640, 604, 652, 634,
-	443, 381, 0, 0, 384, 284, 308, 323, 0, 624,
-	508, 229, 472, 293, 253, 0, 0, 213, 248, 232,
-	262, 277, 280, 327, 395, 404, 433, 439, 299, 274,
-	246, 465, 243, 491, 525, 526, 527, 529, 399, 269,
-	438, 400, 0, 379, 582, 583, 319, 0, 0, 0,
-	534, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 420, 0, 0, 0, 0, 0, 0, 0,
-	273, 0, 0, 0, 0, 369, 270, 0, 1942, 206,
-	511, 0, 435, 0, 205, 0, 493, 255, 380, 377,
-	590, 285, 276, 272, 252, 320, 389, 432, 524, 426,
-	0, 373, 0, 0, 503, 405, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 326, 250, 328, 204, 417, 504,
-	289, 0, 0, 0, 0, 0, 513, 731, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 240, 0, 0,
-	247, 0, 0, 0, 354, 363, 362, 342, 343, 345,
-	347, 353, 360, 366, 339, 348, 0, 0, 616, 0,
-	0, 0, 268, 324, 275, 267, 587, 0, 0, 0,
-	0, 0, 0, 603, 0, 0, 231, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 278, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 300, 0, 406, 260, 0, 459, 0,
-	0, 0, 636, 0, 0, 0, 0, 0, 0, 0,
-	368, 0, 333, 199, 227, 0, 0, 416, 467, 479,
-	0, 0, 0, 256, 0, 477, 430, 611, 235, 287,
-	464, 437, 475, 445, 290, 0, 0, 476, 375, 592,
-	455, 608, 637, 638, 266, 410, 622, 528, 630, 655,
-	228, 263, 424, 512, 614, 500, 401, 588, 589, 332,
-	499, 298, 203, 372, 643, 226, 485, 374, 244, 233,
-	594, 619, 302, 254, 292, 462, 650, 215, 523, 605,
-	241, 489, 0, 0, 658, 249, 510, 617, 606, 217,
-	601, 509, 397, 329, 330, 216, 0, 463, 271, 296,
-	0, 0, 261, 419, 596, 597, 259, 659, 230, 629,
-	222, 0, 628, 412, 591, 602, 398, 386, 221, 600,
-	396, 385, 337, 358, 359, 283, 310, 452, 378, 453,
-	309, 311, 408, 407, 409, 209, 615, 633, 0, 210,
-	0, 505, 618, 660, 457, 214, 236, 237, 239, 0,
-	282, 286, 294, 297, 306, 307, 316, 370, 423, 451,
-	447, 456, 0, 585, 609, 623, 635, 641, 642, 644,
-	645, 646, 647, 648, 651, 649, 411, 314, 501, 336,
-	376, 0, 0, 429, 478, 242, 613, 502, 201, 0,
-	0, 0, 0, 257, 258, 0, 581, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 661, 662, 663, 664,
-	665, 666, 667, 668, 669, 670, 671, 672, 673, 674,
-	675, 676, 677, 678, 656, 514, 520, 515, 516, 517,
-	518, 519, 0, 521, 0, 0, 0, 0, 0, 402,
-	0, 598, 599, 679, 387, 492, 610, 338, 352, 355,
-	344, 364, 0, 365, 340, 341, 346, 349, 350, 351,
-	356, 357, 361, 367, 251, 212, 394, 403, 584, 315,
-	218, 219, 220, 530, 531, 532, 533, 626, 627, 631,
-	207, 468, 469, 470, 471, 295, 621, 312, 474, 473,
-	334, 335, 382, 454, 546, 548, 559, 563, 565, 567,
-	573, 576, 547, 549, 560, 564, 566, 568, 574, 577,
-	536, 538, 540, 542, 555, 554, 551, 579, 580, 557,
-	562, 541, 553, 558, 571, 578, 575, 535, 539, 543,
-	552, 570, 569, 550, 561, 572, 556, 544, 537, 545,
-	0, 198, 223, 371, 0, 460, 291, 657, 625, 490,
-	620, 208, 225, 0, 265, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 200, 202, 211, 224,
-	234, 238, 245, 264, 279, 281, 288, 301, 313, 321,
-	322, 325, 331, 383, 390, 391, 392, 393, 413, 414,
-	415, 418, 421, 422, 425, 427, 428, 431, 436, 440,
-	441, 442, 444, 446, 448, 461, 466, 480, 481, 482,
-	483, 484, 487, 488, 494, 495, 496, 497, 498, 506,
-	507, 522, 593, 595, 612, 632, 639, 486, 388, 434,
-	458, 586, 304, 305, 449, 450, 317, 318, 653, 654,
-	303, 607, 640, 604, 652, 634, 443, 381, 0, 0,
-	384, 284, 308, 323, 0, 624, 508, 229, 472, 293,
-	253, 0, 0, 213, 248, 232, 262, 277, 280, 327,
-	395, 404, 433, 439, 299, 274, 246, 465, 243, 491,
-	525, 526, 527, 529, 399, 269, 438, 400, 0, 379,
-	582, 583, 319, 0, 0, 0, 534, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 420, 0,
-	0, 0, 0, 0, 0, 0, 273, 0, 0, 0,
-	0, 369, 270, 0, 1940, 206, 511, 0, 435, 0,
-	205, 0, 493, 255, 380, 377, 590, 285, 276, 272,
-	252, 320, 389, 432, 524, 426, 0, 373, 0, 0,
-	503, 405, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	326, 250, 328, 204, 417, 504, 289, 0, 0, 0,
-	0, 0, 513, 731, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 240, 0, 0, 247, 0, 0, 0,
-	354, 363, 362, 342, 343, 345, 347, 353, 360, 366,
-	339, 348, 0, 0, 616, 0, 0, 0, 268, 324,
-	275, 267, 587, 0, 0, 0, 0, 0, 0, 603,
-	0, 0, 231, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 278, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 300,
-	0, 406, 260, 0, 459, 0, 0, 0, 636, 0,
-	0, 0, 0, 0, 0, 0, 368, 0, 333, 199,
-	227, 0, 0, 416, 467, 479, 0, 0, 0, 256,
-	0, 477, 430, 611, 235, 287, 464, 437, 475, 445,
-	290, 0, 0, 476, 375, 592, 455, 608, 637, 638,
-	266, 410, 622, 528, 630, 655, 228, 263, 424, 512,
-	614, 500, 401, 588, 589, 332, 499, 298, 203, 372,
-	643, 226, 485, 374, 244, 233, 594, 619, 302, 254,
-	292, 462, 650, 215, 523, 605, 241, 489, 0, 0,
-	658, 249, 510, 617, 606, 217, 601, 509, 397, 329,
-	330, 216, 0, 463, 271, 296, 0, 0, 261, 419,
-	596, 597, 259, 659, 230, 629, 222, 0, 628, 412,
-	591, 602, 398, 386, 221, 600, 396, 385, 337, 358,
-	359, 283, 310, 452, 378, 453, 309, 311, 408, 407,
-	409, 209, 615, 633, 0, 210, 0, 505, 618, 660,
-	457, 214, 236, 237, 239, 0, 282, 286, 294, 297,
-	306, 307, 316, 370, 423, 451, 447, 456, 0, 585,
-	609, 623, 635, 641, 642, 644, 645, 646, 647, 648,
-	651, 649, 411, 314, 501, 336, 376, 0, 0, 429,
-	478, 242, 613, 502, 201, 0, 0, 0, 0, 257,
-	258, 0, 581, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 661, 662, 663, 664, 665, 666, 667, 668,
-	669, 670, 671, 672, 673, 674, 675, 676, 677, 678,
-	656, 514, 520, 515, 516, 517, 518, 519, 0, 521,
-	0, 0, 0, 0, 0, 402, 0, 598, 599, 679,
-	387, 492, 610, 338, 352, 355, 344, 364, 0, 365,
-	340, 341, 346, 349, 350, 351, 356, 357, 361, 367,
-	251, 212, 394, 403, 584, 315, 218, 219, 220, 530,
-	531, 532, 533, 626, 627, 631, 207, 468, 469, 470,
-	471, 295, 621, 312, 474, 473, 334, 335, 382, 454,
-	546, 548, 559, 563, 565, 567, 573, 576, 547, 549,
-	560, 564, 566, 568, 574, 577, 536, 538, 540, 542,
-	555, 554, 551, 579, 580, 557, 562, 541, 553, 558,
-	571, 578, 575, 535, 539, 543, 552, 570, 569, 550,
-	561, 572, 556, 544, 537, 545, 0, 198, 223, 371,
-	0, 460, 291, 657, 625, 490, 620, 208, 225, 0,
-	265, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 200, 202, 211, 224, 234, 238, 245, 264,
-	279, 281, 288, 301, 313, 321, 322, 325, 331, 383,
-	390, 391, 392, 393, 413, 414, 415, 418, 421, 422,
-	425, 427, 428, 431, 436, 440, 441, 442, 444, 446,
-	448, 461, 466, 480, 481, 482, 483, 484, 487, 488,
-	494, 495, 496, 497, 498, 506, 507, 522, 593, 595,
-	612, 632, 639, 486, 388, 434, 458, 586, 304, 305,
-	449, 450, 317, 318, 653, 654, 303, 607, 640, 604,
-	652, 634, 443, 381, 0, 0, 384, 284, 308, 323,
-	0, 624, 508, 229, 472, 293, 253, 0, 0, 213,
-	248, 232, 262, 277, 280, 327, 395, 404, 433, 439,
-	299, 274, 246, 465, 243, 491, 525, 526, 527, 529,
-	399, 269, 438, 400, 0, 379, 582, 583, 319, 0,
-	0, 0, 534, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 420, 0, 0, 0, 0, 0,
-	0, 0, 273, 0, 0, 0, 0, 369, 270, 0,
-	1938, 206, 511, 0, 435, 0, 205, 0, 493, 255,
-	380, 377, 590, 285, 276, 272, 252, 320, 389, 432,
-	524, 426, 0, 373, 0, 0, 503, 405, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 326, 250, 328, 204,
-	417, 504, 289, 0, 0, 0, 0, 0, 513, 731,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 240,
-	0, 0, 247, 0, 0, 0, 354, 363, 362, 342,
-	343, 345, 347, 353, 360, 366, 339, 348, 0, 0,
-	616, 0, 0, 0, 268, 324, 275, 267, 587, 0,
-	0, 0, 0, 0, 0, 603, 0, 0, 231, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 278, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 300, 0, 406, 260, 0,
-	459, 0, 0, 0, 636, 0, 0, 0, 0, 0,
-	0, 0, 368, 0, 333, 199, 227, 0, 0, 416,
-	467, 479, 0, 0, 0, 256, 0, 477, 430, 611,
-	235, 287, 464, 437, 475, 445, 290, 0, 0, 476,
-	375, 592, 455, 608, 637, 638, 266, 410, 622, 528,
-	630, 655, 228, 263, 424, 512, 614, 500, 401, 588,
-	589, 332, 499, 298, 203, 372, 643, 226, 485, 374,
-	244, 233, 594, 619, 302, 254, 292, 462, 650, 215,
-	523, 605, 241, 489, 0, 0, 658, 249, 510, 617,
-	606, 217, 601, 509, 397, 329, 330, 216, 0, 463,
-	271, 296, 0, 0, 261, 419, 596, 597, 259, 659,
-	230, 629, 222, 0, 628, 412, 591, 602, 398, 386,
-	221, 600, 396, 385, 337, 358, 359, 283, 310, 452,
-	378, 453, 309, 311, 408, 407, 409, 209, 615, 633,
-	0, 210, 0, 505, 618, 660, 457, 214, 236, 237,
-	239, 0, 282, 286, 294, 297, 306, 307, 316, 370,
-	423, 451, 447, 456, 0, 585, 609, 623, 635, 641,
-	642, 644, 645, 646, 647, 648, 651, 649, 411, 314,
-	501, 336, 376, 0, 0, 429, 478, 242, 613, 502,
-	201, 0, 0, 0, 0, 257, 258, 0, 581, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 661, 662,
-	663, 664, 665, 666, 667, 668, 669, 670, 671, 672,
-	673, 674, 675, 676, 677, 678, 656, 514, 520, 515,
-	516, 517, 518, 519, 0, 521, 0, 0, 0, 0,
-	0, 402, 0, 598, 599, 679, 387, 492, 610, 338,
-	352, 355, 344, 364, 0, 365, 340, 341, 346, 349,
-	350, 351, 356, 357, 361, 367, 251, 212, 394, 403,
-	584, 315, 218, 219, 220, 530, 531, 532, 533, 626,
-	627, 631, 207, 468, 469, 470, 471, 295, 621, 312,
-	474, 473, 334, 335, 382, 454, 546, 548, 559, 563,
-	565, 567, 573, 576, 547, 549, 560, 564, 566, 568,
-	574, 577, 536, 538, 540, 542, 555, 554, 551, 579,
-	580, 557, 562, 541, 553, 558, 571, 578, 575, 535,
-	539, 543, 552, 570, 569, 550, 561, 572, 556, 544,
-	537, 545, 0, 198, 223, 371, 0, 460, 291, 657,
-	625, 490, 620, 208, 225, 0, 265, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 200, 202,
-	211, 224, 234, 238, 245, 264, 279, 281, 288, 301,
-	313, 321, 322, 325, 331, 383, 390, 391, 392, 393,
-	413, 414, 415, 418, 421, 422, 425, 427, 428, 431,
-	436, 440, 441, 442, 444, 446, 448, 461, 466, 480,
-	481, 482, 483, 484, 487, 488, 494, 495, 496, 497,
-	498, 506, 507, 522, 593, 595, 612, 632, 639, 486,
-	388, 434, 458, 586, 304, 305, 449, 450, 317, 318,
-	653, 654, 303, 607, 640, 604, 652, 634, 443, 381,
-	0, 0, 384, 284, 308, 323, 0, 624, 508, 229,
-	472, 293, 253, 0, 0, 213, 248, 232, 262, 277,
-	280, 327, 395, 404, 433, 439, 299, 274, 246, 465,
-	243, 491, 525, 526, 527, 529, 399, 269, 438, 400,
-	0, 379, 582, 583, 319, 0, 0, 0, 534, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	420, 0, 0, 0, 0, 0, 0, 0, 273, 0,
-	0, 0, 0, 369, 270, 0, 1936, 206, 511, 0,
-	435, 0, 205, 0, 493, 255, 380, 377, 590, 285,
-	276, 272, 252, 320, 389, 432, 524, 426, 0, 373,
-	0, 0, 503, 405, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 326, 250, 328, 204, 417, 504, 289, 0,
-	0, 0, 0, 0, 513, 731, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 240, 0, 0, 247, 0,
-	0, 0, 354, 363, 362, 342, 343, 345, 347, 353,
-	360, 366, 339, 348, 0, 0, 616, 0, 0, 0,
-	268, 324, 275, 267, 587, 0, 0, 0, 0, 0,
-	0, 603, 0, 0, 231, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 278,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 300, 0, 406, 260, 0, 459, 0, 0, 0,
-	636, 0, 0, 0, 0, 0, 0, 0, 368, 0,
-	333, 199, 227, 0, 0, 416, 467, 479, 0, 0,
-	0, 256, 0, 477, 430, 611, 235, 287, 464, 437,
-	475, 445, 290, 0, 0, 476, 375, 592, 455, 608,
-	637, 638, 266, 410, 622, 528, 630, 655, 228, 263,
-	424, 512, 614, 500, 401, 588, 589, 332, 499, 298,
-	203, 372, 643, 226, 485, 374, 244, 233, 594, 619,
-	302, 254, 292, 462, 650, 215, 523, 605, 241, 489,
-	0, 0, 658, 249, 510, 617, 606, 217, 601, 509,
-	397, 329, 330, 216, 0, 463, 271, 296, 0, 0,
-	261, 419, 596, 597, 259, 659, 230, 629, 222, 0,
-	628, 412, 591, 602, 398, 386, 221, 600, 396, 385,
-	337, 358, 359, 283, 310, 452, 378, 453, 309, 311,
-	408, 407, 409, 209, 615, 633, 0, 210, 0, 505,
-	618, 660, 457, 214, 236, 237, 239, 0, 282, 286,
-	294, 297, 306, 307, 316, 370, 423, 451, 447, 456,
-	0, 585, 609, 623, 635, 641, 642, 644, 645, 646,
-	647, 648, 651, 649, 411, 314, 501, 336, 376, 0,
-	0, 429, 478, 242, 613, 502, 201, 0, 0, 0,
-	0, 257, 258, 0, 581, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 661, 662, 663, 664, 665, 666,
-	667, 668, 669, 670, 671, 672, 673, 674, 675, 676,
-	677, 678, 656, 514, 520, 515, 516, 517, 518, 519,
-	0, 521, 0, 0, 0, 0, 0, 402, 0, 598,
-	599, 679, 387, 492, 610, 338, 352, 355, 344, 364,
-	0, 365, 340, 341, 346, 349, 350, 351, 356, 357,
-	361, 367, 251, 212, 394, 403, 584, 315, 218, 219,
-	220, 530, 531, 532, 533, 626, 627, 631, 207, 468,
-	469, 470, 471, 295, 621, 312, 474, 473, 334, 335,
-	382, 454, 546, 548, 559, 563, 565, 567, 573, 576,
-	547, 549, 560, 564, 566, 568, 574, 577, 536, 538,
-	540, 542, 555, 554, 551, 579, 580, 557, 562, 541,
-	553, 558, 571, 578, 575, 535, 539, 543, 552, 570,
-	569, 550, 561, 572, 556, 544, 537, 545, 0, 198,
-	223, 371, 0, 460, 291, 657, 625, 490, 620, 208,
-	225, 0, 265, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 200, 202, 211, 224, 234, 238,
-	245, 264, 279, 281, 288, 301, 313, 321, 322, 325,
-	331, 383, 390, 391, 392, 393, 413, 414, 415, 418,
-	421, 422, 425, 427, 428, 431, 436, 440, 441, 442,
-	444, 446, 448, 461, 466, 480, 481, 482, 483, 484,
-	487, 488, 494, 495, 496, 497, 498, 506, 507, 522,
-	593, 595, 612, 632, 639, 486, 388, 434, 458, 586,
-	304, 305, 449, 450, 317, 318, 653, 654, 303, 607,
-	640, 604, 652, 634, 443, 381, 0, 0, 384, 284,
-	308, 323, 0, 624, 508, 229, 472, 293, 253, 0,
-	0, 213, 248, 232, 262, 277, 280, 327, 395, 404,
-	433, 439, 299, 274, 246, 465, 243, 491, 525, 526,
-	527, 529, 399, 269, 438, 400, 0, 379, 582, 583,
-	319, 0, 0, 0, 534, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 420, 0, 0, 0,
-	0, 0, 0, 0, 273, 0, 0, 0, 0, 369,
-	270, 0, 1932, 206, 511, 0, 435, 0, 205, 0,
-	493, 255, 380, 377, 590, 285, 276, 272, 252, 320,
-	389, 432, 524, 426, 0, 373, 0, 0, 503, 405,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 326, 250,
-	328, 204, 417, 504, 289, 0, 0, 0, 0, 0,
-	513, 731, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 240, 0, 0, 247, 0, 0, 0, 354, 363,
-	362, 342, 343, 345, 347, 353, 360, 366, 339, 348,
-	0, 0, 616, 0, 0, 0, 268, 324, 275, 267,
-	587, 0, 0, 0, 0, 0, 0, 603, 0, 0,
-	231, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 278, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 300, 0, 406,
-	260, 0, 459, 0, 0, 0, 636, 0, 0, 0,
-	0, 0, 0, 0, 368, 0, 333, 199, 227, 0,
-	0, 416, 467, 479, 0, 0, 0, 256, 0, 477,
-	430, 611, 235, 287, 464, 437, 475, 445, 290, 0,
-	0, 476, 375, 592, 455, 608, 637, 638, 266, 410,
-	622, 528, 630, 655, 228, 263, 424, 512, 614, 500,
-	401, 588, 589, 332, 499, 298, 203, 372, 643, 226,
-	485, 374, 244, 233, 594, 619, 302, 254, 292, 462,
-	650, 215, 523, 605, 241, 489, 0, 0, 658, 249,
-	510, 617, 606, 217, 601, 509, 397, 329, 330, 216,
-	0, 463, 271, 296, 0, 0, 261, 419, 596, 597,
-	259, 659, 230, 629, 222, 0, 628, 412, 591, 602,
-	398, 386, 221, 600, 396, 385, 337, 358, 359, 283,
-	310, 452, 378, 453, 309, 311, 408, 407, 409, 209,
-	615, 633, 0, 210, 0, 505, 618, 660, 457, 214,
-	236, 237, 239, 0, 282, 286, 294, 297, 306, 307,
-	316, 370, 423, 451, 447, 456, 0, 585, 609, 623,
-	635, 641, 642, 644, 645, 646, 647, 648, 651, 649,
-	411, 314, 501, 336, 376, 0, 0, 429, 478, 242,
-	613, 502, 201, 0, 0, 0, 0, 257, 258, 0,
-	581, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	661, 662, 663, 664, 665, 666, 667, 668, 669, 670,
-	671, 672, 673, 674, 675, 676, 677, 678, 656, 514,
-	520, 515, 516, 517, 518, 519, 0, 521, 0, 0,
-	0, 0, 0, 402, 0, 598, 599, 679, 387, 492,
-	610, 338, 352, 355, 344, 364, 0, 365, 340, 341,
-	346, 349, 350, 351, 356, 357, 361, 367, 251, 212,
-	394, 403, 584, 315, 218, 219, 220, 530, 531, 532,
-	533, 626, 627, 631, 207, 468, 469, 470, 471, 295,
-	621, 312, 474, 473, 334, 335, 382, 454, 546, 548,
-	559, 563, 565, 567, 573, 576, 547, 549, 560, 564,
-	566, 568, 574, 577, 536, 538, 540, 542, 555, 554,
-	551, 579, 580, 557, 562, 541, 553, 558, 571, 578,
-	575, 535, 539, 543, 552, 570, 569, 550, 561, 572,
-	556, 544, 537, 545, 0, 198, 223, 371, 0, 460,
-	291, 657, 625, 490, 620, 208, 225, 0, 265, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	200, 202, 211, 224, 234, 238, 245, 264, 279, 281,
-	288, 301, 313, 321, 322, 325, 331, 383, 390, 391,
-	392, 393, 413, 414, 415, 418, 421, 422, 425, 427,
-	428, 431, 436, 440, 441, 442, 444, 446, 448, 461,
-	466, 480, 481, 482, 483, 484, 487, 488, 494, 495,
-	496, 497, 498, 506, 507, 522, 593, 595, 612, 632,
-	639, 486, 388, 434, 458, 586, 304, 305, 449, 450,
-	317, 318, 653, 654, 303, 607, 640, 604, 652, 634,
-	443, 381, 0, 0, 384, 284, 308, 323, 0, 624,
-	508, 229, 472, 293, 253, 0, 0, 213, 248, 232,
-	262, 277, 280, 327, 395, 404, 433, 439, 299, 274,
-	246, 465, 243, 491, 525, 526, 527, 529, 399, 269,
-	438, 400, 0, 379, 582, 583, 319, 0, 0, 0,
-	534, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 420, 0, 0, 0, 0, 0, 0, 0,
-	273, 0, 0, 0, 0, 369, 270, 0, 1930, 206,
-	511, 0, 435, 0, 205, 0, 493, 255, 380, 377,
-	590, 285, 276, 272, 252, 320, 389, 432, 524, 426,
-	0, 373, 0, 0, 503, 405, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 326, 250, 328, 204, 417, 504,
-	289, 0, 0, 0, 0, 0, 513, 731, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 240, 0, 0,
-	247, 0, 0, 0, 354, 363, 362, 342, 343, 345,
-	347, 353, 360, 366, 339, 348, 0, 0, 616, 0,
-	0, 0, 268, 324, 275, 267, 587, 0, 0, 0,
-	0, 0, 0, 603, 0, 0, 231, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 278, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 300, 0, 406, 260, 0, 459, 0,
-	0, 0, 636, 0, 0, 0, 0, 0, 0, 0,
-	368, 0, 333, 199, 227, 0, 0, 416, 467, 479,
-	0, 0, 0, 256, 0, 477, 430, 611, 235, 287,
-	464, 437, 475, 445, 290, 0, 0, 476, 375, 592,
-	455, 608, 637, 638, 266, 410, 622, 528, 630, 655,
-	228, 263, 424, 512, 614, 500, 401, 588, 589, 332,
-	499, 298, 203, 372, 643, 226, 485, 374, 244, 233,
-	594, 619, 302, 254, 292, 462, 650, 215, 523, 605,
-	241, 489, 0, 0, 658, 249, 510, 617, 606, 217,
-	601, 509, 397, 329, 330, 216, 0, 463, 271, 296,
-	0, 0, 261, 419, 596, 597, 259, 659, 230, 629,
-	222, 0, 628, 412, 591, 602, 398, 386, 221, 600,
-	396, 385, 337, 358, 359, 283, 310, 452, 378, 453,
-	309, 311, 408, 407, 409, 209, 615, 633, 0, 210,
-	0, 505, 618, 660, 457, 214, 236, 237, 239, 0,
-	282, 286, 294, 297, 306, 307, 316, 370, 423, 451,
-	447, 456, 0, 585, 609, 623, 635, 641, 642, 644,
-	645, 646, 647, 648, 651, 649, 411, 314, 501, 336,
-	376, 0, 0, 429, 478, 242, 613, 502, 201, 0,
-	0, 0, 0, 257, 258, 0, 581, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 661, 662, 663, 664,
-	665, 666, 667, 668, 669, 670, 671, 672, 673, 674,
-	675, 676, 677, 678, 656, 514, 520, 515, 516, 517,
-	518, 519, 0, 521, 0, 0, 0, 0, 0, 402,
-	0, 598, 599, 679, 387, 492, 610, 338, 352, 355,
-	344, 364, 0, 365, 340, 341, 346, 349, 350, 351,
-	356, 357, 361, 367, 251, 212, 394, 403, 584, 315,
-	218, 219, 220, 530, 531, 532, 533, 626, 627, 631,
-	207, 468, 469, 470, 471, 295, 621, 312, 474, 473,
-	334, 335, 382, 454, 546, 548, 559, 563, 565, 567,
-	573, 576, 547, 549, 560, 564, 566, 568, 574, 577,
-	536, 538, 540, 542, 555, 554, 551, 579, 580, 557,
-	562, 541, 553, 558, 571, 578, 575, 535, 539, 543,
-	552, 570, 569, 550, 561, 572, 556, 544, 537, 545,
-	0, 198, 223, 371, 0, 460, 291, 657, 625, 490,
-	620, 208, 225, 0, 265, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 200, 202, 211, 224,
-	234, 238, 245, 264, 279, 281, 288, 301, 313, 321,
-	322, 325, 331, 383, 390, 391, 392, 393, 413, 414,
-	415, 418, 421, 422, 425, 427, 428, 431, 436, 440,
-	441, 442, 444, 446, 448, 461, 466, 480, 481, 482,
-	483, 484, 487, 488, 494, 495, 496, 497, 498, 506,
-	507, 522, 593, 595, 612, 632, 639, 486, 388, 434,
-	458, 586, 304, 305, 449, 450, 317, 318, 653, 654,
-	303, 607, 640, 604, 652, 634, 443, 381, 0, 0,
-	384, 284, 308, 323, 0, 624, 508, 229, 472, 293,
-	253, 0, 0, 213, 248, 232, 262, 277, 280, 327,
-	395, 404, 433, 439, 299, 274, 246, 465, 243, 491,
-	525, 526, 527, 529, 399, 269, 438, 400, 0, 379,
-	582, 583, 319, 0, 0, 0, 534, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 420, 0,
-	0, 0, 0, 0, 0, 0, 273, 0, 0, 0,
-	0, 369, 270, 0, 1928, 206, 511, 0, 435, 0,
-	205, 0, 493, 255, 380, 377, 590, 285, 276, 272,
-	252, 320, 389, 432, 524, 426, 0, 373, 0, 0,
-	503, 405, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	326, 250, 328, 204, 417, 504, 289, 0, 0, 0,
-	0, 0, 513, 731, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 240, 0, 0, 247, 0, 0, 0,
-	354, 363, 362, 342, 343, 345, 347, 353, 360, 366,
-	339, 348, 0, 0, 616, 0, 0, 0, 268, 324,
-	275, 267, 587, 0, 0, 0, 0, 0, 0, 603,
-	0, 0, 231, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 278, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 300,
-	0, 406, 260, 0, 459, 0, 0, 0, 636, 0,
-	0, 0, 0, 0, 0, 0, 368, 0, 333, 199,
-	227, 0, 0, 416, 467, 479, 0, 0, 0, 256,
-	0, 477, 430, 611, 235, 287, 464, 437, 475, 445,
-	290, 0, 0, 476, 375, 592, 455, 608, 637, 638,
-	266, 410, 622, 528, 630, 655, 228, 263, 424, 512,
-	614, 500, 401, 588, 589, 332, 499, 298, 203, 372,
-	643, 226, 485, 374, 244, 233, 594, 619, 302, 254,
-	292, 462, 650, 215, 523, 605, 241, 489, 0, 0,
-	658, 249, 510, 617, 606, 217, 601, 509, 397, 329,
-	330, 216, 0, 463, 271, 296, 0, 0, 261, 419,
-	596, 597, 259, 659, 230, 629, 222, 0, 628, 412,
-	591, 602, 398, 386, 221, 600, 396, 385, 337, 358,
-	359, 283, 310, 452, 378, 453, 309, 311, 408, 407,
-	409, 209, 615, 633, 0, 210, 0, 505, 618, 660,
-	457, 214, 236, 237, 239, 0, 282, 286, 294, 297,
-	306, 307, 316, 370, 423, 451, 447, 456, 0, 585,
-	609, 623, 635, 641, 642, 644, 645, 646, 647, 648,
-	651, 649, 411, 314, 501, 336, 376, 0, 0, 429,
-	478, 242, 613, 502, 201, 0, 0, 0, 0, 257,
-	258, 0, 581, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 661, 662, 663, 664, 665, 666, 667, 668,
-	669, 670, 671, 672, 673, 674, 675, 676, 677, 678,
-	656, 514, 520, 515, 516, 517, 518, 519, 0, 521,
-	0, 0, 0, 0, 0, 402, 0, 598, 599, 679,
-	387, 492, 610, 338, 352, 355, 344, 364, 0, 365,
-	340, 341, 346, 349, 350, 351, 356, 357, 361, 367,
-	251, 212, 394, 403, 584, 315, 218, 219, 220, 530,
-	531, 532, 533, 626, 627, 631, 207, 468, 469, 470,
-	471, 295, 621, 312, 474, 473, 334, 335, 382, 454,
-	546, 548, 559, 563, 565, 567, 573, 576, 547, 549,
-	560, 564, 566, 568, 574, 577, 536, 538, 540, 542,
-	555, 554, 551, 579, 580, 557, 562, 541, 553, 558,
-	571, 578, 575, 535, 539, 543, 552, 570, 569, 550,
-	561, 572, 556, 544, 537, 545, 0, 198, 223, 371,
-	0, 460, 291, 657, 625, 490, 620, 208, 225, 0,
-	265, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 200, 202, 211, 224, 234, 238, 245, 264,
-	279, 281, 288, 301, 313, 321, 322, 325, 331, 383,
-	390, 391, 392, 393, 413, 414, 415, 418, 421, 422,
-	425, 427, 428, 431, 436, 440, 441, 442, 444, 446,
-	448, 461, 466, 480, 481, 482, 483, 484, 487, 488,
-	494, 495, 496, 497, 498, 506, 507, 522, 593, 595,
-	612, 632, 639, 486, 388, 434, 458, 586, 304, 305,
-	449, 450, 317, 318, 653, 654, 303, 607, 640, 604,
-	652, 634, 443, 381, 0, 0, 384, 284, 308, 323,
-	0, 624, 508, 229, 472, 293, 253, 0, 0, 213,
-	248, 232, 262, 277, 280, 327, 395, 404, 433, 439,
-	299, 274, 246, 465, 243, 491, 525, 526, 527, 529,
-	399, 269, 438, 400, 0, 379, 582, 583, 319, 0,
-	0, 0, 534, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 420, 0, 0, 0, 0, 0,
-	0, 0, 273, 0, 0, 0, 0, 369, 270, 0,
-	0, 206, 511, 0, 435, 0, 205, 0, 493, 255,
-	380, 377, 590, 285, 276, 272, 252, 320, 389, 432,
-	524, 426, 0, 373, 0, 0, 503, 405, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 326, 250, 328, 204,
-	417, 504, 289, 0, 1903, 0, 0, 0, 513, 731,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 240,
-	0, 0, 247, 0, 0, 0, 354, 363, 362, 342,
-	343, 345, 347, 353, 360, 366, 339, 348, 0, 0,
-	616, 0, 0, 0, 268, 324, 275, 267, 587, 0,
-	0, 0, 0, 0, 0, 603, 0, 0, 231, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 278, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 300, 0, 406, 260, 0,
-	459, 0, 0, 0, 636, 0, 0, 0, 0, 0,
-	0, 0, 368, 0, 333, 199, 227, 0, 0, 416,
-	467, 479, 0, 0, 0, 256, 0, 477, 430, 611,
-	235, 287, 464, 437, 475, 445, 290, 0, 0, 476,
-	375, 592, 455, 608, 637, 638, 266, 410, 622, 528,
-	630, 655, 228, 263, 424, 512, 614, 500, 401, 588,
-	589, 332, 499, 298, 203, 372, 643, 226, 485, 374,
-	244, 233, 594, 619, 302, 254, 292, 462, 650, 215,
-	523, 605, 241, 489, 0, 0, 658, 249, 510, 617,
-	606, 217, 601, 509, 397, 329, 330, 216, 0, 463,
-	271, 296, 0, 0, 261, 419, 596, 597, 259, 659,
-	230, 629, 222, 0, 628, 412, 591, 602, 398, 386,
-	221, 600, 396, 385, 337, 358, 359, 283, 310, 452,
-	378, 453, 309, 311, 408, 407, 409, 209, 615, 633,
-	0, 210, 0, 505, 618, 660, 457, 214, 236, 237,
-	239, 0, 282, 286, 294, 297, 306, 307, 316, 370,
-	423, 451, 447, 456, 0, 585, 609, 623, 635, 641,
-	642, 644, 645, 646, 647, 648, 651, 649, 411, 314,
-	501, 336, 376, 0, 0, 429, 478, 242, 613, 502,
-	201, 0, 0, 0, 0, 257, 258, 0, 581, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 661, 662,
-	663, 664, 665, 666, 667, 668, 669, 670, 671, 672,
-	673, 674, 675, 676, 677, 678, 656, 514, 520, 515,
-	516, 517, 518, 519, 0, 521, 0, 0, 0, 0,
-	0, 402, 0, 598, 599, 679, 387, 492, 610, 338,
-	352, 355, 344, 364, 0, 365, 340, 341, 346, 349,
-	350, 351, 356, 357, 361, 367, 251, 212, 394, 403,
-	584, 315, 218, 219, 220, 530, 531, 532, 533, 626,
-	627, 631, 207, 468, 469, 470, 471, 295, 621, 312,
-	474, 473, 334, 335, 382, 454, 546, 548, 559, 563,
-	565, 567, 573, 576, 547, 549, 560, 564, 566, 568,
-	574, 577, 536, 538, 540, 542, 555, 554, 551, 579,
-	580, 557, 562, 541, 553, 558, 571, 578, 575, 535,
-	539, 543, 552, 570, 569, 550, 561, 572, 556, 544,
-	537, 545, 0, 198, 223, 371, 0, 460, 291, 657,
-	625, 490, 620, 208, 225, 0, 265, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 200, 202,
-	211, 224, 234, 238, 245, 264, 279, 281, 288, 301,
-	313, 321, 322, 325, 331, 383, 390, 391, 392, 393,
-	413, 414, 415, 418, 421, 422, 425, 427, 428, 431,
-	436, 440, 441, 442, 444, 446, 448, 461, 466, 480,
-	481, 482, 483, 484, 487, 488, 494, 495, 496, 497,
-	498, 506, 507, 522, 593, 595, 612, 632, 639, 486,
-	388, 434, 458, 586, 304, 305, 449, 450, 317, 318,
-	653, 654, 303, 607, 640, 604, 652, 634, 443, 381,
-	0, 0, 384, 284, 308, 323, 0, 624, 508, 229,
-	472, 293, 253, 0, 0, 213, 248, 232, 262, 277,
-	280, 327, 395, 404, 433, 439, 299, 274, 246, 465,
-	243, 491, 525, 526, 527, 529, 399, 269, 438, 400,
-	0, 379, 582, 583, 319, 0, 0, 0, 534, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	420, 0, 0, 0, 0, 0, 0, 1800, 273, 0,
-	0, 0, 0, 369, 270, 0, 0, 206, 511, 0,
-	435, 0, 205, 0, 493, 255, 380, 377, 590, 285,
-	276, 272, 252, 320, 389, 432, 524, 426, 0, 373,
-	0, 0, 503, 405, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 326, 250, 328, 204, 417, 504, 289, 0,
-	0, 0, 0, 0, 513, 196, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 240, 0, 0, 247, 0,
-	0, 0, 354, 363, 362, 342, 343, 345, 347, 353,
-	360, 366, 339, 348, 0, 0, 616, 0, 0, 0,
-	268, 324, 275, 267, 587, 0, 0, 0, 0, 0,
-	0, 603, 0, 0, 231, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 278,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 300, 0, 406, 260, 0, 459, 0, 0, 0,
-	636, 0, 0, 0, 0, 0, 0, 0, 368, 0,
-	333, 199, 227, 0, 0, 416, 467, 479, 0, 0,
-	0, 256, 0, 477, 430, 611, 235, 287, 464, 437,
-	475, 445, 290, 0, 0, 476, 375, 592, 455, 608,
-	637, 638, 266, 410, 622, 528, 630, 655, 228, 263,
-	424, 512, 614, 500, 401, 588, 589, 332, 499, 298,
-	203, 372, 643, 226, 485, 374, 244, 233, 594, 619,
-	302, 254, 292, 462, 650, 215, 523, 605, 241, 489,
-	0, 0, 658, 249, 510, 617, 606, 217, 601, 509,
-	397, 329, 330, 216, 0, 463, 271, 296, 0, 0,
-	261, 419, 596, 597, 259, 659, 230, 629, 222, 0,
-	628, 412, 591, 602, 398, 386, 221, 600, 396, 385,
-	337, 358, 359, 283, 310, 452, 378, 453, 309, 311,
-	408, 407, 409, 209, 615, 633, 0, 210, 0, 505,
-	618, 660, 457, 214, 236, 237, 239, 0, 282, 286,
-	294, 297, 306, 307, 316, 370, 423, 451, 447, 456,
-	0, 585, 609, 623, 635, 641, 642, 644, 645, 646,
-	647, 648, 651, 649, 411, 314, 501, 336, 376, 0,
-	0, 429, 478, 242, 613, 502, 201, 0, 0, 0,
-	0, 257, 258, 0, 581, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 661, 662, 663, 664, 665, 666,
-	667, 668, 669, 670, 671, 672, 673, 674, 675, 676,
-	677, 678, 656, 514, 520, 515, 516, 517, 518, 519,
-	0, 521, 0, 0, 0, 0, 0, 402, 0, 598,
-	599, 679, 387, 492, 610, 338, 352, 355, 344, 364,
-	0, 365, 340, 341, 346, 349, 350, 351, 356, 357,
-	361, 367, 251, 212, 394, 403, 584, 315, 218, 219,
-	220, 530, 531, 532, 533, 626, 627, 631, 207, 468,
-	469, 470, 471, 295, 621, 312, 474, 473, 334, 335,
-	382, 454, 546, 548, 559, 563, 565, 567, 573, 576,
-	547, 549, 560, 564, 566, 568, 574, 577, 536, 538,
-	540, 542, 555, 554, 551, 579, 580, 557, 562, 541,
-	553, 558, 571, 578, 575, 535, 539, 543, 552, 570,
-	569, 550, 561, 572, 556, 544, 537, 545, 0, 198,
-	223, 371, 0, 460, 291, 657, 625, 490, 620, 208,
-	225, 0, 265, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 200, 202, 211, 224, 234, 238,
-	245, 264, 279, 281, 288, 301, 313, 321, 322, 325,
-	331, 383, 390, 391, 392, 393, 413, 414, 415, 418,
-	421, 422, 425, 427, 428, 431, 436, 440, 441, 442,
-	444, 446, 448, 461, 466, 480, 481, 482, 483, 484,
-	487, 488, 494, 495, 496, 497, 498, 506, 507, 522,
-	593, 595, 612, 632, 639, 486, 388, 434, 458, 586,
-	304, 305, 449, 450, 317, 318, 653, 654, 303, 607,
-	640, 604, 652, 634, 443, 381, 0, 0, 384, 284,
-	308, 323, 0, 624, 508, 229, 472, 293, 253, 0,
-	0, 213, 248, 232, 262, 277, 280, 327, 395, 404,
-	433, 439, 299, 274, 246, 465, 243, 491, 525, 526,
-	527, 529, 399, 269, 438, 400, 0, 379, 582, 583,
-	319, 0, 0, 0, 534, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 420, 0, 0, 0,
-	0, 0, 0, 0, 273, 0, 0, 0, 0, 369,
-	270, 0, 0, 206, 511, 0, 435, 0, 205, 0,
-	493, 255, 380, 377, 590, 285, 276, 272, 252, 320,
-	389, 432, 524, 426, 0, 373, 0, 0, 503, 405,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 326, 250,
-	328, 204, 417, 504, 289, 0, 95, 0, 0, 0,
-	513, 966, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 240, 0, 0, 247, 0, 0, 0, 354, 363,
-	362, 342, 343, 345, 347, 353, 360, 366, 339, 348,
-	0, 0, 616, 0, 0, 0, 268, 324, 275, 267,
-	587, 0, 0, 0, 0, 0, 0, 603, 0, 0,
-	231, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 278, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 300, 0, 406,
-	260, 0, 459, 0, 0, 0, 636, 0, 0, 0,
-	0, 0, 0, 0, 368, 0, 333, 199, 227, 0,
-	0, 416, 467, 479, 0, 0, 0, 256, 0, 477,
-	430, 611, 235, 287, 464, 437, 475, 445, 290, 0,
-	0, 476, 375, 592, 455, 608, 637, 638, 266, 410,
-	622, 528, 630, 655, 228, 263, 424, 512, 614, 500,
-	401, 588, 589, 332, 499, 298, 203, 372, 643, 226,
-	485, 374, 244, 233, 594, 619, 302, 254, 292, 462,
-	650, 215, 523, 605, 241, 489, 0, 0, 658, 249,
-	510, 617, 606, 217, 601, 509, 397, 329, 330, 216,
-	0, 463, 271, 296, 0, 0, 261, 419, 596, 597,
-	259, 659, 230, 629, 222, 0, 628, 412, 591, 602,
-	398, 386, 221, 600, 396, 385, 337, 358, 359, 283,
-	310, 452, 378, 453, 309, 311, 408, 407, 409, 209,
-	615, 633, 0, 210, 0, 505, 618, 660, 457, 214,
-	236, 237, 239, 0, 282, 286, 294, 297, 306, 307,
-	316, 370, 423, 451, 447, 456, 0, 585, 609, 623,
-	635, 641, 642, 644, 645, 646, 647, 648, 651, 649,
-	411, 314, 501, 336, 376, 0, 0, 429, 478, 242,
-	613, 502, 201, 0, 0, 0, 0, 257, 258, 0,
-	581, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	661, 662, 663, 664, 665, 666, 667, 668, 669, 670,
-	671, 672, 673, 674, 675, 676, 677, 678, 656, 514,
-	520, 515, 516, 517, 518, 519, 0, 521, 0, 0,
-	0, 0, 0, 402, 0, 598, 599, 679, 387, 492,
-	610, 338, 352, 355, 344, 364, 0, 365, 340, 341,
-	346, 349, 350, 351, 356, 357, 361, 367, 251, 212,
-	394, 403, 584, 315, 218, 219, 220, 530, 531, 532,
-	533, 626, 627, 631, 207, 468, 469, 470, 471, 295,
-	621, 312, 474, 473, 334, 335, 382, 454, 546, 548,
-	559, 563, 565, 567, 573, 576, 547, 549, 560, 564,
-	566, 568, 574, 577, 536, 538, 540, 542, 555, 554,
-	551, 579, 580, 557, 562, 541, 553, 558, 571, 578,
-	575, 535, 539, 543, 552, 570, 569, 550, 561, 572,
-	556, 544, 537, 545, 0, 198, 223, 371, 0, 460,
-	291, 657, 625, 490, 620, 208, 225, 0, 265, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	200, 202, 211, 224, 234, 238, 245, 264, 279, 281,
-	288, 301, 313, 321, 322, 325, 331, 383, 390, 391,
-	392, 393, 413, 414, 415, 418, 421, 422, 425, 427,
-	428, 431, 436, 440, 441, 442, 444, 446, 448, 461,
-	466, 480, 481, 482, 483, 484, 487, 488, 494, 495,
-	496, 497, 498, 506, 507, 522, 593, 595, 612, 632,
-	639, 486, 388, 434, 458, 586, 304, 305, 449, 450,
-	317, 318, 653, 654, 303, 607, 640, 604, 652, 634,
-	443, 381, 0, 0, 384, 284, 308, 323, 0, 624,
-	508, 229, 472, 293, 253, 0, 0, 213, 248, 232,
-	262, 277, 280, 327, 395, 404, 433, 439, 299, 274,
-	246, 465, 243, 491, 525, 526, 527, 529, 399, 269,
-	438, 400, 0, 379, 582, 583, 319, 0, 0, 0,
-	534, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 420, 0, 0, 0, 0, 0, 0, 0,
-	273, 0, 0, 0, 0, 369, 270, 0, 0, 206,
-	511, 0, 435, 0, 205, 0, 493, 255, 380, 377,
-	590, 285, 276, 272, 252, 320, 389, 432, 524, 426,
-	0, 373, 0, 0, 503, 405, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 326, 250, 328, 204, 417, 504,
-	289, 0, 0, 0, 0, 0, 513, 196, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 240, 0, 0,
-	247, 0, 0, 0, 354, 363, 362, 342, 343, 345,
-	347, 353, 360, 366, 339, 348, 0, 0, 616, 0,
-	0, 0, 268, 324, 275, 267, 587, 0, 0, 0,
-	0, 0, 0, 603, 0, 0, 231, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 278, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 1466, 0, 300, 0, 406, 260, 0, 459, 0,
-	0, 0, 636, 0, 0, 0, 0, 0, 0, 0,
-	368, 0, 333, 199, 227, 0, 0, 416, 467, 479,
-	0, 0, 0, 256, 0, 477, 430, 611, 235, 287,
-	464, 437, 475, 445, 290, 0, 0, 476, 375, 592,
-	455, 608, 637, 638, 266, 410, 622, 528, 630, 655,
-	228, 263, 424, 512, 614, 500, 401, 588, 589, 332,
-	499, 298, 203, 372, 643, 226, 485, 374, 244, 233,
-	594, 619, 302, 254, 292, 462, 650, 215, 523, 605,
-	241, 489, 0, 0, 658, 249, 510, 617, 606, 217,
-	601, 509, 397, 329, 330, 216, 0, 463, 271, 296,
-	0, 0, 261, 419, 596, 597, 259, 659, 230, 629,
-	222, 0, 628, 412, 591, 602, 398, 386, 221, 600,
-	396, 385, 337, 358, 359, 283, 310, 452, 378, 453,
-	309, 311, 408, 407, 409, 209, 615, 633, 0, 210,
-	0, 505, 618, 660, 457, 214, 236, 237, 239, 0,
-	282, 286, 294, 297, 306, 307, 316, 370, 423, 451,
-	447, 456, 0, 585, 609, 623, 635, 641, 642, 644,
-	645, 646, 647, 648, 651, 649, 411, 314, 501, 336,
-	376, 0, 0, 429, 478, 242, 613, 502, 201, 0,
-	0, 0, 0, 257, 258, 0, 581, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 661, 662, 663, 664,
-	665, 666, 667, 668, 669, 670, 671, 672, 673, 674,
-	675, 676, 677, 678, 656, 514, 520, 515, 516, 517,
-	518, 519, 0, 521, 0, 0, 0, 0, 0, 402,
-	0, 598, 599, 679, 387, 492, 610, 338, 352, 355,
-	344, 364, 0, 365, 340, 341, 346, 349, 350, 351,
-	356, 357, 361, 367, 251, 212, 394, 403, 584, 315,
-	218, 219, 220, 530, 531, 532, 533, 626, 627, 631,
-	207, 468, 469, 470, 471, 295, 621, 312, 474, 473,
-	334, 335, 382, 454, 546, 548, 559, 563, 565, 567,
-	573, 576, 547, 549, 560, 564, 566, 568, 574, 577,
-	536, 538, 540, 542, 555, 554, 551, 579, 580, 557,
-	562, 541, 553, 558, 571, 578, 575, 535, 539, 543,
-	552, 570, 569, 550, 561, 572, 556, 544, 537, 545,
-	0, 198, 223, 371, 0, 460, 291, 657, 625, 490,
-	620, 208, 225, 0, 265, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 200, 202, 211, 224,
-	234, 238, 245, 264, 279, 281, 288, 301, 313, 321,
-	322, 325, 331, 383, 390, 391, 392, 393, 413, 414,
-	415, 418, 421, 422, 425, 427, 428, 431, 436, 440,
-	441, 442, 444, 446, 448, 461, 466, 480, 481, 482,
-	483, 484, 487, 488, 494, 495, 496, 497, 498, 506,
-	507, 522, 593, 595, 612, 632, 639, 486, 388, 434,
-	458, 586, 304, 305, 449, 450, 317, 318, 653, 654,
-	1465, 607, 640, 604, 652, 634, 443, 381, 0, 0,
-	384, 284, 308, 323, 0, 624, 508, 229, 472, 293,
-	253, 0, 0, 213, 248, 232, 262, 277, 280, 327,
-	395, 404, 433, 439, 299, 274, 246, 465, 243, 491,
-	525, 526, 527, 529, 399, 269, 438, 400, 0, 379,
-	582, 583, 319, 0, 0, 0, 534, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 420, 0,
-	0, 0, 0, 0, 0, 0, 273, 0, 0, 0,
-	0, 369, 270, 0, 0, 206, 511, 0, 435, 0,
-	205, 0, 493, 255, 380, 377, 590, 285, 276, 272,
-	252, 320, 389, 432, 524, 426, 0, 373, 0, 0,
-	503, 405, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	326, 250, 328, 204, 417, 504, 289, 0, 0, 0,
-	0, 0, 513, 196, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 240, 0, 0, 247, 0, 0, 0,
-	354, 363, 362, 342, 343, 345, 347, 353, 360, 366,
-	339, 348, 0, 0, 616, 0, 0, 0, 268, 324,
-	275, 267, 587, 0, 0, 0, 0, 0, 0, 603,
-	0, 0, 231, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 278, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 300,
-	0, 406, 260, 0, 459, 0, 0, 0, 636, 0,
-	0, 0, 0, 0, 0, 0, 368, 0, 333, 199,
-	227, 0, 0, 416, 467, 479, 0, 0, 0, 256,
-	0, 477, 430, 611, 235, 287, 464, 437, 475, 445,
-	290, 0, 0, 476, 375, 592, 455, 608, 637, 638,
-	266, 410, 622, 528, 630, 655, 228, 263, 424, 512,
-	614, 500, 401, 588, 589, 332, 499, 298, 203, 372,
-	643, 226, 485, 374, 244, 233, 594, 619, 302, 254,
-	292, 462, 650, 215, 523, 605, 241, 489, 0, 0,
-	658, 249, 510, 617, 606, 217, 601, 509, 397, 329,
-	330, 216, 0, 463, 271, 296, 0, 0, 261, 419,
-	596, 597, 259, 659, 230, 629, 222, 0, 628, 412,
-	591, 602, 398, 386, 221, 600, 396, 385, 337, 358,
-	359, 283, 310, 452, 378, 453, 309, 311, 408, 407,
-	409, 209, 615, 633, 0, 210, 0, 505, 618, 660,
-	457, 214, 236, 237, 239, 0, 282, 286, 294, 297,
-	306, 307, 316, 370, 423, 451, 447, 456, 0, 585,
-	609, 623, 635, 641, 642, 644, 645, 646, 647, 648,
-	651, 649, 411, 314, 501, 336, 376, 0, 0, 429,
-	478, 242, 613, 502, 201, 0, 0, 0, 0, 257,
-	258, 0, 581, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 661, 662, 663, 664, 665, 666, 667, 668,
-	669, 670, 671, 672, 673, 674, 675, 676, 677, 678,
-	656, 514, 520, 515, 516, 517, 518, 519, 0, 521,
-	0, 0, 0, 0, 0, 402, 0, 598, 599, 679,
-	387, 492, 610, 338, 352, 355, 344, 364, 0, 365,
-	340, 341, 346, 349, 350, 351, 356, 357, 361, 367,
-	251, 212, 394, 403, 584, 315, 218, 219, 220, 530,
-	531, 532, 533, 626, 627, 631, 207, 468, 469, 470,
-	471, 295, 621, 312, 474, 473, 334, 335, 382, 454,
-	546, 548, 559, 563, 565, 567, 573, 576, 547, 549,
-	560, 564, 566, 568, 574, 577, 536, 538, 540, 542,
-	555, 554, 551, 579, 580, 557, 562, 541, 553, 558,
-	571, 578, 575, 535, 539, 543, 552, 570, 569, 550,
-	561, 572, 556, 544, 537, 545, 0, 198, 223, 371,
-	0, 460, 291, 657, 625, 490, 620, 208, 225, 0,
-	265, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 1058, 0,
-	0, 0, 200, 202, 211, 224, 234, 238, 245, 264,
-	279, 281, 288, 301, 313, 321, 322, 325, 331, 383,
-	390, 391, 392, 393, 413, 414, 415, 418, 421, 422,
-	425, 427, 428, 431, 436, 440, 441, 442, 444, 446,
-	448, 461, 466, 480, 481, 482, 483, 484, 487, 488,
-	494, 495, 496, 497, 498, 506, 507, 522, 593, 595,
-	612, 632, 639, 486, 388, 434, 458, 586, 304, 305,
-	449, 450, 317, 318, 653, 654, 303, 607, 640, 604,
-	652, 634, 443, 381, 0, 0, 384, 284, 308, 323,
-	0, 624, 508, 229, 472, 293, 253, 0, 0, 213,
-	248, 232, 262, 277, 280, 327, 395, 404, 433, 439,
-	299, 274, 246, 465, 243, 491, 525, 526, 527, 529,
-	399, 269, 438, 400, 0, 379, 582, 583, 319, 0,
-	0, 0, 534, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 420, 0, 0, 0, 0, 0,
-	0, 0, 273, 0, 0, 0, 0, 369, 270, 0,
-	0, 206, 511, 0, 435, 0, 205, 0, 493, 255,
-	380, 377, 590, 285, 276, 272, 252, 320, 389, 432,
-	524, 426, 0, 373, 0, 0, 503, 405, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 326, 250, 328, 204,
-	417, 504, 289, 0, 0, 0, 0, 0, 513, 196,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 240,
-	0, 0, 247, 0, 0, 0, 354, 363, 362, 342,
-	343, 345, 347, 353, 360, 366, 339, 348, 0, 0,
-	616, 0, 0, 0, 268, 324, 275, 267, 587, 0,
-	0, 0, 0, 0, 0, 603, 0, 0, 231, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 278, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 300, 0, 406, 260, 0,
-	459, 0, 682, 0, 636, 0, 0, 0, 0, 0,
-	0, 0, 368, 0, 333, 199, 227, 0, 0, 416,
-	467, 479, 0, 0, 0, 256, 0, 477, 430, 611,
-	235, 287, 464, 437, 475, 445, 290, 0, 0, 476,
-	375, 592, 455, 608, 637, 638, 266, 410, 622, 528,
-	630, 655, 228, 263, 424, 512, 614, 500, 401, 588,
-	589, 332, 499, 298, 203, 372, 643, 226, 485, 374,
-	244, 233, 594, 619, 302, 254, 292, 462, 650, 215,
-	523, 605, 241, 489, 0, 0, 658, 249, 510, 617,
-	606, 217, 601, 509, 397, 329, 330, 216, 0, 463,
-	271, 296, 0, 0, 261, 419, 596, 597, 259, 659,
-	230, 629, 222, 0, 628, 412, 591, 602, 398, 386,
-	221, 600, 396, 385, 337, 358, 359, 283, 310, 452,
-	378, 453, 309, 311, 408, 407, 409, 209, 615, 633,
-	0, 210, 0, 505, 618, 660, 457, 214, 236, 237,
-	239, 0, 282, 286, 294, 297, 306, 307, 316, 370,
-	423, 451, 447, 456, 0, 585, 609, 623, 635, 641,
-	642, 644, 645, 646, 647, 648, 651, 649, 411, 314,
-	501, 336, 376, 0, 0, 429, 478, 242, 613, 502,
-	201, 0, 0, 0, 0, 257, 258, 0, 581, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 661, 662,
-	663, 664, 665, 666, 667, 668, 669, 670, 671, 672,
-	673, 674, 675, 676, 677, 678, 656, 514, 520, 515,
-	516, 517, 518, 519, 0, 521, 0, 0, 0, 0,
-	0, 402, 0, 598, 599, 679, 387, 492, 610, 338,
-	352, 355, 344, 364, 0, 365, 340, 341, 346, 349,
-	350, 351, 356, 357, 361, 367, 251, 212, 394, 403,
-	584, 315, 218, 219, 220, 530, 531, 532, 533, 626,
-	627, 631, 207, 468, 469, 470, 471, 295, 621, 312,
-	474, 473, 334, 335, 382, 454, 546, 548, 559, 563,
-	565, 567, 573, 576, 547, 549, 560, 564, 566, 568,
-	574, 577, 536, 538, 540, 542, 555, 554, 551, 579,
-	580, 557, 562, 541, 553, 558, 571, 578, 575, 535,
-	539, 543, 552, 570, 569, 550, 561, 572, 556, 544,
-	537, 545, 0, 198, 223, 371, 0, 460, 291, 657,
-	625, 490, 620, 208, 225, 0, 265, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 200, 202,
-	211, 224, 234, 238, 245, 264, 279, 281, 288, 301,
-	313, 321, 322, 325, 331, 383, 390, 391, 392, 393,
-	413, 414, 415, 418, 421, 422, 425, 427, 428, 431,
-	436, 440, 441, 442, 444, 446, 448, 461, 466, 480,
-	481, 482, 483, 484, 487, 488, 494, 495, 496, 497,
-	498, 506, 507, 522, 593, 595, 612, 632, 639, 486,
-	388, 434, 458, 586, 304, 305, 449, 450, 317, 318,
-	653, 654, 303, 607, 640, 604, 652, 634, 443, 381,
-	0, 0, 384, 284, 308, 323, 0, 624, 508, 229,
-	472, 293, 253, 0, 0, 213, 248, 232, 262, 277,
-	280, 327, 395, 404, 433, 439, 299, 274, 246, 465,
-	243, 491, 525, 526, 527, 529, 399, 269, 438, 400,
-	0, 379, 582, 583, 319, 0, 0, 0, 534, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	420, 0, 0, 0, 0, 0, 0, 0, 273, 0,
-	0, 0, 0, 369, 270, 0, 0, 206, 511, 0,
-	435, 0, 205, 0, 493, 255, 380, 377, 590, 285,
-	276, 272, 252, 320, 389, 432, 524, 426, 0, 373,
-	0, 0, 503, 405, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 326, 250, 328, 204, 417, 504, 289, 0,
-	0, 0, 0, 0, 513, 731, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 240, 0, 0, 247, 0,
-	0, 0, 354, 363, 362, 342, 343, 345, 347, 353,
-	360, 366, 339, 348, 0, 0, 616, 0, 0, 0,
-	268, 324, 275, 267, 587, 0, 0, 0, 0, 0,
-	0, 603, 0, 0, 231, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 278,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 300, 0, 406, 260, 0, 459, 0, 0, 0,
-	636, 0, 0, 0, 0, 0, 0, 0, 368, 0,
-	333, 199, 227, 0, 0, 416, 467, 479, 0, 0,
-	0, 256, 0, 477, 430, 611, 235, 287, 464, 437,
-	475, 445, 290, 0, 0, 476, 375, 592, 455, 608,
-	637, 638, 266, 410, 622, 528, 630, 655, 228, 263,
-	424, 512, 614, 500, 401, 588, 589, 332, 499, 298,
-	203, 372, 643, 226, 485, 374, 244, 233, 594, 619,
-	302, 254, 292, 462, 650, 215, 523, 605, 241, 489,
-	0, 0, 658, 249, 510, 617, 606, 217, 601, 509,
-	397, 329, 330, 216, 0, 463, 271, 296, 0, 0,
-	261, 419, 596, 597, 259, 659, 230, 629, 222, 0,
-	628, 412, 591, 602, 398, 386, 221, 600, 396, 385,
-	337, 358, 359, 283, 310, 452, 378, 453, 309, 311,
-	408, 407, 409, 209, 615, 633, 0, 210, 0, 505,
-	618, 660, 457, 214, 236, 237, 239, 0, 282, 286,
-	294, 297, 306, 307, 316, 370, 423, 451, 447, 456,
-	0, 585, 609, 623, 635, 641, 642, 644, 645, 646,
-	647, 648, 651, 649, 411, 314, 501, 336, 376, 0,
-	0, 429, 478, 242, 613, 502, 201, 0, 0, 0,
-	0, 257, 258, 0, 581, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 661, 662, 663, 664, 665, 666,
-	667, 668, 669, 670, 671, 672, 673, 674, 675, 676,
-	677, 678, 656, 514, 520, 515, 516, 517, 518, 519,
-	0, 521, 0, 0, 0, 0, 0, 402, 0, 598,
-	599, 679, 387, 492, 610, 338, 352, 355, 344, 364,
-	0, 365, 340, 341, 346, 349, 350, 351, 356, 357,
-	361, 367, 251, 212, 394, 403, 584, 315, 218, 219,
-	220, 530, 531, 532, 533, 626, 627, 631, 207, 468,
-	469, 470, 471, 295, 621, 312, 474, 473, 334, 335,
-	382, 454, 546, 548, 559, 563, 565, 567, 573, 576,
-	547, 549, 560, 564, 566, 568, 574, 577, 536, 538,
-	540, 542, 555, 554, 551, 579, 580, 557, 562, 541,
-	553, 558, 571, 578, 575, 535, 539, 543, 552, 570,
-	569, 550, 561, 572, 556, 544, 537, 545, 0, 198,
-	223, 371, 0, 460, 291, 657, 625, 490, 620, 208,
-	225, 0, 265, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 200, 202, 211, 224, 234, 238,
-	245, 264, 279, 281, 288, 301, 313, 321, 322, 325,
-	331, 383, 390, 391, 392, 393, 4159, 414, 415, 418,
-	421, 422, 425, 427, 428, 431, 436, 440, 441, 442,
-	444, 446, 448, 461, 466, 480, 481, 482, 483, 484,
-	487, 488, 494, 495, 496, 497, 498, 506, 507, 522,
-	593, 595, 612, 632, 639, 486, 388, 434, 458, 586,
-	304, 305, 449, 450, 317, 318, 653, 654, 303, 607,
-	640, 604, 652, 634, 443, 381, 0, 0, 384, 284,
-	308, 323, 0, 624, 508, 229, 472, 293, 253, 0,
-	0, 213, 248, 232, 262, 277, 280, 327, 395, 404,
-	433, 439, 299, 274, 246, 465, 243, 491, 525, 526,
-	527, 529, 399, 269, 438, 400, 0, 379, 582, 583,
-	319, 0, 0, 0, 534, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 420, 0, 0, 0,
-	0, 0, 0, 0, 273, 0, 0, 0, 0, 369,
-	270, 0, 0, 206, 511, 0, 435, 0, 205, 0,
-	493, 255, 380, 377, 590, 285, 276, 272, 252, 320,
-	389, 432, 524, 426, 0, 373, 0, 0, 503, 405,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 326, 250,
-	328, 204, 417, 504, 289, 0, 0, 0, 0, 0,
-	513, 731, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 240, 0, 0, 247, 0, 0, 0, 354, 363,
-	362, 342, 343, 345, 347, 353, 360, 366, 339, 348,
-	0, 0, 616, 0, 0, 0, 268, 324, 275, 267,
-	587, 0, 0, 0, 0, 0, 0, 603, 0, 0,
-	231, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 278, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 300, 0, 406,
-	260, 0, 459, 0, 0, 0, 636, 0, 0, 0,
-	0, 0, 0, 0, 368, 0, 333, 199, 227, 0,
-	0, 416, 467, 479, 0, 0, 0, 256, 0, 477,
-	430, 611, 235, 287, 464, 437, 475, 445, 290, 0,
-	0, 476, 375, 592, 455, 608, 637, 638, 266, 410,
-	622, 528, 630, 655, 228, 263, 424, 512, 614, 500,
-	401, 588, 589, 332, 499, 298, 203, 372, 643, 226,
-	485, 374, 244, 233, 594, 619, 302, 254, 292, 462,
-	650, 215, 523, 605, 241, 489, 0, 0, 658, 249,
-	510, 617, 606, 217, 601, 509, 397, 329, 330, 216,
-	0, 463, 271, 296, 0, 0, 261, 419, 596, 597,
-	259, 659, 230, 629, 222, 0, 628, 412, 591, 602,
-	398, 386, 221, 600, 396, 385, 337, 358, 359, 283,
-	310, 452, 378, 453, 309, 311, 408, 407, 409, 209,
-	615, 633, 0, 210, 0, 505, 618, 660, 457, 214,
-	236, 237, 239, 0, 282, 286, 294, 297, 306, 307,
-	316, 370, 423, 451, 447, 456, 0, 585, 609, 623,
-	635, 641, 642, 644, 645, 646, 647, 648, 651, 649,
-	411, 314, 501, 336, 376, 0, 0, 429, 478, 242,
-	613, 502, 201, 0, 0, 0, 0, 257, 258, 0,
-	581, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	661, 662, 663, 664, 665, 666, 667, 668, 669, 670,
-	671, 672, 673, 674, 675, 676, 677, 678, 656, 514,
-	520, 515, 516, 517, 518, 519, 0, 521, 0, 0,
-	0, 0, 0, 402, 0, 598, 599, 679, 387, 492,
-	610, 338, 352, 355, 344, 364, 0, 365, 340, 341,
-	346, 349, 350, 351, 356, 357, 361, 367, 251, 212,
-	394, 403, 584, 315, 218, 219, 220, 530, 531, 532,
-	533, 626, 627, 631, 207, 468, 469, 470, 471, 295,
-	621, 312, 474, 473, 334, 335, 382, 454, 546, 548,
-	559, 563, 565, 567, 573, 576, 547, 549, 560, 564,
-	566, 568, 574, 577, 536, 538, 540, 542, 555, 554,
-	551, 579, 580, 557, 562, 541, 553, 558, 571, 578,
-	575, 535, 539, 543, 552, 570, 569, 550, 561, 572,
-	556, 544, 537, 545, 0, 198, 223, 371, 0, 460,
-	291, 657, 625, 490, 620, 208, 225, 0, 265, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	200, 202, 211, 224, 234, 238, 245, 264, 279, 281,
-	288, 301, 313, 321, 322, 325, 331, 383, 390, 391,
-	392, 393, 413, 414, 415, 418, 421, 422, 425, 427,
-	428, 431, 436, 440, 441, 442, 444, 446, 448, 461,
-	466, 480, 481, 482, 483, 484, 487, 488, 494, 495,
-	496, 497, 498, 506, 507, 522, 593, 595, 612, 632,
-	639, 486, 388, 434, 458, 586, 304, 305, 449, 450,
-	317, 318, 653, 654, 303, 607, 640, 604, 652, 634,
-	443, 381, 0, 0, 384, 284, 308, 323, 0, 624,
-	508, 229, 472, 293, 253, 0, 0, 213, 248, 232,
-	262, 277, 280, 327, 395, 404, 433, 439, 299, 274,
-	246, 465, 243, 491, 525, 526, 527, 529, 399, 269,
-	438, 400, 0, 379, 582, 583, 319, 0, 0, 0,
-	534, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 420, 0, 0, 0, 0, 0, 0, 0,
-	273, 0, 0, 0, 0, 369, 270, 0, 0, 206,
-	511, 0, 435, 0, 205, 0, 493, 255, 380, 377,
-	590, 285, 276, 272, 252, 320, 389, 432, 524, 426,
-	0, 373, 0, 0, 503, 405, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 326, 250, 328, 204, 417, 504,
-	289, 0, 0, 0, 0, 0, 513, 966, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 240, 0, 0,
-	247, 0, 0, 0, 354, 363, 362, 342, 343, 345,
-	347, 353, 360, 366, 339, 348, 0, 0, 616, 0,
-	0, 0, 268, 324, 275, 267, 587, 0, 0, 0,
-	0, 0, 0, 603, 0, 0, 231, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 278, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 300, 0, 406, 260, 0, 459, 0,
-	0, 0, 636, 0, 0, 0, 0, 0, 0, 0,
-	368, 0, 333, 199, 227, 0, 0, 416, 467, 479,
-	0, 0, 0, 256, 0, 477, 430, 611, 235, 287,
-	464, 437, 475, 445, 290, 0, 0, 476, 375, 592,
-	455, 608, 637, 638, 266, 410, 622, 528, 630, 655,
-	228, 263, 424, 512, 614, 500, 401, 588, 589, 332,
-	499, 298, 203, 372, 643, 226, 485, 374, 244, 233,
-	594, 619, 302, 254, 292, 462, 650, 215, 523, 605,
-	241, 489, 0, 0, 658, 249, 510, 617, 606, 217,
-	601, 509, 397, 329, 330, 216, 0, 463, 271, 296,
-	0, 0, 261, 419, 596, 597, 259, 659, 230, 629,
-	222, 0, 628, 412, 591, 602, 398, 386, 221, 600,
-	396, 385, 337, 358, 359, 283, 310, 452, 378, 453,
-	309, 311, 408, 407, 409, 209, 615, 633, 0, 210,
-	0, 505, 618, 660, 457, 214, 236, 237, 239, 0,
-	282, 286, 294, 297, 306, 307, 316, 370, 423, 451,
-	447, 456, 0, 585, 609, 623, 635, 641, 642, 644,
-	645, 646, 647, 648, 651, 649, 411, 314, 501, 336,
-	376, 0, 0, 429, 478, 242, 613, 502, 201, 0,
-	0, 0, 0, 257, 258, 0, 581, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 661, 662, 663, 664,
-	665, 666, 667, 668, 669, 670, 671, 672, 673, 674,
-	675, 676, 677, 678, 656, 514, 520, 515, 516, 517,
-	518, 519, 0, 521, 0, 0, 0, 0, 0, 402,
-	0, 598, 599, 679, 387, 492, 610, 338, 352, 355,
-	344, 364, 0, 365, 340, 341, 346, 349, 350, 351,
-	356, 357, 361, 367, 251, 212, 394, 403, 584, 315,
-	218, 219, 220, 530, 531, 532, 533, 626, 627, 631,
-	207, 468, 469, 470, 471, 295, 621, 312, 474, 473,
-	334, 335, 382, 454, 546, 548, 559, 563, 565, 567,
-	573, 576, 547, 549, 560, 564, 566, 568, 574, 577,
-	536, 538, 540, 542, 555, 554, 551, 579, 580, 557,
-	562, 541, 553, 558, 571, 578, 575, 535, 539, 543,
-	552, 570, 569, 550, 561, 572, 556, 544, 537, 545,
-	0, 198, 223, 371, 0, 460, 291, 657, 625, 490,
-	620, 208, 225, 0, 265, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 200, 202, 211, 224,
-	234, 238, 245, 264, 279, 281, 288, 301, 313, 321,
-	322, 325, 331, 383, 390, 391, 392, 393, 413, 414,
-	415, 418, 421, 422, 425, 427, 428, 431, 436, 440,
-	441, 442, 444, 446, 448, 461, 466, 480, 481, 482,
-	483, 484, 487, 488, 494, 495, 496, 497, 498, 506,
-	507, 522, 593, 595, 612, 632, 639, 486, 388, 434,
-	458, 586, 304, 305, 449, 450, 317, 318, 653, 654,
-	303, 607, 640, 604, 652, 634, 443, 381, 0, 0,
-	384, 284, 308, 323, 0, 624, 508, 229, 472, 293,
-	253, 0, 0, 213, 248, 232, 262, 277, 280, 327,
-	395, 404, 433, 439, 299, 274, 246, 465, 243, 491,
-	525, 526, 527, 529, 399, 269, 438, 400, 0, 379,
-	582, 583, 319, 0, 0, 0, 534, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 420, 0,
-	0, 0, 0, 0, 0, 0, 273, 0, 0, 0,
-	0, 369, 270, 0, 0, 206, 511, 0, 435, 0,
-	205, 0, 493, 255, 380, 377, 590, 285, 276, 272,
-	252, 320, 389, 432, 524, 426, 0, 373, 0, 0,
-	503, 405, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	326, 250, 328, 204, 417, 504, 289, 0, 0, 0,
-	0, 0, 513, 196, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 240, 0, 0, 247, 0, 0, 0,
-	354, 363, 362, 342, 343, 345, 347, 353, 360, 366,
-	339, 348, 0, 0, 616, 0, 0, 0, 268, 324,
-	275, 267, 587, 0, 0, 0, 0, 0, 0, 603,
-	0, 0, 231, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 278, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 300,
-	0, 406, 260, 0, 459, 0, 0, 0, 636, 0,
-	0, 0, 0, 0, 0, 0, 368, 0, 333, 199,
-	227, 0, 0, 416, 467, 479, 0, 0, 0, 256,
-	0, 477, 430, 611, 235, 287, 464, 437, 475, 445,
-	290, 0, 0, 476, 375, 592, 455, 608, 637, 638,
-	266, 410, 622, 528, 630, 655, 228, 263, 424, 512,
-	614, 500, 401, 588, 589, 332, 499, 298, 203, 372,
-	643, 226, 485, 374, 244, 233, 594, 619, 302, 254,
-	292, 462, 650, 215, 523, 605, 241, 489, 0, 0,
-	658, 249, 510, 617, 606, 217, 601, 509, 397, 329,
-	330, 216, 0, 463, 271, 296, 0, 0, 261, 419,
-	596, 597, 259, 659, 230, 629, 222, 0, 628, 412,
-	591, 602, 398, 386, 221, 600, 396, 385, 337, 358,
-	359, 283, 310, 452, 378, 453, 309, 311, 408, 407,
-	409, 209, 615, 633, 0, 210, 0, 505, 618, 660,
-	457, 214, 236, 237, 239, 0, 282, 286, 294, 297,
-	306, 307, 316, 370, 423, 451, 447, 456, 0, 585,
-	609, 623, 635, 641, 642, 644, 645, 646, 647, 648,
-	651, 649, 411, 314, 501, 336, 376, 0, 0, 429,
-	478, 242, 613, 502, 201, 0, 0, 0, 0, 257,
-	258, 0, 581, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 661, 662, 663, 664, 665, 666, 667, 668,
-	669, 670, 671, 672, 673, 674, 675, 676, 677, 678,
-	656, 514, 520, 515, 516, 517, 518, 519, 0, 521,
-	0, 0, 0, 0, 0, 402, 0, 598, 599, 679,
-	387, 492, 610, 338, 352, 355, 344, 364, 0, 365,
-	340, 341, 346, 349, 350, 351, 356, 357, 361, 367,
-	251, 212, 394, 403, 584, 315, 218, 219, 220, 530,
-	531, 532, 533, 626, 627, 631, 207, 468, 469, 470,
-	471, 295, 621, 312, 474, 473, 334, 335, 382, 454,
-	546, 548, 559, 563, 565, 567, 573, 576, 547, 549,
-	560, 564, 566, 568, 574, 577, 536, 538, 540, 542,
-	555, 554, 551, 579, 580, 557, 562, 541, 553, 558,
-	571, 578, 575, 535, 539, 543, 552, 570, 569, 550,
-	561, 572, 556, 544, 537, 545, 0, 198, 223, 371,
-	0, 460, 291, 657, 625, 490, 620, 208, 225, 0,
-	265, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 200, 202, 211, 224, 234, 238, 245, 264,
-	279, 281, 288, 301, 313, 321, 322, 325, 331, 383,
-	390, 391, 392, 393, 413, 414, 415, 418, 421, 422,
-	425, 427, 428, 431, 436, 440, 441, 442, 444, 446,
-	448, 461, 466, 480, 481, 482, 483, 484, 487, 488,
-	494, 495, 496, 497, 498, 506, 507, 522, 593, 595,
-	612, 632, 639, 486, 388, 434, 458, 586, 304, 305,
-	449, 450, 317, 318, 653, 654, 303, 607, 640, 604,
-	652, 634, 443, 381, 0, 0, 384, 284, 308, 323,
-	0, 624, 508, 229, 472, 293, 253, 0, 0, 213,
-	248, 232, 262, 277, 280, 327, 395, 404, 433, 439,
-	299, 274, 246, 465, 243, 491, 525, 526, 527, 529,
-	399, 269, 438, 0, 0, 379, 582, 583, 319,
+	0, 2408, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 400, 0, 0, 0,
+	1872, 0, 4158, 1431, 1415, 534, 0, 1357, 1434, 1325,
+	1344, 1444, 1347, 1350, 1394, 1303, 1372, 420, 1341, 1329,
+	1298, 1336, 1299, 1327, 1359, 273, 1324, 1417, 1376, 1433,
+	369, 270, 1305, 1296, 206, 511, 1330, 435, 1346, 205,
+	1396, 493, 255, 380, 377, 590, 285, 276, 272, 252,
+	320, 389, 432, 524, 426, 1440, 373, 1382, 0, 503,
+	405, 0, 0, 0, 1421, 1420, 1351, 1361, 1423, 1370,
+	1408, 1356, 1395, 1313, 1381, 1435, 1342, 1391, 1436, 326,
+	250, 328, 204, 417, 504, 289, 0, 0, 0, 0,
+	4132, 513, 966, 0, 0, 0, 0, 4133, 0, 0,
+	0, 0, 240, 0, 0, 247, 0, 0, 0, 354,
+	363, 362, 342, 343, 345, 347, 353, 360, 366, 339,
+	348, 1338, 1388, 616, 1430, 1339, 1390, 268, 324, 275,
+	267, 587, 1441, 1422, 1302, 1369, 1429, 1364, 603, 0,
+	0, 231, 1432, 1363, 0, 1393, 0, 1447, 1297, 1384,
+	0, 1300, 1304, 1443, 1427, 1333, 278, 0, 0, 0,
+	0, 0, 0, 0, 1360, 1371, 1405, 1409, 1354, 0,
+	0, 0, 0, 0, 0, 0, 0, 1331, 0, 1380,
+	0, 0, 0, 1309, 1301, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 1358, 0, 0,
+	0, 0, 1312, 0, 1332, 1406, 0, 1295, 300, 1306,
+	406, 260, 0, 459, 1413, 1426, 1355, 636, 1428, 1353,
+	1352, 1400, 1310, 1419, 1345, 368, 1308, 333, 199, 227,
+	0, 1343, 416, 467, 479, 1418, 1328, 1337, 256, 1335,
+	477, 430, 611, 235, 287, 464, 437, 475, 445, 290,
+	1379, 1398, 476, 375, 592, 455, 608, 637, 638, 266,
+	410, 622, 528, 630, 655, 228, 263, 424, 512, 614,
+	500, 401, 588, 589, 332, 499, 298, 203, 372, 643,
+	226, 485, 374, 244, 233, 594, 619, 302, 254, 292,
+	462, 650, 215, 523, 605, 241, 489, 0, 0, 658,
+	249, 510, 617, 606, 217, 601, 509, 397, 329, 330,
+	216, 0, 463, 271, 296, 0, 0, 261, 419, 596,
+	597, 259, 659, 230, 629, 222, 1307, 628, 412, 591,
+	602, 398, 386, 221, 600, 396, 385, 337, 358, 359,
+	283, 310, 452, 378, 453, 309, 311, 408, 407, 409,
+	209, 615, 633, 0, 210, 0, 505, 618, 660, 457,
+	214, 236, 237, 239, 1323, 282, 286, 294, 297, 306,
+	307, 316, 370, 423, 451, 447, 456, 1414, 585, 609,
+	623, 635, 641, 642, 644, 645, 646, 647, 648, 651,
+	649, 411, 314, 501, 336, 376, 1403, 1446, 429, 478,
+	242, 613, 502, 201, 1317, 1322, 1315, 0, 257, 258,
+	1385, 581, 1318, 1316, 1374, 1375, 1319, 1437, 1438, 1439,
+	1424, 661, 662, 663, 664, 665, 666, 667, 668, 669,
+	670, 671, 672, 673, 674, 675, 676, 677, 678, 656,
+	514, 520, 515, 516, 517, 518, 519, 0, 521, 1407,
+	1311, 0, 1320, 1321, 402, 1416, 598, 599, 679, 387,
+	492, 610, 338, 352, 355, 344, 364, 0, 365, 340,
+	341, 346, 349, 350, 351, 356, 357, 361, 367, 251,
+	212, 394, 403, 584, 315, 218, 219, 220, 530, 531,
+	532, 533, 626, 627, 631, 207, 468, 469, 470, 471,
+	295, 621, 312, 474, 473, 334, 335, 382, 454, 546,
+	548, 559, 563, 565, 567, 573, 576, 547, 549, 560,
+	564, 566, 568, 574, 577, 536, 538, 540, 542, 555,
+	554, 551, 579, 580, 557, 562, 541, 553, 558, 571,
+	578, 575, 535, 539, 543, 552, 570, 569, 550, 561,
+	572, 556, 544, 537, 545, 1378, 198, 223, 371, 1442,
+	460, 291, 657, 625, 490, 620, 208, 225, 1314, 265,
+	1326, 1334, 0, 1340, 1348, 1349, 1362, 1365, 1366, 1367,
+	1368, 1386, 1387, 1389, 1397, 1399, 1402, 1404, 1411, 1425,
+	1445, 200, 202, 211, 224, 234, 238, 245, 264, 279,
+	281, 288, 301, 313, 321, 322, 325, 331, 383, 390,
+	391, 392, 393, 413, 414, 415, 418, 421, 422, 425,
+	427, 428, 431, 436, 440, 441, 442, 444, 446, 448,
+	461, 466, 480, 481, 482, 483, 484, 487, 488, 494,
+	495, 496, 497, 498, 506, 507, 522, 593, 595, 612,
+	632, 639, 486, 388, 434, 458, 586, 304, 305, 449,
+	450, 317, 318, 653, 654, 303, 607, 640, 604, 652,
+	634, 443, 381, 1377, 1383, 384, 284, 308, 323, 1392,
+	624, 508, 229, 472, 293, 253, 1410, 1412, 213, 248,
+	232, 262, 277, 280, 327, 395, 404, 433, 439, 299,
+	274, 246, 465, 243, 491, 525, 526, 527, 529, 399,
+	269, 438, 1373, 1401, 379, 582, 583, 319, 400, 0,
+	0, 0, 0, 0, 0, 1431, 1415, 534, 0, 1357,
+	1434, 1325, 1344, 1444, 1347, 1350, 1394, 1303, 1372, 420,
+	1341, 1329, 1298, 1336, 1299, 1327, 1359, 273, 1324, 1417,
+	1376, 1433, 369, 270, 1305, 1296, 206, 511, 1330, 435,
+	1346, 205, 1396, 493, 255, 380, 377, 590, 285, 276,
+	272, 252, 320, 389, 432, 524, 426, 1440, 373, 1382,
+	0, 503, 405, 0, 0, 0, 1421, 1420, 1351, 1361,
+	1423, 1370, 1408, 1356, 1395, 1313, 1381, 1435, 1342, 1391,
+	1436, 326, 250, 328, 204, 417, 504, 289, 0, 0,
+	0, 0, 0, 513, 196, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 240, 0, 0, 247, 0, 0,
+	0, 354, 363, 362, 342, 343, 345, 347, 353, 360,
+	366, 339, 348, 1338, 1388, 616, 1430, 1339, 1390, 268,
+	324, 275, 267, 587, 1441, 1422, 1302, 1369, 1429, 1364,
+	603, 0, 0, 231, 1432, 1363, 0, 1393, 0, 1447,
+	1297, 1384, 0, 1300, 1304, 1443, 1427, 1333, 278, 0,
+	0, 0, 0, 0, 0, 0, 1360, 1371, 1405, 1409,
+	1354, 0, 0, 0, 0, 0, 0, 3276, 0, 1331,
+	0, 1380, 0, 0, 0, 1309, 1301, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 1358,
+	0, 0, 0, 0, 1312, 0, 1332, 1406, 0, 1295,
+	300, 1306, 406, 260, 0, 459, 1413, 1426, 1355, 636,
+	1428, 1353, 1352, 1400, 1310, 1419, 1345, 368, 1308, 333,
+	199, 227, 0, 1343, 416, 467, 479, 1418, 1328, 1337,
+	256, 1335, 477, 430, 611, 235, 287, 464, 437, 475,
+	445, 290, 1379, 1398, 476, 375, 592, 455, 608, 637,
+	638, 266, 410, 622, 528, 630, 655, 228, 263, 424,
+	512, 614, 500, 401, 588, 589, 332, 499, 298, 203,
+	372, 643, 226, 485, 374, 244, 233, 594, 619, 302,
+	254, 292, 462, 650, 215, 523, 605, 241, 489, 0,
+	0, 658, 249, 510, 617, 606, 217, 601, 509, 397,
+	329, 330, 216, 0, 463, 271, 296, 0, 0, 261,
+	419, 596, 597, 259, 659, 230, 629, 222, 1307, 628,
+	412, 591, 602, 398, 386, 221, 600, 396, 385, 337,
+	358, 359, 283, 310, 452, 378, 453, 309, 311, 408,
+	407, 409, 209, 615, 633, 0, 210, 0, 505, 618,
+	660, 457, 214, 236, 237, 239, 1323, 282, 286, 294,
+	297, 306, 307, 316, 370, 423, 451, 447, 456, 1414,
+	585, 609, 623, 635, 641, 642, 644, 645, 646, 647,
+	648, 651, 649, 411, 314, 501, 336, 376, 1403, 1446,
+	429, 478, 242, 613, 502, 201, 1317, 1322, 1315, 0,
+	257, 258, 1385, 581, 1318, 1316, 1374, 1375, 1319, 1437,
+	1438, 1439, 1424, 661, 662, 663, 664, 665, 666, 667,
+	668, 669, 670, 671, 672, 673, 674, 675, 676, 677,
+	678, 656, 514, 520, 515, 516, 517, 518, 519, 0,
+	521, 1407, 1311, 0, 1320, 1321, 402, 1416, 598, 599,
+	679, 387, 492, 610, 338, 352, 355, 344, 364, 0,
+	365, 340, 341, 346, 349, 350, 351, 356, 357, 361,
+	367, 251, 212, 394, 403, 584, 315, 218, 219, 220,
+	530, 531, 532, 533, 626, 627, 631, 207, 468, 469,
+	470, 471, 295, 621, 312, 474, 473, 334, 335, 382,
+	454, 546, 548, 559, 563, 565, 567, 573, 576, 547,
+	549, 560, 564, 566, 568, 574, 577, 536, 538, 540,
+	542, 555, 554, 551, 579, 580, 557, 562, 541, 553,
+	558, 571, 578, 575, 535, 539, 543, 552, 570, 569,
+	550, 561, 572, 556, 544, 537, 545, 1378, 198, 223,
+	371, 1442, 460, 291, 657, 625, 490, 620, 208, 225,
+	1314, 265, 1326, 1334, 0, 1340, 1348, 1349, 1362, 1365,
+	1366, 1367, 1368, 1386, 1387, 1389, 1397, 1399, 1402, 1404,
+	1411, 1425, 1445, 200, 202, 211, 224, 234, 238, 245,
+	264, 279, 281, 288, 301, 313, 321, 322, 325, 331,
+	383, 390, 391, 392, 393, 413, 414, 415, 418, 421,
+	422, 425, 427, 428, 431, 436, 440, 441, 442, 444,
+	446, 448, 461, 466, 480, 481, 482, 483, 484, 487,
+	488, 494, 495, 496, 497, 498, 506, 507, 522, 593,
+	595, 612, 632, 639, 486, 388, 434, 458, 586, 304,
+	305, 449, 450, 317, 318, 653, 654, 303, 607, 640,
+	604, 652, 634, 443, 381, 1377, 1383, 384, 284, 308,
+	323, 1392, 624, 508, 229, 472, 293, 253, 1410, 1412,
+	213, 248, 232, 262, 277, 280, 327, 395, 404, 433,
+	439, 299, 274, 246, 465, 243, 491, 525, 526, 527,
+	529, 399, 269, 438, 1373, 1401, 379, 582, 583, 319,
+	400, 0, 0, 0, 0, 0, 0, 1431, 1415, 534,
+	0, 1357, 1434, 1325, 1344, 1444, 1347, 1350, 1394, 1303,
+	1372, 420, 1341, 1329, 1298, 1336, 1299, 1327, 1359, 273,
+	1324, 1417, 1376, 1433, 369, 270, 1305, 1296, 206, 511,
+	1330, 435, 1346, 205, 1396, 493, 255, 380, 377, 590,
+	285, 276, 272, 252, 320, 389, 432, 524, 426, 1440,
+	373, 1382, 0, 503, 405, 0, 0, 0, 1421, 1420,
+	1351, 1361, 1423, 1370, 1408, 1356, 1395, 1313, 1381, 1435,
+	1342, 1391, 1436, 326, 250, 328, 204, 417, 504, 289,
+	0, 0, 0, 0, 0, 513, 731, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 240, 0, 0, 247,
+	0, 0, 0, 354, 363, 362, 342, 343, 345, 347,
+	353, 360, 366, 339, 348, 1338, 1388, 616, 1430, 1339,
+	1390, 268, 324, 275, 267, 587, 1441, 1422, 1302, 1369,
+	1429, 1364, 603, 0, 0, 231, 1432, 1363, 0, 1393,
+	0, 1447, 1297, 1384, 0, 1300, 1304, 1443, 1427, 1333,
+	278, 0, 0, 0, 0, 0, 0, 0, 1360, 1371,
+	1405, 1409, 1354, 0, 0, 0, 0, 0, 0, 3237,
+	0, 1331, 0, 1380, 0, 0, 0, 1309, 1301, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 1358, 0, 0, 0, 0, 1312, 0, 1332, 1406,
+	0, 1295, 300, 1306, 406, 260, 0, 459, 1413, 1426,
+	1355, 636, 1428, 1353, 1352, 1400, 1310, 1419, 1345, 368,
+	1308, 333, 199, 227, 0, 1343, 416, 467, 479, 1418,
+	1328, 1337, 256, 1335, 477, 430, 611, 235, 287, 464,
+	437, 475, 445, 290, 1379, 1398, 476, 375, 592, 455,
+	608, 637, 638, 266, 410, 622, 528, 630, 655, 228,
+	263, 424, 512, 614, 500, 401, 588, 589, 332, 499,
+	298, 203, 372, 643, 226, 485, 374, 244, 233, 594,
+	619, 302, 254, 292, 462, 650, 215, 523, 605, 241,
+	489, 0, 0, 658, 249, 510, 617, 606, 217, 601,
+	509, 397, 329, 330, 216, 0, 463, 271, 296, 0,
+	0, 261, 419, 596, 597, 259, 659, 230, 629, 222,
+	1307, 628, 412, 591, 602, 398, 386, 221, 600, 396,
+	385, 337, 358, 359, 283, 310, 452, 378, 453, 309,
+	311, 408, 407, 409, 209, 615, 633, 0, 210, 0,
+	505, 618, 660, 457, 214, 236, 237, 239, 1323, 282,
+	286, 294, 297, 306, 307, 316, 370, 423, 451, 447,
+	456, 1414, 585, 609, 623, 635, 641, 642, 644, 645,
+	646, 647, 648, 651, 649, 411, 314, 501, 336, 376,
+	1403, 1446, 429, 478, 242, 613, 502, 201, 1317, 1322,
+	1315, 0, 257, 258, 1385, 581, 1318, 1316, 1374, 1375,
+	1319, 1437, 1438, 1439, 1424, 661, 662, 663, 664, 665,
+	666, 667, 668, 669, 670, 671, 672, 673, 674, 675,
+	676, 677, 678, 656, 514, 520, 515, 516, 517, 518,
+	519, 0, 521, 1407, 1311, 0, 1320, 1321, 402, 1416,
+	598, 599, 679, 387, 492, 610, 338, 352, 355, 344,
+	364, 0, 365, 340, 341, 346, 349, 350, 351, 356,
+	357, 361, 367, 251, 212, 394, 403, 584, 315, 218,
+	219, 220, 530, 531, 532, 533, 626, 627, 631, 207,
+	468, 469, 470, 471, 295, 621, 312, 474, 473, 334,
+	335, 382, 454, 546, 548, 559, 563, 565, 567, 573,
+	576, 547, 549, 560, 564, 566, 568, 574, 577, 536,
+	538, 540, 542, 555, 554, 551, 579, 580, 557, 562,
+	541, 553, 558, 571, 578, 575, 535, 539, 543, 552,
+	570, 569, 550, 561, 572, 556, 544, 537, 545, 1378,
+	198, 223, 371, 1442, 460, 291, 657, 625, 490, 620,
+	208, 225, 1314, 265, 1326, 1334, 0, 1340, 1348, 1349,
+	1362, 1365, 1366, 1367, 1368, 1386, 1387, 1389, 1397, 1399,
+	1402, 1404, 1411, 1425, 1445, 200, 202, 211, 224, 234,
+	238, 245, 264, 279, 281, 288, 301, 313, 321, 322,
+	325, 331, 383, 390, 391, 392, 393, 413, 414, 415,
+	418, 421, 422, 425, 427, 428, 431, 436, 440, 441,
+	442, 444, 446, 448, 461, 466, 480, 481, 482, 483,
+	484, 487, 488, 494, 495, 496, 497, 498, 506, 507,
+	522, 593, 595, 612, 632, 639, 486, 388, 434, 458,
+	586, 304, 305, 449, 450, 317, 318, 653, 654, 303,
+	607, 640, 604, 652, 634, 443, 381, 1377, 1383, 384,
+	284, 308, 323, 1392, 624, 508, 229, 472, 293, 253,
+	1410, 1412, 213, 248, 232, 262, 277, 280, 327, 395,
+	404, 433, 439, 299, 274, 246, 465, 243, 491, 525,
+	526, 527, 529, 399, 269, 438, 1373, 1401, 379, 582,
+	583, 319, 400, 0, 0, 0, 0, 0, 0, 1431,
+	1415, 534, 0, 1357, 1434, 1325, 1344, 1444, 1347, 1350,
+	1394, 1303, 1372, 420, 1341, 1329, 1298, 1336, 1299, 1327,
+	1359, 273, 1324, 1417, 1376, 1433, 369, 270, 1305, 1296,
+	206, 511, 1330, 435, 1346, 205, 1396, 493, 255, 380,
+	377, 590, 285, 276, 272, 252, 320, 389, 432, 524,
+	426, 1440, 373, 1382, 0, 503, 405, 0, 0, 0,
+	1421, 1420, 1351, 1361, 1423, 1370, 1408, 1356, 1395, 1313,
+	1381, 1435, 1342, 1391, 1436, 326, 250, 328, 204, 417,
+	504, 289, 0, 0, 0, 0, 0, 513, 966, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 240, 0,
+	0, 247, 0, 0, 0, 354, 363, 362, 342, 343,
+	345, 347, 353, 360, 366, 339, 348, 1338, 1388, 616,
+	1430, 1339, 1390, 268, 324, 275, 267, 587, 1441, 1422,
+	1302, 1369, 1429, 1364, 603, 0, 0, 231, 1432, 1363,
+	0, 1393, 0, 1447, 1297, 1384, 0, 1300, 1304, 1443,
+	1427, 1333, 278, 0, 0, 0, 0, 0, 0, 0,
+	1360, 1371, 1405, 1409, 1354, 0, 0, 0, 0, 0,
+	0, 2428, 0, 1331, 0, 1380, 0, 0, 0, 1309,
+	1301, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 1358, 0, 0, 0, 0, 1312, 0,
+	1332, 1406, 0, 1295, 300, 1306, 406, 260, 0, 459,
+	1413, 1426, 1355, 636, 1428, 1353, 1352, 1400, 1310, 1419,
+	1345, 368, 1308, 333, 199, 227, 0, 1343, 416, 467,
+	479, 1418, 1328, 1337, 256, 1335, 477, 430, 611, 235,
+	287, 464, 437, 475, 445, 290, 1379, 1398, 476, 375,
+	592, 455, 608, 637, 638, 266, 410, 622, 528, 630,
+	655, 228, 263, 424, 512, 614, 500, 401, 588, 589,
+	332, 499, 298, 203, 372, 643, 226, 485, 374, 244,
+	233, 594, 619, 302, 254, 292, 462, 650, 215, 523,
+	605, 241, 489, 0, 0, 658, 249, 510, 617, 606,
+	217, 601, 509, 397, 329, 330, 216, 0, 463, 271,
+	296, 0, 0, 261, 419, 596, 597, 259, 659, 230,
+	629, 222, 1307, 628, 412, 591, 602, 398, 386, 221,
+	600, 396, 385, 337, 358, 359, 283, 310, 452, 378,
+	453, 309, 311, 408, 407, 409, 209, 615, 633, 0,
+	210, 0, 505, 618, 660, 457, 214, 236, 237, 239,
+	1323, 282, 286, 294, 297, 306, 307, 316, 370, 423,
+	451, 447, 456, 1414, 585, 609, 623, 635, 641, 642,
+	644, 645, 646, 647, 648, 651, 649, 411, 314, 501,
+	336, 376, 1403, 1446, 429, 478, 242, 613, 502, 201,
+	1317, 1322, 1315, 0, 257, 258, 1385, 581, 1318, 1316,
+	1374, 1375, 1319, 1437, 1438, 1439, 1424, 661, 662, 663,
+	664, 665, 666, 667, 668, 669, 670, 671, 672, 673,
+	674, 675, 676, 677, 678, 656, 514, 520, 515, 516,
+	517, 518, 519, 0, 521, 1407, 1311, 0, 1320, 1321,
+	402, 1416, 598, 599, 679, 387, 492, 610, 338, 352,
+	355, 344, 364, 0, 365, 340, 341, 346, 349, 350,
+	351, 356, 357, 361, 367, 251, 212, 394, 403, 584,
+	315, 218, 219, 220, 530, 531, 532, 533, 626, 627,
+	631, 207, 468, 469, 470, 471, 295, 621, 312, 474,
+	473, 334, 335, 382, 454, 546, 548, 559, 563, 565,
+	567, 573, 576, 547, 549, 560, 564, 566, 568, 574,
+	577, 536, 538, 540, 542, 555, 554, 551, 579, 580,
+	557, 562, 541, 553, 558, 571, 578, 575, 535, 539,
+	543, 552, 570, 569, 550, 561, 572, 556, 544, 537,
+	545, 1378, 198, 223, 371, 1442, 460, 291, 657, 625,
+	490, 620, 208, 225, 1314, 265, 1326, 1334, 0, 1340,
+	1348, 1349, 1362, 1365, 1366, 1367, 1368, 1386, 1387, 1389,
+	1397, 1399, 1402, 1404, 1411, 1425, 1445, 200, 202, 211,
+	224, 234, 238, 245, 264, 279, 281, 288, 301, 313,
+	321, 322, 325, 331, 383, 390, 391, 392, 393, 413,
+	414, 415, 418, 421, 422, 425, 427, 428, 431, 436,
+	440, 441, 442, 444, 446, 448, 461, 466, 480, 481,
+	482, 483, 484, 487, 488, 494, 495, 496, 497, 498,
+	506, 507, 522, 593, 595, 612, 632, 639, 486, 388,
+	434, 458, 586, 304, 305, 449, 450, 317, 318, 653,
+	654, 303, 607, 640, 604, 652, 634, 443, 381, 1377,
+	1383, 384, 284, 308, 323, 1392, 624, 508, 229, 472,
+	293, 253, 1410, 1412, 213, 248, 232, 262, 277, 280,
+	327, 395, 404, 433, 439, 299, 274, 246, 465, 243,
+	491, 525, 526, 527, 529, 399, 269, 438, 1373, 1401,
+	379, 582, 583, 319, 400, 0, 0, 0, 0, 0,
+	0, 1431, 1415, 534, 0, 1357, 1434, 1325, 1344, 1444,
+	1347, 1350, 1394, 1303, 1372, 420, 1341, 1329, 1298, 1336,
+	1299, 1327, 1359, 273, 1324, 1417, 1376, 1433, 369, 270,
+	1305, 1296, 206, 511, 1330, 435, 1346, 205, 1396, 493,
+	255, 380, 377, 590, 285, 276, 272, 252, 320, 389,
+	432, 524, 426, 1440, 373, 1382, 0, 503, 405, 0,
+	0, 0, 1421, 1420, 1351, 1361, 1423, 1370, 1408, 1356,
+	1395, 1313, 1381, 1435, 1342, 1391, 1436, 326, 250, 328,
+	204, 417, 504, 289, 0, 95, 0, 0, 0, 513,
+	731, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	240, 0, 0, 247, 0, 0, 0, 354, 363, 362,
+	342, 343, 345, 347, 353, 360, 366, 339, 348, 1338,
+	1388, 616, 1430, 1339, 1390, 268, 324, 275, 267, 587,
+	1441, 1422, 1302, 1369, 1429, 1364, 603, 0, 0, 231,
+	1432, 1363, 0, 1393, 0, 1447, 1297, 1384, 0, 1300,
+	1304, 1443, 1427, 1333, 278, 0, 0, 0, 0, 0,
+	0, 0, 1360, 1371, 1405, 1409, 1354, 0, 0, 0,
+	0, 0, 0, 0, 0, 1331, 0, 1380, 0, 0,
+	0, 1309, 1301, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 1358, 0, 0, 0, 0,
+	1312, 0, 1332, 1406, 0, 1295, 300, 1306, 406, 260,
+	0, 459, 1413, 1426, 1355, 636, 1428, 1353, 1352, 1400,
+	1310, 1419, 1345, 368, 1308, 333, 199, 227, 0, 1343,
+	416, 467, 479, 1418, 1328, 1337, 256, 1335, 477, 430,
+	611, 235, 287, 464, 437, 475, 445, 290, 1379, 1398,
+	476, 375, 592, 455, 608, 637, 638, 266, 410, 622,
+	528, 630, 655, 228, 263, 424, 512, 614, 500, 401,
+	588, 589, 332, 499, 298, 203, 372, 643, 226, 485,
+	374, 244, 233, 594, 619, 302, 254, 292, 462, 650,
+	215, 523, 605, 241, 489, 0, 0, 658, 249, 510,
+	617, 606, 217, 601, 509, 397, 329, 330, 216, 0,
+	463, 271, 296, 0, 0, 261, 419, 596, 597, 259,
+	659, 230, 629, 222, 1307, 628, 412, 591, 602, 398,
+	386, 221, 600, 396, 385, 337, 358, 359, 283, 310,
+	452, 378, 453, 309, 311, 408, 407, 409, 209, 615,
+	633, 0, 210, 0, 505, 618, 660, 457, 214, 236,
+	237, 239, 1323, 282, 286, 294, 297, 306, 307, 316,
+	370, 423, 451, 447, 456, 1414, 585, 609, 623, 635,
+	641, 642, 644, 645, 646, 647, 648, 651, 649, 411,
+	314, 501, 336, 376, 1403, 1446, 429, 478, 242, 613,
+	502, 201, 1317, 1322, 1315, 0, 257, 258, 1385, 581,
+	1318, 1316, 1374, 1375, 1319, 1437, 1438, 1439, 1424, 661,
+	662, 663, 664, 665, 666, 667, 668, 669, 670, 671,
+	672, 673, 674, 675, 676, 677, 678, 656, 514, 520,
+	515, 516, 517, 518, 519, 0, 521, 1407, 1311, 0,
+	1320, 1321, 402, 1416, 598, 599, 679, 387, 492, 610,
+	338, 352, 355, 344, 364, 0, 365, 340, 341, 346,
+	349, 350, 351, 356, 357, 361, 367, 251, 212, 394,
+	403, 584, 315, 218, 219, 220, 530, 531, 532, 533,
+	626, 627, 631, 207, 468, 469, 470, 471, 295, 621,
+	312, 474, 473, 334, 335, 382, 454, 546, 548, 559,
+	563, 565, 567, 573, 576, 547, 549, 560, 564, 566,
+	568, 574, 577, 536, 538, 540, 542, 555, 554, 551,
+	579, 580, 557, 562, 541, 553, 558, 571, 578, 575,
+	535, 539, 543, 552, 570, 569, 550, 561, 572, 556,
+	544, 537, 545, 1378, 198, 223, 371, 1442, 460, 291,
+	657, 625, 490, 620, 208, 225, 1314, 265, 1326, 1334,
+	0, 1340, 1348, 1349, 1362, 1365, 1366, 1367, 1368, 1386,
+	1387, 1389, 1397, 1399, 1402, 1404, 1411, 1425, 1445, 200,
+	202, 211, 224, 234, 238, 245, 264, 279, 281, 288,
+	301, 313, 321, 322, 325, 331, 383, 390, 391, 392,
+	393, 413, 414, 415, 418, 421, 422, 425, 427, 428,
+	431, 436, 440, 441, 442, 444, 446, 448, 461, 466,
+	480, 481, 482, 483, 484, 487, 488, 494, 495, 496,
+	497, 498, 506, 507, 522, 593, 595, 612, 632, 639,
+	486, 388, 434, 458, 586, 304, 305, 449, 450, 317,
+	318, 653, 654, 303, 607, 640, 604, 652, 634, 443,
+	381, 1377, 1383, 384, 284, 308, 323, 1392, 624, 508,
+	229, 472, 293, 253, 1410, 1412, 213, 248, 232, 262,
+	277, 280, 327, 395, 404, 433, 439, 299, 274, 246,
+	465, 243, 491, 525, 526, 527, 529, 399, 269, 438,
+	1373, 1401, 379, 582, 583, 319, 400, 0, 0, 0,
+	0, 0, 0, 1431, 1415, 534, 0, 1357, 1434, 1325,
+	1344, 1444, 1347, 1350, 1394, 1303, 1372, 420, 1341, 1329,
+	1298, 1336, 1299, 1327, 1359, 273, 1324, 1417, 1376, 1433,
+	369, 270, 1305, 1296, 206, 511, 1330, 435, 1346, 205,
+	1396, 493, 255, 380, 377, 590, 285, 276, 272, 252,
+	320, 389, 432, 524, 426, 1440, 373, 1382, 0, 503,
+	405, 0, 0, 0, 1421, 1420, 1351, 1361, 1423, 1370,
+	1408, 1356, 1395, 1313, 1381, 1435, 1342, 1391, 1436, 326,
+	250, 328, 204, 417, 504, 289, 0, 0, 0, 0,
+	0, 513, 196, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 240, 0, 0, 247, 0, 0, 0, 354,
+	363, 362, 342, 343, 345, 347, 353, 360, 366, 339,
+	348, 1338, 1388, 616, 1430, 1339, 1390, 268, 324, 275,
+	267, 587, 1441, 1422, 1302, 1369, 1429, 1364, 603, 0,
+	0, 231, 1432, 1363, 0, 1393, 0, 1447, 1297, 1384,
+	0, 1300, 1304, 1443, 1427, 1333, 278, 0, 0, 0,
+	0, 0, 0, 0, 1360, 1371, 1405, 1409, 1354, 0,
+	0, 0, 0, 0, 0, 0, 0, 1331, 0, 1380,
+	0, 0, 0, 1309, 1301, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 1358, 0, 0,
+	0, 0, 1312, 0, 1332, 1406, 0, 1295, 300, 1306,
+	406, 260, 0, 459, 1413, 1426, 1355, 636, 1428, 1353,
+	1352, 1400, 1310, 1419, 1345, 368, 1308, 333, 199, 227,
+	0, 1343, 416, 467, 479, 1418, 1328, 1337, 256, 1335,
+	477, 430, 611, 235, 287, 464, 437, 475, 445, 290,
+	1379, 1398, 476, 375, 592, 455, 608, 637, 638, 266,
+	410, 622, 528, 630, 655, 228, 263, 424, 512, 614,
+	500, 401, 588, 589, 332, 499, 298, 203, 372, 643,
+	226, 485, 374, 244, 233, 594, 619, 302, 254, 292,
+	462, 650, 215, 523, 605, 241, 489, 0, 0, 658,
+	249, 510, 617, 606, 217, 601, 509, 397, 329, 330,
+	216, 0, 463, 271, 296, 0, 0, 261, 419, 596,
+	597, 259, 659, 230, 629, 222, 1307, 628, 412, 591,
+	602, 398, 386, 221, 600, 396, 385, 337, 358, 359,
+	283, 310, 452, 378, 453, 309, 311, 408, 407, 409,
+	209, 615, 633, 0, 210, 0, 505, 618, 660, 457,
+	214, 236, 237, 239, 1323, 282, 286, 294, 297, 306,
+	307, 316, 370, 423, 451, 447, 456, 1414, 585, 609,
+	623, 635, 641, 642, 644, 645, 646, 647, 648, 651,
+	649, 411, 314, 501, 336, 376, 1403, 1446, 429, 478,
+	242, 613, 502, 201, 1317, 1322, 1315, 0, 257, 258,
+	1385, 581, 1318, 1316, 1374, 1375, 1319, 1437, 1438, 1439,
+	1424, 661, 662, 663, 664, 665, 666, 667, 668, 669,
+	670, 671, 672, 673, 674, 675, 676, 677, 678, 656,
+	514, 520, 515, 516, 517, 518, 519, 0, 521, 1407,
+	1311, 0, 1320, 1321, 402, 1416, 598, 599, 679, 387,
+	492, 610, 338, 352, 355, 344, 364, 0, 365, 340,
+	341, 346, 349, 350, 351, 356, 357, 361, 367, 251,
+	212, 394, 403, 584, 315, 218, 219, 220, 530, 531,
+	532, 533, 626, 627, 631, 207, 468, 469, 470, 471,
+	295, 621, 312, 474, 473, 334, 335, 382, 454, 546,
+	548, 559, 563, 565, 567, 573, 576, 547, 549, 560,
+	564, 566, 568, 574, 577, 536, 538, 540, 542, 555,
+	554, 551, 579, 580, 557, 562, 541, 553, 558, 571,
+	578, 575, 535, 539, 543, 552, 570, 569, 550, 561,
+	572, 556, 544, 537, 545, 1378, 198, 223, 371, 1442,
+	460, 291, 657, 625, 490, 620, 208, 225, 1314, 265,
+	1326, 1334, 0, 1340, 1348, 1349, 1362, 1365, 1366, 1367,
+	1368, 1386, 1387, 1389, 1397, 1399, 1402, 1404, 1411, 1425,
+	1445, 200, 202, 211, 224, 234, 238, 245, 264, 279,
+	281, 288, 301, 313, 321, 322, 325, 331, 383, 390,
+	391, 392, 393, 413, 414, 415, 418, 421, 422, 425,
+	427, 428, 431, 436, 440, 441, 442, 444, 446, 448,
+	461, 466, 480, 481, 482, 483, 484, 487, 488, 494,
+	495, 496, 497, 498, 506, 507, 522, 593, 595, 612,
+	632, 639, 486, 388, 434, 458, 586, 304, 305, 449,
+	450, 317, 318, 653, 654, 303, 607, 640, 604, 652,
+	634, 443, 381, 1377, 1383, 384, 284, 308, 323, 1392,
+	624, 508, 229, 472, 293, 253, 1410, 1412, 213, 248,
+	232, 262, 277, 280, 327, 395, 404, 433, 439, 299,
+	274, 246, 465, 243, 491, 525, 526, 527, 529, 399,
+	269, 438, 1373, 1401, 379, 582, 583, 319, 400, 0,
+	0, 0, 0, 0, 0, 1431, 1415, 534, 0, 1357,
+	1434, 1325, 1344, 1444, 1347, 1350, 1394, 1303, 1372, 420,
+	1341, 1329, 1298, 1336, 1299, 1327, 1359, 273, 1324, 1417,
+	1376, 1433, 369, 270, 1305, 1296, 206, 511, 1330, 435,
+	1346, 205, 1396, 493, 255, 380, 377, 590, 285, 276,
+	272, 252, 320, 389, 432, 524, 426, 1440, 373, 1382,
+	0, 503, 405, 0, 0, 0, 1421, 1420, 1351, 1361,
+	1423, 1370, 1408, 1356, 1395, 1313, 1381, 1435, 1342, 1391,
+	1436, 326, 250, 328, 204, 417, 504, 289, 0, 0,
+	0, 0, 0, 513, 731, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 240, 0, 0, 247, 0, 0,
+	0, 354, 363, 362, 342, 343, 345, 347, 353, 360,
+	366, 339, 348, 1338, 1388, 616, 1430, 1339, 1390, 268,
+	324, 275, 267, 587, 1441, 1422, 1302, 1369, 1429, 1364,
+	603, 0, 0, 231, 1432, 1363, 0, 1393, 0, 1447,
+	1297, 1384, 0, 1300, 1304, 1443, 1427, 1333, 278, 0,
+	0, 0, 0, 0, 0, 0, 1360, 1371, 1405, 1409,
+	1354, 0, 0, 0, 0, 0, 0, 0, 0, 1331,
+	0, 1380, 0, 0, 0, 1309, 1301, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 1358,
+	0, 0, 0, 0, 1312, 0, 1332, 1406, 0, 1295,
+	300, 1306, 406, 260, 0, 459, 1413, 1426, 1355, 636,
+	1428, 1353, 1352, 1400, 1310, 1419, 1345, 368, 1308, 333,
+	199, 227, 0, 1343, 416, 467, 479, 1418, 1328, 1337,
+	256, 1335, 477, 430, 611, 235, 287, 464, 437, 475,
+	445, 290, 1379, 1398, 476, 375, 592, 455, 608, 637,
+	638, 266, 410, 622, 528, 630, 655, 228, 263, 424,
+	512, 614, 500, 401, 588, 589, 332, 499, 298, 203,
+	372, 643, 226, 485, 374, 244, 233, 594, 619, 302,
+	254, 292, 462, 650, 215, 523, 605, 241, 489, 0,
+	0, 658, 249, 510, 617, 606, 217, 601, 509, 397,
+	329, 330, 216, 0, 463, 271, 296, 0, 0, 261,
+	419, 596, 597, 259, 659, 230, 629, 222, 1307, 628,
+	412, 591, 602, 398, 386, 221, 600, 396, 385, 337,
+	358, 359, 283, 310, 452, 378, 453, 309, 311, 408,
+	407, 409, 209, 615, 633, 0, 210, 0, 505, 618,
+	660, 457, 214, 236, 237, 239, 1323, 282, 286, 294,
+	297, 306, 307, 316, 370, 423, 451, 447, 456, 1414,
+	585, 609, 623, 635, 641, 642, 644, 645, 646, 647,
+	648, 651, 649, 411, 314, 501, 336, 376, 1403, 1446,
+	429, 478, 242, 613, 502, 201, 1317, 1322, 1315, 0,
+	257, 258, 1385, 581, 1318, 1316, 1374, 1375, 1319, 1437,
+	1438, 1439, 1424, 661, 662, 663, 664, 665, 666, 667,
+	668, 669, 670, 671, 672, 673, 674, 675, 676, 677,
+	678, 656, 514, 520, 515, 516, 517, 518, 519, 0,
+	521, 1407, 1311, 0, 1320, 1321, 402, 1416, 598, 599,
+	679, 387, 492, 610, 338, 352, 355, 344, 364, 0,
+	365, 340, 341, 346, 349, 350, 351, 356, 357, 361,
+	367, 251, 212, 394, 403, 584, 315, 218, 219, 220,
+	530, 531, 532, 533, 626, 627, 631, 207, 468, 469,
+	470, 471, 295, 621, 312, 474, 473, 334, 335, 382,
+	454, 546, 548, 559, 563, 565, 567, 573, 576, 547,
+	549, 560, 564, 566, 568, 574, 577, 536, 538, 540,
+	542, 555, 554, 551, 579, 580, 557, 562, 541, 553,
+	558, 571, 578, 575, 535, 539, 543, 552, 570, 569,
+	550, 561, 572, 556, 544, 537, 545, 1378, 198, 223,
+	371, 1442, 460, 291, 657, 625, 490, 620, 208, 225,
+	1314, 265, 1326, 1334, 0, 1340, 1348, 1349, 1362, 1365,
+	1366, 1367, 1368, 1386, 1387, 1389, 1397, 1399, 1402, 1404,
+	1411, 1425, 1445, 200, 202, 211, 224, 234, 238, 245,
+	264, 279, 281, 288, 301, 313, 321, 322, 325, 331,
+	383, 390, 391, 392, 393, 413, 414, 415, 418, 421,
+	422, 425, 427, 428, 431, 436, 440, 441, 442, 444,
+	446, 448, 461, 466, 480, 481, 482, 483, 484, 487,
+	488, 494, 495, 496, 497, 498, 506, 507, 522, 593,
+	595, 612, 632, 639, 486, 388, 434, 458, 586, 304,
+	305, 449, 450, 317, 318, 653, 654, 303, 607, 640,
+	604, 652, 634, 443, 381, 1377, 1383, 384, 284, 308,
+	323, 1392, 624, 508, 229, 472, 293, 253, 1410, 1412,
+	213, 248, 232, 262, 277, 280, 327, 395, 404, 433,
+	439, 299, 274, 246, 465, 243, 491, 525, 526, 527,
+	529, 399, 269, 438, 1373, 1401, 379, 582, 583, 319,
+	400, 0, 0, 0, 0, 0, 0, 1431, 1415, 534,
+	0, 1357, 1434, 1325, 1344, 1444, 1347, 1350, 1394, 1303,
+	1372, 420, 1341, 1329, 1298, 1336, 1299, 1327, 1359, 273,
+	1324, 1417, 1376, 1433, 369, 270, 1305, 1296, 206, 511,
+	1330, 435, 1346, 205, 1396, 493, 255, 380, 377, 590,
+	285, 276, 272, 252, 320, 389, 432, 524, 426, 1440,
+	373, 1382, 0, 503, 405, 0, 0, 0, 1421, 1420,
+	1351, 1361, 1423, 1370, 1408, 1356, 1395, 1313, 1381, 1435,
+	1342, 1391, 1436, 326, 250, 328, 204, 417, 504, 289,
+	0, 0, 0, 0, 0, 513, 966, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 240, 0, 0, 247,
+	0, 0, 0, 354, 363, 362, 342, 343, 345, 347,
+	353, 360, 366, 339, 348, 1338, 1388, 616, 1430, 1339,
+	1390, 268, 324, 275, 267, 587, 1441, 1422, 1302, 1369,
+	1429, 1364, 603, 0, 0, 231, 1432, 1363, 0, 1393,
+	0, 1447, 1297, 1384, 0, 1300, 1304, 1443, 1427, 1333,
+	278, 0, 0, 0, 0, 0, 0, 0, 1360, 1371,
+	1405, 1409, 1354, 0, 0, 0, 0, 0, 0, 0,
+	0, 1331, 0, 1380, 0, 0, 0, 1309, 1301, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 1358, 0, 0, 0, 0, 1312, 0, 1332, 1406,
+	0, 1295, 300, 1306, 406, 260, 0, 459, 1413, 1426,
+	1355, 636, 1428, 1353, 1352, 1400, 1310, 1419, 1345, 368,
+	1308, 333, 199, 227, 0, 1343, 416, 467, 479, 1418,
+	1328, 1337, 256, 1335, 477, 430, 611, 235, 287, 464,
+	437, 475, 445, 290, 1379, 1398, 476, 375, 592, 455,
+	608, 637, 638, 266, 410, 622, 528, 630, 655, 228,
+	263, 424, 512, 614, 500, 401, 588, 589, 332, 499,
+	298, 203, 372, 643, 226, 485, 374, 244, 233, 594,
+	619, 302, 254, 292, 462, 650, 215, 523, 605, 241,
+	489, 0, 0, 658, 249, 510, 617, 606, 217, 601,
+	509, 397, 329, 330, 216, 0, 463, 271, 296, 0,
+	0, 261, 419, 596, 597, 259, 659, 230, 629, 222,
+	1307, 628, 412, 591, 602, 398, 386, 221, 600, 396,
+	385, 337, 358, 359, 283, 310, 452, 378, 453, 309,
+	311, 408, 407, 409, 209, 615, 633, 0, 210, 0,
+	505, 618, 660, 457, 214, 236, 237, 239, 1323, 282,
+	286, 294, 297, 306, 307, 316, 370, 423, 451, 447,
+	456, 1414, 585, 609, 623, 635, 641, 642, 644, 645,
+	646, 647, 648, 651, 649, 411, 314, 501, 336, 376,
+	1403, 1446, 429, 478, 242, 613, 502, 201, 1317, 1322,
+	1315, 0, 257, 258, 1385, 581, 1318, 1316, 1374, 1375,
+	1319, 1437, 1438, 1439, 1424, 661, 662, 663, 664, 665,
+	666, 667, 668, 669, 670, 671, 672, 673, 674, 675,
+	676, 677, 678, 656, 514, 520, 515, 516, 517, 518,
+	519, 0, 521, 1407, 1311, 0, 1320, 1321, 402, 1416,
+	598, 599, 679, 387, 492, 610, 338, 352, 355, 344,
+	364, 0, 365, 340, 341, 346, 349, 350, 351, 356,
+	357, 361, 367, 251, 212, 394, 403, 584, 315, 218,
+	219, 220, 530, 531, 532, 533, 626, 627, 631, 207,
+	468, 469, 470, 471, 295, 621, 312, 474, 473, 334,
+	335, 382, 454, 546, 548, 559, 563, 565, 567, 573,
+	576, 547, 549, 560, 564, 566, 568, 574, 577, 536,
+	538, 540, 542, 555, 554, 551, 579, 580, 557, 562,
+	541, 553, 558, 571, 578, 575, 535, 539, 543, 552,
+	570, 569, 550, 561, 572, 556, 544, 537, 545, 1378,
+	198, 223, 371, 1442, 460, 291, 657, 625, 490, 620,
+	208, 225, 1314, 265, 1326, 1334, 0, 1340, 1348, 1349,
+	1362, 1365, 1366, 1367, 1368, 1386, 1387, 1389, 1397, 1399,
+	1402, 1404, 1411, 1425, 1445, 200, 202, 211, 224, 234,
+	238, 245, 264, 279, 281, 288, 301, 313, 321, 322,
+	325, 331, 383, 390, 391, 392, 393, 413, 414, 415,
+	418, 421, 422, 425, 427, 428, 431, 436, 440, 441,
+	442, 444, 446, 448, 461, 466, 480, 481, 482, 483,
+	484, 487, 488, 494, 495, 496, 497, 498, 506, 507,
+	522, 593, 595, 612, 632, 639, 486, 388, 434, 458,
+	586, 304, 305, 449, 450, 317, 318, 653, 654, 303,
+	607, 640, 604, 652, 634, 443, 381, 1377, 1383, 384,
+	284, 308, 323, 1392, 624, 508, 229, 472, 293, 253,
+	1410, 1412, 213, 248, 232, 262, 277, 280, 327, 395,
+	404, 433, 439, 299, 274, 246, 465, 243, 491, 525,
+	526, 527, 529, 399, 269, 438, 1373, 1401, 379, 582,
+	583, 319, 400, 0, 0, 0, 0, 0, 0, 0,
+	0, 534, 0, 784, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 420, 0, 0, 0, 771, 0, 0,
+	0, 273, 776, 0, 0, 0, 369, 270, 0, 0,
+	206, 511, 0, 435, 0, 205, 0, 493, 255, 380,
+	377, 590, 285, 276, 272, 252, 320, 389, 432, 524,
+	426, 783, 373, 0, 0, 503, 405, 0, 0, 0,
+	0, 0, 0, 0, 0, 778, 779, 0, 0, 0,
+	0, 0, 0, 0, 0, 326, 250, 328, 204, 417,
+	504, 289, 0, 95, 0, 0, 1032, 513, 966, 755,
+	932, 970, 1033, 984, 985, 986, 971, 0, 240, 972,
+	973, 247, 974, 0, 931, 814, 816, 815, 881, 882,
+	883, 884, 885, 886, 887, 817, 818, 812, 979, 616,
+	987, 988, 0, 268, 324, 275, 267, 587, 0, 0,
+	2248, 2249, 2250, 0, 603, 0, 0, 231, 0, 0,
+	0, 0, 0, 0, 0, 751, 768, 0, 782, 0,
+	0, 0, 278, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 765,
+	766, 0, 0, 0, 0, 926, 0, 767, 0, 0,
+	775, 989, 990, 991, 992, 993, 994, 995, 996, 997,
+	998, 999, 1000, 1001, 1002, 1003, 1004, 1005, 1006, 1007,
+	1008, 1009, 1010, 1011, 1012, 1013, 1014, 1015, 1016, 1017,
+	1018, 1019, 1020, 1021, 1022, 1023, 1024, 1025, 1026, 1027,
+	1028, 1029, 1030, 777, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 300, 0, 406, 260, 0, 459,
+	925, 0, 0, 636, 0, 0, 923, 0, 0, 0,
+	0, 368, 0, 333, 199, 227, 0, 0, 416, 467,
+	479, 0, 0, 0, 976, 0, 477, 430, 611, 235,
+	287, 464, 437, 475, 445, 290, 0, 0, 476, 375,
+	592, 455, 608, 637, 638, 266, 410, 622, 528, 630,
+	655, 228, 263, 424, 512, 614, 500, 401, 588, 589,
+	332, 499, 298, 203, 372, 643, 226, 485, 374, 244,
+	233, 594, 619, 302, 254, 292, 462, 650, 215, 523,
+	605, 241, 489, 0, 0, 658, 249, 510, 617, 606,
+	217, 601, 509, 397, 329, 330, 216, 0, 463, 271,
+	296, 0, 0, 261, 419, 977, 978, 259, 659, 822,
+	629, 222, 0, 628, 412, 591, 602, 398, 386, 221,
+	600, 396, 385, 337, 830, 831, 283, 310, 907, 906,
+	905, 309, 311, 903, 904, 902, 209, 615, 633, 0,
+	210, 0, 505, 618, 660, 457, 214, 236, 237, 239,
+	0, 282, 286, 294, 297, 306, 307, 316, 370, 423,
+	451, 447, 456, 0, 585, 609, 623, 635, 641, 642,
+	644, 645, 646, 647, 648, 651, 649, 411, 314, 501,
+	336, 376, 0, 0, 429, 478, 242, 613, 502, 913,
+	935, 924, 788, 789, 914, 915, 939, 916, 791, 792,
+	936, 937, 785, 786, 790, 938, 940, 661, 662, 663,
+	664, 665, 666, 667, 668, 669, 670, 671, 672, 673,
+	674, 675, 676, 677, 678, 656, 514, 520, 515, 516,
+	517, 518, 519, 0, 521, 927, 774, 773, 0, 780,
+	781, 0, 810, 811, 813, 819, 820, 821, 832, 879,
+	880, 888, 890, 891, 889, 892, 893, 894, 897, 898,
+	899, 900, 895, 896, 901, 793, 797, 794, 795, 796,
+	808, 798, 799, 800, 801, 802, 803, 804, 805, 806,
+	807, 809, 950, 951, 952, 953, 954, 955, 825, 829,
+	828, 826, 827, 823, 824, 851, 850, 852, 853, 854,
+	855, 856, 857, 859, 858, 860, 861, 862, 863, 864,
+	865, 833, 834, 837, 838, 836, 835, 839, 848, 849,
+	840, 841, 842, 843, 844, 845, 847, 846, 866, 867,
+	868, 869, 870, 872, 871, 875, 876, 874, 873, 878,
+	877, 772, 198, 223, 371, 0, 460, 291, 657, 625,
+	490, 620, 208, 225, 941, 265, 942, 0, 0, 946,
+	0, 0, 0, 948, 947, 0, 949, 911, 910, 0,
+	0, 943, 944, 0, 945, 0, 0, 200, 202, 211,
+	224, 234, 238, 245, 264, 279, 281, 288, 301, 313,
+	321, 322, 325, 331, 383, 390, 391, 392, 393, 413,
+	414, 415, 418, 421, 422, 425, 427, 428, 431, 436,
+	440, 441, 442, 444, 446, 448, 461, 466, 480, 481,
+	482, 483, 484, 487, 488, 494, 495, 496, 497, 498,
+	506, 507, 522, 593, 595, 612, 632, 639, 486, 388,
+	434, 458, 586, 956, 957, 958, 959, 960, 961, 962,
+	963, 303, 607, 640, 604, 652, 634, 443, 381, 0,
+	0, 384, 284, 308, 323, 0, 624, 508, 229, 472,
+	293, 253, 1031, 0, 213, 248, 232, 262, 277, 280,
+	327, 395, 404, 433, 439, 299, 274, 246, 465, 243,
+	491, 525, 526, 527, 529, 399, 269, 438, 400, 0,
+	379, 582, 583, 319, 0, 0, 0, 534, 0, 784,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 420,
+	0, 0, 0, 771, 0, 0, 0, 273, 776, 0,
+	0, 0, 369, 270, 0, 0, 206, 511, 0, 435,
+	0, 205, 0, 493, 255, 380, 377, 590, 285, 276,
+	272, 252, 320, 389, 432, 524, 426, 783, 373, 0,
+	0, 503, 405, 0, 0, 0, 0, 0, 0, 0,
+	0, 778, 779, 0, 0, 0, 0, 0, 0, 2457,
+	0, 326, 250, 328, 204, 417, 504, 289, 0, 95,
+	0, 0, 1032, 513, 966, 755, 932, 970, 1033, 984,
+	985, 986, 971, 0, 240, 972, 973, 247, 974, 0,
+	931, 814, 816, 815, 881, 882, 883, 884, 885, 886,
+	887, 817, 818, 812, 979, 616, 987, 988, 2458, 268,
+	324, 275, 267, 587, 0, 0, 0, 0, 0, 0,
+	603, 0, 0, 231, 0, 0, 0, 0, 0, 0,
+	0, 751, 768, 0, 782, 0, 0, 0, 278, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 765, 766, 0, 0, 0,
+	0, 926, 0, 767, 0, 0, 775, 989, 990, 991,
+	992, 993, 994, 995, 996, 997, 998, 999, 1000, 1001,
+	1002, 1003, 1004, 1005, 1006, 1007, 1008, 1009, 1010, 1011,
+	1012, 1013, 1014, 1015, 1016, 1017, 1018, 1019, 1020, 1021,
+	1022, 1023, 1024, 1025, 1026, 1027, 1028, 1029, 1030, 777,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	300, 0, 406, 260, 0, 459, 925, 0, 0, 636,
+	0, 0, 923, 0, 0, 0, 0, 368, 0, 333,
+	199, 227, 0, 0, 416, 467, 479, 0, 0, 0,
+	976, 0, 477, 430, 611, 235, 287, 464, 437, 475,
+	445, 290, 0, 0, 476, 375, 592, 455, 608, 637,
+	638, 266, 410, 622, 528, 630, 655, 228, 263, 424,
+	512, 614, 500, 401, 588, 589, 332, 499, 298, 203,
+	372, 643, 226, 485, 374, 244, 233, 594, 619, 302,
+	254, 292, 462, 650, 215, 523, 605, 241, 489, 0,
+	0, 658, 249, 510, 617, 606, 217, 601, 509, 397,
+	329, 330, 216, 0, 463, 271, 296, 0, 0, 261,
+	419, 977, 978, 259, 659, 822, 629, 222, 0, 628,
+	412, 591, 602, 398, 386, 221, 600, 396, 385, 337,
+	830, 831, 283, 310, 907, 906, 905, 309, 311, 903,
+	904, 902, 209, 615, 633, 0, 210, 0, 505, 618,
+	660, 457, 214, 236, 237, 239, 0, 282, 286, 294,
+	297, 306, 307, 316, 370, 423, 451, 447, 456, 0,
+	585, 609, 623, 635, 641, 642, 644, 645, 646, 647,
+	648, 651, 649, 411, 314, 501, 336, 376, 0, 0,
+	429, 478, 242, 613, 502, 913, 935, 924, 788, 789,
+	914, 915, 939, 916, 791, 792, 936, 937, 785, 786,
+	790, 938, 940, 661, 662, 663, 664, 665, 666, 667,
+	668, 669, 670, 671, 672, 673, 674, 675, 676, 677,
+	678, 656, 514, 520, 515, 516, 517, 518, 519, 0,
+	521, 927, 774, 773, 0, 780, 781, 0, 810, 811,
+	813, 819, 820, 821, 832, 879, 880, 888, 890, 891,
+	889, 892, 893, 894, 897, 898, 899, 900, 895, 896,
+	901, 793, 797, 794, 795, 796, 808, 798, 799, 800,
+	801, 802, 803, 804, 805, 806, 807, 809, 950, 951,
+	952, 953, 954, 955, 825, 829, 828, 826, 827, 823,
+	824, 851, 850, 852, 853, 854, 855, 856, 857, 859,
+	858, 860, 861, 862, 863, 864, 865, 833, 834, 837,
+	838, 836, 835, 839, 848, 849, 840, 841, 842, 843,
+	844, 845, 847, 846, 866, 867, 868, 869, 870, 872,
+	871, 875, 876, 874, 873, 878, 877, 772, 198, 223,
+	371, 0, 460, 291, 657, 625, 490, 620, 208, 225,
+	941, 265, 942, 0, 0, 946, 0, 0, 0, 948,
+	947, 0, 949, 911, 910, 0, 0, 943, 944, 0,
+	945, 0, 0, 200, 202, 211, 224, 234, 238, 245,
+	264, 279, 281, 288, 301, 313, 321, 322, 325, 331,
+	383, 390, 391, 392, 393, 413, 414, 415, 418, 421,
+	422, 425, 427, 428, 431, 436, 440, 441, 442, 444,
+	446, 448, 461, 466, 480, 481, 482, 483, 484, 487,
+	488, 494, 495, 496, 497, 498, 506, 507, 522, 593,
+	595, 612, 632, 639, 486, 388, 434, 458, 586, 956,
+	957, 958, 959, 960, 961, 962, 963, 303, 607, 640,
+	604, 652, 634, 443, 381, 0, 0, 384, 284, 308,
+	323, 0, 624, 508, 229, 472, 293, 253, 1031, 0,
+	213, 248, 232, 262, 277, 280, 327, 395, 404, 433,
+	439, 299, 274, 246, 465, 243, 491, 525, 526, 527,
+	529, 399, 269, 438, 400, 0, 379, 582, 583, 319,
+	0, 0, 86, 534, 0, 784, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 420, 0, 0, 0, 771,
+	0, 0, 0, 273, 776, 0, 0, 0, 369, 270,
+	0, 0, 206, 511, 0, 435, 0, 205, 0, 493,
+	255, 380, 377, 590, 285, 276, 272, 252, 320, 389,
+	432, 524, 426, 1727, 373, 0, 0, 503, 405, 0,
+	0, 0, 0, 0, 0, 0, 0, 778, 779, 0,
+	0, 0, 0, 0, 0, 0, 0, 326, 250, 328,
+	204, 417, 504, 289, 0, 95, 0, 0, 1032, 513,
+	966, 755, 932, 970, 1033, 984, 985, 986, 971, 0,
+	240, 972, 973, 247, 974, 0, 931, 814, 816, 815,
+	881, 882, 883, 884, 885, 886, 887, 817, 818, 812,
+	979, 616, 987, 988, 0, 268, 324, 275, 267, 587,
+	0, 0, 0, 0, 0, 0, 603, 0, 0, 231,
+	0, 0, 0, 0, 0, 0, 0, 751, 768, 0,
+	782, 0, 0, 0, 278, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 765, 766, 0, 0, 0, 0, 926, 0, 767,
+	0, 0, 775, 989, 990, 991, 992, 993, 994, 995,
+	996, 997, 998, 999, 1000, 1001, 1002, 1003, 1004, 1005,
+	1006, 1007, 1008, 1009, 1010, 1011, 1012, 1013, 1014, 1015,
+	1016, 1017, 1018, 1019, 1020, 1021, 1022, 1023, 1024, 1025,
+	1026, 1027, 1028, 1029, 1030, 777, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 300, 0, 406, 260,
+	0, 459, 925, 0, 0, 636, 0, 0, 923, 0,
+	0, 0, 0, 368, 0, 333, 199, 227, 0, 0,
+	416, 467, 479, 0, 0, 0, 976, 0, 477, 430,
+	611, 235, 287, 464, 437, 475, 445, 290, 0, 0,
+	476, 375, 592, 455, 608, 637, 638, 266, 410, 622,
+	528, 630, 655, 228, 263, 424, 512, 614, 500, 401,
+	588, 589, 332, 499, 298, 203, 372, 643, 226, 485,
+	374, 244, 233, 594, 619, 302, 254, 292, 462, 650,
+	215, 523, 605, 241, 489, 0, 0, 658, 249, 510,
+	617, 606, 217, 601, 509, 397, 329, 330, 216, 0,
+	463, 271, 296, 0, 0, 261, 419, 977, 978, 259,
+	659, 822, 629, 222, 0, 628, 412, 591, 602, 398,
+	386, 221, 600, 396, 385, 337, 830, 831, 283, 310,
+	907, 906, 905, 309, 311, 903, 904, 902, 209, 615,
+	633, 0, 210, 0, 505, 618, 660, 457, 214, 236,
+	237, 239, 0, 282, 286, 294, 297, 306, 307, 316,
+	370, 423, 451, 447, 456, 0, 585, 609, 623, 635,
+	641, 642, 644, 645, 646, 647, 648, 651, 649, 411,
+	314, 501, 336, 376, 0, 0, 429, 478, 242, 613,
+	502, 913, 935, 924, 788, 789, 914, 915, 939, 916,
+	791, 792, 936, 937, 785, 786, 790, 938, 940, 661,
+	662, 663, 664, 665, 666, 667, 668, 669, 670, 671,
+	672, 673, 674, 675, 676, 677, 678, 656, 514, 520,
+	515, 516, 517, 518, 519, 0, 521, 927, 774, 773,
+	0, 780, 781, 0, 810, 811, 813, 819, 820, 821,
+	832, 879, 880, 888, 890, 891, 889, 892, 893, 894,
+	897, 898, 899, 900, 895, 896, 901, 793, 797, 794,
+	795, 796, 808, 798, 799, 800, 801, 802, 803, 804,
+	805, 806, 807, 809, 950, 951, 952, 953, 954, 955,
+	825, 829, 828, 826, 827, 823, 824, 851, 850, 852,
+	853, 854, 855, 856, 857, 859, 858, 860, 861, 862,
+	863, 864, 865, 833, 834, 837, 838, 836, 835, 839,
+	848, 849, 840, 841, 842, 843, 844, 845, 847, 846,
+	866, 867, 868, 869, 870, 872, 871, 875, 876, 874,
+	873, 878, 877, 772, 198, 223, 371, 94, 460, 291,
+	657, 625, 490, 620, 208, 225, 941, 265, 942, 0,
+	0, 946, 0, 0, 0, 948, 947, 0, 949, 911,
+	910, 0, 0, 943, 944, 0, 945, 0, 0, 200,
+	202, 211, 224, 234, 238, 245, 264, 279, 281, 288,
+	301, 313, 321, 322, 325, 331, 383, 390, 391, 392,
+	393, 413, 414, 415, 418, 421, 422, 425, 427, 428,
+	431, 436, 440, 441, 442, 444, 446, 448, 461, 466,
+	480, 481, 482, 483, 484, 487, 488, 494, 495, 496,
+	497, 498, 506, 507, 522, 593, 595, 612, 632, 639,
+	486, 388, 434, 458, 586, 956, 957, 958, 959, 960,
+	961, 962, 963, 303, 607, 640, 604, 652, 634, 443,
+	381, 0, 0, 384, 284, 308, 323, 0, 624, 508,
+	229, 472, 293, 253, 1031, 0, 213, 248, 232, 262,
+	277, 280, 327, 395, 404, 433, 439, 299, 274, 246,
+	465, 243, 491, 525, 526, 527, 529, 399, 269, 438,
+	400, 0, 379, 582, 583, 319, 0, 0, 0, 534,
+	0, 784, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 420, 0, 0, 0, 771, 0, 0, 0, 273,
+	776, 0, 0, 0, 369, 270, 0, 0, 206, 511,
+	0, 435, 0, 205, 0, 493, 255, 380, 377, 590,
+	285, 276, 272, 252, 320, 389, 432, 524, 426, 783,
+	373, 0, 0, 503, 405, 0, 0, 0, 0, 0,
+	0, 0, 0, 778, 779, 0, 0, 0, 0, 0,
+	0, 0, 0, 326, 250, 328, 204, 417, 504, 289,
+	0, 95, 0, 0, 1032, 513, 966, 755, 932, 970,
+	1033, 984, 985, 986, 971, 0, 240, 972, 973, 247,
+	974, 0, 931, 814, 816, 815, 881, 882, 883, 884,
+	885, 886, 887, 817, 818, 812, 979, 616, 987, 988,
+	0, 268, 324, 275, 267, 587, 0, 0, 0, 0,
+	0, 0, 603, 0, 0, 231, 0, 0, 0, 0,
+	0, 0, 0, 751, 768, 0, 782, 0, 0, 0,
+	278, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 765, 766, 0,
+	0, 0, 0, 926, 0, 767, 0, 0, 775, 989,
+	990, 991, 992, 993, 994, 995, 996, 997, 998, 999,
+	1000, 1001, 1002, 1003, 1004, 1005, 1006, 1007, 1008, 1009,
+	1010, 1011, 1012, 1013, 1014, 1015, 1016, 1017, 1018, 1019,
+	1020, 1021, 1022, 1023, 1024, 1025, 1026, 1027, 1028, 1029,
+	1030, 777, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 300, 0, 406, 260, 0, 459, 925, 0,
+	0, 636, 0, 0, 923, 0, 0, 0, 0, 368,
+	0, 333, 199, 227, 0, 0, 416, 467, 479, 0,
+	0, 0, 976, 0, 477, 430, 611, 235, 287, 464,
+	437, 475, 445, 290, 4118, 0, 476, 375, 592, 455,
+	608, 637, 638, 266, 410, 622, 528, 630, 655, 228,
+	263, 424, 512, 614, 500, 401, 588, 589, 332, 499,
+	298, 203, 372, 643, 226, 485, 374, 244, 233, 594,
+	619, 302, 254, 292, 462, 650, 215, 523, 605, 241,
+	489, 0, 0, 658, 249, 510, 617, 606, 217, 601,
+	509, 397, 329, 330, 216, 0, 463, 271, 296, 0,
+	0, 261, 419, 977, 978, 259, 659, 822, 629, 222,
+	0, 628, 412, 591, 602, 398, 386, 221, 600, 396,
+	385, 337, 830, 831, 283, 310, 907, 906, 905, 309,
+	311, 903, 904, 902, 209, 615, 633, 0, 210, 0,
+	505, 618, 660, 457, 214, 236, 237, 239, 0, 282,
+	286, 294, 297, 306, 307, 316, 370, 423, 451, 447,
+	456, 0, 585, 609, 623, 635, 641, 642, 644, 645,
+	646, 647, 648, 651, 649, 411, 314, 501, 336, 376,
+	0, 0, 429, 478, 242, 613, 502, 913, 935, 924,
+	788, 789, 914, 915, 939, 916, 791, 792, 936, 937,
+	785, 786, 790, 938, 940, 661, 662, 663, 664, 665,
+	666, 667, 668, 669, 670, 671, 672, 673, 674, 675,
+	676, 677, 678, 656, 514, 520, 515, 516, 517, 518,
+	519, 0, 521, 927, 774, 773, 0, 780, 781, 0,
+	810, 811, 813, 819, 820, 821, 832, 879, 880, 888,
+	890, 891, 889, 892, 893, 894, 897, 898, 899, 900,
+	895, 896, 901, 793, 797, 794, 795, 796, 808, 798,
+	799, 800, 801, 802, 803, 804, 805, 806, 807, 809,
+	950, 951, 952, 953, 954, 955, 825, 829, 828, 826,
+	827, 823, 824, 851, 850, 852, 853, 854, 855, 856,
+	857, 859, 858, 860, 861, 862, 863, 864, 865, 833,
+	834, 837, 838, 836, 835, 839, 848, 849, 840, 841,
+	842, 843, 844, 845, 847, 846, 866, 867, 868, 869,
+	870, 872, 871, 875, 876, 874, 873, 878, 877, 772,
+	198, 223, 371, 0, 460, 291, 657, 625, 490, 620,
+	208, 225, 941, 265, 942, 0, 0, 946, 0, 0,
+	0, 948, 947, 0, 949, 911, 910, 0, 0, 943,
+	944, 0, 945, 0, 0, 200, 202, 211, 224, 234,
+	238, 245, 264, 279, 281, 288, 301, 313, 321, 322,
+	325, 331, 383, 390, 391, 392, 393, 413, 414, 415,
+	418, 421, 422, 425, 427, 428, 431, 436, 440, 441,
+	442, 444, 446, 448, 461, 466, 480, 481, 482, 483,
+	484, 487, 488, 494, 495, 496, 497, 498, 506, 507,
+	522, 593, 595, 612, 632, 639, 486, 388, 434, 458,
+	586, 956, 957, 958, 959, 960, 961, 962, 963, 303,
+	607, 640, 604, 652, 634, 443, 381, 0, 0, 384,
+	284, 308, 323, 0, 624, 508, 229, 472, 293, 253,
+	1031, 0, 213, 248, 232, 262, 277, 280, 327, 395,
+	404, 433, 439, 299, 274, 246, 465, 243, 491, 525,
+	526, 527, 529, 399, 269, 438, 400, 0, 379, 582,
+	583, 319, 0, 0, 0, 534, 0, 784, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 420, 0, 0,
+	0, 771, 0, 0, 0, 273, 776, 0, 0, 0,
+	369, 270, 0, 0, 206, 511, 0, 435, 0, 205,
+	0, 493, 255, 380, 377, 590, 285, 276, 272, 252,
+	320, 389, 432, 524, 426, 783, 373, 0, 0, 503,
+	405, 0, 0, 0, 0, 0, 0, 0, 0, 778,
+	779, 0, 0, 0, 0, 0, 0, 0, 0, 326,
+	250, 328, 204, 417, 504, 289, 0, 95, 0, 1764,
+	1032, 513, 966, 755, 932, 970, 1033, 984, 985, 986,
+	971, 0, 240, 972, 973, 247, 974, 0, 931, 814,
+	816, 815, 881, 882, 883, 884, 885, 886, 887, 817,
+	818, 812, 979, 616, 987, 988, 0, 268, 324, 275,
+	267, 587, 0, 0, 0, 0, 0, 0, 603, 0,
+	0, 231, 0, 0, 0, 0, 0, 0, 0, 751,
+	768, 0, 782, 0, 0, 0, 278, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 765, 766, 0, 0, 0, 0, 926,
+	0, 767, 0, 0, 775, 989, 990, 991, 992, 993,
+	994, 995, 996, 997, 998, 999, 1000, 1001, 1002, 1003,
+	1004, 1005, 1006, 1007, 1008, 1009, 1010, 1011, 1012, 1013,
+	1014, 1015, 1016, 1017, 1018, 1019, 1020, 1021, 1022, 1023,
+	1024, 1025, 1026, 1027, 1028, 1029, 1030, 777, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 300, 0,
+	406, 260, 0, 459, 925, 0, 0, 636, 0, 0,
+	923, 0, 0, 0, 0, 368, 0, 333, 199, 227,
+	0, 0, 416, 467, 479, 0, 0, 0, 976, 0,
+	477, 430, 611, 235, 287, 464, 437, 475, 445, 290,
+	0, 0, 476, 375, 592, 455, 608, 637, 638, 266,
+	410, 622, 528, 630, 655, 228, 263, 424, 512, 614,
+	500, 401, 588, 589, 332, 499, 298, 203, 372, 643,
+	226, 485, 374, 244, 233, 594, 619, 302, 254, 292,
+	462, 650, 215, 523, 605, 241, 489, 0, 0, 658,
+	249, 510, 617, 606, 217, 601, 509, 397, 329, 330,
+	216, 0, 463, 271, 296, 0, 0, 261, 419, 977,
+	978, 259, 659, 822, 629, 222, 0, 628, 412, 591,
+	602, 398, 386, 221, 600, 396, 385, 337, 830, 831,
+	283, 310, 907, 906, 905, 309, 311, 903, 904, 902,
+	209, 615, 633, 0, 210, 0, 505, 618, 660, 457,
+	214, 236, 237, 239, 0, 282, 286, 294, 297, 306,
+	307, 316, 370, 423, 451, 447, 456, 0, 585, 609,
+	623, 635, 641, 642, 644, 645, 646, 647, 648, 651,
+	649, 411, 314, 501, 336, 376, 0, 0, 429, 478,
+	242, 613, 502, 913, 935, 924, 788, 789, 914, 915,
+	939, 916, 791, 792, 936, 937, 785, 786, 790, 938,
+	940, 661, 662, 663, 664, 665, 666, 667, 668, 669,
+	670, 671, 672, 673, 674, 675, 676, 677, 678, 656,
+	514, 520, 515, 516, 517, 518, 519, 0, 521, 927,
+	774, 773, 0, 780, 781, 0, 810, 811, 813, 819,
+	820, 821, 832, 879, 880, 888, 890, 891, 889, 892,
+	893, 894, 897, 898, 899, 900, 895, 896, 901, 793,
+	797, 794, 795, 796, 808, 798, 799, 800, 801, 802,
+	803, 804, 805, 806, 807, 809, 950, 951, 952, 953,
+	954, 955, 825, 829, 828, 826, 827, 823, 824, 851,
+	850, 852, 853, 854, 855, 856, 857, 859, 858, 860,
+	861, 862, 863, 864, 865, 833, 834, 837, 838, 836,
+	835, 839, 848, 849, 840, 841, 842, 843, 844, 845,
+	847, 846, 866, 867, 868, 869, 870, 872, 871, 875,
+	876, 874, 873, 878, 877, 772, 198, 223, 371, 0,
+	460, 291, 657, 625, 490, 620, 208, 225, 941, 265,
+	942, 0, 0, 946, 0, 0, 0, 948, 947, 0,
+	949, 911, 910, 0, 0, 943, 944, 0, 945, 0,
+	0, 200, 202, 211, 224, 234, 238, 245, 264, 279,
+	281, 288, 301, 313, 321, 322, 325, 331, 383, 390,
+	391, 392, 393, 413, 414, 415, 418, 421, 422, 425,
+	427, 428, 431, 436, 440, 441, 442, 444, 446, 448,
+	461, 466, 480, 481, 482, 483, 484, 487, 488, 494,
+	495, 496, 497, 498, 506, 507, 522, 593, 595, 612,
+	632, 639, 486, 388, 434, 458, 586, 956, 957, 958,
+	959, 960, 961, 962, 963, 303, 607, 640, 604, 652,
+	634, 443, 381, 0, 0, 384, 284, 308, 323, 0,
+	624, 508, 229, 472, 293, 253, 1031, 0, 213, 248,
+	232, 262, 277, 280, 327, 395, 404, 433, 439, 299,
+	274, 246, 465, 243, 491, 525, 526, 527, 529, 399,
+	269, 438, 400, 0, 379, 582, 583, 319, 0, 0,
+	0, 534, 0, 784, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 420, 0, 0, 0, 771, 0, 0,
+	0, 273, 776, 0, 0, 0, 369, 270, 0, 0,
+	206, 511, 0, 435, 0, 205, 0, 493, 255, 380,
+	377, 590, 285, 276, 272, 252, 320, 389, 432, 524,
+	426, 783, 373, 0, 0, 503, 405, 0, 0, 0,
+	0, 0, 0, 0, 0, 778, 779, 0, 0, 0,
+	0, 0, 0, 0, 0, 326, 250, 328, 204, 417,
+	504, 289, 0, 95, 0, 0, 1032, 513, 966, 755,
+	932, 970, 1033, 984, 985, 986, 971, 0, 240, 972,
+	973, 247, 974, 0, 931, 814, 816, 815, 881, 882,
+	883, 884, 885, 886, 887, 817, 818, 812, 979, 616,
+	987, 988, 0, 268, 324, 275, 267, 587, 0, 0,
+	0, 0, 0, 0, 603, 0, 0, 231, 0, 0,
+	0, 0, 0, 0, 0, 751, 768, 0, 782, 0,
+	0, 0, 278, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 765,
+	766, 1079, 0, 0, 0, 926, 0, 767, 0, 0,
+	775, 989, 990, 991, 992, 993, 994, 995, 996, 997,
+	998, 999, 1000, 1001, 1002, 1003, 1004, 1005, 1006, 1007,
+	1008, 1009, 1010, 1011, 1012, 1013, 1014, 1015, 1016, 1017,
+	1018, 1019, 1020, 1021, 1022, 1023, 1024, 1025, 1026, 1027,
+	1028, 1029, 1030, 777, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 300, 0, 406, 260, 0, 459,
+	925, 0, 0, 636, 0, 0, 923, 0, 0, 0,
+	0, 368, 0, 333, 199, 227, 0, 0, 416, 467,
+	479, 0, 0, 0, 976, 0, 477, 430, 611, 235,
+	287, 464, 437, 475, 445, 290, 0, 0, 476, 375,
+	592, 455, 608, 637, 638, 266, 410, 622, 528, 630,
+	655, 228, 263, 424, 512, 614, 500, 401, 588, 589,
+	332, 499, 298, 203, 372, 643, 226, 485, 374, 244,
+	233, 594, 619, 302, 254, 292, 462, 650, 215, 523,
+	605, 241, 489, 0, 0, 658, 249, 510, 617, 606,
+	217, 601, 509, 397, 329, 330, 216, 0, 463, 271,
+	296, 0, 0, 261, 419, 977, 978, 259, 659, 822,
+	629, 222, 0, 628, 412, 591, 602, 398, 386, 221,
+	600, 396, 385, 337, 830, 831, 283, 310, 907, 906,
+	905, 309, 311, 903, 904, 902, 209, 615, 633, 0,
+	210, 0, 505, 618, 660, 457, 214, 236, 237, 239,
+	0, 282, 286, 294, 297, 306, 307, 316, 370, 423,
+	451, 447, 456, 0, 585, 609, 623, 635, 641, 642,
+	644, 645, 646, 647, 648, 651, 649, 411, 314, 501,
+	336, 376, 0, 0, 429, 478, 242, 613, 502, 913,
+	935, 924, 788, 789, 914, 915, 939, 916, 791, 792,
+	936, 937, 785, 786, 790, 938, 940, 661, 662, 663,
+	664, 665, 666, 667, 668, 669, 670, 671, 672, 673,
+	674, 675, 676, 677, 678, 656, 514, 520, 515, 516,
+	517, 518, 519, 0, 521, 927, 774, 773, 0, 780,
+	781, 0, 810, 811, 813, 819, 820, 821, 832, 879,
+	880, 888, 890, 891, 889, 892, 893, 894, 897, 898,
+	899, 900, 895, 896, 901, 793, 797, 794, 795, 796,
+	808, 798, 799, 800, 801, 802, 803, 804, 805, 806,
+	807, 809, 950, 951, 952, 953, 954, 955, 825, 829,
+	828, 826, 827, 823, 824, 851, 850, 852, 853, 854,
+	855, 856, 857, 859, 858, 860, 861, 862, 863, 864,
+	865, 833, 834, 837, 838, 836, 835, 839, 848, 849,
+	840, 841, 842, 843, 844, 845, 847, 846, 866, 867,
+	868, 869, 870, 872, 871, 875, 876, 874, 873, 878,
+	877, 772, 198, 223, 371, 0, 460, 291, 657, 625,
+	490, 620, 208, 225, 941, 265, 942, 0, 0, 946,
+	0, 0, 0, 948, 947, 0, 949, 911, 910, 0,
+	0, 943, 944, 0, 945, 0, 0, 200, 202, 211,
+	224, 234, 238, 245, 264, 279, 281, 288, 301, 313,
+	321, 322, 325, 331, 383, 390, 391, 392, 393, 413,
+	414, 415, 418, 421, 422, 425, 427, 428, 431, 436,
+	440, 441, 442, 444, 446, 448, 461, 466, 480, 481,
+	482, 483, 484, 487, 488, 494, 495, 496, 497, 498,
+	506, 507, 522, 593, 595, 612, 632, 639, 486, 388,
+	434, 458, 586, 956, 957, 958, 959, 960, 961, 962,
+	963, 303, 607, 640, 604, 652, 634, 443, 381, 0,
+	0, 384, 284, 308, 323, 0, 624, 508, 229, 472,
+	293, 253, 1031, 0, 213, 248, 232, 262, 277, 280,
+	327, 395, 404, 433, 439, 299, 274, 246, 465, 243,
+	491, 525, 526, 527, 529, 399, 269, 438, 400, 0,
+	379, 582, 583, 319, 0, 0, 0, 534, 0, 784,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 420,
+	0, 0, 0, 771, 0, 0, 0, 273, 776, 0,
+	0, 0, 369, 270, 0, 0, 206, 511, 0, 435,
+	0, 205, 0, 493, 255, 380, 377, 590, 285, 276,
+	272, 252, 320, 389, 432, 524, 426, 783, 373, 0,
+	0, 503, 405, 0, 0, 0, 0, 0, 0, 0,
+	0, 778, 779, 0, 0, 0, 0, 0, 0, 0,
+	0, 326, 250, 328, 204, 417, 504, 289, 0, 95,
+	0, 0, 1032, 513, 966, 755, 932, 970, 1033, 984,
+	985, 986, 971, 0, 240, 972, 973, 247, 974, 0,
+	931, 814, 816, 815, 881, 882, 883, 884, 885, 886,
+	887, 817, 818, 812, 979, 616, 987, 988, 0, 268,
+	324, 275, 267, 587, 0, 0, 0, 0, 0, 0,
+	603, 0, 0, 231, 0, 0, 0, 0, 0, 0,
+	0, 751, 768, 0, 782, 0, 0, 0, 278, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 765, 766, 0, 0, 0,
+	0, 926, 0, 767, 0, 0, 775, 989, 990, 991,
+	992, 993, 994, 995, 996, 997, 998, 999, 1000, 1001,
+	1002, 1003, 1004, 1005, 1006, 1007, 1008, 1009, 1010, 1011,
+	1012, 1013, 1014, 1015, 1016, 1017, 1018, 1019, 1020, 1021,
+	1022, 1023, 1024, 1025, 1026, 1027, 1028, 1029, 1030, 777,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	300, 0, 406, 260, 0, 459, 925, 0, 0, 636,
+	0, 0, 923, 0, 0, 0, 0, 368, 0, 333,
+	199, 227, 0, 0, 416, 467, 479, 0, 0, 0,
+	976, 0, 477, 430, 611, 235, 287, 464, 437, 475,
+	445, 290, 0, 0, 476, 375, 592, 455, 608, 637,
+	638, 266, 410, 622, 528, 630, 655, 228, 263, 424,
+	512, 614, 500, 401, 588, 589, 332, 499, 298, 203,
+	372, 643, 226, 485, 374, 244, 233, 594, 619, 302,
+	254, 292, 462, 650, 215, 523, 605, 241, 489, 0,
+	0, 658, 249, 510, 617, 606, 217, 601, 509, 397,
+	329, 330, 216, 0, 463, 271, 296, 0, 0, 261,
+	419, 977, 978, 259, 659, 822, 629, 222, 0, 628,
+	412, 591, 602, 398, 386, 221, 600, 396, 385, 337,
+	830, 831, 283, 310, 907, 906, 905, 309, 311, 903,
+	904, 902, 209, 615, 633, 0, 210, 0, 505, 618,
+	660, 457, 214, 236, 237, 239, 0, 282, 286, 294,
+	297, 306, 307, 316, 370, 423, 451, 447, 456, 0,
+	585, 609, 623, 635, 641, 642, 644, 645, 646, 647,
+	648, 651, 649, 411, 314, 501, 336, 376, 0, 0,
+	429, 478, 242, 613, 502, 913, 935, 924, 788, 789,
+	914, 915, 939, 916, 791, 792, 936, 937, 785, 786,
+	790, 938, 940, 661, 662, 663, 664, 665, 666, 667,
+	668, 669, 670, 671, 672, 673, 674, 675, 676, 677,
+	678, 656, 514, 520, 515, 516, 517, 518, 519, 0,
+	521, 927, 774, 773, 0, 780, 781, 0, 810, 811,
+	813, 819, 820, 821, 832, 879, 880, 888, 890, 891,
+	889, 892, 893, 894, 897, 898, 899, 900, 895, 896,
+	901, 793, 797, 794, 795, 796, 808, 798, 799, 800,
+	801, 802, 803, 804, 805, 806, 807, 809, 950, 951,
+	952, 953, 954, 955, 825, 829, 828, 826, 827, 823,
+	824, 851, 850, 852, 853, 854, 855, 856, 857, 859,
+	858, 860, 861, 862, 863, 864, 865, 833, 834, 837,
+	838, 836, 835, 839, 848, 849, 840, 841, 842, 843,
+	844, 845, 847, 846, 866, 867, 868, 869, 870, 872,
+	871, 875, 876, 874, 873, 878, 877, 772, 198, 223,
+	371, 0, 460, 291, 657, 625, 490, 620, 208, 225,
+	941, 265, 942, 0, 0, 946, 0, 0, 0, 948,
+	947, 0, 949, 911, 910, 0, 0, 943, 944, 0,
+	945, 0, 0, 200, 202, 211, 224, 234, 238, 245,
+	264, 279, 281, 288, 301, 313, 321, 322, 325, 331,
+	383, 390, 391, 392, 393, 413, 414, 415, 418, 421,
+	422, 425, 427, 428, 431, 436, 440, 441, 442, 444,
+	446, 448, 461, 466, 480, 481, 482, 483, 484, 487,
+	488, 494, 495, 496, 497, 498, 506, 507, 522, 593,
+	595, 612, 632, 639, 486, 388, 434, 458, 586, 956,
+	957, 958, 959, 960, 961, 962, 963, 303, 607, 640,
+	604, 652, 634, 443, 381, 0, 0, 384, 284, 308,
+	323, 0, 624, 508, 229, 472, 293, 253, 1031, 0,
+	213, 248, 232, 262, 277, 280, 327, 395, 404, 433,
+	439, 299, 274, 246, 465, 243, 491, 525, 526, 527,
+	529, 399, 269, 438, 400, 0, 379, 582, 583, 319,
+	0, 0, 0, 534, 0, 784, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 420, 0, 0, 0, 771,
+	0, 0, 0, 273, 776, 0, 0, 0, 369, 270,
+	0, 0, 206, 511, 0, 435, 0, 205, 0, 493,
+	255, 380, 377, 590, 285, 276, 272, 252, 320, 389,
+	432, 524, 426, 783, 373, 0, 0, 503, 405, 0,
+	0, 0, 0, 0, 0, 0, 0, 778, 779, 0,
+	0, 0, 0, 0, 0, 0, 0, 326, 250, 328,
+	204, 417, 504, 289, 0, 95, 0, 0, 1032, 513,
+	966, 755, 932, 970, 1033, 984, 985, 986, 971, 0,
+	240, 972, 973, 247, 974, 0, 931, 814, 816, 815,
+	881, 882, 883, 884, 885, 886, 887, 817, 818, 812,
+	979, 616, 987, 988, 0, 268, 324, 275, 267, 587,
+	0, 0, 0, 0, 0, 0, 603, 0, 0, 231,
+	0, 0, 0, 0, 0, 0, 0, 751, 768, 0,
+	782, 0, 0, 0, 278, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 765, 766, 0, 0, 0, 0, 926, 0, 767,
+	0, 0, 775, 989, 990, 991, 992, 993, 994, 995,
+	996, 997, 998, 999, 1000, 1001, 1002, 1003, 1004, 1005,
+	1006, 1007, 1008, 1009, 1010, 1011, 1012, 1013, 1014, 1015,
+	1016, 1017, 1018, 1019, 1020, 1021, 1022, 1023, 1024, 1025,
+	1026, 1027, 1028, 1029, 1030, 3193, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 300, 0, 406, 260,
+	0, 459, 925, 0, 0, 636, 0, 0, 923, 0,
+	0, 0, 0, 368, 0, 333, 199, 227, 0, 0,
+	416, 467, 479, 0, 0, 0, 976, 0, 477, 430,
+	611, 235, 287, 464, 437, 475, 445, 290, 0, 0,
+	476, 375, 592, 455, 608, 637, 638, 266, 410, 622,
+	528, 630, 655, 228, 263, 424, 512, 614, 500, 401,
+	588, 589, 332, 499, 298, 203, 372, 643, 226, 485,
+	374, 244, 233, 594, 619, 302, 254, 292, 462, 650,
+	215, 523, 605, 241, 489, 0, 0, 658, 249, 510,
+	617, 606, 217, 601, 509, 397, 329, 330, 216, 0,
+	463, 271, 296, 0, 0, 261, 419, 977, 978, 259,
+	659, 822, 629, 222, 0, 628, 412, 591, 602, 398,
+	386, 221, 600, 396, 385, 337, 830, 831, 283, 310,
+	907, 906, 905, 309, 311, 903, 904, 902, 209, 615,
+	633, 0, 210, 0, 505, 618, 660, 457, 214, 236,
+	237, 239, 0, 282, 286, 294, 297, 306, 307, 316,
+	370, 423, 451, 447, 456, 0, 585, 609, 623, 635,
+	641, 642, 644, 645, 646, 647, 648, 651, 649, 411,
+	314, 501, 336, 376, 0, 0, 429, 478, 242, 613,
+	502, 913, 935, 924, 788, 789, 914, 915, 939, 916,
+	791, 792, 936, 937, 785, 786, 790, 938, 940, 661,
+	662, 663, 664, 665, 666, 667, 668, 669, 670, 671,
+	672, 673, 674, 675, 676, 677, 678, 656, 514, 520,
+	515, 516, 517, 518, 519, 0, 521, 927, 774, 773,
+	0, 780, 781, 0, 810, 811, 813, 819, 820, 821,
+	832, 879, 880, 888, 890, 891, 889, 892, 893, 894,
+	897, 898, 899, 900, 895, 896, 901, 793, 797, 794,
+	795, 796, 808, 798, 799, 800, 801, 802, 803, 804,
+	805, 806, 807, 809, 950, 951, 952, 953, 954, 955,
+	825, 829, 828, 826, 827, 823, 824, 851, 850, 852,
+	853, 854, 855, 856, 857, 859, 858, 860, 861, 862,
+	863, 864, 865, 833, 834, 837, 838, 836, 835, 839,
+	848, 849, 840, 841, 842, 843, 844, 845, 847, 846,
+	866, 867, 868, 869, 870, 872, 871, 875, 876, 874,
+	873, 878, 877, 772, 198, 223, 371, 0, 460, 291,
+	657, 625, 490, 620, 208, 225, 941, 265, 942, 0,
+	0, 946, 0, 0, 0, 948, 947, 0, 949, 911,
+	910, 0, 0, 943, 944, 0, 945, 0, 0, 200,
+	202, 211, 224, 234, 238, 245, 264, 279, 281, 288,
+	301, 313, 321, 322, 325, 331, 383, 390, 391, 392,
+	393, 413, 414, 415, 418, 421, 422, 425, 427, 428,
+	431, 436, 440, 441, 442, 444, 446, 448, 461, 466,
+	480, 481, 482, 483, 484, 487, 488, 494, 495, 496,
+	497, 498, 506, 507, 522, 593, 595, 612, 632, 639,
+	486, 388, 434, 458, 586, 956, 957, 958, 959, 960,
+	961, 962, 963, 303, 607, 640, 604, 652, 634, 443,
+	381, 0, 0, 384, 284, 308, 323, 0, 624, 508,
+	229, 472, 293, 253, 1031, 0, 213, 248, 232, 262,
+	277, 280, 327, 395, 404, 433, 439, 299, 274, 246,
+	465, 243, 491, 525, 526, 527, 529, 399, 269, 438,
+	400, 0, 379, 582, 583, 319, 0, 0, 0, 534,
+	0, 784, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 420, 0, 0, 0, 771, 0, 0, 0, 273,
+	776, 0, 0, 0, 369, 270, 0, 0, 206, 511,
+	0, 435, 0, 205, 0, 493, 255, 380, 377, 590,
+	285, 276, 272, 252, 320, 389, 432, 524, 426, 783,
+	373, 0, 0, 503, 405, 0, 0, 0, 0, 0,
+	0, 0, 0, 778, 779, 0, 0, 0, 0, 0,
+	0, 0, 0, 326, 250, 328, 204, 417, 504, 289,
+	0, 95, 0, 0, 1032, 513, 966, 755, 932, 970,
+	1033, 984, 985, 986, 971, 0, 240, 972, 973, 247,
+	974, 0, 931, 814, 816, 815, 881, 882, 883, 884,
+	885, 886, 887, 817, 818, 812, 979, 616, 987, 988,
+	0, 268, 324, 275, 267, 587, 0, 0, 0, 0,
+	0, 0, 603, 0, 0, 231, 0, 0, 0, 0,
+	0, 0, 0, 751, 768, 0, 782, 0, 0, 0,
+	278, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 765, 766, 0,
+	0, 0, 0, 926, 0, 767, 0, 0, 775, 989,
+	990, 991, 992, 993, 994, 995, 996, 997, 998, 999,
+	1000, 1001, 1002, 1003, 1004, 1005, 1006, 1007, 1008, 1009,
+	1010, 1011, 1012, 1013, 1014, 1015, 1016, 1017, 1018, 1019,
+	1020, 1021, 1022, 1023, 1024, 1025, 1026, 1027, 1028, 1029,
+	1030, 3189, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 300, 0, 406, 260, 0, 459, 925, 0,
+	0, 636, 0, 0, 923, 0, 0, 0, 0, 368,
+	0, 333, 199, 227, 0, 0, 416, 467, 479, 0,
+	0, 0, 976, 0, 477, 430, 611, 235, 287, 464,
+	437, 475, 445, 290, 0, 0, 476, 375, 592, 455,
+	608, 637, 638, 266, 410, 622, 528, 630, 655, 228,
+	263, 424, 512, 614, 500, 401, 588, 589, 332, 499,
+	298, 203, 372, 643, 226, 485, 374, 244, 233, 594,
+	619, 302, 254, 292, 462, 650, 215, 523, 605, 241,
+	489, 0, 0, 658, 249, 510, 617, 606, 217, 601,
+	509, 397, 329, 330, 216, 0, 463, 271, 296, 0,
+	0, 261, 419, 977, 978, 259, 659, 822, 629, 222,
+	0, 628, 412, 591, 602, 398, 386, 221, 600, 396,
+	385, 337, 830, 831, 283, 310, 907, 906, 905, 309,
+	311, 903, 904, 902, 209, 615, 633, 0, 210, 0,
+	505, 618, 660, 457, 214, 236, 237, 239, 0, 282,
+	286, 294, 297, 306, 307, 316, 370, 423, 451, 447,
+	456, 0, 585, 609, 623, 635, 641, 642, 644, 645,
+	646, 647, 648, 651, 649, 411, 314, 501, 336, 376,
+	0, 0, 429, 478, 242, 613, 502, 913, 935, 924,
+	788, 789, 914, 915, 939, 916, 791, 792, 936, 937,
+	785, 786, 790, 938, 940, 661, 662, 663, 664, 665,
+	666, 667, 668, 669, 670, 671, 672, 673, 674, 675,
+	676, 677, 678, 656, 514, 520, 515, 516, 517, 518,
+	519, 0, 521, 927, 774, 773, 0, 780, 781, 0,
+	810, 811, 813, 819, 820, 821, 832, 879, 880, 888,
+	890, 891, 889, 892, 893, 894, 897, 898, 899, 900,
+	895, 896, 901, 793, 797, 794, 795, 796, 808, 798,
+	799, 800, 801, 802, 803, 804, 805, 806, 807, 809,
+	950, 951, 952, 953, 954, 955, 825, 829, 828, 826,
+	827, 823, 824, 851, 850, 852, 853, 854, 855, 856,
+	857, 859, 858, 860, 861, 862, 863, 864, 865, 833,
+	834, 837, 838, 836, 835, 839, 848, 849, 840, 841,
+	842, 843, 844, 845, 847, 846, 866, 867, 868, 869,
+	870, 872, 871, 875, 876, 874, 873, 878, 877, 772,
+	198, 223, 371, 0, 460, 291, 657, 625, 490, 620,
+	208, 225, 941, 265, 942, 0, 0, 946, 0, 0,
+	0, 948, 947, 0, 949, 911, 910, 0, 0, 943,
+	944, 0, 945, 0, 0, 200, 202, 211, 224, 234,
+	238, 245, 264, 279, 281, 288, 301, 313, 321, 322,
+	325, 331, 383, 390, 391, 392, 393, 413, 414, 415,
+	418, 421, 422, 425, 427, 428, 431, 436, 440, 441,
+	442, 444, 446, 448, 461, 466, 480, 481, 482, 483,
+	484, 487, 488, 494, 495, 496, 497, 498, 506, 507,
+	522, 593, 595, 612, 632, 639, 486, 388, 434, 458,
+	586, 956, 957, 958, 959, 960, 961, 962, 963, 303,
+	607, 640, 604, 652, 634, 443, 381, 0, 0, 384,
+	284, 308, 323, 0, 624, 508, 229, 472, 293, 253,
+	1031, 0, 213, 248, 232, 262, 277, 280, 327, 395,
+	404, 433, 439, 299, 274, 246, 465, 243, 491, 525,
+	526, 527, 529, 399, 269, 438, 400, 0, 379, 582,
+	583, 319, 0, 0, 0, 534, 0, 784, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 420, 0, 0,
+	0, 771, 0, 0, 0, 273, 776, 0, 0, 0,
+	369, 270, 0, 0, 206, 511, 0, 435, 0, 205,
+	0, 493, 255, 380, 377, 590, 285, 276, 272, 252,
+	320, 389, 432, 524, 426, 783, 373, 0, 0, 503,
+	405, 0, 0, 0, 0, 0, 0, 0, 0, 778,
+	779, 0, 0, 0, 0, 0, 0, 0, 0, 326,
+	250, 328, 204, 417, 504, 289, 0, 95, 0, 0,
+	1032, 513, 966, 1100, 932, 970, 1033, 984, 985, 986,
+	971, 0, 240, 972, 973, 247, 974, 0, 931, 814,
+	816, 815, 881, 882, 883, 884, 885, 886, 887, 817,
+	818, 812, 979, 616, 987, 988, 0, 268, 324, 275,
+	267, 587, 0, 0, 0, 0, 0, 0, 603, 0,
+	0, 231, 0, 0, 0, 0, 0, 0, 0, 0,
+	768, 0, 782, 0, 0, 0, 278, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 765, 766, 0, 0, 0, 0, 926,
+	0, 767, 0, 0, 775, 989, 990, 991, 992, 993,
+	994, 995, 996, 997, 998, 999, 1000, 1001, 1002, 1003,
+	1004, 1005, 1006, 1007, 1008, 1009, 1010, 1011, 1012, 1013,
+	1014, 1015, 1016, 1017, 1018, 1019, 1020, 1021, 1022, 1023,
+	1024, 1025, 1026, 1027, 1028, 1029, 1030, 777, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 300, 0,
+	406, 260, 0, 459, 925, 0, 0, 636, 0, 0,
+	923, 0, 0, 0, 0, 368, 0, 333, 199, 227,
+	0, 0, 416, 467, 479, 0, 0, 0, 976, 0,
+	477, 430, 611, 235, 287, 464, 437, 475, 445, 290,
+	0, 0, 476, 375, 592, 455, 608, 637, 638, 266,
+	410, 622, 528, 630, 655, 228, 263, 424, 512, 614,
+	500, 401, 588, 589, 332, 499, 298, 203, 372, 643,
+	226, 485, 374, 244, 233, 594, 619, 302, 254, 292,
+	462, 650, 215, 523, 605, 241, 489, 0, 0, 658,
+	249, 510, 617, 606, 217, 601, 509, 397, 329, 330,
+	216, 0, 463, 271, 296, 0, 0, 261, 419, 977,
+	978, 259, 659, 822, 629, 222, 0, 628, 412, 591,
+	602, 398, 386, 221, 600, 396, 385, 337, 830, 831,
+	283, 310, 907, 906, 905, 309, 311, 903, 904, 902,
+	209, 615, 633, 0, 210, 0, 505, 618, 660, 457,
+	214, 236, 237, 239, 0, 282, 286, 294, 297, 306,
+	307, 316, 370, 423, 451, 447, 456, 0, 585, 609,
+	623, 635, 641, 642, 644, 645, 646, 647, 648, 651,
+	649, 411, 314, 501, 336, 376, 0, 0, 429, 478,
+	242, 613, 502, 913, 935, 924, 788, 789, 914, 915,
+	939, 916, 791, 792, 936, 937, 785, 786, 790, 938,
+	940, 661, 662, 663, 664, 665, 666, 667, 668, 669,
+	670, 671, 672, 673, 674, 675, 676, 677, 678, 656,
+	514, 520, 515, 516, 517, 518, 519, 0, 521, 927,
+	774, 773, 0, 780, 781, 0, 810, 811, 813, 819,
+	820, 821, 832, 879, 880, 888, 890, 891, 889, 892,
+	893, 894, 897, 898, 899, 900, 895, 896, 901, 793,
+	797, 794, 795, 796, 808, 798, 799, 800, 801, 802,
+	803, 804, 805, 806, 807, 809, 950, 951, 952, 953,
+	954, 955, 825, 829, 828, 826, 827, 823, 824, 851,
+	850, 852, 853, 854, 855, 856, 857, 859, 858, 860,
+	861, 862, 863, 864, 865, 833, 834, 837, 838, 836,
+	835, 839, 848, 849, 840, 841, 842, 843, 844, 845,
+	847, 846, 866, 867, 868, 869, 870, 872, 871, 875,
+	876, 874, 873, 878, 877, 772, 198, 223, 371, 0,
+	460, 291, 657, 625, 490, 620, 208, 225, 941, 265,
+	942, 0, 0, 946, 0, 0, 0, 948, 947, 0,
+	949, 911, 910, 0, 0, 943, 944, 0, 945, 0,
+	0, 200, 202, 211, 224, 234, 238, 245, 264, 279,
+	281, 288, 301, 313, 321, 322, 325, 331, 383, 390,
+	391, 392, 393, 413, 414, 415, 418, 421, 422, 425,
+	427, 428, 431, 436, 440, 441, 442, 444, 446, 448,
+	461, 466, 480, 481, 482, 483, 484, 487, 488, 494,
+	495, 496, 497, 498, 506, 507, 522, 593, 595, 612,
+	632, 639, 486, 388, 434, 458, 586, 956, 957, 958,
+	959, 960, 961, 962, 963, 303, 607, 640, 604, 652,
+	634, 443, 381, 0, 0, 384, 284, 308, 323, 0,
+	624, 508, 229, 472, 293, 253, 1031, 0, 213, 248,
+	232, 262, 277, 280, 327, 395, 404, 433, 439, 299,
+	274, 246, 465, 243, 491, 525, 526, 527, 529, 399,
+	269, 438, 400, 0, 379, 582, 583, 319, 0, 0,
+	0, 534, 0, 784, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 420, 0, 0, 0, 771, 0, 0,
+	0, 273, 776, 0, 0, 0, 369, 270, 0, 0,
+	206, 511, 0, 435, 0, 205, 0, 493, 255, 380,
+	377, 590, 285, 276, 272, 252, 320, 389, 432, 524,
+	426, 783, 373, 0, 0, 503, 405, 0, 0, 0,
+	0, 0, 0, 0, 0, 778, 779, 0, 0, 0,
+	0, 0, 0, 0, 0, 326, 250, 328, 204, 417,
+	504, 289, 0, 95, 0, 0, 1032, 513, 966, 1100,
+	932, 970, 1033, 984, 985, 986, 971, 0, 240, 972,
+	973, 247, 974, 0, 931, 814, 816, 815, 881, 882,
+	883, 884, 885, 886, 887, 817, 818, 812, 979, 616,
+	987, 988, 0, 268, 324, 275, 267, 587, 0, 0,
+	0, 0, 0, 0, 603, 0, 0, 231, 0, 0,
+	0, 0, 0, 0, 0, 0, 768, 0, 782, 0,
+	0, 0, 278, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 765,
+	766, 0, 0, 0, 0, 926, 0, 767, 0, 0,
+	775, 989, 990, 991, 992, 993, 994, 995, 996, 997,
+	998, 999, 1000, 1001, 1002, 1003, 1004, 1005, 1006, 1007,
+	1008, 1009, 1010, 1011, 1012, 1013, 1014, 1015, 1016, 1017,
+	1018, 1019, 1020, 1021, 1022, 1023, 1024, 1025, 1026, 1027,
+	1028, 1029, 1030, 2139, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 300, 0, 406, 260, 0, 459,
+	925, 0, 0, 636, 0, 0, 923, 0, 0, 0,
+	0, 368, 0, 333, 199, 227, 0, 0, 416, 467,
+	479, 0, 0, 0, 976, 0, 477, 430, 611, 235,
+	287, 464, 437, 475, 445, 290, 0, 0, 476, 375,
+	592, 455, 608, 637, 638, 266, 410, 622, 528, 630,
+	655, 228, 263, 424, 512, 614, 500, 401, 588, 589,
+	332, 499, 298, 203, 372, 643, 226, 485, 374, 244,
+	233, 594, 619, 302, 254, 292, 462, 650, 215, 523,
+	605, 241, 489, 0, 0, 658, 249, 510, 617, 606,
+	217, 601, 509, 397, 329, 330, 216, 0, 463, 271,
+	296, 0, 0, 261, 419, 977, 978, 259, 659, 822,
+	629, 222, 0, 628, 412, 591, 602, 398, 386, 221,
+	600, 396, 385, 337, 830, 831, 283, 310, 907, 906,
+	905, 309, 311, 903, 904, 902, 209, 615, 633, 0,
+	210, 0, 505, 618, 660, 457, 214, 236, 237, 239,
+	0, 282, 286, 294, 297, 306, 307, 316, 370, 423,
+	451, 447, 456, 0, 585, 609, 623, 635, 641, 642,
+	644, 645, 646, 647, 648, 651, 649, 411, 314, 501,
+	336, 376, 0, 0, 429, 478, 242, 613, 502, 913,
+	935, 924, 788, 789, 914, 915, 939, 916, 791, 792,
+	936, 937, 785, 786, 790, 938, 940, 661, 662, 663,
+	664, 665, 666, 667, 668, 669, 670, 671, 672, 673,
+	674, 675, 676, 677, 678, 656, 514, 520, 515, 516,
+	517, 518, 519, 0, 521, 927, 774, 773, 0, 780,
+	781, 0, 810, 811, 813, 819, 820, 821, 832, 879,
+	880, 888, 890, 891, 889, 892, 893, 894, 897, 898,
+	899, 900, 895, 896, 901, 793, 797, 794, 795, 796,
+	808, 798, 799, 800, 801, 802, 803, 804, 805, 806,
+	807, 809, 950, 951, 952, 953, 954, 955, 825, 829,
+	828, 826, 827, 823, 824, 851, 850, 852, 853, 854,
+	855, 856, 857, 859, 858, 860, 861, 862, 863, 864,
+	865, 833, 834, 837, 838, 836, 835, 839, 848, 849,
+	840, 841, 842, 843, 844, 845, 847, 846, 866, 867,
+	868, 869, 870, 872, 871, 875, 876, 874, 873, 878,
+	877, 772, 198, 223, 371, 0, 460, 291, 657, 625,
+	490, 620, 208, 225, 941, 265, 942, 0, 0, 946,
+	0, 0, 0, 948, 947, 0, 949, 911, 910, 0,
+	0, 943, 944, 0, 945, 0, 0, 200, 202, 211,
+	224, 234, 238, 245, 264, 279, 281, 288, 301, 313,
+	321, 322, 325, 331, 383, 390, 391, 392, 393, 413,
+	414, 415, 418, 421, 422, 425, 427, 428, 431, 436,
+	440, 441, 442, 444, 446, 448, 461, 466, 480, 481,
+	482, 483, 484, 487, 488, 494, 495, 496, 497, 498,
+	506, 507, 522, 593, 595, 612, 632, 639, 486, 388,
+	434, 458, 586, 956, 957, 958, 959, 960, 961, 962,
+	963, 303, 607, 640, 604, 652, 634, 443, 381, 0,
+	0, 384, 284, 308, 323, 0, 624, 508, 229, 472,
+	293, 253, 1031, 0, 213, 248, 232, 262, 277, 280,
+	327, 395, 404, 433, 439, 299, 274, 246, 465, 243,
+	491, 525, 526, 527, 529, 399, 269, 438, 400, 0,
+	379, 582, 583, 319, 0, 0, 0, 534, 0, 784,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 420,
+	0, 0, 0, 771, 0, 0, 0, 273, 776, 0,
+	0, 0, 369, 270, 0, 0, 206, 511, 0, 435,
+	0, 205, 0, 493, 255, 380, 377, 590, 285, 276,
+	272, 252, 320, 389, 432, 524, 426, 783, 373, 0,
+	0, 503, 405, 0, 0, 0, 0, 0, 0, 0,
+	0, 778, 779, 0, 0, 0, 0, 0, 0, 0,
+	0, 326, 250, 328, 204, 417, 504, 289, 0, 95,
+	0, 0, 1032, 513, 966, 1100, 932, 970, 1033, 984,
+	985, 986, 971, 0, 240, 972, 973, 247, 974, 0,
+	931, 814, 816, 815, 881, 882, 883, 884, 885, 886,
+	887, 817, 818, 812, 979, 616, 987, 988, 0, 268,
+	324, 275, 267, 587, 0, 0, 0, 0, 0, 0,
+	603, 0, 0, 231, 0, 0, 0, 0, 0, 0,
+	0, 0, 768, 0, 782, 0, 0, 0, 278, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 765, 766, 0, 0, 0,
+	0, 926, 0, 767, 0, 0, 775, 989, 990, 991,
+	992, 993, 994, 995, 996, 997, 998, 999, 1000, 1001,
+	1002, 1003, 1004, 1005, 1006, 1007, 1008, 1009, 1010, 1011,
+	1012, 1013, 1014, 1015, 1016, 1017, 1018, 1019, 1020, 1021,
+	1022, 1023, 1024, 1025, 1026, 1027, 1028, 1029, 1030, 2137,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	300, 0, 406, 260, 0, 459, 925, 0, 0, 636,
+	0, 0, 923, 0, 0, 0, 0, 368, 0, 333,
+	199, 227, 0, 0, 416, 467, 479, 0, 0, 0,
+	976, 0, 477, 430, 611, 235, 287, 464, 437, 475,
+	445, 290, 0, 0, 476, 375, 592, 455, 608, 637,
+	638, 266, 410, 622, 528, 630, 655, 228, 263, 424,
+	512, 614, 500, 401, 588, 589, 332, 499, 298, 203,
+	372, 643, 226, 485, 374, 244, 233, 594, 619, 302,
+	254, 292, 462, 650, 215, 523, 605, 241, 489, 0,
+	0, 658, 249, 510, 617, 606, 217, 601, 509, 397,
+	329, 330, 216, 0, 463, 271, 296, 0, 0, 261,
+	419, 977, 978, 259, 659, 822, 629, 222, 0, 628,
+	412, 591, 602, 398, 386, 221, 600, 396, 385, 337,
+	830, 831, 283, 310, 907, 906, 905, 309, 311, 903,
+	904, 902, 209, 615, 633, 0, 210, 0, 505, 618,
+	660, 457, 214, 236, 237, 239, 0, 282, 286, 294,
+	297, 306, 307, 316, 370, 423, 451, 447, 456, 0,
+	585, 609, 623, 635, 641, 642, 644, 645, 646, 647,
+	648, 651, 649, 411, 314, 501, 336, 376, 0, 0,
+	429, 478, 242, 613, 502, 913, 935, 924, 788, 789,
+	914, 915, 939, 916, 791, 792, 936, 937, 785, 786,
+	790, 938, 940, 661, 662, 663, 664, 665, 666, 667,
+	668, 669, 670, 671, 672, 673, 674, 675, 676, 677,
+	678, 656, 514, 520, 515, 516, 517, 518, 519, 0,
+	521, 927, 774, 773, 0, 780, 781, 0, 810, 811,
+	813, 819, 820, 821, 832, 879, 880, 888, 890, 891,
+	889, 892, 893, 894, 897, 898, 899, 900, 895, 896,
+	901, 793, 797, 794, 795, 796, 808, 798, 799, 800,
+	801, 802, 803, 804, 805, 806, 807, 809, 950, 951,
+	952, 953, 954, 955, 825, 829, 828, 826, 827, 823,
+	824, 851, 850, 852, 853, 854, 855, 856, 857, 859,
+	858, 860, 861, 862, 863, 864, 865, 833, 834, 837,
+	838, 836, 835, 839, 848, 849, 840, 841, 842, 843,
+	844, 845, 847, 846, 866, 867, 868, 869, 870, 872,
+	871, 875, 876, 874, 873, 878, 877, 772, 198, 223,
+	371, 0, 460, 291, 657, 625, 490, 620, 208, 225,
+	941, 265, 942, 0, 0, 946, 0, 0, 0, 948,
+	947, 0, 949, 911, 910, 0, 0, 943, 944, 0,
+	945, 0, 0, 200, 202, 211, 224, 234, 238, 245,
+	264, 279, 281, 288, 301, 313, 321, 322, 325, 331,
+	383, 390, 391, 392, 393, 413, 414, 415, 418, 421,
+	422, 425, 427, 428, 431, 436, 440, 441, 442, 444,
+	446, 448, 461, 466, 480, 481, 482, 483, 484, 487,
+	488, 494, 495, 496, 497, 498, 506, 507, 522, 593,
+	595, 612, 632, 639, 486, 388, 434, 458, 586, 956,
+	957, 958, 959, 960, 961, 962, 963, 303, 607, 640,
+	604, 652, 634, 443, 381, 0, 0, 384, 284, 308,
+	323, 0, 624, 508, 229, 472, 293, 253, 1031, 0,
+	213, 248, 232, 262, 277, 280, 327, 395, 404, 433,
+	439, 299, 274, 246, 465, 243, 491, 525, 526, 527,
+	529, 399, 269, 438, 400, 0, 379, 582, 583, 319,
+	0, 0, 0, 534, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 420, 0, 0, 0, 0,
+	0, 0, 0, 273, 0, 0, 0, 0, 369, 270,
+	0, 0, 206, 511, 0, 435, 0, 205, 0, 493,
+	255, 380, 377, 590, 285, 276, 272, 252, 320, 389,
+	432, 524, 426, 0, 373, 0, 0, 503, 405, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 326, 250, 328,
+	204, 417, 504, 289, 0, 0, 0, 0, 0, 513,
+	731, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	240, 0, 0, 247, 0, 0, 0, 354, 363, 362,
+	342, 343, 345, 347, 353, 360, 366, 339, 348, 0,
+	0, 616, 0, 0, 0, 268, 324, 275, 267, 587,
+	0, 0, 0, 0, 0, 0, 603, 0, 0, 231,
+	0, 1151, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 278, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 300, 0, 406, 260,
+	0, 459, 0, 0, 1150, 636, 0, 0, 0, 0,
+	0, 1147, 1148, 368, 1108, 333, 199, 227, 1141, 1145,
+	416, 467, 479, 0, 0, 0, 256, 0, 477, 430,
+	611, 235, 287, 464, 437, 475, 445, 290, 0, 0,
+	476, 375, 592, 455, 608, 637, 638, 266, 410, 622,
+	528, 630, 655, 228, 263, 424, 512, 614, 500, 401,
+	588, 589, 332, 499, 298, 203, 372, 643, 226, 485,
+	374, 244, 233, 594, 619, 302, 254, 292, 462, 650,
+	215, 523, 605, 241, 489, 0, 0, 658, 249, 510,
+	617, 606, 217, 601, 509, 397, 329, 330, 216, 0,
+	463, 271, 296, 0, 0, 261, 419, 596, 597, 259,
+	659, 230, 629, 222, 0, 628, 412, 591, 602, 398,
+	386, 221, 600, 396, 385, 337, 358, 359, 283, 310,
+	452, 378, 453, 309, 311, 408, 407, 409, 209, 615,
+	633, 0, 210, 0, 505, 618, 660, 457, 214, 236,
+	237, 239, 0, 282, 286, 294, 297, 306, 307, 316,
+	370, 423, 451, 447, 456, 0, 585, 609, 623, 635,
+	641, 642, 644, 645, 646, 647, 648, 651, 649, 411,
+	314, 501, 336, 376, 0, 0, 429, 478, 242, 613,
+	502, 201, 0, 0, 0, 0, 257, 258, 0, 581,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 661,
+	662, 663, 664, 665, 666, 667, 668, 669, 670, 671,
+	672, 673, 674, 675, 676, 677, 678, 656, 514, 520,
+	515, 516, 517, 518, 519, 0, 521, 0, 0, 0,
+	0, 0, 402, 0, 598, 599, 679, 387, 492, 610,
+	338, 352, 355, 344, 364, 0, 365, 340, 341, 346,
+	349, 350, 351, 356, 357, 361, 367, 251, 212, 394,
+	403, 584, 315, 218, 219, 220, 530, 531, 532, 533,
+	626, 627, 631, 207, 468, 469, 470, 471, 295, 621,
+	312, 474, 473, 334, 335, 382, 454, 546, 548, 559,
+	563, 565, 567, 573, 576, 547, 549, 560, 564, 566,
+	568, 574, 577, 536, 538, 540, 542, 555, 554, 551,
+	579, 580, 557, 562, 541, 553, 558, 571, 578, 575,
+	535, 539, 543, 552, 570, 569, 550, 561, 572, 556,
+	544, 537, 545, 0, 198, 223, 371, 0, 460, 291,
+	657, 625, 490, 620, 208, 225, 0, 265, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 200,
+	202, 211, 224, 234, 238, 245, 264, 279, 281, 288,
+	301, 313, 321, 322, 325, 331, 383, 390, 391, 392,
+	393, 413, 414, 415, 418, 421, 422, 425, 427, 428,
+	431, 436, 440, 441, 442, 444, 446, 448, 461, 466,
+	480, 481, 482, 483, 484, 487, 488, 494, 495, 496,
+	497, 498, 506, 507, 522, 593, 595, 612, 632, 639,
+	486, 388, 434, 458, 586, 304, 305, 449, 450, 317,
+	318, 653, 654, 303, 607, 640, 604, 652, 634, 443,
+	381, 0, 0, 384, 284, 308, 323, 0, 624, 508,
+	229, 472, 293, 253, 0, 0, 213, 248, 232, 262,
+	277, 280, 327, 395, 404, 433, 439, 299, 274, 246,
+	465, 243, 491, 525, 526, 527, 529, 399, 269, 438,
+	400, 0, 379, 582, 583, 319, 0, 0, 86, 534,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 420, 0, 0, 0, 0, 0, 0, 0, 273,
+	0, 0, 0, 0, 369, 270, 0, 0, 206, 511,
+	0, 435, 0, 205, 0, 493, 255, 380, 377, 590,
+	285, 276, 272, 252, 320, 389, 432, 524, 426, 97,
+	373, 0, 0, 503, 405, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 326, 250, 328, 204, 417, 504, 289,
+	0, 95, 0, 0, 0, 513, 196, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 240, 0, 0, 247,
+	0, 0, 0, 354, 363, 362, 342, 343, 345, 347,
+	353, 360, 366, 339, 348, 0, 0, 616, 0, 0,
+	0, 268, 324, 275, 267, 587, 0, 0, 0, 0,
+	0, 0, 603, 0, 0, 231, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	278, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 300, 0, 406, 260, 0, 459, 0, 0,
+	0, 636, 0, 0, 0, 0, 0, 0, 0, 368,
+	0, 333, 199, 227, 0, 0, 416, 467, 479, 0,
+	0, 0, 256, 0, 477, 430, 611, 235, 287, 464,
+	437, 475, 445, 290, 0, 0, 476, 375, 592, 455,
+	608, 637, 638, 266, 410, 622, 528, 630, 655, 228,
+	263, 424, 512, 614, 500, 401, 588, 589, 332, 499,
+	298, 203, 372, 643, 226, 485, 374, 244, 233, 594,
+	619, 302, 254, 292, 462, 650, 215, 523, 605, 241,
+	489, 0, 0, 658, 249, 510, 617, 606, 217, 601,
+	509, 397, 329, 330, 216, 0, 463, 271, 296, 0,
+	0, 261, 419, 596, 597, 259, 659, 230, 629, 222,
+	0, 628, 412, 591, 602, 398, 386, 221, 600, 396,
+	385, 337, 358, 359, 283, 310, 452, 378, 453, 309,
+	311, 408, 407, 409, 209, 615, 633, 0, 210, 0,
+	505, 618, 660, 457, 214, 236, 237, 239, 0, 282,
+	286, 294, 297, 306, 307, 316, 370, 423, 451, 447,
+	456, 0, 585, 609, 623, 635, 641, 642, 644, 645,
+	646, 647, 648, 651, 649, 411, 314, 501, 336, 376,
+	0, 0, 429, 478, 242, 613, 502, 201, 0, 0,
+	0, 0, 257, 258, 0, 581, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 661, 662, 663, 664, 665,
+	666, 667, 668, 669, 670, 671, 672, 673, 674, 675,
+	676, 677, 678, 656, 514, 520, 515, 516, 517, 518,
+	519, 0, 521, 0, 0, 0, 0, 0, 402, 0,
+	598, 599, 679, 387, 492, 610, 338, 352, 355, 344,
+	364, 0, 365, 340, 341, 346, 349, 350, 351, 356,
+	357, 361, 367, 251, 212, 394, 403, 584, 315, 218,
+	219, 220, 530, 531, 532, 533, 626, 627, 631, 207,
+	468, 469, 470, 471, 295, 621, 312, 474, 473, 334,
+	335, 382, 454, 546, 548, 559, 563, 565, 567, 573,
+	576, 547, 549, 560, 564, 566, 568, 574, 577, 536,
+	538, 540, 542, 555, 554, 551, 579, 580, 557, 562,
+	541, 553, 558, 571, 578, 575, 535, 539, 543, 552,
+	570, 569, 550, 561, 572, 556, 544, 537, 545, 0,
+	198, 223, 371, 94, 460, 291, 657, 625, 490, 620,
+	208, 225, 0, 265, 0, 0, 0, 0, 0, 0,
+	2444, 0, 0, 2443, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 200, 202, 211, 224, 234,
+	238, 245, 264, 279, 281, 288, 301, 313, 321, 322,
+	325, 331, 383, 390, 391, 392, 393, 413, 414, 415,
+	418, 421, 422, 425, 427, 428, 431, 436, 440, 441,
+	442, 444, 446, 448, 461, 466, 480, 481, 482, 483,
+	484, 487, 488, 494, 495, 496, 497, 498, 506, 507,
+	522, 593, 595, 612, 632, 639, 486, 388, 434, 458,
+	586, 304, 305, 449, 450, 317, 318, 653, 654, 303,
+	607, 640, 604, 652, 634, 443, 381, 0, 0, 384,
+	284, 308, 323, 0, 624, 508, 229, 472, 293, 253,
+	0, 0, 213, 248, 232, 262, 277, 280, 327, 395,
+	404, 433, 439, 299, 274, 246, 465, 243, 491, 525,
+	526, 527, 529, 399, 269, 438, 400, 0, 379, 582,
+	583, 319, 0, 0, 86, 534, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 420, 0, 0,
+	0, 0, 0, 0, 0, 273, 0, 0, 0, 0,
+	369, 270, 0, 0, 206, 511, 0, 435, 0, 205,
+	0, 493, 255, 380, 377, 590, 285, 276, 272, 252,
+	320, 389, 432, 524, 426, 97, 373, 0, 0, 503,
+	405, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 326,
+	250, 328, 204, 417, 504, 289, 0, 95, 0, 1764,
+	0, 513, 731, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 240, 0, 0, 247, 0, 0, 0, 354,
+	363, 362, 342, 343, 345, 347, 353, 360, 366, 339,
+	348, 0, 0, 616, 0, 0, 0, 268, 324, 275,
+	267, 587, 0, 0, 0, 0, 0, 0, 603, 0,
+	0, 231, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 278, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 300, 0,
+	406, 260, 0, 459, 0, 0, 0, 636, 0, 0,
+	0, 0, 0, 0, 0, 368, 0, 333, 199, 227,
+	0, 0, 416, 467, 479, 0, 0, 0, 256, 0,
+	477, 430, 611, 235, 287, 464, 437, 475, 445, 290,
+	0, 0, 476, 375, 592, 455, 608, 637, 638, 266,
+	410, 622, 528, 630, 655, 228, 263, 424, 512, 614,
+	500, 401, 588, 589, 332, 499, 298, 203, 372, 643,
+	226, 485, 374, 244, 233, 594, 619, 302, 254, 292,
+	462, 650, 215, 523, 605, 241, 489, 0, 0, 658,
+	249, 510, 617, 606, 217, 601, 509, 397, 329, 330,
+	216, 0, 463, 271, 296, 0, 0, 261, 419, 596,
+	597, 259, 659, 230, 629, 222, 0, 628, 412, 591,
+	602, 398, 386, 221, 600, 396, 385, 337, 358, 359,
+	283, 310, 452, 378, 453, 309, 311, 408, 407, 409,
+	209, 615, 633, 0, 210, 0, 505, 618, 660, 457,
+	214, 236, 237, 239, 0, 282, 286, 294, 297, 306,
+	307, 316, 370, 423, 451, 447, 456, 0, 585, 609,
+	623, 635, 641, 642, 644, 645, 646, 647, 648, 651,
+	649, 411, 314, 501, 336, 376, 0, 0, 429, 478,
+	242, 613, 502, 201, 0, 0, 0, 0, 257, 258,
+	0, 581, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 661, 662, 663, 664, 665, 666, 667, 668, 669,
+	670, 671, 672, 673, 674, 675, 676, 677, 678, 656,
+	514, 520, 515, 516, 517, 518, 519, 0, 521, 0,
+	0, 0, 0, 0, 402, 0, 598, 599, 679, 387,
+	492, 610, 338, 352, 355, 344, 364, 0, 365, 340,
+	341, 346, 349, 350, 351, 356, 357, 361, 367, 251,
+	212, 394, 403, 584, 315, 218, 219, 220, 530, 531,
+	532, 533, 626, 627, 631, 207, 468, 469, 470, 471,
+	295, 621, 312, 474, 473, 334, 335, 382, 454, 546,
+	548, 559, 563, 565, 567, 573, 576, 547, 549, 560,
+	564, 566, 568, 574, 577, 536, 538, 540, 542, 555,
+	554, 551, 579, 580, 557, 562, 541, 553, 558, 571,
+	578, 575, 535, 539, 543, 552, 570, 569, 550, 561,
+	572, 556, 544, 537, 545, 0, 198, 223, 371, 94,
+	460, 291, 657, 625, 490, 620, 208, 225, 0, 265,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 200, 202, 211, 224, 234, 238, 245, 264, 279,
+	281, 288, 301, 313, 321, 322, 325, 331, 383, 390,
+	391, 392, 393, 413, 414, 415, 418, 421, 422, 425,
+	427, 428, 431, 436, 440, 441, 442, 444, 446, 448,
+	461, 466, 480, 481, 482, 483, 484, 487, 488, 494,
+	495, 496, 497, 498, 506, 507, 522, 593, 595, 612,
+	632, 639, 486, 388, 434, 458, 586, 304, 305, 449,
+	450, 317, 318, 653, 654, 303, 607, 640, 604, 652,
+	634, 443, 381, 0, 0, 384, 284, 308, 323, 0,
+	624, 508, 229, 472, 293, 253, 0, 0, 213, 248,
+	232, 262, 277, 280, 327, 395, 404, 433, 439, 299,
+	274, 246, 465, 243, 491, 525, 526, 527, 529, 399,
+	269, 438, 1792, 0, 379, 582, 583, 319, 0, 0,
+	0, 534, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 420, 0, 0, 1794, 0, 0, 0,
+	0, 273, 0, 0, 0, 0, 369, 270, 0, 0,
+	206, 511, 0, 435, 0, 205, 0, 493, 255, 380,
+	377, 590, 285, 276, 272, 252, 320, 389, 432, 524,
+	426, 0, 373, 0, 0, 503, 405, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 326, 250, 328, 204, 417,
+	504, 289, 0, 0, 0, 0, 1796, 513, 731, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 240, 0,
+	0, 247, 0, 0, 0, 354, 363, 362, 342, 343,
+	345, 347, 353, 360, 366, 339, 348, 0, 0, 616,
+	0, 0, 0, 268, 324, 275, 267, 587, 0, 0,
+	0, 0, 0, 0, 603, 0, 0, 231, 0, 0,
+	0, 1489, 0, 1490, 1491, 0, 0, 0, 0, 0,
+	0, 0, 278, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 300, 0, 406, 260, 0, 459,
+	0, 0, 0, 636, 0, 0, 0, 0, 0, 0,
+	0, 368, 0, 333, 199, 227, 0, 0, 416, 467,
+	479, 0, 0, 0, 256, 0, 477, 430, 611, 235,
+	287, 464, 437, 475, 445, 290, 0, 0, 476, 375,
+	592, 455, 608, 637, 638, 266, 410, 622, 528, 630,
+	655, 228, 263, 424, 512, 614, 500, 401, 588, 589,
+	332, 499, 298, 203, 372, 643, 226, 485, 374, 244,
+	233, 594, 619, 302, 254, 292, 462, 650, 215, 523,
+	605, 241, 489, 0, 0, 658, 249, 510, 617, 606,
+	217, 601, 509, 397, 329, 330, 216, 0, 463, 271,
+	296, 0, 0, 261, 419, 596, 597, 259, 659, 230,
+	629, 222, 0, 628, 412, 591, 602, 398, 386, 221,
+	600, 396, 385, 337, 358, 359, 283, 310, 452, 378,
+	453, 309, 311, 408, 407, 409, 209, 615, 633, 0,
+	210, 0, 505, 618, 660, 457, 214, 236, 237, 239,
+	0, 282, 286, 294, 297, 306, 307, 316, 370, 423,
+	451, 447, 456, 0, 585, 609, 623, 635, 641, 642,
+	644, 645, 646, 647, 648, 651, 649, 411, 314, 501,
+	336, 376, 0, 0, 429, 478, 242, 613, 502, 201,
+	0, 0, 0, 0, 257, 258, 0, 581, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 661, 662, 663,
+	664, 665, 666, 667, 668, 669, 670, 671, 672, 673,
+	674, 675, 676, 677, 678, 656, 514, 520, 515, 516,
+	517, 518, 519, 0, 521, 0, 0, 0, 0, 0,
+	402, 0, 598, 599, 679, 387, 492, 610, 338, 352,
+	355, 344, 364, 0, 365, 340, 341, 346, 349, 350,
+	351, 356, 357, 361, 367, 251, 212, 394, 403, 584,
+	315, 218, 219, 220, 530, 531, 532, 533, 626, 627,
+	631, 207, 468, 469, 470, 471, 295, 621, 312, 474,
+	473, 334, 335, 382, 454, 546, 548, 559, 563, 565,
+	567, 573, 576, 547, 549, 560, 564, 566, 568, 574,
+	577, 536, 538, 540, 542, 555, 554, 551, 579, 580,
+	557, 562, 541, 553, 558, 571, 578, 575, 535, 539,
+	543, 552, 570, 569, 550, 561, 572, 556, 544, 537,
+	545, 0, 198, 223, 371, 0, 460, 291, 657, 625,
+	490, 620, 208, 225, 0, 265, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 200, 202, 211,
+	224, 234, 238, 245, 264, 279, 281, 288, 301, 313,
+	321, 322, 325, 331, 383, 390, 391, 392, 393, 413,
+	414, 415, 418, 421, 422, 425, 427, 428, 431, 436,
+	440, 441, 442, 444, 446, 448, 461, 466, 480, 481,
+	482, 483, 484, 487, 488, 494, 495, 496, 497, 498,
+	506, 507, 522, 593, 595, 612, 632, 639, 486, 388,
+	434, 458, 586, 304, 305, 449, 450, 317, 318, 653,
+	654, 303, 607, 640, 604, 652, 634, 443, 381, 0,
+	0, 384, 284, 308, 323, 0, 624, 508, 229, 472,
+	293, 253, 0, 0, 213, 248, 232, 262, 277, 280,
+	327, 395, 404, 433, 439, 299, 274, 246, 465, 243,
+	491, 525, 526, 527, 529, 399, 269, 438, 400, 0,
+	379, 582, 583, 319, 0, 0, 0, 534, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 420,
+	0, 0, 0, 0, 0, 0, 0, 273, 0, 0,
+	0, 0, 369, 270, 0, 0, 206, 511, 0, 435,
+	0, 205, 0, 493, 255, 380, 377, 590, 285, 276,
+	272, 252, 320, 389, 432, 524, 426, 0, 373, 0,
+	0, 503, 405, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 326, 250, 328, 204, 417, 504, 289, 0, 95,
+	0, 0, 0, 513, 196, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 240, 0, 0, 247, 0, 0,
+	0, 354, 363, 362, 342, 343, 345, 347, 353, 360,
+	366, 339, 348, 0, 0, 616, 0, 0, 0, 268,
+	324, 275, 267, 587, 0, 0, 0, 0, 0, 0,
+	603, 0, 0, 231, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 278, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	300, 0, 406, 260, 0, 459, 0, 0, 0, 636,
+	0, 0, 0, 0, 0, 0, 0, 368, 0, 333,
+	199, 227, 0, 0, 416, 467, 479, 0, 0, 0,
+	256, 0, 477, 430, 611, 235, 287, 464, 437, 475,
+	445, 290, 0, 0, 476, 375, 592, 455, 608, 637,
+	638, 266, 410, 622, 528, 630, 655, 228, 263, 424,
+	512, 614, 500, 401, 588, 589, 332, 499, 298, 203,
+	372, 643, 226, 485, 374, 244, 233, 594, 619, 302,
+	254, 292, 462, 650, 215, 523, 605, 241, 489, 0,
+	0, 658, 249, 510, 617, 606, 217, 601, 509, 397,
+	329, 330, 216, 0, 463, 271, 296, 0, 0, 261,
+	419, 596, 597, 259, 659, 230, 629, 222, 0, 628,
+	412, 591, 602, 398, 386, 221, 600, 396, 385, 337,
+	358, 359, 283, 310, 452, 378, 453, 309, 311, 408,
+	407, 409, 209, 615, 633, 0, 210, 0, 505, 618,
+	660, 457, 214, 236, 237, 239, 0, 282, 286, 294,
+	297, 306, 307, 316, 370, 423, 451, 447, 456, 0,
+	585, 609, 623, 635, 641, 642, 644, 645, 646, 647,
+	648, 651, 649, 411, 314, 501, 336, 376, 0, 0,
+	429, 478, 242, 613, 502, 201, 0, 0, 0, 0,
+	257, 258, 0, 581, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 661, 662, 663, 664, 665, 666, 667,
+	668, 669, 670, 671, 672, 673, 674, 675, 676, 677,
+	678, 656, 514, 520, 515, 516, 517, 518, 519, 0,
+	521, 0, 0, 0, 0, 0, 402, 0, 598, 599,
+	679, 387, 492, 610, 338, 352, 355, 344, 364, 0,
+	365, 340, 341, 346, 349, 350, 351, 356, 357, 361,
+	367, 251, 212, 394, 403, 584, 315, 218, 219, 220,
+	530, 531, 532, 533, 626, 627, 631, 207, 468, 469,
+	470, 471, 295, 621, 312, 474, 473, 334, 335, 382,
+	454, 546, 548, 559, 563, 565, 567, 573, 576, 547,
+	549, 560, 564, 566, 568, 574, 577, 536, 538, 540,
+	542, 555, 554, 551, 579, 580, 557, 562, 541, 553,
+	558, 571, 578, 575, 535, 539, 543, 552, 570, 569,
+	550, 561, 572, 556, 544, 537, 545, 0, 198, 223,
+	371, 0, 460, 291, 657, 625, 490, 620, 208, 225,
+	0, 265, 0, 0, 0, 0, 0, 0, 2444, 0,
+	0, 2443, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 200, 202, 211, 224, 234, 238, 245,
+	264, 279, 281, 288, 301, 313, 321, 322, 325, 331,
+	383, 390, 391, 392, 393, 413, 414, 415, 418, 421,
+	422, 425, 427, 428, 431, 436, 440, 441, 442, 444,
+	446, 448, 461, 466, 480, 481, 482, 483, 484, 487,
+	488, 494, 495, 496, 497, 498, 506, 507, 522, 593,
+	595, 612, 632, 639, 486, 388, 434, 458, 586, 304,
+	305, 449, 450, 317, 318, 653, 654, 303, 607, 640,
+	604, 652, 634, 443, 381, 0, 0, 384, 284, 308,
+	323, 0, 624, 508, 229, 472, 293, 253, 0, 0,
+	213, 248, 232, 262, 277, 280, 327, 395, 404, 433,
+	439, 299, 274, 246, 465, 243, 491, 525, 526, 527,
+	529, 399, 269, 438, 400, 0, 379, 582, 583, 319,
+	0, 0, 0, 534, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 420, 0, 0, 2389, 0,
+	0, 0, 0, 273, 0, 0, 0, 0, 369, 270,
+	0, 0, 206, 511, 0, 435, 0, 205, 0, 493,
+	255, 380, 377, 590, 285, 276, 272, 252, 320, 389,
+	432, 524, 426, 0, 373, 0, 0, 503, 405, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 326, 250, 328,
+	204, 417, 504, 289, 0, 0, 0, 0, 1977, 513,
+	196, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	240, 0, 0, 247, 0, 0, 0, 354, 363, 362,
+	342, 343, 345, 347, 353, 360, 366, 339, 348, 0,
+	0, 616, 0, 0, 0, 268, 324, 275, 267, 587,
+	0, 0, 0, 0, 0, 0, 603, 0, 0, 231,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 278, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 300, 0, 406, 260,
+	0, 459, 0, 0, 0, 636, 0, 0, 0, 0,
+	0, 0, 0, 368, 0, 333, 199, 227, 0, 0,
+	416, 467, 479, 0, 0, 0, 256, 0, 477, 430,
+	611, 235, 287, 464, 437, 475, 445, 290, 0, 2387,
+	476, 375, 592, 455, 608, 637, 638, 266, 410, 622,
+	528, 630, 655, 228, 263, 424, 512, 614, 500, 401,
+	588, 589, 332, 499, 298, 203, 372, 643, 226, 485,
+	374, 244, 233, 594, 619, 302, 254, 292, 462, 650,
+	215, 523, 605, 241, 489, 0, 0, 658, 249, 510,
+	617, 606, 217, 601, 509, 397, 329, 330, 216, 0,
+	463, 271, 296, 0, 0, 261, 419, 596, 597, 259,
+	659, 230, 629, 222, 0, 628, 412, 591, 602, 398,
+	386, 221, 600, 396, 385, 337, 358, 359, 283, 310,
+	452, 378, 453, 309, 311, 408, 407, 409, 209, 615,
+	633, 0, 210, 0, 505, 618, 660, 457, 214, 236,
+	237, 239, 0, 282, 286, 294, 297, 306, 307, 316,
+	370, 423, 451, 447, 456, 0, 585, 609, 623, 635,
+	641, 642, 644, 645, 646, 647, 648, 651, 649, 411,
+	314, 501, 336, 376, 0, 0, 429, 478, 242, 613,
+	502, 201, 0, 0, 0, 0, 257, 258, 0, 581,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 661,
+	662, 663, 664, 665, 666, 667, 668, 669, 670, 671,
+	672, 673, 674, 675, 676, 677, 678, 656, 514, 520,
+	515, 516, 517, 518, 519, 0, 521, 0, 0, 0,
+	0, 0, 402, 0, 598, 599, 679, 387, 492, 610,
+	338, 352, 355, 344, 364, 0, 365, 340, 341, 346,
+	349, 350, 351, 356, 357, 361, 367, 251, 212, 394,
+	403, 584, 315, 218, 219, 220, 530, 531, 532, 533,
+	626, 627, 631, 207, 468, 469, 470, 471, 295, 621,
+	312, 474, 473, 334, 335, 382, 454, 546, 548, 559,
+	563, 565, 567, 573, 576, 547, 549, 560, 564, 566,
+	568, 574, 577, 536, 538, 540, 542, 555, 554, 551,
+	579, 580, 557, 562, 541, 553, 558, 571, 578, 575,
+	535, 539, 543, 552, 570, 569, 550, 561, 572, 556,
+	544, 537, 545, 0, 198, 223, 371, 0, 460, 291,
+	657, 625, 490, 620, 208, 225, 0, 265, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 200,
+	202, 211, 224, 234, 238, 245, 264, 279, 281, 288,
+	301, 313, 321, 322, 325, 331, 383, 390, 391, 392,
+	393, 413, 414, 415, 418, 421, 422, 425, 427, 428,
+	431, 436, 440, 441, 442, 444, 446, 448, 461, 466,
+	480, 481, 482, 483, 484, 487, 488, 494, 495, 496,
+	497, 498, 506, 507, 522, 593, 595, 612, 632, 639,
+	486, 388, 434, 458, 586, 304, 305, 449, 450, 317,
+	318, 653, 654, 303, 607, 640, 604, 652, 634, 443,
+	381, 0, 0, 384, 284, 308, 323, 0, 624, 508,
+	229, 472, 293, 253, 0, 0, 213, 248, 232, 262,
+	277, 280, 327, 395, 404, 433, 439, 299, 274, 246,
+	465, 243, 491, 525, 526, 527, 529, 399, 269, 438,
+	400, 0, 379, 582, 583, 319, 0, 0, 0, 534,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 420, 0, 0, 0, 0, 0, 0, 0, 273,
+	0, 0, 0, 0, 369, 270, 0, 0, 206, 511,
+	0, 435, 0, 205, 0, 493, 255, 380, 377, 590,
+	285, 276, 272, 252, 320, 389, 432, 524, 426, 0,
+	373, 0, 0, 503, 405, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 326, 250, 328, 204, 417, 504, 289,
+	0, 0, 0, 0, 0, 513, 731, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 240, 0, 0, 247,
+	0, 0, 0, 354, 363, 362, 342, 343, 345, 347,
+	353, 360, 366, 339, 348, 0, 0, 616, 0, 0,
+	0, 268, 324, 275, 267, 587, 0, 0, 0, 0,
+	0, 0, 603, 0, 0, 231, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	278, 0, 0, 0, 0, 0, 0, 0, 0, 1102,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 300, 0, 406, 260, 0, 459, 0, 0,
+	0, 636, 0, 0, 0, 0, 0, 0, 0, 368,
+	1108, 333, 199, 227, 1106, 0, 416, 467, 479, 0,
+	0, 0, 256, 0, 477, 430, 611, 235, 287, 464,
+	437, 475, 445, 290, 0, 0, 476, 375, 592, 455,
+	608, 637, 638, 266, 410, 622, 528, 630, 655, 228,
+	263, 424, 512, 614, 500, 401, 588, 589, 332, 499,
+	298, 203, 372, 643, 226, 485, 374, 244, 233, 594,
+	619, 302, 254, 292, 462, 650, 215, 523, 605, 241,
+	489, 0, 0, 658, 249, 510, 617, 606, 217, 601,
+	509, 397, 329, 330, 216, 0, 463, 271, 296, 0,
+	0, 261, 419, 596, 597, 259, 659, 230, 629, 222,
+	0, 628, 412, 591, 602, 398, 386, 221, 600, 396,
+	385, 337, 358, 359, 283, 310, 452, 378, 453, 309,
+	311, 408, 407, 409, 209, 615, 633, 0, 210, 0,
+	505, 618, 660, 457, 214, 236, 237, 239, 0, 282,
+	286, 294, 297, 306, 307, 316, 370, 423, 451, 447,
+	456, 0, 585, 609, 623, 635, 641, 642, 644, 645,
+	646, 647, 648, 651, 649, 411, 314, 501, 336, 376,
+	0, 0, 429, 478, 242, 613, 502, 201, 0, 0,
+	0, 0, 257, 258, 0, 581, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 661, 662, 663, 664, 665,
+	666, 667, 668, 669, 670, 671, 672, 673, 674, 675,
+	676, 677, 678, 656, 514, 520, 515, 516, 517, 518,
+	519, 0, 521, 0, 0, 0, 0, 0, 402, 0,
+	598, 599, 679, 387, 492, 610, 338, 352, 355, 344,
+	364, 0, 365, 340, 341, 346, 349, 350, 351, 356,
+	357, 361, 367, 251, 212, 394, 403, 584, 315, 218,
+	219, 220, 530, 531, 532, 533, 626, 627, 631, 207,
+	468, 469, 470, 471, 295, 621, 312, 474, 473, 334,
+	335, 382, 454, 546, 548, 559, 563, 565, 567, 573,
+	576, 547, 549, 560, 564, 566, 568, 574, 577, 536,
+	538, 540, 542, 555, 554, 551, 579, 580, 557, 562,
+	541, 553, 558, 571, 578, 575, 535, 539, 543, 552,
+	570, 569, 550, 561, 572, 556, 544, 537, 545, 0,
+	198, 223, 371, 0, 460, 291, 657, 625, 490, 620,
+	208, 225, 0, 265, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 200, 202, 211, 224, 234,
+	238, 245, 264, 279, 281, 288, 301, 313, 321, 322,
+	325, 331, 383, 390, 391, 392, 393, 413, 414, 415,
+	418, 421, 422, 425, 427, 428, 431, 436, 440, 441,
+	442, 444, 446, 448, 461, 466, 480, 481, 482, 483,
+	484, 487, 488, 494, 495, 496, 497, 498, 506, 507,
+	522, 593, 595, 612, 632, 639, 486, 388, 434, 458,
+	586, 304, 305, 449, 450, 317, 318, 653, 654, 303,
+	607, 640, 604, 652, 634, 443, 381, 0, 0, 384,
+	284, 308, 323, 0, 624, 508, 229, 472, 293, 253,
+	0, 0, 213, 248, 232, 262, 277, 280, 327, 395,
+	404, 433, 439, 299, 274, 246, 465, 243, 491, 525,
+	526, 527, 529, 399, 269, 438, 400, 0, 379, 582,
+	583, 319, 0, 0, 0, 534, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 420, 0, 0,
+	2389, 0, 0, 0, 0, 273, 0, 0, 0, 0,
+	369, 270, 0, 0, 206, 511, 0, 435, 0, 205,
+	0, 493, 255, 380, 377, 590, 285, 276, 272, 252,
+	320, 389, 432, 524, 426, 0, 373, 0, 0, 503,
+	405, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 326,
+	250, 328, 204, 417, 504, 289, 0, 0, 0, 0,
+	1977, 513, 196, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 240, 0, 0, 247, 0, 0, 0, 354,
+	363, 362, 342, 343, 345, 347, 353, 360, 366, 339,
+	348, 0, 0, 616, 0, 0, 0, 268, 324, 275,
+	267, 587, 0, 0, 0, 0, 0, 0, 603, 0,
+	0, 231, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 278, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 300, 0,
+	406, 260, 0, 459, 0, 0, 0, 636, 0, 0,
+	0, 0, 0, 0, 0, 368, 0, 333, 199, 227,
+	0, 0, 416, 467, 479, 0, 0, 0, 256, 0,
+	477, 430, 611, 235, 287, 464, 437, 475, 445, 290,
+	0, 0, 476, 375, 592, 455, 608, 637, 638, 266,
+	410, 622, 528, 630, 655, 228, 263, 424, 512, 614,
+	500, 401, 588, 589, 332, 499, 298, 203, 372, 643,
+	226, 485, 374, 244, 233, 594, 619, 302, 254, 292,
+	462, 650, 215, 523, 605, 241, 489, 0, 0, 658,
+	249, 510, 617, 606, 217, 601, 509, 397, 329, 330,
+	216, 0, 463, 271, 296, 0, 0, 261, 419, 596,
+	597, 259, 659, 230, 629, 222, 0, 628, 412, 591,
+	602, 398, 386, 221, 600, 396, 385, 337, 358, 359,
+	283, 310, 452, 378, 453, 309, 311, 408, 407, 409,
+	209, 615, 633, 0, 210, 0, 505, 618, 660, 457,
+	214, 236, 237, 239, 0, 282, 286, 294, 297, 306,
+	307, 316, 370, 423, 451, 447, 456, 0, 585, 609,
+	623, 635, 641, 642, 644, 645, 646, 647, 648, 651,
+	649, 411, 314, 501, 336, 376, 0, 0, 429, 478,
+	242, 613, 502, 201, 0, 0, 0, 0, 257, 258,
+	0, 581, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 661, 662, 663, 664, 665, 666, 667, 668, 669,
+	670, 671, 672, 673, 674, 675, 676, 677, 678, 656,
+	514, 520, 515, 516, 517, 518, 519, 0, 521, 0,
+	0, 0, 0, 0, 402, 0, 598, 599, 679, 387,
+	492, 610, 338, 352, 355, 344, 364, 0, 365, 340,
+	341, 346, 349, 350, 351, 356, 357, 361, 367, 251,
+	212, 394, 403, 584, 315, 218, 219, 220, 530, 531,
+	532, 533, 626, 627, 631, 207, 468, 469, 470, 471,
+	295, 621, 312, 474, 473, 334, 335, 382, 454, 546,
+	548, 559, 563, 565, 567, 573, 576, 547, 549, 560,
+	564, 566, 568, 574, 577, 536, 538, 540, 542, 555,
+	554, 551, 579, 580, 557, 562, 541, 553, 558, 571,
+	578, 575, 535, 539, 543, 552, 570, 569, 550, 561,
+	572, 556, 544, 537, 545, 0, 198, 223, 371, 0,
+	460, 291, 657, 625, 490, 620, 208, 225, 0, 265,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 200, 202, 211, 224, 234, 238, 245, 264, 279,
+	281, 288, 301, 313, 321, 322, 325, 331, 383, 390,
+	391, 392, 393, 413, 414, 415, 418, 421, 422, 425,
+	427, 428, 431, 436, 440, 441, 442, 444, 446, 448,
+	461, 466, 480, 481, 482, 483, 484, 487, 488, 494,
+	495, 496, 497, 498, 506, 507, 522, 593, 595, 612,
+	632, 639, 486, 388, 434, 458, 586, 304, 305, 449,
+	450, 317, 318, 653, 654, 303, 607, 640, 604, 652,
+	634, 443, 381, 0, 0, 384, 284, 308, 323, 0,
+	624, 508, 229, 472, 293, 253, 0, 0, 213, 248,
+	232, 262, 277, 280, 327, 395, 404, 433, 439, 299,
+	274, 246, 465, 243, 491, 525, 526, 527, 529, 399,
+	269, 438, 400, 0, 379, 582, 583, 319, 0, 0,
+	0, 534, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 420, 0, 0, 0, 0, 0, 0,
+	0, 273, 0, 0, 0, 0, 369, 270, 0, 0,
+	206, 511, 0, 435, 0, 205, 0, 493, 255, 380,
+	377, 590, 285, 276, 272, 252, 320, 389, 432, 524,
+	426, 0, 373, 0, 0, 503, 405, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 326, 250, 328, 204, 417,
+	504, 289, 0, 0, 0, 1764, 0, 513, 731, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 240, 0,
+	0, 247, 0, 0, 0, 354, 363, 362, 342, 343,
+	345, 347, 353, 360, 366, 339, 348, 0, 0, 616,
+	0, 0, 0, 268, 324, 275, 267, 587, 0, 0,
+	0, 0, 0, 0, 603, 0, 0, 231, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 278, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 300, 0, 406, 260, 0, 459,
+	0, 0, 0, 636, 0, 0, 0, 3749, 0, 0,
+	0, 368, 0, 333, 199, 227, 0, 0, 416, 467,
+	479, 0, 0, 0, 256, 0, 477, 430, 611, 235,
+	287, 464, 437, 475, 445, 290, 0, 0, 476, 375,
+	592, 455, 608, 637, 638, 266, 410, 622, 528, 630,
+	655, 228, 263, 424, 512, 614, 500, 401, 588, 589,
+	332, 499, 298, 203, 372, 643, 226, 485, 374, 244,
+	233, 594, 619, 302, 254, 292, 462, 650, 215, 523,
+	605, 241, 489, 0, 0, 658, 249, 510, 617, 606,
+	217, 601, 509, 397, 329, 330, 216, 0, 463, 271,
+	296, 0, 0, 261, 419, 596, 597, 259, 659, 230,
+	629, 222, 0, 628, 412, 591, 602, 398, 386, 221,
+	600, 396, 385, 337, 358, 359, 283, 310, 452, 378,
+	453, 309, 311, 408, 407, 409, 209, 615, 633, 0,
+	210, 0, 505, 618, 660, 457, 214, 236, 237, 239,
+	0, 282, 286, 294, 297, 306, 307, 316, 370, 423,
+	451, 447, 456, 0, 585, 609, 623, 635, 641, 642,
+	644, 645, 646, 647, 648, 651, 649, 411, 314, 501,
+	336, 376, 0, 0, 429, 478, 242, 613, 502, 201,
+	0, 0, 0, 0, 257, 258, 0, 581, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 661, 662, 663,
+	664, 665, 666, 667, 668, 669, 670, 671, 672, 673,
+	674, 675, 676, 677, 678, 656, 514, 520, 515, 516,
+	517, 518, 519, 0, 521, 0, 0, 0, 0, 0,
+	402, 0, 598, 599, 679, 387, 492, 610, 338, 352,
+	355, 344, 364, 0, 365, 340, 341, 346, 349, 350,
+	351, 356, 357, 361, 367, 251, 212, 394, 403, 584,
+	315, 218, 219, 220, 530, 531, 532, 533, 626, 627,
+	631, 207, 468, 469, 470, 471, 295, 621, 312, 474,
+	473, 334, 335, 382, 454, 546, 548, 559, 563, 565,
+	567, 573, 576, 547, 549, 560, 564, 566, 568, 574,
+	577, 536, 538, 540, 542, 555, 554, 551, 579, 580,
+	557, 562, 541, 553, 558, 571, 578, 575, 535, 539,
+	543, 552, 570, 569, 550, 561, 572, 556, 544, 537,
+	545, 0, 198, 223, 371, 0, 460, 291, 657, 625,
+	490, 620, 208, 225, 0, 265, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 200, 202, 211,
+	224, 234, 238, 245, 264, 279, 281, 288, 301, 313,
+	321, 322, 325, 331, 383, 390, 391, 392, 393, 413,
+	414, 415, 418, 421, 422, 425, 427, 428, 431, 436,
+	440, 441, 442, 444, 446, 448, 461, 466, 480, 481,
+	482, 483, 484, 487, 488, 494, 495, 496, 497, 498,
+	506, 507, 522, 593, 595, 612, 632, 639, 486, 388,
+	434, 458, 586, 304, 305, 449, 450, 317, 318, 653,
+	654, 303, 607, 640, 604, 652, 634, 443, 381, 0,
+	0, 384, 284, 308, 323, 0, 624, 508, 229, 472,
+	293, 253, 0, 0, 213, 248, 232, 262, 277, 280,
+	327, 395, 404, 433, 439, 299, 274, 246, 465, 243,
+	491, 525, 526, 527, 529, 399, 269, 438, 400, 0,
+	379, 582, 583, 319, 0, 0, 0, 534, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 420,
+	0, 0, 0, 0, 0, 0, 0, 273, 0, 0,
+	0, 0, 369, 270, 0, 0, 206, 511, 0, 435,
+	0, 205, 0, 493, 255, 380, 377, 590, 285, 276,
+	272, 252, 320, 389, 432, 524, 426, 0, 373, 0,
+	0, 503, 405, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 326, 250, 328, 204, 417, 504, 289, 0, 0,
+	0, 0, 2148, 513, 731, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 240, 0, 0, 247, 0, 0,
+	0, 354, 363, 362, 342, 343, 345, 347, 353, 360,
+	366, 339, 348, 0, 0, 616, 0, 0, 0, 268,
+	324, 275, 267, 587, 0, 0, 0, 0, 0, 0,
+	603, 0, 0, 231, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 278, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 2149, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	300, 0, 406, 260, 0, 459, 0, 0, 0, 636,
+	0, 0, 0, 0, 0, 0, 0, 368, 0, 333,
+	199, 227, 0, 0, 416, 467, 479, 0, 0, 0,
+	256, 0, 477, 430, 611, 235, 287, 464, 437, 475,
+	445, 290, 0, 0, 476, 375, 592, 455, 608, 637,
+	638, 266, 410, 622, 528, 630, 655, 228, 263, 424,
+	512, 614, 500, 401, 588, 589, 332, 499, 298, 203,
+	372, 643, 226, 485, 374, 244, 233, 594, 619, 302,
+	254, 292, 462, 650, 215, 523, 605, 241, 489, 0,
+	0, 658, 249, 510, 617, 606, 217, 601, 509, 397,
+	329, 330, 216, 0, 463, 271, 296, 0, 0, 261,
+	419, 596, 597, 259, 659, 230, 629, 222, 0, 628,
+	412, 591, 602, 398, 386, 221, 600, 396, 385, 337,
+	358, 359, 283, 310, 452, 378, 453, 309, 311, 408,
+	407, 409, 209, 615, 633, 0, 210, 0, 505, 618,
+	660, 457, 214, 236, 237, 239, 0, 282, 286, 294,
+	297, 306, 307, 316, 370, 423, 451, 447, 456, 0,
+	585, 609, 623, 635, 641, 642, 644, 645, 646, 647,
+	648, 651, 649, 411, 314, 501, 336, 376, 0, 0,
+	429, 478, 242, 613, 502, 201, 0, 0, 0, 0,
+	257, 258, 0, 581, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 661, 662, 663, 664, 665, 666, 667,
+	668, 669, 670, 671, 672, 673, 674, 675, 676, 677,
+	678, 656, 514, 520, 515, 516, 517, 518, 519, 0,
+	521, 0, 0, 0, 0, 0, 402, 0, 598, 599,
+	679, 387, 492, 610, 338, 352, 355, 344, 364, 0,
+	365, 340, 341, 346, 349, 350, 351, 356, 357, 361,
+	367, 251, 212, 394, 403, 584, 315, 218, 219, 220,
+	530, 531, 532, 533, 626, 627, 631, 207, 468, 469,
+	470, 471, 295, 621, 312, 474, 473, 334, 335, 382,
+	454, 546, 548, 559, 563, 565, 567, 573, 576, 547,
+	549, 560, 564, 566, 568, 574, 577, 536, 538, 540,
+	542, 555, 554, 551, 579, 580, 557, 562, 541, 553,
+	558, 571, 578, 575, 535, 539, 543, 552, 570, 569,
+	550, 561, 572, 556, 544, 537, 545, 0, 198, 223,
+	371, 0, 460, 291, 657, 625, 490, 620, 208, 225,
+	0, 265, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 200, 202, 211, 224, 234, 238, 245,
+	264, 279, 281, 288, 301, 313, 321, 322, 325, 331,
+	383, 390, 391, 392, 393, 413, 414, 415, 418, 421,
+	422, 425, 427, 428, 431, 436, 440, 441, 442, 444,
+	446, 448, 461, 466, 480, 481, 482, 483, 484, 487,
+	488, 494, 495, 496, 497, 498, 506, 507, 522, 593,
+	595, 612, 632, 639, 486, 388, 434, 458, 586, 304,
+	305, 449, 450, 317, 318, 653, 654, 303, 607, 640,
+	604, 652, 634, 443, 381, 0, 0, 384, 284, 308,
+	323, 0, 624, 508, 229, 472, 293, 253, 0, 0,
+	213, 248, 232, 262, 277, 280, 327, 395, 404, 433,
+	439, 299, 274, 246, 465, 243, 491, 525, 526, 527,
+	529, 399, 269, 438, 400, 0, 379, 582, 583, 319,
+	0, 0, 0, 534, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 420, 0, 0, 0, 0,
+	0, 0, 0, 273, 0, 0, 0, 0, 369, 270,
+	0, 0, 206, 511, 0, 435, 0, 205, 0, 493,
+	255, 380, 377, 590, 285, 276, 272, 252, 320, 389,
+	432, 524, 426, 0, 373, 0, 0, 503, 405, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 326, 250, 328,
+	204, 417, 504, 289, 0, 0, 0, 0, 2900, 513,
+	731, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	240, 0, 0, 247, 0, 0, 0, 354, 363, 362,
+	342, 343, 345, 347, 353, 360, 366, 339, 348, 0,
+	0, 616, 0, 0, 0, 268, 324, 275, 267, 587,
+	0, 0, 0, 0, 0, 0, 603, 0, 0, 231,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 278, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 2901, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 300, 0, 406, 260,
+	0, 459, 0, 0, 0, 636, 0, 0, 0, 0,
+	0, 0, 0, 368, 0, 333, 199, 227, 0, 0,
+	416, 467, 479, 0, 0, 0, 256, 0, 477, 430,
+	611, 235, 287, 464, 437, 475, 445, 290, 0, 0,
+	476, 375, 592, 455, 608, 637, 638, 266, 410, 622,
+	528, 630, 655, 228, 263, 424, 512, 614, 500, 401,
+	588, 589, 332, 499, 298, 203, 372, 643, 226, 485,
+	374, 244, 233, 594, 619, 302, 254, 292, 462, 650,
+	215, 523, 605, 241, 489, 0, 0, 658, 249, 510,
+	617, 606, 217, 601, 509, 397, 329, 330, 216, 0,
+	463, 271, 296, 0, 0, 261, 419, 596, 597, 259,
+	659, 230, 629, 222, 0, 628, 412, 591, 602, 398,
+	386, 221, 600, 396, 385, 337, 358, 359, 283, 310,
+	452, 378, 453, 309, 311, 408, 407, 409, 209, 615,
+	633, 0, 210, 0, 505, 618, 660, 457, 214, 236,
+	237, 239, 0, 282, 286, 294, 297, 306, 307, 316,
+	370, 423, 451, 447, 456, 0, 585, 609, 623, 635,
+	641, 642, 644, 645, 646, 647, 648, 651, 649, 411,
+	314, 501, 336, 376, 0, 0, 429, 478, 242, 613,
+	502, 201, 0, 0, 0, 0, 257, 258, 0, 581,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 661,
+	662, 663, 664, 665, 666, 667, 668, 669, 670, 671,
+	672, 673, 674, 675, 676, 677, 678, 656, 514, 520,
+	515, 516, 517, 518, 519, 0, 521, 0, 0, 0,
+	0, 0, 402, 0, 598, 599, 679, 387, 492, 610,
+	338, 352, 355, 344, 364, 0, 365, 340, 341, 346,
+	349, 350, 351, 356, 357, 361, 367, 251, 212, 394,
+	403, 584, 315, 218, 219, 220, 530, 531, 532, 533,
+	626, 627, 631, 207, 468, 469, 470, 471, 295, 621,
+	312, 474, 473, 334, 335, 382, 454, 546, 548, 559,
+	563, 565, 567, 573, 576, 547, 549, 560, 564, 566,
+	568, 574, 577, 536, 538, 540, 542, 555, 554, 551,
+	579, 580, 557, 562, 541, 553, 558, 571, 578, 575,
+	535, 539, 543, 552, 570, 569, 550, 561, 572, 556,
+	544, 537, 545, 0, 198, 223, 371, 0, 460, 291,
+	657, 625, 490, 620, 208, 225, 0, 265, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 200,
+	202, 211, 224, 234, 238, 245, 264, 279, 281, 288,
+	301, 313, 321, 322, 325, 331, 383, 390, 391, 392,
+	393, 413, 414, 415, 418, 421, 422, 425, 427, 428,
+	431, 436, 440, 441, 442, 444, 446, 448, 461, 466,
+	480, 481, 482, 483, 484, 487, 488, 494, 495, 496,
+	497, 498, 506, 507, 522, 593, 595, 612, 632, 639,
+	486, 388, 434, 458, 586, 304, 305, 449, 450, 317,
+	318, 653, 654, 303, 607, 640, 604, 652, 634, 443,
+	381, 0, 0, 384, 284, 308, 323, 0, 624, 508,
+	229, 472, 293, 253, 0, 0, 213, 248, 232, 262,
+	277, 280, 327, 395, 404, 433, 439, 299, 274, 246,
+	465, 243, 491, 525, 526, 527, 529, 399, 269, 438,
+	400, 0, 379, 582, 583, 319, 0, 0, 0, 534,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 420, 0, 0, 0, 0, 0, 0, 0, 273,
+	0, 0, 0, 0, 369, 270, 0, 0, 206, 511,
+	0, 435, 0, 205, 0, 493, 255, 380, 377, 590,
+	285, 276, 272, 252, 320, 389, 432, 524, 426, 0,
+	373, 0, 0, 503, 405, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 326, 250, 328, 204, 417, 504, 289,
+	0, 0, 0, 0, 0, 513, 731, 0, 0, 0,
+	0, 2883, 0, 0, 0, 0, 240, 0, 0, 247,
+	2884, 0, 0, 354, 363, 362, 342, 343, 345, 347,
+	353, 360, 366, 339, 348, 0, 0, 616, 0, 0,
+	0, 268, 324, 275, 267, 587, 0, 0, 0, 0,
+	0, 0, 603, 0, 0, 231, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	278, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 300, 0, 406, 260, 0, 459, 0, 0,
+	0, 636, 0, 0, 0, 0, 0, 0, 0, 368,
+	0, 333, 199, 227, 0, 0, 416, 467, 479, 0,
+	0, 0, 256, 0, 477, 430, 611, 235, 287, 464,
+	437, 475, 445, 290, 0, 0, 476, 375, 592, 455,
+	608, 637, 638, 266, 410, 622, 528, 630, 655, 228,
+	263, 424, 512, 614, 500, 401, 588, 589, 332, 499,
+	298, 203, 372, 643, 226, 485, 374, 244, 233, 594,
+	619, 302, 254, 292, 462, 650, 215, 523, 605, 241,
+	489, 0, 0, 658, 249, 510, 617, 606, 217, 601,
+	509, 397, 329, 330, 216, 0, 463, 271, 296, 0,
+	0, 261, 419, 596, 597, 259, 659, 230, 629, 222,
+	0, 628, 412, 591, 602, 398, 386, 221, 600, 396,
+	385, 337, 358, 359, 283, 310, 452, 378, 453, 309,
+	311, 408, 407, 409, 209, 615, 633, 0, 210, 0,
+	505, 618, 660, 457, 214, 236, 237, 239, 0, 282,
+	286, 294, 297, 306, 307, 316, 370, 423, 451, 447,
+	456, 0, 585, 609, 623, 635, 641, 642, 644, 645,
+	646, 647, 648, 651, 649, 411, 314, 501, 336, 376,
+	0, 0, 429, 478, 242, 613, 502, 201, 0, 0,
+	0, 0, 257, 258, 0, 581, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 661, 662, 663, 664, 665,
+	666, 667, 668, 669, 670, 671, 672, 673, 674, 675,
+	676, 677, 678, 656, 514, 520, 515, 516, 517, 518,
+	519, 0, 521, 0, 0, 0, 0, 0, 402, 0,
+	598, 599, 679, 387, 492, 610, 338, 352, 355, 344,
+	364, 0, 365, 340, 341, 346, 349, 350, 351, 356,
+	357, 361, 367, 251, 212, 394, 403, 584, 315, 218,
+	219, 220, 530, 531, 532, 533, 626, 627, 631, 207,
+	468, 469, 470, 471, 295, 621, 312, 474, 473, 334,
+	335, 382, 454, 546, 548, 559, 563, 565, 567, 573,
+	576, 547, 549, 560, 564, 566, 568, 574, 577, 536,
+	538, 540, 542, 555, 554, 551, 579, 580, 557, 562,
+	541, 553, 558, 571, 578, 575, 535, 539, 543, 552,
+	570, 569, 550, 561, 572, 556, 544, 537, 545, 0,
+	198, 223, 371, 0, 460, 291, 657, 625, 490, 620,
+	208, 225, 0, 265, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 200, 202, 211, 224, 234,
+	238, 245, 264, 279, 281, 288, 301, 313, 321, 322,
+	325, 331, 383, 390, 391, 392, 393, 413, 414, 415,
+	418, 421, 422, 425, 427, 428, 431, 436, 440, 441,
+	442, 444, 446, 448, 461, 466, 480, 481, 482, 483,
+	484, 487, 488, 494, 495, 496, 497, 498, 506, 507,
+	522, 593, 595, 612, 632, 639, 486, 388, 434, 458,
+	586, 304, 305, 449, 450, 317, 318, 653, 654, 303,
+	607, 640, 604, 652, 634, 443, 381, 0, 0, 384,
+	284, 308, 323, 0, 624, 508, 229, 472, 293, 253,
+	0, 0, 213, 248, 232, 262, 277, 280, 327, 395,
+	404, 433, 439, 299, 274, 246, 465, 243, 491, 525,
+	526, 527, 529, 399, 269, 438, 400, 0, 379, 582,
+	583, 319, 0, 0, 0, 534, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 420, 0, 0,
+	0, 0, 0, 0, 0, 273, 1815, 0, 0, 0,
+	369, 270, 0, 0, 206, 511, 0, 435, 0, 205,
+	0, 493, 255, 380, 377, 590, 285, 276, 272, 252,
+	320, 389, 432, 524, 426, 0, 373, 0, 0, 503,
+	405, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 326,
+	250, 328, 204, 417, 504, 289, 0, 0, 0, 0,
+	1814, 513, 731, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 240, 0, 0, 247, 0, 0, 0, 354,
+	363, 362, 342, 343, 345, 347, 353, 360, 366, 339,
+	348, 0, 0, 616, 0, 0, 0, 268, 324, 275,
+	267, 587, 0, 0, 0, 0, 0, 0, 603, 0,
+	0, 231, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 278, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 300, 0,
+	406, 260, 0, 459, 0, 0, 0, 636, 0, 0,
+	0, 0, 0, 0, 0, 368, 0, 333, 199, 227,
+	0, 0, 416, 467, 479, 0, 0, 0, 256, 0,
+	477, 430, 611, 235, 287, 464, 437, 475, 445, 290,
+	0, 0, 476, 375, 592, 455, 608, 637, 638, 266,
+	410, 622, 528, 630, 655, 228, 263, 424, 512, 614,
+	500, 401, 588, 589, 332, 499, 298, 203, 372, 643,
+	226, 485, 374, 244, 233, 594, 619, 302, 254, 292,
+	462, 650, 215, 523, 605, 241, 489, 0, 0, 658,
+	249, 510, 617, 606, 217, 601, 509, 397, 329, 330,
+	216, 0, 463, 271, 296, 0, 0, 261, 419, 596,
+	597, 259, 659, 230, 629, 222, 0, 628, 412, 591,
+	602, 398, 386, 221, 600, 396, 385, 337, 358, 359,
+	283, 310, 452, 378, 453, 309, 311, 408, 407, 409,
+	209, 615, 633, 0, 210, 0, 505, 618, 660, 457,
+	214, 236, 237, 239, 0, 282, 286, 294, 297, 306,
+	307, 316, 370, 423, 451, 447, 456, 0, 585, 609,
+	623, 635, 641, 642, 644, 645, 646, 647, 648, 651,
+	649, 411, 314, 501, 336, 376, 0, 0, 429, 478,
+	242, 613, 502, 201, 0, 0, 0, 0, 257, 258,
+	0, 581, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 661, 662, 663, 664, 665, 666, 667, 668, 669,
+	670, 671, 672, 673, 674, 675, 676, 677, 678, 656,
+	514, 520, 515, 516, 517, 518, 519, 0, 521, 0,
+	0, 0, 0, 0, 402, 0, 598, 599, 679, 387,
+	492, 610, 338, 352, 355, 344, 364, 0, 365, 340,
+	341, 346, 349, 350, 351, 356, 357, 361, 367, 251,
+	212, 394, 403, 584, 315, 218, 219, 220, 530, 531,
+	532, 533, 626, 627, 631, 207, 468, 469, 470, 471,
+	295, 621, 312, 474, 473, 334, 335, 382, 454, 546,
+	548, 559, 563, 565, 567, 573, 576, 547, 549, 560,
+	564, 566, 568, 574, 577, 536, 538, 540, 542, 555,
+	554, 551, 579, 580, 557, 562, 541, 553, 558, 571,
+	578, 575, 535, 539, 543, 552, 570, 569, 550, 561,
+	572, 556, 544, 537, 545, 0, 198, 223, 371, 0,
+	460, 291, 657, 625, 490, 620, 208, 225, 0, 265,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 200, 202, 211, 224, 234, 238, 245, 264, 279,
+	281, 288, 301, 313, 321, 322, 325, 331, 383, 390,
+	391, 392, 393, 413, 414, 415, 418, 421, 422, 425,
+	427, 428, 431, 436, 440, 441, 442, 444, 446, 448,
+	461, 466, 480, 481, 482, 483, 484, 487, 488, 494,
+	495, 496, 497, 498, 506, 507, 522, 593, 595, 612,
+	632, 639, 486, 388, 434, 458, 586, 304, 305, 449,
+	450, 317, 318, 653, 654, 303, 607, 640, 604, 652,
+	634, 443, 381, 0, 0, 384, 284, 308, 323, 0,
+	624, 508, 229, 472, 293, 253, 0, 0, 213, 248,
+	232, 262, 277, 280, 327, 395, 404, 433, 439, 299,
+	274, 246, 465, 243, 491, 525, 526, 527, 529, 399,
+	269, 438, 400, 0, 379, 582, 583, 319, 0, 0,
+	0, 534, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 420, 0, 0, 0, 0, 0, 0,
+	0, 273, 0, 0, 0, 0, 369, 270, 0, 0,
+	206, 511, 0, 435, 0, 205, 0, 493, 255, 380,
+	377, 590, 285, 276, 272, 252, 320, 389, 432, 524,
+	426, 0, 373, 0, 0, 503, 405, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 326, 250, 328, 204, 417,
+	504, 289, 0, 0, 0, 0, 0, 513, 733, 734,
+	735, 0, 0, 0, 0, 0, 0, 0, 240, 0,
+	0, 247, 0, 0, 0, 354, 363, 362, 342, 343,
+	345, 347, 353, 360, 366, 339, 348, 0, 0, 616,
+	0, 0, 0, 268, 324, 275, 267, 587, 0, 0,
+	0, 0, 0, 0, 603, 0, 0, 231, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 278, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 300, 0, 406, 260, 0, 459,
+	0, 0, 0, 636, 0, 0, 0, 0, 0, 0,
+	0, 368, 0, 333, 199, 227, 0, 0, 416, 467,
+	479, 0, 0, 0, 256, 0, 477, 430, 611, 235,
+	287, 464, 437, 475, 445, 290, 0, 0, 476, 375,
+	592, 455, 608, 637, 638, 266, 410, 622, 528, 630,
+	655, 228, 263, 424, 512, 614, 500, 401, 588, 589,
+	332, 499, 298, 203, 372, 643, 226, 485, 374, 244,
+	233, 594, 619, 302, 254, 292, 462, 650, 215, 523,
+	605, 241, 489, 0, 0, 658, 249, 510, 617, 606,
+	217, 601, 509, 397, 329, 330, 216, 0, 463, 271,
+	296, 0, 0, 261, 419, 596, 597, 259, 659, 230,
+	629, 222, 0, 628, 412, 591, 602, 398, 386, 221,
+	600, 396, 385, 337, 358, 359, 283, 310, 452, 378,
+	453, 309, 311, 408, 407, 409, 209, 615, 633, 0,
+	210, 0, 505, 618, 660, 457, 214, 236, 237, 239,
+	0, 282, 286, 294, 297, 306, 307, 316, 370, 423,
+	451, 447, 456, 0, 585, 609, 623, 635, 641, 642,
+	644, 645, 646, 647, 648, 651, 649, 411, 314, 501,
+	336, 376, 0, 0, 429, 478, 242, 613, 502, 201,
+	0, 0, 0, 0, 257, 258, 0, 581, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 661, 662, 663,
+	664, 665, 666, 667, 668, 669, 670, 671, 672, 673,
+	674, 675, 676, 677, 678, 656, 514, 520, 515, 516,
+	517, 518, 519, 0, 521, 0, 0, 0, 0, 0,
+	402, 0, 598, 599, 679, 387, 492, 610, 338, 352,
+	355, 344, 364, 0, 365, 340, 341, 346, 349, 350,
+	351, 356, 357, 361, 367, 251, 212, 394, 403, 584,
+	315, 218, 219, 220, 530, 531, 532, 533, 626, 627,
+	631, 207, 468, 469, 470, 471, 295, 621, 312, 474,
+	473, 334, 335, 382, 454, 546, 548, 559, 563, 565,
+	567, 573, 576, 547, 549, 560, 564, 566, 568, 574,
+	577, 536, 538, 540, 542, 555, 554, 551, 579, 580,
+	557, 562, 541, 553, 558, 571, 578, 575, 535, 539,
+	543, 552, 570, 569, 550, 561, 572, 556, 544, 537,
+	545, 0, 198, 223, 371, 0, 460, 291, 657, 625,
+	490, 620, 208, 225, 0, 265, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 200, 202, 211,
+	224, 234, 238, 245, 264, 279, 281, 288, 301, 313,
+	321, 322, 325, 331, 383, 390, 391, 392, 393, 413,
+	414, 415, 418, 421, 422, 425, 427, 428, 431, 436,
+	440, 441, 442, 444, 446, 448, 461, 466, 480, 481,
+	482, 483, 484, 487, 488, 494, 495, 496, 497, 498,
+	506, 507, 522, 593, 595, 612, 632, 639, 486, 388,
+	434, 458, 586, 304, 305, 449, 450, 317, 318, 653,
+	654, 303, 607, 640, 604, 652, 634, 443, 381, 0,
+	0, 384, 284, 308, 323, 0, 624, 508, 229, 472,
+	293, 253, 0, 0, 213, 248, 232, 262, 277, 280,
+	327, 395, 404, 433, 439, 299, 274, 246, 465, 243,
+	491, 525, 526, 527, 529, 399, 269, 438, 400, 0,
+	379, 582, 583, 319, 0, 0, 0, 534, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 420,
+	0, 0, 0, 0, 0, 0, 0, 273, 0, 0,
+	0, 0, 369, 270, 0, 0, 206, 511, 0, 435,
+	0, 205, 0, 493, 255, 380, 377, 590, 285, 276,
+	272, 252, 320, 389, 432, 524, 426, 0, 373, 0,
+	0, 503, 405, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 326, 250, 328, 204, 417, 504, 289, 0, 0,
+	0, 0, 0, 513, 731, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 240, 0, 0, 247, 0, 0,
+	0, 354, 363, 362, 342, 343, 345, 347, 353, 360,
+	366, 339, 348, 0, 0, 616, 0, 0, 0, 268,
+	324, 275, 267, 587, 0, 0, 0, 0, 0, 0,
+	603, 0, 0, 231, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 278, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	300, 0, 406, 260, 0, 459, 0, 0, 0, 636,
+	0, 0, 0, 4093, 0, 0, 0, 368, 0, 333,
+	199, 227, 0, 0, 416, 467, 479, 0, 0, 0,
+	256, 0, 477, 430, 611, 235, 287, 464, 437, 475,
+	445, 290, 0, 0, 476, 375, 592, 455, 608, 637,
+	638, 266, 410, 622, 528, 630, 655, 228, 263, 424,
+	512, 614, 500, 401, 588, 589, 332, 499, 298, 203,
+	372, 643, 226, 485, 374, 244, 233, 594, 619, 302,
+	254, 292, 462, 650, 215, 523, 605, 241, 489, 0,
+	0, 658, 249, 510, 617, 606, 217, 601, 509, 397,
+	329, 330, 216, 0, 463, 271, 296, 0, 0, 261,
+	419, 596, 597, 259, 659, 230, 629, 222, 0, 628,
+	412, 591, 602, 398, 386, 221, 600, 396, 385, 337,
+	358, 359, 283, 310, 452, 378, 453, 309, 311, 408,
+	407, 409, 209, 615, 633, 0, 210, 0, 505, 618,
+	660, 457, 214, 236, 237, 239, 0, 282, 286, 294,
+	297, 306, 307, 316, 370, 423, 451, 447, 456, 0,
+	585, 609, 623, 635, 641, 642, 644, 645, 646, 647,
+	648, 651, 649, 411, 314, 501, 336, 376, 0, 0,
+	429, 478, 242, 613, 502, 201, 0, 0, 0, 0,
+	257, 258, 0, 581, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 661, 662, 663, 664, 665, 666, 667,
+	668, 669, 670, 671, 672, 673, 674, 675, 676, 677,
+	678, 656, 514, 520, 515, 516, 517, 518, 519, 0,
+	521, 0, 0, 0, 0, 0, 402, 0, 598, 599,
+	679, 387, 492, 610, 338, 352, 355, 344, 364, 0,
+	365, 340, 341, 346, 349, 350, 351, 356, 357, 361,
+	367, 251, 212, 394, 403, 584, 315, 218, 219, 220,
+	530, 531, 532, 533, 626, 627, 631, 207, 468, 469,
+	470, 471, 295, 621, 312, 474, 473, 334, 335, 382,
+	454, 546, 548, 559, 563, 565, 567, 573, 576, 547,
+	549, 560, 564, 566, 568, 574, 577, 536, 538, 540,
+	542, 555, 554, 551, 579, 580, 557, 562, 541, 553,
+	558, 571, 578, 575, 535, 539, 543, 552, 570, 569,
+	550, 561, 572, 556, 544, 537, 545, 0, 198, 223,
+	371, 0, 460, 291, 657, 625, 490, 620, 208, 225,
+	0, 265, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 200, 202, 211, 224, 234, 238, 245,
+	264, 279, 281, 288, 301, 313, 321, 322, 325, 331,
+	383, 390, 391, 392, 393, 413, 414, 415, 418, 421,
+	422, 425, 427, 428, 431, 436, 440, 441, 442, 444,
+	446, 448, 461, 466, 480, 481, 482, 483, 484, 487,
+	488, 494, 495, 496, 497, 498, 506, 507, 522, 593,
+	595, 612, 632, 639, 486, 388, 434, 458, 586, 304,
+	305, 449, 450, 317, 318, 653, 654, 303, 607, 640,
+	604, 652, 634, 443, 381, 0, 0, 384, 284, 308,
+	323, 0, 624, 508, 229, 472, 293, 253, 0, 0,
+	213, 248, 232, 262, 277, 280, 327, 395, 404, 433,
+	439, 299, 274, 246, 465, 243, 491, 525, 526, 527,
+	529, 399, 269, 438, 400, 0, 379, 582, 583, 319,
+	0, 0, 0, 534, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 420, 0, 0, 0, 0,
+	0, 0, 0, 273, 0, 0, 0, 0, 369, 270,
+	0, 0, 206, 511, 0, 435, 0, 205, 0, 493,
+	255, 380, 377, 590, 285, 276, 272, 252, 320, 389,
+	432, 524, 426, 0, 373, 0, 0, 503, 405, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 326, 250, 328,
+	204, 417, 504, 289, 0, 0, 0, 0, 1977, 513,
+	196, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	240, 0, 0, 247, 0, 0, 0, 354, 363, 362,
+	342, 343, 345, 347, 353, 360, 366, 339, 348, 0,
+	0, 616, 0, 0, 0, 268, 324, 275, 267, 587,
+	0, 0, 0, 0, 0, 0, 603, 0, 0, 231,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 278, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 300, 0, 406, 260,
+	0, 459, 0, 0, 0, 636, 0, 0, 0, 0,
+	0, 0, 0, 368, 0, 333, 199, 227, 0, 0,
+	416, 467, 479, 0, 0, 0, 256, 0, 477, 430,
+	611, 235, 287, 464, 437, 475, 445, 290, 0, 0,
+	476, 375, 592, 455, 608, 637, 638, 266, 410, 622,
+	528, 630, 655, 228, 263, 424, 512, 614, 500, 401,
+	588, 589, 332, 499, 298, 203, 372, 643, 226, 485,
+	374, 244, 233, 594, 619, 302, 254, 292, 462, 650,
+	215, 523, 605, 241, 489, 0, 0, 658, 249, 510,
+	617, 606, 217, 601, 509, 397, 329, 330, 216, 0,
+	463, 271, 296, 0, 0, 261, 419, 596, 597, 259,
+	659, 230, 629, 222, 0, 628, 412, 591, 602, 398,
+	386, 221, 600, 396, 385, 337, 358, 359, 283, 310,
+	452, 378, 453, 309, 311, 408, 407, 409, 209, 615,
+	633, 0, 210, 0, 505, 618, 660, 457, 214, 236,
+	237, 239, 0, 282, 286, 294, 297, 306, 307, 316,
+	370, 423, 451, 447, 456, 0, 585, 609, 623, 635,
+	641, 642, 644, 645, 646, 647, 648, 651, 649, 411,
+	314, 501, 336, 376, 0, 0, 429, 478, 242, 613,
+	502, 201, 0, 0, 0, 0, 257, 258, 0, 581,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 661,
+	662, 663, 664, 665, 666, 667, 668, 669, 670, 671,
+	672, 673, 674, 675, 676, 677, 678, 656, 514, 520,
+	515, 516, 517, 518, 519, 0, 521, 0, 0, 0,
+	0, 0, 402, 0, 598, 599, 679, 387, 492, 610,
+	338, 352, 355, 344, 364, 0, 365, 340, 341, 346,
+	349, 350, 351, 356, 357, 361, 367, 251, 212, 394,
+	403, 584, 315, 218, 219, 220, 530, 531, 532, 533,
+	626, 627, 631, 207, 468, 469, 470, 471, 295, 621,
+	312, 474, 473, 334, 335, 382, 454, 546, 548, 559,
+	563, 565, 567, 573, 576, 547, 549, 560, 564, 566,
+	568, 574, 577, 536, 538, 540, 542, 555, 554, 551,
+	579, 580, 557, 562, 541, 553, 558, 571, 578, 575,
+	535, 539, 543, 552, 570, 569, 550, 561, 572, 556,
+	544, 537, 545, 0, 198, 223, 371, 0, 460, 291,
+	657, 625, 490, 620, 208, 225, 0, 265, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 200,
+	202, 211, 224, 234, 238, 245, 264, 279, 281, 288,
+	301, 313, 321, 322, 325, 331, 383, 390, 391, 392,
+	393, 413, 414, 415, 418, 421, 422, 425, 427, 428,
+	431, 436, 440, 441, 442, 444, 446, 448, 461, 466,
+	480, 481, 482, 483, 484, 487, 488, 494, 495, 496,
+	497, 498, 506, 507, 522, 593, 595, 612, 632, 639,
+	486, 388, 434, 458, 586, 304, 305, 449, 450, 317,
+	318, 653, 654, 303, 607, 640, 604, 652, 634, 443,
+	381, 0, 0, 384, 284, 308, 323, 0, 624, 508,
+	229, 472, 293, 253, 0, 0, 213, 248, 232, 262,
+	277, 280, 327, 395, 404, 433, 439, 299, 274, 246,
+	465, 243, 491, 525, 526, 527, 529, 399, 269, 438,
+	400, 0, 379, 582, 583, 319, 0, 0, 0, 534,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 420, 0, 0, 0, 0, 0, 0, 0, 273,
+	0, 0, 0, 0, 369, 270, 0, 0, 206, 511,
+	0, 435, 0, 205, 0, 493, 255, 380, 377, 590,
+	285, 276, 272, 252, 320, 389, 432, 524, 426, 0,
+	373, 0, 0, 503, 405, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 326, 250, 328, 204, 417, 504, 289,
+	0, 0, 0, 0, 0, 513, 731, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 240, 0, 0, 247,
+	0, 0, 0, 354, 363, 362, 342, 343, 345, 347,
+	353, 360, 366, 339, 348, 0, 0, 616, 0, 0,
+	0, 268, 324, 275, 267, 587, 0, 0, 0, 0,
+	0, 0, 603, 0, 0, 231, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	278, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 300, 0, 406, 260, 0, 459, 0, 0,
+	0, 636, 0, 0, 0, 3749, 0, 0, 0, 368,
+	0, 333, 199, 227, 0, 0, 416, 467, 479, 0,
+	0, 0, 256, 0, 477, 430, 611, 235, 287, 464,
+	437, 475, 445, 290, 0, 0, 476, 375, 592, 455,
+	608, 637, 638, 266, 410, 622, 528, 630, 655, 228,
+	263, 424, 512, 614, 500, 401, 588, 589, 332, 499,
+	298, 203, 372, 643, 226, 485, 374, 244, 233, 594,
+	619, 302, 254, 292, 462, 650, 215, 523, 605, 241,
+	489, 0, 0, 658, 249, 510, 617, 606, 217, 601,
+	509, 397, 329, 330, 216, 0, 463, 271, 296, 0,
+	0, 261, 419, 596, 597, 259, 659, 230, 629, 222,
+	0, 628, 412, 591, 602, 398, 386, 221, 600, 396,
+	385, 337, 358, 359, 283, 310, 452, 378, 453, 309,
+	311, 408, 407, 409, 209, 615, 633, 0, 210, 0,
+	505, 618, 660, 457, 214, 236, 237, 239, 0, 282,
+	286, 294, 297, 306, 307, 316, 370, 423, 451, 447,
+	456, 0, 585, 609, 623, 635, 641, 642, 644, 645,
+	646, 647, 648, 651, 649, 411, 314, 501, 336, 376,
+	0, 0, 429, 478, 242, 613, 502, 201, 0, 0,
+	0, 0, 257, 258, 0, 581, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 661, 662, 663, 664, 665,
+	666, 667, 668, 669, 670, 671, 672, 673, 674, 675,
+	676, 677, 678, 656, 514, 520, 515, 516, 517, 518,
+	519, 0, 521, 0, 0, 0, 0, 0, 402, 0,
+	598, 599, 679, 387, 492, 610, 338, 352, 355, 344,
+	364, 0, 365, 340, 341, 346, 349, 350, 351, 356,
+	357, 361, 367, 251, 212, 394, 403, 584, 315, 218,
+	219, 220, 530, 531, 532, 533, 626, 627, 631, 207,
+	468, 469, 470, 471, 295, 621, 312, 474, 473, 334,
+	335, 382, 454, 546, 548, 559, 563, 565, 567, 573,
+	576, 547, 549, 560, 564, 566, 568, 574, 577, 536,
+	538, 540, 542, 555, 554, 551, 579, 580, 557, 562,
+	541, 553, 558, 571, 578, 575, 535, 539, 543, 552,
+	570, 569, 550, 561, 572, 556, 544, 537, 545, 0,
+	198, 223, 371, 0, 460, 291, 657, 625, 490, 620,
+	208, 225, 0, 265, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 200, 202, 211, 224, 234,
+	238, 245, 264, 279, 281, 288, 301, 313, 321, 322,
+	325, 331, 383, 390, 391, 392, 393, 413, 414, 415,
+	418, 421, 422, 425, 427, 428, 431, 436, 440, 441,
+	442, 444, 446, 448, 461, 466, 480, 481, 482, 483,
+	484, 487, 488, 494, 495, 496, 497, 498, 506, 507,
+	522, 593, 595, 612, 632, 639, 486, 388, 434, 458,
+	586, 304, 305, 449, 450, 317, 318, 653, 654, 303,
+	607, 640, 604, 652, 634, 443, 381, 0, 0, 384,
+	284, 308, 323, 0, 624, 508, 229, 472, 293, 253,
+	0, 0, 213, 248, 232, 262, 277, 280, 327, 395,
+	404, 433, 439, 299, 274, 246, 465, 243, 491, 525,
+	526, 527, 529, 399, 269, 438, 400, 0, 379, 582,
+	583, 319, 0, 0, 0, 534, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 420, 0, 0,
+	0, 0, 0, 0, 0, 273, 0, 0, 0, 0,
+	369, 270, 0, 0, 206, 511, 0, 435, 0, 205,
+	0, 493, 255, 380, 377, 590, 285, 276, 272, 252,
+	320, 389, 432, 524, 426, 0, 373, 0, 0, 503,
+	405, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 326,
+	250, 328, 204, 417, 504, 289, 0, 95, 0, 0,
+	0, 513, 731, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 240, 0, 0, 247, 0, 0, 0, 354,
+	363, 362, 342, 343, 345, 347, 353, 360, 366, 339,
+	348, 0, 0, 616, 0, 0, 0, 268, 324, 275,
+	267, 587, 0, 0, 0, 0, 0, 0, 603, 0,
+	0, 231, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 278, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 300, 0,
+	406, 260, 0, 459, 0, 0, 0, 636, 0, 0,
+	0, 0, 0, 0, 0, 368, 0, 333, 199, 227,
+	0, 0, 416, 467, 479, 0, 0, 0, 256, 0,
+	477, 430, 611, 235, 287, 464, 437, 475, 445, 290,
+	0, 0, 476, 375, 592, 455, 608, 637, 638, 266,
+	410, 622, 528, 630, 655, 228, 263, 424, 512, 614,
+	500, 401, 588, 589, 332, 499, 298, 203, 372, 643,
+	226, 485, 374, 244, 233, 594, 619, 302, 254, 292,
+	462, 650, 215, 523, 605, 241, 489, 0, 0, 658,
+	249, 510, 617, 606, 217, 601, 509, 397, 329, 330,
+	216, 0, 463, 271, 296, 0, 0, 261, 419, 596,
+	597, 259, 659, 230, 629, 222, 0, 628, 412, 591,
+	602, 398, 386, 221, 600, 396, 385, 337, 358, 359,
+	283, 310, 452, 378, 453, 309, 311, 408, 407, 409,
+	209, 615, 633, 0, 210, 0, 505, 618, 660, 457,
+	214, 236, 237, 239, 0, 282, 286, 294, 297, 306,
+	307, 316, 370, 423, 451, 447, 456, 0, 585, 609,
+	623, 635, 641, 642, 644, 645, 646, 647, 648, 651,
+	649, 411, 314, 501, 336, 376, 0, 0, 429, 478,
+	242, 613, 502, 201, 0, 0, 0, 0, 257, 258,
+	0, 581, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 661, 662, 663, 664, 665, 666, 667, 668, 669,
+	670, 671, 672, 673, 674, 675, 676, 677, 678, 656,
+	514, 520, 515, 516, 517, 518, 519, 0, 521, 0,
+	0, 0, 0, 0, 402, 0, 598, 599, 679, 387,
+	492, 610, 338, 352, 355, 344, 364, 0, 365, 340,
+	341, 346, 349, 350, 351, 356, 357, 361, 367, 251,
+	212, 394, 403, 584, 315, 218, 219, 220, 530, 531,
+	532, 533, 626, 627, 631, 207, 468, 469, 470, 471,
+	295, 621, 312, 474, 473, 334, 335, 382, 454, 546,
+	548, 559, 563, 565, 567, 573, 576, 547, 549, 560,
+	564, 566, 568, 574, 577, 536, 538, 540, 542, 555,
+	554, 551, 579, 580, 557, 562, 541, 553, 558, 571,
+	578, 575, 535, 539, 543, 552, 570, 569, 550, 561,
+	572, 556, 544, 537, 545, 0, 198, 223, 371, 0,
+	460, 291, 657, 625, 490, 620, 208, 225, 0, 265,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 200, 202, 211, 224, 234, 238, 245, 264, 279,
+	281, 288, 301, 313, 321, 322, 325, 331, 383, 390,
+	391, 392, 393, 413, 414, 415, 418, 421, 422, 425,
+	427, 428, 431, 436, 440, 441, 442, 444, 446, 448,
+	461, 466, 480, 481, 482, 483, 484, 487, 488, 494,
+	495, 496, 497, 498, 506, 507, 522, 593, 595, 612,
+	632, 639, 486, 388, 434, 458, 586, 304, 305, 449,
+	450, 317, 318, 653, 654, 303, 607, 640, 604, 652,
+	634, 443, 381, 0, 0, 384, 284, 308, 323, 0,
+	624, 508, 229, 472, 293, 253, 0, 0, 213, 248,
+	232, 262, 277, 280, 327, 395, 404, 433, 439, 299,
+	274, 246, 465, 243, 491, 525, 526, 527, 529, 399,
+	269, 438, 400, 0, 379, 582, 583, 319, 0, 0,
+	0, 534, 0, 0, 0, 0, 2445, 0, 0, 0,
+	0, 0, 0, 420, 0, 0, 0, 0, 0, 0,
+	0, 273, 0, 0, 0, 0, 369, 270, 0, 0,
+	206, 511, 0, 435, 0, 205, 0, 493, 255, 380,
+	377, 590, 285, 276, 272, 252, 320, 389, 432, 524,
+	426, 0, 373, 0, 0, 503, 405, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 326, 250, 328, 204, 417,
+	504, 289, 0, 0, 0, 0, 0, 513, 196, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 240, 0,
+	0, 247, 0, 0, 0, 354, 363, 362, 342, 343,
+	345, 347, 353, 360, 366, 339, 348, 0, 0, 616,
+	0, 0, 0, 268, 324, 275, 267, 587, 0, 0,
+	0, 0, 0, 0, 603, 0, 0, 231, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 278, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 300, 0, 406, 260, 0, 459,
+	0, 0, 0, 636, 0, 0, 0, 0, 0, 0,
+	0, 368, 0, 333, 199, 227, 0, 0, 416, 467,
+	479, 0, 0, 0, 256, 0, 477, 430, 611, 235,
+	287, 464, 437, 475, 445, 290, 0, 0, 476, 375,
+	592, 455, 608, 637, 638, 266, 410, 622, 528, 630,
+	655, 228, 263, 424, 512, 614, 500, 401, 588, 589,
+	332, 499, 298, 203, 372, 643, 226, 485, 374, 244,
+	233, 594, 619, 302, 254, 292, 462, 650, 215, 523,
+	605, 241, 489, 0, 0, 658, 249, 510, 617, 606,
+	217, 601, 509, 397, 329, 330, 216, 0, 463, 271,
+	296, 0, 0, 261, 419, 596, 597, 259, 659, 230,
+	629, 222, 0, 628, 412, 591, 602, 398, 386, 221,
+	600, 396, 385, 337, 358, 359, 283, 310, 452, 378,
+	453, 309, 311, 408, 407, 409, 209, 615, 633, 0,
+	210, 0, 505, 618, 660, 457, 214, 236, 237, 239,
+	0, 282, 286, 294, 297, 306, 307, 316, 370, 423,
+	451, 447, 456, 0, 585, 609, 623, 635, 641, 642,
+	644, 645, 646, 647, 648, 651, 649, 411, 314, 501,
+	336, 376, 0, 0, 429, 478, 242, 613, 502, 201,
+	0, 0, 0, 0, 257, 258, 0, 581, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 661, 662, 663,
+	664, 665, 666, 667, 668, 669, 670, 671, 672, 673,
+	674, 675, 676, 677, 678, 656, 514, 520, 515, 516,
+	517, 518, 519, 0, 521, 0, 0, 0, 0, 0,
+	402, 0, 598, 599, 679, 387, 492, 610, 338, 352,
+	355, 344, 364, 0, 365, 340, 341, 346, 349, 350,
+	351, 356, 357, 361, 367, 251, 212, 394, 403, 584,
+	315, 218, 219, 220, 530, 531, 532, 533, 626, 627,
+	631, 207, 468, 469, 470, 471, 295, 621, 312, 474,
+	473, 334, 335, 382, 454, 546, 548, 559, 563, 565,
+	567, 573, 576, 547, 549, 560, 564, 566, 568, 574,
+	577, 536, 538, 540, 542, 555, 554, 551, 579, 580,
+	557, 562, 541, 553, 558, 571, 578, 575, 535, 539,
+	543, 552, 570, 569, 550, 561, 572, 556, 544, 537,
+	545, 0, 198, 223, 371, 0, 460, 291, 657, 625,
+	490, 620, 208, 225, 0, 265, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 200, 202, 211,
+	224, 234, 238, 245, 264, 279, 281, 288, 301, 313,
+	321, 322, 325, 331, 383, 390, 391, 392, 393, 413,
+	414, 415, 418, 421, 422, 425, 427, 428, 431, 436,
+	440, 441, 442, 444, 446, 448, 461, 466, 480, 481,
+	482, 483, 484, 487, 488, 494, 495, 496, 497, 498,
+	506, 507, 522, 593, 595, 612, 632, 639, 486, 388,
+	434, 458, 586, 304, 305, 449, 450, 317, 318, 653,
+	654, 303, 607, 640, 604, 652, 634, 443, 381, 0,
+	0, 384, 284, 308, 323, 0, 624, 508, 229, 472,
+	293, 253, 0, 0, 213, 248, 232, 262, 277, 280,
+	327, 395, 404, 433, 439, 299, 274, 246, 465, 243,
+	491, 525, 526, 527, 529, 399, 269, 438, 400, 0,
+	379, 582, 583, 319, 0, 0, 0, 534, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 420,
+	0, 0, 0, 0, 0, 0, 0, 273, 0, 0,
+	0, 0, 369, 270, 0, 0, 206, 511, 0, 435,
+	0, 205, 0, 493, 255, 380, 377, 590, 285, 276,
+	272, 252, 320, 389, 432, 524, 426, 0, 373, 0,
+	0, 503, 405, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 326, 250, 328, 204, 417, 504, 289, 0, 0,
+	0, 0, 1796, 513, 731, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 240, 0, 0, 247, 0, 0,
+	0, 354, 363, 362, 342, 343, 345, 347, 353, 360,
+	366, 339, 348, 0, 0, 616, 0, 0, 0, 268,
+	324, 275, 267, 587, 0, 0, 0, 0, 0, 0,
+	603, 0, 0, 231, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 278, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	300, 0, 406, 260, 0, 459, 0, 0, 0, 636,
+	0, 0, 0, 0, 0, 0, 0, 368, 0, 333,
+	199, 227, 0, 0, 416, 467, 479, 0, 0, 0,
+	256, 0, 477, 430, 611, 235, 287, 464, 437, 475,
+	445, 290, 0, 0, 476, 375, 592, 455, 608, 637,
+	638, 266, 410, 622, 528, 630, 655, 228, 263, 424,
+	512, 614, 500, 401, 588, 589, 332, 499, 298, 203,
+	372, 643, 226, 485, 374, 244, 233, 594, 619, 302,
+	254, 292, 462, 650, 215, 523, 605, 241, 489, 0,
+	0, 658, 249, 510, 617, 606, 217, 601, 509, 397,
+	329, 330, 216, 0, 463, 271, 296, 0, 0, 261,
+	419, 596, 597, 259, 659, 230, 629, 222, 0, 628,
+	412, 591, 602, 398, 386, 221, 600, 396, 385, 337,
+	358, 359, 283, 310, 452, 378, 453, 309, 311, 408,
+	407, 409, 209, 615, 633, 0, 210, 0, 505, 618,
+	660, 457, 214, 236, 237, 239, 0, 282, 286, 294,
+	297, 306, 307, 316, 370, 423, 451, 447, 456, 0,
+	585, 609, 623, 635, 641, 642, 644, 645, 646, 647,
+	648, 651, 649, 411, 314, 501, 336, 376, 0, 0,
+	429, 478, 242, 613, 502, 201, 0, 0, 0, 0,
+	257, 258, 0, 581, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 661, 662, 663, 664, 665, 666, 667,
+	668, 669, 670, 671, 672, 673, 674, 675, 676, 677,
+	678, 656, 514, 520, 515, 516, 517, 518, 519, 0,
+	521, 0, 0, 0, 0, 0, 402, 0, 598, 599,
+	679, 387, 492, 610, 338, 352, 355, 344, 364, 0,
+	365, 340, 341, 346, 349, 350, 351, 356, 357, 361,
+	367, 251, 212, 394, 403, 584, 315, 218, 219, 220,
+	530, 531, 532, 533, 626, 627, 631, 207, 468, 469,
+	470, 471, 295, 621, 312, 474, 473, 334, 335, 382,
+	454, 546, 548, 559, 563, 565, 567, 573, 576, 547,
+	549, 560, 564, 566, 568, 574, 577, 536, 538, 540,
+	542, 555, 554, 551, 579, 580, 557, 562, 541, 553,
+	558, 571, 578, 575, 535, 539, 543, 552, 570, 569,
+	550, 561, 572, 556, 544, 537, 545, 0, 198, 223,
+	371, 0, 460, 291, 657, 625, 490, 620, 208, 225,
+	0, 265, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 200, 202, 211, 224, 234, 238, 245,
+	264, 279, 281, 288, 301, 313, 321, 322, 325, 331,
+	383, 390, 391, 392, 393, 413, 414, 415, 418, 421,
+	422, 425, 427, 428, 431, 436, 440, 441, 442, 444,
+	446, 448, 461, 466, 480, 481, 482, 483, 484, 487,
+	488, 494, 495, 496, 497, 498, 506, 507, 522, 593,
+	595, 612, 632, 639, 486, 388, 434, 458, 586, 304,
+	305, 449, 450, 317, 318, 653, 654, 303, 607, 640,
+	604, 652, 634, 443, 381, 0, 0, 384, 284, 308,
+	323, 0, 624, 508, 229, 472, 293, 253, 0, 0,
+	213, 248, 232, 262, 277, 280, 327, 395, 404, 433,
+	439, 299, 274, 246, 465, 243, 491, 525, 526, 527,
+	529, 399, 269, 438, 400, 0, 379, 582, 583, 319,
+	0, 0, 0, 534, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 420, 0, 0, 0, 0,
+	0, 0, 0, 273, 0, 0, 0, 0, 369, 270,
+	0, 0, 206, 511, 0, 435, 0, 205, 0, 493,
+	255, 380, 377, 590, 285, 276, 272, 252, 320, 389,
+	432, 524, 426, 0, 373, 0, 0, 503, 405, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 326, 250, 328,
+	204, 417, 504, 289, 0, 0, 0, 0, 0, 513,
+	196, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	240, 0, 0, 247, 0, 0, 0, 354, 363, 362,
+	342, 343, 345, 347, 353, 360, 366, 339, 348, 0,
+	0, 616, 0, 0, 0, 268, 324, 275, 267, 587,
+	0, 0, 0, 0, 0, 0, 603, 0, 0, 231,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 278, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 300, 0, 406, 260,
+	0, 459, 0, 0, 0, 636, 0, 0, 0, 0,
+	0, 0, 0, 368, 0, 333, 199, 227, 0, 0,
+	416, 467, 479, 0, 0, 0, 256, 0, 477, 430,
+	611, 235, 287, 464, 437, 475, 445, 290, 0, 0,
+	476, 375, 592, 455, 608, 637, 638, 266, 410, 622,
+	528, 630, 655, 228, 263, 424, 512, 614, 500, 401,
+	588, 589, 332, 499, 298, 203, 372, 643, 226, 485,
+	374, 244, 233, 594, 619, 302, 254, 292, 462, 650,
+	215, 523, 605, 241, 489, 0, 0, 658, 249, 510,
+	617, 606, 217, 601, 509, 397, 329, 330, 216, 0,
+	463, 271, 296, 0, 0, 261, 419, 596, 597, 259,
+	659, 230, 629, 222, 0, 628, 412, 591, 602, 398,
+	386, 221, 600, 396, 385, 337, 358, 359, 283, 310,
+	452, 378, 453, 309, 311, 408, 407, 409, 209, 615,
+	633, 0, 210, 0, 505, 618, 660, 457, 214, 236,
+	237, 239, 0, 282, 286, 294, 297, 306, 307, 316,
+	370, 423, 451, 447, 456, 0, 585, 609, 623, 635,
+	641, 642, 644, 645, 646, 647, 648, 651, 649, 411,
+	314, 501, 336, 376, 0, 0, 429, 478, 242, 613,
+	502, 201, 0, 0, 0, 0, 257, 258, 0, 581,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 661,
+	662, 663, 664, 665, 666, 667, 668, 669, 670, 671,
+	672, 673, 674, 675, 676, 677, 678, 656, 514, 520,
+	515, 516, 517, 518, 519, 0, 521, 0, 0, 0,
+	0, 0, 402, 0, 598, 599, 679, 387, 492, 610,
+	338, 352, 355, 344, 364, 0, 365, 340, 341, 346,
+	349, 350, 351, 356, 357, 361, 367, 251, 212, 394,
+	403, 584, 315, 218, 219, 220, 530, 531, 532, 533,
+	626, 627, 631, 207, 468, 469, 470, 471, 295, 621,
+	312, 474, 473, 334, 335, 382, 454, 546, 548, 559,
+	563, 565, 567, 573, 576, 547, 549, 560, 564, 566,
+	568, 574, 577, 536, 538, 540, 542, 555, 554, 551,
+	579, 580, 557, 562, 541, 553, 558, 571, 578, 575,
+	535, 539, 543, 552, 570, 569, 550, 561, 572, 556,
+	544, 537, 545, 0, 198, 223, 371, 2095, 460, 291,
+	657, 625, 490, 620, 208, 225, 0, 265, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 200,
+	202, 211, 224, 234, 238, 245, 264, 279, 281, 288,
+	301, 313, 321, 322, 325, 331, 383, 390, 391, 392,
+	393, 413, 414, 415, 418, 421, 422, 425, 427, 428,
+	431, 436, 440, 441, 442, 444, 446, 448, 461, 466,
+	480, 481, 482, 483, 484, 487, 488, 494, 495, 496,
+	497, 498, 506, 507, 522, 593, 595, 612, 632, 639,
+	486, 388, 434, 458, 586, 304, 305, 449, 450, 317,
+	318, 653, 654, 303, 607, 640, 604, 652, 634, 443,
+	381, 0, 0, 384, 284, 308, 323, 0, 624, 508,
+	229, 472, 293, 253, 0, 0, 213, 248, 232, 262,
+	277, 280, 327, 395, 404, 433, 439, 299, 274, 246,
+	465, 243, 491, 525, 526, 527, 529, 399, 269, 438,
+	400, 0, 379, 582, 583, 319, 0, 0, 0, 534,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 420, 0, 0, 0, 0, 0, 0, 0, 273,
+	0, 0, 0, 0, 369, 270, 0, 0, 206, 511,
+	0, 435, 0, 205, 0, 493, 255, 380, 377, 590,
+	285, 276, 272, 252, 320, 389, 432, 524, 426, 0,
+	373, 0, 0, 503, 405, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 326, 250, 328, 204, 417, 504, 289,
+	0, 0, 0, 0, 2086, 513, 731, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 240, 0, 0, 247,
+	0, 0, 0, 354, 363, 362, 342, 343, 345, 347,
+	353, 360, 366, 339, 348, 0, 0, 616, 0, 0,
+	0, 268, 324, 275, 267, 587, 0, 0, 0, 0,
+	0, 0, 603, 0, 0, 231, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	278, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 300, 0, 406, 260, 0, 459, 0, 0,
+	0, 636, 0, 0, 0, 0, 0, 0, 0, 368,
+	0, 333, 199, 227, 0, 0, 416, 467, 479, 0,
+	0, 0, 256, 0, 477, 430, 611, 235, 287, 464,
+	437, 475, 445, 290, 0, 0, 476, 375, 592, 455,
+	608, 637, 638, 266, 410, 622, 528, 630, 655, 228,
+	263, 424, 512, 614, 500, 401, 588, 589, 332, 499,
+	298, 203, 372, 643, 226, 485, 374, 244, 233, 594,
+	619, 302, 254, 292, 462, 650, 215, 523, 605, 241,
+	489, 0, 0, 658, 249, 510, 617, 606, 217, 601,
+	509, 397, 329, 330, 216, 0, 463, 271, 296, 0,
+	0, 261, 419, 596, 597, 259, 659, 230, 629, 222,
+	0, 628, 412, 591, 602, 398, 386, 221, 600, 396,
+	385, 337, 358, 359, 283, 310, 452, 378, 453, 309,
+	311, 408, 407, 409, 209, 615, 633, 0, 210, 0,
+	505, 618, 660, 457, 214, 236, 237, 239, 0, 282,
+	286, 294, 297, 306, 307, 316, 370, 423, 451, 447,
+	456, 0, 585, 609, 623, 635, 641, 642, 644, 645,
+	646, 647, 648, 651, 649, 411, 314, 501, 336, 376,
+	0, 0, 429, 478, 242, 613, 502, 201, 0, 0,
+	0, 0, 257, 258, 0, 581, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 661, 662, 663, 664, 665,
+	666, 667, 668, 669, 670, 671, 672, 673, 674, 675,
+	676, 677, 678, 656, 514, 520, 515, 516, 517, 518,
+	519, 0, 521, 0, 0, 0, 0, 0, 402, 0,
+	598, 599, 679, 387, 492, 610, 338, 352, 355, 344,
+	364, 0, 365, 340, 341, 346, 349, 350, 351, 356,
+	357, 361, 367, 251, 212, 394, 403, 584, 315, 218,
+	219, 220, 530, 531, 532, 533, 626, 627, 631, 207,
+	468, 469, 470, 471, 295, 621, 312, 474, 473, 334,
+	335, 382, 454, 546, 548, 559, 563, 565, 567, 573,
+	576, 547, 549, 560, 564, 566, 568, 574, 577, 536,
+	538, 540, 542, 555, 554, 551, 579, 580, 557, 562,
+	541, 553, 558, 571, 578, 575, 535, 539, 543, 552,
+	570, 569, 550, 561, 572, 556, 544, 537, 545, 0,
+	198, 223, 371, 0, 460, 291, 657, 625, 490, 620,
+	208, 225, 0, 265, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 200, 202, 211, 224, 234,
+	238, 245, 264, 279, 281, 288, 301, 313, 321, 322,
+	325, 331, 383, 390, 391, 392, 393, 413, 414, 415,
+	418, 421, 422, 425, 427, 428, 431, 436, 440, 441,
+	442, 444, 446, 448, 461, 466, 480, 481, 482, 483,
+	484, 487, 488, 494, 495, 496, 497, 498, 506, 507,
+	522, 593, 595, 612, 632, 639, 486, 388, 434, 458,
+	586, 304, 305, 449, 450, 317, 318, 653, 654, 303,
+	607, 640, 604, 652, 634, 443, 381, 0, 0, 384,
+	284, 308, 323, 0, 624, 508, 229, 472, 293, 253,
+	0, 0, 213, 248, 232, 262, 277, 280, 327, 395,
+	404, 433, 439, 299, 274, 246, 465, 243, 491, 525,
+	526, 527, 529, 399, 269, 438, 400, 0, 379, 582,
+	583, 319, 0, 0, 0, 534, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 420, 0, 0,
+	0, 0, 0, 0, 0, 273, 0, 0, 0, 0,
+	369, 270, 0, 1944, 206, 511, 0, 435, 0, 205,
+	0, 493, 255, 380, 377, 590, 285, 276, 272, 252,
+	320, 389, 432, 524, 426, 0, 373, 0, 0, 503,
+	405, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 326,
+	250, 328, 204, 417, 504, 289, 0, 0, 0, 0,
+	0, 513, 731, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 240, 0, 0, 247, 0, 0, 0, 354,
+	363, 362, 342, 343, 345, 347, 353, 360, 366, 339,
+	348, 0, 0, 616, 0, 0, 0, 268, 324, 275,
+	267, 587, 0, 0, 0, 0, 0, 0, 603, 0,
+	0, 231, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 278, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 300, 0,
+	406, 260, 0, 459, 0, 0, 0, 636, 0, 0,
+	0, 0, 0, 0, 0, 368, 0, 333, 199, 227,
+	0, 0, 416, 467, 479, 0, 0, 0, 256, 0,
+	477, 430, 611, 235, 287, 464, 437, 475, 445, 290,
+	0, 0, 476, 375, 592, 455, 608, 637, 638, 266,
+	410, 622, 528, 630, 655, 228, 263, 424, 512, 614,
+	500, 401, 588, 589, 332, 499, 298, 203, 372, 643,
+	226, 485, 374, 244, 233, 594, 619, 302, 254, 292,
+	462, 650, 215, 523, 605, 241, 489, 0, 0, 658,
+	249, 510, 617, 606, 217, 601, 509, 397, 329, 330,
+	216, 0, 463, 271, 296, 0, 0, 261, 419, 596,
+	597, 259, 659, 230, 629, 222, 0, 628, 412, 591,
+	602, 398, 386, 221, 600, 396, 385, 337, 358, 359,
+	283, 310, 452, 378, 453, 309, 311, 408, 407, 409,
+	209, 615, 633, 0, 210, 0, 505, 618, 660, 457,
+	214, 236, 237, 239, 0, 282, 286, 294, 297, 306,
+	307, 316, 370, 423, 451, 447, 456, 0, 585, 609,
+	623, 635, 641, 642, 644, 645, 646, 647, 648, 651,
+	649, 411, 314, 501, 336, 376, 0, 0, 429, 478,
+	242, 613, 502, 201, 0, 0, 0, 0, 257, 258,
+	0, 581, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 661, 662, 663, 664, 665, 666, 667, 668, 669,
+	670, 671, 672, 673, 674, 675, 676, 677, 678, 656,
+	514, 520, 515, 516, 517, 518, 519, 0, 521, 0,
+	0, 0, 0, 0, 402, 0, 598, 599, 679, 387,
+	492, 610, 338, 352, 355, 344, 364, 0, 365, 340,
+	341, 346, 349, 350, 351, 356, 357, 361, 367, 251,
+	212, 394, 403, 584, 315, 218, 219, 220, 530, 531,
+	532, 533, 626, 627, 631, 207, 468, 469, 470, 471,
+	295, 621, 312, 474, 473, 334, 335, 382, 454, 546,
+	548, 559, 563, 565, 567, 573, 576, 547, 549, 560,
+	564, 566, 568, 574, 577, 536, 538, 540, 542, 555,
+	554, 551, 579, 580, 557, 562, 541, 553, 558, 571,
+	578, 575, 535, 539, 543, 552, 570, 569, 550, 561,
+	572, 556, 544, 537, 545, 0, 198, 223, 371, 0,
+	460, 291, 657, 625, 490, 620, 208, 225, 0, 265,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 200, 202, 211, 224, 234, 238, 245, 264, 279,
+	281, 288, 301, 313, 321, 322, 325, 331, 383, 390,
+	391, 392, 393, 413, 414, 415, 418, 421, 422, 425,
+	427, 428, 431, 436, 440, 441, 442, 444, 446, 448,
+	461, 466, 480, 481, 482, 483, 484, 487, 488, 494,
+	495, 496, 497, 498, 506, 507, 522, 593, 595, 612,
+	632, 639, 486, 388, 434, 458, 586, 304, 305, 449,
+	450, 317, 318, 653, 654, 303, 607, 640, 604, 652,
+	634, 443, 381, 0, 0, 384, 284, 308, 323, 0,
+	624, 508, 229, 472, 293, 253, 0, 0, 213, 248,
+	232, 262, 277, 280, 327, 395, 404, 433, 439, 299,
+	274, 246, 465, 243, 491, 525, 526, 527, 529, 399,
+	269, 438, 400, 0, 379, 582, 583, 319, 0, 0,
+	0, 534, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 420, 0, 0, 0, 0, 0, 0,
+	0, 273, 0, 0, 0, 0, 369, 270, 0, 1942,
+	206, 511, 0, 435, 0, 205, 0, 493, 255, 380,
+	377, 590, 285, 276, 272, 252, 320, 389, 432, 524,
+	426, 0, 373, 0, 0, 503, 405, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 326, 250, 328, 204, 417,
+	504, 289, 0, 0, 0, 0, 0, 513, 731, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 240, 0,
+	0, 247, 0, 0, 0, 354, 363, 362, 342, 343,
+	345, 347, 353, 360, 366, 339, 348, 0, 0, 616,
+	0, 0, 0, 268, 324, 275, 267, 587, 0, 0,
+	0, 0, 0, 0, 603, 0, 0, 231, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 278, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 300, 0, 406, 260, 0, 459,
+	0, 0, 0, 636, 0, 0, 0, 0, 0, 0,
+	0, 368, 0, 333, 199, 227, 0, 0, 416, 467,
+	479, 0, 0, 0, 256, 0, 477, 430, 611, 235,
+	287, 464, 437, 475, 445, 290, 0, 0, 476, 375,
+	592, 455, 608, 637, 638, 266, 410, 622, 528, 630,
+	655, 228, 263, 424, 512, 614, 500, 401, 588, 589,
+	332, 499, 298, 203, 372, 643, 226, 485, 374, 244,
+	233, 594, 619, 302, 254, 292, 462, 650, 215, 523,
+	605, 241, 489, 0, 0, 658, 249, 510, 617, 606,
+	217, 601, 509, 397, 329, 330, 216, 0, 463, 271,
+	296, 0, 0, 261, 419, 596, 597, 259, 659, 230,
+	629, 222, 0, 628, 412, 591, 602, 398, 386, 221,
+	600, 396, 385, 337, 358, 359, 283, 310, 452, 378,
+	453, 309, 311, 408, 407, 409, 209, 615, 633, 0,
+	210, 0, 505, 618, 660, 457, 214, 236, 237, 239,
+	0, 282, 286, 294, 297, 306, 307, 316, 370, 423,
+	451, 447, 456, 0, 585, 609, 623, 635, 641, 642,
+	644, 645, 646, 647, 648, 651, 649, 411, 314, 501,
+	336, 376, 0, 0, 429, 478, 242, 613, 502, 201,
+	0, 0, 0, 0, 257, 258, 0, 581, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 661, 662, 663,
+	664, 665, 666, 667, 668, 669, 670, 671, 672, 673,
+	674, 675, 676, 677, 678, 656, 514, 520, 515, 516,
+	517, 518, 519, 0, 521, 0, 0, 0, 0, 0,
+	402, 0, 598, 599, 679, 387, 492, 610, 338, 352,
+	355, 344, 364, 0, 365, 340, 341, 346, 349, 350,
+	351, 356, 357, 361, 367, 251, 212, 394, 403, 584,
+	315, 218, 219, 220, 530, 531, 532, 533, 626, 627,
+	631, 207, 468, 469, 470, 471, 295, 621, 312, 474,
+	473, 334, 335, 382, 454, 546, 548, 559, 563, 565,
+	567, 573, 576, 547, 549, 560, 564, 566, 568, 574,
+	577, 536, 538, 540, 542, 555, 554, 551, 579, 580,
+	557, 562, 541, 553, 558, 571, 578, 575, 535, 539,
+	543, 552, 570, 569, 550, 561, 572, 556, 544, 537,
+	545, 0, 198, 223, 371, 0, 460, 291, 657, 625,
+	490, 620, 208, 225, 0, 265, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 200, 202, 211,
+	224, 234, 238, 245, 264, 279, 281, 288, 301, 313,
+	321, 322, 325, 331, 383, 390, 391, 392, 393, 413,
+	414, 415, 418, 421, 422, 425, 427, 428, 431, 436,
+	440, 441, 442, 444, 446, 448, 461, 466, 480, 481,
+	482, 483, 484, 487, 488, 494, 495, 496, 497, 498,
+	506, 507, 522, 593, 595, 612, 632, 639, 486, 388,
+	434, 458, 586, 304, 305, 449, 450, 317, 318, 653,
+	654, 303, 607, 640, 604, 652, 634, 443, 381, 0,
+	0, 384, 284, 308, 323, 0, 624, 508, 229, 472,
+	293, 253, 0, 0, 213, 248, 232, 262, 277, 280,
+	327, 395, 404, 433, 439, 299, 274, 246, 465, 243,
+	491, 525, 526, 527, 529, 399, 269, 438, 400, 0,
+	379, 582, 583, 319, 0, 0, 0, 534, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 420,
+	0, 0, 0, 0, 0, 0, 0, 273, 0, 0,
+	0, 0, 369, 270, 0, 1940, 206, 511, 0, 435,
+	0, 205, 0, 493, 255, 380, 377, 590, 285, 276,
+	272, 252, 320, 389, 432, 524, 426, 0, 373, 0,
+	0, 503, 405, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 326, 250, 328, 204, 417, 504, 289, 0, 0,
+	0, 0, 0, 513, 731, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 240, 0, 0, 247, 0, 0,
+	0, 354, 363, 362, 342, 343, 345, 347, 353, 360,
+	366, 339, 348, 0, 0, 616, 0, 0, 0, 268,
+	324, 275, 267, 587, 0, 0, 0, 0, 0, 0,
+	603, 0, 0, 231, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 278, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	300, 0, 406, 260, 0, 459, 0, 0, 0, 636,
+	0, 0, 0, 0, 0, 0, 0, 368, 0, 333,
+	199, 227, 0, 0, 416, 467, 479, 0, 0, 0,
+	256, 0, 477, 430, 611, 235, 287, 464, 437, 475,
+	445, 290, 0, 0, 476, 375, 592, 455, 608, 637,
+	638, 266, 410, 622, 528, 630, 655, 228, 263, 424,
+	512, 614, 500, 401, 588, 589, 332, 499, 298, 203,
+	372, 643, 226, 485, 374, 244, 233, 594, 619, 302,
+	254, 292, 462, 650, 215, 523, 605, 241, 489, 0,
+	0, 658, 249, 510, 617, 606, 217, 601, 509, 397,
+	329, 330, 216, 0, 463, 271, 296, 0, 0, 261,
+	419, 596, 597, 259, 659, 230, 629, 222, 0, 628,
+	412, 591, 602, 398, 386, 221, 600, 396, 385, 337,
+	358, 359, 283, 310, 452, 378, 453, 309, 311, 408,
+	407, 409, 209, 615, 633, 0, 210, 0, 505, 618,
+	660, 457, 214, 236, 237, 239, 0, 282, 286, 294,
+	297, 306, 307, 316, 370, 423, 451, 447, 456, 0,
+	585, 609, 623, 635, 641, 642, 644, 645, 646, 647,
+	648, 651, 649, 411, 314, 501, 336, 376, 0, 0,
+	429, 478, 242, 613, 502, 201, 0, 0, 0, 0,
+	257, 258, 0, 581, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 661, 662, 663, 664, 665, 666, 667,
+	668, 669, 670, 671, 672, 673, 674, 675, 676, 677,
+	678, 656, 514, 520, 515, 516, 517, 518, 519, 0,
+	521, 0, 0, 0, 0, 0, 402, 0, 598, 599,
+	679, 387, 492, 610, 338, 352, 355, 344, 364, 0,
+	365, 340, 341, 346, 349, 350, 351, 356, 357, 361,
+	367, 251, 212, 394, 403, 584, 315, 218, 219, 220,
+	530, 531, 532, 533, 626, 627, 631, 207, 468, 469,
+	470, 471, 295, 621, 312, 474, 473, 334, 335, 382,
+	454, 546, 548, 559, 563, 565, 567, 573, 576, 547,
+	549, 560, 564, 566, 568, 574, 577, 536, 538, 540,
+	542, 555, 554, 551, 579, 580, 557, 562, 541, 553,
+	558, 571, 578, 575, 535, 539, 543, 552, 570, 569,
+	550, 561, 572, 556, 544, 537, 545, 0, 198, 223,
+	371, 0, 460, 291, 657, 625, 490, 620, 208, 225,
+	0, 265, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 200, 202, 211, 224, 234, 238, 245,
+	264, 279, 281, 288, 301, 313, 321, 322, 325, 331,
+	383, 390, 391, 392, 393, 413, 414, 415, 418, 421,
+	422, 425, 427, 428, 431, 436, 440, 441, 442, 444,
+	446, 448, 461, 466, 480, 481, 482, 483, 484, 487,
+	488, 494, 495, 496, 497, 498, 506, 507, 522, 593,
+	595, 612, 632, 639, 486, 388, 434, 458, 586, 304,
+	305, 449, 450, 317, 318, 653, 654, 303, 607, 640,
+	604, 652, 634, 443, 381, 0, 0, 384, 284, 308,
+	323, 0, 624, 508, 229, 472, 293, 253, 0, 0,
+	213, 248, 232, 262, 277, 280, 327, 395, 404, 433,
+	439, 299, 274, 246, 465, 243, 491, 525, 526, 527,
+	529, 399, 269, 438, 400, 0, 379, 582, 583, 319,
+	0, 0, 0, 534, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 420, 0, 0, 0, 0,
+	0, 0, 0, 273, 0, 0, 0, 0, 369, 270,
+	0, 1938, 206, 511, 0, 435, 0, 205, 0, 493,
+	255, 380, 377, 590, 285, 276, 272, 252, 320, 389,
+	432, 524, 426, 0, 373, 0, 0, 503, 405, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 326, 250, 328,
+	204, 417, 504, 289, 0, 0, 0, 0, 0, 513,
+	731, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	240, 0, 0, 247, 0, 0, 0, 354, 363, 362,
+	342, 343, 345, 347, 353, 360, 366, 339, 348, 0,
+	0, 616, 0, 0, 0, 268, 324, 275, 267, 587,
+	0, 0, 0, 0, 0, 0, 603, 0, 0, 231,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 278, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 300, 0, 406, 260,
+	0, 459, 0, 0, 0, 636, 0, 0, 0, 0,
+	0, 0, 0, 368, 0, 333, 199, 227, 0, 0,
+	416, 467, 479, 0, 0, 0, 256, 0, 477, 430,
+	611, 235, 287, 464, 437, 475, 445, 290, 0, 0,
+	476, 375, 592, 455, 608, 637, 638, 266, 410, 622,
+	528, 630, 655, 228, 263, 424, 512, 614, 500, 401,
+	588, 589, 332, 499, 298, 203, 372, 643, 226, 485,
+	374, 244, 233, 594, 619, 302, 254, 292, 462, 650,
+	215, 523, 605, 241, 489, 0, 0, 658, 249, 510,
+	617, 606, 217, 601, 509, 397, 329, 330, 216, 0,
+	463, 271, 296, 0, 0, 261, 419, 596, 597, 259,
+	659, 230, 629, 222, 0, 628, 412, 591, 602, 398,
+	386, 221, 600, 396, 385, 337, 358, 359, 283, 310,
+	452, 378, 453, 309, 311, 408, 407, 409, 209, 615,
+	633, 0, 210, 0, 505, 618, 660, 457, 214, 236,
+	237, 239, 0, 282, 286, 294, 297, 306, 307, 316,
+	370, 423, 451, 447, 456, 0, 585, 609, 623, 635,
+	641, 642, 644, 645, 646, 647, 648, 651, 649, 411,
+	314, 501, 336, 376, 0, 0, 429, 478, 242, 613,
+	502, 201, 0, 0, 0, 0, 257, 258, 0, 581,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 661,
+	662, 663, 664, 665, 666, 667, 668, 669, 670, 671,
+	672, 673, 674, 675, 676, 677, 678, 656, 514, 520,
+	515, 516, 517, 518, 519, 0, 521, 0, 0, 0,
+	0, 0, 402, 0, 598, 599, 679, 387, 492, 610,
+	338, 352, 355, 344, 364, 0, 365, 340, 341, 346,
+	349, 350, 351, 356, 357, 361, 367, 251, 212, 394,
+	403, 584, 315, 218, 219, 220, 530, 531, 532, 533,
+	626, 627, 631, 207, 468, 469, 470, 471, 295, 621,
+	312, 474, 473, 334, 335, 382, 454, 546, 548, 559,
+	563, 565, 567, 573, 576, 547, 549, 560, 564, 566,
+	568, 574, 577, 536, 538, 540, 542, 555, 554, 551,
+	579, 580, 557, 562, 541, 553, 558, 571, 578, 575,
+	535, 539, 543, 552, 570, 569, 550, 561, 572, 556,
+	544, 537, 545, 0, 198, 223, 371, 0, 460, 291,
+	657, 625, 490, 620, 208, 225, 0, 265, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 200,
+	202, 211, 224, 234, 238, 245, 264, 279, 281, 288,
+	301, 313, 321, 322, 325, 331, 383, 390, 391, 392,
+	393, 413, 414, 415, 418, 421, 422, 425, 427, 428,
+	431, 436, 440, 441, 442, 444, 446, 448, 461, 466,
+	480, 481, 482, 483, 484, 487, 488, 494, 495, 496,
+	497, 498, 506, 507, 522, 593, 595, 612, 632, 639,
+	486, 388, 434, 458, 586, 304, 305, 449, 450, 317,
+	318, 653, 654, 303, 607, 640, 604, 652, 634, 443,
+	381, 0, 0, 384, 284, 308, 323, 0, 624, 508,
+	229, 472, 293, 253, 0, 0, 213, 248, 232, 262,
+	277, 280, 327, 395, 404, 433, 439, 299, 274, 246,
+	465, 243, 491, 525, 526, 527, 529, 399, 269, 438,
+	400, 0, 379, 582, 583, 319, 0, 0, 0, 534,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 420, 0, 0, 0, 0, 0, 0, 0, 273,
+	0, 0, 0, 0, 369, 270, 0, 1936, 206, 511,
+	0, 435, 0, 205, 0, 493, 255, 380, 377, 590,
+	285, 276, 272, 252, 320, 389, 432, 524, 426, 0,
+	373, 0, 0, 503, 405, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 326, 250, 328, 204, 417, 504, 289,
+	0, 0, 0, 0, 0, 513, 731, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 240, 0, 0, 247,
+	0, 0, 0, 354, 363, 362, 342, 343, 345, 347,
+	353, 360, 366, 339, 348, 0, 0, 616, 0, 0,
+	0, 268, 324, 275, 267, 587, 0, 0, 0, 0,
+	0, 0, 603, 0, 0, 231, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	278, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 300, 0, 406, 260, 0, 459, 0, 0,
+	0, 636, 0, 0, 0, 0, 0, 0, 0, 368,
+	0, 333, 199, 227, 0, 0, 416, 467, 479, 0,
+	0, 0, 256, 0, 477, 430, 611, 235, 287, 464,
+	437, 475, 445, 290, 0, 0, 476, 375, 592, 455,
+	608, 637, 638, 266, 410, 622, 528, 630, 655, 228,
+	263, 424, 512, 614, 500, 401, 588, 589, 332, 499,
+	298, 203, 372, 643, 226, 485, 374, 244, 233, 594,
+	619, 302, 254, 292, 462, 650, 215, 523, 605, 241,
+	489, 0, 0, 658, 249, 510, 617, 606, 217, 601,
+	509, 397, 329, 330, 216, 0, 463, 271, 296, 0,
+	0, 261, 419, 596, 597, 259, 659, 230, 629, 222,
+	0, 628, 412, 591, 602, 398, 386, 221, 600, 396,
+	385, 337, 358, 359, 283, 310, 452, 378, 453, 309,
+	311, 408, 407, 409, 209, 615, 633, 0, 210, 0,
+	505, 618, 660, 457, 214, 236, 237, 239, 0, 282,
+	286, 294, 297, 306, 307, 316, 370, 423, 451, 447,
+	456, 0, 585, 609, 623, 635, 641, 642, 644, 645,
+	646, 647, 648, 651, 649, 411, 314, 501, 336, 376,
+	0, 0, 429, 478, 242, 613, 502, 201, 0, 0,
+	0, 0, 257, 258, 0, 581, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 661, 662, 663, 664, 665,
+	666, 667, 668, 669, 670, 671, 672, 673, 674, 675,
+	676, 677, 678, 656, 514, 520, 515, 516, 517, 518,
+	519, 0, 521, 0, 0, 0, 0, 0, 402, 0,
+	598, 599, 679, 387, 492, 610, 338, 352, 355, 344,
+	364, 0, 365, 340, 341, 346, 349, 350, 351, 356,
+	357, 361, 367, 251, 212, 394, 403, 584, 315, 218,
+	219, 220, 530, 531, 532, 533, 626, 627, 631, 207,
+	468, 469, 470, 471, 295, 621, 312, 474, 473, 334,
+	335, 382, 454, 546, 548, 559, 563, 565, 567, 573,
+	576, 547, 549, 560, 564, 566, 568, 574, 577, 536,
+	538, 540, 542, 555, 554, 551, 579, 580, 557, 562,
+	541, 553, 558, 571, 578, 575, 535, 539, 543, 552,
+	570, 569, 550, 561, 572, 556, 544, 537, 545, 0,
+	198, 223, 371, 0, 460, 291, 657, 625, 490, 620,
+	208, 225, 0, 265, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 200, 202, 211, 224, 234,
+	238, 245, 264, 279, 281, 288, 301, 313, 321, 322,
+	325, 331, 383, 390, 391, 392, 393, 413, 414, 415,
+	418, 421, 422, 425, 427, 428, 431, 436, 440, 441,
+	442, 444, 446, 448, 461, 466, 480, 481, 482, 483,
+	484, 487, 488, 494, 495, 496, 497, 498, 506, 507,
+	522, 593, 595, 612, 632, 639, 486, 388, 434, 458,
+	586, 304, 305, 449, 450, 317, 318, 653, 654, 303,
+	607, 640, 604, 652, 634, 443, 381, 0, 0, 384,
+	284, 308, 323, 0, 624, 508, 229, 472, 293, 253,
+	0, 0, 213, 248, 232, 262, 277, 280, 327, 395,
+	404, 433, 439, 299, 274, 246, 465, 243, 491, 525,
+	526, 527, 529, 399, 269, 438, 400, 0, 379, 582,
+	583, 319, 0, 0, 0, 534, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 420, 0, 0,
+	0, 0, 0, 0, 0, 273, 0, 0, 0, 0,
+	369, 270, 0, 1932, 206, 511, 0, 435, 0, 205,
+	0, 493, 255, 380, 377, 590, 285, 276, 272, 252,
+	320, 389, 432, 524, 426, 0, 373, 0, 0, 503,
+	405, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 326,
+	250, 328, 204, 417, 504, 289, 0, 0, 0, 0,
+	0, 513, 731, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 240, 0, 0, 247, 0, 0, 0, 354,
+	363, 362, 342, 343, 345, 347, 353, 360, 366, 339,
+	348, 0, 0, 616, 0, 0, 0, 268, 324, 275,
+	267, 587, 0, 0, 0, 0, 0, 0, 603, 0,
+	0, 231, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 278, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 300, 0,
+	406, 260, 0, 459, 0, 0, 0, 636, 0, 0,
+	0, 0, 0, 0, 0, 368, 0, 333, 199, 227,
+	0, 0, 416, 467, 479, 0, 0, 0, 256, 0,
+	477, 430, 611, 235, 287, 464, 437, 475, 445, 290,
+	0, 0, 476, 375, 592, 455, 608, 637, 638, 266,
+	410, 622, 528, 630, 655, 228, 263, 424, 512, 614,
+	500, 401, 588, 589, 332, 499, 298, 203, 372, 643,
+	226, 485, 374, 244, 233, 594, 619, 302, 254, 292,
+	462, 650, 215, 523, 605, 241, 489, 0, 0, 658,
+	249, 510, 617, 606, 217, 601, 509, 397, 329, 330,
+	216, 0, 463, 271, 296, 0, 0, 261, 419, 596,
+	597, 259, 659, 230, 629, 222, 0, 628, 412, 591,
+	602, 398, 386, 221, 600, 396, 385, 337, 358, 359,
+	283, 310, 452, 378, 453, 309, 311, 408, 407, 409,
+	209, 615, 633, 0, 210, 0, 505, 618, 660, 457,
+	214, 236, 237, 239, 0, 282, 286, 294, 297, 306,
+	307, 316, 370, 423, 451, 447, 456, 0, 585, 609,
+	623, 635, 641, 642, 644, 645, 646, 647, 648, 651,
+	649, 411, 314, 501, 336, 376, 0, 0, 429, 478,
+	242, 613, 502, 201, 0, 0, 0, 0, 257, 258,
+	0, 581, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 661, 662, 663, 664, 665, 666, 667, 668, 669,
+	670, 671, 672, 673, 674, 675, 676, 677, 678, 656,
+	514, 520, 515, 516, 517, 518, 519, 0, 521, 0,
+	0, 0, 0, 0, 402, 0, 598, 599, 679, 387,
+	492, 610, 338, 352, 355, 344, 364, 0, 365, 340,
+	341, 346, 349, 350, 351, 356, 357, 361, 367, 251,
+	212, 394, 403, 584, 315, 218, 219, 220, 530, 531,
+	532, 533, 626, 627, 631, 207, 468, 469, 470, 471,
+	295, 621, 312, 474, 473, 334, 335, 382, 454, 546,
+	548, 559, 563, 565, 567, 573, 576, 547, 549, 560,
+	564, 566, 568, 574, 577, 536, 538, 540, 542, 555,
+	554, 551, 579, 580, 557, 562, 541, 553, 558, 571,
+	578, 575, 535, 539, 543, 552, 570, 569, 550, 561,
+	572, 556, 544, 537, 545, 0, 198, 223, 371, 0,
+	460, 291, 657, 625, 490, 620, 208, 225, 0, 265,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 200, 202, 211, 224, 234, 238, 245, 264, 279,
+	281, 288, 301, 313, 321, 322, 325, 331, 383, 390,
+	391, 392, 393, 413, 414, 415, 418, 421, 422, 425,
+	427, 428, 431, 436, 440, 441, 442, 444, 446, 448,
+	461, 466, 480, 481, 482, 483, 484, 487, 488, 494,
+	495, 496, 497, 498, 506, 507, 522, 593, 595, 612,
+	632, 639, 486, 388, 434, 458, 586, 304, 305, 449,
+	450, 317, 318, 653, 654, 303, 607, 640, 604, 652,
+	634, 443, 381, 0, 0, 384, 284, 308, 323, 0,
+	624, 508, 229, 472, 293, 253, 0, 0, 213, 248,
+	232, 262, 277, 280, 327, 395, 404, 433, 439, 299,
+	274, 246, 465, 243, 491, 525, 526, 527, 529, 399,
+	269, 438, 400, 0, 379, 582, 583, 319, 0, 0,
+	0, 534, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 420, 0, 0, 0, 0, 0, 0,
+	0, 273, 0, 0, 0, 0, 369, 270, 0, 1930,
+	206, 511, 0, 435, 0, 205, 0, 493, 255, 380,
+	377, 590, 285, 276, 272, 252, 320, 389, 432, 524,
+	426, 0, 373, 0, 0, 503, 405, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 326, 250, 328, 204, 417,
+	504, 289, 0, 0, 0, 0, 0, 513, 731, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 240, 0,
+	0, 247, 0, 0, 0, 354, 363, 362, 342, 343,
+	345, 347, 353, 360, 366, 339, 348, 0, 0, 616,
+	0, 0, 0, 268, 324, 275, 267, 587, 0, 0,
+	0, 0, 0, 0, 603, 0, 0, 231, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 278, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 300, 0, 406, 260, 0, 459,
+	0, 0, 0, 636, 0, 0, 0, 0, 0, 0,
+	0, 368, 0, 333, 199, 227, 0, 0, 416, 467,
+	479, 0, 0, 0, 256, 0, 477, 430, 611, 235,
+	287, 464, 437, 475, 445, 290, 0, 0, 476, 375,
+	592, 455, 608, 637, 638, 266, 410, 622, 528, 630,
+	655, 228, 263, 424, 512, 614, 500, 401, 588, 589,
+	332, 499, 298, 203, 372, 643, 226, 485, 374, 244,
+	233, 594, 619, 302, 254, 292, 462, 650, 215, 523,
+	605, 241, 489, 0, 0, 658, 249, 510, 617, 606,
+	217, 601, 509, 397, 329, 330, 216, 0, 463, 271,
+	296, 0, 0, 261, 419, 596, 597, 259, 659, 230,
+	629, 222, 0, 628, 412, 591, 602, 398, 386, 221,
+	600, 396, 385, 337, 358, 359, 283, 310, 452, 378,
+	453, 309, 311, 408, 407, 409, 209, 615, 633, 0,
+	210, 0, 505, 618, 660, 457, 214, 236, 237, 239,
+	0, 282, 286, 294, 297, 306, 307, 316, 370, 423,
+	451, 447, 456, 0, 585, 609, 623, 635, 641, 642,
+	644, 645, 646, 647, 648, 651, 649, 411, 314, 501,
+	336, 376, 0, 0, 429, 478, 242, 613, 502, 201,
+	0, 0, 0, 0, 257, 258, 0, 581, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 661, 662, 663,
+	664, 665, 666, 667, 668, 669, 670, 671, 672, 673,
+	674, 675, 676, 677, 678, 656, 514, 520, 515, 516,
+	517, 518, 519, 0, 521, 0, 0, 0, 0, 0,
+	402, 0, 598, 599, 679, 387, 492, 610, 338, 352,
+	355, 344, 364, 0, 365, 340, 341, 346, 349, 350,
+	351, 356, 357, 361, 367, 251, 212, 394, 403, 584,
+	315, 218, 219, 220, 530, 531, 532, 533, 626, 627,
+	631, 207, 468, 469, 470, 471, 295, 621, 312, 474,
+	473, 334, 335, 382, 454, 546, 548, 559, 563, 565,
+	567, 573, 576, 547, 549, 560, 564, 566, 568, 574,
+	577, 536, 538, 540, 542, 555, 554, 551, 579, 580,
+	557, 562, 541, 553, 558, 571, 578, 575, 535, 539,
+	543, 552, 570, 569, 550, 561, 572, 556, 544, 537,
+	545, 0, 198, 223, 371, 0, 460, 291, 657, 625,
+	490, 620, 208, 225, 0, 265, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 200, 202, 211,
+	224, 234, 238, 245, 264, 279, 281, 288, 301, 313,
+	321, 322, 325, 331, 383, 390, 391, 392, 393, 413,
+	414, 415, 418, 421, 422, 425, 427, 428, 431, 436,
+	440, 441, 442, 444, 446, 448, 461, 466, 480, 481,
+	482, 483, 484, 487, 488, 494, 495, 496, 497, 498,
+	506, 507, 522, 593, 595, 612, 632, 639, 486, 388,
+	434, 458, 586, 304, 305, 449, 450, 317, 318, 653,
+	654, 303, 607, 640, 604, 652, 634, 443, 381, 0,
+	0, 384, 284, 308, 323, 0, 624, 508, 229, 472,
+	293, 253, 0, 0, 213, 248, 232, 262, 277, 280,
+	327, 395, 404, 433, 439, 299, 274, 246, 465, 243,
+	491, 525, 526, 527, 529, 399, 269, 438, 400, 0,
+	379, 582, 583, 319, 0, 0, 0, 534, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 420,
+	0, 0, 0, 0, 0, 0, 0, 273, 0, 0,
+	0, 0, 369, 270, 0, 1928, 206, 511, 0, 435,
+	0, 205, 0, 493, 255, 380, 377, 590, 285, 276,
+	272, 252, 320, 389, 432, 524, 426, 0, 373, 0,
+	0, 503, 405, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 326, 250, 328, 204, 417, 504, 289, 0, 0,
+	0, 0, 0, 513, 731, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 240, 0, 0, 247, 0, 0,
+	0, 354, 363, 362, 342, 343, 345, 347, 353, 360,
+	366, 339, 348, 0, 0, 616, 0, 0, 0, 268,
+	324, 275, 267, 587, 0, 0, 0, 0, 0, 0,
+	603, 0, 0, 231, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 278, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	300, 0, 406, 260, 0, 459, 0, 0, 0, 636,
+	0, 0, 0, 0, 0, 0, 0, 368, 0, 333,
+	199, 227, 0, 0, 416, 467, 479, 0, 0, 0,
+	256, 0, 477, 430, 611, 235, 287, 464, 437, 475,
+	445, 290, 0, 0, 476, 375, 592, 455, 608, 637,
+	638, 266, 410, 622, 528, 630, 655, 228, 263, 424,
+	512, 614, 500, 401, 588, 589, 332, 499, 298, 203,
+	372, 643, 226, 485, 374, 244, 233, 594, 619, 302,
+	254, 292, 462, 650, 215, 523, 605, 241, 489, 0,
+	0, 658, 249, 510, 617, 606, 217, 601, 509, 397,
+	329, 330, 216, 0, 463, 271, 296, 0, 0, 261,
+	419, 596, 597, 259, 659, 230, 629, 222, 0, 628,
+	412, 591, 602, 398, 386, 221, 600, 396, 385, 337,
+	358, 359, 283, 310, 452, 378, 453, 309, 311, 408,
+	407, 409, 209, 615, 633, 0, 210, 0, 505, 618,
+	660, 457, 214, 236, 237, 239, 0, 282, 286, 294,
+	297, 306, 307, 316, 370, 423, 451, 447, 456, 0,
+	585, 609, 623, 635, 641, 642, 644, 645, 646, 647,
+	648, 651, 649, 411, 314, 501, 336, 376, 0, 0,
+	429, 478, 242, 613, 502, 201, 0, 0, 0, 0,
+	257, 258, 0, 581, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 661, 662, 663, 664, 665, 666, 667,
+	668, 669, 670, 671, 672, 673, 674, 675, 676, 677,
+	678, 656, 514, 520, 515, 516, 517, 518, 519, 0,
+	521, 0, 0, 0, 0, 0, 402, 0, 598, 599,
+	679, 387, 492, 610, 338, 352, 355, 344, 364, 0,
+	365, 340, 341, 346, 349, 350, 351, 356, 357, 361,
+	367, 251, 212, 394, 403, 584, 315, 218, 219, 220,
+	530, 531, 532, 533, 626, 627, 631, 207, 468, 469,
+	470, 471, 295, 621, 312, 474, 473, 334, 335, 382,
+	454, 546, 548, 559, 563, 565, 567, 573, 576, 547,
+	549, 560, 564, 566, 568, 574, 577, 536, 538, 540,
+	542, 555, 554, 551, 579, 580, 557, 562, 541, 553,
+	558, 571, 578, 575, 535, 539, 543, 552, 570, 569,
+	550, 561, 572, 556, 544, 537, 545, 0, 198, 223,
+	371, 0, 460, 291, 657, 625, 490, 620, 208, 225,
+	0, 265, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 200, 202, 211, 224, 234, 238, 245,
+	264, 279, 281, 288, 301, 313, 321, 322, 325, 331,
+	383, 390, 391, 392, 393, 413, 414, 415, 418, 421,
+	422, 425, 427, 428, 431, 436, 440, 441, 442, 444,
+	446, 448, 461, 466, 480, 481, 482, 483, 484, 487,
+	488, 494, 495, 496, 497, 498, 506, 507, 522, 593,
+	595, 612, 632, 639, 486, 388, 434, 458, 586, 304,
+	305, 449, 450, 317, 318, 653, 654, 303, 607, 640,
+	604, 652, 634, 443, 381, 0, 0, 384, 284, 308,
+	323, 0, 624, 508, 229, 472, 293, 253, 0, 0,
+	213, 248, 232, 262, 277, 280, 327, 395, 404, 433,
+	439, 299, 274, 246, 465, 243, 491, 525, 526, 527,
+	529, 399, 269, 438, 400, 0, 379, 582, 583, 319,
+	0, 0, 0, 534, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 420, 0, 0, 0, 0,
+	0, 0, 0, 273, 0, 0, 0, 0, 369, 270,
+	0, 0, 206, 511, 0, 435, 0, 205, 0, 493,
+	255, 380, 377, 590, 285, 276, 272, 252, 320, 389,
+	432, 524, 426, 0, 373, 0, 0, 503, 405, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 326, 250, 328,
+	204, 417, 504, 289, 0, 1903, 0, 0, 0, 513,
+	731, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	240, 0, 0, 247, 0, 0, 0, 354, 363, 362,
+	342, 343, 345, 347, 353, 360, 366, 339, 348, 0,
+	0, 616, 0, 0, 0, 268, 324, 275, 267, 587,
+	0, 0, 0, 0, 0, 0, 603, 0, 0, 231,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 278, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 300, 0, 406, 260,
+	0, 459, 0, 0, 0, 636, 0, 0, 0, 0,
+	0, 0, 0, 368, 0, 333, 199, 227, 0, 0,
+	416, 467, 479, 0, 0, 0, 256, 0, 477, 430,
+	611, 235, 287, 464, 437, 475, 445, 290, 0, 0,
+	476, 375, 592, 455, 608, 637, 638, 266, 410, 622,
+	528, 630, 655, 228, 263, 424, 512, 614, 500, 401,
+	588, 589, 332, 499, 298, 203, 372, 643, 226, 485,
+	374, 244, 233, 594, 619, 302, 254, 292, 462, 650,
+	215, 523, 605, 241, 489, 0, 0, 658, 249, 510,
+	617, 606, 217, 601, 509, 397, 329, 330, 216, 0,
+	463, 271, 296, 0, 0, 261, 419, 596, 597, 259,
+	659, 230, 629, 222, 0, 628, 412, 591, 602, 398,
+	386, 221, 600, 396, 385, 337, 358, 359, 283, 310,
+	452, 378, 453, 309, 311, 408, 407, 409, 209, 615,
+	633, 0, 210, 0, 505, 618, 660, 457, 214, 236,
+	237, 239, 0, 282, 286, 294, 297, 306, 307, 316,
+	370, 423, 451, 447, 456, 0, 585, 609, 623, 635,
+	641, 642, 644, 645, 646, 647, 648, 651, 649, 411,
+	314, 501, 336, 376, 0, 0, 429, 478, 242, 613,
+	502, 201, 0, 0, 0, 0, 257, 258, 0, 581,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 661,
+	662, 663, 664, 665, 666, 667, 668, 669, 670, 671,
+	672, 673, 674, 675, 676, 677, 678, 656, 514, 520,
+	515, 516, 517, 518, 519, 0, 521, 0, 0, 0,
+	0, 0, 402, 0, 598, 599, 679, 387, 492, 610,
+	338, 352, 355, 344, 364, 0, 365, 340, 341, 346,
+	349, 350, 351, 356, 357, 361, 367, 251, 212, 394,
+	403, 584, 315, 218, 219, 220, 530, 531, 532, 533,
+	626, 627, 631, 207, 468, 469, 470, 471, 295, 621,
+	312, 474, 473, 334, 335, 382, 454, 546, 548, 559,
+	563, 565, 567, 573, 576, 547, 549, 560, 564, 566,
+	568, 574, 577, 536, 538, 540, 542, 555, 554, 551,
+	579, 580, 557, 562, 541, 553, 558, 571, 578, 575,
+	535, 539, 543, 552, 570, 569, 550, 561, 572, 556,
+	544, 537, 545, 0, 198, 223, 371, 0, 460, 291,
+	657, 625, 490, 620, 208, 225, 0, 265, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 200,
+	202, 211, 224, 234, 238, 245, 264, 279, 281, 288,
+	301, 313, 321, 322, 325, 331, 383, 390, 391, 392,
+	393, 413, 414, 415, 418, 421, 422, 425, 427, 428,
+	431, 436, 440, 441, 442, 444, 446, 448, 461, 466,
+	480, 481, 482, 483, 484, 487, 488, 494, 495, 496,
+	497, 498, 506, 507, 522, 593, 595, 612, 632, 639,
+	486, 388, 434, 458, 586, 304, 305, 449, 450, 317,
+	318, 653, 654, 303, 607, 640, 604, 652, 634, 443,
+	381, 0, 0, 384, 284, 308, 323, 0, 624, 508,
+	229, 472, 293, 253, 0, 0, 213, 248, 232, 262,
+	277, 280, 327, 395, 404, 433, 439, 299, 274, 246,
+	465, 243, 491, 525, 526, 527, 529, 399, 269, 438,
+	400, 0, 379, 582, 583, 319, 0, 0, 0, 534,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 420, 0, 0, 0, 0, 0, 0, 1800, 273,
+	0, 0, 0, 0, 369, 270, 0, 0, 206, 511,
+	0, 435, 0, 205, 0, 493, 255, 380, 377, 590,
+	285, 276, 272, 252, 320, 389, 432, 524, 426, 0,
+	373, 0, 0, 503, 405, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 326, 250, 328, 204, 417, 504, 289,
+	0, 0, 0, 0, 0, 513, 196, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 240, 0, 0, 247,
+	0, 0, 0, 354, 363, 362, 342, 343, 345, 347,
+	353, 360, 366, 339, 348, 0, 0, 616, 0, 0,
+	0, 268, 324, 275, 267, 587, 0, 0, 0, 0,
+	0, 0, 603, 0, 0, 231, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	278, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 300, 0, 406, 260, 0, 459, 0, 0,
+	0, 636, 0, 0, 0, 0, 0, 0, 0, 368,
+	0, 333, 199, 227, 0, 0, 416, 467, 479, 0,
+	0, 0, 256, 0, 477, 430, 611, 235, 287, 464,
+	437, 475, 445, 290, 0, 0, 476, 375, 592, 455,
+	608, 637, 638, 266, 410, 622, 528, 630, 655, 228,
+	263, 424, 512, 614, 500, 401, 588, 589, 332, 499,
+	298, 203, 372, 643, 226, 485, 374, 244, 233, 594,
+	619, 302, 254, 292, 462, 650, 215, 523, 605, 241,
+	489, 0, 0, 658, 249, 510, 617, 606, 217, 601,
+	509, 397, 329, 330, 216, 0, 463, 271, 296, 0,
+	0, 261, 419, 596, 597, 259, 659, 230, 629, 222,
+	0, 628, 412, 591, 602, 398, 386, 221, 600, 396,
+	385, 337, 358, 359, 283, 310, 452, 378, 453, 309,
+	311, 408, 407, 409, 209, 615, 633, 0, 210, 0,
+	505, 618, 660, 457, 214, 236, 237, 239, 0, 282,
+	286, 294, 297, 306, 307, 316, 370, 423, 451, 447,
+	456, 0, 585, 609, 623, 635, 641, 642, 644, 645,
+	646, 647, 648, 651, 649, 411, 314, 501, 336, 376,
+	0, 0, 429, 478, 242, 613, 502, 201, 0, 0,
+	0, 0, 257, 258, 0, 581, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 661, 662, 663, 664, 665,
+	666, 667, 668, 669, 670, 671, 672, 673, 674, 675,
+	676, 677, 678, 656, 514, 520, 515, 516, 517, 518,
+	519, 0, 521, 0, 0, 0, 0, 0, 402, 0,
+	598, 599, 679, 387, 492, 610, 338, 352, 355, 344,
+	364, 0, 365, 340, 341, 346, 349, 350, 351, 356,
+	357, 361, 367, 251, 212, 394, 403, 584, 315, 218,
+	219, 220, 530, 531, 532, 533, 626, 627, 631, 207,
+	468, 469, 470, 471, 295, 621, 312, 474, 473, 334,
+	335, 382, 454, 546, 548, 559, 563, 565, 567, 573,
+	576, 547, 549, 560, 564, 566, 568, 574, 577, 536,
+	538, 540, 542, 555, 554, 551, 579, 580, 557, 562,
+	541, 553, 558, 571, 578, 575, 535, 539, 543, 552,
+	570, 569, 550, 561, 572, 556, 544, 537, 545, 0,
+	198, 223, 371, 0, 460, 291, 657, 625, 490, 620,
+	208, 225, 0, 265, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 200, 202, 211, 224, 234,
+	238, 245, 264, 279, 281, 288, 301, 313, 321, 322,
+	325, 331, 383, 390, 391, 392, 393, 413, 414, 415,
+	418, 421, 422, 425, 427, 428, 431, 436, 440, 441,
+	442, 444, 446, 448, 461, 466, 480, 481, 482, 483,
+	484, 487, 488, 494, 495, 496, 497, 498, 506, 507,
+	522, 593, 595, 612, 632, 639, 486, 388, 434, 458,
+	586, 304, 305, 449, 450, 317, 318, 653, 654, 303,
+	607, 640, 604, 652, 634, 443, 381, 0, 0, 384,
+	284, 308, 323, 0, 624, 508, 229, 472, 293, 253,
+	0, 0, 213, 248, 232, 262, 277, 280, 327, 395,
+	404, 433, 439, 299, 274, 246, 465, 243, 491, 525,
+	526, 527, 529, 399, 269, 438, 400, 0, 379, 582,
+	583, 319, 0, 0, 0, 534, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 420, 0, 0,
+	0, 0, 0, 0, 0, 273, 0, 0, 0, 0,
+	369, 270, 0, 0, 206, 511, 0, 435, 0, 205,
+	0, 493, 255, 380, 377, 590, 285, 276, 272, 252,
+	320, 389, 432, 524, 426, 0, 373, 0, 0, 503,
+	405, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 326,
+	250, 328, 204, 417, 504, 289, 0, 95, 0, 0,
+	0, 513, 966, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 240, 0, 0, 247, 0, 0, 0, 354,
+	363, 362, 342, 343, 345, 347, 353, 360, 366, 339,
+	348, 0, 0, 616, 0, 0, 0, 268, 324, 275,
+	267, 587, 0, 0, 0, 0, 0, 0, 603, 0,
+	0, 231, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 278, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 300, 0,
+	406, 260, 0, 459, 0, 0, 0, 636, 0, 0,
+	0, 0, 0, 0, 0, 368, 0, 333, 199, 227,
+	0, 0, 416, 467, 479, 0, 0, 0, 256, 0,
+	477, 430, 611, 235, 287, 464, 437, 475, 445, 290,
+	0, 0, 476, 375, 592, 455, 608, 637, 638, 266,
+	410, 622, 528, 630, 655, 228, 263, 424, 512, 614,
+	500, 401, 588, 589, 332, 499, 298, 203, 372, 643,
+	226, 485, 374, 244, 233, 594, 619, 302, 254, 292,
+	462, 650, 215, 523, 605, 241, 489, 0, 0, 658,
+	249, 510, 617, 606, 217, 601, 509, 397, 329, 330,
+	216, 0, 463, 271, 296, 0, 0, 261, 419, 596,
+	597, 259, 659, 230, 629, 222, 0, 628, 412, 591,
+	602, 398, 386, 221, 600, 396, 385, 337, 358, 359,
+	283, 310, 452, 378, 453, 309, 311, 408, 407, 409,
+	209, 615, 633, 0, 210, 0, 505, 618, 660, 457,
+	214, 236, 237, 239, 0, 282, 286, 294, 297, 306,
+	307, 316, 370, 423, 451, 447, 456, 0, 585, 609,
+	623, 635, 641, 642, 644, 645, 646, 647, 648, 651,
+	649, 411, 314, 501, 336, 376, 0, 0, 429, 478,
+	242, 613, 502, 201, 0, 0, 0, 0, 257, 258,
+	0, 581, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 661, 662, 663, 664, 665, 666, 667, 668, 669,
+	670, 671, 672, 673, 674, 675, 676, 677, 678, 656,
+	514, 520, 515, 516, 517, 518, 519, 0, 521, 0,
+	0, 0, 0, 0, 402, 0, 598, 599, 679, 387,
+	492, 610, 338, 352, 355, 344, 364, 0, 365, 340,
+	341, 346, 349, 350, 351, 356, 357, 361, 367, 251,
+	212, 394, 403, 584, 315, 218, 219, 220, 530, 531,
+	532, 533, 626, 627, 631, 207, 468, 469, 470, 471,
+	295, 621, 312, 474, 473, 334, 335, 382, 454, 546,
+	548, 559, 563, 565, 567, 573, 576, 547, 549, 560,
+	564, 566, 568, 574, 577, 536, 538, 540, 542, 555,
+	554, 551, 579, 580, 557, 562, 541, 553, 558, 571,
+	578, 575, 535, 539, 543, 552, 570, 569, 550, 561,
+	572, 556, 544, 537, 545, 0, 198, 223, 371, 0,
+	460, 291, 657, 625, 490, 620, 208, 225, 0, 265,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 200, 202, 211, 224, 234, 238, 245, 264, 279,
+	281, 288, 301, 313, 321, 322, 325, 331, 383, 390,
+	391, 392, 393, 413, 414, 415, 418, 421, 422, 425,
+	427, 428, 431, 436, 440, 441, 442, 444, 446, 448,
+	461, 466, 480, 481, 482, 483, 484, 487, 488, 494,
+	495, 496, 497, 498, 506, 507, 522, 593, 595, 612,
+	632, 639, 486, 388, 434, 458, 586, 304, 305, 449,
+	450, 317, 318, 653, 654, 303, 607, 640, 604, 652,
+	634, 443, 381, 0, 0, 384, 284, 308, 323, 0,
+	624, 508, 229, 472, 293, 253, 0, 0, 213, 248,
+	232, 262, 277, 280, 327, 395, 404, 433, 439, 299,
+	274, 246, 465, 243, 491, 525, 526, 527, 529, 399,
+	269, 438, 400, 0, 379, 582, 583, 319, 0, 0,
+	0, 534, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 420, 0, 0, 0, 0, 0, 0,
+	0, 273, 0, 0, 0, 0, 369, 270, 0, 0,
+	206, 511, 0, 435, 0, 205, 0, 493, 255, 380,
+	377, 590, 285, 276, 272, 252, 320, 389, 432, 524,
+	426, 0, 373, 0, 0, 503, 405, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 326, 250, 328, 204, 417,
+	504, 289, 0, 0, 0, 0, 0, 513, 196, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 240, 0,
+	0, 247, 0, 0, 0, 354, 363, 362, 342, 343,
+	345, 347, 353, 360, 366, 339, 348, 0, 0, 616,
+	0, 0, 0, 268, 324, 275, 267, 587, 0, 0,
+	0, 0, 0, 0, 603, 0, 0, 231, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 278, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 1466, 0, 300, 0, 406, 260, 0, 459,
+	0, 0, 0, 636, 0, 0, 0, 0, 0, 0,
+	0, 368, 0, 333, 199, 227, 0, 0, 416, 467,
+	479, 0, 0, 0, 256, 0, 477, 430, 611, 235,
+	287, 464, 437, 475, 445, 290, 0, 0, 476, 375,
+	592, 455, 608, 637, 638, 266, 410, 622, 528, 630,
+	655, 228, 263, 424, 512, 614, 500, 401, 588, 589,
+	332, 499, 298, 203, 372, 643, 226, 485, 374, 244,
+	233, 594, 619, 302, 254, 292, 462, 650, 215, 523,
+	605, 241, 489, 0, 0, 658, 249, 510, 617, 606,
+	217, 601, 509, 397, 329, 330, 216, 0, 463, 271,
+	296, 0, 0, 261, 419, 596, 597, 259, 659, 230,
+	629, 222, 0, 628, 412, 591, 602, 398, 386, 221,
+	600, 396, 385, 337, 358, 359, 283, 310, 452, 378,
+	453, 309, 311, 408, 407, 409, 209, 615, 633, 0,
+	210, 0, 505, 618, 660, 457, 214, 236, 237, 239,
+	0, 282, 286, 294, 297, 306, 307, 316, 370, 423,
+	451, 447, 456, 0, 585, 609, 623, 635, 641, 642,
+	644, 645, 646, 647, 648, 651, 649, 411, 314, 501,
+	336, 376, 0, 0, 429, 478, 242, 613, 502, 201,
+	0, 0, 0, 0, 257, 258, 0, 581, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 661, 662, 663,
+	664, 665, 666, 667, 668, 669, 670, 671, 672, 673,
+	674, 675, 676, 677, 678, 656, 514, 520, 515, 516,
+	517, 518, 519, 0, 521, 0, 0, 0, 0, 0,
+	402, 0, 598, 599, 679, 387, 492, 610, 338, 352,
+	355, 344, 364, 0, 365, 340, 341, 346, 349, 350,
+	351, 356, 357, 361, 367, 251, 212, 394, 403, 584,
+	315, 218, 219, 220, 530, 531, 532, 533, 626, 627,
+	631, 207, 468, 469, 470, 471, 295, 621, 312, 474,
+	473, 334, 335, 382, 454, 546, 548, 559, 563, 565,
+	567, 573, 576, 547, 549, 560, 564, 566, 568, 574,
+	577, 536, 538, 540, 542, 555, 554, 551, 579, 580,
+	557, 562, 541, 553, 558, 571, 578, 575, 535, 539,
+	543, 552, 570, 569, 550, 561, 572, 556, 544, 537,
+	545, 0, 198, 223, 371, 0, 460, 291, 657, 625,
+	490, 620, 208, 225, 0, 265, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 200, 202, 211,
+	224, 234, 238, 245, 264, 279, 281, 288, 301, 313,
+	321, 322, 325, 331, 383, 390, 391, 392, 393, 413,
+	414, 415, 418, 421, 422, 425, 427, 428, 431, 436,
+	440, 441, 442, 444, 446, 448, 461, 466, 480, 481,
+	482, 483, 484, 487, 488, 494, 495, 496, 497, 498,
+	506, 507, 522, 593, 595, 612, 632, 639, 486, 388,
+	434, 458, 586, 304, 305, 449, 450, 317, 318, 653,
+	654, 1465, 607, 640, 604, 652, 634, 443, 381, 0,
+	0, 384, 284, 308, 323, 0, 624, 508, 229, 472,
+	293, 253, 0, 0, 213, 248, 232, 262, 277, 280,
+	327, 395, 404, 433, 439, 299, 274, 246, 465, 243,
+	491, 525, 526, 527, 529, 399, 269, 438, 400, 0,
+	379, 582, 583, 319, 0, 0, 0, 534, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 420,
+	0, 0, 0, 0, 0, 0, 0, 273, 0, 0,
+	0, 0, 369, 270, 0, 0, 206, 511, 0, 435,
+	0, 205, 0, 493, 255, 380, 377, 590, 285, 276,
+	272, 252, 320, 389, 432, 524, 426, 0, 373, 0,
+	0, 503, 405, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 326, 250, 328, 204, 417, 504, 289, 0, 0,
+	0, 0, 0, 513, 196, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 240, 0, 0, 247, 0, 0,
+	0, 354, 363, 362, 342, 343, 345, 347, 353, 360,
+	366, 339, 348, 0, 0, 616, 0, 0, 0, 268,
+	324, 275, 267, 587, 0, 0, 0, 0, 0, 0,
+	603, 0, 0, 231, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 278, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	300, 0, 406, 260, 0, 459, 0, 0, 0, 636,
+	0, 0, 0, 0, 0, 0, 0, 368, 0, 333,
+	199, 227, 0, 0, 416, 467, 479, 0, 0, 0,
+	256, 0, 477, 430, 611, 235, 287, 464, 437, 475,
+	445, 290, 0, 0, 476, 375, 592, 455, 608, 637,
+	638, 266, 410, 622, 528, 630, 655, 228, 263, 424,
+	512, 614, 500, 401, 588, 589, 332, 499, 298, 203,
+	372, 643, 226, 485, 374, 244, 233, 594, 619, 302,
+	254, 292, 462, 650, 215, 523, 605, 241, 489, 0,
+	0, 658, 249, 510, 617, 606, 217, 601, 509, 397,
+	329, 330, 216, 0, 463, 271, 296, 0, 0, 261,
+	419, 596, 597, 259, 659, 230, 629, 222, 0, 628,
+	412, 591, 602, 398, 386, 221, 600, 396, 385, 337,
+	358, 359, 283, 310, 452, 378, 453, 309, 311, 408,
+	407, 409, 209, 615, 633, 0, 210, 0, 505, 618,
+	660, 457, 214, 236, 237, 239, 0, 282, 286, 294,
+	297, 306, 307, 316, 370, 423, 451, 447, 456, 0,
+	585, 609, 623, 635, 641, 642, 644, 645, 646, 647,
+	648, 651, 649, 411, 314, 501, 336, 376, 0, 0,
+	429, 478, 242, 613, 502, 201, 0, 0, 0, 0,
+	257, 258, 0, 581, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 661, 662, 663, 664, 665, 666, 667,
+	668, 669, 670, 671, 672, 673, 674, 675, 676, 677,
+	678, 656, 514, 520, 515, 516, 517, 518, 519, 0,
+	521, 0, 0, 0, 0, 0, 402, 0, 598, 599,
+	679, 387, 492, 610, 338, 352, 355, 344, 364, 0,
+	365, 340, 341, 346, 349, 350, 351, 356, 357, 361,
+	367, 251, 212, 394, 403, 584, 315, 218, 219, 220,
+	530, 531, 532, 533, 626, 627, 631, 207, 468, 469,
+	470, 471, 295, 621, 312, 474, 473, 334, 335, 382,
+	454, 546, 548, 559, 563, 565, 567, 573, 576, 547,
+	549, 560, 564, 566, 568, 574, 577, 536, 538, 540,
+	542, 555, 554, 551, 579, 580, 557, 562, 541, 553,
+	558, 571, 578, 575, 535, 539, 543, 552, 570, 569,
+	550, 561, 572, 556, 544, 537, 545, 0, 198, 223,
+	371, 0, 460, 291, 657, 625, 490, 620, 208, 225,
+	0, 265, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 1058,
+	0, 0, 0, 200, 202, 211, 224, 234, 238, 245,
+	264, 279, 281, 288, 301, 313, 321, 322, 325, 331,
+	383, 390, 391, 392, 393, 413, 414, 415, 418, 421,
+	422, 425, 427, 428, 431, 436, 440, 441, 442, 444,
+	446, 448, 461, 466, 480, 481, 482, 483, 484, 487,
+	488, 494, 495, 496, 497, 498, 506, 507, 522, 593,
+	595, 612, 632, 639, 486, 388, 434, 458, 586, 304,
+	305, 449, 450, 317, 318, 653, 654, 303, 607, 640,
+	604, 652, 634, 443, 381, 0, 0, 384, 284, 308,
+	323, 0, 624, 508, 229, 472, 293, 253, 0, 0,
+	213, 248, 232, 262, 277, 280, 327, 395, 404, 433,
+	439, 299, 274, 246, 465, 243, 491, 525, 526, 527,
+	529, 399, 269, 438, 400, 0, 379, 582, 583, 319,
+	0, 0, 0, 534, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 420, 0, 0, 0, 0,
+	0, 0, 0, 273, 0, 0, 0, 0, 369, 270,
+	0, 0, 206, 511, 0, 435, 0, 205, 0, 493,
+	255, 380, 377, 590, 285, 276, 272, 252, 320, 389,
+	432, 524, 426, 0, 373, 0, 0, 503, 405, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 326, 250, 328,
+	204, 417, 504, 289, 0, 0, 0, 0, 0, 513,
+	196, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	240, 0, 0, 247, 0, 0, 0, 354, 363, 362,
+	342, 343, 345, 347, 353, 360, 366, 339, 348, 0,
+	0, 616, 0, 0, 0, 268, 324, 275, 267, 587,
+	0, 0, 0, 0, 0, 0, 603, 0, 0, 231,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 278, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 300, 0, 406, 260,
+	0, 459, 0, 682, 0, 636, 0, 0, 0, 0,
+	0, 0, 0, 368, 0, 333, 199, 227, 0, 0,
+	416, 467, 479, 0, 0, 0, 256, 0, 477, 430,
+	611, 235, 287, 464, 437, 475, 445, 290, 0, 0,
+	476, 375, 592, 455, 608, 637, 638, 266, 410, 622,
+	528, 630, 655, 228, 263, 424, 512, 614, 500, 401,
+	588, 589, 332, 499, 298, 203, 372, 643, 226, 485,
+	374, 244, 233, 594, 619, 302, 254, 292, 462, 650,
+	215, 523, 605, 241, 489, 0, 0, 658, 249, 510,
+	617, 606, 217, 601, 509, 397, 329, 330, 216, 0,
+	463, 271, 296, 0, 0, 261, 419, 596, 597, 259,
+	659, 230, 629, 222, 0, 628, 412, 591, 602, 398,
+	386, 221, 600, 396, 385, 337, 358, 359, 283, 310,
+	452, 378, 453, 309, 311, 408, 407, 409, 209, 615,
+	633, 0, 210, 0, 505, 618, 660, 457, 214, 236,
+	237, 239, 0, 282, 286, 294, 297, 306, 307, 316,
+	370, 423, 451, 447, 456, 0, 585, 609, 623, 635,
+	641, 642, 644, 645, 646, 647, 648, 651, 649, 411,
+	314, 501, 336, 376, 0, 0, 429, 478, 242, 613,
+	502, 201, 0, 0, 0, 0, 257, 258, 0, 581,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 661,
+	662, 663, 664, 665, 666, 667, 668, 669, 670, 671,
+	672, 673, 674, 675, 676, 677, 678, 656, 514, 520,
+	515, 516, 517, 518, 519, 0, 521, 0, 0, 0,
+	0, 0, 402, 0, 598, 599, 679, 387, 492, 610,
+	338, 352, 355, 344, 364, 0, 365, 340, 341, 346,
+	349, 350, 351, 356, 357, 361, 367, 251, 212, 394,
+	403, 584, 315, 218, 219, 220, 530, 531, 532, 533,
+	626, 627, 631, 207, 468, 469, 470, 471, 295, 621,
+	312, 474, 473, 334, 335, 382, 454, 546, 548, 559,
+	563, 565, 567, 573, 576, 547, 549, 560, 564, 566,
+	568, 574, 577, 536, 538, 540, 542, 555, 554, 551,
+	579, 580, 557, 562, 541, 553, 558, 571, 578, 575,
+	535, 539, 543, 552, 570, 569, 550, 561, 572, 556,
+	544, 537, 545, 0, 198, 223, 371, 0, 460, 291,
+	657, 625, 490, 620, 208, 225, 0, 265, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 200,
+	202, 211, 224, 234, 238, 245, 264, 279, 281, 288,
+	301, 313, 321, 322, 325, 331, 383, 390, 391, 392,
+	393, 413, 414, 415, 418, 421, 422, 425, 427, 428,
+	431, 436, 440, 441, 442, 444, 446, 448, 461, 466,
+	480, 481, 482, 483, 484, 487, 488, 494, 495, 496,
+	497, 498, 506, 507, 522, 593, 595, 612, 632, 639,
+	486, 388, 434, 458, 586, 304, 305, 449, 450, 317,
+	318, 653, 654, 303, 607, 640, 604, 652, 634, 443,
+	381, 0, 0, 384, 284, 308, 323, 0, 624, 508,
+	229, 472, 293, 253, 0, 0, 213, 248, 232, 262,
+	277, 280, 327, 395, 404, 433, 439, 299, 274, 246,
+	465, 243, 491, 525, 526, 527, 529, 399, 269, 438,
+	400, 0, 379, 582, 583, 319, 0, 0, 0, 534,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 420, 0, 0, 0, 0, 0, 0, 0, 273,
+	0, 0, 0, 0, 369, 270, 0, 0, 206, 511,
+	0, 435, 0, 205, 0, 493, 255, 380, 377, 590,
+	285, 276, 272, 252, 320, 389, 432, 524, 426, 0,
+	373, 0, 0, 503, 405, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 326, 250, 328, 204, 417, 504, 289,
+	0, 0, 0, 0, 0, 513, 731, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 240, 0, 0, 247,
+	0, 0, 0, 354, 363, 362, 342, 343, 345, 347,
+	353, 360, 366, 339, 348, 0, 0, 616, 0, 0,
+	0, 268, 324, 275, 267, 587, 0, 0, 0, 0,
+	0, 0, 603, 0, 0, 231, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	278, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 300, 0, 406, 260, 0, 459, 0, 0,
+	0, 636, 0, 0, 0, 0, 0, 0, 0, 368,
+	0, 333, 199, 227, 0, 0, 416, 467, 479, 0,
+	0, 0, 256, 0, 477, 430, 611, 235, 287, 464,
+	437, 475, 445, 290, 0, 0, 476, 375, 592, 455,
+	608, 637, 638, 266, 410, 622, 528, 630, 655, 228,
+	263, 424, 512, 614, 500, 401, 588, 589, 332, 499,
+	298, 203, 372, 643, 226, 485, 374, 244, 233, 594,
+	619, 302, 254, 292, 462, 650, 215, 523, 605, 241,
+	489, 0, 0, 658, 249, 510, 617, 606, 217, 601,
+	509, 397, 329, 330, 216, 0, 463, 271, 296, 0,
+	0, 261, 419, 596, 597, 259, 659, 230, 629, 222,
+	0, 628, 412, 591, 602, 398, 386, 221, 600, 396,
+	385, 337, 358, 359, 283, 310, 452, 378, 453, 309,
+	311, 408, 407, 409, 209, 615, 633, 0, 210, 0,
+	505, 618, 660, 457, 214, 236, 237, 239, 0, 282,
+	286, 294, 297, 306, 307, 316, 370, 423, 451, 447,
+	456, 0, 585, 609, 623, 635, 641, 642, 644, 645,
+	646, 647, 648, 651, 649, 411, 314, 501, 336, 376,
+	0, 0, 429, 478, 242, 613, 502, 201, 0, 0,
+	0, 0, 257, 258, 0, 581, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 661, 662, 663, 664, 665,
+	666, 667, 668, 669, 670, 671, 672, 673, 674, 675,
+	676, 677, 678, 656, 514, 520, 515, 516, 517, 518,
+	519, 0, 521, 0, 0, 0, 0, 0, 402, 0,
+	598, 599, 679, 387, 492, 610, 338, 352, 355, 344,
+	364, 0, 365, 340, 341, 346, 349, 350, 351, 356,
+	357, 361, 367, 251, 212, 394, 403, 584, 315, 218,
+	219, 220, 530, 531, 532, 533, 626, 627, 631, 207,
+	468, 469, 470, 471, 295, 621, 312, 474, 473, 334,
+	335, 382, 454, 546, 548, 559, 563, 565, 567, 573,
+	576, 547, 549, 560, 564, 566, 568, 574, 577, 536,
+	538, 540, 542, 555, 554, 551, 579, 580, 557, 562,
+	541, 553, 558, 571, 578, 575, 535, 539, 543, 552,
+	570, 569, 550, 561, 572, 556, 544, 537, 545, 0,
+	198, 223, 371, 0, 460, 291, 657, 625, 490, 620,
+	208, 225, 0, 265, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 200, 202, 211, 224, 234,
+	238, 245, 264, 279, 281, 288, 301, 313, 321, 322,
+	325, 331, 383, 390, 391, 392, 393, 4159, 414, 415,
+	418, 421, 422, 425, 427, 428, 431, 436, 440, 441,
+	442, 444, 446, 448, 461, 466, 480, 481, 482, 483,
+	484, 487, 488, 494, 495, 496, 497, 498, 506, 507,
+	522, 593, 595, 612, 632, 639, 486, 388, 434, 458,
+	586, 304, 305, 449, 450, 317, 318, 653, 654, 303,
+	607, 640, 604, 652, 634, 443, 381, 0, 0, 384,
+	284, 308, 323, 0, 624, 508, 229, 472, 293, 253,
+	0, 0, 213, 248, 232, 262, 277, 280, 327, 395,
+	404, 433, 439, 299, 274, 246, 465, 243, 491, 525,
+	526, 527, 529, 399, 269, 438, 400, 0, 379, 582,
+	583, 319, 0, 0, 0, 534, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 420, 0, 0,
+	0, 0, 0, 0, 0, 273, 0, 0, 0, 0,
+	369, 270, 0, 0, 206, 511, 0, 435, 0, 205,
+	0, 493, 255, 380, 377, 590, 285, 276, 272, 252,
+	320, 389, 432, 524, 426, 0, 373, 0, 0, 503,
+	405, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 326,
+	250, 328, 204, 417, 504, 289, 0, 0, 0, 0,
+	0, 513, 731, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 240, 0, 0, 247, 0, 0, 0, 354,
+	363, 362, 342, 343, 345, 347, 353, 360, 366, 339,
+	348, 0, 0, 616, 0, 0, 0, 268, 324, 275,
+	267, 587, 0, 0, 0, 0, 0, 0, 603, 0,
+	0, 231, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 278, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 300, 0,
+	406, 260, 0, 459, 0, 0, 0, 636, 0, 0,
+	0, 0, 0, 0, 0, 368, 0, 333, 199, 227,
+	0, 0, 416, 467, 479, 0, 0, 0, 256, 0,
+	477, 430, 611, 235, 287, 464, 437, 475, 445, 290,
+	0, 0, 476, 375, 592, 455, 608, 637, 638, 266,
+	410, 622, 528, 630, 655, 228, 263, 424, 512, 614,
+	500, 401, 588, 589, 332, 499, 298, 203, 372, 643,
+	226, 485, 374, 244, 233, 594, 619, 302, 254, 292,
+	462, 650, 215, 523, 605, 241, 489, 0, 0, 658,
+	249, 510, 617, 606, 217, 601, 509, 397, 329, 330,
+	216, 0, 463, 271, 296, 0, 0, 261, 419, 596,
+	597, 259, 659, 230, 629, 222, 0, 628, 412, 591,
+	602, 398, 386, 221, 600, 396, 385, 337, 358, 359,
+	283, 310, 452, 378, 453, 309, 311, 408, 407, 409,
+	209, 615, 633, 0, 210, 0, 505, 618, 660, 457,
+	214, 236, 237, 239, 0, 282, 286, 294, 297, 306,
+	307, 316, 370, 423, 451, 447, 456, 0, 585, 609,
+	623, 635, 641, 642, 644, 645, 646, 647, 648, 651,
+	649, 411, 314, 501, 336, 376, 0, 0, 429, 478,
+	242, 613, 502, 201, 0, 0, 0, 0, 257, 258,
+	0, 581, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 661, 662, 663, 664, 665, 666, 667, 668, 669,
+	670, 671, 672, 673, 674, 675, 676, 677, 678, 656,
+	514, 520, 515, 516, 517, 518, 519, 0, 521, 0,
+	0, 0, 0, 0, 402, 0, 598, 599, 679, 387,
+	492, 610, 338, 352, 355, 344, 364, 0, 365, 340,
+	341, 346, 349, 350, 351, 356, 357, 361, 367, 251,
+	212, 394, 403, 584, 315, 218, 219, 220, 530, 531,
+	532, 533, 626, 627, 631, 207, 468, 469, 470, 471,
+	295, 621, 312, 474, 473, 334, 335, 382, 454, 546,
+	548, 559, 563, 565, 567, 573, 576, 547, 549, 560,
+	564, 566, 568, 574, 577, 536, 538, 540, 542, 555,
+	554, 551, 579, 580, 557, 562, 541, 553, 558, 571,
+	578, 575, 535, 539, 543, 552, 570, 569, 550, 561,
+	572, 556, 544, 537, 545, 0, 198, 223, 371, 0,
+	460, 291, 657, 625, 490, 620, 208, 225, 0, 265,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 200, 202, 211, 224, 234, 238, 245, 264, 279,
+	281, 288, 301, 313, 321, 322, 325, 331, 383, 390,
+	391, 392, 393, 413, 414, 415, 418, 421, 422, 425,
+	427, 428, 431, 436, 440, 441, 442, 444, 446, 448,
+	461, 466, 480, 481, 482, 483, 484, 487, 488, 494,
+	495, 496, 497, 498, 506, 507, 522, 593, 595, 612,
+	632, 639, 486, 388, 434, 458, 586, 304, 305, 449,
+	450, 317, 318, 653, 654, 303, 607, 640, 604, 652,
+	634, 443, 381, 0, 0, 384, 284, 308, 323, 0,
+	624, 508, 229, 472, 293, 253, 0, 0, 213, 248,
+	232, 262, 277, 280, 327, 395, 404, 433, 439, 299,
+	274, 246, 465, 243, 491, 525, 526, 527, 529, 399,
+	269, 438, 400, 0, 379, 582, 583, 319, 0, 0,
+	0, 534, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 420, 0, 0, 0, 0, 0, 0,
+	0, 273, 0, 0, 0, 0, 369, 270, 0, 0,
+	206, 511, 0, 435, 0, 205, 0, 493, 255, 380,
+	377, 590, 285, 276, 272, 252, 320, 389, 432, 524,
+	426, 0, 373, 0, 0, 503, 405, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 326, 250, 328, 204, 417,
+	504, 289, 0, 0, 0, 0, 0, 513, 966, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 240, 0,
+	0, 247, 0, 0, 0, 354, 363, 362, 342, 343,
+	345, 347, 353, 360, 366, 339, 348, 0, 0, 616,
+	0, 0, 0, 268, 324, 275, 267, 587, 0, 0,
+	0, 0, 0, 0, 603, 0, 0, 231, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 278, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 300, 0, 406, 260, 0, 459,
+	0, 0, 0, 636, 0, 0, 0, 0, 0, 0,
+	0, 368, 0, 333, 199, 227, 0, 0, 416, 467,
+	479, 0, 0, 0, 256, 0, 477, 430, 611, 235,
+	287, 464, 437, 475, 445, 290, 0, 0, 476, 375,
+	592, 455, 608, 637, 638, 266, 410, 622, 528, 630,
+	655, 228, 263, 424, 512, 614, 500, 401, 588, 589,
+	332, 499, 298, 203, 372, 643, 226, 485, 374, 244,
+	233, 594, 619, 302, 254, 292, 462, 650, 215, 523,
+	605, 241, 489, 0, 0, 658, 249, 510, 617, 606,
+	217, 601, 509, 397, 329, 330, 216, 0, 463, 271,
+	296, 0, 0, 261, 419, 596, 597, 259, 659, 230,
+	629, 222, 0, 628, 412, 591, 602, 398, 386, 221,
+	600, 396, 385, 337, 358, 359, 283, 310, 452, 378,
+	453, 309, 311, 408, 407, 409, 209, 615, 633, 0,
+	210, 0, 505, 618, 660, 457, 214, 236, 237, 239,
+	0, 282, 286, 294, 297, 306, 307, 316, 370, 423,
+	451, 447, 456, 0, 585, 609, 623, 635, 641, 642,
+	644, 645, 646, 647, 648, 651, 649, 411, 314, 501,
+	336, 376, 0, 0, 429, 478, 242, 613, 502, 201,
+	0, 0, 0, 0, 257, 258, 0, 581, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 661, 662, 663,
+	664, 665, 666, 667, 668, 669, 670, 671, 672, 673,
+	674, 675, 676, 677, 678, 656, 514, 520, 515, 516,
+	517, 518, 519, 0, 521, 0, 0, 0, 0, 0,
+	402, 0, 598, 599, 679, 387, 492, 610, 338, 352,
+	355, 344, 364, 0, 365, 340, 341, 346, 349, 350,
+	351, 356, 357, 361, 367, 251, 212, 394, 403, 584,
+	315, 218, 219, 220, 530, 531, 532, 533, 626, 627,
+	631, 207, 468, 469, 470, 471, 295, 621, 312, 474,
+	473, 334, 335, 382, 454, 546, 548, 559, 563, 565,
+	567, 573, 576, 547, 549, 560, 564, 566, 568, 574,
+	577, 536, 538, 540, 542, 555, 554, 551, 579, 580,
+	557, 562, 541, 553, 558, 571, 578, 575, 535, 539,
+	543, 552, 570, 569, 550, 561, 572, 556, 544, 537,
+	545, 0, 198, 223, 371, 0, 460, 291, 657, 625,
+	490, 620, 208, 225, 0, 265, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 200, 202, 211,
+	224, 234, 238, 245, 264, 279, 281, 288, 301, 313,
+	321, 322, 325, 331, 383, 390, 391, 392, 393, 413,
+	414, 415, 418, 421, 422, 425, 427, 428, 431, 436,
+	440, 441, 442, 444, 446, 448, 461, 466, 480, 481,
+	482, 483, 484, 487, 488, 494, 495, 496, 497, 498,
+	506, 507, 522, 593, 595, 612, 632, 639, 486, 388,
+	434, 458, 586, 304, 305, 449, 450, 317, 318, 653,
+	654, 303, 607, 640, 604, 652, 634, 443, 381, 0,
+	0, 384, 284, 308, 323, 0, 624, 508, 229, 472,
+	293, 253, 0, 0, 213, 248, 232, 262, 277, 280,
+	327, 395, 404, 433, 439, 299, 274, 246, 465, 243,
+	491, 525, 526, 527, 529, 399, 269, 438, 400, 0,
+	379, 582, 583, 319, 0, 0, 0, 534, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 420,
+	0, 0, 0, 0, 0, 0, 0, 273, 0, 0,
+	0, 0, 369, 270, 0, 0, 206, 511, 0, 435,
+	0, 205, 0, 493, 255, 380, 377, 590, 285, 276,
+	272, 252, 320, 389, 432, 524, 426, 0, 373, 0,
+	0, 503, 405, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 326, 250, 328, 204, 417, 504, 289, 0, 0,
+	0, 0, 0, 513, 196, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 240, 0, 0, 247, 0, 0,
+	0, 354, 363, 362, 342, 343, 345, 347, 353, 360,
+	366, 339, 348, 0, 0, 616, 0, 0, 0, 268,
+	324, 275, 267, 587, 0, 0, 0, 0, 0, 0,
+	603, 0, 0, 231, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 278, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	300, 0, 406, 260, 0, 459, 0, 0, 0, 636,
+	0, 0, 0, 0, 0, 0, 0, 368, 0, 333,
+	199, 227, 0, 0, 416, 467, 479, 0, 0, 0,
+	256, 0, 477, 430, 611, 235, 287, 464, 437, 475,
+	445, 290, 0, 0, 476, 375, 592, 455, 608, 637,
+	638, 266, 410, 622, 528, 630, 655, 228, 263, 424,
+	512, 614, 500, 401, 588, 589, 332, 499, 298, 203,
+	372, 643, 226, 485, 374, 244, 233, 594, 619, 302,
+	254, 292, 462, 650, 215, 523, 605, 241, 489, 0,
+	0, 658, 249, 510, 617, 606, 217, 601, 509, 397,
+	329, 330, 216, 0, 463, 271, 296, 0, 0, 261,
+	419, 596, 597, 259, 659, 230, 629, 222, 0, 628,
+	412, 591, 602, 398, 386, 221, 600, 396, 385, 337,
+	358, 359, 283, 310, 452, 378, 453, 309, 311, 408,
+	407, 409, 209, 615, 633, 0, 210, 0, 505, 618,
+	660, 457, 214, 236, 237, 239, 0, 282, 286, 294,
+	297, 306, 307, 316, 370, 423, 451, 447, 456, 0,
+	585, 609, 623, 635, 641, 642, 644, 645, 646, 647,
+	648, 651, 649, 411, 314, 501, 336, 376, 0, 0,
+	429, 478, 242, 613, 502, 201, 0, 0, 0, 0,
+	257, 258, 0, 581, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 661, 662, 663, 664, 665, 666, 667,
+	668, 669, 670, 671, 672, 673, 674, 675, 676, 677,
+	678, 656, 514, 520, 515, 516, 517, 518, 519, 0,
+	521, 0, 0, 0, 0, 0, 402, 0, 598, 599,
+	679, 387, 492, 610, 338, 352, 355, 344, 364, 0,
+	365, 340, 341, 346, 349, 350, 351, 356, 357, 361,
+	367, 251, 212, 394, 403, 584, 315, 218, 219, 220,
+	530, 531, 532, 533, 626, 627, 631, 207, 468, 469,
+	470, 471, 295, 621, 312, 474, 473, 334, 335, 382,
+	454, 546, 548, 559, 563, 565, 567, 573, 576, 547,
+	549, 560, 564, 566, 568, 574, 577, 536, 538, 540,
+	542, 555, 554, 551, 579, 580, 557, 562, 541, 553,
+	558, 571, 578, 575, 535, 539, 543, 552, 570, 569,
+	550, 561, 572, 556, 544, 537, 545, 0, 198, 223,
+	371, 0, 460, 291, 657, 625, 490, 620, 208, 225,
+	0, 265, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 200, 202, 211, 224, 234, 238, 245,
+	264, 279, 281, 288, 301, 313, 321, 322, 325, 331,
+	383, 390, 391, 392, 393, 413, 414, 415, 418, 421,
+	422, 425, 427, 428, 431, 436, 440, 441, 442, 444,
+	446, 448, 461, 466, 480, 481, 482, 483, 484, 487,
+	488, 494, 495, 496, 497, 498, 506, 507, 522, 593,
+	595, 612, 632, 639, 486, 388, 434, 458, 586, 304,
+	305, 449, 450, 317, 318, 653, 654, 303, 607, 640,
+	604, 652, 634, 443, 381, 0, 0, 384, 284, 308,
+	323, 0, 624, 508, 229, 472, 293, 253, 0, 0,
+	213, 248, 232, 262, 277, 280, 327, 395, 404, 433,
+	439, 299, 274, 246, 465, 243, 491, 525, 526, 527,
+	529, 399, 269, 438, 0, 0, 379, 582, 583, 319,
 }
 
 var yyPact = [...]int{
-	-1000, -1000, 4555, -1000, -558, -1000, -1000, -1000, -1000, -1000,
+	-1000, -1000, 4559, -1000, -555, -1000, -1000, -1000, -1000, -1000,
 	-1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000,
 	-1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000,
 	-1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000,
-	-1000, 2464, 2518, -1000, -1000, -1000, -1000, 2659, -1000, 1021,
-	2094, -1000, 2451, 5683, -1000, 55453, 792, -1000, 52469, -456,
-	905, 234, 36057, -1000, 189, -1000, 173, 53961, 181, -1000,
-	-1000, -1000, -1000, -456, 21883, 2330, 38, 36, 55453, -1000,
-	-1000, -1000, -1000, -373, 2596, 2035, -1000, 419, -1000, -1000,
-	-1000, -1000, -1000, -1000, 51723, -1000, -1000, -1000, 1132, -1000,
-	-1000, 2460, 2455, 2304, 931, 2341, -1000, 2519, 2035, -1000,
-	21883, 2587, 2399, 21137, 21137, 470, -1000, -1000, 299, -1000,
-	-1000, 30835, 55453, 39041, 310, -1000, 2451, -1000, -1000, -1000,
-	188, -1000, 340, 1976, -1000, 1967, -1000, 921, 932, 378,
-	494, 442, 364, 363, 361, 359, 354, 349, 346, 341,
-	387, -1000, 953, 953, -217, -221, 4400, 478, 438, 438,
-	1080, 513, 2396, 2393, -1000, -1000, 953, 953, 953, 362,
-	953, 953, 953, 953, 296, 281, 953, 953, 953, 953,
-	953, 953, 953, 953, 953, 953, 953, 953, 953, 953,
-	953, 953, 953, 885, 2451, 258, -1000, -1000, -1000, -1000,
+	-1000, 2542, 2773, -1000, -1000, -1000, -1000, 2685, -1000, 999,
+	2121, -1000, 2449, 4217, -1000, 55454, 473, -1000, 52470, -428,
+	862, 234, 36058, -1000, 199, -1000, 189, 53962, 200, -1000,
+	-1000, -1000, -1000, -428, 21884, 2358, 54, 52, 55454, -1000,
+	-1000, -1000, -1000, -362, 2637, 2002, -1000, 386, -1000, -1000,
+	-1000, -1000, -1000, -1000, 51724, -1000, -1000, -1000, 1103, -1000,
+	-1000, 2458, 2456, 2291, 889, 2354, -1000, 2532, 2002, -1000,
+	21884, 2621, 2398, 21138, 21138, 446, -1000, -1000, 336, -1000,
+	-1000, 30836, 55454, 39042, 913, -1000, 2449, -1000, -1000, -1000,
+	193, -1000, 340, 2041, -1000, 2040, -1000, 864, 1083, 377,
+	863, 487, 374, 363, 361, 351, 346, 344, 343, 342,
+	392, -1000, 919, 919, -214, -221, 1470, 431, 434, 434,
+	1044, 456, 2436, 2428, -1000, -1000, 919, 919, 919, 365,
+	919, 919, 919, 919, 315, 310, 919, 919, 919, 919,
+	919, 919, 919, 919, 919, 919, 919, 919, 919, 919,
+	919, 919, 919, 884, 2449, 274, -1000, -1000, -1000, -1000,
 	-1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000,
 	-1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000,
 	-1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000,
@@ -7399,67 +7399,67 @@ var yyPact = [...]int{
 	-1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000,
 	-1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000,
 	-1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000,
-	55453, 185, 55453, -1000, 850, 789, -1000, -1000, -460, 1104,
-	1104, 74, 1104, 1104, 1104, 1104, 184, 1031, 35, -1000,
-	183, 245, 156, 259, 1102, 172, -1000, -1000, 249, 1102,
-	1873, -1000, 936, 255, 207, -1000, 1104, 1104, -1000, 14399,
-	257, 14399, 14399, 254, 158, -1000, 2408, -1000, -1000, -1000,
-	-1000, -1000, 1458, -1000, -1000, -1000, -1000, -39, 511, -1000,
-	-1000, -1000, -1000, 53961, 50977, 309, -1000, -1000, 31, 1813,
-	1162, 21883, 1396, 928, -1000, -1000, 1197, 909, -1000, -1000,
-	-1000, -1000, -1000, 832, -1000, 24121, 24121, 24121, 24121, -1000,
-	-1000, 1734, 50231, 1734, 1734, 24121, 1734, 24121, 1734, 1734,
-	1734, 1734, 21883, 1734, 1734, 1734, 1734, -1000, 1734, 1734,
-	1734, 1734, 1734, 1734, 1734, 1734, 1734, 1734, 1734, 1734,
-	1734, 1734, 1734, 1734, 1734, 1734, 1734, 1734, 1734, 1734,
-	1734, 1734, 1734, 1734, 1734, 1734, 1734, 1734, 1734, 1734,
-	1734, 1734, 1734, 1734, 1734, 1734, 1734, 1734, 1734, 1734,
-	1734, 1734, 1734, 1734, 1734, 1734, 1734, 1734, 1734, 1734,
-	1734, 1734, 1734, 1734, 1734, 1734, 1734, 1734, 1734, 1734,
-	1734, 1734, 1734, 1734, 1734, 1734, 1734, 1734, 1734, 1734,
-	1734, 1734, 1734, 1734, 1734, 1734, 1734, 1734, 1734, 1734,
-	1734, 1734, 1734, 1734, 1734, 1734, 1734, 1734, 1734, 1734,
-	1734, 1734, 1734, 1734, 1734, 1734, 1734, 1734, 1734, 1734,
-	1734, 1734, 1734, 1734, 1734, 1734, 1734, 1734, 1734, 1734,
-	1734, 1734, 1734, 1734, 1734, 1734, 1734, 1734, 1734, 1734,
-	1734, 1734, 1734, 1734, 1734, 1734, 1734, -1000, -1000, -1000,
-	-1000, 1734, 849, 1734, 1734, 1734, 1734, 1734, -1000, -1000,
-	-1000, -1000, -1000, -1000, -1000, 1734, 1734, 1734, 1734, 1734,
-	1734, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000,
-	1734, 1734, 1734, 1734, 1734, 1734, 1734, 1734, 1734, 1734,
-	1734, 1734, 1734, 1734, -1000, -1000, -1000, 1728, -1000, -1000,
-	-1000, -1000, -1000, -1000, -1000, 3009, 1588, 1585, 1584, -1000,
-	18899, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000,
+	55454, 224, 55454, -1000, 813, 472, -1000, -1000, -453, 1084,
+	1084, 74, 1084, 1084, 1084, 1084, 201, 1031, 51, -1000,
+	198, 271, 196, 268, 1069, 210, -1000, -1000, 254, 1069,
+	1875, -1000, 894, 264, 203, -1000, 1084, 1084, -1000, 14400,
+	229, 14400, 14400, 259, 180, -1000, 2437, -1000, -1000, -1000,
+	-1000, -1000, 1319, -1000, -1000, -1000, -1000, -32, 455, -1000,
+	-1000, -1000, -1000, 53962, 50978, 278, -1000, -1000, 28, 1919,
+	1722, 21884, 1323, 887, -1000, -1000, 1343, 870, -1000, -1000,
+	-1000, -1000, -1000, 512, -1000, 24122, 24122, 24122, 24122, -1000,
+	-1000, 2003, 50232, 2003, 2003, 24122, 2003, 24122, 2003, 2003,
+	2003, 2003, 21884, 2003, 2003, 2003, 2003, -1000, 2003, 2003,
+	2003, 2003, 2003, 2003, 2003, 2003, 2003, 2003, 2003, 2003,
+	2003, 2003, 2003, 2003, 2003, 2003, 2003, 2003, 2003, 2003,
+	2003, 2003, 2003, 2003, 2003, 2003, 2003, 2003, 2003, 2003,
+	2003, 2003, 2003, 2003, 2003, 2003, 2003, 2003, 2003, 2003,
+	2003, 2003, 2003, 2003, 2003, 2003, 2003, 2003, 2003, 2003,
+	2003, 2003, 2003, 2003, 2003, 2003, 2003, 2003, 2003, 2003,
+	2003, 2003, 2003, 2003, 2003, 2003, 2003, 2003, 2003, 2003,
+	2003, 2003, 2003, 2003, 2003, 2003, 2003, 2003, 2003, 2003,
+	2003, 2003, 2003, 2003, 2003, 2003, 2003, 2003, 2003, 2003,
+	2003, 2003, 2003, 2003, 2003, 2003, 2003, 2003, 2003, 2003,
+	2003, 2003, 2003, 2003, 2003, 2003, 2003, 2003, 2003, 2003,
+	2003, 2003, 2003, 2003, 2003, 2003, 2003, 2003, 2003, 2003,
+	2003, 2003, 2003, 2003, 2003, 2003, 2003, -1000, -1000, -1000,
+	-1000, 2003, 809, 2003, 2003, 2003, 2003, 2003, -1000, -1000,
+	-1000, -1000, -1000, -1000, -1000, 2003, 2003, 2003, 2003, 2003,
+	2003, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000,
+	2003, 2003, 2003, 2003, 2003, 2003, 2003, 2003, 2003, 2003,
+	2003, 2003, 2003, 2003, -1000, -1000, -1000, 1672, -1000, -1000,
+	-1000, -1000, -1000, -1000, -1000, 1448, 1542, 1525, 1512, -1000,
+	18900, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000,
 	-1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000,
 	-1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000,
 	-1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000,
 	-1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000,
-	-1000, 1734, -1000, -1000, -1000, 55453, -1000, 1734, 215, 53961,
-	53961, 384, 1380, -1000, -1000, 2519, 2035, -1000, 2596, 2650,
-	419, -1000, 3948, 1667, 1590, 1477, 2035, 1942, 55453, -1000,
-	1999, 218, -1000, -1000, -1000, -335, -357, 2256, 1586, 1871,
-	-1000, -1000, -1000, -1000, 1291, 21883, -1000, -1000, 2655, -1000,
-	28597, 848, 2651, 49485, -1000, 470, 470, 1959, 423, -15,
-	-1000, -1000, -1000, -1000, 978, 35311, -1000, -1000, -1000, -1000,
-	-1000, 1883, 55453, -1000, -1000, 6933, 53961, -1000, 2093, -1000,
-	1879, -1000, 2017, 21883, 2092, 788, 53961, 781, 766, 534,
-	463, -71, -1000, -1000, -1000, -1000, -1000, -1000, 953, 953,
-	953, -1000, 301, 2581, 5683, 6836, -1000, -1000, -1000, 48739,
-	2090, 53961, -1000, 2063, -1000, 1066, 883, 859, 859, 53961,
-	-1000, -1000, 54707, 53961, 1065, 1052, 53961, 53961, 53961, 53961,
-	-1000, 47993, -1000, 47247, 46501, 1379, 53961, 45755, 45009, 44263,
-	43517, 42771, -1000, 2348, -1000, 2111, -1000, -1000, -1000, 54707,
-	53961, 53961, 54707, 53961, 54707, 55453, 53961, -1000, -1000, 360,
-	-1000, -1000, 1377, 1376, 1370, 953, 953, 1369, 1870, 1868,
-	1843, 953, 953, 1366, 1840, 37549, 1827, 278, 1362, 1357,
-	1347, 1535, 1825, 209, 1823, 1453, 1324, 1343, 53961, 2059,
-	55453, -1000, 235, 1084, 436, 968, 2451, 2329, 1954, 507,
-	786, 53961, 460, 460, 53961, -1000, 15151, 55453, 242, -1000,
-	1821, 21883, -1000, 1118, 1102, 1102, -1000, -1000, -1000, -1000,
-	-1000, -1000, 1104, 55453, 1118, -1000, -1000, -1000, 1102, 1104,
-	55453, 1104, 1104, 1104, 1104, 1102, 1102, 1102, 1104, 55453,
-	55453, 55453, 55453, 55453, 55453, 55453, 55453, 55453, 14399, 936,
-	1104, -461, -1000, 1816, -1000, -1000, -1000, 2244, -1000, -1000,
+	-1000, 2003, -1000, -1000, -1000, 55454, -1000, 2003, 221, 53962,
+	53962, 383, 1313, -1000, -1000, 2532, 2002, -1000, 2637, 2676,
+	386, -1000, 3945, 1695, 1638, 1546, 2002, 2010, 55454, -1000,
+	2050, 211, -1000, -1000, -1000, -332, -347, 2262, 1532, 1870,
+	-1000, -1000, -1000, -1000, 1841, 21884, -1000, -1000, 2681, -1000,
+	28598, 803, 2677, 49486, -1000, 446, 446, 2032, 430, -11,
+	-1000, -1000, -1000, -1000, 956, 35312, -1000, -1000, -1000, -1000,
+	-1000, 1894, 55454, -1000, -1000, 5606, 53962, -1000, 2116, -1000,
+	1887, -1000, 2073, 21884, 2134, 471, 53962, 462, 461, 460,
+	443, -67, -1000, -1000, -1000, -1000, -1000, -1000, 919, 919,
+	919, -1000, 388, 2620, 4217, 6836, -1000, -1000, -1000, 48740,
+	2113, 53962, -1000, 2112, -1000, 1026, 868, 869, 869, 53962,
+	-1000, -1000, 54708, 53962, 1022, 1020, 53962, 53962, 53962, 53962,
+	-1000, 47994, -1000, 47248, 46502, 1311, 53962, 45756, 45010, 44264,
+	43518, 42772, -1000, 2364, -1000, 2098, -1000, -1000, -1000, 54708,
+	53962, 53962, 54708, 53962, 54708, 55454, 53962, -1000, -1000, 368,
+	-1000, -1000, 1305, 1304, 1297, 919, 919, 1268, 1859, 1856,
+	1849, 919, 919, 1266, 1827, 37550, 1817, 276, 1262, 1261,
+	1259, 1312, 1815, 269, 1805, 1296, 1254, 1255, 53962, 2100,
+	55454, -1000, 249, 985, 995, 955, 2449, 2346, 2027, 452,
+	468, 53962, 439, 439, 53962, -1000, 15152, 55454, 250, -1000,
+	1791, 21884, -1000, 1079, 1069, 1069, -1000, -1000, -1000, -1000,
+	-1000, -1000, 1084, 55454, 1079, -1000, -1000, -1000, 1069, 1084,
+	55454, 1084, 1084, 1084, 1084, 1069, 1069, 1069, 1084, 55454,
+	55454, 55454, 55454, 55454, 55454, 55454, 55454, 55454, 14400, 894,
+	1084, -454, -1000, 1752, -1000, -1000, -1000, 2240, -1000, -1000,
 	-1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000,
 	-1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000,
 	-1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000,
@@ -7475,338 +7475,338 @@ var yyPact = [...]int{
 	-1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000,
 	-1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000,
 	-1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000,
-	-1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, 14399, 14399,
-	-1000, -1000, 2539, 2526, -1000, -1000, -1000, 1946, -1000, 175,
-	6, 180, -1000, 42025, 532, 967, -1000, 532, -1000, -1000,
-	-1000, -1000, -1000, 1945, 41279, -1000, -462, -463, -465, -466,
-	-1000, -1000, -1000, -473, -476, -1000, -1000, -1000, 21883, 21883,
-	21883, 21883, -254, -1000, 1040, 24121, 2432, -1000, -1000, -1000,
-	-1000, -1000, -1000, -1000, 21883, 1227, 1003, 24121, 24121, 24121,
-	24121, 24121, 24121, 24121, 25613, 24867, 24121, 24121, 24121, 24121,
-	24121, 24121, -1000, -1000, 33073, 8389, 8389, 909, 909, 909,
-	909, -1000, -185, 1944, 54707, -1000, -1000, -1000, 846, 21883,
-	21883, 909, -1000, 1470, 1987, 18899, 21883, 21883, 21883, 21883,
-	988, 1162, 54707, 21883, -1000, 1477, -1000, -1000, -1000, -1000,
-	1244, -1000, -1000, 1087, 2385, 2385, 2385, 2385, 21883, 21883,
-	21883, 21883, 21883, 21883, 21883, 21883, 21883, 21883, 2385, 21883,
-	210, 210, 240, 21883, 21883, 21883, 21883, 21883, 21883, 21883,
-	21883, 17407, 21883, 21883, 24121, 21883, 21883, 21883, 1477, 21883,
-	21883, 21883, 21883, 21883, 21883, 21883, 21883, 21883, 21883, 21883,
-	21883, 21883, 21883, 21883, 21883, 21883, 21883, 21883, 21883, 21883,
-	21883, 21883, 21883, 21883, 21883, 21883, 21883, 21883, 21883, 21883,
-	21883, 21883, 21883, 21883, 21883, 21883, 21883, 21883, 21883, 21883,
-	21883, 21883, 21883, 21883, 21883, 21883, 21883, 21883, 21883, 21883,
-	21883, 21883, 21883, 21883, 21883, 21883, 21883, 21883, 21883, 21883,
-	21883, 21883, 21883, 21883, 21883, 21883, 21883, 21883, 21883, 21883,
-	21883, 21883, 21883, 21883, 21883, 21883, 21883, 21883, 1477, 21883,
-	1523, 21883, 21883, 21883, 21883, 21883, 21883, 21883, 16655, 21883,
-	21883, 21883, 21883, 21883, -1000, -1000, -1000, -1000, -1000, -1000,
-	21883, 21883, 21883, 21883, 21883, 21883, 21883, 21883, 1477, 21883,
-	21883, 21883, 21883, 21883, -1000, -1000, -1000, -1000, -1000, -1000,
-	-1000, -1000, -1000, -1000, 1780, 1573, 1604, 1734, 21883, -1000,
-	1943, -1000, -189, 30089, 21883, 1766, 2644, 2138, 53961, -1000,
-	-1000, -1000, -1000, 2519, -1000, 2519, 1780, 3937, 2272, 21137,
+	-1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, 14400, 14400,
+	-1000, -1000, 2555, 2545, -1000, -1000, -1000, 2026, -1000, 187,
+	15, 197, -1000, 42026, 507, 937, -1000, 507, -1000, -1000,
+	-1000, -1000, -1000, 2017, 41280, -1000, -459, -463, -465, -466,
+	-1000, -1000, -1000, -467, -472, -1000, -1000, -1000, 21884, 21884,
+	21884, 21884, -251, -1000, 1530, 24122, 2419, -1000, -1000, -1000,
+	-1000, -1000, -1000, -1000, 21884, 1177, 941, 24122, 24122, 24122,
+	24122, 24122, 24122, 24122, 25614, 24868, 24122, 24122, 24122, 24122,
+	24122, 24122, -1000, -1000, 33074, 4706, 4706, 870, 870, 870,
+	870, -1000, -178, 2016, 54708, -1000, -1000, -1000, 800, 21884,
+	21884, 870, -1000, 1334, 4398, 18900, 21884, 21884, 21884, 21884,
+	961, 1722, 54708, 21884, -1000, 1546, -1000, -1000, -1000, -1000,
+	1192, -1000, -1000, 1139, 2404, 2404, 2404, 2404, 21884, 21884,
+	21884, 21884, 21884, 21884, 21884, 21884, 21884, 21884, 2404, 21884,
+	725, 725, 917, 21884, 21884, 21884, 21884, 21884, 21884, 21884,
+	21884, 17408, 21884, 21884, 24122, 21884, 21884, 21884, 1546, 21884,
+	21884, 21884, 21884, 21884, 21884, 21884, 21884, 21884, 21884, 21884,
+	21884, 21884, 21884, 21884, 21884, 21884, 21884, 21884, 21884, 21884,
+	21884, 21884, 21884, 21884, 21884, 21884, 21884, 21884, 21884, 21884,
+	21884, 21884, 21884, 21884, 21884, 21884, 21884, 21884, 21884, 21884,
+	21884, 21884, 21884, 21884, 21884, 21884, 21884, 21884, 21884, 21884,
+	21884, 21884, 21884, 21884, 21884, 21884, 21884, 21884, 21884, 21884,
+	21884, 21884, 21884, 21884, 21884, 21884, 21884, 21884, 21884, 21884,
+	21884, 21884, 21884, 21884, 21884, 21884, 21884, 21884, 1546, 21884,
+	1244, 21884, 21884, 21884, 21884, 21884, 21884, 21884, 16656, 21884,
+	21884, 21884, 21884, 21884, -1000, -1000, -1000, -1000, -1000, -1000,
+	21884, 21884, 21884, 21884, 21884, 21884, 21884, 21884, 1546, 21884,
+	21884, 21884, 21884, 21884, -1000, -1000, -1000, -1000, -1000, -1000,
+	-1000, -1000, -1000, -1000, 1668, 1750, 1572, 2003, 21884, -1000,
+	2011, -1000, -195, 30090, 21884, 1748, 2675, 2157, 53962, -1000,
+	-1000, -1000, -1000, 2532, -1000, 2532, 1668, 3937, 2278, 21138,
 	-1000, -1000, 3937, -1000, -1000, -1000, -1000, -1000, -1000, -1000,
-	-1000, -1000, -1000, -1000, -1000, -1000, 1839, -1000, 55453, 1942,
-	2517, 53961, -1000, 1939, -1000, -1000, 1734, -1000, -317, -1000,
-	-323, 2251, 1764, 376, -1000, 21883, 21883, 1938, -1000, 1423,
-	55453, -1000, -254, -1000, 40533, -1000, -1000, 13647, 55453, 335,
-	55453, -1000, 29343, 39787, 304, -1000, -15, 1920, -1000, 16,
-	-1, 18153, 907, -1000, -1000, -1000, 4400, 26359, 1727, 907,
-	111, -1000, -1000, -1000, 2017, -1000, 2017, 2017, 2017, 2017,
-	376, 376, 376, 376, -1000, -1000, -1000, -1000, -1000, 2055,
-	2017, 2047, -1000, 2017, 2017, 2017, 2017, -1000, -1000, -1000,
+	-1000, -1000, -1000, -1000, -1000, -1000, 1775, -1000, 55454, 2010,
+	2527, 53962, -1000, 1998, -1000, -1000, 2003, -1000, -306, -1000,
+	-309, 2232, 1743, 832, -1000, 21884, 21884, 1997, -1000, 1298,
+	55454, -1000, -251, -1000, 40534, -1000, -1000, 13648, 55454, 338,
+	55454, -1000, 29344, 39788, 307, -1000, -11, 1972, -1000, 26,
+	-3, 18154, 867, -1000, -1000, -1000, 1470, 26360, 1865, 867,
+	113, -1000, -1000, -1000, 2073, -1000, 2073, 2073, 2073, 2073,
+	832, 832, 832, 832, -1000, -1000, -1000, -1000, -1000, 2099,
+	2073, 2097, -1000, 2073, 2073, 2073, 2073, -1000, -1000, -1000,
 	-1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000,
-	-1000, -1000, -1000, -1000, 2044, 2044, 2044, 2037, 2037, 2018,
-	2018, 422, -1000, 21883, 414, 39041, 2471, 1340, 1447, 235,
-	463, 2132, 53961, 53961, 53961, 55453, 982, -1000, 1544, 1507,
-	1506, -1000, -539, 1933, -1000, -1000, 2579, -1000, -1000, 974,
-	1101, 1098, 1079, 53961, 219, 308, -1000, 411, -1000, 39041,
-	53961, 1033, 859, 53961, -1000, 53961, -1000, -1000, -1000, -1000,
-	-1000, 53961, -1000, -1000, 1929, -1000, 1986, 1214, 1094, 1150,
-	1083, 1929, -1000, -1000, -194, 1929, -1000, 1929, -1000, 1929,
-	-1000, 1929, -1000, 1929, -1000, -1000, -1000, -1000, -1000, -1000,
-	-1000, -1000, -1000, 1019, 286, -385, 53961, 219, 495, -1000,
-	487, 33073, -1000, -1000, -1000, 33073, 33073, -1000, -1000, -1000,
-	-1000, 1762, 1754, -1000, -1000, -1000, -1000, -1000, -1000, -1000,
+	-1000, -1000, -1000, -1000, 2093, 2093, 2093, 2088, 2088, 2076,
+	2076, 432, -1000, 21884, 348, 39042, 2495, 1249, 2137, 249,
+	443, 2146, 53962, 53962, 53962, 55454, 982, -1000, 1477, 1435,
+	1401, -1000, -539, 1992, -1000, -1000, 2613, -1000, -1000, 1101,
+	1043, 1041, 978, 53962, 227, 328, -1000, 417, -1000, 39042,
+	53962, 1019, 869, 53962, -1000, 53962, -1000, -1000, -1000, -1000,
+	-1000, 53962, -1000, -1000, 1990, -1000, 1945, 1154, 1040, 1104,
+	1011, 1990, -1000, -1000, -184, 1990, -1000, 1990, -1000, 1990,
+	-1000, 1990, -1000, 1990, -1000, -1000, -1000, -1000, -1000, -1000,
+	-1000, -1000, -1000, 993, 309, -346, 53962, 227, 450, -1000,
+	449, 33074, -1000, -1000, -1000, 33074, 33074, -1000, -1000, -1000,
+	-1000, 1732, 1711, -1000, -1000, -1000, -1000, -1000, -1000, -1000,
 	-1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000,
 	-1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000,
-	-1000, -1000, -524, 55453, -1000, 232, 962, 261, 324, 288,
-	55453, 742, 2384, 2380, 2377, 2372, 2369, 2364, 2361, 307,
-	276, 55453, 55453, 460, 2181, 55453, 2483, 55453, -1000, -1000,
-	-1000, -1000, -1000, 1746, 1736, -1000, 1162, 55453, -1000, -1000,
-	1104, 1104, -1000, -1000, 55453, 1104, -1000, -1000, -1000, -1000,
-	-1000, -1000, -1000, -1000, 1104, -1000, -1000, -1000, -1000, -1000,
+	-1000, -1000, -522, 55454, -1000, 241, 936, 294, 314, 308,
+	55454, 787, 2397, 2395, 2387, 2382, 2379, 2377, 2376, 251,
+	298, 55454, 55454, 439, 2194, 55454, 2489, 55454, -1000, -1000,
+	-1000, -1000, -1000, 1697, 1689, -1000, 1722, 55454, -1000, -1000,
+	1084, 1084, -1000, -1000, 55454, 1084, -1000, -1000, -1000, -1000,
+	-1000, -1000, -1000, -1000, 1084, -1000, -1000, -1000, -1000, -1000,
 	-1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000,
-	55453, -1000, -1000, -1000, -1000, 1733, -1000, 55453, -39, 162,
-	-1000, -1000, 53961, -1000, -1000, -1000, -1000, -1000, -1000, -1000,
-	-1000, -1000, -118, -1000, 284, 11, 381, -1000, -1000, -1000,
-	-1000, -1000, 2520, -1000, 1162, 1043, 1012, -1000, 1734, -1000,
-	-1000, 1451, -1000, -1000, -1000, -1000, -1000, 1734, 1734, 1734,
-	-1000, -1000, -1000, -1000, -1000, 1227, 24121, 24121, 24121, 1310,
-	833, 1325, 1336, 1350, 1365, 1365, 1116, 24121, 1116, 24121,
-	913, 913, 913, 913, 913, -1000, -1000, -1000, -1000, -1000,
-	-1000, 1728, -1000, 1716, -1000, 1734, 54707, 1862, 16655, 1857,
-	2540, 1477, 923, -1000, -1000, -1000, -1000, -1000, -1000, -1000,
+	55454, -1000, -1000, -1000, -1000, 1681, -1000, 55454, -32, 185,
+	-1000, -1000, 53962, -1000, -1000, -1000, -1000, -1000, -1000, -1000,
+	-1000, -1000, -83, -1000, 39, 21, 373, -1000, -1000, -1000,
+	-1000, -1000, 2534, -1000, 1722, 975, 992, -1000, 2003, -1000,
+	-1000, 1274, -1000, -1000, -1000, -1000, -1000, 2003, 2003, 2003,
+	-1000, -1000, -1000, -1000, -1000, 1177, 24122, 24122, 24122, 1410,
+	492, 1433, 1327, 1420, 1276, 1276, 1287, 24122, 1287, 24122,
+	871, 871, 871, 871, 871, -1000, -1000, -1000, -1000, -1000,
+	-1000, 1672, -1000, 1627, -1000, 2003, 54708, 1874, 16656, 1904,
+	1540, 1546, 879, -1000, -1000, -1000, -1000, -1000, -1000, -1000,
 	-1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000,
-	-1000, -1000, -1000, 3604, 1477, 1813, 1477, 1317, 3577, 987,
-	-1000, 21883, 1477, 3556, -1000, -1000, 1477, 1477, 21883, -1000,
-	-1000, 21883, 21883, 21883, 21883, 1447, 1447, 1447, 1447, 1447,
-	1447, 1447, 1447, 1447, 1447, 21883, 1447, 1926, -1000, -1000,
+	-1000, -1000, -1000, 3614, 1546, 1919, 1546, 1671, 3609, 979,
+	-1000, 21884, 1546, 3598, -1000, -1000, 1546, 1546, 21884, -1000,
+	-1000, 21884, 21884, 21884, 21884, 2137, 2137, 2137, 2137, 2137,
+	2137, 2137, 2137, 2137, 2137, 21884, 2137, 1989, -1000, -1000,
 	-1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000,
-	-1000, -1000, -1000, -1000, -1000, -1000, 1923, 2642, 1455, 1447,
-	1447, 1447, 1447, 3524, 1447, 1447, 21883, 1346, -1000, -1000,
-	-1000, 1565, 3516, 1254, 3494, 1447, 1447, -1000, 1447, 3487,
-	3483, 1477, 2630, 2620, 1447, 1447, 1447, 1447, 1447, 2611,
-	2602, 1447, 1447, 2535, 1447, 3466, 1447, 2531, 2524, 2515,
-	2501, 2495, 2489, 2461, 2426, 2411, 2407, 2371, 2331, 2327,
-	2323, 2261, 2248, 2237, 2228, 1447, 1447, 1447, 3450, 1447,
-	3446, 1447, 3433, 1447, 1447, 3429, 2212, 2206, 1477, 1921,
-	-1000, 3417, 1447, 3410, 3400, 3388, 2195, 3382, 3371, 3361,
-	1447, 1447, 1447, 2187, 3356, 3306, 3104, 3053, 3048, 3030,
-	3018, 3010, 3006, 1447, 1604, 1604, 1604, 1604, 1604, 2985,
-	-263, 1447, 1477, -1000, -1000, -1000, -1000, -1000, 2976, 2183,
-	2960, 2945, 2937, 2892, 1477, 1734, 844, -1000, -1000, 1604,
-	1477, 1477, 1604, 1604, 2822, 2752, 2733, 2728, 2721, 2710,
-	1447, 1447, -1000, 1447, 2706, 2701, 2133, 2117, 1477, -1000,
-	1604, 55453, -1000, -455, -1000, -12, 1006, 1734, -1000, 37549,
-	1477, -1000, 5688, -1000, 1425, -1000, -1000, -1000, -1000, -1000,
-	34565, 1949, -1000, -1000, -1000, -1000, 1734, 1860, -1000, -496,
-	20391, -1000, -1000, -1000, 376, 58, 33819, 903, 903, 119,
-	1162, 1162, 21883, -1000, -1000, -1000, -1000, -1000, -1000, 842,
-	2603, 398, 1734, -1000, 1985, 3100, -1000, -1000, -1000, 2510,
-	27105, -1000, -1000, 1734, 1734, 55453, 1874, 1865, -1000, 841,
-	-1000, 1471, 1920, -15, -16, -1000, -1000, -1000, -1000, 1162,
-	-1000, 1491, 337, 4215, -1000, 473, -1000, -1000, -1000, -1000,
-	2349, 85, -1000, -1000, -1000, 895, 376, -1000, -1000, -1000,
-	-1000, -1000, -1000, 1712, -1000, 1712, -1000, -1000, -1000, -1000,
-	-1000, 1323, -1000, -1000, -1000, -1000, 1301, -1000, -1000, 1294,
-	-1000, -1000, 2342, 2125, 414, -1000, -1000, 953, 1707, -1000,
-	-1000, 2353, 953, 953, 53961, -1000, -1000, 1711, 2471, 232,
-	55453, 2179, -1000, 2132, 2132, 2132, -1000, 2465, -1000, -1000,
-	-1000, -1000, -1000, -1000, -528, 177, 367, -1000, -1000, -1000,
-	4239, 53961, 1849, -1000, 216, -1000, 1670, -1000, 53961, -1000,
-	1838, 2034, 53961, 53961, -1000, -1000, -1000, 53961, 1734, -1000,
-	-1000, -1000, -1000, 784, 2436, 332, -1000, -1000, -301, -1000,
-	-1000, 219, 216, 54707, 53961, 907, -1000, -1000, -1000, -1000,
-	-1000, -529, 1811, 516, 224, 322, 55453, 55453, 55453, 55453,
-	55453, 55453, 811, -1000, -1000, 26, -1000, -1000, 190, -1000,
-	-1000, 1692, -1000, -1000, -1000, -1000, 190, -1000, -1000, -1000,
-	-1000, -1000, 251, 483, -1000, 55453, 55453, 947, -1000, -1000,
-	-1000, -1000, -1000, 1102, -1000, -1000, 1102, -1000, -1000, -1000,
-	-1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, 2433,
-	55453, 2, -493, -1000, -488, 21883, -1000, -1000, -1000, -1000,
-	-1000, -1000, -1000, 1237, 802, 1325, 24121, 24121, 1987, 1987,
-	24121, -1000, -1000, -1000, 854, 854, 33073, -1000, 24121, 21883,
-	-1000, -1000, 21883, 21883, 21883, 948, -1000, 21883, 1204, -1000,
-	21883, -1000, -263, 1604, 1447, 1447, 1447, 1447, -263, -263,
-	-263, -263, -263, -263, -263, -263, -263, -263, 1963, -1000,
-	21883, 21883, 21883, 1477, 320, -1000, -1000, -1000, -263, 21883,
-	-1000, -1000, 2641, -1000, 21883, -1000, 33073, 21883, 21883, 21883,
-	-1000, -1000, -1000, 21883, 21883, -1000, -1000, 21883, -1000, 21883,
-	-1000, -1000, -1000, -1000, -1000, -1000, 21883, -1000, 21883, -1000,
-	-1000, -1000, 21883, -1000, 21883, -1000, -1000, 21883, -1000, 21883,
-	-1000, 21883, -1000, 21883, -1000, 21883, -1000, 21883, -1000, 21883,
-	-1000, 21883, -1000, 21883, -1000, 21883, -1000, 21883, -1000, 21883,
-	-1000, 21883, -1000, 21883, -1000, 21883, -1000, 21883, -1000, 21883,
-	-1000, 21883, -1000, -1000, -1000, 21883, -1000, 21883, -1000, 21883,
-	-1000, -1000, 21883, -1000, 21883, -1000, 21883, -1000, 21883, 21883,
-	-1000, 21883, 21883, 21883, -1000, 21883, 21883, 21883, 21883, -1000,
-	-1000, -1000, -1000, 21883, 21883, 21883, 21883, 21883, 21883, 21883,
-	21883, 21883, 21883, -1000, -1000, -1000, -1000, -1000, -1000, 21883,
-	-1000, 39041, 4, -263, 1523, 4, 1523, 23375, 856, 853,
-	22629, -1000, 21883, 15903, -1000, -1000, -1000, -1000, -1000, 21883,
-	21883, 21883, 21883, 21883, 21883, -1000, -1000, -1000, 21883, 21883,
-	-1000, 21883, -1000, 21883, -1000, -1000, -1000, -1000, -1000, 1006,
-	-1000, 820, 471, 859, 53961, -1000, -1000, -1000, -1000, 1918,
-	-1000, 2529, -1000, 2286, 2278, 2640, 2603, 21137, -1000, 29343,
-	-1000, -1000, 53961, -1000, -1000, -445, -1000, 2324, 2346, 903,
-	903, -1000, -1000, -1000, -1000, -1000, -1000, -1000, 12895, 2519,
-	21883, 2178, 54707, 1734, -1000, 27851, 53961, 54707, 29343, 29343,
-	29343, 29343, 29343, -1000, 2230, 2225, -1000, 2207, 2196, 2218,
-	55453, -1000, 1780, 1807, -1000, 21883, 31581, 1702, 29343, -1000,
-	-1000, 29343, 55453, 12143, -1000, -1000, -4, -10, -1000, -1000,
-	-1000, -1000, 4400, -1000, -1000, 996, 2503, 2344, -1000, -1000,
-	-1000, -1000, -1000, 1785, -1000, 1782, 1913, 1778, 1773, 286,
-	-1000, 2061, 2430, 953, 953, -1000, 1287, -1000, 1470, 1651,
-	1635, -1000, -1000, -1000, 515, -1000, 55453, 2169, 2166, 2165,
-	-1000, -545, 1285, 2033, 1996, 21883, 2032, 2578, 1901, 53961,
-	-1000, -1000, 54707, -1000, 250, -1000, 414, 53961, -1000, -1000,
-	-1000, 308, 55453, -1000, 8598, -1000, -1000, -1000, 216, -1000,
-	-1000, -1000, -1000, -1000, -1000, -1000, 55453, 231, -1000, 2020,
-	1456, -1000, -1000, 2112, -1000, -1000, -1000, -1000, -1000, 199,
-	197, 1627, 198, 1624, -1000, 198, -1000, 55453, 940, 2125,
-	55453, -1000, -1000, -1000, 1104, 1104, -1000, -1000, 2406, -1000,
-	1470, 1447, 24121, 24121, -1000, 909, -1000, -1000, 425, -236,
-	2017, 2017, -1000, 2017, 2018, -1000, 2017, 149, 2017, 142,
-	2017, -1000, -1000, 1477, 1477, -1000, 1604, 2100, 1305, 2663,
-	-1000, 1162, 21883, 2643, -1000, -1000, -263, -263, -263, -263,
-	-263, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000,
-	-1000, -79, 2626, 2615, 1447, -1000, 2015, 2012, -1000, 1447,
-	21883, 1447, 1477, 2087, 1447, 1447, 1447, 1447, 1447, 1447,
-	1447, 1447, 1447, 1447, 1447, 1447, 2080, 2066, 2056, 2052,
-	2039, 2004, 1991, 1978, 1970, 1940, 1893, 1851, 1846, 1797,
-	1776, 1771, 1447, 1447, 1731, 1447, 1710, 1703, -1000, 1162,
-	1604, 2585, 1604, 1447, 1447, 2547, 317, 1447, 1751, 1751,
-	1751, 1751, 1751, 1604, 1604, 1604, 1604, 1447, 53961, -1000,
-	-263, -1000, -1000, -332, -334, -1000, 1477, -263, 1904, 24121,
-	1447, 24121, 24121, 24121, 1447, 1477, -1000, 1698, 1690, 2418,
-	1677, 1447, 1909, 1447, 1447, 1447, 1656, -1000, 2491, 1734,
-	2491, 1734, 2491, 1726, 1425, 55453, -1000, -1000, -1000, -1000,
-	2603, 2605, -1000, 1902, -1000, 58, 662, -1000, 2299, 2346,
-	-1000, 2577, 2314, 2576, -1000, -1000, -1000, -1000, -1000, 1162,
-	-1000, 2456, 1898, -1000, 957, 1983, -1000, -1000, 20391, 1745,
-	2263, 839, 1726, 1984, 3100, 2142, 2164, 3612, -1000, -1000,
-	-1000, -1000, 2215, -1000, 2199, -1000, -1000, 1999, -1000, 1537,
-	335, 29343, 1973, 1973, -1000, 837, -1000, -1000, -1000, -1000,
-	-1000, -1000, -1000, 1093, 8598, 2667, -1000, 1617, -1000, 1488,
-	196, 1284, -1000, -1000, 953, 953, -1000, 1029, 1023, -1000,
-	55453, 2011, -1000, 376, 1600, 376, 1281, -1000, -1000, 1262,
-	-1000, -1000, -1000, -1000, 2088, 2210, -1000, -1000, -1000, -1000,
-	55453, -1000, 55453, 55453, 55453, 2010, 2571, -1000, 21883, 2008,
-	956, 2151, 53961, 53961, -1000, -1000, -1000, -1000, -1000, -1000,
-	-1000, -1000, -1000, -1000, -1000, 445, 953, -507, 270, 264,
-	953, 953, 953, -548, -1000, -1000, 1723, 1700, -1000, -215,
-	-1000, 21883, -1000, -1000, -1000, -1000, -1000, 1304, 1304, 1588,
-	1585, 1584, -1000, 1999, -1000, -1000, -1000, 1657, -1000, -1000,
-	-201, 53961, 53961, 53961, 53961, -1000, -1000, -1000, 1181, -1000,
+	-1000, -1000, -1000, -1000, -1000, -1000, 1985, 2672, 1329, 2137,
+	2137, 2137, 2137, 3587, 2137, 2137, 21884, 1974, -1000, -1000,
+	-1000, 1569, 3558, 1257, 3551, 2137, 2137, -1000, 2137, 3515,
+	3485, 1546, 2662, 2630, 2137, 2137, 2137, 2137, 2137, 2615,
+	2585, 2137, 2137, 2581, 2137, 3480, 2137, 2575, 2568, 2554,
+	2550, 2520, 2473, 2465, 2455, 2451, 2411, 2388, 2367, 2361,
+	2350, 2338, 2333, 2315, 2287, 2137, 2137, 2137, 3464, 2137,
+	3448, 2137, 3444, 2137, 2137, 3439, 2271, 2248, 1546, 1973,
+	-1000, 3429, 2137, 3413, 3386, 3381, 2244, 3371, 3362, 3358,
+	2137, 2137, 2137, 2238, 3350, 3346, 3342, 3306, 3115, 3106,
+	3102, 3097, 3083, 2137, 1572, 1572, 1572, 1572, 1572, 3050,
+	-258, 2137, 1546, -1000, -1000, -1000, -1000, -1000, 3009, 2225,
+	2994, 2986, 2976, 2971, 1546, 2003, 797, -1000, -1000, 1572,
+	1546, 1546, 1572, 1572, 2960, 2941, 2892, 2844, 2816, 2812,
+	2137, 2137, -1000, 2137, 2804, 2772, 2206, 2177, 1546, -1000,
+	1572, 55454, -1000, -425, -1000, 5, 960, 2003, -1000, 37550,
+	1546, -1000, 4201, -1000, 1247, -1000, -1000, -1000, -1000, -1000,
+	34566, 2018, -1000, -1000, -1000, -1000, 2003, 1864, -1000, -496,
+	20392, -1000, -1000, -1000, 832, 94, 33820, 860, 860, 124,
+	1722, 1722, 21884, -1000, -1000, -1000, -1000, -1000, -1000, 552,
+	2639, 376, 2003, -1000, 1951, 2420, -1000, -1000, -1000, 2507,
+	27106, -1000, -1000, 2003, 2003, 55454, 1893, 1873, -1000, 535,
+	-1000, 1352, 1972, -11, -12, -1000, -1000, -1000, -1000, 1722,
+	-1000, 1398, 341, 347, -1000, 424, -1000, -1000, -1000, -1000,
+	2368, 106, -1000, -1000, -1000, 345, 832, -1000, -1000, -1000,
+	-1000, -1000, -1000, 1622, -1000, 1622, -1000, -1000, -1000, -1000,
+	-1000, 1248, -1000, -1000, -1000, -1000, 1239, -1000, -1000, 1231,
+	-1000, -1000, 2670, 2181, 348, -1000, -1000, 919, 1620, -1000,
+	-1000, 2371, 919, 919, 53962, -1000, -1000, 1810, 2495, 241,
+	55454, 2191, -1000, 2146, 2146, 2146, -1000, 2482, -1000, -1000,
+	-1000, -1000, -1000, -1000, -526, 166, 548, -1000, -1000, -1000,
+	5202, 53962, 1809, -1000, 213, -1000, 1804, -1000, 53962, -1000,
+	1803, 2085, 53962, 53962, -1000, -1000, -1000, 53962, 2003, -1000,
+	-1000, -1000, -1000, 466, 2447, 367, -1000, -1000, -282, -1000,
+	-1000, 227, 213, 54708, 53962, 867, -1000, -1000, -1000, -1000,
+	-1000, -529, 1788, 458, 232, 329, 55454, 55454, 55454, 55454,
+	55454, 55454, 485, -1000, -1000, 40, -1000, -1000, 212, -1000,
+	-1000, 1609, -1000, -1000, -1000, -1000, 212, -1000, -1000, -1000,
+	-1000, -1000, 277, 448, -1000, 55454, 55454, 952, -1000, -1000,
+	-1000, -1000, -1000, 1069, -1000, -1000, 1069, -1000, -1000, -1000,
+	-1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, 2443,
+	55454, 20, -492, -1000, -488, 21884, -1000, -1000, -1000, -1000,
+	-1000, -1000, -1000, 1243, 486, 1433, 24122, 24122, 4398, 4398,
+	24122, -1000, -1000, -1000, 323, 323, 33074, -1000, 24122, 21884,
+	-1000, -1000, 21884, 21884, 21884, 931, -1000, 21884, 1392, -1000,
+	21884, -1000, -258, 1572, 2137, 2137, 2137, 2137, -258, -258,
+	-258, -258, -258, -258, -258, -258, -258, -258, 1917, -1000,
+	21884, 21884, 21884, 1546, 326, -1000, -1000, -1000, -258, 21884,
+	-1000, -1000, 2649, -1000, 21884, -1000, 33074, 21884, 21884, 21884,
+	-1000, -1000, -1000, 21884, 21884, -1000, -1000, 21884, -1000, 21884,
+	-1000, -1000, -1000, -1000, -1000, -1000, 21884, -1000, 21884, -1000,
+	-1000, -1000, 21884, -1000, 21884, -1000, -1000, 21884, -1000, 21884,
+	-1000, 21884, -1000, 21884, -1000, 21884, -1000, 21884, -1000, 21884,
+	-1000, 21884, -1000, 21884, -1000, 21884, -1000, 21884, -1000, 21884,
+	-1000, 21884, -1000, 21884, -1000, 21884, -1000, 21884, -1000, 21884,
+	-1000, 21884, -1000, -1000, -1000, 21884, -1000, 21884, -1000, 21884,
+	-1000, -1000, 21884, -1000, 21884, -1000, 21884, -1000, 21884, 21884,
+	-1000, 21884, 21884, 21884, -1000, 21884, 21884, 21884, 21884, -1000,
+	-1000, -1000, -1000, 21884, 21884, 21884, 21884, 21884, 21884, 21884,
+	21884, 21884, 21884, -1000, -1000, -1000, -1000, -1000, -1000, 21884,
+	-1000, 39042, 38, -258, 1244, 38, 1244, 23376, 815, 493,
+	22630, -1000, 21884, 15904, -1000, -1000, -1000, -1000, -1000, 21884,
+	21884, 21884, 21884, 21884, 21884, -1000, -1000, -1000, 21884, 21884,
+	-1000, 21884, -1000, 21884, -1000, -1000, -1000, -1000, -1000, 960,
+	-1000, 453, 445, 869, 53962, -1000, -1000, -1000, -1000, 1971,
+	-1000, 2558, -1000, 2289, 2268, 2645, 2639, 21138, -1000, 29344,
+	-1000, -1000, 53962, -1000, -1000, -410, -1000, 2343, 2295, 860,
+	860, -1000, -1000, -1000, -1000, -1000, -1000, -1000, 12896, 2532,
+	21884, 2184, 54708, 2003, -1000, 27852, 53962, 54708, 29344, 29344,
+	29344, 29344, 29344, -1000, 2214, 2210, -1000, 2224, 2208, 2312,
+	55454, -1000, 1668, 1785, -1000, 21884, 31582, 1921, 29344, -1000,
+	-1000, 29344, 55454, 12144, -1000, -1000, 19, -8, -1000, -1000,
+	-1000, -1000, 1470, -1000, -1000, 1144, 2504, 2366, -1000, -1000,
+	-1000, -1000, -1000, 1783, -1000, 1773, 1970, 1767, 1763, 309,
+	-1000, 2132, 2439, 919, 919, -1000, 1229, -1000, 1334, 1599,
+	1596, -1000, -1000, -1000, 447, -1000, 55454, 2178, 2174, 2172,
+	-1000, -546, 1227, 2084, 2129, 21884, 2079, 2608, 1950, 53962,
+	-1000, -1000, 54708, -1000, 296, -1000, 348, 53962, -1000, -1000,
+	-1000, 328, 55454, -1000, 5547, -1000, -1000, -1000, 213, -1000,
+	-1000, -1000, -1000, -1000, -1000, -1000, 55454, 240, -1000, 2077,
+	1318, -1000, -1000, 2135, -1000, -1000, -1000, -1000, -1000, 216,
+	214, 1593, 205, 1584, -1000, 205, -1000, 55454, 909, 2181,
+	55454, -1000, -1000, -1000, 1084, 1084, -1000, -1000, 2413, -1000,
+	1334, 2137, 24122, 24122, -1000, 870, -1000, -1000, 400, -233,
+	2073, 2073, -1000, 2073, 2076, -1000, 2073, 173, 2073, 158,
+	2073, -1000, -1000, 1546, 1546, -1000, 1572, 2171, 2183, 2710,
+	-1000, 1722, 21884, 2704, -1000, -1000, -258, -258, -258, -258,
+	-258, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000,
+	-1000, -75, 2700, 2626, 2137, -1000, 2071, 2067, -1000, 2137,
+	21884, 2137, 1546, 2153, 2137, 2137, 2137, 2137, 2137, 2137,
+	2137, 2137, 2137, 2137, 2137, 2137, 2142, 2131, 2080, 2029,
+	2014, 2008, 1999, 1995, 1978, 1947, 1927, 1908, 1884, 1879,
+	1853, 1845, 2137, 2137, 1832, 2137, 1800, 1790, -1000, 1722,
+	1572, 2541, 1572, 2137, 2137, 2536, 292, 2137, 1758, 1758,
+	1758, 1758, 1758, 1572, 1572, 1572, 1572, 2137, 53962, -1000,
+	-258, -1000, -1000, -330, -354, -1000, 1546, -258, 1955, 24122,
+	2137, 24122, 24122, 24122, 2137, 1546, -1000, 1771, 1718, 2500,
+	1684, 2137, 2469, 2137, 2137, 2137, 1663, -1000, 2531, 2003,
+	2531, 2003, 2531, 1738, 1247, 55454, -1000, -1000, -1000, -1000,
+	2639, 2632, -1000, 1953, -1000, 94, 581, -1000, 2316, 2295,
+	-1000, 2592, 2331, 2591, -1000, -1000, -1000, -1000, -1000, 1722,
+	-1000, 2454, 1942, -1000, 933, 1765, -1000, -1000, 20392, 1756,
+	2242, 532, 1738, 1991, 2420, 2155, 2170, 2807, -1000, -1000,
+	-1000, -1000, 2207, -1000, 2187, -1000, -1000, 2050, -1000, 2446,
+	338, 29344, 1983, 1983, -1000, 528, -1000, -1000, -1000, -1000,
+	-1000, -1000, -1000, 1061, 5547, 2703, -1000, 1575, -1000, 1348,
+	195, 1216, -1000, -1000, 919, 919, -1000, 1018, 1017, -1000,
+	55454, 2065, -1000, 832, 1573, 832, 1209, -1000, -1000, 1207,
+	-1000, -1000, -1000, -1000, 2024, 2286, -1000, -1000, -1000, -1000,
+	55454, -1000, 55454, 55454, 55454, 2064, 2590, -1000, 21884, 2063,
+	923, 2666, 53962, 53962, -1000, -1000, -1000, -1000, -1000, -1000,
+	-1000, -1000, -1000, -1000, -1000, 444, 919, -506, 297, 280,
+	919, 919, 919, -547, -1000, -1000, 1709, 1705, -1000, -215,
+	-1000, 21884, -1000, -1000, -1000, -1000, -1000, 1234, 1234, 1542,
+	1525, 1512, -1000, 2050, -1000, -1000, -1000, 1768, -1000, -1000,
+	-197, 53962, 53962, 53962, 53962, -1000, -1000, -1000, 1121, -1000,
 	-1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000,
-	-1000, 909, 1477, 350, -204, 1477, -1000, -1000, 376, -1000,
-	-1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, 21883,
-	-1000, 21883, -1000, 21883, 1162, 21883, -1000, -1000, -1000, -1000,
-	-1000, 2519, 1581, 21883, 21883, -1000, 1260, 1256, -263, 1447,
-	-1000, -1000, -1000, 21883, -1000, -1000, -1000, -1000, -1000, -1000,
-	-1000, -1000, -1000, -1000, -1000, -1000, -1000, 21883, -1000, 21883,
-	-1000, 21883, -1000, 21883, -1000, 21883, -1000, 21883, -1000, 21883,
-	-1000, 21883, -1000, 21883, -1000, 21883, -1000, 21883, -1000, 21883,
-	-1000, 21883, -1000, 21883, -1000, 21883, -1000, 21883, -1000, -1000,
-	21883, -1000, -1000, -1000, 21883, -1000, 21883, -1000, 21883, -1000,
-	-1000, -1000, 21883, 205, 854, -1000, -1000, -1000, -1000, -1000,
-	-1000, -1000, -1000, -1000, -1000, -1000, 1477, 313, -1000, -1000,
-	-1000, 2628, -1000, 1477, 21883, 1987, -1000, 1987, 1987, 1987,
-	-1000, -1000, -1000, 21883, -1000, 21883, 21883, -1000, 21883, -1000,
-	21883, -1000, -1000, -1000, -1000, 21883, 1734, 2310, 38295, 1734,
-	38295, 1734, 31581, -1000, -1000, 2605, 2592, 2564, 2311, 2305,
-	2305, 2299, -1000, 2557, 2555, -1000, 1560, 2553, 1556, 1001,
-	-1000, 54707, 21883, -1000, 1734, 37549, -1000, 434, 53961, 1734,
-	53961, -1000, 2548, -1000, -1000, 21883, 2007, -1000, 21883, -1000,
-	-1000, -1000, -1000, 8389, 2603, 1973, -1000, -1000, 919, -1000,
-	21883, -1000, 9719, -1000, -1000, -1000, -1000, -1000, -1000, -1000,
-	-1000, -1000, 1554, 1552, -1000, -1000, 2002, 21883, -1000, -1000,
-	-1000, 1591, 1572, -1000, -1000, -1000, -1000, -1000, -1000, -1000,
-	-1000, 1999, -1000, -1000, -1000, -1000, 308, -533, 2104, 53961,
-	1250, -1000, 1687, 1901, 277, 1734, 1547, 953, 953, 953,
-	1247, 1177, 37549, 1685, -1000, 53961, 401, -1000, 308, -1000,
-	-229, -230, 1447, -1000, -1000, 2497, -1000, -1000, 15903, -1000,
-	-1000, 1997, 2120, -1000, -1000, -1000, -1000, 2217, -188, -211,
-	-1000, -1000, 1447, 1447, 1447, 1241, 1477, -1000, 1447, 1447,
-	1551, 1524, -1000, -1000, 1447, 1447, 1447, 1447, 1447, 1447,
-	1447, 1447, 1447, 1447, 1447, 1447, 1447, 1447, 1447, 1447,
-	1447, 1447, 1447, 1447, 1604, 1623, -1000, 205, 1477, 2160,
-	-1000, -1000, 8389, -1000, -1000, 2548, 2549, 4, -1000, -1000,
-	214, 4, 1162, 1014, 1477, 1477, 1014, 1616, 1447, 1576,
-	1571, 1447, 1447, 32327, -1000, 2545, 2538, 1666, -1000, -1000,
-	38295, 1666, 38295, 1006, 2592, -272, 21883, 21883, 2294, 1235,
-	-1000, -1000, -1000, -1000, 1540, 1527, -1000, 1500, -1000, 2662,
-	-1000, 1162, -1000, 1734, 1734, -1000, 819, 1983, -1000, 2519,
-	1162, 53961, 1162, 66, 2548, -1000, 1447, -1000, 1734, 1734,
-	1734, 1734, 1734, 1734, 1734, 1734, 1734, 1734, 1734, 1734,
-	1734, 1734, 1734, 1734, 1734, 1734, 1734, 1734, 1734, 1734,
-	1734, 1734, 1734, 1734, 1734, 1734, 1734, 1734, 1734, 1734,
-	1734, 1734, 1734, 1734, 1734, 1734, 1734, 1734, 1734, 1734,
-	1734, 1734, 1734, 1734, 1734, 1734, 1734, 1734, 1734, 1734,
-	1734, 1734, 1734, 1734, 1734, 1734, 1734, 1734, 1734, 1734,
-	1734, 1734, 1734, 1734, 1734, 1734, 1734, 1734, 1734, 1734,
-	1734, 1734, 1734, 1734, 1734, 1734, 1734, 1734, 1734, 1734,
-	1734, 1734, 1734, 1734, 1734, 1734, 1734, 1734, 1734, 1734,
-	1734, 1734, 1734, 1734, 1734, 1734, 1734, 1734, 1734, 1734,
-	1734, 1734, 1734, 1734, 1734, 1734, 1734, 1734, 1734, 1734,
-	1734, 1734, 1734, 1734, 1734, 1734, 1734, 1734, 1734, 1734,
-	1734, 1734, 1734, 1734, 1734, 1734, 1734, 1734, 1734, -1000,
-	-1000, 53961, 1961, -1000, -1000, 2492, 1669, 176, -1000, 1522,
-	1901, -1000, -1000, 879, -1000, 21883, -1000, 37549, 1495, 1492,
-	-1000, -1000, -1000, -1000, -548, -1000, -1000, -1000, -1000, -1000,
-	-1000, 419, 1900, -1000, 952, 53961, 55453, -1000, 2213, -1000,
-	-1000, -1000, -1000, 21883, -1000, -1000, -1000, -1000, -1000, -1000,
+	-1000, 870, 1546, 395, -202, 1546, -1000, -1000, 832, -1000,
+	-1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, 21884,
+	-1000, 21884, -1000, 21884, 1722, 21884, -1000, -1000, -1000, -1000,
+	-1000, 2532, 1486, 21884, 21884, -1000, 1205, 1201, -258, 2137,
+	-1000, -1000, -1000, 21884, -1000, -1000, -1000, -1000, -1000, -1000,
+	-1000, -1000, -1000, -1000, -1000, -1000, -1000, 21884, -1000, 21884,
+	-1000, 21884, -1000, 21884, -1000, 21884, -1000, 21884, -1000, 21884,
+	-1000, 21884, -1000, 21884, -1000, 21884, -1000, 21884, -1000, 21884,
+	-1000, 21884, -1000, 21884, -1000, 21884, -1000, 21884, -1000, -1000,
+	21884, -1000, -1000, -1000, 21884, -1000, 21884, -1000, 21884, -1000,
+	-1000, -1000, 21884, 289, 323, -1000, -1000, -1000, -1000, -1000,
+	-1000, -1000, -1000, -1000, -1000, -1000, 1546, 335, -1000, -1000,
+	-1000, 2642, -1000, 1546, 21884, 4398, -1000, 4398, 4398, 4398,
+	-1000, -1000, -1000, 21884, -1000, 21884, 21884, -1000, 21884, -1000,
+	21884, -1000, -1000, -1000, -1000, 21884, 2003, 2434, 38296, 2003,
+	38296, 2003, 31582, -1000, -1000, 2632, 2624, 2589, 2317, 2327,
+	2327, 2316, -1000, 2586, 2580, -1000, 1484, 2577, 1478, 990,
+	-1000, 54708, 21884, -1000, 2003, 37550, -1000, 398, 53962, 2003,
+	53962, -1000, 2569, -1000, -1000, 21884, 2058, -1000, 21884, -1000,
+	-1000, -1000, -1000, 4706, 2639, 1983, -1000, -1000, 872, -1000,
+	21884, -1000, 9719, -1000, -1000, -1000, -1000, -1000, -1000, -1000,
+	-1000, -1000, 1465, 1459, -1000, -1000, 2052, 21884, -1000, -1000,
+	-1000, 1759, 1751, -1000, -1000, -1000, -1000, -1000, -1000, -1000,
+	-1000, 2050, -1000, -1000, -1000, -1000, 328, -536, 2638, 53962,
+	1200, -1000, 1701, 1950, 301, 2003, 1452, 919, 919, 919,
+	1198, 1194, 37550, 1687, -1000, 53962, 399, -1000, 328, -1000,
+	-223, -226, 2137, -1000, -1000, 2502, -1000, -1000, 15904, -1000,
+	-1000, 2049, 2144, -1000, -1000, -1000, -1000, 2213, -182, -209,
+	-1000, -1000, 2137, 2137, 2137, 1676, 1546, -1000, 2137, 2137,
+	1669, 1581, -1000, -1000, 2137, 2137, 2137, 2137, 2137, 2137,
+	2137, 2137, 2137, 2137, 2137, 2137, 2137, 2137, 2137, 2137,
+	2137, 2137, 2137, 2137, 1572, 1655, -1000, 289, 1546, 2169,
+	-1000, -1000, 4706, -1000, -1000, 2569, 2564, 38, -1000, -1000,
+	226, 38, 1722, 965, 1546, 1546, 965, 1635, 2137, 1618,
+	1557, 2137, 2137, 32328, -1000, 2563, 2557, 1665, -1000, -1000,
+	38296, 1665, 38296, 960, 2624, -268, 21884, 21884, 2290, 1107,
+	-1000, -1000, -1000, -1000, 1443, 1439, -1000, 1436, -1000, 2702,
+	-1000, 1722, -1000, 2003, 2003, -1000, 525, 1765, -1000, 2532,
+	1722, 53962, 1722, 83, 2569, -1000, 2137, -1000, 2003, 2003,
+	2003, 2003, 2003, 2003, 2003, 2003, 2003, 2003, 2003, 2003,
+	2003, 2003, 2003, 2003, 2003, 2003, 2003, 2003, 2003, 2003,
+	2003, 2003, 2003, 2003, 2003, 2003, 2003, 2003, 2003, 2003,
+	2003, 2003, 2003, 2003, 2003, 2003, 2003, 2003, 2003, 2003,
+	2003, 2003, 2003, 2003, 2003, 2003, 2003, 2003, 2003, 2003,
+	2003, 2003, 2003, 2003, 2003, 2003, 2003, 2003, 2003, 2003,
+	2003, 2003, 2003, 2003, 2003, 2003, 2003, 2003, 2003, 2003,
+	2003, 2003, 2003, 2003, 2003, 2003, 2003, 2003, 2003, 2003,
+	2003, 2003, 2003, 2003, 2003, 2003, 2003, 2003, 2003, 2003,
+	2003, 2003, 2003, 2003, 2003, 2003, 2003, 2003, 2003, 2003,
+	2003, 2003, 2003, 2003, 2003, 2003, 2003, 2003, 2003, 2003,
+	2003, 2003, 2003, 2003, 2003, 2003, 2003, 2003, 2003, 2003,
+	2003, 2003, 2003, 2003, 2003, 2003, 2003, 2003, 2003, -1000,
+	-1000, 53962, 2530, -1000, -1000, 2501, 1667, 164, -1000, 1553,
+	1950, -1000, -1000, 930, -1000, 21884, -1000, 37550, 1405, 1385,
+	-1000, -1000, -1000, -1000, -547, -1000, -1000, -1000, -1000, -1000,
+	-1000, 386, 1949, -1000, 906, 53962, 55454, -1000, 2188, -1000,
+	-1000, -1000, -1000, 21884, -1000, -1000, -1000, -1000, -1000, -1000,
 	-1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000,
 	-1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000,
-	-1000, 21883, -1000, 1477, 2154, -1000, -376, -1000, -516, 21883,
-	-263, -1000, -1000, -263, -1000, -1000, -1000, -1000, -1000, 21883,
-	-1000, -1000, 21883, -1000, 21883, -1000, -1000, 1666, -1000, -1000,
-	-1000, 36803, -1000, 1666, -1000, 1666, -1000, -272, -1000, 1892,
-	-1000, 53961, 1162, 390, -1000, 1229, -1000, -1000, -1000, -1000,
-	-1000, 54707, 53961, 1983, 53961, -1000, -1000, 1664, 1477, 1734,
-	2519, -1000, 1621, -1000, 419, -1000, 1990, 1996, -1000, -1000,
-	-1000, 19645, -1000, -1000, -1000, -1000, -1000, 248, -200, 15903,
-	11391, 1614, -1000, -199, 1447, 1604, -1000, -478, -1000, -1000,
-	-1000, -1000, 256, -1000, -1000, 1813, -1000, -1000, 1550, 1521,
-	1476, -1000, -1000, -1000, -1000, -1000, -1000, -272, -1000, -1000,
-	2488, -1000, -232, -1000, -1000, 1799, 1599, -1000, -1000, -1000,
-	31581, 53215, -1000, -180, 328, -200, 21883, 1988, 1477, -1000,
-	-1000, -1000, -1000, -1000, -1000, -1000, -1000, -44, -1000, -1000,
-	812, -1000, -1000, -1000, 2112, -205, -1000, -1000, -1000, 285,
-	-497, -287, -296, 24121, -1000, 21883, -1000, 21883, -1000, 21883,
-	-1000, 53961, 1734, -1000, -1000, -1000, 1569, -1000, 5018, -346,
-	2152, -1000, -142, -1000, -1000, -1000, 1088, 1479, -1000, -1000,
-	-1000, -1000, -1000, -1000, 1831, 53961, -1000, 421, -1000, -1000,
-	15151, -201, -213, 995, -1000, -1000, -1000, -1000, -1000, 1987,
-	1459, 1248, 1447, -1000, 53961, -1000, 53215, -341, 907, 8389,
-	-1000, 2149, 2105, 2636, -1000, -1000, -1000, -1000, -1000, -1000,
-	-550, 1567, 237, -1000, -1000, -1000, 285, -310, -1000, 21883,
-	-1000, 21883, -1000, 1477, -1000, -1000, 2459, 66, -1000, 2622,
-	-1000, 2612, 1041, 1041, -1000, 1142, -550, -1000, -1000, -1000,
-	-1000, 1447, 1447, -1000, -391, -1000, -1000, -1000, -1000, -1000,
-	407, 1296, -1000, -1000, -1000, -1000, -1000, 8389, -1000, -1000,
-	-1000, 272, 272, -1000, -1000,
+	-1000, 21884, -1000, 1546, 2168, -1000, -364, -1000, -516, 21884,
+	-258, -1000, -1000, -258, -1000, -1000, -1000, -1000, -1000, 21884,
+	-1000, -1000, 21884, -1000, 21884, -1000, -1000, 1665, -1000, -1000,
+	-1000, 36804, -1000, 1665, -1000, 1665, -1000, -268, -1000, 1946,
+	-1000, 53962, 1722, 350, -1000, 1102, -1000, -1000, -1000, -1000,
+	-1000, 54708, 53962, 1765, 53962, -1000, -1000, 1633, 1546, 2003,
+	2532, -1000, 1589, -1000, 386, -1000, 2047, 2129, -1000, -1000,
+	-1000, 19646, -1000, -1000, -1000, -1000, -1000, 238, -192, 15904,
+	11392, 1580, -1000, -185, 2137, 1572, -1000, -477, -1000, -1000,
+	-1000, -1000, 256, -1000, -1000, 1919, -1000, -1000, 1549, 1545,
+	1528, -1000, -1000, -1000, -1000, -1000, -1000, -268, -1000, -1000,
+	2499, -1000, -228, -1000, -1000, 1915, 1552, -1000, -1000, -1000,
+	31582, 53216, -1000, -176, 332, -192, 21884, 2044, 1546, -1000,
+	-1000, -1000, -1000, -1000, -1000, -1000, -1000, -20, -1000, -1000,
+	495, -1000, -1000, -1000, 2135, -206, -1000, -1000, -1000, 288,
+	-497, -286, -293, 24122, -1000, 21884, -1000, 21884, -1000, 21884,
+	-1000, 53962, 2003, -1000, -1000, -1000, 1531, -1000, 5018, -355,
+	2166, -1000, -113, -1000, -1000, -1000, 1060, 1381, -1000, 1157,
+	-1000, -1000, -1000, -1000, -1000, 2266, 53962, -1000, 429, -1000,
+	-1000, 15152, -197, -210, 987, -1000, -1000, -1000, -1000, -1000,
+	4398, 1482, 1476, 2137, -1000, 53962, -1000, 53216, -340, 867,
+	4706, -1000, 2160, 2159, 2663, -1000, -1000, -1000, -1000, -1000,
+	-1000, -1000, -550, 1370, 244, -1000, -1000, -1000, 288, -343,
+	-1000, 21884, -1000, 21884, -1000, 1546, -1000, -1000, 2471, 83,
+	-1000, 2699, -1000, 2640, 1006, 1006, -1000, 1111, -550, -1000,
+	-1000, -1000, -1000, 2137, 2137, -1000, -358, -1000, -1000, -1000,
+	-1000, -1000, 413, 1152, -1000, -1000, -1000, -1000, -1000, 4706,
+	-1000, -1000, -1000, 215, 215, -1000, -1000,
 }
 
 var yyPgo = [...]int{
-	0, 3261, 3258, 28, 6, 38, 37, 3256, 3255, 3254,
-	175, 3253, 3252, 3250, 3239, 3238, 3237, 2701, 2694, 2689,
-	3236, 3235, 3234, 3230, 3229, 3228, 3225, 3224, 3223, 39,
-	93, 77, 113, 203, 206, 3222, 3220, 171, 161, 199,
-	3217, 3216, 3215, 114, 184, 82, 78, 192, 3214, 3213,
-	72, 3211, 3207, 3205, 187, 185, 180, 1092, 3202, 178,
-	110, 47, 3198, 3195, 3193, 3191, 3189, 3188, 3187, 3184,
-	3180, 3172, 3170, 3169, 3168, 3167, 3164, 3160, 3158, 3151,
-	294, 3147, 3146, 18, 3139, 75, 3136, 3135, 3134, 3130,
-	3125, 11, 3110, 3109, 23, 45, 56, 3105, 3104, 44,
-	3099, 3097, 3096, 3094, 3091, 68, 3084, 26, 3083, 29,
-	3082, 3080, 120, 3079, 3077, 3076, 40, 3073, 3071, 3067,
-	4, 169, 3065, 3064, 136, 3061, 3060, 3059, 191, 216,
-	3058, 2322, 3054, 99, 3049, 3046, 3043, 167, 190, 3042,
-	117, 3039, 3037, 3036, 150, 3035, 3920, 3013, 3012, 74,
-	63, 226, 3011, 3008, 200, 60, 10, 3006, 13, 16,
-	3003, 3002, 59, 64, 3001, 108, 2992, 2991, 98, 65,
-	2990, 106, 97, 2985, 2983, 17, 9, 2982, 5, 2,
-	7, 92, 2981, 2976, 107, 2973, 2971, 2969, 96, 2968,
-	2966, 6505, 2965, 84, 129, 100, 70, 2962, 170, 153,
-	2954, 2953, 2952, 2946, 2940, 2938, 50, 2937, 2935, 2929,
-	132, 1257, 101, 2928, 2927, 147, 351, 126, 51, 127,
-	2925, 149, 2924, 215, 76, 2917, 162, 2915, 2912, 131,
-	130, 2910, 2906, 55, 168, 195, 2904, 91, 125, 116,
-	193, 90, 139, 2903, 2902, 52, 66, 2900, 2899, 2898,
-	2897, 164, 2893, 2892, 58, 2891, 53, 2885, 196, 2882,
-	325, 67, 2878, 189, 173, 2875, 137, 2873, 2872, 69,
-	104, 103, 30, 2870, 156, 159, 123, 172, 2869, 2868,
-	61, 2864, 2860, 2855, 194, 293, 2853, 2852, 332, 177,
-	140, 146, 83, 2851, 308, 2849, 2847, 2846, 19, 5107,
-	7204, 183, 27, 160, 2845, 2842, 1040, 41, 48, 24,
-	2840, 210, 2836, 179, 2835, 2833, 2830, 197, 207, 111,
-	157, 54, 2827, 2825, 2823, 2822, 34, 2821, 2820, 2815,
-	2814, 2813, 2812, 36, 35, 33, 71, 220, 57, 20,
-	94, 166, 152, 62, 2811, 2810, 2808, 119, 87, 2807,
-	155, 154, 122, 158, 2805, 176, 144, 112, 2804, 95,
-	32, 2800, 2795, 2794, 2793, 85, 2792, 2791, 2788, 2787,
-	148, 142, 118, 79, 2784, 81, 115, 145, 143, 49,
-	2780, 43, 2777, 2772, 31, 188, 25, 2769, 14, 102,
-	141, 2763, 5291, 2762, 89, 324, 151, 2744, 2742, 8,
-	12, 15, 2736, 2735, 2734, 2733, 128, 2731, 2730, 2728,
-	2724, 22, 46, 21, 1, 105, 135, 73, 2719, 2718,
-	138, 2715, 2709, 2706, 0, 1034, 121, 2685, 202,
+	0, 3391, 3388, 28, 4, 38, 37, 3387, 3386, 3383,
+	166, 3382, 3381, 3378, 3364, 3363, 3294, 2769, 2762, 2739,
+	3292, 3289, 3284, 3278, 3273, 3269, 3267, 3265, 3263, 48,
+	96, 87, 105, 203, 192, 3260, 3256, 179, 169, 199,
+	3254, 3237, 3235, 113, 189, 79, 78, 191, 3234, 3233,
+	62, 3230, 3228, 3226, 187, 186, 185, 1053, 3225, 181,
+	112, 46, 3224, 3223, 3220, 3217, 3216, 3215, 3214, 3213,
+	3209, 3208, 3207, 3204, 3201, 3200, 3195, 3191, 3189, 3188,
+	286, 3187, 3186, 10, 3185, 65, 3184, 3183, 3182, 3181,
+	3180, 15, 3178, 3177, 20, 41, 57, 3176, 3175, 44,
+	3174, 3173, 3172, 3171, 3169, 71, 3167, 26, 3159, 40,
+	3153, 3152, 120, 3151, 3145, 3144, 30, 3143, 3140, 3137,
+	2, 172, 3136, 3135, 136, 3134, 3130, 3125, 190, 217,
+	3123, 2296, 3122, 101, 3121, 3117, 3109, 170, 194, 3108,
+	121, 3107, 3104, 3103, 145, 3102, 3920, 3100, 3099, 68,
+	63, 226, 3098, 3093, 200, 64, 60, 3092, 16, 13,
+	3089, 3081, 59, 75, 3080, 106, 3077, 3076, 100, 80,
+	3075, 98, 104, 3073, 3071, 21, 7, 3070, 5, 1,
+	6, 82, 3069, 3065, 117, 3064, 3061, 3060, 93, 3057,
+	3055, 6505, 3049, 92, 128, 103, 70, 3046, 171, 153,
+	3043, 3042, 3041, 3039, 3036, 3034, 49, 3018, 3014, 3011,
+	134, 1256, 108, 3004, 3002, 147, 352, 126, 50, 129,
+	3001, 146, 2996, 215, 76, 2993, 164, 2992, 2991, 133,
+	132, 2987, 2984, 56, 168, 195, 2983, 97, 127, 116,
+	176, 95, 131, 2982, 2981, 55, 69, 2979, 2978, 2976,
+	2966, 165, 2963, 2962, 58, 2948, 53, 2944, 178, 2938,
+	325, 67, 2937, 180, 161, 2935, 72, 2934, 2924, 66,
+	99, 102, 29, 2918, 157, 162, 123, 160, 2917, 2915,
+	52, 2911, 2910, 2904, 197, 327, 2902, 2901, 305, 167,
+	141, 149, 83, 2899, 353, 2898, 2897, 2891, 14, 5107,
+	7204, 183, 27, 163, 2881, 2879, 1040, 19, 47, 24,
+	2878, 210, 2877, 198, 2876, 2874, 2873, 205, 208, 111,
+	158, 54, 2872, 2870, 2869, 2864, 35, 2862, 2861, 2854,
+	2852, 2851, 2850, 36, 34, 33, 89, 221, 61, 18,
+	94, 155, 150, 73, 2847, 2846, 2845, 119, 91, 2842,
+	156, 154, 122, 159, 2840, 177, 142, 115, 2836, 84,
+	32, 2835, 2833, 2830, 2829, 85, 2827, 2824, 2814, 2813,
+	152, 143, 118, 77, 2812, 81, 114, 148, 144, 43,
+	2811, 42, 2810, 2807, 31, 188, 25, 2804, 39, 107,
+	137, 2803, 5291, 2799, 9, 349, 151, 2798, 2792, 8,
+	11, 17, 2788, 2787, 2780, 2777, 130, 2775, 2773, 2764,
+	2757, 23, 45, 22, 12, 110, 135, 74, 2756, 2745,
+	139, 2744, 2725, 2716, 0, 1034, 125, 2688, 202,
 }
 
-//line sql.y:8815
+//line sql.y:8820
 type yySymType struct {
 	union             any
 	empty             struct{}
@@ -8533,102 +8533,102 @@ var yyR1 = [...]int{
 	141, 243, 243, 243, 243, 243, 243, 243, 243, 243,
 	243, 243, 243, 243, 243, 243, 243, 243, 410, 410,
 	410, 410, 409, 409, 244, 244, 244, 244, 244, 244,
-	244, 244, 150, 150, 162, 162, 162, 162, 162, 162,
-	148, 148, 149, 147, 147, 147, 155, 155, 155, 155,
+	244, 244, 244, 150, 150, 162, 162, 162, 162, 162,
+	162, 148, 148, 149, 147, 147, 147, 155, 155, 155,
 	155, 155, 155, 155, 155, 155, 155, 155, 155, 155,
-	155, 155, 414, 414, 414, 414, 414, 414, 414, 414,
+	155, 155, 155, 414, 414, 414, 414, 414, 414, 414,
 	414, 414, 414, 414, 414, 414, 414, 414, 414, 414,
 	414, 414, 414, 414, 414, 414, 414, 414, 414, 414,
 	414, 414, 414, 414, 414, 414, 414, 414, 414, 414,
-	414, 414, 414, 414, 161, 161, 156, 156, 156, 158,
-	158, 157, 157, 157, 159, 159, 411, 411, 411, 411,
-	326, 326, 326, 326, 329, 329, 327, 327, 327, 327,
-	327, 327, 327, 327, 327, 328, 328, 328, 328, 328,
-	328, 328, 330, 330, 330, 330, 330, 331, 331, 331,
+	414, 414, 414, 414, 414, 161, 161, 156, 156, 156,
+	158, 158, 157, 157, 157, 159, 159, 411, 411, 411,
+	411, 326, 326, 326, 326, 329, 329, 327, 327, 327,
+	327, 327, 327, 327, 327, 327, 328, 328, 328, 328,
+	328, 328, 328, 330, 330, 330, 330, 330, 331, 331,
 	331, 331, 331, 331, 331, 331, 331, 331, 331, 331,
-	331, 331, 331, 331, 332, 332, 332, 332, 332, 332,
-	332, 332, 347, 347, 336, 336, 341, 341, 342, 342,
-	343, 343, 343, 344, 344, 344, 345, 345, 338, 338,
-	338, 338, 338, 338, 338, 338, 338, 340, 340, 339,
-	339, 339, 350, 375, 375, 374, 374, 372, 372, 372,
-	372, 372, 372, 372, 372, 359, 359, 369, 369, 369,
-	369, 369, 358, 358, 354, 354, 354, 355, 355, 356,
-	356, 353, 353, 357, 357, 371, 371, 370, 370, 351,
-	351, 352, 352, 377, 412, 412, 412, 412, 412, 413,
-	413, 378, 402, 404, 404, 404, 403, 403, 400, 401,
-	399, 399, 399, 399, 399, 85, 85, 85, 292, 292,
-	293, 293, 367, 367, 366, 366, 366, 368, 368, 365,
+	331, 331, 331, 331, 331, 332, 332, 332, 332, 332,
+	332, 332, 332, 347, 347, 336, 336, 341, 341, 342,
+	342, 343, 343, 343, 344, 344, 344, 345, 345, 338,
+	338, 338, 338, 338, 338, 338, 338, 338, 340, 340,
+	339, 339, 339, 350, 375, 375, 374, 374, 372, 372,
+	372, 372, 372, 372, 372, 372, 359, 359, 369, 369,
+	369, 369, 369, 358, 358, 354, 354, 354, 355, 355,
+	356, 356, 353, 353, 357, 357, 371, 371, 370, 370,
+	351, 351, 352, 352, 377, 412, 412, 412, 412, 412,
+	413, 413, 378, 402, 404, 404, 404, 403, 403, 400,
+	401, 399, 399, 399, 399, 399, 85, 85, 85, 292,
+	292, 293, 293, 367, 367, 366, 366, 366, 368, 368,
 	365, 365, 365, 365, 365, 365, 365, 365, 365, 365,
 	365, 365, 365, 365, 365, 365, 365, 365, 365, 365,
 	365, 365, 365, 365, 365, 365, 365, 365, 365, 365,
-	287, 287, 287, 398, 398, 398, 398, 398, 398, 397,
-	397, 397, 364, 364, 364, 364, 396, 396, 60, 60,
-	224, 224, 415, 415, 417, 417, 417, 48, 48, 48,
-	48, 48, 48, 47, 47, 47, 43, 43, 43, 43,
+	365, 287, 287, 287, 398, 398, 398, 398, 398, 398,
+	397, 397, 397, 364, 364, 364, 364, 396, 396, 60,
+	60, 224, 224, 415, 415, 417, 417, 417, 48, 48,
+	48, 48, 48, 48, 47, 47, 47, 43, 43, 43,
 	43, 43, 43, 43, 43, 43, 43, 43, 43, 43,
 	43, 43, 43, 43, 43, 43, 43, 43, 43, 43,
-	43, 43, 43, 43, 43, 43, 43, 49, 49, 44,
-	44, 44, 44, 44, 44, 44, 44, 44, 44, 23,
+	43, 43, 43, 43, 43, 43, 43, 43, 49, 49,
+	44, 44, 44, 44, 44, 44, 44, 44, 44, 44,
 	23, 23, 23, 23, 23, 23, 23, 23, 23, 23,
 	23, 23, 23, 23, 23, 23, 23, 23, 23, 23,
 	23, 23, 23, 23, 23, 23, 23, 23, 23, 23,
-	23, 23, 23, 112, 112, 113, 113, 113, 113, 115,
-	115, 115, 380, 380, 61, 61, 3, 3, 174, 176,
-	177, 177, 175, 175, 175, 175, 175, 175, 63, 63,
-	62, 62, 179, 178, 180, 180, 180, 1, 1, 2,
-	2, 4, 4, 385, 385, 385, 385, 385, 385, 385,
+	23, 23, 23, 23, 112, 112, 113, 113, 113, 113,
+	115, 115, 115, 380, 380, 61, 61, 3, 3, 174,
+	176, 177, 177, 175, 175, 175, 175, 175, 175, 63,
+	63, 62, 62, 179, 178, 180, 180, 180, 1, 1,
+	2, 2, 4, 4, 385, 385, 385, 385, 385, 385,
 	385, 385, 385, 385, 385, 385, 385, 385, 385, 385,
-	385, 385, 385, 385, 385, 346, 346, 346, 379, 379,
-	381, 114, 114, 114, 114, 114, 114, 114, 114, 114,
-	114, 118, 117, 117, 116, 119, 119, 119, 119, 119,
-	119, 119, 119, 383, 383, 383, 64, 64, 384, 333,
-	334, 335, 5, 6, 360, 382, 126, 126, 24, 40,
-	40, 25, 25, 25, 25, 26, 26, 65, 68, 68,
+	385, 385, 385, 385, 385, 385, 346, 346, 346, 379,
+	379, 381, 114, 114, 114, 114, 114, 114, 114, 114,
+	114, 114, 118, 117, 117, 116, 119, 119, 119, 119,
+	119, 119, 119, 119, 383, 383, 383, 64, 64, 384,
+	333, 334, 335, 5, 6, 360, 382, 126, 126, 24,
+	40, 40, 25, 25, 25, 25, 26, 26, 65, 68,
+	68, 66, 66, 66, 66, 66, 66, 66, 66, 66,
 	66, 66, 66, 66, 66, 66, 66, 66, 66, 66,
 	66, 66, 66, 66, 66, 66, 66, 66, 66, 66,
 	66, 66, 66, 66, 66, 66, 66, 66, 66, 66,
 	66, 66, 66, 66, 66, 66, 66, 66, 66, 66,
-	66, 66, 66, 66, 66, 66, 66, 66, 66, 66,
-	66, 66, 66, 66, 66, 66, 297, 297, 286, 286,
-	295, 295, 285, 285, 311, 311, 311, 288, 288, 288,
-	289, 289, 408, 408, 408, 282, 282, 67, 67, 67,
-	312, 312, 312, 312, 70, 70, 418, 418, 419, 419,
-	420, 420, 420, 71, 72, 72, 315, 315, 316, 316,
-	73, 74, 86, 86, 86, 86, 86, 87, 87, 87,
-	87, 87, 87, 111, 111, 111, 10, 10, 10, 10,
-	82, 82, 82, 9, 9, 11, 69, 69, 76, 405,
-	405, 406, 407, 407, 407, 407, 77, 79, 27, 27,
-	27, 27, 27, 27, 136, 136, 124, 124, 124, 124,
-	124, 124, 124, 124, 124, 124, 124, 124, 131, 131,
-	131, 125, 125, 427, 80, 81, 81, 129, 129, 129,
-	122, 122, 122, 128, 128, 128, 12, 12, 13, 268,
-	268, 14, 14, 135, 135, 134, 134, 137, 137, 137,
-	137, 137, 137, 137, 137, 137, 137, 137, 132, 132,
-	133, 133, 133, 133, 304, 304, 304, 303, 303, 168,
-	168, 170, 169, 169, 171, 171, 172, 172, 172, 172,
-	222, 222, 194, 194, 261, 261, 262, 262, 260, 260,
-	267, 267, 263, 263, 263, 263, 270, 270, 173, 173,
-	173, 173, 181, 181, 182, 182, 183, 183, 314, 314,
-	309, 309, 309, 308, 308, 187, 187, 187, 189, 188,
-	188, 188, 188, 190, 190, 192, 192, 191, 191, 193,
-	198, 198, 197, 197, 195, 195, 195, 195, 195, 195,
-	196, 196, 196, 196, 199, 199, 146, 146, 146, 146,
-	146, 146, 146, 146, 416, 416, 160, 160, 160, 160,
-	160, 160, 160, 163, 163, 163, 163, 163, 163, 163,
-	163, 163, 163, 163, 251, 251, 151, 151, 151, 151,
+	66, 66, 66, 66, 66, 66, 66, 297, 297, 286,
+	286, 295, 295, 285, 285, 311, 311, 311, 288, 288,
+	288, 289, 289, 408, 408, 408, 282, 282, 67, 67,
+	67, 312, 312, 312, 312, 70, 70, 418, 418, 419,
+	419, 420, 420, 420, 71, 72, 72, 315, 315, 316,
+	316, 73, 74, 86, 86, 86, 86, 86, 87, 87,
+	87, 87, 87, 87, 111, 111, 111, 10, 10, 10,
+	10, 82, 82, 82, 9, 9, 11, 69, 69, 76,
+	405, 405, 406, 407, 407, 407, 407, 77, 79, 27,
+	27, 27, 27, 27, 27, 136, 136, 124, 124, 124,
+	124, 124, 124, 124, 124, 124, 124, 124, 124, 131,
+	131, 131, 125, 125, 427, 80, 81, 81, 129, 129,
+	129, 122, 122, 122, 128, 128, 128, 12, 12, 13,
+	268, 268, 14, 14, 135, 135, 134, 134, 137, 137,
+	137, 137, 137, 137, 137, 137, 137, 137, 137, 132,
+	132, 133, 133, 133, 133, 304, 304, 304, 303, 303,
+	168, 168, 170, 169, 169, 171, 171, 172, 172, 172,
+	172, 222, 222, 194, 194, 261, 261, 262, 262, 260,
+	260, 267, 267, 263, 263, 263, 263, 270, 270, 173,
+	173, 173, 173, 181, 181, 182, 182, 183, 183, 314,
+	314, 309, 309, 309, 308, 308, 187, 187, 187, 189,
+	188, 188, 188, 188, 190, 190, 192, 192, 191, 191,
+	193, 198, 198, 197, 197, 195, 195, 195, 195, 195,
+	195, 196, 196, 196, 196, 199, 199, 146, 146, 146,
+	146, 146, 146, 146, 146, 416, 416, 160, 160, 160,
+	160, 160, 160, 160, 163, 163, 163, 163, 163, 163,
+	163, 163, 163, 163, 163, 251, 251, 151, 151, 151,
 	151, 151, 151, 151, 151, 151, 151, 151, 151, 151,
-	151, 154, 154, 154, 154, 154, 154, 154, 154, 154,
+	151, 151, 154, 154, 154, 154, 154, 154, 154, 154,
 	154, 154, 154, 154, 154, 154, 154, 154, 154, 154,
-	154, 154, 154, 154, 154, 154, 227, 227, 226, 226,
-	88, 88, 88, 89, 89, 90, 90, 90, 90, 90,
-	91, 91, 91, 91, 91, 91, 91, 93, 93, 92,
-	92, 213, 213, 301, 301, 94, 95, 95, 96, 96,
-	99, 99, 98, 97, 97, 103, 103, 100, 100, 102,
-	102, 101, 104, 104, 105, 106, 106, 283, 283, 200,
-	200, 209, 209, 209, 209, 201, 201, 202, 202, 202,
-	202, 202, 202, 210, 210, 210, 221, 211, 211, 207,
-	207, 205, 205, 205, 205, 205, 205, 205, 205, 205,
-	205, 205, 206, 206, 206, 206, 206, 206, 206, 206,
+	154, 154, 154, 154, 154, 154, 154, 227, 227, 226,
+	226, 88, 88, 88, 89, 89, 90, 90, 90, 90,
+	90, 91, 91, 91, 91, 91, 91, 91, 93, 93,
+	92, 92, 213, 213, 301, 301, 94, 95, 95, 96,
+	96, 99, 99, 98, 97, 97, 103, 103, 100, 100,
+	102, 102, 101, 104, 104, 105, 106, 106, 283, 283,
+	200, 200, 209, 209, 209, 209, 201, 201, 202, 202,
+	202, 202, 202, 202, 210, 210, 210, 221, 211, 211,
+	207, 207, 205, 205, 205, 205, 205, 205, 205, 205,
+	205, 205, 205, 206, 206, 206, 206, 206, 206, 206,
 	206, 206, 206, 206, 206, 206, 206, 206, 206, 206,
 	206, 206, 206, 206, 206, 206, 206, 206, 206, 206,
 	206, 206, 206, 206, 206, 206, 206, 206, 206, 206,
@@ -8647,37 +8647,37 @@ var yyR1 = [...]int{
 	206, 206, 206, 206, 206, 206, 206, 206, 206, 206,
 	206, 206, 206, 206, 206, 206, 206, 206, 206, 206,
 	206, 206, 206, 206, 206, 206, 206, 206, 206, 206,
-	206, 206, 206, 206, 206, 165, 165, 165, 165, 232,
-	232, 152, 152, 152, 152, 152, 152, 152, 152, 152,
-	152, 152, 152, 152, 152, 152, 153, 153, 166, 166,
-	166, 166, 167, 167, 167, 167, 167, 167, 167, 322,
-	322, 120, 120, 120, 120, 120, 120, 120, 120, 120,
+	206, 206, 206, 206, 206, 206, 165, 165, 165, 165,
+	232, 232, 152, 152, 152, 152, 152, 152, 152, 152,
+	152, 152, 152, 152, 152, 152, 152, 153, 153, 166,
+	166, 166, 166, 167, 167, 167, 167, 167, 167, 167,
+	322, 322, 120, 120, 120, 120, 120, 120, 120, 120,
 	120, 120, 120, 120, 120, 120, 120, 120, 120, 120,
-	120, 121, 121, 121, 121, 121, 121, 121, 121, 121,
-	121, 121, 121, 121, 121, 121, 121, 121, 121, 428,
-	428, 337, 337, 337, 208, 208, 208, 208, 208, 127,
-	127, 127, 127, 127, 319, 319, 319, 323, 323, 323,
-	321, 321, 321, 321, 321, 321, 321, 321, 321, 321,
-	321, 321, 321, 321, 321, 324, 324, 230, 230, 123,
-	123, 228, 228, 229, 231, 231, 223, 223, 223, 223,
-	225, 225, 204, 204, 204, 233, 233, 325, 325, 234,
-	234, 107, 108, 108, 109, 109, 235, 235, 237, 236,
-	236, 238, 239, 239, 239, 240, 240, 241, 241, 241,
-	50, 50, 50, 50, 50, 45, 45, 45, 45, 46,
-	46, 46, 46, 138, 138, 138, 138, 140, 140, 139,
-	139, 83, 83, 84, 84, 84, 144, 144, 145, 145,
-	145, 142, 142, 143, 143, 258, 258, 258, 258, 258,
-	258, 258, 242, 242, 242, 249, 249, 249, 245, 245,
-	247, 247, 247, 248, 248, 248, 246, 255, 255, 257,
-	257, 256, 256, 252, 252, 253, 253, 254, 254, 254,
-	250, 250, 203, 203, 203, 203, 203, 259, 259, 259,
-	259, 313, 313, 313, 271, 271, 214, 214, 215, 215,
-	219, 219, 218, 218, 216, 217, 220, 220, 164, 272,
-	272, 280, 277, 277, 278, 278, 305, 305, 305, 281,
-	281, 294, 294, 290, 290, 291, 291, 284, 284, 296,
-	296, 296, 78, 212, 212, 376, 376, 373, 300, 300,
-	302, 302, 306, 306, 310, 310, 307, 307, 8, 421,
-	421, 421, 298, 298, 298, 298, 298, 298, 298, 298,
+	120, 120, 121, 121, 121, 121, 121, 121, 121, 121,
+	121, 121, 121, 121, 121, 121, 121, 121, 121, 121,
+	428, 428, 337, 337, 337, 208, 208, 208, 208, 208,
+	127, 127, 127, 127, 127, 319, 319, 319, 323, 323,
+	323, 321, 321, 321, 321, 321, 321, 321, 321, 321,
+	321, 321, 321, 321, 321, 321, 324, 324, 230, 230,
+	123, 123, 228, 228, 229, 231, 231, 223, 223, 223,
+	223, 225, 225, 204, 204, 204, 233, 233, 325, 325,
+	234, 234, 107, 108, 108, 109, 109, 235, 235, 237,
+	236, 236, 238, 239, 239, 239, 240, 240, 241, 241,
+	241, 50, 50, 50, 50, 50, 45, 45, 45, 45,
+	46, 46, 46, 46, 138, 138, 138, 138, 140, 140,
+	139, 139, 83, 83, 84, 84, 84, 144, 144, 145,
+	145, 145, 142, 142, 143, 143, 258, 258, 258, 258,
+	258, 258, 258, 242, 242, 242, 249, 249, 249, 245,
+	245, 247, 247, 247, 248, 248, 248, 246, 255, 255,
+	257, 257, 256, 256, 252, 252, 253, 253, 254, 254,
+	254, 250, 250, 203, 203, 203, 203, 203, 259, 259,
+	259, 259, 313, 313, 313, 271, 271, 214, 214, 215,
+	215, 219, 219, 218, 218, 216, 217, 220, 220, 164,
+	272, 272, 280, 277, 277, 278, 278, 305, 305, 305,
+	281, 281, 294, 294, 290, 290, 291, 291, 284, 284,
+	296, 296, 296, 78, 212, 212, 376, 376, 373, 300,
+	300, 302, 302, 306, 306, 310, 310, 307, 307, 8,
+	421, 421, 421, 298, 298, 298, 298, 298, 298, 298,
 	298, 298, 298, 298, 298, 298, 298, 298, 298, 298,
 	298, 298, 298, 298, 298, 298, 298, 298, 298, 298,
 	298, 298, 298, 298, 298, 298, 298, 298, 298, 298,
@@ -8692,7 +8692,7 @@ var yyR1 = [...]int{
 	298, 298, 298, 298, 298, 298, 298, 298, 298, 298,
 	298, 298, 298, 298, 298, 298, 298, 298, 298, 298,
 	298, 298, 298, 298, 298, 298, 298, 298, 298, 298,
-	298, 298, 298, 298, 298, 299, 299, 299, 299, 299,
+	298, 298, 298, 298, 298, 298, 299, 299, 299, 299,
 	299, 299, 299, 299, 299, 299, 299, 299, 299, 299,
 	299, 299, 299, 299, 299, 299, 299, 299, 299, 299,
 	299, 299, 299, 299, 299, 299, 299, 299, 299, 299,
@@ -8740,8 +8740,8 @@ var yyR1 = [...]int{
 	299, 299, 299, 299, 299, 299, 299, 299, 299, 299,
 	299, 299, 299, 299, 299, 299, 299, 299, 299, 299,
 	299, 299, 299, 299, 299, 299, 299, 299, 299, 299,
-	299, 299, 299, 299, 299, 299, 299, 424, 425, 317,
-	318, 318, 318,
+	299, 299, 299, 299, 299, 299, 299, 299, 424, 425,
+	317, 318, 318, 318,
 }
 
 var yyR2 = [...]int{
@@ -8767,151 +8767,151 @@ var yyR2 = [...]int{
 	2, 0, 2, 3, 5, 3, 4, 2, 3, 2,
 	3, 3, 3, 3, 2, 2, 4, 4, 1, 1,
 	1, 1, 1, 1, 0, 2, 2, 3, 3, 2,
-	2, 2, 1, 1, 2, 2, 2, 2, 2, 2,
-	1, 1, 1, 1, 2, 2, 1, 1, 1, 1,
-	1, 1, 1, 1, 2, 2, 2, 2, 2, 2,
-	2, 2, 1, 1, 1, 1, 1, 1, 1, 1,
+	3, 2, 2, 1, 1, 2, 2, 2, 2, 2,
+	2, 1, 1, 1, 1, 2, 2, 1, 1, 1,
+	1, 1, 1, 1, 1, 2, 2, 2, 2, 2,
+	2, 2, 2, 1, 1, 1, 1, 1, 1, 1,
 	1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
 	1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
 	1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
 	1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-	2, 1, 1, 2, 1, 1, 2, 1, 2, 1,
-	3, 1, 1, 1, 2, 1, 1, 1, 1, 1,
-	1, 1, 1, 1, 1, 2, 2, 2, 2, 2,
-	2, 2, 1, 2, 2, 2, 2, 3, 3, 3,
-	2, 2, 2, 2, 2, 2, 1, 1, 1, 1,
-	1, 5, 2, 5, 1, 1, 1, 1, 1, 1,
-	1, 1, 1, 3, 0, 3, 0, 5, 1, 3,
-	0, 3, 5, 0, 1, 1, 0, 1, 0, 3,
-	3, 2, 2, 2, 1, 2, 2, 0, 1, 0,
-	2, 2, 5, 0, 1, 1, 2, 1, 3, 2,
-	1, 1, 3, 3, 3, 0, 1, 4, 3, 3,
-	4, 2, 0, 2, 1, 1, 1, 1, 1, 0,
-	1, 1, 1, 0, 1, 1, 3, 3, 4, 3,
-	1, 3, 1, 7, 6, 7, 7, 8, 8, 0,
-	1, 5, 2, 1, 1, 1, 0, 1, 3, 3,
-	1, 1, 2, 2, 2, 0, 1, 1, 1, 2,
-	0, 1, 0, 1, 1, 3, 2, 1, 2, 3,
-	3, 3, 4, 4, 3, 3, 3, 3, 4, 4,
-	3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
-	3, 3, 3, 3, 3, 3, 3, 3, 4, 5,
-	0, 2, 2, 1, 1, 1, 1, 1, 1, 1,
-	1, 1, 3, 1, 1, 1, 0, 1, 0, 1,
-	0, 2, 0, 2, 0, 2, 2, 0, 1, 5,
-	1, 3, 7, 1, 3, 3, 1, 2, 2, 2,
-	5, 5, 5, 6, 8, 5, 5, 4, 4, 4,
-	6, 5, 5, 5, 2, 2, 2, 2, 3, 3,
-	3, 4, 3, 3, 1, 3, 5, 1, 3, 3,
-	3, 3, 3, 3, 3, 3, 3, 2, 2, 3,
-	4, 4, 2, 11, 3, 6, 8, 6, 6, 6,
-	13, 8, 6, 6, 10, 7, 5, 5, 5, 5,
-	7, 5, 5, 5, 5, 5, 7, 7, 5, 5,
-	5, 5, 6, 0, 6, 5, 6, 4, 5, 0,
-	8, 9, 0, 3, 0, 1, 0, 3, 8, 4,
-	1, 3, 3, 6, 7, 7, 8, 4, 0, 1,
-	0, 1, 3, 3, 1, 1, 2, 1, 1, 0,
-	2, 0, 2, 5, 3, 7, 4, 4, 4, 4,
-	3, 3, 3, 7, 3, 3, 3, 3, 3, 3,
-	3, 3, 3, 3, 2, 0, 2, 2, 1, 3,
-	2, 0, 2, 2, 2, 2, 2, 2, 2, 2,
-	2, 3, 1, 3, 3, 0, 2, 2, 2, 2,
-	2, 2, 2, 4, 4, 3, 0, 1, 4, 3,
-	4, 4, 3, 3, 3, 2, 1, 3, 3, 3,
-	5, 7, 7, 6, 5, 3, 2, 4, 5, 5,
-	3, 3, 7, 3, 3, 3, 3, 4, 7, 5,
-	2, 4, 4, 4, 4, 4, 5, 5, 4, 4,
-	4, 4, 4, 4, 4, 4, 2, 2, 4, 4,
-	4, 4, 4, 2, 3, 3, 3, 3, 3, 5,
-	2, 3, 3, 2, 3, 4, 4, 4, 3, 4,
-	4, 5, 3, 5, 3, 5, 0, 1, 0, 1,
-	0, 1, 1, 1, 0, 2, 2, 0, 2, 2,
-	0, 2, 0, 1, 1, 1, 1, 2, 1, 3,
-	1, 1, 1, 1, 1, 3, 0, 1, 1, 3,
-	3, 2, 2, 1, 1, 5, 0, 1, 0, 1,
-	2, 3, 0, 3, 3, 3, 1, 0, 1, 1,
+	1, 2, 1, 1, 2, 1, 1, 2, 1, 2,
+	1, 3, 1, 1, 1, 2, 1, 1, 1, 1,
+	1, 1, 1, 1, 1, 1, 2, 2, 2, 2,
+	2, 2, 2, 1, 2, 2, 2, 2, 3, 3,
+	3, 2, 2, 2, 2, 2, 2, 1, 1, 1,
+	1, 1, 5, 2, 5, 1, 1, 1, 1, 1,
+	1, 1, 1, 1, 3, 0, 3, 0, 5, 1,
+	3, 0, 3, 5, 0, 1, 1, 0, 1, 0,
+	3, 3, 2, 2, 2, 1, 2, 2, 0, 1,
+	0, 2, 2, 5, 0, 1, 1, 2, 1, 3,
+	2, 1, 1, 3, 3, 3, 0, 1, 4, 3,
+	3, 4, 2, 0, 2, 1, 1, 1, 1, 1,
+	0, 1, 1, 1, 0, 1, 1, 3, 3, 4,
+	3, 1, 3, 1, 7, 6, 7, 7, 8, 8,
+	0, 1, 5, 2, 1, 1, 1, 0, 1, 3,
+	3, 1, 1, 2, 2, 2, 0, 1, 1, 1,
+	2, 0, 1, 0, 1, 1, 3, 2, 1, 2,
+	3, 3, 3, 4, 4, 3, 3, 3, 3, 4,
+	4, 3, 3, 3, 3, 3, 3, 3, 3, 3,
+	3, 3, 3, 3, 3, 3, 3, 3, 3, 4,
+	5, 0, 2, 2, 1, 1, 1, 1, 1, 1,
+	1, 1, 1, 3, 1, 1, 1, 0, 1, 0,
+	1, 0, 2, 0, 2, 0, 2, 2, 0, 1,
+	5, 1, 3, 7, 1, 3, 3, 1, 2, 2,
+	2, 5, 5, 5, 6, 8, 5, 5, 4, 4,
+	4, 6, 5, 5, 5, 2, 2, 2, 2, 3,
+	3, 3, 4, 3, 3, 1, 3, 5, 1, 3,
+	3, 3, 3, 3, 3, 3, 3, 3, 2, 2,
+	3, 4, 4, 2, 11, 3, 6, 8, 6, 6,
+	6, 13, 8, 6, 6, 10, 7, 5, 5, 5,
+	5, 7, 5, 5, 5, 5, 5, 7, 7, 5,
+	5, 5, 5, 6, 0, 6, 5, 6, 4, 5,
+	0, 8, 9, 0, 3, 0, 1, 0, 3, 8,
+	4, 1, 3, 3, 6, 7, 7, 8, 4, 0,
+	1, 0, 1, 3, 3, 1, 1, 2, 1, 1,
+	0, 2, 0, 2, 5, 3, 7, 4, 4, 4,
+	4, 3, 3, 3, 7, 3, 3, 3, 3, 3,
+	3, 3, 3, 3, 3, 2, 0, 2, 2, 1,
+	3, 2, 0, 2, 2, 2, 2, 2, 2, 2,
+	2, 2, 3, 1, 3, 3, 0, 2, 2, 2,
+	2, 2, 2, 2, 4, 4, 3, 0, 1, 4,
+	3, 4, 4, 3, 3, 3, 2, 1, 3, 3,
+	3, 5, 7, 7, 6, 5, 3, 2, 4, 5,
+	5, 3, 3, 7, 3, 3, 3, 3, 4, 7,
+	5, 2, 4, 4, 4, 4, 4, 5, 5, 4,
+	4, 4, 4, 4, 4, 4, 4, 2, 2, 4,
+	4, 4, 4, 4, 2, 3, 3, 3, 3, 3,
+	5, 2, 3, 3, 2, 3, 4, 4, 4, 3,
+	4, 4, 5, 3, 5, 3, 5, 0, 1, 0,
+	1, 0, 1, 1, 1, 0, 2, 2, 0, 2,
+	2, 0, 2, 0, 1, 1, 1, 1, 2, 1,
+	3, 1, 1, 1, 1, 1, 3, 0, 1, 1,
+	3, 3, 2, 2, 1, 1, 5, 0, 1, 0,
+	1, 2, 3, 0, 3, 3, 3, 1, 0, 1,
 	1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-	0, 1, 1, 4, 4, 4, 2, 2, 3, 1,
-	3, 2, 1, 2, 1, 2, 2, 4, 3, 3,
-	6, 4, 7, 6, 1, 3, 2, 2, 2, 2,
-	1, 1, 1, 3, 2, 1, 1, 1, 0, 1,
-	1, 0, 3, 0, 2, 0, 2, 1, 2, 2,
-	0, 1, 1, 0, 1, 1, 5, 5, 4, 0,
-	2, 4, 4, 0, 1, 1, 2, 1, 1, 1,
-	1, 1, 1, 1, 1, 1, 1, 1, 1, 3,
-	1, 2, 3, 5, 0, 1, 2, 1, 1, 0,
-	1, 2, 1, 3, 1, 1, 1, 4, 3, 1,
-	1, 2, 3, 7, 0, 3, 0, 1, 1, 3,
-	1, 3, 1, 1, 3, 3, 1, 3, 4, 4,
-	4, 3, 2, 4, 0, 1, 0, 2, 0, 1,
-	0, 1, 2, 1, 1, 1, 2, 2, 1, 2,
-	3, 2, 3, 2, 2, 2, 1, 1, 3, 3,
-	0, 1, 1, 2, 6, 5, 6, 6, 5, 5,
-	0, 2, 3, 3, 0, 2, 3, 3, 3, 2,
-	3, 1, 3, 6, 1, 1, 3, 4, 3, 4,
-	4, 4, 1, 3, 4, 5, 6, 3, 4, 5,
-	6, 3, 4, 1, 1, 1, 3, 3, 3, 3,
-	3, 3, 5, 5, 3, 3, 3, 3, 3, 3,
-	1, 1, 1, 1, 1, 3, 1, 1, 1, 2,
-	2, 2, 2, 1, 1, 2, 7, 7, 6, 6,
-	2, 2, 5, 6, 3, 3, 1, 3, 1, 3,
+	1, 0, 1, 1, 4, 4, 4, 2, 2, 3,
+	1, 3, 2, 1, 2, 1, 2, 2, 4, 3,
+	3, 6, 4, 7, 6, 1, 3, 2, 2, 2,
+	2, 1, 1, 1, 3, 2, 1, 1, 1, 0,
+	1, 1, 0, 3, 0, 2, 0, 2, 1, 2,
+	2, 0, 1, 1, 0, 1, 1, 5, 5, 4,
+	0, 2, 4, 4, 0, 1, 1, 2, 1, 1,
 	1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-	2, 2, 2, 2, 4, 2, 4, 0, 1, 2,
-	5, 0, 3, 0, 1, 4, 4, 2, 1, 0,
-	0, 1, 1, 2, 2, 1, 1, 2, 2, 0,
-	1, 1, 1, 1, 5, 1, 3, 0, 3, 1,
-	1, 1, 2, 1, 2, 1, 1, 1, 1, 1,
-	1, 1, 1, 1, 1, 1, 1, 1, 3, 4,
-	6, 4, 4, 8, 8, 6, 8, 6, 5, 4,
-	10, 2, 2, 1, 2, 2, 2, 2, 2, 5,
-	6, 6, 6, 6, 6, 5, 5, 5, 5, 5,
-	5, 5, 5, 5, 5, 8, 4, 8, 8, 6,
-	5, 4, 4, 4, 5, 7, 4, 4, 7, 4,
-	4, 6, 6, 6, 8, 6, 6, 4, 4, 3,
-	4, 6, 6, 4, 4, 6, 4, 6, 4, 4,
-	4, 4, 4, 4, 6, 4, 6, 4, 4, 4,
-	6, 4, 6, 4, 4, 6, 4, 6, 4, 6,
+	3, 1, 2, 3, 5, 0, 1, 2, 1, 1,
+	0, 1, 2, 1, 3, 1, 1, 1, 4, 3,
+	1, 1, 2, 3, 7, 0, 3, 0, 1, 1,
+	3, 1, 3, 1, 1, 3, 3, 1, 3, 4,
+	4, 4, 3, 2, 4, 0, 1, 0, 2, 0,
+	1, 0, 1, 2, 1, 1, 1, 2, 2, 1,
+	2, 3, 2, 3, 2, 2, 2, 1, 1, 3,
+	3, 0, 1, 1, 2, 6, 5, 6, 6, 5,
+	5, 0, 2, 3, 3, 0, 2, 3, 3, 3,
+	2, 3, 1, 3, 6, 1, 1, 3, 4, 3,
+	4, 4, 4, 1, 3, 4, 5, 6, 3, 4,
+	5, 6, 3, 4, 1, 1, 1, 3, 3, 3,
+	3, 3, 3, 5, 5, 3, 3, 3, 3, 3,
+	3, 1, 1, 1, 1, 1, 3, 1, 1, 1,
+	2, 2, 2, 2, 1, 1, 2, 7, 7, 6,
+	6, 2, 2, 5, 6, 3, 3, 1, 3, 1,
+	3, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+	1, 2, 2, 2, 2, 4, 2, 4, 0, 1,
+	2, 5, 0, 3, 0, 1, 4, 4, 2, 1,
+	0, 0, 1, 1, 2, 2, 1, 1, 2, 2,
+	0, 1, 1, 1, 1, 5, 1, 3, 0, 3,
+	1, 1, 1, 2, 1, 2, 1, 1, 1, 1,
+	1, 1, 1, 1, 1, 1, 1, 1, 1, 3,
+	4, 6, 4, 4, 8, 8, 6, 8, 6, 5,
+	4, 10, 2, 2, 1, 2, 2, 2, 2, 2,
+	5, 6, 6, 6, 6, 6, 5, 5, 5, 5,
+	5, 5, 5, 5, 5, 5, 8, 4, 8, 8,
+	6, 5, 4, 4, 4, 5, 7, 4, 4, 7,
+	4, 4, 6, 6, 6, 8, 6, 6, 4, 4,
+	3, 4, 6, 6, 4, 4, 6, 4, 6, 4,
+	4, 4, 4, 4, 4, 6, 4, 6, 4, 4,
+	4, 6, 4, 6, 4, 4, 6, 4, 6, 4,
+	6, 8, 4, 6, 8, 4, 6, 8, 4, 6,
 	8, 4, 6, 8, 4, 6, 8, 4, 6, 8,
 	4, 6, 8, 4, 6, 8, 4, 6, 8, 4,
 	6, 8, 4, 6, 8, 4, 6, 8, 4, 6,
-	8, 4, 6, 8, 4, 6, 8, 4, 6, 8,
-	4, 6, 8, 4, 6, 8, 4, 4, 4, 6,
-	4, 6, 4, 8, 6, 4, 4, 6, 4, 6,
-	8, 4, 6, 8, 4, 4, 6, 8, 6, 4,
-	6, 6, 8, 10, 7, 8, 8, 9, 4, 4,
-	4, 4, 6, 6, 6, 6, 6, 6, 6, 6,
-	6, 6, 4, 4, 4, 4, 4, 4, 6, 4,
-	6, 5, 9, 6, 9, 8, 6, 8, 8, 8,
-	6, 1, 1, 1, 1, 1, 1, 1, 1, 0,
-	2, 6, 8, 10, 12, 14, 6, 8, 8, 10,
-	12, 14, 6, 8, 10, 12, 6, 8, 4, 4,
-	3, 4, 6, 6, 4, 6, 4, 6, 8, 0,
-	2, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+	8, 4, 6, 8, 4, 6, 8, 4, 4, 4,
+	6, 4, 6, 4, 8, 6, 4, 4, 6, 4,
+	6, 8, 4, 6, 8, 4, 4, 6, 8, 6,
+	4, 6, 6, 8, 10, 7, 8, 8, 9, 4,
+	4, 4, 4, 6, 6, 6, 6, 6, 6, 6,
+	6, 6, 6, 4, 4, 4, 4, 4, 4, 6,
+	4, 6, 5, 9, 6, 9, 8, 6, 8, 8,
+	8, 6, 1, 1, 1, 1, 1, 1, 1, 1,
+	0, 2, 6, 8, 10, 12, 14, 6, 8, 8,
+	10, 12, 14, 6, 8, 10, 12, 6, 8, 4,
+	4, 3, 4, 6, 6, 4, 6, 4, 6, 8,
+	0, 2, 1, 1, 1, 1, 1, 1, 1, 1,
 	1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
 	1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-	1, 1, 1, 1, 1, 1, 1, 1, 1, 0,
-	2, 0, 2, 3, 4, 4, 4, 4, 4, 0,
-	3, 4, 7, 3, 1, 1, 1, 0, 5, 5,
-	2, 3, 1, 2, 2, 1, 2, 1, 2, 2,
-	1, 2, 2, 1, 1, 0, 1, 0, 1, 0,
-	2, 1, 2, 4, 0, 2, 1, 1, 3, 5,
-	1, 1, 1, 2, 2, 0, 4, 0, 2, 0,
-	2, 2, 1, 3, 0, 1, 0, 1, 3, 1,
-	3, 2, 0, 1, 1, 0, 1, 2, 4, 4,
-	0, 2, 2, 1, 1, 3, 3, 3, 3, 3,
-	3, 3, 3, 0, 3, 3, 3, 0, 3, 1,
-	1, 0, 4, 0, 1, 1, 0, 3, 1, 3,
-	2, 1, 1, 0, 1, 2, 3, 4, 2, 3,
-	4, 4, 9, 3, 5, 0, 3, 3, 0, 1,
-	0, 2, 2, 0, 2, 2, 2, 0, 2, 1,
-	2, 3, 3, 0, 2, 1, 2, 3, 4, 3,
-	0, 1, 3, 1, 6, 5, 4, 1, 3, 3,
-	5, 0, 2, 5, 0, 5, 1, 3, 1, 3,
-	1, 3, 1, 2, 3, 4, 1, 1, 1, 1,
-	3, 3, 1, 2, 1, 1, 1, 1, 1, 1,
-	1, 0, 1, 0, 2, 0, 3, 0, 1, 0,
-	1, 1, 5, 0, 1, 0, 1, 2, 1, 1,
-	1, 1, 1, 1, 0, 1, 1, 1, 3, 0,
 	1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+	0, 2, 0, 2, 3, 4, 4, 4, 4, 4,
+	0, 3, 4, 7, 3, 1, 1, 1, 0, 5,
+	5, 2, 3, 1, 2, 2, 1, 2, 1, 2,
+	2, 1, 2, 2, 1, 1, 0, 1, 0, 1,
+	0, 2, 1, 2, 4, 0, 2, 1, 1, 3,
+	5, 1, 1, 1, 2, 2, 0, 4, 0, 2,
+	0, 2, 2, 1, 3, 0, 1, 0, 1, 3,
+	1, 3, 2, 0, 1, 1, 0, 1, 2, 4,
+	4, 0, 2, 2, 1, 1, 3, 3, 3, 3,
+	3, 3, 3, 3, 0, 3, 3, 3, 0, 3,
+	1, 1, 0, 4, 0, 1, 1, 0, 3, 1,
+	3, 2, 1, 1, 0, 1, 2, 3, 4, 2,
+	3, 4, 4, 9, 3, 5, 0, 3, 3, 0,
+	1, 0, 2, 2, 0, 2, 2, 2, 0, 2,
+	1, 2, 3, 3, 0, 2, 1, 2, 3, 4,
+	3, 0, 1, 3, 1, 6, 5, 4, 1, 3,
+	3, 5, 0, 2, 5, 0, 5, 1, 3, 1,
+	3, 1, 3, 1, 2, 3, 4, 1, 1, 1,
+	1, 3, 3, 1, 2, 1, 1, 1, 1, 1,
+	1, 1, 0, 1, 0, 2, 0, 3, 0, 1,
+	0, 1, 1, 5, 0, 1, 0, 1, 2, 1,
+	1, 1, 1, 1, 1, 0, 1, 1, 1, 3,
+	0, 1, 1, 1, 1, 1, 1, 1, 1, 1,
 	1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
 	1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
 	1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
@@ -8974,8 +8974,8 @@ var yyR2 = [...]int{
 	1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
 	1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
 	1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-	1, 1, 1, 1, 1, 1, 1, 1, 1, 0,
-	0, 1, 1,
+	1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+	0, 0, 1, 1,
 }
 
 var yyChk = [...]int{
@@ -9395,181 +9395,181 @@ var yyChk = [...]int{
 	-306, -302, 98, 105, 97, 597, -425, -425, -91, 159,
 	723, 687, -156, 235, -425, 96, -425, 96, -425, 96,
 	-107, 96, 28, 602, -425, -309, -177, -175, -300, 651,
-	-403, -402, 593, -413, -409, 130, 157, 110, -411, 689,
-	645, 140, 141, -83, -146, 95, -425, -84, 303, 710,
-	236, -394, 598, -91, 724, 665, 640, 665, 640, -151,
-	-146, -146, -146, -105, -424, -425, 96, 26, -326, -63,
-	662, -400, -401, 85, -404, 407, 661, 682, 130, 98,
-	97, -260, 264, -307, -388, 599, 156, -120, -425, 96,
-	-425, 96, -425, -94, -175, 658, -339, -159, -401, 85,
-	-400, 85, 17, 16, -4, 754, 97, 305, -91, 665,
-	640, -146, -146, -425, -62, 29, -176, -399, 272, 267,
-	270, 35, -399, 105, -4, -425, -425, 662, 266, 34,
-	130, -159, -179, -178, -178,
+	-403, -402, 593, -413, -409, 130, 157, 110, -411, 684,
+	689, 645, 140, 141, -83, -146, 95, -425, -84, 303,
+	710, 236, -394, 598, -91, 724, 665, 640, 665, 640,
+	-151, -146, -146, -146, -105, -424, -425, 96, 26, -326,
+	-63, 662, -400, -401, 85, -404, 407, 661, 682, 130,
+	98, 105, 97, -260, 264, -307, -388, 599, 156, -120,
+	-425, 96, -425, 96, -425, -94, -175, 658, -339, -159,
+	-401, 85, -400, 85, 17, 16, -4, 754, 97, 305,
+	-91, 665, 640, -146, -146, -425, -62, 29, -176, -399,
+	272, 267, 270, 35, -399, 105, -4, -425, -425, 662,
+	266, 34, 130, -159, -179, -178, -178,
 }
 
 var yyDef = [...]int{
-	893, -2, -2, 895, 2, 4, 5, 6, 7, 8,
+	894, -2, -2, 896, 2, 4, 5, 6, 7, 8,
 	9, 10, 11, 12, 13, 14, 15, 16, 17, 18,
 	19, 20, 21, 22, 23, 24, 25, 26, 27, 28,
 	29, 30, 31, 32, 33, 34, 35, 36, 37, 38,
-	39, 70, 72, 73, 893, 893, 893, 0, 893, 0,
-	0, 893, -2, -2, 893, 1654, 0, 893, 0, 888,
-	0, -2, 808, 814, 0, 823, -2, 0, 0, 893,
-	893, 2299, 2299, 888, 0, 0, 0, 0, 0, 893,
-	893, 893, 893, 1659, 1506, 50, 893, 0, 88, 89,
-	843, 844, 845, 65, 0, 2297, 85, 893, 894, 1,
-	3, 71, 75, 0, 0, 0, 58, 1515, 0, 78,
-	0, 0, 897, 0, 0, 1637, 893, 893, 0, 129,
+	39, 70, 72, 73, 894, 894, 894, 0, 894, 0,
+	0, 894, -2, -2, 894, 1655, 0, 894, 0, 889,
+	0, -2, 809, 815, 0, 824, -2, 0, 0, 894,
+	894, 2300, 2300, 889, 0, 0, 0, 0, 0, 894,
+	894, 894, 894, 1660, 1507, 50, 894, 0, 88, 89,
+	844, 845, 846, 65, 0, 2298, 85, 894, 895, 1,
+	3, 71, 75, 0, 0, 0, 58, 1516, 0, 78,
+	0, 0, 898, 0, 0, 1638, 894, 894, 0, 129,
 	130, 0, 0, 0, -2, 133, -2, 162, 163, 164,
-	0, 169, 613, 530, 582, 528, 567, -2, 516, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 533, 405, 405, 0, 0, -2, 516, 516, 516,
-	1639, 0, 0, 0, 564, 467, 405, 405, 405, 0,
-	405, 405, 405, 405, 0, 0, 405, 405, 405, 405,
-	405, 405, 405, 405, 405, 405, 405, 405, 405, 405,
-	405, 405, 405, 1533, 168, 1655, 1652, 1653, 1815, 1816,
-	1817, 1818, 1819, 1820, 1821, 1822, 1823, 1824, 1825, 1826,
-	1827, 1828, 1829, 1830, 1831, 1832, 1833, 1834, 1835, 1836,
-	1837, 1838, 1839, 1840, 1841, 1842, 1843, 1844, 1845, 1846,
-	1847, 1848, 1849, 1850, 1851, 1852, 1853, 1854, 1855, 1856,
-	1857, 1858, 1859, 1860, 1861, 1862, 1863, 1864, 1865, 1866,
-	1867, 1868, 1869, 1870, 1871, 1872, 1873, 1874, 1875, 1876,
-	1877, 1878, 1879, 1880, 1881, 1882, 1883, 1884, 1885, 1886,
-	1887, 1888, 1889, 1890, 1891, 1892, 1893, 1894, 1895, 1896,
-	1897, 1898, 1899, 1900, 1901, 1902, 1903, 1904, 1905, 1906,
-	1907, 1908, 1909, 1910, 1911, 1912, 1913, 1914, 1915, 1916,
-	1917, 1918, 1919, 1920, 1921, 1922, 1923, 1924, 1925, 1926,
-	1927, 1928, 1929, 1930, 1931, 1932, 1933, 1934, 1935, 1936,
-	1937, 1938, 1939, 1940, 1941, 1942, 1943, 1944, 1945, 1946,
-	1947, 1948, 1949, 1950, 1951, 1952, 1953, 1954, 1955, 1956,
-	1957, 1958, 1959, 1960, 1961, 1962, 1963, 1964, 1965, 1966,
-	1967, 1968, 1969, 1970, 1971, 1972, 1973, 1974, 1975, 1976,
-	1977, 1978, 1979, 1980, 1981, 1982, 1983, 1984, 1985, 1986,
-	1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996,
-	1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
-	2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016,
-	2017, 2018, 2019, 2020, 2021, 2022, 2023, 2024, 2025, 2026,
-	2027, 2028, 2029, 2030, 2031, 2032, 2033, 2034, 2035, 2036,
-	2037, 2038, 2039, 2040, 2041, 2042, 2043, 2044, 2045, 2046,
-	2047, 2048, 2049, 2050, 2051, 2052, 2053, 2054, 2055, 2056,
-	2057, 2058, 2059, 2060, 2061, 2062, 2063, 2064, 2065, 2066,
-	2067, 2068, 2069, 2070, 2071, 2072, 2073, 2074, 2075, 2076,
-	2077, 2078, 2079, 2080, 2081, 2082, 2083, 2084, 2085, 2086,
-	2087, 2088, 2089, 2090, 2091, 2092, 2093, 2094, 2095, 2096,
-	2097, 2098, 2099, 2100, 2101, 2102, 2103, 2104, 2105, 2106,
-	2107, 2108, 2109, 2110, 2111, 2112, 2113, 2114, 2115, 2116,
-	2117, 2118, 2119, 2120, 2121, 2122, 2123, 2124, 2125, 2126,
-	2127, 2128, 2129, 2130, 2131, 2132, 2133, 2134, 2135, 2136,
-	2137, 2138, 2139, 2140, 2141, 2142, 2143, 2144, 2145, 2146,
-	2147, 2148, 2149, 2150, 2151, 2152, 2153, 2154, 2155, 2156,
-	2157, 2158, 2159, 2160, 2161, 2162, 2163, 2164, 2165, 2166,
-	2167, 2168, 2169, 2170, 2171, 2172, 2173, 2174, 2175, 2176,
-	2177, 2178, 2179, 2180, 2181, 2182, 2183, 2184, 2185, 2186,
-	2187, 2188, 2189, 2190, 2191, 2192, 2193, 2194, 2195, 2196,
-	2197, 2198, 2199, 2200, 2201, 2202, 2203, 2204, 2205, 2206,
-	2207, 2208, 2209, 2210, 2211, 2212, 2213, 2214, 2215, 2216,
-	2217, 2218, 2219, 2220, 2221, 2222, 2223, 2224, 2225, 2226,
-	2227, 2228, 2229, 2230, 2231, 2232, 2233, 2234, 2235, 2236,
-	2237, 2238, 2239, 2240, 2241, 2242, 2243, 2244, 2245, 2246,
-	2247, 2248, 2249, 2250, 2251, 2252, 2253, 2254, 2255, 2256,
-	2257, 2258, 2259, 2260, 2261, 2262, 2263, 2264, 2265, 2266,
-	2267, 2268, 2269, 2270, 2271, 2272, 2273, 2274, 2275, 2276,
-	2277, 2278, 2279, 2280, 2281, 2282, 2283, 2284, 2285, 2286,
-	2287, 2288, 2289, 2290, 2291, 2292, 2293, 2294, 2295, 2296,
-	0, 1631, 0, 726, 997, 0, 889, 890, 0, 797,
-	797, 0, 797, 797, 797, 797, 0, 0, 0, 740,
-	0, 0, 0, 0, 794, 0, 756, 757, 0, 794,
-	0, 763, 800, 0, 0, 770, 797, 797, 773, 2300,
-	0, 2300, 2300, 0, 0, 1622, 0, 791, 789, 803,
-	804, 42, 807, 810, 811, 812, 813, 816, 0, 827,
-	830, 1648, 1649, 0, 832, 837, 856, 857, 0, 45,
-	1157, 0, 1021, 0, 1032, -2, 1043, 1060, 1061, 1062,
-	1063, 1064, 1066, 1067, 1068, 0, 0, 0, 0, 1073,
-	1074, 0, 0, 0, 0, 0, 1137, 0, 0, 0,
-	0, 2019, 1477, 0, 0, 1439, 1439, 1173, 1439, 1439,
-	1441, 1441, 1441, 1868, 2011, 2020, 2201, 1829, 1835, 1836,
-	1837, 2147, 2148, 2149, 2150, 2243, 2244, 2248, 1932, 1824,
-	2215, 2216, 0, 2296, 1971, 1979, 1980, 1956, 1965, 2004,
-	2109, 2227, 1847, 1999, 2071, 1929, 1951, 1952, 2090, 2091,
-	1975, 1976, 1955, 2153, 2155, 2171, 2172, 2157, 2159, 2168,
-	2174, 2179, 2158, 2170, 2175, 2188, 2192, 2195, 2196, 2197,
-	2165, 2163, 2176, 2180, 2182, 2184, 2190, 2193, 2166, 2164,
-	2177, 2181, 2183, 2185, 2191, 2194, 2152, 2156, 2160, 2169,
-	2187, 2167, 2186, 2161, 2173, 2178, 2189, 2162, 2154, 1969,
-	1972, 1959, 1960, 1962, 1964, 1970, 1977, 1983, 1961, 1982,
-	1981, 0, 1957, 1958, 1963, 1974, 1978, 1966, 1967, 1968,
-	1973, 1984, 2026, 2025, 2024, 2070, 1995, 2069, 0, 0,
-	0, 0, 0, 1818, 1874, 1875, 2198, 1361, 1362, 1363,
-	1364, 0, 0, 0, 0, 0, 0, 0, 294, 295,
-	1490, 1491, 44, 1156, 1618, 1441, 1441, 1441, 1441, 1441,
-	1441, 1095, 1096, 1097, 1098, 1099, 1125, 1126, 1132, 1133,
-	2085, 2086, 2087, 2088, 1912, 2238, 1921, 1922, 2066, 2067,
-	1934, 1935, 2270, 2271, -2, -2, -2, 236, 237, 238,
-	239, 240, 241, 242, 243, 0, 1873, 2213, 2214, 232,
-	0, 1616, 1617, 299, 296, 297, 298, 1139, 1140, 252,
-	253, 254, 255, 256, 257, 258, 259, 260, 261, 262,
-	263, 264, 265, 266, 267, 268, 269, 270, 271, 272,
-	273, 274, 275, 276, 277, 278, 279, 280, 281, 282,
-	283, 284, 285, 286, 287, 288, 289, 290, 291, 292,
-	293, 0, 301, 302, 2299, 0, 866, 0, 0, 0,
-	0, 0, 0, 1660, 1661, 1515, 0, 1507, 1506, 63,
-	0, 893, -2, 0, 0, 0, 0, 47, 0, 52,
-	954, 0, 896, 77, 76, 1555, 1558, 0, 0, 0,
-	59, 1516, 67, 69, 1517, 0, 898, 899, 0, 930,
-	934, 0, 0, 0, 1638, 1637, 1637, 105, 0, 0,
-	106, 126, 127, 128, 0, 0, 112, 113, 1624, 1625,
-	43, 0, 0, 180, 181, 0, 1113, 432, 0, 176,
-	0, 425, 364, 0, 1533, 0, 0, 0, 0, 0,
-	1635, 0, 1632, 157, 158, 165, 166, 167, 405, 405,
-	405, 579, 0, 0, 168, 168, 537, 538, 539, 0,
-	0, -2, 430, 0, 517, 0, 0, 419, 419, 423,
-	421, 422, 0, 0, 0, 0, 0, 0, 0, 0,
-	556, 0, 557, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 674, 0, 406, 0, 577, 578, 468, 0,
-	0, 0, 0, 0, 0, 0, 0, 1640, 1641, 0,
-	554, 555, 0, 0, 0, 405, 405, 0, 0, 0,
-	0, 405, 405, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 156, 1546, 0, 0, 0, -2, 0, 718, 0,
-	0, 0, 1633, 1633, 0, 725, 0, 0, 0, 730,
-	0, 0, 731, 0, 794, 794, 792, 793, 733, 734,
-	735, 736, 797, 0, 0, 414, 415, 416, 794, 797,
-	0, 797, 797, 797, 797, 794, 794, 794, 797, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 2300, 800,
-	797, 0, 764, 0, 765, 766, 767, 768, 771, 772,
-	774, 2301, 2302, 1650, 1651, 1662, 1663, 1664, 1665, 1666,
-	1667, 1668, 1669, 1670, 1671, 1672, 1673, 1674, 1675, 1676,
-	1677, 1678, 1679, 1680, 1681, 1682, 1683, 1684, 1685, 1686,
-	1687, 1688, 1689, 1690, 1691, 1692, 1693, 1694, 1695, 1696,
-	1697, 1698, 1699, 1700, 1701, 1702, 1703, 1704, 1705, 1706,
-	1707, 1708, 1709, 1710, 1711, 1712, 1713, 1714, 1715, 1716,
-	1717, 1718, 1719, 1720, 1721, 1722, 1723, 1724, 1725, 1726,
-	1727, 1728, 1729, 1730, 1731, 1732, 1733, 1734, 1735, 1736,
-	1737, 1738, 1739, 1740, 1741, 1742, 1743, 1744, 1745, 1746,
-	1747, 1748, 1749, 1750, 1751, 1752, 1753, 1754, 1755, 1756,
-	1757, 1758, 1759, 1760, 1761, 1762, 1763, 1764, 1765, 1766,
-	1767, 1768, 1769, 1770, 1771, 1772, 1773, 1774, 1775, 1776,
-	1777, 1778, 1779, 1780, 1781, 1782, 1783, 1784, 1785, 1786,
-	1787, 1788, 1789, 1790, 1791, 1792, 1793, 1794, 1795, 1796,
-	1797, 1798, 1799, 1800, 1801, 1802, 1803, 1804, 1805, 1806,
-	1807, 1808, 1809, 1810, 1811, 1812, 1813, 1814, 2300, 2300,
-	778, 782, 786, 784, 1623, 809, 815, 817, 818, 0,
-	0, 828, 831, 850, 49, 1920, 836, 49, 838, 839,
-	840, 841, 842, 868, 869, 874, 0, 0, 0, 0,
-	880, 881, 882, 0, 0, 885, 886, 887, 0, 0,
-	0, 0, 0, 1019, 0, 0, 1145, 1146, 1147, 1148,
-	1149, 1150, 1151, 1152, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 1044, 1045, 0, 0, 0, 1069, 1070, 1071,
-	1072, 1075, 0, 1086, 0, 1088, 1486, -2, 0, 0,
-	0, 1080, 1081, 0, 0, 0, 1643, 1643, 0, 0,
-	0, 1478, 0, 0, 1171, 0, 1172, 1174, 1175, 1176,
-	0, 1177, 1178, 903, 903, 903, 903, 903, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 903, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 1643, 0, 0, 0, 0, 0, 0, 0,
+	0, 169, 614, 531, 583, 529, 568, -2, 517, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 534, 406, 406, 0, 0, -2, 517, 517, 517,
+	1640, 0, 0, 0, 565, 468, 406, 406, 406, 0,
+	406, 406, 406, 406, 0, 0, 406, 406, 406, 406,
+	406, 406, 406, 406, 406, 406, 406, 406, 406, 406,
+	406, 406, 406, 1534, 168, 1656, 1653, 1654, 1816, 1817,
+	1818, 1819, 1820, 1821, 1822, 1823, 1824, 1825, 1826, 1827,
+	1828, 1829, 1830, 1831, 1832, 1833, 1834, 1835, 1836, 1837,
+	1838, 1839, 1840, 1841, 1842, 1843, 1844, 1845, 1846, 1847,
+	1848, 1849, 1850, 1851, 1852, 1853, 1854, 1855, 1856, 1857,
+	1858, 1859, 1860, 1861, 1862, 1863, 1864, 1865, 1866, 1867,
+	1868, 1869, 1870, 1871, 1872, 1873, 1874, 1875, 1876, 1877,
+	1878, 1879, 1880, 1881, 1882, 1883, 1884, 1885, 1886, 1887,
+	1888, 1889, 1890, 1891, 1892, 1893, 1894, 1895, 1896, 1897,
+	1898, 1899, 1900, 1901, 1902, 1903, 1904, 1905, 1906, 1907,
+	1908, 1909, 1910, 1911, 1912, 1913, 1914, 1915, 1916, 1917,
+	1918, 1919, 1920, 1921, 1922, 1923, 1924, 1925, 1926, 1927,
+	1928, 1929, 1930, 1931, 1932, 1933, 1934, 1935, 1936, 1937,
+	1938, 1939, 1940, 1941, 1942, 1943, 1944, 1945, 1946, 1947,
+	1948, 1949, 1950, 1951, 1952, 1953, 1954, 1955, 1956, 1957,
+	1958, 1959, 1960, 1961, 1962, 1963, 1964, 1965, 1966, 1967,
+	1968, 1969, 1970, 1971, 1972, 1973, 1974, 1975, 1976, 1977,
+	1978, 1979, 1980, 1981, 1982, 1983, 1984, 1985, 1986, 1987,
+	1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997,
+	1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
+	2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017,
+	2018, 2019, 2020, 2021, 2022, 2023, 2024, 2025, 2026, 2027,
+	2028, 2029, 2030, 2031, 2032, 2033, 2034, 2035, 2036, 2037,
+	2038, 2039, 2040, 2041, 2042, 2043, 2044, 2045, 2046, 2047,
+	2048, 2049, 2050, 2051, 2052, 2053, 2054, 2055, 2056, 2057,
+	2058, 2059, 2060, 2061, 2062, 2063, 2064, 2065, 2066, 2067,
+	2068, 2069, 2070, 2071, 2072, 2073, 2074, 2075, 2076, 2077,
+	2078, 2079, 2080, 2081, 2082, 2083, 2084, 2085, 2086, 2087,
+	2088, 2089, 2090, 2091, 2092, 2093, 2094, 2095, 2096, 2097,
+	2098, 2099, 2100, 2101, 2102, 2103, 2104, 2105, 2106, 2107,
+	2108, 2109, 2110, 2111, 2112, 2113, 2114, 2115, 2116, 2117,
+	2118, 2119, 2120, 2121, 2122, 2123, 2124, 2125, 2126, 2127,
+	2128, 2129, 2130, 2131, 2132, 2133, 2134, 2135, 2136, 2137,
+	2138, 2139, 2140, 2141, 2142, 2143, 2144, 2145, 2146, 2147,
+	2148, 2149, 2150, 2151, 2152, 2153, 2154, 2155, 2156, 2157,
+	2158, 2159, 2160, 2161, 2162, 2163, 2164, 2165, 2166, 2167,
+	2168, 2169, 2170, 2171, 2172, 2173, 2174, 2175, 2176, 2177,
+	2178, 2179, 2180, 2181, 2182, 2183, 2184, 2185, 2186, 2187,
+	2188, 2189, 2190, 2191, 2192, 2193, 2194, 2195, 2196, 2197,
+	2198, 2199, 2200, 2201, 2202, 2203, 2204, 2205, 2206, 2207,
+	2208, 2209, 2210, 2211, 2212, 2213, 2214, 2215, 2216, 2217,
+	2218, 2219, 2220, 2221, 2222, 2223, 2224, 2225, 2226, 2227,
+	2228, 2229, 2230, 2231, 2232, 2233, 2234, 2235, 2236, 2237,
+	2238, 2239, 2240, 2241, 2242, 2243, 2244, 2245, 2246, 2247,
+	2248, 2249, 2250, 2251, 2252, 2253, 2254, 2255, 2256, 2257,
+	2258, 2259, 2260, 2261, 2262, 2263, 2264, 2265, 2266, 2267,
+	2268, 2269, 2270, 2271, 2272, 2273, 2274, 2275, 2276, 2277,
+	2278, 2279, 2280, 2281, 2282, 2283, 2284, 2285, 2286, 2287,
+	2288, 2289, 2290, 2291, 2292, 2293, 2294, 2295, 2296, 2297,
+	0, 1632, 0, 727, 998, 0, 890, 891, 0, 798,
+	798, 0, 798, 798, 798, 798, 0, 0, 0, 741,
+	0, 0, 0, 0, 795, 0, 757, 758, 0, 795,
+	0, 764, 801, 0, 0, 771, 798, 798, 774, 2301,
+	0, 2301, 2301, 0, 0, 1623, 0, 792, 790, 804,
+	805, 42, 808, 811, 812, 813, 814, 817, 0, 828,
+	831, 1649, 1650, 0, 833, 838, 857, 858, 0, 45,
+	1158, 0, 1022, 0, 1033, -2, 1044, 1061, 1062, 1063,
+	1064, 1065, 1067, 1068, 1069, 0, 0, 0, 0, 1074,
+	1075, 0, 0, 0, 0, 0, 1138, 0, 0, 0,
+	0, 2020, 1478, 0, 0, 1440, 1440, 1174, 1440, 1440,
+	1442, 1442, 1442, 1869, 2012, 2021, 2202, 1830, 1836, 1837,
+	1838, 2148, 2149, 2150, 2151, 2244, 2245, 2249, 1933, 1825,
+	2216, 2217, 0, 2297, 1972, 1980, 1981, 1957, 1966, 2005,
+	2110, 2228, 1848, 2000, 2072, 1930, 1952, 1953, 2091, 2092,
+	1976, 1977, 1956, 2154, 2156, 2172, 2173, 2158, 2160, 2169,
+	2175, 2180, 2159, 2171, 2176, 2189, 2193, 2196, 2197, 2198,
+	2166, 2164, 2177, 2181, 2183, 2185, 2191, 2194, 2167, 2165,
+	2178, 2182, 2184, 2186, 2192, 2195, 2153, 2157, 2161, 2170,
+	2188, 2168, 2187, 2162, 2174, 2179, 2190, 2163, 2155, 1970,
+	1973, 1960, 1961, 1963, 1965, 1971, 1978, 1984, 1962, 1983,
+	1982, 0, 1958, 1959, 1964, 1975, 1979, 1967, 1968, 1969,
+	1974, 1985, 2027, 2026, 2025, 2071, 1996, 2070, 0, 0,
+	0, 0, 0, 1819, 1875, 1876, 2199, 1362, 1363, 1364,
+	1365, 0, 0, 0, 0, 0, 0, 0, 295, 296,
+	1491, 1492, 44, 1157, 1619, 1442, 1442, 1442, 1442, 1442,
+	1442, 1096, 1097, 1098, 1099, 1100, 1126, 1127, 1133, 1134,
+	2086, 2087, 2088, 2089, 1913, 2239, 1922, 1923, 2067, 2068,
+	1935, 1936, 2271, 2272, -2, -2, -2, 237, 238, 239,
+	240, 241, 242, 243, 244, 0, 1874, 2214, 2215, 233,
+	0, 1617, 1618, 300, 297, 298, 299, 1140, 1141, 253,
+	254, 255, 256, 257, 258, 259, 260, 261, 262, 263,
+	264, 265, 266, 267, 268, 269, 270, 271, 272, 273,
+	274, 275, 276, 277, 278, 279, 280, 281, 282, 283,
+	284, 285, 286, 287, 288, 289, 290, 291, 292, 293,
+	294, 0, 302, 303, 2300, 0, 867, 0, 0, 0,
+	0, 0, 0, 1661, 1662, 1516, 0, 1508, 1507, 63,
+	0, 894, -2, 0, 0, 0, 0, 47, 0, 52,
+	955, 0, 897, 77, 76, 1556, 1559, 0, 0, 0,
+	59, 1517, 67, 69, 1518, 0, 899, 900, 0, 931,
+	935, 0, 0, 0, 1639, 1638, 1638, 105, 0, 0,
+	106, 126, 127, 128, 0, 0, 112, 113, 1625, 1626,
+	43, 0, 0, 180, 181, 0, 1114, 433, 0, 176,
+	0, 426, 365, 0, 1534, 0, 0, 0, 0, 0,
+	1636, 0, 1633, 157, 158, 165, 166, 167, 406, 406,
+	406, 580, 0, 0, 168, 168, 538, 539, 540, 0,
+	0, -2, 431, 0, 518, 0, 0, 420, 420, 424,
+	422, 423, 0, 0, 0, 0, 0, 0, 0, 0,
+	557, 0, 558, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 675, 0, 407, 0, 578, 579, 469, 0,
+	0, 0, 0, 0, 0, 0, 0, 1641, 1642, 0,
+	555, 556, 0, 0, 0, 406, 406, 0, 0, 0,
+	0, 406, 406, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 156, 1547, 0, 0, 0, -2, 0, 719, 0,
+	0, 0, 1634, 1634, 0, 726, 0, 0, 0, 731,
+	0, 0, 732, 0, 795, 795, 793, 794, 734, 735,
+	736, 737, 798, 0, 0, 415, 416, 417, 795, 798,
+	0, 798, 798, 798, 798, 795, 795, 795, 798, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 2301, 801,
+	798, 0, 765, 0, 766, 767, 768, 769, 772, 773,
+	775, 2302, 2303, 1651, 1652, 1663, 1664, 1665, 1666, 1667,
+	1668, 1669, 1670, 1671, 1672, 1673, 1674, 1675, 1676, 1677,
+	1678, 1679, 1680, 1681, 1682, 1683, 1684, 1685, 1686, 1687,
+	1688, 1689, 1690, 1691, 1692, 1693, 1694, 1695, 1696, 1697,
+	1698, 1699, 1700, 1701, 1702, 1703, 1704, 1705, 1706, 1707,
+	1708, 1709, 1710, 1711, 1712, 1713, 1714, 1715, 1716, 1717,
+	1718, 1719, 1720, 1721, 1722, 1723, 1724, 1725, 1726, 1727,
+	1728, 1729, 1730, 1731, 1732, 1733, 1734, 1735, 1736, 1737,
+	1738, 1739, 1740, 1741, 1742, 1743, 1744, 1745, 1746, 1747,
+	1748, 1749, 1750, 1751, 1752, 1753, 1754, 1755, 1756, 1757,
+	1758, 1759, 1760, 1761, 1762, 1763, 1764, 1765, 1766, 1767,
+	1768, 1769, 1770, 1771, 1772, 1773, 1774, 1775, 1776, 1777,
+	1778, 1779, 1780, 1781, 1782, 1783, 1784, 1785, 1786, 1787,
+	1788, 1789, 1790, 1791, 1792, 1793, 1794, 1795, 1796, 1797,
+	1798, 1799, 1800, 1801, 1802, 1803, 1804, 1805, 1806, 1807,
+	1808, 1809, 1810, 1811, 1812, 1813, 1814, 1815, 2301, 2301,
+	779, 783, 787, 785, 1624, 810, 816, 818, 819, 0,
+	0, 829, 832, 851, 49, 1921, 837, 49, 839, 840,
+	841, 842, 843, 869, 870, 875, 0, 0, 0, 0,
+	881, 882, 883, 0, 0, 886, 887, 888, 0, 0,
+	0, 0, 0, 1020, 0, 0, 1146, 1147, 1148, 1149,
+	1150, 1151, 1152, 1153, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 1045, 1046, 0, 0, 0, 1070, 1071, 1072,
+	1073, 1076, 0, 1087, 0, 1089, 1487, -2, 0, 0,
+	0, 1081, 1082, 0, 0, 0, 1644, 1644, 0, 0,
+	0, 1479, 0, 0, 1172, 0, 1173, 1175, 1176, 1177,
+	0, 1178, 1179, 904, 904, 904, 904, 904, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 904, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 1644, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -9577,64 +9577,64 @@ var yyDef = [...]int{
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 1643, 0, 0,
-	1643, 1643, 0, 0, 224, 225, 226, 227, 228, 229,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 300, 244, 245, 246, 247, 248,
-	303, 249, 250, 251, 1156, 0, 0, 893, 0, 46,
-	858, 859, 0, 980, 1643, 0, 0, 909, 0, 1658,
-	57, 66, 68, 1515, 61, 1515, 0, 913, 0, 0,
-	-2, -2, 914, 915, 919, 920, 921, 922, 923, 924,
-	925, 926, 927, 54, 2298, 55, 0, 74, 0, 48,
-	0, 0, 79, 80, 1606, 1610, 0, 1556, 0, 1559,
-	0, 0, 0, 378, 1563, 0, 0, 1508, 1509, 1512,
-	0, 931, 2017, 935, 0, 937, 938, 0, 0, 103,
-	0, 996, 0, 0, 0, 114, 0, 116, 117, 0,
-	0, 0, 389, 1626, 1627, 1628, -2, 412, 0, 389,
-	373, 311, 312, 313, 364, 315, 364, 364, 364, 364,
-	378, 378, 378, 378, 346, 347, 348, 349, 350, 0,
-	364, 0, 332, 364, 364, 364, 364, 354, 355, 356,
-	357, 358, 359, 360, 361, 316, 317, 318, 319, 320,
-	321, 322, 323, 324, 366, 366, 366, 366, 366, 370,
-	370, 0, 1114, 0, 393, 0, 1512, 0, 0, 1546,
-	1635, 1645, 0, 0, 0, 0, 0, 135, 0, 0,
-	0, 580, 624, 531, 568, 581, 0, 534, 535, -2,
-	0, 0, 516, 0, 518, 0, 413, 0, -2, 0,
-	423, 0, 419, 423, 420, 423, 411, 424, 558, 559,
-	560, 0, 562, 563, 654, 966, 0, 0, 0, 0,
-	0, 660, 661, 662, 0, 664, 665, 666, 667, 668,
-	669, 670, 671, 672, 673, 569, 570, 571, 572, 573,
-	574, 575, 576, 0, 0, 0, 0, 518, 0, 565,
-	0, 0, 469, 470, 471, 0, 0, 474, 475, 476,
-	477, 0, 0, 480, 481, 482, 983, 984, 483, 484,
-	509, 510, 511, 485, 486, 487, 488, 489, 490, 491,
-	503, 504, 505, 506, 507, 508, 492, 493, 494, 495,
-	496, 497, 500, 0, 150, 1537, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 1633, 0, 0, 0, 0, 912, 998,
-	1656, 1657, 727, 0, 0, 798, 799, 0, 417, 418,
-	797, 797, 737, 779, 0, 797, 741, 780, 742, 744,
-	743, 745, 758, 759, 797, 748, 795, 796, 749, 750,
-	751, 752, 753, 754, 755, 775, 760, 761, 762, 801,
-	0, 805, 806, 776, 777, 0, 787, 0, 0, 0,
-	821, 822, 0, 829, 853, 851, 852, 854, 846, 847,
-	848, 849, 0, 855, 0, 0, 871, 99, 876, 877,
-	878, 879, 891, 884, 1158, 1016, 1017, 1018, 0, 1020,
-	1026, 0, 1141, 1143, 1024, 1025, 1028, 0, 0, 0,
-	1022, 1033, 1153, 1154, 1155, 0, 0, 0, 0, 0,
-	1037, 1041, 1046, 1047, 1048, 1049, 1050, 0, 1051, 0,
-	1054, 1055, 1056, 1057, 1058, 1059, 1065, 1454, 1455, 1456,
-	1084, 304, 305, 0, 1085, 0, 0, 0, 0, 0,
-	0, 0, 0, 1401, 1402, 1403, 1404, 1405, 1406, 1407,
-	1408, 1409, 1410, 1411, 1412, 1413, 1414, 1415, 1416, 1417,
-	1418, 1419, 1420, 1157, 0, 1644, 0, 0, 0, 1484,
-	1481, 0, 0, 0, 1440, 1442, 0, 0, 0, 904,
-	905, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 1421, 1422,
-	1423, 1424, 1425, 1426, 1427, 1428, 1429, 1430, 1431, 1432,
-	1433, 1434, 1435, 1436, 1437, 1438, 0, 0, 1457, 0,
-	0, 0, 0, 0, 0, 0, 1477, 0, 1090, 1091,
-	1092, 0, 0, 0, 0, 0, 0, 1219, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 1644, 0, 0,
+	1644, 1644, 0, 0, 225, 226, 227, 228, 229, 230,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 301, 245, 246, 247, 248, 249,
+	304, 250, 251, 252, 1157, 0, 0, 894, 0, 46,
+	859, 860, 0, 981, 1644, 0, 0, 910, 0, 1659,
+	57, 66, 68, 1516, 61, 1516, 0, 914, 0, 0,
+	-2, -2, 915, 916, 920, 921, 922, 923, 924, 925,
+	926, 927, 928, 54, 2299, 55, 0, 74, 0, 48,
+	0, 0, 79, 80, 1607, 1611, 0, 1557, 0, 1560,
+	0, 0, 0, 379, 1564, 0, 0, 1509, 1510, 1513,
+	0, 932, 2018, 936, 0, 938, 939, 0, 0, 103,
+	0, 997, 0, 0, 0, 114, 0, 116, 117, 0,
+	0, 0, 390, 1627, 1628, 1629, -2, 413, 0, 390,
+	374, 312, 313, 314, 365, 316, 365, 365, 365, 365,
+	379, 379, 379, 379, 347, 348, 349, 350, 351, 0,
+	365, 0, 333, 365, 365, 365, 365, 355, 356, 357,
+	358, 359, 360, 361, 362, 317, 318, 319, 320, 321,
+	322, 323, 324, 325, 367, 367, 367, 367, 367, 371,
+	371, 0, 1115, 0, 394, 0, 1513, 0, 0, 1547,
+	1636, 1646, 0, 0, 0, 0, 0, 135, 0, 0,
+	0, 581, 625, 532, 569, 582, 0, 535, 536, -2,
+	0, 0, 517, 0, 519, 0, 414, 0, -2, 0,
+	424, 0, 420, 424, 421, 424, 412, 425, 559, 560,
+	561, 0, 563, 564, 655, 967, 0, 0, 0, 0,
+	0, 661, 662, 663, 0, 665, 666, 667, 668, 669,
+	670, 671, 672, 673, 674, 570, 571, 572, 573, 574,
+	575, 576, 577, 0, 0, 0, 0, 519, 0, 566,
+	0, 0, 470, 471, 472, 0, 0, 475, 476, 477,
+	478, 0, 0, 481, 482, 483, 984, 985, 484, 485,
+	510, 511, 512, 486, 487, 488, 489, 490, 491, 492,
+	504, 505, 506, 507, 508, 509, 493, 494, 495, 496,
+	497, 498, 501, 0, 150, 1538, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 1634, 0, 0, 0, 0, 913, 999,
+	1657, 1658, 728, 0, 0, 799, 800, 0, 418, 419,
+	798, 798, 738, 780, 0, 798, 742, 781, 743, 745,
+	744, 746, 759, 760, 798, 749, 796, 797, 750, 751,
+	752, 753, 754, 755, 756, 776, 761, 762, 763, 802,
+	0, 806, 807, 777, 778, 0, 788, 0, 0, 0,
+	822, 823, 0, 830, 854, 852, 853, 855, 847, 848,
+	849, 850, 0, 856, 0, 0, 872, 99, 877, 878,
+	879, 880, 892, 885, 1159, 1017, 1018, 1019, 0, 1021,
+	1027, 0, 1142, 1144, 1025, 1026, 1029, 0, 0, 0,
+	1023, 1034, 1154, 1155, 1156, 0, 0, 0, 0, 0,
+	1038, 1042, 1047, 1048, 1049, 1050, 1051, 0, 1052, 0,
+	1055, 1056, 1057, 1058, 1059, 1060, 1066, 1455, 1456, 1457,
+	1085, 305, 306, 0, 1086, 0, 0, 0, 0, 0,
+	0, 0, 0, 1402, 1403, 1404, 1405, 1406, 1407, 1408,
+	1409, 1410, 1411, 1412, 1413, 1414, 1415, 1416, 1417, 1418,
+	1419, 1420, 1421, 1158, 0, 1645, 0, 0, 0, 1485,
+	1482, 0, 0, 0, 1441, 1443, 0, 0, 0, 905,
+	906, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 1422, 1423,
+	1424, 1425, 1426, 1427, 1428, 1429, 1430, 1431, 1432, 1433,
+	1434, 1435, 1436, 1437, 1438, 1439, 0, 0, 1458, 0,
+	0, 0, 0, 0, 0, 0, 1478, 0, 1091, 1092,
+	1093, 0, 0, 0, 0, 0, 0, 1220, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -9643,151 +9643,151 @@ var yyDef = [...]int{
 	146, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 1365, 1366, 1367, 1368, 41, 0, 0,
-	0, 0, 0, 0, 0, 1488, 0, -2, -2, 0,
+	0, 0, 0, 1366, 1367, 1368, 1369, 41, 0, 0,
+	0, 0, 0, 0, 0, 1489, 0, -2, -2, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 1390, 0, 0, 0, 0, 0, 0, 1614,
-	0, 0, 861, 862, 864, 0, 1000, 0, 981, 0,
-	0, 867, 0, 908, 0, 911, 60, 62, 917, 918,
-	0, 939, 928, 916, 56, 51, 0, 0, 958, 0,
-	0, 1557, 1560, 1561, 378, 1583, 0, 387, 387, 384,
-	1518, 1519, 0, 1511, 1513, 1514, 81, 936, 932, 0,
-	1014, 0, 0, 995, 0, 942, 944, 945, 946, 978,
-	0, 949, 950, 0, 0, 0, 0, 0, 101, 997,
+	0, 0, 1391, 0, 0, 0, 0, 0, 0, 1615,
+	0, 0, 862, 863, 865, 0, 1001, 0, 982, 0,
+	0, 868, 0, 909, 0, 912, 60, 62, 918, 919,
+	0, 940, 929, 917, 56, 51, 0, 0, 959, 0,
+	0, 1558, 1561, 1562, 379, 1584, 0, 388, 388, 385,
+	1519, 1520, 0, 1512, 1514, 1515, 81, 937, 933, 0,
+	1015, 0, 0, 996, 0, 943, 945, 946, 947, 979,
+	0, 950, 951, 0, 0, 0, 0, 0, 101, 998,
 	107, 0, 115, 0, 0, 120, 121, 108, 109, 110,
-	111, 0, 613, -2, 464, 182, 184, 185, 186, 177,
-	-2, 376, 374, 375, 314, 378, 378, 340, 341, 342,
-	343, 344, 345, 0, 352, 0, 333, 334, 335, 336,
-	325, 0, 326, 327, 328, 368, 0, 329, 330, 0,
-	331, 431, 0, 1520, 394, 395, 397, 405, 0, 400,
-	401, 0, 405, 405, 0, 426, 427, 0, 1512, 1537,
-	0, 0, 1646, 1645, 1645, 1645, 155, 0, 170, 171,
-	172, 173, 174, 175, 649, 0, 0, 625, 647, 648,
-	168, 0, 0, 178, 520, 519, 0, 681, 0, 429,
-	0, 0, 423, 423, 408, 409, 561, 0, 0, 656,
-	657, 658, 659, 0, 0, 0, 547, 458, 0, 548,
-	549, 518, 520, 0, 0, 389, 472, 473, 478, 479,
-	498, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 596, 597, 599, 602, 604, 522, 608,
-	610, 0, 598, 601, 603, 605, 522, 609, 611, 1534,
-	1535, 1536, 0, 0, 719, 0, 0, 455, 97, 1634,
-	724, 728, 729, 794, 747, 781, 794, 739, 746, 769,
-	783, 785, 819, 820, 825, 833, 834, 835, 875, 0,
-	0, 0, 0, 883, 0, 0, 1027, 1142, 1144, 1029,
-	1030, 1031, 1034, 0, 1038, 1042, 0, 0, 0, 0,
-	0, 1089, 1087, 1488, 0, 0, 0, 1138, 0, 0,
-	1161, 1162, 0, 0, 0, 0, 1482, 0, 0, 1169,
-	0, 1443, 1119, 0, 0, 0, 0, 0, 1119, 1119,
-	1119, 1119, 1119, 1119, 1119, 1119, 1119, 1119, 1506, 1196,
-	0, 0, 0, 0, 0, 1201, 1202, 1203, 1119, 0,
-	1206, 1207, 0, 1209, 0, 1210, 0, 0, 0, 0,
-	1217, 1218, 1220, 0, 0, 1223, 1224, 0, 1226, 0,
-	1228, 1229, 1230, 1231, 1232, 1233, 0, 1235, 0, 1237,
-	1238, 1239, 0, 1241, 0, 1243, 1244, 0, 1246, 0,
-	1248, 0, 1251, 0, 1254, 0, 1257, 0, 1260, 0,
-	1263, 0, 1266, 0, 1269, 0, 1272, 0, 1275, 0,
-	1278, 0, 1281, 0, 1284, 0, 1287, 0, 1290, 0,
-	1293, 0, 1296, 1297, 1298, 0, 1300, 0, 1302, 0,
-	1305, 1306, 0, 1308, 0, 1311, 0, 1314, 0, 0,
-	1315, 0, 0, 0, 1319, 0, 0, 0, 0, 1328,
-	1329, 1330, 1331, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 1342, 1343, 1344, 1345, 1346, 1347, 0,
-	1349, 0, 1120, 0, 0, 1120, 0, 0, 0, 0,
-	0, 1159, 1643, 0, 1444, 1445, 1446, 1447, 1448, 0,
-	0, 0, 0, 0, 0, 1388, 1389, 1391, 0, 0,
-	1394, 0, 1396, 0, 1615, 860, 863, 865, 952, 1001,
-	1002, 0, 0, 0, 0, 982, 1642, 906, 907, 910,
-	960, 0, 1492, 0, 0, 939, 1014, 0, 940, 0,
-	53, 955, 0, 1607, 1611, 1565, 1564, 1577, 1590, 387,
-	387, 381, 382, 388, 383, 385, 386, 1510, 0, 1515,
-	0, 1604, 0, 893, 1593, 0, 0, 0, 0, 0,
-	0, 0, 0, 985, 0, 0, 988, 0, 0, 0,
-	0, 979, 950, 0, 951, 0, -2, 0, 0, 95,
-	96, 0, 0, 0, 118, 119, 0, 0, 125, 390,
-	391, 159, 168, 466, 183, 439, 0, 0, 310, 377,
-	337, 338, 339, 0, 362, 0, 0, 0, 0, 460,
-	131, 1524, 1523, 405, 405, 396, 0, 399, 0, 0,
-	0, 1647, 365, 428, 0, 149, 0, 0, 0, 0,
-	1636, 619, 0, 0, 626, 0, 0, 0, 529, 0,
-	540, 541, 0, 653, -2, 715, 393, 0, 407, 410,
-	967, 0, 0, 542, 0, 545, 546, 459, 520, 551,
-	552, 566, 553, 501, 502, 499, 0, 0, 1547, 1548,
-	1553, 1551, 1552, 136, 587, 589, 593, 588, 592, 0,
-	0, 0, 524, 0, 612, 524, 585, 0, 455, 1520,
-	0, 723, 456, 457, 797, 797, 870, 100, 0, 873,
-	0, 0, 0, 0, 1035, 1039, 1052, 1053, 1449, 1475,
-	364, 364, 1462, 364, 370, 1465, 364, 1467, 364, 1470,
-	364, 1473, 1474, 0, 0, 1082, 0, 0, 0, 0,
-	1168, 1485, 0, 0, 1179, 1118, 1119, 1119, 1119, 1119,
-	1119, 1185, 1186, 1187, 1188, 1189, 1190, 1191, 1192, 1193,
-	1194, 1479, 0, 0, 0, 1200, 0, 0, 1204, 0,
+	111, 0, 614, -2, 465, 182, 184, 185, 186, 177,
+	-2, 377, 375, 376, 315, 379, 379, 341, 342, 343,
+	344, 345, 346, 0, 353, 0, 334, 335, 336, 337,
+	326, 0, 327, 328, 329, 369, 0, 330, 331, 0,
+	332, 432, 0, 1521, 395, 396, 398, 406, 0, 401,
+	402, 0, 406, 406, 0, 427, 428, 0, 1513, 1538,
+	0, 0, 1647, 1646, 1646, 1646, 155, 0, 170, 171,
+	172, 173, 174, 175, 650, 0, 0, 626, 648, 649,
+	168, 0, 0, 178, 521, 520, 0, 682, 0, 430,
+	0, 0, 424, 424, 409, 410, 562, 0, 0, 657,
+	658, 659, 660, 0, 0, 0, 548, 459, 0, 549,
+	550, 519, 521, 0, 0, 390, 473, 474, 479, 480,
+	499, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 597, 598, 600, 603, 605, 523, 609,
+	611, 0, 599, 602, 604, 606, 523, 610, 612, 1535,
+	1536, 1537, 0, 0, 720, 0, 0, 456, 97, 1635,
+	725, 729, 730, 795, 748, 782, 795, 740, 747, 770,
+	784, 786, 820, 821, 826, 834, 835, 836, 876, 0,
+	0, 0, 0, 884, 0, 0, 1028, 1143, 1145, 1030,
+	1031, 1032, 1035, 0, 1039, 1043, 0, 0, 0, 0,
+	0, 1090, 1088, 1489, 0, 0, 0, 1139, 0, 0,
+	1162, 1163, 0, 0, 0, 0, 1483, 0, 0, 1170,
+	0, 1444, 1120, 0, 0, 0, 0, 0, 1120, 1120,
+	1120, 1120, 1120, 1120, 1120, 1120, 1120, 1120, 1507, 1197,
+	0, 0, 0, 0, 0, 1202, 1203, 1204, 1120, 0,
+	1207, 1208, 0, 1210, 0, 1211, 0, 0, 0, 0,
+	1218, 1219, 1221, 0, 0, 1224, 1225, 0, 1227, 0,
+	1229, 1230, 1231, 1232, 1233, 1234, 0, 1236, 0, 1238,
+	1239, 1240, 0, 1242, 0, 1244, 1245, 0, 1247, 0,
+	1249, 0, 1252, 0, 1255, 0, 1258, 0, 1261, 0,
+	1264, 0, 1267, 0, 1270, 0, 1273, 0, 1276, 0,
+	1279, 0, 1282, 0, 1285, 0, 1288, 0, 1291, 0,
+	1294, 0, 1297, 1298, 1299, 0, 1301, 0, 1303, 0,
+	1306, 1307, 0, 1309, 0, 1312, 0, 1315, 0, 0,
+	1316, 0, 0, 0, 1320, 0, 0, 0, 0, 1329,
+	1330, 1331, 1332, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 1343, 1344, 1345, 1346, 1347, 1348, 0,
+	1350, 0, 1121, 0, 0, 1121, 0, 0, 0, 0,
+	0, 1160, 1644, 0, 1445, 1446, 1447, 1448, 1449, 0,
+	0, 0, 0, 0, 0, 1389, 1390, 1392, 0, 0,
+	1395, 0, 1397, 0, 1616, 861, 864, 866, 953, 1002,
+	1003, 0, 0, 0, 0, 983, 1643, 907, 908, 911,
+	961, 0, 1493, 0, 0, 940, 1015, 0, 941, 0,
+	53, 956, 0, 1608, 1612, 1566, 1565, 1578, 1591, 388,
+	388, 382, 383, 389, 384, 386, 387, 1511, 0, 1516,
+	0, 1605, 0, 894, 1594, 0, 0, 0, 0, 0,
+	0, 0, 0, 986, 0, 0, 989, 0, 0, 0,
+	0, 980, 951, 0, 952, 0, -2, 0, 0, 95,
+	96, 0, 0, 0, 118, 119, 0, 0, 125, 391,
+	392, 159, 168, 467, 183, 440, 0, 0, 311, 378,
+	338, 339, 340, 0, 363, 0, 0, 0, 0, 461,
+	131, 1525, 1524, 406, 406, 397, 0, 400, 0, 0,
+	0, 1648, 366, 429, 0, 149, 0, 0, 0, 0,
+	1637, 620, 0, 0, 627, 0, 0, 0, 530, 0,
+	541, 542, 0, 654, -2, 716, 394, 0, 408, 411,
+	968, 0, 0, 543, 0, 546, 547, 460, 521, 552,
+	553, 567, 554, 502, 503, 500, 0, 0, 1548, 1549,
+	1554, 1552, 1553, 136, 588, 590, 594, 589, 593, 0,
+	0, 0, 525, 0, 613, 525, 586, 0, 456, 1521,
+	0, 724, 457, 458, 798, 798, 871, 100, 0, 874,
+	0, 0, 0, 0, 1036, 1040, 1053, 1054, 1450, 1476,
+	365, 365, 1463, 365, 371, 1466, 365, 1468, 365, 1471,
+	365, 1474, 1475, 0, 0, 1083, 0, 0, 0, 0,
+	1169, 1486, 0, 0, 1180, 1119, 1120, 1120, 1120, 1120,
+	1120, 1186, 1187, 1188, 1189, 1190, 1191, 1192, 1193, 1194,
+	1195, 1480, 0, 0, 0, 1201, 0, 0, 1205, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 147, 148,
-	0, 0, 0, 0, 0, 0, 1399, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 1113, 1117,
-	0, 1121, 1122, 0, 0, 1351, 0, 0, 1369, 0,
-	0, 0, 0, 0, 0, 0, 1489, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 1003, 1010, 0,
-	1010, 0, 1010, 0, 0, 0, 1629, 1630, 1493, 1494,
-	1014, 1495, 929, 941, 959, 1583, 0, 1576, 0, -2,
-	1585, 0, 0, 0, 1591, 379, 380, 933, 82, 1015,
-	86, 0, 1604, 1619, 0, 1601, 1608, 1612, 0, 0,
-	0, 1597, 0, 1014, 943, 974, 976, 0, 971, 986,
-	987, 989, 0, 991, 0, 993, 994, 954, 948, 0,
-	103, 0, 1014, 1014, 102, 0, 999, 122, 123, 124,
-	465, 187, 192, 0, 0, 0, 197, 0, 199, 0,
-	0, 0, 204, 205, 405, 405, 440, 0, 307, 309,
-	0, 0, 190, 378, 0, 378, 0, 369, 371, 0,
-	441, 461, 1521, 1522, 0, 0, 398, 402, 403, 404,
-	0, 151, 0, 0, 0, 622, 0, 650, 0, 0,
-	0, 0, 0, 0, 179, 521, 682, 683, 684, 685,
-	686, 687, 688, 689, 690, 0, 405, 0, 0, 0,
-	405, 405, 405, 0, 707, 392, 0, 0, 678, 675,
-	543, 0, 222, 223, 230, 231, 233, 0, 0, 0,
-	0, 0, 550, 954, 1538, 1539, 1540, 0, 1550, 1554,
-	139, 0, 0, 0, 0, 595, 600, 606, 0, 523,
-	607, 720, 721, 722, 98, 732, 738, 872, 892, 1023,
-	1036, 1040, 0, 0, 0, 0, 1476, 1460, 378, 1463,
-	1464, 1466, 1468, 1469, 1471, 1472, 1078, 1079, 1083, 0,
-	1165, 0, 1167, 0, 1483, 0, 1180, 1181, 1182, 1183,
-	1184, 1515, 0, 0, 0, 1199, 0, 0, 1119, 0,
-	1212, 1211, 1213, 0, 1215, 1216, 1221, 1222, 1225, 1227,
-	1234, 1236, 1240, 1242, 1245, 1247, 1249, 0, 1252, 0,
-	1255, 0, 1258, 0, 1261, 0, 1264, 0, 1267, 0,
-	1270, 0, 1273, 0, 1276, 0, 1279, 0, 1282, 0,
-	1285, 0, 1288, 0, 1291, 0, 1294, 0, 1299, 1301,
-	0, 1304, 1307, 1309, 0, 1312, 0, 1316, 0, 1318,
-	1320, 1321, 0, 0, 0, 1332, 1333, 1334, 1335, 1336,
-	1337, 1338, 1339, 1340, 1341, 1348, 0, 1111, 1350, 1123,
-	1124, 1129, 1353, 0, 0, 0, 1356, 0, 0, 0,
-	1360, 1160, 1371, 0, 1376, 0, 0, 1382, 0, 1386,
-	0, 1392, 1393, 1395, 1397, 0, 0, 0, 0, 0,
-	0, 0, 980, 961, 64, 1495, 1499, 0, 1570, 1568,
-	1568, 1578, 1579, 0, 0, 1586, 0, 0, 0, 0,
-	87, 0, 0, 1592, 0, 0, 1613, 0, 0, 0,
-	0, 104, 1506, 968, 975, 0, 0, 969, 0, 970,
-	990, 992, 947, 0, 1014, 1014, 93, 94, 0, 193,
+	0, 0, 0, 0, 0, 0, 1400, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 1114, 1118,
+	0, 1122, 1123, 0, 0, 1352, 0, 0, 1370, 0,
+	0, 0, 0, 0, 0, 0, 1490, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 1004, 1011, 0,
+	1011, 0, 1011, 0, 0, 0, 1630, 1631, 1494, 1495,
+	1015, 1496, 930, 942, 960, 1584, 0, 1577, 0, -2,
+	1586, 0, 0, 0, 1592, 380, 381, 934, 82, 1016,
+	86, 0, 1605, 1620, 0, 1602, 1609, 1613, 0, 0,
+	0, 1598, 0, 1015, 944, 975, 977, 0, 972, 987,
+	988, 990, 0, 992, 0, 994, 995, 955, 949, 0,
+	103, 0, 1015, 1015, 102, 0, 1000, 122, 123, 124,
+	466, 187, 192, 0, 0, 0, 197, 0, 199, 0,
+	0, 0, 204, 205, 406, 406, 441, 0, 308, 310,
+	0, 0, 190, 379, 0, 379, 0, 370, 372, 0,
+	442, 462, 1522, 1523, 0, 0, 399, 403, 404, 405,
+	0, 151, 0, 0, 0, 623, 0, 651, 0, 0,
+	0, 0, 0, 0, 179, 522, 683, 684, 685, 686,
+	687, 688, 689, 690, 691, 0, 406, 0, 0, 0,
+	406, 406, 406, 0, 708, 393, 0, 0, 679, 676,
+	544, 0, 223, 224, 231, 232, 234, 0, 0, 0,
+	0, 0, 551, 955, 1539, 1540, 1541, 0, 1551, 1555,
+	139, 0, 0, 0, 0, 596, 601, 607, 0, 524,
+	608, 721, 722, 723, 98, 733, 739, 873, 893, 1024,
+	1037, 1041, 0, 0, 0, 0, 1477, 1461, 379, 1464,
+	1465, 1467, 1469, 1470, 1472, 1473, 1079, 1080, 1084, 0,
+	1166, 0, 1168, 0, 1484, 0, 1181, 1182, 1183, 1184,
+	1185, 1516, 0, 0, 0, 1200, 0, 0, 1120, 0,
+	1213, 1212, 1214, 0, 1216, 1217, 1222, 1223, 1226, 1228,
+	1235, 1237, 1241, 1243, 1246, 1248, 1250, 0, 1253, 0,
+	1256, 0, 1259, 0, 1262, 0, 1265, 0, 1268, 0,
+	1271, 0, 1274, 0, 1277, 0, 1280, 0, 1283, 0,
+	1286, 0, 1289, 0, 1292, 0, 1295, 0, 1300, 1302,
+	0, 1305, 1308, 1310, 0, 1313, 0, 1317, 0, 1319,
+	1321, 1322, 0, 0, 0, 1333, 1334, 1335, 1336, 1337,
+	1338, 1339, 1340, 1341, 1342, 1349, 0, 1112, 1351, 1124,
+	1125, 1130, 1354, 0, 0, 0, 1357, 0, 0, 0,
+	1361, 1161, 1372, 0, 1377, 0, 0, 1383, 0, 1387,
+	0, 1393, 1394, 1396, 1398, 0, 0, 0, 0, 0,
+	0, 0, 981, 962, 64, 1496, 1500, 0, 1571, 1569,
+	1569, 1579, 1580, 0, 0, 1587, 0, 0, 0, 0,
+	87, 0, 0, 1593, 0, 0, 1614, 0, 0, 0,
+	0, 104, 1507, 969, 976, 0, 0, 970, 0, 971,
+	991, 993, 948, 0, 1015, 1015, 93, 94, 0, 193,
 	0, 195, 0, 198, 200, 201, 202, 208, 209, 210,
-	211, 203, 0, 0, 306, 308, 0, 0, 351, 363,
-	353, 0, 0, 1525, 1526, 1527, 1528, 1529, 1530, 1531,
-	1532, 954, 152, 153, 154, 614, 0, 624, 0, 956,
-	0, 617, 0, 532, 0, 0, 0, 405, 405, 405,
-	0, 0, 0, 0, 692, 0, 0, 655, 0, 663,
-	0, 0, 0, 234, 235, 0, 1549, 586, 0, 137,
-	138, 0, 0, 591, 525, 526, 1076, 0, 0, 0,
-	1077, 1461, 0, 0, 0, 0, 0, 1480, 0, 0,
-	0, 0, 1205, 1208, 0, 0, 0, 0, 0, 0,
+	211, 203, 0, 0, 307, 309, 0, 0, 352, 364,
+	354, 0, 0, 1526, 1527, 1528, 1529, 1530, 1531, 1532,
+	1533, 955, 152, 153, 154, 615, 0, 625, 0, 957,
+	0, 618, 0, 533, 0, 0, 0, 406, 406, 406,
+	0, 0, 0, 0, 693, 0, 0, 656, 0, 664,
+	0, 0, 0, 235, 236, 0, 1550, 587, 0, 137,
+	138, 0, 0, 592, 526, 527, 1077, 0, 0, 0,
+	1078, 1462, 0, 0, 0, 0, 0, 1481, 0, 0,
+	0, 0, 1206, 1209, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 1324, 0, 0, 0,
-	644, 645, 0, 1400, 1116, 1506, 0, 1120, 1130, 1131,
-	0, 1120, 1370, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 1011, 0, 0, 0, 962, 963,
-	0, 0, 0, 1000, 1499, 1504, 0, 0, 1573, 0,
-	1566, 1569, 1567, 1580, 0, 0, 1587, 0, 1589, 0,
-	1620, 1621, 1609, 1602, 893, 1596, 1599, 1601, 1598, 1515,
-	972, 0, 977, 0, 1506, 92, 0, 196, 0, 0,
+	0, 0, 0, 0, 0, 0, 1325, 0, 0, 0,
+	645, 646, 0, 1401, 1117, 1507, 0, 1121, 1131, 1132,
+	0, 1121, 1371, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 1012, 0, 0, 0, 963, 964,
+	0, 0, 0, 1001, 1500, 1505, 0, 0, 1574, 0,
+	1567, 1570, 1568, 1581, 0, 0, 1588, 0, 1590, 0,
+	1621, 1622, 1610, 1603, 894, 1597, 1600, 1602, 1599, 1516,
+	973, 0, 978, 0, 1507, 92, 0, 196, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -9801,41 +9801,41 @@ var yyDef = [...]int{
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 206,
-	207, 0, 0, 367, 372, 0, 0, 0, 615, 0,
-	957, 627, 618, 0, 705, 0, 709, 0, 0, 0,
-	712, 713, 714, 691, 0, 695, 433, 679, 676, 677,
-	544, 0, 140, 141, 0, 0, 0, 1450, 0, 1453,
-	1163, 1166, 1164, 0, 1195, 1197, 1198, 1458, 1459, 1214,
-	1250, 1253, 1256, 1259, 1262, 1265, 1268, 1271, 1274, 1277,
-	1280, 1283, 1286, 1289, 1292, 1295, 1303, 1310, 1313, 1317,
-	1322, 0, 1325, 0, 0, 1326, 0, 646, 1107, 0,
-	0, 1127, 1128, 0, 1355, 1357, 1358, 1359, 1372, 0,
-	1377, 1378, 0, 1383, 0, 1387, 1398, 0, 1005, 1012,
-	1013, 0, 1008, 0, 1009, 0, 953, 1504, 84, 1505,
-	1502, 0, 1500, 1497, 1562, 0, 1571, 1572, 1581, 1582,
-	1588, 0, 0, 1601, 0, 1595, 90, 0, 0, 0,
-	1515, 194, 0, 214, 0, 623, 0, 626, 616, 703,
-	704, 0, 716, 708, 710, 711, 693, -2, 1541, 0,
-	0, 0, 594, 1451, 0, 0, 1327, 0, 642, 643,
-	1115, 1108, 0, 1093, 1094, 1112, 1352, 1354, 0, 0,
-	0, 1004, 964, 965, 1006, 1007, 83, 0, 1501, 1135,
-	0, 1496, 0, 1574, 1575, 1605, 0, 1594, 1600, 973,
-	980, 0, 91, 446, 439, 1541, 0, 0, 0, 696,
-	697, 698, 699, 700, 701, 702, 583, 1543, 142, 143,
-	0, 513, 514, 515, 136, 0, 1170, 1323, 1109, 0,
-	0, 0, 0, 0, 1373, 0, 1379, 0, 1384, 0,
-	1503, 0, 0, 1498, 1603, 628, 0, 630, 0, -2,
-	434, 447, 0, 188, 215, 216, 0, 0, 219, 220,
-	221, 212, 213, 132, 0, 0, 717, 0, 1544, 1545,
-	0, 139, 0, 0, 1100, 1101, 1102, 1103, 1105, 0,
-	0, 0, 0, 1136, 1113, 629, 0, 0, 389, 0,
-	639, 435, 436, 0, 442, 443, 444, 445, 217, 218,
-	651, 0, 0, 512, 590, 1452, 0, 0, 1374, 0,
-	1380, 0, 1385, 0, 631, 632, 640, 0, 437, 0,
-	438, 0, 0, 0, 620, 0, 651, 1542, 1110, 1104,
-	1106, 0, 0, 1134, 0, 641, 637, 448, 450, 451,
-	0, 0, 449, 652, 621, 1375, 1381, 0, 452, 453,
-	454, 633, 634, 635, 636,
+	207, 0, 0, 368, 373, 0, 0, 0, 616, 0,
+	958, 628, 619, 0, 706, 0, 710, 0, 0, 0,
+	713, 714, 715, 692, 0, 696, 434, 680, 677, 678,
+	545, 0, 140, 141, 0, 0, 0, 1451, 0, 1454,
+	1164, 1167, 1165, 0, 1196, 1198, 1199, 1459, 1460, 1215,
+	1251, 1254, 1257, 1260, 1263, 1266, 1269, 1272, 1275, 1278,
+	1281, 1284, 1287, 1290, 1293, 1296, 1304, 1311, 1314, 1318,
+	1323, 0, 1326, 0, 0, 1327, 0, 647, 1108, 0,
+	0, 1128, 1129, 0, 1356, 1358, 1359, 1360, 1373, 0,
+	1378, 1379, 0, 1384, 0, 1388, 1399, 0, 1006, 1013,
+	1014, 0, 1009, 0, 1010, 0, 954, 1505, 84, 1506,
+	1503, 0, 1501, 1498, 1563, 0, 1572, 1573, 1582, 1583,
+	1589, 0, 0, 1602, 0, 1596, 90, 0, 0, 0,
+	1516, 194, 0, 214, 0, 624, 0, 627, 617, 704,
+	705, 0, 717, 709, 711, 712, 694, -2, 1542, 0,
+	0, 0, 595, 1452, 0, 0, 1328, 0, 643, 644,
+	1116, 1109, 0, 1094, 1095, 1113, 1353, 1355, 0, 0,
+	0, 1005, 965, 966, 1007, 1008, 83, 0, 1502, 1136,
+	0, 1497, 0, 1575, 1576, 1606, 0, 1595, 1601, 974,
+	981, 0, 91, 447, 440, 1542, 0, 0, 0, 697,
+	698, 699, 700, 701, 702, 703, 584, 1544, 142, 143,
+	0, 514, 515, 516, 136, 0, 1171, 1324, 1110, 0,
+	0, 0, 0, 0, 1374, 0, 1380, 0, 1385, 0,
+	1504, 0, 0, 1499, 1604, 629, 0, 631, 0, -2,
+	435, 448, 0, 188, 215, 216, 0, 0, 219, 0,
+	221, 222, 212, 213, 132, 0, 0, 718, 0, 1545,
+	1546, 0, 139, 0, 0, 1101, 1102, 1103, 1104, 1106,
+	0, 0, 0, 0, 1137, 1114, 630, 0, 0, 390,
+	0, 640, 436, 437, 0, 443, 444, 445, 446, 217,
+	218, 220, 652, 0, 0, 513, 591, 1453, 0, 0,
+	1375, 0, 1381, 0, 1386, 0, 632, 633, 641, 0,
+	438, 0, 439, 0, 0, 0, 621, 0, 652, 1543,
+	1111, 1105, 1107, 0, 0, 1135, 0, 642, 638, 449,
+	451, 452, 0, 0, 450, 653, 622, 1376, 1382, 0,
+	453, 454, 455, 634, 635, 636, 637,
 }
 
 var yyTok1 = [...]int{
@@ -11798,11 +11798,11 @@ yydefault:
 		}
 		yyVAL.union = yyLOCAL
 	case 220:
-		yyDollar = yyS[yypt-2 : yypt+1]
+		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL *ColumnTypeOptions
 //line sql.y:1640
 		{
-			yyDollar[1].columnTypeOptionsUnion().Invisible = ptr.Of(false)
+			yyDollar[1].columnTypeOptionsUnion().SRID = NewIntLiteral(yyDollar[3].str)
 			yyLOCAL = yyDollar[1].columnTypeOptionsUnion()
 		}
 		yyVAL.union = yyLOCAL
@@ -11811,669 +11811,670 @@ yydefault:
 		var yyLOCAL *ColumnTypeOptions
 //line sql.y:1645
 		{
-			yyDollar[1].columnTypeOptionsUnion().Invisible = ptr.Of(true)
+			yyDollar[1].columnTypeOptionsUnion().Invisible = ptr.Of(false)
 			yyLOCAL = yyDollar[1].columnTypeOptionsUnion()
 		}
 		yyVAL.union = yyLOCAL
 	case 222:
+		yyDollar = yyS[yypt-2 : yypt+1]
+		var yyLOCAL *ColumnTypeOptions
+//line sql.y:1650
+		{
+			yyDollar[1].columnTypeOptionsUnion().Invisible = ptr.Of(true)
+			yyLOCAL = yyDollar[1].columnTypeOptionsUnion()
+		}
+		yyVAL.union = yyLOCAL
+	case 223:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:1652
+//line sql.y:1657
 		{
 			yyLOCAL = yyDollar[1].exprUnion()
 		}
 		yyVAL.union = yyLOCAL
-	case 224:
+	case 225:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:1659
+//line sql.y:1664
 		{
 			yyLOCAL = &CurTimeFuncExpr{Name: NewIdentifierCI("current_timestamp"), Fsp: yyDollar[2].integerUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 225:
+	case 226:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:1663
+//line sql.y:1668
 		{
 			yyLOCAL = &CurTimeFuncExpr{Name: NewIdentifierCI("localtime"), Fsp: yyDollar[2].integerUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 226:
+	case 227:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:1667
+//line sql.y:1672
 		{
 			yyLOCAL = &CurTimeFuncExpr{Name: NewIdentifierCI("localtimestamp"), Fsp: yyDollar[2].integerUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 227:
+	case 228:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:1671
+//line sql.y:1676
 		{
 			yyLOCAL = &CurTimeFuncExpr{Name: NewIdentifierCI("utc_timestamp"), Fsp: yyDollar[2].integerUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 228:
+	case 229:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:1675
+//line sql.y:1680
 		{
 			yyLOCAL = &CurTimeFuncExpr{Name: NewIdentifierCI("now"), Fsp: yyDollar[2].integerUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 229:
+	case 230:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:1679
+//line sql.y:1684
 		{
 			yyLOCAL = &CurTimeFuncExpr{Name: NewIdentifierCI("sysdate"), Fsp: yyDollar[2].integerUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 232:
+	case 233:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:1689
+//line sql.y:1694
 		{
 			yyLOCAL = &NullVal{}
 		}
 		yyVAL.union = yyLOCAL
-	case 234:
+	case 235:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:1696
+//line sql.y:1701
 		{
 			yyLOCAL = yyDollar[2].exprUnion()
 		}
 		yyVAL.union = yyLOCAL
-	case 235:
+	case 236:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:1700
+//line sql.y:1705
 		{
 			yyLOCAL = &UnaryExpr{Operator: UMinusOp, Expr: yyDollar[2].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 236:
+	case 237:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:1706
+//line sql.y:1711
 		{
 			yyLOCAL = yyDollar[1].exprUnion()
 		}
 		yyVAL.union = yyLOCAL
-	case 237:
+	case 238:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:1710
+//line sql.y:1715
 		{
 			yyLOCAL = yyDollar[1].exprUnion()
 		}
 		yyVAL.union = yyLOCAL
-	case 238:
+	case 239:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:1714
+//line sql.y:1719
 		{
 			yyLOCAL = yyDollar[1].boolValUnion()
 		}
 		yyVAL.union = yyLOCAL
-	case 239:
+	case 240:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:1718
+//line sql.y:1723
 		{
 			yyLOCAL = NewHexLiteral(yyDollar[1].str)
 		}
 		yyVAL.union = yyLOCAL
-	case 240:
+	case 241:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:1722
+//line sql.y:1727
 		{
 			yyLOCAL = NewHexNumLiteral(yyDollar[1].str)
 		}
 		yyVAL.union = yyLOCAL
-	case 241:
+	case 242:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:1726
+//line sql.y:1731
 		{
 			yyLOCAL = NewBitLiteral(yyDollar[1].str)
 		}
 		yyVAL.union = yyLOCAL
-	case 242:
+	case 243:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:1730
+//line sql.y:1735
 		{
 			yyLOCAL = NewBitLiteral("0b" + yyDollar[1].str)
 		}
 		yyVAL.union = yyLOCAL
-	case 243:
+	case 244:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:1734
+//line sql.y:1739
 		{
 			yyLOCAL = parseBindVariable(yylex, yyDollar[1].str[1:])
 		}
 		yyVAL.union = yyLOCAL
-	case 244:
+	case 245:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:1738
+//line sql.y:1743
 		{
 			yyLOCAL = &IntroducerExpr{CharacterSet: yyDollar[1].str, Expr: NewBitLiteral("0b" + yyDollar[2].str)}
 		}
 		yyVAL.union = yyLOCAL
-	case 245:
+	case 246:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:1742
+//line sql.y:1747
 		{
 			yyLOCAL = &IntroducerExpr{CharacterSet: yyDollar[1].str, Expr: NewHexNumLiteral(yyDollar[2].str)}
 		}
 		yyVAL.union = yyLOCAL
-	case 246:
+	case 247:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:1746
+//line sql.y:1751
 		{
 			yyLOCAL = &IntroducerExpr{CharacterSet: yyDollar[1].str, Expr: NewBitLiteral(yyDollar[2].str)}
 		}
 		yyVAL.union = yyLOCAL
-	case 247:
+	case 248:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:1750
+//line sql.y:1755
 		{
 			yyLOCAL = &IntroducerExpr{CharacterSet: yyDollar[1].str, Expr: NewHexLiteral(yyDollar[2].str)}
 		}
 		yyVAL.union = yyLOCAL
-	case 248:
+	case 249:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:1754
+//line sql.y:1759
 		{
 			arg := parseBindVariable(yylex, yyDollar[2].str[1:])
 			yyLOCAL = &IntroducerExpr{CharacterSet: yyDollar[1].str, Expr: arg}
 		}
 		yyVAL.union = yyLOCAL
-	case 249:
+	case 250:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:1759
+//line sql.y:1764
 		{
 			yyLOCAL = NewDateLiteral(yyDollar[2].str)
 		}
 		yyVAL.union = yyLOCAL
-	case 250:
+	case 251:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:1763
+//line sql.y:1768
 		{
 			yyLOCAL = NewTimeLiteral(yyDollar[2].str)
 		}
 		yyVAL.union = yyLOCAL
-	case 251:
+	case 252:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:1767
+//line sql.y:1772
 		{
 			yyLOCAL = NewTimestampLiteral(yyDollar[2].str)
 		}
 		yyVAL.union = yyLOCAL
-	case 252:
+	case 253:
 		yyDollar = yyS[yypt-1 : yypt+1]
-//line sql.y:1773
+//line sql.y:1778
 		{
 			yyVAL.str = Armscii8Str
 		}
-	case 253:
+	case 254:
 		yyDollar = yyS[yypt-1 : yypt+1]
-//line sql.y:1777
+//line sql.y:1782
 		{
 			yyVAL.str = ASCIIStr
 		}
-	case 254:
+	case 255:
 		yyDollar = yyS[yypt-1 : yypt+1]
-//line sql.y:1781
+//line sql.y:1786
 		{
 			yyVAL.str = Big5Str
 		}
-	case 255:
+	case 256:
 		yyDollar = yyS[yypt-1 : yypt+1]
-//line sql.y:1785
+//line sql.y:1790
 		{
 			yyVAL.str = UBinaryStr
 		}
-	case 256:
+	case 257:
 		yyDollar = yyS[yypt-1 : yypt+1]
-//line sql.y:1789
+//line sql.y:1794
 		{
 			yyVAL.str = Cp1250Str
 		}
-	case 257:
+	case 258:
 		yyDollar = yyS[yypt-1 : yypt+1]
-//line sql.y:1793
+//line sql.y:1798
 		{
 			yyVAL.str = Cp1251Str
 		}
-	case 258:
+	case 259:
 		yyDollar = yyS[yypt-1 : yypt+1]
-//line sql.y:1797
+//line sql.y:1802
 		{
 			yyVAL.str = Cp1256Str
 		}
-	case 259:
+	case 260:
 		yyDollar = yyS[yypt-1 : yypt+1]
-//line sql.y:1801
+//line sql.y:1806
 		{
 			yyVAL.str = Cp1257Str
 		}
-	case 260:
+	case 261:
 		yyDollar = yyS[yypt-1 : yypt+1]
-//line sql.y:1805
+//line sql.y:1810
 		{
 			yyVAL.str = Cp850Str
 		}
-	case 261:
+	case 262:
 		yyDollar = yyS[yypt-1 : yypt+1]
-//line sql.y:1809
+//line sql.y:1814
 		{
 			yyVAL.str = Cp852Str
 		}
-	case 262:
+	case 263:
 		yyDollar = yyS[yypt-1 : yypt+1]
-//line sql.y:1813
+//line sql.y:1818
 		{
 			yyVAL.str = Cp866Str
 		}
-	case 263:
+	case 264:
 		yyDollar = yyS[yypt-1 : yypt+1]
-//line sql.y:1817
+//line sql.y:1822
 		{
 			yyVAL.str = Cp932Str
 		}
-	case 264:
+	case 265:
 		yyDollar = yyS[yypt-1 : yypt+1]
-//line sql.y:1821
+//line sql.y:1826
 		{
 			yyVAL.str = Dec8Str
 		}
-	case 265:
+	case 266:
 		yyDollar = yyS[yypt-1 : yypt+1]
-//line sql.y:1825
+//line sql.y:1830
 		{
 			yyVAL.str = EucjpmsStr
 		}
-	case 266:
+	case 267:
 		yyDollar = yyS[yypt-1 : yypt+1]
-//line sql.y:1829
+//line sql.y:1834
 		{
 			yyVAL.str = EuckrStr
 		}
-	case 267:
+	case 268:
 		yyDollar = yyS[yypt-1 : yypt+1]
-//line sql.y:1833
+//line sql.y:1838
 		{
 			yyVAL.str = Gb18030Str
 		}
-	case 268:
+	case 269:
 		yyDollar = yyS[yypt-1 : yypt+1]
-//line sql.y:1837
+//line sql.y:1842
 		{
 			yyVAL.str = Gb2312Str
 		}
-	case 269:
+	case 270:
 		yyDollar = yyS[yypt-1 : yypt+1]
-//line sql.y:1841
+//line sql.y:1846
 		{
 			yyVAL.str = GbkStr
 		}
-	case 270:
+	case 271:
 		yyDollar = yyS[yypt-1 : yypt+1]
-//line sql.y:1845
+//line sql.y:1850
 		{
 			yyVAL.str = Geostd8Str
 		}
-	case 271:
+	case 272:
 		yyDollar = yyS[yypt-1 : yypt+1]
-//line sql.y:1849
+//line sql.y:1854
 		{
 			yyVAL.str = GreekStr
 		}
-	case 272:
+	case 273:
 		yyDollar = yyS[yypt-1 : yypt+1]
-//line sql.y:1853
+//line sql.y:1858
 		{
 			yyVAL.str = HebrewStr
 		}
-	case 273:
+	case 274:
 		yyDollar = yyS[yypt-1 : yypt+1]
-//line sql.y:1857
+//line sql.y:1862
 		{
 			yyVAL.str = Hp8Str
 		}
-	case 274:
+	case 275:
 		yyDollar = yyS[yypt-1 : yypt+1]
-//line sql.y:1861
+//line sql.y:1866
 		{
 			yyVAL.str = Keybcs2Str
 		}
-	case 275:
+	case 276:
 		yyDollar = yyS[yypt-1 : yypt+1]
-//line sql.y:1865
+//line sql.y:1870
 		{
 			yyVAL.str = Koi8rStr
 		}
-	case 276:
+	case 277:
 		yyDollar = yyS[yypt-1 : yypt+1]
-//line sql.y:1869
+//line sql.y:1874
 		{
 			yyVAL.str = Koi8uStr
 		}
-	case 277:
+	case 278:
 		yyDollar = yyS[yypt-1 : yypt+1]
-//line sql.y:1873
+//line sql.y:1878
 		{
 			yyVAL.str = Latin1Str
 		}
-	case 278:
+	case 279:
 		yyDollar = yyS[yypt-1 : yypt+1]
-//line sql.y:1877
+//line sql.y:1882
 		{
 			yyVAL.str = Latin2Str
 		}
-	case 279:
+	case 280:
 		yyDollar = yyS[yypt-1 : yypt+1]
-//line sql.y:1881
+//line sql.y:1886
 		{
 			yyVAL.str = Latin5Str
 		}
-	case 280:
+	case 281:
 		yyDollar = yyS[yypt-1 : yypt+1]
-//line sql.y:1885
+//line sql.y:1890
 		{
 			yyVAL.str = Latin7Str
 		}
-	case 281:
+	case 282:
 		yyDollar = yyS[yypt-1 : yypt+1]
-//line sql.y:1889
+//line sql.y:1894
 		{
 			yyVAL.str = MacceStr
 		}
-	case 282:
+	case 283:
 		yyDollar = yyS[yypt-1 : yypt+1]
-//line sql.y:1893
+//line sql.y:1898
 		{
 			yyVAL.str = MacromanStr
 		}
-	case 283:
+	case 284:
 		yyDollar = yyS[yypt-1 : yypt+1]
-//line sql.y:1897
+//line sql.y:1902
 		{
 			yyVAL.str = SjisStr
 		}
-	case 284:
+	case 285:
 		yyDollar = yyS[yypt-1 : yypt+1]
-//line sql.y:1901
+//line sql.y:1906
 		{
 			yyVAL.str = Swe7Str
 		}
-	case 285:
+	case 286:
 		yyDollar = yyS[yypt-1 : yypt+1]
-//line sql.y:1905
+//line sql.y:1910
 		{
 			yyVAL.str = Tis620Str
 		}
-	case 286:
+	case 287:
 		yyDollar = yyS[yypt-1 : yypt+1]
-//line sql.y:1909
+//line sql.y:1914
 		{
 			yyVAL.str = Ucs2Str
 		}
-	case 287:
+	case 288:
 		yyDollar = yyS[yypt-1 : yypt+1]
-//line sql.y:1913
+//line sql.y:1918
 		{
 			yyVAL.str = UjisStr
 		}
-	case 288:
+	case 289:
 		yyDollar = yyS[yypt-1 : yypt+1]
-//line sql.y:1917
+//line sql.y:1922
 		{
 			yyVAL.str = Utf16Str
 		}
-	case 289:
+	case 290:
 		yyDollar = yyS[yypt-1 : yypt+1]
-//line sql.y:1921
+//line sql.y:1926
 		{
 			yyVAL.str = Utf16leStr
 		}
-	case 290:
+	case 291:
 		yyDollar = yyS[yypt-1 : yypt+1]
-//line sql.y:1925
+//line sql.y:1930
 		{
 			yyVAL.str = Utf32Str
 		}
-	case 291:
+	case 292:
 		yyDollar = yyS[yypt-1 : yypt+1]
-//line sql.y:1929
+//line sql.y:1934
 		{
 			yyVAL.str = Utf8mb3Str
 		}
-	case 292:
+	case 293:
 		yyDollar = yyS[yypt-1 : yypt+1]
-//line sql.y:1933
+//line sql.y:1938
 		{
 			yyVAL.str = Utf8mb4Str
 		}
-	case 293:
+	case 294:
 		yyDollar = yyS[yypt-1 : yypt+1]
-//line sql.y:1937
+//line sql.y:1942
 		{
 			yyVAL.str = Utf8mb3Str
 		}
-	case 296:
+	case 297:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:1947
+//line sql.y:1952
 		{
 			yyLOCAL = NewIntLiteral(yyDollar[1].str)
 		}
 		yyVAL.union = yyLOCAL
-	case 297:
+	case 298:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:1951
+//line sql.y:1956
 		{
 			yyLOCAL = NewFloatLiteral(yyDollar[1].str)
 		}
 		yyVAL.union = yyLOCAL
-	case 298:
+	case 299:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:1955
+//line sql.y:1960
 		{
 			yyLOCAL = NewDecimalLiteral(yyDollar[1].str)
 		}
 		yyVAL.union = yyLOCAL
-	case 299:
+	case 300:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:1961
+//line sql.y:1966
 		{
 			yyLOCAL = yyDollar[1].exprUnion()
 		}
 		yyVAL.union = yyLOCAL
-	case 300:
+	case 301:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:1965
+//line sql.y:1970
 		{
 			yyLOCAL = AppendString(yyDollar[1].exprUnion(), yyDollar[2].str)
 		}
 		yyVAL.union = yyLOCAL
-	case 301:
+	case 302:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:1971
+//line sql.y:1976
 		{
 			yyLOCAL = NewStrLiteral(yyDollar[1].str)
 		}
 		yyVAL.union = yyLOCAL
-	case 302:
+	case 303:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:1975
+//line sql.y:1980
 		{
 			yyLOCAL = &UnaryExpr{Operator: NStringOp, Expr: NewStrLiteral(yyDollar[1].str)}
 		}
 		yyVAL.union = yyLOCAL
-	case 303:
+	case 304:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:1979
+//line sql.y:1984
 		{
 			yyLOCAL = &IntroducerExpr{CharacterSet: yyDollar[1].str, Expr: NewStrLiteral(yyDollar[2].str)}
 		}
 		yyVAL.union = yyLOCAL
-	case 304:
+	case 305:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:1985
+//line sql.y:1990
 		{
 			yyLOCAL = yyDollar[1].exprUnion()
 		}
 		yyVAL.union = yyLOCAL
-	case 305:
+	case 306:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:1989
+//line sql.y:1994
 		{
 			yyLOCAL = parseBindVariable(yylex, yyDollar[1].str[1:])
 		}
 		yyVAL.union = yyLOCAL
-	case 306:
+	case 307:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL ColumnKeyOption
-//line sql.y:1995
+//line sql.y:2000
 		{
 			yyLOCAL = ColKeyPrimary
 		}
 		yyVAL.union = yyLOCAL
-	case 307:
+	case 308:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL ColumnKeyOption
-//line sql.y:1999
+//line sql.y:2004
 		{
 			yyLOCAL = ColKeyUnique
 		}
 		yyVAL.union = yyLOCAL
-	case 308:
+	case 309:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL ColumnKeyOption
-//line sql.y:2003
+//line sql.y:2008
 		{
 			yyLOCAL = ColKeyUniqueKey
 		}
 		yyVAL.union = yyLOCAL
-	case 309:
+	case 310:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL ColumnKeyOption
-//line sql.y:2007
+//line sql.y:2012
 		{
 			yyLOCAL = ColKey
 		}
 		yyVAL.union = yyLOCAL
-	case 310:
+	case 311:
 		yyDollar = yyS[yypt-3 : yypt+1]
-//line sql.y:2013
+//line sql.y:2018
 		{
 			yyVAL.columnType = yyDollar[1].columnType
 			yyVAL.columnType.Unsigned = yyDollar[2].booleanUnion()
 			yyVAL.columnType.Zerofill = yyDollar[3].booleanUnion()
 		}
-	case 314:
-		yyDollar = yyS[yypt-2 : yypt+1]
-//line sql.y:2024
-		{
-			yyVAL.columnType = yyDollar[1].columnType
-			yyVAL.columnType.Length = yyDollar[2].intPtrUnion()
-		}
 	case 315:
-		yyDollar = yyS[yypt-1 : yypt+1]
+		yyDollar = yyS[yypt-2 : yypt+1]
 //line sql.y:2029
 		{
 			yyVAL.columnType = yyDollar[1].columnType
+			yyVAL.columnType.Length = yyDollar[2].intPtrUnion()
 		}
 	case 316:
 		yyDollar = yyS[yypt-1 : yypt+1]
-//line sql.y:2035
+//line sql.y:2034
 		{
-			yyVAL.columnType = &ColumnType{Type: string(yyDollar[1].str)}
+			yyVAL.columnType = yyDollar[1].columnType
 		}
 	case 317:
 		yyDollar = yyS[yypt-1 : yypt+1]
-//line sql.y:2039
+//line sql.y:2040
 		{
 			yyVAL.columnType = &ColumnType{Type: string(yyDollar[1].str)}
 		}
 	case 318:
 		yyDollar = yyS[yypt-1 : yypt+1]
-//line sql.y:2043
+//line sql.y:2044
 		{
 			yyVAL.columnType = &ColumnType{Type: string(yyDollar[1].str)}
 		}
 	case 319:
 		yyDollar = yyS[yypt-1 : yypt+1]
-//line sql.y:2047
+//line sql.y:2048
 		{
 			yyVAL.columnType = &ColumnType{Type: string(yyDollar[1].str)}
 		}
 	case 320:
 		yyDollar = yyS[yypt-1 : yypt+1]
-//line sql.y:2051
+//line sql.y:2052
 		{
 			yyVAL.columnType = &ColumnType{Type: string(yyDollar[1].str)}
 		}
 	case 321:
 		yyDollar = yyS[yypt-1 : yypt+1]
-//line sql.y:2055
+//line sql.y:2056
 		{
 			yyVAL.columnType = &ColumnType{Type: string(yyDollar[1].str)}
 		}
 	case 322:
 		yyDollar = yyS[yypt-1 : yypt+1]
-//line sql.y:2059
+//line sql.y:2060
 		{
 			yyVAL.columnType = &ColumnType{Type: string(yyDollar[1].str)}
 		}
 	case 323:
 		yyDollar = yyS[yypt-1 : yypt+1]
-//line sql.y:2063
+//line sql.y:2064
 		{
 			yyVAL.columnType = &ColumnType{Type: string(yyDollar[1].str)}
 		}
 	case 324:
 		yyDollar = yyS[yypt-1 : yypt+1]
-//line sql.y:2067
+//line sql.y:2068
 		{
 			yyVAL.columnType = &ColumnType{Type: string(yyDollar[1].str)}
 		}
 	case 325:
-		yyDollar = yyS[yypt-2 : yypt+1]
-//line sql.y:2073
+		yyDollar = yyS[yypt-1 : yypt+1]
+//line sql.y:2072
 		{
 			yyVAL.columnType = &ColumnType{Type: string(yyDollar[1].str)}
-			yyVAL.columnType.Length = yyDollar[2].LengthScaleOption.Length
-			yyVAL.columnType.Scale = yyDollar[2].LengthScaleOption.Scale
 		}
 	case 326:
 		yyDollar = yyS[yypt-2 : yypt+1]
-//line sql.y:2079
+//line sql.y:2078
 		{
 			yyVAL.columnType = &ColumnType{Type: string(yyDollar[1].str)}
 			yyVAL.columnType.Length = yyDollar[2].LengthScaleOption.Length
@@ -12481,7 +12482,7 @@ yydefault:
 		}
 	case 327:
 		yyDollar = yyS[yypt-2 : yypt+1]
-//line sql.y:2085
+//line sql.y:2084
 		{
 			yyVAL.columnType = &ColumnType{Type: string(yyDollar[1].str)}
 			yyVAL.columnType.Length = yyDollar[2].LengthScaleOption.Length
@@ -12489,7 +12490,7 @@ yydefault:
 		}
 	case 328:
 		yyDollar = yyS[yypt-2 : yypt+1]
-//line sql.y:2091
+//line sql.y:2090
 		{
 			yyVAL.columnType = &ColumnType{Type: string(yyDollar[1].str)}
 			yyVAL.columnType.Length = yyDollar[2].LengthScaleOption.Length
@@ -12497,7 +12498,7 @@ yydefault:
 		}
 	case 329:
 		yyDollar = yyS[yypt-2 : yypt+1]
-//line sql.y:2097
+//line sql.y:2096
 		{
 			yyVAL.columnType = &ColumnType{Type: string(yyDollar[1].str)}
 			yyVAL.columnType.Length = yyDollar[2].LengthScaleOption.Length
@@ -12505,7 +12506,7 @@ yydefault:
 		}
 	case 330:
 		yyDollar = yyS[yypt-2 : yypt+1]
-//line sql.y:2103
+//line sql.y:2102
 		{
 			yyVAL.columnType = &ColumnType{Type: string(yyDollar[1].str)}
 			yyVAL.columnType.Length = yyDollar[2].LengthScaleOption.Length
@@ -12513,1763 +12514,1771 @@ yydefault:
 		}
 	case 331:
 		yyDollar = yyS[yypt-2 : yypt+1]
-//line sql.y:2109
+//line sql.y:2108
 		{
 			yyVAL.columnType = &ColumnType{Type: string(yyDollar[1].str)}
 			yyVAL.columnType.Length = yyDollar[2].LengthScaleOption.Length
 			yyVAL.columnType.Scale = yyDollar[2].LengthScaleOption.Scale
 		}
 	case 332:
-		yyDollar = yyS[yypt-1 : yypt+1]
-//line sql.y:2117
+		yyDollar = yyS[yypt-2 : yypt+1]
+//line sql.y:2114
 		{
 			yyVAL.columnType = &ColumnType{Type: string(yyDollar[1].str)}
+			yyVAL.columnType.Length = yyDollar[2].LengthScaleOption.Length
+			yyVAL.columnType.Scale = yyDollar[2].LengthScaleOption.Scale
 		}
 	case 333:
-		yyDollar = yyS[yypt-2 : yypt+1]
-//line sql.y:2121
+		yyDollar = yyS[yypt-1 : yypt+1]
+//line sql.y:2122
 		{
-			yyVAL.columnType = &ColumnType{Type: string(yyDollar[1].str), Length: yyDollar[2].intPtrUnion()}
+			yyVAL.columnType = &ColumnType{Type: string(yyDollar[1].str)}
 		}
 	case 334:
 		yyDollar = yyS[yypt-2 : yypt+1]
-//line sql.y:2125
+//line sql.y:2126
 		{
 			yyVAL.columnType = &ColumnType{Type: string(yyDollar[1].str), Length: yyDollar[2].intPtrUnion()}
 		}
 	case 335:
 		yyDollar = yyS[yypt-2 : yypt+1]
-//line sql.y:2129
+//line sql.y:2130
 		{
 			yyVAL.columnType = &ColumnType{Type: string(yyDollar[1].str), Length: yyDollar[2].intPtrUnion()}
 		}
 	case 336:
 		yyDollar = yyS[yypt-2 : yypt+1]
-//line sql.y:2133
+//line sql.y:2134
 		{
 			yyVAL.columnType = &ColumnType{Type: string(yyDollar[1].str), Length: yyDollar[2].intPtrUnion()}
 		}
 	case 337:
+		yyDollar = yyS[yypt-2 : yypt+1]
+//line sql.y:2138
+		{
+			yyVAL.columnType = &ColumnType{Type: string(yyDollar[1].str), Length: yyDollar[2].intPtrUnion()}
+		}
+	case 338:
 		yyDollar = yyS[yypt-3 : yypt+1]
-//line sql.y:2139
+//line sql.y:2144
 		{
 			yyVAL.columnType = &ColumnType{Type: string(yyDollar[1].str), Length: yyDollar[2].intPtrUnion(), Charset: yyDollar[3].columnCharset}
 		}
-	case 338:
+	case 339:
 		yyDollar = yyS[yypt-3 : yypt+1]
-//line sql.y:2143
+//line sql.y:2148
 		{
 			// CHAR BYTE is an alias for binary. See also:
 			// https://dev.mysql.com/doc/refman/8.0/en/string-type-syntax.html
 			yyVAL.columnType = &ColumnType{Type: "binary", Length: yyDollar[2].intPtrUnion()}
 		}
-	case 339:
+	case 340:
 		yyDollar = yyS[yypt-3 : yypt+1]
-//line sql.y:2149
+//line sql.y:2154
 		{
 			yyVAL.columnType = &ColumnType{Type: string(yyDollar[1].str), Length: yyDollar[2].intPtrUnion(), Charset: yyDollar[3].columnCharset}
 		}
-	case 340:
-		yyDollar = yyS[yypt-2 : yypt+1]
-//line sql.y:2153
-		{
-			yyVAL.columnType = &ColumnType{Type: string(yyDollar[1].str), Length: yyDollar[2].intPtrUnion()}
-		}
 	case 341:
 		yyDollar = yyS[yypt-2 : yypt+1]
-//line sql.y:2157
+//line sql.y:2158
 		{
 			yyVAL.columnType = &ColumnType{Type: string(yyDollar[1].str), Length: yyDollar[2].intPtrUnion()}
 		}
 	case 342:
 		yyDollar = yyS[yypt-2 : yypt+1]
-//line sql.y:2161
+//line sql.y:2162
 		{
-			yyVAL.columnType = &ColumnType{Type: string(yyDollar[1].str), Charset: yyDollar[2].columnCharset}
+			yyVAL.columnType = &ColumnType{Type: string(yyDollar[1].str), Length: yyDollar[2].intPtrUnion()}
 		}
 	case 343:
 		yyDollar = yyS[yypt-2 : yypt+1]
-//line sql.y:2165
+//line sql.y:2166
 		{
 			yyVAL.columnType = &ColumnType{Type: string(yyDollar[1].str), Charset: yyDollar[2].columnCharset}
 		}
 	case 344:
 		yyDollar = yyS[yypt-2 : yypt+1]
-//line sql.y:2169
+//line sql.y:2170
 		{
 			yyVAL.columnType = &ColumnType{Type: string(yyDollar[1].str), Charset: yyDollar[2].columnCharset}
 		}
 	case 345:
 		yyDollar = yyS[yypt-2 : yypt+1]
-//line sql.y:2173
+//line sql.y:2174
 		{
 			yyVAL.columnType = &ColumnType{Type: string(yyDollar[1].str), Charset: yyDollar[2].columnCharset}
 		}
 	case 346:
-		yyDollar = yyS[yypt-1 : yypt+1]
-//line sql.y:2177
+		yyDollar = yyS[yypt-2 : yypt+1]
+//line sql.y:2178
 		{
-			yyVAL.columnType = &ColumnType{Type: string(yyDollar[1].str)}
+			yyVAL.columnType = &ColumnType{Type: string(yyDollar[1].str), Charset: yyDollar[2].columnCharset}
 		}
 	case 347:
 		yyDollar = yyS[yypt-1 : yypt+1]
-//line sql.y:2181
+//line sql.y:2182
 		{
 			yyVAL.columnType = &ColumnType{Type: string(yyDollar[1].str)}
 		}
 	case 348:
 		yyDollar = yyS[yypt-1 : yypt+1]
-//line sql.y:2185
+//line sql.y:2186
 		{
 			yyVAL.columnType = &ColumnType{Type: string(yyDollar[1].str)}
 		}
 	case 349:
 		yyDollar = yyS[yypt-1 : yypt+1]
-//line sql.y:2189
+//line sql.y:2190
 		{
 			yyVAL.columnType = &ColumnType{Type: string(yyDollar[1].str)}
 		}
 	case 350:
 		yyDollar = yyS[yypt-1 : yypt+1]
-//line sql.y:2193
+//line sql.y:2194
 		{
 			yyVAL.columnType = &ColumnType{Type: string(yyDollar[1].str)}
 		}
 	case 351:
-		yyDollar = yyS[yypt-5 : yypt+1]
-//line sql.y:2197
+		yyDollar = yyS[yypt-1 : yypt+1]
+//line sql.y:2198
 		{
-			yyVAL.columnType = &ColumnType{Type: string(yyDollar[1].str), EnumValues: yyDollar[3].strs, Charset: yyDollar[5].columnCharset}
+			yyVAL.columnType = &ColumnType{Type: string(yyDollar[1].str)}
 		}
 	case 352:
-		yyDollar = yyS[yypt-2 : yypt+1]
-//line sql.y:2201
+		yyDollar = yyS[yypt-5 : yypt+1]
+//line sql.y:2202
 		{
-			yyVAL.columnType = &ColumnType{Type: string(yyDollar[1].str), Length: yyDollar[2].intPtrUnion()}
+			yyVAL.columnType = &ColumnType{Type: string(yyDollar[1].str), EnumValues: yyDollar[3].strs, Charset: yyDollar[5].columnCharset}
 		}
 	case 353:
-		yyDollar = yyS[yypt-5 : yypt+1]
+		yyDollar = yyS[yypt-2 : yypt+1]
 //line sql.y:2206
 		{
-			yyVAL.columnType = &ColumnType{Type: string(yyDollar[1].str), EnumValues: yyDollar[3].strs, Charset: yyDollar[5].columnCharset}
+			yyVAL.columnType = &ColumnType{Type: string(yyDollar[1].str), Length: yyDollar[2].intPtrUnion()}
 		}
 	case 354:
-		yyDollar = yyS[yypt-1 : yypt+1]
-//line sql.y:2212
+		yyDollar = yyS[yypt-5 : yypt+1]
+//line sql.y:2211
 		{
-			yyVAL.columnType = &ColumnType{Type: string(yyDollar[1].str)}
+			yyVAL.columnType = &ColumnType{Type: string(yyDollar[1].str), EnumValues: yyDollar[3].strs, Charset: yyDollar[5].columnCharset}
 		}
 	case 355:
 		yyDollar = yyS[yypt-1 : yypt+1]
-//line sql.y:2216
+//line sql.y:2217
 		{
 			yyVAL.columnType = &ColumnType{Type: string(yyDollar[1].str)}
 		}
 	case 356:
 		yyDollar = yyS[yypt-1 : yypt+1]
-//line sql.y:2220
+//line sql.y:2221
 		{
 			yyVAL.columnType = &ColumnType{Type: string(yyDollar[1].str)}
 		}
 	case 357:
 		yyDollar = yyS[yypt-1 : yypt+1]
-//line sql.y:2224
+//line sql.y:2225
 		{
 			yyVAL.columnType = &ColumnType{Type: string(yyDollar[1].str)}
 		}
 	case 358:
 		yyDollar = yyS[yypt-1 : yypt+1]
-//line sql.y:2228
+//line sql.y:2229
 		{
 			yyVAL.columnType = &ColumnType{Type: string(yyDollar[1].str)}
 		}
 	case 359:
 		yyDollar = yyS[yypt-1 : yypt+1]
-//line sql.y:2232
+//line sql.y:2233
 		{
 			yyVAL.columnType = &ColumnType{Type: string(yyDollar[1].str)}
 		}
 	case 360:
 		yyDollar = yyS[yypt-1 : yypt+1]
-//line sql.y:2236
+//line sql.y:2237
 		{
 			yyVAL.columnType = &ColumnType{Type: string(yyDollar[1].str)}
 		}
 	case 361:
 		yyDollar = yyS[yypt-1 : yypt+1]
-//line sql.y:2240
+//line sql.y:2241
 		{
 			yyVAL.columnType = &ColumnType{Type: string(yyDollar[1].str)}
 		}
 	case 362:
 		yyDollar = yyS[yypt-1 : yypt+1]
-//line sql.y:2246
+//line sql.y:2245
+		{
+			yyVAL.columnType = &ColumnType{Type: string(yyDollar[1].str)}
+		}
+	case 363:
+		yyDollar = yyS[yypt-1 : yypt+1]
+//line sql.y:2251
 		{
 			yyVAL.strs = make([]string, 0, 4)
 			yyVAL.strs = append(yyVAL.strs, encodeSQLString(yyDollar[1].str))
 		}
-	case 363:
+	case 364:
 		yyDollar = yyS[yypt-3 : yypt+1]
-//line sql.y:2251
+//line sql.y:2256
 		{
 			yyVAL.strs = append(yyDollar[1].strs, encodeSQLString(yyDollar[3].str))
 		}
-	case 364:
+	case 365:
 		yyDollar = yyS[yypt-0 : yypt+1]
 		var yyLOCAL *int
-//line sql.y:2256
+//line sql.y:2261
 		{
 			yyLOCAL = nil
 		}
 		yyVAL.union = yyLOCAL
-	case 365:
+	case 366:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL *int
-//line sql.y:2260
+//line sql.y:2265
 		{
 			yyLOCAL = ptr.Of(convertStringToInt(yyDollar[2].str))
 		}
 		yyVAL.union = yyLOCAL
-	case 366:
+	case 367:
 		yyDollar = yyS[yypt-0 : yypt+1]
-//line sql.y:2265
+//line sql.y:2270
 		{
 			yyVAL.LengthScaleOption = LengthScaleOption{}
 		}
-	case 367:
+	case 368:
 		yyDollar = yyS[yypt-5 : yypt+1]
-//line sql.y:2269
+//line sql.y:2274
 		{
 			yyVAL.LengthScaleOption = LengthScaleOption{
 				Length: ptr.Of(convertStringToInt(yyDollar[2].str)),
 				Scale:  ptr.Of(convertStringToInt(yyDollar[4].str)),
 			}
 		}
-	case 368:
+	case 369:
 		yyDollar = yyS[yypt-1 : yypt+1]
-//line sql.y:2278
+//line sql.y:2283
 		{
 			yyVAL.LengthScaleOption = yyDollar[1].LengthScaleOption
 		}
-	case 369:
+	case 370:
 		yyDollar = yyS[yypt-3 : yypt+1]
-//line sql.y:2282
+//line sql.y:2287
 		{
 			yyVAL.LengthScaleOption = LengthScaleOption{
 				Length: ptr.Of(convertStringToInt(yyDollar[2].str)),
 			}
 		}
-	case 370:
+	case 371:
 		yyDollar = yyS[yypt-0 : yypt+1]
-//line sql.y:2289
+//line sql.y:2294
 		{
 			yyVAL.LengthScaleOption = LengthScaleOption{}
 		}
-	case 371:
+	case 372:
 		yyDollar = yyS[yypt-3 : yypt+1]
-//line sql.y:2293
+//line sql.y:2298
 		{
 			yyVAL.LengthScaleOption = LengthScaleOption{
 				Length: ptr.Of(convertStringToInt(yyDollar[2].str)),
 			}
 		}
-	case 372:
+	case 373:
 		yyDollar = yyS[yypt-5 : yypt+1]
-//line sql.y:2299
+//line sql.y:2304
 		{
 			yyVAL.LengthScaleOption = LengthScaleOption{
 				Length: ptr.Of(convertStringToInt(yyDollar[2].str)),
 				Scale:  ptr.Of(convertStringToInt(yyDollar[4].str)),
 			}
 		}
-	case 373:
+	case 374:
 		yyDollar = yyS[yypt-0 : yypt+1]
 		var yyLOCAL bool
-//line sql.y:2307
+//line sql.y:2312
 		{
 			yyLOCAL = false
 		}
 		yyVAL.union = yyLOCAL
-	case 374:
+	case 375:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL bool
-//line sql.y:2311
+//line sql.y:2316
 		{
 			yyLOCAL = true
 		}
 		yyVAL.union = yyLOCAL
-	case 375:
+	case 376:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL bool
-//line sql.y:2315
+//line sql.y:2320
 		{
 			yyLOCAL = false
 		}
 		yyVAL.union = yyLOCAL
-	case 376:
+	case 377:
 		yyDollar = yyS[yypt-0 : yypt+1]
 		var yyLOCAL bool
-//line sql.y:2320
+//line sql.y:2325
 		{
 			yyLOCAL = false
 		}
 		yyVAL.union = yyLOCAL
-	case 377:
+	case 378:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL bool
-//line sql.y:2324
+//line sql.y:2329
 		{
 			yyLOCAL = true
 		}
 		yyVAL.union = yyLOCAL
-	case 378:
+	case 379:
 		yyDollar = yyS[yypt-0 : yypt+1]
-//line sql.y:2329
+//line sql.y:2334
 		{
 			yyVAL.columnCharset = ColumnCharset{}
 		}
-	case 379:
+	case 380:
 		yyDollar = yyS[yypt-3 : yypt+1]
-//line sql.y:2333
+//line sql.y:2338
 		{
 			yyVAL.columnCharset = ColumnCharset{Name: string(yyDollar[2].identifierCI.String()), Binary: yyDollar[3].booleanUnion()}
 		}
-	case 380:
+	case 381:
 		yyDollar = yyS[yypt-3 : yypt+1]
-//line sql.y:2337
+//line sql.y:2342
 		{
 			yyVAL.columnCharset = ColumnCharset{Name: encodeSQLString(yyDollar[2].str), Binary: yyDollar[3].booleanUnion()}
 		}
-	case 381:
+	case 382:
 		yyDollar = yyS[yypt-2 : yypt+1]
-//line sql.y:2341
+//line sql.y:2346
 		{
 			yyVAL.columnCharset = ColumnCharset{Name: string(yyDollar[2].str)}
 		}
-	case 382:
+	case 383:
 		yyDollar = yyS[yypt-2 : yypt+1]
-//line sql.y:2345
+//line sql.y:2350
 		{
 			// ASCII: Shorthand for CHARACTER SET latin1.
 			yyVAL.columnCharset = ColumnCharset{Name: "latin1", Binary: yyDollar[2].booleanUnion()}
 		}
-	case 383:
+	case 384:
 		yyDollar = yyS[yypt-2 : yypt+1]
-//line sql.y:2350
+//line sql.y:2355
 		{
 			// UNICODE: Shorthand for CHARACTER SET ucs2.
 			yyVAL.columnCharset = ColumnCharset{Name: "ucs2", Binary: yyDollar[2].booleanUnion()}
 		}
-	case 384:
+	case 385:
 		yyDollar = yyS[yypt-1 : yypt+1]
-//line sql.y:2355
+//line sql.y:2360
 		{
 			// BINARY: Shorthand for default CHARACTER SET but with binary collation
 			yyVAL.columnCharset = ColumnCharset{Name: "", Binary: true}
 		}
-	case 385:
+	case 386:
 		yyDollar = yyS[yypt-2 : yypt+1]
-//line sql.y:2360
+//line sql.y:2365
 		{
 			// BINARY ASCII: Shorthand for CHARACTER SET latin1 with binary collation
 			yyVAL.columnCharset = ColumnCharset{Name: "latin1", Binary: true}
 		}
-	case 386:
+	case 387:
 		yyDollar = yyS[yypt-2 : yypt+1]
-//line sql.y:2365
+//line sql.y:2370
 		{
 			// BINARY UNICODE: Shorthand for CHARACTER SET ucs2 with binary collation
 			yyVAL.columnCharset = ColumnCharset{Name: "ucs2", Binary: true}
 		}
-	case 387:
+	case 388:
 		yyDollar = yyS[yypt-0 : yypt+1]
 		var yyLOCAL bool
-//line sql.y:2371
+//line sql.y:2376
 		{
 			yyLOCAL = false
 		}
 		yyVAL.union = yyLOCAL
-	case 388:
+	case 389:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL bool
-//line sql.y:2375
+//line sql.y:2380
 		{
 			yyLOCAL = true
 		}
 		yyVAL.union = yyLOCAL
-	case 389:
+	case 390:
 		yyDollar = yyS[yypt-0 : yypt+1]
-//line sql.y:2380
+//line sql.y:2385
 		{
 			yyVAL.str = ""
 		}
-	case 390:
+	case 391:
 		yyDollar = yyS[yypt-2 : yypt+1]
-//line sql.y:2384
+//line sql.y:2389
 		{
 			yyVAL.str = string(yyDollar[2].identifierCI.String())
 		}
-	case 391:
+	case 392:
 		yyDollar = yyS[yypt-2 : yypt+1]
-//line sql.y:2388
+//line sql.y:2393
 		{
 			yyVAL.str = encodeSQLString(yyDollar[2].str)
 		}
-	case 392:
+	case 393:
 		yyDollar = yyS[yypt-5 : yypt+1]
 		var yyLOCAL *IndexDefinition
-//line sql.y:2394
+//line sql.y:2399
 		{
 			yyLOCAL = &IndexDefinition{Info: yyDollar[1].indexInfoUnion(), Columns: yyDollar[3].indexColumnsUnion(), Options: yyDollar[5].indexOptionsUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 393:
+	case 394:
 		yyDollar = yyS[yypt-0 : yypt+1]
 		var yyLOCAL []*IndexOption
-//line sql.y:2399
+//line sql.y:2404
 		{
 			yyLOCAL = nil
 		}
 		yyVAL.union = yyLOCAL
-	case 394:
+	case 395:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL []*IndexOption
-//line sql.y:2403
+//line sql.y:2408
 		{
 			yyLOCAL = yyDollar[1].indexOptionsUnion()
 		}
 		yyVAL.union = yyLOCAL
-	case 395:
+	case 396:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL []*IndexOption
-//line sql.y:2409
+//line sql.y:2414
 		{
 			yyLOCAL = []*IndexOption{yyDollar[1].indexOptionUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 396:
+	case 397:
 		yyDollar = yyS[yypt-2 : yypt+1]
-//line sql.y:2413
+//line sql.y:2418
 		{
 			yySLICE := (*[]*IndexOption)(yyIaddr(yyVAL.union))
 			*yySLICE = append(*yySLICE, yyDollar[2].indexOptionUnion())
 		}
-	case 397:
+	case 398:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL *IndexOption
-//line sql.y:2419
+//line sql.y:2424
 		{
 			yyLOCAL = yyDollar[1].indexOptionUnion()
 		}
 		yyVAL.union = yyLOCAL
-	case 398:
+	case 399:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL *IndexOption
-//line sql.y:2423
+//line sql.y:2428
 		{
 			// should not be string
 			yyLOCAL = &IndexOption{Name: string(yyDollar[1].str), Value: NewIntLiteral(yyDollar[3].str)}
 		}
 		yyVAL.union = yyLOCAL
-	case 399:
+	case 400:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL *IndexOption
-//line sql.y:2428
+//line sql.y:2433
 		{
 			yyLOCAL = &IndexOption{Name: string(yyDollar[1].str), Value: NewStrLiteral(yyDollar[2].str)}
 		}
 		yyVAL.union = yyLOCAL
-	case 400:
+	case 401:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL *IndexOption
-//line sql.y:2432
+//line sql.y:2437
 		{
 			yyLOCAL = &IndexOption{Name: string(yyDollar[1].str)}
 		}
 		yyVAL.union = yyLOCAL
-	case 401:
+	case 402:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL *IndexOption
-//line sql.y:2436
+//line sql.y:2441
 		{
 			yyLOCAL = &IndexOption{Name: string(yyDollar[1].str)}
 		}
 		yyVAL.union = yyLOCAL
-	case 402:
+	case 403:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL *IndexOption
-//line sql.y:2440
+//line sql.y:2445
 		{
 			yyLOCAL = &IndexOption{Name: string(yyDollar[1].str) + " " + string(yyDollar[2].str), String: yyDollar[3].identifierCI.String()}
 		}
 		yyVAL.union = yyLOCAL
-	case 403:
+	case 404:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL *IndexOption
-//line sql.y:2444
+//line sql.y:2449
 		{
 			yyLOCAL = &IndexOption{Name: string(yyDollar[1].str), Value: NewStrLiteral(yyDollar[3].str)}
 		}
 		yyVAL.union = yyLOCAL
-	case 404:
+	case 405:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL *IndexOption
-//line sql.y:2448
+//line sql.y:2453
 		{
 			yyLOCAL = &IndexOption{Name: string(yyDollar[1].str), Value: NewStrLiteral(yyDollar[3].str)}
 		}
 		yyVAL.union = yyLOCAL
-	case 405:
+	case 406:
 		yyDollar = yyS[yypt-0 : yypt+1]
-//line sql.y:2454
+//line sql.y:2459
 		{
 			yyVAL.str = ""
 		}
-	case 406:
+	case 407:
 		yyDollar = yyS[yypt-1 : yypt+1]
-//line sql.y:2458
+//line sql.y:2463
 		{
 			yyVAL.str = string(yyDollar[1].str)
 		}
-	case 407:
+	case 408:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL *IndexInfo
-//line sql.y:2464
+//line sql.y:2469
 		{
 			yyLOCAL = &IndexInfo{Type: IndexTypePrimary, ConstraintName: NewIdentifierCI(yyDollar[1].str), Name: NewIdentifierCI("PRIMARY")}
 		}
 		yyVAL.union = yyLOCAL
-	case 408:
+	case 409:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL *IndexInfo
-//line sql.y:2468
+//line sql.y:2473
 		{
 			yyLOCAL = &IndexInfo{Type: IndexTypeSpatial, Name: NewIdentifierCI(yyDollar[3].str)}
 		}
 		yyVAL.union = yyLOCAL
-	case 409:
+	case 410:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL *IndexInfo
-//line sql.y:2472
+//line sql.y:2477
 		{
 			yyLOCAL = &IndexInfo{Type: IndexTypeFullText, Name: NewIdentifierCI(yyDollar[3].str)}
 		}
 		yyVAL.union = yyLOCAL
-	case 410:
+	case 411:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL *IndexInfo
-//line sql.y:2476
+//line sql.y:2481
 		{
 			yyLOCAL = &IndexInfo{Type: IndexTypeUnique, ConstraintName: NewIdentifierCI(yyDollar[1].str), Name: NewIdentifierCI(yyDollar[4].str)}
 		}
 		yyVAL.union = yyLOCAL
-	case 411:
+	case 412:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL *IndexInfo
-//line sql.y:2480
+//line sql.y:2485
 		{
 			yyLOCAL = &IndexInfo{Type: IndexTypeDefault, Name: NewIdentifierCI(yyDollar[2].str)}
 		}
 		yyVAL.union = yyLOCAL
-	case 412:
+	case 413:
 		yyDollar = yyS[yypt-0 : yypt+1]
-//line sql.y:2485
+//line sql.y:2490
 		{
 			yyVAL.str = ""
 		}
-	case 413:
+	case 414:
 		yyDollar = yyS[yypt-2 : yypt+1]
-//line sql.y:2489
+//line sql.y:2494
 		{
 			yyVAL.str = yyDollar[2].str
 		}
-	case 414:
-		yyDollar = yyS[yypt-1 : yypt+1]
-//line sql.y:2495
-		{
-			yyVAL.str = string(yyDollar[1].str)
-		}
 	case 415:
 		yyDollar = yyS[yypt-1 : yypt+1]
-//line sql.y:2499
+//line sql.y:2500
 		{
 			yyVAL.str = string(yyDollar[1].str)
 		}
 	case 416:
 		yyDollar = yyS[yypt-1 : yypt+1]
-//line sql.y:2503
+//line sql.y:2504
 		{
 			yyVAL.str = string(yyDollar[1].str)
 		}
 	case 417:
 		yyDollar = yyS[yypt-1 : yypt+1]
-//line sql.y:2509
+//line sql.y:2508
 		{
 			yyVAL.str = string(yyDollar[1].str)
 		}
 	case 418:
 		yyDollar = yyS[yypt-1 : yypt+1]
-//line sql.y:2513
+//line sql.y:2514
 		{
 			yyVAL.str = string(yyDollar[1].str)
 		}
 	case 419:
-		yyDollar = yyS[yypt-0 : yypt+1]
+		yyDollar = yyS[yypt-1 : yypt+1]
 //line sql.y:2518
 		{
-			yyVAL.str = ""
+			yyVAL.str = string(yyDollar[1].str)
 		}
 	case 420:
-		yyDollar = yyS[yypt-1 : yypt+1]
-//line sql.y:2522
+		yyDollar = yyS[yypt-0 : yypt+1]
+//line sql.y:2523
 		{
-			yyVAL.str = yyDollar[1].str
+			yyVAL.str = ""
 		}
 	case 421:
 		yyDollar = yyS[yypt-1 : yypt+1]
-//line sql.y:2528
+//line sql.y:2527
 		{
-			yyVAL.str = string(yyDollar[1].str)
+			yyVAL.str = yyDollar[1].str
 		}
 	case 422:
 		yyDollar = yyS[yypt-1 : yypt+1]
-//line sql.y:2532
+//line sql.y:2533
 		{
 			yyVAL.str = string(yyDollar[1].str)
 		}
 	case 423:
-		yyDollar = yyS[yypt-0 : yypt+1]
+		yyDollar = yyS[yypt-1 : yypt+1]
 //line sql.y:2537
 		{
-			yyVAL.str = ""
+			yyVAL.str = string(yyDollar[1].str)
 		}
 	case 424:
-		yyDollar = yyS[yypt-1 : yypt+1]
-//line sql.y:2541
+		yyDollar = yyS[yypt-0 : yypt+1]
+//line sql.y:2542
 		{
-			yyVAL.str = string(yyDollar[1].identifierCI.String())
+			yyVAL.str = ""
 		}
 	case 425:
 		yyDollar = yyS[yypt-1 : yypt+1]
+//line sql.y:2546
+		{
+			yyVAL.str = string(yyDollar[1].identifierCI.String())
+		}
+	case 426:
+		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL []*IndexColumn
-//line sql.y:2547
+//line sql.y:2552
 		{
 			yyLOCAL = []*IndexColumn{yyDollar[1].indexColumnUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 426:
+	case 427:
 		yyDollar = yyS[yypt-3 : yypt+1]
-//line sql.y:2551
+//line sql.y:2556
 		{
 			yySLICE := (*[]*IndexColumn)(yyIaddr(yyVAL.union))
 			*yySLICE = append(*yySLICE, yyDollar[3].indexColumnUnion())
 		}
-	case 427:
+	case 428:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL *IndexColumn
-//line sql.y:2557
+//line sql.y:2562
 		{
 			yyLOCAL = &IndexColumn{Column: yyDollar[1].identifierCI, Length: yyDollar[2].intPtrUnion(), Direction: yyDollar[3].orderDirectionUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 428:
+	case 429:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL *IndexColumn
-//line sql.y:2561
+//line sql.y:2566
 		{
 			yyLOCAL = &IndexColumn{Expression: yyDollar[2].exprUnion(), Direction: yyDollar[4].orderDirectionUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 429:
+	case 430:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL *ConstraintDefinition
-//line sql.y:2567
+//line sql.y:2572
 		{
 			yyLOCAL = &ConstraintDefinition{Name: yyDollar[2].identifierCI, Details: yyDollar[3].constraintInfoUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 430:
+	case 431:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL *ConstraintDefinition
-//line sql.y:2571
+//line sql.y:2576
 		{
 			yyLOCAL = &ConstraintDefinition{Details: yyDollar[1].constraintInfoUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 431:
+	case 432:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL *ConstraintDefinition
-//line sql.y:2577
+//line sql.y:2582
 		{
 			yyLOCAL = &ConstraintDefinition{Name: yyDollar[2].identifierCI, Details: yyDollar[3].constraintInfoUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 432:
+	case 433:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL *ConstraintDefinition
-//line sql.y:2581
+//line sql.y:2586
 		{
 			yyLOCAL = &ConstraintDefinition{Details: yyDollar[1].constraintInfoUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 433:
+	case 434:
 		yyDollar = yyS[yypt-7 : yypt+1]
 		var yyLOCAL ConstraintInfo
-//line sql.y:2587
+//line sql.y:2592
 		{
 			yyLOCAL = &ForeignKeyDefinition{IndexName: NewIdentifierCI(yyDollar[3].str), Source: yyDollar[5].columnsUnion(), ReferenceDefinition: yyDollar[7].referenceDefinitionUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 434:
+	case 435:
 		yyDollar = yyS[yypt-6 : yypt+1]
 		var yyLOCAL *ReferenceDefinition
-//line sql.y:2593
+//line sql.y:2598
 		{
 			yyLOCAL = &ReferenceDefinition{ReferencedTable: yyDollar[2].tableName, ReferencedColumns: yyDollar[4].columnsUnion(), Match: yyDollar[6].matchActionUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 435:
+	case 436:
 		yyDollar = yyS[yypt-7 : yypt+1]
 		var yyLOCAL *ReferenceDefinition
-//line sql.y:2597
+//line sql.y:2602
 		{
 			yyLOCAL = &ReferenceDefinition{ReferencedTable: yyDollar[2].tableName, ReferencedColumns: yyDollar[4].columnsUnion(), Match: yyDollar[6].matchActionUnion(), OnDelete: yyDollar[7].referenceActionUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 436:
+	case 437:
 		yyDollar = yyS[yypt-7 : yypt+1]
 		var yyLOCAL *ReferenceDefinition
-//line sql.y:2601
+//line sql.y:2606
 		{
 			yyLOCAL = &ReferenceDefinition{ReferencedTable: yyDollar[2].tableName, ReferencedColumns: yyDollar[4].columnsUnion(), Match: yyDollar[6].matchActionUnion(), OnUpdate: yyDollar[7].referenceActionUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 437:
+	case 438:
 		yyDollar = yyS[yypt-8 : yypt+1]
 		var yyLOCAL *ReferenceDefinition
-//line sql.y:2605
+//line sql.y:2610
 		{
 			yyLOCAL = &ReferenceDefinition{ReferencedTable: yyDollar[2].tableName, ReferencedColumns: yyDollar[4].columnsUnion(), Match: yyDollar[6].matchActionUnion(), OnDelete: yyDollar[7].referenceActionUnion(), OnUpdate: yyDollar[8].referenceActionUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 438:
+	case 439:
 		yyDollar = yyS[yypt-8 : yypt+1]
 		var yyLOCAL *ReferenceDefinition
-//line sql.y:2609
+//line sql.y:2614
 		{
 			yyLOCAL = &ReferenceDefinition{ReferencedTable: yyDollar[2].tableName, ReferencedColumns: yyDollar[4].columnsUnion(), Match: yyDollar[6].matchActionUnion(), OnUpdate: yyDollar[7].referenceActionUnion(), OnDelete: yyDollar[8].referenceActionUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 439:
+	case 440:
 		yyDollar = yyS[yypt-0 : yypt+1]
 		var yyLOCAL *ReferenceDefinition
-//line sql.y:2614
+//line sql.y:2619
 		{
 			yyLOCAL = nil
 		}
 		yyVAL.union = yyLOCAL
-	case 440:
+	case 441:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL *ReferenceDefinition
-//line sql.y:2618
+//line sql.y:2623
 		{
 			yyLOCAL = yyDollar[1].referenceDefinitionUnion()
 		}
 		yyVAL.union = yyLOCAL
-	case 441:
+	case 442:
 		yyDollar = yyS[yypt-5 : yypt+1]
 		var yyLOCAL ConstraintInfo
-//line sql.y:2624
+//line sql.y:2629
 		{
 			yyLOCAL = &CheckConstraintDefinition{Expr: yyDollar[3].exprUnion(), Enforced: yyDollar[5].booleanUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 442:
+	case 443:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL MatchAction
-//line sql.y:2630
+//line sql.y:2635
 		{
 			yyLOCAL = yyDollar[2].matchActionUnion()
 		}
 		yyVAL.union = yyLOCAL
-	case 443:
+	case 444:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL MatchAction
-//line sql.y:2636
+//line sql.y:2641
 		{
 			yyLOCAL = Full
 		}
 		yyVAL.union = yyLOCAL
-	case 444:
+	case 445:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL MatchAction
-//line sql.y:2640
+//line sql.y:2645
 		{
 			yyLOCAL = Partial
 		}
 		yyVAL.union = yyLOCAL
-	case 445:
+	case 446:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL MatchAction
-//line sql.y:2644
+//line sql.y:2649
 		{
 			yyLOCAL = Simple
 		}
 		yyVAL.union = yyLOCAL
-	case 446:
+	case 447:
 		yyDollar = yyS[yypt-0 : yypt+1]
 		var yyLOCAL MatchAction
-//line sql.y:2649
+//line sql.y:2654
 		{
 			yyLOCAL = DefaultMatch
 		}
 		yyVAL.union = yyLOCAL
-	case 447:
+	case 448:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL MatchAction
-//line sql.y:2653
+//line sql.y:2658
 		{
 			yyLOCAL = yyDollar[1].matchActionUnion()
 		}
 		yyVAL.union = yyLOCAL
-	case 448:
+	case 449:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL ReferenceAction
-//line sql.y:2659
+//line sql.y:2664
 		{
 			yyLOCAL = yyDollar[3].referenceActionUnion()
 		}
 		yyVAL.union = yyLOCAL
-	case 449:
+	case 450:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL ReferenceAction
-//line sql.y:2665
+//line sql.y:2670
 		{
 			yyLOCAL = yyDollar[3].referenceActionUnion()
 		}
 		yyVAL.union = yyLOCAL
-	case 450:
+	case 451:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL ReferenceAction
-//line sql.y:2671
+//line sql.y:2676
 		{
 			yyLOCAL = Restrict
 		}
 		yyVAL.union = yyLOCAL
-	case 451:
+	case 452:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL ReferenceAction
-//line sql.y:2675
+//line sql.y:2680
 		{
 			yyLOCAL = Cascade
 		}
 		yyVAL.union = yyLOCAL
-	case 452:
+	case 453:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL ReferenceAction
-//line sql.y:2679
+//line sql.y:2684
 		{
 			yyLOCAL = NoAction
 		}
 		yyVAL.union = yyLOCAL
-	case 453:
+	case 454:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL ReferenceAction
-//line sql.y:2683
+//line sql.y:2688
 		{
 			yyLOCAL = SetDefault
 		}
 		yyVAL.union = yyLOCAL
-	case 454:
+	case 455:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL ReferenceAction
-//line sql.y:2687
+//line sql.y:2692
 		{
 			yyLOCAL = SetNull
 		}
 		yyVAL.union = yyLOCAL
-	case 455:
+	case 456:
 		yyDollar = yyS[yypt-0 : yypt+1]
-//line sql.y:2692
+//line sql.y:2697
 		{
 			yyVAL.str = ""
 		}
-	case 456:
+	case 457:
 		yyDollar = yyS[yypt-1 : yypt+1]
-//line sql.y:2696
+//line sql.y:2701
 		{
 			yyVAL.str = string(yyDollar[1].str)
 		}
-	case 457:
+	case 458:
 		yyDollar = yyS[yypt-1 : yypt+1]
-//line sql.y:2700
+//line sql.y:2705
 		{
 			yyVAL.str = string(yyDollar[1].str)
 		}
-	case 458:
+	case 459:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL bool
-//line sql.y:2706
+//line sql.y:2711
 		{
 			yyLOCAL = true
 		}
 		yyVAL.union = yyLOCAL
-	case 459:
+	case 460:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL bool
-//line sql.y:2710
+//line sql.y:2715
 		{
 			yyLOCAL = false
 		}
 		yyVAL.union = yyLOCAL
-	case 460:
+	case 461:
 		yyDollar = yyS[yypt-0 : yypt+1]
 		var yyLOCAL bool
-//line sql.y:2715
+//line sql.y:2720
 		{
 			yyLOCAL = true
 		}
 		yyVAL.union = yyLOCAL
-	case 461:
+	case 462:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL bool
-//line sql.y:2719
+//line sql.y:2724
 		{
 			yyLOCAL = yyDollar[1].booleanUnion()
 		}
 		yyVAL.union = yyLOCAL
-	case 462:
+	case 463:
 		yyDollar = yyS[yypt-0 : yypt+1]
 		var yyLOCAL TableOptions
-//line sql.y:2724
+//line sql.y:2729
 		{
 			yyLOCAL = nil
 		}
 		yyVAL.union = yyLOCAL
-	case 463:
+	case 464:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL TableOptions
-//line sql.y:2728
+//line sql.y:2733
 		{
 			yyLOCAL = yyDollar[1].tableOptionsUnion()
 		}
 		yyVAL.union = yyLOCAL
-	case 464:
+	case 465:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL TableOptions
-//line sql.y:2734
+//line sql.y:2739
 		{
 			yyLOCAL = TableOptions{yyDollar[1].tableOptionUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 465:
+	case 466:
 		yyDollar = yyS[yypt-3 : yypt+1]
-//line sql.y:2738
+//line sql.y:2743
 		{
 			yySLICE := (*TableOptions)(yyIaddr(yyVAL.union))
 			*yySLICE = append(*yySLICE, yyDollar[3].tableOptionUnion())
 		}
-	case 466:
+	case 467:
 		yyDollar = yyS[yypt-2 : yypt+1]
-//line sql.y:2742
+//line sql.y:2747
 		{
 			yySLICE := (*TableOptions)(yyIaddr(yyVAL.union))
 			*yySLICE = append(*yySLICE, yyDollar[2].tableOptionUnion())
 		}
-	case 467:
+	case 468:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL TableOptions
-//line sql.y:2748
+//line sql.y:2753
 		{
 			yyLOCAL = TableOptions{yyDollar[1].tableOptionUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 468:
+	case 469:
 		yyDollar = yyS[yypt-2 : yypt+1]
-//line sql.y:2752
+//line sql.y:2757
 		{
 			yySLICE := (*TableOptions)(yyIaddr(yyVAL.union))
 			*yySLICE = append(*yySLICE, yyDollar[2].tableOptionUnion())
 		}
-	case 469:
+	case 470:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL *TableOption
-//line sql.y:2758
+//line sql.y:2763
 		{
 			yyLOCAL = &TableOption{Name: string(yyDollar[1].str), Value: NewIntLiteral(yyDollar[3].str)}
 		}
 		yyVAL.union = yyLOCAL
-	case 470:
+	case 471:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL *TableOption
-//line sql.y:2762
+//line sql.y:2767
 		{
 			yyLOCAL = &TableOption{Name: string(yyDollar[1].str), Value: NewIntLiteral(yyDollar[3].str)}
 		}
 		yyVAL.union = yyLOCAL
-	case 471:
+	case 472:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL *TableOption
-//line sql.y:2766
+//line sql.y:2771
 		{
 			yyLOCAL = &TableOption{Name: string(yyDollar[1].str), Value: NewIntLiteral(yyDollar[3].str)}
 		}
 		yyVAL.union = yyLOCAL
-	case 472:
+	case 473:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL *TableOption
-//line sql.y:2770
+//line sql.y:2775
 		{
 			yyLOCAL = &TableOption{Name: (string(yyDollar[2].str)), String: yyDollar[4].str, CaseSensitive: true}
 		}
 		yyVAL.union = yyLOCAL
-	case 473:
+	case 474:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL *TableOption
-//line sql.y:2774
+//line sql.y:2779
 		{
 			yyLOCAL = &TableOption{Name: string(yyDollar[2].str), String: yyDollar[4].str, CaseSensitive: true}
 		}
 		yyVAL.union = yyLOCAL
-	case 474:
+	case 475:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL *TableOption
-//line sql.y:2778
+//line sql.y:2783
 		{
 			yyLOCAL = &TableOption{Name: string(yyDollar[1].str), Value: NewIntLiteral(yyDollar[3].str)}
 		}
 		yyVAL.union = yyLOCAL
-	case 475:
+	case 476:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL *TableOption
-//line sql.y:2782
+//line sql.y:2787
 		{
 			yyLOCAL = &TableOption{Name: string(yyDollar[1].str), Value: NewStrLiteral(yyDollar[3].str)}
 		}
 		yyVAL.union = yyLOCAL
-	case 476:
+	case 477:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL *TableOption
-//line sql.y:2786
+//line sql.y:2791
 		{
 			yyLOCAL = &TableOption{Name: string(yyDollar[1].str), Value: NewStrLiteral(yyDollar[3].str)}
 		}
 		yyVAL.union = yyLOCAL
-	case 477:
+	case 478:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL *TableOption
-//line sql.y:2790
+//line sql.y:2795
 		{
 			yyLOCAL = &TableOption{Name: string(yyDollar[1].str), Value: NewStrLiteral(yyDollar[3].str)}
 		}
 		yyVAL.union = yyLOCAL
-	case 478:
+	case 479:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL *TableOption
-//line sql.y:2794
+//line sql.y:2799
 		{
 			yyLOCAL = &TableOption{Name: (string(yyDollar[1].str) + " " + string(yyDollar[2].str)), Value: NewStrLiteral(yyDollar[4].str)}
 		}
 		yyVAL.union = yyLOCAL
-	case 479:
+	case 480:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL *TableOption
-//line sql.y:2798
+//line sql.y:2803
 		{
 			yyLOCAL = &TableOption{Name: (string(yyDollar[1].str) + " " + string(yyDollar[2].str)), Value: NewStrLiteral(yyDollar[4].str)}
 		}
 		yyVAL.union = yyLOCAL
-	case 480:
+	case 481:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL *TableOption
-//line sql.y:2802
+//line sql.y:2807
 		{
 			yyLOCAL = &TableOption{Name: string(yyDollar[1].str), Value: NewIntLiteral(yyDollar[3].str)}
 		}
 		yyVAL.union = yyLOCAL
-	case 481:
+	case 482:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL *TableOption
-//line sql.y:2806
+//line sql.y:2811
 		{
 			yyLOCAL = &TableOption{Name: string(yyDollar[1].str), Value: NewStrLiteral(yyDollar[3].str)}
 		}
 		yyVAL.union = yyLOCAL
-	case 482:
+	case 483:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL *TableOption
-//line sql.y:2810
+//line sql.y:2815
 		{
 			yyLOCAL = &TableOption{Name: string(yyDollar[1].str), String: yyDollar[3].identifierCS.String(), CaseSensitive: true}
 		}
 		yyVAL.union = yyLOCAL
-	case 483:
+	case 484:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL *TableOption
-//line sql.y:2814
+//line sql.y:2819
 		{
 			yyLOCAL = &TableOption{Name: string(yyDollar[1].str), Value: NewStrLiteral(yyDollar[3].str)}
 		}
 		yyVAL.union = yyLOCAL
-	case 484:
+	case 485:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL *TableOption
-//line sql.y:2818
+//line sql.y:2823
 		{
 			yyLOCAL = &TableOption{Name: string(yyDollar[1].str), String: string(yyDollar[3].str)}
 		}
 		yyVAL.union = yyLOCAL
-	case 485:
+	case 486:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL *TableOption
-//line sql.y:2822
+//line sql.y:2827
 		{
 			yyLOCAL = &TableOption{Name: string(yyDollar[1].str), Value: NewIntLiteral(yyDollar[3].str)}
 		}
 		yyVAL.union = yyLOCAL
-	case 486:
+	case 487:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL *TableOption
-//line sql.y:2826
+//line sql.y:2831
 		{
 			yyLOCAL = &TableOption{Name: string(yyDollar[1].str), Value: NewIntLiteral(yyDollar[3].str)}
 		}
 		yyVAL.union = yyLOCAL
-	case 487:
+	case 488:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL *TableOption
-//line sql.y:2830
+//line sql.y:2835
 		{
 			yyLOCAL = &TableOption{Name: string(yyDollar[1].str), Value: NewIntLiteral(yyDollar[3].str)}
 		}
 		yyVAL.union = yyLOCAL
-	case 488:
+	case 489:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL *TableOption
-//line sql.y:2834
+//line sql.y:2839
 		{
 			yyLOCAL = &TableOption{Name: string(yyDollar[1].str), Value: NewIntLiteral(yyDollar[3].str)}
 		}
 		yyVAL.union = yyLOCAL
-	case 489:
+	case 490:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL *TableOption
-//line sql.y:2838
+//line sql.y:2843
 		{
 			yyLOCAL = &TableOption{Name: string(yyDollar[1].str), String: string(yyDollar[3].str)}
 		}
 		yyVAL.union = yyLOCAL
-	case 490:
+	case 491:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL *TableOption
-//line sql.y:2842
+//line sql.y:2847
 		{
 			yyLOCAL = &TableOption{Name: string(yyDollar[1].str), Value: NewStrLiteral(yyDollar[3].str)}
 		}
 		yyVAL.union = yyLOCAL
-	case 491:
+	case 492:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL *TableOption
-//line sql.y:2846
+//line sql.y:2851
 		{
 			yyLOCAL = &TableOption{Name: string(yyDollar[1].str), String: string(yyDollar[3].str)}
 		}
 		yyVAL.union = yyLOCAL
-	case 492:
+	case 493:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL *TableOption
-//line sql.y:2850
+//line sql.y:2855
 		{
 			yyLOCAL = &TableOption{Name: string(yyDollar[1].str), Value: NewStrLiteral(yyDollar[3].str)}
 		}
 		yyVAL.union = yyLOCAL
-	case 493:
+	case 494:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL *TableOption
-//line sql.y:2854
+//line sql.y:2859
 		{
 			yyLOCAL = &TableOption{Name: string(yyDollar[1].str), Value: NewIntLiteral(yyDollar[3].str)}
 		}
 		yyVAL.union = yyLOCAL
-	case 494:
+	case 495:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL *TableOption
-//line sql.y:2858
+//line sql.y:2863
 		{
 			yyLOCAL = &TableOption{Name: string(yyDollar[1].str), String: string(yyDollar[3].str)}
 		}
 		yyVAL.union = yyLOCAL
-	case 495:
+	case 496:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL *TableOption
-//line sql.y:2862
+//line sql.y:2867
 		{
 			yyLOCAL = &TableOption{Name: string(yyDollar[1].str), Value: NewIntLiteral(yyDollar[3].str)}
 		}
 		yyVAL.union = yyLOCAL
-	case 496:
+	case 497:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL *TableOption
-//line sql.y:2866
+//line sql.y:2871
 		{
 			yyLOCAL = &TableOption{Name: string(yyDollar[1].str), String: string(yyDollar[3].str)}
 		}
 		yyVAL.union = yyLOCAL
-	case 497:
+	case 498:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL *TableOption
-//line sql.y:2870
+//line sql.y:2875
 		{
 			yyLOCAL = &TableOption{Name: string(yyDollar[1].str), Value: NewIntLiteral(yyDollar[3].str)}
 		}
 		yyVAL.union = yyLOCAL
-	case 498:
+	case 499:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL *TableOption
-//line sql.y:2874
+//line sql.y:2879
 		{
 			yyLOCAL = &TableOption{Name: string(yyDollar[1].str), String: (yyDollar[3].identifierCI.String() + yyDollar[4].str), CaseSensitive: true}
 		}
 		yyVAL.union = yyLOCAL
-	case 499:
+	case 500:
 		yyDollar = yyS[yypt-5 : yypt+1]
 		var yyLOCAL *TableOption
-//line sql.y:2878
+//line sql.y:2883
 		{
 			yyLOCAL = &TableOption{Name: string(yyDollar[1].str), Tables: yyDollar[4].tableNamesUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 500:
+	case 501:
 		yyDollar = yyS[yypt-0 : yypt+1]
-//line sql.y:2883
+//line sql.y:2888
 		{
 			yyVAL.str = ""
 		}
-	case 501:
+	case 502:
 		yyDollar = yyS[yypt-2 : yypt+1]
-//line sql.y:2887
+//line sql.y:2892
 		{
 			yyVAL.str = " " + string(yyDollar[1].str) + " " + string(yyDollar[2].str)
 		}
-	case 502:
+	case 503:
 		yyDollar = yyS[yypt-2 : yypt+1]
-//line sql.y:2891
+//line sql.y:2896
 		{
 			yyVAL.str = " " + string(yyDollar[1].str) + " " + string(yyDollar[2].str)
 		}
-	case 512:
+	case 513:
 		yyDollar = yyS[yypt-3 : yypt+1]
-//line sql.y:2910
+//line sql.y:2915
 		{
 			yyVAL.str = String(TableName{Qualifier: yyDollar[1].identifierCS, Name: yyDollar[3].identifierCS})
 		}
-	case 513:
+	case 514:
 		yyDollar = yyS[yypt-1 : yypt+1]
-//line sql.y:2914
+//line sql.y:2919
 		{
 			yyVAL.str = yyDollar[1].identifierCI.String()
 		}
-	case 514:
+	case 515:
 		yyDollar = yyS[yypt-1 : yypt+1]
-//line sql.y:2918
+//line sql.y:2923
 		{
 			yyVAL.str = encodeSQLString(yyDollar[1].str)
 		}
-	case 515:
+	case 516:
 		yyDollar = yyS[yypt-1 : yypt+1]
-//line sql.y:2922
+//line sql.y:2927
 		{
 			yyVAL.str = string(yyDollar[1].str)
 		}
-	case 516:
+	case 517:
 		yyDollar = yyS[yypt-0 : yypt+1]
-//line sql.y:2927
+//line sql.y:2932
 		{
 			yyVAL.str = ""
 		}
-	case 518:
+	case 519:
 		yyDollar = yyS[yypt-0 : yypt+1]
 		var yyLOCAL bool
-//line sql.y:2933
+//line sql.y:2938
 		{
 			yyLOCAL = false
 		}
 		yyVAL.union = yyLOCAL
-	case 519:
+	case 520:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL bool
-//line sql.y:2937
+//line sql.y:2942
 		{
 			yyLOCAL = true
 		}
 		yyVAL.union = yyLOCAL
-	case 520:
+	case 521:
 		yyDollar = yyS[yypt-0 : yypt+1]
 		var yyLOCAL *ColName
-//line sql.y:2942
+//line sql.y:2947
 		{
 			yyLOCAL = nil
 		}
 		yyVAL.union = yyLOCAL
-	case 521:
+	case 522:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL *ColName
-//line sql.y:2946
+//line sql.y:2951
 		{
 			yyLOCAL = yyDollar[2].colNameUnion()
 		}
 		yyVAL.union = yyLOCAL
-	case 522:
+	case 523:
 		yyDollar = yyS[yypt-0 : yypt+1]
-//line sql.y:2951
+//line sql.y:2956
 		{
 			yyVAL.str = ""
 		}
-	case 523:
+	case 524:
 		yyDollar = yyS[yypt-2 : yypt+1]
-//line sql.y:2955
+//line sql.y:2960
 		{
 			yyVAL.str = string(yyDollar[2].str)
 		}
-	case 524:
+	case 525:
 		yyDollar = yyS[yypt-0 : yypt+1]
 		var yyLOCAL *Literal
-//line sql.y:2960
+//line sql.y:2965
 		{
 			yyLOCAL = nil
 		}
 		yyVAL.union = yyLOCAL
-	case 525:
+	case 526:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL *Literal
-//line sql.y:2964
+//line sql.y:2969
 		{
 			yyLOCAL = NewIntLiteral(yyDollar[2].str)
 		}
 		yyVAL.union = yyLOCAL
-	case 526:
+	case 527:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL *Literal
-//line sql.y:2968
+//line sql.y:2973
 		{
 			yyLOCAL = NewDecimalLiteral(yyDollar[2].str)
 		}
 		yyVAL.union = yyLOCAL
-	case 527:
+	case 528:
 		yyDollar = yyS[yypt-0 : yypt+1]
 		var yyLOCAL []AlterOption
-//line sql.y:2973
+//line sql.y:2978
 		{
 			yyLOCAL = nil
 		}
 		yyVAL.union = yyLOCAL
-	case 528:
+	case 529:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL []AlterOption
-//line sql.y:2977
+//line sql.y:2982
 		{
 			yyLOCAL = yyDollar[1].alterOptionsUnion()
 		}
 		yyVAL.union = yyLOCAL
-	case 529:
+	case 530:
 		yyDollar = yyS[yypt-5 : yypt+1]
-//line sql.y:2981
+//line sql.y:2986
 		{
 			yySLICE := (*[]AlterOption)(yyIaddr(yyVAL.union))
 			*yySLICE = append(*yySLICE, &OrderByOption{Cols: yyDollar[5].columnsUnion()})
 		}
-	case 530:
+	case 531:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL []AlterOption
-//line sql.y:2985
+//line sql.y:2990
 		{
 			yyLOCAL = yyDollar[1].alterOptionsUnion()
 		}
 		yyVAL.union = yyLOCAL
-	case 531:
+	case 532:
 		yyDollar = yyS[yypt-3 : yypt+1]
-//line sql.y:2989
+//line sql.y:2994
 		{
 			yySLICE := (*[]AlterOption)(yyIaddr(yyVAL.union))
 			*yySLICE = append(*yySLICE, yyDollar[3].alterOptionsUnion()...)
 		}
-	case 532:
+	case 533:
 		yyDollar = yyS[yypt-7 : yypt+1]
 		var yyLOCAL []AlterOption
-//line sql.y:2993
+//line sql.y:2998
 		{
 			yyLOCAL = append(append(yyDollar[1].alterOptionsUnion(), yyDollar[3].alterOptionsUnion()...), &OrderByOption{Cols: yyDollar[7].columnsUnion()})
 		}
 		yyVAL.union = yyLOCAL
-	case 533:
+	case 534:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL []AlterOption
-//line sql.y:2999
+//line sql.y:3004
 		{
 			yyLOCAL = []AlterOption{yyDollar[1].alterOptionUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 534:
+	case 535:
 		yyDollar = yyS[yypt-3 : yypt+1]
-//line sql.y:3003
+//line sql.y:3008
 		{
 			yySLICE := (*[]AlterOption)(yyIaddr(yyVAL.union))
 			*yySLICE = append(*yySLICE, yyDollar[3].alterOptionUnion())
 		}
-	case 535:
+	case 536:
 		yyDollar = yyS[yypt-3 : yypt+1]
-//line sql.y:3007
+//line sql.y:3012
 		{
 			yySLICE := (*[]AlterOption)(yyIaddr(yyVAL.union))
 			*yySLICE = append(*yySLICE, yyDollar[3].alterOptionUnion())
 		}
-	case 536:
+	case 537:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL AlterOption
-//line sql.y:3013
+//line sql.y:3018
 		{
 			yyLOCAL = yyDollar[1].tableOptionsUnion()
 		}
 		yyVAL.union = yyLOCAL
-	case 537:
+	case 538:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL AlterOption
-//line sql.y:3017
+//line sql.y:3022
 		{
 			yyLOCAL = &AddConstraintDefinition{ConstraintDefinition: yyDollar[2].constraintDefinitionUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 538:
+	case 539:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL AlterOption
-//line sql.y:3021
+//line sql.y:3026
 		{
 			yyLOCAL = &AddConstraintDefinition{ConstraintDefinition: yyDollar[2].constraintDefinitionUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 539:
+	case 540:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL AlterOption
-//line sql.y:3025
+//line sql.y:3030
 		{
 			yyLOCAL = &AddIndexDefinition{IndexDefinition: yyDollar[2].indexDefinitionUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 540:
+	case 541:
 		yyDollar = yyS[yypt-5 : yypt+1]
 		var yyLOCAL AlterOption
-//line sql.y:3029
+//line sql.y:3034
 		{
 			yyLOCAL = &AddColumns{Columns: yyDollar[4].columnDefinitionsUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 541:
+	case 542:
 		yyDollar = yyS[yypt-5 : yypt+1]
 		var yyLOCAL AlterOption
-//line sql.y:3033
+//line sql.y:3038
 		{
 			yyLOCAL = &AddColumns{Columns: []*ColumnDefinition{yyDollar[3].columnDefinitionUnion()}, First: yyDollar[4].booleanUnion(), After: yyDollar[5].colNameUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 542:
+	case 543:
 		yyDollar = yyS[yypt-5 : yypt+1]
 		var yyLOCAL AlterOption
-//line sql.y:3037
+//line sql.y:3042
 		{
 			yyLOCAL = &AlterColumn{Column: yyDollar[3].colNameUnion(), DropDefault: true}
 		}
 		yyVAL.union = yyLOCAL
-	case 543:
+	case 544:
 		yyDollar = yyS[yypt-6 : yypt+1]
 		var yyLOCAL AlterOption
-//line sql.y:3041
+//line sql.y:3046
 		{
 			yyLOCAL = &AlterColumn{Column: yyDollar[3].colNameUnion(), DropDefault: false, DefaultVal: yyDollar[6].exprUnion(), DefaultLiteral: true}
 		}
 		yyVAL.union = yyLOCAL
-	case 544:
+	case 545:
 		yyDollar = yyS[yypt-8 : yypt+1]
 		var yyLOCAL AlterOption
-//line sql.y:3045
+//line sql.y:3050
 		{
 			yyLOCAL = &AlterColumn{Column: yyDollar[3].colNameUnion(), DropDefault: false, DefaultVal: yyDollar[7].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 545:
+	case 546:
 		yyDollar = yyS[yypt-5 : yypt+1]
 		var yyLOCAL AlterOption
-//line sql.y:3049
+//line sql.y:3054
 		{
 			yyLOCAL = &AlterColumn{Column: yyDollar[3].colNameUnion(), Invisible: ptr.Of(false)}
 		}
 		yyVAL.union = yyLOCAL
-	case 546:
+	case 547:
 		yyDollar = yyS[yypt-5 : yypt+1]
 		var yyLOCAL AlterOption
-//line sql.y:3053
+//line sql.y:3058
 		{
 			yyLOCAL = &AlterColumn{Column: yyDollar[3].colNameUnion(), Invisible: ptr.Of(true)}
 		}
 		yyVAL.union = yyLOCAL
-	case 547:
+	case 548:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL AlterOption
-//line sql.y:3057
+//line sql.y:3062
 		{
 			yyLOCAL = &AlterCheck{Name: yyDollar[3].identifierCI, Enforced: yyDollar[4].booleanUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 548:
+	case 549:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL AlterOption
-//line sql.y:3061
+//line sql.y:3066
 		{
 			yyLOCAL = &AlterIndex{Name: yyDollar[3].identifierCI, Invisible: false}
 		}
 		yyVAL.union = yyLOCAL
-	case 549:
+	case 550:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL AlterOption
-//line sql.y:3065
+//line sql.y:3070
 		{
 			yyLOCAL = &AlterIndex{Name: yyDollar[3].identifierCI, Invisible: true}
 		}
 		yyVAL.union = yyLOCAL
-	case 550:
+	case 551:
 		yyDollar = yyS[yypt-6 : yypt+1]
 		var yyLOCAL AlterOption
-//line sql.y:3069
+//line sql.y:3074
 		{
 			yyLOCAL = &ChangeColumn{OldColumn: yyDollar[3].colNameUnion(), NewColDefinition: yyDollar[4].columnDefinitionUnion(), First: yyDollar[5].booleanUnion(), After: yyDollar[6].colNameUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 551:
+	case 552:
 		yyDollar = yyS[yypt-5 : yypt+1]
 		var yyLOCAL AlterOption
-//line sql.y:3073
+//line sql.y:3078
 		{
 			yyLOCAL = &ModifyColumn{NewColDefinition: yyDollar[3].columnDefinitionUnion(), First: yyDollar[4].booleanUnion(), After: yyDollar[5].colNameUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 552:
+	case 553:
 		yyDollar = yyS[yypt-5 : yypt+1]
 		var yyLOCAL AlterOption
-//line sql.y:3077
+//line sql.y:3082
 		{
 			yyLOCAL = &RenameColumn{OldName: yyDollar[3].colNameUnion(), NewName: yyDollar[5].colNameUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 553:
+	case 554:
 		yyDollar = yyS[yypt-5 : yypt+1]
 		var yyLOCAL AlterOption
-//line sql.y:3081
+//line sql.y:3086
 		{
 			yyLOCAL = &AlterCharset{CharacterSet: yyDollar[4].str, Collate: yyDollar[5].str}
 		}
 		yyVAL.union = yyLOCAL
-	case 554:
+	case 555:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL AlterOption
-//line sql.y:3085
+//line sql.y:3090
 		{
 			yyLOCAL = &KeyState{Enable: false}
 		}
 		yyVAL.union = yyLOCAL
-	case 555:
+	case 556:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL AlterOption
-//line sql.y:3089
+//line sql.y:3094
 		{
 			yyLOCAL = &KeyState{Enable: true}
 		}
 		yyVAL.union = yyLOCAL
-	case 556:
+	case 557:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL AlterOption
-//line sql.y:3093
+//line sql.y:3098
 		{
 			yyLOCAL = &TablespaceOperation{Import: false}
 		}
 		yyVAL.union = yyLOCAL
-	case 557:
+	case 558:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL AlterOption
-//line sql.y:3097
+//line sql.y:3102
 		{
 			yyLOCAL = &TablespaceOperation{Import: true}
 		}
 		yyVAL.union = yyLOCAL
-	case 558:
+	case 559:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL AlterOption
-//line sql.y:3101
+//line sql.y:3106
 		{
 			yyLOCAL = &DropColumn{Name: yyDollar[3].colNameUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 559:
+	case 560:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL AlterOption
-//line sql.y:3105
+//line sql.y:3110
 		{
 			yyLOCAL = &DropKey{Type: NormalKeyType, Name: yyDollar[3].identifierCI}
 		}
 		yyVAL.union = yyLOCAL
-	case 560:
+	case 561:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL AlterOption
-//line sql.y:3109
+//line sql.y:3114
 		{
 			yyLOCAL = &DropKey{Type: PrimaryKeyType}
 		}
 		yyVAL.union = yyLOCAL
-	case 561:
+	case 562:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL AlterOption
-//line sql.y:3113
+//line sql.y:3118
 		{
 			yyLOCAL = &DropKey{Type: ForeignKeyType, Name: yyDollar[4].identifierCI}
 		}
 		yyVAL.union = yyLOCAL
-	case 562:
+	case 563:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL AlterOption
-//line sql.y:3117
+//line sql.y:3122
 		{
 			yyLOCAL = &DropKey{Type: CheckKeyType, Name: yyDollar[3].identifierCI}
 		}
 		yyVAL.union = yyLOCAL
-	case 563:
+	case 564:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL AlterOption
-//line sql.y:3121
+//line sql.y:3126
 		{
 			yyLOCAL = &DropKey{Type: CheckKeyType, Name: yyDollar[3].identifierCI}
 		}
 		yyVAL.union = yyLOCAL
-	case 564:
+	case 565:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL AlterOption
-//line sql.y:3125
+//line sql.y:3130
 		{
 			yyLOCAL = &Force{}
 		}
 		yyVAL.union = yyLOCAL
-	case 565:
+	case 566:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL AlterOption
-//line sql.y:3129
+//line sql.y:3134
 		{
 			yyLOCAL = &RenameTableName{Table: yyDollar[3].tableName}
 		}
 		yyVAL.union = yyLOCAL
-	case 566:
+	case 567:
 		yyDollar = yyS[yypt-5 : yypt+1]
 		var yyLOCAL AlterOption
-//line sql.y:3133
+//line sql.y:3138
 		{
 			yyLOCAL = &RenameIndex{OldName: yyDollar[3].identifierCI, NewName: yyDollar[5].identifierCI}
 		}
 		yyVAL.union = yyLOCAL
-	case 567:
+	case 568:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL []AlterOption
-//line sql.y:3139
+//line sql.y:3144
 		{
 			yyLOCAL = []AlterOption{yyDollar[1].alterOptionUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 568:
+	case 569:
 		yyDollar = yyS[yypt-3 : yypt+1]
-//line sql.y:3143
+//line sql.y:3148
 		{
 			yySLICE := (*[]AlterOption)(yyIaddr(yyVAL.union))
 			*yySLICE = append(*yySLICE, yyDollar[3].alterOptionUnion())
 		}
-	case 569:
+	case 570:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL AlterOption
-//line sql.y:3149
+//line sql.y:3154
 		{
 			yyLOCAL = AlgorithmValue(string(yyDollar[3].str))
 		}
 		yyVAL.union = yyLOCAL
-	case 570:
+	case 571:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL AlterOption
-//line sql.y:3153
+//line sql.y:3158
 		{
 			yyLOCAL = AlgorithmValue(string(yyDollar[3].str))
 		}
 		yyVAL.union = yyLOCAL
-	case 571:
+	case 572:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL AlterOption
-//line sql.y:3157
+//line sql.y:3162
 		{
 			yyLOCAL = AlgorithmValue(string(yyDollar[3].str))
 		}
 		yyVAL.union = yyLOCAL
-	case 572:
+	case 573:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL AlterOption
-//line sql.y:3161
+//line sql.y:3166
 		{
 			yyLOCAL = AlgorithmValue(string(yyDollar[3].str))
 		}
 		yyVAL.union = yyLOCAL
-	case 573:
+	case 574:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL AlterOption
-//line sql.y:3165
+//line sql.y:3170
 		{
 			yyLOCAL = &LockOption{Type: DefaultType}
 		}
 		yyVAL.union = yyLOCAL
-	case 574:
+	case 575:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL AlterOption
-//line sql.y:3169
+//line sql.y:3174
 		{
 			yyLOCAL = &LockOption{Type: NoneType}
 		}
 		yyVAL.union = yyLOCAL
-	case 575:
+	case 576:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL AlterOption
-//line sql.y:3173
+//line sql.y:3178
 		{
 			yyLOCAL = &LockOption{Type: SharedType}
 		}
 		yyVAL.union = yyLOCAL
-	case 576:
+	case 577:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL AlterOption
-//line sql.y:3177
+//line sql.y:3182
 		{
 			yyLOCAL = &LockOption{Type: ExclusiveType}
 		}
 		yyVAL.union = yyLOCAL
-	case 577:
+	case 578:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL AlterOption
-//line sql.y:3181
+//line sql.y:3186
 		{
 			yyLOCAL = &Validation{With: true}
 		}
 		yyVAL.union = yyLOCAL
-	case 578:
+	case 579:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL AlterOption
-//line sql.y:3185
+//line sql.y:3190
 		{
 			yyLOCAL = &Validation{With: false}
 		}
 		yyVAL.union = yyLOCAL
-	case 579:
+	case 580:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL Statement
-//line sql.y:3191
+//line sql.y:3196
 		{
 			yyDollar[1].alterTableUnion().FullyParsed = true
 			yyDollar[1].alterTableUnion().AlterOptions = yyDollar[2].alterOptionsUnion()
@@ -14277,10 +14286,10 @@ yydefault:
 			yyLOCAL = yyDollar[1].alterTableUnion()
 		}
 		yyVAL.union = yyLOCAL
-	case 580:
+	case 581:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Statement
-//line sql.y:3198
+//line sql.y:3203
 		{
 			yyDollar[1].alterTableUnion().FullyParsed = true
 			yyDollar[1].alterTableUnion().AlterOptions = yyDollar[2].alterOptionsUnion()
@@ -14288,10 +14297,10 @@ yydefault:
 			yyLOCAL = yyDollar[1].alterTableUnion()
 		}
 		yyVAL.union = yyLOCAL
-	case 581:
+	case 582:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Statement
-//line sql.y:3205
+//line sql.y:3210
 		{
 			yyDollar[1].alterTableUnion().FullyParsed = true
 			yyDollar[1].alterTableUnion().AlterOptions = yyDollar[2].alterOptionsUnion()
@@ -14299,28 +14308,28 @@ yydefault:
 			yyLOCAL = yyDollar[1].alterTableUnion()
 		}
 		yyVAL.union = yyLOCAL
-	case 582:
+	case 583:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL Statement
-//line sql.y:3212
+//line sql.y:3217
 		{
 			yyDollar[1].alterTableUnion().FullyParsed = true
 			yyDollar[1].alterTableUnion().PartitionSpec = yyDollar[2].partSpecUnion()
 			yyLOCAL = yyDollar[1].alterTableUnion()
 		}
 		yyVAL.union = yyLOCAL
-	case 583:
+	case 584:
 		yyDollar = yyS[yypt-11 : yypt+1]
 		var yyLOCAL Statement
-//line sql.y:3218
+//line sql.y:3223
 		{
 			yyLOCAL = &AlterView{ViewName: yyDollar[7].tableName, Comments: Comments(yyDollar[2].strs).Parsed(), Algorithm: yyDollar[3].str, Definer: yyDollar[4].definerUnion(), Security: yyDollar[5].str, Columns: yyDollar[8].columnsUnion(), Select: yyDollar[10].tableStmtUnion(), CheckOption: yyDollar[11].str}
 		}
 		yyVAL.union = yyLOCAL
-	case 584:
+	case 585:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL Statement
-//line sql.y:3228
+//line sql.y:3233
 		{
 			yyDollar[1].alterDatabaseUnion().FullyParsed = true
 			yyDollar[1].alterDatabaseUnion().DBName = yyDollar[2].identifierCS
@@ -14328,10 +14337,10 @@ yydefault:
 			yyLOCAL = yyDollar[1].alterDatabaseUnion()
 		}
 		yyVAL.union = yyLOCAL
-	case 585:
+	case 586:
 		yyDollar = yyS[yypt-6 : yypt+1]
 		var yyLOCAL Statement
-//line sql.y:3235
+//line sql.y:3240
 		{
 			yyDollar[1].alterDatabaseUnion().FullyParsed = true
 			yyDollar[1].alterDatabaseUnion().DBName = yyDollar[2].identifierCS
@@ -14339,10 +14348,10 @@ yydefault:
 			yyLOCAL = yyDollar[1].alterDatabaseUnion()
 		}
 		yyVAL.union = yyLOCAL
-	case 586:
+	case 587:
 		yyDollar = yyS[yypt-8 : yypt+1]
 		var yyLOCAL Statement
-//line sql.y:3242
+//line sql.y:3247
 		{
 			yyLOCAL = &AlterVschema{
 				Action: CreateVindexDDLAction,
@@ -14355,10 +14364,10 @@ yydefault:
 			}
 		}
 		yyVAL.union = yyLOCAL
-	case 587:
+	case 588:
 		yyDollar = yyS[yypt-6 : yypt+1]
 		var yyLOCAL Statement
-//line sql.y:3254
+//line sql.y:3259
 		{
 			yyLOCAL = &AlterVschema{
 				Action: DropVindexDDLAction,
@@ -14369,26 +14378,26 @@ yydefault:
 			}
 		}
 		yyVAL.union = yyLOCAL
-	case 588:
+	case 589:
 		yyDollar = yyS[yypt-6 : yypt+1]
 		var yyLOCAL Statement
-//line sql.y:3264
+//line sql.y:3269
 		{
 			yyLOCAL = &AlterVschema{Action: AddVschemaTableDDLAction, Table: yyDollar[6].tableName}
 		}
 		yyVAL.union = yyLOCAL
-	case 589:
+	case 590:
 		yyDollar = yyS[yypt-6 : yypt+1]
 		var yyLOCAL Statement
-//line sql.y:3268
+//line sql.y:3273
 		{
 			yyLOCAL = &AlterVschema{Action: DropVschemaTableDDLAction, Table: yyDollar[6].tableName}
 		}
 		yyVAL.union = yyLOCAL
-	case 590:
+	case 591:
 		yyDollar = yyS[yypt-13 : yypt+1]
 		var yyLOCAL Statement
-//line sql.y:3272
+//line sql.y:3277
 		{
 			yyLOCAL = &AlterVschema{
 				Action: AddColVindexDDLAction,
@@ -14402,10 +14411,10 @@ yydefault:
 			}
 		}
 		yyVAL.union = yyLOCAL
-	case 591:
+	case 592:
 		yyDollar = yyS[yypt-8 : yypt+1]
 		var yyLOCAL Statement
-//line sql.y:3285
+//line sql.y:3290
 		{
 			yyLOCAL = &AlterVschema{
 				Action: DropColVindexDDLAction,
@@ -14416,26 +14425,26 @@ yydefault:
 			}
 		}
 		yyVAL.union = yyLOCAL
-	case 592:
+	case 593:
 		yyDollar = yyS[yypt-6 : yypt+1]
 		var yyLOCAL Statement
-//line sql.y:3295
+//line sql.y:3300
 		{
 			yyLOCAL = &AlterVschema{Action: AddSequenceDDLAction, Table: yyDollar[6].tableName}
 		}
 		yyVAL.union = yyLOCAL
-	case 593:
+	case 594:
 		yyDollar = yyS[yypt-6 : yypt+1]
 		var yyLOCAL Statement
-//line sql.y:3299
+//line sql.y:3304
 		{
 			yyLOCAL = &AlterVschema{Action: DropSequenceDDLAction, Table: yyDollar[6].tableName}
 		}
 		yyVAL.union = yyLOCAL
-	case 594:
+	case 595:
 		yyDollar = yyS[yypt-10 : yypt+1]
 		var yyLOCAL Statement
-//line sql.y:3303
+//line sql.y:3308
 		{
 			yyLOCAL = &AlterVschema{
 				Action: AddAutoIncDDLAction,
@@ -14447,10 +14456,10 @@ yydefault:
 			}
 		}
 		yyVAL.union = yyLOCAL
-	case 595:
+	case 596:
 		yyDollar = yyS[yypt-7 : yypt+1]
 		var yyLOCAL Statement
-//line sql.y:3314
+//line sql.y:3319
 		{
 			yyLOCAL = &AlterVschema{
 				Action: DropAutoIncDDLAction,
@@ -14458,10 +14467,10 @@ yydefault:
 			}
 		}
 		yyVAL.union = yyLOCAL
-	case 596:
+	case 597:
 		yyDollar = yyS[yypt-5 : yypt+1]
 		var yyLOCAL Statement
-//line sql.y:3321
+//line sql.y:3326
 		{
 			yyLOCAL = &AlterMigration{
 				Type: RetryMigrationType,
@@ -14469,10 +14478,10 @@ yydefault:
 			}
 		}
 		yyVAL.union = yyLOCAL
-	case 597:
+	case 598:
 		yyDollar = yyS[yypt-5 : yypt+1]
 		var yyLOCAL Statement
-//line sql.y:3328
+//line sql.y:3333
 		{
 			yyLOCAL = &AlterMigration{
 				Type: CleanupMigrationType,
@@ -14480,20 +14489,20 @@ yydefault:
 			}
 		}
 		yyVAL.union = yyLOCAL
-	case 598:
+	case 599:
 		yyDollar = yyS[yypt-5 : yypt+1]
 		var yyLOCAL Statement
-//line sql.y:3335
+//line sql.y:3340
 		{
 			yyLOCAL = &AlterMigration{
 				Type: CleanupAllMigrationType,
 			}
 		}
 		yyVAL.union = yyLOCAL
-	case 599:
+	case 600:
 		yyDollar = yyS[yypt-5 : yypt+1]
 		var yyLOCAL Statement
-//line sql.y:3341
+//line sql.y:3346
 		{
 			yyLOCAL = &AlterMigration{
 				Type: LaunchMigrationType,
@@ -14501,10 +14510,10 @@ yydefault:
 			}
 		}
 		yyVAL.union = yyLOCAL
-	case 600:
+	case 601:
 		yyDollar = yyS[yypt-7 : yypt+1]
 		var yyLOCAL Statement
-//line sql.y:3348
+//line sql.y:3353
 		{
 			yyLOCAL = &AlterMigration{
 				Type:   LaunchMigrationType,
@@ -14513,20 +14522,20 @@ yydefault:
 			}
 		}
 		yyVAL.union = yyLOCAL
-	case 601:
+	case 602:
 		yyDollar = yyS[yypt-5 : yypt+1]
 		var yyLOCAL Statement
-//line sql.y:3356
+//line sql.y:3361
 		{
 			yyLOCAL = &AlterMigration{
 				Type: LaunchAllMigrationType,
 			}
 		}
 		yyVAL.union = yyLOCAL
-	case 602:
+	case 603:
 		yyDollar = yyS[yypt-5 : yypt+1]
 		var yyLOCAL Statement
-//line sql.y:3362
+//line sql.y:3367
 		{
 			yyLOCAL = &AlterMigration{
 				Type: CompleteMigrationType,
@@ -14534,20 +14543,20 @@ yydefault:
 			}
 		}
 		yyVAL.union = yyLOCAL
-	case 603:
+	case 604:
 		yyDollar = yyS[yypt-5 : yypt+1]
 		var yyLOCAL Statement
-//line sql.y:3369
+//line sql.y:3374
 		{
 			yyLOCAL = &AlterMigration{
 				Type: CompleteAllMigrationType,
 			}
 		}
 		yyVAL.union = yyLOCAL
-	case 604:
+	case 605:
 		yyDollar = yyS[yypt-5 : yypt+1]
 		var yyLOCAL Statement
-//line sql.y:3375
+//line sql.y:3380
 		{
 			yyLOCAL = &AlterMigration{
 				Type: CancelMigrationType,
@@ -14555,20 +14564,20 @@ yydefault:
 			}
 		}
 		yyVAL.union = yyLOCAL
-	case 605:
+	case 606:
 		yyDollar = yyS[yypt-5 : yypt+1]
 		var yyLOCAL Statement
-//line sql.y:3382
+//line sql.y:3387
 		{
 			yyLOCAL = &AlterMigration{
 				Type: CancelAllMigrationType,
 			}
 		}
 		yyVAL.union = yyLOCAL
-	case 606:
+	case 607:
 		yyDollar = yyS[yypt-7 : yypt+1]
 		var yyLOCAL Statement
-//line sql.y:3388
+//line sql.y:3393
 		{
 			yyLOCAL = &AlterMigration{
 				Type:   ThrottleMigrationType,
@@ -14578,10 +14587,10 @@ yydefault:
 			}
 		}
 		yyVAL.union = yyLOCAL
-	case 607:
+	case 608:
 		yyDollar = yyS[yypt-7 : yypt+1]
 		var yyLOCAL Statement
-//line sql.y:3397
+//line sql.y:3402
 		{
 			yyLOCAL = &AlterMigration{
 				Type:   ThrottleAllMigrationType,
@@ -14590,10 +14599,10 @@ yydefault:
 			}
 		}
 		yyVAL.union = yyLOCAL
-	case 608:
+	case 609:
 		yyDollar = yyS[yypt-5 : yypt+1]
 		var yyLOCAL Statement
-//line sql.y:3405
+//line sql.y:3410
 		{
 			yyLOCAL = &AlterMigration{
 				Type: UnthrottleMigrationType,
@@ -14601,20 +14610,20 @@ yydefault:
 			}
 		}
 		yyVAL.union = yyLOCAL
-	case 609:
+	case 610:
 		yyDollar = yyS[yypt-5 : yypt+1]
 		var yyLOCAL Statement
-//line sql.y:3412
+//line sql.y:3417
 		{
 			yyLOCAL = &AlterMigration{
 				Type: UnthrottleAllMigrationType,
 			}
 		}
 		yyVAL.union = yyLOCAL
-	case 610:
+	case 611:
 		yyDollar = yyS[yypt-5 : yypt+1]
 		var yyLOCAL Statement
-//line sql.y:3418
+//line sql.y:3423
 		{
 			yyLOCAL = &AlterMigration{
 				Type: ForceCutOverMigrationType,
@@ -14622,20 +14631,20 @@ yydefault:
 			}
 		}
 		yyVAL.union = yyLOCAL
-	case 611:
+	case 612:
 		yyDollar = yyS[yypt-5 : yypt+1]
 		var yyLOCAL Statement
-//line sql.y:3425
+//line sql.y:3430
 		{
 			yyLOCAL = &AlterMigration{
 				Type: ForceCutOverAllMigrationType,
 			}
 		}
 		yyVAL.union = yyLOCAL
-	case 612:
+	case 613:
 		yyDollar = yyS[yypt-6 : yypt+1]
 		var yyLOCAL Statement
-//line sql.y:3431
+//line sql.y:3436
 		{
 			yyLOCAL = &AlterMigration{
 				Type:      SetCutOverThresholdMigrationType,
@@ -14644,18 +14653,18 @@ yydefault:
 			}
 		}
 		yyVAL.union = yyLOCAL
-	case 613:
+	case 614:
 		yyDollar = yyS[yypt-0 : yypt+1]
 		var yyLOCAL *PartitionOption
-//line sql.y:3440
+//line sql.y:3445
 		{
 			yyLOCAL = nil
 		}
 		yyVAL.union = yyLOCAL
-	case 614:
+	case 615:
 		yyDollar = yyS[yypt-6 : yypt+1]
 		var yyLOCAL *PartitionOption
-//line sql.y:3444
+//line sql.y:3449
 		{
 			yyDollar[3].partitionOptionUnion().Partitions = yyDollar[4].integerUnion()
 			yyDollar[3].partitionOptionUnion().SubPartition = yyDollar[5].subPartitionUnion()
@@ -14663,10 +14672,10 @@ yydefault:
 			yyLOCAL = yyDollar[3].partitionOptionUnion()
 		}
 		yyVAL.union = yyLOCAL
-	case 615:
+	case 616:
 		yyDollar = yyS[yypt-5 : yypt+1]
 		var yyLOCAL *PartitionOption
-//line sql.y:3453
+//line sql.y:3458
 		{
 			yyLOCAL = &PartitionOption{
 				IsLinear: yyDollar[1].booleanUnion(),
@@ -14675,10 +14684,10 @@ yydefault:
 			}
 		}
 		yyVAL.union = yyLOCAL
-	case 616:
+	case 617:
 		yyDollar = yyS[yypt-6 : yypt+1]
 		var yyLOCAL *PartitionOption
-//line sql.y:3461
+//line sql.y:3466
 		{
 			yyLOCAL = &PartitionOption{
 				IsLinear:     yyDollar[1].booleanUnion(),
@@ -14688,10 +14697,10 @@ yydefault:
 			}
 		}
 		yyVAL.union = yyLOCAL
-	case 617:
+	case 618:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL *PartitionOption
-//line sql.y:3470
+//line sql.y:3475
 		{
 			yyLOCAL = &PartitionOption{
 				Type: yyDollar[1].partitionByTypeUnion(),
@@ -14699,10 +14708,10 @@ yydefault:
 			}
 		}
 		yyVAL.union = yyLOCAL
-	case 618:
+	case 619:
 		yyDollar = yyS[yypt-5 : yypt+1]
 		var yyLOCAL *PartitionOption
-//line sql.y:3477
+//line sql.y:3482
 		{
 			yyLOCAL = &PartitionOption{
 				Type:    yyDollar[1].partitionByTypeUnion(),
@@ -14710,18 +14719,18 @@ yydefault:
 			}
 		}
 		yyVAL.union = yyLOCAL
-	case 619:
+	case 620:
 		yyDollar = yyS[yypt-0 : yypt+1]
 		var yyLOCAL *SubPartition
-//line sql.y:3485
+//line sql.y:3490
 		{
 			yyLOCAL = nil
 		}
 		yyVAL.union = yyLOCAL
-	case 620:
+	case 621:
 		yyDollar = yyS[yypt-8 : yypt+1]
 		var yyLOCAL *SubPartition
-//line sql.y:3489
+//line sql.y:3494
 		{
 			yyLOCAL = &SubPartition{
 				IsLinear:      yyDollar[3].booleanUnion(),
@@ -14731,10 +14740,10 @@ yydefault:
 			}
 		}
 		yyVAL.union = yyLOCAL
-	case 621:
+	case 622:
 		yyDollar = yyS[yypt-9 : yypt+1]
 		var yyLOCAL *SubPartition
-//line sql.y:3498
+//line sql.y:3503
 		{
 			yyLOCAL = &SubPartition{
 				IsLinear:      yyDollar[3].booleanUnion(),
@@ -14745,506 +14754,497 @@ yydefault:
 			}
 		}
 		yyVAL.union = yyLOCAL
-	case 622:
+	case 623:
 		yyDollar = yyS[yypt-0 : yypt+1]
 		var yyLOCAL []*PartitionDefinition
-//line sql.y:3509
+//line sql.y:3514
 		{
 			yyLOCAL = nil
 		}
 		yyVAL.union = yyLOCAL
-	case 623:
+	case 624:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL []*PartitionDefinition
-//line sql.y:3513
+//line sql.y:3518
 		{
 			yyLOCAL = yyDollar[2].partDefsUnion()
 		}
 		yyVAL.union = yyLOCAL
-	case 624:
+	case 625:
 		yyDollar = yyS[yypt-0 : yypt+1]
 		var yyLOCAL bool
-//line sql.y:3518
+//line sql.y:3523
 		{
 			yyLOCAL = false
 		}
 		yyVAL.union = yyLOCAL
-	case 625:
+	case 626:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL bool
-//line sql.y:3522
+//line sql.y:3527
 		{
 			yyLOCAL = true
 		}
 		yyVAL.union = yyLOCAL
-	case 626:
+	case 627:
 		yyDollar = yyS[yypt-0 : yypt+1]
 		var yyLOCAL int
-//line sql.y:3527
+//line sql.y:3532
 		{
 			yyLOCAL = 0
 		}
 		yyVAL.union = yyLOCAL
-	case 627:
+	case 628:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL int
-//line sql.y:3531
+//line sql.y:3536
 		{
 			yyLOCAL = convertStringToInt(yyDollar[3].str)
 		}
 		yyVAL.union = yyLOCAL
-	case 628:
+	case 629:
 		yyDollar = yyS[yypt-8 : yypt+1]
 		var yyLOCAL TableExpr
-//line sql.y:3537
+//line sql.y:3542
 		{
 			yyLOCAL = &JSONTableExpr{Expr: yyDollar[3].exprUnion(), Filter: yyDollar[5].exprUnion(), Columns: yyDollar[6].jtColumnListUnion(), Alias: yyDollar[8].identifierCS}
 		}
 		yyVAL.union = yyLOCAL
-	case 629:
+	case 630:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL []*JtColumnDefinition
-//line sql.y:3543
+//line sql.y:3548
 		{
 			yyLOCAL = yyDollar[3].jtColumnListUnion()
 		}
 		yyVAL.union = yyLOCAL
-	case 630:
+	case 631:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL []*JtColumnDefinition
-//line sql.y:3549
+//line sql.y:3554
 		{
 			yyLOCAL = []*JtColumnDefinition{yyDollar[1].jtColumnDefinitionUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 631:
+	case 632:
 		yyDollar = yyS[yypt-3 : yypt+1]
-//line sql.y:3553
+//line sql.y:3558
 		{
 			yySLICE := (*[]*JtColumnDefinition)(yyIaddr(yyVAL.union))
 			*yySLICE = append(*yySLICE, yyDollar[3].jtColumnDefinitionUnion())
 		}
-	case 632:
+	case 633:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL *JtColumnDefinition
-//line sql.y:3559
+//line sql.y:3564
 		{
 			yyLOCAL = &JtColumnDefinition{JtOrdinal: &JtOrdinalColDef{Name: yyDollar[1].identifierCI}}
 		}
 		yyVAL.union = yyLOCAL
-	case 633:
+	case 634:
 		yyDollar = yyS[yypt-6 : yypt+1]
 		var yyLOCAL *JtColumnDefinition
-//line sql.y:3563
+//line sql.y:3568
 		{
 			yyDollar[2].columnType.Options = &ColumnTypeOptions{Collate: yyDollar[3].str}
 			jtPath := &JtPathColDef{Name: yyDollar[1].identifierCI, Type: yyDollar[2].columnType, JtColExists: yyDollar[4].booleanUnion(), Path: yyDollar[6].exprUnion()}
 			yyLOCAL = &JtColumnDefinition{JtPath: jtPath}
 		}
 		yyVAL.union = yyLOCAL
-	case 634:
+	case 635:
 		yyDollar = yyS[yypt-7 : yypt+1]
 		var yyLOCAL *JtColumnDefinition
-//line sql.y:3569
+//line sql.y:3574
 		{
 			yyDollar[2].columnType.Options = &ColumnTypeOptions{Collate: yyDollar[3].str}
 			jtPath := &JtPathColDef{Name: yyDollar[1].identifierCI, Type: yyDollar[2].columnType, JtColExists: yyDollar[4].booleanUnion(), Path: yyDollar[6].exprUnion(), EmptyOnResponse: yyDollar[7].jtOnResponseUnion()}
 			yyLOCAL = &JtColumnDefinition{JtPath: jtPath}
 		}
 		yyVAL.union = yyLOCAL
-	case 635:
+	case 636:
 		yyDollar = yyS[yypt-7 : yypt+1]
 		var yyLOCAL *JtColumnDefinition
-//line sql.y:3575
+//line sql.y:3580
 		{
 			yyDollar[2].columnType.Options = &ColumnTypeOptions{Collate: yyDollar[3].str}
 			jtPath := &JtPathColDef{Name: yyDollar[1].identifierCI, Type: yyDollar[2].columnType, JtColExists: yyDollar[4].booleanUnion(), Path: yyDollar[6].exprUnion(), ErrorOnResponse: yyDollar[7].jtOnResponseUnion()}
 			yyLOCAL = &JtColumnDefinition{JtPath: jtPath}
 		}
 		yyVAL.union = yyLOCAL
-	case 636:
+	case 637:
 		yyDollar = yyS[yypt-8 : yypt+1]
 		var yyLOCAL *JtColumnDefinition
-//line sql.y:3581
+//line sql.y:3586
 		{
 			yyDollar[2].columnType.Options = &ColumnTypeOptions{Collate: yyDollar[3].str}
 			jtPath := &JtPathColDef{Name: yyDollar[1].identifierCI, Type: yyDollar[2].columnType, JtColExists: yyDollar[4].booleanUnion(), Path: yyDollar[6].exprUnion(), EmptyOnResponse: yyDollar[7].jtOnResponseUnion(), ErrorOnResponse: yyDollar[8].jtOnResponseUnion()}
 			yyLOCAL = &JtColumnDefinition{JtPath: jtPath}
 		}
 		yyVAL.union = yyLOCAL
-	case 637:
+	case 638:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL *JtColumnDefinition
-//line sql.y:3587
+//line sql.y:3592
 		{
 			jtNestedPath := &JtNestedPathColDef{Path: yyDollar[3].exprUnion(), Columns: yyDollar[4].jtColumnListUnion()}
 			yyLOCAL = &JtColumnDefinition{JtNestedPath: jtNestedPath}
 		}
 		yyVAL.union = yyLOCAL
-	case 638:
+	case 639:
 		yyDollar = yyS[yypt-0 : yypt+1]
 		var yyLOCAL bool
-//line sql.y:3593
+//line sql.y:3598
 		{
 			yyLOCAL = false
 		}
 		yyVAL.union = yyLOCAL
-	case 639:
+	case 640:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL bool
-//line sql.y:3597
+//line sql.y:3602
 		{
 			yyLOCAL = true
 		}
 		yyVAL.union = yyLOCAL
-	case 640:
+	case 641:
 		yyDollar = yyS[yypt-0 : yypt+1]
 		var yyLOCAL bool
-//line sql.y:3601
+//line sql.y:3606
 		{
 			yyLOCAL = false
 		}
 		yyVAL.union = yyLOCAL
-	case 641:
+	case 642:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL bool
-//line sql.y:3605
+//line sql.y:3610
 		{
 			yyLOCAL = true
 		}
 		yyVAL.union = yyLOCAL
-	case 642:
+	case 643:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL *JtOnResponse
-//line sql.y:3611
+//line sql.y:3616
 		{
 			yyLOCAL = yyDollar[1].jtOnResponseUnion()
 		}
 		yyVAL.union = yyLOCAL
-	case 643:
+	case 644:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL *JtOnResponse
-//line sql.y:3617
+//line sql.y:3622
 		{
 			yyLOCAL = yyDollar[1].jtOnResponseUnion()
 		}
 		yyVAL.union = yyLOCAL
-	case 644:
+	case 645:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL *JtOnResponse
-//line sql.y:3623
+//line sql.y:3628
 		{
 			yyLOCAL = &JtOnResponse{ResponseType: ErrorJSONType}
 		}
 		yyVAL.union = yyLOCAL
-	case 645:
+	case 646:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL *JtOnResponse
-//line sql.y:3627
+//line sql.y:3632
 		{
 			yyLOCAL = &JtOnResponse{ResponseType: NullJSONType}
 		}
 		yyVAL.union = yyLOCAL
-	case 646:
+	case 647:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL *JtOnResponse
-//line sql.y:3631
+//line sql.y:3636
 		{
 			yyLOCAL = &JtOnResponse{ResponseType: DefaultJSONType, Expr: yyDollar[2].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 647:
+	case 648:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL PartitionByType
-//line sql.y:3637
+//line sql.y:3642
 		{
 			yyLOCAL = RangeType
 		}
 		yyVAL.union = yyLOCAL
-	case 648:
+	case 649:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL PartitionByType
-//line sql.y:3641
+//line sql.y:3646
 		{
 			yyLOCAL = ListType
 		}
 		yyVAL.union = yyLOCAL
-	case 649:
+	case 650:
 		yyDollar = yyS[yypt-0 : yypt+1]
 		var yyLOCAL int
-//line sql.y:3646
+//line sql.y:3651
 		{
 			yyLOCAL = -1
 		}
 		yyVAL.union = yyLOCAL
-	case 650:
+	case 651:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL int
-//line sql.y:3650
+//line sql.y:3655
 		{
 			yyLOCAL = convertStringToInt(yyDollar[2].str)
 		}
 		yyVAL.union = yyLOCAL
-	case 651:
+	case 652:
 		yyDollar = yyS[yypt-0 : yypt+1]
 		var yyLOCAL int
-//line sql.y:3655
+//line sql.y:3660
 		{
 			yyLOCAL = -1
 		}
 		yyVAL.union = yyLOCAL
-	case 652:
+	case 653:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL int
-//line sql.y:3659
+//line sql.y:3664
 		{
 			yyLOCAL = convertStringToInt(yyDollar[2].str)
 		}
 		yyVAL.union = yyLOCAL
-	case 653:
+	case 654:
 		yyDollar = yyS[yypt-5 : yypt+1]
 		var yyLOCAL *PartitionSpec
-//line sql.y:3665
+//line sql.y:3670
 		{
 			yyLOCAL = &PartitionSpec{Action: AddAction, Definitions: []*PartitionDefinition{yyDollar[4].partDefUnion()}}
 		}
 		yyVAL.union = yyLOCAL
-	case 654:
+	case 655:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL *PartitionSpec
-//line sql.y:3669
+//line sql.y:3674
 		{
 			yyLOCAL = &PartitionSpec{Action: DropAction, Names: yyDollar[3].partitionsUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 655:
+	case 656:
 		yyDollar = yyS[yypt-7 : yypt+1]
 		var yyLOCAL *PartitionSpec
-//line sql.y:3673
+//line sql.y:3678
 		{
 			yyLOCAL = &PartitionSpec{Action: ReorganizeAction, Names: yyDollar[3].partitionsUnion(), Definitions: yyDollar[6].partDefsUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 656:
+	case 657:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL *PartitionSpec
-//line sql.y:3677
+//line sql.y:3682
 		{
 			yyLOCAL = &PartitionSpec{Action: DiscardAction, Names: yyDollar[3].partitionsUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 657:
+	case 658:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL *PartitionSpec
-//line sql.y:3681
+//line sql.y:3686
 		{
 			yyLOCAL = &PartitionSpec{Action: DiscardAction, IsAll: true}
 		}
 		yyVAL.union = yyLOCAL
-	case 658:
+	case 659:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL *PartitionSpec
-//line sql.y:3685
+//line sql.y:3690
 		{
 			yyLOCAL = &PartitionSpec{Action: ImportAction, Names: yyDollar[3].partitionsUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 659:
+	case 660:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL *PartitionSpec
-//line sql.y:3689
+//line sql.y:3694
 		{
 			yyLOCAL = &PartitionSpec{Action: ImportAction, IsAll: true}
 		}
 		yyVAL.union = yyLOCAL
-	case 660:
+	case 661:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL *PartitionSpec
-//line sql.y:3693
+//line sql.y:3698
 		{
 			yyLOCAL = &PartitionSpec{Action: TruncateAction, Names: yyDollar[3].partitionsUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 661:
+	case 662:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL *PartitionSpec
-//line sql.y:3697
+//line sql.y:3702
 		{
 			yyLOCAL = &PartitionSpec{Action: TruncateAction, IsAll: true}
 		}
 		yyVAL.union = yyLOCAL
-	case 662:
+	case 663:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL *PartitionSpec
-//line sql.y:3701
+//line sql.y:3706
 		{
 			yyLOCAL = &PartitionSpec{Action: CoalesceAction, Number: NewIntLiteral(yyDollar[3].str)}
 		}
 		yyVAL.union = yyLOCAL
-	case 663:
+	case 664:
 		yyDollar = yyS[yypt-7 : yypt+1]
 		var yyLOCAL *PartitionSpec
-//line sql.y:3705
+//line sql.y:3710
 		{
 			yyLOCAL = &PartitionSpec{Action: ExchangeAction, Names: Partitions{yyDollar[3].identifierCI}, TableName: yyDollar[6].tableName, WithoutValidation: yyDollar[7].booleanUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 664:
+	case 665:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL *PartitionSpec
-//line sql.y:3709
+//line sql.y:3714
 		{
 			yyLOCAL = &PartitionSpec{Action: AnalyzeAction, Names: yyDollar[3].partitionsUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 665:
+	case 666:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL *PartitionSpec
-//line sql.y:3713
+//line sql.y:3718
 		{
 			yyLOCAL = &PartitionSpec{Action: AnalyzeAction, IsAll: true}
 		}
 		yyVAL.union = yyLOCAL
-	case 666:
+	case 667:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL *PartitionSpec
-//line sql.y:3717
+//line sql.y:3722
 		{
 			yyLOCAL = &PartitionSpec{Action: CheckAction, Names: yyDollar[3].partitionsUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 667:
+	case 668:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL *PartitionSpec
-//line sql.y:3721
+//line sql.y:3726
 		{
 			yyLOCAL = &PartitionSpec{Action: CheckAction, IsAll: true}
 		}
 		yyVAL.union = yyLOCAL
-	case 668:
+	case 669:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL *PartitionSpec
-//line sql.y:3725
+//line sql.y:3730
 		{
 			yyLOCAL = &PartitionSpec{Action: OptimizeAction, Names: yyDollar[3].partitionsUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 669:
+	case 670:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL *PartitionSpec
-//line sql.y:3729
+//line sql.y:3734
 		{
 			yyLOCAL = &PartitionSpec{Action: OptimizeAction, IsAll: true}
 		}
 		yyVAL.union = yyLOCAL
-	case 670:
+	case 671:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL *PartitionSpec
-//line sql.y:3733
+//line sql.y:3738
 		{
 			yyLOCAL = &PartitionSpec{Action: RebuildAction, Names: yyDollar[3].partitionsUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 671:
+	case 672:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL *PartitionSpec
-//line sql.y:3737
+//line sql.y:3742
 		{
 			yyLOCAL = &PartitionSpec{Action: RebuildAction, IsAll: true}
 		}
 		yyVAL.union = yyLOCAL
-	case 672:
+	case 673:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL *PartitionSpec
-//line sql.y:3741
+//line sql.y:3746
 		{
 			yyLOCAL = &PartitionSpec{Action: RepairAction, Names: yyDollar[3].partitionsUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 673:
+	case 674:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL *PartitionSpec
-//line sql.y:3745
+//line sql.y:3750
 		{
 			yyLOCAL = &PartitionSpec{Action: RepairAction, IsAll: true}
 		}
 		yyVAL.union = yyLOCAL
-	case 674:
+	case 675:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL *PartitionSpec
-//line sql.y:3749
+//line sql.y:3754
 		{
 			yyLOCAL = &PartitionSpec{Action: UpgradeAction}
 		}
 		yyVAL.union = yyLOCAL
-	case 675:
+	case 676:
 		yyDollar = yyS[yypt-0 : yypt+1]
 		var yyLOCAL bool
-//line sql.y:3754
+//line sql.y:3759
 		{
 			yyLOCAL = false
 		}
 		yyVAL.union = yyLOCAL
-	case 676:
+	case 677:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL bool
-//line sql.y:3758
+//line sql.y:3763
 		{
 			yyLOCAL = false
 		}
 		yyVAL.union = yyLOCAL
-	case 677:
+	case 678:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL bool
-//line sql.y:3762
+//line sql.y:3767
 		{
 			yyLOCAL = true
 		}
 		yyVAL.union = yyLOCAL
-	case 678:
+	case 679:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL []*PartitionDefinition
-//line sql.y:3768
+//line sql.y:3773
 		{
 			yyLOCAL = []*PartitionDefinition{yyDollar[1].partDefUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 679:
+	case 680:
 		yyDollar = yyS[yypt-3 : yypt+1]
-//line sql.y:3772
+//line sql.y:3777
 		{
 			yySLICE := (*[]*PartitionDefinition)(yyIaddr(yyVAL.union))
 			*yySLICE = append(*yySLICE, yyDollar[3].partDefUnion())
 		}
-	case 680:
+	case 681:
 		yyDollar = yyS[yypt-2 : yypt+1]
-//line sql.y:3778
+//line sql.y:3783
 		{
 			yyVAL.partDefUnion().Options = yyDollar[2].partitionDefinitionOptionsUnion()
 		}
-	case 681:
+	case 682:
 		yyDollar = yyS[yypt-0 : yypt+1]
 		var yyLOCAL *PartitionDefinitionOptions
-//line sql.y:3783
+//line sql.y:3788
 		{
 			yyLOCAL = &PartitionDefinitionOptions{}
 		}
 		yyVAL.union = yyLOCAL
-	case 682:
-		yyDollar = yyS[yypt-2 : yypt+1]
-		var yyLOCAL *PartitionDefinitionOptions
-//line sql.y:3787
-		{
-			yyDollar[1].partitionDefinitionOptionsUnion().ValueRange = yyDollar[2].partitionValueRangeUnion()
-			yyLOCAL = yyDollar[1].partitionDefinitionOptionsUnion()
-		}
-		yyVAL.union = yyLOCAL
 	case 683:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL *PartitionDefinitionOptions
 //line sql.y:3792
 		{
-			yyDollar[1].partitionDefinitionOptionsUnion().Comment = yyDollar[2].literalUnion()
+			yyDollar[1].partitionDefinitionOptionsUnion().ValueRange = yyDollar[2].partitionValueRangeUnion()
 			yyLOCAL = yyDollar[1].partitionDefinitionOptionsUnion()
 		}
 		yyVAL.union = yyLOCAL
@@ -15253,7 +15253,7 @@ yydefault:
 		var yyLOCAL *PartitionDefinitionOptions
 //line sql.y:3797
 		{
-			yyDollar[1].partitionDefinitionOptionsUnion().Engine = yyDollar[2].partitionEngineUnion()
+			yyDollar[1].partitionDefinitionOptionsUnion().Comment = yyDollar[2].literalUnion()
 			yyLOCAL = yyDollar[1].partitionDefinitionOptionsUnion()
 		}
 		yyVAL.union = yyLOCAL
@@ -15262,7 +15262,7 @@ yydefault:
 		var yyLOCAL *PartitionDefinitionOptions
 //line sql.y:3802
 		{
-			yyDollar[1].partitionDefinitionOptionsUnion().DataDirectory = yyDollar[2].literalUnion()
+			yyDollar[1].partitionDefinitionOptionsUnion().Engine = yyDollar[2].partitionEngineUnion()
 			yyLOCAL = yyDollar[1].partitionDefinitionOptionsUnion()
 		}
 		yyVAL.union = yyLOCAL
@@ -15271,7 +15271,7 @@ yydefault:
 		var yyLOCAL *PartitionDefinitionOptions
 //line sql.y:3807
 		{
-			yyDollar[1].partitionDefinitionOptionsUnion().IndexDirectory = yyDollar[2].literalUnion()
+			yyDollar[1].partitionDefinitionOptionsUnion().DataDirectory = yyDollar[2].literalUnion()
 			yyLOCAL = yyDollar[1].partitionDefinitionOptionsUnion()
 		}
 		yyVAL.union = yyLOCAL
@@ -15280,7 +15280,7 @@ yydefault:
 		var yyLOCAL *PartitionDefinitionOptions
 //line sql.y:3812
 		{
-			yyDollar[1].partitionDefinitionOptionsUnion().MaxRows = ptr.Of(yyDollar[2].integerUnion())
+			yyDollar[1].partitionDefinitionOptionsUnion().IndexDirectory = yyDollar[2].literalUnion()
 			yyLOCAL = yyDollar[1].partitionDefinitionOptionsUnion()
 		}
 		yyVAL.union = yyLOCAL
@@ -15289,7 +15289,7 @@ yydefault:
 		var yyLOCAL *PartitionDefinitionOptions
 //line sql.y:3817
 		{
-			yyDollar[1].partitionDefinitionOptionsUnion().MinRows = ptr.Of(yyDollar[2].integerUnion())
+			yyDollar[1].partitionDefinitionOptionsUnion().MaxRows = ptr.Of(yyDollar[2].integerUnion())
 			yyLOCAL = yyDollar[1].partitionDefinitionOptionsUnion()
 		}
 		yyVAL.union = yyLOCAL
@@ -15298,7 +15298,7 @@ yydefault:
 		var yyLOCAL *PartitionDefinitionOptions
 //line sql.y:3822
 		{
-			yyDollar[1].partitionDefinitionOptionsUnion().TableSpace = yyDollar[2].str
+			yyDollar[1].partitionDefinitionOptionsUnion().MinRows = ptr.Of(yyDollar[2].integerUnion())
 			yyLOCAL = yyDollar[1].partitionDefinitionOptionsUnion()
 		}
 		yyVAL.union = yyLOCAL
@@ -15307,64 +15307,64 @@ yydefault:
 		var yyLOCAL *PartitionDefinitionOptions
 //line sql.y:3827
 		{
-			yyDollar[1].partitionDefinitionOptionsUnion().SubPartitionDefinitions = yyDollar[2].subPartitionDefinitionsUnion()
+			yyDollar[1].partitionDefinitionOptionsUnion().TableSpace = yyDollar[2].str
 			yyLOCAL = yyDollar[1].partitionDefinitionOptionsUnion()
 		}
 		yyVAL.union = yyLOCAL
 	case 691:
+		yyDollar = yyS[yypt-2 : yypt+1]
+		var yyLOCAL *PartitionDefinitionOptions
+//line sql.y:3832
+		{
+			yyDollar[1].partitionDefinitionOptionsUnion().SubPartitionDefinitions = yyDollar[2].subPartitionDefinitionsUnion()
+			yyLOCAL = yyDollar[1].partitionDefinitionOptionsUnion()
+		}
+		yyVAL.union = yyLOCAL
+	case 692:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL SubPartitionDefinitions
-//line sql.y:3833
+//line sql.y:3838
 		{
 			yyLOCAL = yyDollar[2].subPartitionDefinitionsUnion()
 		}
 		yyVAL.union = yyLOCAL
-	case 692:
+	case 693:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL SubPartitionDefinitions
-//line sql.y:3839
+//line sql.y:3844
 		{
 			yyLOCAL = SubPartitionDefinitions{yyDollar[1].subPartitionDefinitionUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 693:
+	case 694:
 		yyDollar = yyS[yypt-3 : yypt+1]
-//line sql.y:3843
+//line sql.y:3848
 		{
 			yySLICE := (*SubPartitionDefinitions)(yyIaddr(yyVAL.union))
 			*yySLICE = append(*yySLICE, yyDollar[3].subPartitionDefinitionUnion())
 		}
-	case 694:
+	case 695:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL *SubPartitionDefinition
-//line sql.y:3849
+//line sql.y:3854
 		{
 			yyLOCAL = &SubPartitionDefinition{Name: yyDollar[2].identifierCI, Options: yyDollar[3].subPartitionDefinitionOptionsUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 695:
+	case 696:
 		yyDollar = yyS[yypt-0 : yypt+1]
 		var yyLOCAL *SubPartitionDefinitionOptions
-//line sql.y:3854
+//line sql.y:3859
 		{
 			yyLOCAL = &SubPartitionDefinitionOptions{}
 		}
 		yyVAL.union = yyLOCAL
-	case 696:
-		yyDollar = yyS[yypt-2 : yypt+1]
-		var yyLOCAL *SubPartitionDefinitionOptions
-//line sql.y:3858
-		{
-			yyDollar[1].subPartitionDefinitionOptionsUnion().Comment = yyDollar[2].literalUnion()
-			yyLOCAL = yyDollar[1].subPartitionDefinitionOptionsUnion()
-		}
-		yyVAL.union = yyLOCAL
 	case 697:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL *SubPartitionDefinitionOptions
 //line sql.y:3863
 		{
-			yyDollar[1].subPartitionDefinitionOptionsUnion().Engine = yyDollar[2].partitionEngineUnion()
+			yyDollar[1].subPartitionDefinitionOptionsUnion().Comment = yyDollar[2].literalUnion()
 			yyLOCAL = yyDollar[1].subPartitionDefinitionOptionsUnion()
 		}
 		yyVAL.union = yyLOCAL
@@ -15373,7 +15373,7 @@ yydefault:
 		var yyLOCAL *SubPartitionDefinitionOptions
 //line sql.y:3868
 		{
-			yyDollar[1].subPartitionDefinitionOptionsUnion().DataDirectory = yyDollar[2].literalUnion()
+			yyDollar[1].subPartitionDefinitionOptionsUnion().Engine = yyDollar[2].partitionEngineUnion()
 			yyLOCAL = yyDollar[1].subPartitionDefinitionOptionsUnion()
 		}
 		yyVAL.union = yyLOCAL
@@ -15382,7 +15382,7 @@ yydefault:
 		var yyLOCAL *SubPartitionDefinitionOptions
 //line sql.y:3873
 		{
-			yyDollar[1].subPartitionDefinitionOptionsUnion().IndexDirectory = yyDollar[2].literalUnion()
+			yyDollar[1].subPartitionDefinitionOptionsUnion().DataDirectory = yyDollar[2].literalUnion()
 			yyLOCAL = yyDollar[1].subPartitionDefinitionOptionsUnion()
 		}
 		yyVAL.union = yyLOCAL
@@ -15391,7 +15391,7 @@ yydefault:
 		var yyLOCAL *SubPartitionDefinitionOptions
 //line sql.y:3878
 		{
-			yyDollar[1].subPartitionDefinitionOptionsUnion().MaxRows = ptr.Of(yyDollar[2].integerUnion())
+			yyDollar[1].subPartitionDefinitionOptionsUnion().IndexDirectory = yyDollar[2].literalUnion()
 			yyLOCAL = yyDollar[1].subPartitionDefinitionOptionsUnion()
 		}
 		yyVAL.union = yyLOCAL
@@ -15400,7 +15400,7 @@ yydefault:
 		var yyLOCAL *SubPartitionDefinitionOptions
 //line sql.y:3883
 		{
-			yyDollar[1].subPartitionDefinitionOptionsUnion().MinRows = ptr.Of(yyDollar[2].integerUnion())
+			yyDollar[1].subPartitionDefinitionOptionsUnion().MaxRows = ptr.Of(yyDollar[2].integerUnion())
 			yyLOCAL = yyDollar[1].subPartitionDefinitionOptionsUnion()
 		}
 		yyVAL.union = yyLOCAL
@@ -15409,14 +15409,23 @@ yydefault:
 		var yyLOCAL *SubPartitionDefinitionOptions
 //line sql.y:3888
 		{
-			yyDollar[1].subPartitionDefinitionOptionsUnion().TableSpace = yyDollar[2].str
+			yyDollar[1].subPartitionDefinitionOptionsUnion().MinRows = ptr.Of(yyDollar[2].integerUnion())
 			yyLOCAL = yyDollar[1].subPartitionDefinitionOptionsUnion()
 		}
 		yyVAL.union = yyLOCAL
 	case 703:
+		yyDollar = yyS[yypt-2 : yypt+1]
+		var yyLOCAL *SubPartitionDefinitionOptions
+//line sql.y:3893
+		{
+			yyDollar[1].subPartitionDefinitionOptionsUnion().TableSpace = yyDollar[2].str
+			yyLOCAL = yyDollar[1].subPartitionDefinitionOptionsUnion()
+		}
+		yyVAL.union = yyLOCAL
+	case 704:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL *PartitionValueRange
-//line sql.y:3895
+//line sql.y:3900
 		{
 			yyLOCAL = &PartitionValueRange{
 				Type:  LessThanType,
@@ -15424,10 +15433,10 @@ yydefault:
 			}
 		}
 		yyVAL.union = yyLOCAL
-	case 704:
+	case 705:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL *PartitionValueRange
-//line sql.y:3902
+//line sql.y:3907
 		{
 			yyLOCAL = &PartitionValueRange{
 				Type:     LessThanType,
@@ -15435,10 +15444,10 @@ yydefault:
 			}
 		}
 		yyVAL.union = yyLOCAL
-	case 705:
+	case 706:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL *PartitionValueRange
-//line sql.y:3909
+//line sql.y:3914
 		{
 			yyLOCAL = &PartitionValueRange{
 				Type:  InType,
@@ -15446,131 +15455,131 @@ yydefault:
 			}
 		}
 		yyVAL.union = yyLOCAL
-	case 706:
+	case 707:
 		yyDollar = yyS[yypt-0 : yypt+1]
 		var yyLOCAL bool
-//line sql.y:3917
+//line sql.y:3922
 		{
 			yyLOCAL = false
 		}
 		yyVAL.union = yyLOCAL
-	case 707:
+	case 708:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL bool
-//line sql.y:3921
+//line sql.y:3926
 		{
 			yyLOCAL = true
 		}
 		yyVAL.union = yyLOCAL
-	case 708:
+	case 709:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL *PartitionEngine
-//line sql.y:3927
+//line sql.y:3932
 		{
 			yyLOCAL = &PartitionEngine{Storage: yyDollar[1].booleanUnion(), Name: yyDollar[4].identifierCS.String()}
 		}
 		yyVAL.union = yyLOCAL
-	case 709:
+	case 710:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL *Literal
-//line sql.y:3933
+//line sql.y:3938
 		{
 			yyLOCAL = NewStrLiteral(yyDollar[3].str)
 		}
 		yyVAL.union = yyLOCAL
-	case 710:
+	case 711:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL *Literal
-//line sql.y:3939
+//line sql.y:3944
 		{
 			yyLOCAL = NewStrLiteral(yyDollar[4].str)
 		}
 		yyVAL.union = yyLOCAL
-	case 711:
+	case 712:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL *Literal
-//line sql.y:3945
+//line sql.y:3950
 		{
 			yyLOCAL = NewStrLiteral(yyDollar[4].str)
 		}
 		yyVAL.union = yyLOCAL
-	case 712:
+	case 713:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL int
-//line sql.y:3951
+//line sql.y:3956
 		{
 			yyLOCAL = convertStringToInt(yyDollar[3].str)
 		}
 		yyVAL.union = yyLOCAL
-	case 713:
+	case 714:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL int
-//line sql.y:3957
+//line sql.y:3962
 		{
 			yyLOCAL = convertStringToInt(yyDollar[3].str)
 		}
 		yyVAL.union = yyLOCAL
-	case 714:
+	case 715:
 		yyDollar = yyS[yypt-3 : yypt+1]
-//line sql.y:3963
+//line sql.y:3968
 		{
 			yyVAL.str = yyDollar[3].identifierCS.String()
 		}
-	case 715:
+	case 716:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL *PartitionDefinition
-//line sql.y:3969
+//line sql.y:3974
 		{
 			yyLOCAL = &PartitionDefinition{Name: yyDollar[2].identifierCI}
 		}
 		yyVAL.union = yyLOCAL
-	case 716:
+	case 717:
 		yyDollar = yyS[yypt-1 : yypt+1]
-//line sql.y:3975
+//line sql.y:3980
 		{
 			yyVAL.str = ""
 		}
-	case 717:
+	case 718:
 		yyDollar = yyS[yypt-3 : yypt+1]
-//line sql.y:3979
+//line sql.y:3984
 		{
 			yyVAL.str = ""
 		}
-	case 718:
+	case 719:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL Statement
-//line sql.y:3985
+//line sql.y:3990
 		{
 			yyLOCAL = &RenameTable{TablePairs: yyDollar[3].renameTablePairsUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 719:
+	case 720:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL []*RenameTablePair
-//line sql.y:3991
+//line sql.y:3996
 		{
 			yyLOCAL = []*RenameTablePair{{FromTable: yyDollar[1].tableName, ToTable: yyDollar[3].tableName}}
 		}
 		yyVAL.union = yyLOCAL
-	case 720:
+	case 721:
 		yyDollar = yyS[yypt-5 : yypt+1]
-//line sql.y:3995
+//line sql.y:4000
 		{
 			yySLICE := (*[]*RenameTablePair)(yyIaddr(yyVAL.union))
 			*yySLICE = append(*yySLICE, &RenameTablePair{FromTable: yyDollar[3].tableName, ToTable: yyDollar[5].tableName})
 		}
-	case 721:
+	case 722:
 		yyDollar = yyS[yypt-7 : yypt+1]
 		var yyLOCAL Statement
-//line sql.y:4001
+//line sql.y:4006
 		{
 			yyLOCAL = &DropTable{FromTables: yyDollar[6].tableNamesUnion(), IfExists: yyDollar[5].booleanUnion(), Comments: Comments(yyDollar[2].strs).Parsed(), Temp: yyDollar[3].booleanUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 722:
+	case 723:
 		yyDollar = yyS[yypt-7 : yypt+1]
 		var yyLOCAL Statement
-//line sql.y:4005
+//line sql.y:4010
 		{
 			// Change this to an alter statement
 			if yyDollar[4].identifierCI.Lowered() == "primary" {
@@ -15580,1377 +15589,1377 @@ yydefault:
 			}
 		}
 		yyVAL.union = yyLOCAL
-	case 723:
+	case 724:
 		yyDollar = yyS[yypt-6 : yypt+1]
 		var yyLOCAL Statement
-//line sql.y:4014
+//line sql.y:4019
 		{
 			yyLOCAL = &DropView{FromTables: yyDollar[5].tableNamesUnion(), Comments: Comments(yyDollar[2].strs).Parsed(), IfExists: yyDollar[4].booleanUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 724:
+	case 725:
 		yyDollar = yyS[yypt-5 : yypt+1]
 		var yyLOCAL Statement
-//line sql.y:4018
+//line sql.y:4023
 		{
 			yyLOCAL = &DropDatabase{Comments: Comments(yyDollar[2].strs).Parsed(), DBName: yyDollar[5].identifierCS, IfExists: yyDollar[4].booleanUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 725:
+	case 726:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL Statement
-//line sql.y:4024
+//line sql.y:4029
 		{
 			yyLOCAL = &TruncateTable{Table: yyDollar[3].tableName}
 		}
 		yyVAL.union = yyLOCAL
-	case 726:
+	case 727:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL Statement
-//line sql.y:4028
+//line sql.y:4033
 		{
 			yyLOCAL = &TruncateTable{Table: yyDollar[2].tableName}
 		}
 		yyVAL.union = yyLOCAL
-	case 727:
+	case 728:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Statement
-//line sql.y:4034
+//line sql.y:4039
 		{
 			yyLOCAL = &Analyze{IsLocal: yyDollar[2].booleanUnion(), Table: yyDollar[4].tableName}
 		}
 		yyVAL.union = yyLOCAL
-	case 728:
+	case 729:
 		yyDollar = yyS[yypt-5 : yypt+1]
 		var yyLOCAL Statement
-//line sql.y:4040
+//line sql.y:4045
 		{
 			yyLOCAL = &PurgeBinaryLogs{To: string(yyDollar[5].str)}
 		}
 		yyVAL.union = yyLOCAL
-	case 729:
+	case 730:
 		yyDollar = yyS[yypt-5 : yypt+1]
 		var yyLOCAL Statement
-//line sql.y:4044
+//line sql.y:4049
 		{
 			yyLOCAL = &PurgeBinaryLogs{Before: string(yyDollar[5].str)}
 		}
 		yyVAL.union = yyLOCAL
-	case 730:
+	case 731:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL Statement
-//line sql.y:4050
+//line sql.y:4055
 		{
 			yyLOCAL = &Show{&ShowBasic{Command: Charset, Filter: yyDollar[3].showFilterUnion()}}
 		}
 		yyVAL.union = yyLOCAL
-	case 731:
+	case 732:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL Statement
-//line sql.y:4054
+//line sql.y:4059
 		{
 			yyLOCAL = &Show{&ShowBasic{Command: Collation, Filter: yyDollar[3].showFilterUnion()}}
 		}
 		yyVAL.union = yyLOCAL
-	case 732:
+	case 733:
 		yyDollar = yyS[yypt-7 : yypt+1]
 		var yyLOCAL Statement
-//line sql.y:4058
+//line sql.y:4063
 		{
 			yyLOCAL = &Show{&ShowBasic{Full: yyDollar[2].booleanUnion(), Command: Column, Tbl: yyDollar[5].tableName, DbName: yyDollar[6].identifierCS, Filter: yyDollar[7].showFilterUnion()}}
 		}
 		yyVAL.union = yyLOCAL
-	case 733:
+	case 734:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL Statement
-//line sql.y:4062
+//line sql.y:4067
 		{
 			yyLOCAL = &Show{&ShowBasic{Command: Database, Filter: yyDollar[3].showFilterUnion()}}
 		}
 		yyVAL.union = yyLOCAL
-	case 734:
+	case 735:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL Statement
-//line sql.y:4066
+//line sql.y:4071
 		{
 			yyLOCAL = &Show{&ShowBasic{Command: Database, Filter: yyDollar[3].showFilterUnion()}}
 		}
 		yyVAL.union = yyLOCAL
-	case 735:
+	case 736:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL Statement
-//line sql.y:4070
+//line sql.y:4075
 		{
 			yyLOCAL = &Show{&ShowBasic{Command: Keyspace, Filter: yyDollar[3].showFilterUnion()}}
 		}
 		yyVAL.union = yyLOCAL
-	case 736:
+	case 737:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL Statement
-//line sql.y:4074
+//line sql.y:4079
 		{
 			yyLOCAL = &Show{&ShowBasic{Command: Keyspace, Filter: yyDollar[3].showFilterUnion()}}
 		}
 		yyVAL.union = yyLOCAL
-	case 737:
+	case 738:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Statement
-//line sql.y:4078
+//line sql.y:4083
 		{
 			yyLOCAL = &Show{&ShowBasic{Command: Function, Filter: yyDollar[4].showFilterUnion()}}
 		}
 		yyVAL.union = yyLOCAL
-	case 738:
+	case 739:
 		yyDollar = yyS[yypt-7 : yypt+1]
 		var yyLOCAL Statement
-//line sql.y:4082
+//line sql.y:4087
 		{
 			yyLOCAL = &Show{&ShowBasic{Command: Index, Tbl: yyDollar[5].tableName, DbName: yyDollar[6].identifierCS, Filter: yyDollar[7].showFilterUnion()}}
 		}
 		yyVAL.union = yyLOCAL
-	case 739:
+	case 740:
 		yyDollar = yyS[yypt-5 : yypt+1]
 		var yyLOCAL Statement
-//line sql.y:4086
+//line sql.y:4091
 		{
 			yyLOCAL = &Show{&ShowBasic{Command: OpenTable, DbName: yyDollar[4].identifierCS, Filter: yyDollar[5].showFilterUnion()}}
 		}
 		yyVAL.union = yyLOCAL
-	case 740:
+	case 741:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL Statement
-//line sql.y:4090
+//line sql.y:4095
 		{
 			yyLOCAL = &Show{&ShowBasic{Command: Privilege}}
 		}
 		yyVAL.union = yyLOCAL
-	case 741:
+	case 742:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Statement
-//line sql.y:4094
+//line sql.y:4099
 		{
 			yyLOCAL = &Show{&ShowBasic{Command: Procedure, Filter: yyDollar[4].showFilterUnion()}}
 		}
 		yyVAL.union = yyLOCAL
-	case 742:
+	case 743:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Statement
-//line sql.y:4098
+//line sql.y:4103
 		{
 			yyLOCAL = &Show{&ShowBasic{Command: StatusSession, Filter: yyDollar[4].showFilterUnion()}}
 		}
 		yyVAL.union = yyLOCAL
-	case 743:
+	case 744:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Statement
-//line sql.y:4102
+//line sql.y:4107
 		{
 			yyLOCAL = &Show{&ShowBasic{Command: StatusGlobal, Filter: yyDollar[4].showFilterUnion()}}
 		}
 		yyVAL.union = yyLOCAL
-	case 744:
+	case 745:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Statement
-//line sql.y:4106
+//line sql.y:4111
 		{
 			yyLOCAL = &Show{&ShowBasic{Command: VariableSession, Filter: yyDollar[4].showFilterUnion()}}
 		}
 		yyVAL.union = yyLOCAL
-	case 745:
+	case 746:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Statement
-//line sql.y:4110
+//line sql.y:4115
 		{
 			yyLOCAL = &Show{&ShowBasic{Command: VariableGlobal, Filter: yyDollar[4].showFilterUnion()}}
 		}
 		yyVAL.union = yyLOCAL
-	case 746:
+	case 747:
 		yyDollar = yyS[yypt-5 : yypt+1]
 		var yyLOCAL Statement
-//line sql.y:4114
+//line sql.y:4119
 		{
 			yyLOCAL = &Show{&ShowBasic{Command: TableStatus, DbName: yyDollar[4].identifierCS, Filter: yyDollar[5].showFilterUnion()}}
 		}
 		yyVAL.union = yyLOCAL
-	case 747:
+	case 748:
 		yyDollar = yyS[yypt-5 : yypt+1]
 		var yyLOCAL Statement
-//line sql.y:4118
+//line sql.y:4123
 		{
 			yyLOCAL = &Show{&ShowBasic{Command: Table, Full: yyDollar[2].booleanUnion(), DbName: yyDollar[4].identifierCS, Filter: yyDollar[5].showFilterUnion()}}
 		}
 		yyVAL.union = yyLOCAL
-	case 748:
+	case 749:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Statement
-//line sql.y:4122
+//line sql.y:4127
 		{
 			yyLOCAL = &Show{&ShowBasic{Command: Trigger, DbName: yyDollar[3].identifierCS, Filter: yyDollar[4].showFilterUnion()}}
 		}
 		yyVAL.union = yyLOCAL
-	case 749:
+	case 750:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Statement
-//line sql.y:4126
+//line sql.y:4131
 		{
 			yyLOCAL = &Show{&ShowCreate{Command: CreateDb, Op: yyDollar[4].tableName}}
 		}
 		yyVAL.union = yyLOCAL
-	case 750:
+	case 751:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Statement
-//line sql.y:4130
+//line sql.y:4135
 		{
 			yyLOCAL = &Show{&ShowCreate{Command: CreateE, Op: yyDollar[4].tableName}}
 		}
 		yyVAL.union = yyLOCAL
-	case 751:
+	case 752:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Statement
-//line sql.y:4134
+//line sql.y:4139
 		{
 			yyLOCAL = &Show{&ShowCreate{Command: CreateF, Op: yyDollar[4].tableName}}
 		}
 		yyVAL.union = yyLOCAL
-	case 752:
+	case 753:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Statement
-//line sql.y:4138
+//line sql.y:4143
 		{
 			yyLOCAL = &Show{&ShowCreate{Command: CreateProc, Op: yyDollar[4].tableName}}
 		}
 		yyVAL.union = yyLOCAL
-	case 753:
+	case 754:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Statement
-//line sql.y:4142
+//line sql.y:4147
 		{
 			yyLOCAL = &Show{&ShowCreate{Command: CreateTbl, Op: yyDollar[4].tableName}}
 		}
 		yyVAL.union = yyLOCAL
-	case 754:
+	case 755:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Statement
-//line sql.y:4146
+//line sql.y:4151
 		{
 			yyLOCAL = &Show{&ShowCreate{Command: CreateTr, Op: yyDollar[4].tableName}}
 		}
 		yyVAL.union = yyLOCAL
-	case 755:
+	case 756:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Statement
-//line sql.y:4150
+//line sql.y:4155
 		{
 			yyLOCAL = &Show{&ShowCreate{Command: CreateV, Op: yyDollar[4].tableName}}
 		}
 		yyVAL.union = yyLOCAL
-	case 756:
+	case 757:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL Statement
-//line sql.y:4154
+//line sql.y:4159
 		{
 			yyLOCAL = &Show{&ShowBasic{Command: Engines}}
 		}
 		yyVAL.union = yyLOCAL
-	case 757:
+	case 758:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL Statement
-//line sql.y:4158
+//line sql.y:4163
 		{
 			yyLOCAL = &Show{&ShowBasic{Command: Plugins}}
 		}
 		yyVAL.union = yyLOCAL
-	case 758:
+	case 759:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Statement
-//line sql.y:4162
+//line sql.y:4167
 		{
 			yyLOCAL = &Show{&ShowBasic{Command: GtidExecGlobal, DbName: yyDollar[4].identifierCS}}
 		}
 		yyVAL.union = yyLOCAL
-	case 759:
+	case 760:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Statement
-//line sql.y:4166
+//line sql.y:4171
 		{
 			yyLOCAL = &Show{&ShowBasic{Command: VGtidExecGlobal, DbName: yyDollar[4].identifierCS}}
 		}
 		yyVAL.union = yyLOCAL
-	case 760:
+	case 761:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Statement
-//line sql.y:4170
+//line sql.y:4175
 		{
 			yyLOCAL = &Show{&ShowBasic{Command: VitessVariables, Filter: yyDollar[4].showFilterUnion()}}
 		}
 		yyVAL.union = yyLOCAL
-	case 761:
+	case 762:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Statement
-//line sql.y:4174
+//line sql.y:4179
 		{
 			yyLOCAL = &Show{&ShowBasic{Command: VitessMigrations, Filter: yyDollar[4].showFilterUnion(), DbName: yyDollar[3].identifierCS}}
 		}
 		yyVAL.union = yyLOCAL
-	case 762:
+	case 763:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Statement
-//line sql.y:4178
+//line sql.y:4183
 		{
 			yyLOCAL = &ShowMigrationLogs{UUID: string(yyDollar[3].str)}
 		}
 		yyVAL.union = yyLOCAL
-	case 763:
+	case 764:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL Statement
-//line sql.y:4182
+//line sql.y:4187
 		{
 			yyLOCAL = &ShowThrottledApps{}
 		}
 		yyVAL.union = yyLOCAL
-	case 764:
+	case 765:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL Statement
-//line sql.y:4186
+//line sql.y:4191
 		{
 			yyLOCAL = &Show{&ShowBasic{Command: VitessReplicationStatus, Filter: yyDollar[3].showFilterUnion()}}
 		}
 		yyVAL.union = yyLOCAL
-	case 765:
+	case 766:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL Statement
-//line sql.y:4190
+//line sql.y:4195
 		{
 			yyLOCAL = &ShowThrottlerStatus{}
 		}
 		yyVAL.union = yyLOCAL
-	case 766:
+	case 767:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL Statement
-//line sql.y:4194
+//line sql.y:4199
 		{
 			yyLOCAL = &Show{&ShowBasic{Command: VschemaTables}}
 		}
 		yyVAL.union = yyLOCAL
-	case 767:
+	case 768:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL Statement
-//line sql.y:4198
+//line sql.y:4203
 		{
 			yyLOCAL = &Show{&ShowBasic{Command: VschemaKeyspaces}}
 		}
 		yyVAL.union = yyLOCAL
-	case 768:
+	case 769:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL Statement
-//line sql.y:4202
+//line sql.y:4207
 		{
 			yyLOCAL = &Show{&ShowBasic{Command: VschemaVindexes}}
 		}
 		yyVAL.union = yyLOCAL
-	case 769:
+	case 770:
 		yyDollar = yyS[yypt-5 : yypt+1]
 		var yyLOCAL Statement
-//line sql.y:4206
+//line sql.y:4211
 		{
 			yyLOCAL = &Show{&ShowBasic{Command: VschemaVindexes, Tbl: yyDollar[5].tableName}}
 		}
 		yyVAL.union = yyLOCAL
-	case 770:
+	case 771:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL Statement
-//line sql.y:4210
+//line sql.y:4215
 		{
 			yyLOCAL = &Show{&ShowBasic{Command: Warnings}}
 		}
 		yyVAL.union = yyLOCAL
-	case 771:
+	case 772:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL Statement
-//line sql.y:4214
+//line sql.y:4219
 		{
 			yyLOCAL = &Show{&ShowBasic{Command: VitessShards, Filter: yyDollar[3].showFilterUnion()}}
 		}
 		yyVAL.union = yyLOCAL
-	case 772:
+	case 773:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL Statement
-//line sql.y:4218
+//line sql.y:4223
 		{
 			yyLOCAL = &Show{&ShowBasic{Command: VitessTablets, Filter: yyDollar[3].showFilterUnion()}}
 		}
 		yyVAL.union = yyLOCAL
-	case 773:
+	case 774:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL Statement
-//line sql.y:4222
+//line sql.y:4227
 		{
 			yyLOCAL = &Show{&ShowBasic{Command: VitessTarget}}
 		}
 		yyVAL.union = yyLOCAL
-	case 774:
+	case 775:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL Statement
-//line sql.y:4229
+//line sql.y:4234
 		{
 			yyLOCAL = &Show{&ShowOther{Command: string(yyDollar[2].identifierCI.String())}}
 		}
 		yyVAL.union = yyLOCAL
-	case 775:
+	case 776:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Statement
-//line sql.y:4233
+//line sql.y:4238
 		{
 			yyLOCAL = &Show{&ShowOther{Command: string(yyDollar[2].str) + " " + string(yyDollar[3].str)}}
 		}
 		yyVAL.union = yyLOCAL
-	case 776:
+	case 777:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Statement
-//line sql.y:4237
+//line sql.y:4242
 		{
 			yyLOCAL = &Show{&ShowOther{Command: string(yyDollar[2].str) + " " + yyDollar[3].identifierCI.String()}}
 		}
 		yyVAL.union = yyLOCAL
-	case 777:
+	case 778:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Statement
-//line sql.y:4241
+//line sql.y:4246
 		{
 			yyLOCAL = &Show{&ShowOther{Command: string(yyDollar[2].str) + " " + string(yyDollar[3].str)}}
 		}
 		yyVAL.union = yyLOCAL
-	case 778:
+	case 779:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL Statement
-//line sql.y:4245
+//line sql.y:4250
 		{
 			yyLOCAL = &Show{&ShowOther{Command: string(yyDollar[2].str)}}
 		}
 		yyVAL.union = yyLOCAL
-	case 779:
+	case 780:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Statement
-//line sql.y:4249
+//line sql.y:4254
 		{
 			yyLOCAL = &Show{&ShowOther{Command: string(yyDollar[2].str) + " " + string(yyDollar[3].str) + " " + String(yyDollar[4].tableName)}}
 		}
 		yyVAL.union = yyLOCAL
-	case 780:
+	case 781:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Statement
-//line sql.y:4253
+//line sql.y:4258
 		{
 			yyLOCAL = &Show{&ShowOther{Command: string(yyDollar[2].str) + " " + string(yyDollar[3].str) + " " + String(yyDollar[4].tableName)}}
 		}
 		yyVAL.union = yyLOCAL
-	case 781:
+	case 782:
 		yyDollar = yyS[yypt-5 : yypt+1]
 		var yyLOCAL Statement
-//line sql.y:4257
+//line sql.y:4262
 		{
 			yyLOCAL = &Show{&ShowOther{Command: string(yyDollar[3].str)}}
 		}
 		yyVAL.union = yyLOCAL
-	case 782:
+	case 783:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL Statement
-//line sql.y:4261
+//line sql.y:4266
 		{
 			yyLOCAL = &Show{&ShowOther{Command: string(yyDollar[2].str)}}
 		}
 		yyVAL.union = yyLOCAL
-	case 783:
+	case 784:
 		yyDollar = yyS[yypt-5 : yypt+1]
 		var yyLOCAL Statement
-//line sql.y:4265
+//line sql.y:4270
 		{
 			yyLOCAL = &Show{&ShowTransactionStatus{TransactionID: string(yyDollar[5].str)}}
 		}
 		yyVAL.union = yyLOCAL
-	case 784:
+	case 785:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL Statement
-//line sql.y:4269
+//line sql.y:4274
 		{
 			yyLOCAL = &Show{&ShowTransactionStatus{}}
 		}
 		yyVAL.union = yyLOCAL
-	case 785:
+	case 786:
 		yyDollar = yyS[yypt-5 : yypt+1]
 		var yyLOCAL Statement
-//line sql.y:4273
+//line sql.y:4278
 		{
 			yyLOCAL = &Show{&ShowTransactionStatus{Keyspace: yyDollar[5].identifierCS.String()}}
 		}
 		yyVAL.union = yyLOCAL
-	case 786:
+	case 787:
 		yyDollar = yyS[yypt-0 : yypt+1]
-//line sql.y:4278
+//line sql.y:4283
 		{
 		}
-	case 787:
+	case 788:
 		yyDollar = yyS[yypt-1 : yypt+1]
-//line sql.y:4280
+//line sql.y:4285
 		{
 		}
-	case 788:
+	case 789:
 		yyDollar = yyS[yypt-0 : yypt+1]
-//line sql.y:4284
+//line sql.y:4289
 		{
 			yyVAL.str = ""
 		}
-	case 789:
+	case 790:
 		yyDollar = yyS[yypt-1 : yypt+1]
-//line sql.y:4288
+//line sql.y:4293
 		{
 			yyVAL.str = "extended "
 		}
-	case 790:
+	case 791:
 		yyDollar = yyS[yypt-0 : yypt+1]
 		var yyLOCAL bool
-//line sql.y:4294
+//line sql.y:4299
 		{
 			yyLOCAL = false
 		}
 		yyVAL.union = yyLOCAL
-	case 791:
+	case 792:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL bool
-//line sql.y:4298
+//line sql.y:4303
 		{
 			yyLOCAL = true
 		}
 		yyVAL.union = yyLOCAL
-	case 792:
+	case 793:
 		yyDollar = yyS[yypt-1 : yypt+1]
-//line sql.y:4304
+//line sql.y:4309
 		{
 			yyVAL.str = string(yyDollar[1].str)
 		}
-	case 793:
+	case 794:
 		yyDollar = yyS[yypt-1 : yypt+1]
-//line sql.y:4308
+//line sql.y:4313
 		{
 			yyVAL.str = string(yyDollar[1].str)
 		}
-	case 794:
+	case 795:
 		yyDollar = yyS[yypt-0 : yypt+1]
-//line sql.y:4314
+//line sql.y:4319
 		{
 			yyVAL.identifierCS = NewIdentifierCS("")
 		}
-	case 795:
+	case 796:
 		yyDollar = yyS[yypt-2 : yypt+1]
-//line sql.y:4318
+//line sql.y:4323
 		{
 			yyVAL.identifierCS = yyDollar[2].identifierCS
 		}
-	case 796:
+	case 797:
 		yyDollar = yyS[yypt-2 : yypt+1]
-//line sql.y:4322
+//line sql.y:4327
 		{
 			yyVAL.identifierCS = yyDollar[2].identifierCS
 		}
-	case 797:
+	case 798:
 		yyDollar = yyS[yypt-0 : yypt+1]
 		var yyLOCAL *ShowFilter
-//line sql.y:4328
+//line sql.y:4333
 		{
 			yyLOCAL = nil
 		}
 		yyVAL.union = yyLOCAL
-	case 798:
+	case 799:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL *ShowFilter
-//line sql.y:4332
+//line sql.y:4337
 		{
 			yyLOCAL = &ShowFilter{Like: string(yyDollar[2].str)}
 		}
 		yyVAL.union = yyLOCAL
-	case 799:
+	case 800:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL *ShowFilter
-//line sql.y:4336
+//line sql.y:4341
 		{
 			yyLOCAL = &ShowFilter{Filter: yyDollar[2].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 800:
+	case 801:
 		yyDollar = yyS[yypt-0 : yypt+1]
 		var yyLOCAL *ShowFilter
-//line sql.y:4342
+//line sql.y:4347
 		{
 			yyLOCAL = nil
 		}
 		yyVAL.union = yyLOCAL
-	case 801:
+	case 802:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL *ShowFilter
-//line sql.y:4346
+//line sql.y:4351
 		{
 			yyLOCAL = &ShowFilter{Like: string(yyDollar[2].str)}
 		}
 		yyVAL.union = yyLOCAL
-	case 802:
+	case 803:
 		yyDollar = yyS[yypt-0 : yypt+1]
-//line sql.y:4352
+//line sql.y:4357
 		{
 			yyVAL.empty = struct{}{}
 		}
-	case 803:
+	case 804:
 		yyDollar = yyS[yypt-1 : yypt+1]
-//line sql.y:4356
+//line sql.y:4361
 		{
 			yyVAL.empty = struct{}{}
 		}
-	case 804:
+	case 805:
 		yyDollar = yyS[yypt-1 : yypt+1]
-//line sql.y:4360
+//line sql.y:4365
 		{
 			yyVAL.empty = struct{}{}
 		}
-	case 805:
+	case 806:
 		yyDollar = yyS[yypt-1 : yypt+1]
-//line sql.y:4366
+//line sql.y:4371
 		{
 			yyVAL.str = string(yyDollar[1].str)
 		}
-	case 806:
+	case 807:
 		yyDollar = yyS[yypt-1 : yypt+1]
-//line sql.y:4370
+//line sql.y:4375
 		{
 			yyVAL.str = string(yyDollar[1].str)
 		}
-	case 807:
+	case 808:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL Statement
-//line sql.y:4376
+//line sql.y:4381
 		{
 			yyLOCAL = &Use{DBName: yyDollar[2].identifierCS}
 		}
 		yyVAL.union = yyLOCAL
-	case 808:
+	case 809:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL Statement
-//line sql.y:4380
+//line sql.y:4385
 		{
 			yyLOCAL = &Use{DBName: IdentifierCS{v: ""}}
 		}
 		yyVAL.union = yyLOCAL
-	case 809:
+	case 810:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL Statement
-//line sql.y:4384
+//line sql.y:4389
 		{
 			yyLOCAL = &Use{DBName: NewIdentifierCS(yyDollar[2].identifierCS.String() + "@" + string(yyDollar[3].str))}
 		}
 		yyVAL.union = yyLOCAL
-	case 810:
+	case 811:
 		yyDollar = yyS[yypt-1 : yypt+1]
-//line sql.y:4391
+//line sql.y:4396
 		{
 			yyVAL.identifierCS = NewIdentifierCS(string(yyDollar[1].str))
 		}
-	case 811:
+	case 812:
 		yyDollar = yyS[yypt-1 : yypt+1]
-//line sql.y:4395
+//line sql.y:4400
 		{
 			yyVAL.identifierCS = NewIdentifierCS("@" + string(yyDollar[1].str))
 		}
-	case 812:
+	case 813:
 		yyDollar = yyS[yypt-1 : yypt+1]
-//line sql.y:4399
+//line sql.y:4404
 		{
 			yyVAL.identifierCS = NewIdentifierCS("@@" + string(yyDollar[1].str))
 		}
-	case 813:
+	case 814:
 		yyDollar = yyS[yypt-1 : yypt+1]
-//line sql.y:4403
+//line sql.y:4408
 		{
 			yyVAL.identifierCS = NewIdentifierCS(string(yyDollar[1].str))
 		}
-	case 814:
+	case 815:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL Statement
-//line sql.y:4410
+//line sql.y:4415
 		{
 			yyLOCAL = &Begin{}
 		}
 		yyVAL.union = yyLOCAL
-	case 815:
+	case 816:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL Statement
-//line sql.y:4414
+//line sql.y:4419
 		{
 			yyLOCAL = &Begin{TxAccessModes: yyDollar[3].txAccessModesUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 816:
+	case 817:
 		yyDollar = yyS[yypt-0 : yypt+1]
 		var yyLOCAL []TxAccessMode
-//line sql.y:4419
+//line sql.y:4424
 		{
 			yyLOCAL = nil
 		}
 		yyVAL.union = yyLOCAL
-	case 817:
+	case 818:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL []TxAccessMode
-//line sql.y:4423
+//line sql.y:4428
 		{
 			yyLOCAL = yyDollar[1].txAccessModesUnion()
 		}
 		yyVAL.union = yyLOCAL
-	case 818:
+	case 819:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL []TxAccessMode
-//line sql.y:4429
+//line sql.y:4434
 		{
 			yyLOCAL = []TxAccessMode{yyDollar[1].txAccessModeUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 819:
+	case 820:
 		yyDollar = yyS[yypt-3 : yypt+1]
-//line sql.y:4433
+//line sql.y:4438
 		{
 			yySLICE := (*[]TxAccessMode)(yyIaddr(yyVAL.union))
 			*yySLICE = append(*yySLICE, yyDollar[3].txAccessModeUnion())
 		}
-	case 820:
+	case 821:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL TxAccessMode
-//line sql.y:4439
+//line sql.y:4444
 		{
 			yyLOCAL = WithConsistentSnapshot
 		}
 		yyVAL.union = yyLOCAL
-	case 821:
+	case 822:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL TxAccessMode
-//line sql.y:4443
+//line sql.y:4448
 		{
 			yyLOCAL = ReadWrite
 		}
 		yyVAL.union = yyLOCAL
-	case 822:
+	case 823:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL TxAccessMode
-//line sql.y:4447
+//line sql.y:4452
 		{
 			yyLOCAL = ReadOnly
 		}
 		yyVAL.union = yyLOCAL
-	case 823:
+	case 824:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL Statement
-//line sql.y:4454
+//line sql.y:4459
 		{
 			yyLOCAL = &Commit{}
 		}
 		yyVAL.union = yyLOCAL
-	case 824:
+	case 825:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL Statement
-//line sql.y:4460
+//line sql.y:4465
 		{
 			yyLOCAL = &Rollback{}
 		}
 		yyVAL.union = yyLOCAL
-	case 825:
+	case 826:
 		yyDollar = yyS[yypt-5 : yypt+1]
 		var yyLOCAL Statement
-//line sql.y:4464
+//line sql.y:4469
 		{
 			yyLOCAL = &SRollback{Name: yyDollar[5].identifierCI}
 		}
 		yyVAL.union = yyLOCAL
-	case 826:
+	case 827:
 		yyDollar = yyS[yypt-0 : yypt+1]
-//line sql.y:4469
+//line sql.y:4474
 		{
 			yyVAL.empty = struct{}{}
 		}
-	case 827:
+	case 828:
 		yyDollar = yyS[yypt-1 : yypt+1]
-//line sql.y:4471
+//line sql.y:4476
 		{
 			yyVAL.empty = struct{}{}
 		}
-	case 828:
+	case 829:
 		yyDollar = yyS[yypt-0 : yypt+1]
-//line sql.y:4474
+//line sql.y:4479
 		{
 			yyVAL.empty = struct{}{}
 		}
-	case 829:
+	case 830:
 		yyDollar = yyS[yypt-1 : yypt+1]
-//line sql.y:4476
+//line sql.y:4481
 		{
 			yyVAL.empty = struct{}{}
 		}
-	case 830:
+	case 831:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL Statement
-//line sql.y:4480
+//line sql.y:4485
 		{
 			yyLOCAL = &Savepoint{Name: yyDollar[2].identifierCI}
 		}
 		yyVAL.union = yyLOCAL
-	case 831:
+	case 832:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL Statement
-//line sql.y:4486
+//line sql.y:4491
 		{
 			yyLOCAL = &Release{Name: yyDollar[3].identifierCI}
 		}
 		yyVAL.union = yyLOCAL
-	case 832:
+	case 833:
 		yyDollar = yyS[yypt-0 : yypt+1]
 		var yyLOCAL ExplainType
-//line sql.y:4491
+//line sql.y:4496
 		{
 			yyLOCAL = EmptyType
 		}
 		yyVAL.union = yyLOCAL
-	case 833:
+	case 834:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL ExplainType
-//line sql.y:4495
+//line sql.y:4500
 		{
 			yyLOCAL = JSONType
 		}
 		yyVAL.union = yyLOCAL
-	case 834:
+	case 835:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL ExplainType
-//line sql.y:4499
+//line sql.y:4504
 		{
 			yyLOCAL = TreeType
 		}
 		yyVAL.union = yyLOCAL
-	case 835:
+	case 836:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL ExplainType
-//line sql.y:4503
+//line sql.y:4508
 		{
 			yyLOCAL = TraditionalType
 		}
 		yyVAL.union = yyLOCAL
-	case 836:
+	case 837:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL ExplainType
-//line sql.y:4507
+//line sql.y:4512
 		{
 			yyLOCAL = AnalyzeType
 		}
 		yyVAL.union = yyLOCAL
-	case 837:
+	case 838:
 		yyDollar = yyS[yypt-0 : yypt+1]
 		var yyLOCAL VExplainType
-//line sql.y:4512
+//line sql.y:4517
 		{
 			yyLOCAL = PlanVExplainType
 		}
 		yyVAL.union = yyLOCAL
-	case 838:
+	case 839:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL VExplainType
-//line sql.y:4516
+//line sql.y:4521
 		{
 			yyLOCAL = PlanVExplainType
 		}
 		yyVAL.union = yyLOCAL
-	case 839:
+	case 840:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL VExplainType
-//line sql.y:4520
+//line sql.y:4525
 		{
 			yyLOCAL = AllVExplainType
 		}
 		yyVAL.union = yyLOCAL
-	case 840:
+	case 841:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL VExplainType
-//line sql.y:4524
+//line sql.y:4529
 		{
 			yyLOCAL = QueriesVExplainType
 		}
 		yyVAL.union = yyLOCAL
-	case 841:
+	case 842:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL VExplainType
-//line sql.y:4528
+//line sql.y:4533
 		{
 			yyLOCAL = TraceVExplainType
 		}
 		yyVAL.union = yyLOCAL
-	case 842:
+	case 843:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL VExplainType
-//line sql.y:4532
+//line sql.y:4537
 		{
 			yyLOCAL = KeysVExplainType
 		}
 		yyVAL.union = yyLOCAL
-	case 843:
+	case 844:
 		yyDollar = yyS[yypt-1 : yypt+1]
-//line sql.y:4538
+//line sql.y:4543
 		{
 			yyVAL.str = yyDollar[1].str
 		}
-	case 844:
+	case 845:
 		yyDollar = yyS[yypt-1 : yypt+1]
-//line sql.y:4542
+//line sql.y:4547
 		{
 			yyVAL.str = yyDollar[1].str
 		}
-	case 845:
+	case 846:
 		yyDollar = yyS[yypt-1 : yypt+1]
-//line sql.y:4546
+//line sql.y:4551
 		{
 			yyVAL.str = yyDollar[1].str
 		}
-	case 846:
+	case 847:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL Statement
-//line sql.y:4552
+//line sql.y:4557
 		{
 			yyLOCAL = yyDollar[1].tableStmtUnion()
 		}
 		yyVAL.union = yyLOCAL
-	case 847:
+	case 848:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL Statement
-//line sql.y:4556
+//line sql.y:4561
 		{
 			yyLOCAL = yyDollar[1].statementUnion()
 		}
 		yyVAL.union = yyLOCAL
-	case 848:
+	case 849:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL Statement
-//line sql.y:4560
+//line sql.y:4565
 		{
 			yyLOCAL = yyDollar[1].statementUnion()
 		}
 		yyVAL.union = yyLOCAL
-	case 849:
+	case 850:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL Statement
-//line sql.y:4564
+//line sql.y:4569
 		{
 			yyLOCAL = yyDollar[1].statementUnion()
 		}
 		yyVAL.union = yyLOCAL
-	case 850:
+	case 851:
 		yyDollar = yyS[yypt-0 : yypt+1]
-//line sql.y:4569
+//line sql.y:4574
 		{
 			yyVAL.str = ""
 		}
-	case 851:
+	case 852:
 		yyDollar = yyS[yypt-1 : yypt+1]
-//line sql.y:4573
+//line sql.y:4578
 		{
 			yyVAL.str = yyDollar[1].identifierCI.val
 		}
-	case 852:
+	case 853:
 		yyDollar = yyS[yypt-1 : yypt+1]
-//line sql.y:4577
+//line sql.y:4582
 		{
 			yyVAL.str = encodeSQLString(yyDollar[1].str)
 		}
-	case 853:
+	case 854:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Statement
-//line sql.y:4583
+//line sql.y:4588
 		{
 			yyLOCAL = &ExplainTab{Table: yyDollar[3].tableName, Wild: yyDollar[4].str}
 		}
 		yyVAL.union = yyLOCAL
-	case 854:
+	case 855:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Statement
-//line sql.y:4587
+//line sql.y:4592
 		{
 			yyLOCAL = &ExplainStmt{Type: yyDollar[3].explainTypeUnion(), Statement: yyDollar[4].statementUnion(), Comments: Comments(yyDollar[2].strs).Parsed()}
 		}
 		yyVAL.union = yyLOCAL
-	case 855:
+	case 856:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Statement
-//line sql.y:4593
+//line sql.y:4598
 		{
 			yyLOCAL = &VExplainStmt{Type: yyDollar[3].vexplainTypeUnion(), Statement: yyDollar[4].statementUnion(), Comments: Comments(yyDollar[2].strs).Parsed()}
 		}
 		yyVAL.union = yyLOCAL
-	case 856:
+	case 857:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL Statement
-//line sql.y:4599
+//line sql.y:4604
 		{
 			yyLOCAL = &OtherAdmin{}
 		}
 		yyVAL.union = yyLOCAL
-	case 857:
+	case 858:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL Statement
-//line sql.y:4603
+//line sql.y:4608
 		{
 			yyLOCAL = &OtherAdmin{}
 		}
 		yyVAL.union = yyLOCAL
-	case 858:
+	case 859:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL Statement
-//line sql.y:4609
+//line sql.y:4614
 		{
 			yyLOCAL = &LockTables{Tables: yyDollar[3].tableAndLockTypesUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 859:
+	case 860:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL TableAndLockTypes
-//line sql.y:4615
+//line sql.y:4620
 		{
 			yyLOCAL = TableAndLockTypes{yyDollar[1].tableAndLockTypeUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 860:
+	case 861:
 		yyDollar = yyS[yypt-3 : yypt+1]
-//line sql.y:4619
+//line sql.y:4624
 		{
 			yySLICE := (*TableAndLockTypes)(yyIaddr(yyVAL.union))
 			*yySLICE = append(*yySLICE, yyDollar[3].tableAndLockTypeUnion())
 		}
-	case 861:
+	case 862:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL *TableAndLockType
-//line sql.y:4625
+//line sql.y:4630
 		{
 			yyLOCAL = &TableAndLockType{Table: yyDollar[1].aliasedTableNameUnion(), Lock: yyDollar[2].lockTypeUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 862:
+	case 863:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL LockType
-//line sql.y:4631
+//line sql.y:4636
 		{
 			yyLOCAL = Read
 		}
 		yyVAL.union = yyLOCAL
-	case 863:
+	case 864:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL LockType
-//line sql.y:4635
+//line sql.y:4640
 		{
 			yyLOCAL = ReadLocal
 		}
 		yyVAL.union = yyLOCAL
-	case 864:
+	case 865:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL LockType
-//line sql.y:4639
+//line sql.y:4644
 		{
 			yyLOCAL = Write
 		}
 		yyVAL.union = yyLOCAL
-	case 865:
+	case 866:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL LockType
-//line sql.y:4643
+//line sql.y:4648
 		{
 			yyLOCAL = LowPriorityWrite
 		}
 		yyVAL.union = yyLOCAL
-	case 866:
+	case 867:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL Statement
-//line sql.y:4649
+//line sql.y:4654
 		{
 			yyLOCAL = &UnlockTables{}
 		}
 		yyVAL.union = yyLOCAL
-	case 867:
+	case 868:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Statement
-//line sql.y:4655
+//line sql.y:4660
 		{
 			yyLOCAL = &RevertMigration{Comments: Comments(yyDollar[2].strs).Parsed(), UUID: string(yyDollar[4].str)}
 		}
 		yyVAL.union = yyLOCAL
-	case 868:
+	case 869:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL Statement
-//line sql.y:4661
+//line sql.y:4666
 		{
 			yyLOCAL = &Flush{IsLocal: yyDollar[2].booleanUnion(), FlushOptions: yyDollar[3].strs}
 		}
 		yyVAL.union = yyLOCAL
-	case 869:
+	case 870:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL Statement
-//line sql.y:4665
+//line sql.y:4670
 		{
 			yyLOCAL = &Flush{IsLocal: yyDollar[2].booleanUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 870:
+	case 871:
 		yyDollar = yyS[yypt-6 : yypt+1]
 		var yyLOCAL Statement
-//line sql.y:4669
+//line sql.y:4674
 		{
 			yyLOCAL = &Flush{IsLocal: yyDollar[2].booleanUnion(), WithLock: true}
 		}
 		yyVAL.union = yyLOCAL
-	case 871:
+	case 872:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Statement
-//line sql.y:4673
+//line sql.y:4678
 		{
 			yyLOCAL = &Flush{IsLocal: yyDollar[2].booleanUnion(), TableNames: yyDollar[4].tableNamesUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 872:
+	case 873:
 		yyDollar = yyS[yypt-7 : yypt+1]
 		var yyLOCAL Statement
-//line sql.y:4677
+//line sql.y:4682
 		{
 			yyLOCAL = &Flush{IsLocal: yyDollar[2].booleanUnion(), TableNames: yyDollar[4].tableNamesUnion(), WithLock: true}
 		}
 		yyVAL.union = yyLOCAL
-	case 873:
+	case 874:
 		yyDollar = yyS[yypt-6 : yypt+1]
 		var yyLOCAL Statement
-//line sql.y:4681
+//line sql.y:4686
 		{
 			yyLOCAL = &Flush{IsLocal: yyDollar[2].booleanUnion(), TableNames: yyDollar[4].tableNamesUnion(), ForExport: true}
 		}
 		yyVAL.union = yyLOCAL
-	case 874:
+	case 875:
 		yyDollar = yyS[yypt-1 : yypt+1]
-//line sql.y:4687
+//line sql.y:4692
 		{
 			yyVAL.strs = []string{yyDollar[1].str}
 		}
-	case 875:
+	case 876:
 		yyDollar = yyS[yypt-3 : yypt+1]
-//line sql.y:4691
+//line sql.y:4696
 		{
 			yyVAL.strs = append(yyDollar[1].strs, yyDollar[3].str)
 		}
-	case 876:
-		yyDollar = yyS[yypt-2 : yypt+1]
-//line sql.y:4697
-		{
-			yyVAL.str = string(yyDollar[1].str) + " " + string(yyDollar[2].str)
-		}
 	case 877:
 		yyDollar = yyS[yypt-2 : yypt+1]
-//line sql.y:4701
+//line sql.y:4702
 		{
 			yyVAL.str = string(yyDollar[1].str) + " " + string(yyDollar[2].str)
 		}
 	case 878:
 		yyDollar = yyS[yypt-2 : yypt+1]
-//line sql.y:4705
+//line sql.y:4706
 		{
 			yyVAL.str = string(yyDollar[1].str) + " " + string(yyDollar[2].str)
 		}
 	case 879:
 		yyDollar = yyS[yypt-2 : yypt+1]
-//line sql.y:4709
+//line sql.y:4710
 		{
 			yyVAL.str = string(yyDollar[1].str) + " " + string(yyDollar[2].str)
 		}
 	case 880:
-		yyDollar = yyS[yypt-1 : yypt+1]
-//line sql.y:4713
+		yyDollar = yyS[yypt-2 : yypt+1]
+//line sql.y:4714
 		{
-			yyVAL.str = string(yyDollar[1].str)
+			yyVAL.str = string(yyDollar[1].str) + " " + string(yyDollar[2].str)
 		}
 	case 881:
 		yyDollar = yyS[yypt-1 : yypt+1]
-//line sql.y:4717
+//line sql.y:4718
 		{
 			yyVAL.str = string(yyDollar[1].str)
 		}
 	case 882:
 		yyDollar = yyS[yypt-1 : yypt+1]
-//line sql.y:4721
+//line sql.y:4722
 		{
 			yyVAL.str = string(yyDollar[1].str)
 		}
 	case 883:
+		yyDollar = yyS[yypt-1 : yypt+1]
+//line sql.y:4726
+		{
+			yyVAL.str = string(yyDollar[1].str)
+		}
+	case 884:
 		yyDollar = yyS[yypt-3 : yypt+1]
-//line sql.y:4725
+//line sql.y:4730
 		{
 			yyVAL.str = string(yyDollar[1].str) + " " + string(yyDollar[2].str) + yyDollar[3].str
 		}
-	case 884:
+	case 885:
 		yyDollar = yyS[yypt-2 : yypt+1]
-//line sql.y:4729
+//line sql.y:4734
 		{
 			yyVAL.str = string(yyDollar[1].str) + " " + string(yyDollar[2].str)
 		}
-	case 885:
+	case 886:
 		yyDollar = yyS[yypt-1 : yypt+1]
-//line sql.y:4733
+//line sql.y:4738
 		{
 			yyVAL.str = string(yyDollar[1].str)
 		}
-	case 886:
+	case 887:
 		yyDollar = yyS[yypt-1 : yypt+1]
-//line sql.y:4737
+//line sql.y:4742
 		{
 			yyVAL.str = string(yyDollar[1].str)
 		}
-	case 887:
+	case 888:
 		yyDollar = yyS[yypt-1 : yypt+1]
-//line sql.y:4741
+//line sql.y:4746
 		{
 			yyVAL.str = string(yyDollar[1].str)
 		}
-	case 888:
+	case 889:
 		yyDollar = yyS[yypt-0 : yypt+1]
 		var yyLOCAL bool
-//line sql.y:4746
+//line sql.y:4751
 		{
 			yyLOCAL = false
 		}
 		yyVAL.union = yyLOCAL
-	case 889:
+	case 890:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL bool
-//line sql.y:4750
+//line sql.y:4755
 		{
 			yyLOCAL = true
 		}
 		yyVAL.union = yyLOCAL
-	case 890:
+	case 891:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL bool
-//line sql.y:4754
+//line sql.y:4759
 		{
 			yyLOCAL = true
 		}
 		yyVAL.union = yyLOCAL
-	case 891:
+	case 892:
 		yyDollar = yyS[yypt-0 : yypt+1]
-//line sql.y:4759
+//line sql.y:4764
 		{
 			yyVAL.str = ""
 		}
-	case 892:
+	case 893:
 		yyDollar = yyS[yypt-3 : yypt+1]
-//line sql.y:4763
+//line sql.y:4768
 		{
 			yyVAL.str = " " + string(yyDollar[1].str) + " " + string(yyDollar[2].str) + " " + yyDollar[3].identifierCI.String()
 		}
-	case 893:
+	case 894:
 		yyDollar = yyS[yypt-0 : yypt+1]
-//line sql.y:4768
+//line sql.y:4773
 		{
 			setAllowComments(yylex, true)
 		}
-	case 894:
+	case 895:
 		yyDollar = yyS[yypt-2 : yypt+1]
-//line sql.y:4772
+//line sql.y:4777
 		{
 			yyVAL.strs = yyDollar[2].strs
 			setAllowComments(yylex, false)
 		}
-	case 895:
+	case 896:
 		yyDollar = yyS[yypt-0 : yypt+1]
-//line sql.y:4778
+//line sql.y:4783
 		{
 			yyVAL.strs = nil
 		}
-	case 896:
+	case 897:
 		yyDollar = yyS[yypt-2 : yypt+1]
-//line sql.y:4782
+//line sql.y:4787
 		{
 			yyVAL.strs = append(yyDollar[1].strs, yyDollar[2].str)
 		}
-	case 897:
+	case 898:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL bool
-//line sql.y:4788
+//line sql.y:4793
 		{
 			yyLOCAL = true
 		}
 		yyVAL.union = yyLOCAL
-	case 898:
+	case 899:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL bool
-//line sql.y:4792
+//line sql.y:4797
 		{
 			yyLOCAL = false
 		}
 		yyVAL.union = yyLOCAL
-	case 899:
+	case 900:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL bool
-//line sql.y:4796
+//line sql.y:4801
 		{
 			yyLOCAL = true
 		}
 		yyVAL.union = yyLOCAL
-	case 900:
+	case 901:
 		yyDollar = yyS[yypt-0 : yypt+1]
-//line sql.y:4801
+//line sql.y:4806
 		{
 			yyVAL.str = ""
 		}
-	case 901:
+	case 902:
 		yyDollar = yyS[yypt-1 : yypt+1]
-//line sql.y:4805
+//line sql.y:4810
 		{
 			yyVAL.str = SQLNoCacheStr
 		}
-	case 902:
+	case 903:
 		yyDollar = yyS[yypt-1 : yypt+1]
-//line sql.y:4809
+//line sql.y:4814
 		{
 			yyVAL.str = SQLCacheStr
 		}
-	case 903:
+	case 904:
 		yyDollar = yyS[yypt-0 : yypt+1]
 		var yyLOCAL bool
-//line sql.y:4814
+//line sql.y:4819
 		{
 			yyLOCAL = false
 		}
 		yyVAL.union = yyLOCAL
-	case 904:
+	case 905:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL bool
-//line sql.y:4818
+//line sql.y:4823
 		{
 			yyLOCAL = true
 		}
 		yyVAL.union = yyLOCAL
-	case 905:
+	case 906:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL bool
-//line sql.y:4822
+//line sql.y:4827
 		{
 			yyLOCAL = true
 		}
 		yyVAL.union = yyLOCAL
-	case 906:
+	case 907:
 		yyDollar = yyS[yypt-5 : yypt+1]
 		var yyLOCAL Statement
-//line sql.y:4828
+//line sql.y:4833
 		{
 			yyLOCAL = &PrepareStmt{Name: yyDollar[3].identifierCI, Comments: Comments(yyDollar[2].strs).Parsed(), Statement: yyDollar[5].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 907:
+	case 908:
 		yyDollar = yyS[yypt-5 : yypt+1]
 		var yyLOCAL Statement
-//line sql.y:4832
+//line sql.y:4837
 		{
 			yyLOCAL = &PrepareStmt{
 				Name:      yyDollar[3].identifierCI,
@@ -16959,597 +16968,597 @@ yydefault:
 			}
 		}
 		yyVAL.union = yyLOCAL
-	case 908:
+	case 909:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Statement
-//line sql.y:4842
+//line sql.y:4847
 		{
 			yyLOCAL = &ExecuteStmt{Name: yyDollar[3].identifierCI, Comments: Comments(yyDollar[2].strs).Parsed(), Arguments: yyDollar[4].variablesUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 909:
+	case 910:
 		yyDollar = yyS[yypt-0 : yypt+1]
 		var yyLOCAL []*Variable
-//line sql.y:4847
+//line sql.y:4852
 		{
 			yyLOCAL = nil
 		}
 		yyVAL.union = yyLOCAL
-	case 910:
+	case 911:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL []*Variable
-//line sql.y:4851
+//line sql.y:4856
 		{
 			yyLOCAL = yyDollar[2].variablesUnion()
 		}
 		yyVAL.union = yyLOCAL
-	case 911:
+	case 912:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Statement
-//line sql.y:4857
+//line sql.y:4862
 		{
 			yyLOCAL = &DeallocateStmt{Comments: Comments(yyDollar[2].strs).Parsed(), Name: yyDollar[4].identifierCI}
 		}
 		yyVAL.union = yyLOCAL
-	case 912:
+	case 913:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Statement
-//line sql.y:4861
+//line sql.y:4866
 		{
 			yyLOCAL = &DeallocateStmt{Comments: Comments(yyDollar[2].strs).Parsed(), Name: yyDollar[4].identifierCI}
 		}
 		yyVAL.union = yyLOCAL
-	case 913:
+	case 914:
 		yyDollar = yyS[yypt-0 : yypt+1]
-//line sql.y:4866
+//line sql.y:4871
 		{
 			yyVAL.strs = nil
 		}
-	case 914:
+	case 915:
 		yyDollar = yyS[yypt-1 : yypt+1]
-//line sql.y:4870
+//line sql.y:4875
 		{
 			yyVAL.strs = yyDollar[1].strs
 		}
-	case 915:
+	case 916:
 		yyDollar = yyS[yypt-1 : yypt+1]
-//line sql.y:4876
+//line sql.y:4881
 		{
 			yyVAL.strs = []string{yyDollar[1].str}
 		}
-	case 916:
+	case 917:
 		yyDollar = yyS[yypt-2 : yypt+1]
-//line sql.y:4880
+//line sql.y:4885
 		{
 			yyVAL.strs = append(yyDollar[1].strs, yyDollar[2].str)
 		}
-	case 917:
+	case 918:
 		yyDollar = yyS[yypt-1 : yypt+1]
-//line sql.y:4886
+//line sql.y:4891
 		{
 			yyVAL.str = SQLNoCacheStr
 		}
-	case 918:
+	case 919:
 		yyDollar = yyS[yypt-1 : yypt+1]
-//line sql.y:4890
+//line sql.y:4895
 		{
 			yyVAL.str = SQLCacheStr
 		}
-	case 919:
+	case 920:
 		yyDollar = yyS[yypt-1 : yypt+1]
-//line sql.y:4894
+//line sql.y:4899
 		{
 			yyVAL.str = DistinctStr
 		}
-	case 920:
+	case 921:
 		yyDollar = yyS[yypt-1 : yypt+1]
-//line sql.y:4898
+//line sql.y:4903
 		{
 			yyVAL.str = DistinctStr
 		}
-	case 921:
+	case 922:
 		yyDollar = yyS[yypt-1 : yypt+1]
-//line sql.y:4902
+//line sql.y:4907
 		{
 			yyVAL.str = HighPriorityStr
 		}
-	case 922:
+	case 923:
 		yyDollar = yyS[yypt-1 : yypt+1]
-//line sql.y:4906
+//line sql.y:4911
 		{
 			yyVAL.str = StraightJoinHint
 		}
-	case 923:
+	case 924:
 		yyDollar = yyS[yypt-1 : yypt+1]
-//line sql.y:4910
+//line sql.y:4915
 		{
 			yyVAL.str = SQLBufferResultStr
 		}
-	case 924:
+	case 925:
 		yyDollar = yyS[yypt-1 : yypt+1]
-//line sql.y:4914
+//line sql.y:4919
 		{
 			yyVAL.str = SQLSmallResultStr
 		}
-	case 925:
+	case 926:
 		yyDollar = yyS[yypt-1 : yypt+1]
-//line sql.y:4918
+//line sql.y:4923
 		{
 			yyVAL.str = SQLBigResultStr
 		}
-	case 926:
+	case 927:
 		yyDollar = yyS[yypt-1 : yypt+1]
-//line sql.y:4922
+//line sql.y:4927
 		{
 			yyVAL.str = SQLCalcFoundRowsStr
 		}
-	case 927:
+	case 928:
 		yyDollar = yyS[yypt-1 : yypt+1]
-//line sql.y:4926
+//line sql.y:4931
 		{
 			yyVAL.str = AllStr // These are not picked up by NewSelect, and so ALL will be dropped. But this is OK, since it's redundant anyway
 		}
-	case 928:
+	case 929:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL SelectExprs
-//line sql.y:4932
+//line sql.y:4937
 		{
 			yyLOCAL = SelectExprs{yyDollar[1].selectExprUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 929:
+	case 930:
 		yyDollar = yyS[yypt-3 : yypt+1]
-//line sql.y:4936
+//line sql.y:4941
 		{
 			yySLICE := (*SelectExprs)(yyIaddr(yyVAL.union))
 			*yySLICE = append(*yySLICE, yyDollar[3].selectExprUnion())
 		}
-	case 930:
+	case 931:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL SelectExpr
-//line sql.y:4942
+//line sql.y:4947
 		{
 			yyLOCAL = &StarExpr{}
 		}
 		yyVAL.union = yyLOCAL
-	case 931:
+	case 932:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL SelectExpr
-//line sql.y:4946
+//line sql.y:4951
 		{
 			yyLOCAL = &AliasedExpr{Expr: yyDollar[1].exprUnion(), As: yyDollar[2].identifierCI}
 		}
 		yyVAL.union = yyLOCAL
-	case 932:
+	case 933:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL SelectExpr
-//line sql.y:4950
+//line sql.y:4955
 		{
 			yyLOCAL = &StarExpr{TableName: TableName{Name: yyDollar[1].identifierCS}}
 		}
 		yyVAL.union = yyLOCAL
-	case 933:
+	case 934:
 		yyDollar = yyS[yypt-5 : yypt+1]
 		var yyLOCAL SelectExpr
-//line sql.y:4954
+//line sql.y:4959
 		{
 			yyLOCAL = &StarExpr{TableName: TableName{Qualifier: yyDollar[1].identifierCS, Name: yyDollar[3].identifierCS}}
 		}
 		yyVAL.union = yyLOCAL
-	case 934:
+	case 935:
 		yyDollar = yyS[yypt-0 : yypt+1]
-//line sql.y:4959
+//line sql.y:4964
 		{
 			yyVAL.identifierCI = IdentifierCI{}
 		}
-	case 935:
+	case 936:
 		yyDollar = yyS[yypt-1 : yypt+1]
-//line sql.y:4963
+//line sql.y:4968
 		{
 			yyVAL.identifierCI = yyDollar[1].identifierCI
 		}
-	case 936:
+	case 937:
 		yyDollar = yyS[yypt-2 : yypt+1]
-//line sql.y:4967
+//line sql.y:4972
 		{
 			yyVAL.identifierCI = yyDollar[2].identifierCI
 		}
-	case 938:
+	case 939:
 		yyDollar = yyS[yypt-1 : yypt+1]
-//line sql.y:4974
+//line sql.y:4979
 		{
 			yyVAL.identifierCI = NewIdentifierCI(string(yyDollar[1].str))
 		}
-	case 939:
+	case 940:
 		yyDollar = yyS[yypt-0 : yypt+1]
 		var yyLOCAL TableExprs
-//line sql.y:4979
+//line sql.y:4984
 		{
 			yyLOCAL = TableExprs{&AliasedTableExpr{Expr: TableName{Name: NewIdentifierCS("dual")}}}
 		}
 		yyVAL.union = yyLOCAL
-	case 940:
+	case 941:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL TableExprs
-//line sql.y:4983
+//line sql.y:4988
 		{
 			yyLOCAL = yyDollar[1].tableExprsUnion()
 		}
 		yyVAL.union = yyLOCAL
-	case 941:
+	case 942:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL TableExprs
-//line sql.y:4989
+//line sql.y:4994
 		{
 			yyLOCAL = yyDollar[2].tableExprsUnion()
 		}
 		yyVAL.union = yyLOCAL
-	case 942:
+	case 943:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL TableExprs
-//line sql.y:4995
+//line sql.y:5000
 		{
 			yyLOCAL = TableExprs{yyDollar[1].tableExprUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 943:
+	case 944:
 		yyDollar = yyS[yypt-3 : yypt+1]
-//line sql.y:4999
+//line sql.y:5004
 		{
 			yySLICE := (*TableExprs)(yyIaddr(yyVAL.union))
 			*yySLICE = append(*yySLICE, yyDollar[3].tableExprUnion())
 		}
-	case 946:
+	case 947:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL TableExpr
-//line sql.y:5009
+//line sql.y:5014
 		{
 			yyLOCAL = yyDollar[1].aliasedTableNameUnion()
 		}
 		yyVAL.union = yyLOCAL
-	case 947:
+	case 948:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL TableExpr
-//line sql.y:5013
+//line sql.y:5018
 		{
 			yyLOCAL = &AliasedTableExpr{Expr: yyDollar[1].derivedTableUnion(), As: yyDollar[3].identifierCS, Columns: yyDollar[4].columnsUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 948:
+	case 949:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL TableExpr
-//line sql.y:5017
+//line sql.y:5022
 		{
 			yyLOCAL = &ParenTableExpr{Exprs: yyDollar[2].tableExprsUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 949:
+	case 950:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL TableExpr
-//line sql.y:5021
+//line sql.y:5026
 		{
 			yyLOCAL = yyDollar[1].tableExprUnion()
 		}
 		yyVAL.union = yyLOCAL
-	case 950:
+	case 951:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL *DerivedTable
-//line sql.y:5027
+//line sql.y:5032
 		{
 			yyLOCAL = &DerivedTable{Lateral: false, Select: yyDollar[1].tableStmtUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 951:
+	case 952:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL *DerivedTable
-//line sql.y:5031
+//line sql.y:5036
 		{
 			yyLOCAL = &DerivedTable{Lateral: true, Select: yyDollar[2].tableStmtUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 952:
+	case 953:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL *AliasedTableExpr
-//line sql.y:5037
+//line sql.y:5042
 		{
 			yyLOCAL = &AliasedTableExpr{Expr: yyDollar[1].tableName, As: yyDollar[2].identifierCS, Hints: yyDollar[3].indexHintsUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 953:
+	case 954:
 		yyDollar = yyS[yypt-7 : yypt+1]
 		var yyLOCAL *AliasedTableExpr
-//line sql.y:5041
+//line sql.y:5046
 		{
 			yyLOCAL = &AliasedTableExpr{Expr: yyDollar[1].tableName, Partitions: yyDollar[4].partitionsUnion(), As: yyDollar[6].identifierCS, Hints: yyDollar[7].indexHintsUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 954:
+	case 955:
 		yyDollar = yyS[yypt-0 : yypt+1]
 		var yyLOCAL Columns
-//line sql.y:5046
+//line sql.y:5051
 		{
 			yyLOCAL = nil
 		}
 		yyVAL.union = yyLOCAL
-	case 955:
+	case 956:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL Columns
-//line sql.y:5050
+//line sql.y:5055
 		{
 			yyLOCAL = yyDollar[2].columnsUnion()
 		}
 		yyVAL.union = yyLOCAL
-	case 956:
+	case 957:
 		yyDollar = yyS[yypt-0 : yypt+1]
 		var yyLOCAL Columns
-//line sql.y:5055
+//line sql.y:5060
 		{
 			yyLOCAL = nil
 		}
 		yyVAL.union = yyLOCAL
-	case 957:
+	case 958:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL Columns
-//line sql.y:5059
+//line sql.y:5064
 		{
 			yyLOCAL = yyDollar[1].columnsUnion()
 		}
 		yyVAL.union = yyLOCAL
-	case 958:
+	case 959:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL Columns
-//line sql.y:5065
+//line sql.y:5070
 		{
 			yyLOCAL = Columns{yyDollar[1].identifierCI}
 		}
 		yyVAL.union = yyLOCAL
-	case 959:
+	case 960:
 		yyDollar = yyS[yypt-3 : yypt+1]
-//line sql.y:5069
+//line sql.y:5074
 		{
 			yySLICE := (*Columns)(yyIaddr(yyVAL.union))
 			*yySLICE = append(*yySLICE, yyDollar[3].identifierCI)
 		}
-	case 960:
+	case 961:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL []*Variable
-//line sql.y:5075
+//line sql.y:5080
 		{
 			yyLOCAL = []*Variable{yyDollar[1].variableUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 961:
+	case 962:
 		yyDollar = yyS[yypt-3 : yypt+1]
-//line sql.y:5079
+//line sql.y:5084
 		{
 			yySLICE := (*[]*Variable)(yyIaddr(yyVAL.union))
 			*yySLICE = append(*yySLICE, yyDollar[3].variableUnion())
 		}
-	case 962:
+	case 963:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL Columns
-//line sql.y:5085
+//line sql.y:5090
 		{
 			yyLOCAL = Columns{yyDollar[1].identifierCI}
 		}
 		yyVAL.union = yyLOCAL
-	case 963:
+	case 964:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL Columns
-//line sql.y:5089
+//line sql.y:5094
 		{
 			yyLOCAL = Columns{NewIdentifierCI(string(yyDollar[1].str))}
 		}
 		yyVAL.union = yyLOCAL
-	case 964:
+	case 965:
 		yyDollar = yyS[yypt-3 : yypt+1]
-//line sql.y:5093
+//line sql.y:5098
 		{
 			yySLICE := (*Columns)(yyIaddr(yyVAL.union))
 			*yySLICE = append(*yySLICE, yyDollar[3].identifierCI)
 		}
-	case 965:
+	case 966:
 		yyDollar = yyS[yypt-3 : yypt+1]
-//line sql.y:5097
+//line sql.y:5102
 		{
 			yySLICE := (*Columns)(yyIaddr(yyVAL.union))
 			*yySLICE = append(*yySLICE, NewIdentifierCI(string(yyDollar[3].str)))
 		}
-	case 966:
+	case 967:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL Partitions
-//line sql.y:5103
+//line sql.y:5108
 		{
 			yyLOCAL = Partitions{yyDollar[1].identifierCI}
 		}
 		yyVAL.union = yyLOCAL
-	case 967:
+	case 968:
 		yyDollar = yyS[yypt-3 : yypt+1]
-//line sql.y:5107
+//line sql.y:5112
 		{
 			yySLICE := (*Partitions)(yyIaddr(yyVAL.union))
 			*yySLICE = append(*yySLICE, yyDollar[3].identifierCI)
 		}
-	case 968:
+	case 969:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL TableExpr
-//line sql.y:5120
+//line sql.y:5125
 		{
 			yyLOCAL = &JoinTableExpr{LeftExpr: yyDollar[1].tableExprUnion(), Join: yyDollar[2].joinTypeUnion(), RightExpr: yyDollar[3].tableExprUnion(), Condition: yyDollar[4].joinCondition}
 		}
 		yyVAL.union = yyLOCAL
-	case 969:
+	case 970:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL TableExpr
-//line sql.y:5124
+//line sql.y:5129
 		{
 			yyLOCAL = &JoinTableExpr{LeftExpr: yyDollar[1].tableExprUnion(), Join: yyDollar[2].joinTypeUnion(), RightExpr: yyDollar[3].tableExprUnion(), Condition: yyDollar[4].joinCondition}
 		}
 		yyVAL.union = yyLOCAL
-	case 970:
+	case 971:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL TableExpr
-//line sql.y:5128
+//line sql.y:5133
 		{
 			yyLOCAL = &JoinTableExpr{LeftExpr: yyDollar[1].tableExprUnion(), Join: yyDollar[2].joinTypeUnion(), RightExpr: yyDollar[3].tableExprUnion(), Condition: yyDollar[4].joinCondition}
 		}
 		yyVAL.union = yyLOCAL
-	case 971:
+	case 972:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL TableExpr
-//line sql.y:5132
+//line sql.y:5137
 		{
 			yyLOCAL = &JoinTableExpr{LeftExpr: yyDollar[1].tableExprUnion(), Join: yyDollar[2].joinTypeUnion(), RightExpr: yyDollar[3].tableExprUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 972:
+	case 973:
 		yyDollar = yyS[yypt-2 : yypt+1]
-//line sql.y:5138
+//line sql.y:5143
 		{
 			yyVAL.joinCondition = &JoinCondition{On: yyDollar[2].exprUnion()}
 		}
-	case 973:
+	case 974:
 		yyDollar = yyS[yypt-4 : yypt+1]
-//line sql.y:5140
+//line sql.y:5145
 		{
 			yyVAL.joinCondition = &JoinCondition{Using: yyDollar[3].columnsUnion()}
 		}
-	case 974:
+	case 975:
 		yyDollar = yyS[yypt-0 : yypt+1]
-//line sql.y:5144
+//line sql.y:5149
 		{
 			yyVAL.joinCondition = &JoinCondition{}
 		}
-	case 975:
+	case 976:
 		yyDollar = yyS[yypt-1 : yypt+1]
-//line sql.y:5146
+//line sql.y:5151
 		{
 			yyVAL.joinCondition = yyDollar[1].joinCondition
 		}
-	case 976:
+	case 977:
 		yyDollar = yyS[yypt-0 : yypt+1]
-//line sql.y:5150
+//line sql.y:5155
 		{
 			yyVAL.joinCondition = &JoinCondition{}
 		}
-	case 977:
+	case 978:
 		yyDollar = yyS[yypt-2 : yypt+1]
-//line sql.y:5152
+//line sql.y:5157
 		{
 			yyVAL.joinCondition = &JoinCondition{On: yyDollar[2].exprUnion()}
 		}
-	case 978:
+	case 979:
 		yyDollar = yyS[yypt-0 : yypt+1]
-//line sql.y:5155
+//line sql.y:5160
 		{
 			yyVAL.empty = struct{}{}
 		}
-	case 979:
+	case 980:
 		yyDollar = yyS[yypt-1 : yypt+1]
-//line sql.y:5157
+//line sql.y:5162
 		{
 			yyVAL.empty = struct{}{}
 		}
-	case 980:
+	case 981:
 		yyDollar = yyS[yypt-0 : yypt+1]
-//line sql.y:5160
+//line sql.y:5165
 		{
 			yyVAL.identifierCS = NewIdentifierCS("")
 		}
-	case 981:
+	case 982:
 		yyDollar = yyS[yypt-1 : yypt+1]
-//line sql.y:5164
+//line sql.y:5169
 		{
 			yyVAL.identifierCS = yyDollar[1].identifierCS
 		}
-	case 982:
+	case 983:
 		yyDollar = yyS[yypt-2 : yypt+1]
-//line sql.y:5168
+//line sql.y:5173
 		{
 			yyVAL.identifierCS = yyDollar[2].identifierCS
 		}
-	case 984:
+	case 985:
 		yyDollar = yyS[yypt-1 : yypt+1]
-//line sql.y:5175
+//line sql.y:5180
 		{
 			yyVAL.identifierCS = NewIdentifierCS(string(yyDollar[1].str))
 		}
-	case 985:
+	case 986:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL JoinType
-//line sql.y:5181
+//line sql.y:5186
 		{
 			yyLOCAL = NormalJoinType
 		}
 		yyVAL.union = yyLOCAL
-	case 986:
+	case 987:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL JoinType
-//line sql.y:5185
+//line sql.y:5190
 		{
 			yyLOCAL = NormalJoinType
 		}
 		yyVAL.union = yyLOCAL
-	case 987:
+	case 988:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL JoinType
-//line sql.y:5189
+//line sql.y:5194
 		{
 			yyLOCAL = NormalJoinType
 		}
 		yyVAL.union = yyLOCAL
-	case 988:
+	case 989:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL JoinType
-//line sql.y:5195
+//line sql.y:5200
 		{
 			yyLOCAL = StraightJoinType
 		}
 		yyVAL.union = yyLOCAL
-	case 989:
+	case 990:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL JoinType
-//line sql.y:5201
+//line sql.y:5206
 		{
 			yyLOCAL = LeftJoinType
 		}
 		yyVAL.union = yyLOCAL
-	case 990:
+	case 991:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL JoinType
-//line sql.y:5205
+//line sql.y:5210
 		{
 			yyLOCAL = LeftJoinType
 		}
 		yyVAL.union = yyLOCAL
-	case 991:
+	case 992:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL JoinType
-//line sql.y:5209
+//line sql.y:5214
 		{
 			yyLOCAL = RightJoinType
 		}
 		yyVAL.union = yyLOCAL
-	case 992:
+	case 993:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL JoinType
-//line sql.y:5213
+//line sql.y:5218
 		{
 			yyLOCAL = RightJoinType
 		}
 		yyVAL.union = yyLOCAL
-	case 993:
+	case 994:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL JoinType
-//line sql.y:5219
+//line sql.y:5224
 		{
 			yyLOCAL = NaturalJoinType
 		}
 		yyVAL.union = yyLOCAL
-	case 994:
+	case 995:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL JoinType
-//line sql.y:5223
+//line sql.y:5228
 		{
 			if yyDollar[2].joinTypeUnion() == LeftJoinType {
 				yyLOCAL = NaturalLeftJoinType
@@ -17558,667 +17567,667 @@ yydefault:
 			}
 		}
 		yyVAL.union = yyLOCAL
-	case 995:
+	case 996:
 		yyDollar = yyS[yypt-2 : yypt+1]
-//line sql.y:5233
+//line sql.y:5238
 		{
 			yyVAL.tableName = yyDollar[2].tableName
 		}
-	case 996:
+	case 997:
 		yyDollar = yyS[yypt-1 : yypt+1]
-//line sql.y:5237
+//line sql.y:5242
 		{
 			yyVAL.tableName = yyDollar[1].tableName
 		}
-	case 997:
+	case 998:
 		yyDollar = yyS[yypt-1 : yypt+1]
-//line sql.y:5243
+//line sql.y:5248
 		{
 			yyVAL.tableName = TableName{Name: yyDollar[1].identifierCS}
 		}
-	case 998:
+	case 999:
 		yyDollar = yyS[yypt-3 : yypt+1]
-//line sql.y:5247
+//line sql.y:5252
 		{
 			yyVAL.tableName = TableName{Qualifier: yyDollar[1].identifierCS, Name: yyDollar[3].identifierCS}
 		}
-	case 999:
+	case 1000:
 		yyDollar = yyS[yypt-3 : yypt+1]
-//line sql.y:5253
+//line sql.y:5258
 		{
 			yyVAL.tableName = TableName{Name: yyDollar[1].identifierCS}
 		}
-	case 1000:
+	case 1001:
 		yyDollar = yyS[yypt-0 : yypt+1]
 		var yyLOCAL IndexHints
-//line sql.y:5258
+//line sql.y:5263
 		{
 			yyLOCAL = nil
 		}
 		yyVAL.union = yyLOCAL
-	case 1001:
+	case 1002:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL IndexHints
-//line sql.y:5262
+//line sql.y:5267
 		{
 			yyLOCAL = yyDollar[1].indexHintsUnion()
 		}
 		yyVAL.union = yyLOCAL
-	case 1002:
+	case 1003:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL IndexHints
-//line sql.y:5268
+//line sql.y:5273
 		{
 			yyLOCAL = IndexHints{yyDollar[1].indexHintUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1003:
+	case 1004:
 		yyDollar = yyS[yypt-2 : yypt+1]
-//line sql.y:5272
+//line sql.y:5277
 		{
 			yySLICE := (*IndexHints)(yyIaddr(yyVAL.union))
 			*yySLICE = append(*yySLICE, yyDollar[2].indexHintUnion())
 		}
-	case 1004:
+	case 1005:
 		yyDollar = yyS[yypt-6 : yypt+1]
 		var yyLOCAL *IndexHint
-//line sql.y:5278
+//line sql.y:5283
 		{
 			yyLOCAL = &IndexHint{Type: UseOp, ForType: yyDollar[3].indexHintForTypeUnion(), Indexes: yyDollar[5].columnsUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1005:
+	case 1006:
 		yyDollar = yyS[yypt-5 : yypt+1]
 		var yyLOCAL *IndexHint
-//line sql.y:5282
+//line sql.y:5287
 		{
 			yyLOCAL = &IndexHint{Type: UseOp, ForType: yyDollar[3].indexHintForTypeUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1006:
+	case 1007:
 		yyDollar = yyS[yypt-6 : yypt+1]
 		var yyLOCAL *IndexHint
-//line sql.y:5286
+//line sql.y:5291
 		{
 			yyLOCAL = &IndexHint{Type: IgnoreOp, ForType: yyDollar[3].indexHintForTypeUnion(), Indexes: yyDollar[5].columnsUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1007:
+	case 1008:
 		yyDollar = yyS[yypt-6 : yypt+1]
 		var yyLOCAL *IndexHint
-//line sql.y:5290
+//line sql.y:5295
 		{
 			yyLOCAL = &IndexHint{Type: ForceOp, ForType: yyDollar[3].indexHintForTypeUnion(), Indexes: yyDollar[5].columnsUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1008:
+	case 1009:
 		yyDollar = yyS[yypt-5 : yypt+1]
 		var yyLOCAL *IndexHint
-//line sql.y:5294
+//line sql.y:5299
 		{
 			yyLOCAL = &IndexHint{Type: UseVindexOp, Indexes: yyDollar[4].columnsUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1009:
+	case 1010:
 		yyDollar = yyS[yypt-5 : yypt+1]
 		var yyLOCAL *IndexHint
-//line sql.y:5298
+//line sql.y:5303
 		{
 			yyLOCAL = &IndexHint{Type: IgnoreVindexOp, Indexes: yyDollar[4].columnsUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1010:
+	case 1011:
 		yyDollar = yyS[yypt-0 : yypt+1]
 		var yyLOCAL IndexHintForType
-//line sql.y:5303
+//line sql.y:5308
 		{
 			yyLOCAL = NoForType
 		}
 		yyVAL.union = yyLOCAL
-	case 1011:
+	case 1012:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL IndexHintForType
-//line sql.y:5307
+//line sql.y:5312
 		{
 			yyLOCAL = JoinForType
 		}
 		yyVAL.union = yyLOCAL
-	case 1012:
+	case 1013:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL IndexHintForType
-//line sql.y:5311
+//line sql.y:5316
 		{
 			yyLOCAL = OrderByForType
 		}
 		yyVAL.union = yyLOCAL
-	case 1013:
+	case 1014:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL IndexHintForType
-//line sql.y:5315
+//line sql.y:5320
 		{
 			yyLOCAL = GroupByForType
 		}
 		yyVAL.union = yyLOCAL
-	case 1014:
+	case 1015:
 		yyDollar = yyS[yypt-0 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:5321
+//line sql.y:5326
 		{
 			yyLOCAL = nil
 		}
 		yyVAL.union = yyLOCAL
-	case 1015:
+	case 1016:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:5325
+//line sql.y:5330
 		{
 			yyLOCAL = yyDollar[2].exprUnion()
 		}
 		yyVAL.union = yyLOCAL
-	case 1016:
+	case 1017:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:5332
+//line sql.y:5337
 		{
 			yyLOCAL = &OrExpr{Left: yyDollar[1].exprUnion(), Right: yyDollar[3].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1017:
+	case 1018:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:5336
+//line sql.y:5341
 		{
 			yyLOCAL = &XorExpr{Left: yyDollar[1].exprUnion(), Right: yyDollar[3].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1018:
+	case 1019:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:5340
+//line sql.y:5345
 		{
 			yyLOCAL = &AndExpr{Left: yyDollar[1].exprUnion(), Right: yyDollar[3].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1019:
+	case 1020:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:5344
+//line sql.y:5349
 		{
 			yyLOCAL = &NotExpr{Expr: yyDollar[2].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1020:
+	case 1021:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:5348
+//line sql.y:5353
 		{
 			yyLOCAL = &IsExpr{Left: yyDollar[1].exprUnion(), Right: yyDollar[3].isExprOperatorUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1021:
+	case 1022:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:5352
+//line sql.y:5357
 		{
 			yyLOCAL = yyDollar[1].exprUnion()
 		}
 		yyVAL.union = yyLOCAL
-	case 1022:
+	case 1023:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:5356
+//line sql.y:5361
 		{
 			yyLOCAL = &AssignmentExpr{Left: yyDollar[1].variableUnion(), Right: yyDollar[3].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1023:
+	case 1024:
 		yyDollar = yyS[yypt-6 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:5360
+//line sql.y:5365
 		{
 			yyLOCAL = &MemberOfExpr{Value: yyDollar[1].exprUnion(), JSONArr: yyDollar[5].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1024:
+	case 1025:
 		yyDollar = yyS[yypt-1 : yypt+1]
-//line sql.y:5366
+//line sql.y:5371
 		{
 		}
-	case 1025:
+	case 1026:
 		yyDollar = yyS[yypt-1 : yypt+1]
-//line sql.y:5369
+//line sql.y:5374
 		{
 		}
-	case 1026:
+	case 1027:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:5374
+//line sql.y:5379
 		{
 			yyLOCAL = &IsExpr{Left: yyDollar[1].exprUnion(), Right: IsNullOp}
 		}
 		yyVAL.union = yyLOCAL
-	case 1027:
+	case 1028:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:5378
+//line sql.y:5383
 		{
 			yyLOCAL = &IsExpr{Left: yyDollar[1].exprUnion(), Right: IsNotNullOp}
 		}
 		yyVAL.union = yyLOCAL
-	case 1028:
+	case 1029:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:5382
+//line sql.y:5387
 		{
 			yyLOCAL = &ComparisonExpr{Left: yyDollar[1].exprUnion(), Operator: yyDollar[2].comparisonExprOperatorUnion(), Right: yyDollar[3].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1029:
+	case 1030:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:5386
+//line sql.y:5391
 		{
 			yyLOCAL = &ComparisonExpr{Left: yyDollar[1].exprUnion(), Operator: yyDollar[2].comparisonExprOperatorUnion(), Modifier: Any, Right: yyDollar[4].subqueryUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1030:
+	case 1031:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:5390
+//line sql.y:5395
 		{
 			yyLOCAL = &ComparisonExpr{Left: yyDollar[1].exprUnion(), Operator: yyDollar[2].comparisonExprOperatorUnion(), Modifier: Any, Right: yyDollar[4].subqueryUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1031:
+	case 1032:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:5394
+//line sql.y:5399
 		{
 			yyLOCAL = &ComparisonExpr{Left: yyDollar[1].exprUnion(), Operator: yyDollar[2].comparisonExprOperatorUnion(), Modifier: All, Right: yyDollar[4].subqueryUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1032:
+	case 1033:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:5398
+//line sql.y:5403
 		{
 			yyLOCAL = yyDollar[1].exprUnion()
 		}
 		yyVAL.union = yyLOCAL
-	case 1033:
+	case 1034:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:5404
+//line sql.y:5409
 		{
 			yyLOCAL = &ComparisonExpr{Left: yyDollar[1].exprUnion(), Operator: InOp, Right: yyDollar[3].colTupleUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1034:
+	case 1035:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:5408
+//line sql.y:5413
 		{
 			yyLOCAL = &ComparisonExpr{Left: yyDollar[1].exprUnion(), Operator: NotInOp, Right: yyDollar[4].colTupleUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1035:
+	case 1036:
 		yyDollar = yyS[yypt-5 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:5412
+//line sql.y:5417
 		{
 			yyLOCAL = &BetweenExpr{Left: yyDollar[1].exprUnion(), IsBetween: true, From: yyDollar[3].exprUnion(), To: yyDollar[5].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1036:
+	case 1037:
 		yyDollar = yyS[yypt-6 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:5416
+//line sql.y:5421
 		{
 			yyLOCAL = &BetweenExpr{Left: yyDollar[1].exprUnion(), IsBetween: false, From: yyDollar[4].exprUnion(), To: yyDollar[6].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1037:
+	case 1038:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:5420
+//line sql.y:5425
 		{
 			yyLOCAL = &ComparisonExpr{Left: yyDollar[1].exprUnion(), Operator: LikeOp, Right: yyDollar[3].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1038:
+	case 1039:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:5424
+//line sql.y:5429
 		{
 			yyLOCAL = &ComparisonExpr{Left: yyDollar[1].exprUnion(), Operator: NotLikeOp, Right: yyDollar[4].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1039:
+	case 1040:
 		yyDollar = yyS[yypt-5 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:5428
+//line sql.y:5433
 		{
 			yyLOCAL = &ComparisonExpr{Left: yyDollar[1].exprUnion(), Operator: LikeOp, Right: yyDollar[3].exprUnion(), Escape: yyDollar[5].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1040:
+	case 1041:
 		yyDollar = yyS[yypt-6 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:5432
+//line sql.y:5437
 		{
 			yyLOCAL = &ComparisonExpr{Left: yyDollar[1].exprUnion(), Operator: NotLikeOp, Right: yyDollar[4].exprUnion(), Escape: yyDollar[6].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1041:
+	case 1042:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:5436
+//line sql.y:5441
 		{
 			yyLOCAL = &ComparisonExpr{Left: yyDollar[1].exprUnion(), Operator: RegexpOp, Right: yyDollar[3].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1042:
+	case 1043:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:5440
+//line sql.y:5445
 		{
 			yyLOCAL = &ComparisonExpr{Left: yyDollar[1].exprUnion(), Operator: NotRegexpOp, Right: yyDollar[4].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1043:
+	case 1044:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:5444
+//line sql.y:5449
 		{
 			yyLOCAL = yyDollar[1].exprUnion()
 		}
 		yyVAL.union = yyLOCAL
-	case 1044:
+	case 1045:
 		yyDollar = yyS[yypt-1 : yypt+1]
-//line sql.y:5450
+//line sql.y:5455
 		{
 		}
-	case 1045:
+	case 1046:
 		yyDollar = yyS[yypt-1 : yypt+1]
-//line sql.y:5453
+//line sql.y:5458
 		{
 		}
-	case 1046:
+	case 1047:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:5459
+//line sql.y:5464
 		{
 			yyLOCAL = &BinaryExpr{Left: yyDollar[1].exprUnion(), Operator: BitOrOp, Right: yyDollar[3].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1047:
+	case 1048:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:5463
+//line sql.y:5468
 		{
 			yyLOCAL = &BinaryExpr{Left: yyDollar[1].exprUnion(), Operator: BitAndOp, Right: yyDollar[3].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1048:
+	case 1049:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:5467
+//line sql.y:5472
 		{
 			yyLOCAL = &BinaryExpr{Left: yyDollar[1].exprUnion(), Operator: ShiftLeftOp, Right: yyDollar[3].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1049:
+	case 1050:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:5471
+//line sql.y:5476
 		{
 			yyLOCAL = &BinaryExpr{Left: yyDollar[1].exprUnion(), Operator: ShiftRightOp, Right: yyDollar[3].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1050:
+	case 1051:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:5475
+//line sql.y:5480
 		{
 			yyLOCAL = &BinaryExpr{Left: yyDollar[1].exprUnion(), Operator: PlusOp, Right: yyDollar[3].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1051:
+	case 1052:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:5479
+//line sql.y:5484
 		{
 			yyLOCAL = &BinaryExpr{Left: yyDollar[1].exprUnion(), Operator: MinusOp, Right: yyDollar[3].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1052:
+	case 1053:
 		yyDollar = yyS[yypt-5 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:5483
+//line sql.y:5488
 		{
 			yyLOCAL = &IntervalDateExpr{Syntax: IntervalDateExprBinaryAdd, Date: yyDollar[1].exprUnion(), Unit: yyDollar[5].intervalTypeUnion(), Interval: yyDollar[4].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1053:
+	case 1054:
 		yyDollar = yyS[yypt-5 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:5487
+//line sql.y:5492
 		{
 			yyLOCAL = &IntervalDateExpr{Syntax: IntervalDateExprBinarySub, Date: yyDollar[1].exprUnion(), Unit: yyDollar[5].intervalTypeUnion(), Interval: yyDollar[4].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1054:
+	case 1055:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:5491
+//line sql.y:5496
 		{
 			yyLOCAL = &BinaryExpr{Left: yyDollar[1].exprUnion(), Operator: MultOp, Right: yyDollar[3].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1055:
+	case 1056:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:5495
+//line sql.y:5500
 		{
 			yyLOCAL = &BinaryExpr{Left: yyDollar[1].exprUnion(), Operator: DivOp, Right: yyDollar[3].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1056:
+	case 1057:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:5499
+//line sql.y:5504
 		{
 			yyLOCAL = &BinaryExpr{Left: yyDollar[1].exprUnion(), Operator: ModOp, Right: yyDollar[3].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1057:
+	case 1058:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:5503
+//line sql.y:5508
 		{
 			yyLOCAL = &BinaryExpr{Left: yyDollar[1].exprUnion(), Operator: IntDivOp, Right: yyDollar[3].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1058:
+	case 1059:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:5507
+//line sql.y:5512
 		{
 			yyLOCAL = &BinaryExpr{Left: yyDollar[1].exprUnion(), Operator: ModOp, Right: yyDollar[3].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1059:
+	case 1060:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:5511
+//line sql.y:5516
 		{
 			yyLOCAL = &BinaryExpr{Left: yyDollar[1].exprUnion(), Operator: BitXorOp, Right: yyDollar[3].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1060:
+	case 1061:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:5515
+//line sql.y:5520
 		{
 			yyLOCAL = yyDollar[1].exprUnion()
 		}
 		yyVAL.union = yyLOCAL
-	case 1061:
+	case 1062:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:5521
+//line sql.y:5526
 		{
 			yyLOCAL = yyDollar[1].exprUnion()
 		}
 		yyVAL.union = yyLOCAL
-	case 1062:
+	case 1063:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:5525
+//line sql.y:5530
 		{
 			yyLOCAL = yyDollar[1].exprUnion()
 		}
 		yyVAL.union = yyLOCAL
-	case 1063:
+	case 1064:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:5529
+//line sql.y:5534
 		{
 			yyLOCAL = yyDollar[1].exprUnion()
 		}
 		yyVAL.union = yyLOCAL
-	case 1064:
+	case 1065:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:5533
+//line sql.y:5538
 		{
 			yyLOCAL = yyDollar[1].exprUnion()
 		}
 		yyVAL.union = yyLOCAL
-	case 1065:
+	case 1066:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:5537
+//line sql.y:5542
 		{
 			yyLOCAL = &CollateExpr{Expr: yyDollar[1].exprUnion(), Collation: yyDollar[3].str}
 		}
 		yyVAL.union = yyLOCAL
-	case 1066:
+	case 1067:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:5541
+//line sql.y:5546
 		{
 			yyLOCAL = yyDollar[1].exprUnion()
 		}
 		yyVAL.union = yyLOCAL
-	case 1067:
+	case 1068:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:5545
+//line sql.y:5550
 		{
 			yyLOCAL = yyDollar[1].exprUnion()
 		}
 		yyVAL.union = yyLOCAL
-	case 1068:
+	case 1069:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:5549
+//line sql.y:5554
 		{
 			yyLOCAL = yyDollar[1].variableUnion()
 		}
 		yyVAL.union = yyLOCAL
-	case 1069:
+	case 1070:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:5553
+//line sql.y:5558
 		{
 			yyLOCAL = yyDollar[2].exprUnion() // TODO: do we really want to ignore unary '+' before any kind of literals?
 		}
 		yyVAL.union = yyLOCAL
-	case 1070:
+	case 1071:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:5557
+//line sql.y:5562
 		{
 			yyLOCAL = &UnaryExpr{Operator: UMinusOp, Expr: yyDollar[2].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1071:
+	case 1072:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:5561
+//line sql.y:5566
 		{
 			yyLOCAL = &UnaryExpr{Operator: TildaOp, Expr: yyDollar[2].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1072:
+	case 1073:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:5565
+//line sql.y:5570
 		{
 			yyLOCAL = &UnaryExpr{Operator: BangOp, Expr: yyDollar[2].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1073:
+	case 1074:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:5569
+//line sql.y:5574
 		{
 			yyLOCAL = yyDollar[1].subqueryUnion()
 		}
 		yyVAL.union = yyLOCAL
-	case 1074:
+	case 1075:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:5573
+//line sql.y:5578
 		{
 			yyLOCAL = yyDollar[1].exprUnion()
 		}
 		yyVAL.union = yyLOCAL
-	case 1075:
+	case 1076:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:5577
+//line sql.y:5582
 		{
 			yyLOCAL = &ExistsExpr{Subquery: yyDollar[2].subqueryUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1076:
+	case 1077:
 		yyDollar = yyS[yypt-7 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:5581
+//line sql.y:5586
 		{
 			yyLOCAL = &MatchExpr{Columns: yyDollar[2].colNamesUnion(), Expr: yyDollar[5].exprUnion(), Option: yyDollar[6].matchExprOptionUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1077:
+	case 1078:
 		yyDollar = yyS[yypt-7 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:5585
+//line sql.y:5590
 		{
 			yyLOCAL = &CastExpr{Expr: yyDollar[3].exprUnion(), Type: yyDollar[5].convertTypeUnion(), Array: yyDollar[6].booleanUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1078:
+	case 1079:
 		yyDollar = yyS[yypt-6 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:5589
+//line sql.y:5594
 		{
 			yyLOCAL = &ConvertExpr{Expr: yyDollar[3].exprUnion(), Type: yyDollar[5].convertTypeUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1079:
+	case 1080:
 		yyDollar = yyS[yypt-6 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:5593
+//line sql.y:5598
 		{
 			yyLOCAL = &ConvertUsingExpr{Expr: yyDollar[3].exprUnion(), Type: yyDollar[5].str}
 		}
 		yyVAL.union = yyLOCAL
-	case 1080:
+	case 1081:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:5597
+//line sql.y:5602
 		{
 			// From: https://dev.mysql.com/doc/refman/8.0/en/cast-functions.html#operator_binary
 			// To convert a string expression to a binary string, these constructs are equivalent:
@@ -18227,3218 +18236,3218 @@ yydefault:
 			yyLOCAL = &ConvertExpr{Expr: yyDollar[2].exprUnion(), Type: &ConvertType{Type: yyDollar[1].str}}
 		}
 		yyVAL.union = yyLOCAL
-	case 1081:
+	case 1082:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:5605
+//line sql.y:5610
 		{
 			yyLOCAL = &Default{ColName: yyDollar[2].str}
 		}
 		yyVAL.union = yyLOCAL
-	case 1082:
+	case 1083:
 		yyDollar = yyS[yypt-5 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:5609
+//line sql.y:5614
 		{
 			yyLOCAL = &IntervalDateExpr{Syntax: IntervalDateExprBinaryAddLeft, Date: yyDollar[5].exprUnion(), Unit: yyDollar[3].intervalTypeUnion(), Interval: yyDollar[2].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1083:
+	case 1084:
 		yyDollar = yyS[yypt-6 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:5613
+//line sql.y:5618
 		{
 			yyLOCAL = &IntervalFuncExpr{Expr: yyDollar[3].exprUnion(), Exprs: yyDollar[5].exprsUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1084:
+	case 1085:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:5617
+//line sql.y:5622
 		{
 			yyLOCAL = &JSONExtractExpr{JSONDoc: yyDollar[1].exprUnion(), PathList: []Expr{yyDollar[3].exprUnion()}}
 		}
 		yyVAL.union = yyLOCAL
-	case 1085:
+	case 1086:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:5621
+//line sql.y:5626
 		{
 			yyLOCAL = &JSONUnquoteExpr{JSONValue: &JSONExtractExpr{JSONDoc: yyDollar[1].exprUnion(), PathList: []Expr{yyDollar[3].exprUnion()}}}
 		}
 		yyVAL.union = yyLOCAL
-	case 1086:
+	case 1087:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL []*ColName
-//line sql.y:5627
+//line sql.y:5632
 		{
 			yyLOCAL = yyDollar[1].colNamesUnion()
 		}
 		yyVAL.union = yyLOCAL
-	case 1087:
+	case 1088:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL []*ColName
-//line sql.y:5631
+//line sql.y:5636
 		{
 			yyLOCAL = yyDollar[2].colNamesUnion()
 		}
 		yyVAL.union = yyLOCAL
-	case 1088:
+	case 1089:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL []*ColName
-//line sql.y:5637
+//line sql.y:5642
 		{
 			yyLOCAL = []*ColName{yyDollar[1].colNameUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1089:
+	case 1090:
 		yyDollar = yyS[yypt-3 : yypt+1]
-//line sql.y:5641
+//line sql.y:5646
 		{
 			yySLICE := (*[]*ColName)(yyIaddr(yyVAL.union))
 			*yySLICE = append(*yySLICE, yyDollar[3].colNameUnion())
 		}
-	case 1090:
+	case 1091:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL TrimType
-//line sql.y:5647
+//line sql.y:5652
 		{
 			yyLOCAL = BothTrimType
 		}
 		yyVAL.union = yyLOCAL
-	case 1091:
+	case 1092:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL TrimType
-//line sql.y:5651
+//line sql.y:5656
 		{
 			yyLOCAL = LeadingTrimType
 		}
 		yyVAL.union = yyLOCAL
-	case 1092:
+	case 1093:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL TrimType
-//line sql.y:5655
+//line sql.y:5660
 		{
 			yyLOCAL = TrailingTrimType
 		}
 		yyVAL.union = yyLOCAL
-	case 1093:
+	case 1094:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL FrameUnitType
-//line sql.y:5661
+//line sql.y:5666
 		{
 			yyLOCAL = FrameRowsType
 		}
 		yyVAL.union = yyLOCAL
-	case 1094:
+	case 1095:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL FrameUnitType
-//line sql.y:5665
+//line sql.y:5670
 		{
 			yyLOCAL = FrameRangeType
 		}
 		yyVAL.union = yyLOCAL
-	case 1095:
+	case 1096:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL ArgumentLessWindowExprType
-//line sql.y:5672
+//line sql.y:5677
 		{
 			yyLOCAL = CumeDistExprType
 		}
 		yyVAL.union = yyLOCAL
-	case 1096:
+	case 1097:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL ArgumentLessWindowExprType
-//line sql.y:5676
+//line sql.y:5681
 		{
 			yyLOCAL = DenseRankExprType
 		}
 		yyVAL.union = yyLOCAL
-	case 1097:
+	case 1098:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL ArgumentLessWindowExprType
-//line sql.y:5680
+//line sql.y:5685
 		{
 			yyLOCAL = PercentRankExprType
 		}
 		yyVAL.union = yyLOCAL
-	case 1098:
+	case 1099:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL ArgumentLessWindowExprType
-//line sql.y:5684
+//line sql.y:5689
 		{
 			yyLOCAL = RankExprType
 		}
 		yyVAL.union = yyLOCAL
-	case 1099:
+	case 1100:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL ArgumentLessWindowExprType
-//line sql.y:5688
+//line sql.y:5693
 		{
 			yyLOCAL = RowNumberExprType
 		}
 		yyVAL.union = yyLOCAL
-	case 1100:
+	case 1101:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL *FramePoint
-//line sql.y:5694
+//line sql.y:5699
 		{
 			yyLOCAL = &FramePoint{Type: CurrentRowType}
 		}
 		yyVAL.union = yyLOCAL
-	case 1101:
+	case 1102:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL *FramePoint
-//line sql.y:5698
+//line sql.y:5703
 		{
 			yyLOCAL = &FramePoint{Type: UnboundedPrecedingType}
 		}
 		yyVAL.union = yyLOCAL
-	case 1102:
+	case 1103:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL *FramePoint
-//line sql.y:5702
+//line sql.y:5707
 		{
 			yyLOCAL = &FramePoint{Type: UnboundedFollowingType}
 		}
 		yyVAL.union = yyLOCAL
-	case 1103:
+	case 1104:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL *FramePoint
-//line sql.y:5706
+//line sql.y:5711
 		{
 			yyLOCAL = &FramePoint{Type: ExprPrecedingType, Expr: yyDollar[1].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1104:
+	case 1105:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL *FramePoint
-//line sql.y:5710
+//line sql.y:5715
 		{
 			yyLOCAL = &FramePoint{Type: ExprPrecedingType, Expr: yyDollar[2].exprUnion(), Unit: yyDollar[3].intervalTypeUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1105:
+	case 1106:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL *FramePoint
-//line sql.y:5714
+//line sql.y:5719
 		{
 			yyLOCAL = &FramePoint{Type: ExprFollowingType, Expr: yyDollar[1].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1106:
+	case 1107:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL *FramePoint
-//line sql.y:5718
+//line sql.y:5723
 		{
 			yyLOCAL = &FramePoint{Type: ExprFollowingType, Expr: yyDollar[2].exprUnion(), Unit: yyDollar[3].intervalTypeUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1107:
+	case 1108:
 		yyDollar = yyS[yypt-0 : yypt+1]
 		var yyLOCAL *FrameClause
-//line sql.y:5723
+//line sql.y:5728
 		{
 			yyLOCAL = nil
 		}
 		yyVAL.union = yyLOCAL
-	case 1108:
+	case 1109:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL *FrameClause
-//line sql.y:5727
+//line sql.y:5732
 		{
 			yyLOCAL = yyDollar[1].frameClauseUnion()
 		}
 		yyVAL.union = yyLOCAL
-	case 1109:
+	case 1110:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL *FrameClause
-//line sql.y:5733
+//line sql.y:5738
 		{
 			yyLOCAL = &FrameClause{Unit: yyDollar[1].frameUnitTypeUnion(), Start: yyDollar[2].framePointUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1110:
+	case 1111:
 		yyDollar = yyS[yypt-5 : yypt+1]
 		var yyLOCAL *FrameClause
-//line sql.y:5737
+//line sql.y:5742
 		{
 			yyLOCAL = &FrameClause{Unit: yyDollar[1].frameUnitTypeUnion(), Start: yyDollar[3].framePointUnion(), End: yyDollar[5].framePointUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1111:
+	case 1112:
 		yyDollar = yyS[yypt-0 : yypt+1]
 		var yyLOCAL Exprs
-//line sql.y:5742
+//line sql.y:5747
 		{
 			yyLOCAL = nil
 		}
 		yyVAL.union = yyLOCAL
-	case 1112:
+	case 1113:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL Exprs
-//line sql.y:5746
+//line sql.y:5751
 		{
 			yyLOCAL = yyDollar[3].exprsUnion()
 		}
 		yyVAL.union = yyLOCAL
-	case 1113:
+	case 1114:
 		yyDollar = yyS[yypt-0 : yypt+1]
-//line sql.y:5751
+//line sql.y:5756
 		{
 			yyVAL.identifierCI = IdentifierCI{}
 		}
-	case 1114:
+	case 1115:
 		yyDollar = yyS[yypt-1 : yypt+1]
-//line sql.y:5755
+//line sql.y:5760
 		{
 			yyVAL.identifierCI = yyDollar[1].identifierCI
 		}
-	case 1115:
+	case 1116:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL *WindowSpecification
-//line sql.y:5761
+//line sql.y:5766
 		{
 			yyLOCAL = &WindowSpecification{Name: yyDollar[1].identifierCI, PartitionClause: yyDollar[2].exprsUnion(), OrderClause: yyDollar[3].orderByUnion(), FrameClause: yyDollar[4].frameClauseUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1116:
+	case 1117:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL *OverClause
-//line sql.y:5767
+//line sql.y:5772
 		{
 			yyLOCAL = &OverClause{WindowSpec: yyDollar[3].windowSpecificationUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1117:
+	case 1118:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL *OverClause
-//line sql.y:5771
+//line sql.y:5776
 		{
 			yyLOCAL = &OverClause{WindowName: yyDollar[2].identifierCI}
 		}
 		yyVAL.union = yyLOCAL
-	case 1118:
+	case 1119:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL *OverClause
-//line sql.y:5777
+//line sql.y:5782
 		{
 			yyLOCAL = yyDollar[1].overClauseUnion()
 		}
 		yyVAL.union = yyLOCAL
-	case 1119:
+	case 1120:
 		yyDollar = yyS[yypt-0 : yypt+1]
 		var yyLOCAL *OverClause
-//line sql.y:5781
+//line sql.y:5786
 		{
 			yyLOCAL = nil
 		}
 		yyVAL.union = yyLOCAL
-	case 1120:
+	case 1121:
 		yyDollar = yyS[yypt-0 : yypt+1]
 		var yyLOCAL *NullTreatmentClause
-//line sql.y:5786
+//line sql.y:5791
 		{
 			yyLOCAL = nil
 		}
 		yyVAL.union = yyLOCAL
-	case 1122:
+	case 1123:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL *NullTreatmentClause
-//line sql.y:5793
+//line sql.y:5798
 		{
 			yyLOCAL = &NullTreatmentClause{yyDollar[1].nullTreatmentTypeUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1123:
+	case 1124:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL NullTreatmentType
-//line sql.y:5799
+//line sql.y:5804
 		{
 			yyLOCAL = RespectNullsType
 		}
 		yyVAL.union = yyLOCAL
-	case 1124:
+	case 1125:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL NullTreatmentType
-//line sql.y:5803
+//line sql.y:5808
 		{
 			yyLOCAL = IgnoreNullsType
 		}
 		yyVAL.union = yyLOCAL
-	case 1125:
+	case 1126:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL FirstOrLastValueExprType
-//line sql.y:5809
+//line sql.y:5814
 		{
 			yyLOCAL = FirstValueExprType
 		}
 		yyVAL.union = yyLOCAL
-	case 1126:
+	case 1127:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL FirstOrLastValueExprType
-//line sql.y:5813
+//line sql.y:5818
 		{
 			yyLOCAL = LastValueExprType
 		}
 		yyVAL.union = yyLOCAL
-	case 1127:
+	case 1128:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL FromFirstLastType
-//line sql.y:5819
+//line sql.y:5824
 		{
 			yyLOCAL = FromFirstType
 		}
 		yyVAL.union = yyLOCAL
-	case 1128:
+	case 1129:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL FromFirstLastType
-//line sql.y:5823
+//line sql.y:5828
 		{
 			yyLOCAL = FromLastType
 		}
 		yyVAL.union = yyLOCAL
-	case 1129:
+	case 1130:
 		yyDollar = yyS[yypt-0 : yypt+1]
 		var yyLOCAL *FromFirstLastClause
-//line sql.y:5828
+//line sql.y:5833
 		{
 			yyLOCAL = nil
 		}
 		yyVAL.union = yyLOCAL
-	case 1131:
+	case 1132:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL *FromFirstLastClause
-//line sql.y:5835
+//line sql.y:5840
 		{
 			yyLOCAL = &FromFirstLastClause{yyDollar[1].fromFirstLastTypeUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1132:
+	case 1133:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL LagLeadExprType
-//line sql.y:5841
+//line sql.y:5846
 		{
 			yyLOCAL = LagExprType
 		}
 		yyVAL.union = yyLOCAL
-	case 1133:
+	case 1134:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL LagLeadExprType
-//line sql.y:5845
+//line sql.y:5850
 		{
 			yyLOCAL = LeadExprType
 		}
 		yyVAL.union = yyLOCAL
-	case 1134:
+	case 1135:
 		yyDollar = yyS[yypt-5 : yypt+1]
 		var yyLOCAL *WindowDefinition
-//line sql.y:5851
+//line sql.y:5856
 		{
 			yyLOCAL = &WindowDefinition{Name: yyDollar[1].identifierCI, WindowSpec: yyDollar[4].windowSpecificationUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1135:
+	case 1136:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL WindowDefinitions
-//line sql.y:5857
+//line sql.y:5862
 		{
 			yyLOCAL = WindowDefinitions{yyDollar[1].windowDefinitionUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1136:
+	case 1137:
 		yyDollar = yyS[yypt-3 : yypt+1]
-//line sql.y:5861
+//line sql.y:5866
 		{
 			yySLICE := (*WindowDefinitions)(yyIaddr(yyVAL.union))
 			*yySLICE = append(*yySLICE, yyDollar[3].windowDefinitionUnion())
 		}
-	case 1137:
+	case 1138:
 		yyDollar = yyS[yypt-0 : yypt+1]
-//line sql.y:5867
+//line sql.y:5872
 		{
 			yyVAL.str = ""
 		}
-	case 1138:
+	case 1139:
 		yyDollar = yyS[yypt-3 : yypt+1]
-//line sql.y:5871
+//line sql.y:5876
 		{
 			yyVAL.str = string(yyDollar[2].identifierCI.String())
 		}
-	case 1139:
+	case 1140:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL BoolVal
-//line sql.y:5877
+//line sql.y:5882
 		{
 			yyLOCAL = BoolVal(true)
 		}
 		yyVAL.union = yyLOCAL
-	case 1140:
+	case 1141:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL BoolVal
-//line sql.y:5881
+//line sql.y:5886
 		{
 			yyLOCAL = BoolVal(false)
 		}
 		yyVAL.union = yyLOCAL
-	case 1141:
+	case 1142:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL IsExprOperator
-//line sql.y:5888
+//line sql.y:5893
 		{
 			yyLOCAL = IsTrueOp
 		}
 		yyVAL.union = yyLOCAL
-	case 1142:
+	case 1143:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL IsExprOperator
-//line sql.y:5892
+//line sql.y:5897
 		{
 			yyLOCAL = IsNotTrueOp
 		}
 		yyVAL.union = yyLOCAL
-	case 1143:
+	case 1144:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL IsExprOperator
-//line sql.y:5896
+//line sql.y:5901
 		{
 			yyLOCAL = IsFalseOp
 		}
 		yyVAL.union = yyLOCAL
-	case 1144:
+	case 1145:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL IsExprOperator
-//line sql.y:5900
+//line sql.y:5905
 		{
 			yyLOCAL = IsNotFalseOp
 		}
 		yyVAL.union = yyLOCAL
-	case 1145:
+	case 1146:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL ComparisonExprOperator
-//line sql.y:5906
+//line sql.y:5911
 		{
 			yyLOCAL = yyDollar[1].comparisonExprOperatorUnion()
 		}
 		yyVAL.union = yyLOCAL
-	case 1146:
+	case 1147:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL ComparisonExprOperator
-//line sql.y:5910
+//line sql.y:5915
 		{
 			yyLOCAL = NullSafeEqualOp
 		}
 		yyVAL.union = yyLOCAL
-	case 1147:
+	case 1148:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL ComparisonExprOperator
-//line sql.y:5916
+//line sql.y:5921
 		{
 			yyLOCAL = EqualOp
 		}
 		yyVAL.union = yyLOCAL
-	case 1148:
+	case 1149:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL ComparisonExprOperator
-//line sql.y:5920
+//line sql.y:5925
 		{
 			yyLOCAL = LessThanOp
 		}
 		yyVAL.union = yyLOCAL
-	case 1149:
+	case 1150:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL ComparisonExprOperator
-//line sql.y:5924
+//line sql.y:5929
 		{
 			yyLOCAL = GreaterThanOp
 		}
 		yyVAL.union = yyLOCAL
-	case 1150:
+	case 1151:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL ComparisonExprOperator
-//line sql.y:5928
+//line sql.y:5933
 		{
 			yyLOCAL = LessEqualOp
 		}
 		yyVAL.union = yyLOCAL
-	case 1151:
+	case 1152:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL ComparisonExprOperator
-//line sql.y:5932
+//line sql.y:5937
 		{
 			yyLOCAL = GreaterEqualOp
 		}
 		yyVAL.union = yyLOCAL
-	case 1152:
+	case 1153:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL ComparisonExprOperator
-//line sql.y:5936
+//line sql.y:5941
 		{
 			yyLOCAL = NotEqualOp
 		}
 		yyVAL.union = yyLOCAL
-	case 1153:
+	case 1154:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL ColTuple
-//line sql.y:5942
+//line sql.y:5947
 		{
 			yyLOCAL = yyDollar[1].valTupleUnion()
 		}
 		yyVAL.union = yyLOCAL
-	case 1154:
+	case 1155:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL ColTuple
-//line sql.y:5946
+//line sql.y:5951
 		{
 			yyLOCAL = yyDollar[1].subqueryUnion()
 		}
 		yyVAL.union = yyLOCAL
-	case 1155:
+	case 1156:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL ColTuple
-//line sql.y:5950
+//line sql.y:5955
 		{
 			yyLOCAL = ListArg(yyDollar[1].str[2:])
 			markBindVariable(yylex, yyDollar[1].str[2:])
 		}
 		yyVAL.union = yyLOCAL
-	case 1156:
+	case 1157:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL *Subquery
-//line sql.y:5957
+//line sql.y:5962
 		{
 			yyLOCAL = &Subquery{yyDollar[1].tableStmtUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1157:
+	case 1158:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL Exprs
-//line sql.y:5963
+//line sql.y:5968
 		{
 			yyLOCAL = Exprs{yyDollar[1].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1158:
+	case 1159:
 		yyDollar = yyS[yypt-3 : yypt+1]
-//line sql.y:5967
+//line sql.y:5972
 		{
 			yySLICE := (*Exprs)(yyIaddr(yyVAL.union))
 			*yySLICE = append(*yySLICE, yyDollar[3].exprUnion())
 		}
-	case 1159:
+	case 1160:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:5977
+//line sql.y:5982
 		{
 			yyLOCAL = &FuncExpr{Name: yyDollar[1].identifierCI, Exprs: yyDollar[3].exprsUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1160:
+	case 1161:
 		yyDollar = yyS[yypt-6 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:5981
+//line sql.y:5986
 		{
 			yyLOCAL = &FuncExpr{Qualifier: yyDollar[1].identifierCS, Name: yyDollar[3].identifierCI, Exprs: yyDollar[5].exprsUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1161:
+	case 1162:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:5991
+//line sql.y:5996
 		{
 			yyLOCAL = &FuncExpr{Name: NewIdentifierCI("left"), Exprs: yyDollar[3].exprsUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1162:
+	case 1163:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:5995
+//line sql.y:6000
 		{
 			yyLOCAL = &FuncExpr{Name: NewIdentifierCI("right"), Exprs: yyDollar[3].exprsUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1163:
+	case 1164:
 		yyDollar = yyS[yypt-8 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:5999
+//line sql.y:6004
 		{
 			yyLOCAL = &SubstrExpr{Name: yyDollar[3].exprUnion(), From: yyDollar[5].exprUnion(), To: yyDollar[7].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1164:
+	case 1165:
 		yyDollar = yyS[yypt-8 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6003
+//line sql.y:6008
 		{
 			yyLOCAL = &SubstrExpr{Name: yyDollar[3].exprUnion(), From: yyDollar[5].exprUnion(), To: yyDollar[7].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1165:
+	case 1166:
 		yyDollar = yyS[yypt-6 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6007
+//line sql.y:6012
 		{
 			yyLOCAL = &SubstrExpr{Name: yyDollar[3].exprUnion(), From: yyDollar[5].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1166:
+	case 1167:
 		yyDollar = yyS[yypt-8 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6011
+//line sql.y:6016
 		{
 			yyLOCAL = &SubstrExpr{Name: yyDollar[3].exprUnion(), From: yyDollar[5].exprUnion(), To: yyDollar[7].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1167:
+	case 1168:
 		yyDollar = yyS[yypt-6 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6015
+//line sql.y:6020
 		{
 			yyLOCAL = &SubstrExpr{Name: yyDollar[3].exprUnion(), From: yyDollar[5].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1168:
+	case 1169:
 		yyDollar = yyS[yypt-5 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6019
+//line sql.y:6024
 		{
 			yyLOCAL = &CaseExpr{Expr: yyDollar[2].exprUnion(), Whens: yyDollar[3].whensUnion(), Else: yyDollar[4].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1169:
+	case 1170:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6023
+//line sql.y:6028
 		{
 			yyLOCAL = &ValuesFuncExpr{Name: yyDollar[3].colNameUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1170:
+	case 1171:
 		yyDollar = yyS[yypt-10 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6027
+//line sql.y:6032
 		{
 			yyLOCAL = &InsertExpr{Str: yyDollar[3].exprUnion(), Pos: yyDollar[5].exprUnion(), Len: yyDollar[7].exprUnion(), NewStr: yyDollar[9].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1171:
+	case 1172:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6031
+//line sql.y:6036
 		{
 			yyLOCAL = &FuncExpr{Name: NewIdentifierCI(yyDollar[1].str)}
 		}
 		yyVAL.union = yyLOCAL
-	case 1172:
+	case 1173:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6042
+//line sql.y:6047
 		{
 			yyLOCAL = &FuncExpr{Name: NewIdentifierCI("utc_date")}
 		}
 		yyVAL.union = yyLOCAL
-	case 1173:
+	case 1174:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6046
+//line sql.y:6051
 		{
 			yyLOCAL = yyDollar[1].exprUnion()
 		}
 		yyVAL.union = yyLOCAL
-	case 1174:
+	case 1175:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6052
+//line sql.y:6057
 		{
 			yyLOCAL = &FuncExpr{Name: NewIdentifierCI("current_date")}
 		}
 		yyVAL.union = yyLOCAL
-	case 1175:
+	case 1176:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6056
+//line sql.y:6061
 		{
 			yyLOCAL = &FuncExpr{Name: NewIdentifierCI("curdate")}
 		}
 		yyVAL.union = yyLOCAL
-	case 1176:
+	case 1177:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6060
+//line sql.y:6065
 		{
 			yyLOCAL = &CurTimeFuncExpr{Name: NewIdentifierCI("utc_time"), Fsp: yyDollar[2].integerUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1177:
+	case 1178:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6065
+//line sql.y:6070
 		{
 			yyLOCAL = &CurTimeFuncExpr{Name: NewIdentifierCI("curtime"), Fsp: yyDollar[2].integerUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1178:
+	case 1179:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6070
+//line sql.y:6075
 		{
 			yyLOCAL = &CurTimeFuncExpr{Name: NewIdentifierCI("current_time"), Fsp: yyDollar[2].integerUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1179:
+	case 1180:
 		yyDollar = yyS[yypt-5 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6074
+//line sql.y:6079
 		{
 			yyLOCAL = &CountStar{OverClause: yyDollar[5].overClauseUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1180:
+	case 1181:
 		yyDollar = yyS[yypt-6 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6078
+//line sql.y:6083
 		{
 			yyLOCAL = &Count{Distinct: yyDollar[3].booleanUnion(), Args: yyDollar[4].exprsUnion(), OverClause: yyDollar[6].overClauseUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1181:
+	case 1182:
 		yyDollar = yyS[yypt-6 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6082
+//line sql.y:6087
 		{
 			yyLOCAL = &Max{Distinct: yyDollar[3].booleanUnion(), Arg: yyDollar[4].exprUnion(), OverClause: yyDollar[6].overClauseUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1182:
+	case 1183:
 		yyDollar = yyS[yypt-6 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6086
+//line sql.y:6091
 		{
 			yyLOCAL = &Min{Distinct: yyDollar[3].booleanUnion(), Arg: yyDollar[4].exprUnion(), OverClause: yyDollar[6].overClauseUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1183:
+	case 1184:
 		yyDollar = yyS[yypt-6 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6090
+//line sql.y:6095
 		{
 			yyLOCAL = &Sum{Distinct: yyDollar[3].booleanUnion(), Arg: yyDollar[4].exprUnion(), OverClause: yyDollar[6].overClauseUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1184:
+	case 1185:
 		yyDollar = yyS[yypt-6 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6094
+//line sql.y:6099
 		{
 			yyLOCAL = &Avg{Distinct: yyDollar[3].booleanUnion(), Arg: yyDollar[4].exprUnion(), OverClause: yyDollar[6].overClauseUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1185:
+	case 1186:
 		yyDollar = yyS[yypt-5 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6098
+//line sql.y:6103
 		{
 			yyLOCAL = &BitAnd{Arg: yyDollar[3].exprUnion(), OverClause: yyDollar[5].overClauseUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1186:
+	case 1187:
 		yyDollar = yyS[yypt-5 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6102
+//line sql.y:6107
 		{
 			yyLOCAL = &BitOr{Arg: yyDollar[3].exprUnion(), OverClause: yyDollar[5].overClauseUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1187:
+	case 1188:
 		yyDollar = yyS[yypt-5 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6106
+//line sql.y:6111
 		{
 			yyLOCAL = &BitXor{Arg: yyDollar[3].exprUnion(), OverClause: yyDollar[5].overClauseUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1188:
+	case 1189:
 		yyDollar = yyS[yypt-5 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6110
+//line sql.y:6115
 		{
 			yyLOCAL = &Std{Arg: yyDollar[3].exprUnion(), OverClause: yyDollar[5].overClauseUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1189:
+	case 1190:
 		yyDollar = yyS[yypt-5 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6114
+//line sql.y:6119
 		{
 			yyLOCAL = &StdDev{Arg: yyDollar[3].exprUnion(), OverClause: yyDollar[5].overClauseUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1190:
+	case 1191:
 		yyDollar = yyS[yypt-5 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6118
+//line sql.y:6123
 		{
 			yyLOCAL = &StdPop{Arg: yyDollar[3].exprUnion(), OverClause: yyDollar[5].overClauseUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1191:
+	case 1192:
 		yyDollar = yyS[yypt-5 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6122
+//line sql.y:6127
 		{
 			yyLOCAL = &StdSamp{Arg: yyDollar[3].exprUnion(), OverClause: yyDollar[5].overClauseUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1192:
+	case 1193:
 		yyDollar = yyS[yypt-5 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6126
+//line sql.y:6131
 		{
 			yyLOCAL = &VarPop{Arg: yyDollar[3].exprUnion(), OverClause: yyDollar[5].overClauseUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1193:
+	case 1194:
 		yyDollar = yyS[yypt-5 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6130
+//line sql.y:6135
 		{
 			yyLOCAL = &VarSamp{Arg: yyDollar[3].exprUnion(), OverClause: yyDollar[5].overClauseUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1194:
+	case 1195:
 		yyDollar = yyS[yypt-5 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6134
+//line sql.y:6139
 		{
 			yyLOCAL = &Variance{Arg: yyDollar[3].exprUnion(), OverClause: yyDollar[5].overClauseUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1195:
+	case 1196:
 		yyDollar = yyS[yypt-8 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6138
+//line sql.y:6143
 		{
 			yyLOCAL = &GroupConcatExpr{Distinct: yyDollar[3].booleanUnion(), Exprs: yyDollar[4].exprsUnion(), OrderBy: yyDollar[5].orderByUnion(), Separator: yyDollar[6].str, Limit: yyDollar[7].limitUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1196:
+	case 1197:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6142
+//line sql.y:6147
 		{
 			yyLOCAL = &AnyValue{Arg: yyDollar[3].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1197:
+	case 1198:
 		yyDollar = yyS[yypt-8 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6146
+//line sql.y:6151
 		{
 			yyLOCAL = &IntervalDateExpr{Syntax: IntervalDateExprTimestampadd, Date: yyDollar[7].exprUnion(), Interval: yyDollar[5].exprUnion(), Unit: yyDollar[3].intervalTypeUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1198:
+	case 1199:
 		yyDollar = yyS[yypt-8 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6150
+//line sql.y:6155
 		{
 			yyLOCAL = &TimestampDiffExpr{Unit: yyDollar[3].intervalTypeUnion(), Expr1: yyDollar[5].exprUnion(), Expr2: yyDollar[7].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1199:
+	case 1200:
 		yyDollar = yyS[yypt-6 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6154
+//line sql.y:6159
 		{
 			yyLOCAL = &ExtractFuncExpr{IntervalType: yyDollar[3].intervalTypeUnion(), Expr: yyDollar[5].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1200:
+	case 1201:
 		yyDollar = yyS[yypt-5 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6158
+//line sql.y:6163
 		{
 			yyLOCAL = &WeightStringFuncExpr{Expr: yyDollar[3].exprUnion(), As: yyDollar[4].convertTypeUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1201:
+	case 1202:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6162
+//line sql.y:6167
 		{
 			yyLOCAL = &JSONPrettyExpr{JSONVal: yyDollar[3].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1202:
+	case 1203:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6166
+//line sql.y:6171
 		{
 			yyLOCAL = &JSONStorageFreeExpr{JSONVal: yyDollar[3].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1203:
+	case 1204:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6170
+//line sql.y:6175
 		{
 			yyLOCAL = &JSONStorageSizeExpr{JSONVal: yyDollar[3].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1204:
+	case 1205:
 		yyDollar = yyS[yypt-5 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6174
+//line sql.y:6179
 		{
 			yyLOCAL = &JSONArrayAgg{Expr: yyDollar[3].exprUnion(), OverClause: yyDollar[5].overClauseUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1205:
+	case 1206:
 		yyDollar = yyS[yypt-7 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6178
+//line sql.y:6183
 		{
 			yyLOCAL = &JSONObjectAgg{Key: yyDollar[3].exprUnion(), Value: yyDollar[5].exprUnion(), OverClause: yyDollar[7].overClauseUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1206:
+	case 1207:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6182
+//line sql.y:6187
 		{
 			yyLOCAL = &TrimFuncExpr{TrimFuncType: LTrimType, Type: LeadingTrimType, StringArg: yyDollar[3].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1207:
+	case 1208:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6186
+//line sql.y:6191
 		{
 			yyLOCAL = &TrimFuncExpr{TrimFuncType: RTrimType, Type: TrailingTrimType, StringArg: yyDollar[3].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1208:
+	case 1209:
 		yyDollar = yyS[yypt-7 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6190
+//line sql.y:6195
 		{
 			yyLOCAL = &TrimFuncExpr{Type: yyDollar[3].trimTypeUnion(), TrimArg: yyDollar[4].exprUnion(), StringArg: yyDollar[6].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1209:
+	case 1210:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6194
+//line sql.y:6199
 		{
 			yyLOCAL = &TrimFuncExpr{StringArg: yyDollar[3].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1210:
+	case 1211:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6198
+//line sql.y:6203
 		{
 			yyLOCAL = &CharExpr{Exprs: yyDollar[3].exprsUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1211:
+	case 1212:
 		yyDollar = yyS[yypt-6 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6202
+//line sql.y:6207
 		{
 			yyLOCAL = &CharExpr{Exprs: yyDollar[3].exprsUnion(), Charset: yyDollar[5].str}
 		}
 		yyVAL.union = yyLOCAL
-	case 1212:
+	case 1213:
 		yyDollar = yyS[yypt-6 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6206
+//line sql.y:6211
 		{
 			yyLOCAL = &TrimFuncExpr{TrimArg: yyDollar[3].exprUnion(), StringArg: yyDollar[5].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1213:
+	case 1214:
 		yyDollar = yyS[yypt-6 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6210
+//line sql.y:6215
 		{
 			yyLOCAL = &LocateExpr{SubStr: yyDollar[3].exprUnion(), Str: yyDollar[5].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1214:
+	case 1215:
 		yyDollar = yyS[yypt-8 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6214
+//line sql.y:6219
 		{
 			yyLOCAL = &LocateExpr{SubStr: yyDollar[3].exprUnion(), Str: yyDollar[5].exprUnion(), Pos: yyDollar[7].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1215:
+	case 1216:
 		yyDollar = yyS[yypt-6 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6218
+//line sql.y:6223
 		{
 			yyLOCAL = &LocateExpr{SubStr: yyDollar[3].exprUnion(), Str: yyDollar[5].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1216:
+	case 1217:
 		yyDollar = yyS[yypt-6 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6222
+//line sql.y:6227
 		{
 			yyLOCAL = &LockingFunc{Type: GetLock, Name: yyDollar[3].exprUnion(), Timeout: yyDollar[5].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1217:
+	case 1218:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6226
+//line sql.y:6231
 		{
 			yyLOCAL = &LockingFunc{Type: IsFreeLock, Name: yyDollar[3].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1218:
+	case 1219:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6230
+//line sql.y:6235
 		{
 			yyLOCAL = &LockingFunc{Type: IsUsedLock, Name: yyDollar[3].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1219:
+	case 1220:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6234
+//line sql.y:6239
 		{
 			yyLOCAL = &LockingFunc{Type: ReleaseAllLocks}
 		}
 		yyVAL.union = yyLOCAL
-	case 1220:
+	case 1221:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6238
+//line sql.y:6243
 		{
 			yyLOCAL = &LockingFunc{Type: ReleaseLock, Name: yyDollar[3].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1221:
+	case 1222:
 		yyDollar = yyS[yypt-6 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6242
+//line sql.y:6247
 		{
 			yyLOCAL = &JSONSchemaValidFuncExpr{Schema: yyDollar[3].exprUnion(), Document: yyDollar[5].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1222:
+	case 1223:
 		yyDollar = yyS[yypt-6 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6246
+//line sql.y:6251
 		{
 			yyLOCAL = &JSONSchemaValidationReportFuncExpr{Schema: yyDollar[3].exprUnion(), Document: yyDollar[5].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1223:
+	case 1224:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6250
+//line sql.y:6255
 		{
 			yyLOCAL = &JSONArrayExpr{Params: yyDollar[3].exprsUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1224:
+	case 1225:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6254
+//line sql.y:6259
 		{
 			yyLOCAL = &GeomFormatExpr{FormatType: BinaryFormat, Geom: yyDollar[3].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1225:
+	case 1226:
 		yyDollar = yyS[yypt-6 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6258
+//line sql.y:6263
 		{
 			yyLOCAL = &GeomFormatExpr{FormatType: BinaryFormat, Geom: yyDollar[3].exprUnion(), AxisOrderOpt: yyDollar[5].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1226:
+	case 1227:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6262
+//line sql.y:6267
 		{
 			yyLOCAL = &GeomFormatExpr{FormatType: TextFormat, Geom: yyDollar[3].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1227:
+	case 1228:
 		yyDollar = yyS[yypt-6 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6266
+//line sql.y:6271
 		{
 			yyLOCAL = &GeomFormatExpr{FormatType: TextFormat, Geom: yyDollar[3].exprUnion(), AxisOrderOpt: yyDollar[5].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1228:
+	case 1229:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6270
+//line sql.y:6275
 		{
 			yyLOCAL = &GeomPropertyFuncExpr{Property: IsEmpty, Geom: yyDollar[3].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1229:
+	case 1230:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6274
+//line sql.y:6279
 		{
 			yyLOCAL = &GeomPropertyFuncExpr{Property: IsSimple, Geom: yyDollar[3].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1230:
+	case 1231:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6278
+//line sql.y:6283
 		{
 			yyLOCAL = &GeomPropertyFuncExpr{Property: Dimension, Geom: yyDollar[3].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1231:
+	case 1232:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6282
+//line sql.y:6287
 		{
 			yyLOCAL = &GeomPropertyFuncExpr{Property: Envelope, Geom: yyDollar[3].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1232:
+	case 1233:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6286
+//line sql.y:6291
 		{
 			yyLOCAL = &GeomPropertyFuncExpr{Property: GeometryType, Geom: yyDollar[3].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1233:
+	case 1234:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6290
+//line sql.y:6295
 		{
 			yyLOCAL = &PointPropertyFuncExpr{Property: Latitude, Point: yyDollar[3].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1234:
+	case 1235:
 		yyDollar = yyS[yypt-6 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6294
+//line sql.y:6299
 		{
 			yyLOCAL = &PointPropertyFuncExpr{Property: Latitude, Point: yyDollar[3].exprUnion(), ValueToSet: yyDollar[5].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1235:
+	case 1236:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6298
+//line sql.y:6303
 		{
 			yyLOCAL = &PointPropertyFuncExpr{Property: Longitude, Point: yyDollar[3].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1236:
+	case 1237:
 		yyDollar = yyS[yypt-6 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6302
+//line sql.y:6307
 		{
 			yyLOCAL = &PointPropertyFuncExpr{Property: Longitude, Point: yyDollar[3].exprUnion(), ValueToSet: yyDollar[5].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1237:
+	case 1238:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6306
+//line sql.y:6311
 		{
 			yyLOCAL = &LinestrPropertyFuncExpr{Property: EndPoint, Linestring: yyDollar[3].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1238:
+	case 1239:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6310
+//line sql.y:6315
 		{
 			yyLOCAL = &LinestrPropertyFuncExpr{Property: IsClosed, Linestring: yyDollar[3].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1239:
+	case 1240:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6314
+//line sql.y:6319
 		{
 			yyLOCAL = &LinestrPropertyFuncExpr{Property: Length, Linestring: yyDollar[3].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1240:
+	case 1241:
 		yyDollar = yyS[yypt-6 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6318
+//line sql.y:6323
 		{
 			yyLOCAL = &LinestrPropertyFuncExpr{Property: Length, Linestring: yyDollar[3].exprUnion(), PropertyDefArg: yyDollar[5].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1241:
+	case 1242:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6322
+//line sql.y:6327
 		{
 			yyLOCAL = &LinestrPropertyFuncExpr{Property: NumPoints, Linestring: yyDollar[3].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1242:
+	case 1243:
 		yyDollar = yyS[yypt-6 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6326
+//line sql.y:6331
 		{
 			yyLOCAL = &LinestrPropertyFuncExpr{Property: PointN, Linestring: yyDollar[3].exprUnion(), PropertyDefArg: yyDollar[5].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1243:
+	case 1244:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6330
+//line sql.y:6335
 		{
 			yyLOCAL = &LinestrPropertyFuncExpr{Property: StartPoint, Linestring: yyDollar[3].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1244:
+	case 1245:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6334
+//line sql.y:6339
 		{
 			yyLOCAL = &PointPropertyFuncExpr{Property: XCordinate, Point: yyDollar[3].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1245:
+	case 1246:
 		yyDollar = yyS[yypt-6 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6338
+//line sql.y:6343
 		{
 			yyLOCAL = &PointPropertyFuncExpr{Property: XCordinate, Point: yyDollar[3].exprUnion(), ValueToSet: yyDollar[5].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1246:
+	case 1247:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6342
+//line sql.y:6347
 		{
 			yyLOCAL = &PointPropertyFuncExpr{Property: YCordinate, Point: yyDollar[3].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1247:
+	case 1248:
 		yyDollar = yyS[yypt-6 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6346
+//line sql.y:6351
 		{
 			yyLOCAL = &PointPropertyFuncExpr{Property: YCordinate, Point: yyDollar[3].exprUnion(), ValueToSet: yyDollar[5].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1248:
+	case 1249:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6350
+//line sql.y:6355
 		{
 			yyLOCAL = &GeomFromTextExpr{Type: GeometryFromText, WktText: yyDollar[3].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1249:
+	case 1250:
 		yyDollar = yyS[yypt-6 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6354
+//line sql.y:6359
 		{
 			yyLOCAL = &GeomFromTextExpr{Type: GeometryFromText, WktText: yyDollar[3].exprUnion(), Srid: yyDollar[5].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1250:
+	case 1251:
 		yyDollar = yyS[yypt-8 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6358
+//line sql.y:6363
 		{
 			yyLOCAL = &GeomFromTextExpr{Type: GeometryFromText, WktText: yyDollar[3].exprUnion(), Srid: yyDollar[5].exprUnion(), AxisOrderOpt: yyDollar[7].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1251:
+	case 1252:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6362
+//line sql.y:6367
 		{
 			yyLOCAL = &GeomFromTextExpr{Type: GeometryCollectionFromText, WktText: yyDollar[3].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1252:
+	case 1253:
 		yyDollar = yyS[yypt-6 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6366
+//line sql.y:6371
 		{
 			yyLOCAL = &GeomFromTextExpr{Type: GeometryCollectionFromText, WktText: yyDollar[3].exprUnion(), Srid: yyDollar[5].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1253:
+	case 1254:
 		yyDollar = yyS[yypt-8 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6370
+//line sql.y:6375
 		{
 			yyLOCAL = &GeomFromTextExpr{Type: GeometryCollectionFromText, WktText: yyDollar[3].exprUnion(), Srid: yyDollar[5].exprUnion(), AxisOrderOpt: yyDollar[7].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1254:
+	case 1255:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6374
+//line sql.y:6379
 		{
 			yyLOCAL = &GeomFromTextExpr{Type: LineStringFromText, WktText: yyDollar[3].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1255:
+	case 1256:
 		yyDollar = yyS[yypt-6 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6378
+//line sql.y:6383
 		{
 			yyLOCAL = &GeomFromTextExpr{Type: LineStringFromText, WktText: yyDollar[3].exprUnion(), Srid: yyDollar[5].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1256:
+	case 1257:
 		yyDollar = yyS[yypt-8 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6382
+//line sql.y:6387
 		{
 			yyLOCAL = &GeomFromTextExpr{Type: LineStringFromText, WktText: yyDollar[3].exprUnion(), Srid: yyDollar[5].exprUnion(), AxisOrderOpt: yyDollar[7].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1257:
+	case 1258:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6386
+//line sql.y:6391
 		{
 			yyLOCAL = &GeomFromTextExpr{Type: MultiLinestringFromText, WktText: yyDollar[3].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1258:
+	case 1259:
 		yyDollar = yyS[yypt-6 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6390
+//line sql.y:6395
 		{
 			yyLOCAL = &GeomFromTextExpr{Type: MultiLinestringFromText, WktText: yyDollar[3].exprUnion(), Srid: yyDollar[5].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1259:
+	case 1260:
 		yyDollar = yyS[yypt-8 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6394
+//line sql.y:6399
 		{
 			yyLOCAL = &GeomFromTextExpr{Type: MultiLinestringFromText, WktText: yyDollar[3].exprUnion(), Srid: yyDollar[5].exprUnion(), AxisOrderOpt: yyDollar[7].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1260:
+	case 1261:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6398
+//line sql.y:6403
 		{
 			yyLOCAL = &GeomFromTextExpr{Type: MultiPointFromText, WktText: yyDollar[3].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1261:
+	case 1262:
 		yyDollar = yyS[yypt-6 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6402
+//line sql.y:6407
 		{
 			yyLOCAL = &GeomFromTextExpr{Type: MultiPointFromText, WktText: yyDollar[3].exprUnion(), Srid: yyDollar[5].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1262:
+	case 1263:
 		yyDollar = yyS[yypt-8 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6406
+//line sql.y:6411
 		{
 			yyLOCAL = &GeomFromTextExpr{Type: MultiPointFromText, WktText: yyDollar[3].exprUnion(), Srid: yyDollar[5].exprUnion(), AxisOrderOpt: yyDollar[7].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1263:
+	case 1264:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6410
+//line sql.y:6415
 		{
 			yyLOCAL = &GeomFromTextExpr{Type: MultiPolygonFromText, WktText: yyDollar[3].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1264:
+	case 1265:
 		yyDollar = yyS[yypt-6 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6414
+//line sql.y:6419
 		{
 			yyLOCAL = &GeomFromTextExpr{Type: MultiPolygonFromText, WktText: yyDollar[3].exprUnion(), Srid: yyDollar[5].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1265:
+	case 1266:
 		yyDollar = yyS[yypt-8 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6418
+//line sql.y:6423
 		{
 			yyLOCAL = &GeomFromTextExpr{Type: MultiPolygonFromText, WktText: yyDollar[3].exprUnion(), Srid: yyDollar[5].exprUnion(), AxisOrderOpt: yyDollar[7].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1266:
+	case 1267:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6422
+//line sql.y:6427
 		{
 			yyLOCAL = &GeomFromTextExpr{Type: PointFromText, WktText: yyDollar[3].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1267:
+	case 1268:
 		yyDollar = yyS[yypt-6 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6426
+//line sql.y:6431
 		{
 			yyLOCAL = &GeomFromTextExpr{Type: PointFromText, WktText: yyDollar[3].exprUnion(), Srid: yyDollar[5].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1268:
+	case 1269:
 		yyDollar = yyS[yypt-8 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6430
+//line sql.y:6435
 		{
 			yyLOCAL = &GeomFromTextExpr{Type: PointFromText, WktText: yyDollar[3].exprUnion(), Srid: yyDollar[5].exprUnion(), AxisOrderOpt: yyDollar[7].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1269:
+	case 1270:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6434
+//line sql.y:6439
 		{
 			yyLOCAL = &GeomFromTextExpr{Type: PolygonFromText, WktText: yyDollar[3].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1270:
+	case 1271:
 		yyDollar = yyS[yypt-6 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6438
+//line sql.y:6443
 		{
 			yyLOCAL = &GeomFromTextExpr{Type: PolygonFromText, WktText: yyDollar[3].exprUnion(), Srid: yyDollar[5].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1271:
+	case 1272:
 		yyDollar = yyS[yypt-8 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6442
+//line sql.y:6447
 		{
 			yyLOCAL = &GeomFromTextExpr{Type: PolygonFromText, WktText: yyDollar[3].exprUnion(), Srid: yyDollar[5].exprUnion(), AxisOrderOpt: yyDollar[7].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1272:
+	case 1273:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6446
+//line sql.y:6451
 		{
 			yyLOCAL = &GeomFromWKBExpr{Type: GeometryFromWKB, WkbBlob: yyDollar[3].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1273:
+	case 1274:
 		yyDollar = yyS[yypt-6 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6450
+//line sql.y:6455
 		{
 			yyLOCAL = &GeomFromWKBExpr{Type: GeometryFromWKB, WkbBlob: yyDollar[3].exprUnion(), Srid: yyDollar[5].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1274:
+	case 1275:
 		yyDollar = yyS[yypt-8 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6454
+//line sql.y:6459
 		{
 			yyLOCAL = &GeomFromWKBExpr{Type: GeometryFromWKB, WkbBlob: yyDollar[3].exprUnion(), Srid: yyDollar[5].exprUnion(), AxisOrderOpt: yyDollar[7].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1275:
+	case 1276:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6458
+//line sql.y:6463
 		{
 			yyLOCAL = &GeomFromWKBExpr{Type: GeometryCollectionFromWKB, WkbBlob: yyDollar[3].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1276:
+	case 1277:
 		yyDollar = yyS[yypt-6 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6462
+//line sql.y:6467
 		{
 			yyLOCAL = &GeomFromWKBExpr{Type: GeometryCollectionFromWKB, WkbBlob: yyDollar[3].exprUnion(), Srid: yyDollar[5].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1277:
+	case 1278:
 		yyDollar = yyS[yypt-8 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6466
+//line sql.y:6471
 		{
 			yyLOCAL = &GeomFromWKBExpr{Type: GeometryCollectionFromWKB, WkbBlob: yyDollar[3].exprUnion(), Srid: yyDollar[5].exprUnion(), AxisOrderOpt: yyDollar[7].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1278:
+	case 1279:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6470
+//line sql.y:6475
 		{
 			yyLOCAL = &GeomFromWKBExpr{Type: LineStringFromWKB, WkbBlob: yyDollar[3].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1279:
+	case 1280:
 		yyDollar = yyS[yypt-6 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6474
+//line sql.y:6479
 		{
 			yyLOCAL = &GeomFromWKBExpr{Type: LineStringFromWKB, WkbBlob: yyDollar[3].exprUnion(), Srid: yyDollar[5].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1280:
+	case 1281:
 		yyDollar = yyS[yypt-8 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6478
+//line sql.y:6483
 		{
 			yyLOCAL = &GeomFromWKBExpr{Type: LineStringFromWKB, WkbBlob: yyDollar[3].exprUnion(), Srid: yyDollar[5].exprUnion(), AxisOrderOpt: yyDollar[7].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1281:
+	case 1282:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6482
+//line sql.y:6487
 		{
 			yyLOCAL = &GeomFromWKBExpr{Type: MultiLinestringFromWKB, WkbBlob: yyDollar[3].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1282:
+	case 1283:
 		yyDollar = yyS[yypt-6 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6486
+//line sql.y:6491
 		{
 			yyLOCAL = &GeomFromWKBExpr{Type: MultiLinestringFromWKB, WkbBlob: yyDollar[3].exprUnion(), Srid: yyDollar[5].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1283:
+	case 1284:
 		yyDollar = yyS[yypt-8 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6490
+//line sql.y:6495
 		{
 			yyLOCAL = &GeomFromWKBExpr{Type: MultiLinestringFromWKB, WkbBlob: yyDollar[3].exprUnion(), Srid: yyDollar[5].exprUnion(), AxisOrderOpt: yyDollar[7].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1284:
+	case 1285:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6494
+//line sql.y:6499
 		{
 			yyLOCAL = &GeomFromWKBExpr{Type: MultiPointFromWKB, WkbBlob: yyDollar[3].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1285:
+	case 1286:
 		yyDollar = yyS[yypt-6 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6498
+//line sql.y:6503
 		{
 			yyLOCAL = &GeomFromWKBExpr{Type: MultiPointFromWKB, WkbBlob: yyDollar[3].exprUnion(), Srid: yyDollar[5].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1286:
+	case 1287:
 		yyDollar = yyS[yypt-8 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6502
+//line sql.y:6507
 		{
 			yyLOCAL = &GeomFromWKBExpr{Type: MultiPointFromWKB, WkbBlob: yyDollar[3].exprUnion(), Srid: yyDollar[5].exprUnion(), AxisOrderOpt: yyDollar[7].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1287:
+	case 1288:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6506
+//line sql.y:6511
 		{
 			yyLOCAL = &GeomFromWKBExpr{Type: MultiPolygonFromWKB, WkbBlob: yyDollar[3].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1288:
+	case 1289:
 		yyDollar = yyS[yypt-6 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6510
+//line sql.y:6515
 		{
 			yyLOCAL = &GeomFromWKBExpr{Type: MultiPolygonFromWKB, WkbBlob: yyDollar[3].exprUnion(), Srid: yyDollar[5].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1289:
+	case 1290:
 		yyDollar = yyS[yypt-8 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6514
+//line sql.y:6519
 		{
 			yyLOCAL = &GeomFromWKBExpr{Type: MultiPolygonFromWKB, WkbBlob: yyDollar[3].exprUnion(), Srid: yyDollar[5].exprUnion(), AxisOrderOpt: yyDollar[7].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1290:
+	case 1291:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6518
+//line sql.y:6523
 		{
 			yyLOCAL = &GeomFromWKBExpr{Type: PointFromWKB, WkbBlob: yyDollar[3].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1291:
+	case 1292:
 		yyDollar = yyS[yypt-6 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6522
+//line sql.y:6527
 		{
 			yyLOCAL = &GeomFromWKBExpr{Type: PointFromWKB, WkbBlob: yyDollar[3].exprUnion(), Srid: yyDollar[5].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1292:
+	case 1293:
 		yyDollar = yyS[yypt-8 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6526
+//line sql.y:6531
 		{
 			yyLOCAL = &GeomFromWKBExpr{Type: PointFromWKB, WkbBlob: yyDollar[3].exprUnion(), Srid: yyDollar[5].exprUnion(), AxisOrderOpt: yyDollar[7].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1293:
+	case 1294:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6530
+//line sql.y:6535
 		{
 			yyLOCAL = &GeomFromWKBExpr{Type: PolygonFromWKB, WkbBlob: yyDollar[3].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1294:
+	case 1295:
 		yyDollar = yyS[yypt-6 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6534
+//line sql.y:6539
 		{
 			yyLOCAL = &GeomFromWKBExpr{Type: PolygonFromWKB, WkbBlob: yyDollar[3].exprUnion(), Srid: yyDollar[5].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1295:
+	case 1296:
 		yyDollar = yyS[yypt-8 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6538
+//line sql.y:6543
 		{
 			yyLOCAL = &GeomFromWKBExpr{Type: PolygonFromWKB, WkbBlob: yyDollar[3].exprUnion(), Srid: yyDollar[5].exprUnion(), AxisOrderOpt: yyDollar[7].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1296:
+	case 1297:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6542
+//line sql.y:6547
 		{
 			yyLOCAL = &PolygonPropertyFuncExpr{Property: Area, Polygon: yyDollar[3].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1297:
+	case 1298:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6546
+//line sql.y:6551
 		{
 			yyLOCAL = &PolygonPropertyFuncExpr{Property: Centroid, Polygon: yyDollar[3].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1298:
+	case 1299:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6550
+//line sql.y:6555
 		{
 			yyLOCAL = &PolygonPropertyFuncExpr{Property: ExteriorRing, Polygon: yyDollar[3].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1299:
+	case 1300:
 		yyDollar = yyS[yypt-6 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6554
+//line sql.y:6559
 		{
 			yyLOCAL = &PolygonPropertyFuncExpr{Property: InteriorRingN, Polygon: yyDollar[3].exprUnion(), PropertyDefArg: yyDollar[5].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1300:
+	case 1301:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6558
+//line sql.y:6563
 		{
 			yyLOCAL = &PolygonPropertyFuncExpr{Property: NumInteriorRings, Polygon: yyDollar[3].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1301:
+	case 1302:
 		yyDollar = yyS[yypt-6 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6562
+//line sql.y:6567
 		{
 			yyLOCAL = &GeomCollPropertyFuncExpr{Property: GeometryN, GeomColl: yyDollar[3].exprUnion(), PropertyDefArg: yyDollar[5].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1302:
+	case 1303:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6566
+//line sql.y:6571
 		{
 			yyLOCAL = &GeomCollPropertyFuncExpr{Property: NumGeometries, GeomColl: yyDollar[3].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1303:
+	case 1304:
 		yyDollar = yyS[yypt-8 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6570
+//line sql.y:6575
 		{
 			yyLOCAL = &GeoHashFromLatLongExpr{Longitude: yyDollar[3].exprUnion(), Latitude: yyDollar[5].exprUnion(), MaxLength: yyDollar[7].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1304:
+	case 1305:
 		yyDollar = yyS[yypt-6 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6574
+//line sql.y:6579
 		{
 			yyLOCAL = &GeoHashFromPointExpr{Point: yyDollar[3].exprUnion(), MaxLength: yyDollar[5].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1305:
+	case 1306:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6578
+//line sql.y:6583
 		{
 			yyLOCAL = &GeomFromGeoHashExpr{GeomType: LatitudeFromHash, GeoHash: yyDollar[3].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1306:
+	case 1307:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6582
+//line sql.y:6587
 		{
 			yyLOCAL = &GeomFromGeoHashExpr{GeomType: LongitudeFromHash, GeoHash: yyDollar[3].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1307:
+	case 1308:
 		yyDollar = yyS[yypt-6 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6586
+//line sql.y:6591
 		{
 			yyLOCAL = &GeomFromGeoHashExpr{GeomType: PointFromHash, GeoHash: yyDollar[3].exprUnion(), SridOpt: yyDollar[5].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1308:
+	case 1309:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6590
+//line sql.y:6595
 		{
 			yyLOCAL = &GeomFromGeoJSONExpr{GeoJSON: yyDollar[3].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1309:
+	case 1310:
 		yyDollar = yyS[yypt-6 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6594
+//line sql.y:6599
 		{
 			yyLOCAL = &GeomFromGeoJSONExpr{GeoJSON: yyDollar[3].exprUnion(), HigherDimHandlerOpt: yyDollar[5].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1310:
+	case 1311:
 		yyDollar = yyS[yypt-8 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6598
+//line sql.y:6603
 		{
 			yyLOCAL = &GeomFromGeoJSONExpr{GeoJSON: yyDollar[3].exprUnion(), HigherDimHandlerOpt: yyDollar[5].exprUnion(), Srid: yyDollar[7].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1311:
+	case 1312:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6602
+//line sql.y:6607
 		{
 			yyLOCAL = &GeoJSONFromGeomExpr{Geom: yyDollar[3].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1312:
+	case 1313:
 		yyDollar = yyS[yypt-6 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6606
+//line sql.y:6611
 		{
 			yyLOCAL = &GeoJSONFromGeomExpr{Geom: yyDollar[3].exprUnion(), MaxDecimalDigits: yyDollar[5].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1313:
+	case 1314:
 		yyDollar = yyS[yypt-8 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6610
+//line sql.y:6615
 		{
 			yyLOCAL = &GeoJSONFromGeomExpr{Geom: yyDollar[3].exprUnion(), MaxDecimalDigits: yyDollar[5].exprUnion(), Bitmask: yyDollar[7].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1314:
+	case 1315:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6614
+//line sql.y:6619
 		{
 			yyLOCAL = &JSONObjectExpr{Params: yyDollar[3].jsonObjectParamsUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1315:
+	case 1316:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6618
+//line sql.y:6623
 		{
 			yyLOCAL = &JSONQuoteExpr{StringArg: yyDollar[3].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1316:
+	case 1317:
 		yyDollar = yyS[yypt-6 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6622
+//line sql.y:6627
 		{
 			yyLOCAL = &JSONContainsExpr{Target: yyDollar[3].exprUnion(), Candidate: yyDollar[5].exprsUnion()[0], PathList: yyDollar[5].exprsUnion()[1:]}
 		}
 		yyVAL.union = yyLOCAL
-	case 1317:
+	case 1318:
 		yyDollar = yyS[yypt-8 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6626
+//line sql.y:6631
 		{
 			yyLOCAL = &JSONContainsPathExpr{JSONDoc: yyDollar[3].exprUnion(), OneOrAll: yyDollar[5].exprUnion(), PathList: yyDollar[7].exprsUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1318:
+	case 1319:
 		yyDollar = yyS[yypt-6 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6630
+//line sql.y:6635
 		{
 			yyLOCAL = &JSONExtractExpr{JSONDoc: yyDollar[3].exprUnion(), PathList: yyDollar[5].exprsUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1319:
+	case 1320:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6634
+//line sql.y:6639
 		{
 			yyLOCAL = &JSONKeysExpr{JSONDoc: yyDollar[3].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1320:
+	case 1321:
 		yyDollar = yyS[yypt-6 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6638
+//line sql.y:6643
 		{
 			yyLOCAL = &JSONKeysExpr{JSONDoc: yyDollar[3].exprUnion(), Path: yyDollar[5].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1321:
+	case 1322:
 		yyDollar = yyS[yypt-6 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6642
+//line sql.y:6647
 		{
 			yyLOCAL = &JSONOverlapsExpr{JSONDoc1: yyDollar[3].exprUnion(), JSONDoc2: yyDollar[5].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1322:
+	case 1323:
 		yyDollar = yyS[yypt-8 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6646
+//line sql.y:6651
 		{
 			yyLOCAL = &JSONSearchExpr{JSONDoc: yyDollar[3].exprUnion(), OneOrAll: yyDollar[5].exprUnion(), SearchStr: yyDollar[7].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1323:
+	case 1324:
 		yyDollar = yyS[yypt-10 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6650
+//line sql.y:6655
 		{
 			yyLOCAL = &JSONSearchExpr{JSONDoc: yyDollar[3].exprUnion(), OneOrAll: yyDollar[5].exprUnion(), SearchStr: yyDollar[7].exprUnion(), EscapeChar: yyDollar[9].exprsUnion()[0], PathList: yyDollar[9].exprsUnion()[1:]}
 		}
 		yyVAL.union = yyLOCAL
-	case 1324:
+	case 1325:
 		yyDollar = yyS[yypt-7 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6654
+//line sql.y:6659
 		{
 			yyLOCAL = &JSONValueExpr{JSONDoc: yyDollar[3].exprUnion(), Path: yyDollar[5].exprUnion(), ReturningType: yyDollar[6].convertTypeUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1325:
+	case 1326:
 		yyDollar = yyS[yypt-8 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6658
+//line sql.y:6663
 		{
 			yyLOCAL = &JSONValueExpr{JSONDoc: yyDollar[3].exprUnion(), Path: yyDollar[5].exprUnion(), ReturningType: yyDollar[6].convertTypeUnion(), EmptyOnResponse: yyDollar[7].jtOnResponseUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1326:
+	case 1327:
 		yyDollar = yyS[yypt-8 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6662
+//line sql.y:6667
 		{
 			yyLOCAL = &JSONValueExpr{JSONDoc: yyDollar[3].exprUnion(), Path: yyDollar[5].exprUnion(), ReturningType: yyDollar[6].convertTypeUnion(), ErrorOnResponse: yyDollar[7].jtOnResponseUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1327:
+	case 1328:
 		yyDollar = yyS[yypt-9 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6666
+//line sql.y:6671
 		{
 			yyLOCAL = &JSONValueExpr{JSONDoc: yyDollar[3].exprUnion(), Path: yyDollar[5].exprUnion(), ReturningType: yyDollar[6].convertTypeUnion(), EmptyOnResponse: yyDollar[7].jtOnResponseUnion(), ErrorOnResponse: yyDollar[8].jtOnResponseUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1328:
+	case 1329:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6670
+//line sql.y:6675
 		{
 			yyLOCAL = &JSONAttributesExpr{Type: DepthAttributeType, JSONDoc: yyDollar[3].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1329:
+	case 1330:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6674
+//line sql.y:6679
 		{
 			yyLOCAL = &JSONAttributesExpr{Type: ValidAttributeType, JSONDoc: yyDollar[3].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1330:
+	case 1331:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6678
+//line sql.y:6683
 		{
 			yyLOCAL = &JSONAttributesExpr{Type: TypeAttributeType, JSONDoc: yyDollar[3].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1331:
+	case 1332:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6682
+//line sql.y:6687
 		{
 			yyLOCAL = &JSONAttributesExpr{Type: LengthAttributeType, JSONDoc: yyDollar[3].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1332:
+	case 1333:
 		yyDollar = yyS[yypt-6 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6686
+//line sql.y:6691
 		{
 			yyLOCAL = &JSONAttributesExpr{Type: LengthAttributeType, JSONDoc: yyDollar[3].exprUnion(), Path: yyDollar[5].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1333:
+	case 1334:
 		yyDollar = yyS[yypt-6 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6690
+//line sql.y:6695
 		{
 			yyLOCAL = &JSONValueModifierExpr{Type: JSONArrayAppendType, JSONDoc: yyDollar[3].exprUnion(), Params: yyDollar[5].jsonObjectParamsUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1334:
+	case 1335:
 		yyDollar = yyS[yypt-6 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6694
+//line sql.y:6699
 		{
 			yyLOCAL = &JSONValueModifierExpr{Type: JSONArrayInsertType, JSONDoc: yyDollar[3].exprUnion(), Params: yyDollar[5].jsonObjectParamsUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1335:
+	case 1336:
 		yyDollar = yyS[yypt-6 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6698
+//line sql.y:6703
 		{
 			yyLOCAL = &JSONValueModifierExpr{Type: JSONInsertType, JSONDoc: yyDollar[3].exprUnion(), Params: yyDollar[5].jsonObjectParamsUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1336:
+	case 1337:
 		yyDollar = yyS[yypt-6 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6702
+//line sql.y:6707
 		{
 			yyLOCAL = &JSONValueModifierExpr{Type: JSONReplaceType, JSONDoc: yyDollar[3].exprUnion(), Params: yyDollar[5].jsonObjectParamsUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1337:
+	case 1338:
 		yyDollar = yyS[yypt-6 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6706
+//line sql.y:6711
 		{
 			yyLOCAL = &JSONValueModifierExpr{Type: JSONSetType, JSONDoc: yyDollar[3].exprUnion(), Params: yyDollar[5].jsonObjectParamsUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1338:
+	case 1339:
 		yyDollar = yyS[yypt-6 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6710
+//line sql.y:6715
 		{
 			yyLOCAL = &JSONValueMergeExpr{Type: JSONMergeType, JSONDoc: yyDollar[3].exprUnion(), JSONDocList: yyDollar[5].exprsUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1339:
+	case 1340:
 		yyDollar = yyS[yypt-6 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6714
+//line sql.y:6719
 		{
 			yyLOCAL = &JSONValueMergeExpr{Type: JSONMergePatchType, JSONDoc: yyDollar[3].exprUnion(), JSONDocList: yyDollar[5].exprsUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1340:
+	case 1341:
 		yyDollar = yyS[yypt-6 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6718
+//line sql.y:6723
 		{
 			yyLOCAL = &JSONValueMergeExpr{Type: JSONMergePreserveType, JSONDoc: yyDollar[3].exprUnion(), JSONDocList: yyDollar[5].exprsUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1341:
+	case 1342:
 		yyDollar = yyS[yypt-6 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6722
+//line sql.y:6727
 		{
 			yyLOCAL = &JSONRemoveExpr{JSONDoc: yyDollar[3].exprUnion(), PathList: yyDollar[5].exprsUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1342:
+	case 1343:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6726
+//line sql.y:6731
 		{
 			yyLOCAL = &JSONUnquoteExpr{JSONValue: yyDollar[3].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1343:
+	case 1344:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6730
+//line sql.y:6735
 		{
 			yyLOCAL = &MultiPolygonExpr{PolygonParams: yyDollar[3].exprsUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1344:
+	case 1345:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6734
+//line sql.y:6739
 		{
 			yyLOCAL = &MultiPointExpr{PointParams: yyDollar[3].exprsUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1345:
+	case 1346:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6738
+//line sql.y:6743
 		{
 			yyLOCAL = &MultiLinestringExpr{LinestringParams: yyDollar[3].exprsUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1346:
+	case 1347:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6742
+//line sql.y:6747
 		{
 			yyLOCAL = &PolygonExpr{LinestringParams: yyDollar[3].exprsUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1347:
+	case 1348:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6746
+//line sql.y:6751
 		{
 			yyLOCAL = &LineStringExpr{PointParams: yyDollar[3].exprsUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1348:
+	case 1349:
 		yyDollar = yyS[yypt-6 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6750
+//line sql.y:6755
 		{
 			yyLOCAL = &PointExpr{XCordinate: yyDollar[3].exprUnion(), YCordinate: yyDollar[5].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1349:
+	case 1350:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6754
+//line sql.y:6759
 		{
 			yyLOCAL = &ArgumentLessWindowExpr{Type: yyDollar[1].argumentLessWindowExprTypeUnion(), OverClause: yyDollar[4].overClauseUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1350:
+	case 1351:
 		yyDollar = yyS[yypt-6 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6758
+//line sql.y:6763
 		{
 			yyLOCAL = &FirstOrLastValueExpr{Type: yyDollar[1].firstOrLastValueExprTypeUnion(), Expr: yyDollar[3].exprUnion(), NullTreatmentClause: yyDollar[5].nullTreatmentClauseUnion(), OverClause: yyDollar[6].overClauseUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1351:
+	case 1352:
 		yyDollar = yyS[yypt-5 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6762
+//line sql.y:6767
 		{
 			yyLOCAL = &NtileExpr{N: yyDollar[3].exprUnion(), OverClause: yyDollar[5].overClauseUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1352:
+	case 1353:
 		yyDollar = yyS[yypt-9 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6766
+//line sql.y:6771
 		{
 			yyLOCAL = &NTHValueExpr{Expr: yyDollar[3].exprUnion(), N: yyDollar[5].exprUnion(), FromFirstLastClause: yyDollar[7].fromFirstLastClauseUnion(), NullTreatmentClause: yyDollar[8].nullTreatmentClauseUnion(), OverClause: yyDollar[9].overClauseUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1353:
+	case 1354:
 		yyDollar = yyS[yypt-6 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6770
+//line sql.y:6775
 		{
 			yyLOCAL = &LagLeadExpr{Type: yyDollar[1].lagLeadExprTypeUnion(), Expr: yyDollar[3].exprUnion(), NullTreatmentClause: yyDollar[5].nullTreatmentClauseUnion(), OverClause: yyDollar[6].overClauseUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1354:
+	case 1355:
 		yyDollar = yyS[yypt-9 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6774
+//line sql.y:6779
 		{
 			yyLOCAL = &LagLeadExpr{Type: yyDollar[1].lagLeadExprTypeUnion(), Expr: yyDollar[3].exprUnion(), N: yyDollar[5].exprUnion(), Default: yyDollar[6].exprUnion(), NullTreatmentClause: yyDollar[8].nullTreatmentClauseUnion(), OverClause: yyDollar[9].overClauseUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1355:
+	case 1356:
 		yyDollar = yyS[yypt-8 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6778
+//line sql.y:6783
 		{
 			yyLOCAL = &IntervalDateExpr{Syntax: IntervalDateExprAdddate, Date: yyDollar[3].exprUnion(), Interval: yyDollar[6].exprUnion(), Unit: yyDollar[7].intervalTypeUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1356:
+	case 1357:
 		yyDollar = yyS[yypt-6 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6782
+//line sql.y:6787
 		{
 			yyLOCAL = &IntervalDateExpr{Syntax: IntervalDateExprAdddate, Date: yyDollar[3].exprUnion(), Interval: yyDollar[5].exprUnion(), Unit: IntervalNone}
 		}
 		yyVAL.union = yyLOCAL
-	case 1357:
+	case 1358:
 		yyDollar = yyS[yypt-8 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6786
+//line sql.y:6791
 		{
 			yyLOCAL = &IntervalDateExpr{Syntax: IntervalDateExprDateAdd, Date: yyDollar[3].exprUnion(), Interval: yyDollar[6].exprUnion(), Unit: yyDollar[7].intervalTypeUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1358:
+	case 1359:
 		yyDollar = yyS[yypt-8 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6790
+//line sql.y:6795
 		{
 			yyLOCAL = &IntervalDateExpr{Syntax: IntervalDateExprDateSub, Date: yyDollar[3].exprUnion(), Interval: yyDollar[6].exprUnion(), Unit: yyDollar[7].intervalTypeUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1359:
+	case 1360:
 		yyDollar = yyS[yypt-8 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6794
+//line sql.y:6799
 		{
 			yyLOCAL = &IntervalDateExpr{Syntax: IntervalDateExprSubdate, Date: yyDollar[3].exprUnion(), Interval: yyDollar[6].exprUnion(), Unit: yyDollar[7].intervalTypeUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1360:
+	case 1361:
 		yyDollar = yyS[yypt-6 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6798
+//line sql.y:6803
 		{
 			yyLOCAL = &IntervalDateExpr{Syntax: IntervalDateExprSubdate, Date: yyDollar[3].exprUnion(), Interval: yyDollar[5].exprUnion(), Unit: IntervalNone}
 		}
 		yyVAL.union = yyLOCAL
-	case 1365:
+	case 1366:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6808
+//line sql.y:6813
 		{
 			yyLOCAL = yyDollar[1].exprUnion()
 		}
 		yyVAL.union = yyLOCAL
-	case 1366:
+	case 1367:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6812
+//line sql.y:6817
 		{
 			yyLOCAL = NewIntLiteral(yyDollar[1].str)
 		}
 		yyVAL.union = yyLOCAL
-	case 1367:
+	case 1368:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6816
+//line sql.y:6821
 		{
 			yyLOCAL = yyDollar[1].variableUnion()
 		}
 		yyVAL.union = yyLOCAL
-	case 1368:
+	case 1369:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6820
+//line sql.y:6825
 		{
 			yyLOCAL = parseBindVariable(yylex, yyDollar[1].str[1:])
 		}
 		yyVAL.union = yyLOCAL
-	case 1369:
+	case 1370:
 		yyDollar = yyS[yypt-0 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6825
+//line sql.y:6830
 		{
 			yyLOCAL = nil
 		}
 		yyVAL.union = yyLOCAL
-	case 1370:
+	case 1371:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6829
+//line sql.y:6834
 		{
 			yyLOCAL = yyDollar[2].exprUnion()
 		}
 		yyVAL.union = yyLOCAL
-	case 1371:
+	case 1372:
 		yyDollar = yyS[yypt-6 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6835
+//line sql.y:6840
 		{
 			yyLOCAL = &RegexpInstrExpr{Expr: yyDollar[3].exprUnion(), Pattern: yyDollar[5].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1372:
+	case 1373:
 		yyDollar = yyS[yypt-8 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6839
+//line sql.y:6844
 		{
 			yyLOCAL = &RegexpInstrExpr{Expr: yyDollar[3].exprUnion(), Pattern: yyDollar[5].exprUnion(), Position: yyDollar[7].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1373:
+	case 1374:
 		yyDollar = yyS[yypt-10 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6843
+//line sql.y:6848
 		{
 			yyLOCAL = &RegexpInstrExpr{Expr: yyDollar[3].exprUnion(), Pattern: yyDollar[5].exprUnion(), Position: yyDollar[7].exprUnion(), Occurrence: yyDollar[9].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1374:
+	case 1375:
 		yyDollar = yyS[yypt-12 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6847
+//line sql.y:6852
 		{
 			yyLOCAL = &RegexpInstrExpr{Expr: yyDollar[3].exprUnion(), Pattern: yyDollar[5].exprUnion(), Position: yyDollar[7].exprUnion(), Occurrence: yyDollar[9].exprUnion(), ReturnOption: yyDollar[11].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1375:
+	case 1376:
 		yyDollar = yyS[yypt-14 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6851
+//line sql.y:6856
 		{
 			// Match type is kept expression as TRIM( ' m  ') is accepted
 			yyLOCAL = &RegexpInstrExpr{Expr: yyDollar[3].exprUnion(), Pattern: yyDollar[5].exprUnion(), Position: yyDollar[7].exprUnion(), Occurrence: yyDollar[9].exprUnion(), ReturnOption: yyDollar[11].exprUnion(), MatchType: yyDollar[13].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1376:
+	case 1377:
 		yyDollar = yyS[yypt-6 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6856
+//line sql.y:6861
 		{
 			yyLOCAL = &RegexpLikeExpr{Expr: yyDollar[3].exprUnion(), Pattern: yyDollar[5].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1377:
+	case 1378:
 		yyDollar = yyS[yypt-8 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6860
+//line sql.y:6865
 		{
 			yyLOCAL = &RegexpLikeExpr{Expr: yyDollar[3].exprUnion(), Pattern: yyDollar[5].exprUnion(), MatchType: yyDollar[7].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1378:
+	case 1379:
 		yyDollar = yyS[yypt-8 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6864
+//line sql.y:6869
 		{
 			yyLOCAL = &RegexpReplaceExpr{Expr: yyDollar[3].exprUnion(), Pattern: yyDollar[5].exprUnion(), Repl: yyDollar[7].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1379:
+	case 1380:
 		yyDollar = yyS[yypt-10 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6868
+//line sql.y:6873
 		{
 			yyLOCAL = &RegexpReplaceExpr{Expr: yyDollar[3].exprUnion(), Pattern: yyDollar[5].exprUnion(), Repl: yyDollar[7].exprUnion(), Position: yyDollar[9].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1380:
+	case 1381:
 		yyDollar = yyS[yypt-12 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6872
+//line sql.y:6877
 		{
 			yyLOCAL = &RegexpReplaceExpr{Expr: yyDollar[3].exprUnion(), Pattern: yyDollar[5].exprUnion(), Repl: yyDollar[7].exprUnion(), Position: yyDollar[9].exprUnion(), Occurrence: yyDollar[11].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1381:
+	case 1382:
 		yyDollar = yyS[yypt-14 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6876
+//line sql.y:6881
 		{
 			// Match type is kept expression as TRIM( ' m  ') is accepted
 			yyLOCAL = &RegexpReplaceExpr{Expr: yyDollar[3].exprUnion(), Pattern: yyDollar[5].exprUnion(), Repl: yyDollar[7].exprUnion(), Position: yyDollar[9].exprUnion(), Occurrence: yyDollar[11].exprUnion(), MatchType: yyDollar[13].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1382:
+	case 1383:
 		yyDollar = yyS[yypt-6 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6881
+//line sql.y:6886
 		{
 			yyLOCAL = &RegexpSubstrExpr{Expr: yyDollar[3].exprUnion(), Pattern: yyDollar[5].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1383:
+	case 1384:
 		yyDollar = yyS[yypt-8 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6885
+//line sql.y:6890
 		{
 			yyLOCAL = &RegexpSubstrExpr{Expr: yyDollar[3].exprUnion(), Pattern: yyDollar[5].exprUnion(), Position: yyDollar[7].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1384:
+	case 1385:
 		yyDollar = yyS[yypt-10 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6889
+//line sql.y:6894
 		{
 			yyLOCAL = &RegexpSubstrExpr{Expr: yyDollar[3].exprUnion(), Pattern: yyDollar[5].exprUnion(), Position: yyDollar[7].exprUnion(), Occurrence: yyDollar[9].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1385:
+	case 1386:
 		yyDollar = yyS[yypt-12 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6893
+//line sql.y:6898
 		{
 			// Match type is kept expression as TRIM( ' m  ') is accepted
 			yyLOCAL = &RegexpSubstrExpr{Expr: yyDollar[3].exprUnion(), Pattern: yyDollar[5].exprUnion(), Position: yyDollar[7].exprUnion(), Occurrence: yyDollar[9].exprUnion(), MatchType: yyDollar[11].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1386:
+	case 1387:
 		yyDollar = yyS[yypt-6 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6900
+//line sql.y:6905
 		{
 			yyLOCAL = &ExtractValueExpr{Fragment: yyDollar[3].exprUnion(), XPathExpr: yyDollar[5].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1387:
+	case 1388:
 		yyDollar = yyS[yypt-8 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6904
+//line sql.y:6909
 		{
 			yyLOCAL = &UpdateXMLExpr{Target: yyDollar[3].exprUnion(), XPathExpr: yyDollar[5].exprUnion(), NewXML: yyDollar[7].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1388:
+	case 1389:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6910
+//line sql.y:6915
 		{
 			yyLOCAL = &PerformanceSchemaFuncExpr{Type: FormatBytesType, Argument: yyDollar[3].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1389:
+	case 1390:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6914
+//line sql.y:6919
 		{
 			yyLOCAL = &PerformanceSchemaFuncExpr{Type: FormatPicoTimeType, Argument: yyDollar[3].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1390:
+	case 1391:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6918
+//line sql.y:6923
 		{
 			yyLOCAL = &PerformanceSchemaFuncExpr{Type: PsCurrentThreadIDType}
 		}
 		yyVAL.union = yyLOCAL
-	case 1391:
+	case 1392:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6922
+//line sql.y:6927
 		{
 			yyLOCAL = &PerformanceSchemaFuncExpr{Type: PsThreadIDType, Argument: yyDollar[3].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1392:
+	case 1393:
 		yyDollar = yyS[yypt-6 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6928
+//line sql.y:6933
 		{
 			yyLOCAL = &GTIDFuncExpr{Type: GTIDSubsetType, Set1: yyDollar[3].exprUnion(), Set2: yyDollar[5].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1393:
+	case 1394:
 		yyDollar = yyS[yypt-6 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6932
+//line sql.y:6937
 		{
 			yyLOCAL = &GTIDFuncExpr{Type: GTIDSubtractType, Set1: yyDollar[3].exprUnion(), Set2: yyDollar[5].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1394:
+	case 1395:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6936
+//line sql.y:6941
 		{
 			yyLOCAL = &GTIDFuncExpr{Type: WaitForExecutedGTIDSetType, Set1: yyDollar[3].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1395:
+	case 1396:
 		yyDollar = yyS[yypt-6 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6940
+//line sql.y:6945
 		{
 			yyLOCAL = &GTIDFuncExpr{Type: WaitForExecutedGTIDSetType, Set1: yyDollar[3].exprUnion(), Timeout: yyDollar[5].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1396:
+	case 1397:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6944
+//line sql.y:6949
 		{
 			yyLOCAL = &GTIDFuncExpr{Type: WaitUntilSQLThreadAfterGTIDSType, Set1: yyDollar[3].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1397:
+	case 1398:
 		yyDollar = yyS[yypt-6 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6948
+//line sql.y:6953
 		{
 			yyLOCAL = &GTIDFuncExpr{Type: WaitUntilSQLThreadAfterGTIDSType, Set1: yyDollar[3].exprUnion(), Timeout: yyDollar[5].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1398:
+	case 1399:
 		yyDollar = yyS[yypt-8 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6952
+//line sql.y:6957
 		{
 			yyLOCAL = &GTIDFuncExpr{Type: WaitUntilSQLThreadAfterGTIDSType, Set1: yyDollar[3].exprUnion(), Timeout: yyDollar[5].exprUnion(), Channel: yyDollar[7].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1399:
+	case 1400:
 		yyDollar = yyS[yypt-0 : yypt+1]
 		var yyLOCAL *ConvertType
-//line sql.y:6957
+//line sql.y:6962
 		{
 			yyLOCAL = nil
 		}
 		yyVAL.union = yyLOCAL
-	case 1400:
+	case 1401:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL *ConvertType
-//line sql.y:6961
+//line sql.y:6966
 		{
 			yyLOCAL = yyDollar[2].convertTypeUnion()
 		}
 		yyVAL.union = yyLOCAL
-	case 1401:
+	case 1402:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL IntervalType
-//line sql.y:6967
+//line sql.y:6972
 		{
 			yyLOCAL = IntervalDayHour
 		}
 		yyVAL.union = yyLOCAL
-	case 1402:
+	case 1403:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL IntervalType
-//line sql.y:6971
+//line sql.y:6976
 		{
 			yyLOCAL = IntervalDayMicrosecond
 		}
 		yyVAL.union = yyLOCAL
-	case 1403:
+	case 1404:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL IntervalType
-//line sql.y:6975
+//line sql.y:6980
 		{
 			yyLOCAL = IntervalDayMinute
 		}
 		yyVAL.union = yyLOCAL
-	case 1404:
+	case 1405:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL IntervalType
-//line sql.y:6979
+//line sql.y:6984
 		{
 			yyLOCAL = IntervalDaySecond
 		}
 		yyVAL.union = yyLOCAL
-	case 1405:
+	case 1406:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL IntervalType
-//line sql.y:6983
+//line sql.y:6988
 		{
 			yyLOCAL = IntervalHourMicrosecond
 		}
 		yyVAL.union = yyLOCAL
-	case 1406:
+	case 1407:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL IntervalType
-//line sql.y:6987
+//line sql.y:6992
 		{
 			yyLOCAL = IntervalHourMinute
 		}
 		yyVAL.union = yyLOCAL
-	case 1407:
+	case 1408:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL IntervalType
-//line sql.y:6991
+//line sql.y:6996
 		{
 			yyLOCAL = IntervalHourSecond
 		}
 		yyVAL.union = yyLOCAL
-	case 1408:
+	case 1409:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL IntervalType
-//line sql.y:6995
+//line sql.y:7000
 		{
 			yyLOCAL = IntervalMinuteMicrosecond
 		}
 		yyVAL.union = yyLOCAL
-	case 1409:
+	case 1410:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL IntervalType
-//line sql.y:6999
+//line sql.y:7004
 		{
 			yyLOCAL = IntervalMinuteSecond
 		}
 		yyVAL.union = yyLOCAL
-	case 1410:
+	case 1411:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL IntervalType
-//line sql.y:7003
+//line sql.y:7008
 		{
 			yyLOCAL = IntervalSecondMicrosecond
 		}
 		yyVAL.union = yyLOCAL
-	case 1411:
+	case 1412:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL IntervalType
-//line sql.y:7007
+//line sql.y:7012
 		{
 			yyLOCAL = IntervalYearMonth
 		}
 		yyVAL.union = yyLOCAL
-	case 1412:
+	case 1413:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL IntervalType
-//line sql.y:7011
+//line sql.y:7016
 		{
 			yyLOCAL = IntervalDay
 		}
 		yyVAL.union = yyLOCAL
-	case 1413:
+	case 1414:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL IntervalType
-//line sql.y:7015
+//line sql.y:7020
 		{
 			yyLOCAL = IntervalWeek
 		}
 		yyVAL.union = yyLOCAL
-	case 1414:
+	case 1415:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL IntervalType
-//line sql.y:7019
+//line sql.y:7024
 		{
 			yyLOCAL = IntervalHour
 		}
 		yyVAL.union = yyLOCAL
-	case 1415:
+	case 1416:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL IntervalType
-//line sql.y:7023
+//line sql.y:7028
 		{
 			yyLOCAL = IntervalMinute
 		}
 		yyVAL.union = yyLOCAL
-	case 1416:
+	case 1417:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL IntervalType
-//line sql.y:7027
+//line sql.y:7032
 		{
 			yyLOCAL = IntervalMonth
 		}
 		yyVAL.union = yyLOCAL
-	case 1417:
+	case 1418:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL IntervalType
-//line sql.y:7031
+//line sql.y:7036
 		{
 			yyLOCAL = IntervalQuarter
 		}
 		yyVAL.union = yyLOCAL
-	case 1418:
+	case 1419:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL IntervalType
-//line sql.y:7035
+//line sql.y:7040
 		{
 			yyLOCAL = IntervalSecond
 		}
 		yyVAL.union = yyLOCAL
-	case 1419:
+	case 1420:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL IntervalType
-//line sql.y:7039
+//line sql.y:7044
 		{
 			yyLOCAL = IntervalMicrosecond
 		}
 		yyVAL.union = yyLOCAL
-	case 1420:
+	case 1421:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL IntervalType
-//line sql.y:7043
+//line sql.y:7048
 		{
 			yyLOCAL = IntervalYear
 		}
 		yyVAL.union = yyLOCAL
-	case 1421:
+	case 1422:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL IntervalType
-//line sql.y:7049
+//line sql.y:7054
 		{
 			yyLOCAL = IntervalDay
 		}
 		yyVAL.union = yyLOCAL
-	case 1422:
+	case 1423:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL IntervalType
-//line sql.y:7053
+//line sql.y:7058
 		{
 			yyLOCAL = IntervalWeek
 		}
 		yyVAL.union = yyLOCAL
-	case 1423:
+	case 1424:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL IntervalType
-//line sql.y:7057
+//line sql.y:7062
 		{
 			yyLOCAL = IntervalHour
 		}
 		yyVAL.union = yyLOCAL
-	case 1424:
+	case 1425:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL IntervalType
-//line sql.y:7061
+//line sql.y:7066
 		{
 			yyLOCAL = IntervalMinute
 		}
 		yyVAL.union = yyLOCAL
-	case 1425:
+	case 1426:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL IntervalType
-//line sql.y:7065
+//line sql.y:7070
 		{
 			yyLOCAL = IntervalMonth
 		}
 		yyVAL.union = yyLOCAL
-	case 1426:
+	case 1427:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL IntervalType
-//line sql.y:7069
+//line sql.y:7074
 		{
 			yyLOCAL = IntervalQuarter
 		}
 		yyVAL.union = yyLOCAL
-	case 1427:
+	case 1428:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL IntervalType
-//line sql.y:7073
+//line sql.y:7078
 		{
 			yyLOCAL = IntervalSecond
 		}
 		yyVAL.union = yyLOCAL
-	case 1428:
+	case 1429:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL IntervalType
-//line sql.y:7077
+//line sql.y:7082
 		{
 			yyLOCAL = IntervalMicrosecond
 		}
 		yyVAL.union = yyLOCAL
-	case 1429:
+	case 1430:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL IntervalType
-//line sql.y:7081
+//line sql.y:7086
 		{
 			yyLOCAL = IntervalYear
 		}
 		yyVAL.union = yyLOCAL
-	case 1430:
+	case 1431:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL IntervalType
-//line sql.y:7085
+//line sql.y:7090
 		{
 			yyLOCAL = IntervalDay
 		}
 		yyVAL.union = yyLOCAL
-	case 1431:
+	case 1432:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL IntervalType
-//line sql.y:7089
+//line sql.y:7094
 		{
 			yyLOCAL = IntervalWeek
 		}
 		yyVAL.union = yyLOCAL
-	case 1432:
+	case 1433:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL IntervalType
-//line sql.y:7093
+//line sql.y:7098
 		{
 			yyLOCAL = IntervalHour
 		}
 		yyVAL.union = yyLOCAL
-	case 1433:
+	case 1434:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL IntervalType
-//line sql.y:7097
+//line sql.y:7102
 		{
 			yyLOCAL = IntervalMinute
 		}
 		yyVAL.union = yyLOCAL
-	case 1434:
+	case 1435:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL IntervalType
-//line sql.y:7101
+//line sql.y:7106
 		{
 			yyLOCAL = IntervalMonth
 		}
 		yyVAL.union = yyLOCAL
-	case 1435:
+	case 1436:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL IntervalType
-//line sql.y:7105
+//line sql.y:7110
 		{
 			yyLOCAL = IntervalQuarter
 		}
 		yyVAL.union = yyLOCAL
-	case 1436:
+	case 1437:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL IntervalType
-//line sql.y:7109
+//line sql.y:7114
 		{
 			yyLOCAL = IntervalSecond
 		}
 		yyVAL.union = yyLOCAL
-	case 1437:
+	case 1438:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL IntervalType
-//line sql.y:7113
+//line sql.y:7118
 		{
 			yyLOCAL = IntervalMicrosecond
 		}
 		yyVAL.union = yyLOCAL
-	case 1438:
+	case 1439:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL IntervalType
-//line sql.y:7117
+//line sql.y:7122
 		{
 			yyLOCAL = IntervalYear
 		}
 		yyVAL.union = yyLOCAL
-	case 1441:
+	case 1442:
 		yyDollar = yyS[yypt-0 : yypt+1]
 		var yyLOCAL int
-//line sql.y:7127
+//line sql.y:7132
 		{
 			yyLOCAL = 0
 		}
 		yyVAL.union = yyLOCAL
-	case 1442:
+	case 1443:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL int
-//line sql.y:7131
+//line sql.y:7136
 		{
 			yyLOCAL = 0
 		}
 		yyVAL.union = yyLOCAL
-	case 1443:
+	case 1444:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL int
-//line sql.y:7135
+//line sql.y:7140
 		{
 			yyLOCAL = convertStringToInt(yyDollar[2].str)
 		}
 		yyVAL.union = yyLOCAL
-	case 1444:
+	case 1445:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:7145
+//line sql.y:7150
 		{
 			yyLOCAL = &FuncExpr{Name: NewIdentifierCI("if"), Exprs: yyDollar[3].exprsUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1445:
+	case 1446:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:7149
+//line sql.y:7154
 		{
 			yyLOCAL = &FuncExpr{Name: NewIdentifierCI("database"), Exprs: yyDollar[3].exprsUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1446:
+	case 1447:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:7153
+//line sql.y:7158
 		{
 			yyLOCAL = &FuncExpr{Name: NewIdentifierCI("schema"), Exprs: yyDollar[3].exprsUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1447:
+	case 1448:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:7157
+//line sql.y:7162
 		{
 			yyLOCAL = &FuncExpr{Name: NewIdentifierCI("mod"), Exprs: yyDollar[3].exprsUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1448:
+	case 1449:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:7161
+//line sql.y:7166
 		{
 			yyLOCAL = &FuncExpr{Name: NewIdentifierCI("replace"), Exprs: yyDollar[3].exprsUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1449:
+	case 1450:
 		yyDollar = yyS[yypt-0 : yypt+1]
 		var yyLOCAL MatchExprOption
-//line sql.y:7167
+//line sql.y:7172
 		{
 			yyLOCAL = NoOption
 		}
 		yyVAL.union = yyLOCAL
-	case 1450:
+	case 1451:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL MatchExprOption
-//line sql.y:7171
+//line sql.y:7176
 		{
 			yyLOCAL = BooleanModeOpt
 		}
 		yyVAL.union = yyLOCAL
-	case 1451:
+	case 1452:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL MatchExprOption
-//line sql.y:7175
+//line sql.y:7180
 		{
 			yyLOCAL = NaturalLanguageModeOpt
 		}
 		yyVAL.union = yyLOCAL
-	case 1452:
+	case 1453:
 		yyDollar = yyS[yypt-7 : yypt+1]
 		var yyLOCAL MatchExprOption
-//line sql.y:7179
+//line sql.y:7184
 		{
 			yyLOCAL = NaturalLanguageModeWithQueryExpansionOpt
 		}
 		yyVAL.union = yyLOCAL
-	case 1453:
+	case 1454:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL MatchExprOption
-//line sql.y:7183
+//line sql.y:7188
 		{
 			yyLOCAL = QueryExpansionOpt
 		}
 		yyVAL.union = yyLOCAL
-	case 1454:
+	case 1455:
 		yyDollar = yyS[yypt-1 : yypt+1]
-//line sql.y:7189
+//line sql.y:7194
 		{
 			yyVAL.str = string(yyDollar[1].identifierCI.String())
 		}
-	case 1455:
+	case 1456:
 		yyDollar = yyS[yypt-1 : yypt+1]
-//line sql.y:7193
+//line sql.y:7198
 		{
 			yyVAL.str = string(yyDollar[1].str)
 		}
-	case 1456:
+	case 1457:
 		yyDollar = yyS[yypt-1 : yypt+1]
-//line sql.y:7197
+//line sql.y:7202
 		{
 			yyVAL.str = string(yyDollar[1].str)
 		}
-	case 1457:
+	case 1458:
 		yyDollar = yyS[yypt-0 : yypt+1]
 		var yyLOCAL *ConvertType
-//line sql.y:7203
+//line sql.y:7208
 		{
 			yyLOCAL = nil
 		}
 		yyVAL.union = yyLOCAL
-	case 1458:
+	case 1459:
 		yyDollar = yyS[yypt-5 : yypt+1]
 		var yyLOCAL *ConvertType
-//line sql.y:7207
+//line sql.y:7212
 		{
 			yyLOCAL = &ConvertType{Type: string(yyDollar[2].str), Length: ptr.Of(convertStringToInt(yyDollar[4].str))}
 		}
 		yyVAL.union = yyLOCAL
-	case 1459:
+	case 1460:
 		yyDollar = yyS[yypt-5 : yypt+1]
 		var yyLOCAL *ConvertType
-//line sql.y:7211
+//line sql.y:7216
 		{
 			yyLOCAL = &ConvertType{Type: string(yyDollar[2].str), Length: ptr.Of(convertStringToInt(yyDollar[4].str))}
 		}
 		yyVAL.union = yyLOCAL
-	case 1460:
+	case 1461:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL *ConvertType
-//line sql.y:7217
+//line sql.y:7222
 		{
 			yyLOCAL = &ConvertType{Type: string(yyDollar[1].str), Length: yyDollar[2].intPtrUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1461:
+	case 1462:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL *ConvertType
-//line sql.y:7221
+//line sql.y:7226
 		{
 			yyLOCAL = &ConvertType{Type: string(yyDollar[1].str), Length: yyDollar[2].intPtrUnion(), Charset: yyDollar[3].columnCharset}
 		}
 		yyVAL.union = yyLOCAL
-	case 1462:
+	case 1463:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL *ConvertType
-//line sql.y:7225
+//line sql.y:7230
 		{
 			yyLOCAL = &ConvertType{Type: string(yyDollar[1].str)}
 		}
 		yyVAL.union = yyLOCAL
-	case 1463:
+	case 1464:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL *ConvertType
-//line sql.y:7229
+//line sql.y:7234
 		{
 			yyLOCAL = &ConvertType{Type: string(yyDollar[1].str), Length: yyDollar[2].intPtrUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1464:
+	case 1465:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL *ConvertType
-//line sql.y:7233
+//line sql.y:7238
 		{
 			yyLOCAL = &ConvertType{Type: string(yyDollar[1].str)}
 			yyLOCAL.Length = yyDollar[2].LengthScaleOption.Length
 			yyLOCAL.Scale = yyDollar[2].LengthScaleOption.Scale
 		}
 		yyVAL.union = yyLOCAL
-	case 1465:
+	case 1466:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL *ConvertType
-//line sql.y:7239
+//line sql.y:7244
 		{
 			yyLOCAL = &ConvertType{Type: string(yyDollar[1].str)}
 		}
 		yyVAL.union = yyLOCAL
-	case 1466:
+	case 1467:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL *ConvertType
-//line sql.y:7243
+//line sql.y:7248
 		{
 			yyLOCAL = &ConvertType{Type: string(yyDollar[1].str), Length: yyDollar[2].intPtrUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1467:
+	case 1468:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL *ConvertType
-//line sql.y:7247
+//line sql.y:7252
 		{
 			yyLOCAL = &ConvertType{Type: string(yyDollar[1].str)}
 		}
 		yyVAL.union = yyLOCAL
-	case 1468:
+	case 1469:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL *ConvertType
-//line sql.y:7251
+//line sql.y:7256
 		{
 			yyLOCAL = &ConvertType{Type: string(yyDollar[1].str)}
 		}
 		yyVAL.union = yyLOCAL
-	case 1469:
+	case 1470:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL *ConvertType
-//line sql.y:7255
+//line sql.y:7260
 		{
 			yyLOCAL = &ConvertType{Type: string(yyDollar[1].str), Length: yyDollar[2].intPtrUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1470:
+	case 1471:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL *ConvertType
-//line sql.y:7259
+//line sql.y:7264
 		{
 			yyLOCAL = &ConvertType{Type: string(yyDollar[1].str)}
 		}
 		yyVAL.union = yyLOCAL
-	case 1471:
+	case 1472:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL *ConvertType
-//line sql.y:7263
+//line sql.y:7268
 		{
 			yyLOCAL = &ConvertType{Type: string(yyDollar[1].str)}
 		}
 		yyVAL.union = yyLOCAL
-	case 1472:
+	case 1473:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL *ConvertType
-//line sql.y:7267
+//line sql.y:7272
 		{
 			yyLOCAL = &ConvertType{Type: string(yyDollar[1].str), Length: yyDollar[2].intPtrUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1473:
+	case 1474:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL *ConvertType
-//line sql.y:7271
+//line sql.y:7276
 		{
 			yyLOCAL = &ConvertType{Type: string(yyDollar[1].str)}
 		}
 		yyVAL.union = yyLOCAL
-	case 1474:
+	case 1475:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL *ConvertType
-//line sql.y:7275
+//line sql.y:7280
 		{
 			yyLOCAL = &ConvertType{Type: string(yyDollar[1].str)}
 		}
 		yyVAL.union = yyLOCAL
-	case 1475:
+	case 1476:
 		yyDollar = yyS[yypt-0 : yypt+1]
 		var yyLOCAL bool
-//line sql.y:7281
+//line sql.y:7286
 		{
 			yyLOCAL = false
 		}
 		yyVAL.union = yyLOCAL
-	case 1476:
+	case 1477:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL bool
-//line sql.y:7285
+//line sql.y:7290
 		{
 			yyLOCAL = true
 		}
 		yyVAL.union = yyLOCAL
-	case 1477:
+	case 1478:
 		yyDollar = yyS[yypt-0 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:7290
+//line sql.y:7295
 		{
 			yyLOCAL = nil
 		}
 		yyVAL.union = yyLOCAL
-	case 1478:
+	case 1479:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:7294
+//line sql.y:7299
 		{
 			yyLOCAL = yyDollar[1].exprUnion()
 		}
 		yyVAL.union = yyLOCAL
-	case 1479:
+	case 1480:
 		yyDollar = yyS[yypt-0 : yypt+1]
-//line sql.y:7299
+//line sql.y:7304
 		{
 			yyVAL.str = string("")
 		}
-	case 1480:
+	case 1481:
 		yyDollar = yyS[yypt-2 : yypt+1]
-//line sql.y:7303
+//line sql.y:7308
 		{
 			yyVAL.str = encodeSQLString(yyDollar[2].str)
 		}
-	case 1481:
+	case 1482:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL []*When
-//line sql.y:7309
+//line sql.y:7314
 		{
 			yyLOCAL = []*When{yyDollar[1].whenUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1482:
+	case 1483:
 		yyDollar = yyS[yypt-2 : yypt+1]
-//line sql.y:7313
+//line sql.y:7318
 		{
 			yySLICE := (*[]*When)(yyIaddr(yyVAL.union))
 			*yySLICE = append(*yySLICE, yyDollar[2].whenUnion())
 		}
-	case 1483:
+	case 1484:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL *When
-//line sql.y:7319
+//line sql.y:7324
 		{
 			yyLOCAL = &When{Cond: yyDollar[2].exprUnion(), Val: yyDollar[4].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1484:
+	case 1485:
 		yyDollar = yyS[yypt-0 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:7324
+//line sql.y:7329
 		{
 			yyLOCAL = nil
 		}
 		yyVAL.union = yyLOCAL
-	case 1485:
+	case 1486:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:7328
+//line sql.y:7333
 		{
 			yyLOCAL = yyDollar[2].exprUnion()
 		}
 		yyVAL.union = yyLOCAL
-	case 1486:
+	case 1487:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL *ColName
-//line sql.y:7334
+//line sql.y:7339
 		{
 			yyLOCAL = &ColName{Name: yyDollar[1].identifierCI}
 		}
 		yyVAL.union = yyLOCAL
-	case 1487:
+	case 1488:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL *ColName
-//line sql.y:7338
+//line sql.y:7343
 		{
 			yyLOCAL = &ColName{Name: NewIdentifierCI(string(yyDollar[1].str))}
 		}
 		yyVAL.union = yyLOCAL
-	case 1488:
+	case 1489:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL *ColName
-//line sql.y:7342
+//line sql.y:7347
 		{
 			yyLOCAL = &ColName{Qualifier: TableName{Name: yyDollar[1].identifierCS}, Name: yyDollar[3].identifierCI}
 		}
 		yyVAL.union = yyLOCAL
-	case 1489:
+	case 1490:
 		yyDollar = yyS[yypt-5 : yypt+1]
 		var yyLOCAL *ColName
-//line sql.y:7346
+//line sql.y:7351
 		{
 			yyLOCAL = &ColName{Qualifier: TableName{Qualifier: yyDollar[1].identifierCS, Name: yyDollar[3].identifierCS}, Name: yyDollar[5].identifierCI}
 		}
 		yyVAL.union = yyLOCAL
-	case 1490:
+	case 1491:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:7352
+//line sql.y:7357
 		{
 			yyLOCAL = yyDollar[1].colNameUnion()
 		}
 		yyVAL.union = yyLOCAL
-	case 1491:
+	case 1492:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:7356
+//line sql.y:7361
 		{
 			yyLOCAL = &Offset{V: convertStringToInt(yyDollar[1].str)}
 		}
 		yyVAL.union = yyLOCAL
-	case 1492:
+	case 1493:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:7362
+//line sql.y:7367
 		{
 			// TODO(sougou): Deprecate this construct.
 			if yyDollar[1].identifierCI.Lowered() != "value" {
@@ -21448,442 +21457,442 @@ yydefault:
 			yyLOCAL = NewIntLiteral("1")
 		}
 		yyVAL.union = yyLOCAL
-	case 1493:
+	case 1494:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:7371
+//line sql.y:7376
 		{
 			yyLOCAL = NewIntLiteral(yyDollar[1].str)
 		}
 		yyVAL.union = yyLOCAL
-	case 1494:
+	case 1495:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:7375
+//line sql.y:7380
 		{
 			yyLOCAL = parseBindVariable(yylex, yyDollar[1].str[1:])
 		}
 		yyVAL.union = yyLOCAL
-	case 1495:
+	case 1496:
 		yyDollar = yyS[yypt-0 : yypt+1]
 		var yyLOCAL *GroupBy
-//line sql.y:7380
+//line sql.y:7385
 		{
 			yyLOCAL = nil
 		}
 		yyVAL.union = yyLOCAL
-	case 1496:
+	case 1497:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL *GroupBy
-//line sql.y:7384
+//line sql.y:7389
 		{
 			yyLOCAL = &GroupBy{Exprs: yyDollar[3].exprsUnion(), WithRollup: yyDollar[4].booleanUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1497:
+	case 1498:
 		yyDollar = yyS[yypt-0 : yypt+1]
 		var yyLOCAL bool
-//line sql.y:7389
+//line sql.y:7394
 		{
 			yyLOCAL = false
 		}
 		yyVAL.union = yyLOCAL
-	case 1498:
+	case 1499:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL bool
-//line sql.y:7393
+//line sql.y:7398
 		{
 			yyLOCAL = true
 		}
 		yyVAL.union = yyLOCAL
-	case 1499:
+	case 1500:
 		yyDollar = yyS[yypt-0 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:7399
+//line sql.y:7404
 		{
 			yyLOCAL = nil
 		}
 		yyVAL.union = yyLOCAL
-	case 1500:
+	case 1501:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:7403
+//line sql.y:7408
 		{
 			yyLOCAL = yyDollar[2].exprUnion()
 		}
 		yyVAL.union = yyLOCAL
-	case 1501:
+	case 1502:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL *NamedWindow
-//line sql.y:7409
+//line sql.y:7414
 		{
 			yyLOCAL = &NamedWindow{yyDollar[2].windowDefinitionsUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1502:
+	case 1503:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL NamedWindows
-//line sql.y:7415
+//line sql.y:7420
 		{
 			yyLOCAL = NamedWindows{yyDollar[1].namedWindowUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1503:
+	case 1504:
 		yyDollar = yyS[yypt-3 : yypt+1]
-//line sql.y:7419
+//line sql.y:7424
 		{
 			yySLICE := (*NamedWindows)(yyIaddr(yyVAL.union))
 			*yySLICE = append(*yySLICE, yyDollar[3].namedWindowUnion())
 		}
-	case 1504:
+	case 1505:
 		yyDollar = yyS[yypt-0 : yypt+1]
 		var yyLOCAL NamedWindows
-//line sql.y:7424
+//line sql.y:7429
 		{
 			yyLOCAL = nil
 		}
 		yyVAL.union = yyLOCAL
-	case 1505:
+	case 1506:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL NamedWindows
-//line sql.y:7428
+//line sql.y:7433
 		{
 			yyLOCAL = yyDollar[1].namedWindowsUnion()
 		}
 		yyVAL.union = yyLOCAL
-	case 1506:
+	case 1507:
 		yyDollar = yyS[yypt-0 : yypt+1]
 		var yyLOCAL OrderBy
-//line sql.y:7433
+//line sql.y:7438
 		{
 			yyLOCAL = nil
 		}
 		yyVAL.union = yyLOCAL
-	case 1507:
+	case 1508:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL OrderBy
-//line sql.y:7437
+//line sql.y:7442
 		{
 			yyLOCAL = yyDollar[1].orderByUnion()
 		}
 		yyVAL.union = yyLOCAL
-	case 1508:
+	case 1509:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL OrderBy
-//line sql.y:7443
+//line sql.y:7448
 		{
 			yyLOCAL = yyDollar[3].orderByUnion()
 		}
 		yyVAL.union = yyLOCAL
-	case 1509:
+	case 1510:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL OrderBy
-//line sql.y:7449
+//line sql.y:7454
 		{
 			yyLOCAL = OrderBy{yyDollar[1].orderUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1510:
+	case 1511:
 		yyDollar = yyS[yypt-3 : yypt+1]
-//line sql.y:7453
+//line sql.y:7458
 		{
 			yySLICE := (*OrderBy)(yyIaddr(yyVAL.union))
 			*yySLICE = append(*yySLICE, yyDollar[3].orderUnion())
 		}
-	case 1511:
+	case 1512:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL *Order
-//line sql.y:7459
+//line sql.y:7464
 		{
 			yyLOCAL = &Order{Expr: yyDollar[1].exprUnion(), Direction: yyDollar[2].orderDirectionUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1512:
+	case 1513:
 		yyDollar = yyS[yypt-0 : yypt+1]
 		var yyLOCAL OrderDirection
-//line sql.y:7464
+//line sql.y:7469
 		{
 			yyLOCAL = AscOrder
 		}
 		yyVAL.union = yyLOCAL
-	case 1513:
+	case 1514:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL OrderDirection
-//line sql.y:7468
+//line sql.y:7473
 		{
 			yyLOCAL = AscOrder
 		}
 		yyVAL.union = yyLOCAL
-	case 1514:
+	case 1515:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL OrderDirection
-//line sql.y:7472
+//line sql.y:7477
 		{
 			yyLOCAL = DescOrder
 		}
 		yyVAL.union = yyLOCAL
-	case 1515:
+	case 1516:
 		yyDollar = yyS[yypt-0 : yypt+1]
 		var yyLOCAL *Limit
-//line sql.y:7477
+//line sql.y:7482
 		{
 			yyLOCAL = nil
 		}
 		yyVAL.union = yyLOCAL
-	case 1516:
+	case 1517:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL *Limit
-//line sql.y:7481
+//line sql.y:7486
 		{
 			yyLOCAL = yyDollar[1].limitUnion()
 		}
 		yyVAL.union = yyLOCAL
-	case 1517:
+	case 1518:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL *Limit
-//line sql.y:7487
+//line sql.y:7492
 		{
 			yyLOCAL = &Limit{Rowcount: yyDollar[2].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1518:
+	case 1519:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL *Limit
-//line sql.y:7491
+//line sql.y:7496
 		{
 			yyLOCAL = &Limit{Offset: yyDollar[2].exprUnion(), Rowcount: yyDollar[4].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1519:
+	case 1520:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL *Limit
-//line sql.y:7495
+//line sql.y:7500
 		{
 			yyLOCAL = &Limit{Offset: yyDollar[4].exprUnion(), Rowcount: yyDollar[2].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1520:
+	case 1521:
 		yyDollar = yyS[yypt-0 : yypt+1]
 		var yyLOCAL []AlterOption
-//line sql.y:7500
+//line sql.y:7505
 		{
 			yyLOCAL = nil
 		}
 		yyVAL.union = yyLOCAL
-	case 1521:
+	case 1522:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL []AlterOption
-//line sql.y:7504
+//line sql.y:7509
 		{
 			yyLOCAL = []AlterOption{yyDollar[1].alterOptionUnion(), yyDollar[2].alterOptionUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1522:
+	case 1523:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL []AlterOption
-//line sql.y:7508
+//line sql.y:7513
 		{
 			yyLOCAL = []AlterOption{yyDollar[1].alterOptionUnion(), yyDollar[2].alterOptionUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1523:
+	case 1524:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL []AlterOption
-//line sql.y:7512
+//line sql.y:7517
 		{
 			yyLOCAL = []AlterOption{yyDollar[1].alterOptionUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1524:
+	case 1525:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL []AlterOption
-//line sql.y:7516
+//line sql.y:7521
 		{
 			yyLOCAL = []AlterOption{yyDollar[1].alterOptionUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1525:
+	case 1526:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL AlterOption
-//line sql.y:7523
+//line sql.y:7528
 		{
 			yyLOCAL = &LockOption{Type: DefaultType}
 		}
 		yyVAL.union = yyLOCAL
-	case 1526:
+	case 1527:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL AlterOption
-//line sql.y:7527
+//line sql.y:7532
 		{
 			yyLOCAL = &LockOption{Type: NoneType}
 		}
 		yyVAL.union = yyLOCAL
-	case 1527:
+	case 1528:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL AlterOption
-//line sql.y:7531
+//line sql.y:7536
 		{
 			yyLOCAL = &LockOption{Type: SharedType}
 		}
 		yyVAL.union = yyLOCAL
-	case 1528:
+	case 1529:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL AlterOption
-//line sql.y:7535
+//line sql.y:7540
 		{
 			yyLOCAL = &LockOption{Type: ExclusiveType}
 		}
 		yyVAL.union = yyLOCAL
-	case 1529:
+	case 1530:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL AlterOption
-//line sql.y:7541
+//line sql.y:7546
 		{
 			yyLOCAL = AlgorithmValue(yyDollar[3].str)
 		}
 		yyVAL.union = yyLOCAL
-	case 1530:
+	case 1531:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL AlterOption
-//line sql.y:7545
+//line sql.y:7550
 		{
 			yyLOCAL = AlgorithmValue(yyDollar[3].str)
 		}
 		yyVAL.union = yyLOCAL
-	case 1531:
+	case 1532:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL AlterOption
-//line sql.y:7549
+//line sql.y:7554
 		{
 			yyLOCAL = AlgorithmValue(yyDollar[3].str)
 		}
 		yyVAL.union = yyLOCAL
-	case 1532:
+	case 1533:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL AlterOption
-//line sql.y:7553
+//line sql.y:7558
 		{
 			yyLOCAL = AlgorithmValue(yyDollar[3].str)
 		}
 		yyVAL.union = yyLOCAL
-	case 1533:
+	case 1534:
 		yyDollar = yyS[yypt-0 : yypt+1]
-//line sql.y:7558
+//line sql.y:7563
 		{
 			yyVAL.str = ""
 		}
-	case 1534:
+	case 1535:
 		yyDollar = yyS[yypt-3 : yypt+1]
-//line sql.y:7562
+//line sql.y:7567
 		{
 			yyVAL.str = string(yyDollar[3].str)
 		}
-	case 1535:
+	case 1536:
 		yyDollar = yyS[yypt-3 : yypt+1]
-//line sql.y:7566
+//line sql.y:7571
 		{
 			yyVAL.str = string(yyDollar[3].str)
 		}
-	case 1536:
+	case 1537:
 		yyDollar = yyS[yypt-3 : yypt+1]
-//line sql.y:7570
+//line sql.y:7575
 		{
 			yyVAL.str = string(yyDollar[3].str)
 		}
-	case 1537:
+	case 1538:
 		yyDollar = yyS[yypt-0 : yypt+1]
-//line sql.y:7575
+//line sql.y:7580
 		{
 			yyVAL.str = ""
 		}
-	case 1538:
+	case 1539:
 		yyDollar = yyS[yypt-3 : yypt+1]
-//line sql.y:7579
+//line sql.y:7584
 		{
 			yyVAL.str = yyDollar[3].str
 		}
-	case 1539:
+	case 1540:
 		yyDollar = yyS[yypt-1 : yypt+1]
-//line sql.y:7585
+//line sql.y:7590
 		{
 			yyVAL.str = string(yyDollar[1].str)
 		}
-	case 1540:
+	case 1541:
 		yyDollar = yyS[yypt-1 : yypt+1]
-//line sql.y:7589
+//line sql.y:7594
 		{
 			yyVAL.str = string(yyDollar[1].str)
 		}
-	case 1541:
+	case 1542:
 		yyDollar = yyS[yypt-0 : yypt+1]
-//line sql.y:7594
+//line sql.y:7599
 		{
 			yyVAL.str = ""
 		}
-	case 1542:
+	case 1543:
 		yyDollar = yyS[yypt-4 : yypt+1]
-//line sql.y:7598
+//line sql.y:7603
 		{
 			yyVAL.str = yyDollar[2].str
 		}
-	case 1543:
+	case 1544:
 		yyDollar = yyS[yypt-0 : yypt+1]
-//line sql.y:7603
+//line sql.y:7608
 		{
 			yyVAL.str = "cascaded"
 		}
-	case 1544:
+	case 1545:
 		yyDollar = yyS[yypt-1 : yypt+1]
-//line sql.y:7607
+//line sql.y:7612
 		{
 			yyVAL.str = string(yyDollar[1].str)
 		}
-	case 1545:
+	case 1546:
 		yyDollar = yyS[yypt-1 : yypt+1]
-//line sql.y:7611
+//line sql.y:7616
 		{
 			yyVAL.str = string(yyDollar[1].str)
 		}
-	case 1546:
+	case 1547:
 		yyDollar = yyS[yypt-0 : yypt+1]
 		var yyLOCAL *Definer
-//line sql.y:7616
+//line sql.y:7621
 		{
 			yyLOCAL = nil
 		}
 		yyVAL.union = yyLOCAL
-	case 1547:
+	case 1548:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL *Definer
-//line sql.y:7620
+//line sql.y:7625
 		{
 			yyLOCAL = yyDollar[3].definerUnion()
 		}
 		yyVAL.union = yyLOCAL
-	case 1548:
+	case 1549:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL *Definer
-//line sql.y:7626
+//line sql.y:7631
 		{
 			yyLOCAL = &Definer{
 				Name: string(yyDollar[1].str),
 			}
 		}
 		yyVAL.union = yyLOCAL
-	case 1549:
+	case 1550:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL *Definer
-//line sql.y:7632
+//line sql.y:7637
 		{
 			yyLOCAL = &Definer{
 				Name: string(yyDollar[1].str),
 			}
 		}
 		yyVAL.union = yyLOCAL
-	case 1550:
+	case 1551:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL *Definer
-//line sql.y:7638
+//line sql.y:7643
 		{
 			yyLOCAL = &Definer{
 				Name:    yyDollar[1].str,
@@ -21891,464 +21900,464 @@ yydefault:
 			}
 		}
 		yyVAL.union = yyLOCAL
-	case 1551:
+	case 1552:
 		yyDollar = yyS[yypt-1 : yypt+1]
-//line sql.y:7647
+//line sql.y:7652
 		{
 			yyVAL.str = encodeSQLString(yyDollar[1].str)
 		}
-	case 1552:
+	case 1553:
 		yyDollar = yyS[yypt-1 : yypt+1]
-//line sql.y:7651
+//line sql.y:7656
 		{
 			yyVAL.str = formatIdentifier(yyDollar[1].str)
 		}
-	case 1553:
+	case 1554:
 		yyDollar = yyS[yypt-0 : yypt+1]
-//line sql.y:7656
+//line sql.y:7661
 		{
 			yyVAL.str = ""
 		}
-	case 1554:
+	case 1555:
 		yyDollar = yyS[yypt-1 : yypt+1]
-//line sql.y:7660
+//line sql.y:7665
 		{
 			yyVAL.str = formatAddress(yyDollar[1].str)
 		}
-	case 1555:
+	case 1556:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL Lock
-//line sql.y:7666
+//line sql.y:7671
 		{
 			yyLOCAL = ForUpdateLock
 		}
 		yyVAL.union = yyLOCAL
-	case 1556:
+	case 1557:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL Lock
-//line sql.y:7670
+//line sql.y:7675
 		{
 			yyLOCAL = ForUpdateLockNoWait
 		}
 		yyVAL.union = yyLOCAL
-	case 1557:
+	case 1558:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Lock
-//line sql.y:7674
+//line sql.y:7679
 		{
 			yyLOCAL = ForUpdateLockSkipLocked
 		}
 		yyVAL.union = yyLOCAL
-	case 1558:
+	case 1559:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL Lock
-//line sql.y:7678
+//line sql.y:7683
 		{
 			yyLOCAL = ForShareLock
 		}
 		yyVAL.union = yyLOCAL
-	case 1559:
+	case 1560:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL Lock
-//line sql.y:7682
+//line sql.y:7687
 		{
 			yyLOCAL = ForShareLockNoWait
 		}
 		yyVAL.union = yyLOCAL
-	case 1560:
+	case 1561:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Lock
-//line sql.y:7686
+//line sql.y:7691
 		{
 			yyLOCAL = ForShareLockSkipLocked
 		}
 		yyVAL.union = yyLOCAL
-	case 1561:
+	case 1562:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Lock
-//line sql.y:7690
+//line sql.y:7695
 		{
 			yyLOCAL = ShareModeLock
 		}
 		yyVAL.union = yyLOCAL
-	case 1562:
+	case 1563:
 		yyDollar = yyS[yypt-9 : yypt+1]
 		var yyLOCAL *SelectInto
-//line sql.y:7696
+//line sql.y:7701
 		{
 			yyLOCAL = &SelectInto{Type: IntoOutfileS3, FileName: encodeSQLString(yyDollar[4].str), Charset: yyDollar[5].columnCharset, FormatOption: yyDollar[6].str, ExportOption: yyDollar[7].str, Manifest: yyDollar[8].str, Overwrite: yyDollar[9].str}
 		}
 		yyVAL.union = yyLOCAL
-	case 1563:
+	case 1564:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL *SelectInto
-//line sql.y:7700
+//line sql.y:7705
 		{
 			yyLOCAL = &SelectInto{Type: IntoDumpfile, FileName: encodeSQLString(yyDollar[3].str), Charset: ColumnCharset{}, FormatOption: "", ExportOption: "", Manifest: "", Overwrite: ""}
 		}
 		yyVAL.union = yyLOCAL
-	case 1564:
+	case 1565:
 		yyDollar = yyS[yypt-5 : yypt+1]
 		var yyLOCAL *SelectInto
-//line sql.y:7704
+//line sql.y:7709
 		{
 			yyLOCAL = &SelectInto{Type: IntoOutfile, FileName: encodeSQLString(yyDollar[3].str), Charset: yyDollar[4].columnCharset, FormatOption: "", ExportOption: yyDollar[5].str, Manifest: "", Overwrite: ""}
 		}
 		yyVAL.union = yyLOCAL
-	case 1565:
+	case 1566:
 		yyDollar = yyS[yypt-0 : yypt+1]
-//line sql.y:7709
+//line sql.y:7714
 		{
 			yyVAL.str = ""
 		}
-	case 1566:
+	case 1567:
 		yyDollar = yyS[yypt-3 : yypt+1]
-//line sql.y:7713
+//line sql.y:7718
 		{
 			yyVAL.str = " format csv" + yyDollar[3].str
 		}
-	case 1567:
+	case 1568:
 		yyDollar = yyS[yypt-3 : yypt+1]
-//line sql.y:7717
+//line sql.y:7722
 		{
 			yyVAL.str = " format text" + yyDollar[3].str
 		}
-	case 1568:
+	case 1569:
 		yyDollar = yyS[yypt-0 : yypt+1]
-//line sql.y:7722
+//line sql.y:7727
 		{
 			yyVAL.str = ""
 		}
-	case 1569:
+	case 1570:
 		yyDollar = yyS[yypt-1 : yypt+1]
-//line sql.y:7726
+//line sql.y:7731
 		{
 			yyVAL.str = " header"
 		}
-	case 1570:
+	case 1571:
 		yyDollar = yyS[yypt-0 : yypt+1]
-//line sql.y:7731
+//line sql.y:7736
 		{
 			yyVAL.str = ""
 		}
-	case 1571:
+	case 1572:
 		yyDollar = yyS[yypt-2 : yypt+1]
-//line sql.y:7735
+//line sql.y:7740
 		{
 			yyVAL.str = " manifest on"
 		}
-	case 1572:
+	case 1573:
 		yyDollar = yyS[yypt-2 : yypt+1]
-//line sql.y:7739
+//line sql.y:7744
 		{
 			yyVAL.str = " manifest off"
 		}
-	case 1573:
+	case 1574:
 		yyDollar = yyS[yypt-0 : yypt+1]
-//line sql.y:7744
+//line sql.y:7749
 		{
 			yyVAL.str = ""
 		}
-	case 1574:
+	case 1575:
 		yyDollar = yyS[yypt-2 : yypt+1]
-//line sql.y:7748
+//line sql.y:7753
 		{
 			yyVAL.str = " overwrite on"
 		}
-	case 1575:
+	case 1576:
 		yyDollar = yyS[yypt-2 : yypt+1]
-//line sql.y:7752
+//line sql.y:7757
 		{
 			yyVAL.str = " overwrite off"
 		}
-	case 1576:
+	case 1577:
 		yyDollar = yyS[yypt-2 : yypt+1]
-//line sql.y:7758
+//line sql.y:7763
 		{
 			yyVAL.str = yyDollar[1].str + yyDollar[2].str
 		}
-	case 1577:
+	case 1578:
 		yyDollar = yyS[yypt-0 : yypt+1]
-//line sql.y:7763
+//line sql.y:7768
 		{
 			yyVAL.str = ""
 		}
-	case 1578:
+	case 1579:
 		yyDollar = yyS[yypt-2 : yypt+1]
-//line sql.y:7767
+//line sql.y:7772
 		{
 			yyVAL.str = " lines" + yyDollar[2].str
 		}
-	case 1579:
+	case 1580:
 		yyDollar = yyS[yypt-1 : yypt+1]
-//line sql.y:7773
+//line sql.y:7778
 		{
 			yyVAL.str = yyDollar[1].str
 		}
-	case 1580:
+	case 1581:
 		yyDollar = yyS[yypt-2 : yypt+1]
-//line sql.y:7777
+//line sql.y:7782
 		{
 			yyVAL.str = yyDollar[1].str + yyDollar[2].str
 		}
-	case 1581:
+	case 1582:
 		yyDollar = yyS[yypt-3 : yypt+1]
-//line sql.y:7783
+//line sql.y:7788
 		{
 			yyVAL.str = " starting by " + encodeSQLString(yyDollar[3].str)
 		}
-	case 1582:
+	case 1583:
 		yyDollar = yyS[yypt-3 : yypt+1]
-//line sql.y:7787
+//line sql.y:7792
 		{
 			yyVAL.str = " terminated by " + encodeSQLString(yyDollar[3].str)
 		}
-	case 1583:
+	case 1584:
 		yyDollar = yyS[yypt-0 : yypt+1]
-//line sql.y:7792
+//line sql.y:7797
 		{
 			yyVAL.str = ""
 		}
-	case 1584:
+	case 1585:
 		yyDollar = yyS[yypt-2 : yypt+1]
-//line sql.y:7796
+//line sql.y:7801
 		{
 			yyVAL.str = " " + yyDollar[1].str + yyDollar[2].str
 		}
-	case 1585:
+	case 1586:
 		yyDollar = yyS[yypt-1 : yypt+1]
-//line sql.y:7802
+//line sql.y:7807
 		{
 			yyVAL.str = yyDollar[1].str
 		}
-	case 1586:
+	case 1587:
 		yyDollar = yyS[yypt-2 : yypt+1]
-//line sql.y:7806
+//line sql.y:7811
 		{
 			yyVAL.str = yyDollar[1].str + yyDollar[2].str
 		}
-	case 1587:
+	case 1588:
 		yyDollar = yyS[yypt-3 : yypt+1]
-//line sql.y:7812
+//line sql.y:7817
 		{
 			yyVAL.str = " terminated by " + encodeSQLString(yyDollar[3].str)
 		}
-	case 1588:
+	case 1589:
 		yyDollar = yyS[yypt-4 : yypt+1]
-//line sql.y:7816
+//line sql.y:7821
 		{
 			yyVAL.str = yyDollar[1].str + " enclosed by " + encodeSQLString(yyDollar[4].str)
 		}
-	case 1589:
+	case 1590:
 		yyDollar = yyS[yypt-3 : yypt+1]
-//line sql.y:7820
+//line sql.y:7825
 		{
 			yyVAL.str = " escaped by " + encodeSQLString(yyDollar[3].str)
 		}
-	case 1590:
+	case 1591:
 		yyDollar = yyS[yypt-0 : yypt+1]
-//line sql.y:7825
+//line sql.y:7830
 		{
 			yyVAL.str = ""
 		}
-	case 1591:
+	case 1592:
 		yyDollar = yyS[yypt-1 : yypt+1]
-//line sql.y:7829
+//line sql.y:7834
 		{
 			yyVAL.str = " optionally"
 		}
-	case 1592:
+	case 1593:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL *Insert
-//line sql.y:7842
+//line sql.y:7847
 		{
 			yyLOCAL = &Insert{Rows: yyDollar[2].valuesUnion(), RowAlias: yyDollar[3].rowAliasUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1593:
+	case 1594:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL *Insert
-//line sql.y:7846
+//line sql.y:7851
 		{
 			yyLOCAL = &Insert{Rows: yyDollar[1].tableStmtUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1594:
+	case 1595:
 		yyDollar = yyS[yypt-6 : yypt+1]
 		var yyLOCAL *Insert
-//line sql.y:7850
+//line sql.y:7855
 		{
 			yyLOCAL = &Insert{Columns: yyDollar[2].columnsUnion(), Rows: yyDollar[5].valuesUnion(), RowAlias: yyDollar[6].rowAliasUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1595:
+	case 1596:
 		yyDollar = yyS[yypt-5 : yypt+1]
 		var yyLOCAL *Insert
-//line sql.y:7854
+//line sql.y:7859
 		{
 			yyLOCAL = &Insert{Columns: []IdentifierCI{}, Rows: yyDollar[4].valuesUnion(), RowAlias: yyDollar[5].rowAliasUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1596:
+	case 1597:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL *Insert
-//line sql.y:7858
+//line sql.y:7863
 		{
 			yyLOCAL = &Insert{Columns: yyDollar[2].columnsUnion(), Rows: yyDollar[4].tableStmtUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1597:
+	case 1598:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL Columns
-//line sql.y:7864
+//line sql.y:7869
 		{
 			yyLOCAL = Columns{yyDollar[1].identifierCI}
 		}
 		yyVAL.union = yyLOCAL
-	case 1598:
+	case 1599:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL Columns
-//line sql.y:7868
+//line sql.y:7873
 		{
 			yyLOCAL = Columns{yyDollar[3].identifierCI}
 		}
 		yyVAL.union = yyLOCAL
-	case 1599:
+	case 1600:
 		yyDollar = yyS[yypt-3 : yypt+1]
-//line sql.y:7872
+//line sql.y:7877
 		{
 			yySLICE := (*Columns)(yyIaddr(yyVAL.union))
 			*yySLICE = append(*yySLICE, yyDollar[3].identifierCI)
 		}
-	case 1600:
+	case 1601:
 		yyDollar = yyS[yypt-5 : yypt+1]
-//line sql.y:7876
+//line sql.y:7881
 		{
 			yySLICE := (*Columns)(yyIaddr(yyVAL.union))
 			*yySLICE = append(*yySLICE, yyDollar[5].identifierCI)
 		}
-	case 1601:
+	case 1602:
 		yyDollar = yyS[yypt-0 : yypt+1]
 		var yyLOCAL *RowAlias
-//line sql.y:7881
+//line sql.y:7886
 		{
 			yyLOCAL = nil
 		}
 		yyVAL.union = yyLOCAL
-	case 1602:
+	case 1603:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL *RowAlias
-//line sql.y:7885
+//line sql.y:7890
 		{
 			yyLOCAL = &RowAlias{TableName: yyDollar[2].identifierCS}
 		}
 		yyVAL.union = yyLOCAL
-	case 1603:
+	case 1604:
 		yyDollar = yyS[yypt-5 : yypt+1]
 		var yyLOCAL *RowAlias
-//line sql.y:7889
+//line sql.y:7894
 		{
 			yyLOCAL = &RowAlias{TableName: yyDollar[2].identifierCS, Columns: yyDollar[4].columnsUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1604:
+	case 1605:
 		yyDollar = yyS[yypt-0 : yypt+1]
 		var yyLOCAL UpdateExprs
-//line sql.y:7894
+//line sql.y:7899
 		{
 			yyLOCAL = nil
 		}
 		yyVAL.union = yyLOCAL
-	case 1605:
+	case 1606:
 		yyDollar = yyS[yypt-5 : yypt+1]
 		var yyLOCAL UpdateExprs
-//line sql.y:7898
+//line sql.y:7903
 		{
 			yyLOCAL = yyDollar[5].updateExprsUnion()
 		}
 		yyVAL.union = yyLOCAL
-	case 1606:
+	case 1607:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL Values
-//line sql.y:7904
+//line sql.y:7909
 		{
 			yyLOCAL = Values{yyDollar[1].valTupleUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1607:
+	case 1608:
 		yyDollar = yyS[yypt-3 : yypt+1]
-//line sql.y:7908
+//line sql.y:7913
 		{
 			yySLICE := (*Values)(yyIaddr(yyVAL.union))
 			*yySLICE = append(*yySLICE, yyDollar[3].valTupleUnion())
 		}
-	case 1608:
+	case 1609:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL Values
-//line sql.y:7914
+//line sql.y:7919
 		{
 			yyLOCAL = Values{yyDollar[1].valTupleUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1609:
+	case 1610:
 		yyDollar = yyS[yypt-3 : yypt+1]
-//line sql.y:7918
+//line sql.y:7923
 		{
 			yySLICE := (*Values)(yyIaddr(yyVAL.union))
 			*yySLICE = append(*yySLICE, yyDollar[3].valTupleUnion())
 		}
-	case 1610:
+	case 1611:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL ValTuple
-//line sql.y:7924
+//line sql.y:7929
 		{
 			yyLOCAL = yyDollar[1].valTupleUnion()
 		}
 		yyVAL.union = yyLOCAL
-	case 1611:
+	case 1612:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL ValTuple
-//line sql.y:7928
+//line sql.y:7933
 		{
 			yyLOCAL = ValTuple{}
 		}
 		yyVAL.union = yyLOCAL
-	case 1612:
+	case 1613:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL ValTuple
-//line sql.y:7934
+//line sql.y:7939
 		{
 			yyLOCAL = yyDollar[1].valTupleUnion()
 		}
 		yyVAL.union = yyLOCAL
-	case 1613:
+	case 1614:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL ValTuple
-//line sql.y:7938
+//line sql.y:7943
 		{
 			yyLOCAL = ValTuple{}
 		}
 		yyVAL.union = yyLOCAL
-	case 1614:
+	case 1615:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL ValTuple
-//line sql.y:7944
+//line sql.y:7949
 		{
 			yyLOCAL = ValTuple(yyDollar[2].exprsUnion())
 		}
 		yyVAL.union = yyLOCAL
-	case 1615:
+	case 1616:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL ValTuple
-//line sql.y:7950
+//line sql.y:7955
 		{
 			yyLOCAL = ValTuple(yyDollar[3].exprsUnion())
 		}
 		yyVAL.union = yyLOCAL
-	case 1618:
+	case 1619:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:7960
+//line sql.y:7965
 		{
 			if len(yyDollar[1].valTupleUnion()) == 1 {
 				yyLOCAL = yyDollar[1].valTupleUnion()[0]
@@ -22357,284 +22366,278 @@ yydefault:
 			}
 		}
 		yyVAL.union = yyLOCAL
-	case 1619:
+	case 1620:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL UpdateExprs
-//line sql.y:7970
+//line sql.y:7975
 		{
 			yyLOCAL = UpdateExprs{yyDollar[1].updateExprUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1620:
+	case 1621:
 		yyDollar = yyS[yypt-3 : yypt+1]
-//line sql.y:7974
+//line sql.y:7979
 		{
 			yySLICE := (*UpdateExprs)(yyIaddr(yyVAL.union))
 			*yySLICE = append(*yySLICE, yyDollar[3].updateExprUnion())
 		}
-	case 1621:
+	case 1622:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL *UpdateExpr
-//line sql.y:7980
+//line sql.y:7985
 		{
 			yyLOCAL = &UpdateExpr{Name: yyDollar[1].colNameUnion(), Expr: yyDollar[3].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1623:
+	case 1624:
 		yyDollar = yyS[yypt-2 : yypt+1]
-//line sql.y:7987
+//line sql.y:7992
 		{
 			yyVAL.str = "charset"
 		}
-	case 1626:
+	case 1627:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:7997
+//line sql.y:8002
 		{
 			yyLOCAL = NewStrLiteral(yyDollar[1].identifierCI.String())
 		}
 		yyVAL.union = yyLOCAL
-	case 1627:
+	case 1628:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:8001
+//line sql.y:8006
 		{
 			yyLOCAL = NewStrLiteral(yyDollar[1].str)
 		}
 		yyVAL.union = yyLOCAL
-	case 1628:
+	case 1629:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:8005
+//line sql.y:8010
 		{
 			yyLOCAL = &Default{}
 		}
 		yyVAL.union = yyLOCAL
-	case 1631:
+	case 1632:
 		yyDollar = yyS[yypt-0 : yypt+1]
 		var yyLOCAL bool
-//line sql.y:8014
+//line sql.y:8019
 		{
 			yyLOCAL = false
 		}
 		yyVAL.union = yyLOCAL
-	case 1632:
+	case 1633:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL bool
-//line sql.y:8016
+//line sql.y:8021
 		{
 			yyLOCAL = true
 		}
 		yyVAL.union = yyLOCAL
-	case 1633:
+	case 1634:
 		yyDollar = yyS[yypt-0 : yypt+1]
 		var yyLOCAL bool
-//line sql.y:8019
+//line sql.y:8024
 		{
 			yyLOCAL = false
 		}
 		yyVAL.union = yyLOCAL
-	case 1634:
+	case 1635:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL bool
-//line sql.y:8021
+//line sql.y:8026
 		{
 			yyLOCAL = true
 		}
 		yyVAL.union = yyLOCAL
-	case 1635:
+	case 1636:
 		yyDollar = yyS[yypt-0 : yypt+1]
 		var yyLOCAL bool
-//line sql.y:8024
+//line sql.y:8029
 		{
 			yyLOCAL = false
 		}
 		yyVAL.union = yyLOCAL
-	case 1636:
+	case 1637:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL bool
-//line sql.y:8026
+//line sql.y:8031
 		{
 			yyLOCAL = true
 		}
 		yyVAL.union = yyLOCAL
-	case 1637:
+	case 1638:
 		yyDollar = yyS[yypt-0 : yypt+1]
 		var yyLOCAL Ignore
-//line sql.y:8029
+//line sql.y:8034
 		{
 			yyLOCAL = false
 		}
 		yyVAL.union = yyLOCAL
-	case 1638:
+	case 1639:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL Ignore
-//line sql.y:8031
+//line sql.y:8036
 		{
 			yyLOCAL = true
 		}
 		yyVAL.union = yyLOCAL
-	case 1639:
+	case 1640:
 		yyDollar = yyS[yypt-0 : yypt+1]
-//line sql.y:8034
+//line sql.y:8039
 		{
 			yyVAL.empty = struct{}{}
 		}
-	case 1640:
+	case 1641:
 		yyDollar = yyS[yypt-1 : yypt+1]
-//line sql.y:8036
+//line sql.y:8041
 		{
 			yyVAL.empty = struct{}{}
 		}
-	case 1641:
+	case 1642:
 		yyDollar = yyS[yypt-1 : yypt+1]
-//line sql.y:8038
+//line sql.y:8043
 		{
 			yyVAL.empty = struct{}{}
 		}
-	case 1642:
+	case 1643:
 		yyDollar = yyS[yypt-5 : yypt+1]
 		var yyLOCAL Statement
-//line sql.y:8042
+//line sql.y:8047
 		{
 			yyLOCAL = &CallProc{Name: yyDollar[2].tableName, Params: yyDollar[4].exprsUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1643:
+	case 1644:
 		yyDollar = yyS[yypt-0 : yypt+1]
 		var yyLOCAL Exprs
-//line sql.y:8047
+//line sql.y:8052
 		{
 			yyLOCAL = nil
 		}
 		yyVAL.union = yyLOCAL
-	case 1644:
+	case 1645:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL Exprs
-//line sql.y:8051
+//line sql.y:8056
 		{
 			yyLOCAL = yyDollar[1].exprsUnion()
 		}
 		yyVAL.union = yyLOCAL
-	case 1645:
+	case 1646:
 		yyDollar = yyS[yypt-0 : yypt+1]
 		var yyLOCAL []*IndexOption
-//line sql.y:8056
+//line sql.y:8061
 		{
 			yyLOCAL = nil
 		}
 		yyVAL.union = yyLOCAL
-	case 1646:
+	case 1647:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL []*IndexOption
-//line sql.y:8058
+//line sql.y:8063
 		{
 			yyLOCAL = []*IndexOption{yyDollar[1].indexOptionUnion()}
 		}
 		yyVAL.union = yyLOCAL
-	case 1647:
+	case 1648:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL *IndexOption
-//line sql.y:8062
+//line sql.y:8067
 		{
 			yyLOCAL = &IndexOption{Name: string(yyDollar[1].str), String: string(yyDollar[2].identifierCI.String())}
 		}
 		yyVAL.union = yyLOCAL
-	case 1648:
+	case 1649:
 		yyDollar = yyS[yypt-1 : yypt+1]
-//line sql.y:8068
+//line sql.y:8073
 		{
 			yyVAL.identifierCI = yyDollar[1].identifierCI
 		}
-	case 1649:
+	case 1650:
 		yyDollar = yyS[yypt-1 : yypt+1]
-//line sql.y:8072
+//line sql.y:8077
 		{
 			yyVAL.identifierCI = NewIdentifierCI(string(yyDollar[1].str))
 		}
-	case 1651:
+	case 1652:
 		yyDollar = yyS[yypt-1 : yypt+1]
-//line sql.y:8079
+//line sql.y:8084
 		{
 			yyVAL.identifierCI = NewIdentifierCI(string(yyDollar[1].str))
 		}
-	case 1652:
+	case 1653:
 		yyDollar = yyS[yypt-1 : yypt+1]
-//line sql.y:8085
+//line sql.y:8090
 		{
 			yyVAL.identifierCS = NewIdentifierCS(string(yyDollar[1].str))
 		}
-	case 1653:
+	case 1654:
 		yyDollar = yyS[yypt-1 : yypt+1]
-//line sql.y:8089
+//line sql.y:8094
 		{
 			yyVAL.identifierCS = NewIdentifierCS(string(yyDollar[1].str))
 		}
-	case 1654:
+	case 1655:
 		yyDollar = yyS[yypt-0 : yypt+1]
-//line sql.y:8095
+//line sql.y:8100
 		{
 			yyVAL.identifierCS = NewIdentifierCS("")
 		}
-	case 1655:
+	case 1656:
 		yyDollar = yyS[yypt-1 : yypt+1]
-//line sql.y:8099
+//line sql.y:8104
 		{
 			yyVAL.identifierCS = yyDollar[1].identifierCS
 		}
-	case 1657:
+	case 1658:
 		yyDollar = yyS[yypt-1 : yypt+1]
-//line sql.y:8106
+//line sql.y:8111
 		{
 			yyVAL.identifierCS = NewIdentifierCS(string(yyDollar[1].str))
 		}
-	case 1658:
+	case 1659:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL Statement
-//line sql.y:8112
+//line sql.y:8117
 		{
 			yyLOCAL = &Kill{Type: yyDollar[2].killTypeUnion(), ProcesslistID: convertStringToUInt64(yyDollar[3].str)}
 		}
 		yyVAL.union = yyLOCAL
-	case 1659:
+	case 1660:
 		yyDollar = yyS[yypt-0 : yypt+1]
 		var yyLOCAL KillType
-//line sql.y:8118
+//line sql.y:8123
 		{
 			yyLOCAL = ConnectionType
 		}
 		yyVAL.union = yyLOCAL
-	case 1660:
+	case 1661:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL KillType
-//line sql.y:8122
+//line sql.y:8127
 		{
 			yyLOCAL = ConnectionType
 		}
 		yyVAL.union = yyLOCAL
-	case 1661:
+	case 1662:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL KillType
-//line sql.y:8126
+//line sql.y:8131
 		{
 			yyLOCAL = QueryType
 		}
 		yyVAL.union = yyLOCAL
-	case 2297:
-		yyDollar = yyS[yypt-1 : yypt+1]
-//line sql.y:8790
-		{
-		}
 	case 2298:
 		yyDollar = yyS[yypt-1 : yypt+1]
 //line sql.y:8795
 		{
 		}
 	case 2299:
-		yyDollar = yyS[yypt-0 : yypt+1]
-//line sql.y:8799
+		yyDollar = yyS[yypt-1 : yypt+1]
+//line sql.y:8800
 		{
-			skipToEnd(yylex)
 		}
 	case 2300:
 		yyDollar = yyS[yypt-0 : yypt+1]
@@ -22643,14 +22646,20 @@ yydefault:
 			skipToEnd(yylex)
 		}
 	case 2301:
-		yyDollar = yyS[yypt-1 : yypt+1]
-//line sql.y:8808
+		yyDollar = yyS[yypt-0 : yypt+1]
+//line sql.y:8809
 		{
 			skipToEnd(yylex)
 		}
 	case 2302:
 		yyDollar = yyS[yypt-1 : yypt+1]
-//line sql.y:8812
+//line sql.y:8813
+		{
+			skipToEnd(yylex)
+		}
+	case 2303:
+		yyDollar = yyS[yypt-1 : yypt+1]
+//line sql.y:8817
 		{
 			skipToEnd(yylex)
 		}
diff --git a/go/vt/sqlparser/sql.y b/go/vt/sqlparser/sql.y
index 772be1e75ec..f1663a9a41c 100644
--- a/go/vt/sqlparser/sql.y
+++ b/go/vt/sqlparser/sql.y
@@ -1636,6 +1636,11 @@ generated_column_attribute_list_opt:
     $1.KeyOpt = $2
     $$ = $1
   }
+| generated_column_attribute_list_opt SRID INTEGRAL
+  {
+    $1.SRID = NewIntLiteral($3)
+    $$ = $1
+  }
 | generated_column_attribute_list_opt VISIBLE
   {
     $1.Invisible = ptr.Of(false)

From 3c4a4ceb99c4e6936bb3c2bb6e4d4bae9481fd4a Mon Sep 17 00:00:00 2001
From: Chaitanya Rangavajhala <crangavajha1@bloomberg.net>
Date: Mon, 3 Feb 2025 10:19:04 -0500
Subject: [PATCH 18/68] vtadmin: enable sorting in all tables (#17468)

Signed-off-by: c-r-dev <crangavajha1@bloomberg.net>
Signed-off-by: Frances Thai <notfelineit@gmail.com>
Co-authored-by: Frances Thai <notfelineit@gmail.com>
---
 .../dataTable/SortedDataTable.test.tsx        |  60 +++++++
 .../components/dataTable/SortedDataTable.tsx  | 170 ++++++++++++++++++
 web/vtadmin/src/components/routes/Schemas.tsx |  72 +++++---
 3 files changed, 273 insertions(+), 29 deletions(-)
 create mode 100755 web/vtadmin/src/components/dataTable/SortedDataTable.test.tsx
 create mode 100644 web/vtadmin/src/components/dataTable/SortedDataTable.tsx

diff --git a/web/vtadmin/src/components/dataTable/SortedDataTable.test.tsx b/web/vtadmin/src/components/dataTable/SortedDataTable.test.tsx
new file mode 100755
index 00000000000..554a7e2040d
--- /dev/null
+++ b/web/vtadmin/src/components/dataTable/SortedDataTable.test.tsx
@@ -0,0 +1,60 @@
+/**
+ * Copyright 2025 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.
+ */
+
+import { describe, expect, it } from 'vitest';
+import { JSX } from 'react/jsx-runtime';
+import { SortedDataTable } from './SortedDataTable';
+import { fireEvent, render, screen } from '@testing-library/react';
+import { MemoryRouter } from 'react-router-dom';
+
+describe('SortedDataTable', () => {
+    it('SortedDataTable renders successfully', () => {
+        const columnProps = [
+            { display: 'col1', accessor: 'col1' },
+            { display: <div>col2</div>, accessor: 'a_col2' },
+        ];
+        const testData = [
+            { col1: 'dcol1', a_col2: '20' },
+            { col1: 'dcol11', a_col2: '10' },
+        ];
+
+        render(
+            <MemoryRouter initialEntries={[{ pathname: '/schemas', totalPages: 10, pageQueryKey: 'page' }]}>
+                <SortedDataTable
+                    columns={columnProps}
+                    data={testData}
+                    renderRows={function (rows: any[]): JSX.Element[] {
+                        return rows.map((item, idx) => {
+                            return (
+                                <tr key={idx}>
+                                    <td> {item.col1} </td> <td> {item.col2} </td>
+                                </tr>
+                            );
+                        });
+                    }}
+                />
+            </MemoryRouter>
+        );
+        expect(screen.getAllByRole('table').length).toBe(1);
+        expect(screen.getAllByRole('row').length).toBe(3);
+        expect(screen.getAllByRole('columnheader').length).toBe(2);
+
+        // Check onClick on column
+        const column1 = screen.getByText('col1');
+        fireEvent.click(column1);
+        // dependency on vite-jest to check useState sortColumn if col1 gets set.
+    });
+});
diff --git a/web/vtadmin/src/components/dataTable/SortedDataTable.tsx b/web/vtadmin/src/components/dataTable/SortedDataTable.tsx
new file mode 100644
index 00000000000..a8766aa9ee3
--- /dev/null
+++ b/web/vtadmin/src/components/dataTable/SortedDataTable.tsx
@@ -0,0 +1,170 @@
+/**
+ * Copyright 2025 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.
+ */
+import * as React from 'react';
+import { useLocation } from 'react-router-dom';
+
+import { useURLPagination } from '../../hooks/useURLPagination';
+import { useURLQuery } from '../../hooks/useURLQuery';
+import { stringify } from '../../util/queryString';
+import { PaginationNav } from './PaginationNav';
+import { useCallback, useMemo, useState } from 'react';
+import { Icon, Icons } from '../Icon';
+
+export interface ColumnProps {
+    // Coulmn display name string | JSX.Element
+    display: string | JSX.Element;
+    // Column data accessor
+    accessor: string;
+}
+
+interface Props<T> {
+    // When passing a JSX.Element, note that the column element
+    // will be rendered *inside* a <th> tag. (Note: I don't love this
+    // abstraction + we'll likely want to revisit this when we add
+    // table sorting.)
+    columns: Array<ColumnProps>;
+    data: T[];
+    pageSize?: number;
+    renderRows: (rows: T[]) => JSX.Element[];
+    title?: string;
+    // Pass a unique `pageKey` for each DataTable, in case multiple
+    // DataTables access the same URL. This will be used to
+    // access page number from the URL.
+    pageKey?: string;
+}
+
+type SortOrder = 'asc' | 'desc';
+
+// Generally, page sizes of ~100 rows are fine in terms of performance,
+// but anything over ~50 feels unwieldy in terms of UX.
+const DEFAULT_PAGE_SIZE = 50;
+
+export const SortedDataTable = <T extends object>({
+    columns,
+    data,
+    pageSize = DEFAULT_PAGE_SIZE,
+    renderRows,
+    title,
+    pageKey = '',
+}: Props<T>) => {
+    const { pathname } = useLocation();
+    const urlQuery = useURLQuery();
+
+    const pageQueryKey = `${pageKey}page`;
+
+    const totalPages = Math.ceil(data.length / pageSize);
+    const { page } = useURLPagination({ totalPages, pageQueryKey });
+
+    const startIndex = (page - 1) * pageSize;
+    const endIndex = startIndex + pageSize;
+
+    const startRow = startIndex + 1;
+    const lastRow = Math.min(data.length, startIndex + pageSize);
+
+    const formatPageLink = (p: number) => ({
+        pathname,
+        search: stringify({ ...urlQuery.query, [pageQueryKey]: p === 1 ? undefined : p }),
+    });
+
+    const [sortColumn, setSortColumn] = useState<null | string>(null);
+    const [sortOrder, setSortOrder] = useState<SortOrder>('asc');
+
+    const handleSort = useCallback(
+        (column: any) => {
+            if (sortColumn === column) {
+                setSortOrder(sortOrder === 'asc' ? 'desc' : 'asc');
+            } else {
+                setSortColumn(column);
+                setSortOrder('asc');
+            }
+        },
+        [sortColumn, sortOrder]
+    );
+
+    const sortedData = useMemo(() => {
+        if (!sortColumn) return data;
+
+        const compare = (a: { [x: string]: any }, b: { [x: string]: any }) => {
+            const valueA = a[sortColumn];
+            const valueB = b[sortColumn];
+
+            if (valueA < valueB) {
+                return sortOrder === 'asc' ? -1 : 1;
+            } else if (valueA > valueB) {
+                return sortOrder === 'asc' ? 1 : -1;
+            } else {
+                return 0;
+            }
+        };
+
+        return [...data].sort(compare);
+    }, [data, sortColumn, sortOrder]);
+
+    const dataPage = sortedData.slice(startIndex, endIndex);
+
+    return (
+        <div>
+            <table className="table-fixed">
+                {title && <caption>{title}</caption>}
+                <thead>
+                    <tr>
+                        {columns.map((col, cdx) => (
+                            <SortTableHeader
+                                col={col}
+                                cdx={cdx}
+                                sortColumn={sortColumn}
+                                sortOrder={sortOrder}
+                                handleSort={handleSort}
+                            ></SortTableHeader>
+                        ))}
+                    </tr>
+                </thead>
+                <tbody>{renderRows(dataPage)}</tbody>
+            </table>
+
+            <PaginationNav currentPage={page} formatLink={formatPageLink} totalPages={totalPages} />
+            {!!data.length && (
+                <p className="text-secondary">
+                    Showing {startRow} {lastRow > startRow ? `- ${lastRow}` : null} of {data.length}
+                </p>
+            )}
+        </div>
+    );
+};
+
+type SortTableHeaderProps = {
+    col: ColumnProps;
+    cdx: number;
+    sortOrder: SortOrder;
+    sortColumn: null | string;
+    handleSort: (column: any) => void;
+};
+
+const SortTableHeader: React.FC<SortTableHeaderProps> = ({ col, cdx, sortOrder, sortColumn, handleSort }) => {
+    const upFillColor = sortOrder === 'asc' && sortColumn === col.accessor ? 'fill-current' : 'fill-gray-300';
+    const downFillColor = sortOrder !== 'asc' && sortColumn === col.accessor ? 'fill-current' : 'fill-gray-300';
+    return (
+        <th key={cdx} onClick={() => handleSort(col.accessor)}>
+            <div className="flex cursor-pointer items-center">
+                <div className="mr-1">{col.display}</div>
+                <div>
+                    <Icon className={`${upFillColor} -mb-1`} icon={Icons.chevronUp} />
+                    <Icon className={`${downFillColor} -mt-1`} icon={Icons.chevronDown} />
+                </div>
+            </div>
+        </th>
+    );
+};
diff --git a/web/vtadmin/src/components/routes/Schemas.tsx b/web/vtadmin/src/components/routes/Schemas.tsx
index fff3bb8b2db..5da3870efbc 100644
--- a/web/vtadmin/src/components/routes/Schemas.tsx
+++ b/web/vtadmin/src/components/routes/Schemas.tsx
@@ -25,7 +25,7 @@ import { formatBytes } from '../../util/formatBytes';
 import { getTableDefinitions } from '../../util/tableDefinitions';
 import { DataCell } from '../dataTable/DataCell';
 import { DataFilter } from '../dataTable/DataFilter';
-import { DataTable } from '../dataTable/DataTable';
+import { ColumnProps, SortedDataTable } from '../dataTable/SortedDataTable';
 import { ContentContainer } from '../layout/ContentContainer';
 import { WorkspaceHeader } from '../layout/WorkspaceHeader';
 import { WorkspaceTitle } from '../layout/WorkspaceTitle';
@@ -33,31 +33,43 @@ import { KeyspaceLink } from '../links/KeyspaceLink';
 import { QueryLoadingPlaceholder } from '../placeholders/QueryLoadingPlaceholder';
 import { HelpTooltip } from '../tooltip/HelpTooltip';
 
-const TABLE_COLUMNS = [
-    'Keyspace',
-    'Table',
-    <div className="text-right">
-        Approx. Size{' '}
-        <HelpTooltip
-            text={
-                <span>
-                    Size is an approximate value derived from <span className="font-mono">INFORMATION_SCHEMA</span>.
-                </span>
-            }
-        />
-    </div>,
-    <div className="text-right">
-        Approx. Rows{' '}
-        <HelpTooltip
-            text={
-                // c.f. https://dev.mysql.com/doc/refman/5.7/en/information-schema-tables-table.html
-                <span>
-                    Row count is an approximate value derived from <span className="font-mono">INFORMATION_SCHEMA</span>
-                    . Actual values may vary by as much as 40% to 50%.
-                </span>
-            }
-        />
-    </div>,
+const TABLE_COLUMNS: Array<ColumnProps> = [
+    { display: 'Keyspace', accessor: 'keyspace' },
+    { display: 'Table', accessor: 'table' },
+    {
+        display: (
+            <div className="text-left">
+                Approx. Size{' '}
+                <HelpTooltip
+                    text={
+                        <span>
+                            Size is an approximate value derived from{' '}
+                            <span className="font-mono">INFORMATION_SCHEMA</span>.
+                        </span>
+                    }
+                />
+            </div>
+        ),
+        accessor: '_tableSize',
+    },
+    {
+        display: (
+            <div className="text-left">
+                Approx. Rows{' '}
+                <HelpTooltip
+                    text={
+                        // c.f. https://dev.mysql.com/doc/refman/5.7/en/information-schema-tables-table.html
+                        <span>
+                            Row count is an approximate value derived from{' '}
+                            <span className="font-mono">INFORMATION_SCHEMA</span>. Actual values may vary by as much as
+                            40% to 50%.
+                        </span>
+                    }
+                />
+            </div>
+        ),
+        accessor: '_tableRowCount',
+    },
 ];
 
 export const Schemas = () => {
@@ -74,6 +86,8 @@ export const Schemas = () => {
             clusterID: d.cluster?.id,
             keyspace: d.keyspace,
             table: d.tableDefinition?.name,
+            _tableSize: d.tableSize?.data_length || 0,
+            _tableRowCount: d.tableSize?.row_count || 0,
             _raw: d,
         }));
 
@@ -96,13 +110,13 @@ export const Schemas = () => {
                         </KeyspaceLink>
                     </DataCell>
                     <DataCell className="font-bold">{href ? <Link to={href}>{row.table}</Link> : row.table}</DataCell>
-                    <DataCell className="text-right">
+                    <DataCell className="text-left">
                         <div>{formatBytes(row._raw.tableSize?.data_length)}</div>
                         <div className="text-sm text-secondary">
                             {formatBytes(row._raw.tableSize?.data_length, 'B')}
                         </div>
                     </DataCell>
-                    <DataCell className="text-right">{(row._raw.tableSize?.row_count || 0).toLocaleString()}</DataCell>
+                    <DataCell className="text-left">{(row._raw.tableSize?.row_count || 0).toLocaleString()}</DataCell>
                 </tr>
             );
         });
@@ -120,7 +134,7 @@ export const Schemas = () => {
                     placeholder="Filter schemas"
                     value={filter || ''}
                 />
-                <DataTable columns={TABLE_COLUMNS} data={filteredData} renderRows={renderRows} />
+                <SortedDataTable columns={TABLE_COLUMNS} data={filteredData} renderRows={renderRows} />
                 <QueryLoadingPlaceholder query={schemasQuery} />
             </ContentContainer>
         </div>

From 30c09f56beeb055d43eb2c9c70a13cf7b65f71ef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vicent=20Mart=C3=AD?= <42793+vmg@users.noreply.github.com>
Date: Mon, 3 Feb 2025 17:34:11 +0100
Subject: [PATCH 19/68] smartconnpool: do not allow connections to starve
 (#17675)

Signed-off-by: Vicent Marti <vmg@strn.cat>
Signed-off-by: Dirkjan Bussink <d.bussink@gmail.com>
Co-authored-by: Mohamed Hamza <mhamza15@github.com>
Co-authored-by: Dirkjan Bussink <d.bussink@gmail.com>
---
 go/pools/smartconnpool/pool.go      | 57 +++++++++++++++---------
 go/pools/smartconnpool/pool_test.go | 69 +++++++++++++++++++++++++++++
 go/pools/smartconnpool/waitlist.go  |  6 ++-
 3 files changed, 111 insertions(+), 21 deletions(-)

diff --git a/go/pools/smartconnpool/pool.go b/go/pools/smartconnpool/pool.go
index b024cc656df..52346adb1a4 100644
--- a/go/pools/smartconnpool/pool.go
+++ b/go/pools/smartconnpool/pool.go
@@ -161,7 +161,6 @@ type ConnPool[C Connection] struct {
 // The pool must be ConnPool.Open before it can start giving out connections
 func NewPool[C Connection](config *Config[C]) *ConnPool[C] {
 	pool := &ConnPool[C]{}
-	pool.freshSettingsStack.Store(-1)
 	pool.config.maxCapacity = config.Capacity
 	pool.config.maxIdleCount = config.MaxIdleCount
 	pool.config.maxLifetime.Store(config.MaxLifetime.Nanoseconds())
@@ -202,8 +201,14 @@ func (pool *ConnPool[C]) open() {
 
 	// The expire worker takes care of removing from the waiter list any clients whose
 	// context has been cancelled.
-	pool.runWorker(pool.close, 1*time.Second, func(_ time.Time) bool {
-		pool.wait.expire(false)
+	pool.runWorker(pool.close, 100*time.Millisecond, func(_ time.Time) bool {
+		maybeStarving := pool.wait.expire(false)
+
+		// Do not allow connections to starve; if there's waiters in the queue
+		// and connections in the stack, it means we could be starving them.
+		// Try getting out a connection and handing it over directly
+		for n := 0; n < maybeStarving && pool.tryReturnAnyConn(); n++ {
+		}
 		return true
 	})
 
@@ -416,20 +421,37 @@ func (pool *ConnPool[C]) put(conn *Pooled[C]) {
 		}
 	}
 
-	if !pool.wait.tryReturnConn(conn) {
-		if pool.closeOnIdleLimitReached(conn) {
-			return
-		}
+	pool.tryReturnConn(conn)
+}
+
+func (pool *ConnPool[C]) tryReturnConn(conn *Pooled[C]) bool {
+	if pool.wait.tryReturnConn(conn) {
+		return true
+	}
+	if pool.closeOnIdleLimitReached(conn) {
+		return false
+	}
+	connSetting := conn.Conn.Setting()
+	if connSetting == nil {
+		pool.clean.Push(conn)
+	} else {
+		stack := connSetting.bucket & stackMask
+		pool.settings[stack].Push(conn)
+		pool.freshSettingsStack.Store(int64(stack))
+	}
+	return false
+}
 
-		connSetting := conn.Conn.Setting()
-		if connSetting == nil {
-			pool.clean.Push(conn)
-		} else {
-			stack := connSetting.bucket & stackMask
-			pool.settings[stack].Push(conn)
-			pool.freshSettingsStack.Store(int64(stack))
+func (pool *ConnPool[C]) tryReturnAnyConn() bool {
+	if conn, ok := pool.clean.Pop(); ok {
+		return pool.tryReturnConn(conn)
+	}
+	for u := 0; u <= stackMask; u++ {
+		if conn, ok := pool.settings[u].Pop(); ok {
+			return pool.tryReturnConn(conn)
 		}
 	}
+	return false
 }
 
 // closeOnIdleLimitReached closes a connection if the number of idle connections (active - inuse) in the pool
@@ -484,14 +506,9 @@ func (pool *ConnPool[C]) connNew(ctx context.Context) (*Pooled[C], error) {
 }
 
 func (pool *ConnPool[C]) getFromSettingsStack(setting *Setting) *Pooled[C] {
-	fresh := pool.freshSettingsStack.Load()
-	if fresh < 0 {
-		return nil
-	}
-
 	var start uint32
 	if setting == nil {
-		start = uint32(fresh)
+		start = uint32(pool.freshSettingsStack.Load())
 	} else {
 		start = setting.bucket
 	}
diff --git a/go/pools/smartconnpool/pool_test.go b/go/pools/smartconnpool/pool_test.go
index 44bd431d189..2ac3d1b00e3 100644
--- a/go/pools/smartconnpool/pool_test.go
+++ b/go/pools/smartconnpool/pool_test.go
@@ -20,6 +20,7 @@ import (
 	"context"
 	"fmt"
 	"reflect"
+	"sync"
 	"sync/atomic"
 	"testing"
 	"time"
@@ -36,6 +37,7 @@ var (
 type TestState struct {
 	lastID, open, close, reset atomic.Int64
 	waits                      []time.Time
+	mu                         sync.Mutex
 
 	chaos struct {
 		delayConnect time.Duration
@@ -45,6 +47,8 @@ type TestState struct {
 }
 
 func (ts *TestState) LogWait(start time.Time) {
+	ts.mu.Lock()
+	defer ts.mu.Unlock()
 	ts.waits = append(ts.waits, start)
 }
 
@@ -1125,3 +1129,68 @@ func TestApplySettingsFailure(t *testing.T) {
 		p.put(r)
 	}
 }
+
+func TestGetSpike(t *testing.T) {
+	var state TestState
+
+	ctx := context.Background()
+	p := NewPool(&Config[*TestConn]{
+		Capacity:    5,
+		IdleTimeout: time.Second,
+		LogWait:     state.LogWait,
+	}).Open(newConnector(&state), nil)
+
+	var resources [10]*Pooled[*TestConn]
+
+	// Ensure we have a pool with 5 available resources
+	for i := 0; i < 5; i++ {
+		r, err := p.Get(ctx, nil)
+
+		require.NoError(t, err)
+		resources[i] = r
+		assert.EqualValues(t, 5-i-1, p.Available())
+		assert.Zero(t, p.Metrics.WaitCount())
+		assert.Zero(t, len(state.waits))
+		assert.Zero(t, p.Metrics.WaitTime())
+		assert.EqualValues(t, i+1, state.lastID.Load())
+		assert.EqualValues(t, i+1, state.open.Load())
+	}
+
+	for i := 0; i < 5; i++ {
+		p.put(resources[i])
+	}
+
+	assert.EqualValues(t, 5, p.Available())
+	assert.EqualValues(t, 5, p.Active())
+	assert.EqualValues(t, 0, p.InUse())
+
+	for i := 0; i < 2000; i++ {
+		wg := sync.WaitGroup{}
+
+		ctx, cancel := context.WithTimeout(context.Background(), time.Second)
+		defer cancel()
+
+		errs := make(chan error, 80)
+
+		for j := 0; j < 80; j++ {
+			wg.Add(1)
+
+			go func() {
+				defer wg.Done()
+				r, err := p.Get(ctx, nil)
+				defer p.put(r)
+
+				if err != nil {
+					errs <- err
+				}
+			}()
+		}
+		wg.Wait()
+
+		if len(errs) > 0 {
+			t.Errorf("Error getting connection: %v", <-errs)
+		}
+
+		close(errs)
+	}
+}
diff --git a/go/pools/smartconnpool/waitlist.go b/go/pools/smartconnpool/waitlist.go
index f16215f4b14..ef1eb1fe997 100644
--- a/go/pools/smartconnpool/waitlist.go
+++ b/go/pools/smartconnpool/waitlist.go
@@ -76,7 +76,7 @@ func (wl *waitlist[C]) waitForConn(ctx context.Context, setting *Setting) (*Pool
 
 // expire removes and wakes any expired waiter in the waitlist.
 // if force is true, it'll wake and remove all the waiters.
-func (wl *waitlist[C]) expire(force bool) {
+func (wl *waitlist[C]) expire(force bool) (maybeStarving int) {
 	if wl.list.Len() == 0 {
 		return
 	}
@@ -91,6 +91,9 @@ func (wl *waitlist[C]) expire(force bool) {
 			expired = append(expired, e)
 			continue
 		}
+		if e.Value.age == 0 {
+			maybeStarving++
+		}
 	}
 	// remove the expired waiters from the waitlist after traversing it
 	for _, e := range expired {
@@ -102,6 +105,7 @@ func (wl *waitlist[C]) expire(force bool) {
 	for _, e := range expired {
 		e.Value.sema.notify(false)
 	}
+	return
 }
 
 // tryReturnConn tries handing over a connection to one of the waiters in the pool.

From bd342dd7a1c2963de625c14a85eee40a8140c282 Mon Sep 17 00:00:00 2001
From: Noble Mittal <62551163+beingnoble03@users.noreply.github.com>
Date: Tue, 4 Feb 2025 15:38:53 +0530
Subject: [PATCH 20/68] test: Add more unit tests for `server.go` (#17679)

Signed-off-by: Noble Mittal <noblemittal@outlook.com>
---
 go/vt/vtctl/workflow/framework_test.go |  47 ++++-
 go/vt/vtctl/workflow/server_test.go    | 272 +++++++++++++++++++++++++
 2 files changed, 318 insertions(+), 1 deletion(-)

diff --git a/go/vt/vtctl/workflow/framework_test.go b/go/vt/vtctl/workflow/framework_test.go
index fad48e31e0c..0575965c433 100644
--- a/go/vt/vtctl/workflow/framework_test.go
+++ b/go/vt/vtctl/workflow/framework_test.go
@@ -272,13 +272,15 @@ type testTMClient struct {
 	createVReplicationWorkflowRequests map[uint32]*createVReplicationWorkflowRequestResponse
 	readVReplicationWorkflowRequests   map[uint32]*readVReplicationWorkflowRequestResponse
 	updateVReplicationWorklowsRequests map[uint32]*tabletmanagerdatapb.UpdateVReplicationWorkflowsRequest
+	updateVReplicationWorklowRequests  map[uint32]*updateVReplicationWorkflowRequestResponse
 	applySchemaRequests                map[uint32][]*applySchemaRequestResponse
 	primaryPositions                   map[uint32]string
 	vdiffRequests                      map[uint32]*vdiffRequestResponse
 	refreshStateErrors                 map[uint32]error
 
 	// Stack of ReadVReplicationWorkflowsResponse to return, in order, for each shard
-	readVReplicationWorkflowsResponses map[string][]*tabletmanagerdatapb.ReadVReplicationWorkflowsResponse
+	readVReplicationWorkflowsResponses       map[string][]*tabletmanagerdatapb.ReadVReplicationWorkflowsResponse
+	validateVReplicationPermissionsResponses map[uint32]*validateVReplicationPermissionsResponse
 
 	env     *testEnv    // For access to the env config from tmc methods.
 	reverse atomic.Bool // Are we reversing traffic?
@@ -296,6 +298,7 @@ func newTestTMClient(env *testEnv) *testTMClient {
 		createVReplicationWorkflowRequests: make(map[uint32]*createVReplicationWorkflowRequestResponse),
 		readVReplicationWorkflowRequests:   make(map[uint32]*readVReplicationWorkflowRequestResponse),
 		updateVReplicationWorklowsRequests: make(map[uint32]*tabletmanagerdatapb.UpdateVReplicationWorkflowsRequest),
+		updateVReplicationWorklowRequests:  make(map[uint32]*updateVReplicationWorkflowRequestResponse),
 		applySchemaRequests:                make(map[uint32][]*applySchemaRequestResponse),
 		readVReplicationWorkflowsResponses: make(map[string][]*tabletmanagerdatapb.ReadVReplicationWorkflowsResponse),
 		primaryPositions:                   make(map[uint32]string),
@@ -519,6 +522,17 @@ func (tmc *testTMClient) expectApplySchemaRequest(tabletID uint32, req *applySch
 	tmc.applySchemaRequests[tabletID] = append(tmc.applySchemaRequests[tabletID], req)
 }
 
+func (tmc *testTMClient) expectValidateVReplicationPermissionsResponse(tabletID uint32, req *validateVReplicationPermissionsResponse) {
+	tmc.mu.Lock()
+	defer tmc.mu.Unlock()
+
+	if tmc.validateVReplicationPermissionsResponses == nil {
+		tmc.validateVReplicationPermissionsResponses = make(map[uint32]*validateVReplicationPermissionsResponse)
+	}
+
+	tmc.validateVReplicationPermissionsResponses[tabletID] = req
+}
+
 // Note: ONLY breaks up change.SQL into individual statements and executes it. Does NOT fully implement ApplySchema.
 func (tmc *testTMClient) ApplySchema(ctx context.Context, tablet *topodatapb.Tablet, change *tmutils.SchemaChange) (*tabletmanagerdatapb.SchemaChangeResult, error) {
 	tmc.mu.Lock()
@@ -578,6 +592,17 @@ type applySchemaRequestResponse struct {
 	err    error
 }
 
+type updateVReplicationWorkflowRequestResponse struct {
+	req *tabletmanagerdatapb.UpdateVReplicationWorkflowRequest
+	res *tabletmanagerdatapb.UpdateVReplicationWorkflowResponse
+	err error
+}
+
+type validateVReplicationPermissionsResponse struct {
+	res *tabletmanagerdatapb.ValidateVReplicationPermissionsResponse
+	err error
+}
+
 func (tmc *testTMClient) expectVDiffRequest(tablet *topodatapb.Tablet, vrr *vdiffRequestResponse) {
 	tmc.mu.Lock()
 	defer tmc.mu.Unlock()
@@ -692,6 +717,15 @@ func (tmc *testTMClient) ReadVReplicationWorkflows(ctx context.Context, tablet *
 }
 
 func (tmc *testTMClient) UpdateVReplicationWorkflow(ctx context.Context, tablet *topodatapb.Tablet, req *tabletmanagerdatapb.UpdateVReplicationWorkflowRequest) (*tabletmanagerdatapb.UpdateVReplicationWorkflowResponse, error) {
+	tmc.mu.Lock()
+	defer tmc.mu.Unlock()
+	if expect := tmc.updateVReplicationWorklowRequests[tablet.Alias.Uid]; expect != nil {
+		if !proto.Equal(expect.req, req) {
+			return nil, vterrors.Errorf(vtrpcpb.Code_INVALID_ARGUMENT, "unexpected ReadVReplicationWorkflow request on tablet %s: got %+v, want %+v",
+				topoproto.TabletAliasString(tablet.Alias), req, expect)
+		}
+		return expect.res, expect.err
+	}
 	return &tabletmanagerdatapb.UpdateVReplicationWorkflowResponse{
 		Result: &querypb.QueryResult{
 			RowsAffected: 1,
@@ -713,6 +747,11 @@ func (tmc *testTMClient) UpdateVReplicationWorkflows(ctx context.Context, tablet
 }
 
 func (tmc *testTMClient) ValidateVReplicationPermissions(ctx context.Context, tablet *topodatapb.Tablet, req *tabletmanagerdatapb.ValidateVReplicationPermissionsRequest) (*tabletmanagerdatapb.ValidateVReplicationPermissionsResponse, error) {
+	tmc.mu.Lock()
+	defer tmc.mu.Unlock()
+	if resp, ok := tmc.validateVReplicationPermissionsResponses[tablet.Alias.Uid]; ok {
+		return resp.res, resp.err
+	}
 	return &tabletmanagerdatapb.ValidateVReplicationPermissionsResponse{
 		User: "vt_filtered",
 		Ok:   true,
@@ -777,6 +816,12 @@ func (tmc *testTMClient) AddUpdateVReplicationRequests(tabletUID uint32, req *ta
 	tmc.updateVReplicationWorklowsRequests[tabletUID] = req
 }
 
+func (tmc *testTMClient) AddUpdateVReplicationWorkflowRequestResponse(tabletUID uint32, reqres *updateVReplicationWorkflowRequestResponse) {
+	tmc.mu.Lock()
+	defer tmc.mu.Unlock()
+	tmc.updateVReplicationWorklowRequests[tabletUID] = reqres
+}
+
 func (tmc *testTMClient) getVReplicationWorkflowsResponse(key string) *tabletmanagerdatapb.ReadVReplicationWorkflowsResponse {
 	if len(tmc.readVReplicationWorkflowsResponses) == 0 {
 		return nil
diff --git a/go/vt/vtctl/workflow/server_test.go b/go/vt/vtctl/workflow/server_test.go
index 4676b732245..99e8e657cc7 100644
--- a/go/vt/vtctl/workflow/server_test.go
+++ b/go/vt/vtctl/workflow/server_test.go
@@ -29,6 +29,8 @@ import (
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
+	"google.golang.org/grpc/codes"
+	"google.golang.org/grpc/status"
 	"google.golang.org/protobuf/encoding/prototext"
 
 	"vitess.io/vitess/go/sqltypes"
@@ -2397,3 +2399,273 @@ func TestCopySchemaShard(t *testing.T) {
 	assert.NoError(t, err)
 	assert.Empty(t, te.tmc.applySchemaRequests[200])
 }
+
+func TestValidateShardsHaveVReplicationPermissions(t *testing.T) {
+	ctx := context.Background()
+
+	sourceKeyspace := &testKeyspace{"source_keyspace", []string{"-"}}
+	targetKeyspace := &testKeyspace{"target_keyspace", []string{"-80", "80-"}}
+
+	te := newTestEnv(t, ctx, defaultCellName, sourceKeyspace, targetKeyspace)
+	defer te.close()
+
+	si1, err := te.ts.GetShard(ctx, targetKeyspace.KeyspaceName, targetKeyspace.ShardNames[0])
+	require.NoError(t, err)
+	si2, err := te.ts.GetShard(ctx, targetKeyspace.KeyspaceName, targetKeyspace.ShardNames[1])
+	require.NoError(t, err)
+
+	testcases := []struct {
+		name                string
+		response            *validateVReplicationPermissionsResponse
+		expectedErrContains string
+	}{
+		{
+			// Expect no error in this case.
+			name: "unimplemented error",
+			response: &validateVReplicationPermissionsResponse{
+				err: status.Error(codes.Unimplemented, "unimplemented test"),
+			},
+		},
+		{
+			name: "tmc error",
+			response: &validateVReplicationPermissionsResponse{
+				err: fmt.Errorf("tmc throws error"),
+			},
+			expectedErrContains: "tmc throws error",
+		},
+		{
+			name: "no permissions",
+			response: &validateVReplicationPermissionsResponse{
+				res: &tabletmanagerdatapb.ValidateVReplicationPermissionsResponse{
+					User: "vt_test_user",
+					Ok:   false,
+				},
+			},
+			expectedErrContains: "vt_test_user does not have the required set of permissions",
+		},
+		{
+			name: "success",
+			response: &validateVReplicationPermissionsResponse{
+				res: &tabletmanagerdatapb.ValidateVReplicationPermissionsResponse{
+					User: "vt_filtered",
+					Ok:   true,
+				},
+			},
+		},
+	}
+
+	for _, tc := range testcases {
+		t.Run(tc.name, func(t *testing.T) {
+			te.tmc.expectValidateVReplicationPermissionsResponse(200, tc.response)
+			te.tmc.expectValidateVReplicationPermissionsResponse(210, tc.response)
+			err = te.ws.validateShardsHaveVReplicationPermissions(ctx, targetKeyspace.KeyspaceName, []*topo.ShardInfo{si1, si2})
+			if tc.expectedErrContains == "" {
+				assert.NoError(t, err)
+				return
+			}
+			assert.ErrorContains(t, err, tc.expectedErrContains)
+		})
+	}
+}
+
+func TestWorkflowUpdate(t *testing.T) {
+	ctx := context.Background()
+
+	sourceKeyspace := &testKeyspace{"source_keyspace", []string{"-"}}
+	targetKeyspace := &testKeyspace{"target_keyspace", []string{"-80", "80-"}}
+
+	te := newTestEnv(t, ctx, defaultCellName, sourceKeyspace, targetKeyspace)
+	defer te.close()
+
+	req := &vtctldatapb.WorkflowUpdateRequest{
+		Keyspace: targetKeyspace.KeyspaceName,
+		TabletRequest: &tabletmanagerdatapb.UpdateVReplicationWorkflowRequest{
+			Workflow: "wf1",
+			State:    binlogdatapb.VReplicationWorkflowState_Running.Enum(),
+		},
+	}
+
+	testcases := []struct {
+		name     string
+		response map[uint32]*tabletmanagerdatapb.UpdateVReplicationWorkflowResponse
+		err      map[uint32]error
+
+		// Match the tablet `changed` field from response.
+		expectedResponse    map[uint32]bool
+		expectedErrContains string
+	}{
+		{
+			name: "one tablet stream changed",
+			response: map[uint32]*tabletmanagerdatapb.UpdateVReplicationWorkflowResponse{
+				200: {
+					Result: &querypb.QueryResult{
+						RowsAffected: 1,
+					},
+				},
+				210: {
+					Result: &querypb.QueryResult{
+						RowsAffected: 0,
+					},
+				},
+			},
+			expectedResponse: map[uint32]bool{
+				200: true,
+				210: false,
+			},
+		},
+		{
+			name: "two tablet stream changed",
+			response: map[uint32]*tabletmanagerdatapb.UpdateVReplicationWorkflowResponse{
+				200: {
+					Result: &querypb.QueryResult{
+						RowsAffected: 1,
+					},
+				},
+				210: {
+					Result: &querypb.QueryResult{
+						RowsAffected: 2,
+					},
+				},
+			},
+			expectedResponse: map[uint32]bool{
+				200: true,
+				210: true,
+			},
+		},
+		{
+			name: "tablet throws error",
+			err: map[uint32]error{
+				200: fmt.Errorf("test error from 200"),
+			},
+			expectedErrContains: "test error from 200",
+		},
+	}
+
+	for _, tc := range testcases {
+		t.Run(tc.name, func(t *testing.T) {
+			// Add responses
+			for tabletID, resp := range tc.response {
+				te.tmc.AddUpdateVReplicationWorkflowRequestResponse(tabletID, &updateVReplicationWorkflowRequestResponse{
+					req: req.TabletRequest,
+					res: resp,
+				})
+			}
+			// Add errors
+			for tabletID, err := range tc.err {
+				te.tmc.AddUpdateVReplicationWorkflowRequestResponse(tabletID, &updateVReplicationWorkflowRequestResponse{
+					req: req.TabletRequest,
+					err: err,
+				})
+			}
+
+			res, err := te.ws.WorkflowUpdate(ctx, req)
+			if tc.expectedErrContains != "" {
+				assert.ErrorContains(t, err, tc.expectedErrContains)
+				return
+			}
+
+			assert.NoError(t, err)
+			for tabletID, changed := range tc.expectedResponse {
+				i := slices.IndexFunc(res.Details, func(det *vtctldatapb.WorkflowUpdateResponse_TabletInfo) bool {
+					return det.Tablet.Uid == tabletID
+				})
+				assert.NotEqual(t, -1, i)
+				assert.Equal(t, changed, res.Details[i].Changed)
+			}
+		})
+	}
+}
+
+func TestFinalizeMigrateWorkflow(t *testing.T) {
+	ctx := context.Background()
+
+	workflowName := "wf1"
+	tableName1 := "t1"
+	tableName2 := "t2"
+
+	sourceKeyspace := &testKeyspace{"source_keyspace", []string{"-"}}
+	targetKeyspace := &testKeyspace{"target_keyspace", []string{"-80", "80-"}}
+
+	schema := map[string]*tabletmanagerdatapb.SchemaDefinition{
+		tableName1: {
+			TableDefinitions: []*tabletmanagerdatapb.TableDefinition{
+				{
+					Name:   tableName1,
+					Schema: fmt.Sprintf("CREATE TABLE %s (id BIGINT, name VARCHAR(64), PRIMARY KEY (id))", tableName1),
+				},
+			},
+		},
+		tableName2: {
+			TableDefinitions: []*tabletmanagerdatapb.TableDefinition{
+				{
+					Name:   tableName2,
+					Schema: fmt.Sprintf("CREATE TABLE %s (id BIGINT, name VARCHAR(64), PRIMARY KEY (id))", tableName2),
+				},
+			},
+		},
+	}
+
+	testcases := []struct {
+		name          string
+		expectQueries []string
+		cancel        bool
+		keepData      bool
+	}{
+		{
+			name: "cancel false, keepData true",
+			expectQueries: []string{
+				"delete from _vt.vreplication where db_name = 'vt_target_keyspace' and workflow = 'wf1'",
+			},
+			cancel:   false,
+			keepData: true,
+		},
+		{
+			name: "cancel true, keepData false",
+			expectQueries: []string{
+				"delete from _vt.vreplication where db_name = 'vt_target_keyspace' and workflow = 'wf1'",
+				"drop table `vt_target_keyspace`.`t1`",
+				"drop table `vt_target_keyspace`.`t2`",
+			},
+			cancel:   true,
+			keepData: false,
+		},
+	}
+
+	for _, tc := range testcases {
+		t.Run(tc.name, func(t *testing.T) {
+			te := newTestEnv(t, ctx, defaultCellName, sourceKeyspace, targetKeyspace)
+			defer te.close()
+			te.tmc.schema = schema
+
+			ts, _, err := te.ws.getWorkflowState(ctx, targetKeyspace.KeyspaceName, workflowName)
+			require.NoError(t, err)
+
+			for _, q := range tc.expectQueries {
+				te.tmc.expectVRQuery(200, q, nil)
+				te.tmc.expectVRQuery(210, q, nil)
+			}
+
+			_, err = te.ws.finalizeMigrateWorkflow(ctx, ts, "", tc.cancel, tc.keepData, false, false)
+			assert.NoError(t, err)
+
+			ks, err := te.ts.GetSrvVSchema(ctx, "cell")
+			require.NoError(t, err)
+			assert.NotNil(t, ks.Keyspaces[targetKeyspace.KeyspaceName])
+
+			// Expect tables to be present in the VSchema if cancel was false.
+			if !tc.cancel {
+				assert.Len(t, ks.Keyspaces[targetKeyspace.KeyspaceName].Tables, 2)
+				assert.NotNil(t, ks.Keyspaces[targetKeyspace.KeyspaceName].Tables[tableName1])
+				assert.NotNil(t, ks.Keyspaces[targetKeyspace.KeyspaceName].Tables[tableName2])
+			} else {
+				assert.Len(t, ks.Keyspaces[targetKeyspace.KeyspaceName].Tables, 0)
+				assert.Nil(t, ks.Keyspaces[targetKeyspace.KeyspaceName].Tables[tableName1])
+				assert.Nil(t, ks.Keyspaces[targetKeyspace.KeyspaceName].Tables[tableName2])
+			}
+
+			// Expect queries to be used.
+			assert.Empty(t, te.tmc.applySchemaRequests[200])
+			assert.Empty(t, te.tmc.applySchemaRequests[210])
+		})
+	}
+}

From 71b2cae69e88c9d5552937c081be064f1a54d067 Mon Sep 17 00:00:00 2001
From: Dirkjan Bussink <d.bussink@gmail.com>
Date: Tue, 4 Feb 2025 16:14:48 +0100
Subject: [PATCH 21/68] Update dependencies manually (#17691)

Signed-off-by: Dirkjan Bussink <d.bussink@gmail.com>
---
 go.mod                                        |  156 +-
 go.sum                                        |  450 ++-
 go/vt/proto/binlogdata/binlogdata.pb.go       |  387 ++-
 .../proto/binlogdata/binlogdata_vtproto.pb.go |    2 +-
 go/vt/proto/binlogservice/binlogservice.pb.go |   10 +-
 go/vt/proto/logutil/logutil.pb.go             |   29 +-
 go/vt/proto/logutil/logutil_vtproto.pb.go     |    2 +-
 go/vt/proto/mysqlctl/mysqlctl.pb.go           |  153 +-
 go/vt/proto/mysqlctl/mysqlctl_vtproto.pb.go   |    2 +-
 go/vt/proto/query/cached_size.go              |   36 +-
 go/vt/proto/query/query.pb.go                 |  820 +++---
 go/vt/proto/query/query_vtproto.pb.go         |    2 +-
 go/vt/proto/queryservice/queryservice.pb.go   |   10 +-
 .../replicationdata/replicationdata.pb.go     |  111 +-
 .../replicationdata_vtproto.pb.go             |    2 +-
 go/vt/proto/tableacl/tableacl.pb.go           |   30 +-
 go/vt/proto/tableacl/tableacl_vtproto.pb.go   |    2 +-
 .../tabletmanagerdata/tabletmanagerdata.pb.go | 1181 ++++----
 .../tabletmanagerdata_vtproto.pb.go           |    2 +-
 .../tabletmanagerservice.pb.go                |   10 +-
 go/vt/proto/throttlerdata/throttlerdata.pb.go |   98 +-
 .../throttlerdata/throttlerdata_vtproto.pb.go |    2 +-
 .../throttlerservice/throttlerservice.pb.go   |   10 +-
 go/vt/proto/topodata/cached_size.go           |   16 +-
 go/vt/proto/topodata/topodata.pb.go           |  204 +-
 go/vt/proto/topodata/topodata_vtproto.pb.go   |    2 +-
 go/vt/proto/vschema/vschema.pb.go             |  178 +-
 go/vt/proto/vschema/vschema_vtproto.pb.go     |    2 +-
 go/vt/proto/vtadmin/vtadmin.pb.go             | 1257 ++++-----
 go/vt/proto/vtadmin/vtadmin_vtproto.pb.go     |    2 +-
 go/vt/proto/vtctldata/vtctldata.pb.go         | 2486 ++++++++---------
 go/vt/proto/vtctldata/vtctldata_vtproto.pb.go |    2 +-
 go/vt/proto/vtctlservice/vtctlservice.pb.go   |   10 +-
 go/vt/proto/vtgate/vtgate.pb.go               |  202 +-
 go/vt/proto/vtgate/vtgate_vtproto.pb.go       |    2 +-
 go/vt/proto/vtgateservice/vtgateservice.pb.go |   10 +-
 go/vt/proto/vtrpc/vtrpc.pb.go                 |   32 +-
 go/vt/proto/vtrpc/vtrpc_vtproto.pb.go         |    2 +-
 go/vt/proto/vttest/vttest.pb.go               |   39 +-
 go/vt/proto/vttest/vttest_vtproto.pb.go       |    2 +-
 go/vt/proto/vttime/vttime.pb.go               |   32 +-
 go/vt/proto/vttime/vttime_vtproto.pb.go       |    2 +-
 42 files changed, 3650 insertions(+), 4339 deletions(-)

diff --git a/go.mod b/go.mod
index 81f6fcb141f..30d7ead741c 100644
--- a/go.mod
+++ b/go.mod
@@ -3,7 +3,7 @@ module vitess.io/vitess
 go 1.23.5
 
 require (
-	cloud.google.com/go/storage v1.46.0
+	cloud.google.com/go/storage v1.50.0
 	github.com/AdaLogics/go-fuzz-headers v0.0.0-20240806141605-e8a1dd7889d6
 	github.com/Azure/azure-pipeline-go v0.2.3
 	github.com/Azure/azure-storage-blob-go v0.15.0
@@ -27,14 +27,14 @@ require (
 	github.com/gorilla/mux v1.8.1
 	github.com/grpc-ecosystem/go-grpc-middleware v1.4.0
 	github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0
-	github.com/hashicorp/consul/api v1.30.0
+	github.com/hashicorp/consul/api v1.31.0
 	github.com/hashicorp/go-immutable-radix v1.3.1 // indirect
-	github.com/hashicorp/serf v0.10.1 // indirect
+	github.com/hashicorp/serf v0.10.2 // indirect
 	github.com/icrowley/fake v0.0.0-20180203215853-4178557ae428
 	github.com/klauspost/compress v1.17.11
 	github.com/klauspost/pgzip v1.2.6
 	github.com/krishicks/yaml-patch v0.0.10
-	github.com/magiconair/properties v1.8.7 // indirect
+	github.com/magiconair/properties v1.8.9 // indirect
 	github.com/minio/minio-go v0.0.0-20190131015406-c8a261de75c1
 	github.com/montanaflynn/stats v0.7.1
 	github.com/olekukonko/tablewriter v0.0.5
@@ -46,15 +46,15 @@ require (
 	github.com/pires/go-proxyproto v0.8.0
 	github.com/pkg/errors v0.9.1
 	github.com/planetscale/pargzip v0.0.0-20201116224723-90c7fc03ea8a
-	github.com/planetscale/vtprotobuf v0.6.1-0.20241011083415-71c992bc3c87
+	github.com/planetscale/vtprotobuf v0.6.1-0.20241121165744-79df5c4772f2
 	github.com/prometheus/client_golang v1.20.5
-	github.com/prometheus/common v0.60.1
+	github.com/prometheus/common v0.62.0
 	github.com/sjmudd/stopwatch v0.1.1
 	github.com/soheilhy/cmux v0.1.5
 	github.com/spf13/cobra v1.8.1
-	github.com/spf13/pflag v1.0.5
+	github.com/spf13/pflag v1.0.6
 	github.com/spf13/viper v1.19.0
-	github.com/stretchr/testify v1.9.0
+	github.com/stretchr/testify v1.10.0
 	github.com/tchap/go-patricia v2.3.0+incompatible
 	github.com/tidwall/gjson v1.18.0
 	github.com/tinylib/msgp v1.2.4 // indirect
@@ -62,25 +62,25 @@ require (
 	github.com/uber/jaeger-lib v2.4.1+incompatible // indirect
 	github.com/yudai/golcs v0.0.0-20170316035057-ecda9a501e82
 	github.com/z-division/go-zookeeper v1.0.0
-	go.etcd.io/etcd/api/v3 v3.5.17
-	go.etcd.io/etcd/client/pkg/v3 v3.5.17
-	go.etcd.io/etcd/client/v3 v3.5.17
-	go.uber.org/mock v0.2.0
-	golang.org/x/crypto v0.31.0 // indirect
+	go.etcd.io/etcd/api/v3 v3.5.18
+	go.etcd.io/etcd/client/pkg/v3 v3.5.18
+	go.etcd.io/etcd/client/v3 v3.5.18
+	go.uber.org/mock v0.5.0
+	golang.org/x/crypto v0.32.0 // indirect
 	golang.org/x/mod v0.22.0 // indirect
-	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
+	golang.org/x/net v0.34.0
+	golang.org/x/oauth2 v0.25.0
+	golang.org/x/sys v0.29.0
+	golang.org/x/term v0.28.0
 	golang.org/x/text v0.21.0 // indirect
-	golang.org/x/time v0.8.0
-	golang.org/x/tools v0.27.0
-	google.golang.org/api v0.205.0
-	google.golang.org/genproto v0.0.0-20241113202542-65e8d215514f // indirect
-	google.golang.org/grpc v1.68.0
-	google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.3.0
-	google.golang.org/grpc/examples v0.0.0-20210430044426-28078834f35b
-	google.golang.org/protobuf v1.35.1
+	golang.org/x/time v0.9.0
+	golang.org/x/tools v0.29.0
+	google.golang.org/api v0.219.0
+	google.golang.org/genproto v0.0.0-20250127172529-29210b9bc287 // indirect
+	google.golang.org/grpc v1.70.0
+	google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.5.1
+	google.golang.org/grpc/examples v0.0.0-20250204041003-947e2a4be2ba
+	google.golang.org/protobuf v1.36.4
 	gopkg.in/DataDog/dd-trace-go.v1 v1.69.1
 	gopkg.in/asn1-ber.v1 v1.0.0-20181015200546-f715ec2f112d // indirect
 	gopkg.in/ldap.v2 v2.5.1
@@ -88,13 +88,13 @@ require (
 )
 
 require (
-	github.com/DataDog/datadog-go/v5 v5.5.0
+	github.com/DataDog/datadog-go/v5 v5.6.0
 	github.com/Shopify/toxiproxy/v2 v2.11.0
-	github.com/aws/aws-sdk-go-v2 v1.32.4
-	github.com/aws/aws-sdk-go-v2/config v1.28.3
+	github.com/aws/aws-sdk-go-v2 v1.32.8
+	github.com/aws/aws-sdk-go-v2/config v1.28.9
 	github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.17.37
 	github.com/aws/aws-sdk-go-v2/service/s3 v1.66.3
-	github.com/aws/smithy-go v1.22.0
+	github.com/aws/smithy-go v1.22.1
 	github.com/bndr/gotabulate v1.1.2
 	github.com/dustin/go-humanize v1.0.1
 	github.com/gammazero/deque v0.2.1
@@ -104,24 +104,24 @@ require (
 	github.com/kr/text v0.2.0
 	github.com/mitchellh/mapstructure v1.5.0
 	github.com/nsf/jsondiff v0.0.0-20210926074059-1e845ec5d249
-	github.com/spf13/afero v1.11.0
+	github.com/spf13/afero v1.12.0
 	github.com/spf13/jwalterweatherman v1.1.0
 	github.com/xlab/treeprint v1.2.0
 	go.uber.org/goleak v1.3.0
-	golang.org/x/exp v0.0.0-20241108190413-2d47ceb2692f
+	golang.org/x/exp v0.0.0-20250128182459-e0ece0dbea4c
 	golang.org/x/sync v0.10.0
-	gonum.org/v1/gonum v0.14.0
-	modernc.org/sqlite v1.33.1
+	gonum.org/v1/gonum v0.15.1
+	modernc.org/sqlite v1.34.5
 )
 
 require (
-	cel.dev/expr v0.18.0 // indirect
-	cloud.google.com/go v0.116.0 // indirect
-	cloud.google.com/go/auth v0.10.2 // indirect
-	cloud.google.com/go/auth/oauth2adapt v0.2.5 // indirect
-	cloud.google.com/go/compute/metadata v0.5.2 // indirect
-	cloud.google.com/go/iam v1.2.2 // indirect
-	cloud.google.com/go/monitoring v1.21.2 // indirect
+	cel.dev/expr v0.19.2 // indirect
+	cloud.google.com/go v0.118.1 // indirect
+	cloud.google.com/go/auth v0.14.1 // indirect
+	cloud.google.com/go/auth/oauth2adapt v0.2.7 // indirect
+	cloud.google.com/go/compute/metadata v0.6.0 // indirect
+	cloud.google.com/go/iam v1.3.1 // indirect
+	cloud.google.com/go/monitoring v1.23.0 // indirect
 	github.com/DataDog/appsec-internal-go v1.9.0 // indirect
 	github.com/DataDog/datadog-agent/pkg/obfuscate v0.59.0 // indirect
 	github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.59.0 // indirect
@@ -129,57 +129,55 @@ require (
 	github.com/DataDog/go-sqllexer v0.0.17 // indirect
 	github.com/DataDog/go-tuf v1.1.0-0.5.2 // indirect
 	github.com/DataDog/sketches-go v1.4.6 // indirect
-	github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.25.0 // indirect
-	github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/metric v0.49.0 // indirect
-	github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.49.0 // indirect
+	github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.26.0 // indirect
+	github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/metric v0.50.0 // indirect
+	github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.50.0 // indirect
 	github.com/Microsoft/go-winio v0.6.2 // indirect
 	github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.6 // indirect
-	github.com/aws/aws-sdk-go-v2/credentials v1.17.44 // indirect
-	github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.19 // indirect
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.23 // indirect
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.23 // indirect
+	github.com/aws/aws-sdk-go-v2/credentials v1.17.50 // indirect
+	github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.23 // indirect
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.27 // indirect
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.27 // indirect
 	github.com/aws/aws-sdk-go-v2/internal/ini v1.8.1 // indirect
 	github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.23 // indirect
-	github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.12.0 // indirect
+	github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.12.1 // indirect
 	github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.4.4 // indirect
-	github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.4 // indirect
+	github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.8 // indirect
 	github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.18.4 // indirect
-	github.com/aws/aws-sdk-go-v2/service/sso v1.24.5 // indirect
-	github.com/aws/aws-sdk-go-v2/service/ssooidc v1.28.4 // indirect
-	github.com/aws/aws-sdk-go-v2/service/sts v1.32.4 // indirect
+	github.com/aws/aws-sdk-go-v2/service/sso v1.24.9 // indirect
+	github.com/aws/aws-sdk-go-v2/service/ssooidc v1.28.8 // indirect
+	github.com/aws/aws-sdk-go-v2/service/sts v1.33.5 // indirect
 	github.com/beorn7/perks v1.0.1 // indirect
-	github.com/census-instrumentation/opencensus-proto v0.4.1 // indirect
-	github.com/cncf/xds/go v0.0.0-20240905190251-b4127c9b8d78 // indirect
+	github.com/cncf/xds/go v0.0.0-20250121191232-2f005788dc42 // indirect
 	github.com/coreos/go-semver v0.3.1 // indirect
 	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/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
-	github.com/envoyproxy/protoc-gen-validate v1.1.0 // indirect
+	github.com/envoyproxy/go-control-plane/envoy v1.32.4 // indirect
+	github.com/envoyproxy/protoc-gen-validate v1.2.1 // indirect
 	github.com/fatih/color v1.18.0 // indirect
 	github.com/felixge/httpsnoop v1.0.4 // indirect
 	github.com/go-logr/logr v1.4.2 // indirect
 	github.com/go-logr/stdr v1.2.2 // indirect
 	github.com/gogo/protobuf v1.3.2 // indirect
-	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
-	github.com/google/s2a-go v0.1.8 // indirect
+	github.com/google/s2a-go v0.1.9 // indirect
 	github.com/googleapis/enterprise-certificate-proxy v0.3.4 // indirect
-	github.com/googleapis/gax-go/v2 v2.14.0 // indirect
+	github.com/googleapis/gax-go/v2 v2.14.1 // indirect
 	github.com/hashicorp/errwrap v1.1.0 // indirect
 	github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
 	github.com/hashicorp/go-hclog v1.6.3 // indirect
+	github.com/hashicorp/go-metrics v0.5.4 // indirect
 	github.com/hashicorp/go-multierror v1.1.1 // indirect
 	github.com/hashicorp/go-rootcerts v1.0.2 // indirect
 	github.com/hashicorp/go-secure-stdlib/parseutil v0.1.8 // indirect
 	github.com/hashicorp/go-secure-stdlib/strutil v0.1.2 // indirect
 	github.com/hashicorp/go-sockaddr v1.0.7 // indirect
 	github.com/hashicorp/golang-lru v1.0.2 // indirect
-	github.com/hashicorp/golang-lru/v2 v2.0.7 // indirect
 	github.com/hashicorp/hcl v1.0.1-vault-7 // indirect
 	github.com/inconshreveable/mousetrap v1.1.0 // indirect
-	github.com/mattn/go-colorable v0.1.13 // indirect
+	github.com/mattn/go-colorable v0.1.14 // indirect
 	github.com/mattn/go-ieproxy v0.0.12 // indirect
 	github.com/mattn/go-isatty v0.0.20 // indirect
 	github.com/mattn/go-runewidth v0.0.16 // indirect
@@ -198,37 +196,33 @@ require (
 	github.com/rogpeppe/go-internal v1.13.1 // indirect
 	github.com/russross/blackfriday/v2 v2.1.0 // indirect
 	github.com/ryanuber/go-glob v1.0.0 // indirect
-	github.com/sagikazarmark/locafero v0.6.0 // indirect
+	github.com/sagikazarmark/locafero v0.7.0 // indirect
 	github.com/sagikazarmark/slog-shim v0.1.0 // indirect
 	github.com/secure-systems-lab/go-securesystemslib v0.8.0 // indirect
 	github.com/sourcegraph/conc v0.3.0 // indirect
-	github.com/spf13/cast v1.7.0 // indirect
+	github.com/spf13/cast v1.7.1 // indirect
 	github.com/subosito/gotenv v1.6.0 // indirect
 	github.com/tidwall/match v1.1.1 // indirect
 	github.com/tidwall/pretty v1.2.1 // indirect
-	go.opencensus.io v0.24.0 // indirect
-	go.opentelemetry.io/contrib/detectors/gcp v1.32.0 // indirect
-	go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.57.0 // indirect
-	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.57.0 // indirect
-	go.opentelemetry.io/otel v1.32.0 // indirect
-	go.opentelemetry.io/otel/metric v1.32.0 // indirect
-	go.opentelemetry.io/otel/sdk v1.32.0 // indirect
-	go.opentelemetry.io/otel/sdk/metric v1.32.0 // indirect
-	go.opentelemetry.io/otel/trace v1.32.0 // indirect
+	go.opentelemetry.io/auto/sdk v1.1.0 // indirect
+	go.opentelemetry.io/contrib/detectors/gcp v1.34.0 // indirect
+	go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.59.0 // indirect
+	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.59.0 // indirect
+	go.opentelemetry.io/otel v1.34.0 // indirect
+	go.opentelemetry.io/otel/metric v1.34.0 // indirect
+	go.opentelemetry.io/otel/sdk v1.34.0 // indirect
+	go.opentelemetry.io/otel/sdk/metric v1.34.0 // indirect
+	go.opentelemetry.io/otel/trace v1.34.0 // indirect
 	go.uber.org/atomic v1.11.0 // indirect
 	go.uber.org/multierr v1.11.0 // indirect
 	go.uber.org/zap v1.27.0 // indirect
 	golang.org/x/xerrors v0.0.0-20240903120638-7835f813f4da // indirect
-	google.golang.org/genproto/googleapis/api v0.0.0-20241113202542-65e8d215514f // indirect
-	google.golang.org/genproto/googleapis/rpc v0.0.0-20241113202542-65e8d215514f // indirect
-	google.golang.org/grpc/stats/opentelemetry v0.0.0-20241028142157-ada6787961b3 // indirect
+	google.golang.org/genproto/googleapis/api v0.0.0-20250127172529-29210b9bc287 // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20250127172529-29210b9bc287 // indirect
 	gopkg.in/ini.v1 v1.67.0 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
-	modernc.org/gc/v3 v3.0.0-20241004144649-1aea3fae8852 // indirect
-	modernc.org/libc v1.61.0 // indirect
-	modernc.org/mathutil v1.6.0 // indirect
-	modernc.org/memory v1.8.0 // indirect
-	modernc.org/strutil v1.2.0 // indirect
-	modernc.org/token v1.1.0 // indirect
+	modernc.org/libc v1.61.11 // indirect
+	modernc.org/mathutil v1.7.1 // indirect
+	modernc.org/memory v1.8.2 // indirect
 )
diff --git a/go.sum b/go.sum
index 4d25efb17fa..71a594c1408 100644
--- a/go.sum
+++ b/go.sum
@@ -1,27 +1,27 @@
-cel.dev/expr v0.18.0 h1:CJ6drgk+Hf96lkLikr4rFf19WrU0BOWEihyZnI2TAzo=
-cel.dev/expr v0.18.0/go.mod h1:MrpN08Q+lEBs+bGYdLxxHkZoUSsCp0nSKTs0nTymJgw=
+cel.dev/expr v0.19.2 h1:V354PbqIXr9IQdwy4SYA4xa0HXaWq1BUPAGzugBY5V4=
+cel.dev/expr v0.19.2/go.mod h1:MrpN08Q+lEBs+bGYdLxxHkZoUSsCp0nSKTs0nTymJgw=
 cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
 cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
-cloud.google.com/go v0.116.0 h1:B3fRrSDkLRt5qSHWe40ERJvhvnQwdZiHu0bJOpldweE=
-cloud.google.com/go v0.116.0/go.mod h1:cEPSRWPzZEswwdr9BxE6ChEn01dWlTaF05LiC2Xs70U=
-cloud.google.com/go/auth v0.10.2 h1:oKF7rgBfSHdp/kuhXtqU/tNDr0mZqhYbEh+6SiqzkKo=
-cloud.google.com/go/auth v0.10.2/go.mod h1:xxA5AqpDrvS+Gkmo9RqrGGRh6WSNKKOXhY3zNOr38tI=
-cloud.google.com/go/auth/oauth2adapt v0.2.5 h1:2p29+dePqsCHPP1bqDJcKj4qxRyYCcbzKpFyKGt3MTk=
-cloud.google.com/go/auth/oauth2adapt v0.2.5/go.mod h1:AlmsELtlEBnaNTL7jCj8VQFLy6mbZv0s4Q7NGBeQ5E8=
-cloud.google.com/go/compute/metadata v0.5.2 h1:UxK4uu/Tn+I3p2dYWTfiX4wva7aYlKixAHn3fyqngqo=
-cloud.google.com/go/compute/metadata v0.5.2/go.mod h1:C66sj2AluDcIqakBq/M8lw8/ybHgOZqin2obFxa/E5k=
-cloud.google.com/go/iam v1.2.2 h1:ozUSofHUGf/F4tCNy/mu9tHLTaxZFLOUiKzjcgWHGIA=
-cloud.google.com/go/iam v1.2.2/go.mod h1:0Ys8ccaZHdI1dEUilwzqng/6ps2YB6vRsjIe00/+6JY=
-cloud.google.com/go/logging v1.12.0 h1:ex1igYcGFd4S/RZWOCU51StlIEuey5bjqwH9ZYjHibk=
-cloud.google.com/go/logging v1.12.0/go.mod h1:wwYBt5HlYP1InnrtYI0wtwttpVU1rifnMT7RejksUAM=
-cloud.google.com/go/longrunning v0.6.2 h1:xjDfh1pQcWPEvnfjZmwjKQEcHnpz6lHjfy7Fo0MK+hc=
-cloud.google.com/go/longrunning v0.6.2/go.mod h1:k/vIs83RN4bE3YCswdXC5PFfWVILjm3hpEUlSko4PiI=
-cloud.google.com/go/monitoring v1.21.2 h1:FChwVtClH19E7pJ+e0xUhJPGksctZNVOk2UhMmblmdU=
-cloud.google.com/go/monitoring v1.21.2/go.mod h1:hS3pXvaG8KgWTSz+dAdyzPrGUYmi2Q+WFX8g2hqVEZU=
-cloud.google.com/go/storage v1.46.0 h1:OTXISBpFd8KaA2ClT3K3oRk8UGOcTHtrZ1bW88xKiic=
-cloud.google.com/go/storage v1.46.0/go.mod h1:lM+gMAW91EfXIeMTBmixRsKL/XCxysytoAgduVikjMk=
-cloud.google.com/go/trace v1.11.2 h1:4ZmaBdL8Ng/ajrgKqY5jfvzqMXbrDcBsUGXOT9aqTtI=
-cloud.google.com/go/trace v1.11.2/go.mod h1:bn7OwXd4pd5rFuAnTrzBuoZ4ax2XQeG3qNgYmfCy0Io=
+cloud.google.com/go v0.118.1 h1:b8RATMcrK9A4BH0rj8yQupPXp+aP+cJ0l6H7V9osV1E=
+cloud.google.com/go v0.118.1/go.mod h1:CFO4UPEPi8oV21xoezZCrd3d81K4fFkDTEJu4R8K+9M=
+cloud.google.com/go/auth v0.14.1 h1:AwoJbzUdxA/whv1qj3TLKwh3XX5sikny2fc40wUl+h0=
+cloud.google.com/go/auth v0.14.1/go.mod h1:4JHUxlGXisL0AW8kXPtUF6ztuOksyfUQNFjfsOCXkPM=
+cloud.google.com/go/auth/oauth2adapt v0.2.7 h1:/Lc7xODdqcEw8IrZ9SvwnlLX6j9FHQM74z6cBk9Rw6M=
+cloud.google.com/go/auth/oauth2adapt v0.2.7/go.mod h1:NTbTTzfvPl1Y3V1nPpOgl2w6d/FjO7NNUQaWSox6ZMc=
+cloud.google.com/go/compute/metadata v0.6.0 h1:A6hENjEsCDtC1k8byVsgwvVcioamEHvZ4j01OwKxG9I=
+cloud.google.com/go/compute/metadata v0.6.0/go.mod h1:FjyFAW1MW0C203CEOMDTu3Dk1FlqW3Rga40jzHL4hfg=
+cloud.google.com/go/iam v1.3.1 h1:KFf8SaT71yYq+sQtRISn90Gyhyf4X8RGgeAVC8XGf3E=
+cloud.google.com/go/iam v1.3.1/go.mod h1:3wMtuyT4NcbnYNPLMBzYRFiEfjKfJlLVLrisE7bwm34=
+cloud.google.com/go/logging v1.13.0 h1:7j0HgAp0B94o1YRDqiqm26w4q1rDMH7XNRU34lJXHYc=
+cloud.google.com/go/logging v1.13.0/go.mod h1:36CoKh6KA/M0PbhPKMq6/qety2DCAErbhXT62TuXALA=
+cloud.google.com/go/longrunning v0.6.4 h1:3tyw9rO3E2XVXzSApn1gyEEnH2K9SynNQjMlBi3uHLg=
+cloud.google.com/go/longrunning v0.6.4/go.mod h1:ttZpLCe6e7EXvn9OxpBRx7kZEB0efv8yBO6YnVMfhJs=
+cloud.google.com/go/monitoring v1.23.0 h1:M3nXww2gn9oZ/qWN2bZ35CjolnVHM3qnSbu6srCPgjk=
+cloud.google.com/go/monitoring v1.23.0/go.mod h1:034NnlQPDzrQ64G2Gavhl0LUHZs9H3rRmhtnp7jiJgg=
+cloud.google.com/go/storage v1.50.0 h1:3TbVkzTooBvnZsk7WaAQfOsNrdoM8QHusXA1cpk6QJs=
+cloud.google.com/go/storage v1.50.0/go.mod h1:l7XeiD//vx5lfqE3RavfmU9yvk5Pp0Zhcv482poyafY=
+cloud.google.com/go/trace v1.11.3 h1:c+I4YFjxRQjvAhRmSsmjpASUKq88chOX854ied0K/pE=
+cloud.google.com/go/trace v1.11.3/go.mod h1:pt7zCYiDSQjC9Y2oqCsh9jF4GStB/hmjrYLsxRR27q8=
 github.com/AdaLogics/go-fuzz-headers v0.0.0-20240806141605-e8a1dd7889d6 h1:He8afgbRMd7mFxO99hRNu+6tazq8nFF9lIwo9JFroBk=
 github.com/AdaLogics/go-fuzz-headers v0.0.0-20240806141605-e8a1dd7889d6/go.mod h1:8o94RPi1/7XTJvwPpRSzSUedZrtlirdB3r9Z20bi2f8=
 github.com/Azure/azure-pipeline-go v0.2.3 h1:7U9HBg1JFK3jHl5qmo4CTZKFTVgMwdFHMVtCdfBE21U=
@@ -47,8 +47,8 @@ github.com/DataDog/datadog-agent/pkg/obfuscate v0.59.0/go.mod h1:ATVw8kr3U1Eqz3q
 github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.59.0 h1:9C8TVNz0IiNoD6tuEKPY/vMIUjB7kN0OaLyImhatWjg=
 github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.59.0/go.mod h1:c4th0IFaP0Q1ofRa0GcPB9hJWN+cmUoEfOI1Ub0O50A=
 github.com/DataDog/datadog-go v3.2.0+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ=
-github.com/DataDog/datadog-go/v5 v5.5.0 h1:G5KHeB8pWBNXT4Jtw0zAkhdxEAWSpWH00geHI6LDrKU=
-github.com/DataDog/datadog-go/v5 v5.5.0/go.mod h1:K9kcYBlxkcPP8tvvjZZKs/m1edNAUFzBbdpTUKfCsuw=
+github.com/DataDog/datadog-go/v5 v5.6.0 h1:2oCLxjF/4htd55piM75baflj/KoE6VYS7alEUqFvRDw=
+github.com/DataDog/datadog-go/v5 v5.6.0/go.mod h1:K9kcYBlxkcPP8tvvjZZKs/m1edNAUFzBbdpTUKfCsuw=
 github.com/DataDog/go-libddwaf/v3 v3.5.1 h1:GWA4ln4DlLxiXm+X7HA/oj0ZLcdCwOS81KQitegRTyY=
 github.com/DataDog/go-libddwaf/v3 v3.5.1/go.mod h1:n98d9nZ1gzenRSk53wz8l6d34ikxS+hs62A31Fqmyi4=
 github.com/DataDog/go-sqllexer v0.0.17 h1:u47fJAVg/+5DA74ZW3w0Qu+3qXHd3GtnA8ZBYixdPrM=
@@ -59,14 +59,14 @@ github.com/DataDog/gostackparse v0.7.0 h1:i7dLkXHvYzHV308hnkvVGDL3BR4FWl7IsXNPz/
 github.com/DataDog/gostackparse v0.7.0/go.mod h1:lTfqcJKqS9KnXQGnyQMCugq3u1FP6UZMfWR0aitKFMM=
 github.com/DataDog/sketches-go v1.4.6 h1:acd5fb+QdUzGrosfNLwrIhqyrbMORpvBy7mE+vHlT3I=
 github.com/DataDog/sketches-go v1.4.6/go.mod h1:7Y8GN8Jf66DLyDhc94zuWA3uHEt/7ttt8jHOBWWrSOg=
-github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.25.0 h1:3c8yed4lgqTt+oTQ+JNMDo+F4xprBf+O/il4ZC0nRLw=
-github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.25.0/go.mod h1:obipzmGjfSjam60XLwGfqUkJsfiheAl+TUjG+4yzyPM=
-github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/metric v0.49.0 h1:o90wcURuxekmXrtxmYWTyNla0+ZEHhud6DI1ZTxd1vI=
-github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/metric v0.49.0/go.mod h1:6fTWu4m3jocfUZLYF5KsZC1TUfRvEjs7lM4crme/irw=
-github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/cloudmock v0.49.0 h1:jJKWl98inONJAr/IZrdFQUWcwUO95DLY1XMD1ZIut+g=
-github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/cloudmock v0.49.0/go.mod h1:l2fIqmwB+FKSfvn3bAD/0i+AXAxhIZjTK2svT/mgUXs=
-github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.49.0 h1:GYUJLfvd++4DMuMhCFLgLXvFwofIxh/qOwoGuS/LTew=
-github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.49.0/go.mod h1:wRbFgBQUVm1YXrvWKofAEmq9HNJTDphbAaJSSX01KUI=
+github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.26.0 h1:f2Qw/Ehhimh5uO1fayV0QIW7DShEQqhtUfhYc+cBPlw=
+github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.26.0/go.mod h1:2bIszWvQRlJVmJLiuLhukLImRjKPcYdzzsx6darK02A=
+github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/metric v0.50.0 h1:5IT7xOdq17MtcdtL/vtl6mGfzhaq4m4vpollPRmlsBQ=
+github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/metric v0.50.0/go.mod h1:ZV4VOm0/eHR06JLrXWe09068dHpr3TRpY9Uo7T+anuA=
+github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/cloudmock v0.50.0 h1:nNMpRpnkWDAaqcpxMJvxa/Ud98gjbYwayJY4/9bdjiU=
+github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/cloudmock v0.50.0/go.mod h1:SZiPHWGOOk3bl8tkevxkoiwPgsIl6CwrWcbwjfHZpdM=
+github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.50.0 h1:ig/FpDD2JofP/NExKQUbn7uOSZzJAQqogfqluZK4ed4=
+github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.50.0/go.mod h1:otE2jQekW/PqXk1Awf5lmfokJx4uwuqcj1ab5SpGeW0=
 github.com/HdrHistogram/hdrhistogram-go v0.9.0 h1:dpujRju0R4M/QZzcnR1LH1qm+TVG3UzkWdp5tH1WMcg=
 github.com/HdrHistogram/hdrhistogram-go v0.9.0/go.mod h1:nxrse8/Tzg2tg3DZcZjm6qEclQKK70g0KxO61gFFZD4=
 github.com/Masterminds/glide v0.13.2/go.mod h1:STyF5vcenH/rUqTEv+/hBXlSTo7KYwg2oc2f4tzPWic=
@@ -81,65 +81,59 @@ github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuy
 github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
 github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
 github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
+github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d/go.mod h1:rBZYJk541a8SKzHPHnH3zbiI+7dagKZ0cgpgrD7Fyho=
 github.com/aquarapid/vaultlib v0.5.1 h1:vuLWR6bZzLHybjJBSUYPgZlIp6KZ+SXeHLRRYTuk6d4=
 github.com/aquarapid/vaultlib v0.5.1/go.mod h1:yT7AlEXtuabkxylOc/+Ulyp18tff1+QjgNLTnFWTlOs=
-github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o=
-github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY=
 github.com/armon/go-metrics v0.4.1 h1:hR91U9KYmb6bLBYLQjyM+3j+rcd/UhE+G78SFnF8gJA=
 github.com/armon/go-metrics v0.4.1/go.mod h1:E6amYzXo6aW1tqzoZGT755KkbgrJsSdpwZ+3JqfkOG4=
-github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8=
-github.com/armon/go-radix v1.0.0/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8=
-github.com/aws/aws-sdk-go-v2 v1.32.4 h1:S13INUiTxgrPueTmrm5DZ+MiAo99zYzHEFh1UNkOxNE=
-github.com/aws/aws-sdk-go-v2 v1.32.4/go.mod h1:2SK5n0a2karNTv5tbP1SjsX0uhttou00v/HpXKM1ZUo=
+github.com/aws/aws-sdk-go-v2 v1.32.8 h1:cZV+NUS/eGxKXMtmyhtYPJ7Z4YLoI/V8bkTdRZfYhGo=
+github.com/aws/aws-sdk-go-v2 v1.32.8/go.mod h1:P5WJBrYqqbWVaOxgH0X/FYYD47/nooaPOZPlQdmiN2U=
 github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.6 h1:pT3hpW0cOHRJx8Y0DfJUEQuqPild8jRGmSFmBgvydr0=
 github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.6/go.mod h1:j/I2++U0xX+cr44QjHay4Cvxj6FUbnxrgmqN3H1jTZA=
-github.com/aws/aws-sdk-go-v2/config v1.28.3 h1:kL5uAptPcPKaJ4q0sDUjUIdueO18Q7JDzl64GpVwdOM=
-github.com/aws/aws-sdk-go-v2/config v1.28.3/go.mod h1:SPEn1KA8YbgQnwiJ/OISU4fz7+F6Fe309Jf0QTsRCl4=
-github.com/aws/aws-sdk-go-v2/credentials v1.17.44 h1:qqfs5kulLUHUEXlHEZXLJkgGoF3kkUeFUTVA585cFpU=
-github.com/aws/aws-sdk-go-v2/credentials v1.17.44/go.mod h1:0Lm2YJ8etJdEdw23s+q/9wTpOeo2HhNE97XcRa7T8MA=
-github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.19 h1:woXadbf0c7enQ2UGCi8gW/WuKmE0xIzxBF/eD94jMKQ=
-github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.19/go.mod h1:zminj5ucw7w0r65bP6nhyOd3xL6veAUMc3ElGMoLVb4=
+github.com/aws/aws-sdk-go-v2/config v1.28.9 h1:7/P2J1MGkava+2c9Xlk7CTPTpGqFAOaM4874wJsGi4Q=
+github.com/aws/aws-sdk-go-v2/config v1.28.9/go.mod h1:ce/HX8tHlIh4VTPaLz/aQIvA5+/rUghFy+nGMrXHQ9U=
+github.com/aws/aws-sdk-go-v2/credentials v1.17.50 h1:63pBzfU7EG4RbMMVRv4Hgm34cIaPXICCnHojKdPbTR0=
+github.com/aws/aws-sdk-go-v2/credentials v1.17.50/go.mod h1:m5ThO5y87w0fiAHBt9cYXS5BVsebOeJEFCGUQeZZYLw=
+github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.23 h1:IBAoD/1d8A8/1aA8g4MBVtTRHhXRiNAgwdbo/xRM2DI=
+github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.23/go.mod h1:vfENuCM7dofkgKpYzuzf1VT1UKkA/YL3qanfBn7HCaA=
 github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.17.37 h1:jHKR76E81sZvz1+x1vYYrHMxphG5LFBJPhSqEr4CLlE=
 github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.17.37/go.mod h1:iMkyPkmoJWQKzSOtaX+8oEJxAuqr7s8laxcqGDSHeII=
-github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.23 h1:A2w6m6Tmr+BNXjDsr7M90zkWjsu4JXHwrzPg235STs4=
-github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.23/go.mod h1:35EVp9wyeANdujZruvHiQUAo9E3vbhnIO1mTCAxMlY0=
-github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.23 h1:pgYW9FCabt2M25MoHYCfMrVY2ghiiBKYWUVXfwZs+sU=
-github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.23/go.mod h1:c48kLgzO19wAu3CPkDWC28JbaJ+hfQlsdl7I2+oqIbk=
+github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.27 h1:jSJjSBzw8VDIbWv+mmvBSP8ezsztMYJGH+eKqi9AmNs=
+github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.27/go.mod h1:/DAhLbFRgwhmvJdOfSm+WwikZrCuUJiA4WgJG0fTNSw=
+github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.27 h1:l+X4K77Dui85pIj5foXDhPlnqcNRG2QUyvca300lXh8=
+github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.27/go.mod h1:KvZXSFEXm6x84yE8qffKvT3x8J5clWnVFXphpohhzJ8=
 github.com/aws/aws-sdk-go-v2/internal/ini v1.8.1 h1:VaRN3TlFdd6KxX1x3ILT5ynH6HvKgqdiXoTxAF4HQcQ=
 github.com/aws/aws-sdk-go-v2/internal/ini v1.8.1/go.mod h1:FbtygfRFze9usAadmnGJNc8KsP346kEe+y2/oyhGAGc=
 github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.23 h1:1SZBDiRzzs3sNhOMVApyWPduWYGAX0imGy06XiBnCAM=
 github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.23/go.mod h1:i9TkxgbZmHVh2S0La6CAXtnyFhlCX/pJ0JsOvBAS6Mk=
-github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.12.0 h1:TToQNkvGguu209puTojY/ozlqy2d/SFNcoLIqTFi42g=
-github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.12.0/go.mod h1:0jp+ltwkf+SwG2fm/PKo8t4y8pJSgOCO4D8Lz3k0aHQ=
+github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.12.1 h1:iXtILhvDxB6kPvEXgsDhGaZCSC6LQET5ZHSdJozeI0Y=
+github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.12.1/go.mod h1:9nu0fVANtYiAePIBh2/pFUSwtJ402hLnp854CNoDOeE=
 github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.4.4 h1:aaPpoG15S2qHkWm4KlEyF01zovK1nW4BBbyXuHNSE90=
 github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.4.4/go.mod h1:eD9gS2EARTKgGr/W5xwgY/ik9z/zqpW+m/xOQbVxrMk=
-github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.4 h1:tHxQi/XHPK0ctd/wdOw0t7Xrc2OxcRCnVzv8lwWPu0c=
-github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.4/go.mod h1:4GQbF1vJzG60poZqWatZlhP31y8PGCCVTvIGPdaaYJ0=
+github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.8 h1:cWno7lefSH6Pp+mSznagKCgfDGeZRin66UvYUqAkyeA=
+github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.8/go.mod h1:tPD+VjU3ABTBoEJ3nctu5Nyg4P4yjqSH5bJGGkY4+XE=
 github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.18.4 h1:E5ZAVOmI2apR8ADb72Q63KqwwwdW1XcMeXIlrZ1Psjg=
 github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.18.4/go.mod h1:wezzqVUOVVdk+2Z/JzQT4NxAU0NbhRe5W8pIE72jsWI=
 github.com/aws/aws-sdk-go-v2/service/s3 v1.66.3 h1:neNOYJl72bHrz9ikAEED4VqWyND/Po0DnEx64RW6YM4=
 github.com/aws/aws-sdk-go-v2/service/s3 v1.66.3/go.mod h1:TMhLIyRIyoGVlaEMAt+ITMbwskSTpcGsCPDq91/ihY0=
-github.com/aws/aws-sdk-go-v2/service/sso v1.24.5 h1:HJwZwRt2Z2Tdec+m+fPjvdmkq2s9Ra+VR0hjF7V2o40=
-github.com/aws/aws-sdk-go-v2/service/sso v1.24.5/go.mod h1:wrMCEwjFPms+V86TCQQeOxQF/If4vT44FGIOFiMC2ck=
-github.com/aws/aws-sdk-go-v2/service/ssooidc v1.28.4 h1:zcx9LiGWZ6i6pjdcoE9oXAB6mUdeyC36Ia/QEiIvYdg=
-github.com/aws/aws-sdk-go-v2/service/ssooidc v1.28.4/go.mod h1:Tp/ly1cTjRLGBBmNccFumbZ8oqpZlpdhFf80SrRh4is=
-github.com/aws/aws-sdk-go-v2/service/sts v1.32.4 h1:yDxvkz3/uOKfxnv8YhzOi9m+2OGIxF+on3KOISbK5IU=
-github.com/aws/aws-sdk-go-v2/service/sts v1.32.4/go.mod h1:9XEUty5v5UAsMiFOBJrNibZgwCeOma73jgGwwhgffa8=
-github.com/aws/smithy-go v1.22.0 h1:uunKnWlcoL3zO7q+gG2Pk53joueEOsnNB28QdMsmiMM=
-github.com/aws/smithy-go v1.22.0/go.mod h1:irrKGvNn1InZwb2d7fkIRNucdfwR8R+Ts3wxYa/cJHg=
+github.com/aws/aws-sdk-go-v2/service/sso v1.24.9 h1:YqtxripbjWb2QLyzRK9pByfEDvgg95gpC2AyDq4hFE8=
+github.com/aws/aws-sdk-go-v2/service/sso v1.24.9/go.mod h1:lV8iQpg6OLOfBnqbGMBKYjilBlf633qwHnBEiMSPoHY=
+github.com/aws/aws-sdk-go-v2/service/ssooidc v1.28.8 h1:6dBT1Lz8fK11m22R+AqfRsFn8320K0T5DTGxxOQBSMw=
+github.com/aws/aws-sdk-go-v2/service/ssooidc v1.28.8/go.mod h1:/kiBvRQXBc6xeJTYzhSdGvJ5vm1tjaDEjH+MSeRJnlY=
+github.com/aws/aws-sdk-go-v2/service/sts v1.33.5 h1:URp6kw3vHAnuU9pgP4K1SohwWLDzgtqA/qgeBfgBxn0=
+github.com/aws/aws-sdk-go-v2/service/sts v1.33.5/go.mod h1:+8h7PZb3yY5ftmVLD7ocEoE98hdc8PoKS0H3wfx1dlc=
+github.com/aws/smithy-go v1.22.1 h1:/HPHZQ0g7f4eUeK6HKglFz8uwVfZKgoI25rb/J+dnro=
+github.com/aws/smithy-go v1.22.1/go.mod h1:irrKGvNn1InZwb2d7fkIRNucdfwR8R+Ts3wxYa/cJHg=
 github.com/benbjohnson/clock v1.1.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA=
 github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=
 github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8=
 github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
 github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
-github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs=
 github.com/bndr/gotabulate v1.1.2 h1:yC9izuZEphojb9r+KYL4W9IJKO/ceIO8HDwxMA24U4c=
 github.com/bndr/gotabulate v1.1.2/go.mod h1:0+8yUgaPTtLRTjf49E8oju7ojpU11YmXyvq1LbPAb3U=
 github.com/buger/jsonparser v1.1.1 h1:2PnMjfWD7wBILjqQbt530v576A/cAbQvEW9gGIpYMUs=
 github.com/buger/jsonparser v1.1.1/go.mod h1:6RYKKt7H4d4+iWqouImQ9R2FZql3VbhNgx27UK13J/0=
 github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
-github.com/census-instrumentation/opencensus-proto v0.4.1 h1:iKLQ0xPNFxR/2hzXZMrBo8f1j86j5WHzznCCQxV/b8g=
-github.com/census-instrumentation/opencensus-proto v0.4.1/go.mod h1:4T9NM4+4Vw91VeyqjLS6ao50K5bOcLKN6Q42XnYaRYw=
 github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
 github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UFvs=
 github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
@@ -147,8 +141,8 @@ github.com/circonus-labs/circonus-gometrics v2.3.1+incompatible/go.mod h1:nmEj6D
 github.com/circonus-labs/circonusllhist v0.1.3/go.mod h1:kMXHVDlOchFAehlya5ePtbp5jckzBHf4XRpQvBOLI+I=
 github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
 github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc=
-github.com/cncf/xds/go v0.0.0-20240905190251-b4127c9b8d78 h1:QVw89YDxXxEe+l8gU8ETbOasdwEV+avkR75ZzsVV9WI=
-github.com/cncf/xds/go v0.0.0-20240905190251-b4127c9b8d78/go.mod h1:W+zGtBO5Y1IgJhy4+A9GOqVhqLpfZi+vwmdNXUehLA8=
+github.com/cncf/xds/go v0.0.0-20250121191232-2f005788dc42 h1:Om6kYQYDUk5wWbT0t0q6pvyM49i9XZAv9dDrkDA7gjk=
+github.com/cncf/xds/go v0.0.0-20250121191232-2f005788dc42/go.mod h1:W+zGtBO5Y1IgJhy4+A9GOqVhqLpfZi+vwmdNXUehLA8=
 github.com/codegangsta/cli v1.20.0/go.mod h1:/qJNoX69yVSKu5o4jLyXAENLRyk1uhi7zkbQ3slBdOA=
 github.com/coreos/go-semver v0.3.1 h1:yi21YpKnrx1gt5R+la8n5WgS0kCrsPp33dmEyHReZr4=
 github.com/coreos/go-semver v0.3.1/go.mod h1:irMmmIw/7yzSRPWryHsK7EYSg09caPQL03VsM8rvUec=
@@ -178,15 +172,17 @@ github.com/ebitengine/purego v0.8.1/go.mod h1:iIjxzd6CiRiOG0UyXP+V1+jWqUXVjPKLAI
 github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
 github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
 github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98=
-github.com/envoyproxy/go-control-plane v0.13.1 h1:vPfJZCkob6yTMEgS+0TwfTUfbHjfy/6vOJ8hUWX/uXE=
-github.com/envoyproxy/go-control-plane v0.13.1/go.mod h1:X45hY0mufo6Fd0KW3rqsGvQMw58jvjymeCzBU3mWyHw=
+github.com/envoyproxy/go-control-plane v0.13.4 h1:zEqyPVyku6IvWCFwux4x9RxkLOMUL+1vC9xUFv5l2/M=
+github.com/envoyproxy/go-control-plane v0.13.4/go.mod h1:kDfuBlDVsSj2MjrLEtRWtHlsWIFcGyB2RMO44Dc5GZA=
+github.com/envoyproxy/go-control-plane/envoy v1.32.4 h1:jb83lalDRZSpPWW2Z7Mck/8kXZ5CQAFYVjQcdVIr83A=
+github.com/envoyproxy/go-control-plane/envoy v1.32.4/go.mod h1:Gzjc5k8JcJswLjAx1Zm+wSYE20UrLtt7JZMWiWQXQEw=
+github.com/envoyproxy/go-control-plane/ratelimit v0.1.0 h1:/G9QYbddjL25KvtKTv3an9lx6VBE2cnb8wp1vEGNYGI=
+github.com/envoyproxy/go-control-plane/ratelimit v0.1.0/go.mod h1:Wk+tMFAFbCXaJPzVVHnPgRKdUdwW/KdbRt94AzgRee4=
 github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
-github.com/envoyproxy/protoc-gen-validate v1.1.0 h1:tntQDh69XqOCOZsDz0lVJQez/2L6Uu2PdjCQwWCJ3bM=
-github.com/envoyproxy/protoc-gen-validate v1.1.0/go.mod h1:sXRDRVmzEbkM7CVcM06s9shE/m23dg3wzjl0UWqJ2q4=
+github.com/envoyproxy/protoc-gen-validate v1.2.1 h1:DEo3O99U8j4hBFwbJfrz9VtgcDfUKS7KJ7spH3d86P8=
+github.com/envoyproxy/protoc-gen-validate v1.2.1/go.mod h1:d/C80l/jxXLdfEIhX1W2TmLfsJ31lvEjwamM4DxlWXU=
 github.com/evanphx/json-patch v5.9.0+incompatible h1:fBXyNpNMuTTDdquAq/uisOr2lShz4oaXpDTX2bLe7ls=
 github.com/evanphx/json-patch v5.9.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk=
-github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4=
-github.com/fatih/color v1.9.0/go.mod h1:eQcE1qtQxscV5RaZvpXrrb8Drkc3/DdQ+uUYCNjL+zU=
 github.com/fatih/color v1.13.0/go.mod h1:kLAiJbzzSOZDVNGyDpeOxJ47H46qBXwg5ILebYFFOfk=
 github.com/fatih/color v1.18.0 h1:S8gINlzdQ840/4pfAwic/ZE0djQEH3wM94VfqLTZcOM=
 github.com/fatih/color v1.18.0/go.mod h1:4FelSpRwEGDpQ12mAdzqdOukCy4u8WUtOY6lkT/6HfU=
@@ -224,9 +220,6 @@ github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69
 github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
 github.com/golang/glog v1.2.4 h1:CNNw5U8lSiiBk7druxtSHHTsRWcxKoac6kZKm2peBBc=
 github.com/golang/glog v1.2.4/go.mod h1:6AhwSGph0fcJtXVM/PEHPqZlFeoLxhs7/t5UDAwmO+w=
-github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
-github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da h1:oI5xCqsCo564l8iNU+DwB5epxmsaqB+rhGL0m5jtYqE=
-github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
 github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
 github.com/golang/mock v1.6.0/go.mod h1:p6yTPP+5HYm5mzsMV8JkE6ZKdX+/wYM6Hr+LicevLPs=
 github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
@@ -238,22 +231,20 @@ github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:x
 github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs=
 github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w=
 github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0=
-github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8=
 github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
 github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
 github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek=
 github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps=
 github.com/golang/snappy v0.0.4 h1:yAGX7huGHXlcLOEtBnF4w7FQwA26wojNCwOYAEhLjQM=
 github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
-github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
-github.com/google/btree v1.0.1 h1:gK4Kx5IaGY9CD5sPJ36FHiBJ6ZXl0kilRiiCj+jdYp4=
-github.com/google/btree v1.0.1/go.mod h1:xXMiIv4Fb/0kKde4SpL7qlzvu5cMJDRkFDxJfI9uaxA=
+github.com/google/btree v1.1.2 h1:xf4v41cLI2Z6FxbKm+8Bu+m8ifhj15JuZ9sa0jZCMUU=
+github.com/google/btree v1.1.2/go.mod h1:qOPhT0dTNdNzV6Z/lhRX0YXUafgPLFUh+gZMl761Gm4=
 github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
 github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
 github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
 github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.5.3/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
 github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
@@ -264,20 +255,19 @@ github.com/google/martian/v3 v3.3.3 h1:DIhPTQrbPkgs2yJYdXU/eNACCG5DVQjySNRNlflZ9
 github.com/google/martian/v3 v3.3.3/go.mod h1:iEPrYcgCF7jA9OtScMFQyAlZZ4YXTKEtJ1E6RWzmBA0=
 github.com/google/pprof v0.0.0-20240409012703-83162a5b38cd h1:gbpYu9NMq8jhDVbvlGkMFWCjLFlqqEZjEmObmhUy6Vo=
 github.com/google/pprof v0.0.0-20240409012703-83162a5b38cd/go.mod h1:kf6iHlnVGwgKolg33glAes7Yg/8iWP8ukqeldJSO7jw=
-github.com/google/s2a-go v0.1.8 h1:zZDs9gcbt9ZPLV0ndSyQk6Kacx2g/X+SKYovpnz3SMM=
-github.com/google/s2a-go v0.1.8/go.mod h1:6iNWHTpQ+nfNRN5E00MSdfDwVesa8hhS32PhPO8deJA=
+github.com/google/s2a-go v0.1.9 h1:LGD7gtMgezd8a/Xak7mEWL0PjoTQFvpRudN895yqKW0=
+github.com/google/s2a-go v0.1.9/go.mod h1:YA0Ei2ZQL3acow2O62kdp9UlnvMmU7kA6Eutn0dXayM=
 github.com/google/safehtml v0.1.0 h1:EwLKo8qawTKfsi0orxcQAZzu07cICaBeFMegAU9eaT8=
 github.com/google/safehtml v0.1.0/go.mod h1:L4KWwDsUJdECRAEpZoBn3O64bQaywRscowZjJAzjHnU=
 github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 h1:El6M4kTTCOh6aBiKaUGG7oYTSPP8MxqL4YI3kZKwcP4=
 github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510/go.mod h1:pupxD2MaaD3pAXIBCelhxNneeOaAeabZDe5s4K6zSpQ=
-github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/google/uuid v1.2.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
 github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/googleapis/enterprise-certificate-proxy v0.3.4 h1:XYIDZApgAnrN1c855gTgghdIA6Stxb52D5RnLI1SLyw=
 github.com/googleapis/enterprise-certificate-proxy v0.3.4/go.mod h1:YKe7cfqYXjKGpGvmSg28/fFvhNzinZQm8DGnaburhGA=
-github.com/googleapis/gax-go/v2 v2.14.0 h1:f+jMrjBPl+DL9nI4IQzLUxMq7XrAqFYB7hBPqMNIe8o=
-github.com/googleapis/gax-go/v2 v2.14.0/go.mod h1:lhBCnjdLrWRaPvLWhmc8IS24m9mr07qSYnHncrgo+zk=
+github.com/googleapis/gax-go/v2 v2.14.1 h1:hb0FFeiPaQskmvakKu5EbCbpntQn48jyHuvrkurSS/Q=
+github.com/googleapis/gax-go/v2 v2.14.1/go.mod h1:Hb/NubMaVM88SrNkvl8X/o8XWwDJEPqouaLeN2IUxoA=
 github.com/gopherjs/gopherjs v0.0.0-20181103185306-d547d1d9531e/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=
 github.com/gorilla/handlers v1.5.2 h1:cLTUSsNkgcwhgRqvCNmdbRWG0A3N4F+M2nWKdScwyEE=
 github.com/gorilla/handlers v1.5.2/go.mod h1:dX+xVpaxdSw+q0Qek8SSsl3dfMk3jNddUkMzo0GtH0w=
@@ -287,8 +277,8 @@ github.com/grpc-ecosystem/go-grpc-middleware v1.4.0 h1:UH//fgunKIs4JdUbpDl1VZCDa
 github.com/grpc-ecosystem/go-grpc-middleware v1.4.0/go.mod h1:g5qyo/la0ALbONm6Vbp88Yd8NsDy6rZz+RcrMPxvld8=
 github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 h1:Ovs26xHkKqVztRpIrF/92BcuyuQ/YW4NSIpoGtfXNho=
 github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk=
-github.com/hashicorp/consul/api v1.30.0 h1:ArHVMMILb1nQv8vZSGIwwQd2gtc+oSQZ6CalyiyH2XQ=
-github.com/hashicorp/consul/api v1.30.0/go.mod h1:B2uGchvaXVW2JhFoS8nqTxMD5PBykr4ebY4JWHTTeLM=
+github.com/hashicorp/consul/api v1.31.0 h1:32BUNLembeSRek0G/ZAM6WNfdEwYdYo8oQ4+JoqGkNQ=
+github.com/hashicorp/consul/api v1.31.0/go.mod h1:2ZGIiXM3A610NmDULmCHd/aqBJj8CkMfOhswhOafxRg=
 github.com/hashicorp/consul/sdk v0.16.1 h1:V8TxTnImoPD5cj0U9Spl0TUxcytjcbbJeADFF07KdHg=
 github.com/hashicorp/consul/sdk v0.16.1/go.mod h1:fSXvwxB2hmh1FMZCNl6PwX0Q/1wdWtHJcZ7Ea5tns0s=
 github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
@@ -302,11 +292,11 @@ github.com/hashicorp/go-hclog v1.6.3/go.mod h1:W4Qnvbt70Wk/zYJryRzDRU/4r0kIg0PVH
 github.com/hashicorp/go-immutable-radix v1.0.0/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60=
 github.com/hashicorp/go-immutable-radix v1.3.1 h1:DKHmCUm2hRBK510BaiZlwvpD40f8bJFeZnpfm2KLowc=
 github.com/hashicorp/go-immutable-radix v1.3.1/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60=
-github.com/hashicorp/go-msgpack v0.5.3/go.mod h1:ahLV/dePpqEmjfWmKiqvPkv/twdG7iPBM1vqhUKIvfM=
+github.com/hashicorp/go-metrics v0.5.4 h1:8mmPiIJkTPPEbAiV97IxdAGNdRdaWwVap1BU6elejKY=
+github.com/hashicorp/go-metrics v0.5.4/go.mod h1:CG5yz4NZ/AI/aQt9Ucm/vdBnbh7fvmv4lxZ350i+QQI=
 github.com/hashicorp/go-msgpack v0.5.5 h1:i9R9JSrqIz0QVLz3sz+i3YJdT7TTSLcfLLzJi9aZTuI=
-github.com/hashicorp/go-msgpack v0.5.5/go.mod h1:ahLV/dePpqEmjfWmKiqvPkv/twdG7iPBM1vqhUKIvfM=
-github.com/hashicorp/go-multierror v1.0.0/go.mod h1:dHtQlpGsu+cZNNAkkCN/P3hoUDHhCYQXV3UM06sGGrk=
-github.com/hashicorp/go-multierror v1.1.0/go.mod h1:spPvp8C1qA32ftKqdAHm4hHTbPw+vmowP0z+KUhOZdA=
+github.com/hashicorp/go-msgpack/v2 v2.1.2 h1:4Ee8FTp834e+ewB71RDrQ0VKpyFdrKOjvYtnQ/ltVj0=
+github.com/hashicorp/go-msgpack/v2 v2.1.2/go.mod h1:upybraOAblm4S7rx0+jeNy+CWWhzywQsSRV5033mMu4=
 github.com/hashicorp/go-multierror v1.1.1 h1:H5DkEtf6CXdFp0N0Em5UCwQpXMWke8IA0+lD48awMYo=
 github.com/hashicorp/go-multierror v1.1.1/go.mod h1:iw975J/qwKPdAO1clOe2L8331t/9/fmwbPZ6JB6eMoM=
 github.com/hashicorp/go-retryablehttp v0.5.3/go.mod h1:9B5zBasrRhHXnJnui7y6sL7es7NDiJgTc6Er0maI1Xs=
@@ -316,12 +306,9 @@ github.com/hashicorp/go-secure-stdlib/parseutil v0.1.8 h1:iBt4Ew4XEGLfh6/bPk4rSY
 github.com/hashicorp/go-secure-stdlib/parseutil v0.1.8/go.mod h1:aiJI+PIApBRQG7FZTEBx5GiiX+HbOHilUdNxUZi4eV0=
 github.com/hashicorp/go-secure-stdlib/strutil v0.1.2 h1:kes8mmyCpxJsI7FTwtzRqEy9CdjCtrXrXGuOpxEA7Ts=
 github.com/hashicorp/go-secure-stdlib/strutil v0.1.2/go.mod h1:Gou2R9+il93BqX25LAKCLuM+y9U2T4hlwvT1yprcna4=
-github.com/hashicorp/go-sockaddr v1.0.0/go.mod h1:7Xibr9yA9JjQq1JpNB2Vw7kxv8xerXegt+ozgdvDeDU=
 github.com/hashicorp/go-sockaddr v1.0.7 h1:G+pTkSO01HpR5qCxg7lxfsFEZaG+C0VssTy/9dbT+Fw=
 github.com/hashicorp/go-sockaddr v1.0.7/go.mod h1:FZQbEYa1pxkQ7WLpyXJ6cbjpT8q0YgQaK/JakXqGyWw=
-github.com/hashicorp/go-syslog v1.0.0/go.mod h1:qPfqrKkXGihmCqbJM2mZgkZGvKG1dFdvsLplgctolz4=
 github.com/hashicorp/go-uuid v1.0.0/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro=
-github.com/hashicorp/go-uuid v1.0.1/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro=
 github.com/hashicorp/go-uuid v1.0.3 h1:2gKiV6YVmrJ1i2CKKa9obLvRieoRGviZFL26PcT/Co8=
 github.com/hashicorp/go-uuid v1.0.3/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro=
 github.com/hashicorp/go-version v1.7.0 h1:5tqGy27NaOTB8yJKUZELlFAS/LTKJkrmONwQKeRZfjY=
@@ -329,25 +316,25 @@ github.com/hashicorp/go-version v1.7.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09
 github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
 github.com/hashicorp/golang-lru v1.0.2 h1:dV3g9Z/unq5DpblPpw+Oqcv4dU/1omnb4Ok8iPY6p1c=
 github.com/hashicorp/golang-lru v1.0.2/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4=
-github.com/hashicorp/golang-lru/v2 v2.0.7 h1:a+bsQ5rvGLjzHuww6tVxozPZFVghXaHOwFs4luLUK2k=
-github.com/hashicorp/golang-lru/v2 v2.0.7/go.mod h1:QeFd9opnmA6QUJc5vARoKUSoFhyfM2/ZepoAG6RGpeM=
 github.com/hashicorp/hcl v1.0.1-vault-7 h1:ag5OxFVy3QYTFTJODRzTKVZ6xvdfLLCA1cy/Y6xGI0I=
 github.com/hashicorp/hcl v1.0.1-vault-7/go.mod h1:XYhtn6ijBSAj6n4YqAaf7RBPS4I06AItNorpy+MoQNM=
-github.com/hashicorp/logutils v1.0.0/go.mod h1:QIAnNjmIWmVIIkWDTG1z5v++HQmx9WQRO+LraFDTW64=
-github.com/hashicorp/mdns v1.0.4/go.mod h1:mtBihi+LeNXGtG8L9dX59gAEa12BDtBQSp4v/YAJqrc=
-github.com/hashicorp/memberlist v0.5.0 h1:EtYPN8DpAURiapus508I4n9CzHs2W+8NZGbmmR/prTM=
-github.com/hashicorp/memberlist v0.5.0/go.mod h1:yvyXLpo0QaGE59Y7hDTsTzDD25JYBZ4mHgHUZ8lrOI0=
-github.com/hashicorp/serf v0.10.1 h1:Z1H2J60yRKvfDYAOZLd2MU0ND4AH/WDz7xYHDWQsIPY=
-github.com/hashicorp/serf v0.10.1/go.mod h1:yL2t6BqATOLGc5HF7qbFkTfXoPIY0WZdWHfEvMqbG+4=
+github.com/hashicorp/memberlist v0.5.2 h1:rJoNPWZ0juJBgqn48gjy59K5H4rNgvUoM1kUD7bXiuI=
+github.com/hashicorp/memberlist v0.5.2/go.mod h1:Ri9p/tRShbjYnpNf4FFPXG7wxEGY4Nrcn6E7jrVa//4=
+github.com/hashicorp/serf v0.10.2 h1:m5IORhuNSjaxeljg5DeQVDlQyVkhRIjJDimbkCa8aAc=
+github.com/hashicorp/serf v0.10.2/go.mod h1:T1CmSGfSeGfnfNy/w0odXQUR1rfECGd2Qdsp84DjOiY=
 github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
 github.com/icrowley/fake v0.0.0-20180203215853-4178557ae428 h1:Mo9W14pwbO9VfRe+ygqZ8dFbPpoIK1HFrG/zjTuQ+nc=
 github.com/icrowley/fake v0.0.0-20180203215853-4178557ae428/go.mod h1:uhpZMVGznybq1itEKXj6RYw9I71qK4kH+OGMjRC4KEo=
 github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8=
 github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw=
+github.com/jpillora/backoff v1.0.0/go.mod h1:J/6gKK9jxlEcS3zixgDgUAsiuZ7yrSoa/FX5e0EB2j4=
 github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
 github.com/json-iterator/go v1.1.9/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
+github.com/json-iterator/go v1.1.10/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
+github.com/json-iterator/go v1.1.11/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
 github.com/jtolds/gls v4.2.1+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU=
 github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w=
+github.com/julienschmidt/httprouter v1.3.0/go.mod h1:JR6WtHb+2LUe8TCKY3cZOxFyyO8IZAc4RVcycCCAKdM=
 github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8=
 github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
 github.com/klauspost/compress v1.17.11 h1:In6xLpyWOi1+C7tXUUWv2ot1QvBjxevKAaI6IXrJmUc=
@@ -355,6 +342,7 @@ github.com/klauspost/compress v1.17.11/go.mod h1:pMDklpSncoRMuLFrf1W9Ss9KT+0rH90
 github.com/klauspost/pgzip v1.2.6 h1:8RXeL5crjEUFnR2/Sn6GJNWtSQ3Dk8pq4CL3jvdDyjU=
 github.com/klauspost/pgzip v1.2.6/go.mod h1:Ch1tH69qFZu15pkjo5kYi6mth2Zzwzt50oCQKQE9RUs=
 github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
+github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
 github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc=
 github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
 github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
@@ -368,40 +356,29 @@ github.com/krishicks/yaml-patch v0.0.10 h1:H4FcHpnNwVmw8u0MjPRjWyIXtco6zM2F78t+5
 github.com/krishicks/yaml-patch v0.0.10/go.mod h1:Sm5TchwZS6sm7RJoyg87tzxm2ZcKzdRE4Q7TjNhPrME=
 github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0SNc=
 github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw=
-github.com/magiconair/properties v1.8.7 h1:IeQXZAiQcpL9mgcAe1Nu6cX9LLw6ExEHKjN0VQdvPDY=
-github.com/magiconair/properties v1.8.7/go.mod h1:Dhd985XPs7jluiymwWYZ0G4Z61jb3vdS329zhj2hYo0=
-github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU=
-github.com/mattn/go-colorable v0.1.4/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE=
-github.com/mattn/go-colorable v0.1.6/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc=
+github.com/magiconair/properties v1.8.9 h1:nWcCbLq1N2v/cpNsy5WvQ37Fb+YElfq20WJ/a8RkpQM=
+github.com/magiconair/properties v1.8.9/go.mod h1:Dhd985XPs7jluiymwWYZ0G4Z61jb3vdS329zhj2hYo0=
 github.com/mattn/go-colorable v0.1.9/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc=
 github.com/mattn/go-colorable v0.1.12/go.mod h1:u5H1YNBxpqRaxsYJYSkiCWKzEfiAb1Gb520KVy5xxl4=
-github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA=
-github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg=
+github.com/mattn/go-colorable v0.1.14 h1:9A9LHSqF/7dyVVX6g0U9cwm9pG3kP9gSzcuIPHPsaIE=
+github.com/mattn/go-colorable v0.1.14/go.mod h1:6LmQG8QLFO4G5z1gPvYEzlUgJ2wF+stgPZH1UqBm1s8=
 github.com/mattn/go-ieproxy v0.0.1/go.mod h1:pYabZ6IHcRpFh7vIaLfK7rdcWgFEb3SFJ6/gNWuh88E=
 github.com/mattn/go-ieproxy v0.0.12 h1:OZkUFJC3ESNZPQ+6LzC3VJIFSnreeFLQyqvBWtvfL2M=
 github.com/mattn/go-ieproxy v0.0.12/go.mod h1:Vn+N61199DAnVeTgaF8eoB9PvLO8P3OBnG95ENh7B7c=
-github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4=
-github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
-github.com/mattn/go-isatty v0.0.11/go.mod h1:PhnuNfih5lzO57/f3n+odYbM4JtupLOxQOAqxQCu2WE=
 github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU=
 github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94=
-github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
 github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY=
 github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
 github.com/mattn/go-runewidth v0.0.9/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI=
 github.com/mattn/go-runewidth v0.0.16 h1:E5ScNMtiwvlvB5paMFdw9p4kSQzbXFikJ5SQO6TULQc=
 github.com/mattn/go-runewidth v0.0.16/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w=
 github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
-github.com/miekg/dns v1.1.26/go.mod h1:bPDLeHnStXmXAq1m/Ch/hvfNHr14JKNPMBo3VZKjuso=
-github.com/miekg/dns v1.1.41/go.mod h1:p6aan82bvRIyn+zDIv9xYNUpwa73JcSh9BKwknJysuI=
-github.com/miekg/dns v1.1.55 h1:GoQ4hpsj0nFLYe+bWiCToyrBEJXkQfOOIvFGFy0lEgo=
-github.com/miekg/dns v1.1.55/go.mod h1:uInx36IzPl7FYnDcMeVWxj9byh7DutNykX4G9Sj60FY=
+github.com/miekg/dns v1.1.56 h1:5imZaSeoRNvpM9SzWNhEcP9QliKiz20/dA2QabIGVnE=
+github.com/miekg/dns v1.1.56/go.mod h1:cRm6Oo2C8TY9ZS/TqsSrseAcncm74lfK5G+ikN2SWWY=
 github.com/minio/minio-go v0.0.0-20190131015406-c8a261de75c1 h1:jw16EimP5oAEM/2wt+SiEUov/YDyTCTDuPtIKgQIvk0=
 github.com/minio/minio-go v0.0.0-20190131015406-c8a261de75c1/go.mod h1:vuvdOZLJuf5HmJAJrKV64MmozrSsk+or0PB5dzdfspg=
-github.com/mitchellh/cli v1.1.0/go.mod h1:xcISNoH86gajksDmfB23e/pu+B+GeFRMYmoHXxx3xhI=
 github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG+4E0Y=
 github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
-github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=
 github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY=
 github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
 github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
@@ -413,6 +390,7 @@ github.com/montanaflynn/stats v0.7.1/go.mod h1:etXPPgVO6n31NxCd9KQUMvCM+ve0ruNzt
 github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA=
 github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
 github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
+github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
 github.com/ncruces/go-strftime v0.1.9 h1:bY0MQC28UADQmHmaF5dgpLmImcShSi2kHU9XLdhx/f4=
 github.com/ncruces/go-strftime v0.1.9/go.mod h1:Fwc5htZGVVkseilnfgOVb9mKy6w1naJmn9CehxcKcls=
 github.com/ngdinhtoan/glide-cleanup v0.2.0/go.mod h1:UQzsmiDOb8YV3nOsCxK/c9zPpCZVNoHScRE3EO9pVMM=
@@ -438,7 +416,6 @@ github.com/opentracing/opentracing-go v1.2.0 h1:uEJPy/1a5RIPAJ0Ov+OIO8OxWu77jEv+
 github.com/opentracing/opentracing-go v1.2.0/go.mod h1:GxEUsuufX4nBwe+T+Wl9TAgYrxe9dPLANfrWvHYVTgc=
 github.com/outcaste-io/ristretto v0.2.3 h1:AK4zt/fJ76kjlYObOeNwh4T3asEuaCmp26pOvUOL9w0=
 github.com/outcaste-io/ristretto v0.2.3/go.mod h1:W8HywhmtlopSB1jeMg3JtdIhf+DYkLAr0VN/s4+MHac=
-github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc=
 github.com/pascaldekloe/goe v0.1.0 h1:cBOtyMzM9HTpWjXfbbunk26uA6nG3a8n06Wieeh0MwY=
 github.com/pascaldekloe/goe v0.1.0/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc=
 github.com/patrickmn/go-cache v2.1.0+incompatible h1:HRMgzkcYKYpi3C8ajMPV8OFXaaRUnok+kx1WdO15EQc=
@@ -458,16 +435,16 @@ github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
 github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/planetscale/pargzip v0.0.0-20201116224723-90c7fc03ea8a h1:y0OpQ4+5tKxeh9+H+2cVgASl9yMZYV9CILinKOiKafA=
 github.com/planetscale/pargzip v0.0.0-20201116224723-90c7fc03ea8a/go.mod h1:GJFUzQuXIoB2Kjn1ZfDhJr/42D5nWOqRcIQVgCxTuIE=
-github.com/planetscale/vtprotobuf v0.6.1-0.20241011083415-71c992bc3c87 h1:ejBLlgnQdFWS/QGVdGYBRKsorfWl8rOysCC6aUOlCZc=
-github.com/planetscale/vtprotobuf v0.6.1-0.20241011083415-71c992bc3c87/go.mod h1:t/avpk3KcrXxUnYOhZhMXJlSEyie6gQbtLq5NM3loB8=
+github.com/planetscale/vtprotobuf v0.6.1-0.20241121165744-79df5c4772f2 h1:1sLMdKq4gNANTj0dUibycTLzpIEKVnLnbaEkxws78nw=
+github.com/planetscale/vtprotobuf v0.6.1-0.20241121165744-79df5c4772f2/go.mod h1:t/avpk3KcrXxUnYOhZhMXJlSEyie6gQbtLq5NM3loB8=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U=
 github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI=
-github.com/posener/complete v1.2.3/go.mod h1:WZIdtGGp+qx0sLrYKtIRAruyNpv6hFCicSgv7Sy7s/s=
 github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw=
 github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo=
 github.com/prometheus/client_golang v1.4.0/go.mod h1:e9GMxYsXl05ICDXkRhurwBS4Q3OK1iX/F2sw+iXX5zU=
+github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M=
+github.com/prometheus/client_golang v1.11.1/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0=
 github.com/prometheus/client_golang v1.20.5 h1:cxppBPuYhUnsO6yo/aoRol4L7q7UFfdm+bR9r+8l63Y=
 github.com/prometheus/client_golang v1.20.5/go.mod h1:PIEt8X02hGcP8JWbeHyeZ53Y/jReSnHgO035n//V5WE=
 github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo=
@@ -478,11 +455,15 @@ github.com/prometheus/client_model v0.6.1 h1:ZKSh/rekM+n3CeS952MLRAdFwIKqeY8b62p
 github.com/prometheus/client_model v0.6.1/go.mod h1:OrxVMOVHjw3lKMa8+x6HeMGkHMQyHDk9E3jmP2AmGiY=
 github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4=
 github.com/prometheus/common v0.9.1/go.mod h1:yhUN8i9wzaXS3w1O07YhxHEBxD+W35wd8bs7vj7HSQ4=
-github.com/prometheus/common v0.60.1 h1:FUas6GcOw66yB/73KC+BOZoFJmbo/1pojoILArPAaSc=
-github.com/prometheus/common v0.60.1/go.mod h1:h0LYf1R1deLSKtD4Vdg8gy4RuOvENW2J/h19V5NADQw=
+github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB80sz/V91rCo=
+github.com/prometheus/common v0.26.0/go.mod h1:M7rCNAaPfAosfx8veZJCuw84e35h3Cfd9VFqTh1DIvc=
+github.com/prometheus/common v0.62.0 h1:xasJaQlnWAeyHdUBeGjXmutelfJHWMRr+Fg4QszZ2Io=
+github.com/prometheus/common v0.62.0/go.mod h1:vyBcEuLSvWos9B1+CyL7JZ2up+uFzXhkqml0W5zIY1I=
 github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
 github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA=
 github.com/prometheus/procfs v0.0.8/go.mod h1:7Qr8sr6344vo1JqZ6HhLceV9o3AJ1Ff+GxbHq6oeK9A=
+github.com/prometheus/procfs v0.1.3/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU=
+github.com/prometheus/procfs v0.6.0/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA=
 github.com/prometheus/procfs v0.15.1 h1:YagwOFzUgYfKKHX6Dr+sHT7km/hxC76UB0learggepc=
 github.com/prometheus/procfs v0.15.1/go.mod h1:fB45yRUv8NstnjriLhBQLuOUt+WW4BsoGhij/e3PBqk=
 github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec h1:W09IVJc94icq4NjY3clb7Lk8O1qJ8BdBEF8z0ibU0rE=
@@ -497,11 +478,10 @@ github.com/rogpeppe/go-internal v1.13.1 h1:KvO1DLK/DRN07sQ1LQKScxyZJuNnedQ5/wKSR
 github.com/rogpeppe/go-internal v1.13.1/go.mod h1:uMEvuHeurkdAXX61udpOXGD/AzZDWNMNyH2VO9fmH0o=
 github.com/russross/blackfriday/v2 v2.1.0 h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf35Ld67mk=
 github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
-github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts=
 github.com/ryanuber/go-glob v1.0.0 h1:iQh3xXAumdQ+4Ufa5b25cRpC5TYKlno6hsv6Cb3pkBk=
 github.com/ryanuber/go-glob v1.0.0/go.mod h1:807d1WSdnB0XRJzKNil9Om6lcp/3a0v4qIHxIXzX/Yc=
-github.com/sagikazarmark/locafero v0.6.0 h1:ON7AQg37yzcRPU69mt7gwhFEBwxI6P9T4Qu3N51bwOk=
-github.com/sagikazarmark/locafero v0.6.0/go.mod h1:77OmuIc6VTraTXKXIs/uvUxKGUXjE1GbemJYHqdNjX0=
+github.com/sagikazarmark/locafero v0.7.0 h1:5MqpDsTGNDhY8sGp0Aowyf0qKsPrhewaLSsFaodPcyo=
+github.com/sagikazarmark/locafero v0.7.0/go.mod h1:2za3Cg5rMaTMoG/2Ulr9AwtFaIppKXTRYnozin4aB5k=
 github.com/sagikazarmark/slog-shim v0.1.0 h1:diDBnUNK9N/354PgrxMywXnAwEr1QZcOr6gto+ugjYE=
 github.com/sagikazarmark/slog-shim v0.1.0/go.mod h1:SrcSrq8aKtyuqEI1uvTDTK1arOWRIczQRv+GVI1AkeQ=
 github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529 h1:nn5Wsu0esKSJiIVhscUtVbo7ada43DJhG55ua/hjS5I=
@@ -510,6 +490,7 @@ github.com/secure-systems-lab/go-securesystemslib v0.8.0 h1:mr5An6X45Kb2nddcFlbm
 github.com/secure-systems-lab/go-securesystemslib v0.8.0/go.mod h1:UH2VZVuJfCYR8WgMlCU1uFsOUU+KeyrTWcSS73NBOzU=
 github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo=
 github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
+github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88=
 github.com/sirupsen/logrus v1.7.0/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0=
 github.com/sjmudd/stopwatch v0.1.1 h1:x45OvxFB5OtCkjvYtzRF5fWB857Jzjjk84Oyd5C5ebw=
 github.com/sjmudd/stopwatch v0.1.1/go.mod h1:BLw0oIQJ1YLXBO/q9ufK/SgnKBVIkC2qrm6uy78Zw6U=
@@ -521,16 +502,17 @@ github.com/sourcegraph/conc v0.3.0 h1:OQTbbt6P72L20UqAkXXuLOj79LfEanQ+YQFNpLA9yS
 github.com/sourcegraph/conc v0.3.0/go.mod h1:Sdozi7LEKbFPqYX2/J+iBAM6HpqSLTASQIKqDmF7Mt0=
 github.com/spaolacci/murmur3 v1.1.0 h1:7c1g84S4BPRrfL5Xrdp6fOJ206sU9y293DDHaoy0bLI=
 github.com/spaolacci/murmur3 v1.1.0/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA=
-github.com/spf13/afero v1.11.0 h1:WJQKhtpdm3v2IzqG8VMqrr6Rf3UYpEF239Jy9wNepM8=
-github.com/spf13/afero v1.11.0/go.mod h1:GH9Y3pIexgf1MTIWtNGyogA5MwRIDXGUr+hbWNoBjkY=
-github.com/spf13/cast v1.7.0 h1:ntdiHjuueXFgm5nzDRdOS4yfT43P5Fnud6DH50rz/7w=
-github.com/spf13/cast v1.7.0/go.mod h1:ancEpBxwJDODSW/UG4rDrAqiKolqNNh2DX3mk86cAdo=
+github.com/spf13/afero v1.12.0 h1:UcOPyRBYczmFn6yvphxkn9ZEOY65cpwGKb5mL36mrqs=
+github.com/spf13/afero v1.12.0/go.mod h1:ZTlWwG4/ahT8W7T0WQ5uYmjI9duaLQGy3Q2OAl4sk/4=
+github.com/spf13/cast v1.7.1 h1:cuNEagBQEHWN1FnbGEjCXL2szYEXqfJPbP2HNUaca9Y=
+github.com/spf13/cast v1.7.1/go.mod h1:ancEpBxwJDODSW/UG4rDrAqiKolqNNh2DX3mk86cAdo=
 github.com/spf13/cobra v1.8.1 h1:e5/vxKd/rZsfSJMUX1agtjeTDf+qv1/JdBF8gg5k9ZM=
 github.com/spf13/cobra v1.8.1/go.mod h1:wHxEcudfqmLYa8iTfL+OuZPbBZkmvliBWKIezN3kD9Y=
 github.com/spf13/jwalterweatherman v1.1.0 h1:ue6voC5bR5F8YxI5S67j9i582FU4Qvo2bmqnqMYADFk=
 github.com/spf13/jwalterweatherman v1.1.0/go.mod h1:aNWZUN0dPAAO/Ljvb5BEdw96iTZ0EXowPYD95IqWIGo=
-github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
 github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
+github.com/spf13/pflag v1.0.6 h1:jFzHGLGAlb3ruxLB8MhbI6A8+AQX/2eW4qeyNZXNp2o=
+github.com/spf13/pflag v1.0.6/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
 github.com/spf13/viper v1.19.0 h1:RWq5SEjt8o25SROyN3z2OrDB9l7RPd3lwTWU8EcEdcI=
 github.com/spf13/viper v1.19.0/go.mod h1:GQUN9bilAbhU/jgc1bKs99f/suXKeUMct8Adx5+Ntkg=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
@@ -548,8 +530,8 @@ github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/
 github.com/stretchr/testify v1.7.2/go.mod h1:R6va5+xMeoiuVRoj+gSkQ7d3FALtqAAGI1FQKckRals=
 github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
 github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
-github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
-github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
+github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
+github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
 github.com/subosito/gotenv v1.6.0 h1:9NlTDc1FTs4qu0DDq7AEtTPNw6SVm7uBMsUCUjABIf8=
 github.com/subosito/gotenv v1.6.0/go.mod h1:Dk4QP5c2W3ibzajGcXpNraDfq2IrhjMIvMSWPKKo0FU=
 github.com/tchap/go-patricia v2.3.0+incompatible h1:GkY4dP3cEfEASBPPkWd+AmjYxhmDkqO9/zg7R0lSQRs=
@@ -577,30 +559,32 @@ github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9dec
 github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
 github.com/z-division/go-zookeeper v1.0.0 h1:ULsCj0nP6+U1liDFWe+2oEF6o4amixoDcDlwEUghVUY=
 github.com/z-division/go-zookeeper v1.0.0/go.mod h1:6X4UioQXpvyezJJl4J9NHAJKsoffCwy5wCaaTktXjOA=
-go.etcd.io/etcd/api/v3 v3.5.17 h1:cQB8eb8bxwuxOilBpMJAEo8fAONyrdXTHUNcMd8yT1w=
-go.etcd.io/etcd/api/v3 v3.5.17/go.mod h1:d1hvkRuXkts6PmaYk2Vrgqbv7H4ADfAKhyJqHNLJCB4=
-go.etcd.io/etcd/client/pkg/v3 v3.5.17 h1:XxnDXAWq2pnxqx76ljWwiQ9jylbpC4rvkAeRVOUKKVw=
-go.etcd.io/etcd/client/pkg/v3 v3.5.17/go.mod h1:4DqK1TKacp/86nJk4FLQqo6Mn2vvQFBmruW3pP14H/w=
-go.etcd.io/etcd/client/v3 v3.5.17 h1:o48sINNeWz5+pjy/Z0+HKpj/xSnBkuVhVvXkjEXbqZY=
-go.etcd.io/etcd/client/v3 v3.5.17/go.mod h1:j2d4eXTHWkT2ClBgnnEPm/Wuu7jsqku41v9DZ3OtjQo=
-go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0=
-go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo=
-go.opentelemetry.io/contrib/detectors/gcp v1.32.0 h1:P78qWqkLSShicHmAzfECaTgvslqHxblNE9j62Ws1NK8=
-go.opentelemetry.io/contrib/detectors/gcp v1.32.0/go.mod h1:TVqo0Sda4Cv8gCIixd7LuLwW4EylumVWfhjZJjDD4DU=
-go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.57.0 h1:qtFISDHKolvIxzSs0gIaiPUPR0Cucb0F2coHC7ZLdps=
-go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.57.0/go.mod h1:Y+Pop1Q6hCOnETWTW4NROK/q1hv50hM7yDaUTjG8lp8=
-go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.57.0 h1:DheMAlT6POBP+gh8RUH19EOTnQIor5QE0uSRPtzCpSw=
-go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.57.0/go.mod h1:wZcGmeVO9nzP67aYSLDqXNWK87EZWhi7JWj1v7ZXf94=
-go.opentelemetry.io/otel v1.32.0 h1:WnBN+Xjcteh0zdk01SVqV55d/m62NJLJdIyb4y/WO5U=
-go.opentelemetry.io/otel v1.32.0/go.mod h1:00DCVSB0RQcnzlwyTfqtxSm+DRr9hpYrHjNGiBHVQIg=
-go.opentelemetry.io/otel/metric v1.32.0 h1:xV2umtmNcThh2/a/aCP+h64Xx5wsj8qqnkYZktzNa0M=
-go.opentelemetry.io/otel/metric v1.32.0/go.mod h1:jH7CIbbK6SH2V2wE16W05BHCtIDzauciCRLoc/SyMv8=
-go.opentelemetry.io/otel/sdk v1.32.0 h1:RNxepc9vK59A8XsgZQouW8ue8Gkb4jpWtJm9ge5lEG4=
-go.opentelemetry.io/otel/sdk v1.32.0/go.mod h1:LqgegDBjKMmb2GC6/PrTnteJG39I8/vJCAP9LlJXEjU=
-go.opentelemetry.io/otel/sdk/metric v1.32.0 h1:rZvFnvmvawYb0alrYkjraqJq0Z4ZUJAiyYCU9snn1CU=
-go.opentelemetry.io/otel/sdk/metric v1.32.0/go.mod h1:PWeZlq0zt9YkYAp3gjKZ0eicRYvOh1Gd+X99x6GHpCQ=
-go.opentelemetry.io/otel/trace v1.32.0 h1:WIC9mYrXf8TmY/EXuULKc8hR17vE+Hjv2cssQDe03fM=
-go.opentelemetry.io/otel/trace v1.32.0/go.mod h1:+i4rkvCraA+tG6AzwloGaCtkx53Fa+L+V8e9a7YvhT8=
+go.etcd.io/etcd/api/v3 v3.5.18 h1:Q4oDAKnmwqTo5lafvB+afbgCDF7E35E4EYV2g+FNGhs=
+go.etcd.io/etcd/api/v3 v3.5.18/go.mod h1:uY03Ob2H50077J7Qq0DeehjM/A9S8PhVfbQ1mSaMopU=
+go.etcd.io/etcd/client/pkg/v3 v3.5.18 h1:mZPOYw4h8rTk7TeJ5+3udUkfVGBqc+GCjOJYd68QgNM=
+go.etcd.io/etcd/client/pkg/v3 v3.5.18/go.mod h1:BxVf2o5wXG9ZJV+/Cu7QNUiJYk4A29sAhoI5tIRsCu4=
+go.etcd.io/etcd/client/v3 v3.5.18 h1:nvvYmNHGumkDjZhTHgVU36A9pykGa2K4lAJ0yY7hcXA=
+go.etcd.io/etcd/client/v3 v3.5.18/go.mod h1:kmemwOsPU9broExyhYsBxX4spCTDX3yLgPMWtpBXG6E=
+go.opentelemetry.io/auto/sdk v1.1.0 h1:cH53jehLUN6UFLY71z+NDOiNJqDdPRaXzTel0sJySYA=
+go.opentelemetry.io/auto/sdk v1.1.0/go.mod h1:3wSPjt5PWp2RhlCcmmOial7AvC4DQqZb7a7wCow3W8A=
+go.opentelemetry.io/contrib/detectors/gcp v1.34.0 h1:JRxssobiPg23otYU5SbWtQC//snGVIM3Tx6QRzlQBao=
+go.opentelemetry.io/contrib/detectors/gcp v1.34.0/go.mod h1:cV4BMFcscUR/ckqLkbfQmF0PRsq8w/lMGzdbCSveBHo=
+go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.59.0 h1:rgMkmiGfix9vFJDcDi1PK8WEQP4FLQwLDfhp5ZLpFeE=
+go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.59.0/go.mod h1:ijPqXp5P6IRRByFVVg9DY8P5HkxkHE5ARIa+86aXPf4=
+go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.59.0 h1:CV7UdSGJt/Ao6Gp4CXckLxVRRsRgDHoI8XjbL3PDl8s=
+go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.59.0/go.mod h1:FRmFuRJfag1IZ2dPkHnEoSFVgTVPUd2qf5Vi69hLb8I=
+go.opentelemetry.io/otel v1.34.0 h1:zRLXxLCgL1WyKsPVrgbSdMN4c0FMkDAskSTQP+0hdUY=
+go.opentelemetry.io/otel v1.34.0/go.mod h1:OWFPOQ+h4G8xpyjgqo4SxJYdDQ/qmRH+wivy7zzx9oI=
+go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.29.0 h1:WDdP9acbMYjbKIyJUhTvtzj601sVJOqgWdUxSdR/Ysc=
+go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.29.0/go.mod h1:BLbf7zbNIONBLPwvFnwNHGj4zge8uTCM/UPIVW1Mq2I=
+go.opentelemetry.io/otel/metric v1.34.0 h1:+eTR3U0MyfWjRDhmFMxe2SsW64QrZ84AOhvqS7Y+PoQ=
+go.opentelemetry.io/otel/metric v1.34.0/go.mod h1:CEDrp0fy2D0MvkXE+dPV7cMi8tWZwX3dmaIhwPOaqHE=
+go.opentelemetry.io/otel/sdk v1.34.0 h1:95zS4k/2GOy069d321O8jWgYsW3MzVV+KuSPKp7Wr1A=
+go.opentelemetry.io/otel/sdk v1.34.0/go.mod h1:0e/pNiaMAqaykJGKbi+tSjWfNNHMTxoC9qANsCzbyxU=
+go.opentelemetry.io/otel/sdk/metric v1.34.0 h1:5CeK9ujjbFVL5c1PhLuStg1wxA7vQv7ce1EK0Gyvahk=
+go.opentelemetry.io/otel/sdk/metric v1.34.0/go.mod h1:jQ/r8Ze28zRKoNRdkjCZxfs6YvBTG1+YIqyFVFYec5w=
+go.opentelemetry.io/otel/trace v1.34.0 h1:+ouXS2V8Rd4hp4580a8q23bg0azF2nI8cqLYnC8mh/k=
+go.opentelemetry.io/otel/trace v1.34.0/go.mod h1:Svm7lSjQD7kG7KJ/MUHPVXSDGz2OX4h0M2jHBhmSfRE=
 go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc=
 go.uber.org/atomic v1.9.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc=
 go.uber.org/atomic v1.11.0 h1:ZvwS0R+56ePWxUNi+Atn9dWONBPp/AUETXlHW0DxSjE=
@@ -608,8 +592,8 @@ go.uber.org/atomic v1.11.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0
 go.uber.org/goleak v1.1.10/go.mod h1:8a7PlsEVH3e/a/GLqe5IIrQx6GzcnRmZEufDUTk4A7A=
 go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto=
 go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE=
-go.uber.org/mock v0.2.0 h1:TaP3xedm7JaAgScZO7tlvlKrqT0p7I6OsdGB5YNSMDU=
-go.uber.org/mock v0.2.0/go.mod h1:J0y0rp9L3xiff1+ZBfKxlC1fz2+aO16tw0tsDOixfuM=
+go.uber.org/mock v0.5.0 h1:KAMbZvZPyBPWgD14IrIQ38QCyjwpvVVV6K/bHl1IwQU=
+go.uber.org/mock v0.5.0/go.mod h1:ge71pBPLYDk7QIi1LupWxdAykm7KIEFchiOqd6z7qMM=
 go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU=
 go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0=
 go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y=
@@ -619,16 +603,15 @@ go.uber.org/zap v1.27.0/go.mod h1:GB2qFLM7cTU87MWRP2mPIjqfIDnGu+VIO4V/SdhGo2E=
 golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
 golang.org/x/crypto v0.0.0-20190128193316-c7b33c32a30b/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
-golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod h1:/lpIB1dKB+9EgE3H3cr1v9wB50oz8l4C4h62xy7jSTY=
 golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20201002170205-7f63de1d35b0/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20201016220609-9e8e0b390897/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
-golang.org/x/crypto v0.31.0 h1:ihbySMvVjLAeSH1IbfcRTkD/iNscyz8rGzjF/E5hV6U=
-golang.org/x/crypto v0.31.0/go.mod h1:kDsLvtWBEx7MV9tJOj9bnXsPbxwJQ6csT/x4KIN4Ssk=
+golang.org/x/crypto v0.32.0 h1:euUpcYgM8WcP71gNpTqQCn6rC2t6ULUPiOzfWaXVVfc=
+golang.org/x/crypto v0.32.0/go.mod h1:ZnnJkOaASj8g0AjIduWNlq2NRxL0PlBrbKVyZ6V/Ugc=
 golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
-golang.org/x/exp v0.0.0-20241108190413-2d47ceb2692f h1:XdNn9LlyWAhLVp6P/i8QYBW+hlyhrhei9uErw2B5GJo=
-golang.org/x/exp v0.0.0-20241108190413-2d47ceb2692f/go.mod h1:D5SMRVC3C2/4+F/DB1wZsLRnSNimn2Sp/NPsCrsv8ak=
+golang.org/x/exp v0.0.0-20250128182459-e0ece0dbea4c h1:KL/ZBHXgKGVmuZBZ01Lt57yE5ws8ZPSkkihmEyq7FXc=
+golang.org/x/exp v0.0.0-20250128182459-e0ece0dbea4c/go.mod h1:tujkw807nyEEAamNbDrEGzRav+ilXA7PCRAd6xsmwiU=
 golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
 golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
 golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
@@ -649,146 +632,131 @@ golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20190923162816-aa69164e4478/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20191112182307-2180aed22343/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
+golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
 golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
-golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
 golang.org/x/net v0.0.0-20201202161906-c7110b5ffcbb/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
-golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
 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.33.0 h1:74SYHlV8BIgHIFC/LrYkOGIwL19eTYXQ5wc6TBuO36I=
-golang.org/x/net v0.33.0/go.mod h1:HXLR5J+9DxmrqMwG9qjGCxZ+zKXxBru04zlTvWlWuN4=
+golang.org/x/net v0.34.0 h1:Mb7Mrk043xzHgnRM88suvJFwzVrRfHEHJEl5/71CKw0=
+golang.org/x/net v0.34.0/go.mod h1:di0qlW3YNM5oh6GqDGQr92MyTozJPmybPK4Ev/Gm31k=
 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=
-golang.org/x/oauth2 v0.24.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI=
+golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
+golang.org/x/oauth2 v0.25.0 h1:CY4y7XT9v0cRI9oupztF8AgiIu99L/ksR/Xp/6jrZ70=
+golang.org/x/oauth2 v0.25.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI=
 golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.10.0 h1:3NQrjDixjgGwUOCaF8w2+VYHv0Ve/vGYSbdkTa98gmQ=
 golang.org/x/sync v0.10.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
-golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190124100055-b90733256f2e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190904154756-749cb33beabd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190922100055-0a153f010e69/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190924154521-2837fb4f24fe/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191112214154-59a1497f0cea/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200106162015-b016eb3dc98e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200122134326-e047566fdf82/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200615200032-f1bc736245b1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210112080510-489259a85091/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210303074136-134d130e1a04/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20210603081109-ebe580a85c40/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20211025201205-69cdffdb9359/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220503163025-988cb79eb6c6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220627191245-f75cf1eec38b/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.28.0 h1:Fksou7UEQUWlKvIdsqzJmUmCX3cZuD2+P3XyyzwMhlA=
-golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.29.0 h1:TPYlXGxvx1MGTn2GiZDhnjPA9wZzZeGKHHmKhHYvgaU=
+golang.org/x/sys v0.29.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
-golang.org/x/term v0.27.0 h1:WP60Sv1nlK1T6SupCHbXzSaN0b9wUmsPoRS9b61A23Q=
-golang.org/x/term v0.27.0/go.mod h1:iMsnZpn0cago0GOrHO2+Y7u7JPn5AylBrcoWkElMTSM=
+golang.org/x/term v0.28.0 h1:/Ts8HFuMR2E6IP/jlo7QVLZHggjKQbhu/7H0LJFr3Gg=
+golang.org/x/term v0.28.0/go.mod h1:Sw/lC2IAUZ92udQNf3WodGtn4k/XoLyZoh8v/8uiwek=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo=
 golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ=
-golang.org/x/time v0.8.0 h1:9i3RxcPv3PZnitoVGMPDKZSq1xW1gK1Xy3ArNOGZfEg=
-golang.org/x/time v0.8.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM=
+golang.org/x/time v0.9.0 h1:EsRrnYcQiGH+5FfbgvV4AP7qEZstoyrHB0DzarOQ4ZY=
+golang.org/x/time v0.9.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
 golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
 golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
-golang.org/x/tools v0.0.0-20190907020128-2ca718005c18/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.0.0-20191108193012-7d206e10da11/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
 golang.org/x/tools v0.0.0-20201224043029-2b0845dc783e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
 golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
 golang.org/x/tools v0.1.1/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
-golang.org/x/tools v0.27.0 h1:qEKojBykQkQ4EynWy4S8Weg69NumxKdn40Fce3uc/8o=
-golang.org/x/tools v0.27.0/go.mod h1:sUi0ZgbwW9ZPAq26Ekut+weQPR5eIM6GQLQ1Yjm1H0Q=
+golang.org/x/tools v0.29.0 h1:Xx0h3TtM9rzQpQuR4dKLrdglAmCEN5Oi+P74JdhdzXE=
+golang.org/x/tools v0.29.0/go.mod h1:KMQVMRsVxU6nHCFXrBPhDB8XncLNLM0lIy/F14RP588=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20240903120638-7835f813f4da h1:noIWHXmPHxILtqtCOPIhSt0ABwskkZKjD3bXGnZGpNY=
 golang.org/x/xerrors v0.0.0-20240903120638-7835f813f4da/go.mod h1:NDW/Ps6MPRej6fsCIbMTohpP40sJ/P/vI1MoTEGwX90=
-gonum.org/v1/gonum v0.14.0 h1:2NiG67LD1tEH0D7kM+ps2V+fXmsAnpUeec7n8tcr4S0=
-gonum.org/v1/gonum v0.14.0/go.mod h1:AoWeoz0becf9QMWtE8iWXNXc27fK4fNeHNf/oMejGfU=
-google.golang.org/api v0.205.0 h1:LFaxkAIpDb/GsrWV20dMMo5MR0h8UARTbn24LmD+0Pg=
-google.golang.org/api v0.205.0/go.mod h1:NrK1EMqO8Xk6l6QwRAmrXXg2v6dzukhlOyvkYtnvUuc=
+gonum.org/v1/gonum v0.15.1 h1:FNy7N6OUZVUaWG9pTiD+jlhdQ3lMP+/LcTpJ6+a8sQ0=
+gonum.org/v1/gonum v0.15.1/go.mod h1:eZTZuRFrzu5pcyjN5wJhcIhnUdNijYxX1T2IcrOGY0o=
+google.golang.org/api v0.219.0 h1:nnKIvxKs/06jWawp2liznTBnMRQBEPpGo7I+oEypTX0=
+google.golang.org/api v0.219.0/go.mod h1:K6OmjGm+NtLrIkHxv1U3a0qIf/0JOvAHd5O/6AoyKYE=
 google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
 google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
 google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
 google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
 google.golang.org/genproto v0.0.0-20200423170343-7949de9c1215/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
-google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo=
-google.golang.org/genproto v0.0.0-20200806141610-86f49bd18e98/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
-google.golang.org/genproto v0.0.0-20241113202542-65e8d215514f h1:zDoHYmMzMacIdjNe+P2XiTmPsLawi/pCbSPfxt6lTfw=
-google.golang.org/genproto v0.0.0-20241113202542-65e8d215514f/go.mod h1:Q5m6g8b5KaFFzsQFIGdJkSJDGeJiybVenoYFMMa3ohI=
-google.golang.org/genproto/googleapis/api v0.0.0-20241113202542-65e8d215514f h1:M65LEviCfuZTfrfzwwEoxVtgvfkFkBUbFnRbxCXuXhU=
-google.golang.org/genproto/googleapis/api v0.0.0-20241113202542-65e8d215514f/go.mod h1:Yo94eF2nj7igQt+TiJ49KxjIH8ndLYPZMIRSiRcEbg0=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20241113202542-65e8d215514f h1:C1QccEa9kUwvMgEUORqQD9S17QesQijxjZ84sO82mfo=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20241113202542-65e8d215514f/go.mod h1:GX3210XPVPUjJbTUbvwI8f2IpZDMZuPJWDzDuebbviI=
+google.golang.org/genproto v0.0.0-20250127172529-29210b9bc287 h1:WoUI1G0DQ648FKvSl756SKxHQR/bI+y4HyyIQfxMWI8=
+google.golang.org/genproto v0.0.0-20250127172529-29210b9bc287/go.mod h1:wkQ2Aj/xvshAUDtO/JHvu9y+AaN9cqs28QuSVSHtZSY=
+google.golang.org/genproto/googleapis/api v0.0.0-20250127172529-29210b9bc287 h1:A2ni10G3UlplFrWdCDJTl7D7mJ7GSRm37S+PDimaKRw=
+google.golang.org/genproto/googleapis/api v0.0.0-20250127172529-29210b9bc287/go.mod h1:iYONQfRdizDB8JJBybql13nArx91jcUk7zCXEsOofM4=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20250127172529-29210b9bc287 h1:J1H9f+LEdWAfHcez/4cvaVBox7cOYT+IU6rgqj5x++8=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20250127172529-29210b9bc287/go.mod h1:8BS3B93F/U1juMFq9+EDk+qOT5CO1R9IzXxG3PTqiRk=
 google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
 google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
 google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY=
 google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
 google.golang.org/grpc v1.29.1/go.mod h1:itym6AZVZYACWQqET3MqgPpjcuV5QH3BxFS3IjizoKk=
-google.golang.org/grpc v1.31.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak=
-google.golang.org/grpc v1.33.2/go.mod h1:JMHMWHQWaTccqQQlmk3MJZS+GWXOdAesneDmEnv2fbc=
-google.golang.org/grpc v1.68.0 h1:aHQeeJbo8zAkAa3pRzrVjZlbz6uSfeOXlJNQM0RAbz0=
-google.golang.org/grpc v1.68.0/go.mod h1:fmSPC5AsjSBCK54MyHRx48kpOti1/jRfOlwEWywNjWA=
-google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.3.0 h1:rNBFJjBCOgVr9pWD7rs/knKL4FRTKgpZmsRfV214zcA=
-google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.3.0/go.mod h1:Dk1tviKTvMCz5tvh7t+fh94dhmQVHuCt2OzJB3CTW9Y=
-google.golang.org/grpc/examples v0.0.0-20210430044426-28078834f35b h1:D/GTYPo6I1oEo08Bfpuj3xl5XE+UGHj7//5fVyKxhsQ=
-google.golang.org/grpc/examples v0.0.0-20210430044426-28078834f35b/go.mod h1:Ly7ZA/ARzg8fnPU9TyZIxoz33sEUuWX7txiqs8lPTgE=
-google.golang.org/grpc/stats/opentelemetry v0.0.0-20241028142157-ada6787961b3 h1:hUfOButuEtpc0UvYiaYRbNwxVYr0mQQOWq6X8beJ9Gc=
-google.golang.org/grpc/stats/opentelemetry v0.0.0-20241028142157-ada6787961b3/go.mod h1:jzYlkSMbKypzuu6xoAEijsNVo9ZeDF1u/zCfFgsx7jg=
+google.golang.org/grpc v1.70.0 h1:pWFv03aZoHzlRKHWicjsZytKAiYCtNS0dHbXnIdq7jQ=
+google.golang.org/grpc v1.70.0/go.mod h1:ofIJqVKDXx/JiXrwr2IG4/zwdH9txy3IlF40RmcJSQw=
+google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.5.1 h1:F29+wU6Ee6qgu9TddPgooOdaqsxTMunOoj8KA5yuS5A=
+google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.5.1/go.mod h1:5KF+wpkbTSbGcR9zteSqZV6fqFOWBl4Yde8En8MryZA=
+google.golang.org/grpc/examples v0.0.0-20250204041003-947e2a4be2ba h1:w92RAwwmP8PEc4O6JrGzSoUrL/eE53n2wIG7NAcedM8=
+google.golang.org/grpc/examples v0.0.0-20250204041003-947e2a4be2ba/go.mod h1:R5h+Luidkixc0mZ7sBzeKUyTv9IaBcGq9m7OgmpVLpw=
 google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
 google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
 google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM=
 google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE=
 google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo=
-google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
 google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
-google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
-google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGjtUeSXeh4=
-google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c=
-google.golang.org/protobuf v1.35.1 h1:m3LfL6/Ca+fqnjnlqQXNpFPABW1UD7mjh8KO2mKFytA=
-google.golang.org/protobuf v1.35.1/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=
+google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
+google.golang.org/protobuf v1.36.4 h1:6A3ZDJHn/eNqc1i+IdefRzy/9PokBTPvcqMySR7NNIM=
+google.golang.org/protobuf v1.36.4/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=
 gopkg.in/DataDog/dd-trace-go.v1 v1.69.1 h1:grTElrPaCfxUsrJjyPLHlVPbmlKVzWMxVdcBrGZSzEk=
 gopkg.in/DataDog/dd-trace-go.v1 v1.69.1/go.mod h1:U9AOeBHNAL95JXcd/SPf4a7O5GNeF/yD13sJtli/yaU=
 gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw=
@@ -821,30 +789,28 @@ gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
-modernc.org/cc/v4 v4.21.4 h1:3Be/Rdo1fpr8GrQ7IVw9OHtplU4gWbb+wNgeoBMmGLQ=
-modernc.org/cc/v4 v4.21.4/go.mod h1:HM7VJTZbUCR3rV8EYBi9wxnJ0ZBRiGE5OeGXNA0IsLQ=
-modernc.org/ccgo/v4 v4.21.0 h1:kKPI3dF7RIag8YcToh5ZwDcVMIv6VGa0ED5cvh0LMW4=
-modernc.org/ccgo/v4 v4.21.0/go.mod h1:h6kt6H/A2+ew/3MW/p6KEoQmrq/i3pr0J/SiwiaF/g0=
+modernc.org/cc/v4 v4.24.4 h1:TFkx1s6dCkQpd6dKurBNmpo+G8Zl4Sq/ztJ+2+DEsh0=
+modernc.org/cc/v4 v4.24.4/go.mod h1:uVtb5OGqUKpoLWhqwNQo/8LwvoiEBLvZXIQ/SmO6mL0=
+modernc.org/ccgo/v4 v4.23.15 h1:wFDan71KnYqeHz4eF63vmGE6Q6Pc0PUGDpP0PRMYjDc=
+modernc.org/ccgo/v4 v4.23.15/go.mod h1:nJX30dks/IWuBOnVa7VRii9Me4/9TZ1SC9GNtmARTy0=
 modernc.org/fileutil v1.3.0 h1:gQ5SIzK3H9kdfai/5x41oQiKValumqNTDXMvKo62HvE=
 modernc.org/fileutil v1.3.0/go.mod h1:XatxS8fZi3pS8/hKG2GH/ArUogfxjpEKs3Ku3aK4JyQ=
-modernc.org/gc/v2 v2.5.0 h1:bJ9ChznK1L1mUtAQtxi0wi5AtAs5jQuw4PrPHO5pb6M=
-modernc.org/gc/v2 v2.5.0/go.mod h1:wzN5dK1AzVGoH6XOzc3YZ+ey/jPgYHLuVckd62P0GYU=
-modernc.org/gc/v3 v3.0.0-20241004144649-1aea3fae8852 h1:IYXPPTTjjoSHvUClZIYexDiO7g+4x+XveKT4gCIAwiY=
-modernc.org/gc/v3 v3.0.0-20241004144649-1aea3fae8852/go.mod h1:Qz0X07sNOR1jWYCrJMEnbW/X55x206Q7Vt4mz6/wHp4=
-modernc.org/libc v1.61.0 h1:eGFcvWpqlnoGwzZeZe3PWJkkKbM/3SUGyk1DVZQ0TpE=
-modernc.org/libc v1.61.0/go.mod h1:DvxVX89wtGTu+r72MLGhygpfi3aUGgZRdAYGCAVVud0=
-modernc.org/mathutil v1.6.0 h1:fRe9+AmYlaej+64JsEEhoWuAYBkOtQiMEU7n/XgfYi4=
-modernc.org/mathutil v1.6.0/go.mod h1:Ui5Q9q1TR2gFm0AQRqQUaBWFLAhQpCwNcuhBOSedWPo=
-modernc.org/memory v1.8.0 h1:IqGTL6eFMaDZZhEWwcREgeMXYwmW83LYW8cROZYkg+E=
-modernc.org/memory v1.8.0/go.mod h1:XPZ936zp5OMKGWPqbD3JShgd/ZoQ7899TUuQqxY+peU=
-modernc.org/opt v0.1.3 h1:3XOZf2yznlhC+ibLltsDGzABUGVx8J6pnFMS3E4dcq4=
-modernc.org/opt v0.1.3/go.mod h1:WdSiB5evDcignE70guQKxYUl14mgWtbClRi5wmkkTX0=
-modernc.org/sortutil v1.2.0 h1:jQiD3PfS2REGJNzNCMMaLSp/wdMNieTbKX920Cqdgqc=
-modernc.org/sortutil v1.2.0/go.mod h1:TKU2s7kJMf1AE84OoiGppNHJwvB753OYfNl2WRb++Ss=
-modernc.org/sqlite v1.33.1 h1:trb6Z3YYoeM9eDL1O8do81kP+0ejv+YzgyFo+Gwy0nM=
-modernc.org/sqlite v1.33.1/go.mod h1:pXV2xHxhzXZsgT/RtTFAPY6JJDEvOTcTdwADQCCWD4k=
-modernc.org/strutil v1.2.0 h1:agBi9dp1I+eOnxXeiZawM8F4LawKv4NzGWSaLfyeNZA=
-modernc.org/strutil v1.2.0/go.mod h1:/mdcBmfOibveCTBxUl5B5l6W+TTH1FXPLHZE6bTosX0=
+modernc.org/gc/v2 v2.6.2 h1:YBXi5Kqp6aCK3fIxwKQ3/fErvawVKwjOLItxj1brGds=
+modernc.org/gc/v2 v2.6.2/go.mod h1:YgIahr1ypgfe7chRuJi2gD7DBQiKSLMPgBQe9oIiito=
+modernc.org/libc v1.61.11 h1:6sZG8uB6EMMG7iTLPTndi8jyTdgAQNIeLGjCFICACZw=
+modernc.org/libc v1.61.11/go.mod h1:HHX+srFdn839oaJRd0W8hBM3eg+mieyZCAjWwB08/nM=
+modernc.org/mathutil v1.7.1 h1:GCZVGXdaN8gTqB1Mf/usp1Y/hSqgI2vAGGP4jZMCxOU=
+modernc.org/mathutil v1.7.1/go.mod h1:4p5IwJITfppl0G4sUEDtCr4DthTaT47/N3aT6MhfgJg=
+modernc.org/memory v1.8.2 h1:cL9L4bcoAObu4NkxOlKWBWtNHIsnnACGF/TbqQ6sbcI=
+modernc.org/memory v1.8.2/go.mod h1:ZbjSvMO5NQ1A2i3bWeDiVMxIorXwdClKE/0SZ+BMotU=
+modernc.org/opt v0.1.4 h1:2kNGMRiUjrp4LcaPuLY2PzUfqM/w9N23quVwhKt5Qm8=
+modernc.org/opt v0.1.4/go.mod h1:03fq9lsNfvkYSfxrfUhZCWPk1lm4cq4N+Bh//bEtgns=
+modernc.org/sortutil v1.2.1 h1:+xyoGf15mM3NMlPDnFqrteY07klSFxLElE2PVuWIJ7w=
+modernc.org/sortutil v1.2.1/go.mod h1:7ZI3a3REbai7gzCLcotuw9AC4VZVpYMjDzETGsSMqJE=
+modernc.org/sqlite v1.34.5 h1:Bb6SR13/fjp15jt70CL4f18JIN7p7dnMExd+UFnF15g=
+modernc.org/sqlite v1.34.5/go.mod h1:YLuNmX9NKs8wRNK2ko1LW1NGYcc9FkBO69JOt1AR9JE=
+modernc.org/strutil v1.2.1 h1:UneZBkQA+DX2Rp35KcM69cSsNES9ly8mQWD71HKlOA0=
+modernc.org/strutil v1.2.1/go.mod h1:EHkiggD70koQxjVdSBM3JKM7k6L0FbGE5eymy9i3B9A=
 modernc.org/token v1.1.0 h1:Xl7Ap9dKaEs5kLoOQeQmPWevfnk/DM5qcLcYlA8ys6Y=
 modernc.org/token v1.1.0/go.mod h1:UGzOrNV1mAFSEB63lOFHIpNRUVMvYTc6yu1SMY/XTDM=
 sigs.k8s.io/yaml v1.4.0 h1:Mk1wCc2gy/F0THH0TAp1QYyJNzRm2KCLy3o5ASXVI5E=
diff --git a/go/vt/proto/binlogdata/binlogdata.pb.go b/go/vt/proto/binlogdata/binlogdata.pb.go
index e3523b6b384..d809f959cc1 100644
--- a/go/vt/proto/binlogdata/binlogdata.pb.go
+++ b/go/vt/proto/binlogdata/binlogdata.pb.go
@@ -19,7 +19,7 @@
 
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.35.1
+// 	protoc-gen-go v1.36.4
 // 	protoc        v3.21.3
 // source: binlogdata.proto
 
@@ -30,6 +30,7 @@ import (
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
 	reflect "reflect"
 	sync "sync"
+	unsafe "unsafe"
 	query "vitess.io/vitess/go/vt/proto/query"
 	topodata "vitess.io/vitess/go/vt/proto/topodata"
 	vtrpc "vitess.io/vitess/go/vt/proto/vtrpc"
@@ -548,16 +549,15 @@ func (Filter_FieldEventMode) EnumDescriptor() ([]byte, []int) {
 
 // Charset is the per-statement charset info from a QUERY_EVENT binlog entry.
 type Charset struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
+	state protoimpl.MessageState `protogen:"open.v1"`
 	// @@session.character_set_client
 	Client int32 `protobuf:"varint,1,opt,name=client,proto3" json:"client,omitempty"`
 	// @@session.collation_connection
 	Conn int32 `protobuf:"varint,2,opt,name=conn,proto3" json:"conn,omitempty"`
 	// @@session.collation_server
-	Server int32 `protobuf:"varint,3,opt,name=server,proto3" json:"server,omitempty"`
+	Server        int32 `protobuf:"varint,3,opt,name=server,proto3" json:"server,omitempty"`
+	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *Charset) Reset() {
@@ -614,14 +614,13 @@ func (x *Charset) GetServer() int32 {
 // BinlogTransaction describes a transaction inside the binlogs.
 // It is streamed by vttablet for filtered replication, used during resharding.
 type BinlogTransaction struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
+	state protoimpl.MessageState `protogen:"open.v1"`
 	// the statements in this transaction
 	Statements []*BinlogTransaction_Statement `protobuf:"bytes,1,rep,name=statements,proto3" json:"statements,omitempty"`
 	// The Event Token for this event.
-	EventToken *query.EventToken `protobuf:"bytes,4,opt,name=event_token,json=eventToken,proto3" json:"event_token,omitempty"`
+	EventToken    *query.EventToken `protobuf:"bytes,4,opt,name=event_token,json=eventToken,proto3" json:"event_token,omitempty"`
+	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *BinlogTransaction) Reset() {
@@ -670,16 +669,15 @@ func (x *BinlogTransaction) GetEventToken() *query.EventToken {
 
 // StreamKeyRangeRequest is the payload to StreamKeyRange
 type StreamKeyRangeRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
+	state protoimpl.MessageState `protogen:"open.v1"`
 	// where to start
 	Position string `protobuf:"bytes,1,opt,name=position,proto3" json:"position,omitempty"`
 	// what to get
 	KeyRange *topodata.KeyRange `protobuf:"bytes,2,opt,name=key_range,json=keyRange,proto3" json:"key_range,omitempty"`
 	// default charset on the player side
-	Charset *Charset `protobuf:"bytes,3,opt,name=charset,proto3" json:"charset,omitempty"`
+	Charset       *Charset `protobuf:"bytes,3,opt,name=charset,proto3" json:"charset,omitempty"`
+	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *StreamKeyRangeRequest) Reset() {
@@ -735,11 +733,10 @@ func (x *StreamKeyRangeRequest) GetCharset() *Charset {
 
 // StreamKeyRangeResponse is the response from StreamKeyRange
 type StreamKeyRangeResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	BinlogTransaction *BinlogTransaction `protobuf:"bytes,1,opt,name=binlog_transaction,json=binlogTransaction,proto3" json:"binlog_transaction,omitempty"`
+	state             protoimpl.MessageState `protogen:"open.v1"`
+	BinlogTransaction *BinlogTransaction     `protobuf:"bytes,1,opt,name=binlog_transaction,json=binlogTransaction,proto3" json:"binlog_transaction,omitempty"`
+	unknownFields     protoimpl.UnknownFields
+	sizeCache         protoimpl.SizeCache
 }
 
 func (x *StreamKeyRangeResponse) Reset() {
@@ -781,16 +778,15 @@ func (x *StreamKeyRangeResponse) GetBinlogTransaction() *BinlogTransaction {
 
 // StreamTablesRequest is the payload to StreamTables
 type StreamTablesRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
+	state protoimpl.MessageState `protogen:"open.v1"`
 	// where to start
 	Position string `protobuf:"bytes,1,opt,name=position,proto3" json:"position,omitempty"`
 	// what to get
 	Tables []string `protobuf:"bytes,2,rep,name=tables,proto3" json:"tables,omitempty"`
 	// default charset on the player side
-	Charset *Charset `protobuf:"bytes,3,opt,name=charset,proto3" json:"charset,omitempty"`
+	Charset       *Charset `protobuf:"bytes,3,opt,name=charset,proto3" json:"charset,omitempty"`
+	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *StreamTablesRequest) Reset() {
@@ -846,11 +842,10 @@ func (x *StreamTablesRequest) GetCharset() *Charset {
 
 // StreamTablesResponse is the response from StreamTables
 type StreamTablesResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	BinlogTransaction *BinlogTransaction `protobuf:"bytes,1,opt,name=binlog_transaction,json=binlogTransaction,proto3" json:"binlog_transaction,omitempty"`
+	state             protoimpl.MessageState `protogen:"open.v1"`
+	BinlogTransaction *BinlogTransaction     `protobuf:"bytes,1,opt,name=binlog_transaction,json=binlogTransaction,proto3" json:"binlog_transaction,omitempty"`
+	unknownFields     protoimpl.UnknownFields
+	sizeCache         protoimpl.SizeCache
 }
 
 func (x *StreamTablesResponse) Reset() {
@@ -892,14 +887,13 @@ func (x *StreamTablesResponse) GetBinlogTransaction() *BinlogTransaction {
 
 // CharsetConversion represent a conversion of text from one charset to another
 type CharsetConversion struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
+	state protoimpl.MessageState `protogen:"open.v1"`
 	// FromCharset is the charset name from which we convert the text (e.g. latin1)
 	FromCharset string `protobuf:"bytes,1,opt,name=from_charset,json=fromCharset,proto3" json:"from_charset,omitempty"`
 	// ToCharset is the charset name to which we convert the text (e.g. utf8mb4)
-	ToCharset string `protobuf:"bytes,2,opt,name=to_charset,json=toCharset,proto3" json:"to_charset,omitempty"`
+	ToCharset     string `protobuf:"bytes,2,opt,name=to_charset,json=toCharset,proto3" json:"to_charset,omitempty"`
+	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *CharsetConversion) Reset() {
@@ -948,10 +942,7 @@ func (x *CharsetConversion) GetToCharset() string {
 
 // Rule represents one rule in a Filter.
 type Rule struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
+	state protoimpl.MessageState `protogen:"open.v1"`
 	// Match can be a table name or a regular expression.
 	// If it starts with a '/', it's a regular expression.
 	// For example, "t" matches a table named "t", whereas
@@ -974,12 +965,12 @@ type Rule struct {
 	// TODO(sougou): support this on vstreamer side also.
 	Filter string `protobuf:"bytes,2,opt,name=filter,proto3" json:"filter,omitempty"`
 	// Example: key="color", value="'red','green','blue'"
-	ConvertEnumToText map[string]string `protobuf:"bytes,3,rep,name=convert_enum_to_text,json=convertEnumToText,proto3" json:"convert_enum_to_text,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
+	ConvertEnumToText map[string]string `protobuf:"bytes,3,rep,name=convert_enum_to_text,json=convertEnumToText,proto3" json:"convert_enum_to_text,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
 	// ConvertCharset: optional mapping, between column name and a CharsetConversion.
 	// This hints to vreplication that columns are encoded from/to non-trivial charsets
 	// The map is only populated when either "from" or "to" charset of a column are non-trivial
 	// trivial charsets are utf8 and ascii variants.
-	ConvertCharset map[string]*CharsetConversion `protobuf:"bytes,4,rep,name=convert_charset,json=convertCharset,proto3" json:"convert_charset,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
+	ConvertCharset map[string]*CharsetConversion `protobuf:"bytes,4,rep,name=convert_charset,json=convertCharset,proto3" json:"convert_charset,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
 	// SourceUniqueKeyColumns represents the ordered columns in the index used by rowstreamer to iterate the table
 	// It is comma delimited, as in col1,col2,col3 (tokens are escaped via net/url)
 	SourceUniqueKeyColumns string `protobuf:"bytes,5,opt,name=source_unique_key_columns,json=sourceUniqueKeyColumns,proto3" json:"source_unique_key_columns,omitempty"`
@@ -992,9 +983,11 @@ type Rule struct {
 	// ConvertIntToEnum lists any columns that are converted from an integral value into an enum.
 	// such columns need to have special transofrmation of the data, from an integral format into a
 	// string format. e.g. the value 0 needs to be converted to '0'.
-	ConvertIntToEnum map[string]bool `protobuf:"bytes,8,rep,name=convert_int_to_enum,json=convertIntToEnum,proto3" json:"convert_int_to_enum,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"`
+	ConvertIntToEnum map[string]bool `protobuf:"bytes,8,rep,name=convert_int_to_enum,json=convertIntToEnum,proto3" json:"convert_int_to_enum,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"varint,2,opt,name=value"`
 	// ForceUniqueKey gives vtreamer a hint for `FORCE INDEX (...)` usage.
 	ForceUniqueKey string `protobuf:"bytes,9,opt,name=force_unique_key,json=forceUniqueKey,proto3" json:"force_unique_key,omitempty"`
+	unknownFields  protoimpl.UnknownFields
+	sizeCache      protoimpl.SizeCache
 }
 
 func (x *Rule) Reset() {
@@ -1093,11 +1086,8 @@ func (x *Rule) GetForceUniqueKey() string {
 // Filter represents a list of ordered rules. The first
 // match wins.
 type Filter struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Rules []*Rule `protobuf:"bytes,1,rep,name=rules,proto3" json:"rules,omitempty"`
+	state protoimpl.MessageState `protogen:"open.v1"`
+	Rules []*Rule                `protobuf:"bytes,1,rep,name=rules,proto3" json:"rules,omitempty"`
 	// FieldEventMode specifies the behavior if there is a mismatch
 	// between the current schema and the fields in the binlog. This
 	// can happen if the binlog position is before a DDL that would
@@ -1109,6 +1099,8 @@ type Filter struct {
 	FieldEventMode Filter_FieldEventMode `protobuf:"varint,2,opt,name=field_event_mode,json=fieldEventMode,proto3,enum=binlogdata.Filter_FieldEventMode" json:"field_event_mode,omitempty"`
 	WorkflowType   int64                 `protobuf:"varint,3,opt,name=workflow_type,json=workflowType,proto3" json:"workflow_type,omitempty"`
 	WorkflowName   string                `protobuf:"bytes,4,opt,name=workflow_name,json=workflowName,proto3" json:"workflow_name,omitempty"`
+	unknownFields  protoimpl.UnknownFields
+	sizeCache      protoimpl.SizeCache
 }
 
 func (x *Filter) Reset() {
@@ -1173,10 +1165,7 @@ func (x *Filter) GetWorkflowName() string {
 // Filtered Replication. KeyRange and Tables are legacy. Filter
 // is the new way to specify the filtering rules.
 type BinlogSource struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
+	state protoimpl.MessageState `protogen:"open.v1"`
 	// the source keyspace
 	Keyspace string `protobuf:"bytes,1,opt,name=keyspace,proto3" json:"keyspace,omitempty"`
 	// the source shard
@@ -1206,6 +1195,8 @@ type BinlogSource struct {
 	// TargetTimeZone is not currently specifiable by the user, defaults to UTC for the forward workflows
 	// and to the SourceTimeZone in reverse workflows
 	TargetTimeZone string `protobuf:"bytes,12,opt,name=target_time_zone,json=targetTimeZone,proto3" json:"target_time_zone,omitempty"`
+	unknownFields  protoimpl.UnknownFields
+	sizeCache      protoimpl.SizeCache
 }
 
 func (x *BinlogSource) Reset() {
@@ -1327,12 +1318,9 @@ func (x *BinlogSource) GetTargetTimeZone() string {
 // If After is set and not Before, it's an insert.
 // If both are set, it's an update.
 type RowChange struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	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"`
+	state  protoimpl.MessageState `protogen:"open.v1"`
+	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 *RowChange_Bitmap `protobuf:"bytes,3,opt,name=data_columns,json=dataColumns,proto3" json:"data_columns,omitempty"`
@@ -1344,6 +1332,8 @@ type RowChange struct {
 	// 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"`
+	unknownFields     protoimpl.UnknownFields
+	sizeCache         protoimpl.SizeCache
 }
 
 func (x *RowChange) Reset() {
@@ -1406,16 +1396,15 @@ func (x *RowChange) GetJsonPartialValues() *RowChange_Bitmap {
 
 // RowEvent represent row events for one table.
 type RowEvent struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	TableName       string       `protobuf:"bytes,1,opt,name=table_name,json=tableName,proto3" json:"table_name,omitempty"`
-	RowChanges      []*RowChange `protobuf:"bytes,2,rep,name=row_changes,json=rowChanges,proto3" json:"row_changes,omitempty"`
-	Keyspace        string       `protobuf:"bytes,3,opt,name=keyspace,proto3" json:"keyspace,omitempty"`
-	Shard           string       `protobuf:"bytes,4,opt,name=shard,proto3" json:"shard,omitempty"`
-	Flags           uint32       `protobuf:"varint,5,opt,name=flags,proto3" json:"flags,omitempty"`                                              // https://dev.mysql.com/doc/dev/mysql-server/latest/classbinary__log_1_1Rows__event.html
-	IsInternalTable bool         `protobuf:"varint,6,opt,name=is_internal_table,json=isInternalTable,proto3" json:"is_internal_table,omitempty"` // set for sidecardb tables
+	state           protoimpl.MessageState `protogen:"open.v1"`
+	TableName       string                 `protobuf:"bytes,1,opt,name=table_name,json=tableName,proto3" json:"table_name,omitempty"`
+	RowChanges      []*RowChange           `protobuf:"bytes,2,rep,name=row_changes,json=rowChanges,proto3" json:"row_changes,omitempty"`
+	Keyspace        string                 `protobuf:"bytes,3,opt,name=keyspace,proto3" json:"keyspace,omitempty"`
+	Shard           string                 `protobuf:"bytes,4,opt,name=shard,proto3" json:"shard,omitempty"`
+	Flags           uint32                 `protobuf:"varint,5,opt,name=flags,proto3" json:"flags,omitempty"`                                              // https://dev.mysql.com/doc/dev/mysql-server/latest/classbinary__log_1_1Rows__event.html
+	IsInternalTable bool                   `protobuf:"varint,6,opt,name=is_internal_table,json=isInternalTable,proto3" json:"is_internal_table,omitempty"` // set for sidecardb tables
+	unknownFields   protoimpl.UnknownFields
+	sizeCache       protoimpl.SizeCache
 }
 
 func (x *RowEvent) Reset() {
@@ -1492,14 +1481,11 @@ func (x *RowEvent) GetIsInternalTable() bool {
 
 // FieldEvent represents the field info for a table.
 type FieldEvent struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	TableName string         `protobuf:"bytes,1,opt,name=table_name,json=tableName,proto3" json:"table_name,omitempty"`
-	Fields    []*query.Field `protobuf:"bytes,2,rep,name=fields,proto3" json:"fields,omitempty"`
-	Keyspace  string         `protobuf:"bytes,3,opt,name=keyspace,proto3" json:"keyspace,omitempty"`
-	Shard     string         `protobuf:"bytes,4,opt,name=shard,proto3" json:"shard,omitempty"`
+	state     protoimpl.MessageState `protogen:"open.v1"`
+	TableName string                 `protobuf:"bytes,1,opt,name=table_name,json=tableName,proto3" json:"table_name,omitempty"`
+	Fields    []*query.Field         `protobuf:"bytes,2,rep,name=fields,proto3" json:"fields,omitempty"`
+	Keyspace  string                 `protobuf:"bytes,3,opt,name=keyspace,proto3" json:"keyspace,omitempty"`
+	Shard     string                 `protobuf:"bytes,4,opt,name=shard,proto3" json:"shard,omitempty"`
 	// Are ENUM and SET field values already mapped to strings in the ROW
 	// events? This allows us to transition VTGate VStream consumers from
 	// the pre v20 behavior of having to do this mapping themselves to the
@@ -1509,6 +1495,8 @@ type FieldEvent struct {
 	// vstreams managed by the vstreamManager.
 	EnumSetStringValues bool `protobuf:"varint,25,opt,name=enum_set_string_values,json=enumSetStringValues,proto3" json:"enum_set_string_values,omitempty"`
 	IsInternalTable     bool `protobuf:"varint,26,opt,name=is_internal_table,json=isInternalTable,proto3" json:"is_internal_table,omitempty"` // set for sidecardb tables
+	unknownFields       protoimpl.UnknownFields
+	sizeCache           protoimpl.SizeCache
 }
 
 func (x *FieldEvent) Reset() {
@@ -1589,14 +1577,13 @@ func (x *FieldEvent) GetIsInternalTable() bool {
 // of a shard. It's also used in a Journal to indicate the
 // list of targets and shard positions to migrate to.
 type ShardGtid struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	Keyspace      string                 `protobuf:"bytes,1,opt,name=keyspace,proto3" json:"keyspace,omitempty"`
+	Shard         string                 `protobuf:"bytes,2,opt,name=shard,proto3" json:"shard,omitempty"`
+	Gtid          string                 `protobuf:"bytes,3,opt,name=gtid,proto3" json:"gtid,omitempty"`
+	TablePKs      []*TableLastPK         `protobuf:"bytes,4,rep,name=table_p_ks,json=tablePKs,proto3" json:"table_p_ks,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	Keyspace string         `protobuf:"bytes,1,opt,name=keyspace,proto3" json:"keyspace,omitempty"`
-	Shard    string         `protobuf:"bytes,2,opt,name=shard,proto3" json:"shard,omitempty"`
-	Gtid     string         `protobuf:"bytes,3,opt,name=gtid,proto3" json:"gtid,omitempty"`
-	TablePKs []*TableLastPK `protobuf:"bytes,4,rep,name=table_p_ks,json=tablePKs,proto3" json:"table_p_ks,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *ShardGtid) Reset() {
@@ -1659,11 +1646,10 @@ func (x *ShardGtid) GetTablePKs() []*TableLastPK {
 
 // A VGtid is a list of ShardGtids.
 type VGtid struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	ShardGtids    []*ShardGtid           `protobuf:"bytes,1,rep,name=shard_gtids,json=shardGtids,proto3" json:"shard_gtids,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	ShardGtids []*ShardGtid `protobuf:"bytes,1,rep,name=shard_gtids,json=shardGtids,proto3" json:"shard_gtids,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *VGtid) Reset() {
@@ -1705,12 +1691,11 @@ func (x *VGtid) GetShardGtids() []*ShardGtid {
 
 // KeyspaceShard represents a keyspace and shard.
 type KeyspaceShard struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	Keyspace      string                 `protobuf:"bytes,1,opt,name=keyspace,proto3" json:"keyspace,omitempty"`
+	Shard         string                 `protobuf:"bytes,2,opt,name=shard,proto3" json:"shard,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	Keyspace string `protobuf:"bytes,1,opt,name=keyspace,proto3" json:"keyspace,omitempty"`
-	Shard    string `protobuf:"bytes,2,opt,name=shard,proto3" json:"shard,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *KeyspaceShard) Reset() {
@@ -1761,10 +1746,7 @@ func (x *KeyspaceShard) GetShard() string {
 // The commit of a journal event indicates the point of no return
 // for a migration.
 type Journal struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
+	state protoimpl.MessageState `protogen:"open.v1"`
 	// Id represents a unique journal id.
 	Id            int64         `protobuf:"varint,1,opt,name=id,proto3" json:"id,omitempty"`
 	MigrationType MigrationType `protobuf:"varint,2,opt,name=migration_type,json=migrationType,proto3,enum=binlogdata.MigrationType" json:"migration_type,omitempty"`
@@ -1787,6 +1769,8 @@ type Journal struct {
 	// is committed, this information is used to start the target streams
 	// that were created prior to the creation of the journal.
 	SourceWorkflows []string `protobuf:"bytes,7,rep,name=source_workflows,json=sourceWorkflows,proto3" json:"source_workflows,omitempty"`
+	unknownFields   protoimpl.UnknownFields
+	sizeCache       protoimpl.SizeCache
 }
 
 func (x *Journal) Reset() {
@@ -1877,11 +1861,8 @@ func (x *Journal) GetSourceWorkflows() []string {
 // COMMIT, DDL or OTHER.
 // OTHER events are non-material events that have no additional metadata.
 type VEvent struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Type VEventType `protobuf:"varint,1,opt,name=type,proto3,enum=binlogdata.VEventType" json:"type,omitempty"`
+	state protoimpl.MessageState `protogen:"open.v1"`
+	Type  VEventType             `protobuf:"varint,1,opt,name=type,proto3,enum=binlogdata.VEventType" json:"type,omitempty"`
 	// Timestamp is the binlog timestamp in seconds.
 	// The value should be ignored if 0.
 	Timestamp int64 `protobuf:"varint,2,opt,name=timestamp,proto3" json:"timestamp,omitempty"`
@@ -1913,6 +1894,8 @@ type VEvent struct {
 	Throttled bool `protobuf:"varint,24,opt,name=throttled,proto3" json:"throttled,omitempty"`
 	// ThrottledReason is a human readable string that explains why the stream is throttled
 	ThrottledReason string `protobuf:"bytes,25,opt,name=throttled_reason,json=throttledReason,proto3" json:"throttled_reason,omitempty"`
+	unknownFields   protoimpl.UnknownFields
+	sizeCache       protoimpl.SizeCache
 }
 
 func (x *VEvent) Reset() {
@@ -2051,17 +2034,16 @@ func (x *VEvent) GetThrottledReason() string {
 }
 
 type MinimalTable struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Name      string         `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
-	Fields    []*query.Field `protobuf:"bytes,2,rep,name=fields,proto3" json:"fields,omitempty"`
-	PKColumns []int64        `protobuf:"varint,3,rep,packed,name=p_k_columns,json=pKColumns,proto3" json:"p_k_columns,omitempty"`
+	state     protoimpl.MessageState `protogen:"open.v1"`
+	Name      string                 `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	Fields    []*query.Field         `protobuf:"bytes,2,rep,name=fields,proto3" json:"fields,omitempty"`
+	PKColumns []int64                `protobuf:"varint,3,rep,packed,name=p_k_columns,json=pKColumns,proto3" json:"p_k_columns,omitempty"`
 	// This will be PRIMARY when the actual primary key is used and it
 	// will be the name of the Primary Key equivalent if one is used
 	// instead. Otherwise it will be empty.
-	PKIndexName string `protobuf:"bytes,4,opt,name=p_k_index_name,json=pKIndexName,proto3" json:"p_k_index_name,omitempty"`
+	PKIndexName   string `protobuf:"bytes,4,opt,name=p_k_index_name,json=pKIndexName,proto3" json:"p_k_index_name,omitempty"`
+	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *MinimalTable) Reset() {
@@ -2123,11 +2105,10 @@ func (x *MinimalTable) GetPKIndexName() string {
 }
 
 type MinimalSchema struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	Tables        []*MinimalTable        `protobuf:"bytes,1,rep,name=tables,proto3" json:"tables,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	Tables []*MinimalTable `protobuf:"bytes,1,rep,name=tables,proto3" json:"tables,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *MinimalSchema) Reset() {
@@ -2168,12 +2149,11 @@ func (x *MinimalSchema) GetTables() []*MinimalTable {
 }
 
 type VStreamOptions struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	InternalTables  []string          `protobuf:"bytes,1,rep,name=internal_tables,json=internalTables,proto3" json:"internal_tables,omitempty"`
-	ConfigOverrides map[string]string `protobuf:"bytes,2,rep,name=config_overrides,json=configOverrides,proto3" json:"config_overrides,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
+	state           protoimpl.MessageState `protogen:"open.v1"`
+	InternalTables  []string               `protobuf:"bytes,1,rep,name=internal_tables,json=internalTables,proto3" json:"internal_tables,omitempty"`
+	ConfigOverrides map[string]string      `protobuf:"bytes,2,rep,name=config_overrides,json=configOverrides,proto3" json:"config_overrides,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
+	unknownFields   protoimpl.UnknownFields
+	sizeCache       protoimpl.SizeCache
 }
 
 func (x *VStreamOptions) Reset() {
@@ -2222,17 +2202,16 @@ func (x *VStreamOptions) GetConfigOverrides() map[string]string {
 
 // VStreamRequest is the payload for VStreamer
 type VStreamRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	EffectiveCallerId *vtrpc.CallerID       `protobuf:"bytes,1,opt,name=effective_caller_id,json=effectiveCallerId,proto3" json:"effective_caller_id,omitempty"`
-	ImmediateCallerId *query.VTGateCallerID `protobuf:"bytes,2,opt,name=immediate_caller_id,json=immediateCallerId,proto3" json:"immediate_caller_id,omitempty"`
-	Target            *query.Target         `protobuf:"bytes,3,opt,name=target,proto3" json:"target,omitempty"`
-	Position          string                `protobuf:"bytes,4,opt,name=position,proto3" json:"position,omitempty"`
-	Filter            *Filter               `protobuf:"bytes,5,opt,name=filter,proto3" json:"filter,omitempty"`
-	TableLastPKs      []*TableLastPK        `protobuf:"bytes,6,rep,name=table_last_p_ks,json=tableLastPKs,proto3" json:"table_last_p_ks,omitempty"`
-	Options           *VStreamOptions       `protobuf:"bytes,7,opt,name=options,proto3" json:"options,omitempty"`
+	state             protoimpl.MessageState `protogen:"open.v1"`
+	EffectiveCallerId *vtrpc.CallerID        `protobuf:"bytes,1,opt,name=effective_caller_id,json=effectiveCallerId,proto3" json:"effective_caller_id,omitempty"`
+	ImmediateCallerId *query.VTGateCallerID  `protobuf:"bytes,2,opt,name=immediate_caller_id,json=immediateCallerId,proto3" json:"immediate_caller_id,omitempty"`
+	Target            *query.Target          `protobuf:"bytes,3,opt,name=target,proto3" json:"target,omitempty"`
+	Position          string                 `protobuf:"bytes,4,opt,name=position,proto3" json:"position,omitempty"`
+	Filter            *Filter                `protobuf:"bytes,5,opt,name=filter,proto3" json:"filter,omitempty"`
+	TableLastPKs      []*TableLastPK         `protobuf:"bytes,6,rep,name=table_last_p_ks,json=tableLastPKs,proto3" json:"table_last_p_ks,omitempty"`
+	Options           *VStreamOptions        `protobuf:"bytes,7,opt,name=options,proto3" json:"options,omitempty"`
+	unknownFields     protoimpl.UnknownFields
+	sizeCache         protoimpl.SizeCache
 }
 
 func (x *VStreamRequest) Reset() {
@@ -2316,11 +2295,10 @@ func (x *VStreamRequest) GetOptions() *VStreamOptions {
 
 // VStreamResponse is the response from VStreamer
 type VStreamResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	Events        []*VEvent              `protobuf:"bytes,1,rep,name=events,proto3" json:"events,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	Events []*VEvent `protobuf:"bytes,1,rep,name=events,proto3" json:"events,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *VStreamResponse) Reset() {
@@ -2362,16 +2340,15 @@ func (x *VStreamResponse) GetEvents() []*VEvent {
 
 // VStreamRowsRequest is the payload for VStreamRows
 type VStreamRowsRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	EffectiveCallerId *vtrpc.CallerID       `protobuf:"bytes,1,opt,name=effective_caller_id,json=effectiveCallerId,proto3" json:"effective_caller_id,omitempty"`
-	ImmediateCallerId *query.VTGateCallerID `protobuf:"bytes,2,opt,name=immediate_caller_id,json=immediateCallerId,proto3" json:"immediate_caller_id,omitempty"`
-	Target            *query.Target         `protobuf:"bytes,3,opt,name=target,proto3" json:"target,omitempty"`
-	Query             string                `protobuf:"bytes,4,opt,name=query,proto3" json:"query,omitempty"`
-	Lastpk            *query.QueryResult    `protobuf:"bytes,5,opt,name=lastpk,proto3" json:"lastpk,omitempty"`
-	Options           *VStreamOptions       `protobuf:"bytes,6,opt,name=options,proto3" json:"options,omitempty"`
+	state             protoimpl.MessageState `protogen:"open.v1"`
+	EffectiveCallerId *vtrpc.CallerID        `protobuf:"bytes,1,opt,name=effective_caller_id,json=effectiveCallerId,proto3" json:"effective_caller_id,omitempty"`
+	ImmediateCallerId *query.VTGateCallerID  `protobuf:"bytes,2,opt,name=immediate_caller_id,json=immediateCallerId,proto3" json:"immediate_caller_id,omitempty"`
+	Target            *query.Target          `protobuf:"bytes,3,opt,name=target,proto3" json:"target,omitempty"`
+	Query             string                 `protobuf:"bytes,4,opt,name=query,proto3" json:"query,omitempty"`
+	Lastpk            *query.QueryResult     `protobuf:"bytes,5,opt,name=lastpk,proto3" json:"lastpk,omitempty"`
+	Options           *VStreamOptions        `protobuf:"bytes,6,opt,name=options,proto3" json:"options,omitempty"`
+	unknownFields     protoimpl.UnknownFields
+	sizeCache         protoimpl.SizeCache
 }
 
 func (x *VStreamRowsRequest) Reset() {
@@ -2448,21 +2425,20 @@ func (x *VStreamRowsRequest) GetOptions() *VStreamOptions {
 
 // VStreamRowsResponse is the response from VStreamRows
 type VStreamRowsResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Fields   []*query.Field `protobuf:"bytes,1,rep,name=fields,proto3" json:"fields,omitempty"`
-	Pkfields []*query.Field `protobuf:"bytes,2,rep,name=pkfields,proto3" json:"pkfields,omitempty"`
-	Gtid     string         `protobuf:"bytes,3,opt,name=gtid,proto3" json:"gtid,omitempty"`
-	Rows     []*query.Row   `protobuf:"bytes,4,rep,name=rows,proto3" json:"rows,omitempty"`
-	Lastpk   *query.Row     `protobuf:"bytes,5,opt,name=lastpk,proto3" json:"lastpk,omitempty"`
+	state    protoimpl.MessageState `protogen:"open.v1"`
+	Fields   []*query.Field         `protobuf:"bytes,1,rep,name=fields,proto3" json:"fields,omitempty"`
+	Pkfields []*query.Field         `protobuf:"bytes,2,rep,name=pkfields,proto3" json:"pkfields,omitempty"`
+	Gtid     string                 `protobuf:"bytes,3,opt,name=gtid,proto3" json:"gtid,omitempty"`
+	Rows     []*query.Row           `protobuf:"bytes,4,rep,name=rows,proto3" json:"rows,omitempty"`
+	Lastpk   *query.Row             `protobuf:"bytes,5,opt,name=lastpk,proto3" json:"lastpk,omitempty"`
 	// Throttled indicates that rowstreamer is being throttled right now
 	Throttled bool `protobuf:"varint,6,opt,name=throttled,proto3" json:"throttled,omitempty"`
 	// Heartbeat indicates that this is a heartbeat message
 	Heartbeat bool `protobuf:"varint,7,opt,name=heartbeat,proto3" json:"heartbeat,omitempty"`
 	// ThrottledReason is a human readable string that explains why the stream is throttled
 	ThrottledReason string `protobuf:"bytes,8,opt,name=throttled_reason,json=throttledReason,proto3" json:"throttled_reason,omitempty"`
+	unknownFields   protoimpl.UnknownFields
+	sizeCache       protoimpl.SizeCache
 }
 
 func (x *VStreamRowsResponse) Reset() {
@@ -2553,14 +2529,13 @@ func (x *VStreamRowsResponse) GetThrottledReason() string {
 
 // VStreamTablesRequest is the payload for VStreamTables
 type VStreamTablesRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	EffectiveCallerId *vtrpc.CallerID       `protobuf:"bytes,1,opt,name=effective_caller_id,json=effectiveCallerId,proto3" json:"effective_caller_id,omitempty"`
-	ImmediateCallerId *query.VTGateCallerID `protobuf:"bytes,2,opt,name=immediate_caller_id,json=immediateCallerId,proto3" json:"immediate_caller_id,omitempty"`
-	Target            *query.Target         `protobuf:"bytes,3,opt,name=target,proto3" json:"target,omitempty"`
-	Options           *VStreamOptions       `protobuf:"bytes,4,opt,name=options,proto3" json:"options,omitempty"`
+	state             protoimpl.MessageState `protogen:"open.v1"`
+	EffectiveCallerId *vtrpc.CallerID        `protobuf:"bytes,1,opt,name=effective_caller_id,json=effectiveCallerId,proto3" json:"effective_caller_id,omitempty"`
+	ImmediateCallerId *query.VTGateCallerID  `protobuf:"bytes,2,opt,name=immediate_caller_id,json=immediateCallerId,proto3" json:"immediate_caller_id,omitempty"`
+	Target            *query.Target          `protobuf:"bytes,3,opt,name=target,proto3" json:"target,omitempty"`
+	Options           *VStreamOptions        `protobuf:"bytes,4,opt,name=options,proto3" json:"options,omitempty"`
+	unknownFields     protoimpl.UnknownFields
+	sizeCache         protoimpl.SizeCache
 }
 
 func (x *VStreamTablesRequest) Reset() {
@@ -2623,16 +2598,15 @@ func (x *VStreamTablesRequest) GetOptions() *VStreamOptions {
 
 // VStreamTablesResponse is the response from VStreamTables
 type VStreamTablesResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	TableName     string                 `protobuf:"bytes,1,opt,name=table_name,json=tableName,proto3" json:"table_name,omitempty"`
+	Fields        []*query.Field         `protobuf:"bytes,2,rep,name=fields,proto3" json:"fields,omitempty"`
+	Pkfields      []*query.Field         `protobuf:"bytes,3,rep,name=pkfields,proto3" json:"pkfields,omitempty"`
+	Gtid          string                 `protobuf:"bytes,4,opt,name=gtid,proto3" json:"gtid,omitempty"`
+	Rows          []*query.Row           `protobuf:"bytes,5,rep,name=rows,proto3" json:"rows,omitempty"`
+	Lastpk        *query.Row             `protobuf:"bytes,6,opt,name=lastpk,proto3" json:"lastpk,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	TableName string         `protobuf:"bytes,1,opt,name=table_name,json=tableName,proto3" json:"table_name,omitempty"`
-	Fields    []*query.Field `protobuf:"bytes,2,rep,name=fields,proto3" json:"fields,omitempty"`
-	Pkfields  []*query.Field `protobuf:"bytes,3,rep,name=pkfields,proto3" json:"pkfields,omitempty"`
-	Gtid      string         `protobuf:"bytes,4,opt,name=gtid,proto3" json:"gtid,omitempty"`
-	Rows      []*query.Row   `protobuf:"bytes,5,rep,name=rows,proto3" json:"rows,omitempty"`
-	Lastpk    *query.Row     `protobuf:"bytes,6,opt,name=lastpk,proto3" json:"lastpk,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *VStreamTablesResponse) Reset() {
@@ -2708,12 +2682,11 @@ func (x *VStreamTablesResponse) GetLastpk() *query.Row {
 }
 
 type LastPKEvent struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	TableLastPK   *TableLastPK           `protobuf:"bytes,1,opt,name=table_last_p_k,json=tableLastPK,proto3" json:"table_last_p_k,omitempty"`
+	Completed     bool                   `protobuf:"varint,2,opt,name=completed,proto3" json:"completed,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	TableLastPK *TableLastPK `protobuf:"bytes,1,opt,name=table_last_p_k,json=tableLastPK,proto3" json:"table_last_p_k,omitempty"`
-	Completed   bool         `protobuf:"varint,2,opt,name=completed,proto3" json:"completed,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *LastPKEvent) Reset() {
@@ -2761,12 +2734,11 @@ func (x *LastPKEvent) GetCompleted() bool {
 }
 
 type TableLastPK struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	TableName     string                 `protobuf:"bytes,1,opt,name=table_name,json=tableName,proto3" json:"table_name,omitempty"`
+	Lastpk        *query.QueryResult     `protobuf:"bytes,3,opt,name=lastpk,proto3" json:"lastpk,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	TableName string             `protobuf:"bytes,1,opt,name=table_name,json=tableName,proto3" json:"table_name,omitempty"`
-	Lastpk    *query.QueryResult `protobuf:"bytes,3,opt,name=lastpk,proto3" json:"lastpk,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *TableLastPK) Reset() {
@@ -2817,14 +2789,13 @@ func (x *TableLastPK) GetLastpk() *query.QueryResult {
 // The ids match VStreamRows, in case we decide to merge the two.
 // The ids match VStreamRows, in case we decide to merge the two.
 type VStreamResultsRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	EffectiveCallerId *vtrpc.CallerID       `protobuf:"bytes,1,opt,name=effective_caller_id,json=effectiveCallerId,proto3" json:"effective_caller_id,omitempty"`
-	ImmediateCallerId *query.VTGateCallerID `protobuf:"bytes,2,opt,name=immediate_caller_id,json=immediateCallerId,proto3" json:"immediate_caller_id,omitempty"`
-	Target            *query.Target         `protobuf:"bytes,3,opt,name=target,proto3" json:"target,omitempty"`
-	Query             string                `protobuf:"bytes,4,opt,name=query,proto3" json:"query,omitempty"`
+	state             protoimpl.MessageState `protogen:"open.v1"`
+	EffectiveCallerId *vtrpc.CallerID        `protobuf:"bytes,1,opt,name=effective_caller_id,json=effectiveCallerId,proto3" json:"effective_caller_id,omitempty"`
+	ImmediateCallerId *query.VTGateCallerID  `protobuf:"bytes,2,opt,name=immediate_caller_id,json=immediateCallerId,proto3" json:"immediate_caller_id,omitempty"`
+	Target            *query.Target          `protobuf:"bytes,3,opt,name=target,proto3" json:"target,omitempty"`
+	Query             string                 `protobuf:"bytes,4,opt,name=query,proto3" json:"query,omitempty"`
+	unknownFields     protoimpl.UnknownFields
+	sizeCache         protoimpl.SizeCache
 }
 
 func (x *VStreamResultsRequest) Reset() {
@@ -2888,13 +2859,12 @@ func (x *VStreamResultsRequest) GetQuery() string {
 // VStreamResultsResponse is the response from VStreamResults
 // The ids match VStreamRows, in case we decide to merge the two.
 type VStreamResultsResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	Fields        []*query.Field         `protobuf:"bytes,1,rep,name=fields,proto3" json:"fields,omitempty"`
+	Gtid          string                 `protobuf:"bytes,3,opt,name=gtid,proto3" json:"gtid,omitempty"`
+	Rows          []*query.Row           `protobuf:"bytes,4,rep,name=rows,proto3" json:"rows,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	Fields []*query.Field `protobuf:"bytes,1,rep,name=fields,proto3" json:"fields,omitempty"`
-	Gtid   string         `protobuf:"bytes,3,opt,name=gtid,proto3" json:"gtid,omitempty"`
-	Rows   []*query.Row   `protobuf:"bytes,4,rep,name=rows,proto3" json:"rows,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *VStreamResultsResponse) Reset() {
@@ -2949,16 +2919,15 @@ func (x *VStreamResultsResponse) GetRows() []*query.Row {
 }
 
 type BinlogTransaction_Statement struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
+	state protoimpl.MessageState `protogen:"open.v1"`
 	// what type of statement is this?
 	Category BinlogTransaction_Statement_Category `protobuf:"varint,1,opt,name=category,proto3,enum=binlogdata.BinlogTransaction_Statement_Category" json:"category,omitempty"`
 	// charset of this statement, if different from pre-negotiated default.
 	Charset *Charset `protobuf:"bytes,2,opt,name=charset,proto3" json:"charset,omitempty"`
 	// the sql
-	Sql []byte `protobuf:"bytes,3,opt,name=sql,proto3" json:"sql,omitempty"`
+	Sql           []byte `protobuf:"bytes,3,opt,name=sql,proto3" json:"sql,omitempty"`
+	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *BinlogTransaction_Statement) Reset() {
@@ -3013,12 +2982,11 @@ func (x *BinlogTransaction_Statement) GetSql() []byte {
 }
 
 type RowChange_Bitmap struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	Count         int64                  `protobuf:"varint,1,opt,name=count,proto3" json:"count,omitempty"`
+	Cols          []byte                 `protobuf:"bytes,2,opt,name=cols,proto3" json:"cols,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	Count int64  `protobuf:"varint,1,opt,name=count,proto3" json:"count,omitempty"`
-	Cols  []byte `protobuf:"bytes,2,opt,name=cols,proto3" json:"cols,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *RowChange_Bitmap) Reset() {
@@ -3067,7 +3035,7 @@ func (x *RowChange_Bitmap) GetCols() []byte {
 
 var File_binlogdata_proto protoreflect.FileDescriptor
 
-var file_binlogdata_proto_rawDesc = []byte{
+var file_binlogdata_proto_rawDesc = string([]byte{
 	0x0a, 0x10, 0x62, 0x69, 0x6e, 0x6c, 0x6f, 0x67, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x70, 0x72, 0x6f,
 	0x74, 0x6f, 0x12, 0x0a, 0x62, 0x69, 0x6e, 0x6c, 0x6f, 0x67, 0x64, 0x61, 0x74, 0x61, 0x1a, 0x0b,
 	0x76, 0x74, 0x72, 0x70, 0x63, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x0b, 0x71, 0x75, 0x65,
@@ -3560,16 +3528,16 @@ var file_binlogdata_proto_rawDesc = []byte{
 	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 (
 	file_binlogdata_proto_rawDescOnce sync.Once
-	file_binlogdata_proto_rawDescData = file_binlogdata_proto_rawDesc
+	file_binlogdata_proto_rawDescData []byte
 )
 
 func file_binlogdata_proto_rawDescGZIP() []byte {
 	file_binlogdata_proto_rawDescOnce.Do(func() {
-		file_binlogdata_proto_rawDescData = protoimpl.X.CompressGZIP(file_binlogdata_proto_rawDescData)
+		file_binlogdata_proto_rawDescData = protoimpl.X.CompressGZIP(unsafe.Slice(unsafe.StringData(file_binlogdata_proto_rawDesc), len(file_binlogdata_proto_rawDesc)))
 	})
 	return file_binlogdata_proto_rawDescData
 }
@@ -3719,7 +3687,7 @@ func file_binlogdata_proto_init() {
 	out := protoimpl.TypeBuilder{
 		File: protoimpl.DescBuilder{
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
-			RawDescriptor: file_binlogdata_proto_rawDesc,
+			RawDescriptor: unsafe.Slice(unsafe.StringData(file_binlogdata_proto_rawDesc), len(file_binlogdata_proto_rawDesc)),
 			NumEnums:      8,
 			NumMessages:   37,
 			NumExtensions: 0,
@@ -3731,7 +3699,6 @@ func file_binlogdata_proto_init() {
 		MessageInfos:      file_binlogdata_proto_msgTypes,
 	}.Build()
 	File_binlogdata_proto = out.File
-	file_binlogdata_proto_rawDesc = nil
 	file_binlogdata_proto_goTypes = nil
 	file_binlogdata_proto_depIdxs = nil
 }
diff --git a/go/vt/proto/binlogdata/binlogdata_vtproto.pb.go b/go/vt/proto/binlogdata/binlogdata_vtproto.pb.go
index 93b378738dd..315a753568f 100644
--- a/go/vt/proto/binlogdata/binlogdata_vtproto.pb.go
+++ b/go/vt/proto/binlogdata/binlogdata_vtproto.pb.go
@@ -1,5 +1,5 @@
 // Code generated by protoc-gen-go-vtproto. DO NOT EDIT.
-// protoc-gen-go-vtproto version: v0.6.1-0.20241011083415-71c992bc3c87
+// protoc-gen-go-vtproto version: v0.6.1-0.20241121165744-79df5c4772f2
 // source: binlogdata.proto
 
 package binlogdata
diff --git a/go/vt/proto/binlogservice/binlogservice.pb.go b/go/vt/proto/binlogservice/binlogservice.pb.go
index 9ac93adc872..857ec58c129 100644
--- a/go/vt/proto/binlogservice/binlogservice.pb.go
+++ b/go/vt/proto/binlogservice/binlogservice.pb.go
@@ -19,7 +19,7 @@
 
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.35.1
+// 	protoc-gen-go v1.36.4
 // 	protoc        v3.21.3
 // source: binlogservice.proto
 
@@ -29,6 +29,7 @@ import (
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
 	reflect "reflect"
+	unsafe "unsafe"
 	binlogdata "vitess.io/vitess/go/vt/proto/binlogdata"
 )
 
@@ -41,7 +42,7 @@ const (
 
 var File_binlogservice_proto protoreflect.FileDescriptor
 
-var file_binlogservice_proto_rawDesc = []byte{
+var file_binlogservice_proto_rawDesc = string([]byte{
 	0x0a, 0x13, 0x62, 0x69, 0x6e, 0x6c, 0x6f, 0x67, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e,
 	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x0d, 0x62, 0x69, 0x6e, 0x6c, 0x6f, 0x67, 0x73, 0x65, 0x72,
 	0x76, 0x69, 0x63, 0x65, 0x1a, 0x10, 0x62, 0x69, 0x6e, 0x6c, 0x6f, 0x67, 0x64, 0x61, 0x74, 0x61,
@@ -62,7 +63,7 @@ var file_binlogservice_proto_rawDesc = []byte{
 	0x67, 0x6f, 0x2f, 0x76, 0x74, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x62, 0x69, 0x6e, 0x6c,
 	0x6f, 0x67, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f,
 	0x33,
-}
+})
 
 var file_binlogservice_proto_goTypes = []any{
 	(*binlogdata.StreamKeyRangeRequest)(nil),  // 0: binlogdata.StreamKeyRangeRequest
@@ -91,7 +92,7 @@ func file_binlogservice_proto_init() {
 	out := protoimpl.TypeBuilder{
 		File: protoimpl.DescBuilder{
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
-			RawDescriptor: file_binlogservice_proto_rawDesc,
+			RawDescriptor: unsafe.Slice(unsafe.StringData(file_binlogservice_proto_rawDesc), len(file_binlogservice_proto_rawDesc)),
 			NumEnums:      0,
 			NumMessages:   0,
 			NumExtensions: 0,
@@ -101,7 +102,6 @@ func file_binlogservice_proto_init() {
 		DependencyIndexes: file_binlogservice_proto_depIdxs,
 	}.Build()
 	File_binlogservice_proto = out.File
-	file_binlogservice_proto_rawDesc = nil
 	file_binlogservice_proto_goTypes = nil
 	file_binlogservice_proto_depIdxs = nil
 }
diff --git a/go/vt/proto/logutil/logutil.pb.go b/go/vt/proto/logutil/logutil.pb.go
index fff477ddf27..d1ea7ea3938 100644
--- a/go/vt/proto/logutil/logutil.pb.go
+++ b/go/vt/proto/logutil/logutil.pb.go
@@ -17,7 +17,7 @@
 
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.35.1
+// 	protoc-gen-go v1.36.4
 // 	protoc        v3.21.3
 // source: logutil.proto
 
@@ -28,6 +28,7 @@ import (
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
 	reflect "reflect"
 	sync "sync"
+	unsafe "unsafe"
 	vttime "vitess.io/vitess/go/vt/proto/vttime"
 )
 
@@ -97,15 +98,14 @@ func (Level) EnumDescriptor() ([]byte, []int) {
 
 // Event is a single logging event
 type Event struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	Time          *vttime.Time           `protobuf:"bytes,1,opt,name=time,proto3" json:"time,omitempty"`
+	Level         Level                  `protobuf:"varint,2,opt,name=level,proto3,enum=logutil.Level" json:"level,omitempty"`
+	File          string                 `protobuf:"bytes,3,opt,name=file,proto3" json:"file,omitempty"`
+	Line          int64                  `protobuf:"varint,4,opt,name=line,proto3" json:"line,omitempty"`
+	Value         string                 `protobuf:"bytes,5,opt,name=value,proto3" json:"value,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	Time  *vttime.Time `protobuf:"bytes,1,opt,name=time,proto3" json:"time,omitempty"`
-	Level Level        `protobuf:"varint,2,opt,name=level,proto3,enum=logutil.Level" json:"level,omitempty"`
-	File  string       `protobuf:"bytes,3,opt,name=file,proto3" json:"file,omitempty"`
-	Line  int64        `protobuf:"varint,4,opt,name=line,proto3" json:"line,omitempty"`
-	Value string       `protobuf:"bytes,5,opt,name=value,proto3" json:"value,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *Event) Reset() {
@@ -175,7 +175,7 @@ func (x *Event) GetValue() string {
 
 var File_logutil_proto protoreflect.FileDescriptor
 
-var file_logutil_proto_rawDesc = []byte{
+var file_logutil_proto_rawDesc = string([]byte{
 	0x0a, 0x0d, 0x6c, 0x6f, 0x67, 0x75, 0x74, 0x69, 0x6c, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12,
 	0x07, 0x6c, 0x6f, 0x67, 0x75, 0x74, 0x69, 0x6c, 0x1a, 0x0c, 0x76, 0x74, 0x74, 0x69, 0x6d, 0x65,
 	0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x8d, 0x01, 0x0a, 0x05, 0x45, 0x76, 0x65, 0x6e, 0x74,
@@ -194,16 +194,16 @@ var file_logutil_proto_rawDesc = []byte{
 	0x5a, 0x24, 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, 0x6c,
 	0x6f, 0x67, 0x75, 0x74, 0x69, 0x6c, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
-}
+})
 
 var (
 	file_logutil_proto_rawDescOnce sync.Once
-	file_logutil_proto_rawDescData = file_logutil_proto_rawDesc
+	file_logutil_proto_rawDescData []byte
 )
 
 func file_logutil_proto_rawDescGZIP() []byte {
 	file_logutil_proto_rawDescOnce.Do(func() {
-		file_logutil_proto_rawDescData = protoimpl.X.CompressGZIP(file_logutil_proto_rawDescData)
+		file_logutil_proto_rawDescData = protoimpl.X.CompressGZIP(unsafe.Slice(unsafe.StringData(file_logutil_proto_rawDesc), len(file_logutil_proto_rawDesc)))
 	})
 	return file_logutil_proto_rawDescData
 }
@@ -234,7 +234,7 @@ func file_logutil_proto_init() {
 	out := protoimpl.TypeBuilder{
 		File: protoimpl.DescBuilder{
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
-			RawDescriptor: file_logutil_proto_rawDesc,
+			RawDescriptor: unsafe.Slice(unsafe.StringData(file_logutil_proto_rawDesc), len(file_logutil_proto_rawDesc)),
 			NumEnums:      1,
 			NumMessages:   1,
 			NumExtensions: 0,
@@ -246,7 +246,6 @@ func file_logutil_proto_init() {
 		MessageInfos:      file_logutil_proto_msgTypes,
 	}.Build()
 	File_logutil_proto = out.File
-	file_logutil_proto_rawDesc = nil
 	file_logutil_proto_goTypes = nil
 	file_logutil_proto_depIdxs = nil
 }
diff --git a/go/vt/proto/logutil/logutil_vtproto.pb.go b/go/vt/proto/logutil/logutil_vtproto.pb.go
index 208d652cdaf..80d7189c02c 100644
--- a/go/vt/proto/logutil/logutil_vtproto.pb.go
+++ b/go/vt/proto/logutil/logutil_vtproto.pb.go
@@ -1,5 +1,5 @@
 // Code generated by protoc-gen-go-vtproto. DO NOT EDIT.
-// protoc-gen-go-vtproto version: v0.6.1-0.20241011083415-71c992bc3c87
+// protoc-gen-go-vtproto version: v0.6.1-0.20241121165744-79df5c4772f2
 // source: logutil.proto
 
 package logutil
diff --git a/go/vt/proto/mysqlctl/mysqlctl.pb.go b/go/vt/proto/mysqlctl/mysqlctl.pb.go
index 1e7ca88f5fe..75bbbc28dc5 100644
--- a/go/vt/proto/mysqlctl/mysqlctl.pb.go
+++ b/go/vt/proto/mysqlctl/mysqlctl.pb.go
@@ -18,7 +18,7 @@
 
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.35.1
+// 	protoc-gen-go v1.36.4
 // 	protoc        v3.21.3
 // source: mysqlctl.proto
 
@@ -29,6 +29,7 @@ import (
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
 	reflect "reflect"
 	sync "sync"
+	unsafe "unsafe"
 	topodata "vitess.io/vitess/go/vt/proto/topodata"
 	vtrpc "vitess.io/vitess/go/vt/proto/vtrpc"
 	vttime "vitess.io/vitess/go/vt/proto/vttime"
@@ -102,11 +103,10 @@ func (BackupInfo_Status) EnumDescriptor() ([]byte, []int) {
 }
 
 type StartRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	MysqldArgs    []string               `protobuf:"bytes,1,rep,name=mysqld_args,json=mysqldArgs,proto3" json:"mysqld_args,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	MysqldArgs []string `protobuf:"bytes,1,rep,name=mysqld_args,json=mysqldArgs,proto3" json:"mysqld_args,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *StartRequest) Reset() {
@@ -147,9 +147,9 @@ func (x *StartRequest) GetMysqldArgs() []string {
 }
 
 type StartResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
 	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *StartResponse) Reset() {
@@ -183,12 +183,11 @@ func (*StartResponse) Descriptor() ([]byte, []int) {
 }
 
 type ShutdownRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	WaitForMysqld        bool             `protobuf:"varint,1,opt,name=wait_for_mysqld,json=waitForMysqld,proto3" json:"wait_for_mysqld,omitempty"`
-	MysqlShutdownTimeout *vttime.Duration `protobuf:"bytes,2,opt,name=mysql_shutdown_timeout,json=mysqlShutdownTimeout,proto3" json:"mysql_shutdown_timeout,omitempty"`
+	state                protoimpl.MessageState `protogen:"open.v1"`
+	WaitForMysqld        bool                   `protobuf:"varint,1,opt,name=wait_for_mysqld,json=waitForMysqld,proto3" json:"wait_for_mysqld,omitempty"`
+	MysqlShutdownTimeout *vttime.Duration       `protobuf:"bytes,2,opt,name=mysql_shutdown_timeout,json=mysqlShutdownTimeout,proto3" json:"mysql_shutdown_timeout,omitempty"`
+	unknownFields        protoimpl.UnknownFields
+	sizeCache            protoimpl.SizeCache
 }
 
 func (x *ShutdownRequest) Reset() {
@@ -236,9 +235,9 @@ func (x *ShutdownRequest) GetMysqlShutdownTimeout() *vttime.Duration {
 }
 
 type ShutdownResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
 	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *ShutdownResponse) Reset() {
@@ -272,9 +271,9 @@ func (*ShutdownResponse) Descriptor() ([]byte, []int) {
 }
 
 type RunMysqlUpgradeRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
 	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *RunMysqlUpgradeRequest) Reset() {
@@ -308,9 +307,9 @@ func (*RunMysqlUpgradeRequest) Descriptor() ([]byte, []int) {
 }
 
 type RunMysqlUpgradeResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
 	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *RunMysqlUpgradeResponse) Reset() {
@@ -344,13 +343,12 @@ func (*RunMysqlUpgradeResponse) Descriptor() ([]byte, []int) {
 }
 
 type ApplyBinlogFileRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	BinlogFileName        string       `protobuf:"bytes,1,opt,name=binlog_file_name,json=binlogFileName,proto3" json:"binlog_file_name,omitempty"`
-	BinlogRestorePosition string       `protobuf:"bytes,2,opt,name=binlog_restore_position,json=binlogRestorePosition,proto3" json:"binlog_restore_position,omitempty"`
-	BinlogRestoreDatetime *vttime.Time `protobuf:"bytes,3,opt,name=binlog_restore_datetime,json=binlogRestoreDatetime,proto3" json:"binlog_restore_datetime,omitempty"`
+	state                 protoimpl.MessageState `protogen:"open.v1"`
+	BinlogFileName        string                 `protobuf:"bytes,1,opt,name=binlog_file_name,json=binlogFileName,proto3" json:"binlog_file_name,omitempty"`
+	BinlogRestorePosition string                 `protobuf:"bytes,2,opt,name=binlog_restore_position,json=binlogRestorePosition,proto3" json:"binlog_restore_position,omitempty"`
+	BinlogRestoreDatetime *vttime.Time           `protobuf:"bytes,3,opt,name=binlog_restore_datetime,json=binlogRestoreDatetime,proto3" json:"binlog_restore_datetime,omitempty"`
+	unknownFields         protoimpl.UnknownFields
+	sizeCache             protoimpl.SizeCache
 }
 
 func (x *ApplyBinlogFileRequest) Reset() {
@@ -405,9 +403,9 @@ func (x *ApplyBinlogFileRequest) GetBinlogRestoreDatetime() *vttime.Time {
 }
 
 type ApplyBinlogFileResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
 	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *ApplyBinlogFileResponse) Reset() {
@@ -441,11 +439,10 @@ func (*ApplyBinlogFileResponse) Descriptor() ([]byte, []int) {
 }
 
 type ReadBinlogFilesTimestampsRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	BinlogFileNames []string `protobuf:"bytes,1,rep,name=binlog_file_names,json=binlogFileNames,proto3" json:"binlog_file_names,omitempty"`
+	state           protoimpl.MessageState `protogen:"open.v1"`
+	BinlogFileNames []string               `protobuf:"bytes,1,rep,name=binlog_file_names,json=binlogFileNames,proto3" json:"binlog_file_names,omitempty"`
+	unknownFields   protoimpl.UnknownFields
+	sizeCache       protoimpl.SizeCache
 }
 
 func (x *ReadBinlogFilesTimestampsRequest) Reset() {
@@ -486,10 +483,7 @@ func (x *ReadBinlogFilesTimestampsRequest) GetBinlogFileNames() []string {
 }
 
 type ReadBinlogFilesTimestampsResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
+	state protoimpl.MessageState `protogen:"open.v1"`
 	// FirstTimestamp is the timestamp of the first found transaction searching in order of given binlog files
 	FirstTimestamp *vttime.Time `protobuf:"bytes,1,opt,name=first_timestamp,json=firstTimestamp,proto3" json:"first_timestamp,omitempty"`
 	// FirstTimestampBinlog is the name of the binary log in which the first timestamp is found
@@ -498,6 +492,8 @@ type ReadBinlogFilesTimestampsResponse struct {
 	LastTimestamp *vttime.Time `protobuf:"bytes,3,opt,name=last_timestamp,json=lastTimestamp,proto3" json:"last_timestamp,omitempty"`
 	// LastTimestampBinlog is the name of the binary log in which the last timestamp is found
 	LastTimestampBinlog string `protobuf:"bytes,4,opt,name=last_timestamp_binlog,json=lastTimestampBinlog,proto3" json:"last_timestamp_binlog,omitempty"`
+	unknownFields       protoimpl.UnknownFields
+	sizeCache           protoimpl.SizeCache
 }
 
 func (x *ReadBinlogFilesTimestampsResponse) Reset() {
@@ -559,9 +555,9 @@ func (x *ReadBinlogFilesTimestampsResponse) GetLastTimestampBinlog() string {
 }
 
 type ReinitConfigRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
 	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *ReinitConfigRequest) Reset() {
@@ -595,9 +591,9 @@ func (*ReinitConfigRequest) Descriptor() ([]byte, []int) {
 }
 
 type ReinitConfigResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
 	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *ReinitConfigResponse) Reset() {
@@ -631,9 +627,9 @@ func (*ReinitConfigResponse) Descriptor() ([]byte, []int) {
 }
 
 type RefreshConfigRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
 	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *RefreshConfigRequest) Reset() {
@@ -667,9 +663,9 @@ func (*RefreshConfigRequest) Descriptor() ([]byte, []int) {
 }
 
 type RefreshConfigResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
 	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *RefreshConfigResponse) Reset() {
@@ -703,9 +699,9 @@ func (*RefreshConfigResponse) Descriptor() ([]byte, []int) {
 }
 
 type VersionStringRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
 	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *VersionStringRequest) Reset() {
@@ -739,11 +735,10 @@ func (*VersionStringRequest) Descriptor() ([]byte, []int) {
 }
 
 type VersionStringResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	Version       string                 `protobuf:"bytes,1,opt,name=version,proto3" json:"version,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	Version string `protobuf:"bytes,1,opt,name=version,proto3" json:"version,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *VersionStringResponse) Reset() {
@@ -784,9 +779,9 @@ func (x *VersionStringResponse) GetVersion() string {
 }
 
 type HostMetricsRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
 	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *HostMetricsRequest) Reset() {
@@ -820,13 +815,12 @@ func (*HostMetricsRequest) Descriptor() ([]byte, []int) {
 }
 
 type HostMetricsResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
+	state protoimpl.MessageState `protogen:"open.v1"`
 	// Metrics is a map (metric name -> metric value/error) so that the client has as much
 	// information as possible about all the checked metrics.
-	Metrics map[string]*HostMetricsResponse_Metric `protobuf:"bytes,1,rep,name=metrics,proto3" json:"metrics,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
+	Metrics       map[string]*HostMetricsResponse_Metric `protobuf:"bytes,1,rep,name=metrics,proto3" json:"metrics,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
+	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *HostMetricsResponse) Reset() {
@@ -868,20 +862,19 @@ func (x *HostMetricsResponse) GetMetrics() map[string]*HostMetricsResponse_Metri
 
 // BackupInfo is the read-only attributes of a mysqlctl/backupstorage.BackupHandle.
 type BackupInfo struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Name        string                `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
-	Directory   string                `protobuf:"bytes,2,opt,name=directory,proto3" json:"directory,omitempty"`
-	Keyspace    string                `protobuf:"bytes,3,opt,name=keyspace,proto3" json:"keyspace,omitempty"`
-	Shard       string                `protobuf:"bytes,4,opt,name=shard,proto3" json:"shard,omitempty"`
-	TabletAlias *topodata.TabletAlias `protobuf:"bytes,5,opt,name=tablet_alias,json=tabletAlias,proto3" json:"tablet_alias,omitempty"`
-	Time        *vttime.Time          `protobuf:"bytes,6,opt,name=time,proto3" json:"time,omitempty"`
+	state       protoimpl.MessageState `protogen:"open.v1"`
+	Name        string                 `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	Directory   string                 `protobuf:"bytes,2,opt,name=directory,proto3" json:"directory,omitempty"`
+	Keyspace    string                 `protobuf:"bytes,3,opt,name=keyspace,proto3" json:"keyspace,omitempty"`
+	Shard       string                 `protobuf:"bytes,4,opt,name=shard,proto3" json:"shard,omitempty"`
+	TabletAlias *topodata.TabletAlias  `protobuf:"bytes,5,opt,name=tablet_alias,json=tabletAlias,proto3" json:"tablet_alias,omitempty"`
+	Time        *vttime.Time           `protobuf:"bytes,6,opt,name=time,proto3" json:"time,omitempty"`
 	// Engine is the name of the backupengine implementation used to create
 	// this backup.
-	Engine string            `protobuf:"bytes,7,opt,name=engine,proto3" json:"engine,omitempty"`
-	Status BackupInfo_Status `protobuf:"varint,8,opt,name=status,proto3,enum=mysqlctl.BackupInfo_Status" json:"status,omitempty"`
+	Engine        string            `protobuf:"bytes,7,opt,name=engine,proto3" json:"engine,omitempty"`
+	Status        BackupInfo_Status `protobuf:"varint,8,opt,name=status,proto3,enum=mysqlctl.BackupInfo_Status" json:"status,omitempty"`
+	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *BackupInfo) Reset() {
@@ -971,16 +964,15 @@ func (x *BackupInfo) GetStatus() BackupInfo_Status {
 }
 
 type HostMetricsResponse_Metric struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
+	state protoimpl.MessageState `protogen:"open.v1"`
 	// Name of the metric
 	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// Value is the metric value
 	Value float64 `protobuf:"fixed64,2,opt,name=value,proto3" json:"value,omitempty"`
 	// Error indicates an error retrieving the value
-	Error *vtrpc.RPCError `protobuf:"bytes,3,opt,name=error,proto3" json:"error,omitempty"`
+	Error         *vtrpc.RPCError `protobuf:"bytes,3,opt,name=error,proto3" json:"error,omitempty"`
+	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *HostMetricsResponse_Metric) Reset() {
@@ -1036,7 +1028,7 @@ func (x *HostMetricsResponse_Metric) GetError() *vtrpc.RPCError {
 
 var File_mysqlctl_proto protoreflect.FileDescriptor
 
-var file_mysqlctl_proto_rawDesc = []byte{
+var file_mysqlctl_proto_rawDesc = string([]byte{
 	0x0a, 0x0e, 0x6d, 0x79, 0x73, 0x71, 0x6c, 0x63, 0x74, 0x6c, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f,
 	0x12, 0x08, 0x6d, 0x79, 0x73, 0x71, 0x6c, 0x63, 0x74, 0x6c, 0x1a, 0x0e, 0x74, 0x6f, 0x70, 0x6f,
 	0x64, 0x61, 0x74, 0x61, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x0c, 0x76, 0x74, 0x74, 0x69,
@@ -1197,16 +1189,16 @@ var file_mysqlctl_proto_rawDesc = []byte{
 	0x6f, 0x2f, 0x76, 0x69, 0x74, 0x65, 0x73, 0x73, 0x2f, 0x67, 0x6f, 0x2f, 0x76, 0x74, 0x2f, 0x70,
 	0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x6d, 0x79, 0x73, 0x71, 0x6c, 0x63, 0x74, 0x6c, 0x62, 0x06, 0x70,
 	0x72, 0x6f, 0x74, 0x6f, 0x33,
-}
+})
 
 var (
 	file_mysqlctl_proto_rawDescOnce sync.Once
-	file_mysqlctl_proto_rawDescData = file_mysqlctl_proto_rawDesc
+	file_mysqlctl_proto_rawDescData []byte
 )
 
 func file_mysqlctl_proto_rawDescGZIP() []byte {
 	file_mysqlctl_proto_rawDescOnce.Do(func() {
-		file_mysqlctl_proto_rawDescData = protoimpl.X.CompressGZIP(file_mysqlctl_proto_rawDescData)
+		file_mysqlctl_proto_rawDescData = protoimpl.X.CompressGZIP(unsafe.Slice(unsafe.StringData(file_mysqlctl_proto_rawDesc), len(file_mysqlctl_proto_rawDesc)))
 	})
 	return file_mysqlctl_proto_rawDescData
 }
@@ -1286,7 +1278,7 @@ func file_mysqlctl_proto_init() {
 	out := protoimpl.TypeBuilder{
 		File: protoimpl.DescBuilder{
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
-			RawDescriptor: file_mysqlctl_proto_rawDesc,
+			RawDescriptor: unsafe.Slice(unsafe.StringData(file_mysqlctl_proto_rawDesc), len(file_mysqlctl_proto_rawDesc)),
 			NumEnums:      1,
 			NumMessages:   21,
 			NumExtensions: 0,
@@ -1298,7 +1290,6 @@ func file_mysqlctl_proto_init() {
 		MessageInfos:      file_mysqlctl_proto_msgTypes,
 	}.Build()
 	File_mysqlctl_proto = out.File
-	file_mysqlctl_proto_rawDesc = nil
 	file_mysqlctl_proto_goTypes = nil
 	file_mysqlctl_proto_depIdxs = nil
 }
diff --git a/go/vt/proto/mysqlctl/mysqlctl_vtproto.pb.go b/go/vt/proto/mysqlctl/mysqlctl_vtproto.pb.go
index f0c77770d50..0be379d3ede 100644
--- a/go/vt/proto/mysqlctl/mysqlctl_vtproto.pb.go
+++ b/go/vt/proto/mysqlctl/mysqlctl_vtproto.pb.go
@@ -1,5 +1,5 @@
 // Code generated by protoc-gen-go-vtproto. DO NOT EDIT.
-// protoc-gen-go-vtproto version: v0.6.1-0.20241011083415-71c992bc3c87
+// protoc-gen-go-vtproto version: v0.6.1-0.20241121165744-79df5c4772f2
 // source: mysqlctl.proto
 
 package mysqlctl
diff --git a/go/vt/proto/query/cached_size.go b/go/vt/proto/query/cached_size.go
index 4436594681a..58054d3c445 100644
--- a/go/vt/proto/query/cached_size.go
+++ b/go/vt/proto/query/cached_size.go
@@ -27,10 +27,6 @@ func (cached *BindVariable) CachedSize(alloc bool) int64 {
 	if alloc {
 		size += int64(96)
 	}
-	// field unknownFields google.golang.org/protobuf/runtime/protoimpl.UnknownFields
-	{
-		size += hack.RuntimeAllocSize(int64(cap(cached.unknownFields)))
-	}
 	// field Value []byte
 	{
 		size += hack.RuntimeAllocSize(int64(cap(cached.Value)))
@@ -42,6 +38,10 @@ func (cached *BindVariable) CachedSize(alloc bool) int64 {
 			size += elem.CachedSize(true)
 		}
 	}
+	// field unknownFields google.golang.org/protobuf/runtime/protoimpl.UnknownFields
+	{
+		size += hack.RuntimeAllocSize(int64(cap(cached.unknownFields)))
+	}
 	return size
 }
 func (cached *Field) CachedSize(alloc bool) int64 {
@@ -52,10 +52,6 @@ func (cached *Field) CachedSize(alloc bool) int64 {
 	if alloc {
 		size += int64(160)
 	}
-	// field unknownFields google.golang.org/protobuf/runtime/protoimpl.UnknownFields
-	{
-		size += hack.RuntimeAllocSize(int64(cap(cached.unknownFields)))
-	}
 	// field Name string
 	size += hack.RuntimeAllocSize(int64(len(cached.Name)))
 	// field Table string
@@ -68,6 +64,10 @@ func (cached *Field) CachedSize(alloc bool) int64 {
 	size += hack.RuntimeAllocSize(int64(len(cached.OrgName)))
 	// field ColumnType string
 	size += hack.RuntimeAllocSize(int64(len(cached.ColumnType)))
+	// field unknownFields google.golang.org/protobuf/runtime/protoimpl.UnknownFields
+	{
+		size += hack.RuntimeAllocSize(int64(cap(cached.unknownFields)))
+	}
 	return size
 }
 func (cached *QueryWarning) CachedSize(alloc bool) int64 {
@@ -78,12 +78,12 @@ func (cached *QueryWarning) CachedSize(alloc bool) int64 {
 	if alloc {
 		size += int64(64)
 	}
+	// field Message string
+	size += hack.RuntimeAllocSize(int64(len(cached.Message)))
 	// field unknownFields google.golang.org/protobuf/runtime/protoimpl.UnknownFields
 	{
 		size += hack.RuntimeAllocSize(int64(cap(cached.unknownFields)))
 	}
-	// field Message string
-	size += hack.RuntimeAllocSize(int64(len(cached.Message)))
 	return size
 }
 func (cached *Target) CachedSize(alloc bool) int64 {
@@ -94,16 +94,16 @@ func (cached *Target) CachedSize(alloc bool) int64 {
 	if alloc {
 		size += int64(96)
 	}
-	// field unknownFields google.golang.org/protobuf/runtime/protoimpl.UnknownFields
-	{
-		size += hack.RuntimeAllocSize(int64(cap(cached.unknownFields)))
-	}
 	// field Keyspace string
 	size += hack.RuntimeAllocSize(int64(len(cached.Keyspace)))
 	// field Shard string
 	size += hack.RuntimeAllocSize(int64(len(cached.Shard)))
 	// field Cell string
 	size += hack.RuntimeAllocSize(int64(len(cached.Cell)))
+	// field unknownFields google.golang.org/protobuf/runtime/protoimpl.UnknownFields
+	{
+		size += hack.RuntimeAllocSize(int64(cap(cached.unknownFields)))
+	}
 	return size
 }
 func (cached *Value) CachedSize(alloc bool) int64 {
@@ -114,13 +114,13 @@ func (cached *Value) CachedSize(alloc bool) int64 {
 	if alloc {
 		size += int64(80)
 	}
-	// field unknownFields google.golang.org/protobuf/runtime/protoimpl.UnknownFields
-	{
-		size += hack.RuntimeAllocSize(int64(cap(cached.unknownFields)))
-	}
 	// field Value []byte
 	{
 		size += hack.RuntimeAllocSize(int64(cap(cached.Value)))
 	}
+	// field unknownFields google.golang.org/protobuf/runtime/protoimpl.UnknownFields
+	{
+		size += hack.RuntimeAllocSize(int64(cap(cached.unknownFields)))
+	}
 	return size
 }
diff --git a/go/vt/proto/query/query.pb.go b/go/vt/proto/query/query.pb.go
index a168cc2d363..ab49a5605df 100644
--- a/go/vt/proto/query/query.pb.go
+++ b/go/vt/proto/query/query.pb.go
@@ -18,7 +18,7 @@
 
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.35.1
+// 	protoc-gen-go v1.36.4
 // 	protoc        v3.21.3
 // source: query.proto
 
@@ -29,6 +29,7 @@ import (
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
 	reflect "reflect"
 	sync "sync"
+	unsafe "unsafe"
 	topodata "vitess.io/vitess/go/vt/proto/topodata"
 	vtrpc "vitess.io/vitess/go/vt/proto/vtrpc"
 )
@@ -976,16 +977,15 @@ func (StreamEvent_Statement_Category) EnumDescriptor() ([]byte, []int) {
 // Target describes what the client expects the tablet is.
 // If the tablet does not match, an error is returned.
 type Target struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Keyspace   string              `protobuf:"bytes,1,opt,name=keyspace,proto3" json:"keyspace,omitempty"`
-	Shard      string              `protobuf:"bytes,2,opt,name=shard,proto3" json:"shard,omitempty"`
-	TabletType topodata.TabletType `protobuf:"varint,3,opt,name=tablet_type,json=tabletType,proto3,enum=topodata.TabletType" json:"tablet_type,omitempty"`
+	state      protoimpl.MessageState `protogen:"open.v1"`
+	Keyspace   string                 `protobuf:"bytes,1,opt,name=keyspace,proto3" json:"keyspace,omitempty"`
+	Shard      string                 `protobuf:"bytes,2,opt,name=shard,proto3" json:"shard,omitempty"`
+	TabletType topodata.TabletType    `protobuf:"varint,3,opt,name=tablet_type,json=tabletType,proto3,enum=topodata.TabletType" json:"tablet_type,omitempty"`
 	// cell is used for routing queries between vtgate and vttablets. It
 	// is not used when Target is part of the Session sent by the client.
-	Cell string `protobuf:"bytes,4,opt,name=cell,proto3" json:"cell,omitempty"`
+	Cell          string `protobuf:"bytes,4,opt,name=cell,proto3" json:"cell,omitempty"`
+	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *Target) Reset() {
@@ -1055,12 +1055,11 @@ func (x *Target) GetCell() string {
 // structure, which is not secure at all, because it is provided
 // by the Vitess client.
 type VTGateCallerID struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	Username      string                 `protobuf:"bytes,1,opt,name=username,proto3" json:"username,omitempty"`
+	Groups        []string               `protobuf:"bytes,2,rep,name=groups,proto3" json:"groups,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	Username string   `protobuf:"bytes,1,opt,name=username,proto3" json:"username,omitempty"`
-	Groups   []string `protobuf:"bytes,2,rep,name=groups,proto3" json:"groups,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *VTGateCallerID) Reset() {
@@ -1112,10 +1111,7 @@ func (x *VTGateCallerID) GetGroups() []string {
 // position can be retrieved from vttablet when executing a query. It
 // is also sent with the replication streams from the binlog service.
 type EventToken struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
+	state protoimpl.MessageState `protogen:"open.v1"`
 	// timestamp is the MySQL timestamp of the statements. Seconds since Epoch.
 	Timestamp int64 `protobuf:"varint,1,opt,name=timestamp,proto3" json:"timestamp,omitempty"`
 	// The shard name that applied the statements. Note this is not set when
@@ -1123,7 +1119,9 @@ type EventToken struct {
 	Shard string `protobuf:"bytes,2,opt,name=shard,proto3" json:"shard,omitempty"`
 	// The position on the replication stream after this statement was applied.
 	// It is not the transaction ID / GTID, but the position / GTIDSet.
-	Position string `protobuf:"bytes,3,opt,name=position,proto3" json:"position,omitempty"`
+	Position      string `protobuf:"bytes,3,opt,name=position,proto3" json:"position,omitempty"`
+	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *EventToken) Reset() {
@@ -1179,12 +1177,11 @@ func (x *EventToken) GetPosition() string {
 
 // Value represents a typed value.
 type Value struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	Type          Type                   `protobuf:"varint,1,opt,name=type,proto3,enum=query.Type" json:"type,omitempty"`
+	Value         []byte                 `protobuf:"bytes,2,opt,name=value,proto3" json:"value,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	Type  Type   `protobuf:"varint,1,opt,name=type,proto3,enum=query.Type" json:"type,omitempty"`
-	Value []byte `protobuf:"bytes,2,opt,name=value,proto3" json:"value,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *Value) Reset() {
@@ -1233,14 +1230,13 @@ func (x *Value) GetValue() []byte {
 
 // BindVariable represents a single bind variable in a Query.
 type BindVariable struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Type  Type   `protobuf:"varint,1,opt,name=type,proto3,enum=query.Type" json:"type,omitempty"`
-	Value []byte `protobuf:"bytes,2,opt,name=value,proto3" json:"value,omitempty"`
+	state protoimpl.MessageState `protogen:"open.v1"`
+	Type  Type                   `protobuf:"varint,1,opt,name=type,proto3,enum=query.Type" json:"type,omitempty"`
+	Value []byte                 `protobuf:"bytes,2,opt,name=value,proto3" json:"value,omitempty"`
 	// values are set if type is TUPLE.
-	Values []*Value `protobuf:"bytes,3,rep,name=values,proto3" json:"values,omitempty"`
+	Values        []*Value `protobuf:"bytes,3,rep,name=values,proto3" json:"values,omitempty"`
+	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *BindVariable) Reset() {
@@ -1296,15 +1292,14 @@ func (x *BindVariable) GetValues() []*Value {
 
 // BoundQuery is a query with its bind variables
 type BoundQuery struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
+	state protoimpl.MessageState `protogen:"open.v1"`
 	// sql is the SQL query to execute
 	Sql string `protobuf:"bytes,1,opt,name=sql,proto3" json:"sql,omitempty"`
 	// bind_variables is a map of all bind variables to expand in the query.
 	// nil values are not allowed. Use NULL_TYPE to express a NULL value.
-	BindVariables map[string]*BindVariable `protobuf:"bytes,2,rep,name=bind_variables,json=bindVariables,proto3" json:"bind_variables,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
+	BindVariables map[string]*BindVariable `protobuf:"bytes,2,rep,name=bind_variables,json=bindVariables,proto3" json:"bind_variables,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
+	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *BoundQuery) Reset() {
@@ -1353,10 +1348,7 @@ func (x *BoundQuery) GetBindVariables() map[string]*BindVariable {
 
 // ExecuteOptions is passed around for all Execute calls.
 type ExecuteOptions struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
+	state protoimpl.MessageState `protogen:"open.v1"`
 	// Controls what fields are returned in Field message responses from mysql, i.e.
 	// field name, table name, etc. This is an optimization for high-QPS queries where
 	// the client knows what it's getting
@@ -1399,7 +1391,7 @@ type ExecuteOptions struct {
 	Priority string `protobuf:"bytes,16,opt,name=priority,proto3" json:"priority,omitempty"`
 	// timeout specifies the query timeout in milliseconds. If not set, the default timeout is used.
 	//
-	// Types that are assignable to Timeout:
+	// Types that are valid to be assigned to Timeout:
 	//
 	//	*ExecuteOptions_AuthoritativeTimeout
 	Timeout isExecuteOptions_Timeout `protobuf_oneof:"timeout"`
@@ -1408,6 +1400,8 @@ type ExecuteOptions struct {
 	// 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"`
+	unknownFields     protoimpl.UnknownFields
+	sizeCache         protoimpl.SizeCache
 }
 
 func (x *ExecuteOptions) Reset() {
@@ -1524,16 +1518,18 @@ func (x *ExecuteOptions) GetPriority() string {
 	return ""
 }
 
-func (m *ExecuteOptions) GetTimeout() isExecuteOptions_Timeout {
-	if m != nil {
-		return m.Timeout
+func (x *ExecuteOptions) GetTimeout() isExecuteOptions_Timeout {
+	if x != nil {
+		return x.Timeout
 	}
 	return nil
 }
 
 func (x *ExecuteOptions) GetAuthoritativeTimeout() int64 {
-	if x, ok := x.GetTimeout().(*ExecuteOptions_AuthoritativeTimeout); ok {
-		return x.AuthoritativeTimeout
+	if x != nil {
+		if x, ok := x.Timeout.(*ExecuteOptions_AuthoritativeTimeout); ok {
+			return x.AuthoritativeTimeout
+		}
 	}
 	return 0
 }
@@ -1557,10 +1553,7 @@ func (*ExecuteOptions_AuthoritativeTimeout) isExecuteOptions_Timeout() {}
 
 // Field describes a single column returned by a query
 type Field struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
+	state protoimpl.MessageState `protogen:"open.v1"`
 	// name of the field as returned by mysql C API
 	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// vitess-defined type. Conversion function is in sqltypes package.
@@ -1581,7 +1574,9 @@ type Field struct {
 	// flags is actually a uint16. Only the lower 16 bits are used.
 	Flags uint32 `protobuf:"varint,10,opt,name=flags,proto3" json:"flags,omitempty"`
 	// column_type is optionally populated from information_schema.columns
-	ColumnType string `protobuf:"bytes,11,opt,name=column_type,json=columnType,proto3" json:"column_type,omitempty"`
+	ColumnType    string `protobuf:"bytes,11,opt,name=column_type,json=columnType,proto3" json:"column_type,omitempty"`
+	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *Field) Reset() {
@@ -1693,17 +1688,16 @@ func (x *Field) GetColumnType() string {
 
 // Row is a database row.
 type Row struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
+	state protoimpl.MessageState `protogen:"open.v1"`
 	// lengths contains the length of each value in values.
 	// A length of -1 means that the field is NULL. While
 	// reading values, you have to accummulate the length
 	// to know the offset where the next value begins in values.
 	Lengths []int64 `protobuf:"zigzag64,1,rep,packed,name=lengths,proto3" json:"lengths,omitempty"`
 	// values contains a concatenation of all values in the row.
-	Values []byte `protobuf:"bytes,2,opt,name=values,proto3" json:"values,omitempty"`
+	Values        []byte `protobuf:"bytes,2,opt,name=values,proto3" json:"values,omitempty"`
+	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *Row) Reset() {
@@ -1760,17 +1754,16 @@ func (x *Row) GetValues() []byte {
 // len(QueryResult[0].fields) is always equal to len(row) (for each
 // row in rows for each QueryResult in QueryResult[1:]).
 type QueryResult struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Fields              []*Field `protobuf:"bytes,1,rep,name=fields,proto3" json:"fields,omitempty"`
-	RowsAffected        uint64   `protobuf:"varint,2,opt,name=rows_affected,json=rowsAffected,proto3" json:"rows_affected,omitempty"`
-	InsertId            uint64   `protobuf:"varint,3,opt,name=insert_id,json=insertId,proto3" json:"insert_id,omitempty"`
-	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"`
+	state               protoimpl.MessageState `protogen:"open.v1"`
+	Fields              []*Field               `protobuf:"bytes,1,rep,name=fields,proto3" json:"fields,omitempty"`
+	RowsAffected        uint64                 `protobuf:"varint,2,opt,name=rows_affected,json=rowsAffected,proto3" json:"rows_affected,omitempty"`
+	InsertId            uint64                 `protobuf:"varint,3,opt,name=insert_id,json=insertId,proto3" json:"insert_id,omitempty"`
+	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"`
+	unknownFields       protoimpl.UnknownFields
+	sizeCache           protoimpl.SizeCache
 }
 
 func (x *QueryResult) Reset() {
@@ -1855,12 +1848,11 @@ func (x *QueryResult) GetInsertIdChanged() bool {
 // QueryWarning is used to convey out of band query execution warnings
 // by storing in the vtgate.Session
 type QueryWarning struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	Code          uint32                 `protobuf:"varint,1,opt,name=code,proto3" json:"code,omitempty"`
+	Message       string                 `protobuf:"bytes,2,opt,name=message,proto3" json:"message,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	Code    uint32 `protobuf:"varint,1,opt,name=code,proto3" json:"code,omitempty"`
-	Message string `protobuf:"bytes,2,opt,name=message,proto3" json:"message,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *QueryWarning) Reset() {
@@ -1911,14 +1903,13 @@ func (x *QueryWarning) GetMessage() string {
 // single transactional unit on a server. It is streamed back by the
 // Update Stream calls.
 type StreamEvent struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
+	state protoimpl.MessageState `protogen:"open.v1"`
 	// The statements in this transaction.
 	Statements []*StreamEvent_Statement `protobuf:"bytes,1,rep,name=statements,proto3" json:"statements,omitempty"`
 	// The Event Token for this event.
-	EventToken *EventToken `protobuf:"bytes,2,opt,name=event_token,json=eventToken,proto3" json:"event_token,omitempty"`
+	EventToken    *EventToken `protobuf:"bytes,2,opt,name=event_token,json=eventToken,proto3" json:"event_token,omitempty"`
+	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *StreamEvent) Reset() {
@@ -1967,17 +1958,16 @@ func (x *StreamEvent) GetEventToken() *EventToken {
 
 // ExecuteRequest is the payload to Execute
 type ExecuteRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	EffectiveCallerId *vtrpc.CallerID `protobuf:"bytes,1,opt,name=effective_caller_id,json=effectiveCallerId,proto3" json:"effective_caller_id,omitempty"`
-	ImmediateCallerId *VTGateCallerID `protobuf:"bytes,2,opt,name=immediate_caller_id,json=immediateCallerId,proto3" json:"immediate_caller_id,omitempty"`
-	Target            *Target         `protobuf:"bytes,3,opt,name=target,proto3" json:"target,omitempty"`
-	Query             *BoundQuery     `protobuf:"bytes,4,opt,name=query,proto3" json:"query,omitempty"`
-	TransactionId     int64           `protobuf:"varint,5,opt,name=transaction_id,json=transactionId,proto3" json:"transaction_id,omitempty"`
-	Options           *ExecuteOptions `protobuf:"bytes,6,opt,name=options,proto3" json:"options,omitempty"`
-	ReservedId        int64           `protobuf:"varint,7,opt,name=reserved_id,json=reservedId,proto3" json:"reserved_id,omitempty"`
+	state             protoimpl.MessageState `protogen:"open.v1"`
+	EffectiveCallerId *vtrpc.CallerID        `protobuf:"bytes,1,opt,name=effective_caller_id,json=effectiveCallerId,proto3" json:"effective_caller_id,omitempty"`
+	ImmediateCallerId *VTGateCallerID        `protobuf:"bytes,2,opt,name=immediate_caller_id,json=immediateCallerId,proto3" json:"immediate_caller_id,omitempty"`
+	Target            *Target                `protobuf:"bytes,3,opt,name=target,proto3" json:"target,omitempty"`
+	Query             *BoundQuery            `protobuf:"bytes,4,opt,name=query,proto3" json:"query,omitempty"`
+	TransactionId     int64                  `protobuf:"varint,5,opt,name=transaction_id,json=transactionId,proto3" json:"transaction_id,omitempty"`
+	Options           *ExecuteOptions        `protobuf:"bytes,6,opt,name=options,proto3" json:"options,omitempty"`
+	ReservedId        int64                  `protobuf:"varint,7,opt,name=reserved_id,json=reservedId,proto3" json:"reserved_id,omitempty"`
+	unknownFields     protoimpl.UnknownFields
+	sizeCache         protoimpl.SizeCache
 }
 
 func (x *ExecuteRequest) Reset() {
@@ -2061,11 +2051,10 @@ func (x *ExecuteRequest) GetReservedId() int64 {
 
 // ExecuteResponse is the returned value from Execute
 type ExecuteResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	Result        *QueryResult           `protobuf:"bytes,1,opt,name=result,proto3" json:"result,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	Result *QueryResult `protobuf:"bytes,1,opt,name=result,proto3" json:"result,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *ExecuteResponse) Reset() {
@@ -2109,14 +2098,13 @@ func (x *ExecuteResponse) GetResult() *QueryResult {
 // in the form of result or error but not both.
 // TODO: To be used in ExecuteBatchResponse and BeginExecuteBatchResponse.
 type ResultWithError struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
+	state protoimpl.MessageState `protogen:"open.v1"`
 	// error contains an query level error, only set if result is unset.
 	Error *vtrpc.RPCError `protobuf:"bytes,1,opt,name=error,proto3" json:"error,omitempty"`
 	// result contains the query result, only set if error is unset.
-	Result *QueryResult `protobuf:"bytes,2,opt,name=result,proto3" json:"result,omitempty"`
+	Result        *QueryResult `protobuf:"bytes,2,opt,name=result,proto3" json:"result,omitempty"`
+	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *ResultWithError) Reset() {
@@ -2165,17 +2153,16 @@ func (x *ResultWithError) GetResult() *QueryResult {
 
 // StreamExecuteRequest is the payload to StreamExecute
 type StreamExecuteRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	EffectiveCallerId *vtrpc.CallerID `protobuf:"bytes,1,opt,name=effective_caller_id,json=effectiveCallerId,proto3" json:"effective_caller_id,omitempty"`
-	ImmediateCallerId *VTGateCallerID `protobuf:"bytes,2,opt,name=immediate_caller_id,json=immediateCallerId,proto3" json:"immediate_caller_id,omitempty"`
-	Target            *Target         `protobuf:"bytes,3,opt,name=target,proto3" json:"target,omitempty"`
-	Query             *BoundQuery     `protobuf:"bytes,4,opt,name=query,proto3" json:"query,omitempty"`
-	Options           *ExecuteOptions `protobuf:"bytes,5,opt,name=options,proto3" json:"options,omitempty"`
-	TransactionId     int64           `protobuf:"varint,6,opt,name=transaction_id,json=transactionId,proto3" json:"transaction_id,omitempty"`
-	ReservedId        int64           `protobuf:"varint,7,opt,name=reserved_id,json=reservedId,proto3" json:"reserved_id,omitempty"`
+	state             protoimpl.MessageState `protogen:"open.v1"`
+	EffectiveCallerId *vtrpc.CallerID        `protobuf:"bytes,1,opt,name=effective_caller_id,json=effectiveCallerId,proto3" json:"effective_caller_id,omitempty"`
+	ImmediateCallerId *VTGateCallerID        `protobuf:"bytes,2,opt,name=immediate_caller_id,json=immediateCallerId,proto3" json:"immediate_caller_id,omitempty"`
+	Target            *Target                `protobuf:"bytes,3,opt,name=target,proto3" json:"target,omitempty"`
+	Query             *BoundQuery            `protobuf:"bytes,4,opt,name=query,proto3" json:"query,omitempty"`
+	Options           *ExecuteOptions        `protobuf:"bytes,5,opt,name=options,proto3" json:"options,omitempty"`
+	TransactionId     int64                  `protobuf:"varint,6,opt,name=transaction_id,json=transactionId,proto3" json:"transaction_id,omitempty"`
+	ReservedId        int64                  `protobuf:"varint,7,opt,name=reserved_id,json=reservedId,proto3" json:"reserved_id,omitempty"`
+	unknownFields     protoimpl.UnknownFields
+	sizeCache         protoimpl.SizeCache
 }
 
 func (x *StreamExecuteRequest) Reset() {
@@ -2259,11 +2246,10 @@ func (x *StreamExecuteRequest) GetReservedId() int64 {
 
 // StreamExecuteResponse is the returned value from StreamExecute
 type StreamExecuteResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	Result        *QueryResult           `protobuf:"bytes,1,opt,name=result,proto3" json:"result,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	Result *QueryResult `protobuf:"bytes,1,opt,name=result,proto3" json:"result,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *StreamExecuteResponse) Reset() {
@@ -2305,14 +2291,13 @@ func (x *StreamExecuteResponse) GetResult() *QueryResult {
 
 // BeginRequest is the payload to Begin
 type BeginRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	EffectiveCallerId *vtrpc.CallerID `protobuf:"bytes,1,opt,name=effective_caller_id,json=effectiveCallerId,proto3" json:"effective_caller_id,omitempty"`
-	ImmediateCallerId *VTGateCallerID `protobuf:"bytes,2,opt,name=immediate_caller_id,json=immediateCallerId,proto3" json:"immediate_caller_id,omitempty"`
-	Target            *Target         `protobuf:"bytes,3,opt,name=target,proto3" json:"target,omitempty"`
-	Options           *ExecuteOptions `protobuf:"bytes,4,opt,name=options,proto3" json:"options,omitempty"`
+	state             protoimpl.MessageState `protogen:"open.v1"`
+	EffectiveCallerId *vtrpc.CallerID        `protobuf:"bytes,1,opt,name=effective_caller_id,json=effectiveCallerId,proto3" json:"effective_caller_id,omitempty"`
+	ImmediateCallerId *VTGateCallerID        `protobuf:"bytes,2,opt,name=immediate_caller_id,json=immediateCallerId,proto3" json:"immediate_caller_id,omitempty"`
+	Target            *Target                `protobuf:"bytes,3,opt,name=target,proto3" json:"target,omitempty"`
+	Options           *ExecuteOptions        `protobuf:"bytes,4,opt,name=options,proto3" json:"options,omitempty"`
+	unknownFields     protoimpl.UnknownFields
+	sizeCache         protoimpl.SizeCache
 }
 
 func (x *BeginRequest) Reset() {
@@ -2375,15 +2360,14 @@ func (x *BeginRequest) GetOptions() *ExecuteOptions {
 
 // BeginResponse is the returned value from Begin
 type BeginResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	TransactionId int64                 `protobuf:"varint,1,opt,name=transaction_id,json=transactionId,proto3" json:"transaction_id,omitempty"`
-	TabletAlias   *topodata.TabletAlias `protobuf:"bytes,2,opt,name=tablet_alias,json=tabletAlias,proto3" json:"tablet_alias,omitempty"`
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	TransactionId int64                  `protobuf:"varint,1,opt,name=transaction_id,json=transactionId,proto3" json:"transaction_id,omitempty"`
+	TabletAlias   *topodata.TabletAlias  `protobuf:"bytes,2,opt,name=tablet_alias,json=tabletAlias,proto3" json:"tablet_alias,omitempty"`
 	// The session_state_changes might be set if the transaction is a snapshot transaction
 	// and the MySQL implementation supports getting a start gtid on snapshot
 	SessionStateChanges string `protobuf:"bytes,3,opt,name=session_state_changes,json=sessionStateChanges,proto3" json:"session_state_changes,omitempty"`
+	unknownFields       protoimpl.UnknownFields
+	sizeCache           protoimpl.SizeCache
 }
 
 func (x *BeginResponse) Reset() {
@@ -2439,14 +2423,13 @@ func (x *BeginResponse) GetSessionStateChanges() string {
 
 // CommitRequest is the payload to Commit
 type CommitRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	EffectiveCallerId *vtrpc.CallerID `protobuf:"bytes,1,opt,name=effective_caller_id,json=effectiveCallerId,proto3" json:"effective_caller_id,omitempty"`
-	ImmediateCallerId *VTGateCallerID `protobuf:"bytes,2,opt,name=immediate_caller_id,json=immediateCallerId,proto3" json:"immediate_caller_id,omitempty"`
-	Target            *Target         `protobuf:"bytes,3,opt,name=target,proto3" json:"target,omitempty"`
-	TransactionId     int64           `protobuf:"varint,4,opt,name=transaction_id,json=transactionId,proto3" json:"transaction_id,omitempty"`
+	state             protoimpl.MessageState `protogen:"open.v1"`
+	EffectiveCallerId *vtrpc.CallerID        `protobuf:"bytes,1,opt,name=effective_caller_id,json=effectiveCallerId,proto3" json:"effective_caller_id,omitempty"`
+	ImmediateCallerId *VTGateCallerID        `protobuf:"bytes,2,opt,name=immediate_caller_id,json=immediateCallerId,proto3" json:"immediate_caller_id,omitempty"`
+	Target            *Target                `protobuf:"bytes,3,opt,name=target,proto3" json:"target,omitempty"`
+	TransactionId     int64                  `protobuf:"varint,4,opt,name=transaction_id,json=transactionId,proto3" json:"transaction_id,omitempty"`
+	unknownFields     protoimpl.UnknownFields
+	sizeCache         protoimpl.SizeCache
 }
 
 func (x *CommitRequest) Reset() {
@@ -2509,11 +2492,10 @@ func (x *CommitRequest) GetTransactionId() int64 {
 
 // CommitResponse is the returned value from Commit
 type CommitResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	ReservedId    int64                  `protobuf:"varint,1,opt,name=reserved_id,json=reservedId,proto3" json:"reserved_id,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	ReservedId int64 `protobuf:"varint,1,opt,name=reserved_id,json=reservedId,proto3" json:"reserved_id,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *CommitResponse) Reset() {
@@ -2555,14 +2537,13 @@ func (x *CommitResponse) GetReservedId() int64 {
 
 // RollbackRequest is the payload to Rollback
 type RollbackRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	EffectiveCallerId *vtrpc.CallerID `protobuf:"bytes,1,opt,name=effective_caller_id,json=effectiveCallerId,proto3" json:"effective_caller_id,omitempty"`
-	ImmediateCallerId *VTGateCallerID `protobuf:"bytes,2,opt,name=immediate_caller_id,json=immediateCallerId,proto3" json:"immediate_caller_id,omitempty"`
-	Target            *Target         `protobuf:"bytes,3,opt,name=target,proto3" json:"target,omitempty"`
-	TransactionId     int64           `protobuf:"varint,4,opt,name=transaction_id,json=transactionId,proto3" json:"transaction_id,omitempty"`
+	state             protoimpl.MessageState `protogen:"open.v1"`
+	EffectiveCallerId *vtrpc.CallerID        `protobuf:"bytes,1,opt,name=effective_caller_id,json=effectiveCallerId,proto3" json:"effective_caller_id,omitempty"`
+	ImmediateCallerId *VTGateCallerID        `protobuf:"bytes,2,opt,name=immediate_caller_id,json=immediateCallerId,proto3" json:"immediate_caller_id,omitempty"`
+	Target            *Target                `protobuf:"bytes,3,opt,name=target,proto3" json:"target,omitempty"`
+	TransactionId     int64                  `protobuf:"varint,4,opt,name=transaction_id,json=transactionId,proto3" json:"transaction_id,omitempty"`
+	unknownFields     protoimpl.UnknownFields
+	sizeCache         protoimpl.SizeCache
 }
 
 func (x *RollbackRequest) Reset() {
@@ -2625,11 +2606,10 @@ func (x *RollbackRequest) GetTransactionId() int64 {
 
 // RollbackResponse is the returned value from Rollback
 type RollbackResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	ReservedId    int64                  `protobuf:"varint,1,opt,name=reserved_id,json=reservedId,proto3" json:"reserved_id,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	ReservedId int64 `protobuf:"varint,1,opt,name=reserved_id,json=reservedId,proto3" json:"reserved_id,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *RollbackResponse) Reset() {
@@ -2671,15 +2651,14 @@ func (x *RollbackResponse) GetReservedId() int64 {
 
 // PrepareRequest is the payload to Prepare
 type PrepareRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	EffectiveCallerId *vtrpc.CallerID `protobuf:"bytes,1,opt,name=effective_caller_id,json=effectiveCallerId,proto3" json:"effective_caller_id,omitempty"`
-	ImmediateCallerId *VTGateCallerID `protobuf:"bytes,2,opt,name=immediate_caller_id,json=immediateCallerId,proto3" json:"immediate_caller_id,omitempty"`
-	Target            *Target         `protobuf:"bytes,3,opt,name=target,proto3" json:"target,omitempty"`
-	TransactionId     int64           `protobuf:"varint,4,opt,name=transaction_id,json=transactionId,proto3" json:"transaction_id,omitempty"`
-	Dtid              string          `protobuf:"bytes,5,opt,name=dtid,proto3" json:"dtid,omitempty"`
+	state             protoimpl.MessageState `protogen:"open.v1"`
+	EffectiveCallerId *vtrpc.CallerID        `protobuf:"bytes,1,opt,name=effective_caller_id,json=effectiveCallerId,proto3" json:"effective_caller_id,omitempty"`
+	ImmediateCallerId *VTGateCallerID        `protobuf:"bytes,2,opt,name=immediate_caller_id,json=immediateCallerId,proto3" json:"immediate_caller_id,omitempty"`
+	Target            *Target                `protobuf:"bytes,3,opt,name=target,proto3" json:"target,omitempty"`
+	TransactionId     int64                  `protobuf:"varint,4,opt,name=transaction_id,json=transactionId,proto3" json:"transaction_id,omitempty"`
+	Dtid              string                 `protobuf:"bytes,5,opt,name=dtid,proto3" json:"dtid,omitempty"`
+	unknownFields     protoimpl.UnknownFields
+	sizeCache         protoimpl.SizeCache
 }
 
 func (x *PrepareRequest) Reset() {
@@ -2749,9 +2728,9 @@ func (x *PrepareRequest) GetDtid() string {
 
 // PrepareResponse is the returned value from Prepare
 type PrepareResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
 	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *PrepareResponse) Reset() {
@@ -2786,14 +2765,13 @@ func (*PrepareResponse) Descriptor() ([]byte, []int) {
 
 // CommitPreparedRequest is the payload to CommitPrepared
 type CommitPreparedRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	EffectiveCallerId *vtrpc.CallerID `protobuf:"bytes,1,opt,name=effective_caller_id,json=effectiveCallerId,proto3" json:"effective_caller_id,omitempty"`
-	ImmediateCallerId *VTGateCallerID `protobuf:"bytes,2,opt,name=immediate_caller_id,json=immediateCallerId,proto3" json:"immediate_caller_id,omitempty"`
-	Target            *Target         `protobuf:"bytes,3,opt,name=target,proto3" json:"target,omitempty"`
-	Dtid              string          `protobuf:"bytes,4,opt,name=dtid,proto3" json:"dtid,omitempty"`
+	state             protoimpl.MessageState `protogen:"open.v1"`
+	EffectiveCallerId *vtrpc.CallerID        `protobuf:"bytes,1,opt,name=effective_caller_id,json=effectiveCallerId,proto3" json:"effective_caller_id,omitempty"`
+	ImmediateCallerId *VTGateCallerID        `protobuf:"bytes,2,opt,name=immediate_caller_id,json=immediateCallerId,proto3" json:"immediate_caller_id,omitempty"`
+	Target            *Target                `protobuf:"bytes,3,opt,name=target,proto3" json:"target,omitempty"`
+	Dtid              string                 `protobuf:"bytes,4,opt,name=dtid,proto3" json:"dtid,omitempty"`
+	unknownFields     protoimpl.UnknownFields
+	sizeCache         protoimpl.SizeCache
 }
 
 func (x *CommitPreparedRequest) Reset() {
@@ -2856,9 +2834,9 @@ func (x *CommitPreparedRequest) GetDtid() string {
 
 // CommitPreparedResponse is the returned value from CommitPrepared
 type CommitPreparedResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
 	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *CommitPreparedResponse) Reset() {
@@ -2893,15 +2871,14 @@ func (*CommitPreparedResponse) Descriptor() ([]byte, []int) {
 
 // RollbackPreparedRequest is the payload to RollbackPrepared
 type RollbackPreparedRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	EffectiveCallerId *vtrpc.CallerID `protobuf:"bytes,1,opt,name=effective_caller_id,json=effectiveCallerId,proto3" json:"effective_caller_id,omitempty"`
-	ImmediateCallerId *VTGateCallerID `protobuf:"bytes,2,opt,name=immediate_caller_id,json=immediateCallerId,proto3" json:"immediate_caller_id,omitempty"`
-	Target            *Target         `protobuf:"bytes,3,opt,name=target,proto3" json:"target,omitempty"`
-	TransactionId     int64           `protobuf:"varint,4,opt,name=transaction_id,json=transactionId,proto3" json:"transaction_id,omitempty"`
-	Dtid              string          `protobuf:"bytes,5,opt,name=dtid,proto3" json:"dtid,omitempty"`
+	state             protoimpl.MessageState `protogen:"open.v1"`
+	EffectiveCallerId *vtrpc.CallerID        `protobuf:"bytes,1,opt,name=effective_caller_id,json=effectiveCallerId,proto3" json:"effective_caller_id,omitempty"`
+	ImmediateCallerId *VTGateCallerID        `protobuf:"bytes,2,opt,name=immediate_caller_id,json=immediateCallerId,proto3" json:"immediate_caller_id,omitempty"`
+	Target            *Target                `protobuf:"bytes,3,opt,name=target,proto3" json:"target,omitempty"`
+	TransactionId     int64                  `protobuf:"varint,4,opt,name=transaction_id,json=transactionId,proto3" json:"transaction_id,omitempty"`
+	Dtid              string                 `protobuf:"bytes,5,opt,name=dtid,proto3" json:"dtid,omitempty"`
+	unknownFields     protoimpl.UnknownFields
+	sizeCache         protoimpl.SizeCache
 }
 
 func (x *RollbackPreparedRequest) Reset() {
@@ -2971,9 +2948,9 @@ func (x *RollbackPreparedRequest) GetDtid() string {
 
 // RollbackPreparedResponse is the returned value from RollbackPrepared
 type RollbackPreparedResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
 	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *RollbackPreparedResponse) Reset() {
@@ -3008,15 +2985,14 @@ func (*RollbackPreparedResponse) Descriptor() ([]byte, []int) {
 
 // CreateTransactionRequest is the payload to CreateTransaction
 type CreateTransactionRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	EffectiveCallerId *vtrpc.CallerID `protobuf:"bytes,1,opt,name=effective_caller_id,json=effectiveCallerId,proto3" json:"effective_caller_id,omitempty"`
-	ImmediateCallerId *VTGateCallerID `protobuf:"bytes,2,opt,name=immediate_caller_id,json=immediateCallerId,proto3" json:"immediate_caller_id,omitempty"`
-	Target            *Target         `protobuf:"bytes,3,opt,name=target,proto3" json:"target,omitempty"`
-	Dtid              string          `protobuf:"bytes,4,opt,name=dtid,proto3" json:"dtid,omitempty"`
-	Participants      []*Target       `protobuf:"bytes,5,rep,name=participants,proto3" json:"participants,omitempty"`
+	state             protoimpl.MessageState `protogen:"open.v1"`
+	EffectiveCallerId *vtrpc.CallerID        `protobuf:"bytes,1,opt,name=effective_caller_id,json=effectiveCallerId,proto3" json:"effective_caller_id,omitempty"`
+	ImmediateCallerId *VTGateCallerID        `protobuf:"bytes,2,opt,name=immediate_caller_id,json=immediateCallerId,proto3" json:"immediate_caller_id,omitempty"`
+	Target            *Target                `protobuf:"bytes,3,opt,name=target,proto3" json:"target,omitempty"`
+	Dtid              string                 `protobuf:"bytes,4,opt,name=dtid,proto3" json:"dtid,omitempty"`
+	Participants      []*Target              `protobuf:"bytes,5,rep,name=participants,proto3" json:"participants,omitempty"`
+	unknownFields     protoimpl.UnknownFields
+	sizeCache         protoimpl.SizeCache
 }
 
 func (x *CreateTransactionRequest) Reset() {
@@ -3086,9 +3062,9 @@ func (x *CreateTransactionRequest) GetParticipants() []*Target {
 
 // CreateTransactionResponse is the returned value from CreateTransaction
 type CreateTransactionResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
 	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *CreateTransactionResponse) Reset() {
@@ -3123,15 +3099,14 @@ func (*CreateTransactionResponse) Descriptor() ([]byte, []int) {
 
 // StartCommitRequest is the payload to StartCommit
 type StartCommitRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	EffectiveCallerId *vtrpc.CallerID `protobuf:"bytes,1,opt,name=effective_caller_id,json=effectiveCallerId,proto3" json:"effective_caller_id,omitempty"`
-	ImmediateCallerId *VTGateCallerID `protobuf:"bytes,2,opt,name=immediate_caller_id,json=immediateCallerId,proto3" json:"immediate_caller_id,omitempty"`
-	Target            *Target         `protobuf:"bytes,3,opt,name=target,proto3" json:"target,omitempty"`
-	TransactionId     int64           `protobuf:"varint,4,opt,name=transaction_id,json=transactionId,proto3" json:"transaction_id,omitempty"`
-	Dtid              string          `protobuf:"bytes,5,opt,name=dtid,proto3" json:"dtid,omitempty"`
+	state             protoimpl.MessageState `protogen:"open.v1"`
+	EffectiveCallerId *vtrpc.CallerID        `protobuf:"bytes,1,opt,name=effective_caller_id,json=effectiveCallerId,proto3" json:"effective_caller_id,omitempty"`
+	ImmediateCallerId *VTGateCallerID        `protobuf:"bytes,2,opt,name=immediate_caller_id,json=immediateCallerId,proto3" json:"immediate_caller_id,omitempty"`
+	Target            *Target                `protobuf:"bytes,3,opt,name=target,proto3" json:"target,omitempty"`
+	TransactionId     int64                  `protobuf:"varint,4,opt,name=transaction_id,json=transactionId,proto3" json:"transaction_id,omitempty"`
+	Dtid              string                 `protobuf:"bytes,5,opt,name=dtid,proto3" json:"dtid,omitempty"`
+	unknownFields     protoimpl.UnknownFields
+	sizeCache         protoimpl.SizeCache
 }
 
 func (x *StartCommitRequest) Reset() {
@@ -3201,11 +3176,10 @@ func (x *StartCommitRequest) GetDtid() string {
 
 // StartCommitResponse is the returned value from StartCommit
 type StartCommitResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	State         StartCommitState       `protobuf:"varint,1,opt,name=state,proto3,enum=query.StartCommitState" json:"state,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	State StartCommitState `protobuf:"varint,1,opt,name=state,proto3,enum=query.StartCommitState" json:"state,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *StartCommitResponse) Reset() {
@@ -3247,15 +3221,14 @@ func (x *StartCommitResponse) GetState() StartCommitState {
 
 // SetRollbackRequest is the payload to SetRollback
 type SetRollbackRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	EffectiveCallerId *vtrpc.CallerID `protobuf:"bytes,1,opt,name=effective_caller_id,json=effectiveCallerId,proto3" json:"effective_caller_id,omitempty"`
-	ImmediateCallerId *VTGateCallerID `protobuf:"bytes,2,opt,name=immediate_caller_id,json=immediateCallerId,proto3" json:"immediate_caller_id,omitempty"`
-	Target            *Target         `protobuf:"bytes,3,opt,name=target,proto3" json:"target,omitempty"`
-	TransactionId     int64           `protobuf:"varint,4,opt,name=transaction_id,json=transactionId,proto3" json:"transaction_id,omitempty"`
-	Dtid              string          `protobuf:"bytes,5,opt,name=dtid,proto3" json:"dtid,omitempty"`
+	state             protoimpl.MessageState `protogen:"open.v1"`
+	EffectiveCallerId *vtrpc.CallerID        `protobuf:"bytes,1,opt,name=effective_caller_id,json=effectiveCallerId,proto3" json:"effective_caller_id,omitempty"`
+	ImmediateCallerId *VTGateCallerID        `protobuf:"bytes,2,opt,name=immediate_caller_id,json=immediateCallerId,proto3" json:"immediate_caller_id,omitempty"`
+	Target            *Target                `protobuf:"bytes,3,opt,name=target,proto3" json:"target,omitempty"`
+	TransactionId     int64                  `protobuf:"varint,4,opt,name=transaction_id,json=transactionId,proto3" json:"transaction_id,omitempty"`
+	Dtid              string                 `protobuf:"bytes,5,opt,name=dtid,proto3" json:"dtid,omitempty"`
+	unknownFields     protoimpl.UnknownFields
+	sizeCache         protoimpl.SizeCache
 }
 
 func (x *SetRollbackRequest) Reset() {
@@ -3325,9 +3298,9 @@ func (x *SetRollbackRequest) GetDtid() string {
 
 // SetRollbackResponse is the returned value from SetRollback
 type SetRollbackResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
 	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *SetRollbackResponse) Reset() {
@@ -3362,14 +3335,13 @@ func (*SetRollbackResponse) Descriptor() ([]byte, []int) {
 
 // ConcludeTransactionRequest is the payload to ConcludeTransaction
 type ConcludeTransactionRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	EffectiveCallerId *vtrpc.CallerID `protobuf:"bytes,1,opt,name=effective_caller_id,json=effectiveCallerId,proto3" json:"effective_caller_id,omitempty"`
-	ImmediateCallerId *VTGateCallerID `protobuf:"bytes,2,opt,name=immediate_caller_id,json=immediateCallerId,proto3" json:"immediate_caller_id,omitempty"`
-	Target            *Target         `protobuf:"bytes,3,opt,name=target,proto3" json:"target,omitempty"`
-	Dtid              string          `protobuf:"bytes,4,opt,name=dtid,proto3" json:"dtid,omitempty"`
+	state             protoimpl.MessageState `protogen:"open.v1"`
+	EffectiveCallerId *vtrpc.CallerID        `protobuf:"bytes,1,opt,name=effective_caller_id,json=effectiveCallerId,proto3" json:"effective_caller_id,omitempty"`
+	ImmediateCallerId *VTGateCallerID        `protobuf:"bytes,2,opt,name=immediate_caller_id,json=immediateCallerId,proto3" json:"immediate_caller_id,omitempty"`
+	Target            *Target                `protobuf:"bytes,3,opt,name=target,proto3" json:"target,omitempty"`
+	Dtid              string                 `protobuf:"bytes,4,opt,name=dtid,proto3" json:"dtid,omitempty"`
+	unknownFields     protoimpl.UnknownFields
+	sizeCache         protoimpl.SizeCache
 }
 
 func (x *ConcludeTransactionRequest) Reset() {
@@ -3432,9 +3404,9 @@ func (x *ConcludeTransactionRequest) GetDtid() string {
 
 // ConcludeTransactionResponse is the returned value from ConcludeTransaction
 type ConcludeTransactionResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
 	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *ConcludeTransactionResponse) Reset() {
@@ -3469,14 +3441,13 @@ func (*ConcludeTransactionResponse) Descriptor() ([]byte, []int) {
 
 // ReadTransactionRequest is the payload to ReadTransaction
 type ReadTransactionRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	EffectiveCallerId *vtrpc.CallerID `protobuf:"bytes,1,opt,name=effective_caller_id,json=effectiveCallerId,proto3" json:"effective_caller_id,omitempty"`
-	ImmediateCallerId *VTGateCallerID `protobuf:"bytes,2,opt,name=immediate_caller_id,json=immediateCallerId,proto3" json:"immediate_caller_id,omitempty"`
-	Target            *Target         `protobuf:"bytes,3,opt,name=target,proto3" json:"target,omitempty"`
-	Dtid              string          `protobuf:"bytes,4,opt,name=dtid,proto3" json:"dtid,omitempty"`
+	state             protoimpl.MessageState `protogen:"open.v1"`
+	EffectiveCallerId *vtrpc.CallerID        `protobuf:"bytes,1,opt,name=effective_caller_id,json=effectiveCallerId,proto3" json:"effective_caller_id,omitempty"`
+	ImmediateCallerId *VTGateCallerID        `protobuf:"bytes,2,opt,name=immediate_caller_id,json=immediateCallerId,proto3" json:"immediate_caller_id,omitempty"`
+	Target            *Target                `protobuf:"bytes,3,opt,name=target,proto3" json:"target,omitempty"`
+	Dtid              string                 `protobuf:"bytes,4,opt,name=dtid,proto3" json:"dtid,omitempty"`
+	unknownFields     protoimpl.UnknownFields
+	sizeCache         protoimpl.SizeCache
 }
 
 func (x *ReadTransactionRequest) Reset() {
@@ -3539,11 +3510,10 @@ func (x *ReadTransactionRequest) GetDtid() string {
 
 // ReadTransactionResponse is the returned value from ReadTransaction
 type ReadTransactionResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	Metadata      *TransactionMetadata   `protobuf:"bytes,1,opt,name=metadata,proto3" json:"metadata,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	Metadata *TransactionMetadata `protobuf:"bytes,1,opt,name=metadata,proto3" json:"metadata,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *ReadTransactionResponse) Reset() {
@@ -3585,14 +3555,13 @@ func (x *ReadTransactionResponse) GetMetadata() *TransactionMetadata {
 
 // UnresolvedTransactionsRequest is the payload to UnresolvedTransactions
 type UnresolvedTransactionsRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	EffectiveCallerId *vtrpc.CallerID `protobuf:"bytes,1,opt,name=effective_caller_id,json=effectiveCallerId,proto3" json:"effective_caller_id,omitempty"`
-	ImmediateCallerId *VTGateCallerID `protobuf:"bytes,2,opt,name=immediate_caller_id,json=immediateCallerId,proto3" json:"immediate_caller_id,omitempty"`
-	Target            *Target         `protobuf:"bytes,3,opt,name=target,proto3" json:"target,omitempty"`
-	AbandonAge        int64           `protobuf:"varint,4,opt,name=abandon_age,json=abandonAge,proto3" json:"abandon_age,omitempty"` // Unresolved Transactions older than this (in seconds).
+	state             protoimpl.MessageState `protogen:"open.v1"`
+	EffectiveCallerId *vtrpc.CallerID        `protobuf:"bytes,1,opt,name=effective_caller_id,json=effectiveCallerId,proto3" json:"effective_caller_id,omitempty"`
+	ImmediateCallerId *VTGateCallerID        `protobuf:"bytes,2,opt,name=immediate_caller_id,json=immediateCallerId,proto3" json:"immediate_caller_id,omitempty"`
+	Target            *Target                `protobuf:"bytes,3,opt,name=target,proto3" json:"target,omitempty"`
+	AbandonAge        int64                  `protobuf:"varint,4,opt,name=abandon_age,json=abandonAge,proto3" json:"abandon_age,omitempty"` // Unresolved Transactions older than this (in seconds).
+	unknownFields     protoimpl.UnknownFields
+	sizeCache         protoimpl.SizeCache
 }
 
 func (x *UnresolvedTransactionsRequest) Reset() {
@@ -3655,11 +3624,10 @@ func (x *UnresolvedTransactionsRequest) GetAbandonAge() int64 {
 
 // UnresolvedTransactionsResponse is the returned value from UnresolvedTransactions
 type UnresolvedTransactionsResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	Transactions  []*TransactionMetadata `protobuf:"bytes,1,rep,name=transactions,proto3" json:"transactions,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	Transactions []*TransactionMetadata `protobuf:"bytes,1,rep,name=transactions,proto3" json:"transactions,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *UnresolvedTransactionsResponse) Reset() {
@@ -3701,17 +3669,16 @@ func (x *UnresolvedTransactionsResponse) GetTransactions() []*TransactionMetadat
 
 // BeginExecuteRequest is the payload to BeginExecute
 type BeginExecuteRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	EffectiveCallerId *vtrpc.CallerID `protobuf:"bytes,1,opt,name=effective_caller_id,json=effectiveCallerId,proto3" json:"effective_caller_id,omitempty"`
-	ImmediateCallerId *VTGateCallerID `protobuf:"bytes,2,opt,name=immediate_caller_id,json=immediateCallerId,proto3" json:"immediate_caller_id,omitempty"`
-	Target            *Target         `protobuf:"bytes,3,opt,name=target,proto3" json:"target,omitempty"`
-	Query             *BoundQuery     `protobuf:"bytes,4,opt,name=query,proto3" json:"query,omitempty"`
-	Options           *ExecuteOptions `protobuf:"bytes,5,opt,name=options,proto3" json:"options,omitempty"`
-	ReservedId        int64           `protobuf:"varint,6,opt,name=reserved_id,json=reservedId,proto3" json:"reserved_id,omitempty"`
-	PreQueries        []string        `protobuf:"bytes,7,rep,name=pre_queries,json=preQueries,proto3" json:"pre_queries,omitempty"`
+	state             protoimpl.MessageState `protogen:"open.v1"`
+	EffectiveCallerId *vtrpc.CallerID        `protobuf:"bytes,1,opt,name=effective_caller_id,json=effectiveCallerId,proto3" json:"effective_caller_id,omitempty"`
+	ImmediateCallerId *VTGateCallerID        `protobuf:"bytes,2,opt,name=immediate_caller_id,json=immediateCallerId,proto3" json:"immediate_caller_id,omitempty"`
+	Target            *Target                `protobuf:"bytes,3,opt,name=target,proto3" json:"target,omitempty"`
+	Query             *BoundQuery            `protobuf:"bytes,4,opt,name=query,proto3" json:"query,omitempty"`
+	Options           *ExecuteOptions        `protobuf:"bytes,5,opt,name=options,proto3" json:"options,omitempty"`
+	ReservedId        int64                  `protobuf:"varint,6,opt,name=reserved_id,json=reservedId,proto3" json:"reserved_id,omitempty"`
+	PreQueries        []string               `protobuf:"bytes,7,rep,name=pre_queries,json=preQueries,proto3" json:"pre_queries,omitempty"`
+	unknownFields     protoimpl.UnknownFields
+	sizeCache         protoimpl.SizeCache
 }
 
 func (x *BeginExecuteRequest) Reset() {
@@ -3795,10 +3762,7 @@ func (x *BeginExecuteRequest) GetPreQueries() []string {
 
 // BeginExecuteResponse is the returned value from BeginExecute
 type BeginExecuteResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
+	state protoimpl.MessageState `protogen:"open.v1"`
 	// error contains an application level error if necessary. Note the
 	// transaction_id may be set, even when an error is returned, if the begin
 	// worked but the execute failed.
@@ -3810,6 +3774,8 @@ type BeginExecuteResponse struct {
 	// The session_state_changes might be set if the transaction is a snapshot transaction
 	// and the MySQL implementation supports getting a start gtid on snapshot
 	SessionStateChanges string `protobuf:"bytes,5,opt,name=session_state_changes,json=sessionStateChanges,proto3" json:"session_state_changes,omitempty"`
+	unknownFields       protoimpl.UnknownFields
+	sizeCache           protoimpl.SizeCache
 }
 
 func (x *BeginExecuteResponse) Reset() {
@@ -3879,17 +3845,16 @@ func (x *BeginExecuteResponse) GetSessionStateChanges() string {
 
 // BeginStreamExecuteRequest is the payload to BeginStreamExecute
 type BeginStreamExecuteRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	EffectiveCallerId *vtrpc.CallerID `protobuf:"bytes,1,opt,name=effective_caller_id,json=effectiveCallerId,proto3" json:"effective_caller_id,omitempty"`
-	ImmediateCallerId *VTGateCallerID `protobuf:"bytes,2,opt,name=immediate_caller_id,json=immediateCallerId,proto3" json:"immediate_caller_id,omitempty"`
-	Target            *Target         `protobuf:"bytes,3,opt,name=target,proto3" json:"target,omitempty"`
-	Query             *BoundQuery     `protobuf:"bytes,4,opt,name=query,proto3" json:"query,omitempty"`
-	Options           *ExecuteOptions `protobuf:"bytes,5,opt,name=options,proto3" json:"options,omitempty"`
-	PreQueries        []string        `protobuf:"bytes,6,rep,name=pre_queries,json=preQueries,proto3" json:"pre_queries,omitempty"`
-	ReservedId        int64           `protobuf:"varint,7,opt,name=reserved_id,json=reservedId,proto3" json:"reserved_id,omitempty"`
+	state             protoimpl.MessageState `protogen:"open.v1"`
+	EffectiveCallerId *vtrpc.CallerID        `protobuf:"bytes,1,opt,name=effective_caller_id,json=effectiveCallerId,proto3" json:"effective_caller_id,omitempty"`
+	ImmediateCallerId *VTGateCallerID        `protobuf:"bytes,2,opt,name=immediate_caller_id,json=immediateCallerId,proto3" json:"immediate_caller_id,omitempty"`
+	Target            *Target                `protobuf:"bytes,3,opt,name=target,proto3" json:"target,omitempty"`
+	Query             *BoundQuery            `protobuf:"bytes,4,opt,name=query,proto3" json:"query,omitempty"`
+	Options           *ExecuteOptions        `protobuf:"bytes,5,opt,name=options,proto3" json:"options,omitempty"`
+	PreQueries        []string               `protobuf:"bytes,6,rep,name=pre_queries,json=preQueries,proto3" json:"pre_queries,omitempty"`
+	ReservedId        int64                  `protobuf:"varint,7,opt,name=reserved_id,json=reservedId,proto3" json:"reserved_id,omitempty"`
+	unknownFields     protoimpl.UnknownFields
+	sizeCache         protoimpl.SizeCache
 }
 
 func (x *BeginStreamExecuteRequest) Reset() {
@@ -3973,10 +3938,7 @@ func (x *BeginStreamExecuteRequest) GetReservedId() int64 {
 
 // BeginStreamExecuteResponse is the returned value from BeginStreamExecute
 type BeginStreamExecuteResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
+	state protoimpl.MessageState `protogen:"open.v1"`
 	// error contains an application level error if necessary. Note the
 	// transaction_id may be set, even when an error is returned, if the begin
 	// worked but the stream execute failed.
@@ -3988,6 +3950,8 @@ type BeginStreamExecuteResponse struct {
 	// The session_state_changes might be set if the transaction is a snapshot transaction
 	// and the MySQL implementation supports getting a start gtid on snapshot
 	SessionStateChanges string `protobuf:"bytes,5,opt,name=session_state_changes,json=sessionStateChanges,proto3" json:"session_state_changes,omitempty"`
+	unknownFields       protoimpl.UnknownFields
+	sizeCache           protoimpl.SizeCache
 }
 
 func (x *BeginStreamExecuteResponse) Reset() {
@@ -4057,15 +4021,14 @@ func (x *BeginStreamExecuteResponse) GetSessionStateChanges() string {
 
 // MessageStreamRequest is the request payload for MessageStream.
 type MessageStreamRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	EffectiveCallerId *vtrpc.CallerID `protobuf:"bytes,1,opt,name=effective_caller_id,json=effectiveCallerId,proto3" json:"effective_caller_id,omitempty"`
-	ImmediateCallerId *VTGateCallerID `protobuf:"bytes,2,opt,name=immediate_caller_id,json=immediateCallerId,proto3" json:"immediate_caller_id,omitempty"`
-	Target            *Target         `protobuf:"bytes,3,opt,name=target,proto3" json:"target,omitempty"`
+	state             protoimpl.MessageState `protogen:"open.v1"`
+	EffectiveCallerId *vtrpc.CallerID        `protobuf:"bytes,1,opt,name=effective_caller_id,json=effectiveCallerId,proto3" json:"effective_caller_id,omitempty"`
+	ImmediateCallerId *VTGateCallerID        `protobuf:"bytes,2,opt,name=immediate_caller_id,json=immediateCallerId,proto3" json:"immediate_caller_id,omitempty"`
+	Target            *Target                `protobuf:"bytes,3,opt,name=target,proto3" json:"target,omitempty"`
 	// name is the message table name.
-	Name string `protobuf:"bytes,4,opt,name=name,proto3" json:"name,omitempty"`
+	Name          string `protobuf:"bytes,4,opt,name=name,proto3" json:"name,omitempty"`
+	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *MessageStreamRequest) Reset() {
@@ -4128,11 +4091,10 @@ func (x *MessageStreamRequest) GetName() string {
 
 // MessageStreamResponse is a response for MessageStream.
 type MessageStreamResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	Result        *QueryResult           `protobuf:"bytes,1,opt,name=result,proto3" json:"result,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	Result *QueryResult `protobuf:"bytes,1,opt,name=result,proto3" json:"result,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *MessageStreamResponse) Reset() {
@@ -4174,16 +4136,15 @@ func (x *MessageStreamResponse) GetResult() *QueryResult {
 
 // MessageAckRequest is the request payload for MessageAck.
 type MessageAckRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	EffectiveCallerId *vtrpc.CallerID `protobuf:"bytes,1,opt,name=effective_caller_id,json=effectiveCallerId,proto3" json:"effective_caller_id,omitempty"`
-	ImmediateCallerId *VTGateCallerID `protobuf:"bytes,2,opt,name=immediate_caller_id,json=immediateCallerId,proto3" json:"immediate_caller_id,omitempty"`
-	Target            *Target         `protobuf:"bytes,3,opt,name=target,proto3" json:"target,omitempty"`
+	state             protoimpl.MessageState `protogen:"open.v1"`
+	EffectiveCallerId *vtrpc.CallerID        `protobuf:"bytes,1,opt,name=effective_caller_id,json=effectiveCallerId,proto3" json:"effective_caller_id,omitempty"`
+	ImmediateCallerId *VTGateCallerID        `protobuf:"bytes,2,opt,name=immediate_caller_id,json=immediateCallerId,proto3" json:"immediate_caller_id,omitempty"`
+	Target            *Target                `protobuf:"bytes,3,opt,name=target,proto3" json:"target,omitempty"`
 	// name is the message table name.
-	Name string   `protobuf:"bytes,4,opt,name=name,proto3" json:"name,omitempty"`
-	Ids  []*Value `protobuf:"bytes,5,rep,name=ids,proto3" json:"ids,omitempty"`
+	Name          string   `protobuf:"bytes,4,opt,name=name,proto3" json:"name,omitempty"`
+	Ids           []*Value `protobuf:"bytes,5,rep,name=ids,proto3" json:"ids,omitempty"`
+	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *MessageAckRequest) Reset() {
@@ -4253,14 +4214,13 @@ func (x *MessageAckRequest) GetIds() []*Value {
 
 // MessageAckResponse is the response for MessageAck.
 type MessageAckResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
+	state protoimpl.MessageState `protogen:"open.v1"`
 	// result contains the result of the ack operation.
 	// Since this acts like a DML, only
 	// RowsAffected is returned in the result.
-	Result *QueryResult `protobuf:"bytes,1,opt,name=result,proto3" json:"result,omitempty"`
+	Result        *QueryResult `protobuf:"bytes,1,opt,name=result,proto3" json:"result,omitempty"`
+	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *MessageAckResponse) Reset() {
@@ -4302,17 +4262,16 @@ func (x *MessageAckResponse) GetResult() *QueryResult {
 
 // ReserveExecuteRequest is the payload to ReserveExecute
 type ReserveExecuteRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	EffectiveCallerId *vtrpc.CallerID `protobuf:"bytes,1,opt,name=effective_caller_id,json=effectiveCallerId,proto3" json:"effective_caller_id,omitempty"`
-	ImmediateCallerId *VTGateCallerID `protobuf:"bytes,2,opt,name=immediate_caller_id,json=immediateCallerId,proto3" json:"immediate_caller_id,omitempty"`
-	Target            *Target         `protobuf:"bytes,3,opt,name=target,proto3" json:"target,omitempty"`
-	Query             *BoundQuery     `protobuf:"bytes,4,opt,name=query,proto3" json:"query,omitempty"`
-	TransactionId     int64           `protobuf:"varint,5,opt,name=transaction_id,json=transactionId,proto3" json:"transaction_id,omitempty"`
-	Options           *ExecuteOptions `protobuf:"bytes,6,opt,name=options,proto3" json:"options,omitempty"`
-	PreQueries        []string        `protobuf:"bytes,7,rep,name=pre_queries,json=preQueries,proto3" json:"pre_queries,omitempty"`
+	state             protoimpl.MessageState `protogen:"open.v1"`
+	EffectiveCallerId *vtrpc.CallerID        `protobuf:"bytes,1,opt,name=effective_caller_id,json=effectiveCallerId,proto3" json:"effective_caller_id,omitempty"`
+	ImmediateCallerId *VTGateCallerID        `protobuf:"bytes,2,opt,name=immediate_caller_id,json=immediateCallerId,proto3" json:"immediate_caller_id,omitempty"`
+	Target            *Target                `protobuf:"bytes,3,opt,name=target,proto3" json:"target,omitempty"`
+	Query             *BoundQuery            `protobuf:"bytes,4,opt,name=query,proto3" json:"query,omitempty"`
+	TransactionId     int64                  `protobuf:"varint,5,opt,name=transaction_id,json=transactionId,proto3" json:"transaction_id,omitempty"`
+	Options           *ExecuteOptions        `protobuf:"bytes,6,opt,name=options,proto3" json:"options,omitempty"`
+	PreQueries        []string               `protobuf:"bytes,7,rep,name=pre_queries,json=preQueries,proto3" json:"pre_queries,omitempty"`
+	unknownFields     protoimpl.UnknownFields
+	sizeCache         protoimpl.SizeCache
 }
 
 func (x *ReserveExecuteRequest) Reset() {
@@ -4396,15 +4355,14 @@ func (x *ReserveExecuteRequest) GetPreQueries() []string {
 
 // ReserveExecuteResponse is the returned value from ReserveExecute
 type ReserveExecuteResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Error  *vtrpc.RPCError `protobuf:"bytes,1,opt,name=error,proto3" json:"error,omitempty"`
-	Result *QueryResult    `protobuf:"bytes,2,opt,name=result,proto3" json:"result,omitempty"`
+	state  protoimpl.MessageState `protogen:"open.v1"`
+	Error  *vtrpc.RPCError        `protobuf:"bytes,1,opt,name=error,proto3" json:"error,omitempty"`
+	Result *QueryResult           `protobuf:"bytes,2,opt,name=result,proto3" json:"result,omitempty"`
 	// The following fields might be non-zero even if an error is present.
-	ReservedId  int64                 `protobuf:"varint,3,opt,name=reserved_id,json=reservedId,proto3" json:"reserved_id,omitempty"`
-	TabletAlias *topodata.TabletAlias `protobuf:"bytes,4,opt,name=tablet_alias,json=tabletAlias,proto3" json:"tablet_alias,omitempty"`
+	ReservedId    int64                 `protobuf:"varint,3,opt,name=reserved_id,json=reservedId,proto3" json:"reserved_id,omitempty"`
+	TabletAlias   *topodata.TabletAlias `protobuf:"bytes,4,opt,name=tablet_alias,json=tabletAlias,proto3" json:"tablet_alias,omitempty"`
+	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *ReserveExecuteResponse) Reset() {
@@ -4467,17 +4425,16 @@ func (x *ReserveExecuteResponse) GetTabletAlias() *topodata.TabletAlias {
 
 // ReserveStreamExecuteRequest is the payload to ReserveStreamExecute
 type ReserveStreamExecuteRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	EffectiveCallerId *vtrpc.CallerID `protobuf:"bytes,1,opt,name=effective_caller_id,json=effectiveCallerId,proto3" json:"effective_caller_id,omitempty"`
-	ImmediateCallerId *VTGateCallerID `protobuf:"bytes,2,opt,name=immediate_caller_id,json=immediateCallerId,proto3" json:"immediate_caller_id,omitempty"`
-	Target            *Target         `protobuf:"bytes,3,opt,name=target,proto3" json:"target,omitempty"`
-	Query             *BoundQuery     `protobuf:"bytes,4,opt,name=query,proto3" json:"query,omitempty"`
-	Options           *ExecuteOptions `protobuf:"bytes,5,opt,name=options,proto3" json:"options,omitempty"`
-	TransactionId     int64           `protobuf:"varint,6,opt,name=transaction_id,json=transactionId,proto3" json:"transaction_id,omitempty"`
-	PreQueries        []string        `protobuf:"bytes,7,rep,name=pre_queries,json=preQueries,proto3" json:"pre_queries,omitempty"`
+	state             protoimpl.MessageState `protogen:"open.v1"`
+	EffectiveCallerId *vtrpc.CallerID        `protobuf:"bytes,1,opt,name=effective_caller_id,json=effectiveCallerId,proto3" json:"effective_caller_id,omitempty"`
+	ImmediateCallerId *VTGateCallerID        `protobuf:"bytes,2,opt,name=immediate_caller_id,json=immediateCallerId,proto3" json:"immediate_caller_id,omitempty"`
+	Target            *Target                `protobuf:"bytes,3,opt,name=target,proto3" json:"target,omitempty"`
+	Query             *BoundQuery            `protobuf:"bytes,4,opt,name=query,proto3" json:"query,omitempty"`
+	Options           *ExecuteOptions        `protobuf:"bytes,5,opt,name=options,proto3" json:"options,omitempty"`
+	TransactionId     int64                  `protobuf:"varint,6,opt,name=transaction_id,json=transactionId,proto3" json:"transaction_id,omitempty"`
+	PreQueries        []string               `protobuf:"bytes,7,rep,name=pre_queries,json=preQueries,proto3" json:"pre_queries,omitempty"`
+	unknownFields     protoimpl.UnknownFields
+	sizeCache         protoimpl.SizeCache
 }
 
 func (x *ReserveStreamExecuteRequest) Reset() {
@@ -4561,15 +4518,14 @@ func (x *ReserveStreamExecuteRequest) GetPreQueries() []string {
 
 // ReserveStreamExecuteResponse is the returned value from ReserveStreamExecute
 type ReserveStreamExecuteResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Error  *vtrpc.RPCError `protobuf:"bytes,1,opt,name=error,proto3" json:"error,omitempty"`
-	Result *QueryResult    `protobuf:"bytes,2,opt,name=result,proto3" json:"result,omitempty"`
+	state  protoimpl.MessageState `protogen:"open.v1"`
+	Error  *vtrpc.RPCError        `protobuf:"bytes,1,opt,name=error,proto3" json:"error,omitempty"`
+	Result *QueryResult           `protobuf:"bytes,2,opt,name=result,proto3" json:"result,omitempty"`
 	// The following fields might be non-zero even if an error is present.
-	ReservedId  int64                 `protobuf:"varint,3,opt,name=reserved_id,json=reservedId,proto3" json:"reserved_id,omitempty"`
-	TabletAlias *topodata.TabletAlias `protobuf:"bytes,4,opt,name=tablet_alias,json=tabletAlias,proto3" json:"tablet_alias,omitempty"`
+	ReservedId    int64                 `protobuf:"varint,3,opt,name=reserved_id,json=reservedId,proto3" json:"reserved_id,omitempty"`
+	TabletAlias   *topodata.TabletAlias `protobuf:"bytes,4,opt,name=tablet_alias,json=tabletAlias,proto3" json:"tablet_alias,omitempty"`
+	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *ReserveStreamExecuteResponse) Reset() {
@@ -4632,17 +4588,16 @@ func (x *ReserveStreamExecuteResponse) GetTabletAlias() *topodata.TabletAlias {
 
 // ReserveBeginExecuteRequest is the payload to ReserveBeginExecute
 type ReserveBeginExecuteRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	EffectiveCallerId *vtrpc.CallerID `protobuf:"bytes,1,opt,name=effective_caller_id,json=effectiveCallerId,proto3" json:"effective_caller_id,omitempty"`
-	ImmediateCallerId *VTGateCallerID `protobuf:"bytes,2,opt,name=immediate_caller_id,json=immediateCallerId,proto3" json:"immediate_caller_id,omitempty"`
-	Target            *Target         `protobuf:"bytes,3,opt,name=target,proto3" json:"target,omitempty"`
-	Query             *BoundQuery     `protobuf:"bytes,4,opt,name=query,proto3" json:"query,omitempty"`
-	Options           *ExecuteOptions `protobuf:"bytes,5,opt,name=options,proto3" json:"options,omitempty"`
-	PreQueries        []string        `protobuf:"bytes,6,rep,name=pre_queries,json=preQueries,proto3" json:"pre_queries,omitempty"`
-	PostBeginQueries  []string        `protobuf:"bytes,7,rep,name=post_begin_queries,json=postBeginQueries,proto3" json:"post_begin_queries,omitempty"`
+	state             protoimpl.MessageState `protogen:"open.v1"`
+	EffectiveCallerId *vtrpc.CallerID        `protobuf:"bytes,1,opt,name=effective_caller_id,json=effectiveCallerId,proto3" json:"effective_caller_id,omitempty"`
+	ImmediateCallerId *VTGateCallerID        `protobuf:"bytes,2,opt,name=immediate_caller_id,json=immediateCallerId,proto3" json:"immediate_caller_id,omitempty"`
+	Target            *Target                `protobuf:"bytes,3,opt,name=target,proto3" json:"target,omitempty"`
+	Query             *BoundQuery            `protobuf:"bytes,4,opt,name=query,proto3" json:"query,omitempty"`
+	Options           *ExecuteOptions        `protobuf:"bytes,5,opt,name=options,proto3" json:"options,omitempty"`
+	PreQueries        []string               `protobuf:"bytes,6,rep,name=pre_queries,json=preQueries,proto3" json:"pre_queries,omitempty"`
+	PostBeginQueries  []string               `protobuf:"bytes,7,rep,name=post_begin_queries,json=postBeginQueries,proto3" json:"post_begin_queries,omitempty"`
+	unknownFields     protoimpl.UnknownFields
+	sizeCache         protoimpl.SizeCache
 }
 
 func (x *ReserveBeginExecuteRequest) Reset() {
@@ -4726,10 +4681,7 @@ func (x *ReserveBeginExecuteRequest) GetPostBeginQueries() []string {
 
 // ReserveBeginExecuteResponse is the returned value from ReserveBeginExecute
 type ReserveBeginExecuteResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
+	state protoimpl.MessageState `protogen:"open.v1"`
 	// error contains an application level error if necessary. Note the
 	// transaction_id may be set, even when an error is returned, if the begin
 	// worked but the execute failed.
@@ -4742,6 +4694,8 @@ type ReserveBeginExecuteResponse struct {
 	// The session_state_changes might be set if the transaction is a snapshot transaction
 	// and the MySQL implementation supports getting a start gtid on snapshot
 	SessionStateChanges string `protobuf:"bytes,6,opt,name=session_state_changes,json=sessionStateChanges,proto3" json:"session_state_changes,omitempty"`
+	unknownFields       protoimpl.UnknownFields
+	sizeCache           protoimpl.SizeCache
 }
 
 func (x *ReserveBeginExecuteResponse) Reset() {
@@ -4818,17 +4772,16 @@ func (x *ReserveBeginExecuteResponse) GetSessionStateChanges() string {
 
 // ReserveBeginStreamExecuteRequest is the payload to ReserveBeginStreamExecute
 type ReserveBeginStreamExecuteRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	EffectiveCallerId *vtrpc.CallerID `protobuf:"bytes,1,opt,name=effective_caller_id,json=effectiveCallerId,proto3" json:"effective_caller_id,omitempty"`
-	ImmediateCallerId *VTGateCallerID `protobuf:"bytes,2,opt,name=immediate_caller_id,json=immediateCallerId,proto3" json:"immediate_caller_id,omitempty"`
-	Target            *Target         `protobuf:"bytes,3,opt,name=target,proto3" json:"target,omitempty"`
-	Query             *BoundQuery     `protobuf:"bytes,4,opt,name=query,proto3" json:"query,omitempty"`
-	Options           *ExecuteOptions `protobuf:"bytes,5,opt,name=options,proto3" json:"options,omitempty"`
-	PreQueries        []string        `protobuf:"bytes,6,rep,name=pre_queries,json=preQueries,proto3" json:"pre_queries,omitempty"`
-	PostBeginQueries  []string        `protobuf:"bytes,7,rep,name=post_begin_queries,json=postBeginQueries,proto3" json:"post_begin_queries,omitempty"`
+	state             protoimpl.MessageState `protogen:"open.v1"`
+	EffectiveCallerId *vtrpc.CallerID        `protobuf:"bytes,1,opt,name=effective_caller_id,json=effectiveCallerId,proto3" json:"effective_caller_id,omitempty"`
+	ImmediateCallerId *VTGateCallerID        `protobuf:"bytes,2,opt,name=immediate_caller_id,json=immediateCallerId,proto3" json:"immediate_caller_id,omitempty"`
+	Target            *Target                `protobuf:"bytes,3,opt,name=target,proto3" json:"target,omitempty"`
+	Query             *BoundQuery            `protobuf:"bytes,4,opt,name=query,proto3" json:"query,omitempty"`
+	Options           *ExecuteOptions        `protobuf:"bytes,5,opt,name=options,proto3" json:"options,omitempty"`
+	PreQueries        []string               `protobuf:"bytes,6,rep,name=pre_queries,json=preQueries,proto3" json:"pre_queries,omitempty"`
+	PostBeginQueries  []string               `protobuf:"bytes,7,rep,name=post_begin_queries,json=postBeginQueries,proto3" json:"post_begin_queries,omitempty"`
+	unknownFields     protoimpl.UnknownFields
+	sizeCache         protoimpl.SizeCache
 }
 
 func (x *ReserveBeginStreamExecuteRequest) Reset() {
@@ -4912,10 +4865,7 @@ func (x *ReserveBeginStreamExecuteRequest) GetPostBeginQueries() []string {
 
 // ReserveBeginStreamExecuteResponse is the returned value from ReserveBeginStreamExecute
 type ReserveBeginStreamExecuteResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
+	state protoimpl.MessageState `protogen:"open.v1"`
 	// error contains an application level error if necessary. Note the
 	// transaction_id may be set, even when an error is returned, if the begin
 	// worked but the stream execute failed.
@@ -4928,6 +4878,8 @@ type ReserveBeginStreamExecuteResponse struct {
 	// The session_state_changes might be set if the transaction is a snapshot transaction
 	// and the MySQL implementation supports getting a start gtid on snapshot
 	SessionStateChanges string `protobuf:"bytes,6,opt,name=session_state_changes,json=sessionStateChanges,proto3" json:"session_state_changes,omitempty"`
+	unknownFields       protoimpl.UnknownFields
+	sizeCache           protoimpl.SizeCache
 }
 
 func (x *ReserveBeginStreamExecuteResponse) Reset() {
@@ -5004,15 +4956,14 @@ func (x *ReserveBeginStreamExecuteResponse) GetSessionStateChanges() string {
 
 // ReleaseRequest is the payload to Release
 type ReleaseRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	EffectiveCallerId *vtrpc.CallerID `protobuf:"bytes,1,opt,name=effective_caller_id,json=effectiveCallerId,proto3" json:"effective_caller_id,omitempty"`
-	ImmediateCallerId *VTGateCallerID `protobuf:"bytes,2,opt,name=immediate_caller_id,json=immediateCallerId,proto3" json:"immediate_caller_id,omitempty"`
-	Target            *Target         `protobuf:"bytes,3,opt,name=target,proto3" json:"target,omitempty"`
-	TransactionId     int64           `protobuf:"varint,4,opt,name=transaction_id,json=transactionId,proto3" json:"transaction_id,omitempty"`
-	ReservedId        int64           `protobuf:"varint,5,opt,name=reserved_id,json=reservedId,proto3" json:"reserved_id,omitempty"`
+	state             protoimpl.MessageState `protogen:"open.v1"`
+	EffectiveCallerId *vtrpc.CallerID        `protobuf:"bytes,1,opt,name=effective_caller_id,json=effectiveCallerId,proto3" json:"effective_caller_id,omitempty"`
+	ImmediateCallerId *VTGateCallerID        `protobuf:"bytes,2,opt,name=immediate_caller_id,json=immediateCallerId,proto3" json:"immediate_caller_id,omitempty"`
+	Target            *Target                `protobuf:"bytes,3,opt,name=target,proto3" json:"target,omitempty"`
+	TransactionId     int64                  `protobuf:"varint,4,opt,name=transaction_id,json=transactionId,proto3" json:"transaction_id,omitempty"`
+	ReservedId        int64                  `protobuf:"varint,5,opt,name=reserved_id,json=reservedId,proto3" json:"reserved_id,omitempty"`
+	unknownFields     protoimpl.UnknownFields
+	sizeCache         protoimpl.SizeCache
 }
 
 func (x *ReleaseRequest) Reset() {
@@ -5082,9 +5033,9 @@ func (x *ReleaseRequest) GetReservedId() int64 {
 
 // ReleaseResponse is the returned value from Release
 type ReleaseResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
 	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *ReleaseResponse) Reset() {
@@ -5119,9 +5070,9 @@ func (*ReleaseResponse) Descriptor() ([]byte, []int) {
 
 // StreamHealthRequest is the payload for StreamHealth
 type StreamHealthRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
 	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *StreamHealthRequest) Reset() {
@@ -5157,10 +5108,7 @@ func (*StreamHealthRequest) Descriptor() ([]byte, []int) {
 // RealtimeStats contains information about the tablet status.
 // It is only valid for a single tablet.
 type RealtimeStats struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
+	state protoimpl.MessageState `protogen:"open.v1"`
 	// health_error is the last error we got from health check,
 	// or empty is the server is healthy. This is used for subset selection,
 	// we do not send queries to servers that are not healthy.
@@ -5193,8 +5141,10 @@ type RealtimeStats struct {
 	// view_schema_changed is to provide list of views that have schema changes detected by the tablet.
 	ViewSchemaChanged []string `protobuf:"bytes,8,rep,name=view_schema_changed,json=viewSchemaChanged,proto3" json:"view_schema_changed,omitempty"`
 	// udfs_changed is used to signal that the UDFs have changed on the tablet.
-	UdfsChanged  bool `protobuf:"varint,9,opt,name=udfs_changed,json=udfsChanged,proto3" json:"udfs_changed,omitempty"`
-	TxUnresolved bool `protobuf:"varint,10,opt,name=tx_unresolved,json=txUnresolved,proto3" json:"tx_unresolved,omitempty"`
+	UdfsChanged   bool `protobuf:"varint,9,opt,name=udfs_changed,json=udfsChanged,proto3" json:"udfs_changed,omitempty"`
+	TxUnresolved  bool `protobuf:"varint,10,opt,name=tx_unresolved,json=txUnresolved,proto3" json:"tx_unresolved,omitempty"`
+	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *RealtimeStats) Reset() {
@@ -5302,10 +5252,7 @@ func (x *RealtimeStats) GetTxUnresolved() bool {
 // to another, or from the Gateway layer of a vtgate to the routing
 // layer.
 type AggregateStats struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
+	state protoimpl.MessageState `protogen:"open.v1"`
 	// healthy_tablet_count is the number of healthy tablets in the group.
 	HealthyTabletCount int32 `protobuf:"varint,1,opt,name=healthy_tablet_count,json=healthyTabletCount,proto3" json:"healthy_tablet_count,omitempty"`
 	// unhealthy_tablet_count is the number of unhealthy tablets in the group.
@@ -5318,6 +5265,8 @@ type AggregateStats struct {
 	// replication_lag_seconds values of the healthy tablets. It is unset
 	// if the tablet type is primary.
 	ReplicationLagSecondsMax uint32 `protobuf:"varint,4,opt,name=replication_lag_seconds_max,json=replicationLagSecondsMax,proto3" json:"replication_lag_seconds_max,omitempty"`
+	unknownFields            protoimpl.UnknownFields
+	sizeCache                protoimpl.SizeCache
 }
 
 func (x *AggregateStats) Reset() {
@@ -5384,10 +5333,7 @@ func (x *AggregateStats) GetReplicationLagSecondsMax() uint32 {
 // - realtime_stats is set.
 // - aggregate_stats is not set (deprecated)
 type StreamHealthResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
+	state protoimpl.MessageState `protogen:"open.v1"`
 	// target is the current server type. Only queries with that exact Target
 	// record will be accepted (the cell may not match, however).
 	Target *Target `protobuf:"bytes,1,opt,name=target,proto3" json:"target,omitempty"`
@@ -5435,7 +5381,9 @@ type StreamHealthResponse struct {
 	// code uses it to verify that it's talking to the correct tablet and that it
 	// hasn't changed in the meantime e.g. due to tablet restarts where ports or
 	// ips have been reused but assigned differently.
-	TabletAlias *topodata.TabletAlias `protobuf:"bytes,5,opt,name=tablet_alias,json=tabletAlias,proto3" json:"tablet_alias,omitempty"`
+	TabletAlias   *topodata.TabletAlias `protobuf:"bytes,5,opt,name=tablet_alias,json=tabletAlias,proto3" json:"tablet_alias,omitempty"`
+	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *StreamHealthResponse) Reset() {
@@ -5505,14 +5453,13 @@ func (x *StreamHealthResponse) GetTabletAlias() *topodata.TabletAlias {
 
 // TransactionMetadata contains the metadata for a distributed transaction.
 type TransactionMetadata struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	Dtid          string                 `protobuf:"bytes,1,opt,name=dtid,proto3" json:"dtid,omitempty"`
+	State         TransactionState       `protobuf:"varint,2,opt,name=state,proto3,enum=query.TransactionState" json:"state,omitempty"`
+	TimeCreated   int64                  `protobuf:"varint,3,opt,name=time_created,json=timeCreated,proto3" json:"time_created,omitempty"`
+	Participants  []*Target              `protobuf:"bytes,4,rep,name=participants,proto3" json:"participants,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	Dtid         string           `protobuf:"bytes,1,opt,name=dtid,proto3" json:"dtid,omitempty"`
-	State        TransactionState `protobuf:"varint,2,opt,name=state,proto3,enum=query.TransactionState" json:"state,omitempty"`
-	TimeCreated  int64            `protobuf:"varint,3,opt,name=time_created,json=timeCreated,proto3" json:"time_created,omitempty"`
-	Participants []*Target        `protobuf:"bytes,4,rep,name=participants,proto3" json:"participants,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *TransactionMetadata) Reset() {
@@ -5575,13 +5522,12 @@ func (x *TransactionMetadata) GetParticipants() []*Target {
 
 // GetSchemaRequest is the payload to GetSchema
 type GetSchemaRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	Target        *Target                `protobuf:"bytes,1,opt,name=target,proto3" json:"target,omitempty"`
+	TableType     SchemaTableType        `protobuf:"varint,2,opt,name=table_type,json=tableType,proto3,enum=query.SchemaTableType" json:"table_type,omitempty"`
+	TableNames    []string               `protobuf:"bytes,3,rep,name=table_names,json=tableNames,proto3" json:"table_names,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	Target     *Target         `protobuf:"bytes,1,opt,name=target,proto3" json:"target,omitempty"`
-	TableType  SchemaTableType `protobuf:"varint,2,opt,name=table_type,json=tableType,proto3,enum=query.SchemaTableType" json:"table_type,omitempty"`
-	TableNames []string        `protobuf:"bytes,3,rep,name=table_names,json=tableNames,proto3" json:"table_names,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *GetSchemaRequest) Reset() {
@@ -5637,13 +5583,12 @@ func (x *GetSchemaRequest) GetTableNames() []string {
 
 // UDFInfo represents the information about a UDF.
 type UDFInfo struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	Name          string                 `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	Aggregating   bool                   `protobuf:"varint,2,opt,name=aggregating,proto3" json:"aggregating,omitempty"`
+	ReturnType    Type                   `protobuf:"varint,3,opt,name=return_type,json=returnType,proto3,enum=query.Type" json:"return_type,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	Name        string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
-	Aggregating bool   `protobuf:"varint,2,opt,name=aggregating,proto3" json:"aggregating,omitempty"`
-	ReturnType  Type   `protobuf:"varint,3,opt,name=return_type,json=returnType,proto3,enum=query.Type" json:"return_type,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *UDFInfo) Reset() {
@@ -5699,13 +5644,12 @@ func (x *UDFInfo) GetReturnType() Type {
 
 // GetSchemaResponse is the returned value from GetSchema
 type GetSchemaResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Udfs []*UDFInfo `protobuf:"bytes,1,rep,name=udfs,proto3" json:"udfs,omitempty"`
+	state protoimpl.MessageState `protogen:"open.v1"`
+	Udfs  []*UDFInfo             `protobuf:"bytes,1,rep,name=udfs,proto3" json:"udfs,omitempty"`
 	// this is for the schema definition for the requested tables and views.
-	TableDefinition map[string]string `protobuf:"bytes,2,rep,name=table_definition,json=tableDefinition,proto3" json:"table_definition,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
+	TableDefinition map[string]string `protobuf:"bytes,2,rep,name=table_definition,json=tableDefinition,proto3" json:"table_definition,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
+	unknownFields   protoimpl.UnknownFields
+	sizeCache       protoimpl.SizeCache
 }
 
 func (x *GetSchemaResponse) Reset() {
@@ -5754,10 +5698,7 @@ func (x *GetSchemaResponse) GetTableDefinition() map[string]string {
 
 // One individual Statement in a transaction.
 type StreamEvent_Statement struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
+	state    protoimpl.MessageState         `protogen:"open.v1"`
 	Category StreamEvent_Statement_Category `protobuf:"varint,1,opt,name=category,proto3,enum=query.StreamEvent_Statement_Category" json:"category,omitempty"`
 	// table_name, primary_key_fields and primary_key_values are set for DML.
 	TableName        string   `protobuf:"bytes,2,opt,name=table_name,json=tableName,proto3" json:"table_name,omitempty"`
@@ -5765,7 +5706,9 @@ type StreamEvent_Statement struct {
 	PrimaryKeyValues []*Row   `protobuf:"bytes,4,rep,name=primary_key_values,json=primaryKeyValues,proto3" json:"primary_key_values,omitempty"`
 	// sql is set for all queries.
 	// FIXME(alainjobart) we may not need it for DMLs.
-	Sql []byte `protobuf:"bytes,5,opt,name=sql,proto3" json:"sql,omitempty"`
+	Sql           []byte `protobuf:"bytes,5,opt,name=sql,proto3" json:"sql,omitempty"`
+	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *StreamEvent_Statement) Reset() {
@@ -5835,7 +5778,7 @@ func (x *StreamEvent_Statement) GetSql() []byte {
 
 var File_query_proto protoreflect.FileDescriptor
 
-var file_query_proto_rawDesc = []byte{
+var file_query_proto_rawDesc = string([]byte{
 	0x0a, 0x0b, 0x71, 0x75, 0x65, 0x72, 0x79, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x05, 0x71,
 	0x75, 0x65, 0x72, 0x79, 0x1a, 0x0e, 0x74, 0x6f, 0x70, 0x6f, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x70,
 	0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x0b, 0x76, 0x74, 0x72, 0x70, 0x63, 0x2e, 0x70, 0x72, 0x6f, 0x74,
@@ -6804,16 +6747,16 @@ var file_query_proto_rawDesc = []byte{
 	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 (
 	file_query_proto_rawDescOnce sync.Once
-	file_query_proto_rawDescData = file_query_proto_rawDesc
+	file_query_proto_rawDescData []byte
 )
 
 func file_query_proto_rawDescGZIP() []byte {
 	file_query_proto_rawDescOnce.Do(func() {
-		file_query_proto_rawDescData = protoimpl.X.CompressGZIP(file_query_proto_rawDescData)
+		file_query_proto_rawDescData = protoimpl.X.CompressGZIP(unsafe.Slice(unsafe.StringData(file_query_proto_rawDesc), len(file_query_proto_rawDesc)))
 	})
 	return file_query_proto_rawDescData
 }
@@ -7075,7 +7018,7 @@ func file_query_proto_init() {
 	out := protoimpl.TypeBuilder{
 		File: protoimpl.DescBuilder{
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
-			RawDescriptor: file_query_proto_rawDesc,
+			RawDescriptor: unsafe.Slice(unsafe.StringData(file_query_proto_rawDesc), len(file_query_proto_rawDesc)),
 			NumEnums:      13,
 			NumMessages:   70,
 			NumExtensions: 0,
@@ -7087,7 +7030,6 @@ func file_query_proto_init() {
 		MessageInfos:      file_query_proto_msgTypes,
 	}.Build()
 	File_query_proto = out.File
-	file_query_proto_rawDesc = nil
 	file_query_proto_goTypes = nil
 	file_query_proto_depIdxs = nil
 }
diff --git a/go/vt/proto/query/query_vtproto.pb.go b/go/vt/proto/query/query_vtproto.pb.go
index 21ab8776fc5..91ac1050d2d 100644
--- a/go/vt/proto/query/query_vtproto.pb.go
+++ b/go/vt/proto/query/query_vtproto.pb.go
@@ -1,5 +1,5 @@
 // Code generated by protoc-gen-go-vtproto. DO NOT EDIT.
-// protoc-gen-go-vtproto version: v0.6.1-0.20241011083415-71c992bc3c87
+// protoc-gen-go-vtproto version: v0.6.1-0.20241121165744-79df5c4772f2
 // source: query.proto
 
 package query
diff --git a/go/vt/proto/queryservice/queryservice.pb.go b/go/vt/proto/queryservice/queryservice.pb.go
index b44c6becd5d..30695928d1f 100644
--- a/go/vt/proto/queryservice/queryservice.pb.go
+++ b/go/vt/proto/queryservice/queryservice.pb.go
@@ -17,7 +17,7 @@
 
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.35.1
+// 	protoc-gen-go v1.36.4
 // 	protoc        v3.21.3
 // source: queryservice.proto
 
@@ -27,6 +27,7 @@ import (
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
 	reflect "reflect"
+	unsafe "unsafe"
 	binlogdata "vitess.io/vitess/go/vt/proto/binlogdata"
 	query "vitess.io/vitess/go/vt/proto/query"
 )
@@ -40,7 +41,7 @@ const (
 
 var File_queryservice_proto protoreflect.FileDescriptor
 
-var file_queryservice_proto_rawDesc = []byte{
+var file_queryservice_proto_rawDesc = string([]byte{
 	0x0a, 0x12, 0x71, 0x75, 0x65, 0x72, 0x79, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x70,
 	0x72, 0x6f, 0x74, 0x6f, 0x12, 0x0c, 0x71, 0x75, 0x65, 0x72, 0x79, 0x73, 0x65, 0x72, 0x76, 0x69,
 	0x63, 0x65, 0x1a, 0x0b, 0x71, 0x75, 0x65, 0x72, 0x79, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a,
@@ -194,7 +195,7 @@ var file_queryservice_proto_rawDesc = []byte{
 	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, 0x73,
 	0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
-}
+})
 
 var file_queryservice_proto_goTypes = []any{
 	(*query.ExecuteRequest)(nil),                    // 0: query.ExecuteRequest
@@ -331,7 +332,7 @@ func file_queryservice_proto_init() {
 	out := protoimpl.TypeBuilder{
 		File: protoimpl.DescBuilder{
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
-			RawDescriptor: file_queryservice_proto_rawDesc,
+			RawDescriptor: unsafe.Slice(unsafe.StringData(file_queryservice_proto_rawDesc), len(file_queryservice_proto_rawDesc)),
 			NumEnums:      0,
 			NumMessages:   0,
 			NumExtensions: 0,
@@ -341,7 +342,6 @@ func file_queryservice_proto_init() {
 		DependencyIndexes: file_queryservice_proto_depIdxs,
 	}.Build()
 	File_queryservice_proto = out.File
-	file_queryservice_proto_rawDesc = nil
 	file_queryservice_proto_goTypes = nil
 	file_queryservice_proto_depIdxs = nil
 }
diff --git a/go/vt/proto/replicationdata/replicationdata.pb.go b/go/vt/proto/replicationdata/replicationdata.pb.go
index bb973577d55..d99881e2cad 100644
--- a/go/vt/proto/replicationdata/replicationdata.pb.go
+++ b/go/vt/proto/replicationdata/replicationdata.pb.go
@@ -17,7 +17,7 @@
 
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.35.1
+// 	protoc-gen-go v1.36.4
 // 	protoc        v3.21.3
 // source: replicationdata.proto
 
@@ -28,6 +28,7 @@ import (
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
 	reflect "reflect"
 	sync "sync"
+	unsafe "unsafe"
 )
 
 const (
@@ -87,15 +88,12 @@ func (StopReplicationMode) EnumDescriptor() ([]byte, []int) {
 // Status is the replication status for MySQL/MariaDB/File-based. Returned by a
 // flavor-specific command and parsed into a Position and fields.
 type Status struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Position              string `protobuf:"bytes,1,opt,name=position,proto3" json:"position,omitempty"`
-	ReplicationLagSeconds uint32 `protobuf:"varint,4,opt,name=replication_lag_seconds,json=replicationLagSeconds,proto3" json:"replication_lag_seconds,omitempty"`
-	SourceHost            string `protobuf:"bytes,5,opt,name=source_host,json=sourceHost,proto3" json:"source_host,omitempty"`
-	SourcePort            int32  `protobuf:"varint,6,opt,name=source_port,json=sourcePort,proto3" json:"source_port,omitempty"`
-	ConnectRetry          int32  `protobuf:"varint,7,opt,name=connect_retry,json=connectRetry,proto3" json:"connect_retry,omitempty"`
+	state                 protoimpl.MessageState `protogen:"open.v1"`
+	Position              string                 `protobuf:"bytes,1,opt,name=position,proto3" json:"position,omitempty"`
+	ReplicationLagSeconds uint32                 `protobuf:"varint,4,opt,name=replication_lag_seconds,json=replicationLagSeconds,proto3" json:"replication_lag_seconds,omitempty"`
+	SourceHost            string                 `protobuf:"bytes,5,opt,name=source_host,json=sourceHost,proto3" json:"source_host,omitempty"`
+	SourcePort            int32                  `protobuf:"varint,6,opt,name=source_port,json=sourcePort,proto3" json:"source_port,omitempty"`
+	ConnectRetry          int32                  `protobuf:"varint,7,opt,name=connect_retry,json=connectRetry,proto3" json:"connect_retry,omitempty"`
 	// RelayLogPosition will be empty for flavors that do not support returning the full GTIDSet from the relay log, such as MariaDB.
 	RelayLogPosition                       string `protobuf:"bytes,8,opt,name=relay_log_position,json=relayLogPosition,proto3" json:"relay_log_position,omitempty"`
 	FilePosition                           string `protobuf:"bytes,9,opt,name=file_position,json=filePosition,proto3" json:"file_position,omitempty"`
@@ -115,6 +113,8 @@ type Status struct {
 	SslAllowed                             bool   `protobuf:"varint,23,opt,name=ssl_allowed,json=sslAllowed,proto3" json:"ssl_allowed,omitempty"`
 	ReplicationLagUnknown                  bool   `protobuf:"varint,24,opt,name=replication_lag_unknown,json=replicationLagUnknown,proto3" json:"replication_lag_unknown,omitempty"`
 	BackupRunning                          bool   `protobuf:"varint,25,opt,name=backup_running,json=backupRunning,proto3" json:"backup_running,omitempty"`
+	unknownFields                          protoimpl.UnknownFields
+	sizeCache                              protoimpl.SizeCache
 }
 
 func (x *Status) Reset() {
@@ -310,14 +310,13 @@ func (x *Status) GetBackupRunning() bool {
 
 // Configuration holds replication configuration information gathered from performance_schema and global variables.
 type Configuration struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
+	state protoimpl.MessageState `protogen:"open.v1"`
 	// HeartbeatInterval controls the heartbeat interval that the primary sends to the replica
 	HeartbeatInterval float64 `protobuf:"fixed64,1,opt,name=heartbeat_interval,json=heartbeatInterval,proto3" json:"heartbeat_interval,omitempty"`
 	// ReplicaNetTimeout specifies the number of seconds to wait for more data or a heartbeat signal from the source before the replica considers the connection broken
 	ReplicaNetTimeout int32 `protobuf:"varint,2,opt,name=replica_net_timeout,json=replicaNetTimeout,proto3" json:"replica_net_timeout,omitempty"`
+	unknownFields     protoimpl.UnknownFields
+	sizeCache         protoimpl.SizeCache
 }
 
 func (x *Configuration) Reset() {
@@ -367,12 +366,11 @@ func (x *Configuration) GetReplicaNetTimeout() int32 {
 // StopReplicationStatus represents the replication status before calling StopReplication, and the replication status collected immediately after
 // calling StopReplication.
 type StopReplicationStatus struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	Before        *Status                `protobuf:"bytes,1,opt,name=before,proto3" json:"before,omitempty"`
+	After         *Status                `protobuf:"bytes,2,opt,name=after,proto3" json:"after,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	Before *Status `protobuf:"bytes,1,opt,name=before,proto3" json:"before,omitempty"`
-	After  *Status `protobuf:"bytes,2,opt,name=after,proto3" json:"after,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *StopReplicationStatus) Reset() {
@@ -421,13 +419,12 @@ func (x *StopReplicationStatus) GetAfter() *Status {
 
 // PrimaryStatus is the replication status for a MySQL primary (returned by 'show binary log status').
 type PrimaryStatus struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	Position      string                 `protobuf:"bytes,1,opt,name=position,proto3" json:"position,omitempty"`
+	FilePosition  string                 `protobuf:"bytes,2,opt,name=file_position,json=filePosition,proto3" json:"file_position,omitempty"`
+	ServerUuid    string                 `protobuf:"bytes,3,opt,name=server_uuid,json=serverUuid,proto3" json:"server_uuid,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	Position     string `protobuf:"bytes,1,opt,name=position,proto3" json:"position,omitempty"`
-	FilePosition string `protobuf:"bytes,2,opt,name=file_position,json=filePosition,proto3" json:"file_position,omitempty"`
-	ServerUuid   string `protobuf:"bytes,3,opt,name=server_uuid,json=serverUuid,proto3" json:"server_uuid,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *PrimaryStatus) Reset() {
@@ -483,33 +480,32 @@ func (x *PrimaryStatus) GetServerUuid() string {
 
 // FullStatus contains the full status of MySQL including the replication information, semi-sync information, GTID information among others
 type FullStatus struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	ServerId                    uint32         `protobuf:"varint,1,opt,name=server_id,json=serverId,proto3" json:"server_id,omitempty"`
-	ServerUuid                  string         `protobuf:"bytes,2,opt,name=server_uuid,json=serverUuid,proto3" json:"server_uuid,omitempty"`
-	ReplicationStatus           *Status        `protobuf:"bytes,3,opt,name=replication_status,json=replicationStatus,proto3" json:"replication_status,omitempty"`
-	PrimaryStatus               *PrimaryStatus `protobuf:"bytes,4,opt,name=primary_status,json=primaryStatus,proto3" json:"primary_status,omitempty"`
-	GtidPurged                  string         `protobuf:"bytes,5,opt,name=gtid_purged,json=gtidPurged,proto3" json:"gtid_purged,omitempty"`
-	Version                     string         `protobuf:"bytes,6,opt,name=version,proto3" json:"version,omitempty"`
-	VersionComment              string         `protobuf:"bytes,7,opt,name=version_comment,json=versionComment,proto3" json:"version_comment,omitempty"`
-	ReadOnly                    bool           `protobuf:"varint,8,opt,name=read_only,json=readOnly,proto3" json:"read_only,omitempty"`
-	GtidMode                    string         `protobuf:"bytes,9,opt,name=gtid_mode,json=gtidMode,proto3" json:"gtid_mode,omitempty"`
-	BinlogFormat                string         `protobuf:"bytes,10,opt,name=binlog_format,json=binlogFormat,proto3" json:"binlog_format,omitempty"`
-	BinlogRowImage              string         `protobuf:"bytes,11,opt,name=binlog_row_image,json=binlogRowImage,proto3" json:"binlog_row_image,omitempty"`
-	LogBinEnabled               bool           `protobuf:"varint,12,opt,name=log_bin_enabled,json=logBinEnabled,proto3" json:"log_bin_enabled,omitempty"`
-	LogReplicaUpdates           bool           `protobuf:"varint,13,opt,name=log_replica_updates,json=logReplicaUpdates,proto3" json:"log_replica_updates,omitempty"`
-	SemiSyncPrimaryEnabled      bool           `protobuf:"varint,14,opt,name=semi_sync_primary_enabled,json=semiSyncPrimaryEnabled,proto3" json:"semi_sync_primary_enabled,omitempty"`
-	SemiSyncReplicaEnabled      bool           `protobuf:"varint,15,opt,name=semi_sync_replica_enabled,json=semiSyncReplicaEnabled,proto3" json:"semi_sync_replica_enabled,omitempty"`
-	SemiSyncPrimaryStatus       bool           `protobuf:"varint,16,opt,name=semi_sync_primary_status,json=semiSyncPrimaryStatus,proto3" json:"semi_sync_primary_status,omitempty"`
-	SemiSyncReplicaStatus       bool           `protobuf:"varint,17,opt,name=semi_sync_replica_status,json=semiSyncReplicaStatus,proto3" json:"semi_sync_replica_status,omitempty"`
-	SemiSyncPrimaryClients      uint32         `protobuf:"varint,18,opt,name=semi_sync_primary_clients,json=semiSyncPrimaryClients,proto3" json:"semi_sync_primary_clients,omitempty"`
-	SemiSyncPrimaryTimeout      uint64         `protobuf:"varint,19,opt,name=semi_sync_primary_timeout,json=semiSyncPrimaryTimeout,proto3" json:"semi_sync_primary_timeout,omitempty"`
-	SemiSyncWaitForReplicaCount uint32         `protobuf:"varint,20,opt,name=semi_sync_wait_for_replica_count,json=semiSyncWaitForReplicaCount,proto3" json:"semi_sync_wait_for_replica_count,omitempty"`
-	SuperReadOnly               bool           `protobuf:"varint,21,opt,name=super_read_only,json=superReadOnly,proto3" json:"super_read_only,omitempty"`
-	ReplicationConfiguration    *Configuration `protobuf:"bytes,22,opt,name=replication_configuration,json=replicationConfiguration,proto3" json:"replication_configuration,omitempty"`
-	DiskStalled                 bool           `protobuf:"varint,23,opt,name=disk_stalled,json=diskStalled,proto3" json:"disk_stalled,omitempty"`
+	state                       protoimpl.MessageState `protogen:"open.v1"`
+	ServerId                    uint32                 `protobuf:"varint,1,opt,name=server_id,json=serverId,proto3" json:"server_id,omitempty"`
+	ServerUuid                  string                 `protobuf:"bytes,2,opt,name=server_uuid,json=serverUuid,proto3" json:"server_uuid,omitempty"`
+	ReplicationStatus           *Status                `protobuf:"bytes,3,opt,name=replication_status,json=replicationStatus,proto3" json:"replication_status,omitempty"`
+	PrimaryStatus               *PrimaryStatus         `protobuf:"bytes,4,opt,name=primary_status,json=primaryStatus,proto3" json:"primary_status,omitempty"`
+	GtidPurged                  string                 `protobuf:"bytes,5,opt,name=gtid_purged,json=gtidPurged,proto3" json:"gtid_purged,omitempty"`
+	Version                     string                 `protobuf:"bytes,6,opt,name=version,proto3" json:"version,omitempty"`
+	VersionComment              string                 `protobuf:"bytes,7,opt,name=version_comment,json=versionComment,proto3" json:"version_comment,omitempty"`
+	ReadOnly                    bool                   `protobuf:"varint,8,opt,name=read_only,json=readOnly,proto3" json:"read_only,omitempty"`
+	GtidMode                    string                 `protobuf:"bytes,9,opt,name=gtid_mode,json=gtidMode,proto3" json:"gtid_mode,omitempty"`
+	BinlogFormat                string                 `protobuf:"bytes,10,opt,name=binlog_format,json=binlogFormat,proto3" json:"binlog_format,omitempty"`
+	BinlogRowImage              string                 `protobuf:"bytes,11,opt,name=binlog_row_image,json=binlogRowImage,proto3" json:"binlog_row_image,omitempty"`
+	LogBinEnabled               bool                   `protobuf:"varint,12,opt,name=log_bin_enabled,json=logBinEnabled,proto3" json:"log_bin_enabled,omitempty"`
+	LogReplicaUpdates           bool                   `protobuf:"varint,13,opt,name=log_replica_updates,json=logReplicaUpdates,proto3" json:"log_replica_updates,omitempty"`
+	SemiSyncPrimaryEnabled      bool                   `protobuf:"varint,14,opt,name=semi_sync_primary_enabled,json=semiSyncPrimaryEnabled,proto3" json:"semi_sync_primary_enabled,omitempty"`
+	SemiSyncReplicaEnabled      bool                   `protobuf:"varint,15,opt,name=semi_sync_replica_enabled,json=semiSyncReplicaEnabled,proto3" json:"semi_sync_replica_enabled,omitempty"`
+	SemiSyncPrimaryStatus       bool                   `protobuf:"varint,16,opt,name=semi_sync_primary_status,json=semiSyncPrimaryStatus,proto3" json:"semi_sync_primary_status,omitempty"`
+	SemiSyncReplicaStatus       bool                   `protobuf:"varint,17,opt,name=semi_sync_replica_status,json=semiSyncReplicaStatus,proto3" json:"semi_sync_replica_status,omitempty"`
+	SemiSyncPrimaryClients      uint32                 `protobuf:"varint,18,opt,name=semi_sync_primary_clients,json=semiSyncPrimaryClients,proto3" json:"semi_sync_primary_clients,omitempty"`
+	SemiSyncPrimaryTimeout      uint64                 `protobuf:"varint,19,opt,name=semi_sync_primary_timeout,json=semiSyncPrimaryTimeout,proto3" json:"semi_sync_primary_timeout,omitempty"`
+	SemiSyncWaitForReplicaCount uint32                 `protobuf:"varint,20,opt,name=semi_sync_wait_for_replica_count,json=semiSyncWaitForReplicaCount,proto3" json:"semi_sync_wait_for_replica_count,omitempty"`
+	SuperReadOnly               bool                   `protobuf:"varint,21,opt,name=super_read_only,json=superReadOnly,proto3" json:"super_read_only,omitempty"`
+	ReplicationConfiguration    *Configuration         `protobuf:"bytes,22,opt,name=replication_configuration,json=replicationConfiguration,proto3" json:"replication_configuration,omitempty"`
+	DiskStalled                 bool                   `protobuf:"varint,23,opt,name=disk_stalled,json=diskStalled,proto3" json:"disk_stalled,omitempty"`
+	unknownFields               protoimpl.UnknownFields
+	sizeCache                   protoimpl.SizeCache
 }
 
 func (x *FullStatus) Reset() {
@@ -705,7 +701,7 @@ func (x *FullStatus) GetDiskStalled() bool {
 
 var File_replicationdata_proto protoreflect.FileDescriptor
 
-var file_replicationdata_proto_rawDesc = []byte{
+var file_replicationdata_proto_rawDesc = string([]byte{
 	0x0a, 0x15, 0x72, 0x65, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x64, 0x61, 0x74,
 	0x61, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x0f, 0x72, 0x65, 0x70, 0x6c, 0x69, 0x63, 0x61,
 	0x74, 0x69, 0x6f, 0x6e, 0x64, 0x61, 0x74, 0x61, 0x22, 0xbd, 0x07, 0x0a, 0x06, 0x53, 0x74, 0x61,
@@ -869,16 +865,16 @@ var file_replicationdata_proto_rawDesc = []byte{
 	0x65, 0x73, 0x73, 0x2f, 0x67, 0x6f, 0x2f, 0x76, 0x74, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f,
 	0x72, 0x65, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x64, 0x61, 0x74, 0x61, 0x62,
 	0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
-}
+})
 
 var (
 	file_replicationdata_proto_rawDescOnce sync.Once
-	file_replicationdata_proto_rawDescData = file_replicationdata_proto_rawDesc
+	file_replicationdata_proto_rawDescData []byte
 )
 
 func file_replicationdata_proto_rawDescGZIP() []byte {
 	file_replicationdata_proto_rawDescOnce.Do(func() {
-		file_replicationdata_proto_rawDescData = protoimpl.X.CompressGZIP(file_replicationdata_proto_rawDescData)
+		file_replicationdata_proto_rawDescData = protoimpl.X.CompressGZIP(unsafe.Slice(unsafe.StringData(file_replicationdata_proto_rawDesc), len(file_replicationdata_proto_rawDesc)))
 	})
 	return file_replicationdata_proto_rawDescData
 }
@@ -915,7 +911,7 @@ func file_replicationdata_proto_init() {
 	out := protoimpl.TypeBuilder{
 		File: protoimpl.DescBuilder{
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
-			RawDescriptor: file_replicationdata_proto_rawDesc,
+			RawDescriptor: unsafe.Slice(unsafe.StringData(file_replicationdata_proto_rawDesc), len(file_replicationdata_proto_rawDesc)),
 			NumEnums:      1,
 			NumMessages:   5,
 			NumExtensions: 0,
@@ -927,7 +923,6 @@ func file_replicationdata_proto_init() {
 		MessageInfos:      file_replicationdata_proto_msgTypes,
 	}.Build()
 	File_replicationdata_proto = out.File
-	file_replicationdata_proto_rawDesc = nil
 	file_replicationdata_proto_goTypes = nil
 	file_replicationdata_proto_depIdxs = nil
 }
diff --git a/go/vt/proto/replicationdata/replicationdata_vtproto.pb.go b/go/vt/proto/replicationdata/replicationdata_vtproto.pb.go
index a515397c065..92f8e3074c3 100644
--- a/go/vt/proto/replicationdata/replicationdata_vtproto.pb.go
+++ b/go/vt/proto/replicationdata/replicationdata_vtproto.pb.go
@@ -1,5 +1,5 @@
 // Code generated by protoc-gen-go-vtproto. DO NOT EDIT.
-// protoc-gen-go-vtproto version: v0.6.1-0.20241011083415-71c992bc3c87
+// protoc-gen-go-vtproto version: v0.6.1-0.20241121165744-79df5c4772f2
 // source: replicationdata.proto
 
 package replicationdata
diff --git a/go/vt/proto/tableacl/tableacl.pb.go b/go/vt/proto/tableacl/tableacl.pb.go
index 44281419028..ccdf60777bc 100644
--- a/go/vt/proto/tableacl/tableacl.pb.go
+++ b/go/vt/proto/tableacl/tableacl.pb.go
@@ -17,7 +17,7 @@
 
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.35.1
+// 	protoc-gen-go v1.36.4
 // 	protoc        v3.21.3
 // source: tableacl.proto
 
@@ -28,6 +28,7 @@ import (
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
 	reflect "reflect"
 	sync "sync"
+	unsafe "unsafe"
 )
 
 const (
@@ -39,16 +40,15 @@ const (
 
 // TableGroupSpec defines ACLs for a group of tables.
 type TableGroupSpec struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	state protoimpl.MessageState `protogen:"open.v1"`
+	Name  string                 `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// either tables or a table name prefixes (if it ends in a %)
 	TableNamesOrPrefixes []string `protobuf:"bytes,2,rep,name=table_names_or_prefixes,json=tableNamesOrPrefixes,proto3" json:"table_names_or_prefixes,omitempty"`
 	Readers              []string `protobuf:"bytes,3,rep,name=readers,proto3" json:"readers,omitempty"`
 	Writers              []string `protobuf:"bytes,4,rep,name=writers,proto3" json:"writers,omitempty"`
 	Admins               []string `protobuf:"bytes,5,rep,name=admins,proto3" json:"admins,omitempty"`
+	unknownFields        protoimpl.UnknownFields
+	sizeCache            protoimpl.SizeCache
 }
 
 func (x *TableGroupSpec) Reset() {
@@ -117,11 +117,10 @@ func (x *TableGroupSpec) GetAdmins() []string {
 }
 
 type Config struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	TableGroups   []*TableGroupSpec      `protobuf:"bytes,1,rep,name=table_groups,json=tableGroups,proto3" json:"table_groups,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	TableGroups []*TableGroupSpec `protobuf:"bytes,1,rep,name=table_groups,json=tableGroups,proto3" json:"table_groups,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *Config) Reset() {
@@ -163,7 +162,7 @@ func (x *Config) GetTableGroups() []*TableGroupSpec {
 
 var File_tableacl_proto protoreflect.FileDescriptor
 
-var file_tableacl_proto_rawDesc = []byte{
+var file_tableacl_proto_rawDesc = string([]byte{
 	0x0a, 0x0e, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x61, 0x63, 0x6c, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f,
 	0x12, 0x08, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x61, 0x63, 0x6c, 0x22, 0xa7, 0x01, 0x0a, 0x0e, 0x54,
 	0x61, 0x62, 0x6c, 0x65, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x53, 0x70, 0x65, 0x63, 0x12, 0x12, 0x0a,
@@ -184,16 +183,16 @@ var file_tableacl_proto_rawDesc = []byte{
 	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, 0x74, 0x61, 0x62, 0x6c,
 	0x65, 0x61, 0x63, 0x6c, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
-}
+})
 
 var (
 	file_tableacl_proto_rawDescOnce sync.Once
-	file_tableacl_proto_rawDescData = file_tableacl_proto_rawDesc
+	file_tableacl_proto_rawDescData []byte
 )
 
 func file_tableacl_proto_rawDescGZIP() []byte {
 	file_tableacl_proto_rawDescOnce.Do(func() {
-		file_tableacl_proto_rawDescData = protoimpl.X.CompressGZIP(file_tableacl_proto_rawDescData)
+		file_tableacl_proto_rawDescData = protoimpl.X.CompressGZIP(unsafe.Slice(unsafe.StringData(file_tableacl_proto_rawDesc), len(file_tableacl_proto_rawDesc)))
 	})
 	return file_tableacl_proto_rawDescData
 }
@@ -221,7 +220,7 @@ func file_tableacl_proto_init() {
 	out := protoimpl.TypeBuilder{
 		File: protoimpl.DescBuilder{
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
-			RawDescriptor: file_tableacl_proto_rawDesc,
+			RawDescriptor: unsafe.Slice(unsafe.StringData(file_tableacl_proto_rawDesc), len(file_tableacl_proto_rawDesc)),
 			NumEnums:      0,
 			NumMessages:   2,
 			NumExtensions: 0,
@@ -232,7 +231,6 @@ func file_tableacl_proto_init() {
 		MessageInfos:      file_tableacl_proto_msgTypes,
 	}.Build()
 	File_tableacl_proto = out.File
-	file_tableacl_proto_rawDesc = nil
 	file_tableacl_proto_goTypes = nil
 	file_tableacl_proto_depIdxs = nil
 }
diff --git a/go/vt/proto/tableacl/tableacl_vtproto.pb.go b/go/vt/proto/tableacl/tableacl_vtproto.pb.go
index 60c9294706f..2b16744f765 100644
--- a/go/vt/proto/tableacl/tableacl_vtproto.pb.go
+++ b/go/vt/proto/tableacl/tableacl_vtproto.pb.go
@@ -1,5 +1,5 @@
 // Code generated by protoc-gen-go-vtproto. DO NOT EDIT.
-// protoc-gen-go-vtproto version: v0.6.1-0.20241011083415-71c992bc3c87
+// protoc-gen-go-vtproto version: v0.6.1-0.20241121165744-79df5c4772f2
 // source: tableacl.proto
 
 package tableacl
diff --git a/go/vt/proto/tabletmanagerdata/tabletmanagerdata.pb.go b/go/vt/proto/tabletmanagerdata/tabletmanagerdata.pb.go
index 1608272d9e5..93690d02140 100644
--- a/go/vt/proto/tabletmanagerdata/tabletmanagerdata.pb.go
+++ b/go/vt/proto/tabletmanagerdata/tabletmanagerdata.pb.go
@@ -18,7 +18,7 @@
 
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.35.1
+// 	protoc-gen-go v1.36.4
 // 	protoc        v3.21.3
 // source: tabletmanagerdata.proto
 
@@ -29,6 +29,7 @@ import (
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
 	reflect "reflect"
 	sync "sync"
+	unsafe "unsafe"
 	binlogdata "vitess.io/vitess/go/vt/proto/binlogdata"
 	logutil "vitess.io/vitess/go/vt/proto/logutil"
 	mysqlctl "vitess.io/vitess/go/vt/proto/mysqlctl"
@@ -156,10 +157,7 @@ func (CheckThrottlerResponseCode) EnumDescriptor() ([]byte, []int) {
 }
 
 type TableDefinition struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
+	state protoimpl.MessageState `protogen:"open.v1"`
 	// the table name
 	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// the SQL to run to create the table
@@ -176,7 +174,9 @@ type TableDefinition struct {
 	RowCount uint64 `protobuf:"varint,7,opt,name=row_count,json=rowCount,proto3" json:"row_count,omitempty"`
 	// column names along with their types.
 	// NOTE: this is a superset of columns.
-	Fields []*query.Field `protobuf:"bytes,8,rep,name=fields,proto3" json:"fields,omitempty"`
+	Fields        []*query.Field `protobuf:"bytes,8,rep,name=fields,proto3" json:"fields,omitempty"`
+	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *TableDefinition) Reset() {
@@ -266,12 +266,11 @@ func (x *TableDefinition) GetFields() []*query.Field {
 }
 
 type SchemaDefinition struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	DatabaseSchema   string             `protobuf:"bytes,1,opt,name=database_schema,json=databaseSchema,proto3" json:"database_schema,omitempty"`
-	TableDefinitions []*TableDefinition `protobuf:"bytes,2,rep,name=table_definitions,json=tableDefinitions,proto3" json:"table_definitions,omitempty"`
+	state            protoimpl.MessageState `protogen:"open.v1"`
+	DatabaseSchema   string                 `protobuf:"bytes,1,opt,name=database_schema,json=databaseSchema,proto3" json:"database_schema,omitempty"`
+	TableDefinitions []*TableDefinition     `protobuf:"bytes,2,rep,name=table_definitions,json=tableDefinitions,proto3" json:"table_definitions,omitempty"`
+	unknownFields    protoimpl.UnknownFields
+	sizeCache        protoimpl.SizeCache
 }
 
 func (x *SchemaDefinition) Reset() {
@@ -319,14 +318,13 @@ func (x *SchemaDefinition) GetTableDefinitions() []*TableDefinition {
 }
 
 type SchemaChangeResult struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
+	state protoimpl.MessageState `protogen:"open.v1"`
 	// before_schema holds the schema before each change.
 	BeforeSchema *SchemaDefinition `protobuf:"bytes,1,opt,name=before_schema,json=beforeSchema,proto3" json:"before_schema,omitempty"`
 	// after_schema holds the schema after each change.
-	AfterSchema *SchemaDefinition `protobuf:"bytes,2,opt,name=after_schema,json=afterSchema,proto3" json:"after_schema,omitempty"`
+	AfterSchema   *SchemaDefinition `protobuf:"bytes,2,opt,name=after_schema,json=afterSchema,proto3" json:"after_schema,omitempty"`
+	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *SchemaChangeResult) Reset() {
@@ -377,14 +375,13 @@ func (x *SchemaChangeResult) GetAfterSchema() *SchemaDefinition {
 // Primary key is Host+User
 // PasswordChecksum is the crc64 of the password, for security reasons
 type UserPermission struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Host             string            `protobuf:"bytes,1,opt,name=host,proto3" json:"host,omitempty"`
-	User             string            `protobuf:"bytes,2,opt,name=user,proto3" json:"user,omitempty"`
-	PasswordChecksum uint64            `protobuf:"varint,3,opt,name=password_checksum,json=passwordChecksum,proto3" json:"password_checksum,omitempty"`
-	Privileges       map[string]string `protobuf:"bytes,4,rep,name=privileges,proto3" json:"privileges,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
+	state            protoimpl.MessageState `protogen:"open.v1"`
+	Host             string                 `protobuf:"bytes,1,opt,name=host,proto3" json:"host,omitempty"`
+	User             string                 `protobuf:"bytes,2,opt,name=user,proto3" json:"user,omitempty"`
+	PasswordChecksum uint64                 `protobuf:"varint,3,opt,name=password_checksum,json=passwordChecksum,proto3" json:"password_checksum,omitempty"`
+	Privileges       map[string]string      `protobuf:"bytes,4,rep,name=privileges,proto3" json:"privileges,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
+	unknownFields    protoimpl.UnknownFields
+	sizeCache        protoimpl.SizeCache
 }
 
 func (x *UserPermission) Reset() {
@@ -448,14 +445,13 @@ func (x *UserPermission) GetPrivileges() map[string]string {
 // DbPermission describes a single row in the mysql.db table
 // Primary key is Host+Db+User
 type DbPermission struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	Host          string                 `protobuf:"bytes,1,opt,name=host,proto3" json:"host,omitempty"`
+	Db            string                 `protobuf:"bytes,2,opt,name=db,proto3" json:"db,omitempty"`
+	User          string                 `protobuf:"bytes,3,opt,name=user,proto3" json:"user,omitempty"`
+	Privileges    map[string]string      `protobuf:"bytes,4,rep,name=privileges,proto3" json:"privileges,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
 	unknownFields protoimpl.UnknownFields
-
-	Host       string            `protobuf:"bytes,1,opt,name=host,proto3" json:"host,omitempty"`
-	Db         string            `protobuf:"bytes,2,opt,name=db,proto3" json:"db,omitempty"`
-	User       string            `protobuf:"bytes,3,opt,name=user,proto3" json:"user,omitempty"`
-	Privileges map[string]string `protobuf:"bytes,4,rep,name=privileges,proto3" json:"privileges,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *DbPermission) Reset() {
@@ -519,12 +515,11 @@ func (x *DbPermission) GetPrivileges() map[string]string {
 // Permissions have all the rows in mysql.{user,db} tables,
 // (all rows are sorted by primary key)
 type Permissions struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	UserPermissions []*UserPermission `protobuf:"bytes,1,rep,name=user_permissions,json=userPermissions,proto3" json:"user_permissions,omitempty"`
-	DbPermissions   []*DbPermission   `protobuf:"bytes,2,rep,name=db_permissions,json=dbPermissions,proto3" json:"db_permissions,omitempty"`
+	state           protoimpl.MessageState `protogen:"open.v1"`
+	UserPermissions []*UserPermission      `protobuf:"bytes,1,rep,name=user_permissions,json=userPermissions,proto3" json:"user_permissions,omitempty"`
+	DbPermissions   []*DbPermission        `protobuf:"bytes,2,rep,name=db_permissions,json=dbPermissions,proto3" json:"db_permissions,omitempty"`
+	unknownFields   protoimpl.UnknownFields
+	sizeCache       protoimpl.SizeCache
 }
 
 func (x *Permissions) Reset() {
@@ -572,11 +567,10 @@ func (x *Permissions) GetDbPermissions() []*DbPermission {
 }
 
 type PingRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	Payload       string                 `protobuf:"bytes,1,opt,name=payload,proto3" json:"payload,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	Payload string `protobuf:"bytes,1,opt,name=payload,proto3" json:"payload,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *PingRequest) Reset() {
@@ -617,11 +611,10 @@ func (x *PingRequest) GetPayload() string {
 }
 
 type PingResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	Payload       string                 `protobuf:"bytes,1,opt,name=payload,proto3" json:"payload,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	Payload string `protobuf:"bytes,1,opt,name=payload,proto3" json:"payload,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *PingResponse) Reset() {
@@ -662,12 +655,11 @@ func (x *PingResponse) GetPayload() string {
 }
 
 type SleepRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
+	state protoimpl.MessageState `protogen:"open.v1"`
 	// duration is in nanoseconds
-	Duration int64 `protobuf:"varint,1,opt,name=duration,proto3" json:"duration,omitempty"`
+	Duration      int64 `protobuf:"varint,1,opt,name=duration,proto3" json:"duration,omitempty"`
+	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *SleepRequest) Reset() {
@@ -708,9 +700,9 @@ func (x *SleepRequest) GetDuration() int64 {
 }
 
 type SleepResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
 	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *SleepResponse) Reset() {
@@ -744,13 +736,12 @@ func (*SleepResponse) Descriptor() ([]byte, []int) {
 }
 
 type ExecuteHookRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	Name          string                 `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	Parameters    []string               `protobuf:"bytes,2,rep,name=parameters,proto3" json:"parameters,omitempty"`
+	ExtraEnv      map[string]string      `protobuf:"bytes,3,rep,name=extra_env,json=extraEnv,proto3" json:"extra_env,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
 	unknownFields protoimpl.UnknownFields
-
-	Name       string            `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
-	Parameters []string          `protobuf:"bytes,2,rep,name=parameters,proto3" json:"parameters,omitempty"`
-	ExtraEnv   map[string]string `protobuf:"bytes,3,rep,name=extra_env,json=extraEnv,proto3" json:"extra_env,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *ExecuteHookRequest) Reset() {
@@ -805,13 +796,12 @@ func (x *ExecuteHookRequest) GetExtraEnv() map[string]string {
 }
 
 type ExecuteHookResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	ExitStatus    int64                  `protobuf:"varint,1,opt,name=exit_status,json=exitStatus,proto3" json:"exit_status,omitempty"`
+	Stdout        string                 `protobuf:"bytes,2,opt,name=stdout,proto3" json:"stdout,omitempty"`
+	Stderr        string                 `protobuf:"bytes,3,opt,name=stderr,proto3" json:"stderr,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	ExitStatus int64  `protobuf:"varint,1,opt,name=exit_status,json=exitStatus,proto3" json:"exit_status,omitempty"`
-	Stdout     string `protobuf:"bytes,2,opt,name=stdout,proto3" json:"stdout,omitempty"`
-	Stderr     string `protobuf:"bytes,3,opt,name=stderr,proto3" json:"stderr,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *ExecuteHookResponse) Reset() {
@@ -866,16 +856,15 @@ func (x *ExecuteHookResponse) GetStderr() string {
 }
 
 type GetSchemaRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Tables        []string `protobuf:"bytes,1,rep,name=tables,proto3" json:"tables,omitempty"`
-	IncludeViews  bool     `protobuf:"varint,2,opt,name=include_views,json=includeViews,proto3" json:"include_views,omitempty"`
-	ExcludeTables []string `protobuf:"bytes,3,rep,name=exclude_tables,json=excludeTables,proto3" json:"exclude_tables,omitempty"`
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	Tables        []string               `protobuf:"bytes,1,rep,name=tables,proto3" json:"tables,omitempty"`
+	IncludeViews  bool                   `protobuf:"varint,2,opt,name=include_views,json=includeViews,proto3" json:"include_views,omitempty"`
+	ExcludeTables []string               `protobuf:"bytes,3,rep,name=exclude_tables,json=excludeTables,proto3" json:"exclude_tables,omitempty"`
 	// TableSchemaOnly specifies whether to limit the results to just table/view
 	// schema definition (CREATE TABLE/VIEW statements) and skip column/field information
 	TableSchemaOnly bool `protobuf:"varint,4,opt,name=table_schema_only,json=tableSchemaOnly,proto3" json:"table_schema_only,omitempty"`
+	unknownFields   protoimpl.UnknownFields
+	sizeCache       protoimpl.SizeCache
 }
 
 func (x *GetSchemaRequest) Reset() {
@@ -937,11 +926,10 @@ func (x *GetSchemaRequest) GetTableSchemaOnly() bool {
 }
 
 type GetSchemaResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	SchemaDefinition *SchemaDefinition `protobuf:"bytes,1,opt,name=schema_definition,json=schemaDefinition,proto3" json:"schema_definition,omitempty"`
+	state            protoimpl.MessageState `protogen:"open.v1"`
+	SchemaDefinition *SchemaDefinition      `protobuf:"bytes,1,opt,name=schema_definition,json=schemaDefinition,proto3" json:"schema_definition,omitempty"`
+	unknownFields    protoimpl.UnknownFields
+	sizeCache        protoimpl.SizeCache
 }
 
 func (x *GetSchemaResponse) Reset() {
@@ -982,9 +970,9 @@ func (x *GetSchemaResponse) GetSchemaDefinition() *SchemaDefinition {
 }
 
 type GetPermissionsRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
 	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *GetPermissionsRequest) Reset() {
@@ -1018,11 +1006,10 @@ func (*GetPermissionsRequest) Descriptor() ([]byte, []int) {
 }
 
 type GetPermissionsResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	Permissions   *Permissions           `protobuf:"bytes,1,opt,name=permissions,proto3" json:"permissions,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	Permissions *Permissions `protobuf:"bytes,1,opt,name=permissions,proto3" json:"permissions,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *GetPermissionsResponse) Reset() {
@@ -1063,11 +1050,10 @@ func (x *GetPermissionsResponse) GetPermissions() *Permissions {
 }
 
 type GetGlobalStatusVarsRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	Variables     []string               `protobuf:"bytes,1,rep,name=variables,proto3" json:"variables,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	Variables []string `protobuf:"bytes,1,rep,name=variables,proto3" json:"variables,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *GetGlobalStatusVarsRequest) Reset() {
@@ -1108,11 +1094,10 @@ func (x *GetGlobalStatusVarsRequest) GetVariables() []string {
 }
 
 type GetGlobalStatusVarsResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	StatusValues  map[string]string      `protobuf:"bytes,1,rep,name=status_values,json=statusValues,proto3" json:"status_values,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
 	unknownFields protoimpl.UnknownFields
-
-	StatusValues map[string]string `protobuf:"bytes,1,rep,name=status_values,json=statusValues,proto3" json:"status_values,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *GetGlobalStatusVarsResponse) Reset() {
@@ -1153,9 +1138,9 @@ func (x *GetGlobalStatusVarsResponse) GetStatusValues() map[string]string {
 }
 
 type SetReadOnlyRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
 	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *SetReadOnlyRequest) Reset() {
@@ -1189,9 +1174,9 @@ func (*SetReadOnlyRequest) Descriptor() ([]byte, []int) {
 }
 
 type SetReadOnlyResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
 	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *SetReadOnlyResponse) Reset() {
@@ -1225,9 +1210,9 @@ func (*SetReadOnlyResponse) Descriptor() ([]byte, []int) {
 }
 
 type SetReadWriteRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
 	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *SetReadWriteRequest) Reset() {
@@ -1261,9 +1246,9 @@ func (*SetReadWriteRequest) Descriptor() ([]byte, []int) {
 }
 
 type SetReadWriteResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
 	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *SetReadWriteResponse) Reset() {
@@ -1297,12 +1282,11 @@ func (*SetReadWriteResponse) Descriptor() ([]byte, []int) {
 }
 
 type ChangeTypeRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	TabletType    topodata.TabletType    `protobuf:"varint,1,opt,name=tablet_type,json=tabletType,proto3,enum=topodata.TabletType" json:"tablet_type,omitempty"`
+	SemiSync      bool                   `protobuf:"varint,2,opt,name=semiSync,proto3" json:"semiSync,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	TabletType topodata.TabletType `protobuf:"varint,1,opt,name=tablet_type,json=tabletType,proto3,enum=topodata.TabletType" json:"tablet_type,omitempty"`
-	SemiSync   bool                `protobuf:"varint,2,opt,name=semiSync,proto3" json:"semiSync,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *ChangeTypeRequest) Reset() {
@@ -1350,9 +1334,9 @@ func (x *ChangeTypeRequest) GetSemiSync() bool {
 }
 
 type ChangeTypeResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
 	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *ChangeTypeResponse) Reset() {
@@ -1386,9 +1370,9 @@ func (*ChangeTypeResponse) Descriptor() ([]byte, []int) {
 }
 
 type RefreshStateRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
 	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *RefreshStateRequest) Reset() {
@@ -1422,9 +1406,9 @@ func (*RefreshStateRequest) Descriptor() ([]byte, []int) {
 }
 
 type RefreshStateResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
 	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *RefreshStateResponse) Reset() {
@@ -1458,9 +1442,9 @@ func (*RefreshStateResponse) Descriptor() ([]byte, []int) {
 }
 
 type RunHealthCheckRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
 	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *RunHealthCheckRequest) Reset() {
@@ -1494,9 +1478,9 @@ func (*RunHealthCheckRequest) Descriptor() ([]byte, []int) {
 }
 
 type RunHealthCheckResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
 	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *RunHealthCheckResponse) Reset() {
@@ -1530,14 +1514,13 @@ func (*RunHealthCheckResponse) Descriptor() ([]byte, []int) {
 }
 
 type ReloadSchemaRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
+	state protoimpl.MessageState `protogen:"open.v1"`
 	// wait_position allows scheduling a schema reload to occur after a
 	// given DDL has replicated to this server, by specifying a replication
 	// position to wait for. Leave empty to trigger the reload immediately.
-	WaitPosition string `protobuf:"bytes,1,opt,name=wait_position,json=waitPosition,proto3" json:"wait_position,omitempty"`
+	WaitPosition  string `protobuf:"bytes,1,opt,name=wait_position,json=waitPosition,proto3" json:"wait_position,omitempty"`
+	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *ReloadSchemaRequest) Reset() {
@@ -1578,9 +1561,9 @@ func (x *ReloadSchemaRequest) GetWaitPosition() string {
 }
 
 type ReloadSchemaResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
 	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *ReloadSchemaResponse) Reset() {
@@ -1614,11 +1597,10 @@ func (*ReloadSchemaResponse) Descriptor() ([]byte, []int) {
 }
 
 type PreflightSchemaRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	Changes       []string               `protobuf:"bytes,1,rep,name=changes,proto3" json:"changes,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	Changes []string `protobuf:"bytes,1,rep,name=changes,proto3" json:"changes,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *PreflightSchemaRequest) Reset() {
@@ -1659,13 +1641,12 @@ func (x *PreflightSchemaRequest) GetChanges() []string {
 }
 
 type PreflightSchemaResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
+	state protoimpl.MessageState `protogen:"open.v1"`
 	// change_results has for each change the schema before and after it.
 	// The number of elements is identical to the length of "changes" in the request.
 	ChangeResults []*SchemaChangeResult `protobuf:"bytes,1,rep,name=change_results,json=changeResults,proto3" json:"change_results,omitempty"`
+	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *PreflightSchemaResponse) Reset() {
@@ -1706,20 +1687,19 @@ func (x *PreflightSchemaResponse) GetChangeResults() []*SchemaChangeResult {
 }
 
 type ApplySchemaRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Sql              string            `protobuf:"bytes,1,opt,name=sql,proto3" json:"sql,omitempty"`
-	Force            bool              `protobuf:"varint,2,opt,name=force,proto3" json:"force,omitempty"`
-	AllowReplication bool              `protobuf:"varint,3,opt,name=allow_replication,json=allowReplication,proto3" json:"allow_replication,omitempty"`
-	BeforeSchema     *SchemaDefinition `protobuf:"bytes,4,opt,name=before_schema,json=beforeSchema,proto3" json:"before_schema,omitempty"`
-	AfterSchema      *SchemaDefinition `protobuf:"bytes,5,opt,name=after_schema,json=afterSchema,proto3" json:"after_schema,omitempty"`
-	SqlMode          string            `protobuf:"bytes,6,opt,name=sql_mode,json=sqlMode,proto3" json:"sql_mode,omitempty"`
+	state            protoimpl.MessageState `protogen:"open.v1"`
+	Sql              string                 `protobuf:"bytes,1,opt,name=sql,proto3" json:"sql,omitempty"`
+	Force            bool                   `protobuf:"varint,2,opt,name=force,proto3" json:"force,omitempty"`
+	AllowReplication bool                   `protobuf:"varint,3,opt,name=allow_replication,json=allowReplication,proto3" json:"allow_replication,omitempty"`
+	BeforeSchema     *SchemaDefinition      `protobuf:"bytes,4,opt,name=before_schema,json=beforeSchema,proto3" json:"before_schema,omitempty"`
+	AfterSchema      *SchemaDefinition      `protobuf:"bytes,5,opt,name=after_schema,json=afterSchema,proto3" json:"after_schema,omitempty"`
+	SqlMode          string                 `protobuf:"bytes,6,opt,name=sql_mode,json=sqlMode,proto3" json:"sql_mode,omitempty"`
 	// BatchSize indicates how many queries to apply together.
 	BatchSize int64 `protobuf:"varint,7,opt,name=batch_size,json=batchSize,proto3" json:"batch_size,omitempty"`
 	// DisableForeignKeyChecks will result in setting foreign_key_checks to off before applying the schema.
 	DisableForeignKeyChecks bool `protobuf:"varint,8,opt,name=disable_foreign_key_checks,json=disableForeignKeyChecks,proto3" json:"disable_foreign_key_checks,omitempty"`
+	unknownFields           protoimpl.UnknownFields
+	sizeCache               protoimpl.SizeCache
 }
 
 func (x *ApplySchemaRequest) Reset() {
@@ -1809,12 +1789,11 @@ func (x *ApplySchemaRequest) GetDisableForeignKeyChecks() bool {
 }
 
 type ApplySchemaResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	BeforeSchema  *SchemaDefinition      `protobuf:"bytes,1,opt,name=before_schema,json=beforeSchema,proto3" json:"before_schema,omitempty"`
+	AfterSchema   *SchemaDefinition      `protobuf:"bytes,2,opt,name=after_schema,json=afterSchema,proto3" json:"after_schema,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	BeforeSchema *SchemaDefinition `protobuf:"bytes,1,opt,name=before_schema,json=beforeSchema,proto3" json:"before_schema,omitempty"`
-	AfterSchema  *SchemaDefinition `protobuf:"bytes,2,opt,name=after_schema,json=afterSchema,proto3" json:"after_schema,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *ApplySchemaResponse) Reset() {
@@ -1862,9 +1841,9 @@ func (x *ApplySchemaResponse) GetAfterSchema() *SchemaDefinition {
 }
 
 type LockTablesRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
 	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *LockTablesRequest) Reset() {
@@ -1898,9 +1877,9 @@ func (*LockTablesRequest) Descriptor() ([]byte, []int) {
 }
 
 type LockTablesResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
 	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *LockTablesResponse) Reset() {
@@ -1934,9 +1913,9 @@ func (*LockTablesResponse) Descriptor() ([]byte, []int) {
 }
 
 type UnlockTablesRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
 	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *UnlockTablesRequest) Reset() {
@@ -1970,9 +1949,9 @@ func (*UnlockTablesRequest) Descriptor() ([]byte, []int) {
 }
 
 type UnlockTablesResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
 	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *UnlockTablesResponse) Reset() {
@@ -2006,16 +1985,15 @@ func (*UnlockTablesResponse) Descriptor() ([]byte, []int) {
 }
 
 type ExecuteQueryRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Query   []byte `protobuf:"bytes,1,opt,name=query,proto3" json:"query,omitempty"`
-	DbName  string `protobuf:"bytes,2,opt,name=db_name,json=dbName,proto3" json:"db_name,omitempty"`
-	MaxRows uint64 `protobuf:"varint,3,opt,name=max_rows,json=maxRows,proto3" json:"max_rows,omitempty"`
+	state   protoimpl.MessageState `protogen:"open.v1"`
+	Query   []byte                 `protobuf:"bytes,1,opt,name=query,proto3" json:"query,omitempty"`
+	DbName  string                 `protobuf:"bytes,2,opt,name=db_name,json=dbName,proto3" json:"db_name,omitempty"`
+	MaxRows uint64                 `protobuf:"varint,3,opt,name=max_rows,json=maxRows,proto3" json:"max_rows,omitempty"`
 	// caller_id identifies the caller. This is the effective caller ID,
 	// set by the application to further identify the caller.
-	CallerId *vtrpc.CallerID `protobuf:"bytes,4,opt,name=caller_id,json=callerId,proto3" json:"caller_id,omitempty"`
+	CallerId      *vtrpc.CallerID `protobuf:"bytes,4,opt,name=caller_id,json=callerId,proto3" json:"caller_id,omitempty"`
+	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *ExecuteQueryRequest) Reset() {
@@ -2077,11 +2055,10 @@ func (x *ExecuteQueryRequest) GetCallerId() *vtrpc.CallerID {
 }
 
 type ExecuteQueryResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	Result        *query.QueryResult     `protobuf:"bytes,1,opt,name=result,proto3" json:"result,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	Result *query.QueryResult `protobuf:"bytes,1,opt,name=result,proto3" json:"result,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *ExecuteQueryResponse) Reset() {
@@ -2122,16 +2099,15 @@ func (x *ExecuteQueryResponse) GetResult() *query.QueryResult {
 }
 
 type ExecuteFetchAsDbaRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Query                   []byte `protobuf:"bytes,1,opt,name=query,proto3" json:"query,omitempty"`
-	DbName                  string `protobuf:"bytes,2,opt,name=db_name,json=dbName,proto3" json:"db_name,omitempty"`
-	MaxRows                 uint64 `protobuf:"varint,3,opt,name=max_rows,json=maxRows,proto3" json:"max_rows,omitempty"`
-	DisableBinlogs          bool   `protobuf:"varint,4,opt,name=disable_binlogs,json=disableBinlogs,proto3" json:"disable_binlogs,omitempty"`
-	ReloadSchema            bool   `protobuf:"varint,5,opt,name=reload_schema,json=reloadSchema,proto3" json:"reload_schema,omitempty"`
-	DisableForeignKeyChecks bool   `protobuf:"varint,6,opt,name=disable_foreign_key_checks,json=disableForeignKeyChecks,proto3" json:"disable_foreign_key_checks,omitempty"`
+	state                   protoimpl.MessageState `protogen:"open.v1"`
+	Query                   []byte                 `protobuf:"bytes,1,opt,name=query,proto3" json:"query,omitempty"`
+	DbName                  string                 `protobuf:"bytes,2,opt,name=db_name,json=dbName,proto3" json:"db_name,omitempty"`
+	MaxRows                 uint64                 `protobuf:"varint,3,opt,name=max_rows,json=maxRows,proto3" json:"max_rows,omitempty"`
+	DisableBinlogs          bool                   `protobuf:"varint,4,opt,name=disable_binlogs,json=disableBinlogs,proto3" json:"disable_binlogs,omitempty"`
+	ReloadSchema            bool                   `protobuf:"varint,5,opt,name=reload_schema,json=reloadSchema,proto3" json:"reload_schema,omitempty"`
+	DisableForeignKeyChecks bool                   `protobuf:"varint,6,opt,name=disable_foreign_key_checks,json=disableForeignKeyChecks,proto3" json:"disable_foreign_key_checks,omitempty"`
+	unknownFields           protoimpl.UnknownFields
+	sizeCache               protoimpl.SizeCache
 }
 
 func (x *ExecuteFetchAsDbaRequest) Reset() {
@@ -2207,11 +2183,10 @@ func (x *ExecuteFetchAsDbaRequest) GetDisableForeignKeyChecks() bool {
 }
 
 type ExecuteFetchAsDbaResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	Result        *query.QueryResult     `protobuf:"bytes,1,opt,name=result,proto3" json:"result,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	Result *query.QueryResult `protobuf:"bytes,1,opt,name=result,proto3" json:"result,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *ExecuteFetchAsDbaResponse) Reset() {
@@ -2252,16 +2227,15 @@ func (x *ExecuteFetchAsDbaResponse) GetResult() *query.QueryResult {
 }
 
 type ExecuteMultiFetchAsDbaRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Sql                     []byte `protobuf:"bytes,1,opt,name=sql,proto3" json:"sql,omitempty"`
-	DbName                  string `protobuf:"bytes,2,opt,name=db_name,json=dbName,proto3" json:"db_name,omitempty"`
-	MaxRows                 uint64 `protobuf:"varint,3,opt,name=max_rows,json=maxRows,proto3" json:"max_rows,omitempty"`
-	DisableBinlogs          bool   `protobuf:"varint,4,opt,name=disable_binlogs,json=disableBinlogs,proto3" json:"disable_binlogs,omitempty"`
-	ReloadSchema            bool   `protobuf:"varint,5,opt,name=reload_schema,json=reloadSchema,proto3" json:"reload_schema,omitempty"`
-	DisableForeignKeyChecks bool   `protobuf:"varint,6,opt,name=disable_foreign_key_checks,json=disableForeignKeyChecks,proto3" json:"disable_foreign_key_checks,omitempty"`
+	state                   protoimpl.MessageState `protogen:"open.v1"`
+	Sql                     []byte                 `protobuf:"bytes,1,opt,name=sql,proto3" json:"sql,omitempty"`
+	DbName                  string                 `protobuf:"bytes,2,opt,name=db_name,json=dbName,proto3" json:"db_name,omitempty"`
+	MaxRows                 uint64                 `protobuf:"varint,3,opt,name=max_rows,json=maxRows,proto3" json:"max_rows,omitempty"`
+	DisableBinlogs          bool                   `protobuf:"varint,4,opt,name=disable_binlogs,json=disableBinlogs,proto3" json:"disable_binlogs,omitempty"`
+	ReloadSchema            bool                   `protobuf:"varint,5,opt,name=reload_schema,json=reloadSchema,proto3" json:"reload_schema,omitempty"`
+	DisableForeignKeyChecks bool                   `protobuf:"varint,6,opt,name=disable_foreign_key_checks,json=disableForeignKeyChecks,proto3" json:"disable_foreign_key_checks,omitempty"`
+	unknownFields           protoimpl.UnknownFields
+	sizeCache               protoimpl.SizeCache
 }
 
 func (x *ExecuteMultiFetchAsDbaRequest) Reset() {
@@ -2337,11 +2311,10 @@ func (x *ExecuteMultiFetchAsDbaRequest) GetDisableForeignKeyChecks() bool {
 }
 
 type ExecuteMultiFetchAsDbaResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	Results       []*query.QueryResult   `protobuf:"bytes,1,rep,name=results,proto3" json:"results,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	Results []*query.QueryResult `protobuf:"bytes,1,rep,name=results,proto3" json:"results,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *ExecuteMultiFetchAsDbaResponse) Reset() {
@@ -2382,14 +2355,13 @@ func (x *ExecuteMultiFetchAsDbaResponse) GetResults() []*query.QueryResult {
 }
 
 type ExecuteFetchAsAllPrivsRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	Query         []byte                 `protobuf:"bytes,1,opt,name=query,proto3" json:"query,omitempty"`
+	DbName        string                 `protobuf:"bytes,2,opt,name=db_name,json=dbName,proto3" json:"db_name,omitempty"`
+	MaxRows       uint64                 `protobuf:"varint,3,opt,name=max_rows,json=maxRows,proto3" json:"max_rows,omitempty"`
+	ReloadSchema  bool                   `protobuf:"varint,4,opt,name=reload_schema,json=reloadSchema,proto3" json:"reload_schema,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	Query        []byte `protobuf:"bytes,1,opt,name=query,proto3" json:"query,omitempty"`
-	DbName       string `protobuf:"bytes,2,opt,name=db_name,json=dbName,proto3" json:"db_name,omitempty"`
-	MaxRows      uint64 `protobuf:"varint,3,opt,name=max_rows,json=maxRows,proto3" json:"max_rows,omitempty"`
-	ReloadSchema bool   `protobuf:"varint,4,opt,name=reload_schema,json=reloadSchema,proto3" json:"reload_schema,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *ExecuteFetchAsAllPrivsRequest) Reset() {
@@ -2451,11 +2423,10 @@ func (x *ExecuteFetchAsAllPrivsRequest) GetReloadSchema() bool {
 }
 
 type ExecuteFetchAsAllPrivsResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	Result        *query.QueryResult     `protobuf:"bytes,1,opt,name=result,proto3" json:"result,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	Result *query.QueryResult `protobuf:"bytes,1,opt,name=result,proto3" json:"result,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *ExecuteFetchAsAllPrivsResponse) Reset() {
@@ -2496,12 +2467,11 @@ func (x *ExecuteFetchAsAllPrivsResponse) GetResult() *query.QueryResult {
 }
 
 type ExecuteFetchAsAppRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	Query         []byte                 `protobuf:"bytes,1,opt,name=query,proto3" json:"query,omitempty"`
+	MaxRows       uint64                 `protobuf:"varint,2,opt,name=max_rows,json=maxRows,proto3" json:"max_rows,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	Query   []byte `protobuf:"bytes,1,opt,name=query,proto3" json:"query,omitempty"`
-	MaxRows uint64 `protobuf:"varint,2,opt,name=max_rows,json=maxRows,proto3" json:"max_rows,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *ExecuteFetchAsAppRequest) Reset() {
@@ -2549,11 +2519,10 @@ func (x *ExecuteFetchAsAppRequest) GetMaxRows() uint64 {
 }
 
 type ExecuteFetchAsAppResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	Result        *query.QueryResult     `protobuf:"bytes,1,opt,name=result,proto3" json:"result,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	Result *query.QueryResult `protobuf:"bytes,1,opt,name=result,proto3" json:"result,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *ExecuteFetchAsAppResponse) Reset() {
@@ -2594,11 +2563,10 @@ func (x *ExecuteFetchAsAppResponse) GetResult() *query.QueryResult {
 }
 
 type GetUnresolvedTransactionsRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	AbandonAge    int64                  `protobuf:"varint,1,opt,name=abandon_age,json=abandonAge,proto3" json:"abandon_age,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	AbandonAge int64 `protobuf:"varint,1,opt,name=abandon_age,json=abandonAge,proto3" json:"abandon_age,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *GetUnresolvedTransactionsRequest) Reset() {
@@ -2639,11 +2607,10 @@ func (x *GetUnresolvedTransactionsRequest) GetAbandonAge() int64 {
 }
 
 type GetUnresolvedTransactionsResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState       `protogen:"open.v1"`
+	Transactions  []*query.TransactionMetadata `protobuf:"bytes,1,rep,name=transactions,proto3" json:"transactions,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	Transactions []*query.TransactionMetadata `protobuf:"bytes,1,rep,name=transactions,proto3" json:"transactions,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *GetUnresolvedTransactionsResponse) Reset() {
@@ -2684,11 +2651,10 @@ func (x *GetUnresolvedTransactionsResponse) GetTransactions() []*query.Transacti
 }
 
 type ReadTransactionRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	Dtid          string                 `protobuf:"bytes,1,opt,name=dtid,proto3" json:"dtid,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	Dtid string `protobuf:"bytes,1,opt,name=dtid,proto3" json:"dtid,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *ReadTransactionRequest) Reset() {
@@ -2729,11 +2695,10 @@ func (x *ReadTransactionRequest) GetDtid() string {
 }
 
 type ReadTransactionResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState     `protogen:"open.v1"`
+	Transaction   *query.TransactionMetadata `protobuf:"bytes,1,opt,name=transaction,proto3" json:"transaction,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	Transaction *query.TransactionMetadata `protobuf:"bytes,1,opt,name=transaction,proto3" json:"transaction,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *ReadTransactionResponse) Reset() {
@@ -2774,11 +2739,10 @@ func (x *ReadTransactionResponse) GetTransaction() *query.TransactionMetadata {
 }
 
 type GetTransactionInfoRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	Dtid          string                 `protobuf:"bytes,1,opt,name=dtid,proto3" json:"dtid,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	Dtid string `protobuf:"bytes,1,opt,name=dtid,proto3" json:"dtid,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *GetTransactionInfoRequest) Reset() {
@@ -2819,14 +2783,13 @@ func (x *GetTransactionInfoRequest) GetDtid() string {
 }
 
 type GetTransactionInfoResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	State         string                 `protobuf:"bytes,1,opt,name=state,proto3" json:"state,omitempty"`
+	Message       string                 `protobuf:"bytes,2,opt,name=message,proto3" json:"message,omitempty"`
+	TimeCreated   int64                  `protobuf:"varint,3,opt,name=time_created,json=timeCreated,proto3" json:"time_created,omitempty"`
+	Statements    []string               `protobuf:"bytes,4,rep,name=statements,proto3" json:"statements,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	State       string   `protobuf:"bytes,1,opt,name=state,proto3" json:"state,omitempty"`
-	Message     string   `protobuf:"bytes,2,opt,name=message,proto3" json:"message,omitempty"`
-	TimeCreated int64    `protobuf:"varint,3,opt,name=time_created,json=timeCreated,proto3" json:"time_created,omitempty"`
-	Statements  []string `protobuf:"bytes,4,rep,name=statements,proto3" json:"statements,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *GetTransactionInfoResponse) Reset() {
@@ -2888,12 +2851,11 @@ func (x *GetTransactionInfoResponse) GetStatements() []string {
 }
 
 type ConcludeTransactionRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	Dtid          string                 `protobuf:"bytes,1,opt,name=dtid,proto3" json:"dtid,omitempty"`
+	Mm            bool                   `protobuf:"varint,2,opt,name=mm,proto3" json:"mm,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	Dtid string `protobuf:"bytes,1,opt,name=dtid,proto3" json:"dtid,omitempty"`
-	Mm   bool   `protobuf:"varint,2,opt,name=mm,proto3" json:"mm,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *ConcludeTransactionRequest) Reset() {
@@ -2941,9 +2903,9 @@ func (x *ConcludeTransactionRequest) GetMm() bool {
 }
 
 type ConcludeTransactionResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
 	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *ConcludeTransactionResponse) Reset() {
@@ -2977,9 +2939,9 @@ func (*ConcludeTransactionResponse) Descriptor() ([]byte, []int) {
 }
 
 type MysqlHostMetricsRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
 	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *MysqlHostMetricsRequest) Reset() {
@@ -3013,11 +2975,10 @@ func (*MysqlHostMetricsRequest) Descriptor() ([]byte, []int) {
 }
 
 type MysqlHostMetricsResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState        `protogen:"open.v1"`
+	HostMetrics   *mysqlctl.HostMetricsResponse `protobuf:"bytes,1,opt,name=HostMetrics,proto3" json:"HostMetrics,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	HostMetrics *mysqlctl.HostMetricsResponse `protobuf:"bytes,1,opt,name=HostMetrics,proto3" json:"HostMetrics,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *MysqlHostMetricsResponse) Reset() {
@@ -3058,9 +3019,9 @@ func (x *MysqlHostMetricsResponse) GetHostMetrics() *mysqlctl.HostMetricsRespons
 }
 
 type ReplicationStatusRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
 	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *ReplicationStatusRequest) Reset() {
@@ -3094,11 +3055,10 @@ func (*ReplicationStatusRequest) Descriptor() ([]byte, []int) {
 }
 
 type ReplicationStatusResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState  `protogen:"open.v1"`
+	Status        *replicationdata.Status `protobuf:"bytes,1,opt,name=status,proto3" json:"status,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	Status *replicationdata.Status `protobuf:"bytes,1,opt,name=status,proto3" json:"status,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *ReplicationStatusResponse) Reset() {
@@ -3139,9 +3099,9 @@ func (x *ReplicationStatusResponse) GetStatus() *replicationdata.Status {
 }
 
 type PrimaryStatusRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
 	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *PrimaryStatusRequest) Reset() {
@@ -3175,11 +3135,10 @@ func (*PrimaryStatusRequest) Descriptor() ([]byte, []int) {
 }
 
 type PrimaryStatusResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState         `protogen:"open.v1"`
+	Status        *replicationdata.PrimaryStatus `protobuf:"bytes,1,opt,name=status,proto3" json:"status,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	Status *replicationdata.PrimaryStatus `protobuf:"bytes,1,opt,name=status,proto3" json:"status,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *PrimaryStatusResponse) Reset() {
@@ -3220,9 +3179,9 @@ func (x *PrimaryStatusResponse) GetStatus() *replicationdata.PrimaryStatus {
 }
 
 type PrimaryPositionRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
 	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *PrimaryPositionRequest) Reset() {
@@ -3256,11 +3215,10 @@ func (*PrimaryPositionRequest) Descriptor() ([]byte, []int) {
 }
 
 type PrimaryPositionResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	Position      string                 `protobuf:"bytes,1,opt,name=position,proto3" json:"position,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	Position string `protobuf:"bytes,1,opt,name=position,proto3" json:"position,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *PrimaryPositionResponse) Reset() {
@@ -3301,11 +3259,10 @@ func (x *PrimaryPositionResponse) GetPosition() string {
 }
 
 type WaitForPositionRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	Position      string                 `protobuf:"bytes,1,opt,name=position,proto3" json:"position,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	Position string `protobuf:"bytes,1,opt,name=position,proto3" json:"position,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *WaitForPositionRequest) Reset() {
@@ -3346,9 +3303,9 @@ func (x *WaitForPositionRequest) GetPosition() string {
 }
 
 type WaitForPositionResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
 	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *WaitForPositionResponse) Reset() {
@@ -3382,9 +3339,9 @@ func (*WaitForPositionResponse) Descriptor() ([]byte, []int) {
 }
 
 type StopReplicationRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
 	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *StopReplicationRequest) Reset() {
@@ -3418,9 +3375,9 @@ func (*StopReplicationRequest) Descriptor() ([]byte, []int) {
 }
 
 type StopReplicationResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
 	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *StopReplicationResponse) Reset() {
@@ -3454,12 +3411,11 @@ func (*StopReplicationResponse) Descriptor() ([]byte, []int) {
 }
 
 type StopReplicationMinimumRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	Position      string                 `protobuf:"bytes,1,opt,name=position,proto3" json:"position,omitempty"`
+	WaitTimeout   int64                  `protobuf:"varint,2,opt,name=wait_timeout,json=waitTimeout,proto3" json:"wait_timeout,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	Position    string `protobuf:"bytes,1,opt,name=position,proto3" json:"position,omitempty"`
-	WaitTimeout int64  `protobuf:"varint,2,opt,name=wait_timeout,json=waitTimeout,proto3" json:"wait_timeout,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *StopReplicationMinimumRequest) Reset() {
@@ -3507,11 +3463,10 @@ func (x *StopReplicationMinimumRequest) GetWaitTimeout() int64 {
 }
 
 type StopReplicationMinimumResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	Position      string                 `protobuf:"bytes,1,opt,name=position,proto3" json:"position,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	Position string `protobuf:"bytes,1,opt,name=position,proto3" json:"position,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *StopReplicationMinimumResponse) Reset() {
@@ -3552,11 +3507,10 @@ func (x *StopReplicationMinimumResponse) GetPosition() string {
 }
 
 type StartReplicationRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	SemiSync      bool                   `protobuf:"varint,1,opt,name=semiSync,proto3" json:"semiSync,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	SemiSync bool `protobuf:"varint,1,opt,name=semiSync,proto3" json:"semiSync,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *StartReplicationRequest) Reset() {
@@ -3597,9 +3551,9 @@ func (x *StartReplicationRequest) GetSemiSync() bool {
 }
 
 type StartReplicationResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
 	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *StartReplicationResponse) Reset() {
@@ -3633,12 +3587,11 @@ func (*StartReplicationResponse) Descriptor() ([]byte, []int) {
 }
 
 type StartReplicationUntilAfterRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	Position      string                 `protobuf:"bytes,1,opt,name=position,proto3" json:"position,omitempty"`
+	WaitTimeout   int64                  `protobuf:"varint,2,opt,name=wait_timeout,json=waitTimeout,proto3" json:"wait_timeout,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	Position    string `protobuf:"bytes,1,opt,name=position,proto3" json:"position,omitempty"`
-	WaitTimeout int64  `protobuf:"varint,2,opt,name=wait_timeout,json=waitTimeout,proto3" json:"wait_timeout,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *StartReplicationUntilAfterRequest) Reset() {
@@ -3686,9 +3639,9 @@ func (x *StartReplicationUntilAfterRequest) GetWaitTimeout() int64 {
 }
 
 type StartReplicationUntilAfterResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
 	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *StartReplicationUntilAfterResponse) Reset() {
@@ -3722,9 +3675,9 @@ func (*StartReplicationUntilAfterResponse) Descriptor() ([]byte, []int) {
 }
 
 type GetReplicasRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
 	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *GetReplicasRequest) Reset() {
@@ -3758,11 +3711,10 @@ func (*GetReplicasRequest) Descriptor() ([]byte, []int) {
 }
 
 type GetReplicasResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	Addrs         []string               `protobuf:"bytes,1,rep,name=addrs,proto3" json:"addrs,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	Addrs []string `protobuf:"bytes,1,rep,name=addrs,proto3" json:"addrs,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *GetReplicasResponse) Reset() {
@@ -3803,9 +3755,9 @@ func (x *GetReplicasResponse) GetAddrs() []string {
 }
 
 type ResetReplicationRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
 	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *ResetReplicationRequest) Reset() {
@@ -3839,9 +3791,9 @@ func (*ResetReplicationRequest) Descriptor() ([]byte, []int) {
 }
 
 type ResetReplicationResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
 	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *ResetReplicationResponse) Reset() {
@@ -3875,11 +3827,10 @@ func (*ResetReplicationResponse) Descriptor() ([]byte, []int) {
 }
 
 type VReplicationExecRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	Query         string                 `protobuf:"bytes,1,opt,name=query,proto3" json:"query,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	Query string `protobuf:"bytes,1,opt,name=query,proto3" json:"query,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *VReplicationExecRequest) Reset() {
@@ -3920,11 +3871,10 @@ func (x *VReplicationExecRequest) GetQuery() string {
 }
 
 type VReplicationExecResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	Result        *query.QueryResult     `protobuf:"bytes,1,opt,name=result,proto3" json:"result,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	Result *query.QueryResult `protobuf:"bytes,1,opt,name=result,proto3" json:"result,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *VReplicationExecResponse) Reset() {
@@ -3965,12 +3915,11 @@ func (x *VReplicationExecResponse) GetResult() *query.QueryResult {
 }
 
 type VReplicationWaitForPosRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	Id            int32                  `protobuf:"varint,1,opt,name=id,proto3" json:"id,omitempty"`
+	Position      string                 `protobuf:"bytes,2,opt,name=position,proto3" json:"position,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	Id       int32  `protobuf:"varint,1,opt,name=id,proto3" json:"id,omitempty"`
-	Position string `protobuf:"bytes,2,opt,name=position,proto3" json:"position,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *VReplicationWaitForPosRequest) Reset() {
@@ -4018,9 +3967,9 @@ func (x *VReplicationWaitForPosRequest) GetPosition() string {
 }
 
 type VReplicationWaitForPosResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
 	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *VReplicationWaitForPosResponse) Reset() {
@@ -4054,11 +4003,10 @@ func (*VReplicationWaitForPosResponse) Descriptor() ([]byte, []int) {
 }
 
 type InitPrimaryRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	SemiSync      bool                   `protobuf:"varint,1,opt,name=semiSync,proto3" json:"semiSync,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	SemiSync bool `protobuf:"varint,1,opt,name=semiSync,proto3" json:"semiSync,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *InitPrimaryRequest) Reset() {
@@ -4099,11 +4047,10 @@ func (x *InitPrimaryRequest) GetSemiSync() bool {
 }
 
 type InitPrimaryResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	Position      string                 `protobuf:"bytes,1,opt,name=position,proto3" json:"position,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	Position string `protobuf:"bytes,1,opt,name=position,proto3" json:"position,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *InitPrimaryResponse) Reset() {
@@ -4144,14 +4091,13 @@ func (x *InitPrimaryResponse) GetPosition() string {
 }
 
 type PopulateReparentJournalRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	TimeCreatedNs       int64                 `protobuf:"varint,1,opt,name=time_created_ns,json=timeCreatedNs,proto3" json:"time_created_ns,omitempty"`
-	ActionName          string                `protobuf:"bytes,2,opt,name=action_name,json=actionName,proto3" json:"action_name,omitempty"`
-	PrimaryAlias        *topodata.TabletAlias `protobuf:"bytes,3,opt,name=primary_alias,json=primaryAlias,proto3" json:"primary_alias,omitempty"`
-	ReplicationPosition string                `protobuf:"bytes,4,opt,name=replication_position,json=replicationPosition,proto3" json:"replication_position,omitempty"`
+	state               protoimpl.MessageState `protogen:"open.v1"`
+	TimeCreatedNs       int64                  `protobuf:"varint,1,opt,name=time_created_ns,json=timeCreatedNs,proto3" json:"time_created_ns,omitempty"`
+	ActionName          string                 `protobuf:"bytes,2,opt,name=action_name,json=actionName,proto3" json:"action_name,omitempty"`
+	PrimaryAlias        *topodata.TabletAlias  `protobuf:"bytes,3,opt,name=primary_alias,json=primaryAlias,proto3" json:"primary_alias,omitempty"`
+	ReplicationPosition string                 `protobuf:"bytes,4,opt,name=replication_position,json=replicationPosition,proto3" json:"replication_position,omitempty"`
+	unknownFields       protoimpl.UnknownFields
+	sizeCache           protoimpl.SizeCache
 }
 
 func (x *PopulateReparentJournalRequest) Reset() {
@@ -4213,9 +4159,9 @@ func (x *PopulateReparentJournalRequest) GetReplicationPosition() string {
 }
 
 type PopulateReparentJournalResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
 	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *PopulateReparentJournalResponse) Reset() {
@@ -4249,9 +4195,9 @@ func (*PopulateReparentJournalResponse) Descriptor() ([]byte, []int) {
 }
 
 type ReadReparentJournalInfoRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
 	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *ReadReparentJournalInfoRequest) Reset() {
@@ -4285,11 +4231,10 @@ func (*ReadReparentJournalInfoRequest) Descriptor() ([]byte, []int) {
 }
 
 type ReadReparentJournalInfoResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	Length        int32                  `protobuf:"varint,1,opt,name=length,proto3" json:"length,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	Length int32 `protobuf:"varint,1,opt,name=length,proto3" json:"length,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *ReadReparentJournalInfoResponse) Reset() {
@@ -4330,14 +4275,13 @@ func (x *ReadReparentJournalInfoResponse) GetLength() int32 {
 }
 
 type InitReplicaRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Parent              *topodata.TabletAlias `protobuf:"bytes,1,opt,name=parent,proto3" json:"parent,omitempty"`
-	ReplicationPosition string                `protobuf:"bytes,2,opt,name=replication_position,json=replicationPosition,proto3" json:"replication_position,omitempty"`
-	TimeCreatedNs       int64                 `protobuf:"varint,3,opt,name=time_created_ns,json=timeCreatedNs,proto3" json:"time_created_ns,omitempty"`
-	SemiSync            bool                  `protobuf:"varint,4,opt,name=semiSync,proto3" json:"semiSync,omitempty"`
+	state               protoimpl.MessageState `protogen:"open.v1"`
+	Parent              *topodata.TabletAlias  `protobuf:"bytes,1,opt,name=parent,proto3" json:"parent,omitempty"`
+	ReplicationPosition string                 `protobuf:"bytes,2,opt,name=replication_position,json=replicationPosition,proto3" json:"replication_position,omitempty"`
+	TimeCreatedNs       int64                  `protobuf:"varint,3,opt,name=time_created_ns,json=timeCreatedNs,proto3" json:"time_created_ns,omitempty"`
+	SemiSync            bool                   `protobuf:"varint,4,opt,name=semiSync,proto3" json:"semiSync,omitempty"`
+	unknownFields       protoimpl.UnknownFields
+	sizeCache           protoimpl.SizeCache
 }
 
 func (x *InitReplicaRequest) Reset() {
@@ -4399,9 +4343,9 @@ func (x *InitReplicaRequest) GetSemiSync() bool {
 }
 
 type InitReplicaResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
 	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *InitReplicaResponse) Reset() {
@@ -4435,9 +4379,9 @@ func (*InitReplicaResponse) Descriptor() ([]byte, []int) {
 }
 
 type DemotePrimaryRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
 	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *DemotePrimaryRequest) Reset() {
@@ -4471,12 +4415,11 @@ func (*DemotePrimaryRequest) Descriptor() ([]byte, []int) {
 }
 
 type DemotePrimaryResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
+	state protoimpl.MessageState `protogen:"open.v1"`
 	// PrimaryStatus represents the response from calling `SHOW BINARY LOG STATUS` on a primary that has been demoted.
 	PrimaryStatus *replicationdata.PrimaryStatus `protobuf:"bytes,2,opt,name=primary_status,json=primaryStatus,proto3" json:"primary_status,omitempty"`
+	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *DemotePrimaryResponse) Reset() {
@@ -4517,11 +4460,10 @@ func (x *DemotePrimaryResponse) GetPrimaryStatus() *replicationdata.PrimaryStatu
 }
 
 type UndoDemotePrimaryRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	SemiSync      bool                   `protobuf:"varint,1,opt,name=semiSync,proto3" json:"semiSync,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	SemiSync bool `protobuf:"varint,1,opt,name=semiSync,proto3" json:"semiSync,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *UndoDemotePrimaryRequest) Reset() {
@@ -4562,9 +4504,9 @@ func (x *UndoDemotePrimaryRequest) GetSemiSync() bool {
 }
 
 type UndoDemotePrimaryResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
 	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *UndoDemotePrimaryResponse) Reset() {
@@ -4598,9 +4540,9 @@ func (*UndoDemotePrimaryResponse) Descriptor() ([]byte, []int) {
 }
 
 type ReplicaWasPromotedRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
 	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *ReplicaWasPromotedRequest) Reset() {
@@ -4634,9 +4576,9 @@ func (*ReplicaWasPromotedRequest) Descriptor() ([]byte, []int) {
 }
 
 type ReplicaWasPromotedResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
 	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *ReplicaWasPromotedResponse) Reset() {
@@ -4670,9 +4612,9 @@ func (*ReplicaWasPromotedResponse) Descriptor() ([]byte, []int) {
 }
 
 type ResetReplicationParametersRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
 	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *ResetReplicationParametersRequest) Reset() {
@@ -4706,9 +4648,9 @@ func (*ResetReplicationParametersRequest) Descriptor() ([]byte, []int) {
 }
 
 type ResetReplicationParametersResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
 	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *ResetReplicationParametersResponse) Reset() {
@@ -4742,9 +4684,9 @@ func (*ResetReplicationParametersResponse) Descriptor() ([]byte, []int) {
 }
 
 type FullStatusRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
 	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *FullStatusRequest) Reset() {
@@ -4778,11 +4720,10 @@ func (*FullStatusRequest) Descriptor() ([]byte, []int) {
 }
 
 type FullStatusResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState      `protogen:"open.v1"`
+	Status        *replicationdata.FullStatus `protobuf:"bytes,1,opt,name=status,proto3" json:"status,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	Status *replicationdata.FullStatus `protobuf:"bytes,1,opt,name=status,proto3" json:"status,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *FullStatusResponse) Reset() {
@@ -4823,16 +4764,15 @@ func (x *FullStatusResponse) GetStatus() *replicationdata.FullStatus {
 }
 
 type SetReplicationSourceRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Parent                *topodata.TabletAlias `protobuf:"bytes,1,opt,name=parent,proto3" json:"parent,omitempty"`
-	TimeCreatedNs         int64                 `protobuf:"varint,2,opt,name=time_created_ns,json=timeCreatedNs,proto3" json:"time_created_ns,omitempty"`
-	ForceStartReplication bool                  `protobuf:"varint,3,opt,name=force_start_replication,json=forceStartReplication,proto3" json:"force_start_replication,omitempty"`
-	WaitPosition          string                `protobuf:"bytes,4,opt,name=wait_position,json=waitPosition,proto3" json:"wait_position,omitempty"`
-	SemiSync              bool                  `protobuf:"varint,5,opt,name=semiSync,proto3" json:"semiSync,omitempty"`
-	HeartbeatInterval     float64               `protobuf:"fixed64,6,opt,name=heartbeat_interval,json=heartbeatInterval,proto3" json:"heartbeat_interval,omitempty"`
+	state                 protoimpl.MessageState `protogen:"open.v1"`
+	Parent                *topodata.TabletAlias  `protobuf:"bytes,1,opt,name=parent,proto3" json:"parent,omitempty"`
+	TimeCreatedNs         int64                  `protobuf:"varint,2,opt,name=time_created_ns,json=timeCreatedNs,proto3" json:"time_created_ns,omitempty"`
+	ForceStartReplication bool                   `protobuf:"varint,3,opt,name=force_start_replication,json=forceStartReplication,proto3" json:"force_start_replication,omitempty"`
+	WaitPosition          string                 `protobuf:"bytes,4,opt,name=wait_position,json=waitPosition,proto3" json:"wait_position,omitempty"`
+	SemiSync              bool                   `protobuf:"varint,5,opt,name=semiSync,proto3" json:"semiSync,omitempty"`
+	HeartbeatInterval     float64                `protobuf:"fixed64,6,opt,name=heartbeat_interval,json=heartbeatInterval,proto3" json:"heartbeat_interval,omitempty"`
+	unknownFields         protoimpl.UnknownFields
+	sizeCache             protoimpl.SizeCache
 }
 
 func (x *SetReplicationSourceRequest) Reset() {
@@ -4908,9 +4848,9 @@ func (x *SetReplicationSourceRequest) GetHeartbeatInterval() float64 {
 }
 
 type SetReplicationSourceResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
 	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *SetReplicationSourceResponse) Reset() {
@@ -4944,12 +4884,11 @@ func (*SetReplicationSourceResponse) Descriptor() ([]byte, []int) {
 }
 
 type ReplicaWasRestartedRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
+	state protoimpl.MessageState `protogen:"open.v1"`
 	// the parent alias the tablet should have
-	Parent *topodata.TabletAlias `protobuf:"bytes,1,opt,name=parent,proto3" json:"parent,omitempty"`
+	Parent        *topodata.TabletAlias `protobuf:"bytes,1,opt,name=parent,proto3" json:"parent,omitempty"`
+	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *ReplicaWasRestartedRequest) Reset() {
@@ -4990,9 +4929,9 @@ func (x *ReplicaWasRestartedRequest) GetParent() *topodata.TabletAlias {
 }
 
 type ReplicaWasRestartedResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
 	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *ReplicaWasRestartedResponse) Reset() {
@@ -5026,11 +4965,10 @@ func (*ReplicaWasRestartedResponse) Descriptor() ([]byte, []int) {
 }
 
 type StopReplicationAndGetStatusRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
+	state               protoimpl.MessageState              `protogen:"open.v1"`
 	StopReplicationMode replicationdata.StopReplicationMode `protobuf:"varint,1,opt,name=stop_replication_mode,json=stopReplicationMode,proto3,enum=replicationdata.StopReplicationMode" json:"stop_replication_mode,omitempty"`
+	unknownFields       protoimpl.UnknownFields
+	sizeCache           protoimpl.SizeCache
 }
 
 func (x *StopReplicationAndGetStatusRequest) Reset() {
@@ -5071,12 +5009,11 @@ func (x *StopReplicationAndGetStatusRequest) GetStopReplicationMode() replicatio
 }
 
 type StopReplicationAndGetStatusResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
+	state protoimpl.MessageState `protogen:"open.v1"`
 	// Status represents the replication status call right before, and right after telling the replica to stop.
-	Status *replicationdata.StopReplicationStatus `protobuf:"bytes,2,opt,name=status,proto3" json:"status,omitempty"`
+	Status        *replicationdata.StopReplicationStatus `protobuf:"bytes,2,opt,name=status,proto3" json:"status,omitempty"`
+	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *StopReplicationAndGetStatusResponse) Reset() {
@@ -5117,11 +5054,10 @@ func (x *StopReplicationAndGetStatusResponse) GetStatus() *replicationdata.StopR
 }
 
 type PromoteReplicaRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	SemiSync      bool                   `protobuf:"varint,1,opt,name=semiSync,proto3" json:"semiSync,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	SemiSync bool `protobuf:"varint,1,opt,name=semiSync,proto3" json:"semiSync,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *PromoteReplicaRequest) Reset() {
@@ -5162,11 +5098,10 @@ func (x *PromoteReplicaRequest) GetSemiSync() bool {
 }
 
 type PromoteReplicaResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	Position      string                 `protobuf:"bytes,1,opt,name=position,proto3" json:"position,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	Position string `protobuf:"bytes,1,opt,name=position,proto3" json:"position,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *PromoteReplicaResponse) Reset() {
@@ -5207,12 +5142,9 @@ func (x *PromoteReplicaResponse) GetPosition() string {
 }
 
 type BackupRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Concurrency  int32 `protobuf:"varint,1,opt,name=concurrency,proto3" json:"concurrency,omitempty"`
-	AllowPrimary bool  `protobuf:"varint,2,opt,name=allow_primary,json=allowPrimary,proto3" json:"allow_primary,omitempty"`
+	state        protoimpl.MessageState `protogen:"open.v1"`
+	Concurrency  int32                  `protobuf:"varint,1,opt,name=concurrency,proto3" json:"concurrency,omitempty"`
+	AllowPrimary bool                   `protobuf:"varint,2,opt,name=allow_primary,json=allowPrimary,proto3" json:"allow_primary,omitempty"`
 	// IncrementalFromPos indicates a position of a previous backup. When this value is non-empty
 	// then the backup becomes incremental and applies as of given position.
 	IncrementalFromPos string `protobuf:"bytes,3,opt,name=incremental_from_pos,json=incrementalFromPos,proto3" json:"incremental_from_pos,omitempty"`
@@ -5220,7 +5152,9 @@ type BackupRequest struct {
 	// so that it's a backup that can be used for an upgrade.
 	UpgradeSafe bool `protobuf:"varint,4,opt,name=upgrade_safe,json=upgradeSafe,proto3" json:"upgrade_safe,omitempty"`
 	// BackupEngine specifies if we want to use a particular backup engine for this backup request
-	BackupEngine *string `protobuf:"bytes,5,opt,name=backup_engine,json=backupEngine,proto3,oneof" json:"backup_engine,omitempty"`
+	BackupEngine  *string `protobuf:"bytes,5,opt,name=backup_engine,json=backupEngine,proto3,oneof" json:"backup_engine,omitempty"`
+	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *BackupRequest) Reset() {
@@ -5289,11 +5223,10 @@ func (x *BackupRequest) GetBackupEngine() string {
 }
 
 type BackupResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	Event         *logutil.Event         `protobuf:"bytes,1,opt,name=event,proto3" json:"event,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	Event *logutil.Event `protobuf:"bytes,1,opt,name=event,proto3" json:"event,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *BackupResponse) Reset() {
@@ -5334,11 +5267,8 @@ func (x *BackupResponse) GetEvent() *logutil.Event {
 }
 
 type RestoreFromBackupRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	BackupTime *vttime.Time `protobuf:"bytes,1,opt,name=backup_time,json=backupTime,proto3" json:"backup_time,omitempty"`
+	state      protoimpl.MessageState `protogen:"open.v1"`
+	BackupTime *vttime.Time           `protobuf:"bytes,1,opt,name=backup_time,json=backupTime,proto3" json:"backup_time,omitempty"`
 	// RestoreToPos indicates a position for a point-in-time recovery. The recovery
 	// is expected to utilize one full backup, followed by zero or more incremental backups,
 	// that reach the precise desired position
@@ -5350,6 +5280,8 @@ type RestoreFromBackupRequest struct {
 	RestoreToTimestamp *vttime.Time `protobuf:"bytes,4,opt,name=restore_to_timestamp,json=restoreToTimestamp,proto3" json:"restore_to_timestamp,omitempty"`
 	// AllowedBackupEngines, if present will filter out any backups taken with engines not included in the list
 	AllowedBackupEngines []string `protobuf:"bytes,5,rep,name=allowed_backup_engines,json=allowedBackupEngines,proto3" json:"allowed_backup_engines,omitempty"`
+	unknownFields        protoimpl.UnknownFields
+	sizeCache            protoimpl.SizeCache
 }
 
 func (x *RestoreFromBackupRequest) Reset() {
@@ -5418,11 +5350,10 @@ func (x *RestoreFromBackupRequest) GetAllowedBackupEngines() []string {
 }
 
 type RestoreFromBackupResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	Event         *logutil.Event         `protobuf:"bytes,1,opt,name=event,proto3" json:"event,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	Event *logutil.Event `protobuf:"bytes,1,opt,name=event,proto3" json:"event,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *RestoreFromBackupResponse) Reset() {
@@ -5463,10 +5394,7 @@ func (x *RestoreFromBackupResponse) GetEvent() *logutil.Event {
 }
 
 type CreateVReplicationWorkflowRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
+	state        protoimpl.MessageState     `protogen:"open.v1"`
 	Workflow     string                     `protobuf:"bytes,1,opt,name=workflow,proto3" json:"workflow,omitempty"`
 	BinlogSource []*binlogdata.BinlogSource `protobuf:"bytes,2,rep,name=binlog_source,json=binlogSource,proto3" json:"binlog_source,omitempty"`
 	// Optional parameters.
@@ -5484,6 +5412,8 @@ type CreateVReplicationWorkflowRequest struct {
 	// Should the workflow stop after the copy phase.
 	StopAfterCopy bool   `protobuf:"varint,10,opt,name=stop_after_copy,json=stopAfterCopy,proto3" json:"stop_after_copy,omitempty"`
 	Options       string `protobuf:"bytes,11,opt,name=options,proto3" json:"options,omitempty"`
+	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *CreateVReplicationWorkflowRequest) Reset() {
@@ -5594,11 +5524,10 @@ func (x *CreateVReplicationWorkflowRequest) GetOptions() string {
 }
 
 type CreateVReplicationWorkflowResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	Result        *query.QueryResult     `protobuf:"bytes,1,opt,name=result,proto3" json:"result,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	Result *query.QueryResult `protobuf:"bytes,1,opt,name=result,proto3" json:"result,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *CreateVReplicationWorkflowResponse) Reset() {
@@ -5639,16 +5568,15 @@ func (x *CreateVReplicationWorkflowResponse) GetResult() *query.QueryResult {
 }
 
 type DeleteTableDataRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
+	state protoimpl.MessageState `protogen:"open.v1"`
 	// The key is the table that we want to delete data from.
 	// The value is the filter or WHERE clause to use when deleting
 	// data in the table.
-	TableFilters map[string]string `protobuf:"bytes,1,rep,name=table_filters,json=tableFilters,proto3" json:"table_filters,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
+	TableFilters map[string]string `protobuf:"bytes,1,rep,name=table_filters,json=tableFilters,proto3" json:"table_filters,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
 	// BatchSize is the number of rows to delete in a single batch.
-	BatchSize int64 `protobuf:"varint,2,opt,name=batch_size,json=batchSize,proto3" json:"batch_size,omitempty"`
+	BatchSize     int64 `protobuf:"varint,2,opt,name=batch_size,json=batchSize,proto3" json:"batch_size,omitempty"`
+	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *DeleteTableDataRequest) Reset() {
@@ -5696,9 +5624,9 @@ func (x *DeleteTableDataRequest) GetBatchSize() int64 {
 }
 
 type DeleteTableDataResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
 	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *DeleteTableDataResponse) Reset() {
@@ -5732,11 +5660,10 @@ func (*DeleteTableDataResponse) Descriptor() ([]byte, []int) {
 }
 
 type DeleteVReplicationWorkflowRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	Workflow      string                 `protobuf:"bytes,1,opt,name=workflow,proto3" json:"workflow,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	Workflow string `protobuf:"bytes,1,opt,name=workflow,proto3" json:"workflow,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *DeleteVReplicationWorkflowRequest) Reset() {
@@ -5777,11 +5704,10 @@ func (x *DeleteVReplicationWorkflowRequest) GetWorkflow() string {
 }
 
 type DeleteVReplicationWorkflowResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	Result        *query.QueryResult     `protobuf:"bytes,1,opt,name=result,proto3" json:"result,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	Result *query.QueryResult `protobuf:"bytes,1,opt,name=result,proto3" json:"result,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *DeleteVReplicationWorkflowResponse) Reset() {
@@ -5822,9 +5748,9 @@ func (x *DeleteVReplicationWorkflowResponse) GetResult() *query.QueryResult {
 }
 
 type HasVReplicationWorkflowsRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
 	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *HasVReplicationWorkflowsRequest) Reset() {
@@ -5858,11 +5784,10 @@ func (*HasVReplicationWorkflowsRequest) Descriptor() ([]byte, []int) {
 }
 
 type HasVReplicationWorkflowsResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	Has           bool                   `protobuf:"varint,1,opt,name=has,proto3" json:"has,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	Has bool `protobuf:"varint,1,opt,name=has,proto3" json:"has,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *HasVReplicationWorkflowsResponse) Reset() {
@@ -5903,16 +5828,15 @@ func (x *HasVReplicationWorkflowsResponse) GetHas() bool {
 }
 
 type ReadVReplicationWorkflowsRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
+	state            protoimpl.MessageState                 `protogen:"open.v1"`
 	IncludeIds       []int32                                `protobuf:"varint,1,rep,packed,name=include_ids,json=includeIds,proto3" json:"include_ids,omitempty"`
 	IncludeWorkflows []string                               `protobuf:"bytes,2,rep,name=include_workflows,json=includeWorkflows,proto3" json:"include_workflows,omitempty"`
 	IncludeStates    []binlogdata.VReplicationWorkflowState `protobuf:"varint,3,rep,packed,name=include_states,json=includeStates,proto3,enum=binlogdata.VReplicationWorkflowState" json:"include_states,omitempty"`
 	ExcludeWorkflows []string                               `protobuf:"bytes,4,rep,name=exclude_workflows,json=excludeWorkflows,proto3" json:"exclude_workflows,omitempty"`
 	ExcludeStates    []binlogdata.VReplicationWorkflowState `protobuf:"varint,5,rep,packed,name=exclude_states,json=excludeStates,proto3,enum=binlogdata.VReplicationWorkflowState" json:"exclude_states,omitempty"`
 	ExcludeFrozen    bool                                   `protobuf:"varint,6,opt,name=exclude_frozen,json=excludeFrozen,proto3" json:"exclude_frozen,omitempty"`
+	unknownFields    protoimpl.UnknownFields
+	sizeCache        protoimpl.SizeCache
 }
 
 func (x *ReadVReplicationWorkflowsRequest) Reset() {
@@ -5988,11 +5912,10 @@ func (x *ReadVReplicationWorkflowsRequest) GetExcludeFrozen() bool {
 }
 
 type ReadVReplicationWorkflowsResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState              `protogen:"open.v1"`
+	Workflows     []*ReadVReplicationWorkflowResponse `protobuf:"bytes,1,rep,name=workflows,proto3" json:"workflows,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	Workflows []*ReadVReplicationWorkflowResponse `protobuf:"bytes,1,rep,name=workflows,proto3" json:"workflows,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *ReadVReplicationWorkflowsResponse) Reset() {
@@ -6033,11 +5956,10 @@ func (x *ReadVReplicationWorkflowsResponse) GetWorkflows() []*ReadVReplicationWo
 }
 
 type ReadVReplicationWorkflowRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	Workflow      string                 `protobuf:"bytes,1,opt,name=workflow,proto3" json:"workflow,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	Workflow string `protobuf:"bytes,1,opt,name=workflow,proto3" json:"workflow,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *ReadVReplicationWorkflowRequest) Reset() {
@@ -6078,10 +6000,7 @@ func (x *ReadVReplicationWorkflowRequest) GetWorkflow() string {
 }
 
 type ReadVReplicationWorkflowResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
+	state                     protoimpl.MessageState                     `protogen:"open.v1"`
 	Workflow                  string                                     `protobuf:"bytes,2,opt,name=workflow,proto3" json:"workflow,omitempty"`
 	Cells                     string                                     `protobuf:"bytes,3,opt,name=cells,proto3" json:"cells,omitempty"`
 	TabletTypes               []topodata.TabletType                      `protobuf:"varint,4,rep,packed,name=tablet_types,json=tabletTypes,proto3,enum=topodata.TabletType" json:"tablet_types,omitempty"`
@@ -6093,7 +6012,9 @@ type ReadVReplicationWorkflowResponse struct {
 	DeferSecondaryKeys        bool                                       `protobuf:"varint,10,opt,name=defer_secondary_keys,json=deferSecondaryKeys,proto3" json:"defer_secondary_keys,omitempty"`
 	Streams                   []*ReadVReplicationWorkflowResponse_Stream `protobuf:"bytes,11,rep,name=streams,proto3" json:"streams,omitempty"`
 	Options                   string                                     `protobuf:"bytes,12,opt,name=options,proto3" json:"options,omitempty"`
-	ConfigOverrides           map[string]string                          `protobuf:"bytes,13,rep,name=config_overrides,json=configOverrides,proto3" json:"config_overrides,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
+	ConfigOverrides           map[string]string                          `protobuf:"bytes,13,rep,name=config_overrides,json=configOverrides,proto3" json:"config_overrides,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
+	unknownFields             protoimpl.UnknownFields
+	sizeCache                 protoimpl.SizeCache
 }
 
 func (x *ReadVReplicationWorkflowResponse) Reset() {
@@ -6211,9 +6132,9 @@ func (x *ReadVReplicationWorkflowResponse) GetConfigOverrides() map[string]strin
 }
 
 type ValidateVReplicationPermissionsRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
 	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *ValidateVReplicationPermissionsRequest) Reset() {
@@ -6247,15 +6168,14 @@ func (*ValidateVReplicationPermissionsRequest) Descriptor() ([]byte, []int) {
 }
 
 type ValidateVReplicationPermissionsResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
+	state protoimpl.MessageState `protogen:"open.v1"`
 	// The --db_filtered_user on the tablet.
 	User string `protobuf:"bytes,1,opt,name=user,proto3" json:"user,omitempty"`
 	// Does the user have the minimum privileges needed to manage
 	// vreplication metadata.
-	Ok bool `protobuf:"varint,2,opt,name=ok,proto3" json:"ok,omitempty"`
+	Ok            bool `protobuf:"varint,2,opt,name=ok,proto3" json:"ok,omitempty"`
+	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *ValidateVReplicationPermissionsResponse) Reset() {
@@ -6303,16 +6223,15 @@ func (x *ValidateVReplicationPermissionsResponse) GetOk() bool {
 }
 
 type VDiffRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	Keyspace      string                 `protobuf:"bytes,1,opt,name=keyspace,proto3" json:"keyspace,omitempty"`
+	Workflow      string                 `protobuf:"bytes,2,opt,name=workflow,proto3" json:"workflow,omitempty"`
+	Action        string                 `protobuf:"bytes,3,opt,name=action,proto3" json:"action,omitempty"`
+	ActionArg     string                 `protobuf:"bytes,4,opt,name=action_arg,json=actionArg,proto3" json:"action_arg,omitempty"`
+	VdiffUuid     string                 `protobuf:"bytes,5,opt,name=vdiff_uuid,json=vdiffUuid,proto3" json:"vdiff_uuid,omitempty"`
+	Options       *VDiffOptions          `protobuf:"bytes,6,opt,name=options,proto3" json:"options,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	Keyspace  string        `protobuf:"bytes,1,opt,name=keyspace,proto3" json:"keyspace,omitempty"`
-	Workflow  string        `protobuf:"bytes,2,opt,name=workflow,proto3" json:"workflow,omitempty"`
-	Action    string        `protobuf:"bytes,3,opt,name=action,proto3" json:"action,omitempty"`
-	ActionArg string        `protobuf:"bytes,4,opt,name=action_arg,json=actionArg,proto3" json:"action_arg,omitempty"`
-	VdiffUuid string        `protobuf:"bytes,5,opt,name=vdiff_uuid,json=vdiffUuid,proto3" json:"vdiff_uuid,omitempty"`
-	Options   *VDiffOptions `protobuf:"bytes,6,opt,name=options,proto3" json:"options,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *VDiffRequest) Reset() {
@@ -6388,13 +6307,12 @@ func (x *VDiffRequest) GetOptions() *VDiffOptions {
 }
 
 type VDiffResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	Id            int64                  `protobuf:"varint,1,opt,name=id,proto3" json:"id,omitempty"`
+	Output        *query.QueryResult     `protobuf:"bytes,2,opt,name=output,proto3" json:"output,omitempty"`
+	VdiffUuid     string                 `protobuf:"bytes,3,opt,name=vdiff_uuid,json=vdiffUuid,proto3" json:"vdiff_uuid,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	Id        int64              `protobuf:"varint,1,opt,name=id,proto3" json:"id,omitempty"`
-	Output    *query.QueryResult `protobuf:"bytes,2,opt,name=output,proto3" json:"output,omitempty"`
-	VdiffUuid string             `protobuf:"bytes,3,opt,name=vdiff_uuid,json=vdiffUuid,proto3" json:"vdiff_uuid,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *VDiffResponse) Reset() {
@@ -6450,13 +6368,12 @@ func (x *VDiffResponse) GetVdiffUuid() string {
 
 // options that influence the tablet selected by the picker for streaming data from
 type VDiffPickerOptions struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	TabletTypes   string                 `protobuf:"bytes,1,opt,name=tablet_types,json=tabletTypes,proto3" json:"tablet_types,omitempty"`
+	SourceCell    string                 `protobuf:"bytes,2,opt,name=source_cell,json=sourceCell,proto3" json:"source_cell,omitempty"`
+	TargetCell    string                 `protobuf:"bytes,3,opt,name=target_cell,json=targetCell,proto3" json:"target_cell,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	TabletTypes string `protobuf:"bytes,1,opt,name=tablet_types,json=tabletTypes,proto3" json:"tablet_types,omitempty"`
-	SourceCell  string `protobuf:"bytes,2,opt,name=source_cell,json=sourceCell,proto3" json:"source_cell,omitempty"`
-	TargetCell  string `protobuf:"bytes,3,opt,name=target_cell,json=targetCell,proto3" json:"target_cell,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *VDiffPickerOptions) Reset() {
@@ -6512,15 +6429,14 @@ func (x *VDiffPickerOptions) GetTargetCell() string {
 
 // options that only influence how vdiff differences are reported
 type VDiffReportOptions struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	OnlyPks                 bool   `protobuf:"varint,1,opt,name=only_pks,json=onlyPks,proto3" json:"only_pks,omitempty"`
-	DebugQuery              bool   `protobuf:"varint,2,opt,name=debug_query,json=debugQuery,proto3" json:"debug_query,omitempty"`
-	Format                  string `protobuf:"bytes,3,opt,name=format,proto3" json:"format,omitempty"`
-	MaxSampleRows           int64  `protobuf:"varint,4,opt,name=max_sample_rows,json=maxSampleRows,proto3" json:"max_sample_rows,omitempty"`
-	RowDiffColumnTruncateAt int64  `protobuf:"varint,5,opt,name=row_diff_column_truncate_at,json=rowDiffColumnTruncateAt,proto3" json:"row_diff_column_truncate_at,omitempty"`
+	state                   protoimpl.MessageState `protogen:"open.v1"`
+	OnlyPks                 bool                   `protobuf:"varint,1,opt,name=only_pks,json=onlyPks,proto3" json:"only_pks,omitempty"`
+	DebugQuery              bool                   `protobuf:"varint,2,opt,name=debug_query,json=debugQuery,proto3" json:"debug_query,omitempty"`
+	Format                  string                 `protobuf:"bytes,3,opt,name=format,proto3" json:"format,omitempty"`
+	MaxSampleRows           int64                  `protobuf:"varint,4,opt,name=max_sample_rows,json=maxSampleRows,proto3" json:"max_sample_rows,omitempty"`
+	RowDiffColumnTruncateAt int64                  `protobuf:"varint,5,opt,name=row_diff_column_truncate_at,json=rowDiffColumnTruncateAt,proto3" json:"row_diff_column_truncate_at,omitempty"`
+	unknownFields           protoimpl.UnknownFields
+	sizeCache               protoimpl.SizeCache
 }
 
 func (x *VDiffReportOptions) Reset() {
@@ -6589,20 +6505,19 @@ func (x *VDiffReportOptions) GetRowDiffColumnTruncateAt() int64 {
 }
 
 type VDiffCoreOptions struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Tables                string `protobuf:"bytes,1,opt,name=tables,proto3" json:"tables,omitempty"`
-	AutoRetry             bool   `protobuf:"varint,2,opt,name=auto_retry,json=autoRetry,proto3" json:"auto_retry,omitempty"`
-	MaxRows               int64  `protobuf:"varint,3,opt,name=max_rows,json=maxRows,proto3" json:"max_rows,omitempty"`
-	Checksum              bool   `protobuf:"varint,4,opt,name=checksum,proto3" json:"checksum,omitempty"`
-	SamplePct             int64  `protobuf:"varint,5,opt,name=sample_pct,json=samplePct,proto3" json:"sample_pct,omitempty"`
-	TimeoutSeconds        int64  `protobuf:"varint,6,opt,name=timeout_seconds,json=timeoutSeconds,proto3" json:"timeout_seconds,omitempty"`
-	MaxExtraRowsToCompare int64  `protobuf:"varint,7,opt,name=max_extra_rows_to_compare,json=maxExtraRowsToCompare,proto3" json:"max_extra_rows_to_compare,omitempty"`
-	UpdateTableStats      bool   `protobuf:"varint,8,opt,name=update_table_stats,json=updateTableStats,proto3" json:"update_table_stats,omitempty"`
-	MaxDiffSeconds        int64  `protobuf:"varint,9,opt,name=max_diff_seconds,json=maxDiffSeconds,proto3" json:"max_diff_seconds,omitempty"`
-	AutoStart             *bool  `protobuf:"varint,10,opt,name=auto_start,json=autoStart,proto3,oneof" json:"auto_start,omitempty"`
+	state                 protoimpl.MessageState `protogen:"open.v1"`
+	Tables                string                 `protobuf:"bytes,1,opt,name=tables,proto3" json:"tables,omitempty"`
+	AutoRetry             bool                   `protobuf:"varint,2,opt,name=auto_retry,json=autoRetry,proto3" json:"auto_retry,omitempty"`
+	MaxRows               int64                  `protobuf:"varint,3,opt,name=max_rows,json=maxRows,proto3" json:"max_rows,omitempty"`
+	Checksum              bool                   `protobuf:"varint,4,opt,name=checksum,proto3" json:"checksum,omitempty"`
+	SamplePct             int64                  `protobuf:"varint,5,opt,name=sample_pct,json=samplePct,proto3" json:"sample_pct,omitempty"`
+	TimeoutSeconds        int64                  `protobuf:"varint,6,opt,name=timeout_seconds,json=timeoutSeconds,proto3" json:"timeout_seconds,omitempty"`
+	MaxExtraRowsToCompare int64                  `protobuf:"varint,7,opt,name=max_extra_rows_to_compare,json=maxExtraRowsToCompare,proto3" json:"max_extra_rows_to_compare,omitempty"`
+	UpdateTableStats      bool                   `protobuf:"varint,8,opt,name=update_table_stats,json=updateTableStats,proto3" json:"update_table_stats,omitempty"`
+	MaxDiffSeconds        int64                  `protobuf:"varint,9,opt,name=max_diff_seconds,json=maxDiffSeconds,proto3" json:"max_diff_seconds,omitempty"`
+	AutoStart             *bool                  `protobuf:"varint,10,opt,name=auto_start,json=autoStart,proto3,oneof" json:"auto_start,omitempty"`
+	unknownFields         protoimpl.UnknownFields
+	sizeCache             protoimpl.SizeCache
 }
 
 func (x *VDiffCoreOptions) Reset() {
@@ -6706,13 +6621,12 @@ func (x *VDiffCoreOptions) GetAutoStart() bool {
 }
 
 type VDiffOptions struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	PickerOptions *VDiffPickerOptions    `protobuf:"bytes,1,opt,name=picker_options,json=pickerOptions,proto3" json:"picker_options,omitempty"`
+	CoreOptions   *VDiffCoreOptions      `protobuf:"bytes,2,opt,name=core_options,json=coreOptions,proto3" json:"core_options,omitempty"`
+	ReportOptions *VDiffReportOptions    `protobuf:"bytes,3,opt,name=report_options,json=reportOptions,proto3" json:"report_options,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	PickerOptions *VDiffPickerOptions `protobuf:"bytes,1,opt,name=picker_options,json=pickerOptions,proto3" json:"picker_options,omitempty"`
-	CoreOptions   *VDiffCoreOptions   `protobuf:"bytes,2,opt,name=core_options,json=coreOptions,proto3" json:"core_options,omitempty"`
-	ReportOptions *VDiffReportOptions `protobuf:"bytes,3,opt,name=report_options,json=reportOptions,proto3" json:"report_options,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *VDiffOptions) Reset() {
@@ -6767,14 +6681,13 @@ func (x *VDiffOptions) GetReportOptions() *VDiffReportOptions {
 }
 
 type VDiffTableLastPK struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Target *query.QueryResult `protobuf:"bytes,1,opt,name=target,proto3" json:"target,omitempty"`
+	state  protoimpl.MessageState `protogen:"open.v1"`
+	Target *query.QueryResult     `protobuf:"bytes,1,opt,name=target,proto3" json:"target,omitempty"`
 	// If the source value is nil then it's the same as the target
 	// and the target value should be used for both.
-	Source *query.QueryResult `protobuf:"bytes,2,opt,name=source,proto3,oneof" json:"source,omitempty"`
+	Source        *query.QueryResult `protobuf:"bytes,2,opt,name=source,proto3,oneof" json:"source,omitempty"`
+	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *VDiffTableLastPK) Reset() {
@@ -6828,10 +6741,7 @@ func (x *VDiffTableLastPK) GetSource() *query.QueryResult {
 // TODO: leverage the optional modifier for these fields rather than using SimulatedNull
 // values: https://github.com/vitessio/vitess/issues/15627
 type UpdateVReplicationWorkflowRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
+	state                     protoimpl.MessageState                `protogen:"open.v1"`
 	Workflow                  string                                `protobuf:"bytes,1,opt,name=workflow,proto3" json:"workflow,omitempty"`
 	Cells                     []string                              `protobuf:"bytes,2,rep,name=cells,proto3" json:"cells,omitempty"`
 	TabletTypes               []topodata.TabletType                 `protobuf:"varint,3,rep,packed,name=tablet_types,json=tabletTypes,proto3,enum=topodata.TabletType" json:"tablet_types,omitempty"`
@@ -6839,8 +6749,10 @@ type UpdateVReplicationWorkflowRequest struct {
 	OnDdl                     *binlogdata.OnDDLAction               `protobuf:"varint,5,opt,name=on_ddl,json=onDdl,proto3,enum=binlogdata.OnDDLAction,oneof" json:"on_ddl,omitempty"`
 	State                     *binlogdata.VReplicationWorkflowState `protobuf:"varint,6,opt,name=state,proto3,enum=binlogdata.VReplicationWorkflowState,oneof" json:"state,omitempty"`
 	Shards                    []string                              `protobuf:"bytes,7,rep,name=shards,proto3" json:"shards,omitempty"`
-	ConfigOverrides           map[string]string                     `protobuf:"bytes,8,rep,name=config_overrides,json=configOverrides,proto3" json:"config_overrides,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
+	ConfigOverrides           map[string]string                     `protobuf:"bytes,8,rep,name=config_overrides,json=configOverrides,proto3" json:"config_overrides,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
 	Message                   *string                               `protobuf:"bytes,9,opt,name=message,proto3,oneof" json:"message,omitempty"`
+	unknownFields             protoimpl.UnknownFields
+	sizeCache                 protoimpl.SizeCache
 }
 
 func (x *UpdateVReplicationWorkflowRequest) Reset() {
@@ -6937,11 +6849,10 @@ func (x *UpdateVReplicationWorkflowRequest) GetMessage() string {
 }
 
 type UpdateVReplicationWorkflowResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	Result        *query.QueryResult     `protobuf:"bytes,1,opt,name=result,proto3" json:"result,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	Result *query.QueryResult `protobuf:"bytes,1,opt,name=result,proto3" json:"result,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *UpdateVReplicationWorkflowResponse) Reset() {
@@ -6988,16 +6899,15 @@ func (x *UpdateVReplicationWorkflowResponse) GetResult() *query.QueryResult {
 // TODO: leverage the optional modifier for these fields rather than using SimulatedNull
 // values: https://github.com/vitessio/vitess/issues/15627
 type UpdateVReplicationWorkflowsRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
+	state            protoimpl.MessageState                `protogen:"open.v1"`
 	AllWorkflows     bool                                  `protobuf:"varint,1,opt,name=all_workflows,json=allWorkflows,proto3" json:"all_workflows,omitempty"`
 	IncludeWorkflows []string                              `protobuf:"bytes,2,rep,name=include_workflows,json=includeWorkflows,proto3" json:"include_workflows,omitempty"`
 	ExcludeWorkflows []string                              `protobuf:"bytes,3,rep,name=exclude_workflows,json=excludeWorkflows,proto3" json:"exclude_workflows,omitempty"`
 	State            *binlogdata.VReplicationWorkflowState `protobuf:"varint,4,opt,name=state,proto3,enum=binlogdata.VReplicationWorkflowState,oneof" json:"state,omitempty"`
 	Message          *string                               `protobuf:"bytes,5,opt,name=message,proto3,oneof" json:"message,omitempty"`
 	StopPosition     *string                               `protobuf:"bytes,6,opt,name=stop_position,json=stopPosition,proto3,oneof" json:"stop_position,omitempty"`
+	unknownFields    protoimpl.UnknownFields
+	sizeCache        protoimpl.SizeCache
 }
 
 func (x *UpdateVReplicationWorkflowsRequest) Reset() {
@@ -7073,11 +6983,10 @@ func (x *UpdateVReplicationWorkflowsRequest) GetStopPosition() string {
 }
 
 type UpdateVReplicationWorkflowsResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	Result        *query.QueryResult     `protobuf:"bytes,1,opt,name=result,proto3" json:"result,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	Result *query.QueryResult `protobuf:"bytes,1,opt,name=result,proto3" json:"result,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *UpdateVReplicationWorkflowsResponse) Reset() {
@@ -7118,11 +7027,10 @@ func (x *UpdateVReplicationWorkflowsResponse) GetResult() *query.QueryResult {
 }
 
 type ResetSequencesRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	Tables        []string               `protobuf:"bytes,1,rep,name=tables,proto3" json:"tables,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	Tables []string `protobuf:"bytes,1,rep,name=tables,proto3" json:"tables,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *ResetSequencesRequest) Reset() {
@@ -7163,9 +7071,9 @@ func (x *ResetSequencesRequest) GetTables() []string {
 }
 
 type ResetSequencesResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
 	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *ResetSequencesResponse) Reset() {
@@ -7199,12 +7107,9 @@ func (*ResetSequencesResponse) Descriptor() ([]byte, []int) {
 }
 
 type CheckThrottlerRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	AppName string `protobuf:"bytes,1,opt,name=app_name,json=appName,proto3" json:"app_name,omitempty"`
-	Scope   string `protobuf:"bytes,2,opt,name=scope,proto3" json:"scope,omitempty"`
+	state   protoimpl.MessageState `protogen:"open.v1"`
+	AppName string                 `protobuf:"bytes,1,opt,name=app_name,json=appName,proto3" json:"app_name,omitempty"`
+	Scope   string                 `protobuf:"bytes,2,opt,name=scope,proto3" json:"scope,omitempty"`
 	// SkipRequestHeartbeats ensures this check does not renew heartbeat lease
 	SkipRequestHeartbeats bool `protobuf:"varint,3,opt,name=skip_request_heartbeats,json=skipRequestHeartbeats,proto3" json:"skip_request_heartbeats,omitempty"`
 	// OKIfNotExists asks the throttler to return OK even if the metric does not exist
@@ -7212,6 +7117,8 @@ type CheckThrottlerRequest struct {
 	// MultiMetricsEnabled is always set to "true" and is how a multi-metrics enabled replica
 	// throttler knows its being probed by a multi-metrics enabled primary vttablet.
 	MultiMetricsEnabled bool `protobuf:"varint,5,opt,name=multi_metrics_enabled,json=multiMetricsEnabled,proto3" json:"multi_metrics_enabled,omitempty"`
+	unknownFields       protoimpl.UnknownFields
+	sizeCache           protoimpl.SizeCache
 }
 
 func (x *CheckThrottlerRequest) Reset() {
@@ -7280,10 +7187,7 @@ func (x *CheckThrottlerRequest) GetMultiMetricsEnabled() bool {
 }
 
 type CheckThrottlerResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
+	state protoimpl.MessageState `protogen:"open.v1"`
 	// StatusCode is HTTP compliant response code (e.g. 200 for OK)
 	StatusCode int32 `protobuf:"varint,1,opt,name=status_code,json=statusCode,proto3" json:"status_code,omitempty"`
 	// Value is the metric value collected by the tablet
@@ -7299,13 +7203,15 @@ type CheckThrottlerResponse struct {
 	RecentlyChecked bool `protobuf:"varint,6,opt,name=recently_checked,json=recentlyChecked,proto3" json:"recently_checked,omitempty"`
 	// Metrics is a map (metric name -> metric value/error) so that the client has as much
 	// information as possible about all the checked metrics.
-	Metrics map[string]*CheckThrottlerResponse_Metric `protobuf:"bytes,7,rep,name=metrics,proto3" json:"metrics,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
+	Metrics map[string]*CheckThrottlerResponse_Metric `protobuf:"bytes,7,rep,name=metrics,proto3" json:"metrics,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
 	// AppName is the name of app that was matched by the throttler
 	AppName string `protobuf:"bytes,8,opt,name=app_name,json=appName,proto3" json:"app_name,omitempty"`
 	// Summary is a human readable analysis of the result
 	Summary string `protobuf:"bytes,9,opt,name=summary,proto3" json:"summary,omitempty"`
 	// ResponseCode is the enum representation of the response
-	ResponseCode CheckThrottlerResponseCode `protobuf:"varint,10,opt,name=response_code,json=responseCode,proto3,enum=tabletmanagerdata.CheckThrottlerResponseCode" json:"response_code,omitempty"`
+	ResponseCode  CheckThrottlerResponseCode `protobuf:"varint,10,opt,name=response_code,json=responseCode,proto3,enum=tabletmanagerdata.CheckThrottlerResponseCode" json:"response_code,omitempty"`
+	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *CheckThrottlerResponse) Reset() {
@@ -7409,9 +7315,9 @@ func (x *CheckThrottlerResponse) GetResponseCode() CheckThrottlerResponseCode {
 }
 
 type GetThrottlerStatusRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
 	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *GetThrottlerStatusRequest) Reset() {
@@ -7445,10 +7351,7 @@ func (*GetThrottlerStatusRequest) Descriptor() ([]byte, []int) {
 }
 
 type GetThrottlerStatusResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
+	state protoimpl.MessageState `protogen:"open.v1"`
 	// TabletAlias of probed tablet
 	TabletAlias string `protobuf:"bytes,1,opt,name=tablet_alias,json=tabletAlias,proto3" json:"tablet_alias,omitempty"`
 	Keyspace    string `protobuf:"bytes,2,opt,name=keyspace,proto3" json:"keyspace,omitempty"`
@@ -7473,18 +7376,20 @@ type GetThrottlerStatusResponse struct {
 	MetricNameUsedAsDefault string `protobuf:"bytes,11,opt,name=metric_name_used_as_default,json=metricNameUsedAsDefault,proto3" json:"metric_name_used_as_default,omitempty"`
 	// AggregatedMetrics is a map of metric names to their values/errors
 	// Names are, for example, "self", "self/lag", "shard/lag", "shard/loadavg", etc.
-	AggregatedMetrics map[string]*GetThrottlerStatusResponse_MetricResult `protobuf:"bytes,12,rep,name=aggregated_metrics,json=aggregatedMetrics,proto3" json:"aggregated_metrics,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
+	AggregatedMetrics map[string]*GetThrottlerStatusResponse_MetricResult `protobuf:"bytes,12,rep,name=aggregated_metrics,json=aggregatedMetrics,proto3" json:"aggregated_metrics,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
 	// MetricThresholds is a map of metric names to their thresholds.
-	MetricThresholds map[string]float64 `protobuf:"bytes,13,rep,name=metric_thresholds,json=metricThresholds,proto3" json:"metric_thresholds,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"fixed64,2,opt,name=value,proto3"`
+	MetricThresholds map[string]float64 `protobuf:"bytes,13,rep,name=metric_thresholds,json=metricThresholds,proto3" json:"metric_thresholds,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"fixed64,2,opt,name=value"`
 	// MetricsHealth is a map of metric names to their health status.
-	MetricsHealth map[string]*GetThrottlerStatusResponse_MetricHealth `protobuf:"bytes,14,rep,name=metrics_health,json=metricsHealth,proto3" json:"metrics_health,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
+	MetricsHealth map[string]*GetThrottlerStatusResponse_MetricHealth `protobuf:"bytes,14,rep,name=metrics_health,json=metricsHealth,proto3" json:"metrics_health,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
 	// ThrottledApps is a map of app names to their throttling rules
-	ThrottledApps map[string]*topodata.ThrottledAppRule `protobuf:"bytes,15,rep,name=throttled_apps,json=throttledApps,proto3" json:"throttled_apps,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
+	ThrottledApps map[string]*topodata.ThrottledAppRule `protobuf:"bytes,15,rep,name=throttled_apps,json=throttledApps,proto3" json:"throttled_apps,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
 	// AppCheckedMetrics is a map of app names to their assigned metrics
-	AppCheckedMetrics map[string]string `protobuf:"bytes,16,rep,name=app_checked_metrics,json=appCheckedMetrics,proto3" json:"app_checked_metrics,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
+	AppCheckedMetrics map[string]string `protobuf:"bytes,16,rep,name=app_checked_metrics,json=appCheckedMetrics,proto3" json:"app_checked_metrics,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
 	RecentlyChecked   bool              `protobuf:"varint,17,opt,name=recently_checked,json=recentlyChecked,proto3" json:"recently_checked,omitempty"`
 	// RecentApps is a map of app names to their recent check status
-	RecentApps map[string]*GetThrottlerStatusResponse_RecentApp `protobuf:"bytes,18,rep,name=recent_apps,json=recentApps,proto3" json:"recent_apps,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
+	RecentApps    map[string]*GetThrottlerStatusResponse_RecentApp `protobuf:"bytes,18,rep,name=recent_apps,json=recentApps,proto3" json:"recent_apps,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
+	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *GetThrottlerStatusResponse) Reset() {
@@ -7644,12 +7549,11 @@ func (x *GetThrottlerStatusResponse) GetRecentApps() map[string]*GetThrottlerSta
 }
 
 type ChangeTagsRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	Tags          map[string]string      `protobuf:"bytes,1,rep,name=tags,proto3" json:"tags,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
+	Replace       bool                   `protobuf:"varint,2,opt,name=replace,proto3" json:"replace,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	Tags    map[string]string `protobuf:"bytes,1,rep,name=tags,proto3" json:"tags,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
-	Replace bool              `protobuf:"varint,2,opt,name=replace,proto3" json:"replace,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *ChangeTagsRequest) Reset() {
@@ -7697,11 +7601,10 @@ func (x *ChangeTagsRequest) GetReplace() bool {
 }
 
 type ChangeTagsResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	Tags          map[string]string      `protobuf:"bytes,1,rep,name=tags,proto3" json:"tags,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
 	unknownFields protoimpl.UnknownFields
-
-	Tags map[string]string `protobuf:"bytes,1,rep,name=tags,proto3" json:"tags,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *ChangeTagsResponse) Reset() {
@@ -7742,10 +7645,7 @@ func (x *ChangeTagsResponse) GetTags() map[string]string {
 }
 
 type ReadVReplicationWorkflowResponse_Stream struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
+	state                protoimpl.MessageState               `protogen:"open.v1"`
 	Id                   int32                                `protobuf:"varint,1,opt,name=id,proto3" json:"id,omitempty"`
 	Bls                  *binlogdata.BinlogSource             `protobuf:"bytes,2,opt,name=bls,proto3" json:"bls,omitempty"`
 	Pos                  string                               `protobuf:"bytes,3,opt,name=pos,proto3" json:"pos,omitempty"`
@@ -7760,6 +7660,8 @@ type ReadVReplicationWorkflowResponse_Stream struct {
 	TimeHeartbeat        *vttime.Time                         `protobuf:"bytes,12,opt,name=time_heartbeat,json=timeHeartbeat,proto3" json:"time_heartbeat,omitempty"`
 	TimeThrottled        *vttime.Time                         `protobuf:"bytes,13,opt,name=time_throttled,json=timeThrottled,proto3" json:"time_throttled,omitempty"`
 	ComponentThrottled   string                               `protobuf:"bytes,14,opt,name=component_throttled,json=componentThrottled,proto3" json:"component_throttled,omitempty"`
+	unknownFields        protoimpl.UnknownFields
+	sizeCache            protoimpl.SizeCache
 }
 
 func (x *ReadVReplicationWorkflowResponse_Stream) Reset() {
@@ -7891,10 +7793,7 @@ func (x *ReadVReplicationWorkflowResponse_Stream) GetComponentThrottled() string
 }
 
 type CheckThrottlerResponse_Metric struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
+	state protoimpl.MessageState `protogen:"open.v1"`
 	// Name of the metric
 	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// StatusCode is HTTP compliant response code (e.g. 200 for OK)
@@ -7910,7 +7809,9 @@ type CheckThrottlerResponse_Metric struct {
 	// Scope used in this check
 	Scope string `protobuf:"bytes,7,opt,name=scope,proto3" json:"scope,omitempty"`
 	// ResponseCode is the enum representation of the response
-	ResponseCode CheckThrottlerResponseCode `protobuf:"varint,8,opt,name=response_code,json=responseCode,proto3,enum=tabletmanagerdata.CheckThrottlerResponseCode" json:"response_code,omitempty"`
+	ResponseCode  CheckThrottlerResponseCode `protobuf:"varint,8,opt,name=response_code,json=responseCode,proto3,enum=tabletmanagerdata.CheckThrottlerResponseCode" json:"response_code,omitempty"`
+	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *CheckThrottlerResponse_Metric) Reset() {
@@ -8000,12 +7901,11 @@ func (x *CheckThrottlerResponse_Metric) GetResponseCode() CheckThrottlerResponse
 }
 
 type GetThrottlerStatusResponse_MetricResult struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	Value         float64                `protobuf:"fixed64,1,opt,name=value,proto3" json:"value,omitempty"`
+	Error         string                 `protobuf:"bytes,2,opt,name=error,proto3" json:"error,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	Value float64 `protobuf:"fixed64,1,opt,name=value,proto3" json:"value,omitempty"`
-	Error string  `protobuf:"bytes,2,opt,name=error,proto3" json:"error,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *GetThrottlerStatusResponse_MetricResult) Reset() {
@@ -8053,12 +7953,11 @@ func (x *GetThrottlerStatusResponse_MetricResult) GetError() string {
 }
 
 type GetThrottlerStatusResponse_MetricHealth struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	LastHealthyAt           *vttime.Time `protobuf:"bytes,1,opt,name=last_healthy_at,json=lastHealthyAt,proto3" json:"last_healthy_at,omitempty"`
-	SecondsSinceLastHealthy int64        `protobuf:"varint,2,opt,name=seconds_since_last_healthy,json=secondsSinceLastHealthy,proto3" json:"seconds_since_last_healthy,omitempty"`
+	state                   protoimpl.MessageState `protogen:"open.v1"`
+	LastHealthyAt           *vttime.Time           `protobuf:"bytes,1,opt,name=last_healthy_at,json=lastHealthyAt,proto3" json:"last_healthy_at,omitempty"`
+	SecondsSinceLastHealthy int64                  `protobuf:"varint,2,opt,name=seconds_since_last_healthy,json=secondsSinceLastHealthy,proto3" json:"seconds_since_last_healthy,omitempty"`
+	unknownFields           protoimpl.UnknownFields
+	sizeCache               protoimpl.SizeCache
 }
 
 func (x *GetThrottlerStatusResponse_MetricHealth) Reset() {
@@ -8106,14 +8005,13 @@ func (x *GetThrottlerStatusResponse_MetricHealth) GetSecondsSinceLastHealthy() i
 }
 
 type GetThrottlerStatusResponse_RecentApp struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	CheckedAt  *vttime.Time `protobuf:"bytes,1,opt,name=checked_at,json=checkedAt,proto3" json:"checked_at,omitempty"`
-	StatusCode int32        `protobuf:"varint,2,opt,name=status_code,json=statusCode,proto3" json:"status_code,omitempty"`
+	state      protoimpl.MessageState `protogen:"open.v1"`
+	CheckedAt  *vttime.Time           `protobuf:"bytes,1,opt,name=checked_at,json=checkedAt,proto3" json:"checked_at,omitempty"`
+	StatusCode int32                  `protobuf:"varint,2,opt,name=status_code,json=statusCode,proto3" json:"status_code,omitempty"`
 	// ResponseCode is the enum representation of the response
-	ResponseCode CheckThrottlerResponseCode `protobuf:"varint,3,opt,name=response_code,json=responseCode,proto3,enum=tabletmanagerdata.CheckThrottlerResponseCode" json:"response_code,omitempty"`
+	ResponseCode  CheckThrottlerResponseCode `protobuf:"varint,3,opt,name=response_code,json=responseCode,proto3,enum=tabletmanagerdata.CheckThrottlerResponseCode" json:"response_code,omitempty"`
+	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *GetThrottlerStatusResponse_RecentApp) Reset() {
@@ -8169,7 +8067,7 @@ func (x *GetThrottlerStatusResponse_RecentApp) GetResponseCode() CheckThrottlerR
 
 var File_tabletmanagerdata_proto protoreflect.FileDescriptor
 
-var file_tabletmanagerdata_proto_rawDesc = []byte{
+var file_tabletmanagerdata_proto_rawDesc = string([]byte{
 	0x0a, 0x17, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x6d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x72, 0x64,
 	0x61, 0x74, 0x61, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x11, 0x74, 0x61, 0x62, 0x6c, 0x65,
 	0x74, 0x6d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x72, 0x64, 0x61, 0x74, 0x61, 0x1a, 0x10, 0x62, 0x69,
@@ -9354,16 +9252,16 @@ var file_tabletmanagerdata_proto_rawDesc = []byte{
 	0x74, 0x65, 0x73, 0x73, 0x2f, 0x67, 0x6f, 0x2f, 0x76, 0x74, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f,
 	0x2f, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x6d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x72, 0x64, 0x61,
 	0x74, 0x61, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
-}
+})
 
 var (
 	file_tabletmanagerdata_proto_rawDescOnce sync.Once
-	file_tabletmanagerdata_proto_rawDescData = file_tabletmanagerdata_proto_rawDesc
+	file_tabletmanagerdata_proto_rawDescData []byte
 )
 
 func file_tabletmanagerdata_proto_rawDescGZIP() []byte {
 	file_tabletmanagerdata_proto_rawDescOnce.Do(func() {
-		file_tabletmanagerdata_proto_rawDescData = protoimpl.X.CompressGZIP(file_tabletmanagerdata_proto_rawDescData)
+		file_tabletmanagerdata_proto_rawDescData = protoimpl.X.CompressGZIP(unsafe.Slice(unsafe.StringData(file_tabletmanagerdata_proto_rawDesc), len(file_tabletmanagerdata_proto_rawDesc)))
 	})
 	return file_tabletmanagerdata_proto_rawDescData
 }
@@ -9681,7 +9579,7 @@ func file_tabletmanagerdata_proto_init() {
 	out := protoimpl.TypeBuilder{
 		File: protoimpl.DescBuilder{
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
-			RawDescriptor: file_tabletmanagerdata_proto_rawDesc,
+			RawDescriptor: unsafe.Slice(unsafe.StringData(file_tabletmanagerdata_proto_rawDesc), len(file_tabletmanagerdata_proto_rawDesc)),
 			NumEnums:      2,
 			NumMessages:   166,
 			NumExtensions: 0,
@@ -9693,7 +9591,6 @@ func file_tabletmanagerdata_proto_init() {
 		MessageInfos:      file_tabletmanagerdata_proto_msgTypes,
 	}.Build()
 	File_tabletmanagerdata_proto = out.File
-	file_tabletmanagerdata_proto_rawDesc = nil
 	file_tabletmanagerdata_proto_goTypes = nil
 	file_tabletmanagerdata_proto_depIdxs = nil
 }
diff --git a/go/vt/proto/tabletmanagerdata/tabletmanagerdata_vtproto.pb.go b/go/vt/proto/tabletmanagerdata/tabletmanagerdata_vtproto.pb.go
index f56895605ab..dc7f132ec2e 100644
--- a/go/vt/proto/tabletmanagerdata/tabletmanagerdata_vtproto.pb.go
+++ b/go/vt/proto/tabletmanagerdata/tabletmanagerdata_vtproto.pb.go
@@ -1,5 +1,5 @@
 // Code generated by protoc-gen-go-vtproto. DO NOT EDIT.
-// protoc-gen-go-vtproto version: v0.6.1-0.20241011083415-71c992bc3c87
+// protoc-gen-go-vtproto version: v0.6.1-0.20241121165744-79df5c4772f2
 // source: tabletmanagerdata.proto
 
 package tabletmanagerdata
diff --git a/go/vt/proto/tabletmanagerservice/tabletmanagerservice.pb.go b/go/vt/proto/tabletmanagerservice/tabletmanagerservice.pb.go
index 7fc337a9da2..9b2db955f19 100644
--- a/go/vt/proto/tabletmanagerservice/tabletmanagerservice.pb.go
+++ b/go/vt/proto/tabletmanagerservice/tabletmanagerservice.pb.go
@@ -18,7 +18,7 @@
 
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.35.1
+// 	protoc-gen-go v1.36.4
 // 	protoc        v3.21.3
 // source: tabletmanagerservice.proto
 
@@ -28,6 +28,7 @@ import (
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
 	reflect "reflect"
+	unsafe "unsafe"
 	tabletmanagerdata "vitess.io/vitess/go/vt/proto/tabletmanagerdata"
 )
 
@@ -40,7 +41,7 @@ const (
 
 var File_tabletmanagerservice_proto protoreflect.FileDescriptor
 
-var file_tabletmanagerservice_proto_rawDesc = []byte{
+var file_tabletmanagerservice_proto_rawDesc = string([]byte{
 	0x0a, 0x1a, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x6d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x72, 0x73,
 	0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x14, 0x74, 0x61,
 	0x62, 0x6c, 0x65, 0x74, 0x6d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x72, 0x73, 0x65, 0x72, 0x76, 0x69,
@@ -524,7 +525,7 @@ var file_tabletmanagerservice_proto_rawDesc = []byte{
 	0x76, 0x74, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x6d,
 	0x61, 0x6e, 0x61, 0x67, 0x65, 0x72, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x62, 0x06, 0x70,
 	0x72, 0x6f, 0x74, 0x6f, 0x33,
-}
+})
 
 var file_tabletmanagerservice_proto_goTypes = []any{
 	(*tabletmanagerdata.PingRequest)(nil),                             // 0: tabletmanagerdata.PingRequest
@@ -813,7 +814,7 @@ func file_tabletmanagerservice_proto_init() {
 	out := protoimpl.TypeBuilder{
 		File: protoimpl.DescBuilder{
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
-			RawDescriptor: file_tabletmanagerservice_proto_rawDesc,
+			RawDescriptor: unsafe.Slice(unsafe.StringData(file_tabletmanagerservice_proto_rawDesc), len(file_tabletmanagerservice_proto_rawDesc)),
 			NumEnums:      0,
 			NumMessages:   0,
 			NumExtensions: 0,
@@ -823,7 +824,6 @@ func file_tabletmanagerservice_proto_init() {
 		DependencyIndexes: file_tabletmanagerservice_proto_depIdxs,
 	}.Build()
 	File_tabletmanagerservice_proto = out.File
-	file_tabletmanagerservice_proto_rawDesc = nil
 	file_tabletmanagerservice_proto_goTypes = nil
 	file_tabletmanagerservice_proto_depIdxs = nil
 }
diff --git a/go/vt/proto/throttlerdata/throttlerdata.pb.go b/go/vt/proto/throttlerdata/throttlerdata.pb.go
index 9a51319692f..fdbd091e45b 100644
--- a/go/vt/proto/throttlerdata/throttlerdata.pb.go
+++ b/go/vt/proto/throttlerdata/throttlerdata.pb.go
@@ -17,7 +17,7 @@
 
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.35.1
+// 	protoc-gen-go v1.36.4
 // 	protoc        v3.21.3
 // source: throttlerdata.proto
 
@@ -28,6 +28,7 @@ import (
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
 	reflect "reflect"
 	sync "sync"
+	unsafe "unsafe"
 )
 
 const (
@@ -39,9 +40,9 @@ const (
 
 // MaxRatesRequest is the payload for the MaxRates RPC.
 type MaxRatesRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
 	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *MaxRatesRequest) Reset() {
@@ -76,13 +77,12 @@ func (*MaxRatesRequest) Descriptor() ([]byte, []int) {
 
 // MaxRatesResponse is returned by the MaxRates RPC.
 type MaxRatesResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
+	state protoimpl.MessageState `protogen:"open.v1"`
 	// max_rates returns the max rate for each throttler. It's keyed by the
 	// throttler name.
-	Rates map[string]int64 `protobuf:"bytes,1,rep,name=rates,proto3" json:"rates,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"`
+	Rates         map[string]int64 `protobuf:"bytes,1,rep,name=rates,proto3" json:"rates,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"varint,2,opt,name=value"`
+	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *MaxRatesResponse) Reset() {
@@ -124,11 +124,10 @@ func (x *MaxRatesResponse) GetRates() map[string]int64 {
 
 // SetMaxRateRequest is the payload for the SetMaxRate RPC.
 type SetMaxRateRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	Rate          int64                  `protobuf:"varint,1,opt,name=rate,proto3" json:"rate,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	Rate int64 `protobuf:"varint,1,opt,name=rate,proto3" json:"rate,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *SetMaxRateRequest) Reset() {
@@ -170,12 +169,11 @@ func (x *SetMaxRateRequest) GetRate() int64 {
 
 // SetMaxRateResponse is returned by the SetMaxRate RPC.
 type SetMaxRateResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
+	state protoimpl.MessageState `protogen:"open.v1"`
 	// names is the list of throttler names which were updated.
-	Names []string `protobuf:"bytes,1,rep,name=names,proto3" json:"names,omitempty"`
+	Names         []string `protobuf:"bytes,1,rep,name=names,proto3" json:"names,omitempty"`
+	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *SetMaxRateResponse) Reset() {
@@ -219,10 +217,7 @@ func (x *SetMaxRateResponse) GetNames() []string {
 // MaxReplicationLagModule which adaptively adjusts the throttling rate based on
 // the observed replication lag across all replicas.
 type Configuration struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
+	state protoimpl.MessageState `protogen:"open.v1"`
 	// target_replication_lag_sec is the replication lag (in seconds) the
 	// MaxReplicationLagModule tries to aim for.
 	// If it is within the target, it tries to increase the throttler
@@ -300,6 +295,8 @@ type Configuration struct {
 	// rate must exceed 100*max_rate_approach_threshold for the throttler to increase the current
 	// limit.
 	MaxRateApproachThreshold float64 `protobuf:"fixed64,14,opt,name=max_rate_approach_threshold,json=maxRateApproachThreshold,proto3" json:"max_rate_approach_threshold,omitempty"`
+	unknownFields            protoimpl.UnknownFields
+	sizeCache                protoimpl.SizeCache
 }
 
 func (x *Configuration) Reset() {
@@ -432,13 +429,12 @@ func (x *Configuration) GetMaxRateApproachThreshold() float64 {
 
 // GetConfigurationRequest is the payload for the GetConfiguration RPC.
 type GetConfigurationRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
+	state protoimpl.MessageState `protogen:"open.v1"`
 	// throttler_name specifies which throttler to select. If empty, all active
 	// throttlers will be selected.
 	ThrottlerName string `protobuf:"bytes,1,opt,name=throttler_name,json=throttlerName,proto3" json:"throttler_name,omitempty"`
+	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *GetConfigurationRequest) Reset() {
@@ -480,13 +476,12 @@ func (x *GetConfigurationRequest) GetThrottlerName() string {
 
 // GetConfigurationResponse is returned by the GetConfiguration RPC.
 type GetConfigurationResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
+	state protoimpl.MessageState `protogen:"open.v1"`
 	// max_rates returns the configurations for each throttler.
 	// It's keyed by the throttler name.
-	Configurations map[string]*Configuration `protobuf:"bytes,1,rep,name=configurations,proto3" json:"configurations,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
+	Configurations map[string]*Configuration `protobuf:"bytes,1,rep,name=configurations,proto3" json:"configurations,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
+	unknownFields  protoimpl.UnknownFields
+	sizeCache      protoimpl.SizeCache
 }
 
 func (x *GetConfigurationResponse) Reset() {
@@ -528,10 +523,7 @@ func (x *GetConfigurationResponse) GetConfigurations() map[string]*Configuration
 
 // UpdateConfigurationRequest is the payload for the UpdateConfiguration RPC.
 type UpdateConfigurationRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
+	state protoimpl.MessageState `protogen:"open.v1"`
 	// throttler_name specifies which throttler to update. If empty, all active
 	// throttlers will be updated.
 	ThrottlerName string `protobuf:"bytes,1,opt,name=throttler_name,json=throttlerName,proto3" json:"throttler_name,omitempty"`
@@ -540,6 +532,8 @@ type UpdateConfigurationRequest struct {
 	// copy_zero_values specifies whether fields with zero values should be copied
 	// as well.
 	CopyZeroValues bool `protobuf:"varint,3,opt,name=copy_zero_values,json=copyZeroValues,proto3" json:"copy_zero_values,omitempty"`
+	unknownFields  protoimpl.UnknownFields
+	sizeCache      protoimpl.SizeCache
 }
 
 func (x *UpdateConfigurationRequest) Reset() {
@@ -595,12 +589,11 @@ func (x *UpdateConfigurationRequest) GetCopyZeroValues() bool {
 
 // UpdateConfigurationResponse is returned by the UpdateConfiguration RPC.
 type UpdateConfigurationResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
+	state protoimpl.MessageState `protogen:"open.v1"`
 	// names is the list of throttler names which were updated.
-	Names []string `protobuf:"bytes,1,rep,name=names,proto3" json:"names,omitempty"`
+	Names         []string `protobuf:"bytes,1,rep,name=names,proto3" json:"names,omitempty"`
+	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *UpdateConfigurationResponse) Reset() {
@@ -642,13 +635,12 @@ func (x *UpdateConfigurationResponse) GetNames() []string {
 
 // ResetConfigurationRequest is the payload for the ResetConfiguration RPC.
 type ResetConfigurationRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
+	state protoimpl.MessageState `protogen:"open.v1"`
 	// throttler_name specifies which throttler to reset. If empty, all active
 	// throttlers will be reset.
 	ThrottlerName string `protobuf:"bytes,1,opt,name=throttler_name,json=throttlerName,proto3" json:"throttler_name,omitempty"`
+	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *ResetConfigurationRequest) Reset() {
@@ -690,12 +682,11 @@ func (x *ResetConfigurationRequest) GetThrottlerName() string {
 
 // ResetConfigurationResponse is returned by the ResetConfiguration RPC.
 type ResetConfigurationResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
+	state protoimpl.MessageState `protogen:"open.v1"`
 	// names is the list of throttler names which were updated.
-	Names []string `protobuf:"bytes,1,rep,name=names,proto3" json:"names,omitempty"`
+	Names         []string `protobuf:"bytes,1,rep,name=names,proto3" json:"names,omitempty"`
+	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *ResetConfigurationResponse) Reset() {
@@ -737,7 +728,7 @@ func (x *ResetConfigurationResponse) GetNames() []string {
 
 var File_throttlerdata_proto protoreflect.FileDescriptor
 
-var file_throttlerdata_proto_rawDesc = []byte{
+var file_throttlerdata_proto_rawDesc = string([]byte{
 	0x0a, 0x13, 0x74, 0x68, 0x72, 0x6f, 0x74, 0x74, 0x6c, 0x65, 0x72, 0x64, 0x61, 0x74, 0x61, 0x2e,
 	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x0d, 0x74, 0x68, 0x72, 0x6f, 0x74, 0x74, 0x6c, 0x65, 0x72,
 	0x64, 0x61, 0x74, 0x61, 0x22, 0x11, 0x0a, 0x0f, 0x4d, 0x61, 0x78, 0x52, 0x61, 0x74, 0x65, 0x73,
@@ -851,16 +842,16 @@ var file_throttlerdata_proto_rawDesc = []byte{
 	0x74, 0x65, 0x73, 0x73, 0x2f, 0x67, 0x6f, 0x2f, 0x76, 0x74, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f,
 	0x2f, 0x74, 0x68, 0x72, 0x6f, 0x74, 0x74, 0x6c, 0x65, 0x72, 0x64, 0x61, 0x74, 0x61, 0x62, 0x06,
 	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
-}
+})
 
 var (
 	file_throttlerdata_proto_rawDescOnce sync.Once
-	file_throttlerdata_proto_rawDescData = file_throttlerdata_proto_rawDesc
+	file_throttlerdata_proto_rawDescData []byte
 )
 
 func file_throttlerdata_proto_rawDescGZIP() []byte {
 	file_throttlerdata_proto_rawDescOnce.Do(func() {
-		file_throttlerdata_proto_rawDescData = protoimpl.X.CompressGZIP(file_throttlerdata_proto_rawDescData)
+		file_throttlerdata_proto_rawDescData = protoimpl.X.CompressGZIP(unsafe.Slice(unsafe.StringData(file_throttlerdata_proto_rawDesc), len(file_throttlerdata_proto_rawDesc)))
 	})
 	return file_throttlerdata_proto_rawDescData
 }
@@ -902,7 +893,7 @@ func file_throttlerdata_proto_init() {
 	out := protoimpl.TypeBuilder{
 		File: protoimpl.DescBuilder{
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
-			RawDescriptor: file_throttlerdata_proto_rawDesc,
+			RawDescriptor: unsafe.Slice(unsafe.StringData(file_throttlerdata_proto_rawDesc), len(file_throttlerdata_proto_rawDesc)),
 			NumEnums:      0,
 			NumMessages:   13,
 			NumExtensions: 0,
@@ -913,7 +904,6 @@ func file_throttlerdata_proto_init() {
 		MessageInfos:      file_throttlerdata_proto_msgTypes,
 	}.Build()
 	File_throttlerdata_proto = out.File
-	file_throttlerdata_proto_rawDesc = nil
 	file_throttlerdata_proto_goTypes = nil
 	file_throttlerdata_proto_depIdxs = nil
 }
diff --git a/go/vt/proto/throttlerdata/throttlerdata_vtproto.pb.go b/go/vt/proto/throttlerdata/throttlerdata_vtproto.pb.go
index cdfb6ee66f8..870d23fe2a4 100644
--- a/go/vt/proto/throttlerdata/throttlerdata_vtproto.pb.go
+++ b/go/vt/proto/throttlerdata/throttlerdata_vtproto.pb.go
@@ -1,5 +1,5 @@
 // Code generated by protoc-gen-go-vtproto. DO NOT EDIT.
-// protoc-gen-go-vtproto version: v0.6.1-0.20241011083415-71c992bc3c87
+// protoc-gen-go-vtproto version: v0.6.1-0.20241121165744-79df5c4772f2
 // source: throttlerdata.proto
 
 package throttlerdata
diff --git a/go/vt/proto/throttlerservice/throttlerservice.pb.go b/go/vt/proto/throttlerservice/throttlerservice.pb.go
index ffa3808cf6b..b5256ae3430 100644
--- a/go/vt/proto/throttlerservice/throttlerservice.pb.go
+++ b/go/vt/proto/throttlerservice/throttlerservice.pb.go
@@ -18,7 +18,7 @@
 
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.35.1
+// 	protoc-gen-go v1.36.4
 // 	protoc        v3.21.3
 // source: throttlerservice.proto
 
@@ -28,6 +28,7 @@ import (
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
 	reflect "reflect"
+	unsafe "unsafe"
 	throttlerdata "vitess.io/vitess/go/vt/proto/throttlerdata"
 )
 
@@ -40,7 +41,7 @@ const (
 
 var File_throttlerservice_proto protoreflect.FileDescriptor
 
-var file_throttlerservice_proto_rawDesc = []byte{
+var file_throttlerservice_proto_rawDesc = string([]byte{
 	0x0a, 0x16, 0x74, 0x68, 0x72, 0x6f, 0x74, 0x74, 0x6c, 0x65, 0x72, 0x73, 0x65, 0x72, 0x76, 0x69,
 	0x63, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x10, 0x74, 0x68, 0x72, 0x6f, 0x74, 0x74,
 	0x6c, 0x65, 0x72, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x1a, 0x13, 0x74, 0x68, 0x72, 0x6f,
@@ -80,7 +81,7 @@ var file_throttlerservice_proto_rawDesc = []byte{
 	0x69, 0x6f, 0x2f, 0x76, 0x69, 0x74, 0x65, 0x73, 0x73, 0x2f, 0x67, 0x6f, 0x2f, 0x76, 0x74, 0x2f,
 	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x74, 0x68, 0x72, 0x6f, 0x74, 0x74, 0x6c, 0x65, 0x72, 0x73,
 	0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
-}
+})
 
 var file_throttlerservice_proto_goTypes = []any{
 	(*throttlerdata.MaxRatesRequest)(nil),             // 0: throttlerdata.MaxRatesRequest
@@ -121,7 +122,7 @@ func file_throttlerservice_proto_init() {
 	out := protoimpl.TypeBuilder{
 		File: protoimpl.DescBuilder{
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
-			RawDescriptor: file_throttlerservice_proto_rawDesc,
+			RawDescriptor: unsafe.Slice(unsafe.StringData(file_throttlerservice_proto_rawDesc), len(file_throttlerservice_proto_rawDesc)),
 			NumEnums:      0,
 			NumMessages:   0,
 			NumExtensions: 0,
@@ -131,7 +132,6 @@ func file_throttlerservice_proto_init() {
 		DependencyIndexes: file_throttlerservice_proto_depIdxs,
 	}.Build()
 	File_throttlerservice_proto = out.File
-	file_throttlerservice_proto_rawDesc = nil
 	file_throttlerservice_proto_goTypes = nil
 	file_throttlerservice_proto_depIdxs = nil
 }
diff --git a/go/vt/proto/topodata/cached_size.go b/go/vt/proto/topodata/cached_size.go
index 3feead01bae..165c9ee4226 100644
--- a/go/vt/proto/topodata/cached_size.go
+++ b/go/vt/proto/topodata/cached_size.go
@@ -27,10 +27,6 @@ func (cached *KeyRange) CachedSize(alloc bool) int64 {
 	if alloc {
 		size += int64(96)
 	}
-	// field unknownFields google.golang.org/protobuf/runtime/protoimpl.UnknownFields
-	{
-		size += hack.RuntimeAllocSize(int64(cap(cached.unknownFields)))
-	}
 	// field Start []byte
 	{
 		size += hack.RuntimeAllocSize(int64(cap(cached.Start)))
@@ -39,6 +35,10 @@ func (cached *KeyRange) CachedSize(alloc bool) int64 {
 	{
 		size += hack.RuntimeAllocSize(int64(cap(cached.End)))
 	}
+	// field unknownFields google.golang.org/protobuf/runtime/protoimpl.UnknownFields
+	{
+		size += hack.RuntimeAllocSize(int64(cap(cached.unknownFields)))
+	}
 	return size
 }
 func (cached *ThrottledAppRule) CachedSize(alloc bool) int64 {
@@ -49,13 +49,13 @@ func (cached *ThrottledAppRule) CachedSize(alloc bool) int64 {
 	if alloc {
 		size += int64(80)
 	}
-	// field unknownFields google.golang.org/protobuf/runtime/protoimpl.UnknownFields
-	{
-		size += hack.RuntimeAllocSize(int64(cap(cached.unknownFields)))
-	}
 	// field Name string
 	size += hack.RuntimeAllocSize(int64(len(cached.Name)))
 	// field ExpiresAt *vitess.io/vitess/go/vt/proto/vttime.Time
 	size += cached.ExpiresAt.CachedSize(true)
+	// field unknownFields google.golang.org/protobuf/runtime/protoimpl.UnknownFields
+	{
+		size += hack.RuntimeAllocSize(int64(cap(cached.unknownFields)))
+	}
 	return size
 }
diff --git a/go/vt/proto/topodata/topodata.pb.go b/go/vt/proto/topodata/topodata.pb.go
index fb0d8ec0ab8..15c25dd3a31 100644
--- a/go/vt/proto/topodata/topodata.pb.go
+++ b/go/vt/proto/topodata/topodata.pb.go
@@ -20,7 +20,7 @@
 
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.35.1
+// 	protoc-gen-go v1.36.4
 // 	protoc        v3.21.3
 // source: topodata.proto
 
@@ -31,6 +31,7 @@ import (
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
 	reflect "reflect"
 	sync "sync"
+	unsafe "unsafe"
 	vttime "vitess.io/vitess/go/vt/proto/vttime"
 )
 
@@ -244,12 +245,11 @@ func (ShardReplicationError_Type) EnumDescriptor() ([]byte, []int) {
 // KeyRange describes a range of sharding keys, when range-based
 // sharding is used.
 type KeyRange struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	Start         []byte                 `protobuf:"bytes,1,opt,name=start,proto3" json:"start,omitempty"`
+	End           []byte                 `protobuf:"bytes,2,opt,name=end,proto3" json:"end,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	Start []byte `protobuf:"bytes,1,opt,name=start,proto3" json:"start,omitempty"`
-	End   []byte `protobuf:"bytes,2,opt,name=end,proto3" json:"end,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *KeyRange) Reset() {
@@ -298,15 +298,14 @@ func (x *KeyRange) GetEnd() []byte {
 
 // TabletAlias is a globally unique tablet identifier.
 type TabletAlias struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
+	state protoimpl.MessageState `protogen:"open.v1"`
 	// cell is the cell (or datacenter) the tablet is in
 	Cell string `protobuf:"bytes,1,opt,name=cell,proto3" json:"cell,omitempty"`
 	// uid is a unique id for this tablet within the shard
 	// (this is the MySQL server id as well).
-	Uid uint32 `protobuf:"varint,2,opt,name=uid,proto3" json:"uid,omitempty"`
+	Uid           uint32 `protobuf:"varint,2,opt,name=uid,proto3" json:"uid,omitempty"`
+	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *TabletAlias) Reset() {
@@ -355,10 +354,7 @@ func (x *TabletAlias) GetUid() uint32 {
 
 // Tablet represents information about a running instance of vttablet.
 type Tablet struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
+	state protoimpl.MessageState `protogen:"open.v1"`
 	// alias is the unique name of the tablet.
 	Alias *TabletAlias `protobuf:"bytes,1,opt,name=alias,proto3" json:"alias,omitempty"`
 	// Fully qualified domain name of the host.
@@ -369,7 +365,7 @@ type Tablet struct {
 	// For accessing mysql port, use topoproto.MysqlPort to fetch, and
 	// topoproto.SetMysqlPort to set. These wrappers will ensure
 	// legacy behavior is supported.
-	PortMap map[string]int32 `protobuf:"bytes,4,rep,name=port_map,json=portMap,proto3" json:"port_map,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"`
+	PortMap map[string]int32 `protobuf:"bytes,4,rep,name=port_map,json=portMap,proto3" json:"port_map,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"varint,2,opt,name=value"`
 	// Keyspace name.
 	Keyspace string `protobuf:"bytes,5,opt,name=keyspace,proto3" json:"keyspace,omitempty"`
 	// Shard name. If range based sharding is used, it should match
@@ -383,7 +379,7 @@ type Tablet struct {
 	// normal "vt_" + keyspace.
 	DbNameOverride string `protobuf:"bytes,9,opt,name=db_name_override,json=dbNameOverride,proto3" json:"db_name_override,omitempty"`
 	// tablet tags
-	Tags map[string]string `protobuf:"bytes,10,rep,name=tags,proto3" json:"tags,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
+	Tags map[string]string `protobuf:"bytes,10,rep,name=tags,proto3" json:"tags,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
 	// MySQL hostname.
 	MysqlHostname string `protobuf:"bytes,12,opt,name=mysql_hostname,json=mysqlHostname,proto3" json:"mysql_hostname,omitempty"`
 	// MySQL port. Use topoproto.MysqlPort and topoproto.SetMysqlPort
@@ -401,6 +397,8 @@ type Tablet struct {
 	PrimaryTermStartTime *vttime.Time `protobuf:"bytes,14,opt,name=primary_term_start_time,json=primaryTermStartTime,proto3" json:"primary_term_start_time,omitempty"`
 	// default_conn_collation is the default connection collation used by this tablet.
 	DefaultConnCollation uint32 `protobuf:"varint,16,opt,name=default_conn_collation,json=defaultConnCollation,proto3" json:"default_conn_collation,omitempty"`
+	unknownFields        protoimpl.UnknownFields
+	sizeCache            protoimpl.SizeCache
 }
 
 func (x *Tablet) Reset() {
@@ -526,10 +524,7 @@ func (x *Tablet) GetDefaultConnCollation() uint32 {
 
 // A Shard contains data about a subset of the data whithin a keyspace.
 type Shard struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
+	state protoimpl.MessageState `protogen:"open.v1"`
 	// primary_alias is the tablet alias of the primary for the shard.
 	// If it is unset, then there is no primary in this shard yet.
 	// No lock is necessary to update this field, when for instance
@@ -568,6 +563,8 @@ type Shard struct {
 	// is_primary_serving sets whether this shard primary is serving traffic or not.
 	// The keyspace lock is always taken when changing this.
 	IsPrimaryServing bool `protobuf:"varint,7,opt,name=is_primary_serving,json=isPrimaryServing,proto3" json:"is_primary_serving,omitempty"`
+	unknownFields    protoimpl.UnknownFields
+	sizeCache        protoimpl.SizeCache
 }
 
 func (x *Shard) Reset() {
@@ -644,10 +641,7 @@ func (x *Shard) GetIsPrimaryServing() bool {
 
 // A Keyspace contains data about a keyspace.
 type Keyspace struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
+	state protoimpl.MessageState `protogen:"open.v1"`
 	// keyspace_type will determine how this keyspace is treated by
 	// vtgate / vschema. Normal keyspaces are routable by
 	// any query. Snapshot keyspaces are only accessible
@@ -671,6 +665,8 @@ type Keyspace struct {
 	// used for various system metadata that is stored in each
 	// tablet's mysqld instance.
 	SidecarDbName string `protobuf:"bytes,10,opt,name=sidecar_db_name,json=sidecarDbName,proto3" json:"sidecar_db_name,omitempty"`
+	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *Keyspace) Reset() {
@@ -748,13 +744,12 @@ func (x *Keyspace) GetSidecarDbName() string {
 // ShardReplication describes the MySQL replication relationships
 // whithin a cell.
 type ShardReplication struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
+	state protoimpl.MessageState `protogen:"open.v1"`
 	// Note there can be only one Node in this array
 	// for a given tablet.
-	Nodes []*ShardReplication_Node `protobuf:"bytes,1,rep,name=nodes,proto3" json:"nodes,omitempty"`
+	Nodes         []*ShardReplication_Node `protobuf:"bytes,1,rep,name=nodes,proto3" json:"nodes,omitempty"`
+	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *ShardReplication) Reset() {
@@ -797,14 +792,13 @@ func (x *ShardReplication) GetNodes() []*ShardReplication_Node {
 // ShardReplicationError describes the error being fixed by
 // ShardReplicationFix.
 type ShardReplicationError struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
+	state protoimpl.MessageState `protogen:"open.v1"`
 	// Type is the category of problem being fixed.
 	Type ShardReplicationError_Type `protobuf:"varint,1,opt,name=type,proto3,enum=topodata.ShardReplicationError_Type" json:"type,omitempty"`
 	// TabletAlias is the tablet record that has the problem.
-	TabletAlias *TabletAlias `protobuf:"bytes,2,opt,name=tablet_alias,json=tabletAlias,proto3" json:"tablet_alias,omitempty"`
+	TabletAlias   *TabletAlias `protobuf:"bytes,2,opt,name=tablet_alias,json=tabletAlias,proto3" json:"tablet_alias,omitempty"`
+	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *ShardReplicationError) Reset() {
@@ -853,13 +847,12 @@ func (x *ShardReplicationError) GetTabletAlias() *TabletAlias {
 
 // ShardReference is used as a pointer from a SrvKeyspace to a Shard
 type ShardReference struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
+	state protoimpl.MessageState `protogen:"open.v1"`
 	// Copied from Shard.
-	Name     string    `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
-	KeyRange *KeyRange `protobuf:"bytes,2,opt,name=key_range,json=keyRange,proto3" json:"key_range,omitempty"` // Disable query serving in this shard
+	Name          string    `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	KeyRange      *KeyRange `protobuf:"bytes,2,opt,name=key_range,json=keyRange,proto3" json:"key_range,omitempty"` // Disable query serving in this shard
+	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *ShardReference) Reset() {
@@ -908,15 +901,14 @@ func (x *ShardReference) GetKeyRange() *KeyRange {
 
 // ShardTabletControl is used as a pointer from a SrvKeyspace to a Shard
 type ShardTabletControl struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
+	state protoimpl.MessageState `protogen:"open.v1"`
 	// Copied from Shard.
 	Name     string    `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	KeyRange *KeyRange `protobuf:"bytes,2,opt,name=key_range,json=keyRange,proto3" json:"key_range,omitempty"`
 	// Disable query serving in this shard
 	QueryServiceDisabled bool `protobuf:"varint,3,opt,name=query_service_disabled,json=queryServiceDisabled,proto3" json:"query_service_disabled,omitempty"`
+	unknownFields        protoimpl.UnknownFields
+	sizeCache            protoimpl.SizeCache
 }
 
 func (x *ShardTabletControl) Reset() {
@@ -972,10 +964,7 @@ func (x *ShardTabletControl) GetQueryServiceDisabled() bool {
 
 // ThrottledAppRule defines an app-specific throttling rule, with expiration.
 type ThrottledAppRule struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
+	state protoimpl.MessageState `protogen:"open.v1"`
 	// Name of the app to be throttled, e.g. "vreplication" or "online-ddl"
 	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// Ratio defines how much the app should be throttled, range [0.0...1.0]. 1.0 means fully throttled. 0.0 means not throttled at all.
@@ -984,7 +973,9 @@ type ThrottledAppRule struct {
 	// ExpiresAt is the time at which the rule expires.
 	ExpiresAt *vttime.Time `protobuf:"bytes,3,opt,name=expires_at,json=expiresAt,proto3" json:"expires_at,omitempty"`
 	// Exempt indicates the app should never be throttled, even if the throttler is, in general, throttling other apps.
-	Exempt bool `protobuf:"varint,4,opt,name=exempt,proto3" json:"exempt,omitempty"`
+	Exempt        bool `protobuf:"varint,4,opt,name=exempt,proto3" json:"exempt,omitempty"`
+	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *ThrottledAppRule) Reset() {
@@ -1046,10 +1037,7 @@ func (x *ThrottledAppRule) GetExempt() bool {
 }
 
 type ThrottlerConfig struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
+	state protoimpl.MessageState `protogen:"open.v1"`
 	// Enabled indicates that the throttler is actually checking state for
 	// requests. When disabled, it automatically returns 200 OK for all
 	// checks.
@@ -1064,11 +1052,13 @@ type ThrottlerConfig struct {
 	// should behave like a /check-self.
 	CheckAsCheckSelf bool `protobuf:"varint,4,opt,name=check_as_check_self,json=checkAsCheckSelf,proto3" json:"check_as_check_self,omitempty"`
 	// ThrottledApps is a map of rules for app-specific throttling
-	ThrottledApps map[string]*ThrottledAppRule `protobuf:"bytes,5,rep,name=throttled_apps,json=throttledApps,proto3" json:"throttled_apps,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
+	ThrottledApps map[string]*ThrottledAppRule `protobuf:"bytes,5,rep,name=throttled_apps,json=throttledApps,proto3" json:"throttled_apps,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
 	// AppCheckedMetrics maps app names to the list of metrics that should be checked for that app
-	AppCheckedMetrics map[string]*ThrottlerConfig_MetricNames `protobuf:"bytes,6,rep,name=app_checked_metrics,json=appCheckedMetrics,proto3" json:"app_checked_metrics,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
+	AppCheckedMetrics map[string]*ThrottlerConfig_MetricNames `protobuf:"bytes,6,rep,name=app_checked_metrics,json=appCheckedMetrics,proto3" json:"app_checked_metrics,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
 	// MetricThresholds maps metric names to the threshold values that should be used for that metric
-	MetricThresholds map[string]float64 `protobuf:"bytes,7,rep,name=metric_thresholds,json=metricThresholds,proto3" json:"metric_thresholds,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"fixed64,2,opt,name=value,proto3"`
+	MetricThresholds map[string]float64 `protobuf:"bytes,7,rep,name=metric_thresholds,json=metricThresholds,proto3" json:"metric_thresholds,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"fixed64,2,opt,name=value"`
+	unknownFields    protoimpl.UnknownFields
+	sizeCache        protoimpl.SizeCache
 }
 
 func (x *ThrottlerConfig) Reset() {
@@ -1152,10 +1142,7 @@ func (x *ThrottlerConfig) GetMetricThresholds() map[string]float64 {
 
 // SrvKeyspace is a rollup node for the keyspace itself.
 type SrvKeyspace struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
+	state protoimpl.MessageState `protogen:"open.v1"`
 	// The partitions this keyspace is serving, per tablet type.
 	Partitions []*SrvKeyspace_KeyspacePartition `protobuf:"bytes,1,rep,name=partitions,proto3" json:"partitions,omitempty"`
 	// ThrottlerConfig has the configuration for the tablet server's
@@ -1163,6 +1150,8 @@ type SrvKeyspace struct {
 	// shards and tablets. This is copied from the global keyspace
 	// object.
 	ThrottlerConfig *ThrottlerConfig `protobuf:"bytes,6,opt,name=throttler_config,json=throttlerConfig,proto3" json:"throttler_config,omitempty"`
+	unknownFields   protoimpl.UnknownFields
+	sizeCache       protoimpl.SizeCache
 }
 
 func (x *SrvKeyspace) Reset() {
@@ -1213,10 +1202,7 @@ func (x *SrvKeyspace) GetThrottlerConfig() *ThrottlerConfig {
 // stored in the global topology server, and describe how to reach
 // local topology servers.
 type CellInfo struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
+	state protoimpl.MessageState `protogen:"open.v1"`
 	// ServerAddress contains the address of the server for the cell.
 	// The syntax of this field is topology implementation specific.
 	// For instance, for Zookeeper, it is a comma-separated list of
@@ -1224,7 +1210,9 @@ type CellInfo struct {
 	ServerAddress string `protobuf:"bytes,1,opt,name=server_address,json=serverAddress,proto3" json:"server_address,omitempty"`
 	// Root is the path to store data in. It is only used when talking
 	// to server_address.
-	Root string `protobuf:"bytes,2,opt,name=root,proto3" json:"root,omitempty"`
+	Root          string `protobuf:"bytes,2,opt,name=root,proto3" json:"root,omitempty"`
+	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *CellInfo) Reset() {
@@ -1273,12 +1261,11 @@ func (x *CellInfo) GetRoot() string {
 
 // CellsAlias
 type CellsAlias struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
+	state protoimpl.MessageState `protogen:"open.v1"`
 	// Cells that map to this alias
-	Cells []string `protobuf:"bytes,2,rep,name=cells,proto3" json:"cells,omitempty"`
+	Cells         []string `protobuf:"bytes,2,rep,name=cells,proto3" json:"cells,omitempty"`
+	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *CellsAlias) Reset() {
@@ -1319,13 +1306,12 @@ func (x *CellsAlias) GetCells() []string {
 }
 
 type TopoConfig struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	TopoType      string                 `protobuf:"bytes,1,opt,name=topo_type,json=topoType,proto3" json:"topo_type,omitempty"`
+	Server        string                 `protobuf:"bytes,2,opt,name=server,proto3" json:"server,omitempty"`
+	Root          string                 `protobuf:"bytes,3,opt,name=root,proto3" json:"root,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	TopoType string `protobuf:"bytes,1,opt,name=topo_type,json=topoType,proto3" json:"topo_type,omitempty"`
-	Server   string `protobuf:"bytes,2,opt,name=server,proto3" json:"server,omitempty"`
-	Root     string `protobuf:"bytes,3,opt,name=root,proto3" json:"root,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *TopoConfig) Reset() {
@@ -1380,11 +1366,10 @@ func (x *TopoConfig) GetRoot() string {
 }
 
 type ExternalVitessCluster struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	TopoConfig    *TopoConfig            `protobuf:"bytes,1,opt,name=topo_config,json=topoConfig,proto3" json:"topo_config,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	TopoConfig *TopoConfig `protobuf:"bytes,1,opt,name=topo_config,json=topoConfig,proto3" json:"topo_config,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *ExternalVitessCluster) Reset() {
@@ -1426,11 +1411,10 @@ func (x *ExternalVitessCluster) GetTopoConfig() *TopoConfig {
 
 // ExternalClusters
 type ExternalClusters struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
+	state         protoimpl.MessageState   `protogen:"open.v1"`
 	VitessCluster []*ExternalVitessCluster `protobuf:"bytes,1,rep,name=vitess_cluster,json=vitessCluster,proto3" json:"vitess_cluster,omitempty"`
+	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *ExternalClusters) Reset() {
@@ -1474,10 +1458,7 @@ func (x *ExternalClusters) GetVitessCluster() []*ExternalVitessCluster {
 // across shards. When this is used in a destination shard, the primary
 // of that shard will run filtered replication.
 type Shard_SourceShard struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
+	state protoimpl.MessageState `protogen:"open.v1"`
 	// Uid is the unique ID for this SourceShard object.
 	Uid int32 `protobuf:"varint,1,opt,name=uid,proto3" json:"uid,omitempty"`
 	// the source keyspace
@@ -1487,7 +1468,9 @@ type Shard_SourceShard struct {
 	// the source shard keyrange
 	KeyRange *KeyRange `protobuf:"bytes,4,opt,name=key_range,json=keyRange,proto3" json:"key_range,omitempty"`
 	// the source table list to replicate
-	Tables []string `protobuf:"bytes,5,rep,name=tables,proto3" json:"tables,omitempty"`
+	Tables        []string `protobuf:"bytes,5,rep,name=tables,proto3" json:"tables,omitempty"`
+	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *Shard_SourceShard) Reset() {
@@ -1557,17 +1540,16 @@ func (x *Shard_SourceShard) GetTables() []string {
 
 // TabletControl controls tablet's behavior
 type Shard_TabletControl struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
+	state protoimpl.MessageState `protogen:"open.v1"`
 	// which tablet type is affected
 	TabletType   TabletType `protobuf:"varint,1,opt,name=tablet_type,json=tabletType,proto3,enum=topodata.TabletType" json:"tablet_type,omitempty"`
 	Cells        []string   `protobuf:"bytes,2,rep,name=cells,proto3" json:"cells,omitempty"`
 	DeniedTables []string   `protobuf:"bytes,4,rep,name=denied_tables,json=deniedTables,proto3" json:"denied_tables,omitempty"`
 	// frozen is set if we've started failing over traffic for
 	// the primary. If set, this record should not be removed.
-	Frozen bool `protobuf:"varint,5,opt,name=frozen,proto3" json:"frozen,omitempty"`
+	Frozen        bool `protobuf:"varint,5,opt,name=frozen,proto3" json:"frozen,omitempty"`
+	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *Shard_TabletControl) Reset() {
@@ -1630,11 +1612,10 @@ func (x *Shard_TabletControl) GetFrozen() bool {
 
 // Node describes a tablet instance within the cell
 type ShardReplication_Node struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	TabletAlias   *TabletAlias           `protobuf:"bytes,1,opt,name=tablet_alias,json=tabletAlias,proto3" json:"tablet_alias,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	TabletAlias *TabletAlias `protobuf:"bytes,1,opt,name=tablet_alias,json=tabletAlias,proto3" json:"tablet_alias,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *ShardReplication_Node) Reset() {
@@ -1675,11 +1656,10 @@ func (x *ShardReplication_Node) GetTabletAlias() *TabletAlias {
 }
 
 type ThrottlerConfig_MetricNames struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	Names         []string               `protobuf:"bytes,1,rep,name=names,proto3" json:"names,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	Names []string `protobuf:"bytes,1,rep,name=names,proto3" json:"names,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *ThrottlerConfig_MetricNames) Reset() {
@@ -1720,16 +1700,15 @@ func (x *ThrottlerConfig_MetricNames) GetNames() []string {
 }
 
 type SrvKeyspace_KeyspacePartition struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
+	state protoimpl.MessageState `protogen:"open.v1"`
 	// The type this partition applies to.
 	ServedType TabletType `protobuf:"varint,1,opt,name=served_type,json=servedType,proto3,enum=topodata.TabletType" json:"served_type,omitempty"`
 	// List of non-overlapping continuous shards sorted by range.
 	ShardReferences []*ShardReference `protobuf:"bytes,2,rep,name=shard_references,json=shardReferences,proto3" json:"shard_references,omitempty"`
 	// List of shard tablet controls
 	ShardTabletControls []*ShardTabletControl `protobuf:"bytes,3,rep,name=shard_tablet_controls,json=shardTabletControls,proto3" json:"shard_tablet_controls,omitempty"`
+	unknownFields       protoimpl.UnknownFields
+	sizeCache           protoimpl.SizeCache
 }
 
 func (x *SrvKeyspace_KeyspacePartition) Reset() {
@@ -1785,7 +1764,7 @@ func (x *SrvKeyspace_KeyspacePartition) GetShardTabletControls() []*ShardTabletC
 
 var File_topodata_proto protoreflect.FileDescriptor
 
-var file_topodata_proto_rawDesc = []byte{
+var file_topodata_proto_rawDesc = string([]byte{
 	0x0a, 0x0e, 0x74, 0x6f, 0x70, 0x6f, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f,
 	0x12, 0x08, 0x74, 0x6f, 0x70, 0x6f, 0x64, 0x61, 0x74, 0x61, 0x1a, 0x0c, 0x76, 0x74, 0x74, 0x69,
 	0x6d, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x32, 0x0a, 0x08, 0x4b, 0x65, 0x79, 0x52,
@@ -2061,16 +2040,16 @@ var file_topodata_proto_rawDesc = []byte{
 	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, 0x74, 0x6f, 0x70, 0x6f, 0x64, 0x61, 0x74,
 	0x61, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
-}
+})
 
 var (
 	file_topodata_proto_rawDescOnce sync.Once
-	file_topodata_proto_rawDescData = file_topodata_proto_rawDesc
+	file_topodata_proto_rawDescData []byte
 )
 
 func file_topodata_proto_rawDescGZIP() []byte {
 	file_topodata_proto_rawDescOnce.Do(func() {
-		file_topodata_proto_rawDescData = protoimpl.X.CompressGZIP(file_topodata_proto_rawDescData)
+		file_topodata_proto_rawDescData = protoimpl.X.CompressGZIP(unsafe.Slice(unsafe.StringData(file_topodata_proto_rawDesc), len(file_topodata_proto_rawDesc)))
 	})
 	return file_topodata_proto_rawDescData
 }
@@ -2162,7 +2141,7 @@ func file_topodata_proto_init() {
 	out := protoimpl.TypeBuilder{
 		File: protoimpl.DescBuilder{
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
-			RawDescriptor: file_topodata_proto_rawDesc,
+			RawDescriptor: unsafe.Slice(unsafe.StringData(file_topodata_proto_rawDesc), len(file_topodata_proto_rawDesc)),
 			NumEnums:      3,
 			NumMessages:   27,
 			NumExtensions: 0,
@@ -2174,7 +2153,6 @@ func file_topodata_proto_init() {
 		MessageInfos:      file_topodata_proto_msgTypes,
 	}.Build()
 	File_topodata_proto = out.File
-	file_topodata_proto_rawDesc = nil
 	file_topodata_proto_goTypes = nil
 	file_topodata_proto_depIdxs = nil
 }
diff --git a/go/vt/proto/topodata/topodata_vtproto.pb.go b/go/vt/proto/topodata/topodata_vtproto.pb.go
index 564a55ea82b..9c13a6f5882 100644
--- a/go/vt/proto/topodata/topodata_vtproto.pb.go
+++ b/go/vt/proto/topodata/topodata_vtproto.pb.go
@@ -1,5 +1,5 @@
 // Code generated by protoc-gen-go-vtproto. DO NOT EDIT.
-// protoc-gen-go-vtproto version: v0.6.1-0.20241011083415-71c992bc3c87
+// protoc-gen-go-vtproto version: v0.6.1-0.20241121165744-79df5c4772f2
 // source: topodata.proto
 
 package topodata
diff --git a/go/vt/proto/vschema/vschema.pb.go b/go/vt/proto/vschema/vschema.pb.go
index c4348cae92d..60edc17e446 100644
--- a/go/vt/proto/vschema/vschema.pb.go
+++ b/go/vt/proto/vschema/vschema.pb.go
@@ -17,7 +17,7 @@
 
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.35.1
+// 	protoc-gen-go v1.36.4
 // 	protoc        v3.21.3
 // source: vschema.proto
 
@@ -28,6 +28,7 @@ import (
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
 	reflect "reflect"
 	sync "sync"
+	unsafe "unsafe"
 	query "vitess.io/vitess/go/vt/proto/query"
 )
 
@@ -92,14 +93,13 @@ func (Keyspace_ForeignKeyMode) EnumDescriptor() ([]byte, []int) {
 
 // RoutingRules specify the high level routing rules for the VSchema.
 type RoutingRules struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
+	state protoimpl.MessageState `protogen:"open.v1"`
 	// rules should ideally be a map. However protos dont't allow
 	// repeated fields as elements of a map. So, we use a list
 	// instead.
-	Rules []*RoutingRule `protobuf:"bytes,1,rep,name=rules,proto3" json:"rules,omitempty"`
+	Rules         []*RoutingRule `protobuf:"bytes,1,rep,name=rules,proto3" json:"rules,omitempty"`
+	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *RoutingRules) Reset() {
@@ -141,12 +141,11 @@ func (x *RoutingRules) GetRules() []*RoutingRule {
 
 // RoutingRule specifies a routing rule.
 type RoutingRule struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	FromTable     string                 `protobuf:"bytes,1,opt,name=from_table,json=fromTable,proto3" json:"from_table,omitempty"`
+	ToTables      []string               `protobuf:"bytes,2,rep,name=to_tables,json=toTables,proto3" json:"to_tables,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	FromTable string   `protobuf:"bytes,1,opt,name=from_table,json=fromTable,proto3" json:"from_table,omitempty"`
-	ToTables  []string `protobuf:"bytes,2,rep,name=to_tables,json=toTables,proto3" json:"to_tables,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *RoutingRule) Reset() {
@@ -195,20 +194,19 @@ func (x *RoutingRule) GetToTables() []string {
 
 // Keyspace is the vschema for a keyspace.
 type Keyspace struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
+	state protoimpl.MessageState `protogen:"open.v1"`
 	// If sharded is false, vindexes and tables are ignored.
 	Sharded  bool               `protobuf:"varint,1,opt,name=sharded,proto3" json:"sharded,omitempty"`
-	Vindexes map[string]*Vindex `protobuf:"bytes,2,rep,name=vindexes,proto3" json:"vindexes,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
-	Tables   map[string]*Table  `protobuf:"bytes,3,rep,name=tables,proto3" json:"tables,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
+	Vindexes map[string]*Vindex `protobuf:"bytes,2,rep,name=vindexes,proto3" json:"vindexes,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
+	Tables   map[string]*Table  `protobuf:"bytes,3,rep,name=tables,proto3" json:"tables,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
 	// If require_explicit_routing is true, vindexes and tables are not added to global routing
 	RequireExplicitRouting bool `protobuf:"varint,4,opt,name=require_explicit_routing,json=requireExplicitRouting,proto3" json:"require_explicit_routing,omitempty"`
 	// foreign_key_mode dictates how Vitess should handle foreign keys for this keyspace.
 	ForeignKeyMode Keyspace_ForeignKeyMode `protobuf:"varint,5,opt,name=foreign_key_mode,json=foreignKeyMode,proto3,enum=vschema.Keyspace_ForeignKeyMode" json:"foreign_key_mode,omitempty"`
 	// multi_tenant_mode specifies that the keyspace is multi-tenant. Currently used during migrations with MoveTables.
 	MultiTenantSpec *MultiTenantSpec `protobuf:"bytes,6,opt,name=multi_tenant_spec,json=multiTenantSpec,proto3" json:"multi_tenant_spec,omitempty"`
+	unknownFields   protoimpl.UnknownFields
+	sizeCache       protoimpl.SizeCache
 }
 
 func (x *Keyspace) Reset() {
@@ -284,14 +282,13 @@ func (x *Keyspace) GetMultiTenantSpec() *MultiTenantSpec {
 }
 
 type MultiTenantSpec struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
+	state protoimpl.MessageState `protogen:"open.v1"`
 	// tenant_column is the name of the column that specifies the tenant id.
 	TenantIdColumnName string `protobuf:"bytes,1,opt,name=tenant_id_column_name,json=tenantIdColumnName,proto3" json:"tenant_id_column_name,omitempty"`
 	// tenant_column_type is the type of the column that specifies the tenant id.
 	TenantIdColumnType query.Type `protobuf:"varint,2,opt,name=tenant_id_column_type,json=tenantIdColumnType,proto3,enum=query.Type" json:"tenant_id_column_type,omitempty"`
+	unknownFields      protoimpl.UnknownFields
+	sizeCache          protoimpl.SizeCache
 }
 
 func (x *MultiTenantSpec) Reset() {
@@ -340,10 +337,7 @@ func (x *MultiTenantSpec) GetTenantIdColumnType() query.Type {
 
 // Vindex is the vindex info for a Keyspace.
 type Vindex struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
+	state protoimpl.MessageState `protogen:"open.v1"`
 	// The type must match one of the predefined
 	// (or plugged in) vindex names.
 	Type string `protobuf:"bytes,1,opt,name=type,proto3" json:"type,omitempty"`
@@ -351,12 +345,14 @@ type Vindex struct {
 	// that must be defined as required by the
 	// vindex constructors. The values can only
 	// be strings.
-	Params map[string]string `protobuf:"bytes,2,rep,name=params,proto3" json:"params,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
+	Params map[string]string `protobuf:"bytes,2,rep,name=params,proto3" json:"params,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
 	// A lookup vindex can have an owner table defined.
 	// If so, rows in the lookup table are created or
 	// deleted in sync with corresponding rows in the
 	// owner table.
-	Owner string `protobuf:"bytes,3,opt,name=owner,proto3" json:"owner,omitempty"`
+	Owner         string `protobuf:"bytes,3,opt,name=owner,proto3" json:"owner,omitempty"`
+	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *Vindex) Reset() {
@@ -412,10 +408,7 @@ func (x *Vindex) GetOwner() string {
 
 // Table is the table info for a Keyspace.
 type Table struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
+	state protoimpl.MessageState `protogen:"open.v1"`
 	// If the table is a sequence, type must be
 	// "sequence".
 	//
@@ -442,7 +435,9 @@ type Table struct {
 	// us to expand 'select *' expressions.
 	ColumnListAuthoritative bool `protobuf:"varint,6,opt,name=column_list_authoritative,json=columnListAuthoritative,proto3" json:"column_list_authoritative,omitempty"`
 	// reference tables may optionally indicate their source table.
-	Source string `protobuf:"bytes,7,opt,name=source,proto3" json:"source,omitempty"`
+	Source        string `protobuf:"bytes,7,opt,name=source,proto3" json:"source,omitempty"`
+	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *Table) Reset() {
@@ -526,16 +521,15 @@ func (x *Table) GetSource() string {
 
 // ColumnVindex is used to associate a column to a vindex.
 type ColumnVindex struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
+	state protoimpl.MessageState `protogen:"open.v1"`
 	// Legacy implementation, moving forward all vindexes should define a list of columns.
 	Column string `protobuf:"bytes,1,opt,name=column,proto3" json:"column,omitempty"`
 	// The name must match a vindex defined in Keyspace.
 	Name string `protobuf:"bytes,2,opt,name=name,proto3" json:"name,omitempty"`
 	// List of columns that define this Vindex
-	Columns []string `protobuf:"bytes,3,rep,name=columns,proto3" json:"columns,omitempty"`
+	Columns       []string `protobuf:"bytes,3,rep,name=columns,proto3" json:"columns,omitempty"`
+	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *ColumnVindex) Reset() {
@@ -591,13 +585,12 @@ func (x *ColumnVindex) GetColumns() []string {
 
 // Autoincrement is used to designate a column as auto-inc.
 type AutoIncrement struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Column string `protobuf:"bytes,1,opt,name=column,proto3" json:"column,omitempty"`
+	state  protoimpl.MessageState `protogen:"open.v1"`
+	Column string                 `protobuf:"bytes,1,opt,name=column,proto3" json:"column,omitempty"`
 	// The sequence must match a table of type SEQUENCE.
-	Sequence string `protobuf:"bytes,2,opt,name=sequence,proto3" json:"sequence,omitempty"`
+	Sequence      string `protobuf:"bytes,2,opt,name=sequence,proto3" json:"sequence,omitempty"`
+	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *AutoIncrement) Reset() {
@@ -646,20 +639,19 @@ func (x *AutoIncrement) GetSequence() string {
 
 // Column describes a column.
 type Column struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Name          string     `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
-	Type          query.Type `protobuf:"varint,2,opt,name=type,proto3,enum=query.Type" json:"type,omitempty"`
-	Invisible     bool       `protobuf:"varint,3,opt,name=invisible,proto3" json:"invisible,omitempty"`
-	Default       string     `protobuf:"bytes,4,opt,name=default,proto3" json:"default,omitempty"`
-	CollationName string     `protobuf:"bytes,5,opt,name=collation_name,json=collationName,proto3" json:"collation_name,omitempty"`
-	Size          int32      `protobuf:"varint,6,opt,name=size,proto3" json:"size,omitempty"`
-	Scale         int32      `protobuf:"varint,7,opt,name=scale,proto3" json:"scale,omitempty"`
-	Nullable      *bool      `protobuf:"varint,8,opt,name=nullable,proto3,oneof" json:"nullable,omitempty"`
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	Name          string                 `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	Type          query.Type             `protobuf:"varint,2,opt,name=type,proto3,enum=query.Type" json:"type,omitempty"`
+	Invisible     bool                   `protobuf:"varint,3,opt,name=invisible,proto3" json:"invisible,omitempty"`
+	Default       string                 `protobuf:"bytes,4,opt,name=default,proto3" json:"default,omitempty"`
+	CollationName string                 `protobuf:"bytes,5,opt,name=collation_name,json=collationName,proto3" json:"collation_name,omitempty"`
+	Size          int32                  `protobuf:"varint,6,opt,name=size,proto3" json:"size,omitempty"`
+	Scale         int32                  `protobuf:"varint,7,opt,name=scale,proto3" json:"scale,omitempty"`
+	Nullable      *bool                  `protobuf:"varint,8,opt,name=nullable,proto3,oneof" json:"nullable,omitempty"`
 	// values contains the list of values for an enum or set column.
-	Values []string `protobuf:"bytes,9,rep,name=values,proto3" json:"values,omitempty"`
+	Values        []string `protobuf:"bytes,9,rep,name=values,proto3" json:"values,omitempty"`
+	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *Column) Reset() {
@@ -757,16 +749,15 @@ func (x *Column) GetValues() []string {
 
 // SrvVSchema is the roll-up of all the Keyspace schema for a cell.
 type SrvVSchema struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
+	state protoimpl.MessageState `protogen:"open.v1"`
 	// keyspaces is a map of keyspace name -> Keyspace object.
-	Keyspaces            map[string]*Keyspace  `protobuf:"bytes,1,rep,name=keyspaces,proto3" json:"keyspaces,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
+	Keyspaces            map[string]*Keyspace  `protobuf:"bytes,1,rep,name=keyspaces,proto3" json:"keyspaces,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
 	RoutingRules         *RoutingRules         `protobuf:"bytes,2,opt,name=routing_rules,json=routingRules,proto3" json:"routing_rules,omitempty"` // table routing rules
 	ShardRoutingRules    *ShardRoutingRules    `protobuf:"bytes,3,opt,name=shard_routing_rules,json=shardRoutingRules,proto3" json:"shard_routing_rules,omitempty"`
 	KeyspaceRoutingRules *KeyspaceRoutingRules `protobuf:"bytes,4,opt,name=keyspace_routing_rules,json=keyspaceRoutingRules,proto3" json:"keyspace_routing_rules,omitempty"`
 	MirrorRules          *MirrorRules          `protobuf:"bytes,5,opt,name=mirror_rules,json=mirrorRules,proto3" json:"mirror_rules,omitempty"` // mirror rules
+	unknownFields        protoimpl.UnknownFields
+	sizeCache            protoimpl.SizeCache
 }
 
 func (x *SrvVSchema) Reset() {
@@ -836,11 +827,10 @@ func (x *SrvVSchema) GetMirrorRules() *MirrorRules {
 
 // ShardRoutingRules specify the shard routing rules for the VSchema.
 type ShardRoutingRules struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	Rules         []*ShardRoutingRule    `protobuf:"bytes,1,rep,name=rules,proto3" json:"rules,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	Rules []*ShardRoutingRule `protobuf:"bytes,1,rep,name=rules,proto3" json:"rules,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *ShardRoutingRules) Reset() {
@@ -882,13 +872,12 @@ func (x *ShardRoutingRules) GetRules() []*ShardRoutingRule {
 
 // ShardRoutingRule specifies a routing rule.
 type ShardRoutingRule struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	FromKeyspace  string                 `protobuf:"bytes,1,opt,name=from_keyspace,json=fromKeyspace,proto3" json:"from_keyspace,omitempty"`
+	ToKeyspace    string                 `protobuf:"bytes,2,opt,name=to_keyspace,json=toKeyspace,proto3" json:"to_keyspace,omitempty"`
+	Shard         string                 `protobuf:"bytes,3,opt,name=shard,proto3" json:"shard,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	FromKeyspace string `protobuf:"bytes,1,opt,name=from_keyspace,json=fromKeyspace,proto3" json:"from_keyspace,omitempty"`
-	ToKeyspace   string `protobuf:"bytes,2,opt,name=to_keyspace,json=toKeyspace,proto3" json:"to_keyspace,omitempty"`
-	Shard        string `protobuf:"bytes,3,opt,name=shard,proto3" json:"shard,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *ShardRoutingRule) Reset() {
@@ -943,11 +932,10 @@ func (x *ShardRoutingRule) GetShard() string {
 }
 
 type KeyspaceRoutingRules struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	Rules         []*KeyspaceRoutingRule `protobuf:"bytes,1,rep,name=rules,proto3" json:"rules,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	Rules []*KeyspaceRoutingRule `protobuf:"bytes,1,rep,name=rules,proto3" json:"rules,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *KeyspaceRoutingRules) Reset() {
@@ -988,12 +976,11 @@ func (x *KeyspaceRoutingRules) GetRules() []*KeyspaceRoutingRule {
 }
 
 type KeyspaceRoutingRule struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	FromKeyspace  string                 `protobuf:"bytes,1,opt,name=from_keyspace,json=fromKeyspace,proto3" json:"from_keyspace,omitempty"`
+	ToKeyspace    string                 `protobuf:"bytes,2,opt,name=to_keyspace,json=toKeyspace,proto3" json:"to_keyspace,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	FromKeyspace string `protobuf:"bytes,1,opt,name=from_keyspace,json=fromKeyspace,proto3" json:"from_keyspace,omitempty"`
-	ToKeyspace   string `protobuf:"bytes,2,opt,name=to_keyspace,json=toKeyspace,proto3" json:"to_keyspace,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *KeyspaceRoutingRule) Reset() {
@@ -1042,14 +1029,13 @@ func (x *KeyspaceRoutingRule) GetToKeyspace() string {
 
 // MirrorRules specify the high level mirror rules for the VSchema.
 type MirrorRules struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
+	state protoimpl.MessageState `protogen:"open.v1"`
 	// rules should ideally be a map. However protos dont't allow
 	// repeated fields as elements of a map. So, we use a list
 	// instead.
-	Rules []*MirrorRule `protobuf:"bytes,1,rep,name=rules,proto3" json:"rules,omitempty"`
+	Rules         []*MirrorRule `protobuf:"bytes,1,rep,name=rules,proto3" json:"rules,omitempty"`
+	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *MirrorRules) Reset() {
@@ -1091,13 +1077,12 @@ func (x *MirrorRules) GetRules() []*MirrorRule {
 
 // MirrorRule specifies a mirror rule.
 type MirrorRule struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	FromTable     string                 `protobuf:"bytes,1,opt,name=from_table,json=fromTable,proto3" json:"from_table,omitempty"`
+	ToTable       string                 `protobuf:"bytes,2,opt,name=to_table,json=toTable,proto3" json:"to_table,omitempty"`
+	Percent       float32                `protobuf:"fixed32,3,opt,name=percent,proto3" json:"percent,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	FromTable string  `protobuf:"bytes,1,opt,name=from_table,json=fromTable,proto3" json:"from_table,omitempty"`
-	ToTable   string  `protobuf:"bytes,2,opt,name=to_table,json=toTable,proto3" json:"to_table,omitempty"`
-	Percent   float32 `protobuf:"fixed32,3,opt,name=percent,proto3" json:"percent,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *MirrorRule) Reset() {
@@ -1153,7 +1138,7 @@ func (x *MirrorRule) GetPercent() float32 {
 
 var File_vschema_proto protoreflect.FileDescriptor
 
-var file_vschema_proto_rawDesc = []byte{
+var file_vschema_proto_rawDesc = string([]byte{
 	0x0a, 0x0d, 0x76, 0x73, 0x63, 0x68, 0x65, 0x6d, 0x61, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12,
 	0x07, 0x76, 0x73, 0x63, 0x68, 0x65, 0x6d, 0x61, 0x1a, 0x0b, 0x71, 0x75, 0x65, 0x72, 0x79, 0x2e,
 	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x3a, 0x0a, 0x0c, 0x52, 0x6f, 0x75, 0x74, 0x69, 0x6e, 0x67,
@@ -1329,16 +1314,16 @@ var file_vschema_proto_rawDesc = []byte{
 	0x2e, 0x69, 0x6f, 0x2f, 0x76, 0x69, 0x74, 0x65, 0x73, 0x73, 0x2f, 0x67, 0x6f, 0x2f, 0x76, 0x74,
 	0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x76, 0x73, 0x63, 0x68, 0x65, 0x6d, 0x61, 0x62, 0x06,
 	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
-}
+})
 
 var (
 	file_vschema_proto_rawDescOnce sync.Once
-	file_vschema_proto_rawDescData = file_vschema_proto_rawDesc
+	file_vschema_proto_rawDescData []byte
 )
 
 func file_vschema_proto_rawDescGZIP() []byte {
 	file_vschema_proto_rawDescOnce.Do(func() {
-		file_vschema_proto_rawDescData = protoimpl.X.CompressGZIP(file_vschema_proto_rawDescData)
+		file_vschema_proto_rawDescData = protoimpl.X.CompressGZIP(unsafe.Slice(unsafe.StringData(file_vschema_proto_rawDesc), len(file_vschema_proto_rawDesc)))
 	})
 	return file_vschema_proto_rawDescData
 }
@@ -1409,7 +1394,7 @@ func file_vschema_proto_init() {
 	out := protoimpl.TypeBuilder{
 		File: protoimpl.DescBuilder{
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
-			RawDescriptor: file_vschema_proto_rawDesc,
+			RawDescriptor: unsafe.Slice(unsafe.StringData(file_vschema_proto_rawDesc), len(file_vschema_proto_rawDesc)),
 			NumEnums:      1,
 			NumMessages:   20,
 			NumExtensions: 0,
@@ -1421,7 +1406,6 @@ func file_vschema_proto_init() {
 		MessageInfos:      file_vschema_proto_msgTypes,
 	}.Build()
 	File_vschema_proto = out.File
-	file_vschema_proto_rawDesc = nil
 	file_vschema_proto_goTypes = nil
 	file_vschema_proto_depIdxs = nil
 }
diff --git a/go/vt/proto/vschema/vschema_vtproto.pb.go b/go/vt/proto/vschema/vschema_vtproto.pb.go
index a970ccf49c6..f2b0410d4af 100644
--- a/go/vt/proto/vschema/vschema_vtproto.pb.go
+++ b/go/vt/proto/vschema/vschema_vtproto.pb.go
@@ -1,5 +1,5 @@
 // Code generated by protoc-gen-go-vtproto. DO NOT EDIT.
-// protoc-gen-go-vtproto version: v0.6.1-0.20241011083415-71c992bc3c87
+// protoc-gen-go-vtproto version: v0.6.1-0.20241121165744-79df5c4772f2
 // source: vschema.proto
 
 package vschema
diff --git a/go/vt/proto/vtadmin/vtadmin.pb.go b/go/vt/proto/vtadmin/vtadmin.pb.go
index c086eb01443..642c8278202 100644
--- a/go/vt/proto/vtadmin/vtadmin.pb.go
+++ b/go/vt/proto/vtadmin/vtadmin.pb.go
@@ -17,7 +17,7 @@
 
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.35.1
+// 	protoc-gen-go v1.36.4
 // 	protoc        v3.21.3
 // source: vtadmin.proto
 
@@ -28,6 +28,7 @@ import (
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
 	reflect "reflect"
 	sync "sync"
+	unsafe "unsafe"
 	logutil "vitess.io/vitess/go/vt/proto/logutil"
 	mysqlctl "vitess.io/vitess/go/vt/proto/mysqlctl"
 	tabletmanagerdata "vitess.io/vitess/go/vt/proto/tabletmanagerdata"
@@ -94,12 +95,11 @@ func (Tablet_ServingState) EnumDescriptor() ([]byte, []int) {
 
 // Cluster represents information about a Vitess cluster.
 type Cluster struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	Id            string                 `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"`
+	Name          string                 `protobuf:"bytes,2,opt,name=name,proto3" json:"name,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	Id   string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"`
-	Name string `protobuf:"bytes,2,opt,name=name,proto3" json:"name,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *Cluster) Reset() {
@@ -147,12 +147,11 @@ func (x *Cluster) GetName() string {
 }
 
 type ClusterBackup struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	Cluster       *Cluster               `protobuf:"bytes,1,opt,name=cluster,proto3" json:"cluster,omitempty"`
+	Backup        *mysqlctl.BackupInfo   `protobuf:"bytes,2,opt,name=backup,proto3" json:"backup,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	Cluster *Cluster             `protobuf:"bytes,1,opt,name=cluster,proto3" json:"cluster,omitempty"`
-	Backup  *mysqlctl.BackupInfo `protobuf:"bytes,2,opt,name=backup,proto3" json:"backup,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *ClusterBackup) Reset() {
@@ -200,12 +199,11 @@ func (x *ClusterBackup) GetBackup() *mysqlctl.BackupInfo {
 }
 
 type ClusterCellsAliases struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState          `protogen:"open.v1"`
+	Cluster       *Cluster                        `protobuf:"bytes,1,opt,name=cluster,proto3" json:"cluster,omitempty"`
+	Aliases       map[string]*topodata.CellsAlias `protobuf:"bytes,2,rep,name=aliases,proto3" json:"aliases,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
 	unknownFields protoimpl.UnknownFields
-
-	Cluster *Cluster                        `protobuf:"bytes,1,opt,name=cluster,proto3" json:"cluster,omitempty"`
-	Aliases map[string]*topodata.CellsAlias `protobuf:"bytes,2,rep,name=aliases,proto3" json:"aliases,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *ClusterCellsAliases) Reset() {
@@ -253,16 +251,15 @@ func (x *ClusterCellsAliases) GetAliases() map[string]*topodata.CellsAlias {
 }
 
 type ClusterCellInfo struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Cluster *Cluster `protobuf:"bytes,1,opt,name=cluster,proto3" json:"cluster,omitempty"`
-	Name    string   `protobuf:"bytes,2,opt,name=name,proto3" json:"name,omitempty"`
+	state   protoimpl.MessageState `protogen:"open.v1"`
+	Cluster *Cluster               `protobuf:"bytes,1,opt,name=cluster,proto3" json:"cluster,omitempty"`
+	Name    string                 `protobuf:"bytes,2,opt,name=name,proto3" json:"name,omitempty"`
 	// CellInfo contains the data for the cell.
 	//
 	// It may be nil if the GetCellsInfosRequest specified NamesOnly.
-	CellInfo *topodata.CellInfo `protobuf:"bytes,3,opt,name=cell_info,json=cellInfo,proto3" json:"cell_info,omitempty"`
+	CellInfo      *topodata.CellInfo `protobuf:"bytes,3,opt,name=cell_info,json=cellInfo,proto3" json:"cell_info,omitempty"`
+	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *ClusterCellInfo) Reset() {
@@ -317,14 +314,13 @@ func (x *ClusterCellInfo) GetCellInfo() *topodata.CellInfo {
 }
 
 type ClusterShardReplicationPosition struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState                       `protogen:"open.v1"`
+	Cluster       *Cluster                                     `protobuf:"bytes,1,opt,name=cluster,proto3" json:"cluster,omitempty"`
+	Keyspace      string                                       `protobuf:"bytes,2,opt,name=keyspace,proto3" json:"keyspace,omitempty"`
+	Shard         string                                       `protobuf:"bytes,3,opt,name=shard,proto3" json:"shard,omitempty"`
+	PositionInfo  *vtctldata.ShardReplicationPositionsResponse `protobuf:"bytes,4,opt,name=position_info,json=positionInfo,proto3" json:"position_info,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	Cluster      *Cluster                                     `protobuf:"bytes,1,opt,name=cluster,proto3" json:"cluster,omitempty"`
-	Keyspace     string                                       `protobuf:"bytes,2,opt,name=keyspace,proto3" json:"keyspace,omitempty"`
-	Shard        string                                       `protobuf:"bytes,3,opt,name=shard,proto3" json:"shard,omitempty"`
-	PositionInfo *vtctldata.ShardReplicationPositionsResponse `protobuf:"bytes,4,opt,name=position_info,json=positionInfo,proto3" json:"position_info,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *ClusterShardReplicationPosition) Reset() {
@@ -386,14 +382,13 @@ func (x *ClusterShardReplicationPosition) GetPositionInfo() *vtctldata.ShardRepl
 }
 
 type ClusterWorkflows struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Workflows []*Workflow `protobuf:"bytes,1,rep,name=workflows,proto3" json:"workflows,omitempty"`
+	state     protoimpl.MessageState `protogen:"open.v1"`
+	Workflows []*Workflow            `protobuf:"bytes,1,rep,name=workflows,proto3" json:"workflows,omitempty"`
 	// Warnings is a list of non-fatal errors encountered when fetching
 	// workflows for a particular cluster.
-	Warnings []string `protobuf:"bytes,2,rep,name=warnings,proto3" json:"warnings,omitempty"`
+	Warnings      []string `protobuf:"bytes,2,rep,name=warnings,proto3" json:"warnings,omitempty"`
+	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *ClusterWorkflows) Reset() {
@@ -443,13 +438,12 @@ func (x *ClusterWorkflows) GetWarnings() []string {
 // Keyspace represents information about a keyspace in a particular Vitess
 // cluster.
 type Keyspace struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState      `protogen:"open.v1"`
+	Cluster       *Cluster                    `protobuf:"bytes,1,opt,name=cluster,proto3" json:"cluster,omitempty"`
+	Keyspace      *vtctldata.Keyspace         `protobuf:"bytes,2,opt,name=keyspace,proto3" json:"keyspace,omitempty"`
+	Shards        map[string]*vtctldata.Shard `protobuf:"bytes,3,rep,name=shards,proto3" json:"shards,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
 	unknownFields protoimpl.UnknownFields
-
-	Cluster  *Cluster                    `protobuf:"bytes,1,opt,name=cluster,proto3" json:"cluster,omitempty"`
-	Keyspace *vtctldata.Keyspace         `protobuf:"bytes,2,opt,name=keyspace,proto3" json:"keyspace,omitempty"`
-	Shards   map[string]*vtctldata.Shard `protobuf:"bytes,3,rep,name=shards,proto3" json:"shards,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *Keyspace) Reset() {
@@ -504,15 +498,14 @@ func (x *Keyspace) GetShards() map[string]*vtctldata.Shard {
 }
 
 type Schema struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
+	state            protoimpl.MessageState               `protogen:"open.v1"`
 	Cluster          *Cluster                             `protobuf:"bytes,1,opt,name=cluster,proto3" json:"cluster,omitempty"`
 	Keyspace         string                               `protobuf:"bytes,2,opt,name=keyspace,proto3" json:"keyspace,omitempty"`
 	TableDefinitions []*tabletmanagerdata.TableDefinition `protobuf:"bytes,3,rep,name=table_definitions,json=tableDefinitions,proto3" json:"table_definitions,omitempty"`
 	// TableSizes is a mapping of table name to TableSize information.
-	TableSizes map[string]*Schema_TableSize `protobuf:"bytes,4,rep,name=table_sizes,json=tableSizes,proto3" json:"table_sizes,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
+	TableSizes    map[string]*Schema_TableSize `protobuf:"bytes,4,rep,name=table_sizes,json=tableSizes,proto3" json:"table_sizes,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
+	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *Schema) Reset() {
@@ -574,12 +567,11 @@ func (x *Schema) GetTableSizes() map[string]*Schema_TableSize {
 }
 
 type SchemaMigration struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
+	state           protoimpl.MessageState     `protogen:"open.v1"`
 	Cluster         *Cluster                   `protobuf:"bytes,1,opt,name=cluster,proto3" json:"cluster,omitempty"`
 	SchemaMigration *vtctldata.SchemaMigration `protobuf:"bytes,2,opt,name=schema_migration,json=schemaMigration,proto3" json:"schema_migration,omitempty"`
+	unknownFields   protoimpl.UnknownFields
+	sizeCache       protoimpl.SizeCache
 }
 
 func (x *SchemaMigration) Reset() {
@@ -629,12 +621,11 @@ func (x *SchemaMigration) GetSchemaMigration() *vtctldata.SchemaMigration {
 // Shard groups the vtctldata information about a shard record together with
 // the Vitess cluster it belongs to.
 type Shard struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	Cluster       *Cluster               `protobuf:"bytes,1,opt,name=cluster,proto3" json:"cluster,omitempty"`
+	Shard         *vtctldata.Shard       `protobuf:"bytes,2,opt,name=shard,proto3" json:"shard,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	Cluster *Cluster         `protobuf:"bytes,1,opt,name=cluster,proto3" json:"cluster,omitempty"`
-	Shard   *vtctldata.Shard `protobuf:"bytes,2,opt,name=shard,proto3" json:"shard,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *Shard) Reset() {
@@ -682,13 +673,12 @@ func (x *Shard) GetShard() *vtctldata.Shard {
 }
 
 type SrvVSchema struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	Cell          string                 `protobuf:"bytes,1,opt,name=cell,proto3" json:"cell,omitempty"`
+	Cluster       *Cluster               `protobuf:"bytes,2,opt,name=cluster,proto3" json:"cluster,omitempty"`
+	SrvVSchema    *vschema.SrvVSchema    `protobuf:"bytes,3,opt,name=srv_v_schema,json=srvVSchema,proto3" json:"srv_v_schema,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	Cell       string              `protobuf:"bytes,1,opt,name=cell,proto3" json:"cell,omitempty"`
-	Cluster    *Cluster            `protobuf:"bytes,2,opt,name=cluster,proto3" json:"cluster,omitempty"`
-	SrvVSchema *vschema.SrvVSchema `protobuf:"bytes,3,opt,name=srv_v_schema,json=srvVSchema,proto3" json:"srv_v_schema,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *SrvVSchema) Reset() {
@@ -745,14 +735,13 @@ func (x *SrvVSchema) GetSrvVSchema() *vschema.SrvVSchema {
 // Tablet groups the topo information of a tablet together with the Vitess
 // cluster it belongs to.
 type Tablet struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	Cluster       *Cluster               `protobuf:"bytes,1,opt,name=cluster,proto3" json:"cluster,omitempty"`
+	Tablet        *topodata.Tablet       `protobuf:"bytes,2,opt,name=tablet,proto3" json:"tablet,omitempty"`
+	State         Tablet_ServingState    `protobuf:"varint,3,opt,name=state,proto3,enum=vtadmin.Tablet_ServingState" json:"state,omitempty"`
+	FQDN          string                 `protobuf:"bytes,4,opt,name=FQDN,proto3" json:"FQDN,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	Cluster *Cluster            `protobuf:"bytes,1,opt,name=cluster,proto3" json:"cluster,omitempty"`
-	Tablet  *topodata.Tablet    `protobuf:"bytes,2,opt,name=tablet,proto3" json:"tablet,omitempty"`
-	State   Tablet_ServingState `protobuf:"varint,3,opt,name=state,proto3,enum=vtadmin.Tablet_ServingState" json:"state,omitempty"`
-	FQDN    string              `protobuf:"bytes,4,opt,name=FQDN,proto3" json:"FQDN,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *Tablet) Reset() {
@@ -815,14 +804,13 @@ func (x *Tablet) GetFQDN() string {
 
 // VSchema represents the vschema for a keyspace in the cluster it belongs to.
 type VSchema struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Cluster *Cluster `protobuf:"bytes,1,opt,name=cluster,proto3" json:"cluster,omitempty"`
+	state   protoimpl.MessageState `protogen:"open.v1"`
+	Cluster *Cluster               `protobuf:"bytes,1,opt,name=cluster,proto3" json:"cluster,omitempty"`
 	// Name is the name of the keyspace this VSchema is for.
-	Name    string            `protobuf:"bytes,2,opt,name=name,proto3" json:"name,omitempty"`
-	VSchema *vschema.Keyspace `protobuf:"bytes,3,opt,name=v_schema,json=vSchema,proto3" json:"v_schema,omitempty"`
+	Name          string            `protobuf:"bytes,2,opt,name=name,proto3" json:"name,omitempty"`
+	VSchema       *vschema.Keyspace `protobuf:"bytes,3,opt,name=v_schema,json=vSchema,proto3" json:"v_schema,omitempty"`
+	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *VSchema) Reset() {
@@ -878,13 +866,12 @@ func (x *VSchema) GetVSchema() *vschema.Keyspace {
 
 // Vtctld represents information about a single Vtctld host.
 type Vtctld struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	Hostname      string                 `protobuf:"bytes,1,opt,name=hostname,proto3" json:"hostname,omitempty"`
+	Cluster       *Cluster               `protobuf:"bytes,2,opt,name=cluster,proto3" json:"cluster,omitempty"`
+	FQDN          string                 `protobuf:"bytes,3,opt,name=FQDN,proto3" json:"FQDN,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	Hostname string   `protobuf:"bytes,1,opt,name=hostname,proto3" json:"hostname,omitempty"`
-	Cluster  *Cluster `protobuf:"bytes,2,opt,name=cluster,proto3" json:"cluster,omitempty"`
-	FQDN     string   `protobuf:"bytes,3,opt,name=FQDN,proto3" json:"FQDN,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *Vtctld) Reset() {
@@ -940,10 +927,7 @@ func (x *Vtctld) GetFQDN() string {
 
 // VTGate represents information about a single VTGate host.
 type VTGate struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
+	state protoimpl.MessageState `protogen:"open.v1"`
 	// Hostname is the shortname of the VTGate.
 	Hostname string `protobuf:"bytes,1,opt,name=hostname,proto3" json:"hostname,omitempty"`
 	// Pool is group the VTGate serves queries for. Some deployments segment
@@ -955,8 +939,10 @@ type VTGate struct {
 	// Cluster is the cluster the VTGate serves.
 	Cluster *Cluster `protobuf:"bytes,4,opt,name=cluster,proto3" json:"cluster,omitempty"`
 	// Keyspaces is the list of keyspaces-to-watch for the VTGate.
-	Keyspaces []string `protobuf:"bytes,5,rep,name=keyspaces,proto3" json:"keyspaces,omitempty"`
-	FQDN      string   `protobuf:"bytes,6,opt,name=FQDN,proto3" json:"FQDN,omitempty"`
+	Keyspaces     []string `protobuf:"bytes,5,rep,name=keyspaces,proto3" json:"keyspaces,omitempty"`
+	FQDN          string   `protobuf:"bytes,6,opt,name=FQDN,proto3" json:"FQDN,omitempty"`
+	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *VTGate) Reset() {
@@ -1032,13 +1018,12 @@ func (x *VTGate) GetFQDN() string {
 }
 
 type Workflow struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	Cluster       *Cluster               `protobuf:"bytes,1,opt,name=cluster,proto3" json:"cluster,omitempty"`
+	Keyspace      string                 `protobuf:"bytes,2,opt,name=keyspace,proto3" json:"keyspace,omitempty"`
+	Workflow      *vtctldata.Workflow    `protobuf:"bytes,3,opt,name=workflow,proto3" json:"workflow,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	Cluster  *Cluster            `protobuf:"bytes,1,opt,name=cluster,proto3" json:"cluster,omitempty"`
-	Keyspace string              `protobuf:"bytes,2,opt,name=keyspace,proto3" json:"keyspace,omitempty"`
-	Workflow *vtctldata.Workflow `protobuf:"bytes,3,opt,name=workflow,proto3" json:"workflow,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *Workflow) Reset() {
@@ -1093,12 +1078,11 @@ func (x *Workflow) GetWorkflow() *vtctldata.Workflow {
 }
 
 type WorkflowDeleteRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState           `protogen:"open.v1"`
+	ClusterId     string                           `protobuf:"bytes,1,opt,name=cluster_id,json=clusterId,proto3" json:"cluster_id,omitempty"`
+	Request       *vtctldata.WorkflowDeleteRequest `protobuf:"bytes,2,opt,name=request,proto3" json:"request,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	ClusterId string                           `protobuf:"bytes,1,opt,name=cluster_id,json=clusterId,proto3" json:"cluster_id,omitempty"`
-	Request   *vtctldata.WorkflowDeleteRequest `protobuf:"bytes,2,opt,name=request,proto3" json:"request,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *WorkflowDeleteRequest) Reset() {
@@ -1146,12 +1130,11 @@ func (x *WorkflowDeleteRequest) GetRequest() *vtctldata.WorkflowDeleteRequest {
 }
 
 type WorkflowSwitchTrafficRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState                  `protogen:"open.v1"`
+	ClusterId     string                                  `protobuf:"bytes,1,opt,name=cluster_id,json=clusterId,proto3" json:"cluster_id,omitempty"`
+	Request       *vtctldata.WorkflowSwitchTrafficRequest `protobuf:"bytes,2,opt,name=request,proto3" json:"request,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	ClusterId string                                  `protobuf:"bytes,1,opt,name=cluster_id,json=clusterId,proto3" json:"cluster_id,omitempty"`
-	Request   *vtctldata.WorkflowSwitchTrafficRequest `protobuf:"bytes,2,opt,name=request,proto3" json:"request,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *WorkflowSwitchTrafficRequest) Reset() {
@@ -1199,16 +1182,15 @@ func (x *WorkflowSwitchTrafficRequest) GetRequest() *vtctldata.WorkflowSwitchTra
 }
 
 type ApplySchemaRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	ClusterId string `protobuf:"bytes,1,opt,name=cluster_id,json=clusterId,proto3" json:"cluster_id,omitempty"`
+	state     protoimpl.MessageState `protogen:"open.v1"`
+	ClusterId string                 `protobuf:"bytes,1,opt,name=cluster_id,json=clusterId,proto3" json:"cluster_id,omitempty"`
 	// Request.Sql will be overriden by this Sql field.
 	Sql string `protobuf:"bytes,2,opt,name=sql,proto3" json:"sql,omitempty"`
 	// Request.CallerId will be overriden by this CallerId field.
-	CallerId string                        `protobuf:"bytes,3,opt,name=caller_id,json=callerId,proto3" json:"caller_id,omitempty"`
-	Request  *vtctldata.ApplySchemaRequest `protobuf:"bytes,4,opt,name=request,proto3" json:"request,omitempty"`
+	CallerId      string                        `protobuf:"bytes,3,opt,name=caller_id,json=callerId,proto3" json:"caller_id,omitempty"`
+	Request       *vtctldata.ApplySchemaRequest `protobuf:"bytes,4,opt,name=request,proto3" json:"request,omitempty"`
+	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *ApplySchemaRequest) Reset() {
@@ -1270,12 +1252,11 @@ func (x *ApplySchemaRequest) GetRequest() *vtctldata.ApplySchemaRequest {
 }
 
 type CancelSchemaMigrationRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState                  `protogen:"open.v1"`
+	ClusterId     string                                  `protobuf:"bytes,1,opt,name=cluster_id,json=clusterId,proto3" json:"cluster_id,omitempty"`
+	Request       *vtctldata.CancelSchemaMigrationRequest `protobuf:"bytes,2,opt,name=request,proto3" json:"request,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	ClusterId string                                  `protobuf:"bytes,1,opt,name=cluster_id,json=clusterId,proto3" json:"cluster_id,omitempty"`
-	Request   *vtctldata.CancelSchemaMigrationRequest `protobuf:"bytes,2,opt,name=request,proto3" json:"request,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *CancelSchemaMigrationRequest) Reset() {
@@ -1323,12 +1304,11 @@ func (x *CancelSchemaMigrationRequest) GetRequest() *vtctldata.CancelSchemaMigra
 }
 
 type CleanupSchemaMigrationRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState                   `protogen:"open.v1"`
+	ClusterId     string                                   `protobuf:"bytes,1,opt,name=cluster_id,json=clusterId,proto3" json:"cluster_id,omitempty"`
+	Request       *vtctldata.CleanupSchemaMigrationRequest `protobuf:"bytes,2,opt,name=request,proto3" json:"request,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	ClusterId string                                   `protobuf:"bytes,1,opt,name=cluster_id,json=clusterId,proto3" json:"cluster_id,omitempty"`
-	Request   *vtctldata.CleanupSchemaMigrationRequest `protobuf:"bytes,2,opt,name=request,proto3" json:"request,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *CleanupSchemaMigrationRequest) Reset() {
@@ -1376,12 +1356,11 @@ func (x *CleanupSchemaMigrationRequest) GetRequest() *vtctldata.CleanupSchemaMig
 }
 
 type CompleteSchemaMigrationRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState                    `protogen:"open.v1"`
+	ClusterId     string                                    `protobuf:"bytes,1,opt,name=cluster_id,json=clusterId,proto3" json:"cluster_id,omitempty"`
+	Request       *vtctldata.CompleteSchemaMigrationRequest `protobuf:"bytes,2,opt,name=request,proto3" json:"request,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	ClusterId string                                    `protobuf:"bytes,1,opt,name=cluster_id,json=clusterId,proto3" json:"cluster_id,omitempty"`
-	Request   *vtctldata.CompleteSchemaMigrationRequest `protobuf:"bytes,2,opt,name=request,proto3" json:"request,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *CompleteSchemaMigrationRequest) Reset() {
@@ -1429,12 +1408,11 @@ func (x *CompleteSchemaMigrationRequest) GetRequest() *vtctldata.CompleteSchemaM
 }
 
 type ConcludeTransactionRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	ClusterId     string                 `protobuf:"bytes,1,opt,name=cluster_id,json=clusterId,proto3" json:"cluster_id,omitempty"`
+	Dtid          string                 `protobuf:"bytes,2,opt,name=dtid,proto3" json:"dtid,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	ClusterId string `protobuf:"bytes,1,opt,name=cluster_id,json=clusterId,proto3" json:"cluster_id,omitempty"`
-	Dtid      string `protobuf:"bytes,2,opt,name=dtid,proto3" json:"dtid,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *ConcludeTransactionRequest) Reset() {
@@ -1482,12 +1460,11 @@ func (x *ConcludeTransactionRequest) GetDtid() string {
 }
 
 type CreateKeyspaceRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState           `protogen:"open.v1"`
+	ClusterId     string                           `protobuf:"bytes,1,opt,name=cluster_id,json=clusterId,proto3" json:"cluster_id,omitempty"`
+	Options       *vtctldata.CreateKeyspaceRequest `protobuf:"bytes,2,opt,name=options,proto3" json:"options,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	ClusterId string                           `protobuf:"bytes,1,opt,name=cluster_id,json=clusterId,proto3" json:"cluster_id,omitempty"`
-	Options   *vtctldata.CreateKeyspaceRequest `protobuf:"bytes,2,opt,name=options,proto3" json:"options,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *CreateKeyspaceRequest) Reset() {
@@ -1535,11 +1512,10 @@ func (x *CreateKeyspaceRequest) GetOptions() *vtctldata.CreateKeyspaceRequest {
 }
 
 type CreateKeyspaceResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	Keyspace      *Keyspace              `protobuf:"bytes,1,opt,name=keyspace,proto3" json:"keyspace,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	Keyspace *Keyspace `protobuf:"bytes,1,opt,name=keyspace,proto3" json:"keyspace,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *CreateKeyspaceResponse) Reset() {
@@ -1580,12 +1556,11 @@ func (x *CreateKeyspaceResponse) GetKeyspace() *Keyspace {
 }
 
 type CreateShardRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState        `protogen:"open.v1"`
+	ClusterId     string                        `protobuf:"bytes,1,opt,name=cluster_id,json=clusterId,proto3" json:"cluster_id,omitempty"`
+	Options       *vtctldata.CreateShardRequest `protobuf:"bytes,2,opt,name=options,proto3" json:"options,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	ClusterId string                        `protobuf:"bytes,1,opt,name=cluster_id,json=clusterId,proto3" json:"cluster_id,omitempty"`
-	Options   *vtctldata.CreateShardRequest `protobuf:"bytes,2,opt,name=options,proto3" json:"options,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *CreateShardRequest) Reset() {
@@ -1633,12 +1608,11 @@ func (x *CreateShardRequest) GetOptions() *vtctldata.CreateShardRequest {
 }
 
 type DeleteKeyspaceRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState           `protogen:"open.v1"`
+	ClusterId     string                           `protobuf:"bytes,1,opt,name=cluster_id,json=clusterId,proto3" json:"cluster_id,omitempty"`
+	Options       *vtctldata.DeleteKeyspaceRequest `protobuf:"bytes,2,opt,name=options,proto3" json:"options,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	ClusterId string                           `protobuf:"bytes,1,opt,name=cluster_id,json=clusterId,proto3" json:"cluster_id,omitempty"`
-	Options   *vtctldata.DeleteKeyspaceRequest `protobuf:"bytes,2,opt,name=options,proto3" json:"options,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *DeleteKeyspaceRequest) Reset() {
@@ -1686,12 +1660,11 @@ func (x *DeleteKeyspaceRequest) GetOptions() *vtctldata.DeleteKeyspaceRequest {
 }
 
 type DeleteShardsRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState         `protogen:"open.v1"`
+	ClusterId     string                         `protobuf:"bytes,1,opt,name=cluster_id,json=clusterId,proto3" json:"cluster_id,omitempty"`
+	Options       *vtctldata.DeleteShardsRequest `protobuf:"bytes,2,opt,name=options,proto3" json:"options,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	ClusterId string                         `protobuf:"bytes,1,opt,name=cluster_id,json=clusterId,proto3" json:"cluster_id,omitempty"`
-	Options   *vtctldata.DeleteShardsRequest `protobuf:"bytes,2,opt,name=options,proto3" json:"options,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *DeleteShardsRequest) Reset() {
@@ -1739,13 +1712,12 @@ func (x *DeleteShardsRequest) GetOptions() *vtctldata.DeleteShardsRequest {
 }
 
 type DeleteTabletRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	Alias         *topodata.TabletAlias  `protobuf:"bytes,1,opt,name=alias,proto3" json:"alias,omitempty"`
+	ClusterIds    []string               `protobuf:"bytes,2,rep,name=cluster_ids,json=clusterIds,proto3" json:"cluster_ids,omitempty"`
+	AllowPrimary  bool                   `protobuf:"varint,3,opt,name=allow_primary,json=allowPrimary,proto3" json:"allow_primary,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	Alias        *topodata.TabletAlias `protobuf:"bytes,1,opt,name=alias,proto3" json:"alias,omitempty"`
-	ClusterIds   []string              `protobuf:"bytes,2,rep,name=cluster_ids,json=clusterIds,proto3" json:"cluster_ids,omitempty"`
-	AllowPrimary bool                  `protobuf:"varint,3,opt,name=allow_primary,json=allowPrimary,proto3" json:"allow_primary,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *DeleteTabletRequest) Reset() {
@@ -1800,12 +1772,11 @@ func (x *DeleteTabletRequest) GetAllowPrimary() bool {
 }
 
 type DeleteTabletResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	Status        string                 `protobuf:"bytes,1,opt,name=status,proto3" json:"status,omitempty"`
+	Cluster       *Cluster               `protobuf:"bytes,2,opt,name=cluster,proto3" json:"cluster,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	Status  string   `protobuf:"bytes,1,opt,name=status,proto3" json:"status,omitempty"`
-	Cluster *Cluster `protobuf:"bytes,2,opt,name=cluster,proto3" json:"cluster,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *DeleteTabletResponse) Reset() {
@@ -1853,12 +1824,11 @@ func (x *DeleteTabletResponse) GetCluster() *Cluster {
 }
 
 type EmergencyFailoverShardRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState                   `protogen:"open.v1"`
+	ClusterId     string                                   `protobuf:"bytes,1,opt,name=cluster_id,json=clusterId,proto3" json:"cluster_id,omitempty"`
+	Options       *vtctldata.EmergencyReparentShardRequest `protobuf:"bytes,2,opt,name=options,proto3" json:"options,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	ClusterId string                                   `protobuf:"bytes,1,opt,name=cluster_id,json=clusterId,proto3" json:"cluster_id,omitempty"`
-	Options   *vtctldata.EmergencyReparentShardRequest `protobuf:"bytes,2,opt,name=options,proto3" json:"options,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *EmergencyFailoverShardRequest) Reset() {
@@ -1906,19 +1876,18 @@ func (x *EmergencyFailoverShardRequest) GetOptions() *vtctldata.EmergencyReparen
 }
 
 type EmergencyFailoverShardResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Cluster  *Cluster `protobuf:"bytes,1,opt,name=cluster,proto3" json:"cluster,omitempty"`
-	Keyspace string   `protobuf:"bytes,2,opt,name=keyspace,proto3" json:"keyspace,omitempty"`
-	Shard    string   `protobuf:"bytes,3,opt,name=shard,proto3" json:"shard,omitempty"`
+	state    protoimpl.MessageState `protogen:"open.v1"`
+	Cluster  *Cluster               `protobuf:"bytes,1,opt,name=cluster,proto3" json:"cluster,omitempty"`
+	Keyspace string                 `protobuf:"bytes,2,opt,name=keyspace,proto3" json:"keyspace,omitempty"`
+	Shard    string                 `protobuf:"bytes,3,opt,name=shard,proto3" json:"shard,omitempty"`
 	// PromotedPrimary is the tablet alias that was promoted to shard primary.
 	// If NewPrimary was set in the request options, then this will be the
 	// same tablet alias. Otherwise, it will be the alias of the tablet found
 	// to be most up-to-date in the shard.
 	PromotedPrimary *topodata.TabletAlias `protobuf:"bytes,4,opt,name=promoted_primary,json=promotedPrimary,proto3" json:"promoted_primary,omitempty"`
 	Events          []*logutil.Event      `protobuf:"bytes,5,rep,name=events,proto3" json:"events,omitempty"`
+	unknownFields   protoimpl.UnknownFields
+	sizeCache       protoimpl.SizeCache
 }
 
 func (x *EmergencyFailoverShardResponse) Reset() {
@@ -1987,13 +1956,12 @@ func (x *EmergencyFailoverShardResponse) GetEvents() []*logutil.Event {
 }
 
 type FindSchemaRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
+	state            protoimpl.MessageState     `protogen:"open.v1"`
 	Table            string                     `protobuf:"bytes,1,opt,name=table,proto3" json:"table,omitempty"`
 	ClusterIds       []string                   `protobuf:"bytes,2,rep,name=cluster_ids,json=clusterIds,proto3" json:"cluster_ids,omitempty"`
 	TableSizeOptions *GetSchemaTableSizeOptions `protobuf:"bytes,3,opt,name=table_size_options,json=tableSizeOptions,proto3" json:"table_size_options,omitempty"`
+	unknownFields    protoimpl.UnknownFields
+	sizeCache        protoimpl.SizeCache
 }
 
 func (x *FindSchemaRequest) Reset() {
@@ -2048,11 +2016,8 @@ func (x *FindSchemaRequest) GetTableSizeOptions() *GetSchemaTableSizeOptions {
 }
 
 type GetBackupsRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	ClusterIds []string `protobuf:"bytes,1,rep,name=cluster_ids,json=clusterIds,proto3" json:"cluster_ids,omitempty"`
+	state      protoimpl.MessageState `protogen:"open.v1"`
+	ClusterIds []string               `protobuf:"bytes,1,rep,name=cluster_ids,json=clusterIds,proto3" json:"cluster_ids,omitempty"`
 	// Keyspaces, if set, limits backups to just the specified keyspaces.
 	// Applies to all clusters in the request.
 	Keyspaces []string `protobuf:"bytes,2,rep,name=keyspaces,proto3" json:"keyspaces,omitempty"`
@@ -2067,6 +2032,8 @@ type GetBackupsRequest struct {
 	// of this field are ignored; it is used only to specify Limit and Detailed
 	// fields.
 	RequestOptions *vtctldata.GetBackupsRequest `protobuf:"bytes,4,opt,name=request_options,json=requestOptions,proto3" json:"request_options,omitempty"`
+	unknownFields  protoimpl.UnknownFields
+	sizeCache      protoimpl.SizeCache
 }
 
 func (x *GetBackupsRequest) Reset() {
@@ -2128,11 +2095,10 @@ func (x *GetBackupsRequest) GetRequestOptions() *vtctldata.GetBackupsRequest {
 }
 
 type GetBackupsResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	Backups       []*ClusterBackup       `protobuf:"bytes,1,rep,name=backups,proto3" json:"backups,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	Backups []*ClusterBackup `protobuf:"bytes,1,rep,name=backups,proto3" json:"backups,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *GetBackupsResponse) Reset() {
@@ -2173,11 +2139,8 @@ func (x *GetBackupsResponse) GetBackups() []*ClusterBackup {
 }
 
 type GetCellInfosRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	ClusterIds []string `protobuf:"bytes,1,rep,name=cluster_ids,json=clusterIds,proto3" json:"cluster_ids,omitempty"`
+	state      protoimpl.MessageState `protogen:"open.v1"`
+	ClusterIds []string               `protobuf:"bytes,1,rep,name=cluster_ids,json=clusterIds,proto3" json:"cluster_ids,omitempty"`
 	// Cells, if specified, limits the response to include only CellInfo objects
 	// with those names. If omitted, all CellInfo objects in each cluster are
 	// returned.
@@ -2187,7 +2150,9 @@ type GetCellInfosRequest struct {
 	Cells []string `protobuf:"bytes,2,rep,name=cells,proto3" json:"cells,omitempty"`
 	// Return only the cell names in each cluster; the actual CellInfo objects
 	// will be empty.
-	NamesOnly bool `protobuf:"varint,3,opt,name=names_only,json=namesOnly,proto3" json:"names_only,omitempty"`
+	NamesOnly     bool `protobuf:"varint,3,opt,name=names_only,json=namesOnly,proto3" json:"names_only,omitempty"`
+	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *GetCellInfosRequest) Reset() {
@@ -2242,11 +2207,10 @@ func (x *GetCellInfosRequest) GetNamesOnly() bool {
 }
 
 type GetCellInfosResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	CellInfos     []*ClusterCellInfo     `protobuf:"bytes,1,rep,name=cell_infos,json=cellInfos,proto3" json:"cell_infos,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	CellInfos []*ClusterCellInfo `protobuf:"bytes,1,rep,name=cell_infos,json=cellInfos,proto3" json:"cell_infos,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *GetCellInfosResponse) Reset() {
@@ -2287,11 +2251,10 @@ func (x *GetCellInfosResponse) GetCellInfos() []*ClusterCellInfo {
 }
 
 type GetCellsAliasesRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	ClusterIds    []string               `protobuf:"bytes,1,rep,name=cluster_ids,json=clusterIds,proto3" json:"cluster_ids,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	ClusterIds []string `protobuf:"bytes,1,rep,name=cluster_ids,json=clusterIds,proto3" json:"cluster_ids,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *GetCellsAliasesRequest) Reset() {
@@ -2332,11 +2295,10 @@ func (x *GetCellsAliasesRequest) GetClusterIds() []string {
 }
 
 type GetCellsAliasesResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	Aliases       []*ClusterCellsAliases `protobuf:"bytes,1,rep,name=aliases,proto3" json:"aliases,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	Aliases []*ClusterCellsAliases `protobuf:"bytes,1,rep,name=aliases,proto3" json:"aliases,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *GetCellsAliasesResponse) Reset() {
@@ -2377,9 +2339,9 @@ func (x *GetCellsAliasesResponse) GetAliases() []*ClusterCellsAliases {
 }
 
 type GetClustersRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
 	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *GetClustersRequest) Reset() {
@@ -2413,11 +2375,10 @@ func (*GetClustersRequest) Descriptor() ([]byte, []int) {
 }
 
 type GetClustersResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	Clusters      []*Cluster             `protobuf:"bytes,1,rep,name=clusters,proto3" json:"clusters,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	Clusters []*Cluster `protobuf:"bytes,1,rep,name=clusters,proto3" json:"clusters,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *GetClustersResponse) Reset() {
@@ -2458,12 +2419,11 @@ func (x *GetClustersResponse) GetClusters() []*Cluster {
 }
 
 type GetFullStatusRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	ClusterId     string                 `protobuf:"bytes,1,opt,name=cluster_id,json=clusterId,proto3" json:"cluster_id,omitempty"`
+	Alias         *topodata.TabletAlias  `protobuf:"bytes,2,opt,name=alias,proto3" json:"alias,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	ClusterId string                `protobuf:"bytes,1,opt,name=cluster_id,json=clusterId,proto3" json:"cluster_id,omitempty"`
-	Alias     *topodata.TabletAlias `protobuf:"bytes,2,opt,name=alias,proto3" json:"alias,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *GetFullStatusRequest) Reset() {
@@ -2511,11 +2471,10 @@ func (x *GetFullStatusRequest) GetAlias() *topodata.TabletAlias {
 }
 
 type GetGatesRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	ClusterIds    []string               `protobuf:"bytes,1,rep,name=cluster_ids,json=clusterIds,proto3" json:"cluster_ids,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	ClusterIds []string `protobuf:"bytes,1,rep,name=cluster_ids,json=clusterIds,proto3" json:"cluster_ids,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *GetGatesRequest) Reset() {
@@ -2556,11 +2515,10 @@ func (x *GetGatesRequest) GetClusterIds() []string {
 }
 
 type GetGatesResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	Gates         []*VTGate              `protobuf:"bytes,1,rep,name=gates,proto3" json:"gates,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	Gates []*VTGate `protobuf:"bytes,1,rep,name=gates,proto3" json:"gates,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *GetGatesResponse) Reset() {
@@ -2601,12 +2559,11 @@ func (x *GetGatesResponse) GetGates() []*VTGate {
 }
 
 type GetKeyspaceRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	ClusterId     string                 `protobuf:"bytes,1,opt,name=cluster_id,json=clusterId,proto3" json:"cluster_id,omitempty"`
+	Keyspace      string                 `protobuf:"bytes,2,opt,name=keyspace,proto3" json:"keyspace,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	ClusterId string `protobuf:"bytes,1,opt,name=cluster_id,json=clusterId,proto3" json:"cluster_id,omitempty"`
-	Keyspace  string `protobuf:"bytes,2,opt,name=keyspace,proto3" json:"keyspace,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *GetKeyspaceRequest) Reset() {
@@ -2654,11 +2611,10 @@ func (x *GetKeyspaceRequest) GetKeyspace() string {
 }
 
 type GetKeyspacesRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	ClusterIds    []string               `protobuf:"bytes,1,rep,name=cluster_ids,json=clusterIds,proto3" json:"cluster_ids,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	ClusterIds []string `protobuf:"bytes,1,rep,name=cluster_ids,json=clusterIds,proto3" json:"cluster_ids,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *GetKeyspacesRequest) Reset() {
@@ -2699,11 +2655,10 @@ func (x *GetKeyspacesRequest) GetClusterIds() []string {
 }
 
 type GetKeyspacesResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	Keyspaces     []*Keyspace            `protobuf:"bytes,1,rep,name=keyspaces,proto3" json:"keyspaces,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	Keyspaces []*Keyspace `protobuf:"bytes,1,rep,name=keyspaces,proto3" json:"keyspaces,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *GetKeyspacesResponse) Reset() {
@@ -2744,14 +2699,13 @@ func (x *GetKeyspacesResponse) GetKeyspaces() []*Keyspace {
 }
 
 type GetSchemaRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
+	state            protoimpl.MessageState     `protogen:"open.v1"`
 	ClusterId        string                     `protobuf:"bytes,1,opt,name=cluster_id,json=clusterId,proto3" json:"cluster_id,omitempty"`
 	Keyspace         string                     `protobuf:"bytes,2,opt,name=keyspace,proto3" json:"keyspace,omitempty"`
 	Table            string                     `protobuf:"bytes,3,opt,name=table,proto3" json:"table,omitempty"`
 	TableSizeOptions *GetSchemaTableSizeOptions `protobuf:"bytes,4,opt,name=table_size_options,json=tableSizeOptions,proto3" json:"table_size_options,omitempty"`
+	unknownFields    protoimpl.UnknownFields
+	sizeCache        protoimpl.SizeCache
 }
 
 func (x *GetSchemaRequest) Reset() {
@@ -2813,12 +2767,11 @@ func (x *GetSchemaRequest) GetTableSizeOptions() *GetSchemaTableSizeOptions {
 }
 
 type GetSchemasRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
+	state            protoimpl.MessageState     `protogen:"open.v1"`
 	ClusterIds       []string                   `protobuf:"bytes,1,rep,name=cluster_ids,json=clusterIds,proto3" json:"cluster_ids,omitempty"`
 	TableSizeOptions *GetSchemaTableSizeOptions `protobuf:"bytes,2,opt,name=table_size_options,json=tableSizeOptions,proto3" json:"table_size_options,omitempty"`
+	unknownFields    protoimpl.UnknownFields
+	sizeCache        protoimpl.SizeCache
 }
 
 func (x *GetSchemasRequest) Reset() {
@@ -2866,11 +2819,10 @@ func (x *GetSchemasRequest) GetTableSizeOptions() *GetSchemaTableSizeOptions {
 }
 
 type GetSchemasResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	Schemas       []*Schema              `protobuf:"bytes,1,rep,name=schemas,proto3" json:"schemas,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	Schemas []*Schema `protobuf:"bytes,1,rep,name=schemas,proto3" json:"schemas,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *GetSchemasResponse) Reset() {
@@ -2911,11 +2863,10 @@ func (x *GetSchemasResponse) GetSchemas() []*Schema {
 }
 
 type GetSchemaMigrationsRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
+	state           protoimpl.MessageState                       `protogen:"open.v1"`
 	ClusterRequests []*GetSchemaMigrationsRequest_ClusterRequest `protobuf:"bytes,1,rep,name=cluster_requests,json=clusterRequests,proto3" json:"cluster_requests,omitempty"`
+	unknownFields   protoimpl.UnknownFields
+	sizeCache       protoimpl.SizeCache
 }
 
 func (x *GetSchemaMigrationsRequest) Reset() {
@@ -2956,11 +2907,10 @@ func (x *GetSchemaMigrationsRequest) GetClusterRequests() []*GetSchemaMigrations
 }
 
 type GetSchemaMigrationsResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	SchemaMigrations []*SchemaMigration `protobuf:"bytes,1,rep,name=schema_migrations,json=schemaMigrations,proto3" json:"schema_migrations,omitempty"`
+	state            protoimpl.MessageState `protogen:"open.v1"`
+	SchemaMigrations []*SchemaMigration     `protobuf:"bytes,1,rep,name=schema_migrations,json=schemaMigrations,proto3" json:"schema_migrations,omitempty"`
+	unknownFields    protoimpl.UnknownFields
+	sizeCache        protoimpl.SizeCache
 }
 
 func (x *GetSchemaMigrationsResponse) Reset() {
@@ -3001,11 +2951,8 @@ func (x *GetSchemaMigrationsResponse) GetSchemaMigrations() []*SchemaMigration {
 }
 
 type GetShardReplicationPositionsRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	ClusterIds []string `protobuf:"bytes,1,rep,name=cluster_ids,json=clusterIds,proto3" json:"cluster_ids,omitempty"`
+	state      protoimpl.MessageState `protogen:"open.v1"`
+	ClusterIds []string               `protobuf:"bytes,1,rep,name=cluster_ids,json=clusterIds,proto3" json:"cluster_ids,omitempty"`
 	// Keyspaces, if set, limits replication positions to just the specified
 	// keyspaces. Applies to all clusters in the request.
 	Keyspaces []string `protobuf:"bytes,2,rep,name=keyspaces,proto3" json:"keyspaces,omitempty"`
@@ -3015,6 +2962,8 @@ type GetShardReplicationPositionsRequest struct {
 	// This field takes precedence over Keyspaces. If KeyspaceShards is set,
 	// Keyspaces is ignored.
 	KeyspaceShards []string `protobuf:"bytes,3,rep,name=keyspace_shards,json=keyspaceShards,proto3" json:"keyspace_shards,omitempty"`
+	unknownFields  protoimpl.UnknownFields
+	sizeCache      protoimpl.SizeCache
 }
 
 func (x *GetShardReplicationPositionsRequest) Reset() {
@@ -3069,11 +3018,10 @@ func (x *GetShardReplicationPositionsRequest) GetKeyspaceShards() []string {
 }
 
 type GetShardReplicationPositionsResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
+	state                protoimpl.MessageState             `protogen:"open.v1"`
 	ReplicationPositions []*ClusterShardReplicationPosition `protobuf:"bytes,1,rep,name=replication_positions,json=replicationPositions,proto3" json:"replication_positions,omitempty"`
+	unknownFields        protoimpl.UnknownFields
+	sizeCache            protoimpl.SizeCache
 }
 
 func (x *GetShardReplicationPositionsResponse) Reset() {
@@ -3114,15 +3062,14 @@ func (x *GetShardReplicationPositionsResponse) GetReplicationPositions() []*Clus
 }
 
 type GetSrvKeyspaceRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	ClusterId string `protobuf:"bytes,1,opt,name=cluster_id,json=clusterId,proto3" json:"cluster_id,omitempty"`
-	Keyspace  string `protobuf:"bytes,2,opt,name=keyspace,proto3" json:"keyspace,omitempty"`
+	state     protoimpl.MessageState `protogen:"open.v1"`
+	ClusterId string                 `protobuf:"bytes,1,opt,name=cluster_id,json=clusterId,proto3" json:"cluster_id,omitempty"`
+	Keyspace  string                 `protobuf:"bytes,2,opt,name=keyspace,proto3" json:"keyspace,omitempty"`
 	// Cells is a list of cells to lookup a SrvKeyspace for. Leaving this empty is
 	// equivalent to specifying all cells in the topo.
-	Cells []string `protobuf:"bytes,3,rep,name=cells,proto3" json:"cells,omitempty"`
+	Cells         []string `protobuf:"bytes,3,rep,name=cells,proto3" json:"cells,omitempty"`
+	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *GetSrvKeyspaceRequest) Reset() {
@@ -3177,15 +3124,14 @@ func (x *GetSrvKeyspaceRequest) GetCells() []string {
 }
 
 type GetSrvKeyspacesRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
+	state protoimpl.MessageState `protogen:"open.v1"`
 	// An optional list of cluster IDs to filter specific clusters
 	ClusterIds []string `protobuf:"bytes,1,rep,name=cluster_ids,json=clusterIds,proto3" json:"cluster_ids,omitempty"`
 	// Cells is a list of cells to lookup a SrvKeyspace for. Leaving this empty is
 	// equivalent to specifying all cells in the topo.
-	Cells []string `protobuf:"bytes,2,rep,name=cells,proto3" json:"cells,omitempty"`
+	Cells         []string `protobuf:"bytes,2,rep,name=cells,proto3" json:"cells,omitempty"`
+	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *GetSrvKeyspacesRequest) Reset() {
@@ -3233,12 +3179,11 @@ func (x *GetSrvKeyspacesRequest) GetCells() []string {
 }
 
 type GetSrvKeyspacesResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
+	state protoimpl.MessageState `protogen:"open.v1"`
 	// GetSrvKeyspaces responses for each keyspace
-	SrvKeyspaces map[string]*vtctldata.GetSrvKeyspacesResponse `protobuf:"bytes,1,rep,name=srv_keyspaces,json=srvKeyspaces,proto3" json:"srv_keyspaces,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
+	SrvKeyspaces  map[string]*vtctldata.GetSrvKeyspacesResponse `protobuf:"bytes,1,rep,name=srv_keyspaces,json=srvKeyspaces,proto3" json:"srv_keyspaces,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
+	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *GetSrvKeyspacesResponse) Reset() {
@@ -3279,12 +3224,11 @@ func (x *GetSrvKeyspacesResponse) GetSrvKeyspaces() map[string]*vtctldata.GetSrv
 }
 
 type GetSrvVSchemaRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	ClusterId     string                 `protobuf:"bytes,1,opt,name=cluster_id,json=clusterId,proto3" json:"cluster_id,omitempty"`
+	Cell          string                 `protobuf:"bytes,2,opt,name=cell,proto3" json:"cell,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	ClusterId string `protobuf:"bytes,1,opt,name=cluster_id,json=clusterId,proto3" json:"cluster_id,omitempty"`
-	Cell      string `protobuf:"bytes,2,opt,name=cell,proto3" json:"cell,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *GetSrvVSchemaRequest) Reset() {
@@ -3332,12 +3276,11 @@ func (x *GetSrvVSchemaRequest) GetCell() string {
 }
 
 type GetSrvVSchemasRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	ClusterIds    []string               `protobuf:"bytes,1,rep,name=cluster_ids,json=clusterIds,proto3" json:"cluster_ids,omitempty"`
+	Cells         []string               `protobuf:"bytes,2,rep,name=cells,proto3" json:"cells,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	ClusterIds []string `protobuf:"bytes,1,rep,name=cluster_ids,json=clusterIds,proto3" json:"cluster_ids,omitempty"`
-	Cells      []string `protobuf:"bytes,2,rep,name=cells,proto3" json:"cells,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *GetSrvVSchemasRequest) Reset() {
@@ -3385,11 +3328,10 @@ func (x *GetSrvVSchemasRequest) GetCells() []string {
 }
 
 type GetSrvVSchemasResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	SrvVSchemas   []*SrvVSchema          `protobuf:"bytes,1,rep,name=srv_v_schemas,json=srvVSchemas,proto3" json:"srv_v_schemas,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	SrvVSchemas []*SrvVSchema `protobuf:"bytes,1,rep,name=srv_v_schemas,json=srvVSchemas,proto3" json:"srv_v_schemas,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *GetSrvVSchemasResponse) Reset() {
@@ -3430,12 +3372,11 @@ func (x *GetSrvVSchemasResponse) GetSrvVSchemas() []*SrvVSchema {
 }
 
 type GetSchemaTableSizeOptions struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	AggregateSizes          bool `protobuf:"varint,1,opt,name=aggregate_sizes,json=aggregateSizes,proto3" json:"aggregate_sizes,omitempty"`
-	IncludeNonServingShards bool `protobuf:"varint,2,opt,name=include_non_serving_shards,json=includeNonServingShards,proto3" json:"include_non_serving_shards,omitempty"`
+	state                   protoimpl.MessageState `protogen:"open.v1"`
+	AggregateSizes          bool                   `protobuf:"varint,1,opt,name=aggregate_sizes,json=aggregateSizes,proto3" json:"aggregate_sizes,omitempty"`
+	IncludeNonServingShards bool                   `protobuf:"varint,2,opt,name=include_non_serving_shards,json=includeNonServingShards,proto3" json:"include_non_serving_shards,omitempty"`
+	unknownFields           protoimpl.UnknownFields
+	sizeCache               protoimpl.SizeCache
 }
 
 func (x *GetSchemaTableSizeOptions) Reset() {
@@ -3483,16 +3424,15 @@ func (x *GetSchemaTableSizeOptions) GetIncludeNonServingShards() bool {
 }
 
 type GetTabletRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
+	state protoimpl.MessageState `protogen:"open.v1"`
 	// Unique (per cluster) tablet alias.
 	Alias *topodata.TabletAlias `protobuf:"bytes,1,opt,name=alias,proto3" json:"alias,omitempty"`
 	// ClusterIDs is an optional parameter to narrow the scope of the search, if
 	// the caller knows which cluster the tablet may be in, or, to disambiguate
 	// if multiple clusters have a tablet with the same hostname.
-	ClusterIds []string `protobuf:"bytes,2,rep,name=cluster_ids,json=clusterIds,proto3" json:"cluster_ids,omitempty"`
+	ClusterIds    []string `protobuf:"bytes,2,rep,name=cluster_ids,json=clusterIds,proto3" json:"cluster_ids,omitempty"`
+	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *GetTabletRequest) Reset() {
@@ -3540,11 +3480,10 @@ func (x *GetTabletRequest) GetClusterIds() []string {
 }
 
 type GetTabletsRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	ClusterIds    []string               `protobuf:"bytes,1,rep,name=cluster_ids,json=clusterIds,proto3" json:"cluster_ids,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	ClusterIds []string `protobuf:"bytes,1,rep,name=cluster_ids,json=clusterIds,proto3" json:"cluster_ids,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *GetTabletsRequest) Reset() {
@@ -3585,11 +3524,10 @@ func (x *GetTabletsRequest) GetClusterIds() []string {
 }
 
 type GetTabletsResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	Tablets       []*Tablet              `protobuf:"bytes,1,rep,name=tablets,proto3" json:"tablets,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	Tablets []*Tablet `protobuf:"bytes,1,rep,name=tablets,proto3" json:"tablets,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *GetTabletsResponse) Reset() {
@@ -3630,12 +3568,11 @@ func (x *GetTabletsResponse) GetTablets() []*Tablet {
 }
 
 type GetTopologyPathRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	ClusterId     string                 `protobuf:"bytes,1,opt,name=cluster_id,json=clusterId,proto3" json:"cluster_id,omitempty"`
+	Path          string                 `protobuf:"bytes,2,opt,name=path,proto3" json:"path,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	ClusterId string `protobuf:"bytes,1,opt,name=cluster_id,json=clusterId,proto3" json:"cluster_id,omitempty"`
-	Path      string `protobuf:"bytes,2,opt,name=path,proto3" json:"path,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *GetTopologyPathRequest) Reset() {
@@ -3683,12 +3620,11 @@ func (x *GetTopologyPathRequest) GetPath() string {
 }
 
 type GetTransactionInfoRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState               `protogen:"open.v1"`
+	ClusterId     string                               `protobuf:"bytes,1,opt,name=cluster_id,json=clusterId,proto3" json:"cluster_id,omitempty"`
+	Request       *vtctldata.GetTransactionInfoRequest `protobuf:"bytes,2,opt,name=request,proto3" json:"request,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	ClusterId string                               `protobuf:"bytes,1,opt,name=cluster_id,json=clusterId,proto3" json:"cluster_id,omitempty"`
-	Request   *vtctldata.GetTransactionInfoRequest `protobuf:"bytes,2,opt,name=request,proto3" json:"request,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *GetTransactionInfoRequest) Reset() {
@@ -3736,13 +3672,12 @@ func (x *GetTransactionInfoRequest) GetRequest() *vtctldata.GetTransactionInfoRe
 }
 
 type GetUnresolvedTransactionsRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	ClusterId     string                 `protobuf:"bytes,1,opt,name=cluster_id,json=clusterId,proto3" json:"cluster_id,omitempty"`
+	Keyspace      string                 `protobuf:"bytes,2,opt,name=keyspace,proto3" json:"keyspace,omitempty"`
+	AbandonAge    int64                  `protobuf:"varint,3,opt,name=abandon_age,json=abandonAge,proto3" json:"abandon_age,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	ClusterId  string `protobuf:"bytes,1,opt,name=cluster_id,json=clusterId,proto3" json:"cluster_id,omitempty"`
-	Keyspace   string `protobuf:"bytes,2,opt,name=keyspace,proto3" json:"keyspace,omitempty"`
-	AbandonAge int64  `protobuf:"varint,3,opt,name=abandon_age,json=abandonAge,proto3" json:"abandon_age,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *GetUnresolvedTransactionsRequest) Reset() {
@@ -3797,12 +3732,11 @@ func (x *GetUnresolvedTransactionsRequest) GetAbandonAge() int64 {
 }
 
 type GetVSchemaRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	ClusterId     string                 `protobuf:"bytes,1,opt,name=cluster_id,json=clusterId,proto3" json:"cluster_id,omitempty"`
+	Keyspace      string                 `protobuf:"bytes,2,opt,name=keyspace,proto3" json:"keyspace,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	ClusterId string `protobuf:"bytes,1,opt,name=cluster_id,json=clusterId,proto3" json:"cluster_id,omitempty"`
-	Keyspace  string `protobuf:"bytes,2,opt,name=keyspace,proto3" json:"keyspace,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *GetVSchemaRequest) Reset() {
@@ -3850,11 +3784,10 @@ func (x *GetVSchemaRequest) GetKeyspace() string {
 }
 
 type GetVSchemasRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	ClusterIds    []string               `protobuf:"bytes,1,rep,name=cluster_ids,json=clusterIds,proto3" json:"cluster_ids,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	ClusterIds []string `protobuf:"bytes,1,rep,name=cluster_ids,json=clusterIds,proto3" json:"cluster_ids,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *GetVSchemasRequest) Reset() {
@@ -3895,11 +3828,10 @@ func (x *GetVSchemasRequest) GetClusterIds() []string {
 }
 
 type GetVSchemasResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	VSchemas      []*VSchema             `protobuf:"bytes,1,rep,name=v_schemas,json=vSchemas,proto3" json:"v_schemas,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	VSchemas []*VSchema `protobuf:"bytes,1,rep,name=v_schemas,json=vSchemas,proto3" json:"v_schemas,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *GetVSchemasResponse) Reset() {
@@ -3940,11 +3872,10 @@ func (x *GetVSchemasResponse) GetVSchemas() []*VSchema {
 }
 
 type GetVtctldsRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	ClusterIds    []string               `protobuf:"bytes,1,rep,name=cluster_ids,json=clusterIds,proto3" json:"cluster_ids,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	ClusterIds []string `protobuf:"bytes,1,rep,name=cluster_ids,json=clusterIds,proto3" json:"cluster_ids,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *GetVtctldsRequest) Reset() {
@@ -3985,11 +3916,10 @@ func (x *GetVtctldsRequest) GetClusterIds() []string {
 }
 
 type GetVtctldsResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	Vtctlds       []*Vtctld              `protobuf:"bytes,1,rep,name=vtctlds,proto3" json:"vtctlds,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	Vtctlds []*Vtctld `protobuf:"bytes,1,rep,name=vtctlds,proto3" json:"vtctlds,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *GetVtctldsResponse) Reset() {
@@ -4030,14 +3960,13 @@ func (x *GetVtctldsResponse) GetVtctlds() []*Vtctld {
 }
 
 type GetWorkflowRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	ClusterId     string                 `protobuf:"bytes,1,opt,name=cluster_id,json=clusterId,proto3" json:"cluster_id,omitempty"`
+	Keyspace      string                 `protobuf:"bytes,2,opt,name=keyspace,proto3" json:"keyspace,omitempty"`
+	Name          string                 `protobuf:"bytes,3,opt,name=name,proto3" json:"name,omitempty"`
+	ActiveOnly    bool                   `protobuf:"varint,4,opt,name=active_only,json=activeOnly,proto3" json:"active_only,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	ClusterId  string `protobuf:"bytes,1,opt,name=cluster_id,json=clusterId,proto3" json:"cluster_id,omitempty"`
-	Keyspace   string `protobuf:"bytes,2,opt,name=keyspace,proto3" json:"keyspace,omitempty"`
-	Name       string `protobuf:"bytes,3,opt,name=name,proto3" json:"name,omitempty"`
-	ActiveOnly bool   `protobuf:"varint,4,opt,name=active_only,json=activeOnly,proto3" json:"active_only,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *GetWorkflowRequest) Reset() {
@@ -4099,13 +4028,12 @@ func (x *GetWorkflowRequest) GetActiveOnly() bool {
 }
 
 type GetWorkflowStatusRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	ClusterId     string                 `protobuf:"bytes,1,opt,name=cluster_id,json=clusterId,proto3" json:"cluster_id,omitempty"`
+	Keyspace      string                 `protobuf:"bytes,2,opt,name=keyspace,proto3" json:"keyspace,omitempty"`
+	Name          string                 `protobuf:"bytes,3,opt,name=name,proto3" json:"name,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	ClusterId string `protobuf:"bytes,1,opt,name=cluster_id,json=clusterId,proto3" json:"cluster_id,omitempty"`
-	Keyspace  string `protobuf:"bytes,2,opt,name=keyspace,proto3" json:"keyspace,omitempty"`
-	Name      string `protobuf:"bytes,3,opt,name=name,proto3" json:"name,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *GetWorkflowStatusRequest) Reset() {
@@ -4160,13 +4088,12 @@ func (x *GetWorkflowStatusRequest) GetName() string {
 }
 
 type StartWorkflowRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	ClusterId     string                 `protobuf:"bytes,1,opt,name=cluster_id,json=clusterId,proto3" json:"cluster_id,omitempty"`
+	Keyspace      string                 `protobuf:"bytes,2,opt,name=keyspace,proto3" json:"keyspace,omitempty"`
+	Workflow      string                 `protobuf:"bytes,3,opt,name=workflow,proto3" json:"workflow,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	ClusterId string `protobuf:"bytes,1,opt,name=cluster_id,json=clusterId,proto3" json:"cluster_id,omitempty"`
-	Keyspace  string `protobuf:"bytes,2,opt,name=keyspace,proto3" json:"keyspace,omitempty"`
-	Workflow  string `protobuf:"bytes,3,opt,name=workflow,proto3" json:"workflow,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *StartWorkflowRequest) Reset() {
@@ -4221,13 +4148,12 @@ func (x *StartWorkflowRequest) GetWorkflow() string {
 }
 
 type StopWorkflowRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	ClusterId     string                 `protobuf:"bytes,1,opt,name=cluster_id,json=clusterId,proto3" json:"cluster_id,omitempty"`
+	Keyspace      string                 `protobuf:"bytes,2,opt,name=keyspace,proto3" json:"keyspace,omitempty"`
+	Workflow      string                 `protobuf:"bytes,3,opt,name=workflow,proto3" json:"workflow,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	ClusterId string `protobuf:"bytes,1,opt,name=cluster_id,json=clusterId,proto3" json:"cluster_id,omitempty"`
-	Keyspace  string `protobuf:"bytes,2,opt,name=keyspace,proto3" json:"keyspace,omitempty"`
-	Workflow  string `protobuf:"bytes,3,opt,name=workflow,proto3" json:"workflow,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *StopWorkflowRequest) Reset() {
@@ -4282,11 +4208,8 @@ func (x *StopWorkflowRequest) GetWorkflow() string {
 }
 
 type GetWorkflowsRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	ClusterIds []string `protobuf:"bytes,1,rep,name=cluster_ids,json=clusterIds,proto3" json:"cluster_ids,omitempty"`
+	state      protoimpl.MessageState `protogen:"open.v1"`
+	ClusterIds []string               `protobuf:"bytes,1,rep,name=cluster_ids,json=clusterIds,proto3" json:"cluster_ids,omitempty"`
 	// ActiveOnly specifies whether to return workflows that are currently
 	// active (running or paused) instead of all workflows.
 	ActiveOnly bool `protobuf:"varint,2,opt,name=active_only,json=activeOnly,proto3" json:"active_only,omitempty"`
@@ -4305,6 +4228,8 @@ type GetWorkflowsRequest struct {
 	// search. It has the same semantics as the Keyspaces parameter, so refer to
 	// that documentation for more details.
 	IgnoreKeyspaces []string `protobuf:"bytes,4,rep,name=ignore_keyspaces,json=ignoreKeyspaces,proto3" json:"ignore_keyspaces,omitempty"`
+	unknownFields   protoimpl.UnknownFields
+	sizeCache       protoimpl.SizeCache
 }
 
 func (x *GetWorkflowsRequest) Reset() {
@@ -4366,11 +4291,10 @@ func (x *GetWorkflowsRequest) GetIgnoreKeyspaces() []string {
 }
 
 type GetWorkflowsResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	WorkflowsByCluster map[string]*ClusterWorkflows `protobuf:"bytes,1,rep,name=workflows_by_cluster,json=workflowsByCluster,proto3" json:"workflows_by_cluster,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
+	state              protoimpl.MessageState       `protogen:"open.v1"`
+	WorkflowsByCluster map[string]*ClusterWorkflows `protobuf:"bytes,1,rep,name=workflows_by_cluster,json=workflowsByCluster,proto3" json:"workflows_by_cluster,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
+	unknownFields      protoimpl.UnknownFields
+	sizeCache          protoimpl.SizeCache
 }
 
 func (x *GetWorkflowsResponse) Reset() {
@@ -4411,12 +4335,11 @@ func (x *GetWorkflowsResponse) GetWorkflowsByCluster() map[string]*ClusterWorkfl
 }
 
 type LaunchSchemaMigrationRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState                  `protogen:"open.v1"`
+	ClusterId     string                                  `protobuf:"bytes,1,opt,name=cluster_id,json=clusterId,proto3" json:"cluster_id,omitempty"`
+	Request       *vtctldata.LaunchSchemaMigrationRequest `protobuf:"bytes,2,opt,name=request,proto3" json:"request,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	ClusterId string                                  `protobuf:"bytes,1,opt,name=cluster_id,json=clusterId,proto3" json:"cluster_id,omitempty"`
-	Request   *vtctldata.LaunchSchemaMigrationRequest `protobuf:"bytes,2,opt,name=request,proto3" json:"request,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *LaunchSchemaMigrationRequest) Reset() {
@@ -4464,15 +4387,14 @@ func (x *LaunchSchemaMigrationRequest) GetRequest() *vtctldata.LaunchSchemaMigra
 }
 
 type MaterializeCreateRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	ClusterId string `protobuf:"bytes,1,opt,name=cluster_id,json=clusterId,proto3" json:"cluster_id,omitempty"`
+	state     protoimpl.MessageState `protogen:"open.v1"`
+	ClusterId string                 `protobuf:"bytes,1,opt,name=cluster_id,json=clusterId,proto3" json:"cluster_id,omitempty"`
 	// TableSettings is a JSON string defining what tables to materialize using
 	// what select statements.
 	TableSettings string                              `protobuf:"bytes,2,opt,name=table_settings,json=tableSettings,proto3" json:"table_settings,omitempty"`
 	Request       *vtctldata.MaterializeCreateRequest `protobuf:"bytes,3,opt,name=request,proto3" json:"request,omitempty"`
+	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *MaterializeCreateRequest) Reset() {
@@ -4527,12 +4449,11 @@ func (x *MaterializeCreateRequest) GetRequest() *vtctldata.MaterializeCreateRequ
 }
 
 type MoveTablesCompleteRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState               `protogen:"open.v1"`
+	ClusterId     string                               `protobuf:"bytes,1,opt,name=cluster_id,json=clusterId,proto3" json:"cluster_id,omitempty"`
+	Request       *vtctldata.MoveTablesCompleteRequest `protobuf:"bytes,2,opt,name=request,proto3" json:"request,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	ClusterId string                               `protobuf:"bytes,1,opt,name=cluster_id,json=clusterId,proto3" json:"cluster_id,omitempty"`
-	Request   *vtctldata.MoveTablesCompleteRequest `protobuf:"bytes,2,opt,name=request,proto3" json:"request,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *MoveTablesCompleteRequest) Reset() {
@@ -4580,12 +4501,11 @@ func (x *MoveTablesCompleteRequest) GetRequest() *vtctldata.MoveTablesCompleteRe
 }
 
 type MoveTablesCreateRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState             `protogen:"open.v1"`
+	ClusterId     string                             `protobuf:"bytes,1,opt,name=cluster_id,json=clusterId,proto3" json:"cluster_id,omitempty"`
+	Request       *vtctldata.MoveTablesCreateRequest `protobuf:"bytes,2,opt,name=request,proto3" json:"request,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	ClusterId string                             `protobuf:"bytes,1,opt,name=cluster_id,json=clusterId,proto3" json:"cluster_id,omitempty"`
-	Request   *vtctldata.MoveTablesCreateRequest `protobuf:"bytes,2,opt,name=request,proto3" json:"request,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *MoveTablesCreateRequest) Reset() {
@@ -4633,16 +4553,15 @@ func (x *MoveTablesCreateRequest) GetRequest() *vtctldata.MoveTablesCreateReques
 }
 
 type PingTabletRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
+	state protoimpl.MessageState `protogen:"open.v1"`
 	// Unique (per cluster) tablet alias of the standard form: "$cell-$uid"
 	Alias *topodata.TabletAlias `protobuf:"bytes,1,opt,name=alias,proto3" json:"alias,omitempty"`
 	// ClusterIDs is an optional parameter to narrow the scope of the search, if
 	// the caller knows which cluster the tablet may be in, or, to disambiguate
 	// if multiple clusters have a tablet with the same hostname.
-	ClusterIds []string `protobuf:"bytes,2,rep,name=cluster_ids,json=clusterIds,proto3" json:"cluster_ids,omitempty"`
+	ClusterIds    []string `protobuf:"bytes,2,rep,name=cluster_ids,json=clusterIds,proto3" json:"cluster_ids,omitempty"`
+	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *PingTabletRequest) Reset() {
@@ -4690,12 +4609,11 @@ func (x *PingTabletRequest) GetClusterIds() []string {
 }
 
 type PingTabletResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	Status        string                 `protobuf:"bytes,1,opt,name=status,proto3" json:"status,omitempty"`
+	Cluster       *Cluster               `protobuf:"bytes,2,opt,name=cluster,proto3" json:"cluster,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	Status  string   `protobuf:"bytes,1,opt,name=status,proto3" json:"status,omitempty"`
-	Cluster *Cluster `protobuf:"bytes,2,opt,name=cluster,proto3" json:"cluster,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *PingTabletResponse) Reset() {
@@ -4743,12 +4661,11 @@ func (x *PingTabletResponse) GetCluster() *Cluster {
 }
 
 type PlannedFailoverShardRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState                 `protogen:"open.v1"`
+	ClusterId     string                                 `protobuf:"bytes,1,opt,name=cluster_id,json=clusterId,proto3" json:"cluster_id,omitempty"`
+	Options       *vtctldata.PlannedReparentShardRequest `protobuf:"bytes,2,opt,name=options,proto3" json:"options,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	ClusterId string                                 `protobuf:"bytes,1,opt,name=cluster_id,json=clusterId,proto3" json:"cluster_id,omitempty"`
-	Options   *vtctldata.PlannedReparentShardRequest `protobuf:"bytes,2,opt,name=options,proto3" json:"options,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *PlannedFailoverShardRequest) Reset() {
@@ -4796,19 +4713,18 @@ func (x *PlannedFailoverShardRequest) GetOptions() *vtctldata.PlannedReparentSha
 }
 
 type PlannedFailoverShardResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Cluster  *Cluster `protobuf:"bytes,1,opt,name=cluster,proto3" json:"cluster,omitempty"`
-	Keyspace string   `protobuf:"bytes,2,opt,name=keyspace,proto3" json:"keyspace,omitempty"`
-	Shard    string   `protobuf:"bytes,3,opt,name=shard,proto3" json:"shard,omitempty"`
+	state    protoimpl.MessageState `protogen:"open.v1"`
+	Cluster  *Cluster               `protobuf:"bytes,1,opt,name=cluster,proto3" json:"cluster,omitempty"`
+	Keyspace string                 `protobuf:"bytes,2,opt,name=keyspace,proto3" json:"keyspace,omitempty"`
+	Shard    string                 `protobuf:"bytes,3,opt,name=shard,proto3" json:"shard,omitempty"`
 	// PromotedPrimary is the tablet alias that was promoted to shard primary.
 	// If NewPrimary was set in the request options, then this will be the
 	// same tablet alias. Otherwise, it will be the alias of the tablet found
 	// to be most up-to-date in the shard.
 	PromotedPrimary *topodata.TabletAlias `protobuf:"bytes,4,opt,name=promoted_primary,json=promotedPrimary,proto3" json:"promoted_primary,omitempty"`
 	Events          []*logutil.Event      `protobuf:"bytes,5,rep,name=events,proto3" json:"events,omitempty"`
+	unknownFields   protoimpl.UnknownFields
+	sizeCache       protoimpl.SizeCache
 }
 
 func (x *PlannedFailoverShardResponse) Reset() {
@@ -4877,14 +4793,13 @@ func (x *PlannedFailoverShardResponse) GetEvents() []*logutil.Event {
 }
 
 type RebuildKeyspaceGraphRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	ClusterId     string                 `protobuf:"bytes,1,opt,name=cluster_id,json=clusterId,proto3" json:"cluster_id,omitempty"`
+	Keyspace      string                 `protobuf:"bytes,2,opt,name=keyspace,proto3" json:"keyspace,omitempty"`
+	Cells         []string               `protobuf:"bytes,3,rep,name=cells,proto3" json:"cells,omitempty"`
+	AllowPartial  bool                   `protobuf:"varint,4,opt,name=allow_partial,json=allowPartial,proto3" json:"allow_partial,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	ClusterId    string   `protobuf:"bytes,1,opt,name=cluster_id,json=clusterId,proto3" json:"cluster_id,omitempty"`
-	Keyspace     string   `protobuf:"bytes,2,opt,name=keyspace,proto3" json:"keyspace,omitempty"`
-	Cells        []string `protobuf:"bytes,3,rep,name=cells,proto3" json:"cells,omitempty"`
-	AllowPartial bool     `protobuf:"varint,4,opt,name=allow_partial,json=allowPartial,proto3" json:"allow_partial,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *RebuildKeyspaceGraphRequest) Reset() {
@@ -4946,11 +4861,10 @@ func (x *RebuildKeyspaceGraphRequest) GetAllowPartial() bool {
 }
 
 type RebuildKeyspaceGraphResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	Status        string                 `protobuf:"bytes,1,opt,name=status,proto3" json:"status,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	Status string `protobuf:"bytes,1,opt,name=status,proto3" json:"status,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *RebuildKeyspaceGraphResponse) Reset() {
@@ -4991,12 +4905,11 @@ func (x *RebuildKeyspaceGraphResponse) GetStatus() string {
 }
 
 type RefreshStateRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	Alias         *topodata.TabletAlias  `protobuf:"bytes,1,opt,name=alias,proto3" json:"alias,omitempty"`
+	ClusterIds    []string               `protobuf:"bytes,2,rep,name=cluster_ids,json=clusterIds,proto3" json:"cluster_ids,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	Alias      *topodata.TabletAlias `protobuf:"bytes,1,opt,name=alias,proto3" json:"alias,omitempty"`
-	ClusterIds []string              `protobuf:"bytes,2,rep,name=cluster_ids,json=clusterIds,proto3" json:"cluster_ids,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *RefreshStateRequest) Reset() {
@@ -5044,12 +4957,11 @@ func (x *RefreshStateRequest) GetClusterIds() []string {
 }
 
 type RefreshStateResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	Status        string                 `protobuf:"bytes,1,opt,name=status,proto3" json:"status,omitempty"`
+	Cluster       *Cluster               `protobuf:"bytes,2,opt,name=cluster,proto3" json:"cluster,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	Status  string   `protobuf:"bytes,1,opt,name=status,proto3" json:"status,omitempty"`
-	Cluster *Cluster `protobuf:"bytes,2,opt,name=cluster,proto3" json:"cluster,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *RefreshStateResponse) Reset() {
@@ -5097,10 +5009,7 @@ func (x *RefreshStateResponse) GetCluster() *Cluster {
 }
 
 type ReloadSchemasRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
+	state protoimpl.MessageState `protogen:"open.v1"`
 	// Keyspaces, if set, will reload schemas across one or more keyspaces. A
 	// keyspace not existing in a cluster will not fail the overall request.
 	//
@@ -5143,6 +5052,8 @@ type ReloadSchemasRequest struct {
 	//
 	// Does not apply in Tablets mode.
 	IncludePrimary bool `protobuf:"varint,7,opt,name=include_primary,json=includePrimary,proto3" json:"include_primary,omitempty"`
+	unknownFields  protoimpl.UnknownFields
+	sizeCache      protoimpl.SizeCache
 }
 
 func (x *ReloadSchemasRequest) Reset() {
@@ -5225,10 +5136,7 @@ func (x *ReloadSchemasRequest) GetIncludePrimary() bool {
 }
 
 type ReloadSchemasResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
+	state protoimpl.MessageState `protogen:"open.v1"`
 	// KeyspaceResults is the list of KeyspaceResult objects for a ReloadSchemas
 	// operation. It is only set when the request mandates Keyspaces mode (see
 	// ReloadSchemasRequest).
@@ -5241,6 +5149,8 @@ type ReloadSchemasResponse struct {
 	// operation. It is only set when the request mandates Tablets mode (see
 	// ReloadSchemasRequest).
 	TabletResults []*ReloadSchemasResponse_TabletResult `protobuf:"bytes,3,rep,name=tablet_results,json=tabletResults,proto3" json:"tablet_results,omitempty"`
+	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *ReloadSchemasResponse) Reset() {
@@ -5295,16 +5205,15 @@ func (x *ReloadSchemasResponse) GetTabletResults() []*ReloadSchemasResponse_Tabl
 }
 
 type ReloadSchemaShardRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	ClusterId      string `protobuf:"bytes,1,opt,name=cluster_id,json=clusterId,proto3" json:"cluster_id,omitempty"`
-	Keyspace       string `protobuf:"bytes,2,opt,name=keyspace,proto3" json:"keyspace,omitempty"`
-	Shard          string `protobuf:"bytes,3,opt,name=shard,proto3" json:"shard,omitempty"`
-	WaitPosition   string `protobuf:"bytes,4,opt,name=wait_position,json=waitPosition,proto3" json:"wait_position,omitempty"`
-	IncludePrimary bool   `protobuf:"varint,5,opt,name=include_primary,json=includePrimary,proto3" json:"include_primary,omitempty"`
-	Concurrency    int32  `protobuf:"varint,6,opt,name=concurrency,proto3" json:"concurrency,omitempty"`
+	state          protoimpl.MessageState `protogen:"open.v1"`
+	ClusterId      string                 `protobuf:"bytes,1,opt,name=cluster_id,json=clusterId,proto3" json:"cluster_id,omitempty"`
+	Keyspace       string                 `protobuf:"bytes,2,opt,name=keyspace,proto3" json:"keyspace,omitempty"`
+	Shard          string                 `protobuf:"bytes,3,opt,name=shard,proto3" json:"shard,omitempty"`
+	WaitPosition   string                 `protobuf:"bytes,4,opt,name=wait_position,json=waitPosition,proto3" json:"wait_position,omitempty"`
+	IncludePrimary bool                   `protobuf:"varint,5,opt,name=include_primary,json=includePrimary,proto3" json:"include_primary,omitempty"`
+	Concurrency    int32                  `protobuf:"varint,6,opt,name=concurrency,proto3" json:"concurrency,omitempty"`
+	unknownFields  protoimpl.UnknownFields
+	sizeCache      protoimpl.SizeCache
 }
 
 func (x *ReloadSchemaShardRequest) Reset() {
@@ -5380,11 +5289,10 @@ func (x *ReloadSchemaShardRequest) GetConcurrency() int32 {
 }
 
 type ReloadSchemaShardResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	Events        []*logutil.Event       `protobuf:"bytes,1,rep,name=events,proto3" json:"events,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	Events []*logutil.Event `protobuf:"bytes,1,rep,name=events,proto3" json:"events,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *ReloadSchemaShardResponse) Reset() {
@@ -5425,12 +5333,11 @@ func (x *ReloadSchemaShardResponse) GetEvents() []*logutil.Event {
 }
 
 type RefreshTabletReplicationSourceRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	Alias         *topodata.TabletAlias  `protobuf:"bytes,1,opt,name=alias,proto3" json:"alias,omitempty"`
+	ClusterIds    []string               `protobuf:"bytes,2,rep,name=cluster_ids,json=clusterIds,proto3" json:"cluster_ids,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	Alias      *topodata.TabletAlias `protobuf:"bytes,1,opt,name=alias,proto3" json:"alias,omitempty"`
-	ClusterIds []string              `protobuf:"bytes,2,rep,name=cluster_ids,json=clusterIds,proto3" json:"cluster_ids,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *RefreshTabletReplicationSourceRequest) Reset() {
@@ -5478,14 +5385,13 @@ func (x *RefreshTabletReplicationSourceRequest) GetClusterIds() []string {
 }
 
 type RefreshTabletReplicationSourceResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	Keyspace      string                 `protobuf:"bytes,1,opt,name=keyspace,proto3" json:"keyspace,omitempty"`
+	Shard         string                 `protobuf:"bytes,2,opt,name=shard,proto3" json:"shard,omitempty"`
+	Primary       *topodata.TabletAlias  `protobuf:"bytes,3,opt,name=primary,proto3" json:"primary,omitempty"`
+	Cluster       *Cluster               `protobuf:"bytes,4,opt,name=cluster,proto3" json:"cluster,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	Keyspace string                `protobuf:"bytes,1,opt,name=keyspace,proto3" json:"keyspace,omitempty"`
-	Shard    string                `protobuf:"bytes,2,opt,name=shard,proto3" json:"shard,omitempty"`
-	Primary  *topodata.TabletAlias `protobuf:"bytes,3,opt,name=primary,proto3" json:"primary,omitempty"`
-	Cluster  *Cluster              `protobuf:"bytes,4,opt,name=cluster,proto3" json:"cluster,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *RefreshTabletReplicationSourceResponse) Reset() {
@@ -5547,15 +5453,14 @@ func (x *RefreshTabletReplicationSourceResponse) GetCluster() *Cluster {
 }
 
 type RemoveKeyspaceCellRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	ClusterId     string                 `protobuf:"bytes,1,opt,name=cluster_id,json=clusterId,proto3" json:"cluster_id,omitempty"`
+	Keyspace      string                 `protobuf:"bytes,2,opt,name=keyspace,proto3" json:"keyspace,omitempty"`
+	Cell          string                 `protobuf:"bytes,3,opt,name=cell,proto3" json:"cell,omitempty"`
+	Force         bool                   `protobuf:"varint,4,opt,name=force,proto3" json:"force,omitempty"`
+	Recursive     bool                   `protobuf:"varint,5,opt,name=recursive,proto3" json:"recursive,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	ClusterId string `protobuf:"bytes,1,opt,name=cluster_id,json=clusterId,proto3" json:"cluster_id,omitempty"`
-	Keyspace  string `protobuf:"bytes,2,opt,name=keyspace,proto3" json:"keyspace,omitempty"`
-	Cell      string `protobuf:"bytes,3,opt,name=cell,proto3" json:"cell,omitempty"`
-	Force     bool   `protobuf:"varint,4,opt,name=force,proto3" json:"force,omitempty"`
-	Recursive bool   `protobuf:"varint,5,opt,name=recursive,proto3" json:"recursive,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *RemoveKeyspaceCellRequest) Reset() {
@@ -5624,11 +5529,10 @@ func (x *RemoveKeyspaceCellRequest) GetRecursive() bool {
 }
 
 type RemoveKeyspaceCellResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	Status        string                 `protobuf:"bytes,1,opt,name=status,proto3" json:"status,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	Status string `protobuf:"bytes,1,opt,name=status,proto3" json:"status,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *RemoveKeyspaceCellResponse) Reset() {
@@ -5669,12 +5573,11 @@ func (x *RemoveKeyspaceCellResponse) GetStatus() string {
 }
 
 type RetrySchemaMigrationRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState                 `protogen:"open.v1"`
+	ClusterId     string                                 `protobuf:"bytes,1,opt,name=cluster_id,json=clusterId,proto3" json:"cluster_id,omitempty"`
+	Request       *vtctldata.RetrySchemaMigrationRequest `protobuf:"bytes,2,opt,name=request,proto3" json:"request,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	ClusterId string                                 `protobuf:"bytes,1,opt,name=cluster_id,json=clusterId,proto3" json:"cluster_id,omitempty"`
-	Request   *vtctldata.RetrySchemaMigrationRequest `protobuf:"bytes,2,opt,name=request,proto3" json:"request,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *RetrySchemaMigrationRequest) Reset() {
@@ -5722,12 +5625,11 @@ func (x *RetrySchemaMigrationRequest) GetRequest() *vtctldata.RetrySchemaMigrati
 }
 
 type RunHealthCheckRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	Alias         *topodata.TabletAlias  `protobuf:"bytes,1,opt,name=alias,proto3" json:"alias,omitempty"`
+	ClusterIds    []string               `protobuf:"bytes,2,rep,name=cluster_ids,json=clusterIds,proto3" json:"cluster_ids,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	Alias      *topodata.TabletAlias `protobuf:"bytes,1,opt,name=alias,proto3" json:"alias,omitempty"`
-	ClusterIds []string              `protobuf:"bytes,2,rep,name=cluster_ids,json=clusterIds,proto3" json:"cluster_ids,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *RunHealthCheckRequest) Reset() {
@@ -5775,12 +5677,11 @@ func (x *RunHealthCheckRequest) GetClusterIds() []string {
 }
 
 type RunHealthCheckResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	Status        string                 `protobuf:"bytes,1,opt,name=status,proto3" json:"status,omitempty"`
+	Cluster       *Cluster               `protobuf:"bytes,2,opt,name=cluster,proto3" json:"cluster,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	Status  string   `protobuf:"bytes,1,opt,name=status,proto3" json:"status,omitempty"`
-	Cluster *Cluster `protobuf:"bytes,2,opt,name=cluster,proto3" json:"cluster,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *RunHealthCheckResponse) Reset() {
@@ -5828,12 +5729,11 @@ func (x *RunHealthCheckResponse) GetCluster() *Cluster {
 }
 
 type ReshardCreateRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState          `protogen:"open.v1"`
+	ClusterId     string                          `protobuf:"bytes,1,opt,name=cluster_id,json=clusterId,proto3" json:"cluster_id,omitempty"`
+	Request       *vtctldata.ReshardCreateRequest `protobuf:"bytes,2,opt,name=request,proto3" json:"request,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	ClusterId string                          `protobuf:"bytes,1,opt,name=cluster_id,json=clusterId,proto3" json:"cluster_id,omitempty"`
-	Request   *vtctldata.ReshardCreateRequest `protobuf:"bytes,2,opt,name=request,proto3" json:"request,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *ReshardCreateRequest) Reset() {
@@ -5881,12 +5781,11 @@ func (x *ReshardCreateRequest) GetRequest() *vtctldata.ReshardCreateRequest {
 }
 
 type SetReadOnlyRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	Alias         *topodata.TabletAlias  `protobuf:"bytes,1,opt,name=alias,proto3" json:"alias,omitempty"`
+	ClusterIds    []string               `protobuf:"bytes,2,rep,name=cluster_ids,json=clusterIds,proto3" json:"cluster_ids,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	Alias      *topodata.TabletAlias `protobuf:"bytes,1,opt,name=alias,proto3" json:"alias,omitempty"`
-	ClusterIds []string              `protobuf:"bytes,2,rep,name=cluster_ids,json=clusterIds,proto3" json:"cluster_ids,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *SetReadOnlyRequest) Reset() {
@@ -5934,9 +5833,9 @@ func (x *SetReadOnlyRequest) GetClusterIds() []string {
 }
 
 type SetReadOnlyResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
 	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *SetReadOnlyResponse) Reset() {
@@ -5970,12 +5869,11 @@ func (*SetReadOnlyResponse) Descriptor() ([]byte, []int) {
 }
 
 type SetReadWriteRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	Alias         *topodata.TabletAlias  `protobuf:"bytes,1,opt,name=alias,proto3" json:"alias,omitempty"`
+	ClusterIds    []string               `protobuf:"bytes,2,rep,name=cluster_ids,json=clusterIds,proto3" json:"cluster_ids,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	Alias      *topodata.TabletAlias `protobuf:"bytes,1,opt,name=alias,proto3" json:"alias,omitempty"`
-	ClusterIds []string              `protobuf:"bytes,2,rep,name=cluster_ids,json=clusterIds,proto3" json:"cluster_ids,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *SetReadWriteRequest) Reset() {
@@ -6023,9 +5921,9 @@ func (x *SetReadWriteRequest) GetClusterIds() []string {
 }
 
 type SetReadWriteResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
 	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *SetReadWriteResponse) Reset() {
@@ -6059,12 +5957,11 @@ func (*SetReadWriteResponse) Descriptor() ([]byte, []int) {
 }
 
 type StartReplicationRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	Alias         *topodata.TabletAlias  `protobuf:"bytes,1,opt,name=alias,proto3" json:"alias,omitempty"`
+	ClusterIds    []string               `protobuf:"bytes,2,rep,name=cluster_ids,json=clusterIds,proto3" json:"cluster_ids,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	Alias      *topodata.TabletAlias `protobuf:"bytes,1,opt,name=alias,proto3" json:"alias,omitempty"`
-	ClusterIds []string              `protobuf:"bytes,2,rep,name=cluster_ids,json=clusterIds,proto3" json:"cluster_ids,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *StartReplicationRequest) Reset() {
@@ -6112,12 +6009,11 @@ func (x *StartReplicationRequest) GetClusterIds() []string {
 }
 
 type StartReplicationResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	Status        string                 `protobuf:"bytes,1,opt,name=status,proto3" json:"status,omitempty"`
+	Cluster       *Cluster               `protobuf:"bytes,2,opt,name=cluster,proto3" json:"cluster,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	Status  string   `protobuf:"bytes,1,opt,name=status,proto3" json:"status,omitempty"`
-	Cluster *Cluster `protobuf:"bytes,2,opt,name=cluster,proto3" json:"cluster,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *StartReplicationResponse) Reset() {
@@ -6165,12 +6061,11 @@ func (x *StartReplicationResponse) GetCluster() *Cluster {
 }
 
 type StopReplicationRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	Alias         *topodata.TabletAlias  `protobuf:"bytes,1,opt,name=alias,proto3" json:"alias,omitempty"`
+	ClusterIds    []string               `protobuf:"bytes,2,rep,name=cluster_ids,json=clusterIds,proto3" json:"cluster_ids,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	Alias      *topodata.TabletAlias `protobuf:"bytes,1,opt,name=alias,proto3" json:"alias,omitempty"`
-	ClusterIds []string              `protobuf:"bytes,2,rep,name=cluster_ids,json=clusterIds,proto3" json:"cluster_ids,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *StopReplicationRequest) Reset() {
@@ -6218,12 +6113,11 @@ func (x *StopReplicationRequest) GetClusterIds() []string {
 }
 
 type StopReplicationResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	Status        string                 `protobuf:"bytes,1,opt,name=status,proto3" json:"status,omitempty"`
+	Cluster       *Cluster               `protobuf:"bytes,2,opt,name=cluster,proto3" json:"cluster,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	Status  string   `protobuf:"bytes,1,opt,name=status,proto3" json:"status,omitempty"`
-	Cluster *Cluster `protobuf:"bytes,2,opt,name=cluster,proto3" json:"cluster,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *StopReplicationResponse) Reset() {
@@ -6271,14 +6165,13 @@ func (x *StopReplicationResponse) GetCluster() *Cluster {
 }
 
 type TabletExternallyPromotedRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
+	state protoimpl.MessageState `protogen:"open.v1"`
 	// Tablet is the alias of the tablet that was promoted externally and should
 	// be updated to the shard primary in the topo.
-	Alias      *topodata.TabletAlias `protobuf:"bytes,1,opt,name=alias,proto3" json:"alias,omitempty"`
-	ClusterIds []string              `protobuf:"bytes,2,rep,name=cluster_ids,json=clusterIds,proto3" json:"cluster_ids,omitempty"`
+	Alias         *topodata.TabletAlias `protobuf:"bytes,1,opt,name=alias,proto3" json:"alias,omitempty"`
+	ClusterIds    []string              `protobuf:"bytes,2,rep,name=cluster_ids,json=clusterIds,proto3" json:"cluster_ids,omitempty"`
+	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *TabletExternallyPromotedRequest) Reset() {
@@ -6326,15 +6219,14 @@ func (x *TabletExternallyPromotedRequest) GetClusterIds() []string {
 }
 
 type TabletExternallyPromotedResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	Cluster       *Cluster               `protobuf:"bytes,1,opt,name=cluster,proto3" json:"cluster,omitempty"`
+	Keyspace      string                 `protobuf:"bytes,2,opt,name=keyspace,proto3" json:"keyspace,omitempty"`
+	Shard         string                 `protobuf:"bytes,3,opt,name=shard,proto3" json:"shard,omitempty"`
+	NewPrimary    *topodata.TabletAlias  `protobuf:"bytes,4,opt,name=new_primary,json=newPrimary,proto3" json:"new_primary,omitempty"`
+	OldPrimary    *topodata.TabletAlias  `protobuf:"bytes,5,opt,name=old_primary,json=oldPrimary,proto3" json:"old_primary,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	Cluster    *Cluster              `protobuf:"bytes,1,opt,name=cluster,proto3" json:"cluster,omitempty"`
-	Keyspace   string                `protobuf:"bytes,2,opt,name=keyspace,proto3" json:"keyspace,omitempty"`
-	Shard      string                `protobuf:"bytes,3,opt,name=shard,proto3" json:"shard,omitempty"`
-	NewPrimary *topodata.TabletAlias `protobuf:"bytes,4,opt,name=new_primary,json=newPrimary,proto3" json:"new_primary,omitempty"`
-	OldPrimary *topodata.TabletAlias `protobuf:"bytes,5,opt,name=old_primary,json=oldPrimary,proto3" json:"old_primary,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *TabletExternallyPromotedResponse) Reset() {
@@ -6403,12 +6295,11 @@ func (x *TabletExternallyPromotedResponse) GetOldPrimary() *topodata.TabletAlias
 }
 
 type TabletExternallyReparentedRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	Alias         *topodata.TabletAlias  `protobuf:"bytes,1,opt,name=alias,proto3" json:"alias,omitempty"`
+	ClusterIds    []string               `protobuf:"bytes,2,rep,name=cluster_ids,json=clusterIds,proto3" json:"cluster_ids,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	Alias      *topodata.TabletAlias `protobuf:"bytes,1,opt,name=alias,proto3" json:"alias,omitempty"`
-	ClusterIds []string              `protobuf:"bytes,2,rep,name=cluster_ids,json=clusterIds,proto3" json:"cluster_ids,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *TabletExternallyReparentedRequest) Reset() {
@@ -6456,12 +6347,11 @@ func (x *TabletExternallyReparentedRequest) GetClusterIds() []string {
 }
 
 type ValidateRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	ClusterId     string                 `protobuf:"bytes,1,opt,name=cluster_id,json=clusterId,proto3" json:"cluster_id,omitempty"`
+	PingTablets   bool                   `protobuf:"varint,2,opt,name=ping_tablets,json=pingTablets,proto3" json:"ping_tablets,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	ClusterId   string `protobuf:"bytes,1,opt,name=cluster_id,json=clusterId,proto3" json:"cluster_id,omitempty"`
-	PingTablets bool   `protobuf:"varint,2,opt,name=ping_tablets,json=pingTablets,proto3" json:"ping_tablets,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *ValidateRequest) Reset() {
@@ -6509,13 +6399,12 @@ func (x *ValidateRequest) GetPingTablets() bool {
 }
 
 type ValidateKeyspaceRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	ClusterId     string                 `protobuf:"bytes,1,opt,name=cluster_id,json=clusterId,proto3" json:"cluster_id,omitempty"`
+	Keyspace      string                 `protobuf:"bytes,2,opt,name=keyspace,proto3" json:"keyspace,omitempty"`
+	PingTablets   bool                   `protobuf:"varint,3,opt,name=ping_tablets,json=pingTablets,proto3" json:"ping_tablets,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	ClusterId   string `protobuf:"bytes,1,opt,name=cluster_id,json=clusterId,proto3" json:"cluster_id,omitempty"`
-	Keyspace    string `protobuf:"bytes,2,opt,name=keyspace,proto3" json:"keyspace,omitempty"`
-	PingTablets bool   `protobuf:"varint,3,opt,name=ping_tablets,json=pingTablets,proto3" json:"ping_tablets,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *ValidateKeyspaceRequest) Reset() {
@@ -6570,12 +6459,11 @@ func (x *ValidateKeyspaceRequest) GetPingTablets() bool {
 }
 
 type ValidateSchemaKeyspaceRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	ClusterId     string                 `protobuf:"bytes,1,opt,name=cluster_id,json=clusterId,proto3" json:"cluster_id,omitempty"`
+	Keyspace      string                 `protobuf:"bytes,2,opt,name=keyspace,proto3" json:"keyspace,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	ClusterId string `protobuf:"bytes,1,opt,name=cluster_id,json=clusterId,proto3" json:"cluster_id,omitempty"`
-	Keyspace  string `protobuf:"bytes,2,opt,name=keyspace,proto3" json:"keyspace,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *ValidateSchemaKeyspaceRequest) Reset() {
@@ -6623,14 +6511,13 @@ func (x *ValidateSchemaKeyspaceRequest) GetKeyspace() string {
 }
 
 type ValidateShardRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	ClusterId     string                 `protobuf:"bytes,1,opt,name=cluster_id,json=clusterId,proto3" json:"cluster_id,omitempty"`
+	Keyspace      string                 `protobuf:"bytes,2,opt,name=keyspace,proto3" json:"keyspace,omitempty"`
+	Shard         string                 `protobuf:"bytes,3,opt,name=shard,proto3" json:"shard,omitempty"`
+	PingTablets   bool                   `protobuf:"varint,4,opt,name=ping_tablets,json=pingTablets,proto3" json:"ping_tablets,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	ClusterId   string `protobuf:"bytes,1,opt,name=cluster_id,json=clusterId,proto3" json:"cluster_id,omitempty"`
-	Keyspace    string `protobuf:"bytes,2,opt,name=keyspace,proto3" json:"keyspace,omitempty"`
-	Shard       string `protobuf:"bytes,3,opt,name=shard,proto3" json:"shard,omitempty"`
-	PingTablets bool   `protobuf:"varint,4,opt,name=ping_tablets,json=pingTablets,proto3" json:"ping_tablets,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *ValidateShardRequest) Reset() {
@@ -6692,12 +6579,11 @@ func (x *ValidateShardRequest) GetPingTablets() bool {
 }
 
 type ValidateVersionKeyspaceRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	ClusterId     string                 `protobuf:"bytes,1,opt,name=cluster_id,json=clusterId,proto3" json:"cluster_id,omitempty"`
+	Keyspace      string                 `protobuf:"bytes,2,opt,name=keyspace,proto3" json:"keyspace,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	ClusterId string `protobuf:"bytes,1,opt,name=cluster_id,json=clusterId,proto3" json:"cluster_id,omitempty"`
-	Keyspace  string `protobuf:"bytes,2,opt,name=keyspace,proto3" json:"keyspace,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *ValidateVersionKeyspaceRequest) Reset() {
@@ -6745,13 +6631,12 @@ func (x *ValidateVersionKeyspaceRequest) GetKeyspace() string {
 }
 
 type ValidateVersionShardRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	ClusterId     string                 `protobuf:"bytes,1,opt,name=cluster_id,json=clusterId,proto3" json:"cluster_id,omitempty"`
+	Keyspace      string                 `protobuf:"bytes,2,opt,name=keyspace,proto3" json:"keyspace,omitempty"`
+	Shard         string                 `protobuf:"bytes,3,opt,name=shard,proto3" json:"shard,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	ClusterId string `protobuf:"bytes,1,opt,name=cluster_id,json=clusterId,proto3" json:"cluster_id,omitempty"`
-	Keyspace  string `protobuf:"bytes,2,opt,name=keyspace,proto3" json:"keyspace,omitempty"`
-	Shard     string `protobuf:"bytes,3,opt,name=shard,proto3" json:"shard,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *ValidateVersionShardRequest) Reset() {
@@ -6806,12 +6691,11 @@ func (x *ValidateVersionShardRequest) GetShard() string {
 }
 
 type VDiffCreateRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState        `protogen:"open.v1"`
+	ClusterId     string                        `protobuf:"bytes,1,opt,name=cluster_id,json=clusterId,proto3" json:"cluster_id,omitempty"`
+	Request       *vtctldata.VDiffCreateRequest `protobuf:"bytes,2,opt,name=request,proto3" json:"request,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	ClusterId string                        `protobuf:"bytes,1,opt,name=cluster_id,json=clusterId,proto3" json:"cluster_id,omitempty"`
-	Request   *vtctldata.VDiffCreateRequest `protobuf:"bytes,2,opt,name=request,proto3" json:"request,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *VDiffCreateRequest) Reset() {
@@ -6859,12 +6743,11 @@ func (x *VDiffCreateRequest) GetRequest() *vtctldata.VDiffCreateRequest {
 }
 
 type VDiffShowRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState      `protogen:"open.v1"`
+	ClusterId     string                      `protobuf:"bytes,1,opt,name=cluster_id,json=clusterId,proto3" json:"cluster_id,omitempty"`
+	Request       *vtctldata.VDiffShowRequest `protobuf:"bytes,2,opt,name=request,proto3" json:"request,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	ClusterId string                      `protobuf:"bytes,1,opt,name=cluster_id,json=clusterId,proto3" json:"cluster_id,omitempty"`
-	Request   *vtctldata.VDiffShowRequest `protobuf:"bytes,2,opt,name=request,proto3" json:"request,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *VDiffShowRequest) Reset() {
@@ -6912,12 +6795,11 @@ func (x *VDiffShowRequest) GetRequest() *vtctldata.VDiffShowRequest {
 }
 
 type VDiffProgress struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	Percentage    float64                `protobuf:"fixed64,1,opt,name=percentage,proto3" json:"percentage,omitempty"`
+	Eta           string                 `protobuf:"bytes,2,opt,name=eta,proto3" json:"eta,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	Percentage float64 `protobuf:"fixed64,1,opt,name=percentage,proto3" json:"percentage,omitempty"`
-	Eta        string  `protobuf:"bytes,2,opt,name=eta,proto3" json:"eta,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *VDiffProgress) Reset() {
@@ -6965,16 +6847,15 @@ func (x *VDiffProgress) GetEta() string {
 }
 
 type VDiffShardReport struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	State         string                 `protobuf:"bytes,1,opt,name=state,proto3" json:"state,omitempty"`
+	RowsCompared  int64                  `protobuf:"varint,2,opt,name=rows_compared,json=rowsCompared,proto3" json:"rows_compared,omitempty"`
+	HasMismatch   bool                   `protobuf:"varint,3,opt,name=has_mismatch,json=hasMismatch,proto3" json:"has_mismatch,omitempty"`
+	StartedAt     string                 `protobuf:"bytes,4,opt,name=started_at,json=startedAt,proto3" json:"started_at,omitempty"`
+	CompletedAt   string                 `protobuf:"bytes,5,opt,name=completed_at,json=completedAt,proto3" json:"completed_at,omitempty"`
+	Progress      *VDiffProgress         `protobuf:"bytes,6,opt,name=progress,proto3" json:"progress,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	State        string         `protobuf:"bytes,1,opt,name=state,proto3" json:"state,omitempty"`
-	RowsCompared int64          `protobuf:"varint,2,opt,name=rows_compared,json=rowsCompared,proto3" json:"rows_compared,omitempty"`
-	HasMismatch  bool           `protobuf:"varint,3,opt,name=has_mismatch,json=hasMismatch,proto3" json:"has_mismatch,omitempty"`
-	StartedAt    string         `protobuf:"bytes,4,opt,name=started_at,json=startedAt,proto3" json:"started_at,omitempty"`
-	CompletedAt  string         `protobuf:"bytes,5,opt,name=completed_at,json=completedAt,proto3" json:"completed_at,omitempty"`
-	Progress     *VDiffProgress `protobuf:"bytes,6,opt,name=progress,proto3" json:"progress,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *VDiffShardReport) Reset() {
@@ -7050,11 +6931,10 @@ func (x *VDiffShardReport) GetProgress() *VDiffProgress {
 }
 
 type VDiffShowResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState       `protogen:"open.v1"`
+	ShardReport   map[string]*VDiffShardReport `protobuf:"bytes,1,rep,name=shard_report,json=shardReport,proto3" json:"shard_report,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
 	unknownFields protoimpl.UnknownFields
-
-	ShardReport map[string]*VDiffShardReport `protobuf:"bytes,1,rep,name=shard_report,json=shardReport,proto3" json:"shard_report,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *VDiffShowResponse) Reset() {
@@ -7095,13 +6975,12 @@ func (x *VDiffShowResponse) GetShardReport() map[string]*VDiffShardReport {
 }
 
 type VTExplainRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	Cluster       string                 `protobuf:"bytes,1,opt,name=cluster,proto3" json:"cluster,omitempty"`
+	Keyspace      string                 `protobuf:"bytes,2,opt,name=keyspace,proto3" json:"keyspace,omitempty"`
+	Sql           string                 `protobuf:"bytes,3,opt,name=sql,proto3" json:"sql,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	Cluster  string `protobuf:"bytes,1,opt,name=cluster,proto3" json:"cluster,omitempty"`
-	Keyspace string `protobuf:"bytes,2,opt,name=keyspace,proto3" json:"keyspace,omitempty"`
-	Sql      string `protobuf:"bytes,3,opt,name=sql,proto3" json:"sql,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *VTExplainRequest) Reset() {
@@ -7156,11 +7035,10 @@ func (x *VTExplainRequest) GetSql() string {
 }
 
 type VTExplainResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	Response      string                 `protobuf:"bytes,1,opt,name=response,proto3" json:"response,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	Response string `protobuf:"bytes,1,opt,name=response,proto3" json:"response,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *VTExplainResponse) Reset() {
@@ -7201,13 +7079,12 @@ func (x *VTExplainResponse) GetResponse() string {
 }
 
 type VExplainRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	ClusterId     string                 `protobuf:"bytes,1,opt,name=cluster_id,json=clusterId,proto3" json:"cluster_id,omitempty"`
+	Keyspace      string                 `protobuf:"bytes,2,opt,name=keyspace,proto3" json:"keyspace,omitempty"`
+	Sql           string                 `protobuf:"bytes,3,opt,name=sql,proto3" json:"sql,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	ClusterId string `protobuf:"bytes,1,opt,name=cluster_id,json=clusterId,proto3" json:"cluster_id,omitempty"`
-	Keyspace  string `protobuf:"bytes,2,opt,name=keyspace,proto3" json:"keyspace,omitempty"`
-	Sql       string `protobuf:"bytes,3,opt,name=sql,proto3" json:"sql,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *VExplainRequest) Reset() {
@@ -7262,11 +7139,10 @@ func (x *VExplainRequest) GetSql() string {
 }
 
 type VExplainResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	Response      string                 `protobuf:"bytes,1,opt,name=response,proto3" json:"response,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	Response string `protobuf:"bytes,1,opt,name=response,proto3" json:"response,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *VExplainResponse) Reset() {
@@ -7307,12 +7183,11 @@ func (x *VExplainResponse) GetResponse() string {
 }
 
 type Schema_ShardTableSize struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	RowCount      uint64                 `protobuf:"varint,1,opt,name=row_count,json=rowCount,proto3" json:"row_count,omitempty"`
+	DataLength    uint64                 `protobuf:"varint,2,opt,name=data_length,json=dataLength,proto3" json:"data_length,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	RowCount   uint64 `protobuf:"varint,1,opt,name=row_count,json=rowCount,proto3" json:"row_count,omitempty"`
-	DataLength uint64 `protobuf:"varint,2,opt,name=data_length,json=dataLength,proto3" json:"data_length,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *Schema_ShardTableSize) Reset() {
@@ -7362,13 +7237,12 @@ func (x *Schema_ShardTableSize) GetDataLength() uint64 {
 // TableSize aggregates table size information across all shards containing
 // in the given keyspace and cluster, as well as per-shard size information.
 type Schema_TableSize struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState            `protogen:"open.v1"`
+	RowCount      uint64                            `protobuf:"varint,1,opt,name=row_count,json=rowCount,proto3" json:"row_count,omitempty"`
+	DataLength    uint64                            `protobuf:"varint,2,opt,name=data_length,json=dataLength,proto3" json:"data_length,omitempty"`
+	ByShard       map[string]*Schema_ShardTableSize `protobuf:"bytes,3,rep,name=by_shard,json=byShard,proto3" json:"by_shard,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
 	unknownFields protoimpl.UnknownFields
-
-	RowCount   uint64                            `protobuf:"varint,1,opt,name=row_count,json=rowCount,proto3" json:"row_count,omitempty"`
-	DataLength uint64                            `protobuf:"varint,2,opt,name=data_length,json=dataLength,proto3" json:"data_length,omitempty"`
-	ByShard    map[string]*Schema_ShardTableSize `protobuf:"bytes,3,rep,name=by_shard,json=byShard,proto3" json:"by_shard,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *Schema_TableSize) Reset() {
@@ -7423,12 +7297,11 @@ func (x *Schema_TableSize) GetByShard() map[string]*Schema_ShardTableSize {
 }
 
 type GetSchemaMigrationsRequest_ClusterRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState                `protogen:"open.v1"`
+	ClusterId     string                                `protobuf:"bytes,1,opt,name=cluster_id,json=clusterId,proto3" json:"cluster_id,omitempty"`
+	Request       *vtctldata.GetSchemaMigrationsRequest `protobuf:"bytes,2,opt,name=request,proto3" json:"request,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	ClusterId string                                `protobuf:"bytes,1,opt,name=cluster_id,json=clusterId,proto3" json:"cluster_id,omitempty"`
-	Request   *vtctldata.GetSchemaMigrationsRequest `protobuf:"bytes,2,opt,name=request,proto3" json:"request,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *GetSchemaMigrationsRequest_ClusterRequest) Reset() {
@@ -7482,12 +7355,11 @@ func (x *GetSchemaMigrationsRequest_ClusterRequest) GetRequest() *vtctldata.GetS
 // It is only set when a ReloadSchemas request mandates Keyspaces mode
 // (see ReloadSchemasRequest).
 type ReloadSchemasResponse_KeyspaceResult struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	Keyspace      *Keyspace              `protobuf:"bytes,1,opt,name=keyspace,proto3" json:"keyspace,omitempty"`
+	Events        []*logutil.Event       `protobuf:"bytes,2,rep,name=events,proto3" json:"events,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	Keyspace *Keyspace        `protobuf:"bytes,1,opt,name=keyspace,proto3" json:"keyspace,omitempty"`
-	Events   []*logutil.Event `protobuf:"bytes,2,rep,name=events,proto3" json:"events,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *ReloadSchemasResponse_KeyspaceResult) Reset() {
@@ -7541,12 +7413,11 @@ func (x *ReloadSchemasResponse_KeyspaceResult) GetEvents() []*logutil.Event {
 // It is only set when a ReloadSchemas request mandates KeyspaceShards mode
 // (see ReloadSchemasRequest).
 type ReloadSchemasResponse_ShardResult struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	Shard         *Shard                 `protobuf:"bytes,1,opt,name=shard,proto3" json:"shard,omitempty"`
+	Events        []*logutil.Event       `protobuf:"bytes,2,rep,name=events,proto3" json:"events,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	Shard  *Shard           `protobuf:"bytes,1,opt,name=shard,proto3" json:"shard,omitempty"`
-	Events []*logutil.Event `protobuf:"bytes,2,rep,name=events,proto3" json:"events,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *ReloadSchemasResponse_ShardResult) Reset() {
@@ -7601,12 +7472,11 @@ func (x *ReloadSchemasResponse_ShardResult) GetEvents() []*logutil.Event {
 // It is only set when a ReloadSchemas request mandates Tablets mode (see
 // ReloadSchemasRequest).
 type ReloadSchemasResponse_TabletResult struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	Tablet        *Tablet                `protobuf:"bytes,1,opt,name=tablet,proto3" json:"tablet,omitempty"`
+	Result        string                 `protobuf:"bytes,2,opt,name=result,proto3" json:"result,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	Tablet *Tablet `protobuf:"bytes,1,opt,name=tablet,proto3" json:"tablet,omitempty"`
-	Result string  `protobuf:"bytes,2,opt,name=result,proto3" json:"result,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *ReloadSchemasResponse_TabletResult) Reset() {
@@ -7655,7 +7525,7 @@ func (x *ReloadSchemasResponse_TabletResult) GetResult() string {
 
 var File_vtadmin_proto protoreflect.FileDescriptor
 
-var file_vtadmin_proto_rawDesc = []byte{
+var file_vtadmin_proto_rawDesc = string([]byte{
 	0x0a, 0x0d, 0x76, 0x74, 0x61, 0x64, 0x6d, 0x69, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12,
 	0x07, 0x76, 0x74, 0x61, 0x64, 0x6d, 0x69, 0x6e, 0x1a, 0x0d, 0x6c, 0x6f, 0x67, 0x75, 0x74, 0x69,
 	0x6c, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x0e, 0x6d, 0x79, 0x73, 0x71, 0x6c, 0x63, 0x74,
@@ -9064,16 +8934,16 @@ var file_vtadmin_proto_rawDesc = []byte{
 	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, 0x76, 0x74, 0x61, 0x64, 0x6d, 0x69,
 	0x6e, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
-}
+})
 
 var (
 	file_vtadmin_proto_rawDescOnce sync.Once
-	file_vtadmin_proto_rawDescData = file_vtadmin_proto_rawDesc
+	file_vtadmin_proto_rawDescData []byte
 )
 
 func file_vtadmin_proto_rawDescGZIP() []byte {
 	file_vtadmin_proto_rawDescOnce.Do(func() {
-		file_vtadmin_proto_rawDescData = protoimpl.X.CompressGZIP(file_vtadmin_proto_rawDescData)
+		file_vtadmin_proto_rawDescData = protoimpl.X.CompressGZIP(unsafe.Slice(unsafe.StringData(file_vtadmin_proto_rawDesc), len(file_vtadmin_proto_rawDesc)))
 	})
 	return file_vtadmin_proto_rawDescData
 }
@@ -9575,7 +9445,7 @@ func file_vtadmin_proto_init() {
 	out := protoimpl.TypeBuilder{
 		File: protoimpl.DescBuilder{
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
-			RawDescriptor: file_vtadmin_proto_rawDesc,
+			RawDescriptor: unsafe.Slice(unsafe.StringData(file_vtadmin_proto_rawDesc), len(file_vtadmin_proto_rawDesc)),
 			NumEnums:      1,
 			NumMessages:   141,
 			NumExtensions: 0,
@@ -9587,7 +9457,6 @@ func file_vtadmin_proto_init() {
 		MessageInfos:      file_vtadmin_proto_msgTypes,
 	}.Build()
 	File_vtadmin_proto = out.File
-	file_vtadmin_proto_rawDesc = nil
 	file_vtadmin_proto_goTypes = nil
 	file_vtadmin_proto_depIdxs = nil
 }
diff --git a/go/vt/proto/vtadmin/vtadmin_vtproto.pb.go b/go/vt/proto/vtadmin/vtadmin_vtproto.pb.go
index 31cfd018921..93001e5d228 100644
--- a/go/vt/proto/vtadmin/vtadmin_vtproto.pb.go
+++ b/go/vt/proto/vtadmin/vtadmin_vtproto.pb.go
@@ -1,5 +1,5 @@
 // Code generated by protoc-gen-go-vtproto. DO NOT EDIT.
-// protoc-gen-go-vtproto version: v0.6.1-0.20241011083415-71c992bc3c87
+// protoc-gen-go-vtproto version: v0.6.1-0.20241121165744-79df5c4772f2
 // source: vtadmin.proto
 
 package vtadmin
diff --git a/go/vt/proto/vtctldata/vtctldata.pb.go b/go/vt/proto/vtctldata/vtctldata.pb.go
index 1ba227db405..dc3122d4b5e 100644
--- a/go/vt/proto/vtctldata/vtctldata.pb.go
+++ b/go/vt/proto/vtctldata/vtctldata.pb.go
@@ -18,7 +18,7 @@
 
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.35.1
+// 	protoc-gen-go v1.36.4
 // 	protoc        v3.21.3
 // source: vtctldata.proto
 
@@ -29,6 +29,7 @@ import (
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
 	reflect "reflect"
 	sync "sync"
+	unsafe "unsafe"
 	binlogdata "vitess.io/vitess/go/vt/proto/binlogdata"
 	logutil "vitess.io/vitess/go/vt/proto/logutil"
 	mysqlctl "vitess.io/vitess/go/vt/proto/mysqlctl"
@@ -332,12 +333,11 @@ func (SchemaMigration_Status) EnumDescriptor() ([]byte, []int) {
 // ExecuteVtctlCommandRequest is the payload for ExecuteVtctlCommand.
 // timeouts are in nanoseconds.
 type ExecuteVtctlCommandRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	Args          []string               `protobuf:"bytes,1,rep,name=args,proto3" json:"args,omitempty"`
+	ActionTimeout int64                  `protobuf:"varint,2,opt,name=action_timeout,json=actionTimeout,proto3" json:"action_timeout,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	Args          []string `protobuf:"bytes,1,rep,name=args,proto3" json:"args,omitempty"`
-	ActionTimeout int64    `protobuf:"varint,2,opt,name=action_timeout,json=actionTimeout,proto3" json:"action_timeout,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *ExecuteVtctlCommandRequest) Reset() {
@@ -386,11 +386,10 @@ func (x *ExecuteVtctlCommandRequest) GetActionTimeout() int64 {
 
 // ExecuteVtctlCommandResponse is streamed back by ExecuteVtctlCommand.
 type ExecuteVtctlCommandResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	Event         *logutil.Event         `protobuf:"bytes,1,opt,name=event,proto3" json:"event,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	Event *logutil.Event `protobuf:"bytes,1,opt,name=event,proto3" json:"event,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *ExecuteVtctlCommandResponse) Reset() {
@@ -432,17 +431,16 @@ func (x *ExecuteVtctlCommandResponse) GetEvent() *logutil.Event {
 
 // TableMaterializeSttings contains the settings for one table.
 type TableMaterializeSettings struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	TargetTable string `protobuf:"bytes,1,opt,name=target_table,json=targetTable,proto3" json:"target_table,omitempty"`
+	state       protoimpl.MessageState `protogen:"open.v1"`
+	TargetTable string                 `protobuf:"bytes,1,opt,name=target_table,json=targetTable,proto3" json:"target_table,omitempty"`
 	// source_expression is a select statement.
 	SourceExpression string `protobuf:"bytes,2,opt,name=source_expression,json=sourceExpression,proto3" json:"source_expression,omitempty"`
 	// create_ddl contains the DDL to create the target table.
 	// If empty, the target table must already exist.
 	// if "copy", the target table DDL is the same as the source table.
-	CreateDdl string `protobuf:"bytes,3,opt,name=create_ddl,json=createDdl,proto3" json:"create_ddl,omitempty"`
+	CreateDdl     string `protobuf:"bytes,3,opt,name=create_ddl,json=createDdl,proto3" json:"create_ddl,omitempty"`
+	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *TableMaterializeSettings) Reset() {
@@ -498,10 +496,7 @@ func (x *TableMaterializeSettings) GetCreateDdl() string {
 
 // MaterializeSettings contains the settings for the Materialize command.
 type MaterializeSettings struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
+	state protoimpl.MessageState `protogen:"open.v1"`
 	// workflow is the name of the workflow.
 	Workflow       string `protobuf:"bytes,1,opt,name=workflow,proto3" json:"workflow,omitempty"`
 	SourceKeyspace string `protobuf:"bytes,2,opt,name=source_keyspace,json=sourceKeyspace,proto3" json:"source_keyspace,omitempty"`
@@ -532,6 +527,8 @@ type MaterializeSettings struct {
 	WorkflowOptions           *WorkflowOptions                            `protobuf:"bytes,17,opt,name=workflow_options,json=workflowOptions,proto3" json:"workflow_options,omitempty"`
 	// ReferenceTables is set to a csv list of tables, if the materialization is for reference tables.
 	ReferenceTables []string `protobuf:"bytes,18,rep,name=reference_tables,json=referenceTables,proto3" json:"reference_tables,omitempty"`
+	unknownFields   protoimpl.UnknownFields
+	sizeCache       protoimpl.SizeCache
 }
 
 func (x *MaterializeSettings) Reset() {
@@ -691,12 +688,11 @@ func (x *MaterializeSettings) GetReferenceTables() []string {
 }
 
 type Keyspace struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	Name          string                 `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	Keyspace      *topodata.Keyspace     `protobuf:"bytes,2,opt,name=keyspace,proto3" json:"keyspace,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	Name     string             `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
-	Keyspace *topodata.Keyspace `protobuf:"bytes,2,opt,name=keyspace,proto3" json:"keyspace,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *Keyspace) Reset() {
@@ -745,10 +741,7 @@ func (x *Keyspace) GetKeyspace() *topodata.Keyspace {
 
 // SchemaMigration represents a row in the schema_migrations sidecar table.
 type SchemaMigration struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
+	state                       protoimpl.MessageState   `protogen:"open.v1"`
 	Uuid                        string                   `protobuf:"bytes,1,opt,name=uuid,proto3" json:"uuid,omitempty"`
 	Keyspace                    string                   `protobuf:"bytes,2,opt,name=keyspace,proto3" json:"keyspace,omitempty"`
 	Shard                       string                   `protobuf:"bytes,3,opt,name=shard,proto3" json:"shard,omitempty"`
@@ -803,6 +796,8 @@ type SchemaMigration struct {
 	ReviewedAt                  *vttime.Time             `protobuf:"bytes,52,opt,name=reviewed_at,json=reviewedAt,proto3" json:"reviewed_at,omitempty"`
 	ReadyToCompleteAt           *vttime.Time             `protobuf:"bytes,53,opt,name=ready_to_complete_at,json=readyToCompleteAt,proto3" json:"ready_to_complete_at,omitempty"`
 	RemovedForeignKeyNames      string                   `protobuf:"bytes,54,opt,name=removed_foreign_key_names,json=removedForeignKeyNames,proto3" json:"removed_foreign_key_names,omitempty"`
+	unknownFields               protoimpl.UnknownFields
+	sizeCache                   protoimpl.SizeCache
 }
 
 func (x *SchemaMigration) Reset() {
@@ -1214,13 +1209,12 @@ func (x *SchemaMigration) GetRemovedForeignKeyNames() string {
 }
 
 type Shard struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	Keyspace      string                 `protobuf:"bytes,1,opt,name=keyspace,proto3" json:"keyspace,omitempty"`
+	Name          string                 `protobuf:"bytes,2,opt,name=name,proto3" json:"name,omitempty"`
+	Shard         *topodata.Shard        `protobuf:"bytes,3,opt,name=shard,proto3" json:"shard,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	Keyspace string          `protobuf:"bytes,1,opt,name=keyspace,proto3" json:"keyspace,omitempty"`
-	Name     string          `protobuf:"bytes,2,opt,name=name,proto3" json:"name,omitempty"`
-	Shard    *topodata.Shard `protobuf:"bytes,3,opt,name=shard,proto3" json:"shard,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *Shard) Reset() {
@@ -1275,11 +1269,8 @@ func (x *Shard) GetShard() *topodata.Shard {
 }
 
 type WorkflowOptions struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	TenantId string `protobuf:"bytes,1,opt,name=tenant_id,json=tenantId,proto3" json:"tenant_id,omitempty"`
+	state    protoimpl.MessageState `protogen:"open.v1"`
+	TenantId string                 `protobuf:"bytes,1,opt,name=tenant_id,json=tenantId,proto3" json:"tenant_id,omitempty"`
 	// Remove auto_increment clauses on tables when moving them to a sharded
 	// keyspace and optionally replace them with vschema AutoIncrement
 	// definitions.
@@ -1287,10 +1278,12 @@ type WorkflowOptions struct {
 	// Shards on which vreplication streams in the target keyspace are created for this workflow and to which the data
 	// from the source will be vreplicated.
 	Shards []string          `protobuf:"bytes,3,rep,name=shards,proto3" json:"shards,omitempty"`
-	Config map[string]string `protobuf:"bytes,4,rep,name=config,proto3" json:"config,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
+	Config map[string]string `protobuf:"bytes,4,rep,name=config,proto3" json:"config,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
 	// Where to create any related schema and vschema objects such as
 	// sequence tables.
 	GlobalKeyspace string `protobuf:"bytes,5,opt,name=global_keyspace,json=globalKeyspace,proto3" json:"global_keyspace,omitempty"`
+	unknownFields  protoimpl.UnknownFields
+	sizeCache      protoimpl.SizeCache
 }
 
 func (x *WorkflowOptions) Reset() {
@@ -1360,17 +1353,14 @@ func (x *WorkflowOptions) GetGlobalKeyspace() string {
 
 // TODO: comment the hell out of this.
 type Workflow struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
+	state  protoimpl.MessageState        `protogen:"open.v1"`
 	Name   string                        `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	Source *Workflow_ReplicationLocation `protobuf:"bytes,2,opt,name=source,proto3" json:"source,omitempty"`
 	Target *Workflow_ReplicationLocation `protobuf:"bytes,3,opt,name=target,proto3" json:"target,omitempty"`
 	// This represents how long it's been since we processed any event in the
 	// stream.
 	MaxVReplicationLag int64                            `protobuf:"varint,4,opt,name=max_v_replication_lag,json=maxVReplicationLag,proto3" json:"max_v_replication_lag,omitempty"`
-	ShardStreams       map[string]*Workflow_ShardStream `protobuf:"bytes,5,rep,name=shard_streams,json=shardStreams,proto3" json:"shard_streams,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
+	ShardStreams       map[string]*Workflow_ShardStream `protobuf:"bytes,5,rep,name=shard_streams,json=shardStreams,proto3" json:"shard_streams,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
 	WorkflowType       string                           `protobuf:"bytes,6,opt,name=workflow_type,json=workflowType,proto3" json:"workflow_type,omitempty"`
 	WorkflowSubType    string                           `protobuf:"bytes,7,opt,name=workflow_sub_type,json=workflowSubType,proto3" json:"workflow_sub_type,omitempty"`
 	// This represents the lag across all shards, between the current time and
@@ -1381,7 +1371,9 @@ type Workflow struct {
 	DeferSecondaryKeys bool `protobuf:"varint,9,opt,name=defer_secondary_keys,json=deferSecondaryKeys,proto3" json:"defer_secondary_keys,omitempty"`
 	// These are additional (optional) settings for vreplication workflows. Previously we used to add it to the
 	// binlogdata.BinlogSource proto object. More details in go/vt/sidecardb/schema/vreplication.sql.
-	Options *WorkflowOptions `protobuf:"bytes,10,opt,name=options,proto3" json:"options,omitempty"`
+	Options       *WorkflowOptions `protobuf:"bytes,10,opt,name=options,proto3" json:"options,omitempty"`
+	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *Workflow) Reset() {
@@ -1485,12 +1477,11 @@ func (x *Workflow) GetOptions() *WorkflowOptions {
 }
 
 type AddCellInfoRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	Name          string                 `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	CellInfo      *topodata.CellInfo     `protobuf:"bytes,2,opt,name=cell_info,json=cellInfo,proto3" json:"cell_info,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	Name     string             `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
-	CellInfo *topodata.CellInfo `protobuf:"bytes,2,opt,name=cell_info,json=cellInfo,proto3" json:"cell_info,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *AddCellInfoRequest) Reset() {
@@ -1538,9 +1529,9 @@ func (x *AddCellInfoRequest) GetCellInfo() *topodata.CellInfo {
 }
 
 type AddCellInfoResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
 	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *AddCellInfoResponse) Reset() {
@@ -1574,12 +1565,11 @@ func (*AddCellInfoResponse) Descriptor() ([]byte, []int) {
 }
 
 type AddCellsAliasRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	Name          string                 `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	Cells         []string               `protobuf:"bytes,2,rep,name=cells,proto3" json:"cells,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	Name  string   `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
-	Cells []string `protobuf:"bytes,2,rep,name=cells,proto3" json:"cells,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *AddCellsAliasRequest) Reset() {
@@ -1627,9 +1617,9 @@ func (x *AddCellsAliasRequest) GetCells() []string {
 }
 
 type AddCellsAliasResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
 	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *AddCellsAliasResponse) Reset() {
@@ -1663,10 +1653,7 @@ func (*AddCellsAliasResponse) Descriptor() ([]byte, []int) {
 }
 
 type ApplyKeyspaceRoutingRulesRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
+	state                protoimpl.MessageState        `protogen:"open.v1"`
 	KeyspaceRoutingRules *vschema.KeyspaceRoutingRules `protobuf:"bytes,1,opt,name=keyspace_routing_rules,json=keyspaceRoutingRules,proto3" json:"keyspace_routing_rules,omitempty"`
 	// SkipRebuild, if set, will cause ApplyKeyspaceRoutingRules to skip rebuilding the
 	// SrvVSchema objects in each cell in RebuildCells.
@@ -1675,7 +1662,9 @@ type ApplyKeyspaceRoutingRulesRequest struct {
 	// provided the SrvVSchema will be rebuilt in every cell in the topology.
 	//
 	// Ignored if SkipRebuild is set.
-	RebuildCells []string `protobuf:"bytes,3,rep,name=rebuild_cells,json=rebuildCells,proto3" json:"rebuild_cells,omitempty"`
+	RebuildCells  []string `protobuf:"bytes,3,rep,name=rebuild_cells,json=rebuildCells,proto3" json:"rebuild_cells,omitempty"`
+	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *ApplyKeyspaceRoutingRulesRequest) Reset() {
@@ -1730,12 +1719,11 @@ func (x *ApplyKeyspaceRoutingRulesRequest) GetRebuildCells() []string {
 }
 
 type ApplyKeyspaceRoutingRulesResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
+	state protoimpl.MessageState `protogen:"open.v1"`
 	// KeyspaceRoutingRules returns the current set of rules.
 	KeyspaceRoutingRules *vschema.KeyspaceRoutingRules `protobuf:"bytes,1,opt,name=keyspace_routing_rules,json=keyspaceRoutingRules,proto3" json:"keyspace_routing_rules,omitempty"`
+	unknownFields        protoimpl.UnknownFields
+	sizeCache            protoimpl.SizeCache
 }
 
 func (x *ApplyKeyspaceRoutingRulesResponse) Reset() {
@@ -1776,11 +1764,8 @@ func (x *ApplyKeyspaceRoutingRulesResponse) GetKeyspaceRoutingRules() *vschema.K
 }
 
 type ApplyRoutingRulesRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	RoutingRules *vschema.RoutingRules `protobuf:"bytes,1,opt,name=routing_rules,json=routingRules,proto3" json:"routing_rules,omitempty"`
+	state        protoimpl.MessageState `protogen:"open.v1"`
+	RoutingRules *vschema.RoutingRules  `protobuf:"bytes,1,opt,name=routing_rules,json=routingRules,proto3" json:"routing_rules,omitempty"`
 	// SkipRebuild, if set, will cause ApplyRoutingRules to skip rebuilding the
 	// SrvVSchema objects in each cell in RebuildCells.
 	SkipRebuild bool `protobuf:"varint,2,opt,name=skip_rebuild,json=skipRebuild,proto3" json:"skip_rebuild,omitempty"`
@@ -1788,7 +1773,9 @@ type ApplyRoutingRulesRequest struct {
 	// provided the SrvVSchema will be rebuilt in every cell in the topology.
 	//
 	// Ignored if SkipRebuild is set.
-	RebuildCells []string `protobuf:"bytes,3,rep,name=rebuild_cells,json=rebuildCells,proto3" json:"rebuild_cells,omitempty"`
+	RebuildCells  []string `protobuf:"bytes,3,rep,name=rebuild_cells,json=rebuildCells,proto3" json:"rebuild_cells,omitempty"`
+	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *ApplyRoutingRulesRequest) Reset() {
@@ -1843,9 +1830,9 @@ func (x *ApplyRoutingRulesRequest) GetRebuildCells() []string {
 }
 
 type ApplyRoutingRulesResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
 	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *ApplyRoutingRulesResponse) Reset() {
@@ -1879,10 +1866,7 @@ func (*ApplyRoutingRulesResponse) Descriptor() ([]byte, []int) {
 }
 
 type ApplyShardRoutingRulesRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
+	state             protoimpl.MessageState     `protogen:"open.v1"`
 	ShardRoutingRules *vschema.ShardRoutingRules `protobuf:"bytes,1,opt,name=shard_routing_rules,json=shardRoutingRules,proto3" json:"shard_routing_rules,omitempty"`
 	// SkipRebuild, if set, will cause ApplyShardRoutingRules to skip rebuilding the
 	// SrvVSchema objects in each cell in RebuildCells.
@@ -1891,7 +1875,9 @@ type ApplyShardRoutingRulesRequest struct {
 	// provided the SrvVSchema will be rebuilt in every cell in the topology.
 	//
 	// Ignored if SkipRebuild is set.
-	RebuildCells []string `protobuf:"bytes,3,rep,name=rebuild_cells,json=rebuildCells,proto3" json:"rebuild_cells,omitempty"`
+	RebuildCells  []string `protobuf:"bytes,3,rep,name=rebuild_cells,json=rebuildCells,proto3" json:"rebuild_cells,omitempty"`
+	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *ApplyShardRoutingRulesRequest) Reset() {
@@ -1946,9 +1932,9 @@ func (x *ApplyShardRoutingRulesRequest) GetRebuildCells() []string {
 }
 
 type ApplyShardRoutingRulesResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
 	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *ApplyShardRoutingRulesResponse) Reset() {
@@ -1982,11 +1968,8 @@ func (*ApplyShardRoutingRulesResponse) Descriptor() ([]byte, []int) {
 }
 
 type ApplySchemaRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Keyspace string `protobuf:"bytes,1,opt,name=keyspace,proto3" json:"keyspace,omitempty"`
+	state    protoimpl.MessageState `protogen:"open.v1"`
+	Keyspace string                 `protobuf:"bytes,1,opt,name=keyspace,proto3" json:"keyspace,omitempty"`
 	// SQL commands to run.
 	Sql []string `protobuf:"bytes,3,rep,name=sql,proto3" json:"sql,omitempty"`
 	// Online DDL strategy, compatible with @@ddl_strategy session variable (examples: 'gh-ost', 'pt-osc', 'gh-ost --max-load=Threads_running=100'")
@@ -2004,7 +1987,9 @@ type ApplySchemaRequest struct {
 	// set by the application to further identify the caller.
 	CallerId *vtrpc.CallerID `protobuf:"bytes,9,opt,name=caller_id,json=callerId,proto3" json:"caller_id,omitempty"`
 	// BatchSize indicates how many queries to apply together
-	BatchSize int64 `protobuf:"varint,10,opt,name=batch_size,json=batchSize,proto3" json:"batch_size,omitempty"`
+	BatchSize     int64 `protobuf:"varint,10,opt,name=batch_size,json=batchSize,proto3" json:"batch_size,omitempty"`
+	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *ApplySchemaRequest) Reset() {
@@ -2094,12 +2079,11 @@ func (x *ApplySchemaRequest) GetBatchSize() int64 {
 }
 
 type ApplySchemaResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	UuidList            []string          `protobuf:"bytes,1,rep,name=uuid_list,json=uuidList,proto3" json:"uuid_list,omitempty"`
-	RowsAffectedByShard map[string]uint64 `protobuf:"bytes,2,rep,name=rows_affected_by_shard,json=rowsAffectedByShard,proto3" json:"rows_affected_by_shard,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"`
+	state               protoimpl.MessageState `protogen:"open.v1"`
+	UuidList            []string               `protobuf:"bytes,1,rep,name=uuid_list,json=uuidList,proto3" json:"uuid_list,omitempty"`
+	RowsAffectedByShard map[string]uint64      `protobuf:"bytes,2,rep,name=rows_affected_by_shard,json=rowsAffectedByShard,proto3" json:"rows_affected_by_shard,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"varint,2,opt,name=value"`
+	unknownFields       protoimpl.UnknownFields
+	sizeCache           protoimpl.SizeCache
 }
 
 func (x *ApplySchemaResponse) Reset() {
@@ -2147,18 +2131,17 @@ func (x *ApplySchemaResponse) GetRowsAffectedByShard() map[string]uint64 {
 }
 
 type ApplyVSchemaRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Keyspace    string            `protobuf:"bytes,1,opt,name=keyspace,proto3" json:"keyspace,omitempty"`
-	SkipRebuild bool              `protobuf:"varint,2,opt,name=skip_rebuild,json=skipRebuild,proto3" json:"skip_rebuild,omitempty"`
-	DryRun      bool              `protobuf:"varint,3,opt,name=dry_run,json=dryRun,proto3" json:"dry_run,omitempty"`
-	Cells       []string          `protobuf:"bytes,4,rep,name=cells,proto3" json:"cells,omitempty"`
-	VSchema     *vschema.Keyspace `protobuf:"bytes,5,opt,name=v_schema,json=vSchema,proto3" json:"v_schema,omitempty"`
-	Sql         string            `protobuf:"bytes,6,opt,name=sql,proto3" json:"sql,omitempty"`
+	state       protoimpl.MessageState `protogen:"open.v1"`
+	Keyspace    string                 `protobuf:"bytes,1,opt,name=keyspace,proto3" json:"keyspace,omitempty"`
+	SkipRebuild bool                   `protobuf:"varint,2,opt,name=skip_rebuild,json=skipRebuild,proto3" json:"skip_rebuild,omitempty"`
+	DryRun      bool                   `protobuf:"varint,3,opt,name=dry_run,json=dryRun,proto3" json:"dry_run,omitempty"`
+	Cells       []string               `protobuf:"bytes,4,rep,name=cells,proto3" json:"cells,omitempty"`
+	VSchema     *vschema.Keyspace      `protobuf:"bytes,5,opt,name=v_schema,json=vSchema,proto3" json:"v_schema,omitempty"`
+	Sql         string                 `protobuf:"bytes,6,opt,name=sql,proto3" json:"sql,omitempty"`
 	// Strict returns an error if there are unknown vindex params.
-	Strict bool `protobuf:"varint,7,opt,name=strict,proto3" json:"strict,omitempty"`
+	Strict        bool `protobuf:"varint,7,opt,name=strict,proto3" json:"strict,omitempty"`
+	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *ApplyVSchemaRequest) Reset() {
@@ -2241,11 +2224,8 @@ func (x *ApplyVSchemaRequest) GetStrict() bool {
 }
 
 type ApplyVSchemaResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	VSchema *vschema.Keyspace `protobuf:"bytes,1,opt,name=v_schema,json=vSchema,proto3" json:"v_schema,omitempty"`
+	state   protoimpl.MessageState `protogen:"open.v1"`
+	VSchema *vschema.Keyspace      `protobuf:"bytes,1,opt,name=v_schema,json=vSchema,proto3" json:"v_schema,omitempty"`
 	// UnknownVindexParams is a map of vindex name to params that were not recognized by the vindex
 	// type. E.g.:
 	//
@@ -2254,7 +2234,9 @@ type ApplyVSchemaResponse struct {
 	//	    "params": ["raed_lock", "not_verify"]
 	//	  }
 	//	}
-	UnknownVindexParams map[string]*ApplyVSchemaResponse_ParamList `protobuf:"bytes,2,rep,name=unknown_vindex_params,json=unknownVindexParams,proto3" json:"unknown_vindex_params,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
+	UnknownVindexParams map[string]*ApplyVSchemaResponse_ParamList `protobuf:"bytes,2,rep,name=unknown_vindex_params,json=unknownVindexParams,proto3" json:"unknown_vindex_params,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
+	unknownFields       protoimpl.UnknownFields
+	sizeCache           protoimpl.SizeCache
 }
 
 func (x *ApplyVSchemaResponse) Reset() {
@@ -2302,11 +2284,8 @@ func (x *ApplyVSchemaResponse) GetUnknownVindexParams() map[string]*ApplyVSchema
 }
 
 type BackupRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	TabletAlias *topodata.TabletAlias `protobuf:"bytes,1,opt,name=tablet_alias,json=tabletAlias,proto3" json:"tablet_alias,omitempty"`
+	state       protoimpl.MessageState `protogen:"open.v1"`
+	TabletAlias *topodata.TabletAlias  `protobuf:"bytes,1,opt,name=tablet_alias,json=tabletAlias,proto3" json:"tablet_alias,omitempty"`
 	// AllowPrimary allows the backup to proceed if TabletAlias is a PRIMARY.
 	//
 	// WARNING: If using the builtin backup engine, this will shutdown mysqld on
@@ -2322,7 +2301,9 @@ type BackupRequest struct {
 	// so that it's a backup that can be used for an upgrade.
 	UpgradeSafe bool `protobuf:"varint,5,opt,name=upgrade_safe,json=upgradeSafe,proto3" json:"upgrade_safe,omitempty"`
 	// BackupEngine specifies if we want to use a particular backup engine for this backup request
-	BackupEngine *string `protobuf:"bytes,6,opt,name=backup_engine,json=backupEngine,proto3,oneof" json:"backup_engine,omitempty"`
+	BackupEngine  *string `protobuf:"bytes,6,opt,name=backup_engine,json=backupEngine,proto3,oneof" json:"backup_engine,omitempty"`
+	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *BackupRequest) Reset() {
@@ -2398,15 +2379,14 @@ func (x *BackupRequest) GetBackupEngine() string {
 }
 
 type BackupResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
+	state protoimpl.MessageState `protogen:"open.v1"`
 	// TabletAlias is the alias being used for the backup.
-	TabletAlias *topodata.TabletAlias `protobuf:"bytes,1,opt,name=tablet_alias,json=tabletAlias,proto3" json:"tablet_alias,omitempty"`
-	Keyspace    string                `protobuf:"bytes,2,opt,name=keyspace,proto3" json:"keyspace,omitempty"`
-	Shard       string                `protobuf:"bytes,3,opt,name=shard,proto3" json:"shard,omitempty"`
-	Event       *logutil.Event        `protobuf:"bytes,4,opt,name=event,proto3" json:"event,omitempty"`
+	TabletAlias   *topodata.TabletAlias `protobuf:"bytes,1,opt,name=tablet_alias,json=tabletAlias,proto3" json:"tablet_alias,omitempty"`
+	Keyspace      string                `protobuf:"bytes,2,opt,name=keyspace,proto3" json:"keyspace,omitempty"`
+	Shard         string                `protobuf:"bytes,3,opt,name=shard,proto3" json:"shard,omitempty"`
+	Event         *logutil.Event        `protobuf:"bytes,4,opt,name=event,proto3" json:"event,omitempty"`
+	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *BackupResponse) Reset() {
@@ -2468,12 +2448,9 @@ func (x *BackupResponse) GetEvent() *logutil.Event {
 }
 
 type BackupShardRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Keyspace string `protobuf:"bytes,1,opt,name=keyspace,proto3" json:"keyspace,omitempty"`
-	Shard    string `protobuf:"bytes,2,opt,name=shard,proto3" json:"shard,omitempty"`
+	state    protoimpl.MessageState `protogen:"open.v1"`
+	Keyspace string                 `protobuf:"bytes,1,opt,name=keyspace,proto3" json:"keyspace,omitempty"`
+	Shard    string                 `protobuf:"bytes,2,opt,name=shard,proto3" json:"shard,omitempty"`
 	// AllowPrimary allows the backup to occur on a PRIMARY tablet. See
 	// BackupRequest.AllowPrimary for warnings and caveats.
 	AllowPrimary bool `protobuf:"varint,3,opt,name=allow_primary,json=allowPrimary,proto3" json:"allow_primary,omitempty"`
@@ -2486,6 +2463,8 @@ type BackupShardRequest struct {
 	// IncrementalFromPos indicates a position of a previous backup. When this value is non-empty
 	// then the backup becomes incremental and applies as of given position.
 	IncrementalFromPos string `protobuf:"bytes,6,opt,name=incremental_from_pos,json=incrementalFromPos,proto3" json:"incremental_from_pos,omitempty"`
+	unknownFields      protoimpl.UnknownFields
+	sizeCache          protoimpl.SizeCache
 }
 
 func (x *BackupShardRequest) Reset() {
@@ -2561,12 +2540,11 @@ func (x *BackupShardRequest) GetIncrementalFromPos() string {
 }
 
 type CancelSchemaMigrationRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	Keyspace      string                 `protobuf:"bytes,1,opt,name=keyspace,proto3" json:"keyspace,omitempty"`
+	Uuid          string                 `protobuf:"bytes,2,opt,name=uuid,proto3" json:"uuid,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	Keyspace string `protobuf:"bytes,1,opt,name=keyspace,proto3" json:"keyspace,omitempty"`
-	Uuid     string `protobuf:"bytes,2,opt,name=uuid,proto3" json:"uuid,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *CancelSchemaMigrationRequest) Reset() {
@@ -2614,11 +2592,10 @@ func (x *CancelSchemaMigrationRequest) GetUuid() string {
 }
 
 type CancelSchemaMigrationResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	RowsAffectedByShard map[string]uint64 `protobuf:"bytes,1,rep,name=rows_affected_by_shard,json=rowsAffectedByShard,proto3" json:"rows_affected_by_shard,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"`
+	state               protoimpl.MessageState `protogen:"open.v1"`
+	RowsAffectedByShard map[string]uint64      `protobuf:"bytes,1,rep,name=rows_affected_by_shard,json=rowsAffectedByShard,proto3" json:"rows_affected_by_shard,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"varint,2,opt,name=value"`
+	unknownFields       protoimpl.UnknownFields
+	sizeCache           protoimpl.SizeCache
 }
 
 func (x *CancelSchemaMigrationResponse) Reset() {
@@ -2659,13 +2636,12 @@ func (x *CancelSchemaMigrationResponse) GetRowsAffectedByShard() map[string]uint
 }
 
 type ChangeTabletTagsRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	TabletAlias   *topodata.TabletAlias  `protobuf:"bytes,1,opt,name=tablet_alias,json=tabletAlias,proto3" json:"tablet_alias,omitempty"`
+	Tags          map[string]string      `protobuf:"bytes,2,rep,name=tags,proto3" json:"tags,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
+	Replace       bool                   `protobuf:"varint,3,opt,name=replace,proto3" json:"replace,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	TabletAlias *topodata.TabletAlias `protobuf:"bytes,1,opt,name=tablet_alias,json=tabletAlias,proto3" json:"tablet_alias,omitempty"`
-	Tags        map[string]string     `protobuf:"bytes,2,rep,name=tags,proto3" json:"tags,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
-	Replace     bool                  `protobuf:"varint,3,opt,name=replace,proto3" json:"replace,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *ChangeTabletTagsRequest) Reset() {
@@ -2720,12 +2696,11 @@ func (x *ChangeTabletTagsRequest) GetReplace() bool {
 }
 
 type ChangeTabletTagsResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	BeforeTags    map[string]string      `protobuf:"bytes,1,rep,name=before_tags,json=beforeTags,proto3" json:"before_tags,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
+	AfterTags     map[string]string      `protobuf:"bytes,2,rep,name=after_tags,json=afterTags,proto3" json:"after_tags,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
 	unknownFields protoimpl.UnknownFields
-
-	BeforeTags map[string]string `protobuf:"bytes,1,rep,name=before_tags,json=beforeTags,proto3" json:"before_tags,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
-	AfterTags  map[string]string `protobuf:"bytes,2,rep,name=after_tags,json=afterTags,proto3" json:"after_tags,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *ChangeTabletTagsResponse) Reset() {
@@ -2773,13 +2748,12 @@ func (x *ChangeTabletTagsResponse) GetAfterTags() map[string]string {
 }
 
 type ChangeTabletTypeRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	TabletAlias   *topodata.TabletAlias  `protobuf:"bytes,1,opt,name=tablet_alias,json=tabletAlias,proto3" json:"tablet_alias,omitempty"`
+	DbType        topodata.TabletType    `protobuf:"varint,2,opt,name=db_type,json=dbType,proto3,enum=topodata.TabletType" json:"db_type,omitempty"`
+	DryRun        bool                   `protobuf:"varint,3,opt,name=dry_run,json=dryRun,proto3" json:"dry_run,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	TabletAlias *topodata.TabletAlias `protobuf:"bytes,1,opt,name=tablet_alias,json=tabletAlias,proto3" json:"tablet_alias,omitempty"`
-	DbType      topodata.TabletType   `protobuf:"varint,2,opt,name=db_type,json=dbType,proto3,enum=topodata.TabletType" json:"db_type,omitempty"`
-	DryRun      bool                  `protobuf:"varint,3,opt,name=dry_run,json=dryRun,proto3" json:"dry_run,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *ChangeTabletTypeRequest) Reset() {
@@ -2834,13 +2808,12 @@ func (x *ChangeTabletTypeRequest) GetDryRun() bool {
 }
 
 type ChangeTabletTypeResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	BeforeTablet  *topodata.Tablet       `protobuf:"bytes,1,opt,name=before_tablet,json=beforeTablet,proto3" json:"before_tablet,omitempty"`
+	AfterTablet   *topodata.Tablet       `protobuf:"bytes,2,opt,name=after_tablet,json=afterTablet,proto3" json:"after_tablet,omitempty"`
+	WasDryRun     bool                   `protobuf:"varint,3,opt,name=was_dry_run,json=wasDryRun,proto3" json:"was_dry_run,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	BeforeTablet *topodata.Tablet `protobuf:"bytes,1,opt,name=before_tablet,json=beforeTablet,proto3" json:"before_tablet,omitempty"`
-	AfterTablet  *topodata.Tablet `protobuf:"bytes,2,opt,name=after_tablet,json=afterTablet,proto3" json:"after_tablet,omitempty"`
-	WasDryRun    bool             `protobuf:"varint,3,opt,name=was_dry_run,json=wasDryRun,proto3" json:"was_dry_run,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *ChangeTabletTypeResponse) Reset() {
@@ -2895,17 +2868,16 @@ func (x *ChangeTabletTypeResponse) GetWasDryRun() bool {
 }
 
 type CheckThrottlerRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	TabletAlias *topodata.TabletAlias `protobuf:"bytes,1,opt,name=tablet_alias,json=tabletAlias,proto3" json:"tablet_alias,omitempty"`
-	AppName     string                `protobuf:"bytes,2,opt,name=app_name,json=appName,proto3" json:"app_name,omitempty"`
-	Scope       string                `protobuf:"bytes,3,opt,name=scope,proto3" json:"scope,omitempty"`
+	state       protoimpl.MessageState `protogen:"open.v1"`
+	TabletAlias *topodata.TabletAlias  `protobuf:"bytes,1,opt,name=tablet_alias,json=tabletAlias,proto3" json:"tablet_alias,omitempty"`
+	AppName     string                 `protobuf:"bytes,2,opt,name=app_name,json=appName,proto3" json:"app_name,omitempty"`
+	Scope       string                 `protobuf:"bytes,3,opt,name=scope,proto3" json:"scope,omitempty"`
 	// SkipRequestHeartbeats ensures this check does not renew heartbeat lease
 	SkipRequestHeartbeats bool `protobuf:"varint,4,opt,name=skip_request_heartbeats,json=skipRequestHeartbeats,proto3" json:"skip_request_heartbeats,omitempty"`
 	// OKIfNotExists asks the throttler to return OK even if the metric does not exist
 	OkIfNotExists bool `protobuf:"varint,5,opt,name=ok_if_not_exists,json=okIfNotExists,proto3" json:"ok_if_not_exists,omitempty"`
+	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *CheckThrottlerRequest) Reset() {
@@ -2974,12 +2946,11 @@ func (x *CheckThrottlerRequest) GetOkIfNotExists() bool {
 }
 
 type CheckThrottlerResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState                    `protogen:"open.v1"`
+	TabletAlias   *topodata.TabletAlias                     `protobuf:"bytes,1,opt,name=tablet_alias,json=tabletAlias,proto3" json:"tablet_alias,omitempty"`
+	Check         *tabletmanagerdata.CheckThrottlerResponse `protobuf:"bytes,2,opt,name=Check,proto3" json:"Check,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	TabletAlias *topodata.TabletAlias                     `protobuf:"bytes,1,opt,name=tablet_alias,json=tabletAlias,proto3" json:"tablet_alias,omitempty"`
-	Check       *tabletmanagerdata.CheckThrottlerResponse `protobuf:"bytes,2,opt,name=Check,proto3" json:"Check,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *CheckThrottlerResponse) Reset() {
@@ -3027,12 +2998,11 @@ func (x *CheckThrottlerResponse) GetCheck() *tabletmanagerdata.CheckThrottlerRes
 }
 
 type CleanupSchemaMigrationRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	Keyspace      string                 `protobuf:"bytes,1,opt,name=keyspace,proto3" json:"keyspace,omitempty"`
+	Uuid          string                 `protobuf:"bytes,2,opt,name=uuid,proto3" json:"uuid,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	Keyspace string `protobuf:"bytes,1,opt,name=keyspace,proto3" json:"keyspace,omitempty"`
-	Uuid     string `protobuf:"bytes,2,opt,name=uuid,proto3" json:"uuid,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *CleanupSchemaMigrationRequest) Reset() {
@@ -3080,11 +3050,10 @@ func (x *CleanupSchemaMigrationRequest) GetUuid() string {
 }
 
 type CleanupSchemaMigrationResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	RowsAffectedByShard map[string]uint64 `protobuf:"bytes,1,rep,name=rows_affected_by_shard,json=rowsAffectedByShard,proto3" json:"rows_affected_by_shard,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"`
+	state               protoimpl.MessageState `protogen:"open.v1"`
+	RowsAffectedByShard map[string]uint64      `protobuf:"bytes,1,rep,name=rows_affected_by_shard,json=rowsAffectedByShard,proto3" json:"rows_affected_by_shard,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"varint,2,opt,name=value"`
+	unknownFields       protoimpl.UnknownFields
+	sizeCache           protoimpl.SizeCache
 }
 
 func (x *CleanupSchemaMigrationResponse) Reset() {
@@ -3125,12 +3094,11 @@ func (x *CleanupSchemaMigrationResponse) GetRowsAffectedByShard() map[string]uin
 }
 
 type CompleteSchemaMigrationRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	Keyspace      string                 `protobuf:"bytes,1,opt,name=keyspace,proto3" json:"keyspace,omitempty"`
+	Uuid          string                 `protobuf:"bytes,2,opt,name=uuid,proto3" json:"uuid,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	Keyspace string `protobuf:"bytes,1,opt,name=keyspace,proto3" json:"keyspace,omitempty"`
-	Uuid     string `protobuf:"bytes,2,opt,name=uuid,proto3" json:"uuid,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *CompleteSchemaMigrationRequest) Reset() {
@@ -3178,11 +3146,10 @@ func (x *CompleteSchemaMigrationRequest) GetUuid() string {
 }
 
 type CompleteSchemaMigrationResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	RowsAffectedByShard map[string]uint64 `protobuf:"bytes,1,rep,name=rows_affected_by_shard,json=rowsAffectedByShard,proto3" json:"rows_affected_by_shard,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"`
+	state               protoimpl.MessageState `protogen:"open.v1"`
+	RowsAffectedByShard map[string]uint64      `protobuf:"bytes,1,rep,name=rows_affected_by_shard,json=rowsAffectedByShard,proto3" json:"rows_affected_by_shard,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"varint,2,opt,name=value"`
+	unknownFields       protoimpl.UnknownFields
+	sizeCache           protoimpl.SizeCache
 }
 
 func (x *CompleteSchemaMigrationResponse) Reset() {
@@ -3223,18 +3190,17 @@ func (x *CompleteSchemaMigrationResponse) GetRowsAffectedByShard() map[string]ui
 }
 
 type CopySchemaShardRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	SourceTabletAlias   *topodata.TabletAlias `protobuf:"bytes,1,opt,name=source_tablet_alias,json=sourceTabletAlias,proto3" json:"source_tablet_alias,omitempty"`
-	Tables              []string              `protobuf:"bytes,2,rep,name=tables,proto3" json:"tables,omitempty"`
-	ExcludeTables       []string              `protobuf:"bytes,3,rep,name=exclude_tables,json=excludeTables,proto3" json:"exclude_tables,omitempty"`
-	IncludeViews        bool                  `protobuf:"varint,4,opt,name=include_views,json=includeViews,proto3" json:"include_views,omitempty"`
-	SkipVerify          bool                  `protobuf:"varint,5,opt,name=skip_verify,json=skipVerify,proto3" json:"skip_verify,omitempty"`
-	WaitReplicasTimeout *vttime.Duration      `protobuf:"bytes,6,opt,name=wait_replicas_timeout,json=waitReplicasTimeout,proto3" json:"wait_replicas_timeout,omitempty"`
-	DestinationKeyspace string                `protobuf:"bytes,7,opt,name=destination_keyspace,json=destinationKeyspace,proto3" json:"destination_keyspace,omitempty"`
-	DestinationShard    string                `protobuf:"bytes,8,opt,name=destination_shard,json=destinationShard,proto3" json:"destination_shard,omitempty"`
+	state               protoimpl.MessageState `protogen:"open.v1"`
+	SourceTabletAlias   *topodata.TabletAlias  `protobuf:"bytes,1,opt,name=source_tablet_alias,json=sourceTabletAlias,proto3" json:"source_tablet_alias,omitempty"`
+	Tables              []string               `protobuf:"bytes,2,rep,name=tables,proto3" json:"tables,omitempty"`
+	ExcludeTables       []string               `protobuf:"bytes,3,rep,name=exclude_tables,json=excludeTables,proto3" json:"exclude_tables,omitempty"`
+	IncludeViews        bool                   `protobuf:"varint,4,opt,name=include_views,json=includeViews,proto3" json:"include_views,omitempty"`
+	SkipVerify          bool                   `protobuf:"varint,5,opt,name=skip_verify,json=skipVerify,proto3" json:"skip_verify,omitempty"`
+	WaitReplicasTimeout *vttime.Duration       `protobuf:"bytes,6,opt,name=wait_replicas_timeout,json=waitReplicasTimeout,proto3" json:"wait_replicas_timeout,omitempty"`
+	DestinationKeyspace string                 `protobuf:"bytes,7,opt,name=destination_keyspace,json=destinationKeyspace,proto3" json:"destination_keyspace,omitempty"`
+	DestinationShard    string                 `protobuf:"bytes,8,opt,name=destination_shard,json=destinationShard,proto3" json:"destination_shard,omitempty"`
+	unknownFields       protoimpl.UnknownFields
+	sizeCache           protoimpl.SizeCache
 }
 
 func (x *CopySchemaShardRequest) Reset() {
@@ -3324,9 +3290,9 @@ func (x *CopySchemaShardRequest) GetDestinationShard() string {
 }
 
 type CopySchemaShardResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
 	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *CopySchemaShardResponse) Reset() {
@@ -3360,10 +3326,7 @@ func (*CopySchemaShardResponse) Descriptor() ([]byte, []int) {
 }
 
 type CreateKeyspaceRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
+	state protoimpl.MessageState `protogen:"open.v1"`
 	// Name is the name of the keyspace.
 	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// Force proceeds with the request even if the keyspace already exists.
@@ -3384,6 +3347,8 @@ type CreateKeyspaceRequest struct {
 	// SidecarDBName is the name of the sidecar database that
 	// each vttablet in the keyspace will use.
 	SidecarDbName string `protobuf:"bytes,11,opt,name=sidecar_db_name,json=sidecarDbName,proto3" json:"sidecar_db_name,omitempty"`
+	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *CreateKeyspaceRequest) Reset() {
@@ -3473,12 +3438,11 @@ func (x *CreateKeyspaceRequest) GetSidecarDbName() string {
 }
 
 type CreateKeyspaceResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
+	state protoimpl.MessageState `protogen:"open.v1"`
 	// Keyspace is the newly-created keyspace.
-	Keyspace *Keyspace `protobuf:"bytes,1,opt,name=keyspace,proto3" json:"keyspace,omitempty"`
+	Keyspace      *Keyspace `protobuf:"bytes,1,opt,name=keyspace,proto3" json:"keyspace,omitempty"`
+	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *CreateKeyspaceResponse) Reset() {
@@ -3519,10 +3483,7 @@ func (x *CreateKeyspaceResponse) GetKeyspace() *Keyspace {
 }
 
 type CreateShardRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
+	state protoimpl.MessageState `protogen:"open.v1"`
 	// Keyspace is the name of the keyspace to create the shard in.
 	Keyspace string `protobuf:"bytes,1,opt,name=keyspace,proto3" json:"keyspace,omitempty"`
 	// ShardName is the name of the shard to create. E.g. "-" or "-80".
@@ -3533,6 +3494,8 @@ type CreateShardRequest struct {
 	// IncludeParent creates the parent keyspace as an empty BASE keyspace, if it
 	// doesn't already exist.
 	IncludeParent bool `protobuf:"varint,4,opt,name=include_parent,json=includeParent,proto3" json:"include_parent,omitempty"`
+	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *CreateShardRequest) Reset() {
@@ -3594,10 +3557,7 @@ func (x *CreateShardRequest) GetIncludeParent() bool {
 }
 
 type CreateShardResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
+	state protoimpl.MessageState `protogen:"open.v1"`
 	// Keyspace is the created keyspace. It is set only if IncludeParent was
 	// specified in the request and the parent keyspace needed to be created.
 	Keyspace *Keyspace `protobuf:"bytes,1,opt,name=keyspace,proto3" json:"keyspace,omitempty"`
@@ -3606,6 +3566,8 @@ type CreateShardResponse struct {
 	// ShardAlreadyExists is set if Force was specified in the request and the
 	// shard already existed.
 	ShardAlreadyExists bool `protobuf:"varint,3,opt,name=shard_already_exists,json=shardAlreadyExists,proto3" json:"shard_already_exists,omitempty"`
+	unknownFields      protoimpl.UnknownFields
+	sizeCache          protoimpl.SizeCache
 }
 
 func (x *CreateShardResponse) Reset() {
@@ -3660,12 +3622,11 @@ func (x *CreateShardResponse) GetShardAlreadyExists() bool {
 }
 
 type DeleteCellInfoRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	Name          string                 `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	Force         bool                   `protobuf:"varint,2,opt,name=force,proto3" json:"force,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	Name  string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
-	Force bool   `protobuf:"varint,2,opt,name=force,proto3" json:"force,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *DeleteCellInfoRequest) Reset() {
@@ -3713,9 +3674,9 @@ func (x *DeleteCellInfoRequest) GetForce() bool {
 }
 
 type DeleteCellInfoResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
 	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *DeleteCellInfoResponse) Reset() {
@@ -3749,11 +3710,10 @@ func (*DeleteCellInfoResponse) Descriptor() ([]byte, []int) {
 }
 
 type DeleteCellsAliasRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	Name          string                 `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *DeleteCellsAliasRequest) Reset() {
@@ -3794,9 +3754,9 @@ func (x *DeleteCellsAliasRequest) GetName() string {
 }
 
 type DeleteCellsAliasResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
 	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *DeleteCellsAliasResponse) Reset() {
@@ -3830,10 +3790,7 @@ func (*DeleteCellsAliasResponse) Descriptor() ([]byte, []int) {
 }
 
 type DeleteKeyspaceRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
+	state protoimpl.MessageState `protogen:"open.v1"`
 	// Keyspace is the name of the keyspace to delete.
 	Keyspace string `protobuf:"bytes,1,opt,name=keyspace,proto3" json:"keyspace,omitempty"`
 	// Recursive causes all shards in the keyspace to be recursively deleted
@@ -3842,7 +3799,9 @@ type DeleteKeyspaceRequest struct {
 	Recursive bool `protobuf:"varint,2,opt,name=recursive,proto3" json:"recursive,omitempty"`
 	// Force allows a keyspace to be deleted even if the keyspace lock cannot be
 	// obtained. This should only be used to force-clean a keyspace.
-	Force bool `protobuf:"varint,3,opt,name=force,proto3" json:"force,omitempty"`
+	Force         bool `protobuf:"varint,3,opt,name=force,proto3" json:"force,omitempty"`
+	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *DeleteKeyspaceRequest) Reset() {
@@ -3897,9 +3856,9 @@ func (x *DeleteKeyspaceRequest) GetForce() bool {
 }
 
 type DeleteKeyspaceResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
 	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *DeleteKeyspaceResponse) Reset() {
@@ -3933,10 +3892,7 @@ func (*DeleteKeyspaceResponse) Descriptor() ([]byte, []int) {
 }
 
 type DeleteShardsRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
+	state protoimpl.MessageState `protogen:"open.v1"`
 	// Shards is the list of shards to delete. The nested topodatapb.Shard field
 	// is not required for DeleteShard, but the Keyspace and Shard fields are.
 	Shards []*Shard `protobuf:"bytes,1,rep,name=shards,proto3" json:"shards,omitempty"`
@@ -3949,7 +3905,9 @@ type DeleteShardsRequest struct {
 	EvenIfServing bool `protobuf:"varint,4,opt,name=even_if_serving,json=evenIfServing,proto3" json:"even_if_serving,omitempty"`
 	// Force allows a shard to be deleted even if the shard lock cannot be
 	// obtained. This should only be used to force-clean a shard.
-	Force bool `protobuf:"varint,5,opt,name=force,proto3" json:"force,omitempty"`
+	Force         bool `protobuf:"varint,5,opt,name=force,proto3" json:"force,omitempty"`
+	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *DeleteShardsRequest) Reset() {
@@ -4011,9 +3969,9 @@ func (x *DeleteShardsRequest) GetForce() bool {
 }
 
 type DeleteShardsResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
 	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *DeleteShardsResponse) Reset() {
@@ -4047,11 +4005,10 @@ func (*DeleteShardsResponse) Descriptor() ([]byte, []int) {
 }
 
 type DeleteSrvVSchemaRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	Cell          string                 `protobuf:"bytes,1,opt,name=cell,proto3" json:"cell,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	Cell string `protobuf:"bytes,1,opt,name=cell,proto3" json:"cell,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *DeleteSrvVSchemaRequest) Reset() {
@@ -4092,9 +4049,9 @@ func (x *DeleteSrvVSchemaRequest) GetCell() string {
 }
 
 type DeleteSrvVSchemaResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
 	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *DeleteSrvVSchemaResponse) Reset() {
@@ -4128,15 +4085,14 @@ func (*DeleteSrvVSchemaResponse) Descriptor() ([]byte, []int) {
 }
 
 type DeleteTabletsRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
+	state protoimpl.MessageState `protogen:"open.v1"`
 	// TabletAliases is the list of tablets to delete.
 	TabletAliases []*topodata.TabletAlias `protobuf:"bytes,1,rep,name=tablet_aliases,json=tabletAliases,proto3" json:"tablet_aliases,omitempty"`
 	// AllowPrimary allows for the primary tablet of a shard to be deleted.
 	// Use with caution.
-	AllowPrimary bool `protobuf:"varint,2,opt,name=allow_primary,json=allowPrimary,proto3" json:"allow_primary,omitempty"`
+	AllowPrimary  bool `protobuf:"varint,2,opt,name=allow_primary,json=allowPrimary,proto3" json:"allow_primary,omitempty"`
+	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *DeleteTabletsRequest) Reset() {
@@ -4184,9 +4140,9 @@ func (x *DeleteTabletsRequest) GetAllowPrimary() bool {
 }
 
 type DeleteTabletsResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
 	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *DeleteTabletsResponse) Reset() {
@@ -4220,10 +4176,7 @@ func (*DeleteTabletsResponse) Descriptor() ([]byte, []int) {
 }
 
 type EmergencyReparentShardRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
+	state protoimpl.MessageState `protogen:"open.v1"`
 	// Keyspace is the name of the keyspace to perform the Emergency Reparent in.
 	Keyspace string `protobuf:"bytes,1,opt,name=keyspace,proto3" json:"keyspace,omitempty"`
 	// Shard is the name of the shard to perform the Emergency Reparent in.
@@ -4248,6 +4201,8 @@ type EmergencyReparentShardRequest struct {
 	// ExpectedPrimary is the optional alias we expect to be the current primary in order for
 	// the reparent operation to succeed.
 	ExpectedPrimary *topodata.TabletAlias `protobuf:"bytes,8,opt,name=expected_primary,json=expectedPrimary,proto3" json:"expected_primary,omitempty"`
+	unknownFields   protoimpl.UnknownFields
+	sizeCache       protoimpl.SizeCache
 }
 
 func (x *EmergencyReparentShardRequest) Reset() {
@@ -4337,10 +4292,7 @@ func (x *EmergencyReparentShardRequest) GetExpectedPrimary() *topodata.TabletAli
 }
 
 type EmergencyReparentShardResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
+	state protoimpl.MessageState `protogen:"open.v1"`
 	// Keyspace is the name of the keyspace the Emergency Reparent took place in.
 	Keyspace string `protobuf:"bytes,1,opt,name=keyspace,proto3" json:"keyspace,omitempty"`
 	// Shard is the name of the shard the Emergency Reparent took place in.
@@ -4351,6 +4303,8 @@ type EmergencyReparentShardResponse struct {
 	// up-to-date.
 	PromotedPrimary *topodata.TabletAlias `protobuf:"bytes,3,opt,name=promoted_primary,json=promotedPrimary,proto3" json:"promoted_primary,omitempty"`
 	Events          []*logutil.Event      `protobuf:"bytes,4,rep,name=events,proto3" json:"events,omitempty"`
+	unknownFields   protoimpl.UnknownFields
+	sizeCache       protoimpl.SizeCache
 }
 
 func (x *EmergencyReparentShardResponse) Reset() {
@@ -4412,12 +4366,9 @@ func (x *EmergencyReparentShardResponse) GetEvents() []*logutil.Event {
 }
 
 type ExecuteFetchAsAppRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	TabletAlias *topodata.TabletAlias `protobuf:"bytes,1,opt,name=tablet_alias,json=tabletAlias,proto3" json:"tablet_alias,omitempty"`
-	Query       string                `protobuf:"bytes,2,opt,name=query,proto3" json:"query,omitempty"`
+	state       protoimpl.MessageState `protogen:"open.v1"`
+	TabletAlias *topodata.TabletAlias  `protobuf:"bytes,1,opt,name=tablet_alias,json=tabletAlias,proto3" json:"tablet_alias,omitempty"`
+	Query       string                 `protobuf:"bytes,2,opt,name=query,proto3" json:"query,omitempty"`
 	// MaxRows is an optional parameter to limit the number of rows read into the
 	// QueryResult. Note that this does not apply a LIMIT to the query, just how
 	// many rows are read from the MySQL server on the tablet side.
@@ -4426,7 +4377,9 @@ type ExecuteFetchAsAppRequest struct {
 	// default is configured in the VtctldService.
 	MaxRows int64 `protobuf:"varint,3,opt,name=max_rows,json=maxRows,proto3" json:"max_rows,omitempty"`
 	// UsePool causes the query to be run with a pooled connection to the tablet.
-	UsePool bool `protobuf:"varint,4,opt,name=use_pool,json=usePool,proto3" json:"use_pool,omitempty"`
+	UsePool       bool `protobuf:"varint,4,opt,name=use_pool,json=usePool,proto3" json:"use_pool,omitempty"`
+	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *ExecuteFetchAsAppRequest) Reset() {
@@ -4488,11 +4441,10 @@ func (x *ExecuteFetchAsAppRequest) GetUsePool() bool {
 }
 
 type ExecuteFetchAsAppResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	Result        *query.QueryResult     `protobuf:"bytes,1,opt,name=result,proto3" json:"result,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	Result *query.QueryResult `protobuf:"bytes,1,opt,name=result,proto3" json:"result,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *ExecuteFetchAsAppResponse) Reset() {
@@ -4533,12 +4485,9 @@ func (x *ExecuteFetchAsAppResponse) GetResult() *query.QueryResult {
 }
 
 type ExecuteFetchAsDBARequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	TabletAlias *topodata.TabletAlias `protobuf:"bytes,1,opt,name=tablet_alias,json=tabletAlias,proto3" json:"tablet_alias,omitempty"`
-	Query       string                `protobuf:"bytes,2,opt,name=query,proto3" json:"query,omitempty"`
+	state       protoimpl.MessageState `protogen:"open.v1"`
+	TabletAlias *topodata.TabletAlias  `protobuf:"bytes,1,opt,name=tablet_alias,json=tabletAlias,proto3" json:"tablet_alias,omitempty"`
+	Query       string                 `protobuf:"bytes,2,opt,name=query,proto3" json:"query,omitempty"`
 	// MaxRows is an optional parameter to limit the number of rows read into the
 	// QueryResult. Note that this does not apply a LIMIT to the query, just how
 	// many rows are read from the MySQL server on the tablet side.
@@ -4551,7 +4500,9 @@ type ExecuteFetchAsDBARequest struct {
 	DisableBinlogs bool `protobuf:"varint,4,opt,name=disable_binlogs,json=disableBinlogs,proto3" json:"disable_binlogs,omitempty"`
 	// ReloadSchema instructs the tablet to reload its schema after executing the
 	// query.
-	ReloadSchema bool `protobuf:"varint,5,opt,name=reload_schema,json=reloadSchema,proto3" json:"reload_schema,omitempty"`
+	ReloadSchema  bool `protobuf:"varint,5,opt,name=reload_schema,json=reloadSchema,proto3" json:"reload_schema,omitempty"`
+	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *ExecuteFetchAsDBARequest) Reset() {
@@ -4620,11 +4571,10 @@ func (x *ExecuteFetchAsDBARequest) GetReloadSchema() bool {
 }
 
 type ExecuteFetchAsDBAResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	Result        *query.QueryResult     `protobuf:"bytes,1,opt,name=result,proto3" json:"result,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	Result *query.QueryResult `protobuf:"bytes,1,opt,name=result,proto3" json:"result,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *ExecuteFetchAsDBAResponse) Reset() {
@@ -4665,12 +4615,11 @@ func (x *ExecuteFetchAsDBAResponse) GetResult() *query.QueryResult {
 }
 
 type ExecuteHookRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
+	state             protoimpl.MessageState                `protogen:"open.v1"`
 	TabletAlias       *topodata.TabletAlias                 `protobuf:"bytes,1,opt,name=tablet_alias,json=tabletAlias,proto3" json:"tablet_alias,omitempty"`
 	TabletHookRequest *tabletmanagerdata.ExecuteHookRequest `protobuf:"bytes,2,opt,name=tablet_hook_request,json=tabletHookRequest,proto3" json:"tablet_hook_request,omitempty"`
+	unknownFields     protoimpl.UnknownFields
+	sizeCache         protoimpl.SizeCache
 }
 
 func (x *ExecuteHookRequest) Reset() {
@@ -4718,11 +4667,10 @@ func (x *ExecuteHookRequest) GetTabletHookRequest() *tabletmanagerdata.ExecuteHo
 }
 
 type ExecuteHookResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState                 `protogen:"open.v1"`
+	HookResult    *tabletmanagerdata.ExecuteHookResponse `protobuf:"bytes,1,opt,name=hook_result,json=hookResult,proto3" json:"hook_result,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	HookResult *tabletmanagerdata.ExecuteHookResponse `protobuf:"bytes,1,opt,name=hook_result,json=hookResult,proto3" json:"hook_result,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *ExecuteHookResponse) Reset() {
@@ -4763,11 +4711,8 @@ func (x *ExecuteHookResponse) GetHookResult() *tabletmanagerdata.ExecuteHookResp
 }
 
 type ExecuteMultiFetchAsDBARequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	TabletAlias *topodata.TabletAlias `protobuf:"bytes,1,opt,name=tablet_alias,json=tabletAlias,proto3" json:"tablet_alias,omitempty"`
+	state       protoimpl.MessageState `protogen:"open.v1"`
+	TabletAlias *topodata.TabletAlias  `protobuf:"bytes,1,opt,name=tablet_alias,json=tabletAlias,proto3" json:"tablet_alias,omitempty"`
 	// SQL could have potentially multiple queries separated by semicolons.
 	Sql string `protobuf:"bytes,2,opt,name=sql,proto3" json:"sql,omitempty"`
 	// MaxRows is an optional parameter to limit the number of rows read into the
@@ -4782,7 +4727,9 @@ type ExecuteMultiFetchAsDBARequest struct {
 	DisableBinlogs bool `protobuf:"varint,4,opt,name=disable_binlogs,json=disableBinlogs,proto3" json:"disable_binlogs,omitempty"`
 	// ReloadSchema instructs the tablet to reload its schema after executing the
 	// query.
-	ReloadSchema bool `protobuf:"varint,5,opt,name=reload_schema,json=reloadSchema,proto3" json:"reload_schema,omitempty"`
+	ReloadSchema  bool `protobuf:"varint,5,opt,name=reload_schema,json=reloadSchema,proto3" json:"reload_schema,omitempty"`
+	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *ExecuteMultiFetchAsDBARequest) Reset() {
@@ -4851,11 +4798,10 @@ func (x *ExecuteMultiFetchAsDBARequest) GetReloadSchema() bool {
 }
 
 type ExecuteMultiFetchAsDBAResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	Results       []*query.QueryResult   `protobuf:"bytes,1,rep,name=results,proto3" json:"results,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	Results []*query.QueryResult `protobuf:"bytes,1,rep,name=results,proto3" json:"results,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *ExecuteMultiFetchAsDBAResponse) Reset() {
@@ -4896,11 +4842,10 @@ func (x *ExecuteMultiFetchAsDBAResponse) GetResults() []*query.QueryResult {
 }
 
 type FindAllShardsInKeyspaceRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	Keyspace      string                 `protobuf:"bytes,1,opt,name=keyspace,proto3" json:"keyspace,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	Keyspace string `protobuf:"bytes,1,opt,name=keyspace,proto3" json:"keyspace,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *FindAllShardsInKeyspaceRequest) Reset() {
@@ -4941,11 +4886,10 @@ func (x *FindAllShardsInKeyspaceRequest) GetKeyspace() string {
 }
 
 type FindAllShardsInKeyspaceResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	Shards        map[string]*Shard      `protobuf:"bytes,1,rep,name=shards,proto3" json:"shards,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
 	unknownFields protoimpl.UnknownFields
-
-	Shards map[string]*Shard `protobuf:"bytes,1,rep,name=shards,proto3" json:"shards,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *FindAllShardsInKeyspaceResponse) Reset() {
@@ -4986,12 +4930,11 @@ func (x *FindAllShardsInKeyspaceResponse) GetShards() map[string]*Shard {
 }
 
 type ForceCutOverSchemaMigrationRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	Keyspace      string                 `protobuf:"bytes,1,opt,name=keyspace,proto3" json:"keyspace,omitempty"`
+	Uuid          string                 `protobuf:"bytes,2,opt,name=uuid,proto3" json:"uuid,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	Keyspace string `protobuf:"bytes,1,opt,name=keyspace,proto3" json:"keyspace,omitempty"`
-	Uuid     string `protobuf:"bytes,2,opt,name=uuid,proto3" json:"uuid,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *ForceCutOverSchemaMigrationRequest) Reset() {
@@ -5039,11 +4982,10 @@ func (x *ForceCutOverSchemaMigrationRequest) GetUuid() string {
 }
 
 type ForceCutOverSchemaMigrationResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	RowsAffectedByShard map[string]uint64 `protobuf:"bytes,1,rep,name=rows_affected_by_shard,json=rowsAffectedByShard,proto3" json:"rows_affected_by_shard,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"`
+	state               protoimpl.MessageState `protogen:"open.v1"`
+	RowsAffectedByShard map[string]uint64      `protobuf:"bytes,1,rep,name=rows_affected_by_shard,json=rowsAffectedByShard,proto3" json:"rows_affected_by_shard,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"varint,2,opt,name=value"`
+	unknownFields       protoimpl.UnknownFields
+	sizeCache           protoimpl.SizeCache
 }
 
 func (x *ForceCutOverSchemaMigrationResponse) Reset() {
@@ -5084,12 +5026,9 @@ func (x *ForceCutOverSchemaMigrationResponse) GetRowsAffectedByShard() map[strin
 }
 
 type GetBackupsRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Keyspace string `protobuf:"bytes,1,opt,name=keyspace,proto3" json:"keyspace,omitempty"`
-	Shard    string `protobuf:"bytes,2,opt,name=shard,proto3" json:"shard,omitempty"`
+	state    protoimpl.MessageState `protogen:"open.v1"`
+	Keyspace string                 `protobuf:"bytes,1,opt,name=keyspace,proto3" json:"keyspace,omitempty"`
+	Shard    string                 `protobuf:"bytes,2,opt,name=shard,proto3" json:"shard,omitempty"`
 	// Limit, if nonzero, will return only the most N recent backups.
 	Limit uint32 `protobuf:"varint,3,opt,name=limit,proto3" json:"limit,omitempty"`
 	// Detailed indicates whether to use the backupengine, if supported, to
@@ -5104,6 +5043,8 @@ type GetBackupsRequest struct {
 	// backup infos will have additional fields set, and any remaining backups
 	// will not.
 	DetailedLimit uint32 `protobuf:"varint,5,opt,name=detailed_limit,json=detailedLimit,proto3" json:"detailed_limit,omitempty"`
+	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *GetBackupsRequest) Reset() {
@@ -5172,11 +5113,10 @@ func (x *GetBackupsRequest) GetDetailedLimit() uint32 {
 }
 
 type GetBackupsResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	Backups       []*mysqlctl.BackupInfo `protobuf:"bytes,1,rep,name=backups,proto3" json:"backups,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	Backups []*mysqlctl.BackupInfo `protobuf:"bytes,1,rep,name=backups,proto3" json:"backups,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *GetBackupsResponse) Reset() {
@@ -5217,11 +5157,10 @@ func (x *GetBackupsResponse) GetBackups() []*mysqlctl.BackupInfo {
 }
 
 type GetCellInfoRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	Cell          string                 `protobuf:"bytes,1,opt,name=cell,proto3" json:"cell,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	Cell string `protobuf:"bytes,1,opt,name=cell,proto3" json:"cell,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *GetCellInfoRequest) Reset() {
@@ -5262,11 +5201,10 @@ func (x *GetCellInfoRequest) GetCell() string {
 }
 
 type GetCellInfoResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	CellInfo      *topodata.CellInfo     `protobuf:"bytes,1,opt,name=cell_info,json=cellInfo,proto3" json:"cell_info,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	CellInfo *topodata.CellInfo `protobuf:"bytes,1,opt,name=cell_info,json=cellInfo,proto3" json:"cell_info,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *GetCellInfoResponse) Reset() {
@@ -5307,9 +5245,9 @@ func (x *GetCellInfoResponse) GetCellInfo() *topodata.CellInfo {
 }
 
 type GetCellInfoNamesRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
 	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *GetCellInfoNamesRequest) Reset() {
@@ -5343,11 +5281,10 @@ func (*GetCellInfoNamesRequest) Descriptor() ([]byte, []int) {
 }
 
 type GetCellInfoNamesResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	Names         []string               `protobuf:"bytes,1,rep,name=names,proto3" json:"names,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	Names []string `protobuf:"bytes,1,rep,name=names,proto3" json:"names,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *GetCellInfoNamesResponse) Reset() {
@@ -5388,9 +5325,9 @@ func (x *GetCellInfoNamesResponse) GetNames() []string {
 }
 
 type GetCellsAliasesRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
 	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *GetCellsAliasesRequest) Reset() {
@@ -5424,11 +5361,10 @@ func (*GetCellsAliasesRequest) Descriptor() ([]byte, []int) {
 }
 
 type GetCellsAliasesResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState          `protogen:"open.v1"`
+	Aliases       map[string]*topodata.CellsAlias `protobuf:"bytes,1,rep,name=aliases,proto3" json:"aliases,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
 	unknownFields protoimpl.UnknownFields
-
-	Aliases map[string]*topodata.CellsAlias `protobuf:"bytes,1,rep,name=aliases,proto3" json:"aliases,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *GetCellsAliasesResponse) Reset() {
@@ -5469,11 +5405,10 @@ func (x *GetCellsAliasesResponse) GetAliases() map[string]*topodata.CellsAlias {
 }
 
 type GetFullStatusRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	TabletAlias   *topodata.TabletAlias  `protobuf:"bytes,1,opt,name=tablet_alias,json=tabletAlias,proto3" json:"tablet_alias,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	TabletAlias *topodata.TabletAlias `protobuf:"bytes,1,opt,name=tablet_alias,json=tabletAlias,proto3" json:"tablet_alias,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *GetFullStatusRequest) Reset() {
@@ -5514,11 +5449,10 @@ func (x *GetFullStatusRequest) GetTabletAlias() *topodata.TabletAlias {
 }
 
 type GetFullStatusResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState      `protogen:"open.v1"`
+	Status        *replicationdata.FullStatus `protobuf:"bytes,1,opt,name=status,proto3" json:"status,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	Status *replicationdata.FullStatus `protobuf:"bytes,1,opt,name=status,proto3" json:"status,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *GetFullStatusResponse) Reset() {
@@ -5559,9 +5493,9 @@ func (x *GetFullStatusResponse) GetStatus() *replicationdata.FullStatus {
 }
 
 type GetKeyspacesRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
 	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *GetKeyspacesRequest) Reset() {
@@ -5595,11 +5529,10 @@ func (*GetKeyspacesRequest) Descriptor() ([]byte, []int) {
 }
 
 type GetKeyspacesResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	Keyspaces     []*Keyspace            `protobuf:"bytes,1,rep,name=keyspaces,proto3" json:"keyspaces,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	Keyspaces []*Keyspace `protobuf:"bytes,1,rep,name=keyspaces,proto3" json:"keyspaces,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *GetKeyspacesResponse) Reset() {
@@ -5640,11 +5573,10 @@ func (x *GetKeyspacesResponse) GetKeyspaces() []*Keyspace {
 }
 
 type GetKeyspaceRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	Keyspace      string                 `protobuf:"bytes,1,opt,name=keyspace,proto3" json:"keyspace,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	Keyspace string `protobuf:"bytes,1,opt,name=keyspace,proto3" json:"keyspace,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *GetKeyspaceRequest) Reset() {
@@ -5685,11 +5617,10 @@ func (x *GetKeyspaceRequest) GetKeyspace() string {
 }
 
 type GetKeyspaceResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	Keyspace      *Keyspace              `protobuf:"bytes,1,opt,name=keyspace,proto3" json:"keyspace,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	Keyspace *Keyspace `protobuf:"bytes,1,opt,name=keyspace,proto3" json:"keyspace,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *GetKeyspaceResponse) Reset() {
@@ -5730,11 +5661,10 @@ func (x *GetKeyspaceResponse) GetKeyspace() *Keyspace {
 }
 
 type GetPermissionsRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	TabletAlias   *topodata.TabletAlias  `protobuf:"bytes,1,opt,name=tablet_alias,json=tabletAlias,proto3" json:"tablet_alias,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	TabletAlias *topodata.TabletAlias `protobuf:"bytes,1,opt,name=tablet_alias,json=tabletAlias,proto3" json:"tablet_alias,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *GetPermissionsRequest) Reset() {
@@ -5775,11 +5705,10 @@ func (x *GetPermissionsRequest) GetTabletAlias() *topodata.TabletAlias {
 }
 
 type GetPermissionsResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState         `protogen:"open.v1"`
+	Permissions   *tabletmanagerdata.Permissions `protobuf:"bytes,1,opt,name=permissions,proto3" json:"permissions,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	Permissions *tabletmanagerdata.Permissions `protobuf:"bytes,1,opt,name=permissions,proto3" json:"permissions,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *GetPermissionsResponse) Reset() {
@@ -5820,9 +5749,9 @@ func (x *GetPermissionsResponse) GetPermissions() *tabletmanagerdata.Permissions
 }
 
 type GetKeyspaceRoutingRulesRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
 	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *GetKeyspaceRoutingRulesRequest) Reset() {
@@ -5856,11 +5785,10 @@ func (*GetKeyspaceRoutingRulesRequest) Descriptor() ([]byte, []int) {
 }
 
 type GetKeyspaceRoutingRulesResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
+	state                protoimpl.MessageState        `protogen:"open.v1"`
 	KeyspaceRoutingRules *vschema.KeyspaceRoutingRules `protobuf:"bytes,1,opt,name=keyspace_routing_rules,json=keyspaceRoutingRules,proto3" json:"keyspace_routing_rules,omitempty"`
+	unknownFields        protoimpl.UnknownFields
+	sizeCache            protoimpl.SizeCache
 }
 
 func (x *GetKeyspaceRoutingRulesResponse) Reset() {
@@ -5901,9 +5829,9 @@ func (x *GetKeyspaceRoutingRulesResponse) GetKeyspaceRoutingRules() *vschema.Key
 }
 
 type GetRoutingRulesRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
 	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *GetRoutingRulesRequest) Reset() {
@@ -5937,11 +5865,10 @@ func (*GetRoutingRulesRequest) Descriptor() ([]byte, []int) {
 }
 
 type GetRoutingRulesResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	RoutingRules  *vschema.RoutingRules  `protobuf:"bytes,1,opt,name=routing_rules,json=routingRules,proto3" json:"routing_rules,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	RoutingRules *vschema.RoutingRules `protobuf:"bytes,1,opt,name=routing_rules,json=routingRules,proto3" json:"routing_rules,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *GetRoutingRulesResponse) Reset() {
@@ -5982,11 +5909,8 @@ func (x *GetRoutingRulesResponse) GetRoutingRules() *vschema.RoutingRules {
 }
 
 type GetSchemaRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	TabletAlias *topodata.TabletAlias `protobuf:"bytes,1,opt,name=tablet_alias,json=tabletAlias,proto3" json:"tablet_alias,omitempty"`
+	state       protoimpl.MessageState `protogen:"open.v1"`
+	TabletAlias *topodata.TabletAlias  `protobuf:"bytes,1,opt,name=tablet_alias,json=tabletAlias,proto3" json:"tablet_alias,omitempty"`
 	// Tables is a list of tables for which we should gather information. Each is
 	// either an exact match, or a regular expression of the form /regexp/.
 	Tables []string `protobuf:"bytes,2,rep,name=tables,proto3" json:"tables,omitempty"`
@@ -6005,6 +5929,8 @@ type GetSchemaRequest struct {
 	// TableSchemaOnly specifies whether to limit the results to just table/view
 	// schema definition (CREATE TABLE/VIEW statements) and skip column/field information
 	TableSchemaOnly bool `protobuf:"varint,7,opt,name=table_schema_only,json=tableSchemaOnly,proto3" json:"table_schema_only,omitempty"`
+	unknownFields   protoimpl.UnknownFields
+	sizeCache       protoimpl.SizeCache
 }
 
 func (x *GetSchemaRequest) Reset() {
@@ -6087,11 +6013,10 @@ func (x *GetSchemaRequest) GetTableSchemaOnly() bool {
 }
 
 type GetSchemaResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState              `protogen:"open.v1"`
+	Schema        *tabletmanagerdata.SchemaDefinition `protobuf:"bytes,1,opt,name=schema,proto3" json:"schema,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	Schema *tabletmanagerdata.SchemaDefinition `protobuf:"bytes,1,opt,name=schema,proto3" json:"schema,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *GetSchemaResponse) Reset() {
@@ -6142,11 +6067,8 @@ func (x *GetSchemaResponse) GetSchema() *tabletmanagerdata.SchemaDefinition {
 //
 // MigrationContext, Status, and Recent are mutually exclusive.
 type GetSchemaMigrationsRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Keyspace string `protobuf:"bytes,1,opt,name=keyspace,proto3" json:"keyspace,omitempty"`
+	state    protoimpl.MessageState `protogen:"open.v1"`
+	Keyspace string                 `protobuf:"bytes,1,opt,name=keyspace,proto3" json:"keyspace,omitempty"`
 	// Uuid, if set, will cause GetSchemaMigrations to return exactly 1 migration,
 	// namely the one with that UUID. If no migration exists, the response will
 	// be an empty slice, not an error.
@@ -6158,10 +6080,12 @@ type GetSchemaMigrationsRequest struct {
 	Status           SchemaMigration_Status `protobuf:"varint,4,opt,name=status,proto3,enum=vtctldata.SchemaMigration_Status" json:"status,omitempty"`
 	// Recent, if set, returns migrations requested between now and the provided
 	// value.
-	Recent *vttime.Duration `protobuf:"bytes,5,opt,name=recent,proto3" json:"recent,omitempty"`
-	Order  QueryOrdering    `protobuf:"varint,6,opt,name=order,proto3,enum=vtctldata.QueryOrdering" json:"order,omitempty"`
-	Limit  uint64           `protobuf:"varint,7,opt,name=limit,proto3" json:"limit,omitempty"`
-	Skip   uint64           `protobuf:"varint,8,opt,name=skip,proto3" json:"skip,omitempty"`
+	Recent        *vttime.Duration `protobuf:"bytes,5,opt,name=recent,proto3" json:"recent,omitempty"`
+	Order         QueryOrdering    `protobuf:"varint,6,opt,name=order,proto3,enum=vtctldata.QueryOrdering" json:"order,omitempty"`
+	Limit         uint64           `protobuf:"varint,7,opt,name=limit,proto3" json:"limit,omitempty"`
+	Skip          uint64           `protobuf:"varint,8,opt,name=skip,proto3" json:"skip,omitempty"`
+	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *GetSchemaMigrationsRequest) Reset() {
@@ -6251,11 +6175,10 @@ func (x *GetSchemaMigrationsRequest) GetSkip() uint64 {
 }
 
 type GetSchemaMigrationsResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	Migrations    []*SchemaMigration     `protobuf:"bytes,1,rep,name=migrations,proto3" json:"migrations,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	Migrations []*SchemaMigration `protobuf:"bytes,1,rep,name=migrations,proto3" json:"migrations,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *GetSchemaMigrationsResponse) Reset() {
@@ -6296,15 +6219,14 @@ func (x *GetSchemaMigrationsResponse) GetMigrations() []*SchemaMigration {
 }
 
 type GetShardReplicationRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Keyspace string `protobuf:"bytes,1,opt,name=keyspace,proto3" json:"keyspace,omitempty"`
-	Shard    string `protobuf:"bytes,2,opt,name=shard,proto3" json:"shard,omitempty"`
+	state    protoimpl.MessageState `protogen:"open.v1"`
+	Keyspace string                 `protobuf:"bytes,1,opt,name=keyspace,proto3" json:"keyspace,omitempty"`
+	Shard    string                 `protobuf:"bytes,2,opt,name=shard,proto3" json:"shard,omitempty"`
 	// Cells is the list of cells to fetch data for. Omit to fetch data from all
 	// cells.
-	Cells []string `protobuf:"bytes,3,rep,name=cells,proto3" json:"cells,omitempty"`
+	Cells         []string `protobuf:"bytes,3,rep,name=cells,proto3" json:"cells,omitempty"`
+	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *GetShardReplicationRequest) Reset() {
@@ -6359,11 +6281,10 @@ func (x *GetShardReplicationRequest) GetCells() []string {
 }
 
 type GetShardReplicationResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	ShardReplicationByCell map[string]*topodata.ShardReplication `protobuf:"bytes,1,rep,name=shard_replication_by_cell,json=shardReplicationByCell,proto3" json:"shard_replication_by_cell,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
+	state                  protoimpl.MessageState                `protogen:"open.v1"`
+	ShardReplicationByCell map[string]*topodata.ShardReplication `protobuf:"bytes,1,rep,name=shard_replication_by_cell,json=shardReplicationByCell,proto3" json:"shard_replication_by_cell,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
+	unknownFields          protoimpl.UnknownFields
+	sizeCache              protoimpl.SizeCache
 }
 
 func (x *GetShardReplicationResponse) Reset() {
@@ -6404,12 +6325,11 @@ func (x *GetShardReplicationResponse) GetShardReplicationByCell() map[string]*to
 }
 
 type GetShardRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	Keyspace      string                 `protobuf:"bytes,1,opt,name=keyspace,proto3" json:"keyspace,omitempty"`
+	ShardName     string                 `protobuf:"bytes,2,opt,name=shard_name,json=shardName,proto3" json:"shard_name,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	Keyspace  string `protobuf:"bytes,1,opt,name=keyspace,proto3" json:"keyspace,omitempty"`
-	ShardName string `protobuf:"bytes,2,opt,name=shard_name,json=shardName,proto3" json:"shard_name,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *GetShardRequest) Reset() {
@@ -6457,11 +6377,10 @@ func (x *GetShardRequest) GetShardName() string {
 }
 
 type GetShardResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	Shard         *Shard                 `protobuf:"bytes,1,opt,name=shard,proto3" json:"shard,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	Shard *Shard `protobuf:"bytes,1,opt,name=shard,proto3" json:"shard,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *GetShardResponse) Reset() {
@@ -6502,9 +6421,9 @@ func (x *GetShardResponse) GetShard() *Shard {
 }
 
 type GetShardRoutingRulesRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
 	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *GetShardRoutingRulesRequest) Reset() {
@@ -6538,11 +6457,10 @@ func (*GetShardRoutingRulesRequest) Descriptor() ([]byte, []int) {
 }
 
 type GetShardRoutingRulesResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
+	state             protoimpl.MessageState     `protogen:"open.v1"`
 	ShardRoutingRules *vschema.ShardRoutingRules `protobuf:"bytes,1,opt,name=shard_routing_rules,json=shardRoutingRules,proto3" json:"shard_routing_rules,omitempty"`
+	unknownFields     protoimpl.UnknownFields
+	sizeCache         protoimpl.SizeCache
 }
 
 func (x *GetShardRoutingRulesResponse) Reset() {
@@ -6583,11 +6501,10 @@ func (x *GetShardRoutingRulesResponse) GetShardRoutingRules() *vschema.ShardRout
 }
 
 type GetSrvKeyspaceNamesRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	Cells         []string               `protobuf:"bytes,1,rep,name=cells,proto3" json:"cells,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	Cells []string `protobuf:"bytes,1,rep,name=cells,proto3" json:"cells,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *GetSrvKeyspaceNamesRequest) Reset() {
@@ -6628,12 +6545,11 @@ func (x *GetSrvKeyspaceNamesRequest) GetCells() []string {
 }
 
 type GetSrvKeyspaceNamesResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
+	state protoimpl.MessageState `protogen:"open.v1"`
 	// Names is a mapping of cell name to a list of SrvKeyspace names.
-	Names map[string]*GetSrvKeyspaceNamesResponse_NameList `protobuf:"bytes,1,rep,name=names,proto3" json:"names,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
+	Names         map[string]*GetSrvKeyspaceNamesResponse_NameList `protobuf:"bytes,1,rep,name=names,proto3" json:"names,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
+	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *GetSrvKeyspaceNamesResponse) Reset() {
@@ -6674,14 +6590,13 @@ func (x *GetSrvKeyspaceNamesResponse) GetNames() map[string]*GetSrvKeyspaceNames
 }
 
 type GetSrvKeyspacesRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Keyspace string `protobuf:"bytes,1,opt,name=keyspace,proto3" json:"keyspace,omitempty"`
+	state    protoimpl.MessageState `protogen:"open.v1"`
+	Keyspace string                 `protobuf:"bytes,1,opt,name=keyspace,proto3" json:"keyspace,omitempty"`
 	// Cells is a list of cells to lookup a SrvKeyspace for. Leaving this empty is
 	// equivalent to specifying all cells in the topo.
-	Cells []string `protobuf:"bytes,2,rep,name=cells,proto3" json:"cells,omitempty"`
+	Cells         []string `protobuf:"bytes,2,rep,name=cells,proto3" json:"cells,omitempty"`
+	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *GetSrvKeyspacesRequest) Reset() {
@@ -6729,12 +6644,11 @@ func (x *GetSrvKeyspacesRequest) GetCells() []string {
 }
 
 type GetSrvKeyspacesResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
+	state protoimpl.MessageState `protogen:"open.v1"`
 	// SrvKeyspaces is a mapping of cell name to SrvKeyspace.
-	SrvKeyspaces map[string]*topodata.SrvKeyspace `protobuf:"bytes,1,rep,name=srv_keyspaces,json=srvKeyspaces,proto3" json:"srv_keyspaces,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
+	SrvKeyspaces  map[string]*topodata.SrvKeyspace `protobuf:"bytes,1,rep,name=srv_keyspaces,json=srvKeyspaces,proto3" json:"srv_keyspaces,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
+	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *GetSrvKeyspacesResponse) Reset() {
@@ -6775,11 +6689,8 @@ func (x *GetSrvKeyspacesResponse) GetSrvKeyspaces() map[string]*topodata.SrvKeys
 }
 
 type UpdateThrottlerConfigRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Keyspace string `protobuf:"bytes,1,opt,name=keyspace,proto3" json:"keyspace,omitempty"`
+	state    protoimpl.MessageState `protogen:"open.v1"`
+	Keyspace string                 `protobuf:"bytes,1,opt,name=keyspace,proto3" json:"keyspace,omitempty"`
 	// Enable instructs to enable the throttler
 	Enable bool `protobuf:"varint,2,opt,name=enable,proto3" json:"enable,omitempty"`
 	// Disable instructs to disable the throttler
@@ -6803,6 +6714,8 @@ type UpdateThrottlerConfigRequest struct {
 	// AppCheckedMetrics are the metrics to be checked got the given AppName. These can be scoped. For example:
 	// ["lag", "self/loadvg", "shard/threads_running"]
 	AppCheckedMetrics []string `protobuf:"bytes,12,rep,name=app_checked_metrics,json=appCheckedMetrics,proto3" json:"app_checked_metrics,omitempty"`
+	unknownFields     protoimpl.UnknownFields
+	sizeCache         protoimpl.SizeCache
 }
 
 func (x *UpdateThrottlerConfigRequest) Reset() {
@@ -6920,9 +6833,9 @@ func (x *UpdateThrottlerConfigRequest) GetAppCheckedMetrics() []string {
 }
 
 type UpdateThrottlerConfigResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
 	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *UpdateThrottlerConfigResponse) Reset() {
@@ -6956,11 +6869,10 @@ func (*UpdateThrottlerConfigResponse) Descriptor() ([]byte, []int) {
 }
 
 type GetSrvVSchemaRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	Cell          string                 `protobuf:"bytes,1,opt,name=cell,proto3" json:"cell,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	Cell string `protobuf:"bytes,1,opt,name=cell,proto3" json:"cell,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *GetSrvVSchemaRequest) Reset() {
@@ -7001,11 +6913,10 @@ func (x *GetSrvVSchemaRequest) GetCell() string {
 }
 
 type GetSrvVSchemaResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	SrvVSchema    *vschema.SrvVSchema    `protobuf:"bytes,1,opt,name=srv_v_schema,json=srvVSchema,proto3" json:"srv_v_schema,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	SrvVSchema *vschema.SrvVSchema `protobuf:"bytes,1,opt,name=srv_v_schema,json=srvVSchema,proto3" json:"srv_v_schema,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *GetSrvVSchemaResponse) Reset() {
@@ -7046,11 +6957,10 @@ func (x *GetSrvVSchemaResponse) GetSrvVSchema() *vschema.SrvVSchema {
 }
 
 type GetSrvVSchemasRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	Cells         []string               `protobuf:"bytes,2,rep,name=cells,proto3" json:"cells,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	Cells []string `protobuf:"bytes,2,rep,name=cells,proto3" json:"cells,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *GetSrvVSchemasRequest) Reset() {
@@ -7091,12 +7001,11 @@ func (x *GetSrvVSchemasRequest) GetCells() []string {
 }
 
 type GetSrvVSchemasResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
+	state protoimpl.MessageState `protogen:"open.v1"`
 	// SrvVSchemas is a mapping of cell name to SrvVSchema
-	SrvVSchemas map[string]*vschema.SrvVSchema `protobuf:"bytes,1,rep,name=srv_v_schemas,json=srvVSchemas,proto3" json:"srv_v_schemas,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
+	SrvVSchemas   map[string]*vschema.SrvVSchema `protobuf:"bytes,1,rep,name=srv_v_schemas,json=srvVSchemas,proto3" json:"srv_v_schemas,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
+	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *GetSrvVSchemasResponse) Reset() {
@@ -7137,11 +7046,10 @@ func (x *GetSrvVSchemasResponse) GetSrvVSchemas() map[string]*vschema.SrvVSchema
 }
 
 type GetTabletRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	TabletAlias   *topodata.TabletAlias  `protobuf:"bytes,1,opt,name=tablet_alias,json=tabletAlias,proto3" json:"tablet_alias,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	TabletAlias *topodata.TabletAlias `protobuf:"bytes,1,opt,name=tablet_alias,json=tabletAlias,proto3" json:"tablet_alias,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *GetTabletRequest) Reset() {
@@ -7182,11 +7090,10 @@ func (x *GetTabletRequest) GetTabletAlias() *topodata.TabletAlias {
 }
 
 type GetTabletResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	Tablet        *topodata.Tablet       `protobuf:"bytes,1,opt,name=tablet,proto3" json:"tablet,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	Tablet *topodata.Tablet `protobuf:"bytes,1,opt,name=tablet,proto3" json:"tablet,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *GetTabletResponse) Reset() {
@@ -7227,10 +7134,7 @@ func (x *GetTabletResponse) GetTablet() *topodata.Tablet {
 }
 
 type GetTabletsRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
+	state protoimpl.MessageState `protogen:"open.v1"`
 	// Keyspace is the name of the keyspace to return tablets for. Omit to return
 	// tablets from all keyspaces.
 	Keyspace string `protobuf:"bytes,1,opt,name=keyspace,proto3" json:"keyspace,omitempty"`
@@ -7252,7 +7156,9 @@ type GetTabletsRequest struct {
 	TabletAliases []*topodata.TabletAlias `protobuf:"bytes,5,rep,name=tablet_aliases,json=tabletAliases,proto3" json:"tablet_aliases,omitempty"`
 	// tablet_type specifies the type of tablets to return. Omit to return all
 	// tablet types.
-	TabletType topodata.TabletType `protobuf:"varint,6,opt,name=tablet_type,json=tabletType,proto3,enum=topodata.TabletType" json:"tablet_type,omitempty"`
+	TabletType    topodata.TabletType `protobuf:"varint,6,opt,name=tablet_type,json=tabletType,proto3,enum=topodata.TabletType" json:"tablet_type,omitempty"`
+	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *GetTabletsRequest) Reset() {
@@ -7328,11 +7234,10 @@ func (x *GetTabletsRequest) GetTabletType() topodata.TabletType {
 }
 
 type GetTabletsResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	Tablets       []*topodata.Tablet     `protobuf:"bytes,1,rep,name=tablets,proto3" json:"tablets,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	Tablets []*topodata.Tablet `protobuf:"bytes,1,rep,name=tablets,proto3" json:"tablets,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *GetTabletsResponse) Reset() {
@@ -7373,12 +7278,11 @@ func (x *GetTabletsResponse) GetTablets() []*topodata.Tablet {
 }
 
 type GetThrottlerStatusRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
+	state protoimpl.MessageState `protogen:"open.v1"`
 	// TabletAlias is the alias of the tablet to probe
-	TabletAlias *topodata.TabletAlias `protobuf:"bytes,1,opt,name=tablet_alias,json=tabletAlias,proto3" json:"tablet_alias,omitempty"`
+	TabletAlias   *topodata.TabletAlias `protobuf:"bytes,1,opt,name=tablet_alias,json=tabletAlias,proto3" json:"tablet_alias,omitempty"`
+	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *GetThrottlerStatusRequest) Reset() {
@@ -7419,11 +7323,10 @@ func (x *GetThrottlerStatusRequest) GetTabletAlias() *topodata.TabletAlias {
 }
 
 type GetThrottlerStatusResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState                        `protogen:"open.v1"`
+	Status        *tabletmanagerdata.GetThrottlerStatusResponse `protobuf:"bytes,1,opt,name=status,proto3" json:"status,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	Status *tabletmanagerdata.GetThrottlerStatusResponse `protobuf:"bytes,1,opt,name=status,proto3" json:"status,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *GetThrottlerStatusResponse) Reset() {
@@ -7464,13 +7367,12 @@ func (x *GetThrottlerStatusResponse) GetStatus() *tabletmanagerdata.GetThrottler
 }
 
 type GetTopologyPathRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	Path          string                 `protobuf:"bytes,1,opt,name=path,proto3" json:"path,omitempty"`
+	Version       int64                  `protobuf:"varint,2,opt,name=version,proto3" json:"version,omitempty"`
+	AsJson        bool                   `protobuf:"varint,3,opt,name=as_json,json=asJson,proto3" json:"as_json,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	Path    string `protobuf:"bytes,1,opt,name=path,proto3" json:"path,omitempty"`
-	Version int64  `protobuf:"varint,2,opt,name=version,proto3" json:"version,omitempty"`
-	AsJson  bool   `protobuf:"varint,3,opt,name=as_json,json=asJson,proto3" json:"as_json,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *GetTopologyPathRequest) Reset() {
@@ -7525,11 +7427,10 @@ func (x *GetTopologyPathRequest) GetAsJson() bool {
 }
 
 type GetTopologyPathResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	Cell          *TopologyCell          `protobuf:"bytes,1,opt,name=cell,proto3" json:"cell,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	Cell *TopologyCell `protobuf:"bytes,1,opt,name=cell,proto3" json:"cell,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *GetTopologyPathResponse) Reset() {
@@ -7570,17 +7471,16 @@ func (x *GetTopologyPathResponse) GetCell() *TopologyCell {
 }
 
 type TopologyCell struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
-	Path string `protobuf:"bytes,2,opt,name=path,proto3" json:"path,omitempty"`
+	state protoimpl.MessageState `protogen:"open.v1"`
+	Name  string                 `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	Path  string                 `protobuf:"bytes,2,opt,name=path,proto3" json:"path,omitempty"`
 	// Data is the file contents of the cell located at path.
 	// It is only populated if the cell is a terminal node.
-	Data     string   `protobuf:"bytes,3,opt,name=data,proto3" json:"data,omitempty"`
-	Children []string `protobuf:"bytes,4,rep,name=children,proto3" json:"children,omitempty"`
-	Version  int64    `protobuf:"varint,5,opt,name=version,proto3" json:"version,omitempty"`
+	Data          string   `protobuf:"bytes,3,opt,name=data,proto3" json:"data,omitempty"`
+	Children      []string `protobuf:"bytes,4,rep,name=children,proto3" json:"children,omitempty"`
+	Version       int64    `protobuf:"varint,5,opt,name=version,proto3" json:"version,omitempty"`
+	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *TopologyCell) Reset() {
@@ -7649,12 +7549,11 @@ func (x *TopologyCell) GetVersion() int64 {
 }
 
 type GetUnresolvedTransactionsRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	Keyspace      string                 `protobuf:"bytes,1,opt,name=keyspace,proto3" json:"keyspace,omitempty"`
+	AbandonAge    int64                  `protobuf:"varint,2,opt,name=abandon_age,json=abandonAge,proto3" json:"abandon_age,omitempty"` // in seconds
 	unknownFields protoimpl.UnknownFields
-
-	Keyspace   string `protobuf:"bytes,1,opt,name=keyspace,proto3" json:"keyspace,omitempty"`
-	AbandonAge int64  `protobuf:"varint,2,opt,name=abandon_age,json=abandonAge,proto3" json:"abandon_age,omitempty"` // in seconds
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *GetUnresolvedTransactionsRequest) Reset() {
@@ -7702,11 +7601,10 @@ func (x *GetUnresolvedTransactionsRequest) GetAbandonAge() int64 {
 }
 
 type GetUnresolvedTransactionsResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState       `protogen:"open.v1"`
+	Transactions  []*query.TransactionMetadata `protobuf:"bytes,1,rep,name=transactions,proto3" json:"transactions,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	Transactions []*query.TransactionMetadata `protobuf:"bytes,1,rep,name=transactions,proto3" json:"transactions,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *GetUnresolvedTransactionsResponse) Reset() {
@@ -7747,11 +7645,10 @@ func (x *GetUnresolvedTransactionsResponse) GetTransactions() []*query.Transacti
 }
 
 type GetTransactionInfoRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	Dtid          string                 `protobuf:"bytes,1,opt,name=dtid,proto3" json:"dtid,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	Dtid string `protobuf:"bytes,1,opt,name=dtid,proto3" json:"dtid,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *GetTransactionInfoRequest) Reset() {
@@ -7792,15 +7689,14 @@ func (x *GetTransactionInfoRequest) GetDtid() string {
 }
 
 type ShardTransactionState struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	Shard         string                 `protobuf:"bytes,1,opt,name=shard,proto3" json:"shard,omitempty"`
+	State         string                 `protobuf:"bytes,2,opt,name=state,proto3" json:"state,omitempty"`
+	Message       string                 `protobuf:"bytes,3,opt,name=message,proto3" json:"message,omitempty"`
+	TimeCreated   int64                  `protobuf:"varint,4,opt,name=time_created,json=timeCreated,proto3" json:"time_created,omitempty"`
+	Statements    []string               `protobuf:"bytes,5,rep,name=statements,proto3" json:"statements,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	Shard       string   `protobuf:"bytes,1,opt,name=shard,proto3" json:"shard,omitempty"`
-	State       string   `protobuf:"bytes,2,opt,name=state,proto3" json:"state,omitempty"`
-	Message     string   `protobuf:"bytes,3,opt,name=message,proto3" json:"message,omitempty"`
-	TimeCreated int64    `protobuf:"varint,4,opt,name=time_created,json=timeCreated,proto3" json:"time_created,omitempty"`
-	Statements  []string `protobuf:"bytes,5,rep,name=statements,proto3" json:"statements,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *ShardTransactionState) Reset() {
@@ -7869,12 +7765,11 @@ func (x *ShardTransactionState) GetStatements() []string {
 }
 
 type GetTransactionInfoResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState     `protogen:"open.v1"`
+	Metadata      *query.TransactionMetadata `protobuf:"bytes,1,opt,name=metadata,proto3" json:"metadata,omitempty"`
+	ShardStates   []*ShardTransactionState   `protobuf:"bytes,2,rep,name=shard_states,json=shardStates,proto3" json:"shard_states,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	Metadata    *query.TransactionMetadata `protobuf:"bytes,1,opt,name=metadata,proto3" json:"metadata,omitempty"`
-	ShardStates []*ShardTransactionState   `protobuf:"bytes,2,rep,name=shard_states,json=shardStates,proto3" json:"shard_states,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *GetTransactionInfoResponse) Reset() {
@@ -7922,12 +7817,11 @@ func (x *GetTransactionInfoResponse) GetShardStates() []*ShardTransactionState {
 }
 
 type ConcludeTransactionRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	Dtid          string                 `protobuf:"bytes,1,opt,name=dtid,proto3" json:"dtid,omitempty"`
+	Participants  []*query.Target        `protobuf:"bytes,2,rep,name=participants,proto3" json:"participants,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	Dtid         string          `protobuf:"bytes,1,opt,name=dtid,proto3" json:"dtid,omitempty"`
-	Participants []*query.Target `protobuf:"bytes,2,rep,name=participants,proto3" json:"participants,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *ConcludeTransactionRequest) Reset() {
@@ -7975,9 +7869,9 @@ func (x *ConcludeTransactionRequest) GetParticipants() []*query.Target {
 }
 
 type ConcludeTransactionResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
 	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *ConcludeTransactionResponse) Reset() {
@@ -8011,11 +7905,10 @@ func (*ConcludeTransactionResponse) Descriptor() ([]byte, []int) {
 }
 
 type GetVSchemaRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	Keyspace      string                 `protobuf:"bytes,1,opt,name=keyspace,proto3" json:"keyspace,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	Keyspace string `protobuf:"bytes,1,opt,name=keyspace,proto3" json:"keyspace,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *GetVSchemaRequest) Reset() {
@@ -8056,11 +7949,10 @@ func (x *GetVSchemaRequest) GetKeyspace() string {
 }
 
 type GetVersionRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	TabletAlias   *topodata.TabletAlias  `protobuf:"bytes,1,opt,name=tablet_alias,json=tabletAlias,proto3" json:"tablet_alias,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	TabletAlias *topodata.TabletAlias `protobuf:"bytes,1,opt,name=tablet_alias,json=tabletAlias,proto3" json:"tablet_alias,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *GetVersionRequest) Reset() {
@@ -8101,11 +7993,10 @@ func (x *GetVersionRequest) GetTabletAlias() *topodata.TabletAlias {
 }
 
 type GetVersionResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	Version       string                 `protobuf:"bytes,1,opt,name=version,proto3" json:"version,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	Version string `protobuf:"bytes,1,opt,name=version,proto3" json:"version,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *GetVersionResponse) Reset() {
@@ -8146,11 +8037,10 @@ func (x *GetVersionResponse) GetVersion() string {
 }
 
 type GetVSchemaResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	VSchema       *vschema.Keyspace      `protobuf:"bytes,1,opt,name=v_schema,json=vSchema,proto3" json:"v_schema,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	VSchema *vschema.Keyspace `protobuf:"bytes,1,opt,name=v_schema,json=vSchema,proto3" json:"v_schema,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *GetVSchemaResponse) Reset() {
@@ -8191,17 +8081,16 @@ func (x *GetVSchemaResponse) GetVSchema() *vschema.Keyspace {
 }
 
 type GetWorkflowsRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Keyspace   string `protobuf:"bytes,1,opt,name=keyspace,proto3" json:"keyspace,omitempty"`
-	ActiveOnly bool   `protobuf:"varint,2,opt,name=active_only,json=activeOnly,proto3" json:"active_only,omitempty"`
-	NameOnly   bool   `protobuf:"varint,3,opt,name=name_only,json=nameOnly,proto3" json:"name_only,omitempty"`
+	state      protoimpl.MessageState `protogen:"open.v1"`
+	Keyspace   string                 `protobuf:"bytes,1,opt,name=keyspace,proto3" json:"keyspace,omitempty"`
+	ActiveOnly bool                   `protobuf:"varint,2,opt,name=active_only,json=activeOnly,proto3" json:"active_only,omitempty"`
+	NameOnly   bool                   `protobuf:"varint,3,opt,name=name_only,json=nameOnly,proto3" json:"name_only,omitempty"`
 	// If you only want a specific workflow then set this field.
-	Workflow    string   `protobuf:"bytes,4,opt,name=workflow,proto3" json:"workflow,omitempty"`
-	IncludeLogs bool     `protobuf:"varint,5,opt,name=include_logs,json=includeLogs,proto3" json:"include_logs,omitempty"`
-	Shards      []string `protobuf:"bytes,6,rep,name=shards,proto3" json:"shards,omitempty"`
+	Workflow      string   `protobuf:"bytes,4,opt,name=workflow,proto3" json:"workflow,omitempty"`
+	IncludeLogs   bool     `protobuf:"varint,5,opt,name=include_logs,json=includeLogs,proto3" json:"include_logs,omitempty"`
+	Shards        []string `protobuf:"bytes,6,rep,name=shards,proto3" json:"shards,omitempty"`
+	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *GetWorkflowsRequest) Reset() {
@@ -8277,11 +8166,10 @@ func (x *GetWorkflowsRequest) GetShards() []string {
 }
 
 type GetWorkflowsResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	Workflows     []*Workflow            `protobuf:"bytes,1,rep,name=workflows,proto3" json:"workflows,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	Workflows []*Workflow `protobuf:"bytes,1,rep,name=workflows,proto3" json:"workflows,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *GetWorkflowsResponse) Reset() {
@@ -8322,15 +8210,14 @@ func (x *GetWorkflowsResponse) GetWorkflows() []*Workflow {
 }
 
 type InitShardPrimaryRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Keyspace                string                `protobuf:"bytes,1,opt,name=keyspace,proto3" json:"keyspace,omitempty"`
-	Shard                   string                `protobuf:"bytes,2,opt,name=shard,proto3" json:"shard,omitempty"`
-	PrimaryElectTabletAlias *topodata.TabletAlias `protobuf:"bytes,3,opt,name=primary_elect_tablet_alias,json=primaryElectTabletAlias,proto3" json:"primary_elect_tablet_alias,omitempty"`
-	Force                   bool                  `protobuf:"varint,4,opt,name=force,proto3" json:"force,omitempty"`
-	WaitReplicasTimeout     *vttime.Duration      `protobuf:"bytes,5,opt,name=wait_replicas_timeout,json=waitReplicasTimeout,proto3" json:"wait_replicas_timeout,omitempty"`
+	state                   protoimpl.MessageState `protogen:"open.v1"`
+	Keyspace                string                 `protobuf:"bytes,1,opt,name=keyspace,proto3" json:"keyspace,omitempty"`
+	Shard                   string                 `protobuf:"bytes,2,opt,name=shard,proto3" json:"shard,omitempty"`
+	PrimaryElectTabletAlias *topodata.TabletAlias  `protobuf:"bytes,3,opt,name=primary_elect_tablet_alias,json=primaryElectTabletAlias,proto3" json:"primary_elect_tablet_alias,omitempty"`
+	Force                   bool                   `protobuf:"varint,4,opt,name=force,proto3" json:"force,omitempty"`
+	WaitReplicasTimeout     *vttime.Duration       `protobuf:"bytes,5,opt,name=wait_replicas_timeout,json=waitReplicasTimeout,proto3" json:"wait_replicas_timeout,omitempty"`
+	unknownFields           protoimpl.UnknownFields
+	sizeCache               protoimpl.SizeCache
 }
 
 func (x *InitShardPrimaryRequest) Reset() {
@@ -8399,11 +8286,10 @@ func (x *InitShardPrimaryRequest) GetWaitReplicasTimeout() *vttime.Duration {
 }
 
 type InitShardPrimaryResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	Events        []*logutil.Event       `protobuf:"bytes,1,rep,name=events,proto3" json:"events,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	Events []*logutil.Event `protobuf:"bytes,1,rep,name=events,proto3" json:"events,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *InitShardPrimaryResponse) Reset() {
@@ -8444,12 +8330,11 @@ func (x *InitShardPrimaryResponse) GetEvents() []*logutil.Event {
 }
 
 type LaunchSchemaMigrationRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	Keyspace      string                 `protobuf:"bytes,1,opt,name=keyspace,proto3" json:"keyspace,omitempty"`
+	Uuid          string                 `protobuf:"bytes,2,opt,name=uuid,proto3" json:"uuid,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	Keyspace string `protobuf:"bytes,1,opt,name=keyspace,proto3" json:"keyspace,omitempty"`
-	Uuid     string `protobuf:"bytes,2,opt,name=uuid,proto3" json:"uuid,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *LaunchSchemaMigrationRequest) Reset() {
@@ -8497,11 +8382,10 @@ func (x *LaunchSchemaMigrationRequest) GetUuid() string {
 }
 
 type LaunchSchemaMigrationResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	RowsAffectedByShard map[string]uint64 `protobuf:"bytes,1,rep,name=rows_affected_by_shard,json=rowsAffectedByShard,proto3" json:"rows_affected_by_shard,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"`
+	state               protoimpl.MessageState `protogen:"open.v1"`
+	RowsAffectedByShard map[string]uint64      `protobuf:"bytes,1,rep,name=rows_affected_by_shard,json=rowsAffectedByShard,proto3" json:"rows_affected_by_shard,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"varint,2,opt,name=value"`
+	unknownFields       protoimpl.UnknownFields
+	sizeCache           protoimpl.SizeCache
 }
 
 func (x *LaunchSchemaMigrationResponse) Reset() {
@@ -8542,16 +8426,15 @@ func (x *LaunchSchemaMigrationResponse) GetRowsAffectedByShard() map[string]uint
 }
 
 type LookupVindexCompleteRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
+	state protoimpl.MessageState `protogen:"open.v1"`
 	// Where the lookup vindex lives.
 	Keyspace string `protobuf:"bytes,1,opt,name=keyspace,proto3" json:"keyspace,omitempty"`
 	// This is the name of the lookup vindex and the vreplication workflow.
 	Name string `protobuf:"bytes,2,opt,name=name,proto3" json:"name,omitempty"`
 	// Where the vreplication workflow lives.
 	TableKeyspace string `protobuf:"bytes,3,opt,name=table_keyspace,json=tableKeyspace,proto3" json:"table_keyspace,omitempty"`
+	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *LookupVindexCompleteRequest) Reset() {
@@ -8606,9 +8489,9 @@ func (x *LookupVindexCompleteRequest) GetTableKeyspace() string {
 }
 
 type LookupVindexCompleteResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
 	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *LookupVindexCompleteResponse) Reset() {
@@ -8642,10 +8525,7 @@ func (*LookupVindexCompleteResponse) Descriptor() ([]byte, []int) {
 }
 
 type LookupVindexCreateRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
+	state                      protoimpl.MessageState                      `protogen:"open.v1"`
 	Keyspace                   string                                      `protobuf:"bytes,1,opt,name=keyspace,proto3" json:"keyspace,omitempty"`
 	Workflow                   string                                      `protobuf:"bytes,2,opt,name=workflow,proto3" json:"workflow,omitempty"`
 	Cells                      []string                                    `protobuf:"bytes,3,rep,name=cells,proto3" json:"cells,omitempty"`
@@ -8653,6 +8533,8 @@ type LookupVindexCreateRequest struct {
 	ContinueAfterCopyWithOwner bool                                        `protobuf:"varint,5,opt,name=continue_after_copy_with_owner,json=continueAfterCopyWithOwner,proto3" json:"continue_after_copy_with_owner,omitempty"`
 	TabletTypes                []topodata.TabletType                       `protobuf:"varint,6,rep,packed,name=tablet_types,json=tabletTypes,proto3,enum=topodata.TabletType" json:"tablet_types,omitempty"`
 	TabletSelectionPreference  tabletmanagerdata.TabletSelectionPreference `protobuf:"varint,7,opt,name=tablet_selection_preference,json=tabletSelectionPreference,proto3,enum=tabletmanagerdata.TabletSelectionPreference" json:"tablet_selection_preference,omitempty"`
+	unknownFields              protoimpl.UnknownFields
+	sizeCache                  protoimpl.SizeCache
 }
 
 func (x *LookupVindexCreateRequest) Reset() {
@@ -8735,9 +8617,9 @@ func (x *LookupVindexCreateRequest) GetTabletSelectionPreference() tabletmanager
 }
 
 type LookupVindexCreateResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
 	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *LookupVindexCreateResponse) Reset() {
@@ -8771,10 +8653,7 @@ func (*LookupVindexCreateResponse) Descriptor() ([]byte, []int) {
 }
 
 type LookupVindexExternalizeRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
+	state protoimpl.MessageState `protogen:"open.v1"`
 	// Where the lookup vindex lives.
 	Keyspace string `protobuf:"bytes,1,opt,name=keyspace,proto3" json:"keyspace,omitempty"`
 	// This is the name of the lookup vindex and the vreplication workflow.
@@ -8784,6 +8663,8 @@ type LookupVindexExternalizeRequest struct {
 	// If this is set true, we directly delete the workflow instead of stopping.
 	// Also, complete command is not required to delete workflow in that case.
 	DeleteWorkflow bool `protobuf:"varint,4,opt,name=delete_workflow,json=deleteWorkflow,proto3" json:"delete_workflow,omitempty"`
+	unknownFields  protoimpl.UnknownFields
+	sizeCache      protoimpl.SizeCache
 }
 
 func (x *LookupVindexExternalizeRequest) Reset() {
@@ -8845,14 +8726,13 @@ func (x *LookupVindexExternalizeRequest) GetDeleteWorkflow() bool {
 }
 
 type LookupVindexExternalizeResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
+	state protoimpl.MessageState `protogen:"open.v1"`
 	// Was the workflow stopped.
 	WorkflowStopped bool `protobuf:"varint,1,opt,name=workflow_stopped,json=workflowStopped,proto3" json:"workflow_stopped,omitempty"`
 	// Was the workflow deleted.
 	WorkflowDeleted bool `protobuf:"varint,2,opt,name=workflow_deleted,json=workflowDeleted,proto3" json:"workflow_deleted,omitempty"`
+	unknownFields   protoimpl.UnknownFields
+	sizeCache       protoimpl.SizeCache
 }
 
 func (x *LookupVindexExternalizeResponse) Reset() {
@@ -8900,16 +8780,15 @@ func (x *LookupVindexExternalizeResponse) GetWorkflowDeleted() bool {
 }
 
 type LookupVindexInternalizeRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
+	state protoimpl.MessageState `protogen:"open.v1"`
 	// Where the lookup vindex lives.
 	Keyspace string `protobuf:"bytes,1,opt,name=keyspace,proto3" json:"keyspace,omitempty"`
 	// This is the name of the lookup vindex and the vreplication workflow.
 	Name string `protobuf:"bytes,2,opt,name=name,proto3" json:"name,omitempty"`
 	// Where the vreplication workflow lives.
 	TableKeyspace string `protobuf:"bytes,3,opt,name=table_keyspace,json=tableKeyspace,proto3" json:"table_keyspace,omitempty"`
+	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *LookupVindexInternalizeRequest) Reset() {
@@ -8964,9 +8843,9 @@ func (x *LookupVindexInternalizeRequest) GetTableKeyspace() string {
 }
 
 type LookupVindexInternalizeResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
 	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *LookupVindexInternalizeResponse) Reset() {
@@ -9000,11 +8879,10 @@ func (*LookupVindexInternalizeResponse) Descriptor() ([]byte, []int) {
 }
 
 type MaterializeCreateRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	Settings      *MaterializeSettings   `protobuf:"bytes,1,opt,name=settings,proto3" json:"settings,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	Settings *MaterializeSettings `protobuf:"bytes,1,opt,name=settings,proto3" json:"settings,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *MaterializeCreateRequest) Reset() {
@@ -9045,9 +8923,9 @@ func (x *MaterializeCreateRequest) GetSettings() *MaterializeSettings {
 }
 
 type MaterializeCreateResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
 	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *MaterializeCreateResponse) Reset() {
@@ -9081,10 +8959,7 @@ func (*MaterializeCreateResponse) Descriptor() ([]byte, []int) {
 }
 
 type MigrateCreateRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
+	state protoimpl.MessageState `protogen:"open.v1"`
 	// The necessary info gets passed on to each primary tablet involved
 	// in the workflow via the CreateVReplicationWorkflow tabletmanager RPC.
 	Workflow                  string                                      `protobuf:"bytes,1,opt,name=workflow,proto3" json:"workflow,omitempty"`
@@ -9111,6 +8986,8 @@ type MigrateCreateRequest struct {
 	AutoStart bool `protobuf:"varint,16,opt,name=auto_start,json=autoStart,proto3" json:"auto_start,omitempty"`
 	// NoRoutingRules is set to true if routing rules should not be created on the target when the workflow is created.
 	NoRoutingRules bool `protobuf:"varint,17,opt,name=no_routing_rules,json=noRoutingRules,proto3" json:"no_routing_rules,omitempty"`
+	unknownFields  protoimpl.UnknownFields
+	sizeCache      protoimpl.SizeCache
 }
 
 func (x *MigrateCreateRequest) Reset() {
@@ -9263,16 +9140,15 @@ func (x *MigrateCreateRequest) GetNoRoutingRules() bool {
 }
 
 type MigrateCompleteRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Workflow         string `protobuf:"bytes,1,opt,name=workflow,proto3" json:"workflow,omitempty"`
-	TargetKeyspace   string `protobuf:"bytes,3,opt,name=target_keyspace,json=targetKeyspace,proto3" json:"target_keyspace,omitempty"`
-	KeepData         bool   `protobuf:"varint,4,opt,name=keep_data,json=keepData,proto3" json:"keep_data,omitempty"`
-	KeepRoutingRules bool   `protobuf:"varint,5,opt,name=keep_routing_rules,json=keepRoutingRules,proto3" json:"keep_routing_rules,omitempty"`
-	RenameTables     bool   `protobuf:"varint,6,opt,name=rename_tables,json=renameTables,proto3" json:"rename_tables,omitempty"`
-	DryRun           bool   `protobuf:"varint,7,opt,name=dry_run,json=dryRun,proto3" json:"dry_run,omitempty"`
+	state            protoimpl.MessageState `protogen:"open.v1"`
+	Workflow         string                 `protobuf:"bytes,1,opt,name=workflow,proto3" json:"workflow,omitempty"`
+	TargetKeyspace   string                 `protobuf:"bytes,3,opt,name=target_keyspace,json=targetKeyspace,proto3" json:"target_keyspace,omitempty"`
+	KeepData         bool                   `protobuf:"varint,4,opt,name=keep_data,json=keepData,proto3" json:"keep_data,omitempty"`
+	KeepRoutingRules bool                   `protobuf:"varint,5,opt,name=keep_routing_rules,json=keepRoutingRules,proto3" json:"keep_routing_rules,omitempty"`
+	RenameTables     bool                   `protobuf:"varint,6,opt,name=rename_tables,json=renameTables,proto3" json:"rename_tables,omitempty"`
+	DryRun           bool                   `protobuf:"varint,7,opt,name=dry_run,json=dryRun,proto3" json:"dry_run,omitempty"`
+	unknownFields    protoimpl.UnknownFields
+	sizeCache        protoimpl.SizeCache
 }
 
 func (x *MigrateCompleteRequest) Reset() {
@@ -9348,12 +9224,11 @@ func (x *MigrateCompleteRequest) GetDryRun() bool {
 }
 
 type MigrateCompleteResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	Summary       string                 `protobuf:"bytes,1,opt,name=summary,proto3" json:"summary,omitempty"`
+	DryRunResults []string               `protobuf:"bytes,2,rep,name=dry_run_results,json=dryRunResults,proto3" json:"dry_run_results,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	Summary       string   `protobuf:"bytes,1,opt,name=summary,proto3" json:"summary,omitempty"`
-	DryRunResults []string `protobuf:"bytes,2,rep,name=dry_run_results,json=dryRunResults,proto3" json:"dry_run_results,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *MigrateCompleteResponse) Reset() {
@@ -9401,14 +9276,13 @@ func (x *MigrateCompleteResponse) GetDryRunResults() []string {
 }
 
 type MountRegisterRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	TopoType      string                 `protobuf:"bytes,1,opt,name=topo_type,json=topoType,proto3" json:"topo_type,omitempty"`
+	TopoServer    string                 `protobuf:"bytes,2,opt,name=topo_server,json=topoServer,proto3" json:"topo_server,omitempty"`
+	TopoRoot      string                 `protobuf:"bytes,3,opt,name=topo_root,json=topoRoot,proto3" json:"topo_root,omitempty"`
+	Name          string                 `protobuf:"bytes,4,opt,name=name,proto3" json:"name,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	TopoType   string `protobuf:"bytes,1,opt,name=topo_type,json=topoType,proto3" json:"topo_type,omitempty"`
-	TopoServer string `protobuf:"bytes,2,opt,name=topo_server,json=topoServer,proto3" json:"topo_server,omitempty"`
-	TopoRoot   string `protobuf:"bytes,3,opt,name=topo_root,json=topoRoot,proto3" json:"topo_root,omitempty"`
-	Name       string `protobuf:"bytes,4,opt,name=name,proto3" json:"name,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *MountRegisterRequest) Reset() {
@@ -9470,9 +9344,9 @@ func (x *MountRegisterRequest) GetName() string {
 }
 
 type MountRegisterResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
 	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *MountRegisterResponse) Reset() {
@@ -9506,11 +9380,10 @@ func (*MountRegisterResponse) Descriptor() ([]byte, []int) {
 }
 
 type MountUnregisterRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	Name          string                 `protobuf:"bytes,4,opt,name=name,proto3" json:"name,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	Name string `protobuf:"bytes,4,opt,name=name,proto3" json:"name,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *MountUnregisterRequest) Reset() {
@@ -9551,9 +9424,9 @@ func (x *MountUnregisterRequest) GetName() string {
 }
 
 type MountUnregisterResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
 	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *MountUnregisterResponse) Reset() {
@@ -9587,11 +9460,10 @@ func (*MountUnregisterResponse) Descriptor() ([]byte, []int) {
 }
 
 type MountShowRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	Name          string                 `protobuf:"bytes,4,opt,name=name,proto3" json:"name,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	Name string `protobuf:"bytes,4,opt,name=name,proto3" json:"name,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *MountShowRequest) Reset() {
@@ -9632,14 +9504,13 @@ func (x *MountShowRequest) GetName() string {
 }
 
 type MountShowResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	TopoType      string                 `protobuf:"bytes,1,opt,name=topo_type,json=topoType,proto3" json:"topo_type,omitempty"`
+	TopoServer    string                 `protobuf:"bytes,2,opt,name=topo_server,json=topoServer,proto3" json:"topo_server,omitempty"`
+	TopoRoot      string                 `protobuf:"bytes,3,opt,name=topo_root,json=topoRoot,proto3" json:"topo_root,omitempty"`
+	Name          string                 `protobuf:"bytes,4,opt,name=name,proto3" json:"name,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	TopoType   string `protobuf:"bytes,1,opt,name=topo_type,json=topoType,proto3" json:"topo_type,omitempty"`
-	TopoServer string `protobuf:"bytes,2,opt,name=topo_server,json=topoServer,proto3" json:"topo_server,omitempty"`
-	TopoRoot   string `protobuf:"bytes,3,opt,name=topo_root,json=topoRoot,proto3" json:"topo_root,omitempty"`
-	Name       string `protobuf:"bytes,4,opt,name=name,proto3" json:"name,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *MountShowResponse) Reset() {
@@ -9701,9 +9572,9 @@ func (x *MountShowResponse) GetName() string {
 }
 
 type MountListRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
 	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *MountListRequest) Reset() {
@@ -9737,11 +9608,10 @@ func (*MountListRequest) Descriptor() ([]byte, []int) {
 }
 
 type MountListResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	Names         []string               `protobuf:"bytes,1,rep,name=names,proto3" json:"names,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	Names []string `protobuf:"bytes,1,rep,name=names,proto3" json:"names,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *MountListResponse) Reset() {
@@ -9782,10 +9652,7 @@ func (x *MountListResponse) GetNames() []string {
 }
 
 type MoveTablesCreateRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
+	state protoimpl.MessageState `protogen:"open.v1"`
 	// The necessary info gets passed on to each primary tablet involved
 	// in the workflow via the CreateVReplicationWorkflow tabletmanager RPC.
 	Workflow                  string                                      `protobuf:"bytes,1,opt,name=workflow,proto3" json:"workflow,omitempty"`
@@ -9817,6 +9684,8 @@ type MoveTablesCreateRequest struct {
 	// Run a single copy phase for the entire database.
 	AtomicCopy      bool             `protobuf:"varint,19,opt,name=atomic_copy,json=atomicCopy,proto3" json:"atomic_copy,omitempty"`
 	WorkflowOptions *WorkflowOptions `protobuf:"bytes,20,opt,name=workflow_options,json=workflowOptions,proto3" json:"workflow_options,omitempty"`
+	unknownFields   protoimpl.UnknownFields
+	sizeCache       protoimpl.SizeCache
 }
 
 func (x *MoveTablesCreateRequest) Reset() {
@@ -9990,12 +9859,11 @@ func (x *MoveTablesCreateRequest) GetWorkflowOptions() *WorkflowOptions {
 }
 
 type MoveTablesCreateResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState                 `protogen:"open.v1"`
+	Summary       string                                 `protobuf:"bytes,1,opt,name=summary,proto3" json:"summary,omitempty"`
+	Details       []*MoveTablesCreateResponse_TabletInfo `protobuf:"bytes,2,rep,name=details,proto3" json:"details,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	Summary string                                 `protobuf:"bytes,1,opt,name=summary,proto3" json:"summary,omitempty"`
-	Details []*MoveTablesCreateResponse_TabletInfo `protobuf:"bytes,2,rep,name=details,proto3" json:"details,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *MoveTablesCreateResponse) Reset() {
@@ -10043,17 +9911,16 @@ func (x *MoveTablesCreateResponse) GetDetails() []*MoveTablesCreateResponse_Tabl
 }
 
 type MoveTablesCompleteRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Workflow         string   `protobuf:"bytes,1,opt,name=workflow,proto3" json:"workflow,omitempty"`
-	TargetKeyspace   string   `protobuf:"bytes,3,opt,name=target_keyspace,json=targetKeyspace,proto3" json:"target_keyspace,omitempty"`
-	KeepData         bool     `protobuf:"varint,4,opt,name=keep_data,json=keepData,proto3" json:"keep_data,omitempty"`
-	KeepRoutingRules bool     `protobuf:"varint,5,opt,name=keep_routing_rules,json=keepRoutingRules,proto3" json:"keep_routing_rules,omitempty"`
-	RenameTables     bool     `protobuf:"varint,6,opt,name=rename_tables,json=renameTables,proto3" json:"rename_tables,omitempty"`
-	DryRun           bool     `protobuf:"varint,7,opt,name=dry_run,json=dryRun,proto3" json:"dry_run,omitempty"`
-	Shards           []string `protobuf:"bytes,8,rep,name=shards,proto3" json:"shards,omitempty"`
+	state            protoimpl.MessageState `protogen:"open.v1"`
+	Workflow         string                 `protobuf:"bytes,1,opt,name=workflow,proto3" json:"workflow,omitempty"`
+	TargetKeyspace   string                 `protobuf:"bytes,3,opt,name=target_keyspace,json=targetKeyspace,proto3" json:"target_keyspace,omitempty"`
+	KeepData         bool                   `protobuf:"varint,4,opt,name=keep_data,json=keepData,proto3" json:"keep_data,omitempty"`
+	KeepRoutingRules bool                   `protobuf:"varint,5,opt,name=keep_routing_rules,json=keepRoutingRules,proto3" json:"keep_routing_rules,omitempty"`
+	RenameTables     bool                   `protobuf:"varint,6,opt,name=rename_tables,json=renameTables,proto3" json:"rename_tables,omitempty"`
+	DryRun           bool                   `protobuf:"varint,7,opt,name=dry_run,json=dryRun,proto3" json:"dry_run,omitempty"`
+	Shards           []string               `protobuf:"bytes,8,rep,name=shards,proto3" json:"shards,omitempty"`
+	unknownFields    protoimpl.UnknownFields
+	sizeCache        protoimpl.SizeCache
 }
 
 func (x *MoveTablesCompleteRequest) Reset() {
@@ -10136,12 +10003,11 @@ func (x *MoveTablesCompleteRequest) GetShards() []string {
 }
 
 type MoveTablesCompleteResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	Summary       string                 `protobuf:"bytes,1,opt,name=summary,proto3" json:"summary,omitempty"`
+	DryRunResults []string               `protobuf:"bytes,2,rep,name=dry_run_results,json=dryRunResults,proto3" json:"dry_run_results,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	Summary       string   `protobuf:"bytes,1,opt,name=summary,proto3" json:"summary,omitempty"`
-	DryRunResults []string `protobuf:"bytes,2,rep,name=dry_run_results,json=dryRunResults,proto3" json:"dry_run_results,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *MoveTablesCompleteResponse) Reset() {
@@ -10189,11 +10055,10 @@ func (x *MoveTablesCompleteResponse) GetDryRunResults() []string {
 }
 
 type PingTabletRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	TabletAlias   *topodata.TabletAlias  `protobuf:"bytes,1,opt,name=tablet_alias,json=tabletAlias,proto3" json:"tablet_alias,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	TabletAlias *topodata.TabletAlias `protobuf:"bytes,1,opt,name=tablet_alias,json=tabletAlias,proto3" json:"tablet_alias,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *PingTabletRequest) Reset() {
@@ -10234,9 +10099,9 @@ func (x *PingTabletRequest) GetTabletAlias() *topodata.TabletAlias {
 }
 
 type PingTabletResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
 	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *PingTabletResponse) Reset() {
@@ -10270,10 +10135,7 @@ func (*PingTabletResponse) Descriptor() ([]byte, []int) {
 }
 
 type PlannedReparentShardRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
+	state protoimpl.MessageState `protogen:"open.v1"`
 	// Keyspace is the name of the keyspace to perform the Planned Reparent in.
 	Keyspace string `protobuf:"bytes,1,opt,name=keyspace,proto3" json:"keyspace,omitempty"`
 	// Shard is the name of the shard to perform teh Planned Reparent in.
@@ -10305,6 +10167,8 @@ type PlannedReparentShardRequest struct {
 	// ExpectedPrimary is the optional alias we expect to be the current primary in order for
 	// the reparent operation to succeed.
 	ExpectedPrimary *topodata.TabletAlias `protobuf:"bytes,8,opt,name=expected_primary,json=expectedPrimary,proto3" json:"expected_primary,omitempty"`
+	unknownFields   protoimpl.UnknownFields
+	sizeCache       protoimpl.SizeCache
 }
 
 func (x *PlannedReparentShardRequest) Reset() {
@@ -10394,10 +10258,7 @@ func (x *PlannedReparentShardRequest) GetExpectedPrimary() *topodata.TabletAlias
 }
 
 type PlannedReparentShardResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
+	state protoimpl.MessageState `protogen:"open.v1"`
 	// Keyspace is the name of the keyspace the Planned Reparent took place in.
 	Keyspace string `protobuf:"bytes,1,opt,name=keyspace,proto3" json:"keyspace,omitempty"`
 	// Shard is the name of the shard the Planned Reparent took place in.
@@ -10408,6 +10269,8 @@ type PlannedReparentShardResponse struct {
 	// up-to-date.
 	PromotedPrimary *topodata.TabletAlias `protobuf:"bytes,3,opt,name=promoted_primary,json=promotedPrimary,proto3" json:"promoted_primary,omitempty"`
 	Events          []*logutil.Event      `protobuf:"bytes,4,rep,name=events,proto3" json:"events,omitempty"`
+	unknownFields   protoimpl.UnknownFields
+	sizeCache       protoimpl.SizeCache
 }
 
 func (x *PlannedReparentShardResponse) Reset() {
@@ -10469,15 +10332,14 @@ func (x *PlannedReparentShardResponse) GetEvents() []*logutil.Event {
 }
 
 type RebuildKeyspaceGraphRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Keyspace string   `protobuf:"bytes,1,opt,name=keyspace,proto3" json:"keyspace,omitempty"`
-	Cells    []string `protobuf:"bytes,2,rep,name=cells,proto3" json:"cells,omitempty"`
+	state    protoimpl.MessageState `protogen:"open.v1"`
+	Keyspace string                 `protobuf:"bytes,1,opt,name=keyspace,proto3" json:"keyspace,omitempty"`
+	Cells    []string               `protobuf:"bytes,2,rep,name=cells,proto3" json:"cells,omitempty"`
 	// AllowPartial, when set, allows a SNAPSHOT keyspace to serve with an
 	// incomplete set of shards. It is ignored for all other keyspace types.
-	AllowPartial bool `protobuf:"varint,3,opt,name=allow_partial,json=allowPartial,proto3" json:"allow_partial,omitempty"`
+	AllowPartial  bool `protobuf:"varint,3,opt,name=allow_partial,json=allowPartial,proto3" json:"allow_partial,omitempty"`
+	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *RebuildKeyspaceGraphRequest) Reset() {
@@ -10532,9 +10394,9 @@ func (x *RebuildKeyspaceGraphRequest) GetAllowPartial() bool {
 }
 
 type RebuildKeyspaceGraphResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
 	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *RebuildKeyspaceGraphResponse) Reset() {
@@ -10568,13 +10430,12 @@ func (*RebuildKeyspaceGraphResponse) Descriptor() ([]byte, []int) {
 }
 
 type RebuildVSchemaGraphRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
+	state protoimpl.MessageState `protogen:"open.v1"`
 	// Cells specifies the cells to rebuild the SrvVSchema objects for. If empty,
 	// RebuildVSchemaGraph rebuilds the SrvVSchema for every cell in the topo.
-	Cells []string `protobuf:"bytes,1,rep,name=cells,proto3" json:"cells,omitempty"`
+	Cells         []string `protobuf:"bytes,1,rep,name=cells,proto3" json:"cells,omitempty"`
+	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *RebuildVSchemaGraphRequest) Reset() {
@@ -10615,9 +10476,9 @@ func (x *RebuildVSchemaGraphRequest) GetCells() []string {
 }
 
 type RebuildVSchemaGraphResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
 	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *RebuildVSchemaGraphResponse) Reset() {
@@ -10651,11 +10512,10 @@ func (*RebuildVSchemaGraphResponse) Descriptor() ([]byte, []int) {
 }
 
 type RefreshStateRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	TabletAlias   *topodata.TabletAlias  `protobuf:"bytes,1,opt,name=tablet_alias,json=tabletAlias,proto3" json:"tablet_alias,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	TabletAlias *topodata.TabletAlias `protobuf:"bytes,1,opt,name=tablet_alias,json=tabletAlias,proto3" json:"tablet_alias,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *RefreshStateRequest) Reset() {
@@ -10696,9 +10556,9 @@ func (x *RefreshStateRequest) GetTabletAlias() *topodata.TabletAlias {
 }
 
 type RefreshStateResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
 	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *RefreshStateResponse) Reset() {
@@ -10732,13 +10592,12 @@ func (*RefreshStateResponse) Descriptor() ([]byte, []int) {
 }
 
 type RefreshStateByShardRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	Keyspace      string                 `protobuf:"bytes,1,opt,name=keyspace,proto3" json:"keyspace,omitempty"`
+	Shard         string                 `protobuf:"bytes,2,opt,name=shard,proto3" json:"shard,omitempty"`
+	Cells         []string               `protobuf:"bytes,3,rep,name=cells,proto3" json:"cells,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	Keyspace string   `protobuf:"bytes,1,opt,name=keyspace,proto3" json:"keyspace,omitempty"`
-	Shard    string   `protobuf:"bytes,2,opt,name=shard,proto3" json:"shard,omitempty"`
-	Cells    []string `protobuf:"bytes,3,rep,name=cells,proto3" json:"cells,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *RefreshStateByShardRequest) Reset() {
@@ -10793,13 +10652,12 @@ func (x *RefreshStateByShardRequest) GetCells() []string {
 }
 
 type RefreshStateByShardResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	IsPartialRefresh bool `protobuf:"varint,1,opt,name=is_partial_refresh,json=isPartialRefresh,proto3" json:"is_partial_refresh,omitempty"`
+	state            protoimpl.MessageState `protogen:"open.v1"`
+	IsPartialRefresh bool                   `protobuf:"varint,1,opt,name=is_partial_refresh,json=isPartialRefresh,proto3" json:"is_partial_refresh,omitempty"`
 	// This explains why we had a partial refresh (if we did)
 	PartialRefreshDetails string `protobuf:"bytes,2,opt,name=partial_refresh_details,json=partialRefreshDetails,proto3" json:"partial_refresh_details,omitempty"`
+	unknownFields         protoimpl.UnknownFields
+	sizeCache             protoimpl.SizeCache
 }
 
 func (x *RefreshStateByShardResponse) Reset() {
@@ -10847,11 +10705,10 @@ func (x *RefreshStateByShardResponse) GetPartialRefreshDetails() string {
 }
 
 type ReloadSchemaRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	TabletAlias   *topodata.TabletAlias  `protobuf:"bytes,1,opt,name=tablet_alias,json=tabletAlias,proto3" json:"tablet_alias,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	TabletAlias *topodata.TabletAlias `protobuf:"bytes,1,opt,name=tablet_alias,json=tabletAlias,proto3" json:"tablet_alias,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *ReloadSchemaRequest) Reset() {
@@ -10892,9 +10749,9 @@ func (x *ReloadSchemaRequest) GetTabletAlias() *topodata.TabletAlias {
 }
 
 type ReloadSchemaResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
 	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *ReloadSchemaResponse) Reset() {
@@ -10928,17 +10785,16 @@ func (*ReloadSchemaResponse) Descriptor() ([]byte, []int) {
 }
 
 type ReloadSchemaKeyspaceRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Keyspace       string `protobuf:"bytes,1,opt,name=keyspace,proto3" json:"keyspace,omitempty"`
-	WaitPosition   string `protobuf:"bytes,2,opt,name=wait_position,json=waitPosition,proto3" json:"wait_position,omitempty"`
-	IncludePrimary bool   `protobuf:"varint,3,opt,name=include_primary,json=includePrimary,proto3" json:"include_primary,omitempty"`
+	state          protoimpl.MessageState `protogen:"open.v1"`
+	Keyspace       string                 `protobuf:"bytes,1,opt,name=keyspace,proto3" json:"keyspace,omitempty"`
+	WaitPosition   string                 `protobuf:"bytes,2,opt,name=wait_position,json=waitPosition,proto3" json:"wait_position,omitempty"`
+	IncludePrimary bool                   `protobuf:"varint,3,opt,name=include_primary,json=includePrimary,proto3" json:"include_primary,omitempty"`
 	// Concurrency is the global concurrency across all shards in the keyspace
 	// (so, at most this many tablets will be reloaded across the keyspace at any
 	// given point).
-	Concurrency int32 `protobuf:"varint,4,opt,name=concurrency,proto3" json:"concurrency,omitempty"`
+	Concurrency   int32 `protobuf:"varint,4,opt,name=concurrency,proto3" json:"concurrency,omitempty"`
+	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *ReloadSchemaKeyspaceRequest) Reset() {
@@ -11000,11 +10856,10 @@ func (x *ReloadSchemaKeyspaceRequest) GetConcurrency() int32 {
 }
 
 type ReloadSchemaKeyspaceResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	Events        []*logutil.Event       `protobuf:"bytes,1,rep,name=events,proto3" json:"events,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	Events []*logutil.Event `protobuf:"bytes,1,rep,name=events,proto3" json:"events,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *ReloadSchemaKeyspaceResponse) Reset() {
@@ -11045,16 +10900,15 @@ func (x *ReloadSchemaKeyspaceResponse) GetEvents() []*logutil.Event {
 }
 
 type ReloadSchemaShardRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Keyspace       string `protobuf:"bytes,1,opt,name=keyspace,proto3" json:"keyspace,omitempty"`
-	Shard          string `protobuf:"bytes,2,opt,name=shard,proto3" json:"shard,omitempty"`
-	WaitPosition   string `protobuf:"bytes,3,opt,name=wait_position,json=waitPosition,proto3" json:"wait_position,omitempty"`
-	IncludePrimary bool   `protobuf:"varint,4,opt,name=include_primary,json=includePrimary,proto3" json:"include_primary,omitempty"`
+	state          protoimpl.MessageState `protogen:"open.v1"`
+	Keyspace       string                 `protobuf:"bytes,1,opt,name=keyspace,proto3" json:"keyspace,omitempty"`
+	Shard          string                 `protobuf:"bytes,2,opt,name=shard,proto3" json:"shard,omitempty"`
+	WaitPosition   string                 `protobuf:"bytes,3,opt,name=wait_position,json=waitPosition,proto3" json:"wait_position,omitempty"`
+	IncludePrimary bool                   `protobuf:"varint,4,opt,name=include_primary,json=includePrimary,proto3" json:"include_primary,omitempty"`
 	// Concurrency is the maximum number of tablets to reload at one time.
-	Concurrency int32 `protobuf:"varint,5,opt,name=concurrency,proto3" json:"concurrency,omitempty"`
+	Concurrency   int32 `protobuf:"varint,5,opt,name=concurrency,proto3" json:"concurrency,omitempty"`
+	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *ReloadSchemaShardRequest) Reset() {
@@ -11123,11 +10977,10 @@ func (x *ReloadSchemaShardRequest) GetConcurrency() int32 {
 }
 
 type ReloadSchemaShardResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	Events        []*logutil.Event       `protobuf:"bytes,2,rep,name=events,proto3" json:"events,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	Events []*logutil.Event `protobuf:"bytes,2,rep,name=events,proto3" json:"events,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *ReloadSchemaShardResponse) Reset() {
@@ -11168,13 +11021,12 @@ func (x *ReloadSchemaShardResponse) GetEvents() []*logutil.Event {
 }
 
 type RemoveBackupRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	Keyspace      string                 `protobuf:"bytes,1,opt,name=keyspace,proto3" json:"keyspace,omitempty"`
+	Shard         string                 `protobuf:"bytes,2,opt,name=shard,proto3" json:"shard,omitempty"`
+	Name          string                 `protobuf:"bytes,3,opt,name=name,proto3" json:"name,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	Keyspace string `protobuf:"bytes,1,opt,name=keyspace,proto3" json:"keyspace,omitempty"`
-	Shard    string `protobuf:"bytes,2,opt,name=shard,proto3" json:"shard,omitempty"`
-	Name     string `protobuf:"bytes,3,opt,name=name,proto3" json:"name,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *RemoveBackupRequest) Reset() {
@@ -11229,9 +11081,9 @@ func (x *RemoveBackupRequest) GetName() string {
 }
 
 type RemoveBackupResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
 	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *RemoveBackupResponse) Reset() {
@@ -11265,19 +11117,18 @@ func (*RemoveBackupResponse) Descriptor() ([]byte, []int) {
 }
 
 type RemoveKeyspaceCellRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Keyspace string `protobuf:"bytes,1,opt,name=keyspace,proto3" json:"keyspace,omitempty"`
-	Cell     string `protobuf:"bytes,2,opt,name=cell,proto3" json:"cell,omitempty"`
+	state    protoimpl.MessageState `protogen:"open.v1"`
+	Keyspace string                 `protobuf:"bytes,1,opt,name=keyspace,proto3" json:"keyspace,omitempty"`
+	Cell     string                 `protobuf:"bytes,2,opt,name=cell,proto3" json:"cell,omitempty"`
 	// Force proceeds even if the cell's topology server cannot be reached. This
 	// should only be set if a cell has been shut down entirely, and the global
 	// topology data just needs to be updated.
 	Force bool `protobuf:"varint,3,opt,name=force,proto3" json:"force,omitempty"`
 	// Recursive also deletes all tablets in that cell belonging to the specified
 	// keyspace.
-	Recursive bool `protobuf:"varint,4,opt,name=recursive,proto3" json:"recursive,omitempty"`
+	Recursive     bool `protobuf:"varint,4,opt,name=recursive,proto3" json:"recursive,omitempty"`
+	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *RemoveKeyspaceCellRequest) Reset() {
@@ -11339,9 +11190,9 @@ func (x *RemoveKeyspaceCellRequest) GetRecursive() bool {
 }
 
 type RemoveKeyspaceCellResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
 	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *RemoveKeyspaceCellResponse) Reset() {
@@ -11375,20 +11226,19 @@ func (*RemoveKeyspaceCellResponse) Descriptor() ([]byte, []int) {
 }
 
 type RemoveShardCellRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Keyspace  string `protobuf:"bytes,1,opt,name=keyspace,proto3" json:"keyspace,omitempty"`
-	ShardName string `protobuf:"bytes,2,opt,name=shard_name,json=shardName,proto3" json:"shard_name,omitempty"`
-	Cell      string `protobuf:"bytes,3,opt,name=cell,proto3" json:"cell,omitempty"`
+	state     protoimpl.MessageState `protogen:"open.v1"`
+	Keyspace  string                 `protobuf:"bytes,1,opt,name=keyspace,proto3" json:"keyspace,omitempty"`
+	ShardName string                 `protobuf:"bytes,2,opt,name=shard_name,json=shardName,proto3" json:"shard_name,omitempty"`
+	Cell      string                 `protobuf:"bytes,3,opt,name=cell,proto3" json:"cell,omitempty"`
 	// Force proceeds even if the cell's topology server cannot be reached. This
 	// should only be set if a cell has been shut down entirely, and the global
 	// topology data just needs to be updated.
 	Force bool `protobuf:"varint,4,opt,name=force,proto3" json:"force,omitempty"`
 	// Recursive also deletes all tablets in that cell belonging to the specified
 	// keyspace and shard.
-	Recursive bool `protobuf:"varint,5,opt,name=recursive,proto3" json:"recursive,omitempty"`
+	Recursive     bool `protobuf:"varint,5,opt,name=recursive,proto3" json:"recursive,omitempty"`
+	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *RemoveShardCellRequest) Reset() {
@@ -11457,9 +11307,9 @@ func (x *RemoveShardCellRequest) GetRecursive() bool {
 }
 
 type RemoveShardCellResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
 	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *RemoveShardCellResponse) Reset() {
@@ -11493,13 +11343,12 @@ func (*RemoveShardCellResponse) Descriptor() ([]byte, []int) {
 }
 
 type ReparentTabletRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
+	state protoimpl.MessageState `protogen:"open.v1"`
 	// Tablet is the alias of the tablet that should be reparented under the
 	// current shard primary.
-	Tablet *topodata.TabletAlias `protobuf:"bytes,1,opt,name=tablet,proto3" json:"tablet,omitempty"`
+	Tablet        *topodata.TabletAlias `protobuf:"bytes,1,opt,name=tablet,proto3" json:"tablet,omitempty"`
+	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *ReparentTabletRequest) Reset() {
@@ -11540,16 +11389,15 @@ func (x *ReparentTabletRequest) GetTablet() *topodata.TabletAlias {
 }
 
 type ReparentTabletResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
+	state protoimpl.MessageState `protogen:"open.v1"`
 	// Keyspace is the name of the keyspace the tablet was reparented in.
 	Keyspace string `protobuf:"bytes,1,opt,name=keyspace,proto3" json:"keyspace,omitempty"`
 	// Shard is the name of the shard the tablet was reparented in.
 	Shard string `protobuf:"bytes,2,opt,name=shard,proto3" json:"shard,omitempty"`
 	// Primary is the alias of the tablet that the tablet was reparented under.
-	Primary *topodata.TabletAlias `protobuf:"bytes,3,opt,name=primary,proto3" json:"primary,omitempty"`
+	Primary       *topodata.TabletAlias `protobuf:"bytes,3,opt,name=primary,proto3" json:"primary,omitempty"`
+	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *ReparentTabletResponse) Reset() {
@@ -11604,10 +11452,7 @@ func (x *ReparentTabletResponse) GetPrimary() *topodata.TabletAlias {
 }
 
 type ReshardCreateRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
+	state                     protoimpl.MessageState                      `protogen:"open.v1"`
 	Workflow                  string                                      `protobuf:"bytes,1,opt,name=workflow,proto3" json:"workflow,omitempty"`
 	Keyspace                  string                                      `protobuf:"bytes,2,opt,name=keyspace,proto3" json:"keyspace,omitempty"`
 	SourceShards              []string                                    `protobuf:"bytes,3,rep,name=source_shards,json=sourceShards,proto3" json:"source_shards,omitempty"`
@@ -11627,6 +11472,8 @@ type ReshardCreateRequest struct {
 	// Start the workflow after creating it.
 	AutoStart       bool             `protobuf:"varint,12,opt,name=auto_start,json=autoStart,proto3" json:"auto_start,omitempty"`
 	WorkflowOptions *WorkflowOptions `protobuf:"bytes,13,opt,name=workflow_options,json=workflowOptions,proto3" json:"workflow_options,omitempty"`
+	unknownFields   protoimpl.UnknownFields
+	sizeCache       protoimpl.SizeCache
 }
 
 func (x *ReshardCreateRequest) Reset() {
@@ -11751,11 +11598,8 @@ func (x *ReshardCreateRequest) GetWorkflowOptions() *WorkflowOptions {
 }
 
 type RestoreFromBackupRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	TabletAlias *topodata.TabletAlias `protobuf:"bytes,1,opt,name=tablet_alias,json=tabletAlias,proto3" json:"tablet_alias,omitempty"`
+	state       protoimpl.MessageState `protogen:"open.v1"`
+	TabletAlias *topodata.TabletAlias  `protobuf:"bytes,1,opt,name=tablet_alias,json=tabletAlias,proto3" json:"tablet_alias,omitempty"`
 	// BackupTime, if set, will use the backup taken most closely at or before
 	// this time. If nil, the latest backup will be restored on the tablet.
 	BackupTime *vttime.Time `protobuf:"bytes,2,opt,name=backup_time,json=backupTime,proto3" json:"backup_time,omitempty"`
@@ -11770,6 +11614,8 @@ type RestoreFromBackupRequest struct {
 	RestoreToTimestamp *vttime.Time `protobuf:"bytes,5,opt,name=restore_to_timestamp,json=restoreToTimestamp,proto3" json:"restore_to_timestamp,omitempty"`
 	// AllowedBackupEngines, if present will filter out any backups taken with engines not included in the list
 	AllowedBackupEngines []string `protobuf:"bytes,6,rep,name=allowed_backup_engines,json=allowedBackupEngines,proto3" json:"allowed_backup_engines,omitempty"`
+	unknownFields        protoimpl.UnknownFields
+	sizeCache            protoimpl.SizeCache
 }
 
 func (x *RestoreFromBackupRequest) Reset() {
@@ -11845,15 +11691,14 @@ func (x *RestoreFromBackupRequest) GetAllowedBackupEngines() []string {
 }
 
 type RestoreFromBackupResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
+	state protoimpl.MessageState `protogen:"open.v1"`
 	// TabletAlias is the alias of the tablet doing the restore.
-	TabletAlias *topodata.TabletAlias `protobuf:"bytes,1,opt,name=tablet_alias,json=tabletAlias,proto3" json:"tablet_alias,omitempty"`
-	Keyspace    string                `protobuf:"bytes,2,opt,name=keyspace,proto3" json:"keyspace,omitempty"`
-	Shard       string                `protobuf:"bytes,3,opt,name=shard,proto3" json:"shard,omitempty"`
-	Event       *logutil.Event        `protobuf:"bytes,4,opt,name=event,proto3" json:"event,omitempty"`
+	TabletAlias   *topodata.TabletAlias `protobuf:"bytes,1,opt,name=tablet_alias,json=tabletAlias,proto3" json:"tablet_alias,omitempty"`
+	Keyspace      string                `protobuf:"bytes,2,opt,name=keyspace,proto3" json:"keyspace,omitempty"`
+	Shard         string                `protobuf:"bytes,3,opt,name=shard,proto3" json:"shard,omitempty"`
+	Event         *logutil.Event        `protobuf:"bytes,4,opt,name=event,proto3" json:"event,omitempty"`
+	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *RestoreFromBackupResponse) Reset() {
@@ -11915,12 +11760,11 @@ func (x *RestoreFromBackupResponse) GetEvent() *logutil.Event {
 }
 
 type RetrySchemaMigrationRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	Keyspace      string                 `protobuf:"bytes,1,opt,name=keyspace,proto3" json:"keyspace,omitempty"`
+	Uuid          string                 `protobuf:"bytes,2,opt,name=uuid,proto3" json:"uuid,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	Keyspace string `protobuf:"bytes,1,opt,name=keyspace,proto3" json:"keyspace,omitempty"`
-	Uuid     string `protobuf:"bytes,2,opt,name=uuid,proto3" json:"uuid,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *RetrySchemaMigrationRequest) Reset() {
@@ -11968,11 +11812,10 @@ func (x *RetrySchemaMigrationRequest) GetUuid() string {
 }
 
 type RetrySchemaMigrationResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	RowsAffectedByShard map[string]uint64 `protobuf:"bytes,1,rep,name=rows_affected_by_shard,json=rowsAffectedByShard,proto3" json:"rows_affected_by_shard,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"`
+	state               protoimpl.MessageState `protogen:"open.v1"`
+	RowsAffectedByShard map[string]uint64      `protobuf:"bytes,1,rep,name=rows_affected_by_shard,json=rowsAffectedByShard,proto3" json:"rows_affected_by_shard,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"varint,2,opt,name=value"`
+	unknownFields       protoimpl.UnknownFields
+	sizeCache           protoimpl.SizeCache
 }
 
 func (x *RetrySchemaMigrationResponse) Reset() {
@@ -12013,11 +11856,10 @@ func (x *RetrySchemaMigrationResponse) GetRowsAffectedByShard() map[string]uint6
 }
 
 type RunHealthCheckRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	TabletAlias   *topodata.TabletAlias  `protobuf:"bytes,1,opt,name=tablet_alias,json=tabletAlias,proto3" json:"tablet_alias,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	TabletAlias *topodata.TabletAlias `protobuf:"bytes,1,opt,name=tablet_alias,json=tabletAlias,proto3" json:"tablet_alias,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *RunHealthCheckRequest) Reset() {
@@ -12058,9 +11900,9 @@ func (x *RunHealthCheckRequest) GetTabletAlias() *topodata.TabletAlias {
 }
 
 type RunHealthCheckResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
 	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *RunHealthCheckResponse) Reset() {
@@ -12094,12 +11936,11 @@ func (*RunHealthCheckResponse) Descriptor() ([]byte, []int) {
 }
 
 type SetKeyspaceDurabilityPolicyRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Keyspace         string `protobuf:"bytes,1,opt,name=keyspace,proto3" json:"keyspace,omitempty"`
-	DurabilityPolicy string `protobuf:"bytes,2,opt,name=durability_policy,json=durabilityPolicy,proto3" json:"durability_policy,omitempty"`
+	state            protoimpl.MessageState `protogen:"open.v1"`
+	Keyspace         string                 `protobuf:"bytes,1,opt,name=keyspace,proto3" json:"keyspace,omitempty"`
+	DurabilityPolicy string                 `protobuf:"bytes,2,opt,name=durability_policy,json=durabilityPolicy,proto3" json:"durability_policy,omitempty"`
+	unknownFields    protoimpl.UnknownFields
+	sizeCache        protoimpl.SizeCache
 }
 
 func (x *SetKeyspaceDurabilityPolicyRequest) Reset() {
@@ -12147,12 +11988,11 @@ func (x *SetKeyspaceDurabilityPolicyRequest) GetDurabilityPolicy() string {
 }
 
 type SetKeyspaceDurabilityPolicyResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
+	state protoimpl.MessageState `protogen:"open.v1"`
 	// Keyspace is the updated keyspace record.
-	Keyspace *topodata.Keyspace `protobuf:"bytes,1,opt,name=keyspace,proto3" json:"keyspace,omitempty"`
+	Keyspace      *topodata.Keyspace `protobuf:"bytes,1,opt,name=keyspace,proto3" json:"keyspace,omitempty"`
+	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *SetKeyspaceDurabilityPolicyResponse) Reset() {
@@ -12193,12 +12033,11 @@ func (x *SetKeyspaceDurabilityPolicyResponse) GetKeyspace() *topodata.Keyspace {
 }
 
 type SetKeyspaceShardingInfoRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	Keyspace      string                 `protobuf:"bytes,1,opt,name=keyspace,proto3" json:"keyspace,omitempty"`
+	Force         bool                   `protobuf:"varint,4,opt,name=force,proto3" json:"force,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	Keyspace string `protobuf:"bytes,1,opt,name=keyspace,proto3" json:"keyspace,omitempty"`
-	Force    bool   `protobuf:"varint,4,opt,name=force,proto3" json:"force,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *SetKeyspaceShardingInfoRequest) Reset() {
@@ -12246,12 +12085,11 @@ func (x *SetKeyspaceShardingInfoRequest) GetForce() bool {
 }
 
 type SetKeyspaceShardingInfoResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
+	state protoimpl.MessageState `protogen:"open.v1"`
 	// Keyspace is the updated keyspace record.
-	Keyspace *topodata.Keyspace `protobuf:"bytes,1,opt,name=keyspace,proto3" json:"keyspace,omitempty"`
+	Keyspace      *topodata.Keyspace `protobuf:"bytes,1,opt,name=keyspace,proto3" json:"keyspace,omitempty"`
+	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *SetKeyspaceShardingInfoResponse) Reset() {
@@ -12292,13 +12130,12 @@ func (x *SetKeyspaceShardingInfoResponse) GetKeyspace() *topodata.Keyspace {
 }
 
 type SetShardIsPrimaryServingRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	Keyspace      string                 `protobuf:"bytes,1,opt,name=keyspace,proto3" json:"keyspace,omitempty"`
+	Shard         string                 `protobuf:"bytes,2,opt,name=shard,proto3" json:"shard,omitempty"`
+	IsServing     bool                   `protobuf:"varint,3,opt,name=is_serving,json=isServing,proto3" json:"is_serving,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	Keyspace  string `protobuf:"bytes,1,opt,name=keyspace,proto3" json:"keyspace,omitempty"`
-	Shard     string `protobuf:"bytes,2,opt,name=shard,proto3" json:"shard,omitempty"`
-	IsServing bool   `protobuf:"varint,3,opt,name=is_serving,json=isServing,proto3" json:"is_serving,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *SetShardIsPrimaryServingRequest) Reset() {
@@ -12353,12 +12190,11 @@ func (x *SetShardIsPrimaryServingRequest) GetIsServing() bool {
 }
 
 type SetShardIsPrimaryServingResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
+	state protoimpl.MessageState `protogen:"open.v1"`
 	// Shard is the updated shard record.
-	Shard *topodata.Shard `protobuf:"bytes,1,opt,name=shard,proto3" json:"shard,omitempty"`
+	Shard         *topodata.Shard `protobuf:"bytes,1,opt,name=shard,proto3" json:"shard,omitempty"`
+	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *SetShardIsPrimaryServingResponse) Reset() {
@@ -12399,14 +12235,11 @@ func (x *SetShardIsPrimaryServingResponse) GetShard() *topodata.Shard {
 }
 
 type SetShardTabletControlRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Keyspace   string              `protobuf:"bytes,1,opt,name=keyspace,proto3" json:"keyspace,omitempty"`
-	Shard      string              `protobuf:"bytes,2,opt,name=shard,proto3" json:"shard,omitempty"`
-	TabletType topodata.TabletType `protobuf:"varint,3,opt,name=tablet_type,json=tabletType,proto3,enum=topodata.TabletType" json:"tablet_type,omitempty"`
-	Cells      []string            `protobuf:"bytes,4,rep,name=cells,proto3" json:"cells,omitempty"`
+	state      protoimpl.MessageState `protogen:"open.v1"`
+	Keyspace   string                 `protobuf:"bytes,1,opt,name=keyspace,proto3" json:"keyspace,omitempty"`
+	Shard      string                 `protobuf:"bytes,2,opt,name=shard,proto3" json:"shard,omitempty"`
+	TabletType topodata.TabletType    `protobuf:"varint,3,opt,name=tablet_type,json=tabletType,proto3,enum=topodata.TabletType" json:"tablet_type,omitempty"`
+	Cells      []string               `protobuf:"bytes,4,rep,name=cells,proto3" json:"cells,omitempty"`
 	// DeniedTables updates the list of denied tables the shard will serve for
 	// the given tablet type. This is useful to fix tables that are being blocked
 	// after a MoveTables operation.
@@ -12423,7 +12256,9 @@ type SetShardTabletControlRequest struct {
 	// precedence over DeniedTables and DisableQueryService fields, and is useful
 	// to manually remove serving restrictions after a completed MoveTables
 	// operation.
-	Remove bool `protobuf:"varint,7,opt,name=remove,proto3" json:"remove,omitempty"`
+	Remove        bool `protobuf:"varint,7,opt,name=remove,proto3" json:"remove,omitempty"`
+	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *SetShardTabletControlRequest) Reset() {
@@ -12506,12 +12341,11 @@ func (x *SetShardTabletControlRequest) GetRemove() bool {
 }
 
 type SetShardTabletControlResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
+	state protoimpl.MessageState `protogen:"open.v1"`
 	// Shard is the updated shard record.
-	Shard *topodata.Shard `protobuf:"bytes,1,opt,name=shard,proto3" json:"shard,omitempty"`
+	Shard         *topodata.Shard `protobuf:"bytes,1,opt,name=shard,proto3" json:"shard,omitempty"`
+	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *SetShardTabletControlResponse) Reset() {
@@ -12552,12 +12386,11 @@ func (x *SetShardTabletControlResponse) GetShard() *topodata.Shard {
 }
 
 type SetWritableRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	TabletAlias   *topodata.TabletAlias  `protobuf:"bytes,1,opt,name=tablet_alias,json=tabletAlias,proto3" json:"tablet_alias,omitempty"`
+	Writable      bool                   `protobuf:"varint,2,opt,name=writable,proto3" json:"writable,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	TabletAlias *topodata.TabletAlias `protobuf:"bytes,1,opt,name=tablet_alias,json=tabletAlias,proto3" json:"tablet_alias,omitempty"`
-	Writable    bool                  `protobuf:"varint,2,opt,name=writable,proto3" json:"writable,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *SetWritableRequest) Reset() {
@@ -12605,9 +12438,9 @@ func (x *SetWritableRequest) GetWritable() bool {
 }
 
 type SetWritableResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
 	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *SetWritableResponse) Reset() {
@@ -12641,13 +12474,12 @@ func (*SetWritableResponse) Descriptor() ([]byte, []int) {
 }
 
 type ShardReplicationAddRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	Keyspace      string                 `protobuf:"bytes,1,opt,name=keyspace,proto3" json:"keyspace,omitempty"`
+	Shard         string                 `protobuf:"bytes,2,opt,name=shard,proto3" json:"shard,omitempty"`
+	TabletAlias   *topodata.TabletAlias  `protobuf:"bytes,3,opt,name=tablet_alias,json=tabletAlias,proto3" json:"tablet_alias,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	Keyspace    string                `protobuf:"bytes,1,opt,name=keyspace,proto3" json:"keyspace,omitempty"`
-	Shard       string                `protobuf:"bytes,2,opt,name=shard,proto3" json:"shard,omitempty"`
-	TabletAlias *topodata.TabletAlias `protobuf:"bytes,3,opt,name=tablet_alias,json=tabletAlias,proto3" json:"tablet_alias,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *ShardReplicationAddRequest) Reset() {
@@ -12702,9 +12534,9 @@ func (x *ShardReplicationAddRequest) GetTabletAlias() *topodata.TabletAlias {
 }
 
 type ShardReplicationAddResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
 	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *ShardReplicationAddResponse) Reset() {
@@ -12738,13 +12570,12 @@ func (*ShardReplicationAddResponse) Descriptor() ([]byte, []int) {
 }
 
 type ShardReplicationFixRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	Keyspace      string                 `protobuf:"bytes,1,opt,name=keyspace,proto3" json:"keyspace,omitempty"`
+	Shard         string                 `protobuf:"bytes,2,opt,name=shard,proto3" json:"shard,omitempty"`
+	Cell          string                 `protobuf:"bytes,3,opt,name=cell,proto3" json:"cell,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	Keyspace string `protobuf:"bytes,1,opt,name=keyspace,proto3" json:"keyspace,omitempty"`
-	Shard    string `protobuf:"bytes,2,opt,name=shard,proto3" json:"shard,omitempty"`
-	Cell     string `protobuf:"bytes,3,opt,name=cell,proto3" json:"cell,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *ShardReplicationFixRequest) Reset() {
@@ -12796,17 +12627,16 @@ func (x *ShardReplicationFixRequest) GetCell() string {
 		return x.Cell
 	}
 	return ""
-}
-
-type ShardReplicationFixResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
+}
 
+type ShardReplicationFixResponse struct {
+	state protoimpl.MessageState `protogen:"open.v1"`
 	// Error contains information about the error fixed by a
 	// ShardReplicationFix RPC. If there were no errors to fix (i.e. all nodes
 	// in the replication graph are valid), this field is nil.
-	Error *topodata.ShardReplicationError `protobuf:"bytes,1,opt,name=error,proto3" json:"error,omitempty"`
+	Error         *topodata.ShardReplicationError `protobuf:"bytes,1,opt,name=error,proto3" json:"error,omitempty"`
+	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *ShardReplicationFixResponse) Reset() {
@@ -12847,12 +12677,11 @@ func (x *ShardReplicationFixResponse) GetError() *topodata.ShardReplicationError
 }
 
 type ShardReplicationPositionsRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	Keyspace      string                 `protobuf:"bytes,1,opt,name=keyspace,proto3" json:"keyspace,omitempty"`
+	Shard         string                 `protobuf:"bytes,2,opt,name=shard,proto3" json:"shard,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	Keyspace string `protobuf:"bytes,1,opt,name=keyspace,proto3" json:"keyspace,omitempty"`
-	Shard    string `protobuf:"bytes,2,opt,name=shard,proto3" json:"shard,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *ShardReplicationPositionsRequest) Reset() {
@@ -12900,16 +12729,15 @@ func (x *ShardReplicationPositionsRequest) GetShard() string {
 }
 
 type ShardReplicationPositionsResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
+	state protoimpl.MessageState `protogen:"open.v1"`
 	// ReplicationStatuses is a mapping of tablet alias string to replication
 	// status for that tablet.
-	ReplicationStatuses map[string]*replicationdata.Status `protobuf:"bytes,1,rep,name=replication_statuses,json=replicationStatuses,proto3" json:"replication_statuses,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
+	ReplicationStatuses map[string]*replicationdata.Status `protobuf:"bytes,1,rep,name=replication_statuses,json=replicationStatuses,proto3" json:"replication_statuses,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
 	// TabletMap is the set of tablets whose replication statuses were queried,
 	// keyed by tablet alias.
-	TabletMap map[string]*topodata.Tablet `protobuf:"bytes,2,rep,name=tablet_map,json=tabletMap,proto3" json:"tablet_map,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
+	TabletMap     map[string]*topodata.Tablet `protobuf:"bytes,2,rep,name=tablet_map,json=tabletMap,proto3" json:"tablet_map,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
+	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *ShardReplicationPositionsResponse) Reset() {
@@ -12957,13 +12785,12 @@ func (x *ShardReplicationPositionsResponse) GetTabletMap() map[string]*topodata.
 }
 
 type ShardReplicationRemoveRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	Keyspace      string                 `protobuf:"bytes,1,opt,name=keyspace,proto3" json:"keyspace,omitempty"`
+	Shard         string                 `protobuf:"bytes,2,opt,name=shard,proto3" json:"shard,omitempty"`
+	TabletAlias   *topodata.TabletAlias  `protobuf:"bytes,3,opt,name=tablet_alias,json=tabletAlias,proto3" json:"tablet_alias,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	Keyspace    string                `protobuf:"bytes,1,opt,name=keyspace,proto3" json:"keyspace,omitempty"`
-	Shard       string                `protobuf:"bytes,2,opt,name=shard,proto3" json:"shard,omitempty"`
-	TabletAlias *topodata.TabletAlias `protobuf:"bytes,3,opt,name=tablet_alias,json=tabletAlias,proto3" json:"tablet_alias,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *ShardReplicationRemoveRequest) Reset() {
@@ -13018,9 +12845,9 @@ func (x *ShardReplicationRemoveRequest) GetTabletAlias() *topodata.TabletAlias {
 }
 
 type ShardReplicationRemoveResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
 	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *ShardReplicationRemoveResponse) Reset() {
@@ -13054,12 +12881,11 @@ func (*ShardReplicationRemoveResponse) Descriptor() ([]byte, []int) {
 }
 
 type SleepTabletRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	TabletAlias   *topodata.TabletAlias  `protobuf:"bytes,1,opt,name=tablet_alias,json=tabletAlias,proto3" json:"tablet_alias,omitempty"`
+	Duration      *vttime.Duration       `protobuf:"bytes,2,opt,name=duration,proto3" json:"duration,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	TabletAlias *topodata.TabletAlias `protobuf:"bytes,1,opt,name=tablet_alias,json=tabletAlias,proto3" json:"tablet_alias,omitempty"`
-	Duration    *vttime.Duration      `protobuf:"bytes,2,opt,name=duration,proto3" json:"duration,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *SleepTabletRequest) Reset() {
@@ -13107,9 +12933,9 @@ func (x *SleepTabletRequest) GetDuration() *vttime.Duration {
 }
 
 type SleepTabletResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
 	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *SleepTabletResponse) Reset() {
@@ -13143,21 +12969,20 @@ func (*SleepTabletResponse) Descriptor() ([]byte, []int) {
 }
 
 type SourceShardAddRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Keyspace       string `protobuf:"bytes,1,opt,name=keyspace,proto3" json:"keyspace,omitempty"`
-	Shard          string `protobuf:"bytes,2,opt,name=shard,proto3" json:"shard,omitempty"`
-	Uid            int32  `protobuf:"varint,3,opt,name=uid,proto3" json:"uid,omitempty"`
-	SourceKeyspace string `protobuf:"bytes,4,opt,name=source_keyspace,json=sourceKeyspace,proto3" json:"source_keyspace,omitempty"`
-	SourceShard    string `protobuf:"bytes,5,opt,name=source_shard,json=sourceShard,proto3" json:"source_shard,omitempty"`
+	state          protoimpl.MessageState `protogen:"open.v1"`
+	Keyspace       string                 `protobuf:"bytes,1,opt,name=keyspace,proto3" json:"keyspace,omitempty"`
+	Shard          string                 `protobuf:"bytes,2,opt,name=shard,proto3" json:"shard,omitempty"`
+	Uid            int32                  `protobuf:"varint,3,opt,name=uid,proto3" json:"uid,omitempty"`
+	SourceKeyspace string                 `protobuf:"bytes,4,opt,name=source_keyspace,json=sourceKeyspace,proto3" json:"source_keyspace,omitempty"`
+	SourceShard    string                 `protobuf:"bytes,5,opt,name=source_shard,json=sourceShard,proto3" json:"source_shard,omitempty"`
 	// KeyRange identifies the key range to use for the SourceShard. This field is
 	// optional.
 	KeyRange *topodata.KeyRange `protobuf:"bytes,6,opt,name=key_range,json=keyRange,proto3" json:"key_range,omitempty"`
 	// Tables is a list of tables replicate (for MoveTables). Each "table" can be
 	// either an exact match or a regular expression of the form "/regexp/".
-	Tables []string `protobuf:"bytes,7,rep,name=tables,proto3" json:"tables,omitempty"`
+	Tables        []string `protobuf:"bytes,7,rep,name=tables,proto3" json:"tables,omitempty"`
+	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *SourceShardAddRequest) Reset() {
@@ -13240,12 +13065,11 @@ func (x *SourceShardAddRequest) GetTables() []string {
 }
 
 type SourceShardAddResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
+	state protoimpl.MessageState `protogen:"open.v1"`
 	// Shard is the updated shard record.
-	Shard *topodata.Shard `protobuf:"bytes,1,opt,name=shard,proto3" json:"shard,omitempty"`
+	Shard         *topodata.Shard `protobuf:"bytes,1,opt,name=shard,proto3" json:"shard,omitempty"`
+	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *SourceShardAddResponse) Reset() {
@@ -13286,13 +13110,12 @@ func (x *SourceShardAddResponse) GetShard() *topodata.Shard {
 }
 
 type SourceShardDeleteRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	Keyspace      string                 `protobuf:"bytes,1,opt,name=keyspace,proto3" json:"keyspace,omitempty"`
+	Shard         string                 `protobuf:"bytes,2,opt,name=shard,proto3" json:"shard,omitempty"`
+	Uid           int32                  `protobuf:"varint,3,opt,name=uid,proto3" json:"uid,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	Keyspace string `protobuf:"bytes,1,opt,name=keyspace,proto3" json:"keyspace,omitempty"`
-	Shard    string `protobuf:"bytes,2,opt,name=shard,proto3" json:"shard,omitempty"`
-	Uid      int32  `protobuf:"varint,3,opt,name=uid,proto3" json:"uid,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *SourceShardDeleteRequest) Reset() {
@@ -13347,12 +13170,11 @@ func (x *SourceShardDeleteRequest) GetUid() int32 {
 }
 
 type SourceShardDeleteResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
+	state protoimpl.MessageState `protogen:"open.v1"`
 	// Shard is the updated shard record.
-	Shard *topodata.Shard `protobuf:"bytes,1,opt,name=shard,proto3" json:"shard,omitempty"`
+	Shard         *topodata.Shard `protobuf:"bytes,1,opt,name=shard,proto3" json:"shard,omitempty"`
+	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *SourceShardDeleteResponse) Reset() {
@@ -13393,11 +13215,10 @@ func (x *SourceShardDeleteResponse) GetShard() *topodata.Shard {
 }
 
 type StartReplicationRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	TabletAlias   *topodata.TabletAlias  `protobuf:"bytes,1,opt,name=tablet_alias,json=tabletAlias,proto3" json:"tablet_alias,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	TabletAlias *topodata.TabletAlias `protobuf:"bytes,1,opt,name=tablet_alias,json=tabletAlias,proto3" json:"tablet_alias,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *StartReplicationRequest) Reset() {
@@ -13438,9 +13259,9 @@ func (x *StartReplicationRequest) GetTabletAlias() *topodata.TabletAlias {
 }
 
 type StartReplicationResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
 	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *StartReplicationResponse) Reset() {
@@ -13474,11 +13295,10 @@ func (*StartReplicationResponse) Descriptor() ([]byte, []int) {
 }
 
 type StopReplicationRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	TabletAlias   *topodata.TabletAlias  `protobuf:"bytes,1,opt,name=tablet_alias,json=tabletAlias,proto3" json:"tablet_alias,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	TabletAlias *topodata.TabletAlias `protobuf:"bytes,1,opt,name=tablet_alias,json=tabletAlias,proto3" json:"tablet_alias,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *StopReplicationRequest) Reset() {
@@ -13519,9 +13339,9 @@ func (x *StopReplicationRequest) GetTabletAlias() *topodata.TabletAlias {
 }
 
 type StopReplicationResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
 	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *StopReplicationResponse) Reset() {
@@ -13555,13 +13375,12 @@ func (*StopReplicationResponse) Descriptor() ([]byte, []int) {
 }
 
 type TabletExternallyReparentedRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
+	state protoimpl.MessageState `protogen:"open.v1"`
 	// Tablet is the alias of the tablet that was promoted externally and should
 	// be updated to the shard primary in the topo.
-	Tablet *topodata.TabletAlias `protobuf:"bytes,1,opt,name=tablet,proto3" json:"tablet,omitempty"`
+	Tablet        *topodata.TabletAlias `protobuf:"bytes,1,opt,name=tablet,proto3" json:"tablet,omitempty"`
+	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *TabletExternallyReparentedRequest) Reset() {
@@ -13602,14 +13421,13 @@ func (x *TabletExternallyReparentedRequest) GetTablet() *topodata.TabletAlias {
 }
 
 type TabletExternallyReparentedResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	Keyspace      string                 `protobuf:"bytes,1,opt,name=keyspace,proto3" json:"keyspace,omitempty"`
+	Shard         string                 `protobuf:"bytes,2,opt,name=shard,proto3" json:"shard,omitempty"`
+	NewPrimary    *topodata.TabletAlias  `protobuf:"bytes,3,opt,name=new_primary,json=newPrimary,proto3" json:"new_primary,omitempty"`
+	OldPrimary    *topodata.TabletAlias  `protobuf:"bytes,4,opt,name=old_primary,json=oldPrimary,proto3" json:"old_primary,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	Keyspace   string                `protobuf:"bytes,1,opt,name=keyspace,proto3" json:"keyspace,omitempty"`
-	Shard      string                `protobuf:"bytes,2,opt,name=shard,proto3" json:"shard,omitempty"`
-	NewPrimary *topodata.TabletAlias `protobuf:"bytes,3,opt,name=new_primary,json=newPrimary,proto3" json:"new_primary,omitempty"`
-	OldPrimary *topodata.TabletAlias `protobuf:"bytes,4,opt,name=old_primary,json=oldPrimary,proto3" json:"old_primary,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *TabletExternallyReparentedResponse) Reset() {
@@ -13671,12 +13489,11 @@ func (x *TabletExternallyReparentedResponse) GetOldPrimary() *topodata.TabletAli
 }
 
 type UpdateCellInfoRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	Name          string                 `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	CellInfo      *topodata.CellInfo     `protobuf:"bytes,2,opt,name=cell_info,json=cellInfo,proto3" json:"cell_info,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	Name     string             `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
-	CellInfo *topodata.CellInfo `protobuf:"bytes,2,opt,name=cell_info,json=cellInfo,proto3" json:"cell_info,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *UpdateCellInfoRequest) Reset() {
@@ -13724,12 +13541,11 @@ func (x *UpdateCellInfoRequest) GetCellInfo() *topodata.CellInfo {
 }
 
 type UpdateCellInfoResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	Name          string                 `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	CellInfo      *topodata.CellInfo     `protobuf:"bytes,2,opt,name=cell_info,json=cellInfo,proto3" json:"cell_info,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	Name     string             `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
-	CellInfo *topodata.CellInfo `protobuf:"bytes,2,opt,name=cell_info,json=cellInfo,proto3" json:"cell_info,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *UpdateCellInfoResponse) Reset() {
@@ -13777,12 +13593,11 @@ func (x *UpdateCellInfoResponse) GetCellInfo() *topodata.CellInfo {
 }
 
 type UpdateCellsAliasRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	Name          string                 `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	CellsAlias    *topodata.CellsAlias   `protobuf:"bytes,2,opt,name=cells_alias,json=cellsAlias,proto3" json:"cells_alias,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	Name       string               `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
-	CellsAlias *topodata.CellsAlias `protobuf:"bytes,2,opt,name=cells_alias,json=cellsAlias,proto3" json:"cells_alias,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *UpdateCellsAliasRequest) Reset() {
@@ -13830,12 +13645,11 @@ func (x *UpdateCellsAliasRequest) GetCellsAlias() *topodata.CellsAlias {
 }
 
 type UpdateCellsAliasResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	Name          string                 `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	CellsAlias    *topodata.CellsAlias   `protobuf:"bytes,2,opt,name=cells_alias,json=cellsAlias,proto3" json:"cells_alias,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	Name       string               `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
-	CellsAlias *topodata.CellsAlias `protobuf:"bytes,2,opt,name=cells_alias,json=cellsAlias,proto3" json:"cells_alias,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *UpdateCellsAliasResponse) Reset() {
@@ -13883,11 +13697,10 @@ func (x *UpdateCellsAliasResponse) GetCellsAlias() *topodata.CellsAlias {
 }
 
 type ValidateRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	PingTablets   bool                   `protobuf:"varint,1,opt,name=ping_tablets,json=pingTablets,proto3" json:"ping_tablets,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	PingTablets bool `protobuf:"varint,1,opt,name=ping_tablets,json=pingTablets,proto3" json:"ping_tablets,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *ValidateRequest) Reset() {
@@ -13928,12 +13741,11 @@ func (x *ValidateRequest) GetPingTablets() bool {
 }
 
 type ValidateResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
+	state             protoimpl.MessageState               `protogen:"open.v1"`
 	Results           []string                             `protobuf:"bytes,1,rep,name=results,proto3" json:"results,omitempty"`
-	ResultsByKeyspace map[string]*ValidateKeyspaceResponse `protobuf:"bytes,2,rep,name=results_by_keyspace,json=resultsByKeyspace,proto3" json:"results_by_keyspace,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
+	ResultsByKeyspace map[string]*ValidateKeyspaceResponse `protobuf:"bytes,2,rep,name=results_by_keyspace,json=resultsByKeyspace,proto3" json:"results_by_keyspace,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
+	unknownFields     protoimpl.UnknownFields
+	sizeCache         protoimpl.SizeCache
 }
 
 func (x *ValidateResponse) Reset() {
@@ -13981,12 +13793,11 @@ func (x *ValidateResponse) GetResultsByKeyspace() map[string]*ValidateKeyspaceRe
 }
 
 type ValidateKeyspaceRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	Keyspace      string                 `protobuf:"bytes,1,opt,name=keyspace,proto3" json:"keyspace,omitempty"`
+	PingTablets   bool                   `protobuf:"varint,2,opt,name=ping_tablets,json=pingTablets,proto3" json:"ping_tablets,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	Keyspace    string `protobuf:"bytes,1,opt,name=keyspace,proto3" json:"keyspace,omitempty"`
-	PingTablets bool   `protobuf:"varint,2,opt,name=ping_tablets,json=pingTablets,proto3" json:"ping_tablets,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *ValidateKeyspaceRequest) Reset() {
@@ -14034,12 +13845,11 @@ func (x *ValidateKeyspaceRequest) GetPingTablets() bool {
 }
 
 type ValidateKeyspaceResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
+	state          protoimpl.MessageState            `protogen:"open.v1"`
 	Results        []string                          `protobuf:"bytes,1,rep,name=results,proto3" json:"results,omitempty"`
-	ResultsByShard map[string]*ValidateShardResponse `protobuf:"bytes,2,rep,name=results_by_shard,json=resultsByShard,proto3" json:"results_by_shard,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
+	ResultsByShard map[string]*ValidateShardResponse `protobuf:"bytes,2,rep,name=results_by_shard,json=resultsByShard,proto3" json:"results_by_shard,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
+	unknownFields  protoimpl.UnknownFields
+	sizeCache      protoimpl.SizeCache
 }
 
 func (x *ValidateKeyspaceResponse) Reset() {
@@ -14087,14 +13897,13 @@ func (x *ValidateKeyspaceResponse) GetResultsByShard() map[string]*ValidateShard
 }
 
 type ValidatePermissionsKeyspaceRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Keyspace string `protobuf:"bytes,1,opt,name=keyspace,proto3" json:"keyspace,omitempty"`
+	state    protoimpl.MessageState `protogen:"open.v1"`
+	Keyspace string                 `protobuf:"bytes,1,opt,name=keyspace,proto3" json:"keyspace,omitempty"`
 	// If you only want to validate a subset of the shards in the
 	// keyspace, then specify a list of shard names.
-	Shards []string `protobuf:"bytes,2,rep,name=shards,proto3" json:"shards,omitempty"`
+	Shards        []string `protobuf:"bytes,2,rep,name=shards,proto3" json:"shards,omitempty"`
+	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *ValidatePermissionsKeyspaceRequest) Reset() {
@@ -14142,9 +13951,9 @@ func (x *ValidatePermissionsKeyspaceRequest) GetShards() []string {
 }
 
 type ValidatePermissionsKeyspaceResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
 	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *ValidatePermissionsKeyspaceResponse) Reset() {
@@ -14178,18 +13987,17 @@ func (*ValidatePermissionsKeyspaceResponse) Descriptor() ([]byte, []int) {
 }
 
 type ValidateSchemaKeyspaceRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Keyspace       string   `protobuf:"bytes,1,opt,name=keyspace,proto3" json:"keyspace,omitempty"`
-	ExcludeTables  []string `protobuf:"bytes,2,rep,name=exclude_tables,json=excludeTables,proto3" json:"exclude_tables,omitempty"`
-	IncludeViews   bool     `protobuf:"varint,3,opt,name=include_views,json=includeViews,proto3" json:"include_views,omitempty"`
-	SkipNoPrimary  bool     `protobuf:"varint,4,opt,name=skip_no_primary,json=skipNoPrimary,proto3" json:"skip_no_primary,omitempty"`
-	IncludeVschema bool     `protobuf:"varint,5,opt,name=include_vschema,json=includeVschema,proto3" json:"include_vschema,omitempty"`
+	state          protoimpl.MessageState `protogen:"open.v1"`
+	Keyspace       string                 `protobuf:"bytes,1,opt,name=keyspace,proto3" json:"keyspace,omitempty"`
+	ExcludeTables  []string               `protobuf:"bytes,2,rep,name=exclude_tables,json=excludeTables,proto3" json:"exclude_tables,omitempty"`
+	IncludeViews   bool                   `protobuf:"varint,3,opt,name=include_views,json=includeViews,proto3" json:"include_views,omitempty"`
+	SkipNoPrimary  bool                   `protobuf:"varint,4,opt,name=skip_no_primary,json=skipNoPrimary,proto3" json:"skip_no_primary,omitempty"`
+	IncludeVschema bool                   `protobuf:"varint,5,opt,name=include_vschema,json=includeVschema,proto3" json:"include_vschema,omitempty"`
 	// If you only want to validate a subset of the shards in the
 	// keyspace, then specify a list of shard names.
-	Shards []string `protobuf:"bytes,6,rep,name=shards,proto3" json:"shards,omitempty"`
+	Shards        []string `protobuf:"bytes,6,rep,name=shards,proto3" json:"shards,omitempty"`
+	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *ValidateSchemaKeyspaceRequest) Reset() {
@@ -14265,12 +14073,11 @@ func (x *ValidateSchemaKeyspaceRequest) GetShards() []string {
 }
 
 type ValidateSchemaKeyspaceResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
+	state          protoimpl.MessageState            `protogen:"open.v1"`
 	Results        []string                          `protobuf:"bytes,1,rep,name=results,proto3" json:"results,omitempty"`
-	ResultsByShard map[string]*ValidateShardResponse `protobuf:"bytes,2,rep,name=results_by_shard,json=resultsByShard,proto3" json:"results_by_shard,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
+	ResultsByShard map[string]*ValidateShardResponse `protobuf:"bytes,2,rep,name=results_by_shard,json=resultsByShard,proto3" json:"results_by_shard,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
+	unknownFields  protoimpl.UnknownFields
+	sizeCache      protoimpl.SizeCache
 }
 
 func (x *ValidateSchemaKeyspaceResponse) Reset() {
@@ -14318,13 +14125,12 @@ func (x *ValidateSchemaKeyspaceResponse) GetResultsByShard() map[string]*Validat
 }
 
 type ValidateShardRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	Keyspace      string                 `protobuf:"bytes,1,opt,name=keyspace,proto3" json:"keyspace,omitempty"`
+	Shard         string                 `protobuf:"bytes,2,opt,name=shard,proto3" json:"shard,omitempty"`
+	PingTablets   bool                   `protobuf:"varint,3,opt,name=ping_tablets,json=pingTablets,proto3" json:"ping_tablets,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	Keyspace    string `protobuf:"bytes,1,opt,name=keyspace,proto3" json:"keyspace,omitempty"`
-	Shard       string `protobuf:"bytes,2,opt,name=shard,proto3" json:"shard,omitempty"`
-	PingTablets bool   `protobuf:"varint,3,opt,name=ping_tablets,json=pingTablets,proto3" json:"ping_tablets,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *ValidateShardRequest) Reset() {
@@ -14379,11 +14185,10 @@ func (x *ValidateShardRequest) GetPingTablets() bool {
 }
 
 type ValidateShardResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	Results       []string               `protobuf:"bytes,1,rep,name=results,proto3" json:"results,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	Results []string `protobuf:"bytes,1,rep,name=results,proto3" json:"results,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *ValidateShardResponse) Reset() {
@@ -14424,11 +14229,10 @@ func (x *ValidateShardResponse) GetResults() []string {
 }
 
 type ValidateVersionKeyspaceRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	Keyspace      string                 `protobuf:"bytes,1,opt,name=keyspace,proto3" json:"keyspace,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	Keyspace string `protobuf:"bytes,1,opt,name=keyspace,proto3" json:"keyspace,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *ValidateVersionKeyspaceRequest) Reset() {
@@ -14469,12 +14273,11 @@ func (x *ValidateVersionKeyspaceRequest) GetKeyspace() string {
 }
 
 type ValidateVersionKeyspaceResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
+	state          protoimpl.MessageState            `protogen:"open.v1"`
 	Results        []string                          `protobuf:"bytes,1,rep,name=results,proto3" json:"results,omitempty"`
-	ResultsByShard map[string]*ValidateShardResponse `protobuf:"bytes,2,rep,name=results_by_shard,json=resultsByShard,proto3" json:"results_by_shard,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
+	ResultsByShard map[string]*ValidateShardResponse `protobuf:"bytes,2,rep,name=results_by_shard,json=resultsByShard,proto3" json:"results_by_shard,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
+	unknownFields  protoimpl.UnknownFields
+	sizeCache      protoimpl.SizeCache
 }
 
 func (x *ValidateVersionKeyspaceResponse) Reset() {
@@ -14522,12 +14325,11 @@ func (x *ValidateVersionKeyspaceResponse) GetResultsByShard() map[string]*Valida
 }
 
 type ValidateVersionShardRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	Keyspace      string                 `protobuf:"bytes,1,opt,name=keyspace,proto3" json:"keyspace,omitempty"`
+	Shard         string                 `protobuf:"bytes,2,opt,name=shard,proto3" json:"shard,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	Keyspace string `protobuf:"bytes,1,opt,name=keyspace,proto3" json:"keyspace,omitempty"`
-	Shard    string `protobuf:"bytes,2,opt,name=shard,proto3" json:"shard,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *ValidateVersionShardRequest) Reset() {
@@ -14575,11 +14377,10 @@ func (x *ValidateVersionShardRequest) GetShard() string {
 }
 
 type ValidateVersionShardResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	Results       []string               `protobuf:"bytes,1,rep,name=results,proto3" json:"results,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	Results []string `protobuf:"bytes,1,rep,name=results,proto3" json:"results,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *ValidateVersionShardResponse) Reset() {
@@ -14620,14 +14421,13 @@ func (x *ValidateVersionShardResponse) GetResults() []string {
 }
 
 type ValidateVSchemaRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	Keyspace      string                 `protobuf:"bytes,1,opt,name=keyspace,proto3" json:"keyspace,omitempty"`
+	Shards        []string               `protobuf:"bytes,2,rep,name=shards,proto3" json:"shards,omitempty"`
+	ExcludeTables []string               `protobuf:"bytes,3,rep,name=exclude_tables,json=excludeTables,proto3" json:"exclude_tables,omitempty"`
+	IncludeViews  bool                   `protobuf:"varint,4,opt,name=include_views,json=includeViews,proto3" json:"include_views,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	Keyspace      string   `protobuf:"bytes,1,opt,name=keyspace,proto3" json:"keyspace,omitempty"`
-	Shards        []string `protobuf:"bytes,2,rep,name=shards,proto3" json:"shards,omitempty"`
-	ExcludeTables []string `protobuf:"bytes,3,rep,name=exclude_tables,json=excludeTables,proto3" json:"exclude_tables,omitempty"`
-	IncludeViews  bool     `protobuf:"varint,4,opt,name=include_views,json=includeViews,proto3" json:"include_views,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *ValidateVSchemaRequest) Reset() {
@@ -14689,12 +14489,11 @@ func (x *ValidateVSchemaRequest) GetIncludeViews() bool {
 }
 
 type ValidateVSchemaResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
+	state          protoimpl.MessageState            `protogen:"open.v1"`
 	Results        []string                          `protobuf:"bytes,1,rep,name=results,proto3" json:"results,omitempty"`
-	ResultsByShard map[string]*ValidateShardResponse `protobuf:"bytes,2,rep,name=results_by_shard,json=resultsByShard,proto3" json:"results_by_shard,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
+	ResultsByShard map[string]*ValidateShardResponse `protobuf:"bytes,2,rep,name=results_by_shard,json=resultsByShard,proto3" json:"results_by_shard,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
+	unknownFields  protoimpl.UnknownFields
+	sizeCache      protoimpl.SizeCache
 }
 
 func (x *ValidateVSchemaResponse) Reset() {
@@ -14742,10 +14541,7 @@ func (x *ValidateVSchemaResponse) GetResultsByShard() map[string]*ValidateShardR
 }
 
 type VDiffCreateRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
+	state protoimpl.MessageState `protogen:"open.v1"`
 	// The name of the workflow that we're diffing tables for.
 	Workflow string `protobuf:"bytes,1,opt,name=workflow,proto3" json:"workflow,omitempty"`
 	// The keyspace where the vreplication workflow is running.
@@ -14825,7 +14621,9 @@ type VDiffCreateRequest struct {
 	RowDiffColumnTruncateAt int64 `protobuf:"varint,21,opt,name=row_diff_column_truncate_at,json=rowDiffColumnTruncateAt,proto3" json:"row_diff_column_truncate_at,omitempty"`
 	// Auto start the vdiff after creating it.
 	// The default is true if no value is specified.
-	AutoStart *bool `protobuf:"varint,22,opt,name=auto_start,json=autoStart,proto3,oneof" json:"auto_start,omitempty"`
+	AutoStart     *bool `protobuf:"varint,22,opt,name=auto_start,json=autoStart,proto3,oneof" json:"auto_start,omitempty"`
+	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *VDiffCreateRequest) Reset() {
@@ -15013,13 +14811,12 @@ func (x *VDiffCreateRequest) GetAutoStart() bool {
 }
 
 type VDiffCreateResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
+	state protoimpl.MessageState `protogen:"open.v1"`
 	// Intentionally upper case to maintain compatibility with
 	// vtctlclient and other VDiff client command output.
-	UUID string `protobuf:"bytes,1,opt,name=UUID,proto3" json:"UUID,omitempty"`
+	UUID          string `protobuf:"bytes,1,opt,name=UUID,proto3" json:"UUID,omitempty"`
+	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *VDiffCreateResponse) Reset() {
@@ -15060,14 +14857,13 @@ func (x *VDiffCreateResponse) GetUUID() string {
 }
 
 type VDiffDeleteRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Workflow       string `protobuf:"bytes,1,opt,name=workflow,proto3" json:"workflow,omitempty"`
-	TargetKeyspace string `protobuf:"bytes,2,opt,name=target_keyspace,json=targetKeyspace,proto3" json:"target_keyspace,omitempty"`
+	state          protoimpl.MessageState `protogen:"open.v1"`
+	Workflow       string                 `protobuf:"bytes,1,opt,name=workflow,proto3" json:"workflow,omitempty"`
+	TargetKeyspace string                 `protobuf:"bytes,2,opt,name=target_keyspace,json=targetKeyspace,proto3" json:"target_keyspace,omitempty"`
 	// This will be 'all' or a UUID.
-	Arg string `protobuf:"bytes,3,opt,name=arg,proto3" json:"arg,omitempty"`
+	Arg           string `protobuf:"bytes,3,opt,name=arg,proto3" json:"arg,omitempty"`
+	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *VDiffDeleteRequest) Reset() {
@@ -15122,9 +14918,9 @@ func (x *VDiffDeleteRequest) GetArg() string {
 }
 
 type VDiffDeleteResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
 	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *VDiffDeleteResponse) Reset() {
@@ -15158,14 +14954,13 @@ func (*VDiffDeleteResponse) Descriptor() ([]byte, []int) {
 }
 
 type VDiffResumeRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Workflow       string   `protobuf:"bytes,1,opt,name=workflow,proto3" json:"workflow,omitempty"`
-	TargetKeyspace string   `protobuf:"bytes,2,opt,name=target_keyspace,json=targetKeyspace,proto3" json:"target_keyspace,omitempty"`
-	Uuid           string   `protobuf:"bytes,3,opt,name=uuid,proto3" json:"uuid,omitempty"`
-	TargetShards   []string `protobuf:"bytes,4,rep,name=target_shards,json=targetShards,proto3" json:"target_shards,omitempty"`
+	state          protoimpl.MessageState `protogen:"open.v1"`
+	Workflow       string                 `protobuf:"bytes,1,opt,name=workflow,proto3" json:"workflow,omitempty"`
+	TargetKeyspace string                 `protobuf:"bytes,2,opt,name=target_keyspace,json=targetKeyspace,proto3" json:"target_keyspace,omitempty"`
+	Uuid           string                 `protobuf:"bytes,3,opt,name=uuid,proto3" json:"uuid,omitempty"`
+	TargetShards   []string               `protobuf:"bytes,4,rep,name=target_shards,json=targetShards,proto3" json:"target_shards,omitempty"`
+	unknownFields  protoimpl.UnknownFields
+	sizeCache      protoimpl.SizeCache
 }
 
 func (x *VDiffResumeRequest) Reset() {
@@ -15227,9 +15022,9 @@ func (x *VDiffResumeRequest) GetTargetShards() []string {
 }
 
 type VDiffResumeResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
 	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *VDiffResumeResponse) Reset() {
@@ -15263,14 +15058,13 @@ func (*VDiffResumeResponse) Descriptor() ([]byte, []int) {
 }
 
 type VDiffShowRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Workflow       string `protobuf:"bytes,1,opt,name=workflow,proto3" json:"workflow,omitempty"`
-	TargetKeyspace string `protobuf:"bytes,2,opt,name=target_keyspace,json=targetKeyspace,proto3" json:"target_keyspace,omitempty"`
+	state          protoimpl.MessageState `protogen:"open.v1"`
+	Workflow       string                 `protobuf:"bytes,1,opt,name=workflow,proto3" json:"workflow,omitempty"`
+	TargetKeyspace string                 `protobuf:"bytes,2,opt,name=target_keyspace,json=targetKeyspace,proto3" json:"target_keyspace,omitempty"`
 	// This will be 'all', 'last', or a UUID.
-	Arg string `protobuf:"bytes,3,opt,name=arg,proto3" json:"arg,omitempty"`
+	Arg           string `protobuf:"bytes,3,opt,name=arg,proto3" json:"arg,omitempty"`
+	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *VDiffShowRequest) Reset() {
@@ -15325,12 +15119,11 @@ func (x *VDiffShowRequest) GetArg() string {
 }
 
 type VDiffShowResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
+	state protoimpl.MessageState `protogen:"open.v1"`
 	// The key is keyspace/shard.
-	TabletResponses map[string]*tabletmanagerdata.VDiffResponse `protobuf:"bytes,1,rep,name=tablet_responses,json=tabletResponses,proto3" json:"tablet_responses,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
+	TabletResponses map[string]*tabletmanagerdata.VDiffResponse `protobuf:"bytes,1,rep,name=tablet_responses,json=tabletResponses,proto3" json:"tablet_responses,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
+	unknownFields   protoimpl.UnknownFields
+	sizeCache       protoimpl.SizeCache
 }
 
 func (x *VDiffShowResponse) Reset() {
@@ -15371,14 +15164,13 @@ func (x *VDiffShowResponse) GetTabletResponses() map[string]*tabletmanagerdata.V
 }
 
 type VDiffStopRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Workflow       string   `protobuf:"bytes,1,opt,name=workflow,proto3" json:"workflow,omitempty"`
-	TargetKeyspace string   `protobuf:"bytes,2,opt,name=target_keyspace,json=targetKeyspace,proto3" json:"target_keyspace,omitempty"`
-	Uuid           string   `protobuf:"bytes,3,opt,name=uuid,proto3" json:"uuid,omitempty"`
-	TargetShards   []string `protobuf:"bytes,4,rep,name=target_shards,json=targetShards,proto3" json:"target_shards,omitempty"`
+	state          protoimpl.MessageState `protogen:"open.v1"`
+	Workflow       string                 `protobuf:"bytes,1,opt,name=workflow,proto3" json:"workflow,omitempty"`
+	TargetKeyspace string                 `protobuf:"bytes,2,opt,name=target_keyspace,json=targetKeyspace,proto3" json:"target_keyspace,omitempty"`
+	Uuid           string                 `protobuf:"bytes,3,opt,name=uuid,proto3" json:"uuid,omitempty"`
+	TargetShards   []string               `protobuf:"bytes,4,rep,name=target_shards,json=targetShards,proto3" json:"target_shards,omitempty"`
+	unknownFields  protoimpl.UnknownFields
+	sizeCache      protoimpl.SizeCache
 }
 
 func (x *VDiffStopRequest) Reset() {
@@ -15440,9 +15232,9 @@ func (x *VDiffStopRequest) GetTargetShards() []string {
 }
 
 type VDiffStopResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
 	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *VDiffStopResponse) Reset() {
@@ -15476,19 +15268,18 @@ func (*VDiffStopResponse) Descriptor() ([]byte, []int) {
 }
 
 type WorkflowDeleteRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Keyspace         string   `protobuf:"bytes,1,opt,name=keyspace,proto3" json:"keyspace,omitempty"`
-	Workflow         string   `protobuf:"bytes,2,opt,name=workflow,proto3" json:"workflow,omitempty"`
-	KeepData         bool     `protobuf:"varint,3,opt,name=keep_data,json=keepData,proto3" json:"keep_data,omitempty"`
-	KeepRoutingRules bool     `protobuf:"varint,4,opt,name=keep_routing_rules,json=keepRoutingRules,proto3" json:"keep_routing_rules,omitempty"`
-	Shards           []string `protobuf:"bytes,5,rep,name=shards,proto3" json:"shards,omitempty"`
+	state            protoimpl.MessageState `protogen:"open.v1"`
+	Keyspace         string                 `protobuf:"bytes,1,opt,name=keyspace,proto3" json:"keyspace,omitempty"`
+	Workflow         string                 `protobuf:"bytes,2,opt,name=workflow,proto3" json:"workflow,omitempty"`
+	KeepData         bool                   `protobuf:"varint,3,opt,name=keep_data,json=keepData,proto3" json:"keep_data,omitempty"`
+	KeepRoutingRules bool                   `protobuf:"varint,4,opt,name=keep_routing_rules,json=keepRoutingRules,proto3" json:"keep_routing_rules,omitempty"`
+	Shards           []string               `protobuf:"bytes,5,rep,name=shards,proto3" json:"shards,omitempty"`
 	// The max records to delete from the moved tables when cleaning
 	// up the migrated data. This is only used with multi-tenant
 	// MoveTables migrations.
 	DeleteBatchSize int64 `protobuf:"varint,6,opt,name=delete_batch_size,json=deleteBatchSize,proto3" json:"delete_batch_size,omitempty"`
+	unknownFields   protoimpl.UnknownFields
+	sizeCache       protoimpl.SizeCache
 }
 
 func (x *WorkflowDeleteRequest) Reset() {
@@ -15564,12 +15355,11 @@ func (x *WorkflowDeleteRequest) GetDeleteBatchSize() int64 {
 }
 
 type WorkflowDeleteResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState               `protogen:"open.v1"`
+	Summary       string                               `protobuf:"bytes,1,opt,name=summary,proto3" json:"summary,omitempty"`
+	Details       []*WorkflowDeleteResponse_TabletInfo `protobuf:"bytes,2,rep,name=details,proto3" json:"details,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	Summary string                               `protobuf:"bytes,1,opt,name=summary,proto3" json:"summary,omitempty"`
-	Details []*WorkflowDeleteResponse_TabletInfo `protobuf:"bytes,2,rep,name=details,proto3" json:"details,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *WorkflowDeleteResponse) Reset() {
@@ -15617,13 +15407,12 @@ func (x *WorkflowDeleteResponse) GetDetails() []*WorkflowDeleteResponse_TabletIn
 }
 
 type WorkflowStatusRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	Keyspace      string                 `protobuf:"bytes,1,opt,name=keyspace,proto3" json:"keyspace,omitempty"`
+	Workflow      string                 `protobuf:"bytes,2,opt,name=workflow,proto3" json:"workflow,omitempty"`
+	Shards        []string               `protobuf:"bytes,3,rep,name=shards,proto3" json:"shards,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	Keyspace string   `protobuf:"bytes,1,opt,name=keyspace,proto3" json:"keyspace,omitempty"`
-	Workflow string   `protobuf:"bytes,2,opt,name=workflow,proto3" json:"workflow,omitempty"`
-	Shards   []string `protobuf:"bytes,3,rep,name=shards,proto3" json:"shards,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *WorkflowStatusRequest) Reset() {
@@ -15678,14 +15467,13 @@ func (x *WorkflowStatusRequest) GetShards() []string {
 }
 
 type WorkflowStatusResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
+	state protoimpl.MessageState `protogen:"open.v1"`
 	// The key is keyspace/shard.
-	TableCopyState map[string]*WorkflowStatusResponse_TableCopyState `protobuf:"bytes,1,rep,name=table_copy_state,json=tableCopyState,proto3" json:"table_copy_state,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
-	ShardStreams   map[string]*WorkflowStatusResponse_ShardStreams   `protobuf:"bytes,2,rep,name=shard_streams,json=shardStreams,proto3" json:"shard_streams,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
+	TableCopyState map[string]*WorkflowStatusResponse_TableCopyState `protobuf:"bytes,1,rep,name=table_copy_state,json=tableCopyState,proto3" json:"table_copy_state,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
+	ShardStreams   map[string]*WorkflowStatusResponse_ShardStreams   `protobuf:"bytes,2,rep,name=shard_streams,json=shardStreams,proto3" json:"shard_streams,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
 	TrafficState   string                                            `protobuf:"bytes,3,opt,name=traffic_state,json=trafficState,proto3" json:"traffic_state,omitempty"`
+	unknownFields  protoimpl.UnknownFields
+	sizeCache      protoimpl.SizeCache
 }
 
 func (x *WorkflowStatusResponse) Reset() {
@@ -15740,22 +15528,21 @@ func (x *WorkflowStatusResponse) GetTrafficState() string {
 }
 
 type WorkflowSwitchTrafficRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Keyspace                  string                `protobuf:"bytes,1,opt,name=keyspace,proto3" json:"keyspace,omitempty"`
-	Workflow                  string                `protobuf:"bytes,2,opt,name=workflow,proto3" json:"workflow,omitempty"`
-	Cells                     []string              `protobuf:"bytes,3,rep,name=cells,proto3" json:"cells,omitempty"`
-	TabletTypes               []topodata.TabletType `protobuf:"varint,4,rep,packed,name=tablet_types,json=tabletTypes,proto3,enum=topodata.TabletType" json:"tablet_types,omitempty"`
-	MaxReplicationLagAllowed  *vttime.Duration      `protobuf:"bytes,5,opt,name=max_replication_lag_allowed,json=maxReplicationLagAllowed,proto3" json:"max_replication_lag_allowed,omitempty"`
-	EnableReverseReplication  bool                  `protobuf:"varint,6,opt,name=enable_reverse_replication,json=enableReverseReplication,proto3" json:"enable_reverse_replication,omitempty"`
-	Direction                 int32                 `protobuf:"varint,7,opt,name=direction,proto3" json:"direction,omitempty"`
-	Timeout                   *vttime.Duration      `protobuf:"bytes,8,opt,name=timeout,proto3" json:"timeout,omitempty"`
-	DryRun                    bool                  `protobuf:"varint,9,opt,name=dry_run,json=dryRun,proto3" json:"dry_run,omitempty"`
-	InitializeTargetSequences bool                  `protobuf:"varint,10,opt,name=initialize_target_sequences,json=initializeTargetSequences,proto3" json:"initialize_target_sequences,omitempty"`
-	Shards                    []string              `protobuf:"bytes,11,rep,name=shards,proto3" json:"shards,omitempty"`
-	Force                     bool                  `protobuf:"varint,12,opt,name=force,proto3" json:"force,omitempty"`
+	state                     protoimpl.MessageState `protogen:"open.v1"`
+	Keyspace                  string                 `protobuf:"bytes,1,opt,name=keyspace,proto3" json:"keyspace,omitempty"`
+	Workflow                  string                 `protobuf:"bytes,2,opt,name=workflow,proto3" json:"workflow,omitempty"`
+	Cells                     []string               `protobuf:"bytes,3,rep,name=cells,proto3" json:"cells,omitempty"`
+	TabletTypes               []topodata.TabletType  `protobuf:"varint,4,rep,packed,name=tablet_types,json=tabletTypes,proto3,enum=topodata.TabletType" json:"tablet_types,omitempty"`
+	MaxReplicationLagAllowed  *vttime.Duration       `protobuf:"bytes,5,opt,name=max_replication_lag_allowed,json=maxReplicationLagAllowed,proto3" json:"max_replication_lag_allowed,omitempty"`
+	EnableReverseReplication  bool                   `protobuf:"varint,6,opt,name=enable_reverse_replication,json=enableReverseReplication,proto3" json:"enable_reverse_replication,omitempty"`
+	Direction                 int32                  `protobuf:"varint,7,opt,name=direction,proto3" json:"direction,omitempty"`
+	Timeout                   *vttime.Duration       `protobuf:"bytes,8,opt,name=timeout,proto3" json:"timeout,omitempty"`
+	DryRun                    bool                   `protobuf:"varint,9,opt,name=dry_run,json=dryRun,proto3" json:"dry_run,omitempty"`
+	InitializeTargetSequences bool                   `protobuf:"varint,10,opt,name=initialize_target_sequences,json=initializeTargetSequences,proto3" json:"initialize_target_sequences,omitempty"`
+	Shards                    []string               `protobuf:"bytes,11,rep,name=shards,proto3" json:"shards,omitempty"`
+	Force                     bool                   `protobuf:"varint,12,opt,name=force,proto3" json:"force,omitempty"`
+	unknownFields             protoimpl.UnknownFields
+	sizeCache                 protoimpl.SizeCache
 }
 
 func (x *WorkflowSwitchTrafficRequest) Reset() {
@@ -15873,14 +15660,13 @@ func (x *WorkflowSwitchTrafficRequest) GetForce() bool {
 }
 
 type WorkflowSwitchTrafficResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	Summary       string                 `protobuf:"bytes,1,opt,name=summary,proto3" json:"summary,omitempty"`
+	StartState    string                 `protobuf:"bytes,2,opt,name=start_state,json=startState,proto3" json:"start_state,omitempty"`
+	CurrentState  string                 `protobuf:"bytes,3,opt,name=current_state,json=currentState,proto3" json:"current_state,omitempty"`
+	DryRunResults []string               `protobuf:"bytes,4,rep,name=dry_run_results,json=dryRunResults,proto3" json:"dry_run_results,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	Summary       string   `protobuf:"bytes,1,opt,name=summary,proto3" json:"summary,omitempty"`
-	StartState    string   `protobuf:"bytes,2,opt,name=start_state,json=startState,proto3" json:"start_state,omitempty"`
-	CurrentState  string   `protobuf:"bytes,3,opt,name=current_state,json=currentState,proto3" json:"current_state,omitempty"`
-	DryRunResults []string `protobuf:"bytes,4,rep,name=dry_run_results,json=dryRunResults,proto3" json:"dry_run_results,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *WorkflowSwitchTrafficResponse) Reset() {
@@ -15942,14 +15728,13 @@ func (x *WorkflowSwitchTrafficResponse) GetDryRunResults() []string {
 }
 
 type WorkflowUpdateRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Keyspace string `protobuf:"bytes,1,opt,name=keyspace,proto3" json:"keyspace,omitempty"`
+	state    protoimpl.MessageState `protogen:"open.v1"`
+	Keyspace string                 `protobuf:"bytes,1,opt,name=keyspace,proto3" json:"keyspace,omitempty"`
 	// TabletRequest gets passed on to each primary tablet involved
 	// in the workflow via the UpdateVReplicationWorkflow tabletmanager RPC.
 	TabletRequest *tabletmanagerdata.UpdateVReplicationWorkflowRequest `protobuf:"bytes,2,opt,name=tablet_request,json=tabletRequest,proto3" json:"tablet_request,omitempty"`
+	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *WorkflowUpdateRequest) Reset() {
@@ -15997,12 +15782,11 @@ func (x *WorkflowUpdateRequest) GetTabletRequest() *tabletmanagerdata.UpdateVRep
 }
 
 type WorkflowUpdateResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState               `protogen:"open.v1"`
+	Summary       string                               `protobuf:"bytes,1,opt,name=summary,proto3" json:"summary,omitempty"`
+	Details       []*WorkflowUpdateResponse_TabletInfo `protobuf:"bytes,2,rep,name=details,proto3" json:"details,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	Summary string                               `protobuf:"bytes,1,opt,name=summary,proto3" json:"summary,omitempty"`
-	Details []*WorkflowUpdateResponse_TabletInfo `protobuf:"bytes,2,rep,name=details,proto3" json:"details,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *WorkflowUpdateResponse) Reset() {
@@ -16050,9 +15834,9 @@ func (x *WorkflowUpdateResponse) GetDetails() []*WorkflowUpdateResponse_TabletIn
 }
 
 type GetMirrorRulesRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
 	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *GetMirrorRulesRequest) Reset() {
@@ -16086,11 +15870,10 @@ func (*GetMirrorRulesRequest) Descriptor() ([]byte, []int) {
 }
 
 type GetMirrorRulesResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	MirrorRules   *vschema.MirrorRules   `protobuf:"bytes,1,opt,name=mirror_rules,json=mirrorRules,proto3" json:"mirror_rules,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	MirrorRules *vschema.MirrorRules `protobuf:"bytes,1,opt,name=mirror_rules,json=mirrorRules,proto3" json:"mirror_rules,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *GetMirrorRulesResponse) Reset() {
@@ -16131,14 +15914,13 @@ func (x *GetMirrorRulesResponse) GetMirrorRules() *vschema.MirrorRules {
 }
 
 type WorkflowMirrorTrafficRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	Keyspace      string                 `protobuf:"bytes,1,opt,name=keyspace,proto3" json:"keyspace,omitempty"`
+	Workflow      string                 `protobuf:"bytes,2,opt,name=workflow,proto3" json:"workflow,omitempty"`
+	TabletTypes   []topodata.TabletType  `protobuf:"varint,3,rep,packed,name=tablet_types,json=tabletTypes,proto3,enum=topodata.TabletType" json:"tablet_types,omitempty"`
+	Percent       float32                `protobuf:"fixed32,4,opt,name=percent,proto3" json:"percent,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	Keyspace    string                `protobuf:"bytes,1,opt,name=keyspace,proto3" json:"keyspace,omitempty"`
-	Workflow    string                `protobuf:"bytes,2,opt,name=workflow,proto3" json:"workflow,omitempty"`
-	TabletTypes []topodata.TabletType `protobuf:"varint,3,rep,packed,name=tablet_types,json=tabletTypes,proto3,enum=topodata.TabletType" json:"tablet_types,omitempty"`
-	Percent     float32               `protobuf:"fixed32,4,opt,name=percent,proto3" json:"percent,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *WorkflowMirrorTrafficRequest) Reset() {
@@ -16200,13 +15982,12 @@ func (x *WorkflowMirrorTrafficRequest) GetPercent() float32 {
 }
 
 type WorkflowMirrorTrafficResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	Summary       string                 `protobuf:"bytes,1,opt,name=summary,proto3" json:"summary,omitempty"`
+	StartState    string                 `protobuf:"bytes,2,opt,name=start_state,json=startState,proto3" json:"start_state,omitempty"`
+	CurrentState  string                 `protobuf:"bytes,3,opt,name=current_state,json=currentState,proto3" json:"current_state,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	Summary      string `protobuf:"bytes,1,opt,name=summary,proto3" json:"summary,omitempty"`
-	StartState   string `protobuf:"bytes,2,opt,name=start_state,json=startState,proto3" json:"start_state,omitempty"`
-	CurrentState string `protobuf:"bytes,3,opt,name=current_state,json=currentState,proto3" json:"current_state,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *WorkflowMirrorTrafficResponse) Reset() {
@@ -16261,12 +16042,11 @@ func (x *WorkflowMirrorTrafficResponse) GetCurrentState() string {
 }
 
 type Workflow_ReplicationLocation struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	Keyspace      string                 `protobuf:"bytes,1,opt,name=keyspace,proto3" json:"keyspace,omitempty"`
+	Shards        []string               `protobuf:"bytes,2,rep,name=shards,proto3" json:"shards,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	Keyspace string   `protobuf:"bytes,1,opt,name=keyspace,proto3" json:"keyspace,omitempty"`
-	Shards   []string `protobuf:"bytes,2,rep,name=shards,proto3" json:"shards,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *Workflow_ReplicationLocation) Reset() {
@@ -16314,13 +16094,12 @@ func (x *Workflow_ReplicationLocation) GetShards() []string {
 }
 
 type Workflow_ShardStream struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
+	state            protoimpl.MessageState          `protogen:"open.v1"`
 	Streams          []*Workflow_Stream              `protobuf:"bytes,1,rep,name=streams,proto3" json:"streams,omitempty"`
 	TabletControls   []*topodata.Shard_TabletControl `protobuf:"bytes,2,rep,name=tablet_controls,json=tabletControls,proto3" json:"tablet_controls,omitempty"`
 	IsPrimaryServing bool                            `protobuf:"varint,3,opt,name=is_primary_serving,json=isPrimaryServing,proto3" json:"is_primary_serving,omitempty"`
+	unknownFields    protoimpl.UnknownFields
+	sizeCache        protoimpl.SizeCache
 }
 
 func (x *Workflow_ShardStream) Reset() {
@@ -16375,10 +16154,7 @@ func (x *Workflow_ShardStream) GetIsPrimaryServing() bool {
 }
 
 type Workflow_Stream struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
+	state                protoimpl.MessageState       `protogen:"open.v1"`
 	Id                   int64                        `protobuf:"varint,1,opt,name=id,proto3" json:"id,omitempty"`
 	Shard                string                       `protobuf:"bytes,2,opt,name=shard,proto3" json:"shard,omitempty"`
 	Tablet               *topodata.TabletAlias        `protobuf:"bytes,3,opt,name=tablet,proto3" json:"tablet,omitempty"`
@@ -16407,6 +16183,8 @@ type Workflow_Stream struct {
 	TabletTypes               []topodata.TabletType                       `protobuf:"varint,18,rep,packed,name=tablet_types,json=tabletTypes,proto3,enum=topodata.TabletType" json:"tablet_types,omitempty"`
 	TabletSelectionPreference tabletmanagerdata.TabletSelectionPreference `protobuf:"varint,19,opt,name=tablet_selection_preference,json=tabletSelectionPreference,proto3,enum=tabletmanagerdata.TabletSelectionPreference" json:"tablet_selection_preference,omitempty"`
 	Cells                     []string                                    `protobuf:"bytes,20,rep,name=cells,proto3" json:"cells,omitempty"`
+	unknownFields             protoimpl.UnknownFields
+	sizeCache                 protoimpl.SizeCache
 }
 
 func (x *Workflow_Stream) Reset() {
@@ -16580,13 +16358,12 @@ func (x *Workflow_Stream) GetCells() []string {
 }
 
 type Workflow_Stream_CopyState struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	Table         string                 `protobuf:"bytes,1,opt,name=table,proto3" json:"table,omitempty"`
+	LastPk        string                 `protobuf:"bytes,2,opt,name=last_pk,json=lastPk,proto3" json:"last_pk,omitempty"`
+	StreamId      int64                  `protobuf:"varint,3,opt,name=stream_id,json=streamId,proto3" json:"stream_id,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	Table    string `protobuf:"bytes,1,opt,name=table,proto3" json:"table,omitempty"`
-	LastPk   string `protobuf:"bytes,2,opt,name=last_pk,json=lastPk,proto3" json:"last_pk,omitempty"`
-	StreamId int64  `protobuf:"varint,3,opt,name=stream_id,json=streamId,proto3" json:"stream_id,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *Workflow_Stream_CopyState) Reset() {
@@ -16641,18 +16418,17 @@ func (x *Workflow_Stream_CopyState) GetStreamId() int64 {
 }
 
 type Workflow_Stream_Log struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	Id            int64                  `protobuf:"varint,1,opt,name=id,proto3" json:"id,omitempty"`
+	StreamId      int64                  `protobuf:"varint,2,opt,name=stream_id,json=streamId,proto3" json:"stream_id,omitempty"`
+	Type          string                 `protobuf:"bytes,3,opt,name=type,proto3" json:"type,omitempty"`
+	State         string                 `protobuf:"bytes,4,opt,name=state,proto3" json:"state,omitempty"`
+	CreatedAt     *vttime.Time           `protobuf:"bytes,5,opt,name=created_at,json=createdAt,proto3" json:"created_at,omitempty"`
+	UpdatedAt     *vttime.Time           `protobuf:"bytes,6,opt,name=updated_at,json=updatedAt,proto3" json:"updated_at,omitempty"`
+	Message       string                 `protobuf:"bytes,7,opt,name=message,proto3" json:"message,omitempty"`
+	Count         int64                  `protobuf:"varint,8,opt,name=count,proto3" json:"count,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	Id        int64        `protobuf:"varint,1,opt,name=id,proto3" json:"id,omitempty"`
-	StreamId  int64        `protobuf:"varint,2,opt,name=stream_id,json=streamId,proto3" json:"stream_id,omitempty"`
-	Type      string       `protobuf:"bytes,3,opt,name=type,proto3" json:"type,omitempty"`
-	State     string       `protobuf:"bytes,4,opt,name=state,proto3" json:"state,omitempty"`
-	CreatedAt *vttime.Time `protobuf:"bytes,5,opt,name=created_at,json=createdAt,proto3" json:"created_at,omitempty"`
-	UpdatedAt *vttime.Time `protobuf:"bytes,6,opt,name=updated_at,json=updatedAt,proto3" json:"updated_at,omitempty"`
-	Message   string       `protobuf:"bytes,7,opt,name=message,proto3" json:"message,omitempty"`
-	Count     int64        `protobuf:"varint,8,opt,name=count,proto3" json:"count,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *Workflow_Stream_Log) Reset() {
@@ -16742,12 +16518,11 @@ func (x *Workflow_Stream_Log) GetCount() int64 {
 }
 
 type Workflow_Stream_ThrottlerStatus struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	ComponentThrottled string       `protobuf:"bytes,1,opt,name=component_throttled,json=componentThrottled,proto3" json:"component_throttled,omitempty"`
-	TimeThrottled      *vttime.Time `protobuf:"bytes,2,opt,name=time_throttled,json=timeThrottled,proto3" json:"time_throttled,omitempty"`
+	state              protoimpl.MessageState `protogen:"open.v1"`
+	ComponentThrottled string                 `protobuf:"bytes,1,opt,name=component_throttled,json=componentThrottled,proto3" json:"component_throttled,omitempty"`
+	TimeThrottled      *vttime.Time           `protobuf:"bytes,2,opt,name=time_throttled,json=timeThrottled,proto3" json:"time_throttled,omitempty"`
+	unknownFields      protoimpl.UnknownFields
+	sizeCache          protoimpl.SizeCache
 }
 
 func (x *Workflow_Stream_ThrottlerStatus) Reset() {
@@ -16795,11 +16570,10 @@ func (x *Workflow_Stream_ThrottlerStatus) GetTimeThrottled() *vttime.Time {
 }
 
 type ApplyVSchemaResponse_ParamList struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	Params        []string               `protobuf:"bytes,1,rep,name=params,proto3" json:"params,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	Params []string `protobuf:"bytes,1,rep,name=params,proto3" json:"params,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *ApplyVSchemaResponse_ParamList) Reset() {
@@ -16840,11 +16614,10 @@ func (x *ApplyVSchemaResponse_ParamList) GetParams() []string {
 }
 
 type GetSrvKeyspaceNamesResponse_NameList struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	Names         []string               `protobuf:"bytes,1,rep,name=names,proto3" json:"names,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	Names []string `protobuf:"bytes,1,rep,name=names,proto3" json:"names,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *GetSrvKeyspaceNamesResponse_NameList) Reset() {
@@ -16885,13 +16658,12 @@ func (x *GetSrvKeyspaceNamesResponse_NameList) GetNames() []string {
 }
 
 type MoveTablesCreateResponse_TabletInfo struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Tablet *topodata.TabletAlias `protobuf:"bytes,1,opt,name=tablet,proto3" json:"tablet,omitempty"`
+	state  protoimpl.MessageState `protogen:"open.v1"`
+	Tablet *topodata.TabletAlias  `protobuf:"bytes,1,opt,name=tablet,proto3" json:"tablet,omitempty"`
 	// Created is set if the workflow was created on this tablet or not.
-	Created bool `protobuf:"varint,2,opt,name=created,proto3" json:"created,omitempty"`
+	Created       bool `protobuf:"varint,2,opt,name=created,proto3" json:"created,omitempty"`
+	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *MoveTablesCreateResponse_TabletInfo) Reset() {
@@ -16939,13 +16711,12 @@ func (x *MoveTablesCreateResponse_TabletInfo) GetCreated() bool {
 }
 
 type WorkflowDeleteResponse_TabletInfo struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Tablet *topodata.TabletAlias `protobuf:"bytes,1,opt,name=tablet,proto3" json:"tablet,omitempty"`
+	state  protoimpl.MessageState `protogen:"open.v1"`
+	Tablet *topodata.TabletAlias  `protobuf:"bytes,1,opt,name=tablet,proto3" json:"tablet,omitempty"`
 	// Delete is set if the workflow was deleted on this tablet.
-	Deleted bool `protobuf:"varint,2,opt,name=deleted,proto3" json:"deleted,omitempty"`
+	Deleted       bool `protobuf:"varint,2,opt,name=deleted,proto3" json:"deleted,omitempty"`
+	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *WorkflowDeleteResponse_TabletInfo) Reset() {
@@ -16993,16 +16764,15 @@ func (x *WorkflowDeleteResponse_TabletInfo) GetDeleted() bool {
 }
 
 type WorkflowStatusResponse_TableCopyState struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	RowsCopied      int64   `protobuf:"varint,1,opt,name=rows_copied,json=rowsCopied,proto3" json:"rows_copied,omitempty"`
-	RowsTotal       int64   `protobuf:"varint,2,opt,name=rows_total,json=rowsTotal,proto3" json:"rows_total,omitempty"`
-	RowsPercentage  float32 `protobuf:"fixed32,3,opt,name=rows_percentage,json=rowsPercentage,proto3" json:"rows_percentage,omitempty"`
-	BytesCopied     int64   `protobuf:"varint,4,opt,name=bytes_copied,json=bytesCopied,proto3" json:"bytes_copied,omitempty"`
-	BytesTotal      int64   `protobuf:"varint,5,opt,name=bytes_total,json=bytesTotal,proto3" json:"bytes_total,omitempty"`
-	BytesPercentage float32 `protobuf:"fixed32,6,opt,name=bytes_percentage,json=bytesPercentage,proto3" json:"bytes_percentage,omitempty"`
+	state           protoimpl.MessageState `protogen:"open.v1"`
+	RowsCopied      int64                  `protobuf:"varint,1,opt,name=rows_copied,json=rowsCopied,proto3" json:"rows_copied,omitempty"`
+	RowsTotal       int64                  `protobuf:"varint,2,opt,name=rows_total,json=rowsTotal,proto3" json:"rows_total,omitempty"`
+	RowsPercentage  float32                `protobuf:"fixed32,3,opt,name=rows_percentage,json=rowsPercentage,proto3" json:"rows_percentage,omitempty"`
+	BytesCopied     int64                  `protobuf:"varint,4,opt,name=bytes_copied,json=bytesCopied,proto3" json:"bytes_copied,omitempty"`
+	BytesTotal      int64                  `protobuf:"varint,5,opt,name=bytes_total,json=bytesTotal,proto3" json:"bytes_total,omitempty"`
+	BytesPercentage float32                `protobuf:"fixed32,6,opt,name=bytes_percentage,json=bytesPercentage,proto3" json:"bytes_percentage,omitempty"`
+	unknownFields   protoimpl.UnknownFields
+	sizeCache       protoimpl.SizeCache
 }
 
 func (x *WorkflowStatusResponse_TableCopyState) Reset() {
@@ -17078,16 +16848,15 @@ func (x *WorkflowStatusResponse_TableCopyState) GetBytesPercentage() float32 {
 }
 
 type WorkflowStatusResponse_ShardStreamState struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	Id            int32                  `protobuf:"varint,1,opt,name=id,proto3" json:"id,omitempty"`
+	Tablet        *topodata.TabletAlias  `protobuf:"bytes,2,opt,name=tablet,proto3" json:"tablet,omitempty"`
+	SourceShard   string                 `protobuf:"bytes,3,opt,name=source_shard,json=sourceShard,proto3" json:"source_shard,omitempty"`
+	Position      string                 `protobuf:"bytes,4,opt,name=position,proto3" json:"position,omitempty"`
+	Status        string                 `protobuf:"bytes,5,opt,name=status,proto3" json:"status,omitempty"`
+	Info          string                 `protobuf:"bytes,6,opt,name=info,proto3" json:"info,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	Id          int32                 `protobuf:"varint,1,opt,name=id,proto3" json:"id,omitempty"`
-	Tablet      *topodata.TabletAlias `protobuf:"bytes,2,opt,name=tablet,proto3" json:"tablet,omitempty"`
-	SourceShard string                `protobuf:"bytes,3,opt,name=source_shard,json=sourceShard,proto3" json:"source_shard,omitempty"`
-	Position    string                `protobuf:"bytes,4,opt,name=position,proto3" json:"position,omitempty"`
-	Status      string                `protobuf:"bytes,5,opt,name=status,proto3" json:"status,omitempty"`
-	Info        string                `protobuf:"bytes,6,opt,name=info,proto3" json:"info,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *WorkflowStatusResponse_ShardStreamState) Reset() {
@@ -17163,11 +16932,10 @@ func (x *WorkflowStatusResponse_ShardStreamState) GetInfo() string {
 }
 
 type WorkflowStatusResponse_ShardStreams struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState                     `protogen:"open.v1"`
+	Streams       []*WorkflowStatusResponse_ShardStreamState `protobuf:"bytes,2,rep,name=streams,proto3" json:"streams,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	Streams []*WorkflowStatusResponse_ShardStreamState `protobuf:"bytes,2,rep,name=streams,proto3" json:"streams,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *WorkflowStatusResponse_ShardStreams) Reset() {
@@ -17208,14 +16976,13 @@ func (x *WorkflowStatusResponse_ShardStreams) GetStreams() []*WorkflowStatusResp
 }
 
 type WorkflowUpdateResponse_TabletInfo struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Tablet *topodata.TabletAlias `protobuf:"bytes,1,opt,name=tablet,proto3" json:"tablet,omitempty"`
+	state  protoimpl.MessageState `protogen:"open.v1"`
+	Tablet *topodata.TabletAlias  `protobuf:"bytes,1,opt,name=tablet,proto3" json:"tablet,omitempty"`
 	// Changed is true if any of the provided values were different
 	// than what was already stored on this tablet.
-	Changed bool `protobuf:"varint,2,opt,name=changed,proto3" json:"changed,omitempty"`
+	Changed       bool `protobuf:"varint,2,opt,name=changed,proto3" json:"changed,omitempty"`
+	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *WorkflowUpdateResponse_TabletInfo) Reset() {
@@ -17264,7 +17031,7 @@ func (x *WorkflowUpdateResponse_TabletInfo) GetChanged() bool {
 
 var File_vtctldata_proto protoreflect.FileDescriptor
 
-var file_vtctldata_proto_rawDesc = []byte{
+var file_vtctldata_proto_rawDesc = string([]byte{
 	0x0a, 0x0f, 0x76, 0x74, 0x63, 0x74, 0x6c, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x70, 0x72, 0x6f, 0x74,
 	0x6f, 0x12, 0x09, 0x76, 0x74, 0x63, 0x74, 0x6c, 0x64, 0x61, 0x74, 0x61, 0x1a, 0x10, 0x62, 0x69,
 	0x6e, 0x6c, 0x6f, 0x67, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x0d,
@@ -19903,16 +19670,16 @@ var file_vtctldata_proto_rawDesc = []byte{
 	0x76, 0x69, 0x74, 0x65, 0x73, 0x73, 0x2f, 0x67, 0x6f, 0x2f, 0x76, 0x74, 0x2f, 0x70, 0x72, 0x6f,
 	0x74, 0x6f, 0x2f, 0x76, 0x74, 0x63, 0x74, 0x6c, 0x64, 0x61, 0x74, 0x61, 0x62, 0x06, 0x70, 0x72,
 	0x6f, 0x74, 0x6f, 0x33,
-}
+})
 
 var (
 	file_vtctldata_proto_rawDescOnce sync.Once
-	file_vtctldata_proto_rawDescData = file_vtctldata_proto_rawDesc
+	file_vtctldata_proto_rawDescData []byte
 )
 
 func file_vtctldata_proto_rawDescGZIP() []byte {
 	file_vtctldata_proto_rawDescOnce.Do(func() {
-		file_vtctldata_proto_rawDescData = protoimpl.X.CompressGZIP(file_vtctldata_proto_rawDescData)
+		file_vtctldata_proto_rawDescData = protoimpl.X.CompressGZIP(unsafe.Slice(unsafe.StringData(file_vtctldata_proto_rawDesc), len(file_vtctldata_proto_rawDesc)))
 	})
 	return file_vtctldata_proto_rawDescData
 }
@@ -20537,7 +20304,7 @@ func file_vtctldata_proto_init() {
 	out := protoimpl.TypeBuilder{
 		File: protoimpl.DescBuilder{
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
-			RawDescriptor: file_vtctldata_proto_rawDesc,
+			RawDescriptor: unsafe.Slice(unsafe.StringData(file_vtctldata_proto_rawDesc), len(file_vtctldata_proto_rawDesc)),
 			NumEnums:      5,
 			NumMessages:   309,
 			NumExtensions: 0,
@@ -20549,7 +20316,6 @@ func file_vtctldata_proto_init() {
 		MessageInfos:      file_vtctldata_proto_msgTypes,
 	}.Build()
 	File_vtctldata_proto = out.File
-	file_vtctldata_proto_rawDesc = nil
 	file_vtctldata_proto_goTypes = nil
 	file_vtctldata_proto_depIdxs = nil
 }
diff --git a/go/vt/proto/vtctldata/vtctldata_vtproto.pb.go b/go/vt/proto/vtctldata/vtctldata_vtproto.pb.go
index c9ae1183793..26ff08a0d7f 100644
--- a/go/vt/proto/vtctldata/vtctldata_vtproto.pb.go
+++ b/go/vt/proto/vtctldata/vtctldata_vtproto.pb.go
@@ -1,5 +1,5 @@
 // Code generated by protoc-gen-go-vtproto. DO NOT EDIT.
-// protoc-gen-go-vtproto version: v0.6.1-0.20241011083415-71c992bc3c87
+// protoc-gen-go-vtproto version: v0.6.1-0.20241121165744-79df5c4772f2
 // source: vtctldata.proto
 
 package vtctldata
diff --git a/go/vt/proto/vtctlservice/vtctlservice.pb.go b/go/vt/proto/vtctlservice/vtctlservice.pb.go
index cbd97a8022e..9e4da8c5778 100644
--- a/go/vt/proto/vtctlservice/vtctlservice.pb.go
+++ b/go/vt/proto/vtctlservice/vtctlservice.pb.go
@@ -18,7 +18,7 @@
 
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.35.1
+// 	protoc-gen-go v1.36.4
 // 	protoc        v3.21.3
 // source: vtctlservice.proto
 
@@ -28,6 +28,7 @@ import (
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
 	reflect "reflect"
+	unsafe "unsafe"
 	vtctldata "vitess.io/vitess/go/vt/proto/vtctldata"
 )
 
@@ -40,7 +41,7 @@ const (
 
 var File_vtctlservice_proto protoreflect.FileDescriptor
 
-var file_vtctlservice_proto_rawDesc = []byte{
+var file_vtctlservice_proto_rawDesc = string([]byte{
 	0x0a, 0x12, 0x76, 0x74, 0x63, 0x74, 0x6c, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x70,
 	0x72, 0x6f, 0x74, 0x6f, 0x12, 0x0c, 0x76, 0x74, 0x63, 0x74, 0x6c, 0x73, 0x65, 0x72, 0x76, 0x69,
 	0x63, 0x65, 0x1a, 0x0f, 0x76, 0x74, 0x63, 0x74, 0x6c, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x70, 0x72,
@@ -811,7 +812,7 @@ var file_vtctlservice_proto_rawDesc = []byte{
 	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, 0x76, 0x74, 0x63, 0x74, 0x6c, 0x73,
 	0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
-}
+})
 
 var file_vtctlservice_proto_goTypes = []any{
 	(*vtctldata.ExecuteVtctlCommandRequest)(nil),          // 0: vtctldata.ExecuteVtctlCommandRequest
@@ -1340,7 +1341,7 @@ func file_vtctlservice_proto_init() {
 	out := protoimpl.TypeBuilder{
 		File: protoimpl.DescBuilder{
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
-			RawDescriptor: file_vtctlservice_proto_rawDesc,
+			RawDescriptor: unsafe.Slice(unsafe.StringData(file_vtctlservice_proto_rawDesc), len(file_vtctlservice_proto_rawDesc)),
 			NumEnums:      0,
 			NumMessages:   0,
 			NumExtensions: 0,
@@ -1350,7 +1351,6 @@ func file_vtctlservice_proto_init() {
 		DependencyIndexes: file_vtctlservice_proto_depIdxs,
 	}.Build()
 	File_vtctlservice_proto = out.File
-	file_vtctlservice_proto_rawDesc = nil
 	file_vtctlservice_proto_goTypes = nil
 	file_vtctlservice_proto_depIdxs = nil
 }
diff --git a/go/vt/proto/vtgate/vtgate.pb.go b/go/vt/proto/vtgate/vtgate.pb.go
index b996f919256..3fbbf494ede 100644
--- a/go/vt/proto/vtgate/vtgate.pb.go
+++ b/go/vt/proto/vtgate/vtgate.pb.go
@@ -17,7 +17,7 @@
 
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.35.1
+// 	protoc-gen-go v1.36.4
 // 	protoc        v3.21.3
 // source: vtgate.proto
 
@@ -28,6 +28,7 @@ import (
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
 	reflect "reflect"
 	sync "sync"
+	unsafe "unsafe"
 	binlogdata "vitess.io/vitess/go/vt/proto/binlogdata"
 	query "vitess.io/vitess/go/vt/proto/query"
 	topodata "vitess.io/vitess/go/vt/proto/topodata"
@@ -168,10 +169,7 @@ func (CommitOrder) EnumDescriptor() ([]byte, []int) {
 // discarded. If you're not in a transaction, Session is
 // an optional parameter for the V2 APIs.
 type Session struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
+	state protoimpl.MessageState `protogen:"open.v1"`
 	// in_transaction is set to true if the session is in a transaction.
 	InTransaction bool `protobuf:"varint,1,opt,name=in_transaction,json=inTransaction,proto3" json:"in_transaction,omitempty"`
 	// shard_sessions keep track of per-shard transaction info.
@@ -198,10 +196,10 @@ type Session struct {
 	// found_rows keeps track of how many rows the last query returned
 	FoundRows uint64 `protobuf:"varint,12,opt,name=found_rows,json=foundRows,proto3" json:"found_rows,omitempty"`
 	// user_defined_variables contains all the @variables defined for this session
-	UserDefinedVariables map[string]*query.BindVariable `protobuf:"bytes,13,rep,name=user_defined_variables,json=userDefinedVariables,proto3" json:"user_defined_variables,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
+	UserDefinedVariables map[string]*query.BindVariable `protobuf:"bytes,13,rep,name=user_defined_variables,json=userDefinedVariables,proto3" json:"user_defined_variables,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
 	// system_variables keeps track of all session variables set for this connection
 	// TODO: systay should we keep this so we can apply it ordered?
-	SystemVariables map[string]string `protobuf:"bytes,14,rep,name=system_variables,json=systemVariables,proto3" json:"system_variables,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
+	SystemVariables map[string]string `protobuf:"bytes,14,rep,name=system_variables,json=systemVariables,proto3" json:"system_variables,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
 	// row_count keeps track of the last seen rows affected for this session
 	RowCount int64 `protobuf:"varint,15,opt,name=row_count,json=rowCount,proto3" json:"row_count,omitempty"`
 	// Stores savepoint and release savepoint calls inside a transaction
@@ -221,12 +219,14 @@ type Session struct {
 	SessionUUID string `protobuf:"bytes,22,opt,name=SessionUUID,proto3" json:"SessionUUID,omitempty"`
 	// enable_system_settings defines if we can use reserved connections.
 	EnableSystemSettings bool             `protobuf:"varint,23,opt,name=enable_system_settings,json=enableSystemSettings,proto3" json:"enable_system_settings,omitempty"`
-	AdvisoryLock         map[string]int64 `protobuf:"bytes,24,rep,name=advisory_lock,json=advisoryLock,proto3" json:"advisory_lock,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"`
+	AdvisoryLock         map[string]int64 `protobuf:"bytes,24,rep,name=advisory_lock,json=advisoryLock,proto3" json:"advisory_lock,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"varint,2,opt,name=value"`
 	// query_timeout is the maximum amount of time a query is permitted to run
 	QueryTimeout     int64                   `protobuf:"varint,25,opt,name=query_timeout,json=queryTimeout,proto3" json:"query_timeout,omitempty"`
-	PrepareStatement map[string]*PrepareData `protobuf:"bytes,26,rep,name=prepare_statement,json=prepareStatement,proto3" json:"prepare_statement,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
+	PrepareStatement map[string]*PrepareData `protobuf:"bytes,26,rep,name=prepare_statement,json=prepareStatement,proto3" json:"prepare_statement,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
 	// MigrationContext
 	MigrationContext string `protobuf:"bytes,27,opt,name=migration_context,json=migrationContext,proto3" json:"migration_context,omitempty"`
+	unknownFields    protoimpl.UnknownFields
+	sizeCache        protoimpl.SizeCache
 }
 
 func (x *Session) Reset() {
@@ -443,12 +443,11 @@ func (x *Session) GetMigrationContext() string {
 
 // PrepareData keeps the prepared statement and other information related for execution of it.
 type PrepareData struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	PrepareStatement string `protobuf:"bytes,1,opt,name=prepare_statement,json=prepareStatement,proto3" json:"prepare_statement,omitempty"`
-	ParamsCount      int32  `protobuf:"varint,2,opt,name=params_count,json=paramsCount,proto3" json:"params_count,omitempty"`
+	state            protoimpl.MessageState `protogen:"open.v1"`
+	PrepareStatement string                 `protobuf:"bytes,1,opt,name=prepare_statement,json=prepareStatement,proto3" json:"prepare_statement,omitempty"`
+	ParamsCount      int32                  `protobuf:"varint,2,opt,name=params_count,json=paramsCount,proto3" json:"params_count,omitempty"`
+	unknownFields    protoimpl.UnknownFields
+	sizeCache        protoimpl.SizeCache
 }
 
 func (x *PrepareData) Reset() {
@@ -498,13 +497,12 @@ func (x *PrepareData) GetParamsCount() int32 {
 // ReadAfterWrite contains information regarding gtid set and timeout
 // Also if the gtid information needs to be passed to client.
 type ReadAfterWrite struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	ReadAfterWriteGtid    string  `protobuf:"bytes,1,opt,name=read_after_write_gtid,json=readAfterWriteGtid,proto3" json:"read_after_write_gtid,omitempty"`
-	ReadAfterWriteTimeout float64 `protobuf:"fixed64,2,opt,name=read_after_write_timeout,json=readAfterWriteTimeout,proto3" json:"read_after_write_timeout,omitempty"`
-	SessionTrackGtids     bool    `protobuf:"varint,3,opt,name=session_track_gtids,json=sessionTrackGtids,proto3" json:"session_track_gtids,omitempty"`
+	state                 protoimpl.MessageState `protogen:"open.v1"`
+	ReadAfterWriteGtid    string                 `protobuf:"bytes,1,opt,name=read_after_write_gtid,json=readAfterWriteGtid,proto3" json:"read_after_write_gtid,omitempty"`
+	ReadAfterWriteTimeout float64                `protobuf:"fixed64,2,opt,name=read_after_write_timeout,json=readAfterWriteTimeout,proto3" json:"read_after_write_timeout,omitempty"`
+	SessionTrackGtids     bool                   `protobuf:"varint,3,opt,name=session_track_gtids,json=sessionTrackGtids,proto3" json:"session_track_gtids,omitempty"`
+	unknownFields         protoimpl.UnknownFields
+	sizeCache             protoimpl.SizeCache
 }
 
 func (x *ReadAfterWrite) Reset() {
@@ -560,17 +558,16 @@ func (x *ReadAfterWrite) GetSessionTrackGtids() bool {
 
 // ExecuteRequest is the payload to Execute.
 type ExecuteRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
+	state protoimpl.MessageState `protogen:"open.v1"`
 	// caller_id identifies the caller. This is the effective caller ID,
 	// set by the application to further identify the caller.
 	CallerId *vtrpc.CallerID `protobuf:"bytes,1,opt,name=caller_id,json=callerId,proto3" json:"caller_id,omitempty"`
 	// session carries the session state.
 	Session *Session `protobuf:"bytes,2,opt,name=session,proto3" json:"session,omitempty"`
 	// query is the query and bind variables to execute.
-	Query *query.BoundQuery `protobuf:"bytes,3,opt,name=query,proto3" json:"query,omitempty"`
+	Query         *query.BoundQuery `protobuf:"bytes,3,opt,name=query,proto3" json:"query,omitempty"`
+	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *ExecuteRequest) Reset() {
@@ -626,10 +623,7 @@ func (x *ExecuteRequest) GetQuery() *query.BoundQuery {
 
 // ExecuteResponse is the returned value from Execute.
 type ExecuteResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
+	state protoimpl.MessageState `protogen:"open.v1"`
 	// error contains an application level error if necessary. Note the
 	// session may have changed, even when an error is returned (for
 	// instance if a database integrity error happened).
@@ -637,7 +631,9 @@ type ExecuteResponse struct {
 	// session is the updated session information.
 	Session *Session `protobuf:"bytes,2,opt,name=session,proto3" json:"session,omitempty"`
 	// result contains the query result, only set if error is unset.
-	Result *query.QueryResult `protobuf:"bytes,3,opt,name=result,proto3" json:"result,omitempty"`
+	Result        *query.QueryResult `protobuf:"bytes,3,opt,name=result,proto3" json:"result,omitempty"`
+	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *ExecuteResponse) Reset() {
@@ -693,17 +689,16 @@ func (x *ExecuteResponse) GetResult() *query.QueryResult {
 
 // ExecuteBatchRequest is the payload to ExecuteBatch.
 type ExecuteBatchRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
+	state protoimpl.MessageState `protogen:"open.v1"`
 	// caller_id identifies the caller. This is the effective caller ID,
 	// set by the application to further identify the caller.
 	CallerId *vtrpc.CallerID `protobuf:"bytes,1,opt,name=caller_id,json=callerId,proto3" json:"caller_id,omitempty"`
 	// session carries the session state.
 	Session *Session `protobuf:"bytes,2,opt,name=session,proto3" json:"session,omitempty"`
 	// queries is a list of query and bind variables to execute.
-	Queries []*query.BoundQuery `protobuf:"bytes,3,rep,name=queries,proto3" json:"queries,omitempty"`
+	Queries       []*query.BoundQuery `protobuf:"bytes,3,rep,name=queries,proto3" json:"queries,omitempty"`
+	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *ExecuteBatchRequest) Reset() {
@@ -759,10 +754,7 @@ func (x *ExecuteBatchRequest) GetQueries() []*query.BoundQuery {
 
 // ExecuteBatchResponse is the returned value from ExecuteBatch.
 type ExecuteBatchResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
+	state protoimpl.MessageState `protogen:"open.v1"`
 	// error contains an application level error if necessary. Note the
 	// session may have changed, even when an error is returned (for
 	// instance if a database integrity error happened).
@@ -770,7 +762,9 @@ type ExecuteBatchResponse struct {
 	// session is the updated session information.
 	Session *Session `protobuf:"bytes,2,opt,name=session,proto3" json:"session,omitempty"`
 	// results contains the query results, only set if application level error is unset.
-	Results []*query.ResultWithError `protobuf:"bytes,3,rep,name=results,proto3" json:"results,omitempty"`
+	Results       []*query.ResultWithError `protobuf:"bytes,3,rep,name=results,proto3" json:"results,omitempty"`
+	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *ExecuteBatchResponse) Reset() {
@@ -826,17 +820,16 @@ func (x *ExecuteBatchResponse) GetResults() []*query.ResultWithError {
 
 // StreamExecuteRequest is the payload to StreamExecute.
 type StreamExecuteRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
+	state protoimpl.MessageState `protogen:"open.v1"`
 	// caller_id identifies the caller. This is the effective caller ID,
 	// set by the application to further identify the caller.
 	CallerId *vtrpc.CallerID `protobuf:"bytes,1,opt,name=caller_id,json=callerId,proto3" json:"caller_id,omitempty"`
 	// query is the query and bind variables to execute.
 	Query *query.BoundQuery `protobuf:"bytes,2,opt,name=query,proto3" json:"query,omitempty"`
 	// session carries the session state.
-	Session *Session `protobuf:"bytes,6,opt,name=session,proto3" json:"session,omitempty"`
+	Session       *Session `protobuf:"bytes,6,opt,name=session,proto3" json:"session,omitempty"`
+	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *StreamExecuteRequest) Reset() {
@@ -894,16 +887,15 @@ func (x *StreamExecuteRequest) GetSession() *Session {
 // The session is currently not returned because StreamExecute is
 // not expected to modify it.
 type StreamExecuteResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
+	state protoimpl.MessageState `protogen:"open.v1"`
 	// result contains the result data.
 	// The first value contains only Fields information.
 	// The next values contain the actual rows, a few values per result.
 	Result *query.QueryResult `protobuf:"bytes,1,opt,name=result,proto3" json:"result,omitempty"`
 	// session is the updated session information.
-	Session *Session `protobuf:"bytes,2,opt,name=session,proto3" json:"session,omitempty"`
+	Session       *Session `protobuf:"bytes,2,opt,name=session,proto3" json:"session,omitempty"`
+	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *StreamExecuteResponse) Reset() {
@@ -952,15 +944,14 @@ func (x *StreamExecuteResponse) GetSession() *Session {
 
 // ResolveTransactionRequest is the payload to ResolveTransaction.
 type ResolveTransactionRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
+	state protoimpl.MessageState `protogen:"open.v1"`
 	// caller_id identifies the caller. This is the effective caller ID,
 	// set by the application to further identify the caller.
 	CallerId *vtrpc.CallerID `protobuf:"bytes,1,opt,name=caller_id,json=callerId,proto3" json:"caller_id,omitempty"`
 	// dtid is the dtid of the transaction to be resolved.
-	Dtid string `protobuf:"bytes,2,opt,name=dtid,proto3" json:"dtid,omitempty"`
+	Dtid          string `protobuf:"bytes,2,opt,name=dtid,proto3" json:"dtid,omitempty"`
+	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *ResolveTransactionRequest) Reset() {
@@ -1009,9 +1000,9 @@ func (x *ResolveTransactionRequest) GetDtid() string {
 
 // ResolveTransactionResponse is the returned value from Rollback.
 type ResolveTransactionResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
 	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *ResolveTransactionResponse) Reset() {
@@ -1045,10 +1036,7 @@ func (*ResolveTransactionResponse) Descriptor() ([]byte, []int) {
 }
 
 type VStreamFlags struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
+	state protoimpl.MessageState `protogen:"open.v1"`
 	// align streams
 	MinimizeSkew bool `protobuf:"varint,1,opt,name=minimize_skew,json=minimizeSkew,proto3" json:"minimize_skew,omitempty"`
 	// how often heartbeats must be sent when idle (seconds)
@@ -1064,6 +1052,8 @@ type VStreamFlags struct {
 	StreamKeyspaceHeartbeats bool `protobuf:"varint,7,opt,name=stream_keyspace_heartbeats,json=streamKeyspaceHeartbeats,proto3" json:"stream_keyspace_heartbeats,omitempty"`
 	// Include reshard journal events in the stream.
 	IncludeReshardJournalEvents bool `protobuf:"varint,8,opt,name=include_reshard_journal_events,json=includeReshardJournalEvents,proto3" json:"include_reshard_journal_events,omitempty"`
+	unknownFields               protoimpl.UnknownFields
+	sizeCache                   protoimpl.SizeCache
 }
 
 func (x *VStreamFlags) Reset() {
@@ -1154,18 +1144,17 @@ func (x *VStreamFlags) GetIncludeReshardJournalEvents() bool {
 
 // VStreamRequest is the payload for VStream.
 type VStreamRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	CallerId   *vtrpc.CallerID     `protobuf:"bytes,1,opt,name=caller_id,json=callerId,proto3" json:"caller_id,omitempty"`
-	TabletType topodata.TabletType `protobuf:"varint,2,opt,name=tablet_type,json=tabletType,proto3,enum=topodata.TabletType" json:"tablet_type,omitempty"`
+	state      protoimpl.MessageState `protogen:"open.v1"`
+	CallerId   *vtrpc.CallerID        `protobuf:"bytes,1,opt,name=caller_id,json=callerId,proto3" json:"caller_id,omitempty"`
+	TabletType topodata.TabletType    `protobuf:"varint,2,opt,name=tablet_type,json=tabletType,proto3,enum=topodata.TabletType" json:"tablet_type,omitempty"`
 	// position specifies the starting point of the bin log positions
 	// as well as the keyspace-shards to pull events from.
 	// position is of the form 'ks1:0@MySQL56/<mysql_pos>|ks2:-80@MySQL56/<mysql_pos>'.
-	Vgtid  *binlogdata.VGtid  `protobuf:"bytes,3,opt,name=vgtid,proto3" json:"vgtid,omitempty"`
-	Filter *binlogdata.Filter `protobuf:"bytes,4,opt,name=filter,proto3" json:"filter,omitempty"`
-	Flags  *VStreamFlags      `protobuf:"bytes,5,opt,name=flags,proto3" json:"flags,omitempty"`
+	Vgtid         *binlogdata.VGtid  `protobuf:"bytes,3,opt,name=vgtid,proto3" json:"vgtid,omitempty"`
+	Filter        *binlogdata.Filter `protobuf:"bytes,4,opt,name=filter,proto3" json:"filter,omitempty"`
+	Flags         *VStreamFlags      `protobuf:"bytes,5,opt,name=flags,proto3" json:"flags,omitempty"`
+	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *VStreamRequest) Reset() {
@@ -1235,11 +1224,10 @@ func (x *VStreamRequest) GetFlags() *VStreamFlags {
 
 // VStreamResponse is streamed by VStream.
 type VStreamResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	Events        []*binlogdata.VEvent   `protobuf:"bytes,1,rep,name=events,proto3" json:"events,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	Events []*binlogdata.VEvent `protobuf:"bytes,1,rep,name=events,proto3" json:"events,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *VStreamResponse) Reset() {
@@ -1281,17 +1269,16 @@ func (x *VStreamResponse) GetEvents() []*binlogdata.VEvent {
 
 // PrepareRequest is the payload to Prepare.
 type PrepareRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
+	state protoimpl.MessageState `protogen:"open.v1"`
 	// caller_id identifies the caller. This is the effective caller ID,
 	// set by the application to further identify the caller.
 	CallerId *vtrpc.CallerID `protobuf:"bytes,1,opt,name=caller_id,json=callerId,proto3" json:"caller_id,omitempty"`
 	// session carries the session state.
 	Session *Session `protobuf:"bytes,2,opt,name=session,proto3" json:"session,omitempty"`
 	// query is the query and bind variables to execute.
-	Query *query.BoundQuery `protobuf:"bytes,3,opt,name=query,proto3" json:"query,omitempty"`
+	Query         *query.BoundQuery `protobuf:"bytes,3,opt,name=query,proto3" json:"query,omitempty"`
+	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *PrepareRequest) Reset() {
@@ -1347,10 +1334,7 @@ func (x *PrepareRequest) GetQuery() *query.BoundQuery {
 
 // PrepareResponse is the returned value from Prepare.
 type PrepareResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
+	state protoimpl.MessageState `protogen:"open.v1"`
 	// error contains an application level error if necessary. Note the
 	// session may have changed, even when an error is returned (for
 	// instance if a database integrity error happened).
@@ -1358,7 +1342,9 @@ type PrepareResponse struct {
 	// session is the updated session information.
 	Session *Session `protobuf:"bytes,2,opt,name=session,proto3" json:"session,omitempty"`
 	// fields contains the fields, only set if error is unset.
-	Fields []*query.Field `protobuf:"bytes,3,rep,name=fields,proto3" json:"fields,omitempty"`
+	Fields        []*query.Field `protobuf:"bytes,3,rep,name=fields,proto3" json:"fields,omitempty"`
+	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *PrepareResponse) Reset() {
@@ -1414,15 +1400,14 @@ func (x *PrepareResponse) GetFields() []*query.Field {
 
 // CloseSessionRequest is the payload to CloseSession.
 type CloseSessionRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
+	state protoimpl.MessageState `protogen:"open.v1"`
 	// caller_id identifies the caller. This is the effective caller ID,
 	// set by the application to further identify the caller.
 	CallerId *vtrpc.CallerID `protobuf:"bytes,1,opt,name=caller_id,json=callerId,proto3" json:"caller_id,omitempty"`
 	// session carries the session state.
-	Session *Session `protobuf:"bytes,2,opt,name=session,proto3" json:"session,omitempty"`
+	Session       *Session `protobuf:"bytes,2,opt,name=session,proto3" json:"session,omitempty"`
+	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *CloseSessionRequest) Reset() {
@@ -1471,14 +1456,13 @@ func (x *CloseSessionRequest) GetSession() *Session {
 
 // CloseSessionResponse is the returned value from CloseSession.
 type CloseSessionResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
+	state protoimpl.MessageState `protogen:"open.v1"`
 	// error contains an application level error if necessary. Note the
 	// session may have changed, even when an error is returned (for
 	// instance if a database integrity error happened).
-	Error *vtrpc.RPCError `protobuf:"bytes,1,opt,name=error,proto3" json:"error,omitempty"`
+	Error         *vtrpc.RPCError `protobuf:"bytes,1,opt,name=error,proto3" json:"error,omitempty"`
+	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *CloseSessionResponse) Reset() {
@@ -1519,18 +1503,17 @@ func (x *CloseSessionResponse) GetError() *vtrpc.RPCError {
 }
 
 type Session_ShardSession struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Target        *query.Target         `protobuf:"bytes,1,opt,name=target,proto3" json:"target,omitempty"`
-	TransactionId int64                 `protobuf:"varint,2,opt,name=transaction_id,json=transactionId,proto3" json:"transaction_id,omitempty"`
-	TabletAlias   *topodata.TabletAlias `protobuf:"bytes,3,opt,name=tablet_alias,json=tabletAlias,proto3" json:"tablet_alias,omitempty"`
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	Target        *query.Target          `protobuf:"bytes,1,opt,name=target,proto3" json:"target,omitempty"`
+	TransactionId int64                  `protobuf:"varint,2,opt,name=transaction_id,json=transactionId,proto3" json:"transaction_id,omitempty"`
+	TabletAlias   *topodata.TabletAlias  `protobuf:"bytes,3,opt,name=tablet_alias,json=tabletAlias,proto3" json:"tablet_alias,omitempty"`
 	// reserved connection if a dedicated connection is needed
 	ReservedId int64 `protobuf:"varint,4,opt,name=reserved_id,json=reservedId,proto3" json:"reserved_id,omitempty"`
 	VindexOnly bool  `protobuf:"varint,5,opt,name=vindex_only,json=vindexOnly,proto3" json:"vindex_only,omitempty"`
 	// rows_affected tracks if any query has modified the rows.
-	RowsAffected bool `protobuf:"varint,6,opt,name=rows_affected,json=rowsAffected,proto3" json:"rows_affected,omitempty"`
+	RowsAffected  bool `protobuf:"varint,6,opt,name=rows_affected,json=rowsAffected,proto3" json:"rows_affected,omitempty"`
+	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *Session_ShardSession) Reset() {
@@ -1607,7 +1590,7 @@ func (x *Session_ShardSession) GetRowsAffected() bool {
 
 var File_vtgate_proto protoreflect.FileDescriptor
 
-var file_vtgate_proto_rawDesc = []byte{
+var file_vtgate_proto_rawDesc = string([]byte{
 	0x0a, 0x0c, 0x76, 0x74, 0x67, 0x61, 0x74, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x06,
 	0x76, 0x74, 0x67, 0x61, 0x74, 0x65, 0x1a, 0x10, 0x62, 0x69, 0x6e, 0x6c, 0x6f, 0x67, 0x64, 0x61,
 	0x74, 0x61, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x0b, 0x71, 0x75, 0x65, 0x72, 0x79, 0x2e,
@@ -1903,16 +1886,16 @@ var file_vtgate_proto_rawDesc = []byte{
 	0x5a, 0x23, 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, 0x76,
 	0x74, 0x67, 0x61, 0x74, 0x65, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
-}
+})
 
 var (
 	file_vtgate_proto_rawDescOnce sync.Once
-	file_vtgate_proto_rawDescData = file_vtgate_proto_rawDesc
+	file_vtgate_proto_rawDescData []byte
 )
 
 func file_vtgate_proto_rawDescGZIP() []byte {
 	file_vtgate_proto_rawDescOnce.Do(func() {
-		file_vtgate_proto_rawDescData = protoimpl.X.CompressGZIP(file_vtgate_proto_rawDescData)
+		file_vtgate_proto_rawDescData = protoimpl.X.CompressGZIP(unsafe.Slice(unsafe.StringData(file_vtgate_proto_rawDesc), len(file_vtgate_proto_rawDesc)))
 	})
 	return file_vtgate_proto_rawDescData
 }
@@ -2027,7 +2010,7 @@ func file_vtgate_proto_init() {
 	out := protoimpl.TypeBuilder{
 		File: protoimpl.DescBuilder{
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
-			RawDescriptor: file_vtgate_proto_rawDesc,
+			RawDescriptor: unsafe.Slice(unsafe.StringData(file_vtgate_proto_rawDesc), len(file_vtgate_proto_rawDesc)),
 			NumEnums:      2,
 			NumMessages:   23,
 			NumExtensions: 0,
@@ -2039,7 +2022,6 @@ func file_vtgate_proto_init() {
 		MessageInfos:      file_vtgate_proto_msgTypes,
 	}.Build()
 	File_vtgate_proto = out.File
-	file_vtgate_proto_rawDesc = nil
 	file_vtgate_proto_goTypes = nil
 	file_vtgate_proto_depIdxs = nil
 }
diff --git a/go/vt/proto/vtgate/vtgate_vtproto.pb.go b/go/vt/proto/vtgate/vtgate_vtproto.pb.go
index 5df6dbbffef..f4bdbeeec93 100644
--- a/go/vt/proto/vtgate/vtgate_vtproto.pb.go
+++ b/go/vt/proto/vtgate/vtgate_vtproto.pb.go
@@ -1,5 +1,5 @@
 // Code generated by protoc-gen-go-vtproto. DO NOT EDIT.
-// protoc-gen-go-vtproto version: v0.6.1-0.20241011083415-71c992bc3c87
+// protoc-gen-go-vtproto version: v0.6.1-0.20241121165744-79df5c4772f2
 // source: vtgate.proto
 
 package vtgate
diff --git a/go/vt/proto/vtgateservice/vtgateservice.pb.go b/go/vt/proto/vtgateservice/vtgateservice.pb.go
index 3abab1e7dbf..d576eb5e76b 100644
--- a/go/vt/proto/vtgateservice/vtgateservice.pb.go
+++ b/go/vt/proto/vtgateservice/vtgateservice.pb.go
@@ -18,7 +18,7 @@
 
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.35.1
+// 	protoc-gen-go v1.36.4
 // 	protoc        v3.21.3
 // source: vtgateservice.proto
 
@@ -28,6 +28,7 @@ import (
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
 	reflect "reflect"
+	unsafe "unsafe"
 	vtgate "vitess.io/vitess/go/vt/proto/vtgate"
 )
 
@@ -40,7 +41,7 @@ const (
 
 var File_vtgateservice_proto protoreflect.FileDescriptor
 
-var file_vtgateservice_proto_rawDesc = []byte{
+var file_vtgateservice_proto_rawDesc = string([]byte{
 	0x0a, 0x13, 0x76, 0x74, 0x67, 0x61, 0x74, 0x65, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e,
 	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x0d, 0x76, 0x74, 0x67, 0x61, 0x74, 0x65, 0x73, 0x65, 0x72,
 	0x76, 0x69, 0x63, 0x65, 0x1a, 0x0c, 0x76, 0x74, 0x67, 0x61, 0x74, 0x65, 0x2e, 0x70, 0x72, 0x6f,
@@ -77,7 +78,7 @@ var file_vtgateservice_proto_rawDesc = []byte{
 	0x67, 0x6f, 0x2f, 0x76, 0x74, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x76, 0x74, 0x67, 0x61,
 	0x74, 0x65, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f,
 	0x33,
-}
+})
 
 var file_vtgateservice_proto_goTypes = []any{
 	(*vtgate.ExecuteRequest)(nil),        // 0: vtgate.ExecuteRequest
@@ -122,7 +123,7 @@ func file_vtgateservice_proto_init() {
 	out := protoimpl.TypeBuilder{
 		File: protoimpl.DescBuilder{
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
-			RawDescriptor: file_vtgateservice_proto_rawDesc,
+			RawDescriptor: unsafe.Slice(unsafe.StringData(file_vtgateservice_proto_rawDesc), len(file_vtgateservice_proto_rawDesc)),
 			NumEnums:      0,
 			NumMessages:   0,
 			NumExtensions: 0,
@@ -132,7 +133,6 @@ func file_vtgateservice_proto_init() {
 		DependencyIndexes: file_vtgateservice_proto_depIdxs,
 	}.Build()
 	File_vtgateservice_proto = out.File
-	file_vtgateservice_proto_rawDesc = nil
 	file_vtgateservice_proto_goTypes = nil
 	file_vtgateservice_proto_depIdxs = nil
 }
diff --git a/go/vt/proto/vtrpc/vtrpc.pb.go b/go/vt/proto/vtrpc/vtrpc.pb.go
index 6f6a204277c..042a4ae6208 100644
--- a/go/vt/proto/vtrpc/vtrpc.pb.go
+++ b/go/vt/proto/vtrpc/vtrpc.pb.go
@@ -17,7 +17,7 @@
 
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.35.1
+// 	protoc-gen-go v1.36.4
 // 	protoc        v3.21.3
 // source: vtrpc.proto
 
@@ -28,6 +28,7 @@ import (
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
 	reflect "reflect"
 	sync "sync"
+	unsafe "unsafe"
 )
 
 const (
@@ -234,10 +235,7 @@ func (Code) EnumDescriptor() ([]byte, []int) {
 // information for monitoring purposes, to display on dashboards, or
 // for denying access to tables during a migration.
 type CallerID struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
+	state protoimpl.MessageState `protogen:"open.v1"`
 	// principal is the effective user identifier. It is usually filled in
 	// with whoever made the request to the appserver, if the request
 	// came from an automated job or another system component.
@@ -253,7 +251,9 @@ type CallerID struct {
 	// servlet name or an API endpoint name.
 	Subcomponent string `protobuf:"bytes,3,opt,name=subcomponent,proto3" json:"subcomponent,omitempty"`
 	// set of security groups that should be assigned to this caller.
-	Groups []string `protobuf:"bytes,4,rep,name=groups,proto3" json:"groups,omitempty"`
+	Groups        []string `protobuf:"bytes,4,rep,name=groups,proto3" json:"groups,omitempty"`
+	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *CallerID) Reset() {
@@ -319,12 +319,11 @@ func (x *CallerID) GetGroups() []string {
 // We use this so the clients don't have to parse the error messages,
 // but instead can depend on the value of the code.
 type RPCError struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	Message       string                 `protobuf:"bytes,2,opt,name=message,proto3" json:"message,omitempty"`
+	Code          Code                   `protobuf:"varint,3,opt,name=code,proto3,enum=vtrpc.Code" json:"code,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	Message string `protobuf:"bytes,2,opt,name=message,proto3" json:"message,omitempty"`
-	Code    Code   `protobuf:"varint,3,opt,name=code,proto3,enum=vtrpc.Code" json:"code,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *RPCError) Reset() {
@@ -373,7 +372,7 @@ func (x *RPCError) GetCode() Code {
 
 var File_vtrpc_proto protoreflect.FileDescriptor
 
-var file_vtrpc_proto_rawDesc = []byte{
+var file_vtrpc_proto_rawDesc = string([]byte{
 	0x0a, 0x0b, 0x76, 0x74, 0x72, 0x70, 0x63, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x05, 0x76,
 	0x74, 0x72, 0x70, 0x63, 0x22, 0x82, 0x01, 0x0a, 0x08, 0x43, 0x61, 0x6c, 0x6c, 0x65, 0x72, 0x49,
 	0x44, 0x12, 0x1c, 0x0a, 0x09, 0x70, 0x72, 0x69, 0x6e, 0x63, 0x69, 0x70, 0x61, 0x6c, 0x18, 0x01,
@@ -415,16 +414,16 @@ var file_vtrpc_proto_rawDesc = []byte{
 	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,
 	0x76, 0x74, 0x72, 0x70, 0x63, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
-}
+})
 
 var (
 	file_vtrpc_proto_rawDescOnce sync.Once
-	file_vtrpc_proto_rawDescData = file_vtrpc_proto_rawDesc
+	file_vtrpc_proto_rawDescData []byte
 )
 
 func file_vtrpc_proto_rawDescGZIP() []byte {
 	file_vtrpc_proto_rawDescOnce.Do(func() {
-		file_vtrpc_proto_rawDescData = protoimpl.X.CompressGZIP(file_vtrpc_proto_rawDescData)
+		file_vtrpc_proto_rawDescData = protoimpl.X.CompressGZIP(unsafe.Slice(unsafe.StringData(file_vtrpc_proto_rawDesc), len(file_vtrpc_proto_rawDesc)))
 	})
 	return file_vtrpc_proto_rawDescData
 }
@@ -454,7 +453,7 @@ func file_vtrpc_proto_init() {
 	out := protoimpl.TypeBuilder{
 		File: protoimpl.DescBuilder{
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
-			RawDescriptor: file_vtrpc_proto_rawDesc,
+			RawDescriptor: unsafe.Slice(unsafe.StringData(file_vtrpc_proto_rawDesc), len(file_vtrpc_proto_rawDesc)),
 			NumEnums:      1,
 			NumMessages:   2,
 			NumExtensions: 0,
@@ -466,7 +465,6 @@ func file_vtrpc_proto_init() {
 		MessageInfos:      file_vtrpc_proto_msgTypes,
 	}.Build()
 	File_vtrpc_proto = out.File
-	file_vtrpc_proto_rawDesc = nil
 	file_vtrpc_proto_goTypes = nil
 	file_vtrpc_proto_depIdxs = nil
 }
diff --git a/go/vt/proto/vtrpc/vtrpc_vtproto.pb.go b/go/vt/proto/vtrpc/vtrpc_vtproto.pb.go
index 23bc792e9ad..4334064e09e 100644
--- a/go/vt/proto/vtrpc/vtrpc_vtproto.pb.go
+++ b/go/vt/proto/vtrpc/vtrpc_vtproto.pb.go
@@ -1,5 +1,5 @@
 // Code generated by protoc-gen-go-vtproto. DO NOT EDIT.
-// protoc-gen-go-vtproto version: v0.6.1-0.20241011083415-71c992bc3c87
+// protoc-gen-go-vtproto version: v0.6.1-0.20241121165744-79df5c4772f2
 // source: vtrpc.proto
 
 package vtrpc
diff --git a/go/vt/proto/vttest/vttest.pb.go b/go/vt/proto/vttest/vttest.pb.go
index ee78cc5231a..49b44e3e7c5 100644
--- a/go/vt/proto/vttest/vttest.pb.go
+++ b/go/vt/proto/vttest/vttest.pb.go
@@ -41,7 +41,7 @@
 
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.35.1
+// 	protoc-gen-go v1.36.4
 // 	protoc        v3.21.3
 // source: vttest.proto
 
@@ -52,6 +52,7 @@ import (
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
 	reflect "reflect"
 	sync "sync"
+	unsafe "unsafe"
 	vschema "vitess.io/vitess/go/vt/proto/vschema"
 )
 
@@ -64,10 +65,7 @@ const (
 
 // Shard describes a single shard in a keyspace.
 type Shard struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
+	state protoimpl.MessageState `protogen:"open.v1"`
 	// name has to be unique in a keyspace. For unsharded keyspaces, it
 	// should be '0'. For sharded keyspace, it should be derived from
 	// the keyrange, like '-80' or '40-80'.
@@ -76,6 +74,8 @@ type Shard struct {
 	// globally unique. If not specified, we will by default use
 	// 'vt_<keyspace>_<shard>'.
 	DbNameOverride string `protobuf:"bytes,2,opt,name=db_name_override,json=dbNameOverride,proto3" json:"db_name_override,omitempty"`
+	unknownFields  protoimpl.UnknownFields
+	sizeCache      protoimpl.SizeCache
 }
 
 func (x *Shard) Reset() {
@@ -124,10 +124,7 @@ func (x *Shard) GetDbNameOverride() string {
 
 // Keyspace describes a single keyspace.
 type Keyspace struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
+	state protoimpl.MessageState `protogen:"open.v1"`
 	// name has to be unique in a VTTestTopology.
 	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// shards inside this keyspace. Ignored if redirect is set.
@@ -135,7 +132,9 @@ type Keyspace struct {
 	// number of replica tablets to instantiate. This includes the primary tablet.
 	ReplicaCount int32 `protobuf:"varint,6,opt,name=replica_count,json=replicaCount,proto3" json:"replica_count,omitempty"`
 	// number of rdonly tablets to instantiate.
-	RdonlyCount int32 `protobuf:"varint,7,opt,name=rdonly_count,json=rdonlyCount,proto3" json:"rdonly_count,omitempty"`
+	RdonlyCount   int32 `protobuf:"varint,7,opt,name=rdonly_count,json=rdonlyCount,proto3" json:"rdonly_count,omitempty"`
+	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *Keyspace) Reset() {
@@ -198,10 +197,7 @@ func (x *Keyspace) GetRdonlyCount() int32 {
 
 // VTTestTopology describes the keyspaces in the topology.
 type VTTestTopology struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
+	state protoimpl.MessageState `protogen:"open.v1"`
 	// all keyspaces in the topology.
 	Keyspaces []*Keyspace `protobuf:"bytes,1,rep,name=keyspaces,proto3" json:"keyspaces,omitempty"`
 	// list of cells the keyspaces reside in. Vtgate is started in only the first cell.
@@ -209,7 +205,9 @@ type VTTestTopology struct {
 	// routing rules for the topology.
 	RoutingRules *vschema.RoutingRules `protobuf:"bytes,3,opt,name=routing_rules,json=routingRules,proto3" json:"routing_rules,omitempty"`
 	// mirror rules for the topology.
-	MirrorRules *vschema.MirrorRules `protobuf:"bytes,4,opt,name=mirror_rules,json=mirrorRules,proto3" json:"mirror_rules,omitempty"`
+	MirrorRules   *vschema.MirrorRules `protobuf:"bytes,4,opt,name=mirror_rules,json=mirrorRules,proto3" json:"mirror_rules,omitempty"`
+	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *VTTestTopology) Reset() {
@@ -272,7 +270,7 @@ func (x *VTTestTopology) GetMirrorRules() *vschema.MirrorRules {
 
 var File_vttest_proto protoreflect.FileDescriptor
 
-var file_vttest_proto_rawDesc = []byte{
+var file_vttest_proto_rawDesc = string([]byte{
 	0x0a, 0x0c, 0x76, 0x74, 0x74, 0x65, 0x73, 0x74, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x06,
 	0x76, 0x74, 0x74, 0x65, 0x73, 0x74, 0x1a, 0x0d, 0x76, 0x73, 0x63, 0x68, 0x65, 0x6d, 0x61, 0x2e,
 	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x45, 0x0a, 0x05, 0x53, 0x68, 0x61, 0x72, 0x64, 0x12, 0x12,
@@ -306,16 +304,16 @@ var file_vttest_proto_rawDesc = []byte{
 	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, 0x76, 0x74, 0x74,
 	0x65, 0x73, 0x74, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
-}
+})
 
 var (
 	file_vttest_proto_rawDescOnce sync.Once
-	file_vttest_proto_rawDescData = file_vttest_proto_rawDesc
+	file_vttest_proto_rawDescData []byte
 )
 
 func file_vttest_proto_rawDescGZIP() []byte {
 	file_vttest_proto_rawDescOnce.Do(func() {
-		file_vttest_proto_rawDescData = protoimpl.X.CompressGZIP(file_vttest_proto_rawDescData)
+		file_vttest_proto_rawDescData = protoimpl.X.CompressGZIP(unsafe.Slice(unsafe.StringData(file_vttest_proto_rawDesc), len(file_vttest_proto_rawDesc)))
 	})
 	return file_vttest_proto_rawDescData
 }
@@ -349,7 +347,7 @@ func file_vttest_proto_init() {
 	out := protoimpl.TypeBuilder{
 		File: protoimpl.DescBuilder{
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
-			RawDescriptor: file_vttest_proto_rawDesc,
+			RawDescriptor: unsafe.Slice(unsafe.StringData(file_vttest_proto_rawDesc), len(file_vttest_proto_rawDesc)),
 			NumEnums:      0,
 			NumMessages:   3,
 			NumExtensions: 0,
@@ -360,7 +358,6 @@ func file_vttest_proto_init() {
 		MessageInfos:      file_vttest_proto_msgTypes,
 	}.Build()
 	File_vttest_proto = out.File
-	file_vttest_proto_rawDesc = nil
 	file_vttest_proto_goTypes = nil
 	file_vttest_proto_depIdxs = nil
 }
diff --git a/go/vt/proto/vttest/vttest_vtproto.pb.go b/go/vt/proto/vttest/vttest_vtproto.pb.go
index b6a887ad41f..fe862b84d04 100644
--- a/go/vt/proto/vttest/vttest_vtproto.pb.go
+++ b/go/vt/proto/vttest/vttest_vtproto.pb.go
@@ -1,5 +1,5 @@
 // Code generated by protoc-gen-go-vtproto. DO NOT EDIT.
-// protoc-gen-go-vtproto version: v0.6.1-0.20241011083415-71c992bc3c87
+// protoc-gen-go-vtproto version: v0.6.1-0.20241121165744-79df5c4772f2
 // source: vttest.proto
 
 package vttest
diff --git a/go/vt/proto/vttime/vttime.pb.go b/go/vt/proto/vttime/vttime.pb.go
index 957ca7f0969..305bff16f59 100644
--- a/go/vt/proto/vttime/vttime.pb.go
+++ b/go/vt/proto/vttime/vttime.pb.go
@@ -17,7 +17,7 @@
 
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.35.1
+// 	protoc-gen-go v1.36.4
 // 	protoc        v3.21.3
 // source: vttime.proto
 
@@ -28,6 +28,7 @@ import (
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
 	reflect "reflect"
 	sync "sync"
+	unsafe "unsafe"
 )
 
 const (
@@ -40,12 +41,11 @@ const (
 // Time represents a time stamp in nanoseconds. In go, use logutil library
 // to convert times.
 type Time struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	Seconds       int64                  `protobuf:"varint,1,opt,name=seconds,proto3" json:"seconds,omitempty"`
+	Nanoseconds   int32                  `protobuf:"varint,2,opt,name=nanoseconds,proto3" json:"nanoseconds,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	Seconds     int64 `protobuf:"varint,1,opt,name=seconds,proto3" json:"seconds,omitempty"`
-	Nanoseconds int32 `protobuf:"varint,2,opt,name=nanoseconds,proto3" json:"nanoseconds,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *Time) Reset() {
@@ -93,12 +93,11 @@ func (x *Time) GetNanoseconds() int32 {
 }
 
 type Duration struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	Seconds       int64                  `protobuf:"varint,1,opt,name=seconds,proto3" json:"seconds,omitempty"`
+	Nanos         int32                  `protobuf:"varint,2,opt,name=nanos,proto3" json:"nanos,omitempty"`
 	unknownFields protoimpl.UnknownFields
-
-	Seconds int64 `protobuf:"varint,1,opt,name=seconds,proto3" json:"seconds,omitempty"`
-	Nanos   int32 `protobuf:"varint,2,opt,name=nanos,proto3" json:"nanos,omitempty"`
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *Duration) Reset() {
@@ -147,7 +146,7 @@ func (x *Duration) GetNanos() int32 {
 
 var File_vttime_proto protoreflect.FileDescriptor
 
-var file_vttime_proto_rawDesc = []byte{
+var file_vttime_proto_rawDesc = string([]byte{
 	0x0a, 0x0c, 0x76, 0x74, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x06,
 	0x76, 0x74, 0x74, 0x69, 0x6d, 0x65, 0x22, 0x42, 0x0a, 0x04, 0x54, 0x69, 0x6d, 0x65, 0x12, 0x18,
 	0x0a, 0x07, 0x73, 0x65, 0x63, 0x6f, 0x6e, 0x64, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52,
@@ -161,16 +160,16 @@ var file_vttime_proto_rawDesc = []byte{
 	0x2e, 0x69, 0x6f, 0x2f, 0x76, 0x69, 0x74, 0x65, 0x73, 0x73, 0x2f, 0x67, 0x6f, 0x2f, 0x76, 0x74,
 	0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x76, 0x74, 0x74, 0x69, 0x6d, 0x65, 0x62, 0x06, 0x70,
 	0x72, 0x6f, 0x74, 0x6f, 0x33,
-}
+})
 
 var (
 	file_vttime_proto_rawDescOnce sync.Once
-	file_vttime_proto_rawDescData = file_vttime_proto_rawDesc
+	file_vttime_proto_rawDescData []byte
 )
 
 func file_vttime_proto_rawDescGZIP() []byte {
 	file_vttime_proto_rawDescOnce.Do(func() {
-		file_vttime_proto_rawDescData = protoimpl.X.CompressGZIP(file_vttime_proto_rawDescData)
+		file_vttime_proto_rawDescData = protoimpl.X.CompressGZIP(unsafe.Slice(unsafe.StringData(file_vttime_proto_rawDesc), len(file_vttime_proto_rawDesc)))
 	})
 	return file_vttime_proto_rawDescData
 }
@@ -197,7 +196,7 @@ func file_vttime_proto_init() {
 	out := protoimpl.TypeBuilder{
 		File: protoimpl.DescBuilder{
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
-			RawDescriptor: file_vttime_proto_rawDesc,
+			RawDescriptor: unsafe.Slice(unsafe.StringData(file_vttime_proto_rawDesc), len(file_vttime_proto_rawDesc)),
 			NumEnums:      0,
 			NumMessages:   2,
 			NumExtensions: 0,
@@ -208,7 +207,6 @@ func file_vttime_proto_init() {
 		MessageInfos:      file_vttime_proto_msgTypes,
 	}.Build()
 	File_vttime_proto = out.File
-	file_vttime_proto_rawDesc = nil
 	file_vttime_proto_goTypes = nil
 	file_vttime_proto_depIdxs = nil
 }
diff --git a/go/vt/proto/vttime/vttime_vtproto.pb.go b/go/vt/proto/vttime/vttime_vtproto.pb.go
index 08e712e7139..191684f2c98 100644
--- a/go/vt/proto/vttime/vttime_vtproto.pb.go
+++ b/go/vt/proto/vttime/vttime_vtproto.pb.go
@@ -1,5 +1,5 @@
 // Code generated by protoc-gen-go-vtproto. DO NOT EDIT.
-// protoc-gen-go-vtproto version: v0.6.1-0.20241011083415-71c992bc3c87
+// protoc-gen-go-vtproto version: v0.6.1-0.20241121165744-79df5c4772f2
 // source: vttime.proto
 
 package vttime

From aebc4b82f91733cd97e370174feaf6a57257ccfa Mon Sep 17 00:00:00 2001
From: Rohit Nayak <57520317+rohit-nayak-ps@users.noreply.github.com>
Date: Tue, 4 Feb 2025 17:52:33 +0100
Subject: [PATCH 22/68] VDiff: fix race when a vdiff resumes on vttablet
 restart (#17638)

Signed-off-by: Rohit Nayak <rohit@planetscale.com>
---
 go/vt/vttablet/tabletmanager/shard_sync.go    | 13 +++++++----
 .../tabletmanager/vdiff/controller.go         |  5 +----
 go/vt/vttablet/tabletmanager/vdiff/engine.go  | 22 +++++++------------
 .../tabletmanager/vdiff/framework_test.go     | 14 ++++++++++--
 go/vt/vttablet/tabletmanager/vdiff/stats.go   |  7 ++++++
 .../vdiff/workflow_differ_test.go             |  8 ++-----
 6 files changed, 39 insertions(+), 30 deletions(-)

diff --git a/go/vt/vttablet/tabletmanager/shard_sync.go b/go/vt/vttablet/tabletmanager/shard_sync.go
index ab995ec14b1..4afbaa1a639 100644
--- a/go/vt/vttablet/tabletmanager/shard_sync.go
+++ b/go/vt/vttablet/tabletmanager/shard_sync.go
@@ -85,10 +85,15 @@ func (tm *TabletManager) shardSyncLoop(ctx context.Context, notifyChan <-chan st
 			// We don't use the watch event except to know that we should
 			// re-read the shard record, and to know if the watch dies.
 			log.Info("Change in shard record")
-			if event.Err != nil {
-				// The watch failed. Stop it so we start a new one if needed.
-				log.Errorf("Shard watch failed: %v", event.Err)
-				shardWatch.stop()
+
+			if event != nil {
+				if event.Err != nil {
+					// The watch failed. Stop it so we start a new one if needed.
+					log.Errorf("Shard watch failed: %v", event.Err)
+					shardWatch.stop()
+				}
+			} else {
+				log.Infof("Got a nil event from the shard watcher for %s. This should not happen.", tm.tabletAlias)
 			}
 		case <-ctx.Done():
 			// Our context was cancelled. Terminate the loop.
diff --git a/go/vt/vttablet/tabletmanager/vdiff/controller.go b/go/vt/vttablet/tabletmanager/vdiff/controller.go
index 20c1501989e..7b5e1311066 100644
--- a/go/vt/vttablet/tabletmanager/vdiff/controller.go
+++ b/go/vt/vttablet/tabletmanager/vdiff/controller.go
@@ -83,7 +83,7 @@ type controller struct {
 	TableDiffPhaseTimings *stats.Timings
 }
 
-func newController(ctx context.Context, row sqltypes.RowNamedValues, dbClientFactory func() binlogplayer.DBClient,
+func newController(row sqltypes.RowNamedValues, dbClientFactory func() binlogplayer.DBClient,
 	ts *topo.Server, vde *Engine, options *tabletmanagerdata.VDiffOptions) (*controller, error) {
 
 	log.Infof("VDiff controller initializing for %+v", row)
@@ -104,9 +104,6 @@ func newController(ctx context.Context, row sqltypes.RowNamedValues, dbClientFac
 		TableDiffRowCounts:    stats.NewCountersWithSingleLabel("", "", "Rows"),
 		TableDiffPhaseTimings: stats.NewTimings("", "", "", "TablePhase"),
 	}
-	ctx, ct.cancel = context.WithCancel(ctx)
-	go ct.run(ctx)
-
 	return ct, nil
 }
 
diff --git a/go/vt/vttablet/tabletmanager/vdiff/engine.go b/go/vt/vttablet/tabletmanager/vdiff/engine.go
index b2285a070fa..cd3771accfd 100644
--- a/go/vt/vttablet/tabletmanager/vdiff/engine.go
+++ b/go/vt/vttablet/tabletmanager/vdiff/engine.go
@@ -146,6 +146,8 @@ func (vde *Engine) openLocked(ctx context.Context) error {
 		vde.resetControllers()
 	}
 
+	globalStats.initControllerStats()
+
 	// At this point the tablet has no controllers running. So
 	// we want to start any VDiffs that have not been explicitly
 	// stopped or otherwise finished.
@@ -153,12 +155,12 @@ func (vde *Engine) openLocked(ctx context.Context) error {
 	if err != nil {
 		return err
 	}
+
 	vde.ctx, vde.cancel = context.WithCancel(ctx)
 	vde.isOpen = true // now we are open and have things to close
 	if err := vde.initControllers(rows); err != nil {
 		return err
 	}
-	vde.updateStats()
 
 	// At this point we've fully and successfully opened so begin
 	// retrying error'd VDiffs until the engine is closed.
@@ -212,7 +214,7 @@ func (vde *Engine) retry(ctx context.Context, err error) {
 // addController creates a new controller using the given vdiff record and adds it to the engine.
 // You must already have the main engine mutex (mu) locked before calling this.
 func (vde *Engine) addController(row sqltypes.RowNamedValues, options *tabletmanagerdata.VDiffOptions) error {
-	ct, err := newController(vde.ctx, row, vde.dbClientFactoryDba, vde.ts, vde, options)
+	ct, err := newController(row, vde.dbClientFactoryDba, vde.ts, vde, options)
 	if err != nil {
 		return fmt.Errorf("controller could not be initialized for stream %+v on tablet %v",
 			row, vde.thisTablet.Alias)
@@ -221,6 +223,10 @@ func (vde *Engine) addController(row sqltypes.RowNamedValues, options *tabletman
 	globalStats.mu.Lock()
 	defer globalStats.mu.Unlock()
 	globalStats.controllers[ct.id] = ct
+
+	controllerCtx, cancel := context.WithCancel(vde.ctx)
+	ct.cancel = cancel
+	go ct.run(controllerCtx)
 	return nil
 }
 
@@ -395,16 +401,4 @@ func (vde *Engine) resetControllers() {
 		ct.Stop()
 	}
 	vde.controllers = make(map[int64]*controller)
-	vde.updateStats()
-}
-
-// updateStats must only be called while holding the engine lock.
-func (vre *Engine) updateStats() {
-	globalStats.mu.Lock()
-	defer globalStats.mu.Unlock()
-
-	globalStats.controllers = make(map[int64]*controller, len(vre.controllers))
-	for id, ct := range vre.controllers {
-		globalStats.controllers[id] = ct
-	}
 }
diff --git a/go/vt/vttablet/tabletmanager/vdiff/framework_test.go b/go/vt/vttablet/tabletmanager/vdiff/framework_test.go
index 563741fcd23..4c1c7e8f3b8 100644
--- a/go/vt/vttablet/tabletmanager/vdiff/framework_test.go
+++ b/go/vt/vttablet/tabletmanager/vdiff/framework_test.go
@@ -676,8 +676,7 @@ func (tvde *testVDiffEnv) createController(t *testing.T, id int) *controller {
 		fmt.Sprintf("%d|%s|%s|%s|%s|%s|%s|%s|", id, uuid.New(), tvde.workflow, tstenv.KeyspaceName, tstenv.ShardName, vdiffDBName, PendingState, optionsJS),
 	)
 	tvde.dbClient.ExpectRequest(fmt.Sprintf("select * from _vt.vdiff where id = %d", id), noResults, nil)
-	ct, err := newController(context.Background(), controllerQR.Named().Row(), tvde.dbClientFactory, tstenv.TopoServ, tvde.vde, tvde.opts)
-	require.NoError(t, err)
+	ct := tvde.newController(t, controllerQR)
 	ct.sources = map[string]*migrationSource{
 		tstenv.ShardName: {
 			vrID: 1,
@@ -688,5 +687,16 @@ func (tvde *testVDiffEnv) createController(t *testing.T, id int) *controller {
 		},
 	}
 	ct.sourceKeyspace = tstenv.KeyspaceName
+
+	return ct
+}
+
+func (tvde *testVDiffEnv) newController(t *testing.T, controllerQR *sqltypes.Result) *controller {
+	ctx := context.Background()
+	ct, err := newController(controllerQR.Named().Row(), tvde.dbClientFactory, tstenv.TopoServ, tvde.vde, tvde.opts)
+	require.NoError(t, err)
+	ctx2, cancel := context.WithCancel(ctx)
+	ct.cancel = cancel
+	go ct.run(ctx2)
 	return ct
 }
diff --git a/go/vt/vttablet/tabletmanager/vdiff/stats.go b/go/vt/vttablet/tabletmanager/vdiff/stats.go
index 04cda6ac0c1..ae59884e6c2 100644
--- a/go/vt/vttablet/tabletmanager/vdiff/stats.go
+++ b/go/vt/vttablet/tabletmanager/vdiff/stats.go
@@ -44,11 +44,18 @@ type vdiffStats struct {
 	RowsDiffedCount     *stats.Counter
 }
 
+func (vds *vdiffStats) initControllerStats() {
+	vds.mu.Lock()
+	defer vds.mu.Unlock()
+	vds.controllers = make(map[int64]*controller)
+}
+
 func (vds *vdiffStats) register() {
 	globalStats.Count = stats.NewGauge("", "")
 	globalStats.ErrorCount = stats.NewCounter("", "")
 	globalStats.RestartedTableDiffs = stats.NewCountersWithSingleLabel("", "", "Table")
 	globalStats.RowsDiffedCount = stats.NewCounter("", "")
+	globalStats.initControllerStats()
 
 	stats.NewGaugeFunc("VDiffCount", "Number of current vdiffs", vds.numControllers)
 
diff --git a/go/vt/vttablet/tabletmanager/vdiff/workflow_differ_test.go b/go/vt/vttablet/tabletmanager/vdiff/workflow_differ_test.go
index 5ac0fabd726..9d6f4050a64 100644
--- a/go/vt/vttablet/tabletmanager/vdiff/workflow_differ_test.go
+++ b/go/vt/vttablet/tabletmanager/vdiff/workflow_differ_test.go
@@ -17,7 +17,6 @@ limitations under the License.
 package vdiff
 
 import (
-	"context"
 	"fmt"
 	"strings"
 	"testing"
@@ -49,8 +48,7 @@ func TestBuildPlanSuccess(t *testing.T) {
 	)
 
 	vdiffenv.dbClient.ExpectRequest("select * from _vt.vdiff where id = 1", noResults, nil)
-	ct, err := newController(context.Background(), controllerQR.Named().Row(), vdiffenv.dbClientFactory, tstenv.TopoServ, vdiffenv.vde, vdiffenv.opts)
-	require.NoError(t, err)
+	ct := vdenv.newController(t, controllerQR)
 	ct.sources = map[string]*migrationSource{
 		tstenv.ShardName: {
 			vrID: 1,
@@ -698,9 +696,7 @@ func TestBuildPlanFailure(t *testing.T) {
 		fmt.Sprintf("1|%s|%s|%s|%s|%s|%s|%s|", UUID, vdiffenv.workflow, tstenv.KeyspaceName, tstenv.ShardName, vdiffDBName, PendingState, optionsJS),
 	)
 	vdiffenv.dbClient.ExpectRequest("select * from _vt.vdiff where id = 1", noResults, nil)
-	ct, err := newController(context.Background(), controllerQR.Named().Row(), vdiffenv.dbClientFactory, tstenv.TopoServ, vdiffenv.vde, vdiffenv.opts)
-	require.NoError(t, err)
-
+	ct := vdenv.newController(t, controllerQR)
 	testcases := []struct {
 		input *binlogdatapb.Rule
 		err   string

From b461dcdd13b7f6b0ff412580c031405eb79a8052 Mon Sep 17 00:00:00 2001
From: Florent Poinsard <35779988+frouioui@users.noreply.github.com>
Date: Tue, 4 Feb 2025 12:43:54 -0600
Subject: [PATCH 23/68] Fix golang dependencies upgrade workflow (#17692)

Signed-off-by: Florent Poinsard <florent.poinsard@outlook.fr>
---
 .github/workflows/update_golang_dependencies.yml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/update_golang_dependencies.yml b/.github/workflows/update_golang_dependencies.yml
index e2a3e7bd847..3bf7f71b832 100644
--- a/.github/workflows/update_golang_dependencies.yml
+++ b/.github/workflows/update_golang_dependencies.yml
@@ -16,17 +16,17 @@ jobs:
     name: Update Golang Dependencies
     runs-on: ubuntu-24.04
     steps:
-      - name: Set up Go
-        uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2
-        with:
-          go-version-file: go.mod
-
       - name: Check out code
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           ref: main
           persist-credentials: 'false'
 
+      - name: Set up Go
+        uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2
+        with:
+          go-version-file: go.mod
+
       - name: Upgrade the Golang Dependencies
         id: detect-and-update
         run: |

From f880198a4c392e02e7a1217f128ac5a9a9fa0dcd Mon Sep 17 00:00:00 2001
From: Shlomi Noach <2607934+shlomi-noach@users.noreply.github.com>
Date: Tue, 4 Feb 2025 20:48:35 +0200
Subject: [PATCH 24/68] Supporting `InnoDBParallelReadThreadsCapability`
 (#17689)

Signed-off-by: Shlomi Noach <2607934+shlomi-noach@users.noreply.github.com>
---
 go/mysql/capabilities/capability.go      |  3 +++
 go/mysql/capabilities/capability_test.go | 15 +++++++++++++++
 2 files changed, 18 insertions(+)

diff --git a/go/mysql/capabilities/capability.go b/go/mysql/capabilities/capability.go
index eac25585089..1877caf11d6 100644
--- a/go/mysql/capabilities/capability.go
+++ b/go/mysql/capabilities/capability.go
@@ -42,6 +42,7 @@ const (
 	InstantExpandEnumCapability                                           //
 	InstantChangeColumnVisibilityCapability                               //
 	MySQLUpgradeInServerFlavorCapability                                  //
+	InnoDBParallelReadThreadsCapability                                   // Supported in 8.0.14 and above, introducing innodb_parallel_read_threads variable
 	DynamicRedoLogCapacityFlavorCapability                                // supported in MySQL 8.0.30 and above: https://dev.mysql.com/doc/relnotes/mysql/8.0/en/news-8-0-30.html
 	DisableRedoLogFlavorCapability                                        // supported in MySQL 8.0.21 and above: https://dev.mysql.com/doc/relnotes/mysql/8.0/en/news-8-0-21.html
 	CheckConstraintsCapability                                            // supported in MySQL 8.0.16 and above: https://dev.mysql.com/doc/relnotes/mysql/8.0/en/news-8-0-16.html
@@ -100,6 +101,8 @@ func MySQLVersionHasCapability(serverVersion string, capability FlavorCapability
 		return atLeast(8, 0, 1)
 	case PerformanceSchemaMetadataLocksTableCapability:
 		return atLeast(8, 0, 2)
+	case InnoDBParallelReadThreadsCapability:
+		return atLeast(8, 0, 14)
 	case MySQLUpgradeInServerFlavorCapability:
 		return atLeast(8, 0, 16)
 	case CheckConstraintsCapability:
diff --git a/go/mysql/capabilities/capability_test.go b/go/mysql/capabilities/capability_test.go
index cf5e693840e..ea8458ba2ff 100644
--- a/go/mysql/capabilities/capability_test.go
+++ b/go/mysql/capabilities/capability_test.go
@@ -154,6 +154,21 @@ func TestMySQLVersionCapableOf(t *testing.T) {
 			capability: TransactionalGtidExecutedFlavorCapability,
 			isCapable:  false,
 		},
+		{
+			version:    "8.0.13",
+			capability: InnoDBParallelReadThreadsCapability,
+			isCapable:  false,
+		},
+		{
+			version:    "8.0.14",
+			capability: InnoDBParallelReadThreadsCapability,
+			isCapable:  true,
+		},
+		{
+			version:    "8.4.1",
+			capability: InnoDBParallelReadThreadsCapability,
+			isCapable:  true,
+		},
 		{
 			version:    "8.0.30",
 			capability: DynamicRedoLogCapacityFlavorCapability,

From 5d439cd82e7f561e737da447e787f28ae88a98ef Mon Sep 17 00:00:00 2001
From: vitess-bot <139342327+vitess-bot@users.noreply.github.com>
Date: Tue, 4 Feb 2025 15:13:38 -0600
Subject: [PATCH 25/68] Upgrade the Golang Dependencies (#17695)

Signed-off-by: GitHub <noreply@github.com>
Signed-off-by: Dirkjan Bussink <d.bussink@gmail.com>
Co-authored-by: dbussink <dbussink@users.noreply.github.com>
Co-authored-by: Dirkjan Bussink <d.bussink@gmail.com>
---
 go.mod                   |  84 +++++++++----------
 go.sum                   | 171 ++++++++++++++++++++-------------------
 go/cache/theine/store.go |   2 +-
 3 files changed, 129 insertions(+), 128 deletions(-)

diff --git a/go.mod b/go.mod
index 30d7ead741c..d4e98fda37a 100644
--- a/go.mod
+++ b/go.mod
@@ -14,7 +14,7 @@ require (
 	github.com/cespare/xxhash/v2 v2.3.0
 	github.com/corpix/uarand v0.1.1 // indirect
 	github.com/dave/jennifer v1.7.1
-	github.com/evanphx/json-patch v5.9.0+incompatible
+	github.com/evanphx/json-patch v5.9.11+incompatible
 	github.com/fsnotify/fsnotify v1.8.0
 	github.com/go-sql-driver/mysql v1.7.1
 	github.com/golang/glog v1.2.4
@@ -38,7 +38,7 @@ require (
 	github.com/minio/minio-go v0.0.0-20190131015406-c8a261de75c1
 	github.com/montanaflynn/stats v0.7.1
 	github.com/olekukonko/tablewriter v0.0.5
-	github.com/opentracing-contrib/go-grpc v0.1.0
+	github.com/opentracing-contrib/go-grpc v0.1.1
 	github.com/opentracing/opentracing-go v1.2.0
 	github.com/patrickmn/go-cache v2.1.0+incompatible
 	github.com/philhofer/fwd v1.1.3-0.20240916144458-20a13a1f6b7c // indirect
@@ -57,7 +57,7 @@ require (
 	github.com/stretchr/testify v1.10.0
 	github.com/tchap/go-patricia v2.3.0+incompatible
 	github.com/tidwall/gjson v1.18.0
-	github.com/tinylib/msgp v1.2.4 // indirect
+	github.com/tinylib/msgp v1.2.5 // indirect
 	github.com/uber/jaeger-client-go v2.30.0+incompatible
 	github.com/uber/jaeger-lib v2.4.1+incompatible // indirect
 	github.com/yudai/golcs v0.0.0-20170316035057-ecda9a501e82
@@ -67,16 +67,16 @@ require (
 	go.etcd.io/etcd/client/v3 v3.5.18
 	go.uber.org/mock v0.5.0
 	golang.org/x/crypto v0.32.0 // indirect
-	golang.org/x/mod v0.22.0 // indirect
+	golang.org/x/mod v0.23.0 // indirect
 	golang.org/x/net v0.34.0
-	golang.org/x/oauth2 v0.25.0
-	golang.org/x/sys v0.29.0
-	golang.org/x/term v0.28.0
-	golang.org/x/text v0.21.0 // indirect
-	golang.org/x/time v0.9.0
+	golang.org/x/oauth2 v0.26.0
+	golang.org/x/sys v0.30.0
+	golang.org/x/term v0.29.0
+	golang.org/x/text v0.22.0 // indirect
+	golang.org/x/time v0.10.0
 	golang.org/x/tools v0.29.0
 	google.golang.org/api v0.219.0
-	google.golang.org/genproto v0.0.0-20250127172529-29210b9bc287 // indirect
+	google.golang.org/genproto v0.0.0-20250204164813-702378808489 // indirect
 	google.golang.org/grpc v1.70.0
 	google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.5.1
 	google.golang.org/grpc/examples v0.0.0-20250204041003-947e2a4be2ba
@@ -90,26 +90,26 @@ require (
 require (
 	github.com/DataDog/datadog-go/v5 v5.6.0
 	github.com/Shopify/toxiproxy/v2 v2.11.0
-	github.com/aws/aws-sdk-go-v2 v1.32.8
-	github.com/aws/aws-sdk-go-v2/config v1.28.9
-	github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.17.37
-	github.com/aws/aws-sdk-go-v2/service/s3 v1.66.3
-	github.com/aws/smithy-go v1.22.1
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/config v1.29.4
+	github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.17.57
+	github.com/aws/aws-sdk-go-v2/service/s3 v1.75.2
+	github.com/aws/smithy-go v1.22.2
 	github.com/bndr/gotabulate v1.1.2
 	github.com/dustin/go-humanize v1.0.1
-	github.com/gammazero/deque v0.2.1
+	github.com/gammazero/deque v1.0.0
 	github.com/google/safehtml v0.1.0
 	github.com/hashicorp/go-version v1.7.0
 	github.com/kr/pretty v0.3.1
 	github.com/kr/text v0.2.0
-	github.com/mitchellh/mapstructure v1.5.0
+	github.com/mitchellh/mapstructure v1.5.1-0.20231216201459-8508981c8b6c
 	github.com/nsf/jsondiff v0.0.0-20210926074059-1e845ec5d249
 	github.com/spf13/afero v1.12.0
 	github.com/spf13/jwalterweatherman v1.1.0
 	github.com/xlab/treeprint v1.2.0
 	go.uber.org/goleak v1.3.0
 	golang.org/x/exp v0.0.0-20250128182459-e0ece0dbea4c
-	golang.org/x/sync v0.10.0
+	golang.org/x/sync v0.11.0
 	gonum.org/v1/gonum v0.15.1
 	modernc.org/sqlite v1.34.5
 )
@@ -122,39 +122,39 @@ require (
 	cloud.google.com/go/compute/metadata v0.6.0 // indirect
 	cloud.google.com/go/iam v1.3.1 // indirect
 	cloud.google.com/go/monitoring v1.23.0 // indirect
-	github.com/DataDog/appsec-internal-go v1.9.0 // indirect
-	github.com/DataDog/datadog-agent/pkg/obfuscate v0.59.0 // indirect
-	github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.59.0 // indirect
+	github.com/DataDog/appsec-internal-go v1.10.0 // indirect
+	github.com/DataDog/datadog-agent/pkg/obfuscate v0.62.1 // indirect
+	github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.62.1 // indirect
 	github.com/DataDog/go-libddwaf/v3 v3.5.1 // indirect
-	github.com/DataDog/go-sqllexer v0.0.17 // indirect
+	github.com/DataDog/go-sqllexer v0.0.20 // indirect
 	github.com/DataDog/go-tuf v1.1.0-0.5.2 // indirect
 	github.com/DataDog/sketches-go v1.4.6 // indirect
 	github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.26.0 // indirect
 	github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/metric v0.50.0 // indirect
 	github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.50.0 // indirect
 	github.com/Microsoft/go-winio v0.6.2 // indirect
-	github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.6 // indirect
-	github.com/aws/aws-sdk-go-v2/credentials v1.17.50 // indirect
-	github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.23 // indirect
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.27 // indirect
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.27 // indirect
-	github.com/aws/aws-sdk-go-v2/internal/ini v1.8.1 // indirect
-	github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.23 // indirect
-	github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.12.1 // indirect
-	github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.4.4 // indirect
-	github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.8 // indirect
-	github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.18.4 // indirect
-	github.com/aws/aws-sdk-go-v2/service/sso v1.24.9 // indirect
-	github.com/aws/aws-sdk-go-v2/service/ssooidc v1.28.8 // indirect
-	github.com/aws/aws-sdk-go-v2/service/sts v1.33.5 // indirect
+	github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.8 // indirect
+	github.com/aws/aws-sdk-go-v2/credentials v1.17.57 // indirect
+	github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.27 // indirect
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31 // indirect
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31 // indirect
+	github.com/aws/aws-sdk-go-v2/internal/ini v1.8.2 // indirect
+	github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.31 // indirect
+	github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.12.2 // indirect
+	github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.5.5 // indirect
+	github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.12 // indirect
+	github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.18.12 // indirect
+	github.com/aws/aws-sdk-go-v2/service/sso v1.24.14 // indirect
+	github.com/aws/aws-sdk-go-v2/service/ssooidc v1.28.13 // indirect
+	github.com/aws/aws-sdk-go-v2/service/sts v1.33.12 // indirect
 	github.com/beorn7/perks v1.0.1 // indirect
 	github.com/cncf/xds/go v0.0.0-20250121191232-2f005788dc42 // indirect
 	github.com/coreos/go-semver v0.3.1 // indirect
 	github.com/coreos/go-systemd/v22 v22.5.0 // indirect
-	github.com/cpuguy83/go-md2man/v2 v2.0.5 // indirect
+	github.com/cpuguy83/go-md2man/v2 v2.0.6 // indirect
 	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
 	github.com/eapache/queue/v2 v2.0.0-20230407133247-75960ed334e4 // indirect
-	github.com/ebitengine/purego v0.8.1 // indirect
+	github.com/ebitengine/purego v0.8.2 // indirect
 	github.com/envoyproxy/go-control-plane/envoy v1.32.4 // indirect
 	github.com/envoyproxy/protoc-gen-validate v1.2.1 // indirect
 	github.com/fatih/color v1.18.0 // indirect
@@ -171,7 +171,7 @@ require (
 	github.com/hashicorp/go-metrics v0.5.4 // indirect
 	github.com/hashicorp/go-multierror v1.1.1 // indirect
 	github.com/hashicorp/go-rootcerts v1.0.2 // indirect
-	github.com/hashicorp/go-secure-stdlib/parseutil v0.1.8 // indirect
+	github.com/hashicorp/go-secure-stdlib/parseutil v0.1.9 // indirect
 	github.com/hashicorp/go-secure-stdlib/strutil v0.1.2 // indirect
 	github.com/hashicorp/go-sockaddr v1.0.7 // indirect
 	github.com/hashicorp/golang-lru v1.0.2 // indirect
@@ -198,7 +198,7 @@ require (
 	github.com/ryanuber/go-glob v1.0.0 // indirect
 	github.com/sagikazarmark/locafero v0.7.0 // indirect
 	github.com/sagikazarmark/slog-shim v0.1.0 // indirect
-	github.com/secure-systems-lab/go-securesystemslib v0.8.0 // indirect
+	github.com/secure-systems-lab/go-securesystemslib v0.9.0 // indirect
 	github.com/sourcegraph/conc v0.3.0 // indirect
 	github.com/spf13/cast v1.7.1 // indirect
 	github.com/subosito/gotenv v1.6.0 // indirect
@@ -217,8 +217,8 @@ require (
 	go.uber.org/multierr v1.11.0 // indirect
 	go.uber.org/zap v1.27.0 // indirect
 	golang.org/x/xerrors v0.0.0-20240903120638-7835f813f4da // indirect
-	google.golang.org/genproto/googleapis/api v0.0.0-20250127172529-29210b9bc287 // indirect
-	google.golang.org/genproto/googleapis/rpc v0.0.0-20250127172529-29210b9bc287 // indirect
+	google.golang.org/genproto/googleapis/api v0.0.0-20250204164813-702378808489 // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20250204164813-702378808489 // indirect
 	gopkg.in/ini.v1 v1.67.0 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
diff --git a/go.sum b/go.sum
index 71a594c1408..b4d8092871b 100644
--- a/go.sum
+++ b/go.sum
@@ -40,19 +40,19 @@ github.com/Azure/go-autorest/logger v0.2.1/go.mod h1:T9E3cAhj2VqvPOtCYAvby9aBXkZ
 github.com/Azure/go-autorest/tracing v0.6.0 h1:TYi4+3m5t6K48TGI9AUdb+IzbnSxvnvUMfuitfgcfuo=
 github.com/Azure/go-autorest/tracing v0.6.0/go.mod h1:+vhtPC754Xsa23ID7GlGsrdKBpUA79WCAKPPZVC2DeU=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
-github.com/DataDog/appsec-internal-go v1.9.0 h1:cGOneFsg0JTRzWl5U2+og5dbtyW3N8XaYwc5nXe39Vw=
-github.com/DataDog/appsec-internal-go v1.9.0/go.mod h1:wW0cRfWBo4C044jHGwYiyh5moQV2x0AhnwqMuiX7O/g=
-github.com/DataDog/datadog-agent/pkg/obfuscate v0.59.0 h1:uX6/XoKMS7KYXe+R+vwgw+eRdmn16xfa9PDF5dxgumE=
-github.com/DataDog/datadog-agent/pkg/obfuscate v0.59.0/go.mod h1:ATVw8kr3U1Eqz3qBz9kS6WFDKji9XyoAsHKSlj3hPTM=
-github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.59.0 h1:9C8TVNz0IiNoD6tuEKPY/vMIUjB7kN0OaLyImhatWjg=
-github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.59.0/go.mod h1:c4th0IFaP0Q1ofRa0GcPB9hJWN+cmUoEfOI1Ub0O50A=
+github.com/DataDog/appsec-internal-go v1.10.0 h1:RlY1FXYeaDCHs5fbhcs5x/MxZYUwg53LOy+iSj0iHsU=
+github.com/DataDog/appsec-internal-go v1.10.0/go.mod h1:9eYpAdKZF4Pz49qOmNL+OSVFHjhkZrBdBBjmAwBeN5c=
+github.com/DataDog/datadog-agent/pkg/obfuscate v0.62.1 h1:Zw5TNfv9863OlFn5ZUtLi/Ghc9xAzIw0zrcbsgtiM+Y=
+github.com/DataDog/datadog-agent/pkg/obfuscate v0.62.1/go.mod h1:ZMCwrRdccdTW9hERhTQfTXEXeYr/NYNl86E5KxRMcSk=
+github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.62.1 h1:SC291g9TsblQBlJhF0DWgtRJ8aNB15Xfa5JQ4GWKE1I=
+github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.62.1/go.mod h1:yhdpD1VkSNoJ3MwsEUIe5UiPiZaaD1SnHLV/QasRfoo=
 github.com/DataDog/datadog-go v3.2.0+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ=
 github.com/DataDog/datadog-go/v5 v5.6.0 h1:2oCLxjF/4htd55piM75baflj/KoE6VYS7alEUqFvRDw=
 github.com/DataDog/datadog-go/v5 v5.6.0/go.mod h1:K9kcYBlxkcPP8tvvjZZKs/m1edNAUFzBbdpTUKfCsuw=
 github.com/DataDog/go-libddwaf/v3 v3.5.1 h1:GWA4ln4DlLxiXm+X7HA/oj0ZLcdCwOS81KQitegRTyY=
 github.com/DataDog/go-libddwaf/v3 v3.5.1/go.mod h1:n98d9nZ1gzenRSk53wz8l6d34ikxS+hs62A31Fqmyi4=
-github.com/DataDog/go-sqllexer v0.0.17 h1:u47fJAVg/+5DA74ZW3w0Qu+3qXHd3GtnA8ZBYixdPrM=
-github.com/DataDog/go-sqllexer v0.0.17/go.mod h1:KwkYhpFEVIq+BfobkTC1vfqm4gTi65skV/DpDBXtexc=
+github.com/DataDog/go-sqllexer v0.0.20 h1:0fBknHo42yuhawZS3GtuQSdqcwaiojWjYNT6OdsZRfI=
+github.com/DataDog/go-sqllexer v0.0.20/go.mod h1:KwkYhpFEVIq+BfobkTC1vfqm4gTi65skV/DpDBXtexc=
 github.com/DataDog/go-tuf v1.1.0-0.5.2 h1:4CagiIekonLSfL8GMHRHcHudo1fQnxELS9g4tiAupQ4=
 github.com/DataDog/go-tuf v1.1.0-0.5.2/go.mod h1:zBcq6f654iVqmkk8n2Cx81E1JnNTMOAx1UEO/wZR+P0=
 github.com/DataDog/gostackparse v0.7.0 h1:i7dLkXHvYzHV308hnkvVGDL3BR4FWl7IsXNPz/IGQh4=
@@ -86,44 +86,44 @@ github.com/aquarapid/vaultlib v0.5.1 h1:vuLWR6bZzLHybjJBSUYPgZlIp6KZ+SXeHLRRYTuk
 github.com/aquarapid/vaultlib v0.5.1/go.mod h1:yT7AlEXtuabkxylOc/+Ulyp18tff1+QjgNLTnFWTlOs=
 github.com/armon/go-metrics v0.4.1 h1:hR91U9KYmb6bLBYLQjyM+3j+rcd/UhE+G78SFnF8gJA=
 github.com/armon/go-metrics v0.4.1/go.mod h1:E6amYzXo6aW1tqzoZGT755KkbgrJsSdpwZ+3JqfkOG4=
-github.com/aws/aws-sdk-go-v2 v1.32.8 h1:cZV+NUS/eGxKXMtmyhtYPJ7Z4YLoI/V8bkTdRZfYhGo=
-github.com/aws/aws-sdk-go-v2 v1.32.8/go.mod h1:P5WJBrYqqbWVaOxgH0X/FYYD47/nooaPOZPlQdmiN2U=
-github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.6 h1:pT3hpW0cOHRJx8Y0DfJUEQuqPild8jRGmSFmBgvydr0=
-github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.6/go.mod h1:j/I2++U0xX+cr44QjHay4Cvxj6FUbnxrgmqN3H1jTZA=
-github.com/aws/aws-sdk-go-v2/config v1.28.9 h1:7/P2J1MGkava+2c9Xlk7CTPTpGqFAOaM4874wJsGi4Q=
-github.com/aws/aws-sdk-go-v2/config v1.28.9/go.mod h1:ce/HX8tHlIh4VTPaLz/aQIvA5+/rUghFy+nGMrXHQ9U=
-github.com/aws/aws-sdk-go-v2/credentials v1.17.50 h1:63pBzfU7EG4RbMMVRv4Hgm34cIaPXICCnHojKdPbTR0=
-github.com/aws/aws-sdk-go-v2/credentials v1.17.50/go.mod h1:m5ThO5y87w0fiAHBt9cYXS5BVsebOeJEFCGUQeZZYLw=
-github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.23 h1:IBAoD/1d8A8/1aA8g4MBVtTRHhXRiNAgwdbo/xRM2DI=
-github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.23/go.mod h1:vfENuCM7dofkgKpYzuzf1VT1UKkA/YL3qanfBn7HCaA=
-github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.17.37 h1:jHKR76E81sZvz1+x1vYYrHMxphG5LFBJPhSqEr4CLlE=
-github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.17.37/go.mod h1:iMkyPkmoJWQKzSOtaX+8oEJxAuqr7s8laxcqGDSHeII=
-github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.27 h1:jSJjSBzw8VDIbWv+mmvBSP8ezsztMYJGH+eKqi9AmNs=
-github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.27/go.mod h1:/DAhLbFRgwhmvJdOfSm+WwikZrCuUJiA4WgJG0fTNSw=
-github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.27 h1:l+X4K77Dui85pIj5foXDhPlnqcNRG2QUyvca300lXh8=
-github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.27/go.mod h1:KvZXSFEXm6x84yE8qffKvT3x8J5clWnVFXphpohhzJ8=
-github.com/aws/aws-sdk-go-v2/internal/ini v1.8.1 h1:VaRN3TlFdd6KxX1x3ILT5ynH6HvKgqdiXoTxAF4HQcQ=
-github.com/aws/aws-sdk-go-v2/internal/ini v1.8.1/go.mod h1:FbtygfRFze9usAadmnGJNc8KsP346kEe+y2/oyhGAGc=
-github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.23 h1:1SZBDiRzzs3sNhOMVApyWPduWYGAX0imGy06XiBnCAM=
-github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.23/go.mod h1:i9TkxgbZmHVh2S0La6CAXtnyFhlCX/pJ0JsOvBAS6Mk=
-github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.12.1 h1:iXtILhvDxB6kPvEXgsDhGaZCSC6LQET5ZHSdJozeI0Y=
-github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.12.1/go.mod h1:9nu0fVANtYiAePIBh2/pFUSwtJ402hLnp854CNoDOeE=
-github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.4.4 h1:aaPpoG15S2qHkWm4KlEyF01zovK1nW4BBbyXuHNSE90=
-github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.4.4/go.mod h1:eD9gS2EARTKgGr/W5xwgY/ik9z/zqpW+m/xOQbVxrMk=
-github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.8 h1:cWno7lefSH6Pp+mSznagKCgfDGeZRin66UvYUqAkyeA=
-github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.8/go.mod h1:tPD+VjU3ABTBoEJ3nctu5Nyg4P4yjqSH5bJGGkY4+XE=
-github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.18.4 h1:E5ZAVOmI2apR8ADb72Q63KqwwwdW1XcMeXIlrZ1Psjg=
-github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.18.4/go.mod h1:wezzqVUOVVdk+2Z/JzQT4NxAU0NbhRe5W8pIE72jsWI=
-github.com/aws/aws-sdk-go-v2/service/s3 v1.66.3 h1:neNOYJl72bHrz9ikAEED4VqWyND/Po0DnEx64RW6YM4=
-github.com/aws/aws-sdk-go-v2/service/s3 v1.66.3/go.mod h1:TMhLIyRIyoGVlaEMAt+ITMbwskSTpcGsCPDq91/ihY0=
-github.com/aws/aws-sdk-go-v2/service/sso v1.24.9 h1:YqtxripbjWb2QLyzRK9pByfEDvgg95gpC2AyDq4hFE8=
-github.com/aws/aws-sdk-go-v2/service/sso v1.24.9/go.mod h1:lV8iQpg6OLOfBnqbGMBKYjilBlf633qwHnBEiMSPoHY=
-github.com/aws/aws-sdk-go-v2/service/ssooidc v1.28.8 h1:6dBT1Lz8fK11m22R+AqfRsFn8320K0T5DTGxxOQBSMw=
-github.com/aws/aws-sdk-go-v2/service/ssooidc v1.28.8/go.mod h1:/kiBvRQXBc6xeJTYzhSdGvJ5vm1tjaDEjH+MSeRJnlY=
-github.com/aws/aws-sdk-go-v2/service/sts v1.33.5 h1:URp6kw3vHAnuU9pgP4K1SohwWLDzgtqA/qgeBfgBxn0=
-github.com/aws/aws-sdk-go-v2/service/sts v1.33.5/go.mod h1:+8h7PZb3yY5ftmVLD7ocEoE98hdc8PoKS0H3wfx1dlc=
-github.com/aws/smithy-go v1.22.1 h1:/HPHZQ0g7f4eUeK6HKglFz8uwVfZKgoI25rb/J+dnro=
-github.com/aws/smithy-go v1.22.1/go.mod h1:irrKGvNn1InZwb2d7fkIRNucdfwR8R+Ts3wxYa/cJHg=
+github.com/aws/aws-sdk-go-v2 v1.36.0 h1:b1wM5CcE65Ujwn565qcwgtOTT1aT4ADOHHgglKjG7fk=
+github.com/aws/aws-sdk-go-v2 v1.36.0/go.mod h1:5PMILGVKiW32oDzjj6RU52yrNrDPUHcbZQYr1sM7qmM=
+github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.8 h1:zAxi9p3wsZMIaVCdoiQp2uZ9k1LsZvmAnoTBeZPXom0=
+github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.8/go.mod h1:3XkePX5dSaxveLAYY7nsbsZZrKxCyEuE5pM4ziFxyGg=
+github.com/aws/aws-sdk-go-v2/config v1.29.4 h1:ObNqKsDYFGr2WxnoXKOhCvTlf3HhwtoGgc+KmZ4H5yg=
+github.com/aws/aws-sdk-go-v2/config v1.29.4/go.mod h1:j2/AF7j/qxVmsNIChw1tWfsVKOayJoGRDjg1Tgq7NPk=
+github.com/aws/aws-sdk-go-v2/credentials v1.17.57 h1:kFQDsbdBAR3GZsB8xA+51ptEnq9TIj3tS4MuP5b+TcQ=
+github.com/aws/aws-sdk-go-v2/credentials v1.17.57/go.mod h1:2kerxPUUbTagAr/kkaHiqvj/bcYHzi2qiJS/ZinllU0=
+github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.27 h1:7lOW8NUwE9UZekS1DYoiPdVAqZ6A+LheHWb+mHbNOq8=
+github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.27/go.mod h1:w1BASFIPOPUae7AgaH4SbjNbfdkxuggLyGfNFTn8ITY=
+github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.17.57 h1:4hFrvTb32jty/LpKdIwWhMgqITPxNo9l1X1hjUyVCZ4=
+github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.17.57/go.mod h1:n6n8rfggAVPgDVldL1zk9QUzIWImRb6OWI8t9CfDImM=
+github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31 h1:lWm9ucLSRFiI4dQQafLrEOmEDGry3Swrz0BIRdiHJqQ=
+github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31/go.mod h1:Huu6GG0YTfbPphQkDSo4dEGmQRTKb9k9G7RdtyQWxuI=
+github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31 h1:ACxDklUKKXb48+eg5ROZXi1vDgfMyfIA/WyvqHcHI0o=
+github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31/go.mod h1:yadnfsDwqXeVaohbGc/RaD287PuyRw2wugkh5ZL2J6k=
+github.com/aws/aws-sdk-go-v2/internal/ini v1.8.2 h1:Pg9URiobXy85kgFev3og2CuOZ8JZUBENF+dcgWBaYNk=
+github.com/aws/aws-sdk-go-v2/internal/ini v1.8.2/go.mod h1:FbtygfRFze9usAadmnGJNc8KsP346kEe+y2/oyhGAGc=
+github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.31 h1:8IwBjuLdqIO1dGB+dZ9zJEl8wzY3bVYxcs0Xyu/Lsc0=
+github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.31/go.mod h1:8tMBcuVjL4kP/ECEIWTCWtwV2kj6+ouEKl4cqR4iWLw=
+github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.12.2 h1:D4oz8/CzT9bAEYtVhSBmFj2dNOtaHOtMKc2vHBwYizA=
+github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.12.2/go.mod h1:Za3IHqTQ+yNcRHxu1OFucBh0ACZT4j4VQFF0BqpZcLY=
+github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.5.5 h1:siiQ+jummya9OLPDEyHVb2dLW4aOMe22FGDd0sAfuSw=
+github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.5.5/go.mod h1:iHVx2J9pWzITdP5MJY6qWfG34TfD9EA+Qi3eV6qQCXw=
+github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.12 h1:O+8vD2rGjfihBewr5bT+QUfYUHIxCVgG61LHoT59shM=
+github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.12/go.mod h1:usVdWJaosa66NMvmCrr08NcWDBRv4E6+YFG2pUdw1Lk=
+github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.18.12 h1:tkVNm99nkJnFo1H9IIQb5QkCiPcvCDn3Pos+IeTbGRA=
+github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.18.12/go.mod h1:dIVlquSPUMqEJtx2/W17SM2SuESRaVEhEV9alcMqxjw=
+github.com/aws/aws-sdk-go-v2/service/s3 v1.75.2 h1:dyC+iA2+Yc7iDMDh0R4eT6fi8TgBduc+BOWCy6Br0/o=
+github.com/aws/aws-sdk-go-v2/service/s3 v1.75.2/go.mod h1:FHSHmyEUkzRbaFFqqm6bkLAOQHgqhsLmfCahvCBMiyA=
+github.com/aws/aws-sdk-go-v2/service/sso v1.24.14 h1:c5WJ3iHz7rLIgArznb3JCSQT3uUMiz9DLZhIX+1G8ok=
+github.com/aws/aws-sdk-go-v2/service/sso v1.24.14/go.mod h1:+JJQTxB6N4niArC14YNtxcQtwEqzS3o9Z32n7q33Rfs=
+github.com/aws/aws-sdk-go-v2/service/ssooidc v1.28.13 h1:f1L/JtUkVODD+k1+IiSJUUv8A++2qVr+Xvb3xWXETMU=
+github.com/aws/aws-sdk-go-v2/service/ssooidc v1.28.13/go.mod h1:tvqlFoja8/s0o+UruA1Nrezo/df0PzdunMDDurUfg6U=
+github.com/aws/aws-sdk-go-v2/service/sts v1.33.12 h1:fqg6c1KVrc3SYWma/egWue5rKI4G2+M4wMQN2JosNAA=
+github.com/aws/aws-sdk-go-v2/service/sts v1.33.12/go.mod h1:7Yn+p66q/jt38qMoVfNvjbm3D89mGBnkwDcijgtih8w=
+github.com/aws/smithy-go v1.22.2 h1:6D9hW43xKFrRx/tXXfAlIZc4JI+yQe6snnWcQyxSyLQ=
+github.com/aws/smithy-go v1.22.2/go.mod h1:irrKGvNn1InZwb2d7fkIRNucdfwR8R+Ts3wxYa/cJHg=
 github.com/benbjohnson/clock v1.1.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA=
 github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=
 github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8=
@@ -151,8 +151,8 @@ github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSV
 github.com/corpix/uarand v0.1.1 h1:RMr1TWc9F4n5jiPDzFHtmaUXLKLNUFK0SgCLo4BhX/U=
 github.com/corpix/uarand v0.1.1/go.mod h1:SFKZvkcRoLqVRFZ4u25xPmp6m9ktANfbpXZ7SJ0/FNU=
 github.com/cpuguy83/go-md2man/v2 v2.0.4/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
-github.com/cpuguy83/go-md2man/v2 v2.0.5 h1:ZtcqGrnekaHpVLArFSe4HK5DoKx1T0rq2DwVB0alcyc=
-github.com/cpuguy83/go-md2man/v2 v2.0.5/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
+github.com/cpuguy83/go-md2man/v2 v2.0.6 h1:XJtiaUW6dEEqVuZiMTn1ldk455QWwEIsMIJlo5vtkx0=
+github.com/cpuguy83/go-md2man/v2 v2.0.6/go.mod h1:oOW0eioCTA6cOiMLiUPZOpcVxMig6NIQQ7OS05n1F4g=
 github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
 github.com/dave/jennifer v1.7.1 h1:B4jJJDHelWcDhlRQxWeo0Npa/pYKBLrirAQoTN45txo=
 github.com/dave/jennifer v1.7.1/go.mod h1:nXbxhEmQfOZhWml3D1cDK5M1FLnMSozpbFN/m3RmGZc=
@@ -160,15 +160,16 @@ github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM=
 github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/dgryski/go-farm v0.0.0-20190423205320-6a90982ecee2 h1:tdlZCpZ/P9DhczCTSixgIKmwPv6+wP5DGjqLYw5SUiA=
 github.com/dgryski/go-farm v0.0.0-20190423205320-6a90982ecee2/go.mod h1:SqUrOPUnsFjfmXRMNPybcSiG0BgUW2AuFH8PAnS2iTw=
+github.com/dgryski/go-farm v0.0.0-20200201041132-a6ae2369ad13 h1:fAjc9m62+UWV/WAFKLNi6ZS0675eEUC9y3AlwSbQu1Y=
+github.com/dgryski/go-farm v0.0.0-20200201041132-a6ae2369ad13/go.mod h1:SqUrOPUnsFjfmXRMNPybcSiG0BgUW2AuFH8PAnS2iTw=
 github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk=
 github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkpeCY=
 github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto=
 github.com/eapache/queue/v2 v2.0.0-20230407133247-75960ed334e4 h1:8EXxF+tCLqaVk8AOC29zl2mnhQjwyLxxOTuhUazWRsg=
 github.com/eapache/queue/v2 v2.0.0-20230407133247-75960ed334e4/go.mod h1:I5sHm0Y0T1u5YjlyqC5GVArM7aNZRUYtTjmJ8mPJFds=
-github.com/ebitengine/purego v0.8.1 h1:sdRKd6plj7KYW33EH5As6YKfe8m9zbN9JMrOjNVF/BE=
-github.com/ebitengine/purego v0.8.1/go.mod h1:iIjxzd6CiRiOG0UyXP+V1+jWqUXVjPKLAI0mRfJZTmQ=
+github.com/ebitengine/purego v0.8.2 h1:jPPGWs2sZ1UgOSgD2bClL0MJIqu58nOmIcBuXr62z1I=
+github.com/ebitengine/purego v0.8.2/go.mod h1:iIjxzd6CiRiOG0UyXP+V1+jWqUXVjPKLAI0mRfJZTmQ=
 github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
 github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
 github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98=
@@ -181,8 +182,8 @@ github.com/envoyproxy/go-control-plane/ratelimit v0.1.0/go.mod h1:Wk+tMFAFbCXaJP
 github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
 github.com/envoyproxy/protoc-gen-validate v1.2.1 h1:DEo3O99U8j4hBFwbJfrz9VtgcDfUKS7KJ7spH3d86P8=
 github.com/envoyproxy/protoc-gen-validate v1.2.1/go.mod h1:d/C80l/jxXLdfEIhX1W2TmLfsJ31lvEjwamM4DxlWXU=
-github.com/evanphx/json-patch v5.9.0+incompatible h1:fBXyNpNMuTTDdquAq/uisOr2lShz4oaXpDTX2bLe7ls=
-github.com/evanphx/json-patch v5.9.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk=
+github.com/evanphx/json-patch v5.9.11+incompatible h1:ixHHqfcGvxhWkniF1tWxBHA0yb4Z+d1UQi45df52xW8=
+github.com/evanphx/json-patch v5.9.11+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk=
 github.com/fatih/color v1.13.0/go.mod h1:kLAiJbzzSOZDVNGyDpeOxJ47H46qBXwg5ILebYFFOfk=
 github.com/fatih/color v1.18.0 h1:S8gINlzdQ840/4pfAwic/ZE0djQEH3wM94VfqLTZcOM=
 github.com/fatih/color v1.18.0/go.mod h1:4FelSpRwEGDpQ12mAdzqdOukCy4u8WUtOY6lkT/6HfU=
@@ -196,8 +197,8 @@ github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMo
 github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ=
 github.com/fsnotify/fsnotify v1.8.0 h1:dAwr6QBTBZIkG8roQaJjGof0pp0EeF+tNV7YBP3F/8M=
 github.com/fsnotify/fsnotify v1.8.0/go.mod h1:8jBTzvmWwFyi3Pb8djgCCO5IBqzKJ/Jwo8TRcHyHii0=
-github.com/gammazero/deque v0.2.1 h1:qSdsbG6pgp6nL7A0+K/B7s12mcCY/5l5SIUpMOl+dC0=
-github.com/gammazero/deque v0.2.1/go.mod h1:LFroj8x4cMYCukHJDbxFCkT+r9AndaJnFMuZDV34tuU=
+github.com/gammazero/deque v1.0.0 h1:LTmimT8H7bXkkCy6gZX7zNLtkbz4NdS2z8LZuor3j34=
+github.com/gammazero/deque v1.0.0/go.mod h1:iflpYvtGfM3U8S8j+sZEKIak3SAKYpA5/SQewgfXDKo=
 github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
 github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
 github.com/go-kit/log v0.1.0/go.mod h1:zbhenjAZHb184qTLMA9ZjW7ThYL0H2mk7Q6pNt4vbaY=
@@ -302,8 +303,8 @@ github.com/hashicorp/go-multierror v1.1.1/go.mod h1:iw975J/qwKPdAO1clOe2L8331t/9
 github.com/hashicorp/go-retryablehttp v0.5.3/go.mod h1:9B5zBasrRhHXnJnui7y6sL7es7NDiJgTc6Er0maI1Xs=
 github.com/hashicorp/go-rootcerts v1.0.2 h1:jzhAVGtqPKbwpyCPELlgNWhE1znq+qwJtW5Oi2viEzc=
 github.com/hashicorp/go-rootcerts v1.0.2/go.mod h1:pqUvnprVnM5bf7AOirdbb01K4ccR319Vf4pU3K5EGc8=
-github.com/hashicorp/go-secure-stdlib/parseutil v0.1.8 h1:iBt4Ew4XEGLfh6/bPk4rSYmuZJGizr6/x/AEizP0CQc=
-github.com/hashicorp/go-secure-stdlib/parseutil v0.1.8/go.mod h1:aiJI+PIApBRQG7FZTEBx5GiiX+HbOHilUdNxUZi4eV0=
+github.com/hashicorp/go-secure-stdlib/parseutil v0.1.9 h1:FW0YttEnUNDJ2WL9XcrrfteS1xW8u+sh4ggM8pN5isQ=
+github.com/hashicorp/go-secure-stdlib/parseutil v0.1.9/go.mod h1:Ll013mhdmsVDuoIXVfBtvgGJsXDYkTw1kooNcoCXuE0=
 github.com/hashicorp/go-secure-stdlib/strutil v0.1.2 h1:kes8mmyCpxJsI7FTwtzRqEy9CdjCtrXrXGuOpxEA7Ts=
 github.com/hashicorp/go-secure-stdlib/strutil v0.1.2/go.mod h1:Gou2R9+il93BqX25LAKCLuM+y9U2T4hlwvT1yprcna4=
 github.com/hashicorp/go-sockaddr v1.0.7 h1:G+pTkSO01HpR5qCxg7lxfsFEZaG+C0VssTy/9dbT+Fw=
@@ -379,8 +380,8 @@ github.com/minio/minio-go v0.0.0-20190131015406-c8a261de75c1 h1:jw16EimP5oAEM/2w
 github.com/minio/minio-go v0.0.0-20190131015406-c8a261de75c1/go.mod h1:vuvdOZLJuf5HmJAJrKV64MmozrSsk+or0PB5dzdfspg=
 github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG+4E0Y=
 github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
-github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY=
-github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
+github.com/mitchellh/mapstructure v1.5.1-0.20231216201459-8508981c8b6c h1:cqn374mizHuIWj+OSJCajGr/phAmuMug9qIX3l9CflE=
+github.com/mitchellh/mapstructure v1.5.1-0.20231216201459-8508981c8b6c/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
 github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
 github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
 github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
@@ -409,8 +410,8 @@ github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7J
 github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo=
 github.com/onsi/gomega v1.23.0 h1:/oxKu9c2HVap+F3PfKort2Hw5DEU+HGlW8n+tguWsys=
 github.com/onsi/gomega v1.23.0/go.mod h1:Z/NWtiqwBrwUt4/2loMmHL63EDLnYHmVbuBpDr2vQAg=
-github.com/opentracing-contrib/go-grpc v0.1.0 h1:9JHDtQXv6UL0tFF8KJB/4ApJgeOcaHp1h07d0PJjESc=
-github.com/opentracing-contrib/go-grpc v0.1.0/go.mod h1:i3/jx/TvJZ/HKidtT4XGIi/NosUEpzS9xjVJctbKZzI=
+github.com/opentracing-contrib/go-grpc v0.1.1 h1:Ws7IN1zyiL1DFqKQPhRXuKe5pLYzMfdxnC1qtajE2PE=
+github.com/opentracing-contrib/go-grpc v0.1.1/go.mod h1:Nu6sz+4zzgxXu8rvKfnwjBEmHsuhTigxRwV2RhELrS8=
 github.com/opentracing/opentracing-go v1.1.0/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o=
 github.com/opentracing/opentracing-go v1.2.0 h1:uEJPy/1a5RIPAJ0Ov+OIO8OxWu77jEv+1B0VhjKrZUs=
 github.com/opentracing/opentracing-go v1.2.0/go.mod h1:GxEUsuufX4nBwe+T+Wl9TAgYrxe9dPLANfrWvHYVTgc=
@@ -486,8 +487,8 @@ github.com/sagikazarmark/slog-shim v0.1.0 h1:diDBnUNK9N/354PgrxMywXnAwEr1QZcOr6g
 github.com/sagikazarmark/slog-shim v0.1.0/go.mod h1:SrcSrq8aKtyuqEI1uvTDTK1arOWRIczQRv+GVI1AkeQ=
 github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529 h1:nn5Wsu0esKSJiIVhscUtVbo7ada43DJhG55ua/hjS5I=
 github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc=
-github.com/secure-systems-lab/go-securesystemslib v0.8.0 h1:mr5An6X45Kb2nddcFlbmfHkLguCE9laoZCUzEEpIZXA=
-github.com/secure-systems-lab/go-securesystemslib v0.8.0/go.mod h1:UH2VZVuJfCYR8WgMlCU1uFsOUU+KeyrTWcSS73NBOzU=
+github.com/secure-systems-lab/go-securesystemslib v0.9.0 h1:rf1HIbL64nUpEIZnjLZ3mcNEL9NBPB0iuVjyxvq3LZc=
+github.com/secure-systems-lab/go-securesystemslib v0.9.0/go.mod h1:DVHKMcZ+V4/woA/peqr+L0joiRXbPpQ042GgJckkFgw=
 github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo=
 github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
 github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88=
@@ -543,8 +544,8 @@ github.com/tidwall/match v1.1.1/go.mod h1:eRSPERbgtNPcGhD8UCthc6PmLEQXEWd3PRB5JT
 github.com/tidwall/pretty v1.2.0/go.mod h1:ITEVvHYasfjBbM0u2Pg8T2nJnzm8xPwvNhhsoaGGjNU=
 github.com/tidwall/pretty v1.2.1 h1:qjsOFOWWQl+N3RsoF5/ssm1pHmJJwhjlSbZ51I6wMl4=
 github.com/tidwall/pretty v1.2.1/go.mod h1:ITEVvHYasfjBbM0u2Pg8T2nJnzm8xPwvNhhsoaGGjNU=
-github.com/tinylib/msgp v1.2.4 h1:yLFeUGostXXSGW5vxfT5dXG/qzkn4schv2I7at5+hVU=
-github.com/tinylib/msgp v1.2.4/go.mod h1:ykjzy2wzgrlvpDCRc4LA8UXy6D8bzMSuAF3WD57Gok0=
+github.com/tinylib/msgp v1.2.5 h1:WeQg1whrXRFiZusidTQqzETkRpGjFjcIhW6uqWH09po=
+github.com/tinylib/msgp v1.2.5/go.mod h1:ykjzy2wzgrlvpDCRc4LA8UXy6D8bzMSuAF3WD57Gok0=
 github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926/go.mod h1:9ESjWnEqriFuLhtthL60Sar/7RFoluCcXsuvEwTV5KM=
 github.com/uber/jaeger-client-go v2.30.0+incompatible h1:D6wyKGCecFaSRUpo8lCVbaOOb6ThwMmTEbhRwtKR97o=
 github.com/uber/jaeger-client-go v2.30.0+incompatible/go.mod h1:WVhlPFC8FDjOFMMWRy2pZqQJSXxYSwNYOkTr/Z6d3Kk=
@@ -619,8 +620,8 @@ golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHl
 golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
-golang.org/x/mod v0.22.0 h1:D4nJWe9zXqHOmWqj4VMOJhvzj7bEZg4wEYa759z1pH4=
-golang.org/x/mod v0.22.0/go.mod h1:6SkKJ3Xj0I0BrPOZoBy3bdMptDDU9oJrpohJ3eWZ1fY=
+golang.org/x/mod v0.23.0 h1:Zb7khfcRGKk+kqfxFaP5tZqCnDZMjC5VtUBs87Hr6QM=
+golang.org/x/mod v0.23.0/go.mod h1:6SkKJ3Xj0I0BrPOZoBy3bdMptDDU9oJrpohJ3eWZ1fY=
 golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
@@ -644,8 +645,8 @@ golang.org/x/net v0.34.0 h1:Mb7Mrk043xzHgnRM88suvJFwzVrRfHEHJEl5/71CKw0=
 golang.org/x/net v0.34.0/go.mod h1:di0qlW3YNM5oh6GqDGQr92MyTozJPmybPK4Ev/Gm31k=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
-golang.org/x/oauth2 v0.25.0 h1:CY4y7XT9v0cRI9oupztF8AgiIu99L/ksR/Xp/6jrZ70=
-golang.org/x/oauth2 v0.25.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI=
+golang.org/x/oauth2 v0.26.0 h1:afQXWNNaeC4nvZ0Ed9XvCCzXM6UHJG7iCg0W4fPqSBE=
+golang.org/x/oauth2 v0.26.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI=
 golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -654,8 +655,8 @@ golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJ
 golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.10.0 h1:3NQrjDixjgGwUOCaF8w2+VYHv0Ve/vGYSbdkTa98gmQ=
-golang.org/x/sync v0.10.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
+golang.org/x/sync v0.11.0 h1:GGz8+XQP4FvTTrjZPzNKTMFtSXH80RAzG+5ghFPgK9w=
+golang.org/x/sync v0.11.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
 golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
@@ -690,19 +691,19 @@ golang.org/x/sys v0.0.0-20211025201205-69cdffdb9359/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/sys v0.0.0-20220503163025-988cb79eb6c6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220627191245-f75cf1eec38b/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.29.0 h1:TPYlXGxvx1MGTn2GiZDhnjPA9wZzZeGKHHmKhHYvgaU=
-golang.org/x/sys v0.29.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.30.0 h1:QjkSwP/36a20jFYWkSue1YwXzLmsV5Gfq7Eiy72C1uc=
+golang.org/x/sys v0.30.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
-golang.org/x/term v0.28.0 h1:/Ts8HFuMR2E6IP/jlo7QVLZHggjKQbhu/7H0LJFr3Gg=
-golang.org/x/term v0.28.0/go.mod h1:Sw/lC2IAUZ92udQNf3WodGtn4k/XoLyZoh8v/8uiwek=
+golang.org/x/term v0.29.0 h1:L6pJp37ocefwRRtYPKSWOWzOtWSxVajvz2ldH/xi3iU=
+golang.org/x/term v0.29.0/go.mod h1:6bl4lRlvVuDgSf3179VpIxBF0o10JUpXWOnI7nErv7s=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo=
-golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ=
-golang.org/x/time v0.9.0 h1:EsRrnYcQiGH+5FfbgvV4AP7qEZstoyrHB0DzarOQ4ZY=
-golang.org/x/time v0.9.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM=
+golang.org/x/text v0.22.0 h1:bofq7m3/HAFvbF51jz3Q9wLg3jkvSPuiZu/pD1XwgtM=
+golang.org/x/text v0.22.0/go.mod h1:YRoo4H8PVmsu+E3Ou7cqLVH8oXWIHVoX0jqUWALQhfY=
+golang.org/x/time v0.10.0 h1:3usCWA8tQn0L8+hFJQNgzpWbd89begxN66o1Ojdn5L4=
+golang.org/x/time v0.10.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
@@ -731,12 +732,12 @@ google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7
 google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
 google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
 google.golang.org/genproto v0.0.0-20200423170343-7949de9c1215/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
-google.golang.org/genproto v0.0.0-20250127172529-29210b9bc287 h1:WoUI1G0DQ648FKvSl756SKxHQR/bI+y4HyyIQfxMWI8=
-google.golang.org/genproto v0.0.0-20250127172529-29210b9bc287/go.mod h1:wkQ2Aj/xvshAUDtO/JHvu9y+AaN9cqs28QuSVSHtZSY=
-google.golang.org/genproto/googleapis/api v0.0.0-20250127172529-29210b9bc287 h1:A2ni10G3UlplFrWdCDJTl7D7mJ7GSRm37S+PDimaKRw=
-google.golang.org/genproto/googleapis/api v0.0.0-20250127172529-29210b9bc287/go.mod h1:iYONQfRdizDB8JJBybql13nArx91jcUk7zCXEsOofM4=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20250127172529-29210b9bc287 h1:J1H9f+LEdWAfHcez/4cvaVBox7cOYT+IU6rgqj5x++8=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20250127172529-29210b9bc287/go.mod h1:8BS3B93F/U1juMFq9+EDk+qOT5CO1R9IzXxG3PTqiRk=
+google.golang.org/genproto v0.0.0-20250204164813-702378808489 h1:nQcbCCOg2h2CQ0yA8SY3AHqriNKDvsetuq9mE/HFjtc=
+google.golang.org/genproto v0.0.0-20250204164813-702378808489/go.mod h1:wkQ2Aj/xvshAUDtO/JHvu9y+AaN9cqs28QuSVSHtZSY=
+google.golang.org/genproto/googleapis/api v0.0.0-20250204164813-702378808489 h1:fCuMM4fowGzigT89NCIsW57Pk9k2D12MMi2ODn+Nk+o=
+google.golang.org/genproto/googleapis/api v0.0.0-20250204164813-702378808489/go.mod h1:iYONQfRdizDB8JJBybql13nArx91jcUk7zCXEsOofM4=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20250204164813-702378808489 h1:5bKytslY8ViY0Cj/ewmRtrWHW64bNF03cAatUUFCdFI=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20250204164813-702378808489/go.mod h1:8BS3B93F/U1juMFq9+EDk+qOT5CO1R9IzXxG3PTqiRk=
 google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
 google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
 google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY=
diff --git a/go/cache/theine/store.go b/go/cache/theine/store.go
index 0e444c2206a..42142be3b4a 100644
--- a/go/cache/theine/store.go
+++ b/go/cache/theine/store.go
@@ -58,7 +58,7 @@ func NewShard[K cachekey, V any](qsize uint, doorkeeper bool) *Shard[K, V] {
 	s := &Shard[K, V]{
 		hashmap: make(map[K]*Entry[K, V]),
 		qsize:   qsize,
-		deque:   deque.New[*Entry[K, V]](),
+		deque:   &deque.Deque[*Entry[K, V]]{},
 		group:   NewGroup[K, V](),
 	}
 	if doorkeeper {

From 202065e9d8ac982488165f1c5048c72f2383f40e Mon Sep 17 00:00:00 2001
From: Harshit Gangal <harshit@planetscale.com>
Date: Wed, 5 Feb 2025 15:46:24 +0100
Subject: [PATCH 26/68] Views global routing (#17633)

Signed-off-by: Harshit Gangal <harshit@planetscale.com>
Signed-off-by: Andres Taylor <andres@planetscale.com>
Co-authored-by: Andres Taylor <andres@planetscale.com>
---
 .../vtgate/schematracker/multi_ks/sschema.sql |  16 ++
 .../schematracker/multi_ks/svschema.json      |  34 +++
 .../vtgate/schematracker/multi_ks/uschema.sql |  16 ++
 .../schematracker/multi_ks/uvschema.json      |   8 +
 .../schematracker/multi_ks/views_test.go      | 253 ++++++++++++++++++
 go/test/vschemawrapper/vschema_wrapper.go     |   4 +-
 go/vt/schemadiff/semantics.go                 |   8 +-
 go/vt/sqlparser/ast_funcs.go                  |  17 ++
 go/vt/sqlparser/ast_funcs_test.go             |  10 +
 go/vt/vtgate/engine/fake_vcursor_test.go      |   6 +-
 go/vt/vtgate/engine/insert.go                 |   2 +-
 go/vt/vtgate/engine/insert_select.go          |   2 +-
 go/vt/vtgate/engine/primitive.go              |   2 +-
 go/vt/vtgate/engine/route_test.go             |   2 +-
 go/vt/vtgate/executorcontext/vcursor_impl.go  |  10 +-
 go/vt/vtgate/planbuilder/ddl.go               |   6 +-
 go/vt/vtgate/planbuilder/delete.go            |   2 +-
 go/vt/vtgate/planbuilder/insert.go            |   4 +-
 .../planbuilder/operator_transformers.go      |   2 +-
 go/vt/vtgate/planbuilder/operators/delete.go  |  10 +-
 .../planbuilder/operators/dml_planning.go     |   6 +-
 go/vt/vtgate/planbuilder/operators/helpers.go |   2 +-
 go/vt/vtgate/planbuilder/operators/insert.go  |  20 +-
 go/vt/vtgate/planbuilder/operators/route.go   |   8 +-
 .../planbuilder/operators/route_planning.go   |   4 +-
 .../planbuilder/operators/sharded_routing.go  |   2 +-
 go/vt/vtgate/planbuilder/operators/table.go   |   2 +-
 go/vt/vtgate/planbuilder/operators/update.go  |  28 +-
 .../planbuilder/operators/update_test.go      |   2 +-
 go/vt/vtgate/planbuilder/operators/upsert.go  |   2 +-
 go/vt/vtgate/planbuilder/operators/vindex.go  |   2 +-
 .../plancontext/planning_context_test.go      |   4 +-
 .../vtgate/planbuilder/plancontext/vschema.go |   4 +-
 go/vt/vtgate/planbuilder/planner_test.go      |   2 +-
 go/vt/vtgate/planbuilder/update.go            |   2 +-
 go/vt/vtgate/planbuilder/vexplain.go          |   2 +-
 go/vt/vtgate/schema/tracker.go                |   1 +
 go/vt/vtgate/schema/tracker_test.go           |  31 ++-
 go/vt/vtgate/semantics/FakeSI.go              |   4 +-
 go/vt/vtgate/semantics/analyzer_test.go       |  64 ++---
 go/vt/vtgate/semantics/cte_table.go           |   2 +-
 go/vt/vtgate/semantics/derived_table.go       |   2 +-
 go/vt/vtgate/semantics/derived_test.go        |   6 +-
 go/vt/vtgate/semantics/early_rewriter_test.go |  18 +-
 go/vt/vtgate/semantics/foreign_keys_test.go   |  20 +-
 go/vt/vtgate/semantics/info_schema.go         |   4 +-
 go/vt/vtgate/semantics/real_table.go          |   4 +-
 go/vt/vtgate/semantics/semantic_table.go      |  12 +-
 go/vt/vtgate/semantics/semantic_table_test.go |  66 ++---
 go/vt/vtgate/semantics/table_collector.go     |  10 +-
 go/vt/vtgate/semantics/vindex_table.go        |   2 +-
 go/vt/vtgate/semantics/vtable.go              |   2 +-
 go/vt/vtgate/vindexes/foreign_keys.go         |  12 +-
 go/vt/vtgate/vindexes/vschema.go              | 214 +++++++++------
 go/vt/vtgate/vindexes/vschema_routing_test.go |  16 +-
 go/vt/vtgate/vindexes/vschema_test.go         | 186 +++++++++----
 go/vt/vtgate/vschema_manager.go               |  22 +-
 go/vt/vtgate/vschema_manager_test.go          | 124 ++++++---
 .../tabletserver/vstreamer/local_vschema.go   |   2 +-
 59 files changed, 924 insertions(+), 406 deletions(-)
 create mode 100644 go/test/endtoend/vtgate/schematracker/multi_ks/sschema.sql
 create mode 100644 go/test/endtoend/vtgate/schematracker/multi_ks/svschema.json
 create mode 100644 go/test/endtoend/vtgate/schematracker/multi_ks/uschema.sql
 create mode 100644 go/test/endtoend/vtgate/schematracker/multi_ks/uvschema.json
 create mode 100644 go/test/endtoend/vtgate/schematracker/multi_ks/views_test.go

diff --git a/go/test/endtoend/vtgate/schematracker/multi_ks/sschema.sql b/go/test/endtoend/vtgate/schematracker/multi_ks/sschema.sql
new file mode 100644
index 00000000000..7c1244eb318
--- /dev/null
+++ b/go/test/endtoend/vtgate/schematracker/multi_ks/sschema.sql
@@ -0,0 +1,16 @@
+create table t(
+       id bigint,
+       col bigint,
+       primary key(id)
+) Engine=InnoDB;
+
+create table s(
+       id bigint,
+       col bigint,
+       primary key(id)
+) Engine=InnoDB;
+
+create view sv1 as select t.id as id, t.col + s.col as acol from t join s on t.id = s.id;
+create view cv1 as select t.id as id, t.col - s.col as scol from t join s on t.id = s.id;
+create view cv2 as select t.id as id, t.col * s.col as mcol from t join s on t.id = s.id;
+create view cv3 as select t.id as id, t.col / s.col as dcol from t join s on t.id = s.id;
\ No newline at end of file
diff --git a/go/test/endtoend/vtgate/schematracker/multi_ks/svschema.json b/go/test/endtoend/vtgate/schematracker/multi_ks/svschema.json
new file mode 100644
index 00000000000..f81ad52549c
--- /dev/null
+++ b/go/test/endtoend/vtgate/schematracker/multi_ks/svschema.json
@@ -0,0 +1,34 @@
+{
+  "sharded": true,
+  "vindexes": {
+    "reverse_bits": {
+      "type": "reverse_bits"
+    }
+  },
+  "tables": {
+    "t": {
+      "column_vindexes": [
+        {
+          "column": "id",
+          "name": "reverse_bits"
+        }
+      ]
+    },
+    "s": {
+      "column_vindexes": [
+        {
+          "column": "id",
+          "name": "reverse_bits"
+        }
+      ]
+    },
+    "cv2": {
+      "column_vindexes": [
+        {
+          "column": "id",
+          "name": "reverse_bits"
+        }
+      ]
+    }
+  }
+}
\ No newline at end of file
diff --git a/go/test/endtoend/vtgate/schematracker/multi_ks/uschema.sql b/go/test/endtoend/vtgate/schematracker/multi_ks/uschema.sql
new file mode 100644
index 00000000000..89e9c97243f
--- /dev/null
+++ b/go/test/endtoend/vtgate/schematracker/multi_ks/uschema.sql
@@ -0,0 +1,16 @@
+create table t(
+       id bigint,
+       col bigint,
+       primary key(id)
+) Engine=InnoDB;
+
+create table u(
+       id bigint,
+       col bigint,
+       primary key(id)
+) Engine=InnoDB;
+
+create view uv1 as select t.id as id, t.col + u.col as acol from t join u on t.id = u.id;
+create view cv1 as select t.id as id, t.col - u.col as scol from t join u on t.id = u.id;
+create view cv2 as select t.id as id, t.col * u.col as mcol from t join u on t.id = u.id;
+create view cv3 as select t.id as id, t.col / u.col as dcol from t join u on t.id = u.id;
\ No newline at end of file
diff --git a/go/test/endtoend/vtgate/schematracker/multi_ks/uvschema.json b/go/test/endtoend/vtgate/schematracker/multi_ks/uvschema.json
new file mode 100644
index 00000000000..aaf08022676
--- /dev/null
+++ b/go/test/endtoend/vtgate/schematracker/multi_ks/uvschema.json
@@ -0,0 +1,8 @@
+{
+  "sharded": false,
+  "tables": {
+    "t": {},
+    "u": {},
+    "cv1": {}
+  }
+}
\ No newline at end of file
diff --git a/go/test/endtoend/vtgate/schematracker/multi_ks/views_test.go b/go/test/endtoend/vtgate/schematracker/multi_ks/views_test.go
new file mode 100644
index 00000000000..1300d371c30
--- /dev/null
+++ b/go/test/endtoend/vtgate/schematracker/multi_ks/views_test.go
@@ -0,0 +1,253 @@
+/*
+Copyright 2025 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 multiks
+
+import (
+	"context"
+	_ "embed"
+	"flag"
+	"fmt"
+	"os"
+	"testing"
+	"time"
+
+	"github.com/stretchr/testify/require"
+
+	"vitess.io/vitess/go/mysql"
+	"vitess.io/vitess/go/test/endtoend/cluster"
+	"vitess.io/vitess/go/test/endtoend/utils"
+)
+
+var (
+	clusterInstance *cluster.LocalProcessCluster
+	vtParams        mysql.ConnParams
+	shardedKs       = "sks"
+	unshardedKs     = "uks"
+	cell            = "zone1"
+
+	//go:embed sschema.sql
+	shardedSchema string
+
+	//go:embed uschema.sql
+	unshardedSchema string
+
+	//go:embed svschema.json
+	shardedVSchema string
+
+	//go:embed uvschema.json
+	unshardedVSchema string
+)
+
+func TestMain(m *testing.M) {
+	flag.Parse()
+
+	exitCode := func() int {
+		clusterInstance = cluster.NewCluster(cell, "localhost")
+		defer clusterInstance.Teardown()
+
+		// Start topo server
+		err := clusterInstance.StartTopo()
+		if err != nil {
+			return 1
+		}
+
+		// enable views tracking
+		clusterInstance.VtGateExtraArgs = append(clusterInstance.VtGateExtraArgs, "--enable-views")
+		clusterInstance.VtTabletExtraArgs = append(clusterInstance.VtTabletExtraArgs, "--queryserver-enable-views")
+
+		// Start sharded keyspace
+		sks := cluster.Keyspace{
+			Name:      shardedKs,
+			SchemaSQL: shardedSchema,
+			VSchema:   shardedVSchema,
+		}
+
+		err = clusterInstance.StartKeyspace(sks, []string{"-80", "80-"}, 0, false)
+		if err != nil {
+			return 1
+		}
+
+		// Start unsharded keyspace
+		uks := cluster.Keyspace{
+			Name:      unshardedKs,
+			SchemaSQL: unshardedSchema,
+			VSchema:   unshardedVSchema,
+		}
+
+		err = clusterInstance.StartUnshardedKeyspace(uks, 0, false)
+		if err != nil {
+			return 1
+		}
+
+		// Start vtgate
+		err = clusterInstance.StartVtgate()
+		if err != nil {
+			return 1
+		}
+
+		err = clusterInstance.WaitForVTGateAndVTTablets(1 * time.Minute)
+		if err != nil {
+			fmt.Println(err)
+			return 1
+		}
+
+		vtParams = mysql.ConnParams{
+			Host: clusterInstance.Hostname,
+			Port: clusterInstance.VtgateMySQLPort,
+		}
+		return m.Run()
+	}()
+	os.Exit(exitCode)
+}
+
+// TestViewQueries validates that view tracking works as expected with qualified and unqualified views.
+func TestViewQueries(t *testing.T) {
+	ctx := context.Background()
+	conn, err := mysql.Connect(ctx, &vtParams)
+	require.NoError(t, err)
+	defer conn.Close()
+
+	viewExists := func(t *testing.T, ksMap map[string]any) bool {
+		// wait for the view definition to change
+		views := ksMap["views"]
+		viewsMap := views.(map[string]any)
+		_, ok := viewsMap["cv3"]
+		return ok
+	}
+
+	utils.WaitForVschemaCondition(t, clusterInstance.VtgateProcess, shardedKs, viewExists, "view cv3 not found")
+
+	// Insert some data
+	insertData(t, conn)
+
+	tcases := []struct {
+		name      string
+		sql       string
+		defaultKs string
+		expRes    string
+		expErr    string
+	}{{
+		name:      "unique unsharded view - qualified",
+		defaultKs: "@primary",
+		sql:       "select * from uks.uv1 order by id",
+		expRes:    "[[INT64(1) INT64(1010)] [INT64(2) INT64(4020)]]",
+	}, {
+		name:      "unique sharded view - qualified",
+		defaultKs: "@primary",
+		sql:       "select * from sks.sv1 order by id",
+		expRes:    "[[INT64(1) INT64(1100)] [INT64(2) INT64(4200)]]",
+	}, {
+		name:      "unique unsharded view - non qualified",
+		defaultKs: "@primary",
+		sql:       "select * from uv1 order by id",
+		expRes:    "[[INT64(1) INT64(1010)] [INT64(2) INT64(4020)]]",
+	}, {
+		name:      "unique sharded view - non qualified",
+		defaultKs: "@primary",
+		sql:       "select * from sv1 order by id",
+		expRes:    "[[INT64(1) INT64(1100)] [INT64(2) INT64(4200)]]",
+	}, {
+		name:      "unique unsharded view - non qualified - default unsharded keyspace",
+		defaultKs: "uks",
+		sql:       "select * from uv1 order by id",
+		expRes:    "[[INT64(1) INT64(1010)] [INT64(2) INT64(4020)]]",
+	}, {
+		name:      "unique sharded view - non qualified - default unsharded keyspace- should error",
+		defaultKs: "uks",
+		sql:       "select * from sv1 order by id",
+		expErr:    "(errno 1146) (sqlstate 42S02)",
+	}, {
+		name:      "unique unsharded view - non qualified - default sharded keyspace - should error",
+		defaultKs: "sks",
+		sql:       "select * from uv1 order by id",
+		expErr:    "table uv1 not found",
+	}, {
+		name:      "unique sharded view - non qualified - default sharded keyspace",
+		defaultKs: "sks",
+		sql:       "select * from sv1 order by id",
+		expRes:    "[[INT64(1) INT64(1100)] [INT64(2) INT64(4200)]]",
+	}, {
+		name:      "unique sharded view - qualified - default sharded keyspace",
+		defaultKs: "sks",
+		sql:       "select * from sks.sv1 order by id",
+		expRes:    "[[INT64(1) INT64(1100)] [INT64(2) INT64(4200)]]",
+	}, {
+		name:      "vschema provided - unsharded view - non qualified",
+		defaultKs: "@primary",
+		sql:       "select * from cv1 order by id",
+		expRes:    "[[INT64(1) INT64(990)] [INT64(2) INT64(3980)]]",
+	}, {
+		name:      "vschema provided - sharded view - non qualified",
+		defaultKs: "@primary",
+		sql:       "select id, mcol from cv2 order by id",
+		expRes:    "[[INT64(1) INT64(100000)] [INT64(2) INT64(800000)]]",
+	}, {
+		name:      "non unique view - non qualified - should error",
+		defaultKs: "@primary",
+		sql:       "select * from cv3 order by id",
+		expErr:    "ambiguous table reference: cv3",
+	}, {
+		name:      "non unique view - unsharded qualified",
+		defaultKs: "@primary",
+		sql:       "select * from uks.cv3 order by id",
+		expRes:    "[[INT64(1) DECIMAL(100.0000)] [INT64(2) DECIMAL(200.0000)]]",
+	}, {
+		name:      "non unique view - sharded qualified",
+		defaultKs: "@primary",
+		sql:       "select * from sks.cv3 order by id",
+		expRes:    "[[INT64(1) DECIMAL(10.0000)] [INT64(2) DECIMAL(20.0000)]]",
+	}, {
+		name:      "non unique view - non qualified - default unsharded keyspace",
+		defaultKs: "uks",
+		sql:       "select * from cv3 order by id",
+		expRes:    "[[INT64(1) DECIMAL(100.0000)] [INT64(2) DECIMAL(200.0000)]]",
+	}, {
+		name:      "non unique view - non qualified - default sharded keyspace",
+		defaultKs: "sks",
+		sql:       "select * from cv3 order by id",
+		expRes:    "[[INT64(1) DECIMAL(10.0000)] [INT64(2) DECIMAL(20.0000)]]",
+	}}
+
+	for _, tc := range tcases {
+		t.Run(tc.name, func(t *testing.T) {
+			utils.Exec(t, conn, "use "+tc.defaultKs)
+			qr, err := utils.ExecAllowError(t, conn, tc.sql)
+			if tc.expErr != "" {
+				require.ErrorContains(t, err, tc.expErr)
+				return
+			}
+			require.NoError(t, err)
+			require.Equal(t, tc.expRes, fmt.Sprintf("%v", qr.Rows))
+		})
+	}
+}
+
+func insertData(t *testing.T, conn *mysql.Conn) {
+	t.Helper()
+
+	// unsharded
+	utils.Exec(t, conn, "insert into uks.t(id, col) values(1, 1000)")
+	utils.Exec(t, conn, "insert into uks.t(id, col) values(2, 4000)")
+	utils.Exec(t, conn, "insert into u(id, col) values(1, 10)")
+	utils.Exec(t, conn, "insert into u(id, col) values(2, 20)")
+
+	// sharded
+	utils.Exec(t, conn, "insert into sks.t(id, col) values(1, 1000)")
+	utils.Exec(t, conn, "insert into sks.t(id, col) values(2, 4000)")
+	utils.Exec(t, conn, "insert into s(id, col) values(1, 100)")
+	utils.Exec(t, conn, "insert into s(id, col) values(2, 200)")
+}
diff --git a/go/test/vschemawrapper/vschema_wrapper.go b/go/test/vschemawrapper/vschema_wrapper.go
index 5b1c6b033e6..02daa646bf8 100644
--- a/go/test/vschemawrapper/vschema_wrapper.go
+++ b/go/test/vschemawrapper/vschema_wrapper.go
@@ -253,7 +253,7 @@ func (vw *VSchemaWrapper) Destination() key.Destination {
 	return vw.Dest
 }
 
-func (vw *VSchemaWrapper) FindTable(tab sqlparser.TableName) (*vindexes.Table, string, topodatapb.TabletType, key.Destination, error) {
+func (vw *VSchemaWrapper) FindTable(tab sqlparser.TableName) (*vindexes.BaseTable, string, topodatapb.TabletType, key.Destination, error) {
 	destKeyspace, destTabletType, destTarget, err := topoproto.ParseDestination(tab.Qualifier.String(), topodatapb.TabletType_PRIMARY)
 	if err != nil {
 		return nil, destKeyspace, destTabletType, destTarget, err
@@ -284,7 +284,7 @@ func (vw *VSchemaWrapper) FindViewTarget(name sqlparser.TableName) (*vindexes.Ke
 	return nil, nil
 }
 
-func (vw *VSchemaWrapper) FindTableOrVindex(tab sqlparser.TableName) (*vindexes.Table, vindexes.Vindex, string, topodatapb.TabletType, key.Destination, error) {
+func (vw *VSchemaWrapper) FindTableOrVindex(tab sqlparser.TableName) (*vindexes.BaseTable, vindexes.Vindex, string, topodatapb.TabletType, key.Destination, error) {
 	return vw.Vcursor.FindTableOrVindex(tab)
 }
 
diff --git a/go/vt/schemadiff/semantics.go b/go/vt/schemadiff/semantics.go
index f12f59ef6ae..a2a4b4f954f 100644
--- a/go/vt/schemadiff/semantics.go
+++ b/go/vt/schemadiff/semantics.go
@@ -38,19 +38,19 @@ var _ semantics.SchemaInformation = (*declarativeSchemaInformation)(nil)
 // declarativeSchemaInformation is a utility wrapper around FakeSI, and adds a few utility functions
 // to make it more simple and accessible to schemadiff's logic.
 type declarativeSchemaInformation struct {
-	Tables map[string]*vindexes.Table
+	Tables map[string]*vindexes.BaseTable
 	env    *Environment
 }
 
 func newDeclarativeSchemaInformation(env *Environment) *declarativeSchemaInformation {
 	return &declarativeSchemaInformation{
-		Tables: make(map[string]*vindexes.Table),
+		Tables: make(map[string]*vindexes.BaseTable),
 		env:    env,
 	}
 }
 
 // FindTableOrVindex implements the SchemaInformation interface
-func (si *declarativeSchemaInformation) FindTableOrVindex(tablename sqlparser.TableName) (*vindexes.Table, vindexes.Vindex, string, topodatapb.TabletType, key.Destination, error) {
+func (si *declarativeSchemaInformation) FindTableOrVindex(tablename sqlparser.TableName) (*vindexes.BaseTable, vindexes.Vindex, string, topodatapb.TabletType, key.Destination, error) {
 	table := si.Tables[tablename.Name.String()]
 	return table, nil, "", 0, nil, nil
 }
@@ -86,7 +86,7 @@ func (si *declarativeSchemaInformation) FindMirrorRule(tablename sqlparser.Table
 
 // addTable adds a fake table with an empty column list
 func (si *declarativeSchemaInformation) addTable(tableName string) {
-	tbl := &vindexes.Table{
+	tbl := &vindexes.BaseTable{
 		Name:                    sqlparser.NewIdentifierCS(tableName),
 		Columns:                 []vindexes.Column{},
 		ColumnListAuthoritative: true,
diff --git a/go/vt/sqlparser/ast_funcs.go b/go/vt/sqlparser/ast_funcs.go
index fbf5a346c98..2da783af3df 100644
--- a/go/vt/sqlparser/ast_funcs.go
+++ b/go/vt/sqlparser/ast_funcs.go
@@ -2471,6 +2471,23 @@ func removeKeyspace(in SQLNode, shouldRemove func(qualifier string) bool) {
 	})
 }
 
+// AddKeyspace adds the keyspace qualifier to TableName if it's not already present
+func AddKeyspace(in SQLNode, ks string) {
+	Rewrite(in, func(cursor *Cursor) bool {
+		switch expr := cursor.Node().(type) {
+		case *ColName:
+			// ignore it
+			return false
+		case TableName:
+			if expr.Qualifier.IsEmpty() {
+				expr.Qualifier = NewIdentifierCS(ks)
+				cursor.Replace(expr)
+			}
+		}
+		return true
+	}, nil)
+}
+
 func convertStringToInt(integer string) int {
 	val, _ := strconv.Atoi(integer)
 	return val
diff --git a/go/vt/sqlparser/ast_funcs_test.go b/go/vt/sqlparser/ast_funcs_test.go
index 009f3e6cc15..1d195b84c88 100644
--- a/go/vt/sqlparser/ast_funcs_test.go
+++ b/go/vt/sqlparser/ast_funcs_test.go
@@ -244,3 +244,13 @@ func TestRemoveSpecificKeyspace(t *testing.T) {
 	RemoveSpecificKeyspace(stmt, "uks")
 	require.Equal(t, "select 1 from unsharded", String(stmt))
 }
+
+// TestAddKeyspace tests the AddKeyspace function which adds the keyspace to the non-qualified table.
+func TestKeyspaceToNonQualifiedTable(t *testing.T) {
+	stmt, err := NewTestParser().Parse("select col, col + (select 1 from t4) from ks.t join t2 join (select 1 from t3) as x where t.id = t2.id and x.id = t.id")
+	require.NoError(t, err)
+
+	// add keyspace to non qualified table
+	AddKeyspace(stmt, "ks2")
+	require.Equal(t, "select col, col + (select 1 from ks2.t4) from ks.t join ks2.t2 join (select 1 from ks2.t3) as x where t.id = t2.id and x.id = t.id", String(stmt))
+}
diff --git a/go/vt/vtgate/engine/fake_vcursor_test.go b/go/vt/vtgate/engine/fake_vcursor_test.go
index 060d2ebcfcb..b277b018faa 100644
--- a/go/vt/vtgate/engine/fake_vcursor_test.go
+++ b/go/vt/vtgate/engine/fake_vcursor_test.go
@@ -267,7 +267,7 @@ func (t *noopVCursor) InTransactionAndIsDML() bool {
 	panic("implement me")
 }
 
-func (t *noopVCursor) FindRoutedTable(sqlparser.TableName) (*vindexes.Table, error) {
+func (t *noopVCursor) FindRoutedTable(sqlparser.TableName) (*vindexes.BaseTable, error) {
 	panic("implement me")
 }
 
@@ -480,7 +480,7 @@ func (f *loggingVCursor) GetUDV(key string) *querypb.BindVariable {
 }
 
 type tableRoutes struct {
-	tbl *vindexes.Table
+	tbl *vindexes.BaseTable
 }
 
 func (f *loggingVCursor) ExecutePrimitive(ctx context.Context, primitive Primitive, bindVars map[string]*querypb.BindVariable, wantfields bool) (*sqltypes.Result, error) {
@@ -845,7 +845,7 @@ func (f *loggingVCursor) SetPriority(string) {
 	panic("implement me")
 }
 
-func (f *loggingVCursor) FindRoutedTable(tbl sqlparser.TableName) (*vindexes.Table, error) {
+func (f *loggingVCursor) FindRoutedTable(tbl sqlparser.TableName) (*vindexes.BaseTable, error) {
 	f.log = append(f.log, fmt.Sprintf("FindTable(%s)", sqlparser.String(tbl)))
 	return f.tableRoutes.tbl, nil
 }
diff --git a/go/vt/vtgate/engine/insert.go b/go/vt/vtgate/engine/insert.go
index 5bc206f7465..c51c490ada6 100644
--- a/go/vt/vtgate/engine/insert.go
+++ b/go/vt/vtgate/engine/insert.go
@@ -77,7 +77,7 @@ func newInsert(
 	ignore bool,
 	keyspace *vindexes.Keyspace,
 	vindexValues [][][]evalengine.Expr,
-	table *vindexes.Table,
+	table *vindexes.BaseTable,
 	prefix string,
 	mid sqlparser.Values,
 	suffix sqlparser.OnDup,
diff --git a/go/vt/vtgate/engine/insert_select.go b/go/vt/vtgate/engine/insert_select.go
index af834858175..1e1ea5b20f9 100644
--- a/go/vt/vtgate/engine/insert_select.go
+++ b/go/vt/vtgate/engine/insert_select.go
@@ -55,7 +55,7 @@ type (
 func newInsertSelect(
 	ignore bool,
 	keyspace *vindexes.Keyspace,
-	table *vindexes.Table,
+	table *vindexes.BaseTable,
 	prefix string,
 	suffix sqlparser.OnDup,
 	vv [][]int,
diff --git a/go/vt/vtgate/engine/primitive.go b/go/vt/vtgate/engine/primitive.go
index 7734dd81a6b..fe991a670b6 100644
--- a/go/vt/vtgate/engine/primitive.go
+++ b/go/vt/vtgate/engine/primitive.go
@@ -98,7 +98,7 @@ type (
 
 		LookupRowLockShardSession() vtgatepb.CommitOrder
 
-		FindRoutedTable(tablename sqlparser.TableName) (*vindexes.Table, error)
+		FindRoutedTable(tablename sqlparser.TableName) (*vindexes.BaseTable, error)
 
 		// GetDBDDLPlugin gets the configured plugin for DROP/CREATE DATABASE
 		GetDBDDLPluginName() string
diff --git a/go/vt/vtgate/engine/route_test.go b/go/vt/vtgate/engine/route_test.go
index b2f4020cb59..6b6f65acf42 100644
--- a/go/vt/vtgate/engine/route_test.go
+++ b/go/vt/vtgate/engine/route_test.go
@@ -178,7 +178,7 @@ func TestInformationSchemaWithTableAndSchemaWithRoutedTables(t *testing.T) {
 			}
 			if tc.routed {
 				vc.tableRoutes = tableRoutes{
-					tbl: &vindexes.Table{
+					tbl: &vindexes.BaseTable{
 						Name:     sqlparser.NewIdentifierCS("routedTable"),
 						Keyspace: &vindexes.Keyspace{Name: "routedKeyspace"},
 					}}
diff --git a/go/vt/vtgate/executorcontext/vcursor_impl.go b/go/vt/vtgate/executorcontext/vcursor_impl.go
index 4d3f631bac5..19b8f3cbe3a 100644
--- a/go/vt/vtgate/executorcontext/vcursor_impl.go
+++ b/go/vt/vtgate/executorcontext/vcursor_impl.go
@@ -391,7 +391,7 @@ func (vc *VCursorImpl) StartPrimitiveTrace() func() engine.Stats {
 
 // FindTable finds the specified table. If the keyspace what specified in the input, it gets used as qualifier.
 // Otherwise, the keyspace from the request is used, if one was provided.
-func (vc *VCursorImpl) FindTable(name sqlparser.TableName) (*vindexes.Table, string, topodatapb.TabletType, key.Destination, error) {
+func (vc *VCursorImpl) FindTable(name sqlparser.TableName) (*vindexes.BaseTable, string, topodatapb.TabletType, key.Destination, error) {
 	destKeyspace, destTabletType, dest, err := vc.parseDestinationTarget(name.Qualifier.String())
 	if err != nil {
 		return nil, "", destTabletType, nil, err
@@ -417,7 +417,7 @@ func (vc *VCursorImpl) FindView(name sqlparser.TableName) sqlparser.TableStateme
 	return vc.vschema.FindView(ks, name.Name.String())
 }
 
-func (vc *VCursorImpl) FindRoutedTable(name sqlparser.TableName) (*vindexes.Table, error) {
+func (vc *VCursorImpl) FindRoutedTable(name sqlparser.TableName) (*vindexes.BaseTable, error) {
 	destKeyspace, destTabletType, _, err := vc.parseDestinationTarget(name.Qualifier.String())
 	if err != nil {
 		return nil, err
@@ -435,7 +435,7 @@ func (vc *VCursorImpl) FindRoutedTable(name sqlparser.TableName) (*vindexes.Tabl
 }
 
 // FindTableOrVindex finds the specified table or vindex.
-func (vc *VCursorImpl) FindTableOrVindex(name sqlparser.TableName) (*vindexes.Table, vindexes.Vindex, string, topodatapb.TabletType, key.Destination, error) {
+func (vc *VCursorImpl) FindTableOrVindex(name sqlparser.TableName) (*vindexes.BaseTable, vindexes.Vindex, string, topodatapb.TabletType, key.Destination, error) {
 	if name.Qualifier.IsEmpty() && name.Name.String() == "dual" {
 		// The magical MySQL dual table should only be resolved
 		// when it is not qualified by a database name.
@@ -489,7 +489,7 @@ func ParseDestinationTarget(targetString string, tablet topodatapb.TabletType, v
 	return destKeyspace, destTabletType, dest, err
 }
 
-func (vc *VCursorImpl) getDualTable() (*vindexes.Table, vindexes.Vindex, string, topodatapb.TabletType, key.Destination, error) {
+func (vc *VCursorImpl) getDualTable() (*vindexes.BaseTable, vindexes.Vindex, string, topodatapb.TabletType, key.Destination, error) {
 	ksName := vc.getActualKeyspace()
 	var ks *vindexes.Keyspace
 	if ksName == "" {
@@ -498,7 +498,7 @@ func (vc *VCursorImpl) getDualTable() (*vindexes.Table, vindexes.Vindex, string,
 	} else {
 		ks = vc.vschema.Keyspaces[ksName].Keyspace
 	}
-	tbl := &vindexes.Table{
+	tbl := &vindexes.BaseTable{
 		Name:     sqlparser.NewIdentifierCS("dual"),
 		Keyspace: ks,
 		Type:     vindexes.TypeReference,
diff --git a/go/vt/vtgate/planbuilder/ddl.go b/go/vt/vtgate/planbuilder/ddl.go
index 2ca924c31ab..1359da1c0a8 100644
--- a/go/vt/vtgate/planbuilder/ddl.go
+++ b/go/vt/vtgate/planbuilder/ddl.go
@@ -166,7 +166,7 @@ func checkFKError(vschema plancontext.VSchema, ddlStatement sqlparser.DDLStateme
 }
 
 func findTableDestinationAndKeyspace(vschema plancontext.VSchema, ddlStatement sqlparser.DDLStatement) (key.Destination, *vindexes.Keyspace, error) {
-	var table *vindexes.Table
+	var table *vindexes.BaseTable
 	var destination key.Destination
 	var keyspace *vindexes.Keyspace
 	var err error
@@ -325,7 +325,7 @@ func buildDropTable(vschema plancontext.VSchema, ddlStatement sqlparser.DDLState
 	for i, tab := range ddlStatement.GetFromTables() {
 		var destinationTab key.Destination
 		var keyspaceTab *vindexes.Keyspace
-		var table *vindexes.Table
+		var table *vindexes.BaseTable
 		var err error
 		table, _, _, _, destinationTab, err = vschema.FindTableOrVindex(tab)
 
@@ -369,7 +369,7 @@ func buildRenameTable(vschema plancontext.VSchema, renameTable *sqlparser.Rename
 	for _, tabPair := range renameTable.TablePairs {
 		var destinationFrom key.Destination
 		var keyspaceFrom *vindexes.Keyspace
-		var table *vindexes.Table
+		var table *vindexes.BaseTable
 		var err error
 		table, _, _, _, destinationFrom, err = vschema.FindTableOrVindex(tabPair.FromTable)
 
diff --git a/go/vt/vtgate/planbuilder/delete.go b/go/vt/vtgate/planbuilder/delete.go
index 239e7bae0ae..95c2f68dc62 100644
--- a/go/vt/vtgate/planbuilder/delete.go
+++ b/go/vt/vtgate/planbuilder/delete.go
@@ -123,7 +123,7 @@ func rewriteSingleTbl(del *sqlparser.Delete) (*sqlparser.Delete, error) {
 	return del, nil
 }
 
-func deleteUnshardedShortcut(stmt *sqlparser.Delete, ks *vindexes.Keyspace, tables []*vindexes.Table) engine.Primitive {
+func deleteUnshardedShortcut(stmt *sqlparser.Delete, ks *vindexes.Keyspace, tables []*vindexes.BaseTable) engine.Primitive {
 	edml := engine.NewDML()
 	edml.Keyspace = ks
 	edml.Opcode = engine.Unsharded
diff --git a/go/vt/vtgate/planbuilder/insert.go b/go/vt/vtgate/planbuilder/insert.go
index d3ad5afac72..d784fffe7ee 100644
--- a/go/vt/vtgate/planbuilder/insert.go
+++ b/go/vt/vtgate/planbuilder/insert.go
@@ -83,14 +83,14 @@ func gen4InsertStmtPlanner(version querypb.ExecuteOptions_PlannerVersion, insStm
 	return newPlanResult(plan, operators.TablesUsed(op)...), nil
 }
 
-func errOutIfPlanCannotBeConstructed(ctx *plancontext.PlanningContext, vTbl *vindexes.Table) error {
+func errOutIfPlanCannotBeConstructed(ctx *plancontext.PlanningContext, vTbl *vindexes.BaseTable) error {
 	if !vTbl.Keyspace.Sharded {
 		return nil
 	}
 	return ctx.SemTable.NotUnshardedErr
 }
 
-func insertUnshardedShortcut(ctx *plancontext.PlanningContext, stmt *sqlparser.Insert, ks *vindexes.Keyspace, tables []*vindexes.Table) engine.Primitive {
+func insertUnshardedShortcut(ctx *plancontext.PlanningContext, stmt *sqlparser.Insert, ks *vindexes.Keyspace, tables []*vindexes.BaseTable) engine.Primitive {
 	eIns := &engine.Insert{
 		InsertCommon: engine.InsertCommon{
 			Opcode:            engine.InsertUnsharded,
diff --git a/go/vt/vtgate/planbuilder/operator_transformers.go b/go/vt/vtgate/planbuilder/operator_transformers.go
index b51eac449fc..807912110df 100644
--- a/go/vt/vtgate/planbuilder/operator_transformers.go
+++ b/go/vt/vtgate/planbuilder/operator_transformers.go
@@ -783,7 +783,7 @@ func buildDeletePrimitive(ctx *plancontext.PlanningContext, rb *operators.Route,
 	return &engine.Delete{DML: edml}, nil
 }
 
-func createDMLPrimitive(ctx *plancontext.PlanningContext, rb *operators.Route, hints *queryHints, vTbl *vindexes.Table, query string, colVindexes []*vindexes.ColumnVindex, vindexQuery string) *engine.DML {
+func createDMLPrimitive(ctx *plancontext.PlanningContext, rb *operators.Route, hints *queryHints, vTbl *vindexes.BaseTable, query string, colVindexes []*vindexes.ColumnVindex, vindexQuery string) *engine.DML {
 	rp := newRoutingParams(ctx, rb.Routing.OpCode())
 	rb.Routing.UpdateRoutingParams(ctx, rp)
 	edml := &engine.DML{
diff --git a/go/vt/vtgate/planbuilder/operators/delete.go b/go/vt/vtgate/planbuilder/operators/delete.go
index 015220470e0..23c909e0a04 100644
--- a/go/vt/vtgate/planbuilder/operators/delete.go
+++ b/go/vt/vtgate/planbuilder/operators/delete.go
@@ -71,7 +71,7 @@ func createOperatorFromDelete(ctx *plancontext.PlanningContext, deleteStmt *sqlp
 	}
 
 	delClone := sqlparser.Clone(deleteStmt)
-	var vTbl *vindexes.Table
+	var vTbl *vindexes.BaseTable
 	op, vTbl = createDeleteOperator(ctx, deleteStmt)
 
 	if deleteStmt.Comments != nil {
@@ -154,7 +154,7 @@ func createDeleteWithInputOp(ctx *plancontext.PlanningContext, del *sqlparser.De
 }
 
 // getFirstVindex returns the first Vindex, if available
-func getFirstVindex(vTbl *vindexes.Table) vindexes.Vindex {
+func getFirstVindex(vTbl *vindexes.BaseTable) vindexes.Vindex {
 	if len(vTbl.ColumnVindexes) > 0 {
 		return vTbl.ColumnVindexes[0].Vindex
 	}
@@ -204,7 +204,7 @@ func createDeleteOpWithTarget(ctx *plancontext.PlanningContext, target semantics
 	}
 }
 
-func createDeleteOperator(ctx *plancontext.PlanningContext, del *sqlparser.Delete) (Operator, *vindexes.Table) {
+func createDeleteOperator(ctx *plancontext.PlanningContext, del *sqlparser.Delete) (Operator, *vindexes.BaseTable) {
 	op := crossJoin(ctx, del.TableExprs)
 
 	sqc := &SubQueryBuilder{}
@@ -310,7 +310,7 @@ func addOrdering(ctx *plancontext.PlanningContext, op Operator, orderBy sqlparse
 	return newOrdering(op, order)
 }
 
-func updateQueryGraphWithSource(ctx *plancontext.PlanningContext, input Operator, tblID semantics.TableSet, vTbl *vindexes.Table) *vindexes.Table {
+func updateQueryGraphWithSource(ctx *plancontext.PlanningContext, input Operator, tblID semantics.TableSet, vTbl *vindexes.BaseTable) *vindexes.BaseTable {
 	sourceTable, _, _, _, _, err := ctx.VSchema.FindTableOrVindex(vTbl.Source.TableName)
 	if err != nil {
 		panic(err)
@@ -339,7 +339,7 @@ func updateQueryGraphWithSource(ctx *plancontext.PlanningContext, input Operator
 	return vTbl
 }
 
-func createFkCascadeOpForDelete(ctx *plancontext.PlanningContext, parentOp Operator, delStmt *sqlparser.Delete, childFks []vindexes.ChildFKInfo, deletedTbl *vindexes.Table) Operator {
+func createFkCascadeOpForDelete(ctx *plancontext.PlanningContext, parentOp Operator, delStmt *sqlparser.Delete, childFks []vindexes.ChildFKInfo, deletedTbl *vindexes.BaseTable) Operator {
 	var fkChildren []*FkChild
 	var selectExprs []sqlparser.SelectExpr
 	tblName := delStmt.Targets[0]
diff --git a/go/vt/vtgate/planbuilder/operators/dml_planning.go b/go/vt/vtgate/planbuilder/operators/dml_planning.go
index 866c308956c..bf8fce7287e 100644
--- a/go/vt/vtgate/planbuilder/operators/dml_planning.go
+++ b/go/vt/vtgate/planbuilder/operators/dml_planning.go
@@ -35,14 +35,14 @@ type DMLCommon struct {
 
 type TargetTable struct {
 	ID     semantics.TableSet
-	VTable *vindexes.Table
+	VTable *vindexes.BaseTable
 	Name   sqlparser.TableName
 }
 
 // dmlOp stores intermediary value for Update/Delete Operator with the vindexes. Table for ordering.
 type dmlOp struct {
 	op      Operator
-	vTbl    *vindexes.Table
+	vTbl    *vindexes.BaseTable
 	cols    []*sqlparser.ColName
 	updList updList
 }
@@ -87,7 +87,7 @@ func shortDesc(target TargetTable, ovq *sqlparser.Select) string {
 
 // getVindexInformation returns the vindex and VindexPlusPredicates for the DML,
 // If it cannot find a unique vindex match, it returns an error.
-func getVindexInformation(id semantics.TableSet, table *vindexes.Table) *vindexes.ColumnVindex {
+func getVindexInformation(id semantics.TableSet, table *vindexes.BaseTable) *vindexes.ColumnVindex {
 	// Check that we have a primary vindex which is valid
 	if len(table.ColumnVindexes) == 0 || !table.ColumnVindexes[0].IsUnique() {
 		panic(vterrors.VT09001(table.Name))
diff --git a/go/vt/vtgate/planbuilder/operators/helpers.go b/go/vt/vtgate/planbuilder/operators/helpers.go
index 36b10c96ae1..52c50d15053 100644
--- a/go/vt/vtgate/planbuilder/operators/helpers.go
+++ b/go/vt/vtgate/planbuilder/operators/helpers.go
@@ -138,7 +138,7 @@ func QualifiedTableNames(ks *vindexes.Keyspace, ts []sqlparser.TableName) []stri
 	return collect()
 }
 
-func QualifiedTables(ks *vindexes.Keyspace, vts []*vindexes.Table) []string {
+func QualifiedTables(ks *vindexes.Keyspace, vts []*vindexes.BaseTable) []string {
 	add, collect := collectSortedUniqueStrings()
 	for _, vt := range vts {
 		add(QualifiedIdentifier(ks, vt.Name))
diff --git a/go/vt/vtgate/planbuilder/operators/insert.go b/go/vt/vtgate/planbuilder/operators/insert.go
index ae125dea19c..f6d86d49ca2 100644
--- a/go/vt/vtgate/planbuilder/operators/insert.go
+++ b/go/vt/vtgate/planbuilder/operators/insert.go
@@ -31,7 +31,7 @@ import (
 // Insert represents an insert operation on a table.
 type Insert struct {
 	// VTable represents the target table for the insert operation.
-	VTable *vindexes.Table
+	VTable *vindexes.BaseTable
 	// AST represents the insert statement from the SQL syntax.
 	AST *sqlparser.Insert
 
@@ -146,7 +146,7 @@ func createOperatorFromInsert(ctx *plancontext.PlanningContext, ins *sqlparser.I
 	return &Sequential{Sources: []Operator{delOp, insOp}}
 }
 
-func checkAndCreateInsertOperator(ctx *plancontext.PlanningContext, ins *sqlparser.Insert, vTbl *vindexes.Table, routing Routing) Operator {
+func checkAndCreateInsertOperator(ctx *plancontext.PlanningContext, ins *sqlparser.Insert, vTbl *vindexes.BaseTable, routing Routing) Operator {
 	insOp := createInsertOperator(ctx, ins, vTbl, routing)
 
 	// Find the foreign key mode and for unmanaged foreign-key-mode, we don't need to do anything.
@@ -200,7 +200,7 @@ func getWhereCondExpr(compExprs []*sqlparser.ComparisonExpr) sqlparser.Expr {
 	return outputExpr
 }
 
-func pkCompExpression(vTbl *vindexes.Table, ins *sqlparser.Insert, rows sqlparser.Values) *sqlparser.ComparisonExpr {
+func pkCompExpression(vTbl *vindexes.BaseTable, ins *sqlparser.Insert, rows sqlparser.Values) *sqlparser.ComparisonExpr {
 	if len(vTbl.PrimaryKey) == 0 {
 		return nil
 	}
@@ -227,7 +227,7 @@ type pComp struct {
 	col sqlparser.IdentifierCI
 }
 
-func findPKIndexes(vTbl *vindexes.Table, ins *sqlparser.Insert) (pIndexes []pComp, pColTuple sqlparser.ValTuple) {
+func findPKIndexes(vTbl *vindexes.BaseTable, ins *sqlparser.Insert) (pIndexes []pComp, pColTuple sqlparser.ValTuple) {
 	for _, pCol := range vTbl.PrimaryKey {
 		var def sqlparser.Expr
 		idx := ins.Columns.FindColumn(pCol)
@@ -244,7 +244,7 @@ func findPKIndexes(vTbl *vindexes.Table, ins *sqlparser.Insert) (pIndexes []pCom
 	return
 }
 
-func findDefault(vTbl *vindexes.Table, pCol sqlparser.IdentifierCI) sqlparser.Expr {
+func findDefault(vTbl *vindexes.BaseTable, pCol sqlparser.IdentifierCI) sqlparser.Expr {
 	for _, column := range vTbl.Columns {
 		if column.Name.Equal(pCol) {
 			return column.Default
@@ -258,7 +258,7 @@ type uComp struct {
 	def sqlparser.Expr
 }
 
-func uniqKeyCompExpressions(vTbl *vindexes.Table, ins *sqlparser.Insert, rows sqlparser.Values) (comps []*sqlparser.ComparisonExpr) {
+func uniqKeyCompExpressions(vTbl *vindexes.BaseTable, ins *sqlparser.Insert, rows sqlparser.Values) (comps []*sqlparser.ComparisonExpr) {
 	noOfUniqKeys := len(vTbl.UniqueKeys)
 	if noOfUniqKeys == 0 {
 		return nil
@@ -322,7 +322,7 @@ func uniqKeyCompExpressions(vTbl *vindexes.Table, ins *sqlparser.Insert, rows sq
 	return compExprs
 }
 
-func createUniqueKeyComp(ins *sqlparser.Insert, expr sqlparser.Expr, vTbl *vindexes.Table) ([]uComp, bool) {
+func createUniqueKeyComp(ins *sqlparser.Insert, expr sqlparser.Expr, vTbl *vindexes.BaseTable) ([]uComp, bool) {
 	col, isCol := expr.(*sqlparser.ColName)
 	if isCol {
 		var def sqlparser.Expr
@@ -357,7 +357,7 @@ func createUniqueKeyComp(ins *sqlparser.Insert, expr sqlparser.Expr, vTbl *vinde
 	return offsets, false
 }
 
-func createInsertOperator(ctx *plancontext.PlanningContext, insStmt *sqlparser.Insert, vTbl *vindexes.Table, routing Routing) (op Operator) {
+func createInsertOperator(ctx *plancontext.PlanningContext, insStmt *sqlparser.Insert, vTbl *vindexes.BaseTable, routing Routing) (op Operator) {
 	if _, target := routing.(*TargetedRouting); target {
 		panic(vterrors.VT09017("INSERT with a target destination is not allowed"))
 	}
@@ -595,7 +595,7 @@ func findColumn(ins *sqlparser.Insert, col sqlparser.IdentifierCI) int {
 	return -1
 }
 
-func populateInsertColumnlist(ins *sqlparser.Insert, table *vindexes.Table) *sqlparser.Insert {
+func populateInsertColumnlist(ins *sqlparser.Insert, table *vindexes.BaseTable) *sqlparser.Insert {
 	cols := make(sqlparser.Columns, 0, len(table.Columns))
 	for _, c := range table.Columns {
 		cols = append(cols, c.Name)
@@ -606,7 +606,7 @@ func populateInsertColumnlist(ins *sqlparser.Insert, table *vindexes.Table) *sql
 
 // modifyForAutoinc modifies the AST and the plan to generate necessary autoinc values.
 // For row values cases, bind variable names are generated using baseName.
-func modifyForAutoinc(ctx *plancontext.PlanningContext, ins *sqlparser.Insert, vTable *vindexes.Table) *Generate {
+func modifyForAutoinc(ctx *plancontext.PlanningContext, ins *sqlparser.Insert, vTable *vindexes.BaseTable) *Generate {
 	if vTable.AutoIncrement == nil {
 		return nil
 	}
diff --git a/go/vt/vtgate/planbuilder/operators/route.go b/go/vt/vtgate/planbuilder/operators/route.go
index e398fb05607..904d5085718 100644
--- a/go/vt/vtgate/planbuilder/operators/route.go
+++ b/go/vt/vtgate/planbuilder/operators/route.go
@@ -365,7 +365,7 @@ func findVSchemaTableAndCreateRoute(
 	)
 }
 
-func createTargetedRouting(ctx *plancontext.PlanningContext, target key.Destination, tabletType topodatapb.TabletType, vschemaTable *vindexes.Table) Routing {
+func createTargetedRouting(ctx *plancontext.PlanningContext, target key.Destination, tabletType topodatapb.TabletType, vschemaTable *vindexes.BaseTable) Routing {
 	switch ctx.Statement.(type) {
 	case *sqlparser.Update:
 		if tabletType != topodatapb.TabletType_PRIMARY {
@@ -401,7 +401,7 @@ func createTargetedRouting(ctx *plancontext.PlanningContext, target key.Destinat
 func createRouteFromVSchemaTable(
 	ctx *plancontext.PlanningContext,
 	queryTable *QueryTable,
-	vschemaTable *vindexes.Table,
+	vschemaTable *vindexes.BaseTable,
 	planAlternates bool,
 	targeted Routing,
 ) *Route {
@@ -457,7 +457,7 @@ func createRouteFromVSchemaTable(
 	return plan
 }
 
-func createRoutingForVTable(ctx *plancontext.PlanningContext, vschemaTable *vindexes.Table, id semantics.TableSet) Routing {
+func createRoutingForVTable(ctx *plancontext.PlanningContext, vschemaTable *vindexes.BaseTable, id semantics.TableSet) Routing {
 	switch {
 	case vschemaTable.Type == vindexes.TypeSequence:
 		return &SequenceRouting{keyspace: vschemaTable.Keyspace}
@@ -473,7 +473,7 @@ func createRoutingForVTable(ctx *plancontext.PlanningContext, vschemaTable *vind
 func createAlternateRoutesFromVSchemaTable(
 	ctx *plancontext.PlanningContext,
 	queryTable *QueryTable,
-	vschemaTable *vindexes.Table,
+	vschemaTable *vindexes.BaseTable,
 ) map[*vindexes.Keyspace]*Route {
 	routes := make(map[*vindexes.Keyspace]*Route)
 
diff --git a/go/vt/vtgate/planbuilder/operators/route_planning.go b/go/vt/vtgate/planbuilder/operators/route_planning.go
index 90eb16e1562..b5bcf37c127 100644
--- a/go/vt/vtgate/planbuilder/operators/route_planning.go
+++ b/go/vt/vtgate/planbuilder/operators/route_planning.go
@@ -82,7 +82,7 @@ func buildVindexTableForDML(
 	table *QueryTable,
 	ins *sqlparser.Insert,
 	dmlType string,
-) (*vindexes.Table, Routing) {
+) (*vindexes.BaseTable, Routing) {
 	vindexTable := tableInfo.GetVindexTable()
 	if tableInfo.GetVindexTable().Type == vindexes.TypeReference && vindexTable.Source != nil {
 		sourceTable, _, _, _, _, err := ctx.VSchema.FindTableOrVindex(vindexTable.Source.TableName)
@@ -179,7 +179,7 @@ func createInfSchemaRoute(ctx *plancontext.PlanningContext, table *QueryTable) O
 	}
 	var src Operator = &Table{
 		QTable: table,
-		VTable: &vindexes.Table{
+		VTable: &vindexes.BaseTable{
 			Name:     table.Table.Name,
 			Keyspace: ks,
 		},
diff --git a/go/vt/vtgate/planbuilder/operators/sharded_routing.go b/go/vt/vtgate/planbuilder/operators/sharded_routing.go
index 2c8873dee07..9ad567c71b1 100644
--- a/go/vt/vtgate/planbuilder/operators/sharded_routing.go
+++ b/go/vt/vtgate/planbuilder/operators/sharded_routing.go
@@ -51,7 +51,7 @@ type ShardedRouting struct {
 
 var _ Routing = (*ShardedRouting)(nil)
 
-func newShardedRouting(ctx *plancontext.PlanningContext, vtable *vindexes.Table, id semantics.TableSet) Routing {
+func newShardedRouting(ctx *plancontext.PlanningContext, vtable *vindexes.BaseTable, id semantics.TableSet) Routing {
 	routing := &ShardedRouting{
 		RouteOpCode: engine.Scatter,
 		keyspace:    vtable.Keyspace,
diff --git a/go/vt/vtgate/planbuilder/operators/table.go b/go/vt/vtgate/planbuilder/operators/table.go
index 4391380480c..473459d6864 100644
--- a/go/vt/vtgate/planbuilder/operators/table.go
+++ b/go/vt/vtgate/planbuilder/operators/table.go
@@ -30,7 +30,7 @@ import (
 type (
 	Table struct {
 		QTable  *QueryTable
-		VTable  *vindexes.Table
+		VTable  *vindexes.BaseTable
 		Columns []*sqlparser.ColName
 
 		nullaryOperator
diff --git a/go/vt/vtgate/planbuilder/operators/update.go b/go/vt/vtgate/planbuilder/operators/update.go
index 18a81175f7b..0fa0d10d9c7 100644
--- a/go/vt/vtgate/planbuilder/operators/update.go
+++ b/go/vt/vtgate/planbuilder/operators/update.go
@@ -543,7 +543,7 @@ func addColumns(ctx *plancontext.PlanningContext, columns sqlparser.Columns, exp
 // For an update query having non-literal updates, we add the updated expression and a comparison expression to the select query.
 // For example, for a query like `update fk_table set col = id * 100 + 1`
 // We would add the expression `id * 100 + 1` and the comparison expression `col <=> id * 100 + 1` to the select query.
-func addNonLiteralUpdExprToSelect(ctx *plancontext.PlanningContext, updatedTable *vindexes.Table, updExpr *sqlparser.UpdateExpr, exprs []sqlparser.SelectExpr) (engine.NonLiteralUpdateInfo, []sqlparser.SelectExpr) {
+func addNonLiteralUpdExprToSelect(ctx *plancontext.PlanningContext, updatedTable *vindexes.BaseTable, updExpr *sqlparser.UpdateExpr, exprs []sqlparser.SelectExpr) (engine.NonLiteralUpdateInfo, []sqlparser.SelectExpr) {
 	// Create the comparison expression.
 	castedExpr := getCastedUpdateExpression(updatedTable, updExpr)
 	compExpr := sqlparser.NewComparisonExpr(sqlparser.NullSafeEqualOp, updExpr.Name, castedExpr, nil)
@@ -572,7 +572,7 @@ func addNonLiteralUpdExprToSelect(ctx *plancontext.PlanningContext, updatedTable
 	return info, exprs
 }
 
-func getCastedUpdateExpression(updatedTable *vindexes.Table, updExpr *sqlparser.UpdateExpr) sqlparser.Expr {
+func getCastedUpdateExpression(updatedTable *vindexes.BaseTable, updExpr *sqlparser.UpdateExpr) sqlparser.Expr {
 	castTypeStr := getCastTypeForColumn(updatedTable, updExpr)
 	if castTypeStr == "" {
 		return updExpr.Expr
@@ -585,7 +585,7 @@ func getCastedUpdateExpression(updatedTable *vindexes.Table, updExpr *sqlparser.
 	}
 }
 
-func getCastTypeForColumn(updatedTable *vindexes.Table, updExpr *sqlparser.UpdateExpr) string {
+func getCastTypeForColumn(updatedTable *vindexes.BaseTable, updExpr *sqlparser.UpdateExpr) string {
 	var ty querypb.Type
 	for _, column := range updatedTable.Columns {
 		if updExpr.Name.Name.Equal(column.Name) {
@@ -616,7 +616,7 @@ func getCastTypeForColumn(updatedTable *vindexes.Table, updExpr *sqlparser.Updat
 }
 
 // createFkChildForUpdate creates the update query operator for the child table based on the foreign key constraints.
-func createFkChildForUpdate(ctx *plancontext.PlanningContext, fk vindexes.ChildFKInfo, selectOffsets []int, nonLiteralUpdateInfo []engine.NonLiteralUpdateInfo, updatedTable *vindexes.Table) *FkChild {
+func createFkChildForUpdate(ctx *plancontext.PlanningContext, fk vindexes.ChildFKInfo, selectOffsets []int, nonLiteralUpdateInfo []engine.NonLiteralUpdateInfo, updatedTable *vindexes.BaseTable) *FkChild {
 	// Create a ValTuple of child column names
 	var valTuple sqlparser.ValTuple
 	for _, column := range fk.ChildColumns {
@@ -660,7 +660,7 @@ func createFkChildForUpdate(ctx *plancontext.PlanningContext, fk vindexes.ChildF
 // The query looks like this -
 //
 //	`UPDATE <child_table> SET <child_column_updated_using_update_exprs_from_parent_update_query> WHERE <child_columns_in_fk> IN (<bind variable for the output from SELECT>)`
-func buildChildUpdOpForCascade(ctx *plancontext.PlanningContext, fk vindexes.ChildFKInfo, childWhereExpr sqlparser.Expr, nonLiteralUpdateInfo []engine.NonLiteralUpdateInfo, updatedTable *vindexes.Table) Operator {
+func buildChildUpdOpForCascade(ctx *plancontext.PlanningContext, fk vindexes.ChildFKInfo, childWhereExpr sqlparser.Expr, nonLiteralUpdateInfo []engine.NonLiteralUpdateInfo, updatedTable *vindexes.BaseTable) Operator {
 	// The update expressions are the same as the update expressions in the parent update query
 	// with the column names replaced with the child column names.
 	var childUpdateExprs sqlparser.UpdateExprs
@@ -708,7 +708,7 @@ func buildChildUpdOpForSetNull(
 	fk vindexes.ChildFKInfo,
 	childWhereExpr sqlparser.Expr,
 	nonLiteralUpdateInfo []engine.NonLiteralUpdateInfo,
-	updatedTable *vindexes.Table,
+	updatedTable *vindexes.BaseTable,
 ) Operator {
 	// For the SET NULL type constraint, we need to set all the child columns to NULL.
 	var childUpdateExprs sqlparser.UpdateExprs
@@ -769,7 +769,7 @@ func createFKVerifyOp(
 	updStmt *sqlparser.Update,
 	parentFks []vindexes.ParentFKInfo,
 	restrictChildFks []vindexes.ChildFKInfo,
-	updatedTable *vindexes.Table,
+	updatedTable *vindexes.BaseTable,
 ) Operator {
 	if len(parentFks) == 0 && len(restrictChildFks) == 0 {
 		return childOp
@@ -811,7 +811,7 @@ func createFKVerifyOp(
 // where Parent.p1 is null and Parent.p2 is null and Child.id = 1 and Child.c2 + 1 is not null
 // and Child.c2 is not null and not ((Child.c1) <=> (Child.c2 + 1))
 // limit 1
-func createFkVerifyOpForParentFKForUpdate(ctx *plancontext.PlanningContext, updatedTable *vindexes.Table, updStmt *sqlparser.Update, pFK vindexes.ParentFKInfo) Operator {
+func createFkVerifyOpForParentFKForUpdate(ctx *plancontext.PlanningContext, updatedTable *vindexes.BaseTable, updStmt *sqlparser.Update, pFK vindexes.ParentFKInfo) Operator {
 	childTblExpr := updStmt.TableExprs[0].(*sqlparser.AliasedTableExpr)
 	childTbl, err := childTblExpr.TableName()
 	if err != nil {
@@ -903,14 +903,14 @@ func createFkVerifyOpForParentFKForUpdate(ctx *plancontext.PlanningContext, upda
 		getVerifyLock(updatedTable))
 }
 
-func getVerifyLock(vTbl *vindexes.Table) sqlparser.Lock {
+func getVerifyLock(vTbl *vindexes.BaseTable) sqlparser.Lock {
 	if len(vTbl.UniqueKeys) > 0 {
 		return sqlparser.ForShareLockNoWait
 	}
 	return sqlparser.ForShareLock
 }
 
-func getUpdateLock(vTbl *vindexes.Table) sqlparser.Lock {
+func getUpdateLock(vTbl *vindexes.BaseTable) sqlparser.Lock {
 	if len(vTbl.UniqueKeys) > 0 {
 		return sqlparser.ForUpdateLockNoWait
 	}
@@ -925,7 +925,7 @@ func getUpdateLock(vTbl *vindexes.Table) sqlparser.Lock {
 // verify query:
 // select 1 from Child join Parent on Parent.p1 = Child.c1 and Parent.p2 = Child.c2
 // where Parent.id = 1 and ((Parent.col + 1) IS NULL OR (child.c1) NOT IN ((Parent.col + 1))) limit 1
-func createFkVerifyOpForChildFKForUpdate(ctx *plancontext.PlanningContext, updatedTable *vindexes.Table, updStmt *sqlparser.Update, cFk vindexes.ChildFKInfo) Operator {
+func createFkVerifyOpForChildFKForUpdate(ctx *plancontext.PlanningContext, updatedTable *vindexes.BaseTable, updStmt *sqlparser.Update, cFk vindexes.ChildFKInfo) Operator {
 	// ON UPDATE RESTRICT foreign keys that require validation, should only be allowed in the case where we
 	// are verifying all the FKs on vtgate level.
 	if !ctx.VerifyAllFKs {
@@ -992,7 +992,7 @@ func createFkVerifyOpForChildFKForUpdate(ctx *plancontext.PlanningContext, updat
 // `:v1 IS NULL OR :v2 IS NULL OR (cola, colb) NOT IN ((:v1,:v2))`
 // So, if either of :v1 or :v2 is NULL, then the entire condition is true (which is the same as not having the condition when :v1 or :v2 is NULL)
 // This expression is used in cascading SET NULLs and in verifying whether an update should be restricted.
-func nullSafeNotInComparison(ctx *plancontext.PlanningContext, updatedTable *vindexes.Table, updateExprs sqlparser.UpdateExprs, cFk vindexes.ChildFKInfo, parentTbl sqlparser.TableName, nonLiteralUpdateInfo []engine.NonLiteralUpdateInfo, appendQualifier bool) sqlparser.Expr {
+func nullSafeNotInComparison(ctx *plancontext.PlanningContext, updatedTable *vindexes.BaseTable, updateExprs sqlparser.UpdateExprs, cFk vindexes.ChildFKInfo, parentTbl sqlparser.TableName, nonLiteralUpdateInfo []engine.NonLiteralUpdateInfo, appendQualifier bool) sqlparser.Expr {
 	var valTuple sqlparser.ValTuple
 	var updateValues sqlparser.ValTuple
 	for idx, updateExpr := range updateExprs {
@@ -1031,7 +1031,7 @@ func nullSafeNotInComparison(ctx *plancontext.PlanningContext, updatedTable *vin
 func buildChangedVindexesValues(
 	ctx *plancontext.PlanningContext,
 	update *sqlparser.Update,
-	table *vindexes.Table,
+	table *vindexes.BaseTable,
 	ksidCols []sqlparser.IdentifierCI,
 	assignments []SetExpr,
 ) (changedVindexes map[string]*engine.VindexValues, ovq *sqlparser.Select, subQueriesArgOnChangedVindex []string) {
@@ -1076,7 +1076,7 @@ func buildChangedVindexesValues(
 	return changedVindexes, ovq, subQueriesArgOnChangedVindex
 }
 
-func initialQuery(ksidCols []sqlparser.IdentifierCI, table *vindexes.Table) (sqlparser.SelectExprs, int) {
+func initialQuery(ksidCols []sqlparser.IdentifierCI, table *vindexes.BaseTable) (sqlparser.SelectExprs, int) {
 	var selExprs sqlparser.SelectExprs
 	offset := 0
 	for _, col := range ksidCols {
diff --git a/go/vt/vtgate/planbuilder/operators/update_test.go b/go/vt/vtgate/planbuilder/operators/update_test.go
index 6cdf7be3f7d..6efe113813c 100644
--- a/go/vt/vtgate/planbuilder/operators/update_test.go
+++ b/go/vt/vtgate/planbuilder/operators/update_test.go
@@ -125,7 +125,7 @@ func TestGetCastTypeForColumn(t *testing.T) {
 			updExpr := &sqlparser.UpdateExpr{
 				Name: sqlparser.NewColName("col"),
 			}
-			updatedTable := &vindexes.Table{
+			updatedTable := &vindexes.BaseTable{
 				Columns: []vindexes.Column{
 					{
 						Name: sqlparser.NewIdentifierCI("col"),
diff --git a/go/vt/vtgate/planbuilder/operators/upsert.go b/go/vt/vtgate/planbuilder/operators/upsert.go
index bfe2a1cbc52..90cee8a5607 100644
--- a/go/vt/vtgate/planbuilder/operators/upsert.go
+++ b/go/vt/vtgate/planbuilder/operators/upsert.go
@@ -74,7 +74,7 @@ func (u *Upsert) GetOrdering(ctx *plancontext.PlanningContext) []OrderBy {
 	return nil
 }
 
-func createUpsertOperator(ctx *plancontext.PlanningContext, ins *sqlparser.Insert, insOp Operator, rows sqlparser.Values, vTbl *vindexes.Table) Operator {
+func createUpsertOperator(ctx *plancontext.PlanningContext, ins *sqlparser.Insert, insOp Operator, rows sqlparser.Values, vTbl *vindexes.BaseTable) Operator {
 	if len(vTbl.UniqueKeys) != 0 {
 		panic(vterrors.VT12001("ON DUPLICATE KEY UPDATE with foreign keys with unique keys"))
 	}
diff --git a/go/vt/vtgate/planbuilder/operators/vindex.go b/go/vt/vtgate/planbuilder/operators/vindex.go
index 30f13701df6..cb0719b815f 100644
--- a/go/vt/vtgate/planbuilder/operators/vindex.go
+++ b/go/vt/vtgate/planbuilder/operators/vindex.go
@@ -44,7 +44,7 @@ type (
 		Alias      *sqlparser.AliasedTableExpr
 		Table      sqlparser.TableName
 		Predicates []sqlparser.Expr
-		VTable     *vindexes.Table
+		VTable     *vindexes.BaseTable
 	}
 )
 
diff --git a/go/vt/vtgate/planbuilder/plancontext/planning_context_test.go b/go/vt/vtgate/planbuilder/plancontext/planning_context_test.go
index 2844f7e87dc..b13c2112e3a 100644
--- a/go/vt/vtgate/planbuilder/plancontext/planning_context_test.go
+++ b/go/vt/vtgate/planbuilder/plancontext/planning_context_test.go
@@ -191,7 +191,7 @@ func (v *vschema) FindViewTarget(name sqlparser.TableName) (*vindexes.Keyspace,
 	panic("implement me")
 }
 
-func (v *vschema) FindTable(tablename sqlparser.TableName) (*vindexes.Table, string, topodatapb.TabletType, key.Destination, error) {
+func (v *vschema) FindTable(tablename sqlparser.TableName) (*vindexes.BaseTable, string, topodatapb.TabletType, key.Destination, error) {
 	// TODO implement me
 	panic("implement me")
 }
@@ -201,7 +201,7 @@ func (v *vschema) FindView(name sqlparser.TableName) sqlparser.TableStatement {
 	panic("implement me")
 }
 
-func (v *vschema) FindTableOrVindex(tablename sqlparser.TableName) (*vindexes.Table, vindexes.Vindex, string, topodatapb.TabletType, key.Destination, error) {
+func (v *vschema) FindTableOrVindex(tablename sqlparser.TableName) (*vindexes.BaseTable, vindexes.Vindex, string, topodatapb.TabletType, key.Destination, error) {
 	// TODO implement me
 	panic("implement me")
 }
diff --git a/go/vt/vtgate/planbuilder/plancontext/vschema.go b/go/vt/vtgate/planbuilder/plancontext/vschema.go
index c810324f369..1b86225382c 100644
--- a/go/vt/vtgate/planbuilder/plancontext/vschema.go
+++ b/go/vt/vtgate/planbuilder/plancontext/vschema.go
@@ -24,11 +24,11 @@ type PlannerVersion = querypb.ExecuteOptions_PlannerVersion
 // VSchema defines the interface for this package to fetch
 // info about tables.
 type VSchema interface {
-	FindTable(tablename sqlparser.TableName) (*vindexes.Table, string, topodatapb.TabletType, key.Destination, error)
+	FindTable(tablename sqlparser.TableName) (*vindexes.BaseTable, string, topodatapb.TabletType, key.Destination, error)
 	FindView(name sqlparser.TableName) sqlparser.TableStatement
 	// FindViewTarget finds the target keyspace for the view table provided.
 	FindViewTarget(name sqlparser.TableName) (*vindexes.Keyspace, error)
-	FindTableOrVindex(tablename sqlparser.TableName) (*vindexes.Table, vindexes.Vindex, string, topodatapb.TabletType, key.Destination, error)
+	FindTableOrVindex(tablename sqlparser.TableName) (*vindexes.BaseTable, vindexes.Vindex, string, topodatapb.TabletType, key.Destination, error)
 
 	// SelectedKeyspace returns the current keyspace if set, otherwise returns an error
 	SelectedKeyspace() (*vindexes.Keyspace, error)
diff --git a/go/vt/vtgate/planbuilder/planner_test.go b/go/vt/vtgate/planbuilder/planner_test.go
index c3caf9f3536..bd4c520510c 100644
--- a/go/vt/vtgate/planbuilder/planner_test.go
+++ b/go/vt/vtgate/planbuilder/planner_test.go
@@ -63,7 +63,7 @@ func TestBindingSubquery(t *testing.T) {
 			require.NoError(t, err)
 			selStmt := parse.(*sqlparser.Select)
 			semTable, err := semantics.Analyze(selStmt, "d", &semantics.FakeSI{
-				Tables: map[string]*vindexes.Table{
+				Tables: map[string]*vindexes.BaseTable{
 					"tabl": {Name: sqlparser.NewIdentifierCS("tabl")},
 					"foo":  {Name: sqlparser.NewIdentifierCS("foo")},
 				},
diff --git a/go/vt/vtgate/planbuilder/update.go b/go/vt/vtgate/planbuilder/update.go
index d653df867fb..fb3fd08ecb5 100644
--- a/go/vt/vtgate/planbuilder/update.go
+++ b/go/vt/vtgate/planbuilder/update.go
@@ -82,7 +82,7 @@ func gen4UpdateStmtPlanner(
 	return newPlanResult(plan, operators.TablesUsed(op)...), nil
 }
 
-func updateUnshardedShortcut(stmt *sqlparser.Update, ks *vindexes.Keyspace, tables []*vindexes.Table) engine.Primitive {
+func updateUnshardedShortcut(stmt *sqlparser.Update, ks *vindexes.Keyspace, tables []*vindexes.BaseTable) engine.Primitive {
 	edml := engine.NewDML()
 	edml.Keyspace = ks
 	edml.Opcode = engine.Unsharded
diff --git a/go/vt/vtgate/planbuilder/vexplain.go b/go/vt/vtgate/planbuilder/vexplain.go
index a12139c3068..061fa85473d 100644
--- a/go/vt/vtgate/planbuilder/vexplain.go
+++ b/go/vt/vtgate/planbuilder/vexplain.go
@@ -64,7 +64,7 @@ func explainTabPlan(explain *sqlparser.ExplainTab, vschema plancontext.VSchema)
 			return nil, err
 		}
 	} else {
-		var tbl *vindexes.Table
+		var tbl *vindexes.BaseTable
 		var err error
 		tbl, _, _, _, dest, err = vschema.FindTableOrVindex(explain.Table)
 		if err != nil {
diff --git a/go/vt/vtgate/schema/tracker.go b/go/vt/vtgate/schema/tracker.go
index 4dae11cded9..a425efa68fb 100644
--- a/go/vt/vtgate/schema/tracker.go
+++ b/go/vt/vtgate/schema/tracker.go
@@ -545,6 +545,7 @@ func (vm *viewMap) set(ks, tbl, sql string) {
 		log.Warningf("ignoring view '%s', view definition is not a create view query: %T", tbl, stmt)
 		return
 	}
+	sqlparser.AddKeyspace(cv.Select, ks)
 	m[tbl] = cv.Select
 }
 
diff --git a/go/vt/vtgate/schema/tracker_test.go b/go/vt/vtgate/schema/tracker_test.go
index e5280c78ed8..0cdde88b471 100644
--- a/go/vt/vtgate/schema/tracker_test.go
+++ b/go/vt/vtgate/schema/tracker_test.go
@@ -27,7 +27,6 @@ import (
 	"github.com/stretchr/testify/require"
 
 	"vitess.io/vitess/go/sqltypes"
-
 	"vitess.io/vitess/go/test/utils"
 	"vitess.io/vitess/go/vt/discovery"
 	"vitess.io/vitess/go/vt/log"
@@ -271,37 +270,37 @@ func TestViewsTracking(t *testing.T) {
 	testcases := []testCases{{
 		testName: "initial view load",
 		expView: map[string]string{
-			"prior": "select 1 from tbl"},
+			"prior": "select 1 from ks.tbl"},
 	}, {
 		testName: "new view t1, V1",
 		updView:  []string{"t1", "V1"},
 		expView: map[string]string{
-			"t1":    "select 1 from tbl1",
-			"V1":    "select 1 from tbl2",
-			"prior": "select 1 from tbl"},
+			"t1":    "select 1 from ks.tbl1",
+			"V1":    "select 1 from ks.tbl2",
+			"prior": "select 1 from ks.tbl"},
 	}, {
 		testName: "delete prior, updated V1 and new t3",
 		updView:  []string{"prior", "V1", "t3"},
 		expView: map[string]string{
-			"t1": "select 1 from tbl1",
-			"V1": "select 1, 2 from tbl2",
-			"t3": "select 1 from tbl3"},
+			"t1": "select 1 from ks.tbl1",
+			"V1": "select 1, 2 from ks.tbl2",
+			"t3": "select 1 from ks.tbl3"},
 	}, {
 		testName: "new t4",
 		updView:  []string{"t4"},
 		expView: map[string]string{
-			"t1": "select 1 from tbl1",
-			"V1": "select 1, 2 from tbl2",
-			"t3": "select 1 from tbl3",
-			"t4": "select 1 from tbl4"},
+			"t1": "select 1 from ks.tbl1",
+			"V1": "select 1, 2 from ks.tbl2",
+			"t3": "select 1 from ks.tbl3",
+			"t4": "select 1 from ks.tbl4"},
 	}, {
 		testName: "new broken t5",
 		updView:  []string{"t5"},
 		expView: map[string]string{
-			"t1": "select 1 from tbl1",
-			"V1": "select 1, 2 from tbl2",
-			"t3": "select 1 from tbl3",
-			"t4": "select 1 from tbl4"},
+			"t1": "select 1 from ks.tbl1",
+			"V1": "select 1, 2 from ks.tbl2",
+			"t3": "select 1 from ks.tbl3",
+			"t4": "select 1 from ks.tbl4"},
 	}}
 
 	testTracker(t, false, schemaDefResult, testcases)
diff --git a/go/vt/vtgate/semantics/FakeSI.go b/go/vt/vtgate/semantics/FakeSI.go
index cb1b9cec094..8e24a029002 100644
--- a/go/vt/vtgate/semantics/FakeSI.go
+++ b/go/vt/vtgate/semantics/FakeSI.go
@@ -32,7 +32,7 @@ var _ SchemaInformation = (*FakeSI)(nil)
 
 // FakeSI is a fake SchemaInformation for testing
 type FakeSI struct {
-	Tables           map[string]*vindexes.Table
+	Tables           map[string]*vindexes.BaseTable
 	VindexTables     map[string]vindexes.Vindex
 	KsForeignKeyMode map[string]vschemapb.Keyspace_ForeignKeyMode
 	KsError          map[string]error
@@ -40,7 +40,7 @@ type FakeSI struct {
 }
 
 // FindTableOrVindex implements the SchemaInformation interface
-func (s *FakeSI) FindTableOrVindex(tablename sqlparser.TableName) (*vindexes.Table, vindexes.Vindex, string, topodatapb.TabletType, key.Destination, error) {
+func (s *FakeSI) FindTableOrVindex(tablename sqlparser.TableName) (*vindexes.BaseTable, vindexes.Vindex, string, topodatapb.TabletType, key.Destination, error) {
 	table, ok := s.Tables[sqlparser.String(tablename)]
 	if ok {
 		return table, nil, "", 0, nil, nil
diff --git a/go/vt/vtgate/semantics/analyzer_test.go b/go/vt/vtgate/semantics/analyzer_test.go
index 3f7a21cb6ac..c7f24e6c73c 100644
--- a/go/vt/vtgate/semantics/analyzer_test.go
+++ b/go/vt/vtgate/semantics/analyzer_test.go
@@ -143,7 +143,7 @@ func TestBindingSingleAliasedTableNegative(t *testing.T) {
 			parse, err := sqlparser.NewTestParser().Parse(query)
 			require.NoError(t, err)
 			st, err := Analyze(parse, "", &FakeSI{
-				Tables: map[string]*vindexes.Table{
+				Tables: map[string]*vindexes.BaseTable{
 					"t": {Name: sqlparser.NewIdentifierCS("t")},
 				},
 			})
@@ -294,7 +294,7 @@ func TestBindingMultiTableNegative(t *testing.T) {
 			parse, err := sqlparser.NewTestParser().Parse(query)
 			require.NoError(t, err)
 			_, err = Analyze(parse, "d", &FakeSI{
-				Tables: map[string]*vindexes.Table{
+				Tables: map[string]*vindexes.BaseTable{
 					"tabl": {Name: sqlparser.NewIdentifierCS("tabl")},
 					"foo":  {Name: sqlparser.NewIdentifierCS("foo")},
 				},
@@ -318,7 +318,7 @@ func TestBindingMultiAliasedTableNegative(t *testing.T) {
 			parse, err := sqlparser.NewTestParser().Parse(query)
 			require.NoError(t, err)
 			_, err = Analyze(parse, "d", &FakeSI{
-				Tables: map[string]*vindexes.Table{
+				Tables: map[string]*vindexes.BaseTable{
 					"tabl": {Name: sqlparser.NewIdentifierCS("tabl")},
 					"foo":  {Name: sqlparser.NewIdentifierCS("foo")},
 				},
@@ -383,7 +383,7 @@ func TestMissingTable(t *testing.T) {
 }
 
 func TestUnknownColumnMap2(t *testing.T) {
-	authoritativeTblA := vindexes.Table{
+	authoritativeTblA := vindexes.BaseTable{
 		Name: sqlparser.NewIdentifierCS("a"),
 		Columns: []vindexes.Column{{
 			Name: sqlparser.NewIdentifierCI("col2"),
@@ -391,7 +391,7 @@ func TestUnknownColumnMap2(t *testing.T) {
 		}},
 		ColumnListAuthoritative: true,
 	}
-	authoritativeTblB := vindexes.Table{
+	authoritativeTblB := vindexes.BaseTable{
 		Name: sqlparser.NewIdentifierCS("b"),
 		Columns: []vindexes.Column{{
 			Name: sqlparser.NewIdentifierCI("col"),
@@ -403,7 +403,7 @@ func TestUnknownColumnMap2(t *testing.T) {
 	nonAuthoritativeTblA.ColumnListAuthoritative = false
 	nonAuthoritativeTblB := authoritativeTblB
 	nonAuthoritativeTblB.ColumnListAuthoritative = false
-	authoritativeTblAWithConflict := vindexes.Table{
+	authoritativeTblAWithConflict := vindexes.BaseTable{
 		Name: sqlparser.NewIdentifierCS("a"),
 		Columns: []vindexes.Column{{
 			Name: sqlparser.NewIdentifierCI("col"),
@@ -411,7 +411,7 @@ func TestUnknownColumnMap2(t *testing.T) {
 		}},
 		ColumnListAuthoritative: true,
 	}
-	authoritativeTblBWithInt := vindexes.Table{
+	authoritativeTblBWithInt := vindexes.BaseTable{
 		Name: sqlparser.NewIdentifierCS("b"),
 		Columns: []vindexes.Column{{
 			Name: sqlparser.NewIdentifierCI("col"),
@@ -422,40 +422,40 @@ func TestUnknownColumnMap2(t *testing.T) {
 
 	tests := []struct {
 		name   string
-		schema map[string]*vindexes.Table
+		schema map[string]*vindexes.BaseTable
 		err    bool
 		typ    querypb.Type
 	}{{
 		name:   "no info about tables",
-		schema: map[string]*vindexes.Table{"a": {}, "b": {}},
+		schema: map[string]*vindexes.BaseTable{"a": {}, "b": {}},
 		err:    true,
 	}, {
 		name:   "non authoritative columns",
-		schema: map[string]*vindexes.Table{"a": &nonAuthoritativeTblA, "b": &nonAuthoritativeTblA},
+		schema: map[string]*vindexes.BaseTable{"a": &nonAuthoritativeTblA, "b": &nonAuthoritativeTblA},
 		err:    true,
 	}, {
 		name:   "non authoritative columns - one authoritative and one not",
-		schema: map[string]*vindexes.Table{"a": &nonAuthoritativeTblA, "b": &authoritativeTblB},
+		schema: map[string]*vindexes.BaseTable{"a": &nonAuthoritativeTblA, "b": &authoritativeTblB},
 		err:    false,
 		typ:    sqltypes.VarChar,
 	}, {
 		name:   "non authoritative columns - one authoritative and one not",
-		schema: map[string]*vindexes.Table{"a": &authoritativeTblA, "b": &nonAuthoritativeTblB},
+		schema: map[string]*vindexes.BaseTable{"a": &authoritativeTblA, "b": &nonAuthoritativeTblB},
 		err:    false,
 		typ:    sqltypes.VarChar,
 	}, {
 		name:   "authoritative columns",
-		schema: map[string]*vindexes.Table{"a": &authoritativeTblA, "b": &authoritativeTblB},
+		schema: map[string]*vindexes.BaseTable{"a": &authoritativeTblA, "b": &authoritativeTblB},
 		err:    false,
 		typ:    sqltypes.VarChar,
 	}, {
 		name:   "authoritative columns",
-		schema: map[string]*vindexes.Table{"a": &authoritativeTblA, "b": &authoritativeTblBWithInt},
+		schema: map[string]*vindexes.BaseTable{"a": &authoritativeTblA, "b": &authoritativeTblBWithInt},
 		err:    false,
 		typ:    sqltypes.Int64,
 	}, {
 		name:   "authoritative columns with overlap",
-		schema: map[string]*vindexes.Table{"a": &authoritativeTblAWithConflict, "b": &authoritativeTblB},
+		schema: map[string]*vindexes.BaseTable{"a": &authoritativeTblAWithConflict, "b": &authoritativeTblB},
 		err:    true,
 	}}
 
@@ -486,10 +486,10 @@ func TestUnknownColumnMap2(t *testing.T) {
 
 func TestUnknownPredicate(t *testing.T) {
 	query := "select 1 from a, b where col = 1"
-	authoritativeTblA := &vindexes.Table{
+	authoritativeTblA := &vindexes.BaseTable{
 		Name: sqlparser.NewIdentifierCS("a"),
 	}
-	authoritativeTblB := &vindexes.Table{
+	authoritativeTblB := &vindexes.BaseTable{
 		Name: sqlparser.NewIdentifierCS("b"),
 	}
 
@@ -497,12 +497,12 @@ func TestUnknownPredicate(t *testing.T) {
 
 	tests := []struct {
 		name   string
-		schema map[string]*vindexes.Table
+		schema map[string]*vindexes.BaseTable
 		err    bool
 	}{
 		{
 			name:   "no info about tables",
-			schema: map[string]*vindexes.Table{"a": authoritativeTblA, "b": authoritativeTblB},
+			schema: map[string]*vindexes.BaseTable{"a": authoritativeTblA, "b": authoritativeTblB},
 			err:    false,
 		},
 	}
@@ -534,7 +534,7 @@ func TestScoping(t *testing.T) {
 			parse, err := sqlparser.NewTestParser().Parse(query.query)
 			require.NoError(t, err)
 			st, err := Analyze(parse, "user", &FakeSI{
-				Tables: map[string]*vindexes.Table{
+				Tables: map[string]*vindexes.BaseTable{
 					"t": {Name: sqlparser.NewIdentifierCS("t")},
 				},
 			})
@@ -1103,7 +1103,7 @@ func TestScopingWithWITH(t *testing.T) {
 			parse, err := sqlparser.NewTestParser().Parse(query.query)
 			require.NoError(t, err)
 			st, err := Analyze(parse, "user", &FakeSI{
-				Tables: map[string]*vindexes.Table{
+				Tables: map[string]*vindexes.BaseTable{
 					"t": {Name: sqlparser.NewIdentifierCS("t")},
 				},
 			})
@@ -1188,7 +1188,7 @@ func TestScopingWVindexTables(t *testing.T) {
 			require.NoError(t, err)
 			hash, _ := vindexes.CreateVindex("hash", "user_index", nil)
 			st, err := Analyze(parse, "user", &FakeSI{
-				Tables: map[string]*vindexes.Table{
+				Tables: map[string]*vindexes.BaseTable{
 					"t": {Name: sqlparser.NewIdentifierCS("t")},
 				},
 				VindexTables: map[string]vindexes.Vindex{
@@ -1451,7 +1451,7 @@ func TestScopingSubQueryJoinClause(t *testing.T) {
 	require.NoError(t, err)
 
 	st, err := Analyze(parse, "user", &FakeSI{
-		Tables: map[string]*vindexes.Table{
+		Tables: map[string]*vindexes.BaseTable{
 			"t": {Name: sqlparser.NewIdentifierCS("t")},
 		},
 	})
@@ -1481,7 +1481,7 @@ var ks3 = &vindexes.Keyspace{
 // create table t2(uid bigint, name varchar(255))
 func fakeSchemaInfo() *FakeSI {
 	si := &FakeSI{
-		Tables: map[string]*vindexes.Table{
+		Tables: map[string]*vindexes.BaseTable{
 			"t":  tableT(),
 			"t1": tableT1(),
 			"t2": tableT2(),
@@ -1491,14 +1491,14 @@ func fakeSchemaInfo() *FakeSI {
 	return si
 }
 
-func tableT() *vindexes.Table {
-	return &vindexes.Table{
+func tableT() *vindexes.BaseTable {
+	return &vindexes.BaseTable{
 		Name:     sqlparser.NewIdentifierCS("t"),
 		Keyspace: unsharded,
 	}
 }
-func tableT1() *vindexes.Table {
-	return &vindexes.Table{
+func tableT1() *vindexes.BaseTable {
+	return &vindexes.BaseTable{
 		Name: sqlparser.NewIdentifierCS("t1"),
 		Columns: []vindexes.Column{{
 			Name: sqlparser.NewIdentifierCI("id"),
@@ -1511,8 +1511,8 @@ func tableT1() *vindexes.Table {
 		Keyspace: ks2,
 	}
 }
-func tableT2() *vindexes.Table {
-	return &vindexes.Table{
+func tableT2() *vindexes.BaseTable {
+	return &vindexes.BaseTable{
 		Name: sqlparser.NewIdentifierCS("t2"),
 		Columns: []vindexes.Column{{
 			Name: sqlparser.NewIdentifierCI("uid"),
@@ -1531,8 +1531,8 @@ func tableT2() *vindexes.Table {
 	}
 }
 
-func tableT3() *vindexes.Table {
-	return &vindexes.Table{
+func tableT3() *vindexes.BaseTable {
+	return &vindexes.BaseTable{
 		Name: sqlparser.NewIdentifierCS("t3"),
 		Columns: []vindexes.Column{{
 			Name: sqlparser.NewIdentifierCI("uid"),
diff --git a/go/vt/vtgate/semantics/cte_table.go b/go/vt/vtgate/semantics/cte_table.go
index 7083fea10d2..30cee8061d1 100644
--- a/go/vt/vtgate/semantics/cte_table.go
+++ b/go/vt/vtgate/semantics/cte_table.go
@@ -67,7 +67,7 @@ func (cte *CTETable) Name() (sqlparser.TableName, error) {
 	return sqlparser.NewTableName(cte.TableName), nil
 }
 
-func (cte *CTETable) GetVindexTable() *vindexes.Table {
+func (cte *CTETable) GetVindexTable() *vindexes.BaseTable {
 	return nil
 }
 
diff --git a/go/vt/vtgate/semantics/derived_table.go b/go/vt/vtgate/semantics/derived_table.go
index fc7e1cb391c..676679d2fa9 100644
--- a/go/vt/vtgate/semantics/derived_table.go
+++ b/go/vt/vtgate/semantics/derived_table.go
@@ -150,7 +150,7 @@ func (dt *DerivedTable) canShortCut() shortCut {
 }
 
 // GetVindexTable implements the TableInfo interface
-func (dt *DerivedTable) GetVindexTable() *vindexes.Table {
+func (dt *DerivedTable) GetVindexTable() *vindexes.BaseTable {
 	return nil
 }
 
diff --git a/go/vt/vtgate/semantics/derived_test.go b/go/vt/vtgate/semantics/derived_test.go
index 8344fd1e261..3788baeae9a 100644
--- a/go/vt/vtgate/semantics/derived_test.go
+++ b/go/vt/vtgate/semantics/derived_test.go
@@ -113,7 +113,7 @@ func TestScopingWDerivedTables(t *testing.T) {
 			parse, err := sqlparser.NewTestParser().Parse(query.query)
 			require.NoError(t, err)
 			st, err := Analyze(parse, "user", &FakeSI{
-				Tables: map[string]*vindexes.Table{
+				Tables: map[string]*vindexes.BaseTable{
 					"t": {Name: sqlparser.NewIdentifierCS("t"), Keyspace: ks2},
 				},
 			})
@@ -175,7 +175,7 @@ func TestDerivedTablesOrderClause(t *testing.T) {
 		recursiveExpectation: TS0,
 		expectation:          TS1,
 	}}
-	si := &FakeSI{Tables: map[string]*vindexes.Table{"t": {Name: sqlparser.NewIdentifierCS("t")}}}
+	si := &FakeSI{Tables: map[string]*vindexes.BaseTable{"t": {Name: sqlparser.NewIdentifierCS("t")}}}
 	for _, query := range queries {
 		t.Run(query.query, func(t *testing.T) {
 			parse, err := sqlparser.NewTestParser().Parse(query.query)
@@ -215,7 +215,7 @@ func TestScopingWComplexDerivedTables(t *testing.T) {
 			parse, err := sqlparser.NewTestParser().Parse(query.query)
 			require.NoError(t, err)
 			st, err := Analyze(parse, "user", &FakeSI{
-				Tables: map[string]*vindexes.Table{
+				Tables: map[string]*vindexes.BaseTable{
 					"t": {Name: sqlparser.NewIdentifierCS("t")},
 				},
 			})
diff --git a/go/vt/vtgate/semantics/early_rewriter_test.go b/go/vt/vtgate/semantics/early_rewriter_test.go
index 1ec7786a46c..29da6ab51ee 100644
--- a/go/vt/vtgate/semantics/early_rewriter_test.go
+++ b/go/vt/vtgate/semantics/early_rewriter_test.go
@@ -35,7 +35,7 @@ func TestExpandStar(t *testing.T) {
 		Sharded: true,
 	}
 	schemaInfo := &FakeSI{
-		Tables: map[string]*vindexes.Table{
+		Tables: map[string]*vindexes.BaseTable{
 			"t1": {
 				Keyspace: ks,
 				Name:     sqlparser.NewIdentifierCS("t1"),
@@ -226,7 +226,7 @@ func assertExpandedColumns(t *testing.T, st *SemTable, expandedColumns string) {
 
 func TestRewriteJoinUsingColumns(t *testing.T) {
 	schemaInfo := &FakeSI{
-		Tables: map[string]*vindexes.Table{
+		Tables: map[string]*vindexes.BaseTable{
 			"t1": {
 				Name: sqlparser.NewIdentifierCS("t1"),
 				Columns: []vindexes.Column{{
@@ -309,7 +309,7 @@ func TestRewriteJoinUsingColumns(t *testing.T) {
 
 func TestGroupByColumnName(t *testing.T) {
 	schemaInfo := &FakeSI{
-		Tables: map[string]*vindexes.Table{
+		Tables: map[string]*vindexes.BaseTable{
 			"t1": {
 				Name: sqlparser.NewIdentifierCS("t1"),
 				Columns: []vindexes.Column{{
@@ -393,7 +393,7 @@ func TestGroupByColumnName(t *testing.T) {
 
 func TestGroupByLiteral(t *testing.T) {
 	schemaInfo := &FakeSI{
-		Tables: map[string]*vindexes.Table{},
+		Tables: map[string]*vindexes.BaseTable{},
 	}
 	cDB := "db"
 	tcases := []struct {
@@ -437,7 +437,7 @@ func TestGroupByLiteral(t *testing.T) {
 
 func TestOrderByLiteral(t *testing.T) {
 	schemaInfo := &FakeSI{
-		Tables: map[string]*vindexes.Table{},
+		Tables: map[string]*vindexes.BaseTable{},
 	}
 	cDB := "db"
 	tcases := []struct {
@@ -620,7 +620,7 @@ func TestHavingColumnName(t *testing.T) {
 
 func getSchemaWithKnownColumns() *FakeSI {
 	schemaInfo := &FakeSI{
-		Tables: map[string]*vindexes.Table{
+		Tables: map[string]*vindexes.BaseTable{
 			"t1": {
 				Keyspace: &vindexes.Keyspace{Name: "ks", Sharded: true},
 				Name:     sqlparser.NewIdentifierCS("t1"),
@@ -753,7 +753,7 @@ func TestOrderByColumnName(t *testing.T) {
 }
 
 func TestSemTableDependenciesAfterExpandStar(t *testing.T) {
-	schemaInfo := &FakeSI{Tables: map[string]*vindexes.Table{
+	schemaInfo := &FakeSI{Tables: map[string]*vindexes.BaseTable{
 		"t1": {
 			Name: sqlparser.NewIdentifierCS("t1"),
 			Columns: []vindexes.Column{{
@@ -812,7 +812,7 @@ func TestRewriteNot(t *testing.T) {
 		Sharded: true,
 	}
 	schemaInfo := &FakeSI{
-		Tables: map[string]*vindexes.Table{
+		Tables: map[string]*vindexes.BaseTable{
 			"t1": {
 				Keyspace: ks,
 				Name:     sqlparser.NewIdentifierCS("t1"),
@@ -866,7 +866,7 @@ func TestOrderByDerivedTable(t *testing.T) {
 		Sharded: true,
 	}
 	schemaInfo := &FakeSI{
-		Tables: map[string]*vindexes.Table{
+		Tables: map[string]*vindexes.BaseTable{
 			"t1": {
 				Keyspace: ks,
 				Name:     sqlparser.NewIdentifierCS("t1"),
diff --git a/go/vt/vtgate/semantics/foreign_keys_test.go b/go/vt/vtgate/semantics/foreign_keys_test.go
index a46c67c9710..e59f06fb435 100644
--- a/go/vt/vtgate/semantics/foreign_keys_test.go
+++ b/go/vt/vtgate/semantics/foreign_keys_test.go
@@ -27,7 +27,7 @@ import (
 	"vitess.io/vitess/go/vt/vtgate/vindexes"
 )
 
-var parentTbl = &vindexes.Table{
+var parentTbl = &vindexes.BaseTable{
 	Name: sqlparser.NewIdentifierCS("parentt"),
 	Keyspace: &vindexes.Keyspace{
 		Name: "ks",
@@ -36,7 +36,7 @@ var parentTbl = &vindexes.Table{
 
 var tbl = map[string]TableInfo{
 	"t0": &RealTable{
-		Table: &vindexes.Table{
+		Table: &vindexes.BaseTable{
 			Name:     sqlparser.NewIdentifierCS("t0"),
 			Keyspace: &vindexes.Keyspace{Name: "ks"},
 			ChildForeignKeys: []vindexes.ChildFKInfo{
@@ -50,7 +50,7 @@ var tbl = map[string]TableInfo{
 		},
 	},
 	"t1": &RealTable{
-		Table: &vindexes.Table{
+		Table: &vindexes.BaseTable{
 			Name:     sqlparser.NewIdentifierCS("t1"),
 			Keyspace: &vindexes.Keyspace{Name: "ks_unmanaged", Sharded: true},
 			ChildForeignKeys: []vindexes.ChildFKInfo{
@@ -60,19 +60,19 @@ var tbl = map[string]TableInfo{
 		},
 	},
 	"t2": &RealTable{
-		Table: &vindexes.Table{
+		Table: &vindexes.BaseTable{
 			Name:     sqlparser.NewIdentifierCS("t2"),
 			Keyspace: &vindexes.Keyspace{Name: "ks"},
 		},
 	},
 	"t3": &RealTable{
-		Table: &vindexes.Table{
+		Table: &vindexes.BaseTable{
 			Name:     sqlparser.NewIdentifierCS("t3"),
 			Keyspace: &vindexes.Keyspace{Name: "undefined_ks", Sharded: true},
 		},
 	},
 	"t4": &RealTable{
-		Table: &vindexes.Table{
+		Table: &vindexes.BaseTable{
 			Name:     sqlparser.NewIdentifierCS("t4"),
 			Keyspace: &vindexes.Keyspace{Name: "ks"},
 			ChildForeignKeys: []vindexes.ChildFKInfo{
@@ -92,7 +92,7 @@ var tbl = map[string]TableInfo{
 		},
 	},
 	"t5": &RealTable{
-		Table: &vindexes.Table{
+		Table: &vindexes.BaseTable{
 			Name:     sqlparser.NewIdentifierCS("t5"),
 			Keyspace: &vindexes.Keyspace{Name: "ks"},
 			ChildForeignKeys: []vindexes.ChildFKInfo{
@@ -110,7 +110,7 @@ var tbl = map[string]TableInfo{
 		},
 	},
 	"t6": &RealTable{
-		Table: &vindexes.Table{
+		Table: &vindexes.BaseTable{
 			Name:     sqlparser.NewIdentifierCS("t6"),
 			Keyspace: &vindexes.Keyspace{Name: "ks"},
 			ChildForeignKeys: []vindexes.ChildFKInfo{
@@ -552,7 +552,7 @@ func TestGetInvolvedForeignKeys(t *testing.T) {
 	}
 }
 
-func ckInfo(cTable *vindexes.Table, pCols []string, cCols []string, refAction sqlparser.ReferenceAction) vindexes.ChildFKInfo {
+func ckInfo(cTable *vindexes.BaseTable, pCols []string, cCols []string, refAction sqlparser.ReferenceAction) vindexes.ChildFKInfo {
 	return vindexes.ChildFKInfo{
 		Table:         cTable,
 		ParentColumns: sqlparser.MakeColumns(pCols...),
@@ -561,7 +561,7 @@ func ckInfo(cTable *vindexes.Table, pCols []string, cCols []string, refAction sq
 	}
 }
 
-func pkInfo(parentTable *vindexes.Table, pCols []string, cCols []string) vindexes.ParentFKInfo {
+func pkInfo(parentTable *vindexes.BaseTable, pCols []string, cCols []string) vindexes.ParentFKInfo {
 	return vindexes.ParentFKInfo{
 		Table:         parentTable,
 		ParentColumns: sqlparser.MakeColumns(pCols...),
diff --git a/go/vt/vtgate/semantics/info_schema.go b/go/vt/vtgate/semantics/info_schema.go
index b33a20620e4..c15056ce033 100644
--- a/go/vt/vtgate/semantics/info_schema.go
+++ b/go/vt/vtgate/semantics/info_schema.go
@@ -1627,7 +1627,7 @@ func loadSchemaInfo(version string) map[string][]vindexes.Column {
 }
 
 // FindTableOrVindex implements the SchemaInformation interface
-func (i *infoSchemaWithColumns) FindTableOrVindex(tbl sqlparser.TableName) (*vindexes.Table, vindexes.Vindex, string, topodatapb.TabletType, key.Destination, error) {
+func (i *infoSchemaWithColumns) FindTableOrVindex(tbl sqlparser.TableName) (*vindexes.BaseTable, vindexes.Vindex, string, topodatapb.TabletType, key.Destination, error) {
 	if !strings.EqualFold(tbl.Qualifier.String(), "information_schema") {
 		return i.inner.FindTableOrVindex(tbl)
 	}
@@ -1636,7 +1636,7 @@ func (i *infoSchemaWithColumns) FindTableOrVindex(tbl sqlparser.TableName) (*vin
 	if !found {
 		return nil, nil, "", topodatapb.TabletType_UNKNOWN, nil, vindexes.NotFoundError{TableName: tbl.Name.String()}
 	}
-	vtbl := &vindexes.Table{
+	vtbl := &vindexes.BaseTable{
 		Type:                    "View",
 		Name:                    sqlparser.NewIdentifierCS(tbl.Name.String()),
 		Columns:                 cols,
diff --git a/go/vt/vtgate/semantics/real_table.go b/go/vt/vtgate/semantics/real_table.go
index 64f3ac5f3f0..55dd25a5064 100644
--- a/go/vt/vtgate/semantics/real_table.go
+++ b/go/vt/vtgate/semantics/real_table.go
@@ -32,7 +32,7 @@ import (
 type RealTable struct {
 	dbName, tableName string
 	ASTNode           *sqlparser.AliasedTableExpr
-	Table             *vindexes.Table
+	Table             *vindexes.BaseTable
 	CTE               *CTE
 	VindexHint        *sqlparser.IndexHint
 	MirrorRule        *vindexes.MirrorRule
@@ -207,7 +207,7 @@ func (r *RealTable) canShortCut() shortCut {
 }
 
 // GetVindexTable implements the TableInfo interface
-func (r *RealTable) GetVindexTable() *vindexes.Table {
+func (r *RealTable) GetVindexTable() *vindexes.BaseTable {
 	return r.Table
 }
 
diff --git a/go/vt/vtgate/semantics/semantic_table.go b/go/vt/vtgate/semantics/semantic_table.go
index e3eead71c90..0227ee04137 100644
--- a/go/vt/vtgate/semantics/semantic_table.go
+++ b/go/vt/vtgate/semantics/semantic_table.go
@@ -39,7 +39,7 @@ type (
 		Name() (sqlparser.TableName, error)
 
 		// GetVindexTable returns the vschema version of this TableInfo
-		GetVindexTable() *vindexes.Table
+		GetVindexTable() *vindexes.BaseTable
 
 		// IsInfSchema returns true if this table is information_schema
 		IsInfSchema() bool
@@ -165,7 +165,7 @@ type (
 
 	// SchemaInformation is used to provide table information from Vschema.
 	SchemaInformation interface {
-		FindTableOrVindex(tablename sqlparser.TableName) (*vindexes.Table, vindexes.Vindex, string, topodatapb.TabletType, key.Destination, error)
+		FindTableOrVindex(tablename sqlparser.TableName) (*vindexes.BaseTable, vindexes.Vindex, string, topodatapb.TabletType, key.Destination, error)
 		ConnCollation() collations.ID
 		Environment() *vtenv.Environment
 		// ForeignKeyMode returns the foreign_key flag value
@@ -436,7 +436,7 @@ func (st *SemTable) HasNonLiteralForeignKeyUpdate(updExprs sqlparser.UpdateExprs
 }
 
 // isShardScoped checks if the foreign key constraint is shard-scoped or not. It uses the vindex information to make this call.
-func isShardScoped(pTable *vindexes.Table, cTable *vindexes.Table, pCols sqlparser.Columns, cCols sqlparser.Columns) bool {
+func isShardScoped(pTable *vindexes.BaseTable, cTable *vindexes.BaseTable, pCols sqlparser.Columns, cCols sqlparser.Columns) bool {
 	if !pTable.Keyspace.Sharded {
 		return true
 	}
@@ -762,11 +762,11 @@ func (st *SemTable) ColumnLookup(col *sqlparser.ColName) (int, error) {
 }
 
 // SingleUnshardedKeyspace returns the single keyspace if all tables in the query are in the same, unsharded keyspace
-func (st *SemTable) SingleUnshardedKeyspace() (ks *vindexes.Keyspace, tables []*vindexes.Table) {
+func (st *SemTable) SingleUnshardedKeyspace() (ks *vindexes.Keyspace, tables []*vindexes.BaseTable) {
 	return singleUnshardedKeyspace(st.Tables)
 }
 
-func singleUnshardedKeyspace(tableInfos []TableInfo) (ks *vindexes.Keyspace, tables []*vindexes.Table) {
+func singleUnshardedKeyspace(tableInfos []TableInfo) (ks *vindexes.Keyspace, tables []*vindexes.BaseTable) {
 	validKS := func(this *vindexes.Keyspace) bool {
 		if this == nil || this.Sharded {
 			return false
@@ -783,7 +783,7 @@ func singleUnshardedKeyspace(tableInfos []TableInfo) (ks *vindexes.Keyspace, tab
 
 	for _, table := range tableInfos {
 		sc := table.canShortCut()
-		var vtbl *vindexes.Table
+		var vtbl *vindexes.BaseTable
 
 		switch sc {
 		case dependsOnKeyspace:
diff --git a/go/vt/vtgate/semantics/semantic_table_test.go b/go/vt/vtgate/semantics/semantic_table_test.go
index 1f324215326..19f586d6190 100644
--- a/go/vt/vtgate/semantics/semantic_table_test.go
+++ b/go/vt/vtgate/semantics/semantic_table_test.go
@@ -69,7 +69,7 @@ func fakeSchemaInfoTest() *FakeSI {
 	}}
 
 	si := &FakeSI{
-		Tables: map[string]*vindexes.Table{
+		Tables: map[string]*vindexes.BaseTable{
 			"t1": {Name: sqlparser.NewIdentifierCS("t1"), Columns: cols1, ColumnListAuthoritative: true, Keyspace: ks2},
 			"t2": {Name: sqlparser.NewIdentifierCS("t2"), Columns: cols2, ColumnListAuthoritative: true, Keyspace: ks3},
 		},
@@ -141,22 +141,22 @@ func TestIsShardScoped(t *testing.T) {
 
 	tests := []struct {
 		name              string
-		pTable            *vindexes.Table
-		cTable            *vindexes.Table
+		pTable            *vindexes.BaseTable
+		cTable            *vindexes.BaseTable
 		pCols             sqlparser.Columns
 		cCols             sqlparser.Columns
 		wantedShardScoped bool
 	}{
 		{
 			name: "unsharded keyspace",
-			pTable: &vindexes.Table{
+			pTable: &vindexes.BaseTable{
 				Keyspace: &vindexes.Keyspace{Name: "uks", Sharded: false},
 			},
 			wantedShardScoped: true,
 		},
 		{
 			name: "Primary vindexes don't match",
-			pTable: &vindexes.Table{
+			pTable: &vindexes.BaseTable{
 				Keyspace: &vindexes.Keyspace{Name: "ks", Sharded: true},
 				ColumnVindexes: []*vindexes.ColumnVindex{
 					{
@@ -164,7 +164,7 @@ func TestIsShardScoped(t *testing.T) {
 					},
 				},
 			},
-			cTable: &vindexes.Table{
+			cTable: &vindexes.BaseTable{
 				ColumnVindexes: []*vindexes.ColumnVindex{
 					{
 						Vindex: xxhashVindex,
@@ -175,7 +175,7 @@ func TestIsShardScoped(t *testing.T) {
 		},
 		{
 			name: "Child primary vindex not part of the foreign key",
-			pTable: &vindexes.Table{
+			pTable: &vindexes.BaseTable{
 				Keyspace: &vindexes.Keyspace{Name: "ks", Sharded: true},
 				ColumnVindexes: []*vindexes.ColumnVindex{
 					{
@@ -183,7 +183,7 @@ func TestIsShardScoped(t *testing.T) {
 					},
 				},
 			},
-			cTable: &vindexes.Table{
+			cTable: &vindexes.BaseTable{
 				ColumnVindexes: []*vindexes.ColumnVindex{
 					{
 						Vindex:  hashVindex,
@@ -196,7 +196,7 @@ func TestIsShardScoped(t *testing.T) {
 		},
 		{
 			name: "Parent primary vindex not part of the foreign key",
-			pTable: &vindexes.Table{
+			pTable: &vindexes.BaseTable{
 				Keyspace: &vindexes.Keyspace{Name: "ks", Sharded: true},
 				ColumnVindexes: []*vindexes.ColumnVindex{
 					{
@@ -205,7 +205,7 @@ func TestIsShardScoped(t *testing.T) {
 					},
 				},
 			},
-			cTable: &vindexes.Table{
+			cTable: &vindexes.BaseTable{
 				ColumnVindexes: []*vindexes.ColumnVindex{
 					{
 						Vindex:  hashVindex,
@@ -219,7 +219,7 @@ func TestIsShardScoped(t *testing.T) {
 		},
 		{
 			name: "Indexes order doesn't match",
-			pTable: &vindexes.Table{
+			pTable: &vindexes.BaseTable{
 				Keyspace: &vindexes.Keyspace{Name: "ks", Sharded: true},
 				ColumnVindexes: []*vindexes.ColumnVindex{
 					{
@@ -228,7 +228,7 @@ func TestIsShardScoped(t *testing.T) {
 					},
 				},
 			},
-			cTable: &vindexes.Table{
+			cTable: &vindexes.BaseTable{
 				ColumnVindexes: []*vindexes.ColumnVindex{
 					{
 						Vindex:  hashVindex,
@@ -242,7 +242,7 @@ func TestIsShardScoped(t *testing.T) {
 		},
 		{
 			name: "Is shard scoped",
-			pTable: &vindexes.Table{
+			pTable: &vindexes.BaseTable{
 				Keyspace: &vindexes.Keyspace{Name: "ks", Sharded: true},
 				ColumnVindexes: []*vindexes.ColumnVindex{
 					{
@@ -251,7 +251,7 @@ func TestIsShardScoped(t *testing.T) {
 					},
 				},
 			},
-			cTable: &vindexes.Table{
+			cTable: &vindexes.BaseTable{
 				ColumnVindexes: []*vindexes.ColumnVindex{
 					{
 						Vindex:  hashVindex,
@@ -379,15 +379,15 @@ func TestGetParentForeignKeysList(t *testing.T) {
 
 // TestRemoveParentForeignKey tests the functionality of RemoveParentForeignKey
 func TestRemoveParentForeignKey(t *testing.T) {
-	t1Table := &vindexes.Table{
+	t1Table := &vindexes.BaseTable{
 		Keyspace: &vindexes.Keyspace{Name: "ks"},
 		Name:     sqlparser.NewIdentifierCS("t1"),
 	}
-	t2Table := &vindexes.Table{
+	t2Table := &vindexes.BaseTable{
 		Keyspace: &vindexes.Keyspace{Name: "ks"},
 		Name:     sqlparser.NewIdentifierCS("t2"),
 	}
-	t3Table := &vindexes.Table{
+	t3Table := &vindexes.BaseTable{
 		Keyspace: &vindexes.Keyspace{Name: "ks"},
 		Name:     sqlparser.NewIdentifierCS("t3"),
 	}
@@ -483,7 +483,7 @@ func TestRemoveParentForeignKey(t *testing.T) {
 func TestRemoveNonRequiredForeignKeys(t *testing.T) {
 	hashVindex := &vindexes.Hash{}
 	xxhashVindex := &vindexes.XXHash{}
-	t1Table := &vindexes.Table{
+	t1Table := &vindexes.BaseTable{
 		Keyspace: &vindexes.Keyspace{Name: "ks", Sharded: true},
 		Name:     sqlparser.NewIdentifierCS("t1"),
 		ColumnVindexes: []*vindexes.ColumnVindex{
@@ -493,7 +493,7 @@ func TestRemoveNonRequiredForeignKeys(t *testing.T) {
 			},
 		},
 	}
-	t2Table := &vindexes.Table{
+	t2Table := &vindexes.BaseTable{
 		Keyspace: &vindexes.Keyspace{Name: "ks", Sharded: true},
 		Name:     sqlparser.NewIdentifierCS("t2"),
 		ColumnVindexes: []*vindexes.ColumnVindex{
@@ -503,7 +503,7 @@ func TestRemoveNonRequiredForeignKeys(t *testing.T) {
 			},
 		},
 	}
-	t4Table := &vindexes.Table{
+	t4Table := &vindexes.BaseTable{
 		Keyspace: &vindexes.Keyspace{Name: "ks", Sharded: true},
 		Name:     sqlparser.NewIdentifierCS("t4"),
 		ColumnVindexes: []*vindexes.ColumnVindex{
@@ -513,7 +513,7 @@ func TestRemoveNonRequiredForeignKeys(t *testing.T) {
 			},
 		},
 	}
-	t3Table := &vindexes.Table{
+	t3Table := &vindexes.BaseTable{
 		Keyspace: &vindexes.Keyspace{Name: "ks2"},
 		Name:     sqlparser.NewIdentifierCS("t3"),
 	}
@@ -752,7 +752,7 @@ func TestRemoveNonRequiredForeignKeys(t *testing.T) {
 
 func TestIsFkDependentColumnUpdated(t *testing.T) {
 	keyspaceName := "ks"
-	t3Table := &vindexes.Table{
+	t3Table := &vindexes.BaseTable{
 		Keyspace: &vindexes.Keyspace{Name: keyspaceName},
 		Name:     sqlparser.NewIdentifierCS("t3"),
 	}
@@ -769,7 +769,7 @@ func TestIsFkDependentColumnUpdated(t *testing.T) {
 				KsForeignKeyMode: map[string]vschemapb.Keyspace_ForeignKeyMode{
 					keyspaceName: vschemapb.Keyspace_managed,
 				},
-				Tables: map[string]*vindexes.Table{
+				Tables: map[string]*vindexes.BaseTable{
 					"t1": {
 						Name:     sqlparser.NewIdentifierCS("t1"),
 						Keyspace: &vindexes.Keyspace{Name: keyspaceName},
@@ -787,7 +787,7 @@ func TestIsFkDependentColumnUpdated(t *testing.T) {
 				KsForeignKeyMode: map[string]vschemapb.Keyspace_ForeignKeyMode{
 					keyspaceName: vschemapb.Keyspace_managed,
 				},
-				Tables: map[string]*vindexes.Table{
+				Tables: map[string]*vindexes.BaseTable{
 					"t1": {
 						Name:     sqlparser.NewIdentifierCS("t1"),
 						Keyspace: &vindexes.Keyspace{Name: keyspaceName},
@@ -805,7 +805,7 @@ func TestIsFkDependentColumnUpdated(t *testing.T) {
 				KsForeignKeyMode: map[string]vschemapb.Keyspace_ForeignKeyMode{
 					keyspaceName: vschemapb.Keyspace_managed,
 				},
-				Tables: map[string]*vindexes.Table{
+				Tables: map[string]*vindexes.BaseTable{
 					"t1": {
 						Name:     sqlparser.NewIdentifierCS("t1"),
 						Keyspace: &vindexes.Keyspace{Name: keyspaceName},
@@ -823,7 +823,7 @@ func TestIsFkDependentColumnUpdated(t *testing.T) {
 				KsForeignKeyMode: map[string]vschemapb.Keyspace_ForeignKeyMode{
 					keyspaceName: vschemapb.Keyspace_managed,
 				},
-				Tables: map[string]*vindexes.Table{
+				Tables: map[string]*vindexes.BaseTable{
 					"t1": {
 						Name:     sqlparser.NewIdentifierCS("t1"),
 						Keyspace: &vindexes.Keyspace{Name: keyspaceName},
@@ -841,7 +841,7 @@ func TestIsFkDependentColumnUpdated(t *testing.T) {
 				KsForeignKeyMode: map[string]vschemapb.Keyspace_ForeignKeyMode{
 					keyspaceName: vschemapb.Keyspace_managed,
 				},
-				Tables: map[string]*vindexes.Table{
+				Tables: map[string]*vindexes.BaseTable{
 					"t1": {
 						Name:     sqlparser.NewIdentifierCS("t1"),
 						Keyspace: &vindexes.Keyspace{Name: keyspaceName, Sharded: true},
@@ -869,7 +869,7 @@ func TestIsFkDependentColumnUpdated(t *testing.T) {
 
 func TestHasNonLiteralForeignKeyUpdate(t *testing.T) {
 	keyspaceName := "ks"
-	t3Table := &vindexes.Table{
+	t3Table := &vindexes.BaseTable{
 		Keyspace: &vindexes.Keyspace{Name: keyspaceName},
 		Name:     sqlparser.NewIdentifierCS("t3"),
 	}
@@ -886,7 +886,7 @@ func TestHasNonLiteralForeignKeyUpdate(t *testing.T) {
 				KsForeignKeyMode: map[string]vschemapb.Keyspace_ForeignKeyMode{
 					keyspaceName: vschemapb.Keyspace_managed,
 				},
-				Tables: map[string]*vindexes.Table{
+				Tables: map[string]*vindexes.BaseTable{
 					"t1": {
 						Name:     sqlparser.NewIdentifierCS("t1"),
 						Keyspace: &vindexes.Keyspace{Name: keyspaceName},
@@ -904,7 +904,7 @@ func TestHasNonLiteralForeignKeyUpdate(t *testing.T) {
 				KsForeignKeyMode: map[string]vschemapb.Keyspace_ForeignKeyMode{
 					keyspaceName: vschemapb.Keyspace_managed,
 				},
-				Tables: map[string]*vindexes.Table{
+				Tables: map[string]*vindexes.BaseTable{
 					"t1": {
 						Name:     sqlparser.NewIdentifierCS("t1"),
 						Keyspace: &vindexes.Keyspace{Name: keyspaceName},
@@ -922,7 +922,7 @@ func TestHasNonLiteralForeignKeyUpdate(t *testing.T) {
 				KsForeignKeyMode: map[string]vschemapb.Keyspace_ForeignKeyMode{
 					keyspaceName: vschemapb.Keyspace_managed,
 				},
-				Tables: map[string]*vindexes.Table{
+				Tables: map[string]*vindexes.BaseTable{
 					"t1": {
 						Name:     sqlparser.NewIdentifierCS("t1"),
 						Keyspace: &vindexes.Keyspace{Name: keyspaceName},
@@ -940,7 +940,7 @@ func TestHasNonLiteralForeignKeyUpdate(t *testing.T) {
 				KsForeignKeyMode: map[string]vschemapb.Keyspace_ForeignKeyMode{
 					keyspaceName: vschemapb.Keyspace_managed,
 				},
-				Tables: map[string]*vindexes.Table{
+				Tables: map[string]*vindexes.BaseTable{
 					"t1": {
 						Name:     sqlparser.NewIdentifierCS("t1"),
 						Keyspace: &vindexes.Keyspace{Name: keyspaceName},
@@ -958,7 +958,7 @@ func TestHasNonLiteralForeignKeyUpdate(t *testing.T) {
 				KsForeignKeyMode: map[string]vschemapb.Keyspace_ForeignKeyMode{
 					keyspaceName: vschemapb.Keyspace_managed,
 				},
-				Tables: map[string]*vindexes.Table{
+				Tables: map[string]*vindexes.BaseTable{
 					"t1": {
 						Name:     sqlparser.NewIdentifierCS("t1"),
 						Keyspace: &vindexes.Keyspace{Name: keyspaceName},
diff --git a/go/vt/vtgate/semantics/table_collector.go b/go/vt/vtgate/semantics/table_collector.go
index 329ebcef254..e35165f600d 100644
--- a/go/vt/vtgate/semantics/table_collector.go
+++ b/go/vt/vtgate/semantics/table_collector.go
@@ -346,7 +346,7 @@ func (etc *earlyTableCollector) getCTE(t sqlparser.TableName) *CTE {
 }
 
 func (etc *earlyTableCollector) getTableInfo(node *sqlparser.AliasedTableExpr, t sqlparser.TableName, sc *scoper) (TableInfo, error) {
-	var tbl *vindexes.Table
+	var tbl *vindexes.BaseTable
 	var vindex vindexes.Vindex
 	if cteDef := etc.getCTE(t); cteDef != nil {
 		cte, err := etc.buildRecursiveCTE(node, t, sc, cteDef)
@@ -504,7 +504,7 @@ func (tc *tableCollector) addUnionDerivedTable(
 	return scope.addTable(tableInfo)
 }
 
-func newVindexTable(t sqlparser.IdentifierCS) *vindexes.Table {
+func newVindexTable(t sqlparser.IdentifierCS) *vindexes.BaseTable {
 	vindexCols := []vindexes.Column{
 		{Name: sqlparser.NewIdentifierCI("id"), Type: querypb.Type_VARBINARY},
 		{Name: sqlparser.NewIdentifierCI("keyspace_id"), Type: querypb.Type_VARBINARY},
@@ -514,7 +514,7 @@ func newVindexTable(t sqlparser.IdentifierCS) *vindexes.Table {
 		{Name: sqlparser.NewIdentifierCI("shard"), Type: querypb.Type_VARBINARY},
 	}
 
-	return &vindexes.Table{
+	return &vindexes.BaseTable{
 		Name:                    t,
 		Columns:                 vindexCols,
 		ColumnListAuthoritative: true,
@@ -544,7 +544,7 @@ func (tc *tableCollector) tableInfoFor(id TableSet) (TableInfo, error) {
 func (etc *earlyTableCollector) createTable(
 	t sqlparser.TableName,
 	alias *sqlparser.AliasedTableExpr,
-	tbl *vindexes.Table,
+	tbl *vindexes.BaseTable,
 	isInfSchema bool,
 	vindex vindexes.Vindex,
 ) (TableInfo, error) {
@@ -591,7 +591,7 @@ func (etc *earlyTableCollector) createTable(
 	return table, nil
 }
 
-func checkValidVindexHints(hint *sqlparser.IndexHint, tbl *vindexes.Table) error {
+func checkValidVindexHints(hint *sqlparser.IndexHint, tbl *vindexes.BaseTable) error {
 	if hint == nil {
 		return nil
 	}
diff --git a/go/vt/vtgate/semantics/vindex_table.go b/go/vt/vtgate/semantics/vindex_table.go
index c8ef271af5d..faac55c8116 100644
--- a/go/vt/vtgate/semantics/vindex_table.go
+++ b/go/vt/vtgate/semantics/vindex_table.go
@@ -47,7 +47,7 @@ func (v *VindexTable) getExprFor(_ string) (sqlparser.Expr, error) {
 }
 
 // GetVindexTable implements the TableInfo interface
-func (v *VindexTable) GetVindexTable() *vindexes.Table {
+func (v *VindexTable) GetVindexTable() *vindexes.BaseTable {
 	return v.Table.GetVindexTable()
 }
 
diff --git a/go/vt/vtgate/semantics/vtable.go b/go/vt/vtgate/semantics/vtable.go
index 6cd7e34aecc..94dc74cdf34 100644
--- a/go/vt/vtgate/semantics/vtable.go
+++ b/go/vt/vtgate/semantics/vtable.go
@@ -100,7 +100,7 @@ func (v *vTableInfo) canShortCut() shortCut {
 }
 
 // GetVindexTable implements the TableInfo interface
-func (v *vTableInfo) GetVindexTable() *vindexes.Table {
+func (v *vTableInfo) GetVindexTable() *vindexes.BaseTable {
 	return nil
 }
 
diff --git a/go/vt/vtgate/vindexes/foreign_keys.go b/go/vt/vtgate/vindexes/foreign_keys.go
index 275a0674998..e9f8c986d10 100644
--- a/go/vt/vtgate/vindexes/foreign_keys.go
+++ b/go/vt/vtgate/vindexes/foreign_keys.go
@@ -26,7 +26,7 @@ import (
 
 // ParentFKInfo contains the parent foreign key info for the table.
 type ParentFKInfo struct {
-	Table         *Table
+	Table         *BaseTable
 	ParentColumns sqlparser.Columns
 	ChildColumns  sqlparser.Columns
 }
@@ -44,7 +44,7 @@ func (fk *ParentFKInfo) MarshalJSON() ([]byte, error) {
 	})
 }
 
-func (fk *ParentFKInfo) String(childTable *Table) string {
+func (fk *ParentFKInfo) String(childTable *BaseTable) string {
 	var str strings.Builder
 	str.WriteString(sqlparser.String(childTable.GetTableName()))
 	for _, column := range fk.ChildColumns {
@@ -58,7 +58,7 @@ func (fk *ParentFKInfo) String(childTable *Table) string {
 }
 
 // NewParentFkInfo creates a new ParentFKInfo.
-func NewParentFkInfo(parentTbl *Table, fkDef *sqlparser.ForeignKeyDefinition) ParentFKInfo {
+func NewParentFkInfo(parentTbl *BaseTable, fkDef *sqlparser.ForeignKeyDefinition) ParentFKInfo {
 	return ParentFKInfo{
 		Table:         parentTbl,
 		ChildColumns:  fkDef.Source,
@@ -68,7 +68,7 @@ func NewParentFkInfo(parentTbl *Table, fkDef *sqlparser.ForeignKeyDefinition) Pa
 
 // ChildFKInfo contains the child foreign key info for the table.
 type ChildFKInfo struct {
-	Table         *Table
+	Table         *BaseTable
 	ChildColumns  sqlparser.Columns
 	ParentColumns sqlparser.Columns
 	Match         sqlparser.MatchAction
@@ -89,7 +89,7 @@ func (fk *ChildFKInfo) MarshalJSON() ([]byte, error) {
 	})
 }
 
-func (fk *ChildFKInfo) String(parentTable *Table) string {
+func (fk *ChildFKInfo) String(parentTable *BaseTable) string {
 	var str strings.Builder
 	str.WriteString(sqlparser.String(fk.Table.GetTableName()))
 	for _, column := range fk.ChildColumns {
@@ -103,7 +103,7 @@ func (fk *ChildFKInfo) String(parentTable *Table) string {
 }
 
 // NewChildFkInfo creates a new ChildFKInfo.
-func NewChildFkInfo(childTbl *Table, fkDef *sqlparser.ForeignKeyDefinition) ChildFKInfo {
+func NewChildFkInfo(childTbl *BaseTable, fkDef *sqlparser.ForeignKeyDefinition) ChildFKInfo {
 	return ChildFKInfo{
 		Table:         childTbl,
 		ChildColumns:  fkDef.Source,
diff --git a/go/vt/vtgate/vindexes/vschema.go b/go/vt/vtgate/vindexes/vschema.go
index 05081a3c9ba..5499200768b 100644
--- a/go/vt/vtgate/vindexes/vschema.go
+++ b/go/vt/vtgate/vindexes/vschema.go
@@ -57,7 +57,6 @@ const (
 	TypeTable     = ""
 	TypeSequence  = "sequence"
 	TypeReference = "reference"
-	TypeView      = "view"
 )
 
 // VSchema represents the denormalized version of SrvVSchema,
@@ -70,7 +69,7 @@ type VSchema struct {
 	// table is uniquely named, the value will be the qualified Table object
 	// with the keyspace where this table exists. If multiple keyspaces have a
 	// table with the same name, the value will be a `nil`.
-	globalTables         map[string]*Table
+	globalTables         map[string]Table
 	uniqueVindexes       map[string]Vindex
 	Keyspaces            map[string]*KeyspaceSchema `json:"keyspaces"`
 	ShardRoutingRules    map[string]string          `json:"shard_routing_rules"`
@@ -83,8 +82,8 @@ type VSchema struct {
 // MirrorRule represents one mirror rule.
 type MirrorRule struct {
 	Error   error
-	Percent float32 `json:"percent,omitempty"`
-	Table   *Table  `json:"table,omitempty"`
+	Percent float32    `json:"percent,omitempty"`
+	Table   *BaseTable `json:"table,omitempty"`
 }
 
 // MarshalJSON returns a JSON representation of MirrorRule.
@@ -94,7 +93,7 @@ func (mr *MirrorRule) MarshalJSON() ([]byte, error) {
 	}
 	return json.Marshal(struct {
 		Percent float32
-		Table   *Table
+		Table   *BaseTable
 	}{
 		Percent: mr.Percent,
 		Table:   mr.Table,
@@ -103,7 +102,7 @@ func (mr *MirrorRule) MarshalJSON() ([]byte, error) {
 
 // RoutingRule represents one routing rule.
 type RoutingRule struct {
-	Tables []*Table
+	Tables []*BaseTable
 	Error  error
 }
 
@@ -120,8 +119,15 @@ func (rr *RoutingRule) MarshalJSON() ([]byte, error) {
 	return json.Marshal(tables)
 }
 
-// Table represents a table in VSchema.
-type Table struct {
+// View represents a view in VSchema.
+type View struct {
+	Name      string
+	Keyspace  *Keyspace
+	Statement sqlparser.TableStatement
+}
+
+// BaseTable represents a table in VSchema.
+type BaseTable struct {
 	Type                    string                 `json:"type,omitempty"`
 	Name                    sqlparser.IdentifierCS `json:"name"`
 	Keyspace                *Keyspace              `json:"-"`
@@ -137,7 +143,7 @@ type Table struct {
 	//
 	// This is useful in route-planning for quickly selecting the optimal route
 	// when JOIN-ing a reference table to a sharded table.
-	ReferencedBy map[string]*Table `json:"-"`
+	ReferencedBy map[string]*BaseTable `json:"-"`
 	// Source is a keyspace-qualified table name that points to the source of a
 	// reference table. Only applicable for tables with Type set to "reference".
 	Source *Source `json:"source,omitempty"`
@@ -153,7 +159,7 @@ type Table struct {
 }
 
 // GetTableName gets the sqlparser.TableName for the vindex Table.
-func (t *Table) GetTableName() sqlparser.TableName {
+func (t *BaseTable) GetTableName() sqlparser.TableName {
 	return sqlparser.NewTableNameWithQualifier(t.Name.String(), t.Keyspace.Name)
 }
 
@@ -262,9 +268,9 @@ func (col *Column) ToEvalengineType(collationEnv *collations.Environment) evalen
 type KeyspaceSchema struct {
 	Keyspace        *Keyspace
 	ForeignKeyMode  vschemapb.Keyspace_ForeignKeyMode
-	Tables          map[string]*Table
+	Tables          map[string]*BaseTable
 	Vindexes        map[string]Vindex
-	Views           map[string]sqlparser.TableStatement
+	Views           map[string]*View
 	Error           error
 	MultiTenantSpec *vschemapb.MultiTenantSpec
 
@@ -275,7 +281,7 @@ type KeyspaceSchema struct {
 type ksJSON struct {
 	Sharded         bool                       `json:"sharded,omitempty"`
 	ForeignKeyMode  string                     `json:"foreignKeyMode,omitempty"`
-	Tables          map[string]*Table          `json:"tables,omitempty"`
+	Tables          map[string]*BaseTable      `json:"tables,omitempty"`
 	Vindexes        map[string]Vindex          `json:"vindexes,omitempty"`
 	Views           map[string]string          `json:"views,omitempty"`
 	Error           string                     `json:"error,omitempty"`
@@ -292,14 +298,14 @@ type ksJSON struct {
 func (ks *KeyspaceSchema) findTable(
 	tablename string,
 	constructUnshardedIfNotFound bool,
-) *Table {
+) *BaseTable {
 	table := ks.Tables[tablename]
 	if table != nil {
 		return table
 	}
 
 	if constructUnshardedIfNotFound && !ks.Keyspace.Sharded {
-		return &Table{Name: sqlparser.NewIdentifierCS(tablename), Keyspace: ks.Keyspace}
+		return &BaseTable{Name: sqlparser.NewIdentifierCS(tablename), Keyspace: ks.Keyspace}
 	}
 
 	return nil
@@ -321,7 +327,7 @@ func (ks *KeyspaceSchema) MarshalJSON() ([]byte, error) {
 		ksJ.Views = make(map[string]string, len(ks.Views))
 	}
 	for view, def := range ks.Views {
-		ksJ.Views[view] = sqlparser.String(def)
+		ksJ.Views[view] = sqlparser.String(def.Statement)
 	}
 
 	return json.Marshal(ksJ)
@@ -330,7 +336,7 @@ func (ks *KeyspaceSchema) MarshalJSON() ([]byte, error) {
 // AutoIncrement contains the auto-inc information for a table.
 type AutoIncrement struct {
 	Column   sqlparser.IdentifierCI `json:"column"`
-	Sequence *Table                 `json:"sequence"`
+	Sequence *BaseTable             `json:"sequence"`
 }
 
 type Source struct {
@@ -348,7 +354,7 @@ func BuildVSchema(source *vschemapb.SrvVSchema, parser *sqlparser.Parser) (vsche
 	vschema = &VSchema{
 		MirrorRules:    make(map[string]*MirrorRule),
 		RoutingRules:   make(map[string]*RoutingRule),
-		globalTables:   make(map[string]*Table),
+		globalTables:   make(map[string]Table),
 		uniqueVindexes: make(map[string]Vindex),
 		Keyspaces:      make(map[string]*KeyspaceSchema),
 		created:        time.Now(),
@@ -380,7 +386,7 @@ func BuildKeyspaceSchema(input *vschemapb.Keyspace, keyspace string, parser *sql
 		},
 	}
 	vschema := &VSchema{
-		globalTables:   make(map[string]*Table),
+		globalTables:   make(map[string]Table),
 		uniqueVindexes: make(map[string]Vindex),
 		Keyspaces:      make(map[string]*KeyspaceSchema),
 	}
@@ -403,7 +409,7 @@ func buildKeyspaces(source *vschemapb.SrvVSchema, vschema *VSchema, parser *sqlp
 				Sharded: ks.Sharded,
 			},
 			ForeignKeyMode:  replaceUnspecifiedForeignKeyMode(ks.ForeignKeyMode),
-			Tables:          make(map[string]*Table),
+			Tables:          make(map[string]*BaseTable),
 			Vindexes:        make(map[string]Vindex),
 			MultiTenantSpec: ks.MultiTenantSpec,
 		}
@@ -436,16 +442,15 @@ func (vschema *VSchema) AddView(ksname, viewName, query string, parser *sqlparse
 		return vterrors.Errorf(vtrpcpb.Code_INVALID_ARGUMENT, "expected SELECT or UNION query, got %T", ast)
 	}
 	if ks.Views == nil {
-		ks.Views = make(map[string]sqlparser.TableStatement)
+		ks.Views = make(map[string]*View)
 	}
-	ks.Views[viewName] = selectStmt
-	t := &Table{
-		Type:                    TypeView,
-		Name:                    sqlparser.NewIdentifierCS(viewName),
-		Keyspace:                ks.Keyspace,
-		ColumnListAuthoritative: true,
+	view := &View{
+		Name:      viewName,
+		Keyspace:  ks.Keyspace,
+		Statement: selectStmt,
 	}
-	vschema.addTableName(t)
+	ks.Views[viewName] = view
+	vschema.addToGlobalTables(view)
 	return nil
 }
 
@@ -478,13 +483,32 @@ func buildGlobalTables(source *vschemapb.SrvVSchema, vschema *VSchema) {
 // which means that the global tables are already populated with the tables from the sharded keyspaces and from
 // unsharded keyspaces which have tables specified in associated vschemas.
 func AddAdditionalGlobalTables(source *vschemapb.SrvVSchema, vschema *VSchema) {
-	newTables := make(map[string]*Table)
+	newTables := make(map[string]Table)
 
 	// Collect valid uniquely named tables from unsharded keyspaces.
 	for ksname, ks := range source.Keyspaces {
 		ksvschema := vschema.Keyspaces[ksname]
-		// Ignore sharded keyspaces and those flagged for explicit routing.
-		if ks.RequireExplicitRouting || ks.Sharded {
+		// Ignore keyspaces marked for explicit routing.
+		if ks.RequireExplicitRouting {
+			continue
+		}
+		// Views does not require routing, so this can be added to global tables
+		// for sharded keyspace as well
+		for tname, table := range ksvschema.Views {
+			// Ignore tables already global (i.e. if specified in the vschema of an unsharded keyspace) or ambiguous.
+			if _, found := vschema.globalTables[tname]; found {
+				continue
+			}
+			_, ok := newTables[tname]
+			if ok {
+				newTables[tname] = nil
+				continue
+			}
+			table.Keyspace = ksvschema.Keyspace
+			newTables[tname] = table
+		}
+		// Sharded tables needs vindex information, adding to global table will not help.
+		if ks.Sharded {
 			continue
 		}
 		for tname, table := range ksvschema.Tables {
@@ -515,18 +539,17 @@ func buildKeyspaceGlobalTables(vschema *VSchema, ksvschema *KeyspaceSchema) {
 			if gt == nil {
 				// Table name is already marked ambiguous, nothing to do.
 				continue
-			} else {
-				// Special handling for reference tables which specify their source.
-				if t.Type == TypeReference && t.Source != nil {
-					// If the reference table points to the already stored
-					// global table, there is no ambiguity.
-					if t.Source.Qualifier.IsEmpty() || t.Source.Qualifier.String() == gt.Keyspace.Name {
-						continue
-					}
+			}
+			// Special handling for reference tables which specify their source.
+			if t.Type == TypeReference && t.Source != nil {
+				// If the reference table points to the already stored
+				// global table, there is no ambiguity.
+				if t.Source.Qualifier.IsEmpty() || t.Source.Qualifier.String() == gt.GetKeyspace().Name {
+					continue
 				}
-				// Otherwise, mark this table name ambiguous.
-				vschema.globalTables[tname] = nil
 			}
+			// Otherwise, mark this table name ambiguous.
+			vschema.globalTables[tname] = nil
 		} else {
 			// Reference tables which define a source with the same name may be
 			// globally routable through their source, as long as the source
@@ -662,7 +685,7 @@ func buildTables(ks *vschemapb.Keyspace, vschema *VSchema, ksvschema *KeyspaceSc
 		ksvschema.Vindexes[vname] = vindex
 	}
 	for tname, table := range ks.Tables {
-		t := &Table{
+		t := &BaseTable{
 			Name:                    sqlparser.NewIdentifierCS(tname),
 			Keyspace:                keyspace,
 			ColumnListAuthoritative: table.ColumnListAuthoritative,
@@ -887,8 +910,9 @@ func buildTables(ks *vschemapb.Keyspace, vschema *VSchema, ksvschema *KeyspaceSc
 	return nil
 }
 
-func (vschema *VSchema) addTableName(t *Table) {
-	tname := t.Name.String()
+// addToGlobalTables adds a table to the global tables map if unique otherwise marks it as ambiguous.
+func (vschema *VSchema) addToGlobalTables(t Table) {
+	tname := t.GetName()
 	if _, ok := vschema.globalTables[tname]; ok {
 		vschema.globalTables[tname] = nil
 	} else {
@@ -905,7 +929,7 @@ func resolveAutoIncrement(source *vschemapb.SrvVSchema, vschema *VSchema, parser
 				continue
 			}
 			seqks, seqtab, err := parser.ParseTable(table.AutoIncrement.Sequence)
-			var seq *Table
+			var seq *BaseTable
 			if err == nil {
 				// Ensure that sequence tables also obey routing rules.
 				seq, err = vschema.FindRoutedTable(seqks, seqtab, topodatapb.TabletType_PRIMARY)
@@ -1299,7 +1323,7 @@ func buildMirrorRule(source *vschemapb.SrvVSchema, vschema *VSchema, parser *sql
 // keyspace in the vschema, and it's unsharded, then all table requests are considered
 // valid and belonging to that keyspace.
 // FindTable bypasses routing rules and returns at most one table.
-func (vschema *VSchema) FindTable(keyspace, tablename string) (*Table, error) {
+func (vschema *VSchema) FindTable(keyspace, tablename string) (*BaseTable, error) {
 	table, err := vschema.findTable(
 		keyspace,
 		tablename,
@@ -1328,12 +1352,17 @@ func (vschema *VSchema) FindTable(keyspace, tablename string) (*Table, error) {
 //
 //   - constructUnshardedIfNotFound is not requested, than no table is returned.
 //   - constructUnshardedIfNotFound is requested, and there is only one keyspace,
-//     and that keyspace is unsharded, then a *Table representing that table is
+//     and that keyspace is unsharded, then a BaseTable representing that table is
 //     returned.
 func (vschema *VSchema) findGlobalTable(
 	tablename string,
 	constructUnshardedIfNotFound bool,
-) (*Table, error) {
+) (Table, error) {
+	table, ok := vschema.globalTables[tablename]
+	if table != nil {
+		return table, nil
+	}
+
 	if len(vschema.Keyspaces) == 1 {
 		for _, ks := range vschema.Keyspaces {
 			table := ks.findTable(tablename, constructUnshardedIfNotFound)
@@ -1341,12 +1370,6 @@ func (vschema *VSchema) findGlobalTable(
 		}
 	}
 
-	table, ok := vschema.globalTables[tablename]
-
-	if table != nil {
-		return table, nil
-	}
-
 	if ok {
 		return nil, vterrors.Errorf(
 			vtrpcpb.Code_FAILED_PRECONDITION,
@@ -1377,9 +1400,16 @@ func (vschema *VSchema) findTable(
 	keyspace,
 	tablename string,
 	constructUnshardedIfNotFound bool,
-) (*Table, error) {
+) (*BaseTable, error) {
 	if keyspace == "" {
-		return vschema.findGlobalTable(tablename, constructUnshardedIfNotFound)
+		tbl, err := vschema.findGlobalTable(tablename, constructUnshardedIfNotFound)
+		if err != nil || tbl == nil {
+			return nil, err
+		}
+		if tbl.IsBaseTable() {
+			return tbl.(*BaseTable), nil
+		}
+		return nil, vterrors.VT13001(fmt.Sprintf("found view `%s`.`%s`, expecting table", tbl.GetKeyspace().Name, tablename))
 	}
 	ks, ok := vschema.Keyspaces[keyspace]
 	if !ok {
@@ -1426,7 +1456,7 @@ func (vschema *VSchema) findRoutedKeyspace(keyspace string, tabletType topodatap
 }
 
 // FindRoutedTable finds a table checking the routing rules.
-func (vschema *VSchema) FindRoutedTable(keyspace, tablename string, tabletType topodatapb.TabletType) (*Table, error) {
+func (vschema *VSchema) FindRoutedTable(keyspace, tablename string, tabletType topodatapb.TabletType) (*BaseTable, error) {
 	keyspace = vschema.findRoutedKeyspace(keyspace, tabletType)
 	qualified := tablename
 	if keyspace != "" {
@@ -1459,7 +1489,7 @@ func (vschema *VSchema) FindRoutedTable(keyspace, tablename string, tabletType t
 }
 
 // FindTableOrVindex finds a table or a Vindex by name using Find and FindVindex.
-func (vschema *VSchema) FindTableOrVindex(keyspace, name string, tabletType topodatapb.TabletType) (*Table, Vindex, error) {
+func (vschema *VSchema) FindTableOrVindex(keyspace, name string, tabletType topodatapb.TabletType) (*BaseTable, Vindex, error) {
 	tables, err := vschema.FindRoutedTable(keyspace, name, tabletType)
 	if err != nil {
 		return nil, nil, err
@@ -1479,22 +1509,11 @@ func (vschema *VSchema) FindTableOrVindex(keyspace, name string, tabletType topo
 
 func (vschema *VSchema) FindView(keyspace, name string) sqlparser.TableStatement {
 	if keyspace == "" {
-		switch {
-		case len(vschema.Keyspaces) == 1:
-			for _, schema := range vschema.Keyspaces {
-				keyspace = schema.Keyspace.Name
-				break
-			}
-		default:
-			t, ok := vschema.globalTables[name]
-			if !ok {
-				return nil
-			}
-			if ok && t == nil {
-				return nil
-			}
-			keyspace = t.Keyspace.Name
+		t, err := vschema.findGlobalTable(name, false)
+		if err != nil || t == nil || t.IsBaseTable() {
+			return nil
 		}
+		return t.(*View).Statement
 	}
 
 	ks := vschema.Keyspaces[keyspace]
@@ -1502,21 +1521,18 @@ func (vschema *VSchema) FindView(keyspace, name string) sqlparser.TableStatement
 		return nil
 	}
 
-	statement, ok := ks.Views[name]
+	view, ok := ks.Views[name]
 	if !ok {
 		return nil
 	}
 
 	// We do this to make sure there is no shared state between uses of this AST
-	statement = sqlparser.Clone(statement)
-	sqlparser.SafeRewrite(statement, nil, func(cursor *sqlparser.Cursor) bool {
+	return sqlparser.CopyOnRewrite(view.Statement, nil, func(cursor *sqlparser.CopyOnWriteCursor) {
 		col, ok := cursor.Node().(*sqlparser.ColName)
 		if ok {
 			cursor.Replace(sqlparser.NewColNameWithQualifier(col.Name.String(), col.Qualifier))
 		}
-		return true
-	})
-	return statement
+	}, nil).(sqlparser.TableStatement)
 }
 
 // NotFoundError represents the error where the table name was not found
@@ -1679,7 +1695,7 @@ func ChooseVindexForType(typ querypb.Type) (string, error) {
 }
 
 // FindBestColVindex finds the best ColumnVindex for VReplication.
-func FindBestColVindex(table *Table) (*ColumnVindex, error) {
+func FindBestColVindex(table *BaseTable) (*ColumnVindex, error) {
 	if len(table.ColumnVindexes) == 0 {
 		return nil, vterrors.Errorf(
 			vtrpcpb.Code_INVALID_ARGUMENT,
@@ -1743,7 +1759,7 @@ func FindVindexForSharding(tableName string, colVindexes []*ColumnVindex) (*Colu
 }
 
 // String prints the (possibly qualified) table name
-func (t *Table) String() string {
+func (t *BaseTable) String() string {
 	res := ""
 	if t == nil {
 		return res
@@ -1754,14 +1770,14 @@ func (t *Table) String() string {
 	return res + t.Name.String()
 }
 
-func (t *Table) addReferenceInKeyspace(keyspace string, table *Table) {
+func (t *BaseTable) addReferenceInKeyspace(keyspace string, table *BaseTable) {
 	if t.ReferencedBy == nil {
-		t.ReferencedBy = make(map[string]*Table)
+		t.ReferencedBy = make(map[string]*BaseTable)
 	}
 	t.ReferencedBy[keyspace] = table
 }
 
-func (t *Table) getReferenceInKeyspace(keyspace string) *Table {
+func (t *BaseTable) getReferenceInKeyspace(keyspace string) *BaseTable {
 	if t.ReferencedBy == nil {
 		return nil
 	}
@@ -1771,3 +1787,33 @@ func (t *Table) getReferenceInKeyspace(keyspace string) *Table {
 	}
 	return t
 }
+
+type Table interface {
+	IsBaseTable() bool
+	GetKeyspace() *Keyspace
+	GetName() string
+}
+
+func (v *View) IsBaseTable() bool {
+	return false
+}
+
+func (t *BaseTable) IsBaseTable() bool {
+	return true
+}
+
+func (v *View) GetKeyspace() *Keyspace {
+	return v.Keyspace
+}
+
+func (t *BaseTable) GetKeyspace() *Keyspace {
+	return t.Keyspace
+}
+
+func (v *View) GetName() string {
+	return v.Name
+}
+
+func (t *BaseTable) GetName() string {
+	return t.Name.String()
+}
diff --git a/go/vt/vtgate/vindexes/vschema_routing_test.go b/go/vt/vtgate/vindexes/vschema_routing_test.go
index 48ac9239fbb..2b0b1bf7efe 100644
--- a/go/vt/vtgate/vindexes/vschema_routing_test.go
+++ b/go/vt/vtgate/vindexes/vschema_routing_test.go
@@ -307,7 +307,7 @@ func TestAutoGlobalRoutingBasic(t *testing.T) {
 
 	// Verify the global tables
 	ks := vschema.Keyspaces["sharded1"]
-	require.EqualValues(t, vschema.globalTables, map[string]*Table{
+	require.EqualValues(t, vschema.globalTables, map[string]Table{
 		"table5":   ks.Tables["table5"],
 		"scommon1": ks.Tables["scommon1"],
 		"scommon2": ks.Tables["scommon2"],
@@ -419,7 +419,7 @@ func TestVSchemaRoutingRules(t *testing.T) {
 	vindex1 := &stFU{
 		name: "stfu1",
 	}
-	t1 := &Table{
+	t1 := &BaseTable{
 		Name:     sqlparser.NewIdentifierCS("t1"),
 		Keyspace: ks1,
 		ColumnVindexes: []*ColumnVindex{{
@@ -434,7 +434,7 @@ func TestVSchemaRoutingRules(t *testing.T) {
 	t1.Ordered = []*ColumnVindex{
 		t1.ColumnVindexes[0],
 	}
-	t2 := &Table{
+	t2 := &BaseTable{
 		Name:     sqlparser.NewIdentifierCS("t2"),
 		Keyspace: ks2,
 	}
@@ -445,10 +445,10 @@ func TestVSchemaRoutingRules(t *testing.T) {
 				Error: errors.New("table rt1 has more than one target: [ks1.t1 ks2.t2]"),
 			},
 			"rt2": {
-				Tables: []*Table{t2},
+				Tables: []*BaseTable{t2},
 			},
 			"escaped": {
-				Tables: []*Table{t2},
+				Tables: []*BaseTable{t2},
 			},
 			"dup": {
 				Error: errors.New("duplicate rule for entry dup"),
@@ -466,7 +466,7 @@ func TestVSchemaRoutingRules(t *testing.T) {
 				Error: errors.New("table t2 not found"),
 			},
 		},
-		globalTables: map[string]*Table{
+		globalTables: map[string]Table{
 			"t1": t1,
 			"t2": t2,
 		},
@@ -477,7 +477,7 @@ func TestVSchemaRoutingRules(t *testing.T) {
 			"ks1": {
 				Keyspace:       ks1,
 				ForeignKeyMode: vschemapb.Keyspace_unmanaged,
-				Tables: map[string]*Table{
+				Tables: map[string]*BaseTable{
 					"t1": t1,
 				},
 				Vindexes: map[string]Vindex{
@@ -487,7 +487,7 @@ func TestVSchemaRoutingRules(t *testing.T) {
 			"ks2": {
 				ForeignKeyMode: vschemapb.Keyspace_managed,
 				Keyspace:       ks2,
-				Tables: map[string]*Table{
+				Tables: map[string]*BaseTable{
 					"t2": t2,
 				},
 				Vindexes: map[string]Vindex{},
diff --git a/go/vt/vtgate/vindexes/vschema_test.go b/go/vt/vtgate/vindexes/vschema_test.go
index 70e70745e9b..5ebb5564ed5 100644
--- a/go/vt/vtgate/vindexes/vschema_test.go
+++ b/go/vt/vtgate/vindexes/vschema_test.go
@@ -899,7 +899,7 @@ func TestVSchemaMirrorRules(t *testing.T) {
 		name: "stfu1",
 	}
 
-	ks3t1 := &Table{
+	ks3t1 := &BaseTable{
 		Name:     sqlparser.NewIdentifierCS("ks3t1"),
 		Keyspace: ks3,
 		ColumnVindexes: []*ColumnVindex{{
@@ -915,7 +915,7 @@ func TestVSchemaMirrorRules(t *testing.T) {
 		ks3t1.ColumnVindexes[0],
 	}
 
-	ks4t1 := &Table{
+	ks4t1 := &BaseTable{
 		Name:     sqlparser.NewIdentifierCS("ks4t1"),
 		Keyspace: ks4,
 		ColumnVindexes: []*ColumnVindex{{
@@ -946,7 +946,7 @@ func TestVSchemaMirrorRules(t *testing.T) {
 				Error: errors.New("to table: invalid table name: 'ks2.ks2t2.c', it must be of the qualified form <keyspace_name>.<table_name> (dots are not allowed in either name)"),
 			},
 			"ks1.ks1t3": {
-				Table: &Table{
+				Table: &BaseTable{
 					Name: sqlparser.NewIdentifierCS("ks2t3"),
 				},
 				Percent: 50,
@@ -955,7 +955,7 @@ func TestVSchemaMirrorRules(t *testing.T) {
 				Error: errors.New("to table: tablet type may not be specified: 'ks2.ks2t4@replica'"),
 			},
 			"ks1.ks1t5@replica": {
-				Table: &Table{
+				Table: &BaseTable{
 					Name: sqlparser.NewIdentifierCS("ks2t5"),
 				},
 			},
@@ -985,19 +985,19 @@ func TestVSchemaMirrorRules(t *testing.T) {
 			"ks1": {
 				Keyspace:       ks1,
 				ForeignKeyMode: vschemapb.Keyspace_unmanaged,
-				Tables:         map[string]*Table{},
+				Tables:         map[string]*BaseTable{},
 				Vindexes:       map[string]Vindex{},
 			},
 			"ks2": {
 				ForeignKeyMode: vschemapb.Keyspace_unmanaged,
 				Keyspace:       ks2,
-				Tables:         map[string]*Table{},
+				Tables:         map[string]*BaseTable{},
 				Vindexes:       map[string]Vindex{},
 			},
 			"ks3": {
 				ForeignKeyMode: vschemapb.Keyspace_unmanaged,
 				Keyspace:       ks3,
-				Tables: map[string]*Table{
+				Tables: map[string]*BaseTable{
 					"ks3t1": ks3t1,
 				},
 				Vindexes: map[string]Vindex{
@@ -1007,7 +1007,7 @@ func TestVSchemaMirrorRules(t *testing.T) {
 			"ks4": {
 				ForeignKeyMode: vschemapb.Keyspace_unmanaged,
 				Keyspace:       ks4,
-				Tables: map[string]*Table{
+				Tables: map[string]*BaseTable{
 					"ks4t1": ks4t1,
 				},
 				Vindexes: map[string]Vindex{
@@ -1224,7 +1224,7 @@ func TestFindVindexForSharding(t *testing.T) {
 	}
 	vindex1 := &stFU{name: "stfu1"}
 	vindex2 := &stLN{name: "stln1"}
-	t1 := &Table{
+	t1 := &BaseTable{
 		Name:     sqlparser.NewIdentifierCS("t1"),
 		Keyspace: ks,
 		ColumnVindexes: []*ColumnVindex{
@@ -1261,7 +1261,7 @@ func TestFindVindexForShardingError(t *testing.T) {
 	}
 	vindex1 := &stLU{name: "stlu1"}
 	vindex2 := &stLN{name: "stln1"}
-	t1 := &Table{
+	t1 := &BaseTable{
 		Name:     sqlparser.NewIdentifierCS("t1"),
 		Keyspace: ks,
 		ColumnVindexes: []*ColumnVindex{
@@ -1301,7 +1301,7 @@ func TestFindVindexForSharding2(t *testing.T) {
 	}
 	vindex1 := &stLU{name: "stlu1"}
 	vindex2 := &stFU{name: "stfu1"}
-	t1 := &Table{
+	t1 := &BaseTable{
 		Name:     sqlparser.NewIdentifierCS("t1"),
 		Keyspace: ks,
 		ColumnVindexes: []*ColumnVindex{
@@ -1356,7 +1356,7 @@ func TestShardedVSchemaMultiColumnVindex(t *testing.T) {
 		Sharded: true,
 	}
 	vindex1 := &stFU{name: "stfu1"}
-	t1 := &Table{
+	t1 := &BaseTable{
 		Name:     sqlparser.NewIdentifierCS("t1"),
 		Keyspace: ks,
 		ColumnVindexes: []*ColumnVindex{
@@ -1376,7 +1376,7 @@ func TestShardedVSchemaMultiColumnVindex(t *testing.T) {
 	want := &VSchema{
 		MirrorRules:  map[string]*MirrorRule{},
 		RoutingRules: map[string]*RoutingRule{},
-		globalTables: map[string]*Table{
+		globalTables: map[string]Table{
 			"t1": t1,
 		},
 		uniqueVindexes: map[string]Vindex{
@@ -1386,7 +1386,7 @@ func TestShardedVSchemaMultiColumnVindex(t *testing.T) {
 			"sharded": {
 				ForeignKeyMode: vschemapb.Keyspace_disallow,
 				Keyspace:       ks,
-				Tables: map[string]*Table{
+				Tables: map[string]*BaseTable{
 					"t1": t1},
 				Vindexes: map[string]Vindex{
 					"stfu1": vindex1},
@@ -1427,7 +1427,7 @@ func TestShardedVSchemaNotOwned(t *testing.T) {
 	}
 	vindex1 := &stLU{name: "stlu1"}
 	vindex2 := &stFU{name: "stfu1"}
-	t1 := &Table{
+	t1 := &BaseTable{
 		Name:     sqlparser.NewIdentifierCS("t1"),
 		Keyspace: ks,
 		ColumnVindexes: []*ColumnVindex{
@@ -1453,7 +1453,7 @@ func TestShardedVSchemaNotOwned(t *testing.T) {
 	want := &VSchema{
 		MirrorRules:  map[string]*MirrorRule{},
 		RoutingRules: map[string]*RoutingRule{},
-		globalTables: map[string]*Table{
+		globalTables: map[string]Table{
 			"t1": t1,
 		},
 		uniqueVindexes: map[string]Vindex{
@@ -1463,7 +1463,7 @@ func TestShardedVSchemaNotOwned(t *testing.T) {
 			"sharded": {
 				ForeignKeyMode: vschemapb.Keyspace_managed,
 				Keyspace:       ks,
-				Tables: map[string]*Table{
+				Tables: map[string]*BaseTable{
 					"t1": t1,
 				},
 				Vindexes: map[string]Vindex{
@@ -1550,18 +1550,18 @@ func TestBuildVSchemaDupSeq(t *testing.T) {
 	ksb := &Keyspace{
 		Name: "ksb"}
 	got := buildVSchema(&good)
-	t1a := &Table{
+	t1a := &BaseTable{
 		Name:     sqlparser.NewIdentifierCS("t1"),
 		Keyspace: ksa,
 		Type:     "sequence"}
-	t1b := &Table{
+	t1b := &BaseTable{
 		Name:     sqlparser.NewIdentifierCS("t1"),
 		Keyspace: ksb,
 		Type:     "sequence"}
 	want := &VSchema{
 		MirrorRules:  map[string]*MirrorRule{},
 		RoutingRules: map[string]*RoutingRule{},
-		globalTables: map[string]*Table{
+		globalTables: map[string]Table{
 			"t1": nil,
 		},
 		uniqueVindexes: map[string]Vindex{},
@@ -1569,7 +1569,7 @@ func TestBuildVSchemaDupSeq(t *testing.T) {
 			"ksa": {
 				ForeignKeyMode: vschemapb.Keyspace_managed,
 				Keyspace:       ksa,
-				Tables: map[string]*Table{
+				Tables: map[string]*BaseTable{
 					"t1": t1a,
 				},
 				Vindexes: map[string]Vindex{},
@@ -1577,7 +1577,7 @@ func TestBuildVSchemaDupSeq(t *testing.T) {
 			"ksb": {
 				ForeignKeyMode: vschemapb.Keyspace_managed,
 				Keyspace:       ksb,
-				Tables: map[string]*Table{
+				Tables: map[string]*BaseTable{
 					"t1": t1b,
 				},
 				Vindexes: map[string]Vindex{}}}}
@@ -1609,21 +1609,21 @@ func TestBuildVSchemaDupTable(t *testing.T) {
 	ksa := &Keyspace{
 		Name: "ksa",
 	}
-	t1a := &Table{
+	t1a := &BaseTable{
 		Name:     sqlparser.NewIdentifierCS("t1"),
 		Keyspace: ksa,
 	}
 	ksb := &Keyspace{
 		Name: "ksb",
 	}
-	t1b := &Table{
+	t1b := &BaseTable{
 		Name:     sqlparser.NewIdentifierCS("t1"),
 		Keyspace: ksb,
 	}
 	want := &VSchema{
 		MirrorRules:  map[string]*MirrorRule{},
 		RoutingRules: map[string]*RoutingRule{},
-		globalTables: map[string]*Table{
+		globalTables: map[string]Table{
 			"t1": nil,
 		},
 		uniqueVindexes: map[string]Vindex{},
@@ -1631,7 +1631,7 @@ func TestBuildVSchemaDupTable(t *testing.T) {
 			"ksa": {
 				ForeignKeyMode: vschemapb.Keyspace_unmanaged,
 				Keyspace:       ksa,
-				Tables: map[string]*Table{
+				Tables: map[string]*BaseTable{
 					"t1": t1a,
 				},
 				Vindexes: map[string]Vindex{},
@@ -1639,7 +1639,7 @@ func TestBuildVSchemaDupTable(t *testing.T) {
 			"ksb": {
 				ForeignKeyMode: vschemapb.Keyspace_unmanaged,
 				Keyspace:       ksb,
-				Tables: map[string]*Table{
+				Tables: map[string]*BaseTable{
 					"t1": t1b,
 				},
 				Vindexes: map[string]Vindex{},
@@ -1714,7 +1714,7 @@ func TestBuildVSchemaDupVindex(t *testing.T) {
 		Sharded: true,
 	}
 	vindex1 := &stLU{name: "stlu1"}
-	t1 := &Table{
+	t1 := &BaseTable{
 		Name:     sqlparser.NewIdentifierCS("t1"),
 		Keyspace: ksa,
 		ColumnVindexes: []*ColumnVindex{
@@ -1732,7 +1732,7 @@ func TestBuildVSchemaDupVindex(t *testing.T) {
 	t1.Ordered = []*ColumnVindex{
 		t1.ColumnVindexes[0],
 	}
-	t2 := &Table{
+	t2 := &BaseTable{
 		Name:     sqlparser.NewIdentifierCS("t1"),
 		Keyspace: ksb,
 		ColumnVindexes: []*ColumnVindex{
@@ -1753,7 +1753,7 @@ func TestBuildVSchemaDupVindex(t *testing.T) {
 	want := &VSchema{
 		MirrorRules:  map[string]*MirrorRule{},
 		RoutingRules: map[string]*RoutingRule{},
-		globalTables: map[string]*Table{
+		globalTables: map[string]Table{
 			"t1": nil,
 		},
 		uniqueVindexes: map[string]Vindex{
@@ -1763,7 +1763,7 @@ func TestBuildVSchemaDupVindex(t *testing.T) {
 			"ksa": {
 				ForeignKeyMode: vschemapb.Keyspace_unmanaged,
 				Keyspace:       ksa,
-				Tables: map[string]*Table{
+				Tables: map[string]*BaseTable{
 					"t1": t1,
 				},
 				Vindexes: map[string]Vindex{
@@ -1773,7 +1773,7 @@ func TestBuildVSchemaDupVindex(t *testing.T) {
 			"ksb": {
 				ForeignKeyMode: vschemapb.Keyspace_unmanaged,
 				Keyspace:       ksb,
-				Tables: map[string]*Table{
+				Tables: map[string]*BaseTable{
 					"t1": t2,
 				},
 				Vindexes: map[string]Vindex{
@@ -2289,13 +2289,13 @@ func TestSequence(t *testing.T) {
 		Name:    "sharded",
 		Sharded: true,
 	}
-	seq := &Table{
+	seq := &BaseTable{
 		Name:     sqlparser.NewIdentifierCS("seq"),
 		Keyspace: ksu,
 		Type:     "sequence",
 	}
 	vindex1 := &stFU{name: "stfu1"}
-	t1 := &Table{
+	t1 := &BaseTable{
 		Name:     sqlparser.NewIdentifierCS("t1"),
 		Keyspace: kss,
 		ColumnVindexes: []*ColumnVindex{
@@ -2316,7 +2316,7 @@ func TestSequence(t *testing.T) {
 	t1.Ordered = []*ColumnVindex{
 		t1.ColumnVindexes[0],
 	}
-	t2 := &Table{
+	t2 := &BaseTable{
 		Name:     sqlparser.NewIdentifierCS("t2"),
 		Keyspace: kss,
 		ColumnVindexes: []*ColumnVindex{
@@ -2340,7 +2340,7 @@ func TestSequence(t *testing.T) {
 	want := &VSchema{
 		MirrorRules:  map[string]*MirrorRule{},
 		RoutingRules: map[string]*RoutingRule{},
-		globalTables: map[string]*Table{
+		globalTables: map[string]Table{
 			"seq": seq,
 			"t1":  t1,
 			"t2":  t2,
@@ -2352,7 +2352,7 @@ func TestSequence(t *testing.T) {
 			"unsharded": {
 				ForeignKeyMode: vschemapb.Keyspace_disallow,
 				Keyspace:       ksu,
-				Tables: map[string]*Table{
+				Tables: map[string]*BaseTable{
 					"seq": seq,
 				},
 				Vindexes: map[string]Vindex{},
@@ -2360,7 +2360,7 @@ func TestSequence(t *testing.T) {
 			"sharded": {
 				ForeignKeyMode: vschemapb.Keyspace_unmanaged,
 				Keyspace:       kss,
-				Tables: map[string]*Table{
+				Tables: map[string]*BaseTable{
 					"t1": t1,
 					"t2": t2,
 				},
@@ -2553,7 +2553,7 @@ func TestFindTable(t *testing.T) {
 	_, err = vschema.FindTable("", "none")
 	require.EqualError(t, err, "table none not found")
 
-	ta := &Table{
+	ta := &BaseTable{
 		Name: sqlparser.NewIdentifierCS("ta"),
 		Keyspace: &Keyspace{
 			Name: "ksa",
@@ -2563,12 +2563,12 @@ func TestFindTable(t *testing.T) {
 	require.NoError(t, err)
 	require.Equal(t, ta, got)
 
-	t2 := &Table{
+	t2 := &BaseTable{
 		Name: sqlparser.NewIdentifierCS("t2"),
 		Keyspace: &Keyspace{
 			Name: "ksa",
 		},
-		ReferencedBy: map[string]*Table{
+		ReferencedBy: map[string]*BaseTable{
 			"ksb": {
 				Type: "reference",
 				Name: sqlparser.NewIdentifierCS("t2"),
@@ -2592,7 +2592,7 @@ func TestFindTable(t *testing.T) {
 	got, _ = vschema.FindTable("ksa", "ta")
 	require.Equal(t, ta, got)
 
-	none := &Table{
+	none := &BaseTable{
 		Name: sqlparser.NewIdentifierCS("none"),
 		Keyspace: &Keyspace{
 			Name: "ksa",
@@ -2779,18 +2779,18 @@ func TestBuildKeyspaceSchema(t *testing.T) {
 	ks := &Keyspace{
 		Name: "ks",
 	}
-	t1 := &Table{
+	t1 := &BaseTable{
 		Name:     sqlparser.NewIdentifierCS("t1"),
 		Keyspace: ks,
 	}
-	t2 := &Table{
+	t2 := &BaseTable{
 		Name:     sqlparser.NewIdentifierCS("t2"),
 		Keyspace: ks,
 	}
 	want := &KeyspaceSchema{
 		Keyspace:       ks,
 		ForeignKeyMode: vschemapb.Keyspace_unmanaged,
-		Tables: map[string]*Table{
+		Tables: map[string]*BaseTable{
 			"t1": t1,
 			"t2": t2,
 		},
@@ -2929,7 +2929,7 @@ func TestVSchemaJSON(t *testing.T) {
 			Keyspace: &Keyspace{
 				Name: "k1",
 			},
-			Tables: map[string]*Table{
+			Tables: map[string]*BaseTable{
 				"t1": {
 					Name: sqlparser.NewIdentifierCS("n1"),
 					Columns: []Column{{
@@ -2952,7 +2952,7 @@ func TestVSchemaJSON(t *testing.T) {
 				Name:    "k2",
 				Sharded: true,
 			},
-			Tables: map[string]*Table{
+			Tables: map[string]*BaseTable{
 				"t3": {
 					Name: sqlparser.NewIdentifierCS("n3"),
 					ColumnVindexes: []*ColumnVindex{{
@@ -3043,7 +3043,7 @@ func TestFindSingleKeyspace(t *testing.T) {
 		},
 	}
 	vschema := BuildVSchema(&input, sqlparser.NewTestParser())
-	none := &Table{
+	none := &BaseTable{
 		Name: sqlparser.NewIdentifierCS("none"),
 		Keyspace: &Keyspace{
 			Name: "ksa",
@@ -3194,7 +3194,7 @@ func TestSourceTableHasReferencedBy(t *testing.T) {
 	require.NoError(t, err)
 	src, err := vs.FindTable("unsharded", "src")
 	require.NoError(t, err)
-	require.Equal(t, src.ReferencedBy, map[string]*Table{
+	require.Equal(t, src.ReferencedBy, map[string]*BaseTable{
 		"sharded1": ref1,
 		"sharded2": ref2,
 	})
@@ -3415,6 +3415,94 @@ func TestGlobalTables(t *testing.T) {
 	assert.NotNil(t, tbl)
 }
 
+// TestAddingAdditionalTablesToGlobalRouting tests that views are added to the global routing which are unique.
+func TestAddingAdditionalTablesToGlobalRouting(t *testing.T) {
+	input := &vschemapb.SrvVSchema{
+		Keyspaces: map[string]*vschemapb.Keyspace{
+			"unsharded": {
+				Sharded: false,
+				Tables:  map[string]*vschemapb.Table{"t1": {}},
+			},
+			"sharded": {
+				Sharded: true,
+				Tables:  map[string]*vschemapb.Table{"t1": {Type: "reference"}},
+			},
+		},
+	}
+
+	v1Stmt, err := sqlparser.NewTestParser().Parse("select 1 from t1")
+	require.NoError(t, err)
+
+	v2Stmt, err := sqlparser.NewTestParser().Parse("select 1 from t2")
+	require.NoError(t, err)
+
+	v3Stmt, err := sqlparser.NewTestParser().Parse("select 1 from t3")
+	require.NoError(t, err)
+
+	vs := BuildVSchema(input, sqlparser.NewTestParser())
+	vs.Keyspaces["unsharded"].Views = map[string]*View{
+		"v1": {
+			Name:      "v1",
+			Keyspace:  vs.Keyspaces["unsharded"].Keyspace,
+			Statement: v1Stmt.(*sqlparser.Select),
+		},
+		"v2": {
+			Name:      "v2",
+			Keyspace:  vs.Keyspaces["unsharded"].Keyspace,
+			Statement: v2Stmt.(*sqlparser.Select),
+		},
+	}
+	vs.Keyspaces["sharded"].Views = map[string]*View{
+		"v2": {
+			Name:      "v2",
+			Keyspace:  vs.Keyspaces["sharded"].Keyspace,
+			Statement: v2Stmt.(*sqlparser.Select),
+		},
+		"v3": {
+			Name:      "v3",
+			Keyspace:  vs.Keyspaces["sharded"].Keyspace,
+			Statement: v3Stmt.(*sqlparser.Select),
+		},
+	}
+
+	// before adding to global tables, the views should not be found.
+	require.Nil(t,
+		vs.FindView("", "v1"))
+	require.Nil(t,
+		vs.FindView("", "v2"))
+	require.Nil(t,
+		vs.FindView("", "v3"))
+
+	AddAdditionalGlobalTables(input, vs)
+
+	// without keyspace will be checked on global table.
+	// v1 and v3 are unique so they should be discovered using the global tables.
+	require.NotNil(t,
+		vs.FindView("", "v1"))
+	require.Nil(t,
+		vs.FindView("", "v2"))
+	require.NotNil(t,
+		vs.FindView("", "v3"))
+
+	// providing the keyspace qualifier will check the keyspace specific views.
+
+	// unsharded check
+	require.NotNil(t,
+		vs.FindView("unsharded", "v1"))
+	require.NotNil(t,
+		vs.FindView("unsharded", "v2"))
+	require.Nil(t,
+		vs.FindView("unsharded", "v3"))
+
+	// sharded check
+	require.Nil(t,
+		vs.FindView("sharded", "v1"))
+	require.NotNil(t,
+		vs.FindView("sharded", "v2"))
+	require.NotNil(t,
+		vs.FindView("sharded", "v3"))
+}
+
 func vindexNames(vindexes []*ColumnVindex) (result []string) {
 	for _, vindex := range vindexes {
 		result = append(result, vindex.Name)
diff --git a/go/vt/vtgate/vschema_manager.go b/go/vt/vtgate/vschema_manager.go
index e73bff4c196..7a1c5ee1d24 100644
--- a/go/vt/vtgate/vschema_manager.go
+++ b/go/vt/vtgate/vschema_manager.go
@@ -222,20 +222,14 @@ func (vm *VSchemaManager) updateViewInfo(ks *vindexes.KeyspaceSchema, ksName str
 	if views == nil {
 		return
 	}
-	ks.Views = make(map[string]sqlparser.TableStatement, len(views))
+	ks.Views = make(map[string]*vindexes.View, len(views))
 	for name, def := range views {
-		ks.Views[name] = sqlparser.Clone(def)
-		vTbl, ok := ks.Tables[name]
-		if ok {
-			vTbl.Type = vindexes.TypeView
-		} else {
-			// Adding view to the VSchema as a table.
-			ks.Tables[name] = &vindexes.Table{
-				Type:     vindexes.TypeView,
-				Name:     sqlparser.NewIdentifierCS(name),
-				Keyspace: ks.Keyspace,
-			}
+		v := &vindexes.View{
+			Name:      name,
+			Keyspace:  ks.Keyspace,
+			Statement: def,
 		}
+		ks.Views[name] = v
 	}
 }
 
@@ -353,11 +347,11 @@ func addCrossEdges(g *graph.Graph[string], from []string, to []string) {
 	}
 }
 
-func setColumns(ks *vindexes.KeyspaceSchema, tblName string, columns []vindexes.Column) *vindexes.Table {
+func setColumns(ks *vindexes.KeyspaceSchema, tblName string, columns []vindexes.Column) *vindexes.BaseTable {
 	vTbl := ks.Tables[tblName]
 	if vTbl == nil {
 		// a table that is unknown by the vschema. we add it as a normal table
-		ks.Tables[tblName] = &vindexes.Table{
+		ks.Tables[tblName] = &vindexes.BaseTable{
 			Name:                    sqlparser.NewIdentifierCS(tblName),
 			Keyspace:                ks.Keyspace,
 			Columns:                 columns,
diff --git a/go/vt/vtgate/vschema_manager_test.go b/go/vt/vtgate/vschema_manager_test.go
index b4b7a20804f..42515d59788 100644
--- a/go/vt/vtgate/vschema_manager_test.go
+++ b/go/vt/vtgate/vschema_manager_test.go
@@ -3,6 +3,7 @@ package vtgate
 import (
 	"testing"
 
+	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
 	"vitess.io/vitess/go/test/utils"
@@ -27,30 +28,30 @@ func TestVSchemaUpdate(t *testing.T) {
 		Nullable: true,
 	}}
 	ks := &vindexes.Keyspace{Name: "ks"}
-	tblNoCol := &vindexes.Table{Name: sqlparser.NewIdentifierCS("tbl"), Keyspace: ks, ColumnListAuthoritative: true}
-	tblCol1 := &vindexes.Table{Name: sqlparser.NewIdentifierCS("tbl"), Keyspace: ks, Columns: cols1, ColumnListAuthoritative: true}
-	tblCol2 := &vindexes.Table{Name: sqlparser.NewIdentifierCS("tbl"), Keyspace: ks, Columns: cols2, ColumnListAuthoritative: true}
-	tblCol2NA := &vindexes.Table{Name: sqlparser.NewIdentifierCS("tbl"), Keyspace: ks, Columns: cols2}
+	tblNoCol := &vindexes.BaseTable{Name: sqlparser.NewIdentifierCS("tbl"), Keyspace: ks, ColumnListAuthoritative: true}
+	tblCol1 := &vindexes.BaseTable{Name: sqlparser.NewIdentifierCS("tbl"), Keyspace: ks, Columns: cols1, ColumnListAuthoritative: true}
+	tblCol2 := &vindexes.BaseTable{Name: sqlparser.NewIdentifierCS("tbl"), Keyspace: ks, Columns: cols2, ColumnListAuthoritative: true}
+	tblCol2NA := &vindexes.BaseTable{Name: sqlparser.NewIdentifierCS("tbl"), Keyspace: ks, Columns: cols2}
 
-	vindexTable_multicol_t1 := &vindexes.Table{
+	vindexTable_multicol_t1 := &vindexes.BaseTable{
 		Name:                    sqlparser.NewIdentifierCS("multicol_t1"),
 		Keyspace:                ks,
 		Columns:                 cols2,
 		ColumnListAuthoritative: true,
 	}
-	vindexTable_multicol_t2 := &vindexes.Table{
+	vindexTable_multicol_t2 := &vindexes.BaseTable{
 		Name:                    sqlparser.NewIdentifierCS("multicol_t2"),
 		Keyspace:                ks,
 		Columns:                 cols2,
 		ColumnListAuthoritative: true,
 	}
-	vindexTable_t1 := &vindexes.Table{
+	vindexTable_t1 := &vindexes.BaseTable{
 		Name:                    sqlparser.NewIdentifierCS("t1"),
 		Keyspace:                ks,
 		Columns:                 cols1,
 		ColumnListAuthoritative: true,
 	}
-	vindexTable_t2 := &vindexes.Table{
+	vindexTable_t2 := &vindexes.BaseTable{
 		Name:                    sqlparser.NewIdentifierCS("t2"),
 		Keyspace:                ks,
 		Columns:                 cols1,
@@ -84,7 +85,7 @@ func TestVSchemaUpdate(t *testing.T) {
 		ParentColumns: sqlparserCols1,
 	})
 
-	idxTbl1 := &vindexes.Table{
+	idxTbl1 := &vindexes.BaseTable{
 		Name:                    sqlparser.NewIdentifierCS("idxTbl1"),
 		Keyspace:                ks,
 		ColumnListAuthoritative: true,
@@ -94,7 +95,7 @@ func TestVSchemaUpdate(t *testing.T) {
 			{sqlparser.NewColName("c"), sqlparser.NewColName("d")},
 		},
 	}
-	idxTbl2 := &vindexes.Table{
+	idxTbl2 := &vindexes.BaseTable{
 		Name:                    sqlparser.NewIdentifierCS("idxTbl2"),
 		Keyspace:                ks,
 		ColumnListAuthoritative: true,
@@ -119,18 +120,18 @@ func TestVSchemaUpdate(t *testing.T) {
 				ColumnListAuthoritative: false,
 			},
 		}),
-		expected: makeTestVSchema("ks", false, map[string]*vindexes.Table{"tbl": tblCol2NA}),
+		expected: makeTestVSchema("ks", false, map[string]*vindexes.BaseTable{"tbl": tblCol2NA}),
 	}, {
 		name:       "1 Schematracking- 0 srvVSchema",
 		srvVschema: makeTestSrvVSchema("ks", false, nil),
 		schema:     map[string]*vindexes.TableInfo{"tbl": {Columns: cols1}},
-		expected:   makeTestVSchema("ks", false, map[string]*vindexes.Table{"tbl": tblCol1}),
+		expected:   makeTestVSchema("ks", false, map[string]*vindexes.BaseTable{"tbl": tblCol1}),
 	}, {
 		name:       "1 Schematracking - 1 srvVSchema (no columns) not authoritative",
 		srvVschema: makeTestSrvVSchema("ks", false, map[string]*vschemapb.Table{"tbl": {}}),
 		schema:     map[string]*vindexes.TableInfo{"tbl": {Columns: cols1}},
 		// schema will override what srvSchema has.
-		expected: makeTestVSchema("ks", false, map[string]*vindexes.Table{"tbl": tblCol1}),
+		expected: makeTestVSchema("ks", false, map[string]*vindexes.BaseTable{"tbl": tblCol1}),
 	}, {
 		name: "1 Schematracking - 1 srvVSchema (have columns) not authoritative",
 		srvVschema: makeTestSrvVSchema("ks", false, map[string]*vschemapb.Table{
@@ -141,7 +142,7 @@ func TestVSchemaUpdate(t *testing.T) {
 		}),
 		schema: map[string]*vindexes.TableInfo{"tbl": {Columns: cols1}},
 		// schema will override what srvSchema has.
-		expected: makeTestVSchema("ks", false, map[string]*vindexes.Table{"tbl": tblCol1}),
+		expected: makeTestVSchema("ks", false, map[string]*vindexes.BaseTable{"tbl": tblCol1}),
 	}, {
 		name: "1 Schematracking - 1 srvVSchema (no columns) authoritative",
 		srvVschema: makeTestSrvVSchema("ks", false, map[string]*vschemapb.Table{"tbl": {
@@ -149,7 +150,7 @@ func TestVSchemaUpdate(t *testing.T) {
 		}}),
 		schema: map[string]*vindexes.TableInfo{"tbl": {Columns: cols1}},
 		// schema will override what srvSchema has.
-		expected: makeTestVSchema("ks", false, map[string]*vindexes.Table{"tbl": tblNoCol}),
+		expected: makeTestVSchema("ks", false, map[string]*vindexes.BaseTable{"tbl": tblNoCol}),
 	}, {
 		name: "1 Schematracking - 1 srvVSchema (have columns) authoritative",
 		srvVschema: makeTestSrvVSchema("ks", false, map[string]*vschemapb.Table{
@@ -160,7 +161,7 @@ func TestVSchemaUpdate(t *testing.T) {
 		}),
 		schema: map[string]*vindexes.TableInfo{"tbl": {Columns: cols1}},
 		// schema tracker will be ignored for authoritative tables.
-		expected: makeTestVSchema("ks", false, map[string]*vindexes.Table{"tbl": tblCol2}),
+		expected: makeTestVSchema("ks", false, map[string]*vindexes.BaseTable{"tbl": tblCol2}),
 	}, {
 		name:     "srvVschema received as nil",
 		schema:   map[string]*vindexes.TableInfo{"tbl": {Columns: cols1}},
@@ -241,7 +242,7 @@ func TestVSchemaUpdate(t *testing.T) {
 					Keyspace:       ks,
 					ForeignKeyMode: vschemapb.Keyspace_managed,
 					Vindexes:       map[string]vindexes.Vindex{},
-					Tables: map[string]*vindexes.Table{
+					Tables: map[string]*vindexes.BaseTable{
 						"t1":          vindexTable_t1,
 						"t2":          vindexTable_t2,
 						"multicol_t1": vindexTable_multicol_t1,
@@ -281,7 +282,7 @@ func TestVSchemaUpdate(t *testing.T) {
 			},
 		},
 		srvVschema: makeTestSrvVSchema("ks", false, nil),
-		expected:   makeTestVSchema("ks", false, map[string]*vindexes.Table{"idxTbl1": idxTbl1}),
+		expected:   makeTestVSchema("ks", false, map[string]*vindexes.BaseTable{"idxTbl1": idxTbl1}),
 	}, {
 		name:           "indexes in schema using expressions",
 		currentVSchema: &vindexes.VSchema{},
@@ -312,7 +313,7 @@ func TestVSchemaUpdate(t *testing.T) {
 			},
 		},
 		srvVschema: makeTestSrvVSchema("ks", false, nil),
-		expected:   makeTestVSchema("ks", false, map[string]*vindexes.Table{"idxTbl2": idxTbl2}),
+		expected:   makeTestVSchema("ks", false, map[string]*vindexes.BaseTable{"idxTbl2": idxTbl2}),
 	}}
 
 	vm := &VSchemaManager{}
@@ -364,11 +365,11 @@ func TestKeyspaceRoutingRules(t *testing.T) {
 	vs := &vindexes.VSchema{
 		Keyspaces: map[string]*vindexes.KeyspaceSchema{
 			"ks": {
-				Tables:   map[string]*vindexes.Table{},
+				Tables:   map[string]*vindexes.BaseTable{},
 				Keyspace: &vindexes.Keyspace{Name: "ks", Sharded: true},
 			},
 			"ks2": {
-				Tables:   map[string]*vindexes.Table{},
+				Tables:   map[string]*vindexes.BaseTable{},
 				Keyspace: &vindexes.Keyspace{Name: "ks2", Sharded: true},
 			},
 		},
@@ -395,10 +396,10 @@ func TestRebuildVSchema(t *testing.T) {
 		Nullable: true,
 	}}
 	ks := &vindexes.Keyspace{Name: "ks"}
-	tblNoCol := &vindexes.Table{Name: sqlparser.NewIdentifierCS("tbl"), Keyspace: ks, ColumnListAuthoritative: true}
-	tblCol1 := &vindexes.Table{Name: sqlparser.NewIdentifierCS("tbl"), Keyspace: ks, Columns: cols1, ColumnListAuthoritative: true}
-	tblCol2 := &vindexes.Table{Name: sqlparser.NewIdentifierCS("tbl"), Keyspace: ks, Columns: cols2, ColumnListAuthoritative: true}
-	tblCol2NA := &vindexes.Table{Name: sqlparser.NewIdentifierCS("tbl"), Keyspace: ks, Columns: cols2}
+	tblNoCol := &vindexes.BaseTable{Name: sqlparser.NewIdentifierCS("tbl"), Keyspace: ks, ColumnListAuthoritative: true}
+	tblCol1 := &vindexes.BaseTable{Name: sqlparser.NewIdentifierCS("tbl"), Keyspace: ks, Columns: cols1, ColumnListAuthoritative: true}
+	tblCol2 := &vindexes.BaseTable{Name: sqlparser.NewIdentifierCS("tbl"), Keyspace: ks, Columns: cols2, ColumnListAuthoritative: true}
+	tblCol2NA := &vindexes.BaseTable{Name: sqlparser.NewIdentifierCS("tbl"), Keyspace: ks, Columns: cols2}
 
 	tcases := []struct {
 		name       string
@@ -413,18 +414,18 @@ func TestRebuildVSchema(t *testing.T) {
 				ColumnListAuthoritative: false,
 			},
 		}),
-		expected: makeTestVSchema("ks", false, map[string]*vindexes.Table{"tbl": tblCol2NA}),
+		expected: makeTestVSchema("ks", false, map[string]*vindexes.BaseTable{"tbl": tblCol2NA}),
 	}, {
 		name:       "1 Schematracking- 0 srvVSchema",
 		srvVschema: makeTestSrvVSchema("ks", false, nil),
 		schema:     map[string]*vindexes.TableInfo{"tbl": {Columns: cols1}},
-		expected:   makeTestVSchema("ks", false, map[string]*vindexes.Table{"tbl": tblCol1}),
+		expected:   makeTestVSchema("ks", false, map[string]*vindexes.BaseTable{"tbl": tblCol1}),
 	}, {
 		name:       "1 Schematracking - 1 srvVSchema (no columns) not authoritative",
 		srvVschema: makeTestSrvVSchema("ks", false, map[string]*vschemapb.Table{"tbl": {}}),
 		schema:     map[string]*vindexes.TableInfo{"tbl": {Columns: cols1}},
 		// schema will override what srvSchema has.
-		expected: makeTestVSchema("ks", false, map[string]*vindexes.Table{"tbl": tblCol1}),
+		expected: makeTestVSchema("ks", false, map[string]*vindexes.BaseTable{"tbl": tblCol1}),
 	}, {
 		name: "1 Schematracking - 1 srvVSchema (have columns) not authoritative",
 		srvVschema: makeTestSrvVSchema("ks", false, map[string]*vschemapb.Table{
@@ -435,7 +436,7 @@ func TestRebuildVSchema(t *testing.T) {
 		}),
 		schema: map[string]*vindexes.TableInfo{"tbl": {Columns: cols1}},
 		// schema will override what srvSchema has.
-		expected: makeTestVSchema("ks", false, map[string]*vindexes.Table{"tbl": tblCol1}),
+		expected: makeTestVSchema("ks", false, map[string]*vindexes.BaseTable{"tbl": tblCol1}),
 	}, {
 		name: "1 Schematracking - 1 srvVSchema (no columns) authoritative",
 		srvVschema: makeTestSrvVSchema("ks", false, map[string]*vschemapb.Table{"tbl": {
@@ -443,7 +444,7 @@ func TestRebuildVSchema(t *testing.T) {
 		}}),
 		schema: map[string]*vindexes.TableInfo{"tbl": {Columns: cols1}},
 		// schema will override what srvSchema has.
-		expected: makeTestVSchema("ks", false, map[string]*vindexes.Table{"tbl": tblNoCol}),
+		expected: makeTestVSchema("ks", false, map[string]*vindexes.BaseTable{"tbl": tblNoCol}),
 	}, {
 		name: "1 Schematracking - 1 srvVSchema (have columns) authoritative",
 		srvVschema: makeTestSrvVSchema("ks", false, map[string]*vschemapb.Table{
@@ -454,7 +455,7 @@ func TestRebuildVSchema(t *testing.T) {
 		}),
 		schema: map[string]*vindexes.TableInfo{"tbl": {Columns: cols1}},
 		// schema tracker will be ignored for authoritative tables.
-		expected: makeTestVSchema("ks", false, map[string]*vindexes.Table{"tbl": tblCol2}),
+		expected: makeTestVSchema("ks", false, map[string]*vindexes.BaseTable{"tbl": tblCol2}),
 	}, {
 		name:   "srvVschema received as nil",
 		schema: map[string]*vindexes.TableInfo{"tbl": {Columns: cols1}},
@@ -506,7 +507,7 @@ func TestVSchemaUDFsUpdate(t *testing.T) {
 			"ks": {
 				Keyspace:       ks,
 				ForeignKeyMode: vschemapb.Keyspace_unmanaged,
-				Tables:         map[string]*vindexes.Table{},
+				Tables:         map[string]*vindexes.BaseTable{},
 				Vindexes:       map[string]vindexes.Vindex{},
 				AggregateUDFs:  []string{"udf1", "udf2"},
 			},
@@ -515,6 +516,40 @@ func TestVSchemaUDFsUpdate(t *testing.T) {
 	utils.MustMatch(t, vs, vm.currentVschema, "currentVschema does not match Vschema")
 }
 
+// TestVSchemaViewsUpdate tests that the views are updated in the VSchema.
+func TestVSchemaViewsUpdate(t *testing.T) {
+	vm := &VSchemaManager{}
+	var vs *vindexes.VSchema
+	vm.subscriber = func(vschema *vindexes.VSchema, _ *VSchemaStats) {
+		vs = vschema
+		vs.ResetCreated()
+	}
+	vm.schema = &fakeSchema{v: map[string]sqlparser.TableStatement{
+		"v1": &sqlparser.Select{
+			From:        sqlparser.TableExprs{sqlparser.NewAliasedTableExpr(sqlparser.NewTableName("t1"), "")},
+			SelectExprs: sqlparser.SelectExprs{sqlparser.NewAliasedExpr(sqlparser.NewIntLiteral("1"), "")},
+		},
+		"v2": &sqlparser.Select{
+			From:        sqlparser.TableExprs{sqlparser.NewAliasedTableExpr(sqlparser.NewTableName("t2"), "")},
+			SelectExprs: sqlparser.SelectExprs{sqlparser.NewAliasedExpr(sqlparser.NewIntLiteral("2"), "")},
+		},
+	}}
+	vm.VSchemaUpdate(&vschemapb.SrvVSchema{
+		Keyspaces: map[string]*vschemapb.Keyspace{
+			"ks": {Sharded: true},
+		},
+	}, nil)
+
+	// find in views map
+	assert.NotNil(t, vs.FindView("ks", "v1"))
+	assert.NotNil(t, vs.FindView("ks", "v2"))
+	// find in global table
+	assert.NotNil(t, vs.FindView("", "v1"))
+	assert.NotNil(t, vs.FindView("", "v2"))
+
+	utils.MustMatch(t, vs, vm.currentVschema, "currentVschema does not match Vschema")
+}
+
 func TestMarkErrorIfCyclesInFk(t *testing.T) {
 	ksName := "ks"
 	keyspace := &vindexes.Keyspace{
@@ -532,7 +567,7 @@ func TestMarkErrorIfCyclesInFk(t *testing.T) {
 					Keyspaces: map[string]*vindexes.KeyspaceSchema{
 						ksName: {
 							ForeignKeyMode: vschemapb.Keyspace_managed,
-							Tables: map[string]*vindexes.Table{
+							Tables: map[string]*vindexes.BaseTable{
 								"t1": {
 									Name:     sqlparser.NewIdentifierCS("t1"),
 									Keyspace: keyspace,
@@ -563,7 +598,7 @@ func TestMarkErrorIfCyclesInFk(t *testing.T) {
 					Keyspaces: map[string]*vindexes.KeyspaceSchema{
 						ksName: {
 							ForeignKeyMode: vschemapb.Keyspace_managed,
-							Tables: map[string]*vindexes.Table{
+							Tables: map[string]*vindexes.BaseTable{
 								"t1": {
 									Name:     sqlparser.NewIdentifierCS("t1"),
 									Keyspace: keyspace,
@@ -594,7 +629,7 @@ func TestMarkErrorIfCyclesInFk(t *testing.T) {
 					Keyspaces: map[string]*vindexes.KeyspaceSchema{
 						ksName: {
 							ForeignKeyMode: vschemapb.Keyspace_managed,
-							Tables: map[string]*vindexes.Table{
+							Tables: map[string]*vindexes.BaseTable{
 								"t1": {
 									Name:     sqlparser.NewIdentifierCS("t1"),
 									Keyspace: keyspace,
@@ -623,7 +658,7 @@ func TestMarkErrorIfCyclesInFk(t *testing.T) {
 					Keyspaces: map[string]*vindexes.KeyspaceSchema{
 						ksName: {
 							ForeignKeyMode: vschemapb.Keyspace_managed,
-							Tables: map[string]*vindexes.Table{
+							Tables: map[string]*vindexes.BaseTable{
 								"t1": {
 									Name:     sqlparser.NewIdentifierCS("t1"),
 									Keyspace: keyspace,
@@ -651,7 +686,7 @@ func TestMarkErrorIfCyclesInFk(t *testing.T) {
 					Keyspaces: map[string]*vindexes.KeyspaceSchema{
 						ksName: {
 							ForeignKeyMode: vschemapb.Keyspace_managed,
-							Tables: map[string]*vindexes.Table{
+							Tables: map[string]*vindexes.BaseTable{
 								"t1": {
 									Name:     sqlparser.NewIdentifierCS("t1"),
 									Keyspace: keyspace,
@@ -679,7 +714,7 @@ func TestMarkErrorIfCyclesInFk(t *testing.T) {
 					Keyspaces: map[string]*vindexes.KeyspaceSchema{
 						ksName: {
 							ForeignKeyMode: vschemapb.Keyspace_managed,
-							Tables: map[string]*vindexes.Table{
+							Tables: map[string]*vindexes.BaseTable{
 								"t1": {
 									Name:     sqlparser.NewIdentifierCS("t1"),
 									Keyspace: keyspace,
@@ -726,7 +761,7 @@ func TestMarkErrorIfCyclesInFk(t *testing.T) {
 					Keyspaces: map[string]*vindexes.KeyspaceSchema{
 						ksName: {
 							ForeignKeyMode: vschemapb.Keyspace_managed,
-							Tables: map[string]*vindexes.Table{
+							Tables: map[string]*vindexes.BaseTable{
 								"t1": {
 									Name:     sqlparser.NewIdentifierCS("t1"),
 									Keyspace: keyspace,
@@ -768,13 +803,13 @@ func TestVSchemaUpdateWithFKReferenceToInternalTables(t *testing.T) {
 	}}
 	sqlparserCols1 := sqlparser.MakeColumns("id")
 
-	vindexTable_t1 := &vindexes.Table{
+	vindexTable_t1 := &vindexes.BaseTable{
 		Name:                    sqlparser.NewIdentifierCS("t1"),
 		Keyspace:                ks,
 		Columns:                 cols1,
 		ColumnListAuthoritative: true,
 	}
-	vindexTable_t2 := &vindexes.Table{
+	vindexTable_t2 := &vindexes.BaseTable{
 		Name:                    sqlparser.NewIdentifierCS("t2"),
 		Keyspace:                ks,
 		Columns:                 cols1,
@@ -830,7 +865,7 @@ func TestVSchemaUpdateWithFKReferenceToInternalTables(t *testing.T) {
 				Keyspace:       ks,
 				ForeignKeyMode: vschemapb.Keyspace_managed,
 				Vindexes:       map[string]vindexes.Vindex{},
-				Tables: map[string]*vindexes.Table{
+				Tables: map[string]*vindexes.BaseTable{
 					"t1": vindexTable_t1,
 					"t2": vindexTable_t2,
 				},
@@ -854,7 +889,7 @@ func createFkDefinition(childCols []string, parentTableName string, parentCols [
 	}
 }
 
-func makeTestVSchema(ks string, sharded bool, tbls map[string]*vindexes.Table) *vindexes.VSchema {
+func makeTestVSchema(ks string, sharded bool, tbls map[string]*vindexes.BaseTable) *vindexes.VSchema {
 	keyspaceSchema := &vindexes.KeyspaceSchema{
 		Keyspace: &vindexes.Keyspace{
 			Name:    ks,
@@ -893,6 +928,7 @@ func makeTestSrvVSchema(ks string, sharded bool, tbls map[string]*vschemapb.Tabl
 
 type fakeSchema struct {
 	t    map[string]*vindexes.TableInfo
+	v    map[string]sqlparser.TableStatement
 	udfs []string
 }
 
@@ -901,7 +937,7 @@ func (f *fakeSchema) Tables(string) map[string]*vindexes.TableInfo {
 }
 
 func (f *fakeSchema) Views(string) map[string]sqlparser.TableStatement {
-	return nil
+	return f.v
 }
 func (f *fakeSchema) UDFs(string) []string { return f.udfs }
 
diff --git a/go/vt/vttablet/tabletserver/vstreamer/local_vschema.go b/go/vt/vttablet/tabletserver/vstreamer/local_vschema.go
index abcdf840e84..e6f8128cc3f 100644
--- a/go/vt/vttablet/tabletserver/vstreamer/local_vschema.go
+++ b/go/vt/vttablet/tabletserver/vstreamer/local_vschema.go
@@ -65,7 +65,7 @@ func (lvs *localVSchema) FindOrCreateVindex(qualifiedName string) (vindexes.Vind
 	return vindexes.CreateVindex(name, name, map[string]string{})
 }
 
-func (lvs *localVSchema) findTable(tablename string) (*vindexes.Table, error) {
+func (lvs *localVSchema) findTable(tablename string) (*vindexes.BaseTable, error) {
 	ks, ok := lvs.vschema.Keyspaces[lvs.keyspace]
 	if !ok {
 		return nil, fmt.Errorf("keyspace %s not found in vschema", lvs.keyspace)

From 747c3089c8055c8978d2259349e5c4fa460f7893 Mon Sep 17 00:00:00 2001
From: wiebeytec <wiebe@ytec.nl>
Date: Wed, 5 Feb 2025 18:01:53 +0100
Subject: [PATCH 27/68] Don't exit tablet server on reloading invalid ACL
 (#17485)

Signed-off-by: Wiebe Cazemier <wiebe@ytec.nl>
Signed-off-by: Matt Lord <mattalord@gmail.com>
Co-authored-by: Matt Lord <mattalord@gmail.com>
---
 changelog/22.0/22.0.0/summary.md              |  5 ++
 go/cmd/vttablet/cli/cli.go                    |  5 +-
 go/vt/tableacl/tableacl.go                    |  4 +-
 go/vt/vttablet/tabletserver/tabletserver.go   | 24 +++----
 .../tabletserver/tabletserver_test.go         | 66 +++++++++++++++----
 5 files changed, 76 insertions(+), 28 deletions(-)

diff --git a/changelog/22.0/22.0.0/summary.md b/changelog/22.0/22.0.0/summary.md
index f773df2b10c..c8ba10f995e 100644
--- a/changelog/22.0/22.0.0/summary.md
+++ b/changelog/22.0/22.0.0/summary.md
@@ -19,6 +19,7 @@
   - **[Support for Filtering Query logs on Error](#query-logs)**
 - **[Minor Changes](#minor-changes)**
   - **[VTTablet Flags](#flags-vttablet)**
+  - **[VTTablet ACL enforcement and reloading](#reloading-vttablet-acl)**
   - **[Topology read concurrency behaviour changes](#topo-read-concurrency-changes)**
   - **[VTAdmin](#vtadmin)**
     - [Updated to node v22.13.1](#updated-node)
@@ -155,6 +156,10 @@ While the flag will continue to accept float values (interpreted as seconds) for
 
 - `--consolidator-query-waiter-cap` flag to set the maximum number of clients allowed to wait on the consolidator. The default value is set to 0 for unlimited wait. Users can adjust  this value based on the performance of VTTablet to avoid excessive memory usage and the risk of being OOMKilled, particularly in Kubernetes deployments.
 
+#### <a id="reloading-vttablet-acl"/>VTTablet ACL enforcement and reloading</a>
+
+When a tablet is started with `--enforce-tableacl-config` it will exit with an error if the contents of the file are not valid. After the changes made in https://github.com/vitessio/vitess/pull/17485 the tablet will no longer exit when reloading the contents of the file after receiving a SIGHUP. When the file contents are invalid on reload the tablet will now log an error and the active in-memory ACLs remain in effect.
+
 ### <a id="topo-read-concurrency-changes"/>`--topo_read_concurrency` behaviour changes
 
 The `--topo_read_concurrency` flag was added to all components that access the topology and the provided limit is now applied separately for each global or local cell _(default `32`)_.
diff --git a/go/cmd/vttablet/cli/cli.go b/go/cmd/vttablet/cli/cli.go
index 3b77b43d9cb..e48a11c79dc 100644
--- a/go/cmd/vttablet/cli/cli.go
+++ b/go/cmd/vttablet/cli/cli.go
@@ -248,7 +248,10 @@ func createTabletServer(ctx context.Context, env *vtenv.Environment, config *tab
 		addStatusParts(qsc)
 	})
 	servenv.OnClose(qsc.StopService)
-	qsc.InitACL(tableACLConfig, enforceTableACLConfig, tableACLConfigReloadInterval)
+	err := qsc.InitACL(tableACLConfig, tableACLConfigReloadInterval)
+	if err != nil && enforceTableACLConfig {
+		return nil, fmt.Errorf("failed to initialize table acl: %w", err)
+	}
 	return qsc, nil
 }
 
diff --git a/go/vt/tableacl/tableacl.go b/go/vt/tableacl/tableacl.go
index 1b236cb1812..9d6762b4adb 100644
--- a/go/vt/tableacl/tableacl.go
+++ b/go/vt/tableacl/tableacl.go
@@ -107,14 +107,14 @@ func (tacl *tableACL) init(configFile string, aclCB func()) error {
 	}
 	data, err := os.ReadFile(configFile)
 	if err != nil {
-		log.Infof("unable to read tableACL config file: %v  Error: %v", configFile, err)
+		log.Errorf("unable to read tableACL config file: %v  Error: %v", configFile, err)
 		return err
 	}
 	config := &tableaclpb.Config{}
 	if err := config.UnmarshalVT(data); err != nil {
 		// try to parse tableacl as json file
 		if jsonErr := json2.UnmarshalPB(data, config); jsonErr != nil {
-			log.Infof("unable to parse tableACL config file as a protobuf or json file.  protobuf err: %v  json err: %v", err, jsonErr)
+			log.Errorf("unable to parse tableACL config file as a protobuf or json file.  protobuf err: %v  json err: %v", err, jsonErr)
 			return fmt.Errorf("unable to unmarshal Table ACL data: %s", data)
 		}
 	}
diff --git a/go/vt/vttablet/tabletserver/tabletserver.go b/go/vt/vttablet/tabletserver/tabletserver.go
index b65b3949354..53322384bdc 100644
--- a/go/vt/vttablet/tabletserver/tabletserver.go
+++ b/go/vt/vttablet/tabletserver/tabletserver.go
@@ -361,31 +361,32 @@ func (tsv *TabletServer) SetQueryRules(ruleSource string, qrs *rules.Rules) erro
 	return nil
 }
 
-func (tsv *TabletServer) initACL(tableACLConfigFile string, enforceTableACLConfig bool) {
+func (tsv *TabletServer) initACL(tableACLConfigFile string) error {
 	// tabletacl.Init loads ACL from file if *tableACLConfig is not empty
-	err := tableacl.Init(
+	return tableacl.Init(
 		tableACLConfigFile,
 		func() {
 			tsv.ClearQueryPlanCache()
 		},
 	)
-	if err != nil {
-		log.Errorf("Fail to initialize Table ACL: %v", err)
-		if enforceTableACLConfig {
-			log.Exit("Need a valid initial Table ACL when enforce-tableacl-config is set, exiting.")
-		}
-	}
 }
 
 // InitACL loads the table ACL and sets up a SIGHUP handler for reloading it.
-func (tsv *TabletServer) InitACL(tableACLConfigFile string, enforceTableACLConfig bool, reloadACLConfigFileInterval time.Duration) {
-	tsv.initACL(tableACLConfigFile, enforceTableACLConfig)
+func (tsv *TabletServer) InitACL(tableACLConfigFile string, reloadACLConfigFileInterval time.Duration) error {
+	if err := tsv.initACL(tableACLConfigFile); err != nil {
+		return err
+	}
 
 	sigChan := make(chan os.Signal, 1)
 	signal.Notify(sigChan, syscall.SIGHUP)
 	go func() {
 		for range sigChan {
-			tsv.initACL(tableACLConfigFile, enforceTableACLConfig)
+			err := tsv.initACL(tableACLConfigFile)
+			if err != nil {
+				log.Errorf("Error reloading ACL config file %s in SIGHUP handler: %v", tableACLConfigFile, err)
+			} else {
+				log.Info("Successfully reloaded ACL file %s in SIGHUP handler", tableACLConfigFile)
+			}
 		}
 	}()
 
@@ -397,6 +398,7 @@ func (tsv *TabletServer) InitACL(tableACLConfigFile string, enforceTableACLConfi
 			}
 		}()
 	}
+	return nil
 }
 
 // SetServingType changes the serving type of the tabletserver. It starts or
diff --git a/go/vt/vttablet/tabletserver/tabletserver_test.go b/go/vt/vttablet/tabletserver/tabletserver_test.go
index e4faf4ee6c9..ef79560ca8f 100644
--- a/go/vt/vttablet/tabletserver/tabletserver_test.go
+++ b/go/vt/vttablet/tabletserver/tabletserver_test.go
@@ -2155,6 +2155,16 @@ var aclJSON2 = `{
     }
   ]
 }`
+var aclJSONOverlapError = `{
+	"table_groups": [
+	  {
+		"name": "group02",
+		"table_names_or_prefixes": ["test_table2", "test_table2"],
+		"readers": ["vt2"],
+		"admins": ["vt2"]
+	  }
+	]
+  }`
 
 func TestACLHUP(t *testing.T) {
 	ctx, cancel := context.WithCancel(context.Background())
@@ -2168,12 +2178,23 @@ func TestACLHUP(t *testing.T) {
 	require.NoError(t, err)
 	defer os.Remove(f.Name())
 
+	// We need to confirm this ACL JSON is broken first, for later use.
+	_, err = io.WriteString(f, aclJSONOverlapError)
+	require.NoError(t, err)
+	err = f.Close()
+	require.NoError(t, err)
+	err = tsv.InitACL(f.Name(), 0)
+	require.Error(t, err)
+
+	f, err = os.Create(f.Name())
+	require.NoError(t, err)
 	_, err = io.WriteString(f, aclJSON1)
 	require.NoError(t, err)
 	err = f.Close()
 	require.NoError(t, err)
 
-	tsv.InitACL(f.Name(), true, 0)
+	err = tsv.InitACL(f.Name(), 0)
+	require.NoError(t, err)
 
 	groups1 := tableacl.GetCurrentConfig().TableGroups
 	if name1 := groups1[0].GetName(); name1 != "group01" {
@@ -2188,20 +2209,37 @@ func TestACLHUP(t *testing.T) {
 	syscall.Kill(syscall.Getpid(), syscall.SIGHUP)
 	time.Sleep(100 * time.Millisecond) // wait for signal handler
 
-	groups2 := tableacl.GetCurrentConfig().TableGroups
-	if len(groups2) != 1 {
-		t.Fatalf("Expected only one table group")
-	}
-	group2 := groups2[0]
-	if name2 := group2.GetName(); name2 != "group02" {
-		t.Fatalf("Expected name 'group02', got '%s'", name2)
-	}
-	if group2.GetAdmins() == nil {
-		t.Fatalf("Expected 'admins' to exist, but it didn't")
-	}
-	if group2.GetWriters() != nil {
-		t.Fatalf("Expected 'writers' to not exist, got '%s'", group2.GetWriters())
+	test_loaded_acl := func() {
+		groups2 := tableacl.GetCurrentConfig().TableGroups
+		if len(groups2) != 1 {
+			t.Fatalf("Expected only one table group")
+		}
+		group2 := groups2[0]
+		if name2 := group2.GetName(); name2 != "group02" {
+			t.Fatalf("Expected name 'group02', got '%s'", name2)
+		}
+		if group2.GetAdmins() == nil {
+			t.Fatalf("Expected 'admins' to exist, but it didn't")
+		}
+		if group2.GetWriters() != nil {
+			t.Fatalf("Expected 'writers' to not exist, got '%s'", group2.GetWriters())
+		}
 	}
+
+	test_loaded_acl()
+
+	// Now try to reload an invalid ACL and see if we are still operating with the same ACL config as before.
+
+	f, err = os.Create(f.Name())
+	require.NoError(t, err)
+	_, err = io.WriteString(f, aclJSONOverlapError)
+	require.NoError(t, err)
+
+	syscall.Kill(syscall.Getpid(), syscall.SIGHUP)
+	time.Sleep(100 * time.Millisecond) // wait for signal handler
+
+	test_loaded_acl()
+
 }
 
 func TestConfigChanges(t *testing.T) {

From cf28afab4e99c6aadea822734cb832852d4c0063 Mon Sep 17 00:00:00 2001
From: Shlomi Noach <2607934+shlomi-noach@users.noreply.github.com>
Date: Thu, 6 Feb 2025 09:07:02 +0200
Subject: [PATCH 28/68] Online DDL: removal of `gh-ost` and `pt-osc` strategies
 (#17626)

Signed-off-by: Shlomi Noach <2607934+shlomi-noach@users.noreply.github.com>
---
 changelog/22.0/22.0.0/summary.md              |   16 +
 go/cmd/vtctldclient/command/schema.go         |    4 +-
 go/flags/endtoend/vtcombo.txt                 |    2 -
 go/flags/endtoend/vttablet.txt                |    2 -
 go/vt/proto/vtctldata/vtctldata.pb.go         | 4603 ++++++++---------
 go/vt/schema/ddl_strategy.go                  |   10 +-
 go/vt/schema/ddl_strategy_test.go             |   45 +-
 go/vt/schema/online_ddl_test.go               |    2 +-
 go/vt/schemamanager/tablet_executor_test.go   |   21 +-
 go/vt/vtctl/schematools/schematools.go        |   14 -
 go/vt/vtctl/schematools/schematools_test.go   |    8 -
 go/vt/vtctl/vtctl.go                          |    4 +-
 go/vt/vttablet/onlineddl/executor.go          |  769 +--
 go/vt/vttablet/onlineddl/schema.go            |   26 -
 go/vt/vttablet/onlineddl/util.go              |   86 -
 go/vt/vttablet/onlineddl/util_test.go         |   32 -
 go/vt/vttablet/onlineddl/vrepl.go             |    4 -
 .../tabletmanager/vreplication/vreplicator.go |    3 +-
 go/vt/vttablet/tabletserver/tabletserver.go   |   13 -
 .../tabletserver/throttle/throttlerapp/app.go |    2 -
 .../tabletserver/vstreamer/vstreamer.go       |    2 +-
 proto/vtctldata.proto                         |    4 +-
 web/vtadmin/src/proto/vtadmin.d.ts            |    2 -
 web/vtadmin/src/proto/vtadmin.js              |   14 -
 24 files changed, 2350 insertions(+), 3338 deletions(-)
 delete mode 100644 go/vt/vttablet/onlineddl/util.go
 delete mode 100644 go/vt/vttablet/onlineddl/util_test.go

diff --git a/changelog/22.0/22.0.0/summary.md b/changelog/22.0/22.0.0/summary.md
index c8ba10f995e..1e7d713b60e 100644
--- a/changelog/22.0/22.0.0/summary.md
+++ b/changelog/22.0/22.0.0/summary.md
@@ -5,6 +5,7 @@
 - **[Major Changes](#major-changes)**
   - **[Deprecations and Deletions](#deprecations-and-deletions)**
     - [Deprecated VTTablet Flags](#vttablet-flags)
+    - [Removing gh-ost and pt-osc Online DDL strategies](#ghost-ptosc)
   - **[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)**
@@ -38,6 +39,21 @@ These are the RPC changes made in this release -
 
 - `twopc_enable` flag is deprecated. Usage of TwoPC commit will be determined by the `transaction_mode` set on VTGate via flag or session variable.
 
+#### <a id="ghost-ptosc"/>Removing gh-ost and pt-osc Online DDL strategies</a>
+
+Vitess no longer recognizes the `gh-ost` and `pt-osc` (`pt-online-schema-change`) Online DDL strategies. The `vitess` strategy is the recommended way to make schema changes at scale. `mysql` and `direct` strategies continue to be supported.
+
+These `vttablet` flags have been removed:
+
+- `--gh-ost-path`
+- `--pt-osc-path`
+
+The use of `gh-ost` and `pt-osc` as strategies as follows, yields an error:
+```sh
+$ vtctldclient ApplySchema --ddl-strategy="gh-ost" ...
+$ vtctldclient ApplySchema --ddl-strategy="pt-osc" ...
+```
+
 ### <a id="reparents-prefer-not-backing-up"/>Prefer not promoting a replica that is currently taking a backup
 
 Emergency reparents now prefer not promoting replicas that are currently taking backups with a backup engine other than
diff --git a/go/cmd/vtctldclient/command/schema.go b/go/cmd/vtctldclient/command/schema.go
index 21a995f30a1..6a36868d2b3 100644
--- a/go/cmd/vtctldclient/command/schema.go
+++ b/go/cmd/vtctldclient/command/schema.go
@@ -45,7 +45,7 @@ var (
 		Long: `Applies the schema change to the specified keyspace on every primary, running in parallel on all shards. The changes are then propagated to replicas via replication.
 
 If --allow-long-unavailability is set, schema changes affecting a large number of rows (and possibly incurring a longer period of unavailability) will not be rejected.
---ddl-strategy is used to instruct migrations via vreplication, gh-ost or pt-osc with optional parameters.
+--ddl-strategy is used to instruct migrations via vreplication, mysql or direct with optional parameters.
 --migration-context allows the user to specify a custom migration context for online DDL migrations.
 If --skip-preflight, SQL goes directly to shards without going through sanity checks.
 
@@ -430,7 +430,7 @@ func commandValidateSchemaShard(cmd *cobra.Command, args []string) error {
 }
 
 func init() {
-	ApplySchema.Flags().StringVar(&applySchemaOptions.DDLStrategy, "ddl-strategy", string(schema.DDLStrategyDirect), "Online DDL strategy, compatible with @@ddl_strategy session variable (examples: 'gh-ost', 'pt-osc', 'gh-ost --max-load=Threads_running=100'.")
+	ApplySchema.Flags().StringVar(&applySchemaOptions.DDLStrategy, "ddl-strategy", string(schema.DDLStrategyDirect), "Online DDL strategy, compatible with @@ddl_strategy session variable (examples: 'direct', 'mysql', 'vitess --postpone-completion'.")
 	ApplySchema.Flags().StringSliceVar(&applySchemaOptions.UUIDList, "uuid", nil, "Optional, comma-delimited, repeatable, explicit UUIDs for migration. If given, must match number of DDL changes.")
 	ApplySchema.Flags().StringVar(&applySchemaOptions.MigrationContext, "migration-context", "", "For Online DDL, optionally supply a custom unique string used as context for the migration(s) in this command. By default a unique context is auto-generated by Vitess.")
 	ApplySchema.Flags().DurationVar(&applySchemaOptions.WaitReplicasTimeout, "wait-replicas-timeout", grpcvtctldserver.DefaultWaitReplicasTimeout, "Amount of time to wait for replicas to receive the schema change via replication.")
diff --git a/go/flags/endtoend/vtcombo.txt b/go/flags/endtoend/vtcombo.txt
index 3ae0cbc9b77..45ca4ee2a08 100644
--- a/go/flags/endtoend/vtcombo.txt
+++ b/go/flags/endtoend/vtcombo.txt
@@ -136,7 +136,6 @@ Flags:
       --gate_query_cache_memory int                                      gate server query cache size in bytes, maximum amount of memory to be cached. vtgate analyzes every incoming query and generate a query plan, these plans are being cached in a lru cache. This config controls the capacity of the lru cache. (default 33554432)
       --gc_check_interval duration                                       Interval between garbage collection checks (default 1h0m0s)
       --gc_purge_check_interval duration                                 Interval between purge discovery checks (default 1m0s)
-      --gh-ost-path string                                               override default gh-ost binary full path (default "gh-ost")
       --grpc-send-session-in-streaming                                   If set, will send the session as last packet in streaming api to support transactions in streaming
       --grpc-use-effective-groups                                        If set, and SSL is not used, will set the immediate caller's security groups from the effective caller id's groups.
       --grpc-use-static-authentication-callerid                          If set, will set the immediate caller id to the username authenticated by the static auth plugin.
@@ -265,7 +264,6 @@ Flags:
       --proto_topo vttest.TopoData                                       vttest proto definition of the topology, encoded in compact text format. See vttest.proto for more information.
       --proxy_protocol                                                   Enable HAProxy PROXY protocol on MySQL listener socket
       --proxy_tablets                                                    Setting this true will make vtctld proxy the tablet status instead of redirecting to them
-      --pt-osc-path string                                               override default pt-online-schema-change binary full path (default "/usr/bin/pt-online-schema-change")
       --publish_retry_interval duration                                  how long vttablet waits to retry publishing the tablet record (default 30s)
       --purge_logs_interval duration                                     how often try to remove old logs (default 1h0m0s)
       --query-log-stream-handler string                                  URL handler for streaming queries log (default "/debug/querylog")
diff --git a/go/flags/endtoend/vttablet.txt b/go/flags/endtoend/vttablet.txt
index 0a9a0ef99ce..a463db305ba 100644
--- a/go/flags/endtoend/vttablet.txt
+++ b/go/flags/endtoend/vttablet.txt
@@ -162,7 +162,6 @@ Flags:
       --gc_purge_check_interval duration                                 Interval between purge discovery checks (default 1m0s)
       --gcs_backup_storage_bucket string                                 Google Cloud Storage bucket to use for backups.
       --gcs_backup_storage_root string                                   Root prefix for all backup-related object names.
-      --gh-ost-path string                                               override default gh-ost binary full path (default "gh-ost")
       --grpc-dial-concurrency-limit int                                  Maximum concurrency of grpc dial operations. This should be less than the golang max thread limit of 10000. (default 1024)
       --grpc_auth_mode string                                            Which auth plugin implementation to use (eg: static)
       --grpc_auth_mtls_allowed_substrings string                         List of substrings of at least one of the client certificate names (separated by colon).
@@ -259,7 +258,6 @@ Flags:
       --port int                                                         port for the server
       --pprof strings                                                    enable profiling
       --pprof-http                                                       enable pprof http endpoints
-      --pt-osc-path string                                               override default pt-online-schema-change binary full path (default "/usr/bin/pt-online-schema-change")
       --publish_retry_interval duration                                  how long vttablet waits to retry publishing the tablet record (default 30s)
       --purge_logs_interval duration                                     how often try to remove old logs (default 1h0m0s)
       --query-log-stream-handler string                                  URL handler for streaming queries log (default "/debug/querylog")
diff --git a/go/vt/proto/vtctldata/vtctldata.pb.go b/go/vt/proto/vtctldata/vtctldata.pb.go
index dc3122d4b5e..ded30cd7f34 100644
--- a/go/vt/proto/vtctldata/vtctldata.pb.go
+++ b/go/vt/proto/vtctldata/vtctldata.pb.go
@@ -209,8 +209,6 @@ const (
 	// SchemaMigration_VITESS was also formerly called "ONLINE".
 	SchemaMigration_VITESS SchemaMigration_Strategy = 0
 	SchemaMigration_ONLINE SchemaMigration_Strategy = 0
-	SchemaMigration_GHOST  SchemaMigration_Strategy = 1
-	SchemaMigration_PTOSC  SchemaMigration_Strategy = 2
 	// SchemaMigration_DIRECT runs the migration directly against MySQL (e.g. `ALTER TABLE ...`),
 	// meaning it is not actually an "online" DDL migration.
 	SchemaMigration_DIRECT SchemaMigration_Strategy = 3
@@ -224,16 +222,12 @@ var (
 	SchemaMigration_Strategy_name = map[int32]string{
 		0: "VITESS",
 		// Duplicate value: 0: "ONLINE",
-		1: "GHOST",
-		2: "PTOSC",
 		3: "DIRECT",
 		4: "MYSQL",
 	}
 	SchemaMigration_Strategy_value = map[string]int32{
 		"VITESS": 0,
 		"ONLINE": 0,
-		"GHOST":  1,
-		"PTOSC":  2,
 		"DIRECT": 3,
 		"MYSQL":  4,
 	}
@@ -17123,7 +17117,7 @@ var file_vtctldata_proto_rawDesc = string([]byte{
 	0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x2e, 0x0a, 0x08, 0x6b, 0x65, 0x79, 0x73, 0x70, 0x61,
 	0x63, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x74, 0x6f, 0x70, 0x6f, 0x64,
 	0x61, 0x74, 0x61, 0x2e, 0x4b, 0x65, 0x79, 0x73, 0x70, 0x61, 0x63, 0x65, 0x52, 0x08, 0x6b, 0x65,
-	0x79, 0x73, 0x70, 0x61, 0x63, 0x65, 0x22, 0xc0, 0x13, 0x0a, 0x0f, 0x53, 0x63, 0x68, 0x65, 0x6d,
+	0x79, 0x73, 0x70, 0x61, 0x63, 0x65, 0x22, 0xb6, 0x13, 0x0a, 0x0f, 0x53, 0x63, 0x68, 0x65, 0x6d,
 	0x61, 0x4d, 0x69, 0x67, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x12, 0x0a, 0x04, 0x75, 0x75,
 	0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x75, 0x75, 0x69, 0x64, 0x12, 0x1a,
 	0x0a, 0x08, 0x6b, 0x65, 0x79, 0x73, 0x70, 0x61, 0x63, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09,
@@ -17267,468 +17261,369 @@ var file_vtctldata_proto_rawDesc = string([]byte{
 	0x64, 0x5f, 0x66, 0x6f, 0x72, 0x65, 0x69, 0x67, 0x6e, 0x5f, 0x6b, 0x65, 0x79, 0x5f, 0x6e, 0x61,
 	0x6d, 0x65, 0x73, 0x18, 0x36, 0x20, 0x01, 0x28, 0x09, 0x52, 0x16, 0x72, 0x65, 0x6d, 0x6f, 0x76,
 	0x65, 0x64, 0x46, 0x6f, 0x72, 0x65, 0x69, 0x67, 0x6e, 0x4b, 0x65, 0x79, 0x4e, 0x61, 0x6d, 0x65,
-	0x73, 0x22, 0x53, 0x0a, 0x08, 0x53, 0x74, 0x72, 0x61, 0x74, 0x65, 0x67, 0x79, 0x12, 0x0a, 0x0a,
+	0x73, 0x22, 0x49, 0x0a, 0x08, 0x53, 0x74, 0x72, 0x61, 0x74, 0x65, 0x67, 0x79, 0x12, 0x0a, 0x0a,
 	0x06, 0x56, 0x49, 0x54, 0x45, 0x53, 0x53, 0x10, 0x00, 0x12, 0x0a, 0x0a, 0x06, 0x4f, 0x4e, 0x4c,
-	0x49, 0x4e, 0x45, 0x10, 0x00, 0x12, 0x09, 0x0a, 0x05, 0x47, 0x48, 0x4f, 0x53, 0x54, 0x10, 0x01,
-	0x12, 0x09, 0x0a, 0x05, 0x50, 0x54, 0x4f, 0x53, 0x43, 0x10, 0x02, 0x12, 0x0a, 0x0a, 0x06, 0x44,
-	0x49, 0x52, 0x45, 0x43, 0x54, 0x10, 0x03, 0x12, 0x09, 0x0a, 0x05, 0x4d, 0x59, 0x53, 0x51, 0x4c,
-	0x10, 0x04, 0x1a, 0x02, 0x10, 0x01, 0x22, 0x71, 0x0a, 0x06, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73,
-	0x12, 0x0b, 0x0a, 0x07, 0x55, 0x4e, 0x4b, 0x4e, 0x4f, 0x57, 0x4e, 0x10, 0x00, 0x12, 0x0d, 0x0a,
-	0x09, 0x52, 0x45, 0x51, 0x55, 0x45, 0x53, 0x54, 0x45, 0x44, 0x10, 0x01, 0x12, 0x0d, 0x0a, 0x09,
-	0x43, 0x41, 0x4e, 0x43, 0x45, 0x4c, 0x4c, 0x45, 0x44, 0x10, 0x02, 0x12, 0x0a, 0x0a, 0x06, 0x51,
-	0x55, 0x45, 0x55, 0x45, 0x44, 0x10, 0x03, 0x12, 0x09, 0x0a, 0x05, 0x52, 0x45, 0x41, 0x44, 0x59,
-	0x10, 0x04, 0x12, 0x0b, 0x0a, 0x07, 0x52, 0x55, 0x4e, 0x4e, 0x49, 0x4e, 0x47, 0x10, 0x05, 0x12,
-	0x0c, 0x0a, 0x08, 0x43, 0x4f, 0x4d, 0x50, 0x4c, 0x45, 0x54, 0x45, 0x10, 0x06, 0x12, 0x0a, 0x0a,
-	0x06, 0x46, 0x41, 0x49, 0x4c, 0x45, 0x44, 0x10, 0x07, 0x22, 0x5e, 0x0a, 0x05, 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, 0x12,
-	0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61,
-	0x6d, 0x65, 0x12, 0x25, 0x0a, 0x05, 0x73, 0x68, 0x61, 0x72, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28,
-	0x0b, 0x32, 0x0f, 0x2e, 0x74, 0x6f, 0x70, 0x6f, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x53, 0x68, 0x61,
-	0x72, 0x64, 0x52, 0x05, 0x73, 0x68, 0x61, 0x72, 0x64, 0x22, 0xda, 0x02, 0x0a, 0x0f, 0x57, 0x6f,
-	0x72, 0x6b, 0x66, 0x6c, 0x6f, 0x77, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x1b, 0x0a,
-	0x09, 0x74, 0x65, 0x6e, 0x61, 0x6e, 0x74, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09,
-	0x52, 0x08, 0x74, 0x65, 0x6e, 0x61, 0x6e, 0x74, 0x49, 0x64, 0x12, 0x6e, 0x0a, 0x1f, 0x73, 0x68,
-	0x61, 0x72, 0x64, 0x65, 0x64, 0x5f, 0x61, 0x75, 0x74, 0x6f, 0x5f, 0x69, 0x6e, 0x63, 0x72, 0x65,
-	0x6d, 0x65, 0x6e, 0x74, 0x5f, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x69, 0x6e, 0x67, 0x18, 0x02, 0x20,
-	0x01, 0x28, 0x0e, 0x32, 0x27, 0x2e, 0x76, 0x74, 0x63, 0x74, 0x6c, 0x64, 0x61, 0x74, 0x61, 0x2e,
-	0x53, 0x68, 0x61, 0x72, 0x64, 0x65, 0x64, 0x41, 0x75, 0x74, 0x6f, 0x49, 0x6e, 0x63, 0x72, 0x65,
-	0x6d, 0x65, 0x6e, 0x74, 0x48, 0x61, 0x6e, 0x64, 0x6c, 0x69, 0x6e, 0x67, 0x52, 0x1c, 0x73, 0x68,
-	0x61, 0x72, 0x64, 0x65, 0x64, 0x41, 0x75, 0x74, 0x6f, 0x49, 0x6e, 0x63, 0x72, 0x65, 0x6d, 0x65,
-	0x6e, 0x74, 0x48, 0x61, 0x6e, 0x64, 0x6c, 0x69, 0x6e, 0x67, 0x12, 0x16, 0x0a, 0x06, 0x73, 0x68,
-	0x61, 0x72, 0x64, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x09, 0x52, 0x06, 0x73, 0x68, 0x61, 0x72,
-	0x64, 0x73, 0x12, 0x3e, 0x0a, 0x06, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x18, 0x04, 0x20, 0x03,
-	0x28, 0x0b, 0x32, 0x26, 0x2e, 0x76, 0x74, 0x63, 0x74, 0x6c, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x57,
-	0x6f, 0x72, 0x6b, 0x66, 0x6c, 0x6f, 0x77, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x43,
-	0x6f, 0x6e, 0x66, 0x69, 0x67, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x06, 0x63, 0x6f, 0x6e, 0x66,
-	0x69, 0x67, 0x12, 0x27, 0x0a, 0x0f, 0x67, 0x6c, 0x6f, 0x62, 0x61, 0x6c, 0x5f, 0x6b, 0x65, 0x79,
-	0x73, 0x70, 0x61, 0x63, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0e, 0x67, 0x6c, 0x6f,
-	0x62, 0x61, 0x6c, 0x4b, 0x65, 0x79, 0x73, 0x70, 0x61, 0x63, 0x65, 0x1a, 0x39, 0x0a, 0x0b, 0x43,
-	0x6f, 0x6e, 0x66, 0x69, 0x67, 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, 0xcf, 0x11, 0x0a, 0x08, 0x57, 0x6f, 0x72, 0x6b, 0x66,
-	0x6c, 0x6f, 0x77, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28,
-	0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x3f, 0x0a, 0x06, 0x73, 0x6f, 0x75, 0x72, 0x63,
-	0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x27, 0x2e, 0x76, 0x74, 0x63, 0x74, 0x6c, 0x64,
-	0x61, 0x74, 0x61, 0x2e, 0x57, 0x6f, 0x72, 0x6b, 0x66, 0x6c, 0x6f, 0x77, 0x2e, 0x52, 0x65, 0x70,
-	0x6c, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x4c, 0x6f, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e,
-	0x52, 0x06, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x12, 0x3f, 0x0a, 0x06, 0x74, 0x61, 0x72, 0x67,
-	0x65, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x27, 0x2e, 0x76, 0x74, 0x63, 0x74, 0x6c,
-	0x64, 0x61, 0x74, 0x61, 0x2e, 0x57, 0x6f, 0x72, 0x6b, 0x66, 0x6c, 0x6f, 0x77, 0x2e, 0x52, 0x65,
-	0x70, 0x6c, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x4c, 0x6f, 0x63, 0x61, 0x74, 0x69, 0x6f,
-	0x6e, 0x52, 0x06, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x12, 0x31, 0x0a, 0x15, 0x6d, 0x61, 0x78,
-	0x5f, 0x76, 0x5f, 0x72, 0x65, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x6c,
-	0x61, 0x67, 0x18, 0x04, 0x20, 0x01, 0x28, 0x03, 0x52, 0x12, 0x6d, 0x61, 0x78, 0x56, 0x52, 0x65,
-	0x70, 0x6c, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x4c, 0x61, 0x67, 0x12, 0x4a, 0x0a, 0x0d,
-	0x73, 0x68, 0x61, 0x72, 0x64, 0x5f, 0x73, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x73, 0x18, 0x05, 0x20,
-	0x03, 0x28, 0x0b, 0x32, 0x25, 0x2e, 0x76, 0x74, 0x63, 0x74, 0x6c, 0x64, 0x61, 0x74, 0x61, 0x2e,
-	0x57, 0x6f, 0x72, 0x6b, 0x66, 0x6c, 0x6f, 0x77, 0x2e, 0x53, 0x68, 0x61, 0x72, 0x64, 0x53, 0x74,
-	0x72, 0x65, 0x61, 0x6d, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x0c, 0x73, 0x68, 0x61, 0x72,
-	0x64, 0x53, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x73, 0x12, 0x23, 0x0a, 0x0d, 0x77, 0x6f, 0x72, 0x6b,
-	0x66, 0x6c, 0x6f, 0x77, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52,
-	0x0c, 0x77, 0x6f, 0x72, 0x6b, 0x66, 0x6c, 0x6f, 0x77, 0x54, 0x79, 0x70, 0x65, 0x12, 0x2a, 0x0a,
-	0x11, 0x77, 0x6f, 0x72, 0x6b, 0x66, 0x6c, 0x6f, 0x77, 0x5f, 0x73, 0x75, 0x62, 0x5f, 0x74, 0x79,
-	0x70, 0x65, 0x18, 0x07, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0f, 0x77, 0x6f, 0x72, 0x6b, 0x66, 0x6c,
-	0x6f, 0x77, 0x53, 0x75, 0x62, 0x54, 0x79, 0x70, 0x65, 0x12, 0x48, 0x0a, 0x21, 0x6d, 0x61, 0x78,
-	0x5f, 0x76, 0x5f, 0x72, 0x65, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x74,
-	0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x6c, 0x61, 0x67, 0x18, 0x08,
-	0x20, 0x01, 0x28, 0x03, 0x52, 0x1d, 0x6d, 0x61, 0x78, 0x56, 0x52, 0x65, 0x70, 0x6c, 0x69, 0x63,
-	0x61, 0x74, 0x69, 0x6f, 0x6e, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e,
-	0x4c, 0x61, 0x67, 0x12, 0x30, 0x0a, 0x14, 0x64, 0x65, 0x66, 0x65, 0x72, 0x5f, 0x73, 0x65, 0x63,
-	0x6f, 0x6e, 0x64, 0x61, 0x72, 0x79, 0x5f, 0x6b, 0x65, 0x79, 0x73, 0x18, 0x09, 0x20, 0x01, 0x28,
-	0x08, 0x52, 0x12, 0x64, 0x65, 0x66, 0x65, 0x72, 0x53, 0x65, 0x63, 0x6f, 0x6e, 0x64, 0x61, 0x72,
-	0x79, 0x4b, 0x65, 0x79, 0x73, 0x12, 0x34, 0x0a, 0x07, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73,
-	0x18, 0x0a, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x76, 0x74, 0x63, 0x74, 0x6c, 0x64, 0x61,
-	0x74, 0x61, 0x2e, 0x57, 0x6f, 0x72, 0x6b, 0x66, 0x6c, 0x6f, 0x77, 0x4f, 0x70, 0x74, 0x69, 0x6f,
-	0x6e, 0x73, 0x52, 0x07, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x1a, 0x60, 0x0a, 0x11, 0x53,
-	0x68, 0x61, 0x72, 0x64, 0x53, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79,
+	0x49, 0x4e, 0x45, 0x10, 0x00, 0x12, 0x0a, 0x0a, 0x06, 0x44, 0x49, 0x52, 0x45, 0x43, 0x54, 0x10,
+	0x03, 0x12, 0x09, 0x0a, 0x05, 0x4d, 0x59, 0x53, 0x51, 0x4c, 0x10, 0x04, 0x1a, 0x02, 0x10, 0x01,
+	0x22, 0x04, 0x08, 0x01, 0x10, 0x01, 0x22, 0x04, 0x08, 0x02, 0x10, 0x02, 0x22, 0x71, 0x0a, 0x06,
+	0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x12, 0x0b, 0x0a, 0x07, 0x55, 0x4e, 0x4b, 0x4e, 0x4f, 0x57,
+	0x4e, 0x10, 0x00, 0x12, 0x0d, 0x0a, 0x09, 0x52, 0x45, 0x51, 0x55, 0x45, 0x53, 0x54, 0x45, 0x44,
+	0x10, 0x01, 0x12, 0x0d, 0x0a, 0x09, 0x43, 0x41, 0x4e, 0x43, 0x45, 0x4c, 0x4c, 0x45, 0x44, 0x10,
+	0x02, 0x12, 0x0a, 0x0a, 0x06, 0x51, 0x55, 0x45, 0x55, 0x45, 0x44, 0x10, 0x03, 0x12, 0x09, 0x0a,
+	0x05, 0x52, 0x45, 0x41, 0x44, 0x59, 0x10, 0x04, 0x12, 0x0b, 0x0a, 0x07, 0x52, 0x55, 0x4e, 0x4e,
+	0x49, 0x4e, 0x47, 0x10, 0x05, 0x12, 0x0c, 0x0a, 0x08, 0x43, 0x4f, 0x4d, 0x50, 0x4c, 0x45, 0x54,
+	0x45, 0x10, 0x06, 0x12, 0x0a, 0x0a, 0x06, 0x46, 0x41, 0x49, 0x4c, 0x45, 0x44, 0x10, 0x07, 0x22,
+	0x5e, 0x0a, 0x05, 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, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01,
+	0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x25, 0x0a, 0x05, 0x73, 0x68, 0x61, 0x72,
+	0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0f, 0x2e, 0x74, 0x6f, 0x70, 0x6f, 0x64, 0x61,
+	0x74, 0x61, 0x2e, 0x53, 0x68, 0x61, 0x72, 0x64, 0x52, 0x05, 0x73, 0x68, 0x61, 0x72, 0x64, 0x22,
+	0xda, 0x02, 0x0a, 0x0f, 0x57, 0x6f, 0x72, 0x6b, 0x66, 0x6c, 0x6f, 0x77, 0x4f, 0x70, 0x74, 0x69,
+	0x6f, 0x6e, 0x73, 0x12, 0x1b, 0x0a, 0x09, 0x74, 0x65, 0x6e, 0x61, 0x6e, 0x74, 0x5f, 0x69, 0x64,
+	0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x74, 0x65, 0x6e, 0x61, 0x6e, 0x74, 0x49, 0x64,
+	0x12, 0x6e, 0x0a, 0x1f, 0x73, 0x68, 0x61, 0x72, 0x64, 0x65, 0x64, 0x5f, 0x61, 0x75, 0x74, 0x6f,
+	0x5f, 0x69, 0x6e, 0x63, 0x72, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x5f, 0x68, 0x61, 0x6e, 0x64, 0x6c,
+	0x69, 0x6e, 0x67, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x27, 0x2e, 0x76, 0x74, 0x63, 0x74,
+	0x6c, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x53, 0x68, 0x61, 0x72, 0x64, 0x65, 0x64, 0x41, 0x75, 0x74,
+	0x6f, 0x49, 0x6e, 0x63, 0x72, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x48, 0x61, 0x6e, 0x64, 0x6c, 0x69,
+	0x6e, 0x67, 0x52, 0x1c, 0x73, 0x68, 0x61, 0x72, 0x64, 0x65, 0x64, 0x41, 0x75, 0x74, 0x6f, 0x49,
+	0x6e, 0x63, 0x72, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x48, 0x61, 0x6e, 0x64, 0x6c, 0x69, 0x6e, 0x67,
+	0x12, 0x16, 0x0a, 0x06, 0x73, 0x68, 0x61, 0x72, 0x64, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x09,
+	0x52, 0x06, 0x73, 0x68, 0x61, 0x72, 0x64, 0x73, 0x12, 0x3e, 0x0a, 0x06, 0x63, 0x6f, 0x6e, 0x66,
+	0x69, 0x67, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x26, 0x2e, 0x76, 0x74, 0x63, 0x74, 0x6c,
+	0x64, 0x61, 0x74, 0x61, 0x2e, 0x57, 0x6f, 0x72, 0x6b, 0x66, 0x6c, 0x6f, 0x77, 0x4f, 0x70, 0x74,
+	0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x45, 0x6e, 0x74, 0x72, 0x79,
+	0x52, 0x06, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x27, 0x0a, 0x0f, 0x67, 0x6c, 0x6f, 0x62,
+	0x61, 0x6c, 0x5f, 0x6b, 0x65, 0x79, 0x73, 0x70, 0x61, 0x63, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28,
+	0x09, 0x52, 0x0e, 0x67, 0x6c, 0x6f, 0x62, 0x61, 0x6c, 0x4b, 0x65, 0x79, 0x73, 0x70, 0x61, 0x63,
+	0x65, 0x1a, 0x39, 0x0a, 0x0b, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x45, 0x6e, 0x74, 0x72, 0x79,
 	0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b,
-	0x65, 0x79, 0x12, 0x35, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28,
-	0x0b, 0x32, 0x1f, 0x2e, 0x76, 0x74, 0x63, 0x74, 0x6c, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x57, 0x6f,
-	0x72, 0x6b, 0x66, 0x6c, 0x6f, 0x77, 0x2e, 0x53, 0x68, 0x61, 0x72, 0x64, 0x53, 0x74, 0x72, 0x65,
-	0x61, 0x6d, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x49, 0x0a,
-	0x13, 0x52, 0x65, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x4c, 0x6f, 0x63, 0x61,
-	0x74, 0x69, 0x6f, 0x6e, 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, 0x16, 0x0a, 0x06, 0x73, 0x68, 0x61, 0x72, 0x64, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x09,
-	0x52, 0x06, 0x73, 0x68, 0x61, 0x72, 0x64, 0x73, 0x1a, 0xb9, 0x01, 0x0a, 0x0b, 0x53, 0x68, 0x61,
-	0x72, 0x64, 0x53, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x12, 0x34, 0x0a, 0x07, 0x73, 0x74, 0x72, 0x65,
-	0x61, 0x6d, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x76, 0x74, 0x63, 0x74,
+	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, 0xcf, 0x11, 0x0a,
+	0x08, 0x57, 0x6f, 0x72, 0x6b, 0x66, 0x6c, 0x6f, 0x77, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d,
+	0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x3f, 0x0a,
+	0x06, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x27, 0x2e,
+	0x76, 0x74, 0x63, 0x74, 0x6c, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x57, 0x6f, 0x72, 0x6b, 0x66, 0x6c,
+	0x6f, 0x77, 0x2e, 0x52, 0x65, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x4c, 0x6f,
+	0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x06, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x12, 0x3f,
+	0x0a, 0x06, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x27,
+	0x2e, 0x76, 0x74, 0x63, 0x74, 0x6c, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x57, 0x6f, 0x72, 0x6b, 0x66,
+	0x6c, 0x6f, 0x77, 0x2e, 0x52, 0x65, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x4c,
+	0x6f, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x06, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x12,
+	0x31, 0x0a, 0x15, 0x6d, 0x61, 0x78, 0x5f, 0x76, 0x5f, 0x72, 0x65, 0x70, 0x6c, 0x69, 0x63, 0x61,
+	0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x6c, 0x61, 0x67, 0x18, 0x04, 0x20, 0x01, 0x28, 0x03, 0x52, 0x12,
+	0x6d, 0x61, 0x78, 0x56, 0x52, 0x65, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x4c,
+	0x61, 0x67, 0x12, 0x4a, 0x0a, 0x0d, 0x73, 0x68, 0x61, 0x72, 0x64, 0x5f, 0x73, 0x74, 0x72, 0x65,
+	0x61, 0x6d, 0x73, 0x18, 0x05, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x25, 0x2e, 0x76, 0x74, 0x63, 0x74,
 	0x6c, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x57, 0x6f, 0x72, 0x6b, 0x66, 0x6c, 0x6f, 0x77, 0x2e, 0x53,
-	0x74, 0x72, 0x65, 0x61, 0x6d, 0x52, 0x07, 0x73, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x73, 0x12, 0x46,
-	0x0a, 0x0f, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x5f, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c,
-	0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1d, 0x2e, 0x74, 0x6f, 0x70, 0x6f, 0x64, 0x61,
-	0x74, 0x61, 0x2e, 0x53, 0x68, 0x61, 0x72, 0x64, 0x2e, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x43,
-	0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x52, 0x0e, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x43, 0x6f,
-	0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x73, 0x12, 0x2c, 0x0a, 0x12, 0x69, 0x73, 0x5f, 0x70, 0x72, 0x69,
-	0x6d, 0x61, 0x72, 0x79, 0x5f, 0x73, 0x65, 0x72, 0x76, 0x69, 0x6e, 0x67, 0x18, 0x03, 0x20, 0x01,
-	0x28, 0x08, 0x52, 0x10, 0x69, 0x73, 0x50, 0x72, 0x69, 0x6d, 0x61, 0x72, 0x79, 0x53, 0x65, 0x72,
-	0x76, 0x69, 0x6e, 0x67, 0x1a, 0xc1, 0x0a, 0x0a, 0x06, 0x53, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x12,
-	0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x02, 0x69, 0x64, 0x12,
-	0x14, 0x0a, 0x05, 0x73, 0x68, 0x61, 0x72, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05,
-	0x73, 0x68, 0x61, 0x72, 0x64, 0x12, 0x2d, 0x0a, 0x06, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x18,
-	0x03, 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, 0x06, 0x74, 0x61,
-	0x62, 0x6c, 0x65, 0x74, 0x12, 0x3d, 0x0a, 0x0d, 0x62, 0x69, 0x6e, 0x6c, 0x6f, 0x67, 0x5f, 0x73,
-	0x6f, 0x75, 0x72, 0x63, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x18, 0x2e, 0x62, 0x69,
-	0x6e, 0x6c, 0x6f, 0x67, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x42, 0x69, 0x6e, 0x6c, 0x6f, 0x67, 0x53,
-	0x6f, 0x75, 0x72, 0x63, 0x65, 0x52, 0x0c, 0x62, 0x69, 0x6e, 0x6c, 0x6f, 0x67, 0x53, 0x6f, 0x75,
-	0x72, 0x63, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x18,
-	0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x12,
-	0x23, 0x0a, 0x0d, 0x73, 0x74, 0x6f, 0x70, 0x5f, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e,
-	0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x73, 0x74, 0x6f, 0x70, 0x50, 0x6f, 0x73, 0x69,
-	0x74, 0x69, 0x6f, 0x6e, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x74, 0x61, 0x74, 0x65, 0x18, 0x07, 0x20,
-	0x01, 0x28, 0x09, 0x52, 0x05, 0x73, 0x74, 0x61, 0x74, 0x65, 0x12, 0x17, 0x0a, 0x07, 0x64, 0x62,
-	0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x08, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x64, 0x62, 0x4e,
-	0x61, 0x6d, 0x65, 0x12, 0x41, 0x0a, 0x15, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69,
-	0x6f, 0x6e, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x18, 0x09, 0x20, 0x01,
+	0x68, 0x61, 0x72, 0x64, 0x53, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79,
+	0x52, 0x0c, 0x73, 0x68, 0x61, 0x72, 0x64, 0x53, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x73, 0x12, 0x23,
+	0x0a, 0x0d, 0x77, 0x6f, 0x72, 0x6b, 0x66, 0x6c, 0x6f, 0x77, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x18,
+	0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x77, 0x6f, 0x72, 0x6b, 0x66, 0x6c, 0x6f, 0x77, 0x54,
+	0x79, 0x70, 0x65, 0x12, 0x2a, 0x0a, 0x11, 0x77, 0x6f, 0x72, 0x6b, 0x66, 0x6c, 0x6f, 0x77, 0x5f,
+	0x73, 0x75, 0x62, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x18, 0x07, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0f,
+	0x77, 0x6f, 0x72, 0x6b, 0x66, 0x6c, 0x6f, 0x77, 0x53, 0x75, 0x62, 0x54, 0x79, 0x70, 0x65, 0x12,
+	0x48, 0x0a, 0x21, 0x6d, 0x61, 0x78, 0x5f, 0x76, 0x5f, 0x72, 0x65, 0x70, 0x6c, 0x69, 0x63, 0x61,
+	0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e,
+	0x5f, 0x6c, 0x61, 0x67, 0x18, 0x08, 0x20, 0x01, 0x28, 0x03, 0x52, 0x1d, 0x6d, 0x61, 0x78, 0x56,
+	0x52, 0x65, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x54, 0x72, 0x61, 0x6e, 0x73,
+	0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x4c, 0x61, 0x67, 0x12, 0x30, 0x0a, 0x14, 0x64, 0x65, 0x66,
+	0x65, 0x72, 0x5f, 0x73, 0x65, 0x63, 0x6f, 0x6e, 0x64, 0x61, 0x72, 0x79, 0x5f, 0x6b, 0x65, 0x79,
+	0x73, 0x18, 0x09, 0x20, 0x01, 0x28, 0x08, 0x52, 0x12, 0x64, 0x65, 0x66, 0x65, 0x72, 0x53, 0x65,
+	0x63, 0x6f, 0x6e, 0x64, 0x61, 0x72, 0x79, 0x4b, 0x65, 0x79, 0x73, 0x12, 0x34, 0x0a, 0x07, 0x6f,
+	0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x76,
+	0x74, 0x63, 0x74, 0x6c, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x57, 0x6f, 0x72, 0x6b, 0x66, 0x6c, 0x6f,
+	0x77, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x52, 0x07, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e,
+	0x73, 0x1a, 0x60, 0x0a, 0x11, 0x53, 0x68, 0x61, 0x72, 0x64, 0x53, 0x74, 0x72, 0x65, 0x61, 0x6d,
+	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, 0x35, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75,
+	0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1f, 0x2e, 0x76, 0x74, 0x63, 0x74, 0x6c, 0x64,
+	0x61, 0x74, 0x61, 0x2e, 0x57, 0x6f, 0x72, 0x6b, 0x66, 0x6c, 0x6f, 0x77, 0x2e, 0x53, 0x68, 0x61,
+	0x72, 0x64, 0x53, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a,
+	0x02, 0x38, 0x01, 0x1a, 0x49, 0x0a, 0x13, 0x52, 0x65, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74, 0x69,
+	0x6f, 0x6e, 0x4c, 0x6f, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 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, 0x16, 0x0a, 0x06, 0x73, 0x68, 0x61, 0x72, 0x64, 0x73,
+	0x18, 0x02, 0x20, 0x03, 0x28, 0x09, 0x52, 0x06, 0x73, 0x68, 0x61, 0x72, 0x64, 0x73, 0x1a, 0xb9,
+	0x01, 0x0a, 0x0b, 0x53, 0x68, 0x61, 0x72, 0x64, 0x53, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x12, 0x34,
+	0x0a, 0x07, 0x73, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32,
+	0x1a, 0x2e, 0x76, 0x74, 0x63, 0x74, 0x6c, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x57, 0x6f, 0x72, 0x6b,
+	0x66, 0x6c, 0x6f, 0x77, 0x2e, 0x53, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x52, 0x07, 0x73, 0x74, 0x72,
+	0x65, 0x61, 0x6d, 0x73, 0x12, 0x46, 0x0a, 0x0f, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x5f, 0x63,
+	0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1d, 0x2e,
+	0x74, 0x6f, 0x70, 0x6f, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x53, 0x68, 0x61, 0x72, 0x64, 0x2e, 0x54,
+	0x61, 0x62, 0x6c, 0x65, 0x74, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x52, 0x0e, 0x74, 0x61,
+	0x62, 0x6c, 0x65, 0x74, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x73, 0x12, 0x2c, 0x0a, 0x12,
+	0x69, 0x73, 0x5f, 0x70, 0x72, 0x69, 0x6d, 0x61, 0x72, 0x79, 0x5f, 0x73, 0x65, 0x72, 0x76, 0x69,
+	0x6e, 0x67, 0x18, 0x03, 0x20, 0x01, 0x28, 0x08, 0x52, 0x10, 0x69, 0x73, 0x50, 0x72, 0x69, 0x6d,
+	0x61, 0x72, 0x79, 0x53, 0x65, 0x72, 0x76, 0x69, 0x6e, 0x67, 0x1a, 0xc1, 0x0a, 0x0a, 0x06, 0x53,
+	0x74, 0x72, 0x65, 0x61, 0x6d, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28,
+	0x03, 0x52, 0x02, 0x69, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x68, 0x61, 0x72, 0x64, 0x18, 0x02,
+	0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x73, 0x68, 0x61, 0x72, 0x64, 0x12, 0x2d, 0x0a, 0x06, 0x74,
+	0x61, 0x62, 0x6c, 0x65, 0x74, 0x18, 0x03, 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, 0x06, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x12, 0x3d, 0x0a, 0x0d, 0x62, 0x69,
+	0x6e, 0x6c, 0x6f, 0x67, 0x5f, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28,
+	0x0b, 0x32, 0x18, 0x2e, 0x62, 0x69, 0x6e, 0x6c, 0x6f, 0x67, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x42,
+	0x69, 0x6e, 0x6c, 0x6f, 0x67, 0x53, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x52, 0x0c, 0x62, 0x69, 0x6e,
+	0x6c, 0x6f, 0x67, 0x53, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x70, 0x6f, 0x73,
+	0x69, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x70, 0x6f, 0x73,
+	0x69, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x23, 0x0a, 0x0d, 0x73, 0x74, 0x6f, 0x70, 0x5f, 0x70, 0x6f,
+	0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x73, 0x74,
+	0x6f, 0x70, 0x50, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x74,
+	0x61, 0x74, 0x65, 0x18, 0x07, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x73, 0x74, 0x61, 0x74, 0x65,
+	0x12, 0x17, 0x0a, 0x07, 0x64, 0x62, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x08, 0x20, 0x01, 0x28,
+	0x09, 0x52, 0x06, 0x64, 0x62, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x41, 0x0a, 0x15, 0x74, 0x72, 0x61,
+	0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61,
+	0x6d, 0x70, 0x18, 0x09, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0c, 0x2e, 0x76, 0x74, 0x74, 0x69, 0x6d,
+	0x65, 0x2e, 0x54, 0x69, 0x6d, 0x65, 0x52, 0x14, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74,
+	0x69, 0x6f, 0x6e, 0x54, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x12, 0x2f, 0x0a, 0x0c,
+	0x74, 0x69, 0x6d, 0x65, 0x5f, 0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x64, 0x18, 0x0a, 0x20, 0x01,
 	0x28, 0x0b, 0x32, 0x0c, 0x2e, 0x76, 0x74, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x54, 0x69, 0x6d, 0x65,
-	0x52, 0x14, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x54, 0x69, 0x6d,
-	0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x12, 0x2f, 0x0a, 0x0c, 0x74, 0x69, 0x6d, 0x65, 0x5f, 0x75,
-	0x70, 0x64, 0x61, 0x74, 0x65, 0x64, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0c, 0x2e, 0x76,
-	0x74, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x54, 0x69, 0x6d, 0x65, 0x52, 0x0b, 0x74, 0x69, 0x6d, 0x65,
-	0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x6d, 0x65, 0x73, 0x73, 0x61,
-	0x67, 0x65, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67,
-	0x65, 0x12, 0x45, 0x0a, 0x0b, 0x63, 0x6f, 0x70, 0x79, 0x5f, 0x73, 0x74, 0x61, 0x74, 0x65, 0x73,
-	0x18, 0x0c, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x24, 0x2e, 0x76, 0x74, 0x63, 0x74, 0x6c, 0x64, 0x61,
-	0x74, 0x61, 0x2e, 0x57, 0x6f, 0x72, 0x6b, 0x66, 0x6c, 0x6f, 0x77, 0x2e, 0x53, 0x74, 0x72, 0x65,
-	0x61, 0x6d, 0x2e, 0x43, 0x6f, 0x70, 0x79, 0x53, 0x74, 0x61, 0x74, 0x65, 0x52, 0x0a, 0x63, 0x6f,
-	0x70, 0x79, 0x53, 0x74, 0x61, 0x74, 0x65, 0x73, 0x12, 0x32, 0x0a, 0x04, 0x6c, 0x6f, 0x67, 0x73,
-	0x18, 0x0d, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1e, 0x2e, 0x76, 0x74, 0x63, 0x74, 0x6c, 0x64, 0x61,
-	0x74, 0x61, 0x2e, 0x57, 0x6f, 0x72, 0x6b, 0x66, 0x6c, 0x6f, 0x77, 0x2e, 0x53, 0x74, 0x72, 0x65,
-	0x61, 0x6d, 0x2e, 0x4c, 0x6f, 0x67, 0x52, 0x04, 0x6c, 0x6f, 0x67, 0x73, 0x12, 0x26, 0x0a, 0x0f,
-	0x6c, 0x6f, 0x67, 0x5f, 0x66, 0x65, 0x74, 0x63, 0x68, 0x5f, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x18,
-	0x0e, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x6c, 0x6f, 0x67, 0x46, 0x65, 0x74, 0x63, 0x68, 0x45,
-	0x72, 0x72, 0x6f, 0x72, 0x12, 0x12, 0x0a, 0x04, 0x74, 0x61, 0x67, 0x73, 0x18, 0x0f, 0x20, 0x03,
-	0x28, 0x09, 0x52, 0x04, 0x74, 0x61, 0x67, 0x73, 0x12, 0x1f, 0x0a, 0x0b, 0x72, 0x6f, 0x77, 0x73,
-	0x5f, 0x63, 0x6f, 0x70, 0x69, 0x65, 0x64, 0x18, 0x10, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0a, 0x72,
-	0x6f, 0x77, 0x73, 0x43, 0x6f, 0x70, 0x69, 0x65, 0x64, 0x12, 0x55, 0x0a, 0x10, 0x74, 0x68, 0x72,
-	0x6f, 0x74, 0x74, 0x6c, 0x65, 0x72, 0x5f, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x18, 0x11, 0x20,
-	0x01, 0x28, 0x0b, 0x32, 0x2a, 0x2e, 0x76, 0x74, 0x63, 0x74, 0x6c, 0x64, 0x61, 0x74, 0x61, 0x2e,
-	0x57, 0x6f, 0x72, 0x6b, 0x66, 0x6c, 0x6f, 0x77, 0x2e, 0x53, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x2e,
-	0x54, 0x68, 0x72, 0x6f, 0x74, 0x74, 0x6c, 0x65, 0x72, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x52,
-	0x0f, 0x74, 0x68, 0x72, 0x6f, 0x74, 0x74, 0x6c, 0x65, 0x72, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73,
-	0x12, 0x37, 0x0a, 0x0c, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x73,
-	0x18, 0x12, 0x20, 0x03, 0x28, 0x0e, 0x32, 0x14, 0x2e, 0x74, 0x6f, 0x70, 0x6f, 0x64, 0x61, 0x74,
-	0x61, 0x2e, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x54, 0x79, 0x70, 0x65, 0x52, 0x0b, 0x74, 0x61,
-	0x62, 0x6c, 0x65, 0x74, 0x54, 0x79, 0x70, 0x65, 0x73, 0x12, 0x6c, 0x0a, 0x1b, 0x74, 0x61, 0x62,
-	0x6c, 0x65, 0x74, 0x5f, 0x73, 0x65, 0x6c, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x70, 0x72,
-	0x65, 0x66, 0x65, 0x72, 0x65, 0x6e, 0x63, 0x65, 0x18, 0x13, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x2c,
-	0x2e, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x6d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x72, 0x64, 0x61,
-	0x74, 0x61, 0x2e, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x53, 0x65, 0x6c, 0x65, 0x63, 0x74, 0x69,
-	0x6f, 0x6e, 0x50, 0x72, 0x65, 0x66, 0x65, 0x72, 0x65, 0x6e, 0x63, 0x65, 0x52, 0x19, 0x74, 0x61,
-	0x62, 0x6c, 0x65, 0x74, 0x53, 0x65, 0x6c, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x50, 0x72, 0x65,
-	0x66, 0x65, 0x72, 0x65, 0x6e, 0x63, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x63, 0x65, 0x6c, 0x6c, 0x73,
-	0x18, 0x14, 0x20, 0x03, 0x28, 0x09, 0x52, 0x05, 0x63, 0x65, 0x6c, 0x6c, 0x73, 0x1a, 0x57, 0x0a,
-	0x09, 0x43, 0x6f, 0x70, 0x79, 0x53, 0x74, 0x61, 0x74, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x74, 0x61,
-	0x62, 0x6c, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x74, 0x61, 0x62, 0x6c, 0x65,
-	0x12, 0x17, 0x0a, 0x07, 0x6c, 0x61, 0x73, 0x74, 0x5f, 0x70, 0x6b, 0x18, 0x02, 0x20, 0x01, 0x28,
-	0x09, 0x52, 0x06, 0x6c, 0x61, 0x73, 0x74, 0x50, 0x6b, 0x12, 0x1b, 0x0a, 0x09, 0x73, 0x74, 0x72,
-	0x65, 0x61, 0x6d, 0x5f, 0x69, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x03, 0x52, 0x08, 0x73, 0x74,
-	0x72, 0x65, 0x61, 0x6d, 0x49, 0x64, 0x1a, 0xe6, 0x01, 0x0a, 0x03, 0x4c, 0x6f, 0x67, 0x12, 0x0e,
-	0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x02, 0x69, 0x64, 0x12, 0x1b,
-	0x0a, 0x09, 0x73, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x5f, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28,
-	0x03, 0x52, 0x08, 0x73, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x49, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x74,
-	0x79, 0x70, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x74, 0x79, 0x70, 0x65, 0x12,
-	0x14, 0x0a, 0x05, 0x73, 0x74, 0x61, 0x74, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05,
-	0x73, 0x74, 0x61, 0x74, 0x65, 0x12, 0x2b, 0x0a, 0x0a, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x64,
-	0x5f, 0x61, 0x74, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0c, 0x2e, 0x76, 0x74, 0x74, 0x69,
-	0x6d, 0x65, 0x2e, 0x54, 0x69, 0x6d, 0x65, 0x52, 0x09, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x64,
-	0x41, 0x74, 0x12, 0x2b, 0x0a, 0x0a, 0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x64, 0x5f, 0x61, 0x74,
-	0x18, 0x06, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0c, 0x2e, 0x76, 0x74, 0x74, 0x69, 0x6d, 0x65, 0x2e,
-	0x54, 0x69, 0x6d, 0x65, 0x52, 0x09, 0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x64, 0x41, 0x74, 0x12,
-	0x18, 0x0a, 0x07, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x18, 0x07, 0x20, 0x01, 0x28, 0x09,
-	0x52, 0x07, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x63, 0x6f, 0x75,
-	0x6e, 0x74, 0x18, 0x08, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x1a,
-	0x77, 0x0a, 0x0f, 0x54, 0x68, 0x72, 0x6f, 0x74, 0x74, 0x6c, 0x65, 0x72, 0x53, 0x74, 0x61, 0x74,
-	0x75, 0x73, 0x12, 0x2f, 0x0a, 0x13, 0x63, 0x6f, 0x6d, 0x70, 0x6f, 0x6e, 0x65, 0x6e, 0x74, 0x5f,
-	0x74, 0x68, 0x72, 0x6f, 0x74, 0x74, 0x6c, 0x65, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52,
-	0x12, 0x63, 0x6f, 0x6d, 0x70, 0x6f, 0x6e, 0x65, 0x6e, 0x74, 0x54, 0x68, 0x72, 0x6f, 0x74, 0x74,
-	0x6c, 0x65, 0x64, 0x12, 0x33, 0x0a, 0x0e, 0x74, 0x69, 0x6d, 0x65, 0x5f, 0x74, 0x68, 0x72, 0x6f,
-	0x74, 0x74, 0x6c, 0x65, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0c, 0x2e, 0x76, 0x74,
-	0x74, 0x69, 0x6d, 0x65, 0x2e, 0x54, 0x69, 0x6d, 0x65, 0x52, 0x0d, 0x74, 0x69, 0x6d, 0x65, 0x54,
-	0x68, 0x72, 0x6f, 0x74, 0x74, 0x6c, 0x65, 0x64, 0x22, 0x59, 0x0a, 0x12, 0x41, 0x64, 0x64, 0x43,
-	0x65, 0x6c, 0x6c, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x12,
-	0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61,
-	0x6d, 0x65, 0x12, 0x2f, 0x0a, 0x09, 0x63, 0x65, 0x6c, 0x6c, 0x5f, 0x69, 0x6e, 0x66, 0x6f, 0x18,
-	0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x74, 0x6f, 0x70, 0x6f, 0x64, 0x61, 0x74, 0x61,
-	0x2e, 0x43, 0x65, 0x6c, 0x6c, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x08, 0x63, 0x65, 0x6c, 0x6c, 0x49,
-	0x6e, 0x66, 0x6f, 0x22, 0x15, 0x0a, 0x13, 0x41, 0x64, 0x64, 0x43, 0x65, 0x6c, 0x6c, 0x49, 0x6e,
-	0x66, 0x6f, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x40, 0x0a, 0x14, 0x41, 0x64,
-	0x64, 0x43, 0x65, 0x6c, 0x6c, 0x73, 0x41, 0x6c, 0x69, 0x61, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65,
-	0x73, 0x74, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09,
-	0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x63, 0x65, 0x6c, 0x6c, 0x73, 0x18,
-	0x02, 0x20, 0x03, 0x28, 0x09, 0x52, 0x05, 0x63, 0x65, 0x6c, 0x6c, 0x73, 0x22, 0x17, 0x0a, 0x15,
-	0x41, 0x64, 0x64, 0x43, 0x65, 0x6c, 0x6c, 0x73, 0x41, 0x6c, 0x69, 0x61, 0x73, 0x52, 0x65, 0x73,
-	0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0xbf, 0x01, 0x0a, 0x20, 0x41, 0x70, 0x70, 0x6c, 0x79, 0x4b,
-	0x65, 0x79, 0x73, 0x70, 0x61, 0x63, 0x65, 0x52, 0x6f, 0x75, 0x74, 0x69, 0x6e, 0x67, 0x52, 0x75,
-	0x6c, 0x65, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x53, 0x0a, 0x16, 0x6b, 0x65,
-	0x79, 0x73, 0x70, 0x61, 0x63, 0x65, 0x5f, 0x72, 0x6f, 0x75, 0x74, 0x69, 0x6e, 0x67, 0x5f, 0x72,
-	0x75, 0x6c, 0x65, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1d, 0x2e, 0x76, 0x73, 0x63,
-	0x68, 0x65, 0x6d, 0x61, 0x2e, 0x4b, 0x65, 0x79, 0x73, 0x70, 0x61, 0x63, 0x65, 0x52, 0x6f, 0x75,
-	0x74, 0x69, 0x6e, 0x67, 0x52, 0x75, 0x6c, 0x65, 0x73, 0x52, 0x14, 0x6b, 0x65, 0x79, 0x73, 0x70,
-	0x61, 0x63, 0x65, 0x52, 0x6f, 0x75, 0x74, 0x69, 0x6e, 0x67, 0x52, 0x75, 0x6c, 0x65, 0x73, 0x12,
-	0x21, 0x0a, 0x0c, 0x73, 0x6b, 0x69, 0x70, 0x5f, 0x72, 0x65, 0x62, 0x75, 0x69, 0x6c, 0x64, 0x18,
-	0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0b, 0x73, 0x6b, 0x69, 0x70, 0x52, 0x65, 0x62, 0x75, 0x69,
-	0x6c, 0x64, 0x12, 0x23, 0x0a, 0x0d, 0x72, 0x65, 0x62, 0x75, 0x69, 0x6c, 0x64, 0x5f, 0x63, 0x65,
-	0x6c, 0x6c, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0c, 0x72, 0x65, 0x62, 0x75, 0x69,
-	0x6c, 0x64, 0x43, 0x65, 0x6c, 0x6c, 0x73, 0x22, 0x78, 0x0a, 0x21, 0x41, 0x70, 0x70, 0x6c, 0x79,
-	0x4b, 0x65, 0x79, 0x73, 0x70, 0x61, 0x63, 0x65, 0x52, 0x6f, 0x75, 0x74, 0x69, 0x6e, 0x67, 0x52,
-	0x75, 0x6c, 0x65, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x53, 0x0a, 0x16,
-	0x6b, 0x65, 0x79, 0x73, 0x70, 0x61, 0x63, 0x65, 0x5f, 0x72, 0x6f, 0x75, 0x74, 0x69, 0x6e, 0x67,
-	0x5f, 0x72, 0x75, 0x6c, 0x65, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1d, 0x2e, 0x76,
-	0x73, 0x63, 0x68, 0x65, 0x6d, 0x61, 0x2e, 0x4b, 0x65, 0x79, 0x73, 0x70, 0x61, 0x63, 0x65, 0x52,
-	0x6f, 0x75, 0x74, 0x69, 0x6e, 0x67, 0x52, 0x75, 0x6c, 0x65, 0x73, 0x52, 0x14, 0x6b, 0x65, 0x79,
+	0x52, 0x0b, 0x74, 0x69, 0x6d, 0x65, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x64, 0x12, 0x18, 0x0a,
+	0x07, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07,
+	0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x12, 0x45, 0x0a, 0x0b, 0x63, 0x6f, 0x70, 0x79, 0x5f,
+	0x73, 0x74, 0x61, 0x74, 0x65, 0x73, 0x18, 0x0c, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x24, 0x2e, 0x76,
+	0x74, 0x63, 0x74, 0x6c, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x57, 0x6f, 0x72, 0x6b, 0x66, 0x6c, 0x6f,
+	0x77, 0x2e, 0x53, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x2e, 0x43, 0x6f, 0x70, 0x79, 0x53, 0x74, 0x61,
+	0x74, 0x65, 0x52, 0x0a, 0x63, 0x6f, 0x70, 0x79, 0x53, 0x74, 0x61, 0x74, 0x65, 0x73, 0x12, 0x32,
+	0x0a, 0x04, 0x6c, 0x6f, 0x67, 0x73, 0x18, 0x0d, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1e, 0x2e, 0x76,
+	0x74, 0x63, 0x74, 0x6c, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x57, 0x6f, 0x72, 0x6b, 0x66, 0x6c, 0x6f,
+	0x77, 0x2e, 0x53, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x2e, 0x4c, 0x6f, 0x67, 0x52, 0x04, 0x6c, 0x6f,
+	0x67, 0x73, 0x12, 0x26, 0x0a, 0x0f, 0x6c, 0x6f, 0x67, 0x5f, 0x66, 0x65, 0x74, 0x63, 0x68, 0x5f,
+	0x65, 0x72, 0x72, 0x6f, 0x72, 0x18, 0x0e, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x6c, 0x6f, 0x67,
+	0x46, 0x65, 0x74, 0x63, 0x68, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x12, 0x12, 0x0a, 0x04, 0x74, 0x61,
+	0x67, 0x73, 0x18, 0x0f, 0x20, 0x03, 0x28, 0x09, 0x52, 0x04, 0x74, 0x61, 0x67, 0x73, 0x12, 0x1f,
+	0x0a, 0x0b, 0x72, 0x6f, 0x77, 0x73, 0x5f, 0x63, 0x6f, 0x70, 0x69, 0x65, 0x64, 0x18, 0x10, 0x20,
+	0x01, 0x28, 0x03, 0x52, 0x0a, 0x72, 0x6f, 0x77, 0x73, 0x43, 0x6f, 0x70, 0x69, 0x65, 0x64, 0x12,
+	0x55, 0x0a, 0x10, 0x74, 0x68, 0x72, 0x6f, 0x74, 0x74, 0x6c, 0x65, 0x72, 0x5f, 0x73, 0x74, 0x61,
+	0x74, 0x75, 0x73, 0x18, 0x11, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2a, 0x2e, 0x76, 0x74, 0x63, 0x74,
+	0x6c, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x57, 0x6f, 0x72, 0x6b, 0x66, 0x6c, 0x6f, 0x77, 0x2e, 0x53,
+	0x74, 0x72, 0x65, 0x61, 0x6d, 0x2e, 0x54, 0x68, 0x72, 0x6f, 0x74, 0x74, 0x6c, 0x65, 0x72, 0x53,
+	0x74, 0x61, 0x74, 0x75, 0x73, 0x52, 0x0f, 0x74, 0x68, 0x72, 0x6f, 0x74, 0x74, 0x6c, 0x65, 0x72,
+	0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x12, 0x37, 0x0a, 0x0c, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x74,
+	0x5f, 0x74, 0x79, 0x70, 0x65, 0x73, 0x18, 0x12, 0x20, 0x03, 0x28, 0x0e, 0x32, 0x14, 0x2e, 0x74,
+	0x6f, 0x70, 0x6f, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x54, 0x79,
+	0x70, 0x65, 0x52, 0x0b, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x54, 0x79, 0x70, 0x65, 0x73, 0x12,
+	0x6c, 0x0a, 0x1b, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x5f, 0x73, 0x65, 0x6c, 0x65, 0x63, 0x74,
+	0x69, 0x6f, 0x6e, 0x5f, 0x70, 0x72, 0x65, 0x66, 0x65, 0x72, 0x65, 0x6e, 0x63, 0x65, 0x18, 0x13,
+	0x20, 0x01, 0x28, 0x0e, 0x32, 0x2c, 0x2e, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x6d, 0x61, 0x6e,
+	0x61, 0x67, 0x65, 0x72, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x53,
+	0x65, 0x6c, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x50, 0x72, 0x65, 0x66, 0x65, 0x72, 0x65, 0x6e,
+	0x63, 0x65, 0x52, 0x19, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x53, 0x65, 0x6c, 0x65, 0x63, 0x74,
+	0x69, 0x6f, 0x6e, 0x50, 0x72, 0x65, 0x66, 0x65, 0x72, 0x65, 0x6e, 0x63, 0x65, 0x12, 0x14, 0x0a,
+	0x05, 0x63, 0x65, 0x6c, 0x6c, 0x73, 0x18, 0x14, 0x20, 0x03, 0x28, 0x09, 0x52, 0x05, 0x63, 0x65,
+	0x6c, 0x6c, 0x73, 0x1a, 0x57, 0x0a, 0x09, 0x43, 0x6f, 0x70, 0x79, 0x53, 0x74, 0x61, 0x74, 0x65,
+	0x12, 0x14, 0x0a, 0x05, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52,
+	0x05, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x12, 0x17, 0x0a, 0x07, 0x6c, 0x61, 0x73, 0x74, 0x5f, 0x70,
+	0x6b, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x6c, 0x61, 0x73, 0x74, 0x50, 0x6b, 0x12,
+	0x1b, 0x0a, 0x09, 0x73, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x5f, 0x69, 0x64, 0x18, 0x03, 0x20, 0x01,
+	0x28, 0x03, 0x52, 0x08, 0x73, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x49, 0x64, 0x1a, 0xe6, 0x01, 0x0a,
+	0x03, 0x4c, 0x6f, 0x67, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03,
+	0x52, 0x02, 0x69, 0x64, 0x12, 0x1b, 0x0a, 0x09, 0x73, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x5f, 0x69,
+	0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x08, 0x73, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x49,
+	0x64, 0x12, 0x12, 0x0a, 0x04, 0x74, 0x79, 0x70, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52,
+	0x04, 0x74, 0x79, 0x70, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x74, 0x61, 0x74, 0x65, 0x18, 0x04,
+	0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x73, 0x74, 0x61, 0x74, 0x65, 0x12, 0x2b, 0x0a, 0x0a, 0x63,
+	0x72, 0x65, 0x61, 0x74, 0x65, 0x64, 0x5f, 0x61, 0x74, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32,
+	0x0c, 0x2e, 0x76, 0x74, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x54, 0x69, 0x6d, 0x65, 0x52, 0x09, 0x63,
+	0x72, 0x65, 0x61, 0x74, 0x65, 0x64, 0x41, 0x74, 0x12, 0x2b, 0x0a, 0x0a, 0x75, 0x70, 0x64, 0x61,
+	0x74, 0x65, 0x64, 0x5f, 0x61, 0x74, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0c, 0x2e, 0x76,
+	0x74, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x54, 0x69, 0x6d, 0x65, 0x52, 0x09, 0x75, 0x70, 0x64, 0x61,
+	0x74, 0x65, 0x64, 0x41, 0x74, 0x12, 0x18, 0x0a, 0x07, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65,
+	0x18, 0x07, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x12,
+	0x14, 0x0a, 0x05, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x08, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05,
+	0x63, 0x6f, 0x75, 0x6e, 0x74, 0x1a, 0x77, 0x0a, 0x0f, 0x54, 0x68, 0x72, 0x6f, 0x74, 0x74, 0x6c,
+	0x65, 0x72, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x12, 0x2f, 0x0a, 0x13, 0x63, 0x6f, 0x6d, 0x70,
+	0x6f, 0x6e, 0x65, 0x6e, 0x74, 0x5f, 0x74, 0x68, 0x72, 0x6f, 0x74, 0x74, 0x6c, 0x65, 0x64, 0x18,
+	0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x12, 0x63, 0x6f, 0x6d, 0x70, 0x6f, 0x6e, 0x65, 0x6e, 0x74,
+	0x54, 0x68, 0x72, 0x6f, 0x74, 0x74, 0x6c, 0x65, 0x64, 0x12, 0x33, 0x0a, 0x0e, 0x74, 0x69, 0x6d,
+	0x65, 0x5f, 0x74, 0x68, 0x72, 0x6f, 0x74, 0x74, 0x6c, 0x65, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28,
+	0x0b, 0x32, 0x0c, 0x2e, 0x76, 0x74, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x54, 0x69, 0x6d, 0x65, 0x52,
+	0x0d, 0x74, 0x69, 0x6d, 0x65, 0x54, 0x68, 0x72, 0x6f, 0x74, 0x74, 0x6c, 0x65, 0x64, 0x22, 0x59,
+	0x0a, 0x12, 0x41, 0x64, 0x64, 0x43, 0x65, 0x6c, 0x6c, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65, 0x71,
+	0x75, 0x65, 0x73, 0x74, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01,
+	0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x2f, 0x0a, 0x09, 0x63, 0x65, 0x6c, 0x6c,
+	0x5f, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x74, 0x6f,
+	0x70, 0x6f, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x43, 0x65, 0x6c, 0x6c, 0x49, 0x6e, 0x66, 0x6f, 0x52,
+	0x08, 0x63, 0x65, 0x6c, 0x6c, 0x49, 0x6e, 0x66, 0x6f, 0x22, 0x15, 0x0a, 0x13, 0x41, 0x64, 0x64,
+	0x43, 0x65, 0x6c, 0x6c, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65,
+	0x22, 0x40, 0x0a, 0x14, 0x41, 0x64, 0x64, 0x43, 0x65, 0x6c, 0x6c, 0x73, 0x41, 0x6c, 0x69, 0x61,
+	0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65,
+	0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x14, 0x0a, 0x05,
+	0x63, 0x65, 0x6c, 0x6c, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x09, 0x52, 0x05, 0x63, 0x65, 0x6c,
+	0x6c, 0x73, 0x22, 0x17, 0x0a, 0x15, 0x41, 0x64, 0x64, 0x43, 0x65, 0x6c, 0x6c, 0x73, 0x41, 0x6c,
+	0x69, 0x61, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0xbf, 0x01, 0x0a, 0x20,
+	0x41, 0x70, 0x70, 0x6c, 0x79, 0x4b, 0x65, 0x79, 0x73, 0x70, 0x61, 0x63, 0x65, 0x52, 0x6f, 0x75,
+	0x74, 0x69, 0x6e, 0x67, 0x52, 0x75, 0x6c, 0x65, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74,
+	0x12, 0x53, 0x0a, 0x16, 0x6b, 0x65, 0x79, 0x73, 0x70, 0x61, 0x63, 0x65, 0x5f, 0x72, 0x6f, 0x75,
+	0x74, 0x69, 0x6e, 0x67, 0x5f, 0x72, 0x75, 0x6c, 0x65, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b,
+	0x32, 0x1d, 0x2e, 0x76, 0x73, 0x63, 0x68, 0x65, 0x6d, 0x61, 0x2e, 0x4b, 0x65, 0x79, 0x73, 0x70,
+	0x61, 0x63, 0x65, 0x52, 0x6f, 0x75, 0x74, 0x69, 0x6e, 0x67, 0x52, 0x75, 0x6c, 0x65, 0x73, 0x52,
+	0x14, 0x6b, 0x65, 0x79, 0x73, 0x70, 0x61, 0x63, 0x65, 0x52, 0x6f, 0x75, 0x74, 0x69, 0x6e, 0x67,
+	0x52, 0x75, 0x6c, 0x65, 0x73, 0x12, 0x21, 0x0a, 0x0c, 0x73, 0x6b, 0x69, 0x70, 0x5f, 0x72, 0x65,
+	0x62, 0x75, 0x69, 0x6c, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0b, 0x73, 0x6b, 0x69,
+	0x70, 0x52, 0x65, 0x62, 0x75, 0x69, 0x6c, 0x64, 0x12, 0x23, 0x0a, 0x0d, 0x72, 0x65, 0x62, 0x75,
+	0x69, 0x6c, 0x64, 0x5f, 0x63, 0x65, 0x6c, 0x6c, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x09, 0x52,
+	0x0c, 0x72, 0x65, 0x62, 0x75, 0x69, 0x6c, 0x64, 0x43, 0x65, 0x6c, 0x6c, 0x73, 0x22, 0x78, 0x0a,
+	0x21, 0x41, 0x70, 0x70, 0x6c, 0x79, 0x4b, 0x65, 0x79, 0x73, 0x70, 0x61, 0x63, 0x65, 0x52, 0x6f,
+	0x75, 0x74, 0x69, 0x6e, 0x67, 0x52, 0x75, 0x6c, 0x65, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e,
+	0x73, 0x65, 0x12, 0x53, 0x0a, 0x16, 0x6b, 0x65, 0x79, 0x73, 0x70, 0x61, 0x63, 0x65, 0x5f, 0x72,
+	0x6f, 0x75, 0x74, 0x69, 0x6e, 0x67, 0x5f, 0x72, 0x75, 0x6c, 0x65, 0x73, 0x18, 0x01, 0x20, 0x01,
+	0x28, 0x0b, 0x32, 0x1d, 0x2e, 0x76, 0x73, 0x63, 0x68, 0x65, 0x6d, 0x61, 0x2e, 0x4b, 0x65, 0x79,
 	0x73, 0x70, 0x61, 0x63, 0x65, 0x52, 0x6f, 0x75, 0x74, 0x69, 0x6e, 0x67, 0x52, 0x75, 0x6c, 0x65,
-	0x73, 0x22, 0x9e, 0x01, 0x0a, 0x18, 0x41, 0x70, 0x70, 0x6c, 0x79, 0x52, 0x6f, 0x75, 0x74, 0x69,
-	0x6e, 0x67, 0x52, 0x75, 0x6c, 0x65, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x3a,
-	0x0a, 0x0d, 0x72, 0x6f, 0x75, 0x74, 0x69, 0x6e, 0x67, 0x5f, 0x72, 0x75, 0x6c, 0x65, 0x73, 0x18,
-	0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x15, 0x2e, 0x76, 0x73, 0x63, 0x68, 0x65, 0x6d, 0x61, 0x2e,
-	0x52, 0x6f, 0x75, 0x74, 0x69, 0x6e, 0x67, 0x52, 0x75, 0x6c, 0x65, 0x73, 0x52, 0x0c, 0x72, 0x6f,
-	0x75, 0x74, 0x69, 0x6e, 0x67, 0x52, 0x75, 0x6c, 0x65, 0x73, 0x12, 0x21, 0x0a, 0x0c, 0x73, 0x6b,
-	0x69, 0x70, 0x5f, 0x72, 0x65, 0x62, 0x75, 0x69, 0x6c, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08,
-	0x52, 0x0b, 0x73, 0x6b, 0x69, 0x70, 0x52, 0x65, 0x62, 0x75, 0x69, 0x6c, 0x64, 0x12, 0x23, 0x0a,
-	0x0d, 0x72, 0x65, 0x62, 0x75, 0x69, 0x6c, 0x64, 0x5f, 0x63, 0x65, 0x6c, 0x6c, 0x73, 0x18, 0x03,
-	0x20, 0x03, 0x28, 0x09, 0x52, 0x0c, 0x72, 0x65, 0x62, 0x75, 0x69, 0x6c, 0x64, 0x43, 0x65, 0x6c,
-	0x6c, 0x73, 0x22, 0x1b, 0x0a, 0x19, 0x41, 0x70, 0x70, 0x6c, 0x79, 0x52, 0x6f, 0x75, 0x74, 0x69,
-	0x6e, 0x67, 0x52, 0x75, 0x6c, 0x65, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22,
-	0xb3, 0x01, 0x0a, 0x1d, 0x41, 0x70, 0x70, 0x6c, 0x79, 0x53, 0x68, 0x61, 0x72, 0x64, 0x52, 0x6f,
-	0x75, 0x74, 0x69, 0x6e, 0x67, 0x52, 0x75, 0x6c, 0x65, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73,
-	0x74, 0x12, 0x4a, 0x0a, 0x13, 0x73, 0x68, 0x61, 0x72, 0x64, 0x5f, 0x72, 0x6f, 0x75, 0x74, 0x69,
-	0x6e, 0x67, 0x5f, 0x72, 0x75, 0x6c, 0x65, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a,
-	0x2e, 0x76, 0x73, 0x63, 0x68, 0x65, 0x6d, 0x61, 0x2e, 0x53, 0x68, 0x61, 0x72, 0x64, 0x52, 0x6f,
-	0x75, 0x74, 0x69, 0x6e, 0x67, 0x52, 0x75, 0x6c, 0x65, 0x73, 0x52, 0x11, 0x73, 0x68, 0x61, 0x72,
-	0x64, 0x52, 0x6f, 0x75, 0x74, 0x69, 0x6e, 0x67, 0x52, 0x75, 0x6c, 0x65, 0x73, 0x12, 0x21, 0x0a,
+	0x73, 0x52, 0x14, 0x6b, 0x65, 0x79, 0x73, 0x70, 0x61, 0x63, 0x65, 0x52, 0x6f, 0x75, 0x74, 0x69,
+	0x6e, 0x67, 0x52, 0x75, 0x6c, 0x65, 0x73, 0x22, 0x9e, 0x01, 0x0a, 0x18, 0x41, 0x70, 0x70, 0x6c,
+	0x79, 0x52, 0x6f, 0x75, 0x74, 0x69, 0x6e, 0x67, 0x52, 0x75, 0x6c, 0x65, 0x73, 0x52, 0x65, 0x71,
+	0x75, 0x65, 0x73, 0x74, 0x12, 0x3a, 0x0a, 0x0d, 0x72, 0x6f, 0x75, 0x74, 0x69, 0x6e, 0x67, 0x5f,
+	0x72, 0x75, 0x6c, 0x65, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x15, 0x2e, 0x76, 0x73,
+	0x63, 0x68, 0x65, 0x6d, 0x61, 0x2e, 0x52, 0x6f, 0x75, 0x74, 0x69, 0x6e, 0x67, 0x52, 0x75, 0x6c,
+	0x65, 0x73, 0x52, 0x0c, 0x72, 0x6f, 0x75, 0x74, 0x69, 0x6e, 0x67, 0x52, 0x75, 0x6c, 0x65, 0x73,
+	0x12, 0x21, 0x0a, 0x0c, 0x73, 0x6b, 0x69, 0x70, 0x5f, 0x72, 0x65, 0x62, 0x75, 0x69, 0x6c, 0x64,
+	0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0b, 0x73, 0x6b, 0x69, 0x70, 0x52, 0x65, 0x62, 0x75,
+	0x69, 0x6c, 0x64, 0x12, 0x23, 0x0a, 0x0d, 0x72, 0x65, 0x62, 0x75, 0x69, 0x6c, 0x64, 0x5f, 0x63,
+	0x65, 0x6c, 0x6c, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0c, 0x72, 0x65, 0x62, 0x75,
+	0x69, 0x6c, 0x64, 0x43, 0x65, 0x6c, 0x6c, 0x73, 0x22, 0x1b, 0x0a, 0x19, 0x41, 0x70, 0x70, 0x6c,
+	0x79, 0x52, 0x6f, 0x75, 0x74, 0x69, 0x6e, 0x67, 0x52, 0x75, 0x6c, 0x65, 0x73, 0x52, 0x65, 0x73,
+	0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0xb3, 0x01, 0x0a, 0x1d, 0x41, 0x70, 0x70, 0x6c, 0x79, 0x53,
+	0x68, 0x61, 0x72, 0x64, 0x52, 0x6f, 0x75, 0x74, 0x69, 0x6e, 0x67, 0x52, 0x75, 0x6c, 0x65, 0x73,
+	0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x4a, 0x0a, 0x13, 0x73, 0x68, 0x61, 0x72, 0x64,
+	0x5f, 0x72, 0x6f, 0x75, 0x74, 0x69, 0x6e, 0x67, 0x5f, 0x72, 0x75, 0x6c, 0x65, 0x73, 0x18, 0x01,
+	0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x76, 0x73, 0x63, 0x68, 0x65, 0x6d, 0x61, 0x2e, 0x53,
+	0x68, 0x61, 0x72, 0x64, 0x52, 0x6f, 0x75, 0x74, 0x69, 0x6e, 0x67, 0x52, 0x75, 0x6c, 0x65, 0x73,
+	0x52, 0x11, 0x73, 0x68, 0x61, 0x72, 0x64, 0x52, 0x6f, 0x75, 0x74, 0x69, 0x6e, 0x67, 0x52, 0x75,
+	0x6c, 0x65, 0x73, 0x12, 0x21, 0x0a, 0x0c, 0x73, 0x6b, 0x69, 0x70, 0x5f, 0x72, 0x65, 0x62, 0x75,
+	0x69, 0x6c, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0b, 0x73, 0x6b, 0x69, 0x70, 0x52,
+	0x65, 0x62, 0x75, 0x69, 0x6c, 0x64, 0x12, 0x23, 0x0a, 0x0d, 0x72, 0x65, 0x62, 0x75, 0x69, 0x6c,
+	0x64, 0x5f, 0x63, 0x65, 0x6c, 0x6c, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0c, 0x72,
+	0x65, 0x62, 0x75, 0x69, 0x6c, 0x64, 0x43, 0x65, 0x6c, 0x6c, 0x73, 0x22, 0x20, 0x0a, 0x1e, 0x41,
+	0x70, 0x70, 0x6c, 0x79, 0x53, 0x68, 0x61, 0x72, 0x64, 0x52, 0x6f, 0x75, 0x74, 0x69, 0x6e, 0x67,
+	0x52, 0x75, 0x6c, 0x65, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0xce, 0x02,
+	0x0a, 0x12, 0x41, 0x70, 0x70, 0x6c, 0x79, 0x53, 0x63, 0x68, 0x65, 0x6d, 0x61, 0x52, 0x65, 0x71,
+	0x75, 0x65, 0x73, 0x74, 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, 0x10, 0x0a, 0x03, 0x73, 0x71, 0x6c, 0x18, 0x03, 0x20, 0x03, 0x28, 0x09, 0x52, 0x03, 0x73,
+	0x71, 0x6c, 0x12, 0x21, 0x0a, 0x0c, 0x64, 0x64, 0x6c, 0x5f, 0x73, 0x74, 0x72, 0x61, 0x74, 0x65,
+	0x67, 0x79, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x64, 0x64, 0x6c, 0x53, 0x74, 0x72,
+	0x61, 0x74, 0x65, 0x67, 0x79, 0x12, 0x1b, 0x0a, 0x09, 0x75, 0x75, 0x69, 0x64, 0x5f, 0x6c, 0x69,
+	0x73, 0x74, 0x18, 0x05, 0x20, 0x03, 0x28, 0x09, 0x52, 0x08, 0x75, 0x75, 0x69, 0x64, 0x4c, 0x69,
+	0x73, 0x74, 0x12, 0x2b, 0x0a, 0x11, 0x6d, 0x69, 0x67, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x5f,
+	0x63, 0x6f, 0x6e, 0x74, 0x65, 0x78, 0x74, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x10, 0x6d,
+	0x69, 0x67, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x43, 0x6f, 0x6e, 0x74, 0x65, 0x78, 0x74, 0x12,
+	0x44, 0x0a, 0x15, 0x77, 0x61, 0x69, 0x74, 0x5f, 0x72, 0x65, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x73,
+	0x5f, 0x74, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x18, 0x07, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x10,
+	0x2e, 0x76, 0x74, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x44, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e,
+	0x52, 0x13, 0x77, 0x61, 0x69, 0x74, 0x52, 0x65, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x73, 0x54, 0x69,
+	0x6d, 0x65, 0x6f, 0x75, 0x74, 0x12, 0x2c, 0x0a, 0x09, 0x63, 0x61, 0x6c, 0x6c, 0x65, 0x72, 0x5f,
+	0x69, 0x64, 0x18, 0x09, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0f, 0x2e, 0x76, 0x74, 0x72, 0x70, 0x63,
+	0x2e, 0x43, 0x61, 0x6c, 0x6c, 0x65, 0x72, 0x49, 0x44, 0x52, 0x08, 0x63, 0x61, 0x6c, 0x6c, 0x65,
+	0x72, 0x49, 0x64, 0x12, 0x1d, 0x0a, 0x0a, 0x62, 0x61, 0x74, 0x63, 0x68, 0x5f, 0x73, 0x69, 0x7a,
+	0x65, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x03, 0x52, 0x09, 0x62, 0x61, 0x74, 0x63, 0x68, 0x53, 0x69,
+	0x7a, 0x65, 0x4a, 0x04, 0x08, 0x02, 0x10, 0x03, 0x4a, 0x04, 0x08, 0x08, 0x10, 0x09, 0x22, 0xe8,
+	0x01, 0x0a, 0x13, 0x41, 0x70, 0x70, 0x6c, 0x79, 0x53, 0x63, 0x68, 0x65, 0x6d, 0x61, 0x52, 0x65,
+	0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x1b, 0x0a, 0x09, 0x75, 0x75, 0x69, 0x64, 0x5f, 0x6c,
+	0x69, 0x73, 0x74, 0x18, 0x01, 0x20, 0x03, 0x28, 0x09, 0x52, 0x08, 0x75, 0x75, 0x69, 0x64, 0x4c,
+	0x69, 0x73, 0x74, 0x12, 0x6c, 0x0a, 0x16, 0x72, 0x6f, 0x77, 0x73, 0x5f, 0x61, 0x66, 0x66, 0x65,
+	0x63, 0x74, 0x65, 0x64, 0x5f, 0x62, 0x79, 0x5f, 0x73, 0x68, 0x61, 0x72, 0x64, 0x18, 0x02, 0x20,
+	0x03, 0x28, 0x0b, 0x32, 0x37, 0x2e, 0x76, 0x74, 0x63, 0x74, 0x6c, 0x64, 0x61, 0x74, 0x61, 0x2e,
+	0x41, 0x70, 0x70, 0x6c, 0x79, 0x53, 0x63, 0x68, 0x65, 0x6d, 0x61, 0x52, 0x65, 0x73, 0x70, 0x6f,
+	0x6e, 0x73, 0x65, 0x2e, 0x52, 0x6f, 0x77, 0x73, 0x41, 0x66, 0x66, 0x65, 0x63, 0x74, 0x65, 0x64,
+	0x42, 0x79, 0x53, 0x68, 0x61, 0x72, 0x64, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x13, 0x72, 0x6f,
+	0x77, 0x73, 0x41, 0x66, 0x66, 0x65, 0x63, 0x74, 0x65, 0x64, 0x42, 0x79, 0x53, 0x68, 0x61, 0x72,
+	0x64, 0x1a, 0x46, 0x0a, 0x18, 0x52, 0x6f, 0x77, 0x73, 0x41, 0x66, 0x66, 0x65, 0x63, 0x74, 0x65,
+	0x64, 0x42, 0x79, 0x53, 0x68, 0x61, 0x72, 0x64, 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, 0x04, 0x52, 0x05,
+	0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0xdb, 0x01, 0x0a, 0x13, 0x41, 0x70,
+	0x70, 0x6c, 0x79, 0x56, 0x53, 0x63, 0x68, 0x65, 0x6d, 0x61, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73,
+	0x74, 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, 0x21, 0x0a,
 	0x0c, 0x73, 0x6b, 0x69, 0x70, 0x5f, 0x72, 0x65, 0x62, 0x75, 0x69, 0x6c, 0x64, 0x18, 0x02, 0x20,
 	0x01, 0x28, 0x08, 0x52, 0x0b, 0x73, 0x6b, 0x69, 0x70, 0x52, 0x65, 0x62, 0x75, 0x69, 0x6c, 0x64,
-	0x12, 0x23, 0x0a, 0x0d, 0x72, 0x65, 0x62, 0x75, 0x69, 0x6c, 0x64, 0x5f, 0x63, 0x65, 0x6c, 0x6c,
-	0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0c, 0x72, 0x65, 0x62, 0x75, 0x69, 0x6c, 0x64,
-	0x43, 0x65, 0x6c, 0x6c, 0x73, 0x22, 0x20, 0x0a, 0x1e, 0x41, 0x70, 0x70, 0x6c, 0x79, 0x53, 0x68,
-	0x61, 0x72, 0x64, 0x52, 0x6f, 0x75, 0x74, 0x69, 0x6e, 0x67, 0x52, 0x75, 0x6c, 0x65, 0x73, 0x52,
-	0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0xce, 0x02, 0x0a, 0x12, 0x41, 0x70, 0x70, 0x6c,
-	0x79, 0x53, 0x63, 0x68, 0x65, 0x6d, 0x61, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 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, 0x10, 0x0a, 0x03, 0x73, 0x71,
-	0x6c, 0x18, 0x03, 0x20, 0x03, 0x28, 0x09, 0x52, 0x03, 0x73, 0x71, 0x6c, 0x12, 0x21, 0x0a, 0x0c,
-	0x64, 0x64, 0x6c, 0x5f, 0x73, 0x74, 0x72, 0x61, 0x74, 0x65, 0x67, 0x79, 0x18, 0x04, 0x20, 0x01,
-	0x28, 0x09, 0x52, 0x0b, 0x64, 0x64, 0x6c, 0x53, 0x74, 0x72, 0x61, 0x74, 0x65, 0x67, 0x79, 0x12,
-	0x1b, 0x0a, 0x09, 0x75, 0x75, 0x69, 0x64, 0x5f, 0x6c, 0x69, 0x73, 0x74, 0x18, 0x05, 0x20, 0x03,
-	0x28, 0x09, 0x52, 0x08, 0x75, 0x75, 0x69, 0x64, 0x4c, 0x69, 0x73, 0x74, 0x12, 0x2b, 0x0a, 0x11,
-	0x6d, 0x69, 0x67, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x78,
-	0x74, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x10, 0x6d, 0x69, 0x67, 0x72, 0x61, 0x74, 0x69,
-	0x6f, 0x6e, 0x43, 0x6f, 0x6e, 0x74, 0x65, 0x78, 0x74, 0x12, 0x44, 0x0a, 0x15, 0x77, 0x61, 0x69,
-	0x74, 0x5f, 0x72, 0x65, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x73, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x6f,
-	0x75, 0x74, 0x18, 0x07, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x76, 0x74, 0x74, 0x69, 0x6d,
-	0x65, 0x2e, 0x44, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x13, 0x77, 0x61, 0x69, 0x74,
-	0x52, 0x65, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x73, 0x54, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x12,
-	0x2c, 0x0a, 0x09, 0x63, 0x61, 0x6c, 0x6c, 0x65, 0x72, 0x5f, 0x69, 0x64, 0x18, 0x09, 0x20, 0x01,
-	0x28, 0x0b, 0x32, 0x0f, 0x2e, 0x76, 0x74, 0x72, 0x70, 0x63, 0x2e, 0x43, 0x61, 0x6c, 0x6c, 0x65,
-	0x72, 0x49, 0x44, 0x52, 0x08, 0x63, 0x61, 0x6c, 0x6c, 0x65, 0x72, 0x49, 0x64, 0x12, 0x1d, 0x0a,
-	0x0a, 0x62, 0x61, 0x74, 0x63, 0x68, 0x5f, 0x73, 0x69, 0x7a, 0x65, 0x18, 0x0a, 0x20, 0x01, 0x28,
-	0x03, 0x52, 0x09, 0x62, 0x61, 0x74, 0x63, 0x68, 0x53, 0x69, 0x7a, 0x65, 0x4a, 0x04, 0x08, 0x02,
-	0x10, 0x03, 0x4a, 0x04, 0x08, 0x08, 0x10, 0x09, 0x22, 0xe8, 0x01, 0x0a, 0x13, 0x41, 0x70, 0x70,
-	0x6c, 0x79, 0x53, 0x63, 0x68, 0x65, 0x6d, 0x61, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65,
-	0x12, 0x1b, 0x0a, 0x09, 0x75, 0x75, 0x69, 0x64, 0x5f, 0x6c, 0x69, 0x73, 0x74, 0x18, 0x01, 0x20,
-	0x03, 0x28, 0x09, 0x52, 0x08, 0x75, 0x75, 0x69, 0x64, 0x4c, 0x69, 0x73, 0x74, 0x12, 0x6c, 0x0a,
-	0x16, 0x72, 0x6f, 0x77, 0x73, 0x5f, 0x61, 0x66, 0x66, 0x65, 0x63, 0x74, 0x65, 0x64, 0x5f, 0x62,
-	0x79, 0x5f, 0x73, 0x68, 0x61, 0x72, 0x64, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x37, 0x2e,
-	0x76, 0x74, 0x63, 0x74, 0x6c, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x41, 0x70, 0x70, 0x6c, 0x79, 0x53,
-	0x63, 0x68, 0x65, 0x6d, 0x61, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x2e, 0x52, 0x6f,
-	0x77, 0x73, 0x41, 0x66, 0x66, 0x65, 0x63, 0x74, 0x65, 0x64, 0x42, 0x79, 0x53, 0x68, 0x61, 0x72,
-	0x64, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x13, 0x72, 0x6f, 0x77, 0x73, 0x41, 0x66, 0x66, 0x65,
-	0x63, 0x74, 0x65, 0x64, 0x42, 0x79, 0x53, 0x68, 0x61, 0x72, 0x64, 0x1a, 0x46, 0x0a, 0x18, 0x52,
-	0x6f, 0x77, 0x73, 0x41, 0x66, 0x66, 0x65, 0x63, 0x74, 0x65, 0x64, 0x42, 0x79, 0x53, 0x68, 0x61,
-	0x72, 0x64, 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, 0x04, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a,
-	0x02, 0x38, 0x01, 0x22, 0xdb, 0x01, 0x0a, 0x13, 0x41, 0x70, 0x70, 0x6c, 0x79, 0x56, 0x53, 0x63,
-	0x68, 0x65, 0x6d, 0x61, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 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, 0x21, 0x0a, 0x0c, 0x73, 0x6b, 0x69, 0x70, 0x5f,
-	0x72, 0x65, 0x62, 0x75, 0x69, 0x6c, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0b, 0x73,
-	0x6b, 0x69, 0x70, 0x52, 0x65, 0x62, 0x75, 0x69, 0x6c, 0x64, 0x12, 0x17, 0x0a, 0x07, 0x64, 0x72,
-	0x79, 0x5f, 0x72, 0x75, 0x6e, 0x18, 0x03, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x64, 0x72, 0x79,
-	0x52, 0x75, 0x6e, 0x12, 0x14, 0x0a, 0x05, 0x63, 0x65, 0x6c, 0x6c, 0x73, 0x18, 0x04, 0x20, 0x03,
-	0x28, 0x09, 0x52, 0x05, 0x63, 0x65, 0x6c, 0x6c, 0x73, 0x12, 0x2c, 0x0a, 0x08, 0x76, 0x5f, 0x73,
-	0x63, 0x68, 0x65, 0x6d, 0x61, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x11, 0x2e, 0x76, 0x73,
-	0x63, 0x68, 0x65, 0x6d, 0x61, 0x2e, 0x4b, 0x65, 0x79, 0x73, 0x70, 0x61, 0x63, 0x65, 0x52, 0x07,
-	0x76, 0x53, 0x63, 0x68, 0x65, 0x6d, 0x61, 0x12, 0x10, 0x0a, 0x03, 0x73, 0x71, 0x6c, 0x18, 0x06,
-	0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x73, 0x71, 0x6c, 0x12, 0x16, 0x0a, 0x06, 0x73, 0x74, 0x72,
-	0x69, 0x63, 0x74, 0x18, 0x07, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x73, 0x74, 0x72, 0x69, 0x63,
-	0x74, 0x22, 0xca, 0x02, 0x0a, 0x14, 0x41, 0x70, 0x70, 0x6c, 0x79, 0x56, 0x53, 0x63, 0x68, 0x65,
-	0x6d, 0x61, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x2c, 0x0a, 0x08, 0x76, 0x5f,
-	0x73, 0x63, 0x68, 0x65, 0x6d, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x11, 0x2e, 0x76,
-	0x73, 0x63, 0x68, 0x65, 0x6d, 0x61, 0x2e, 0x4b, 0x65, 0x79, 0x73, 0x70, 0x61, 0x63, 0x65, 0x52,
-	0x07, 0x76, 0x53, 0x63, 0x68, 0x65, 0x6d, 0x61, 0x12, 0x6c, 0x0a, 0x15, 0x75, 0x6e, 0x6b, 0x6e,
-	0x6f, 0x77, 0x6e, 0x5f, 0x76, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x5f, 0x70, 0x61, 0x72, 0x61, 0x6d,
-	0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x38, 0x2e, 0x76, 0x74, 0x63, 0x74, 0x6c, 0x64,
-	0x61, 0x74, 0x61, 0x2e, 0x41, 0x70, 0x70, 0x6c, 0x79, 0x56, 0x53, 0x63, 0x68, 0x65, 0x6d, 0x61,
-	0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x2e, 0x55, 0x6e, 0x6b, 0x6e, 0x6f, 0x77, 0x6e,
-	0x56, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x73, 0x45, 0x6e, 0x74, 0x72,
-	0x79, 0x52, 0x13, 0x75, 0x6e, 0x6b, 0x6e, 0x6f, 0x77, 0x6e, 0x56, 0x69, 0x6e, 0x64, 0x65, 0x78,
-	0x50, 0x61, 0x72, 0x61, 0x6d, 0x73, 0x1a, 0x71, 0x0a, 0x18, 0x55, 0x6e, 0x6b, 0x6e, 0x6f, 0x77,
-	0x6e, 0x56, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x50, 0x61, 0x72, 0x61, 0x6d, 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, 0x3f, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20,
-	0x01, 0x28, 0x0b, 0x32, 0x29, 0x2e, 0x76, 0x74, 0x63, 0x74, 0x6c, 0x64, 0x61, 0x74, 0x61, 0x2e,
-	0x41, 0x70, 0x70, 0x6c, 0x79, 0x56, 0x53, 0x63, 0x68, 0x65, 0x6d, 0x61, 0x52, 0x65, 0x73, 0x70,
-	0x6f, 0x6e, 0x73, 0x65, 0x2e, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x05,
-	0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x23, 0x0a, 0x09, 0x50, 0x61, 0x72,
-	0x61, 0x6d, 0x4c, 0x69, 0x73, 0x74, 0x12, 0x16, 0x0a, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x73,
-	0x18, 0x01, 0x20, 0x03, 0x28, 0x09, 0x52, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x73, 0x22, 0xa1,
-	0x02, 0x0a, 0x0d, 0x42, 0x61, 0x63, 0x6b, 0x75, 0x70, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74,
-	0x12, 0x38, 0x0a, 0x0c, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x5f, 0x61, 0x6c, 0x69, 0x61, 0x73,
-	0x18, 0x01, 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, 0x23, 0x0a, 0x0d, 0x61, 0x6c,
-	0x6c, 0x6f, 0x77, 0x5f, 0x70, 0x72, 0x69, 0x6d, 0x61, 0x72, 0x79, 0x18, 0x02, 0x20, 0x01, 0x28,
-	0x08, 0x52, 0x0c, 0x61, 0x6c, 0x6c, 0x6f, 0x77, 0x50, 0x72, 0x69, 0x6d, 0x61, 0x72, 0x79, 0x12,
-	0x20, 0x0a, 0x0b, 0x63, 0x6f, 0x6e, 0x63, 0x75, 0x72, 0x72, 0x65, 0x6e, 0x63, 0x79, 0x18, 0x03,
-	0x20, 0x01, 0x28, 0x05, 0x52, 0x0b, 0x63, 0x6f, 0x6e, 0x63, 0x75, 0x72, 0x72, 0x65, 0x6e, 0x63,
-	0x79, 0x12, 0x30, 0x0a, 0x14, 0x69, 0x6e, 0x63, 0x72, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x61, 0x6c,
-	0x5f, 0x66, 0x72, 0x6f, 0x6d, 0x5f, 0x70, 0x6f, 0x73, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52,
-	0x12, 0x69, 0x6e, 0x63, 0x72, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x61, 0x6c, 0x46, 0x72, 0x6f, 0x6d,
-	0x50, 0x6f, 0x73, 0x12, 0x21, 0x0a, 0x0c, 0x75, 0x70, 0x67, 0x72, 0x61, 0x64, 0x65, 0x5f, 0x73,
-	0x61, 0x66, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0b, 0x75, 0x70, 0x67, 0x72, 0x61,
-	0x64, 0x65, 0x53, 0x61, 0x66, 0x65, 0x12, 0x28, 0x0a, 0x0d, 0x62, 0x61, 0x63, 0x6b, 0x75, 0x70,
-	0x5f, 0x65, 0x6e, 0x67, 0x69, 0x6e, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x48, 0x00, 0x52,
-	0x0c, 0x62, 0x61, 0x63, 0x6b, 0x75, 0x70, 0x45, 0x6e, 0x67, 0x69, 0x6e, 0x65, 0x88, 0x01, 0x01,
-	0x42, 0x10, 0x0a, 0x0e, 0x5f, 0x62, 0x61, 0x63, 0x6b, 0x75, 0x70, 0x5f, 0x65, 0x6e, 0x67, 0x69,
-	0x6e, 0x65, 0x22, 0xa2, 0x01, 0x0a, 0x0e, 0x42, 0x61, 0x63, 0x6b, 0x75, 0x70, 0x52, 0x65, 0x73,
-	0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x38, 0x0a, 0x0c, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x5f,
-	0x61, 0x6c, 0x69, 0x61, 0x73, 0x18, 0x01, 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,
-	0x1a, 0x0a, 0x08, 0x6b, 0x65, 0x79, 0x73, 0x70, 0x61, 0x63, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28,
-	0x09, 0x52, 0x08, 0x6b, 0x65, 0x79, 0x73, 0x70, 0x61, 0x63, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x73,
-	0x68, 0x61, 0x72, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x73, 0x68, 0x61, 0x72,
-	0x64, 0x12, 0x24, 0x0a, 0x05, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b,
-	0x32, 0x0e, 0x2e, 0x6c, 0x6f, 0x67, 0x75, 0x74, 0x69, 0x6c, 0x2e, 0x45, 0x76, 0x65, 0x6e, 0x74,
-	0x52, 0x05, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x22, 0xe2, 0x01, 0x0a, 0x12, 0x42, 0x61, 0x63, 0x6b,
-	0x75, 0x70, 0x53, 0x68, 0x61, 0x72, 0x64, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 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, 0x17, 0x0a, 0x07, 0x64, 0x72, 0x79, 0x5f, 0x72, 0x75, 0x6e, 0x18, 0x03, 0x20, 0x01, 0x28,
+	0x08, 0x52, 0x06, 0x64, 0x72, 0x79, 0x52, 0x75, 0x6e, 0x12, 0x14, 0x0a, 0x05, 0x63, 0x65, 0x6c,
+	0x6c, 0x73, 0x18, 0x04, 0x20, 0x03, 0x28, 0x09, 0x52, 0x05, 0x63, 0x65, 0x6c, 0x6c, 0x73, 0x12,
+	0x2c, 0x0a, 0x08, 0x76, 0x5f, 0x73, 0x63, 0x68, 0x65, 0x6d, 0x61, 0x18, 0x05, 0x20, 0x01, 0x28,
+	0x0b, 0x32, 0x11, 0x2e, 0x76, 0x73, 0x63, 0x68, 0x65, 0x6d, 0x61, 0x2e, 0x4b, 0x65, 0x79, 0x73,
+	0x70, 0x61, 0x63, 0x65, 0x52, 0x07, 0x76, 0x53, 0x63, 0x68, 0x65, 0x6d, 0x61, 0x12, 0x10, 0x0a,
+	0x03, 0x73, 0x71, 0x6c, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x73, 0x71, 0x6c, 0x12,
+	0x16, 0x0a, 0x06, 0x73, 0x74, 0x72, 0x69, 0x63, 0x74, 0x18, 0x07, 0x20, 0x01, 0x28, 0x08, 0x52,
+	0x06, 0x73, 0x74, 0x72, 0x69, 0x63, 0x74, 0x22, 0xca, 0x02, 0x0a, 0x14, 0x41, 0x70, 0x70, 0x6c,
+	0x79, 0x56, 0x53, 0x63, 0x68, 0x65, 0x6d, 0x61, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65,
+	0x12, 0x2c, 0x0a, 0x08, 0x76, 0x5f, 0x73, 0x63, 0x68, 0x65, 0x6d, 0x61, 0x18, 0x01, 0x20, 0x01,
+	0x28, 0x0b, 0x32, 0x11, 0x2e, 0x76, 0x73, 0x63, 0x68, 0x65, 0x6d, 0x61, 0x2e, 0x4b, 0x65, 0x79,
+	0x73, 0x70, 0x61, 0x63, 0x65, 0x52, 0x07, 0x76, 0x53, 0x63, 0x68, 0x65, 0x6d, 0x61, 0x12, 0x6c,
+	0x0a, 0x15, 0x75, 0x6e, 0x6b, 0x6e, 0x6f, 0x77, 0x6e, 0x5f, 0x76, 0x69, 0x6e, 0x64, 0x65, 0x78,
+	0x5f, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x38, 0x2e,
+	0x76, 0x74, 0x63, 0x74, 0x6c, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x41, 0x70, 0x70, 0x6c, 0x79, 0x56,
+	0x53, 0x63, 0x68, 0x65, 0x6d, 0x61, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x2e, 0x55,
+	0x6e, 0x6b, 0x6e, 0x6f, 0x77, 0x6e, 0x56, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x50, 0x61, 0x72, 0x61,
+	0x6d, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x13, 0x75, 0x6e, 0x6b, 0x6e, 0x6f, 0x77, 0x6e,
+	0x56, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x73, 0x1a, 0x71, 0x0a, 0x18,
+	0x55, 0x6e, 0x6b, 0x6e, 0x6f, 0x77, 0x6e, 0x56, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x50, 0x61, 0x72,
+	0x61, 0x6d, 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, 0x3f, 0x0a, 0x05, 0x76, 0x61,
+	0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x29, 0x2e, 0x76, 0x74, 0x63, 0x74,
+	0x6c, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x41, 0x70, 0x70, 0x6c, 0x79, 0x56, 0x53, 0x63, 0x68, 0x65,
+	0x6d, 0x61, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x2e, 0x50, 0x61, 0x72, 0x61, 0x6d,
+	0x4c, 0x69, 0x73, 0x74, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a,
+	0x23, 0x0a, 0x09, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x4c, 0x69, 0x73, 0x74, 0x12, 0x16, 0x0a, 0x06,
+	0x70, 0x61, 0x72, 0x61, 0x6d, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x09, 0x52, 0x06, 0x70, 0x61,
+	0x72, 0x61, 0x6d, 0x73, 0x22, 0xa1, 0x02, 0x0a, 0x0d, 0x42, 0x61, 0x63, 0x6b, 0x75, 0x70, 0x52,
+	0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x38, 0x0a, 0x0c, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x74,
+	0x5f, 0x61, 0x6c, 0x69, 0x61, 0x73, 0x18, 0x01, 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, 0x23, 0x0a, 0x0d, 0x61, 0x6c, 0x6c, 0x6f, 0x77, 0x5f, 0x70, 0x72, 0x69, 0x6d, 0x61, 0x72,
-	0x79, 0x18, 0x03, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0c, 0x61, 0x6c, 0x6c, 0x6f, 0x77, 0x50, 0x72,
+	0x79, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0c, 0x61, 0x6c, 0x6c, 0x6f, 0x77, 0x50, 0x72,
 	0x69, 0x6d, 0x61, 0x72, 0x79, 0x12, 0x20, 0x0a, 0x0b, 0x63, 0x6f, 0x6e, 0x63, 0x75, 0x72, 0x72,
-	0x65, 0x6e, 0x63, 0x79, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0b, 0x63, 0x6f, 0x6e, 0x63,
-	0x75, 0x72, 0x72, 0x65, 0x6e, 0x63, 0x79, 0x12, 0x21, 0x0a, 0x0c, 0x75, 0x70, 0x67, 0x72, 0x61,
-	0x64, 0x65, 0x5f, 0x73, 0x61, 0x66, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0b, 0x75,
-	0x70, 0x67, 0x72, 0x61, 0x64, 0x65, 0x53, 0x61, 0x66, 0x65, 0x12, 0x30, 0x0a, 0x14, 0x69, 0x6e,
-	0x63, 0x72, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x61, 0x6c, 0x5f, 0x66, 0x72, 0x6f, 0x6d, 0x5f, 0x70,
-	0x6f, 0x73, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x12, 0x69, 0x6e, 0x63, 0x72, 0x65, 0x6d,
-	0x65, 0x6e, 0x74, 0x61, 0x6c, 0x46, 0x72, 0x6f, 0x6d, 0x50, 0x6f, 0x73, 0x22, 0x4e, 0x0a, 0x1c,
-	0x43, 0x61, 0x6e, 0x63, 0x65, 0x6c, 0x53, 0x63, 0x68, 0x65, 0x6d, 0x61, 0x4d, 0x69, 0x67, 0x72,
-	0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 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, 0x12, 0x0a, 0x04, 0x75, 0x75, 0x69, 0x64,
-	0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x75, 0x75, 0x69, 0x64, 0x22, 0xdf, 0x01, 0x0a,
-	0x1d, 0x43, 0x61, 0x6e, 0x63, 0x65, 0x6c, 0x53, 0x63, 0x68, 0x65, 0x6d, 0x61, 0x4d, 0x69, 0x67,
-	0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x76,
-	0x0a, 0x16, 0x72, 0x6f, 0x77, 0x73, 0x5f, 0x61, 0x66, 0x66, 0x65, 0x63, 0x74, 0x65, 0x64, 0x5f,
-	0x62, 0x79, 0x5f, 0x73, 0x68, 0x61, 0x72, 0x64, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x41,
-	0x2e, 0x76, 0x74, 0x63, 0x74, 0x6c, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x43, 0x61, 0x6e, 0x63, 0x65,
-	0x6c, 0x53, 0x63, 0x68, 0x65, 0x6d, 0x61, 0x4d, 0x69, 0x67, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e,
-	0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x2e, 0x52, 0x6f, 0x77, 0x73, 0x41, 0x66, 0x66,
-	0x65, 0x63, 0x74, 0x65, 0x64, 0x42, 0x79, 0x53, 0x68, 0x61, 0x72, 0x64, 0x45, 0x6e, 0x74, 0x72,
-	0x79, 0x52, 0x13, 0x72, 0x6f, 0x77, 0x73, 0x41, 0x66, 0x66, 0x65, 0x63, 0x74, 0x65, 0x64, 0x42,
-	0x79, 0x53, 0x68, 0x61, 0x72, 0x64, 0x1a, 0x46, 0x0a, 0x18, 0x52, 0x6f, 0x77, 0x73, 0x41, 0x66,
-	0x66, 0x65, 0x63, 0x74, 0x65, 0x64, 0x42, 0x79, 0x53, 0x68, 0x61, 0x72, 0x64, 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, 0x04, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0xe8,
-	0x01, 0x0a, 0x17, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x54,
-	0x61, 0x67, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x38, 0x0a, 0x0c, 0x74, 0x61,
-	0x62, 0x6c, 0x65, 0x74, 0x5f, 0x61, 0x6c, 0x69, 0x61, 0x73, 0x18, 0x01, 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, 0x40, 0x0a, 0x04, 0x74, 0x61, 0x67, 0x73, 0x18, 0x02, 0x20, 0x03,
-	0x28, 0x0b, 0x32, 0x2c, 0x2e, 0x76, 0x74, 0x63, 0x74, 0x6c, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x43,
-	0x68, 0x61, 0x6e, 0x67, 0x65, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x54, 0x61, 0x67, 0x73, 0x52,
-	0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x2e, 0x54, 0x61, 0x67, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79,
-	0x52, 0x04, 0x74, 0x61, 0x67, 0x73, 0x12, 0x18, 0x0a, 0x07, 0x72, 0x65, 0x70, 0x6c, 0x61, 0x63,
-	0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x08, 0x52, 0x07, 0x72, 0x65, 0x70, 0x6c, 0x61, 0x63, 0x65,
-	0x1a, 0x37, 0x0a, 0x09, 0x54, 0x61, 0x67, 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, 0xc0, 0x02, 0x0a, 0x18, 0x43, 0x68,
-	0x61, 0x6e, 0x67, 0x65, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x54, 0x61, 0x67, 0x73, 0x52, 0x65,
-	0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x54, 0x0a, 0x0b, 0x62, 0x65, 0x66, 0x6f, 0x72, 0x65,
-	0x5f, 0x74, 0x61, 0x67, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x33, 0x2e, 0x76, 0x74,
-	0x63, 0x74, 0x6c, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x54, 0x61,
-	0x62, 0x6c, 0x65, 0x74, 0x54, 0x61, 0x67, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65,
-	0x2e, 0x42, 0x65, 0x66, 0x6f, 0x72, 0x65, 0x54, 0x61, 0x67, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79,
-	0x52, 0x0a, 0x62, 0x65, 0x66, 0x6f, 0x72, 0x65, 0x54, 0x61, 0x67, 0x73, 0x12, 0x51, 0x0a, 0x0a,
-	0x61, 0x66, 0x74, 0x65, 0x72, 0x5f, 0x74, 0x61, 0x67, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b,
-	0x32, 0x32, 0x2e, 0x76, 0x74, 0x63, 0x74, 0x6c, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x43, 0x68, 0x61,
-	0x6e, 0x67, 0x65, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x54, 0x61, 0x67, 0x73, 0x52, 0x65, 0x73,
-	0x70, 0x6f, 0x6e, 0x73, 0x65, 0x2e, 0x41, 0x66, 0x74, 0x65, 0x72, 0x54, 0x61, 0x67, 0x73, 0x45,
-	0x6e, 0x74, 0x72, 0x79, 0x52, 0x09, 0x61, 0x66, 0x74, 0x65, 0x72, 0x54, 0x61, 0x67, 0x73, 0x1a,
-	0x3d, 0x0a, 0x0f, 0x42, 0x65, 0x66, 0x6f, 0x72, 0x65, 0x54, 0x61, 0x67, 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, 0x1a, 0x3c,
-	0x0a, 0x0e, 0x41, 0x66, 0x74, 0x65, 0x72, 0x54, 0x61, 0x67, 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, 0x9b, 0x01, 0x0a,
-	0x17, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x54, 0x79, 0x70,
-	0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x38, 0x0a, 0x0c, 0x74, 0x61, 0x62, 0x6c,
-	0x65, 0x74, 0x5f, 0x61, 0x6c, 0x69, 0x61, 0x73, 0x18, 0x01, 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, 0x2d, 0x0a, 0x07, 0x64, 0x62, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x18, 0x02, 0x20,
-	0x01, 0x28, 0x0e, 0x32, 0x14, 0x2e, 0x74, 0x6f, 0x70, 0x6f, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x54,
-	0x61, 0x62, 0x6c, 0x65, 0x74, 0x54, 0x79, 0x70, 0x65, 0x52, 0x06, 0x64, 0x62, 0x54, 0x79, 0x70,
-	0x65, 0x12, 0x17, 0x0a, 0x07, 0x64, 0x72, 0x79, 0x5f, 0x72, 0x75, 0x6e, 0x18, 0x03, 0x20, 0x01,
-	0x28, 0x08, 0x52, 0x06, 0x64, 0x72, 0x79, 0x52, 0x75, 0x6e, 0x22, 0xa6, 0x01, 0x0a, 0x18, 0x43,
-	0x68, 0x61, 0x6e, 0x67, 0x65, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x54, 0x79, 0x70, 0x65, 0x52,
-	0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x35, 0x0a, 0x0d, 0x62, 0x65, 0x66, 0x6f, 0x72,
-	0x65, 0x5f, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x10,
-	0x2e, 0x74, 0x6f, 0x70, 0x6f, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x74,
-	0x52, 0x0c, 0x62, 0x65, 0x66, 0x6f, 0x72, 0x65, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x12, 0x33,
-	0x0a, 0x0c, 0x61, 0x66, 0x74, 0x65, 0x72, 0x5f, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x18, 0x02,
-	0x20, 0x01, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x74, 0x6f, 0x70, 0x6f, 0x64, 0x61, 0x74, 0x61, 0x2e,
-	0x54, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x52, 0x0b, 0x61, 0x66, 0x74, 0x65, 0x72, 0x54, 0x61, 0x62,
-	0x6c, 0x65, 0x74, 0x12, 0x1e, 0x0a, 0x0b, 0x77, 0x61, 0x73, 0x5f, 0x64, 0x72, 0x79, 0x5f, 0x72,
-	0x75, 0x6e, 0x18, 0x03, 0x20, 0x01, 0x28, 0x08, 0x52, 0x09, 0x77, 0x61, 0x73, 0x44, 0x72, 0x79,
-	0x52, 0x75, 0x6e, 0x22, 0xe3, 0x01, 0x0a, 0x15, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x54, 0x68, 0x72,
-	0x6f, 0x74, 0x74, 0x6c, 0x65, 0x72, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x38, 0x0a,
-	0x0c, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x5f, 0x61, 0x6c, 0x69, 0x61, 0x73, 0x18, 0x01, 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, 0x19, 0x0a, 0x08, 0x61, 0x70, 0x70, 0x5f, 0x6e,
-	0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x61, 0x70, 0x70, 0x4e, 0x61,
-	0x6d, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x63, 0x6f, 0x70, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28,
-	0x09, 0x52, 0x05, 0x73, 0x63, 0x6f, 0x70, 0x65, 0x12, 0x36, 0x0a, 0x17, 0x73, 0x6b, 0x69, 0x70,
-	0x5f, 0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x5f, 0x68, 0x65, 0x61, 0x72, 0x74, 0x62, 0x65,
-	0x61, 0x74, 0x73, 0x18, 0x04, 0x20, 0x01, 0x28, 0x08, 0x52, 0x15, 0x73, 0x6b, 0x69, 0x70, 0x52,
-	0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x48, 0x65, 0x61, 0x72, 0x74, 0x62, 0x65, 0x61, 0x74, 0x73,
-	0x12, 0x27, 0x0a, 0x10, 0x6f, 0x6b, 0x5f, 0x69, 0x66, 0x5f, 0x6e, 0x6f, 0x74, 0x5f, 0x65, 0x78,
-	0x69, 0x73, 0x74, 0x73, 0x18, 0x05, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0d, 0x6f, 0x6b, 0x49, 0x66,
-	0x4e, 0x6f, 0x74, 0x45, 0x78, 0x69, 0x73, 0x74, 0x73, 0x22, 0x93, 0x01, 0x0a, 0x16, 0x43, 0x68,
-	0x65, 0x63, 0x6b, 0x54, 0x68, 0x72, 0x6f, 0x74, 0x74, 0x6c, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70,
-	0x6f, 0x6e, 0x73, 0x65, 0x12, 0x38, 0x0a, 0x0c, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x5f, 0x61,
-	0x6c, 0x69, 0x61, 0x73, 0x18, 0x01, 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, 0x3f,
-	0x0a, 0x05, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x29, 0x2e,
-	0x74, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x6d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x72, 0x64, 0x61, 0x74,
-	0x61, 0x2e, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x54, 0x68, 0x72, 0x6f, 0x74, 0x74, 0x6c, 0x65, 0x72,
-	0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x52, 0x05, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x22,
-	0x4f, 0x0a, 0x1d, 0x43, 0x6c, 0x65, 0x61, 0x6e, 0x75, 0x70, 0x53, 0x63, 0x68, 0x65, 0x6d, 0x61,
-	0x4d, 0x69, 0x67, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74,
-	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, 0x12, 0x0a, 0x04,
-	0x75, 0x75, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x75, 0x75, 0x69, 0x64,
-	0x22, 0xe1, 0x01, 0x0a, 0x1e, 0x43, 0x6c, 0x65, 0x61, 0x6e, 0x75, 0x70, 0x53, 0x63, 0x68, 0x65,
-	0x6d, 0x61, 0x4d, 0x69, 0x67, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f,
-	0x6e, 0x73, 0x65, 0x12, 0x77, 0x0a, 0x16, 0x72, 0x6f, 0x77, 0x73, 0x5f, 0x61, 0x66, 0x66, 0x65,
-	0x63, 0x74, 0x65, 0x64, 0x5f, 0x62, 0x79, 0x5f, 0x73, 0x68, 0x61, 0x72, 0x64, 0x18, 0x01, 0x20,
-	0x03, 0x28, 0x0b, 0x32, 0x42, 0x2e, 0x76, 0x74, 0x63, 0x74, 0x6c, 0x64, 0x61, 0x74, 0x61, 0x2e,
-	0x43, 0x6c, 0x65, 0x61, 0x6e, 0x75, 0x70, 0x53, 0x63, 0x68, 0x65, 0x6d, 0x61, 0x4d, 0x69, 0x67,
+	0x65, 0x6e, 0x63, 0x79, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0b, 0x63, 0x6f, 0x6e, 0x63,
+	0x75, 0x72, 0x72, 0x65, 0x6e, 0x63, 0x79, 0x12, 0x30, 0x0a, 0x14, 0x69, 0x6e, 0x63, 0x72, 0x65,
+	0x6d, 0x65, 0x6e, 0x74, 0x61, 0x6c, 0x5f, 0x66, 0x72, 0x6f, 0x6d, 0x5f, 0x70, 0x6f, 0x73, 0x18,
+	0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x12, 0x69, 0x6e, 0x63, 0x72, 0x65, 0x6d, 0x65, 0x6e, 0x74,
+	0x61, 0x6c, 0x46, 0x72, 0x6f, 0x6d, 0x50, 0x6f, 0x73, 0x12, 0x21, 0x0a, 0x0c, 0x75, 0x70, 0x67,
+	0x72, 0x61, 0x64, 0x65, 0x5f, 0x73, 0x61, 0x66, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x08, 0x52,
+	0x0b, 0x75, 0x70, 0x67, 0x72, 0x61, 0x64, 0x65, 0x53, 0x61, 0x66, 0x65, 0x12, 0x28, 0x0a, 0x0d,
+	0x62, 0x61, 0x63, 0x6b, 0x75, 0x70, 0x5f, 0x65, 0x6e, 0x67, 0x69, 0x6e, 0x65, 0x18, 0x06, 0x20,
+	0x01, 0x28, 0x09, 0x48, 0x00, 0x52, 0x0c, 0x62, 0x61, 0x63, 0x6b, 0x75, 0x70, 0x45, 0x6e, 0x67,
+	0x69, 0x6e, 0x65, 0x88, 0x01, 0x01, 0x42, 0x10, 0x0a, 0x0e, 0x5f, 0x62, 0x61, 0x63, 0x6b, 0x75,
+	0x70, 0x5f, 0x65, 0x6e, 0x67, 0x69, 0x6e, 0x65, 0x22, 0xa2, 0x01, 0x0a, 0x0e, 0x42, 0x61, 0x63,
+	0x6b, 0x75, 0x70, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x38, 0x0a, 0x0c, 0x74,
+	0x61, 0x62, 0x6c, 0x65, 0x74, 0x5f, 0x61, 0x6c, 0x69, 0x61, 0x73, 0x18, 0x01, 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, 0x1a, 0x0a, 0x08, 0x6b, 0x65, 0x79, 0x73, 0x70, 0x61, 0x63,
+	0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x6b, 0x65, 0x79, 0x73, 0x70, 0x61, 0x63,
+	0x65, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x68, 0x61, 0x72, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09,
+	0x52, 0x05, 0x73, 0x68, 0x61, 0x72, 0x64, 0x12, 0x24, 0x0a, 0x05, 0x65, 0x76, 0x65, 0x6e, 0x74,
+	0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x6c, 0x6f, 0x67, 0x75, 0x74, 0x69, 0x6c,
+	0x2e, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x52, 0x05, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x22, 0xe2, 0x01,
+	0x0a, 0x12, 0x42, 0x61, 0x63, 0x6b, 0x75, 0x70, 0x53, 0x68, 0x61, 0x72, 0x64, 0x52, 0x65, 0x71,
+	0x75, 0x65, 0x73, 0x74, 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, 0x23, 0x0a, 0x0d, 0x61, 0x6c, 0x6c, 0x6f, 0x77, 0x5f,
+	0x70, 0x72, 0x69, 0x6d, 0x61, 0x72, 0x79, 0x18, 0x03, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0c, 0x61,
+	0x6c, 0x6c, 0x6f, 0x77, 0x50, 0x72, 0x69, 0x6d, 0x61, 0x72, 0x79, 0x12, 0x20, 0x0a, 0x0b, 0x63,
+	0x6f, 0x6e, 0x63, 0x75, 0x72, 0x72, 0x65, 0x6e, 0x63, 0x79, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05,
+	0x52, 0x0b, 0x63, 0x6f, 0x6e, 0x63, 0x75, 0x72, 0x72, 0x65, 0x6e, 0x63, 0x79, 0x12, 0x21, 0x0a,
+	0x0c, 0x75, 0x70, 0x67, 0x72, 0x61, 0x64, 0x65, 0x5f, 0x73, 0x61, 0x66, 0x65, 0x18, 0x05, 0x20,
+	0x01, 0x28, 0x08, 0x52, 0x0b, 0x75, 0x70, 0x67, 0x72, 0x61, 0x64, 0x65, 0x53, 0x61, 0x66, 0x65,
+	0x12, 0x30, 0x0a, 0x14, 0x69, 0x6e, 0x63, 0x72, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x61, 0x6c, 0x5f,
+	0x66, 0x72, 0x6f, 0x6d, 0x5f, 0x70, 0x6f, 0x73, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x12,
+	0x69, 0x6e, 0x63, 0x72, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x61, 0x6c, 0x46, 0x72, 0x6f, 0x6d, 0x50,
+	0x6f, 0x73, 0x22, 0x4e, 0x0a, 0x1c, 0x43, 0x61, 0x6e, 0x63, 0x65, 0x6c, 0x53, 0x63, 0x68, 0x65,
+	0x6d, 0x61, 0x4d, 0x69, 0x67, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x71, 0x75, 0x65,
+	0x73, 0x74, 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, 0x12,
+	0x0a, 0x04, 0x75, 0x75, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x75, 0x75,
+	0x69, 0x64, 0x22, 0xdf, 0x01, 0x0a, 0x1d, 0x43, 0x61, 0x6e, 0x63, 0x65, 0x6c, 0x53, 0x63, 0x68,
+	0x65, 0x6d, 0x61, 0x4d, 0x69, 0x67, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70,
+	0x6f, 0x6e, 0x73, 0x65, 0x12, 0x76, 0x0a, 0x16, 0x72, 0x6f, 0x77, 0x73, 0x5f, 0x61, 0x66, 0x66,
+	0x65, 0x63, 0x74, 0x65, 0x64, 0x5f, 0x62, 0x79, 0x5f, 0x73, 0x68, 0x61, 0x72, 0x64, 0x18, 0x01,
+	0x20, 0x03, 0x28, 0x0b, 0x32, 0x41, 0x2e, 0x76, 0x74, 0x63, 0x74, 0x6c, 0x64, 0x61, 0x74, 0x61,
+	0x2e, 0x43, 0x61, 0x6e, 0x63, 0x65, 0x6c, 0x53, 0x63, 0x68, 0x65, 0x6d, 0x61, 0x4d, 0x69, 0x67,
 	0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x2e, 0x52,
 	0x6f, 0x77, 0x73, 0x41, 0x66, 0x66, 0x65, 0x63, 0x74, 0x65, 0x64, 0x42, 0x79, 0x53, 0x68, 0x61,
 	0x72, 0x64, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x13, 0x72, 0x6f, 0x77, 0x73, 0x41, 0x66, 0x66,
@@ -17737,1314 +17632,1467 @@ var file_vtctldata_proto_rawDesc = string([]byte{
 	0x61, 0x72, 0x64, 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, 0x04, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65,
-	0x3a, 0x02, 0x38, 0x01, 0x22, 0x50, 0x0a, 0x1e, 0x43, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65,
-	0x53, 0x63, 0x68, 0x65, 0x6d, 0x61, 0x4d, 0x69, 0x67, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52,
-	0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 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, 0x12, 0x0a, 0x04, 0x75, 0x75, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09,
-	0x52, 0x04, 0x75, 0x75, 0x69, 0x64, 0x22, 0xe3, 0x01, 0x0a, 0x1f, 0x43, 0x6f, 0x6d, 0x70, 0x6c,
-	0x65, 0x74, 0x65, 0x53, 0x63, 0x68, 0x65, 0x6d, 0x61, 0x4d, 0x69, 0x67, 0x72, 0x61, 0x74, 0x69,
-	0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x78, 0x0a, 0x16, 0x72, 0x6f,
-	0x77, 0x73, 0x5f, 0x61, 0x66, 0x66, 0x65, 0x63, 0x74, 0x65, 0x64, 0x5f, 0x62, 0x79, 0x5f, 0x73,
-	0x68, 0x61, 0x72, 0x64, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x43, 0x2e, 0x76, 0x74, 0x63,
-	0x74, 0x6c, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x43, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x53,
-	0x63, 0x68, 0x65, 0x6d, 0x61, 0x4d, 0x69, 0x67, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65,
-	0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x2e, 0x52, 0x6f, 0x77, 0x73, 0x41, 0x66, 0x66, 0x65, 0x63,
-	0x74, 0x65, 0x64, 0x42, 0x79, 0x53, 0x68, 0x61, 0x72, 0x64, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52,
-	0x13, 0x72, 0x6f, 0x77, 0x73, 0x41, 0x66, 0x66, 0x65, 0x63, 0x74, 0x65, 0x64, 0x42, 0x79, 0x53,
-	0x68, 0x61, 0x72, 0x64, 0x1a, 0x46, 0x0a, 0x18, 0x52, 0x6f, 0x77, 0x73, 0x41, 0x66, 0x66, 0x65,
-	0x63, 0x74, 0x65, 0x64, 0x42, 0x79, 0x53, 0x68, 0x61, 0x72, 0x64, 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,
-	0x04, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x8a, 0x03, 0x0a,
-	0x16, 0x43, 0x6f, 0x70, 0x79, 0x53, 0x63, 0x68, 0x65, 0x6d, 0x61, 0x53, 0x68, 0x61, 0x72, 0x64,
-	0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x45, 0x0a, 0x13, 0x73, 0x6f, 0x75, 0x72, 0x63,
-	0x65, 0x5f, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x5f, 0x61, 0x6c, 0x69, 0x61, 0x73, 0x18, 0x01,
+	0x3a, 0x02, 0x38, 0x01, 0x22, 0xe8, 0x01, 0x0a, 0x17, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x54,
+	0x61, 0x62, 0x6c, 0x65, 0x74, 0x54, 0x61, 0x67, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74,
+	0x12, 0x38, 0x0a, 0x0c, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x5f, 0x61, 0x6c, 0x69, 0x61, 0x73,
+	0x18, 0x01, 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, 0x40, 0x0a, 0x04, 0x74, 0x61,
+	0x67, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x2c, 0x2e, 0x76, 0x74, 0x63, 0x74, 0x6c,
+	0x64, 0x61, 0x74, 0x61, 0x2e, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x54, 0x61, 0x62, 0x6c, 0x65,
+	0x74, 0x54, 0x61, 0x67, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x2e, 0x54, 0x61, 0x67,
+	0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x04, 0x74, 0x61, 0x67, 0x73, 0x12, 0x18, 0x0a, 0x07,
+	0x72, 0x65, 0x70, 0x6c, 0x61, 0x63, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x08, 0x52, 0x07, 0x72,
+	0x65, 0x70, 0x6c, 0x61, 0x63, 0x65, 0x1a, 0x37, 0x0a, 0x09, 0x54, 0x61, 0x67, 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,
+	0xc0, 0x02, 0x0a, 0x18, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x74,
+	0x54, 0x61, 0x67, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x54, 0x0a, 0x0b,
+	0x62, 0x65, 0x66, 0x6f, 0x72, 0x65, 0x5f, 0x74, 0x61, 0x67, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28,
+	0x0b, 0x32, 0x33, 0x2e, 0x76, 0x74, 0x63, 0x74, 0x6c, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x43, 0x68,
+	0x61, 0x6e, 0x67, 0x65, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x54, 0x61, 0x67, 0x73, 0x52, 0x65,
+	0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x2e, 0x42, 0x65, 0x66, 0x6f, 0x72, 0x65, 0x54, 0x61, 0x67,
+	0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x0a, 0x62, 0x65, 0x66, 0x6f, 0x72, 0x65, 0x54, 0x61,
+	0x67, 0x73, 0x12, 0x51, 0x0a, 0x0a, 0x61, 0x66, 0x74, 0x65, 0x72, 0x5f, 0x74, 0x61, 0x67, 0x73,
+	0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x32, 0x2e, 0x76, 0x74, 0x63, 0x74, 0x6c, 0x64, 0x61,
+	0x74, 0x61, 0x2e, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x54,
+	0x61, 0x67, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x2e, 0x41, 0x66, 0x74, 0x65,
+	0x72, 0x54, 0x61, 0x67, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x09, 0x61, 0x66, 0x74, 0x65,
+	0x72, 0x54, 0x61, 0x67, 0x73, 0x1a, 0x3d, 0x0a, 0x0f, 0x42, 0x65, 0x66, 0x6f, 0x72, 0x65, 0x54,
+	0x61, 0x67, 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, 0x1a, 0x3c, 0x0a, 0x0e, 0x41, 0x66, 0x74, 0x65, 0x72, 0x54, 0x61, 0x67,
+	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, 0x9b, 0x01, 0x0a, 0x17, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x54, 0x61, 0x62,
+	0x6c, 0x65, 0x74, 0x54, 0x79, 0x70, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x38,
+	0x0a, 0x0c, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x5f, 0x61, 0x6c, 0x69, 0x61, 0x73, 0x18, 0x01,
 	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, 0x11, 0x73, 0x6f, 0x75,
-	0x72, 0x63, 0x65, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x41, 0x6c, 0x69, 0x61, 0x73, 0x12, 0x16,
-	0x0a, 0x06, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x09, 0x52, 0x06,
-	0x74, 0x61, 0x62, 0x6c, 0x65, 0x73, 0x12, 0x25, 0x0a, 0x0e, 0x65, 0x78, 0x63, 0x6c, 0x75, 0x64,
-	0x65, 0x5f, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0d,
-	0x65, 0x78, 0x63, 0x6c, 0x75, 0x64, 0x65, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x73, 0x12, 0x23, 0x0a,
-	0x0d, 0x69, 0x6e, 0x63, 0x6c, 0x75, 0x64, 0x65, 0x5f, 0x76, 0x69, 0x65, 0x77, 0x73, 0x18, 0x04,
-	0x20, 0x01, 0x28, 0x08, 0x52, 0x0c, 0x69, 0x6e, 0x63, 0x6c, 0x75, 0x64, 0x65, 0x56, 0x69, 0x65,
-	0x77, 0x73, 0x12, 0x1f, 0x0a, 0x0b, 0x73, 0x6b, 0x69, 0x70, 0x5f, 0x76, 0x65, 0x72, 0x69, 0x66,
-	0x79, 0x18, 0x05, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0a, 0x73, 0x6b, 0x69, 0x70, 0x56, 0x65, 0x72,
-	0x69, 0x66, 0x79, 0x12, 0x44, 0x0a, 0x15, 0x77, 0x61, 0x69, 0x74, 0x5f, 0x72, 0x65, 0x70, 0x6c,
-	0x69, 0x63, 0x61, 0x73, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x18, 0x06, 0x20, 0x01,
-	0x28, 0x0b, 0x32, 0x10, 0x2e, 0x76, 0x74, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x44, 0x75, 0x72, 0x61,
-	0x74, 0x69, 0x6f, 0x6e, 0x52, 0x13, 0x77, 0x61, 0x69, 0x74, 0x52, 0x65, 0x70, 0x6c, 0x69, 0x63,
-	0x61, 0x73, 0x54, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x12, 0x31, 0x0a, 0x14, 0x64, 0x65, 0x73,
-	0x74, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x6b, 0x65, 0x79, 0x73, 0x70, 0x61, 0x63,
-	0x65, 0x18, 0x07, 0x20, 0x01, 0x28, 0x09, 0x52, 0x13, 0x64, 0x65, 0x73, 0x74, 0x69, 0x6e, 0x61,
-	0x74, 0x69, 0x6f, 0x6e, 0x4b, 0x65, 0x79, 0x73, 0x70, 0x61, 0x63, 0x65, 0x12, 0x2b, 0x0a, 0x11,
-	0x64, 0x65, 0x73, 0x74, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x73, 0x68, 0x61, 0x72,
-	0x64, 0x18, 0x08, 0x20, 0x01, 0x28, 0x09, 0x52, 0x10, 0x64, 0x65, 0x73, 0x74, 0x69, 0x6e, 0x61,
-	0x74, 0x69, 0x6f, 0x6e, 0x53, 0x68, 0x61, 0x72, 0x64, 0x22, 0x19, 0x0a, 0x17, 0x43, 0x6f, 0x70,
-	0x79, 0x53, 0x63, 0x68, 0x65, 0x6d, 0x61, 0x53, 0x68, 0x61, 0x72, 0x64, 0x52, 0x65, 0x73, 0x70,
-	0x6f, 0x6e, 0x73, 0x65, 0x22, 0xdd, 0x02, 0x0a, 0x15, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x4b,
-	0x65, 0x79, 0x73, 0x70, 0x61, 0x63, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x12,
-	0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61,
-	0x6d, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x66, 0x6f, 0x72, 0x63, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28,
-	0x08, 0x52, 0x05, 0x66, 0x6f, 0x72, 0x63, 0x65, 0x12, 0x2f, 0x0a, 0x14, 0x61, 0x6c, 0x6c, 0x6f,
-	0x77, 0x5f, 0x65, 0x6d, 0x70, 0x74, 0x79, 0x5f, 0x76, 0x5f, 0x73, 0x63, 0x68, 0x65, 0x6d, 0x61,
-	0x18, 0x03, 0x20, 0x01, 0x28, 0x08, 0x52, 0x11, 0x61, 0x6c, 0x6c, 0x6f, 0x77, 0x45, 0x6d, 0x70,
-	0x74, 0x79, 0x56, 0x53, 0x63, 0x68, 0x65, 0x6d, 0x61, 0x12, 0x2a, 0x0a, 0x04, 0x74, 0x79, 0x70,
-	0x65, 0x18, 0x07, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x16, 0x2e, 0x74, 0x6f, 0x70, 0x6f, 0x64, 0x61,
-	0x74, 0x61, 0x2e, 0x4b, 0x65, 0x79, 0x73, 0x70, 0x61, 0x63, 0x65, 0x54, 0x79, 0x70, 0x65, 0x52,
-	0x04, 0x74, 0x79, 0x70, 0x65, 0x12, 0x23, 0x0a, 0x0d, 0x62, 0x61, 0x73, 0x65, 0x5f, 0x6b, 0x65,
-	0x79, 0x73, 0x70, 0x61, 0x63, 0x65, 0x18, 0x08, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x62, 0x61,
-	0x73, 0x65, 0x4b, 0x65, 0x79, 0x73, 0x70, 0x61, 0x63, 0x65, 0x12, 0x31, 0x0a, 0x0d, 0x73, 0x6e,
-	0x61, 0x70, 0x73, 0x68, 0x6f, 0x74, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x09, 0x20, 0x01, 0x28,
-	0x0b, 0x32, 0x0c, 0x2e, 0x76, 0x74, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x54, 0x69, 0x6d, 0x65, 0x52,
-	0x0c, 0x73, 0x6e, 0x61, 0x70, 0x73, 0x68, 0x6f, 0x74, 0x54, 0x69, 0x6d, 0x65, 0x12, 0x2b, 0x0a,
-	0x11, 0x64, 0x75, 0x72, 0x61, 0x62, 0x69, 0x6c, 0x69, 0x74, 0x79, 0x5f, 0x70, 0x6f, 0x6c, 0x69,
-	0x63, 0x79, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x09, 0x52, 0x10, 0x64, 0x75, 0x72, 0x61, 0x62, 0x69,
-	0x6c, 0x69, 0x74, 0x79, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x12, 0x26, 0x0a, 0x0f, 0x73, 0x69,
-	0x64, 0x65, 0x63, 0x61, 0x72, 0x5f, 0x64, 0x62, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x0b, 0x20,
-	0x01, 0x28, 0x09, 0x52, 0x0d, 0x73, 0x69, 0x64, 0x65, 0x63, 0x61, 0x72, 0x44, 0x62, 0x4e, 0x61,
-	0x6d, 0x65, 0x4a, 0x04, 0x08, 0x04, 0x10, 0x05, 0x4a, 0x04, 0x08, 0x05, 0x10, 0x06, 0x4a, 0x04,
-	0x08, 0x06, 0x10, 0x07, 0x22, 0x49, 0x0a, 0x16, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x4b, 0x65,
-	0x79, 0x73, 0x70, 0x61, 0x63, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x2f,
-	0x0a, 0x08, 0x6b, 0x65, 0x79, 0x73, 0x70, 0x61, 0x63, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b,
-	0x32, 0x13, 0x2e, 0x76, 0x74, 0x63, 0x74, 0x6c, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x4b, 0x65, 0x79,
-	0x73, 0x70, 0x61, 0x63, 0x65, 0x52, 0x08, 0x6b, 0x65, 0x79, 0x73, 0x70, 0x61, 0x63, 0x65, 0x22,
-	0x8c, 0x01, 0x0a, 0x12, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x53, 0x68, 0x61, 0x72, 0x64, 0x52,
-	0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 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, 0x1d, 0x0a, 0x0a, 0x73, 0x68, 0x61, 0x72, 0x64, 0x5f, 0x6e, 0x61, 0x6d, 0x65,
-	0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x73, 0x68, 0x61, 0x72, 0x64, 0x4e, 0x61, 0x6d,
-	0x65, 0x12, 0x14, 0x0a, 0x05, 0x66, 0x6f, 0x72, 0x63, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x08,
-	0x52, 0x05, 0x66, 0x6f, 0x72, 0x63, 0x65, 0x12, 0x25, 0x0a, 0x0e, 0x69, 0x6e, 0x63, 0x6c, 0x75,
-	0x64, 0x65, 0x5f, 0x70, 0x61, 0x72, 0x65, 0x6e, 0x74, 0x18, 0x04, 0x20, 0x01, 0x28, 0x08, 0x52,
-	0x0d, 0x69, 0x6e, 0x63, 0x6c, 0x75, 0x64, 0x65, 0x50, 0x61, 0x72, 0x65, 0x6e, 0x74, 0x22, 0xa0,
-	0x01, 0x0a, 0x13, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x53, 0x68, 0x61, 0x72, 0x64, 0x52, 0x65,
-	0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x2f, 0x0a, 0x08, 0x6b, 0x65, 0x79, 0x73, 0x70, 0x61,
-	0x63, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x76, 0x74, 0x63, 0x74, 0x6c,
-	0x64, 0x61, 0x74, 0x61, 0x2e, 0x4b, 0x65, 0x79, 0x73, 0x70, 0x61, 0x63, 0x65, 0x52, 0x08, 0x6b,
-	0x65, 0x79, 0x73, 0x70, 0x61, 0x63, 0x65, 0x12, 0x26, 0x0a, 0x05, 0x73, 0x68, 0x61, 0x72, 0x64,
-	0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x76, 0x74, 0x63, 0x74, 0x6c, 0x64, 0x61,
-	0x74, 0x61, 0x2e, 0x53, 0x68, 0x61, 0x72, 0x64, 0x52, 0x05, 0x73, 0x68, 0x61, 0x72, 0x64, 0x12,
-	0x30, 0x0a, 0x14, 0x73, 0x68, 0x61, 0x72, 0x64, 0x5f, 0x61, 0x6c, 0x72, 0x65, 0x61, 0x64, 0x79,
-	0x5f, 0x65, 0x78, 0x69, 0x73, 0x74, 0x73, 0x18, 0x03, 0x20, 0x01, 0x28, 0x08, 0x52, 0x12, 0x73,
-	0x68, 0x61, 0x72, 0x64, 0x41, 0x6c, 0x72, 0x65, 0x61, 0x64, 0x79, 0x45, 0x78, 0x69, 0x73, 0x74,
-	0x73, 0x22, 0x41, 0x0a, 0x15, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x43, 0x65, 0x6c, 0x6c, 0x49,
-	0x6e, 0x66, 0x6f, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61,
-	0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x14,
-	0x0a, 0x05, 0x66, 0x6f, 0x72, 0x63, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x05, 0x66,
-	0x6f, 0x72, 0x63, 0x65, 0x22, 0x18, 0x0a, 0x16, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x43, 0x65,
-	0x6c, 0x6c, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x2d,
-	0x0a, 0x17, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x43, 0x65, 0x6c, 0x6c, 0x73, 0x41, 0x6c, 0x69,
-	0x61, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d,
-	0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x22, 0x1a, 0x0a,
-	0x18, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x43, 0x65, 0x6c, 0x6c, 0x73, 0x41, 0x6c, 0x69, 0x61,
-	0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x67, 0x0a, 0x15, 0x44, 0x65, 0x6c,
-	0x65, 0x74, 0x65, 0x4b, 0x65, 0x79, 0x73, 0x70, 0x61, 0x63, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65,
-	0x73, 0x74, 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, 0x1c,
-	0x0a, 0x09, 0x72, 0x65, 0x63, 0x75, 0x72, 0x73, 0x69, 0x76, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28,
-	0x08, 0x52, 0x09, 0x72, 0x65, 0x63, 0x75, 0x72, 0x73, 0x69, 0x76, 0x65, 0x12, 0x14, 0x0a, 0x05,
-	0x66, 0x6f, 0x72, 0x63, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x08, 0x52, 0x05, 0x66, 0x6f, 0x72,
-	0x63, 0x65, 0x22, 0x18, 0x0a, 0x16, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x4b, 0x65, 0x79, 0x73,
-	0x70, 0x61, 0x63, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x9b, 0x01, 0x0a,
-	0x13, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x53, 0x68, 0x61, 0x72, 0x64, 0x73, 0x52, 0x65, 0x71,
-	0x75, 0x65, 0x73, 0x74, 0x12, 0x28, 0x0a, 0x06, 0x73, 0x68, 0x61, 0x72, 0x64, 0x73, 0x18, 0x01,
-	0x20, 0x03, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x76, 0x74, 0x63, 0x74, 0x6c, 0x64, 0x61, 0x74, 0x61,
-	0x2e, 0x53, 0x68, 0x61, 0x72, 0x64, 0x52, 0x06, 0x73, 0x68, 0x61, 0x72, 0x64, 0x73, 0x12, 0x1c,
-	0x0a, 0x09, 0x72, 0x65, 0x63, 0x75, 0x72, 0x73, 0x69, 0x76, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28,
-	0x08, 0x52, 0x09, 0x72, 0x65, 0x63, 0x75, 0x72, 0x73, 0x69, 0x76, 0x65, 0x12, 0x26, 0x0a, 0x0f,
-	0x65, 0x76, 0x65, 0x6e, 0x5f, 0x69, 0x66, 0x5f, 0x73, 0x65, 0x72, 0x76, 0x69, 0x6e, 0x67, 0x18,
-	0x04, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0d, 0x65, 0x76, 0x65, 0x6e, 0x49, 0x66, 0x53, 0x65, 0x72,
-	0x76, 0x69, 0x6e, 0x67, 0x12, 0x14, 0x0a, 0x05, 0x66, 0x6f, 0x72, 0x63, 0x65, 0x18, 0x05, 0x20,
-	0x01, 0x28, 0x08, 0x52, 0x05, 0x66, 0x6f, 0x72, 0x63, 0x65, 0x22, 0x16, 0x0a, 0x14, 0x44, 0x65,
-	0x6c, 0x65, 0x74, 0x65, 0x53, 0x68, 0x61, 0x72, 0x64, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e,
-	0x73, 0x65, 0x22, 0x2d, 0x0a, 0x17, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x53, 0x72, 0x76, 0x56,
-	0x53, 0x63, 0x68, 0x65, 0x6d, 0x61, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x12, 0x0a,
-	0x04, 0x63, 0x65, 0x6c, 0x6c, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x63, 0x65, 0x6c,
-	0x6c, 0x22, 0x1a, 0x0a, 0x18, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x53, 0x72, 0x76, 0x56, 0x53,
-	0x63, 0x68, 0x65, 0x6d, 0x61, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x79, 0x0a,
-	0x14, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x73, 0x52, 0x65,
-	0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x3c, 0x0a, 0x0e, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x5f,
-	0x61, 0x6c, 0x69, 0x61, 0x73, 0x65, 0x73, 0x18, 0x01, 0x20, 0x03, 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, 0x0d, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x41, 0x6c, 0x69, 0x61,
-	0x73, 0x65, 0x73, 0x12, 0x23, 0x0a, 0x0d, 0x61, 0x6c, 0x6c, 0x6f, 0x77, 0x5f, 0x70, 0x72, 0x69,
-	0x6d, 0x61, 0x72, 0x79, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0c, 0x61, 0x6c, 0x6c, 0x6f,
-	0x77, 0x50, 0x72, 0x69, 0x6d, 0x61, 0x72, 0x79, 0x22, 0x17, 0x0a, 0x15, 0x44, 0x65, 0x6c, 0x65,
-	0x74, 0x65, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73,
-	0x65, 0x22, 0xc3, 0x03, 0x0a, 0x1d, 0x45, 0x6d, 0x65, 0x72, 0x67, 0x65, 0x6e, 0x63, 0x79, 0x52,
-	0x65, 0x70, 0x61, 0x72, 0x65, 0x6e, 0x74, 0x53, 0x68, 0x61, 0x72, 0x64, 0x52, 0x65, 0x71, 0x75,
-	0x65, 0x73, 0x74, 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, 0x36, 0x0a, 0x0b, 0x6e, 0x65, 0x77, 0x5f, 0x70, 0x72, 0x69,
-	0x6d, 0x61, 0x72, 0x79, 0x18, 0x03, 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, 0x0a, 0x6e, 0x65, 0x77, 0x50, 0x72, 0x69, 0x6d, 0x61, 0x72, 0x79, 0x12, 0x3e, 0x0a,
-	0x0f, 0x69, 0x67, 0x6e, 0x6f, 0x72, 0x65, 0x5f, 0x72, 0x65, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x73,
-	0x18, 0x04, 0x20, 0x03, 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, 0x0e, 0x69,
-	0x67, 0x6e, 0x6f, 0x72, 0x65, 0x52, 0x65, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x73, 0x12, 0x44, 0x0a,
-	0x15, 0x77, 0x61, 0x69, 0x74, 0x5f, 0x72, 0x65, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x73, 0x5f, 0x74,
-	0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x76,
-	0x74, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x44, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x13,
-	0x77, 0x61, 0x69, 0x74, 0x52, 0x65, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x73, 0x54, 0x69, 0x6d, 0x65,
-	0x6f, 0x75, 0x74, 0x12, 0x3f, 0x0a, 0x1c, 0x70, 0x72, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x5f, 0x63,
-	0x72, 0x6f, 0x73, 0x73, 0x5f, 0x63, 0x65, 0x6c, 0x6c, 0x5f, 0x70, 0x72, 0x6f, 0x6d, 0x6f, 0x74,
-	0x69, 0x6f, 0x6e, 0x18, 0x06, 0x20, 0x01, 0x28, 0x08, 0x52, 0x19, 0x70, 0x72, 0x65, 0x76, 0x65,
-	0x6e, 0x74, 0x43, 0x72, 0x6f, 0x73, 0x73, 0x43, 0x65, 0x6c, 0x6c, 0x50, 0x72, 0x6f, 0x6d, 0x6f,
-	0x74, 0x69, 0x6f, 0x6e, 0x12, 0x2f, 0x0a, 0x14, 0x77, 0x61, 0x69, 0x74, 0x5f, 0x66, 0x6f, 0x72,
-	0x5f, 0x61, 0x6c, 0x6c, 0x5f, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x73, 0x18, 0x07, 0x20, 0x01,
-	0x28, 0x08, 0x52, 0x11, 0x77, 0x61, 0x69, 0x74, 0x46, 0x6f, 0x72, 0x41, 0x6c, 0x6c, 0x54, 0x61,
-	0x62, 0x6c, 0x65, 0x74, 0x73, 0x12, 0x40, 0x0a, 0x10, 0x65, 0x78, 0x70, 0x65, 0x63, 0x74, 0x65,
-	0x64, 0x5f, 0x70, 0x72, 0x69, 0x6d, 0x61, 0x72, 0x79, 0x18, 0x08, 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, 0x0f, 0x65, 0x78, 0x70, 0x65, 0x63, 0x74, 0x65, 0x64,
-	0x50, 0x72, 0x69, 0x6d, 0x61, 0x72, 0x79, 0x22, 0xbc, 0x01, 0x0a, 0x1e, 0x45, 0x6d, 0x65, 0x72,
-	0x67, 0x65, 0x6e, 0x63, 0x79, 0x52, 0x65, 0x70, 0x61, 0x72, 0x65, 0x6e, 0x74, 0x53, 0x68, 0x61,
-	0x72, 0x64, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 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, 0x40, 0x0a, 0x10,
-	0x70, 0x72, 0x6f, 0x6d, 0x6f, 0x74, 0x65, 0x64, 0x5f, 0x70, 0x72, 0x69, 0x6d, 0x61, 0x72, 0x79,
-	0x18, 0x03, 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, 0x0f, 0x70,
-	0x72, 0x6f, 0x6d, 0x6f, 0x74, 0x65, 0x64, 0x50, 0x72, 0x69, 0x6d, 0x61, 0x72, 0x79, 0x12, 0x26,
-	0x0a, 0x06, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x73, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0e,
-	0x2e, 0x6c, 0x6f, 0x67, 0x75, 0x74, 0x69, 0x6c, 0x2e, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x52, 0x06,
-	0x65, 0x76, 0x65, 0x6e, 0x74, 0x73, 0x22, 0xa0, 0x01, 0x0a, 0x18, 0x45, 0x78, 0x65, 0x63, 0x75,
-	0x74, 0x65, 0x46, 0x65, 0x74, 0x63, 0x68, 0x41, 0x73, 0x41, 0x70, 0x70, 0x52, 0x65, 0x71, 0x75,
+	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, 0x2d, 0x0a, 0x07, 0x64, 0x62, 0x5f, 0x74,
+	0x79, 0x70, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x14, 0x2e, 0x74, 0x6f, 0x70, 0x6f,
+	0x64, 0x61, 0x74, 0x61, 0x2e, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x54, 0x79, 0x70, 0x65, 0x52,
+	0x06, 0x64, 0x62, 0x54, 0x79, 0x70, 0x65, 0x12, 0x17, 0x0a, 0x07, 0x64, 0x72, 0x79, 0x5f, 0x72,
+	0x75, 0x6e, 0x18, 0x03, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x64, 0x72, 0x79, 0x52, 0x75, 0x6e,
+	0x22, 0xa6, 0x01, 0x0a, 0x18, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x54, 0x61, 0x62, 0x6c, 0x65,
+	0x74, 0x54, 0x79, 0x70, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x35, 0x0a,
+	0x0d, 0x62, 0x65, 0x66, 0x6f, 0x72, 0x65, 0x5f, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x18, 0x01,
+	0x20, 0x01, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x74, 0x6f, 0x70, 0x6f, 0x64, 0x61, 0x74, 0x61, 0x2e,
+	0x54, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x52, 0x0c, 0x62, 0x65, 0x66, 0x6f, 0x72, 0x65, 0x54, 0x61,
+	0x62, 0x6c, 0x65, 0x74, 0x12, 0x33, 0x0a, 0x0c, 0x61, 0x66, 0x74, 0x65, 0x72, 0x5f, 0x74, 0x61,
+	0x62, 0x6c, 0x65, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x74, 0x6f, 0x70,
+	0x6f, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x52, 0x0b, 0x61, 0x66,
+	0x74, 0x65, 0x72, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x12, 0x1e, 0x0a, 0x0b, 0x77, 0x61, 0x73,
+	0x5f, 0x64, 0x72, 0x79, 0x5f, 0x72, 0x75, 0x6e, 0x18, 0x03, 0x20, 0x01, 0x28, 0x08, 0x52, 0x09,
+	0x77, 0x61, 0x73, 0x44, 0x72, 0x79, 0x52, 0x75, 0x6e, 0x22, 0xe3, 0x01, 0x0a, 0x15, 0x43, 0x68,
+	0x65, 0x63, 0x6b, 0x54, 0x68, 0x72, 0x6f, 0x74, 0x74, 0x6c, 0x65, 0x72, 0x52, 0x65, 0x71, 0x75,
 	0x65, 0x73, 0x74, 0x12, 0x38, 0x0a, 0x0c, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x5f, 0x61, 0x6c,
 	0x69, 0x61, 0x73, 0x18, 0x01, 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, 0x14, 0x0a,
-	0x05, 0x71, 0x75, 0x65, 0x72, 0x79, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x71, 0x75,
-	0x65, 0x72, 0x79, 0x12, 0x19, 0x0a, 0x08, 0x6d, 0x61, 0x78, 0x5f, 0x72, 0x6f, 0x77, 0x73, 0x18,
-	0x03, 0x20, 0x01, 0x28, 0x03, 0x52, 0x07, 0x6d, 0x61, 0x78, 0x52, 0x6f, 0x77, 0x73, 0x12, 0x19,
-	0x0a, 0x08, 0x75, 0x73, 0x65, 0x5f, 0x70, 0x6f, 0x6f, 0x6c, 0x18, 0x04, 0x20, 0x01, 0x28, 0x08,
-	0x52, 0x07, 0x75, 0x73, 0x65, 0x50, 0x6f, 0x6f, 0x6c, 0x22, 0x47, 0x0a, 0x19, 0x45, 0x78, 0x65,
-	0x63, 0x75, 0x74, 0x65, 0x46, 0x65, 0x74, 0x63, 0x68, 0x41, 0x73, 0x41, 0x70, 0x70, 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, 0xd3, 0x01, 0x0a, 0x18, 0x45, 0x78, 0x65, 0x63, 0x75, 0x74, 0x65, 0x46, 0x65,
-	0x74, 0x63, 0x68, 0x41, 0x73, 0x44, 0x42, 0x41, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12,
-	0x38, 0x0a, 0x0c, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x5f, 0x61, 0x6c, 0x69, 0x61, 0x73, 0x18,
-	0x01, 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, 0x14, 0x0a, 0x05, 0x71, 0x75, 0x65,
-	0x72, 0x79, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x71, 0x75, 0x65, 0x72, 0x79, 0x12,
-	0x19, 0x0a, 0x08, 0x6d, 0x61, 0x78, 0x5f, 0x72, 0x6f, 0x77, 0x73, 0x18, 0x03, 0x20, 0x01, 0x28,
-	0x03, 0x52, 0x07, 0x6d, 0x61, 0x78, 0x52, 0x6f, 0x77, 0x73, 0x12, 0x27, 0x0a, 0x0f, 0x64, 0x69,
-	0x73, 0x61, 0x62, 0x6c, 0x65, 0x5f, 0x62, 0x69, 0x6e, 0x6c, 0x6f, 0x67, 0x73, 0x18, 0x04, 0x20,
-	0x01, 0x28, 0x08, 0x52, 0x0e, 0x64, 0x69, 0x73, 0x61, 0x62, 0x6c, 0x65, 0x42, 0x69, 0x6e, 0x6c,
-	0x6f, 0x67, 0x73, 0x12, 0x23, 0x0a, 0x0d, 0x72, 0x65, 0x6c, 0x6f, 0x61, 0x64, 0x5f, 0x73, 0x63,
-	0x68, 0x65, 0x6d, 0x61, 0x18, 0x05, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0c, 0x72, 0x65, 0x6c, 0x6f,
-	0x61, 0x64, 0x53, 0x63, 0x68, 0x65, 0x6d, 0x61, 0x22, 0x47, 0x0a, 0x19, 0x45, 0x78, 0x65, 0x63,
-	0x75, 0x74, 0x65, 0x46, 0x65, 0x74, 0x63, 0x68, 0x41, 0x73, 0x44, 0x42, 0x41, 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, 0xa5, 0x01, 0x0a, 0x12, 0x45, 0x78, 0x65, 0x63, 0x75, 0x74, 0x65, 0x48, 0x6f, 0x6f,
-	0x6b, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x38, 0x0a, 0x0c, 0x74, 0x61, 0x62, 0x6c,
-	0x65, 0x74, 0x5f, 0x61, 0x6c, 0x69, 0x61, 0x73, 0x18, 0x01, 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, 0x55, 0x0a, 0x13, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x5f, 0x68, 0x6f, 0x6f,
-	0x6b, 0x5f, 0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32,
-	0x25, 0x2e, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x6d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x72, 0x64,
-	0x61, 0x74, 0x61, 0x2e, 0x45, 0x78, 0x65, 0x63, 0x75, 0x74, 0x65, 0x48, 0x6f, 0x6f, 0x6b, 0x52,
-	0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x52, 0x11, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x48, 0x6f,
-	0x6f, 0x6b, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x22, 0x5e, 0x0a, 0x13, 0x45, 0x78, 0x65,
-	0x63, 0x75, 0x74, 0x65, 0x48, 0x6f, 0x6f, 0x6b, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65,
-	0x12, 0x47, 0x0a, 0x0b, 0x68, 0x6f, 0x6f, 0x6b, 0x5f, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x18,
-	0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x26, 0x2e, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x6d, 0x61,
-	0x6e, 0x61, 0x67, 0x65, 0x72, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x45, 0x78, 0x65, 0x63, 0x75, 0x74,
-	0x65, 0x48, 0x6f, 0x6f, 0x6b, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x52, 0x0a, 0x68,
-	0x6f, 0x6f, 0x6b, 0x52, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x22, 0xd4, 0x01, 0x0a, 0x1d, 0x45, 0x78,
-	0x65, 0x63, 0x75, 0x74, 0x65, 0x4d, 0x75, 0x6c, 0x74, 0x69, 0x46, 0x65, 0x74, 0x63, 0x68, 0x41,
-	0x73, 0x44, 0x42, 0x41, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x38, 0x0a, 0x0c, 0x74,
-	0x61, 0x62, 0x6c, 0x65, 0x74, 0x5f, 0x61, 0x6c, 0x69, 0x61, 0x73, 0x18, 0x01, 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, 0x10, 0x0a, 0x03, 0x73, 0x71, 0x6c, 0x18, 0x02, 0x20, 0x01,
-	0x28, 0x09, 0x52, 0x03, 0x73, 0x71, 0x6c, 0x12, 0x19, 0x0a, 0x08, 0x6d, 0x61, 0x78, 0x5f, 0x72,
-	0x6f, 0x77, 0x73, 0x18, 0x03, 0x20, 0x01, 0x28, 0x03, 0x52, 0x07, 0x6d, 0x61, 0x78, 0x52, 0x6f,
-	0x77, 0x73, 0x12, 0x27, 0x0a, 0x0f, 0x64, 0x69, 0x73, 0x61, 0x62, 0x6c, 0x65, 0x5f, 0x62, 0x69,
-	0x6e, 0x6c, 0x6f, 0x67, 0x73, 0x18, 0x04, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0e, 0x64, 0x69, 0x73,
-	0x61, 0x62, 0x6c, 0x65, 0x42, 0x69, 0x6e, 0x6c, 0x6f, 0x67, 0x73, 0x12, 0x23, 0x0a, 0x0d, 0x72,
-	0x65, 0x6c, 0x6f, 0x61, 0x64, 0x5f, 0x73, 0x63, 0x68, 0x65, 0x6d, 0x61, 0x18, 0x05, 0x20, 0x01,
-	0x28, 0x08, 0x52, 0x0c, 0x72, 0x65, 0x6c, 0x6f, 0x61, 0x64, 0x53, 0x63, 0x68, 0x65, 0x6d, 0x61,
-	0x22, 0x4e, 0x0a, 0x1e, 0x45, 0x78, 0x65, 0x63, 0x75, 0x74, 0x65, 0x4d, 0x75, 0x6c, 0x74, 0x69,
-	0x46, 0x65, 0x74, 0x63, 0x68, 0x41, 0x73, 0x44, 0x42, 0x41, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e,
-	0x73, 0x65, 0x12, 0x2c, 0x0a, 0x07, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x73, 0x18, 0x01, 0x20,
-	0x03, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x71, 0x75, 0x65, 0x72, 0x79, 0x2e, 0x51, 0x75, 0x65, 0x72,
-	0x79, 0x52, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x52, 0x07, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x73,
-	0x22, 0x3c, 0x0a, 0x1e, 0x46, 0x69, 0x6e, 0x64, 0x41, 0x6c, 0x6c, 0x53, 0x68, 0x61, 0x72, 0x64,
-	0x73, 0x49, 0x6e, 0x4b, 0x65, 0x79, 0x73, 0x70, 0x61, 0x63, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65,
-	0x73, 0x74, 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, 0x22, 0xbe,
-	0x01, 0x0a, 0x1f, 0x46, 0x69, 0x6e, 0x64, 0x41, 0x6c, 0x6c, 0x53, 0x68, 0x61, 0x72, 0x64, 0x73,
-	0x49, 0x6e, 0x4b, 0x65, 0x79, 0x73, 0x70, 0x61, 0x63, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e,
-	0x73, 0x65, 0x12, 0x4e, 0x0a, 0x06, 0x73, 0x68, 0x61, 0x72, 0x64, 0x73, 0x18, 0x01, 0x20, 0x03,
-	0x28, 0x0b, 0x32, 0x36, 0x2e, 0x76, 0x74, 0x63, 0x74, 0x6c, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x46,
-	0x69, 0x6e, 0x64, 0x41, 0x6c, 0x6c, 0x53, 0x68, 0x61, 0x72, 0x64, 0x73, 0x49, 0x6e, 0x4b, 0x65,
-	0x79, 0x73, 0x70, 0x61, 0x63, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x2e, 0x53,
-	0x68, 0x61, 0x72, 0x64, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x06, 0x73, 0x68, 0x61, 0x72,
-	0x64, 0x73, 0x1a, 0x4b, 0x0a, 0x0b, 0x53, 0x68, 0x61, 0x72, 0x64, 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, 0x26, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01,
-	0x28, 0x0b, 0x32, 0x10, 0x2e, 0x76, 0x74, 0x63, 0x74, 0x6c, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x53,
-	0x68, 0x61, 0x72, 0x64, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22,
-	0x54, 0x0a, 0x22, 0x46, 0x6f, 0x72, 0x63, 0x65, 0x43, 0x75, 0x74, 0x4f, 0x76, 0x65, 0x72, 0x53,
-	0x63, 0x68, 0x65, 0x6d, 0x61, 0x4d, 0x69, 0x67, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65,
-	0x71, 0x75, 0x65, 0x73, 0x74, 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, 0x12, 0x0a, 0x04, 0x75, 0x75, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52,
-	0x04, 0x75, 0x75, 0x69, 0x64, 0x22, 0xeb, 0x01, 0x0a, 0x23, 0x46, 0x6f, 0x72, 0x63, 0x65, 0x43,
-	0x75, 0x74, 0x4f, 0x76, 0x65, 0x72, 0x53, 0x63, 0x68, 0x65, 0x6d, 0x61, 0x4d, 0x69, 0x67, 0x72,
-	0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x7c, 0x0a,
-	0x16, 0x72, 0x6f, 0x77, 0x73, 0x5f, 0x61, 0x66, 0x66, 0x65, 0x63, 0x74, 0x65, 0x64, 0x5f, 0x62,
-	0x79, 0x5f, 0x73, 0x68, 0x61, 0x72, 0x64, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x47, 0x2e,
-	0x76, 0x74, 0x63, 0x74, 0x6c, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x46, 0x6f, 0x72, 0x63, 0x65, 0x43,
-	0x75, 0x74, 0x4f, 0x76, 0x65, 0x72, 0x53, 0x63, 0x68, 0x65, 0x6d, 0x61, 0x4d, 0x69, 0x67, 0x72,
-	0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x2e, 0x52, 0x6f,
-	0x77, 0x73, 0x41, 0x66, 0x66, 0x65, 0x63, 0x74, 0x65, 0x64, 0x42, 0x79, 0x53, 0x68, 0x61, 0x72,
-	0x64, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x13, 0x72, 0x6f, 0x77, 0x73, 0x41, 0x66, 0x66, 0x65,
-	0x63, 0x74, 0x65, 0x64, 0x42, 0x79, 0x53, 0x68, 0x61, 0x72, 0x64, 0x1a, 0x46, 0x0a, 0x18, 0x52,
+	0x52, 0x0b, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x41, 0x6c, 0x69, 0x61, 0x73, 0x12, 0x19, 0x0a,
+	0x08, 0x61, 0x70, 0x70, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52,
+	0x07, 0x61, 0x70, 0x70, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x63, 0x6f, 0x70,
+	0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x73, 0x63, 0x6f, 0x70, 0x65, 0x12, 0x36,
+	0x0a, 0x17, 0x73, 0x6b, 0x69, 0x70, 0x5f, 0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x5f, 0x68,
+	0x65, 0x61, 0x72, 0x74, 0x62, 0x65, 0x61, 0x74, 0x73, 0x18, 0x04, 0x20, 0x01, 0x28, 0x08, 0x52,
+	0x15, 0x73, 0x6b, 0x69, 0x70, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x48, 0x65, 0x61, 0x72,
+	0x74, 0x62, 0x65, 0x61, 0x74, 0x73, 0x12, 0x27, 0x0a, 0x10, 0x6f, 0x6b, 0x5f, 0x69, 0x66, 0x5f,
+	0x6e, 0x6f, 0x74, 0x5f, 0x65, 0x78, 0x69, 0x73, 0x74, 0x73, 0x18, 0x05, 0x20, 0x01, 0x28, 0x08,
+	0x52, 0x0d, 0x6f, 0x6b, 0x49, 0x66, 0x4e, 0x6f, 0x74, 0x45, 0x78, 0x69, 0x73, 0x74, 0x73, 0x22,
+	0x93, 0x01, 0x0a, 0x16, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x54, 0x68, 0x72, 0x6f, 0x74, 0x74, 0x6c,
+	0x65, 0x72, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x38, 0x0a, 0x0c, 0x74, 0x61,
+	0x62, 0x6c, 0x65, 0x74, 0x5f, 0x61, 0x6c, 0x69, 0x61, 0x73, 0x18, 0x01, 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, 0x3f, 0x0a, 0x05, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x18, 0x02, 0x20,
+	0x01, 0x28, 0x0b, 0x32, 0x29, 0x2e, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x6d, 0x61, 0x6e, 0x61,
+	0x67, 0x65, 0x72, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x54, 0x68, 0x72,
+	0x6f, 0x74, 0x74, 0x6c, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x52, 0x05,
+	0x43, 0x68, 0x65, 0x63, 0x6b, 0x22, 0x4f, 0x0a, 0x1d, 0x43, 0x6c, 0x65, 0x61, 0x6e, 0x75, 0x70,
+	0x53, 0x63, 0x68, 0x65, 0x6d, 0x61, 0x4d, 0x69, 0x67, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52,
+	0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 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, 0x12, 0x0a, 0x04, 0x75, 0x75, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09,
+	0x52, 0x04, 0x75, 0x75, 0x69, 0x64, 0x22, 0xe1, 0x01, 0x0a, 0x1e, 0x43, 0x6c, 0x65, 0x61, 0x6e,
+	0x75, 0x70, 0x53, 0x63, 0x68, 0x65, 0x6d, 0x61, 0x4d, 0x69, 0x67, 0x72, 0x61, 0x74, 0x69, 0x6f,
+	0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x77, 0x0a, 0x16, 0x72, 0x6f, 0x77,
+	0x73, 0x5f, 0x61, 0x66, 0x66, 0x65, 0x63, 0x74, 0x65, 0x64, 0x5f, 0x62, 0x79, 0x5f, 0x73, 0x68,
+	0x61, 0x72, 0x64, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x42, 0x2e, 0x76, 0x74, 0x63, 0x74,
+	0x6c, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x43, 0x6c, 0x65, 0x61, 0x6e, 0x75, 0x70, 0x53, 0x63, 0x68,
+	0x65, 0x6d, 0x61, 0x4d, 0x69, 0x67, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70,
+	0x6f, 0x6e, 0x73, 0x65, 0x2e, 0x52, 0x6f, 0x77, 0x73, 0x41, 0x66, 0x66, 0x65, 0x63, 0x74, 0x65,
+	0x64, 0x42, 0x79, 0x53, 0x68, 0x61, 0x72, 0x64, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x13, 0x72,
 	0x6f, 0x77, 0x73, 0x41, 0x66, 0x66, 0x65, 0x63, 0x74, 0x65, 0x64, 0x42, 0x79, 0x53, 0x68, 0x61,
-	0x72, 0x64, 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, 0x04, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a,
-	0x02, 0x38, 0x01, 0x22, 0x9e, 0x01, 0x0a, 0x11, 0x47, 0x65, 0x74, 0x42, 0x61, 0x63, 0x6b, 0x75,
-	0x70, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 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, 0x14, 0x0a, 0x05, 0x6c,
-	0x69, 0x6d, 0x69, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x05, 0x6c, 0x69, 0x6d, 0x69,
-	0x74, 0x12, 0x1a, 0x0a, 0x08, 0x64, 0x65, 0x74, 0x61, 0x69, 0x6c, 0x65, 0x64, 0x18, 0x04, 0x20,
-	0x01, 0x28, 0x08, 0x52, 0x08, 0x64, 0x65, 0x74, 0x61, 0x69, 0x6c, 0x65, 0x64, 0x12, 0x25, 0x0a,
-	0x0e, 0x64, 0x65, 0x74, 0x61, 0x69, 0x6c, 0x65, 0x64, 0x5f, 0x6c, 0x69, 0x6d, 0x69, 0x74, 0x18,
-	0x05, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x0d, 0x64, 0x65, 0x74, 0x61, 0x69, 0x6c, 0x65, 0x64, 0x4c,
-	0x69, 0x6d, 0x69, 0x74, 0x22, 0x44, 0x0a, 0x12, 0x47, 0x65, 0x74, 0x42, 0x61, 0x63, 0x6b, 0x75,
-	0x70, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x2e, 0x0a, 0x07, 0x62, 0x61,
-	0x63, 0x6b, 0x75, 0x70, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x6d, 0x79,
-	0x73, 0x71, 0x6c, 0x63, 0x74, 0x6c, 0x2e, 0x42, 0x61, 0x63, 0x6b, 0x75, 0x70, 0x49, 0x6e, 0x66,
-	0x6f, 0x52, 0x07, 0x62, 0x61, 0x63, 0x6b, 0x75, 0x70, 0x73, 0x22, 0x28, 0x0a, 0x12, 0x47, 0x65,
-	0x74, 0x43, 0x65, 0x6c, 0x6c, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74,
-	0x12, 0x12, 0x0a, 0x04, 0x63, 0x65, 0x6c, 0x6c, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04,
-	0x63, 0x65, 0x6c, 0x6c, 0x22, 0x46, 0x0a, 0x13, 0x47, 0x65, 0x74, 0x43, 0x65, 0x6c, 0x6c, 0x49,
-	0x6e, 0x66, 0x6f, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x2f, 0x0a, 0x09, 0x63,
-	0x65, 0x6c, 0x6c, 0x5f, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x12,
-	0x2e, 0x74, 0x6f, 0x70, 0x6f, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x43, 0x65, 0x6c, 0x6c, 0x49, 0x6e,
-	0x66, 0x6f, 0x52, 0x08, 0x63, 0x65, 0x6c, 0x6c, 0x49, 0x6e, 0x66, 0x6f, 0x22, 0x19, 0x0a, 0x17,
-	0x47, 0x65, 0x74, 0x43, 0x65, 0x6c, 0x6c, 0x49, 0x6e, 0x66, 0x6f, 0x4e, 0x61, 0x6d, 0x65, 0x73,
-	0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x22, 0x30, 0x0a, 0x18, 0x47, 0x65, 0x74, 0x43, 0x65,
-	0x6c, 0x6c, 0x49, 0x6e, 0x66, 0x6f, 0x4e, 0x61, 0x6d, 0x65, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f,
-	0x6e, 0x73, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x6e, 0x61, 0x6d, 0x65, 0x73, 0x18, 0x01, 0x20, 0x03,
-	0x28, 0x09, 0x52, 0x05, 0x6e, 0x61, 0x6d, 0x65, 0x73, 0x22, 0x18, 0x0a, 0x16, 0x47, 0x65, 0x74,
-	0x43, 0x65, 0x6c, 0x6c, 0x73, 0x41, 0x6c, 0x69, 0x61, 0x73, 0x65, 0x73, 0x52, 0x65, 0x71, 0x75,
-	0x65, 0x73, 0x74, 0x22, 0xb6, 0x01, 0x0a, 0x17, 0x47, 0x65, 0x74, 0x43, 0x65, 0x6c, 0x6c, 0x73,
-	0x41, 0x6c, 0x69, 0x61, 0x73, 0x65, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12,
-	0x49, 0x0a, 0x07, 0x61, 0x6c, 0x69, 0x61, 0x73, 0x65, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b,
-	0x32, 0x2f, 0x2e, 0x76, 0x74, 0x63, 0x74, 0x6c, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x47, 0x65, 0x74,
-	0x43, 0x65, 0x6c, 0x6c, 0x73, 0x41, 0x6c, 0x69, 0x61, 0x73, 0x65, 0x73, 0x52, 0x65, 0x73, 0x70,
-	0x6f, 0x6e, 0x73, 0x65, 0x2e, 0x41, 0x6c, 0x69, 0x61, 0x73, 0x65, 0x73, 0x45, 0x6e, 0x74, 0x72,
-	0x79, 0x52, 0x07, 0x61, 0x6c, 0x69, 0x61, 0x73, 0x65, 0x73, 0x1a, 0x50, 0x0a, 0x0c, 0x41, 0x6c,
-	0x69, 0x61, 0x73, 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, 0x2a, 0x0a, 0x05,
-	0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x74, 0x6f,
-	0x70, 0x6f, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x43, 0x65, 0x6c, 0x6c, 0x73, 0x41, 0x6c, 0x69, 0x61,
-	0x73, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x50, 0x0a, 0x14,
-	0x47, 0x65, 0x74, 0x46, 0x75, 0x6c, 0x6c, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x52, 0x65, 0x71,
-	0x75, 0x65, 0x73, 0x74, 0x12, 0x38, 0x0a, 0x0c, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x5f, 0x61,
+	0x72, 0x64, 0x1a, 0x46, 0x0a, 0x18, 0x52, 0x6f, 0x77, 0x73, 0x41, 0x66, 0x66, 0x65, 0x63, 0x74,
+	0x65, 0x64, 0x42, 0x79, 0x53, 0x68, 0x61, 0x72, 0x64, 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, 0x04, 0x52,
+	0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x50, 0x0a, 0x1e, 0x43, 0x6f,
+	0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x53, 0x63, 0x68, 0x65, 0x6d, 0x61, 0x4d, 0x69, 0x67, 0x72,
+	0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 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, 0x12, 0x0a, 0x04, 0x75, 0x75, 0x69, 0x64,
+	0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x75, 0x75, 0x69, 0x64, 0x22, 0xe3, 0x01, 0x0a,
+	0x1f, 0x43, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x53, 0x63, 0x68, 0x65, 0x6d, 0x61, 0x4d,
+	0x69, 0x67, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65,
+	0x12, 0x78, 0x0a, 0x16, 0x72, 0x6f, 0x77, 0x73, 0x5f, 0x61, 0x66, 0x66, 0x65, 0x63, 0x74, 0x65,
+	0x64, 0x5f, 0x62, 0x79, 0x5f, 0x73, 0x68, 0x61, 0x72, 0x64, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b,
+	0x32, 0x43, 0x2e, 0x76, 0x74, 0x63, 0x74, 0x6c, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x43, 0x6f, 0x6d,
+	0x70, 0x6c, 0x65, 0x74, 0x65, 0x53, 0x63, 0x68, 0x65, 0x6d, 0x61, 0x4d, 0x69, 0x67, 0x72, 0x61,
+	0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x2e, 0x52, 0x6f, 0x77,
+	0x73, 0x41, 0x66, 0x66, 0x65, 0x63, 0x74, 0x65, 0x64, 0x42, 0x79, 0x53, 0x68, 0x61, 0x72, 0x64,
+	0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x13, 0x72, 0x6f, 0x77, 0x73, 0x41, 0x66, 0x66, 0x65, 0x63,
+	0x74, 0x65, 0x64, 0x42, 0x79, 0x53, 0x68, 0x61, 0x72, 0x64, 0x1a, 0x46, 0x0a, 0x18, 0x52, 0x6f,
+	0x77, 0x73, 0x41, 0x66, 0x66, 0x65, 0x63, 0x74, 0x65, 0x64, 0x42, 0x79, 0x53, 0x68, 0x61, 0x72,
+	0x64, 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, 0x04, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02,
+	0x38, 0x01, 0x22, 0x8a, 0x03, 0x0a, 0x16, 0x43, 0x6f, 0x70, 0x79, 0x53, 0x63, 0x68, 0x65, 0x6d,
+	0x61, 0x53, 0x68, 0x61, 0x72, 0x64, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x45, 0x0a,
+	0x13, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x5f, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x5f, 0x61,
 	0x6c, 0x69, 0x61, 0x73, 0x18, 0x01, 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, 0x4c,
-	0x0a, 0x15, 0x47, 0x65, 0x74, 0x46, 0x75, 0x6c, 0x6c, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x52,
-	0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x33, 0x0a, 0x06, 0x73, 0x74, 0x61, 0x74, 0x75,
-	0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1b, 0x2e, 0x72, 0x65, 0x70, 0x6c, 0x69, 0x63,
-	0x61, 0x74, 0x69, 0x6f, 0x6e, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x46, 0x75, 0x6c, 0x6c, 0x53, 0x74,
-	0x61, 0x74, 0x75, 0x73, 0x52, 0x06, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x22, 0x15, 0x0a, 0x13,
-	0x47, 0x65, 0x74, 0x4b, 0x65, 0x79, 0x73, 0x70, 0x61, 0x63, 0x65, 0x73, 0x52, 0x65, 0x71, 0x75,
-	0x65, 0x73, 0x74, 0x22, 0x49, 0x0a, 0x14, 0x47, 0x65, 0x74, 0x4b, 0x65, 0x79, 0x73, 0x70, 0x61,
-	0x63, 0x65, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x31, 0x0a, 0x09, 0x6b,
-	0x65, 0x79, 0x73, 0x70, 0x61, 0x63, 0x65, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x13,
+	0x73, 0x52, 0x11, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x41,
+	0x6c, 0x69, 0x61, 0x73, 0x12, 0x16, 0x0a, 0x06, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x73, 0x18, 0x02,
+	0x20, 0x03, 0x28, 0x09, 0x52, 0x06, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x73, 0x12, 0x25, 0x0a, 0x0e,
+	0x65, 0x78, 0x63, 0x6c, 0x75, 0x64, 0x65, 0x5f, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x73, 0x18, 0x03,
+	0x20, 0x03, 0x28, 0x09, 0x52, 0x0d, 0x65, 0x78, 0x63, 0x6c, 0x75, 0x64, 0x65, 0x54, 0x61, 0x62,
+	0x6c, 0x65, 0x73, 0x12, 0x23, 0x0a, 0x0d, 0x69, 0x6e, 0x63, 0x6c, 0x75, 0x64, 0x65, 0x5f, 0x76,
+	0x69, 0x65, 0x77, 0x73, 0x18, 0x04, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0c, 0x69, 0x6e, 0x63, 0x6c,
+	0x75, 0x64, 0x65, 0x56, 0x69, 0x65, 0x77, 0x73, 0x12, 0x1f, 0x0a, 0x0b, 0x73, 0x6b, 0x69, 0x70,
+	0x5f, 0x76, 0x65, 0x72, 0x69, 0x66, 0x79, 0x18, 0x05, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0a, 0x73,
+	0x6b, 0x69, 0x70, 0x56, 0x65, 0x72, 0x69, 0x66, 0x79, 0x12, 0x44, 0x0a, 0x15, 0x77, 0x61, 0x69,
+	0x74, 0x5f, 0x72, 0x65, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x73, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x6f,
+	0x75, 0x74, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x76, 0x74, 0x74, 0x69, 0x6d,
+	0x65, 0x2e, 0x44, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x13, 0x77, 0x61, 0x69, 0x74,
+	0x52, 0x65, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x73, 0x54, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x12,
+	0x31, 0x0a, 0x14, 0x64, 0x65, 0x73, 0x74, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x6b,
+	0x65, 0x79, 0x73, 0x70, 0x61, 0x63, 0x65, 0x18, 0x07, 0x20, 0x01, 0x28, 0x09, 0x52, 0x13, 0x64,
+	0x65, 0x73, 0x74, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x4b, 0x65, 0x79, 0x73, 0x70, 0x61,
+	0x63, 0x65, 0x12, 0x2b, 0x0a, 0x11, 0x64, 0x65, 0x73, 0x74, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f,
+	0x6e, 0x5f, 0x73, 0x68, 0x61, 0x72, 0x64, 0x18, 0x08, 0x20, 0x01, 0x28, 0x09, 0x52, 0x10, 0x64,
+	0x65, 0x73, 0x74, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x53, 0x68, 0x61, 0x72, 0x64, 0x22,
+	0x19, 0x0a, 0x17, 0x43, 0x6f, 0x70, 0x79, 0x53, 0x63, 0x68, 0x65, 0x6d, 0x61, 0x53, 0x68, 0x61,
+	0x72, 0x64, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0xdd, 0x02, 0x0a, 0x15, 0x43,
+	0x72, 0x65, 0x61, 0x74, 0x65, 0x4b, 0x65, 0x79, 0x73, 0x70, 0x61, 0x63, 0x65, 0x52, 0x65, 0x71,
+	0x75, 0x65, 0x73, 0x74, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01,
+	0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x66, 0x6f, 0x72, 0x63,
+	0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x05, 0x66, 0x6f, 0x72, 0x63, 0x65, 0x12, 0x2f,
+	0x0a, 0x14, 0x61, 0x6c, 0x6c, 0x6f, 0x77, 0x5f, 0x65, 0x6d, 0x70, 0x74, 0x79, 0x5f, 0x76, 0x5f,
+	0x73, 0x63, 0x68, 0x65, 0x6d, 0x61, 0x18, 0x03, 0x20, 0x01, 0x28, 0x08, 0x52, 0x11, 0x61, 0x6c,
+	0x6c, 0x6f, 0x77, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x56, 0x53, 0x63, 0x68, 0x65, 0x6d, 0x61, 0x12,
+	0x2a, 0x0a, 0x04, 0x74, 0x79, 0x70, 0x65, 0x18, 0x07, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x16, 0x2e,
+	0x74, 0x6f, 0x70, 0x6f, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x4b, 0x65, 0x79, 0x73, 0x70, 0x61, 0x63,
+	0x65, 0x54, 0x79, 0x70, 0x65, 0x52, 0x04, 0x74, 0x79, 0x70, 0x65, 0x12, 0x23, 0x0a, 0x0d, 0x62,
+	0x61, 0x73, 0x65, 0x5f, 0x6b, 0x65, 0x79, 0x73, 0x70, 0x61, 0x63, 0x65, 0x18, 0x08, 0x20, 0x01,
+	0x28, 0x09, 0x52, 0x0c, 0x62, 0x61, 0x73, 0x65, 0x4b, 0x65, 0x79, 0x73, 0x70, 0x61, 0x63, 0x65,
+	0x12, 0x31, 0x0a, 0x0d, 0x73, 0x6e, 0x61, 0x70, 0x73, 0x68, 0x6f, 0x74, 0x5f, 0x74, 0x69, 0x6d,
+	0x65, 0x18, 0x09, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0c, 0x2e, 0x76, 0x74, 0x74, 0x69, 0x6d, 0x65,
+	0x2e, 0x54, 0x69, 0x6d, 0x65, 0x52, 0x0c, 0x73, 0x6e, 0x61, 0x70, 0x73, 0x68, 0x6f, 0x74, 0x54,
+	0x69, 0x6d, 0x65, 0x12, 0x2b, 0x0a, 0x11, 0x64, 0x75, 0x72, 0x61, 0x62, 0x69, 0x6c, 0x69, 0x74,
+	0x79, 0x5f, 0x70, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x09, 0x52, 0x10,
+	0x64, 0x75, 0x72, 0x61, 0x62, 0x69, 0x6c, 0x69, 0x74, 0x79, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79,
+	0x12, 0x26, 0x0a, 0x0f, 0x73, 0x69, 0x64, 0x65, 0x63, 0x61, 0x72, 0x5f, 0x64, 0x62, 0x5f, 0x6e,
+	0x61, 0x6d, 0x65, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x73, 0x69, 0x64, 0x65, 0x63,
+	0x61, 0x72, 0x44, 0x62, 0x4e, 0x61, 0x6d, 0x65, 0x4a, 0x04, 0x08, 0x04, 0x10, 0x05, 0x4a, 0x04,
+	0x08, 0x05, 0x10, 0x06, 0x4a, 0x04, 0x08, 0x06, 0x10, 0x07, 0x22, 0x49, 0x0a, 0x16, 0x43, 0x72,
+	0x65, 0x61, 0x74, 0x65, 0x4b, 0x65, 0x79, 0x73, 0x70, 0x61, 0x63, 0x65, 0x52, 0x65, 0x73, 0x70,
+	0x6f, 0x6e, 0x73, 0x65, 0x12, 0x2f, 0x0a, 0x08, 0x6b, 0x65, 0x79, 0x73, 0x70, 0x61, 0x63, 0x65,
+	0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x76, 0x74, 0x63, 0x74, 0x6c, 0x64, 0x61,
+	0x74, 0x61, 0x2e, 0x4b, 0x65, 0x79, 0x73, 0x70, 0x61, 0x63, 0x65, 0x52, 0x08, 0x6b, 0x65, 0x79,
+	0x73, 0x70, 0x61, 0x63, 0x65, 0x22, 0x8c, 0x01, 0x0a, 0x12, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65,
+	0x53, 0x68, 0x61, 0x72, 0x64, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 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, 0x1d, 0x0a, 0x0a, 0x73, 0x68, 0x61, 0x72,
+	0x64, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x73, 0x68,
+	0x61, 0x72, 0x64, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x66, 0x6f, 0x72, 0x63, 0x65,
+	0x18, 0x03, 0x20, 0x01, 0x28, 0x08, 0x52, 0x05, 0x66, 0x6f, 0x72, 0x63, 0x65, 0x12, 0x25, 0x0a,
+	0x0e, 0x69, 0x6e, 0x63, 0x6c, 0x75, 0x64, 0x65, 0x5f, 0x70, 0x61, 0x72, 0x65, 0x6e, 0x74, 0x18,
+	0x04, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0d, 0x69, 0x6e, 0x63, 0x6c, 0x75, 0x64, 0x65, 0x50, 0x61,
+	0x72, 0x65, 0x6e, 0x74, 0x22, 0xa0, 0x01, 0x0a, 0x13, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x53,
+	0x68, 0x61, 0x72, 0x64, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x2f, 0x0a, 0x08,
+	0x6b, 0x65, 0x79, 0x73, 0x70, 0x61, 0x63, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x13,
 	0x2e, 0x76, 0x74, 0x63, 0x74, 0x6c, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x4b, 0x65, 0x79, 0x73, 0x70,
-	0x61, 0x63, 0x65, 0x52, 0x09, 0x6b, 0x65, 0x79, 0x73, 0x70, 0x61, 0x63, 0x65, 0x73, 0x22, 0x30,
-	0x0a, 0x12, 0x47, 0x65, 0x74, 0x4b, 0x65, 0x79, 0x73, 0x70, 0x61, 0x63, 0x65, 0x52, 0x65, 0x71,
-	0x75, 0x65, 0x73, 0x74, 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,
-	0x22, 0x46, 0x0a, 0x13, 0x47, 0x65, 0x74, 0x4b, 0x65, 0x79, 0x73, 0x70, 0x61, 0x63, 0x65, 0x52,
-	0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x2f, 0x0a, 0x08, 0x6b, 0x65, 0x79, 0x73, 0x70,
-	0x61, 0x63, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x76, 0x74, 0x63, 0x74,
-	0x6c, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x4b, 0x65, 0x79, 0x73, 0x70, 0x61, 0x63, 0x65, 0x52, 0x08,
-	0x6b, 0x65, 0x79, 0x73, 0x70, 0x61, 0x63, 0x65, 0x22, 0x51, 0x0a, 0x15, 0x47, 0x65, 0x74, 0x50,
-	0x65, 0x72, 0x6d, 0x69, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73,
+	0x61, 0x63, 0x65, 0x52, 0x08, 0x6b, 0x65, 0x79, 0x73, 0x70, 0x61, 0x63, 0x65, 0x12, 0x26, 0x0a,
+	0x05, 0x73, 0x68, 0x61, 0x72, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x76,
+	0x74, 0x63, 0x74, 0x6c, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x53, 0x68, 0x61, 0x72, 0x64, 0x52, 0x05,
+	0x73, 0x68, 0x61, 0x72, 0x64, 0x12, 0x30, 0x0a, 0x14, 0x73, 0x68, 0x61, 0x72, 0x64, 0x5f, 0x61,
+	0x6c, 0x72, 0x65, 0x61, 0x64, 0x79, 0x5f, 0x65, 0x78, 0x69, 0x73, 0x74, 0x73, 0x18, 0x03, 0x20,
+	0x01, 0x28, 0x08, 0x52, 0x12, 0x73, 0x68, 0x61, 0x72, 0x64, 0x41, 0x6c, 0x72, 0x65, 0x61, 0x64,
+	0x79, 0x45, 0x78, 0x69, 0x73, 0x74, 0x73, 0x22, 0x41, 0x0a, 0x15, 0x44, 0x65, 0x6c, 0x65, 0x74,
+	0x65, 0x43, 0x65, 0x6c, 0x6c, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74,
+	0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04,
+	0x6e, 0x61, 0x6d, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x66, 0x6f, 0x72, 0x63, 0x65, 0x18, 0x02, 0x20,
+	0x01, 0x28, 0x08, 0x52, 0x05, 0x66, 0x6f, 0x72, 0x63, 0x65, 0x22, 0x18, 0x0a, 0x16, 0x44, 0x65,
+	0x6c, 0x65, 0x74, 0x65, 0x43, 0x65, 0x6c, 0x6c, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65, 0x73, 0x70,
+	0x6f, 0x6e, 0x73, 0x65, 0x22, 0x2d, 0x0a, 0x17, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x43, 0x65,
+	0x6c, 0x6c, 0x73, 0x41, 0x6c, 0x69, 0x61, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12,
+	0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e,
+	0x61, 0x6d, 0x65, 0x22, 0x1a, 0x0a, 0x18, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x43, 0x65, 0x6c,
+	0x6c, 0x73, 0x41, 0x6c, 0x69, 0x61, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22,
+	0x67, 0x0a, 0x15, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x4b, 0x65, 0x79, 0x73, 0x70, 0x61, 0x63,
+	0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 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, 0x1c, 0x0a, 0x09, 0x72, 0x65, 0x63, 0x75, 0x72, 0x73, 0x69, 0x76,
+	0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x09, 0x72, 0x65, 0x63, 0x75, 0x72, 0x73, 0x69,
+	0x76, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x66, 0x6f, 0x72, 0x63, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28,
+	0x08, 0x52, 0x05, 0x66, 0x6f, 0x72, 0x63, 0x65, 0x22, 0x18, 0x0a, 0x16, 0x44, 0x65, 0x6c, 0x65,
+	0x74, 0x65, 0x4b, 0x65, 0x79, 0x73, 0x70, 0x61, 0x63, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e,
+	0x73, 0x65, 0x22, 0x9b, 0x01, 0x0a, 0x13, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x53, 0x68, 0x61,
+	0x72, 0x64, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x28, 0x0a, 0x06, 0x73, 0x68,
+	0x61, 0x72, 0x64, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x76, 0x74, 0x63,
+	0x74, 0x6c, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x53, 0x68, 0x61, 0x72, 0x64, 0x52, 0x06, 0x73, 0x68,
+	0x61, 0x72, 0x64, 0x73, 0x12, 0x1c, 0x0a, 0x09, 0x72, 0x65, 0x63, 0x75, 0x72, 0x73, 0x69, 0x76,
+	0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x09, 0x72, 0x65, 0x63, 0x75, 0x72, 0x73, 0x69,
+	0x76, 0x65, 0x12, 0x26, 0x0a, 0x0f, 0x65, 0x76, 0x65, 0x6e, 0x5f, 0x69, 0x66, 0x5f, 0x73, 0x65,
+	0x72, 0x76, 0x69, 0x6e, 0x67, 0x18, 0x04, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0d, 0x65, 0x76, 0x65,
+	0x6e, 0x49, 0x66, 0x53, 0x65, 0x72, 0x76, 0x69, 0x6e, 0x67, 0x12, 0x14, 0x0a, 0x05, 0x66, 0x6f,
+	0x72, 0x63, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x08, 0x52, 0x05, 0x66, 0x6f, 0x72, 0x63, 0x65,
+	0x22, 0x16, 0x0a, 0x14, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x53, 0x68, 0x61, 0x72, 0x64, 0x73,
+	0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x2d, 0x0a, 0x17, 0x44, 0x65, 0x6c, 0x65,
+	0x74, 0x65, 0x53, 0x72, 0x76, 0x56, 0x53, 0x63, 0x68, 0x65, 0x6d, 0x61, 0x52, 0x65, 0x71, 0x75,
+	0x65, 0x73, 0x74, 0x12, 0x12, 0x0a, 0x04, 0x63, 0x65, 0x6c, 0x6c, 0x18, 0x01, 0x20, 0x01, 0x28,
+	0x09, 0x52, 0x04, 0x63, 0x65, 0x6c, 0x6c, 0x22, 0x1a, 0x0a, 0x18, 0x44, 0x65, 0x6c, 0x65, 0x74,
+	0x65, 0x53, 0x72, 0x76, 0x56, 0x53, 0x63, 0x68, 0x65, 0x6d, 0x61, 0x52, 0x65, 0x73, 0x70, 0x6f,
+	0x6e, 0x73, 0x65, 0x22, 0x79, 0x0a, 0x14, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x54, 0x61, 0x62,
+	0x6c, 0x65, 0x74, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x3c, 0x0a, 0x0e, 0x74,
+	0x61, 0x62, 0x6c, 0x65, 0x74, 0x5f, 0x61, 0x6c, 0x69, 0x61, 0x73, 0x65, 0x73, 0x18, 0x01, 0x20,
+	0x03, 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, 0x0d, 0x74, 0x61, 0x62, 0x6c,
+	0x65, 0x74, 0x41, 0x6c, 0x69, 0x61, 0x73, 0x65, 0x73, 0x12, 0x23, 0x0a, 0x0d, 0x61, 0x6c, 0x6c,
+	0x6f, 0x77, 0x5f, 0x70, 0x72, 0x69, 0x6d, 0x61, 0x72, 0x79, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08,
+	0x52, 0x0c, 0x61, 0x6c, 0x6c, 0x6f, 0x77, 0x50, 0x72, 0x69, 0x6d, 0x61, 0x72, 0x79, 0x22, 0x17,
+	0x0a, 0x15, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x73, 0x52,
+	0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0xc3, 0x03, 0x0a, 0x1d, 0x45, 0x6d, 0x65, 0x72,
+	0x67, 0x65, 0x6e, 0x63, 0x79, 0x52, 0x65, 0x70, 0x61, 0x72, 0x65, 0x6e, 0x74, 0x53, 0x68, 0x61,
+	0x72, 0x64, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 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, 0x36, 0x0a, 0x0b, 0x6e,
+	0x65, 0x77, 0x5f, 0x70, 0x72, 0x69, 0x6d, 0x61, 0x72, 0x79, 0x18, 0x03, 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, 0x0a, 0x6e, 0x65, 0x77, 0x50, 0x72, 0x69, 0x6d,
+	0x61, 0x72, 0x79, 0x12, 0x3e, 0x0a, 0x0f, 0x69, 0x67, 0x6e, 0x6f, 0x72, 0x65, 0x5f, 0x72, 0x65,
+	0x70, 0x6c, 0x69, 0x63, 0x61, 0x73, 0x18, 0x04, 0x20, 0x03, 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, 0x0e, 0x69, 0x67, 0x6e, 0x6f, 0x72, 0x65, 0x52, 0x65, 0x70, 0x6c, 0x69,
+	0x63, 0x61, 0x73, 0x12, 0x44, 0x0a, 0x15, 0x77, 0x61, 0x69, 0x74, 0x5f, 0x72, 0x65, 0x70, 0x6c,
+	0x69, 0x63, 0x61, 0x73, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x18, 0x05, 0x20, 0x01,
+	0x28, 0x0b, 0x32, 0x10, 0x2e, 0x76, 0x74, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x44, 0x75, 0x72, 0x61,
+	0x74, 0x69, 0x6f, 0x6e, 0x52, 0x13, 0x77, 0x61, 0x69, 0x74, 0x52, 0x65, 0x70, 0x6c, 0x69, 0x63,
+	0x61, 0x73, 0x54, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x12, 0x3f, 0x0a, 0x1c, 0x70, 0x72, 0x65,
+	0x76, 0x65, 0x6e, 0x74, 0x5f, 0x63, 0x72, 0x6f, 0x73, 0x73, 0x5f, 0x63, 0x65, 0x6c, 0x6c, 0x5f,
+	0x70, 0x72, 0x6f, 0x6d, 0x6f, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x06, 0x20, 0x01, 0x28, 0x08, 0x52,
+	0x19, 0x70, 0x72, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x43, 0x72, 0x6f, 0x73, 0x73, 0x43, 0x65, 0x6c,
+	0x6c, 0x50, 0x72, 0x6f, 0x6d, 0x6f, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x2f, 0x0a, 0x14, 0x77, 0x61,
+	0x69, 0x74, 0x5f, 0x66, 0x6f, 0x72, 0x5f, 0x61, 0x6c, 0x6c, 0x5f, 0x74, 0x61, 0x62, 0x6c, 0x65,
+	0x74, 0x73, 0x18, 0x07, 0x20, 0x01, 0x28, 0x08, 0x52, 0x11, 0x77, 0x61, 0x69, 0x74, 0x46, 0x6f,
+	0x72, 0x41, 0x6c, 0x6c, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x73, 0x12, 0x40, 0x0a, 0x10, 0x65,
+	0x78, 0x70, 0x65, 0x63, 0x74, 0x65, 0x64, 0x5f, 0x70, 0x72, 0x69, 0x6d, 0x61, 0x72, 0x79, 0x18,
+	0x08, 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, 0x0f, 0x65, 0x78,
+	0x70, 0x65, 0x63, 0x74, 0x65, 0x64, 0x50, 0x72, 0x69, 0x6d, 0x61, 0x72, 0x79, 0x22, 0xbc, 0x01,
+	0x0a, 0x1e, 0x45, 0x6d, 0x65, 0x72, 0x67, 0x65, 0x6e, 0x63, 0x79, 0x52, 0x65, 0x70, 0x61, 0x72,
+	0x65, 0x6e, 0x74, 0x53, 0x68, 0x61, 0x72, 0x64, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65,
+	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, 0x40, 0x0a, 0x10, 0x70, 0x72, 0x6f, 0x6d, 0x6f, 0x74, 0x65, 0x64, 0x5f, 0x70,
+	0x72, 0x69, 0x6d, 0x61, 0x72, 0x79, 0x18, 0x03, 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, 0x0f, 0x70, 0x72, 0x6f, 0x6d, 0x6f, 0x74, 0x65, 0x64, 0x50, 0x72, 0x69,
+	0x6d, 0x61, 0x72, 0x79, 0x12, 0x26, 0x0a, 0x06, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x73, 0x18, 0x04,
+	0x20, 0x03, 0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x6c, 0x6f, 0x67, 0x75, 0x74, 0x69, 0x6c, 0x2e, 0x45,
+	0x76, 0x65, 0x6e, 0x74, 0x52, 0x06, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x73, 0x22, 0xa0, 0x01, 0x0a,
+	0x18, 0x45, 0x78, 0x65, 0x63, 0x75, 0x74, 0x65, 0x46, 0x65, 0x74, 0x63, 0x68, 0x41, 0x73, 0x41,
+	0x70, 0x70, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x38, 0x0a, 0x0c, 0x74, 0x61, 0x62,
+	0x6c, 0x65, 0x74, 0x5f, 0x61, 0x6c, 0x69, 0x61, 0x73, 0x18, 0x01, 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, 0x14, 0x0a, 0x05, 0x71, 0x75, 0x65, 0x72, 0x79, 0x18, 0x02, 0x20, 0x01,
+	0x28, 0x09, 0x52, 0x05, 0x71, 0x75, 0x65, 0x72, 0x79, 0x12, 0x19, 0x0a, 0x08, 0x6d, 0x61, 0x78,
+	0x5f, 0x72, 0x6f, 0x77, 0x73, 0x18, 0x03, 0x20, 0x01, 0x28, 0x03, 0x52, 0x07, 0x6d, 0x61, 0x78,
+	0x52, 0x6f, 0x77, 0x73, 0x12, 0x19, 0x0a, 0x08, 0x75, 0x73, 0x65, 0x5f, 0x70, 0x6f, 0x6f, 0x6c,
+	0x18, 0x04, 0x20, 0x01, 0x28, 0x08, 0x52, 0x07, 0x75, 0x73, 0x65, 0x50, 0x6f, 0x6f, 0x6c, 0x22,
+	0x47, 0x0a, 0x19, 0x45, 0x78, 0x65, 0x63, 0x75, 0x74, 0x65, 0x46, 0x65, 0x74, 0x63, 0x68, 0x41,
+	0x73, 0x41, 0x70, 0x70, 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, 0xd3, 0x01, 0x0a, 0x18, 0x45, 0x78, 0x65,
+	0x63, 0x75, 0x74, 0x65, 0x46, 0x65, 0x74, 0x63, 0x68, 0x41, 0x73, 0x44, 0x42, 0x41, 0x52, 0x65,
+	0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x38, 0x0a, 0x0c, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x5f,
+	0x61, 0x6c, 0x69, 0x61, 0x73, 0x18, 0x01, 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,
+	0x14, 0x0a, 0x05, 0x71, 0x75, 0x65, 0x72, 0x79, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05,
+	0x71, 0x75, 0x65, 0x72, 0x79, 0x12, 0x19, 0x0a, 0x08, 0x6d, 0x61, 0x78, 0x5f, 0x72, 0x6f, 0x77,
+	0x73, 0x18, 0x03, 0x20, 0x01, 0x28, 0x03, 0x52, 0x07, 0x6d, 0x61, 0x78, 0x52, 0x6f, 0x77, 0x73,
+	0x12, 0x27, 0x0a, 0x0f, 0x64, 0x69, 0x73, 0x61, 0x62, 0x6c, 0x65, 0x5f, 0x62, 0x69, 0x6e, 0x6c,
+	0x6f, 0x67, 0x73, 0x18, 0x04, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0e, 0x64, 0x69, 0x73, 0x61, 0x62,
+	0x6c, 0x65, 0x42, 0x69, 0x6e, 0x6c, 0x6f, 0x67, 0x73, 0x12, 0x23, 0x0a, 0x0d, 0x72, 0x65, 0x6c,
+	0x6f, 0x61, 0x64, 0x5f, 0x73, 0x63, 0x68, 0x65, 0x6d, 0x61, 0x18, 0x05, 0x20, 0x01, 0x28, 0x08,
+	0x52, 0x0c, 0x72, 0x65, 0x6c, 0x6f, 0x61, 0x64, 0x53, 0x63, 0x68, 0x65, 0x6d, 0x61, 0x22, 0x47,
+	0x0a, 0x19, 0x45, 0x78, 0x65, 0x63, 0x75, 0x74, 0x65, 0x46, 0x65, 0x74, 0x63, 0x68, 0x41, 0x73,
+	0x44, 0x42, 0x41, 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, 0xa5, 0x01, 0x0a, 0x12, 0x45, 0x78, 0x65, 0x63,
+	0x75, 0x74, 0x65, 0x48, 0x6f, 0x6f, 0x6b, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x38,
+	0x0a, 0x0c, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x5f, 0x61, 0x6c, 0x69, 0x61, 0x73, 0x18, 0x01,
+	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, 0x55, 0x0a, 0x13, 0x74, 0x61, 0x62, 0x6c,
+	0x65, 0x74, 0x5f, 0x68, 0x6f, 0x6f, 0x6b, 0x5f, 0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x18,
+	0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x25, 0x2e, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x6d, 0x61,
+	0x6e, 0x61, 0x67, 0x65, 0x72, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x45, 0x78, 0x65, 0x63, 0x75, 0x74,
+	0x65, 0x48, 0x6f, 0x6f, 0x6b, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x52, 0x11, 0x74, 0x61,
+	0x62, 0x6c, 0x65, 0x74, 0x48, 0x6f, 0x6f, 0x6b, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x22,
+	0x5e, 0x0a, 0x13, 0x45, 0x78, 0x65, 0x63, 0x75, 0x74, 0x65, 0x48, 0x6f, 0x6f, 0x6b, 0x52, 0x65,
+	0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x47, 0x0a, 0x0b, 0x68, 0x6f, 0x6f, 0x6b, 0x5f, 0x72,
+	0x65, 0x73, 0x75, 0x6c, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x26, 0x2e, 0x74, 0x61,
+	0x62, 0x6c, 0x65, 0x74, 0x6d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x72, 0x64, 0x61, 0x74, 0x61, 0x2e,
+	0x45, 0x78, 0x65, 0x63, 0x75, 0x74, 0x65, 0x48, 0x6f, 0x6f, 0x6b, 0x52, 0x65, 0x73, 0x70, 0x6f,
+	0x6e, 0x73, 0x65, 0x52, 0x0a, 0x68, 0x6f, 0x6f, 0x6b, 0x52, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x22,
+	0xd4, 0x01, 0x0a, 0x1d, 0x45, 0x78, 0x65, 0x63, 0x75, 0x74, 0x65, 0x4d, 0x75, 0x6c, 0x74, 0x69,
+	0x46, 0x65, 0x74, 0x63, 0x68, 0x41, 0x73, 0x44, 0x42, 0x41, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73,
 	0x74, 0x12, 0x38, 0x0a, 0x0c, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x5f, 0x61, 0x6c, 0x69, 0x61,
 	0x73, 0x18, 0x01, 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, 0x5a, 0x0a, 0x16, 0x47,
-	0x65, 0x74, 0x50, 0x65, 0x72, 0x6d, 0x69, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x52, 0x65, 0x73,
-	0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x40, 0x0a, 0x0b, 0x70, 0x65, 0x72, 0x6d, 0x69, 0x73, 0x73,
-	0x69, 0x6f, 0x6e, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1e, 0x2e, 0x74, 0x61, 0x62,
-	0x6c, 0x65, 0x74, 0x6d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x72, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x50,
-	0x65, 0x72, 0x6d, 0x69, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x52, 0x0b, 0x70, 0x65, 0x72, 0x6d,
-	0x69, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x22, 0x20, 0x0a, 0x1e, 0x47, 0x65, 0x74, 0x4b, 0x65,
-	0x79, 0x73, 0x70, 0x61, 0x63, 0x65, 0x52, 0x6f, 0x75, 0x74, 0x69, 0x6e, 0x67, 0x52, 0x75, 0x6c,
-	0x65, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x22, 0x76, 0x0a, 0x1f, 0x47, 0x65, 0x74,
-	0x4b, 0x65, 0x79, 0x73, 0x70, 0x61, 0x63, 0x65, 0x52, 0x6f, 0x75, 0x74, 0x69, 0x6e, 0x67, 0x52,
-	0x75, 0x6c, 0x65, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x53, 0x0a, 0x16,
-	0x6b, 0x65, 0x79, 0x73, 0x70, 0x61, 0x63, 0x65, 0x5f, 0x72, 0x6f, 0x75, 0x74, 0x69, 0x6e, 0x67,
-	0x5f, 0x72, 0x75, 0x6c, 0x65, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1d, 0x2e, 0x76,
-	0x73, 0x63, 0x68, 0x65, 0x6d, 0x61, 0x2e, 0x4b, 0x65, 0x79, 0x73, 0x70, 0x61, 0x63, 0x65, 0x52,
-	0x6f, 0x75, 0x74, 0x69, 0x6e, 0x67, 0x52, 0x75, 0x6c, 0x65, 0x73, 0x52, 0x14, 0x6b, 0x65, 0x79,
-	0x73, 0x70, 0x61, 0x63, 0x65, 0x52, 0x6f, 0x75, 0x74, 0x69, 0x6e, 0x67, 0x52, 0x75, 0x6c, 0x65,
-	0x73, 0x22, 0x18, 0x0a, 0x16, 0x47, 0x65, 0x74, 0x52, 0x6f, 0x75, 0x74, 0x69, 0x6e, 0x67, 0x52,
-	0x75, 0x6c, 0x65, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x22, 0x55, 0x0a, 0x17, 0x47,
-	0x65, 0x74, 0x52, 0x6f, 0x75, 0x74, 0x69, 0x6e, 0x67, 0x52, 0x75, 0x6c, 0x65, 0x73, 0x52, 0x65,
-	0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x3a, 0x0a, 0x0d, 0x72, 0x6f, 0x75, 0x74, 0x69, 0x6e,
-	0x67, 0x5f, 0x72, 0x75, 0x6c, 0x65, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x15, 0x2e,
-	0x76, 0x73, 0x63, 0x68, 0x65, 0x6d, 0x61, 0x2e, 0x52, 0x6f, 0x75, 0x74, 0x69, 0x6e, 0x67, 0x52,
-	0x75, 0x6c, 0x65, 0x73, 0x52, 0x0c, 0x72, 0x6f, 0x75, 0x74, 0x69, 0x6e, 0x67, 0x52, 0x75, 0x6c,
-	0x65, 0x73, 0x22, 0xb0, 0x02, 0x0a, 0x10, 0x47, 0x65, 0x74, 0x53, 0x63, 0x68, 0x65, 0x6d, 0x61,
+	0x74, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x41, 0x6c, 0x69, 0x61, 0x73, 0x12, 0x10, 0x0a, 0x03, 0x73,
+	0x71, 0x6c, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x73, 0x71, 0x6c, 0x12, 0x19, 0x0a,
+	0x08, 0x6d, 0x61, 0x78, 0x5f, 0x72, 0x6f, 0x77, 0x73, 0x18, 0x03, 0x20, 0x01, 0x28, 0x03, 0x52,
+	0x07, 0x6d, 0x61, 0x78, 0x52, 0x6f, 0x77, 0x73, 0x12, 0x27, 0x0a, 0x0f, 0x64, 0x69, 0x73, 0x61,
+	0x62, 0x6c, 0x65, 0x5f, 0x62, 0x69, 0x6e, 0x6c, 0x6f, 0x67, 0x73, 0x18, 0x04, 0x20, 0x01, 0x28,
+	0x08, 0x52, 0x0e, 0x64, 0x69, 0x73, 0x61, 0x62, 0x6c, 0x65, 0x42, 0x69, 0x6e, 0x6c, 0x6f, 0x67,
+	0x73, 0x12, 0x23, 0x0a, 0x0d, 0x72, 0x65, 0x6c, 0x6f, 0x61, 0x64, 0x5f, 0x73, 0x63, 0x68, 0x65,
+	0x6d, 0x61, 0x18, 0x05, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0c, 0x72, 0x65, 0x6c, 0x6f, 0x61, 0x64,
+	0x53, 0x63, 0x68, 0x65, 0x6d, 0x61, 0x22, 0x4e, 0x0a, 0x1e, 0x45, 0x78, 0x65, 0x63, 0x75, 0x74,
+	0x65, 0x4d, 0x75, 0x6c, 0x74, 0x69, 0x46, 0x65, 0x74, 0x63, 0x68, 0x41, 0x73, 0x44, 0x42, 0x41,
+	0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x2c, 0x0a, 0x07, 0x72, 0x65, 0x73, 0x75,
+	0x6c, 0x74, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x71, 0x75, 0x65, 0x72,
+	0x79, 0x2e, 0x51, 0x75, 0x65, 0x72, 0x79, 0x52, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x52, 0x07, 0x72,
+	0x65, 0x73, 0x75, 0x6c, 0x74, 0x73, 0x22, 0x3c, 0x0a, 0x1e, 0x46, 0x69, 0x6e, 0x64, 0x41, 0x6c,
+	0x6c, 0x53, 0x68, 0x61, 0x72, 0x64, 0x73, 0x49, 0x6e, 0x4b, 0x65, 0x79, 0x73, 0x70, 0x61, 0x63,
+	0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 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, 0x22, 0xbe, 0x01, 0x0a, 0x1f, 0x46, 0x69, 0x6e, 0x64, 0x41, 0x6c, 0x6c,
+	0x53, 0x68, 0x61, 0x72, 0x64, 0x73, 0x49, 0x6e, 0x4b, 0x65, 0x79, 0x73, 0x70, 0x61, 0x63, 0x65,
+	0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x4e, 0x0a, 0x06, 0x73, 0x68, 0x61, 0x72,
+	0x64, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x36, 0x2e, 0x76, 0x74, 0x63, 0x74, 0x6c,
+	0x64, 0x61, 0x74, 0x61, 0x2e, 0x46, 0x69, 0x6e, 0x64, 0x41, 0x6c, 0x6c, 0x53, 0x68, 0x61, 0x72,
+	0x64, 0x73, 0x49, 0x6e, 0x4b, 0x65, 0x79, 0x73, 0x70, 0x61, 0x63, 0x65, 0x52, 0x65, 0x73, 0x70,
+	0x6f, 0x6e, 0x73, 0x65, 0x2e, 0x53, 0x68, 0x61, 0x72, 0x64, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79,
+	0x52, 0x06, 0x73, 0x68, 0x61, 0x72, 0x64, 0x73, 0x1a, 0x4b, 0x0a, 0x0b, 0x53, 0x68, 0x61, 0x72,
+	0x64, 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, 0x26, 0x0a, 0x05, 0x76, 0x61, 0x6c,
+	0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x76, 0x74, 0x63, 0x74, 0x6c,
+	0x64, 0x61, 0x74, 0x61, 0x2e, 0x53, 0x68, 0x61, 0x72, 0x64, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75,
+	0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x54, 0x0a, 0x22, 0x46, 0x6f, 0x72, 0x63, 0x65, 0x43, 0x75,
+	0x74, 0x4f, 0x76, 0x65, 0x72, 0x53, 0x63, 0x68, 0x65, 0x6d, 0x61, 0x4d, 0x69, 0x67, 0x72, 0x61,
+	0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 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, 0x12, 0x0a, 0x04, 0x75, 0x75, 0x69, 0x64, 0x18,
+	0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x75, 0x75, 0x69, 0x64, 0x22, 0xeb, 0x01, 0x0a, 0x23,
+	0x46, 0x6f, 0x72, 0x63, 0x65, 0x43, 0x75, 0x74, 0x4f, 0x76, 0x65, 0x72, 0x53, 0x63, 0x68, 0x65,
+	0x6d, 0x61, 0x4d, 0x69, 0x67, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f,
+	0x6e, 0x73, 0x65, 0x12, 0x7c, 0x0a, 0x16, 0x72, 0x6f, 0x77, 0x73, 0x5f, 0x61, 0x66, 0x66, 0x65,
+	0x63, 0x74, 0x65, 0x64, 0x5f, 0x62, 0x79, 0x5f, 0x73, 0x68, 0x61, 0x72, 0x64, 0x18, 0x01, 0x20,
+	0x03, 0x28, 0x0b, 0x32, 0x47, 0x2e, 0x76, 0x74, 0x63, 0x74, 0x6c, 0x64, 0x61, 0x74, 0x61, 0x2e,
+	0x46, 0x6f, 0x72, 0x63, 0x65, 0x43, 0x75, 0x74, 0x4f, 0x76, 0x65, 0x72, 0x53, 0x63, 0x68, 0x65,
+	0x6d, 0x61, 0x4d, 0x69, 0x67, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f,
+	0x6e, 0x73, 0x65, 0x2e, 0x52, 0x6f, 0x77, 0x73, 0x41, 0x66, 0x66, 0x65, 0x63, 0x74, 0x65, 0x64,
+	0x42, 0x79, 0x53, 0x68, 0x61, 0x72, 0x64, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x13, 0x72, 0x6f,
+	0x77, 0x73, 0x41, 0x66, 0x66, 0x65, 0x63, 0x74, 0x65, 0x64, 0x42, 0x79, 0x53, 0x68, 0x61, 0x72,
+	0x64, 0x1a, 0x46, 0x0a, 0x18, 0x52, 0x6f, 0x77, 0x73, 0x41, 0x66, 0x66, 0x65, 0x63, 0x74, 0x65,
+	0x64, 0x42, 0x79, 0x53, 0x68, 0x61, 0x72, 0x64, 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, 0x04, 0x52, 0x05,
+	0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x9e, 0x01, 0x0a, 0x11, 0x47, 0x65,
+	0x74, 0x42, 0x61, 0x63, 0x6b, 0x75, 0x70, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 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, 0x14, 0x0a, 0x05, 0x6c, 0x69, 0x6d, 0x69, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0d,
+	0x52, 0x05, 0x6c, 0x69, 0x6d, 0x69, 0x74, 0x12, 0x1a, 0x0a, 0x08, 0x64, 0x65, 0x74, 0x61, 0x69,
+	0x6c, 0x65, 0x64, 0x18, 0x04, 0x20, 0x01, 0x28, 0x08, 0x52, 0x08, 0x64, 0x65, 0x74, 0x61, 0x69,
+	0x6c, 0x65, 0x64, 0x12, 0x25, 0x0a, 0x0e, 0x64, 0x65, 0x74, 0x61, 0x69, 0x6c, 0x65, 0x64, 0x5f,
+	0x6c, 0x69, 0x6d, 0x69, 0x74, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x0d, 0x64, 0x65, 0x74,
+	0x61, 0x69, 0x6c, 0x65, 0x64, 0x4c, 0x69, 0x6d, 0x69, 0x74, 0x22, 0x44, 0x0a, 0x12, 0x47, 0x65,
+	0x74, 0x42, 0x61, 0x63, 0x6b, 0x75, 0x70, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65,
+	0x12, 0x2e, 0x0a, 0x07, 0x62, 0x61, 0x63, 0x6b, 0x75, 0x70, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28,
+	0x0b, 0x32, 0x14, 0x2e, 0x6d, 0x79, 0x73, 0x71, 0x6c, 0x63, 0x74, 0x6c, 0x2e, 0x42, 0x61, 0x63,
+	0x6b, 0x75, 0x70, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x07, 0x62, 0x61, 0x63, 0x6b, 0x75, 0x70, 0x73,
+	0x22, 0x28, 0x0a, 0x12, 0x47, 0x65, 0x74, 0x43, 0x65, 0x6c, 0x6c, 0x49, 0x6e, 0x66, 0x6f, 0x52,
+	0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x12, 0x0a, 0x04, 0x63, 0x65, 0x6c, 0x6c, 0x18, 0x01,
+	0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x63, 0x65, 0x6c, 0x6c, 0x22, 0x46, 0x0a, 0x13, 0x47, 0x65,
+	0x74, 0x43, 0x65, 0x6c, 0x6c, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73,
+	0x65, 0x12, 0x2f, 0x0a, 0x09, 0x63, 0x65, 0x6c, 0x6c, 0x5f, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x01,
+	0x20, 0x01, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x74, 0x6f, 0x70, 0x6f, 0x64, 0x61, 0x74, 0x61, 0x2e,
+	0x43, 0x65, 0x6c, 0x6c, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x08, 0x63, 0x65, 0x6c, 0x6c, 0x49, 0x6e,
+	0x66, 0x6f, 0x22, 0x19, 0x0a, 0x17, 0x47, 0x65, 0x74, 0x43, 0x65, 0x6c, 0x6c, 0x49, 0x6e, 0x66,
+	0x6f, 0x4e, 0x61, 0x6d, 0x65, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x22, 0x30, 0x0a,
+	0x18, 0x47, 0x65, 0x74, 0x43, 0x65, 0x6c, 0x6c, 0x49, 0x6e, 0x66, 0x6f, 0x4e, 0x61, 0x6d, 0x65,
+	0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x6e, 0x61, 0x6d,
+	0x65, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x09, 0x52, 0x05, 0x6e, 0x61, 0x6d, 0x65, 0x73, 0x22,
+	0x18, 0x0a, 0x16, 0x47, 0x65, 0x74, 0x43, 0x65, 0x6c, 0x6c, 0x73, 0x41, 0x6c, 0x69, 0x61, 0x73,
+	0x65, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x22, 0xb6, 0x01, 0x0a, 0x17, 0x47, 0x65,
+	0x74, 0x43, 0x65, 0x6c, 0x6c, 0x73, 0x41, 0x6c, 0x69, 0x61, 0x73, 0x65, 0x73, 0x52, 0x65, 0x73,
+	0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x49, 0x0a, 0x07, 0x61, 0x6c, 0x69, 0x61, 0x73, 0x65, 0x73,
+	0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x2f, 0x2e, 0x76, 0x74, 0x63, 0x74, 0x6c, 0x64, 0x61,
+	0x74, 0x61, 0x2e, 0x47, 0x65, 0x74, 0x43, 0x65, 0x6c, 0x6c, 0x73, 0x41, 0x6c, 0x69, 0x61, 0x73,
+	0x65, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x2e, 0x41, 0x6c, 0x69, 0x61, 0x73,
+	0x65, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x07, 0x61, 0x6c, 0x69, 0x61, 0x73, 0x65, 0x73,
+	0x1a, 0x50, 0x0a, 0x0c, 0x41, 0x6c, 0x69, 0x61, 0x73, 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, 0x2a, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28,
+	0x0b, 0x32, 0x14, 0x2e, 0x74, 0x6f, 0x70, 0x6f, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x43, 0x65, 0x6c,
+	0x6c, 0x73, 0x41, 0x6c, 0x69, 0x61, 0x73, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02,
+	0x38, 0x01, 0x22, 0x50, 0x0a, 0x14, 0x47, 0x65, 0x74, 0x46, 0x75, 0x6c, 0x6c, 0x53, 0x74, 0x61,
+	0x74, 0x75, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x38, 0x0a, 0x0c, 0x74, 0x61,
+	0x62, 0x6c, 0x65, 0x74, 0x5f, 0x61, 0x6c, 0x69, 0x61, 0x73, 0x18, 0x01, 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, 0x4c, 0x0a, 0x15, 0x47, 0x65, 0x74, 0x46, 0x75, 0x6c, 0x6c, 0x53,
+	0x74, 0x61, 0x74, 0x75, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x33, 0x0a,
+	0x06, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1b, 0x2e,
+	0x72, 0x65, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x64, 0x61, 0x74, 0x61, 0x2e,
+	0x46, 0x75, 0x6c, 0x6c, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x52, 0x06, 0x73, 0x74, 0x61, 0x74,
+	0x75, 0x73, 0x22, 0x15, 0x0a, 0x13, 0x47, 0x65, 0x74, 0x4b, 0x65, 0x79, 0x73, 0x70, 0x61, 0x63,
+	0x65, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x22, 0x49, 0x0a, 0x14, 0x47, 0x65, 0x74,
+	0x4b, 0x65, 0x79, 0x73, 0x70, 0x61, 0x63, 0x65, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73,
+	0x65, 0x12, 0x31, 0x0a, 0x09, 0x6b, 0x65, 0x79, 0x73, 0x70, 0x61, 0x63, 0x65, 0x73, 0x18, 0x01,
+	0x20, 0x03, 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x76, 0x74, 0x63, 0x74, 0x6c, 0x64, 0x61, 0x74, 0x61,
+	0x2e, 0x4b, 0x65, 0x79, 0x73, 0x70, 0x61, 0x63, 0x65, 0x52, 0x09, 0x6b, 0x65, 0x79, 0x73, 0x70,
+	0x61, 0x63, 0x65, 0x73, 0x22, 0x30, 0x0a, 0x12, 0x47, 0x65, 0x74, 0x4b, 0x65, 0x79, 0x73, 0x70,
+	0x61, 0x63, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 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, 0x22, 0x46, 0x0a, 0x13, 0x47, 0x65, 0x74, 0x4b, 0x65, 0x79,
+	0x73, 0x70, 0x61, 0x63, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x2f, 0x0a,
+	0x08, 0x6b, 0x65, 0x79, 0x73, 0x70, 0x61, 0x63, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32,
+	0x13, 0x2e, 0x76, 0x74, 0x63, 0x74, 0x6c, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x4b, 0x65, 0x79, 0x73,
+	0x70, 0x61, 0x63, 0x65, 0x52, 0x08, 0x6b, 0x65, 0x79, 0x73, 0x70, 0x61, 0x63, 0x65, 0x22, 0x51,
+	0x0a, 0x15, 0x47, 0x65, 0x74, 0x50, 0x65, 0x72, 0x6d, 0x69, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x73,
 	0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x38, 0x0a, 0x0c, 0x74, 0x61, 0x62, 0x6c, 0x65,
 	0x74, 0x5f, 0x61, 0x6c, 0x69, 0x61, 0x73, 0x18, 0x01, 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, 0x16, 0x0a, 0x06, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28,
-	0x09, 0x52, 0x06, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x73, 0x12, 0x25, 0x0a, 0x0e, 0x65, 0x78, 0x63,
-	0x6c, 0x75, 0x64, 0x65, 0x5f, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28,
-	0x09, 0x52, 0x0d, 0x65, 0x78, 0x63, 0x6c, 0x75, 0x64, 0x65, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x73,
-	0x12, 0x23, 0x0a, 0x0d, 0x69, 0x6e, 0x63, 0x6c, 0x75, 0x64, 0x65, 0x5f, 0x76, 0x69, 0x65, 0x77,
-	0x73, 0x18, 0x04, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0c, 0x69, 0x6e, 0x63, 0x6c, 0x75, 0x64, 0x65,
-	0x56, 0x69, 0x65, 0x77, 0x73, 0x12, 0x28, 0x0a, 0x10, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x5f, 0x6e,
-	0x61, 0x6d, 0x65, 0x73, 0x5f, 0x6f, 0x6e, 0x6c, 0x79, 0x18, 0x05, 0x20, 0x01, 0x28, 0x08, 0x52,
-	0x0e, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x4e, 0x61, 0x6d, 0x65, 0x73, 0x4f, 0x6e, 0x6c, 0x79, 0x12,
-	0x28, 0x0a, 0x10, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x5f, 0x73, 0x69, 0x7a, 0x65, 0x73, 0x5f, 0x6f,
-	0x6e, 0x6c, 0x79, 0x18, 0x06, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0e, 0x74, 0x61, 0x62, 0x6c, 0x65,
-	0x53, 0x69, 0x7a, 0x65, 0x73, 0x4f, 0x6e, 0x6c, 0x79, 0x12, 0x2a, 0x0a, 0x11, 0x74, 0x61, 0x62,
-	0x6c, 0x65, 0x5f, 0x73, 0x63, 0x68, 0x65, 0x6d, 0x61, 0x5f, 0x6f, 0x6e, 0x6c, 0x79, 0x18, 0x07,
-	0x20, 0x01, 0x28, 0x08, 0x52, 0x0f, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x53, 0x63, 0x68, 0x65, 0x6d,
-	0x61, 0x4f, 0x6e, 0x6c, 0x79, 0x22, 0x50, 0x0a, 0x11, 0x47, 0x65, 0x74, 0x53, 0x63, 0x68, 0x65,
-	0x6d, 0x61, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x3b, 0x0a, 0x06, 0x73, 0x63,
-	0x68, 0x65, 0x6d, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x23, 0x2e, 0x74, 0x61, 0x62,
-	0x6c, 0x65, 0x74, 0x6d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x72, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x53,
-	0x63, 0x68, 0x65, 0x6d, 0x61, 0x44, 0x65, 0x66, 0x69, 0x6e, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x52,
-	0x06, 0x73, 0x63, 0x68, 0x65, 0x6d, 0x61, 0x22, 0xb8, 0x02, 0x0a, 0x1a, 0x47, 0x65, 0x74, 0x53,
+	0x73, 0x22, 0x5a, 0x0a, 0x16, 0x47, 0x65, 0x74, 0x50, 0x65, 0x72, 0x6d, 0x69, 0x73, 0x73, 0x69,
+	0x6f, 0x6e, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x40, 0x0a, 0x0b, 0x70,
+	0x65, 0x72, 0x6d, 0x69, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b,
+	0x32, 0x1e, 0x2e, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x6d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x72,
+	0x64, 0x61, 0x74, 0x61, 0x2e, 0x50, 0x65, 0x72, 0x6d, 0x69, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x73,
+	0x52, 0x0b, 0x70, 0x65, 0x72, 0x6d, 0x69, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x22, 0x20, 0x0a,
+	0x1e, 0x47, 0x65, 0x74, 0x4b, 0x65, 0x79, 0x73, 0x70, 0x61, 0x63, 0x65, 0x52, 0x6f, 0x75, 0x74,
+	0x69, 0x6e, 0x67, 0x52, 0x75, 0x6c, 0x65, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x22,
+	0x76, 0x0a, 0x1f, 0x47, 0x65, 0x74, 0x4b, 0x65, 0x79, 0x73, 0x70, 0x61, 0x63, 0x65, 0x52, 0x6f,
+	0x75, 0x74, 0x69, 0x6e, 0x67, 0x52, 0x75, 0x6c, 0x65, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e,
+	0x73, 0x65, 0x12, 0x53, 0x0a, 0x16, 0x6b, 0x65, 0x79, 0x73, 0x70, 0x61, 0x63, 0x65, 0x5f, 0x72,
+	0x6f, 0x75, 0x74, 0x69, 0x6e, 0x67, 0x5f, 0x72, 0x75, 0x6c, 0x65, 0x73, 0x18, 0x01, 0x20, 0x01,
+	0x28, 0x0b, 0x32, 0x1d, 0x2e, 0x76, 0x73, 0x63, 0x68, 0x65, 0x6d, 0x61, 0x2e, 0x4b, 0x65, 0x79,
+	0x73, 0x70, 0x61, 0x63, 0x65, 0x52, 0x6f, 0x75, 0x74, 0x69, 0x6e, 0x67, 0x52, 0x75, 0x6c, 0x65,
+	0x73, 0x52, 0x14, 0x6b, 0x65, 0x79, 0x73, 0x70, 0x61, 0x63, 0x65, 0x52, 0x6f, 0x75, 0x74, 0x69,
+	0x6e, 0x67, 0x52, 0x75, 0x6c, 0x65, 0x73, 0x22, 0x18, 0x0a, 0x16, 0x47, 0x65, 0x74, 0x52, 0x6f,
+	0x75, 0x74, 0x69, 0x6e, 0x67, 0x52, 0x75, 0x6c, 0x65, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73,
+	0x74, 0x22, 0x55, 0x0a, 0x17, 0x47, 0x65, 0x74, 0x52, 0x6f, 0x75, 0x74, 0x69, 0x6e, 0x67, 0x52,
+	0x75, 0x6c, 0x65, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x3a, 0x0a, 0x0d,
+	0x72, 0x6f, 0x75, 0x74, 0x69, 0x6e, 0x67, 0x5f, 0x72, 0x75, 0x6c, 0x65, 0x73, 0x18, 0x01, 0x20,
+	0x01, 0x28, 0x0b, 0x32, 0x15, 0x2e, 0x76, 0x73, 0x63, 0x68, 0x65, 0x6d, 0x61, 0x2e, 0x52, 0x6f,
+	0x75, 0x74, 0x69, 0x6e, 0x67, 0x52, 0x75, 0x6c, 0x65, 0x73, 0x52, 0x0c, 0x72, 0x6f, 0x75, 0x74,
+	0x69, 0x6e, 0x67, 0x52, 0x75, 0x6c, 0x65, 0x73, 0x22, 0xb0, 0x02, 0x0a, 0x10, 0x47, 0x65, 0x74,
+	0x53, 0x63, 0x68, 0x65, 0x6d, 0x61, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x38, 0x0a,
+	0x0c, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x5f, 0x61, 0x6c, 0x69, 0x61, 0x73, 0x18, 0x01, 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, 0x16, 0x0a, 0x06, 0x74, 0x61, 0x62, 0x6c, 0x65,
+	0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x09, 0x52, 0x06, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x73, 0x12,
+	0x25, 0x0a, 0x0e, 0x65, 0x78, 0x63, 0x6c, 0x75, 0x64, 0x65, 0x5f, 0x74, 0x61, 0x62, 0x6c, 0x65,
+	0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0d, 0x65, 0x78, 0x63, 0x6c, 0x75, 0x64, 0x65,
+	0x54, 0x61, 0x62, 0x6c, 0x65, 0x73, 0x12, 0x23, 0x0a, 0x0d, 0x69, 0x6e, 0x63, 0x6c, 0x75, 0x64,
+	0x65, 0x5f, 0x76, 0x69, 0x65, 0x77, 0x73, 0x18, 0x04, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0c, 0x69,
+	0x6e, 0x63, 0x6c, 0x75, 0x64, 0x65, 0x56, 0x69, 0x65, 0x77, 0x73, 0x12, 0x28, 0x0a, 0x10, 0x74,
+	0x61, 0x62, 0x6c, 0x65, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x73, 0x5f, 0x6f, 0x6e, 0x6c, 0x79, 0x18,
+	0x05, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0e, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x4e, 0x61, 0x6d, 0x65,
+	0x73, 0x4f, 0x6e, 0x6c, 0x79, 0x12, 0x28, 0x0a, 0x10, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x5f, 0x73,
+	0x69, 0x7a, 0x65, 0x73, 0x5f, 0x6f, 0x6e, 0x6c, 0x79, 0x18, 0x06, 0x20, 0x01, 0x28, 0x08, 0x52,
+	0x0e, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x53, 0x69, 0x7a, 0x65, 0x73, 0x4f, 0x6e, 0x6c, 0x79, 0x12,
+	0x2a, 0x0a, 0x11, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x5f, 0x73, 0x63, 0x68, 0x65, 0x6d, 0x61, 0x5f,
+	0x6f, 0x6e, 0x6c, 0x79, 0x18, 0x07, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0f, 0x74, 0x61, 0x62, 0x6c,
+	0x65, 0x53, 0x63, 0x68, 0x65, 0x6d, 0x61, 0x4f, 0x6e, 0x6c, 0x79, 0x22, 0x50, 0x0a, 0x11, 0x47,
+	0x65, 0x74, 0x53, 0x63, 0x68, 0x65, 0x6d, 0x61, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65,
+	0x12, 0x3b, 0x0a, 0x06, 0x73, 0x63, 0x68, 0x65, 0x6d, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b,
+	0x32, 0x23, 0x2e, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x6d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x72,
+	0x64, 0x61, 0x74, 0x61, 0x2e, 0x53, 0x63, 0x68, 0x65, 0x6d, 0x61, 0x44, 0x65, 0x66, 0x69, 0x6e,
+	0x69, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x06, 0x73, 0x63, 0x68, 0x65, 0x6d, 0x61, 0x22, 0xb8, 0x02,
+	0x0a, 0x1a, 0x47, 0x65, 0x74, 0x53, 0x63, 0x68, 0x65, 0x6d, 0x61, 0x4d, 0x69, 0x67, 0x72, 0x61,
+	0x74, 0x69, 0x6f, 0x6e, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 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, 0x12, 0x0a, 0x04, 0x75, 0x75, 0x69, 0x64,
+	0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x75, 0x75, 0x69, 0x64, 0x12, 0x2b, 0x0a, 0x11,
+	0x6d, 0x69, 0x67, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x78,
+	0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x10, 0x6d, 0x69, 0x67, 0x72, 0x61, 0x74, 0x69,
+	0x6f, 0x6e, 0x43, 0x6f, 0x6e, 0x74, 0x65, 0x78, 0x74, 0x12, 0x39, 0x0a, 0x06, 0x73, 0x74, 0x61,
+	0x74, 0x75, 0x73, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x21, 0x2e, 0x76, 0x74, 0x63, 0x74,
+	0x6c, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x53, 0x63, 0x68, 0x65, 0x6d, 0x61, 0x4d, 0x69, 0x67, 0x72,
+	0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x52, 0x06, 0x73, 0x74,
+	0x61, 0x74, 0x75, 0x73, 0x12, 0x28, 0x0a, 0x06, 0x72, 0x65, 0x63, 0x65, 0x6e, 0x74, 0x18, 0x05,
+	0x20, 0x01, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x76, 0x74, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x44, 0x75,
+	0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x06, 0x72, 0x65, 0x63, 0x65, 0x6e, 0x74, 0x12, 0x2e,
+	0x0a, 0x05, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x18, 0x2e,
+	0x76, 0x74, 0x63, 0x74, 0x6c, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x51, 0x75, 0x65, 0x72, 0x79, 0x4f,
+	0x72, 0x64, 0x65, 0x72, 0x69, 0x6e, 0x67, 0x52, 0x05, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x12, 0x14,
+	0x0a, 0x05, 0x6c, 0x69, 0x6d, 0x69, 0x74, 0x18, 0x07, 0x20, 0x01, 0x28, 0x04, 0x52, 0x05, 0x6c,
+	0x69, 0x6d, 0x69, 0x74, 0x12, 0x12, 0x0a, 0x04, 0x73, 0x6b, 0x69, 0x70, 0x18, 0x08, 0x20, 0x01,
+	0x28, 0x04, 0x52, 0x04, 0x73, 0x6b, 0x69, 0x70, 0x22, 0x59, 0x0a, 0x1b, 0x47, 0x65, 0x74, 0x53,
 	0x63, 0x68, 0x65, 0x6d, 0x61, 0x4d, 0x69, 0x67, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x52,
-	0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 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, 0x12, 0x0a, 0x04, 0x75, 0x75, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09,
-	0x52, 0x04, 0x75, 0x75, 0x69, 0x64, 0x12, 0x2b, 0x0a, 0x11, 0x6d, 0x69, 0x67, 0x72, 0x61, 0x74,
-	0x69, 0x6f, 0x6e, 0x5f, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x78, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28,
-	0x09, 0x52, 0x10, 0x6d, 0x69, 0x67, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x43, 0x6f, 0x6e, 0x74,
-	0x65, 0x78, 0x74, 0x12, 0x39, 0x0a, 0x06, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x18, 0x04, 0x20,
-	0x01, 0x28, 0x0e, 0x32, 0x21, 0x2e, 0x76, 0x74, 0x63, 0x74, 0x6c, 0x64, 0x61, 0x74, 0x61, 0x2e,
-	0x53, 0x63, 0x68, 0x65, 0x6d, 0x61, 0x4d, 0x69, 0x67, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2e,
-	0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x52, 0x06, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x12, 0x28,
-	0x0a, 0x06, 0x72, 0x65, 0x63, 0x65, 0x6e, 0x74, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x10,
-	0x2e, 0x76, 0x74, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x44, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e,
-	0x52, 0x06, 0x72, 0x65, 0x63, 0x65, 0x6e, 0x74, 0x12, 0x2e, 0x0a, 0x05, 0x6f, 0x72, 0x64, 0x65,
-	0x72, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x18, 0x2e, 0x76, 0x74, 0x63, 0x74, 0x6c, 0x64,
-	0x61, 0x74, 0x61, 0x2e, 0x51, 0x75, 0x65, 0x72, 0x79, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x69, 0x6e,
-	0x67, 0x52, 0x05, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x12, 0x14, 0x0a, 0x05, 0x6c, 0x69, 0x6d, 0x69,
-	0x74, 0x18, 0x07, 0x20, 0x01, 0x28, 0x04, 0x52, 0x05, 0x6c, 0x69, 0x6d, 0x69, 0x74, 0x12, 0x12,
-	0x0a, 0x04, 0x73, 0x6b, 0x69, 0x70, 0x18, 0x08, 0x20, 0x01, 0x28, 0x04, 0x52, 0x04, 0x73, 0x6b,
-	0x69, 0x70, 0x22, 0x59, 0x0a, 0x1b, 0x47, 0x65, 0x74, 0x53, 0x63, 0x68, 0x65, 0x6d, 0x61, 0x4d,
-	0x69, 0x67, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73,
-	0x65, 0x12, 0x3a, 0x0a, 0x0a, 0x6d, 0x69, 0x67, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18,
-	0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x76, 0x74, 0x63, 0x74, 0x6c, 0x64, 0x61, 0x74,
-	0x61, 0x2e, 0x53, 0x63, 0x68, 0x65, 0x6d, 0x61, 0x4d, 0x69, 0x67, 0x72, 0x61, 0x74, 0x69, 0x6f,
-	0x6e, 0x52, 0x0a, 0x6d, 0x69, 0x67, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x22, 0x64, 0x0a,
-	0x1a, 0x47, 0x65, 0x74, 0x53, 0x68, 0x61, 0x72, 0x64, 0x52, 0x65, 0x70, 0x6c, 0x69, 0x63, 0x61,
-	0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 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, 0x14, 0x0a,
-	0x05, 0x63, 0x65, 0x6c, 0x6c, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x09, 0x52, 0x05, 0x63, 0x65,
-	0x6c, 0x6c, 0x73, 0x22, 0x83, 0x02, 0x0a, 0x1b, 0x47, 0x65, 0x74, 0x53, 0x68, 0x61, 0x72, 0x64,
-	0x52, 0x65, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f,
-	0x6e, 0x73, 0x65, 0x12, 0x7d, 0x0a, 0x19, 0x73, 0x68, 0x61, 0x72, 0x64, 0x5f, 0x72, 0x65, 0x70,
-	0x6c, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x62, 0x79, 0x5f, 0x63, 0x65, 0x6c, 0x6c,
-	0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x42, 0x2e, 0x76, 0x74, 0x63, 0x74, 0x6c, 0x64, 0x61,
-	0x74, 0x61, 0x2e, 0x47, 0x65, 0x74, 0x53, 0x68, 0x61, 0x72, 0x64, 0x52, 0x65, 0x70, 0x6c, 0x69,
-	0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x2e, 0x53,
-	0x68, 0x61, 0x72, 0x64, 0x52, 0x65, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x42,
-	0x79, 0x43, 0x65, 0x6c, 0x6c, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x16, 0x73, 0x68, 0x61, 0x72,
+	0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x3a, 0x0a, 0x0a, 0x6d, 0x69, 0x67, 0x72, 0x61,
+	0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x76, 0x74,
+	0x63, 0x74, 0x6c, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x53, 0x63, 0x68, 0x65, 0x6d, 0x61, 0x4d, 0x69,
+	0x67, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x0a, 0x6d, 0x69, 0x67, 0x72, 0x61, 0x74, 0x69,
+	0x6f, 0x6e, 0x73, 0x22, 0x64, 0x0a, 0x1a, 0x47, 0x65, 0x74, 0x53, 0x68, 0x61, 0x72, 0x64, 0x52,
+	0x65, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73,
+	0x74, 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, 0x14, 0x0a, 0x05, 0x63, 0x65, 0x6c, 0x6c, 0x73, 0x18, 0x03, 0x20, 0x03,
+	0x28, 0x09, 0x52, 0x05, 0x63, 0x65, 0x6c, 0x6c, 0x73, 0x22, 0x83, 0x02, 0x0a, 0x1b, 0x47, 0x65,
+	0x74, 0x53, 0x68, 0x61, 0x72, 0x64, 0x52, 0x65, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f,
+	0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x7d, 0x0a, 0x19, 0x73, 0x68, 0x61,
+	0x72, 0x64, 0x5f, 0x72, 0x65, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x62,
+	0x79, 0x5f, 0x63, 0x65, 0x6c, 0x6c, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x42, 0x2e, 0x76,
+	0x74, 0x63, 0x74, 0x6c, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x47, 0x65, 0x74, 0x53, 0x68, 0x61, 0x72,
+	0x64, 0x52, 0x65, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70,
+	0x6f, 0x6e, 0x73, 0x65, 0x2e, 0x53, 0x68, 0x61, 0x72, 0x64, 0x52, 0x65, 0x70, 0x6c, 0x69, 0x63,
+	0x61, 0x74, 0x69, 0x6f, 0x6e, 0x42, 0x79, 0x43, 0x65, 0x6c, 0x6c, 0x45, 0x6e, 0x74, 0x72, 0x79,
+	0x52, 0x16, 0x73, 0x68, 0x61, 0x72, 0x64, 0x52, 0x65, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74, 0x69,
+	0x6f, 0x6e, 0x42, 0x79, 0x43, 0x65, 0x6c, 0x6c, 0x1a, 0x65, 0x0a, 0x1b, 0x53, 0x68, 0x61, 0x72,
 	0x64, 0x52, 0x65, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x42, 0x79, 0x43, 0x65,
-	0x6c, 0x6c, 0x1a, 0x65, 0x0a, 0x1b, 0x53, 0x68, 0x61, 0x72, 0x64, 0x52, 0x65, 0x70, 0x6c, 0x69,
-	0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x42, 0x79, 0x43, 0x65, 0x6c, 0x6c, 0x45, 0x6e, 0x74, 0x72,
-	0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03,
-	0x6b, 0x65, 0x79, 0x12, 0x30, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01,
-	0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x74, 0x6f, 0x70, 0x6f, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x53, 0x68,
-	0x61, 0x72, 0x64, 0x52, 0x65, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x05,
-	0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x4c, 0x0a, 0x0f, 0x47, 0x65, 0x74,
-	0x53, 0x68, 0x61, 0x72, 0x64, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 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, 0x1d, 0x0a, 0x0a, 0x73, 0x68, 0x61, 0x72,
-	0x64, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x73, 0x68,
-	0x61, 0x72, 0x64, 0x4e, 0x61, 0x6d, 0x65, 0x22, 0x3a, 0x0a, 0x10, 0x47, 0x65, 0x74, 0x53, 0x68,
-	0x61, 0x72, 0x64, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x26, 0x0a, 0x05, 0x73,
-	0x68, 0x61, 0x72, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x76, 0x74, 0x63,
-	0x74, 0x6c, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x53, 0x68, 0x61, 0x72, 0x64, 0x52, 0x05, 0x73, 0x68,
-	0x61, 0x72, 0x64, 0x22, 0x1d, 0x0a, 0x1b, 0x47, 0x65, 0x74, 0x53, 0x68, 0x61, 0x72, 0x64, 0x52,
-	0x6f, 0x75, 0x74, 0x69, 0x6e, 0x67, 0x52, 0x75, 0x6c, 0x65, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65,
-	0x73, 0x74, 0x22, 0x6a, 0x0a, 0x1c, 0x47, 0x65, 0x74, 0x53, 0x68, 0x61, 0x72, 0x64, 0x52, 0x6f,
-	0x75, 0x74, 0x69, 0x6e, 0x67, 0x52, 0x75, 0x6c, 0x65, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e,
-	0x73, 0x65, 0x12, 0x4a, 0x0a, 0x13, 0x73, 0x68, 0x61, 0x72, 0x64, 0x5f, 0x72, 0x6f, 0x75, 0x74,
-	0x69, 0x6e, 0x67, 0x5f, 0x72, 0x75, 0x6c, 0x65, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32,
-	0x1a, 0x2e, 0x76, 0x73, 0x63, 0x68, 0x65, 0x6d, 0x61, 0x2e, 0x53, 0x68, 0x61, 0x72, 0x64, 0x52,
-	0x6f, 0x75, 0x74, 0x69, 0x6e, 0x67, 0x52, 0x75, 0x6c, 0x65, 0x73, 0x52, 0x11, 0x73, 0x68, 0x61,
-	0x72, 0x64, 0x52, 0x6f, 0x75, 0x74, 0x69, 0x6e, 0x67, 0x52, 0x75, 0x6c, 0x65, 0x73, 0x22, 0x32,
-	0x0a, 0x1a, 0x47, 0x65, 0x74, 0x53, 0x72, 0x76, 0x4b, 0x65, 0x79, 0x73, 0x70, 0x61, 0x63, 0x65,
-	0x4e, 0x61, 0x6d, 0x65, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x14, 0x0a, 0x05,
-	0x63, 0x65, 0x6c, 0x6c, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x09, 0x52, 0x05, 0x63, 0x65, 0x6c,
-	0x6c, 0x73, 0x22, 0xf3, 0x01, 0x0a, 0x1b, 0x47, 0x65, 0x74, 0x53, 0x72, 0x76, 0x4b, 0x65, 0x79,
-	0x73, 0x70, 0x61, 0x63, 0x65, 0x4e, 0x61, 0x6d, 0x65, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e,
-	0x73, 0x65, 0x12, 0x47, 0x0a, 0x05, 0x6e, 0x61, 0x6d, 0x65, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28,
-	0x0b, 0x32, 0x31, 0x2e, 0x76, 0x74, 0x63, 0x74, 0x6c, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x47, 0x65,
-	0x74, 0x53, 0x72, 0x76, 0x4b, 0x65, 0x79, 0x73, 0x70, 0x61, 0x63, 0x65, 0x4e, 0x61, 0x6d, 0x65,
-	0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x2e, 0x4e, 0x61, 0x6d, 0x65, 0x73, 0x45,
-	0x6e, 0x74, 0x72, 0x79, 0x52, 0x05, 0x6e, 0x61, 0x6d, 0x65, 0x73, 0x1a, 0x69, 0x0a, 0x0a, 0x4e,
-	0x61, 0x6d, 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, 0x45, 0x0a, 0x05, 0x76,
-	0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2f, 0x2e, 0x76, 0x74, 0x63,
-	0x74, 0x6c, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x47, 0x65, 0x74, 0x53, 0x72, 0x76, 0x4b, 0x65, 0x79,
-	0x73, 0x70, 0x61, 0x63, 0x65, 0x4e, 0x61, 0x6d, 0x65, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e,
-	0x73, 0x65, 0x2e, 0x4e, 0x61, 0x6d, 0x65, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x05, 0x76, 0x61, 0x6c,
-	0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x20, 0x0a, 0x08, 0x4e, 0x61, 0x6d, 0x65, 0x4c, 0x69,
-	0x73, 0x74, 0x12, 0x14, 0x0a, 0x05, 0x6e, 0x61, 0x6d, 0x65, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28,
-	0x09, 0x52, 0x05, 0x6e, 0x61, 0x6d, 0x65, 0x73, 0x22, 0x4a, 0x0a, 0x16, 0x47, 0x65, 0x74, 0x53,
-	0x72, 0x76, 0x4b, 0x65, 0x79, 0x73, 0x70, 0x61, 0x63, 0x65, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65,
+	0x6c, 0x6c, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01,
+	0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x30, 0x0a, 0x05, 0x76, 0x61, 0x6c,
+	0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x74, 0x6f, 0x70, 0x6f, 0x64,
+	0x61, 0x74, 0x61, 0x2e, 0x53, 0x68, 0x61, 0x72, 0x64, 0x52, 0x65, 0x70, 0x6c, 0x69, 0x63, 0x61,
+	0x74, 0x69, 0x6f, 0x6e, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22,
+	0x4c, 0x0a, 0x0f, 0x47, 0x65, 0x74, 0x53, 0x68, 0x61, 0x72, 0x64, 0x52, 0x65, 0x71, 0x75, 0x65,
 	0x73, 0x74, 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, 0x63, 0x65, 0x6c, 0x6c, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x09, 0x52, 0x05, 0x63,
-	0x65, 0x6c, 0x6c, 0x73, 0x22, 0xcc, 0x01, 0x0a, 0x17, 0x47, 0x65, 0x74, 0x53, 0x72, 0x76, 0x4b,
-	0x65, 0x79, 0x73, 0x70, 0x61, 0x63, 0x65, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65,
-	0x12, 0x59, 0x0a, 0x0d, 0x73, 0x72, 0x76, 0x5f, 0x6b, 0x65, 0x79, 0x73, 0x70, 0x61, 0x63, 0x65,
-	0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x34, 0x2e, 0x76, 0x74, 0x63, 0x74, 0x6c, 0x64,
+	0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x6b, 0x65, 0x79, 0x73, 0x70, 0x61, 0x63, 0x65, 0x12, 0x1d,
+	0x0a, 0x0a, 0x73, 0x68, 0x61, 0x72, 0x64, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01,
+	0x28, 0x09, 0x52, 0x09, 0x73, 0x68, 0x61, 0x72, 0x64, 0x4e, 0x61, 0x6d, 0x65, 0x22, 0x3a, 0x0a,
+	0x10, 0x47, 0x65, 0x74, 0x53, 0x68, 0x61, 0x72, 0x64, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73,
+	0x65, 0x12, 0x26, 0x0a, 0x05, 0x73, 0x68, 0x61, 0x72, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b,
+	0x32, 0x10, 0x2e, 0x76, 0x74, 0x63, 0x74, 0x6c, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x53, 0x68, 0x61,
+	0x72, 0x64, 0x52, 0x05, 0x73, 0x68, 0x61, 0x72, 0x64, 0x22, 0x1d, 0x0a, 0x1b, 0x47, 0x65, 0x74,
+	0x53, 0x68, 0x61, 0x72, 0x64, 0x52, 0x6f, 0x75, 0x74, 0x69, 0x6e, 0x67, 0x52, 0x75, 0x6c, 0x65,
+	0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x22, 0x6a, 0x0a, 0x1c, 0x47, 0x65, 0x74, 0x53,
+	0x68, 0x61, 0x72, 0x64, 0x52, 0x6f, 0x75, 0x74, 0x69, 0x6e, 0x67, 0x52, 0x75, 0x6c, 0x65, 0x73,
+	0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x4a, 0x0a, 0x13, 0x73, 0x68, 0x61, 0x72,
+	0x64, 0x5f, 0x72, 0x6f, 0x75, 0x74, 0x69, 0x6e, 0x67, 0x5f, 0x72, 0x75, 0x6c, 0x65, 0x73, 0x18,
+	0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x76, 0x73, 0x63, 0x68, 0x65, 0x6d, 0x61, 0x2e,
+	0x53, 0x68, 0x61, 0x72, 0x64, 0x52, 0x6f, 0x75, 0x74, 0x69, 0x6e, 0x67, 0x52, 0x75, 0x6c, 0x65,
+	0x73, 0x52, 0x11, 0x73, 0x68, 0x61, 0x72, 0x64, 0x52, 0x6f, 0x75, 0x74, 0x69, 0x6e, 0x67, 0x52,
+	0x75, 0x6c, 0x65, 0x73, 0x22, 0x32, 0x0a, 0x1a, 0x47, 0x65, 0x74, 0x53, 0x72, 0x76, 0x4b, 0x65,
+	0x79, 0x73, 0x70, 0x61, 0x63, 0x65, 0x4e, 0x61, 0x6d, 0x65, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65,
+	0x73, 0x74, 0x12, 0x14, 0x0a, 0x05, 0x63, 0x65, 0x6c, 0x6c, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28,
+	0x09, 0x52, 0x05, 0x63, 0x65, 0x6c, 0x6c, 0x73, 0x22, 0xf3, 0x01, 0x0a, 0x1b, 0x47, 0x65, 0x74,
+	0x53, 0x72, 0x76, 0x4b, 0x65, 0x79, 0x73, 0x70, 0x61, 0x63, 0x65, 0x4e, 0x61, 0x6d, 0x65, 0x73,
+	0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x47, 0x0a, 0x05, 0x6e, 0x61, 0x6d, 0x65,
+	0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x31, 0x2e, 0x76, 0x74, 0x63, 0x74, 0x6c, 0x64,
 	0x61, 0x74, 0x61, 0x2e, 0x47, 0x65, 0x74, 0x53, 0x72, 0x76, 0x4b, 0x65, 0x79, 0x73, 0x70, 0x61,
-	0x63, 0x65, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x2e, 0x53, 0x72, 0x76, 0x4b,
-	0x65, 0x79, 0x73, 0x70, 0x61, 0x63, 0x65, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x0c, 0x73,
-	0x72, 0x76, 0x4b, 0x65, 0x79, 0x73, 0x70, 0x61, 0x63, 0x65, 0x73, 0x1a, 0x56, 0x0a, 0x11, 0x53,
-	0x72, 0x76, 0x4b, 0x65, 0x79, 0x73, 0x70, 0x61, 0x63, 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, 0x2b, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28,
-	0x0b, 0x32, 0x15, 0x2e, 0x74, 0x6f, 0x70, 0x6f, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x53, 0x72, 0x76,
-	0x4b, 0x65, 0x79, 0x73, 0x70, 0x61, 0x63, 0x65, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a,
-	0x02, 0x38, 0x01, 0x22, 0xe4, 0x03, 0x0a, 0x1c, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x54, 0x68,
-	0x72, 0x6f, 0x74, 0x74, 0x6c, 0x65, 0x72, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x52, 0x65, 0x71,
-	0x75, 0x65, 0x73, 0x74, 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, 0x16, 0x0a, 0x06, 0x65, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08,
-	0x52, 0x06, 0x65, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x64, 0x69, 0x73, 0x61,
-	0x62, 0x6c, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x08, 0x52, 0x07, 0x64, 0x69, 0x73, 0x61, 0x62,
-	0x6c, 0x65, 0x12, 0x1c, 0x0a, 0x09, 0x74, 0x68, 0x72, 0x65, 0x73, 0x68, 0x6f, 0x6c, 0x64, 0x18,
-	0x04, 0x20, 0x01, 0x28, 0x01, 0x52, 0x09, 0x74, 0x68, 0x72, 0x65, 0x73, 0x68, 0x6f, 0x6c, 0x64,
-	0x12, 0x21, 0x0a, 0x0c, 0x63, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x5f, 0x71, 0x75, 0x65, 0x72, 0x79,
-	0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x63, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x51, 0x75,
-	0x65, 0x72, 0x79, 0x12, 0x28, 0x0a, 0x10, 0x63, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x5f, 0x71, 0x75,
-	0x65, 0x72, 0x79, 0x5f, 0x73, 0x65, 0x74, 0x18, 0x06, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0e, 0x63,
-	0x75, 0x73, 0x74, 0x6f, 0x6d, 0x51, 0x75, 0x65, 0x72, 0x79, 0x53, 0x65, 0x74, 0x12, 0x2d, 0x0a,
-	0x13, 0x63, 0x68, 0x65, 0x63, 0x6b, 0x5f, 0x61, 0x73, 0x5f, 0x63, 0x68, 0x65, 0x63, 0x6b, 0x5f,
-	0x73, 0x65, 0x6c, 0x66, 0x18, 0x07, 0x20, 0x01, 0x28, 0x08, 0x52, 0x10, 0x63, 0x68, 0x65, 0x63,
-	0x6b, 0x41, 0x73, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x53, 0x65, 0x6c, 0x66, 0x12, 0x2f, 0x0a, 0x14,
-	0x63, 0x68, 0x65, 0x63, 0x6b, 0x5f, 0x61, 0x73, 0x5f, 0x63, 0x68, 0x65, 0x63, 0x6b, 0x5f, 0x73,
-	0x68, 0x61, 0x72, 0x64, 0x18, 0x08, 0x20, 0x01, 0x28, 0x08, 0x52, 0x11, 0x63, 0x68, 0x65, 0x63,
-	0x6b, 0x41, 0x73, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x53, 0x68, 0x61, 0x72, 0x64, 0x12, 0x3f, 0x0a,
-	0x0d, 0x74, 0x68, 0x72, 0x6f, 0x74, 0x74, 0x6c, 0x65, 0x64, 0x5f, 0x61, 0x70, 0x70, 0x18, 0x09,
-	0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x74, 0x6f, 0x70, 0x6f, 0x64, 0x61, 0x74, 0x61, 0x2e,
-	0x54, 0x68, 0x72, 0x6f, 0x74, 0x74, 0x6c, 0x65, 0x64, 0x41, 0x70, 0x70, 0x52, 0x75, 0x6c, 0x65,
-	0x52, 0x0c, 0x74, 0x68, 0x72, 0x6f, 0x74, 0x74, 0x6c, 0x65, 0x64, 0x41, 0x70, 0x70, 0x12, 0x1f,
-	0x0a, 0x0b, 0x6d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x0a, 0x20,
-	0x01, 0x28, 0x09, 0x52, 0x0a, 0x6d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x4e, 0x61, 0x6d, 0x65, 0x12,
-	0x19, 0x0a, 0x08, 0x61, 0x70, 0x70, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x0b, 0x20, 0x01, 0x28,
-	0x09, 0x52, 0x07, 0x61, 0x70, 0x70, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x2e, 0x0a, 0x13, 0x61, 0x70,
-	0x70, 0x5f, 0x63, 0x68, 0x65, 0x63, 0x6b, 0x65, 0x64, 0x5f, 0x6d, 0x65, 0x74, 0x72, 0x69, 0x63,
-	0x73, 0x18, 0x0c, 0x20, 0x03, 0x28, 0x09, 0x52, 0x11, 0x61, 0x70, 0x70, 0x43, 0x68, 0x65, 0x63,
-	0x6b, 0x65, 0x64, 0x4d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x73, 0x22, 0x1f, 0x0a, 0x1d, 0x55, 0x70,
+	0x63, 0x65, 0x4e, 0x61, 0x6d, 0x65, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x2e,
+	0x4e, 0x61, 0x6d, 0x65, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x05, 0x6e, 0x61, 0x6d, 0x65,
+	0x73, 0x1a, 0x69, 0x0a, 0x0a, 0x4e, 0x61, 0x6d, 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, 0x45, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b,
+	0x32, 0x2f, 0x2e, 0x76, 0x74, 0x63, 0x74, 0x6c, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x47, 0x65, 0x74,
+	0x53, 0x72, 0x76, 0x4b, 0x65, 0x79, 0x73, 0x70, 0x61, 0x63, 0x65, 0x4e, 0x61, 0x6d, 0x65, 0x73,
+	0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x2e, 0x4e, 0x61, 0x6d, 0x65, 0x4c, 0x69, 0x73,
+	0x74, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x20, 0x0a, 0x08,
+	0x4e, 0x61, 0x6d, 0x65, 0x4c, 0x69, 0x73, 0x74, 0x12, 0x14, 0x0a, 0x05, 0x6e, 0x61, 0x6d, 0x65,
+	0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x09, 0x52, 0x05, 0x6e, 0x61, 0x6d, 0x65, 0x73, 0x22, 0x4a,
+	0x0a, 0x16, 0x47, 0x65, 0x74, 0x53, 0x72, 0x76, 0x4b, 0x65, 0x79, 0x73, 0x70, 0x61, 0x63, 0x65,
+	0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 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, 0x63, 0x65, 0x6c, 0x6c, 0x73, 0x18, 0x02, 0x20,
+	0x03, 0x28, 0x09, 0x52, 0x05, 0x63, 0x65, 0x6c, 0x6c, 0x73, 0x22, 0xcc, 0x01, 0x0a, 0x17, 0x47,
+	0x65, 0x74, 0x53, 0x72, 0x76, 0x4b, 0x65, 0x79, 0x73, 0x70, 0x61, 0x63, 0x65, 0x73, 0x52, 0x65,
+	0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x59, 0x0a, 0x0d, 0x73, 0x72, 0x76, 0x5f, 0x6b, 0x65,
+	0x79, 0x73, 0x70, 0x61, 0x63, 0x65, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x34, 0x2e,
+	0x76, 0x74, 0x63, 0x74, 0x6c, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x47, 0x65, 0x74, 0x53, 0x72, 0x76,
+	0x4b, 0x65, 0x79, 0x73, 0x70, 0x61, 0x63, 0x65, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73,
+	0x65, 0x2e, 0x53, 0x72, 0x76, 0x4b, 0x65, 0x79, 0x73, 0x70, 0x61, 0x63, 0x65, 0x73, 0x45, 0x6e,
+	0x74, 0x72, 0x79, 0x52, 0x0c, 0x73, 0x72, 0x76, 0x4b, 0x65, 0x79, 0x73, 0x70, 0x61, 0x63, 0x65,
+	0x73, 0x1a, 0x56, 0x0a, 0x11, 0x53, 0x72, 0x76, 0x4b, 0x65, 0x79, 0x73, 0x70, 0x61, 0x63, 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, 0x2b, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75,
+	0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x15, 0x2e, 0x74, 0x6f, 0x70, 0x6f, 0x64, 0x61,
+	0x74, 0x61, 0x2e, 0x53, 0x72, 0x76, 0x4b, 0x65, 0x79, 0x73, 0x70, 0x61, 0x63, 0x65, 0x52, 0x05,
+	0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0xe4, 0x03, 0x0a, 0x1c, 0x55, 0x70,
 	0x64, 0x61, 0x74, 0x65, 0x54, 0x68, 0x72, 0x6f, 0x74, 0x74, 0x6c, 0x65, 0x72, 0x43, 0x6f, 0x6e,
-	0x66, 0x69, 0x67, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x2a, 0x0a, 0x14, 0x47,
-	0x65, 0x74, 0x53, 0x72, 0x76, 0x56, 0x53, 0x63, 0x68, 0x65, 0x6d, 0x61, 0x52, 0x65, 0x71, 0x75,
-	0x65, 0x73, 0x74, 0x12, 0x12, 0x0a, 0x04, 0x63, 0x65, 0x6c, 0x6c, 0x18, 0x01, 0x20, 0x01, 0x28,
-	0x09, 0x52, 0x04, 0x63, 0x65, 0x6c, 0x6c, 0x22, 0x4e, 0x0a, 0x15, 0x47, 0x65, 0x74, 0x53, 0x72,
-	0x76, 0x56, 0x53, 0x63, 0x68, 0x65, 0x6d, 0x61, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65,
-	0x12, 0x35, 0x0a, 0x0c, 0x73, 0x72, 0x76, 0x5f, 0x76, 0x5f, 0x73, 0x63, 0x68, 0x65, 0x6d, 0x61,
-	0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x76, 0x73, 0x63, 0x68, 0x65, 0x6d, 0x61,
-	0x2e, 0x53, 0x72, 0x76, 0x56, 0x53, 0x63, 0x68, 0x65, 0x6d, 0x61, 0x52, 0x0a, 0x73, 0x72, 0x76,
-	0x56, 0x53, 0x63, 0x68, 0x65, 0x6d, 0x61, 0x22, 0x2d, 0x0a, 0x15, 0x47, 0x65, 0x74, 0x53, 0x72,
-	0x76, 0x56, 0x53, 0x63, 0x68, 0x65, 0x6d, 0x61, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74,
-	0x12, 0x14, 0x0a, 0x05, 0x63, 0x65, 0x6c, 0x6c, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x09, 0x52,
-	0x05, 0x63, 0x65, 0x6c, 0x6c, 0x73, 0x22, 0xc5, 0x01, 0x0a, 0x16, 0x47, 0x65, 0x74, 0x53, 0x72,
+	0x66, 0x69, 0x67, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 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, 0x16, 0x0a, 0x06, 0x65, 0x6e, 0x61, 0x62, 0x6c, 0x65,
+	0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x65, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x12, 0x18,
+	0x0a, 0x07, 0x64, 0x69, 0x73, 0x61, 0x62, 0x6c, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x08, 0x52,
+	0x07, 0x64, 0x69, 0x73, 0x61, 0x62, 0x6c, 0x65, 0x12, 0x1c, 0x0a, 0x09, 0x74, 0x68, 0x72, 0x65,
+	0x73, 0x68, 0x6f, 0x6c, 0x64, 0x18, 0x04, 0x20, 0x01, 0x28, 0x01, 0x52, 0x09, 0x74, 0x68, 0x72,
+	0x65, 0x73, 0x68, 0x6f, 0x6c, 0x64, 0x12, 0x21, 0x0a, 0x0c, 0x63, 0x75, 0x73, 0x74, 0x6f, 0x6d,
+	0x5f, 0x71, 0x75, 0x65, 0x72, 0x79, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x63, 0x75,
+	0x73, 0x74, 0x6f, 0x6d, 0x51, 0x75, 0x65, 0x72, 0x79, 0x12, 0x28, 0x0a, 0x10, 0x63, 0x75, 0x73,
+	0x74, 0x6f, 0x6d, 0x5f, 0x71, 0x75, 0x65, 0x72, 0x79, 0x5f, 0x73, 0x65, 0x74, 0x18, 0x06, 0x20,
+	0x01, 0x28, 0x08, 0x52, 0x0e, 0x63, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x51, 0x75, 0x65, 0x72, 0x79,
+	0x53, 0x65, 0x74, 0x12, 0x2d, 0x0a, 0x13, 0x63, 0x68, 0x65, 0x63, 0x6b, 0x5f, 0x61, 0x73, 0x5f,
+	0x63, 0x68, 0x65, 0x63, 0x6b, 0x5f, 0x73, 0x65, 0x6c, 0x66, 0x18, 0x07, 0x20, 0x01, 0x28, 0x08,
+	0x52, 0x10, 0x63, 0x68, 0x65, 0x63, 0x6b, 0x41, 0x73, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x53, 0x65,
+	0x6c, 0x66, 0x12, 0x2f, 0x0a, 0x14, 0x63, 0x68, 0x65, 0x63, 0x6b, 0x5f, 0x61, 0x73, 0x5f, 0x63,
+	0x68, 0x65, 0x63, 0x6b, 0x5f, 0x73, 0x68, 0x61, 0x72, 0x64, 0x18, 0x08, 0x20, 0x01, 0x28, 0x08,
+	0x52, 0x11, 0x63, 0x68, 0x65, 0x63, 0x6b, 0x41, 0x73, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x53, 0x68,
+	0x61, 0x72, 0x64, 0x12, 0x3f, 0x0a, 0x0d, 0x74, 0x68, 0x72, 0x6f, 0x74, 0x74, 0x6c, 0x65, 0x64,
+	0x5f, 0x61, 0x70, 0x70, 0x18, 0x09, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x74, 0x6f, 0x70,
+	0x6f, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x54, 0x68, 0x72, 0x6f, 0x74, 0x74, 0x6c, 0x65, 0x64, 0x41,
+	0x70, 0x70, 0x52, 0x75, 0x6c, 0x65, 0x52, 0x0c, 0x74, 0x68, 0x72, 0x6f, 0x74, 0x74, 0x6c, 0x65,
+	0x64, 0x41, 0x70, 0x70, 0x12, 0x1f, 0x0a, 0x0b, 0x6d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x5f, 0x6e,
+	0x61, 0x6d, 0x65, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x6d, 0x65, 0x74, 0x72, 0x69,
+	0x63, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x19, 0x0a, 0x08, 0x61, 0x70, 0x70, 0x5f, 0x6e, 0x61, 0x6d,
+	0x65, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x61, 0x70, 0x70, 0x4e, 0x61, 0x6d, 0x65,
+	0x12, 0x2e, 0x0a, 0x13, 0x61, 0x70, 0x70, 0x5f, 0x63, 0x68, 0x65, 0x63, 0x6b, 0x65, 0x64, 0x5f,
+	0x6d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x73, 0x18, 0x0c, 0x20, 0x03, 0x28, 0x09, 0x52, 0x11, 0x61,
+	0x70, 0x70, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x65, 0x64, 0x4d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x73,
+	0x22, 0x1f, 0x0a, 0x1d, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x54, 0x68, 0x72, 0x6f, 0x74, 0x74,
+	0x6c, 0x65, 0x72, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73,
+	0x65, 0x22, 0x2a, 0x0a, 0x14, 0x47, 0x65, 0x74, 0x53, 0x72, 0x76, 0x56, 0x53, 0x63, 0x68, 0x65,
+	0x6d, 0x61, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x12, 0x0a, 0x04, 0x63, 0x65, 0x6c,
+	0x6c, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x63, 0x65, 0x6c, 0x6c, 0x22, 0x4e, 0x0a,
+	0x15, 0x47, 0x65, 0x74, 0x53, 0x72, 0x76, 0x56, 0x53, 0x63, 0x68, 0x65, 0x6d, 0x61, 0x52, 0x65,
+	0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x35, 0x0a, 0x0c, 0x73, 0x72, 0x76, 0x5f, 0x76, 0x5f,
+	0x73, 0x63, 0x68, 0x65, 0x6d, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x76,
+	0x73, 0x63, 0x68, 0x65, 0x6d, 0x61, 0x2e, 0x53, 0x72, 0x76, 0x56, 0x53, 0x63, 0x68, 0x65, 0x6d,
+	0x61, 0x52, 0x0a, 0x73, 0x72, 0x76, 0x56, 0x53, 0x63, 0x68, 0x65, 0x6d, 0x61, 0x22, 0x2d, 0x0a,
+	0x15, 0x47, 0x65, 0x74, 0x53, 0x72, 0x76, 0x56, 0x53, 0x63, 0x68, 0x65, 0x6d, 0x61, 0x73, 0x52,
+	0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x14, 0x0a, 0x05, 0x63, 0x65, 0x6c, 0x6c, 0x73, 0x18,
+	0x02, 0x20, 0x03, 0x28, 0x09, 0x52, 0x05, 0x63, 0x65, 0x6c, 0x6c, 0x73, 0x22, 0xc5, 0x01, 0x0a,
+	0x16, 0x47, 0x65, 0x74, 0x53, 0x72, 0x76, 0x56, 0x53, 0x63, 0x68, 0x65, 0x6d, 0x61, 0x73, 0x52,
+	0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x56, 0x0a, 0x0d, 0x73, 0x72, 0x76, 0x5f, 0x76,
+	0x5f, 0x73, 0x63, 0x68, 0x65, 0x6d, 0x61, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x32,
+	0x2e, 0x76, 0x74, 0x63, 0x74, 0x6c, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x47, 0x65, 0x74, 0x53, 0x72,
 	0x76, 0x56, 0x53, 0x63, 0x68, 0x65, 0x6d, 0x61, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73,
-	0x65, 0x12, 0x56, 0x0a, 0x0d, 0x73, 0x72, 0x76, 0x5f, 0x76, 0x5f, 0x73, 0x63, 0x68, 0x65, 0x6d,
-	0x61, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x32, 0x2e, 0x76, 0x74, 0x63, 0x74, 0x6c,
-	0x64, 0x61, 0x74, 0x61, 0x2e, 0x47, 0x65, 0x74, 0x53, 0x72, 0x76, 0x56, 0x53, 0x63, 0x68, 0x65,
-	0x6d, 0x61, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x2e, 0x53, 0x72, 0x76, 0x56,
-	0x53, 0x63, 0x68, 0x65, 0x6d, 0x61, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x0b, 0x73, 0x72,
-	0x76, 0x56, 0x53, 0x63, 0x68, 0x65, 0x6d, 0x61, 0x73, 0x1a, 0x53, 0x0a, 0x10, 0x53, 0x72, 0x76,
-	0x56, 0x53, 0x63, 0x68, 0x65, 0x6d, 0x61, 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,
-	0x29, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x13,
-	0x2e, 0x76, 0x73, 0x63, 0x68, 0x65, 0x6d, 0x61, 0x2e, 0x53, 0x72, 0x76, 0x56, 0x53, 0x63, 0x68,
-	0x65, 0x6d, 0x61, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x4c,
-	0x0a, 0x10, 0x47, 0x65, 0x74, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65,
-	0x73, 0x74, 0x12, 0x38, 0x0a, 0x0c, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x5f, 0x61, 0x6c, 0x69,
-	0x61, 0x73, 0x18, 0x01, 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, 0x3d, 0x0a, 0x11,
-	0x47, 0x65, 0x74, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73,
-	0x65, 0x12, 0x28, 0x0a, 0x06, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28,
-	0x0b, 0x32, 0x10, 0x2e, 0x74, 0x6f, 0x70, 0x6f, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x54, 0x61, 0x62,
-	0x6c, 0x65, 0x74, 0x52, 0x06, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x22, 0xe8, 0x01, 0x0a, 0x11,
-	0x47, 0x65, 0x74, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73,
-	0x74, 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, 0x14, 0x0a, 0x05, 0x63, 0x65, 0x6c, 0x6c, 0x73, 0x18, 0x03, 0x20, 0x03,
-	0x28, 0x09, 0x52, 0x05, 0x63, 0x65, 0x6c, 0x6c, 0x73, 0x12, 0x16, 0x0a, 0x06, 0x73, 0x74, 0x72,
-	0x69, 0x63, 0x74, 0x18, 0x04, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x73, 0x74, 0x72, 0x69, 0x63,
-	0x74, 0x12, 0x3c, 0x0a, 0x0e, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x5f, 0x61, 0x6c, 0x69, 0x61,
-	0x73, 0x65, 0x73, 0x18, 0x05, 0x20, 0x03, 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, 0x0d, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x41, 0x6c, 0x69, 0x61, 0x73, 0x65, 0x73, 0x12,
-	0x35, 0x0a, 0x0b, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x18, 0x06,
-	0x20, 0x01, 0x28, 0x0e, 0x32, 0x14, 0x2e, 0x74, 0x6f, 0x70, 0x6f, 0x64, 0x61, 0x74, 0x61, 0x2e,
-	0x54, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x54, 0x79, 0x70, 0x65, 0x52, 0x0a, 0x74, 0x61, 0x62, 0x6c,
-	0x65, 0x74, 0x54, 0x79, 0x70, 0x65, 0x22, 0x40, 0x0a, 0x12, 0x47, 0x65, 0x74, 0x54, 0x61, 0x62,
-	0x6c, 0x65, 0x74, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x2a, 0x0a, 0x07,
-	0x74, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x10, 0x2e,
-	0x74, 0x6f, 0x70, 0x6f, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x52,
-	0x07, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x73, 0x22, 0x55, 0x0a, 0x19, 0x47, 0x65, 0x74, 0x54,
-	0x68, 0x72, 0x6f, 0x74, 0x74, 0x6c, 0x65, 0x72, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x52, 0x65,
-	0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x38, 0x0a, 0x0c, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x5f,
-	0x61, 0x6c, 0x69, 0x61, 0x73, 0x18, 0x01, 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,
-	0x63, 0x0a, 0x1a, 0x47, 0x65, 0x74, 0x54, 0x68, 0x72, 0x6f, 0x74, 0x74, 0x6c, 0x65, 0x72, 0x53,
-	0x74, 0x61, 0x74, 0x75, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x45, 0x0a,
-	0x06, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2d, 0x2e,
-	0x74, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x6d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x72, 0x64, 0x61, 0x74,
-	0x61, 0x2e, 0x47, 0x65, 0x74, 0x54, 0x68, 0x72, 0x6f, 0x74, 0x74, 0x6c, 0x65, 0x72, 0x53, 0x74,
-	0x61, 0x74, 0x75, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x52, 0x06, 0x73, 0x74,
-	0x61, 0x74, 0x75, 0x73, 0x22, 0x5f, 0x0a, 0x16, 0x47, 0x65, 0x74, 0x54, 0x6f, 0x70, 0x6f, 0x6c,
-	0x6f, 0x67, 0x79, 0x50, 0x61, 0x74, 0x68, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x12,
-	0x0a, 0x04, 0x70, 0x61, 0x74, 0x68, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x70, 0x61,
-	0x74, 0x68, 0x12, 0x18, 0x0a, 0x07, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x18, 0x02, 0x20,
-	0x01, 0x28, 0x03, 0x52, 0x07, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x12, 0x17, 0x0a, 0x07,
-	0x61, 0x73, 0x5f, 0x6a, 0x73, 0x6f, 0x6e, 0x18, 0x03, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x61,
-	0x73, 0x4a, 0x73, 0x6f, 0x6e, 0x22, 0x46, 0x0a, 0x17, 0x47, 0x65, 0x74, 0x54, 0x6f, 0x70, 0x6f,
-	0x6c, 0x6f, 0x67, 0x79, 0x50, 0x61, 0x74, 0x68, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65,
-	0x12, 0x2b, 0x0a, 0x04, 0x63, 0x65, 0x6c, 0x6c, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x17,
-	0x2e, 0x76, 0x74, 0x63, 0x74, 0x6c, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x54, 0x6f, 0x70, 0x6f, 0x6c,
-	0x6f, 0x67, 0x79, 0x43, 0x65, 0x6c, 0x6c, 0x52, 0x04, 0x63, 0x65, 0x6c, 0x6c, 0x22, 0x80, 0x01,
-	0x0a, 0x0c, 0x54, 0x6f, 0x70, 0x6f, 0x6c, 0x6f, 0x67, 0x79, 0x43, 0x65, 0x6c, 0x6c, 0x12, 0x12,
-	0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61,
-	0x6d, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x70, 0x61, 0x74, 0x68, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09,
-	0x52, 0x04, 0x70, 0x61, 0x74, 0x68, 0x12, 0x12, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x03,
-	0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x12, 0x1a, 0x0a, 0x08, 0x63, 0x68,
-	0x69, 0x6c, 0x64, 0x72, 0x65, 0x6e, 0x18, 0x04, 0x20, 0x03, 0x28, 0x09, 0x52, 0x08, 0x63, 0x68,
-	0x69, 0x6c, 0x64, 0x72, 0x65, 0x6e, 0x12, 0x18, 0x0a, 0x07, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f,
-	0x6e, 0x18, 0x05, 0x20, 0x01, 0x28, 0x03, 0x52, 0x07, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e,
-	0x22, 0x5f, 0x0a, 0x20, 0x47, 0x65, 0x74, 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, 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, 0x1f, 0x0a, 0x0b, 0x61, 0x62, 0x61, 0x6e, 0x64, 0x6f, 0x6e, 0x5f, 0x61, 0x67, 0x65, 0x18,
-	0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0a, 0x61, 0x62, 0x61, 0x6e, 0x64, 0x6f, 0x6e, 0x41, 0x67,
-	0x65, 0x22, 0x63, 0x0a, 0x21, 0x47, 0x65, 0x74, 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, 0x2f, 0x0a, 0x19, 0x47, 0x65, 0x74, 0x54, 0x72, 0x61,
-	0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65, 0x71, 0x75,
-	0x65, 0x73, 0x74, 0x12, 0x12, 0x0a, 0x04, 0x64, 0x74, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28,
-	0x09, 0x52, 0x04, 0x64, 0x74, 0x69, 0x64, 0x22, 0xa0, 0x01, 0x0a, 0x15, 0x53, 0x68, 0x61, 0x72,
-	0x64, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x53, 0x74, 0x61, 0x74,
-	0x65, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x68, 0x61, 0x72, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09,
-	0x52, 0x05, 0x73, 0x68, 0x61, 0x72, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x74, 0x61, 0x74, 0x65,
-	0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x73, 0x74, 0x61, 0x74, 0x65, 0x12, 0x18, 0x0a,
-	0x07, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07,
-	0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x12, 0x21, 0x0a, 0x0c, 0x74, 0x69, 0x6d, 0x65, 0x5f,
-	0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x64, 0x18, 0x04, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0b, 0x74,
-	0x69, 0x6d, 0x65, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x64, 0x12, 0x1e, 0x0a, 0x0a, 0x73, 0x74,
-	0x61, 0x74, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x18, 0x05, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0a,
-	0x73, 0x74, 0x61, 0x74, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x22, 0x99, 0x01, 0x0a, 0x1a, 0x47,
-	0x65, 0x74, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x6e, 0x66,
-	0x6f, 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, 0x12, 0x43, 0x0a, 0x0c, 0x73, 0x68, 0x61, 0x72, 0x64, 0x5f, 0x73, 0x74, 0x61, 0x74, 0x65,
-	0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x20, 0x2e, 0x76, 0x74, 0x63, 0x74, 0x6c, 0x64,
-	0x61, 0x74, 0x61, 0x2e, 0x53, 0x68, 0x61, 0x72, 0x64, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63,
-	0x74, 0x69, 0x6f, 0x6e, 0x53, 0x74, 0x61, 0x74, 0x65, 0x52, 0x0b, 0x73, 0x68, 0x61, 0x72, 0x64,
-	0x53, 0x74, 0x61, 0x74, 0x65, 0x73, 0x22, 0x63, 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, 0x12, 0x0a, 0x04, 0x64, 0x74, 0x69, 0x64, 0x18, 0x01, 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, 0x02, 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, 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, 0x2f, 0x0a, 0x11, 0x47, 0x65,
-	0x74, 0x56, 0x53, 0x63, 0x68, 0x65, 0x6d, 0x61, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 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, 0x22, 0x4d, 0x0a, 0x11, 0x47,
-	0x65, 0x74, 0x56, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74,
-	0x12, 0x38, 0x0a, 0x0c, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x5f, 0x61, 0x6c, 0x69, 0x61, 0x73,
-	0x18, 0x01, 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, 0x2e, 0x0a, 0x12, 0x47, 0x65,
-	0x74, 0x56, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65,
-	0x12, 0x18, 0x0a, 0x07, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28,
-	0x09, 0x52, 0x07, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x22, 0x42, 0x0a, 0x12, 0x47, 0x65,
-	0x74, 0x56, 0x53, 0x63, 0x68, 0x65, 0x6d, 0x61, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65,
-	0x12, 0x2c, 0x0a, 0x08, 0x76, 0x5f, 0x73, 0x63, 0x68, 0x65, 0x6d, 0x61, 0x18, 0x01, 0x20, 0x01,
-	0x28, 0x0b, 0x32, 0x11, 0x2e, 0x76, 0x73, 0x63, 0x68, 0x65, 0x6d, 0x61, 0x2e, 0x4b, 0x65, 0x79,
-	0x73, 0x70, 0x61, 0x63, 0x65, 0x52, 0x07, 0x76, 0x53, 0x63, 0x68, 0x65, 0x6d, 0x61, 0x22, 0xc6,
-	0x01, 0x0a, 0x13, 0x47, 0x65, 0x74, 0x57, 0x6f, 0x72, 0x6b, 0x66, 0x6c, 0x6f, 0x77, 0x73, 0x52,
-	0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 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, 0x1f, 0x0a, 0x0b, 0x61, 0x63, 0x74, 0x69, 0x76, 0x65, 0x5f, 0x6f, 0x6e, 0x6c,
-	0x79, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0a, 0x61, 0x63, 0x74, 0x69, 0x76, 0x65, 0x4f,
-	0x6e, 0x6c, 0x79, 0x12, 0x1b, 0x0a, 0x09, 0x6e, 0x61, 0x6d, 0x65, 0x5f, 0x6f, 0x6e, 0x6c, 0x79,
-	0x18, 0x03, 0x20, 0x01, 0x28, 0x08, 0x52, 0x08, 0x6e, 0x61, 0x6d, 0x65, 0x4f, 0x6e, 0x6c, 0x79,
-	0x12, 0x1a, 0x0a, 0x08, 0x77, 0x6f, 0x72, 0x6b, 0x66, 0x6c, 0x6f, 0x77, 0x18, 0x04, 0x20, 0x01,
-	0x28, 0x09, 0x52, 0x08, 0x77, 0x6f, 0x72, 0x6b, 0x66, 0x6c, 0x6f, 0x77, 0x12, 0x21, 0x0a, 0x0c,
-	0x69, 0x6e, 0x63, 0x6c, 0x75, 0x64, 0x65, 0x5f, 0x6c, 0x6f, 0x67, 0x73, 0x18, 0x05, 0x20, 0x01,
-	0x28, 0x08, 0x52, 0x0b, 0x69, 0x6e, 0x63, 0x6c, 0x75, 0x64, 0x65, 0x4c, 0x6f, 0x67, 0x73, 0x12,
-	0x16, 0x0a, 0x06, 0x73, 0x68, 0x61, 0x72, 0x64, 0x73, 0x18, 0x06, 0x20, 0x03, 0x28, 0x09, 0x52,
-	0x06, 0x73, 0x68, 0x61, 0x72, 0x64, 0x73, 0x22, 0x49, 0x0a, 0x14, 0x47, 0x65, 0x74, 0x57, 0x6f,
-	0x72, 0x6b, 0x66, 0x6c, 0x6f, 0x77, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12,
-	0x31, 0x0a, 0x09, 0x77, 0x6f, 0x72, 0x6b, 0x66, 0x6c, 0x6f, 0x77, 0x73, 0x18, 0x01, 0x20, 0x03,
-	0x28, 0x0b, 0x32, 0x13, 0x2e, 0x76, 0x74, 0x63, 0x74, 0x6c, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x57,
-	0x6f, 0x72, 0x6b, 0x66, 0x6c, 0x6f, 0x77, 0x52, 0x09, 0x77, 0x6f, 0x72, 0x6b, 0x66, 0x6c, 0x6f,
-	0x77, 0x73, 0x22, 0xfb, 0x01, 0x0a, 0x17, 0x49, 0x6e, 0x69, 0x74, 0x53, 0x68, 0x61, 0x72, 0x64,
-	0x50, 0x72, 0x69, 0x6d, 0x61, 0x72, 0x79, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 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, 0x52, 0x0a, 0x1a, 0x70, 0x72, 0x69, 0x6d, 0x61, 0x72, 0x79, 0x5f, 0x65, 0x6c, 0x65, 0x63,
-	0x74, 0x5f, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x5f, 0x61, 0x6c, 0x69, 0x61, 0x73, 0x18, 0x03,
-	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, 0x17, 0x70, 0x72, 0x69,
-	0x6d, 0x61, 0x72, 0x79, 0x45, 0x6c, 0x65, 0x63, 0x74, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x41,
-	0x6c, 0x69, 0x61, 0x73, 0x12, 0x14, 0x0a, 0x05, 0x66, 0x6f, 0x72, 0x63, 0x65, 0x18, 0x04, 0x20,
-	0x01, 0x28, 0x08, 0x52, 0x05, 0x66, 0x6f, 0x72, 0x63, 0x65, 0x12, 0x44, 0x0a, 0x15, 0x77, 0x61,
-	0x69, 0x74, 0x5f, 0x72, 0x65, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x73, 0x5f, 0x74, 0x69, 0x6d, 0x65,
-	0x6f, 0x75, 0x74, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x76, 0x74, 0x74, 0x69,
-	0x6d, 0x65, 0x2e, 0x44, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x13, 0x77, 0x61, 0x69,
-	0x74, 0x52, 0x65, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x73, 0x54, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74,
-	0x22, 0x42, 0x0a, 0x18, 0x49, 0x6e, 0x69, 0x74, 0x53, 0x68, 0x61, 0x72, 0x64, 0x50, 0x72, 0x69,
-	0x6d, 0x61, 0x72, 0x79, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x26, 0x0a, 0x06,
-	0x65, 0x76, 0x65, 0x6e, 0x74, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x6c,
-	0x6f, 0x67, 0x75, 0x74, 0x69, 0x6c, 0x2e, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x52, 0x06, 0x65, 0x76,
-	0x65, 0x6e, 0x74, 0x73, 0x22, 0x4e, 0x0a, 0x1c, 0x4c, 0x61, 0x75, 0x6e, 0x63, 0x68, 0x53, 0x63,
-	0x68, 0x65, 0x6d, 0x61, 0x4d, 0x69, 0x67, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x71,
+	0x65, 0x2e, 0x53, 0x72, 0x76, 0x56, 0x53, 0x63, 0x68, 0x65, 0x6d, 0x61, 0x73, 0x45, 0x6e, 0x74,
+	0x72, 0x79, 0x52, 0x0b, 0x73, 0x72, 0x76, 0x56, 0x53, 0x63, 0x68, 0x65, 0x6d, 0x61, 0x73, 0x1a,
+	0x53, 0x0a, 0x10, 0x53, 0x72, 0x76, 0x56, 0x53, 0x63, 0x68, 0x65, 0x6d, 0x61, 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, 0x29, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02,
+	0x20, 0x01, 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x76, 0x73, 0x63, 0x68, 0x65, 0x6d, 0x61, 0x2e, 0x53,
+	0x72, 0x76, 0x56, 0x53, 0x63, 0x68, 0x65, 0x6d, 0x61, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65,
+	0x3a, 0x02, 0x38, 0x01, 0x22, 0x4c, 0x0a, 0x10, 0x47, 0x65, 0x74, 0x54, 0x61, 0x62, 0x6c, 0x65,
+	0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x38, 0x0a, 0x0c, 0x74, 0x61, 0x62, 0x6c,
+	0x65, 0x74, 0x5f, 0x61, 0x6c, 0x69, 0x61, 0x73, 0x18, 0x01, 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, 0x3d, 0x0a, 0x11, 0x47, 0x65, 0x74, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x52,
+	0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x28, 0x0a, 0x06, 0x74, 0x61, 0x62, 0x6c, 0x65,
+	0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x74, 0x6f, 0x70, 0x6f, 0x64, 0x61,
+	0x74, 0x61, 0x2e, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x52, 0x06, 0x74, 0x61, 0x62, 0x6c, 0x65,
+	0x74, 0x22, 0xe8, 0x01, 0x0a, 0x11, 0x47, 0x65, 0x74, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x73,
+	0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 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, 0x14, 0x0a, 0x05, 0x63, 0x65, 0x6c,
+	0x6c, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x09, 0x52, 0x05, 0x63, 0x65, 0x6c, 0x6c, 0x73, 0x12,
+	0x16, 0x0a, 0x06, 0x73, 0x74, 0x72, 0x69, 0x63, 0x74, 0x18, 0x04, 0x20, 0x01, 0x28, 0x08, 0x52,
+	0x06, 0x73, 0x74, 0x72, 0x69, 0x63, 0x74, 0x12, 0x3c, 0x0a, 0x0e, 0x74, 0x61, 0x62, 0x6c, 0x65,
+	0x74, 0x5f, 0x61, 0x6c, 0x69, 0x61, 0x73, 0x65, 0x73, 0x18, 0x05, 0x20, 0x03, 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, 0x0d, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x41, 0x6c,
+	0x69, 0x61, 0x73, 0x65, 0x73, 0x12, 0x35, 0x0a, 0x0b, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x5f,
+	0x74, 0x79, 0x70, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x14, 0x2e, 0x74, 0x6f, 0x70,
+	0x6f, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x54, 0x79, 0x70, 0x65,
+	0x52, 0x0a, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x54, 0x79, 0x70, 0x65, 0x22, 0x40, 0x0a, 0x12,
+	0x47, 0x65, 0x74, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e,
+	0x73, 0x65, 0x12, 0x2a, 0x0a, 0x07, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x73, 0x18, 0x01, 0x20,
+	0x03, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x74, 0x6f, 0x70, 0x6f, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x54,
+	0x61, 0x62, 0x6c, 0x65, 0x74, 0x52, 0x07, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x73, 0x22, 0x55,
+	0x0a, 0x19, 0x47, 0x65, 0x74, 0x54, 0x68, 0x72, 0x6f, 0x74, 0x74, 0x6c, 0x65, 0x72, 0x53, 0x74,
+	0x61, 0x74, 0x75, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x38, 0x0a, 0x0c, 0x74,
+	0x61, 0x62, 0x6c, 0x65, 0x74, 0x5f, 0x61, 0x6c, 0x69, 0x61, 0x73, 0x18, 0x01, 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, 0x63, 0x0a, 0x1a, 0x47, 0x65, 0x74, 0x54, 0x68, 0x72, 0x6f,
+	0x74, 0x74, 0x6c, 0x65, 0x72, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f,
+	0x6e, 0x73, 0x65, 0x12, 0x45, 0x0a, 0x06, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x18, 0x01, 0x20,
+	0x01, 0x28, 0x0b, 0x32, 0x2d, 0x2e, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x6d, 0x61, 0x6e, 0x61,
+	0x67, 0x65, 0x72, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x47, 0x65, 0x74, 0x54, 0x68, 0x72, 0x6f, 0x74,
+	0x74, 0x6c, 0x65, 0x72, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e,
+	0x73, 0x65, 0x52, 0x06, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x22, 0x5f, 0x0a, 0x16, 0x47, 0x65,
+	0x74, 0x54, 0x6f, 0x70, 0x6f, 0x6c, 0x6f, 0x67, 0x79, 0x50, 0x61, 0x74, 0x68, 0x52, 0x65, 0x71,
+	0x75, 0x65, 0x73, 0x74, 0x12, 0x12, 0x0a, 0x04, 0x70, 0x61, 0x74, 0x68, 0x18, 0x01, 0x20, 0x01,
+	0x28, 0x09, 0x52, 0x04, 0x70, 0x61, 0x74, 0x68, 0x12, 0x18, 0x0a, 0x07, 0x76, 0x65, 0x72, 0x73,
+	0x69, 0x6f, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x07, 0x76, 0x65, 0x72, 0x73, 0x69,
+	0x6f, 0x6e, 0x12, 0x17, 0x0a, 0x07, 0x61, 0x73, 0x5f, 0x6a, 0x73, 0x6f, 0x6e, 0x18, 0x03, 0x20,
+	0x01, 0x28, 0x08, 0x52, 0x06, 0x61, 0x73, 0x4a, 0x73, 0x6f, 0x6e, 0x22, 0x46, 0x0a, 0x17, 0x47,
+	0x65, 0x74, 0x54, 0x6f, 0x70, 0x6f, 0x6c, 0x6f, 0x67, 0x79, 0x50, 0x61, 0x74, 0x68, 0x52, 0x65,
+	0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x2b, 0x0a, 0x04, 0x63, 0x65, 0x6c, 0x6c, 0x18, 0x01,
+	0x20, 0x01, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x76, 0x74, 0x63, 0x74, 0x6c, 0x64, 0x61, 0x74, 0x61,
+	0x2e, 0x54, 0x6f, 0x70, 0x6f, 0x6c, 0x6f, 0x67, 0x79, 0x43, 0x65, 0x6c, 0x6c, 0x52, 0x04, 0x63,
+	0x65, 0x6c, 0x6c, 0x22, 0x80, 0x01, 0x0a, 0x0c, 0x54, 0x6f, 0x70, 0x6f, 0x6c, 0x6f, 0x67, 0x79,
+	0x43, 0x65, 0x6c, 0x6c, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01,
+	0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x70, 0x61, 0x74, 0x68,
+	0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x70, 0x61, 0x74, 0x68, 0x12, 0x12, 0x0a, 0x04,
+	0x64, 0x61, 0x74, 0x61, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61,
+	0x12, 0x1a, 0x0a, 0x08, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x72, 0x65, 0x6e, 0x18, 0x04, 0x20, 0x03,
+	0x28, 0x09, 0x52, 0x08, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x72, 0x65, 0x6e, 0x12, 0x18, 0x0a, 0x07,
+	0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x18, 0x05, 0x20, 0x01, 0x28, 0x03, 0x52, 0x07, 0x76,
+	0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x22, 0x5f, 0x0a, 0x20, 0x47, 0x65, 0x74, 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, 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, 0x1f, 0x0a, 0x0b, 0x61, 0x62, 0x61, 0x6e, 0x64, 0x6f,
+	0x6e, 0x5f, 0x61, 0x67, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0a, 0x61, 0x62, 0x61,
+	0x6e, 0x64, 0x6f, 0x6e, 0x41, 0x67, 0x65, 0x22, 0x63, 0x0a, 0x21, 0x47, 0x65, 0x74, 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, 0x2f, 0x0a, 0x19,
+	0x47, 0x65, 0x74, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x6e,
+	0x66, 0x6f, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x12, 0x0a, 0x04, 0x64, 0x74, 0x69,
+	0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x64, 0x74, 0x69, 0x64, 0x22, 0xa0, 0x01,
+	0x0a, 0x15, 0x53, 0x68, 0x61, 0x72, 0x64, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69,
+	0x6f, 0x6e, 0x53, 0x74, 0x61, 0x74, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x68, 0x61, 0x72, 0x64,
+	0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x73, 0x68, 0x61, 0x72, 0x64, 0x12, 0x14, 0x0a,
+	0x05, 0x73, 0x74, 0x61, 0x74, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x73, 0x74,
+	0x61, 0x74, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x18, 0x03,
+	0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x12, 0x21, 0x0a,
+	0x0c, 0x74, 0x69, 0x6d, 0x65, 0x5f, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x64, 0x18, 0x04, 0x20,
+	0x01, 0x28, 0x03, 0x52, 0x0b, 0x74, 0x69, 0x6d, 0x65, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x64,
+	0x12, 0x1e, 0x0a, 0x0a, 0x73, 0x74, 0x61, 0x74, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x18, 0x05,
+	0x20, 0x03, 0x28, 0x09, 0x52, 0x0a, 0x73, 0x74, 0x61, 0x74, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x73,
+	0x22, 0x99, 0x01, 0x0a, 0x1a, 0x47, 0x65, 0x74, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74,
+	0x69, 0x6f, 0x6e, 0x49, 0x6e, 0x66, 0x6f, 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, 0x12, 0x43, 0x0a, 0x0c, 0x73, 0x68, 0x61, 0x72, 0x64,
+	0x5f, 0x73, 0x74, 0x61, 0x74, 0x65, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x20, 0x2e,
+	0x76, 0x74, 0x63, 0x74, 0x6c, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x53, 0x68, 0x61, 0x72, 0x64, 0x54,
+	0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x53, 0x74, 0x61, 0x74, 0x65, 0x52,
+	0x0b, 0x73, 0x68, 0x61, 0x72, 0x64, 0x53, 0x74, 0x61, 0x74, 0x65, 0x73, 0x22, 0x63, 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, 0x12, 0x0a, 0x04, 0x64, 0x74,
+	0x69, 0x64, 0x18, 0x01, 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, 0x02,
+	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, 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, 0x2f, 0x0a, 0x11, 0x47, 0x65, 0x74, 0x56, 0x53, 0x63, 0x68, 0x65, 0x6d, 0x61, 0x52, 0x65,
+	0x71, 0x75, 0x65, 0x73, 0x74, 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, 0x22, 0x4d, 0x0a, 0x11, 0x47, 0x65, 0x74, 0x56, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x52,
+	0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x38, 0x0a, 0x0c, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x74,
+	0x5f, 0x61, 0x6c, 0x69, 0x61, 0x73, 0x18, 0x01, 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, 0x2e, 0x0a, 0x12, 0x47, 0x65, 0x74, 0x56, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x52, 0x65,
+	0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f,
+	0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e,
+	0x22, 0x42, 0x0a, 0x12, 0x47, 0x65, 0x74, 0x56, 0x53, 0x63, 0x68, 0x65, 0x6d, 0x61, 0x52, 0x65,
+	0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x2c, 0x0a, 0x08, 0x76, 0x5f, 0x73, 0x63, 0x68, 0x65,
+	0x6d, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x11, 0x2e, 0x76, 0x73, 0x63, 0x68, 0x65,
+	0x6d, 0x61, 0x2e, 0x4b, 0x65, 0x79, 0x73, 0x70, 0x61, 0x63, 0x65, 0x52, 0x07, 0x76, 0x53, 0x63,
+	0x68, 0x65, 0x6d, 0x61, 0x22, 0xc6, 0x01, 0x0a, 0x13, 0x47, 0x65, 0x74, 0x57, 0x6f, 0x72, 0x6b,
+	0x66, 0x6c, 0x6f, 0x77, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 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, 0x1f, 0x0a, 0x0b, 0x61, 0x63, 0x74, 0x69,
+	0x76, 0x65, 0x5f, 0x6f, 0x6e, 0x6c, 0x79, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0a, 0x61,
+	0x63, 0x74, 0x69, 0x76, 0x65, 0x4f, 0x6e, 0x6c, 0x79, 0x12, 0x1b, 0x0a, 0x09, 0x6e, 0x61, 0x6d,
+	0x65, 0x5f, 0x6f, 0x6e, 0x6c, 0x79, 0x18, 0x03, 0x20, 0x01, 0x28, 0x08, 0x52, 0x08, 0x6e, 0x61,
+	0x6d, 0x65, 0x4f, 0x6e, 0x6c, 0x79, 0x12, 0x1a, 0x0a, 0x08, 0x77, 0x6f, 0x72, 0x6b, 0x66, 0x6c,
+	0x6f, 0x77, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x77, 0x6f, 0x72, 0x6b, 0x66, 0x6c,
+	0x6f, 0x77, 0x12, 0x21, 0x0a, 0x0c, 0x69, 0x6e, 0x63, 0x6c, 0x75, 0x64, 0x65, 0x5f, 0x6c, 0x6f,
+	0x67, 0x73, 0x18, 0x05, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0b, 0x69, 0x6e, 0x63, 0x6c, 0x75, 0x64,
+	0x65, 0x4c, 0x6f, 0x67, 0x73, 0x12, 0x16, 0x0a, 0x06, 0x73, 0x68, 0x61, 0x72, 0x64, 0x73, 0x18,
+	0x06, 0x20, 0x03, 0x28, 0x09, 0x52, 0x06, 0x73, 0x68, 0x61, 0x72, 0x64, 0x73, 0x22, 0x49, 0x0a,
+	0x14, 0x47, 0x65, 0x74, 0x57, 0x6f, 0x72, 0x6b, 0x66, 0x6c, 0x6f, 0x77, 0x73, 0x52, 0x65, 0x73,
+	0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x31, 0x0a, 0x09, 0x77, 0x6f, 0x72, 0x6b, 0x66, 0x6c, 0x6f,
+	0x77, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x76, 0x74, 0x63, 0x74, 0x6c,
+	0x64, 0x61, 0x74, 0x61, 0x2e, 0x57, 0x6f, 0x72, 0x6b, 0x66, 0x6c, 0x6f, 0x77, 0x52, 0x09, 0x77,
+	0x6f, 0x72, 0x6b, 0x66, 0x6c, 0x6f, 0x77, 0x73, 0x22, 0xfb, 0x01, 0x0a, 0x17, 0x49, 0x6e, 0x69,
+	0x74, 0x53, 0x68, 0x61, 0x72, 0x64, 0x50, 0x72, 0x69, 0x6d, 0x61, 0x72, 0x79, 0x52, 0x65, 0x71,
 	0x75, 0x65, 0x73, 0x74, 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, 0x12, 0x0a, 0x04, 0x75, 0x75, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04,
-	0x75, 0x75, 0x69, 0x64, 0x22, 0xdf, 0x01, 0x0a, 0x1d, 0x4c, 0x61, 0x75, 0x6e, 0x63, 0x68, 0x53,
+	0x12, 0x14, 0x0a, 0x05, 0x73, 0x68, 0x61, 0x72, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52,
+	0x05, 0x73, 0x68, 0x61, 0x72, 0x64, 0x12, 0x52, 0x0a, 0x1a, 0x70, 0x72, 0x69, 0x6d, 0x61, 0x72,
+	0x79, 0x5f, 0x65, 0x6c, 0x65, 0x63, 0x74, 0x5f, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x5f, 0x61,
+	0x6c, 0x69, 0x61, 0x73, 0x18, 0x03, 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, 0x17, 0x70, 0x72, 0x69, 0x6d, 0x61, 0x72, 0x79, 0x45, 0x6c, 0x65, 0x63, 0x74, 0x54,
+	0x61, 0x62, 0x6c, 0x65, 0x74, 0x41, 0x6c, 0x69, 0x61, 0x73, 0x12, 0x14, 0x0a, 0x05, 0x66, 0x6f,
+	0x72, 0x63, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x08, 0x52, 0x05, 0x66, 0x6f, 0x72, 0x63, 0x65,
+	0x12, 0x44, 0x0a, 0x15, 0x77, 0x61, 0x69, 0x74, 0x5f, 0x72, 0x65, 0x70, 0x6c, 0x69, 0x63, 0x61,
+	0x73, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32,
+	0x10, 0x2e, 0x76, 0x74, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x44, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f,
+	0x6e, 0x52, 0x13, 0x77, 0x61, 0x69, 0x74, 0x52, 0x65, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x73, 0x54,
+	0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x22, 0x42, 0x0a, 0x18, 0x49, 0x6e, 0x69, 0x74, 0x53, 0x68,
+	0x61, 0x72, 0x64, 0x50, 0x72, 0x69, 0x6d, 0x61, 0x72, 0x79, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e,
+	0x73, 0x65, 0x12, 0x26, 0x0a, 0x06, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x73, 0x18, 0x01, 0x20, 0x03,
+	0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x6c, 0x6f, 0x67, 0x75, 0x74, 0x69, 0x6c, 0x2e, 0x45, 0x76, 0x65,
+	0x6e, 0x74, 0x52, 0x06, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x73, 0x22, 0x4e, 0x0a, 0x1c, 0x4c, 0x61,
+	0x75, 0x6e, 0x63, 0x68, 0x53, 0x63, 0x68, 0x65, 0x6d, 0x61, 0x4d, 0x69, 0x67, 0x72, 0x61, 0x74,
+	0x69, 0x6f, 0x6e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 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, 0x12, 0x0a, 0x04, 0x75, 0x75, 0x69, 0x64, 0x18, 0x02,
+	0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x75, 0x75, 0x69, 0x64, 0x22, 0xdf, 0x01, 0x0a, 0x1d, 0x4c,
+	0x61, 0x75, 0x6e, 0x63, 0x68, 0x53, 0x63, 0x68, 0x65, 0x6d, 0x61, 0x4d, 0x69, 0x67, 0x72, 0x61,
+	0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x76, 0x0a, 0x16,
+	0x72, 0x6f, 0x77, 0x73, 0x5f, 0x61, 0x66, 0x66, 0x65, 0x63, 0x74, 0x65, 0x64, 0x5f, 0x62, 0x79,
+	0x5f, 0x73, 0x68, 0x61, 0x72, 0x64, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x41, 0x2e, 0x76,
+	0x74, 0x63, 0x74, 0x6c, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x4c, 0x61, 0x75, 0x6e, 0x63, 0x68, 0x53,
 	0x63, 0x68, 0x65, 0x6d, 0x61, 0x4d, 0x69, 0x67, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65,
-	0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x76, 0x0a, 0x16, 0x72, 0x6f, 0x77, 0x73, 0x5f, 0x61,
-	0x66, 0x66, 0x65, 0x63, 0x74, 0x65, 0x64, 0x5f, 0x62, 0x79, 0x5f, 0x73, 0x68, 0x61, 0x72, 0x64,
-	0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x41, 0x2e, 0x76, 0x74, 0x63, 0x74, 0x6c, 0x64, 0x61,
-	0x74, 0x61, 0x2e, 0x4c, 0x61, 0x75, 0x6e, 0x63, 0x68, 0x53, 0x63, 0x68, 0x65, 0x6d, 0x61, 0x4d,
-	0x69, 0x67, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65,
-	0x2e, 0x52, 0x6f, 0x77, 0x73, 0x41, 0x66, 0x66, 0x65, 0x63, 0x74, 0x65, 0x64, 0x42, 0x79, 0x53,
-	0x68, 0x61, 0x72, 0x64, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x13, 0x72, 0x6f, 0x77, 0x73, 0x41,
-	0x66, 0x66, 0x65, 0x63, 0x74, 0x65, 0x64, 0x42, 0x79, 0x53, 0x68, 0x61, 0x72, 0x64, 0x1a, 0x46,
-	0x0a, 0x18, 0x52, 0x6f, 0x77, 0x73, 0x41, 0x66, 0x66, 0x65, 0x63, 0x74, 0x65, 0x64, 0x42, 0x79,
-	0x53, 0x68, 0x61, 0x72, 0x64, 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, 0x04, 0x52, 0x05, 0x76, 0x61, 0x6c,
-	0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x74, 0x0a, 0x1b, 0x4c, 0x6f, 0x6f, 0x6b, 0x75, 0x70,
-	0x56, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x43, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x52, 0x65,
+	0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x2e, 0x52, 0x6f, 0x77, 0x73, 0x41, 0x66, 0x66, 0x65, 0x63,
+	0x74, 0x65, 0x64, 0x42, 0x79, 0x53, 0x68, 0x61, 0x72, 0x64, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52,
+	0x13, 0x72, 0x6f, 0x77, 0x73, 0x41, 0x66, 0x66, 0x65, 0x63, 0x74, 0x65, 0x64, 0x42, 0x79, 0x53,
+	0x68, 0x61, 0x72, 0x64, 0x1a, 0x46, 0x0a, 0x18, 0x52, 0x6f, 0x77, 0x73, 0x41, 0x66, 0x66, 0x65,
+	0x63, 0x74, 0x65, 0x64, 0x42, 0x79, 0x53, 0x68, 0x61, 0x72, 0x64, 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,
+	0x04, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x74, 0x0a, 0x1b,
+	0x4c, 0x6f, 0x6f, 0x6b, 0x75, 0x70, 0x56, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x43, 0x6f, 0x6d, 0x70,
+	0x6c, 0x65, 0x74, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 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, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18,
+	0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x25, 0x0a, 0x0e, 0x74,
+	0x61, 0x62, 0x6c, 0x65, 0x5f, 0x6b, 0x65, 0x79, 0x73, 0x70, 0x61, 0x63, 0x65, 0x18, 0x03, 0x20,
+	0x01, 0x28, 0x09, 0x52, 0x0d, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x4b, 0x65, 0x79, 0x73, 0x70, 0x61,
+	0x63, 0x65, 0x22, 0x1e, 0x0a, 0x1c, 0x4c, 0x6f, 0x6f, 0x6b, 0x75, 0x70, 0x56, 0x69, 0x6e, 0x64,
+	0x65, 0x78, 0x43, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e,
+	0x73, 0x65, 0x22, 0xff, 0x02, 0x0a, 0x19, 0x4c, 0x6f, 0x6f, 0x6b, 0x75, 0x70, 0x56, 0x69, 0x6e,
+	0x64, 0x65, 0x78, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74,
+	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, 0x1a, 0x0a, 0x08,
+	0x77, 0x6f, 0x72, 0x6b, 0x66, 0x6c, 0x6f, 0x77, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08,
+	0x77, 0x6f, 0x72, 0x6b, 0x66, 0x6c, 0x6f, 0x77, 0x12, 0x14, 0x0a, 0x05, 0x63, 0x65, 0x6c, 0x6c,
+	0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x09, 0x52, 0x05, 0x63, 0x65, 0x6c, 0x6c, 0x73, 0x12, 0x29,
+	0x0a, 0x06, 0x76, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x11,
+	0x2e, 0x76, 0x73, 0x63, 0x68, 0x65, 0x6d, 0x61, 0x2e, 0x4b, 0x65, 0x79, 0x73, 0x70, 0x61, 0x63,
+	0x65, 0x52, 0x06, 0x76, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x12, 0x42, 0x0a, 0x1e, 0x63, 0x6f, 0x6e,
+	0x74, 0x69, 0x6e, 0x75, 0x65, 0x5f, 0x61, 0x66, 0x74, 0x65, 0x72, 0x5f, 0x63, 0x6f, 0x70, 0x79,
+	0x5f, 0x77, 0x69, 0x74, 0x68, 0x5f, 0x6f, 0x77, 0x6e, 0x65, 0x72, 0x18, 0x05, 0x20, 0x01, 0x28,
+	0x08, 0x52, 0x1a, 0x63, 0x6f, 0x6e, 0x74, 0x69, 0x6e, 0x75, 0x65, 0x41, 0x66, 0x74, 0x65, 0x72,
+	0x43, 0x6f, 0x70, 0x79, 0x57, 0x69, 0x74, 0x68, 0x4f, 0x77, 0x6e, 0x65, 0x72, 0x12, 0x37, 0x0a,
+	0x0c, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x73, 0x18, 0x06, 0x20,
+	0x03, 0x28, 0x0e, 0x32, 0x14, 0x2e, 0x74, 0x6f, 0x70, 0x6f, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x54,
+	0x61, 0x62, 0x6c, 0x65, 0x74, 0x54, 0x79, 0x70, 0x65, 0x52, 0x0b, 0x74, 0x61, 0x62, 0x6c, 0x65,
+	0x74, 0x54, 0x79, 0x70, 0x65, 0x73, 0x12, 0x6c, 0x0a, 0x1b, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x74,
+	0x5f, 0x73, 0x65, 0x6c, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x70, 0x72, 0x65, 0x66, 0x65,
+	0x72, 0x65, 0x6e, 0x63, 0x65, 0x18, 0x07, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x2c, 0x2e, 0x74, 0x61,
+	0x62, 0x6c, 0x65, 0x74, 0x6d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x72, 0x64, 0x61, 0x74, 0x61, 0x2e,
+	0x54, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x53, 0x65, 0x6c, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x50,
+	0x72, 0x65, 0x66, 0x65, 0x72, 0x65, 0x6e, 0x63, 0x65, 0x52, 0x19, 0x74, 0x61, 0x62, 0x6c, 0x65,
+	0x74, 0x53, 0x65, 0x6c, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x50, 0x72, 0x65, 0x66, 0x65, 0x72,
+	0x65, 0x6e, 0x63, 0x65, 0x22, 0x1c, 0x0a, 0x1a, 0x4c, 0x6f, 0x6f, 0x6b, 0x75, 0x70, 0x56, 0x69,
+	0x6e, 0x64, 0x65, 0x78, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e,
+	0x73, 0x65, 0x22, 0xa0, 0x01, 0x0a, 0x1e, 0x4c, 0x6f, 0x6f, 0x6b, 0x75, 0x70, 0x56, 0x69, 0x6e,
+	0x64, 0x65, 0x78, 0x45, 0x78, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x69, 0x7a, 0x65, 0x52, 0x65,
 	0x71, 0x75, 0x65, 0x73, 0x74, 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, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52,
 	0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x25, 0x0a, 0x0e, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x5f, 0x6b,
 	0x65, 0x79, 0x73, 0x70, 0x61, 0x63, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x74,
-	0x61, 0x62, 0x6c, 0x65, 0x4b, 0x65, 0x79, 0x73, 0x70, 0x61, 0x63, 0x65, 0x22, 0x1e, 0x0a, 0x1c,
-	0x4c, 0x6f, 0x6f, 0x6b, 0x75, 0x70, 0x56, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x43, 0x6f, 0x6d, 0x70,
-	0x6c, 0x65, 0x74, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0xff, 0x02, 0x0a,
-	0x19, 0x4c, 0x6f, 0x6f, 0x6b, 0x75, 0x70, 0x56, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x43, 0x72, 0x65,
-	0x61, 0x74, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 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, 0x1a, 0x0a, 0x08, 0x77, 0x6f, 0x72, 0x6b, 0x66, 0x6c,
-	0x6f, 0x77, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x77, 0x6f, 0x72, 0x6b, 0x66, 0x6c,
-	0x6f, 0x77, 0x12, 0x14, 0x0a, 0x05, 0x63, 0x65, 0x6c, 0x6c, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28,
-	0x09, 0x52, 0x05, 0x63, 0x65, 0x6c, 0x6c, 0x73, 0x12, 0x29, 0x0a, 0x06, 0x76, 0x69, 0x6e, 0x64,
-	0x65, 0x78, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x11, 0x2e, 0x76, 0x73, 0x63, 0x68, 0x65,
-	0x6d, 0x61, 0x2e, 0x4b, 0x65, 0x79, 0x73, 0x70, 0x61, 0x63, 0x65, 0x52, 0x06, 0x76, 0x69, 0x6e,
-	0x64, 0x65, 0x78, 0x12, 0x42, 0x0a, 0x1e, 0x63, 0x6f, 0x6e, 0x74, 0x69, 0x6e, 0x75, 0x65, 0x5f,
-	0x61, 0x66, 0x74, 0x65, 0x72, 0x5f, 0x63, 0x6f, 0x70, 0x79, 0x5f, 0x77, 0x69, 0x74, 0x68, 0x5f,
-	0x6f, 0x77, 0x6e, 0x65, 0x72, 0x18, 0x05, 0x20, 0x01, 0x28, 0x08, 0x52, 0x1a, 0x63, 0x6f, 0x6e,
-	0x74, 0x69, 0x6e, 0x75, 0x65, 0x41, 0x66, 0x74, 0x65, 0x72, 0x43, 0x6f, 0x70, 0x79, 0x57, 0x69,
-	0x74, 0x68, 0x4f, 0x77, 0x6e, 0x65, 0x72, 0x12, 0x37, 0x0a, 0x0c, 0x74, 0x61, 0x62, 0x6c, 0x65,
-	0x74, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x73, 0x18, 0x06, 0x20, 0x03, 0x28, 0x0e, 0x32, 0x14, 0x2e,
-	0x74, 0x6f, 0x70, 0x6f, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x54,
-	0x79, 0x70, 0x65, 0x52, 0x0b, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x54, 0x79, 0x70, 0x65, 0x73,
-	0x12, 0x6c, 0x0a, 0x1b, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x5f, 0x73, 0x65, 0x6c, 0x65, 0x63,
-	0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x70, 0x72, 0x65, 0x66, 0x65, 0x72, 0x65, 0x6e, 0x63, 0x65, 0x18,
-	0x07, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x2c, 0x2e, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x6d, 0x61,
-	0x6e, 0x61, 0x67, 0x65, 0x72, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x74,
-	0x53, 0x65, 0x6c, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x50, 0x72, 0x65, 0x66, 0x65, 0x72, 0x65,
-	0x6e, 0x63, 0x65, 0x52, 0x19, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x53, 0x65, 0x6c, 0x65, 0x63,
-	0x74, 0x69, 0x6f, 0x6e, 0x50, 0x72, 0x65, 0x66, 0x65, 0x72, 0x65, 0x6e, 0x63, 0x65, 0x22, 0x1c,
-	0x0a, 0x1a, 0x4c, 0x6f, 0x6f, 0x6b, 0x75, 0x70, 0x56, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x43, 0x72,
-	0x65, 0x61, 0x74, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0xa0, 0x01, 0x0a,
-	0x1e, 0x4c, 0x6f, 0x6f, 0x6b, 0x75, 0x70, 0x56, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x45, 0x78, 0x74,
-	0x65, 0x72, 0x6e, 0x61, 0x6c, 0x69, 0x7a, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 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, 0x12, 0x0a, 0x04, 0x6e,
-	0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12,
-	0x25, 0x0a, 0x0e, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x5f, 0x6b, 0x65, 0x79, 0x73, 0x70, 0x61, 0x63,
-	0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x4b, 0x65,
-	0x79, 0x73, 0x70, 0x61, 0x63, 0x65, 0x12, 0x27, 0x0a, 0x0f, 0x64, 0x65, 0x6c, 0x65, 0x74, 0x65,
-	0x5f, 0x77, 0x6f, 0x72, 0x6b, 0x66, 0x6c, 0x6f, 0x77, 0x18, 0x04, 0x20, 0x01, 0x28, 0x08, 0x52,
-	0x0e, 0x64, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x57, 0x6f, 0x72, 0x6b, 0x66, 0x6c, 0x6f, 0x77, 0x22,
-	0x77, 0x0a, 0x1f, 0x4c, 0x6f, 0x6f, 0x6b, 0x75, 0x70, 0x56, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x45,
-	0x78, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x69, 0x7a, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e,
-	0x73, 0x65, 0x12, 0x29, 0x0a, 0x10, 0x77, 0x6f, 0x72, 0x6b, 0x66, 0x6c, 0x6f, 0x77, 0x5f, 0x73,
-	0x74, 0x6f, 0x70, 0x70, 0x65, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0f, 0x77, 0x6f,
-	0x72, 0x6b, 0x66, 0x6c, 0x6f, 0x77, 0x53, 0x74, 0x6f, 0x70, 0x70, 0x65, 0x64, 0x12, 0x29, 0x0a,
-	0x10, 0x77, 0x6f, 0x72, 0x6b, 0x66, 0x6c, 0x6f, 0x77, 0x5f, 0x64, 0x65, 0x6c, 0x65, 0x74, 0x65,
-	0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0f, 0x77, 0x6f, 0x72, 0x6b, 0x66, 0x6c, 0x6f,
-	0x77, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x64, 0x22, 0x77, 0x0a, 0x1e, 0x4c, 0x6f, 0x6f, 0x6b,
-	0x75, 0x70, 0x56, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x49, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c,
-	0x69, 0x7a, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 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, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02,
-	0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x25, 0x0a, 0x0e, 0x74, 0x61,
-	0x62, 0x6c, 0x65, 0x5f, 0x6b, 0x65, 0x79, 0x73, 0x70, 0x61, 0x63, 0x65, 0x18, 0x03, 0x20, 0x01,
-	0x28, 0x09, 0x52, 0x0d, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x4b, 0x65, 0x79, 0x73, 0x70, 0x61, 0x63,
-	0x65, 0x22, 0x21, 0x0a, 0x1f, 0x4c, 0x6f, 0x6f, 0x6b, 0x75, 0x70, 0x56, 0x69, 0x6e, 0x64, 0x65,
-	0x78, 0x49, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x69, 0x7a, 0x65, 0x52, 0x65, 0x73, 0x70,
-	0x6f, 0x6e, 0x73, 0x65, 0x22, 0x56, 0x0a, 0x18, 0x4d, 0x61, 0x74, 0x65, 0x72, 0x69, 0x61, 0x6c,
-	0x69, 0x7a, 0x65, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74,
-	0x12, 0x3a, 0x0a, 0x08, 0x73, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x73, 0x18, 0x01, 0x20, 0x01,
-	0x28, 0x0b, 0x32, 0x1e, 0x2e, 0x76, 0x74, 0x63, 0x74, 0x6c, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x4d,
-	0x61, 0x74, 0x65, 0x72, 0x69, 0x61, 0x6c, 0x69, 0x7a, 0x65, 0x53, 0x65, 0x74, 0x74, 0x69, 0x6e,
-	0x67, 0x73, 0x52, 0x08, 0x73, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x73, 0x22, 0x1b, 0x0a, 0x19,
-	0x4d, 0x61, 0x74, 0x65, 0x72, 0x69, 0x61, 0x6c, 0x69, 0x7a, 0x65, 0x43, 0x72, 0x65, 0x61, 0x74,
-	0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0xdd, 0x05, 0x0a, 0x14, 0x4d, 0x69,
-	0x67, 0x72, 0x61, 0x74, 0x65, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65,
-	0x73, 0x74, 0x12, 0x1a, 0x0a, 0x08, 0x77, 0x6f, 0x72, 0x6b, 0x66, 0x6c, 0x6f, 0x77, 0x18, 0x01,
-	0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x77, 0x6f, 0x72, 0x6b, 0x66, 0x6c, 0x6f, 0x77, 0x12, 0x27,
-	0x0a, 0x0f, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x5f, 0x6b, 0x65, 0x79, 0x73, 0x70, 0x61, 0x63,
-	0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0e, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x4b,
-	0x65, 0x79, 0x73, 0x70, 0x61, 0x63, 0x65, 0x12, 0x27, 0x0a, 0x0f, 0x74, 0x61, 0x72, 0x67, 0x65,
-	0x74, 0x5f, 0x6b, 0x65, 0x79, 0x73, 0x70, 0x61, 0x63, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09,
-	0x52, 0x0e, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x4b, 0x65, 0x79, 0x73, 0x70, 0x61, 0x63, 0x65,
-	0x12, 0x1d, 0x0a, 0x0a, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x04,
-	0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x4e, 0x61, 0x6d, 0x65, 0x12,
-	0x14, 0x0a, 0x05, 0x63, 0x65, 0x6c, 0x6c, 0x73, 0x18, 0x05, 0x20, 0x03, 0x28, 0x09, 0x52, 0x05,
-	0x63, 0x65, 0x6c, 0x6c, 0x73, 0x12, 0x37, 0x0a, 0x0c, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x5f,
-	0x74, 0x79, 0x70, 0x65, 0x73, 0x18, 0x06, 0x20, 0x03, 0x28, 0x0e, 0x32, 0x14, 0x2e, 0x74, 0x6f,
-	0x70, 0x6f, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x54, 0x79, 0x70,
-	0x65, 0x52, 0x0b, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x54, 0x79, 0x70, 0x65, 0x73, 0x12, 0x6c,
-	0x0a, 0x1b, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x5f, 0x73, 0x65, 0x6c, 0x65, 0x63, 0x74, 0x69,
-	0x6f, 0x6e, 0x5f, 0x70, 0x72, 0x65, 0x66, 0x65, 0x72, 0x65, 0x6e, 0x63, 0x65, 0x18, 0x07, 0x20,
-	0x01, 0x28, 0x0e, 0x32, 0x2c, 0x2e, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x6d, 0x61, 0x6e, 0x61,
-	0x67, 0x65, 0x72, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x53, 0x65,
-	0x6c, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x50, 0x72, 0x65, 0x66, 0x65, 0x72, 0x65, 0x6e, 0x63,
-	0x65, 0x52, 0x19, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x53, 0x65, 0x6c, 0x65, 0x63, 0x74, 0x69,
-	0x6f, 0x6e, 0x50, 0x72, 0x65, 0x66, 0x65, 0x72, 0x65, 0x6e, 0x63, 0x65, 0x12, 0x1d, 0x0a, 0x0a,
-	0x61, 0x6c, 0x6c, 0x5f, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x73, 0x18, 0x08, 0x20, 0x01, 0x28, 0x08,
-	0x52, 0x09, 0x61, 0x6c, 0x6c, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x73, 0x12, 0x25, 0x0a, 0x0e, 0x69,
-	0x6e, 0x63, 0x6c, 0x75, 0x64, 0x65, 0x5f, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x73, 0x18, 0x09, 0x20,
-	0x03, 0x28, 0x09, 0x52, 0x0d, 0x69, 0x6e, 0x63, 0x6c, 0x75, 0x64, 0x65, 0x54, 0x61, 0x62, 0x6c,
-	0x65, 0x73, 0x12, 0x25, 0x0a, 0x0e, 0x65, 0x78, 0x63, 0x6c, 0x75, 0x64, 0x65, 0x5f, 0x74, 0x61,
-	0x62, 0x6c, 0x65, 0x73, 0x18, 0x0a, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0d, 0x65, 0x78, 0x63, 0x6c,
-	0x75, 0x64, 0x65, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x73, 0x12, 0x28, 0x0a, 0x10, 0x73, 0x6f, 0x75,
-	0x72, 0x63, 0x65, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x5f, 0x7a, 0x6f, 0x6e, 0x65, 0x18, 0x0b, 0x20,
-	0x01, 0x28, 0x09, 0x52, 0x0e, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x5a,
-	0x6f, 0x6e, 0x65, 0x12, 0x15, 0x0a, 0x06, 0x6f, 0x6e, 0x5f, 0x64, 0x64, 0x6c, 0x18, 0x0c, 0x20,
-	0x01, 0x28, 0x09, 0x52, 0x05, 0x6f, 0x6e, 0x44, 0x64, 0x6c, 0x12, 0x26, 0x0a, 0x0f, 0x73, 0x74,
-	0x6f, 0x70, 0x5f, 0x61, 0x66, 0x74, 0x65, 0x72, 0x5f, 0x63, 0x6f, 0x70, 0x79, 0x18, 0x0d, 0x20,
-	0x01, 0x28, 0x08, 0x52, 0x0d, 0x73, 0x74, 0x6f, 0x70, 0x41, 0x66, 0x74, 0x65, 0x72, 0x43, 0x6f,
-	0x70, 0x79, 0x12, 0x2a, 0x0a, 0x11, 0x64, 0x72, 0x6f, 0x70, 0x5f, 0x66, 0x6f, 0x72, 0x65, 0x69,
-	0x67, 0x6e, 0x5f, 0x6b, 0x65, 0x79, 0x73, 0x18, 0x0e, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0f, 0x64,
-	0x72, 0x6f, 0x70, 0x46, 0x6f, 0x72, 0x65, 0x69, 0x67, 0x6e, 0x4b, 0x65, 0x79, 0x73, 0x12, 0x30,
-	0x0a, 0x14, 0x64, 0x65, 0x66, 0x65, 0x72, 0x5f, 0x73, 0x65, 0x63, 0x6f, 0x6e, 0x64, 0x61, 0x72,
-	0x79, 0x5f, 0x6b, 0x65, 0x79, 0x73, 0x18, 0x0f, 0x20, 0x01, 0x28, 0x08, 0x52, 0x12, 0x64, 0x65,
-	0x66, 0x65, 0x72, 0x53, 0x65, 0x63, 0x6f, 0x6e, 0x64, 0x61, 0x72, 0x79, 0x4b, 0x65, 0x79, 0x73,
-	0x12, 0x1d, 0x0a, 0x0a, 0x61, 0x75, 0x74, 0x6f, 0x5f, 0x73, 0x74, 0x61, 0x72, 0x74, 0x18, 0x10,
-	0x20, 0x01, 0x28, 0x08, 0x52, 0x09, 0x61, 0x75, 0x74, 0x6f, 0x53, 0x74, 0x61, 0x72, 0x74, 0x12,
-	0x28, 0x0a, 0x10, 0x6e, 0x6f, 0x5f, 0x72, 0x6f, 0x75, 0x74, 0x69, 0x6e, 0x67, 0x5f, 0x72, 0x75,
-	0x6c, 0x65, 0x73, 0x18, 0x11, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0e, 0x6e, 0x6f, 0x52, 0x6f, 0x75,
-	0x74, 0x69, 0x6e, 0x67, 0x52, 0x75, 0x6c, 0x65, 0x73, 0x22, 0xe6, 0x01, 0x0a, 0x16, 0x4d, 0x69,
-	0x67, 0x72, 0x61, 0x74, 0x65, 0x43, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x52, 0x65, 0x71,
-	0x75, 0x65, 0x73, 0x74, 0x12, 0x1a, 0x0a, 0x08, 0x77, 0x6f, 0x72, 0x6b, 0x66, 0x6c, 0x6f, 0x77,
-	0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x77, 0x6f, 0x72, 0x6b, 0x66, 0x6c, 0x6f, 0x77,
-	0x12, 0x27, 0x0a, 0x0f, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x5f, 0x6b, 0x65, 0x79, 0x73, 0x70,
-	0x61, 0x63, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0e, 0x74, 0x61, 0x72, 0x67, 0x65,
-	0x74, 0x4b, 0x65, 0x79, 0x73, 0x70, 0x61, 0x63, 0x65, 0x12, 0x1b, 0x0a, 0x09, 0x6b, 0x65, 0x65,
-	0x70, 0x5f, 0x64, 0x61, 0x74, 0x61, 0x18, 0x04, 0x20, 0x01, 0x28, 0x08, 0x52, 0x08, 0x6b, 0x65,
-	0x65, 0x70, 0x44, 0x61, 0x74, 0x61, 0x12, 0x2c, 0x0a, 0x12, 0x6b, 0x65, 0x65, 0x70, 0x5f, 0x72,
-	0x6f, 0x75, 0x74, 0x69, 0x6e, 0x67, 0x5f, 0x72, 0x75, 0x6c, 0x65, 0x73, 0x18, 0x05, 0x20, 0x01,
-	0x28, 0x08, 0x52, 0x10, 0x6b, 0x65, 0x65, 0x70, 0x52, 0x6f, 0x75, 0x74, 0x69, 0x6e, 0x67, 0x52,
-	0x75, 0x6c, 0x65, 0x73, 0x12, 0x23, 0x0a, 0x0d, 0x72, 0x65, 0x6e, 0x61, 0x6d, 0x65, 0x5f, 0x74,
-	0x61, 0x62, 0x6c, 0x65, 0x73, 0x18, 0x06, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0c, 0x72, 0x65, 0x6e,
-	0x61, 0x6d, 0x65, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x73, 0x12, 0x17, 0x0a, 0x07, 0x64, 0x72, 0x79,
-	0x5f, 0x72, 0x75, 0x6e, 0x18, 0x07, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x64, 0x72, 0x79, 0x52,
-	0x75, 0x6e, 0x22, 0x5b, 0x0a, 0x17, 0x4d, 0x69, 0x67, 0x72, 0x61, 0x74, 0x65, 0x43, 0x6f, 0x6d,
-	0x70, 0x6c, 0x65, 0x74, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x18, 0x0a,
-	0x07, 0x73, 0x75, 0x6d, 0x6d, 0x61, 0x72, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07,
-	0x73, 0x75, 0x6d, 0x6d, 0x61, 0x72, 0x79, 0x12, 0x26, 0x0a, 0x0f, 0x64, 0x72, 0x79, 0x5f, 0x72,
-	0x75, 0x6e, 0x5f, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x09,
-	0x52, 0x0d, 0x64, 0x72, 0x79, 0x52, 0x75, 0x6e, 0x52, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x73, 0x22,
-	0x85, 0x01, 0x0a, 0x14, 0x4d, 0x6f, 0x75, 0x6e, 0x74, 0x52, 0x65, 0x67, 0x69, 0x73, 0x74, 0x65,
-	0x72, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x1b, 0x0a, 0x09, 0x74, 0x6f, 0x70, 0x6f,
-	0x5f, 0x74, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x74, 0x6f, 0x70,
-	0x6f, 0x54, 0x79, 0x70, 0x65, 0x12, 0x1f, 0x0a, 0x0b, 0x74, 0x6f, 0x70, 0x6f, 0x5f, 0x73, 0x65,
-	0x72, 0x76, 0x65, 0x72, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x74, 0x6f, 0x70, 0x6f,
-	0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x12, 0x1b, 0x0a, 0x09, 0x74, 0x6f, 0x70, 0x6f, 0x5f, 0x72,
-	0x6f, 0x6f, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x74, 0x6f, 0x70, 0x6f, 0x52,
-	0x6f, 0x6f, 0x74, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28,
-	0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x22, 0x17, 0x0a, 0x15, 0x4d, 0x6f, 0x75, 0x6e, 0x74,
-	0x52, 0x65, 0x67, 0x69, 0x73, 0x74, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65,
-	0x22, 0x2c, 0x0a, 0x16, 0x4d, 0x6f, 0x75, 0x6e, 0x74, 0x55, 0x6e, 0x72, 0x65, 0x67, 0x69, 0x73,
-	0x74, 0x65, 0x72, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61,
-	0x6d, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x22, 0x19,
-	0x0a, 0x17, 0x4d, 0x6f, 0x75, 0x6e, 0x74, 0x55, 0x6e, 0x72, 0x65, 0x67, 0x69, 0x73, 0x74, 0x65,
-	0x72, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x26, 0x0a, 0x10, 0x4d, 0x6f, 0x75,
-	0x6e, 0x74, 0x53, 0x68, 0x6f, 0x77, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x12, 0x0a,
-	0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d,
-	0x65, 0x22, 0x82, 0x01, 0x0a, 0x11, 0x4d, 0x6f, 0x75, 0x6e, 0x74, 0x53, 0x68, 0x6f, 0x77, 0x52,
-	0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x1b, 0x0a, 0x09, 0x74, 0x6f, 0x70, 0x6f, 0x5f,
-	0x74, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x74, 0x6f, 0x70, 0x6f,
-	0x54, 0x79, 0x70, 0x65, 0x12, 0x1f, 0x0a, 0x0b, 0x74, 0x6f, 0x70, 0x6f, 0x5f, 0x73, 0x65, 0x72,
-	0x76, 0x65, 0x72, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x74, 0x6f, 0x70, 0x6f, 0x53,
-	0x65, 0x72, 0x76, 0x65, 0x72, 0x12, 0x1b, 0x0a, 0x09, 0x74, 0x6f, 0x70, 0x6f, 0x5f, 0x72, 0x6f,
-	0x6f, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x74, 0x6f, 0x70, 0x6f, 0x52, 0x6f,
-	0x6f, 0x74, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09,
-	0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x22, 0x12, 0x0a, 0x10, 0x4d, 0x6f, 0x75, 0x6e, 0x74, 0x4c,
-	0x69, 0x73, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x22, 0x29, 0x0a, 0x11, 0x4d, 0x6f,
-	0x75, 0x6e, 0x74, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12,
-	0x14, 0x0a, 0x05, 0x6e, 0x61, 0x6d, 0x65, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x09, 0x52, 0x05,
-	0x6e, 0x61, 0x6d, 0x65, 0x73, 0x22, 0x82, 0x07, 0x0a, 0x17, 0x4d, 0x6f, 0x76, 0x65, 0x54, 0x61,
-	0x62, 0x6c, 0x65, 0x73, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73,
-	0x74, 0x12, 0x1a, 0x0a, 0x08, 0x77, 0x6f, 0x72, 0x6b, 0x66, 0x6c, 0x6f, 0x77, 0x18, 0x01, 0x20,
-	0x01, 0x28, 0x09, 0x52, 0x08, 0x77, 0x6f, 0x72, 0x6b, 0x66, 0x6c, 0x6f, 0x77, 0x12, 0x27, 0x0a,
-	0x0f, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x5f, 0x6b, 0x65, 0x79, 0x73, 0x70, 0x61, 0x63, 0x65,
-	0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0e, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x4b, 0x65,
-	0x79, 0x73, 0x70, 0x61, 0x63, 0x65, 0x12, 0x27, 0x0a, 0x0f, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74,
-	0x5f, 0x6b, 0x65, 0x79, 0x73, 0x70, 0x61, 0x63, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52,
-	0x0e, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x4b, 0x65, 0x79, 0x73, 0x70, 0x61, 0x63, 0x65, 0x12,
-	0x14, 0x0a, 0x05, 0x63, 0x65, 0x6c, 0x6c, 0x73, 0x18, 0x04, 0x20, 0x03, 0x28, 0x09, 0x52, 0x05,
-	0x63, 0x65, 0x6c, 0x6c, 0x73, 0x12, 0x37, 0x0a, 0x0c, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x5f,
-	0x74, 0x79, 0x70, 0x65, 0x73, 0x18, 0x05, 0x20, 0x03, 0x28, 0x0e, 0x32, 0x14, 0x2e, 0x74, 0x6f,
-	0x70, 0x6f, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x54, 0x79, 0x70,
-	0x65, 0x52, 0x0b, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x54, 0x79, 0x70, 0x65, 0x73, 0x12, 0x6c,
-	0x0a, 0x1b, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x5f, 0x73, 0x65, 0x6c, 0x65, 0x63, 0x74, 0x69,
-	0x6f, 0x6e, 0x5f, 0x70, 0x72, 0x65, 0x66, 0x65, 0x72, 0x65, 0x6e, 0x63, 0x65, 0x18, 0x06, 0x20,
-	0x01, 0x28, 0x0e, 0x32, 0x2c, 0x2e, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x6d, 0x61, 0x6e, 0x61,
-	0x67, 0x65, 0x72, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x53, 0x65,
-	0x6c, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x50, 0x72, 0x65, 0x66, 0x65, 0x72, 0x65, 0x6e, 0x63,
-	0x65, 0x52, 0x19, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x53, 0x65, 0x6c, 0x65, 0x63, 0x74, 0x69,
-	0x6f, 0x6e, 0x50, 0x72, 0x65, 0x66, 0x65, 0x72, 0x65, 0x6e, 0x63, 0x65, 0x12, 0x23, 0x0a, 0x0d,
-	0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x5f, 0x73, 0x68, 0x61, 0x72, 0x64, 0x73, 0x18, 0x07, 0x20,
-	0x03, 0x28, 0x09, 0x52, 0x0c, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x53, 0x68, 0x61, 0x72, 0x64,
-	0x73, 0x12, 0x1d, 0x0a, 0x0a, 0x61, 0x6c, 0x6c, 0x5f, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x73, 0x18,
-	0x08, 0x20, 0x01, 0x28, 0x08, 0x52, 0x09, 0x61, 0x6c, 0x6c, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x73,
-	0x12, 0x25, 0x0a, 0x0e, 0x69, 0x6e, 0x63, 0x6c, 0x75, 0x64, 0x65, 0x5f, 0x74, 0x61, 0x62, 0x6c,
-	0x65, 0x73, 0x18, 0x09, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0d, 0x69, 0x6e, 0x63, 0x6c, 0x75, 0x64,
-	0x65, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x73, 0x12, 0x25, 0x0a, 0x0e, 0x65, 0x78, 0x63, 0x6c, 0x75,
-	0x64, 0x65, 0x5f, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x73, 0x18, 0x0a, 0x20, 0x03, 0x28, 0x09, 0x52,
-	0x0d, 0x65, 0x78, 0x63, 0x6c, 0x75, 0x64, 0x65, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x73, 0x12, 0x32,
-	0x0a, 0x15, 0x65, 0x78, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x5f, 0x63, 0x6c, 0x75, 0x73, 0x74,
-	0x65, 0x72, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x09, 0x52, 0x13, 0x65,
-	0x78, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x4e, 0x61,
-	0x6d, 0x65, 0x12, 0x28, 0x0a, 0x10, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x5f, 0x74, 0x69, 0x6d,
-	0x65, 0x5f, 0x7a, 0x6f, 0x6e, 0x65, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0e, 0x73, 0x6f,
-	0x75, 0x72, 0x63, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x5a, 0x6f, 0x6e, 0x65, 0x12, 0x15, 0x0a, 0x06,
-	0x6f, 0x6e, 0x5f, 0x64, 0x64, 0x6c, 0x18, 0x0d, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x6f, 0x6e,
-	0x44, 0x64, 0x6c, 0x12, 0x26, 0x0a, 0x0f, 0x73, 0x74, 0x6f, 0x70, 0x5f, 0x61, 0x66, 0x74, 0x65,
-	0x72, 0x5f, 0x63, 0x6f, 0x70, 0x79, 0x18, 0x0e, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0d, 0x73, 0x74,
-	0x6f, 0x70, 0x41, 0x66, 0x74, 0x65, 0x72, 0x43, 0x6f, 0x70, 0x79, 0x12, 0x2a, 0x0a, 0x11, 0x64,
-	0x72, 0x6f, 0x70, 0x5f, 0x66, 0x6f, 0x72, 0x65, 0x69, 0x67, 0x6e, 0x5f, 0x6b, 0x65, 0x79, 0x73,
-	0x18, 0x0f, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0f, 0x64, 0x72, 0x6f, 0x70, 0x46, 0x6f, 0x72, 0x65,
-	0x69, 0x67, 0x6e, 0x4b, 0x65, 0x79, 0x73, 0x12, 0x30, 0x0a, 0x14, 0x64, 0x65, 0x66, 0x65, 0x72,
-	0x5f, 0x73, 0x65, 0x63, 0x6f, 0x6e, 0x64, 0x61, 0x72, 0x79, 0x5f, 0x6b, 0x65, 0x79, 0x73, 0x18,
-	0x10, 0x20, 0x01, 0x28, 0x08, 0x52, 0x12, 0x64, 0x65, 0x66, 0x65, 0x72, 0x53, 0x65, 0x63, 0x6f,
-	0x6e, 0x64, 0x61, 0x72, 0x79, 0x4b, 0x65, 0x79, 0x73, 0x12, 0x1d, 0x0a, 0x0a, 0x61, 0x75, 0x74,
-	0x6f, 0x5f, 0x73, 0x74, 0x61, 0x72, 0x74, 0x18, 0x11, 0x20, 0x01, 0x28, 0x08, 0x52, 0x09, 0x61,
-	0x75, 0x74, 0x6f, 0x53, 0x74, 0x61, 0x72, 0x74, 0x12, 0x28, 0x0a, 0x10, 0x6e, 0x6f, 0x5f, 0x72,
-	0x6f, 0x75, 0x74, 0x69, 0x6e, 0x67, 0x5f, 0x72, 0x75, 0x6c, 0x65, 0x73, 0x18, 0x12, 0x20, 0x01,
-	0x28, 0x08, 0x52, 0x0e, 0x6e, 0x6f, 0x52, 0x6f, 0x75, 0x74, 0x69, 0x6e, 0x67, 0x52, 0x75, 0x6c,
-	0x65, 0x73, 0x12, 0x1f, 0x0a, 0x0b, 0x61, 0x74, 0x6f, 0x6d, 0x69, 0x63, 0x5f, 0x63, 0x6f, 0x70,
-	0x79, 0x18, 0x13, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0a, 0x61, 0x74, 0x6f, 0x6d, 0x69, 0x63, 0x43,
-	0x6f, 0x70, 0x79, 0x12, 0x45, 0x0a, 0x10, 0x77, 0x6f, 0x72, 0x6b, 0x66, 0x6c, 0x6f, 0x77, 0x5f,
-	0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x14, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e,
-	0x76, 0x74, 0x63, 0x74, 0x6c, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x57, 0x6f, 0x72, 0x6b, 0x66, 0x6c,
-	0x6f, 0x77, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x52, 0x0f, 0x77, 0x6f, 0x72, 0x6b, 0x66,
-	0x6c, 0x6f, 0x77, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x22, 0xd5, 0x01, 0x0a, 0x18, 0x4d,
-	0x6f, 0x76, 0x65, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x73, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x52,
-	0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x73, 0x75, 0x6d, 0x6d, 0x61,
-	0x72, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x73, 0x75, 0x6d, 0x6d, 0x61, 0x72,
-	0x79, 0x12, 0x48, 0x0a, 0x07, 0x64, 0x65, 0x74, 0x61, 0x69, 0x6c, 0x73, 0x18, 0x02, 0x20, 0x03,
-	0x28, 0x0b, 0x32, 0x2e, 0x2e, 0x76, 0x74, 0x63, 0x74, 0x6c, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x4d,
-	0x6f, 0x76, 0x65, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x73, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x52,
-	0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x2e, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x49, 0x6e,
-	0x66, 0x6f, 0x52, 0x07, 0x64, 0x65, 0x74, 0x61, 0x69, 0x6c, 0x73, 0x1a, 0x55, 0x0a, 0x0a, 0x54,
-	0x61, 0x62, 0x6c, 0x65, 0x74, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x2d, 0x0a, 0x06, 0x74, 0x61, 0x62,
-	0x6c, 0x65, 0x74, 0x18, 0x01, 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, 0x06, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x12, 0x18, 0x0a, 0x07, 0x63, 0x72, 0x65, 0x61,
-	0x74, 0x65, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x07, 0x63, 0x72, 0x65, 0x61, 0x74,
-	0x65, 0x64, 0x22, 0x81, 0x02, 0x0a, 0x19, 0x4d, 0x6f, 0x76, 0x65, 0x54, 0x61, 0x62, 0x6c, 0x65,
-	0x73, 0x43, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74,
-	0x12, 0x1a, 0x0a, 0x08, 0x77, 0x6f, 0x72, 0x6b, 0x66, 0x6c, 0x6f, 0x77, 0x18, 0x01, 0x20, 0x01,
-	0x28, 0x09, 0x52, 0x08, 0x77, 0x6f, 0x72, 0x6b, 0x66, 0x6c, 0x6f, 0x77, 0x12, 0x27, 0x0a, 0x0f,
-	0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x5f, 0x6b, 0x65, 0x79, 0x73, 0x70, 0x61, 0x63, 0x65, 0x18,
-	0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0e, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x4b, 0x65, 0x79,
-	0x73, 0x70, 0x61, 0x63, 0x65, 0x12, 0x1b, 0x0a, 0x09, 0x6b, 0x65, 0x65, 0x70, 0x5f, 0x64, 0x61,
-	0x74, 0x61, 0x18, 0x04, 0x20, 0x01, 0x28, 0x08, 0x52, 0x08, 0x6b, 0x65, 0x65, 0x70, 0x44, 0x61,
-	0x74, 0x61, 0x12, 0x2c, 0x0a, 0x12, 0x6b, 0x65, 0x65, 0x70, 0x5f, 0x72, 0x6f, 0x75, 0x74, 0x69,
-	0x6e, 0x67, 0x5f, 0x72, 0x75, 0x6c, 0x65, 0x73, 0x18, 0x05, 0x20, 0x01, 0x28, 0x08, 0x52, 0x10,
-	0x6b, 0x65, 0x65, 0x70, 0x52, 0x6f, 0x75, 0x74, 0x69, 0x6e, 0x67, 0x52, 0x75, 0x6c, 0x65, 0x73,
-	0x12, 0x23, 0x0a, 0x0d, 0x72, 0x65, 0x6e, 0x61, 0x6d, 0x65, 0x5f, 0x74, 0x61, 0x62, 0x6c, 0x65,
-	0x73, 0x18, 0x06, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0c, 0x72, 0x65, 0x6e, 0x61, 0x6d, 0x65, 0x54,
-	0x61, 0x62, 0x6c, 0x65, 0x73, 0x12, 0x17, 0x0a, 0x07, 0x64, 0x72, 0x79, 0x5f, 0x72, 0x75, 0x6e,
-	0x18, 0x07, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x64, 0x72, 0x79, 0x52, 0x75, 0x6e, 0x12, 0x16,
-	0x0a, 0x06, 0x73, 0x68, 0x61, 0x72, 0x64, 0x73, 0x18, 0x08, 0x20, 0x03, 0x28, 0x09, 0x52, 0x06,
-	0x73, 0x68, 0x61, 0x72, 0x64, 0x73, 0x22, 0x5e, 0x0a, 0x1a, 0x4d, 0x6f, 0x76, 0x65, 0x54, 0x61,
-	0x62, 0x6c, 0x65, 0x73, 0x43, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x52, 0x65, 0x73, 0x70,
-	0x6f, 0x6e, 0x73, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x73, 0x75, 0x6d, 0x6d, 0x61, 0x72, 0x79, 0x18,
-	0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x73, 0x75, 0x6d, 0x6d, 0x61, 0x72, 0x79, 0x12, 0x26,
-	0x0a, 0x0f, 0x64, 0x72, 0x79, 0x5f, 0x72, 0x75, 0x6e, 0x5f, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74,
-	0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0d, 0x64, 0x72, 0x79, 0x52, 0x75, 0x6e, 0x52,
-	0x65, 0x73, 0x75, 0x6c, 0x74, 0x73, 0x22, 0x4d, 0x0a, 0x11, 0x50, 0x69, 0x6e, 0x67, 0x54, 0x61,
-	0x62, 0x6c, 0x65, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x38, 0x0a, 0x0c, 0x74,
-	0x61, 0x62, 0x6c, 0x65, 0x74, 0x5f, 0x61, 0x6c, 0x69, 0x61, 0x73, 0x18, 0x01, 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, 0x14, 0x0a, 0x12, 0x50, 0x69, 0x6e, 0x67, 0x54, 0x61, 0x62,
-	0x6c, 0x65, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0xd6, 0x03, 0x0a, 0x1b,
-	0x50, 0x6c, 0x61, 0x6e, 0x6e, 0x65, 0x64, 0x52, 0x65, 0x70, 0x61, 0x72, 0x65, 0x6e, 0x74, 0x53,
-	0x68, 0x61, 0x72, 0x64, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 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, 0x36, 0x0a,
-	0x0b, 0x6e, 0x65, 0x77, 0x5f, 0x70, 0x72, 0x69, 0x6d, 0x61, 0x72, 0x79, 0x18, 0x03, 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, 0x0a, 0x6e, 0x65, 0x77, 0x50, 0x72,
-	0x69, 0x6d, 0x61, 0x72, 0x79, 0x12, 0x3a, 0x0a, 0x0d, 0x61, 0x76, 0x6f, 0x69, 0x64, 0x5f, 0x70,
-	0x72, 0x69, 0x6d, 0x61, 0x72, 0x79, 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, 0x0c, 0x61, 0x76, 0x6f, 0x69, 0x64, 0x50, 0x72, 0x69, 0x6d, 0x61, 0x72,
-	0x79, 0x12, 0x44, 0x0a, 0x15, 0x77, 0x61, 0x69, 0x74, 0x5f, 0x72, 0x65, 0x70, 0x6c, 0x69, 0x63,
-	0x61, 0x73, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b,
-	0x32, 0x10, 0x2e, 0x76, 0x74, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x44, 0x75, 0x72, 0x61, 0x74, 0x69,
-	0x6f, 0x6e, 0x52, 0x13, 0x77, 0x61, 0x69, 0x74, 0x52, 0x65, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x73,
-	0x54, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x12, 0x4c, 0x0a, 0x19, 0x74, 0x6f, 0x6c, 0x65, 0x72,
-	0x61, 0x62, 0x6c, 0x65, 0x5f, 0x72, 0x65, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e,
-	0x5f, 0x6c, 0x61, 0x67, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x76, 0x74, 0x74,
-	0x69, 0x6d, 0x65, 0x2e, 0x44, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x17, 0x74, 0x6f,
-	0x6c, 0x65, 0x72, 0x61, 0x62, 0x6c, 0x65, 0x52, 0x65, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74, 0x69,
-	0x6f, 0x6e, 0x4c, 0x61, 0x67, 0x12, 0x3b, 0x0a, 0x1a, 0x61, 0x6c, 0x6c, 0x6f, 0x77, 0x5f, 0x63,
-	0x72, 0x6f, 0x73, 0x73, 0x5f, 0x63, 0x65, 0x6c, 0x6c, 0x5f, 0x70, 0x72, 0x6f, 0x6d, 0x6f, 0x74,
-	0x69, 0x6f, 0x6e, 0x18, 0x07, 0x20, 0x01, 0x28, 0x08, 0x52, 0x17, 0x61, 0x6c, 0x6c, 0x6f, 0x77,
-	0x43, 0x72, 0x6f, 0x73, 0x73, 0x43, 0x65, 0x6c, 0x6c, 0x50, 0x72, 0x6f, 0x6d, 0x6f, 0x74, 0x69,
-	0x6f, 0x6e, 0x12, 0x40, 0x0a, 0x10, 0x65, 0x78, 0x70, 0x65, 0x63, 0x74, 0x65, 0x64, 0x5f, 0x70,
-	0x72, 0x69, 0x6d, 0x61, 0x72, 0x79, 0x18, 0x08, 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, 0x0f, 0x65, 0x78, 0x70, 0x65, 0x63, 0x74, 0x65, 0x64, 0x50, 0x72, 0x69,
-	0x6d, 0x61, 0x72, 0x79, 0x22, 0xba, 0x01, 0x0a, 0x1c, 0x50, 0x6c, 0x61, 0x6e, 0x6e, 0x65, 0x64,
-	0x52, 0x65, 0x70, 0x61, 0x72, 0x65, 0x6e, 0x74, 0x53, 0x68, 0x61, 0x72, 0x64, 0x52, 0x65, 0x73,
-	0x70, 0x6f, 0x6e, 0x73, 0x65, 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, 0x40, 0x0a, 0x10, 0x70, 0x72, 0x6f, 0x6d, 0x6f,
-	0x74, 0x65, 0x64, 0x5f, 0x70, 0x72, 0x69, 0x6d, 0x61, 0x72, 0x79, 0x18, 0x03, 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, 0x0f, 0x70, 0x72, 0x6f, 0x6d, 0x6f, 0x74,
-	0x65, 0x64, 0x50, 0x72, 0x69, 0x6d, 0x61, 0x72, 0x79, 0x12, 0x26, 0x0a, 0x06, 0x65, 0x76, 0x65,
-	0x6e, 0x74, 0x73, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x6c, 0x6f, 0x67, 0x75,
-	0x74, 0x69, 0x6c, 0x2e, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x52, 0x06, 0x65, 0x76, 0x65, 0x6e, 0x74,
-	0x73, 0x22, 0x74, 0x0a, 0x1b, 0x52, 0x65, 0x62, 0x75, 0x69, 0x6c, 0x64, 0x4b, 0x65, 0x79, 0x73,
-	0x70, 0x61, 0x63, 0x65, 0x47, 0x72, 0x61, 0x70, 0x68, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74,
+	0x61, 0x62, 0x6c, 0x65, 0x4b, 0x65, 0x79, 0x73, 0x70, 0x61, 0x63, 0x65, 0x12, 0x27, 0x0a, 0x0f,
+	0x64, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x5f, 0x77, 0x6f, 0x72, 0x6b, 0x66, 0x6c, 0x6f, 0x77, 0x18,
+	0x04, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0e, 0x64, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x57, 0x6f, 0x72,
+	0x6b, 0x66, 0x6c, 0x6f, 0x77, 0x22, 0x77, 0x0a, 0x1f, 0x4c, 0x6f, 0x6f, 0x6b, 0x75, 0x70, 0x56,
+	0x69, 0x6e, 0x64, 0x65, 0x78, 0x45, 0x78, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x69, 0x7a, 0x65,
+	0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x29, 0x0a, 0x10, 0x77, 0x6f, 0x72, 0x6b,
+	0x66, 0x6c, 0x6f, 0x77, 0x5f, 0x73, 0x74, 0x6f, 0x70, 0x70, 0x65, 0x64, 0x18, 0x01, 0x20, 0x01,
+	0x28, 0x08, 0x52, 0x0f, 0x77, 0x6f, 0x72, 0x6b, 0x66, 0x6c, 0x6f, 0x77, 0x53, 0x74, 0x6f, 0x70,
+	0x70, 0x65, 0x64, 0x12, 0x29, 0x0a, 0x10, 0x77, 0x6f, 0x72, 0x6b, 0x66, 0x6c, 0x6f, 0x77, 0x5f,
+	0x64, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0f, 0x77,
+	0x6f, 0x72, 0x6b, 0x66, 0x6c, 0x6f, 0x77, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x64, 0x22, 0x77,
+	0x0a, 0x1e, 0x4c, 0x6f, 0x6f, 0x6b, 0x75, 0x70, 0x56, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x49, 0x6e,
+	0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x69, 0x7a, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74,
 	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,
-	0x63, 0x65, 0x6c, 0x6c, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x09, 0x52, 0x05, 0x63, 0x65, 0x6c,
-	0x6c, 0x73, 0x12, 0x23, 0x0a, 0x0d, 0x61, 0x6c, 0x6c, 0x6f, 0x77, 0x5f, 0x70, 0x61, 0x72, 0x74,
-	0x69, 0x61, 0x6c, 0x18, 0x03, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0c, 0x61, 0x6c, 0x6c, 0x6f, 0x77,
-	0x50, 0x61, 0x72, 0x74, 0x69, 0x61, 0x6c, 0x22, 0x1e, 0x0a, 0x1c, 0x52, 0x65, 0x62, 0x75, 0x69,
-	0x6c, 0x64, 0x4b, 0x65, 0x79, 0x73, 0x70, 0x61, 0x63, 0x65, 0x47, 0x72, 0x61, 0x70, 0x68, 0x52,
-	0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x32, 0x0a, 0x1a, 0x52, 0x65, 0x62, 0x75, 0x69,
-	0x6c, 0x64, 0x56, 0x53, 0x63, 0x68, 0x65, 0x6d, 0x61, 0x47, 0x72, 0x61, 0x70, 0x68, 0x52, 0x65,
-	0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x14, 0x0a, 0x05, 0x63, 0x65, 0x6c, 0x6c, 0x73, 0x18, 0x01,
-	0x20, 0x03, 0x28, 0x09, 0x52, 0x05, 0x63, 0x65, 0x6c, 0x6c, 0x73, 0x22, 0x1d, 0x0a, 0x1b, 0x52,
-	0x65, 0x62, 0x75, 0x69, 0x6c, 0x64, 0x56, 0x53, 0x63, 0x68, 0x65, 0x6d, 0x61, 0x47, 0x72, 0x61,
-	0x70, 0x68, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x4f, 0x0a, 0x13, 0x52, 0x65,
-	0x66, 0x72, 0x65, 0x73, 0x68, 0x53, 0x74, 0x61, 0x74, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73,
+	0x28, 0x09, 0x52, 0x08, 0x6b, 0x65, 0x79, 0x73, 0x70, 0x61, 0x63, 0x65, 0x12, 0x12, 0x0a, 0x04,
+	0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65,
+	0x12, 0x25, 0x0a, 0x0e, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x5f, 0x6b, 0x65, 0x79, 0x73, 0x70, 0x61,
+	0x63, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x4b,
+	0x65, 0x79, 0x73, 0x70, 0x61, 0x63, 0x65, 0x22, 0x21, 0x0a, 0x1f, 0x4c, 0x6f, 0x6f, 0x6b, 0x75,
+	0x70, 0x56, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x49, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x69,
+	0x7a, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x56, 0x0a, 0x18, 0x4d, 0x61,
+	0x74, 0x65, 0x72, 0x69, 0x61, 0x6c, 0x69, 0x7a, 0x65, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x52,
+	0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x3a, 0x0a, 0x08, 0x73, 0x65, 0x74, 0x74, 0x69, 0x6e,
+	0x67, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1e, 0x2e, 0x76, 0x74, 0x63, 0x74, 0x6c,
+	0x64, 0x61, 0x74, 0x61, 0x2e, 0x4d, 0x61, 0x74, 0x65, 0x72, 0x69, 0x61, 0x6c, 0x69, 0x7a, 0x65,
+	0x53, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x73, 0x52, 0x08, 0x73, 0x65, 0x74, 0x74, 0x69, 0x6e,
+	0x67, 0x73, 0x22, 0x1b, 0x0a, 0x19, 0x4d, 0x61, 0x74, 0x65, 0x72, 0x69, 0x61, 0x6c, 0x69, 0x7a,
+	0x65, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22,
+	0xdd, 0x05, 0x0a, 0x14, 0x4d, 0x69, 0x67, 0x72, 0x61, 0x74, 0x65, 0x43, 0x72, 0x65, 0x61, 0x74,
+	0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x1a, 0x0a, 0x08, 0x77, 0x6f, 0x72, 0x6b,
+	0x66, 0x6c, 0x6f, 0x77, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x77, 0x6f, 0x72, 0x6b,
+	0x66, 0x6c, 0x6f, 0x77, 0x12, 0x27, 0x0a, 0x0f, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x5f, 0x6b,
+	0x65, 0x79, 0x73, 0x70, 0x61, 0x63, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0e, 0x73,
+	0x6f, 0x75, 0x72, 0x63, 0x65, 0x4b, 0x65, 0x79, 0x73, 0x70, 0x61, 0x63, 0x65, 0x12, 0x27, 0x0a,
+	0x0f, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x5f, 0x6b, 0x65, 0x79, 0x73, 0x70, 0x61, 0x63, 0x65,
+	0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0e, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x4b, 0x65,
+	0x79, 0x73, 0x70, 0x61, 0x63, 0x65, 0x12, 0x1d, 0x0a, 0x0a, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x5f,
+	0x6e, 0x61, 0x6d, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x6d, 0x6f, 0x75, 0x6e,
+	0x74, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x63, 0x65, 0x6c, 0x6c, 0x73, 0x18, 0x05,
+	0x20, 0x03, 0x28, 0x09, 0x52, 0x05, 0x63, 0x65, 0x6c, 0x6c, 0x73, 0x12, 0x37, 0x0a, 0x0c, 0x74,
+	0x61, 0x62, 0x6c, 0x65, 0x74, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x73, 0x18, 0x06, 0x20, 0x03, 0x28,
+	0x0e, 0x32, 0x14, 0x2e, 0x74, 0x6f, 0x70, 0x6f, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x54, 0x61, 0x62,
+	0x6c, 0x65, 0x74, 0x54, 0x79, 0x70, 0x65, 0x52, 0x0b, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x54,
+	0x79, 0x70, 0x65, 0x73, 0x12, 0x6c, 0x0a, 0x1b, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x5f, 0x73,
+	0x65, 0x6c, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x70, 0x72, 0x65, 0x66, 0x65, 0x72, 0x65,
+	0x6e, 0x63, 0x65, 0x18, 0x07, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x2c, 0x2e, 0x74, 0x61, 0x62, 0x6c,
+	0x65, 0x74, 0x6d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x72, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x54, 0x61,
+	0x62, 0x6c, 0x65, 0x74, 0x53, 0x65, 0x6c, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x50, 0x72, 0x65,
+	0x66, 0x65, 0x72, 0x65, 0x6e, 0x63, 0x65, 0x52, 0x19, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x53,
+	0x65, 0x6c, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x50, 0x72, 0x65, 0x66, 0x65, 0x72, 0x65, 0x6e,
+	0x63, 0x65, 0x12, 0x1d, 0x0a, 0x0a, 0x61, 0x6c, 0x6c, 0x5f, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x73,
+	0x18, 0x08, 0x20, 0x01, 0x28, 0x08, 0x52, 0x09, 0x61, 0x6c, 0x6c, 0x54, 0x61, 0x62, 0x6c, 0x65,
+	0x73, 0x12, 0x25, 0x0a, 0x0e, 0x69, 0x6e, 0x63, 0x6c, 0x75, 0x64, 0x65, 0x5f, 0x74, 0x61, 0x62,
+	0x6c, 0x65, 0x73, 0x18, 0x09, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0d, 0x69, 0x6e, 0x63, 0x6c, 0x75,
+	0x64, 0x65, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x73, 0x12, 0x25, 0x0a, 0x0e, 0x65, 0x78, 0x63, 0x6c,
+	0x75, 0x64, 0x65, 0x5f, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x73, 0x18, 0x0a, 0x20, 0x03, 0x28, 0x09,
+	0x52, 0x0d, 0x65, 0x78, 0x63, 0x6c, 0x75, 0x64, 0x65, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x73, 0x12,
+	0x28, 0x0a, 0x10, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x5f, 0x7a,
+	0x6f, 0x6e, 0x65, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0e, 0x73, 0x6f, 0x75, 0x72, 0x63,
+	0x65, 0x54, 0x69, 0x6d, 0x65, 0x5a, 0x6f, 0x6e, 0x65, 0x12, 0x15, 0x0a, 0x06, 0x6f, 0x6e, 0x5f,
+	0x64, 0x64, 0x6c, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x6f, 0x6e, 0x44, 0x64, 0x6c,
+	0x12, 0x26, 0x0a, 0x0f, 0x73, 0x74, 0x6f, 0x70, 0x5f, 0x61, 0x66, 0x74, 0x65, 0x72, 0x5f, 0x63,
+	0x6f, 0x70, 0x79, 0x18, 0x0d, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0d, 0x73, 0x74, 0x6f, 0x70, 0x41,
+	0x66, 0x74, 0x65, 0x72, 0x43, 0x6f, 0x70, 0x79, 0x12, 0x2a, 0x0a, 0x11, 0x64, 0x72, 0x6f, 0x70,
+	0x5f, 0x66, 0x6f, 0x72, 0x65, 0x69, 0x67, 0x6e, 0x5f, 0x6b, 0x65, 0x79, 0x73, 0x18, 0x0e, 0x20,
+	0x01, 0x28, 0x08, 0x52, 0x0f, 0x64, 0x72, 0x6f, 0x70, 0x46, 0x6f, 0x72, 0x65, 0x69, 0x67, 0x6e,
+	0x4b, 0x65, 0x79, 0x73, 0x12, 0x30, 0x0a, 0x14, 0x64, 0x65, 0x66, 0x65, 0x72, 0x5f, 0x73, 0x65,
+	0x63, 0x6f, 0x6e, 0x64, 0x61, 0x72, 0x79, 0x5f, 0x6b, 0x65, 0x79, 0x73, 0x18, 0x0f, 0x20, 0x01,
+	0x28, 0x08, 0x52, 0x12, 0x64, 0x65, 0x66, 0x65, 0x72, 0x53, 0x65, 0x63, 0x6f, 0x6e, 0x64, 0x61,
+	0x72, 0x79, 0x4b, 0x65, 0x79, 0x73, 0x12, 0x1d, 0x0a, 0x0a, 0x61, 0x75, 0x74, 0x6f, 0x5f, 0x73,
+	0x74, 0x61, 0x72, 0x74, 0x18, 0x10, 0x20, 0x01, 0x28, 0x08, 0x52, 0x09, 0x61, 0x75, 0x74, 0x6f,
+	0x53, 0x74, 0x61, 0x72, 0x74, 0x12, 0x28, 0x0a, 0x10, 0x6e, 0x6f, 0x5f, 0x72, 0x6f, 0x75, 0x74,
+	0x69, 0x6e, 0x67, 0x5f, 0x72, 0x75, 0x6c, 0x65, 0x73, 0x18, 0x11, 0x20, 0x01, 0x28, 0x08, 0x52,
+	0x0e, 0x6e, 0x6f, 0x52, 0x6f, 0x75, 0x74, 0x69, 0x6e, 0x67, 0x52, 0x75, 0x6c, 0x65, 0x73, 0x22,
+	0xe6, 0x01, 0x0a, 0x16, 0x4d, 0x69, 0x67, 0x72, 0x61, 0x74, 0x65, 0x43, 0x6f, 0x6d, 0x70, 0x6c,
+	0x65, 0x74, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x1a, 0x0a, 0x08, 0x77, 0x6f,
+	0x72, 0x6b, 0x66, 0x6c, 0x6f, 0x77, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x77, 0x6f,
+	0x72, 0x6b, 0x66, 0x6c, 0x6f, 0x77, 0x12, 0x27, 0x0a, 0x0f, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74,
+	0x5f, 0x6b, 0x65, 0x79, 0x73, 0x70, 0x61, 0x63, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52,
+	0x0e, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x4b, 0x65, 0x79, 0x73, 0x70, 0x61, 0x63, 0x65, 0x12,
+	0x1b, 0x0a, 0x09, 0x6b, 0x65, 0x65, 0x70, 0x5f, 0x64, 0x61, 0x74, 0x61, 0x18, 0x04, 0x20, 0x01,
+	0x28, 0x08, 0x52, 0x08, 0x6b, 0x65, 0x65, 0x70, 0x44, 0x61, 0x74, 0x61, 0x12, 0x2c, 0x0a, 0x12,
+	0x6b, 0x65, 0x65, 0x70, 0x5f, 0x72, 0x6f, 0x75, 0x74, 0x69, 0x6e, 0x67, 0x5f, 0x72, 0x75, 0x6c,
+	0x65, 0x73, 0x18, 0x05, 0x20, 0x01, 0x28, 0x08, 0x52, 0x10, 0x6b, 0x65, 0x65, 0x70, 0x52, 0x6f,
+	0x75, 0x74, 0x69, 0x6e, 0x67, 0x52, 0x75, 0x6c, 0x65, 0x73, 0x12, 0x23, 0x0a, 0x0d, 0x72, 0x65,
+	0x6e, 0x61, 0x6d, 0x65, 0x5f, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x73, 0x18, 0x06, 0x20, 0x01, 0x28,
+	0x08, 0x52, 0x0c, 0x72, 0x65, 0x6e, 0x61, 0x6d, 0x65, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x73, 0x12,
+	0x17, 0x0a, 0x07, 0x64, 0x72, 0x79, 0x5f, 0x72, 0x75, 0x6e, 0x18, 0x07, 0x20, 0x01, 0x28, 0x08,
+	0x52, 0x06, 0x64, 0x72, 0x79, 0x52, 0x75, 0x6e, 0x22, 0x5b, 0x0a, 0x17, 0x4d, 0x69, 0x67, 0x72,
+	0x61, 0x74, 0x65, 0x43, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f,
+	0x6e, 0x73, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x73, 0x75, 0x6d, 0x6d, 0x61, 0x72, 0x79, 0x18, 0x01,
+	0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x73, 0x75, 0x6d, 0x6d, 0x61, 0x72, 0x79, 0x12, 0x26, 0x0a,
+	0x0f, 0x64, 0x72, 0x79, 0x5f, 0x72, 0x75, 0x6e, 0x5f, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x73,
+	0x18, 0x02, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0d, 0x64, 0x72, 0x79, 0x52, 0x75, 0x6e, 0x52, 0x65,
+	0x73, 0x75, 0x6c, 0x74, 0x73, 0x22, 0x85, 0x01, 0x0a, 0x14, 0x4d, 0x6f, 0x75, 0x6e, 0x74, 0x52,
+	0x65, 0x67, 0x69, 0x73, 0x74, 0x65, 0x72, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x1b,
+	0x0a, 0x09, 0x74, 0x6f, 0x70, 0x6f, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28,
+	0x09, 0x52, 0x08, 0x74, 0x6f, 0x70, 0x6f, 0x54, 0x79, 0x70, 0x65, 0x12, 0x1f, 0x0a, 0x0b, 0x74,
+	0x6f, 0x70, 0x6f, 0x5f, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09,
+	0x52, 0x0a, 0x74, 0x6f, 0x70, 0x6f, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x12, 0x1b, 0x0a, 0x09,
+	0x74, 0x6f, 0x70, 0x6f, 0x5f, 0x72, 0x6f, 0x6f, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52,
+	0x08, 0x74, 0x6f, 0x70, 0x6f, 0x52, 0x6f, 0x6f, 0x74, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d,
+	0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x22, 0x17, 0x0a,
+	0x15, 0x4d, 0x6f, 0x75, 0x6e, 0x74, 0x52, 0x65, 0x67, 0x69, 0x73, 0x74, 0x65, 0x72, 0x52, 0x65,
+	0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x2c, 0x0a, 0x16, 0x4d, 0x6f, 0x75, 0x6e, 0x74, 0x55,
+	0x6e, 0x72, 0x65, 0x67, 0x69, 0x73, 0x74, 0x65, 0x72, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74,
+	0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04,
+	0x6e, 0x61, 0x6d, 0x65, 0x22, 0x19, 0x0a, 0x17, 0x4d, 0x6f, 0x75, 0x6e, 0x74, 0x55, 0x6e, 0x72,
+	0x65, 0x67, 0x69, 0x73, 0x74, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22,
+	0x26, 0x0a, 0x10, 0x4d, 0x6f, 0x75, 0x6e, 0x74, 0x53, 0x68, 0x6f, 0x77, 0x52, 0x65, 0x71, 0x75,
+	0x65, 0x73, 0x74, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28,
+	0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x22, 0x82, 0x01, 0x0a, 0x11, 0x4d, 0x6f, 0x75, 0x6e,
+	0x74, 0x53, 0x68, 0x6f, 0x77, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x1b, 0x0a,
+	0x09, 0x74, 0x6f, 0x70, 0x6f, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09,
+	0x52, 0x08, 0x74, 0x6f, 0x70, 0x6f, 0x54, 0x79, 0x70, 0x65, 0x12, 0x1f, 0x0a, 0x0b, 0x74, 0x6f,
+	0x70, 0x6f, 0x5f, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52,
+	0x0a, 0x74, 0x6f, 0x70, 0x6f, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x12, 0x1b, 0x0a, 0x09, 0x74,
+	0x6f, 0x70, 0x6f, 0x5f, 0x72, 0x6f, 0x6f, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08,
+	0x74, 0x6f, 0x70, 0x6f, 0x52, 0x6f, 0x6f, 0x74, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65,
+	0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x22, 0x12, 0x0a, 0x10,
+	0x4d, 0x6f, 0x75, 0x6e, 0x74, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74,
+	0x22, 0x29, 0x0a, 0x11, 0x4d, 0x6f, 0x75, 0x6e, 0x74, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x73,
+	0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x6e, 0x61, 0x6d, 0x65, 0x73, 0x18, 0x01,
+	0x20, 0x03, 0x28, 0x09, 0x52, 0x05, 0x6e, 0x61, 0x6d, 0x65, 0x73, 0x22, 0x82, 0x07, 0x0a, 0x17,
+	0x4d, 0x6f, 0x76, 0x65, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x73, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65,
+	0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x1a, 0x0a, 0x08, 0x77, 0x6f, 0x72, 0x6b, 0x66,
+	0x6c, 0x6f, 0x77, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x77, 0x6f, 0x72, 0x6b, 0x66,
+	0x6c, 0x6f, 0x77, 0x12, 0x27, 0x0a, 0x0f, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x5f, 0x6b, 0x65,
+	0x79, 0x73, 0x70, 0x61, 0x63, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0e, 0x73, 0x6f,
+	0x75, 0x72, 0x63, 0x65, 0x4b, 0x65, 0x79, 0x73, 0x70, 0x61, 0x63, 0x65, 0x12, 0x27, 0x0a, 0x0f,
+	0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x5f, 0x6b, 0x65, 0x79, 0x73, 0x70, 0x61, 0x63, 0x65, 0x18,
+	0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0e, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x4b, 0x65, 0x79,
+	0x73, 0x70, 0x61, 0x63, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x63, 0x65, 0x6c, 0x6c, 0x73, 0x18, 0x04,
+	0x20, 0x03, 0x28, 0x09, 0x52, 0x05, 0x63, 0x65, 0x6c, 0x6c, 0x73, 0x12, 0x37, 0x0a, 0x0c, 0x74,
+	0x61, 0x62, 0x6c, 0x65, 0x74, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x73, 0x18, 0x05, 0x20, 0x03, 0x28,
+	0x0e, 0x32, 0x14, 0x2e, 0x74, 0x6f, 0x70, 0x6f, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x54, 0x61, 0x62,
+	0x6c, 0x65, 0x74, 0x54, 0x79, 0x70, 0x65, 0x52, 0x0b, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x54,
+	0x79, 0x70, 0x65, 0x73, 0x12, 0x6c, 0x0a, 0x1b, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x5f, 0x73,
+	0x65, 0x6c, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x70, 0x72, 0x65, 0x66, 0x65, 0x72, 0x65,
+	0x6e, 0x63, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x2c, 0x2e, 0x74, 0x61, 0x62, 0x6c,
+	0x65, 0x74, 0x6d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x72, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x54, 0x61,
+	0x62, 0x6c, 0x65, 0x74, 0x53, 0x65, 0x6c, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x50, 0x72, 0x65,
+	0x66, 0x65, 0x72, 0x65, 0x6e, 0x63, 0x65, 0x52, 0x19, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x53,
+	0x65, 0x6c, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x50, 0x72, 0x65, 0x66, 0x65, 0x72, 0x65, 0x6e,
+	0x63, 0x65, 0x12, 0x23, 0x0a, 0x0d, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x5f, 0x73, 0x68, 0x61,
+	0x72, 0x64, 0x73, 0x18, 0x07, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0c, 0x73, 0x6f, 0x75, 0x72, 0x63,
+	0x65, 0x53, 0x68, 0x61, 0x72, 0x64, 0x73, 0x12, 0x1d, 0x0a, 0x0a, 0x61, 0x6c, 0x6c, 0x5f, 0x74,
+	0x61, 0x62, 0x6c, 0x65, 0x73, 0x18, 0x08, 0x20, 0x01, 0x28, 0x08, 0x52, 0x09, 0x61, 0x6c, 0x6c,
+	0x54, 0x61, 0x62, 0x6c, 0x65, 0x73, 0x12, 0x25, 0x0a, 0x0e, 0x69, 0x6e, 0x63, 0x6c, 0x75, 0x64,
+	0x65, 0x5f, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x73, 0x18, 0x09, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0d,
+	0x69, 0x6e, 0x63, 0x6c, 0x75, 0x64, 0x65, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x73, 0x12, 0x25, 0x0a,
+	0x0e, 0x65, 0x78, 0x63, 0x6c, 0x75, 0x64, 0x65, 0x5f, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x73, 0x18,
+	0x0a, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0d, 0x65, 0x78, 0x63, 0x6c, 0x75, 0x64, 0x65, 0x54, 0x61,
+	0x62, 0x6c, 0x65, 0x73, 0x12, 0x32, 0x0a, 0x15, 0x65, 0x78, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c,
+	0x5f, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x0b, 0x20,
+	0x01, 0x28, 0x09, 0x52, 0x13, 0x65, 0x78, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x43, 0x6c, 0x75,
+	0x73, 0x74, 0x65, 0x72, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x28, 0x0a, 0x10, 0x73, 0x6f, 0x75, 0x72,
+	0x63, 0x65, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x5f, 0x7a, 0x6f, 0x6e, 0x65, 0x18, 0x0c, 0x20, 0x01,
+	0x28, 0x09, 0x52, 0x0e, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x5a, 0x6f,
+	0x6e, 0x65, 0x12, 0x15, 0x0a, 0x06, 0x6f, 0x6e, 0x5f, 0x64, 0x64, 0x6c, 0x18, 0x0d, 0x20, 0x01,
+	0x28, 0x09, 0x52, 0x05, 0x6f, 0x6e, 0x44, 0x64, 0x6c, 0x12, 0x26, 0x0a, 0x0f, 0x73, 0x74, 0x6f,
+	0x70, 0x5f, 0x61, 0x66, 0x74, 0x65, 0x72, 0x5f, 0x63, 0x6f, 0x70, 0x79, 0x18, 0x0e, 0x20, 0x01,
+	0x28, 0x08, 0x52, 0x0d, 0x73, 0x74, 0x6f, 0x70, 0x41, 0x66, 0x74, 0x65, 0x72, 0x43, 0x6f, 0x70,
+	0x79, 0x12, 0x2a, 0x0a, 0x11, 0x64, 0x72, 0x6f, 0x70, 0x5f, 0x66, 0x6f, 0x72, 0x65, 0x69, 0x67,
+	0x6e, 0x5f, 0x6b, 0x65, 0x79, 0x73, 0x18, 0x0f, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0f, 0x64, 0x72,
+	0x6f, 0x70, 0x46, 0x6f, 0x72, 0x65, 0x69, 0x67, 0x6e, 0x4b, 0x65, 0x79, 0x73, 0x12, 0x30, 0x0a,
+	0x14, 0x64, 0x65, 0x66, 0x65, 0x72, 0x5f, 0x73, 0x65, 0x63, 0x6f, 0x6e, 0x64, 0x61, 0x72, 0x79,
+	0x5f, 0x6b, 0x65, 0x79, 0x73, 0x18, 0x10, 0x20, 0x01, 0x28, 0x08, 0x52, 0x12, 0x64, 0x65, 0x66,
+	0x65, 0x72, 0x53, 0x65, 0x63, 0x6f, 0x6e, 0x64, 0x61, 0x72, 0x79, 0x4b, 0x65, 0x79, 0x73, 0x12,
+	0x1d, 0x0a, 0x0a, 0x61, 0x75, 0x74, 0x6f, 0x5f, 0x73, 0x74, 0x61, 0x72, 0x74, 0x18, 0x11, 0x20,
+	0x01, 0x28, 0x08, 0x52, 0x09, 0x61, 0x75, 0x74, 0x6f, 0x53, 0x74, 0x61, 0x72, 0x74, 0x12, 0x28,
+	0x0a, 0x10, 0x6e, 0x6f, 0x5f, 0x72, 0x6f, 0x75, 0x74, 0x69, 0x6e, 0x67, 0x5f, 0x72, 0x75, 0x6c,
+	0x65, 0x73, 0x18, 0x12, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0e, 0x6e, 0x6f, 0x52, 0x6f, 0x75, 0x74,
+	0x69, 0x6e, 0x67, 0x52, 0x75, 0x6c, 0x65, 0x73, 0x12, 0x1f, 0x0a, 0x0b, 0x61, 0x74, 0x6f, 0x6d,
+	0x69, 0x63, 0x5f, 0x63, 0x6f, 0x70, 0x79, 0x18, 0x13, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0a, 0x61,
+	0x74, 0x6f, 0x6d, 0x69, 0x63, 0x43, 0x6f, 0x70, 0x79, 0x12, 0x45, 0x0a, 0x10, 0x77, 0x6f, 0x72,
+	0x6b, 0x66, 0x6c, 0x6f, 0x77, 0x5f, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x14, 0x20,
+	0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x76, 0x74, 0x63, 0x74, 0x6c, 0x64, 0x61, 0x74, 0x61, 0x2e,
+	0x57, 0x6f, 0x72, 0x6b, 0x66, 0x6c, 0x6f, 0x77, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x52,
+	0x0f, 0x77, 0x6f, 0x72, 0x6b, 0x66, 0x6c, 0x6f, 0x77, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73,
+	0x22, 0xd5, 0x01, 0x0a, 0x18, 0x4d, 0x6f, 0x76, 0x65, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x73, 0x43,
+	0x72, 0x65, 0x61, 0x74, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x18, 0x0a,
+	0x07, 0x73, 0x75, 0x6d, 0x6d, 0x61, 0x72, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07,
+	0x73, 0x75, 0x6d, 0x6d, 0x61, 0x72, 0x79, 0x12, 0x48, 0x0a, 0x07, 0x64, 0x65, 0x74, 0x61, 0x69,
+	0x6c, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x2e, 0x2e, 0x76, 0x74, 0x63, 0x74, 0x6c,
+	0x64, 0x61, 0x74, 0x61, 0x2e, 0x4d, 0x6f, 0x76, 0x65, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x73, 0x43,
+	0x72, 0x65, 0x61, 0x74, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x2e, 0x54, 0x61,
+	0x62, 0x6c, 0x65, 0x74, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x07, 0x64, 0x65, 0x74, 0x61, 0x69, 0x6c,
+	0x73, 0x1a, 0x55, 0x0a, 0x0a, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x49, 0x6e, 0x66, 0x6f, 0x12,
+	0x2d, 0x0a, 0x06, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x18, 0x01, 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, 0x06, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x12, 0x18,
+	0x0a, 0x07, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52,
+	0x07, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x64, 0x22, 0x81, 0x02, 0x0a, 0x19, 0x4d, 0x6f, 0x76,
+	0x65, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x73, 0x43, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x52,
+	0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x1a, 0x0a, 0x08, 0x77, 0x6f, 0x72, 0x6b, 0x66, 0x6c,
+	0x6f, 0x77, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x77, 0x6f, 0x72, 0x6b, 0x66, 0x6c,
+	0x6f, 0x77, 0x12, 0x27, 0x0a, 0x0f, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x5f, 0x6b, 0x65, 0x79,
+	0x73, 0x70, 0x61, 0x63, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0e, 0x74, 0x61, 0x72,
+	0x67, 0x65, 0x74, 0x4b, 0x65, 0x79, 0x73, 0x70, 0x61, 0x63, 0x65, 0x12, 0x1b, 0x0a, 0x09, 0x6b,
+	0x65, 0x65, 0x70, 0x5f, 0x64, 0x61, 0x74, 0x61, 0x18, 0x04, 0x20, 0x01, 0x28, 0x08, 0x52, 0x08,
+	0x6b, 0x65, 0x65, 0x70, 0x44, 0x61, 0x74, 0x61, 0x12, 0x2c, 0x0a, 0x12, 0x6b, 0x65, 0x65, 0x70,
+	0x5f, 0x72, 0x6f, 0x75, 0x74, 0x69, 0x6e, 0x67, 0x5f, 0x72, 0x75, 0x6c, 0x65, 0x73, 0x18, 0x05,
+	0x20, 0x01, 0x28, 0x08, 0x52, 0x10, 0x6b, 0x65, 0x65, 0x70, 0x52, 0x6f, 0x75, 0x74, 0x69, 0x6e,
+	0x67, 0x52, 0x75, 0x6c, 0x65, 0x73, 0x12, 0x23, 0x0a, 0x0d, 0x72, 0x65, 0x6e, 0x61, 0x6d, 0x65,
+	0x5f, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x73, 0x18, 0x06, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0c, 0x72,
+	0x65, 0x6e, 0x61, 0x6d, 0x65, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x73, 0x12, 0x17, 0x0a, 0x07, 0x64,
+	0x72, 0x79, 0x5f, 0x72, 0x75, 0x6e, 0x18, 0x07, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x64, 0x72,
+	0x79, 0x52, 0x75, 0x6e, 0x12, 0x16, 0x0a, 0x06, 0x73, 0x68, 0x61, 0x72, 0x64, 0x73, 0x18, 0x08,
+	0x20, 0x03, 0x28, 0x09, 0x52, 0x06, 0x73, 0x68, 0x61, 0x72, 0x64, 0x73, 0x22, 0x5e, 0x0a, 0x1a,
+	0x4d, 0x6f, 0x76, 0x65, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x73, 0x43, 0x6f, 0x6d, 0x70, 0x6c, 0x65,
+	0x74, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x73, 0x75,
+	0x6d, 0x6d, 0x61, 0x72, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x73, 0x75, 0x6d,
+	0x6d, 0x61, 0x72, 0x79, 0x12, 0x26, 0x0a, 0x0f, 0x64, 0x72, 0x79, 0x5f, 0x72, 0x75, 0x6e, 0x5f,
+	0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0d, 0x64,
+	0x72, 0x79, 0x52, 0x75, 0x6e, 0x52, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x73, 0x22, 0x4d, 0x0a, 0x11,
+	0x50, 0x69, 0x6e, 0x67, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73,
 	0x74, 0x12, 0x38, 0x0a, 0x0c, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x5f, 0x61, 0x6c, 0x69, 0x61,
 	0x73, 0x18, 0x01, 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, 0x16, 0x0a, 0x14, 0x52,
-	0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x53, 0x74, 0x61, 0x74, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f,
-	0x6e, 0x73, 0x65, 0x22, 0x64, 0x0a, 0x1a, 0x52, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x53, 0x74,
-	0x61, 0x74, 0x65, 0x42, 0x79, 0x53, 0x68, 0x61, 0x72, 0x64, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73,
+	0x74, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x41, 0x6c, 0x69, 0x61, 0x73, 0x22, 0x14, 0x0a, 0x12, 0x50,
+	0x69, 0x6e, 0x67, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73,
+	0x65, 0x22, 0xd6, 0x03, 0x0a, 0x1b, 0x50, 0x6c, 0x61, 0x6e, 0x6e, 0x65, 0x64, 0x52, 0x65, 0x70,
+	0x61, 0x72, 0x65, 0x6e, 0x74, 0x53, 0x68, 0x61, 0x72, 0x64, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73,
 	0x74, 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, 0x14, 0x0a, 0x05, 0x63, 0x65, 0x6c, 0x6c, 0x73, 0x18, 0x03, 0x20, 0x03,
-	0x28, 0x09, 0x52, 0x05, 0x63, 0x65, 0x6c, 0x6c, 0x73, 0x22, 0x83, 0x01, 0x0a, 0x1b, 0x52, 0x65,
-	0x66, 0x72, 0x65, 0x73, 0x68, 0x53, 0x74, 0x61, 0x74, 0x65, 0x42, 0x79, 0x53, 0x68, 0x61, 0x72,
-	0x64, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x2c, 0x0a, 0x12, 0x69, 0x73, 0x5f,
-	0x70, 0x61, 0x72, 0x74, 0x69, 0x61, 0x6c, 0x5f, 0x72, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x18,
-	0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x10, 0x69, 0x73, 0x50, 0x61, 0x72, 0x74, 0x69, 0x61, 0x6c,
-	0x52, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x12, 0x36, 0x0a, 0x17, 0x70, 0x61, 0x72, 0x74, 0x69,
-	0x61, 0x6c, 0x5f, 0x72, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x5f, 0x64, 0x65, 0x74, 0x61, 0x69,
-	0x6c, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x15, 0x70, 0x61, 0x72, 0x74, 0x69, 0x61,
-	0x6c, 0x52, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x44, 0x65, 0x74, 0x61, 0x69, 0x6c, 0x73, 0x22,
-	0x4f, 0x0a, 0x13, 0x52, 0x65, 0x6c, 0x6f, 0x61, 0x64, 0x53, 0x63, 0x68, 0x65, 0x6d, 0x61, 0x52,
-	0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x38, 0x0a, 0x0c, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x74,
-	0x5f, 0x61, 0x6c, 0x69, 0x61, 0x73, 0x18, 0x01, 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, 0x16, 0x0a, 0x14, 0x52, 0x65, 0x6c, 0x6f, 0x61, 0x64, 0x53, 0x63, 0x68, 0x65, 0x6d, 0x61,
-	0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0xa9, 0x01, 0x0a, 0x1b, 0x52, 0x65, 0x6c,
-	0x6f, 0x61, 0x64, 0x53, 0x63, 0x68, 0x65, 0x6d, 0x61, 0x4b, 0x65, 0x79, 0x73, 0x70, 0x61, 0x63,
-	0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 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, 0x23, 0x0a, 0x0d, 0x77, 0x61, 0x69, 0x74, 0x5f, 0x70, 0x6f, 0x73,
-	0x69, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x77, 0x61, 0x69,
-	0x74, 0x50, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x27, 0x0a, 0x0f, 0x69, 0x6e, 0x63,
-	0x6c, 0x75, 0x64, 0x65, 0x5f, 0x70, 0x72, 0x69, 0x6d, 0x61, 0x72, 0x79, 0x18, 0x03, 0x20, 0x01,
-	0x28, 0x08, 0x52, 0x0e, 0x69, 0x6e, 0x63, 0x6c, 0x75, 0x64, 0x65, 0x50, 0x72, 0x69, 0x6d, 0x61,
-	0x72, 0x79, 0x12, 0x20, 0x0a, 0x0b, 0x63, 0x6f, 0x6e, 0x63, 0x75, 0x72, 0x72, 0x65, 0x6e, 0x63,
-	0x79, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0b, 0x63, 0x6f, 0x6e, 0x63, 0x75, 0x72, 0x72,
-	0x65, 0x6e, 0x63, 0x79, 0x22, 0x46, 0x0a, 0x1c, 0x52, 0x65, 0x6c, 0x6f, 0x61, 0x64, 0x53, 0x63,
-	0x68, 0x65, 0x6d, 0x61, 0x4b, 0x65, 0x79, 0x73, 0x70, 0x61, 0x63, 0x65, 0x52, 0x65, 0x73, 0x70,
-	0x6f, 0x6e, 0x73, 0x65, 0x12, 0x26, 0x0a, 0x06, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x73, 0x18, 0x01,
-	0x20, 0x03, 0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x6c, 0x6f, 0x67, 0x75, 0x74, 0x69, 0x6c, 0x2e, 0x45,
-	0x76, 0x65, 0x6e, 0x74, 0x52, 0x06, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x73, 0x22, 0xbc, 0x01, 0x0a,
-	0x18, 0x52, 0x65, 0x6c, 0x6f, 0x61, 0x64, 0x53, 0x63, 0x68, 0x65, 0x6d, 0x61, 0x53, 0x68, 0x61,
-	0x72, 0x64, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 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, 0x23, 0x0a, 0x0d, 0x77,
-	0x61, 0x69, 0x74, 0x5f, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x03, 0x20, 0x01,
-	0x28, 0x09, 0x52, 0x0c, 0x77, 0x61, 0x69, 0x74, 0x50, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e,
-	0x12, 0x27, 0x0a, 0x0f, 0x69, 0x6e, 0x63, 0x6c, 0x75, 0x64, 0x65, 0x5f, 0x70, 0x72, 0x69, 0x6d,
-	0x61, 0x72, 0x79, 0x18, 0x04, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0e, 0x69, 0x6e, 0x63, 0x6c, 0x75,
-	0x64, 0x65, 0x50, 0x72, 0x69, 0x6d, 0x61, 0x72, 0x79, 0x12, 0x20, 0x0a, 0x0b, 0x63, 0x6f, 0x6e,
-	0x63, 0x75, 0x72, 0x72, 0x65, 0x6e, 0x63, 0x79, 0x18, 0x05, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0b,
-	0x63, 0x6f, 0x6e, 0x63, 0x75, 0x72, 0x72, 0x65, 0x6e, 0x63, 0x79, 0x22, 0x43, 0x0a, 0x19, 0x52,
-	0x65, 0x6c, 0x6f, 0x61, 0x64, 0x53, 0x63, 0x68, 0x65, 0x6d, 0x61, 0x53, 0x68, 0x61, 0x72, 0x64,
-	0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x26, 0x0a, 0x06, 0x65, 0x76, 0x65, 0x6e,
-	0x74, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x6c, 0x6f, 0x67, 0x75, 0x74,
-	0x69, 0x6c, 0x2e, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x52, 0x06, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x73,
-	0x22, 0x5b, 0x0a, 0x13, 0x52, 0x65, 0x6d, 0x6f, 0x76, 0x65, 0x42, 0x61, 0x63, 0x6b, 0x75, 0x70,
+	0x61, 0x72, 0x64, 0x12, 0x36, 0x0a, 0x0b, 0x6e, 0x65, 0x77, 0x5f, 0x70, 0x72, 0x69, 0x6d, 0x61,
+	0x72, 0x79, 0x18, 0x03, 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,
+	0x0a, 0x6e, 0x65, 0x77, 0x50, 0x72, 0x69, 0x6d, 0x61, 0x72, 0x79, 0x12, 0x3a, 0x0a, 0x0d, 0x61,
+	0x76, 0x6f, 0x69, 0x64, 0x5f, 0x70, 0x72, 0x69, 0x6d, 0x61, 0x72, 0x79, 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, 0x0c, 0x61, 0x76, 0x6f, 0x69, 0x64,
+	0x50, 0x72, 0x69, 0x6d, 0x61, 0x72, 0x79, 0x12, 0x44, 0x0a, 0x15, 0x77, 0x61, 0x69, 0x74, 0x5f,
+	0x72, 0x65, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x73, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74,
+	0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x76, 0x74, 0x74, 0x69, 0x6d, 0x65, 0x2e,
+	0x44, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x13, 0x77, 0x61, 0x69, 0x74, 0x52, 0x65,
+	0x70, 0x6c, 0x69, 0x63, 0x61, 0x73, 0x54, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x12, 0x4c, 0x0a,
+	0x19, 0x74, 0x6f, 0x6c, 0x65, 0x72, 0x61, 0x62, 0x6c, 0x65, 0x5f, 0x72, 0x65, 0x70, 0x6c, 0x69,
+	0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x6c, 0x61, 0x67, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0b,
+	0x32, 0x10, 0x2e, 0x76, 0x74, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x44, 0x75, 0x72, 0x61, 0x74, 0x69,
+	0x6f, 0x6e, 0x52, 0x17, 0x74, 0x6f, 0x6c, 0x65, 0x72, 0x61, 0x62, 0x6c, 0x65, 0x52, 0x65, 0x70,
+	0x6c, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x4c, 0x61, 0x67, 0x12, 0x3b, 0x0a, 0x1a, 0x61,
+	0x6c, 0x6c, 0x6f, 0x77, 0x5f, 0x63, 0x72, 0x6f, 0x73, 0x73, 0x5f, 0x63, 0x65, 0x6c, 0x6c, 0x5f,
+	0x70, 0x72, 0x6f, 0x6d, 0x6f, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x07, 0x20, 0x01, 0x28, 0x08, 0x52,
+	0x17, 0x61, 0x6c, 0x6c, 0x6f, 0x77, 0x43, 0x72, 0x6f, 0x73, 0x73, 0x43, 0x65, 0x6c, 0x6c, 0x50,
+	0x72, 0x6f, 0x6d, 0x6f, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x40, 0x0a, 0x10, 0x65, 0x78, 0x70, 0x65,
+	0x63, 0x74, 0x65, 0x64, 0x5f, 0x70, 0x72, 0x69, 0x6d, 0x61, 0x72, 0x79, 0x18, 0x08, 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, 0x0f, 0x65, 0x78, 0x70, 0x65, 0x63,
+	0x74, 0x65, 0x64, 0x50, 0x72, 0x69, 0x6d, 0x61, 0x72, 0x79, 0x22, 0xba, 0x01, 0x0a, 0x1c, 0x50,
+	0x6c, 0x61, 0x6e, 0x6e, 0x65, 0x64, 0x52, 0x65, 0x70, 0x61, 0x72, 0x65, 0x6e, 0x74, 0x53, 0x68,
+	0x61, 0x72, 0x64, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 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, 0x40, 0x0a,
+	0x10, 0x70, 0x72, 0x6f, 0x6d, 0x6f, 0x74, 0x65, 0x64, 0x5f, 0x70, 0x72, 0x69, 0x6d, 0x61, 0x72,
+	0x79, 0x18, 0x03, 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, 0x0f,
+	0x70, 0x72, 0x6f, 0x6d, 0x6f, 0x74, 0x65, 0x64, 0x50, 0x72, 0x69, 0x6d, 0x61, 0x72, 0x79, 0x12,
+	0x26, 0x0a, 0x06, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x73, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32,
+	0x0e, 0x2e, 0x6c, 0x6f, 0x67, 0x75, 0x74, 0x69, 0x6c, 0x2e, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x52,
+	0x06, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x73, 0x22, 0x74, 0x0a, 0x1b, 0x52, 0x65, 0x62, 0x75, 0x69,
+	0x6c, 0x64, 0x4b, 0x65, 0x79, 0x73, 0x70, 0x61, 0x63, 0x65, 0x47, 0x72, 0x61, 0x70, 0x68, 0x52,
+	0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 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, 0x63, 0x65, 0x6c, 0x6c, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28,
+	0x09, 0x52, 0x05, 0x63, 0x65, 0x6c, 0x6c, 0x73, 0x12, 0x23, 0x0a, 0x0d, 0x61, 0x6c, 0x6c, 0x6f,
+	0x77, 0x5f, 0x70, 0x61, 0x72, 0x74, 0x69, 0x61, 0x6c, 0x18, 0x03, 0x20, 0x01, 0x28, 0x08, 0x52,
+	0x0c, 0x61, 0x6c, 0x6c, 0x6f, 0x77, 0x50, 0x61, 0x72, 0x74, 0x69, 0x61, 0x6c, 0x22, 0x1e, 0x0a,
+	0x1c, 0x52, 0x65, 0x62, 0x75, 0x69, 0x6c, 0x64, 0x4b, 0x65, 0x79, 0x73, 0x70, 0x61, 0x63, 0x65,
+	0x47, 0x72, 0x61, 0x70, 0x68, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x32, 0x0a,
+	0x1a, 0x52, 0x65, 0x62, 0x75, 0x69, 0x6c, 0x64, 0x56, 0x53, 0x63, 0x68, 0x65, 0x6d, 0x61, 0x47,
+	0x72, 0x61, 0x70, 0x68, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x14, 0x0a, 0x05, 0x63,
+	0x65, 0x6c, 0x6c, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x09, 0x52, 0x05, 0x63, 0x65, 0x6c, 0x6c,
+	0x73, 0x22, 0x1d, 0x0a, 0x1b, 0x52, 0x65, 0x62, 0x75, 0x69, 0x6c, 0x64, 0x56, 0x53, 0x63, 0x68,
+	0x65, 0x6d, 0x61, 0x47, 0x72, 0x61, 0x70, 0x68, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65,
+	0x22, 0x4f, 0x0a, 0x13, 0x52, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x53, 0x74, 0x61, 0x74, 0x65,
+	0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x38, 0x0a, 0x0c, 0x74, 0x61, 0x62, 0x6c, 0x65,
+	0x74, 0x5f, 0x61, 0x6c, 0x69, 0x61, 0x73, 0x18, 0x01, 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, 0x16, 0x0a, 0x14, 0x52, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x53, 0x74, 0x61, 0x74,
+	0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x64, 0x0a, 0x1a, 0x52, 0x65, 0x66,
+	0x72, 0x65, 0x73, 0x68, 0x53, 0x74, 0x61, 0x74, 0x65, 0x42, 0x79, 0x53, 0x68, 0x61, 0x72, 0x64,
 	0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 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, 0x6e, 0x61, 0x6d,
-	0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x22, 0x16, 0x0a,
-	0x14, 0x52, 0x65, 0x6d, 0x6f, 0x76, 0x65, 0x42, 0x61, 0x63, 0x6b, 0x75, 0x70, 0x52, 0x65, 0x73,
-	0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x7f, 0x0a, 0x19, 0x52, 0x65, 0x6d, 0x6f, 0x76, 0x65, 0x4b,
-	0x65, 0x79, 0x73, 0x70, 0x61, 0x63, 0x65, 0x43, 0x65, 0x6c, 0x6c, 0x52, 0x65, 0x71, 0x75, 0x65,
-	0x73, 0x74, 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, 0x12,
-	0x0a, 0x04, 0x63, 0x65, 0x6c, 0x6c, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x63, 0x65,
-	0x6c, 0x6c, 0x12, 0x14, 0x0a, 0x05, 0x66, 0x6f, 0x72, 0x63, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28,
-	0x08, 0x52, 0x05, 0x66, 0x6f, 0x72, 0x63, 0x65, 0x12, 0x1c, 0x0a, 0x09, 0x72, 0x65, 0x63, 0x75,
-	0x72, 0x73, 0x69, 0x76, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x08, 0x52, 0x09, 0x72, 0x65, 0x63,
-	0x75, 0x72, 0x73, 0x69, 0x76, 0x65, 0x22, 0x1c, 0x0a, 0x1a, 0x52, 0x65, 0x6d, 0x6f, 0x76, 0x65,
-	0x4b, 0x65, 0x79, 0x73, 0x70, 0x61, 0x63, 0x65, 0x43, 0x65, 0x6c, 0x6c, 0x52, 0x65, 0x73, 0x70,
-	0x6f, 0x6e, 0x73, 0x65, 0x22, 0x9b, 0x01, 0x0a, 0x16, 0x52, 0x65, 0x6d, 0x6f, 0x76, 0x65, 0x53,
-	0x68, 0x61, 0x72, 0x64, 0x43, 0x65, 0x6c, 0x6c, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 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, 0x1d, 0x0a, 0x0a, 0x73,
-	0x68, 0x61, 0x72, 0x64, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52,
-	0x09, 0x73, 0x68, 0x61, 0x72, 0x64, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x63, 0x65,
-	0x6c, 0x6c, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x63, 0x65, 0x6c, 0x6c, 0x12, 0x14,
-	0x0a, 0x05, 0x66, 0x6f, 0x72, 0x63, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x08, 0x52, 0x05, 0x66,
-	0x6f, 0x72, 0x63, 0x65, 0x12, 0x1c, 0x0a, 0x09, 0x72, 0x65, 0x63, 0x75, 0x72, 0x73, 0x69, 0x76,
-	0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x08, 0x52, 0x09, 0x72, 0x65, 0x63, 0x75, 0x72, 0x73, 0x69,
-	0x76, 0x65, 0x22, 0x19, 0x0a, 0x17, 0x52, 0x65, 0x6d, 0x6f, 0x76, 0x65, 0x53, 0x68, 0x61, 0x72,
-	0x64, 0x43, 0x65, 0x6c, 0x6c, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x46, 0x0a,
-	0x15, 0x52, 0x65, 0x70, 0x61, 0x72, 0x65, 0x6e, 0x74, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x52,
-	0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x2d, 0x0a, 0x06, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x74,
-	0x18, 0x01, 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, 0x06, 0x74,
-	0x61, 0x62, 0x6c, 0x65, 0x74, 0x22, 0x7b, 0x0a, 0x16, 0x52, 0x65, 0x70, 0x61, 0x72, 0x65, 0x6e,
-	0x74, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12,
+	0x28, 0x09, 0x52, 0x05, 0x73, 0x68, 0x61, 0x72, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x63, 0x65, 0x6c,
+	0x6c, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x09, 0x52, 0x05, 0x63, 0x65, 0x6c, 0x6c, 0x73, 0x22,
+	0x83, 0x01, 0x0a, 0x1b, 0x52, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x53, 0x74, 0x61, 0x74, 0x65,
+	0x42, 0x79, 0x53, 0x68, 0x61, 0x72, 0x64, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12,
+	0x2c, 0x0a, 0x12, 0x69, 0x73, 0x5f, 0x70, 0x61, 0x72, 0x74, 0x69, 0x61, 0x6c, 0x5f, 0x72, 0x65,
+	0x66, 0x72, 0x65, 0x73, 0x68, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x10, 0x69, 0x73, 0x50,
+	0x61, 0x72, 0x74, 0x69, 0x61, 0x6c, 0x52, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x12, 0x36, 0x0a,
+	0x17, 0x70, 0x61, 0x72, 0x74, 0x69, 0x61, 0x6c, 0x5f, 0x72, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68,
+	0x5f, 0x64, 0x65, 0x74, 0x61, 0x69, 0x6c, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x15,
+	0x70, 0x61, 0x72, 0x74, 0x69, 0x61, 0x6c, 0x52, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x44, 0x65,
+	0x74, 0x61, 0x69, 0x6c, 0x73, 0x22, 0x4f, 0x0a, 0x13, 0x52, 0x65, 0x6c, 0x6f, 0x61, 0x64, 0x53,
+	0x63, 0x68, 0x65, 0x6d, 0x61, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x38, 0x0a, 0x0c,
+	0x74, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x5f, 0x61, 0x6c, 0x69, 0x61, 0x73, 0x18, 0x01, 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, 0x16, 0x0a, 0x14, 0x52, 0x65, 0x6c, 0x6f, 0x61, 0x64,
+	0x53, 0x63, 0x68, 0x65, 0x6d, 0x61, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0xa9,
+	0x01, 0x0a, 0x1b, 0x52, 0x65, 0x6c, 0x6f, 0x61, 0x64, 0x53, 0x63, 0x68, 0x65, 0x6d, 0x61, 0x4b,
+	0x65, 0x79, 0x73, 0x70, 0x61, 0x63, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 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, 0x23, 0x0a, 0x0d, 0x77, 0x61,
+	0x69, 0x74, 0x5f, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28,
+	0x09, 0x52, 0x0c, 0x77, 0x61, 0x69, 0x74, 0x50, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x12,
+	0x27, 0x0a, 0x0f, 0x69, 0x6e, 0x63, 0x6c, 0x75, 0x64, 0x65, 0x5f, 0x70, 0x72, 0x69, 0x6d, 0x61,
+	0x72, 0x79, 0x18, 0x03, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0e, 0x69, 0x6e, 0x63, 0x6c, 0x75, 0x64,
+	0x65, 0x50, 0x72, 0x69, 0x6d, 0x61, 0x72, 0x79, 0x12, 0x20, 0x0a, 0x0b, 0x63, 0x6f, 0x6e, 0x63,
+	0x75, 0x72, 0x72, 0x65, 0x6e, 0x63, 0x79, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0b, 0x63,
+	0x6f, 0x6e, 0x63, 0x75, 0x72, 0x72, 0x65, 0x6e, 0x63, 0x79, 0x22, 0x46, 0x0a, 0x1c, 0x52, 0x65,
+	0x6c, 0x6f, 0x61, 0x64, 0x53, 0x63, 0x68, 0x65, 0x6d, 0x61, 0x4b, 0x65, 0x79, 0x73, 0x70, 0x61,
+	0x63, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x26, 0x0a, 0x06, 0x65, 0x76,
+	0x65, 0x6e, 0x74, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x6c, 0x6f, 0x67,
+	0x75, 0x74, 0x69, 0x6c, 0x2e, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x52, 0x06, 0x65, 0x76, 0x65, 0x6e,
+	0x74, 0x73, 0x22, 0xbc, 0x01, 0x0a, 0x18, 0x52, 0x65, 0x6c, 0x6f, 0x61, 0x64, 0x53, 0x63, 0x68,
+	0x65, 0x6d, 0x61, 0x53, 0x68, 0x61, 0x72, 0x64, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 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, 0x2f, 0x0a, 0x07, 0x70, 0x72, 0x69, 0x6d, 0x61, 0x72, 0x79, 0x18, 0x03, 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, 0x07, 0x70, 0x72, 0x69, 0x6d, 0x61,
-	0x72, 0x79, 0x22, 0xd6, 0x04, 0x0a, 0x14, 0x52, 0x65, 0x73, 0x68, 0x61, 0x72, 0x64, 0x43, 0x72,
-	0x65, 0x61, 0x74, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x1a, 0x0a, 0x08, 0x77,
-	0x6f, 0x72, 0x6b, 0x66, 0x6c, 0x6f, 0x77, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x77,
-	0x6f, 0x72, 0x6b, 0x66, 0x6c, 0x6f, 0x77, 0x12, 0x1a, 0x0a, 0x08, 0x6b, 0x65, 0x79, 0x73, 0x70,
-	0x61, 0x63, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x6b, 0x65, 0x79, 0x73, 0x70,
-	0x61, 0x63, 0x65, 0x12, 0x23, 0x0a, 0x0d, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x5f, 0x73, 0x68,
-	0x61, 0x72, 0x64, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0c, 0x73, 0x6f, 0x75, 0x72,
-	0x63, 0x65, 0x53, 0x68, 0x61, 0x72, 0x64, 0x73, 0x12, 0x23, 0x0a, 0x0d, 0x74, 0x61, 0x72, 0x67,
-	0x65, 0x74, 0x5f, 0x73, 0x68, 0x61, 0x72, 0x64, 0x73, 0x18, 0x04, 0x20, 0x03, 0x28, 0x09, 0x52,
-	0x0c, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x53, 0x68, 0x61, 0x72, 0x64, 0x73, 0x12, 0x14, 0x0a,
-	0x05, 0x63, 0x65, 0x6c, 0x6c, 0x73, 0x18, 0x05, 0x20, 0x03, 0x28, 0x09, 0x52, 0x05, 0x63, 0x65,
-	0x6c, 0x6c, 0x73, 0x12, 0x37, 0x0a, 0x0c, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x5f, 0x74, 0x79,
-	0x70, 0x65, 0x73, 0x18, 0x06, 0x20, 0x03, 0x28, 0x0e, 0x32, 0x14, 0x2e, 0x74, 0x6f, 0x70, 0x6f,
-	0x64, 0x61, 0x74, 0x61, 0x2e, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x54, 0x79, 0x70, 0x65, 0x52,
-	0x0b, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x54, 0x79, 0x70, 0x65, 0x73, 0x12, 0x6c, 0x0a, 0x1b,
-	0x74, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x5f, 0x73, 0x65, 0x6c, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e,
-	0x5f, 0x70, 0x72, 0x65, 0x66, 0x65, 0x72, 0x65, 0x6e, 0x63, 0x65, 0x18, 0x07, 0x20, 0x01, 0x28,
-	0x0e, 0x32, 0x2c, 0x2e, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x6d, 0x61, 0x6e, 0x61, 0x67, 0x65,
-	0x72, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x53, 0x65, 0x6c, 0x65,
-	0x63, 0x74, 0x69, 0x6f, 0x6e, 0x50, 0x72, 0x65, 0x66, 0x65, 0x72, 0x65, 0x6e, 0x63, 0x65, 0x52,
-	0x19, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x53, 0x65, 0x6c, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e,
-	0x50, 0x72, 0x65, 0x66, 0x65, 0x72, 0x65, 0x6e, 0x63, 0x65, 0x12, 0x28, 0x0a, 0x10, 0x73, 0x6b,
-	0x69, 0x70, 0x5f, 0x73, 0x63, 0x68, 0x65, 0x6d, 0x61, 0x5f, 0x63, 0x6f, 0x70, 0x79, 0x18, 0x08,
-	0x20, 0x01, 0x28, 0x08, 0x52, 0x0e, 0x73, 0x6b, 0x69, 0x70, 0x53, 0x63, 0x68, 0x65, 0x6d, 0x61,
-	0x43, 0x6f, 0x70, 0x79, 0x12, 0x15, 0x0a, 0x06, 0x6f, 0x6e, 0x5f, 0x64, 0x64, 0x6c, 0x18, 0x09,
-	0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x6f, 0x6e, 0x44, 0x64, 0x6c, 0x12, 0x26, 0x0a, 0x0f, 0x73,
-	0x74, 0x6f, 0x70, 0x5f, 0x61, 0x66, 0x74, 0x65, 0x72, 0x5f, 0x63, 0x6f, 0x70, 0x79, 0x18, 0x0a,
-	0x20, 0x01, 0x28, 0x08, 0x52, 0x0d, 0x73, 0x74, 0x6f, 0x70, 0x41, 0x66, 0x74, 0x65, 0x72, 0x43,
-	0x6f, 0x70, 0x79, 0x12, 0x30, 0x0a, 0x14, 0x64, 0x65, 0x66, 0x65, 0x72, 0x5f, 0x73, 0x65, 0x63,
-	0x6f, 0x6e, 0x64, 0x61, 0x72, 0x79, 0x5f, 0x6b, 0x65, 0x79, 0x73, 0x18, 0x0b, 0x20, 0x01, 0x28,
-	0x08, 0x52, 0x12, 0x64, 0x65, 0x66, 0x65, 0x72, 0x53, 0x65, 0x63, 0x6f, 0x6e, 0x64, 0x61, 0x72,
-	0x79, 0x4b, 0x65, 0x79, 0x73, 0x12, 0x1d, 0x0a, 0x0a, 0x61, 0x75, 0x74, 0x6f, 0x5f, 0x73, 0x74,
-	0x61, 0x72, 0x74, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x08, 0x52, 0x09, 0x61, 0x75, 0x74, 0x6f, 0x53,
-	0x74, 0x61, 0x72, 0x74, 0x12, 0x45, 0x0a, 0x10, 0x77, 0x6f, 0x72, 0x6b, 0x66, 0x6c, 0x6f, 0x77,
-	0x5f, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x0d, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a,
-	0x2e, 0x76, 0x74, 0x63, 0x74, 0x6c, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x57, 0x6f, 0x72, 0x6b, 0x66,
-	0x6c, 0x6f, 0x77, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x52, 0x0f, 0x77, 0x6f, 0x72, 0x6b,
-	0x66, 0x6c, 0x6f, 0x77, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x22, 0xb8, 0x02, 0x0a, 0x18,
-	0x52, 0x65, 0x73, 0x74, 0x6f, 0x72, 0x65, 0x46, 0x72, 0x6f, 0x6d, 0x42, 0x61, 0x63, 0x6b, 0x75,
-	0x70, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x38, 0x0a, 0x0c, 0x74, 0x61, 0x62, 0x6c,
-	0x65, 0x74, 0x5f, 0x61, 0x6c, 0x69, 0x61, 0x73, 0x18, 0x01, 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, 0x2d, 0x0a, 0x0b, 0x62, 0x61, 0x63, 0x6b, 0x75, 0x70, 0x5f, 0x74, 0x69, 0x6d,
-	0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0c, 0x2e, 0x76, 0x74, 0x74, 0x69, 0x6d, 0x65,
-	0x2e, 0x54, 0x69, 0x6d, 0x65, 0x52, 0x0a, 0x62, 0x61, 0x63, 0x6b, 0x75, 0x70, 0x54, 0x69, 0x6d,
-	0x65, 0x12, 0x24, 0x0a, 0x0e, 0x72, 0x65, 0x73, 0x74, 0x6f, 0x72, 0x65, 0x5f, 0x74, 0x6f, 0x5f,
-	0x70, 0x6f, 0x73, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x72, 0x65, 0x73, 0x74, 0x6f,
-	0x72, 0x65, 0x54, 0x6f, 0x50, 0x6f, 0x73, 0x12, 0x17, 0x0a, 0x07, 0x64, 0x72, 0x79, 0x5f, 0x72,
-	0x75, 0x6e, 0x18, 0x04, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x64, 0x72, 0x79, 0x52, 0x75, 0x6e,
-	0x12, 0x3e, 0x0a, 0x14, 0x72, 0x65, 0x73, 0x74, 0x6f, 0x72, 0x65, 0x5f, 0x74, 0x6f, 0x5f, 0x74,
-	0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0c,
-	0x2e, 0x76, 0x74, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x54, 0x69, 0x6d, 0x65, 0x52, 0x12, 0x72, 0x65,
-	0x73, 0x74, 0x6f, 0x72, 0x65, 0x54, 0x6f, 0x54, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70,
-	0x12, 0x34, 0x0a, 0x16, 0x61, 0x6c, 0x6c, 0x6f, 0x77, 0x65, 0x64, 0x5f, 0x62, 0x61, 0x63, 0x6b,
-	0x75, 0x70, 0x5f, 0x65, 0x6e, 0x67, 0x69, 0x6e, 0x65, 0x73, 0x18, 0x06, 0x20, 0x03, 0x28, 0x09,
-	0x52, 0x14, 0x61, 0x6c, 0x6c, 0x6f, 0x77, 0x65, 0x64, 0x42, 0x61, 0x63, 0x6b, 0x75, 0x70, 0x45,
-	0x6e, 0x67, 0x69, 0x6e, 0x65, 0x73, 0x22, 0xad, 0x01, 0x0a, 0x19, 0x52, 0x65, 0x73, 0x74, 0x6f,
-	0x72, 0x65, 0x46, 0x72, 0x6f, 0x6d, 0x42, 0x61, 0x63, 0x6b, 0x75, 0x70, 0x52, 0x65, 0x73, 0x70,
-	0x6f, 0x6e, 0x73, 0x65, 0x12, 0x38, 0x0a, 0x0c, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x5f, 0x61,
-	0x6c, 0x69, 0x61, 0x73, 0x18, 0x01, 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, 0x1a,
-	0x0a, 0x08, 0x6b, 0x65, 0x79, 0x73, 0x70, 0x61, 0x63, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09,
-	0x52, 0x08, 0x6b, 0x65, 0x79, 0x73, 0x70, 0x61, 0x63, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x68,
-	0x61, 0x72, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x73, 0x68, 0x61, 0x72, 0x64,
-	0x12, 0x24, 0x0a, 0x05, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32,
-	0x0e, 0x2e, 0x6c, 0x6f, 0x67, 0x75, 0x74, 0x69, 0x6c, 0x2e, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x52,
-	0x05, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x22, 0x4d, 0x0a, 0x1b, 0x52, 0x65, 0x74, 0x72, 0x79, 0x53,
-	0x63, 0x68, 0x65, 0x6d, 0x61, 0x4d, 0x69, 0x67, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65,
+	0x64, 0x12, 0x23, 0x0a, 0x0d, 0x77, 0x61, 0x69, 0x74, 0x5f, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69,
+	0x6f, 0x6e, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x77, 0x61, 0x69, 0x74, 0x50, 0x6f,
+	0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x27, 0x0a, 0x0f, 0x69, 0x6e, 0x63, 0x6c, 0x75, 0x64,
+	0x65, 0x5f, 0x70, 0x72, 0x69, 0x6d, 0x61, 0x72, 0x79, 0x18, 0x04, 0x20, 0x01, 0x28, 0x08, 0x52,
+	0x0e, 0x69, 0x6e, 0x63, 0x6c, 0x75, 0x64, 0x65, 0x50, 0x72, 0x69, 0x6d, 0x61, 0x72, 0x79, 0x12,
+	0x20, 0x0a, 0x0b, 0x63, 0x6f, 0x6e, 0x63, 0x75, 0x72, 0x72, 0x65, 0x6e, 0x63, 0x79, 0x18, 0x05,
+	0x20, 0x01, 0x28, 0x05, 0x52, 0x0b, 0x63, 0x6f, 0x6e, 0x63, 0x75, 0x72, 0x72, 0x65, 0x6e, 0x63,
+	0x79, 0x22, 0x43, 0x0a, 0x19, 0x52, 0x65, 0x6c, 0x6f, 0x61, 0x64, 0x53, 0x63, 0x68, 0x65, 0x6d,
+	0x61, 0x53, 0x68, 0x61, 0x72, 0x64, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x26,
+	0x0a, 0x06, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0e,
+	0x2e, 0x6c, 0x6f, 0x67, 0x75, 0x74, 0x69, 0x6c, 0x2e, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x52, 0x06,
+	0x65, 0x76, 0x65, 0x6e, 0x74, 0x73, 0x22, 0x5b, 0x0a, 0x13, 0x52, 0x65, 0x6d, 0x6f, 0x76, 0x65,
+	0x42, 0x61, 0x63, 0x6b, 0x75, 0x70, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 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, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e,
+	0x61, 0x6d, 0x65, 0x22, 0x16, 0x0a, 0x14, 0x52, 0x65, 0x6d, 0x6f, 0x76, 0x65, 0x42, 0x61, 0x63,
+	0x6b, 0x75, 0x70, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x7f, 0x0a, 0x19, 0x52,
+	0x65, 0x6d, 0x6f, 0x76, 0x65, 0x4b, 0x65, 0x79, 0x73, 0x70, 0x61, 0x63, 0x65, 0x43, 0x65, 0x6c,
+	0x6c, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 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, 0x12, 0x0a, 0x04, 0x63, 0x65, 0x6c, 0x6c, 0x18, 0x02, 0x20, 0x01,
+	0x28, 0x09, 0x52, 0x04, 0x63, 0x65, 0x6c, 0x6c, 0x12, 0x14, 0x0a, 0x05, 0x66, 0x6f, 0x72, 0x63,
+	0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x08, 0x52, 0x05, 0x66, 0x6f, 0x72, 0x63, 0x65, 0x12, 0x1c,
+	0x0a, 0x09, 0x72, 0x65, 0x63, 0x75, 0x72, 0x73, 0x69, 0x76, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28,
+	0x08, 0x52, 0x09, 0x72, 0x65, 0x63, 0x75, 0x72, 0x73, 0x69, 0x76, 0x65, 0x22, 0x1c, 0x0a, 0x1a,
+	0x52, 0x65, 0x6d, 0x6f, 0x76, 0x65, 0x4b, 0x65, 0x79, 0x73, 0x70, 0x61, 0x63, 0x65, 0x43, 0x65,
+	0x6c, 0x6c, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x9b, 0x01, 0x0a, 0x16, 0x52,
+	0x65, 0x6d, 0x6f, 0x76, 0x65, 0x53, 0x68, 0x61, 0x72, 0x64, 0x43, 0x65, 0x6c, 0x6c, 0x52, 0x65,
 	0x71, 0x75, 0x65, 0x73, 0x74, 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, 0x12, 0x0a, 0x04, 0x75, 0x75, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52,
-	0x04, 0x75, 0x75, 0x69, 0x64, 0x22, 0xdd, 0x01, 0x0a, 0x1c, 0x52, 0x65, 0x74, 0x72, 0x79, 0x53,
-	0x63, 0x68, 0x65, 0x6d, 0x61, 0x4d, 0x69, 0x67, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65,
-	0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x75, 0x0a, 0x16, 0x72, 0x6f, 0x77, 0x73, 0x5f, 0x61,
-	0x66, 0x66, 0x65, 0x63, 0x74, 0x65, 0x64, 0x5f, 0x62, 0x79, 0x5f, 0x73, 0x68, 0x61, 0x72, 0x64,
-	0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x40, 0x2e, 0x76, 0x74, 0x63, 0x74, 0x6c, 0x64, 0x61,
-	0x74, 0x61, 0x2e, 0x52, 0x65, 0x74, 0x72, 0x79, 0x53, 0x63, 0x68, 0x65, 0x6d, 0x61, 0x4d, 0x69,
-	0x67, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x2e,
-	0x52, 0x6f, 0x77, 0x73, 0x41, 0x66, 0x66, 0x65, 0x63, 0x74, 0x65, 0x64, 0x42, 0x79, 0x53, 0x68,
-	0x61, 0x72, 0x64, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x13, 0x72, 0x6f, 0x77, 0x73, 0x41, 0x66,
-	0x66, 0x65, 0x63, 0x74, 0x65, 0x64, 0x42, 0x79, 0x53, 0x68, 0x61, 0x72, 0x64, 0x1a, 0x46, 0x0a,
-	0x18, 0x52, 0x6f, 0x77, 0x73, 0x41, 0x66, 0x66, 0x65, 0x63, 0x74, 0x65, 0x64, 0x42, 0x79, 0x53,
-	0x68, 0x61, 0x72, 0x64, 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, 0x04, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75,
-	0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x51, 0x0a, 0x15, 0x52, 0x75, 0x6e, 0x48, 0x65, 0x61, 0x6c,
-	0x74, 0x68, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x38,
+	0x65, 0x12, 0x1d, 0x0a, 0x0a, 0x73, 0x68, 0x61, 0x72, 0x64, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x18,
+	0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x73, 0x68, 0x61, 0x72, 0x64, 0x4e, 0x61, 0x6d, 0x65,
+	0x12, 0x12, 0x0a, 0x04, 0x63, 0x65, 0x6c, 0x6c, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04,
+	0x63, 0x65, 0x6c, 0x6c, 0x12, 0x14, 0x0a, 0x05, 0x66, 0x6f, 0x72, 0x63, 0x65, 0x18, 0x04, 0x20,
+	0x01, 0x28, 0x08, 0x52, 0x05, 0x66, 0x6f, 0x72, 0x63, 0x65, 0x12, 0x1c, 0x0a, 0x09, 0x72, 0x65,
+	0x63, 0x75, 0x72, 0x73, 0x69, 0x76, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x08, 0x52, 0x09, 0x72,
+	0x65, 0x63, 0x75, 0x72, 0x73, 0x69, 0x76, 0x65, 0x22, 0x19, 0x0a, 0x17, 0x52, 0x65, 0x6d, 0x6f,
+	0x76, 0x65, 0x53, 0x68, 0x61, 0x72, 0x64, 0x43, 0x65, 0x6c, 0x6c, 0x52, 0x65, 0x73, 0x70, 0x6f,
+	0x6e, 0x73, 0x65, 0x22, 0x46, 0x0a, 0x15, 0x52, 0x65, 0x70, 0x61, 0x72, 0x65, 0x6e, 0x74, 0x54,
+	0x61, 0x62, 0x6c, 0x65, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x2d, 0x0a, 0x06,
+	0x74, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x18, 0x01, 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, 0x06, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x22, 0x7b, 0x0a, 0x16, 0x52,
+	0x65, 0x70, 0x61, 0x72, 0x65, 0x6e, 0x74, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x52, 0x65, 0x73,
+	0x70, 0x6f, 0x6e, 0x73, 0x65, 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, 0x2f, 0x0a, 0x07, 0x70, 0x72, 0x69, 0x6d, 0x61,
+	0x72, 0x79, 0x18, 0x03, 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,
+	0x07, 0x70, 0x72, 0x69, 0x6d, 0x61, 0x72, 0x79, 0x22, 0xd6, 0x04, 0x0a, 0x14, 0x52, 0x65, 0x73,
+	0x68, 0x61, 0x72, 0x64, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73,
+	0x74, 0x12, 0x1a, 0x0a, 0x08, 0x77, 0x6f, 0x72, 0x6b, 0x66, 0x6c, 0x6f, 0x77, 0x18, 0x01, 0x20,
+	0x01, 0x28, 0x09, 0x52, 0x08, 0x77, 0x6f, 0x72, 0x6b, 0x66, 0x6c, 0x6f, 0x77, 0x12, 0x1a, 0x0a,
+	0x08, 0x6b, 0x65, 0x79, 0x73, 0x70, 0x61, 0x63, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52,
+	0x08, 0x6b, 0x65, 0x79, 0x73, 0x70, 0x61, 0x63, 0x65, 0x12, 0x23, 0x0a, 0x0d, 0x73, 0x6f, 0x75,
+	0x72, 0x63, 0x65, 0x5f, 0x73, 0x68, 0x61, 0x72, 0x64, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x09,
+	0x52, 0x0c, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x53, 0x68, 0x61, 0x72, 0x64, 0x73, 0x12, 0x23,
+	0x0a, 0x0d, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x5f, 0x73, 0x68, 0x61, 0x72, 0x64, 0x73, 0x18,
+	0x04, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0c, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x53, 0x68, 0x61,
+	0x72, 0x64, 0x73, 0x12, 0x14, 0x0a, 0x05, 0x63, 0x65, 0x6c, 0x6c, 0x73, 0x18, 0x05, 0x20, 0x03,
+	0x28, 0x09, 0x52, 0x05, 0x63, 0x65, 0x6c, 0x6c, 0x73, 0x12, 0x37, 0x0a, 0x0c, 0x74, 0x61, 0x62,
+	0x6c, 0x65, 0x74, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x73, 0x18, 0x06, 0x20, 0x03, 0x28, 0x0e, 0x32,
+	0x14, 0x2e, 0x74, 0x6f, 0x70, 0x6f, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x54, 0x61, 0x62, 0x6c, 0x65,
+	0x74, 0x54, 0x79, 0x70, 0x65, 0x52, 0x0b, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x54, 0x79, 0x70,
+	0x65, 0x73, 0x12, 0x6c, 0x0a, 0x1b, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x5f, 0x73, 0x65, 0x6c,
+	0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x70, 0x72, 0x65, 0x66, 0x65, 0x72, 0x65, 0x6e, 0x63,
+	0x65, 0x18, 0x07, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x2c, 0x2e, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x74,
+	0x6d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x72, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x54, 0x61, 0x62, 0x6c,
+	0x65, 0x74, 0x53, 0x65, 0x6c, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x50, 0x72, 0x65, 0x66, 0x65,
+	0x72, 0x65, 0x6e, 0x63, 0x65, 0x52, 0x19, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x53, 0x65, 0x6c,
+	0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x50, 0x72, 0x65, 0x66, 0x65, 0x72, 0x65, 0x6e, 0x63, 0x65,
+	0x12, 0x28, 0x0a, 0x10, 0x73, 0x6b, 0x69, 0x70, 0x5f, 0x73, 0x63, 0x68, 0x65, 0x6d, 0x61, 0x5f,
+	0x63, 0x6f, 0x70, 0x79, 0x18, 0x08, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0e, 0x73, 0x6b, 0x69, 0x70,
+	0x53, 0x63, 0x68, 0x65, 0x6d, 0x61, 0x43, 0x6f, 0x70, 0x79, 0x12, 0x15, 0x0a, 0x06, 0x6f, 0x6e,
+	0x5f, 0x64, 0x64, 0x6c, 0x18, 0x09, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x6f, 0x6e, 0x44, 0x64,
+	0x6c, 0x12, 0x26, 0x0a, 0x0f, 0x73, 0x74, 0x6f, 0x70, 0x5f, 0x61, 0x66, 0x74, 0x65, 0x72, 0x5f,
+	0x63, 0x6f, 0x70, 0x79, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0d, 0x73, 0x74, 0x6f, 0x70,
+	0x41, 0x66, 0x74, 0x65, 0x72, 0x43, 0x6f, 0x70, 0x79, 0x12, 0x30, 0x0a, 0x14, 0x64, 0x65, 0x66,
+	0x65, 0x72, 0x5f, 0x73, 0x65, 0x63, 0x6f, 0x6e, 0x64, 0x61, 0x72, 0x79, 0x5f, 0x6b, 0x65, 0x79,
+	0x73, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x08, 0x52, 0x12, 0x64, 0x65, 0x66, 0x65, 0x72, 0x53, 0x65,
+	0x63, 0x6f, 0x6e, 0x64, 0x61, 0x72, 0x79, 0x4b, 0x65, 0x79, 0x73, 0x12, 0x1d, 0x0a, 0x0a, 0x61,
+	0x75, 0x74, 0x6f, 0x5f, 0x73, 0x74, 0x61, 0x72, 0x74, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x08, 0x52,
+	0x09, 0x61, 0x75, 0x74, 0x6f, 0x53, 0x74, 0x61, 0x72, 0x74, 0x12, 0x45, 0x0a, 0x10, 0x77, 0x6f,
+	0x72, 0x6b, 0x66, 0x6c, 0x6f, 0x77, 0x5f, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x0d,
+	0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x76, 0x74, 0x63, 0x74, 0x6c, 0x64, 0x61, 0x74, 0x61,
+	0x2e, 0x57, 0x6f, 0x72, 0x6b, 0x66, 0x6c, 0x6f, 0x77, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73,
+	0x52, 0x0f, 0x77, 0x6f, 0x72, 0x6b, 0x66, 0x6c, 0x6f, 0x77, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e,
+	0x73, 0x22, 0xb8, 0x02, 0x0a, 0x18, 0x52, 0x65, 0x73, 0x74, 0x6f, 0x72, 0x65, 0x46, 0x72, 0x6f,
+	0x6d, 0x42, 0x61, 0x63, 0x6b, 0x75, 0x70, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x38,
 	0x0a, 0x0c, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x5f, 0x61, 0x6c, 0x69, 0x61, 0x73, 0x18, 0x01,
 	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, 0x18, 0x0a, 0x16, 0x52, 0x75, 0x6e, 0x48,
-	0x65, 0x61, 0x6c, 0x74, 0x68, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e,
-	0x73, 0x65, 0x22, 0x6d, 0x0a, 0x22, 0x53, 0x65, 0x74, 0x4b, 0x65, 0x79, 0x73, 0x70, 0x61, 0x63,
-	0x65, 0x44, 0x75, 0x72, 0x61, 0x62, 0x69, 0x6c, 0x69, 0x74, 0x79, 0x50, 0x6f, 0x6c, 0x69, 0x63,
-	0x79, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 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, 0x2b, 0x0a, 0x11, 0x64, 0x75, 0x72, 0x61, 0x62, 0x69, 0x6c, 0x69,
-	0x74, 0x79, 0x5f, 0x70, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52,
-	0x10, 0x64, 0x75, 0x72, 0x61, 0x62, 0x69, 0x6c, 0x69, 0x74, 0x79, 0x50, 0x6f, 0x6c, 0x69, 0x63,
-	0x79, 0x22, 0x55, 0x0a, 0x23, 0x53, 0x65, 0x74, 0x4b, 0x65, 0x79, 0x73, 0x70, 0x61, 0x63, 0x65,
-	0x44, 0x75, 0x72, 0x61, 0x62, 0x69, 0x6c, 0x69, 0x74, 0x79, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79,
-	0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x2e, 0x0a, 0x08, 0x6b, 0x65, 0x79, 0x73,
-	0x70, 0x61, 0x63, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x74, 0x6f, 0x70,
-	0x6f, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x4b, 0x65, 0x79, 0x73, 0x70, 0x61, 0x63, 0x65, 0x52, 0x08,
-	0x6b, 0x65, 0x79, 0x73, 0x70, 0x61, 0x63, 0x65, 0x22, 0x5e, 0x0a, 0x1e, 0x53, 0x65, 0x74, 0x4b,
-	0x65, 0x79, 0x73, 0x70, 0x61, 0x63, 0x65, 0x53, 0x68, 0x61, 0x72, 0x64, 0x69, 0x6e, 0x67, 0x49,
-	0x6e, 0x66, 0x6f, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 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, 0x66, 0x6f, 0x72, 0x63, 0x65, 0x18,
-	0x04, 0x20, 0x01, 0x28, 0x08, 0x52, 0x05, 0x66, 0x6f, 0x72, 0x63, 0x65, 0x4a, 0x04, 0x08, 0x02,
-	0x10, 0x03, 0x4a, 0x04, 0x08, 0x03, 0x10, 0x04, 0x22, 0x51, 0x0a, 0x1f, 0x53, 0x65, 0x74, 0x4b,
-	0x65, 0x79, 0x73, 0x70, 0x61, 0x63, 0x65, 0x53, 0x68, 0x61, 0x72, 0x64, 0x69, 0x6e, 0x67, 0x49,
-	0x6e, 0x66, 0x6f, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x2e, 0x0a, 0x08, 0x6b,
-	0x65, 0x79, 0x73, 0x70, 0x61, 0x63, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x12, 0x2e,
-	0x74, 0x6f, 0x70, 0x6f, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x4b, 0x65, 0x79, 0x73, 0x70, 0x61, 0x63,
-	0x65, 0x52, 0x08, 0x6b, 0x65, 0x79, 0x73, 0x70, 0x61, 0x63, 0x65, 0x22, 0x72, 0x0a, 0x1f, 0x53,
-	0x65, 0x74, 0x53, 0x68, 0x61, 0x72, 0x64, 0x49, 0x73, 0x50, 0x72, 0x69, 0x6d, 0x61, 0x72, 0x79,
-	0x53, 0x65, 0x72, 0x76, 0x69, 0x6e, 0x67, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x1a,
+	0x6c, 0x65, 0x74, 0x41, 0x6c, 0x69, 0x61, 0x73, 0x12, 0x2d, 0x0a, 0x0b, 0x62, 0x61, 0x63, 0x6b,
+	0x75, 0x70, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0c, 0x2e,
+	0x76, 0x74, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x54, 0x69, 0x6d, 0x65, 0x52, 0x0a, 0x62, 0x61, 0x63,
+	0x6b, 0x75, 0x70, 0x54, 0x69, 0x6d, 0x65, 0x12, 0x24, 0x0a, 0x0e, 0x72, 0x65, 0x73, 0x74, 0x6f,
+	0x72, 0x65, 0x5f, 0x74, 0x6f, 0x5f, 0x70, 0x6f, 0x73, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52,
+	0x0c, 0x72, 0x65, 0x73, 0x74, 0x6f, 0x72, 0x65, 0x54, 0x6f, 0x50, 0x6f, 0x73, 0x12, 0x17, 0x0a,
+	0x07, 0x64, 0x72, 0x79, 0x5f, 0x72, 0x75, 0x6e, 0x18, 0x04, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06,
+	0x64, 0x72, 0x79, 0x52, 0x75, 0x6e, 0x12, 0x3e, 0x0a, 0x14, 0x72, 0x65, 0x73, 0x74, 0x6f, 0x72,
+	0x65, 0x5f, 0x74, 0x6f, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x18, 0x05,
+	0x20, 0x01, 0x28, 0x0b, 0x32, 0x0c, 0x2e, 0x76, 0x74, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x54, 0x69,
+	0x6d, 0x65, 0x52, 0x12, 0x72, 0x65, 0x73, 0x74, 0x6f, 0x72, 0x65, 0x54, 0x6f, 0x54, 0x69, 0x6d,
+	0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x12, 0x34, 0x0a, 0x16, 0x61, 0x6c, 0x6c, 0x6f, 0x77, 0x65,
+	0x64, 0x5f, 0x62, 0x61, 0x63, 0x6b, 0x75, 0x70, 0x5f, 0x65, 0x6e, 0x67, 0x69, 0x6e, 0x65, 0x73,
+	0x18, 0x06, 0x20, 0x03, 0x28, 0x09, 0x52, 0x14, 0x61, 0x6c, 0x6c, 0x6f, 0x77, 0x65, 0x64, 0x42,
+	0x61, 0x63, 0x6b, 0x75, 0x70, 0x45, 0x6e, 0x67, 0x69, 0x6e, 0x65, 0x73, 0x22, 0xad, 0x01, 0x0a,
+	0x19, 0x52, 0x65, 0x73, 0x74, 0x6f, 0x72, 0x65, 0x46, 0x72, 0x6f, 0x6d, 0x42, 0x61, 0x63, 0x6b,
+	0x75, 0x70, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x38, 0x0a, 0x0c, 0x74, 0x61,
+	0x62, 0x6c, 0x65, 0x74, 0x5f, 0x61, 0x6c, 0x69, 0x61, 0x73, 0x18, 0x01, 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, 0x1a, 0x0a, 0x08, 0x6b, 0x65, 0x79, 0x73, 0x70, 0x61, 0x63, 0x65,
+	0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x6b, 0x65, 0x79, 0x73, 0x70, 0x61, 0x63, 0x65,
+	0x12, 0x14, 0x0a, 0x05, 0x73, 0x68, 0x61, 0x72, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52,
+	0x05, 0x73, 0x68, 0x61, 0x72, 0x64, 0x12, 0x24, 0x0a, 0x05, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x18,
+	0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x6c, 0x6f, 0x67, 0x75, 0x74, 0x69, 0x6c, 0x2e,
+	0x45, 0x76, 0x65, 0x6e, 0x74, 0x52, 0x05, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x22, 0x4d, 0x0a, 0x1b,
+	0x52, 0x65, 0x74, 0x72, 0x79, 0x53, 0x63, 0x68, 0x65, 0x6d, 0x61, 0x4d, 0x69, 0x67, 0x72, 0x61,
+	0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 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, 0x12, 0x0a, 0x04, 0x75, 0x75, 0x69, 0x64, 0x18,
+	0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x75, 0x75, 0x69, 0x64, 0x22, 0xdd, 0x01, 0x0a, 0x1c,
+	0x52, 0x65, 0x74, 0x72, 0x79, 0x53, 0x63, 0x68, 0x65, 0x6d, 0x61, 0x4d, 0x69, 0x67, 0x72, 0x61,
+	0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x75, 0x0a, 0x16,
+	0x72, 0x6f, 0x77, 0x73, 0x5f, 0x61, 0x66, 0x66, 0x65, 0x63, 0x74, 0x65, 0x64, 0x5f, 0x62, 0x79,
+	0x5f, 0x73, 0x68, 0x61, 0x72, 0x64, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x40, 0x2e, 0x76,
+	0x74, 0x63, 0x74, 0x6c, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x52, 0x65, 0x74, 0x72, 0x79, 0x53, 0x63,
+	0x68, 0x65, 0x6d, 0x61, 0x4d, 0x69, 0x67, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73,
+	0x70, 0x6f, 0x6e, 0x73, 0x65, 0x2e, 0x52, 0x6f, 0x77, 0x73, 0x41, 0x66, 0x66, 0x65, 0x63, 0x74,
+	0x65, 0x64, 0x42, 0x79, 0x53, 0x68, 0x61, 0x72, 0x64, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x13,
+	0x72, 0x6f, 0x77, 0x73, 0x41, 0x66, 0x66, 0x65, 0x63, 0x74, 0x65, 0x64, 0x42, 0x79, 0x53, 0x68,
+	0x61, 0x72, 0x64, 0x1a, 0x46, 0x0a, 0x18, 0x52, 0x6f, 0x77, 0x73, 0x41, 0x66, 0x66, 0x65, 0x63,
+	0x74, 0x65, 0x64, 0x42, 0x79, 0x53, 0x68, 0x61, 0x72, 0x64, 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, 0x04,
+	0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x51, 0x0a, 0x15, 0x52,
+	0x75, 0x6e, 0x48, 0x65, 0x61, 0x6c, 0x74, 0x68, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x52, 0x65, 0x71,
+	0x75, 0x65, 0x73, 0x74, 0x12, 0x38, 0x0a, 0x0c, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x5f, 0x61,
+	0x6c, 0x69, 0x61, 0x73, 0x18, 0x01, 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, 0x18,
+	0x0a, 0x16, 0x52, 0x75, 0x6e, 0x48, 0x65, 0x61, 0x6c, 0x74, 0x68, 0x43, 0x68, 0x65, 0x63, 0x6b,
+	0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x6d, 0x0a, 0x22, 0x53, 0x65, 0x74, 0x4b,
+	0x65, 0x79, 0x73, 0x70, 0x61, 0x63, 0x65, 0x44, 0x75, 0x72, 0x61, 0x62, 0x69, 0x6c, 0x69, 0x74,
+	0x79, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 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, 0x1d, 0x0a, 0x0a, 0x69, 0x73, 0x5f, 0x73, 0x65, 0x72, 0x76, 0x69, 0x6e, 0x67, 0x18, 0x03,
-	0x20, 0x01, 0x28, 0x08, 0x52, 0x09, 0x69, 0x73, 0x53, 0x65, 0x72, 0x76, 0x69, 0x6e, 0x67, 0x22,
-	0x49, 0x0a, 0x20, 0x53, 0x65, 0x74, 0x53, 0x68, 0x61, 0x72, 0x64, 0x49, 0x73, 0x50, 0x72, 0x69,
-	0x6d, 0x61, 0x72, 0x79, 0x53, 0x65, 0x72, 0x76, 0x69, 0x6e, 0x67, 0x52, 0x65, 0x73, 0x70, 0x6f,
-	0x6e, 0x73, 0x65, 0x12, 0x25, 0x0a, 0x05, 0x73, 0x68, 0x61, 0x72, 0x64, 0x18, 0x01, 0x20, 0x01,
-	0x28, 0x0b, 0x32, 0x0f, 0x2e, 0x74, 0x6f, 0x70, 0x6f, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x53, 0x68,
-	0x61, 0x72, 0x64, 0x52, 0x05, 0x73, 0x68, 0x61, 0x72, 0x64, 0x22, 0x8e, 0x02, 0x0a, 0x1c, 0x53,
-	0x65, 0x74, 0x53, 0x68, 0x61, 0x72, 0x64, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x43, 0x6f, 0x6e,
-	0x74, 0x72, 0x6f, 0x6c, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x1a, 0x0a, 0x08, 0x6b,
+	0x52, 0x08, 0x6b, 0x65, 0x79, 0x73, 0x70, 0x61, 0x63, 0x65, 0x12, 0x2b, 0x0a, 0x11, 0x64, 0x75,
+	0x72, 0x61, 0x62, 0x69, 0x6c, 0x69, 0x74, 0x79, 0x5f, 0x70, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x18,
+	0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x10, 0x64, 0x75, 0x72, 0x61, 0x62, 0x69, 0x6c, 0x69, 0x74,
+	0x79, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x22, 0x55, 0x0a, 0x23, 0x53, 0x65, 0x74, 0x4b, 0x65,
+	0x79, 0x73, 0x70, 0x61, 0x63, 0x65, 0x44, 0x75, 0x72, 0x61, 0x62, 0x69, 0x6c, 0x69, 0x74, 0x79,
+	0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x2e,
+	0x0a, 0x08, 0x6b, 0x65, 0x79, 0x73, 0x70, 0x61, 0x63, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b,
+	0x32, 0x12, 0x2e, 0x74, 0x6f, 0x70, 0x6f, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x4b, 0x65, 0x79, 0x73,
+	0x70, 0x61, 0x63, 0x65, 0x52, 0x08, 0x6b, 0x65, 0x79, 0x73, 0x70, 0x61, 0x63, 0x65, 0x22, 0x5e,
+	0x0a, 0x1e, 0x53, 0x65, 0x74, 0x4b, 0x65, 0x79, 0x73, 0x70, 0x61, 0x63, 0x65, 0x53, 0x68, 0x61,
+	0x72, 0x64, 0x69, 0x6e, 0x67, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74,
+	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,
+	0x66, 0x6f, 0x72, 0x63, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x08, 0x52, 0x05, 0x66, 0x6f, 0x72,
+	0x63, 0x65, 0x4a, 0x04, 0x08, 0x02, 0x10, 0x03, 0x4a, 0x04, 0x08, 0x03, 0x10, 0x04, 0x22, 0x51,
+	0x0a, 0x1f, 0x53, 0x65, 0x74, 0x4b, 0x65, 0x79, 0x73, 0x70, 0x61, 0x63, 0x65, 0x53, 0x68, 0x61,
+	0x72, 0x64, 0x69, 0x6e, 0x67, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73,
+	0x65, 0x12, 0x2e, 0x0a, 0x08, 0x6b, 0x65, 0x79, 0x73, 0x70, 0x61, 0x63, 0x65, 0x18, 0x01, 0x20,
+	0x01, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x74, 0x6f, 0x70, 0x6f, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x4b,
+	0x65, 0x79, 0x73, 0x70, 0x61, 0x63, 0x65, 0x52, 0x08, 0x6b, 0x65, 0x79, 0x73, 0x70, 0x61, 0x63,
+	0x65, 0x22, 0x72, 0x0a, 0x1f, 0x53, 0x65, 0x74, 0x53, 0x68, 0x61, 0x72, 0x64, 0x49, 0x73, 0x50,
+	0x72, 0x69, 0x6d, 0x61, 0x72, 0x79, 0x53, 0x65, 0x72, 0x76, 0x69, 0x6e, 0x67, 0x52, 0x65, 0x71,
+	0x75, 0x65, 0x73, 0x74, 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, 0x1d, 0x0a, 0x0a, 0x69, 0x73, 0x5f, 0x73, 0x65, 0x72,
+	0x76, 0x69, 0x6e, 0x67, 0x18, 0x03, 0x20, 0x01, 0x28, 0x08, 0x52, 0x09, 0x69, 0x73, 0x53, 0x65,
+	0x72, 0x76, 0x69, 0x6e, 0x67, 0x22, 0x49, 0x0a, 0x20, 0x53, 0x65, 0x74, 0x53, 0x68, 0x61, 0x72,
+	0x64, 0x49, 0x73, 0x50, 0x72, 0x69, 0x6d, 0x61, 0x72, 0x79, 0x53, 0x65, 0x72, 0x76, 0x69, 0x6e,
+	0x67, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x25, 0x0a, 0x05, 0x73, 0x68, 0x61,
+	0x72, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0f, 0x2e, 0x74, 0x6f, 0x70, 0x6f, 0x64,
+	0x61, 0x74, 0x61, 0x2e, 0x53, 0x68, 0x61, 0x72, 0x64, 0x52, 0x05, 0x73, 0x68, 0x61, 0x72, 0x64,
+	0x22, 0x8e, 0x02, 0x0a, 0x1c, 0x53, 0x65, 0x74, 0x53, 0x68, 0x61, 0x72, 0x64, 0x54, 0x61, 0x62,
+	0x6c, 0x65, 0x74, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73,
+	0x74, 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, 0x35, 0x0a, 0x0b, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x5f, 0x74, 0x79,
+	0x70, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x14, 0x2e, 0x74, 0x6f, 0x70, 0x6f, 0x64,
+	0x61, 0x74, 0x61, 0x2e, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x54, 0x79, 0x70, 0x65, 0x52, 0x0a,
+	0x74, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x54, 0x79, 0x70, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x63, 0x65,
+	0x6c, 0x6c, 0x73, 0x18, 0x04, 0x20, 0x03, 0x28, 0x09, 0x52, 0x05, 0x63, 0x65, 0x6c, 0x6c, 0x73,
+	0x12, 0x23, 0x0a, 0x0d, 0x64, 0x65, 0x6e, 0x69, 0x65, 0x64, 0x5f, 0x74, 0x61, 0x62, 0x6c, 0x65,
+	0x73, 0x18, 0x05, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0c, 0x64, 0x65, 0x6e, 0x69, 0x65, 0x64, 0x54,
+	0x61, 0x62, 0x6c, 0x65, 0x73, 0x12, 0x32, 0x0a, 0x15, 0x64, 0x69, 0x73, 0x61, 0x62, 0x6c, 0x65,
+	0x5f, 0x71, 0x75, 0x65, 0x72, 0x79, 0x5f, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x18, 0x06,
+	0x20, 0x01, 0x28, 0x08, 0x52, 0x13, 0x64, 0x69, 0x73, 0x61, 0x62, 0x6c, 0x65, 0x51, 0x75, 0x65,
+	0x72, 0x79, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x72, 0x65, 0x6d,
+	0x6f, 0x76, 0x65, 0x18, 0x07, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x72, 0x65, 0x6d, 0x6f, 0x76,
+	0x65, 0x22, 0x46, 0x0a, 0x1d, 0x53, 0x65, 0x74, 0x53, 0x68, 0x61, 0x72, 0x64, 0x54, 0x61, 0x62,
+	0x6c, 0x65, 0x74, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e,
+	0x73, 0x65, 0x12, 0x25, 0x0a, 0x05, 0x73, 0x68, 0x61, 0x72, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28,
+	0x0b, 0x32, 0x0f, 0x2e, 0x74, 0x6f, 0x70, 0x6f, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x53, 0x68, 0x61,
+	0x72, 0x64, 0x52, 0x05, 0x73, 0x68, 0x61, 0x72, 0x64, 0x22, 0x6a, 0x0a, 0x12, 0x53, 0x65, 0x74,
+	0x57, 0x72, 0x69, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12,
+	0x38, 0x0a, 0x0c, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x5f, 0x61, 0x6c, 0x69, 0x61, 0x73, 0x18,
+	0x01, 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, 0x1a, 0x0a, 0x08, 0x77, 0x72, 0x69,
+	0x74, 0x61, 0x62, 0x6c, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x08, 0x77, 0x72, 0x69,
+	0x74, 0x61, 0x62, 0x6c, 0x65, 0x22, 0x15, 0x0a, 0x13, 0x53, 0x65, 0x74, 0x57, 0x72, 0x69, 0x74,
+	0x61, 0x62, 0x6c, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x88, 0x01, 0x0a,
+	0x1a, 0x53, 0x68, 0x61, 0x72, 0x64, 0x52, 0x65, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f,
+	0x6e, 0x41, 0x64, 0x64, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 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, 0x35, 0x0a,
-	0x0b, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x18, 0x03, 0x20, 0x01,
-	0x28, 0x0e, 0x32, 0x14, 0x2e, 0x74, 0x6f, 0x70, 0x6f, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x54, 0x61,
-	0x62, 0x6c, 0x65, 0x74, 0x54, 0x79, 0x70, 0x65, 0x52, 0x0a, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x74,
-	0x54, 0x79, 0x70, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x63, 0x65, 0x6c, 0x6c, 0x73, 0x18, 0x04, 0x20,
-	0x03, 0x28, 0x09, 0x52, 0x05, 0x63, 0x65, 0x6c, 0x6c, 0x73, 0x12, 0x23, 0x0a, 0x0d, 0x64, 0x65,
-	0x6e, 0x69, 0x65, 0x64, 0x5f, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x73, 0x18, 0x05, 0x20, 0x03, 0x28,
-	0x09, 0x52, 0x0c, 0x64, 0x65, 0x6e, 0x69, 0x65, 0x64, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x73, 0x12,
-	0x32, 0x0a, 0x15, 0x64, 0x69, 0x73, 0x61, 0x62, 0x6c, 0x65, 0x5f, 0x71, 0x75, 0x65, 0x72, 0x79,
-	0x5f, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x08, 0x52, 0x13,
-	0x64, 0x69, 0x73, 0x61, 0x62, 0x6c, 0x65, 0x51, 0x75, 0x65, 0x72, 0x79, 0x53, 0x65, 0x72, 0x76,
-	0x69, 0x63, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x72, 0x65, 0x6d, 0x6f, 0x76, 0x65, 0x18, 0x07, 0x20,
-	0x01, 0x28, 0x08, 0x52, 0x06, 0x72, 0x65, 0x6d, 0x6f, 0x76, 0x65, 0x22, 0x46, 0x0a, 0x1d, 0x53,
-	0x65, 0x74, 0x53, 0x68, 0x61, 0x72, 0x64, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x43, 0x6f, 0x6e,
-	0x74, 0x72, 0x6f, 0x6c, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x25, 0x0a, 0x05,
-	0x73, 0x68, 0x61, 0x72, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0f, 0x2e, 0x74, 0x6f,
-	0x70, 0x6f, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x53, 0x68, 0x61, 0x72, 0x64, 0x52, 0x05, 0x73, 0x68,
-	0x61, 0x72, 0x64, 0x22, 0x6a, 0x0a, 0x12, 0x53, 0x65, 0x74, 0x57, 0x72, 0x69, 0x74, 0x61, 0x62,
-	0x6c, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x38, 0x0a, 0x0c, 0x74, 0x61, 0x62,
-	0x6c, 0x65, 0x74, 0x5f, 0x61, 0x6c, 0x69, 0x61, 0x73, 0x18, 0x01, 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, 0x1a, 0x0a, 0x08, 0x77, 0x72, 0x69, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x18,
-	0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x08, 0x77, 0x72, 0x69, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x22,
-	0x15, 0x0a, 0x13, 0x53, 0x65, 0x74, 0x57, 0x72, 0x69, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x52, 0x65,
-	0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x88, 0x01, 0x0a, 0x1a, 0x53, 0x68, 0x61, 0x72, 0x64,
+	0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x73, 0x68, 0x61, 0x72, 0x64, 0x12, 0x38, 0x0a,
+	0x0c, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x5f, 0x61, 0x6c, 0x69, 0x61, 0x73, 0x18, 0x03, 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, 0x1d, 0x0a, 0x1b, 0x53, 0x68, 0x61, 0x72, 0x64,
 	0x52, 0x65, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x41, 0x64, 0x64, 0x52, 0x65,
+	0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x62, 0x0a, 0x1a, 0x53, 0x68, 0x61, 0x72, 0x64, 0x52,
+	0x65, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x46, 0x69, 0x78, 0x52, 0x65, 0x71,
+	0x75, 0x65, 0x73, 0x74, 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, 0x63, 0x65, 0x6c, 0x6c, 0x18, 0x03,
+	0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x63, 0x65, 0x6c, 0x6c, 0x22, 0x54, 0x0a, 0x1b, 0x53, 0x68,
+	0x61, 0x72, 0x64, 0x52, 0x65, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x46, 0x69,
+	0x78, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x35, 0x0a, 0x05, 0x65, 0x72, 0x72,
+	0x6f, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1f, 0x2e, 0x74, 0x6f, 0x70, 0x6f, 0x64,
+	0x61, 0x74, 0x61, 0x2e, 0x53, 0x68, 0x61, 0x72, 0x64, 0x52, 0x65, 0x70, 0x6c, 0x69, 0x63, 0x61,
+	0x74, 0x69, 0x6f, 0x6e, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x52, 0x05, 0x65, 0x72, 0x72, 0x6f, 0x72,
+	0x22, 0x54, 0x0a, 0x20, 0x53, 0x68, 0x61, 0x72, 0x64, 0x52, 0x65, 0x70, 0x6c, 0x69, 0x63, 0x61,
+	0x74, 0x69, 0x6f, 0x6e, 0x50, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x52, 0x65, 0x71,
+	0x75, 0x65, 0x73, 0x74, 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, 0xaa, 0x03, 0x0a, 0x21, 0x53, 0x68, 0x61, 0x72, 0x64,
+	0x52, 0x65, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x50, 0x6f, 0x73, 0x69, 0x74,
+	0x69, 0x6f, 0x6e, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x78, 0x0a, 0x14,
+	0x72, 0x65, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x73, 0x74, 0x61, 0x74,
+	0x75, 0x73, 0x65, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x45, 0x2e, 0x76, 0x74, 0x63,
+	0x74, 0x6c, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x53, 0x68, 0x61, 0x72, 0x64, 0x52, 0x65, 0x70, 0x6c,
+	0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x50, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x73,
+	0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x2e, 0x52, 0x65, 0x70, 0x6c, 0x69, 0x63, 0x61,
+	0x74, 0x69, 0x6f, 0x6e, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x65, 0x73, 0x45, 0x6e, 0x74, 0x72,
+	0x79, 0x52, 0x13, 0x72, 0x65, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x53, 0x74,
+	0x61, 0x74, 0x75, 0x73, 0x65, 0x73, 0x12, 0x5a, 0x0a, 0x0a, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x74,
+	0x5f, 0x6d, 0x61, 0x70, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x3b, 0x2e, 0x76, 0x74, 0x63,
+	0x74, 0x6c, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x53, 0x68, 0x61, 0x72, 0x64, 0x52, 0x65, 0x70, 0x6c,
+	0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x50, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x73,
+	0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x2e, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x4d,
+	0x61, 0x70, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x09, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x4d,
+	0x61, 0x70, 0x1a, 0x5f, 0x0a, 0x18, 0x52, 0x65, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f,
+	0x6e, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 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, 0x2d, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32,
+	0x17, 0x2e, 0x72, 0x65, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x64, 0x61, 0x74,
+	0x61, 0x2e, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a,
+	0x02, 0x38, 0x01, 0x1a, 0x4e, 0x0a, 0x0e, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x4d, 0x61, 0x70,
+	0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01,
+	0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x26, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65,
+	0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x74, 0x6f, 0x70, 0x6f, 0x64, 0x61, 0x74,
+	0x61, 0x2e, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a,
+	0x02, 0x38, 0x01, 0x22, 0x8b, 0x01, 0x0a, 0x1d, 0x53, 0x68, 0x61, 0x72, 0x64, 0x52, 0x65, 0x70,
+	0x6c, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x6d, 0x6f, 0x76, 0x65, 0x52, 0x65,
 	0x71, 0x75, 0x65, 0x73, 0x74, 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,
@@ -19052,190 +19100,206 @@ var file_vtctldata_proto_rawDesc = string([]byte{
 	0x74, 0x5f, 0x61, 0x6c, 0x69, 0x61, 0x73, 0x18, 0x03, 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, 0x1d, 0x0a, 0x1b, 0x53, 0x68, 0x61, 0x72, 0x64, 0x52, 0x65, 0x70, 0x6c, 0x69, 0x63,
-	0x61, 0x74, 0x69, 0x6f, 0x6e, 0x41, 0x64, 0x64, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65,
-	0x22, 0x62, 0x0a, 0x1a, 0x53, 0x68, 0x61, 0x72, 0x64, 0x52, 0x65, 0x70, 0x6c, 0x69, 0x63, 0x61,
-	0x74, 0x69, 0x6f, 0x6e, 0x46, 0x69, 0x78, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 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, 0x63, 0x65, 0x6c, 0x6c, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04,
-	0x63, 0x65, 0x6c, 0x6c, 0x22, 0x54, 0x0a, 0x1b, 0x53, 0x68, 0x61, 0x72, 0x64, 0x52, 0x65, 0x70,
-	0x6c, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x46, 0x69, 0x78, 0x52, 0x65, 0x73, 0x70, 0x6f,
-	0x6e, 0x73, 0x65, 0x12, 0x35, 0x0a, 0x05, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x18, 0x01, 0x20, 0x01,
-	0x28, 0x0b, 0x32, 0x1f, 0x2e, 0x74, 0x6f, 0x70, 0x6f, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x53, 0x68,
-	0x61, 0x72, 0x64, 0x52, 0x65, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x45, 0x72,
-	0x72, 0x6f, 0x72, 0x52, 0x05, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x22, 0x54, 0x0a, 0x20, 0x53, 0x68,
-	0x61, 0x72, 0x64, 0x52, 0x65, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x50, 0x6f,
-	0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 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, 0xaa, 0x03, 0x0a, 0x21, 0x53, 0x68, 0x61, 0x72, 0x64, 0x52, 0x65, 0x70, 0x6c, 0x69, 0x63,
-	0x61, 0x74, 0x69, 0x6f, 0x6e, 0x50, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x52, 0x65,
-	0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x78, 0x0a, 0x14, 0x72, 0x65, 0x70, 0x6c, 0x69, 0x63,
-	0x61, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x65, 0x73, 0x18, 0x01,
-	0x20, 0x03, 0x28, 0x0b, 0x32, 0x45, 0x2e, 0x76, 0x74, 0x63, 0x74, 0x6c, 0x64, 0x61, 0x74, 0x61,
-	0x2e, 0x53, 0x68, 0x61, 0x72, 0x64, 0x52, 0x65, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f,
-	0x6e, 0x50, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e,
-	0x73, 0x65, 0x2e, 0x52, 0x65, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x53, 0x74,
-	0x61, 0x74, 0x75, 0x73, 0x65, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x13, 0x72, 0x65, 0x70,
-	0x6c, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x65, 0x73,
-	0x12, 0x5a, 0x0a, 0x0a, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x5f, 0x6d, 0x61, 0x70, 0x18, 0x02,
-	0x20, 0x03, 0x28, 0x0b, 0x32, 0x3b, 0x2e, 0x76, 0x74, 0x63, 0x74, 0x6c, 0x64, 0x61, 0x74, 0x61,
-	0x2e, 0x53, 0x68, 0x61, 0x72, 0x64, 0x52, 0x65, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f,
-	0x6e, 0x50, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e,
-	0x73, 0x65, 0x2e, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x4d, 0x61, 0x70, 0x45, 0x6e, 0x74, 0x72,
-	0x79, 0x52, 0x09, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x4d, 0x61, 0x70, 0x1a, 0x5f, 0x0a, 0x18,
-	0x52, 0x65, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x53, 0x74, 0x61, 0x74, 0x75,
-	0x73, 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, 0x2d, 0x0a, 0x05, 0x76, 0x61,
-	0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x72, 0x65, 0x70, 0x6c,
-	0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x53, 0x74, 0x61, 0x74,
-	0x75, 0x73, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x4e, 0x0a,
-	0x0e, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x4d, 0x61, 0x70, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12,
-	0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65,
-	0x79, 0x12, 0x26, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b,
-	0x32, 0x10, 0x2e, 0x74, 0x6f, 0x70, 0x6f, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x54, 0x61, 0x62, 0x6c,
-	0x65, 0x74, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x8b, 0x01,
-	0x0a, 0x1d, 0x53, 0x68, 0x61, 0x72, 0x64, 0x52, 0x65, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74, 0x69,
-	0x6f, 0x6e, 0x52, 0x65, 0x6d, 0x6f, 0x76, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 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, 0x38, 0x0a, 0x0c, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x5f, 0x61, 0x6c, 0x69, 0x61,
-	0x73, 0x18, 0x03, 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, 0x20, 0x0a, 0x1e, 0x53,
-	0x68, 0x61, 0x72, 0x64, 0x52, 0x65, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52,
-	0x65, 0x6d, 0x6f, 0x76, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x7c, 0x0a,
-	0x12, 0x53, 0x6c, 0x65, 0x65, 0x70, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x52, 0x65, 0x71, 0x75,
-	0x65, 0x73, 0x74, 0x12, 0x38, 0x0a, 0x0c, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x5f, 0x61, 0x6c,
-	0x69, 0x61, 0x73, 0x18, 0x01, 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, 0x2c, 0x0a,
-	0x08, 0x64, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32,
-	0x10, 0x2e, 0x76, 0x74, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x44, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f,
-	0x6e, 0x52, 0x08, 0x64, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x15, 0x0a, 0x13, 0x53,
-	0x6c, 0x65, 0x65, 0x70, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e,
-	0x73, 0x65, 0x22, 0xf0, 0x01, 0x0a, 0x15, 0x53, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x53, 0x68, 0x61,
-	0x72, 0x64, 0x41, 0x64, 0x64, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 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, 0x10,
-	0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x75, 0x69, 0x64,
-	0x12, 0x27, 0x0a, 0x0f, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x5f, 0x6b, 0x65, 0x79, 0x73, 0x70,
-	0x61, 0x63, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0e, 0x73, 0x6f, 0x75, 0x72, 0x63,
-	0x65, 0x4b, 0x65, 0x79, 0x73, 0x70, 0x61, 0x63, 0x65, 0x12, 0x21, 0x0a, 0x0c, 0x73, 0x6f, 0x75,
-	0x72, 0x63, 0x65, 0x5f, 0x73, 0x68, 0x61, 0x72, 0x64, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52,
-	0x0b, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x53, 0x68, 0x61, 0x72, 0x64, 0x12, 0x2f, 0x0a, 0x09,
-	0x6b, 0x65, 0x79, 0x5f, 0x72, 0x61, 0x6e, 0x67, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0b, 0x32,
-	0x12, 0x2e, 0x74, 0x6f, 0x70, 0x6f, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x4b, 0x65, 0x79, 0x52, 0x61,
-	0x6e, 0x67, 0x65, 0x52, 0x08, 0x6b, 0x65, 0x79, 0x52, 0x61, 0x6e, 0x67, 0x65, 0x12, 0x16, 0x0a,
-	0x06, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x73, 0x18, 0x07, 0x20, 0x03, 0x28, 0x09, 0x52, 0x06, 0x74,
-	0x61, 0x62, 0x6c, 0x65, 0x73, 0x22, 0x3f, 0x0a, 0x16, 0x53, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x53,
-	0x68, 0x61, 0x72, 0x64, 0x41, 0x64, 0x64, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12,
-	0x25, 0x0a, 0x05, 0x73, 0x68, 0x61, 0x72, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0f,
-	0x2e, 0x74, 0x6f, 0x70, 0x6f, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x53, 0x68, 0x61, 0x72, 0x64, 0x52,
-	0x05, 0x73, 0x68, 0x61, 0x72, 0x64, 0x22, 0x5e, 0x0a, 0x18, 0x53, 0x6f, 0x75, 0x72, 0x63, 0x65,
-	0x53, 0x68, 0x61, 0x72, 0x64, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65,
+	0x73, 0x22, 0x20, 0x0a, 0x1e, 0x53, 0x68, 0x61, 0x72, 0x64, 0x52, 0x65, 0x70, 0x6c, 0x69, 0x63,
+	0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x6d, 0x6f, 0x76, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f,
+	0x6e, 0x73, 0x65, 0x22, 0x7c, 0x0a, 0x12, 0x53, 0x6c, 0x65, 0x65, 0x70, 0x54, 0x61, 0x62, 0x6c,
+	0x65, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x38, 0x0a, 0x0c, 0x74, 0x61, 0x62,
+	0x6c, 0x65, 0x74, 0x5f, 0x61, 0x6c, 0x69, 0x61, 0x73, 0x18, 0x01, 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, 0x2c, 0x0a, 0x08, 0x64, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x18,
+	0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x76, 0x74, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x44,
+	0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x08, 0x64, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f,
+	0x6e, 0x22, 0x15, 0x0a, 0x13, 0x53, 0x6c, 0x65, 0x65, 0x70, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x74,
+	0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0xf0, 0x01, 0x0a, 0x15, 0x53, 0x6f, 0x75,
+	0x72, 0x63, 0x65, 0x53, 0x68, 0x61, 0x72, 0x64, 0x41, 0x64, 0x64, 0x52, 0x65, 0x71, 0x75, 0x65,
 	0x73, 0x74, 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, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28,
-	0x05, 0x52, 0x03, 0x75, 0x69, 0x64, 0x22, 0x42, 0x0a, 0x19, 0x53, 0x6f, 0x75, 0x72, 0x63, 0x65,
-	0x53, 0x68, 0x61, 0x72, 0x64, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f,
-	0x6e, 0x73, 0x65, 0x12, 0x25, 0x0a, 0x05, 0x73, 0x68, 0x61, 0x72, 0x64, 0x18, 0x01, 0x20, 0x01,
-	0x28, 0x0b, 0x32, 0x0f, 0x2e, 0x74, 0x6f, 0x70, 0x6f, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x53, 0x68,
-	0x61, 0x72, 0x64, 0x52, 0x05, 0x73, 0x68, 0x61, 0x72, 0x64, 0x22, 0x53, 0x0a, 0x17, 0x53, 0x74,
-	0x61, 0x72, 0x74, 0x52, 0x65, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65,
-	0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x38, 0x0a, 0x0c, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x5f,
-	0x61, 0x6c, 0x69, 0x61, 0x73, 0x18, 0x01, 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,
-	0x1a, 0x0a, 0x18, 0x53, 0x74, 0x61, 0x72, 0x74, 0x52, 0x65, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74,
-	0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x52, 0x0a, 0x16, 0x53,
-	0x74, 0x6f, 0x70, 0x52, 0x65, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65,
-	0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x38, 0x0a, 0x0c, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x5f,
-	0x61, 0x6c, 0x69, 0x61, 0x73, 0x18, 0x01, 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,
-	0x19, 0x0a, 0x17, 0x53, 0x74, 0x6f, 0x70, 0x52, 0x65, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74, 0x69,
-	0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x52, 0x0a, 0x21, 0x54, 0x61,
-	0x62, 0x6c, 0x65, 0x74, 0x45, 0x78, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x6c, 0x79, 0x52, 0x65,
-	0x70, 0x61, 0x72, 0x65, 0x6e, 0x74, 0x65, 0x64, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12,
-	0x2d, 0x0a, 0x06, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x18, 0x01, 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, 0x06, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x22, 0xc6,
-	0x01, 0x0a, 0x22, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x45, 0x78, 0x74, 0x65, 0x72, 0x6e, 0x61,
-	0x6c, 0x6c, 0x79, 0x52, 0x65, 0x70, 0x61, 0x72, 0x65, 0x6e, 0x74, 0x65, 0x64, 0x52, 0x65, 0x73,
-	0x70, 0x6f, 0x6e, 0x73, 0x65, 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, 0x36, 0x0a, 0x0b, 0x6e, 0x65, 0x77, 0x5f, 0x70,
-	0x72, 0x69, 0x6d, 0x61, 0x72, 0x79, 0x18, 0x03, 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, 0x0a, 0x6e, 0x65, 0x77, 0x50, 0x72, 0x69, 0x6d, 0x61, 0x72, 0x79, 0x12,
-	0x36, 0x0a, 0x0b, 0x6f, 0x6c, 0x64, 0x5f, 0x70, 0x72, 0x69, 0x6d, 0x61, 0x72, 0x79, 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, 0x0a, 0x6f, 0x6c, 0x64,
-	0x50, 0x72, 0x69, 0x6d, 0x61, 0x72, 0x79, 0x22, 0x5c, 0x0a, 0x15, 0x55, 0x70, 0x64, 0x61, 0x74,
-	0x65, 0x43, 0x65, 0x6c, 0x6c, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74,
-	0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04,
-	0x6e, 0x61, 0x6d, 0x65, 0x12, 0x2f, 0x0a, 0x09, 0x63, 0x65, 0x6c, 0x6c, 0x5f, 0x69, 0x6e, 0x66,
-	0x6f, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x74, 0x6f, 0x70, 0x6f, 0x64, 0x61,
-	0x74, 0x61, 0x2e, 0x43, 0x65, 0x6c, 0x6c, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x08, 0x63, 0x65, 0x6c,
-	0x6c, 0x49, 0x6e, 0x66, 0x6f, 0x22, 0x5d, 0x0a, 0x16, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x43,
-	0x65, 0x6c, 0x6c, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12,
-	0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e,
-	0x61, 0x6d, 0x65, 0x12, 0x2f, 0x0a, 0x09, 0x63, 0x65, 0x6c, 0x6c, 0x5f, 0x69, 0x6e, 0x66, 0x6f,
-	0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x74, 0x6f, 0x70, 0x6f, 0x64, 0x61, 0x74,
-	0x61, 0x2e, 0x43, 0x65, 0x6c, 0x6c, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x08, 0x63, 0x65, 0x6c, 0x6c,
-	0x49, 0x6e, 0x66, 0x6f, 0x22, 0x64, 0x0a, 0x17, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x43, 0x65,
-	0x6c, 0x6c, 0x73, 0x41, 0x6c, 0x69, 0x61, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12,
-	0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e,
-	0x61, 0x6d, 0x65, 0x12, 0x35, 0x0a, 0x0b, 0x63, 0x65, 0x6c, 0x6c, 0x73, 0x5f, 0x61, 0x6c, 0x69,
-	0x61, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x74, 0x6f, 0x70, 0x6f, 0x64,
-	0x61, 0x74, 0x61, 0x2e, 0x43, 0x65, 0x6c, 0x6c, 0x73, 0x41, 0x6c, 0x69, 0x61, 0x73, 0x52, 0x0a,
-	0x63, 0x65, 0x6c, 0x6c, 0x73, 0x41, 0x6c, 0x69, 0x61, 0x73, 0x22, 0x65, 0x0a, 0x18, 0x55, 0x70,
+	0x05, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x27, 0x0a, 0x0f, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65,
+	0x5f, 0x6b, 0x65, 0x79, 0x73, 0x70, 0x61, 0x63, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52,
+	0x0e, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x4b, 0x65, 0x79, 0x73, 0x70, 0x61, 0x63, 0x65, 0x12,
+	0x21, 0x0a, 0x0c, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x5f, 0x73, 0x68, 0x61, 0x72, 0x64, 0x18,
+	0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x53, 0x68, 0x61,
+	0x72, 0x64, 0x12, 0x2f, 0x0a, 0x09, 0x6b, 0x65, 0x79, 0x5f, 0x72, 0x61, 0x6e, 0x67, 0x65, 0x18,
+	0x06, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x74, 0x6f, 0x70, 0x6f, 0x64, 0x61, 0x74, 0x61,
+	0x2e, 0x4b, 0x65, 0x79, 0x52, 0x61, 0x6e, 0x67, 0x65, 0x52, 0x08, 0x6b, 0x65, 0x79, 0x52, 0x61,
+	0x6e, 0x67, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x73, 0x18, 0x07, 0x20,
+	0x03, 0x28, 0x09, 0x52, 0x06, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x73, 0x22, 0x3f, 0x0a, 0x16, 0x53,
+	0x6f, 0x75, 0x72, 0x63, 0x65, 0x53, 0x68, 0x61, 0x72, 0x64, 0x41, 0x64, 0x64, 0x52, 0x65, 0x73,
+	0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x25, 0x0a, 0x05, 0x73, 0x68, 0x61, 0x72, 0x64, 0x18, 0x01,
+	0x20, 0x01, 0x28, 0x0b, 0x32, 0x0f, 0x2e, 0x74, 0x6f, 0x70, 0x6f, 0x64, 0x61, 0x74, 0x61, 0x2e,
+	0x53, 0x68, 0x61, 0x72, 0x64, 0x52, 0x05, 0x73, 0x68, 0x61, 0x72, 0x64, 0x22, 0x5e, 0x0a, 0x18,
+	0x53, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x53, 0x68, 0x61, 0x72, 0x64, 0x44, 0x65, 0x6c, 0x65, 0x74,
+	0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 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, 0x10, 0x0a, 0x03, 0x75, 0x69,
+	0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x75, 0x69, 0x64, 0x22, 0x42, 0x0a, 0x19,
+	0x53, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x53, 0x68, 0x61, 0x72, 0x64, 0x44, 0x65, 0x6c, 0x65, 0x74,
+	0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x25, 0x0a, 0x05, 0x73, 0x68, 0x61,
+	0x72, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0f, 0x2e, 0x74, 0x6f, 0x70, 0x6f, 0x64,
+	0x61, 0x74, 0x61, 0x2e, 0x53, 0x68, 0x61, 0x72, 0x64, 0x52, 0x05, 0x73, 0x68, 0x61, 0x72, 0x64,
+	0x22, 0x53, 0x0a, 0x17, 0x53, 0x74, 0x61, 0x72, 0x74, 0x52, 0x65, 0x70, 0x6c, 0x69, 0x63, 0x61,
+	0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x38, 0x0a, 0x0c, 0x74,
+	0x61, 0x62, 0x6c, 0x65, 0x74, 0x5f, 0x61, 0x6c, 0x69, 0x61, 0x73, 0x18, 0x01, 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, 0x1a, 0x0a, 0x18, 0x53, 0x74, 0x61, 0x72, 0x74, 0x52, 0x65,
+	0x70, 0x6c, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73,
+	0x65, 0x22, 0x52, 0x0a, 0x16, 0x53, 0x74, 0x6f, 0x70, 0x52, 0x65, 0x70, 0x6c, 0x69, 0x63, 0x61,
+	0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x38, 0x0a, 0x0c, 0x74,
+	0x61, 0x62, 0x6c, 0x65, 0x74, 0x5f, 0x61, 0x6c, 0x69, 0x61, 0x73, 0x18, 0x01, 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, 0x19, 0x0a, 0x17, 0x53, 0x74, 0x6f, 0x70, 0x52, 0x65, 0x70,
+	0x6c, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65,
+	0x22, 0x52, 0x0a, 0x21, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x45, 0x78, 0x74, 0x65, 0x72, 0x6e,
+	0x61, 0x6c, 0x6c, 0x79, 0x52, 0x65, 0x70, 0x61, 0x72, 0x65, 0x6e, 0x74, 0x65, 0x64, 0x52, 0x65,
+	0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x2d, 0x0a, 0x06, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x18,
+	0x01, 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, 0x06, 0x74, 0x61,
+	0x62, 0x6c, 0x65, 0x74, 0x22, 0xc6, 0x01, 0x0a, 0x22, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x45,
+	0x78, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x6c, 0x79, 0x52, 0x65, 0x70, 0x61, 0x72, 0x65, 0x6e,
+	0x74, 0x65, 0x64, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 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, 0x36, 0x0a,
+	0x0b, 0x6e, 0x65, 0x77, 0x5f, 0x70, 0x72, 0x69, 0x6d, 0x61, 0x72, 0x79, 0x18, 0x03, 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, 0x0a, 0x6e, 0x65, 0x77, 0x50, 0x72,
+	0x69, 0x6d, 0x61, 0x72, 0x79, 0x12, 0x36, 0x0a, 0x0b, 0x6f, 0x6c, 0x64, 0x5f, 0x70, 0x72, 0x69,
+	0x6d, 0x61, 0x72, 0x79, 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, 0x0a, 0x6f, 0x6c, 0x64, 0x50, 0x72, 0x69, 0x6d, 0x61, 0x72, 0x79, 0x22, 0x5c, 0x0a,
+	0x15, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x43, 0x65, 0x6c, 0x6c, 0x49, 0x6e, 0x66, 0x6f, 0x52,
+	0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01,
+	0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x2f, 0x0a, 0x09, 0x63, 0x65,
+	0x6c, 0x6c, 0x5f, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x12, 0x2e,
+	0x74, 0x6f, 0x70, 0x6f, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x43, 0x65, 0x6c, 0x6c, 0x49, 0x6e, 0x66,
+	0x6f, 0x52, 0x08, 0x63, 0x65, 0x6c, 0x6c, 0x49, 0x6e, 0x66, 0x6f, 0x22, 0x5d, 0x0a, 0x16, 0x55,
+	0x70, 0x64, 0x61, 0x74, 0x65, 0x43, 0x65, 0x6c, 0x6c, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65, 0x73,
+	0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20,
+	0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x2f, 0x0a, 0x09, 0x63, 0x65, 0x6c,
+	0x6c, 0x5f, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x74,
+	0x6f, 0x70, 0x6f, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x43, 0x65, 0x6c, 0x6c, 0x49, 0x6e, 0x66, 0x6f,
+	0x52, 0x08, 0x63, 0x65, 0x6c, 0x6c, 0x49, 0x6e, 0x66, 0x6f, 0x22, 0x64, 0x0a, 0x17, 0x55, 0x70,
 	0x64, 0x61, 0x74, 0x65, 0x43, 0x65, 0x6c, 0x6c, 0x73, 0x41, 0x6c, 0x69, 0x61, 0x73, 0x52, 0x65,
-	0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01,
-	0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x35, 0x0a, 0x0b, 0x63, 0x65,
-	0x6c, 0x6c, 0x73, 0x5f, 0x61, 0x6c, 0x69, 0x61, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32,
-	0x14, 0x2e, 0x74, 0x6f, 0x70, 0x6f, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x43, 0x65, 0x6c, 0x6c, 0x73,
-	0x41, 0x6c, 0x69, 0x61, 0x73, 0x52, 0x0a, 0x63, 0x65, 0x6c, 0x6c, 0x73, 0x41, 0x6c, 0x69, 0x61,
-	0x73, 0x22, 0x34, 0x0a, 0x0f, 0x56, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x65, 0x52, 0x65, 0x71,
-	0x75, 0x65, 0x73, 0x74, 0x12, 0x21, 0x0a, 0x0c, 0x70, 0x69, 0x6e, 0x67, 0x5f, 0x74, 0x61, 0x62,
-	0x6c, 0x65, 0x74, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0b, 0x70, 0x69, 0x6e, 0x67,
-	0x54, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x73, 0x22, 0xfb, 0x01, 0x0a, 0x10, 0x56, 0x61, 0x6c, 0x69,
-	0x64, 0x61, 0x74, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x18, 0x0a, 0x07,
-	0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x09, 0x52, 0x07, 0x72,
-	0x65, 0x73, 0x75, 0x6c, 0x74, 0x73, 0x12, 0x62, 0x0a, 0x13, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74,
-	0x73, 0x5f, 0x62, 0x79, 0x5f, 0x6b, 0x65, 0x79, 0x73, 0x70, 0x61, 0x63, 0x65, 0x18, 0x02, 0x20,
-	0x03, 0x28, 0x0b, 0x32, 0x32, 0x2e, 0x76, 0x74, 0x63, 0x74, 0x6c, 0x64, 0x61, 0x74, 0x61, 0x2e,
-	0x56, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65,
-	0x2e, 0x52, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x73, 0x42, 0x79, 0x4b, 0x65, 0x79, 0x73, 0x70, 0x61,
-	0x63, 0x65, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x11, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x73,
-	0x42, 0x79, 0x4b, 0x65, 0x79, 0x73, 0x70, 0x61, 0x63, 0x65, 0x1a, 0x69, 0x0a, 0x16, 0x52, 0x65,
-	0x73, 0x75, 0x6c, 0x74, 0x73, 0x42, 0x79, 0x4b, 0x65, 0x79, 0x73, 0x70, 0x61, 0x63, 0x65, 0x45,
-	0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28,
-	0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x39, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18,
-	0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x23, 0x2e, 0x76, 0x74, 0x63, 0x74, 0x6c, 0x64, 0x61, 0x74,
-	0x61, 0x2e, 0x56, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x65, 0x4b, 0x65, 0x79, 0x73, 0x70, 0x61,
-	0x63, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75,
-	0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x58, 0x0a, 0x17, 0x56, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74,
-	0x65, 0x4b, 0x65, 0x79, 0x73, 0x70, 0x61, 0x63, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74,
-	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, 0x21, 0x0a, 0x0c,
-	0x70, 0x69, 0x6e, 0x67, 0x5f, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x73, 0x18, 0x02, 0x20, 0x01,
-	0x28, 0x08, 0x52, 0x0b, 0x70, 0x69, 0x6e, 0x67, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x73, 0x22,
-	0xfc, 0x01, 0x0a, 0x18, 0x56, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x65, 0x4b, 0x65, 0x79, 0x73,
-	0x70, 0x61, 0x63, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x18, 0x0a, 0x07,
-	0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x09, 0x52, 0x07, 0x72,
-	0x65, 0x73, 0x75, 0x6c, 0x74, 0x73, 0x12, 0x61, 0x0a, 0x10, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74,
-	0x73, 0x5f, 0x62, 0x79, 0x5f, 0x73, 0x68, 0x61, 0x72, 0x64, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b,
-	0x32, 0x37, 0x2e, 0x76, 0x74, 0x63, 0x74, 0x6c, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x56, 0x61, 0x6c,
-	0x69, 0x64, 0x61, 0x74, 0x65, 0x4b, 0x65, 0x79, 0x73, 0x70, 0x61, 0x63, 0x65, 0x52, 0x65, 0x73,
+	0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20,
+	0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x35, 0x0a, 0x0b, 0x63, 0x65, 0x6c,
+	0x6c, 0x73, 0x5f, 0x61, 0x6c, 0x69, 0x61, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x14,
+	0x2e, 0x74, 0x6f, 0x70, 0x6f, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x43, 0x65, 0x6c, 0x6c, 0x73, 0x41,
+	0x6c, 0x69, 0x61, 0x73, 0x52, 0x0a, 0x63, 0x65, 0x6c, 0x6c, 0x73, 0x41, 0x6c, 0x69, 0x61, 0x73,
+	0x22, 0x65, 0x0a, 0x18, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x43, 0x65, 0x6c, 0x6c, 0x73, 0x41,
+	0x6c, 0x69, 0x61, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x12, 0x0a, 0x04,
+	0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65,
+	0x12, 0x35, 0x0a, 0x0b, 0x63, 0x65, 0x6c, 0x6c, 0x73, 0x5f, 0x61, 0x6c, 0x69, 0x61, 0x73, 0x18,
+	0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x74, 0x6f, 0x70, 0x6f, 0x64, 0x61, 0x74, 0x61,
+	0x2e, 0x43, 0x65, 0x6c, 0x6c, 0x73, 0x41, 0x6c, 0x69, 0x61, 0x73, 0x52, 0x0a, 0x63, 0x65, 0x6c,
+	0x6c, 0x73, 0x41, 0x6c, 0x69, 0x61, 0x73, 0x22, 0x34, 0x0a, 0x0f, 0x56, 0x61, 0x6c, 0x69, 0x64,
+	0x61, 0x74, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x21, 0x0a, 0x0c, 0x70, 0x69,
+	0x6e, 0x67, 0x5f, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08,
+	0x52, 0x0b, 0x70, 0x69, 0x6e, 0x67, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x73, 0x22, 0xfb, 0x01,
+	0x0a, 0x10, 0x56, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e,
+	0x73, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x73, 0x18, 0x01, 0x20,
+	0x03, 0x28, 0x09, 0x52, 0x07, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x73, 0x12, 0x62, 0x0a, 0x13,
+	0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x73, 0x5f, 0x62, 0x79, 0x5f, 0x6b, 0x65, 0x79, 0x73, 0x70,
+	0x61, 0x63, 0x65, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x32, 0x2e, 0x76, 0x74, 0x63, 0x74,
+	0x6c, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x56, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x65, 0x52, 0x65,
+	0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x2e, 0x52, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x73, 0x42, 0x79,
+	0x4b, 0x65, 0x79, 0x73, 0x70, 0x61, 0x63, 0x65, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x11, 0x72,
+	0x65, 0x73, 0x75, 0x6c, 0x74, 0x73, 0x42, 0x79, 0x4b, 0x65, 0x79, 0x73, 0x70, 0x61, 0x63, 0x65,
+	0x1a, 0x69, 0x0a, 0x16, 0x52, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x73, 0x42, 0x79, 0x4b, 0x65, 0x79,
+	0x73, 0x70, 0x61, 0x63, 0x65, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65,
+	0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x39, 0x0a, 0x05,
+	0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x23, 0x2e, 0x76, 0x74,
+	0x63, 0x74, 0x6c, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x56, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x65,
+	0x4b, 0x65, 0x79, 0x73, 0x70, 0x61, 0x63, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65,
+	0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x58, 0x0a, 0x17, 0x56,
+	0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x65, 0x4b, 0x65, 0x79, 0x73, 0x70, 0x61, 0x63, 0x65, 0x52,
+	0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 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, 0x21, 0x0a, 0x0c, 0x70, 0x69, 0x6e, 0x67, 0x5f, 0x74, 0x61, 0x62, 0x6c, 0x65,
+	0x74, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0b, 0x70, 0x69, 0x6e, 0x67, 0x54, 0x61,
+	0x62, 0x6c, 0x65, 0x74, 0x73, 0x22, 0xfc, 0x01, 0x0a, 0x18, 0x56, 0x61, 0x6c, 0x69, 0x64, 0x61,
+	0x74, 0x65, 0x4b, 0x65, 0x79, 0x73, 0x70, 0x61, 0x63, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e,
+	0x73, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x73, 0x18, 0x01, 0x20,
+	0x03, 0x28, 0x09, 0x52, 0x07, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x73, 0x12, 0x61, 0x0a, 0x10,
+	0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x73, 0x5f, 0x62, 0x79, 0x5f, 0x73, 0x68, 0x61, 0x72, 0x64,
+	0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x37, 0x2e, 0x76, 0x74, 0x63, 0x74, 0x6c, 0x64, 0x61,
+	0x74, 0x61, 0x2e, 0x56, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x65, 0x4b, 0x65, 0x79, 0x73, 0x70,
+	0x61, 0x63, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x2e, 0x52, 0x65, 0x73, 0x75,
+	0x6c, 0x74, 0x73, 0x42, 0x79, 0x53, 0x68, 0x61, 0x72, 0x64, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52,
+	0x0e, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x73, 0x42, 0x79, 0x53, 0x68, 0x61, 0x72, 0x64, 0x1a,
+	0x63, 0x0a, 0x13, 0x52, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x73, 0x42, 0x79, 0x53, 0x68, 0x61, 0x72,
+	0x64, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20,
+	0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x36, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75,
+	0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x20, 0x2e, 0x76, 0x74, 0x63, 0x74, 0x6c, 0x64,
+	0x61, 0x74, 0x61, 0x2e, 0x56, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x65, 0x53, 0x68, 0x61, 0x72,
+	0x64, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65,
+	0x3a, 0x02, 0x38, 0x01, 0x22, 0x58, 0x0a, 0x22, 0x56, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x65,
+	0x50, 0x65, 0x72, 0x6d, 0x69, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x4b, 0x65, 0x79, 0x73, 0x70,
+	0x61, 0x63, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 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, 0x16, 0x0a, 0x06, 0x73, 0x68, 0x61, 0x72, 0x64, 0x73,
+	0x18, 0x02, 0x20, 0x03, 0x28, 0x09, 0x52, 0x06, 0x73, 0x68, 0x61, 0x72, 0x64, 0x73, 0x22, 0x25,
+	0x0a, 0x23, 0x56, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x65, 0x50, 0x65, 0x72, 0x6d, 0x69, 0x73,
+	0x73, 0x69, 0x6f, 0x6e, 0x73, 0x4b, 0x65, 0x79, 0x73, 0x70, 0x61, 0x63, 0x65, 0x52, 0x65, 0x73,
+	0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0xf0, 0x01, 0x0a, 0x1d, 0x56, 0x61, 0x6c, 0x69, 0x64, 0x61,
+	0x74, 0x65, 0x53, 0x63, 0x68, 0x65, 0x6d, 0x61, 0x4b, 0x65, 0x79, 0x73, 0x70, 0x61, 0x63, 0x65,
+	0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 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, 0x25, 0x0a, 0x0e, 0x65, 0x78, 0x63, 0x6c, 0x75, 0x64, 0x65, 0x5f, 0x74,
+	0x61, 0x62, 0x6c, 0x65, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0d, 0x65, 0x78, 0x63,
+	0x6c, 0x75, 0x64, 0x65, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x73, 0x12, 0x23, 0x0a, 0x0d, 0x69, 0x6e,
+	0x63, 0x6c, 0x75, 0x64, 0x65, 0x5f, 0x76, 0x69, 0x65, 0x77, 0x73, 0x18, 0x03, 0x20, 0x01, 0x28,
+	0x08, 0x52, 0x0c, 0x69, 0x6e, 0x63, 0x6c, 0x75, 0x64, 0x65, 0x56, 0x69, 0x65, 0x77, 0x73, 0x12,
+	0x26, 0x0a, 0x0f, 0x73, 0x6b, 0x69, 0x70, 0x5f, 0x6e, 0x6f, 0x5f, 0x70, 0x72, 0x69, 0x6d, 0x61,
+	0x72, 0x79, 0x18, 0x04, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0d, 0x73, 0x6b, 0x69, 0x70, 0x4e, 0x6f,
+	0x50, 0x72, 0x69, 0x6d, 0x61, 0x72, 0x79, 0x12, 0x27, 0x0a, 0x0f, 0x69, 0x6e, 0x63, 0x6c, 0x75,
+	0x64, 0x65, 0x5f, 0x76, 0x73, 0x63, 0x68, 0x65, 0x6d, 0x61, 0x18, 0x05, 0x20, 0x01, 0x28, 0x08,
+	0x52, 0x0e, 0x69, 0x6e, 0x63, 0x6c, 0x75, 0x64, 0x65, 0x56, 0x73, 0x63, 0x68, 0x65, 0x6d, 0x61,
+	0x12, 0x16, 0x0a, 0x06, 0x73, 0x68, 0x61, 0x72, 0x64, 0x73, 0x18, 0x06, 0x20, 0x03, 0x28, 0x09,
+	0x52, 0x06, 0x73, 0x68, 0x61, 0x72, 0x64, 0x73, 0x22, 0x88, 0x02, 0x0a, 0x1e, 0x56, 0x61, 0x6c,
+	0x69, 0x64, 0x61, 0x74, 0x65, 0x53, 0x63, 0x68, 0x65, 0x6d, 0x61, 0x4b, 0x65, 0x79, 0x73, 0x70,
+	0x61, 0x63, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x72,
+	0x65, 0x73, 0x75, 0x6c, 0x74, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x09, 0x52, 0x07, 0x72, 0x65,
+	0x73, 0x75, 0x6c, 0x74, 0x73, 0x12, 0x67, 0x0a, 0x10, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x73,
+	0x5f, 0x62, 0x79, 0x5f, 0x73, 0x68, 0x61, 0x72, 0x64, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32,
+	0x3d, 0x2e, 0x76, 0x74, 0x63, 0x74, 0x6c, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x56, 0x61, 0x6c, 0x69,
+	0x64, 0x61, 0x74, 0x65, 0x53, 0x63, 0x68, 0x65, 0x6d, 0x61, 0x4b, 0x65, 0x79, 0x73, 0x70, 0x61,
+	0x63, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x2e, 0x52, 0x65, 0x73, 0x75, 0x6c,
+	0x74, 0x73, 0x42, 0x79, 0x53, 0x68, 0x61, 0x72, 0x64, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x0e,
+	0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x73, 0x42, 0x79, 0x53, 0x68, 0x61, 0x72, 0x64, 0x1a, 0x63,
+	0x0a, 0x13, 0x52, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x73, 0x42, 0x79, 0x53, 0x68, 0x61, 0x72, 0x64,
+	0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01,
+	0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x36, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65,
+	0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x20, 0x2e, 0x76, 0x74, 0x63, 0x74, 0x6c, 0x64, 0x61,
+	0x74, 0x61, 0x2e, 0x56, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x65, 0x53, 0x68, 0x61, 0x72, 0x64,
+	0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a,
+	0x02, 0x38, 0x01, 0x22, 0x6b, 0x0a, 0x14, 0x56, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x65, 0x53,
+	0x68, 0x61, 0x72, 0x64, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 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, 0x21, 0x0a,
+	0x0c, 0x70, 0x69, 0x6e, 0x67, 0x5f, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x73, 0x18, 0x03, 0x20,
+	0x01, 0x28, 0x08, 0x52, 0x0b, 0x70, 0x69, 0x6e, 0x67, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x73,
+	0x22, 0x31, 0x0a, 0x15, 0x56, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x65, 0x53, 0x68, 0x61, 0x72,
+	0x64, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x72, 0x65, 0x73,
+	0x75, 0x6c, 0x74, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x09, 0x52, 0x07, 0x72, 0x65, 0x73, 0x75,
+	0x6c, 0x74, 0x73, 0x22, 0x3c, 0x0a, 0x1e, 0x56, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x65, 0x56,
+	0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x4b, 0x65, 0x79, 0x73, 0x70, 0x61, 0x63, 0x65, 0x52, 0x65,
+	0x71, 0x75, 0x65, 0x73, 0x74, 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, 0x22, 0x8a, 0x02, 0x0a, 0x1f, 0x56, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x65, 0x56, 0x65,
+	0x72, 0x73, 0x69, 0x6f, 0x6e, 0x4b, 0x65, 0x79, 0x73, 0x70, 0x61, 0x63, 0x65, 0x52, 0x65, 0x73,
+	0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x73,
+	0x18, 0x01, 0x20, 0x03, 0x28, 0x09, 0x52, 0x07, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x73, 0x12,
+	0x68, 0x0a, 0x10, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x73, 0x5f, 0x62, 0x79, 0x5f, 0x73, 0x68,
+	0x61, 0x72, 0x64, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x3e, 0x2e, 0x76, 0x74, 0x63, 0x74,
+	0x6c, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x56, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x65, 0x56, 0x65,
+	0x72, 0x73, 0x69, 0x6f, 0x6e, 0x4b, 0x65, 0x79, 0x73, 0x70, 0x61, 0x63, 0x65, 0x52, 0x65, 0x73,
 	0x70, 0x6f, 0x6e, 0x73, 0x65, 0x2e, 0x52, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x73, 0x42, 0x79, 0x53,
 	0x68, 0x61, 0x72, 0x64, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x0e, 0x72, 0x65, 0x73, 0x75, 0x6c,
 	0x74, 0x73, 0x42, 0x79, 0x53, 0x68, 0x61, 0x72, 0x64, 0x1a, 0x63, 0x0a, 0x13, 0x52, 0x65, 0x73,
@@ -19244,432 +19308,361 @@ var file_vtctldata_proto_rawDesc = string([]byte{
 	0x65, 0x79, 0x12, 0x36, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28,
 	0x0b, 0x32, 0x20, 0x2e, 0x76, 0x74, 0x63, 0x74, 0x6c, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x56, 0x61,
 	0x6c, 0x69, 0x64, 0x61, 0x74, 0x65, 0x53, 0x68, 0x61, 0x72, 0x64, 0x52, 0x65, 0x73, 0x70, 0x6f,
-	0x6e, 0x73, 0x65, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x58,
-	0x0a, 0x22, 0x56, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x65, 0x50, 0x65, 0x72, 0x6d, 0x69, 0x73,
-	0x73, 0x69, 0x6f, 0x6e, 0x73, 0x4b, 0x65, 0x79, 0x73, 0x70, 0x61, 0x63, 0x65, 0x52, 0x65, 0x71,
+	0x6e, 0x73, 0x65, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x4f,
+	0x0a, 0x1b, 0x56, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x65, 0x56, 0x65, 0x72, 0x73, 0x69, 0x6f,
+	0x6e, 0x53, 0x68, 0x61, 0x72, 0x64, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 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,
+	0x38, 0x0a, 0x1c, 0x56, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x65, 0x56, 0x65, 0x72, 0x73, 0x69,
+	0x6f, 0x6e, 0x53, 0x68, 0x61, 0x72, 0x64, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12,
+	0x18, 0x0a, 0x07, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x09,
+	0x52, 0x07, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x73, 0x22, 0x98, 0x01, 0x0a, 0x16, 0x56, 0x61,
+	0x6c, 0x69, 0x64, 0x61, 0x74, 0x65, 0x56, 0x53, 0x63, 0x68, 0x65, 0x6d, 0x61, 0x52, 0x65, 0x71,
 	0x75, 0x65, 0x73, 0x74, 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, 0x16, 0x0a, 0x06, 0x73, 0x68, 0x61, 0x72, 0x64, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x09,
-	0x52, 0x06, 0x73, 0x68, 0x61, 0x72, 0x64, 0x73, 0x22, 0x25, 0x0a, 0x23, 0x56, 0x61, 0x6c, 0x69,
-	0x64, 0x61, 0x74, 0x65, 0x50, 0x65, 0x72, 0x6d, 0x69, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x4b,
-	0x65, 0x79, 0x73, 0x70, 0x61, 0x63, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22,
-	0xf0, 0x01, 0x0a, 0x1d, 0x56, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x65, 0x53, 0x63, 0x68, 0x65,
-	0x6d, 0x61, 0x4b, 0x65, 0x79, 0x73, 0x70, 0x61, 0x63, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73,
-	0x74, 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, 0x25, 0x0a,
-	0x0e, 0x65, 0x78, 0x63, 0x6c, 0x75, 0x64, 0x65, 0x5f, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x73, 0x18,
-	0x02, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0d, 0x65, 0x78, 0x63, 0x6c, 0x75, 0x64, 0x65, 0x54, 0x61,
-	0x62, 0x6c, 0x65, 0x73, 0x12, 0x23, 0x0a, 0x0d, 0x69, 0x6e, 0x63, 0x6c, 0x75, 0x64, 0x65, 0x5f,
-	0x76, 0x69, 0x65, 0x77, 0x73, 0x18, 0x03, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0c, 0x69, 0x6e, 0x63,
-	0x6c, 0x75, 0x64, 0x65, 0x56, 0x69, 0x65, 0x77, 0x73, 0x12, 0x26, 0x0a, 0x0f, 0x73, 0x6b, 0x69,
-	0x70, 0x5f, 0x6e, 0x6f, 0x5f, 0x70, 0x72, 0x69, 0x6d, 0x61, 0x72, 0x79, 0x18, 0x04, 0x20, 0x01,
-	0x28, 0x08, 0x52, 0x0d, 0x73, 0x6b, 0x69, 0x70, 0x4e, 0x6f, 0x50, 0x72, 0x69, 0x6d, 0x61, 0x72,
-	0x79, 0x12, 0x27, 0x0a, 0x0f, 0x69, 0x6e, 0x63, 0x6c, 0x75, 0x64, 0x65, 0x5f, 0x76, 0x73, 0x63,
-	0x68, 0x65, 0x6d, 0x61, 0x18, 0x05, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0e, 0x69, 0x6e, 0x63, 0x6c,
-	0x75, 0x64, 0x65, 0x56, 0x73, 0x63, 0x68, 0x65, 0x6d, 0x61, 0x12, 0x16, 0x0a, 0x06, 0x73, 0x68,
-	0x61, 0x72, 0x64, 0x73, 0x18, 0x06, 0x20, 0x03, 0x28, 0x09, 0x52, 0x06, 0x73, 0x68, 0x61, 0x72,
-	0x64, 0x73, 0x22, 0x88, 0x02, 0x0a, 0x1e, 0x56, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x65, 0x53,
-	0x63, 0x68, 0x65, 0x6d, 0x61, 0x4b, 0x65, 0x79, 0x73, 0x70, 0x61, 0x63, 0x65, 0x52, 0x65, 0x73,
-	0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x73,
-	0x18, 0x01, 0x20, 0x03, 0x28, 0x09, 0x52, 0x07, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x73, 0x12,
-	0x67, 0x0a, 0x10, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x73, 0x5f, 0x62, 0x79, 0x5f, 0x73, 0x68,
-	0x61, 0x72, 0x64, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x3d, 0x2e, 0x76, 0x74, 0x63, 0x74,
-	0x6c, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x56, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x65, 0x53, 0x63,
-	0x68, 0x65, 0x6d, 0x61, 0x4b, 0x65, 0x79, 0x73, 0x70, 0x61, 0x63, 0x65, 0x52, 0x65, 0x73, 0x70,
-	0x6f, 0x6e, 0x73, 0x65, 0x2e, 0x52, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x73, 0x42, 0x79, 0x53, 0x68,
-	0x61, 0x72, 0x64, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x0e, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74,
-	0x73, 0x42, 0x79, 0x53, 0x68, 0x61, 0x72, 0x64, 0x1a, 0x63, 0x0a, 0x13, 0x52, 0x65, 0x73, 0x75,
-	0x6c, 0x74, 0x73, 0x42, 0x79, 0x53, 0x68, 0x61, 0x72, 0x64, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12,
-	0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65,
-	0x79, 0x12, 0x36, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b,
-	0x32, 0x20, 0x2e, 0x76, 0x74, 0x63, 0x74, 0x6c, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x56, 0x61, 0x6c,
-	0x69, 0x64, 0x61, 0x74, 0x65, 0x53, 0x68, 0x61, 0x72, 0x64, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e,
-	0x73, 0x65, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x6b, 0x0a,
-	0x14, 0x56, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x65, 0x53, 0x68, 0x61, 0x72, 0x64, 0x52, 0x65,
-	0x71, 0x75, 0x65, 0x73, 0x74, 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, 0x21, 0x0a, 0x0c, 0x70, 0x69, 0x6e, 0x67, 0x5f,
-	0x74, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x73, 0x18, 0x03, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0b, 0x70,
-	0x69, 0x6e, 0x67, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x73, 0x22, 0x31, 0x0a, 0x15, 0x56, 0x61,
-	0x6c, 0x69, 0x64, 0x61, 0x74, 0x65, 0x53, 0x68, 0x61, 0x72, 0x64, 0x52, 0x65, 0x73, 0x70, 0x6f,
-	0x6e, 0x73, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x73, 0x18, 0x01,
-	0x20, 0x03, 0x28, 0x09, 0x52, 0x07, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x73, 0x22, 0x3c, 0x0a,
-	0x1e, 0x56, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x65, 0x56, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e,
-	0x4b, 0x65, 0x79, 0x73, 0x70, 0x61, 0x63, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 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, 0x22, 0x8a, 0x02, 0x0a, 0x1f,
-	0x56, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x65, 0x56, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x4b,
-	0x65, 0x79, 0x73, 0x70, 0x61, 0x63, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12,
-	0x18, 0x0a, 0x07, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x09,
-	0x52, 0x07, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x73, 0x12, 0x68, 0x0a, 0x10, 0x72, 0x65, 0x73,
-	0x75, 0x6c, 0x74, 0x73, 0x5f, 0x62, 0x79, 0x5f, 0x73, 0x68, 0x61, 0x72, 0x64, 0x18, 0x02, 0x20,
-	0x03, 0x28, 0x0b, 0x32, 0x3e, 0x2e, 0x76, 0x74, 0x63, 0x74, 0x6c, 0x64, 0x61, 0x74, 0x61, 0x2e,
-	0x56, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x65, 0x56, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x4b,
-	0x65, 0x79, 0x73, 0x70, 0x61, 0x63, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x2e,
+	0x52, 0x06, 0x73, 0x68, 0x61, 0x72, 0x64, 0x73, 0x12, 0x25, 0x0a, 0x0e, 0x65, 0x78, 0x63, 0x6c,
+	0x75, 0x64, 0x65, 0x5f, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x09,
+	0x52, 0x0d, 0x65, 0x78, 0x63, 0x6c, 0x75, 0x64, 0x65, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x73, 0x12,
+	0x23, 0x0a, 0x0d, 0x69, 0x6e, 0x63, 0x6c, 0x75, 0x64, 0x65, 0x5f, 0x76, 0x69, 0x65, 0x77, 0x73,
+	0x18, 0x04, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0c, 0x69, 0x6e, 0x63, 0x6c, 0x75, 0x64, 0x65, 0x56,
+	0x69, 0x65, 0x77, 0x73, 0x22, 0xfa, 0x01, 0x0a, 0x17, 0x56, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74,
+	0x65, 0x56, 0x53, 0x63, 0x68, 0x65, 0x6d, 0x61, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65,
+	0x12, 0x18, 0x0a, 0x07, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28,
+	0x09, 0x52, 0x07, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x73, 0x12, 0x60, 0x0a, 0x10, 0x72, 0x65,
+	0x73, 0x75, 0x6c, 0x74, 0x73, 0x5f, 0x62, 0x79, 0x5f, 0x73, 0x68, 0x61, 0x72, 0x64, 0x18, 0x02,
+	0x20, 0x03, 0x28, 0x0b, 0x32, 0x36, 0x2e, 0x76, 0x74, 0x63, 0x74, 0x6c, 0x64, 0x61, 0x74, 0x61,
+	0x2e, 0x56, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x65, 0x56, 0x53, 0x63, 0x68, 0x65, 0x6d, 0x61,
+	0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x2e, 0x52, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x73,
+	0x42, 0x79, 0x53, 0x68, 0x61, 0x72, 0x64, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x0e, 0x72, 0x65,
+	0x73, 0x75, 0x6c, 0x74, 0x73, 0x42, 0x79, 0x53, 0x68, 0x61, 0x72, 0x64, 0x1a, 0x63, 0x0a, 0x13,
 	0x52, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x73, 0x42, 0x79, 0x53, 0x68, 0x61, 0x72, 0x64, 0x45, 0x6e,
-	0x74, 0x72, 0x79, 0x52, 0x0e, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x73, 0x42, 0x79, 0x53, 0x68,
-	0x61, 0x72, 0x64, 0x1a, 0x63, 0x0a, 0x13, 0x52, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x73, 0x42, 0x79,
-	0x53, 0x68, 0x61, 0x72, 0x64, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65,
-	0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x36, 0x0a, 0x05,
-	0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x20, 0x2e, 0x76, 0x74,
-	0x63, 0x74, 0x6c, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x56, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x65,
-	0x53, 0x68, 0x61, 0x72, 0x64, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x52, 0x05, 0x76,
-	0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x4f, 0x0a, 0x1b, 0x56, 0x61, 0x6c, 0x69,
-	0x64, 0x61, 0x74, 0x65, 0x56, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x53, 0x68, 0x61, 0x72, 0x64,
-	0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 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, 0x38, 0x0a, 0x1c, 0x56, 0x61, 0x6c,
-	0x69, 0x64, 0x61, 0x74, 0x65, 0x56, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x53, 0x68, 0x61, 0x72,
-	0x64, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x72, 0x65, 0x73,
-	0x75, 0x6c, 0x74, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x09, 0x52, 0x07, 0x72, 0x65, 0x73, 0x75,
-	0x6c, 0x74, 0x73, 0x22, 0x98, 0x01, 0x0a, 0x16, 0x56, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x65,
-	0x56, 0x53, 0x63, 0x68, 0x65, 0x6d, 0x61, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 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, 0x16, 0x0a, 0x06, 0x73, 0x68,
-	0x61, 0x72, 0x64, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x09, 0x52, 0x06, 0x73, 0x68, 0x61, 0x72,
-	0x64, 0x73, 0x12, 0x25, 0x0a, 0x0e, 0x65, 0x78, 0x63, 0x6c, 0x75, 0x64, 0x65, 0x5f, 0x74, 0x61,
-	0x62, 0x6c, 0x65, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0d, 0x65, 0x78, 0x63, 0x6c,
-	0x75, 0x64, 0x65, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x73, 0x12, 0x23, 0x0a, 0x0d, 0x69, 0x6e, 0x63,
-	0x6c, 0x75, 0x64, 0x65, 0x5f, 0x76, 0x69, 0x65, 0x77, 0x73, 0x18, 0x04, 0x20, 0x01, 0x28, 0x08,
-	0x52, 0x0c, 0x69, 0x6e, 0x63, 0x6c, 0x75, 0x64, 0x65, 0x56, 0x69, 0x65, 0x77, 0x73, 0x22, 0xfa,
-	0x01, 0x0a, 0x17, 0x56, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x65, 0x56, 0x53, 0x63, 0x68, 0x65,
-	0x6d, 0x61, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x72, 0x65,
-	0x73, 0x75, 0x6c, 0x74, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x09, 0x52, 0x07, 0x72, 0x65, 0x73,
-	0x75, 0x6c, 0x74, 0x73, 0x12, 0x60, 0x0a, 0x10, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x73, 0x5f,
-	0x62, 0x79, 0x5f, 0x73, 0x68, 0x61, 0x72, 0x64, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x36,
-	0x2e, 0x76, 0x74, 0x63, 0x74, 0x6c, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x56, 0x61, 0x6c, 0x69, 0x64,
-	0x61, 0x74, 0x65, 0x56, 0x53, 0x63, 0x68, 0x65, 0x6d, 0x61, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e,
-	0x73, 0x65, 0x2e, 0x52, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x73, 0x42, 0x79, 0x53, 0x68, 0x61, 0x72,
-	0x64, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x0e, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x73, 0x42,
-	0x79, 0x53, 0x68, 0x61, 0x72, 0x64, 0x1a, 0x63, 0x0a, 0x13, 0x52, 0x65, 0x73, 0x75, 0x6c, 0x74,
-	0x73, 0x42, 0x79, 0x53, 0x68, 0x61, 0x72, 0x64, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a,
-	0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12,
-	0x36, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x20,
-	0x2e, 0x76, 0x74, 0x63, 0x74, 0x6c, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x56, 0x61, 0x6c, 0x69, 0x64,
-	0x61, 0x74, 0x65, 0x53, 0x68, 0x61, 0x72, 0x64, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65,
-	0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0xf9, 0x07, 0x0a, 0x12,
-	0x56, 0x44, 0x69, 0x66, 0x66, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65,
-	0x73, 0x74, 0x12, 0x1a, 0x0a, 0x08, 0x77, 0x6f, 0x72, 0x6b, 0x66, 0x6c, 0x6f, 0x77, 0x18, 0x01,
-	0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x77, 0x6f, 0x72, 0x6b, 0x66, 0x6c, 0x6f, 0x77, 0x12, 0x27,
-	0x0a, 0x0f, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x5f, 0x6b, 0x65, 0x79, 0x73, 0x70, 0x61, 0x63,
-	0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0e, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x4b,
-	0x65, 0x79, 0x73, 0x70, 0x61, 0x63, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x75, 0x75, 0x69, 0x64, 0x18,
-	0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x75, 0x75, 0x69, 0x64, 0x12, 0x21, 0x0a, 0x0c, 0x73,
-	0x6f, 0x75, 0x72, 0x63, 0x65, 0x5f, 0x63, 0x65, 0x6c, 0x6c, 0x73, 0x18, 0x04, 0x20, 0x03, 0x28,
-	0x09, 0x52, 0x0b, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x43, 0x65, 0x6c, 0x6c, 0x73, 0x12, 0x21,
-	0x0a, 0x0c, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x5f, 0x63, 0x65, 0x6c, 0x6c, 0x73, 0x18, 0x05,
-	0x20, 0x03, 0x28, 0x09, 0x52, 0x0b, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x43, 0x65, 0x6c, 0x6c,
-	0x73, 0x12, 0x37, 0x0a, 0x0c, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x5f, 0x74, 0x79, 0x70, 0x65,
-	0x73, 0x18, 0x06, 0x20, 0x03, 0x28, 0x0e, 0x32, 0x14, 0x2e, 0x74, 0x6f, 0x70, 0x6f, 0x64, 0x61,
-	0x74, 0x61, 0x2e, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x54, 0x79, 0x70, 0x65, 0x52, 0x0b, 0x74,
-	0x61, 0x62, 0x6c, 0x65, 0x74, 0x54, 0x79, 0x70, 0x65, 0x73, 0x12, 0x6c, 0x0a, 0x1b, 0x74, 0x61,
-	0x62, 0x6c, 0x65, 0x74, 0x5f, 0x73, 0x65, 0x6c, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x70,
-	0x72, 0x65, 0x66, 0x65, 0x72, 0x65, 0x6e, 0x63, 0x65, 0x18, 0x07, 0x20, 0x01, 0x28, 0x0e, 0x32,
-	0x2c, 0x2e, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x6d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x72, 0x64,
-	0x61, 0x74, 0x61, 0x2e, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x53, 0x65, 0x6c, 0x65, 0x63, 0x74,
-	0x69, 0x6f, 0x6e, 0x50, 0x72, 0x65, 0x66, 0x65, 0x72, 0x65, 0x6e, 0x63, 0x65, 0x52, 0x19, 0x74,
-	0x61, 0x62, 0x6c, 0x65, 0x74, 0x53, 0x65, 0x6c, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x50, 0x72,
-	0x65, 0x66, 0x65, 0x72, 0x65, 0x6e, 0x63, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x74, 0x61, 0x62, 0x6c,
-	0x65, 0x73, 0x18, 0x08, 0x20, 0x03, 0x28, 0x09, 0x52, 0x06, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x73,
-	0x12, 0x14, 0x0a, 0x05, 0x6c, 0x69, 0x6d, 0x69, 0x74, 0x18, 0x09, 0x20, 0x01, 0x28, 0x03, 0x52,
-	0x05, 0x6c, 0x69, 0x6d, 0x69, 0x74, 0x12, 0x55, 0x0a, 0x1e, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72,
-	0x65, 0x64, 0x5f, 0x72, 0x65, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x77,
-	0x61, 0x69, 0x74, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x10,
-	0x2e, 0x76, 0x74, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x44, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e,
-	0x52, 0x1b, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x65, 0x64, 0x52, 0x65, 0x70, 0x6c, 0x69, 0x63,
-	0x61, 0x74, 0x69, 0x6f, 0x6e, 0x57, 0x61, 0x69, 0x74, 0x54, 0x69, 0x6d, 0x65, 0x12, 0x1f, 0x0a,
-	0x0b, 0x64, 0x65, 0x62, 0x75, 0x67, 0x5f, 0x71, 0x75, 0x65, 0x72, 0x79, 0x18, 0x0b, 0x20, 0x01,
-	0x28, 0x08, 0x52, 0x0a, 0x64, 0x65, 0x62, 0x75, 0x67, 0x51, 0x75, 0x65, 0x72, 0x79, 0x12, 0x1a,
-	0x0a, 0x09, 0x6f, 0x6e, 0x6c, 0x79, 0x5f, 0x70, 0x5f, 0x6b, 0x73, 0x18, 0x0c, 0x20, 0x01, 0x28,
-	0x08, 0x52, 0x07, 0x6f, 0x6e, 0x6c, 0x79, 0x50, 0x4b, 0x73, 0x12, 0x2c, 0x0a, 0x12, 0x75, 0x70,
-	0x64, 0x61, 0x74, 0x65, 0x5f, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x5f, 0x73, 0x74, 0x61, 0x74, 0x73,
-	0x18, 0x0d, 0x20, 0x01, 0x28, 0x08, 0x52, 0x10, 0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x54, 0x61,
-	0x62, 0x6c, 0x65, 0x53, 0x74, 0x61, 0x74, 0x73, 0x12, 0x38, 0x0a, 0x19, 0x6d, 0x61, 0x78, 0x5f,
-	0x65, 0x78, 0x74, 0x72, 0x61, 0x5f, 0x72, 0x6f, 0x77, 0x73, 0x5f, 0x74, 0x6f, 0x5f, 0x63, 0x6f,
-	0x6d, 0x70, 0x61, 0x72, 0x65, 0x18, 0x0e, 0x20, 0x01, 0x28, 0x03, 0x52, 0x15, 0x6d, 0x61, 0x78,
-	0x45, 0x78, 0x74, 0x72, 0x61, 0x52, 0x6f, 0x77, 0x73, 0x54, 0x6f, 0x43, 0x6f, 0x6d, 0x70, 0x61,
-	0x72, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x77, 0x61, 0x69, 0x74, 0x18, 0x0f, 0x20, 0x01, 0x28, 0x08,
-	0x52, 0x04, 0x77, 0x61, 0x69, 0x74, 0x12, 0x42, 0x0a, 0x14, 0x77, 0x61, 0x69, 0x74, 0x5f, 0x75,
-	0x70, 0x64, 0x61, 0x74, 0x65, 0x5f, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x76, 0x61, 0x6c, 0x18, 0x10,
-	0x20, 0x01, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x76, 0x74, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x44, 0x75,
-	0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x12, 0x77, 0x61, 0x69, 0x74, 0x55, 0x70, 0x64, 0x61,
-	0x74, 0x65, 0x49, 0x6e, 0x74, 0x65, 0x72, 0x76, 0x61, 0x6c, 0x12, 0x1d, 0x0a, 0x0a, 0x61, 0x75,
-	0x74, 0x6f, 0x5f, 0x72, 0x65, 0x74, 0x72, 0x79, 0x18, 0x11, 0x20, 0x01, 0x28, 0x08, 0x52, 0x09,
-	0x61, 0x75, 0x74, 0x6f, 0x52, 0x65, 0x74, 0x72, 0x79, 0x12, 0x18, 0x0a, 0x07, 0x76, 0x65, 0x72,
-	0x62, 0x6f, 0x73, 0x65, 0x18, 0x12, 0x20, 0x01, 0x28, 0x08, 0x52, 0x07, 0x76, 0x65, 0x72, 0x62,
-	0x6f, 0x73, 0x65, 0x12, 0x33, 0x0a, 0x16, 0x6d, 0x61, 0x78, 0x5f, 0x72, 0x65, 0x70, 0x6f, 0x72,
-	0x74, 0x5f, 0x73, 0x61, 0x6d, 0x70, 0x6c, 0x65, 0x5f, 0x72, 0x6f, 0x77, 0x73, 0x18, 0x13, 0x20,
-	0x01, 0x28, 0x03, 0x52, 0x13, 0x6d, 0x61, 0x78, 0x52, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x53, 0x61,
-	0x6d, 0x70, 0x6c, 0x65, 0x52, 0x6f, 0x77, 0x73, 0x12, 0x3c, 0x0a, 0x11, 0x6d, 0x61, 0x78, 0x5f,
-	0x64, 0x69, 0x66, 0x66, 0x5f, 0x64, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x14, 0x20,
-	0x01, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x76, 0x74, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x44, 0x75, 0x72,
-	0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x0f, 0x6d, 0x61, 0x78, 0x44, 0x69, 0x66, 0x66, 0x44, 0x75,
-	0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x3c, 0x0a, 0x1b, 0x72, 0x6f, 0x77, 0x5f, 0x64, 0x69,
-	0x66, 0x66, 0x5f, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x5f, 0x74, 0x72, 0x75, 0x6e, 0x63, 0x61,
-	0x74, 0x65, 0x5f, 0x61, 0x74, 0x18, 0x15, 0x20, 0x01, 0x28, 0x03, 0x52, 0x17, 0x72, 0x6f, 0x77,
-	0x44, 0x69, 0x66, 0x66, 0x43, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x54, 0x72, 0x75, 0x6e, 0x63, 0x61,
-	0x74, 0x65, 0x41, 0x74, 0x12, 0x22, 0x0a, 0x0a, 0x61, 0x75, 0x74, 0x6f, 0x5f, 0x73, 0x74, 0x61,
-	0x72, 0x74, 0x18, 0x16, 0x20, 0x01, 0x28, 0x08, 0x48, 0x00, 0x52, 0x09, 0x61, 0x75, 0x74, 0x6f,
-	0x53, 0x74, 0x61, 0x72, 0x74, 0x88, 0x01, 0x01, 0x42, 0x0d, 0x0a, 0x0b, 0x5f, 0x61, 0x75, 0x74,
-	0x6f, 0x5f, 0x73, 0x74, 0x61, 0x72, 0x74, 0x22, 0x29, 0x0a, 0x13, 0x56, 0x44, 0x69, 0x66, 0x66,
-	0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x12,
-	0x0a, 0x04, 0x55, 0x55, 0x49, 0x44, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x55, 0x55,
-	0x49, 0x44, 0x22, 0x6b, 0x0a, 0x12, 0x56, 0x44, 0x69, 0x66, 0x66, 0x44, 0x65, 0x6c, 0x65, 0x74,
+	0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09,
+	0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x36, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02,
+	0x20, 0x01, 0x28, 0x0b, 0x32, 0x20, 0x2e, 0x76, 0x74, 0x63, 0x74, 0x6c, 0x64, 0x61, 0x74, 0x61,
+	0x2e, 0x56, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x65, 0x53, 0x68, 0x61, 0x72, 0x64, 0x52, 0x65,
+	0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38,
+	0x01, 0x22, 0xf9, 0x07, 0x0a, 0x12, 0x56, 0x44, 0x69, 0x66, 0x66, 0x43, 0x72, 0x65, 0x61, 0x74,
 	0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x1a, 0x0a, 0x08, 0x77, 0x6f, 0x72, 0x6b,
 	0x66, 0x6c, 0x6f, 0x77, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x77, 0x6f, 0x72, 0x6b,
 	0x66, 0x6c, 0x6f, 0x77, 0x12, 0x27, 0x0a, 0x0f, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x5f, 0x6b,
 	0x65, 0x79, 0x73, 0x70, 0x61, 0x63, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0e, 0x74,
-	0x61, 0x72, 0x67, 0x65, 0x74, 0x4b, 0x65, 0x79, 0x73, 0x70, 0x61, 0x63, 0x65, 0x12, 0x10, 0x0a,
-	0x03, 0x61, 0x72, 0x67, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x61, 0x72, 0x67, 0x22,
-	0x15, 0x0a, 0x13, 0x56, 0x44, 0x69, 0x66, 0x66, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x52, 0x65,
-	0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x92, 0x01, 0x0a, 0x12, 0x56, 0x44, 0x69, 0x66, 0x66,
-	0x52, 0x65, 0x73, 0x75, 0x6d, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x1a, 0x0a,
-	0x08, 0x77, 0x6f, 0x72, 0x6b, 0x66, 0x6c, 0x6f, 0x77, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52,
-	0x08, 0x77, 0x6f, 0x72, 0x6b, 0x66, 0x6c, 0x6f, 0x77, 0x12, 0x27, 0x0a, 0x0f, 0x74, 0x61, 0x72,
-	0x67, 0x65, 0x74, 0x5f, 0x6b, 0x65, 0x79, 0x73, 0x70, 0x61, 0x63, 0x65, 0x18, 0x02, 0x20, 0x01,
-	0x28, 0x09, 0x52, 0x0e, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x4b, 0x65, 0x79, 0x73, 0x70, 0x61,
-	0x63, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x75, 0x75, 0x69, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09,
-	0x52, 0x04, 0x75, 0x75, 0x69, 0x64, 0x12, 0x23, 0x0a, 0x0d, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74,
-	0x5f, 0x73, 0x68, 0x61, 0x72, 0x64, 0x73, 0x18, 0x04, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0c, 0x74,
-	0x61, 0x72, 0x67, 0x65, 0x74, 0x53, 0x68, 0x61, 0x72, 0x64, 0x73, 0x22, 0x15, 0x0a, 0x13, 0x56,
-	0x44, 0x69, 0x66, 0x66, 0x52, 0x65, 0x73, 0x75, 0x6d, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e,
-	0x73, 0x65, 0x22, 0x69, 0x0a, 0x10, 0x56, 0x44, 0x69, 0x66, 0x66, 0x53, 0x68, 0x6f, 0x77, 0x52,
-	0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x1a, 0x0a, 0x08, 0x77, 0x6f, 0x72, 0x6b, 0x66, 0x6c,
-	0x6f, 0x77, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x77, 0x6f, 0x72, 0x6b, 0x66, 0x6c,
-	0x6f, 0x77, 0x12, 0x27, 0x0a, 0x0f, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x5f, 0x6b, 0x65, 0x79,
-	0x73, 0x70, 0x61, 0x63, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0e, 0x74, 0x61, 0x72,
-	0x67, 0x65, 0x74, 0x4b, 0x65, 0x79, 0x73, 0x70, 0x61, 0x63, 0x65, 0x12, 0x10, 0x0a, 0x03, 0x61,
-	0x72, 0x67, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x61, 0x72, 0x67, 0x22, 0xd7, 0x01,
-	0x0a, 0x11, 0x56, 0x44, 0x69, 0x66, 0x66, 0x53, 0x68, 0x6f, 0x77, 0x52, 0x65, 0x73, 0x70, 0x6f,
-	0x6e, 0x73, 0x65, 0x12, 0x5c, 0x0a, 0x10, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x5f, 0x72, 0x65,
-	0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x31, 0x2e,
-	0x76, 0x74, 0x63, 0x74, 0x6c, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x56, 0x44, 0x69, 0x66, 0x66, 0x53,
-	0x68, 0x6f, 0x77, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x2e, 0x54, 0x61, 0x62, 0x6c,
-	0x65, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79,
-	0x52, 0x0f, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65,
-	0x73, 0x1a, 0x64, 0x0a, 0x14, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f,
-	0x6e, 0x73, 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, 0x36, 0x0a, 0x05, 0x76,
-	0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x20, 0x2e, 0x74, 0x61, 0x62,
-	0x6c, 0x65, 0x74, 0x6d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x72, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x56,
-	0x44, 0x69, 0x66, 0x66, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x52, 0x05, 0x76, 0x61,
-	0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x90, 0x01, 0x0a, 0x10, 0x56, 0x44, 0x69, 0x66,
-	0x66, 0x53, 0x74, 0x6f, 0x70, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x1a, 0x0a, 0x08,
+	0x61, 0x72, 0x67, 0x65, 0x74, 0x4b, 0x65, 0x79, 0x73, 0x70, 0x61, 0x63, 0x65, 0x12, 0x12, 0x0a,
+	0x04, 0x75, 0x75, 0x69, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x75, 0x75, 0x69,
+	0x64, 0x12, 0x21, 0x0a, 0x0c, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x5f, 0x63, 0x65, 0x6c, 0x6c,
+	0x73, 0x18, 0x04, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0b, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x43,
+	0x65, 0x6c, 0x6c, 0x73, 0x12, 0x21, 0x0a, 0x0c, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x5f, 0x63,
+	0x65, 0x6c, 0x6c, 0x73, 0x18, 0x05, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0b, 0x74, 0x61, 0x72, 0x67,
+	0x65, 0x74, 0x43, 0x65, 0x6c, 0x6c, 0x73, 0x12, 0x37, 0x0a, 0x0c, 0x74, 0x61, 0x62, 0x6c, 0x65,
+	0x74, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x73, 0x18, 0x06, 0x20, 0x03, 0x28, 0x0e, 0x32, 0x14, 0x2e,
+	0x74, 0x6f, 0x70, 0x6f, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x54,
+	0x79, 0x70, 0x65, 0x52, 0x0b, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x54, 0x79, 0x70, 0x65, 0x73,
+	0x12, 0x6c, 0x0a, 0x1b, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x5f, 0x73, 0x65, 0x6c, 0x65, 0x63,
+	0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x70, 0x72, 0x65, 0x66, 0x65, 0x72, 0x65, 0x6e, 0x63, 0x65, 0x18,
+	0x07, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x2c, 0x2e, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x6d, 0x61,
+	0x6e, 0x61, 0x67, 0x65, 0x72, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x74,
+	0x53, 0x65, 0x6c, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x50, 0x72, 0x65, 0x66, 0x65, 0x72, 0x65,
+	0x6e, 0x63, 0x65, 0x52, 0x19, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x53, 0x65, 0x6c, 0x65, 0x63,
+	0x74, 0x69, 0x6f, 0x6e, 0x50, 0x72, 0x65, 0x66, 0x65, 0x72, 0x65, 0x6e, 0x63, 0x65, 0x12, 0x16,
+	0x0a, 0x06, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x73, 0x18, 0x08, 0x20, 0x03, 0x28, 0x09, 0x52, 0x06,
+	0x74, 0x61, 0x62, 0x6c, 0x65, 0x73, 0x12, 0x14, 0x0a, 0x05, 0x6c, 0x69, 0x6d, 0x69, 0x74, 0x18,
+	0x09, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x6c, 0x69, 0x6d, 0x69, 0x74, 0x12, 0x55, 0x0a, 0x1e,
+	0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x65, 0x64, 0x5f, 0x72, 0x65, 0x70, 0x6c, 0x69, 0x63, 0x61,
+	0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x77, 0x61, 0x69, 0x74, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x0a,
+	0x20, 0x01, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x76, 0x74, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x44, 0x75,
+	0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x1b, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x65, 0x64,
+	0x52, 0x65, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x57, 0x61, 0x69, 0x74, 0x54,
+	0x69, 0x6d, 0x65, 0x12, 0x1f, 0x0a, 0x0b, 0x64, 0x65, 0x62, 0x75, 0x67, 0x5f, 0x71, 0x75, 0x65,
+	0x72, 0x79, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0a, 0x64, 0x65, 0x62, 0x75, 0x67, 0x51,
+	0x75, 0x65, 0x72, 0x79, 0x12, 0x1a, 0x0a, 0x09, 0x6f, 0x6e, 0x6c, 0x79, 0x5f, 0x70, 0x5f, 0x6b,
+	0x73, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x08, 0x52, 0x07, 0x6f, 0x6e, 0x6c, 0x79, 0x50, 0x4b, 0x73,
+	0x12, 0x2c, 0x0a, 0x12, 0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x5f, 0x74, 0x61, 0x62, 0x6c, 0x65,
+	0x5f, 0x73, 0x74, 0x61, 0x74, 0x73, 0x18, 0x0d, 0x20, 0x01, 0x28, 0x08, 0x52, 0x10, 0x75, 0x70,
+	0x64, 0x61, 0x74, 0x65, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x53, 0x74, 0x61, 0x74, 0x73, 0x12, 0x38,
+	0x0a, 0x19, 0x6d, 0x61, 0x78, 0x5f, 0x65, 0x78, 0x74, 0x72, 0x61, 0x5f, 0x72, 0x6f, 0x77, 0x73,
+	0x5f, 0x74, 0x6f, 0x5f, 0x63, 0x6f, 0x6d, 0x70, 0x61, 0x72, 0x65, 0x18, 0x0e, 0x20, 0x01, 0x28,
+	0x03, 0x52, 0x15, 0x6d, 0x61, 0x78, 0x45, 0x78, 0x74, 0x72, 0x61, 0x52, 0x6f, 0x77, 0x73, 0x54,
+	0x6f, 0x43, 0x6f, 0x6d, 0x70, 0x61, 0x72, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x77, 0x61, 0x69, 0x74,
+	0x18, 0x0f, 0x20, 0x01, 0x28, 0x08, 0x52, 0x04, 0x77, 0x61, 0x69, 0x74, 0x12, 0x42, 0x0a, 0x14,
+	0x77, 0x61, 0x69, 0x74, 0x5f, 0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x5f, 0x69, 0x6e, 0x74, 0x65,
+	0x72, 0x76, 0x61, 0x6c, 0x18, 0x10, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x76, 0x74, 0x74,
+	0x69, 0x6d, 0x65, 0x2e, 0x44, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x12, 0x77, 0x61,
+	0x69, 0x74, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x49, 0x6e, 0x74, 0x65, 0x72, 0x76, 0x61, 0x6c,
+	0x12, 0x1d, 0x0a, 0x0a, 0x61, 0x75, 0x74, 0x6f, 0x5f, 0x72, 0x65, 0x74, 0x72, 0x79, 0x18, 0x11,
+	0x20, 0x01, 0x28, 0x08, 0x52, 0x09, 0x61, 0x75, 0x74, 0x6f, 0x52, 0x65, 0x74, 0x72, 0x79, 0x12,
+	0x18, 0x0a, 0x07, 0x76, 0x65, 0x72, 0x62, 0x6f, 0x73, 0x65, 0x18, 0x12, 0x20, 0x01, 0x28, 0x08,
+	0x52, 0x07, 0x76, 0x65, 0x72, 0x62, 0x6f, 0x73, 0x65, 0x12, 0x33, 0x0a, 0x16, 0x6d, 0x61, 0x78,
+	0x5f, 0x72, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x5f, 0x73, 0x61, 0x6d, 0x70, 0x6c, 0x65, 0x5f, 0x72,
+	0x6f, 0x77, 0x73, 0x18, 0x13, 0x20, 0x01, 0x28, 0x03, 0x52, 0x13, 0x6d, 0x61, 0x78, 0x52, 0x65,
+	0x70, 0x6f, 0x72, 0x74, 0x53, 0x61, 0x6d, 0x70, 0x6c, 0x65, 0x52, 0x6f, 0x77, 0x73, 0x12, 0x3c,
+	0x0a, 0x11, 0x6d, 0x61, 0x78, 0x5f, 0x64, 0x69, 0x66, 0x66, 0x5f, 0x64, 0x75, 0x72, 0x61, 0x74,
+	0x69, 0x6f, 0x6e, 0x18, 0x14, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x76, 0x74, 0x74, 0x69,
+	0x6d, 0x65, 0x2e, 0x44, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x0f, 0x6d, 0x61, 0x78,
+	0x44, 0x69, 0x66, 0x66, 0x44, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x3c, 0x0a, 0x1b,
+	0x72, 0x6f, 0x77, 0x5f, 0x64, 0x69, 0x66, 0x66, 0x5f, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x5f,
+	0x74, 0x72, 0x75, 0x6e, 0x63, 0x61, 0x74, 0x65, 0x5f, 0x61, 0x74, 0x18, 0x15, 0x20, 0x01, 0x28,
+	0x03, 0x52, 0x17, 0x72, 0x6f, 0x77, 0x44, 0x69, 0x66, 0x66, 0x43, 0x6f, 0x6c, 0x75, 0x6d, 0x6e,
+	0x54, 0x72, 0x75, 0x6e, 0x63, 0x61, 0x74, 0x65, 0x41, 0x74, 0x12, 0x22, 0x0a, 0x0a, 0x61, 0x75,
+	0x74, 0x6f, 0x5f, 0x73, 0x74, 0x61, 0x72, 0x74, 0x18, 0x16, 0x20, 0x01, 0x28, 0x08, 0x48, 0x00,
+	0x52, 0x09, 0x61, 0x75, 0x74, 0x6f, 0x53, 0x74, 0x61, 0x72, 0x74, 0x88, 0x01, 0x01, 0x42, 0x0d,
+	0x0a, 0x0b, 0x5f, 0x61, 0x75, 0x74, 0x6f, 0x5f, 0x73, 0x74, 0x61, 0x72, 0x74, 0x22, 0x29, 0x0a,
+	0x13, 0x56, 0x44, 0x69, 0x66, 0x66, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x52, 0x65, 0x73, 0x70,
+	0x6f, 0x6e, 0x73, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x55, 0x55, 0x49, 0x44, 0x18, 0x01, 0x20, 0x01,
+	0x28, 0x09, 0x52, 0x04, 0x55, 0x55, 0x49, 0x44, 0x22, 0x6b, 0x0a, 0x12, 0x56, 0x44, 0x69, 0x66,
+	0x66, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x1a,
+	0x0a, 0x08, 0x77, 0x6f, 0x72, 0x6b, 0x66, 0x6c, 0x6f, 0x77, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09,
+	0x52, 0x08, 0x77, 0x6f, 0x72, 0x6b, 0x66, 0x6c, 0x6f, 0x77, 0x12, 0x27, 0x0a, 0x0f, 0x74, 0x61,
+	0x72, 0x67, 0x65, 0x74, 0x5f, 0x6b, 0x65, 0x79, 0x73, 0x70, 0x61, 0x63, 0x65, 0x18, 0x02, 0x20,
+	0x01, 0x28, 0x09, 0x52, 0x0e, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x4b, 0x65, 0x79, 0x73, 0x70,
+	0x61, 0x63, 0x65, 0x12, 0x10, 0x0a, 0x03, 0x61, 0x72, 0x67, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09,
+	0x52, 0x03, 0x61, 0x72, 0x67, 0x22, 0x15, 0x0a, 0x13, 0x56, 0x44, 0x69, 0x66, 0x66, 0x44, 0x65,
+	0x6c, 0x65, 0x74, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x92, 0x01, 0x0a,
+	0x12, 0x56, 0x44, 0x69, 0x66, 0x66, 0x52, 0x65, 0x73, 0x75, 0x6d, 0x65, 0x52, 0x65, 0x71, 0x75,
+	0x65, 0x73, 0x74, 0x12, 0x1a, 0x0a, 0x08, 0x77, 0x6f, 0x72, 0x6b, 0x66, 0x6c, 0x6f, 0x77, 0x18,
+	0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x77, 0x6f, 0x72, 0x6b, 0x66, 0x6c, 0x6f, 0x77, 0x12,
+	0x27, 0x0a, 0x0f, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x5f, 0x6b, 0x65, 0x79, 0x73, 0x70, 0x61,
+	0x63, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0e, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74,
+	0x4b, 0x65, 0x79, 0x73, 0x70, 0x61, 0x63, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x75, 0x75, 0x69, 0x64,
+	0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x75, 0x75, 0x69, 0x64, 0x12, 0x23, 0x0a, 0x0d,
+	0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x5f, 0x73, 0x68, 0x61, 0x72, 0x64, 0x73, 0x18, 0x04, 0x20,
+	0x03, 0x28, 0x09, 0x52, 0x0c, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x53, 0x68, 0x61, 0x72, 0x64,
+	0x73, 0x22, 0x15, 0x0a, 0x13, 0x56, 0x44, 0x69, 0x66, 0x66, 0x52, 0x65, 0x73, 0x75, 0x6d, 0x65,
+	0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x69, 0x0a, 0x10, 0x56, 0x44, 0x69, 0x66,
+	0x66, 0x53, 0x68, 0x6f, 0x77, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x1a, 0x0a, 0x08,
 	0x77, 0x6f, 0x72, 0x6b, 0x66, 0x6c, 0x6f, 0x77, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08,
 	0x77, 0x6f, 0x72, 0x6b, 0x66, 0x6c, 0x6f, 0x77, 0x12, 0x27, 0x0a, 0x0f, 0x74, 0x61, 0x72, 0x67,
 	0x65, 0x74, 0x5f, 0x6b, 0x65, 0x79, 0x73, 0x70, 0x61, 0x63, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28,
 	0x09, 0x52, 0x0e, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x4b, 0x65, 0x79, 0x73, 0x70, 0x61, 0x63,
-	0x65, 0x12, 0x12, 0x0a, 0x04, 0x75, 0x75, 0x69, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52,
-	0x04, 0x75, 0x75, 0x69, 0x64, 0x12, 0x23, 0x0a, 0x0d, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x5f,
-	0x73, 0x68, 0x61, 0x72, 0x64, 0x73, 0x18, 0x04, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0c, 0x74, 0x61,
-	0x72, 0x67, 0x65, 0x74, 0x53, 0x68, 0x61, 0x72, 0x64, 0x73, 0x22, 0x13, 0x0a, 0x11, 0x56, 0x44,
-	0x69, 0x66, 0x66, 0x53, 0x74, 0x6f, 0x70, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22,
-	0xde, 0x01, 0x0a, 0x15, 0x57, 0x6f, 0x72, 0x6b, 0x66, 0x6c, 0x6f, 0x77, 0x44, 0x65, 0x6c, 0x65,
-	0x74, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 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, 0x1a, 0x0a, 0x08, 0x77, 0x6f, 0x72, 0x6b, 0x66, 0x6c, 0x6f,
-	0x77, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x77, 0x6f, 0x72, 0x6b, 0x66, 0x6c, 0x6f,
-	0x77, 0x12, 0x1b, 0x0a, 0x09, 0x6b, 0x65, 0x65, 0x70, 0x5f, 0x64, 0x61, 0x74, 0x61, 0x18, 0x03,
-	0x20, 0x01, 0x28, 0x08, 0x52, 0x08, 0x6b, 0x65, 0x65, 0x70, 0x44, 0x61, 0x74, 0x61, 0x12, 0x2c,
-	0x0a, 0x12, 0x6b, 0x65, 0x65, 0x70, 0x5f, 0x72, 0x6f, 0x75, 0x74, 0x69, 0x6e, 0x67, 0x5f, 0x72,
-	0x75, 0x6c, 0x65, 0x73, 0x18, 0x04, 0x20, 0x01, 0x28, 0x08, 0x52, 0x10, 0x6b, 0x65, 0x65, 0x70,
-	0x52, 0x6f, 0x75, 0x74, 0x69, 0x6e, 0x67, 0x52, 0x75, 0x6c, 0x65, 0x73, 0x12, 0x16, 0x0a, 0x06,
-	0x73, 0x68, 0x61, 0x72, 0x64, 0x73, 0x18, 0x05, 0x20, 0x03, 0x28, 0x09, 0x52, 0x06, 0x73, 0x68,
-	0x61, 0x72, 0x64, 0x73, 0x12, 0x2a, 0x0a, 0x11, 0x64, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x5f, 0x62,
-	0x61, 0x74, 0x63, 0x68, 0x5f, 0x73, 0x69, 0x7a, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x03, 0x52,
-	0x0f, 0x64, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x42, 0x61, 0x74, 0x63, 0x68, 0x53, 0x69, 0x7a, 0x65,
-	0x22, 0xd1, 0x01, 0x0a, 0x16, 0x57, 0x6f, 0x72, 0x6b, 0x66, 0x6c, 0x6f, 0x77, 0x44, 0x65, 0x6c,
-	0x65, 0x74, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x73,
-	0x75, 0x6d, 0x6d, 0x61, 0x72, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x73, 0x75,
-	0x6d, 0x6d, 0x61, 0x72, 0x79, 0x12, 0x46, 0x0a, 0x07, 0x64, 0x65, 0x74, 0x61, 0x69, 0x6c, 0x73,
-	0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x2c, 0x2e, 0x76, 0x74, 0x63, 0x74, 0x6c, 0x64, 0x61,
-	0x74, 0x61, 0x2e, 0x57, 0x6f, 0x72, 0x6b, 0x66, 0x6c, 0x6f, 0x77, 0x44, 0x65, 0x6c, 0x65, 0x74,
-	0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x2e, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x74,
-	0x49, 0x6e, 0x66, 0x6f, 0x52, 0x07, 0x64, 0x65, 0x74, 0x61, 0x69, 0x6c, 0x73, 0x1a, 0x55, 0x0a,
-	0x0a, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x2d, 0x0a, 0x06, 0x74,
-	0x61, 0x62, 0x6c, 0x65, 0x74, 0x18, 0x01, 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, 0x06, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x12, 0x18, 0x0a, 0x07, 0x64, 0x65,
-	0x6c, 0x65, 0x74, 0x65, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x07, 0x64, 0x65, 0x6c,
-	0x65, 0x74, 0x65, 0x64, 0x22, 0x67, 0x0a, 0x15, 0x57, 0x6f, 0x72, 0x6b, 0x66, 0x6c, 0x6f, 0x77,
-	0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x1a, 0x0a,
+	0x65, 0x12, 0x10, 0x0a, 0x03, 0x61, 0x72, 0x67, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03,
+	0x61, 0x72, 0x67, 0x22, 0xd7, 0x01, 0x0a, 0x11, 0x56, 0x44, 0x69, 0x66, 0x66, 0x53, 0x68, 0x6f,
+	0x77, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x5c, 0x0a, 0x10, 0x74, 0x61, 0x62,
+	0x6c, 0x65, 0x74, 0x5f, 0x72, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x73, 0x18, 0x01, 0x20,
+	0x03, 0x28, 0x0b, 0x32, 0x31, 0x2e, 0x76, 0x74, 0x63, 0x74, 0x6c, 0x64, 0x61, 0x74, 0x61, 0x2e,
+	0x56, 0x44, 0x69, 0x66, 0x66, 0x53, 0x68, 0x6f, 0x77, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73,
+	0x65, 0x2e, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65,
+	0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x0f, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x52, 0x65,
+	0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x73, 0x1a, 0x64, 0x0a, 0x14, 0x54, 0x61, 0x62, 0x6c, 0x65,
+	0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 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, 0x36, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b,
+	0x32, 0x20, 0x2e, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x6d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x72,
+	0x64, 0x61, 0x74, 0x61, 0x2e, 0x56, 0x44, 0x69, 0x66, 0x66, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e,
+	0x73, 0x65, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x90, 0x01,
+	0x0a, 0x10, 0x56, 0x44, 0x69, 0x66, 0x66, 0x53, 0x74, 0x6f, 0x70, 0x52, 0x65, 0x71, 0x75, 0x65,
+	0x73, 0x74, 0x12, 0x1a, 0x0a, 0x08, 0x77, 0x6f, 0x72, 0x6b, 0x66, 0x6c, 0x6f, 0x77, 0x18, 0x01,
+	0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x77, 0x6f, 0x72, 0x6b, 0x66, 0x6c, 0x6f, 0x77, 0x12, 0x27,
+	0x0a, 0x0f, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x5f, 0x6b, 0x65, 0x79, 0x73, 0x70, 0x61, 0x63,
+	0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0e, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x4b,
+	0x65, 0x79, 0x73, 0x70, 0x61, 0x63, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x75, 0x75, 0x69, 0x64, 0x18,
+	0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x75, 0x75, 0x69, 0x64, 0x12, 0x23, 0x0a, 0x0d, 0x74,
+	0x61, 0x72, 0x67, 0x65, 0x74, 0x5f, 0x73, 0x68, 0x61, 0x72, 0x64, 0x73, 0x18, 0x04, 0x20, 0x03,
+	0x28, 0x09, 0x52, 0x0c, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x53, 0x68, 0x61, 0x72, 0x64, 0x73,
+	0x22, 0x13, 0x0a, 0x11, 0x56, 0x44, 0x69, 0x66, 0x66, 0x53, 0x74, 0x6f, 0x70, 0x52, 0x65, 0x73,
+	0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0xde, 0x01, 0x0a, 0x15, 0x57, 0x6f, 0x72, 0x6b, 0x66, 0x6c,
+	0x6f, 0x77, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 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, 0x1a, 0x0a, 0x08, 0x77,
+	0x6f, 0x72, 0x6b, 0x66, 0x6c, 0x6f, 0x77, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x77,
+	0x6f, 0x72, 0x6b, 0x66, 0x6c, 0x6f, 0x77, 0x12, 0x1b, 0x0a, 0x09, 0x6b, 0x65, 0x65, 0x70, 0x5f,
+	0x64, 0x61, 0x74, 0x61, 0x18, 0x03, 0x20, 0x01, 0x28, 0x08, 0x52, 0x08, 0x6b, 0x65, 0x65, 0x70,
+	0x44, 0x61, 0x74, 0x61, 0x12, 0x2c, 0x0a, 0x12, 0x6b, 0x65, 0x65, 0x70, 0x5f, 0x72, 0x6f, 0x75,
+	0x74, 0x69, 0x6e, 0x67, 0x5f, 0x72, 0x75, 0x6c, 0x65, 0x73, 0x18, 0x04, 0x20, 0x01, 0x28, 0x08,
+	0x52, 0x10, 0x6b, 0x65, 0x65, 0x70, 0x52, 0x6f, 0x75, 0x74, 0x69, 0x6e, 0x67, 0x52, 0x75, 0x6c,
+	0x65, 0x73, 0x12, 0x16, 0x0a, 0x06, 0x73, 0x68, 0x61, 0x72, 0x64, 0x73, 0x18, 0x05, 0x20, 0x03,
+	0x28, 0x09, 0x52, 0x06, 0x73, 0x68, 0x61, 0x72, 0x64, 0x73, 0x12, 0x2a, 0x0a, 0x11, 0x64, 0x65,
+	0x6c, 0x65, 0x74, 0x65, 0x5f, 0x62, 0x61, 0x74, 0x63, 0x68, 0x5f, 0x73, 0x69, 0x7a, 0x65, 0x18,
+	0x06, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0f, 0x64, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x42, 0x61, 0x74,
+	0x63, 0x68, 0x53, 0x69, 0x7a, 0x65, 0x22, 0xd1, 0x01, 0x0a, 0x16, 0x57, 0x6f, 0x72, 0x6b, 0x66,
+	0x6c, 0x6f, 0x77, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73,
+	0x65, 0x12, 0x18, 0x0a, 0x07, 0x73, 0x75, 0x6d, 0x6d, 0x61, 0x72, 0x79, 0x18, 0x01, 0x20, 0x01,
+	0x28, 0x09, 0x52, 0x07, 0x73, 0x75, 0x6d, 0x6d, 0x61, 0x72, 0x79, 0x12, 0x46, 0x0a, 0x07, 0x64,
+	0x65, 0x74, 0x61, 0x69, 0x6c, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x2c, 0x2e, 0x76,
+	0x74, 0x63, 0x74, 0x6c, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x57, 0x6f, 0x72, 0x6b, 0x66, 0x6c, 0x6f,
+	0x77, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x2e,
+	0x54, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x07, 0x64, 0x65, 0x74, 0x61,
+	0x69, 0x6c, 0x73, 0x1a, 0x55, 0x0a, 0x0a, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x49, 0x6e, 0x66,
+	0x6f, 0x12, 0x2d, 0x0a, 0x06, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x18, 0x01, 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, 0x06, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x74,
+	0x12, 0x18, 0x0a, 0x07, 0x64, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28,
+	0x08, 0x52, 0x07, 0x64, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x64, 0x22, 0x67, 0x0a, 0x15, 0x57, 0x6f,
+	0x72, 0x6b, 0x66, 0x6c, 0x6f, 0x77, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x52, 0x65, 0x71, 0x75,
+	0x65, 0x73, 0x74, 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,
+	0x1a, 0x0a, 0x08, 0x77, 0x6f, 0x72, 0x6b, 0x66, 0x6c, 0x6f, 0x77, 0x18, 0x02, 0x20, 0x01, 0x28,
+	0x09, 0x52, 0x08, 0x77, 0x6f, 0x72, 0x6b, 0x66, 0x6c, 0x6f, 0x77, 0x12, 0x16, 0x0a, 0x06, 0x73,
+	0x68, 0x61, 0x72, 0x64, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x09, 0x52, 0x06, 0x73, 0x68, 0x61,
+	0x72, 0x64, 0x73, 0x22, 0xe6, 0x07, 0x0a, 0x16, 0x57, 0x6f, 0x72, 0x6b, 0x66, 0x6c, 0x6f, 0x77,
+	0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x5f,
+	0x0a, 0x10, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x5f, 0x63, 0x6f, 0x70, 0x79, 0x5f, 0x73, 0x74, 0x61,
+	0x74, 0x65, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x35, 0x2e, 0x76, 0x74, 0x63, 0x74, 0x6c,
+	0x64, 0x61, 0x74, 0x61, 0x2e, 0x57, 0x6f, 0x72, 0x6b, 0x66, 0x6c, 0x6f, 0x77, 0x53, 0x74, 0x61,
+	0x74, 0x75, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x2e, 0x54, 0x61, 0x62, 0x6c,
+	0x65, 0x43, 0x6f, 0x70, 0x79, 0x53, 0x74, 0x61, 0x74, 0x65, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52,
+	0x0e, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x43, 0x6f, 0x70, 0x79, 0x53, 0x74, 0x61, 0x74, 0x65, 0x12,
+	0x58, 0x0a, 0x0d, 0x73, 0x68, 0x61, 0x72, 0x64, 0x5f, 0x73, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x73,
+	0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x33, 0x2e, 0x76, 0x74, 0x63, 0x74, 0x6c, 0x64, 0x61,
+	0x74, 0x61, 0x2e, 0x57, 0x6f, 0x72, 0x6b, 0x66, 0x6c, 0x6f, 0x77, 0x53, 0x74, 0x61, 0x74, 0x75,
+	0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x2e, 0x53, 0x68, 0x61, 0x72, 0x64, 0x53,
+	0x74, 0x72, 0x65, 0x61, 0x6d, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x0c, 0x73, 0x68, 0x61,
+	0x72, 0x64, 0x53, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x73, 0x12, 0x23, 0x0a, 0x0d, 0x74, 0x72, 0x61,
+	0x66, 0x66, 0x69, 0x63, 0x5f, 0x73, 0x74, 0x61, 0x74, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09,
+	0x52, 0x0c, 0x74, 0x72, 0x61, 0x66, 0x66, 0x69, 0x63, 0x53, 0x74, 0x61, 0x74, 0x65, 0x1a, 0xe8,
+	0x01, 0x0a, 0x0e, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x43, 0x6f, 0x70, 0x79, 0x53, 0x74, 0x61, 0x74,
+	0x65, 0x12, 0x1f, 0x0a, 0x0b, 0x72, 0x6f, 0x77, 0x73, 0x5f, 0x63, 0x6f, 0x70, 0x69, 0x65, 0x64,
+	0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0a, 0x72, 0x6f, 0x77, 0x73, 0x43, 0x6f, 0x70, 0x69,
+	0x65, 0x64, 0x12, 0x1d, 0x0a, 0x0a, 0x72, 0x6f, 0x77, 0x73, 0x5f, 0x74, 0x6f, 0x74, 0x61, 0x6c,
+	0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x09, 0x72, 0x6f, 0x77, 0x73, 0x54, 0x6f, 0x74, 0x61,
+	0x6c, 0x12, 0x27, 0x0a, 0x0f, 0x72, 0x6f, 0x77, 0x73, 0x5f, 0x70, 0x65, 0x72, 0x63, 0x65, 0x6e,
+	0x74, 0x61, 0x67, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x02, 0x52, 0x0e, 0x72, 0x6f, 0x77, 0x73,
+	0x50, 0x65, 0x72, 0x63, 0x65, 0x6e, 0x74, 0x61, 0x67, 0x65, 0x12, 0x21, 0x0a, 0x0c, 0x62, 0x79,
+	0x74, 0x65, 0x73, 0x5f, 0x63, 0x6f, 0x70, 0x69, 0x65, 0x64, 0x18, 0x04, 0x20, 0x01, 0x28, 0x03,
+	0x52, 0x0b, 0x62, 0x79, 0x74, 0x65, 0x73, 0x43, 0x6f, 0x70, 0x69, 0x65, 0x64, 0x12, 0x1f, 0x0a,
+	0x0b, 0x62, 0x79, 0x74, 0x65, 0x73, 0x5f, 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x18, 0x05, 0x20, 0x01,
+	0x28, 0x03, 0x52, 0x0a, 0x62, 0x79, 0x74, 0x65, 0x73, 0x54, 0x6f, 0x74, 0x61, 0x6c, 0x12, 0x29,
+	0x0a, 0x10, 0x62, 0x79, 0x74, 0x65, 0x73, 0x5f, 0x70, 0x65, 0x72, 0x63, 0x65, 0x6e, 0x74, 0x61,
+	0x67, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x02, 0x52, 0x0f, 0x62, 0x79, 0x74, 0x65, 0x73, 0x50,
+	0x65, 0x72, 0x63, 0x65, 0x6e, 0x74, 0x61, 0x67, 0x65, 0x1a, 0xbc, 0x01, 0x0a, 0x10, 0x53, 0x68,
+	0x61, 0x72, 0x64, 0x53, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x53, 0x74, 0x61, 0x74, 0x65, 0x12, 0x0e,
+	0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x69, 0x64, 0x12, 0x2d,
+	0x0a, 0x06, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x74, 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, 0x06, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x12, 0x21, 0x0a,
+	0x0c, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x5f, 0x73, 0x68, 0x61, 0x72, 0x64, 0x18, 0x03, 0x20,
+	0x01, 0x28, 0x09, 0x52, 0x0b, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x53, 0x68, 0x61, 0x72, 0x64,
+	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, 0x16, 0x0a, 0x06,
+	0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x73, 0x74,
+	0x61, 0x74, 0x75, 0x73, 0x12, 0x12, 0x0a, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x06, 0x20, 0x01,
+	0x28, 0x09, 0x52, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x1a, 0x5c, 0x0a, 0x0c, 0x53, 0x68, 0x61, 0x72,
+	0x64, 0x53, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x73, 0x12, 0x4c, 0x0a, 0x07, 0x73, 0x74, 0x72, 0x65,
+	0x61, 0x6d, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x32, 0x2e, 0x76, 0x74, 0x63, 0x74,
+	0x6c, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x57, 0x6f, 0x72, 0x6b, 0x66, 0x6c, 0x6f, 0x77, 0x53, 0x74,
+	0x61, 0x74, 0x75, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x2e, 0x53, 0x68, 0x61,
+	0x72, 0x64, 0x53, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x53, 0x74, 0x61, 0x74, 0x65, 0x52, 0x07, 0x73,
+	0x74, 0x72, 0x65, 0x61, 0x6d, 0x73, 0x1a, 0x73, 0x0a, 0x13, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x43,
+	0x6f, 0x70, 0x79, 0x53, 0x74, 0x61, 0x74, 0x65, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a,
+	0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12,
+	0x46, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x30,
+	0x2e, 0x76, 0x74, 0x63, 0x74, 0x6c, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x57, 0x6f, 0x72, 0x6b, 0x66,
+	0x6c, 0x6f, 0x77, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73,
+	0x65, 0x2e, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x43, 0x6f, 0x70, 0x79, 0x53, 0x74, 0x61, 0x74, 0x65,
+	0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x6f, 0x0a, 0x11, 0x53,
+	0x68, 0x61, 0x72, 0x64, 0x53, 0x74, 0x72, 0x65, 0x61, 0x6d, 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, 0x44, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28,
+	0x0b, 0x32, 0x2e, 0x2e, 0x76, 0x74, 0x63, 0x74, 0x6c, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x57, 0x6f,
+	0x72, 0x6b, 0x66, 0x6c, 0x6f, 0x77, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x52, 0x65, 0x73, 0x70,
+	0x6f, 0x6e, 0x73, 0x65, 0x2e, 0x53, 0x68, 0x61, 0x72, 0x64, 0x53, 0x74, 0x72, 0x65, 0x61, 0x6d,
+	0x73, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x85, 0x04, 0x0a,
+	0x1c, 0x57, 0x6f, 0x72, 0x6b, 0x66, 0x6c, 0x6f, 0x77, 0x53, 0x77, 0x69, 0x74, 0x63, 0x68, 0x54,
+	0x72, 0x61, 0x66, 0x66, 0x69, 0x63, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 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, 0x1a, 0x0a, 0x08, 0x77, 0x6f, 0x72,
 	0x6b, 0x66, 0x6c, 0x6f, 0x77, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x77, 0x6f, 0x72,
-	0x6b, 0x66, 0x6c, 0x6f, 0x77, 0x12, 0x16, 0x0a, 0x06, 0x73, 0x68, 0x61, 0x72, 0x64, 0x73, 0x18,
-	0x03, 0x20, 0x03, 0x28, 0x09, 0x52, 0x06, 0x73, 0x68, 0x61, 0x72, 0x64, 0x73, 0x22, 0xe6, 0x07,
-	0x0a, 0x16, 0x57, 0x6f, 0x72, 0x6b, 0x66, 0x6c, 0x6f, 0x77, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73,
-	0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x5f, 0x0a, 0x10, 0x74, 0x61, 0x62, 0x6c,
-	0x65, 0x5f, 0x63, 0x6f, 0x70, 0x79, 0x5f, 0x73, 0x74, 0x61, 0x74, 0x65, 0x18, 0x01, 0x20, 0x03,
-	0x28, 0x0b, 0x32, 0x35, 0x2e, 0x76, 0x74, 0x63, 0x74, 0x6c, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x57,
-	0x6f, 0x72, 0x6b, 0x66, 0x6c, 0x6f, 0x77, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x52, 0x65, 0x73,
-	0x70, 0x6f, 0x6e, 0x73, 0x65, 0x2e, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x43, 0x6f, 0x70, 0x79, 0x53,
-	0x74, 0x61, 0x74, 0x65, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x0e, 0x74, 0x61, 0x62, 0x6c, 0x65,
-	0x43, 0x6f, 0x70, 0x79, 0x53, 0x74, 0x61, 0x74, 0x65, 0x12, 0x58, 0x0a, 0x0d, 0x73, 0x68, 0x61,
-	0x72, 0x64, 0x5f, 0x73, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b,
-	0x32, 0x33, 0x2e, 0x76, 0x74, 0x63, 0x74, 0x6c, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x57, 0x6f, 0x72,
-	0x6b, 0x66, 0x6c, 0x6f, 0x77, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f,
-	0x6e, 0x73, 0x65, 0x2e, 0x53, 0x68, 0x61, 0x72, 0x64, 0x53, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x73,
-	0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x0c, 0x73, 0x68, 0x61, 0x72, 0x64, 0x53, 0x74, 0x72, 0x65,
-	0x61, 0x6d, 0x73, 0x12, 0x23, 0x0a, 0x0d, 0x74, 0x72, 0x61, 0x66, 0x66, 0x69, 0x63, 0x5f, 0x73,
-	0x74, 0x61, 0x74, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x74, 0x72, 0x61, 0x66,
-	0x66, 0x69, 0x63, 0x53, 0x74, 0x61, 0x74, 0x65, 0x1a, 0xe8, 0x01, 0x0a, 0x0e, 0x54, 0x61, 0x62,
-	0x6c, 0x65, 0x43, 0x6f, 0x70, 0x79, 0x53, 0x74, 0x61, 0x74, 0x65, 0x12, 0x1f, 0x0a, 0x0b, 0x72,
-	0x6f, 0x77, 0x73, 0x5f, 0x63, 0x6f, 0x70, 0x69, 0x65, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03,
-	0x52, 0x0a, 0x72, 0x6f, 0x77, 0x73, 0x43, 0x6f, 0x70, 0x69, 0x65, 0x64, 0x12, 0x1d, 0x0a, 0x0a,
-	0x72, 0x6f, 0x77, 0x73, 0x5f, 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03,
-	0x52, 0x09, 0x72, 0x6f, 0x77, 0x73, 0x54, 0x6f, 0x74, 0x61, 0x6c, 0x12, 0x27, 0x0a, 0x0f, 0x72,
-	0x6f, 0x77, 0x73, 0x5f, 0x70, 0x65, 0x72, 0x63, 0x65, 0x6e, 0x74, 0x61, 0x67, 0x65, 0x18, 0x03,
-	0x20, 0x01, 0x28, 0x02, 0x52, 0x0e, 0x72, 0x6f, 0x77, 0x73, 0x50, 0x65, 0x72, 0x63, 0x65, 0x6e,
-	0x74, 0x61, 0x67, 0x65, 0x12, 0x21, 0x0a, 0x0c, 0x62, 0x79, 0x74, 0x65, 0x73, 0x5f, 0x63, 0x6f,
-	0x70, 0x69, 0x65, 0x64, 0x18, 0x04, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0b, 0x62, 0x79, 0x74, 0x65,
-	0x73, 0x43, 0x6f, 0x70, 0x69, 0x65, 0x64, 0x12, 0x1f, 0x0a, 0x0b, 0x62, 0x79, 0x74, 0x65, 0x73,
-	0x5f, 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x18, 0x05, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0a, 0x62, 0x79,
-	0x74, 0x65, 0x73, 0x54, 0x6f, 0x74, 0x61, 0x6c, 0x12, 0x29, 0x0a, 0x10, 0x62, 0x79, 0x74, 0x65,
-	0x73, 0x5f, 0x70, 0x65, 0x72, 0x63, 0x65, 0x6e, 0x74, 0x61, 0x67, 0x65, 0x18, 0x06, 0x20, 0x01,
-	0x28, 0x02, 0x52, 0x0f, 0x62, 0x79, 0x74, 0x65, 0x73, 0x50, 0x65, 0x72, 0x63, 0x65, 0x6e, 0x74,
-	0x61, 0x67, 0x65, 0x1a, 0xbc, 0x01, 0x0a, 0x10, 0x53, 0x68, 0x61, 0x72, 0x64, 0x53, 0x74, 0x72,
-	0x65, 0x61, 0x6d, 0x53, 0x74, 0x61, 0x74, 0x65, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01,
-	0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x69, 0x64, 0x12, 0x2d, 0x0a, 0x06, 0x74, 0x61, 0x62, 0x6c,
-	0x65, 0x74, 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,
-	0x06, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x12, 0x21, 0x0a, 0x0c, 0x73, 0x6f, 0x75, 0x72, 0x63,
-	0x65, 0x5f, 0x73, 0x68, 0x61, 0x72, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x73,
-	0x6f, 0x75, 0x72, 0x63, 0x65, 0x53, 0x68, 0x61, 0x72, 0x64, 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, 0x16, 0x0a, 0x06, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73,
-	0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x12, 0x12,
-	0x0a, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x69, 0x6e,
-	0x66, 0x6f, 0x1a, 0x5c, 0x0a, 0x0c, 0x53, 0x68, 0x61, 0x72, 0x64, 0x53, 0x74, 0x72, 0x65, 0x61,
-	0x6d, 0x73, 0x12, 0x4c, 0x0a, 0x07, 0x73, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x73, 0x18, 0x02, 0x20,
-	0x03, 0x28, 0x0b, 0x32, 0x32, 0x2e, 0x76, 0x74, 0x63, 0x74, 0x6c, 0x64, 0x61, 0x74, 0x61, 0x2e,
-	0x57, 0x6f, 0x72, 0x6b, 0x66, 0x6c, 0x6f, 0x77, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x52, 0x65,
-	0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x2e, 0x53, 0x68, 0x61, 0x72, 0x64, 0x53, 0x74, 0x72, 0x65,
-	0x61, 0x6d, 0x53, 0x74, 0x61, 0x74, 0x65, 0x52, 0x07, 0x73, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x73,
-	0x1a, 0x73, 0x0a, 0x13, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x43, 0x6f, 0x70, 0x79, 0x53, 0x74, 0x61,
-	0x74, 0x65, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01,
-	0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x46, 0x0a, 0x05, 0x76, 0x61, 0x6c,
-	0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x30, 0x2e, 0x76, 0x74, 0x63, 0x74, 0x6c,
-	0x64, 0x61, 0x74, 0x61, 0x2e, 0x57, 0x6f, 0x72, 0x6b, 0x66, 0x6c, 0x6f, 0x77, 0x53, 0x74, 0x61,
-	0x74, 0x75, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x2e, 0x54, 0x61, 0x62, 0x6c,
-	0x65, 0x43, 0x6f, 0x70, 0x79, 0x53, 0x74, 0x61, 0x74, 0x65, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75,
-	0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x6f, 0x0a, 0x11, 0x53, 0x68, 0x61, 0x72, 0x64, 0x53, 0x74,
-	0x72, 0x65, 0x61, 0x6d, 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, 0x44, 0x0a, 0x05,
-	0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2e, 0x2e, 0x76, 0x74,
-	0x63, 0x74, 0x6c, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x57, 0x6f, 0x72, 0x6b, 0x66, 0x6c, 0x6f, 0x77,
-	0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x2e, 0x53,
-	0x68, 0x61, 0x72, 0x64, 0x53, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x73, 0x52, 0x05, 0x76, 0x61, 0x6c,
-	0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x85, 0x04, 0x0a, 0x1c, 0x57, 0x6f, 0x72, 0x6b, 0x66,
-	0x6c, 0x6f, 0x77, 0x53, 0x77, 0x69, 0x74, 0x63, 0x68, 0x54, 0x72, 0x61, 0x66, 0x66, 0x69, 0x63,
-	0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 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, 0x1a, 0x0a, 0x08, 0x77, 0x6f, 0x72, 0x6b, 0x66, 0x6c, 0x6f, 0x77, 0x18,
-	0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x77, 0x6f, 0x72, 0x6b, 0x66, 0x6c, 0x6f, 0x77, 0x12,
-	0x14, 0x0a, 0x05, 0x63, 0x65, 0x6c, 0x6c, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x09, 0x52, 0x05,
-	0x63, 0x65, 0x6c, 0x6c, 0x73, 0x12, 0x37, 0x0a, 0x0c, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x5f,
-	0x74, 0x79, 0x70, 0x65, 0x73, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0e, 0x32, 0x14, 0x2e, 0x74, 0x6f,
-	0x70, 0x6f, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x54, 0x79, 0x70,
-	0x65, 0x52, 0x0b, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x54, 0x79, 0x70, 0x65, 0x73, 0x12, 0x4f,
-	0x0a, 0x1b, 0x6d, 0x61, 0x78, 0x5f, 0x72, 0x65, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f,
-	0x6e, 0x5f, 0x6c, 0x61, 0x67, 0x5f, 0x61, 0x6c, 0x6c, 0x6f, 0x77, 0x65, 0x64, 0x18, 0x05, 0x20,
-	0x01, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x76, 0x74, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x44, 0x75, 0x72,
-	0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x18, 0x6d, 0x61, 0x78, 0x52, 0x65, 0x70, 0x6c, 0x69, 0x63,
-	0x61, 0x74, 0x69, 0x6f, 0x6e, 0x4c, 0x61, 0x67, 0x41, 0x6c, 0x6c, 0x6f, 0x77, 0x65, 0x64, 0x12,
-	0x3c, 0x0a, 0x1a, 0x65, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x5f, 0x72, 0x65, 0x76, 0x65, 0x72, 0x73,
-	0x65, 0x5f, 0x72, 0x65, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x06, 0x20,
-	0x01, 0x28, 0x08, 0x52, 0x18, 0x65, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x52, 0x65, 0x76, 0x65, 0x72,
-	0x73, 0x65, 0x52, 0x65, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x1c, 0x0a,
-	0x09, 0x64, 0x69, 0x72, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x07, 0x20, 0x01, 0x28, 0x05,
-	0x52, 0x09, 0x64, 0x69, 0x72, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x2a, 0x0a, 0x07, 0x74,
-	0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x18, 0x08, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x76,
-	0x74, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x44, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x07,
-	0x74, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x12, 0x17, 0x0a, 0x07, 0x64, 0x72, 0x79, 0x5f, 0x72,
-	0x75, 0x6e, 0x18, 0x09, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x64, 0x72, 0x79, 0x52, 0x75, 0x6e,
-	0x12, 0x3e, 0x0a, 0x1b, 0x69, 0x6e, 0x69, 0x74, 0x69, 0x61, 0x6c, 0x69, 0x7a, 0x65, 0x5f, 0x74,
-	0x61, 0x72, 0x67, 0x65, 0x74, 0x5f, 0x73, 0x65, 0x71, 0x75, 0x65, 0x6e, 0x63, 0x65, 0x73, 0x18,
-	0x0a, 0x20, 0x01, 0x28, 0x08, 0x52, 0x19, 0x69, 0x6e, 0x69, 0x74, 0x69, 0x61, 0x6c, 0x69, 0x7a,
-	0x65, 0x54, 0x61, 0x72, 0x67, 0x65, 0x74, 0x53, 0x65, 0x71, 0x75, 0x65, 0x6e, 0x63, 0x65, 0x73,
-	0x12, 0x16, 0x0a, 0x06, 0x73, 0x68, 0x61, 0x72, 0x64, 0x73, 0x18, 0x0b, 0x20, 0x03, 0x28, 0x09,
-	0x52, 0x06, 0x73, 0x68, 0x61, 0x72, 0x64, 0x73, 0x12, 0x14, 0x0a, 0x05, 0x66, 0x6f, 0x72, 0x63,
-	0x65, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x08, 0x52, 0x05, 0x66, 0x6f, 0x72, 0x63, 0x65, 0x22, 0xa7,
-	0x01, 0x0a, 0x1d, 0x57, 0x6f, 0x72, 0x6b, 0x66, 0x6c, 0x6f, 0x77, 0x53, 0x77, 0x69, 0x74, 0x63,
-	0x68, 0x54, 0x72, 0x61, 0x66, 0x66, 0x69, 0x63, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65,
-	0x12, 0x18, 0x0a, 0x07, 0x73, 0x75, 0x6d, 0x6d, 0x61, 0x72, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28,
-	0x09, 0x52, 0x07, 0x73, 0x75, 0x6d, 0x6d, 0x61, 0x72, 0x79, 0x12, 0x1f, 0x0a, 0x0b, 0x73, 0x74,
-	0x61, 0x72, 0x74, 0x5f, 0x73, 0x74, 0x61, 0x74, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52,
-	0x0a, 0x73, 0x74, 0x61, 0x72, 0x74, 0x53, 0x74, 0x61, 0x74, 0x65, 0x12, 0x23, 0x0a, 0x0d, 0x63,
-	0x75, 0x72, 0x72, 0x65, 0x6e, 0x74, 0x5f, 0x73, 0x74, 0x61, 0x74, 0x65, 0x18, 0x03, 0x20, 0x01,
-	0x28, 0x09, 0x52, 0x0c, 0x63, 0x75, 0x72, 0x72, 0x65, 0x6e, 0x74, 0x53, 0x74, 0x61, 0x74, 0x65,
-	0x12, 0x26, 0x0a, 0x0f, 0x64, 0x72, 0x79, 0x5f, 0x72, 0x75, 0x6e, 0x5f, 0x72, 0x65, 0x73, 0x75,
-	0x6c, 0x74, 0x73, 0x18, 0x04, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0d, 0x64, 0x72, 0x79, 0x52, 0x75,
-	0x6e, 0x52, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x73, 0x22, 0x90, 0x01, 0x0a, 0x15, 0x57, 0x6f, 0x72,
-	0x6b, 0x66, 0x6c, 0x6f, 0x77, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65,
-	0x73, 0x74, 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, 0x5b,
-	0x0a, 0x0e, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x5f, 0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74,
-	0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x34, 0x2e, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x6d,
-	0x61, 0x6e, 0x61, 0x67, 0x65, 0x72, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74,
-	0x65, 0x56, 0x52, 0x65, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x57, 0x6f, 0x72,
-	0x6b, 0x66, 0x6c, 0x6f, 0x77, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x52, 0x0d, 0x74, 0x61,
-	0x62, 0x6c, 0x65, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x22, 0xd1, 0x01, 0x0a, 0x16,
-	0x57, 0x6f, 0x72, 0x6b, 0x66, 0x6c, 0x6f, 0x77, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x52, 0x65,
+	0x6b, 0x66, 0x6c, 0x6f, 0x77, 0x12, 0x14, 0x0a, 0x05, 0x63, 0x65, 0x6c, 0x6c, 0x73, 0x18, 0x03,
+	0x20, 0x03, 0x28, 0x09, 0x52, 0x05, 0x63, 0x65, 0x6c, 0x6c, 0x73, 0x12, 0x37, 0x0a, 0x0c, 0x74,
+	0x61, 0x62, 0x6c, 0x65, 0x74, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x73, 0x18, 0x04, 0x20, 0x03, 0x28,
+	0x0e, 0x32, 0x14, 0x2e, 0x74, 0x6f, 0x70, 0x6f, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x54, 0x61, 0x62,
+	0x6c, 0x65, 0x74, 0x54, 0x79, 0x70, 0x65, 0x52, 0x0b, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x54,
+	0x79, 0x70, 0x65, 0x73, 0x12, 0x4f, 0x0a, 0x1b, 0x6d, 0x61, 0x78, 0x5f, 0x72, 0x65, 0x70, 0x6c,
+	0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x6c, 0x61, 0x67, 0x5f, 0x61, 0x6c, 0x6c, 0x6f,
+	0x77, 0x65, 0x64, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x76, 0x74, 0x74, 0x69,
+	0x6d, 0x65, 0x2e, 0x44, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x18, 0x6d, 0x61, 0x78,
+	0x52, 0x65, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x4c, 0x61, 0x67, 0x41, 0x6c,
+	0x6c, 0x6f, 0x77, 0x65, 0x64, 0x12, 0x3c, 0x0a, 0x1a, 0x65, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x5f,
+	0x72, 0x65, 0x76, 0x65, 0x72, 0x73, 0x65, 0x5f, 0x72, 0x65, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74,
+	0x69, 0x6f, 0x6e, 0x18, 0x06, 0x20, 0x01, 0x28, 0x08, 0x52, 0x18, 0x65, 0x6e, 0x61, 0x62, 0x6c,
+	0x65, 0x52, 0x65, 0x76, 0x65, 0x72, 0x73, 0x65, 0x52, 0x65, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74,
+	0x69, 0x6f, 0x6e, 0x12, 0x1c, 0x0a, 0x09, 0x64, 0x69, 0x72, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e,
+	0x18, 0x07, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x64, 0x69, 0x72, 0x65, 0x63, 0x74, 0x69, 0x6f,
+	0x6e, 0x12, 0x2a, 0x0a, 0x07, 0x74, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x18, 0x08, 0x20, 0x01,
+	0x28, 0x0b, 0x32, 0x10, 0x2e, 0x76, 0x74, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x44, 0x75, 0x72, 0x61,
+	0x74, 0x69, 0x6f, 0x6e, 0x52, 0x07, 0x74, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x12, 0x17, 0x0a,
+	0x07, 0x64, 0x72, 0x79, 0x5f, 0x72, 0x75, 0x6e, 0x18, 0x09, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06,
+	0x64, 0x72, 0x79, 0x52, 0x75, 0x6e, 0x12, 0x3e, 0x0a, 0x1b, 0x69, 0x6e, 0x69, 0x74, 0x69, 0x61,
+	0x6c, 0x69, 0x7a, 0x65, 0x5f, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x5f, 0x73, 0x65, 0x71, 0x75,
+	0x65, 0x6e, 0x63, 0x65, 0x73, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x08, 0x52, 0x19, 0x69, 0x6e, 0x69,
+	0x74, 0x69, 0x61, 0x6c, 0x69, 0x7a, 0x65, 0x54, 0x61, 0x72, 0x67, 0x65, 0x74, 0x53, 0x65, 0x71,
+	0x75, 0x65, 0x6e, 0x63, 0x65, 0x73, 0x12, 0x16, 0x0a, 0x06, 0x73, 0x68, 0x61, 0x72, 0x64, 0x73,
+	0x18, 0x0b, 0x20, 0x03, 0x28, 0x09, 0x52, 0x06, 0x73, 0x68, 0x61, 0x72, 0x64, 0x73, 0x12, 0x14,
+	0x0a, 0x05, 0x66, 0x6f, 0x72, 0x63, 0x65, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x08, 0x52, 0x05, 0x66,
+	0x6f, 0x72, 0x63, 0x65, 0x22, 0xa7, 0x01, 0x0a, 0x1d, 0x57, 0x6f, 0x72, 0x6b, 0x66, 0x6c, 0x6f,
+	0x77, 0x53, 0x77, 0x69, 0x74, 0x63, 0x68, 0x54, 0x72, 0x61, 0x66, 0x66, 0x69, 0x63, 0x52, 0x65,
 	0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x73, 0x75, 0x6d, 0x6d, 0x61, 0x72,
 	0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x73, 0x75, 0x6d, 0x6d, 0x61, 0x72, 0x79,
-	0x12, 0x46, 0x0a, 0x07, 0x64, 0x65, 0x74, 0x61, 0x69, 0x6c, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28,
-	0x0b, 0x32, 0x2c, 0x2e, 0x76, 0x74, 0x63, 0x74, 0x6c, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x57, 0x6f,
-	0x72, 0x6b, 0x66, 0x6c, 0x6f, 0x77, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x52, 0x65, 0x73, 0x70,
-	0x6f, 0x6e, 0x73, 0x65, 0x2e, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x49, 0x6e, 0x66, 0x6f, 0x52,
-	0x07, 0x64, 0x65, 0x74, 0x61, 0x69, 0x6c, 0x73, 0x1a, 0x55, 0x0a, 0x0a, 0x54, 0x61, 0x62, 0x6c,
-	0x65, 0x74, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x2d, 0x0a, 0x06, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x74,
-	0x18, 0x01, 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, 0x06, 0x74,
-	0x61, 0x62, 0x6c, 0x65, 0x74, 0x12, 0x18, 0x0a, 0x07, 0x63, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x64,
-	0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x07, 0x63, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x64, 0x22,
-	0x17, 0x0a, 0x15, 0x47, 0x65, 0x74, 0x4d, 0x69, 0x72, 0x72, 0x6f, 0x72, 0x52, 0x75, 0x6c, 0x65,
-	0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x22, 0x51, 0x0a, 0x16, 0x47, 0x65, 0x74, 0x4d,
-	0x69, 0x72, 0x72, 0x6f, 0x72, 0x52, 0x75, 0x6c, 0x65, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e,
-	0x73, 0x65, 0x12, 0x37, 0x0a, 0x0c, 0x6d, 0x69, 0x72, 0x72, 0x6f, 0x72, 0x5f, 0x72, 0x75, 0x6c,
-	0x65, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x76, 0x73, 0x63, 0x68, 0x65,
-	0x6d, 0x61, 0x2e, 0x4d, 0x69, 0x72, 0x72, 0x6f, 0x72, 0x52, 0x75, 0x6c, 0x65, 0x73, 0x52, 0x0b,
-	0x6d, 0x69, 0x72, 0x72, 0x6f, 0x72, 0x52, 0x75, 0x6c, 0x65, 0x73, 0x22, 0xa9, 0x01, 0x0a, 0x1c,
-	0x57, 0x6f, 0x72, 0x6b, 0x66, 0x6c, 0x6f, 0x77, 0x4d, 0x69, 0x72, 0x72, 0x6f, 0x72, 0x54, 0x72,
-	0x61, 0x66, 0x66, 0x69, 0x63, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 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, 0x1a, 0x0a, 0x08, 0x77, 0x6f, 0x72, 0x6b,
-	0x66, 0x6c, 0x6f, 0x77, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x77, 0x6f, 0x72, 0x6b,
-	0x66, 0x6c, 0x6f, 0x77, 0x12, 0x37, 0x0a, 0x0c, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x5f, 0x74,
-	0x79, 0x70, 0x65, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0e, 0x32, 0x14, 0x2e, 0x74, 0x6f, 0x70,
-	0x6f, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x54, 0x79, 0x70, 0x65,
-	0x52, 0x0b, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x54, 0x79, 0x70, 0x65, 0x73, 0x12, 0x18, 0x0a,
-	0x07, 0x70, 0x65, 0x72, 0x63, 0x65, 0x6e, 0x74, 0x18, 0x04, 0x20, 0x01, 0x28, 0x02, 0x52, 0x07,
-	0x70, 0x65, 0x72, 0x63, 0x65, 0x6e, 0x74, 0x22, 0x7f, 0x0a, 0x1d, 0x57, 0x6f, 0x72, 0x6b, 0x66,
-	0x6c, 0x6f, 0x77, 0x4d, 0x69, 0x72, 0x72, 0x6f, 0x72, 0x54, 0x72, 0x61, 0x66, 0x66, 0x69, 0x63,
-	0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x73, 0x75, 0x6d, 0x6d,
-	0x61, 0x72, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x73, 0x75, 0x6d, 0x6d, 0x61,
-	0x72, 0x79, 0x12, 0x1f, 0x0a, 0x0b, 0x73, 0x74, 0x61, 0x72, 0x74, 0x5f, 0x73, 0x74, 0x61, 0x74,
-	0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x73, 0x74, 0x61, 0x72, 0x74, 0x53, 0x74,
-	0x61, 0x74, 0x65, 0x12, 0x23, 0x0a, 0x0d, 0x63, 0x75, 0x72, 0x72, 0x65, 0x6e, 0x74, 0x5f, 0x73,
-	0x74, 0x61, 0x74, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x63, 0x75, 0x72, 0x72,
-	0x65, 0x6e, 0x74, 0x53, 0x74, 0x61, 0x74, 0x65, 0x2a, 0x4a, 0x0a, 0x15, 0x4d, 0x61, 0x74, 0x65,
-	0x72, 0x69, 0x61, 0x6c, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x6e, 0x74, 0x65, 0x6e,
-	0x74, 0x12, 0x0a, 0x0a, 0x06, 0x43, 0x55, 0x53, 0x54, 0x4f, 0x4d, 0x10, 0x00, 0x12, 0x0e, 0x0a,
-	0x0a, 0x4d, 0x4f, 0x56, 0x45, 0x54, 0x41, 0x42, 0x4c, 0x45, 0x53, 0x10, 0x01, 0x12, 0x15, 0x0a,
-	0x11, 0x43, 0x52, 0x45, 0x41, 0x54, 0x45, 0x4c, 0x4f, 0x4f, 0x4b, 0x55, 0x50, 0x49, 0x4e, 0x44,
-	0x45, 0x58, 0x10, 0x02, 0x2a, 0x38, 0x0a, 0x0d, 0x51, 0x75, 0x65, 0x72, 0x79, 0x4f, 0x72, 0x64,
-	0x65, 0x72, 0x69, 0x6e, 0x67, 0x12, 0x08, 0x0a, 0x04, 0x4e, 0x4f, 0x4e, 0x45, 0x10, 0x00, 0x12,
-	0x0d, 0x0a, 0x09, 0x41, 0x53, 0x43, 0x45, 0x4e, 0x44, 0x49, 0x4e, 0x47, 0x10, 0x01, 0x12, 0x0e,
-	0x0a, 0x0a, 0x44, 0x45, 0x53, 0x43, 0x45, 0x4e, 0x44, 0x49, 0x4e, 0x47, 0x10, 0x02, 0x2a, 0x42,
-	0x0a, 0x1c, 0x53, 0x68, 0x61, 0x72, 0x64, 0x65, 0x64, 0x41, 0x75, 0x74, 0x6f, 0x49, 0x6e, 0x63,
-	0x72, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x48, 0x61, 0x6e, 0x64, 0x6c, 0x69, 0x6e, 0x67, 0x12, 0x09,
-	0x0a, 0x05, 0x4c, 0x45, 0x41, 0x56, 0x45, 0x10, 0x00, 0x12, 0x0a, 0x0a, 0x06, 0x52, 0x45, 0x4d,
-	0x4f, 0x56, 0x45, 0x10, 0x01, 0x12, 0x0b, 0x0a, 0x07, 0x52, 0x45, 0x50, 0x4c, 0x41, 0x43, 0x45,
-	0x10, 0x02, 0x42, 0x28, 0x5a, 0x26, 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, 0x76, 0x74, 0x63, 0x74, 0x6c, 0x64, 0x61, 0x74, 0x61, 0x62, 0x06, 0x70, 0x72,
-	0x6f, 0x74, 0x6f, 0x33,
+	0x12, 0x1f, 0x0a, 0x0b, 0x73, 0x74, 0x61, 0x72, 0x74, 0x5f, 0x73, 0x74, 0x61, 0x74, 0x65, 0x18,
+	0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x73, 0x74, 0x61, 0x72, 0x74, 0x53, 0x74, 0x61, 0x74,
+	0x65, 0x12, 0x23, 0x0a, 0x0d, 0x63, 0x75, 0x72, 0x72, 0x65, 0x6e, 0x74, 0x5f, 0x73, 0x74, 0x61,
+	0x74, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x63, 0x75, 0x72, 0x72, 0x65, 0x6e,
+	0x74, 0x53, 0x74, 0x61, 0x74, 0x65, 0x12, 0x26, 0x0a, 0x0f, 0x64, 0x72, 0x79, 0x5f, 0x72, 0x75,
+	0x6e, 0x5f, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x73, 0x18, 0x04, 0x20, 0x03, 0x28, 0x09, 0x52,
+	0x0d, 0x64, 0x72, 0x79, 0x52, 0x75, 0x6e, 0x52, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x73, 0x22, 0x90,
+	0x01, 0x0a, 0x15, 0x57, 0x6f, 0x72, 0x6b, 0x66, 0x6c, 0x6f, 0x77, 0x55, 0x70, 0x64, 0x61, 0x74,
+	0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 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, 0x5b, 0x0a, 0x0e, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x5f, 0x72,
+	0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x34, 0x2e, 0x74,
+	0x61, 0x62, 0x6c, 0x65, 0x74, 0x6d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x72, 0x64, 0x61, 0x74, 0x61,
+	0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x56, 0x52, 0x65, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74,
+	0x69, 0x6f, 0x6e, 0x57, 0x6f, 0x72, 0x6b, 0x66, 0x6c, 0x6f, 0x77, 0x52, 0x65, 0x71, 0x75, 0x65,
+	0x73, 0x74, 0x52, 0x0d, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73,
+	0x74, 0x22, 0xd1, 0x01, 0x0a, 0x16, 0x57, 0x6f, 0x72, 0x6b, 0x66, 0x6c, 0x6f, 0x77, 0x55, 0x70,
+	0x64, 0x61, 0x74, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x18, 0x0a, 0x07,
+	0x73, 0x75, 0x6d, 0x6d, 0x61, 0x72, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x73,
+	0x75, 0x6d, 0x6d, 0x61, 0x72, 0x79, 0x12, 0x46, 0x0a, 0x07, 0x64, 0x65, 0x74, 0x61, 0x69, 0x6c,
+	0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x2c, 0x2e, 0x76, 0x74, 0x63, 0x74, 0x6c, 0x64,
+	0x61, 0x74, 0x61, 0x2e, 0x57, 0x6f, 0x72, 0x6b, 0x66, 0x6c, 0x6f, 0x77, 0x55, 0x70, 0x64, 0x61,
+	0x74, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x2e, 0x54, 0x61, 0x62, 0x6c, 0x65,
+	0x74, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x07, 0x64, 0x65, 0x74, 0x61, 0x69, 0x6c, 0x73, 0x1a, 0x55,
+	0x0a, 0x0a, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x2d, 0x0a, 0x06,
+	0x74, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x18, 0x01, 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, 0x06, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x12, 0x18, 0x0a, 0x07, 0x63,
+	0x68, 0x61, 0x6e, 0x67, 0x65, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x07, 0x63, 0x68,
+	0x61, 0x6e, 0x67, 0x65, 0x64, 0x22, 0x17, 0x0a, 0x15, 0x47, 0x65, 0x74, 0x4d, 0x69, 0x72, 0x72,
+	0x6f, 0x72, 0x52, 0x75, 0x6c, 0x65, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x22, 0x51,
+	0x0a, 0x16, 0x47, 0x65, 0x74, 0x4d, 0x69, 0x72, 0x72, 0x6f, 0x72, 0x52, 0x75, 0x6c, 0x65, 0x73,
+	0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x37, 0x0a, 0x0c, 0x6d, 0x69, 0x72, 0x72,
+	0x6f, 0x72, 0x5f, 0x72, 0x75, 0x6c, 0x65, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x14,
+	0x2e, 0x76, 0x73, 0x63, 0x68, 0x65, 0x6d, 0x61, 0x2e, 0x4d, 0x69, 0x72, 0x72, 0x6f, 0x72, 0x52,
+	0x75, 0x6c, 0x65, 0x73, 0x52, 0x0b, 0x6d, 0x69, 0x72, 0x72, 0x6f, 0x72, 0x52, 0x75, 0x6c, 0x65,
+	0x73, 0x22, 0xa9, 0x01, 0x0a, 0x1c, 0x57, 0x6f, 0x72, 0x6b, 0x66, 0x6c, 0x6f, 0x77, 0x4d, 0x69,
+	0x72, 0x72, 0x6f, 0x72, 0x54, 0x72, 0x61, 0x66, 0x66, 0x69, 0x63, 0x52, 0x65, 0x71, 0x75, 0x65,
+	0x73, 0x74, 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, 0x1a,
+	0x0a, 0x08, 0x77, 0x6f, 0x72, 0x6b, 0x66, 0x6c, 0x6f, 0x77, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09,
+	0x52, 0x08, 0x77, 0x6f, 0x72, 0x6b, 0x66, 0x6c, 0x6f, 0x77, 0x12, 0x37, 0x0a, 0x0c, 0x74, 0x61,
+	0x62, 0x6c, 0x65, 0x74, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0e,
+	0x32, 0x14, 0x2e, 0x74, 0x6f, 0x70, 0x6f, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x54, 0x61, 0x62, 0x6c,
+	0x65, 0x74, 0x54, 0x79, 0x70, 0x65, 0x52, 0x0b, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x54, 0x79,
+	0x70, 0x65, 0x73, 0x12, 0x18, 0x0a, 0x07, 0x70, 0x65, 0x72, 0x63, 0x65, 0x6e, 0x74, 0x18, 0x04,
+	0x20, 0x01, 0x28, 0x02, 0x52, 0x07, 0x70, 0x65, 0x72, 0x63, 0x65, 0x6e, 0x74, 0x22, 0x7f, 0x0a,
+	0x1d, 0x57, 0x6f, 0x72, 0x6b, 0x66, 0x6c, 0x6f, 0x77, 0x4d, 0x69, 0x72, 0x72, 0x6f, 0x72, 0x54,
+	0x72, 0x61, 0x66, 0x66, 0x69, 0x63, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x18,
+	0x0a, 0x07, 0x73, 0x75, 0x6d, 0x6d, 0x61, 0x72, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52,
+	0x07, 0x73, 0x75, 0x6d, 0x6d, 0x61, 0x72, 0x79, 0x12, 0x1f, 0x0a, 0x0b, 0x73, 0x74, 0x61, 0x72,
+	0x74, 0x5f, 0x73, 0x74, 0x61, 0x74, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x73,
+	0x74, 0x61, 0x72, 0x74, 0x53, 0x74, 0x61, 0x74, 0x65, 0x12, 0x23, 0x0a, 0x0d, 0x63, 0x75, 0x72,
+	0x72, 0x65, 0x6e, 0x74, 0x5f, 0x73, 0x74, 0x61, 0x74, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09,
+	0x52, 0x0c, 0x63, 0x75, 0x72, 0x72, 0x65, 0x6e, 0x74, 0x53, 0x74, 0x61, 0x74, 0x65, 0x2a, 0x4a,
+	0x0a, 0x15, 0x4d, 0x61, 0x74, 0x65, 0x72, 0x69, 0x61, 0x6c, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f,
+	0x6e, 0x49, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x12, 0x0a, 0x0a, 0x06, 0x43, 0x55, 0x53, 0x54, 0x4f,
+	0x4d, 0x10, 0x00, 0x12, 0x0e, 0x0a, 0x0a, 0x4d, 0x4f, 0x56, 0x45, 0x54, 0x41, 0x42, 0x4c, 0x45,
+	0x53, 0x10, 0x01, 0x12, 0x15, 0x0a, 0x11, 0x43, 0x52, 0x45, 0x41, 0x54, 0x45, 0x4c, 0x4f, 0x4f,
+	0x4b, 0x55, 0x50, 0x49, 0x4e, 0x44, 0x45, 0x58, 0x10, 0x02, 0x2a, 0x38, 0x0a, 0x0d, 0x51, 0x75,
+	0x65, 0x72, 0x79, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x69, 0x6e, 0x67, 0x12, 0x08, 0x0a, 0x04, 0x4e,
+	0x4f, 0x4e, 0x45, 0x10, 0x00, 0x12, 0x0d, 0x0a, 0x09, 0x41, 0x53, 0x43, 0x45, 0x4e, 0x44, 0x49,
+	0x4e, 0x47, 0x10, 0x01, 0x12, 0x0e, 0x0a, 0x0a, 0x44, 0x45, 0x53, 0x43, 0x45, 0x4e, 0x44, 0x49,
+	0x4e, 0x47, 0x10, 0x02, 0x2a, 0x42, 0x0a, 0x1c, 0x53, 0x68, 0x61, 0x72, 0x64, 0x65, 0x64, 0x41,
+	0x75, 0x74, 0x6f, 0x49, 0x6e, 0x63, 0x72, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x48, 0x61, 0x6e, 0x64,
+	0x6c, 0x69, 0x6e, 0x67, 0x12, 0x09, 0x0a, 0x05, 0x4c, 0x45, 0x41, 0x56, 0x45, 0x10, 0x00, 0x12,
+	0x0a, 0x0a, 0x06, 0x52, 0x45, 0x4d, 0x4f, 0x56, 0x45, 0x10, 0x01, 0x12, 0x0b, 0x0a, 0x07, 0x52,
+	0x45, 0x50, 0x4c, 0x41, 0x43, 0x45, 0x10, 0x02, 0x42, 0x28, 0x5a, 0x26, 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, 0x76, 0x74, 0x63, 0x74, 0x6c, 0x64, 0x61,
+	0x74, 0x61, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 })
 
 var (
diff --git a/go/vt/schema/ddl_strategy.go b/go/vt/schema/ddl_strategy.go
index 4195c7da863..fd8d4e90617 100644
--- a/go/vt/schema/ddl_strategy.go
+++ b/go/vt/schema/ddl_strategy.go
@@ -54,7 +54,7 @@ const (
 	analyzeTableFlag       = "analyze-table"
 )
 
-// DDLStrategy suggests how an ALTER TABLE should run (e.g. "direct", "online", "gh-ost" or "pt-osc")
+// DDLStrategy suggests how an ALTER TABLE should run (e.g. "direct", "online", "mysql")
 type DDLStrategy string
 
 const (
@@ -64,10 +64,6 @@ const (
 	DDLStrategyVitess DDLStrategy = "vitess"
 	// DDLStrategyOnline requests vreplication to run the migration
 	DDLStrategyOnline DDLStrategy = "online"
-	// DDLStrategyGhost requests gh-ost to run the migration
-	DDLStrategyGhost DDLStrategy = "gh-ost"
-	// DDLStrategyPTOSC requests pt-online-schema-change to run the migration
-	DDLStrategyPTOSC DDLStrategy = "pt-osc"
 	// DDLStrategyMySQL is a managed migration (queued and executed by the scheduler) but runs through a MySQL `ALTER TABLE`
 	DDLStrategyMySQL DDLStrategy = "mysql"
 )
@@ -76,7 +72,7 @@ const (
 // A strategy is direct if it's not explciitly one of the online DDL strategies
 func (s DDLStrategy) IsDirect() bool {
 	switch s {
-	case DDLStrategyVitess, DDLStrategyOnline, DDLStrategyGhost, DDLStrategyPTOSC, DDLStrategyMySQL:
+	case DDLStrategyVitess, DDLStrategyOnline, DDLStrategyMySQL:
 		return false
 	}
 	return true
@@ -108,7 +104,7 @@ func ParseDDLStrategy(strategyVariable string) (*DDLStrategySetting, error) {
 	switch strategy := DDLStrategy(strategyName); strategy {
 	case "": // backward compatiblity and to handle unspecified values
 		setting.Strategy = DDLStrategyDirect
-	case DDLStrategyVitess, DDLStrategyOnline, DDLStrategyGhost, DDLStrategyPTOSC, DDLStrategyMySQL, DDLStrategyDirect:
+	case DDLStrategyVitess, DDLStrategyOnline, DDLStrategyMySQL, DDLStrategyDirect:
 		setting.Strategy = strategy
 	default:
 		return nil, fmt.Errorf("Unknown online DDL strategy: '%v'", strategy)
diff --git a/go/vt/schema/ddl_strategy_test.go b/go/vt/schema/ddl_strategy_test.go
index dd8fec45351..47221a5b8a9 100644
--- a/go/vt/schema/ddl_strategy_test.go
+++ b/go/vt/schema/ddl_strategy_test.go
@@ -28,13 +28,9 @@ func TestIsDirect(t *testing.T) {
 	assert.True(t, DDLStrategyDirect.IsDirect())
 	assert.False(t, DDLStrategyVitess.IsDirect())
 	assert.False(t, DDLStrategyOnline.IsDirect())
-	assert.False(t, DDLStrategyGhost.IsDirect())
-	assert.False(t, DDLStrategyPTOSC.IsDirect())
 	assert.True(t, DDLStrategy("").IsDirect())
 	assert.False(t, DDLStrategy("vitess").IsDirect())
 	assert.False(t, DDLStrategy("online").IsDirect())
-	assert.False(t, DDLStrategy("gh-ost").IsDirect())
-	assert.False(t, DDLStrategy("pt-osc").IsDirect())
 	assert.False(t, DDLStrategy("mysql").IsDirect())
 	assert.True(t, DDLStrategy("something").IsDirect())
 }
@@ -217,14 +213,6 @@ func TestParseDDLStrategy(t *testing.T) {
 			strategyVariable: "online",
 			strategy:         DDLStrategyOnline,
 		},
-		{
-			strategyVariable: "gh-ost",
-			strategy:         DDLStrategyGhost,
-		},
-		{
-			strategyVariable: "pt-osc",
-			strategy:         DDLStrategyPTOSC,
-		},
 		{
 			strategyVariable: "mysql",
 			strategy:         DDLStrategyMySQL,
@@ -233,32 +221,19 @@ func TestParseDDLStrategy(t *testing.T) {
 			strategy: DDLStrategyDirect,
 		},
 		{
-			strategyVariable: "gh-ost --max-load=Threads_running=100 --allow-master",
-			strategy:         DDLStrategyGhost,
-			// These are gh-ost options. Nothing we can do until that changes upstream
-			options:        "--max-load=Threads_running=100 --allow-master",
-			runtimeOptions: "--max-load=Threads_running=100 --allow-master",
-		},
-		{
-			strategyVariable: "gh-ost --max-load=Threads_running=100 -declarative",
-			strategy:         DDLStrategyGhost,
-			options:          "--max-load=Threads_running=100 -declarative",
-			runtimeOptions:   "--max-load=Threads_running=100",
-			isDeclarative:    true,
-		},
-		{
-			strategyVariable: "gh-ost --declarative --max-load=Threads_running=100",
-			strategy:         DDLStrategyGhost,
-			options:          "--declarative --max-load=Threads_running=100",
-			runtimeOptions:   "--max-load=Threads_running=100",
-			isDeclarative:    true,
+			strategyVariable: "vitess -singleton",
+			strategy:         DDLStrategyVitess,
+			options:          "-singleton",
+			runtimeOptions:   "",
+			isSingleton:      true,
 		},
 		{
-			strategyVariable: "pt-osc -singleton",
-			strategy:         DDLStrategyPTOSC,
-			options:          "-singleton",
+			strategyVariable: "vitess --singleton --declarative",
+			strategy:         DDLStrategyVitess,
+			options:          "--singleton --declarative",
 			runtimeOptions:   "",
 			isSingleton:      true,
+			isDeclarative:    true,
 		},
 		{
 			strategyVariable:   "vitess --singleton-context",
@@ -358,7 +333,7 @@ func TestParseDDLStrategy(t *testing.T) {
 			expectError:      "time: invalid duration",
 		},
 		{
-			strategyVariable: "gh-ost --force-cut-over-after=3m",
+			strategyVariable: "mysql --force-cut-over-after=3m",
 			strategy:         DDLStrategyVitess,
 			runtimeOptions:   "",
 			expectError:      "--force-cut-over-after is only valid in 'vitess' strategy",
diff --git a/go/vt/schema/online_ddl_test.go b/go/vt/schema/online_ddl_test.go
index dad92904854..1010afef1e5 100644
--- a/go/vt/schema/online_ddl_test.go
+++ b/go/vt/schema/online_ddl_test.go
@@ -404,7 +404,7 @@ func TestOnlineDDLFromCommentedStatement(t *testing.T) {
 		`alter view v as select * from t`,
 		`revert vitess_migration '4e5dcf80_354b_11eb_82cd_f875a4d24e90'`,
 	}
-	strategySetting := NewDDLStrategySetting(DDLStrategyGhost, `-singleton -declarative --max-load="Threads_running=5"`)
+	strategySetting := NewDDLStrategySetting(DDLStrategyVitess, `-singleton -declarative --max-load="Threads_running=5"`)
 	migrationContext := "354b-11eb-82cd-f875a4d24e90"
 	parser := sqlparser.NewTestParser()
 	for _, query := range queries {
diff --git a/go/vt/schemamanager/tablet_executor_test.go b/go/vt/schemamanager/tablet_executor_test.go
index a683ef4d22e..ac6ba84b0c6 100644
--- a/go/vt/schemamanager/tablet_executor_test.go
+++ b/go/vt/schemamanager/tablet_executor_test.go
@@ -206,12 +206,7 @@ func TestIsOnlineSchemaDDL(t *testing.T) {
 			query:       "CREATE TABLE t(id int)",
 			isOnlineDDL: false,
 		},
-		{
-			query:       "CREATE TABLE t(id int)",
-			ddlStrategy: "gh-ost",
-			isOnlineDDL: true,
-			strategy:    schema.DDLStrategyGhost,
-		},
+
 		{
 			query:       "ALTER TABLE t ADD COLUMN i INT",
 			ddlStrategy: "online",
@@ -231,16 +226,16 @@ func TestIsOnlineSchemaDDL(t *testing.T) {
 		},
 		{
 			query:       "ALTER TABLE t ADD COLUMN i INT",
-			ddlStrategy: "gh-ost",
+			ddlStrategy: "vitess",
 			isOnlineDDL: true,
-			strategy:    schema.DDLStrategyGhost,
+			strategy:    schema.DDLStrategyVitess,
 		},
 		{
 			query:       "ALTER TABLE t ADD COLUMN i INT",
-			ddlStrategy: "gh-ost --max-load=Threads_running=100",
+			ddlStrategy: "vitess --declarative",
 			isOnlineDDL: true,
-			strategy:    schema.DDLStrategyGhost,
-			options:     "--max-load=Threads_running=100",
+			strategy:    schema.DDLStrategyVitess,
+			options:     "--declarative",
 		},
 		{
 			query:       "TRUNCATE TABLE t",
@@ -249,12 +244,12 @@ func TestIsOnlineSchemaDDL(t *testing.T) {
 		},
 		{
 			query:       "TRUNCATE TABLE t",
-			ddlStrategy: "gh-ost",
+			ddlStrategy: "vitess",
 			isOnlineDDL: false,
 		},
 		{
 			query:       "RENAME TABLE t to t2",
-			ddlStrategy: "gh-ost",
+			ddlStrategy: "vitess",
 			isOnlineDDL: false,
 		},
 	}
diff --git a/go/vt/vtctl/schematools/schematools.go b/go/vt/vtctl/schematools/schematools.go
index 059b7ca3db8..2b780388a2d 100644
--- a/go/vt/vtctl/schematools/schematools.go
+++ b/go/vt/vtctl/schematools/schematools.go
@@ -56,14 +56,6 @@ func ParseSchemaMigrationStrategy(name string) (vtctldatapb.SchemaMigration_Stra
 	}
 
 	upperName := strings.ToUpper(name)
-	switch upperName {
-	case "GH-OST", "PT-OSC":
-		// more compatibility since the protobuf message names don't
-		// have the dash.
-		upperName = strings.ReplaceAll(upperName, "-", "")
-	default:
-	}
-
 	strategy, ok := vtctldatapb.SchemaMigration_Strategy_value[upperName]
 	if !ok {
 		return 0, fmt.Errorf("unknown schema migration strategy: '%v'", name)
@@ -91,12 +83,6 @@ func SchemaMigrationStrategyName(strategy vtctldatapb.SchemaMigration_Strategy)
 	if !ok {
 		return "unknown"
 	}
-
-	switch strategy {
-	case vtctldatapb.SchemaMigration_GHOST, vtctldatapb.SchemaMigration_PTOSC:
-		name = strings.Join([]string{name[:2], name[2:]}, "-")
-	}
-
 	return strings.ToLower(name)
 }
 
diff --git a/go/vt/vtctl/schematools/schematools_test.go b/go/vt/vtctl/schematools/schematools_test.go
index 94909ab52b1..a616b2096ce 100644
--- a/go/vt/vtctl/schematools/schematools_test.go
+++ b/go/vt/vtctl/schematools/schematools_test.go
@@ -39,14 +39,6 @@ func TestSchemaMigrationStrategyName(t *testing.T) {
 			in:  vtctldatapb.SchemaMigration_VITESS,
 			out: "vitess",
 		},
-		{
-			in:  vtctldatapb.SchemaMigration_GHOST,
-			out: "gh-ost",
-		},
-		{
-			in:  vtctldatapb.SchemaMigration_PTOSC,
-			out: "pt-osc",
-		},
 		{
 			in:  vtctldatapb.SchemaMigration_DIRECT,
 			out: "direct",
diff --git a/go/vt/vtctl/vtctl.go b/go/vt/vtctl/vtctl.go
index ec29413100e..975a8c98a5e 100644
--- a/go/vt/vtctl/vtctl.go
+++ b/go/vt/vtctl/vtctl.go
@@ -594,7 +594,7 @@ var commands = []commandGroup{
 				name:   "ApplySchema",
 				method: commandApplySchema,
 				params: "[--wait_replicas_timeout=10s] [--ddl_strategy=<ddl_strategy>] [--uuid_list=<comma_separated_uuids>] [--migration_context=<unique-request-context>] {--sql=<sql> || --sql-file=<filename>} [--batch-size=<n>] <keyspace>",
-				help:   "Applies the schema change to the specified keyspace on every primary, running in parallel on all shards. The changes are then propagated to replicas via replication. -ddl_strategy is used to instruct migrations via vreplication, gh-ost or pt-osc with optional parameters. -migration_context allows the user to specify a custom request context for online DDL migrations.",
+				help:   "Applies the schema change to the specified keyspace on every primary, running in parallel on all shards. The changes are then propagated to replicas via replication. -ddl_strategy is used to instruct migrations via vreplication, mysql or direct with optional parameters. -migration_context allows the user to specify a custom request context for online DDL migrations.",
 			},
 			{
 				name:   "CopySchemaShard",
@@ -2918,7 +2918,7 @@ func commandValidateSchemaKeyspace(ctx context.Context, wr *wrangler.Wrangler, s
 func commandApplySchema(ctx context.Context, wr *wrangler.Wrangler, subFlags *pflag.FlagSet, args []string) error {
 	sql := subFlags.String("sql", "", "A list of semicolon-delimited SQL commands")
 	sqlFile := subFlags.String("sql-file", "", "Identifies the file that contains the SQL commands")
-	ddlStrategy := subFlags.String("ddl_strategy", string(schema.DDLStrategyDirect), "Online DDL strategy, compatible with @@ddl_strategy session variable (examples: 'gh-ost', 'pt-osc', 'gh-ost --max-load=Threads_running=100'")
+	ddlStrategy := subFlags.String("ddl_strategy", string(schema.DDLStrategyDirect), "Online DDL strategy, compatible with @@ddl_strategy session variable (examples: 'direct', 'mysql', 'vitess --postpone-completion'")
 	uuidList := subFlags.String("uuid_list", "", "Optional: comma delimited explicit UUIDs for migration. If given, must match number of DDL changes")
 	migrationContext := subFlags.String("migration_context", "", "For Online DDL, optionally supply a custom unique string used as context for the migration(s) in this command. By default a unique context is auto-generated by Vitess")
 	requestContext := subFlags.String("request_context", "", "synonym for --migration_context")
diff --git a/go/vt/vttablet/onlineddl/executor.go b/go/vt/vttablet/onlineddl/executor.go
index 07119263399..ea6ea8732d2 100644
--- a/go/vt/vttablet/onlineddl/executor.go
+++ b/go/vt/vttablet/onlineddl/executor.go
@@ -30,7 +30,6 @@ import (
 	"strings"
 	"sync"
 	"sync/atomic"
-	"syscall"
 	"time"
 
 	"github.com/spf13/pflag"
@@ -43,7 +42,6 @@ import (
 	"vitess.io/vitess/go/mysql/sqlerror"
 	"vitess.io/vitess/go/sqlescape"
 	"vitess.io/vitess/go/sqltypes"
-	"vitess.io/vitess/go/syscallutil"
 	"vitess.io/vitess/go/textutil"
 	"vitess.io/vitess/go/timer"
 	"vitess.io/vitess/go/vt/binlog/binlogplayer"
@@ -69,7 +67,7 @@ import (
 )
 
 var (
-	// ErrExecutorNotWritableTablet  is generated when executor is asked to run gh-ost on a read-only server
+	// ErrExecutorNotWritableTablet is generated when executor is asked to run a migration on a read-only server
 	ErrExecutorNotWritableTablet = errors.New("cannot run migration on non-writable tablet")
 	// ErrExecutorMigrationAlreadyRunning is generated when an attempt is made to run an operation that conflicts with a running migration
 	ErrExecutorMigrationAlreadyRunning = errors.New("cannot run migration since a migration is already running")
@@ -90,8 +88,6 @@ var acceptableDropTableIfExistsErrorCodes = []sqlerror.ErrorCode{sqlerror.ERCant
 var copyAlgorithm = sqlparser.AlgorithmValue(sqlparser.CopyStr)
 
 var (
-	ghostBinaryPath         = "gh-ost"
-	ptOSCBinaryPath         = "/usr/bin/pt-online-schema-change"
 	migrationCheckInterval  = 1 * time.Minute
 	retainOnlineDDLTables   = 24 * time.Hour
 	maxConcurrentOnlineDDLs = 256
@@ -112,8 +108,6 @@ func init() {
 }
 
 func registerOnlineDDLFlags(fs *pflag.FlagSet) {
-	fs.StringVar(&ghostBinaryPath, "gh-ost-path", ghostBinaryPath, "override default gh-ost binary full path")
-	fs.StringVar(&ptOSCBinaryPath, "pt-osc-path", ptOSCBinaryPath, "override default pt-online-schema-change binary full path")
 	fs.DurationVar(&migrationCheckInterval, "migration_check_interval", migrationCheckInterval, "Interval between migration checks")
 	fs.DurationVar(&retainOnlineDDLTables, "retain_online_ddl_tables", retainOnlineDDLTables, "How long should vttablet keep an old migrated table before purging it")
 	fs.IntVar(&maxConcurrentOnlineDDLs, "max_concurrent_online_ddl", maxConcurrentOnlineDDLs, "Maximum number of online DDL changes that may run concurrently")
@@ -135,22 +129,7 @@ const (
 	vreplicationTestSuiteWaitSeconds         = 5
 )
 
-var (
-	migrationLogFileName     = "migration.log"
-	migrationFailureFileName = "migration-failure.log"
-	onlineDDLUser            = "vt-online-ddl-internal"
-	onlineDDLGrant           = fmt.Sprintf("'%s'@'%s'", onlineDDLUser, "%")
-)
-
-type mysqlVariables struct {
-	host           string
-	port           int
-	readOnly       bool
-	version        string
-	versionComment string
-}
-
-// Executor wraps and manages the execution of a gh-ost migration.
+// Executor is a state machine running migrations
 type Executor struct {
 	env                   tabletenv.Env
 	pool                  *connpool.Pool
@@ -173,7 +152,7 @@ type Executor struct {
 	// A UUID listed in this map stands for a migration that is executing, and that this executor can control.
 	// Migrations found to be running which are not listed in this map will either:
 	// - be adopted by this executor (possible for vreplication migrations), or
-	// - be terminated (example: pt-osc migration gone rogue, process still running even as the migration failed)
+	// - be terminated
 	// The Executor auto-reviews the map and cleans up migrations thought to be running which are not running.
 	ownedRunningMigrations        sync.Map
 	vreplicationLastError         map[string]*vterrors.LastError
@@ -219,7 +198,7 @@ func safeMigrationCutOverThreshold(threshold time.Duration) (time.Duration, erro
 	}
 }
 
-// NewExecutor creates a new gh-ost executor.
+// NewExecutor creates a new executor.
 func NewExecutor(env tabletenv.Env, tabletAlias *topodatapb.TabletAlias, ts *topo.Server,
 	lagThrottler *throttle.Throttler,
 	tabletTypeFunc func() topodatapb.TabletType,
@@ -400,7 +379,7 @@ func (e *Executor) allowConcurrentMigration(onlineDDL *schema.OnlineDDL) (action
 	case sqlparser.RevertDDLAction:
 		// REVERT is allowed to run concurrently.
 		// Reminder that REVERT is supported for CREATE, DROP and for 'vitess' ALTER, but never for
-		// 'gh-ost' or 'pt-osc' ALTERs
+		// 'direct' or 'mysql' ALTERs
 		return action, true
 	}
 	return action, false
@@ -446,127 +425,10 @@ func (e *Executor) isAnyConflictingMigrationRunning(onlineDDL *schema.OnlineDDL)
 	return (conflictingMigration != nil), conflictingMigration
 }
 
-func (e *Executor) ghostPanicFlagFileName(uuid string) string {
-	return path.Join(os.TempDir(), fmt.Sprintf("ghost.%s.panic.flag", uuid))
-}
-
-func (e *Executor) createGhostPanicFlagFile(uuid string) error {
-	_, err := os.Create(e.ghostPanicFlagFileName(uuid))
-	return err
-}
-
-func (e *Executor) deleteGhostPanicFlagFile(uuid string) error {
-	// We use RemoveAll because if the file does not exist that's fine. Remove will return an error
-	// if file does not exist; RemoveAll does not.
-	return os.RemoveAll(e.ghostPanicFlagFileName(uuid))
-}
-
-func (e *Executor) ghostPostponeFlagFileName(uuid string) string {
-	return path.Join(os.TempDir(), fmt.Sprintf("ghost.%s.postpone.flag", uuid))
-}
-
-func (e *Executor) deleteGhostPostponeFlagFile(uuid string) error {
-	// We use RemoveAll because if the file does not exist that's fine. Remove will return an error
-	// if file does not exist; RemoveAll does not.
-	return os.RemoveAll(e.ghostPostponeFlagFileName(uuid))
-}
-
 func (e *Executor) ptPidFileName(uuid string) string {
 	return path.Join(os.TempDir(), fmt.Sprintf("pt-online-schema-change.%s.pid", uuid))
 }
 
-// readMySQLVariables contacts the backend MySQL server to read some of its configuration
-func (e *Executor) readMySQLVariables(ctx context.Context) (variables *mysqlVariables, err error) {
-	conn, err := e.pool.Get(ctx, nil)
-	if err != nil {
-		return nil, err
-	}
-	defer conn.Recycle()
-
-	tm, err := conn.Conn.Exec(ctx, `select
-			@@global.hostname as hostname,
-			@@global.port as port,
-			@@global.read_only as read_only,
-			@@global.version AS version,
-			@@global.version_comment AS version_comment
-		from dual`, 1, true)
-	if err != nil {
-		return nil, vterrors.Errorf(vtrpcpb.Code_UNKNOWN, "could not read MySQL variables: %v", err)
-	}
-	row := tm.Named().Row()
-	if row == nil {
-		return nil, vterrors.Errorf(vtrpcpb.Code_UNKNOWN, "unexpected result for MySQL variables: %+v", tm.Rows)
-	}
-	variables = &mysqlVariables{}
-
-	if e.env.Config().DB.Host != "" {
-		variables.host = e.env.Config().DB.Host
-	} else {
-		variables.host = row["hostname"].ToString()
-	}
-
-	if e.env.Config().DB.Port != 0 {
-		variables.port = e.env.Config().DB.Port
-	} else if port, err := row.ToInt("port"); err != nil {
-		return nil, vterrors.Errorf(vtrpcpb.Code_UNKNOWN, "could not parse @@global.port %v: %v", tm, err)
-	} else {
-		variables.port = port
-	}
-	if variables.readOnly, err = row.ToBool("read_only"); err != nil {
-		return nil, vterrors.Errorf(vtrpcpb.Code_UNKNOWN, "could not parse @@global.read_only %v: %v", tm, err)
-	}
-
-	variables.version = row["version"].ToString()
-	variables.versionComment = row["version_comment"].ToString()
-
-	return variables, nil
-}
-
-// createOnlineDDLUser creates a gh-ost or pt-osc user account with all
-// necessary privileges and with a random password
-func (e *Executor) createOnlineDDLUser(ctx context.Context) (password string, err error) {
-	conn, err := dbconnpool.NewDBConnection(ctx, e.env.Config().DB.DbaConnector())
-	if err != nil {
-		return password, err
-	}
-	defer conn.Close()
-
-	password = RandomHash()[0:maxPasswordLength]
-
-	for _, query := range sqlCreateOnlineDDLUser {
-		parsed := sqlparser.BuildParsedQuery(query, onlineDDLGrant, password)
-		if _, err := conn.ExecuteFetch(parsed.Query, 0, false); err != nil {
-			return password, err
-		}
-	}
-	for _, query := range sqlGrantOnlineDDLSuper {
-		parsed := sqlparser.BuildParsedQuery(query, onlineDDLGrant)
-		conn.ExecuteFetch(parsed.Query, 0, false)
-		// We ignore failure, since we might not be able to grant
-		// SUPER privs (e.g. Aurora)
-	}
-	for _, query := range sqlGrantOnlineDDLUser {
-		parsed := sqlparser.BuildParsedQuery(query, onlineDDLGrant)
-		if _, err := conn.ExecuteFetch(parsed.Query, 0, false); err != nil {
-			return password, err
-		}
-	}
-	return password, err
-}
-
-// dropOnlineDDLUser drops the given ddl user account at the end of migration
-func (e *Executor) dropOnlineDDLUser(ctx context.Context) error {
-	conn, err := dbconnpool.NewDBConnection(ctx, e.env.Config().DB.DbaConnector())
-	if err != nil {
-		return err
-	}
-	defer conn.Close()
-
-	parsed := sqlparser.BuildParsedQuery(sqlDropOnlineDDLUser, onlineDDLGrant)
-	_, err = conn.ExecuteFetch(parsed.Query, 0, false)
-	return err
-}
-
 // tableExists checks if a given table exists.
 func (e *Executor) tableExists(ctx context.Context, tableName string) (bool, error) {
 	tableName = strings.ReplaceAll(tableName, `_`, `\_`)
@@ -610,16 +472,6 @@ func (e *Executor) getCreateTableStatement(ctx context.Context, tableName string
 	return createTable, nil
 }
 
-func (e *Executor) parseAlterOptions(ctx context.Context, onlineDDL *schema.OnlineDDL) string {
-	// Temporary hack (2020-08-11)
-	// Because sqlparser does not do full blown ALTER TABLE parsing,
-	// and because we don't want gh-ost to know about WITH_GHOST and WITH_PT syntax,
-	// we resort to regexp-based parsing of the query.
-	// TODO(shlomi): generate _alter options_ via sqlparser when it full supports ALTER TABLE syntax.
-	_, _, alterOptions := schema.ParseAlterTableOptions(onlineDDL.SQL)
-	return alterOptions
-}
-
 // executeDirectly runs a DDL query directly on the backend MySQL server
 func (e *Executor) executeDirectly(ctx context.Context, onlineDDL *schema.OnlineDDL, acceptableMySQLErrorCodes ...sqlerror.ErrorCode) (acceptableErrorCodeFound bool, err error) {
 	conn, err := dbconnpool.NewDBConnection(ctx, e.env.Config().DB.DbaWithDB())
@@ -1589,438 +1441,6 @@ func (e *Executor) ExecuteWithVReplication(ctx context.Context, onlineDDL *schem
 	return nil
 }
 
-// ExecuteWithGhost validates and runs a gh-ost process.
-// Validation included testing the backend MySQL server and the gh-ost binary itself
-// Execution runs first a dry run, then an actual migration
-func (e *Executor) ExecuteWithGhost(ctx context.Context, onlineDDL *schema.OnlineDDL) error {
-	if e.tabletTypeFunc() != topodatapb.TabletType_PRIMARY {
-		return ErrExecutorNotWritableTablet
-	}
-	variables, err := e.readMySQLVariables(ctx)
-	if err != nil {
-		log.Errorf("Error before running gh-ost: %+v", err)
-		return err
-	}
-	if variables.readOnly {
-		err := fmt.Errorf("Error before running gh-ost: MySQL server is read_only")
-		log.Errorf(err.Error())
-		return err
-	}
-	onlineDDLPassword, err := e.createOnlineDDLUser(ctx)
-	if err != nil {
-		err := fmt.Errorf("Error creating gh-ost user: %+v", err)
-		log.Errorf(err.Error())
-		return err
-	}
-	tempDir, err := createTempDir(onlineDDL.UUID)
-	if err != nil {
-		log.Errorf("Error creating temporary directory: %+v", err)
-		return err
-	}
-	credentialsConfigFileContent := fmt.Sprintf(`[client]
-user=%s
-password=${ONLINE_DDL_PASSWORD}
-`, onlineDDLUser)
-	credentialsConfigFileName, err := createTempScript(tempDir, "gh-ost-conf.cfg", credentialsConfigFileContent)
-	if err != nil {
-		log.Errorf("Error creating config file: %+v", err)
-		return err
-	}
-	wrapperScriptContent := fmt.Sprintf(`#!/bin/bash
-ghost_log_path="%s"
-ghost_log_file="%s"
-ghost_log_failure_file="%s"
-
-mkdir -p "$ghost_log_path"
-
-export ONLINE_DDL_PASSWORD
-%s "$@" > "$ghost_log_path/$ghost_log_file" 2>&1
-exit_code=$?
-grep -o '\bFATAL\b.*' "$ghost_log_path/$ghost_log_file" | tail -1 > "$ghost_log_path/$ghost_log_failure_file"
-exit $exit_code
-	`, tempDir, migrationLogFileName, migrationFailureFileName, ghostBinaryPath,
-	)
-	wrapperScriptFileName, err := createTempScript(tempDir, "gh-ost-wrapper.sh", wrapperScriptContent)
-	if err != nil {
-		log.Errorf("Error creating wrapper script: %+v", err)
-		return err
-	}
-	onHookContent := func(status schema.OnlineDDLStatus, hint string) string {
-		return fmt.Sprintf(`#!/bin/bash
-	curl --max-time 10 -s 'http://localhost:%d/schema-migration/report-status?uuid=%s&status=%s&hint=%s&dryrun='"$GH_OST_DRY_RUN"'&progress='"$GH_OST_PROGRESS"'&eta='"$GH_OST_ETA_SECONDS"'&rowscopied='"$GH_OST_COPIED_ROWS"
-			`, servenv.Port(), onlineDDL.UUID, string(status), hint)
-	}
-	if _, err := createTempScript(tempDir, "gh-ost-on-startup", onHookContent(schema.OnlineDDLStatusRunning, emptyHint)); err != nil {
-		log.Errorf("Error creating script: %+v", err)
-		return err
-	}
-	if _, err := createTempScript(tempDir, "gh-ost-on-status", onHookContent(schema.OnlineDDLStatusRunning, emptyHint)); err != nil {
-		log.Errorf("Error creating script: %+v", err)
-		return err
-	}
-	if _, err := createTempScript(tempDir, "gh-ost-on-success", onHookContent(schema.OnlineDDLStatusComplete, emptyHint)); err != nil {
-		log.Errorf("Error creating script: %+v", err)
-		return err
-	}
-	if _, err := createTempScript(tempDir, "gh-ost-on-failure", onHookContent(schema.OnlineDDLStatusFailed, emptyHint)); err != nil {
-		log.Errorf("Error creating script: %+v", err)
-		return err
-	}
-	if _, err := createTempScript(tempDir, "gh-ost-on-begin-postponed", onHookContent(schema.OnlineDDLStatusRunning, readyToCompleteHint)); err != nil {
-		log.Errorf("Error creating script: %+v", err)
-		return err
-	}
-	serveSocketFile := path.Join(tempDir, "serve.sock")
-
-	if err := e.deleteGhostPanicFlagFile(onlineDDL.UUID); err != nil {
-		log.Errorf("Error removing gh-ost panic flag file %s: %+v", e.ghostPanicFlagFileName(onlineDDL.UUID), err)
-		return err
-	}
-	if err := e.deleteGhostPostponeFlagFile(onlineDDL.UUID); err != nil {
-		log.Errorf("Error removing gh-ost postpone flag file %s before migration: %+v", e.ghostPostponeFlagFileName(onlineDDL.UUID), err)
-		return err
-	}
-	// Validate gh-ost binary:
-	_ = e.updateMigrationMessage(ctx, onlineDDL.UUID, "validating gh-ost --version")
-	log.Infof("Will now validate gh-ost binary")
-	_, err = execCmd(
-		"bash",
-		[]string{
-			wrapperScriptFileName,
-			"--version",
-		},
-		os.Environ(),
-		"/tmp",
-		nil,
-		nil,
-	)
-	if err != nil {
-		log.Errorf("Error testing gh-ost binary: %+v", err)
-		return err
-	}
-	_ = e.updateMigrationMessage(ctx, onlineDDL.UUID, "validated gh-ost --version")
-	log.Infof("+ OK")
-
-	if err := e.updateMigrationLogPath(ctx, onlineDDL.UUID, variables.host, tempDir); err != nil {
-		return err
-	}
-
-	runGhost := func(execute bool) error {
-		alterOptions := e.parseAlterOptions(ctx, onlineDDL)
-		forceTableNames := fmt.Sprintf("%s_%s", onlineDDL.UUID, schema.ReadableTimestamp())
-
-		if err := e.updateArtifacts(ctx, onlineDDL.UUID,
-			fmt.Sprintf("_%s_gho", forceTableNames),
-			fmt.Sprintf("_%s_ghc", forceTableNames),
-			fmt.Sprintf("_%s_del", forceTableNames),
-		); err != nil {
-			return err
-		}
-
-		os.Setenv("ONLINE_DDL_PASSWORD", onlineDDLPassword)
-		args := []string{
-			wrapperScriptFileName,
-			fmt.Sprintf(`--host=%s`, variables.host),
-			fmt.Sprintf(`--port=%d`, variables.port),
-			fmt.Sprintf(`--conf=%s`, credentialsConfigFileName), // user & password found here
-			`--allow-on-master`,
-			`--max-load=Threads_running=900`,
-			`--critical-load=Threads_running=1000`,
-			`--critical-load-hibernate-seconds=60`,
-			`--approve-renamed-columns`,
-			`--debug`,
-			`--exact-rowcount`,
-			`--default-retries=120`,
-			fmt.Sprintf("--force-table-names=%s", forceTableNames),
-			fmt.Sprintf("--serve-socket-file=%s", serveSocketFile),
-			fmt.Sprintf("--hooks-path=%s", tempDir),
-			fmt.Sprintf(`--hooks-hint-token=%s`, onlineDDL.UUID),
-			fmt.Sprintf(`--throttle-http=http://localhost:%d/throttler/check?app=%s:%s:%s&p=low`, servenv.Port(), throttlerapp.OnlineDDLName, throttlerapp.GhostName, onlineDDL.UUID),
-			fmt.Sprintf(`--database=%s`, e.dbName),
-			fmt.Sprintf(`--table=%s`, onlineDDL.Table),
-			fmt.Sprintf(`--alter=%s`, alterOptions),
-			fmt.Sprintf(`--panic-flag-file=%s`, e.ghostPanicFlagFileName(onlineDDL.UUID)),
-			fmt.Sprintf(`--execute=%t`, execute),
-		}
-		if onlineDDL.StrategySetting().IsAllowZeroInDateFlag() {
-			args = append(args, "--allow-zero-in-date")
-		}
-		if execute && onlineDDL.StrategySetting().IsPostponeCompletion() {
-			args = append(args, "--postpone-cut-over-flag-file", e.ghostPostponeFlagFileName(onlineDDL.UUID))
-		}
-
-		args = append(args, onlineDDL.StrategySetting().RuntimeOptions()...)
-		_ = e.updateMigrationMessage(ctx, onlineDDL.UUID, fmt.Sprintf("executing gh-ost --execute=%v", execute))
-		_, err := execCmd("bash", args, os.Environ(), "/tmp", nil, nil)
-		_ = e.updateMigrationMessage(ctx, onlineDDL.UUID, fmt.Sprintf("executed gh-ost --execute=%v, err=%v", execute, err))
-		if err != nil {
-			// See if we can get more info from the failure file
-			if content, ferr := os.ReadFile(path.Join(tempDir, migrationFailureFileName)); ferr == nil {
-				failureMessage := strings.TrimSpace(string(content))
-				if failureMessage != "" {
-					// This message was produced by gh-ost itself. It is more informative than the default "migration failed..." message. Overwrite.
-					return errors.New(failureMessage)
-				}
-			}
-		}
-		return err
-	}
-
-	e.ownedRunningMigrations.Store(onlineDDL.UUID, onlineDDL)
-
-	go func() error {
-		defer e.ownedRunningMigrations.Delete(onlineDDL.UUID)
-		defer e.deleteGhostPostponeFlagFile(onlineDDL.UUID) // irrespective whether the file was in fact in use or not
-		defer e.dropOnlineDDLUser(ctx)
-		defer e.gcArtifacts(ctx)
-
-		log.Infof("Will now dry-run gh-ost on: %s:%d", variables.host, variables.port)
-		if err := runGhost(false); err != nil {
-			// perhaps gh-ost was interrupted midway and didn't have the chance to send a "failed" status
-			_ = e.failMigration(ctx, onlineDDL, err)
-
-			log.Errorf("Error executing gh-ost dry run: %+v", err)
-			return err
-		}
-		log.Infof("+ OK")
-
-		log.Infof("Will now run gh-ost on: %s:%d", variables.host, variables.port)
-		startedMigrations.Add(1)
-		if err := runGhost(true); err != nil {
-			// perhaps gh-ost was interrupted midway and didn't have the chance to send a "failes" status
-			_ = e.failMigration(ctx, onlineDDL, err)
-			failedMigrations.Add(1)
-			log.Errorf("Error running gh-ost: %+v", err)
-			return err
-		}
-		// Migration successful!
-		defer e.reloadSchema(ctx)
-		successfulMigrations.Add(1)
-		log.Infof("+ OK")
-		return nil
-	}()
-	return nil
-}
-
-// ExecuteWithPTOSC validates and runs a pt-online-schema-change process.
-// Validation included testing the backend MySQL server and the pt-online-schema-change binary itself
-// Execution runs first a dry run, then an actual migration
-func (e *Executor) ExecuteWithPTOSC(ctx context.Context, onlineDDL *schema.OnlineDDL) error {
-	if e.tabletTypeFunc() != topodatapb.TabletType_PRIMARY {
-		return ErrExecutorNotWritableTablet
-	}
-	variables, err := e.readMySQLVariables(ctx)
-	if err != nil {
-		log.Errorf("Error before running pt-online-schema-change: %+v", err)
-		return err
-	}
-	if variables.readOnly {
-		err := fmt.Errorf("Error before running pt-online-schema-change: MySQL server is read_only")
-		log.Errorf(err.Error())
-		return err
-	}
-	onlineDDLPassword, err := e.createOnlineDDLUser(ctx)
-	if err != nil {
-		err := fmt.Errorf("Error creating pt-online-schema-change user: %+v", err)
-		log.Errorf(err.Error())
-		return err
-	}
-	tempDir, err := createTempDir(onlineDDL.UUID)
-	if err != nil {
-		log.Errorf("Error creating temporary directory: %+v", err)
-		return err
-	}
-
-	wrapperScriptContent := fmt.Sprintf(`#!/bin/bash
-pt_log_path="%s"
-pt_log_file="%s"
-
-mkdir -p "$pt_log_path"
-
-export MYSQL_PWD
-%s "$@" > "$pt_log_path/$pt_log_file" 2>&1
-	`, tempDir, migrationLogFileName, ptOSCBinaryPath,
-	)
-	wrapperScriptFileName, err := createTempScript(tempDir, "pt-online-schema-change-wrapper.sh", wrapperScriptContent)
-	if err != nil {
-		log.Errorf("Error creating wrapper script: %+v", err)
-		return err
-	}
-	pluginCode := `
-	package pt_online_schema_change_plugin;
-
-	use strict;
-	use LWP::Simple;
-
-	sub new {
-	  my($class, % args) = @_;
-	  my $self = { %args };
-	  return bless $self, $class;
-	}
-
-	sub init {
-	  my($self, % args) = @_;
-	}
-
-	sub before_create_new_table {
-	  my($self, % args) = @_;
-	  get("http://localhost:{{VTTABLET_PORT}}/schema-migration/report-status?uuid={{MIGRATION_UUID}}&status={{OnlineDDLStatusRunning}}&hint=&dryrun={{DRYRUN}}");
-	}
-
-	sub before_exit {
-		my($self, % args) = @_;
-		my $exit_status = $args{exit_status};
-	  if ($exit_status == 0) {
-	    get("http://localhost:{{VTTABLET_PORT}}/schema-migration/report-status?uuid={{MIGRATION_UUID}}&status={{OnlineDDLStatusComplete}}&hint=&dryrun={{DRYRUN}}");
-	  } else {
-	    get("http://localhost:{{VTTABLET_PORT}}/schema-migration/report-status?uuid={{MIGRATION_UUID}}&status={{OnlineDDLStatusFailed}}&hint=&dryrun={{DRYRUN}}");
-	  }
-	}
-
-	sub get_slave_lag {
-		my ($self, %args) = @_;
-
-		return sub {
-			if (head("http://localhost:{{VTTABLET_PORT}}/throttler/check?app={{THROTTLER_ONLINE_DDL_APP}}:{{THROTTLER_PT_OSC_APP}}:{{MIGRATION_UUID}}&p=low")) {
-				# Got HTTP 200 OK, means throttler is happy
-				return 0;
-			}	else {
-				# Throttler requests to hold back
-				return 2147483647; # maxint, report *very* high lag
-			}
-		};
-	}
-
-	1;
-	`
-	pluginCode = strings.ReplaceAll(pluginCode, "{{VTTABLET_PORT}}", fmt.Sprintf("%d", servenv.Port()))
-	pluginCode = strings.ReplaceAll(pluginCode, "{{MIGRATION_UUID}}", onlineDDL.UUID)
-	pluginCode = strings.ReplaceAll(pluginCode, "{{THROTTLER_ONLINE_DDL_APP}}", throttlerapp.OnlineDDLName.String())
-	pluginCode = strings.ReplaceAll(pluginCode, "{{THROTTLER_PT_OSC_APP}}", throttlerapp.PTOSCName.String())
-
-	pluginCode = strings.ReplaceAll(pluginCode, "{{OnlineDDLStatusRunning}}", string(schema.OnlineDDLStatusRunning))
-	pluginCode = strings.ReplaceAll(pluginCode, "{{OnlineDDLStatusComplete}}", string(schema.OnlineDDLStatusComplete))
-	pluginCode = strings.ReplaceAll(pluginCode, "{{OnlineDDLStatusFailed}}", string(schema.OnlineDDLStatusFailed))
-
-	// Validate pt-online-schema-change binary:
-	log.Infof("Will now validate pt-online-schema-change binary")
-	_, err = execCmd(
-		"bash",
-		[]string{
-			wrapperScriptFileName,
-			"--version",
-		},
-		os.Environ(),
-		"/tmp",
-		nil,
-		nil,
-	)
-	if err != nil {
-		log.Errorf("Error testing pt-online-schema-change binary: %+v", err)
-		return err
-	}
-	log.Infof("+ OK")
-
-	if err := e.updateMigrationLogPath(ctx, onlineDDL.UUID, variables.host, tempDir); err != nil {
-		return err
-	}
-
-	alterOptions := e.parseAlterOptions(ctx, onlineDDL)
-
-	// The following sleep() is temporary and artificial. Because we create a new user for this
-	// migration, and because we throttle by replicas, we need to wait for the replicas to be
-	// caught up with the new user creation. Otherwise, the OSC tools will fail connecting to the replicas...
-	// Once we have a built in throttling service , we will no longer need to have the OSC tools probe the
-	// replicas. Instead, they will consult with our throttling service.
-	// TODO(shlomi): replace/remove this when we have a proper throttling solution
-	time.Sleep(time.Second)
-
-	runPTOSC := func(execute bool) error {
-		os.Setenv("MYSQL_PWD", onlineDDLPassword)
-		newTableName := fmt.Sprintf("_%s_%s_new", onlineDDL.UUID, schema.ReadableTimestamp())
-
-		if err := e.updateArtifacts(ctx, onlineDDL.UUID,
-			fmt.Sprintf("_%s_old", onlineDDL.Table),
-			fmt.Sprintf("__%s_old", onlineDDL.Table),
-			newTableName,
-		); err != nil {
-			return err
-		}
-
-		executeFlag := "--dry-run"
-		if execute {
-			executeFlag = "--execute"
-		}
-		finalPluginCode := strings.ReplaceAll(pluginCode, "{{DRYRUN}}", fmt.Sprintf("%t", !execute))
-		pluginFile, err := createTempScript(tempDir, "pt-online-schema-change-plugin", finalPluginCode)
-		if err != nil {
-			log.Errorf("Error creating script: %+v", err)
-			return err
-		}
-		args := []string{
-			wrapperScriptFileName,
-			`--pid`,
-			e.ptPidFileName(onlineDDL.UUID),
-			`--plugin`,
-			pluginFile,
-			`--new-table-name`,
-			newTableName,
-			`--alter`,
-			alterOptions,
-			`--check-slave-lag`, // We use primary's identity so that pt-online-schema-change calls our lag plugin for exactly 1 server
-			fmt.Sprintf(`h=%s,P=%d,D=%s,t=%s,u=%s`, variables.host, variables.port, e.dbName, onlineDDL.Table, onlineDDLUser),
-			executeFlag,
-			fmt.Sprintf(`h=%s,P=%d,D=%s,t=%s,u=%s`, variables.host, variables.port, e.dbName, onlineDDL.Table, onlineDDLUser),
-		}
-
-		if execute {
-			args = append(args,
-				`--no-drop-new-table`,
-				`--no-drop-old-table`,
-			)
-		}
-		args = append(args, onlineDDL.StrategySetting().RuntimeOptions()...)
-		_, err = execCmd("bash", args, os.Environ(), "/tmp", nil, nil)
-		return err
-	}
-
-	e.ownedRunningMigrations.Store(onlineDDL.UUID, onlineDDL)
-
-	go func() error {
-		defer e.ownedRunningMigrations.Delete(onlineDDL.UUID)
-		defer e.dropOnlineDDLUser(ctx)
-		defer e.gcArtifacts(ctx)
-
-		log.Infof("Will now dry-run pt-online-schema-change on: %s:%d", variables.host, variables.port)
-		if err := runPTOSC(false); err != nil {
-			// perhaps pt-osc was interrupted midway and didn't have the chance to send a "failes" status
-			_ = e.failMigration(ctx, onlineDDL, err)
-			_ = e.updateMigrationTimestamp(ctx, "completed_timestamp", onlineDDL.UUID)
-			log.Errorf("Error executing pt-online-schema-change dry run: %+v", err)
-			return err
-		}
-		log.Infof("+ OK")
-
-		log.Infof("Will now run pt-online-schema-change on: %s:%d", variables.host, variables.port)
-		startedMigrations.Add(1)
-		if err := runPTOSC(true); err != nil {
-			// perhaps pt-osc was interrupted midway and didn't have the chance to send a "failes" status
-			_ = e.failMigration(ctx, onlineDDL, err)
-			_ = e.updateMigrationTimestamp(ctx, "completed_timestamp", onlineDDL.UUID)
-			_ = e.dropPTOSCMigrationTriggers(ctx, onlineDDL)
-			failedMigrations.Add(1)
-			log.Errorf("Error running pt-online-schema-change: %+v", err)
-			return err
-		}
-		// Migration successful!
-		defer e.reloadSchema(ctx)
-		successfulMigrations.Add(1)
-		log.Infof("+ OK")
-		return nil
-	}()
-	return nil
-}
-
 func (e *Executor) readMigration(ctx context.Context, uuid string) (onlineDDL *schema.OnlineDDL, row sqltypes.RowNamedValues, err error) {
 
 	query, err := sqlparser.ParseAndBind(sqlSelectMigration,
@@ -2087,36 +1507,6 @@ func (e *Executor) terminateMigration(ctx context.Context, onlineDDL *schema.Onl
 		if err := e.terminateVReplMigration(ctx, onlineDDL.UUID); err != nil {
 			return foundRunning, fmt.Errorf("Error terminating migration, vreplication exec error: %+v", err)
 		}
-	case schema.DDLStrategyPTOSC:
-		// see if pt-osc is running (could have been executed by this vttablet or one that crashed in the past)
-		if running, pid, _ := e.isPTOSCMigrationRunning(ctx, onlineDDL.UUID); running {
-			foundRunning = true
-			// Because pt-osc doesn't offer much control, we take a brute force approach to killing it,
-			// revoking its privileges, and cleaning up its triggers.
-			if err := syscallutil.Kill(pid, syscall.SIGTERM); err != nil {
-				return foundRunning, nil
-			}
-			if err := syscallutil.Kill(pid, syscall.SIGKILL); err != nil {
-				return foundRunning, nil
-			}
-			if err := e.dropOnlineDDLUser(ctx); err != nil {
-				return foundRunning, nil
-			}
-			if err := e.dropPTOSCMigrationTriggers(ctx, onlineDDL); err != nil {
-				return foundRunning, nil
-			}
-		}
-	case schema.DDLStrategyGhost:
-		// double check: is the running migration the very same one we wish to cancel?
-		if _, ok := e.ownedRunningMigrations.Load(onlineDDL.UUID); ok {
-			// assuming all goes well in next steps, we can already report that there has indeed been a migration
-			foundRunning = true
-		}
-		// gh-ost migrations are easy to kill: just touch their specific panic flag files. We trust
-		// gh-ost to terminate. No need to KILL it. And there's no trigger cleanup.
-		if err := e.createGhostPanicFlagFile(onlineDDL.UUID); err != nil {
-			return foundRunning, fmt.Errorf("Error terminating gh-ost migration, flag file error: %+v", err)
-		}
 	}
 	return foundRunning, nil
 }
@@ -2319,7 +1709,7 @@ func (e *Executor) scheduleNextMigration(ctx context.Context) error {
 
 		if !(isImmediateOperation && postponeCompletion) {
 			// Any non-postponed migration can be scheduled
-			// postponed ALTER can be scheduled (because gh-ost or vreplication will postpone the cut-over)
+			// postponed ALTER can be scheduled (because vreplication will postpone the cut-over)
 			// We only schedule a single migration in the execution of this function
 			onlyScheduleOneMigration.Do(func() {
 				err = e.updateMigrationStatus(ctx, uuid, schema.OnlineDDLStatusReady)
@@ -2390,7 +1780,6 @@ func (e *Executor) reviewEmptyTableRevertMigrations(ctx context.Context, onlineD
 // - All VIEW operations
 // - An INSTANT DDL accompanied by relevant ddl strategy flags
 // Non immediate operations are:
-// - A gh-ost migration
 // - A vitess (vreplication) migration
 func (e *Executor) reviewImmediateOperations(
 	ctx context.Context,
@@ -3184,14 +2573,6 @@ func (e *Executor) executeAlterDDLActionMigration(ctx context.Context, onlineDDL
 		if err := e.ExecuteWithVReplication(ctx, onlineDDL, nil); err != nil {
 			return failMigration(err)
 		}
-	case schema.DDLStrategyGhost:
-		if err := e.ExecuteWithGhost(ctx, onlineDDL); err != nil {
-			return failMigration(err)
-		}
-	case schema.DDLStrategyPTOSC:
-		if err := e.ExecuteWithPTOSC(ctx, onlineDDL); err != nil {
-			return failMigration(err)
-		}
 	case schema.DDLStrategyMySQL:
 		if _, err := e.executeDirectly(ctx, onlineDDL); err != nil {
 			return failMigration(err)
@@ -3441,72 +2822,6 @@ func (e *Executor) runNextMigration(ctx context.Context) error {
 	return nil
 }
 
-// isPTOSCMigrationRunning sees if pt-online-schema-change is running a specific migration,
-// by examining its PID file
-func (e *Executor) isPTOSCMigrationRunning(ctx context.Context, uuid string) (isRunning bool, pid int, err error) {
-	// Try and read its PID file:
-	content, err := os.ReadFile(e.ptPidFileName(uuid))
-	if err != nil {
-		// file probably does not exist (migration not running)
-		// or any other issue --> we can't confirm that the migration is actually running
-		return false, pid, err
-	}
-	contentString := strings.TrimSpace(string(content))
-	//
-	pid, err = strconv.Atoi(contentString)
-	if err != nil {
-		// can't get the PID right. Can't confirm migration is running.
-		return false, pid, err
-	}
-	p, err := os.FindProcess(pid)
-	if err != nil {
-		// can't find the process. Can't confirm migration is running.
-		return false, pid, err
-	}
-	err = p.Signal(syscall.Signal(0))
-	if err != nil {
-		// can't verify process is running. Can't confirm migration is running.
-		return false, pid, err
-	}
-	// AHA! We are able to confirm this pt-osc migration is actually running!
-	return true, pid, nil
-}
-
-// dropOnlineDDLUser drops the given ddl user account at the end of migration
-func (e *Executor) dropPTOSCMigrationTriggers(ctx context.Context, onlineDDL *schema.OnlineDDL) error {
-	conn, err := dbconnpool.NewDBConnection(ctx, e.env.Config().DB.DbaConnector())
-	if err != nil {
-		return err
-	}
-	defer conn.Close()
-
-	parsed := sqlparser.BuildParsedQuery(sqlSelectPTOSCMigrationTriggers, ":mysql_schema", ":mysql_table")
-	bindVars := map[string]*querypb.BindVariable{
-		"mysql_schema": sqltypes.StringBindVariable(onlineDDL.Schema),
-		"mysql_table":  sqltypes.StringBindVariable(onlineDDL.Table),
-	}
-	bound, err := parsed.GenerateQuery(bindVars, nil)
-	if err != nil {
-		return err
-	}
-	r, err := e.execQuery(ctx, bound)
-	if err != nil {
-		return err
-	}
-	for _, row := range r.Named().Rows {
-		// iterate pt-osc triggers and drop them
-		triggerSchema := row.AsString("trigger_schema", "")
-		triggerName := row.AsString("trigger_name", "")
-
-		dropParsed := sqlparser.BuildParsedQuery(sqlDropTrigger, triggerSchema, triggerName)
-		if _, err := conn.ExecuteFetch(dropParsed.Query, 0, false); err != nil {
-			return err
-		}
-	}
-
-	return err
-}
-
 // readVReplStream reads _vt.vreplication entries for given workflow
 func (e *Executor) readVReplStream(ctx context.Context, uuid string, okIfMissing bool) (*VReplStream, error) {
 	query, err := sqlparser.ParseAndBind(sqlReadVReplStream,
@@ -3840,37 +3155,6 @@ func (e *Executor) reviewRunningMigrations(ctx context.Context) (countRunnning i
 			if err := reviewVReplRunningMigration(); err != nil {
 				return countRunnning, cancellable, err
 			}
-		case schema.DDLStrategyPTOSC:
-			{
-				// Since pt-osc doesn't have a "liveness" plugin entry point, we do it externally:
-				// if the process is alive, we update the `liveness_timestamp` for this migration.
-				running, _, err := e.isPTOSCMigrationRunning(ctx, uuid)
-				if err != nil {
-					return countRunnning, cancellable, err
-				}
-				if running {
-					_ = e.updateMigrationTimestamp(ctx, "liveness_timestamp", uuid)
-				}
-				if _, ok := e.ownedRunningMigrations.Load(uuid); !ok {
-					// Ummm, the migration is running but we don't own it. This means the migration
-					// is rogue. Maybe executed by another tablet. Anyway, if we don't own it, we can't
-					// complete the migration. Even if it runs, the logic around announcing it as complete
-					// is missing. So we may as well cancel it.
-					message := fmt.Sprintf("cancelling a pt-osc running migration %s which is not owned (not started, or is assumed to be terminated) by this executor", uuid)
-					cancellable = append(cancellable, newCancellableMigration(uuid, message))
-				}
-			}
-		case schema.DDLStrategyGhost:
-			{
-				if _, ok := e.ownedRunningMigrations.Load(uuid); !ok {
-					// Ummm, the migration is running but we don't own it. This means the migration
-					// is rogue. Maybe executed by another tablet. Anyway, if we don't own it, we can't
-					// complete the migration. Even if it runs, the logic around announcing it as complete
-					// is missing. So we may as well cancel it.
-					message := fmt.Sprintf("cancelling a gh-ost running migration %s which is not owned by this executor. This can happen when the migration was started by a different tablet. Then, either a MySQL failure, a PRS, or ERS took place. gh-ost does not survive a MySQL restart or a shard failing over to a new PRIMARY", uuid)
-					cancellable = append(cancellable, newCancellableMigration(uuid, message))
-				}
-			}
 		}
 		countRunnning++
 	}
@@ -4205,21 +3489,6 @@ func (e *Executor) updateMigrationTimestamp(ctx context.Context, timestampColumn
 	return err
 }
 
-func (e *Executor) updateMigrationLogPath(ctx context.Context, uuid string, hostname, logPath string) error {
-	logFile := path.Join(logPath, migrationLogFileName)
-	hostLogPath := fmt.Sprintf("%s:%s", hostname, logPath)
-	query, err := sqlparser.ParseAndBind(sqlUpdateMigrationLogPath,
-		sqltypes.StringBindVariable(hostLogPath),
-		sqltypes.StringBindVariable(logFile),
-		sqltypes.StringBindVariable(uuid),
-	)
-	if err != nil {
-		return err
-	}
-	_, err = e.execQuery(ctx, query)
-	return err
-}
-
 func (e *Executor) updateArtifacts(ctx context.Context, uuid string, artifacts ...string) error {
 	bindArtifacts := strings.Join(artifacts, ",")
 	query, err := sqlparser.ParseAndBind(sqlUpdateArtifacts,
@@ -4817,11 +4086,6 @@ func (e *Executor) CompleteMigration(ctx context.Context, uuid string) (result *
 		return nil, err
 	}
 	defer e.triggerNextCheckInterval()
-	if err := e.deleteGhostPostponeFlagFile(uuid); err != nil {
-		// This should work without error even if the migration is not a gh-ost migration, and even
-		// if the file does not exist. An error here indicates a general system error of sorts.
-		return nil, err
-	}
 	rs, err := e.execQuery(ctx, query)
 	if err != nil {
 		return nil, err
@@ -5247,27 +4511,6 @@ func (e *Executor) onSchemaMigrationStatus(ctx context.Context,
 	return nil
 }
 
-// OnSchemaMigrationStatus is called by TabletServer's API, which is invoked by a running gh-ost migration's hooks.
-func (e *Executor) OnSchemaMigrationStatus(ctx context.Context,
-	uuidParam, statusParam, dryrunParam, progressParam, etaParam, rowsCopiedParam, hint string) (err error) {
-	status := schema.OnlineDDLStatus(statusParam)
-	dryRun := (dryrunParam == "true")
-	var progressPct float64
-	if pct, err := strconv.ParseFloat(progressParam, 64); err == nil {
-		progressPct = pct
-	}
-	var etaSeconds int64 = etaSecondsUnknown
-	if eta, err := strconv.ParseInt(etaParam, 10, 64); err == nil {
-		etaSeconds = eta
-	}
-	var rowsCopied int64
-	if rows, err := strconv.ParseInt(rowsCopiedParam, 10, 64); err == nil {
-		rowsCopied = rows
-	}
-
-	return e.onSchemaMigrationStatus(ctx, uuidParam, status, dryRun, progressPct, etaSeconds, rowsCopied, hint)
-}
-
 // checkOnPreparedPool checks if there are any cross-shard prepared transactions on the given table
 func (e *Executor) checkOnPreparedPool(ctx context.Context, table string, waitTime time.Duration) error {
 	if e.isPreparedPoolEmpty(table) {
diff --git a/go/vt/vttablet/onlineddl/schema.go b/go/vt/vttablet/onlineddl/schema.go
index 6c0bff1086f..4c47e46da3a 100644
--- a/go/vt/vttablet/onlineddl/schema.go
+++ b/go/vt/vttablet/onlineddl/schema.go
@@ -468,16 +468,6 @@ const (
 			migration_status='ready'
 		ORDER BY id
 	`
-	sqlSelectPTOSCMigrationTriggers = `SELECT
-			TRIGGER_SCHEMA as trigger_schema,
-			TRIGGER_NAME as trigger_name
-		FROM INFORMATION_SCHEMA.TRIGGERS
-		WHERE
-			EVENT_OBJECT_SCHEMA=%a
-			AND EVENT_OBJECT_TABLE=%a
-			AND ACTION_TIMING='AFTER'
-			AND LEFT(TRIGGER_NAME, 7)='pt_osc_'
-		`
 	selSelectCountFKParentConstraints = `
 		SELECT
 			COUNT(*) as num_fk_constraints
@@ -494,7 +484,6 @@ const (
 			TABLE_SCHEMA=%a AND TABLE_NAME=%a
 			AND REFERENCED_TABLE_NAME IS NOT NULL
 		`
-	sqlDropTrigger                         = "DROP TRIGGER IF EXISTS `%a`.`%a`"
 	sqlShowTablesLike                      = "SHOW TABLES LIKE '%a'"
 	sqlDropTable                           = "DROP TABLE `%a`"
 	sqlDropTableIfExists                   = "DROP TABLE IF EXISTS `%a`"
@@ -577,18 +566,3 @@ const (
 			metadata_locks.OBJECT_SCHEMA=database() AND metadata_locks.OBJECT_NAME=%a
 	`
 )
-
-var (
-	sqlCreateOnlineDDLUser = []string{
-		`CREATE USER IF NOT EXISTS %s IDENTIFIED BY '%s'`,
-		`ALTER USER %s IDENTIFIED BY '%s'`,
-	}
-	sqlGrantOnlineDDLSuper = []string{
-		`GRANT SUPER ON *.* TO %s`,
-	}
-	sqlGrantOnlineDDLUser = []string{
-		`GRANT PROCESS, REPLICATION SLAVE, REPLICATION CLIENT ON *.* TO %s`,
-		`GRANT ALTER, CREATE, CREATE VIEW, SHOW VIEW, DELETE, DROP, INDEX, INSERT, LOCK TABLES, SELECT, TRIGGER, UPDATE ON *.* TO %s`,
-	}
-	sqlDropOnlineDDLUser = `DROP USER IF EXISTS %s`
-)
diff --git a/go/vt/vttablet/onlineddl/util.go b/go/vt/vttablet/onlineddl/util.go
deleted file mode 100644
index 3d06e6df60e..00000000000
--- a/go/vt/vttablet/onlineddl/util.go
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
-Copyright 2019 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 onlineddl
-
-import (
-	"crypto/rand"
-	"crypto/sha256"
-	"encoding/hex"
-	"fmt"
-	"io"
-	"os"
-	"os/exec"
-	"path/filepath"
-	"strings"
-
-	"vitess.io/vitess/go/vt/log"
-)
-
-// execCmd searches the PATH for a command and runs it, logging the output.
-// If input is not nil, pipe it to the command's stdin.
-func execCmd(name string, args, env []string, dir string, input io.Reader, output io.Writer) (cmd *exec.Cmd, err error) {
-	cmdPath, err := exec.LookPath(name)
-	if err != nil {
-		return cmd, err
-	}
-	log.Infof("execCmd: %v %v %v", name, cmdPath, args)
-
-	cmd = exec.Command(cmdPath, args...)
-	cmd.Env = env
-	cmd.Dir = dir
-	if input != nil {
-		cmd.Stdin = input
-	}
-	if output != nil {
-		cmd.Stdout = output
-		cmd.Stderr = output
-	}
-	err = cmd.Run()
-	if err != nil {
-		err = fmt.Errorf("failed running command: %v %s; error=%v", name, strings.Join(args, " "), err)
-		log.Errorf(err.Error())
-	}
-	log.Infof("execCmd success: %v", name)
-	return cmd, err
-}
-
-// createTempDir creates a temporary directory and returns its name
-func createTempDir(hint string) (dirName string, err error) {
-	if hint != "" {
-		return os.MkdirTemp("", fmt.Sprintf("online-ddl-%s-*", hint))
-	}
-	return os.MkdirTemp("", "online-ddl-*")
-}
-
-// createTempScript creates an executable file in given directory and with given text as content.
-func createTempScript(dirName, fileName, text string) (fullName string, err error) {
-	fullName = filepath.Join(dirName, fileName)
-	bytes := []byte(text)
-	err = os.WriteFile(fullName, bytes, 0755)
-	return fullName, err
-}
-
-// RandomHash returns a 64 hex character random string
-func RandomHash() string {
-	size := 64
-	rb := make([]byte, size)
-	_, _ = rand.Read(rb)
-
-	hasher := sha256.New()
-	hasher.Write(rb)
-	return hex.EncodeToString(hasher.Sum(nil))
-}
diff --git a/go/vt/vttablet/onlineddl/util_test.go b/go/vt/vttablet/onlineddl/util_test.go
deleted file mode 100644
index 4beb154c0ae..00000000000
--- a/go/vt/vttablet/onlineddl/util_test.go
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
-Copyright 2019 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 onlineddl
-
-import (
-	"testing"
-
-	"github.com/stretchr/testify/assert"
-)
-
-func TestRandomHash(t *testing.T) {
-	h1 := RandomHash()
-	h2 := RandomHash()
-
-	assert.Equal(t, len(h1), 64)
-	assert.Equal(t, len(h2), 64)
-	assert.NotEqual(t, h1, h2)
-}
diff --git a/go/vt/vttablet/onlineddl/vrepl.go b/go/vt/vttablet/onlineddl/vrepl.go
index b00bcc40894..7423b05a574 100644
--- a/go/vt/vttablet/onlineddl/vrepl.go
+++ b/go/vt/vttablet/onlineddl/vrepl.go
@@ -1,10 +1,6 @@
 /*
 	Original copyright by GitHub as follows. Additions by the Vitess authors as follows.
 */
-/*
-   Copyright 2016 GitHub Inc.
-	 See https://github.com/github/gh-ost/blob/master/LICENSE
-*/
 /*
 Copyright 2021 The Vitess Authors.
 
diff --git a/go/vt/vttablet/tabletmanager/vreplication/vreplicator.go b/go/vt/vttablet/tabletmanager/vreplication/vreplicator.go
index 54e76efa092..ccc37064870 100644
--- a/go/vt/vttablet/tabletmanager/vreplication/vreplicator.go
+++ b/go/vt/vttablet/tabletmanager/vreplication/vreplicator.go
@@ -632,8 +632,7 @@ func (vr *vreplicator) setSQLMode(ctx context.Context, dbClient *vdbClient) (fun
 //   - "vreplication:online-ddl" for online ddl flows.
 //     Note that with such name, it's possible to throttle
 //     the workflow by either /throttler/throttle-app?app=vreplication and/or /throttler/throttle-app?app=online-ddl
-//     This is useful when we want to throttle all migrations. We throttle "online-ddl" and that applies to both vreplication
-//     migrations as well as gh-ost migrations.
+//     This is useful when we want to throttle all migrations. We throttle "online-ddl".
 func (vr *vreplicator) throttlerAppName() string {
 	names := []string{vr.WorkflowName, throttlerapp.VReplicationName.String()}
 	if vr.WorkflowType == int32(binlogdatapb.VReplicationWorkflowType_OnlineDDL) {
diff --git a/go/vt/vttablet/tabletserver/tabletserver.go b/go/vt/vttablet/tabletserver/tabletserver.go
index 53322384bdc..1120e09deef 100644
--- a/go/vt/vttablet/tabletserver/tabletserver.go
+++ b/go/vt/vttablet/tabletserver/tabletserver.go
@@ -230,7 +230,6 @@ func NewTabletServer(ctx context.Context, env *vtenv.Environment, name string, c
 	tsv.registerTxlogzHandler()
 	tsv.registerQueryListHandlers([]*QueryList{tsv.statelessql, tsv.statefulql, tsv.olapql})
 	tsv.registerTwopczHandler()
-	tsv.registerMigrationStatusHandler()
 	tsv.registerThrottlerHandlers()
 	tsv.registerDebugEnvHandler()
 
@@ -1906,18 +1905,6 @@ func (tsv *TabletServer) registerTwopczHandler() {
 	})
 }
 
-func (tsv *TabletServer) registerMigrationStatusHandler() {
-	tsv.exporter.HandleFunc("/schema-migration/report-status", func(w http.ResponseWriter, r *http.Request) {
-		ctx := tabletenv.LocalContext()
-		query := r.URL.Query()
-		if err := tsv.onlineDDLExecutor.OnSchemaMigrationStatus(ctx, query.Get("uuid"), query.Get("status"), query.Get("dryrun"), query.Get("progress"), query.Get("eta"), query.Get("rowscopied"), query.Get("hint")); err != nil {
-			http.Error(w, fmt.Sprintf("not ok: %v", err), http.StatusInternalServerError)
-			return
-		}
-		w.Write([]byte("ok"))
-	})
-}
-
 // registerThrottlerCheckHandlers registers throttler "check" requests
 func (tsv *TabletServer) registerThrottlerCheckHandlers() {
 	handle := func(path string, scope base.Scope) {
diff --git a/go/vt/vttablet/tabletserver/throttle/throttlerapp/app.go b/go/vt/vttablet/tabletserver/throttle/throttlerapp/app.go
index 6fef3db453a..fe9be91992c 100644
--- a/go/vt/vttablet/tabletserver/throttle/throttlerapp/app.go
+++ b/go/vt/vttablet/tabletserver/throttle/throttlerapp/app.go
@@ -55,8 +55,6 @@ const (
 
 	TableGCName   Name = "tablegc"
 	OnlineDDLName Name = "online-ddl"
-	GhostName     Name = "gh-ost"
-	PTOSCName     Name = "pt-osc"
 
 	VReplicationName      Name = "vreplication"
 	VStreamerName         Name = "vstreamer"
diff --git a/go/vt/vttablet/tabletserver/vstreamer/vstreamer.go b/go/vt/vttablet/tabletserver/vstreamer/vstreamer.go
index 237b2e78386..7384865d7eb 100644
--- a/go/vt/vttablet/tabletserver/vstreamer/vstreamer.go
+++ b/go/vt/vttablet/tabletserver/vstreamer/vstreamer.go
@@ -607,7 +607,7 @@ func (vs *vstreamer) parseEvent(ev mysql.BinlogEvent, bufferAndTransmit func(vev
 			vs.plans[id] = nil
 			return nil, nil
 		}
-		if vtschema.IsInternalOperationTableName(tm.Name) { // ignore tables created by onlineddl/gh-ost/pt-osc
+		if vtschema.IsInternalOperationTableName(tm.Name) { // ignore tables created by onlineddl/GC
 			vs.plans[id] = nil
 			return nil, nil
 		}
diff --git a/proto/vtctldata.proto b/proto/vtctldata.proto
index 745a3599cc9..78a76a36f82 100644
--- a/proto/vtctldata.proto
+++ b/proto/vtctldata.proto
@@ -181,8 +181,8 @@ message SchemaMigration {
     // SchemaMigration_VITESS was also formerly called "ONLINE".
     VITESS = 0;
     ONLINE = 0;
-    GHOST = 1;
-    PTOSC = 2;
+    reserved 1; // Was GHOST
+    reserved 2; // Was PTOSC
     // SchemaMigration_DIRECT runs the migration directly against MySQL (e.g. `ALTER TABLE ...`),
     // meaning it is not actually an "online" DDL migration.
     DIRECT = 3;
diff --git a/web/vtadmin/src/proto/vtadmin.d.ts b/web/vtadmin/src/proto/vtadmin.d.ts
index 0a946386995..2175e3508f4 100644
--- a/web/vtadmin/src/proto/vtadmin.d.ts
+++ b/web/vtadmin/src/proto/vtadmin.d.ts
@@ -51810,8 +51810,6 @@ export namespace vtctldata {
         enum Strategy {
             VITESS = 0,
             ONLINE = 0,
-            GHOST = 1,
-            PTOSC = 2,
             DIRECT = 3,
             MYSQL = 4
         }
diff --git a/web/vtadmin/src/proto/vtadmin.js b/web/vtadmin/src/proto/vtadmin.js
index cc3ef73ced6..17a941acfcf 100644
--- a/web/vtadmin/src/proto/vtadmin.js
+++ b/web/vtadmin/src/proto/vtadmin.js
@@ -126857,8 +126857,6 @@ export const vtctldata = $root.vtctldata = (() => {
                     return "strategy: enum value expected";
                 case 0:
                 case 0:
-                case 1:
-                case 2:
                 case 3:
                 case 4:
                     break;
@@ -127083,14 +127081,6 @@ export const vtctldata = $root.vtctldata = (() => {
             case 0:
                 message.strategy = 0;
                 break;
-            case "GHOST":
-            case 1:
-                message.strategy = 1;
-                break;
-            case "PTOSC":
-            case 2:
-                message.strategy = 2;
-                break;
             case "DIRECT":
             case 3:
                 message.strategy = 3;
@@ -127556,8 +127546,6 @@ export const vtctldata = $root.vtctldata = (() => {
          * @enum {number}
          * @property {number} VITESS=0 VITESS value
          * @property {number} ONLINE=0 ONLINE value
-         * @property {number} GHOST=1 GHOST value
-         * @property {number} PTOSC=2 PTOSC value
          * @property {number} DIRECT=3 DIRECT value
          * @property {number} MYSQL=4 MYSQL value
          */
@@ -127565,8 +127553,6 @@ export const vtctldata = $root.vtctldata = (() => {
             const valuesById = {}, values = Object.create(valuesById);
             values[valuesById[0] = "VITESS"] = 0;
             values["ONLINE"] = 0;
-            values[valuesById[1] = "GHOST"] = 1;
-            values[valuesById[2] = "PTOSC"] = 2;
             values[valuesById[3] = "DIRECT"] = 3;
             values[valuesById[4] = "MYSQL"] = 4;
             return values;

From 9bf33261ff6cef2ed0099cce77e830720694a0b7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9s=20Taylor?= <andres@planetscale.com>
Date: Thu, 6 Feb 2025 08:26:05 +0100
Subject: [PATCH 29/68] Make sure no AST types are bare slices (#17674)

Signed-off-by: Andres Taylor <andres@planetscale.com>
Signed-off-by: Vicent Marti <vmg@strn.cat>
Co-authored-by: Vicent Marti <vmg@strn.cat>
---
 .../vtgate/queries/random/query_gen.go        |   32 +-
 go/tools/astfmtgen/main.go                    |   26 +-
 go/tools/asthelpergen/asthelpergen.go         |   11 +-
 go/tools/asthelpergen/asthelpergen_test.go    |   19 +
 .../asthelpergen/integration/ast_rewrite.go   |   93 +-
 .../integration/integration_rewriter_test.go  |   79 +-
 .../asthelpergen/integration/test_helpers.go  |    8 -
 go/tools/asthelpergen/rewrite_gen.go          |   42 +-
 go/vt/sqlparser/analyzer_test.go              |    6 +-
 go/vt/sqlparser/ast.go                        |  135 +-
 go/vt/sqlparser/ast_clone.go                  |  100 +-
 go/vt/sqlparser/ast_copy_on_rewrite.go        |  242 ++-
 go/vt/sqlparser/ast_equals.go                 |  115 +-
 go/vt/sqlparser/ast_format.go                 |   42 +-
 go/vt/sqlparser/ast_format_fast.go            |   45 +-
 go/vt/sqlparser/ast_format_test.go            |   35 +
 go/vt/sqlparser/ast_funcs.go                  |   60 +-
 go/vt/sqlparser/ast_rewrite.go                | 1490 +++++++++++++----
 go/vt/sqlparser/ast_visit.go                  |  108 +-
 go/vt/sqlparser/cached_size.go                |   70 +-
 go/vt/sqlparser/normalizer.go                 |    8 +-
 go/vt/sqlparser/parsed_query_test.go          |    4 +-
 go/vt/sqlparser/parser.go                     |    2 +-
 go/vt/sqlparser/precedence_test.go            |    2 +-
 go/vt/sqlparser/predicate_rewriting.go        |    2 +-
 go/vt/sqlparser/random_expr.go                |   10 +-
 go/vt/sqlparser/rewriter_api.go               |    8 -
 go/vt/sqlparser/rewriter_test.go              |   10 +-
 go/vt/sqlparser/sql.go                        | 1471 ++++++++--------
 go/vt/sqlparser/sql.y                         |   16 +-
 go/vt/sqlparser/tracked_buffer.go             |   78 +-
 go/vt/vtctl/workflow/materializer.go          |    7 +-
 go/vt/vtctl/workflow/stream_migrator.go       |   12 +-
 go/vt/vtctl/workflow/utils.go                 |    2 +-
 go/vt/vtexplain/vtexplain_vttablet.go         |    2 +-
 go/vt/vtgate/engine/insert_test.go            |   14 +-
 go/vt/vtgate/evalengine/expr_env_test.go      |    2 +-
 .../evalengine/integration/fuzz_test.go       |    4 +-
 go/vt/vtgate/evalengine/mysql_test.go         |    2 +-
 go/vt/vtgate/evalengine/translate_test.go     |   10 +-
 go/vt/vtgate/planbuilder/ddl.go               |    4 +-
 .../planbuilder/expression_converter_test.go  |   12 +-
 .../planbuilder/operator_transformers.go      |    4 +-
 .../planbuilder/operators/SQL_builder.go      |   20 +-
 .../operators/aggregation_pushing.go          |   12 +-
 .../planbuilder/operators/aggregator.go       |   12 +-
 .../planbuilder/operators/apply_join.go       |    4 +-
 .../vtgate/planbuilder/operators/ast_to_op.go |    8 +-
 .../vtgate/planbuilder/operators/comments.go  |    2 +-
 go/vt/vtgate/planbuilder/operators/delete.go  |   15 +-
 .../vtgate/planbuilder/operators/distinct.go  |    2 +-
 go/vt/vtgate/planbuilder/operators/filter.go  |    2 +-
 .../vtgate/planbuilder/operators/hash_join.go |    2 +-
 go/vt/vtgate/planbuilder/operators/horizon.go |    6 +-
 .../operators/horizon_expanding.go            |    4 +-
 .../operators/info_schema_planning.go         |   14 +-
 go/vt/vtgate/planbuilder/operators/insert.go  |    4 +-
 go/vt/vtgate/planbuilder/operators/limit.go   |    2 +-
 go/vt/vtgate/planbuilder/operators/mirror.go  |    2 +-
 .../vtgate/planbuilder/operators/operator.go  |    2 +-
 .../vtgate/planbuilder/operators/ordering.go  |    2 +-
 .../planbuilder/operators/plan_query.go       |    7 +-
 .../planbuilder/operators/projection.go       |   16 +-
 .../planbuilder/operators/query_planning.go   |   10 +-
 .../planbuilder/operators/queryprojection.go  |    2 +-
 .../planbuilder/operators/recurse_cte.go      |    2 +-
 go/vt/vtgate/planbuilder/operators/route.go   |    2 +-
 .../planbuilder/operators/sharded_routing.go  |    3 +-
 .../vtgate/planbuilder/operators/subquery.go  |    6 +-
 .../planbuilder/operators/subquery_builder.go |    8 +-
 .../operators/subquery_container.go           |    2 +-
 go/vt/vtgate/planbuilder/operators/table.go   |    2 +-
 go/vt/vtgate/planbuilder/operators/union.go   |   12 +-
 .../planbuilder/operators/union_merging.go    |   25 +-
 go/vt/vtgate/planbuilder/operators/update.go  |   16 +-
 .../planbuilder/operators/utils_test.go       |    3 +-
 go/vt/vtgate/planbuilder/operators/vindex.go  |    2 +-
 go/vt/vtgate/planbuilder/plan_test.go         |   13 +-
 go/vt/vtgate/planbuilder/planner_test.go      |    2 +-
 go/vt/vtgate/planbuilder/route.go             |    8 +-
 go/vt/vtgate/planbuilder/select.go            |   19 +-
 go/vt/vtgate/planbuilder/system_variables.go  |    2 +-
 go/vt/vtgate/semantics/analyzer.go            |   16 +-
 go/vt/vtgate/semantics/analyzer_test.go       |    6 +-
 go/vt/vtgate/semantics/binder.go              |    2 +-
 go/vt/vtgate/semantics/check_invalid.go       |    4 +-
 go/vt/vtgate/semantics/derived_table.go       |    4 +-
 go/vt/vtgate/semantics/early_rewriter.go      |   42 +-
 go/vt/vtgate/semantics/early_rewriter_test.go |    9 +-
 go/vt/vtgate/semantics/real_table.go          |    6 +-
 go/vt/vtgate/semantics/scoper.go              |    6 +-
 go/vt/vtgate/semantics/semantic_table.go      |   21 +-
 go/vt/vtgate/semantics/semantic_table_test.go |    2 +-
 go/vt/vtgate/semantics/table_collector.go     |    8 +-
 go/vt/vtgate/semantics/typer_test.go          |    3 +-
 go/vt/vtgate/semantics/vtable.go              |    4 +-
 .../simplifier/expression_simplifier.go       |    9 +-
 go/vt/vtgate/simplifier/simplifier.go         |   37 +-
 go/vt/vtgate/vindexes/foreign_keys.go         |    2 +-
 go/vt/vtgate/vindexes/vschema.go              |    4 +-
 go/vt/vtgate/vschema_manager.go               |    2 +-
 go/vt/vtgate/vschema_manager_test.go          |   24 +-
 go/vt/vttablet/tabletmanager/vdiff/report.go  |    8 +-
 .../tabletmanager/vdiff/table_differ.go       |   17 +-
 .../tabletmanager/vdiff/table_plan.go         |   20 +-
 .../vreplication/table_plan_builder.go        |   23 +-
 .../tabletserver/planbuilder/builder.go       |    2 +-
 .../tabletserver/planbuilder/permission.go    |    2 +-
 .../tabletserver/vstreamer/planbuilder.go     |   10 +-
 go/vt/wrangler/materializer.go                |    9 +-
 go/vt/wrangler/vdiff.go                       |   46 +-
 go/vt/wrangler/vdiff_test.go                  |   21 +-
 112 files changed, 3130 insertions(+), 1960 deletions(-)
 create mode 100644 go/vt/sqlparser/ast_format_test.go

diff --git a/go/test/endtoend/vtgate/queries/random/query_gen.go b/go/test/endtoend/vtgate/queries/random/query_gen.go
index 69bf66903f3..d7791d8df08 100644
--- a/go/test/endtoend/vtgate/queries/random/query_gen.go
+++ b/go/test/endtoend/vtgate/queries/random/query_gen.go
@@ -292,7 +292,7 @@ func (sg *selectGenerator) randomSelect() {
 	}
 
 	// make sure we have at least one select expression
-	for isRandomExpr || len(sg.sel.SelectExprs) == 0 {
+	for isRandomExpr || len(sg.sel.SelectExprs.Exprs) == 0 {
 		// TODO: if the random expression is an int literal,
 		// TODO: and if the query is (potentially) an aggregate query,
 		// TODO: then we must group by the random expression,
@@ -395,7 +395,7 @@ func (sg *selectGenerator) createJoin(tables []tableT) {
 
 // returns 1-3 random expressions based on the last two elements of tables
 // tables should have at least two elements
-func (sg *selectGenerator) createJoinPredicates(tables []tableT) sqlparser.Exprs {
+func (sg *selectGenerator) createJoinPredicates(tables []tableT) []sqlparser.Expr {
 	if len(tables) < 2 {
 		log.Fatalf("tables has %d elements, needs at least 2", len(tables))
 	}
@@ -427,7 +427,7 @@ func (sg *selectGenerator) createGroupBy(tables []tableT) (grouping []column) {
 
 		// add to select
 		if rand.IntN(2) < 1 {
-			sg.sel.SelectExprs = append(sg.sel.SelectExprs, newAliasedColumn(col, ""))
+			sg.sel.AddSelectExpr(newAliasedColumn(col, ""))
 			grouping = append(grouping, col)
 		}
 	}
@@ -437,13 +437,13 @@ func (sg *selectGenerator) createGroupBy(tables []tableT) (grouping []column) {
 
 // aliasGroupingColumns randomly aliases the grouping columns in the SelectExprs
 func (sg *selectGenerator) aliasGroupingColumns(grouping []column) []column {
-	if len(grouping) != len(sg.sel.SelectExprs) {
-		log.Fatalf("grouping (length: %d) and sg.sel.SelectExprs (length: %d) should have the same length at this point", len(grouping), len(sg.sel.SelectExprs))
+	if len(grouping) != len(sg.sel.SelectExprs.Exprs) {
+		log.Fatalf("grouping (length: %d) and sg.sel.SelectExprs (length: %d) should have the same length at this point", len(grouping), len(sg.sel.SelectExprs.Exprs))
 	}
 
 	for i := range grouping {
 		if rand.IntN(2) < 1 {
-			if aliasedExpr, ok := sg.sel.SelectExprs[i].(*sqlparser.AliasedExpr); ok {
+			if aliasedExpr, ok := sg.sel.SelectExprs.Exprs[i].(*sqlparser.AliasedExpr); ok {
 				alias := fmt.Sprintf("cgroup%d", i)
 				aliasedExpr.SetAlias(alias)
 				grouping[i].name = alias
@@ -454,7 +454,7 @@ func (sg *selectGenerator) aliasGroupingColumns(grouping []column) []column {
 	return grouping
 }
 
-// returns the aggregation columns as three types: sqlparser.SelectExprs, []column
+// returns the aggregation columns as three types: *sqlparser.SelectExprs, []column
 func (sg *selectGenerator) createAggregations(tables []tableT) (aggregates []column) {
 	exprGenerators := slice.Map(tables, func(t tableT) sqlparser.ExprGenerator { return &t })
 	// add scalar subqueries
@@ -485,7 +485,7 @@ func (sg *selectGenerator) createOrderBy() {
 	}
 
 	// randomly order on SelectExprs
-	for _, selExpr := range sg.sel.SelectExprs {
+	for _, selExpr := range sg.sel.SelectExprs.Exprs {
 		if aliasedExpr, ok := selExpr.(*sqlparser.AliasedExpr); ok && rand.IntN(2) < 1 {
 			literal, ok := aliasedExpr.Expr.(*sqlparser.Literal)
 			isIntLiteral := ok && literal.Type == sqlparser.IntVal
@@ -527,7 +527,7 @@ func (sg *selectGenerator) createHavingPredicates(grouping []column) {
 }
 
 // returns between minExprs and maxExprs random expressions using generators
-func (sg *selectGenerator) createRandomExprs(minExprs, maxExprs int, generators ...sqlparser.ExprGenerator) (predicates sqlparser.Exprs) {
+func (sg *selectGenerator) createRandomExprs(minExprs, maxExprs int, generators ...sqlparser.ExprGenerator) (predicates []sqlparser.Expr) {
 	if minExprs > maxExprs {
 		log.Fatalf("minExprs is greater than maxExprs; minExprs: %d, maxExprs: %d\n", minExprs, maxExprs)
 	} else if maxExprs <= 0 {
@@ -578,7 +578,7 @@ func (sg *selectGenerator) randomlyAlias(expr sqlparser.Expr, alias string) colu
 	} else {
 		col.name = alias
 	}
-	sg.sel.SelectExprs = append(sg.sel.SelectExprs, sqlparser.NewAliasedExpr(expr, alias))
+	sg.sel.AddSelectExpr(sqlparser.NewAliasedExpr(expr, alias))
 
 	return col
 }
@@ -586,20 +586,20 @@ func (sg *selectGenerator) randomlyAlias(expr sqlparser.Expr, alias string) colu
 // matchNumCols makes sure sg.sel.SelectExprs and newTable both have the same number of cols: sg.genConfig.NumCols
 func (sg *selectGenerator) matchNumCols(tables []tableT, newTable tableT, canAggregate bool) tableT {
 	// remove SelectExprs and newTable.cols randomly until there are sg.genConfig.NumCols amount
-	for len(sg.sel.SelectExprs) > sg.genConfig.NumCols && sg.genConfig.NumCols > 0 {
+	for len(sg.sel.SelectExprs.Exprs) > sg.genConfig.NumCols && sg.genConfig.NumCols > 0 {
 		// select a random index and remove it from SelectExprs and newTable
-		idx := rand.IntN(len(sg.sel.SelectExprs))
+		idx := rand.IntN(len(sg.sel.SelectExprs.Exprs))
 
-		sg.sel.SelectExprs[idx] = sg.sel.SelectExprs[len(sg.sel.SelectExprs)-1]
-		sg.sel.SelectExprs = sg.sel.SelectExprs[:len(sg.sel.SelectExprs)-1]
+		sg.sel.SelectExprs.Exprs[idx] = sg.sel.SelectExprs.Exprs[len(sg.sel.SelectExprs.Exprs)-1]
+		sg.sel.SelectExprs.Exprs = sg.sel.SelectExprs.Exprs[:len(sg.sel.SelectExprs.Exprs)-1]
 
 		newTable.cols[idx] = newTable.cols[len(newTable.cols)-1]
 		newTable.cols = newTable.cols[:len(newTable.cols)-1]
 	}
 
 	// alternatively, add random expressions until there are sg.genConfig.NumCols amount
-	if sg.genConfig.NumCols > len(sg.sel.SelectExprs) {
-		diff := sg.genConfig.NumCols - len(sg.sel.SelectExprs)
+	if sg.genConfig.NumCols > len(sg.sel.SelectExprs.Exprs) {
+		diff := sg.genConfig.NumCols - len(sg.sel.SelectExprs.Exprs)
 		exprs := sg.createRandomExprs(diff, diff,
 			slice.Map(tables, func(t tableT) sqlparser.ExprGenerator { return &t })...)
 
diff --git a/go/tools/astfmtgen/main.go b/go/tools/astfmtgen/main.go
index 01383171a01..d1a8c6b3bb3 100644
--- a/go/tools/astfmtgen/main.go
+++ b/go/tools/astfmtgen/main.go
@@ -207,8 +207,6 @@ func (r *Rewriter) rewriteAstPrintf(cursor *astutil.Cursor, expr *ast.CallExpr)
 
 		token := format[i]
 		switch token {
-		case 'c':
-			cursor.InsertBefore(r.rewriteLiteral(callexpr.X, "WriteByte", expr.Args[2+fieldnum]))
 		case 's':
 			cursor.InsertBefore(r.rewriteLiteral(callexpr.X, "WriteString", expr.Args[2+fieldnum]))
 		case 'l', 'r', 'v':
@@ -249,6 +247,26 @@ func (r *Rewriter) rewriteAstPrintf(cursor *astutil.Cursor, expr *ast.CallExpr)
 				Args: []ast.Expr{&ast.BasicLit{Value: `"%d"`, Kind: gotoken.STRING}, expr.Args[2+fieldnum]},
 			}
 			cursor.InsertBefore(r.rewriteLiteral(callexpr.X, "WriteString", call))
+		case 'n': // directive for slices of AST nodes checked at code generation time
+			inputExpr := expr.Args[2+fieldnum]
+			inputType := r.pkg.TypesInfo.Types[inputExpr].Type
+			sliceType, ok := inputType.(*types.Slice)
+			if !ok {
+				panic("'%n' directive requires a slice")
+			}
+			if types.Implements(sliceType.Elem(), r.astExpr) {
+				// Fast path: input is []Expr
+				call := &ast.CallExpr{
+					Fun: &ast.SelectorExpr{
+						X:   callexpr.X,
+						Sel: &ast.Ident{Name: "formatExprs"},
+					},
+					Args: []ast.Expr{inputExpr},
+				}
+				cursor.InsertBefore(&ast.ExprStmt{X: call})
+				break
+			}
+			panic("slow path for `n` directive for slice of type other than Expr")
 		default:
 			panic(fmt.Sprintf("unsupported escape %q", token))
 		}
@@ -259,3 +277,7 @@ func (r *Rewriter) rewriteAstPrintf(cursor *astutil.Cursor, expr *ast.CallExpr)
 	cursor.Delete()
 	return true
 }
+
+var noQualifier = func(p *types.Package) string {
+	return ""
+}
diff --git a/go/tools/asthelpergen/asthelpergen.go b/go/tools/asthelpergen/asthelpergen.go
index 3f59fdb3ece..ebb015b7339 100644
--- a/go/tools/asthelpergen/asthelpergen.go
+++ b/go/tools/asthelpergen/asthelpergen.go
@@ -77,9 +77,6 @@ type (
 	}
 )
 
-// exprInterfacePath is the path of the sqlparser.Expr interface.
-const exprInterfacePath = "vitess.io/vitess/go/vt/sqlparser.Expr"
-
 func (gen *astHelperGen) iface() *types.Interface {
 	return gen._iface
 }
@@ -207,19 +204,13 @@ func GenerateASTHelpers(options *Options) (map[string]*jen.File, error) {
 		return nil, err
 	}
 
-	exprType, _ := findTypeObject(exprInterfacePath, scopes)
-	var exprInterface *types.Interface
-	if exprType != nil {
-		exprInterface = exprType.Type().(*types.Named).Underlying().(*types.Interface)
-	}
-
 	nt := tt.Type().(*types.Named)
 	pName := nt.Obj().Pkg().Name()
 	generator := newGenerator(loaded[0].Module, loaded[0].TypesSizes, nt,
 		newEqualsGen(pName, &options.Equals),
 		newCloneGen(pName, &options.Clone),
 		newVisitGen(pName),
-		newRewriterGen(pName, types.TypeString(nt, noQualifier), exprInterface),
+		newRewriterGen(pName, types.TypeString(nt, noQualifier)),
 		newCOWGen(pName, nt),
 	)
 
diff --git a/go/tools/asthelpergen/asthelpergen_test.go b/go/tools/asthelpergen/asthelpergen_test.go
index 19ac865575d..21774187abe 100644
--- a/go/tools/asthelpergen/asthelpergen_test.go
+++ b/go/tools/asthelpergen/asthelpergen_test.go
@@ -21,6 +21,8 @@ import (
 	"strings"
 	"testing"
 
+	"vitess.io/vitess/go/tools/codegen"
+
 	"github.com/stretchr/testify/require"
 )
 
@@ -45,3 +47,20 @@ func TestFullGeneration(t *testing.T) {
 		require.False(t, applyIdx == 0 && cloneIdx == 0, "file doesn't contain expected contents")
 	}
 }
+
+func TestRecreateAllFiles(t *testing.T) {
+	// t.Skip("This test recreates all files in the integration directory. It should only be run when the ASTHelperGen code has changed.")
+	result, err := GenerateASTHelpers(&Options{
+		Packages:      []string{"./integration/..."},
+		RootInterface: "vitess.io/vitess/go/tools/asthelpergen/integration.AST",
+		Clone: CloneOptions{
+			Exclude: []string{"*NoCloneType"},
+		},
+	})
+	require.NoError(t, err)
+
+	for fullPath, file := range result {
+		err := codegen.SaveJenFile(fullPath, file)
+		require.NoError(t, err)
+	}
+}
diff --git a/go/tools/asthelpergen/integration/ast_rewrite.go b/go/tools/asthelpergen/integration/ast_rewrite.go
index cf92b358862..74dc743a581 100644
--- a/go/tools/asthelpergen/integration/ast_rewrite.go
+++ b/go/tools/asthelpergen/integration/ast_rewrite.go
@@ -61,9 +61,8 @@ func (a *application) rewriteBytes(parent AST, node Bytes, replacer replacerFunc
 		a.cur.node = node
 		kontinue := !a.pre(&a.cur)
 		if a.cur.revisit {
-			node = a.cur.node.(Bytes)
 			a.cur.revisit = false
-			return a.rewriteBytes(parent, node, replacer)
+			return a.rewriteAST(parent, a.cur.node, replacer)
 		}
 		if kontinue {
 			return true
@@ -86,7 +85,12 @@ func (a *application) rewriteInterfaceContainer(parent AST, node InterfaceContai
 		a.cur.replacer = replacer
 		a.cur.parent = parent
 		a.cur.node = node
-		if !a.pre(&a.cur) {
+		kontinue := !a.pre(&a.cur)
+		if a.cur.revisit {
+			a.cur.revisit = false
+			return a.rewriteAST(parent, a.cur.node, replacer)
+		}
+		if kontinue {
 			return true
 		}
 	}
@@ -112,9 +116,8 @@ func (a *application) rewriteInterfaceSlice(parent AST, node InterfaceSlice, rep
 		a.cur.node = node
 		kontinue := !a.pre(&a.cur)
 		if a.cur.revisit {
-			node = a.cur.node.(InterfaceSlice)
 			a.cur.revisit = false
-			return a.rewriteInterfaceSlice(parent, node, replacer)
+			return a.rewriteAST(parent, a.cur.node, replacer)
 		}
 		if kontinue {
 			return true
@@ -147,7 +150,12 @@ func (a *application) rewriteRefOfLeaf(parent AST, node *Leaf, replacer replacer
 		a.cur.replacer = replacer
 		a.cur.parent = parent
 		a.cur.node = node
-		if !a.pre(&a.cur) {
+		kontinue := !a.pre(&a.cur)
+		if a.cur.revisit {
+			a.cur.revisit = false
+			return a.rewriteAST(parent, a.cur.node, replacer)
+		}
+		if kontinue {
 			return true
 		}
 	}
@@ -173,9 +181,8 @@ func (a *application) rewriteLeafSlice(parent AST, node LeafSlice, replacer repl
 		a.cur.node = node
 		kontinue := !a.pre(&a.cur)
 		if a.cur.revisit {
-			node = a.cur.node.(LeafSlice)
 			a.cur.revisit = false
-			return a.rewriteLeafSlice(parent, node, replacer)
+			return a.rewriteAST(parent, a.cur.node, replacer)
 		}
 		if kontinue {
 			return true
@@ -208,7 +215,12 @@ func (a *application) rewriteRefOfNoCloneType(parent AST, node *NoCloneType, rep
 		a.cur.replacer = replacer
 		a.cur.parent = parent
 		a.cur.node = node
-		if !a.pre(&a.cur) {
+		kontinue := !a.pre(&a.cur)
+		if a.cur.revisit {
+			a.cur.revisit = false
+			return a.rewriteAST(parent, a.cur.node, replacer)
+		}
+		if kontinue {
 			return true
 		}
 	}
@@ -232,7 +244,12 @@ func (a *application) rewriteRefOfRefContainer(parent AST, node *RefContainer, r
 		a.cur.replacer = replacer
 		a.cur.parent = parent
 		a.cur.node = node
-		if !a.pre(&a.cur) {
+		kontinue := !a.pre(&a.cur)
+		if a.cur.revisit {
+			a.cur.revisit = false
+			return a.rewriteAST(parent, a.cur.node, replacer)
+		}
+		if kontinue {
 			return true
 		}
 	}
@@ -264,7 +281,12 @@ func (a *application) rewriteRefOfRefSliceContainer(parent AST, node *RefSliceCo
 		a.cur.replacer = replacer
 		a.cur.parent = parent
 		a.cur.node = node
-		if !a.pre(&a.cur) {
+		kontinue := !a.pre(&a.cur)
+		if a.cur.revisit {
+			a.cur.revisit = false
+			return a.rewriteAST(parent, a.cur.node, replacer)
+		}
+		if kontinue {
 			return true
 		}
 	}
@@ -304,7 +326,12 @@ func (a *application) rewriteRefOfSubImpl(parent AST, node *SubImpl, replacer re
 		a.cur.replacer = replacer
 		a.cur.parent = parent
 		a.cur.node = node
-		if !a.pre(&a.cur) {
+		kontinue := !a.pre(&a.cur)
+		if a.cur.revisit {
+			a.cur.revisit = false
+			return a.rewriteAST(parent, a.cur.node, replacer)
+		}
+		if kontinue {
 			return true
 		}
 	}
@@ -328,7 +355,12 @@ func (a *application) rewriteValueContainer(parent AST, node ValueContainer, rep
 		a.cur.replacer = replacer
 		a.cur.parent = parent
 		a.cur.node = node
-		if !a.pre(&a.cur) {
+		kontinue := !a.pre(&a.cur)
+		if a.cur.revisit {
+			a.cur.revisit = false
+			return a.rewriteAST(parent, a.cur.node, replacer)
+		}
+		if kontinue {
 			return true
 		}
 	}
@@ -357,7 +389,12 @@ func (a *application) rewriteValueSliceContainer(parent AST, node ValueSliceCont
 		a.cur.replacer = replacer
 		a.cur.parent = parent
 		a.cur.node = node
-		if !a.pre(&a.cur) {
+		kontinue := !a.pre(&a.cur)
+		if a.cur.revisit {
+			a.cur.revisit = false
+			return a.rewriteAST(parent, a.cur.node, replacer)
+		}
+		if kontinue {
 			return true
 		}
 	}
@@ -402,7 +439,12 @@ func (a *application) rewriteBasicType(parent AST, node BasicType, replacer repl
 		a.cur.replacer = replacer
 		a.cur.parent = parent
 		a.cur.node = node
-		if !a.pre(&a.cur) {
+		kontinue := !a.pre(&a.cur)
+		if a.cur.revisit {
+			a.cur.revisit = false
+			return a.rewriteAST(parent, a.cur.node, replacer)
+		}
+		if kontinue {
 			return true
 		}
 	}
@@ -426,7 +468,12 @@ func (a *application) rewriteRefOfInterfaceContainer(parent AST, node *Interface
 		a.cur.replacer = replacer
 		a.cur.parent = parent
 		a.cur.node = node
-		if !a.pre(&a.cur) {
+		kontinue := !a.pre(&a.cur)
+		if a.cur.revisit {
+			a.cur.revisit = false
+			return a.rewriteAST(parent, a.cur.node, replacer)
+		}
+		if kontinue {
 			return true
 		}
 	}
@@ -450,7 +497,12 @@ func (a *application) rewriteRefOfValueContainer(parent AST, node *ValueContaine
 		a.cur.replacer = replacer
 		a.cur.parent = parent
 		a.cur.node = node
-		if !a.pre(&a.cur) {
+		kontinue := !a.pre(&a.cur)
+		if a.cur.revisit {
+			a.cur.revisit = false
+			return a.rewriteAST(parent, a.cur.node, replacer)
+		}
+		if kontinue {
 			return true
 		}
 	}
@@ -482,7 +534,12 @@ func (a *application) rewriteRefOfValueSliceContainer(parent AST, node *ValueSli
 		a.cur.replacer = replacer
 		a.cur.parent = parent
 		a.cur.node = node
-		if !a.pre(&a.cur) {
+		kontinue := !a.pre(&a.cur)
+		if a.cur.revisit {
+			a.cur.revisit = false
+			return a.rewriteAST(parent, a.cur.node, replacer)
+		}
+		if kontinue {
 			return true
 		}
 	}
diff --git a/go/tools/asthelpergen/integration/integration_rewriter_test.go b/go/tools/asthelpergen/integration/integration_rewriter_test.go
index c7822980cd4..af7483b5916 100644
--- a/go/tools/asthelpergen/integration/integration_rewriter_test.go
+++ b/go/tools/asthelpergen/integration/integration_rewriter_test.go
@@ -204,6 +204,46 @@ func TestRewriteAndRevisitInterfaceSlice(t *testing.T) {
 	})
 }
 
+func TestRewriteAndRevisitRefContainer(t *testing.T) {
+	leaf1 := &Leaf{1}
+	leaf2 := &Leaf{2}
+	ast1 := &RefContainer{
+		ASTType:               leaf1,
+		ASTImplementationType: leaf2,
+	}
+	ast2 := &RefContainer{
+		ASTType:               leaf2,
+		ASTImplementationType: leaf1,
+	}
+
+	tv := &rewriteTestVisitor{}
+
+	a := false
+	_ = Rewrite(ast1, func(cursor *Cursor) bool {
+		tv.pre(cursor)
+		switch cursor.node.(type) {
+		case *RefContainer:
+			if a {
+				break
+			}
+			a = true
+			cursor.ReplaceAndRevisit(ast2)
+		}
+		return true
+	}, tv.post)
+
+	tv.assertEquals(t, []step{
+		Pre{ast1}, // when we visit ast, we want to replace and revisit,
+		// which means that we don't do a post on this node, or visit the children
+		Pre{ast2},
+		Pre{leaf2},
+		Post{leaf2},
+		Pre{leaf1},
+		Post{leaf1},
+		Post{ast2},
+	})
+}
+
 func TestRewriteVisitRefContainerReplace(t *testing.T) {
 	ast := &RefContainer{
 		ASTType:               &RefContainer{NotASTType: 12},
@@ -361,29 +401,30 @@ func (tv *rewriteTestVisitor) assertEquals(t *testing.T, expected []step) {
 	error := false
 	expectedSize := len(expected)
 	for i, step := range tv.walk {
-		if expectedSize <= i {
-			t.Errorf("❌️ - Expected less elements %v", tv.walk[i:])
-			break
-		} else {
-			e := expected[i]
-			if reflect.DeepEqual(e, step) {
-				a := "✔️ - " + e.String()
-				if error {
-					fmt.Println(a)
-				} else {
-					lines = append(lines, a)
-				}
+		t.Run(fmt.Sprintf("step %d", i), func(t *testing.T) {
+			if expectedSize <= i {
+				t.Fatalf("❌️ - Expected less elements %v", tv.walk[i:])
 			} else {
-				if !error {
-					// first error we see.
-					error = true
-					for _, line := range lines {
-						fmt.Println(line)
+				e := expected[i]
+				if reflect.DeepEqual(e, step) {
+					a := "✔️ - " + e.String()
+					if error {
+						fmt.Println(a)
+					} else {
+						lines = append(lines, a)
+					}
+				} else {
+					if !error {
+						// first error we see.
+						error = true
+						for _, line := range lines {
+							fmt.Println(line)
+						}
 					}
+					t.Fatalf("❌️ - Expected: %s Got: %s\n", e.String(), step.String())
 				}
-				t.Errorf("❌️ - Expected: %s Got: %s\n", e.String(), step.String())
 			}
-		}
+		})
 	}
 	walkSize := len(tv.walk)
 	if expectedSize > walkSize {
diff --git a/go/tools/asthelpergen/integration/test_helpers.go b/go/tools/asthelpergen/integration/test_helpers.go
index 67745f19687..9a0cd186c34 100644
--- a/go/tools/asthelpergen/integration/test_helpers.go
+++ b/go/tools/asthelpergen/integration/test_helpers.go
@@ -68,14 +68,6 @@ func (c *Cursor) Replace(newNode AST) {
 // When used, this will abort the visitation of the current node - no post or children visited,
 // and the new node visited.
 func (c *Cursor) ReplaceAndRevisit(newNode AST) {
-	switch newNode.(type) {
-	case InterfaceSlice:
-	default:
-		// We need to add support to the generated code for when to look at the revisit flag. At the moment it is only
-		// there for slices of AST implementations
-		panic("no support added for this type yet")
-	}
-
 	c.replacer(newNode, c.parent)
 	c.node = newNode
 	c.revisit = true
diff --git a/go/tools/asthelpergen/rewrite_gen.go b/go/tools/asthelpergen/rewrite_gen.go
index cc8b18a78e9..29ffcee3d5b 100644
--- a/go/tools/asthelpergen/rewrite_gen.go
+++ b/go/tools/asthelpergen/rewrite_gen.go
@@ -30,21 +30,18 @@ const (
 type rewriteGen struct {
 	ifaceName string
 	file      *jen.File
-	// exprInterface is used to store the sqlparser.Expr interface
-	exprInterface *types.Interface
 }
 
 var _ generator = (*rewriteGen)(nil)
 
-func newRewriterGen(pkgname string, ifaceName string, exprInterface *types.Interface) *rewriteGen {
+func newRewriterGen(pkgname string, ifaceName string) *rewriteGen {
 	file := jen.NewFile(pkgname)
 	file.HeaderComment(licenseFileHeader)
 	file.HeaderComment("Code generated by ASTHelperGen. DO NOT EDIT.")
 
 	return &rewriteGen{
-		ifaceName:     ifaceName,
-		file:          file,
-		exprInterface: exprInterface,
+		ifaceName: ifaceName,
+		file:      file,
 	}
 }
 
@@ -108,7 +105,7 @@ func (r *rewriteGen) structMethod(t types.Type, strct *types.Struct, spi generat
 	}
 	fields := r.rewriteAllStructFields(t, strct, spi, true)
 
-	stmts := []jen.Code{r.executePre(t)}
+	stmts := []jen.Code{r.executePre()}
 	stmts = append(stmts, fields...)
 	stmts = append(stmts, executePost(len(fields) > 0))
 	stmts = append(stmts, returnTrue())
@@ -133,7 +130,7 @@ func (r *rewriteGen) ptrToStructMethod(t types.Type, strct *types.Struct, spi ge
 			return nil
 		}
 	*/
-	stmts = append(stmts, r.executePre(t))
+	stmts = append(stmts, r.executePre())
 	fields := r.rewriteAllStructFields(t, strct, spi, false)
 	stmts = append(stmts, fields...)
 	stmts = append(stmts, executePost(len(fields) > 0))
@@ -182,15 +179,12 @@ func (r *rewriteGen) sliceMethod(t types.Type, slice *types.Slice, spi generator
 		jen.If(jen.Id("node == nil").Block(returnTrue())),
 	}
 
-	typeString := types.TypeString(t, noQualifier)
-
 	preStmts := setupCursor()
 	preStmts = append(preStmts,
 		jen.Id("kontinue").Op(":=").Id("!a.pre(&a.cur)"),
 		jen.If(jen.Id("a.cur.revisit").Block(
-			jen.Id("node").Op("=").Id("a.cur.node.("+typeString+")"),
 			jen.Id("a.cur.revisit").Op("=").False(),
-			jen.Return(jen.Id("a.rewrite"+typeString+"(parent, node, replacer)")),
+			jen.Return(jen.Id("a.rewrite"+r.ifaceName+"(parent, a.cur.node, replacer)")),
 		)),
 		jen.If(jen.Id("kontinue").Block(jen.Return(jen.True()))),
 	)
@@ -228,19 +222,17 @@ func setupCursor() []jen.Code {
 		jen.Id("a.cur.node = node"),
 	}
 }
-func (r *rewriteGen) executePre(t types.Type) jen.Code {
+
+func (r *rewriteGen) executePre() jen.Code {
 	curStmts := setupCursor()
-	if r.exprInterface != nil && types.Implements(t, r.exprInterface) {
-		curStmts = append(curStmts, jen.Id("kontinue").Op(":=").Id("!a.pre(&a.cur)"),
-			jen.If(jen.Id("a.cur.revisit").Block(
-				jen.Id("a.cur.revisit").Op("=").False(),
-				jen.Return(jen.Id("a.rewriteExpr(parent, a.cur.node.(Expr), replacer)")),
-			)),
-			jen.If(jen.Id("kontinue").Block(jen.Return(jen.True()))),
-		)
-	} else {
-		curStmts = append(curStmts, jen.If(jen.Id("!a.pre(&a.cur)")).Block(returnTrue()))
-	}
+	name := fmt.Sprintf("a.rewrite%s(parent, a.cur.node, replacer)", r.ifaceName)
+	curStmts = append(curStmts, jen.Id("kontinue").Op(":=").Id("!a.pre(&a.cur)"),
+		jen.If(jen.Id("a.cur.revisit").Block(
+			jen.Id("a.cur.revisit").Op("=").False(),
+			jen.Return(jen.Id(name)),
+		)),
+		jen.If(jen.Id("kontinue").Block(jen.Return(jen.True()))),
+	)
 	return jen.If(jen.Id("a.pre!= nil").Block(curStmts...))
 }
 
@@ -264,7 +256,7 @@ func (r *rewriteGen) basicMethod(t types.Type, _ *types.Basic, spi generatorSPI)
 		return nil
 	}
 
-	stmts := []jen.Code{r.executePre(t), executePost(false), returnTrue()}
+	stmts := []jen.Code{r.executePre(), executePost(false), returnTrue()}
 	r.rewriteFunc(t, stmts)
 	return nil
 }
diff --git a/go/vt/sqlparser/analyzer_test.go b/go/vt/sqlparser/analyzer_test.go
index 0a2de52ef19..e60e10d08ca 100644
--- a/go/vt/sqlparser/analyzer_test.go
+++ b/go/vt/sqlparser/analyzer_test.go
@@ -195,7 +195,7 @@ func TestAndExpressions(t *testing.T) {
 	}
 	testcases := []struct {
 		name           string
-		expressions    Exprs
+		expressions    []Expr
 		expectedOutput Expr
 	}{
 		{
@@ -204,7 +204,7 @@ func TestAndExpressions(t *testing.T) {
 			expectedOutput: nil,
 		}, {
 			name: "two equal inputs",
-			expressions: Exprs{
+			expressions: []Expr{
 				greaterThanExpr,
 				equalExpr,
 				equalExpr,
@@ -216,7 +216,7 @@ func TestAndExpressions(t *testing.T) {
 		},
 		{
 			name: "two equal inputs",
-			expressions: Exprs{
+			expressions: []Expr{
 				equalExpr,
 				equalExpr,
 			},
diff --git a/go/vt/sqlparser/ast.go b/go/vt/sqlparser/ast.go
index e673b1ebf74..806784c27e8 100644
--- a/go/vt/sqlparser/ast.go
+++ b/go/vt/sqlparser/ast.go
@@ -75,7 +75,7 @@ type (
 
 	ColumnResults interface {
 		GetColumnCount() int
-		GetColumns() SelectExprs
+		GetColumns() []SelectExpr
 	}
 
 	Withable interface {
@@ -295,7 +295,7 @@ type (
 		With        *With
 		From        []TableExpr
 		Comments    *ParsedComments
-		SelectExprs SelectExprs
+		SelectExprs *SelectExprs
 		Where       *Where
 		GroupBy     *GroupBy
 		Having      *Where
@@ -645,7 +645,7 @@ type (
 	// CallProc represents a CALL statement
 	CallProc struct {
 		Name   TableName
-		Params Exprs
+		Params []Expr
 	}
 
 	// LockType is an enum for Lock Types
@@ -2039,8 +2039,9 @@ type ParsedComments struct {
 	_directives *CommentDirectives
 }
 
-// SelectExprs represents SELECT expressions.
-type SelectExprs []SelectExpr
+type SelectExprs struct {
+	Exprs []SelectExpr
+}
 
 type (
 	// SelectExpr represents a SELECT expression.
@@ -2209,7 +2210,7 @@ type (
 	// More information available here: https://dev.mysql.com/doc/refman/8.0/en/window-functions-usage.html
 	WindowSpecification struct {
 		Name            IdentifierCI
-		PartitionClause Exprs
+		PartitionClause []Expr
 		OrderClause     OrderBy
 		FrameClause     *FrameClause
 	}
@@ -2400,7 +2401,7 @@ type (
 	ListArg string
 
 	// ValTuple represents a tuple of actual values.
-	ValTuple Exprs
+	ValTuple []Expr
 
 	// BinaryExpr represents a binary value expression.
 	BinaryExpr struct {
@@ -2455,7 +2456,7 @@ type (
 	FuncExpr struct {
 		Qualifier IdentifierCS
 		Name      IdentifierCI
-		Exprs     Exprs
+		Exprs     []Expr
 	}
 
 	// ValuesFuncExpr represents a function call.
@@ -2524,7 +2525,7 @@ type (
 	// IntervalFuncExpr represents an INTERVAL function expression
 	IntervalFuncExpr struct {
 		Expr  Expr
-		Exprs Exprs
+		Exprs []Expr
 	}
 
 	// LocateExpr represents a LOCATE function expression
@@ -2536,7 +2537,7 @@ type (
 
 	// CharExpr represents a CHAR function expression
 	CharExpr struct {
-		Exprs   Exprs
+		Exprs   []Expr
 		Charset string
 	}
 
@@ -2586,7 +2587,7 @@ type (
 	// JSONArrayExpr represents JSON_ARRAY()
 	// More information on https://dev.mysql.com/doc/refman/8.0/en/json-creation-functions.html#function_json-array
 	JSONArrayExpr struct {
-		Params Exprs
+		Params []Expr
 	}
 
 	// JSONObjectExpr represents JSON_OBJECT()
@@ -2776,7 +2777,7 @@ type (
 	JSONValueMergeExpr struct {
 		Type        JSONValueMergeType
 		JSONDoc     Expr
-		JSONDocList Exprs
+		JSONDocList []Expr
 	}
 
 	// JSONValueModifierType is an enum to get types of TrimFunc.
@@ -2787,7 +2788,7 @@ type (
 	// For more information, postVisit https://dev.mysql.com/doc/refman/8.0/en/json-modification-functions.html#function_json-remove
 	JSONRemoveExpr struct {
 		JSONDoc  Expr
-		PathList Exprs
+		PathList []Expr
 	}
 
 	// JSONRemoveExpr represents the JSON_UNQUOTE()
@@ -2804,27 +2805,27 @@ type (
 
 	// LineString represents LineString(POINT(x,y), POINT(x,y), ..) expression
 	LineStringExpr struct {
-		PointParams Exprs
+		PointParams []Expr
 	}
 
 	// PolygonExpr represents Polygon(LineString(POINT(x,y), POINT(x,y), ..)) expressions
 	PolygonExpr struct {
-		LinestringParams Exprs
+		LinestringParams []Expr
 	}
 
 	// MultiPoint represents a geometry collection for points
 	MultiPointExpr struct {
-		PointParams Exprs
+		PointParams []Expr
 	}
 
 	// MultiPoint represents a geometry collection for linestrings
 	MultiLinestringExpr struct {
-		LinestringParams Exprs
+		LinestringParams []Expr
 	}
 
 	// MultiPolygon represents a geometry collection for polygons
 	MultiPolygonExpr struct {
-		PolygonParams Exprs
+		PolygonParams []Expr
 	}
 
 	// GeomFromWktType is an enum to get the types of wkt functions with possible values: GeometryFromText GeometryCollectionFromText PointFromText LineStringFromText PolygonFromText MultiPointFromText MultiPolygonFromText MultiLinestringFromText
@@ -2935,9 +2936,9 @@ type (
 	AggrFunc interface {
 		Expr
 		GetArg() Expr
-		GetArgs() Exprs
+		GetArgs() []Expr
 		SetArg(expr Expr)
-		SetArgs(exprs Exprs) error
+		SetArgs(exprs []Expr) error
 		// AggrName returns the lower case string representing this aggregation function
 		AggrName() string
 	}
@@ -2948,7 +2949,7 @@ type (
 	}
 
 	Count struct {
-		Args       Exprs
+		Args       []Expr
 		Distinct   bool
 		OverClause *OverClause
 	}
@@ -3061,7 +3062,7 @@ type (
 	// GroupConcatExpr represents a call to GROUP_CONCAT
 	GroupConcatExpr struct {
 		Distinct  bool
-		Exprs     Exprs
+		Exprs     []Expr
 		OrderBy   OrderBy
 		Separator string
 		Limit     *Limit
@@ -3450,34 +3451,34 @@ func (av *AnyValue) GetArg() Expr               { return av.Arg }
 func (jaa *JSONArrayAgg) GetArg() Expr          { return jaa.Expr }
 func (joa *JSONObjectAgg) GetArg() Expr         { return joa.Key }
 
-func (sum *Sum) GetArgs() Exprs                   { return Exprs{sum.Arg} }
-func (min *Min) GetArgs() Exprs                   { return Exprs{min.Arg} }
-func (max *Max) GetArgs() Exprs                   { return Exprs{max.Arg} }
-func (avg *Avg) GetArgs() Exprs                   { return Exprs{avg.Arg} }
-func (*CountStar) GetArgs() Exprs                 { return nil }
-func (count *Count) GetArgs() Exprs               { return count.Args }
-func (grpConcat *GroupConcatExpr) GetArgs() Exprs { return grpConcat.Exprs }
-func (bAnd *BitAnd) GetArgs() Exprs               { return Exprs{bAnd.Arg} }
-func (bOr *BitOr) GetArgs() Exprs                 { return Exprs{bOr.Arg} }
-func (bXor *BitXor) GetArgs() Exprs               { return Exprs{bXor.Arg} }
-func (std *Std) GetArgs() Exprs                   { return Exprs{std.Arg} }
-func (stdD *StdDev) GetArgs() Exprs               { return Exprs{stdD.Arg} }
-func (stdP *StdPop) GetArgs() Exprs               { return Exprs{stdP.Arg} }
-func (stdS *StdSamp) GetArgs() Exprs              { return Exprs{stdS.Arg} }
-func (varP *VarPop) GetArgs() Exprs               { return Exprs{varP.Arg} }
-func (varS *VarSamp) GetArgs() Exprs              { return Exprs{varS.Arg} }
-func (variance *Variance) GetArgs() Exprs         { return Exprs{variance.Arg} }
-func (av *AnyValue) GetArgs() Exprs               { return Exprs{av.Arg} }
-func (jaa *JSONArrayAgg) GetArgs() Exprs          { return Exprs{jaa.Expr} }
-func (joa *JSONObjectAgg) GetArgs() Exprs         { return Exprs{joa.Key, joa.Value} }
+func (sum *Sum) GetArgs() []Expr                   { return []Expr{sum.Arg} }
+func (min *Min) GetArgs() []Expr                   { return []Expr{min.Arg} }
+func (max *Max) GetArgs() []Expr                   { return []Expr{max.Arg} }
+func (avg *Avg) GetArgs() []Expr                   { return []Expr{avg.Arg} }
+func (*CountStar) GetArgs() []Expr                 { return nil }
+func (count *Count) GetArgs() []Expr               { return count.Args }
+func (grpConcat *GroupConcatExpr) GetArgs() []Expr { return grpConcat.Exprs }
+func (bAnd *BitAnd) GetArgs() []Expr               { return []Expr{bAnd.Arg} }
+func (bOr *BitOr) GetArgs() []Expr                 { return []Expr{bOr.Arg} }
+func (bXor *BitXor) GetArgs() []Expr               { return []Expr{bXor.Arg} }
+func (std *Std) GetArgs() []Expr                   { return []Expr{std.Arg} }
+func (stdD *StdDev) GetArgs() []Expr               { return []Expr{stdD.Arg} }
+func (stdP *StdPop) GetArgs() []Expr               { return []Expr{stdP.Arg} }
+func (stdS *StdSamp) GetArgs() []Expr              { return []Expr{stdS.Arg} }
+func (varP *VarPop) GetArgs() []Expr               { return []Expr{varP.Arg} }
+func (varS *VarSamp) GetArgs() []Expr              { return []Expr{varS.Arg} }
+func (variance *Variance) GetArgs() []Expr         { return []Expr{variance.Arg} }
+func (av *AnyValue) GetArgs() []Expr               { return []Expr{av.Arg} }
+func (jaa *JSONArrayAgg) GetArgs() []Expr          { return []Expr{jaa.Expr} }
+func (joa *JSONObjectAgg) GetArgs() []Expr         { return []Expr{joa.Key, joa.Value} }
 
 func (min *Min) SetArg(expr Expr)                   { min.Arg = expr }
 func (sum *Sum) SetArg(expr Expr)                   { sum.Arg = expr }
 func (max *Max) SetArg(expr Expr)                   { max.Arg = expr }
 func (avg *Avg) SetArg(expr Expr)                   { avg.Arg = expr }
 func (*CountStar) SetArg(expr Expr)                 {}
-func (count *Count) SetArg(expr Expr)               { count.Args = Exprs{expr} }
-func (grpConcat *GroupConcatExpr) SetArg(expr Expr) { grpConcat.Exprs = Exprs{expr} }
+func (count *Count) SetArg(expr Expr)               { count.Args = []Expr{expr} }
+func (grpConcat *GroupConcatExpr) SetArg(expr Expr) { grpConcat.Exprs = []Expr{expr} }
 func (bAnd *BitAnd) SetArg(expr Expr)               { bAnd.Arg = expr }
 func (bOr *BitOr) SetArg(expr Expr)                 { bOr.Arg = expr }
 func (bXor *BitXor) SetArg(expr Expr)               { bXor.Arg = expr }
@@ -3492,24 +3493,26 @@ func (av *AnyValue) SetArg(expr Expr)               { av.Arg = expr }
 func (jaa *JSONArrayAgg) SetArg(expr Expr)          { jaa.Expr = expr }
 func (joa *JSONObjectAgg) SetArg(expr Expr)         { joa.Key = expr }
 
-func (min *Min) SetArgs(exprs Exprs) error           { return setFuncArgs(min, exprs, "MIN") }
-func (sum *Sum) SetArgs(exprs Exprs) error           { return setFuncArgs(sum, exprs, "SUM") }
-func (max *Max) SetArgs(exprs Exprs) error           { return setFuncArgs(max, exprs, "MAX") }
-func (avg *Avg) SetArgs(exprs Exprs) error           { return setFuncArgs(avg, exprs, "AVG") }
-func (*CountStar) SetArgs(Exprs) error               { return nil }
-func (bAnd *BitAnd) SetArgs(exprs Exprs) error       { return setFuncArgs(bAnd, exprs, "BIT_AND") }
-func (bOr *BitOr) SetArgs(exprs Exprs) error         { return setFuncArgs(bOr, exprs, "BIT_OR") }
-func (bXor *BitXor) SetArgs(exprs Exprs) error       { return setFuncArgs(bXor, exprs, "BIT_XOR") }
-func (std *Std) SetArgs(exprs Exprs) error           { return setFuncArgs(std, exprs, "STD") }
-func (stdD *StdDev) SetArgs(exprs Exprs) error       { return setFuncArgs(stdD, exprs, "STDDEV") }
-func (stdP *StdPop) SetArgs(exprs Exprs) error       { return setFuncArgs(stdP, exprs, "STDDEV_POP") }
-func (stdS *StdSamp) SetArgs(exprs Exprs) error      { return setFuncArgs(stdS, exprs, "STDDEV_SAMP") }
-func (varP *VarPop) SetArgs(exprs Exprs) error       { return setFuncArgs(varP, exprs, "VAR_POP") }
-func (varS *VarSamp) SetArgs(exprs Exprs) error      { return setFuncArgs(varS, exprs, "VAR_SAMP") }
-func (variance *Variance) SetArgs(exprs Exprs) error { return setFuncArgs(variance, exprs, "VARIANCE") }
-func (av *AnyValue) SetArgs(exprs Exprs) error       { return setFuncArgs(av, exprs, "ANY_VALUE") }
-func (jaa *JSONArrayAgg) SetArgs(exprs Exprs) error  { return setFuncArgs(jaa, exprs, "JSON_ARRAYARG") }
-func (joa *JSONObjectAgg) SetArgs(exprs Exprs) error {
+func (min *Min) SetArgs(exprs []Expr) error      { return setFuncArgs(min, exprs, "MIN") }
+func (sum *Sum) SetArgs(exprs []Expr) error      { return setFuncArgs(sum, exprs, "SUM") }
+func (max *Max) SetArgs(exprs []Expr) error      { return setFuncArgs(max, exprs, "MAX") }
+func (avg *Avg) SetArgs(exprs []Expr) error      { return setFuncArgs(avg, exprs, "AVG") }
+func (*CountStar) SetArgs([]Expr) error          { return nil }
+func (bAnd *BitAnd) SetArgs(exprs []Expr) error  { return setFuncArgs(bAnd, exprs, "BIT_AND") }
+func (bOr *BitOr) SetArgs(exprs []Expr) error    { return setFuncArgs(bOr, exprs, "BIT_OR") }
+func (bXor *BitXor) SetArgs(exprs []Expr) error  { return setFuncArgs(bXor, exprs, "BIT_XOR") }
+func (std *Std) SetArgs(exprs []Expr) error      { return setFuncArgs(std, exprs, "STD") }
+func (stdD *StdDev) SetArgs(exprs []Expr) error  { return setFuncArgs(stdD, exprs, "STDDEV") }
+func (stdP *StdPop) SetArgs(exprs []Expr) error  { return setFuncArgs(stdP, exprs, "STDDEV_POP") }
+func (stdS *StdSamp) SetArgs(exprs []Expr) error { return setFuncArgs(stdS, exprs, "STDDEV_SAMP") }
+func (varP *VarPop) SetArgs(exprs []Expr) error  { return setFuncArgs(varP, exprs, "VAR_POP") }
+func (varS *VarSamp) SetArgs(exprs []Expr) error { return setFuncArgs(varS, exprs, "VAR_SAMP") }
+func (variance *Variance) SetArgs(exprs []Expr) error {
+	return setFuncArgs(variance, exprs, "VARIANCE")
+}
+func (av *AnyValue) SetArgs(exprs []Expr) error      { return setFuncArgs(av, exprs, "ANY_VALUE") }
+func (jaa *JSONArrayAgg) SetArgs(exprs []Expr) error { return setFuncArgs(jaa, exprs, "JSON_ARRAYARG") }
+func (joa *JSONObjectAgg) SetArgs(exprs []Expr) error {
 	if len(exprs) != 2 {
 		return vterrors.VT13001("JSONObjectAgg takes in 2 expressions")
 	}
@@ -3518,11 +3521,11 @@ func (joa *JSONObjectAgg) SetArgs(exprs Exprs) error {
 	return nil
 }
 
-func (count *Count) SetArgs(exprs Exprs) error {
+func (count *Count) SetArgs(exprs []Expr) error {
 	count.Args = exprs
 	return nil
 }
-func (grpConcat *GroupConcatExpr) SetArgs(exprs Exprs) error {
+func (grpConcat *GroupConcatExpr) SetArgs(exprs []Expr) error {
 	grpConcat.Exprs = exprs
 	return nil
 }
@@ -3564,7 +3567,9 @@ func (*JSONObjectAgg) AggrName() string   { return "json_objectagg" }
 
 // Exprs represents a list of value expressions.
 // It's not a valid expression because it's not parenthesized.
-type Exprs []Expr
+type Exprs struct {
+	Exprs []Expr
+}
 
 func (ValTuple) iColTuple()  {}
 func (*Subquery) iColTuple() {}
diff --git a/go/vt/sqlparser/ast_clone.go b/go/vt/sqlparser/ast_clone.go
index 3c7f4fe5e6a..997485e086c 100644
--- a/go/vt/sqlparser/ast_clone.go
+++ b/go/vt/sqlparser/ast_clone.go
@@ -161,8 +161,8 @@ func CloneSQLNode(in SQLNode) SQLNode {
 		return CloneRefOfExplainStmt(in)
 	case *ExplainTab:
 		return CloneRefOfExplainTab(in)
-	case Exprs:
-		return CloneExprs(in)
+	case *Exprs:
+		return CloneRefOfExprs(in)
 	case *ExtractFuncExpr:
 		return CloneRefOfExtractFuncExpr(in)
 	case *ExtractValueExpr:
@@ -435,8 +435,8 @@ func CloneSQLNode(in SQLNode) SQLNode {
 		return CloneRefOfSavepoint(in)
 	case *Select:
 		return CloneRefOfSelect(in)
-	case SelectExprs:
-		return CloneSelectExprs(in)
+	case *SelectExprs:
+		return CloneRefOfSelectExprs(in)
 	case *SelectInto:
 		return CloneRefOfSelectInto(in)
 	case *Set:
@@ -887,7 +887,7 @@ func CloneRefOfCallProc(n *CallProc) *CallProc {
 	}
 	out := *n
 	out.Name = CloneTableName(n.Name)
-	out.Params = CloneExprs(n.Params)
+	out.Params = CloneSliceOfExpr(n.Params)
 	return &out
 }
 
@@ -932,7 +932,7 @@ func CloneRefOfCharExpr(n *CharExpr) *CharExpr {
 		return nil
 	}
 	out := *n
-	out.Exprs = CloneExprs(n.Exprs)
+	out.Exprs = CloneSliceOfExpr(n.Exprs)
 	return &out
 }
 
@@ -1091,7 +1091,7 @@ func CloneRefOfCount(n *Count) *Count {
 		return nil
 	}
 	out := *n
-	out.Args = CloneExprs(n.Args)
+	out.Args = CloneSliceOfExpr(n.Args)
 	out.OverClause = CloneRefOfOverClause(n.OverClause)
 	return &out
 }
@@ -1307,16 +1307,14 @@ func CloneRefOfExplainTab(n *ExplainTab) *ExplainTab {
 	return &out
 }
 
-// CloneExprs creates a deep clone of the input.
-func CloneExprs(n Exprs) Exprs {
+// CloneRefOfExprs creates a deep clone of the input.
+func CloneRefOfExprs(n *Exprs) *Exprs {
 	if n == nil {
 		return nil
 	}
-	res := make(Exprs, len(n))
-	for i, x := range n {
-		res[i] = CloneExpr(x)
-	}
-	return res
+	out := *n
+	out.Exprs = CloneSliceOfExpr(n.Exprs)
+	return &out
 }
 
 // CloneRefOfExtractFuncExpr creates a deep clone of the input.
@@ -1422,7 +1420,7 @@ func CloneRefOfFuncExpr(n *FuncExpr) *FuncExpr {
 	out := *n
 	out.Qualifier = CloneIdentifierCS(n.Qualifier)
 	out.Name = CloneIdentifierCI(n.Name)
-	out.Exprs = CloneExprs(n.Exprs)
+	out.Exprs = CloneSliceOfExpr(n.Exprs)
 	return &out
 }
 
@@ -1569,7 +1567,7 @@ func CloneRefOfGroupConcatExpr(n *GroupConcatExpr) *GroupConcatExpr {
 		return nil
 	}
 	out := *n
-	out.Exprs = CloneExprs(n.Exprs)
+	out.Exprs = CloneSliceOfExpr(n.Exprs)
 	out.OrderBy = CloneOrderBy(n.OrderBy)
 	out.Limit = CloneRefOfLimit(n.Limit)
 	return &out
@@ -1677,7 +1675,7 @@ func CloneRefOfIntervalFuncExpr(n *IntervalFuncExpr) *IntervalFuncExpr {
 	}
 	out := *n
 	out.Expr = CloneExpr(n.Expr)
-	out.Exprs = CloneExprs(n.Exprs)
+	out.Exprs = CloneSliceOfExpr(n.Exprs)
 	return &out
 }
 
@@ -1718,7 +1716,7 @@ func CloneRefOfJSONArrayExpr(n *JSONArrayExpr) *JSONArrayExpr {
 		return nil
 	}
 	out := *n
-	out.Params = CloneExprs(n.Params)
+	out.Params = CloneSliceOfExpr(n.Params)
 	return &out
 }
 
@@ -1850,7 +1848,7 @@ func CloneRefOfJSONRemoveExpr(n *JSONRemoveExpr) *JSONRemoveExpr {
 	}
 	out := *n
 	out.JSONDoc = CloneExpr(n.JSONDoc)
-	out.PathList = CloneExprs(n.PathList)
+	out.PathList = CloneSliceOfExpr(n.PathList)
 	return &out
 }
 
@@ -1954,7 +1952,7 @@ func CloneRefOfJSONValueMergeExpr(n *JSONValueMergeExpr) *JSONValueMergeExpr {
 	}
 	out := *n
 	out.JSONDoc = CloneExpr(n.JSONDoc)
-	out.JSONDocList = CloneExprs(n.JSONDocList)
+	out.JSONDocList = CloneSliceOfExpr(n.JSONDocList)
 	return &out
 }
 
@@ -2063,7 +2061,7 @@ func CloneRefOfLineStringExpr(n *LineStringExpr) *LineStringExpr {
 		return nil
 	}
 	out := *n
-	out.PointParams = CloneExprs(n.PointParams)
+	out.PointParams = CloneSliceOfExpr(n.PointParams)
 	return &out
 }
 
@@ -2199,7 +2197,7 @@ func CloneRefOfMultiLinestringExpr(n *MultiLinestringExpr) *MultiLinestringExpr
 		return nil
 	}
 	out := *n
-	out.LinestringParams = CloneExprs(n.LinestringParams)
+	out.LinestringParams = CloneSliceOfExpr(n.LinestringParams)
 	return &out
 }
 
@@ -2209,7 +2207,7 @@ func CloneRefOfMultiPointExpr(n *MultiPointExpr) *MultiPointExpr {
 		return nil
 	}
 	out := *n
-	out.PointParams = CloneExprs(n.PointParams)
+	out.PointParams = CloneSliceOfExpr(n.PointParams)
 	return &out
 }
 
@@ -2219,7 +2217,7 @@ func CloneRefOfMultiPolygonExpr(n *MultiPolygonExpr) *MultiPolygonExpr {
 		return nil
 	}
 	out := *n
-	out.PolygonParams = CloneExprs(n.PolygonParams)
+	out.PolygonParams = CloneSliceOfExpr(n.PolygonParams)
 	return &out
 }
 
@@ -2546,7 +2544,7 @@ func CloneRefOfPolygonExpr(n *PolygonExpr) *PolygonExpr {
 		return nil
 	}
 	out := *n
-	out.LinestringParams = CloneExprs(n.LinestringParams)
+	out.LinestringParams = CloneSliceOfExpr(n.LinestringParams)
 	return &out
 }
 
@@ -2766,7 +2764,7 @@ func CloneRefOfSelect(n *Select) *Select {
 	out.With = CloneRefOfWith(n.With)
 	out.From = CloneSliceOfTableExpr(n.From)
 	out.Comments = CloneRefOfParsedComments(n.Comments)
-	out.SelectExprs = CloneSelectExprs(n.SelectExprs)
+	out.SelectExprs = CloneRefOfSelectExprs(n.SelectExprs)
 	out.Where = CloneRefOfWhere(n.Where)
 	out.GroupBy = CloneRefOfGroupBy(n.GroupBy)
 	out.Having = CloneRefOfWhere(n.Having)
@@ -2777,16 +2775,14 @@ func CloneRefOfSelect(n *Select) *Select {
 	return &out
 }
 
-// CloneSelectExprs creates a deep clone of the input.
-func CloneSelectExprs(n SelectExprs) SelectExprs {
+// CloneRefOfSelectExprs creates a deep clone of the input.
+func CloneRefOfSelectExprs(n *SelectExprs) *SelectExprs {
 	if n == nil {
 		return nil
 	}
-	res := make(SelectExprs, len(n))
-	for i, x := range n {
-		res[i] = CloneSelectExpr(x)
-	}
-	return res
+	out := *n
+	out.Exprs = CloneSliceOfSelectExpr(n.Exprs)
+	return &out
 }
 
 // CloneRefOfSelectInto creates a deep clone of the input.
@@ -3466,7 +3462,7 @@ func CloneRefOfWindowSpecification(n *WindowSpecification) *WindowSpecification
 	}
 	out := *n
 	out.Name = CloneIdentifierCI(n.Name)
-	out.PartitionClause = CloneExprs(n.PartitionClause)
+	out.PartitionClause = CloneSliceOfExpr(n.PartitionClause)
 	out.OrderClause = CloneOrderBy(n.OrderClause)
 	out.FrameClause = CloneRefOfFrameClause(n.FrameClause)
 	return &out
@@ -4418,6 +4414,18 @@ func CloneSliceOfTxAccessMode(n []TxAccessMode) []TxAccessMode {
 	return res
 }
 
+// CloneSliceOfExpr creates a deep clone of the input.
+func CloneSliceOfExpr(n []Expr) []Expr {
+	if n == nil {
+		return nil
+	}
+	res := make([]Expr, len(n))
+	for i, x := range n {
+		res[i] = CloneExpr(x)
+	}
+	return res
+}
+
 // CloneSliceOfRefOfWhen creates a deep clone of the input.
 func CloneSliceOfRefOfWhen(n []*When) []*When {
 	if n == nil {
@@ -4497,18 +4505,6 @@ func CloneSliceOfRefOfVariable(n []*Variable) []*Variable {
 	return res
 }
 
-// CloneSliceOfExpr creates a deep clone of the input.
-func CloneSliceOfExpr(n []Expr) []Expr {
-	if n == nil {
-		return nil
-	}
-	res := make([]Expr, len(n))
-	for i, x := range n {
-		res[i] = CloneExpr(x)
-	}
-	return res
-}
-
 // CloneRefOfIdentifierCI creates a deep clone of the input.
 func CloneRefOfIdentifierCI(n *IdentifierCI) *IdentifierCI {
 	if n == nil {
@@ -4680,6 +4676,18 @@ func CloneRefOfRootNode(n *RootNode) *RootNode {
 	return &out
 }
 
+// CloneSliceOfSelectExpr creates a deep clone of the input.
+func CloneSliceOfSelectExpr(n []SelectExpr) []SelectExpr {
+	if n == nil {
+		return nil
+	}
+	res := make([]SelectExpr, len(n))
+	for i, x := range n {
+		res[i] = CloneSelectExpr(x)
+	}
+	return res
+}
+
 // CloneRefOfTableName creates a deep clone of the input.
 func CloneRefOfTableName(n *TableName) *TableName {
 	if n == nil {
diff --git a/go/vt/sqlparser/ast_copy_on_rewrite.go b/go/vt/sqlparser/ast_copy_on_rewrite.go
index f725dfc6803..46ce38ee29d 100644
--- a/go/vt/sqlparser/ast_copy_on_rewrite.go
+++ b/go/vt/sqlparser/ast_copy_on_rewrite.go
@@ -160,8 +160,8 @@ func (c *cow) copyOnRewriteSQLNode(n SQLNode, parent SQLNode) (out SQLNode, chan
 		return c.copyOnRewriteRefOfExplainStmt(n, parent)
 	case *ExplainTab:
 		return c.copyOnRewriteRefOfExplainTab(n, parent)
-	case Exprs:
-		return c.copyOnRewriteExprs(n, parent)
+	case *Exprs:
+		return c.copyOnRewriteRefOfExprs(n, parent)
 	case *ExtractFuncExpr:
 		return c.copyOnRewriteRefOfExtractFuncExpr(n, parent)
 	case *ExtractValueExpr:
@@ -434,8 +434,8 @@ func (c *cow) copyOnRewriteSQLNode(n SQLNode, parent SQLNode) (out SQLNode, chan
 		return c.copyOnRewriteRefOfSavepoint(n, parent)
 	case *Select:
 		return c.copyOnRewriteRefOfSelect(n, parent)
-	case SelectExprs:
-		return c.copyOnRewriteSelectExprs(n, parent)
+	case *SelectExprs:
+		return c.copyOnRewriteRefOfSelectExprs(n, parent)
 	case *SelectInto:
 		return c.copyOnRewriteRefOfSelectInto(n, parent)
 	case *Set:
@@ -1244,11 +1244,19 @@ func (c *cow) copyOnRewriteRefOfCallProc(n *CallProc, parent SQLNode) (out SQLNo
 	out = n
 	if c.pre == nil || c.pre(n, parent) {
 		_Name, changedName := c.copyOnRewriteTableName(n.Name, n)
-		_Params, changedParams := c.copyOnRewriteExprs(n.Params, n)
+		var changedParams bool
+		_Params := make([]Expr, len(n.Params))
+		for x, el := range n.Params {
+			this, changed := c.copyOnRewriteExpr(el, n)
+			_Params[x] = this.(Expr)
+			if changed {
+				changedParams = true
+			}
+		}
 		if changedName || changedParams {
 			res := *n
 			res.Name, _ = _Name.(TableName)
-			res.Params, _ = _Params.(Exprs)
+			res.Params = _Params
 			out = &res
 			if c.cloned != nil {
 				c.cloned(n, out)
@@ -1351,10 +1359,18 @@ func (c *cow) copyOnRewriteRefOfCharExpr(n *CharExpr, parent SQLNode) (out SQLNo
 	}
 	out = n
 	if c.pre == nil || c.pre(n, parent) {
-		_Exprs, changedExprs := c.copyOnRewriteExprs(n.Exprs, n)
+		var changedExprs bool
+		_Exprs := make([]Expr, len(n.Exprs))
+		for x, el := range n.Exprs {
+			this, changed := c.copyOnRewriteExpr(el, n)
+			_Exprs[x] = this.(Expr)
+			if changed {
+				changedExprs = true
+			}
+		}
 		if changedExprs {
 			res := *n
-			res.Exprs, _ = _Exprs.(Exprs)
+			res.Exprs = _Exprs
 			out = &res
 			if c.cloned != nil {
 				c.cloned(n, out)
@@ -1658,11 +1674,19 @@ func (c *cow) copyOnRewriteRefOfCount(n *Count, parent SQLNode) (out SQLNode, ch
 	}
 	out = n
 	if c.pre == nil || c.pre(n, parent) {
-		_Args, changedArgs := c.copyOnRewriteExprs(n.Args, n)
+		var changedArgs bool
+		_Args := make([]Expr, len(n.Args))
+		for x, el := range n.Args {
+			this, changed := c.copyOnRewriteExpr(el, n)
+			_Args[x] = this.(Expr)
+			if changed {
+				changedArgs = true
+			}
+		}
 		_OverClause, changedOverClause := c.copyOnRewriteRefOfOverClause(n.OverClause, n)
 		if changedArgs || changedOverClause {
 			res := *n
-			res.Args, _ = _Args.(Exprs)
+			res.Args = _Args
 			res.OverClause, _ = _OverClause.(*OverClause)
 			out = &res
 			if c.cloned != nil {
@@ -2134,22 +2158,29 @@ func (c *cow) copyOnRewriteRefOfExplainTab(n *ExplainTab, parent SQLNode) (out S
 	}
 	return
 }
-func (c *cow) copyOnRewriteExprs(n Exprs, parent SQLNode) (out SQLNode, changed bool) {
+func (c *cow) copyOnRewriteRefOfExprs(n *Exprs, parent SQLNode) (out SQLNode, changed bool) {
 	if n == nil || c.cursor.stop {
 		return n, false
 	}
 	out = n
 	if c.pre == nil || c.pre(n, parent) {
-		res := make(Exprs, len(n))
-		for x, el := range n {
-			this, change := c.copyOnRewriteExpr(el, n)
-			res[x] = this.(Expr)
-			if change {
-				changed = true
+		var changedExprs bool
+		_Exprs := make([]Expr, len(n.Exprs))
+		for x, el := range n.Exprs {
+			this, changed := c.copyOnRewriteExpr(el, n)
+			_Exprs[x] = this.(Expr)
+			if changed {
+				changedExprs = true
 			}
 		}
-		if changed {
-			out = res
+		if changedExprs {
+			res := *n
+			res.Exprs = _Exprs
+			out = &res
+			if c.cloned != nil {
+				c.cloned(n, out)
+			}
+			changed = true
 		}
 	}
 	if c.post != nil {
@@ -2355,12 +2386,20 @@ func (c *cow) copyOnRewriteRefOfFuncExpr(n *FuncExpr, parent SQLNode) (out SQLNo
 	if c.pre == nil || c.pre(n, parent) {
 		_Qualifier, changedQualifier := c.copyOnRewriteIdentifierCS(n.Qualifier, n)
 		_Name, changedName := c.copyOnRewriteIdentifierCI(n.Name, n)
-		_Exprs, changedExprs := c.copyOnRewriteExprs(n.Exprs, n)
+		var changedExprs bool
+		_Exprs := make([]Expr, len(n.Exprs))
+		for x, el := range n.Exprs {
+			this, changed := c.copyOnRewriteExpr(el, n)
+			_Exprs[x] = this.(Expr)
+			if changed {
+				changedExprs = true
+			}
+		}
 		if changedQualifier || changedName || changedExprs {
 			res := *n
 			res.Qualifier, _ = _Qualifier.(IdentifierCS)
 			res.Name, _ = _Name.(IdentifierCI)
-			res.Exprs, _ = _Exprs.(Exprs)
+			res.Exprs = _Exprs
 			out = &res
 			if c.cloned != nil {
 				c.cloned(n, out)
@@ -2685,12 +2724,20 @@ func (c *cow) copyOnRewriteRefOfGroupConcatExpr(n *GroupConcatExpr, parent SQLNo
 	}
 	out = n
 	if c.pre == nil || c.pre(n, parent) {
-		_Exprs, changedExprs := c.copyOnRewriteExprs(n.Exprs, n)
+		var changedExprs bool
+		_Exprs := make([]Expr, len(n.Exprs))
+		for x, el := range n.Exprs {
+			this, changed := c.copyOnRewriteExpr(el, n)
+			_Exprs[x] = this.(Expr)
+			if changed {
+				changedExprs = true
+			}
+		}
 		_OrderBy, changedOrderBy := c.copyOnRewriteOrderBy(n.OrderBy, n)
 		_Limit, changedLimit := c.copyOnRewriteRefOfLimit(n.Limit, n)
 		if changedExprs || changedOrderBy || changedLimit {
 			res := *n
-			res.Exprs, _ = _Exprs.(Exprs)
+			res.Exprs = _Exprs
 			res.OrderBy, _ = _OrderBy.(OrderBy)
 			res.Limit, _ = _Limit.(*Limit)
 			out = &res
@@ -2915,11 +2962,19 @@ func (c *cow) copyOnRewriteRefOfIntervalFuncExpr(n *IntervalFuncExpr, parent SQL
 	out = n
 	if c.pre == nil || c.pre(n, parent) {
 		_Expr, changedExpr := c.copyOnRewriteExpr(n.Expr, n)
-		_Exprs, changedExprs := c.copyOnRewriteExprs(n.Exprs, n)
+		var changedExprs bool
+		_Exprs := make([]Expr, len(n.Exprs))
+		for x, el := range n.Exprs {
+			this, changed := c.copyOnRewriteExpr(el, n)
+			_Exprs[x] = this.(Expr)
+			if changed {
+				changedExprs = true
+			}
+		}
 		if changedExpr || changedExprs {
 			res := *n
 			res.Expr, _ = _Expr.(Expr)
-			res.Exprs, _ = _Exprs.(Exprs)
+			res.Exprs = _Exprs
 			out = &res
 			if c.cloned != nil {
 				c.cloned(n, out)
@@ -3006,10 +3061,18 @@ func (c *cow) copyOnRewriteRefOfJSONArrayExpr(n *JSONArrayExpr, parent SQLNode)
 	}
 	out = n
 	if c.pre == nil || c.pre(n, parent) {
-		_Params, changedParams := c.copyOnRewriteExprs(n.Params, n)
+		var changedParams bool
+		_Params := make([]Expr, len(n.Params))
+		for x, el := range n.Params {
+			this, changed := c.copyOnRewriteExpr(el, n)
+			_Params[x] = this.(Expr)
+			if changed {
+				changedParams = true
+			}
+		}
 		if changedParams {
 			res := *n
-			res.Params, _ = _Params.(Exprs)
+			res.Params = _Params
 			out = &res
 			if c.cloned != nil {
 				c.cloned(n, out)
@@ -3325,11 +3388,19 @@ func (c *cow) copyOnRewriteRefOfJSONRemoveExpr(n *JSONRemoveExpr, parent SQLNode
 	out = n
 	if c.pre == nil || c.pre(n, parent) {
 		_JSONDoc, changedJSONDoc := c.copyOnRewriteExpr(n.JSONDoc, n)
-		_PathList, changedPathList := c.copyOnRewriteExprs(n.PathList, n)
+		var changedPathList bool
+		_PathList := make([]Expr, len(n.PathList))
+		for x, el := range n.PathList {
+			this, changed := c.copyOnRewriteExpr(el, n)
+			_PathList[x] = this.(Expr)
+			if changed {
+				changedPathList = true
+			}
+		}
 		if changedJSONDoc || changedPathList {
 			res := *n
 			res.JSONDoc, _ = _JSONDoc.(Expr)
-			res.PathList, _ = _PathList.(Exprs)
+			res.PathList = _PathList
 			out = &res
 			if c.cloned != nil {
 				c.cloned(n, out)
@@ -3567,11 +3638,19 @@ func (c *cow) copyOnRewriteRefOfJSONValueMergeExpr(n *JSONValueMergeExpr, parent
 	out = n
 	if c.pre == nil || c.pre(n, parent) {
 		_JSONDoc, changedJSONDoc := c.copyOnRewriteExpr(n.JSONDoc, n)
-		_JSONDocList, changedJSONDocList := c.copyOnRewriteExprs(n.JSONDocList, n)
+		var changedJSONDocList bool
+		_JSONDocList := make([]Expr, len(n.JSONDocList))
+		for x, el := range n.JSONDocList {
+			this, changed := c.copyOnRewriteExpr(el, n)
+			_JSONDocList[x] = this.(Expr)
+			if changed {
+				changedJSONDocList = true
+			}
+		}
 		if changedJSONDoc || changedJSONDocList {
 			res := *n
 			res.JSONDoc, _ = _JSONDoc.(Expr)
-			res.JSONDocList, _ = _JSONDocList.(Exprs)
+			res.JSONDocList = _JSONDocList
 			out = &res
 			if c.cloned != nil {
 				c.cloned(n, out)
@@ -3784,10 +3863,18 @@ func (c *cow) copyOnRewriteRefOfLineStringExpr(n *LineStringExpr, parent SQLNode
 	}
 	out = n
 	if c.pre == nil || c.pre(n, parent) {
-		_PointParams, changedPointParams := c.copyOnRewriteExprs(n.PointParams, n)
+		var changedPointParams bool
+		_PointParams := make([]Expr, len(n.PointParams))
+		for x, el := range n.PointParams {
+			this, changed := c.copyOnRewriteExpr(el, n)
+			_PointParams[x] = this.(Expr)
+			if changed {
+				changedPointParams = true
+			}
+		}
 		if changedPointParams {
 			res := *n
-			res.PointParams, _ = _PointParams.(Exprs)
+			res.PointParams = _PointParams
 			out = &res
 			if c.cloned != nil {
 				c.cloned(n, out)
@@ -4056,10 +4143,18 @@ func (c *cow) copyOnRewriteRefOfMultiLinestringExpr(n *MultiLinestringExpr, pare
 	}
 	out = n
 	if c.pre == nil || c.pre(n, parent) {
-		_LinestringParams, changedLinestringParams := c.copyOnRewriteExprs(n.LinestringParams, n)
+		var changedLinestringParams bool
+		_LinestringParams := make([]Expr, len(n.LinestringParams))
+		for x, el := range n.LinestringParams {
+			this, changed := c.copyOnRewriteExpr(el, n)
+			_LinestringParams[x] = this.(Expr)
+			if changed {
+				changedLinestringParams = true
+			}
+		}
 		if changedLinestringParams {
 			res := *n
-			res.LinestringParams, _ = _LinestringParams.(Exprs)
+			res.LinestringParams = _LinestringParams
 			out = &res
 			if c.cloned != nil {
 				c.cloned(n, out)
@@ -4078,10 +4173,18 @@ func (c *cow) copyOnRewriteRefOfMultiPointExpr(n *MultiPointExpr, parent SQLNode
 	}
 	out = n
 	if c.pre == nil || c.pre(n, parent) {
-		_PointParams, changedPointParams := c.copyOnRewriteExprs(n.PointParams, n)
+		var changedPointParams bool
+		_PointParams := make([]Expr, len(n.PointParams))
+		for x, el := range n.PointParams {
+			this, changed := c.copyOnRewriteExpr(el, n)
+			_PointParams[x] = this.(Expr)
+			if changed {
+				changedPointParams = true
+			}
+		}
 		if changedPointParams {
 			res := *n
-			res.PointParams, _ = _PointParams.(Exprs)
+			res.PointParams = _PointParams
 			out = &res
 			if c.cloned != nil {
 				c.cloned(n, out)
@@ -4100,10 +4203,18 @@ func (c *cow) copyOnRewriteRefOfMultiPolygonExpr(n *MultiPolygonExpr, parent SQL
 	}
 	out = n
 	if c.pre == nil || c.pre(n, parent) {
-		_PolygonParams, changedPolygonParams := c.copyOnRewriteExprs(n.PolygonParams, n)
+		var changedPolygonParams bool
+		_PolygonParams := make([]Expr, len(n.PolygonParams))
+		for x, el := range n.PolygonParams {
+			this, changed := c.copyOnRewriteExpr(el, n)
+			_PolygonParams[x] = this.(Expr)
+			if changed {
+				changedPolygonParams = true
+			}
+		}
 		if changedPolygonParams {
 			res := *n
-			res.PolygonParams, _ = _PolygonParams.(Exprs)
+			res.PolygonParams = _PolygonParams
 			out = &res
 			if c.cloned != nil {
 				c.cloned(n, out)
@@ -4772,10 +4883,18 @@ func (c *cow) copyOnRewriteRefOfPolygonExpr(n *PolygonExpr, parent SQLNode) (out
 	}
 	out = n
 	if c.pre == nil || c.pre(n, parent) {
-		_LinestringParams, changedLinestringParams := c.copyOnRewriteExprs(n.LinestringParams, n)
+		var changedLinestringParams bool
+		_LinestringParams := make([]Expr, len(n.LinestringParams))
+		for x, el := range n.LinestringParams {
+			this, changed := c.copyOnRewriteExpr(el, n)
+			_LinestringParams[x] = this.(Expr)
+			if changed {
+				changedLinestringParams = true
+			}
+		}
 		if changedLinestringParams {
 			res := *n
-			res.LinestringParams, _ = _LinestringParams.(Exprs)
+			res.LinestringParams = _LinestringParams
 			out = &res
 			if c.cloned != nil {
 				c.cloned(n, out)
@@ -5242,7 +5361,7 @@ func (c *cow) copyOnRewriteRefOfSelect(n *Select, parent SQLNode) (out SQLNode,
 			}
 		}
 		_Comments, changedComments := c.copyOnRewriteRefOfParsedComments(n.Comments, n)
-		_SelectExprs, changedSelectExprs := c.copyOnRewriteSelectExprs(n.SelectExprs, n)
+		_SelectExprs, changedSelectExprs := c.copyOnRewriteRefOfSelectExprs(n.SelectExprs, n)
 		_Where, changedWhere := c.copyOnRewriteRefOfWhere(n.Where, n)
 		_GroupBy, changedGroupBy := c.copyOnRewriteRefOfGroupBy(n.GroupBy, n)
 		_Having, changedHaving := c.copyOnRewriteRefOfWhere(n.Having, n)
@@ -5255,7 +5374,7 @@ func (c *cow) copyOnRewriteRefOfSelect(n *Select, parent SQLNode) (out SQLNode,
 			res.With, _ = _With.(*With)
 			res.From = _From
 			res.Comments, _ = _Comments.(*ParsedComments)
-			res.SelectExprs, _ = _SelectExprs.(SelectExprs)
+			res.SelectExprs, _ = _SelectExprs.(*SelectExprs)
 			res.Where, _ = _Where.(*Where)
 			res.GroupBy, _ = _GroupBy.(*GroupBy)
 			res.Having, _ = _Having.(*Where)
@@ -5275,22 +5394,29 @@ func (c *cow) copyOnRewriteRefOfSelect(n *Select, parent SQLNode) (out SQLNode,
 	}
 	return
 }
-func (c *cow) copyOnRewriteSelectExprs(n SelectExprs, parent SQLNode) (out SQLNode, changed bool) {
+func (c *cow) copyOnRewriteRefOfSelectExprs(n *SelectExprs, parent SQLNode) (out SQLNode, changed bool) {
 	if n == nil || c.cursor.stop {
 		return n, false
 	}
 	out = n
 	if c.pre == nil || c.pre(n, parent) {
-		res := make(SelectExprs, len(n))
-		for x, el := range n {
-			this, change := c.copyOnRewriteSelectExpr(el, n)
-			res[x] = this.(SelectExpr)
-			if change {
-				changed = true
+		var changedExprs bool
+		_Exprs := make([]SelectExpr, len(n.Exprs))
+		for x, el := range n.Exprs {
+			this, changed := c.copyOnRewriteSelectExpr(el, n)
+			_Exprs[x] = this.(SelectExpr)
+			if changed {
+				changedExprs = true
 			}
 		}
-		if changed {
-			out = res
+		if changedExprs {
+			res := *n
+			res.Exprs = _Exprs
+			out = &res
+			if c.cloned != nil {
+				c.cloned(n, out)
+			}
+			changed = true
 		}
 	}
 	if c.post != nil {
@@ -6714,13 +6840,21 @@ func (c *cow) copyOnRewriteRefOfWindowSpecification(n *WindowSpecification, pare
 	out = n
 	if c.pre == nil || c.pre(n, parent) {
 		_Name, changedName := c.copyOnRewriteIdentifierCI(n.Name, n)
-		_PartitionClause, changedPartitionClause := c.copyOnRewriteExprs(n.PartitionClause, n)
+		var changedPartitionClause bool
+		_PartitionClause := make([]Expr, len(n.PartitionClause))
+		for x, el := range n.PartitionClause {
+			this, changed := c.copyOnRewriteExpr(el, n)
+			_PartitionClause[x] = this.(Expr)
+			if changed {
+				changedPartitionClause = true
+			}
+		}
 		_OrderClause, changedOrderClause := c.copyOnRewriteOrderBy(n.OrderClause, n)
 		_FrameClause, changedFrameClause := c.copyOnRewriteRefOfFrameClause(n.FrameClause, n)
 		if changedName || changedPartitionClause || changedOrderClause || changedFrameClause {
 			res := *n
 			res.Name, _ = _Name.(IdentifierCI)
-			res.PartitionClause, _ = _PartitionClause.(Exprs)
+			res.PartitionClause = _PartitionClause
 			res.OrderClause, _ = _OrderClause.(OrderBy)
 			res.FrameClause, _ = _FrameClause.(*FrameClause)
 			out = &res
diff --git a/go/vt/sqlparser/ast_equals.go b/go/vt/sqlparser/ast_equals.go
index 93f10376177..2795daab2c5 100644
--- a/go/vt/sqlparser/ast_equals.go
+++ b/go/vt/sqlparser/ast_equals.go
@@ -440,12 +440,12 @@ func (cmp *Comparator) SQLNode(inA, inB SQLNode) bool {
 			return false
 		}
 		return cmp.RefOfExplainTab(a, b)
-	case Exprs:
-		b, ok := inB.(Exprs)
+	case *Exprs:
+		b, ok := inB.(*Exprs)
 		if !ok {
 			return false
 		}
-		return cmp.Exprs(a, b)
+		return cmp.RefOfExprs(a, b)
 	case *ExtractFuncExpr:
 		b, ok := inB.(*ExtractFuncExpr)
 		if !ok {
@@ -1262,12 +1262,12 @@ func (cmp *Comparator) SQLNode(inA, inB SQLNode) bool {
 			return false
 		}
 		return cmp.RefOfSelect(a, b)
-	case SelectExprs:
-		b, ok := inB.(SelectExprs)
+	case *SelectExprs:
+		b, ok := inB.(*SelectExprs)
 		if !ok {
 			return false
 		}
-		return cmp.SelectExprs(a, b)
+		return cmp.RefOfSelectExprs(a, b)
 	case *SelectInto:
 		b, ok := inB.(*SelectInto)
 		if !ok {
@@ -2032,7 +2032,7 @@ func (cmp *Comparator) RefOfCallProc(a, b *CallProc) bool {
 		return false
 	}
 	return cmp.TableName(a.Name, b.Name) &&
-		cmp.Exprs(a.Params, b.Params)
+		cmp.SliceOfExpr(a.Params, b.Params)
 }
 
 // RefOfCaseExpr does deep equals between the two objects.
@@ -2084,7 +2084,7 @@ func (cmp *Comparator) RefOfCharExpr(a, b *CharExpr) bool {
 		return false
 	}
 	return a.Charset == b.Charset &&
-		cmp.Exprs(a.Exprs, b.Exprs)
+		cmp.SliceOfExpr(a.Exprs, b.Exprs)
 }
 
 // RefOfCheckConstraintDefinition does deep equals between the two objects.
@@ -2278,7 +2278,7 @@ func (cmp *Comparator) RefOfCount(a, b *Count) bool {
 		return false
 	}
 	return a.Distinct == b.Distinct &&
-		cmp.Exprs(a.Args, b.Args) &&
+		cmp.SliceOfExpr(a.Args, b.Args) &&
 		cmp.RefOfOverClause(a.OverClause, b.OverClause)
 }
 
@@ -2534,17 +2534,15 @@ func (cmp *Comparator) RefOfExplainTab(a, b *ExplainTab) bool {
 		cmp.TableName(a.Table, b.Table)
 }
 
-// Exprs does deep equals between the two objects.
-func (cmp *Comparator) Exprs(a, b Exprs) bool {
-	if len(a) != len(b) {
-		return false
+// RefOfExprs does deep equals between the two objects.
+func (cmp *Comparator) RefOfExprs(a, b *Exprs) bool {
+	if a == b {
+		return true
 	}
-	for i := 0; i < len(a); i++ {
-		if !cmp.Expr(a[i], b[i]) {
-			return false
-		}
+	if a == nil || b == nil {
+		return false
 	}
-	return true
+	return cmp.SliceOfExpr(a.Exprs, b.Exprs)
 }
 
 // RefOfExtractFuncExpr does deep equals between the two objects.
@@ -2671,7 +2669,7 @@ func (cmp *Comparator) RefOfFuncExpr(a, b *FuncExpr) bool {
 	}
 	return cmp.IdentifierCS(a.Qualifier, b.Qualifier) &&
 		cmp.IdentifierCI(a.Name, b.Name) &&
-		cmp.Exprs(a.Exprs, b.Exprs)
+		cmp.SliceOfExpr(a.Exprs, b.Exprs)
 }
 
 // RefOfGTIDFuncExpr does deep equals between the two objects.
@@ -2841,7 +2839,7 @@ func (cmp *Comparator) RefOfGroupConcatExpr(a, b *GroupConcatExpr) bool {
 	}
 	return a.Distinct == b.Distinct &&
 		a.Separator == b.Separator &&
-		cmp.Exprs(a.Exprs, b.Exprs) &&
+		cmp.SliceOfExpr(a.Exprs, b.Exprs) &&
 		cmp.OrderBy(a.OrderBy, b.OrderBy) &&
 		cmp.RefOfLimit(a.Limit, b.Limit)
 }
@@ -2965,7 +2963,7 @@ func (cmp *Comparator) RefOfIntervalFuncExpr(a, b *IntervalFuncExpr) bool {
 		return false
 	}
 	return cmp.Expr(a.Expr, b.Expr) &&
-		cmp.Exprs(a.Exprs, b.Exprs)
+		cmp.SliceOfExpr(a.Exprs, b.Exprs)
 }
 
 // RefOfIntroducerExpr does deep equals between the two objects.
@@ -3012,7 +3010,7 @@ func (cmp *Comparator) RefOfJSONArrayExpr(a, b *JSONArrayExpr) bool {
 	if a == nil || b == nil {
 		return false
 	}
-	return cmp.Exprs(a.Params, b.Params)
+	return cmp.SliceOfExpr(a.Params, b.Params)
 }
 
 // RefOfJSONAttributesExpr does deep equals between the two objects.
@@ -3157,7 +3155,7 @@ func (cmp *Comparator) RefOfJSONRemoveExpr(a, b *JSONRemoveExpr) bool {
 		return false
 	}
 	return cmp.Expr(a.JSONDoc, b.JSONDoc) &&
-		cmp.Exprs(a.PathList, b.PathList)
+		cmp.SliceOfExpr(a.PathList, b.PathList)
 }
 
 // RefOfJSONSchemaValidFuncExpr does deep equals between the two objects.
@@ -3271,7 +3269,7 @@ func (cmp *Comparator) RefOfJSONValueMergeExpr(a, b *JSONValueMergeExpr) bool {
 	}
 	return a.Type == b.Type &&
 		cmp.Expr(a.JSONDoc, b.JSONDoc) &&
-		cmp.Exprs(a.JSONDocList, b.JSONDocList)
+		cmp.SliceOfExpr(a.JSONDocList, b.JSONDocList)
 }
 
 // RefOfJSONValueModifierExpr does deep equals between the two objects.
@@ -3397,7 +3395,7 @@ func (cmp *Comparator) RefOfLineStringExpr(a, b *LineStringExpr) bool {
 	if a == nil || b == nil {
 		return false
 	}
-	return cmp.Exprs(a.PointParams, b.PointParams)
+	return cmp.SliceOfExpr(a.PointParams, b.PointParams)
 }
 
 // RefOfLinestrPropertyFuncExpr does deep equals between the two objects.
@@ -3556,7 +3554,7 @@ func (cmp *Comparator) RefOfMultiLinestringExpr(a, b *MultiLinestringExpr) bool
 	if a == nil || b == nil {
 		return false
 	}
-	return cmp.Exprs(a.LinestringParams, b.LinestringParams)
+	return cmp.SliceOfExpr(a.LinestringParams, b.LinestringParams)
 }
 
 // RefOfMultiPointExpr does deep equals between the two objects.
@@ -3567,7 +3565,7 @@ func (cmp *Comparator) RefOfMultiPointExpr(a, b *MultiPointExpr) bool {
 	if a == nil || b == nil {
 		return false
 	}
-	return cmp.Exprs(a.PointParams, b.PointParams)
+	return cmp.SliceOfExpr(a.PointParams, b.PointParams)
 }
 
 // RefOfMultiPolygonExpr does deep equals between the two objects.
@@ -3578,7 +3576,7 @@ func (cmp *Comparator) RefOfMultiPolygonExpr(a, b *MultiPolygonExpr) bool {
 	if a == nil || b == nil {
 		return false
 	}
-	return cmp.Exprs(a.PolygonParams, b.PolygonParams)
+	return cmp.SliceOfExpr(a.PolygonParams, b.PolygonParams)
 }
 
 // RefOfNTHValueExpr does deep equals between the two objects.
@@ -3954,7 +3952,7 @@ func (cmp *Comparator) RefOfPolygonExpr(a, b *PolygonExpr) bool {
 	if a == nil || b == nil {
 		return false
 	}
-	return cmp.Exprs(a.LinestringParams, b.LinestringParams)
+	return cmp.SliceOfExpr(a.LinestringParams, b.LinestringParams)
 }
 
 // RefOfPolygonPropertyFuncExpr does deep equals between the two objects.
@@ -4208,7 +4206,7 @@ func (cmp *Comparator) RefOfSelect(a, b *Select) bool {
 		cmp.RefOfWith(a.With, b.With) &&
 		cmp.SliceOfTableExpr(a.From, b.From) &&
 		cmp.RefOfParsedComments(a.Comments, b.Comments) &&
-		cmp.SelectExprs(a.SelectExprs, b.SelectExprs) &&
+		cmp.RefOfSelectExprs(a.SelectExprs, b.SelectExprs) &&
 		cmp.RefOfWhere(a.Where, b.Where) &&
 		cmp.RefOfGroupBy(a.GroupBy, b.GroupBy) &&
 		cmp.RefOfWhere(a.Having, b.Having) &&
@@ -4219,17 +4217,15 @@ func (cmp *Comparator) RefOfSelect(a, b *Select) bool {
 		cmp.RefOfSelectInto(a.Into, b.Into)
 }
 
-// SelectExprs does deep equals between the two objects.
-func (cmp *Comparator) SelectExprs(a, b SelectExprs) bool {
-	if len(a) != len(b) {
-		return false
+// RefOfSelectExprs does deep equals between the two objects.
+func (cmp *Comparator) RefOfSelectExprs(a, b *SelectExprs) bool {
+	if a == b {
+		return true
 	}
-	for i := 0; i < len(a); i++ {
-		if !cmp.SelectExpr(a[i], b[i]) {
-			return false
-		}
+	if a == nil || b == nil {
+		return false
 	}
-	return true
+	return cmp.SliceOfSelectExpr(a.Exprs, b.Exprs)
 }
 
 // RefOfSelectInto does deep equals between the two objects.
@@ -5006,7 +5002,7 @@ func (cmp *Comparator) RefOfWindowSpecification(a, b *WindowSpecification) bool
 		return false
 	}
 	return cmp.IdentifierCI(a.Name, b.Name) &&
-		cmp.Exprs(a.PartitionClause, b.PartitionClause) &&
+		cmp.SliceOfExpr(a.PartitionClause, b.PartitionClause) &&
 		cmp.OrderBy(a.OrderClause, b.OrderClause) &&
 		cmp.RefOfFrameClause(a.FrameClause, b.FrameClause)
 }
@@ -7328,6 +7324,19 @@ func (cmp *Comparator) SliceOfTxAccessMode(a, b []TxAccessMode) bool {
 	return true
 }
 
+// SliceOfExpr does deep equals between the two objects.
+func (cmp *Comparator) SliceOfExpr(a, b []Expr) bool {
+	if len(a) != len(b) {
+		return false
+	}
+	for i := 0; i < len(a); i++ {
+		if !cmp.Expr(a[i], b[i]) {
+			return false
+		}
+	}
+	return true
+}
+
 // SliceOfRefOfWhen does deep equals between the two objects.
 func (cmp *Comparator) SliceOfRefOfWhen(a, b []*When) bool {
 	if len(a) != len(b) {
@@ -7423,19 +7432,6 @@ func (cmp *Comparator) SliceOfRefOfVariable(a, b []*Variable) bool {
 	return true
 }
 
-// SliceOfExpr does deep equals between the two objects.
-func (cmp *Comparator) SliceOfExpr(a, b []Expr) bool {
-	if len(a) != len(b) {
-		return false
-	}
-	for i := 0; i < len(a); i++ {
-		if !cmp.Expr(a[i], b[i]) {
-			return false
-		}
-	}
-	return true
-}
-
 // RefOfIdentifierCI does deep equals between the two objects.
 func (cmp *Comparator) RefOfIdentifierCI(a, b *IdentifierCI) bool {
 	if a == b {
@@ -7626,6 +7622,19 @@ func (cmp *Comparator) RefOfRootNode(a, b *RootNode) bool {
 	return cmp.SQLNode(a.SQLNode, b.SQLNode)
 }
 
+// SliceOfSelectExpr does deep equals between the two objects.
+func (cmp *Comparator) SliceOfSelectExpr(a, b []SelectExpr) bool {
+	if len(a) != len(b) {
+		return false
+	}
+	for i := 0; i < len(a); i++ {
+		if !cmp.SelectExpr(a[i], b[i]) {
+			return false
+		}
+	}
+	return true
+}
+
 // RefOfTableName does deep equals between the two objects.
 func (cmp *Comparator) RefOfTableName(a, b *TableName) bool {
 	if a == b {
diff --git a/go/vt/sqlparser/ast_format.go b/go/vt/sqlparser/ast_format.go
index 37539c450b2..8939af71f51 100644
--- a/go/vt/sqlparser/ast_format.go
+++ b/go/vt/sqlparser/ast_format.go
@@ -1127,7 +1127,7 @@ func (node *DeallocateStmt) Format(buf *TrackedBuffer) {
 
 // Format formats the node.
 func (node *CallProc) Format(buf *TrackedBuffer) {
-	buf.astPrintf(node, "call %v(%v)", node.Name, node.Params)
+	buf.astPrintf(node, "call %v(%n)", node.Name, node.Params)
 }
 
 // Format formats the node.
@@ -1155,9 +1155,9 @@ func (node *ParsedComments) Format(buf *TrackedBuffer) {
 }
 
 // Format formats the node.
-func (node SelectExprs) Format(buf *TrackedBuffer) {
+func (node *SelectExprs) Format(buf *TrackedBuffer) {
 	var prefix string
-	for _, n := range node {
+	for _, n := range node.Exprs {
 		buf.astPrintf(node, "%s%v", prefix, n)
 		prefix = ", "
 	}
@@ -1312,9 +1312,9 @@ func (node *Where) Format(buf *TrackedBuffer) {
 }
 
 // Format formats the node.
-func (node Exprs) Format(buf *TrackedBuffer) {
+func (node *Exprs) Format(buf *TrackedBuffer) {
 	var prefix string
-	for _, n := range node {
+	for _, n := range node.Exprs {
 		buf.astPrintf(node, "%s%v", prefix, n)
 		prefix = ", "
 	}
@@ -1499,7 +1499,13 @@ func (node *ColName) Format(buf *TrackedBuffer) {
 
 // Format formats the node.
 func (node ValTuple) Format(buf *TrackedBuffer) {
-	buf.astPrintf(node, "(%v)", Exprs(node))
+	var prefix string
+	buf.WriteString("(")
+	for _, n := range node {
+		buf.astPrintf(node, "%s%v", prefix, n)
+		prefix = ", "
+	}
+	buf.WriteString(")")
 }
 
 // Format formats the node.
@@ -1688,15 +1694,15 @@ func (node *FuncExpr) Format(buf *TrackedBuffer) {
 	} else {
 		buf.WriteString(funcName)
 	}
-	buf.astPrintf(node, "(%v)", node.Exprs)
+	buf.astPrintf(node, "(%n)", node.Exprs)
 }
 
 // Format formats the node
 func (node *GroupConcatExpr) Format(buf *TrackedBuffer) {
 	if node.Distinct {
-		buf.astPrintf(node, "group_concat(%s%v%v", DistinctStr, node.Exprs, node.OrderBy)
+		buf.astPrintf(node, "group_concat(%s%n%v", DistinctStr, node.Exprs, node.OrderBy)
 	} else {
-		buf.astPrintf(node, "group_concat(%v%v", node.Exprs, node.OrderBy)
+		buf.astPrintf(node, "group_concat(%n%v", node.Exprs, node.OrderBy)
 	}
 	if node.Separator != "" {
 		buf.astPrintf(node, " %s %#s", keywordStrings[SEPARATOR], node.Separator)
@@ -1744,7 +1750,7 @@ func (node *WindowSpecification) Format(buf *TrackedBuffer) {
 		buf.astPrintf(node, " %v", node.Name)
 	}
 	if node.PartitionClause != nil {
-		buf.astPrintf(node, " partition by %v", node.PartitionClause)
+		buf.astPrintf(node, " partition by %n", node.PartitionClause)
 	}
 	if node.OrderClause != nil {
 		buf.astPrintf(node, "%v", node.OrderClause)
@@ -1898,7 +1904,7 @@ func (node *InsertExpr) Format(buf *TrackedBuffer) {
 
 // Format formats the node.
 func (node *IntervalFuncExpr) Format(buf *TrackedBuffer) {
-	buf.astPrintf(node, "interval(%v, %v)", node.Expr, node.Exprs)
+	buf.astPrintf(node, "interval(%v, %n)", node.Expr, node.Exprs)
 }
 
 // Format formats the node.
@@ -1912,7 +1918,7 @@ func (node *LocateExpr) Format(buf *TrackedBuffer) {
 
 // Format formats the node.
 func (node *CharExpr) Format(buf *TrackedBuffer) {
-	buf.astPrintf(node, "char(%v", node.Exprs)
+	buf.astPrintf(node, "char(%n", node.Exprs)
 	if node.Charset != "" {
 		buf.astPrintf(node, " using %#s", node.Charset)
 	}
@@ -2861,7 +2867,7 @@ func (node *Count) Format(buf *TrackedBuffer) {
 	if node.Distinct {
 		buf.literal(DistinctStr)
 	}
-	buf.astPrintf(node, "%v)", node.Args)
+	buf.astPrintf(node, "%n)", node.Args)
 	if node.OverClause != nil {
 		buf.astPrintf(node, " %v", node.OverClause)
 	}
@@ -3032,12 +3038,12 @@ func (node *PointExpr) Format(buf *TrackedBuffer) {
 
 // Format formats the node.
 func (node *LineStringExpr) Format(buf *TrackedBuffer) {
-	buf.astPrintf(node, "linestring(%v)", node.PointParams)
+	buf.astPrintf(node, "linestring(%n)", node.PointParams)
 }
 
 // Format formats the node.
 func (node *PolygonExpr) Format(buf *TrackedBuffer) {
-	buf.astPrintf(node, "polygon(%v)", node.LinestringParams)
+	buf.astPrintf(node, "polygon(%n)", node.LinestringParams)
 }
 
 // Format formats the node.
@@ -3051,17 +3057,17 @@ func (node *PurgeBinaryLogs) Format(buf *TrackedBuffer) {
 }
 
 func (node *MultiPolygonExpr) Format(buf *TrackedBuffer) {
-	buf.astPrintf(node, "multipolygon(%v)", node.PolygonParams)
+	buf.astPrintf(node, "multipolygon(%n)", node.PolygonParams)
 }
 
 // Format formats the node.
 func (node *MultiPointExpr) Format(buf *TrackedBuffer) {
-	buf.astPrintf(node, "multipoint(%v)", node.PointParams)
+	buf.astPrintf(node, "multipoint(%n)", node.PointParams)
 }
 
 // Format formats the node.
 func (node *MultiLinestringExpr) Format(buf *TrackedBuffer) {
-	buf.astPrintf(node, "multilinestring(%v)", node.LinestringParams)
+	buf.astPrintf(node, "multilinestring(%n)", node.LinestringParams)
 }
 
 // Format formats the node
diff --git a/go/vt/sqlparser/ast_format_fast.go b/go/vt/sqlparser/ast_format_fast.go
index 7a818faf0c0..2a6797871eb 100644
--- a/go/vt/sqlparser/ast_format_fast.go
+++ b/go/vt/sqlparser/ast_format_fast.go
@@ -1487,7 +1487,7 @@ func (node *CallProc) FormatFast(buf *TrackedBuffer) {
 	buf.WriteString("call ")
 	node.Name.FormatFast(buf)
 	buf.WriteByte('(')
-	node.Params.FormatFast(buf)
+	buf.formatExprs(node.Params)
 	buf.WriteByte(')')
 }
 
@@ -1518,9 +1518,9 @@ func (node *ParsedComments) FormatFast(buf *TrackedBuffer) {
 }
 
 // FormatFast formats the node.
-func (node SelectExprs) FormatFast(buf *TrackedBuffer) {
+func (node *SelectExprs) FormatFast(buf *TrackedBuffer) {
 	var prefix string
-	for _, n := range node {
+	for _, n := range node.Exprs {
 		buf.WriteString(prefix)
 		n.FormatFast(buf)
 		prefix = ", "
@@ -1704,9 +1704,9 @@ func (node *Where) FormatFast(buf *TrackedBuffer) {
 }
 
 // FormatFast formats the node.
-func (node Exprs) FormatFast(buf *TrackedBuffer) {
+func (node *Exprs) FormatFast(buf *TrackedBuffer) {
 	var prefix string
-	for _, n := range node {
+	for _, n := range node.Exprs {
 		buf.WriteString(prefix)
 		n.FormatFast(buf)
 		prefix = ", "
@@ -1936,9 +1936,14 @@ func (node *ColName) FormatFast(buf *TrackedBuffer) {
 
 // FormatFast formats the node.
 func (node ValTuple) FormatFast(buf *TrackedBuffer) {
-	buf.WriteByte('(')
-	Exprs(node).FormatFast(buf)
-	buf.WriteByte(')')
+	var prefix string
+	buf.WriteString("(")
+	for _, n := range node {
+		buf.WriteString(prefix)
+		buf.printExpr(node, n, true)
+		prefix = ", "
+	}
+	buf.WriteString(")")
 }
 
 // FormatFast formats the node.
@@ -2223,7 +2228,7 @@ func (node *FuncExpr) FormatFast(buf *TrackedBuffer) {
 		buf.WriteString(funcName)
 	}
 	buf.WriteByte('(')
-	node.Exprs.FormatFast(buf)
+	buf.formatExprs(node.Exprs)
 	buf.WriteByte(')')
 }
 
@@ -2232,11 +2237,11 @@ func (node *GroupConcatExpr) FormatFast(buf *TrackedBuffer) {
 	if node.Distinct {
 		buf.WriteString("group_concat(")
 		buf.WriteString(DistinctStr)
-		node.Exprs.FormatFast(buf)
+		buf.formatExprs(node.Exprs)
 		node.OrderBy.FormatFast(buf)
 	} else {
 		buf.WriteString("group_concat(")
-		node.Exprs.FormatFast(buf)
+		buf.formatExprs(node.Exprs)
 		node.OrderBy.FormatFast(buf)
 	}
 	if node.Separator != "" {
@@ -2302,7 +2307,7 @@ func (node *WindowSpecification) FormatFast(buf *TrackedBuffer) {
 	}
 	if node.PartitionClause != nil {
 		buf.WriteString(" partition by ")
-		node.PartitionClause.FormatFast(buf)
+		buf.formatExprs(node.PartitionClause)
 	}
 	if node.OrderClause != nil {
 		node.OrderClause.FormatFast(buf)
@@ -2519,7 +2524,7 @@ func (node *IntervalFuncExpr) FormatFast(buf *TrackedBuffer) {
 	buf.WriteString("interval(")
 	buf.printExpr(node, node.Expr, true)
 	buf.WriteString(", ")
-	node.Exprs.FormatFast(buf)
+	buf.formatExprs(node.Exprs)
 	buf.WriteByte(')')
 }
 
@@ -2545,7 +2550,7 @@ func (node *LocateExpr) FormatFast(buf *TrackedBuffer) {
 // FormatFast formats the node.
 func (node *CharExpr) FormatFast(buf *TrackedBuffer) {
 	buf.WriteString("char(")
-	node.Exprs.FormatFast(buf)
+	buf.formatExprs(node.Exprs)
 	if node.Charset != "" {
 		buf.WriteString(" using ")
 		buf.WriteString(node.Charset)
@@ -3760,7 +3765,7 @@ func (node *Count) FormatFast(buf *TrackedBuffer) {
 	if node.Distinct {
 		buf.WriteString(DistinctStr)
 	}
-	node.Args.FormatFast(buf)
+	buf.formatExprs(node.Args)
 	buf.WriteByte(')')
 	if node.OverClause != nil {
 		buf.WriteByte(' ')
@@ -3984,14 +3989,14 @@ func (node *PointExpr) FormatFast(buf *TrackedBuffer) {
 // FormatFast formats the node.
 func (node *LineStringExpr) FormatFast(buf *TrackedBuffer) {
 	buf.WriteString("linestring(")
-	node.PointParams.FormatFast(buf)
+	buf.formatExprs(node.PointParams)
 	buf.WriteByte(')')
 }
 
 // FormatFast formats the node.
 func (node *PolygonExpr) FormatFast(buf *TrackedBuffer) {
 	buf.WriteString("polygon(")
-	node.LinestringParams.FormatFast(buf)
+	buf.formatExprs(node.LinestringParams)
 	buf.WriteByte(')')
 }
 
@@ -4011,21 +4016,21 @@ func (node *PurgeBinaryLogs) FormatFast(buf *TrackedBuffer) {
 
 func (node *MultiPolygonExpr) FormatFast(buf *TrackedBuffer) {
 	buf.WriteString("multipolygon(")
-	node.PolygonParams.FormatFast(buf)
+	buf.formatExprs(node.PolygonParams)
 	buf.WriteByte(')')
 }
 
 // FormatFast formats the node.
 func (node *MultiPointExpr) FormatFast(buf *TrackedBuffer) {
 	buf.WriteString("multipoint(")
-	node.PointParams.FormatFast(buf)
+	buf.formatExprs(node.PointParams)
 	buf.WriteByte(')')
 }
 
 // FormatFast formats the node.
 func (node *MultiLinestringExpr) FormatFast(buf *TrackedBuffer) {
 	buf.WriteString("multilinestring(")
-	node.LinestringParams.FormatFast(buf)
+	buf.formatExprs(node.LinestringParams)
 	buf.WriteByte(')')
 }
 
diff --git a/go/vt/sqlparser/ast_format_test.go b/go/vt/sqlparser/ast_format_test.go
new file mode 100644
index 00000000000..5ea4e5e3d2f
--- /dev/null
+++ b/go/vt/sqlparser/ast_format_test.go
@@ -0,0 +1,35 @@
+/*
+Copyright 2025 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 sqlparser
+
+import (
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+)
+
+func TestColNamesInSlice(t *testing.T) {
+	c1 := NewColName("a1")
+	c2 := NewColName("a2")
+	exprs := []Expr{
+		c1,
+		c2,
+	}
+
+	result := SliceString(exprs)
+	assert.Equal(t, "a1, a2", result)
+}
diff --git a/go/vt/sqlparser/ast_funcs.go b/go/vt/sqlparser/ast_funcs.go
index 2da783af3df..ba7648778e3 100644
--- a/go/vt/sqlparser/ast_funcs.go
+++ b/go/vt/sqlparser/ast_funcs.go
@@ -890,7 +890,7 @@ func NewLimitWithoutOffset(rowCount int) *Limit {
 // NewSelect is used to create a select statement
 func NewSelect(
 	comments Comments,
-	exprs SelectExprs,
+	exprs *SelectExprs,
 	selectOptions []string,
 	into *SelectInto,
 	from TableExprs,
@@ -1195,8 +1195,25 @@ func compliantName(in string) string {
 	return buf.String()
 }
 
-func (node *Select) AddSelectExprs(selectExprs SelectExprs) {
-	node.SelectExprs = append(node.SelectExprs, selectExprs...)
+func (node *Select) AddSelectExprs(selectExprs *SelectExprs) {
+	if node.SelectExprs == nil {
+		node.SelectExprs = &SelectExprs{}
+	}
+	node.SelectExprs.Exprs = append(node.SelectExprs.Exprs, selectExprs.Exprs...)
+}
+
+func (node *Select) AddSelectExpr(expr SelectExpr) {
+	if node.SelectExprs == nil {
+		node.SelectExprs = &SelectExprs{}
+	}
+	node.SelectExprs.Exprs = append(node.SelectExprs.Exprs, expr)
+}
+
+func (node *Select) SetSelectExprs(exprs ...SelectExpr) {
+	if node.SelectExprs == nil {
+		node.SelectExprs = &SelectExprs{}
+	}
+	node.SelectExprs.Exprs = exprs
 }
 
 // AddOrder adds an order by element
@@ -1256,12 +1273,18 @@ func (node *Select) IsDistinct() bool {
 
 // GetColumnCount return SelectExprs count.
 func (node *Select) GetColumnCount() int {
-	return len(node.SelectExprs)
+	if node.SelectExprs == nil {
+		return 0
+	}
+	return len(node.SelectExprs.Exprs)
 }
 
 // GetColumns gets the columns
-func (node *Select) GetColumns() SelectExprs {
-	return node.SelectExprs
+func (node *Select) GetColumns() []SelectExpr {
+	if node.SelectExprs == nil {
+		return nil
+	}
+	return node.SelectExprs.Exprs
 }
 
 // SetComments implements the Commented interface
@@ -1362,7 +1385,7 @@ func (node *Union) GetLimit() *Limit {
 }
 
 // GetColumns gets the columns
-func (node *Union) GetColumns() SelectExprs {
+func (node *Union) GetColumns() []SelectExpr {
 	return node.Left.GetColumns()
 }
 
@@ -2354,7 +2377,7 @@ func ContainsAggregation(e SQLNode) bool {
 }
 
 // setFuncArgs sets the arguments for the aggregation function, while checking that there is only one argument
-func setFuncArgs(aggr AggrFunc, exprs Exprs, name string) error {
+func setFuncArgs(aggr AggrFunc, exprs []Expr, name string) error {
 	if len(exprs) != 1 {
 		return vterrors.VT03001(name)
 	}
@@ -2410,8 +2433,8 @@ func (ae *AliasedExpr) ColumnName() string {
 }
 
 // AllAggregation returns true if all the expressions contain aggregation
-func (s SelectExprs) AllAggregation() bool {
-	for _, k := range s {
+func (s *SelectExprs) AllAggregation() bool {
+	for _, k := range s.Exprs {
 		if !ContainsAggregation(k) {
 			return false
 		}
@@ -3070,14 +3093,27 @@ func (node *ValuesStatement) GetColumnCount() int {
 	panic("no columns available") // TODO: we need a better solution than a panic
 }
 
-func (node *ValuesStatement) GetColumns() (result SelectExprs) {
+func (node *ValuesStatement) GetColumns() []SelectExpr {
+	var sel []SelectExpr
 	columnCount := node.GetColumnCount()
 	for i := range columnCount {
-		result = append(result, &AliasedExpr{Expr: NewColName(fmt.Sprintf("column_%d", i))})
+		sel = append(sel, &AliasedExpr{Expr: NewColName(fmt.Sprintf("column_%d", i))})
 	}
+	_ = sel
 	panic("no columns available") // TODO: we need a better solution than a panic
 }
 
 func (node *ValuesStatement) SetComments(comments Comments) {}
 
 func (node *ValuesStatement) GetParsedComments() *ParsedComments { return nil }
+
+func NewFuncExpr(name string, exprs ...Expr) *FuncExpr {
+	return &FuncExpr{
+		Name:  NewIdentifierCI(name),
+		Exprs: exprs,
+	}
+}
+
+func NewExprs(exprs ...Expr) *Exprs {
+	return &Exprs{Exprs: exprs}
+}
diff --git a/go/vt/sqlparser/ast_rewrite.go b/go/vt/sqlparser/ast_rewrite.go
index 690b381b082..a4cfeb4f01c 100644
--- a/go/vt/sqlparser/ast_rewrite.go
+++ b/go/vt/sqlparser/ast_rewrite.go
@@ -160,8 +160,8 @@ func (a *application) rewriteSQLNode(parent SQLNode, node SQLNode, replacer repl
 		return a.rewriteRefOfExplainStmt(parent, node, replacer)
 	case *ExplainTab:
 		return a.rewriteRefOfExplainTab(parent, node, replacer)
-	case Exprs:
-		return a.rewriteExprs(parent, node, replacer)
+	case *Exprs:
+		return a.rewriteRefOfExprs(parent, node, replacer)
 	case *ExtractFuncExpr:
 		return a.rewriteRefOfExtractFuncExpr(parent, node, replacer)
 	case *ExtractValueExpr:
@@ -434,8 +434,8 @@ func (a *application) rewriteSQLNode(parent SQLNode, node SQLNode, replacer repl
 		return a.rewriteRefOfSavepoint(parent, node, replacer)
 	case *Select:
 		return a.rewriteRefOfSelect(parent, node, replacer)
-	case SelectExprs:
-		return a.rewriteSelectExprs(parent, node, replacer)
+	case *SelectExprs:
+		return a.rewriteRefOfSelectExprs(parent, node, replacer)
 	case *SelectInto:
 		return a.rewriteRefOfSelectInto(parent, node, replacer)
 	case *Set:
@@ -577,7 +577,12 @@ func (a *application) rewriteRefOfAddColumns(parent SQLNode, node *AddColumns, r
 		a.cur.replacer = replacer
 		a.cur.parent = parent
 		a.cur.node = node
-		if !a.pre(&a.cur) {
+		kontinue := !a.pre(&a.cur)
+		if a.cur.revisit {
+			a.cur.revisit = false
+			return a.rewriteSQLNode(parent, a.cur.node, replacer)
+		}
+		if kontinue {
 			return true
 		}
 	}
@@ -613,7 +618,12 @@ func (a *application) rewriteRefOfAddConstraintDefinition(parent SQLNode, node *
 		a.cur.replacer = replacer
 		a.cur.parent = parent
 		a.cur.node = node
-		if !a.pre(&a.cur) {
+		kontinue := !a.pre(&a.cur)
+		if a.cur.revisit {
+			a.cur.revisit = false
+			return a.rewriteSQLNode(parent, a.cur.node, replacer)
+		}
+		if kontinue {
 			return true
 		}
 	}
@@ -640,7 +650,12 @@ func (a *application) rewriteRefOfAddIndexDefinition(parent SQLNode, node *AddIn
 		a.cur.replacer = replacer
 		a.cur.parent = parent
 		a.cur.node = node
-		if !a.pre(&a.cur) {
+		kontinue := !a.pre(&a.cur)
+		if a.cur.revisit {
+			a.cur.revisit = false
+			return a.rewriteSQLNode(parent, a.cur.node, replacer)
+		}
+		if kontinue {
 			return true
 		}
 	}
@@ -667,7 +682,12 @@ func (a *application) rewriteRefOfAliasedExpr(parent SQLNode, node *AliasedExpr,
 		a.cur.replacer = replacer
 		a.cur.parent = parent
 		a.cur.node = node
-		if !a.pre(&a.cur) {
+		kontinue := !a.pre(&a.cur)
+		if a.cur.revisit {
+			a.cur.revisit = false
+			return a.rewriteSQLNode(parent, a.cur.node, replacer)
+		}
+		if kontinue {
 			return true
 		}
 	}
@@ -699,7 +719,12 @@ func (a *application) rewriteRefOfAliasedTableExpr(parent SQLNode, node *Aliased
 		a.cur.replacer = replacer
 		a.cur.parent = parent
 		a.cur.node = node
-		if !a.pre(&a.cur) {
+		kontinue := !a.pre(&a.cur)
+		if a.cur.revisit {
+			a.cur.revisit = false
+			return a.rewriteSQLNode(parent, a.cur.node, replacer)
+		}
+		if kontinue {
 			return true
 		}
 	}
@@ -746,7 +771,12 @@ func (a *application) rewriteRefOfAlterCharset(parent SQLNode, node *AlterCharse
 		a.cur.replacer = replacer
 		a.cur.parent = parent
 		a.cur.node = node
-		if !a.pre(&a.cur) {
+		kontinue := !a.pre(&a.cur)
+		if a.cur.revisit {
+			a.cur.revisit = false
+			return a.rewriteSQLNode(parent, a.cur.node, replacer)
+		}
+		if kontinue {
 			return true
 		}
 	}
@@ -770,7 +800,12 @@ func (a *application) rewriteRefOfAlterCheck(parent SQLNode, node *AlterCheck, r
 		a.cur.replacer = replacer
 		a.cur.parent = parent
 		a.cur.node = node
-		if !a.pre(&a.cur) {
+		kontinue := !a.pre(&a.cur)
+		if a.cur.revisit {
+			a.cur.revisit = false
+			return a.rewriteSQLNode(parent, a.cur.node, replacer)
+		}
+		if kontinue {
 			return true
 		}
 	}
@@ -797,7 +832,12 @@ func (a *application) rewriteRefOfAlterColumn(parent SQLNode, node *AlterColumn,
 		a.cur.replacer = replacer
 		a.cur.parent = parent
 		a.cur.node = node
-		if !a.pre(&a.cur) {
+		kontinue := !a.pre(&a.cur)
+		if a.cur.revisit {
+			a.cur.revisit = false
+			return a.rewriteSQLNode(parent, a.cur.node, replacer)
+		}
+		if kontinue {
 			return true
 		}
 	}
@@ -829,7 +869,12 @@ func (a *application) rewriteRefOfAlterDatabase(parent SQLNode, node *AlterDatab
 		a.cur.replacer = replacer
 		a.cur.parent = parent
 		a.cur.node = node
-		if !a.pre(&a.cur) {
+		kontinue := !a.pre(&a.cur)
+		if a.cur.revisit {
+			a.cur.revisit = false
+			return a.rewriteSQLNode(parent, a.cur.node, replacer)
+		}
+		if kontinue {
 			return true
 		}
 	}
@@ -861,7 +906,12 @@ func (a *application) rewriteRefOfAlterIndex(parent SQLNode, node *AlterIndex, r
 		a.cur.replacer = replacer
 		a.cur.parent = parent
 		a.cur.node = node
-		if !a.pre(&a.cur) {
+		kontinue := !a.pre(&a.cur)
+		if a.cur.revisit {
+			a.cur.revisit = false
+			return a.rewriteSQLNode(parent, a.cur.node, replacer)
+		}
+		if kontinue {
 			return true
 		}
 	}
@@ -888,7 +938,12 @@ func (a *application) rewriteRefOfAlterMigration(parent SQLNode, node *AlterMigr
 		a.cur.replacer = replacer
 		a.cur.parent = parent
 		a.cur.node = node
-		if !a.pre(&a.cur) {
+		kontinue := !a.pre(&a.cur)
+		if a.cur.revisit {
+			a.cur.revisit = false
+			return a.rewriteSQLNode(parent, a.cur.node, replacer)
+		}
+		if kontinue {
 			return true
 		}
 	}
@@ -915,7 +970,12 @@ func (a *application) rewriteRefOfAlterTable(parent SQLNode, node *AlterTable, r
 		a.cur.replacer = replacer
 		a.cur.parent = parent
 		a.cur.node = node
-		if !a.pre(&a.cur) {
+		kontinue := !a.pre(&a.cur)
+		if a.cur.revisit {
+			a.cur.revisit = false
+			return a.rewriteSQLNode(parent, a.cur.node, replacer)
+		}
+		if kontinue {
 			return true
 		}
 	}
@@ -966,7 +1026,12 @@ func (a *application) rewriteRefOfAlterView(parent SQLNode, node *AlterView, rep
 		a.cur.replacer = replacer
 		a.cur.parent = parent
 		a.cur.node = node
-		if !a.pre(&a.cur) {
+		kontinue := !a.pre(&a.cur)
+		if a.cur.revisit {
+			a.cur.revisit = false
+			return a.rewriteSQLNode(parent, a.cur.node, replacer)
+		}
+		if kontinue {
 			return true
 		}
 	}
@@ -1013,7 +1078,12 @@ func (a *application) rewriteRefOfAlterVschema(parent SQLNode, node *AlterVschem
 		a.cur.replacer = replacer
 		a.cur.parent = parent
 		a.cur.node = node
-		if !a.pre(&a.cur) {
+		kontinue := !a.pre(&a.cur)
+		if a.cur.revisit {
+			a.cur.revisit = false
+			return a.rewriteSQLNode(parent, a.cur.node, replacer)
+		}
+		if kontinue {
 			return true
 		}
 	}
@@ -1059,7 +1129,12 @@ func (a *application) rewriteRefOfAnalyze(parent SQLNode, node *Analyze, replace
 		a.cur.replacer = replacer
 		a.cur.parent = parent
 		a.cur.node = node
-		if !a.pre(&a.cur) {
+		kontinue := !a.pre(&a.cur)
+		if a.cur.revisit {
+			a.cur.revisit = false
+			return a.rewriteSQLNode(parent, a.cur.node, replacer)
+		}
+		if kontinue {
 			return true
 		}
 	}
@@ -1089,7 +1164,7 @@ func (a *application) rewriteRefOfAndExpr(parent SQLNode, node *AndExpr, replace
 		kontinue := !a.pre(&a.cur)
 		if a.cur.revisit {
 			a.cur.revisit = false
-			return a.rewriteExpr(parent, a.cur.node.(Expr), replacer)
+			return a.rewriteSQLNode(parent, a.cur.node, replacer)
 		}
 		if kontinue {
 			return true
@@ -1126,7 +1201,7 @@ func (a *application) rewriteRefOfAnyValue(parent SQLNode, node *AnyValue, repla
 		kontinue := !a.pre(&a.cur)
 		if a.cur.revisit {
 			a.cur.revisit = false
-			return a.rewriteExpr(parent, a.cur.node.(Expr), replacer)
+			return a.rewriteSQLNode(parent, a.cur.node, replacer)
 		}
 		if kontinue {
 			return true
@@ -1158,7 +1233,7 @@ func (a *application) rewriteRefOfArgument(parent SQLNode, node *Argument, repla
 		kontinue := !a.pre(&a.cur)
 		if a.cur.revisit {
 			a.cur.revisit = false
-			return a.rewriteExpr(parent, a.cur.node.(Expr), replacer)
+			return a.rewriteSQLNode(parent, a.cur.node, replacer)
 		}
 		if kontinue {
 			return true
@@ -1187,7 +1262,7 @@ func (a *application) rewriteRefOfArgumentLessWindowExpr(parent SQLNode, node *A
 		kontinue := !a.pre(&a.cur)
 		if a.cur.revisit {
 			a.cur.revisit = false
-			return a.rewriteExpr(parent, a.cur.node.(Expr), replacer)
+			return a.rewriteSQLNode(parent, a.cur.node, replacer)
 		}
 		if kontinue {
 			return true
@@ -1219,7 +1294,7 @@ func (a *application) rewriteRefOfAssignmentExpr(parent SQLNode, node *Assignmen
 		kontinue := !a.pre(&a.cur)
 		if a.cur.revisit {
 			a.cur.revisit = false
-			return a.rewriteExpr(parent, a.cur.node.(Expr), replacer)
+			return a.rewriteSQLNode(parent, a.cur.node, replacer)
 		}
 		if kontinue {
 			return true
@@ -1253,7 +1328,12 @@ func (a *application) rewriteRefOfAutoIncSpec(parent SQLNode, node *AutoIncSpec,
 		a.cur.replacer = replacer
 		a.cur.parent = parent
 		a.cur.node = node
-		if !a.pre(&a.cur) {
+		kontinue := !a.pre(&a.cur)
+		if a.cur.revisit {
+			a.cur.revisit = false
+			return a.rewriteSQLNode(parent, a.cur.node, replacer)
+		}
+		if kontinue {
 			return true
 		}
 	}
@@ -1288,7 +1368,7 @@ func (a *application) rewriteRefOfAvg(parent SQLNode, node *Avg, replacer replac
 		kontinue := !a.pre(&a.cur)
 		if a.cur.revisit {
 			a.cur.revisit = false
-			return a.rewriteExpr(parent, a.cur.node.(Expr), replacer)
+			return a.rewriteSQLNode(parent, a.cur.node, replacer)
 		}
 		if kontinue {
 			return true
@@ -1322,7 +1402,12 @@ func (a *application) rewriteRefOfBegin(parent SQLNode, node *Begin, replacer re
 		a.cur.replacer = replacer
 		a.cur.parent = parent
 		a.cur.node = node
-		if !a.pre(&a.cur) {
+		kontinue := !a.pre(&a.cur)
+		if a.cur.revisit {
+			a.cur.revisit = false
+			return a.rewriteSQLNode(parent, a.cur.node, replacer)
+		}
+		if kontinue {
 			return true
 		}
 	}
@@ -1349,7 +1434,7 @@ func (a *application) rewriteRefOfBetweenExpr(parent SQLNode, node *BetweenExpr,
 		kontinue := !a.pre(&a.cur)
 		if a.cur.revisit {
 			a.cur.revisit = false
-			return a.rewriteExpr(parent, a.cur.node.(Expr), replacer)
+			return a.rewriteSQLNode(parent, a.cur.node, replacer)
 		}
 		if kontinue {
 			return true
@@ -1391,7 +1476,7 @@ func (a *application) rewriteRefOfBinaryExpr(parent SQLNode, node *BinaryExpr, r
 		kontinue := !a.pre(&a.cur)
 		if a.cur.revisit {
 			a.cur.revisit = false
-			return a.rewriteExpr(parent, a.cur.node.(Expr), replacer)
+			return a.rewriteSQLNode(parent, a.cur.node, replacer)
 		}
 		if kontinue {
 			return true
@@ -1428,7 +1513,7 @@ func (a *application) rewriteRefOfBitAnd(parent SQLNode, node *BitAnd, replacer
 		kontinue := !a.pre(&a.cur)
 		if a.cur.revisit {
 			a.cur.revisit = false
-			return a.rewriteExpr(parent, a.cur.node.(Expr), replacer)
+			return a.rewriteSQLNode(parent, a.cur.node, replacer)
 		}
 		if kontinue {
 			return true
@@ -1465,7 +1550,7 @@ func (a *application) rewriteRefOfBitOr(parent SQLNode, node *BitOr, replacer re
 		kontinue := !a.pre(&a.cur)
 		if a.cur.revisit {
 			a.cur.revisit = false
-			return a.rewriteExpr(parent, a.cur.node.(Expr), replacer)
+			return a.rewriteSQLNode(parent, a.cur.node, replacer)
 		}
 		if kontinue {
 			return true
@@ -1502,7 +1587,7 @@ func (a *application) rewriteRefOfBitXor(parent SQLNode, node *BitXor, replacer
 		kontinue := !a.pre(&a.cur)
 		if a.cur.revisit {
 			a.cur.revisit = false
-			return a.rewriteExpr(parent, a.cur.node.(Expr), replacer)
+			return a.rewriteSQLNode(parent, a.cur.node, replacer)
 		}
 		if kontinue {
 			return true
@@ -1536,7 +1621,12 @@ func (a *application) rewriteRefOfCallProc(parent SQLNode, node *CallProc, repla
 		a.cur.replacer = replacer
 		a.cur.parent = parent
 		a.cur.node = node
-		if !a.pre(&a.cur) {
+		kontinue := !a.pre(&a.cur)
+		if a.cur.revisit {
+			a.cur.revisit = false
+			return a.rewriteSQLNode(parent, a.cur.node, replacer)
+		}
+		if kontinue {
 			return true
 		}
 	}
@@ -1545,10 +1635,14 @@ func (a *application) rewriteRefOfCallProc(parent SQLNode, node *CallProc, repla
 	}) {
 		return false
 	}
-	if !a.rewriteExprs(node, node.Params, func(newNode, parent SQLNode) {
-		parent.(*CallProc).Params = newNode.(Exprs)
-	}) {
-		return false
+	for x, el := range node.Params {
+		if !a.rewriteExpr(node, el, func(idx int) replacerFunc {
+			return func(newNode, parent SQLNode) {
+				parent.(*CallProc).Params[idx] = newNode.(Expr)
+			}
+		}(x)) {
+			return false
+		}
 	}
 	if a.post != nil {
 		a.cur.replacer = replacer
@@ -1571,7 +1665,7 @@ func (a *application) rewriteRefOfCaseExpr(parent SQLNode, node *CaseExpr, repla
 		kontinue := !a.pre(&a.cur)
 		if a.cur.revisit {
 			a.cur.revisit = false
-			return a.rewriteExpr(parent, a.cur.node.(Expr), replacer)
+			return a.rewriteSQLNode(parent, a.cur.node, replacer)
 		}
 		if kontinue {
 			return true
@@ -1617,7 +1711,7 @@ func (a *application) rewriteRefOfCastExpr(parent SQLNode, node *CastExpr, repla
 		kontinue := !a.pre(&a.cur)
 		if a.cur.revisit {
 			a.cur.revisit = false
-			return a.rewriteExpr(parent, a.cur.node.(Expr), replacer)
+			return a.rewriteSQLNode(parent, a.cur.node, replacer)
 		}
 		if kontinue {
 			return true
@@ -1651,7 +1745,12 @@ func (a *application) rewriteRefOfChangeColumn(parent SQLNode, node *ChangeColum
 		a.cur.replacer = replacer
 		a.cur.parent = parent
 		a.cur.node = node
-		if !a.pre(&a.cur) {
+		kontinue := !a.pre(&a.cur)
+		if a.cur.revisit {
+			a.cur.revisit = false
+			return a.rewriteSQLNode(parent, a.cur.node, replacer)
+		}
+		if kontinue {
 			return true
 		}
 	}
@@ -1691,16 +1790,20 @@ func (a *application) rewriteRefOfCharExpr(parent SQLNode, node *CharExpr, repla
 		kontinue := !a.pre(&a.cur)
 		if a.cur.revisit {
 			a.cur.revisit = false
-			return a.rewriteExpr(parent, a.cur.node.(Expr), replacer)
+			return a.rewriteSQLNode(parent, a.cur.node, replacer)
 		}
 		if kontinue {
 			return true
 		}
 	}
-	if !a.rewriteExprs(node, node.Exprs, func(newNode, parent SQLNode) {
-		parent.(*CharExpr).Exprs = newNode.(Exprs)
-	}) {
-		return false
+	for x, el := range node.Exprs {
+		if !a.rewriteExpr(node, el, func(idx int) replacerFunc {
+			return func(newNode, parent SQLNode) {
+				parent.(*CharExpr).Exprs[idx] = newNode.(Expr)
+			}
+		}(x)) {
+			return false
+		}
 	}
 	if a.post != nil {
 		a.cur.replacer = replacer
@@ -1720,7 +1823,12 @@ func (a *application) rewriteRefOfCheckConstraintDefinition(parent SQLNode, node
 		a.cur.replacer = replacer
 		a.cur.parent = parent
 		a.cur.node = node
-		if !a.pre(&a.cur) {
+		kontinue := !a.pre(&a.cur)
+		if a.cur.revisit {
+			a.cur.revisit = false
+			return a.rewriteSQLNode(parent, a.cur.node, replacer)
+		}
+		if kontinue {
 			return true
 		}
 	}
@@ -1750,7 +1858,7 @@ func (a *application) rewriteRefOfColName(parent SQLNode, node *ColName, replace
 		kontinue := !a.pre(&a.cur)
 		if a.cur.revisit {
 			a.cur.revisit = false
-			return a.rewriteExpr(parent, a.cur.node.(Expr), replacer)
+			return a.rewriteSQLNode(parent, a.cur.node, replacer)
 		}
 		if kontinue {
 			return true
@@ -1787,7 +1895,7 @@ func (a *application) rewriteRefOfCollateExpr(parent SQLNode, node *CollateExpr,
 		kontinue := !a.pre(&a.cur)
 		if a.cur.revisit {
 			a.cur.revisit = false
-			return a.rewriteExpr(parent, a.cur.node.(Expr), replacer)
+			return a.rewriteSQLNode(parent, a.cur.node, replacer)
 		}
 		if kontinue {
 			return true
@@ -1816,7 +1924,12 @@ func (a *application) rewriteRefOfColumnDefinition(parent SQLNode, node *ColumnD
 		a.cur.replacer = replacer
 		a.cur.parent = parent
 		a.cur.node = node
-		if !a.pre(&a.cur) {
+		kontinue := !a.pre(&a.cur)
+		if a.cur.revisit {
+			a.cur.revisit = false
+			return a.rewriteSQLNode(parent, a.cur.node, replacer)
+		}
+		if kontinue {
 			return true
 		}
 	}
@@ -1848,7 +1961,12 @@ func (a *application) rewriteRefOfColumnType(parent SQLNode, node *ColumnType, r
 		a.cur.replacer = replacer
 		a.cur.parent = parent
 		a.cur.node = node
-		if !a.pre(&a.cur) {
+		kontinue := !a.pre(&a.cur)
+		if a.cur.revisit {
+			a.cur.revisit = false
+			return a.rewriteSQLNode(parent, a.cur.node, replacer)
+		}
+		if kontinue {
 			return true
 		}
 	}
@@ -1874,9 +1992,8 @@ func (a *application) rewriteColumns(parent SQLNode, node Columns, replacer repl
 		a.cur.node = node
 		kontinue := !a.pre(&a.cur)
 		if a.cur.revisit {
-			node = a.cur.node.(Columns)
 			a.cur.revisit = false
-			return a.rewriteColumns(parent, node, replacer)
+			return a.rewriteSQLNode(parent, a.cur.node, replacer)
 		}
 		if kontinue {
 			return true
@@ -1909,7 +2026,12 @@ func (a *application) rewriteRefOfCommentOnly(parent SQLNode, node *CommentOnly,
 		a.cur.replacer = replacer
 		a.cur.parent = parent
 		a.cur.node = node
-		if !a.pre(&a.cur) {
+		kontinue := !a.pre(&a.cur)
+		if a.cur.revisit {
+			a.cur.revisit = false
+			return a.rewriteSQLNode(parent, a.cur.node, replacer)
+		}
+		if kontinue {
 			return true
 		}
 	}
@@ -1933,7 +2055,12 @@ func (a *application) rewriteRefOfCommit(parent SQLNode, node *Commit, replacer
 		a.cur.replacer = replacer
 		a.cur.parent = parent
 		a.cur.node = node
-		if !a.pre(&a.cur) {
+		kontinue := !a.pre(&a.cur)
+		if a.cur.revisit {
+			a.cur.revisit = false
+			return a.rewriteSQLNode(parent, a.cur.node, replacer)
+		}
+		if kontinue {
 			return true
 		}
 	}
@@ -1957,7 +2084,12 @@ func (a *application) rewriteRefOfCommonTableExpr(parent SQLNode, node *CommonTa
 		a.cur.replacer = replacer
 		a.cur.parent = parent
 		a.cur.node = node
-		if !a.pre(&a.cur) {
+		kontinue := !a.pre(&a.cur)
+		if a.cur.revisit {
+			a.cur.revisit = false
+			return a.rewriteSQLNode(parent, a.cur.node, replacer)
+		}
+		if kontinue {
 			return true
 		}
 	}
@@ -1997,7 +2129,7 @@ func (a *application) rewriteRefOfComparisonExpr(parent SQLNode, node *Compariso
 		kontinue := !a.pre(&a.cur)
 		if a.cur.revisit {
 			a.cur.revisit = false
-			return a.rewriteExpr(parent, a.cur.node.(Expr), replacer)
+			return a.rewriteSQLNode(parent, a.cur.node, replacer)
 		}
 		if kontinue {
 			return true
@@ -2036,7 +2168,12 @@ func (a *application) rewriteRefOfConstraintDefinition(parent SQLNode, node *Con
 		a.cur.replacer = replacer
 		a.cur.parent = parent
 		a.cur.node = node
-		if !a.pre(&a.cur) {
+		kontinue := !a.pre(&a.cur)
+		if a.cur.revisit {
+			a.cur.revisit = false
+			return a.rewriteSQLNode(parent, a.cur.node, replacer)
+		}
+		if kontinue {
 			return true
 		}
 	}
@@ -2071,7 +2208,7 @@ func (a *application) rewriteRefOfConvertExpr(parent SQLNode, node *ConvertExpr,
 		kontinue := !a.pre(&a.cur)
 		if a.cur.revisit {
 			a.cur.revisit = false
-			return a.rewriteExpr(parent, a.cur.node.(Expr), replacer)
+			return a.rewriteSQLNode(parent, a.cur.node, replacer)
 		}
 		if kontinue {
 			return true
@@ -2105,7 +2242,12 @@ func (a *application) rewriteRefOfConvertType(parent SQLNode, node *ConvertType,
 		a.cur.replacer = replacer
 		a.cur.parent = parent
 		a.cur.node = node
-		if !a.pre(&a.cur) {
+		kontinue := !a.pre(&a.cur)
+		if a.cur.revisit {
+			a.cur.revisit = false
+			return a.rewriteSQLNode(parent, a.cur.node, replacer)
+		}
+		if kontinue {
 			return true
 		}
 	}
@@ -2132,7 +2274,7 @@ func (a *application) rewriteRefOfConvertUsingExpr(parent SQLNode, node *Convert
 		kontinue := !a.pre(&a.cur)
 		if a.cur.revisit {
 			a.cur.revisit = false
-			return a.rewriteExpr(parent, a.cur.node.(Expr), replacer)
+			return a.rewriteSQLNode(parent, a.cur.node, replacer)
 		}
 		if kontinue {
 			return true
@@ -2164,16 +2306,20 @@ func (a *application) rewriteRefOfCount(parent SQLNode, node *Count, replacer re
 		kontinue := !a.pre(&a.cur)
 		if a.cur.revisit {
 			a.cur.revisit = false
-			return a.rewriteExpr(parent, a.cur.node.(Expr), replacer)
+			return a.rewriteSQLNode(parent, a.cur.node, replacer)
 		}
 		if kontinue {
 			return true
 		}
 	}
-	if !a.rewriteExprs(node, node.Args, func(newNode, parent SQLNode) {
-		parent.(*Count).Args = newNode.(Exprs)
-	}) {
-		return false
+	for x, el := range node.Args {
+		if !a.rewriteExpr(node, el, func(idx int) replacerFunc {
+			return func(newNode, parent SQLNode) {
+				parent.(*Count).Args[idx] = newNode.(Expr)
+			}
+		}(x)) {
+			return false
+		}
 	}
 	if !a.rewriteRefOfOverClause(node, node.OverClause, func(newNode, parent SQLNode) {
 		parent.(*Count).OverClause = newNode.(*OverClause)
@@ -2201,7 +2347,7 @@ func (a *application) rewriteRefOfCountStar(parent SQLNode, node *CountStar, rep
 		kontinue := !a.pre(&a.cur)
 		if a.cur.revisit {
 			a.cur.revisit = false
-			return a.rewriteExpr(parent, a.cur.node.(Expr), replacer)
+			return a.rewriteSQLNode(parent, a.cur.node, replacer)
 		}
 		if kontinue {
 			return true
@@ -2230,7 +2376,12 @@ func (a *application) rewriteRefOfCreateDatabase(parent SQLNode, node *CreateDat
 		a.cur.replacer = replacer
 		a.cur.parent = parent
 		a.cur.node = node
-		if !a.pre(&a.cur) {
+		kontinue := !a.pre(&a.cur)
+		if a.cur.revisit {
+			a.cur.revisit = false
+			return a.rewriteSQLNode(parent, a.cur.node, replacer)
+		}
+		if kontinue {
 			return true
 		}
 	}
@@ -2262,7 +2413,12 @@ func (a *application) rewriteRefOfCreateTable(parent SQLNode, node *CreateTable,
 		a.cur.replacer = replacer
 		a.cur.parent = parent
 		a.cur.node = node
-		if !a.pre(&a.cur) {
+		kontinue := !a.pre(&a.cur)
+		if a.cur.revisit {
+			a.cur.revisit = false
+			return a.rewriteSQLNode(parent, a.cur.node, replacer)
+		}
+		if kontinue {
 			return true
 		}
 	}
@@ -2304,7 +2460,12 @@ func (a *application) rewriteRefOfCreateView(parent SQLNode, node *CreateView, r
 		a.cur.replacer = replacer
 		a.cur.parent = parent
 		a.cur.node = node
-		if !a.pre(&a.cur) {
+		kontinue := !a.pre(&a.cur)
+		if a.cur.revisit {
+			a.cur.revisit = false
+			return a.rewriteSQLNode(parent, a.cur.node, replacer)
+		}
+		if kontinue {
 			return true
 		}
 	}
@@ -2354,7 +2515,7 @@ func (a *application) rewriteRefOfCurTimeFuncExpr(parent SQLNode, node *CurTimeF
 		kontinue := !a.pre(&a.cur)
 		if a.cur.revisit {
 			a.cur.revisit = false
-			return a.rewriteExpr(parent, a.cur.node.(Expr), replacer)
+			return a.rewriteSQLNode(parent, a.cur.node, replacer)
 		}
 		if kontinue {
 			return true
@@ -2383,7 +2544,12 @@ func (a *application) rewriteRefOfDeallocateStmt(parent SQLNode, node *Deallocat
 		a.cur.replacer = replacer
 		a.cur.parent = parent
 		a.cur.node = node
-		if !a.pre(&a.cur) {
+		kontinue := !a.pre(&a.cur)
+		if a.cur.revisit {
+			a.cur.revisit = false
+			return a.rewriteSQLNode(parent, a.cur.node, replacer)
+		}
+		if kontinue {
 			return true
 		}
 	}
@@ -2418,7 +2584,7 @@ func (a *application) rewriteRefOfDefault(parent SQLNode, node *Default, replace
 		kontinue := !a.pre(&a.cur)
 		if a.cur.revisit {
 			a.cur.revisit = false
-			return a.rewriteExpr(parent, a.cur.node.(Expr), replacer)
+			return a.rewriteSQLNode(parent, a.cur.node, replacer)
 		}
 		if kontinue {
 			return true
@@ -2444,7 +2610,12 @@ func (a *application) rewriteRefOfDefiner(parent SQLNode, node *Definer, replace
 		a.cur.replacer = replacer
 		a.cur.parent = parent
 		a.cur.node = node
-		if !a.pre(&a.cur) {
+		kontinue := !a.pre(&a.cur)
+		if a.cur.revisit {
+			a.cur.revisit = false
+			return a.rewriteSQLNode(parent, a.cur.node, replacer)
+		}
+		if kontinue {
 			return true
 		}
 	}
@@ -2468,7 +2639,12 @@ func (a *application) rewriteRefOfDelete(parent SQLNode, node *Delete, replacer
 		a.cur.replacer = replacer
 		a.cur.parent = parent
 		a.cur.node = node
-		if !a.pre(&a.cur) {
+		kontinue := !a.pre(&a.cur)
+		if a.cur.revisit {
+			a.cur.revisit = false
+			return a.rewriteSQLNode(parent, a.cur.node, replacer)
+		}
+		if kontinue {
 			return true
 		}
 	}
@@ -2534,7 +2710,12 @@ func (a *application) rewriteRefOfDerivedTable(parent SQLNode, node *DerivedTabl
 		a.cur.replacer = replacer
 		a.cur.parent = parent
 		a.cur.node = node
-		if !a.pre(&a.cur) {
+		kontinue := !a.pre(&a.cur)
+		if a.cur.revisit {
+			a.cur.revisit = false
+			return a.rewriteSQLNode(parent, a.cur.node, replacer)
+		}
+		if kontinue {
 			return true
 		}
 	}
@@ -2561,7 +2742,12 @@ func (a *application) rewriteRefOfDropColumn(parent SQLNode, node *DropColumn, r
 		a.cur.replacer = replacer
 		a.cur.parent = parent
 		a.cur.node = node
-		if !a.pre(&a.cur) {
+		kontinue := !a.pre(&a.cur)
+		if a.cur.revisit {
+			a.cur.revisit = false
+			return a.rewriteSQLNode(parent, a.cur.node, replacer)
+		}
+		if kontinue {
 			return true
 		}
 	}
@@ -2588,7 +2774,12 @@ func (a *application) rewriteRefOfDropDatabase(parent SQLNode, node *DropDatabas
 		a.cur.replacer = replacer
 		a.cur.parent = parent
 		a.cur.node = node
-		if !a.pre(&a.cur) {
+		kontinue := !a.pre(&a.cur)
+		if a.cur.revisit {
+			a.cur.revisit = false
+			return a.rewriteSQLNode(parent, a.cur.node, replacer)
+		}
+		if kontinue {
 			return true
 		}
 	}
@@ -2620,7 +2811,12 @@ func (a *application) rewriteRefOfDropKey(parent SQLNode, node *DropKey, replace
 		a.cur.replacer = replacer
 		a.cur.parent = parent
 		a.cur.node = node
-		if !a.pre(&a.cur) {
+		kontinue := !a.pre(&a.cur)
+		if a.cur.revisit {
+			a.cur.revisit = false
+			return a.rewriteSQLNode(parent, a.cur.node, replacer)
+		}
+		if kontinue {
 			return true
 		}
 	}
@@ -2647,7 +2843,12 @@ func (a *application) rewriteRefOfDropTable(parent SQLNode, node *DropTable, rep
 		a.cur.replacer = replacer
 		a.cur.parent = parent
 		a.cur.node = node
-		if !a.pre(&a.cur) {
+		kontinue := !a.pre(&a.cur)
+		if a.cur.revisit {
+			a.cur.revisit = false
+			return a.rewriteSQLNode(parent, a.cur.node, replacer)
+		}
+		if kontinue {
 			return true
 		}
 	}
@@ -2679,7 +2880,12 @@ func (a *application) rewriteRefOfDropView(parent SQLNode, node *DropView, repla
 		a.cur.replacer = replacer
 		a.cur.parent = parent
 		a.cur.node = node
-		if !a.pre(&a.cur) {
+		kontinue := !a.pre(&a.cur)
+		if a.cur.revisit {
+			a.cur.revisit = false
+			return a.rewriteSQLNode(parent, a.cur.node, replacer)
+		}
+		if kontinue {
 			return true
 		}
 	}
@@ -2711,7 +2917,12 @@ func (a *application) rewriteRefOfExecuteStmt(parent SQLNode, node *ExecuteStmt,
 		a.cur.replacer = replacer
 		a.cur.parent = parent
 		a.cur.node = node
-		if !a.pre(&a.cur) {
+		kontinue := !a.pre(&a.cur)
+		if a.cur.revisit {
+			a.cur.revisit = false
+			return a.rewriteSQLNode(parent, a.cur.node, replacer)
+		}
+		if kontinue {
 			return true
 		}
 	}
@@ -2755,7 +2966,7 @@ func (a *application) rewriteRefOfExistsExpr(parent SQLNode, node *ExistsExpr, r
 		kontinue := !a.pre(&a.cur)
 		if a.cur.revisit {
 			a.cur.revisit = false
-			return a.rewriteExpr(parent, a.cur.node.(Expr), replacer)
+			return a.rewriteSQLNode(parent, a.cur.node, replacer)
 		}
 		if kontinue {
 			return true
@@ -2784,7 +2995,12 @@ func (a *application) rewriteRefOfExplainStmt(parent SQLNode, node *ExplainStmt,
 		a.cur.replacer = replacer
 		a.cur.parent = parent
 		a.cur.node = node
-		if !a.pre(&a.cur) {
+		kontinue := !a.pre(&a.cur)
+		if a.cur.revisit {
+			a.cur.revisit = false
+			return a.rewriteSQLNode(parent, a.cur.node, replacer)
+		}
+		if kontinue {
 			return true
 		}
 	}
@@ -2816,7 +3032,12 @@ func (a *application) rewriteRefOfExplainTab(parent SQLNode, node *ExplainTab, r
 		a.cur.replacer = replacer
 		a.cur.parent = parent
 		a.cur.node = node
-		if !a.pre(&a.cur) {
+		kontinue := !a.pre(&a.cur)
+		if a.cur.revisit {
+			a.cur.revisit = false
+			return a.rewriteSQLNode(parent, a.cur.node, replacer)
+		}
+		if kontinue {
 			return true
 		}
 	}
@@ -2835,7 +3056,7 @@ func (a *application) rewriteRefOfExplainTab(parent SQLNode, node *ExplainTab, r
 	}
 	return true
 }
-func (a *application) rewriteExprs(parent SQLNode, node Exprs, replacer replacerFunc) bool {
+func (a *application) rewriteRefOfExprs(parent SQLNode, node *Exprs, replacer replacerFunc) bool {
 	if node == nil {
 		return true
 	}
@@ -2845,18 +3066,17 @@ func (a *application) rewriteExprs(parent SQLNode, node Exprs, replacer replacer
 		a.cur.node = node
 		kontinue := !a.pre(&a.cur)
 		if a.cur.revisit {
-			node = a.cur.node.(Exprs)
 			a.cur.revisit = false
-			return a.rewriteExprs(parent, node, replacer)
+			return a.rewriteSQLNode(parent, a.cur.node, replacer)
 		}
 		if kontinue {
 			return true
 		}
 	}
-	for x, el := range node {
+	for x, el := range node.Exprs {
 		if !a.rewriteExpr(node, el, func(idx int) replacerFunc {
 			return func(newNode, parent SQLNode) {
-				parent.(Exprs)[idx] = newNode.(Expr)
+				parent.(*Exprs).Exprs[idx] = newNode.(Expr)
 			}
 		}(x)) {
 			return false
@@ -2883,7 +3103,7 @@ func (a *application) rewriteRefOfExtractFuncExpr(parent SQLNode, node *ExtractF
 		kontinue := !a.pre(&a.cur)
 		if a.cur.revisit {
 			a.cur.revisit = false
-			return a.rewriteExpr(parent, a.cur.node.(Expr), replacer)
+			return a.rewriteSQLNode(parent, a.cur.node, replacer)
 		}
 		if kontinue {
 			return true
@@ -2915,7 +3135,7 @@ func (a *application) rewriteRefOfExtractValueExpr(parent SQLNode, node *Extract
 		kontinue := !a.pre(&a.cur)
 		if a.cur.revisit {
 			a.cur.revisit = false
-			return a.rewriteExpr(parent, a.cur.node.(Expr), replacer)
+			return a.rewriteSQLNode(parent, a.cur.node, replacer)
 		}
 		if kontinue {
 			return true
@@ -2952,7 +3172,7 @@ func (a *application) rewriteRefOfFirstOrLastValueExpr(parent SQLNode, node *Fir
 		kontinue := !a.pre(&a.cur)
 		if a.cur.revisit {
 			a.cur.revisit = false
-			return a.rewriteExpr(parent, a.cur.node.(Expr), replacer)
+			return a.rewriteSQLNode(parent, a.cur.node, replacer)
 		}
 		if kontinue {
 			return true
@@ -2991,7 +3211,12 @@ func (a *application) rewriteRefOfFlush(parent SQLNode, node *Flush, replacer re
 		a.cur.replacer = replacer
 		a.cur.parent = parent
 		a.cur.node = node
-		if !a.pre(&a.cur) {
+		kontinue := !a.pre(&a.cur)
+		if a.cur.revisit {
+			a.cur.revisit = false
+			return a.rewriteSQLNode(parent, a.cur.node, replacer)
+		}
+		if kontinue {
 			return true
 		}
 	}
@@ -3018,7 +3243,12 @@ func (a *application) rewriteRefOfForce(parent SQLNode, node *Force, replacer re
 		a.cur.replacer = replacer
 		a.cur.parent = parent
 		a.cur.node = node
-		if !a.pre(&a.cur) {
+		kontinue := !a.pre(&a.cur)
+		if a.cur.revisit {
+			a.cur.revisit = false
+			return a.rewriteSQLNode(parent, a.cur.node, replacer)
+		}
+		if kontinue {
 			return true
 		}
 	}
@@ -3042,7 +3272,12 @@ func (a *application) rewriteRefOfForeignKeyDefinition(parent SQLNode, node *For
 		a.cur.replacer = replacer
 		a.cur.parent = parent
 		a.cur.node = node
-		if !a.pre(&a.cur) {
+		kontinue := !a.pre(&a.cur)
+		if a.cur.revisit {
+			a.cur.revisit = false
+			return a.rewriteSQLNode(parent, a.cur.node, replacer)
+		}
+		if kontinue {
 			return true
 		}
 	}
@@ -3079,7 +3314,12 @@ func (a *application) rewriteRefOfFrameClause(parent SQLNode, node *FrameClause,
 		a.cur.replacer = replacer
 		a.cur.parent = parent
 		a.cur.node = node
-		if !a.pre(&a.cur) {
+		kontinue := !a.pre(&a.cur)
+		if a.cur.revisit {
+			a.cur.revisit = false
+			return a.rewriteSQLNode(parent, a.cur.node, replacer)
+		}
+		if kontinue {
 			return true
 		}
 	}
@@ -3111,7 +3351,12 @@ func (a *application) rewriteRefOfFramePoint(parent SQLNode, node *FramePoint, r
 		a.cur.replacer = replacer
 		a.cur.parent = parent
 		a.cur.node = node
-		if !a.pre(&a.cur) {
+		kontinue := !a.pre(&a.cur)
+		if a.cur.revisit {
+			a.cur.revisit = false
+			return a.rewriteSQLNode(parent, a.cur.node, replacer)
+		}
+		if kontinue {
 			return true
 		}
 	}
@@ -3138,7 +3383,12 @@ func (a *application) rewriteRefOfFromFirstLastClause(parent SQLNode, node *From
 		a.cur.replacer = replacer
 		a.cur.parent = parent
 		a.cur.node = node
-		if !a.pre(&a.cur) {
+		kontinue := !a.pre(&a.cur)
+		if a.cur.revisit {
+			a.cur.revisit = false
+			return a.rewriteSQLNode(parent, a.cur.node, replacer)
+		}
+		if kontinue {
 			return true
 		}
 	}
@@ -3165,7 +3415,7 @@ func (a *application) rewriteRefOfFuncExpr(parent SQLNode, node *FuncExpr, repla
 		kontinue := !a.pre(&a.cur)
 		if a.cur.revisit {
 			a.cur.revisit = false
-			return a.rewriteExpr(parent, a.cur.node.(Expr), replacer)
+			return a.rewriteSQLNode(parent, a.cur.node, replacer)
 		}
 		if kontinue {
 			return true
@@ -3181,10 +3431,14 @@ func (a *application) rewriteRefOfFuncExpr(parent SQLNode, node *FuncExpr, repla
 	}) {
 		return false
 	}
-	if !a.rewriteExprs(node, node.Exprs, func(newNode, parent SQLNode) {
-		parent.(*FuncExpr).Exprs = newNode.(Exprs)
-	}) {
-		return false
+	for x, el := range node.Exprs {
+		if !a.rewriteExpr(node, el, func(idx int) replacerFunc {
+			return func(newNode, parent SQLNode) {
+				parent.(*FuncExpr).Exprs[idx] = newNode.(Expr)
+			}
+		}(x)) {
+			return false
+		}
 	}
 	if a.post != nil {
 		a.cur.replacer = replacer
@@ -3207,7 +3461,7 @@ func (a *application) rewriteRefOfGTIDFuncExpr(parent SQLNode, node *GTIDFuncExp
 		kontinue := !a.pre(&a.cur)
 		if a.cur.revisit {
 			a.cur.revisit = false
-			return a.rewriteExpr(parent, a.cur.node.(Expr), replacer)
+			return a.rewriteSQLNode(parent, a.cur.node, replacer)
 		}
 		if kontinue {
 			return true
@@ -3254,7 +3508,7 @@ func (a *application) rewriteRefOfGeoHashFromLatLongExpr(parent SQLNode, node *G
 		kontinue := !a.pre(&a.cur)
 		if a.cur.revisit {
 			a.cur.revisit = false
-			return a.rewriteExpr(parent, a.cur.node.(Expr), replacer)
+			return a.rewriteSQLNode(parent, a.cur.node, replacer)
 		}
 		if kontinue {
 			return true
@@ -3296,7 +3550,7 @@ func (a *application) rewriteRefOfGeoHashFromPointExpr(parent SQLNode, node *Geo
 		kontinue := !a.pre(&a.cur)
 		if a.cur.revisit {
 			a.cur.revisit = false
-			return a.rewriteExpr(parent, a.cur.node.(Expr), replacer)
+			return a.rewriteSQLNode(parent, a.cur.node, replacer)
 		}
 		if kontinue {
 			return true
@@ -3333,7 +3587,7 @@ func (a *application) rewriteRefOfGeoJSONFromGeomExpr(parent SQLNode, node *GeoJ
 		kontinue := !a.pre(&a.cur)
 		if a.cur.revisit {
 			a.cur.revisit = false
-			return a.rewriteExpr(parent, a.cur.node.(Expr), replacer)
+			return a.rewriteSQLNode(parent, a.cur.node, replacer)
 		}
 		if kontinue {
 			return true
@@ -3375,7 +3629,7 @@ func (a *application) rewriteRefOfGeomCollPropertyFuncExpr(parent SQLNode, node
 		kontinue := !a.pre(&a.cur)
 		if a.cur.revisit {
 			a.cur.revisit = false
-			return a.rewriteExpr(parent, a.cur.node.(Expr), replacer)
+			return a.rewriteSQLNode(parent, a.cur.node, replacer)
 		}
 		if kontinue {
 			return true
@@ -3412,7 +3666,7 @@ func (a *application) rewriteRefOfGeomFormatExpr(parent SQLNode, node *GeomForma
 		kontinue := !a.pre(&a.cur)
 		if a.cur.revisit {
 			a.cur.revisit = false
-			return a.rewriteExpr(parent, a.cur.node.(Expr), replacer)
+			return a.rewriteSQLNode(parent, a.cur.node, replacer)
 		}
 		if kontinue {
 			return true
@@ -3449,7 +3703,7 @@ func (a *application) rewriteRefOfGeomFromGeoHashExpr(parent SQLNode, node *Geom
 		kontinue := !a.pre(&a.cur)
 		if a.cur.revisit {
 			a.cur.revisit = false
-			return a.rewriteExpr(parent, a.cur.node.(Expr), replacer)
+			return a.rewriteSQLNode(parent, a.cur.node, replacer)
 		}
 		if kontinue {
 			return true
@@ -3486,7 +3740,7 @@ func (a *application) rewriteRefOfGeomFromGeoJSONExpr(parent SQLNode, node *Geom
 		kontinue := !a.pre(&a.cur)
 		if a.cur.revisit {
 			a.cur.revisit = false
-			return a.rewriteExpr(parent, a.cur.node.(Expr), replacer)
+			return a.rewriteSQLNode(parent, a.cur.node, replacer)
 		}
 		if kontinue {
 			return true
@@ -3528,7 +3782,7 @@ func (a *application) rewriteRefOfGeomFromTextExpr(parent SQLNode, node *GeomFro
 		kontinue := !a.pre(&a.cur)
 		if a.cur.revisit {
 			a.cur.revisit = false
-			return a.rewriteExpr(parent, a.cur.node.(Expr), replacer)
+			return a.rewriteSQLNode(parent, a.cur.node, replacer)
 		}
 		if kontinue {
 			return true
@@ -3570,7 +3824,7 @@ func (a *application) rewriteRefOfGeomFromWKBExpr(parent SQLNode, node *GeomFrom
 		kontinue := !a.pre(&a.cur)
 		if a.cur.revisit {
 			a.cur.revisit = false
-			return a.rewriteExpr(parent, a.cur.node.(Expr), replacer)
+			return a.rewriteSQLNode(parent, a.cur.node, replacer)
 		}
 		if kontinue {
 			return true
@@ -3612,7 +3866,7 @@ func (a *application) rewriteRefOfGeomPropertyFuncExpr(parent SQLNode, node *Geo
 		kontinue := !a.pre(&a.cur)
 		if a.cur.revisit {
 			a.cur.revisit = false
-			return a.rewriteExpr(parent, a.cur.node.(Expr), replacer)
+			return a.rewriteSQLNode(parent, a.cur.node, replacer)
 		}
 		if kontinue {
 			return true
@@ -3641,7 +3895,12 @@ func (a *application) rewriteRefOfGroupBy(parent SQLNode, node *GroupBy, replace
 		a.cur.replacer = replacer
 		a.cur.parent = parent
 		a.cur.node = node
-		if !a.pre(&a.cur) {
+		kontinue := !a.pre(&a.cur)
+		if a.cur.revisit {
+			a.cur.revisit = false
+			return a.rewriteSQLNode(parent, a.cur.node, replacer)
+		}
+		if kontinue {
 			return true
 		}
 	}
@@ -3675,16 +3934,20 @@ func (a *application) rewriteRefOfGroupConcatExpr(parent SQLNode, node *GroupCon
 		kontinue := !a.pre(&a.cur)
 		if a.cur.revisit {
 			a.cur.revisit = false
-			return a.rewriteExpr(parent, a.cur.node.(Expr), replacer)
+			return a.rewriteSQLNode(parent, a.cur.node, replacer)
 		}
 		if kontinue {
 			return true
 		}
 	}
-	if !a.rewriteExprs(node, node.Exprs, func(newNode, parent SQLNode) {
-		parent.(*GroupConcatExpr).Exprs = newNode.(Exprs)
-	}) {
-		return false
+	for x, el := range node.Exprs {
+		if !a.rewriteExpr(node, el, func(idx int) replacerFunc {
+			return func(newNode, parent SQLNode) {
+				parent.(*GroupConcatExpr).Exprs[idx] = newNode.(Expr)
+			}
+		}(x)) {
+			return false
+		}
 	}
 	if !a.rewriteOrderBy(node, node.OrderBy, func(newNode, parent SQLNode) {
 		parent.(*GroupConcatExpr).OrderBy = newNode.(OrderBy)
@@ -3711,7 +3974,12 @@ func (a *application) rewriteIdentifierCI(parent SQLNode, node IdentifierCI, rep
 		a.cur.replacer = replacer
 		a.cur.parent = parent
 		a.cur.node = node
-		if !a.pre(&a.cur) {
+		kontinue := !a.pre(&a.cur)
+		if a.cur.revisit {
+			a.cur.revisit = false
+			return a.rewriteSQLNode(parent, a.cur.node, replacer)
+		}
+		if kontinue {
 			return true
 		}
 	}
@@ -3732,7 +4000,12 @@ func (a *application) rewriteIdentifierCS(parent SQLNode, node IdentifierCS, rep
 		a.cur.replacer = replacer
 		a.cur.parent = parent
 		a.cur.node = node
-		if !a.pre(&a.cur) {
+		kontinue := !a.pre(&a.cur)
+		if a.cur.revisit {
+			a.cur.revisit = false
+			return a.rewriteSQLNode(parent, a.cur.node, replacer)
+		}
+		if kontinue {
 			return true
 		}
 	}
@@ -3756,7 +4029,12 @@ func (a *application) rewriteRefOfIndexDefinition(parent SQLNode, node *IndexDef
 		a.cur.replacer = replacer
 		a.cur.parent = parent
 		a.cur.node = node
-		if !a.pre(&a.cur) {
+		kontinue := !a.pre(&a.cur)
+		if a.cur.revisit {
+			a.cur.revisit = false
+			return a.rewriteSQLNode(parent, a.cur.node, replacer)
+		}
+		if kontinue {
 			return true
 		}
 	}
@@ -3783,7 +4061,12 @@ func (a *application) rewriteRefOfIndexHint(parent SQLNode, node *IndexHint, rep
 		a.cur.replacer = replacer
 		a.cur.parent = parent
 		a.cur.node = node
-		if !a.pre(&a.cur) {
+		kontinue := !a.pre(&a.cur)
+		if a.cur.revisit {
+			a.cur.revisit = false
+			return a.rewriteSQLNode(parent, a.cur.node, replacer)
+		}
+		if kontinue {
 			return true
 		}
 	}
@@ -3816,9 +4099,8 @@ func (a *application) rewriteIndexHints(parent SQLNode, node IndexHints, replace
 		a.cur.node = node
 		kontinue := !a.pre(&a.cur)
 		if a.cur.revisit {
-			node = a.cur.node.(IndexHints)
 			a.cur.revisit = false
-			return a.rewriteIndexHints(parent, node, replacer)
+			return a.rewriteSQLNode(parent, a.cur.node, replacer)
 		}
 		if kontinue {
 			return true
@@ -3851,7 +4133,12 @@ func (a *application) rewriteRefOfIndexInfo(parent SQLNode, node *IndexInfo, rep
 		a.cur.replacer = replacer
 		a.cur.parent = parent
 		a.cur.node = node
-		if !a.pre(&a.cur) {
+		kontinue := !a.pre(&a.cur)
+		if a.cur.revisit {
+			a.cur.revisit = false
+			return a.rewriteSQLNode(parent, a.cur.node, replacer)
+		}
+		if kontinue {
 			return true
 		}
 	}
@@ -3883,7 +4170,12 @@ func (a *application) rewriteRefOfInsert(parent SQLNode, node *Insert, replacer
 		a.cur.replacer = replacer
 		a.cur.parent = parent
 		a.cur.node = node
-		if !a.pre(&a.cur) {
+		kontinue := !a.pre(&a.cur)
+		if a.cur.revisit {
+			a.cur.revisit = false
+			return a.rewriteSQLNode(parent, a.cur.node, replacer)
+		}
+		if kontinue {
 			return true
 		}
 	}
@@ -3943,7 +4235,7 @@ func (a *application) rewriteRefOfInsertExpr(parent SQLNode, node *InsertExpr, r
 		kontinue := !a.pre(&a.cur)
 		if a.cur.revisit {
 			a.cur.revisit = false
-			return a.rewriteExpr(parent, a.cur.node.(Expr), replacer)
+			return a.rewriteSQLNode(parent, a.cur.node, replacer)
 		}
 		if kontinue {
 			return true
@@ -3990,7 +4282,7 @@ func (a *application) rewriteRefOfIntervalDateExpr(parent SQLNode, node *Interva
 		kontinue := !a.pre(&a.cur)
 		if a.cur.revisit {
 			a.cur.revisit = false
-			return a.rewriteExpr(parent, a.cur.node.(Expr), replacer)
+			return a.rewriteSQLNode(parent, a.cur.node, replacer)
 		}
 		if kontinue {
 			return true
@@ -4027,7 +4319,7 @@ func (a *application) rewriteRefOfIntervalFuncExpr(parent SQLNode, node *Interva
 		kontinue := !a.pre(&a.cur)
 		if a.cur.revisit {
 			a.cur.revisit = false
-			return a.rewriteExpr(parent, a.cur.node.(Expr), replacer)
+			return a.rewriteSQLNode(parent, a.cur.node, replacer)
 		}
 		if kontinue {
 			return true
@@ -4038,10 +4330,14 @@ func (a *application) rewriteRefOfIntervalFuncExpr(parent SQLNode, node *Interva
 	}) {
 		return false
 	}
-	if !a.rewriteExprs(node, node.Exprs, func(newNode, parent SQLNode) {
-		parent.(*IntervalFuncExpr).Exprs = newNode.(Exprs)
-	}) {
-		return false
+	for x, el := range node.Exprs {
+		if !a.rewriteExpr(node, el, func(idx int) replacerFunc {
+			return func(newNode, parent SQLNode) {
+				parent.(*IntervalFuncExpr).Exprs[idx] = newNode.(Expr)
+			}
+		}(x)) {
+			return false
+		}
 	}
 	if a.post != nil {
 		a.cur.replacer = replacer
@@ -4064,7 +4360,7 @@ func (a *application) rewriteRefOfIntroducerExpr(parent SQLNode, node *Introduce
 		kontinue := !a.pre(&a.cur)
 		if a.cur.revisit {
 			a.cur.revisit = false
-			return a.rewriteExpr(parent, a.cur.node.(Expr), replacer)
+			return a.rewriteSQLNode(parent, a.cur.node, replacer)
 		}
 		if kontinue {
 			return true
@@ -4096,7 +4392,7 @@ func (a *application) rewriteRefOfIsExpr(parent SQLNode, node *IsExpr, replacer
 		kontinue := !a.pre(&a.cur)
 		if a.cur.revisit {
 			a.cur.revisit = false
-			return a.rewriteExpr(parent, a.cur.node.(Expr), replacer)
+			return a.rewriteSQLNode(parent, a.cur.node, replacer)
 		}
 		if kontinue {
 			return true
@@ -4128,7 +4424,7 @@ func (a *application) rewriteRefOfJSONArrayAgg(parent SQLNode, node *JSONArrayAg
 		kontinue := !a.pre(&a.cur)
 		if a.cur.revisit {
 			a.cur.revisit = false
-			return a.rewriteExpr(parent, a.cur.node.(Expr), replacer)
+			return a.rewriteSQLNode(parent, a.cur.node, replacer)
 		}
 		if kontinue {
 			return true
@@ -4165,17 +4461,21 @@ func (a *application) rewriteRefOfJSONArrayExpr(parent SQLNode, node *JSONArrayE
 		kontinue := !a.pre(&a.cur)
 		if a.cur.revisit {
 			a.cur.revisit = false
-			return a.rewriteExpr(parent, a.cur.node.(Expr), replacer)
+			return a.rewriteSQLNode(parent, a.cur.node, replacer)
 		}
 		if kontinue {
 			return true
 		}
 	}
-	if !a.rewriteExprs(node, node.Params, func(newNode, parent SQLNode) {
-		parent.(*JSONArrayExpr).Params = newNode.(Exprs)
-	}) {
-		return false
-	}
+	for x, el := range node.Params {
+		if !a.rewriteExpr(node, el, func(idx int) replacerFunc {
+			return func(newNode, parent SQLNode) {
+				parent.(*JSONArrayExpr).Params[idx] = newNode.(Expr)
+			}
+		}(x)) {
+			return false
+		}
+	}
 	if a.post != nil {
 		a.cur.replacer = replacer
 		a.cur.parent = parent
@@ -4197,7 +4497,7 @@ func (a *application) rewriteRefOfJSONAttributesExpr(parent SQLNode, node *JSONA
 		kontinue := !a.pre(&a.cur)
 		if a.cur.revisit {
 			a.cur.revisit = false
-			return a.rewriteExpr(parent, a.cur.node.(Expr), replacer)
+			return a.rewriteSQLNode(parent, a.cur.node, replacer)
 		}
 		if kontinue {
 			return true
@@ -4234,7 +4534,7 @@ func (a *application) rewriteRefOfJSONContainsExpr(parent SQLNode, node *JSONCon
 		kontinue := !a.pre(&a.cur)
 		if a.cur.revisit {
 			a.cur.revisit = false
-			return a.rewriteExpr(parent, a.cur.node.(Expr), replacer)
+			return a.rewriteSQLNode(parent, a.cur.node, replacer)
 		}
 		if kontinue {
 			return true
@@ -4280,7 +4580,7 @@ func (a *application) rewriteRefOfJSONContainsPathExpr(parent SQLNode, node *JSO
 		kontinue := !a.pre(&a.cur)
 		if a.cur.revisit {
 			a.cur.revisit = false
-			return a.rewriteExpr(parent, a.cur.node.(Expr), replacer)
+			return a.rewriteSQLNode(parent, a.cur.node, replacer)
 		}
 		if kontinue {
 			return true
@@ -4326,7 +4626,7 @@ func (a *application) rewriteRefOfJSONExtractExpr(parent SQLNode, node *JSONExtr
 		kontinue := !a.pre(&a.cur)
 		if a.cur.revisit {
 			a.cur.revisit = false
-			return a.rewriteExpr(parent, a.cur.node.(Expr), replacer)
+			return a.rewriteSQLNode(parent, a.cur.node, replacer)
 		}
 		if kontinue {
 			return true
@@ -4367,7 +4667,7 @@ func (a *application) rewriteRefOfJSONKeysExpr(parent SQLNode, node *JSONKeysExp
 		kontinue := !a.pre(&a.cur)
 		if a.cur.revisit {
 			a.cur.revisit = false
-			return a.rewriteExpr(parent, a.cur.node.(Expr), replacer)
+			return a.rewriteSQLNode(parent, a.cur.node, replacer)
 		}
 		if kontinue {
 			return true
@@ -4404,7 +4704,7 @@ func (a *application) rewriteRefOfJSONObjectAgg(parent SQLNode, node *JSONObject
 		kontinue := !a.pre(&a.cur)
 		if a.cur.revisit {
 			a.cur.revisit = false
-			return a.rewriteExpr(parent, a.cur.node.(Expr), replacer)
+			return a.rewriteSQLNode(parent, a.cur.node, replacer)
 		}
 		if kontinue {
 			return true
@@ -4446,7 +4746,7 @@ func (a *application) rewriteRefOfJSONObjectExpr(parent SQLNode, node *JSONObjec
 		kontinue := !a.pre(&a.cur)
 		if a.cur.revisit {
 			a.cur.revisit = false
-			return a.rewriteExpr(parent, a.cur.node.(Expr), replacer)
+			return a.rewriteSQLNode(parent, a.cur.node, replacer)
 		}
 		if kontinue {
 			return true
@@ -4479,7 +4779,12 @@ func (a *application) rewriteRefOfJSONObjectParam(parent SQLNode, node *JSONObje
 		a.cur.replacer = replacer
 		a.cur.parent = parent
 		a.cur.node = node
-		if !a.pre(&a.cur) {
+		kontinue := !a.pre(&a.cur)
+		if a.cur.revisit {
+			a.cur.revisit = false
+			return a.rewriteSQLNode(parent, a.cur.node, replacer)
+		}
+		if kontinue {
 			return true
 		}
 	}
@@ -4514,7 +4819,7 @@ func (a *application) rewriteRefOfJSONOverlapsExpr(parent SQLNode, node *JSONOve
 		kontinue := !a.pre(&a.cur)
 		if a.cur.revisit {
 			a.cur.revisit = false
-			return a.rewriteExpr(parent, a.cur.node.(Expr), replacer)
+			return a.rewriteSQLNode(parent, a.cur.node, replacer)
 		}
 		if kontinue {
 			return true
@@ -4551,7 +4856,7 @@ func (a *application) rewriteRefOfJSONPrettyExpr(parent SQLNode, node *JSONPrett
 		kontinue := !a.pre(&a.cur)
 		if a.cur.revisit {
 			a.cur.revisit = false
-			return a.rewriteExpr(parent, a.cur.node.(Expr), replacer)
+			return a.rewriteSQLNode(parent, a.cur.node, replacer)
 		}
 		if kontinue {
 			return true
@@ -4583,7 +4888,7 @@ func (a *application) rewriteRefOfJSONQuoteExpr(parent SQLNode, node *JSONQuoteE
 		kontinue := !a.pre(&a.cur)
 		if a.cur.revisit {
 			a.cur.revisit = false
-			return a.rewriteExpr(parent, a.cur.node.(Expr), replacer)
+			return a.rewriteSQLNode(parent, a.cur.node, replacer)
 		}
 		if kontinue {
 			return true
@@ -4615,7 +4920,7 @@ func (a *application) rewriteRefOfJSONRemoveExpr(parent SQLNode, node *JSONRemov
 		kontinue := !a.pre(&a.cur)
 		if a.cur.revisit {
 			a.cur.revisit = false
-			return a.rewriteExpr(parent, a.cur.node.(Expr), replacer)
+			return a.rewriteSQLNode(parent, a.cur.node, replacer)
 		}
 		if kontinue {
 			return true
@@ -4626,10 +4931,14 @@ func (a *application) rewriteRefOfJSONRemoveExpr(parent SQLNode, node *JSONRemov
 	}) {
 		return false
 	}
-	if !a.rewriteExprs(node, node.PathList, func(newNode, parent SQLNode) {
-		parent.(*JSONRemoveExpr).PathList = newNode.(Exprs)
-	}) {
-		return false
+	for x, el := range node.PathList {
+		if !a.rewriteExpr(node, el, func(idx int) replacerFunc {
+			return func(newNode, parent SQLNode) {
+				parent.(*JSONRemoveExpr).PathList[idx] = newNode.(Expr)
+			}
+		}(x)) {
+			return false
+		}
 	}
 	if a.post != nil {
 		a.cur.replacer = replacer
@@ -4652,7 +4961,7 @@ func (a *application) rewriteRefOfJSONSchemaValidFuncExpr(parent SQLNode, node *
 		kontinue := !a.pre(&a.cur)
 		if a.cur.revisit {
 			a.cur.revisit = false
-			return a.rewriteExpr(parent, a.cur.node.(Expr), replacer)
+			return a.rewriteSQLNode(parent, a.cur.node, replacer)
 		}
 		if kontinue {
 			return true
@@ -4689,7 +4998,7 @@ func (a *application) rewriteRefOfJSONSchemaValidationReportFuncExpr(parent SQLN
 		kontinue := !a.pre(&a.cur)
 		if a.cur.revisit {
 			a.cur.revisit = false
-			return a.rewriteExpr(parent, a.cur.node.(Expr), replacer)
+			return a.rewriteSQLNode(parent, a.cur.node, replacer)
 		}
 		if kontinue {
 			return true
@@ -4726,7 +5035,7 @@ func (a *application) rewriteRefOfJSONSearchExpr(parent SQLNode, node *JSONSearc
 		kontinue := !a.pre(&a.cur)
 		if a.cur.revisit {
 			a.cur.revisit = false
-			return a.rewriteExpr(parent, a.cur.node.(Expr), replacer)
+			return a.rewriteSQLNode(parent, a.cur.node, replacer)
 		}
 		if kontinue {
 			return true
@@ -4782,7 +5091,7 @@ func (a *application) rewriteRefOfJSONStorageFreeExpr(parent SQLNode, node *JSON
 		kontinue := !a.pre(&a.cur)
 		if a.cur.revisit {
 			a.cur.revisit = false
-			return a.rewriteExpr(parent, a.cur.node.(Expr), replacer)
+			return a.rewriteSQLNode(parent, a.cur.node, replacer)
 		}
 		if kontinue {
 			return true
@@ -4814,7 +5123,7 @@ func (a *application) rewriteRefOfJSONStorageSizeExpr(parent SQLNode, node *JSON
 		kontinue := !a.pre(&a.cur)
 		if a.cur.revisit {
 			a.cur.revisit = false
-			return a.rewriteExpr(parent, a.cur.node.(Expr), replacer)
+			return a.rewriteSQLNode(parent, a.cur.node, replacer)
 		}
 		if kontinue {
 			return true
@@ -4843,7 +5152,12 @@ func (a *application) rewriteRefOfJSONTableExpr(parent SQLNode, node *JSONTableE
 		a.cur.replacer = replacer
 		a.cur.parent = parent
 		a.cur.node = node
-		if !a.pre(&a.cur) {
+		kontinue := !a.pre(&a.cur)
+		if a.cur.revisit {
+			a.cur.revisit = false
+			return a.rewriteSQLNode(parent, a.cur.node, replacer)
+		}
+		if kontinue {
 			return true
 		}
 	}
@@ -4892,7 +5206,7 @@ func (a *application) rewriteRefOfJSONUnquoteExpr(parent SQLNode, node *JSONUnqu
 		kontinue := !a.pre(&a.cur)
 		if a.cur.revisit {
 			a.cur.revisit = false
-			return a.rewriteExpr(parent, a.cur.node.(Expr), replacer)
+			return a.rewriteSQLNode(parent, a.cur.node, replacer)
 		}
 		if kontinue {
 			return true
@@ -4924,7 +5238,7 @@ func (a *application) rewriteRefOfJSONValueExpr(parent SQLNode, node *JSONValueE
 		kontinue := !a.pre(&a.cur)
 		if a.cur.revisit {
 			a.cur.revisit = false
-			return a.rewriteExpr(parent, a.cur.node.(Expr), replacer)
+			return a.rewriteSQLNode(parent, a.cur.node, replacer)
 		}
 		if kontinue {
 			return true
@@ -4976,7 +5290,7 @@ func (a *application) rewriteRefOfJSONValueMergeExpr(parent SQLNode, node *JSONV
 		kontinue := !a.pre(&a.cur)
 		if a.cur.revisit {
 			a.cur.revisit = false
-			return a.rewriteExpr(parent, a.cur.node.(Expr), replacer)
+			return a.rewriteSQLNode(parent, a.cur.node, replacer)
 		}
 		if kontinue {
 			return true
@@ -4987,10 +5301,14 @@ func (a *application) rewriteRefOfJSONValueMergeExpr(parent SQLNode, node *JSONV
 	}) {
 		return false
 	}
-	if !a.rewriteExprs(node, node.JSONDocList, func(newNode, parent SQLNode) {
-		parent.(*JSONValueMergeExpr).JSONDocList = newNode.(Exprs)
-	}) {
-		return false
+	for x, el := range node.JSONDocList {
+		if !a.rewriteExpr(node, el, func(idx int) replacerFunc {
+			return func(newNode, parent SQLNode) {
+				parent.(*JSONValueMergeExpr).JSONDocList[idx] = newNode.(Expr)
+			}
+		}(x)) {
+			return false
+		}
 	}
 	if a.post != nil {
 		a.cur.replacer = replacer
@@ -5013,7 +5331,7 @@ func (a *application) rewriteRefOfJSONValueModifierExpr(parent SQLNode, node *JS
 		kontinue := !a.pre(&a.cur)
 		if a.cur.revisit {
 			a.cur.revisit = false
-			return a.rewriteExpr(parent, a.cur.node.(Expr), replacer)
+			return a.rewriteSQLNode(parent, a.cur.node, replacer)
 		}
 		if kontinue {
 			return true
@@ -5051,7 +5369,12 @@ func (a *application) rewriteRefOfJoinCondition(parent SQLNode, node *JoinCondit
 		a.cur.replacer = replacer
 		a.cur.parent = parent
 		a.cur.node = node
-		if !a.pre(&a.cur) {
+		kontinue := !a.pre(&a.cur)
+		if a.cur.revisit {
+			a.cur.revisit = false
+			return a.rewriteSQLNode(parent, a.cur.node, replacer)
+		}
+		if kontinue {
 			return true
 		}
 	}
@@ -5083,7 +5406,12 @@ func (a *application) rewriteRefOfJoinTableExpr(parent SQLNode, node *JoinTableE
 		a.cur.replacer = replacer
 		a.cur.parent = parent
 		a.cur.node = node
-		if !a.pre(&a.cur) {
+		kontinue := !a.pre(&a.cur)
+		if a.cur.revisit {
+			a.cur.revisit = false
+			return a.rewriteSQLNode(parent, a.cur.node, replacer)
+		}
+		if kontinue {
 			return true
 		}
 	}
@@ -5120,7 +5448,12 @@ func (a *application) rewriteRefOfJtColumnDefinition(parent SQLNode, node *JtCol
 		a.cur.replacer = replacer
 		a.cur.parent = parent
 		a.cur.node = node
-		if !a.pre(&a.cur) {
+		kontinue := !a.pre(&a.cur)
+		if a.cur.revisit {
+			a.cur.revisit = false
+			return a.rewriteSQLNode(parent, a.cur.node, replacer)
+		}
+		if kontinue {
 			return true
 		}
 	}
@@ -5144,7 +5477,12 @@ func (a *application) rewriteRefOfJtOnResponse(parent SQLNode, node *JtOnRespons
 		a.cur.replacer = replacer
 		a.cur.parent = parent
 		a.cur.node = node
-		if !a.pre(&a.cur) {
+		kontinue := !a.pre(&a.cur)
+		if a.cur.revisit {
+			a.cur.revisit = false
+			return a.rewriteSQLNode(parent, a.cur.node, replacer)
+		}
+		if kontinue {
 			return true
 		}
 	}
@@ -5171,7 +5509,12 @@ func (a *application) rewriteRefOfKeyState(parent SQLNode, node *KeyState, repla
 		a.cur.replacer = replacer
 		a.cur.parent = parent
 		a.cur.node = node
-		if !a.pre(&a.cur) {
+		kontinue := !a.pre(&a.cur)
+		if a.cur.revisit {
+			a.cur.revisit = false
+			return a.rewriteSQLNode(parent, a.cur.node, replacer)
+		}
+		if kontinue {
 			return true
 		}
 	}
@@ -5195,7 +5538,12 @@ func (a *application) rewriteRefOfKill(parent SQLNode, node *Kill, replacer repl
 		a.cur.replacer = replacer
 		a.cur.parent = parent
 		a.cur.node = node
-		if !a.pre(&a.cur) {
+		kontinue := !a.pre(&a.cur)
+		if a.cur.revisit {
+			a.cur.revisit = false
+			return a.rewriteSQLNode(parent, a.cur.node, replacer)
+		}
+		if kontinue {
 			return true
 		}
 	}
@@ -5222,7 +5570,7 @@ func (a *application) rewriteRefOfLagLeadExpr(parent SQLNode, node *LagLeadExpr,
 		kontinue := !a.pre(&a.cur)
 		if a.cur.revisit {
 			a.cur.revisit = false
-			return a.rewriteExpr(parent, a.cur.node.(Expr), replacer)
+			return a.rewriteSQLNode(parent, a.cur.node, replacer)
 		}
 		if kontinue {
 			return true
@@ -5271,7 +5619,12 @@ func (a *application) rewriteRefOfLimit(parent SQLNode, node *Limit, replacer re
 		a.cur.replacer = replacer
 		a.cur.parent = parent
 		a.cur.node = node
-		if !a.pre(&a.cur) {
+		kontinue := !a.pre(&a.cur)
+		if a.cur.revisit {
+			a.cur.revisit = false
+			return a.rewriteSQLNode(parent, a.cur.node, replacer)
+		}
+		if kontinue {
 			return true
 		}
 	}
@@ -5306,16 +5659,20 @@ func (a *application) rewriteRefOfLineStringExpr(parent SQLNode, node *LineStrin
 		kontinue := !a.pre(&a.cur)
 		if a.cur.revisit {
 			a.cur.revisit = false
-			return a.rewriteExpr(parent, a.cur.node.(Expr), replacer)
+			return a.rewriteSQLNode(parent, a.cur.node, replacer)
 		}
 		if kontinue {
 			return true
 		}
 	}
-	if !a.rewriteExprs(node, node.PointParams, func(newNode, parent SQLNode) {
-		parent.(*LineStringExpr).PointParams = newNode.(Exprs)
-	}) {
-		return false
+	for x, el := range node.PointParams {
+		if !a.rewriteExpr(node, el, func(idx int) replacerFunc {
+			return func(newNode, parent SQLNode) {
+				parent.(*LineStringExpr).PointParams[idx] = newNode.(Expr)
+			}
+		}(x)) {
+			return false
+		}
 	}
 	if a.post != nil {
 		a.cur.replacer = replacer
@@ -5338,7 +5695,7 @@ func (a *application) rewriteRefOfLinestrPropertyFuncExpr(parent SQLNode, node *
 		kontinue := !a.pre(&a.cur)
 		if a.cur.revisit {
 			a.cur.revisit = false
-			return a.rewriteExpr(parent, a.cur.node.(Expr), replacer)
+			return a.rewriteSQLNode(parent, a.cur.node, replacer)
 		}
 		if kontinue {
 			return true
@@ -5375,7 +5732,7 @@ func (a *application) rewriteRefOfLiteral(parent SQLNode, node *Literal, replace
 		kontinue := !a.pre(&a.cur)
 		if a.cur.revisit {
 			a.cur.revisit = false
-			return a.rewriteExpr(parent, a.cur.node.(Expr), replacer)
+			return a.rewriteSQLNode(parent, a.cur.node, replacer)
 		}
 		if kontinue {
 			return true
@@ -5401,7 +5758,12 @@ func (a *application) rewriteRefOfLoad(parent SQLNode, node *Load, replacer repl
 		a.cur.replacer = replacer
 		a.cur.parent = parent
 		a.cur.node = node
-		if !a.pre(&a.cur) {
+		kontinue := !a.pre(&a.cur)
+		if a.cur.revisit {
+			a.cur.revisit = false
+			return a.rewriteSQLNode(parent, a.cur.node, replacer)
+		}
+		if kontinue {
 			return true
 		}
 	}
@@ -5428,7 +5790,7 @@ func (a *application) rewriteRefOfLocateExpr(parent SQLNode, node *LocateExpr, r
 		kontinue := !a.pre(&a.cur)
 		if a.cur.revisit {
 			a.cur.revisit = false
-			return a.rewriteExpr(parent, a.cur.node.(Expr), replacer)
+			return a.rewriteSQLNode(parent, a.cur.node, replacer)
 		}
 		if kontinue {
 			return true
@@ -5467,7 +5829,12 @@ func (a *application) rewriteRefOfLockOption(parent SQLNode, node *LockOption, r
 		a.cur.replacer = replacer
 		a.cur.parent = parent
 		a.cur.node = node
-		if !a.pre(&a.cur) {
+		kontinue := !a.pre(&a.cur)
+		if a.cur.revisit {
+			a.cur.revisit = false
+			return a.rewriteSQLNode(parent, a.cur.node, replacer)
+		}
+		if kontinue {
 			return true
 		}
 	}
@@ -5491,7 +5858,12 @@ func (a *application) rewriteRefOfLockTables(parent SQLNode, node *LockTables, r
 		a.cur.replacer = replacer
 		a.cur.parent = parent
 		a.cur.node = node
-		if !a.pre(&a.cur) {
+		kontinue := !a.pre(&a.cur)
+		if a.cur.revisit {
+			a.cur.revisit = false
+			return a.rewriteSQLNode(parent, a.cur.node, replacer)
+		}
+		if kontinue {
 			return true
 		}
 	}
@@ -5518,7 +5890,7 @@ func (a *application) rewriteRefOfLockingFunc(parent SQLNode, node *LockingFunc,
 		kontinue := !a.pre(&a.cur)
 		if a.cur.revisit {
 			a.cur.revisit = false
-			return a.rewriteExpr(parent, a.cur.node.(Expr), replacer)
+			return a.rewriteSQLNode(parent, a.cur.node, replacer)
 		}
 		if kontinue {
 			return true
@@ -5555,7 +5927,7 @@ func (a *application) rewriteRefOfMatchExpr(parent SQLNode, node *MatchExpr, rep
 		kontinue := !a.pre(&a.cur)
 		if a.cur.revisit {
 			a.cur.revisit = false
-			return a.rewriteExpr(parent, a.cur.node.(Expr), replacer)
+			return a.rewriteSQLNode(parent, a.cur.node, replacer)
 		}
 		if kontinue {
 			return true
@@ -5596,7 +5968,7 @@ func (a *application) rewriteRefOfMax(parent SQLNode, node *Max, replacer replac
 		kontinue := !a.pre(&a.cur)
 		if a.cur.revisit {
 			a.cur.revisit = false
-			return a.rewriteExpr(parent, a.cur.node.(Expr), replacer)
+			return a.rewriteSQLNode(parent, a.cur.node, replacer)
 		}
 		if kontinue {
 			return true
@@ -5633,7 +6005,7 @@ func (a *application) rewriteRefOfMemberOfExpr(parent SQLNode, node *MemberOfExp
 		kontinue := !a.pre(&a.cur)
 		if a.cur.revisit {
 			a.cur.revisit = false
-			return a.rewriteExpr(parent, a.cur.node.(Expr), replacer)
+			return a.rewriteSQLNode(parent, a.cur.node, replacer)
 		}
 		if kontinue {
 			return true
@@ -5670,7 +6042,7 @@ func (a *application) rewriteRefOfMin(parent SQLNode, node *Min, replacer replac
 		kontinue := !a.pre(&a.cur)
 		if a.cur.revisit {
 			a.cur.revisit = false
-			return a.rewriteExpr(parent, a.cur.node.(Expr), replacer)
+			return a.rewriteSQLNode(parent, a.cur.node, replacer)
 		}
 		if kontinue {
 			return true
@@ -5704,7 +6076,12 @@ func (a *application) rewriteRefOfModifyColumn(parent SQLNode, node *ModifyColum
 		a.cur.replacer = replacer
 		a.cur.parent = parent
 		a.cur.node = node
-		if !a.pre(&a.cur) {
+		kontinue := !a.pre(&a.cur)
+		if a.cur.revisit {
+			a.cur.revisit = false
+			return a.rewriteSQLNode(parent, a.cur.node, replacer)
+		}
+		if kontinue {
 			return true
 		}
 	}
@@ -5739,16 +6116,20 @@ func (a *application) rewriteRefOfMultiLinestringExpr(parent SQLNode, node *Mult
 		kontinue := !a.pre(&a.cur)
 		if a.cur.revisit {
 			a.cur.revisit = false
-			return a.rewriteExpr(parent, a.cur.node.(Expr), replacer)
+			return a.rewriteSQLNode(parent, a.cur.node, replacer)
 		}
 		if kontinue {
 			return true
 		}
 	}
-	if !a.rewriteExprs(node, node.LinestringParams, func(newNode, parent SQLNode) {
-		parent.(*MultiLinestringExpr).LinestringParams = newNode.(Exprs)
-	}) {
-		return false
+	for x, el := range node.LinestringParams {
+		if !a.rewriteExpr(node, el, func(idx int) replacerFunc {
+			return func(newNode, parent SQLNode) {
+				parent.(*MultiLinestringExpr).LinestringParams[idx] = newNode.(Expr)
+			}
+		}(x)) {
+			return false
+		}
 	}
 	if a.post != nil {
 		a.cur.replacer = replacer
@@ -5771,16 +6152,20 @@ func (a *application) rewriteRefOfMultiPointExpr(parent SQLNode, node *MultiPoin
 		kontinue := !a.pre(&a.cur)
 		if a.cur.revisit {
 			a.cur.revisit = false
-			return a.rewriteExpr(parent, a.cur.node.(Expr), replacer)
+			return a.rewriteSQLNode(parent, a.cur.node, replacer)
 		}
 		if kontinue {
 			return true
 		}
 	}
-	if !a.rewriteExprs(node, node.PointParams, func(newNode, parent SQLNode) {
-		parent.(*MultiPointExpr).PointParams = newNode.(Exprs)
-	}) {
-		return false
+	for x, el := range node.PointParams {
+		if !a.rewriteExpr(node, el, func(idx int) replacerFunc {
+			return func(newNode, parent SQLNode) {
+				parent.(*MultiPointExpr).PointParams[idx] = newNode.(Expr)
+			}
+		}(x)) {
+			return false
+		}
 	}
 	if a.post != nil {
 		a.cur.replacer = replacer
@@ -5803,16 +6188,20 @@ func (a *application) rewriteRefOfMultiPolygonExpr(parent SQLNode, node *MultiPo
 		kontinue := !a.pre(&a.cur)
 		if a.cur.revisit {
 			a.cur.revisit = false
-			return a.rewriteExpr(parent, a.cur.node.(Expr), replacer)
+			return a.rewriteSQLNode(parent, a.cur.node, replacer)
 		}
 		if kontinue {
 			return true
 		}
 	}
-	if !a.rewriteExprs(node, node.PolygonParams, func(newNode, parent SQLNode) {
-		parent.(*MultiPolygonExpr).PolygonParams = newNode.(Exprs)
-	}) {
-		return false
+	for x, el := range node.PolygonParams {
+		if !a.rewriteExpr(node, el, func(idx int) replacerFunc {
+			return func(newNode, parent SQLNode) {
+				parent.(*MultiPolygonExpr).PolygonParams[idx] = newNode.(Expr)
+			}
+		}(x)) {
+			return false
+		}
 	}
 	if a.post != nil {
 		a.cur.replacer = replacer
@@ -5835,7 +6224,7 @@ func (a *application) rewriteRefOfNTHValueExpr(parent SQLNode, node *NTHValueExp
 		kontinue := !a.pre(&a.cur)
 		if a.cur.revisit {
 			a.cur.revisit = false
-			return a.rewriteExpr(parent, a.cur.node.(Expr), replacer)
+			return a.rewriteSQLNode(parent, a.cur.node, replacer)
 		}
 		if kontinue {
 			return true
@@ -5887,7 +6276,7 @@ func (a *application) rewriteRefOfNamedWindow(parent SQLNode, node *NamedWindow,
 		kontinue := !a.pre(&a.cur)
 		if a.cur.revisit {
 			a.cur.revisit = false
-			return a.rewriteExpr(parent, a.cur.node.(Expr), replacer)
+			return a.rewriteSQLNode(parent, a.cur.node, replacer)
 		}
 		if kontinue {
 			return true
@@ -5918,9 +6307,8 @@ func (a *application) rewriteNamedWindows(parent SQLNode, node NamedWindows, rep
 		a.cur.node = node
 		kontinue := !a.pre(&a.cur)
 		if a.cur.revisit {
-			node = a.cur.node.(NamedWindows)
 			a.cur.revisit = false
-			return a.rewriteNamedWindows(parent, node, replacer)
+			return a.rewriteSQLNode(parent, a.cur.node, replacer)
 		}
 		if kontinue {
 			return true
@@ -5953,7 +6341,12 @@ func (a *application) rewriteRefOfNextval(parent SQLNode, node *Nextval, replace
 		a.cur.replacer = replacer
 		a.cur.parent = parent
 		a.cur.node = node
-		if !a.pre(&a.cur) {
+		kontinue := !a.pre(&a.cur)
+		if a.cur.revisit {
+			a.cur.revisit = false
+			return a.rewriteSQLNode(parent, a.cur.node, replacer)
+		}
+		if kontinue {
 			return true
 		}
 	}
@@ -5983,7 +6376,7 @@ func (a *application) rewriteRefOfNotExpr(parent SQLNode, node *NotExpr, replace
 		kontinue := !a.pre(&a.cur)
 		if a.cur.revisit {
 			a.cur.revisit = false
-			return a.rewriteExpr(parent, a.cur.node.(Expr), replacer)
+			return a.rewriteSQLNode(parent, a.cur.node, replacer)
 		}
 		if kontinue {
 			return true
@@ -6015,7 +6408,7 @@ func (a *application) rewriteRefOfNtileExpr(parent SQLNode, node *NtileExpr, rep
 		kontinue := !a.pre(&a.cur)
 		if a.cur.revisit {
 			a.cur.revisit = false
-			return a.rewriteExpr(parent, a.cur.node.(Expr), replacer)
+			return a.rewriteSQLNode(parent, a.cur.node, replacer)
 		}
 		if kontinue {
 			return true
@@ -6049,7 +6442,12 @@ func (a *application) rewriteRefOfNullTreatmentClause(parent SQLNode, node *Null
 		a.cur.replacer = replacer
 		a.cur.parent = parent
 		a.cur.node = node
-		if !a.pre(&a.cur) {
+		kontinue := !a.pre(&a.cur)
+		if a.cur.revisit {
+			a.cur.revisit = false
+			return a.rewriteSQLNode(parent, a.cur.node, replacer)
+		}
+		if kontinue {
 			return true
 		}
 	}
@@ -6076,7 +6474,7 @@ func (a *application) rewriteRefOfNullVal(parent SQLNode, node *NullVal, replace
 		kontinue := !a.pre(&a.cur)
 		if a.cur.revisit {
 			a.cur.revisit = false
-			return a.rewriteExpr(parent, a.cur.node.(Expr), replacer)
+			return a.rewriteSQLNode(parent, a.cur.node, replacer)
 		}
 		if kontinue {
 			return true
@@ -6105,7 +6503,7 @@ func (a *application) rewriteRefOfOffset(parent SQLNode, node *Offset, replacer
 		kontinue := !a.pre(&a.cur)
 		if a.cur.revisit {
 			a.cur.revisit = false
-			return a.rewriteExpr(parent, a.cur.node.(Expr), replacer)
+			return a.rewriteSQLNode(parent, a.cur.node, replacer)
 		}
 		if kontinue {
 			return true
@@ -6136,9 +6534,8 @@ func (a *application) rewriteOnDup(parent SQLNode, node OnDup, replacer replacer
 		a.cur.node = node
 		kontinue := !a.pre(&a.cur)
 		if a.cur.revisit {
-			node = a.cur.node.(OnDup)
 			a.cur.revisit = false
-			return a.rewriteOnDup(parent, node, replacer)
+			return a.rewriteSQLNode(parent, a.cur.node, replacer)
 		}
 		if kontinue {
 			return true
@@ -6171,7 +6568,12 @@ func (a *application) rewriteRefOfOptLike(parent SQLNode, node *OptLike, replace
 		a.cur.replacer = replacer
 		a.cur.parent = parent
 		a.cur.node = node
-		if !a.pre(&a.cur) {
+		kontinue := !a.pre(&a.cur)
+		if a.cur.revisit {
+			a.cur.revisit = false
+			return a.rewriteSQLNode(parent, a.cur.node, replacer)
+		}
+		if kontinue {
 			return true
 		}
 	}
@@ -6201,7 +6603,7 @@ func (a *application) rewriteRefOfOrExpr(parent SQLNode, node *OrExpr, replacer
 		kontinue := !a.pre(&a.cur)
 		if a.cur.revisit {
 			a.cur.revisit = false
-			return a.rewriteExpr(parent, a.cur.node.(Expr), replacer)
+			return a.rewriteSQLNode(parent, a.cur.node, replacer)
 		}
 		if kontinue {
 			return true
@@ -6235,7 +6637,12 @@ func (a *application) rewriteRefOfOrder(parent SQLNode, node *Order, replacer re
 		a.cur.replacer = replacer
 		a.cur.parent = parent
 		a.cur.node = node
-		if !a.pre(&a.cur) {
+		kontinue := !a.pre(&a.cur)
+		if a.cur.revisit {
+			a.cur.revisit = false
+			return a.rewriteSQLNode(parent, a.cur.node, replacer)
+		}
+		if kontinue {
 			return true
 		}
 	}
@@ -6264,9 +6671,8 @@ func (a *application) rewriteOrderBy(parent SQLNode, node OrderBy, replacer repl
 		a.cur.node = node
 		kontinue := !a.pre(&a.cur)
 		if a.cur.revisit {
-			node = a.cur.node.(OrderBy)
 			a.cur.revisit = false
-			return a.rewriteOrderBy(parent, node, replacer)
+			return a.rewriteSQLNode(parent, a.cur.node, replacer)
 		}
 		if kontinue {
 			return true
@@ -6299,7 +6705,12 @@ func (a *application) rewriteRefOfOrderByOption(parent SQLNode, node *OrderByOpt
 		a.cur.replacer = replacer
 		a.cur.parent = parent
 		a.cur.node = node
-		if !a.pre(&a.cur) {
+		kontinue := !a.pre(&a.cur)
+		if a.cur.revisit {
+			a.cur.revisit = false
+			return a.rewriteSQLNode(parent, a.cur.node, replacer)
+		}
+		if kontinue {
 			return true
 		}
 	}
@@ -6326,7 +6737,12 @@ func (a *application) rewriteRefOfOtherAdmin(parent SQLNode, node *OtherAdmin, r
 		a.cur.replacer = replacer
 		a.cur.parent = parent
 		a.cur.node = node
-		if !a.pre(&a.cur) {
+		kontinue := !a.pre(&a.cur)
+		if a.cur.revisit {
+			a.cur.revisit = false
+			return a.rewriteSQLNode(parent, a.cur.node, replacer)
+		}
+		if kontinue {
 			return true
 		}
 	}
@@ -6350,7 +6766,12 @@ func (a *application) rewriteRefOfOverClause(parent SQLNode, node *OverClause, r
 		a.cur.replacer = replacer
 		a.cur.parent = parent
 		a.cur.node = node
-		if !a.pre(&a.cur) {
+		kontinue := !a.pre(&a.cur)
+		if a.cur.revisit {
+			a.cur.revisit = false
+			return a.rewriteSQLNode(parent, a.cur.node, replacer)
+		}
+		if kontinue {
 			return true
 		}
 	}
@@ -6382,7 +6803,12 @@ func (a *application) rewriteRefOfParenTableExpr(parent SQLNode, node *ParenTabl
 		a.cur.replacer = replacer
 		a.cur.parent = parent
 		a.cur.node = node
-		if !a.pre(&a.cur) {
+		kontinue := !a.pre(&a.cur)
+		if a.cur.revisit {
+			a.cur.revisit = false
+			return a.rewriteSQLNode(parent, a.cur.node, replacer)
+		}
+		if kontinue {
 			return true
 		}
 	}
@@ -6409,7 +6835,12 @@ func (a *application) rewriteRefOfParsedComments(parent SQLNode, node *ParsedCom
 		a.cur.replacer = replacer
 		a.cur.parent = parent
 		a.cur.node = node
-		if !a.pre(&a.cur) {
+		kontinue := !a.pre(&a.cur)
+		if a.cur.revisit {
+			a.cur.revisit = false
+			return a.rewriteSQLNode(parent, a.cur.node, replacer)
+		}
+		if kontinue {
 			return true
 		}
 	}
@@ -6433,7 +6864,12 @@ func (a *application) rewriteRefOfPartitionDefinition(parent SQLNode, node *Part
 		a.cur.replacer = replacer
 		a.cur.parent = parent
 		a.cur.node = node
-		if !a.pre(&a.cur) {
+		kontinue := !a.pre(&a.cur)
+		if a.cur.revisit {
+			a.cur.revisit = false
+			return a.rewriteSQLNode(parent, a.cur.node, replacer)
+		}
+		if kontinue {
 			return true
 		}
 	}
@@ -6465,7 +6901,12 @@ func (a *application) rewriteRefOfPartitionDefinitionOptions(parent SQLNode, nod
 		a.cur.replacer = replacer
 		a.cur.parent = parent
 		a.cur.node = node
-		if !a.pre(&a.cur) {
+		kontinue := !a.pre(&a.cur)
+		if a.cur.revisit {
+			a.cur.revisit = false
+			return a.rewriteSQLNode(parent, a.cur.node, replacer)
+		}
+		if kontinue {
 			return true
 		}
 	}
@@ -6517,7 +6958,12 @@ func (a *application) rewriteRefOfPartitionEngine(parent SQLNode, node *Partitio
 		a.cur.replacer = replacer
 		a.cur.parent = parent
 		a.cur.node = node
-		if !a.pre(&a.cur) {
+		kontinue := !a.pre(&a.cur)
+		if a.cur.revisit {
+			a.cur.revisit = false
+			return a.rewriteSQLNode(parent, a.cur.node, replacer)
+		}
+		if kontinue {
 			return true
 		}
 	}
@@ -6541,7 +6987,12 @@ func (a *application) rewriteRefOfPartitionOption(parent SQLNode, node *Partitio
 		a.cur.replacer = replacer
 		a.cur.parent = parent
 		a.cur.node = node
-		if !a.pre(&a.cur) {
+		kontinue := !a.pre(&a.cur)
+		if a.cur.revisit {
+			a.cur.revisit = false
+			return a.rewriteSQLNode(parent, a.cur.node, replacer)
+		}
+		if kontinue {
 			return true
 		}
 	}
@@ -6587,7 +7038,12 @@ func (a *application) rewriteRefOfPartitionSpec(parent SQLNode, node *PartitionS
 		a.cur.replacer = replacer
 		a.cur.parent = parent
 		a.cur.node = node
-		if !a.pre(&a.cur) {
+		kontinue := !a.pre(&a.cur)
+		if a.cur.revisit {
+			a.cur.revisit = false
+			return a.rewriteSQLNode(parent, a.cur.node, replacer)
+		}
+		if kontinue {
 			return true
 		}
 	}
@@ -6633,7 +7089,12 @@ func (a *application) rewriteRefOfPartitionValueRange(parent SQLNode, node *Part
 		a.cur.replacer = replacer
 		a.cur.parent = parent
 		a.cur.node = node
-		if !a.pre(&a.cur) {
+		kontinue := !a.pre(&a.cur)
+		if a.cur.revisit {
+			a.cur.revisit = false
+			return a.rewriteSQLNode(parent, a.cur.node, replacer)
+		}
+		if kontinue {
 			return true
 		}
 	}
@@ -6662,9 +7123,8 @@ func (a *application) rewritePartitions(parent SQLNode, node Partitions, replace
 		a.cur.node = node
 		kontinue := !a.pre(&a.cur)
 		if a.cur.revisit {
-			node = a.cur.node.(Partitions)
 			a.cur.revisit = false
-			return a.rewritePartitions(parent, node, replacer)
+			return a.rewriteSQLNode(parent, a.cur.node, replacer)
 		}
 		if kontinue {
 			return true
@@ -6700,7 +7160,7 @@ func (a *application) rewriteRefOfPerformanceSchemaFuncExpr(parent SQLNode, node
 		kontinue := !a.pre(&a.cur)
 		if a.cur.revisit {
 			a.cur.revisit = false
-			return a.rewriteExpr(parent, a.cur.node.(Expr), replacer)
+			return a.rewriteSQLNode(parent, a.cur.node, replacer)
 		}
 		if kontinue {
 			return true
@@ -6732,7 +7192,7 @@ func (a *application) rewriteRefOfPointExpr(parent SQLNode, node *PointExpr, rep
 		kontinue := !a.pre(&a.cur)
 		if a.cur.revisit {
 			a.cur.revisit = false
-			return a.rewriteExpr(parent, a.cur.node.(Expr), replacer)
+			return a.rewriteSQLNode(parent, a.cur.node, replacer)
 		}
 		if kontinue {
 			return true
@@ -6769,7 +7229,7 @@ func (a *application) rewriteRefOfPointPropertyFuncExpr(parent SQLNode, node *Po
 		kontinue := !a.pre(&a.cur)
 		if a.cur.revisit {
 			a.cur.revisit = false
-			return a.rewriteExpr(parent, a.cur.node.(Expr), replacer)
+			return a.rewriteSQLNode(parent, a.cur.node, replacer)
 		}
 		if kontinue {
 			return true
@@ -6806,16 +7266,20 @@ func (a *application) rewriteRefOfPolygonExpr(parent SQLNode, node *PolygonExpr,
 		kontinue := !a.pre(&a.cur)
 		if a.cur.revisit {
 			a.cur.revisit = false
-			return a.rewriteExpr(parent, a.cur.node.(Expr), replacer)
+			return a.rewriteSQLNode(parent, a.cur.node, replacer)
 		}
 		if kontinue {
 			return true
 		}
 	}
-	if !a.rewriteExprs(node, node.LinestringParams, func(newNode, parent SQLNode) {
-		parent.(*PolygonExpr).LinestringParams = newNode.(Exprs)
-	}) {
-		return false
+	for x, el := range node.LinestringParams {
+		if !a.rewriteExpr(node, el, func(idx int) replacerFunc {
+			return func(newNode, parent SQLNode) {
+				parent.(*PolygonExpr).LinestringParams[idx] = newNode.(Expr)
+			}
+		}(x)) {
+			return false
+		}
 	}
 	if a.post != nil {
 		a.cur.replacer = replacer
@@ -6838,7 +7302,7 @@ func (a *application) rewriteRefOfPolygonPropertyFuncExpr(parent SQLNode, node *
 		kontinue := !a.pre(&a.cur)
 		if a.cur.revisit {
 			a.cur.revisit = false
-			return a.rewriteExpr(parent, a.cur.node.(Expr), replacer)
+			return a.rewriteSQLNode(parent, a.cur.node, replacer)
 		}
 		if kontinue {
 			return true
@@ -6872,7 +7336,12 @@ func (a *application) rewriteRefOfPrepareStmt(parent SQLNode, node *PrepareStmt,
 		a.cur.replacer = replacer
 		a.cur.parent = parent
 		a.cur.node = node
-		if !a.pre(&a.cur) {
+		kontinue := !a.pre(&a.cur)
+		if a.cur.revisit {
+			a.cur.revisit = false
+			return a.rewriteSQLNode(parent, a.cur.node, replacer)
+		}
+		if kontinue {
 			return true
 		}
 	}
@@ -6909,7 +7378,12 @@ func (a *application) rewriteRefOfPurgeBinaryLogs(parent SQLNode, node *PurgeBin
 		a.cur.replacer = replacer
 		a.cur.parent = parent
 		a.cur.node = node
-		if !a.pre(&a.cur) {
+		kontinue := !a.pre(&a.cur)
+		if a.cur.revisit {
+			a.cur.revisit = false
+			return a.rewriteSQLNode(parent, a.cur.node, replacer)
+		}
+		if kontinue {
 			return true
 		}
 	}
@@ -6933,7 +7407,12 @@ func (a *application) rewriteRefOfReferenceDefinition(parent SQLNode, node *Refe
 		a.cur.replacer = replacer
 		a.cur.parent = parent
 		a.cur.node = node
-		if !a.pre(&a.cur) {
+		kontinue := !a.pre(&a.cur)
+		if a.cur.revisit {
+			a.cur.revisit = false
+			return a.rewriteSQLNode(parent, a.cur.node, replacer)
+		}
+		if kontinue {
 			return true
 		}
 	}
@@ -6983,7 +7462,7 @@ func (a *application) rewriteRefOfRegexpInstrExpr(parent SQLNode, node *RegexpIn
 		kontinue := !a.pre(&a.cur)
 		if a.cur.revisit {
 			a.cur.revisit = false
-			return a.rewriteExpr(parent, a.cur.node.(Expr), replacer)
+			return a.rewriteSQLNode(parent, a.cur.node, replacer)
 		}
 		if kontinue {
 			return true
@@ -7040,7 +7519,7 @@ func (a *application) rewriteRefOfRegexpLikeExpr(parent SQLNode, node *RegexpLik
 		kontinue := !a.pre(&a.cur)
 		if a.cur.revisit {
 			a.cur.revisit = false
-			return a.rewriteExpr(parent, a.cur.node.(Expr), replacer)
+			return a.rewriteSQLNode(parent, a.cur.node, replacer)
 		}
 		if kontinue {
 			return true
@@ -7082,7 +7561,7 @@ func (a *application) rewriteRefOfRegexpReplaceExpr(parent SQLNode, node *Regexp
 		kontinue := !a.pre(&a.cur)
 		if a.cur.revisit {
 			a.cur.revisit = false
-			return a.rewriteExpr(parent, a.cur.node.(Expr), replacer)
+			return a.rewriteSQLNode(parent, a.cur.node, replacer)
 		}
 		if kontinue {
 			return true
@@ -7139,7 +7618,7 @@ func (a *application) rewriteRefOfRegexpSubstrExpr(parent SQLNode, node *RegexpS
 		kontinue := !a.pre(&a.cur)
 		if a.cur.revisit {
 			a.cur.revisit = false
-			return a.rewriteExpr(parent, a.cur.node.(Expr), replacer)
+			return a.rewriteSQLNode(parent, a.cur.node, replacer)
 		}
 		if kontinue {
 			return true
@@ -7188,7 +7667,12 @@ func (a *application) rewriteRefOfRelease(parent SQLNode, node *Release, replace
 		a.cur.replacer = replacer
 		a.cur.parent = parent
 		a.cur.node = node
-		if !a.pre(&a.cur) {
+		kontinue := !a.pre(&a.cur)
+		if a.cur.revisit {
+			a.cur.revisit = false
+			return a.rewriteSQLNode(parent, a.cur.node, replacer)
+		}
+		if kontinue {
 			return true
 		}
 	}
@@ -7215,7 +7699,12 @@ func (a *application) rewriteRefOfRenameColumn(parent SQLNode, node *RenameColum
 		a.cur.replacer = replacer
 		a.cur.parent = parent
 		a.cur.node = node
-		if !a.pre(&a.cur) {
+		kontinue := !a.pre(&a.cur)
+		if a.cur.revisit {
+			a.cur.revisit = false
+			return a.rewriteSQLNode(parent, a.cur.node, replacer)
+		}
+		if kontinue {
 			return true
 		}
 	}
@@ -7247,7 +7736,12 @@ func (a *application) rewriteRefOfRenameIndex(parent SQLNode, node *RenameIndex,
 		a.cur.replacer = replacer
 		a.cur.parent = parent
 		a.cur.node = node
-		if !a.pre(&a.cur) {
+		kontinue := !a.pre(&a.cur)
+		if a.cur.revisit {
+			a.cur.revisit = false
+			return a.rewriteSQLNode(parent, a.cur.node, replacer)
+		}
+		if kontinue {
 			return true
 		}
 	}
@@ -7279,7 +7773,12 @@ func (a *application) rewriteRefOfRenameTable(parent SQLNode, node *RenameTable,
 		a.cur.replacer = replacer
 		a.cur.parent = parent
 		a.cur.node = node
-		if !a.pre(&a.cur) {
+		kontinue := !a.pre(&a.cur)
+		if a.cur.revisit {
+			a.cur.revisit = false
+			return a.rewriteSQLNode(parent, a.cur.node, replacer)
+		}
+		if kontinue {
 			return true
 		}
 	}
@@ -7303,7 +7802,12 @@ func (a *application) rewriteRefOfRenameTableName(parent SQLNode, node *RenameTa
 		a.cur.replacer = replacer
 		a.cur.parent = parent
 		a.cur.node = node
-		if !a.pre(&a.cur) {
+		kontinue := !a.pre(&a.cur)
+		if a.cur.revisit {
+			a.cur.revisit = false
+			return a.rewriteSQLNode(parent, a.cur.node, replacer)
+		}
+		if kontinue {
 			return true
 		}
 	}
@@ -7330,7 +7834,12 @@ func (a *application) rewriteRefOfRevertMigration(parent SQLNode, node *RevertMi
 		a.cur.replacer = replacer
 		a.cur.parent = parent
 		a.cur.node = node
-		if !a.pre(&a.cur) {
+		kontinue := !a.pre(&a.cur)
+		if a.cur.revisit {
+			a.cur.revisit = false
+			return a.rewriteSQLNode(parent, a.cur.node, replacer)
+		}
+		if kontinue {
 			return true
 		}
 	}
@@ -7357,7 +7866,12 @@ func (a *application) rewriteRefOfRollback(parent SQLNode, node *Rollback, repla
 		a.cur.replacer = replacer
 		a.cur.parent = parent
 		a.cur.node = node
-		if !a.pre(&a.cur) {
+		kontinue := !a.pre(&a.cur)
+		if a.cur.revisit {
+			a.cur.revisit = false
+			return a.rewriteSQLNode(parent, a.cur.node, replacer)
+		}
+		if kontinue {
 			return true
 		}
 	}
@@ -7378,7 +7892,12 @@ func (a *application) rewriteRootNode(parent SQLNode, node RootNode, replacer re
 		a.cur.replacer = replacer
 		a.cur.parent = parent
 		a.cur.node = node
-		if !a.pre(&a.cur) {
+		kontinue := !a.pre(&a.cur)
+		if a.cur.revisit {
+			a.cur.revisit = false
+			return a.rewriteSQLNode(parent, a.cur.node, replacer)
+		}
+		if kontinue {
 			return true
 		}
 	}
@@ -7405,7 +7924,12 @@ func (a *application) rewriteRefOfRowAlias(parent SQLNode, node *RowAlias, repla
 		a.cur.replacer = replacer
 		a.cur.parent = parent
 		a.cur.node = node
-		if !a.pre(&a.cur) {
+		kontinue := !a.pre(&a.cur)
+		if a.cur.revisit {
+			a.cur.revisit = false
+			return a.rewriteSQLNode(parent, a.cur.node, replacer)
+		}
+		if kontinue {
 			return true
 		}
 	}
@@ -7437,7 +7961,12 @@ func (a *application) rewriteRefOfSRollback(parent SQLNode, node *SRollback, rep
 		a.cur.replacer = replacer
 		a.cur.parent = parent
 		a.cur.node = node
-		if !a.pre(&a.cur) {
+		kontinue := !a.pre(&a.cur)
+		if a.cur.revisit {
+			a.cur.revisit = false
+			return a.rewriteSQLNode(parent, a.cur.node, replacer)
+		}
+		if kontinue {
 			return true
 		}
 	}
@@ -7464,7 +7993,12 @@ func (a *application) rewriteRefOfSavepoint(parent SQLNode, node *Savepoint, rep
 		a.cur.replacer = replacer
 		a.cur.parent = parent
 		a.cur.node = node
-		if !a.pre(&a.cur) {
+		kontinue := !a.pre(&a.cur)
+		if a.cur.revisit {
+			a.cur.revisit = false
+			return a.rewriteSQLNode(parent, a.cur.node, replacer)
+		}
+		if kontinue {
 			return true
 		}
 	}
@@ -7491,7 +8025,12 @@ func (a *application) rewriteRefOfSelect(parent SQLNode, node *Select, replacer
 		a.cur.replacer = replacer
 		a.cur.parent = parent
 		a.cur.node = node
-		if !a.pre(&a.cur) {
+		kontinue := !a.pre(&a.cur)
+		if a.cur.revisit {
+			a.cur.revisit = false
+			return a.rewriteSQLNode(parent, a.cur.node, replacer)
+		}
+		if kontinue {
 			return true
 		}
 	}
@@ -7514,8 +8053,8 @@ func (a *application) rewriteRefOfSelect(parent SQLNode, node *Select, replacer
 	}) {
 		return false
 	}
-	if !a.rewriteSelectExprs(node, node.SelectExprs, func(newNode, parent SQLNode) {
-		parent.(*Select).SelectExprs = newNode.(SelectExprs)
+	if !a.rewriteRefOfSelectExprs(node, node.SelectExprs, func(newNode, parent SQLNode) {
+		parent.(*Select).SelectExprs = newNode.(*SelectExprs)
 	}) {
 		return false
 	}
@@ -7564,7 +8103,7 @@ func (a *application) rewriteRefOfSelect(parent SQLNode, node *Select, replacer
 	}
 	return true
 }
-func (a *application) rewriteSelectExprs(parent SQLNode, node SelectExprs, replacer replacerFunc) bool {
+func (a *application) rewriteRefOfSelectExprs(parent SQLNode, node *SelectExprs, replacer replacerFunc) bool {
 	if node == nil {
 		return true
 	}
@@ -7574,18 +8113,17 @@ func (a *application) rewriteSelectExprs(parent SQLNode, node SelectExprs, repla
 		a.cur.node = node
 		kontinue := !a.pre(&a.cur)
 		if a.cur.revisit {
-			node = a.cur.node.(SelectExprs)
 			a.cur.revisit = false
-			return a.rewriteSelectExprs(parent, node, replacer)
+			return a.rewriteSQLNode(parent, a.cur.node, replacer)
 		}
 		if kontinue {
 			return true
 		}
 	}
-	for x, el := range node {
+	for x, el := range node.Exprs {
 		if !a.rewriteSelectExpr(node, el, func(idx int) replacerFunc {
 			return func(newNode, parent SQLNode) {
-				parent.(SelectExprs)[idx] = newNode.(SelectExpr)
+				parent.(*SelectExprs).Exprs[idx] = newNode.(SelectExpr)
 			}
 		}(x)) {
 			return false
@@ -7609,7 +8147,12 @@ func (a *application) rewriteRefOfSelectInto(parent SQLNode, node *SelectInto, r
 		a.cur.replacer = replacer
 		a.cur.parent = parent
 		a.cur.node = node
-		if !a.pre(&a.cur) {
+		kontinue := !a.pre(&a.cur)
+		if a.cur.revisit {
+			a.cur.revisit = false
+			return a.rewriteSQLNode(parent, a.cur.node, replacer)
+		}
+		if kontinue {
 			return true
 		}
 	}
@@ -7633,7 +8176,12 @@ func (a *application) rewriteRefOfSet(parent SQLNode, node *Set, replacer replac
 		a.cur.replacer = replacer
 		a.cur.parent = parent
 		a.cur.node = node
-		if !a.pre(&a.cur) {
+		kontinue := !a.pre(&a.cur)
+		if a.cur.revisit {
+			a.cur.revisit = false
+			return a.rewriteSQLNode(parent, a.cur.node, replacer)
+		}
+		if kontinue {
 			return true
 		}
 	}
@@ -7665,7 +8213,12 @@ func (a *application) rewriteRefOfSetExpr(parent SQLNode, node *SetExpr, replace
 		a.cur.replacer = replacer
 		a.cur.parent = parent
 		a.cur.node = node
-		if !a.pre(&a.cur) {
+		kontinue := !a.pre(&a.cur)
+		if a.cur.revisit {
+			a.cur.revisit = false
+			return a.rewriteSQLNode(parent, a.cur.node, replacer)
+		}
+		if kontinue {
 			return true
 		}
 	}
@@ -7699,9 +8252,8 @@ func (a *application) rewriteSetExprs(parent SQLNode, node SetExprs, replacer re
 		a.cur.node = node
 		kontinue := !a.pre(&a.cur)
 		if a.cur.revisit {
-			node = a.cur.node.(SetExprs)
 			a.cur.revisit = false
-			return a.rewriteSetExprs(parent, node, replacer)
+			return a.rewriteSQLNode(parent, a.cur.node, replacer)
 		}
 		if kontinue {
 			return true
@@ -7734,7 +8286,12 @@ func (a *application) rewriteRefOfShow(parent SQLNode, node *Show, replacer repl
 		a.cur.replacer = replacer
 		a.cur.parent = parent
 		a.cur.node = node
-		if !a.pre(&a.cur) {
+		kontinue := !a.pre(&a.cur)
+		if a.cur.revisit {
+			a.cur.revisit = false
+			return a.rewriteSQLNode(parent, a.cur.node, replacer)
+		}
+		if kontinue {
 			return true
 		}
 	}
@@ -7761,7 +8318,12 @@ func (a *application) rewriteRefOfShowBasic(parent SQLNode, node *ShowBasic, rep
 		a.cur.replacer = replacer
 		a.cur.parent = parent
 		a.cur.node = node
-		if !a.pre(&a.cur) {
+		kontinue := !a.pre(&a.cur)
+		if a.cur.revisit {
+			a.cur.revisit = false
+			return a.rewriteSQLNode(parent, a.cur.node, replacer)
+		}
+		if kontinue {
 			return true
 		}
 	}
@@ -7798,7 +8360,12 @@ func (a *application) rewriteRefOfShowCreate(parent SQLNode, node *ShowCreate, r
 		a.cur.replacer = replacer
 		a.cur.parent = parent
 		a.cur.node = node
-		if !a.pre(&a.cur) {
+		kontinue := !a.pre(&a.cur)
+		if a.cur.revisit {
+			a.cur.revisit = false
+			return a.rewriteSQLNode(parent, a.cur.node, replacer)
+		}
+		if kontinue {
 			return true
 		}
 	}
@@ -7825,7 +8392,12 @@ func (a *application) rewriteRefOfShowFilter(parent SQLNode, node *ShowFilter, r
 		a.cur.replacer = replacer
 		a.cur.parent = parent
 		a.cur.node = node
-		if !a.pre(&a.cur) {
+		kontinue := !a.pre(&a.cur)
+		if a.cur.revisit {
+			a.cur.revisit = false
+			return a.rewriteSQLNode(parent, a.cur.node, replacer)
+		}
+		if kontinue {
 			return true
 		}
 	}
@@ -7852,7 +8424,12 @@ func (a *application) rewriteRefOfShowMigrationLogs(parent SQLNode, node *ShowMi
 		a.cur.replacer = replacer
 		a.cur.parent = parent
 		a.cur.node = node
-		if !a.pre(&a.cur) {
+		kontinue := !a.pre(&a.cur)
+		if a.cur.revisit {
+			a.cur.revisit = false
+			return a.rewriteSQLNode(parent, a.cur.node, replacer)
+		}
+		if kontinue {
 			return true
 		}
 	}
@@ -7879,7 +8456,12 @@ func (a *application) rewriteRefOfShowOther(parent SQLNode, node *ShowOther, rep
 		a.cur.replacer = replacer
 		a.cur.parent = parent
 		a.cur.node = node
-		if !a.pre(&a.cur) {
+		kontinue := !a.pre(&a.cur)
+		if a.cur.revisit {
+			a.cur.revisit = false
+			return a.rewriteSQLNode(parent, a.cur.node, replacer)
+		}
+		if kontinue {
 			return true
 		}
 	}
@@ -7903,7 +8485,12 @@ func (a *application) rewriteRefOfShowThrottledApps(parent SQLNode, node *ShowTh
 		a.cur.replacer = replacer
 		a.cur.parent = parent
 		a.cur.node = node
-		if !a.pre(&a.cur) {
+		kontinue := !a.pre(&a.cur)
+		if a.cur.revisit {
+			a.cur.revisit = false
+			return a.rewriteSQLNode(parent, a.cur.node, replacer)
+		}
+		if kontinue {
 			return true
 		}
 	}
@@ -7927,7 +8514,12 @@ func (a *application) rewriteRefOfShowThrottlerStatus(parent SQLNode, node *Show
 		a.cur.replacer = replacer
 		a.cur.parent = parent
 		a.cur.node = node
-		if !a.pre(&a.cur) {
+		kontinue := !a.pre(&a.cur)
+		if a.cur.revisit {
+			a.cur.revisit = false
+			return a.rewriteSQLNode(parent, a.cur.node, replacer)
+		}
+		if kontinue {
 			return true
 		}
 	}
@@ -7951,7 +8543,12 @@ func (a *application) rewriteRefOfShowTransactionStatus(parent SQLNode, node *Sh
 		a.cur.replacer = replacer
 		a.cur.parent = parent
 		a.cur.node = node
-		if !a.pre(&a.cur) {
+		kontinue := !a.pre(&a.cur)
+		if a.cur.revisit {
+			a.cur.revisit = false
+			return a.rewriteSQLNode(parent, a.cur.node, replacer)
+		}
+		if kontinue {
 			return true
 		}
 	}
@@ -7975,7 +8572,12 @@ func (a *application) rewriteRefOfStarExpr(parent SQLNode, node *StarExpr, repla
 		a.cur.replacer = replacer
 		a.cur.parent = parent
 		a.cur.node = node
-		if !a.pre(&a.cur) {
+		kontinue := !a.pre(&a.cur)
+		if a.cur.revisit {
+			a.cur.revisit = false
+			return a.rewriteSQLNode(parent, a.cur.node, replacer)
+		}
+		if kontinue {
 			return true
 		}
 	}
@@ -8005,7 +8607,7 @@ func (a *application) rewriteRefOfStd(parent SQLNode, node *Std, replacer replac
 		kontinue := !a.pre(&a.cur)
 		if a.cur.revisit {
 			a.cur.revisit = false
-			return a.rewriteExpr(parent, a.cur.node.(Expr), replacer)
+			return a.rewriteSQLNode(parent, a.cur.node, replacer)
 		}
 		if kontinue {
 			return true
@@ -8042,7 +8644,7 @@ func (a *application) rewriteRefOfStdDev(parent SQLNode, node *StdDev, replacer
 		kontinue := !a.pre(&a.cur)
 		if a.cur.revisit {
 			a.cur.revisit = false
-			return a.rewriteExpr(parent, a.cur.node.(Expr), replacer)
+			return a.rewriteSQLNode(parent, a.cur.node, replacer)
 		}
 		if kontinue {
 			return true
@@ -8079,7 +8681,7 @@ func (a *application) rewriteRefOfStdPop(parent SQLNode, node *StdPop, replacer
 		kontinue := !a.pre(&a.cur)
 		if a.cur.revisit {
 			a.cur.revisit = false
-			return a.rewriteExpr(parent, a.cur.node.(Expr), replacer)
+			return a.rewriteSQLNode(parent, a.cur.node, replacer)
 		}
 		if kontinue {
 			return true
@@ -8116,7 +8718,7 @@ func (a *application) rewriteRefOfStdSamp(parent SQLNode, node *StdSamp, replace
 		kontinue := !a.pre(&a.cur)
 		if a.cur.revisit {
 			a.cur.revisit = false
-			return a.rewriteExpr(parent, a.cur.node.(Expr), replacer)
+			return a.rewriteSQLNode(parent, a.cur.node, replacer)
 		}
 		if kontinue {
 			return true
@@ -8150,7 +8752,12 @@ func (a *application) rewriteRefOfStream(parent SQLNode, node *Stream, replacer
 		a.cur.replacer = replacer
 		a.cur.parent = parent
 		a.cur.node = node
-		if !a.pre(&a.cur) {
+		kontinue := !a.pre(&a.cur)
+		if a.cur.revisit {
+			a.cur.revisit = false
+			return a.rewriteSQLNode(parent, a.cur.node, replacer)
+		}
+		if kontinue {
 			return true
 		}
 	}
@@ -8187,7 +8794,12 @@ func (a *application) rewriteRefOfSubPartition(parent SQLNode, node *SubPartitio
 		a.cur.replacer = replacer
 		a.cur.parent = parent
 		a.cur.node = node
-		if !a.pre(&a.cur) {
+		kontinue := !a.pre(&a.cur)
+		if a.cur.revisit {
+			a.cur.revisit = false
+			return a.rewriteSQLNode(parent, a.cur.node, replacer)
+		}
+		if kontinue {
 			return true
 		}
 	}
@@ -8219,7 +8831,12 @@ func (a *application) rewriteRefOfSubPartitionDefinition(parent SQLNode, node *S
 		a.cur.replacer = replacer
 		a.cur.parent = parent
 		a.cur.node = node
-		if !a.pre(&a.cur) {
+		kontinue := !a.pre(&a.cur)
+		if a.cur.revisit {
+			a.cur.revisit = false
+			return a.rewriteSQLNode(parent, a.cur.node, replacer)
+		}
+		if kontinue {
 			return true
 		}
 	}
@@ -8251,7 +8868,12 @@ func (a *application) rewriteRefOfSubPartitionDefinitionOptions(parent SQLNode,
 		a.cur.replacer = replacer
 		a.cur.parent = parent
 		a.cur.node = node
-		if !a.pre(&a.cur) {
+		kontinue := !a.pre(&a.cur)
+		if a.cur.revisit {
+			a.cur.revisit = false
+			return a.rewriteSQLNode(parent, a.cur.node, replacer)
+		}
+		if kontinue {
 			return true
 		}
 	}
@@ -8295,9 +8917,8 @@ func (a *application) rewriteSubPartitionDefinitions(parent SQLNode, node SubPar
 		a.cur.node = node
 		kontinue := !a.pre(&a.cur)
 		if a.cur.revisit {
-			node = a.cur.node.(SubPartitionDefinitions)
 			a.cur.revisit = false
-			return a.rewriteSubPartitionDefinitions(parent, node, replacer)
+			return a.rewriteSQLNode(parent, a.cur.node, replacer)
 		}
 		if kontinue {
 			return true
@@ -8333,7 +8954,7 @@ func (a *application) rewriteRefOfSubquery(parent SQLNode, node *Subquery, repla
 		kontinue := !a.pre(&a.cur)
 		if a.cur.revisit {
 			a.cur.revisit = false
-			return a.rewriteExpr(parent, a.cur.node.(Expr), replacer)
+			return a.rewriteSQLNode(parent, a.cur.node, replacer)
 		}
 		if kontinue {
 			return true
@@ -8365,7 +8986,7 @@ func (a *application) rewriteRefOfSubstrExpr(parent SQLNode, node *SubstrExpr, r
 		kontinue := !a.pre(&a.cur)
 		if a.cur.revisit {
 			a.cur.revisit = false
-			return a.rewriteExpr(parent, a.cur.node.(Expr), replacer)
+			return a.rewriteSQLNode(parent, a.cur.node, replacer)
 		}
 		if kontinue {
 			return true
@@ -8407,7 +9028,7 @@ func (a *application) rewriteRefOfSum(parent SQLNode, node *Sum, replacer replac
 		kontinue := !a.pre(&a.cur)
 		if a.cur.revisit {
 			a.cur.revisit = false
-			return a.rewriteExpr(parent, a.cur.node.(Expr), replacer)
+			return a.rewriteSQLNode(parent, a.cur.node, replacer)
 		}
 		if kontinue {
 			return true
@@ -8443,9 +9064,8 @@ func (a *application) rewriteTableExprs(parent SQLNode, node TableExprs, replace
 		a.cur.node = node
 		kontinue := !a.pre(&a.cur)
 		if a.cur.revisit {
-			node = a.cur.node.(TableExprs)
 			a.cur.revisit = false
-			return a.rewriteTableExprs(parent, node, replacer)
+			return a.rewriteSQLNode(parent, a.cur.node, replacer)
 		}
 		if kontinue {
 			return true
@@ -8475,7 +9095,12 @@ func (a *application) rewriteTableName(parent SQLNode, node TableName, replacer
 		a.cur.replacer = replacer
 		a.cur.parent = parent
 		a.cur.node = node
-		if !a.pre(&a.cur) {
+		kontinue := !a.pre(&a.cur)
+		if a.cur.revisit {
+			a.cur.revisit = false
+			return a.rewriteSQLNode(parent, a.cur.node, replacer)
+		}
+		if kontinue {
 			return true
 		}
 	}
@@ -8509,9 +9134,8 @@ func (a *application) rewriteTableNames(parent SQLNode, node TableNames, replace
 		a.cur.node = node
 		kontinue := !a.pre(&a.cur)
 		if a.cur.revisit {
-			node = a.cur.node.(TableNames)
 			a.cur.revisit = false
-			return a.rewriteTableNames(parent, node, replacer)
+			return a.rewriteSQLNode(parent, a.cur.node, replacer)
 		}
 		if kontinue {
 			return true
@@ -8546,9 +9170,8 @@ func (a *application) rewriteTableOptions(parent SQLNode, node TableOptions, rep
 		a.cur.node = node
 		kontinue := !a.pre(&a.cur)
 		if a.cur.revisit {
-			node = a.cur.node.(TableOptions)
 			a.cur.revisit = false
-			return a.rewriteTableOptions(parent, node, replacer)
+			return a.rewriteSQLNode(parent, a.cur.node, replacer)
 		}
 		if kontinue {
 			return true
@@ -8574,7 +9197,12 @@ func (a *application) rewriteRefOfTableSpec(parent SQLNode, node *TableSpec, rep
 		a.cur.replacer = replacer
 		a.cur.parent = parent
 		a.cur.node = node
-		if !a.pre(&a.cur) {
+		kontinue := !a.pre(&a.cur)
+		if a.cur.revisit {
+			a.cur.revisit = false
+			return a.rewriteSQLNode(parent, a.cur.node, replacer)
+		}
+		if kontinue {
 			return true
 		}
 	}
@@ -8633,7 +9261,12 @@ func (a *application) rewriteRefOfTablespaceOperation(parent SQLNode, node *Tabl
 		a.cur.replacer = replacer
 		a.cur.parent = parent
 		a.cur.node = node
-		if !a.pre(&a.cur) {
+		kontinue := !a.pre(&a.cur)
+		if a.cur.revisit {
+			a.cur.revisit = false
+			return a.rewriteSQLNode(parent, a.cur.node, replacer)
+		}
+		if kontinue {
 			return true
 		}
 	}
@@ -8660,7 +9293,7 @@ func (a *application) rewriteRefOfTimestampDiffExpr(parent SQLNode, node *Timest
 		kontinue := !a.pre(&a.cur)
 		if a.cur.revisit {
 			a.cur.revisit = false
-			return a.rewriteExpr(parent, a.cur.node.(Expr), replacer)
+			return a.rewriteSQLNode(parent, a.cur.node, replacer)
 		}
 		if kontinue {
 			return true
@@ -8697,7 +9330,7 @@ func (a *application) rewriteRefOfTrimFuncExpr(parent SQLNode, node *TrimFuncExp
 		kontinue := !a.pre(&a.cur)
 		if a.cur.revisit {
 			a.cur.revisit = false
-			return a.rewriteExpr(parent, a.cur.node.(Expr), replacer)
+			return a.rewriteSQLNode(parent, a.cur.node, replacer)
 		}
 		if kontinue {
 			return true
@@ -8731,7 +9364,12 @@ func (a *application) rewriteRefOfTruncateTable(parent SQLNode, node *TruncateTa
 		a.cur.replacer = replacer
 		a.cur.parent = parent
 		a.cur.node = node
-		if !a.pre(&a.cur) {
+		kontinue := !a.pre(&a.cur)
+		if a.cur.revisit {
+			a.cur.revisit = false
+			return a.rewriteSQLNode(parent, a.cur.node, replacer)
+		}
+		if kontinue {
 			return true
 		}
 	}
@@ -8761,7 +9399,7 @@ func (a *application) rewriteRefOfUnaryExpr(parent SQLNode, node *UnaryExpr, rep
 		kontinue := !a.pre(&a.cur)
 		if a.cur.revisit {
 			a.cur.revisit = false
-			return a.rewriteExpr(parent, a.cur.node.(Expr), replacer)
+			return a.rewriteSQLNode(parent, a.cur.node, replacer)
 		}
 		if kontinue {
 			return true
@@ -8790,7 +9428,12 @@ func (a *application) rewriteRefOfUnion(parent SQLNode, node *Union, replacer re
 		a.cur.replacer = replacer
 		a.cur.parent = parent
 		a.cur.node = node
-		if !a.pre(&a.cur) {
+		kontinue := !a.pre(&a.cur)
+		if a.cur.revisit {
+			a.cur.revisit = false
+			return a.rewriteSQLNode(parent, a.cur.node, replacer)
+		}
+		if kontinue {
 			return true
 		}
 	}
@@ -8842,7 +9485,12 @@ func (a *application) rewriteRefOfUnlockTables(parent SQLNode, node *UnlockTable
 		a.cur.replacer = replacer
 		a.cur.parent = parent
 		a.cur.node = node
-		if !a.pre(&a.cur) {
+		kontinue := !a.pre(&a.cur)
+		if a.cur.revisit {
+			a.cur.revisit = false
+			return a.rewriteSQLNode(parent, a.cur.node, replacer)
+		}
+		if kontinue {
 			return true
 		}
 	}
@@ -8866,7 +9514,12 @@ func (a *application) rewriteRefOfUpdate(parent SQLNode, node *Update, replacer
 		a.cur.replacer = replacer
 		a.cur.parent = parent
 		a.cur.node = node
-		if !a.pre(&a.cur) {
+		kontinue := !a.pre(&a.cur)
+		if a.cur.revisit {
+			a.cur.revisit = false
+			return a.rewriteSQLNode(parent, a.cur.node, replacer)
+		}
+		if kontinue {
 			return true
 		}
 	}
@@ -8927,7 +9580,12 @@ func (a *application) rewriteRefOfUpdateExpr(parent SQLNode, node *UpdateExpr, r
 		a.cur.replacer = replacer
 		a.cur.parent = parent
 		a.cur.node = node
-		if !a.pre(&a.cur) {
+		kontinue := !a.pre(&a.cur)
+		if a.cur.revisit {
+			a.cur.revisit = false
+			return a.rewriteSQLNode(parent, a.cur.node, replacer)
+		}
+		if kontinue {
 			return true
 		}
 	}
@@ -8961,9 +9619,8 @@ func (a *application) rewriteUpdateExprs(parent SQLNode, node UpdateExprs, repla
 		a.cur.node = node
 		kontinue := !a.pre(&a.cur)
 		if a.cur.revisit {
-			node = a.cur.node.(UpdateExprs)
 			a.cur.revisit = false
-			return a.rewriteUpdateExprs(parent, node, replacer)
+			return a.rewriteSQLNode(parent, a.cur.node, replacer)
 		}
 		if kontinue {
 			return true
@@ -8999,7 +9656,7 @@ func (a *application) rewriteRefOfUpdateXMLExpr(parent SQLNode, node *UpdateXMLE
 		kontinue := !a.pre(&a.cur)
 		if a.cur.revisit {
 			a.cur.revisit = false
-			return a.rewriteExpr(parent, a.cur.node.(Expr), replacer)
+			return a.rewriteSQLNode(parent, a.cur.node, replacer)
 		}
 		if kontinue {
 			return true
@@ -9038,7 +9695,12 @@ func (a *application) rewriteRefOfUse(parent SQLNode, node *Use, replacer replac
 		a.cur.replacer = replacer
 		a.cur.parent = parent
 		a.cur.node = node
-		if !a.pre(&a.cur) {
+		kontinue := !a.pre(&a.cur)
+		if a.cur.revisit {
+			a.cur.revisit = false
+			return a.rewriteSQLNode(parent, a.cur.node, replacer)
+		}
+		if kontinue {
 			return true
 		}
 	}
@@ -9065,7 +9727,12 @@ func (a *application) rewriteRefOfVExplainStmt(parent SQLNode, node *VExplainStm
 		a.cur.replacer = replacer
 		a.cur.parent = parent
 		a.cur.node = node
-		if !a.pre(&a.cur) {
+		kontinue := !a.pre(&a.cur)
+		if a.cur.revisit {
+			a.cur.revisit = false
+			return a.rewriteSQLNode(parent, a.cur.node, replacer)
+		}
+		if kontinue {
 			return true
 		}
 	}
@@ -9097,7 +9764,12 @@ func (a *application) rewriteRefOfVStream(parent SQLNode, node *VStream, replace
 		a.cur.replacer = replacer
 		a.cur.parent = parent
 		a.cur.node = node
-		if !a.pre(&a.cur) {
+		kontinue := !a.pre(&a.cur)
+		if a.cur.revisit {
+			a.cur.revisit = false
+			return a.rewriteSQLNode(parent, a.cur.node, replacer)
+		}
+		if kontinue {
 			return true
 		}
 	}
@@ -9146,9 +9818,8 @@ func (a *application) rewriteValTuple(parent SQLNode, node ValTuple, replacer re
 		a.cur.node = node
 		kontinue := !a.pre(&a.cur)
 		if a.cur.revisit {
-			node = a.cur.node.(ValTuple)
 			a.cur.revisit = false
-			return a.rewriteValTuple(parent, node, replacer)
+			return a.rewriteSQLNode(parent, a.cur.node, replacer)
 		}
 		if kontinue {
 			return true
@@ -9181,7 +9852,12 @@ func (a *application) rewriteRefOfValidation(parent SQLNode, node *Validation, r
 		a.cur.replacer = replacer
 		a.cur.parent = parent
 		a.cur.node = node
-		if !a.pre(&a.cur) {
+		kontinue := !a.pre(&a.cur)
+		if a.cur.revisit {
+			a.cur.revisit = false
+			return a.rewriteSQLNode(parent, a.cur.node, replacer)
+		}
+		if kontinue {
 			return true
 		}
 	}
@@ -9207,9 +9883,8 @@ func (a *application) rewriteValues(parent SQLNode, node Values, replacer replac
 		a.cur.node = node
 		kontinue := !a.pre(&a.cur)
 		if a.cur.revisit {
-			node = a.cur.node.(Values)
 			a.cur.revisit = false
-			return a.rewriteValues(parent, node, replacer)
+			return a.rewriteSQLNode(parent, a.cur.node, replacer)
 		}
 		if kontinue {
 			return true
@@ -9245,7 +9920,7 @@ func (a *application) rewriteRefOfValuesFuncExpr(parent SQLNode, node *ValuesFun
 		kontinue := !a.pre(&a.cur)
 		if a.cur.revisit {
 			a.cur.revisit = false
-			return a.rewriteExpr(parent, a.cur.node.(Expr), replacer)
+			return a.rewriteSQLNode(parent, a.cur.node, replacer)
 		}
 		if kontinue {
 			return true
@@ -9274,7 +9949,12 @@ func (a *application) rewriteRefOfValuesStatement(parent SQLNode, node *ValuesSt
 		a.cur.replacer = replacer
 		a.cur.parent = parent
 		a.cur.node = node
-		if !a.pre(&a.cur) {
+		kontinue := !a.pre(&a.cur)
+		if a.cur.revisit {
+			a.cur.revisit = false
+			return a.rewriteSQLNode(parent, a.cur.node, replacer)
+		}
+		if kontinue {
 			return true
 		}
 	}
@@ -9329,7 +10009,7 @@ func (a *application) rewriteRefOfVarPop(parent SQLNode, node *VarPop, replacer
 		kontinue := !a.pre(&a.cur)
 		if a.cur.revisit {
 			a.cur.revisit = false
-			return a.rewriteExpr(parent, a.cur.node.(Expr), replacer)
+			return a.rewriteSQLNode(parent, a.cur.node, replacer)
 		}
 		if kontinue {
 			return true
@@ -9366,7 +10046,7 @@ func (a *application) rewriteRefOfVarSamp(parent SQLNode, node *VarSamp, replace
 		kontinue := !a.pre(&a.cur)
 		if a.cur.revisit {
 			a.cur.revisit = false
-			return a.rewriteExpr(parent, a.cur.node.(Expr), replacer)
+			return a.rewriteSQLNode(parent, a.cur.node, replacer)
 		}
 		if kontinue {
 			return true
@@ -9403,7 +10083,7 @@ func (a *application) rewriteRefOfVariable(parent SQLNode, node *Variable, repla
 		kontinue := !a.pre(&a.cur)
 		if a.cur.revisit {
 			a.cur.revisit = false
-			return a.rewriteExpr(parent, a.cur.node.(Expr), replacer)
+			return a.rewriteSQLNode(parent, a.cur.node, replacer)
 		}
 		if kontinue {
 			return true
@@ -9435,7 +10115,7 @@ func (a *application) rewriteRefOfVariance(parent SQLNode, node *Variance, repla
 		kontinue := !a.pre(&a.cur)
 		if a.cur.revisit {
 			a.cur.revisit = false
-			return a.rewriteExpr(parent, a.cur.node.(Expr), replacer)
+			return a.rewriteSQLNode(parent, a.cur.node, replacer)
 		}
 		if kontinue {
 			return true
@@ -9466,7 +10146,12 @@ func (a *application) rewriteVindexParam(parent SQLNode, node VindexParam, repla
 		a.cur.replacer = replacer
 		a.cur.parent = parent
 		a.cur.node = node
-		if !a.pre(&a.cur) {
+		kontinue := !a.pre(&a.cur)
+		if a.cur.revisit {
+			a.cur.revisit = false
+			return a.rewriteSQLNode(parent, a.cur.node, replacer)
+		}
+		if kontinue {
 			return true
 		}
 	}
@@ -9493,7 +10178,12 @@ func (a *application) rewriteRefOfVindexSpec(parent SQLNode, node *VindexSpec, r
 		a.cur.replacer = replacer
 		a.cur.parent = parent
 		a.cur.node = node
-		if !a.pre(&a.cur) {
+		kontinue := !a.pre(&a.cur)
+		if a.cur.revisit {
+			a.cur.revisit = false
+			return a.rewriteSQLNode(parent, a.cur.node, replacer)
+		}
+		if kontinue {
 			return true
 		}
 	}
@@ -9537,7 +10227,7 @@ func (a *application) rewriteRefOfWeightStringFuncExpr(parent SQLNode, node *Wei
 		kontinue := !a.pre(&a.cur)
 		if a.cur.revisit {
 			a.cur.revisit = false
-			return a.rewriteExpr(parent, a.cur.node.(Expr), replacer)
+			return a.rewriteSQLNode(parent, a.cur.node, replacer)
 		}
 		if kontinue {
 			return true
@@ -9571,7 +10261,12 @@ func (a *application) rewriteRefOfWhen(parent SQLNode, node *When, replacer repl
 		a.cur.replacer = replacer
 		a.cur.parent = parent
 		a.cur.node = node
-		if !a.pre(&a.cur) {
+		kontinue := !a.pre(&a.cur)
+		if a.cur.revisit {
+			a.cur.revisit = false
+			return a.rewriteSQLNode(parent, a.cur.node, replacer)
+		}
+		if kontinue {
 			return true
 		}
 	}
@@ -9603,7 +10298,12 @@ func (a *application) rewriteRefOfWhere(parent SQLNode, node *Where, replacer re
 		a.cur.replacer = replacer
 		a.cur.parent = parent
 		a.cur.node = node
-		if !a.pre(&a.cur) {
+		kontinue := !a.pre(&a.cur)
+		if a.cur.revisit {
+			a.cur.revisit = false
+			return a.rewriteSQLNode(parent, a.cur.node, replacer)
+		}
+		if kontinue {
 			return true
 		}
 	}
@@ -9630,7 +10330,12 @@ func (a *application) rewriteRefOfWindowDefinition(parent SQLNode, node *WindowD
 		a.cur.replacer = replacer
 		a.cur.parent = parent
 		a.cur.node = node
-		if !a.pre(&a.cur) {
+		kontinue := !a.pre(&a.cur)
+		if a.cur.revisit {
+			a.cur.revisit = false
+			return a.rewriteSQLNode(parent, a.cur.node, replacer)
+		}
+		if kontinue {
 			return true
 		}
 	}
@@ -9664,9 +10369,8 @@ func (a *application) rewriteWindowDefinitions(parent SQLNode, node WindowDefini
 		a.cur.node = node
 		kontinue := !a.pre(&a.cur)
 		if a.cur.revisit {
-			node = a.cur.node.(WindowDefinitions)
 			a.cur.revisit = false
-			return a.rewriteWindowDefinitions(parent, node, replacer)
+			return a.rewriteSQLNode(parent, a.cur.node, replacer)
 		}
 		if kontinue {
 			return true
@@ -9699,7 +10403,12 @@ func (a *application) rewriteRefOfWindowSpecification(parent SQLNode, node *Wind
 		a.cur.replacer = replacer
 		a.cur.parent = parent
 		a.cur.node = node
-		if !a.pre(&a.cur) {
+		kontinue := !a.pre(&a.cur)
+		if a.cur.revisit {
+			a.cur.revisit = false
+			return a.rewriteSQLNode(parent, a.cur.node, replacer)
+		}
+		if kontinue {
 			return true
 		}
 	}
@@ -9708,10 +10417,14 @@ func (a *application) rewriteRefOfWindowSpecification(parent SQLNode, node *Wind
 	}) {
 		return false
 	}
-	if !a.rewriteExprs(node, node.PartitionClause, func(newNode, parent SQLNode) {
-		parent.(*WindowSpecification).PartitionClause = newNode.(Exprs)
-	}) {
-		return false
+	for x, el := range node.PartitionClause {
+		if !a.rewriteExpr(node, el, func(idx int) replacerFunc {
+			return func(newNode, parent SQLNode) {
+				parent.(*WindowSpecification).PartitionClause[idx] = newNode.(Expr)
+			}
+		}(x)) {
+			return false
+		}
 	}
 	if !a.rewriteOrderBy(node, node.OrderClause, func(newNode, parent SQLNode) {
 		parent.(*WindowSpecification).OrderClause = newNode.(OrderBy)
@@ -9741,7 +10454,12 @@ func (a *application) rewriteRefOfWith(parent SQLNode, node *With, replacer repl
 		a.cur.replacer = replacer
 		a.cur.parent = parent
 		a.cur.node = node
-		if !a.pre(&a.cur) {
+		kontinue := !a.pre(&a.cur)
+		if a.cur.revisit {
+			a.cur.revisit = false
+			return a.rewriteSQLNode(parent, a.cur.node, replacer)
+		}
+		if kontinue {
 			return true
 		}
 	}
@@ -9775,7 +10493,7 @@ func (a *application) rewriteRefOfXorExpr(parent SQLNode, node *XorExpr, replace
 		kontinue := !a.pre(&a.cur)
 		if a.cur.revisit {
 			a.cur.revisit = false
-			return a.rewriteExpr(parent, a.cur.node.(Expr), replacer)
+			return a.rewriteSQLNode(parent, a.cur.node, replacer)
 		}
 		if kontinue {
 			return true
@@ -10630,7 +11348,12 @@ func (a *application) rewriteAlgorithmValue(parent SQLNode, node AlgorithmValue,
 		a.cur.replacer = replacer
 		a.cur.parent = parent
 		a.cur.node = node
-		if !a.pre(&a.cur) {
+		kontinue := !a.pre(&a.cur)
+		if a.cur.revisit {
+			a.cur.revisit = false
+			return a.rewriteSQLNode(parent, a.cur.node, replacer)
+		}
+		if kontinue {
 			return true
 		}
 	}
@@ -10654,7 +11377,7 @@ func (a *application) rewriteBoolVal(parent SQLNode, node BoolVal, replacer repl
 		kontinue := !a.pre(&a.cur)
 		if a.cur.revisit {
 			a.cur.revisit = false
-			return a.rewriteExpr(parent, a.cur.node.(Expr), replacer)
+			return a.rewriteSQLNode(parent, a.cur.node, replacer)
 		}
 		if kontinue {
 			return true
@@ -10680,7 +11403,7 @@ func (a *application) rewriteListArg(parent SQLNode, node ListArg, replacer repl
 		kontinue := !a.pre(&a.cur)
 		if a.cur.revisit {
 			a.cur.revisit = false
-			return a.rewriteExpr(parent, a.cur.node.(Expr), replacer)
+			return a.rewriteSQLNode(parent, a.cur.node, replacer)
 		}
 		if kontinue {
 			return true
@@ -10703,7 +11426,12 @@ func (a *application) rewriteMatchAction(parent SQLNode, node MatchAction, repla
 		a.cur.replacer = replacer
 		a.cur.parent = parent
 		a.cur.node = node
-		if !a.pre(&a.cur) {
+		kontinue := !a.pre(&a.cur)
+		if a.cur.revisit {
+			a.cur.revisit = false
+			return a.rewriteSQLNode(parent, a.cur.node, replacer)
+		}
+		if kontinue {
 			return true
 		}
 	}
@@ -10724,7 +11452,12 @@ func (a *application) rewriteReferenceAction(parent SQLNode, node ReferenceActio
 		a.cur.replacer = replacer
 		a.cur.parent = parent
 		a.cur.node = node
-		if !a.pre(&a.cur) {
+		kontinue := !a.pre(&a.cur)
+		if a.cur.revisit {
+			a.cur.revisit = false
+			return a.rewriteSQLNode(parent, a.cur.node, replacer)
+		}
+		if kontinue {
 			return true
 		}
 	}
@@ -10748,7 +11481,12 @@ func (a *application) rewriteRefOfIdentifierCI(parent SQLNode, node *IdentifierC
 		a.cur.replacer = replacer
 		a.cur.parent = parent
 		a.cur.node = node
-		if !a.pre(&a.cur) {
+		kontinue := !a.pre(&a.cur)
+		if a.cur.revisit {
+			a.cur.revisit = false
+			return a.rewriteSQLNode(parent, a.cur.node, replacer)
+		}
+		if kontinue {
 			return true
 		}
 	}
@@ -10772,7 +11510,12 @@ func (a *application) rewriteRefOfIdentifierCS(parent SQLNode, node *IdentifierC
 		a.cur.replacer = replacer
 		a.cur.parent = parent
 		a.cur.node = node
-		if !a.pre(&a.cur) {
+		kontinue := !a.pre(&a.cur)
+		if a.cur.revisit {
+			a.cur.revisit = false
+			return a.rewriteSQLNode(parent, a.cur.node, replacer)
+		}
+		if kontinue {
 			return true
 		}
 	}
@@ -10796,7 +11539,12 @@ func (a *application) rewriteRefOfRootNode(parent SQLNode, node *RootNode, repla
 		a.cur.replacer = replacer
 		a.cur.parent = parent
 		a.cur.node = node
-		if !a.pre(&a.cur) {
+		kontinue := !a.pre(&a.cur)
+		if a.cur.revisit {
+			a.cur.revisit = false
+			return a.rewriteSQLNode(parent, a.cur.node, replacer)
+		}
+		if kontinue {
 			return true
 		}
 	}
@@ -10823,7 +11571,12 @@ func (a *application) rewriteRefOfTableName(parent SQLNode, node *TableName, rep
 		a.cur.replacer = replacer
 		a.cur.parent = parent
 		a.cur.node = node
-		if !a.pre(&a.cur) {
+		kontinue := !a.pre(&a.cur)
+		if a.cur.revisit {
+			a.cur.revisit = false
+			return a.rewriteSQLNode(parent, a.cur.node, replacer)
+		}
+		if kontinue {
 			return true
 		}
 	}
@@ -10855,7 +11608,12 @@ func (a *application) rewriteRefOfVindexParam(parent SQLNode, node *VindexParam,
 		a.cur.replacer = replacer
 		a.cur.parent = parent
 		a.cur.node = node
-		if !a.pre(&a.cur) {
+		kontinue := !a.pre(&a.cur)
+		if a.cur.revisit {
+			a.cur.revisit = false
+			return a.rewriteSQLNode(parent, a.cur.node, replacer)
+		}
+		if kontinue {
 			return true
 		}
 	}
diff --git a/go/vt/sqlparser/ast_visit.go b/go/vt/sqlparser/ast_visit.go
index a7fbbe02118..b8ece9e3ae3 100644
--- a/go/vt/sqlparser/ast_visit.go
+++ b/go/vt/sqlparser/ast_visit.go
@@ -160,8 +160,8 @@ func VisitSQLNode(in SQLNode, f Visit) error {
 		return VisitRefOfExplainStmt(in, f)
 	case *ExplainTab:
 		return VisitRefOfExplainTab(in, f)
-	case Exprs:
-		return VisitExprs(in, f)
+	case *Exprs:
+		return VisitRefOfExprs(in, f)
 	case *ExtractFuncExpr:
 		return VisitRefOfExtractFuncExpr(in, f)
 	case *ExtractValueExpr:
@@ -434,8 +434,8 @@ func VisitSQLNode(in SQLNode, f Visit) error {
 		return VisitRefOfSavepoint(in, f)
 	case *Select:
 		return VisitRefOfSelect(in, f)
-	case SelectExprs:
-		return VisitSelectExprs(in, f)
+	case *SelectExprs:
+		return VisitRefOfSelectExprs(in, f)
 	case *SelectInto:
 		return VisitRefOfSelectInto(in, f)
 	case *Set:
@@ -999,8 +999,10 @@ func VisitRefOfCallProc(in *CallProc, f Visit) error {
 	if err := VisitTableName(in.Name, f); err != nil {
 		return err
 	}
-	if err := VisitExprs(in.Params, f); err != nil {
-		return err
+	for _, el := range in.Params {
+		if err := VisitExpr(el, f); err != nil {
+			return err
+		}
 	}
 	return nil
 }
@@ -1064,8 +1066,10 @@ func VisitRefOfCharExpr(in *CharExpr, f Visit) error {
 	if cont, err := f(in); err != nil || !cont {
 		return err
 	}
-	if err := VisitExprs(in.Exprs, f); err != nil {
-		return err
+	for _, el := range in.Exprs {
+		if err := VisitExpr(el, f); err != nil {
+			return err
+		}
 	}
 	return nil
 }
@@ -1258,8 +1262,10 @@ func VisitRefOfCount(in *Count, f Visit) error {
 	if cont, err := f(in); err != nil || !cont {
 		return err
 	}
-	if err := VisitExprs(in.Args, f); err != nil {
-		return err
+	for _, el := range in.Args {
+		if err := VisitExpr(el, f); err != nil {
+			return err
+		}
 	}
 	if err := VisitRefOfOverClause(in.OverClause, f); err != nil {
 		return err
@@ -1558,14 +1564,14 @@ func VisitRefOfExplainTab(in *ExplainTab, f Visit) error {
 	}
 	return nil
 }
-func VisitExprs(in Exprs, f Visit) error {
+func VisitRefOfExprs(in *Exprs, f Visit) error {
 	if in == nil {
 		return nil
 	}
 	if cont, err := f(in); err != nil || !cont {
 		return err
 	}
-	for _, el := range in {
+	for _, el := range in.Exprs {
 		if err := VisitExpr(el, f); err != nil {
 			return err
 		}
@@ -1705,8 +1711,10 @@ func VisitRefOfFuncExpr(in *FuncExpr, f Visit) error {
 	if err := VisitIdentifierCI(in.Name, f); err != nil {
 		return err
 	}
-	if err := VisitExprs(in.Exprs, f); err != nil {
-		return err
+	for _, el := range in.Exprs {
+		if err := VisitExpr(el, f); err != nil {
+			return err
+		}
 	}
 	return nil
 }
@@ -1914,8 +1922,10 @@ func VisitRefOfGroupConcatExpr(in *GroupConcatExpr, f Visit) error {
 	if cont, err := f(in); err != nil || !cont {
 		return err
 	}
-	if err := VisitExprs(in.Exprs, f); err != nil {
-		return err
+	for _, el := range in.Exprs {
+		if err := VisitExpr(el, f); err != nil {
+			return err
+		}
 	}
 	if err := VisitOrderBy(in.OrderBy, f); err != nil {
 		return err
@@ -2068,8 +2078,10 @@ func VisitRefOfIntervalFuncExpr(in *IntervalFuncExpr, f Visit) error {
 	if err := VisitExpr(in.Expr, f); err != nil {
 		return err
 	}
-	if err := VisitExprs(in.Exprs, f); err != nil {
-		return err
+	for _, el := range in.Exprs {
+		if err := VisitExpr(el, f); err != nil {
+			return err
+		}
 	}
 	return nil
 }
@@ -2119,8 +2131,10 @@ func VisitRefOfJSONArrayExpr(in *JSONArrayExpr, f Visit) error {
 	if cont, err := f(in); err != nil || !cont {
 		return err
 	}
-	if err := VisitExprs(in.Params, f); err != nil {
-		return err
+	for _, el := range in.Params {
+		if err := VisitExpr(el, f); err != nil {
+			return err
+		}
 	}
 	return nil
 }
@@ -2307,8 +2321,10 @@ func VisitRefOfJSONRemoveExpr(in *JSONRemoveExpr, f Visit) error {
 	if err := VisitExpr(in.JSONDoc, f); err != nil {
 		return err
 	}
-	if err := VisitExprs(in.PathList, f); err != nil {
-		return err
+	for _, el := range in.PathList {
+		if err := VisitExpr(el, f); err != nil {
+			return err
+		}
 	}
 	return nil
 }
@@ -2461,8 +2477,10 @@ func VisitRefOfJSONValueMergeExpr(in *JSONValueMergeExpr, f Visit) error {
 	if err := VisitExpr(in.JSONDoc, f); err != nil {
 		return err
 	}
-	if err := VisitExprs(in.JSONDocList, f); err != nil {
-		return err
+	for _, el := range in.JSONDocList {
+		if err := VisitExpr(el, f); err != nil {
+			return err
+		}
 	}
 	return nil
 }
@@ -2601,8 +2619,10 @@ func VisitRefOfLineStringExpr(in *LineStringExpr, f Visit) error {
 	if cont, err := f(in); err != nil || !cont {
 		return err
 	}
-	if err := VisitExprs(in.PointParams, f); err != nil {
-		return err
+	for _, el := range in.PointParams {
+		if err := VisitExpr(el, f); err != nil {
+			return err
+		}
 	}
 	return nil
 }
@@ -2774,8 +2794,10 @@ func VisitRefOfMultiLinestringExpr(in *MultiLinestringExpr, f Visit) error {
 	if cont, err := f(in); err != nil || !cont {
 		return err
 	}
-	if err := VisitExprs(in.LinestringParams, f); err != nil {
-		return err
+	for _, el := range in.LinestringParams {
+		if err := VisitExpr(el, f); err != nil {
+			return err
+		}
 	}
 	return nil
 }
@@ -2786,8 +2808,10 @@ func VisitRefOfMultiPointExpr(in *MultiPointExpr, f Visit) error {
 	if cont, err := f(in); err != nil || !cont {
 		return err
 	}
-	if err := VisitExprs(in.PointParams, f); err != nil {
-		return err
+	for _, el := range in.PointParams {
+		if err := VisitExpr(el, f); err != nil {
+			return err
+		}
 	}
 	return nil
 }
@@ -2798,8 +2822,10 @@ func VisitRefOfMultiPolygonExpr(in *MultiPolygonExpr, f Visit) error {
 	if cont, err := f(in); err != nil || !cont {
 		return err
 	}
-	if err := VisitExprs(in.PolygonParams, f); err != nil {
-		return err
+	for _, el := range in.PolygonParams {
+		if err := VisitExpr(el, f); err != nil {
+			return err
+		}
 	}
 	return nil
 }
@@ -3218,8 +3244,10 @@ func VisitRefOfPolygonExpr(in *PolygonExpr, f Visit) error {
 	if cont, err := f(in); err != nil || !cont {
 		return err
 	}
-	if err := VisitExprs(in.LinestringParams, f); err != nil {
-		return err
+	for _, el := range in.LinestringParams {
+		if err := VisitExpr(el, f); err != nil {
+			return err
+		}
 	}
 	return nil
 }
@@ -3535,7 +3563,7 @@ func VisitRefOfSelect(in *Select, f Visit) error {
 	if err := VisitRefOfParsedComments(in.Comments, f); err != nil {
 		return err
 	}
-	if err := VisitSelectExprs(in.SelectExprs, f); err != nil {
+	if err := VisitRefOfSelectExprs(in.SelectExprs, f); err != nil {
 		return err
 	}
 	if err := VisitRefOfWhere(in.Where, f); err != nil {
@@ -3561,14 +3589,14 @@ func VisitRefOfSelect(in *Select, f Visit) error {
 	}
 	return nil
 }
-func VisitSelectExprs(in SelectExprs, f Visit) error {
+func VisitRefOfSelectExprs(in *SelectExprs, f Visit) error {
 	if in == nil {
 		return nil
 	}
 	if cont, err := f(in); err != nil || !cont {
 		return err
 	}
-	for _, el := range in {
+	for _, el := range in.Exprs {
 		if err := VisitSelectExpr(el, f); err != nil {
 			return err
 		}
@@ -4476,8 +4504,10 @@ func VisitRefOfWindowSpecification(in *WindowSpecification, f Visit) error {
 	if err := VisitIdentifierCI(in.Name, f); err != nil {
 		return err
 	}
-	if err := VisitExprs(in.PartitionClause, f); err != nil {
-		return err
+	for _, el := range in.PartitionClause {
+		if err := VisitExpr(el, f); err != nil {
+			return err
+		}
 	}
 	if err := VisitOrderBy(in.OrderClause, f); err != nil {
 		return err
diff --git a/go/vt/sqlparser/cached_size.go b/go/vt/sqlparser/cached_size.go
index 7183ff18e28..4f17041bdbe 100644
--- a/go/vt/sqlparser/cached_size.go
+++ b/go/vt/sqlparser/cached_size.go
@@ -564,7 +564,7 @@ func (cached *CallProc) CachedSize(alloc bool) int64 {
 	}
 	// field Name vitess.io/vitess/go/vt/sqlparser.TableName
 	size += cached.Name.CachedSize(false)
-	// field Params vitess.io/vitess/go/vt/sqlparser.Exprs
+	// field Params []vitess.io/vitess/go/vt/sqlparser.Expr
 	{
 		size += hack.RuntimeAllocSize(int64(cap(cached.Params)) * int64(16))
 		for _, elem := range cached.Params {
@@ -640,7 +640,7 @@ func (cached *CharExpr) CachedSize(alloc bool) int64 {
 	if alloc {
 		size += int64(48)
 	}
-	// field Exprs vitess.io/vitess/go/vt/sqlparser.Exprs
+	// field Exprs []vitess.io/vitess/go/vt/sqlparser.Expr
 	{
 		size += hack.RuntimeAllocSize(int64(cap(cached.Exprs)) * int64(16))
 		for _, elem := range cached.Exprs {
@@ -979,7 +979,7 @@ func (cached *Count) CachedSize(alloc bool) int64 {
 	if alloc {
 		size += int64(48)
 	}
-	// field Args vitess.io/vitess/go/vt/sqlparser.Exprs
+	// field Args []vitess.io/vitess/go/vt/sqlparser.Expr
 	{
 		size += hack.RuntimeAllocSize(int64(cap(cached.Args)) * int64(16))
 		for _, elem := range cached.Args {
@@ -1341,22 +1341,6 @@ func (cached *ExplainTab) CachedSize(alloc bool) int64 {
 	size += hack.RuntimeAllocSize(int64(len(cached.Wild)))
 	return size
 }
-func (cached *Exprs) CachedSize(alloc bool) int64 {
-	if cached == nil {
-		return int64(0)
-	}
-	size := int64(0)
-	if alloc {
-		size += int64(24)
-	}
-	size += hack.RuntimeAllocSize(int64(cap(*cached)) * int64(16))
-	for _, elem := range *cached {
-		if cc, ok := elem.(cachedObject); ok {
-			size += cc.CachedSize(true)
-		}
-	}
-	return size
-}
 func (cached *ExtractFuncExpr) CachedSize(alloc bool) int64 {
 	if cached == nil {
 		return int64(0)
@@ -1494,7 +1478,7 @@ func (cached *FuncExpr) CachedSize(alloc bool) int64 {
 	size += cached.Qualifier.CachedSize(false)
 	// field Name vitess.io/vitess/go/vt/sqlparser.IdentifierCI
 	size += cached.Name.CachedSize(false)
-	// field Exprs vitess.io/vitess/go/vt/sqlparser.Exprs
+	// field Exprs []vitess.io/vitess/go/vt/sqlparser.Expr
 	{
 		size += hack.RuntimeAllocSize(int64(cap(cached.Exprs)) * int64(16))
 		for _, elem := range cached.Exprs {
@@ -1754,7 +1738,7 @@ func (cached *GroupConcatExpr) CachedSize(alloc bool) int64 {
 	if alloc {
 		size += int64(80)
 	}
-	// field Exprs vitess.io/vitess/go/vt/sqlparser.Exprs
+	// field Exprs []vitess.io/vitess/go/vt/sqlparser.Expr
 	{
 		size += hack.RuntimeAllocSize(int64(cap(cached.Exprs)) * int64(16))
 		for _, elem := range cached.Exprs {
@@ -2004,7 +1988,7 @@ func (cached *IntervalFuncExpr) CachedSize(alloc bool) int64 {
 	if cc, ok := cached.Expr.(cachedObject); ok {
 		size += cc.CachedSize(true)
 	}
-	// field Exprs vitess.io/vitess/go/vt/sqlparser.Exprs
+	// field Exprs []vitess.io/vitess/go/vt/sqlparser.Expr
 	{
 		size += hack.RuntimeAllocSize(int64(cap(cached.Exprs)) * int64(16))
 		for _, elem := range cached.Exprs {
@@ -2069,7 +2053,7 @@ func (cached *JSONArrayExpr) CachedSize(alloc bool) int64 {
 	if alloc {
 		size += int64(24)
 	}
-	// field Params vitess.io/vitess/go/vt/sqlparser.Exprs
+	// field Params []vitess.io/vitess/go/vt/sqlparser.Expr
 	{
 		size += hack.RuntimeAllocSize(int64(cap(cached.Params)) * int64(16))
 		for _, elem := range cached.Params {
@@ -2306,7 +2290,7 @@ func (cached *JSONRemoveExpr) CachedSize(alloc bool) int64 {
 	if cc, ok := cached.JSONDoc.(cachedObject); ok {
 		size += cc.CachedSize(true)
 	}
-	// field PathList vitess.io/vitess/go/vt/sqlparser.Exprs
+	// field PathList []vitess.io/vitess/go/vt/sqlparser.Expr
 	{
 		size += hack.RuntimeAllocSize(int64(cap(cached.PathList)) * int64(16))
 		for _, elem := range cached.PathList {
@@ -2493,7 +2477,7 @@ func (cached *JSONValueMergeExpr) CachedSize(alloc bool) int64 {
 	if cc, ok := cached.JSONDoc.(cachedObject); ok {
 		size += cc.CachedSize(true)
 	}
-	// field JSONDocList vitess.io/vitess/go/vt/sqlparser.Exprs
+	// field JSONDocList []vitess.io/vitess/go/vt/sqlparser.Expr
 	{
 		size += hack.RuntimeAllocSize(int64(cap(cached.JSONDocList)) * int64(16))
 		for _, elem := range cached.JSONDocList {
@@ -2725,7 +2709,7 @@ func (cached *LineStringExpr) CachedSize(alloc bool) int64 {
 	if alloc {
 		size += int64(24)
 	}
-	// field PointParams vitess.io/vitess/go/vt/sqlparser.Exprs
+	// field PointParams []vitess.io/vitess/go/vt/sqlparser.Expr
 	{
 		size += hack.RuntimeAllocSize(int64(cap(cached.PointParams)) * int64(16))
 		for _, elem := range cached.PointParams {
@@ -2937,7 +2921,7 @@ func (cached *MultiLinestringExpr) CachedSize(alloc bool) int64 {
 	if alloc {
 		size += int64(24)
 	}
-	// field LinestringParams vitess.io/vitess/go/vt/sqlparser.Exprs
+	// field LinestringParams []vitess.io/vitess/go/vt/sqlparser.Expr
 	{
 		size += hack.RuntimeAllocSize(int64(cap(cached.LinestringParams)) * int64(16))
 		for _, elem := range cached.LinestringParams {
@@ -2956,7 +2940,7 @@ func (cached *MultiPointExpr) CachedSize(alloc bool) int64 {
 	if alloc {
 		size += int64(24)
 	}
-	// field PointParams vitess.io/vitess/go/vt/sqlparser.Exprs
+	// field PointParams []vitess.io/vitess/go/vt/sqlparser.Expr
 	{
 		size += hack.RuntimeAllocSize(int64(cap(cached.PointParams)) * int64(16))
 		for _, elem := range cached.PointParams {
@@ -2975,7 +2959,7 @@ func (cached *MultiPolygonExpr) CachedSize(alloc bool) int64 {
 	if alloc {
 		size += int64(24)
 	}
-	// field PolygonParams vitess.io/vitess/go/vt/sqlparser.Exprs
+	// field PolygonParams []vitess.io/vitess/go/vt/sqlparser.Expr
 	{
 		size += hack.RuntimeAllocSize(int64(cap(cached.PolygonParams)) * int64(16))
 		for _, elem := range cached.PolygonParams {
@@ -3480,7 +3464,7 @@ func (cached *PolygonExpr) CachedSize(alloc bool) int64 {
 	if alloc {
 		size += int64(24)
 	}
-	// field LinestringParams vitess.io/vitess/go/vt/sqlparser.Exprs
+	// field LinestringParams []vitess.io/vitess/go/vt/sqlparser.Expr
 	{
 		size += hack.RuntimeAllocSize(int64(cap(cached.LinestringParams)) * int64(16))
 		for _, elem := range cached.LinestringParams {
@@ -3826,7 +3810,7 @@ func (cached *Select) CachedSize(alloc bool) int64 {
 	}
 	size := int64(0)
 	if alloc {
-		size += int64(176)
+		size += int64(160)
 	}
 	// field Cache *bool
 	size += hack.RuntimeAllocSize(int64(1))
@@ -3843,15 +3827,8 @@ func (cached *Select) CachedSize(alloc bool) int64 {
 	}
 	// field Comments *vitess.io/vitess/go/vt/sqlparser.ParsedComments
 	size += cached.Comments.CachedSize(true)
-	// field SelectExprs vitess.io/vitess/go/vt/sqlparser.SelectExprs
-	{
-		size += hack.RuntimeAllocSize(int64(cap(cached.SelectExprs)) * int64(16))
-		for _, elem := range cached.SelectExprs {
-			if cc, ok := elem.(cachedObject); ok {
-				size += cc.CachedSize(true)
-			}
-		}
-	}
+	// field SelectExprs *vitess.io/vitess/go/vt/sqlparser.SelectExprs
+	size += cached.SelectExprs.CachedSize(true)
 	// field Where *vitess.io/vitess/go/vt/sqlparser.Where
 	size += cached.Where.CachedSize(true)
 	// field GroupBy *vitess.io/vitess/go/vt/sqlparser.GroupBy
@@ -3886,10 +3863,13 @@ func (cached *SelectExprs) CachedSize(alloc bool) int64 {
 	if alloc {
 		size += int64(24)
 	}
-	size += hack.RuntimeAllocSize(int64(cap(*cached)) * int64(16))
-	for _, elem := range *cached {
-		if cc, ok := elem.(cachedObject); ok {
-			size += cc.CachedSize(true)
+	// field Exprs []vitess.io/vitess/go/vt/sqlparser.SelectExpr
+	{
+		size += hack.RuntimeAllocSize(int64(cap(cached.Exprs)) * int64(16))
+		for _, elem := range cached.Exprs {
+			if cc, ok := elem.(cachedObject); ok {
+				size += cc.CachedSize(true)
+			}
 		}
 	}
 	return size
@@ -4990,7 +4970,7 @@ func (cached *WindowSpecification) CachedSize(alloc bool) int64 {
 	}
 	// field Name vitess.io/vitess/go/vt/sqlparser.IdentifierCI
 	size += cached.Name.CachedSize(false)
-	// field PartitionClause vitess.io/vitess/go/vt/sqlparser.Exprs
+	// field PartitionClause []vitess.io/vitess/go/vt/sqlparser.Expr
 	{
 		size += hack.RuntimeAllocSize(int64(cap(cached.PartitionClause)) * int64(16))
 		for _, elem := range cached.PartitionClause {
diff --git a/go/vt/sqlparser/normalizer.go b/go/vt/sqlparser/normalizer.go
index fb3813b7019..dffb90d52b8 100644
--- a/go/vt/sqlparser/normalizer.go
+++ b/go/vt/sqlparser/normalizer.go
@@ -748,7 +748,7 @@ func (nz *normalizer) unnestSubQueries(cursor *Cursor, subquery *Subquery) {
 		return
 	}
 
-	if len(sel.SelectExprs) != 1 ||
+	if len(sel.SelectExprs.Exprs) != 1 ||
 		len(sel.OrderBy) != 0 ||
 		sel.GroupBy != nil ||
 		len(sel.From) != 1 ||
@@ -766,7 +766,7 @@ func (nz *normalizer) unnestSubQueries(cursor *Cursor, subquery *Subquery) {
 	if !ok || table.Name.String() != "dual" {
 		return
 	}
-	expr, ok := sel.SelectExprs[0].(*AliasedExpr)
+	expr, ok := sel.SelectExprs.Exprs[0].(*AliasedExpr)
 	if !ok {
 		return
 	}
@@ -810,8 +810,8 @@ func (nz *normalizer) existsRewrite(cursor *Cursor, node *ExistsExpr) {
 
 	// Simplify the subquery by selecting a constant.
 	// WHERE EXISTS(SELECT 1 FROM ...)
-	sel.SelectExprs = SelectExprs{
-		&AliasedExpr{Expr: NewIntLiteral("1")},
+	sel.SelectExprs = &SelectExprs{
+		Exprs: []SelectExpr{&AliasedExpr{Expr: NewIntLiteral("1")}},
 	}
 	sel.GroupBy = nil
 }
diff --git a/go/vt/sqlparser/parsed_query_test.go b/go/vt/sqlparser/parsed_query_test.go
index 26b9855b0f0..07ff0165982 100644
--- a/go/vt/sqlparser/parsed_query_test.go
+++ b/go/vt/sqlparser/parsed_query_test.go
@@ -296,8 +296,8 @@ func TestCastBindVars(t *testing.T) {
 			}
 
 			s := &Select{
-				SelectExprs: SelectExprs{
-					NewAliasedExpr(argument, ""),
+				SelectExprs: &SelectExprs{
+					Exprs: []SelectExpr{NewAliasedExpr(argument, "")},
 				},
 			}
 
diff --git a/go/vt/sqlparser/parser.go b/go/vt/sqlparser/parser.go
index 8af0018db2a..c8850559cdc 100644
--- a/go/vt/sqlparser/parser.go
+++ b/go/vt/sqlparser/parser.go
@@ -144,7 +144,7 @@ func (p *Parser) ParseExpr(sql string) (Expr, error) {
 	if err != nil {
 		return nil, err
 	}
-	aliasedExpr := stmt.(*Select).SelectExprs[0].(*AliasedExpr)
+	aliasedExpr := stmt.(*Select).SelectExprs.Exprs[0].(*AliasedExpr)
 	return aliasedExpr.Expr, err
 }
 
diff --git a/go/vt/sqlparser/precedence_test.go b/go/vt/sqlparser/precedence_test.go
index 690e6df8647..8ea3fbe1446 100644
--- a/go/vt/sqlparser/precedence_test.go
+++ b/go/vt/sqlparser/precedence_test.go
@@ -84,7 +84,7 @@ func TestPlusStarPrecedence(t *testing.T) {
 			t.Error(err)
 			continue
 		}
-		expr := readable(tree.(*Select).SelectExprs[0].(*AliasedExpr).Expr)
+		expr := readable(tree.(*Select).SelectExprs.Exprs[0].(*AliasedExpr).Expr)
 		if expr != tcase.output {
 			t.Errorf("Parse: \n%s, want: \n%s", expr, tcase.output)
 		}
diff --git a/go/vt/sqlparser/predicate_rewriting.go b/go/vt/sqlparser/predicate_rewriting.go
index 234a2f4acd5..4dd4c09556d 100644
--- a/go/vt/sqlparser/predicate_rewriting.go
+++ b/go/vt/sqlparser/predicate_rewriting.go
@@ -213,7 +213,7 @@ func simplifyAnd(expr *AndExpr) (Expr, bool) {
 // And rewrite that to WHERE (a, b) IN ((1,11), (2,12), (3,13))
 func ExtractINFromOR(expr *OrExpr) []Expr {
 	var varNames []*ColName
-	var values []Exprs
+	var values [][]Expr
 	orSlice := orToSlice(expr)
 	for _, expr := range orSlice {
 		andSlice := andToSlice(expr)
diff --git a/go/vt/sqlparser/random_expr.go b/go/vt/sqlparser/random_expr.go
index f5b394b36fe..b6038119663 100644
--- a/go/vt/sqlparser/random_expr.go
+++ b/go/vt/sqlparser/random_expr.go
@@ -246,7 +246,9 @@ func (g *Generator) randomAggregate(genConfig ExprGeneratorConfig) Expr {
 
 	options := []exprF{
 		func() Expr { return &CountStar{} },
-		func() Expr { return &Count{Args: Exprs{g.Expression(genConfig.anyTypeConfig())}, Distinct: isDistinct} },
+		func() Expr {
+			return &Count{Args: []Expr{g.Expression(genConfig.anyTypeConfig())}, Distinct: isDistinct}
+		},
 		func() Expr { return &Sum{Arg: g.Expression(genConfig), Distinct: isDistinct} },
 		func() Expr { return &Min{Arg: g.Expression(genConfig), Distinct: isDistinct} },
 		func() Expr { return &Max{Arg: g.Expression(genConfig), Distinct: isDistinct} },
@@ -269,7 +271,7 @@ func (g *Generator) booleanExpr(genConfig ExprGeneratorConfig) Expr {
 		func() Expr { return g.orExpr(genConfig) },
 		func() Expr { return g.comparison(genConfig.intTypeConfig()) },
 		func() Expr { return g.comparison(genConfig.stringTypeConfig()) },
-		//func() Expr { return g.comparison(genConfig) }, // this is not accepted by the parser
+		// func() Expr { return g.comparison(genConfig) }, // this is not accepted by the parser
 		func() Expr { return g.inExpr(genConfig) },
 		func() Expr { return g.existsExpr(genConfig) },
 		func() Expr { return g.between(genConfig.intTypeConfig()) },
@@ -374,7 +376,7 @@ func (g *Generator) randomBool(prob float32) bool {
 }
 
 func (g *Generator) intLiteral() Expr {
-	t := fmt.Sprintf("%d", rand.IntN(100)-rand.IntN(100)) //nolint SA4000
+	t := fmt.Sprintf("%d", rand.IntN(100)-rand.IntN(100)) // nolint SA4000
 
 	return NewIntLiteral(t)
 }
@@ -566,7 +568,7 @@ func (g *Generator) existsExpr(genConfig ExprGeneratorConfig) Expr {
 	} else {
 		// if g.subqueryExpr doesn't return a valid subquery, replace with
 		// select 1
-		selectExprs := SelectExprs{NewAliasedExpr(NewIntLiteral("1"), "")}
+		selectExprs := &SelectExprs{Exprs: []SelectExpr{NewAliasedExpr(NewIntLiteral("1"), "")}}
 		from := TableExprs{NewAliasedTableExpr(NewTableName("dual"), "")}
 		expr = NewExistsExpr(NewSubquery(NewSelect(nil, selectExprs, nil, nil, from, nil, nil, nil, nil)))
 	}
diff --git a/go/vt/sqlparser/rewriter_api.go b/go/vt/sqlparser/rewriter_api.go
index cfcf75fa0f9..5dc4b30cc59 100644
--- a/go/vt/sqlparser/rewriter_api.go
+++ b/go/vt/sqlparser/rewriter_api.go
@@ -125,14 +125,6 @@ func (c *Cursor) ReplacerF() func(newNode SQLNode) {
 // When used, this will abort the visitation of the current node - no post or children visited,
 // and the new node visited.
 func (c *Cursor) ReplaceAndRevisit(newNode SQLNode) {
-	switch newNode.(type) {
-	case SelectExprs, Expr:
-	default:
-		// We need to add support to the generated code for when to look at the revisit flag. At the moment it is only
-		// there for slices of SQLNode implementations
-		panic("no support added for this type yet")
-	}
-
 	c.replacer(newNode, c.parent)
 	c.node = newNode
 	c.revisit = true
diff --git a/go/vt/sqlparser/rewriter_test.go b/go/vt/sqlparser/rewriter_test.go
index 628d6fbd0a4..b7d24406677 100644
--- a/go/vt/sqlparser/rewriter_test.go
+++ b/go/vt/sqlparser/rewriter_test.go
@@ -49,10 +49,10 @@ func TestReplaceWorksInLaterCalls(t *testing.T) {
 	Rewrite(stmt, func(cursor *Cursor) bool {
 		switch node := cursor.Node().(type) {
 		case *Select:
-			node.SelectExprs[0] = &AliasedExpr{
+			node.SelectExprs.Exprs[0] = &AliasedExpr{
 				Expr: NewStrLiteral("apa"),
 			}
-			node.SelectExprs = append(node.SelectExprs, &AliasedExpr{
+			node.SelectExprs.Exprs = append(node.SelectExprs.Exprs, &AliasedExpr{
 				Expr: NewStrLiteral("foobar"),
 			})
 		case *StarExpr:
@@ -73,8 +73,8 @@ func TestReplaceAndRevisitWorksInLaterCalls(t *testing.T) {
 	count := 0
 	Rewrite(stmt, func(cursor *Cursor) bool {
 		switch node := cursor.Node().(type) {
-		case SelectExprs:
-			if len(node) != 1 {
+		case *SelectExprs:
+			if len(node.Exprs) != 1 {
 				return true
 			}
 			expr1 := &AliasedExpr{
@@ -83,7 +83,7 @@ func TestReplaceAndRevisitWorksInLaterCalls(t *testing.T) {
 			expr2 := &AliasedExpr{
 				Expr: NewStrLiteral("foobar"),
 			}
-			cursor.ReplaceAndRevisit(SelectExprs{expr1, expr2})
+			cursor.ReplaceAndRevisit(&SelectExprs{Exprs: []SelectExpr{expr1, expr2}})
 		case *StarExpr:
 			t.Errorf("should not have seen the star")
 		case *Literal:
diff --git a/go/vt/sqlparser/sql.go b/go/vt/sqlparser/sql.go
index ff9bc5cb71f..ef2036265e6 100644
--- a/go/vt/sqlparser/sql.go
+++ b/go/vt/sqlparser/sql.go
@@ -7806,7 +7806,7 @@ var yyPgo = [...]int{
 	139, 2744, 2725, 2716, 0, 1034, 125, 2688, 202,
 }
 
-//line sql.y:8820
+//line sql.y:8822
 type yySymType struct {
 	union             any
 	empty             struct{}
@@ -7990,8 +7990,8 @@ func (st *yySymType) exprUnion() Expr {
 	return v
 }
 
-func (st *yySymType) exprsUnion() Exprs {
-	v, _ := st.union.(Exprs)
+func (st *yySymType) exprsUnion() []Expr {
+	v, _ := st.union.([]Expr)
 	return v
 }
 
@@ -8320,8 +8320,8 @@ func (st *yySymType) selectExprUnion() SelectExpr {
 	return v
 }
 
-func (st *yySymType) selectExprsUnion() SelectExprs {
-	v, _ := st.union.(SelectExprs)
+func (st *yySymType) selectExprsUnion() *SelectExprs {
+	v, _ := st.union.(*SelectExprs)
 	return v
 }
 
@@ -10564,7 +10564,7 @@ yydefault:
 		var yyLOCAL TableStatement
 //line sql.y:837
 		{
-			yyLOCAL = NewSelect(Comments(yyDollar[2].strs), SelectExprs{&Nextval{Expr: yyDollar[5].exprUnion()}}, []string{yyDollar[3].str} /*options*/, nil, TableExprs{&AliasedTableExpr{Expr: yyDollar[7].tableName}}, nil /*where*/, nil /*groupBy*/, nil /*having*/, nil)
+			yyLOCAL = NewSelect(Comments(yyDollar[2].strs), &SelectExprs{Exprs: []SelectExpr{&Nextval{Expr: yyDollar[5].exprUnion()}}}, []string{yyDollar[3].str} /*options*/, nil, TableExprs{&AliasedTableExpr{Expr: yyDollar[7].tableName}}, nil /*where*/, nil /*groupBy*/, nil /*having*/, nil)
 		}
 		yyVAL.union = yyLOCAL
 	case 65:
@@ -17100,23 +17100,26 @@ yydefault:
 		}
 	case 929:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		var yyLOCAL SelectExprs
+		var yyLOCAL *SelectExprs
 //line sql.y:4937
 		{
-			yyLOCAL = SelectExprs{yyDollar[1].selectExprUnion()}
+			yyLOCAL = &SelectExprs{Exprs: []SelectExpr{yyDollar[1].selectExprUnion()}}
 		}
 		yyVAL.union = yyLOCAL
 	case 930:
 		yyDollar = yyS[yypt-3 : yypt+1]
+		var yyLOCAL *SelectExprs
 //line sql.y:4941
 		{
-			yySLICE := (*SelectExprs)(yyIaddr(yyVAL.union))
-			*yySLICE = append(*yySLICE, yyDollar[3].selectExprUnion())
+			res := yyDollar[1].selectExprsUnion()
+			res.Exprs = append(res.Exprs, yyDollar[3].selectExprUnion())
+			yyLOCAL = res
 		}
+		yyVAL.union = yyLOCAL
 	case 931:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL SelectExpr
-//line sql.y:4947
+//line sql.y:4949
 		{
 			yyLOCAL = &StarExpr{}
 		}
@@ -17124,7 +17127,7 @@ yydefault:
 	case 932:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL SelectExpr
-//line sql.y:4951
+//line sql.y:4953
 		{
 			yyLOCAL = &AliasedExpr{Expr: yyDollar[1].exprUnion(), As: yyDollar[2].identifierCI}
 		}
@@ -17132,7 +17135,7 @@ yydefault:
 	case 933:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL SelectExpr
-//line sql.y:4955
+//line sql.y:4957
 		{
 			yyLOCAL = &StarExpr{TableName: TableName{Name: yyDollar[1].identifierCS}}
 		}
@@ -17140,39 +17143,39 @@ yydefault:
 	case 934:
 		yyDollar = yyS[yypt-5 : yypt+1]
 		var yyLOCAL SelectExpr
-//line sql.y:4959
+//line sql.y:4961
 		{
 			yyLOCAL = &StarExpr{TableName: TableName{Qualifier: yyDollar[1].identifierCS, Name: yyDollar[3].identifierCS}}
 		}
 		yyVAL.union = yyLOCAL
 	case 935:
 		yyDollar = yyS[yypt-0 : yypt+1]
-//line sql.y:4964
+//line sql.y:4966
 		{
 			yyVAL.identifierCI = IdentifierCI{}
 		}
 	case 936:
 		yyDollar = yyS[yypt-1 : yypt+1]
-//line sql.y:4968
+//line sql.y:4970
 		{
 			yyVAL.identifierCI = yyDollar[1].identifierCI
 		}
 	case 937:
 		yyDollar = yyS[yypt-2 : yypt+1]
-//line sql.y:4972
+//line sql.y:4974
 		{
 			yyVAL.identifierCI = yyDollar[2].identifierCI
 		}
 	case 939:
 		yyDollar = yyS[yypt-1 : yypt+1]
-//line sql.y:4979
+//line sql.y:4981
 		{
 			yyVAL.identifierCI = NewIdentifierCI(string(yyDollar[1].str))
 		}
 	case 940:
 		yyDollar = yyS[yypt-0 : yypt+1]
 		var yyLOCAL TableExprs
-//line sql.y:4984
+//line sql.y:4986
 		{
 			yyLOCAL = TableExprs{&AliasedTableExpr{Expr: TableName{Name: NewIdentifierCS("dual")}}}
 		}
@@ -17180,7 +17183,7 @@ yydefault:
 	case 941:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL TableExprs
-//line sql.y:4988
+//line sql.y:4990
 		{
 			yyLOCAL = yyDollar[1].tableExprsUnion()
 		}
@@ -17188,7 +17191,7 @@ yydefault:
 	case 942:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL TableExprs
-//line sql.y:4994
+//line sql.y:4996
 		{
 			yyLOCAL = yyDollar[2].tableExprsUnion()
 		}
@@ -17196,14 +17199,14 @@ yydefault:
 	case 943:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL TableExprs
-//line sql.y:5000
+//line sql.y:5002
 		{
 			yyLOCAL = TableExprs{yyDollar[1].tableExprUnion()}
 		}
 		yyVAL.union = yyLOCAL
 	case 944:
 		yyDollar = yyS[yypt-3 : yypt+1]
-//line sql.y:5004
+//line sql.y:5006
 		{
 			yySLICE := (*TableExprs)(yyIaddr(yyVAL.union))
 			*yySLICE = append(*yySLICE, yyDollar[3].tableExprUnion())
@@ -17211,7 +17214,7 @@ yydefault:
 	case 947:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL TableExpr
-//line sql.y:5014
+//line sql.y:5016
 		{
 			yyLOCAL = yyDollar[1].aliasedTableNameUnion()
 		}
@@ -17219,7 +17222,7 @@ yydefault:
 	case 948:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL TableExpr
-//line sql.y:5018
+//line sql.y:5020
 		{
 			yyLOCAL = &AliasedTableExpr{Expr: yyDollar[1].derivedTableUnion(), As: yyDollar[3].identifierCS, Columns: yyDollar[4].columnsUnion()}
 		}
@@ -17227,7 +17230,7 @@ yydefault:
 	case 949:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL TableExpr
-//line sql.y:5022
+//line sql.y:5024
 		{
 			yyLOCAL = &ParenTableExpr{Exprs: yyDollar[2].tableExprsUnion()}
 		}
@@ -17235,7 +17238,7 @@ yydefault:
 	case 950:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL TableExpr
-//line sql.y:5026
+//line sql.y:5028
 		{
 			yyLOCAL = yyDollar[1].tableExprUnion()
 		}
@@ -17243,7 +17246,7 @@ yydefault:
 	case 951:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL *DerivedTable
-//line sql.y:5032
+//line sql.y:5034
 		{
 			yyLOCAL = &DerivedTable{Lateral: false, Select: yyDollar[1].tableStmtUnion()}
 		}
@@ -17251,7 +17254,7 @@ yydefault:
 	case 952:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL *DerivedTable
-//line sql.y:5036
+//line sql.y:5038
 		{
 			yyLOCAL = &DerivedTable{Lateral: true, Select: yyDollar[2].tableStmtUnion()}
 		}
@@ -17259,7 +17262,7 @@ yydefault:
 	case 953:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL *AliasedTableExpr
-//line sql.y:5042
+//line sql.y:5044
 		{
 			yyLOCAL = &AliasedTableExpr{Expr: yyDollar[1].tableName, As: yyDollar[2].identifierCS, Hints: yyDollar[3].indexHintsUnion()}
 		}
@@ -17267,7 +17270,7 @@ yydefault:
 	case 954:
 		yyDollar = yyS[yypt-7 : yypt+1]
 		var yyLOCAL *AliasedTableExpr
-//line sql.y:5046
+//line sql.y:5048
 		{
 			yyLOCAL = &AliasedTableExpr{Expr: yyDollar[1].tableName, Partitions: yyDollar[4].partitionsUnion(), As: yyDollar[6].identifierCS, Hints: yyDollar[7].indexHintsUnion()}
 		}
@@ -17275,7 +17278,7 @@ yydefault:
 	case 955:
 		yyDollar = yyS[yypt-0 : yypt+1]
 		var yyLOCAL Columns
-//line sql.y:5051
+//line sql.y:5053
 		{
 			yyLOCAL = nil
 		}
@@ -17283,7 +17286,7 @@ yydefault:
 	case 956:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL Columns
-//line sql.y:5055
+//line sql.y:5057
 		{
 			yyLOCAL = yyDollar[2].columnsUnion()
 		}
@@ -17291,7 +17294,7 @@ yydefault:
 	case 957:
 		yyDollar = yyS[yypt-0 : yypt+1]
 		var yyLOCAL Columns
-//line sql.y:5060
+//line sql.y:5062
 		{
 			yyLOCAL = nil
 		}
@@ -17299,7 +17302,7 @@ yydefault:
 	case 958:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL Columns
-//line sql.y:5064
+//line sql.y:5066
 		{
 			yyLOCAL = yyDollar[1].columnsUnion()
 		}
@@ -17307,14 +17310,14 @@ yydefault:
 	case 959:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL Columns
-//line sql.y:5070
+//line sql.y:5072
 		{
 			yyLOCAL = Columns{yyDollar[1].identifierCI}
 		}
 		yyVAL.union = yyLOCAL
 	case 960:
 		yyDollar = yyS[yypt-3 : yypt+1]
-//line sql.y:5074
+//line sql.y:5076
 		{
 			yySLICE := (*Columns)(yyIaddr(yyVAL.union))
 			*yySLICE = append(*yySLICE, yyDollar[3].identifierCI)
@@ -17322,14 +17325,14 @@ yydefault:
 	case 961:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL []*Variable
-//line sql.y:5080
+//line sql.y:5082
 		{
 			yyLOCAL = []*Variable{yyDollar[1].variableUnion()}
 		}
 		yyVAL.union = yyLOCAL
 	case 962:
 		yyDollar = yyS[yypt-3 : yypt+1]
-//line sql.y:5084
+//line sql.y:5086
 		{
 			yySLICE := (*[]*Variable)(yyIaddr(yyVAL.union))
 			*yySLICE = append(*yySLICE, yyDollar[3].variableUnion())
@@ -17337,7 +17340,7 @@ yydefault:
 	case 963:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL Columns
-//line sql.y:5090
+//line sql.y:5092
 		{
 			yyLOCAL = Columns{yyDollar[1].identifierCI}
 		}
@@ -17345,21 +17348,21 @@ yydefault:
 	case 964:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL Columns
-//line sql.y:5094
+//line sql.y:5096
 		{
 			yyLOCAL = Columns{NewIdentifierCI(string(yyDollar[1].str))}
 		}
 		yyVAL.union = yyLOCAL
 	case 965:
 		yyDollar = yyS[yypt-3 : yypt+1]
-//line sql.y:5098
+//line sql.y:5100
 		{
 			yySLICE := (*Columns)(yyIaddr(yyVAL.union))
 			*yySLICE = append(*yySLICE, yyDollar[3].identifierCI)
 		}
 	case 966:
 		yyDollar = yyS[yypt-3 : yypt+1]
-//line sql.y:5102
+//line sql.y:5104
 		{
 			yySLICE := (*Columns)(yyIaddr(yyVAL.union))
 			*yySLICE = append(*yySLICE, NewIdentifierCI(string(yyDollar[3].str)))
@@ -17367,14 +17370,14 @@ yydefault:
 	case 967:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL Partitions
-//line sql.y:5108
+//line sql.y:5110
 		{
 			yyLOCAL = Partitions{yyDollar[1].identifierCI}
 		}
 		yyVAL.union = yyLOCAL
 	case 968:
 		yyDollar = yyS[yypt-3 : yypt+1]
-//line sql.y:5112
+//line sql.y:5114
 		{
 			yySLICE := (*Partitions)(yyIaddr(yyVAL.union))
 			*yySLICE = append(*yySLICE, yyDollar[3].identifierCI)
@@ -17382,7 +17385,7 @@ yydefault:
 	case 969:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL TableExpr
-//line sql.y:5125
+//line sql.y:5127
 		{
 			yyLOCAL = &JoinTableExpr{LeftExpr: yyDollar[1].tableExprUnion(), Join: yyDollar[2].joinTypeUnion(), RightExpr: yyDollar[3].tableExprUnion(), Condition: yyDollar[4].joinCondition}
 		}
@@ -17390,7 +17393,7 @@ yydefault:
 	case 970:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL TableExpr
-//line sql.y:5129
+//line sql.y:5131
 		{
 			yyLOCAL = &JoinTableExpr{LeftExpr: yyDollar[1].tableExprUnion(), Join: yyDollar[2].joinTypeUnion(), RightExpr: yyDollar[3].tableExprUnion(), Condition: yyDollar[4].joinCondition}
 		}
@@ -17398,7 +17401,7 @@ yydefault:
 	case 971:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL TableExpr
-//line sql.y:5133
+//line sql.y:5135
 		{
 			yyLOCAL = &JoinTableExpr{LeftExpr: yyDollar[1].tableExprUnion(), Join: yyDollar[2].joinTypeUnion(), RightExpr: yyDollar[3].tableExprUnion(), Condition: yyDollar[4].joinCondition}
 		}
@@ -17406,87 +17409,87 @@ yydefault:
 	case 972:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL TableExpr
-//line sql.y:5137
+//line sql.y:5139
 		{
 			yyLOCAL = &JoinTableExpr{LeftExpr: yyDollar[1].tableExprUnion(), Join: yyDollar[2].joinTypeUnion(), RightExpr: yyDollar[3].tableExprUnion()}
 		}
 		yyVAL.union = yyLOCAL
 	case 973:
 		yyDollar = yyS[yypt-2 : yypt+1]
-//line sql.y:5143
+//line sql.y:5145
 		{
 			yyVAL.joinCondition = &JoinCondition{On: yyDollar[2].exprUnion()}
 		}
 	case 974:
 		yyDollar = yyS[yypt-4 : yypt+1]
-//line sql.y:5145
+//line sql.y:5147
 		{
 			yyVAL.joinCondition = &JoinCondition{Using: yyDollar[3].columnsUnion()}
 		}
 	case 975:
 		yyDollar = yyS[yypt-0 : yypt+1]
-//line sql.y:5149
+//line sql.y:5151
 		{
 			yyVAL.joinCondition = &JoinCondition{}
 		}
 	case 976:
 		yyDollar = yyS[yypt-1 : yypt+1]
-//line sql.y:5151
+//line sql.y:5153
 		{
 			yyVAL.joinCondition = yyDollar[1].joinCondition
 		}
 	case 977:
 		yyDollar = yyS[yypt-0 : yypt+1]
-//line sql.y:5155
+//line sql.y:5157
 		{
 			yyVAL.joinCondition = &JoinCondition{}
 		}
 	case 978:
 		yyDollar = yyS[yypt-2 : yypt+1]
-//line sql.y:5157
+//line sql.y:5159
 		{
 			yyVAL.joinCondition = &JoinCondition{On: yyDollar[2].exprUnion()}
 		}
 	case 979:
 		yyDollar = yyS[yypt-0 : yypt+1]
-//line sql.y:5160
+//line sql.y:5162
 		{
 			yyVAL.empty = struct{}{}
 		}
 	case 980:
 		yyDollar = yyS[yypt-1 : yypt+1]
-//line sql.y:5162
+//line sql.y:5164
 		{
 			yyVAL.empty = struct{}{}
 		}
 	case 981:
 		yyDollar = yyS[yypt-0 : yypt+1]
-//line sql.y:5165
+//line sql.y:5167
 		{
 			yyVAL.identifierCS = NewIdentifierCS("")
 		}
 	case 982:
 		yyDollar = yyS[yypt-1 : yypt+1]
-//line sql.y:5169
+//line sql.y:5171
 		{
 			yyVAL.identifierCS = yyDollar[1].identifierCS
 		}
 	case 983:
 		yyDollar = yyS[yypt-2 : yypt+1]
-//line sql.y:5173
+//line sql.y:5175
 		{
 			yyVAL.identifierCS = yyDollar[2].identifierCS
 		}
 	case 985:
 		yyDollar = yyS[yypt-1 : yypt+1]
-//line sql.y:5180
+//line sql.y:5182
 		{
 			yyVAL.identifierCS = NewIdentifierCS(string(yyDollar[1].str))
 		}
 	case 986:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL JoinType
-//line sql.y:5186
+//line sql.y:5188
 		{
 			yyLOCAL = NormalJoinType
 		}
@@ -17494,7 +17497,7 @@ yydefault:
 	case 987:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL JoinType
-//line sql.y:5190
+//line sql.y:5192
 		{
 			yyLOCAL = NormalJoinType
 		}
@@ -17502,7 +17505,7 @@ yydefault:
 	case 988:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL JoinType
-//line sql.y:5194
+//line sql.y:5196
 		{
 			yyLOCAL = NormalJoinType
 		}
@@ -17510,7 +17513,7 @@ yydefault:
 	case 989:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL JoinType
-//line sql.y:5200
+//line sql.y:5202
 		{
 			yyLOCAL = StraightJoinType
 		}
@@ -17518,7 +17521,7 @@ yydefault:
 	case 990:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL JoinType
-//line sql.y:5206
+//line sql.y:5208
 		{
 			yyLOCAL = LeftJoinType
 		}
@@ -17526,7 +17529,7 @@ yydefault:
 	case 991:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL JoinType
-//line sql.y:5210
+//line sql.y:5212
 		{
 			yyLOCAL = LeftJoinType
 		}
@@ -17534,7 +17537,7 @@ yydefault:
 	case 992:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL JoinType
-//line sql.y:5214
+//line sql.y:5216
 		{
 			yyLOCAL = RightJoinType
 		}
@@ -17542,7 +17545,7 @@ yydefault:
 	case 993:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL JoinType
-//line sql.y:5218
+//line sql.y:5220
 		{
 			yyLOCAL = RightJoinType
 		}
@@ -17550,7 +17553,7 @@ yydefault:
 	case 994:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL JoinType
-//line sql.y:5224
+//line sql.y:5226
 		{
 			yyLOCAL = NaturalJoinType
 		}
@@ -17558,7 +17561,7 @@ yydefault:
 	case 995:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL JoinType
-//line sql.y:5228
+//line sql.y:5230
 		{
 			if yyDollar[2].joinTypeUnion() == LeftJoinType {
 				yyLOCAL = NaturalLeftJoinType
@@ -17569,38 +17572,38 @@ yydefault:
 		yyVAL.union = yyLOCAL
 	case 996:
 		yyDollar = yyS[yypt-2 : yypt+1]
-//line sql.y:5238
+//line sql.y:5240
 		{
 			yyVAL.tableName = yyDollar[2].tableName
 		}
 	case 997:
 		yyDollar = yyS[yypt-1 : yypt+1]
-//line sql.y:5242
+//line sql.y:5244
 		{
 			yyVAL.tableName = yyDollar[1].tableName
 		}
 	case 998:
 		yyDollar = yyS[yypt-1 : yypt+1]
-//line sql.y:5248
+//line sql.y:5250
 		{
 			yyVAL.tableName = TableName{Name: yyDollar[1].identifierCS}
 		}
 	case 999:
 		yyDollar = yyS[yypt-3 : yypt+1]
-//line sql.y:5252
+//line sql.y:5254
 		{
 			yyVAL.tableName = TableName{Qualifier: yyDollar[1].identifierCS, Name: yyDollar[3].identifierCS}
 		}
 	case 1000:
 		yyDollar = yyS[yypt-3 : yypt+1]
-//line sql.y:5258
+//line sql.y:5260
 		{
 			yyVAL.tableName = TableName{Name: yyDollar[1].identifierCS}
 		}
 	case 1001:
 		yyDollar = yyS[yypt-0 : yypt+1]
 		var yyLOCAL IndexHints
-//line sql.y:5263
+//line sql.y:5265
 		{
 			yyLOCAL = nil
 		}
@@ -17608,7 +17611,7 @@ yydefault:
 	case 1002:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL IndexHints
-//line sql.y:5267
+//line sql.y:5269
 		{
 			yyLOCAL = yyDollar[1].indexHintsUnion()
 		}
@@ -17616,14 +17619,14 @@ yydefault:
 	case 1003:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL IndexHints
-//line sql.y:5273
+//line sql.y:5275
 		{
 			yyLOCAL = IndexHints{yyDollar[1].indexHintUnion()}
 		}
 		yyVAL.union = yyLOCAL
 	case 1004:
 		yyDollar = yyS[yypt-2 : yypt+1]
-//line sql.y:5277
+//line sql.y:5279
 		{
 			yySLICE := (*IndexHints)(yyIaddr(yyVAL.union))
 			*yySLICE = append(*yySLICE, yyDollar[2].indexHintUnion())
@@ -17631,7 +17634,7 @@ yydefault:
 	case 1005:
 		yyDollar = yyS[yypt-6 : yypt+1]
 		var yyLOCAL *IndexHint
-//line sql.y:5283
+//line sql.y:5285
 		{
 			yyLOCAL = &IndexHint{Type: UseOp, ForType: yyDollar[3].indexHintForTypeUnion(), Indexes: yyDollar[5].columnsUnion()}
 		}
@@ -17639,7 +17642,7 @@ yydefault:
 	case 1006:
 		yyDollar = yyS[yypt-5 : yypt+1]
 		var yyLOCAL *IndexHint
-//line sql.y:5287
+//line sql.y:5289
 		{
 			yyLOCAL = &IndexHint{Type: UseOp, ForType: yyDollar[3].indexHintForTypeUnion()}
 		}
@@ -17647,7 +17650,7 @@ yydefault:
 	case 1007:
 		yyDollar = yyS[yypt-6 : yypt+1]
 		var yyLOCAL *IndexHint
-//line sql.y:5291
+//line sql.y:5293
 		{
 			yyLOCAL = &IndexHint{Type: IgnoreOp, ForType: yyDollar[3].indexHintForTypeUnion(), Indexes: yyDollar[5].columnsUnion()}
 		}
@@ -17655,7 +17658,7 @@ yydefault:
 	case 1008:
 		yyDollar = yyS[yypt-6 : yypt+1]
 		var yyLOCAL *IndexHint
-//line sql.y:5295
+//line sql.y:5297
 		{
 			yyLOCAL = &IndexHint{Type: ForceOp, ForType: yyDollar[3].indexHintForTypeUnion(), Indexes: yyDollar[5].columnsUnion()}
 		}
@@ -17663,7 +17666,7 @@ yydefault:
 	case 1009:
 		yyDollar = yyS[yypt-5 : yypt+1]
 		var yyLOCAL *IndexHint
-//line sql.y:5299
+//line sql.y:5301
 		{
 			yyLOCAL = &IndexHint{Type: UseVindexOp, Indexes: yyDollar[4].columnsUnion()}
 		}
@@ -17671,7 +17674,7 @@ yydefault:
 	case 1010:
 		yyDollar = yyS[yypt-5 : yypt+1]
 		var yyLOCAL *IndexHint
-//line sql.y:5303
+//line sql.y:5305
 		{
 			yyLOCAL = &IndexHint{Type: IgnoreVindexOp, Indexes: yyDollar[4].columnsUnion()}
 		}
@@ -17679,7 +17682,7 @@ yydefault:
 	case 1011:
 		yyDollar = yyS[yypt-0 : yypt+1]
 		var yyLOCAL IndexHintForType
-//line sql.y:5308
+//line sql.y:5310
 		{
 			yyLOCAL = NoForType
 		}
@@ -17687,7 +17690,7 @@ yydefault:
 	case 1012:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL IndexHintForType
-//line sql.y:5312
+//line sql.y:5314
 		{
 			yyLOCAL = JoinForType
 		}
@@ -17695,7 +17698,7 @@ yydefault:
 	case 1013:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL IndexHintForType
-//line sql.y:5316
+//line sql.y:5318
 		{
 			yyLOCAL = OrderByForType
 		}
@@ -17703,7 +17706,7 @@ yydefault:
 	case 1014:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL IndexHintForType
-//line sql.y:5320
+//line sql.y:5322
 		{
 			yyLOCAL = GroupByForType
 		}
@@ -17711,7 +17714,7 @@ yydefault:
 	case 1015:
 		yyDollar = yyS[yypt-0 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:5326
+//line sql.y:5328
 		{
 			yyLOCAL = nil
 		}
@@ -17719,7 +17722,7 @@ yydefault:
 	case 1016:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:5330
+//line sql.y:5332
 		{
 			yyLOCAL = yyDollar[2].exprUnion()
 		}
@@ -17727,7 +17730,7 @@ yydefault:
 	case 1017:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:5337
+//line sql.y:5339
 		{
 			yyLOCAL = &OrExpr{Left: yyDollar[1].exprUnion(), Right: yyDollar[3].exprUnion()}
 		}
@@ -17735,7 +17738,7 @@ yydefault:
 	case 1018:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:5341
+//line sql.y:5343
 		{
 			yyLOCAL = &XorExpr{Left: yyDollar[1].exprUnion(), Right: yyDollar[3].exprUnion()}
 		}
@@ -17743,7 +17746,7 @@ yydefault:
 	case 1019:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:5345
+//line sql.y:5347
 		{
 			yyLOCAL = &AndExpr{Left: yyDollar[1].exprUnion(), Right: yyDollar[3].exprUnion()}
 		}
@@ -17751,7 +17754,7 @@ yydefault:
 	case 1020:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:5349
+//line sql.y:5351
 		{
 			yyLOCAL = &NotExpr{Expr: yyDollar[2].exprUnion()}
 		}
@@ -17759,7 +17762,7 @@ yydefault:
 	case 1021:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:5353
+//line sql.y:5355
 		{
 			yyLOCAL = &IsExpr{Left: yyDollar[1].exprUnion(), Right: yyDollar[3].isExprOperatorUnion()}
 		}
@@ -17767,7 +17770,7 @@ yydefault:
 	case 1022:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:5357
+//line sql.y:5359
 		{
 			yyLOCAL = yyDollar[1].exprUnion()
 		}
@@ -17775,7 +17778,7 @@ yydefault:
 	case 1023:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:5361
+//line sql.y:5363
 		{
 			yyLOCAL = &AssignmentExpr{Left: yyDollar[1].variableUnion(), Right: yyDollar[3].exprUnion()}
 		}
@@ -17783,25 +17786,25 @@ yydefault:
 	case 1024:
 		yyDollar = yyS[yypt-6 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:5365
+//line sql.y:5367
 		{
 			yyLOCAL = &MemberOfExpr{Value: yyDollar[1].exprUnion(), JSONArr: yyDollar[5].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
 	case 1025:
 		yyDollar = yyS[yypt-1 : yypt+1]
-//line sql.y:5371
+//line sql.y:5373
 		{
 		}
 	case 1026:
 		yyDollar = yyS[yypt-1 : yypt+1]
-//line sql.y:5374
+//line sql.y:5376
 		{
 		}
 	case 1027:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:5379
+//line sql.y:5381
 		{
 			yyLOCAL = &IsExpr{Left: yyDollar[1].exprUnion(), Right: IsNullOp}
 		}
@@ -17809,7 +17812,7 @@ yydefault:
 	case 1028:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:5383
+//line sql.y:5385
 		{
 			yyLOCAL = &IsExpr{Left: yyDollar[1].exprUnion(), Right: IsNotNullOp}
 		}
@@ -17817,7 +17820,7 @@ yydefault:
 	case 1029:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:5387
+//line sql.y:5389
 		{
 			yyLOCAL = &ComparisonExpr{Left: yyDollar[1].exprUnion(), Operator: yyDollar[2].comparisonExprOperatorUnion(), Right: yyDollar[3].exprUnion()}
 		}
@@ -17825,7 +17828,7 @@ yydefault:
 	case 1030:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:5391
+//line sql.y:5393
 		{
 			yyLOCAL = &ComparisonExpr{Left: yyDollar[1].exprUnion(), Operator: yyDollar[2].comparisonExprOperatorUnion(), Modifier: Any, Right: yyDollar[4].subqueryUnion()}
 		}
@@ -17833,7 +17836,7 @@ yydefault:
 	case 1031:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:5395
+//line sql.y:5397
 		{
 			yyLOCAL = &ComparisonExpr{Left: yyDollar[1].exprUnion(), Operator: yyDollar[2].comparisonExprOperatorUnion(), Modifier: Any, Right: yyDollar[4].subqueryUnion()}
 		}
@@ -17841,7 +17844,7 @@ yydefault:
 	case 1032:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:5399
+//line sql.y:5401
 		{
 			yyLOCAL = &ComparisonExpr{Left: yyDollar[1].exprUnion(), Operator: yyDollar[2].comparisonExprOperatorUnion(), Modifier: All, Right: yyDollar[4].subqueryUnion()}
 		}
@@ -17849,7 +17852,7 @@ yydefault:
 	case 1033:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:5403
+//line sql.y:5405
 		{
 			yyLOCAL = yyDollar[1].exprUnion()
 		}
@@ -17857,7 +17860,7 @@ yydefault:
 	case 1034:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:5409
+//line sql.y:5411
 		{
 			yyLOCAL = &ComparisonExpr{Left: yyDollar[1].exprUnion(), Operator: InOp, Right: yyDollar[3].colTupleUnion()}
 		}
@@ -17865,7 +17868,7 @@ yydefault:
 	case 1035:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:5413
+//line sql.y:5415
 		{
 			yyLOCAL = &ComparisonExpr{Left: yyDollar[1].exprUnion(), Operator: NotInOp, Right: yyDollar[4].colTupleUnion()}
 		}
@@ -17873,7 +17876,7 @@ yydefault:
 	case 1036:
 		yyDollar = yyS[yypt-5 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:5417
+//line sql.y:5419
 		{
 			yyLOCAL = &BetweenExpr{Left: yyDollar[1].exprUnion(), IsBetween: true, From: yyDollar[3].exprUnion(), To: yyDollar[5].exprUnion()}
 		}
@@ -17881,7 +17884,7 @@ yydefault:
 	case 1037:
 		yyDollar = yyS[yypt-6 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:5421
+//line sql.y:5423
 		{
 			yyLOCAL = &BetweenExpr{Left: yyDollar[1].exprUnion(), IsBetween: false, From: yyDollar[4].exprUnion(), To: yyDollar[6].exprUnion()}
 		}
@@ -17889,7 +17892,7 @@ yydefault:
 	case 1038:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:5425
+//line sql.y:5427
 		{
 			yyLOCAL = &ComparisonExpr{Left: yyDollar[1].exprUnion(), Operator: LikeOp, Right: yyDollar[3].exprUnion()}
 		}
@@ -17897,7 +17900,7 @@ yydefault:
 	case 1039:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:5429
+//line sql.y:5431
 		{
 			yyLOCAL = &ComparisonExpr{Left: yyDollar[1].exprUnion(), Operator: NotLikeOp, Right: yyDollar[4].exprUnion()}
 		}
@@ -17905,7 +17908,7 @@ yydefault:
 	case 1040:
 		yyDollar = yyS[yypt-5 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:5433
+//line sql.y:5435
 		{
 			yyLOCAL = &ComparisonExpr{Left: yyDollar[1].exprUnion(), Operator: LikeOp, Right: yyDollar[3].exprUnion(), Escape: yyDollar[5].exprUnion()}
 		}
@@ -17913,7 +17916,7 @@ yydefault:
 	case 1041:
 		yyDollar = yyS[yypt-6 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:5437
+//line sql.y:5439
 		{
 			yyLOCAL = &ComparisonExpr{Left: yyDollar[1].exprUnion(), Operator: NotLikeOp, Right: yyDollar[4].exprUnion(), Escape: yyDollar[6].exprUnion()}
 		}
@@ -17921,7 +17924,7 @@ yydefault:
 	case 1042:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:5441
+//line sql.y:5443
 		{
 			yyLOCAL = &ComparisonExpr{Left: yyDollar[1].exprUnion(), Operator: RegexpOp, Right: yyDollar[3].exprUnion()}
 		}
@@ -17929,7 +17932,7 @@ yydefault:
 	case 1043:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:5445
+//line sql.y:5447
 		{
 			yyLOCAL = &ComparisonExpr{Left: yyDollar[1].exprUnion(), Operator: NotRegexpOp, Right: yyDollar[4].exprUnion()}
 		}
@@ -17937,25 +17940,25 @@ yydefault:
 	case 1044:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:5449
+//line sql.y:5451
 		{
 			yyLOCAL = yyDollar[1].exprUnion()
 		}
 		yyVAL.union = yyLOCAL
 	case 1045:
 		yyDollar = yyS[yypt-1 : yypt+1]
-//line sql.y:5455
+//line sql.y:5457
 		{
 		}
 	case 1046:
 		yyDollar = yyS[yypt-1 : yypt+1]
-//line sql.y:5458
+//line sql.y:5460
 		{
 		}
 	case 1047:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:5464
+//line sql.y:5466
 		{
 			yyLOCAL = &BinaryExpr{Left: yyDollar[1].exprUnion(), Operator: BitOrOp, Right: yyDollar[3].exprUnion()}
 		}
@@ -17963,7 +17966,7 @@ yydefault:
 	case 1048:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:5468
+//line sql.y:5470
 		{
 			yyLOCAL = &BinaryExpr{Left: yyDollar[1].exprUnion(), Operator: BitAndOp, Right: yyDollar[3].exprUnion()}
 		}
@@ -17971,7 +17974,7 @@ yydefault:
 	case 1049:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:5472
+//line sql.y:5474
 		{
 			yyLOCAL = &BinaryExpr{Left: yyDollar[1].exprUnion(), Operator: ShiftLeftOp, Right: yyDollar[3].exprUnion()}
 		}
@@ -17979,7 +17982,7 @@ yydefault:
 	case 1050:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:5476
+//line sql.y:5478
 		{
 			yyLOCAL = &BinaryExpr{Left: yyDollar[1].exprUnion(), Operator: ShiftRightOp, Right: yyDollar[3].exprUnion()}
 		}
@@ -17987,7 +17990,7 @@ yydefault:
 	case 1051:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:5480
+//line sql.y:5482
 		{
 			yyLOCAL = &BinaryExpr{Left: yyDollar[1].exprUnion(), Operator: PlusOp, Right: yyDollar[3].exprUnion()}
 		}
@@ -17995,7 +17998,7 @@ yydefault:
 	case 1052:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:5484
+//line sql.y:5486
 		{
 			yyLOCAL = &BinaryExpr{Left: yyDollar[1].exprUnion(), Operator: MinusOp, Right: yyDollar[3].exprUnion()}
 		}
@@ -18003,7 +18006,7 @@ yydefault:
 	case 1053:
 		yyDollar = yyS[yypt-5 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:5488
+//line sql.y:5490
 		{
 			yyLOCAL = &IntervalDateExpr{Syntax: IntervalDateExprBinaryAdd, Date: yyDollar[1].exprUnion(), Unit: yyDollar[5].intervalTypeUnion(), Interval: yyDollar[4].exprUnion()}
 		}
@@ -18011,7 +18014,7 @@ yydefault:
 	case 1054:
 		yyDollar = yyS[yypt-5 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:5492
+//line sql.y:5494
 		{
 			yyLOCAL = &IntervalDateExpr{Syntax: IntervalDateExprBinarySub, Date: yyDollar[1].exprUnion(), Unit: yyDollar[5].intervalTypeUnion(), Interval: yyDollar[4].exprUnion()}
 		}
@@ -18019,7 +18022,7 @@ yydefault:
 	case 1055:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:5496
+//line sql.y:5498
 		{
 			yyLOCAL = &BinaryExpr{Left: yyDollar[1].exprUnion(), Operator: MultOp, Right: yyDollar[3].exprUnion()}
 		}
@@ -18027,7 +18030,7 @@ yydefault:
 	case 1056:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:5500
+//line sql.y:5502
 		{
 			yyLOCAL = &BinaryExpr{Left: yyDollar[1].exprUnion(), Operator: DivOp, Right: yyDollar[3].exprUnion()}
 		}
@@ -18035,7 +18038,7 @@ yydefault:
 	case 1057:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:5504
+//line sql.y:5506
 		{
 			yyLOCAL = &BinaryExpr{Left: yyDollar[1].exprUnion(), Operator: ModOp, Right: yyDollar[3].exprUnion()}
 		}
@@ -18043,7 +18046,7 @@ yydefault:
 	case 1058:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:5508
+//line sql.y:5510
 		{
 			yyLOCAL = &BinaryExpr{Left: yyDollar[1].exprUnion(), Operator: IntDivOp, Right: yyDollar[3].exprUnion()}
 		}
@@ -18051,7 +18054,7 @@ yydefault:
 	case 1059:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:5512
+//line sql.y:5514
 		{
 			yyLOCAL = &BinaryExpr{Left: yyDollar[1].exprUnion(), Operator: ModOp, Right: yyDollar[3].exprUnion()}
 		}
@@ -18059,7 +18062,7 @@ yydefault:
 	case 1060:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:5516
+//line sql.y:5518
 		{
 			yyLOCAL = &BinaryExpr{Left: yyDollar[1].exprUnion(), Operator: BitXorOp, Right: yyDollar[3].exprUnion()}
 		}
@@ -18067,7 +18070,7 @@ yydefault:
 	case 1061:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:5520
+//line sql.y:5522
 		{
 			yyLOCAL = yyDollar[1].exprUnion()
 		}
@@ -18075,7 +18078,7 @@ yydefault:
 	case 1062:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:5526
+//line sql.y:5528
 		{
 			yyLOCAL = yyDollar[1].exprUnion()
 		}
@@ -18083,7 +18086,7 @@ yydefault:
 	case 1063:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:5530
+//line sql.y:5532
 		{
 			yyLOCAL = yyDollar[1].exprUnion()
 		}
@@ -18091,7 +18094,7 @@ yydefault:
 	case 1064:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:5534
+//line sql.y:5536
 		{
 			yyLOCAL = yyDollar[1].exprUnion()
 		}
@@ -18099,7 +18102,7 @@ yydefault:
 	case 1065:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:5538
+//line sql.y:5540
 		{
 			yyLOCAL = yyDollar[1].exprUnion()
 		}
@@ -18107,7 +18110,7 @@ yydefault:
 	case 1066:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:5542
+//line sql.y:5544
 		{
 			yyLOCAL = &CollateExpr{Expr: yyDollar[1].exprUnion(), Collation: yyDollar[3].str}
 		}
@@ -18115,7 +18118,7 @@ yydefault:
 	case 1067:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:5546
+//line sql.y:5548
 		{
 			yyLOCAL = yyDollar[1].exprUnion()
 		}
@@ -18123,7 +18126,7 @@ yydefault:
 	case 1068:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:5550
+//line sql.y:5552
 		{
 			yyLOCAL = yyDollar[1].exprUnion()
 		}
@@ -18131,7 +18134,7 @@ yydefault:
 	case 1069:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:5554
+//line sql.y:5556
 		{
 			yyLOCAL = yyDollar[1].variableUnion()
 		}
@@ -18139,7 +18142,7 @@ yydefault:
 	case 1070:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:5558
+//line sql.y:5560
 		{
 			yyLOCAL = yyDollar[2].exprUnion() // TODO: do we really want to ignore unary '+' before any kind of literals?
 		}
@@ -18147,7 +18150,7 @@ yydefault:
 	case 1071:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:5562
+//line sql.y:5564
 		{
 			yyLOCAL = &UnaryExpr{Operator: UMinusOp, Expr: yyDollar[2].exprUnion()}
 		}
@@ -18155,7 +18158,7 @@ yydefault:
 	case 1072:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:5566
+//line sql.y:5568
 		{
 			yyLOCAL = &UnaryExpr{Operator: TildaOp, Expr: yyDollar[2].exprUnion()}
 		}
@@ -18163,7 +18166,7 @@ yydefault:
 	case 1073:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:5570
+//line sql.y:5572
 		{
 			yyLOCAL = &UnaryExpr{Operator: BangOp, Expr: yyDollar[2].exprUnion()}
 		}
@@ -18171,7 +18174,7 @@ yydefault:
 	case 1074:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:5574
+//line sql.y:5576
 		{
 			yyLOCAL = yyDollar[1].subqueryUnion()
 		}
@@ -18179,7 +18182,7 @@ yydefault:
 	case 1075:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:5578
+//line sql.y:5580
 		{
 			yyLOCAL = yyDollar[1].exprUnion()
 		}
@@ -18187,7 +18190,7 @@ yydefault:
 	case 1076:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:5582
+//line sql.y:5584
 		{
 			yyLOCAL = &ExistsExpr{Subquery: yyDollar[2].subqueryUnion()}
 		}
@@ -18195,7 +18198,7 @@ yydefault:
 	case 1077:
 		yyDollar = yyS[yypt-7 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:5586
+//line sql.y:5588
 		{
 			yyLOCAL = &MatchExpr{Columns: yyDollar[2].colNamesUnion(), Expr: yyDollar[5].exprUnion(), Option: yyDollar[6].matchExprOptionUnion()}
 		}
@@ -18203,7 +18206,7 @@ yydefault:
 	case 1078:
 		yyDollar = yyS[yypt-7 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:5590
+//line sql.y:5592
 		{
 			yyLOCAL = &CastExpr{Expr: yyDollar[3].exprUnion(), Type: yyDollar[5].convertTypeUnion(), Array: yyDollar[6].booleanUnion()}
 		}
@@ -18211,7 +18214,7 @@ yydefault:
 	case 1079:
 		yyDollar = yyS[yypt-6 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:5594
+//line sql.y:5596
 		{
 			yyLOCAL = &ConvertExpr{Expr: yyDollar[3].exprUnion(), Type: yyDollar[5].convertTypeUnion()}
 		}
@@ -18219,7 +18222,7 @@ yydefault:
 	case 1080:
 		yyDollar = yyS[yypt-6 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:5598
+//line sql.y:5600
 		{
 			yyLOCAL = &ConvertUsingExpr{Expr: yyDollar[3].exprUnion(), Type: yyDollar[5].str}
 		}
@@ -18227,7 +18230,7 @@ yydefault:
 	case 1081:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:5602
+//line sql.y:5604
 		{
 			// From: https://dev.mysql.com/doc/refman/8.0/en/cast-functions.html#operator_binary
 			// To convert a string expression to a binary string, these constructs are equivalent:
@@ -18239,7 +18242,7 @@ yydefault:
 	case 1082:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:5610
+//line sql.y:5612
 		{
 			yyLOCAL = &Default{ColName: yyDollar[2].str}
 		}
@@ -18247,7 +18250,7 @@ yydefault:
 	case 1083:
 		yyDollar = yyS[yypt-5 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:5614
+//line sql.y:5616
 		{
 			yyLOCAL = &IntervalDateExpr{Syntax: IntervalDateExprBinaryAddLeft, Date: yyDollar[5].exprUnion(), Unit: yyDollar[3].intervalTypeUnion(), Interval: yyDollar[2].exprUnion()}
 		}
@@ -18255,7 +18258,7 @@ yydefault:
 	case 1084:
 		yyDollar = yyS[yypt-6 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:5618
+//line sql.y:5620
 		{
 			yyLOCAL = &IntervalFuncExpr{Expr: yyDollar[3].exprUnion(), Exprs: yyDollar[5].exprsUnion()}
 		}
@@ -18263,7 +18266,7 @@ yydefault:
 	case 1085:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:5622
+//line sql.y:5624
 		{
 			yyLOCAL = &JSONExtractExpr{JSONDoc: yyDollar[1].exprUnion(), PathList: []Expr{yyDollar[3].exprUnion()}}
 		}
@@ -18271,7 +18274,7 @@ yydefault:
 	case 1086:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:5626
+//line sql.y:5628
 		{
 			yyLOCAL = &JSONUnquoteExpr{JSONValue: &JSONExtractExpr{JSONDoc: yyDollar[1].exprUnion(), PathList: []Expr{yyDollar[3].exprUnion()}}}
 		}
@@ -18279,7 +18282,7 @@ yydefault:
 	case 1087:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL []*ColName
-//line sql.y:5632
+//line sql.y:5634
 		{
 			yyLOCAL = yyDollar[1].colNamesUnion()
 		}
@@ -18287,7 +18290,7 @@ yydefault:
 	case 1088:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL []*ColName
-//line sql.y:5636
+//line sql.y:5638
 		{
 			yyLOCAL = yyDollar[2].colNamesUnion()
 		}
@@ -18295,14 +18298,14 @@ yydefault:
 	case 1089:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL []*ColName
-//line sql.y:5642
+//line sql.y:5644
 		{
 			yyLOCAL = []*ColName{yyDollar[1].colNameUnion()}
 		}
 		yyVAL.union = yyLOCAL
 	case 1090:
 		yyDollar = yyS[yypt-3 : yypt+1]
-//line sql.y:5646
+//line sql.y:5648
 		{
 			yySLICE := (*[]*ColName)(yyIaddr(yyVAL.union))
 			*yySLICE = append(*yySLICE, yyDollar[3].colNameUnion())
@@ -18310,7 +18313,7 @@ yydefault:
 	case 1091:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL TrimType
-//line sql.y:5652
+//line sql.y:5654
 		{
 			yyLOCAL = BothTrimType
 		}
@@ -18318,7 +18321,7 @@ yydefault:
 	case 1092:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL TrimType
-//line sql.y:5656
+//line sql.y:5658
 		{
 			yyLOCAL = LeadingTrimType
 		}
@@ -18326,7 +18329,7 @@ yydefault:
 	case 1093:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL TrimType
-//line sql.y:5660
+//line sql.y:5662
 		{
 			yyLOCAL = TrailingTrimType
 		}
@@ -18334,7 +18337,7 @@ yydefault:
 	case 1094:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL FrameUnitType
-//line sql.y:5666
+//line sql.y:5668
 		{
 			yyLOCAL = FrameRowsType
 		}
@@ -18342,7 +18345,7 @@ yydefault:
 	case 1095:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL FrameUnitType
-//line sql.y:5670
+//line sql.y:5672
 		{
 			yyLOCAL = FrameRangeType
 		}
@@ -18350,7 +18353,7 @@ yydefault:
 	case 1096:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL ArgumentLessWindowExprType
-//line sql.y:5677
+//line sql.y:5679
 		{
 			yyLOCAL = CumeDistExprType
 		}
@@ -18358,7 +18361,7 @@ yydefault:
 	case 1097:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL ArgumentLessWindowExprType
-//line sql.y:5681
+//line sql.y:5683
 		{
 			yyLOCAL = DenseRankExprType
 		}
@@ -18366,7 +18369,7 @@ yydefault:
 	case 1098:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL ArgumentLessWindowExprType
-//line sql.y:5685
+//line sql.y:5687
 		{
 			yyLOCAL = PercentRankExprType
 		}
@@ -18374,7 +18377,7 @@ yydefault:
 	case 1099:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL ArgumentLessWindowExprType
-//line sql.y:5689
+//line sql.y:5691
 		{
 			yyLOCAL = RankExprType
 		}
@@ -18382,7 +18385,7 @@ yydefault:
 	case 1100:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL ArgumentLessWindowExprType
-//line sql.y:5693
+//line sql.y:5695
 		{
 			yyLOCAL = RowNumberExprType
 		}
@@ -18390,7 +18393,7 @@ yydefault:
 	case 1101:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL *FramePoint
-//line sql.y:5699
+//line sql.y:5701
 		{
 			yyLOCAL = &FramePoint{Type: CurrentRowType}
 		}
@@ -18398,7 +18401,7 @@ yydefault:
 	case 1102:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL *FramePoint
-//line sql.y:5703
+//line sql.y:5705
 		{
 			yyLOCAL = &FramePoint{Type: UnboundedPrecedingType}
 		}
@@ -18406,7 +18409,7 @@ yydefault:
 	case 1103:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL *FramePoint
-//line sql.y:5707
+//line sql.y:5709
 		{
 			yyLOCAL = &FramePoint{Type: UnboundedFollowingType}
 		}
@@ -18414,7 +18417,7 @@ yydefault:
 	case 1104:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL *FramePoint
-//line sql.y:5711
+//line sql.y:5713
 		{
 			yyLOCAL = &FramePoint{Type: ExprPrecedingType, Expr: yyDollar[1].exprUnion()}
 		}
@@ -18422,7 +18425,7 @@ yydefault:
 	case 1105:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL *FramePoint
-//line sql.y:5715
+//line sql.y:5717
 		{
 			yyLOCAL = &FramePoint{Type: ExprPrecedingType, Expr: yyDollar[2].exprUnion(), Unit: yyDollar[3].intervalTypeUnion()}
 		}
@@ -18430,7 +18433,7 @@ yydefault:
 	case 1106:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL *FramePoint
-//line sql.y:5719
+//line sql.y:5721
 		{
 			yyLOCAL = &FramePoint{Type: ExprFollowingType, Expr: yyDollar[1].exprUnion()}
 		}
@@ -18438,7 +18441,7 @@ yydefault:
 	case 1107:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL *FramePoint
-//line sql.y:5723
+//line sql.y:5725
 		{
 			yyLOCAL = &FramePoint{Type: ExprFollowingType, Expr: yyDollar[2].exprUnion(), Unit: yyDollar[3].intervalTypeUnion()}
 		}
@@ -18446,7 +18449,7 @@ yydefault:
 	case 1108:
 		yyDollar = yyS[yypt-0 : yypt+1]
 		var yyLOCAL *FrameClause
-//line sql.y:5728
+//line sql.y:5730
 		{
 			yyLOCAL = nil
 		}
@@ -18454,7 +18457,7 @@ yydefault:
 	case 1109:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL *FrameClause
-//line sql.y:5732
+//line sql.y:5734
 		{
 			yyLOCAL = yyDollar[1].frameClauseUnion()
 		}
@@ -18462,7 +18465,7 @@ yydefault:
 	case 1110:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL *FrameClause
-//line sql.y:5738
+//line sql.y:5740
 		{
 			yyLOCAL = &FrameClause{Unit: yyDollar[1].frameUnitTypeUnion(), Start: yyDollar[2].framePointUnion()}
 		}
@@ -18470,43 +18473,43 @@ yydefault:
 	case 1111:
 		yyDollar = yyS[yypt-5 : yypt+1]
 		var yyLOCAL *FrameClause
-//line sql.y:5742
+//line sql.y:5744
 		{
 			yyLOCAL = &FrameClause{Unit: yyDollar[1].frameUnitTypeUnion(), Start: yyDollar[3].framePointUnion(), End: yyDollar[5].framePointUnion()}
 		}
 		yyVAL.union = yyLOCAL
 	case 1112:
 		yyDollar = yyS[yypt-0 : yypt+1]
-		var yyLOCAL Exprs
-//line sql.y:5747
+		var yyLOCAL []Expr
+//line sql.y:5749
 		{
 			yyLOCAL = nil
 		}
 		yyVAL.union = yyLOCAL
 	case 1113:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		var yyLOCAL Exprs
-//line sql.y:5751
+		var yyLOCAL []Expr
+//line sql.y:5753
 		{
 			yyLOCAL = yyDollar[3].exprsUnion()
 		}
 		yyVAL.union = yyLOCAL
 	case 1114:
 		yyDollar = yyS[yypt-0 : yypt+1]
-//line sql.y:5756
+//line sql.y:5758
 		{
 			yyVAL.identifierCI = IdentifierCI{}
 		}
 	case 1115:
 		yyDollar = yyS[yypt-1 : yypt+1]
-//line sql.y:5760
+//line sql.y:5762
 		{
 			yyVAL.identifierCI = yyDollar[1].identifierCI
 		}
 	case 1116:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL *WindowSpecification
-//line sql.y:5766
+//line sql.y:5768
 		{
 			yyLOCAL = &WindowSpecification{Name: yyDollar[1].identifierCI, PartitionClause: yyDollar[2].exprsUnion(), OrderClause: yyDollar[3].orderByUnion(), FrameClause: yyDollar[4].frameClauseUnion()}
 		}
@@ -18514,7 +18517,7 @@ yydefault:
 	case 1117:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL *OverClause
-//line sql.y:5772
+//line sql.y:5774
 		{
 			yyLOCAL = &OverClause{WindowSpec: yyDollar[3].windowSpecificationUnion()}
 		}
@@ -18522,7 +18525,7 @@ yydefault:
 	case 1118:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL *OverClause
-//line sql.y:5776
+//line sql.y:5778
 		{
 			yyLOCAL = &OverClause{WindowName: yyDollar[2].identifierCI}
 		}
@@ -18530,7 +18533,7 @@ yydefault:
 	case 1119:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL *OverClause
-//line sql.y:5782
+//line sql.y:5784
 		{
 			yyLOCAL = yyDollar[1].overClauseUnion()
 		}
@@ -18538,7 +18541,7 @@ yydefault:
 	case 1120:
 		yyDollar = yyS[yypt-0 : yypt+1]
 		var yyLOCAL *OverClause
-//line sql.y:5786
+//line sql.y:5788
 		{
 			yyLOCAL = nil
 		}
@@ -18546,7 +18549,7 @@ yydefault:
 	case 1121:
 		yyDollar = yyS[yypt-0 : yypt+1]
 		var yyLOCAL *NullTreatmentClause
-//line sql.y:5791
+//line sql.y:5793
 		{
 			yyLOCAL = nil
 		}
@@ -18554,7 +18557,7 @@ yydefault:
 	case 1123:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL *NullTreatmentClause
-//line sql.y:5798
+//line sql.y:5800
 		{
 			yyLOCAL = &NullTreatmentClause{yyDollar[1].nullTreatmentTypeUnion()}
 		}
@@ -18562,7 +18565,7 @@ yydefault:
 	case 1124:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL NullTreatmentType
-//line sql.y:5804
+//line sql.y:5806
 		{
 			yyLOCAL = RespectNullsType
 		}
@@ -18570,7 +18573,7 @@ yydefault:
 	case 1125:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL NullTreatmentType
-//line sql.y:5808
+//line sql.y:5810
 		{
 			yyLOCAL = IgnoreNullsType
 		}
@@ -18578,7 +18581,7 @@ yydefault:
 	case 1126:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL FirstOrLastValueExprType
-//line sql.y:5814
+//line sql.y:5816
 		{
 			yyLOCAL = FirstValueExprType
 		}
@@ -18586,7 +18589,7 @@ yydefault:
 	case 1127:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL FirstOrLastValueExprType
-//line sql.y:5818
+//line sql.y:5820
 		{
 			yyLOCAL = LastValueExprType
 		}
@@ -18594,7 +18597,7 @@ yydefault:
 	case 1128:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL FromFirstLastType
-//line sql.y:5824
+//line sql.y:5826
 		{
 			yyLOCAL = FromFirstType
 		}
@@ -18602,7 +18605,7 @@ yydefault:
 	case 1129:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL FromFirstLastType
-//line sql.y:5828
+//line sql.y:5830
 		{
 			yyLOCAL = FromLastType
 		}
@@ -18610,7 +18613,7 @@ yydefault:
 	case 1130:
 		yyDollar = yyS[yypt-0 : yypt+1]
 		var yyLOCAL *FromFirstLastClause
-//line sql.y:5833
+//line sql.y:5835
 		{
 			yyLOCAL = nil
 		}
@@ -18618,7 +18621,7 @@ yydefault:
 	case 1132:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL *FromFirstLastClause
-//line sql.y:5840
+//line sql.y:5842
 		{
 			yyLOCAL = &FromFirstLastClause{yyDollar[1].fromFirstLastTypeUnion()}
 		}
@@ -18626,7 +18629,7 @@ yydefault:
 	case 1133:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL LagLeadExprType
-//line sql.y:5846
+//line sql.y:5848
 		{
 			yyLOCAL = LagExprType
 		}
@@ -18634,7 +18637,7 @@ yydefault:
 	case 1134:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL LagLeadExprType
-//line sql.y:5850
+//line sql.y:5852
 		{
 			yyLOCAL = LeadExprType
 		}
@@ -18642,7 +18645,7 @@ yydefault:
 	case 1135:
 		yyDollar = yyS[yypt-5 : yypt+1]
 		var yyLOCAL *WindowDefinition
-//line sql.y:5856
+//line sql.y:5858
 		{
 			yyLOCAL = &WindowDefinition{Name: yyDollar[1].identifierCI, WindowSpec: yyDollar[4].windowSpecificationUnion()}
 		}
@@ -18650,34 +18653,34 @@ yydefault:
 	case 1136:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL WindowDefinitions
-//line sql.y:5862
+//line sql.y:5864
 		{
 			yyLOCAL = WindowDefinitions{yyDollar[1].windowDefinitionUnion()}
 		}
 		yyVAL.union = yyLOCAL
 	case 1137:
 		yyDollar = yyS[yypt-3 : yypt+1]
-//line sql.y:5866
+//line sql.y:5868
 		{
 			yySLICE := (*WindowDefinitions)(yyIaddr(yyVAL.union))
 			*yySLICE = append(*yySLICE, yyDollar[3].windowDefinitionUnion())
 		}
 	case 1138:
 		yyDollar = yyS[yypt-0 : yypt+1]
-//line sql.y:5872
+//line sql.y:5874
 		{
 			yyVAL.str = ""
 		}
 	case 1139:
 		yyDollar = yyS[yypt-3 : yypt+1]
-//line sql.y:5876
+//line sql.y:5878
 		{
 			yyVAL.str = string(yyDollar[2].identifierCI.String())
 		}
 	case 1140:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL BoolVal
-//line sql.y:5882
+//line sql.y:5884
 		{
 			yyLOCAL = BoolVal(true)
 		}
@@ -18685,7 +18688,7 @@ yydefault:
 	case 1141:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL BoolVal
-//line sql.y:5886
+//line sql.y:5888
 		{
 			yyLOCAL = BoolVal(false)
 		}
@@ -18693,7 +18696,7 @@ yydefault:
 	case 1142:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL IsExprOperator
-//line sql.y:5893
+//line sql.y:5895
 		{
 			yyLOCAL = IsTrueOp
 		}
@@ -18701,7 +18704,7 @@ yydefault:
 	case 1143:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL IsExprOperator
-//line sql.y:5897
+//line sql.y:5899
 		{
 			yyLOCAL = IsNotTrueOp
 		}
@@ -18709,7 +18712,7 @@ yydefault:
 	case 1144:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL IsExprOperator
-//line sql.y:5901
+//line sql.y:5903
 		{
 			yyLOCAL = IsFalseOp
 		}
@@ -18717,7 +18720,7 @@ yydefault:
 	case 1145:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL IsExprOperator
-//line sql.y:5905
+//line sql.y:5907
 		{
 			yyLOCAL = IsNotFalseOp
 		}
@@ -18725,7 +18728,7 @@ yydefault:
 	case 1146:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL ComparisonExprOperator
-//line sql.y:5911
+//line sql.y:5913
 		{
 			yyLOCAL = yyDollar[1].comparisonExprOperatorUnion()
 		}
@@ -18733,7 +18736,7 @@ yydefault:
 	case 1147:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL ComparisonExprOperator
-//line sql.y:5915
+//line sql.y:5917
 		{
 			yyLOCAL = NullSafeEqualOp
 		}
@@ -18741,7 +18744,7 @@ yydefault:
 	case 1148:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL ComparisonExprOperator
-//line sql.y:5921
+//line sql.y:5923
 		{
 			yyLOCAL = EqualOp
 		}
@@ -18749,7 +18752,7 @@ yydefault:
 	case 1149:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL ComparisonExprOperator
-//line sql.y:5925
+//line sql.y:5927
 		{
 			yyLOCAL = LessThanOp
 		}
@@ -18757,7 +18760,7 @@ yydefault:
 	case 1150:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL ComparisonExprOperator
-//line sql.y:5929
+//line sql.y:5931
 		{
 			yyLOCAL = GreaterThanOp
 		}
@@ -18765,7 +18768,7 @@ yydefault:
 	case 1151:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL ComparisonExprOperator
-//line sql.y:5933
+//line sql.y:5935
 		{
 			yyLOCAL = LessEqualOp
 		}
@@ -18773,7 +18776,7 @@ yydefault:
 	case 1152:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL ComparisonExprOperator
-//line sql.y:5937
+//line sql.y:5939
 		{
 			yyLOCAL = GreaterEqualOp
 		}
@@ -18781,7 +18784,7 @@ yydefault:
 	case 1153:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL ComparisonExprOperator
-//line sql.y:5941
+//line sql.y:5943
 		{
 			yyLOCAL = NotEqualOp
 		}
@@ -18789,7 +18792,7 @@ yydefault:
 	case 1154:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL ColTuple
-//line sql.y:5947
+//line sql.y:5949
 		{
 			yyLOCAL = yyDollar[1].valTupleUnion()
 		}
@@ -18797,7 +18800,7 @@ yydefault:
 	case 1155:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL ColTuple
-//line sql.y:5951
+//line sql.y:5953
 		{
 			yyLOCAL = yyDollar[1].subqueryUnion()
 		}
@@ -18805,7 +18808,7 @@ yydefault:
 	case 1156:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL ColTuple
-//line sql.y:5955
+//line sql.y:5957
 		{
 			yyLOCAL = ListArg(yyDollar[1].str[2:])
 			markBindVariable(yylex, yyDollar[1].str[2:])
@@ -18814,30 +18817,30 @@ yydefault:
 	case 1157:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL *Subquery
-//line sql.y:5962
+//line sql.y:5964
 		{
 			yyLOCAL = &Subquery{yyDollar[1].tableStmtUnion()}
 		}
 		yyVAL.union = yyLOCAL
 	case 1158:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		var yyLOCAL Exprs
-//line sql.y:5968
+		var yyLOCAL []Expr
+//line sql.y:5970
 		{
-			yyLOCAL = Exprs{yyDollar[1].exprUnion()}
+			yyLOCAL = []Expr{yyDollar[1].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
 	case 1159:
 		yyDollar = yyS[yypt-3 : yypt+1]
-//line sql.y:5972
+//line sql.y:5974
 		{
-			yySLICE := (*Exprs)(yyIaddr(yyVAL.union))
+			yySLICE := (*[]Expr)(yyIaddr(yyVAL.union))
 			*yySLICE = append(*yySLICE, yyDollar[3].exprUnion())
 		}
 	case 1160:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:5982
+//line sql.y:5984
 		{
 			yyLOCAL = &FuncExpr{Name: yyDollar[1].identifierCI, Exprs: yyDollar[3].exprsUnion()}
 		}
@@ -18845,7 +18848,7 @@ yydefault:
 	case 1161:
 		yyDollar = yyS[yypt-6 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:5986
+//line sql.y:5988
 		{
 			yyLOCAL = &FuncExpr{Qualifier: yyDollar[1].identifierCS, Name: yyDollar[3].identifierCI, Exprs: yyDollar[5].exprsUnion()}
 		}
@@ -18853,7 +18856,7 @@ yydefault:
 	case 1162:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:5996
+//line sql.y:5998
 		{
 			yyLOCAL = &FuncExpr{Name: NewIdentifierCI("left"), Exprs: yyDollar[3].exprsUnion()}
 		}
@@ -18861,7 +18864,7 @@ yydefault:
 	case 1163:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6000
+//line sql.y:6002
 		{
 			yyLOCAL = &FuncExpr{Name: NewIdentifierCI("right"), Exprs: yyDollar[3].exprsUnion()}
 		}
@@ -18869,7 +18872,7 @@ yydefault:
 	case 1164:
 		yyDollar = yyS[yypt-8 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6004
+//line sql.y:6006
 		{
 			yyLOCAL = &SubstrExpr{Name: yyDollar[3].exprUnion(), From: yyDollar[5].exprUnion(), To: yyDollar[7].exprUnion()}
 		}
@@ -18877,7 +18880,7 @@ yydefault:
 	case 1165:
 		yyDollar = yyS[yypt-8 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6008
+//line sql.y:6010
 		{
 			yyLOCAL = &SubstrExpr{Name: yyDollar[3].exprUnion(), From: yyDollar[5].exprUnion(), To: yyDollar[7].exprUnion()}
 		}
@@ -18885,7 +18888,7 @@ yydefault:
 	case 1166:
 		yyDollar = yyS[yypt-6 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6012
+//line sql.y:6014
 		{
 			yyLOCAL = &SubstrExpr{Name: yyDollar[3].exprUnion(), From: yyDollar[5].exprUnion()}
 		}
@@ -18893,7 +18896,7 @@ yydefault:
 	case 1167:
 		yyDollar = yyS[yypt-8 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6016
+//line sql.y:6018
 		{
 			yyLOCAL = &SubstrExpr{Name: yyDollar[3].exprUnion(), From: yyDollar[5].exprUnion(), To: yyDollar[7].exprUnion()}
 		}
@@ -18901,7 +18904,7 @@ yydefault:
 	case 1168:
 		yyDollar = yyS[yypt-6 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6020
+//line sql.y:6022
 		{
 			yyLOCAL = &SubstrExpr{Name: yyDollar[3].exprUnion(), From: yyDollar[5].exprUnion()}
 		}
@@ -18909,7 +18912,7 @@ yydefault:
 	case 1169:
 		yyDollar = yyS[yypt-5 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6024
+//line sql.y:6026
 		{
 			yyLOCAL = &CaseExpr{Expr: yyDollar[2].exprUnion(), Whens: yyDollar[3].whensUnion(), Else: yyDollar[4].exprUnion()}
 		}
@@ -18917,7 +18920,7 @@ yydefault:
 	case 1170:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6028
+//line sql.y:6030
 		{
 			yyLOCAL = &ValuesFuncExpr{Name: yyDollar[3].colNameUnion()}
 		}
@@ -18925,7 +18928,7 @@ yydefault:
 	case 1171:
 		yyDollar = yyS[yypt-10 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6032
+//line sql.y:6034
 		{
 			yyLOCAL = &InsertExpr{Str: yyDollar[3].exprUnion(), Pos: yyDollar[5].exprUnion(), Len: yyDollar[7].exprUnion(), NewStr: yyDollar[9].exprUnion()}
 		}
@@ -18933,7 +18936,7 @@ yydefault:
 	case 1172:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6036
+//line sql.y:6038
 		{
 			yyLOCAL = &FuncExpr{Name: NewIdentifierCI(yyDollar[1].str)}
 		}
@@ -18941,7 +18944,7 @@ yydefault:
 	case 1173:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6047
+//line sql.y:6049
 		{
 			yyLOCAL = &FuncExpr{Name: NewIdentifierCI("utc_date")}
 		}
@@ -18949,7 +18952,7 @@ yydefault:
 	case 1174:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6051
+//line sql.y:6053
 		{
 			yyLOCAL = yyDollar[1].exprUnion()
 		}
@@ -18957,7 +18960,7 @@ yydefault:
 	case 1175:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6057
+//line sql.y:6059
 		{
 			yyLOCAL = &FuncExpr{Name: NewIdentifierCI("current_date")}
 		}
@@ -18965,7 +18968,7 @@ yydefault:
 	case 1176:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6061
+//line sql.y:6063
 		{
 			yyLOCAL = &FuncExpr{Name: NewIdentifierCI("curdate")}
 		}
@@ -18973,7 +18976,7 @@ yydefault:
 	case 1177:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6065
+//line sql.y:6067
 		{
 			yyLOCAL = &CurTimeFuncExpr{Name: NewIdentifierCI("utc_time"), Fsp: yyDollar[2].integerUnion()}
 		}
@@ -18981,7 +18984,7 @@ yydefault:
 	case 1178:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6070
+//line sql.y:6072
 		{
 			yyLOCAL = &CurTimeFuncExpr{Name: NewIdentifierCI("curtime"), Fsp: yyDollar[2].integerUnion()}
 		}
@@ -18989,7 +18992,7 @@ yydefault:
 	case 1179:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6075
+//line sql.y:6077
 		{
 			yyLOCAL = &CurTimeFuncExpr{Name: NewIdentifierCI("current_time"), Fsp: yyDollar[2].integerUnion()}
 		}
@@ -18997,7 +19000,7 @@ yydefault:
 	case 1180:
 		yyDollar = yyS[yypt-5 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6079
+//line sql.y:6081
 		{
 			yyLOCAL = &CountStar{OverClause: yyDollar[5].overClauseUnion()}
 		}
@@ -19005,7 +19008,7 @@ yydefault:
 	case 1181:
 		yyDollar = yyS[yypt-6 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6083
+//line sql.y:6085
 		{
 			yyLOCAL = &Count{Distinct: yyDollar[3].booleanUnion(), Args: yyDollar[4].exprsUnion(), OverClause: yyDollar[6].overClauseUnion()}
 		}
@@ -19013,7 +19016,7 @@ yydefault:
 	case 1182:
 		yyDollar = yyS[yypt-6 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6087
+//line sql.y:6089
 		{
 			yyLOCAL = &Max{Distinct: yyDollar[3].booleanUnion(), Arg: yyDollar[4].exprUnion(), OverClause: yyDollar[6].overClauseUnion()}
 		}
@@ -19021,7 +19024,7 @@ yydefault:
 	case 1183:
 		yyDollar = yyS[yypt-6 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6091
+//line sql.y:6093
 		{
 			yyLOCAL = &Min{Distinct: yyDollar[3].booleanUnion(), Arg: yyDollar[4].exprUnion(), OverClause: yyDollar[6].overClauseUnion()}
 		}
@@ -19029,7 +19032,7 @@ yydefault:
 	case 1184:
 		yyDollar = yyS[yypt-6 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6095
+//line sql.y:6097
 		{
 			yyLOCAL = &Sum{Distinct: yyDollar[3].booleanUnion(), Arg: yyDollar[4].exprUnion(), OverClause: yyDollar[6].overClauseUnion()}
 		}
@@ -19037,7 +19040,7 @@ yydefault:
 	case 1185:
 		yyDollar = yyS[yypt-6 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6099
+//line sql.y:6101
 		{
 			yyLOCAL = &Avg{Distinct: yyDollar[3].booleanUnion(), Arg: yyDollar[4].exprUnion(), OverClause: yyDollar[6].overClauseUnion()}
 		}
@@ -19045,7 +19048,7 @@ yydefault:
 	case 1186:
 		yyDollar = yyS[yypt-5 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6103
+//line sql.y:6105
 		{
 			yyLOCAL = &BitAnd{Arg: yyDollar[3].exprUnion(), OverClause: yyDollar[5].overClauseUnion()}
 		}
@@ -19053,7 +19056,7 @@ yydefault:
 	case 1187:
 		yyDollar = yyS[yypt-5 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6107
+//line sql.y:6109
 		{
 			yyLOCAL = &BitOr{Arg: yyDollar[3].exprUnion(), OverClause: yyDollar[5].overClauseUnion()}
 		}
@@ -19061,7 +19064,7 @@ yydefault:
 	case 1188:
 		yyDollar = yyS[yypt-5 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6111
+//line sql.y:6113
 		{
 			yyLOCAL = &BitXor{Arg: yyDollar[3].exprUnion(), OverClause: yyDollar[5].overClauseUnion()}
 		}
@@ -19069,7 +19072,7 @@ yydefault:
 	case 1189:
 		yyDollar = yyS[yypt-5 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6115
+//line sql.y:6117
 		{
 			yyLOCAL = &Std{Arg: yyDollar[3].exprUnion(), OverClause: yyDollar[5].overClauseUnion()}
 		}
@@ -19077,7 +19080,7 @@ yydefault:
 	case 1190:
 		yyDollar = yyS[yypt-5 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6119
+//line sql.y:6121
 		{
 			yyLOCAL = &StdDev{Arg: yyDollar[3].exprUnion(), OverClause: yyDollar[5].overClauseUnion()}
 		}
@@ -19085,7 +19088,7 @@ yydefault:
 	case 1191:
 		yyDollar = yyS[yypt-5 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6123
+//line sql.y:6125
 		{
 			yyLOCAL = &StdPop{Arg: yyDollar[3].exprUnion(), OverClause: yyDollar[5].overClauseUnion()}
 		}
@@ -19093,7 +19096,7 @@ yydefault:
 	case 1192:
 		yyDollar = yyS[yypt-5 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6127
+//line sql.y:6129
 		{
 			yyLOCAL = &StdSamp{Arg: yyDollar[3].exprUnion(), OverClause: yyDollar[5].overClauseUnion()}
 		}
@@ -19101,7 +19104,7 @@ yydefault:
 	case 1193:
 		yyDollar = yyS[yypt-5 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6131
+//line sql.y:6133
 		{
 			yyLOCAL = &VarPop{Arg: yyDollar[3].exprUnion(), OverClause: yyDollar[5].overClauseUnion()}
 		}
@@ -19109,7 +19112,7 @@ yydefault:
 	case 1194:
 		yyDollar = yyS[yypt-5 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6135
+//line sql.y:6137
 		{
 			yyLOCAL = &VarSamp{Arg: yyDollar[3].exprUnion(), OverClause: yyDollar[5].overClauseUnion()}
 		}
@@ -19117,7 +19120,7 @@ yydefault:
 	case 1195:
 		yyDollar = yyS[yypt-5 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6139
+//line sql.y:6141
 		{
 			yyLOCAL = &Variance{Arg: yyDollar[3].exprUnion(), OverClause: yyDollar[5].overClauseUnion()}
 		}
@@ -19125,7 +19128,7 @@ yydefault:
 	case 1196:
 		yyDollar = yyS[yypt-8 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6143
+//line sql.y:6145
 		{
 			yyLOCAL = &GroupConcatExpr{Distinct: yyDollar[3].booleanUnion(), Exprs: yyDollar[4].exprsUnion(), OrderBy: yyDollar[5].orderByUnion(), Separator: yyDollar[6].str, Limit: yyDollar[7].limitUnion()}
 		}
@@ -19133,7 +19136,7 @@ yydefault:
 	case 1197:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6147
+//line sql.y:6149
 		{
 			yyLOCAL = &AnyValue{Arg: yyDollar[3].exprUnion()}
 		}
@@ -19141,7 +19144,7 @@ yydefault:
 	case 1198:
 		yyDollar = yyS[yypt-8 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6151
+//line sql.y:6153
 		{
 			yyLOCAL = &IntervalDateExpr{Syntax: IntervalDateExprTimestampadd, Date: yyDollar[7].exprUnion(), Interval: yyDollar[5].exprUnion(), Unit: yyDollar[3].intervalTypeUnion()}
 		}
@@ -19149,7 +19152,7 @@ yydefault:
 	case 1199:
 		yyDollar = yyS[yypt-8 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6155
+//line sql.y:6157
 		{
 			yyLOCAL = &TimestampDiffExpr{Unit: yyDollar[3].intervalTypeUnion(), Expr1: yyDollar[5].exprUnion(), Expr2: yyDollar[7].exprUnion()}
 		}
@@ -19157,7 +19160,7 @@ yydefault:
 	case 1200:
 		yyDollar = yyS[yypt-6 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6159
+//line sql.y:6161
 		{
 			yyLOCAL = &ExtractFuncExpr{IntervalType: yyDollar[3].intervalTypeUnion(), Expr: yyDollar[5].exprUnion()}
 		}
@@ -19165,7 +19168,7 @@ yydefault:
 	case 1201:
 		yyDollar = yyS[yypt-5 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6163
+//line sql.y:6165
 		{
 			yyLOCAL = &WeightStringFuncExpr{Expr: yyDollar[3].exprUnion(), As: yyDollar[4].convertTypeUnion()}
 		}
@@ -19173,7 +19176,7 @@ yydefault:
 	case 1202:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6167
+//line sql.y:6169
 		{
 			yyLOCAL = &JSONPrettyExpr{JSONVal: yyDollar[3].exprUnion()}
 		}
@@ -19181,7 +19184,7 @@ yydefault:
 	case 1203:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6171
+//line sql.y:6173
 		{
 			yyLOCAL = &JSONStorageFreeExpr{JSONVal: yyDollar[3].exprUnion()}
 		}
@@ -19189,7 +19192,7 @@ yydefault:
 	case 1204:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6175
+//line sql.y:6177
 		{
 			yyLOCAL = &JSONStorageSizeExpr{JSONVal: yyDollar[3].exprUnion()}
 		}
@@ -19197,7 +19200,7 @@ yydefault:
 	case 1205:
 		yyDollar = yyS[yypt-5 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6179
+//line sql.y:6181
 		{
 			yyLOCAL = &JSONArrayAgg{Expr: yyDollar[3].exprUnion(), OverClause: yyDollar[5].overClauseUnion()}
 		}
@@ -19205,7 +19208,7 @@ yydefault:
 	case 1206:
 		yyDollar = yyS[yypt-7 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6183
+//line sql.y:6185
 		{
 			yyLOCAL = &JSONObjectAgg{Key: yyDollar[3].exprUnion(), Value: yyDollar[5].exprUnion(), OverClause: yyDollar[7].overClauseUnion()}
 		}
@@ -19213,7 +19216,7 @@ yydefault:
 	case 1207:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6187
+//line sql.y:6189
 		{
 			yyLOCAL = &TrimFuncExpr{TrimFuncType: LTrimType, Type: LeadingTrimType, StringArg: yyDollar[3].exprUnion()}
 		}
@@ -19221,7 +19224,7 @@ yydefault:
 	case 1208:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6191
+//line sql.y:6193
 		{
 			yyLOCAL = &TrimFuncExpr{TrimFuncType: RTrimType, Type: TrailingTrimType, StringArg: yyDollar[3].exprUnion()}
 		}
@@ -19229,7 +19232,7 @@ yydefault:
 	case 1209:
 		yyDollar = yyS[yypt-7 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6195
+//line sql.y:6197
 		{
 			yyLOCAL = &TrimFuncExpr{Type: yyDollar[3].trimTypeUnion(), TrimArg: yyDollar[4].exprUnion(), StringArg: yyDollar[6].exprUnion()}
 		}
@@ -19237,7 +19240,7 @@ yydefault:
 	case 1210:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6199
+//line sql.y:6201
 		{
 			yyLOCAL = &TrimFuncExpr{StringArg: yyDollar[3].exprUnion()}
 		}
@@ -19245,7 +19248,7 @@ yydefault:
 	case 1211:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6203
+//line sql.y:6205
 		{
 			yyLOCAL = &CharExpr{Exprs: yyDollar[3].exprsUnion()}
 		}
@@ -19253,7 +19256,7 @@ yydefault:
 	case 1212:
 		yyDollar = yyS[yypt-6 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6207
+//line sql.y:6209
 		{
 			yyLOCAL = &CharExpr{Exprs: yyDollar[3].exprsUnion(), Charset: yyDollar[5].str}
 		}
@@ -19261,7 +19264,7 @@ yydefault:
 	case 1213:
 		yyDollar = yyS[yypt-6 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6211
+//line sql.y:6213
 		{
 			yyLOCAL = &TrimFuncExpr{TrimArg: yyDollar[3].exprUnion(), StringArg: yyDollar[5].exprUnion()}
 		}
@@ -19269,7 +19272,7 @@ yydefault:
 	case 1214:
 		yyDollar = yyS[yypt-6 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6215
+//line sql.y:6217
 		{
 			yyLOCAL = &LocateExpr{SubStr: yyDollar[3].exprUnion(), Str: yyDollar[5].exprUnion()}
 		}
@@ -19277,7 +19280,7 @@ yydefault:
 	case 1215:
 		yyDollar = yyS[yypt-8 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6219
+//line sql.y:6221
 		{
 			yyLOCAL = &LocateExpr{SubStr: yyDollar[3].exprUnion(), Str: yyDollar[5].exprUnion(), Pos: yyDollar[7].exprUnion()}
 		}
@@ -19285,7 +19288,7 @@ yydefault:
 	case 1216:
 		yyDollar = yyS[yypt-6 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6223
+//line sql.y:6225
 		{
 			yyLOCAL = &LocateExpr{SubStr: yyDollar[3].exprUnion(), Str: yyDollar[5].exprUnion()}
 		}
@@ -19293,7 +19296,7 @@ yydefault:
 	case 1217:
 		yyDollar = yyS[yypt-6 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6227
+//line sql.y:6229
 		{
 			yyLOCAL = &LockingFunc{Type: GetLock, Name: yyDollar[3].exprUnion(), Timeout: yyDollar[5].exprUnion()}
 		}
@@ -19301,7 +19304,7 @@ yydefault:
 	case 1218:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6231
+//line sql.y:6233
 		{
 			yyLOCAL = &LockingFunc{Type: IsFreeLock, Name: yyDollar[3].exprUnion()}
 		}
@@ -19309,7 +19312,7 @@ yydefault:
 	case 1219:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6235
+//line sql.y:6237
 		{
 			yyLOCAL = &LockingFunc{Type: IsUsedLock, Name: yyDollar[3].exprUnion()}
 		}
@@ -19317,7 +19320,7 @@ yydefault:
 	case 1220:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6239
+//line sql.y:6241
 		{
 			yyLOCAL = &LockingFunc{Type: ReleaseAllLocks}
 		}
@@ -19325,7 +19328,7 @@ yydefault:
 	case 1221:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6243
+//line sql.y:6245
 		{
 			yyLOCAL = &LockingFunc{Type: ReleaseLock, Name: yyDollar[3].exprUnion()}
 		}
@@ -19333,7 +19336,7 @@ yydefault:
 	case 1222:
 		yyDollar = yyS[yypt-6 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6247
+//line sql.y:6249
 		{
 			yyLOCAL = &JSONSchemaValidFuncExpr{Schema: yyDollar[3].exprUnion(), Document: yyDollar[5].exprUnion()}
 		}
@@ -19341,7 +19344,7 @@ yydefault:
 	case 1223:
 		yyDollar = yyS[yypt-6 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6251
+//line sql.y:6253
 		{
 			yyLOCAL = &JSONSchemaValidationReportFuncExpr{Schema: yyDollar[3].exprUnion(), Document: yyDollar[5].exprUnion()}
 		}
@@ -19349,7 +19352,7 @@ yydefault:
 	case 1224:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6255
+//line sql.y:6257
 		{
 			yyLOCAL = &JSONArrayExpr{Params: yyDollar[3].exprsUnion()}
 		}
@@ -19357,7 +19360,7 @@ yydefault:
 	case 1225:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6259
+//line sql.y:6261
 		{
 			yyLOCAL = &GeomFormatExpr{FormatType: BinaryFormat, Geom: yyDollar[3].exprUnion()}
 		}
@@ -19365,7 +19368,7 @@ yydefault:
 	case 1226:
 		yyDollar = yyS[yypt-6 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6263
+//line sql.y:6265
 		{
 			yyLOCAL = &GeomFormatExpr{FormatType: BinaryFormat, Geom: yyDollar[3].exprUnion(), AxisOrderOpt: yyDollar[5].exprUnion()}
 		}
@@ -19373,7 +19376,7 @@ yydefault:
 	case 1227:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6267
+//line sql.y:6269
 		{
 			yyLOCAL = &GeomFormatExpr{FormatType: TextFormat, Geom: yyDollar[3].exprUnion()}
 		}
@@ -19381,7 +19384,7 @@ yydefault:
 	case 1228:
 		yyDollar = yyS[yypt-6 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6271
+//line sql.y:6273
 		{
 			yyLOCAL = &GeomFormatExpr{FormatType: TextFormat, Geom: yyDollar[3].exprUnion(), AxisOrderOpt: yyDollar[5].exprUnion()}
 		}
@@ -19389,7 +19392,7 @@ yydefault:
 	case 1229:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6275
+//line sql.y:6277
 		{
 			yyLOCAL = &GeomPropertyFuncExpr{Property: IsEmpty, Geom: yyDollar[3].exprUnion()}
 		}
@@ -19397,7 +19400,7 @@ yydefault:
 	case 1230:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6279
+//line sql.y:6281
 		{
 			yyLOCAL = &GeomPropertyFuncExpr{Property: IsSimple, Geom: yyDollar[3].exprUnion()}
 		}
@@ -19405,7 +19408,7 @@ yydefault:
 	case 1231:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6283
+//line sql.y:6285
 		{
 			yyLOCAL = &GeomPropertyFuncExpr{Property: Dimension, Geom: yyDollar[3].exprUnion()}
 		}
@@ -19413,7 +19416,7 @@ yydefault:
 	case 1232:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6287
+//line sql.y:6289
 		{
 			yyLOCAL = &GeomPropertyFuncExpr{Property: Envelope, Geom: yyDollar[3].exprUnion()}
 		}
@@ -19421,7 +19424,7 @@ yydefault:
 	case 1233:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6291
+//line sql.y:6293
 		{
 			yyLOCAL = &GeomPropertyFuncExpr{Property: GeometryType, Geom: yyDollar[3].exprUnion()}
 		}
@@ -19429,7 +19432,7 @@ yydefault:
 	case 1234:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6295
+//line sql.y:6297
 		{
 			yyLOCAL = &PointPropertyFuncExpr{Property: Latitude, Point: yyDollar[3].exprUnion()}
 		}
@@ -19437,7 +19440,7 @@ yydefault:
 	case 1235:
 		yyDollar = yyS[yypt-6 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6299
+//line sql.y:6301
 		{
 			yyLOCAL = &PointPropertyFuncExpr{Property: Latitude, Point: yyDollar[3].exprUnion(), ValueToSet: yyDollar[5].exprUnion()}
 		}
@@ -19445,7 +19448,7 @@ yydefault:
 	case 1236:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6303
+//line sql.y:6305
 		{
 			yyLOCAL = &PointPropertyFuncExpr{Property: Longitude, Point: yyDollar[3].exprUnion()}
 		}
@@ -19453,7 +19456,7 @@ yydefault:
 	case 1237:
 		yyDollar = yyS[yypt-6 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6307
+//line sql.y:6309
 		{
 			yyLOCAL = &PointPropertyFuncExpr{Property: Longitude, Point: yyDollar[3].exprUnion(), ValueToSet: yyDollar[5].exprUnion()}
 		}
@@ -19461,7 +19464,7 @@ yydefault:
 	case 1238:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6311
+//line sql.y:6313
 		{
 			yyLOCAL = &LinestrPropertyFuncExpr{Property: EndPoint, Linestring: yyDollar[3].exprUnion()}
 		}
@@ -19469,7 +19472,7 @@ yydefault:
 	case 1239:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6315
+//line sql.y:6317
 		{
 			yyLOCAL = &LinestrPropertyFuncExpr{Property: IsClosed, Linestring: yyDollar[3].exprUnion()}
 		}
@@ -19477,7 +19480,7 @@ yydefault:
 	case 1240:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6319
+//line sql.y:6321
 		{
 			yyLOCAL = &LinestrPropertyFuncExpr{Property: Length, Linestring: yyDollar[3].exprUnion()}
 		}
@@ -19485,7 +19488,7 @@ yydefault:
 	case 1241:
 		yyDollar = yyS[yypt-6 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6323
+//line sql.y:6325
 		{
 			yyLOCAL = &LinestrPropertyFuncExpr{Property: Length, Linestring: yyDollar[3].exprUnion(), PropertyDefArg: yyDollar[5].exprUnion()}
 		}
@@ -19493,7 +19496,7 @@ yydefault:
 	case 1242:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6327
+//line sql.y:6329
 		{
 			yyLOCAL = &LinestrPropertyFuncExpr{Property: NumPoints, Linestring: yyDollar[3].exprUnion()}
 		}
@@ -19501,7 +19504,7 @@ yydefault:
 	case 1243:
 		yyDollar = yyS[yypt-6 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6331
+//line sql.y:6333
 		{
 			yyLOCAL = &LinestrPropertyFuncExpr{Property: PointN, Linestring: yyDollar[3].exprUnion(), PropertyDefArg: yyDollar[5].exprUnion()}
 		}
@@ -19509,7 +19512,7 @@ yydefault:
 	case 1244:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6335
+//line sql.y:6337
 		{
 			yyLOCAL = &LinestrPropertyFuncExpr{Property: StartPoint, Linestring: yyDollar[3].exprUnion()}
 		}
@@ -19517,7 +19520,7 @@ yydefault:
 	case 1245:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6339
+//line sql.y:6341
 		{
 			yyLOCAL = &PointPropertyFuncExpr{Property: XCordinate, Point: yyDollar[3].exprUnion()}
 		}
@@ -19525,7 +19528,7 @@ yydefault:
 	case 1246:
 		yyDollar = yyS[yypt-6 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6343
+//line sql.y:6345
 		{
 			yyLOCAL = &PointPropertyFuncExpr{Property: XCordinate, Point: yyDollar[3].exprUnion(), ValueToSet: yyDollar[5].exprUnion()}
 		}
@@ -19533,7 +19536,7 @@ yydefault:
 	case 1247:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6347
+//line sql.y:6349
 		{
 			yyLOCAL = &PointPropertyFuncExpr{Property: YCordinate, Point: yyDollar[3].exprUnion()}
 		}
@@ -19541,7 +19544,7 @@ yydefault:
 	case 1248:
 		yyDollar = yyS[yypt-6 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6351
+//line sql.y:6353
 		{
 			yyLOCAL = &PointPropertyFuncExpr{Property: YCordinate, Point: yyDollar[3].exprUnion(), ValueToSet: yyDollar[5].exprUnion()}
 		}
@@ -19549,7 +19552,7 @@ yydefault:
 	case 1249:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6355
+//line sql.y:6357
 		{
 			yyLOCAL = &GeomFromTextExpr{Type: GeometryFromText, WktText: yyDollar[3].exprUnion()}
 		}
@@ -19557,7 +19560,7 @@ yydefault:
 	case 1250:
 		yyDollar = yyS[yypt-6 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6359
+//line sql.y:6361
 		{
 			yyLOCAL = &GeomFromTextExpr{Type: GeometryFromText, WktText: yyDollar[3].exprUnion(), Srid: yyDollar[5].exprUnion()}
 		}
@@ -19565,7 +19568,7 @@ yydefault:
 	case 1251:
 		yyDollar = yyS[yypt-8 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6363
+//line sql.y:6365
 		{
 			yyLOCAL = &GeomFromTextExpr{Type: GeometryFromText, WktText: yyDollar[3].exprUnion(), Srid: yyDollar[5].exprUnion(), AxisOrderOpt: yyDollar[7].exprUnion()}
 		}
@@ -19573,7 +19576,7 @@ yydefault:
 	case 1252:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6367
+//line sql.y:6369
 		{
 			yyLOCAL = &GeomFromTextExpr{Type: GeometryCollectionFromText, WktText: yyDollar[3].exprUnion()}
 		}
@@ -19581,7 +19584,7 @@ yydefault:
 	case 1253:
 		yyDollar = yyS[yypt-6 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6371
+//line sql.y:6373
 		{
 			yyLOCAL = &GeomFromTextExpr{Type: GeometryCollectionFromText, WktText: yyDollar[3].exprUnion(), Srid: yyDollar[5].exprUnion()}
 		}
@@ -19589,7 +19592,7 @@ yydefault:
 	case 1254:
 		yyDollar = yyS[yypt-8 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6375
+//line sql.y:6377
 		{
 			yyLOCAL = &GeomFromTextExpr{Type: GeometryCollectionFromText, WktText: yyDollar[3].exprUnion(), Srid: yyDollar[5].exprUnion(), AxisOrderOpt: yyDollar[7].exprUnion()}
 		}
@@ -19597,7 +19600,7 @@ yydefault:
 	case 1255:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6379
+//line sql.y:6381
 		{
 			yyLOCAL = &GeomFromTextExpr{Type: LineStringFromText, WktText: yyDollar[3].exprUnion()}
 		}
@@ -19605,7 +19608,7 @@ yydefault:
 	case 1256:
 		yyDollar = yyS[yypt-6 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6383
+//line sql.y:6385
 		{
 			yyLOCAL = &GeomFromTextExpr{Type: LineStringFromText, WktText: yyDollar[3].exprUnion(), Srid: yyDollar[5].exprUnion()}
 		}
@@ -19613,7 +19616,7 @@ yydefault:
 	case 1257:
 		yyDollar = yyS[yypt-8 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6387
+//line sql.y:6389
 		{
 			yyLOCAL = &GeomFromTextExpr{Type: LineStringFromText, WktText: yyDollar[3].exprUnion(), Srid: yyDollar[5].exprUnion(), AxisOrderOpt: yyDollar[7].exprUnion()}
 		}
@@ -19621,7 +19624,7 @@ yydefault:
 	case 1258:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6391
+//line sql.y:6393
 		{
 			yyLOCAL = &GeomFromTextExpr{Type: MultiLinestringFromText, WktText: yyDollar[3].exprUnion()}
 		}
@@ -19629,7 +19632,7 @@ yydefault:
 	case 1259:
 		yyDollar = yyS[yypt-6 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6395
+//line sql.y:6397
 		{
 			yyLOCAL = &GeomFromTextExpr{Type: MultiLinestringFromText, WktText: yyDollar[3].exprUnion(), Srid: yyDollar[5].exprUnion()}
 		}
@@ -19637,7 +19640,7 @@ yydefault:
 	case 1260:
 		yyDollar = yyS[yypt-8 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6399
+//line sql.y:6401
 		{
 			yyLOCAL = &GeomFromTextExpr{Type: MultiLinestringFromText, WktText: yyDollar[3].exprUnion(), Srid: yyDollar[5].exprUnion(), AxisOrderOpt: yyDollar[7].exprUnion()}
 		}
@@ -19645,7 +19648,7 @@ yydefault:
 	case 1261:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6403
+//line sql.y:6405
 		{
 			yyLOCAL = &GeomFromTextExpr{Type: MultiPointFromText, WktText: yyDollar[3].exprUnion()}
 		}
@@ -19653,7 +19656,7 @@ yydefault:
 	case 1262:
 		yyDollar = yyS[yypt-6 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6407
+//line sql.y:6409
 		{
 			yyLOCAL = &GeomFromTextExpr{Type: MultiPointFromText, WktText: yyDollar[3].exprUnion(), Srid: yyDollar[5].exprUnion()}
 		}
@@ -19661,7 +19664,7 @@ yydefault:
 	case 1263:
 		yyDollar = yyS[yypt-8 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6411
+//line sql.y:6413
 		{
 			yyLOCAL = &GeomFromTextExpr{Type: MultiPointFromText, WktText: yyDollar[3].exprUnion(), Srid: yyDollar[5].exprUnion(), AxisOrderOpt: yyDollar[7].exprUnion()}
 		}
@@ -19669,7 +19672,7 @@ yydefault:
 	case 1264:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6415
+//line sql.y:6417
 		{
 			yyLOCAL = &GeomFromTextExpr{Type: MultiPolygonFromText, WktText: yyDollar[3].exprUnion()}
 		}
@@ -19677,7 +19680,7 @@ yydefault:
 	case 1265:
 		yyDollar = yyS[yypt-6 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6419
+//line sql.y:6421
 		{
 			yyLOCAL = &GeomFromTextExpr{Type: MultiPolygonFromText, WktText: yyDollar[3].exprUnion(), Srid: yyDollar[5].exprUnion()}
 		}
@@ -19685,7 +19688,7 @@ yydefault:
 	case 1266:
 		yyDollar = yyS[yypt-8 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6423
+//line sql.y:6425
 		{
 			yyLOCAL = &GeomFromTextExpr{Type: MultiPolygonFromText, WktText: yyDollar[3].exprUnion(), Srid: yyDollar[5].exprUnion(), AxisOrderOpt: yyDollar[7].exprUnion()}
 		}
@@ -19693,7 +19696,7 @@ yydefault:
 	case 1267:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6427
+//line sql.y:6429
 		{
 			yyLOCAL = &GeomFromTextExpr{Type: PointFromText, WktText: yyDollar[3].exprUnion()}
 		}
@@ -19701,7 +19704,7 @@ yydefault:
 	case 1268:
 		yyDollar = yyS[yypt-6 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6431
+//line sql.y:6433
 		{
 			yyLOCAL = &GeomFromTextExpr{Type: PointFromText, WktText: yyDollar[3].exprUnion(), Srid: yyDollar[5].exprUnion()}
 		}
@@ -19709,7 +19712,7 @@ yydefault:
 	case 1269:
 		yyDollar = yyS[yypt-8 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6435
+//line sql.y:6437
 		{
 			yyLOCAL = &GeomFromTextExpr{Type: PointFromText, WktText: yyDollar[3].exprUnion(), Srid: yyDollar[5].exprUnion(), AxisOrderOpt: yyDollar[7].exprUnion()}
 		}
@@ -19717,7 +19720,7 @@ yydefault:
 	case 1270:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6439
+//line sql.y:6441
 		{
 			yyLOCAL = &GeomFromTextExpr{Type: PolygonFromText, WktText: yyDollar[3].exprUnion()}
 		}
@@ -19725,7 +19728,7 @@ yydefault:
 	case 1271:
 		yyDollar = yyS[yypt-6 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6443
+//line sql.y:6445
 		{
 			yyLOCAL = &GeomFromTextExpr{Type: PolygonFromText, WktText: yyDollar[3].exprUnion(), Srid: yyDollar[5].exprUnion()}
 		}
@@ -19733,7 +19736,7 @@ yydefault:
 	case 1272:
 		yyDollar = yyS[yypt-8 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6447
+//line sql.y:6449
 		{
 			yyLOCAL = &GeomFromTextExpr{Type: PolygonFromText, WktText: yyDollar[3].exprUnion(), Srid: yyDollar[5].exprUnion(), AxisOrderOpt: yyDollar[7].exprUnion()}
 		}
@@ -19741,7 +19744,7 @@ yydefault:
 	case 1273:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6451
+//line sql.y:6453
 		{
 			yyLOCAL = &GeomFromWKBExpr{Type: GeometryFromWKB, WkbBlob: yyDollar[3].exprUnion()}
 		}
@@ -19749,7 +19752,7 @@ yydefault:
 	case 1274:
 		yyDollar = yyS[yypt-6 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6455
+//line sql.y:6457
 		{
 			yyLOCAL = &GeomFromWKBExpr{Type: GeometryFromWKB, WkbBlob: yyDollar[3].exprUnion(), Srid: yyDollar[5].exprUnion()}
 		}
@@ -19757,7 +19760,7 @@ yydefault:
 	case 1275:
 		yyDollar = yyS[yypt-8 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6459
+//line sql.y:6461
 		{
 			yyLOCAL = &GeomFromWKBExpr{Type: GeometryFromWKB, WkbBlob: yyDollar[3].exprUnion(), Srid: yyDollar[5].exprUnion(), AxisOrderOpt: yyDollar[7].exprUnion()}
 		}
@@ -19765,7 +19768,7 @@ yydefault:
 	case 1276:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6463
+//line sql.y:6465
 		{
 			yyLOCAL = &GeomFromWKBExpr{Type: GeometryCollectionFromWKB, WkbBlob: yyDollar[3].exprUnion()}
 		}
@@ -19773,7 +19776,7 @@ yydefault:
 	case 1277:
 		yyDollar = yyS[yypt-6 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6467
+//line sql.y:6469
 		{
 			yyLOCAL = &GeomFromWKBExpr{Type: GeometryCollectionFromWKB, WkbBlob: yyDollar[3].exprUnion(), Srid: yyDollar[5].exprUnion()}
 		}
@@ -19781,7 +19784,7 @@ yydefault:
 	case 1278:
 		yyDollar = yyS[yypt-8 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6471
+//line sql.y:6473
 		{
 			yyLOCAL = &GeomFromWKBExpr{Type: GeometryCollectionFromWKB, WkbBlob: yyDollar[3].exprUnion(), Srid: yyDollar[5].exprUnion(), AxisOrderOpt: yyDollar[7].exprUnion()}
 		}
@@ -19789,7 +19792,7 @@ yydefault:
 	case 1279:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6475
+//line sql.y:6477
 		{
 			yyLOCAL = &GeomFromWKBExpr{Type: LineStringFromWKB, WkbBlob: yyDollar[3].exprUnion()}
 		}
@@ -19797,7 +19800,7 @@ yydefault:
 	case 1280:
 		yyDollar = yyS[yypt-6 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6479
+//line sql.y:6481
 		{
 			yyLOCAL = &GeomFromWKBExpr{Type: LineStringFromWKB, WkbBlob: yyDollar[3].exprUnion(), Srid: yyDollar[5].exprUnion()}
 		}
@@ -19805,7 +19808,7 @@ yydefault:
 	case 1281:
 		yyDollar = yyS[yypt-8 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6483
+//line sql.y:6485
 		{
 			yyLOCAL = &GeomFromWKBExpr{Type: LineStringFromWKB, WkbBlob: yyDollar[3].exprUnion(), Srid: yyDollar[5].exprUnion(), AxisOrderOpt: yyDollar[7].exprUnion()}
 		}
@@ -19813,7 +19816,7 @@ yydefault:
 	case 1282:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6487
+//line sql.y:6489
 		{
 			yyLOCAL = &GeomFromWKBExpr{Type: MultiLinestringFromWKB, WkbBlob: yyDollar[3].exprUnion()}
 		}
@@ -19821,7 +19824,7 @@ yydefault:
 	case 1283:
 		yyDollar = yyS[yypt-6 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6491
+//line sql.y:6493
 		{
 			yyLOCAL = &GeomFromWKBExpr{Type: MultiLinestringFromWKB, WkbBlob: yyDollar[3].exprUnion(), Srid: yyDollar[5].exprUnion()}
 		}
@@ -19829,7 +19832,7 @@ yydefault:
 	case 1284:
 		yyDollar = yyS[yypt-8 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6495
+//line sql.y:6497
 		{
 			yyLOCAL = &GeomFromWKBExpr{Type: MultiLinestringFromWKB, WkbBlob: yyDollar[3].exprUnion(), Srid: yyDollar[5].exprUnion(), AxisOrderOpt: yyDollar[7].exprUnion()}
 		}
@@ -19837,7 +19840,7 @@ yydefault:
 	case 1285:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6499
+//line sql.y:6501
 		{
 			yyLOCAL = &GeomFromWKBExpr{Type: MultiPointFromWKB, WkbBlob: yyDollar[3].exprUnion()}
 		}
@@ -19845,7 +19848,7 @@ yydefault:
 	case 1286:
 		yyDollar = yyS[yypt-6 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6503
+//line sql.y:6505
 		{
 			yyLOCAL = &GeomFromWKBExpr{Type: MultiPointFromWKB, WkbBlob: yyDollar[3].exprUnion(), Srid: yyDollar[5].exprUnion()}
 		}
@@ -19853,7 +19856,7 @@ yydefault:
 	case 1287:
 		yyDollar = yyS[yypt-8 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6507
+//line sql.y:6509
 		{
 			yyLOCAL = &GeomFromWKBExpr{Type: MultiPointFromWKB, WkbBlob: yyDollar[3].exprUnion(), Srid: yyDollar[5].exprUnion(), AxisOrderOpt: yyDollar[7].exprUnion()}
 		}
@@ -19861,7 +19864,7 @@ yydefault:
 	case 1288:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6511
+//line sql.y:6513
 		{
 			yyLOCAL = &GeomFromWKBExpr{Type: MultiPolygonFromWKB, WkbBlob: yyDollar[3].exprUnion()}
 		}
@@ -19869,7 +19872,7 @@ yydefault:
 	case 1289:
 		yyDollar = yyS[yypt-6 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6515
+//line sql.y:6517
 		{
 			yyLOCAL = &GeomFromWKBExpr{Type: MultiPolygonFromWKB, WkbBlob: yyDollar[3].exprUnion(), Srid: yyDollar[5].exprUnion()}
 		}
@@ -19877,7 +19880,7 @@ yydefault:
 	case 1290:
 		yyDollar = yyS[yypt-8 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6519
+//line sql.y:6521
 		{
 			yyLOCAL = &GeomFromWKBExpr{Type: MultiPolygonFromWKB, WkbBlob: yyDollar[3].exprUnion(), Srid: yyDollar[5].exprUnion(), AxisOrderOpt: yyDollar[7].exprUnion()}
 		}
@@ -19885,7 +19888,7 @@ yydefault:
 	case 1291:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6523
+//line sql.y:6525
 		{
 			yyLOCAL = &GeomFromWKBExpr{Type: PointFromWKB, WkbBlob: yyDollar[3].exprUnion()}
 		}
@@ -19893,7 +19896,7 @@ yydefault:
 	case 1292:
 		yyDollar = yyS[yypt-6 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6527
+//line sql.y:6529
 		{
 			yyLOCAL = &GeomFromWKBExpr{Type: PointFromWKB, WkbBlob: yyDollar[3].exprUnion(), Srid: yyDollar[5].exprUnion()}
 		}
@@ -19901,7 +19904,7 @@ yydefault:
 	case 1293:
 		yyDollar = yyS[yypt-8 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6531
+//line sql.y:6533
 		{
 			yyLOCAL = &GeomFromWKBExpr{Type: PointFromWKB, WkbBlob: yyDollar[3].exprUnion(), Srid: yyDollar[5].exprUnion(), AxisOrderOpt: yyDollar[7].exprUnion()}
 		}
@@ -19909,7 +19912,7 @@ yydefault:
 	case 1294:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6535
+//line sql.y:6537
 		{
 			yyLOCAL = &GeomFromWKBExpr{Type: PolygonFromWKB, WkbBlob: yyDollar[3].exprUnion()}
 		}
@@ -19917,7 +19920,7 @@ yydefault:
 	case 1295:
 		yyDollar = yyS[yypt-6 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6539
+//line sql.y:6541
 		{
 			yyLOCAL = &GeomFromWKBExpr{Type: PolygonFromWKB, WkbBlob: yyDollar[3].exprUnion(), Srid: yyDollar[5].exprUnion()}
 		}
@@ -19925,7 +19928,7 @@ yydefault:
 	case 1296:
 		yyDollar = yyS[yypt-8 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6543
+//line sql.y:6545
 		{
 			yyLOCAL = &GeomFromWKBExpr{Type: PolygonFromWKB, WkbBlob: yyDollar[3].exprUnion(), Srid: yyDollar[5].exprUnion(), AxisOrderOpt: yyDollar[7].exprUnion()}
 		}
@@ -19933,7 +19936,7 @@ yydefault:
 	case 1297:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6547
+//line sql.y:6549
 		{
 			yyLOCAL = &PolygonPropertyFuncExpr{Property: Area, Polygon: yyDollar[3].exprUnion()}
 		}
@@ -19941,7 +19944,7 @@ yydefault:
 	case 1298:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6551
+//line sql.y:6553
 		{
 			yyLOCAL = &PolygonPropertyFuncExpr{Property: Centroid, Polygon: yyDollar[3].exprUnion()}
 		}
@@ -19949,7 +19952,7 @@ yydefault:
 	case 1299:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6555
+//line sql.y:6557
 		{
 			yyLOCAL = &PolygonPropertyFuncExpr{Property: ExteriorRing, Polygon: yyDollar[3].exprUnion()}
 		}
@@ -19957,7 +19960,7 @@ yydefault:
 	case 1300:
 		yyDollar = yyS[yypt-6 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6559
+//line sql.y:6561
 		{
 			yyLOCAL = &PolygonPropertyFuncExpr{Property: InteriorRingN, Polygon: yyDollar[3].exprUnion(), PropertyDefArg: yyDollar[5].exprUnion()}
 		}
@@ -19965,7 +19968,7 @@ yydefault:
 	case 1301:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6563
+//line sql.y:6565
 		{
 			yyLOCAL = &PolygonPropertyFuncExpr{Property: NumInteriorRings, Polygon: yyDollar[3].exprUnion()}
 		}
@@ -19973,7 +19976,7 @@ yydefault:
 	case 1302:
 		yyDollar = yyS[yypt-6 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6567
+//line sql.y:6569
 		{
 			yyLOCAL = &GeomCollPropertyFuncExpr{Property: GeometryN, GeomColl: yyDollar[3].exprUnion(), PropertyDefArg: yyDollar[5].exprUnion()}
 		}
@@ -19981,7 +19984,7 @@ yydefault:
 	case 1303:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6571
+//line sql.y:6573
 		{
 			yyLOCAL = &GeomCollPropertyFuncExpr{Property: NumGeometries, GeomColl: yyDollar[3].exprUnion()}
 		}
@@ -19989,7 +19992,7 @@ yydefault:
 	case 1304:
 		yyDollar = yyS[yypt-8 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6575
+//line sql.y:6577
 		{
 			yyLOCAL = &GeoHashFromLatLongExpr{Longitude: yyDollar[3].exprUnion(), Latitude: yyDollar[5].exprUnion(), MaxLength: yyDollar[7].exprUnion()}
 		}
@@ -19997,7 +20000,7 @@ yydefault:
 	case 1305:
 		yyDollar = yyS[yypt-6 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6579
+//line sql.y:6581
 		{
 			yyLOCAL = &GeoHashFromPointExpr{Point: yyDollar[3].exprUnion(), MaxLength: yyDollar[5].exprUnion()}
 		}
@@ -20005,7 +20008,7 @@ yydefault:
 	case 1306:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6583
+//line sql.y:6585
 		{
 			yyLOCAL = &GeomFromGeoHashExpr{GeomType: LatitudeFromHash, GeoHash: yyDollar[3].exprUnion()}
 		}
@@ -20013,7 +20016,7 @@ yydefault:
 	case 1307:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6587
+//line sql.y:6589
 		{
 			yyLOCAL = &GeomFromGeoHashExpr{GeomType: LongitudeFromHash, GeoHash: yyDollar[3].exprUnion()}
 		}
@@ -20021,7 +20024,7 @@ yydefault:
 	case 1308:
 		yyDollar = yyS[yypt-6 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6591
+//line sql.y:6593
 		{
 			yyLOCAL = &GeomFromGeoHashExpr{GeomType: PointFromHash, GeoHash: yyDollar[3].exprUnion(), SridOpt: yyDollar[5].exprUnion()}
 		}
@@ -20029,7 +20032,7 @@ yydefault:
 	case 1309:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6595
+//line sql.y:6597
 		{
 			yyLOCAL = &GeomFromGeoJSONExpr{GeoJSON: yyDollar[3].exprUnion()}
 		}
@@ -20037,7 +20040,7 @@ yydefault:
 	case 1310:
 		yyDollar = yyS[yypt-6 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6599
+//line sql.y:6601
 		{
 			yyLOCAL = &GeomFromGeoJSONExpr{GeoJSON: yyDollar[3].exprUnion(), HigherDimHandlerOpt: yyDollar[5].exprUnion()}
 		}
@@ -20045,7 +20048,7 @@ yydefault:
 	case 1311:
 		yyDollar = yyS[yypt-8 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6603
+//line sql.y:6605
 		{
 			yyLOCAL = &GeomFromGeoJSONExpr{GeoJSON: yyDollar[3].exprUnion(), HigherDimHandlerOpt: yyDollar[5].exprUnion(), Srid: yyDollar[7].exprUnion()}
 		}
@@ -20053,7 +20056,7 @@ yydefault:
 	case 1312:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6607
+//line sql.y:6609
 		{
 			yyLOCAL = &GeoJSONFromGeomExpr{Geom: yyDollar[3].exprUnion()}
 		}
@@ -20061,7 +20064,7 @@ yydefault:
 	case 1313:
 		yyDollar = yyS[yypt-6 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6611
+//line sql.y:6613
 		{
 			yyLOCAL = &GeoJSONFromGeomExpr{Geom: yyDollar[3].exprUnion(), MaxDecimalDigits: yyDollar[5].exprUnion()}
 		}
@@ -20069,7 +20072,7 @@ yydefault:
 	case 1314:
 		yyDollar = yyS[yypt-8 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6615
+//line sql.y:6617
 		{
 			yyLOCAL = &GeoJSONFromGeomExpr{Geom: yyDollar[3].exprUnion(), MaxDecimalDigits: yyDollar[5].exprUnion(), Bitmask: yyDollar[7].exprUnion()}
 		}
@@ -20077,7 +20080,7 @@ yydefault:
 	case 1315:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6619
+//line sql.y:6621
 		{
 			yyLOCAL = &JSONObjectExpr{Params: yyDollar[3].jsonObjectParamsUnion()}
 		}
@@ -20085,7 +20088,7 @@ yydefault:
 	case 1316:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6623
+//line sql.y:6625
 		{
 			yyLOCAL = &JSONQuoteExpr{StringArg: yyDollar[3].exprUnion()}
 		}
@@ -20093,7 +20096,7 @@ yydefault:
 	case 1317:
 		yyDollar = yyS[yypt-6 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6627
+//line sql.y:6629
 		{
 			yyLOCAL = &JSONContainsExpr{Target: yyDollar[3].exprUnion(), Candidate: yyDollar[5].exprsUnion()[0], PathList: yyDollar[5].exprsUnion()[1:]}
 		}
@@ -20101,7 +20104,7 @@ yydefault:
 	case 1318:
 		yyDollar = yyS[yypt-8 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6631
+//line sql.y:6633
 		{
 			yyLOCAL = &JSONContainsPathExpr{JSONDoc: yyDollar[3].exprUnion(), OneOrAll: yyDollar[5].exprUnion(), PathList: yyDollar[7].exprsUnion()}
 		}
@@ -20109,7 +20112,7 @@ yydefault:
 	case 1319:
 		yyDollar = yyS[yypt-6 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6635
+//line sql.y:6637
 		{
 			yyLOCAL = &JSONExtractExpr{JSONDoc: yyDollar[3].exprUnion(), PathList: yyDollar[5].exprsUnion()}
 		}
@@ -20117,7 +20120,7 @@ yydefault:
 	case 1320:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6639
+//line sql.y:6641
 		{
 			yyLOCAL = &JSONKeysExpr{JSONDoc: yyDollar[3].exprUnion()}
 		}
@@ -20125,7 +20128,7 @@ yydefault:
 	case 1321:
 		yyDollar = yyS[yypt-6 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6643
+//line sql.y:6645
 		{
 			yyLOCAL = &JSONKeysExpr{JSONDoc: yyDollar[3].exprUnion(), Path: yyDollar[5].exprUnion()}
 		}
@@ -20133,7 +20136,7 @@ yydefault:
 	case 1322:
 		yyDollar = yyS[yypt-6 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6647
+//line sql.y:6649
 		{
 			yyLOCAL = &JSONOverlapsExpr{JSONDoc1: yyDollar[3].exprUnion(), JSONDoc2: yyDollar[5].exprUnion()}
 		}
@@ -20141,7 +20144,7 @@ yydefault:
 	case 1323:
 		yyDollar = yyS[yypt-8 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6651
+//line sql.y:6653
 		{
 			yyLOCAL = &JSONSearchExpr{JSONDoc: yyDollar[3].exprUnion(), OneOrAll: yyDollar[5].exprUnion(), SearchStr: yyDollar[7].exprUnion()}
 		}
@@ -20149,7 +20152,7 @@ yydefault:
 	case 1324:
 		yyDollar = yyS[yypt-10 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6655
+//line sql.y:6657
 		{
 			yyLOCAL = &JSONSearchExpr{JSONDoc: yyDollar[3].exprUnion(), OneOrAll: yyDollar[5].exprUnion(), SearchStr: yyDollar[7].exprUnion(), EscapeChar: yyDollar[9].exprsUnion()[0], PathList: yyDollar[9].exprsUnion()[1:]}
 		}
@@ -20157,7 +20160,7 @@ yydefault:
 	case 1325:
 		yyDollar = yyS[yypt-7 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6659
+//line sql.y:6661
 		{
 			yyLOCAL = &JSONValueExpr{JSONDoc: yyDollar[3].exprUnion(), Path: yyDollar[5].exprUnion(), ReturningType: yyDollar[6].convertTypeUnion()}
 		}
@@ -20165,7 +20168,7 @@ yydefault:
 	case 1326:
 		yyDollar = yyS[yypt-8 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6663
+//line sql.y:6665
 		{
 			yyLOCAL = &JSONValueExpr{JSONDoc: yyDollar[3].exprUnion(), Path: yyDollar[5].exprUnion(), ReturningType: yyDollar[6].convertTypeUnion(), EmptyOnResponse: yyDollar[7].jtOnResponseUnion()}
 		}
@@ -20173,7 +20176,7 @@ yydefault:
 	case 1327:
 		yyDollar = yyS[yypt-8 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6667
+//line sql.y:6669
 		{
 			yyLOCAL = &JSONValueExpr{JSONDoc: yyDollar[3].exprUnion(), Path: yyDollar[5].exprUnion(), ReturningType: yyDollar[6].convertTypeUnion(), ErrorOnResponse: yyDollar[7].jtOnResponseUnion()}
 		}
@@ -20181,7 +20184,7 @@ yydefault:
 	case 1328:
 		yyDollar = yyS[yypt-9 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6671
+//line sql.y:6673
 		{
 			yyLOCAL = &JSONValueExpr{JSONDoc: yyDollar[3].exprUnion(), Path: yyDollar[5].exprUnion(), ReturningType: yyDollar[6].convertTypeUnion(), EmptyOnResponse: yyDollar[7].jtOnResponseUnion(), ErrorOnResponse: yyDollar[8].jtOnResponseUnion()}
 		}
@@ -20189,7 +20192,7 @@ yydefault:
 	case 1329:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6675
+//line sql.y:6677
 		{
 			yyLOCAL = &JSONAttributesExpr{Type: DepthAttributeType, JSONDoc: yyDollar[3].exprUnion()}
 		}
@@ -20197,7 +20200,7 @@ yydefault:
 	case 1330:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6679
+//line sql.y:6681
 		{
 			yyLOCAL = &JSONAttributesExpr{Type: ValidAttributeType, JSONDoc: yyDollar[3].exprUnion()}
 		}
@@ -20205,7 +20208,7 @@ yydefault:
 	case 1331:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6683
+//line sql.y:6685
 		{
 			yyLOCAL = &JSONAttributesExpr{Type: TypeAttributeType, JSONDoc: yyDollar[3].exprUnion()}
 		}
@@ -20213,7 +20216,7 @@ yydefault:
 	case 1332:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6687
+//line sql.y:6689
 		{
 			yyLOCAL = &JSONAttributesExpr{Type: LengthAttributeType, JSONDoc: yyDollar[3].exprUnion()}
 		}
@@ -20221,7 +20224,7 @@ yydefault:
 	case 1333:
 		yyDollar = yyS[yypt-6 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6691
+//line sql.y:6693
 		{
 			yyLOCAL = &JSONAttributesExpr{Type: LengthAttributeType, JSONDoc: yyDollar[3].exprUnion(), Path: yyDollar[5].exprUnion()}
 		}
@@ -20229,7 +20232,7 @@ yydefault:
 	case 1334:
 		yyDollar = yyS[yypt-6 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6695
+//line sql.y:6697
 		{
 			yyLOCAL = &JSONValueModifierExpr{Type: JSONArrayAppendType, JSONDoc: yyDollar[3].exprUnion(), Params: yyDollar[5].jsonObjectParamsUnion()}
 		}
@@ -20237,7 +20240,7 @@ yydefault:
 	case 1335:
 		yyDollar = yyS[yypt-6 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6699
+//line sql.y:6701
 		{
 			yyLOCAL = &JSONValueModifierExpr{Type: JSONArrayInsertType, JSONDoc: yyDollar[3].exprUnion(), Params: yyDollar[5].jsonObjectParamsUnion()}
 		}
@@ -20245,7 +20248,7 @@ yydefault:
 	case 1336:
 		yyDollar = yyS[yypt-6 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6703
+//line sql.y:6705
 		{
 			yyLOCAL = &JSONValueModifierExpr{Type: JSONInsertType, JSONDoc: yyDollar[3].exprUnion(), Params: yyDollar[5].jsonObjectParamsUnion()}
 		}
@@ -20253,7 +20256,7 @@ yydefault:
 	case 1337:
 		yyDollar = yyS[yypt-6 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6707
+//line sql.y:6709
 		{
 			yyLOCAL = &JSONValueModifierExpr{Type: JSONReplaceType, JSONDoc: yyDollar[3].exprUnion(), Params: yyDollar[5].jsonObjectParamsUnion()}
 		}
@@ -20261,7 +20264,7 @@ yydefault:
 	case 1338:
 		yyDollar = yyS[yypt-6 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6711
+//line sql.y:6713
 		{
 			yyLOCAL = &JSONValueModifierExpr{Type: JSONSetType, JSONDoc: yyDollar[3].exprUnion(), Params: yyDollar[5].jsonObjectParamsUnion()}
 		}
@@ -20269,7 +20272,7 @@ yydefault:
 	case 1339:
 		yyDollar = yyS[yypt-6 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6715
+//line sql.y:6717
 		{
 			yyLOCAL = &JSONValueMergeExpr{Type: JSONMergeType, JSONDoc: yyDollar[3].exprUnion(), JSONDocList: yyDollar[5].exprsUnion()}
 		}
@@ -20277,7 +20280,7 @@ yydefault:
 	case 1340:
 		yyDollar = yyS[yypt-6 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6719
+//line sql.y:6721
 		{
 			yyLOCAL = &JSONValueMergeExpr{Type: JSONMergePatchType, JSONDoc: yyDollar[3].exprUnion(), JSONDocList: yyDollar[5].exprsUnion()}
 		}
@@ -20285,7 +20288,7 @@ yydefault:
 	case 1341:
 		yyDollar = yyS[yypt-6 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6723
+//line sql.y:6725
 		{
 			yyLOCAL = &JSONValueMergeExpr{Type: JSONMergePreserveType, JSONDoc: yyDollar[3].exprUnion(), JSONDocList: yyDollar[5].exprsUnion()}
 		}
@@ -20293,7 +20296,7 @@ yydefault:
 	case 1342:
 		yyDollar = yyS[yypt-6 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6727
+//line sql.y:6729
 		{
 			yyLOCAL = &JSONRemoveExpr{JSONDoc: yyDollar[3].exprUnion(), PathList: yyDollar[5].exprsUnion()}
 		}
@@ -20301,7 +20304,7 @@ yydefault:
 	case 1343:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6731
+//line sql.y:6733
 		{
 			yyLOCAL = &JSONUnquoteExpr{JSONValue: yyDollar[3].exprUnion()}
 		}
@@ -20309,7 +20312,7 @@ yydefault:
 	case 1344:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6735
+//line sql.y:6737
 		{
 			yyLOCAL = &MultiPolygonExpr{PolygonParams: yyDollar[3].exprsUnion()}
 		}
@@ -20317,7 +20320,7 @@ yydefault:
 	case 1345:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6739
+//line sql.y:6741
 		{
 			yyLOCAL = &MultiPointExpr{PointParams: yyDollar[3].exprsUnion()}
 		}
@@ -20325,7 +20328,7 @@ yydefault:
 	case 1346:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6743
+//line sql.y:6745
 		{
 			yyLOCAL = &MultiLinestringExpr{LinestringParams: yyDollar[3].exprsUnion()}
 		}
@@ -20333,7 +20336,7 @@ yydefault:
 	case 1347:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6747
+//line sql.y:6749
 		{
 			yyLOCAL = &PolygonExpr{LinestringParams: yyDollar[3].exprsUnion()}
 		}
@@ -20341,7 +20344,7 @@ yydefault:
 	case 1348:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6751
+//line sql.y:6753
 		{
 			yyLOCAL = &LineStringExpr{PointParams: yyDollar[3].exprsUnion()}
 		}
@@ -20349,7 +20352,7 @@ yydefault:
 	case 1349:
 		yyDollar = yyS[yypt-6 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6755
+//line sql.y:6757
 		{
 			yyLOCAL = &PointExpr{XCordinate: yyDollar[3].exprUnion(), YCordinate: yyDollar[5].exprUnion()}
 		}
@@ -20357,7 +20360,7 @@ yydefault:
 	case 1350:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6759
+//line sql.y:6761
 		{
 			yyLOCAL = &ArgumentLessWindowExpr{Type: yyDollar[1].argumentLessWindowExprTypeUnion(), OverClause: yyDollar[4].overClauseUnion()}
 		}
@@ -20365,7 +20368,7 @@ yydefault:
 	case 1351:
 		yyDollar = yyS[yypt-6 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6763
+//line sql.y:6765
 		{
 			yyLOCAL = &FirstOrLastValueExpr{Type: yyDollar[1].firstOrLastValueExprTypeUnion(), Expr: yyDollar[3].exprUnion(), NullTreatmentClause: yyDollar[5].nullTreatmentClauseUnion(), OverClause: yyDollar[6].overClauseUnion()}
 		}
@@ -20373,7 +20376,7 @@ yydefault:
 	case 1352:
 		yyDollar = yyS[yypt-5 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6767
+//line sql.y:6769
 		{
 			yyLOCAL = &NtileExpr{N: yyDollar[3].exprUnion(), OverClause: yyDollar[5].overClauseUnion()}
 		}
@@ -20381,7 +20384,7 @@ yydefault:
 	case 1353:
 		yyDollar = yyS[yypt-9 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6771
+//line sql.y:6773
 		{
 			yyLOCAL = &NTHValueExpr{Expr: yyDollar[3].exprUnion(), N: yyDollar[5].exprUnion(), FromFirstLastClause: yyDollar[7].fromFirstLastClauseUnion(), NullTreatmentClause: yyDollar[8].nullTreatmentClauseUnion(), OverClause: yyDollar[9].overClauseUnion()}
 		}
@@ -20389,7 +20392,7 @@ yydefault:
 	case 1354:
 		yyDollar = yyS[yypt-6 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6775
+//line sql.y:6777
 		{
 			yyLOCAL = &LagLeadExpr{Type: yyDollar[1].lagLeadExprTypeUnion(), Expr: yyDollar[3].exprUnion(), NullTreatmentClause: yyDollar[5].nullTreatmentClauseUnion(), OverClause: yyDollar[6].overClauseUnion()}
 		}
@@ -20397,7 +20400,7 @@ yydefault:
 	case 1355:
 		yyDollar = yyS[yypt-9 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6779
+//line sql.y:6781
 		{
 			yyLOCAL = &LagLeadExpr{Type: yyDollar[1].lagLeadExprTypeUnion(), Expr: yyDollar[3].exprUnion(), N: yyDollar[5].exprUnion(), Default: yyDollar[6].exprUnion(), NullTreatmentClause: yyDollar[8].nullTreatmentClauseUnion(), OverClause: yyDollar[9].overClauseUnion()}
 		}
@@ -20405,7 +20408,7 @@ yydefault:
 	case 1356:
 		yyDollar = yyS[yypt-8 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6783
+//line sql.y:6785
 		{
 			yyLOCAL = &IntervalDateExpr{Syntax: IntervalDateExprAdddate, Date: yyDollar[3].exprUnion(), Interval: yyDollar[6].exprUnion(), Unit: yyDollar[7].intervalTypeUnion()}
 		}
@@ -20413,7 +20416,7 @@ yydefault:
 	case 1357:
 		yyDollar = yyS[yypt-6 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6787
+//line sql.y:6789
 		{
 			yyLOCAL = &IntervalDateExpr{Syntax: IntervalDateExprAdddate, Date: yyDollar[3].exprUnion(), Interval: yyDollar[5].exprUnion(), Unit: IntervalNone}
 		}
@@ -20421,7 +20424,7 @@ yydefault:
 	case 1358:
 		yyDollar = yyS[yypt-8 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6791
+//line sql.y:6793
 		{
 			yyLOCAL = &IntervalDateExpr{Syntax: IntervalDateExprDateAdd, Date: yyDollar[3].exprUnion(), Interval: yyDollar[6].exprUnion(), Unit: yyDollar[7].intervalTypeUnion()}
 		}
@@ -20429,7 +20432,7 @@ yydefault:
 	case 1359:
 		yyDollar = yyS[yypt-8 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6795
+//line sql.y:6797
 		{
 			yyLOCAL = &IntervalDateExpr{Syntax: IntervalDateExprDateSub, Date: yyDollar[3].exprUnion(), Interval: yyDollar[6].exprUnion(), Unit: yyDollar[7].intervalTypeUnion()}
 		}
@@ -20437,7 +20440,7 @@ yydefault:
 	case 1360:
 		yyDollar = yyS[yypt-8 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6799
+//line sql.y:6801
 		{
 			yyLOCAL = &IntervalDateExpr{Syntax: IntervalDateExprSubdate, Date: yyDollar[3].exprUnion(), Interval: yyDollar[6].exprUnion(), Unit: yyDollar[7].intervalTypeUnion()}
 		}
@@ -20445,7 +20448,7 @@ yydefault:
 	case 1361:
 		yyDollar = yyS[yypt-6 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6803
+//line sql.y:6805
 		{
 			yyLOCAL = &IntervalDateExpr{Syntax: IntervalDateExprSubdate, Date: yyDollar[3].exprUnion(), Interval: yyDollar[5].exprUnion(), Unit: IntervalNone}
 		}
@@ -20453,7 +20456,7 @@ yydefault:
 	case 1366:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6813
+//line sql.y:6815
 		{
 			yyLOCAL = yyDollar[1].exprUnion()
 		}
@@ -20461,7 +20464,7 @@ yydefault:
 	case 1367:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6817
+//line sql.y:6819
 		{
 			yyLOCAL = NewIntLiteral(yyDollar[1].str)
 		}
@@ -20469,7 +20472,7 @@ yydefault:
 	case 1368:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6821
+//line sql.y:6823
 		{
 			yyLOCAL = yyDollar[1].variableUnion()
 		}
@@ -20477,7 +20480,7 @@ yydefault:
 	case 1369:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6825
+//line sql.y:6827
 		{
 			yyLOCAL = parseBindVariable(yylex, yyDollar[1].str[1:])
 		}
@@ -20485,7 +20488,7 @@ yydefault:
 	case 1370:
 		yyDollar = yyS[yypt-0 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6830
+//line sql.y:6832
 		{
 			yyLOCAL = nil
 		}
@@ -20493,7 +20496,7 @@ yydefault:
 	case 1371:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6834
+//line sql.y:6836
 		{
 			yyLOCAL = yyDollar[2].exprUnion()
 		}
@@ -20501,7 +20504,7 @@ yydefault:
 	case 1372:
 		yyDollar = yyS[yypt-6 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6840
+//line sql.y:6842
 		{
 			yyLOCAL = &RegexpInstrExpr{Expr: yyDollar[3].exprUnion(), Pattern: yyDollar[5].exprUnion()}
 		}
@@ -20509,7 +20512,7 @@ yydefault:
 	case 1373:
 		yyDollar = yyS[yypt-8 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6844
+//line sql.y:6846
 		{
 			yyLOCAL = &RegexpInstrExpr{Expr: yyDollar[3].exprUnion(), Pattern: yyDollar[5].exprUnion(), Position: yyDollar[7].exprUnion()}
 		}
@@ -20517,7 +20520,7 @@ yydefault:
 	case 1374:
 		yyDollar = yyS[yypt-10 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6848
+//line sql.y:6850
 		{
 			yyLOCAL = &RegexpInstrExpr{Expr: yyDollar[3].exprUnion(), Pattern: yyDollar[5].exprUnion(), Position: yyDollar[7].exprUnion(), Occurrence: yyDollar[9].exprUnion()}
 		}
@@ -20525,7 +20528,7 @@ yydefault:
 	case 1375:
 		yyDollar = yyS[yypt-12 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6852
+//line sql.y:6854
 		{
 			yyLOCAL = &RegexpInstrExpr{Expr: yyDollar[3].exprUnion(), Pattern: yyDollar[5].exprUnion(), Position: yyDollar[7].exprUnion(), Occurrence: yyDollar[9].exprUnion(), ReturnOption: yyDollar[11].exprUnion()}
 		}
@@ -20533,7 +20536,7 @@ yydefault:
 	case 1376:
 		yyDollar = yyS[yypt-14 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6856
+//line sql.y:6858
 		{
 			// Match type is kept expression as TRIM( ' m  ') is accepted
 			yyLOCAL = &RegexpInstrExpr{Expr: yyDollar[3].exprUnion(), Pattern: yyDollar[5].exprUnion(), Position: yyDollar[7].exprUnion(), Occurrence: yyDollar[9].exprUnion(), ReturnOption: yyDollar[11].exprUnion(), MatchType: yyDollar[13].exprUnion()}
@@ -20542,7 +20545,7 @@ yydefault:
 	case 1377:
 		yyDollar = yyS[yypt-6 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6861
+//line sql.y:6863
 		{
 			yyLOCAL = &RegexpLikeExpr{Expr: yyDollar[3].exprUnion(), Pattern: yyDollar[5].exprUnion()}
 		}
@@ -20550,7 +20553,7 @@ yydefault:
 	case 1378:
 		yyDollar = yyS[yypt-8 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6865
+//line sql.y:6867
 		{
 			yyLOCAL = &RegexpLikeExpr{Expr: yyDollar[3].exprUnion(), Pattern: yyDollar[5].exprUnion(), MatchType: yyDollar[7].exprUnion()}
 		}
@@ -20558,7 +20561,7 @@ yydefault:
 	case 1379:
 		yyDollar = yyS[yypt-8 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6869
+//line sql.y:6871
 		{
 			yyLOCAL = &RegexpReplaceExpr{Expr: yyDollar[3].exprUnion(), Pattern: yyDollar[5].exprUnion(), Repl: yyDollar[7].exprUnion()}
 		}
@@ -20566,7 +20569,7 @@ yydefault:
 	case 1380:
 		yyDollar = yyS[yypt-10 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6873
+//line sql.y:6875
 		{
 			yyLOCAL = &RegexpReplaceExpr{Expr: yyDollar[3].exprUnion(), Pattern: yyDollar[5].exprUnion(), Repl: yyDollar[7].exprUnion(), Position: yyDollar[9].exprUnion()}
 		}
@@ -20574,7 +20577,7 @@ yydefault:
 	case 1381:
 		yyDollar = yyS[yypt-12 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6877
+//line sql.y:6879
 		{
 			yyLOCAL = &RegexpReplaceExpr{Expr: yyDollar[3].exprUnion(), Pattern: yyDollar[5].exprUnion(), Repl: yyDollar[7].exprUnion(), Position: yyDollar[9].exprUnion(), Occurrence: yyDollar[11].exprUnion()}
 		}
@@ -20582,7 +20585,7 @@ yydefault:
 	case 1382:
 		yyDollar = yyS[yypt-14 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6881
+//line sql.y:6883
 		{
 			// Match type is kept expression as TRIM( ' m  ') is accepted
 			yyLOCAL = &RegexpReplaceExpr{Expr: yyDollar[3].exprUnion(), Pattern: yyDollar[5].exprUnion(), Repl: yyDollar[7].exprUnion(), Position: yyDollar[9].exprUnion(), Occurrence: yyDollar[11].exprUnion(), MatchType: yyDollar[13].exprUnion()}
@@ -20591,7 +20594,7 @@ yydefault:
 	case 1383:
 		yyDollar = yyS[yypt-6 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6886
+//line sql.y:6888
 		{
 			yyLOCAL = &RegexpSubstrExpr{Expr: yyDollar[3].exprUnion(), Pattern: yyDollar[5].exprUnion()}
 		}
@@ -20599,7 +20602,7 @@ yydefault:
 	case 1384:
 		yyDollar = yyS[yypt-8 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6890
+//line sql.y:6892
 		{
 			yyLOCAL = &RegexpSubstrExpr{Expr: yyDollar[3].exprUnion(), Pattern: yyDollar[5].exprUnion(), Position: yyDollar[7].exprUnion()}
 		}
@@ -20607,7 +20610,7 @@ yydefault:
 	case 1385:
 		yyDollar = yyS[yypt-10 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6894
+//line sql.y:6896
 		{
 			yyLOCAL = &RegexpSubstrExpr{Expr: yyDollar[3].exprUnion(), Pattern: yyDollar[5].exprUnion(), Position: yyDollar[7].exprUnion(), Occurrence: yyDollar[9].exprUnion()}
 		}
@@ -20615,7 +20618,7 @@ yydefault:
 	case 1386:
 		yyDollar = yyS[yypt-12 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6898
+//line sql.y:6900
 		{
 			// Match type is kept expression as TRIM( ' m  ') is accepted
 			yyLOCAL = &RegexpSubstrExpr{Expr: yyDollar[3].exprUnion(), Pattern: yyDollar[5].exprUnion(), Position: yyDollar[7].exprUnion(), Occurrence: yyDollar[9].exprUnion(), MatchType: yyDollar[11].exprUnion()}
@@ -20624,7 +20627,7 @@ yydefault:
 	case 1387:
 		yyDollar = yyS[yypt-6 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6905
+//line sql.y:6907
 		{
 			yyLOCAL = &ExtractValueExpr{Fragment: yyDollar[3].exprUnion(), XPathExpr: yyDollar[5].exprUnion()}
 		}
@@ -20632,7 +20635,7 @@ yydefault:
 	case 1388:
 		yyDollar = yyS[yypt-8 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6909
+//line sql.y:6911
 		{
 			yyLOCAL = &UpdateXMLExpr{Target: yyDollar[3].exprUnion(), XPathExpr: yyDollar[5].exprUnion(), NewXML: yyDollar[7].exprUnion()}
 		}
@@ -20640,7 +20643,7 @@ yydefault:
 	case 1389:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6915
+//line sql.y:6917
 		{
 			yyLOCAL = &PerformanceSchemaFuncExpr{Type: FormatBytesType, Argument: yyDollar[3].exprUnion()}
 		}
@@ -20648,7 +20651,7 @@ yydefault:
 	case 1390:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6919
+//line sql.y:6921
 		{
 			yyLOCAL = &PerformanceSchemaFuncExpr{Type: FormatPicoTimeType, Argument: yyDollar[3].exprUnion()}
 		}
@@ -20656,7 +20659,7 @@ yydefault:
 	case 1391:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6923
+//line sql.y:6925
 		{
 			yyLOCAL = &PerformanceSchemaFuncExpr{Type: PsCurrentThreadIDType}
 		}
@@ -20664,7 +20667,7 @@ yydefault:
 	case 1392:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6927
+//line sql.y:6929
 		{
 			yyLOCAL = &PerformanceSchemaFuncExpr{Type: PsThreadIDType, Argument: yyDollar[3].exprUnion()}
 		}
@@ -20672,7 +20675,7 @@ yydefault:
 	case 1393:
 		yyDollar = yyS[yypt-6 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6933
+//line sql.y:6935
 		{
 			yyLOCAL = &GTIDFuncExpr{Type: GTIDSubsetType, Set1: yyDollar[3].exprUnion(), Set2: yyDollar[5].exprUnion()}
 		}
@@ -20680,7 +20683,7 @@ yydefault:
 	case 1394:
 		yyDollar = yyS[yypt-6 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6937
+//line sql.y:6939
 		{
 			yyLOCAL = &GTIDFuncExpr{Type: GTIDSubtractType, Set1: yyDollar[3].exprUnion(), Set2: yyDollar[5].exprUnion()}
 		}
@@ -20688,7 +20691,7 @@ yydefault:
 	case 1395:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6941
+//line sql.y:6943
 		{
 			yyLOCAL = &GTIDFuncExpr{Type: WaitForExecutedGTIDSetType, Set1: yyDollar[3].exprUnion()}
 		}
@@ -20696,7 +20699,7 @@ yydefault:
 	case 1396:
 		yyDollar = yyS[yypt-6 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6945
+//line sql.y:6947
 		{
 			yyLOCAL = &GTIDFuncExpr{Type: WaitForExecutedGTIDSetType, Set1: yyDollar[3].exprUnion(), Timeout: yyDollar[5].exprUnion()}
 		}
@@ -20704,7 +20707,7 @@ yydefault:
 	case 1397:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6949
+//line sql.y:6951
 		{
 			yyLOCAL = &GTIDFuncExpr{Type: WaitUntilSQLThreadAfterGTIDSType, Set1: yyDollar[3].exprUnion()}
 		}
@@ -20712,7 +20715,7 @@ yydefault:
 	case 1398:
 		yyDollar = yyS[yypt-6 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6953
+//line sql.y:6955
 		{
 			yyLOCAL = &GTIDFuncExpr{Type: WaitUntilSQLThreadAfterGTIDSType, Set1: yyDollar[3].exprUnion(), Timeout: yyDollar[5].exprUnion()}
 		}
@@ -20720,7 +20723,7 @@ yydefault:
 	case 1399:
 		yyDollar = yyS[yypt-8 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:6957
+//line sql.y:6959
 		{
 			yyLOCAL = &GTIDFuncExpr{Type: WaitUntilSQLThreadAfterGTIDSType, Set1: yyDollar[3].exprUnion(), Timeout: yyDollar[5].exprUnion(), Channel: yyDollar[7].exprUnion()}
 		}
@@ -20728,7 +20731,7 @@ yydefault:
 	case 1400:
 		yyDollar = yyS[yypt-0 : yypt+1]
 		var yyLOCAL *ConvertType
-//line sql.y:6962
+//line sql.y:6964
 		{
 			yyLOCAL = nil
 		}
@@ -20736,7 +20739,7 @@ yydefault:
 	case 1401:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL *ConvertType
-//line sql.y:6966
+//line sql.y:6968
 		{
 			yyLOCAL = yyDollar[2].convertTypeUnion()
 		}
@@ -20744,7 +20747,7 @@ yydefault:
 	case 1402:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL IntervalType
-//line sql.y:6972
+//line sql.y:6974
 		{
 			yyLOCAL = IntervalDayHour
 		}
@@ -20752,7 +20755,7 @@ yydefault:
 	case 1403:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL IntervalType
-//line sql.y:6976
+//line sql.y:6978
 		{
 			yyLOCAL = IntervalDayMicrosecond
 		}
@@ -20760,7 +20763,7 @@ yydefault:
 	case 1404:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL IntervalType
-//line sql.y:6980
+//line sql.y:6982
 		{
 			yyLOCAL = IntervalDayMinute
 		}
@@ -20768,7 +20771,7 @@ yydefault:
 	case 1405:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL IntervalType
-//line sql.y:6984
+//line sql.y:6986
 		{
 			yyLOCAL = IntervalDaySecond
 		}
@@ -20776,7 +20779,7 @@ yydefault:
 	case 1406:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL IntervalType
-//line sql.y:6988
+//line sql.y:6990
 		{
 			yyLOCAL = IntervalHourMicrosecond
 		}
@@ -20784,7 +20787,7 @@ yydefault:
 	case 1407:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL IntervalType
-//line sql.y:6992
+//line sql.y:6994
 		{
 			yyLOCAL = IntervalHourMinute
 		}
@@ -20792,7 +20795,7 @@ yydefault:
 	case 1408:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL IntervalType
-//line sql.y:6996
+//line sql.y:6998
 		{
 			yyLOCAL = IntervalHourSecond
 		}
@@ -20800,7 +20803,7 @@ yydefault:
 	case 1409:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL IntervalType
-//line sql.y:7000
+//line sql.y:7002
 		{
 			yyLOCAL = IntervalMinuteMicrosecond
 		}
@@ -20808,7 +20811,7 @@ yydefault:
 	case 1410:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL IntervalType
-//line sql.y:7004
+//line sql.y:7006
 		{
 			yyLOCAL = IntervalMinuteSecond
 		}
@@ -20816,7 +20819,7 @@ yydefault:
 	case 1411:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL IntervalType
-//line sql.y:7008
+//line sql.y:7010
 		{
 			yyLOCAL = IntervalSecondMicrosecond
 		}
@@ -20824,7 +20827,7 @@ yydefault:
 	case 1412:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL IntervalType
-//line sql.y:7012
+//line sql.y:7014
 		{
 			yyLOCAL = IntervalYearMonth
 		}
@@ -20832,7 +20835,7 @@ yydefault:
 	case 1413:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL IntervalType
-//line sql.y:7016
+//line sql.y:7018
 		{
 			yyLOCAL = IntervalDay
 		}
@@ -20840,7 +20843,7 @@ yydefault:
 	case 1414:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL IntervalType
-//line sql.y:7020
+//line sql.y:7022
 		{
 			yyLOCAL = IntervalWeek
 		}
@@ -20848,7 +20851,7 @@ yydefault:
 	case 1415:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL IntervalType
-//line sql.y:7024
+//line sql.y:7026
 		{
 			yyLOCAL = IntervalHour
 		}
@@ -20856,7 +20859,7 @@ yydefault:
 	case 1416:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL IntervalType
-//line sql.y:7028
+//line sql.y:7030
 		{
 			yyLOCAL = IntervalMinute
 		}
@@ -20864,7 +20867,7 @@ yydefault:
 	case 1417:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL IntervalType
-//line sql.y:7032
+//line sql.y:7034
 		{
 			yyLOCAL = IntervalMonth
 		}
@@ -20872,7 +20875,7 @@ yydefault:
 	case 1418:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL IntervalType
-//line sql.y:7036
+//line sql.y:7038
 		{
 			yyLOCAL = IntervalQuarter
 		}
@@ -20880,7 +20883,7 @@ yydefault:
 	case 1419:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL IntervalType
-//line sql.y:7040
+//line sql.y:7042
 		{
 			yyLOCAL = IntervalSecond
 		}
@@ -20888,7 +20891,7 @@ yydefault:
 	case 1420:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL IntervalType
-//line sql.y:7044
+//line sql.y:7046
 		{
 			yyLOCAL = IntervalMicrosecond
 		}
@@ -20896,7 +20899,7 @@ yydefault:
 	case 1421:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL IntervalType
-//line sql.y:7048
+//line sql.y:7050
 		{
 			yyLOCAL = IntervalYear
 		}
@@ -20904,7 +20907,7 @@ yydefault:
 	case 1422:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL IntervalType
-//line sql.y:7054
+//line sql.y:7056
 		{
 			yyLOCAL = IntervalDay
 		}
@@ -20912,7 +20915,7 @@ yydefault:
 	case 1423:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL IntervalType
-//line sql.y:7058
+//line sql.y:7060
 		{
 			yyLOCAL = IntervalWeek
 		}
@@ -20920,7 +20923,7 @@ yydefault:
 	case 1424:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL IntervalType
-//line sql.y:7062
+//line sql.y:7064
 		{
 			yyLOCAL = IntervalHour
 		}
@@ -20928,7 +20931,7 @@ yydefault:
 	case 1425:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL IntervalType
-//line sql.y:7066
+//line sql.y:7068
 		{
 			yyLOCAL = IntervalMinute
 		}
@@ -20936,7 +20939,7 @@ yydefault:
 	case 1426:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL IntervalType
-//line sql.y:7070
+//line sql.y:7072
 		{
 			yyLOCAL = IntervalMonth
 		}
@@ -20944,7 +20947,7 @@ yydefault:
 	case 1427:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL IntervalType
-//line sql.y:7074
+//line sql.y:7076
 		{
 			yyLOCAL = IntervalQuarter
 		}
@@ -20952,7 +20955,7 @@ yydefault:
 	case 1428:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL IntervalType
-//line sql.y:7078
+//line sql.y:7080
 		{
 			yyLOCAL = IntervalSecond
 		}
@@ -20960,7 +20963,7 @@ yydefault:
 	case 1429:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL IntervalType
-//line sql.y:7082
+//line sql.y:7084
 		{
 			yyLOCAL = IntervalMicrosecond
 		}
@@ -20968,7 +20971,7 @@ yydefault:
 	case 1430:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL IntervalType
-//line sql.y:7086
+//line sql.y:7088
 		{
 			yyLOCAL = IntervalYear
 		}
@@ -20976,7 +20979,7 @@ yydefault:
 	case 1431:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL IntervalType
-//line sql.y:7090
+//line sql.y:7092
 		{
 			yyLOCAL = IntervalDay
 		}
@@ -20984,7 +20987,7 @@ yydefault:
 	case 1432:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL IntervalType
-//line sql.y:7094
+//line sql.y:7096
 		{
 			yyLOCAL = IntervalWeek
 		}
@@ -20992,7 +20995,7 @@ yydefault:
 	case 1433:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL IntervalType
-//line sql.y:7098
+//line sql.y:7100
 		{
 			yyLOCAL = IntervalHour
 		}
@@ -21000,7 +21003,7 @@ yydefault:
 	case 1434:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL IntervalType
-//line sql.y:7102
+//line sql.y:7104
 		{
 			yyLOCAL = IntervalMinute
 		}
@@ -21008,7 +21011,7 @@ yydefault:
 	case 1435:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL IntervalType
-//line sql.y:7106
+//line sql.y:7108
 		{
 			yyLOCAL = IntervalMonth
 		}
@@ -21016,7 +21019,7 @@ yydefault:
 	case 1436:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL IntervalType
-//line sql.y:7110
+//line sql.y:7112
 		{
 			yyLOCAL = IntervalQuarter
 		}
@@ -21024,7 +21027,7 @@ yydefault:
 	case 1437:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL IntervalType
-//line sql.y:7114
+//line sql.y:7116
 		{
 			yyLOCAL = IntervalSecond
 		}
@@ -21032,7 +21035,7 @@ yydefault:
 	case 1438:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL IntervalType
-//line sql.y:7118
+//line sql.y:7120
 		{
 			yyLOCAL = IntervalMicrosecond
 		}
@@ -21040,7 +21043,7 @@ yydefault:
 	case 1439:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL IntervalType
-//line sql.y:7122
+//line sql.y:7124
 		{
 			yyLOCAL = IntervalYear
 		}
@@ -21048,7 +21051,7 @@ yydefault:
 	case 1442:
 		yyDollar = yyS[yypt-0 : yypt+1]
 		var yyLOCAL int
-//line sql.y:7132
+//line sql.y:7134
 		{
 			yyLOCAL = 0
 		}
@@ -21056,7 +21059,7 @@ yydefault:
 	case 1443:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL int
-//line sql.y:7136
+//line sql.y:7138
 		{
 			yyLOCAL = 0
 		}
@@ -21064,7 +21067,7 @@ yydefault:
 	case 1444:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL int
-//line sql.y:7140
+//line sql.y:7142
 		{
 			yyLOCAL = convertStringToInt(yyDollar[2].str)
 		}
@@ -21072,7 +21075,7 @@ yydefault:
 	case 1445:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:7150
+//line sql.y:7152
 		{
 			yyLOCAL = &FuncExpr{Name: NewIdentifierCI("if"), Exprs: yyDollar[3].exprsUnion()}
 		}
@@ -21080,7 +21083,7 @@ yydefault:
 	case 1446:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:7154
+//line sql.y:7156
 		{
 			yyLOCAL = &FuncExpr{Name: NewIdentifierCI("database"), Exprs: yyDollar[3].exprsUnion()}
 		}
@@ -21088,7 +21091,7 @@ yydefault:
 	case 1447:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:7158
+//line sql.y:7160
 		{
 			yyLOCAL = &FuncExpr{Name: NewIdentifierCI("schema"), Exprs: yyDollar[3].exprsUnion()}
 		}
@@ -21096,7 +21099,7 @@ yydefault:
 	case 1448:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:7162
+//line sql.y:7164
 		{
 			yyLOCAL = &FuncExpr{Name: NewIdentifierCI("mod"), Exprs: yyDollar[3].exprsUnion()}
 		}
@@ -21104,7 +21107,7 @@ yydefault:
 	case 1449:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:7166
+//line sql.y:7168
 		{
 			yyLOCAL = &FuncExpr{Name: NewIdentifierCI("replace"), Exprs: yyDollar[3].exprsUnion()}
 		}
@@ -21112,7 +21115,7 @@ yydefault:
 	case 1450:
 		yyDollar = yyS[yypt-0 : yypt+1]
 		var yyLOCAL MatchExprOption
-//line sql.y:7172
+//line sql.y:7174
 		{
 			yyLOCAL = NoOption
 		}
@@ -21120,7 +21123,7 @@ yydefault:
 	case 1451:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL MatchExprOption
-//line sql.y:7176
+//line sql.y:7178
 		{
 			yyLOCAL = BooleanModeOpt
 		}
@@ -21128,7 +21131,7 @@ yydefault:
 	case 1452:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL MatchExprOption
-//line sql.y:7180
+//line sql.y:7182
 		{
 			yyLOCAL = NaturalLanguageModeOpt
 		}
@@ -21136,7 +21139,7 @@ yydefault:
 	case 1453:
 		yyDollar = yyS[yypt-7 : yypt+1]
 		var yyLOCAL MatchExprOption
-//line sql.y:7184
+//line sql.y:7186
 		{
 			yyLOCAL = NaturalLanguageModeWithQueryExpansionOpt
 		}
@@ -21144,33 +21147,33 @@ yydefault:
 	case 1454:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL MatchExprOption
-//line sql.y:7188
+//line sql.y:7190
 		{
 			yyLOCAL = QueryExpansionOpt
 		}
 		yyVAL.union = yyLOCAL
 	case 1455:
 		yyDollar = yyS[yypt-1 : yypt+1]
-//line sql.y:7194
+//line sql.y:7196
 		{
 			yyVAL.str = string(yyDollar[1].identifierCI.String())
 		}
 	case 1456:
 		yyDollar = yyS[yypt-1 : yypt+1]
-//line sql.y:7198
+//line sql.y:7200
 		{
 			yyVAL.str = string(yyDollar[1].str)
 		}
 	case 1457:
 		yyDollar = yyS[yypt-1 : yypt+1]
-//line sql.y:7202
+//line sql.y:7204
 		{
 			yyVAL.str = string(yyDollar[1].str)
 		}
 	case 1458:
 		yyDollar = yyS[yypt-0 : yypt+1]
 		var yyLOCAL *ConvertType
-//line sql.y:7208
+//line sql.y:7210
 		{
 			yyLOCAL = nil
 		}
@@ -21178,7 +21181,7 @@ yydefault:
 	case 1459:
 		yyDollar = yyS[yypt-5 : yypt+1]
 		var yyLOCAL *ConvertType
-//line sql.y:7212
+//line sql.y:7214
 		{
 			yyLOCAL = &ConvertType{Type: string(yyDollar[2].str), Length: ptr.Of(convertStringToInt(yyDollar[4].str))}
 		}
@@ -21186,7 +21189,7 @@ yydefault:
 	case 1460:
 		yyDollar = yyS[yypt-5 : yypt+1]
 		var yyLOCAL *ConvertType
-//line sql.y:7216
+//line sql.y:7218
 		{
 			yyLOCAL = &ConvertType{Type: string(yyDollar[2].str), Length: ptr.Of(convertStringToInt(yyDollar[4].str))}
 		}
@@ -21194,7 +21197,7 @@ yydefault:
 	case 1461:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL *ConvertType
-//line sql.y:7222
+//line sql.y:7224
 		{
 			yyLOCAL = &ConvertType{Type: string(yyDollar[1].str), Length: yyDollar[2].intPtrUnion()}
 		}
@@ -21202,7 +21205,7 @@ yydefault:
 	case 1462:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL *ConvertType
-//line sql.y:7226
+//line sql.y:7228
 		{
 			yyLOCAL = &ConvertType{Type: string(yyDollar[1].str), Length: yyDollar[2].intPtrUnion(), Charset: yyDollar[3].columnCharset}
 		}
@@ -21210,7 +21213,7 @@ yydefault:
 	case 1463:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL *ConvertType
-//line sql.y:7230
+//line sql.y:7232
 		{
 			yyLOCAL = &ConvertType{Type: string(yyDollar[1].str)}
 		}
@@ -21218,7 +21221,7 @@ yydefault:
 	case 1464:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL *ConvertType
-//line sql.y:7234
+//line sql.y:7236
 		{
 			yyLOCAL = &ConvertType{Type: string(yyDollar[1].str), Length: yyDollar[2].intPtrUnion()}
 		}
@@ -21226,7 +21229,7 @@ yydefault:
 	case 1465:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL *ConvertType
-//line sql.y:7238
+//line sql.y:7240
 		{
 			yyLOCAL = &ConvertType{Type: string(yyDollar[1].str)}
 			yyLOCAL.Length = yyDollar[2].LengthScaleOption.Length
@@ -21236,7 +21239,7 @@ yydefault:
 	case 1466:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL *ConvertType
-//line sql.y:7244
+//line sql.y:7246
 		{
 			yyLOCAL = &ConvertType{Type: string(yyDollar[1].str)}
 		}
@@ -21244,7 +21247,7 @@ yydefault:
 	case 1467:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL *ConvertType
-//line sql.y:7248
+//line sql.y:7250
 		{
 			yyLOCAL = &ConvertType{Type: string(yyDollar[1].str), Length: yyDollar[2].intPtrUnion()}
 		}
@@ -21252,7 +21255,7 @@ yydefault:
 	case 1468:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL *ConvertType
-//line sql.y:7252
+//line sql.y:7254
 		{
 			yyLOCAL = &ConvertType{Type: string(yyDollar[1].str)}
 		}
@@ -21260,7 +21263,7 @@ yydefault:
 	case 1469:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL *ConvertType
-//line sql.y:7256
+//line sql.y:7258
 		{
 			yyLOCAL = &ConvertType{Type: string(yyDollar[1].str)}
 		}
@@ -21268,7 +21271,7 @@ yydefault:
 	case 1470:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL *ConvertType
-//line sql.y:7260
+//line sql.y:7262
 		{
 			yyLOCAL = &ConvertType{Type: string(yyDollar[1].str), Length: yyDollar[2].intPtrUnion()}
 		}
@@ -21276,7 +21279,7 @@ yydefault:
 	case 1471:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL *ConvertType
-//line sql.y:7264
+//line sql.y:7266
 		{
 			yyLOCAL = &ConvertType{Type: string(yyDollar[1].str)}
 		}
@@ -21284,7 +21287,7 @@ yydefault:
 	case 1472:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL *ConvertType
-//line sql.y:7268
+//line sql.y:7270
 		{
 			yyLOCAL = &ConvertType{Type: string(yyDollar[1].str)}
 		}
@@ -21292,7 +21295,7 @@ yydefault:
 	case 1473:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL *ConvertType
-//line sql.y:7272
+//line sql.y:7274
 		{
 			yyLOCAL = &ConvertType{Type: string(yyDollar[1].str), Length: yyDollar[2].intPtrUnion()}
 		}
@@ -21300,7 +21303,7 @@ yydefault:
 	case 1474:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL *ConvertType
-//line sql.y:7276
+//line sql.y:7278
 		{
 			yyLOCAL = &ConvertType{Type: string(yyDollar[1].str)}
 		}
@@ -21308,7 +21311,7 @@ yydefault:
 	case 1475:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL *ConvertType
-//line sql.y:7280
+//line sql.y:7282
 		{
 			yyLOCAL = &ConvertType{Type: string(yyDollar[1].str)}
 		}
@@ -21316,7 +21319,7 @@ yydefault:
 	case 1476:
 		yyDollar = yyS[yypt-0 : yypt+1]
 		var yyLOCAL bool
-//line sql.y:7286
+//line sql.y:7288
 		{
 			yyLOCAL = false
 		}
@@ -21324,7 +21327,7 @@ yydefault:
 	case 1477:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL bool
-//line sql.y:7290
+//line sql.y:7292
 		{
 			yyLOCAL = true
 		}
@@ -21332,7 +21335,7 @@ yydefault:
 	case 1478:
 		yyDollar = yyS[yypt-0 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:7295
+//line sql.y:7297
 		{
 			yyLOCAL = nil
 		}
@@ -21340,34 +21343,34 @@ yydefault:
 	case 1479:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:7299
+//line sql.y:7301
 		{
 			yyLOCAL = yyDollar[1].exprUnion()
 		}
 		yyVAL.union = yyLOCAL
 	case 1480:
 		yyDollar = yyS[yypt-0 : yypt+1]
-//line sql.y:7304
+//line sql.y:7306
 		{
 			yyVAL.str = string("")
 		}
 	case 1481:
 		yyDollar = yyS[yypt-2 : yypt+1]
-//line sql.y:7308
+//line sql.y:7310
 		{
 			yyVAL.str = encodeSQLString(yyDollar[2].str)
 		}
 	case 1482:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL []*When
-//line sql.y:7314
+//line sql.y:7316
 		{
 			yyLOCAL = []*When{yyDollar[1].whenUnion()}
 		}
 		yyVAL.union = yyLOCAL
 	case 1483:
 		yyDollar = yyS[yypt-2 : yypt+1]
-//line sql.y:7318
+//line sql.y:7320
 		{
 			yySLICE := (*[]*When)(yyIaddr(yyVAL.union))
 			*yySLICE = append(*yySLICE, yyDollar[2].whenUnion())
@@ -21375,7 +21378,7 @@ yydefault:
 	case 1484:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL *When
-//line sql.y:7324
+//line sql.y:7326
 		{
 			yyLOCAL = &When{Cond: yyDollar[2].exprUnion(), Val: yyDollar[4].exprUnion()}
 		}
@@ -21383,7 +21386,7 @@ yydefault:
 	case 1485:
 		yyDollar = yyS[yypt-0 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:7329
+//line sql.y:7331
 		{
 			yyLOCAL = nil
 		}
@@ -21391,7 +21394,7 @@ yydefault:
 	case 1486:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:7333
+//line sql.y:7335
 		{
 			yyLOCAL = yyDollar[2].exprUnion()
 		}
@@ -21399,7 +21402,7 @@ yydefault:
 	case 1487:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL *ColName
-//line sql.y:7339
+//line sql.y:7341
 		{
 			yyLOCAL = &ColName{Name: yyDollar[1].identifierCI}
 		}
@@ -21407,7 +21410,7 @@ yydefault:
 	case 1488:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL *ColName
-//line sql.y:7343
+//line sql.y:7345
 		{
 			yyLOCAL = &ColName{Name: NewIdentifierCI(string(yyDollar[1].str))}
 		}
@@ -21415,7 +21418,7 @@ yydefault:
 	case 1489:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL *ColName
-//line sql.y:7347
+//line sql.y:7349
 		{
 			yyLOCAL = &ColName{Qualifier: TableName{Name: yyDollar[1].identifierCS}, Name: yyDollar[3].identifierCI}
 		}
@@ -21423,7 +21426,7 @@ yydefault:
 	case 1490:
 		yyDollar = yyS[yypt-5 : yypt+1]
 		var yyLOCAL *ColName
-//line sql.y:7351
+//line sql.y:7353
 		{
 			yyLOCAL = &ColName{Qualifier: TableName{Qualifier: yyDollar[1].identifierCS, Name: yyDollar[3].identifierCS}, Name: yyDollar[5].identifierCI}
 		}
@@ -21431,7 +21434,7 @@ yydefault:
 	case 1491:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:7357
+//line sql.y:7359
 		{
 			yyLOCAL = yyDollar[1].colNameUnion()
 		}
@@ -21439,7 +21442,7 @@ yydefault:
 	case 1492:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:7361
+//line sql.y:7363
 		{
 			yyLOCAL = &Offset{V: convertStringToInt(yyDollar[1].str)}
 		}
@@ -21447,7 +21450,7 @@ yydefault:
 	case 1493:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:7367
+//line sql.y:7369
 		{
 			// TODO(sougou): Deprecate this construct.
 			if yyDollar[1].identifierCI.Lowered() != "value" {
@@ -21460,7 +21463,7 @@ yydefault:
 	case 1494:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:7376
+//line sql.y:7378
 		{
 			yyLOCAL = NewIntLiteral(yyDollar[1].str)
 		}
@@ -21468,7 +21471,7 @@ yydefault:
 	case 1495:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:7380
+//line sql.y:7382
 		{
 			yyLOCAL = parseBindVariable(yylex, yyDollar[1].str[1:])
 		}
@@ -21476,7 +21479,7 @@ yydefault:
 	case 1496:
 		yyDollar = yyS[yypt-0 : yypt+1]
 		var yyLOCAL *GroupBy
-//line sql.y:7385
+//line sql.y:7387
 		{
 			yyLOCAL = nil
 		}
@@ -21484,7 +21487,7 @@ yydefault:
 	case 1497:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL *GroupBy
-//line sql.y:7389
+//line sql.y:7391
 		{
 			yyLOCAL = &GroupBy{Exprs: yyDollar[3].exprsUnion(), WithRollup: yyDollar[4].booleanUnion()}
 		}
@@ -21492,7 +21495,7 @@ yydefault:
 	case 1498:
 		yyDollar = yyS[yypt-0 : yypt+1]
 		var yyLOCAL bool
-//line sql.y:7394
+//line sql.y:7396
 		{
 			yyLOCAL = false
 		}
@@ -21500,7 +21503,7 @@ yydefault:
 	case 1499:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL bool
-//line sql.y:7398
+//line sql.y:7400
 		{
 			yyLOCAL = true
 		}
@@ -21508,7 +21511,7 @@ yydefault:
 	case 1500:
 		yyDollar = yyS[yypt-0 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:7404
+//line sql.y:7406
 		{
 			yyLOCAL = nil
 		}
@@ -21516,7 +21519,7 @@ yydefault:
 	case 1501:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:7408
+//line sql.y:7410
 		{
 			yyLOCAL = yyDollar[2].exprUnion()
 		}
@@ -21524,7 +21527,7 @@ yydefault:
 	case 1502:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL *NamedWindow
-//line sql.y:7414
+//line sql.y:7416
 		{
 			yyLOCAL = &NamedWindow{yyDollar[2].windowDefinitionsUnion()}
 		}
@@ -21532,14 +21535,14 @@ yydefault:
 	case 1503:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL NamedWindows
-//line sql.y:7420
+//line sql.y:7422
 		{
 			yyLOCAL = NamedWindows{yyDollar[1].namedWindowUnion()}
 		}
 		yyVAL.union = yyLOCAL
 	case 1504:
 		yyDollar = yyS[yypt-3 : yypt+1]
-//line sql.y:7424
+//line sql.y:7426
 		{
 			yySLICE := (*NamedWindows)(yyIaddr(yyVAL.union))
 			*yySLICE = append(*yySLICE, yyDollar[3].namedWindowUnion())
@@ -21547,7 +21550,7 @@ yydefault:
 	case 1505:
 		yyDollar = yyS[yypt-0 : yypt+1]
 		var yyLOCAL NamedWindows
-//line sql.y:7429
+//line sql.y:7431
 		{
 			yyLOCAL = nil
 		}
@@ -21555,7 +21558,7 @@ yydefault:
 	case 1506:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL NamedWindows
-//line sql.y:7433
+//line sql.y:7435
 		{
 			yyLOCAL = yyDollar[1].namedWindowsUnion()
 		}
@@ -21563,7 +21566,7 @@ yydefault:
 	case 1507:
 		yyDollar = yyS[yypt-0 : yypt+1]
 		var yyLOCAL OrderBy
-//line sql.y:7438
+//line sql.y:7440
 		{
 			yyLOCAL = nil
 		}
@@ -21571,7 +21574,7 @@ yydefault:
 	case 1508:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL OrderBy
-//line sql.y:7442
+//line sql.y:7444
 		{
 			yyLOCAL = yyDollar[1].orderByUnion()
 		}
@@ -21579,7 +21582,7 @@ yydefault:
 	case 1509:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL OrderBy
-//line sql.y:7448
+//line sql.y:7450
 		{
 			yyLOCAL = yyDollar[3].orderByUnion()
 		}
@@ -21587,14 +21590,14 @@ yydefault:
 	case 1510:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL OrderBy
-//line sql.y:7454
+//line sql.y:7456
 		{
 			yyLOCAL = OrderBy{yyDollar[1].orderUnion()}
 		}
 		yyVAL.union = yyLOCAL
 	case 1511:
 		yyDollar = yyS[yypt-3 : yypt+1]
-//line sql.y:7458
+//line sql.y:7460
 		{
 			yySLICE := (*OrderBy)(yyIaddr(yyVAL.union))
 			*yySLICE = append(*yySLICE, yyDollar[3].orderUnion())
@@ -21602,7 +21605,7 @@ yydefault:
 	case 1512:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL *Order
-//line sql.y:7464
+//line sql.y:7466
 		{
 			yyLOCAL = &Order{Expr: yyDollar[1].exprUnion(), Direction: yyDollar[2].orderDirectionUnion()}
 		}
@@ -21610,7 +21613,7 @@ yydefault:
 	case 1513:
 		yyDollar = yyS[yypt-0 : yypt+1]
 		var yyLOCAL OrderDirection
-//line sql.y:7469
+//line sql.y:7471
 		{
 			yyLOCAL = AscOrder
 		}
@@ -21618,7 +21621,7 @@ yydefault:
 	case 1514:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL OrderDirection
-//line sql.y:7473
+//line sql.y:7475
 		{
 			yyLOCAL = AscOrder
 		}
@@ -21626,7 +21629,7 @@ yydefault:
 	case 1515:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL OrderDirection
-//line sql.y:7477
+//line sql.y:7479
 		{
 			yyLOCAL = DescOrder
 		}
@@ -21634,7 +21637,7 @@ yydefault:
 	case 1516:
 		yyDollar = yyS[yypt-0 : yypt+1]
 		var yyLOCAL *Limit
-//line sql.y:7482
+//line sql.y:7484
 		{
 			yyLOCAL = nil
 		}
@@ -21642,7 +21645,7 @@ yydefault:
 	case 1517:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL *Limit
-//line sql.y:7486
+//line sql.y:7488
 		{
 			yyLOCAL = yyDollar[1].limitUnion()
 		}
@@ -21650,7 +21653,7 @@ yydefault:
 	case 1518:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL *Limit
-//line sql.y:7492
+//line sql.y:7494
 		{
 			yyLOCAL = &Limit{Rowcount: yyDollar[2].exprUnion()}
 		}
@@ -21658,7 +21661,7 @@ yydefault:
 	case 1519:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL *Limit
-//line sql.y:7496
+//line sql.y:7498
 		{
 			yyLOCAL = &Limit{Offset: yyDollar[2].exprUnion(), Rowcount: yyDollar[4].exprUnion()}
 		}
@@ -21666,7 +21669,7 @@ yydefault:
 	case 1520:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL *Limit
-//line sql.y:7500
+//line sql.y:7502
 		{
 			yyLOCAL = &Limit{Offset: yyDollar[4].exprUnion(), Rowcount: yyDollar[2].exprUnion()}
 		}
@@ -21674,7 +21677,7 @@ yydefault:
 	case 1521:
 		yyDollar = yyS[yypt-0 : yypt+1]
 		var yyLOCAL []AlterOption
-//line sql.y:7505
+//line sql.y:7507
 		{
 			yyLOCAL = nil
 		}
@@ -21682,7 +21685,7 @@ yydefault:
 	case 1522:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL []AlterOption
-//line sql.y:7509
+//line sql.y:7511
 		{
 			yyLOCAL = []AlterOption{yyDollar[1].alterOptionUnion(), yyDollar[2].alterOptionUnion()}
 		}
@@ -21690,7 +21693,7 @@ yydefault:
 	case 1523:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL []AlterOption
-//line sql.y:7513
+//line sql.y:7515
 		{
 			yyLOCAL = []AlterOption{yyDollar[1].alterOptionUnion(), yyDollar[2].alterOptionUnion()}
 		}
@@ -21698,7 +21701,7 @@ yydefault:
 	case 1524:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL []AlterOption
-//line sql.y:7517
+//line sql.y:7519
 		{
 			yyLOCAL = []AlterOption{yyDollar[1].alterOptionUnion()}
 		}
@@ -21706,7 +21709,7 @@ yydefault:
 	case 1525:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL []AlterOption
-//line sql.y:7521
+//line sql.y:7523
 		{
 			yyLOCAL = []AlterOption{yyDollar[1].alterOptionUnion()}
 		}
@@ -21714,7 +21717,7 @@ yydefault:
 	case 1526:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL AlterOption
-//line sql.y:7528
+//line sql.y:7530
 		{
 			yyLOCAL = &LockOption{Type: DefaultType}
 		}
@@ -21722,7 +21725,7 @@ yydefault:
 	case 1527:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL AlterOption
-//line sql.y:7532
+//line sql.y:7534
 		{
 			yyLOCAL = &LockOption{Type: NoneType}
 		}
@@ -21730,7 +21733,7 @@ yydefault:
 	case 1528:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL AlterOption
-//line sql.y:7536
+//line sql.y:7538
 		{
 			yyLOCAL = &LockOption{Type: SharedType}
 		}
@@ -21738,7 +21741,7 @@ yydefault:
 	case 1529:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL AlterOption
-//line sql.y:7540
+//line sql.y:7542
 		{
 			yyLOCAL = &LockOption{Type: ExclusiveType}
 		}
@@ -21746,7 +21749,7 @@ yydefault:
 	case 1530:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL AlterOption
-//line sql.y:7546
+//line sql.y:7548
 		{
 			yyLOCAL = AlgorithmValue(yyDollar[3].str)
 		}
@@ -21754,7 +21757,7 @@ yydefault:
 	case 1531:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL AlterOption
-//line sql.y:7550
+//line sql.y:7552
 		{
 			yyLOCAL = AlgorithmValue(yyDollar[3].str)
 		}
@@ -21762,7 +21765,7 @@ yydefault:
 	case 1532:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL AlterOption
-//line sql.y:7554
+//line sql.y:7556
 		{
 			yyLOCAL = AlgorithmValue(yyDollar[3].str)
 		}
@@ -21770,93 +21773,93 @@ yydefault:
 	case 1533:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL AlterOption
-//line sql.y:7558
+//line sql.y:7560
 		{
 			yyLOCAL = AlgorithmValue(yyDollar[3].str)
 		}
 		yyVAL.union = yyLOCAL
 	case 1534:
 		yyDollar = yyS[yypt-0 : yypt+1]
-//line sql.y:7563
+//line sql.y:7565
 		{
 			yyVAL.str = ""
 		}
 	case 1535:
 		yyDollar = yyS[yypt-3 : yypt+1]
-//line sql.y:7567
+//line sql.y:7569
 		{
 			yyVAL.str = string(yyDollar[3].str)
 		}
 	case 1536:
 		yyDollar = yyS[yypt-3 : yypt+1]
-//line sql.y:7571
+//line sql.y:7573
 		{
 			yyVAL.str = string(yyDollar[3].str)
 		}
 	case 1537:
 		yyDollar = yyS[yypt-3 : yypt+1]
-//line sql.y:7575
+//line sql.y:7577
 		{
 			yyVAL.str = string(yyDollar[3].str)
 		}
 	case 1538:
 		yyDollar = yyS[yypt-0 : yypt+1]
-//line sql.y:7580
+//line sql.y:7582
 		{
 			yyVAL.str = ""
 		}
 	case 1539:
 		yyDollar = yyS[yypt-3 : yypt+1]
-//line sql.y:7584
+//line sql.y:7586
 		{
 			yyVAL.str = yyDollar[3].str
 		}
 	case 1540:
 		yyDollar = yyS[yypt-1 : yypt+1]
-//line sql.y:7590
+//line sql.y:7592
 		{
 			yyVAL.str = string(yyDollar[1].str)
 		}
 	case 1541:
 		yyDollar = yyS[yypt-1 : yypt+1]
-//line sql.y:7594
+//line sql.y:7596
 		{
 			yyVAL.str = string(yyDollar[1].str)
 		}
 	case 1542:
 		yyDollar = yyS[yypt-0 : yypt+1]
-//line sql.y:7599
+//line sql.y:7601
 		{
 			yyVAL.str = ""
 		}
 	case 1543:
 		yyDollar = yyS[yypt-4 : yypt+1]
-//line sql.y:7603
+//line sql.y:7605
 		{
 			yyVAL.str = yyDollar[2].str
 		}
 	case 1544:
 		yyDollar = yyS[yypt-0 : yypt+1]
-//line sql.y:7608
+//line sql.y:7610
 		{
 			yyVAL.str = "cascaded"
 		}
 	case 1545:
 		yyDollar = yyS[yypt-1 : yypt+1]
-//line sql.y:7612
+//line sql.y:7614
 		{
 			yyVAL.str = string(yyDollar[1].str)
 		}
 	case 1546:
 		yyDollar = yyS[yypt-1 : yypt+1]
-//line sql.y:7616
+//line sql.y:7618
 		{
 			yyVAL.str = string(yyDollar[1].str)
 		}
 	case 1547:
 		yyDollar = yyS[yypt-0 : yypt+1]
 		var yyLOCAL *Definer
-//line sql.y:7621
+//line sql.y:7623
 		{
 			yyLOCAL = nil
 		}
@@ -21864,7 +21867,7 @@ yydefault:
 	case 1548:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL *Definer
-//line sql.y:7625
+//line sql.y:7627
 		{
 			yyLOCAL = yyDollar[3].definerUnion()
 		}
@@ -21872,7 +21875,7 @@ yydefault:
 	case 1549:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL *Definer
-//line sql.y:7631
+//line sql.y:7633
 		{
 			yyLOCAL = &Definer{
 				Name: string(yyDollar[1].str),
@@ -21882,7 +21885,7 @@ yydefault:
 	case 1550:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL *Definer
-//line sql.y:7637
+//line sql.y:7639
 		{
 			yyLOCAL = &Definer{
 				Name: string(yyDollar[1].str),
@@ -21892,7 +21895,7 @@ yydefault:
 	case 1551:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL *Definer
-//line sql.y:7643
+//line sql.y:7645
 		{
 			yyLOCAL = &Definer{
 				Name:    yyDollar[1].str,
@@ -21902,32 +21905,32 @@ yydefault:
 		yyVAL.union = yyLOCAL
 	case 1552:
 		yyDollar = yyS[yypt-1 : yypt+1]
-//line sql.y:7652
+//line sql.y:7654
 		{
 			yyVAL.str = encodeSQLString(yyDollar[1].str)
 		}
 	case 1553:
 		yyDollar = yyS[yypt-1 : yypt+1]
-//line sql.y:7656
+//line sql.y:7658
 		{
 			yyVAL.str = formatIdentifier(yyDollar[1].str)
 		}
 	case 1554:
 		yyDollar = yyS[yypt-0 : yypt+1]
-//line sql.y:7661
+//line sql.y:7663
 		{
 			yyVAL.str = ""
 		}
 	case 1555:
 		yyDollar = yyS[yypt-1 : yypt+1]
-//line sql.y:7665
+//line sql.y:7667
 		{
 			yyVAL.str = formatAddress(yyDollar[1].str)
 		}
 	case 1556:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL Lock
-//line sql.y:7671
+//line sql.y:7673
 		{
 			yyLOCAL = ForUpdateLock
 		}
@@ -21935,7 +21938,7 @@ yydefault:
 	case 1557:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL Lock
-//line sql.y:7675
+//line sql.y:7677
 		{
 			yyLOCAL = ForUpdateLockNoWait
 		}
@@ -21943,7 +21946,7 @@ yydefault:
 	case 1558:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Lock
-//line sql.y:7679
+//line sql.y:7681
 		{
 			yyLOCAL = ForUpdateLockSkipLocked
 		}
@@ -21951,7 +21954,7 @@ yydefault:
 	case 1559:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL Lock
-//line sql.y:7683
+//line sql.y:7685
 		{
 			yyLOCAL = ForShareLock
 		}
@@ -21959,7 +21962,7 @@ yydefault:
 	case 1560:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL Lock
-//line sql.y:7687
+//line sql.y:7689
 		{
 			yyLOCAL = ForShareLockNoWait
 		}
@@ -21967,7 +21970,7 @@ yydefault:
 	case 1561:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Lock
-//line sql.y:7691
+//line sql.y:7693
 		{
 			yyLOCAL = ForShareLockSkipLocked
 		}
@@ -21975,7 +21978,7 @@ yydefault:
 	case 1562:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL Lock
-//line sql.y:7695
+//line sql.y:7697
 		{
 			yyLOCAL = ShareModeLock
 		}
@@ -21983,7 +21986,7 @@ yydefault:
 	case 1563:
 		yyDollar = yyS[yypt-9 : yypt+1]
 		var yyLOCAL *SelectInto
-//line sql.y:7701
+//line sql.y:7703
 		{
 			yyLOCAL = &SelectInto{Type: IntoOutfileS3, FileName: encodeSQLString(yyDollar[4].str), Charset: yyDollar[5].columnCharset, FormatOption: yyDollar[6].str, ExportOption: yyDollar[7].str, Manifest: yyDollar[8].str, Overwrite: yyDollar[9].str}
 		}
@@ -21991,7 +21994,7 @@ yydefault:
 	case 1564:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL *SelectInto
-//line sql.y:7705
+//line sql.y:7707
 		{
 			yyLOCAL = &SelectInto{Type: IntoDumpfile, FileName: encodeSQLString(yyDollar[3].str), Charset: ColumnCharset{}, FormatOption: "", ExportOption: "", Manifest: "", Overwrite: ""}
 		}
@@ -21999,177 +22002,177 @@ yydefault:
 	case 1565:
 		yyDollar = yyS[yypt-5 : yypt+1]
 		var yyLOCAL *SelectInto
-//line sql.y:7709
+//line sql.y:7711
 		{
 			yyLOCAL = &SelectInto{Type: IntoOutfile, FileName: encodeSQLString(yyDollar[3].str), Charset: yyDollar[4].columnCharset, FormatOption: "", ExportOption: yyDollar[5].str, Manifest: "", Overwrite: ""}
 		}
 		yyVAL.union = yyLOCAL
 	case 1566:
 		yyDollar = yyS[yypt-0 : yypt+1]
-//line sql.y:7714
+//line sql.y:7716
 		{
 			yyVAL.str = ""
 		}
 	case 1567:
 		yyDollar = yyS[yypt-3 : yypt+1]
-//line sql.y:7718
+//line sql.y:7720
 		{
 			yyVAL.str = " format csv" + yyDollar[3].str
 		}
 	case 1568:
 		yyDollar = yyS[yypt-3 : yypt+1]
-//line sql.y:7722
+//line sql.y:7724
 		{
 			yyVAL.str = " format text" + yyDollar[3].str
 		}
 	case 1569:
 		yyDollar = yyS[yypt-0 : yypt+1]
-//line sql.y:7727
+//line sql.y:7729
 		{
 			yyVAL.str = ""
 		}
 	case 1570:
 		yyDollar = yyS[yypt-1 : yypt+1]
-//line sql.y:7731
+//line sql.y:7733
 		{
 			yyVAL.str = " header"
 		}
 	case 1571:
 		yyDollar = yyS[yypt-0 : yypt+1]
-//line sql.y:7736
+//line sql.y:7738
 		{
 			yyVAL.str = ""
 		}
 	case 1572:
 		yyDollar = yyS[yypt-2 : yypt+1]
-//line sql.y:7740
+//line sql.y:7742
 		{
 			yyVAL.str = " manifest on"
 		}
 	case 1573:
 		yyDollar = yyS[yypt-2 : yypt+1]
-//line sql.y:7744
+//line sql.y:7746
 		{
 			yyVAL.str = " manifest off"
 		}
 	case 1574:
 		yyDollar = yyS[yypt-0 : yypt+1]
-//line sql.y:7749
+//line sql.y:7751
 		{
 			yyVAL.str = ""
 		}
 	case 1575:
 		yyDollar = yyS[yypt-2 : yypt+1]
-//line sql.y:7753
+//line sql.y:7755
 		{
 			yyVAL.str = " overwrite on"
 		}
 	case 1576:
 		yyDollar = yyS[yypt-2 : yypt+1]
-//line sql.y:7757
+//line sql.y:7759
 		{
 			yyVAL.str = " overwrite off"
 		}
 	case 1577:
 		yyDollar = yyS[yypt-2 : yypt+1]
-//line sql.y:7763
+//line sql.y:7765
 		{
 			yyVAL.str = yyDollar[1].str + yyDollar[2].str
 		}
 	case 1578:
 		yyDollar = yyS[yypt-0 : yypt+1]
-//line sql.y:7768
+//line sql.y:7770
 		{
 			yyVAL.str = ""
 		}
 	case 1579:
 		yyDollar = yyS[yypt-2 : yypt+1]
-//line sql.y:7772
+//line sql.y:7774
 		{
 			yyVAL.str = " lines" + yyDollar[2].str
 		}
 	case 1580:
 		yyDollar = yyS[yypt-1 : yypt+1]
-//line sql.y:7778
+//line sql.y:7780
 		{
 			yyVAL.str = yyDollar[1].str
 		}
 	case 1581:
 		yyDollar = yyS[yypt-2 : yypt+1]
-//line sql.y:7782
+//line sql.y:7784
 		{
 			yyVAL.str = yyDollar[1].str + yyDollar[2].str
 		}
 	case 1582:
 		yyDollar = yyS[yypt-3 : yypt+1]
-//line sql.y:7788
+//line sql.y:7790
 		{
 			yyVAL.str = " starting by " + encodeSQLString(yyDollar[3].str)
 		}
 	case 1583:
 		yyDollar = yyS[yypt-3 : yypt+1]
-//line sql.y:7792
+//line sql.y:7794
 		{
 			yyVAL.str = " terminated by " + encodeSQLString(yyDollar[3].str)
 		}
 	case 1584:
 		yyDollar = yyS[yypt-0 : yypt+1]
-//line sql.y:7797
+//line sql.y:7799
 		{
 			yyVAL.str = ""
 		}
 	case 1585:
 		yyDollar = yyS[yypt-2 : yypt+1]
-//line sql.y:7801
+//line sql.y:7803
 		{
 			yyVAL.str = " " + yyDollar[1].str + yyDollar[2].str
 		}
 	case 1586:
 		yyDollar = yyS[yypt-1 : yypt+1]
-//line sql.y:7807
+//line sql.y:7809
 		{
 			yyVAL.str = yyDollar[1].str
 		}
 	case 1587:
 		yyDollar = yyS[yypt-2 : yypt+1]
-//line sql.y:7811
+//line sql.y:7813
 		{
 			yyVAL.str = yyDollar[1].str + yyDollar[2].str
 		}
 	case 1588:
 		yyDollar = yyS[yypt-3 : yypt+1]
-//line sql.y:7817
+//line sql.y:7819
 		{
 			yyVAL.str = " terminated by " + encodeSQLString(yyDollar[3].str)
 		}
 	case 1589:
 		yyDollar = yyS[yypt-4 : yypt+1]
-//line sql.y:7821
+//line sql.y:7823
 		{
 			yyVAL.str = yyDollar[1].str + " enclosed by " + encodeSQLString(yyDollar[4].str)
 		}
 	case 1590:
 		yyDollar = yyS[yypt-3 : yypt+1]
-//line sql.y:7825
+//line sql.y:7827
 		{
 			yyVAL.str = " escaped by " + encodeSQLString(yyDollar[3].str)
 		}
 	case 1591:
 		yyDollar = yyS[yypt-0 : yypt+1]
-//line sql.y:7830
+//line sql.y:7832
 		{
 			yyVAL.str = ""
 		}
 	case 1592:
 		yyDollar = yyS[yypt-1 : yypt+1]
-//line sql.y:7834
+//line sql.y:7836
 		{
 			yyVAL.str = " optionally"
 		}
 	case 1593:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL *Insert
-//line sql.y:7847
+//line sql.y:7849
 		{
 			yyLOCAL = &Insert{Rows: yyDollar[2].valuesUnion(), RowAlias: yyDollar[3].rowAliasUnion()}
 		}
@@ -22177,7 +22180,7 @@ yydefault:
 	case 1594:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL *Insert
-//line sql.y:7851
+//line sql.y:7853
 		{
 			yyLOCAL = &Insert{Rows: yyDollar[1].tableStmtUnion()}
 		}
@@ -22185,7 +22188,7 @@ yydefault:
 	case 1595:
 		yyDollar = yyS[yypt-6 : yypt+1]
 		var yyLOCAL *Insert
-//line sql.y:7855
+//line sql.y:7857
 		{
 			yyLOCAL = &Insert{Columns: yyDollar[2].columnsUnion(), Rows: yyDollar[5].valuesUnion(), RowAlias: yyDollar[6].rowAliasUnion()}
 		}
@@ -22193,7 +22196,7 @@ yydefault:
 	case 1596:
 		yyDollar = yyS[yypt-5 : yypt+1]
 		var yyLOCAL *Insert
-//line sql.y:7859
+//line sql.y:7861
 		{
 			yyLOCAL = &Insert{Columns: []IdentifierCI{}, Rows: yyDollar[4].valuesUnion(), RowAlias: yyDollar[5].rowAliasUnion()}
 		}
@@ -22201,7 +22204,7 @@ yydefault:
 	case 1597:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL *Insert
-//line sql.y:7863
+//line sql.y:7865
 		{
 			yyLOCAL = &Insert{Columns: yyDollar[2].columnsUnion(), Rows: yyDollar[4].tableStmtUnion()}
 		}
@@ -22209,7 +22212,7 @@ yydefault:
 	case 1598:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL Columns
-//line sql.y:7869
+//line sql.y:7871
 		{
 			yyLOCAL = Columns{yyDollar[1].identifierCI}
 		}
@@ -22217,21 +22220,21 @@ yydefault:
 	case 1599:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL Columns
-//line sql.y:7873
+//line sql.y:7875
 		{
 			yyLOCAL = Columns{yyDollar[3].identifierCI}
 		}
 		yyVAL.union = yyLOCAL
 	case 1600:
 		yyDollar = yyS[yypt-3 : yypt+1]
-//line sql.y:7877
+//line sql.y:7879
 		{
 			yySLICE := (*Columns)(yyIaddr(yyVAL.union))
 			*yySLICE = append(*yySLICE, yyDollar[3].identifierCI)
 		}
 	case 1601:
 		yyDollar = yyS[yypt-5 : yypt+1]
-//line sql.y:7881
+//line sql.y:7883
 		{
 			yySLICE := (*Columns)(yyIaddr(yyVAL.union))
 			*yySLICE = append(*yySLICE, yyDollar[5].identifierCI)
@@ -22239,7 +22242,7 @@ yydefault:
 	case 1602:
 		yyDollar = yyS[yypt-0 : yypt+1]
 		var yyLOCAL *RowAlias
-//line sql.y:7886
+//line sql.y:7888
 		{
 			yyLOCAL = nil
 		}
@@ -22247,7 +22250,7 @@ yydefault:
 	case 1603:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL *RowAlias
-//line sql.y:7890
+//line sql.y:7892
 		{
 			yyLOCAL = &RowAlias{TableName: yyDollar[2].identifierCS}
 		}
@@ -22255,7 +22258,7 @@ yydefault:
 	case 1604:
 		yyDollar = yyS[yypt-5 : yypt+1]
 		var yyLOCAL *RowAlias
-//line sql.y:7894
+//line sql.y:7896
 		{
 			yyLOCAL = &RowAlias{TableName: yyDollar[2].identifierCS, Columns: yyDollar[4].columnsUnion()}
 		}
@@ -22263,7 +22266,7 @@ yydefault:
 	case 1605:
 		yyDollar = yyS[yypt-0 : yypt+1]
 		var yyLOCAL UpdateExprs
-//line sql.y:7899
+//line sql.y:7901
 		{
 			yyLOCAL = nil
 		}
@@ -22271,7 +22274,7 @@ yydefault:
 	case 1606:
 		yyDollar = yyS[yypt-5 : yypt+1]
 		var yyLOCAL UpdateExprs
-//line sql.y:7903
+//line sql.y:7905
 		{
 			yyLOCAL = yyDollar[5].updateExprsUnion()
 		}
@@ -22279,14 +22282,14 @@ yydefault:
 	case 1607:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL Values
-//line sql.y:7909
+//line sql.y:7911
 		{
 			yyLOCAL = Values{yyDollar[1].valTupleUnion()}
 		}
 		yyVAL.union = yyLOCAL
 	case 1608:
 		yyDollar = yyS[yypt-3 : yypt+1]
-//line sql.y:7913
+//line sql.y:7915
 		{
 			yySLICE := (*Values)(yyIaddr(yyVAL.union))
 			*yySLICE = append(*yySLICE, yyDollar[3].valTupleUnion())
@@ -22294,14 +22297,14 @@ yydefault:
 	case 1609:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL Values
-//line sql.y:7919
+//line sql.y:7921
 		{
 			yyLOCAL = Values{yyDollar[1].valTupleUnion()}
 		}
 		yyVAL.union = yyLOCAL
 	case 1610:
 		yyDollar = yyS[yypt-3 : yypt+1]
-//line sql.y:7923
+//line sql.y:7925
 		{
 			yySLICE := (*Values)(yyIaddr(yyVAL.union))
 			*yySLICE = append(*yySLICE, yyDollar[3].valTupleUnion())
@@ -22309,7 +22312,7 @@ yydefault:
 	case 1611:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL ValTuple
-//line sql.y:7929
+//line sql.y:7931
 		{
 			yyLOCAL = yyDollar[1].valTupleUnion()
 		}
@@ -22317,7 +22320,7 @@ yydefault:
 	case 1612:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL ValTuple
-//line sql.y:7933
+//line sql.y:7935
 		{
 			yyLOCAL = ValTuple{}
 		}
@@ -22325,7 +22328,7 @@ yydefault:
 	case 1613:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL ValTuple
-//line sql.y:7939
+//line sql.y:7941
 		{
 			yyLOCAL = yyDollar[1].valTupleUnion()
 		}
@@ -22333,7 +22336,7 @@ yydefault:
 	case 1614:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL ValTuple
-//line sql.y:7943
+//line sql.y:7945
 		{
 			yyLOCAL = ValTuple{}
 		}
@@ -22341,7 +22344,7 @@ yydefault:
 	case 1615:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL ValTuple
-//line sql.y:7949
+//line sql.y:7951
 		{
 			yyLOCAL = ValTuple(yyDollar[2].exprsUnion())
 		}
@@ -22349,7 +22352,7 @@ yydefault:
 	case 1616:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		var yyLOCAL ValTuple
-//line sql.y:7955
+//line sql.y:7957
 		{
 			yyLOCAL = ValTuple(yyDollar[3].exprsUnion())
 		}
@@ -22357,7 +22360,7 @@ yydefault:
 	case 1619:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:7965
+//line sql.y:7967
 		{
 			if len(yyDollar[1].valTupleUnion()) == 1 {
 				yyLOCAL = yyDollar[1].valTupleUnion()[0]
@@ -22369,14 +22372,14 @@ yydefault:
 	case 1620:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL UpdateExprs
-//line sql.y:7975
+//line sql.y:7977
 		{
 			yyLOCAL = UpdateExprs{yyDollar[1].updateExprUnion()}
 		}
 		yyVAL.union = yyLOCAL
 	case 1621:
 		yyDollar = yyS[yypt-3 : yypt+1]
-//line sql.y:7979
+//line sql.y:7981
 		{
 			yySLICE := (*UpdateExprs)(yyIaddr(yyVAL.union))
 			*yySLICE = append(*yySLICE, yyDollar[3].updateExprUnion())
@@ -22384,21 +22387,21 @@ yydefault:
 	case 1622:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL *UpdateExpr
-//line sql.y:7985
+//line sql.y:7987
 		{
 			yyLOCAL = &UpdateExpr{Name: yyDollar[1].colNameUnion(), Expr: yyDollar[3].exprUnion()}
 		}
 		yyVAL.union = yyLOCAL
 	case 1624:
 		yyDollar = yyS[yypt-2 : yypt+1]
-//line sql.y:7992
+//line sql.y:7994
 		{
 			yyVAL.str = "charset"
 		}
 	case 1627:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:8002
+//line sql.y:8004
 		{
 			yyLOCAL = NewStrLiteral(yyDollar[1].identifierCI.String())
 		}
@@ -22406,7 +22409,7 @@ yydefault:
 	case 1628:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:8006
+//line sql.y:8008
 		{
 			yyLOCAL = NewStrLiteral(yyDollar[1].str)
 		}
@@ -22414,7 +22417,7 @@ yydefault:
 	case 1629:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL Expr
-//line sql.y:8010
+//line sql.y:8012
 		{
 			yyLOCAL = &Default{}
 		}
@@ -22422,7 +22425,7 @@ yydefault:
 	case 1632:
 		yyDollar = yyS[yypt-0 : yypt+1]
 		var yyLOCAL bool
-//line sql.y:8019
+//line sql.y:8021
 		{
 			yyLOCAL = false
 		}
@@ -22430,7 +22433,7 @@ yydefault:
 	case 1633:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL bool
-//line sql.y:8021
+//line sql.y:8023
 		{
 			yyLOCAL = true
 		}
@@ -22438,7 +22441,7 @@ yydefault:
 	case 1634:
 		yyDollar = yyS[yypt-0 : yypt+1]
 		var yyLOCAL bool
-//line sql.y:8024
+//line sql.y:8026
 		{
 			yyLOCAL = false
 		}
@@ -22446,7 +22449,7 @@ yydefault:
 	case 1635:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL bool
-//line sql.y:8026
+//line sql.y:8028
 		{
 			yyLOCAL = true
 		}
@@ -22454,7 +22457,7 @@ yydefault:
 	case 1636:
 		yyDollar = yyS[yypt-0 : yypt+1]
 		var yyLOCAL bool
-//line sql.y:8029
+//line sql.y:8031
 		{
 			yyLOCAL = false
 		}
@@ -22462,7 +22465,7 @@ yydefault:
 	case 1637:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL bool
-//line sql.y:8031
+//line sql.y:8033
 		{
 			yyLOCAL = true
 		}
@@ -22470,7 +22473,7 @@ yydefault:
 	case 1638:
 		yyDollar = yyS[yypt-0 : yypt+1]
 		var yyLOCAL Ignore
-//line sql.y:8034
+//line sql.y:8036
 		{
 			yyLOCAL = false
 		}
@@ -22478,49 +22481,49 @@ yydefault:
 	case 1639:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL Ignore
-//line sql.y:8036
+//line sql.y:8038
 		{
 			yyLOCAL = true
 		}
 		yyVAL.union = yyLOCAL
 	case 1640:
 		yyDollar = yyS[yypt-0 : yypt+1]
-//line sql.y:8039
+//line sql.y:8041
 		{
 			yyVAL.empty = struct{}{}
 		}
 	case 1641:
 		yyDollar = yyS[yypt-1 : yypt+1]
-//line sql.y:8041
+//line sql.y:8043
 		{
 			yyVAL.empty = struct{}{}
 		}
 	case 1642:
 		yyDollar = yyS[yypt-1 : yypt+1]
-//line sql.y:8043
+//line sql.y:8045
 		{
 			yyVAL.empty = struct{}{}
 		}
 	case 1643:
 		yyDollar = yyS[yypt-5 : yypt+1]
 		var yyLOCAL Statement
-//line sql.y:8047
+//line sql.y:8049
 		{
 			yyLOCAL = &CallProc{Name: yyDollar[2].tableName, Params: yyDollar[4].exprsUnion()}
 		}
 		yyVAL.union = yyLOCAL
 	case 1644:
 		yyDollar = yyS[yypt-0 : yypt+1]
-		var yyLOCAL Exprs
-//line sql.y:8052
+		var yyLOCAL []Expr
+//line sql.y:8054
 		{
 			yyLOCAL = nil
 		}
 		yyVAL.union = yyLOCAL
 	case 1645:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		var yyLOCAL Exprs
-//line sql.y:8056
+		var yyLOCAL []Expr
+//line sql.y:8058
 		{
 			yyLOCAL = yyDollar[1].exprsUnion()
 		}
@@ -22528,7 +22531,7 @@ yydefault:
 	case 1646:
 		yyDollar = yyS[yypt-0 : yypt+1]
 		var yyLOCAL []*IndexOption
-//line sql.y:8061
+//line sql.y:8063
 		{
 			yyLOCAL = nil
 		}
@@ -22536,7 +22539,7 @@ yydefault:
 	case 1647:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL []*IndexOption
-//line sql.y:8063
+//line sql.y:8065
 		{
 			yyLOCAL = []*IndexOption{yyDollar[1].indexOptionUnion()}
 		}
@@ -22544,63 +22547,63 @@ yydefault:
 	case 1648:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		var yyLOCAL *IndexOption
-//line sql.y:8067
+//line sql.y:8069
 		{
 			yyLOCAL = &IndexOption{Name: string(yyDollar[1].str), String: string(yyDollar[2].identifierCI.String())}
 		}
 		yyVAL.union = yyLOCAL
 	case 1649:
 		yyDollar = yyS[yypt-1 : yypt+1]
-//line sql.y:8073
+//line sql.y:8075
 		{
 			yyVAL.identifierCI = yyDollar[1].identifierCI
 		}
 	case 1650:
 		yyDollar = yyS[yypt-1 : yypt+1]
-//line sql.y:8077
+//line sql.y:8079
 		{
 			yyVAL.identifierCI = NewIdentifierCI(string(yyDollar[1].str))
 		}
 	case 1652:
 		yyDollar = yyS[yypt-1 : yypt+1]
-//line sql.y:8084
+//line sql.y:8086
 		{
 			yyVAL.identifierCI = NewIdentifierCI(string(yyDollar[1].str))
 		}
 	case 1653:
 		yyDollar = yyS[yypt-1 : yypt+1]
-//line sql.y:8090
+//line sql.y:8092
 		{
 			yyVAL.identifierCS = NewIdentifierCS(string(yyDollar[1].str))
 		}
 	case 1654:
 		yyDollar = yyS[yypt-1 : yypt+1]
-//line sql.y:8094
+//line sql.y:8096
 		{
 			yyVAL.identifierCS = NewIdentifierCS(string(yyDollar[1].str))
 		}
 	case 1655:
 		yyDollar = yyS[yypt-0 : yypt+1]
-//line sql.y:8100
+//line sql.y:8102
 		{
 			yyVAL.identifierCS = NewIdentifierCS("")
 		}
 	case 1656:
 		yyDollar = yyS[yypt-1 : yypt+1]
-//line sql.y:8104
+//line sql.y:8106
 		{
 			yyVAL.identifierCS = yyDollar[1].identifierCS
 		}
 	case 1658:
 		yyDollar = yyS[yypt-1 : yypt+1]
-//line sql.y:8111
+//line sql.y:8113
 		{
 			yyVAL.identifierCS = NewIdentifierCS(string(yyDollar[1].str))
 		}
 	case 1659:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		var yyLOCAL Statement
-//line sql.y:8117
+//line sql.y:8119
 		{
 			yyLOCAL = &Kill{Type: yyDollar[2].killTypeUnion(), ProcesslistID: convertStringToUInt64(yyDollar[3].str)}
 		}
@@ -22608,7 +22611,7 @@ yydefault:
 	case 1660:
 		yyDollar = yyS[yypt-0 : yypt+1]
 		var yyLOCAL KillType
-//line sql.y:8123
+//line sql.y:8125
 		{
 			yyLOCAL = ConnectionType
 		}
@@ -22616,7 +22619,7 @@ yydefault:
 	case 1661:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL KillType
-//line sql.y:8127
+//line sql.y:8129
 		{
 			yyLOCAL = ConnectionType
 		}
@@ -22624,42 +22627,42 @@ yydefault:
 	case 1662:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		var yyLOCAL KillType
-//line sql.y:8131
+//line sql.y:8133
 		{
 			yyLOCAL = QueryType
 		}
 		yyVAL.union = yyLOCAL
 	case 2298:
 		yyDollar = yyS[yypt-1 : yypt+1]
-//line sql.y:8795
+//line sql.y:8797
 		{
 		}
 	case 2299:
 		yyDollar = yyS[yypt-1 : yypt+1]
-//line sql.y:8800
+//line sql.y:8802
 		{
 		}
 	case 2300:
 		yyDollar = yyS[yypt-0 : yypt+1]
-//line sql.y:8804
+//line sql.y:8806
 		{
 			skipToEnd(yylex)
 		}
 	case 2301:
 		yyDollar = yyS[yypt-0 : yypt+1]
-//line sql.y:8809
+//line sql.y:8811
 		{
 			skipToEnd(yylex)
 		}
 	case 2302:
 		yyDollar = yyS[yypt-1 : yypt+1]
-//line sql.y:8813
+//line sql.y:8815
 		{
 			skipToEnd(yylex)
 		}
 	case 2303:
 		yyDollar = yyS[yypt-1 : yypt+1]
-//line sql.y:8817
+//line sql.y:8819
 		{
 			skipToEnd(yylex)
 		}
diff --git a/go/vt/sqlparser/sql.y b/go/vt/sqlparser/sql.y
index f1663a9a41c..5ecdeabe108 100644
--- a/go/vt/sqlparser/sql.y
+++ b/go/vt/sqlparser/sql.y
@@ -154,14 +154,14 @@ func markBindVariable(yylex yyLexer, bvar string) {
   partitions    Partitions
   tableExprs    TableExprs
   tableNames    TableNames
-  exprs         Exprs
+  exprs         []Expr
   values        Values
   valTuple      ValTuple
   orderBy       OrderBy
   updateExprs   UpdateExprs
   setExprs      SetExprs
-  selectExprs   SelectExprs
-  tableOptions     TableOptions
+  selectExprs   *SelectExprs
+  tableOptions  TableOptions
   starExpr      StarExpr
   groupBy	*GroupBy
 
@@ -835,7 +835,7 @@ query_expression:
   }
 | SELECT comment_opt cache_opt NEXT num_val for_from table_name
   {
-    $$ = NewSelect(Comments($2), SelectExprs{&Nextval{Expr: $5}}, []string{$3}/*options*/, nil, TableExprs{&AliasedTableExpr{Expr: $7}}, nil/*where*/, nil/*groupBy*/, nil/*having*/, nil)
+    $$ = NewSelect(Comments($2), &SelectExprs{Exprs: []SelectExpr{&Nextval{Expr: $5}}}, []string{$3}/*options*/, nil, TableExprs{&AliasedTableExpr{Expr: $7}}, nil/*where*/, nil/*groupBy*/, nil/*having*/, nil)
   }
 
 query_expression_body:
@@ -4935,11 +4935,13 @@ select_option:
 select_expression_list:
   select_expression
   {
-    $$ = SelectExprs{$1}
+    $$ = &SelectExprs{Exprs: []SelectExpr{$1}}
   }
 | select_expression_list ',' select_expression
   {
-    $$ = append($$, $3)
+    res := $1
+    res.Exprs = append(res.Exprs, $3)
+    $$ = res
   }
 
 select_expression:
@@ -5966,7 +5968,7 @@ subquery:
 expression_list:
   expression
   {
-    $$ = Exprs{$1}
+    $$ = []Expr{$1}
   }
 | expression_list ',' expression
   {
diff --git a/go/vt/sqlparser/tracked_buffer.go b/go/vt/sqlparser/tracked_buffer.go
index 48efe9547af..9ef0cfd1f93 100644
--- a/go/vt/sqlparser/tracked_buffer.go
+++ b/go/vt/sqlparser/tracked_buffer.go
@@ -18,8 +18,11 @@ package sqlparser
 
 import (
 	"fmt"
+	"reflect"
 	"strconv"
 	"strings"
+
+	"vitess.io/vitess/go/slice"
 )
 
 // NodeFormatter defines the signature of a custom node formatter
@@ -174,15 +177,6 @@ func (buf *TrackedBuffer) astPrintf(currentNode SQLNode, format string, values .
 		}
 
 		switch format[i] {
-		case 'c':
-			switch v := values[fieldnum].(type) {
-			case byte:
-				buf.WriteByte(v)
-			case rune:
-				buf.WriteRune(v)
-			default:
-				panic(fmt.Sprintf("unexpected TrackedBuffer type %T", v))
-			}
 		case 's':
 			switch v := values[fieldnum].(type) {
 			case string:
@@ -240,14 +234,61 @@ func (buf *TrackedBuffer) astPrintf(currentNode SQLNode, format string, values .
 			}
 		case 'a':
 			buf.WriteArg("", values[fieldnum].(string))
+		case 'n':
+			// used for printing slices of SQLNodes
+			value := values[fieldnum]
+			buf.formatNodes(value)
 		default:
-			panic("unexpected")
+			panic("unexpected format: " + string(format[i-1:i+1]))
 		}
 		fieldnum++
 		i++
 	}
 }
 
+func (buf *TrackedBuffer) formatExprs(exprs []Expr) {
+	var prefix string
+	for _, expr := range exprs {
+		buf.WriteString(prefix)
+		buf.formatter(expr)
+		prefix = ", "
+	}
+}
+
+func (buf *TrackedBuffer) formatNodes(input any) {
+	switch nodes := input.(type) {
+	case []Expr:
+		buf.formatExprs(nodes)
+		return
+	}
+
+	// SLOW PATH! Add specific cases above to avoid reflection.
+
+	// Check if the input is a slice
+	val := reflect.ValueOf(input)
+	if val.Kind() != reflect.Slice {
+		// Handle the error or return if input is not a slice
+		panic("input is not a slice")
+	}
+
+	// Iterate over the slice elements
+	for i := 0; i < val.Len(); i++ {
+		elem := val.Index(i).Interface()
+
+		// Assert each element implements SQLNode
+		node, ok := elem.(SQLNode)
+		if !ok {
+			// Handle the error or skip non-SQLNode elements
+			panic("element does not implement SQLNode")
+		}
+
+		// Now `node` is of type SQLNode
+		// You can call methods or use it as a SQLNode here
+		buf.Myprintf("%v", node)
+	}
+
+}
+
 func getExpressionForParensEval(checkParens bool, value any) Expr {
 	if checkParens {
 		expr, isExpr := value.(Expr)
@@ -388,3 +429,20 @@ func CanonicalString(node SQLNode) string {
 	node.Format(buf)
 	return buf.String()
 }
+
+func FormatSlice[T SQLNode](buf *TrackedBuffer, valueExprs []T) {
+	for _, expr := range valueExprs {
+		buf.Myprintf("%v", expr)
+	}
+}
+
+func SliceString[T SQLNode](valueExprs []T) string {
+	return SliceStringWithSep(valueExprs, ", ")
+}
+
+func SliceStringWithSep[T SQLNode](valueExprs []T, sep string) string {
+	exprs := slice.Map(valueExprs, func(expr T) string {
+		return String(expr)
+	})
+	return strings.Join(exprs, sep)
+}
diff --git a/go/vt/vtctl/workflow/materializer.go b/go/vt/vtctl/workflow/materializer.go
index 8cd99d384ee..3e827cbdb6a 100644
--- a/go/vt/vtctl/workflow/materializer.go
+++ b/go/vt/vtctl/workflow/materializer.go
@@ -233,7 +233,7 @@ func (mz *materializer) generateBinlogSources(ctx context.Context, targetShard *
 					}
 					mappedCols = append(mappedCols, colName)
 				}
-				subExprs := make(sqlparser.Exprs, 0, len(mappedCols)+2)
+				subExprs := make([]sqlparser.Expr, 0, len(mappedCols)+2)
 				for _, mappedCol := range mappedCols {
 					subExprs = append(subExprs, mappedCol)
 				}
@@ -253,10 +253,7 @@ func (mz *materializer) generateBinlogSources(ctx context.Context, targetShard *
 
 				subExprs = append(subExprs, sqlparser.NewStrLiteral(vindexName))
 				subExprs = append(subExprs, sqlparser.NewStrLiteral(key.KeyRangeString(targetShard.KeyRange)))
-				inKeyRange := &sqlparser.FuncExpr{
-					Name:  sqlparser.NewIdentifierCI("in_keyrange"),
-					Exprs: subExprs,
-				}
+				inKeyRange := sqlparser.NewFuncExpr("in_keyrange", subExprs...)
 				addFilter(sel, inKeyRange)
 			}
 			if tenantClause != nil {
diff --git a/go/vt/vtctl/workflow/stream_migrator.go b/go/vt/vtctl/workflow/stream_migrator.go
index 7b4fe69074f..f73c3aa64de 100644
--- a/go/vt/vtctl/workflow/stream_migrator.go
+++ b/go/vt/vtctl/workflow/stream_migrator.go
@@ -1195,14 +1195,10 @@ func (sm *StreamMigrator) templatizeKeyRange(ctx context.Context, rule *binlogda
 
 	// There was no in_keyrange expression. Create a new one.
 	vtable := sm.ts.SourceKeyspaceSchema().Tables[rule.Match]
-	inkr := &sqlparser.FuncExpr{
-		Name: sqlparser.NewIdentifierCI("in_keyrange"),
-		Exprs: sqlparser.Exprs{
-			&sqlparser.ColName{Name: vtable.ColumnVindexes[0].Columns[0]},
-			sqlparser.NewStrLiteral(vtable.ColumnVindexes[0].Type),
-			sqlparser.NewStrLiteral("{{.}}"),
-		},
-	}
+	inkr := sqlparser.NewFuncExpr("in_keyrange",
+		sqlparser.NewColName(vtable.ColumnVindexes[0].Columns[0].String()),
+		sqlparser.NewStrLiteral(vtable.ColumnVindexes[0].Type),
+		sqlparser.NewStrLiteral("{{.}}"))
 	sel.AddWhere(inkr)
 	rule.Filter = sqlparser.String(statement)
 	return nil
diff --git a/go/vt/vtctl/workflow/utils.go b/go/vt/vtctl/workflow/utils.go
index 571c40b474f..2f7f51ed206 100644
--- a/go/vt/vtctl/workflow/utils.go
+++ b/go/vt/vtctl/workflow/utils.go
@@ -293,7 +293,7 @@ func forAllShards(shards []*topo.ShardInfo, f func(*topo.ShardInfo) error) error
 }
 
 func matchColInSelect(col sqlparser.IdentifierCI, sel *sqlparser.Select) (*sqlparser.ColName, error) {
-	for _, selExpr := range sel.SelectExprs {
+	for _, selExpr := range sel.GetColumns() {
 		switch selExpr := selExpr.(type) {
 		case *sqlparser.StarExpr:
 			return &sqlparser.ColName{Name: col}, nil
diff --git a/go/vt/vtexplain/vtexplain_vttablet.go b/go/vt/vtexplain/vtexplain_vttablet.go
index 94697c22e91..7918162192a 100644
--- a/go/vt/vtexplain/vtexplain_vttablet.go
+++ b/go/vt/vtexplain/vtexplain_vttablet.go
@@ -789,7 +789,7 @@ func (t *explainTablet) analyzeWhere(selStmt *sqlparser.Select, tableColumnMap m
 func (t *explainTablet) analyzeExpressions(selStmt *sqlparser.Select, tableColumnMap map[sqlparser.IdentifierCS]map[string]querypb.Type) ([]string, []querypb.Type) {
 	colNames := make([]string, 0, 4)
 	colTypes := make([]querypb.Type, 0, 4)
-	for _, node := range selStmt.SelectExprs {
+	for _, node := range selStmt.GetColumns() {
 		switch node := node.(type) {
 		case *sqlparser.AliasedExpr:
 			colNames, colTypes = inferColTypeFromExpr(node.Expr, tableColumnMap, colNames, colTypes)
diff --git a/go/vt/vtgate/engine/insert_test.go b/go/vt/vtgate/engine/insert_test.go
index 2de95e5d186..118a2ab0458 100644
--- a/go/vt/vtgate/engine/insert_test.go
+++ b/go/vt/vtgate/engine/insert_test.go
@@ -340,6 +340,9 @@ func TestInsertShardWithONDuplicateKey(t *testing.T) {
 	ks := vs.Keyspaces["sharded"]
 
 	// A single row insert should be autocommitted
+	funcExpr := sqlparser.NewFuncExpr("if", sqlparser.NewComparisonExpr(sqlparser.InOp, &sqlparser.ValuesFuncExpr{Name: sqlparser.NewColName("col")}, sqlparser.ListArg("_id_1"), nil),
+		sqlparser.NewColName("col"),
+		&sqlparser.ValuesFuncExpr{Name: sqlparser.NewColName("col")})
 	ins := newInsert(
 		InsertSharded,
 		false,
@@ -356,15 +359,8 @@ func TestInsertShardWithONDuplicateKey(t *testing.T) {
 			{&sqlparser.Argument{Name: "_id_0", Type: sqltypes.Int64}},
 		},
 		sqlparser.OnDup{
-			&sqlparser.UpdateExpr{Name: sqlparser.NewColName("suffix1"), Expr: &sqlparser.Argument{Name: "_id_0", Type: sqltypes.Int64}},
-			&sqlparser.UpdateExpr{Name: sqlparser.NewColName("suffix2"), Expr: &sqlparser.FuncExpr{
-				Name: sqlparser.NewIdentifierCI("if"),
-				Exprs: sqlparser.Exprs{
-					sqlparser.NewComparisonExpr(sqlparser.InOp, &sqlparser.ValuesFuncExpr{Name: sqlparser.NewColName("col")}, sqlparser.ListArg("_id_1"), nil),
-					sqlparser.NewColName("col"),
-					&sqlparser.ValuesFuncExpr{Name: sqlparser.NewColName("col")},
-				},
-			}}},
+			&sqlparser.UpdateExpr{Name: sqlparser.NewColName("suffix1"), Expr: sqlparser.NewTypedArgument("_id_0", sqltypes.Int64)},
+			&sqlparser.UpdateExpr{Name: sqlparser.NewColName("suffix2"), Expr: funcExpr}},
 	)
 	vc := newDMLTestVCursor("-20", "20-")
 	vc.shardForKsid = []string{"20-", "-20", "20-"}
diff --git a/go/vt/vtgate/evalengine/expr_env_test.go b/go/vt/vtgate/evalengine/expr_env_test.go
index f75cc6f1376..1206ac42f0a 100644
--- a/go/vt/vtgate/evalengine/expr_env_test.go
+++ b/go/vt/vtgate/evalengine/expr_env_test.go
@@ -42,7 +42,7 @@ func TestExpressionEnvTypeOf(t *testing.T) {
 		Type:   sqltypes.Unknown,
 		Offset: 1,
 		Original: &sqlparser.Count{
-			Args: sqlparser.Exprs{
+			Args: []sqlparser.Expr{
 				sqlparser.NewColName("l_discount"),
 			},
 		},
diff --git a/go/vt/vtgate/evalengine/integration/fuzz_test.go b/go/vt/vtgate/evalengine/integration/fuzz_test.go
index 7372d6fd731..a16f6164b35 100644
--- a/go/vt/vtgate/evalengine/integration/fuzz_test.go
+++ b/go/vt/vtgate/evalengine/integration/fuzz_test.go
@@ -137,7 +137,7 @@ func evaluateLocalEvalengine(env *evalengine.ExpressionEnv, query string, fields
 		return evalengine.EvalResult{}, err
 	}
 
-	astExpr := stmt.(*sqlparser.Select).SelectExprs[0].(*sqlparser.AliasedExpr).Expr
+	astExpr := stmt.(*sqlparser.Select).SelectExprs.Exprs[0].(*sqlparser.AliasedExpr).Expr
 	local, err := func() (expr evalengine.Expr, err error) {
 		defer func() {
 			if r := recover(); r != nil {
@@ -239,7 +239,7 @@ func TestGenerateFuzzCases(t *testing.T) {
 			t.Fatal(err)
 		}
 
-		astExpr := stmt.(*sqlparser.Select).SelectExprs[0].(*sqlparser.AliasedExpr).Expr
+		astExpr := stmt.(*sqlparser.Select).SelectExprs.Exprs[0].(*sqlparser.AliasedExpr).Expr
 
 		if fail := compareWithMySQL(astExpr); fail != nil {
 			failures = append(failures, fail)
diff --git a/go/vt/vtgate/evalengine/mysql_test.go b/go/vt/vtgate/evalengine/mysql_test.go
index 6434d7dcfbf..61bd6e3af1e 100644
--- a/go/vt/vtgate/evalengine/mysql_test.go
+++ b/go/vt/vtgate/evalengine/mysql_test.go
@@ -74,7 +74,7 @@ func convert(t *testing.T, query string, simplify bool) (Expr, error) {
 		NoConstantFolding: !simplify,
 	}
 
-	astExpr := stmt.(*sqlparser.Select).SelectExprs[0].(*sqlparser.AliasedExpr).Expr
+	astExpr := stmt.(*sqlparser.Select).SelectExprs.Exprs[0].(*sqlparser.AliasedExpr).Expr
 	converted, err := Translate(astExpr, cfg)
 	if err == nil {
 		if knownBadQuery(converted) {
diff --git a/go/vt/vtgate/evalengine/translate_test.go b/go/vt/vtgate/evalengine/translate_test.go
index 2bebae548e1..715b773398a 100644
--- a/go/vt/vtgate/evalengine/translate_test.go
+++ b/go/vt/vtgate/evalengine/translate_test.go
@@ -134,7 +134,7 @@ func TestTranslateSimplification(t *testing.T) {
 				NoCompilation:     true,
 			}
 
-			astExpr := stmt.(*sqlparser.Select).SelectExprs[0].(*sqlparser.AliasedExpr).Expr
+			astExpr := stmt.(*sqlparser.Select).SelectExprs.Exprs[0].(*sqlparser.AliasedExpr).Expr
 			converted, err := Translate(astExpr, cfg)
 			if err != nil {
 				if tc.converted.err == "" {
@@ -305,7 +305,7 @@ func TestEvaluate(t *testing.T) {
 			// Given
 			stmt, err := sqlparser.NewTestParser().Parse("select " + test.expression)
 			require.NoError(t, err)
-			astExpr := stmt.(*sqlparser.Select).SelectExprs[0].(*sqlparser.AliasedExpr).Expr
+			astExpr := stmt.(*sqlparser.Select).SelectExprs.Exprs[0].(*sqlparser.AliasedExpr).Expr
 			sqltypesExpr, err := Translate(astExpr, &Config{
 				Collation:   venv.CollationEnv().DefaultConnectionCharset(),
 				Environment: venv,
@@ -354,7 +354,7 @@ func TestEvaluateTuple(t *testing.T) {
 			// Given
 			stmt, err := sqlparser.NewTestParser().Parse("select " + test.expression)
 			require.NoError(t, err)
-			astExpr := stmt.(*sqlparser.Select).SelectExprs[0].(*sqlparser.AliasedExpr).Expr
+			astExpr := stmt.(*sqlparser.Select).SelectExprs.Exprs[0].(*sqlparser.AliasedExpr).Expr
 			sqltypesExpr, err := Translate(astExpr, &Config{
 				Collation:   venv.CollationEnv().DefaultConnectionCharset(),
 				Environment: venv,
@@ -395,7 +395,7 @@ func TestTranslationFailures(t *testing.T) {
 			// Given
 			stmt, err := sqlparser.NewTestParser().Parse("select " + testcase.expression)
 			require.NoError(t, err)
-			astExpr := stmt.(*sqlparser.Select).SelectExprs[0].(*sqlparser.AliasedExpr).Expr
+			astExpr := stmt.(*sqlparser.Select).SelectExprs.Exprs[0].(*sqlparser.AliasedExpr).Expr
 			_, err = Translate(astExpr, &Config{
 				Collation:   venv.CollationEnv().DefaultConnectionCharset(),
 				Environment: venv,
@@ -435,7 +435,7 @@ func TestCardinalityWithBindVariables(t *testing.T) {
 					return err
 				}
 
-				astExpr := stmt.(*sqlparser.Select).SelectExprs[0].(*sqlparser.AliasedExpr).Expr
+				astExpr := stmt.(*sqlparser.Select).SelectExprs.Exprs[0].(*sqlparser.AliasedExpr).Expr
 				_, err = Translate(astExpr, &Config{
 					Collation:     venv.CollationEnv().DefaultConnectionCharset(),
 					Environment:   venv,
diff --git a/go/vt/vtgate/planbuilder/ddl.go b/go/vt/vtgate/planbuilder/ddl.go
index 1359da1c0a8..112d0280813 100644
--- a/go/vt/vtgate/planbuilder/ddl.go
+++ b/go/vt/vtgate/planbuilder/ddl.go
@@ -211,7 +211,7 @@ func buildCreateViewCommon(
 	}
 
 	// because we don't trust the schema tracker to have up-to-date info, we don't want to expand any SELECT * here
-	var expressions []sqlparser.SelectExprs
+	var expressions []*sqlparser.SelectExprs
 	_ = sqlparser.VisitAllSelects(ddlSelect, func(p *sqlparser.Select, idx int) error {
 		expressions = append(expressions, sqlparser.Clone(p.SelectExprs))
 		return nil
@@ -252,7 +252,7 @@ func createViewEnabled(vschema plancontext.VSchema, reservedVars *sqlparser.Rese
 
 	// views definition with `select *` should not be expanded as schema tracker might not be up-to-date
 	// We copy the expressions and restore them after the planning context is created
-	var expressions []sqlparser.SelectExprs
+	var expressions []*sqlparser.SelectExprs
 	_ = sqlparser.VisitAllSelects(ddlSelect, func(p *sqlparser.Select, idx int) error {
 		expressions = append(expressions, sqlparser.Clone(p.SelectExprs))
 		return nil
diff --git a/go/vt/vtgate/planbuilder/expression_converter_test.go b/go/vt/vtgate/planbuilder/expression_converter_test.go
index c92cc184262..0204324e978 100644
--- a/go/vt/vtgate/planbuilder/expression_converter_test.go
+++ b/go/vt/vtgate/planbuilder/expression_converter_test.go
@@ -19,6 +19,8 @@ package planbuilder
 import (
 	"testing"
 
+	"vitess.io/vitess/go/slice"
+
 	"github.com/stretchr/testify/require"
 
 	"vitess.io/vitess/go/vt/sqlparser"
@@ -66,10 +68,8 @@ func TestConversion(t *testing.T) {
 	}
 }
 
-func extract(in sqlparser.SelectExprs) []sqlparser.Expr {
-	var result []sqlparser.Expr
-	for _, expr := range in {
-		result = append(result, expr.(*sqlparser.AliasedExpr).Expr)
-	}
-	return result
+func extract(in *sqlparser.SelectExprs) []sqlparser.Expr {
+	return slice.Map(in.Exprs, func(i sqlparser.SelectExpr) sqlparser.Expr {
+		return i.(*sqlparser.AliasedExpr).Expr
+	})
 }
diff --git a/go/vt/vtgate/planbuilder/operator_transformers.go b/go/vt/vtgate/planbuilder/operator_transformers.go
index 807912110df..1b3313b540a 100644
--- a/go/vt/vtgate/planbuilder/operator_transformers.go
+++ b/go/vt/vtgate/planbuilder/operator_transformers.go
@@ -689,9 +689,9 @@ func autoIncGenerate(gen *operators.Generate) *engine.Generate {
 		return nil
 	}
 	selNext := &sqlparser.Select{
-		From:        []sqlparser.TableExpr{&sqlparser.AliasedTableExpr{Expr: gen.TableName}},
-		SelectExprs: sqlparser.SelectExprs{&sqlparser.Nextval{Expr: &sqlparser.Argument{Name: "n", Type: sqltypes.Int64}}},
+		From: []sqlparser.TableExpr{&sqlparser.AliasedTableExpr{Expr: gen.TableName}},
 	}
+	selNext.AddSelectExpr(&sqlparser.Nextval{Expr: &sqlparser.Argument{Name: "n", Type: sqltypes.Int64}})
 	return &engine.Generate{
 		Keyspace: gen.Keyspace,
 		Query:    sqlparser.String(selNext),
diff --git a/go/vt/vtgate/planbuilder/operators/SQL_builder.go b/go/vt/vtgate/planbuilder/operators/SQL_builder.go
index ca15b5c9134..0b8013a8737 100644
--- a/go/vt/vtgate/planbuilder/operators/SQL_builder.go
+++ b/go/vt/vtgate/planbuilder/operators/SQL_builder.go
@@ -163,7 +163,7 @@ func (qb *queryBuilder) setWithRollup() {
 func (qb *queryBuilder) addProjection(projection sqlparser.SelectExpr) {
 	switch stmt := qb.stmt.(type) {
 	case *sqlparser.Select:
-		stmt.SelectExprs = append(stmt.SelectExprs, projection)
+		stmt.AddSelectExpr(projection)
 		return
 	case *sqlparser.Union:
 		if ae, ok := projection.(*sqlparser.AliasedExpr); ok {
@@ -193,11 +193,12 @@ func (qb *queryBuilder) pushUnionInsideDerived() {
 		}},
 	}
 	firstSelect := getFirstSelect(selStmt)
-	sel.SelectExprs = unionSelects(firstSelect.SelectExprs)
+	sel.SetSelectExprs(unionSelects(firstSelect.GetColumns())...)
 	qb.stmt = sel
 }
 
-func unionSelects(exprs sqlparser.SelectExprs) (selectExprs sqlparser.SelectExprs) {
+func unionSelects(exprs []sqlparser.SelectExpr) []sqlparser.SelectExpr {
+	var selectExprs []sqlparser.SelectExpr
 	for _, col := range exprs {
 		switch col := col.(type) {
 		case *sqlparser.AliasedExpr:
@@ -207,13 +208,13 @@ func unionSelects(exprs sqlparser.SelectExprs) (selectExprs sqlparser.SelectExpr
 			selectExprs = append(selectExprs, col)
 		}
 	}
-	return
+	return selectExprs
 }
 
 func checkUnionColumnByName(column *sqlparser.ColName, sel sqlparser.TableStatement) {
 	colName := column.Name.String()
 	firstSelect := getFirstSelect(sel)
-	exprs := firstSelect.SelectExprs
+	exprs := firstSelect.GetColumns()
 	offset := slices.IndexFunc(exprs, func(expr sqlparser.SelectExpr) bool {
 		switch ae := expr.(type) {
 		case *sqlparser.StarExpr:
@@ -283,7 +284,9 @@ func (qb *queryBuilder) joinWith(other *queryBuilder, onCondition sqlparser.Expr
 
 	if sel, isSel := stmt.(*sqlparser.Select); isSel {
 		otherSel := otherStmt.(*sqlparser.Select)
-		sel.SelectExprs = append(sel.SelectExprs, otherSel.SelectExprs...)
+		for _, expr := range otherSel.GetColumns() {
+			sel.AddSelectExpr(expr)
+		}
 	}
 
 	qb.mergeWhereClauses(stmt, otherStmt)
@@ -410,7 +413,7 @@ func stripDownQuery(from, to sqlparser.TableStatement) {
 		toNode.Comments = node.Comments
 		toNode.Limit = node.Limit
 		toNode.SelectExprs = node.SelectExprs
-		for _, expr := range toNode.SelectExprs {
+		for _, expr := range toNode.SelectExprs.Exprs {
 			removeKeyspaceFromSelectExpr(expr)
 		}
 	case *sqlparser.Union:
@@ -599,8 +602,7 @@ func buildProjection(op *Projection, qb *queryBuilder) {
 	}
 
 	if !isSel {
-		cols := op.GetSelectExprs(qb.ctx)
-		for _, column := range cols {
+		for _, column := range op.GetSelectExprs(qb.ctx) {
 			qb.addProjection(column)
 		}
 	}
diff --git a/go/vt/vtgate/planbuilder/operators/aggregation_pushing.go b/go/vt/vtgate/planbuilder/operators/aggregation_pushing.go
index ced81df147a..b11f49fe936 100644
--- a/go/vt/vtgate/planbuilder/operators/aggregation_pushing.go
+++ b/go/vt/vtgate/planbuilder/operators/aggregation_pushing.go
@@ -206,9 +206,9 @@ func pushAggregations(ctx *plancontext.PlanningContext, aggregator *Aggregator,
 	}
 }
 
-func checkIfWeCanPush(ctx *plancontext.PlanningContext, aggregator *Aggregator) (bool, sqlparser.Exprs) {
+func checkIfWeCanPush(ctx *plancontext.PlanningContext, aggregator *Aggregator) (bool, []sqlparser.Expr) {
 	canPush := true
-	var distinctExprs sqlparser.Exprs
+	var distinctExprs []sqlparser.Expr
 	var differentExpr *sqlparser.AliasedExpr
 
 	for _, aggr := range aggregator.Aggregations {
@@ -574,13 +574,7 @@ outer:
 
 func coalesceFunc(e sqlparser.Expr) sqlparser.Expr {
 	// `coalesce(e,1)` will return `e` if `e` is not `NULL`, otherwise it will return `1`
-	return &sqlparser.FuncExpr{
-		Name: sqlparser.NewIdentifierCI("coalesce"),
-		Exprs: sqlparser.Exprs{
-			e,
-			sqlparser.NewIntLiteral("1"),
-		},
-	}
+	return sqlparser.NewFuncExpr("coalesce", e, sqlparser.NewIntLiteral("1"))
 }
 
 func initColReUse(size int) []int {
diff --git a/go/vt/vtgate/planbuilder/operators/aggregator.go b/go/vt/vtgate/planbuilder/operators/aggregator.go
index f353ee02d1e..1a96e81b66e 100644
--- a/go/vt/vtgate/planbuilder/operators/aggregator.go
+++ b/go/vt/vtgate/planbuilder/operators/aggregator.go
@@ -309,7 +309,7 @@ func (a *Aggregator) GetColumns(ctx *plancontext.PlanningContext) (res []*sqlpar
 	return truncate(a, a.Columns)
 }
 
-func (a *Aggregator) GetSelectExprs(ctx *plancontext.PlanningContext) sqlparser.SelectExprs {
+func (a *Aggregator) GetSelectExprs(ctx *plancontext.PlanningContext) []sqlparser.SelectExpr {
 	return transformColumnsToSelectExprs(ctx, a)
 }
 
@@ -400,10 +400,10 @@ func (a *Aggregator) planOffsets(ctx *plancontext.PlanningContext) Operator {
 	return nil
 }
 
-func (aggr Aggr) setPushColumn(exprs sqlparser.Exprs) {
+func (aggr Aggr) setPushColumn(exprs []sqlparser.Expr) {
 	if aggr.Func == nil {
 		if len(exprs) > 1 {
-			panic(vterrors.VT13001(fmt.Sprintf("unexpected number of expression in an random aggregation: %s", sqlparser.String(exprs))))
+			panic(vterrors.VT13001(fmt.Sprintf("unexpected number of expression in an random aggregation: %s", sqlparser.SliceString(exprs))))
 		}
 		aggr.Original.Expr = exprs[0]
 		return
@@ -434,12 +434,12 @@ func (aggr Aggr) getPushColumn() sqlparser.Expr {
 	}
 }
 
-func (aggr Aggr) getPushColumnExprs() sqlparser.Exprs {
+func (aggr Aggr) getPushColumnExprs() []sqlparser.Expr {
 	switch aggr.OpCode {
 	case opcode.AggregateAnyValue:
-		return sqlparser.Exprs{aggr.Original.Expr}
+		return []sqlparser.Expr{aggr.Original.Expr}
 	case opcode.AggregateCountStar:
-		return sqlparser.Exprs{sqlparser.NewIntLiteral("1")}
+		return []sqlparser.Expr{sqlparser.NewIntLiteral("1")}
 	case opcode.AggregateUDF:
 		// AggregateUDFs can't be evaluated on the vtgate. So either we are able to push everything down, or we will have to fail the query.
 		return nil
diff --git a/go/vt/vtgate/planbuilder/operators/apply_join.go b/go/vt/vtgate/planbuilder/operators/apply_join.go
index 80bf74708a8..2297227a22d 100644
--- a/go/vt/vtgate/planbuilder/operators/apply_join.go
+++ b/go/vt/vtgate/planbuilder/operators/apply_join.go
@@ -180,7 +180,7 @@ func (aj *ApplyJoin) GetColumns(ctx *plancontext.PlanningContext) []*sqlparser.A
 	return cols
 }
 
-func (aj *ApplyJoin) GetSelectExprs(ctx *plancontext.PlanningContext) sqlparser.SelectExprs {
+func (aj *ApplyJoin) GetSelectExprs(ctx *plancontext.PlanningContext) []sqlparser.SelectExpr {
 	return transformColumnsToSelectExprs(ctx, aj)
 }
 
@@ -414,7 +414,7 @@ func (aj *ApplyJoin) findOrAddColNameBindVarName(ctx *plancontext.PlanningContex
 	return bvName
 }
 
-func (aj *ApplyJoin) LHSColumnsNeeded(ctx *plancontext.PlanningContext) (needed sqlparser.Exprs) {
+func (aj *ApplyJoin) LHSColumnsNeeded(ctx *plancontext.PlanningContext) (needed []sqlparser.Expr) {
 	f := func(from BindVarExpr) sqlparser.Expr {
 		return from.Expr
 	}
diff --git a/go/vt/vtgate/planbuilder/operators/ast_to_op.go b/go/vt/vtgate/planbuilder/operators/ast_to_op.go
index 2e3781c94db..009f2c7c265 100644
--- a/go/vt/vtgate/planbuilder/operators/ast_to_op.go
+++ b/go/vt/vtgate/planbuilder/operators/ast_to_op.go
@@ -137,8 +137,8 @@ func findTablesContained(ctx *plancontext.PlanningContext, node sqlparser.SQLNod
 // comparisons between the inner and the outer side.
 // They can be used for merging the two parts of the query together
 type joinPredicateCollector struct {
-	predicates          sqlparser.Exprs
-	remainingPredicates sqlparser.Exprs
+	predicates          []sqlparser.Expr
+	remainingPredicates []sqlparser.Expr
 	joinColumns         []applyJoinColumn
 
 	totalID,
@@ -174,7 +174,7 @@ func createOperatorFromUnion(ctx *plancontext.PlanningContext, node *sqlparser.U
 	rexprs := ctx.SemTable.SelectExprs(node.Right)
 
 	unionCols := ctx.SemTable.SelectExprs(node)
-	union := newUnion([]Operator{opLHS, opRHS}, []sqlparser.SelectExprs{lexprs, rexprs}, unionCols, node.Distinct)
+	union := newUnion([]Operator{opLHS, opRHS}, [][]sqlparser.SelectExpr{lexprs, rexprs}, unionCols, node.Distinct)
 	return newHorizon(union, node)
 }
 
@@ -464,7 +464,7 @@ func createSelectionOp(
 	lock sqlparser.Lock,
 ) Operator {
 	selectionStmt := &sqlparser.Select{
-		SelectExprs: selectExprs,
+		SelectExprs: &sqlparser.SelectExprs{Exprs: selectExprs},
 		From:        tableExprs,
 		Where:       where,
 		OrderBy:     orderBy,
diff --git a/go/vt/vtgate/planbuilder/operators/comments.go b/go/vt/vtgate/planbuilder/operators/comments.go
index 9f0202c250a..445160e3d40 100644
--- a/go/vt/vtgate/planbuilder/operators/comments.go
+++ b/go/vt/vtgate/planbuilder/operators/comments.go
@@ -66,7 +66,7 @@ func (l *LockAndComment) GetColumns(ctx *plancontext.PlanningContext) []*sqlpars
 	return l.Source.GetColumns(ctx)
 }
 
-func (l *LockAndComment) GetSelectExprs(ctx *plancontext.PlanningContext) sqlparser.SelectExprs {
+func (l *LockAndComment) GetSelectExprs(ctx *plancontext.PlanningContext) []sqlparser.SelectExpr {
 	return l.Source.GetSelectExprs(ctx)
 }
 
diff --git a/go/vt/vtgate/planbuilder/operators/delete.go b/go/vt/vtgate/planbuilder/operators/delete.go
index 23c909e0a04..b16f9b8aacf 100644
--- a/go/vt/vtgate/planbuilder/operators/delete.go
+++ b/go/vt/vtgate/planbuilder/operators/delete.go
@@ -136,7 +136,7 @@ func createDeleteWithInputOp(ctx *plancontext.PlanningContext, del *sqlparser.De
 	dmls := slice.Map(delOps, func(from dmlOp) Operator {
 		colsList = append(colsList, from.cols)
 		for _, col := range from.cols {
-			selectStmt.SelectExprs = append(selectStmt.SelectExprs, aeWrap(col))
+			selectStmt.AddSelectExpr(aeWrap(col))
 		}
 		return from.op
 	})
@@ -264,7 +264,7 @@ func createDeleteOperator(ctx *plancontext.PlanningContext, del *sqlparser.Delet
 }
 
 func generateOwnedVindexQuery(del *sqlparser.Delete, table TargetTable, ksidCols []sqlparser.IdentifierCI) *sqlparser.Select {
-	var selExprs sqlparser.SelectExprs
+	var selExprs []sqlparser.SelectExpr
 	for _, col := range ksidCols {
 		colName := makeColName(col, table, sqlparser.MultiTable(del.TableExprs))
 		selExprs = append(selExprs, aeWrap(colName))
@@ -275,12 +275,13 @@ func generateOwnedVindexQuery(del *sqlparser.Delete, table TargetTable, ksidCols
 			selExprs = append(selExprs, aeWrap(colName))
 		}
 	}
-	return &sqlparser.Select{
-		SelectExprs: selExprs,
-		OrderBy:     del.OrderBy,
-		Limit:       del.Limit,
-		Lock:        sqlparser.ForUpdateLock,
+	sel := &sqlparser.Select{
+		OrderBy: del.OrderBy,
+		Limit:   del.Limit,
+		Lock:    sqlparser.ForUpdateLock,
 	}
+	sel.SetSelectExprs(selExprs...)
+	return sel
 }
 
 func makeColName(col sqlparser.IdentifierCI, table TargetTable, isMultiTbl bool) *sqlparser.ColName {
diff --git a/go/vt/vtgate/planbuilder/operators/distinct.go b/go/vt/vtgate/planbuilder/operators/distinct.go
index 52221498eea..00c9512af58 100644
--- a/go/vt/vtgate/planbuilder/operators/distinct.go
+++ b/go/vt/vtgate/planbuilder/operators/distinct.go
@@ -100,7 +100,7 @@ func (d *Distinct) GetColumns(ctx *plancontext.PlanningContext) []*sqlparser.Ali
 	return truncate(d, d.Source.GetColumns(ctx))
 }
 
-func (d *Distinct) GetSelectExprs(ctx *plancontext.PlanningContext) sqlparser.SelectExprs {
+func (d *Distinct) GetSelectExprs(ctx *plancontext.PlanningContext) []sqlparser.SelectExpr {
 	return truncate(d, d.Source.GetSelectExprs(ctx))
 }
 
diff --git a/go/vt/vtgate/planbuilder/operators/filter.go b/go/vt/vtgate/planbuilder/operators/filter.go
index d58d218908e..431461d4ab1 100644
--- a/go/vt/vtgate/planbuilder/operators/filter.go
+++ b/go/vt/vtgate/planbuilder/operators/filter.go
@@ -92,7 +92,7 @@ func (f *Filter) GetColumns(ctx *plancontext.PlanningContext) []*sqlparser.Alias
 	return truncate(f, f.Source.GetColumns(ctx))
 }
 
-func (f *Filter) GetSelectExprs(ctx *plancontext.PlanningContext) sqlparser.SelectExprs {
+func (f *Filter) GetSelectExprs(ctx *plancontext.PlanningContext) []sqlparser.SelectExpr {
 	return truncate(f, f.Source.GetSelectExprs(ctx))
 }
 
diff --git a/go/vt/vtgate/planbuilder/operators/hash_join.go b/go/vt/vtgate/planbuilder/operators/hash_join.go
index 3761c4b87a6..f8724f5221b 100644
--- a/go/vt/vtgate/planbuilder/operators/hash_join.go
+++ b/go/vt/vtgate/planbuilder/operators/hash_join.go
@@ -196,7 +196,7 @@ func (hj *HashJoin) GetColumns(*plancontext.PlanningContext) []*sqlparser.Aliase
 	})
 }
 
-func (hj *HashJoin) GetSelectExprs(ctx *plancontext.PlanningContext) sqlparser.SelectExprs {
+func (hj *HashJoin) GetSelectExprs(ctx *plancontext.PlanningContext) []sqlparser.SelectExpr {
 	return transformColumnsToSelectExprs(ctx, hj)
 }
 
diff --git a/go/vt/vtgate/planbuilder/operators/horizon.go b/go/vt/vtgate/planbuilder/operators/horizon.go
index aa7737001d6..33070f5802b 100644
--- a/go/vt/vtgate/planbuilder/operators/horizon.go
+++ b/go/vt/vtgate/planbuilder/operators/horizon.go
@@ -148,7 +148,7 @@ func (h *Horizon) FindCol(ctx *plancontext.PlanningContext, expr sqlparser.Expr,
 		return -1
 	}
 
-	for idx, se := range getFirstSelect(h.Query).SelectExprs {
+	for idx, se := range getFirstSelect(h.Query).GetColumns() {
 		ae, ok := se.(*sqlparser.AliasedExpr)
 		if !ok {
 			panic(vterrors.VT09015())
@@ -173,8 +173,8 @@ func (h *Horizon) GetColumns(ctx *plancontext.PlanningContext) (exprs []*sqlpars
 	return exprs
 }
 
-func (h *Horizon) GetSelectExprs(*plancontext.PlanningContext) sqlparser.SelectExprs {
-	return getFirstSelect(h.Query).SelectExprs
+func (h *Horizon) GetSelectExprs(*plancontext.PlanningContext) []sqlparser.SelectExpr {
+	return getFirstSelect(h.Query).GetColumns()
 }
 
 func (h *Horizon) GetOrdering(ctx *plancontext.PlanningContext) []OrderBy {
diff --git a/go/vt/vtgate/planbuilder/operators/horizon_expanding.go b/go/vt/vtgate/planbuilder/operators/horizon_expanding.go
index dad5ad3a91a..f60b7996714 100644
--- a/go/vt/vtgate/planbuilder/operators/horizon_expanding.go
+++ b/go/vt/vtgate/planbuilder/operators/horizon_expanding.go
@@ -235,7 +235,7 @@ func createProjectionWithAggr(ctx *plancontext.PlanningContext, qp *QueryProject
 
 func pullOutValueSubqueries(ctx *plancontext.PlanningContext, aggr Aggr, sqc *SubQueryBuilder, outerID semantics.TableSet) Aggr {
 	exprs := aggr.getPushColumnExprs()
-	var newExprs sqlparser.Exprs
+	var newExprs []sqlparser.Expr
 	for _, expr := range exprs {
 		newExpr, subqs := sqc.pullOutValueSubqueries(ctx, expr, outerID, false)
 		if newExpr != nil {
@@ -344,7 +344,7 @@ func createProjectionWithoutAggr(ctx *plancontext.PlanningContext, qp *QueryProj
 }
 
 func newStarProjection(src Operator, qp *QueryProjection) *Projection {
-	cols := sqlparser.SelectExprs{}
+	var cols []sqlparser.SelectExpr
 
 	for _, expr := range qp.SelectExprs {
 		_ = sqlparser.Walk(func(node sqlparser.SQLNode) (kontinue bool, err error) {
diff --git a/go/vt/vtgate/planbuilder/operators/info_schema_planning.go b/go/vt/vtgate/planbuilder/operators/info_schema_planning.go
index f8dc9b9d281..1e15237f30d 100644
--- a/go/vt/vtgate/planbuilder/operators/info_schema_planning.go
+++ b/go/vt/vtgate/planbuilder/operators/info_schema_planning.go
@@ -196,7 +196,7 @@ func tryMergeInfoSchemaRoutings(ctx *plancontext.PlanningContext, routingA, rout
 		return m.merge(ctx, lhsRoute, rhsRoute, isrA)
 
 	// if both sides have the same schema predicate, we can safely merge them
-	case sqlparser.Equals.Exprs(isrA.SysTableTableSchema, isrB.SysTableTableSchema):
+	case equalExprs(isrA.SysTableTableSchema, isrB.SysTableTableSchema):
 		for k, expr := range isrB.SysTableTableName {
 			isrA.SysTableTableName[k] = expr
 		}
@@ -208,6 +208,18 @@ func tryMergeInfoSchemaRoutings(ctx *plancontext.PlanningContext, routingA, rout
 	}
 }
 
+func equalExprs(a, b []sqlparser.Expr) bool {
+	if len(a) != len(b) {
+		return false
+	}
+	for i := range a {
+		if !sqlparser.Equals.Expr(a[i], b[i]) {
+			return false
+		}
+	}
+	return true
+}
+
 var (
 	// these are filled in by the init() function below
 	schemaColumns57 = map[string]any{}
diff --git a/go/vt/vtgate/planbuilder/operators/insert.go b/go/vt/vtgate/planbuilder/operators/insert.go
index f6d86d49ca2..dde07685ff0 100644
--- a/go/vt/vtgate/planbuilder/operators/insert.go
+++ b/go/vt/vtgate/planbuilder/operators/insert.go
@@ -266,7 +266,7 @@ func uniqKeyCompExpressions(vTbl *vindexes.BaseTable, ins *sqlparser.Insert, row
 
 	type uIdx struct {
 		Indexes [][]uComp
-		uniqKey sqlparser.Exprs
+		uniqKey []sqlparser.Expr
 	}
 
 	allIndexes := make([]uIdx, 0, noOfUniqKeys)
@@ -470,7 +470,7 @@ func columnMismatch(gen *Generate, ins *sqlparser.Insert, sel sqlparser.TableSta
 	if origColCount > sel.GetColumnCount() {
 		sel := getFirstSelect(sel)
 		var hasStarExpr bool
-		for _, sExpr := range sel.SelectExprs {
+		for _, sExpr := range sel.GetColumns() {
 			if _, hasStarExpr = sExpr.(*sqlparser.StarExpr); hasStarExpr {
 				break
 			}
diff --git a/go/vt/vtgate/planbuilder/operators/limit.go b/go/vt/vtgate/planbuilder/operators/limit.go
index 4549b85fcda..0a0525562eb 100644
--- a/go/vt/vtgate/planbuilder/operators/limit.go
+++ b/go/vt/vtgate/planbuilder/operators/limit.go
@@ -69,7 +69,7 @@ func (l *Limit) GetColumns(ctx *plancontext.PlanningContext) []*sqlparser.Aliase
 	return l.Source.GetColumns(ctx)
 }
 
-func (l *Limit) GetSelectExprs(ctx *plancontext.PlanningContext) sqlparser.SelectExprs {
+func (l *Limit) GetSelectExprs(ctx *plancontext.PlanningContext) []sqlparser.SelectExpr {
 	return l.Source.GetSelectExprs(ctx)
 }
 
diff --git a/go/vt/vtgate/planbuilder/operators/mirror.go b/go/vt/vtgate/planbuilder/operators/mirror.go
index 82a431af0a2..23448b3fad6 100644
--- a/go/vt/vtgate/planbuilder/operators/mirror.go
+++ b/go/vt/vtgate/planbuilder/operators/mirror.go
@@ -75,7 +75,7 @@ func (m *PercentBasedMirror) GetColumns(ctx *plancontext.PlanningContext) []*sql
 	return m.Operator().GetColumns(ctx)
 }
 
-func (m *PercentBasedMirror) GetSelectExprs(ctx *plancontext.PlanningContext) sqlparser.SelectExprs {
+func (m *PercentBasedMirror) GetSelectExprs(ctx *plancontext.PlanningContext) []sqlparser.SelectExpr {
 	return m.Operator().GetSelectExprs(ctx)
 }
 
diff --git a/go/vt/vtgate/planbuilder/operators/operator.go b/go/vt/vtgate/planbuilder/operators/operator.go
index 42658e4c52e..6e9c10ab951 100644
--- a/go/vt/vtgate/planbuilder/operators/operator.go
+++ b/go/vt/vtgate/planbuilder/operators/operator.go
@@ -72,7 +72,7 @@ type (
 		FindCol(ctx *plancontext.PlanningContext, expr sqlparser.Expr, underRoute bool) int
 
 		GetColumns(ctx *plancontext.PlanningContext) []*sqlparser.AliasedExpr
-		GetSelectExprs(ctx *plancontext.PlanningContext) sqlparser.SelectExprs
+		GetSelectExprs(ctx *plancontext.PlanningContext) []sqlparser.SelectExpr
 
 		ShortDescription() string
 
diff --git a/go/vt/vtgate/planbuilder/operators/ordering.go b/go/vt/vtgate/planbuilder/operators/ordering.go
index 7e40b420f9e..367cb3c75b1 100644
--- a/go/vt/vtgate/planbuilder/operators/ordering.go
+++ b/go/vt/vtgate/planbuilder/operators/ordering.go
@@ -72,7 +72,7 @@ func (o *Ordering) GetColumns(ctx *plancontext.PlanningContext) []*sqlparser.Ali
 	return truncate(o, o.Source.GetColumns(ctx))
 }
 
-func (o *Ordering) GetSelectExprs(ctx *plancontext.PlanningContext) sqlparser.SelectExprs {
+func (o *Ordering) GetSelectExprs(ctx *plancontext.PlanningContext) []sqlparser.SelectExpr {
 	return truncate(o, o.Source.GetSelectExprs(ctx))
 }
 
diff --git a/go/vt/vtgate/planbuilder/operators/plan_query.go b/go/vt/vtgate/planbuilder/operators/plan_query.go
index dc83c89c72c..1bb619e3503 100644
--- a/go/vt/vtgate/planbuilder/operators/plan_query.go
+++ b/go/vt/vtgate/planbuilder/operators/plan_query.go
@@ -147,7 +147,7 @@ func (noColumns) FindCol(*plancontext.PlanningContext, sqlparser.Expr, bool) int
 	panic(vterrors.VT13001("noColumns operators have no column"))
 }
 
-func (noColumns) GetSelectExprs(*plancontext.PlanningContext) sqlparser.SelectExprs {
+func (noColumns) GetSelectExprs(*plancontext.PlanningContext) []sqlparser.SelectExpr {
 	panic(vterrors.VT13001("noColumns operators have no column"))
 }
 
@@ -192,7 +192,7 @@ func tryTruncateColumnsAt(op Operator, truncateAt int) bool {
 	}
 }
 
-func transformColumnsToSelectExprs(ctx *plancontext.PlanningContext, op Operator) sqlparser.SelectExprs {
+func transformColumnsToSelectExprs(ctx *plancontext.PlanningContext, op Operator) []sqlparser.SelectExpr {
 	columns := op.GetColumns(ctx)
 	if trunc, ok := op.(columnTruncator); ok {
 		count := trunc.getTruncateColumnCount()
@@ -201,8 +201,7 @@ func transformColumnsToSelectExprs(ctx *plancontext.PlanningContext, op Operator
 		}
 	}
 
-	selExprs := slice.Map(columns, func(from *sqlparser.AliasedExpr) sqlparser.SelectExpr {
+	return slice.Map(columns, func(from *sqlparser.AliasedExpr) sqlparser.SelectExpr {
 		return from
 	})
-	return selExprs
 }
diff --git a/go/vt/vtgate/planbuilder/operators/projection.go b/go/vt/vtgate/planbuilder/operators/projection.go
index e894ab433b4..0f59d445714 100644
--- a/go/vt/vtgate/planbuilder/operators/projection.go
+++ b/go/vt/vtgate/planbuilder/operators/projection.go
@@ -76,11 +76,11 @@ type (
 	// ProjCols is used to enable projections that are only valid if we can push them into a route, and we never need to ask it about offsets
 	ProjCols interface {
 		GetColumns() []*sqlparser.AliasedExpr
-		GetSelectExprs() sqlparser.SelectExprs
+		GetSelectExprs() []sqlparser.SelectExpr
 	}
 
 	// Used when there are stars in the expressions that we were unable to expand
-	StarProjections sqlparser.SelectExprs
+	StarProjections []sqlparser.SelectExpr
 
 	// Used when we know all the columns
 	AliasedProjections []*ProjExpr
@@ -136,8 +136,8 @@ func (sp StarProjections) GetColumns() []*sqlparser.AliasedExpr {
 	panic(vterrors.VT09015())
 }
 
-func (sp StarProjections) GetSelectExprs() sqlparser.SelectExprs {
-	return sqlparser.SelectExprs(sp)
+func (sp StarProjections) GetSelectExprs() []sqlparser.SelectExpr {
+	return sp
 }
 
 func (ap AliasedProjections) GetColumns() []*sqlparser.AliasedExpr {
@@ -146,7 +146,7 @@ func (ap AliasedProjections) GetColumns() []*sqlparser.AliasedExpr {
 	})
 }
 
-func (ap AliasedProjections) GetSelectExprs() sqlparser.SelectExprs {
+func (ap AliasedProjections) GetSelectExprs() []sqlparser.SelectExpr {
 	return slice.Map(ap, func(from *ProjExpr) sqlparser.SelectExpr {
 		return aeWrap(from.ColExpr)
 	})
@@ -420,12 +420,12 @@ func (p *Projection) GetColumns(*plancontext.PlanningContext) []*sqlparser.Alias
 	return p.Columns.GetColumns()
 }
 
-func (p *Projection) GetSelectExprs(*plancontext.PlanningContext) sqlparser.SelectExprs {
+func (p *Projection) GetSelectExprs(*plancontext.PlanningContext) []sqlparser.SelectExpr {
 	switch cols := p.Columns.(type) {
 	case StarProjections:
-		return sqlparser.SelectExprs(cols)
+		return cols
 	case AliasedProjections:
-		var output sqlparser.SelectExprs
+		var output []sqlparser.SelectExpr
 		for _, pe := range cols {
 			ae := &sqlparser.AliasedExpr{Expr: pe.EvalExpr}
 			if pe.Original.As.NotEmpty() {
diff --git a/go/vt/vtgate/planbuilder/operators/query_planning.go b/go/vt/vtgate/planbuilder/operators/query_planning.go
index db716966d47..f70392252c1 100644
--- a/go/vt/vtgate/planbuilder/operators/query_planning.go
+++ b/go/vt/vtgate/planbuilder/operators/query_planning.go
@@ -30,10 +30,10 @@ import (
 )
 
 func planQuery(ctx *plancontext.PlanningContext, root Operator) Operator {
-	var selExpr sqlparser.SelectExprs
+	var selExpr []sqlparser.SelectExpr
 	if horizon, isHorizon := root.(*Horizon); isHorizon {
 		sel := getFirstSelect(horizon.Query)
-		selExpr = sqlparser.Clone(sel.SelectExprs)
+		selExpr = sqlparser.Clone(sel.SelectExprs).Exprs
 	}
 
 	output := runPhases(ctx, root)
@@ -805,7 +805,7 @@ func tryPushUnion(ctx *plancontext.PlanningContext, op *Union) (Operator, *Apply
 	}
 
 	var sources []Operator
-	var selects []sqlparser.SelectExprs
+	var selects [][]sqlparser.SelectExpr
 
 	if op.distinct {
 		sources, selects = mergeUnionInputInAnyOrder(ctx, op)
@@ -829,7 +829,7 @@ func tryPushUnion(ctx *plancontext.PlanningContext, op *Union) (Operator, *Apply
 }
 
 // addTruncationOrProjectionToReturnOutput uses the original Horizon to make sure that the output columns line up with what the user asked for
-func addTruncationOrProjectionToReturnOutput(ctx *plancontext.PlanningContext, selExprs sqlparser.SelectExprs, output Operator) Operator {
+func addTruncationOrProjectionToReturnOutput(ctx *plancontext.PlanningContext, selExprs []sqlparser.SelectExpr, output Operator) Operator {
 	if len(selExprs) == 0 {
 		return output
 	}
@@ -843,7 +843,7 @@ func addTruncationOrProjectionToReturnOutput(ctx *plancontext.PlanningContext, s
 	return createSimpleProjection(ctx, selExprs, output)
 }
 
-func colNamesAlign(expected, actual sqlparser.SelectExprs) bool {
+func colNamesAlign(expected, actual []sqlparser.SelectExpr) bool {
 	if len(expected) > len(actual) {
 		// if we expect more columns than we have, we can't align
 		return false
diff --git a/go/vt/vtgate/planbuilder/operators/queryprojection.go b/go/vt/vtgate/planbuilder/operators/queryprojection.go
index c66bf757dd8..073e320fff1 100644
--- a/go/vt/vtgate/planbuilder/operators/queryprojection.go
+++ b/go/vt/vtgate/planbuilder/operators/queryprojection.go
@@ -176,7 +176,7 @@ func createQPFromSelect(ctx *plancontext.PlanningContext, sel *sqlparser.Select)
 }
 
 func (qp *QueryProjection) addSelectExpressions(ctx *plancontext.PlanningContext, sel *sqlparser.Select) {
-	for _, selExp := range sel.SelectExprs {
+	for _, selExp := range sel.GetColumns() {
 		switch selExp := selExp.(type) {
 		case *sqlparser.AliasedExpr:
 			col := SelectExpr{
diff --git a/go/vt/vtgate/planbuilder/operators/recurse_cte.go b/go/vt/vtgate/planbuilder/operators/recurse_cte.go
index 61474b663d6..cbd31897479 100644
--- a/go/vt/vtgate/planbuilder/operators/recurse_cte.go
+++ b/go/vt/vtgate/planbuilder/operators/recurse_cte.go
@@ -147,7 +147,7 @@ func (r *RecurseCTE) GetColumns(ctx *plancontext.PlanningContext) []*sqlparser.A
 	return r.Seed().GetColumns(ctx)
 }
 
-func (r *RecurseCTE) GetSelectExprs(ctx *plancontext.PlanningContext) sqlparser.SelectExprs {
+func (r *RecurseCTE) GetSelectExprs(ctx *plancontext.PlanningContext) []sqlparser.SelectExpr {
 	return r.Seed().GetSelectExprs(ctx)
 }
 
diff --git a/go/vt/vtgate/planbuilder/operators/route.go b/go/vt/vtgate/planbuilder/operators/route.go
index 904d5085718..9aeafec2799 100644
--- a/go/vt/vtgate/planbuilder/operators/route.go
+++ b/go/vt/vtgate/planbuilder/operators/route.go
@@ -707,7 +707,7 @@ func (r *Route) GetColumns(ctx *plancontext.PlanningContext) []*sqlparser.Aliase
 	return truncate(r, r.Source.GetColumns(ctx))
 }
 
-func (r *Route) GetSelectExprs(ctx *plancontext.PlanningContext) sqlparser.SelectExprs {
+func (r *Route) GetSelectExprs(ctx *plancontext.PlanningContext) []sqlparser.SelectExpr {
 	return truncate(r, r.Source.GetSelectExprs(ctx))
 }
 
diff --git a/go/vt/vtgate/planbuilder/operators/sharded_routing.go b/go/vt/vtgate/planbuilder/operators/sharded_routing.go
index 9ad567c71b1..0cc828a7ae2 100644
--- a/go/vt/vtgate/planbuilder/operators/sharded_routing.go
+++ b/go/vt/vtgate/planbuilder/operators/sharded_routing.go
@@ -665,10 +665,11 @@ func (tr *ShardedRouting) extraInfo() string {
 		)
 	}
 
+	valueExprs := tr.Selected.ValueExprs
 	return fmt.Sprintf(
 		"Vindex[%s] Values[%s] Seen:[%s]",
 		tr.Selected.FoundVindex.String(),
-		sqlparser.String(sqlparser.Exprs(tr.Selected.ValueExprs)),
+		sqlparser.SliceString(valueExprs),
 		sqlparser.String(sqlparser.AndExpressions(tr.SeenPredicates...)),
 	)
 }
diff --git a/go/vt/vtgate/planbuilder/operators/subquery.go b/go/vt/vtgate/planbuilder/operators/subquery.go
index 9610a2b10c9..62b6e7a725e 100644
--- a/go/vt/vtgate/planbuilder/operators/subquery.go
+++ b/go/vt/vtgate/planbuilder/operators/subquery.go
@@ -38,7 +38,7 @@ type SubQuery struct {
 	FilterType        opcode.PulloutOpcode // Type of subquery filter.
 	Original          sqlparser.Expr       // This is the expression we should use if we can merge the inner to the outer
 	originalSubquery  *sqlparser.Subquery  // Subquery representation, e.g., (SELECT foo from user LIMIT 1).
-	Predicates        sqlparser.Exprs      // Predicates joining outer and inner queries. Empty for uncorrelated subqueries.
+	Predicates        []sqlparser.Expr     // Predicates joining outer and inner queries. Empty for uncorrelated subqueries.
 	OuterPredicate    sqlparser.Expr       // This is the predicate that is using the subquery expression. It will not be empty for projections
 	ArgName           string               // This is the name of the ColName or Argument used to replace the subquery
 	TopLevel          bool                 // will be false if the subquery is deeply nested
@@ -125,7 +125,7 @@ func (sq *SubQuery) Clone(inputs []Operator) Operator {
 	}
 	klone.JoinColumns = slices.Clone(sq.JoinColumns)
 	klone.Vars = maps.Clone(sq.Vars)
-	klone.Predicates = sqlparser.Clone(sq.Predicates)
+	klone.Predicates = slices.Clone(sq.Predicates)
 	return &klone
 }
 
@@ -195,7 +195,7 @@ func (sq *SubQuery) GetColumns(ctx *plancontext.PlanningContext) []*sqlparser.Al
 	return sq.Outer.GetColumns(ctx)
 }
 
-func (sq *SubQuery) GetSelectExprs(ctx *plancontext.PlanningContext) sqlparser.SelectExprs {
+func (sq *SubQuery) GetSelectExprs(ctx *plancontext.PlanningContext) []sqlparser.SelectExpr {
 	return sq.Outer.GetSelectExprs(ctx)
 }
 
diff --git a/go/vt/vtgate/planbuilder/operators/subquery_builder.go b/go/vt/vtgate/planbuilder/operators/subquery_builder.go
index 6ec5ecdd7f3..cc7dc9afe69 100644
--- a/go/vt/vtgate/planbuilder/operators/subquery_builder.go
+++ b/go/vt/vtgate/planbuilder/operators/subquery_builder.go
@@ -116,7 +116,7 @@ func createSubqueryOp(
 // and extracts subqueries into operators
 func (sqb *SubQueryBuilder) inspectStatement(ctx *plancontext.PlanningContext,
 	stmt sqlparser.TableStatement,
-) (sqlparser.Exprs, []applyJoinColumn) {
+) ([]sqlparser.Expr, []applyJoinColumn) {
 	switch stmt := stmt.(type) {
 	case *sqlparser.Select:
 		return sqb.inspectSelect(ctx, stmt)
@@ -134,7 +134,7 @@ func (sqb *SubQueryBuilder) inspectStatement(ctx *plancontext.PlanningContext,
 func (sqb *SubQueryBuilder) inspectSelect(
 	ctx *plancontext.PlanningContext,
 	sel *sqlparser.Select,
-) (sqlparser.Exprs, []applyJoinColumn) {
+) ([]sqlparser.Expr, []applyJoinColumn) {
 	// first we need to go through all the places where one can find predicates
 	// and search for subqueries
 	newWhere, wherePreds, whereJoinCols := sqb.inspectWhere(ctx, sel.Where)
@@ -191,7 +191,7 @@ func createSubquery(
 func (sqb *SubQueryBuilder) inspectWhere(
 	ctx *plancontext.PlanningContext,
 	in *sqlparser.Where,
-) (*sqlparser.Where, sqlparser.Exprs, []applyJoinColumn) {
+) (*sqlparser.Where, []sqlparser.Expr, []applyJoinColumn) {
 	if in == nil {
 		return nil, nil, nil
 	}
@@ -221,7 +221,7 @@ func (sqb *SubQueryBuilder) inspectWhere(
 func (sqb *SubQueryBuilder) inspectOnExpr(
 	ctx *plancontext.PlanningContext,
 	from []sqlparser.TableExpr,
-) (newFrom []sqlparser.TableExpr, onPreds sqlparser.Exprs, onJoinCols []applyJoinColumn) {
+) (newFrom []sqlparser.TableExpr, onPreds []sqlparser.Expr, onJoinCols []applyJoinColumn) {
 	for _, tbl := range from {
 		tbl := sqlparser.CopyOnRewrite(tbl, dontEnterSubqueries, func(cursor *sqlparser.CopyOnWriteCursor) {
 			cond, ok := cursor.Node().(*sqlparser.JoinCondition)
diff --git a/go/vt/vtgate/planbuilder/operators/subquery_container.go b/go/vt/vtgate/planbuilder/operators/subquery_container.go
index 3f5c3eed254..396dc1b3b62 100644
--- a/go/vt/vtgate/planbuilder/operators/subquery_container.go
+++ b/go/vt/vtgate/planbuilder/operators/subquery_container.go
@@ -91,7 +91,7 @@ func (sqc *SubQueryContainer) GetColumns(ctx *plancontext.PlanningContext) []*sq
 	return sqc.Outer.GetColumns(ctx)
 }
 
-func (sqc *SubQueryContainer) GetSelectExprs(ctx *plancontext.PlanningContext) sqlparser.SelectExprs {
+func (sqc *SubQueryContainer) GetSelectExprs(ctx *plancontext.PlanningContext) []sqlparser.SelectExpr {
 	return sqc.Outer.GetSelectExprs(ctx)
 }
 
diff --git a/go/vt/vtgate/planbuilder/operators/table.go b/go/vt/vtgate/planbuilder/operators/table.go
index 473459d6864..2cc561497f7 100644
--- a/go/vt/vtgate/planbuilder/operators/table.go
+++ b/go/vt/vtgate/planbuilder/operators/table.go
@@ -91,7 +91,7 @@ func (to *Table) GetColumns(*plancontext.PlanningContext) []*sqlparser.AliasedEx
 	return slice.Map(to.Columns, colNameToExpr)
 }
 
-func (to *Table) GetSelectExprs(ctx *plancontext.PlanningContext) sqlparser.SelectExprs {
+func (to *Table) GetSelectExprs(ctx *plancontext.PlanningContext) []sqlparser.SelectExpr {
 	return transformColumnsToSelectExprs(ctx, to)
 }
 
diff --git a/go/vt/vtgate/planbuilder/operators/union.go b/go/vt/vtgate/planbuilder/operators/union.go
index 1c692c9f38e..4539569fdc0 100644
--- a/go/vt/vtgate/planbuilder/operators/union.go
+++ b/go/vt/vtgate/planbuilder/operators/union.go
@@ -30,14 +30,14 @@ type Union struct {
 	Sources []Operator
 
 	// These are the select expressions coming from each source
-	Selects  []sqlparser.SelectExprs
+	Selects  [][]sqlparser.SelectExpr
 	distinct bool
 
-	unionColumns              sqlparser.SelectExprs
+	unionColumns              []sqlparser.SelectExpr
 	unionColumnsAsAlisedExprs []*sqlparser.AliasedExpr
 }
 
-func newUnion(srcs []Operator, sourceSelects []sqlparser.SelectExprs, columns sqlparser.SelectExprs, distinct bool) *Union {
+func newUnion(srcs []Operator, sourceSelects [][]sqlparser.SelectExpr, columns []sqlparser.SelectExpr, distinct bool) *Union {
 	if columns == nil {
 		panic("rt")
 	}
@@ -95,7 +95,7 @@ can be found on the same offset. The names of the RHS are discarded.
 func (u *Union) AddPredicate(ctx *plancontext.PlanningContext, expr sqlparser.Expr) Operator {
 	offsets := make(map[string]int)
 	sel := u.GetSelectFor(0)
-	for i, selectExpr := range sel.SelectExprs {
+	for i, selectExpr := range sel.GetColumns() {
 		ae, ok := selectExpr.(*sqlparser.AliasedExpr)
 		if !ok {
 			panic(vterrors.VT12001("pushing predicates on UNION where the first SELECT contains * or NEXT"))
@@ -133,7 +133,7 @@ func (u *Union) predicatePerSource(expr sqlparser.Expr, offsets map[string]int)
 			}
 
 			sel := u.GetSelectFor(i)
-			ae, ok := sel.SelectExprs[idx].(*sqlparser.AliasedExpr)
+			ae, ok := sel.GetColumns()[idx].(*sqlparser.AliasedExpr)
 			if !ok {
 				panic(vterrors.VT09015())
 			}
@@ -269,7 +269,7 @@ func (u *Union) GetColumns(ctx *plancontext.PlanningContext) (result []*sqlparse
 	return u.unionColumnsAsAlisedExprs
 }
 
-func (u *Union) GetSelectExprs(ctx *plancontext.PlanningContext) sqlparser.SelectExprs {
+func (u *Union) GetSelectExprs(ctx *plancontext.PlanningContext) []sqlparser.SelectExpr {
 	// if any of the inputs has more columns that we expect, we want to show on top of UNION, so the results can
 	// be truncated to the expected result columns and nothing else
 	for _, src := range u.Sources {
diff --git a/go/vt/vtgate/planbuilder/operators/union_merging.go b/go/vt/vtgate/planbuilder/operators/union_merging.go
index 6173b59e0dc..b38cc4e9561 100644
--- a/go/vt/vtgate/planbuilder/operators/union_merging.go
+++ b/go/vt/vtgate/planbuilder/operators/union_merging.go
@@ -25,7 +25,7 @@ import (
 
 // mergeUnionInputInAnyOrder merges sources the sources of the union in any order
 // can be used for UNION DISTINCT
-func mergeUnionInputInAnyOrder(ctx *plancontext.PlanningContext, op *Union) ([]Operator, []sqlparser.SelectExprs) {
+func mergeUnionInputInAnyOrder(ctx *plancontext.PlanningContext, op *Union) ([]Operator, [][]sqlparser.SelectExpr) {
 	sources := op.Sources
 	selects := op.Selects
 
@@ -57,7 +57,7 @@ func mergeUnionInputInAnyOrder(ctx *plancontext.PlanningContext, op *Union) ([]O
 		}
 
 		var newSources []Operator
-		var newSelects []sqlparser.SelectExprs
+		var newSelects [][]sqlparser.SelectExpr
 		for i, source := range sources {
 			if keep[i] || i <= idx {
 				newSources = append(newSources, source)
@@ -72,7 +72,7 @@ func mergeUnionInputInAnyOrder(ctx *plancontext.PlanningContext, op *Union) ([]O
 	return sources, selects
 }
 
-func mergeUnionInputsInOrder(ctx *plancontext.PlanningContext, op *Union) ([]Operator, []sqlparser.SelectExprs) {
+func mergeUnionInputsInOrder(ctx *plancontext.PlanningContext, op *Union) ([]Operator, [][]sqlparser.SelectExpr) {
 	sources := op.Sources
 	selects := op.Selects
 	for {
@@ -105,9 +105,9 @@ func mergeUnionInputsInOrder(ctx *plancontext.PlanningContext, op *Union) ([]Ope
 func mergeUnionInputs(
 	ctx *plancontext.PlanningContext,
 	lhs, rhs Operator,
-	lhsExprs, rhsExprs sqlparser.SelectExprs,
+	lhsExprs, rhsExprs []sqlparser.SelectExpr,
 	distinct bool,
-) (Operator, sqlparser.SelectExprs) {
+) (Operator, []sqlparser.SelectExpr) {
 	lhsRoute, rhsRoute, routingA, routingB, a, b, sameKeyspace := prepareInputRoutes(ctx, lhs, rhs)
 	if lhsRoute == nil {
 		return nil, nil
@@ -138,9 +138,9 @@ func mergeUnionInputs(
 func tryMergeUnionShardedRouting(
 	ctx *plancontext.PlanningContext,
 	routeA, routeB *Route,
-	exprsA, exprsB sqlparser.SelectExprs,
+	exprsA, exprsB []sqlparser.SelectExpr,
 	distinct bool,
-) (Operator, sqlparser.SelectExprs) {
+) (Operator, []sqlparser.SelectExpr) {
 	tblA := routeA.Routing.(*ShardedRouting)
 	tblB := routeB.Routing.(*ShardedRouting)
 
@@ -172,13 +172,13 @@ func tryMergeUnionShardedRouting(
 func createMergedUnion(
 	ctx *plancontext.PlanningContext,
 	lhsRoute, rhsRoute *Route,
-	lhsExprs, rhsExprs sqlparser.SelectExprs,
+	lhsExprs, rhsExprs []sqlparser.SelectExpr,
 	distinct bool,
-	routing Routing) (Operator, sqlparser.SelectExprs) {
+	routing Routing) (Operator, []sqlparser.SelectExpr) {
 
 	// if there are `*` on either side, or a different number of SelectExpr items,
 	// we give up aligning the expressions and trust that we can push everything down
-	cols := make(sqlparser.SelectExprs, len(lhsExprs))
+	cols := make([]sqlparser.SelectExpr, len(lhsExprs))
 	noDeps := len(lhsExprs) != len(rhsExprs)
 	for idx, col := range lhsExprs {
 		lae, ok := col.(*sqlparser.AliasedExpr)
@@ -219,7 +219,8 @@ func createMergedUnion(
 		ctx.SemTable.Recursive[col] = deps
 	}
 
-	union := newUnion([]Operator{lhsRoute.Source, rhsRoute.Source}, []sqlparser.SelectExprs{lhsExprs, rhsExprs}, cols, distinct)
+	exprs := [][]sqlparser.SelectExpr{lhsExprs, rhsExprs}
+	union := newUnion([]Operator{lhsRoute.Source, rhsRoute.Source}, exprs, cols, distinct)
 	selectExprs := unionSelects(lhsExprs)
 	return &Route{
 		unaryOperator: newUnaryOp(union),
@@ -241,7 +242,7 @@ func compactUnion(u *Union) *ApplyResult {
 	}
 
 	var newSources []Operator
-	var newSelects []sqlparser.SelectExprs
+	var newSelects [][]sqlparser.SelectExpr
 	merged := false
 
 	for idx, source := range u.Sources {
diff --git a/go/vt/vtgate/planbuilder/operators/update.go b/go/vt/vtgate/planbuilder/operators/update.go
index 0fa0d10d9c7..759500a8dc8 100644
--- a/go/vt/vtgate/planbuilder/operators/update.go
+++ b/go/vt/vtgate/planbuilder/operators/update.go
@@ -186,7 +186,7 @@ func createUpdateWithInputOp(ctx *plancontext.PlanningContext, upd *sqlparser.Up
 		colsList = append(colsList, from.cols)
 		uList = append(uList, from.updList)
 		for _, col := range from.cols {
-			selectStmt.SelectExprs = append(selectStmt.SelectExprs, aeWrap(col))
+			selectStmt.AddSelectExpr(aeWrap(col))
 		}
 		return from.op
 	})
@@ -889,7 +889,7 @@ func createFkVerifyOpForParentFKForUpdate(ctx *plancontext.PlanningContext, upda
 		whereCond = &sqlparser.AndExpr{Left: whereCond, Right: prefixColNames(ctx, childTbl, updStmt.Where.Expr)}
 	}
 	return createSelectionOp(ctx,
-		sqlparser.SelectExprs{sqlparser.NewAliasedExpr(sqlparser.NewIntLiteral("1"), "")},
+		[]sqlparser.SelectExpr{sqlparser.NewAliasedExpr(sqlparser.NewIntLiteral("1"), "")},
 		[]sqlparser.TableExpr{
 			sqlparser.NewJoinTableExpr(
 				childTblExpr,
@@ -973,7 +973,7 @@ func createFkVerifyOpForChildFKForUpdate(ctx *plancontext.PlanningContext, updat
 	}
 
 	return createSelectionOp(ctx,
-		sqlparser.SelectExprs{sqlparser.NewAliasedExpr(sqlparser.NewIntLiteral("1"), "")},
+		[]sqlparser.SelectExpr{sqlparser.NewAliasedExpr(sqlparser.NewIntLiteral("1"), "")},
 		[]sqlparser.TableExpr{
 			sqlparser.NewJoinTableExpr(
 				parentTblExpr,
@@ -1056,7 +1056,7 @@ func buildChangedVindexesValues(
 		}
 
 		// Checks done, let's actually add the expressions and the vindex map
-		selExprs = append(selExprs, aeWrap(sqlparser.AndExpressions(compExprs...)))
+		selExprs.Exprs = append(selExprs.Exprs, aeWrap(sqlparser.AndExpressions(compExprs...)))
 		changedVindexes[vindex.Name] = &engine.VindexValues{
 			EvalExprMap: vindexValueMap,
 			Offset:      offset,
@@ -1076,16 +1076,16 @@ func buildChangedVindexesValues(
 	return changedVindexes, ovq, subQueriesArgOnChangedVindex
 }
 
-func initialQuery(ksidCols []sqlparser.IdentifierCI, table *vindexes.BaseTable) (sqlparser.SelectExprs, int) {
-	var selExprs sqlparser.SelectExprs
+func initialQuery(ksidCols []sqlparser.IdentifierCI, table *vindexes.BaseTable) (*sqlparser.SelectExprs, int) {
+	selExprs := new(sqlparser.SelectExprs)
 	offset := 0
 	for _, col := range ksidCols {
-		selExprs = append(selExprs, aeWrap(sqlparser.NewColName(col.String())))
+		selExprs.Exprs = append(selExprs.Exprs, aeWrap(sqlparser.NewColName(col.String())))
 		offset++
 	}
 	for _, cv := range table.Owned {
 		for _, column := range cv.Columns {
-			selExprs = append(selExprs, aeWrap(sqlparser.NewColName(column.String())))
+			selExprs.Exprs = append(selExprs.Exprs, aeWrap(sqlparser.NewColName(column.String())))
 			offset++
 		}
 	}
diff --git a/go/vt/vtgate/planbuilder/operators/utils_test.go b/go/vt/vtgate/planbuilder/operators/utils_test.go
index 035a273e964..babf6c91afb 100644
--- a/go/vt/vtgate/planbuilder/operators/utils_test.go
+++ b/go/vt/vtgate/planbuilder/operators/utils_test.go
@@ -73,8 +73,7 @@ func (f *fakeOp) GetColumns(ctx *plancontext.PlanningContext) []*sqlparser.Alias
 	panic("implement me")
 }
 
-func (f *fakeOp) GetSelectExprs(ctx *plancontext.PlanningContext) sqlparser.SelectExprs {
-	// TODO implement me
+func (f *fakeOp) GetSelectExprs(ctx *plancontext.PlanningContext) []sqlparser.SelectExpr {
 	panic("implement me")
 }
 
diff --git a/go/vt/vtgate/planbuilder/operators/vindex.go b/go/vt/vtgate/planbuilder/operators/vindex.go
index cb0719b815f..753cf5cb3cd 100644
--- a/go/vt/vtgate/planbuilder/operators/vindex.go
+++ b/go/vt/vtgate/planbuilder/operators/vindex.go
@@ -100,7 +100,7 @@ func (v *Vindex) GetColumns(*plancontext.PlanningContext) []*sqlparser.AliasedEx
 	return slice.Map(v.Columns, colNameToExpr)
 }
 
-func (v *Vindex) GetSelectExprs(ctx *plancontext.PlanningContext) sqlparser.SelectExprs {
+func (v *Vindex) GetSelectExprs(ctx *plancontext.PlanningContext) []sqlparser.SelectExpr {
 	return transformColumnsToSelectExprs(ctx, v)
 }
 
diff --git a/go/vt/vtgate/planbuilder/plan_test.go b/go/vt/vtgate/planbuilder/plan_test.go
index 8a8d55279a6..b1731561dd4 100644
--- a/go/vt/vtgate/planbuilder/plan_test.go
+++ b/go/vt/vtgate/planbuilder/plan_test.go
@@ -229,17 +229,16 @@ func (s *planTestSuite) setFks(vschema *vindexes.VSchema) {
 		_ = vschema.AddForeignKey("unsharded_fk_allow", "u_multicol_tbl2", createFkDefinition([]string{"cola", "colb"}, "u_multicol_tbl1", []string{"cola", "colb"}, sqlparser.SetNull, sqlparser.SetNull))
 		_ = vschema.AddForeignKey("unsharded_fk_allow", "u_multicol_tbl3", createFkDefinition([]string{"cola", "colb"}, "u_multicol_tbl2", []string{"cola", "colb"}, sqlparser.Cascade, sqlparser.Cascade))
 
-		_ = vschema.AddUniqueKey("unsharded_fk_allow", "u_tbl9", sqlparser.Exprs{sqlparser.NewColName("col9")})
-		_ = vschema.AddUniqueKey("unsharded_fk_allow", "u_tbl9", sqlparser.Exprs{&sqlparser.BinaryExpr{Operator: sqlparser.MultOp, Left: sqlparser.NewColName("col9"), Right: sqlparser.NewColName("foo")}})
-		_ = vschema.AddUniqueKey("unsharded_fk_allow", "u_tbl9", sqlparser.Exprs{sqlparser.NewColName("col9"), sqlparser.NewColName("foo")})
-		_ = vschema.AddUniqueKey("unsharded_fk_allow", "u_tbl9", sqlparser.Exprs{sqlparser.NewColName("foo"), sqlparser.NewColName("bar")})
-		_ = vschema.AddUniqueKey("unsharded_fk_allow", "u_tbl9", sqlparser.Exprs{sqlparser.NewColName("bar"), sqlparser.NewColName("col9")})
-		_ = vschema.AddUniqueKey("unsharded_fk_allow", "u_tbl8", sqlparser.Exprs{sqlparser.NewColName("col8")})
+		_ = vschema.AddUniqueKey("unsharded_fk_allow", "u_tbl9", []sqlparser.Expr{sqlparser.NewColName("col9")})
+		_ = vschema.AddUniqueKey("unsharded_fk_allow", "u_tbl9", []sqlparser.Expr{&sqlparser.BinaryExpr{Operator: sqlparser.MultOp, Left: sqlparser.NewColName("col9"), Right: sqlparser.NewColName("foo")}})
+		_ = vschema.AddUniqueKey("unsharded_fk_allow", "u_tbl9", []sqlparser.Expr{sqlparser.NewColName("col9"), sqlparser.NewColName("foo")})
+		_ = vschema.AddUniqueKey("unsharded_fk_allow", "u_tbl9", []sqlparser.Expr{sqlparser.NewColName("foo"), sqlparser.NewColName("bar")})
+		_ = vschema.AddUniqueKey("unsharded_fk_allow", "u_tbl9", []sqlparser.Expr{sqlparser.NewColName("bar"), sqlparser.NewColName("col9")})
+		_ = vschema.AddUniqueKey("unsharded_fk_allow", "u_tbl8", []sqlparser.Expr{sqlparser.NewColName("col8")})
 
 		s.addPKs(vschema, "unsharded_fk_allow", []string{"u_tbl1", "u_tbl2", "u_tbl3", "u_tbl4", "u_tbl5", "u_tbl6", "u_tbl7", "u_tbl8", "u_tbl9", "u_tbl10", "u_tbl11",
 			"u_multicol_tbl1", "u_multicol_tbl2", "u_multicol_tbl3"})
 	}
-
 }
 
 func (s *planTestSuite) addPKs(vschema *vindexes.VSchema, ks string, tbls []string) {
diff --git a/go/vt/vtgate/planbuilder/planner_test.go b/go/vt/vtgate/planbuilder/planner_test.go
index bd4c520510c..7cb66e3d101 100644
--- a/go/vt/vtgate/planbuilder/planner_test.go
+++ b/go/vt/vtgate/planbuilder/planner_test.go
@@ -85,5 +85,5 @@ func TestBindingSubquery(t *testing.T) {
 }
 
 func extractExpr(in *sqlparser.Select, idx int) sqlparser.Expr {
-	return in.SelectExprs[idx].(*sqlparser.AliasedExpr).Expr
+	return in.SelectExprs.Exprs[idx].(*sqlparser.AliasedExpr).Expr
 }
diff --git a/go/vt/vtgate/planbuilder/route.go b/go/vt/vtgate/planbuilder/route.go
index e320df14416..74a13284e81 100644
--- a/go/vt/vtgate/planbuilder/route.go
+++ b/go/vt/vtgate/planbuilder/route.go
@@ -73,12 +73,8 @@ func prepareTheAST(sel sqlparser.SelectStatement) {
 	_ = sqlparser.Walk(func(node sqlparser.SQLNode) (bool, error) {
 		switch node := node.(type) {
 		case *sqlparser.Select:
-			if len(node.SelectExprs) == 0 {
-				node.SelectExprs = []sqlparser.SelectExpr{
-					&sqlparser.AliasedExpr{
-						Expr: sqlparser.NewIntLiteral("1"),
-					},
-				}
+			if node.GetColumnCount() == 0 {
+				node.AddSelectExpr(&sqlparser.AliasedExpr{Expr: sqlparser.NewIntLiteral("1")})
 			}
 		case *sqlparser.ComparisonExpr:
 			// 42 = colName -> colName = 42
diff --git a/go/vt/vtgate/planbuilder/select.go b/go/vt/vtgate/planbuilder/select.go
index 409343f2760..d7fbf59ac13 100644
--- a/go/vt/vtgate/planbuilder/select.go
+++ b/go/vt/vtgate/planbuilder/select.go
@@ -139,19 +139,20 @@ func buildSQLCalcFoundRowsPlan(
 	sel2.OrderBy = nil
 	sel2.Limit = nil
 
-	countStartExpr := []sqlparser.SelectExpr{&sqlparser.AliasedExpr{
-		Expr: &sqlparser.CountStar{},
-	}}
+	countStar := &sqlparser.AliasedExpr{Expr: &sqlparser.CountStar{}}
+	selectExprs := &sqlparser.SelectExprs{
+		Exprs: []sqlparser.SelectExpr{countStar},
+	}
 	if sel2.GroupBy == nil && sel2.Having == nil {
 		// if there is no grouping, we can use the same query and
 		// just replace the SELECT sub-clause to have a single count(*)
-		sel2.SelectExprs = countStartExpr
+		sel2.SetSelectExprs(countStar)
 	} else {
 		// when there is grouping, we have to move the original query into a derived table.
 		//                       select id, sum(12) from user group by id =>
 		// select count(*) from (select id, sum(12) from user group by id) t
 		sel3 := &sqlparser.Select{
-			SelectExprs: countStartExpr,
+			SelectExprs: selectExprs,
 			From: []sqlparser.TableExpr{
 				&sqlparser.AliasedTableExpr{
 					Expr: &sqlparser.DerivedTable{Select: sel2},
@@ -292,10 +293,12 @@ func handleDualSelects(sel *sqlparser.Select, vschema plancontext.VSchema) (engi
 		return nil, nil
 	}
 
-	exprs := make([]evalengine.Expr, len(sel.SelectExprs))
-	cols := make([]string, len(sel.SelectExprs))
+	columns := sel.GetColumns()
+	size := len(columns)
+	exprs := make([]evalengine.Expr, size)
+	cols := make([]string, size)
 	var lockFunctions []*engine.LockFunc
-	for i, e := range sel.SelectExprs {
+	for i, e := range columns {
 		expr, ok := e.(*sqlparser.AliasedExpr)
 		if !ok {
 			return nil, nil
diff --git a/go/vt/vtgate/planbuilder/system_variables.go b/go/vt/vtgate/planbuilder/system_variables.go
index 8ef968a2ac8..e4713e877de 100644
--- a/go/vt/vtgate/planbuilder/system_variables.go
+++ b/go/vt/vtgate/planbuilder/system_variables.go
@@ -60,7 +60,7 @@ func (pc *sysvarPlanCache) parseAndBuildDefaultValue(sysvar sysvars.SystemVariab
 		panic(fmt.Sprintf("bug in set plan init - default value for %s not parsable: %s", sysvar.Name, sysvar.Default))
 	}
 	sel := stmt.(*sqlparser.Select)
-	aliasedExpr := sel.SelectExprs[0].(*sqlparser.AliasedExpr)
+	aliasedExpr := sel.GetColumns()[0].(*sqlparser.AliasedExpr)
 	def, err := evalengine.Translate(aliasedExpr.Expr, &evalengine.Config{
 		Collation:   pc.env.CollationEnv().DefaultConnectionCharset(),
 		Environment: pc.env,
diff --git a/go/vt/vtgate/semantics/analyzer.go b/go/vt/vtgate/semantics/analyzer.go
index c4e7dc55866..46de35323ad 100644
--- a/go/vt/vtgate/semantics/analyzer.go
+++ b/go/vt/vtgate/semantics/analyzer.go
@@ -149,7 +149,7 @@ func (a *analyzer) newSemTable(
 			Direct:                    ExprDependencies{},
 			ColumnEqualities:          map[columnName][]sqlparser.Expr{},
 			ExpandedColumns:           map[sqlparser.TableName][]*sqlparser.ColName{},
-			columns:                   map[*sqlparser.Union]sqlparser.SelectExprs{},
+			columns:                   map[*sqlparser.Union][]sqlparser.SelectExpr{},
 			StatementIDs:              a.scoper.statementIDs,
 			QuerySignature:            a.sig,
 			childForeignKeysInvolved:  map[TableSet][]vindexes.ChildFKInfo{},
@@ -159,7 +159,7 @@ func (a *analyzer) newSemTable(
 		}, nil
 	}
 
-	columns := map[*sqlparser.Union]sqlparser.SelectExprs{}
+	columns := map[*sqlparser.Union][]sqlparser.SelectExpr{}
 	for union, info := range a.tables.unionInfo {
 		columns[union] = info.exprs
 	}
@@ -275,7 +275,7 @@ func (a *analyzer) analyzeUp(cursor *sqlparser.Cursor) bool {
 	return a.shouldContinue()
 }
 
-func containsStar(s sqlparser.SelectExprs) bool {
+func containsStar(s []sqlparser.SelectExpr) bool {
 	for _, expr := range s {
 		_, isStar := expr.(*sqlparser.StarExpr)
 		if isStar {
@@ -306,8 +306,10 @@ func checkUnionColumns(union *sqlparser.Union) error {
 		return nil
 	}
 
-	if len(secondProj) != len(firstProj) {
-		return &UnionColumnsDoNotMatchError{FirstProj: len(firstProj), SecondProj: len(secondProj)}
+	secondSize := len(secondProj)
+	firstSize := len(firstProj)
+	if secondSize != firstSize {
+		return &UnionColumnsDoNotMatchError{FirstProj: firstSize, SecondProj: secondSize}
 	}
 
 	return nil
@@ -318,14 +320,14 @@ errors that happen when we are evaluating SELECT expressions are saved until we
 if we can merge everything into a single route or not
 */
 func (a *analyzer) enterProjection(cursor *sqlparser.Cursor) {
-	_, ok := cursor.Node().(sqlparser.SelectExprs)
+	_, ok := cursor.Node().(*sqlparser.SelectExprs)
 	if ok && isParentSelect(cursor) {
 		a.inProjection++
 	}
 }
 
 func (a *analyzer) leaveProjection(cursor *sqlparser.Cursor) {
-	_, ok := cursor.Node().(sqlparser.SelectExprs)
+	_, ok := cursor.Node().(*sqlparser.SelectExprs)
 	if ok && isParentSelect(cursor) {
 		a.inProjection--
 	}
diff --git a/go/vt/vtgate/semantics/analyzer_test.go b/go/vt/vtgate/semantics/analyzer_test.go
index c7f24e6c73c..72b9ad83eb4 100644
--- a/go/vt/vtgate/semantics/analyzer_test.go
+++ b/go/vt/vtgate/semantics/analyzer_test.go
@@ -41,7 +41,7 @@ var (
 )
 
 func extract(in *sqlparser.Select, idx int) sqlparser.Expr {
-	return in.SelectExprs[idx].(*sqlparser.AliasedExpr).Expr
+	return in.SelectExprs.Exprs[idx].(*sqlparser.AliasedExpr).Expr
 }
 
 func TestBindingSingleTablePositive(t *testing.T) {
@@ -575,7 +575,7 @@ func TestScopeForSubqueries(t *testing.T) {
 			sel, _ := stmt.(*sqlparser.Select)
 
 			// extract the first expression from the subquery (which should be the second expression in the outer query)
-			sel2 := sel.SelectExprs[1].(*sqlparser.AliasedExpr).Expr.(*sqlparser.Subquery).Select.(*sqlparser.Select)
+			sel2 := extract(sel, 1).(*sqlparser.Subquery).Select.(*sqlparser.Select)
 			exp := extract(sel2, 0)
 			s1 := semTable.RecursiveDeps(exp)
 			require.NoError(t, semTable.NotSingleRouteErr)
@@ -1458,7 +1458,7 @@ func TestScopingSubQueryJoinClause(t *testing.T) {
 	require.NoError(t, err)
 	require.NoError(t, st.NotUnshardedErr)
 
-	tb := st.DirectDeps(parse.(*sqlparser.Select).SelectExprs[0].(*sqlparser.AliasedExpr).Expr.(*sqlparser.Subquery).Select.(*sqlparser.Select).From[0].(*sqlparser.JoinTableExpr).Condition.On)
+	tb := st.DirectDeps(extract(parse.(*sqlparser.Select), 0).(*sqlparser.Subquery).Select.(*sqlparser.Select).From[0].(*sqlparser.JoinTableExpr).Condition.On)
 	require.Equal(t, 3, tb.NumberOfTables())
 
 }
diff --git a/go/vt/vtgate/semantics/binder.go b/go/vt/vtgate/semantics/binder.go
index 78148f4bb1f..b59b50159b7 100644
--- a/go/vt/vtgate/semantics/binder.go
+++ b/go/vt/vtgate/semantics/binder.go
@@ -365,7 +365,7 @@ func (b *binder) resolveColumnInHaving(colName *sqlparser.ColName, current *scop
 // searchInSelectExpressions searches for the ColName among the SELECT and GROUP BY expressions
 // It used dependency information to match the columns
 func (b *binder) searchInSelectExpressions(colName *sqlparser.ColName, deps dependency, stmt *sqlparser.Select) dependency {
-	for _, selectExpr := range stmt.SelectExprs {
+	for _, selectExpr := range stmt.GetColumns() {
 		ae, ok := selectExpr.(*sqlparser.AliasedExpr)
 		if !ok {
 			continue
diff --git a/go/vt/vtgate/semantics/check_invalid.go b/go/vt/vtgate/semantics/check_invalid.go
index 6509f5f5ee8..e2519208caa 100644
--- a/go/vt/vtgate/semantics/check_invalid.go
+++ b/go/vt/vtgate/semantics/check_invalid.go
@@ -163,8 +163,8 @@ func (a *analyzer) checkSelect(cursor *sqlparser.Cursor, node *sqlparser.Select)
 	}
 	errMsg := "INTO"
 	nextVal := false
-	if len(node.SelectExprs) == 1 {
-		if _, isNextVal := node.SelectExprs[0].(*sqlparser.Nextval); isNextVal {
+	if node.GetColumnCount() == 1 {
+		if _, isNextVal := node.GetColumns()[0].(*sqlparser.Nextval); isNextVal {
 			nextVal = true
 			errMsg = "NEXT"
 		}
diff --git a/go/vt/vtgate/semantics/derived_table.go b/go/vt/vtgate/semantics/derived_table.go
index 676679d2fa9..8a456ad7c5c 100644
--- a/go/vt/vtgate/semantics/derived_table.go
+++ b/go/vt/vtgate/semantics/derived_table.go
@@ -43,13 +43,13 @@ type unionInfo struct {
 	isAuthoritative bool
 	recursive       []TableSet
 	types           []evalengine.Type
-	exprs           sqlparser.SelectExprs
+	exprs           []sqlparser.SelectExpr
 }
 
 var _ TableInfo = (*DerivedTable)(nil)
 
 func createDerivedTableForExpressions(
-	expressions sqlparser.SelectExprs,
+	expressions []sqlparser.SelectExpr,
 	cols sqlparser.Columns,
 	tables []TableInfo,
 	org originable,
diff --git a/go/vt/vtgate/semantics/early_rewriter.go b/go/vt/vtgate/semantics/early_rewriter.go
index 64426e25748..a76164c2745 100644
--- a/go/vt/vtgate/semantics/early_rewriter.go
+++ b/go/vt/vtgate/semantics/early_rewriter.go
@@ -45,7 +45,7 @@ type earlyRewriter struct {
 
 func (r *earlyRewriter) down(cursor *sqlparser.Cursor) error {
 	switch node := cursor.Node().(type) {
-	case sqlparser.SelectExprs:
+	case *sqlparser.SelectExprs:
 		return r.handleSelectExprs(cursor, node)
 	case *sqlparser.NotExpr:
 		rewriteNotExpr(cursor, node)
@@ -225,7 +225,7 @@ func (r *earlyRewriter) handleHavingClause(node *sqlparser.Where, parent sqlpars
 }
 
 // handleSelectExprs expands * in SELECT expressions.
-func (r *earlyRewriter) handleSelectExprs(cursor *sqlparser.Cursor, node sqlparser.SelectExprs) error {
+func (r *earlyRewriter) handleSelectExprs(cursor *sqlparser.Cursor, node *sqlparser.SelectExprs) error {
 	_, isSel := cursor.Parent().(*sqlparser.Select)
 	if !isSel {
 		return nil
@@ -732,7 +732,7 @@ func (r *earlyRewriter) getAliasMap(sel *sqlparser.Select) (aliases map[string]e
 		return
 	}
 	aliases = map[string]exprContainer{}
-	for _, e := range sel.SelectExprs {
+	for _, e := range sel.GetColumns() {
 		ae, ok := e.(*sqlparser.AliasedExpr)
 		if !ok {
 			continue
@@ -776,7 +776,7 @@ func (r *earlyRewriter) rewriteOrderByLiteral(node *sqlparser.Literal) (expr sql
 		return nil, false, vterrors.Errorf(vtrpcpb.Code_INTERNAL, "error invalid statement type, expect Select, got: %T", scope.stmt)
 	}
 
-	if num < 1 || num > len(stmt.SelectExprs) {
+	if num < 1 || num > stmt.GetColumnCount() {
 		return nil, false, &ColumnNotFoundClauseError{
 			Column: fmt.Sprintf("%d", num),
 			Clause: r.clause,
@@ -785,13 +785,13 @@ func (r *earlyRewriter) rewriteOrderByLiteral(node *sqlparser.Literal) (expr sql
 
 	// We loop like this instead of directly accessing the offset, to make sure there are no unexpanded `*` before
 	for i := 0; i < num; i++ {
-		if _, ok := stmt.SelectExprs[i].(*sqlparser.AliasedExpr); !ok {
-			return nil, false, vterrors.Errorf(vtrpcpb.Code_UNIMPLEMENTED, "cannot use column offsets in %s when using `%s`", r.clause, sqlparser.String(stmt.SelectExprs[i]))
+		if _, ok := stmt.GetColumns()[i].(*sqlparser.AliasedExpr); !ok {
+			return nil, false, vterrors.Errorf(vtrpcpb.Code_UNIMPLEMENTED, "cannot use column offsets in %s when using `%s`", r.clause, sqlparser.String(stmt.GetColumns()[i]))
 		}
 	}
 
 	colOffset := num - 1
-	aliasedExpr, ok := stmt.SelectExprs[colOffset].(*sqlparser.AliasedExpr)
+	aliasedExpr, ok := stmt.GetColumns()[colOffset].(*sqlparser.AliasedExpr)
 	if !ok {
 		return nil, false, vterrors.Errorf(vtrpcpb.Code_INTERNAL, "don't know how to handle %s", sqlparser.String(node))
 	}
@@ -831,18 +831,18 @@ func (r *earlyRewriter) rewriteGroupByExpr(node *sqlparser.Literal) (sqlparser.E
 		return nil, vterrors.Errorf(vtrpcpb.Code_INTERNAL, "error invalid statement type, expect Select, got: %T", scope.stmt)
 	}
 
-	if num < 1 || num > len(stmt.SelectExprs) {
+	if num < 1 || num > stmt.GetColumnCount() {
 		return nil, vterrors.NewErrorf(vtrpcpb.Code_INVALID_ARGUMENT, vterrors.BadFieldError, "Unknown column '%d' in '%s'", num, r.clause)
 	}
 
 	// We loop like this instead of directly accessing the offset, to make sure there are no unexpanded `*` before
 	for i := 0; i < num; i++ {
-		if _, ok := stmt.SelectExprs[i].(*sqlparser.AliasedExpr); !ok {
-			return nil, vterrors.Errorf(vtrpcpb.Code_UNIMPLEMENTED, "cannot use column offsets in %s when using `%s`", r.clause, sqlparser.String(stmt.SelectExprs[i]))
+		if _, ok := stmt.GetColumns()[i].(*sqlparser.AliasedExpr); !ok {
+			return nil, vterrors.Errorf(vtrpcpb.Code_UNIMPLEMENTED, "cannot use column offsets in %s when using `%s`", r.clause, sqlparser.String(stmt.GetColumns()[i]))
 		}
 	}
 
-	aliasedExpr, ok := stmt.SelectExprs[num-1].(*sqlparser.AliasedExpr)
+	aliasedExpr, ok := stmt.GetColumns()[num-1].(*sqlparser.AliasedExpr)
 	if !ok {
 		return nil, vterrors.Errorf(vtrpcpb.Code_INTERNAL, "don't know how to handle %s", sqlparser.String(node))
 	}
@@ -876,14 +876,14 @@ func handleComparisonExpr(cursor *sqlparser.Cursor, node *sqlparser.ComparisonEx
 	return nil
 }
 
-func (r *earlyRewriter) expandStar(cursor *sqlparser.Cursor, node sqlparser.SelectExprs) error {
+func (r *earlyRewriter) expandStar(cursor *sqlparser.Cursor, node *sqlparser.SelectExprs) error {
 	currentScope := r.scoper.currentScope()
-	var selExprs sqlparser.SelectExprs
+	selExprs := new(sqlparser.SelectExprs)
 	changed := false
-	for _, selectExpr := range node {
+	for _, selectExpr := range node.Exprs {
 		starExpr, isStarExpr := selectExpr.(*sqlparser.StarExpr)
 		if !isStarExpr {
-			selExprs = append(selExprs, selectExpr)
+			selExprs.Exprs = append(selExprs.Exprs, selectExpr)
 			continue
 		}
 		starExpanded, colNames, err := r.expandTableColumns(starExpr, currentScope.tables, r.binder.usingJoinInfo, r.scoper.org)
@@ -891,10 +891,10 @@ func (r *earlyRewriter) expandStar(cursor *sqlparser.Cursor, node sqlparser.Sele
 			return err
 		}
 		if !starExpanded || colNames == nil {
-			selExprs = append(selExprs, selectExpr)
+			selExprs.Exprs = append(selExprs.Exprs, selectExpr)
 			continue
 		}
-		selExprs = append(selExprs, colNames...)
+		selExprs.Exprs = append(selExprs.Exprs, colNames.Exprs...)
 		changed = true
 	}
 	if changed {
@@ -1065,11 +1065,11 @@ func (r *earlyRewriter) expandTableColumns(
 	tables []TableInfo,
 	joinUsing map[TableSet]map[string]TableSet,
 	org originable,
-) (bool, sqlparser.SelectExprs, error) {
+) (bool, *sqlparser.SelectExprs, error) {
 	unknownTbl := true
 	starExpanded := true
 	state := &expanderState{
-		colNames:        []sqlparser.SelectExpr{},
+		colNames:        &sqlparser.SelectExprs{},
 		needsQualifier:  len(tables) > 1,
 		joinUsing:       joinUsing,
 		org:             org,
@@ -1155,7 +1155,7 @@ outer:
 
 type expanderState struct {
 	needsQualifier  bool
-	colNames        sqlparser.SelectExprs
+	colNames        *sqlparser.SelectExprs
 	joinUsing       map[TableSet]map[string]TableSet
 	org             originable
 	expandedColumns map[sqlparser.TableName][]*sqlparser.ColName
@@ -1171,7 +1171,7 @@ func (e *expanderState) addColumn(col ColumnInfo, tbl TableInfo, tblName sqlpars
 	} else {
 		colName = sqlparser.NewColName(col.Name)
 	}
-	e.colNames = append(e.colNames, &sqlparser.AliasedExpr{Expr: colName, As: alias})
+	e.colNames.Exprs = append(e.colNames.Exprs, &sqlparser.AliasedExpr{Expr: colName, As: alias})
 	e.storeExpandInfo(tbl, tblName, colName)
 }
 
diff --git a/go/vt/vtgate/semantics/early_rewriter_test.go b/go/vt/vtgate/semantics/early_rewriter_test.go
index 29da6ab51ee..074deb39f64 100644
--- a/go/vt/vtgate/semantics/early_rewriter_test.go
+++ b/go/vt/vtgate/semantics/early_rewriter_test.go
@@ -790,16 +790,17 @@ func TestSemTableDependenciesAfterExpandStar(t *testing.T) {
 			semTable, err := Analyze(selectStatement, "", schemaInfo)
 			require.NoError(t, err)
 			assert.Equal(t, tcase.expSQL, sqlparser.String(selectStatement))
+			exprs := selectStatement.GetColumns()
 			if tcase.otherTbl != -1 {
 				assert.NotEqual(t,
-					semTable.RecursiveDeps(selectStatement.SelectExprs[tcase.otherTbl].(*sqlparser.AliasedExpr).Expr),
-					semTable.RecursiveDeps(selectStatement.SelectExprs[tcase.expandedCol].(*sqlparser.AliasedExpr).Expr),
+					semTable.RecursiveDeps(exprs[tcase.otherTbl].(*sqlparser.AliasedExpr).Expr),
+					semTable.RecursiveDeps(exprs[tcase.expandedCol].(*sqlparser.AliasedExpr).Expr),
 				)
 			}
 			if tcase.sameTbl != -1 {
 				assert.Equal(t,
-					semTable.RecursiveDeps(selectStatement.SelectExprs[tcase.sameTbl].(*sqlparser.AliasedExpr).Expr),
-					semTable.RecursiveDeps(selectStatement.SelectExprs[tcase.expandedCol].(*sqlparser.AliasedExpr).Expr),
+					semTable.RecursiveDeps(exprs[tcase.sameTbl].(*sqlparser.AliasedExpr).Expr),
+					semTable.RecursiveDeps(exprs[tcase.expandedCol].(*sqlparser.AliasedExpr).Expr),
 				)
 			}
 		})
diff --git a/go/vt/vtgate/semantics/real_table.go b/go/vt/vtgate/semantics/real_table.go
index 55dd25a5064..3c6e8a5e56d 100644
--- a/go/vt/vtgate/semantics/real_table.go
+++ b/go/vt/vtgate/semantics/real_table.go
@@ -151,7 +151,7 @@ func (r *RealTable) authoritative() bool {
 	}
 }
 
-func extractSelectExprsFromCTE(selectExprs sqlparser.SelectExprs) []ColumnInfo {
+func extractSelectExprsFromCTE(selectExprs []sqlparser.SelectExpr) []ColumnInfo {
 	var ci []ColumnInfo
 	for _, expr := range selectExprs {
 		ae, ok := expr.(*sqlparser.AliasedExpr)
@@ -166,7 +166,7 @@ func extractSelectExprsFromCTE(selectExprs sqlparser.SelectExprs) []ColumnInfo {
 	return ci
 }
 
-func extractColumnsFromCTE(columns sqlparser.Columns, selectExprs sqlparser.SelectExprs) []ColumnInfo {
+func extractColumnsFromCTE(columns sqlparser.Columns, selectExprs []sqlparser.SelectExpr) []ColumnInfo {
 	if len(columns) == 0 {
 		return nil
 	}
@@ -181,7 +181,7 @@ func extractColumnsFromCTE(columns sqlparser.Columns, selectExprs sqlparser.Sele
 	})
 }
 
-// GetExpr implements the TableInfo interface
+// GetAliasedTableExpr implements the TableInfo interface
 func (r *RealTable) GetAliasedTableExpr() *sqlparser.AliasedTableExpr {
 	return r.ASTNode
 }
diff --git a/go/vt/vtgate/semantics/scoper.go b/go/vt/vtgate/semantics/scoper.go
index e6df3c3a5b0..3ca950b94da 100644
--- a/go/vt/vtgate/semantics/scoper.go
+++ b/go/vt/vtgate/semantics/scoper.go
@@ -76,8 +76,8 @@ func (s *scoper) down(cursor *sqlparser.Cursor) error {
 		s.pushUnionScope(node)
 	case sqlparser.TableExpr:
 		s.enterJoinScope(cursor)
-	case sqlparser.SelectExprs:
-		s.copySelectExprs(cursor, node)
+	case *sqlparser.SelectExprs:
+		s.copySelectExprs(cursor, node.Exprs)
 	case sqlparser.OrderBy:
 		return s.addColumnInfoForOrderBy(cursor, node)
 	case *sqlparser.GroupBy:
@@ -152,7 +152,7 @@ func (s *scoper) addColumnInfoForOrderBy(cursor *sqlparser.Cursor, node sqlparse
 	return nil
 }
 
-func (s *scoper) copySelectExprs(cursor *sqlparser.Cursor, node sqlparser.SelectExprs) {
+func (s *scoper) copySelectExprs(cursor *sqlparser.Cursor, node []sqlparser.SelectExpr) {
 	sel, parentIsSelect := cursor.Parent().(*sqlparser.Select)
 	if !parentIsSelect {
 		return
diff --git a/go/vt/vtgate/semantics/semantic_table.go b/go/vt/vtgate/semantics/semantic_table.go
index 0227ee04137..6a88046e2a2 100644
--- a/go/vt/vtgate/semantics/semantic_table.go
+++ b/go/vt/vtgate/semantics/semantic_table.go
@@ -140,7 +140,7 @@ type (
 		// The columns were added because of the use of `*` in the query
 		ExpandedColumns map[sqlparser.TableName][]*sqlparser.ColName
 
-		columns map[*sqlparser.Union]sqlparser.SelectExprs
+		columns map[*sqlparser.Union][]sqlparser.SelectExpr
 
 		comparator *sqlparser.Comparator
 
@@ -493,10 +493,10 @@ func (st *SemTable) ForeignKeysPresent() bool {
 	return false
 }
 
-func (st *SemTable) SelectExprs(sel sqlparser.TableStatement) sqlparser.SelectExprs {
+func (st *SemTable) SelectExprs(sel sqlparser.TableStatement) []sqlparser.SelectExpr {
 	switch sel := sel.(type) {
 	case *sqlparser.Select:
-		return sel.SelectExprs
+		return sel.GetColumns()
 	case *sqlparser.Union:
 		exprs, found := st.columns[sel]
 		if found {
@@ -512,8 +512,9 @@ func (st *SemTable) SelectExprs(sel sqlparser.TableStatement) sqlparser.SelectEx
 	panic(fmt.Sprintf("BUG: unexpected select statement type %T", sel))
 }
 
-func getColumnNames(exprs sqlparser.SelectExprs) (expanded bool, selectExprs sqlparser.SelectExprs) {
-	expanded = true
+func getColumnNames(exprs []sqlparser.SelectExpr) (bool, []sqlparser.SelectExpr) {
+	var selectExprs []sqlparser.SelectExpr
+	expanded := true
 	for _, col := range exprs {
 		switch col := col.(type) {
 		case *sqlparser.AliasedExpr:
@@ -524,7 +525,7 @@ func getColumnNames(exprs sqlparser.SelectExprs) (expanded bool, selectExprs sql
 			expanded = false
 		}
 	}
-	return
+	return expanded, selectExprs
 }
 
 // CopySemanticInfo copies all semantic information we have about this SQLNode so that it also applies to the `to` node
@@ -571,7 +572,7 @@ func EmptySemTable() *SemTable {
 		Recursive:        map[sqlparser.Expr]TableSet{},
 		Direct:           map[sqlparser.Expr]TableSet{},
 		ColumnEqualities: map[columnName][]sqlparser.Expr{},
-		columns:          map[*sqlparser.Union]sqlparser.SelectExprs{},
+		columns:          map[*sqlparser.Union][]sqlparser.SelectExpr{},
 		ExprTypes:        make(map[sqlparser.Expr]evalengine.Type),
 	}
 }
@@ -658,9 +659,9 @@ func (st *SemTable) TableInfoForExpr(expr sqlparser.Expr) (TableInfo, error) {
 }
 
 // AddExprs adds new select exprs to the SemTable.
-func (st *SemTable) AddExprs(tbl *sqlparser.AliasedTableExpr, cols sqlparser.SelectExprs) {
+func (st *SemTable) AddExprs(tbl *sqlparser.AliasedTableExpr, cols *sqlparser.SelectExprs) {
 	tableSet := st.TableSetFor(tbl)
-	for _, col := range cols {
+	for _, col := range cols.Exprs {
 		st.Recursive[col.(*sqlparser.AliasedExpr).Expr] = tableSet
 	}
 }
@@ -757,7 +758,7 @@ func (st *SemTable) CopyExprInfo(src, dest sqlparser.Expr) {
 var columnNotSupportedErr = vterrors.Errorf(vtrpcpb.Code_UNIMPLEMENTED, "column access not supported here")
 
 // ColumnLookup implements the TranslationLookup interface
-func (st *SemTable) ColumnLookup(col *sqlparser.ColName) (int, error) {
+func (st *SemTable) ColumnLookup(*sqlparser.ColName) (int, error) {
 	return 0, columnNotSupportedErr
 }
 
diff --git a/go/vt/vtgate/semantics/semantic_table_test.go b/go/vt/vtgate/semantics/semantic_table_test.go
index 19f586d6190..3400b196fac 100644
--- a/go/vt/vtgate/semantics/semantic_table_test.go
+++ b/go/vt/vtgate/semantics/semantic_table_test.go
@@ -50,7 +50,7 @@ func TestBindingAndExprEquality(t *testing.T) {
 			require.NoError(t, err)
 			st, err := Analyze(parse, "db", fakeSchemaInfoTest())
 			require.NoError(t, err)
-			exprs := parse.(*sqlparser.Select).SelectExprs
+			exprs := parse.(*sqlparser.Select).GetColumns()
 			a := exprs[0].(*sqlparser.AliasedExpr).Expr
 			b := exprs[1].(*sqlparser.AliasedExpr).Expr
 			assert.Equal(t, st.EqualsExpr(a, b), test.equal)
diff --git a/go/vt/vtgate/semantics/table_collector.go b/go/vt/vtgate/semantics/table_collector.go
index e35165f600d..d2740afaee9 100644
--- a/go/vt/vtgate/semantics/table_collector.go
+++ b/go/vt/vtgate/semantics/table_collector.go
@@ -174,7 +174,7 @@ func (tc *tableCollector) visitUnion(union *sqlparser.Union) error {
 	collations := tc.org.collationEnv()
 
 	err = sqlparser.VisitAllSelects(union, func(s *sqlparser.Select, idx int) error {
-		for i, expr := range s.SelectExprs {
+		for i, expr := range s.GetColumns() {
 			ae, ok := expr.(*sqlparser.AliasedExpr)
 			if !ok {
 				continue
@@ -450,11 +450,11 @@ func (tc *tableCollector) addSelectDerivedTable(
 	alias sqlparser.IdentifierCS,
 ) error {
 	tables := tc.scoper.wScope[sel]
-	size := len(sel.SelectExprs)
+	size := sel.GetColumnCount()
 	deps := make([]TableSet, size)
 	types := make([]evalengine.Type, size)
 	expanded := true
-	for i, expr := range sel.SelectExprs {
+	for i, expr := range sel.GetColumns() {
 		ae, ok := expr.(*sqlparser.AliasedExpr)
 		if !ok {
 			expanded = false
@@ -463,7 +463,7 @@ func (tc *tableCollector) addSelectDerivedTable(
 		_, deps[i], types[i] = tc.org.depsForExpr(ae.Expr)
 	}
 
-	tableInfo := createDerivedTableForExpressions(sel.SelectExprs, columns, tables.tables, tc.org, expanded, deps, types)
+	tableInfo := createDerivedTableForExpressions(sel.GetColumns(), columns, tables.tables, tc.org, expanded, deps, types)
 	if err := tableInfo.checkForDuplicates(); err != nil {
 		return err
 	}
diff --git a/go/vt/vtgate/semantics/typer_test.go b/go/vt/vtgate/semantics/typer_test.go
index 1ec642b8168..bfb8cb1119e 100644
--- a/go/vt/vtgate/semantics/typer_test.go
+++ b/go/vt/vtgate/semantics/typer_test.go
@@ -50,7 +50,8 @@ func TestNormalizerAndSemanticAnalysisIntegration(t *testing.T) {
 
 			st, err := Analyze(out.AST, "d", fakeSchemaInfo())
 			require.NoError(t, err)
-			bv := out.AST.(*sqlparser.Select).SelectExprs[0].(*sqlparser.AliasedExpr).Expr.(*sqlparser.Argument)
+
+			bv := extract(out.AST.(*sqlparser.Select), 0).(*sqlparser.Argument)
 			typ, found := st.ExprTypes[bv]
 			require.True(t, found, "bindvar was not typed")
 			require.Equal(t, test.typ, typ.Type().String())
diff --git a/go/vt/vtgate/semantics/vtable.go b/go/vt/vtgate/semantics/vtable.go
index 94dc74cdf34..610bfa76db8 100644
--- a/go/vt/vtgate/semantics/vtable.go
+++ b/go/vt/vtgate/semantics/vtable.go
@@ -133,7 +133,7 @@ func (v *vTableInfo) getExprFor(s string) (sqlparser.Expr, error) {
 	return nil, vterrors.VT03022(s, "field list")
 }
 
-func createVTableInfoForExpressions(expressions sqlparser.SelectExprs, tables []TableInfo, org originable) *vTableInfo {
+func createVTableInfoForExpressions(expressions []sqlparser.SelectExpr, tables []TableInfo, org originable) *vTableInfo {
 	cols, colNames, ts, isAuthoritative := selectExprsToInfos(expressions, tables, org)
 	return &vTableInfo{
 		columnNames:     colNames,
@@ -144,7 +144,7 @@ func createVTableInfoForExpressions(expressions sqlparser.SelectExprs, tables []
 }
 
 func selectExprsToInfos(
-	expressions sqlparser.SelectExprs,
+	expressions []sqlparser.SelectExpr,
 	tables []TableInfo,
 	org originable,
 ) (cols []sqlparser.Expr, colNames []string, ts TableSet, isAuthoritative bool) {
diff --git a/go/vt/vtgate/simplifier/expression_simplifier.go b/go/vt/vtgate/simplifier/expression_simplifier.go
index b64402cfaac..8395fb26d17 100644
--- a/go/vt/vtgate/simplifier/expression_simplifier.go
+++ b/go/vt/vtgate/simplifier/expression_simplifier.go
@@ -29,7 +29,7 @@ type CheckF = func(sqlparser.Expr) bool
 
 func SimplifyExpr(in sqlparser.Expr, test CheckF) sqlparser.Expr {
 	// since we can't rewrite the top level, wrap the expr in an Exprs object
-	smallestKnown := sqlparser.Exprs{sqlparser.Clone(in)}
+	smallestKnown := sqlparser.NewExprs(sqlparser.Clone(in))
 
 	alwaysVisit := func(node, parent sqlparser.SQLNode) bool {
 		return true
@@ -42,7 +42,7 @@ func SimplifyExpr(in sqlparser.Expr, test CheckF) sqlparser.Expr {
 		for expr != nil {
 			cursor.Replace(expr)
 
-			valid := test(smallestKnown[0])
+			valid := test(smallestKnown.Exprs[0])
 			if valid {
 				break // we will still continue trying to simplify other expressions at this level
 			} else {
@@ -59,12 +59,13 @@ func SimplifyExpr(in sqlparser.Expr, test CheckF) sqlparser.Expr {
 	for {
 		prevSmallest := sqlparser.Clone(smallestKnown)
 		sqlparser.SafeRewrite(smallestKnown, alwaysVisit, up)
-		if sqlparser.Equals.Exprs(prevSmallest, smallestKnown) {
+		_ = prevSmallest
+		if sqlparser.Equals.RefOfExprs(prevSmallest, smallestKnown) {
 			break
 		}
 	}
 
-	return smallestKnown[0]
+	return smallestKnown.Exprs[0]
 }
 
 type shrinker struct {
diff --git a/go/vt/vtgate/simplifier/simplifier.go b/go/vt/vtgate/simplifier/simplifier.go
index c15e2ea58d1..e37ee616be3 100644
--- a/go/vt/vtgate/simplifier/simplifier.go
+++ b/go/vt/vtgate/simplifier/simplifier.go
@@ -281,7 +281,7 @@ func removeTable(clone sqlparser.TableStatement, searchedTS semantics.TableSet,
 			simplified = removeTableinJoinTableExpr(node, searchedTS, semTable, cursor, simplified)
 		case *sqlparser.Where:
 			simplified = removeTableinWhere(node, shouldKeepExpr, simplified)
-		case sqlparser.SelectExprs:
+		case *sqlparser.SelectExprs:
 			simplified = removeTableinSelectExprs(node, cursor, shouldKeepExpr, simplified)
 		case *sqlparser.GroupBy:
 			simplified = removeTableInGroupBy(node, cursor, shouldKeepExpr, simplified)
@@ -352,14 +352,14 @@ func removeTableinWhere(node *sqlparser.Where, shouldKeepExpr func(sqlparser.Exp
 	return simplified
 }
 
-func removeTableinSelectExprs(node sqlparser.SelectExprs, cursor *sqlparser.Cursor, shouldKeepExpr func(sqlparser.Expr) bool, simplified bool) bool {
+func removeTableinSelectExprs(node *sqlparser.SelectExprs, cursor *sqlparser.Cursor, shouldKeepExpr func(sqlparser.Expr) bool, simplified bool) bool {
 	_, isSel := cursor.Parent().(*sqlparser.Select)
 	if !isSel {
 		return simplified
 	}
 
-	var newExprs sqlparser.SelectExprs
-	for _, ae := range node {
+	var newExprs []sqlparser.SelectExpr
+	for _, ae := range node.Exprs {
 		expr, ok := ae.(*sqlparser.AliasedExpr)
 		if !ok {
 			newExprs = append(newExprs, ae)
@@ -371,7 +371,8 @@ func removeTableinSelectExprs(node sqlparser.SelectExprs, cursor *sqlparser.Curs
 			simplified = true
 		}
 	}
-	cursor.Replace(newExprs)
+
+	cursor.Replace(&sqlparser.SelectExprs{Exprs: newExprs})
 
 	return simplified
 }
@@ -435,7 +436,7 @@ func visitAllExpressionsInAST(clone sqlparser.TableStatement, visit func(express
 	}
 	up := func(cursor *sqlparser.Cursor) bool {
 		switch node := cursor.Node().(type) {
-		case sqlparser.SelectExprs:
+		case *sqlparser.SelectExprs:
 			return visitSelectExprs(node, cursor, visit)
 		case *sqlparser.Where:
 			return visitWhere(node, visit)
@@ -455,13 +456,13 @@ func visitAllExpressionsInAST(clone sqlparser.TableStatement, visit func(express
 	sqlparser.SafeRewrite(clone, alwaysVisitChildren, up)
 }
 
-func visitSelectExprs(node sqlparser.SelectExprs, cursor *sqlparser.Cursor, visit func(expressionCursor) bool) bool {
+func visitSelectExprs(node *sqlparser.SelectExprs, cursor *sqlparser.Cursor, visit func(expressionCursor) bool) bool {
 	_, isSel := cursor.Parent().(*sqlparser.Select)
 	if !isSel {
 		return true
 	}
-	for idx := 0; idx < len(node); idx++ {
-		ae := node[idx]
+	for idx := 0; idx < len(node.Exprs); idx++ {
+		ae := node.Exprs[idx]
 		expr, ok := ae.(*sqlparser.AliasedExpr)
 		if !ok {
 			continue
@@ -480,25 +481,23 @@ func visitSelectExprs(node sqlparser.SelectExprs, cursor *sqlparser.Cursor, visi
 				if removed {
 					panic("can't remove twice, silly")
 				}
-				if len(node) == 1 {
+				if len(node.Exprs) == 1 {
 					// can't remove the last expressions - we'd end up with an empty SELECT clause
 					return false
 				}
-				withoutElement := append(node[:idx], node[idx+1:]...)
-				cursor.Replace(withoutElement)
-				node = withoutElement
+				withoutElement := append(node.Exprs[:idx], node.Exprs[idx+1:]...)
+				node.Exprs = withoutElement
 				removed = true
 				return true
 			},
 			/*restore*/ func() {
 				if removed {
-					front := make(sqlparser.SelectExprs, idx)
-					copy(front, node[:idx])
-					back := make(sqlparser.SelectExprs, len(node)-idx)
-					copy(back, node[idx:])
+					front := make([]sqlparser.SelectExpr, idx)
+					copy(front, node.Exprs[:idx])
+					back := make([]sqlparser.SelectExpr, len(node.Exprs)-idx)
+					copy(back, node.Exprs[idx:])
 					frontWithRestoredExpr := append(front, ae)
-					node = append(frontWithRestoredExpr, back...)
-					cursor.Replace(node)
+					node.Exprs = append(frontWithRestoredExpr, back...)
 					removed = false
 					return
 				}
diff --git a/go/vt/vtgate/vindexes/foreign_keys.go b/go/vt/vtgate/vindexes/foreign_keys.go
index e9f8c986d10..46399b6576c 100644
--- a/go/vt/vtgate/vindexes/foreign_keys.go
+++ b/go/vt/vtgate/vindexes/foreign_keys.go
@@ -162,7 +162,7 @@ func (vschema *VSchema) AddPrimaryKey(ksname, tblName string, cols []string) err
 }
 
 // AddUniqueKey is for testing only.
-func (vschema *VSchema) AddUniqueKey(ksname, tblName string, exprs sqlparser.Exprs) error {
+func (vschema *VSchema) AddUniqueKey(ksname, tblName string, exprs []sqlparser.Expr) error {
 	ks, ok := vschema.Keyspaces[ksname]
 	if !ok {
 		return fmt.Errorf("keyspace %s not found in vschema", ksname)
diff --git a/go/vt/vtgate/vindexes/vschema.go b/go/vt/vtgate/vindexes/vschema.go
index 5499200768b..686c3edcb4e 100644
--- a/go/vt/vtgate/vindexes/vschema.go
+++ b/go/vt/vtgate/vindexes/vschema.go
@@ -154,8 +154,8 @@ type BaseTable struct {
 	// index can be columns or expression.
 	// For Primary key, functional indexes are not allowed, therefore it will only be columns.
 	// MySQL error message: ERROR 3756 (HY000): The primary key cannot be a functional index
-	PrimaryKey sqlparser.Columns `json:"primary_key,omitempty"`
-	UniqueKeys []sqlparser.Exprs `json:"unique_keys,omitempty"`
+	PrimaryKey sqlparser.Columns  `json:"primary_key,omitempty"`
+	UniqueKeys [][]sqlparser.Expr `json:"unique_keys,omitempty"`
 }
 
 // GetTableName gets the sqlparser.TableName for the vindex Table.
diff --git a/go/vt/vtgate/vschema_manager.go b/go/vt/vtgate/vschema_manager.go
index 7a1c5ee1d24..0fb5904f133 100644
--- a/go/vt/vtgate/vschema_manager.go
+++ b/go/vt/vtgate/vschema_manager.go
@@ -270,7 +270,7 @@ func (vm *VSchemaManager) updateTableInfo(vschema *vindexes.VSchema, ks *vindexe
 					rTbl.PrimaryKey = append(rTbl.PrimaryKey, idxCol.Column)
 				}
 			case sqlparser.IndexTypeUnique:
-				var uniqueKey sqlparser.Exprs
+				var uniqueKey []sqlparser.Expr
 				for _, idxCol := range idxDef.Columns {
 					if idxCol.Expression == nil {
 						uniqueKey = append(uniqueKey, sqlparser.NewColName(idxCol.Column.String()))
diff --git a/go/vt/vtgate/vschema_manager_test.go b/go/vt/vtgate/vschema_manager_test.go
index 42515d59788..9dae4f1fc5a 100644
--- a/go/vt/vtgate/vschema_manager_test.go
+++ b/go/vt/vtgate/vschema_manager_test.go
@@ -90,7 +90,7 @@ func TestVSchemaUpdate(t *testing.T) {
 		Keyspace:                ks,
 		ColumnListAuthoritative: true,
 		PrimaryKey:              sqlparser.Columns{sqlparser.NewIdentifierCI("a")},
-		UniqueKeys: []sqlparser.Exprs{
+		UniqueKeys: [][]sqlparser.Expr{
 			{sqlparser.NewColName("b")},
 			{sqlparser.NewColName("c"), sqlparser.NewColName("d")},
 		},
@@ -100,7 +100,7 @@ func TestVSchemaUpdate(t *testing.T) {
 		Keyspace:                ks,
 		ColumnListAuthoritative: true,
 		PrimaryKey:              sqlparser.Columns{sqlparser.NewIdentifierCI("a")},
-		UniqueKeys: []sqlparser.Exprs{
+		UniqueKeys: [][]sqlparser.Expr{
 			{&sqlparser.BinaryExpr{Operator: sqlparser.DivOp, Left: sqlparser.NewColName("b"), Right: sqlparser.NewIntLiteral("2")}},
 			{sqlparser.NewColName("c"), &sqlparser.BinaryExpr{Operator: sqlparser.PlusOp, Left: sqlparser.NewColName("d"), Right: sqlparser.NewColName("e")}},
 		},
@@ -524,16 +524,20 @@ func TestVSchemaViewsUpdate(t *testing.T) {
 		vs = vschema
 		vs.ResetCreated()
 	}
+
+	s1 := &sqlparser.Select{
+		From: sqlparser.TableExprs{sqlparser.NewAliasedTableExpr(sqlparser.NewTableName("t1"), "")},
+	}
+	s2 := &sqlparser.Select{
+		From: sqlparser.TableExprs{sqlparser.NewAliasedTableExpr(sqlparser.NewTableName("t2"), "")},
+	}
+	s1.AddSelectExpr(sqlparser.NewAliasedExpr(sqlparser.NewIntLiteral("1"), ""))
+	s2.AddSelectExpr(sqlparser.NewAliasedExpr(sqlparser.NewIntLiteral("2"), ""))
 	vm.schema = &fakeSchema{v: map[string]sqlparser.TableStatement{
-		"v1": &sqlparser.Select{
-			From:        sqlparser.TableExprs{sqlparser.NewAliasedTableExpr(sqlparser.NewTableName("t1"), "")},
-			SelectExprs: sqlparser.SelectExprs{sqlparser.NewAliasedExpr(sqlparser.NewIntLiteral("1"), "")},
-		},
-		"v2": &sqlparser.Select{
-			From:        sqlparser.TableExprs{sqlparser.NewAliasedTableExpr(sqlparser.NewTableName("t2"), "")},
-			SelectExprs: sqlparser.SelectExprs{sqlparser.NewAliasedExpr(sqlparser.NewIntLiteral("2"), "")},
-		},
+		"v1": s1,
+		"v2": s2,
 	}}
+
 	vm.VSchemaUpdate(&vschemapb.SrvVSchema{
 		Keyspaces: map[string]*vschemapb.Keyspace{
 			"ks": {Sharded: true},
diff --git a/go/vt/vttablet/tabletmanager/vdiff/report.go b/go/vt/vttablet/tabletmanager/vdiff/report.go
index b53288b3019..5c7a2593558 100644
--- a/go/vt/vttablet/tabletmanager/vdiff/report.go
+++ b/go/vt/vttablet/tabletmanager/vdiff/report.go
@@ -81,7 +81,7 @@ func (td *tableDiffer) genRowDiff(queryStmt string, row []sqltypes.Value, opts *
 
 	addVal := func(index int, truncateAt int) {
 		buf := sqlparser.NewTrackedBuffer(nil)
-		sel.SelectExprs[index].Format(buf)
+		sel.SelectExprs.Exprs[index].Format(buf)
 		col := buf.String()
 		// Let's truncate if it's really worth it to avoid losing
 		// value for a few chars.
@@ -106,7 +106,7 @@ func (td *tableDiffer) genRowDiff(queryStmt string, row []sqltypes.Value, opts *
 	}
 
 	truncateAt := int(opts.GetRowDiffColumnTruncateAt())
-	for i := range sel.SelectExprs {
+	for i := range sel.SelectExprs.Exprs {
 		if _, pk := pks[i]; !pk {
 			addVal(i, truncateAt)
 		}
@@ -121,7 +121,7 @@ func (td *tableDiffer) genDebugQueryDiff(sel *sqlparser.Select, row []sqltypes.V
 
 	if onlyPks {
 		for i, pkI := range td.tablePlan.selectPks {
-			pk := sel.SelectExprs[pkI]
+			pk := sel.GetColumns()[pkI]
 			pk.Format(buf)
 			if i != len(td.tablePlan.selectPks)-1 {
 				buf.Myprintf(", ")
@@ -134,7 +134,7 @@ func (td *tableDiffer) genDebugQueryDiff(sel *sqlparser.Select, row []sqltypes.V
 	buf.Myprintf(sqlparser.ToString(sel.From))
 	buf.Myprintf(" where ")
 	for i, pkI := range td.tablePlan.selectPks {
-		sel.SelectExprs[pkI].Format(buf)
+		sel.SelectExprs.Exprs[pkI].Format(buf)
 		buf.Myprintf("=")
 		row[pkI].EncodeSQL(buf)
 		if i != len(td.tablePlan.selectPks)-1 {
diff --git a/go/vt/vttablet/tabletmanager/vdiff/table_differ.go b/go/vt/vttablet/tabletmanager/vdiff/table_differ.go
index 1ebeab8ed8d..1904a8e97a5 100644
--- a/go/vt/vttablet/tabletmanager/vdiff/table_differ.go
+++ b/go/vt/vttablet/tabletmanager/vdiff/table_differ.go
@@ -863,12 +863,12 @@ func (td *tableDiffer) lastPKFromRow(row []sqltypes.Value) *tabletmanagerdatapb.
 // VReplication workflow would have converted the datetime columns expecting the
 // source to have been in the SourceTimeZone and target in TargetTimeZone. We need
 // to do the reverse conversion in VDiff before the comparison.
-func (td *tableDiffer) adjustForSourceTimeZone(targetSelectExprs sqlparser.SelectExprs, fields map[string]querypb.Type) sqlparser.SelectExprs {
+func (td *tableDiffer) adjustForSourceTimeZone(targetSelectExprs []sqlparser.SelectExpr, fields map[string]querypb.Type) []sqlparser.SelectExpr {
 	if td.wd.ct.sourceTimeZone == "" {
 		return targetSelectExprs
 	}
 	log.Infof("source time zone specified: %s", td.wd.ct.sourceTimeZone)
-	var newSelectExprs sqlparser.SelectExprs
+	var newSelectExprs []sqlparser.SelectExpr
 	var modified bool
 	for _, expr := range targetSelectExprs {
 		converted := false
@@ -879,14 +879,11 @@ func (td *tableDiffer) adjustForSourceTimeZone(targetSelectExprs sqlparser.Selec
 				colName := colAs.Name.Lowered()
 				fieldType := fields[colName]
 				if fieldType == querypb.Type_DATETIME {
-					convertTZFuncExpr = &sqlparser.FuncExpr{
-						Name: sqlparser.NewIdentifierCI("convert_tz"),
-						Exprs: sqlparser.Exprs{
-							selExpr.Expr,
-							sqlparser.NewStrLiteral(td.wd.ct.targetTimeZone),
-							sqlparser.NewStrLiteral(td.wd.ct.sourceTimeZone),
-						},
-					}
+					convertTZFuncExpr = sqlparser.NewFuncExpr("convert_tz",
+						selExpr.Expr,
+						sqlparser.NewStrLiteral(td.wd.ct.targetTimeZone),
+						sqlparser.NewStrLiteral(td.wd.ct.sourceTimeZone),
+					)
 					log.Infof("converting datetime column %s using convert_tz()", colName)
 					newSelectExprs = append(newSelectExprs, &sqlparser.AliasedExpr{Expr: convertTZFuncExpr, As: colAs.Name})
 					converted = true
diff --git a/go/vt/vttablet/tabletmanager/vdiff/table_plan.go b/go/vt/vttablet/tabletmanager/vdiff/table_plan.go
index b5ea384d864..49f2713b58a 100644
--- a/go/vt/vttablet/tabletmanager/vdiff/table_plan.go
+++ b/go/vt/vttablet/tabletmanager/vdiff/table_plan.go
@@ -87,14 +87,14 @@ func (td *tableDiffer) buildTablePlan(dbClient binlogplayer.DBClient, dbName str
 	targetSelect := &sqlparser.Select{}
 	// Aggregates is the list of Aggregate functions, if any.
 	var aggregates []*engine.AggregateParams
-	for _, selExpr := range sel.SelectExprs {
+	for _, selExpr := range sel.GetColumns() {
 		switch selExpr := selExpr.(type) {
 		case *sqlparser.StarExpr:
 			// If it's a '*' expression, expand column list from the schema.
 			for _, fld := range tp.table.Fields {
 				aliased := &sqlparser.AliasedExpr{Expr: &sqlparser.ColName{Name: sqlparser.NewIdentifierCI(fld.Name)}}
-				sourceSelect.SelectExprs = append(sourceSelect.SelectExprs, aliased)
-				targetSelect.SelectExprs = append(targetSelect.SelectExprs, aliased)
+				sourceSelect.AddSelectExpr(aliased)
+				targetSelect.AddSelectExpr(aliased)
 			}
 		case *sqlparser.AliasedExpr:
 			var targetCol *sqlparser.ColName
@@ -108,8 +108,8 @@ func (td *tableDiffer) buildTablePlan(dbClient binlogplayer.DBClient, dbName str
 				targetCol = &sqlparser.ColName{Name: selExpr.As}
 			}
 			// If the input was "select a as b", then source will use "a" and target will use "b".
-			sourceSelect.SelectExprs = append(sourceSelect.SelectExprs, selExpr)
-			targetSelect.SelectExprs = append(targetSelect.SelectExprs, &sqlparser.AliasedExpr{Expr: targetCol})
+			sourceSelect.AddSelectExpr(selExpr)
+			targetSelect.AddSelectExpr(&sqlparser.AliasedExpr{Expr: targetCol})
 
 			// Check if it's an aggregate expression
 			if expr, ok := selExpr.Expr.(sqlparser.AggrFunc); ok {
@@ -121,7 +121,7 @@ func (td *tableDiffer) buildTablePlan(dbClient binlogplayer.DBClient, dbName str
 					// but will need to be revisited when we add such support to vreplication
 					aggregates = append(aggregates, engine.NewAggregateParam(
 						/*opcode*/ opcode.AggregateSum,
-						/*offset*/ len(sourceSelect.SelectExprs)-1,
+						/*offset*/ sourceSelect.GetColumnCount()-1,
 						/*alias*/ "", collationEnv),
 					)
 				}
@@ -135,12 +135,12 @@ func (td *tableDiffer) buildTablePlan(dbClient binlogplayer.DBClient, dbName str
 		fields[strings.ToLower(field.Name)] = field.Type
 	}
 
-	targetSelect.SelectExprs = td.adjustForSourceTimeZone(targetSelect.SelectExprs, fields)
+	targetSelect.SetSelectExprs(td.adjustForSourceTimeZone(targetSelect.GetColumns(), fields)...)
 	// Start with adding all columns for comparison.
-	tp.compareCols = make([]compareColInfo, len(sourceSelect.SelectExprs))
+	tp.compareCols = make([]compareColInfo, sourceSelect.GetColumnCount())
 	for i := range tp.compareCols {
 		tp.compareCols[i].colIndex = i
-		colname, err := getColumnNameForSelectExpr(targetSelect.SelectExprs[i])
+		colname, err := getColumnNameForSelectExpr(targetSelect.GetColumns()[i])
 		if err != nil {
 			return nil, err
 		}
@@ -215,7 +215,7 @@ func (tp *tablePlan) findPKs(dbClient binlogplayer.DBClient, targetSelect *sqlpa
 	var orderby sqlparser.OrderBy
 	for _, pk := range tp.table.PrimaryKeyColumns {
 		found := false
-		for i, selExpr := range targetSelect.SelectExprs {
+		for i, selExpr := range targetSelect.SelectExprs.Exprs {
 			expr := selExpr.(*sqlparser.AliasedExpr).Expr
 			colname := ""
 			switch ct := expr.(type) {
diff --git a/go/vt/vttablet/tabletmanager/vreplication/table_plan_builder.go b/go/vt/vttablet/tabletmanager/vreplication/table_plan_builder.go
index b8a86b94de5..5c2b0f21dc5 100644
--- a/go/vt/vttablet/tabletmanager/vreplication/table_plan_builder.go
+++ b/go/vt/vttablet/tabletmanager/vreplication/table_plan_builder.go
@@ -234,10 +234,10 @@ func buildTablePlan(tableName string, rule *binlogdatapb.Rule, colInfos []*Colum
 		Match: fromTable,
 	}
 
-	if expr, ok := sel.SelectExprs[0].(*sqlparser.StarExpr); ok {
+	if expr, ok := sel.SelectExprs.Exprs[0].(*sqlparser.StarExpr); ok {
 		// If it's a "select *", we return a partial plan, and complete
 		// it when we get back field info from the stream.
-		if len(sel.SelectExprs) != 1 {
+		if len(sel.SelectExprs.Exprs) != 1 {
 			return nil, planError(fmt.Errorf("unsupported mix of '*' and columns"), sqlparser.String(sel))
 		}
 		if !expr.TableName.IsEmpty() {
@@ -272,7 +272,7 @@ func buildTablePlan(tableName string, rule *binlogdatapb.Rule, colInfos []*Colum
 		workflowConfig: workflowConfig,
 	}
 
-	if err := tpb.analyzeExprs(sel.SelectExprs); err != nil {
+	if err := tpb.analyzeExprs(sel.SelectExprs.Exprs); err != nil {
 		return nil, planError(err, sqlparser.String(sel))
 	}
 	// It's possible that the target table does not materialize all
@@ -309,11 +309,9 @@ func buildTablePlan(tableName string, rule *binlogdatapb.Rule, colInfos []*Colum
 
 	// if there are no columns being selected the select expression can be empty, so we "select 1" so we have a valid
 	// select to get a row back
-	if len(tpb.sendSelect.SelectExprs) == 0 {
-		tpb.sendSelect.SelectExprs = sqlparser.SelectExprs([]sqlparser.SelectExpr{
-			&sqlparser.AliasedExpr{
-				Expr: sqlparser.NewIntLiteral("1"),
-			},
+	if tpb.sendSelect.SelectExprs == nil || len(tpb.sendSelect.SelectExprs.Exprs) == 0 {
+		tpb.sendSelect.AddSelectExpr(&sqlparser.AliasedExpr{
+			Expr: sqlparser.NewIntLiteral("1"),
 		})
 	}
 	commentsList := []string{}
@@ -413,7 +411,7 @@ func analyzeSelectFrom(query string, parser *sqlparser.Parser) (sel *sqlparser.S
 	return sel, fromTable.String(), nil
 }
 
-func (tpb *tablePlanBuilder) analyzeExprs(selExprs sqlparser.SelectExprs) error {
+func (tpb *tablePlanBuilder) analyzeExprs(selExprs []sqlparser.SelectExpr) error {
 	for _, selExpr := range selExprs {
 		cexpr, err := tpb.analyzeExpr(selExpr)
 		if err != nil {
@@ -468,7 +466,7 @@ func (tpb *tablePlanBuilder) analyzeExpr(selExpr sqlparser.SelectExpr) (*colExpr
 		}
 		cexpr.expr = expr
 		cexpr.operation = opExpr
-		tpb.sendSelect.SelectExprs = append(tpb.sendSelect.SelectExprs, &sqlparser.AliasedExpr{Expr: selExpr, As: as})
+		tpb.sendSelect.AddSelectExpr(&sqlparser.AliasedExpr{Expr: selExpr, As: as})
 		cexpr.references[as.String()] = true
 		return cexpr, nil
 	}
@@ -478,7 +476,8 @@ func (tpb *tablePlanBuilder) analyzeExpr(selExpr sqlparser.SelectExpr) (*colExpr
 			if len(expr.Exprs) != 0 {
 				return nil, fmt.Errorf("unsupported multiple keyspace_id expressions: %v", sqlparser.String(expr))
 			}
-			tpb.sendSelect.SelectExprs = append(tpb.sendSelect.SelectExprs, &sqlparser.AliasedExpr{Expr: aliased.Expr})
+
+			tpb.sendSelect.AddSelectExpr(&sqlparser.AliasedExpr{Expr: aliased.Expr})
 			// The vstreamer responds with "keyspace_id" as the field name for this request.
 			cexpr.expr = &sqlparser.ColName{Name: sqlparser.NewIdentifierCI("keyspace_id")}
 			return cexpr, nil
@@ -538,7 +537,7 @@ func (tpb *tablePlanBuilder) analyzeExpr(selExpr sqlparser.SelectExpr) (*colExpr
 // addCol adds the specified column to the send query
 // if it's not already present.
 func (tpb *tablePlanBuilder) addCol(ident sqlparser.IdentifierCI) {
-	tpb.sendSelect.SelectExprs = append(tpb.sendSelect.SelectExprs, &sqlparser.AliasedExpr{
+	tpb.sendSelect.AddSelectExpr(&sqlparser.AliasedExpr{
 		Expr: &sqlparser.ColName{Name: ident},
 	})
 }
diff --git a/go/vt/vttablet/tabletserver/planbuilder/builder.go b/go/vt/vttablet/tabletserver/planbuilder/builder.go
index 6df89f7caf8..f1a6e89416c 100644
--- a/go/vt/vttablet/tabletserver/planbuilder/builder.go
+++ b/go/vt/vttablet/tabletserver/planbuilder/builder.go
@@ -44,7 +44,7 @@ func analyzeSelect(env *vtenv.Environment, sel *sqlparser.Select, tables map[str
 	}
 
 	// Check if it's a NEXT VALUE statement.
-	if nextVal, ok := sel.SelectExprs[0].(*sqlparser.Nextval); ok {
+	if nextVal, ok := sel.GetColumns()[0].(*sqlparser.Nextval); ok {
 		if plan.Table == nil || plan.Table.Type != schema.Sequence {
 			return nil, vterrors.Errorf(vtrpcpb.Code_INVALID_ARGUMENT, "%s is not a sequence", sqlparser.ToString(sel.From))
 		}
diff --git a/go/vt/vttablet/tabletserver/planbuilder/permission.go b/go/vt/vttablet/tabletserver/planbuilder/permission.go
index 1949d6ce739..03f926e0679 100644
--- a/go/vt/vttablet/tabletserver/planbuilder/permission.go
+++ b/go/vt/vttablet/tabletserver/planbuilder/permission.go
@@ -38,7 +38,7 @@ func BuildPermissions(stmt sqlparser.Statement) []Permission {
 	switch node := stmt.(type) {
 	case *sqlparser.Select:
 		role := tableacl.READER
-		if _, ok := node.SelectExprs[0].(*sqlparser.Nextval); ok {
+		if _, ok := node.GetColumns()[0].(*sqlparser.Nextval); ok {
 			role = tableacl.WRITER
 		}
 		permissions = buildSubqueryPermissions(node, role, permissions)
diff --git a/go/vt/vttablet/tabletserver/vstreamer/planbuilder.go b/go/vt/vttablet/tabletserver/vstreamer/planbuilder.go
index e5115afe6d3..1293efa3112 100644
--- a/go/vt/vttablet/tabletserver/vstreamer/planbuilder.go
+++ b/go/vt/vttablet/tabletserver/vstreamer/planbuilder.go
@@ -465,7 +465,7 @@ func buildTablePlan(env *vtenv.Environment, ti *Table, vschema *localVSchema, qu
 		log.Errorf("%s", err.Error())
 		return nil, err
 	}
-	if err := plan.analyzeExprs(vschema, sel.SelectExprs); err != nil {
+	if err := plan.analyzeExprs(vschema, sel.GetColumns()); err != nil {
 		log.Errorf("%s", err.Error())
 		return nil, err
 	}
@@ -670,7 +670,7 @@ func splitAndExpression(filters []sqlparser.Expr, node sqlparser.Expr) []sqlpars
 	return append(filters, node)
 }
 
-func (plan *Plan) analyzeExprs(vschema *localVSchema, selExprs sqlparser.SelectExprs) error {
+func (plan *Plan) analyzeExprs(vschema *localVSchema, selExprs []sqlparser.SelectExpr) error {
 	if _, ok := selExprs[0].(*sqlparser.StarExpr); !ok {
 		for _, expr := range selExprs {
 			cExpr, err := plan.analyzeExpr(vschema, expr)
@@ -681,7 +681,7 @@ func (plan *Plan) analyzeExprs(vschema *localVSchema, selExprs sqlparser.SelectE
 		}
 	} else {
 		if len(selExprs) != 1 {
-			return fmt.Errorf("unsupported: %v", sqlparser.String(selExprs))
+			return fmt.Errorf("unsupported: %v", sqlparser.SliceString(selExprs))
 		}
 		plan.ColExprs = make([]ColExpr, len(plan.Table.Fields))
 		for i, col := range plan.Table.Fields {
@@ -838,7 +838,7 @@ func (plan *Plan) analyzeExpr(vschema *localVSchema, selExpr sqlparser.SelectExp
 // analyzeInKeyRange allows the following constructs: "in_keyrange('-80')",
 // "in_keyrange(col, 'hash', '-80')", "in_keyrange(col, 'local_vindex', '-80')", or
 // "in_keyrange(col, 'ks.external_vindex', '-80')".
-func (plan *Plan) analyzeInKeyRange(vschema *localVSchema, exprs sqlparser.Exprs) error {
+func (plan *Plan) analyzeInKeyRange(vschema *localVSchema, exprs []sqlparser.Expr) error {
 	var colnames []sqlparser.IdentifierCI
 	var krExpr sqlparser.Expr
 	whereFilter := Filter{
@@ -879,7 +879,7 @@ func (plan *Plan) analyzeInKeyRange(vschema *localVSchema, exprs sqlparser.Exprs
 
 		krExpr = exprs[len(exprs)-1]
 	default:
-		return vterrors.Errorf(vtrpcpb.Code_INTERNAL, "[BUG] unexpected in_keyrange parameters: %v", sqlparser.String(exprs))
+		return vterrors.Errorf(vtrpcpb.Code_INTERNAL, "[BUG] unexpected in_keyrange parameters: %v", sqlparser.SliceString(exprs))
 	}
 	var err error
 	whereFilter.VindexColumns, err = buildVindexColumns(plan.Table, colnames)
diff --git a/go/vt/wrangler/materializer.go b/go/vt/wrangler/materializer.go
index 27aaa6935be..2bf2ec824ee 100644
--- a/go/vt/wrangler/materializer.go
+++ b/go/vt/wrangler/materializer.go
@@ -1393,7 +1393,7 @@ func (mz *materializer) generateInserts(ctx context.Context, sourceShards []*top
 					}
 					mappedCols = append(mappedCols, colName)
 				}
-				subExprs := make(sqlparser.Exprs, 0, len(mappedCols)+2)
+				subExprs := make([]sqlparser.Expr, 0, len(mappedCols)+2)
 				for _, mappedCol := range mappedCols {
 					subExprs = append(subExprs, mappedCol)
 				}
@@ -1412,10 +1412,7 @@ func (mz *materializer) generateInserts(ctx context.Context, sourceShards []*top
 				}
 				subExprs = append(subExprs, sqlparser.NewStrLiteral(vindexName))
 				subExprs = append(subExprs, sqlparser.NewStrLiteral("{{.keyrange}}"))
-				inKeyRange := &sqlparser.FuncExpr{
-					Name:  sqlparser.NewIdentifierCI("in_keyrange"),
-					Exprs: subExprs,
-				}
+				inKeyRange := sqlparser.NewFuncExpr("in_keyrange", subExprs...)
 				if sel.Where != nil {
 					sel.Where = &sqlparser.Where{
 						Type: sqlparser.WhereClause,
@@ -1489,7 +1486,7 @@ func (mz *materializer) getWorkflowSubType() (binlogdatapb.VReplicationWorkflowS
 }
 
 func matchColInSelect(col sqlparser.IdentifierCI, sel *sqlparser.Select) (*sqlparser.ColName, error) {
-	for _, selExpr := range sel.SelectExprs {
+	for _, selExpr := range sel.GetColumns() {
 		switch selExpr := selExpr.(type) {
 		case *sqlparser.StarExpr:
 			return &sqlparser.ColName{Name: col}, nil
diff --git a/go/vt/wrangler/vdiff.go b/go/vt/wrangler/vdiff.go
index 9991b5bd633..7c45bc2aeac 100644
--- a/go/vt/wrangler/vdiff.go
+++ b/go/vt/wrangler/vdiff.go
@@ -503,7 +503,7 @@ func findPKs(env *vtenv.Environment, table *tabletmanagerdatapb.TableDefinition,
 	var orderby sqlparser.OrderBy
 	for _, pk := range table.PrimaryKeyColumns {
 		found := false
-		for i, selExpr := range targetSelect.SelectExprs {
+		for i, selExpr := range targetSelect.GetColumns() {
 			expr := selExpr.(*sqlparser.AliasedExpr).Expr
 			colname := ""
 			switch ct := expr.(type) {
@@ -603,12 +603,12 @@ func getColumnCollations(venv *vtenv.Environment, table *tabletmanagerdatapb.Tab
 // If SourceTimeZone is defined in the BinlogSource, the VReplication workflow would have converted the datetime
 // columns expecting the source to have been in the SourceTimeZone and target in TargetTimeZone. We need to do the reverse
 // conversion in VDiff before comparing to the source
-func (df *vdiff) adjustForSourceTimeZone(targetSelectExprs sqlparser.SelectExprs, fields map[string]querypb.Type) sqlparser.SelectExprs {
+func (df *vdiff) adjustForSourceTimeZone(targetSelectExprs []sqlparser.SelectExpr, fields map[string]querypb.Type) []sqlparser.SelectExpr {
 	if df.sourceTimeZone == "" {
 		return targetSelectExprs
 	}
 	log.Infof("source time zone specified: %s", df.sourceTimeZone)
-	var newSelectExprs sqlparser.SelectExprs
+	var newSelectExprs []sqlparser.SelectExpr
 	var modified bool
 	for _, expr := range targetSelectExprs {
 		converted := false
@@ -619,14 +619,10 @@ func (df *vdiff) adjustForSourceTimeZone(targetSelectExprs sqlparser.SelectExprs
 				colName := colAs.Name.Lowered()
 				fieldType := fields[colName]
 				if fieldType == querypb.Type_DATETIME {
-					convertTZFuncExpr = &sqlparser.FuncExpr{
-						Name: sqlparser.NewIdentifierCI("convert_tz"),
-						Exprs: sqlparser.Exprs{
-							colAs,
-							sqlparser.NewStrLiteral(df.targetTimeZone),
-							sqlparser.NewStrLiteral(df.sourceTimeZone),
-						},
-					}
+					convertTZFuncExpr = sqlparser.NewFuncExpr("convert_tz",
+						colAs,
+						sqlparser.NewStrLiteral(df.targetTimeZone),
+						sqlparser.NewStrLiteral(df.sourceTimeZone))
 					log.Infof("converting datetime column %s using convert_tz()", colName)
 					newSelectExprs = append(newSelectExprs, &sqlparser.AliasedExpr{Expr: convertTZFuncExpr, As: colAs.Name})
 					converted = true
@@ -679,14 +675,14 @@ func (df *vdiff) buildTablePlan(table *tabletmanagerdatapb.TableDefinition, quer
 	targetSelect := &sqlparser.Select{}
 	// aggregates contains the list if Aggregate functions, if any.
 	var aggregates []*engine.AggregateParams
-	for _, selExpr := range sel.SelectExprs {
+	for _, selExpr := range sel.GetColumns() {
 		switch selExpr := selExpr.(type) {
 		case *sqlparser.StarExpr:
 			// If it's a '*' expression, expand column list from the schema.
 			for _, fld := range table.Fields {
 				aliased := &sqlparser.AliasedExpr{Expr: &sqlparser.ColName{Name: sqlparser.NewIdentifierCI(fld.Name)}}
-				sourceSelect.SelectExprs = append(sourceSelect.SelectExprs, aliased)
-				targetSelect.SelectExprs = append(targetSelect.SelectExprs, aliased)
+				sourceSelect.AddSelectExpr(aliased)
+				targetSelect.AddSelectExpr(aliased)
 			}
 		case *sqlparser.AliasedExpr:
 			var targetCol *sqlparser.ColName
@@ -700,8 +696,8 @@ func (df *vdiff) buildTablePlan(table *tabletmanagerdatapb.TableDefinition, quer
 				targetCol = &sqlparser.ColName{Name: selExpr.As}
 			}
 			// If the input was "select a as b", then source will use "a" and target will use "b".
-			sourceSelect.SelectExprs = append(sourceSelect.SelectExprs, selExpr)
-			targetSelect.SelectExprs = append(targetSelect.SelectExprs, &sqlparser.AliasedExpr{Expr: targetCol})
+			sourceSelect.AddSelectExpr(selExpr)
+			targetSelect.AddSelectExpr(&sqlparser.AliasedExpr{Expr: targetCol})
 
 			// Check if it's an aggregate expression
 			if expr, ok := selExpr.Expr.(sqlparser.AggrFunc); ok {
@@ -713,7 +709,7 @@ func (df *vdiff) buildTablePlan(table *tabletmanagerdatapb.TableDefinition, quer
 					// but will need to be revisited when we add such support to vreplication
 					aggregates = append(aggregates, engine.NewAggregateParam(
 						/*opcode*/ opcode.AggregateSum,
-						/*offset*/ len(sourceSelect.SelectExprs)-1,
+						/*offset*/ sourceSelect.GetColumnCount()-1,
 						/*alias*/ "", df.env.CollationEnv()))
 				}
 			}
@@ -727,12 +723,12 @@ func (df *vdiff) buildTablePlan(table *tabletmanagerdatapb.TableDefinition, quer
 		fields[strings.ToLower(field.Name)] = field.Type
 	}
 
-	targetSelect.SelectExprs = df.adjustForSourceTimeZone(targetSelect.SelectExprs, fields)
+	targetSelect.SelectExprs.Exprs = df.adjustForSourceTimeZone(targetSelect.SelectExprs.Exprs, fields)
 	// Start with adding all columns for comparison.
-	td.compareCols = make([]compareColInfo, len(sourceSelect.SelectExprs))
+	td.compareCols = make([]compareColInfo, sourceSelect.GetColumnCount())
 	for i := range td.compareCols {
 		td.compareCols[i].colIndex = i
-		colname, err := getColumnNameForSelectExpr(targetSelect.SelectExprs[i])
+		colname, err := getColumnNameForSelectExpr(targetSelect.GetColumns()[i])
 		if err != nil {
 			return nil, err
 		}
@@ -1357,16 +1353,16 @@ func (td *tableDiffer) genRowDiff(queryStmt string, row []sqltypes.Value, debug,
 	if onlyPks {
 		for _, pkI := range td.selectPks {
 			buf := sqlparser.NewTrackedBuffer(nil)
-			sel.SelectExprs[pkI].Format(buf)
+			sel.SelectExprs.Exprs[pkI].Format(buf)
 			col := buf.String()
 			drp.Row[col] = row[pkI]
 		}
 		return drp, nil
 	}
 
-	for i := range sel.SelectExprs {
+	for i := range sel.SelectExprs.Exprs {
 		buf := sqlparser.NewTrackedBuffer(nil)
-		sel.SelectExprs[i].Format(buf)
+		sel.SelectExprs.Exprs[i].Format(buf)
 		col := buf.String()
 		drp.Row[col] = row[i]
 	}
@@ -1380,7 +1376,7 @@ func (td *tableDiffer) genDebugQueryDiff(sel *sqlparser.Select, row []sqltypes.V
 
 	if onlyPks {
 		for i, pkI := range td.selectPks {
-			pk := sel.SelectExprs[pkI]
+			pk := sel.GetColumns()[pkI]
 			pk.Format(buf)
 			if i != len(td.selectPks)-1 {
 				buf.Myprintf(", ")
@@ -1393,7 +1389,7 @@ func (td *tableDiffer) genDebugQueryDiff(sel *sqlparser.Select, row []sqltypes.V
 	buf.Myprintf(sqlparser.ToString(sel.From))
 	buf.Myprintf(" where ")
 	for i, pkI := range td.selectPks {
-		sel.SelectExprs[pkI].Format(buf)
+		sel.SelectExprs.Exprs[pkI].Format(buf)
 		buf.Myprintf("=")
 		row[pkI].EncodeSQL(buf)
 		if i != len(td.selectPks)-1 {
diff --git a/go/vt/wrangler/vdiff_test.go b/go/vt/wrangler/vdiff_test.go
index 44c3a22a336..4bbaed35c3f 100644
--- a/go/vt/wrangler/vdiff_test.go
+++ b/go/vt/wrangler/vdiff_test.go
@@ -1071,11 +1071,10 @@ func TestVDiffFindPKs(t *testing.T) {
 				Schema:            "create table t1(c1 bigint, c2 bigint, primary key(c1))",
 			},
 			targetSelect: &sqlparser.Select{
-				SelectExprs: sqlparser.SelectExprs{
-					&sqlparser.AliasedExpr{Expr: &sqlparser.ColName{Name: sqlparser.NewIdentifierCI("c1")}},
-					&sqlparser.AliasedExpr{Expr: &sqlparser.ColName{Name: sqlparser.NewIdentifierCI("c2")}},
-				},
-			},
+				SelectExprs: &sqlparser.SelectExprs{
+					Exprs: []sqlparser.SelectExpr{
+						&sqlparser.AliasedExpr{Expr: &sqlparser.ColName{Name: sqlparser.NewIdentifierCI("c1")}},
+						&sqlparser.AliasedExpr{Expr: &sqlparser.ColName{Name: sqlparser.NewIdentifierCI("c2")}}}}},
 			tdIn: &tableDiffer{
 				compareCols: []compareColInfo{{0, collations.Unknown, nil, false}, {1, collations.Unknown, nil, false}},
 				comparePKs:  []compareColInfo{},
@@ -1097,12 +1096,12 @@ func TestVDiffFindPKs(t *testing.T) {
 				Schema:            "create table t1(c1 bigint, c2 bigint, c3 varchar(50), c4 bigint, primary key(c1, c4))",
 			},
 			targetSelect: &sqlparser.Select{
-				SelectExprs: sqlparser.SelectExprs{
-					&sqlparser.AliasedExpr{Expr: &sqlparser.ColName{Name: sqlparser.NewIdentifierCI("c1")}},
-					&sqlparser.AliasedExpr{Expr: &sqlparser.ColName{Name: sqlparser.NewIdentifierCI("c2")}},
-					&sqlparser.AliasedExpr{Expr: &sqlparser.FuncExpr{Name: sqlparser.NewIdentifierCI("c3")}},
-					&sqlparser.AliasedExpr{Expr: &sqlparser.ColName{Name: sqlparser.NewIdentifierCI("c4")}},
-				},
+				SelectExprs: &sqlparser.SelectExprs{
+					Exprs: []sqlparser.SelectExpr{
+						&sqlparser.AliasedExpr{Expr: sqlparser.NewColName("c1")},
+						&sqlparser.AliasedExpr{Expr: sqlparser.NewColName("c2")},
+						&sqlparser.AliasedExpr{Expr: sqlparser.NewFuncExpr("c3")},
+						&sqlparser.AliasedExpr{Expr: sqlparser.NewColName("c4")}}},
 			},
 			tdIn: &tableDiffer{
 				compareCols: []compareColInfo{{0, collations.Unknown, nil, false}, {1, collations.Unknown, nil, false}, {2, collations.Unknown, nil, false}, {3, collations.Unknown, nil, false}},

From 3669569f659c6b9850c077fc576eef4f7b613fe1 Mon Sep 17 00:00:00 2001
From: Dirkjan Bussink <d.bussink@gmail.com>
Date: Thu, 6 Feb 2025 09:28:55 +0100
Subject: [PATCH 30/68] Ignore execution time errors for schemadiff view
 analysis (#17704)

Signed-off-by: Dirkjan Bussink <d.bussink@gmail.com>
---
 go/vt/schemadiff/schema.go      |  5 +++++
 go/vt/schemadiff/schema_test.go | 14 ++++++++++++++
 2 files changed, 19 insertions(+)

diff --git a/go/vt/schemadiff/schema.go b/go/vt/schemadiff/schema.go
index bbd1258070e..c251779061c 100644
--- a/go/vt/schemadiff/schema.go
+++ b/go/vt/schemadiff/schema.go
@@ -1085,6 +1085,11 @@ func (s *Schema) ValidateViewReferences() error {
 					View:   view.Name(),
 					Column: e.Column.Name.String(),
 				}
+			case *semantics.UnsupportedConstruct:
+				// These are error types from semantic analysis for executing queries. When we
+				// have a view, we don't have Vitess execute these queries but MySQL does, so
+				// we don't want to return errors for these.
+				return nil
 			}
 			return err
 		}
diff --git a/go/vt/schemadiff/schema_test.go b/go/vt/schemadiff/schema_test.go
index 1710cec12c7..43cfcf78bdc 100644
--- a/go/vt/schemadiff/schema_test.go
+++ b/go/vt/schemadiff/schema_test.go
@@ -570,6 +570,20 @@ func TestInvalidSchema(t *testing.T) {
 			`,
 			expectErr: &DuplicateForeignKeyConstraintNameError{Table: "t2", Constraint: "const_id"},
 		},
+		{
+			schema: `
+CREATE TABLE users (id INT PRIMARY KEY, name VARCHAR(255));
+CREATE VIEW user_earnings_ranking AS
+SELECT
+    u.id AS user_id,
+    e.total_earnings AS total_earnings,
+    ROW_NUMBER() OVER (
+        ORDER BY e.total_earnings DESC, u.id ASC
+    ) AS ranking
+FROM users AS u JOIN earnings AS e ON e.user_id = u.id;
+`,
+			expectErr: &ViewDependencyUnresolvedError{View: "user_earnings_ranking"},
+		},
 	}
 	for _, ts := range tt {
 		t.Run(ts.schema, func(t *testing.T) {

From e08d85c85bc6b76c04bb5da0f214c10a0bc07946 Mon Sep 17 00:00:00 2001
From: Shlomi Noach <2607934+shlomi-noach@users.noreply.github.com>
Date: Thu, 6 Feb 2025 10:29:23 +0200
Subject: [PATCH 31/68] `schemadiff` textual annotation fix + tests (#17630)

Signed-off-by: Shlomi Noach <2607934+shlomi-noach@users.noreply.github.com>
---
 go/vt/schemadiff/annotations.go |  15 +-
 go/vt/schemadiff/diff_test.go   | 234 +++++++++++++++++++++++++++++---
 go/vt/schemadiff/table.go       |   1 +
 go/vt/schemadiff/table_test.go  | 142 +++++++++++++++++--
 4 files changed, 356 insertions(+), 36 deletions(-)

diff --git a/go/vt/schemadiff/annotations.go b/go/vt/schemadiff/annotations.go
index f17344c1085..d17b0c42a48 100644
--- a/go/vt/schemadiff/annotations.go
+++ b/go/vt/schemadiff/annotations.go
@@ -91,17 +91,16 @@ func (a *TextualAnnotations) Removed() (r []*AnnotatedText) {
 func (a *TextualAnnotations) Export() string {
 	textLines := make([]string, 0, len(a.texts))
 	for _, annotatedText := range a.texts {
-		switch annotatedText.typ {
-		case AddedTextualAnnotationType:
+		switch {
+		case annotatedText.typ == AddedTextualAnnotationType:
 			annotatedText.text = "+" + annotatedText.text
-		case RemovedTextualAnnotationType:
+		case annotatedText.typ == RemovedTextualAnnotationType:
 			annotatedText.text = "-" + annotatedText.text
+		case a.hasAnyChanges:
+			// This text is unchanged, but indented to align with changes
+			annotatedText.text = " " + annotatedText.text
 		default:
-			// text unchanged
-			if a.hasAnyChanges {
-				// If there is absolutely no change, we don't add a space anywhere
-				annotatedText.text = " " + annotatedText.text
-			}
+			// If there is absolutely no change, we don't add a space anywhere
 		}
 		textLines = append(textLines, annotatedText.text)
 	}
diff --git a/go/vt/schemadiff/diff_test.go b/go/vt/schemadiff/diff_test.go
index 185d233ef20..c707b6dd290 100644
--- a/go/vt/schemadiff/diff_test.go
+++ b/go/vt/schemadiff/diff_test.go
@@ -73,6 +73,13 @@ func TestDiffTables(t *testing.T) {
 			action:   "alter",
 			fromName: "t",
 			toName:   "t",
+			annotated: []string{
+				" CREATE TABLE `t` (",
+				" 	`id` int,",
+				"+	`i` int,",
+				"+	`b` tinyint(1),",
+				" 	PRIMARY KEY (`id`)",
+				" )"},
 		},
 		{
 			name: "alter columns from tinyint(1) to boolean",
@@ -93,6 +100,14 @@ func TestDiffTables(t *testing.T) {
 			action:   "alter",
 			fromName: "t",
 			toName:   "t",
+			annotated: []string{
+				" CREATE TABLE `t` (",
+				" 	`id` int,",
+				"+	`i` int,",
+				"+	`b` tinyint(1) DEFAULT '1',",
+				" 	PRIMARY KEY (`id`)",
+				" )",
+			},
 		},
 		{
 			name:     "change of columns, boolean type, invalid default",
@@ -103,6 +118,14 @@ func TestDiffTables(t *testing.T) {
 			action:   "alter",
 			fromName: "t",
 			toName:   "t",
+			annotated: []string{
+				" CREATE TABLE `t` (",
+				" 	`id` int,",
+				"+	`i` int,",
+				"+	`b` tinyint(1),",
+				" 	PRIMARY KEY (`id`)",
+				" )",
+			},
 		},
 		{
 			name:   "create",
@@ -139,6 +162,14 @@ func TestDiffTables(t *testing.T) {
 			hints: &DiffHints{
 				TableQualifierHint: TableQualifierDeclared,
 			},
+			annotated: []string{
+				" CREATE TABLE `t1` (",
+				" 	`id` int,",
+				"-	`name` int,",
+				"+	`name` bigint,",
+				" 	PRIMARY KEY (`id`)",
+				" )",
+			},
 		},
 		{
 			name:   "TableQualifierDeclared hint, from has qualifier",
@@ -150,6 +181,14 @@ func TestDiffTables(t *testing.T) {
 			hints: &DiffHints{
 				TableQualifierHint: TableQualifierDeclared,
 			},
+			annotated: []string{
+				" CREATE TABLE `_vt`.`t1` (",
+				" 	`id` int,",
+				"-	`name` int,",
+				"+	`name` bigint,",
+				" 	PRIMARY KEY (`id`)",
+				" )",
+			},
 		},
 		{
 			name:   "TableQualifierDefault, from has qualifier",
@@ -158,6 +197,14 @@ func TestDiffTables(t *testing.T) {
 			diff:   "alter table _vt.t1 modify column `name` bigint",
 			cdiff:  "ALTER TABLE `_vt`.`t1` MODIFY COLUMN `name` bigint",
 			action: "alter",
+			annotated: []string{
+				" CREATE TABLE `_vt`.`t1` (",
+				" 	`id` int,",
+				"-	`name` int,",
+				"+	`name` bigint,",
+				" 	PRIMARY KEY (`id`)",
+				" )",
+			},
 		},
 		{
 			name:   "TableQualifierDefault, both have qualifiers",
@@ -166,6 +213,14 @@ func TestDiffTables(t *testing.T) {
 			diff:   "alter table _vt.t1 modify column `name` bigint",
 			cdiff:  "ALTER TABLE `_vt`.`t1` MODIFY COLUMN `name` bigint",
 			action: "alter",
+			annotated: []string{
+				" CREATE TABLE `_vt`.`t1` (",
+				" 	`id` int,",
+				"-	`name` int,",
+				"+	`name` bigint,",
+				" 	PRIMARY KEY (`id`)",
+				" )",
+			},
 		},
 		{
 			name:   "TableQualifierDefault, create",
@@ -174,6 +229,12 @@ func TestDiffTables(t *testing.T) {
 			cdiff:  "CREATE TABLE `_vt`.`t` (\n\t`id` int,\n\tPRIMARY KEY (`id`)\n)",
 			action: "create",
 			toName: "t",
+			annotated: []string{
+				"+CREATE TABLE `_vt`.`t` (",
+				"+	`id` int,",
+				"+	PRIMARY KEY (`id`)",
+				"+)",
+			},
 		},
 		{
 			name:   "TableQualifierDeclared, create",
@@ -185,6 +246,12 @@ func TestDiffTables(t *testing.T) {
 			hints: &DiffHints{
 				TableQualifierHint: TableQualifierDeclared,
 			},
+			annotated: []string{
+				"+CREATE TABLE `_vt`.`t` (",
+				"+	`id` int,",
+				"+	PRIMARY KEY (`id`)",
+				"+)",
+			},
 		},
 		{
 			name:     "TableQualifierDefault, drop",
@@ -193,6 +260,12 @@ func TestDiffTables(t *testing.T) {
 			cdiff:    "DROP TABLE `_vt`.`t`",
 			action:   "drop",
 			fromName: "t",
+			annotated: []string{
+				"-CREATE TABLE `_vt`.`t` (",
+				"-	`id` int,",
+				"-	PRIMARY KEY (`id`)",
+				"-)",
+			},
 		},
 		{
 			name:     "TableQualifierDeclared, drop",
@@ -204,6 +277,12 @@ func TestDiffTables(t *testing.T) {
 			hints: &DiffHints{
 				TableQualifierHint: TableQualifierDeclared,
 			},
+			annotated: []string{
+				"-CREATE TABLE `_vt`.`t` (",
+				"-	`id` int,",
+				"-	PRIMARY KEY (`id`)",
+				"-)",
+			},
 		},
 		{
 			name: "changing table level defaults with column specific settings, ignore charset",
@@ -254,6 +333,12 @@ func TestDiffTables(t *testing.T) {
 				AlterTableAlgorithmStrategy: AlterTableAlgorithmStrategyCopy,
 				TableCharsetCollateStrategy: TableCharsetCollateStrict,
 			},
+			annotated: []string{
+				" CREATE TABLE `t` (",
+				" 	`a` varchar(64) COLLATE latin1_bin",
+				"-) CHARSET latin1",
+				" )",
+			},
 		},
 		{
 			name:     "changing table level defaults with column specific settings, table already normalized",
@@ -267,6 +352,13 @@ func TestDiffTables(t *testing.T) {
 				AlterTableAlgorithmStrategy: AlterTableAlgorithmStrategyCopy,
 				TableCharsetCollateStrategy: TableCharsetCollateStrict,
 			},
+			annotated: []string{
+				" CREATE TABLE `t` (",
+				"-	`a` varchar(64)",
+				"-) CHARSET latin1",
+				"+	`a` varchar(64) CHARACTER SET latin1 COLLATE latin1_bin",
+				" )",
+			},
 		},
 		{
 			name:   "changing table level charset to default",
@@ -275,6 +367,12 @@ func TestDiffTables(t *testing.T) {
 			action: "alter",
 			diff:   "alter table t charset utf8mb4",
 			cdiff:  "ALTER TABLE `t` CHARSET utf8mb4",
+			annotated: []string{
+				" CREATE TABLE `t` (",
+				" 	`i` int",
+				"-) CHARSET latin1",
+				" )",
+			},
 		},
 		{
 			name: "no changes with normalization and utf8mb4",
@@ -406,11 +504,11 @@ func TestDiffTables(t *testing.T) {
 					require.NotNil(t, from)
 					require.NotNil(t, to)
 					require.NotNil(t, unified)
-					if ts.annotated != nil {
-						// Optional test for assorted scenarios.
-						unifiedExport := unified.Export()
-						assert.Equal(t, ts.annotated, strings.Split(unifiedExport, "\n"))
+					if ts.annotated == nil {
+						ts.annotated = []string{}
 					}
+					unifiedExport := unified.Export()
+					assert.Equal(t, ts.annotated, strings.Split(unifiedExport, "\n"))
 				})
 				// let's also check dq, and also validate that dq's statement is identical to d's
 				assert.NoError(t, dqerr)
@@ -556,12 +654,13 @@ func TestDiffViews(t *testing.T) {
 					_, err = env.Parser().ParseStrictDDL(canonicalDiff)
 					assert.NoError(t, err)
 				}
-				if ts.annotated != nil {
-					// Optional test for assorted scenarios.
-					_, _, unified := d.Annotated()
-					unifiedExport := unified.Export()
-					assert.Equal(t, ts.annotated, strings.Split(unifiedExport, "\n"))
+				if ts.annotated == nil {
+					ts.annotated = []string{}
 				}
+				_, _, unified := d.Annotated()
+				unifiedExport := unified.Export()
+				assert.Equal(t, ts.annotated, strings.Split(unifiedExport, "\n"))
+
 				// let's also check dq, and also validate that dq's statement is identical to d's
 				assert.NoError(t, dqerr)
 				require.NotNil(t, dq)
@@ -606,6 +705,9 @@ func TestDiffSchemas(t *testing.T) {
 			cdiffs: []string{
 				"ALTER TABLE `t` MODIFY COLUMN `v` varchar(20)",
 			},
+			annotated: []string{
+				" CREATE TABLE `t` (\n \t`id` int,\n-\t`v` varchar(10),\n+\t`v` varchar(20),\n \tPRIMARY KEY (`id`)\n )",
+			},
 		},
 		{
 			name: "change of table column tinyint 1 to longer",
@@ -617,6 +719,9 @@ func TestDiffSchemas(t *testing.T) {
 			cdiffs: []string{
 				"ALTER TABLE `t` MODIFY COLUMN `i` tinyint",
 			},
+			annotated: []string{
+				" CREATE TABLE `t` (\n \t`id` int,\n-\t`i` tinyint(1),\n+\t`i` tinyint,\n \tPRIMARY KEY (`id`)\n )",
+			},
 		},
 		{
 			name: "change of table column tinyint 2 to 1",
@@ -628,6 +733,9 @@ func TestDiffSchemas(t *testing.T) {
 			cdiffs: []string{
 				"ALTER TABLE `t` MODIFY COLUMN `i` tinyint(1)",
 			},
+			annotated: []string{
+				" CREATE TABLE `t` (\n \t`id` int,\n-\t`i` tinyint,\n+\t`i` tinyint(1),\n \tPRIMARY KEY (`id`)\n )",
+			},
 		},
 		{
 			name: "change of table columns, added",
@@ -639,6 +747,9 @@ func TestDiffSchemas(t *testing.T) {
 			cdiffs: []string{
 				"ALTER TABLE `t` ADD COLUMN `i` int",
 			},
+			annotated: []string{
+				" CREATE TABLE `t` (\n \t`id` int,\n+\t`i` int,\n \tPRIMARY KEY (`id`)\n )",
+			},
 		},
 		{
 			name: "change with function",
@@ -650,6 +761,9 @@ func TestDiffSchemas(t *testing.T) {
 			cdiffs: []string{
 				"ALTER TABLE `identifiers` ADD COLUMN `company_id` mediumint unsigned NOT NULL FIRST",
 			},
+			annotated: []string{
+				" CREATE TABLE `identifiers` (\n+\t`company_id` mediumint unsigned NOT NULL,\n \t`id` binary(16) NOT NULL DEFAULT (uuid_to_bin(uuid(), true))\n )",
+			},
 		},
 		{
 			name: "change within functional index",
@@ -661,6 +775,9 @@ func TestDiffSchemas(t *testing.T) {
 			cdiffs: []string{
 				"ALTER TABLE `t1` DROP KEY `deleted_check`, ADD UNIQUE KEY `deleted_check` (`id`, (if(`deleted_at` IS NOT NULL, 0, NULL)))",
 			},
+			annotated: []string{
+				" CREATE TABLE `t1` (\n \t`id` mediumint unsigned NOT NULL,\n \t`deleted_at` timestamp NULL,\n \tPRIMARY KEY (`id`),\n-\tUNIQUE KEY `deleted_check` (`id`, (if(`deleted_at` IS NULL, 0, NULL)))\n+\tUNIQUE KEY `deleted_check` (`id`, (if(`deleted_at` IS NOT NULL, 0, NULL)))\n )",
+			},
 		},
 		{
 			name: "change for a check",
@@ -672,6 +789,9 @@ func TestDiffSchemas(t *testing.T) {
 			cdiffs: []string{
 				"ALTER TABLE `t` DROP CHECK `Check1`, ADD CONSTRAINT `RenamedCheck1` CHECK (`test` >= 0)",
 			},
+			annotated: []string{
+				" CREATE TABLE `t` (\n \t`id` int NOT NULL,\n \t`test` int NOT NULL DEFAULT '0',\n \tPRIMARY KEY (`id`),\n-\tCONSTRAINT `Check1` CHECK (`test` >= 0)\n+\tCONSTRAINT `RenamedCheck1` CHECK (`test` >= 0)\n )",
+			},
 		},
 		{
 			name: "not enforce a check",
@@ -683,6 +803,9 @@ func TestDiffSchemas(t *testing.T) {
 			cdiffs: []string{
 				"ALTER TABLE `t` ALTER CHECK `Check1` NOT ENFORCED",
 			},
+			annotated: []string{
+				" CREATE TABLE `t` (\n \t`id` int NOT NULL,\n \t`test` int NOT NULL DEFAULT '0',\n \tPRIMARY KEY (`id`),\n-\tCONSTRAINT `Check1` CHECK (`test` >= 0)\n+\tCONSTRAINT `Check1` CHECK (`test` >= 0) NOT ENFORCED\n )",
+			},
 		},
 		{
 			name: "enforce a check",
@@ -694,6 +817,9 @@ func TestDiffSchemas(t *testing.T) {
 			cdiffs: []string{
 				"ALTER TABLE `t` ALTER CHECK `Check1` ENFORCED",
 			},
+			annotated: []string{
+				" CREATE TABLE `t` (\n \t`id` int NOT NULL,\n \t`test` int NOT NULL DEFAULT '0',\n \tPRIMARY KEY (`id`),\n-\tCONSTRAINT `Check1` CHECK (`test` >= 0) NOT ENFORCED\n+\tCONSTRAINT `Check1` CHECK (`test` >= 0)\n )",
+			},
 		},
 		{
 			name: "change of table columns, removed",
@@ -705,6 +831,9 @@ func TestDiffSchemas(t *testing.T) {
 			cdiffs: []string{
 				"ALTER TABLE `t` DROP COLUMN `i`",
 			},
+			annotated: []string{
+				" CREATE TABLE `t` (\n \t`id` int,\n-\t`i` int,\n \tPRIMARY KEY (`id`)\n )",
+			},
 		},
 		{
 			name: "create table",
@@ -715,6 +844,9 @@ func TestDiffSchemas(t *testing.T) {
 			cdiffs: []string{
 				"CREATE TABLE `t` (\n\t`id` int,\n\tPRIMARY KEY (`id`)\n)",
 			},
+			annotated: []string{
+				"+CREATE TABLE `t` (\n+\t`id` int,\n+\tPRIMARY KEY (`id`)\n+)",
+			},
 		},
 		{
 			name: "create table 2",
@@ -775,6 +907,10 @@ func TestDiffSchemas(t *testing.T) {
 				"DROP TABLE `t2`",
 				"CREATE TABLE `t3` (\n\t`id` int unsigned,\n\tPRIMARY KEY (`id`)\n)",
 			},
+			annotated: []string{
+				"-CREATE TABLE `t2` (\n-\t`id` int unsigned,\n-\tPRIMARY KEY (`id`)\n-)",
+				"+CREATE TABLE `t3` (\n+\t`id` int unsigned,\n+\tPRIMARY KEY (`id`)\n+)",
+			},
 		},
 		{
 			name: "identical tables: heuristic rename",
@@ -811,6 +947,14 @@ func TestDiffSchemas(t *testing.T) {
 				"CREATE TABLE `t2b` (\n\t`id` int unsigned,\n\tPRIMARY KEY (`id`)\n)",
 				"CREATE TABLE `t3b` (\n\t`id` int,\n\tPRIMARY KEY (`id`)\n)",
 			},
+			annotated: []string{
+				"-CREATE TABLE `t3a` (\n-\t`id` smallint,\n-\tPRIMARY KEY (`id`)\n-)",
+				"-CREATE TABLE `t2a` (\n-\t`id` int unsigned,\n-\tPRIMARY KEY (`id`)\n-)",
+				"-CREATE TABLE `t1a` (\n-\t`id` int,\n-\tPRIMARY KEY (`id`)\n-)",
+				"+CREATE TABLE `t1b` (\n+\t`id` bigint,\n+\tPRIMARY KEY (`id`)\n+)",
+				"+CREATE TABLE `t2b` (\n+\t`id` int unsigned,\n+\tPRIMARY KEY (`id`)\n+)",
+				"+CREATE TABLE `t3b` (\n+\t`id` int,\n+\tPRIMARY KEY (`id`)\n+)",
+			},
 		},
 		{
 			name: "identical tables: multiple heuristic rename",
@@ -829,6 +973,12 @@ func TestDiffSchemas(t *testing.T) {
 				"RENAME TABLE `t1a` TO `t3b`",
 			},
 			tableRename: TableRenameHeuristicStatement,
+			annotated: []string{
+				"-CREATE TABLE `t3a` (\n-\t`id` smallint,\n-\tPRIMARY KEY (`id`)\n-)",
+				"+CREATE TABLE `t1b` (\n+\t`id` bigint,\n+\tPRIMARY KEY (`id`)\n+)",
+				"-CREATE TABLE `t2a` (\n-\t`id` int unsigned,\n-\tPRIMARY KEY (`id`)\n-)\n+CREATE TABLE `t2b` (\n+\t`id` int unsigned,\n+\tPRIMARY KEY (`id`)\n+)",
+				"-CREATE TABLE `t1a` (\n-\t`id` int,\n-\tPRIMARY KEY (`id`)\n-)\n+CREATE TABLE `t3b` (\n+\t`id` int,\n+\tPRIMARY KEY (`id`)\n+)",
+			},
 		},
 		{
 			name: "tables with irregular names",
@@ -842,6 +992,10 @@ func TestDiffSchemas(t *testing.T) {
 				"ALTER TABLE `t.2` MODIFY COLUMN `id` bigint",
 				"ALTER TABLE `t3` MODIFY COLUMN `i.d` int unsigned",
 			},
+			annotated: []string{
+				" CREATE TABLE `t.2` (\n-\t`id` int,\n+\t`id` bigint,\n \tPRIMARY KEY (`id`)\n )",
+				" CREATE TABLE `t3` (\n-\t`i.d` int,\n+\t`i.d` int unsigned,\n \tPRIMARY KEY (`i.d`)\n )",
+			},
 		},
 		// Foreign keys
 		{
@@ -857,6 +1011,11 @@ func TestDiffSchemas(t *testing.T) {
 				"CREATE TABLE `t4` (\n\t`id` int,\n\t`i` int,\n\tPRIMARY KEY (`id`),\n\tKEY `f4` (`i`),\n\tCONSTRAINT `f4` FOREIGN KEY (`i`) REFERENCES `t7` (`id`)\n)",
 				"CREATE TABLE `t5` (\n\t`id` int,\n\t`i` int,\n\tPRIMARY KEY (`id`),\n\tKEY `f5` (`i`),\n\tCONSTRAINT `f5` FOREIGN KEY (`i`) REFERENCES `t7` (`id`)\n)",
 			},
+			annotated: []string{
+				"+CREATE TABLE `t7` (\n+\t`id` int,\n+\tPRIMARY KEY (`id`)\n+)",
+				"+CREATE TABLE `t4` (\n+\t`id` int,\n+\t`i` int,\n+\tPRIMARY KEY (`id`),\n+\tKEY `f4` (`i`),\n+\tCONSTRAINT `f4` FOREIGN KEY (`i`) REFERENCES `t7` (`id`)\n+)",
+				"+CREATE TABLE `t5` (\n+\t`id` int,\n+\t`i` int,\n+\tPRIMARY KEY (`id`),\n+\tKEY `f5` (`i`),\n+\tCONSTRAINT `f5` FOREIGN KEY (`i`) REFERENCES `t7` (`id`)\n+)",
+			},
 		},
 		{
 			name: "create tables with foreign keys, with invalid fk reference",
@@ -896,6 +1055,10 @@ func TestDiffSchemas(t *testing.T) {
 				"CREATE TABLE `t12` (\n\t`id` int,\n\t`i` int,\n\tPRIMARY KEY (`id`),\n\tKEY `f1201c` (`i`),\n\tCONSTRAINT `f1201c` FOREIGN KEY (`i`) REFERENCES `t11` (`id`) ON DELETE SET NULL\n)",
 			},
 			fkStrategy: ForeignKeyCheckStrategyIgnore,
+			annotated: []string{
+				"+CREATE TABLE `t11` (\n+\t`id` int,\n+\t`i` int,\n+\tPRIMARY KEY (`id`),\n+\tKEY `f1101c` (`i`),\n+\tCONSTRAINT `f1101c` FOREIGN KEY (`i`) REFERENCES `t12` (`id`) ON DELETE RESTRICT\n+)",
+				"+CREATE TABLE `t12` (\n+\t`id` int,\n+\t`i` int,\n+\tPRIMARY KEY (`id`),\n+\tKEY `f1201c` (`i`),\n+\tCONSTRAINT `f1201c` FOREIGN KEY (`i`) REFERENCES `t11` (`id`) ON DELETE SET NULL\n+)",
+			},
 		},
 		{
 			name: "drop tables with foreign keys, expect specific order",
@@ -910,6 +1073,11 @@ func TestDiffSchemas(t *testing.T) {
 				"DROP TABLE `t4`",
 				"DROP TABLE `t7`",
 			},
+			annotated: []string{
+				"-CREATE TABLE `t5` (\n-\t`id` int,\n-\t`i` int,\n-\tPRIMARY KEY (`id`),\n-\tKEY `f5` (`i`),\n-\tCONSTRAINT `f5` FOREIGN KEY (`i`) REFERENCES `t7` (`id`)\n-)",
+				"-CREATE TABLE `t4` (\n-\t`id` int,\n-\t`i` int,\n-\tPRIMARY KEY (`id`),\n-\tKEY `f4` (`i`),\n-\tCONSTRAINT `f4` FOREIGN KEY (`i`) REFERENCES `t7` (`id`)\n-)",
+				"-CREATE TABLE `t7` (\n-\t`id` int,\n-\tPRIMARY KEY (`id`)\n-)",
+			},
 		},
 		{
 			name: "rename index used by foreign keys",
@@ -921,6 +1089,9 @@ func TestDiffSchemas(t *testing.T) {
 			cdiffs: []string{
 				"ALTER TABLE `t` RENAME INDEX `i_idx` TO `i_alternative`",
 			},
+			annotated: []string{
+				" CREATE TABLE `t` (\n \t`id` int,\n \t`i` int,\n \tPRIMARY KEY (`id`),\n-\tKEY `i_idx` (`i`),\n+\tKEY `i_alternative` (`i`),\n \tCONSTRAINT `f` FOREIGN KEY (`i`) REFERENCES `parent` (`id`)\n )",
+			},
 		},
 		// Views
 		{
@@ -938,6 +1109,9 @@ func TestDiffSchemas(t *testing.T) {
 			cdiffs: []string{
 				"ALTER VIEW `v1` AS SELECT `id` FROM `t`",
 			},
+			annotated: []string{
+				"-CREATE VIEW `v1` AS SELECT * FROM `t`\n+CREATE VIEW `v1` AS SELECT `id` FROM `t`",
+			},
 		},
 		{
 			name: "drop view",
@@ -949,6 +1123,9 @@ func TestDiffSchemas(t *testing.T) {
 			cdiffs: []string{
 				"DROP VIEW `v1`",
 			},
+			annotated: []string{
+				"-CREATE VIEW `v1` AS SELECT * FROM `t`",
+			},
 		},
 		{
 			name: "create view",
@@ -960,6 +1137,9 @@ func TestDiffSchemas(t *testing.T) {
 			cdiffs: []string{
 				"CREATE VIEW `v1` AS SELECT `id` FROM `t`",
 			},
+			annotated: []string{
+				"+CREATE VIEW `v1` AS SELECT `id` FROM `t`",
+			},
 		},
 		{
 			name:        "create view: unresolved dependencies",
@@ -979,6 +1159,10 @@ func TestDiffSchemas(t *testing.T) {
 				"DROP TABLE `v1`",
 				"CREATE VIEW `v1` AS SELECT * FROM `t`",
 			},
+			annotated: []string{
+				"-CREATE TABLE `v1` (\n-\t`id` int\n-)",
+				"+CREATE VIEW `v1` AS SELECT * FROM `t`",
+			},
 		},
 		{
 			name: "convert view to table",
@@ -992,6 +1176,10 @@ func TestDiffSchemas(t *testing.T) {
 				"DROP VIEW `v1`",
 				"CREATE TABLE `v1` (\n\t`id` int\n)",
 			},
+			annotated: []string{
+				"-CREATE VIEW `v1` AS SELECT * FROM `t`",
+				"+CREATE TABLE `v1` (\n+\t`id` int\n+)",
+			},
 		},
 		{
 			name:        "unsupported statement",
@@ -1019,6 +1207,14 @@ func TestDiffSchemas(t *testing.T) {
 				"CREATE VIEW `v0` AS SELECT * FROM `v2`, `t2`",
 				"CREATE TABLE `t4` (\n\t`id` int,\n\tPRIMARY KEY (`id`)\n)",
 			},
+			annotated: []string{
+				"-CREATE VIEW `v1` AS SELECT * FROM `t1`",
+				"-CREATE TABLE `t1` (\n-\t`id` int,\n-\tPRIMARY KEY (`id`)\n-)",
+				" CREATE TABLE `t2` (\n-\t`id` int,\n+\t`id` bigint,\n \tPRIMARY KEY (`id`)\n )",
+				"-CREATE VIEW `v2` AS SELECT * FROM `t2`\n+CREATE VIEW `v2` AS SELECT `id` FROM `t2`",
+				"+CREATE VIEW `v0` AS SELECT * FROM `v2`, `t2`",
+				"+CREATE TABLE `t4` (\n+\t`id` int,\n+\tPRIMARY KEY (`id`)\n+)",
+			},
 		},
 		{
 			// Making sure schemadiff distinguishes between VIEWs with different casing
@@ -1035,6 +1231,11 @@ func TestDiffSchemas(t *testing.T) {
 				"DROP VIEW `V1`",
 				"DROP TABLE `t`",
 			},
+			annotated: []string{
+				"-CREATE VIEW `v1` AS SELECT * FROM `t`",
+				"-CREATE VIEW `V1` AS SELECT * FROM `t`",
+				"-CREATE TABLE `t` (\n-\t`id` int,\n-\tPRIMARY KEY (`id`)\n-)",
+			},
 		},
 	}
 	env := NewTestEnv()
@@ -1093,14 +1294,13 @@ func TestDiffSchemas(t *testing.T) {
 						assert.Equal(t, dTo.Name(), clonedTo.Name())
 					}
 				}
-
-				if ts.annotated != nil {
-					// Optional test for assorted scenarios.
-					if assert.Equalf(t, len(diffs), len(ts.annotated), "%+v", cstatements) {
-						for i, d := range diffs {
-							_, _, unified := d.Annotated()
-							assert.Equal(t, ts.annotated[i], unified.Export())
-						}
+				if ts.annotated == nil {
+					ts.annotated = []string{}
+				}
+				if assert.Equalf(t, len(diffs), len(ts.annotated), "%+v", cstatements) {
+					for i, d := range diffs {
+						_, _, unified := d.Annotated()
+						assert.Equal(t, ts.annotated[i], unified.Export())
 					}
 				}
 
diff --git a/go/vt/schemadiff/table.go b/go/vt/schemadiff/table.go
index e9bb35cb3bd..88f8e7d4ce8 100644
--- a/go/vt/schemadiff/table.go
+++ b/go/vt/schemadiff/table.go
@@ -1689,6 +1689,7 @@ func (c *CreateTableEntity) diffKeys(alterTable *sqlparser.AlterTable,
 						NewName: t2Key.Info.Name,
 					}
 					alterTable.AlterOptions = append(alterTable.AlterOptions, renameIndex)
+					annotations.MarkAdded(sqlparser.CanonicalString(t2Key))
 					convertedToRename = true
 				}
 			}
diff --git a/go/vt/schemadiff/table_test.go b/go/vt/schemadiff/table_test.go
index c1d8d8c241e..9446dc9462b 100644
--- a/go/vt/schemadiff/table_test.go
+++ b/go/vt/schemadiff/table_test.go
@@ -829,6 +829,10 @@ func TestCreateTableDiff(t *testing.T) {
 			to:    "create table t2 (`id` int primary key, i int, key i2_alternative (`i`, id), key i_idx ( i ) )",
 			diff:  "alter table t1 rename index i2_idx to i2_alternative",
 			cdiff: "ALTER TABLE `t1` RENAME INDEX `i2_idx` TO `i2_alternative`",
+			textdiffs: []string{
+				"-	KEY `i2_idx` (`i`, `id`)",
+				"+	KEY `i2_alternative` (`i`, `id`)",
+			},
 		},
 		{
 			name:  "reordered and renamed keys",
@@ -836,6 +840,12 @@ func TestCreateTableDiff(t *testing.T) {
 			to:    "create table t2 (`id` int primary key, i int, key i2_alternative (`i`, id), key i_alternative ( i ) )",
 			diff:  "alter table t1 rename index i2_idx to i2_alternative, rename index i_idx to i_alternative",
 			cdiff: "ALTER TABLE `t1` RENAME INDEX `i2_idx` TO `i2_alternative`, RENAME INDEX `i_idx` TO `i_alternative`",
+			textdiffs: []string{
+				"-	KEY `i_idx` (`i`)",
+				"-	KEY `i2_idx` (`i`, `id`)",
+				"+	KEY `i_alternative` (`i`)",
+				"+	KEY `i2_alternative` (`i`, `id`)",
+			},
 		},
 		{
 			name:  "multiple similar keys, one rename",
@@ -843,6 +853,10 @@ func TestCreateTableDiff(t *testing.T) {
 			to:    "create table t2 (`id` int primary key, i int, key i_idx(i), key i2_alternative(i))",
 			diff:  "alter table t1 rename index i2_idx to i2_alternative",
 			cdiff: "ALTER TABLE `t1` RENAME INDEX `i2_idx` TO `i2_alternative`",
+			textdiffs: []string{
+				"-	KEY `i2_idx` (`i`)",
+				"+	KEY `i2_alternative` (`i`)",
+			},
 		},
 		{
 			name:  "multiple similar keys, two renames",
@@ -850,6 +864,12 @@ func TestCreateTableDiff(t *testing.T) {
 			to:    "create table t2 (`id` int primary key, i int, key i_alternative(i), key i2_alternative(i))",
 			diff:  "alter table t1 rename index i_idx to i_alternative, rename index i2_idx to i2_alternative",
 			cdiff: "ALTER TABLE `t1` RENAME INDEX `i_idx` TO `i_alternative`, RENAME INDEX `i2_idx` TO `i2_alternative`",
+			textdiffs: []string{
+				"-	KEY `i_idx` (`i`)",
+				"-	KEY `i2_idx` (`i`)",
+				"+	KEY `i_alternative` (`i`)",
+				"+	KEY `i2_alternative` (`i`)",
+			},
 		},
 		{
 			name:  "multiple similar keys, two renames, reorder",
@@ -857,6 +877,12 @@ func TestCreateTableDiff(t *testing.T) {
 			to:    "create table t2 (`id` int primary key, i int, key i_alternative(i), key i2_alternative(i), key i0 (i, id))",
 			diff:  "alter table t1 rename index i_idx to i_alternative, rename index i2_idx to i2_alternative",
 			cdiff: "ALTER TABLE `t1` RENAME INDEX `i_idx` TO `i_alternative`, RENAME INDEX `i2_idx` TO `i2_alternative`",
+			textdiffs: []string{
+				"-	KEY `i_idx` (`i`)",
+				"-	KEY `i2_idx` (`i`)",
+				"+	KEY `i_alternative` (`i`)",
+				"+	KEY `i2_alternative` (`i`)",
+			},
 		},
 		{
 			name:  "key made visible",
@@ -1866,6 +1892,9 @@ func TestCreateTableDiff(t *testing.T) {
 			to:    "create table t1 (id int primary key) ",
 			diff:  "alter table t1 row_format DEFAULT",
 			cdiff: "ALTER TABLE `t1` ROW_FORMAT DEFAULT",
+			textdiffs: []string{
+				"-) ROW_FORMAT COMPRESSED",
+			},
 		},
 		{
 			name:  "remove table option 2",
@@ -1873,6 +1902,9 @@ func TestCreateTableDiff(t *testing.T) {
 			to:    "create table t1 (id int primary key) ",
 			diff:  "alter table t1 checksum 0",
 			cdiff: "ALTER TABLE `t1` CHECKSUM 0",
+			textdiffs: []string{
+				"-) CHECKSUM 1",
+			},
 		},
 		{
 			name:  "remove table option 3",
@@ -1880,6 +1912,9 @@ func TestCreateTableDiff(t *testing.T) {
 			to:    "create table t1 (id int primary key) ",
 			diff:  "alter table t1 checksum 0",
 			cdiff: "ALTER TABLE `t1` CHECKSUM 0",
+			textdiffs: []string{
+				"-) CHECKSUM 1",
+			},
 		},
 		{
 			name:  "remove table option 4",
@@ -1887,6 +1922,10 @@ func TestCreateTableDiff(t *testing.T) {
 			to:    "create table t2 (id int auto_increment primary key)",
 			diff:  "alter table t1 key_block_size 0 compression ''",
 			cdiff: "ALTER TABLE `t1` KEY_BLOCK_SIZE 0 COMPRESSION ''",
+			textdiffs: []string{
+				"-) KEY_BLOCK_SIZE 16",
+				"-  COMPRESSION 'zlib'",
+			},
 		},
 		{
 			name:  "add, modify and remove table option",
@@ -1894,6 +1933,12 @@ func TestCreateTableDiff(t *testing.T) {
 			to:    "create table t1 (id int primary key) row_format=compressed, engine=innodb, charset=utf8mb4",
 			diff:  "alter table t1 checksum 0 charset utf8mb4 row_format COMPRESSED",
 			cdiff: "ALTER TABLE `t1` CHECKSUM 0 CHARSET utf8mb4 ROW_FORMAT COMPRESSED",
+			textdiffs: []string{
+				"+) ROW_FORMAT COMPRESSED",
+				"-  CHARSET utf8mb3,",
+				"-  CHECKSUM 1",
+				"+  CHARSET utf8mb4",
+			},
 		},
 		{
 			name: "ignore AUTO_INCREMENT addition",
@@ -1907,6 +1952,9 @@ func TestCreateTableDiff(t *testing.T) {
 			autoinc: AutoIncrementApplyHigher,
 			diff:    "alter table t1 auto_increment 300",
 			cdiff:   "ALTER TABLE `t1` AUTO_INCREMENT 300",
+			textdiffs: []string{
+				"+) AUTO_INCREMENT 300",
+			},
 		},
 		{
 			name: "ignore AUTO_INCREMENT removal",
@@ -1931,6 +1979,10 @@ func TestCreateTableDiff(t *testing.T) {
 			autoinc: AutoIncrementApplyHigher,
 			diff:    "alter table t1 auto_increment 300",
 			cdiff:   "ALTER TABLE `t1` AUTO_INCREMENT 300",
+			textdiffs: []string{
+				"-) AUTO_INCREMENT 100",
+				"+) AUTO_INCREMENT 300",
+			},
 		},
 		{
 			name:    "ignore AUTO_INCREMENT decrease",
@@ -1945,6 +1997,10 @@ func TestCreateTableDiff(t *testing.T) {
 			autoinc: AutoIncrementApplyAlways,
 			diff:    "alter table t1 auto_increment 100",
 			cdiff:   "ALTER TABLE `t1` AUTO_INCREMENT 100",
+			textdiffs: []string{
+				"-) AUTO_INCREMENT 300",
+				"+) AUTO_INCREMENT 100",
+			},
 		},
 		{
 			name:  "apply table charset",
@@ -1952,6 +2008,9 @@ func TestCreateTableDiff(t *testing.T) {
 			to:    "create table t (id int, primary key(id)) DEFAULT CHARSET = utf8mb4",
 			diff:  "alter table t charset utf8mb4",
 			cdiff: "ALTER TABLE `t` CHARSET utf8mb4",
+			textdiffs: []string{
+				"+) CHARSET utf8mb4",
+			},
 		},
 		{
 			name:    "ignore empty table charset",
@@ -1978,6 +2037,10 @@ func TestCreateTableDiff(t *testing.T) {
 			charset: TableCharsetCollateIgnoreEmpty,
 			diff:    "alter table t collate utf8mb4_0900_ai_ci",
 			cdiff:   "ALTER TABLE `t` COLLATE utf8mb4_0900_ai_ci",
+			textdiffs: []string{
+				"-) COLLATE utf8mb4_0900_bin",
+				"+) COLLATE utf8mb4_0900_ai_ci",
+			},
 		},
 		{
 			name:    "ignore empty table charset and collate in target",
@@ -2003,6 +2066,10 @@ func TestCreateTableDiff(t *testing.T) {
 			to:    "create table t (id int, primary key(id)) DEFAULT CHARSET = utf8mb4",
 			diff:  "alter table t charset utf8mb4",
 			cdiff: "ALTER TABLE `t` CHARSET utf8mb4",
+			textdiffs: []string{
+				"-) CHARSET utf8",
+				"+) CHARSET utf8mb4",
+			},
 		},
 		{
 			name:  `change table charset and columns`,
@@ -2010,6 +2077,16 @@ func TestCreateTableDiff(t *testing.T) {
 			to:    "create table t (id int primary key, t1 varchar(128) not null, t2 varchar(128) not null, t3 tinytext, t4 tinytext charset latin1) default charset=utf8mb4",
 			diff:  "alter table t modify column t1 varchar(128) not null, modify column t2 varchar(128) not null, modify column t3 tinytext, charset utf8mb4",
 			cdiff: "ALTER TABLE `t` MODIFY COLUMN `t1` varchar(128) NOT NULL, MODIFY COLUMN `t2` varchar(128) NOT NULL, MODIFY COLUMN `t3` tinytext, CHARSET utf8mb4",
+			textdiffs: []string{
+				"-	`t1` varchar(128),",
+				"-	`t2` varchar(128) NOT NULL,",
+				"-	`t3` tinytext CHARACTER SET latin1,",
+				"+	`t1` varchar(128) NOT NULL",
+				"+	`t2` varchar(128) NOT NULL",
+				"+	`t3` tinytext",
+				"-) CHARSET utf8",
+				"+) CHARSET utf8mb4",
+			},
 		},
 		{
 			name:  "change table collation",
@@ -2017,6 +2094,10 @@ func TestCreateTableDiff(t *testing.T) {
 			to:    "create table t (id int, primary key(id)) DEFAULT CHARSET = utf8mb4 COLLATE utf8mb4_0900_bin",
 			diff:  "alter table t collate utf8mb4_0900_bin",
 			cdiff: "ALTER TABLE `t` COLLATE utf8mb4_0900_bin",
+			textdiffs: []string{
+				"-  COLLATE utf8mb4_0900_ai_ci",
+				"+  COLLATE utf8mb4_0900_bin",
+			},
 		},
 		{
 			name:  "change table collation with textual column",
@@ -2024,6 +2105,12 @@ func TestCreateTableDiff(t *testing.T) {
 			to:    "create table t (id int, t varchar(192) not null) DEFAULT CHARSET = utf8mb4 COLLATE utf8mb4_0900_bin",
 			diff:  "alter table t modify column t varchar(192) not null, collate utf8mb4_0900_bin",
 			cdiff: "ALTER TABLE `t` MODIFY COLUMN `t` varchar(192) NOT NULL, COLLATE utf8mb4_0900_bin",
+			textdiffs: []string{
+				"-	`t` varchar(192) NOT NULL",
+				"+	`t` varchar(192) NOT NULL",
+				"-  COLLATE utf8mb4_0900_ai_ci",
+				"+  COLLATE utf8mb4_0900_bin",
+			},
 		},
 		{
 			name:  "change table collation with textual column that has collation",
@@ -2031,6 +2118,10 @@ func TestCreateTableDiff(t *testing.T) {
 			to:    "create table t (id int, t varchar(192) not null collate utf8mb4_0900_bin) DEFAULT CHARSET = utf8mb4 COLLATE utf8mb4_0900_bin",
 			diff:  "alter table t collate utf8mb4_0900_bin",
 			cdiff: "ALTER TABLE `t` COLLATE utf8mb4_0900_bin",
+			textdiffs: []string{
+				"-  COLLATE utf8mb4_0900_ai_ci",
+				"+  COLLATE utf8mb4_0900_bin",
+			},
 		},
 		{
 			name: "ignore identical implicit charset",
@@ -2073,6 +2164,10 @@ func TestCreateTableDiff(t *testing.T) {
 			to:    "create table t1 (id int unsigned primary key)",
 			diff:  "alter table t1 modify column id int unsigned",
 			cdiff: "ALTER TABLE `t1` MODIFY COLUMN `id` int unsigned",
+			textdiffs: []string{
+				"-	`id` int,",
+				"+	`id` int unsigned,",
+			},
 		},
 		{
 			name:  "normalized ENGINE InnoDB value",
@@ -2111,6 +2206,9 @@ func TestCreateTableDiff(t *testing.T) {
 			to:    "create table t1 (id int primary key) engine=memory, character set=utf8",
 			diff:  "alter table t1 engine MEMORY",
 			cdiff: "ALTER TABLE `t1` ENGINE MEMORY",
+			textdiffs: []string{
+				"+) ENGINE MEMORY",
+			},
 		},
 		{
 			name:  "normalized CHARSET value",
@@ -2118,6 +2216,9 @@ func TestCreateTableDiff(t *testing.T) {
 			to:    "create table t1 (id int primary key) engine=innodb, character set=UTF8MB4",
 			diff:  "alter table t1 charset utf8mb4",
 			cdiff: "ALTER TABLE `t1` CHARSET utf8mb4",
+			textdiffs: []string{
+				"+  CHARSET utf8mb4",
+			},
 		},
 		{
 			name:  "normalized CHARSET utf8 value",
@@ -2125,6 +2226,9 @@ func TestCreateTableDiff(t *testing.T) {
 			to:    "create table t1 (id int primary key) engine=innodb, character set=UTF8",
 			diff:  "alter table t1 charset utf8mb3",
 			cdiff: "ALTER TABLE `t1` CHARSET utf8mb3",
+			textdiffs: []string{
+				"+  CHARSET utf8mb3",
+			},
 		},
 		{
 			name:  "normalized COLLATE value",
@@ -2132,6 +2236,9 @@ func TestCreateTableDiff(t *testing.T) {
 			to:    "create table t1 (id int primary key) engine=innodb, collate=UTF8_BIN",
 			diff:  "alter table t1 collate utf8mb3_bin",
 			cdiff: "ALTER TABLE `t1` COLLATE utf8mb3_bin",
+			textdiffs: []string{
+				"+  COLLATE utf8mb3_bin",
+			},
 		},
 		{
 			name:  "remove table comment",
@@ -2160,6 +2267,9 @@ func TestCreateTableDiff(t *testing.T) {
 				)`,
 			diff:  "alter table t4 add key index_on_company_id ((cast(json_unquote(json_extract(properties, _utf8mb4 '$.company_id')) as signed)))",
 			cdiff: "ALTER TABLE `t4` ADD KEY `index_on_company_id` ((CAST(JSON_UNQUOTE(JSON_EXTRACT(`properties`, _utf8mb4 '$.company_id')) AS signed)))",
+			textdiffs: []string{
+				"+	KEY `index_on_company_id` ((CAST(JSON_UNQUOTE(JSON_EXTRACT(`properties`, _utf8mb4 '$.company_id')) AS signed)))",
+			},
 		},
 		{
 			// validates that CanonicalString prints 'interval 30 minute' and not ' INTERVAL 30 MINUTE', as MySQL's `SHOW CREATE TABLE` outputs lower case 'interval 30 minute'
@@ -2175,6 +2285,9 @@ func TestCreateTableDiff(t *testing.T) {
 				)`,
 			diff:  "alter table t4 add column created_at datetime(6) not null default (now() + interval 30 minute)",
 			cdiff: "ALTER TABLE `t4` ADD COLUMN `created_at` datetime(6) NOT NULL DEFAULT (now() + INTERVAL 30 minute)",
+			textdiffs: []string{
+				"+	`created_at` datetime(6) NOT NULL DEFAULT (now() + INTERVAL 30 minute)",
+			},
 		},
 		// algorithm
 		{
@@ -2184,6 +2297,9 @@ func TestCreateTableDiff(t *testing.T) {
 			diff:      "alter table t1 add column i int not null default 0, algorithm = COPY",
 			cdiff:     "ALTER TABLE `t1` ADD COLUMN `i` int NOT NULL DEFAULT 0, ALGORITHM = COPY",
 			algorithm: AlterTableAlgorithmStrategyCopy,
+			textdiffs: []string{
+				"+	`i` int NOT NULL DEFAULT 0",
+			},
 		},
 		{
 			name:      "algorithm: INPLACE",
@@ -2192,6 +2308,9 @@ func TestCreateTableDiff(t *testing.T) {
 			diff:      "alter table t1 add column i int not null default 0, algorithm = INPLACE",
 			cdiff:     "ALTER TABLE `t1` ADD COLUMN `i` int NOT NULL DEFAULT 0, ALGORITHM = INPLACE",
 			algorithm: AlterTableAlgorithmStrategyInplace,
+			textdiffs: []string{
+				"+	`i` int NOT NULL DEFAULT 0",
+			},
 		},
 		{
 			name:      "algorithm: INSTANT",
@@ -2200,6 +2319,9 @@ func TestCreateTableDiff(t *testing.T) {
 			diff:      "alter table t1 add column i int not null default 0, algorithm = INSTANT",
 			cdiff:     "ALTER TABLE `t1` ADD COLUMN `i` int NOT NULL DEFAULT 0, ALGORITHM = INSTANT",
 			algorithm: AlterTableAlgorithmStrategyInstant,
+			textdiffs: []string{
+				"+	`i` int NOT NULL DEFAULT 0",
+			},
 		},
 	}
 	standardHints := DiffHints{}
@@ -2362,18 +2484,16 @@ func TestCreateTableDiff(t *testing.T) {
 							assert.NotEqual(t, eToStatementString, annotatedToString)
 						}
 					}
-					if len(ts.textdiffs) > 0 { // Still incomplete.
-						// For this test, we should validate the given diffs
-						uniqueDiffs := make(map[string]bool)
-						for _, textdiff := range ts.textdiffs {
-							uniqueDiffs[textdiff] = true
-						}
-						require.Equal(t, len(uniqueDiffs), len(ts.textdiffs)) // integrity of test
-						for _, textdiff := range ts.textdiffs {
-							assert.Containsf(t, annotatedUnifiedString, textdiff, annotatedUnifiedString)
-						}
-						assert.Equalf(t, len(annotatedUnified.Removed())+len(annotatedUnified.Added()), len(ts.textdiffs), annotatedUnifiedString)
+					require.NotEmpty(t, ts.textdiffs)
+					uniqueDiffs := make(map[string]bool)
+					for _, textdiff := range ts.textdiffs {
+						uniqueDiffs[textdiff] = true
+					}
+					require.Equal(t, len(uniqueDiffs), len(ts.textdiffs)) // integrity of test
+					for _, textdiff := range ts.textdiffs {
+						assert.Containsf(t, annotatedUnifiedString, textdiff, "unified: %s\nfrom: %s\nto: %s\nstmt: %s", annotatedUnifiedString, annotatedFromString, annotatedToString, alterEntityDiff.CanonicalStatementString())
 					}
+					assert.Equalf(t, len(annotatedUnified.Removed())+len(annotatedUnified.Added()), len(ts.textdiffs), annotatedUnifiedString)
 				}
 			}
 			{

From b50894f4a526bc8756de9b096123b20ff55b0f8d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9s=20Taylor?= <andres@planetscale.com>
Date: Thu, 6 Feb 2025 10:33:21 +0100
Subject: [PATCH 32/68] Faster dependency copying (#17708)

Signed-off-by: Andres Taylor <andres@planetscale.com>
---
 go/vt/vtgate/semantics/semantic_table.go | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/go/vt/vtgate/semantics/semantic_table.go b/go/vt/vtgate/semantics/semantic_table.go
index 6a88046e2a2..efe574501c1 100644
--- a/go/vt/vtgate/semantics/semantic_table.go
+++ b/go/vt/vtgate/semantics/semantic_table.go
@@ -190,13 +190,15 @@ var ErrNotSingleTable = vterrors.VT13001("should only be used for single tables"
 
 // CopyDependencies copies the dependencies from one expression into the other
 func (st *SemTable) CopyDependencies(from, to sqlparser.Expr) {
-	if ValidAsMapKey(to) {
-		st.Recursive[to] = st.RecursiveDeps(from)
-		st.Direct[to] = st.DirectDeps(from)
-		if ValidAsMapKey(from) {
-			if typ, found := st.ExprTypes[from]; found {
-				st.ExprTypes[to] = typ
-			}
+	if ValidAsMapKey(to) && ValidAsMapKey(from) {
+		if ts, ok := st.Recursive[from]; ok {
+			st.Recursive[to] = ts
+		}
+		if ts, ok := st.Direct[from]; ok {
+			st.Direct[to] = ts
+		}
+		if typ, found := st.ExprTypes[from]; found {
+			st.ExprTypes[to] = typ
 		}
 	}
 }

From 1c56ca1435ce0da01b065cc606d8d2ab98291217 Mon Sep 17 00:00:00 2001
From: Shlomi Noach <2607934+shlomi-noach@users.noreply.github.com>
Date: Thu, 6 Feb 2025 12:28:20 +0200
Subject: [PATCH 33/68] Multi-metrics throttler: post v21 deprecations and
 changes (#16915)

Signed-off-by: Shlomi Noach <2607934+shlomi-noach@users.noreply.github.com>
---
 go/cmd/vtctldclient/command/throttler.go      |   4 -
 .../onlineddl/revert/onlineddl_revert_test.go |   4 +-
 .../throttler_topo/throttler_test.go          |  37 +--
 go/test/endtoend/throttler/util.go            |  16 +-
 go/test/endtoend/vreplication/helper_test.go  |  25 +-
 .../tabletmanagerdata/tabletmanagerdata.pb.go | 252 ++++++++----------
 .../tabletmanagerdata_vtproto.pb.go           | 118 --------
 go/vt/vtctl/grpcvtctldserver/server.go        |  10 -
 go/vt/vtctl/vtctl.go                          |  21 +-
 go/vt/vttablet/grpctmclient/client_test.go    |   4 +-
 go/vt/vttablet/tabletmanager/rpc_throttler.go |  11 +-
 go/vt/vttablet/tabletserver/tabletserver.go   |  19 +-
 .../tabletserver/throttle/base/recent_app.go  |   4 +-
 go/vt/vttablet/tabletserver/throttle/check.go |  27 +-
 .../tabletserver/throttle/check_result.go     |  49 +---
 .../throttle/check_result_test.go             |  76 ------
 .../vttablet/tabletserver/throttle/client.go  |   3 +-
 .../tabletserver/throttle/throttler.go        |  15 +-
 .../tabletserver/throttle/throttler_test.go   | 175 +-----------
 proto/tabletmanagerdata.proto                 |  14 +-
 web/vtadmin/src/proto/vtadmin.d.ts            |  24 --
 web/vtadmin/src/proto/vtadmin.js              |  92 -------
 22 files changed, 196 insertions(+), 804 deletions(-)

diff --git a/go/cmd/vtctldclient/command/throttler.go b/go/cmd/vtctldclient/command/throttler.go
index da8b0763b0d..200d5f87f0b 100644
--- a/go/cmd/vtctldclient/command/throttler.go
+++ b/go/cmd/vtctldclient/command/throttler.go
@@ -169,10 +169,6 @@ func init() {
 	UpdateThrottlerConfig.Flags().StringVar(&updateThrottlerConfigOptions.MetricName, "metric-name", "", "name of the metric for which we apply a new threshold (requires --threshold). If empty, the default (either 'lag' or 'custom') metric is used.")
 	UpdateThrottlerConfig.Flags().Float64Var(&updateThrottlerConfigOptions.Threshold, "threshold", 0, "threshold for the either default check (replication lag seconds) or custom check")
 	UpdateThrottlerConfig.Flags().StringVar(&updateThrottlerConfigOptions.CustomQuery, "custom-query", "", "custom throttler check query")
-	UpdateThrottlerConfig.Flags().BoolVar(&updateThrottlerConfigOptions.CheckAsCheckSelf, "check-as-check-self", false, "/throttler/check requests behave as is /throttler/check-self was called")
-	UpdateThrottlerConfig.Flags().BoolVar(&updateThrottlerConfigOptions.CheckAsCheckShard, "check-as-check-shard", false, "use standard behavior for /throttler/check requests")
-	UpdateThrottlerConfig.Flags().MarkDeprecated("check-as-check-self", "specify metric with scope in --app-metrics to apply to all checks, or use --scope in CheckThrottler for a specific check")
-	UpdateThrottlerConfig.Flags().MarkDeprecated("check-as-check-shard", "specify metric with scope in --app-metrics to apply to all checks, or use --scope in CheckThrottler for a specific check")
 
 	UpdateThrottlerConfig.Flags().StringVar(&unthrottledAppRule.Name, "unthrottle-app", "", "an app name to unthrottle")
 	UpdateThrottlerConfig.Flags().StringVar(&throttledAppRule.Name, "throttle-app", "", "an app name to throttle")
diff --git a/go/test/endtoend/onlineddl/revert/onlineddl_revert_test.go b/go/test/endtoend/onlineddl/revert/onlineddl_revert_test.go
index e052762cd13..41acd0dea4e 100644
--- a/go/test/endtoend/onlineddl/revert/onlineddl_revert_test.go
+++ b/go/test/endtoend/onlineddl/revert/onlineddl_revert_test.go
@@ -21,7 +21,6 @@ import (
 	"flag"
 	"fmt"
 	"math/rand/v2"
-	"net/http"
 	"os"
 	"path"
 	"strings"
@@ -33,6 +32,7 @@ import (
 	"vitess.io/vitess/go/mysql"
 	"vitess.io/vitess/go/mysql/capabilities"
 	"vitess.io/vitess/go/vt/log"
+	tabletmanagerdatapb "vitess.io/vitess/go/vt/proto/tabletmanagerdata"
 	"vitess.io/vitess/go/vt/schema"
 	"vitess.io/vitess/go/vt/vttablet/tabletserver/throttle/throttlerapp"
 
@@ -207,7 +207,7 @@ func TestRevertSchemaChanges(t *testing.T) {
 	require.Equal(t, 1, len(shards))
 
 	throttler.EnableLagThrottlerAndWaitForStatus(t, clusterInstance)
-	throttler.WaitForCheckThrottlerResult(t, clusterInstance, primaryTablet, throttlerapp.TestingName, nil, http.StatusOK, time.Minute)
+	throttler.WaitForCheckThrottlerResult(t, clusterInstance, primaryTablet, throttlerapp.TestingName, nil, tabletmanagerdatapb.CheckThrottlerResponseCode_OK, time.Minute)
 
 	t.Run("revertible", testRevertible)
 	t.Run("revert", testRevert)
diff --git a/go/test/endtoend/tabletmanager/throttler_topo/throttler_test.go b/go/test/endtoend/tabletmanager/throttler_topo/throttler_test.go
index 48b341bf449..3b8111121fe 100644
--- a/go/test/endtoend/tabletmanager/throttler_topo/throttler_test.go
+++ b/go/test/endtoend/tabletmanager/throttler_topo/throttler_test.go
@@ -178,7 +178,6 @@ func vitessThrottleCheck(tablet *cluster.Vttablet, skipRequestHeartbeats bool) (
 	flags := &throttle.CheckFlags{
 		Scope:                 base.ShardScope,
 		SkipRequestHeartbeats: skipRequestHeartbeats,
-		MultiMetricsEnabled:   true,
 	}
 	resp, err := throttler.CheckThrottler(clusterInstance, tablet, throttlerapp.VitessName, flags)
 	return resp, err
@@ -188,7 +187,6 @@ func throttleCheck(tablet *cluster.Vttablet, skipRequestHeartbeats bool) (*vtctl
 	flags := &throttle.CheckFlags{
 		Scope:                 base.ShardScope,
 		SkipRequestHeartbeats: skipRequestHeartbeats,
-		MultiMetricsEnabled:   true,
 	}
 	resp, err := throttler.CheckThrottler(clusterInstance, tablet, testAppName, flags)
 	return resp, err
@@ -196,8 +194,7 @@ func throttleCheck(tablet *cluster.Vttablet, skipRequestHeartbeats bool) (*vtctl
 
 func throttleCheckSelf(tablet *cluster.Vttablet) (*vtctldatapb.CheckThrottlerResponse, error) {
 	flags := &throttle.CheckFlags{
-		Scope:               base.SelfScope,
-		MultiMetricsEnabled: true,
+		Scope: base.SelfScope,
 	}
 	resp, err := throttler.CheckThrottler(clusterInstance, tablet, testAppName, flags)
 	return resp, err
@@ -220,7 +217,7 @@ func warmUpHeartbeat(t *testing.T) tabletmanagerdatapb.CheckThrottlerResponseCod
 	require.NoError(t, err)
 
 	time.Sleep(time.Second)
-	return throttle.ResponseCodeFromStatus(resp.Check.ResponseCode, int(resp.Check.StatusCode))
+	return resp.Check.ResponseCode
 }
 
 // waitForThrottleCheckStatus waits for the tablet to return the provided HTTP code in a throttle check
@@ -242,7 +239,7 @@ func waitForThrottleCheckStatus(t *testing.T, tablet *cluster.Vttablet, wantCode
 		}
 		select {
 		case <-ctx.Done():
-			return resp.Check, false
+			return resp.Check, assert.EqualValues(t, wantCode, resp.Check.ResponseCode, "response: %+v", resp)
 		case <-ticker.C:
 		}
 	}
@@ -376,13 +373,6 @@ func TestInitialThrottler(t *testing.T) {
 			assert.Equal(t, base.ShardScope.String(), metrics.Scope)
 		}
 
-		if !assert.EqualValues(t, http.StatusOK, resp.Check.StatusCode, "Unexpected response from throttler: %+v", resp) {
-			rs, err := replicaTablet.VttabletProcess.QueryTablet("show replica status", keyspaceName, false)
-			assert.NoError(t, err)
-			t.Logf("Seconds_Behind_Source: %s", rs.Named().Row()["Seconds_Behind_Source"].ToString())
-			t.Logf("throttler primary status: %+v", throttleStatus(t, primaryTablet))
-			t.Logf("throttler replica status: %+v", throttleStatus(t, replicaTablet))
-		}
 		if !assert.EqualValues(t, tabletmanagerdatapb.CheckThrottlerResponseCode_OK, resp.Check.ResponseCode, "Unexpected response from throttler: %+v", resp) {
 			rs, err := replicaTablet.VttabletProcess.QueryTablet("show replica status", keyspaceName, false)
 			assert.NoError(t, err)
@@ -401,13 +391,6 @@ func TestInitialThrottler(t *testing.T) {
 		for _, metrics := range resp.Check.Metrics {
 			assert.Equal(t, base.ShardScope.String(), metrics.Scope)
 		}
-		if !assert.EqualValues(t, http.StatusOK, resp.Check.StatusCode, "Unexpected response from throttler: %+v", resp) {
-			rs, err := replicaTablet.VttabletProcess.QueryTablet("show replica status", keyspaceName, false)
-			assert.NoError(t, err)
-			t.Logf("Seconds_Behind_Source: %s", rs.Named().Row()["Seconds_Behind_Source"].ToString())
-			t.Logf("throttler primary status: %+v", throttleStatus(t, primaryTablet))
-			t.Logf("throttler replica status: %+v", throttleStatus(t, replicaTablet))
-		}
 		if !assert.EqualValues(t, tabletmanagerdatapb.CheckThrottlerResponseCode_OK, resp.Check.ResponseCode, "Unexpected response from throttler: %+v", resp) {
 			rs, err := replicaTablet.VttabletProcess.QueryTablet("show replica status", keyspaceName, false)
 			assert.NoError(t, err)
@@ -481,13 +464,11 @@ func TestThrottlerAfterMetricsCollected(t *testing.T) {
 	t.Run("validating primary check self", func(t *testing.T) {
 		resp, err := throttleCheckSelf(primaryTablet)
 		require.NoError(t, err)
-		assert.EqualValues(t, http.StatusOK, resp.Check.StatusCode, "Unexpected response from throttler: %+v", resp)
 		assert.EqualValues(t, tabletmanagerdatapb.CheckThrottlerResponseCode_OK, resp.Check.ResponseCode, "Unexpected response from throttler: %+v", resp)
 	})
 	t.Run("validating replica check self", func(t *testing.T) {
 		resp, err := throttleCheckSelf(replicaTablet)
 		require.NoError(t, err)
-		assert.EqualValues(t, http.StatusOK, resp.Check.StatusCode, "Unexpected response from throttler: %+v", resp)
 		assert.EqualValues(t, tabletmanagerdatapb.CheckThrottlerResponseCode_OK, resp.Check.ResponseCode, "Unexpected response from throttler: %+v", resp)
 	})
 }
@@ -514,7 +495,6 @@ func TestLag(t *testing.T) {
 	t.Run("expecting throttler push back", func(t *testing.T) {
 		resp, err := throttleCheck(primaryTablet, false)
 		require.NoError(t, err)
-		assert.EqualValues(t, http.StatusTooManyRequests, resp.Check.StatusCode, "Unexpected response from throttler: %+v", resp)
 		assert.EqualValues(t, tabletmanagerdatapb.CheckThrottlerResponseCode_THRESHOLD_EXCEEDED, resp.Check.ResponseCode, "Unexpected response from throttler: %+v", resp)
 	})
 	t.Run("primary self-check should still be fine", func(t *testing.T) {
@@ -525,10 +505,6 @@ func TestLag(t *testing.T) {
 			assert.Equal(t, base.SelfScope.String(), metrics.Scope)
 		}
 		// self (on primary) is unaffected by replication lag
-		if !assert.EqualValues(t, http.StatusOK, resp.Check.StatusCode, "Unexpected response from throttler: %+v", resp) {
-			t.Logf("throttler primary status: %+v", throttleStatus(t, primaryTablet))
-			t.Logf("throttler replica status: %+v", throttleStatus(t, replicaTablet))
-		}
 		if !assert.EqualValues(t, tabletmanagerdatapb.CheckThrottlerResponseCode_OK, resp.Check.ResponseCode, "Unexpected response from throttler: %+v", resp) {
 			t.Logf("throttler primary status: %+v", throttleStatus(t, primaryTablet))
 			t.Logf("throttler replica status: %+v", throttleStatus(t, replicaTablet))
@@ -541,7 +517,6 @@ func TestLag(t *testing.T) {
 		for _, metrics := range resp.Check.Metrics {
 			assert.Equal(t, base.SelfScope.String(), metrics.Scope)
 		}
-		assert.EqualValues(t, http.StatusTooManyRequests, resp.Check.StatusCode, "Unexpected response from throttler: %+v", resp)
 		assert.EqualValues(t, tabletmanagerdatapb.CheckThrottlerResponseCode_THRESHOLD_EXCEEDED, resp.Check.ResponseCode, "Unexpected response from throttler: %+v", resp)
 	})
 	t.Run("exempting test app", func(t *testing.T) {
@@ -619,13 +594,11 @@ func TestLag(t *testing.T) {
 		resp, err := throttleCheckSelf(primaryTablet)
 		require.NoError(t, err)
 		// self (on primary) is unaffected by replication lag
-		assert.EqualValues(t, http.StatusOK, resp.Check.StatusCode, "Unexpected response from throttler: %+v", resp)
 		assert.EqualValues(t, tabletmanagerdatapb.CheckThrottlerResponseCode_OK, resp.Check.ResponseCode, "Unexpected response from throttler: %+v", resp)
 	})
 	t.Run("replica self-check should be fine", func(t *testing.T) {
 		resp, err := throttleCheckSelf(replicaTablet)
 		require.NoError(t, err)
-		assert.EqualValues(t, http.StatusOK, resp.Check.StatusCode, "Unexpected response from throttler: %+v", resp)
 		assert.EqualValues(t, tabletmanagerdatapb.CheckThrottlerResponseCode_OK, resp.Check.ResponseCode, "Unexpected response from throttler: %+v", resp)
 	})
 }
@@ -668,7 +641,6 @@ func TestCustomQuery(t *testing.T) {
 		throttler.WaitForValidData(t, primaryTablet, throttlerEnabledTimeout)
 		resp, err := throttleCheck(primaryTablet, false)
 		require.NoError(t, err)
-		assert.EqualValues(t, http.StatusOK, resp.Check.StatusCode, "Unexpected response from throttler: %+v", resp)
 		assert.EqualValues(t, tabletmanagerdatapb.CheckThrottlerResponseCode_OK, resp.Check.ResponseCode, "Unexpected response from throttler: %+v", resp)
 	})
 	t.Run("test threads running", func(t *testing.T) {
@@ -695,7 +667,6 @@ func TestCustomQuery(t *testing.T) {
 			{
 				resp, err := throttleCheckSelf(primaryTablet)
 				require.NoError(t, err)
-				assert.EqualValues(t, http.StatusTooManyRequests, resp.Check.StatusCode, "Unexpected response from throttler: %+v", resp)
 				assert.EqualValues(t, tabletmanagerdatapb.CheckThrottlerResponseCode_THRESHOLD_EXCEEDED, resp.Check.ResponseCode, "Unexpected response from throttler: %+v", resp)
 			}
 		})
@@ -707,7 +678,6 @@ func TestCustomQuery(t *testing.T) {
 			{
 				resp, err := throttleCheckSelf(primaryTablet)
 				require.NoError(t, err)
-				assert.EqualValues(t, http.StatusOK, resp.Check.StatusCode, "Unexpected response from throttler: %+v", resp)
 				assert.EqualValues(t, tabletmanagerdatapb.CheckThrottlerResponseCode_OK, resp.Check.ResponseCode, "Unexpected response from throttler: %+v", resp)
 			}
 		})
@@ -730,7 +700,6 @@ func TestRestoreDefaultQuery(t *testing.T) {
 	t.Run("validating OK response from throttler with default threshold, heartbeats running", func(t *testing.T) {
 		resp, err := throttleCheck(primaryTablet, false)
 		require.NoError(t, err)
-		assert.EqualValues(t, http.StatusOK, resp.Check.StatusCode, "Unexpected response from throttler: %+v", resp)
 		assert.EqualValues(t, tabletmanagerdatapb.CheckThrottlerResponseCode_OK, resp.Check.ResponseCode, "Unexpected response from throttler: %+v", resp)
 	})
 	t.Run("validating pushback response from throttler on default threshold once heartbeats go stale", func(t *testing.T) {
diff --git a/go/test/endtoend/throttler/util.go b/go/test/endtoend/throttler/util.go
index 162388c83e0..588efb090cc 100644
--- a/go/test/endtoend/throttler/util.go
+++ b/go/test/endtoend/throttler/util.go
@@ -66,8 +66,7 @@ func CheckThrottlerRaw(vtctldProcess *cluster.VtctldClientProcess, tablet *clust
 	args = append(args, "CheckThrottler")
 	if flags == nil {
 		flags = &throttle.CheckFlags{
-			Scope:               base.SelfScope,
-			MultiMetricsEnabled: true,
+			Scope: base.SelfScope,
 		}
 	}
 	if appName != "" {
@@ -124,11 +123,6 @@ func UpdateThrottlerTopoConfigRaw(
 		args = append(args, "--threshold", fmt.Sprintf("%f", opts.Threshold))
 	}
 	args = append(args, "--custom-query", opts.CustomQuery)
-	if opts.CustomQuery != "" {
-		args = append(args, "--check-as-check-self")
-	} else {
-		args = append(args, "--check-as-check-shard")
-	}
 	if appRule != nil {
 		args = append(args, "--throttle-app", appRule.Name)
 		args = append(args, "--throttle-app-duration", time.Until(protoutil.TimeFromProto(appRule.ExpiresAt).UTC()).String())
@@ -485,7 +479,7 @@ func EnableLagThrottlerAndWaitForStatus(t *testing.T, clusterInstance *cluster.L
 	}
 }
 
-func WaitForCheckThrottlerResult(t *testing.T, clusterInstance *cluster.LocalProcessCluster, tablet *cluster.Vttablet, appName throttlerapp.Name, flags *throttle.CheckFlags, expect int32, timeout time.Duration) (*vtctldatapb.CheckThrottlerResponse, error) {
+func WaitForCheckThrottlerResult(t *testing.T, clusterInstance *cluster.LocalProcessCluster, tablet *cluster.Vttablet, appName throttlerapp.Name, flags *throttle.CheckFlags, expect tabletmanagerdatapb.CheckThrottlerResponseCode, timeout time.Duration) (*vtctldatapb.CheckThrottlerResponse, error) {
 	ctx, cancel := context.WithTimeout(context.Background(), timeout)
 	defer cancel()
 	ticker := time.NewTicker(time.Second)
@@ -493,7 +487,7 @@ func WaitForCheckThrottlerResult(t *testing.T, clusterInstance *cluster.LocalPro
 	for {
 		resp, err := CheckThrottler(clusterInstance, tablet, appName, flags)
 		require.NoError(t, err)
-		if resp.Check.StatusCode == expect {
+		if resp.Check.ResponseCode == expect {
 			return resp, nil
 		}
 		select {
@@ -534,11 +528,11 @@ func WaitForValidData(t *testing.T, tablet *cluster.Vttablet, timeout time.Durat
 
 	for {
 		checkResp, checkErr := http.Get(checkURL)
-		if checkErr != nil {
+		if checkErr == nil {
 			defer checkResp.Body.Close()
 		}
 		selfCheckResp, selfCheckErr := http.Get(selfCheckURL)
-		if selfCheckErr != nil {
+		if selfCheckErr == nil {
 			defer selfCheckResp.Body.Close()
 		}
 		if checkErr == nil && selfCheckErr == nil &&
diff --git a/go/test/endtoend/vreplication/helper_test.go b/go/test/endtoend/vreplication/helper_test.go
index 6bfce05119a..b3c55becc4a 100644
--- a/go/test/endtoend/vreplication/helper_test.go
+++ b/go/test/endtoend/vreplication/helper_test.go
@@ -55,6 +55,7 @@ import (
 	"vitess.io/vitess/go/vt/vttablet/tabletserver/throttle/throttlerapp"
 
 	binlogdatapb "vitess.io/vitess/go/vt/proto/binlogdata"
+	tabletmanagerdatapb "vitess.io/vitess/go/vt/proto/tabletmanagerdata"
 	topodatapb "vitess.io/vitess/go/vt/proto/topodata"
 )
 
@@ -178,16 +179,32 @@ func waitForQueryResult(t *testing.T, conn *mysql.Conn, database string, query s
 
 // waitForTabletThrottlingStatus waits for the tablet to return the provided HTTP code for
 // the provided app name in its self check.
-func waitForTabletThrottlingStatus(t *testing.T, tablet *cluster.VttabletProcess, throttlerApp throttlerapp.Name, wantCode int64) {
-	var gotCode int64
+func waitForTabletThrottlingStatus(t *testing.T, tablet *cluster.VttabletProcess, throttlerApp throttlerapp.Name, wantCode int) {
 	timer := time.NewTimer(defaultTimeout)
 	defer timer.Stop()
 	for {
 		output, err := throttlerCheckSelf(tablet, throttlerApp)
 		require.NoError(t, err)
 
-		gotCode, err = jsonparser.GetInt([]byte(output), "StatusCode")
-		require.NoError(t, err)
+		responseCode, err := jsonparser.GetInt([]byte(output), "ResponseCode")
+		require.NoError(t, err, "waitForTabletThrottlingStatus output: %v", output)
+
+		var gotCode int
+		switch tabletmanagerdatapb.CheckThrottlerResponseCode(responseCode) {
+		case tabletmanagerdatapb.CheckThrottlerResponseCode_OK:
+			gotCode = http.StatusOK
+		case tabletmanagerdatapb.CheckThrottlerResponseCode_APP_DENIED:
+			gotCode = http.StatusExpectationFailed
+		case tabletmanagerdatapb.CheckThrottlerResponseCode_THRESHOLD_EXCEEDED:
+			gotCode = http.StatusTooManyRequests
+		case tabletmanagerdatapb.CheckThrottlerResponseCode_UNKNOWN_METRIC:
+			gotCode = http.StatusNotFound
+		case tabletmanagerdatapb.CheckThrottlerResponseCode_INTERNAL_ERROR:
+			gotCode = http.StatusInternalServerError
+		default:
+			gotCode = http.StatusInternalServerError
+		}
+
 		if wantCode == gotCode {
 			// Wait for any cached check values to be cleared and the new
 			// status value to be in effect everywhere before returning.
diff --git a/go/vt/proto/tabletmanagerdata/tabletmanagerdata.pb.go b/go/vt/proto/tabletmanagerdata/tabletmanagerdata.pb.go
index 93690d02140..33ba53dcbb8 100644
--- a/go/vt/proto/tabletmanagerdata/tabletmanagerdata.pb.go
+++ b/go/vt/proto/tabletmanagerdata/tabletmanagerdata.pb.go
@@ -7114,11 +7114,8 @@ type CheckThrottlerRequest struct {
 	SkipRequestHeartbeats bool `protobuf:"varint,3,opt,name=skip_request_heartbeats,json=skipRequestHeartbeats,proto3" json:"skip_request_heartbeats,omitempty"`
 	// OKIfNotExists asks the throttler to return OK even if the metric does not exist
 	OkIfNotExists bool `protobuf:"varint,4,opt,name=ok_if_not_exists,json=okIfNotExists,proto3" json:"ok_if_not_exists,omitempty"`
-	// MultiMetricsEnabled is always set to "true" and is how a multi-metrics enabled replica
-	// throttler knows its being probed by a multi-metrics enabled primary vttablet.
-	MultiMetricsEnabled bool `protobuf:"varint,5,opt,name=multi_metrics_enabled,json=multiMetricsEnabled,proto3" json:"multi_metrics_enabled,omitempty"`
-	unknownFields       protoimpl.UnknownFields
-	sizeCache           protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *CheckThrottlerRequest) Reset() {
@@ -7179,17 +7176,8 @@ func (x *CheckThrottlerRequest) GetOkIfNotExists() bool {
 	return false
 }
 
-func (x *CheckThrottlerRequest) GetMultiMetricsEnabled() bool {
-	if x != nil {
-		return x.MultiMetricsEnabled
-	}
-	return false
-}
-
 type CheckThrottlerResponse struct {
 	state protoimpl.MessageState `protogen:"open.v1"`
-	// StatusCode is HTTP compliant response code (e.g. 200 for OK)
-	StatusCode int32 `protobuf:"varint,1,opt,name=status_code,json=statusCode,proto3" json:"status_code,omitempty"`
 	// Value is the metric value collected by the tablet
 	Value float64 `protobuf:"fixed64,2,opt,name=value,proto3" json:"value,omitempty"`
 	// Threshold is the throttling threshold the table was comparing the value with
@@ -7244,13 +7232,6 @@ func (*CheckThrottlerResponse) Descriptor() ([]byte, []int) {
 	return file_tabletmanagerdata_proto_rawDescGZIP(), []int{140}
 }
 
-func (x *CheckThrottlerResponse) GetStatusCode() int32 {
-	if x != nil {
-		return x.StatusCode
-	}
-	return 0
-}
-
 func (x *CheckThrottlerResponse) GetValue() float64 {
 	if x != nil {
 		return x.Value
@@ -7796,8 +7777,6 @@ type CheckThrottlerResponse_Metric struct {
 	state protoimpl.MessageState `protogen:"open.v1"`
 	// Name of the metric
 	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
-	// StatusCode is HTTP compliant response code (e.g. 200 for OK)
-	StatusCode int32 `protobuf:"varint,2,opt,name=status_code,json=statusCode,proto3" json:"status_code,omitempty"`
 	// Value is the metric value collected by the tablet
 	Value float64 `protobuf:"fixed64,3,opt,name=value,proto3" json:"value,omitempty"`
 	// Threshold is the throttling threshold the table was comparing the value with
@@ -7851,13 +7830,6 @@ func (x *CheckThrottlerResponse_Metric) GetName() string {
 	return ""
 }
 
-func (x *CheckThrottlerResponse_Metric) GetStatusCode() int32 {
-	if x != nil {
-		return x.StatusCode
-	}
-	return 0
-}
-
 func (x *CheckThrottlerResponse_Metric) GetValue() float64 {
 	if x != nil {
 		return x.Value
@@ -8005,9 +7977,8 @@ func (x *GetThrottlerStatusResponse_MetricHealth) GetSecondsSinceLastHealthy() i
 }
 
 type GetThrottlerStatusResponse_RecentApp struct {
-	state      protoimpl.MessageState `protogen:"open.v1"`
-	CheckedAt  *vttime.Time           `protobuf:"bytes,1,opt,name=checked_at,json=checkedAt,proto3" json:"checked_at,omitempty"`
-	StatusCode int32                  `protobuf:"varint,2,opt,name=status_code,json=statusCode,proto3" json:"status_code,omitempty"`
+	state     protoimpl.MessageState `protogen:"open.v1"`
+	CheckedAt *vttime.Time           `protobuf:"bytes,1,opt,name=checked_at,json=checkedAt,proto3" json:"checked_at,omitempty"`
 	// ResponseCode is the enum representation of the response
 	ResponseCode  CheckThrottlerResponseCode `protobuf:"varint,3,opt,name=response_code,json=responseCode,proto3,enum=tabletmanagerdata.CheckThrottlerResponseCode" json:"response_code,omitempty"`
 	unknownFields protoimpl.UnknownFields
@@ -8051,13 +8022,6 @@ func (x *GetThrottlerStatusResponse_RecentApp) GetCheckedAt() *vttime.Time {
 	return nil
 }
 
-func (x *GetThrottlerStatusResponse_RecentApp) GetStatusCode() int32 {
-	if x != nil {
-		return x.StatusCode
-	}
-	return 0
-}
-
 func (x *GetThrottlerStatusResponse_RecentApp) GetResponseCode() CheckThrottlerResponseCode {
 	if x != nil {
 		return x.ResponseCode
@@ -9018,7 +8982,7 @@ var file_tabletmanagerdata_proto_rawDesc = string([]byte{
 	0x0a, 0x06, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x09, 0x52, 0x06,
 	0x74, 0x61, 0x62, 0x6c, 0x65, 0x73, 0x22, 0x18, 0x0a, 0x16, 0x52, 0x65, 0x73, 0x65, 0x74, 0x53,
 	0x65, 0x71, 0x75, 0x65, 0x6e, 0x63, 0x65, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65,
-	0x22, 0xdd, 0x01, 0x0a, 0x15, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x54, 0x68, 0x72, 0x6f, 0x74, 0x74,
+	0x22, 0xc6, 0x01, 0x0a, 0x15, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x54, 0x68, 0x72, 0x6f, 0x74, 0x74,
 	0x6c, 0x65, 0x72, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x19, 0x0a, 0x08, 0x61, 0x70,
 	0x70, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x61, 0x70,
 	0x70, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x63, 0x6f, 0x70, 0x65, 0x18, 0x02,
@@ -9028,63 +8992,59 @@ var file_tabletmanagerdata_proto_rawDesc = string([]byte{
 	0x69, 0x70, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x48, 0x65, 0x61, 0x72, 0x74, 0x62, 0x65,
 	0x61, 0x74, 0x73, 0x12, 0x27, 0x0a, 0x10, 0x6f, 0x6b, 0x5f, 0x69, 0x66, 0x5f, 0x6e, 0x6f, 0x74,
 	0x5f, 0x65, 0x78, 0x69, 0x73, 0x74, 0x73, 0x18, 0x04, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0d, 0x6f,
-	0x6b, 0x49, 0x66, 0x4e, 0x6f, 0x74, 0x45, 0x78, 0x69, 0x73, 0x74, 0x73, 0x12, 0x32, 0x0a, 0x15,
-	0x6d, 0x75, 0x6c, 0x74, 0x69, 0x5f, 0x6d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x73, 0x5f, 0x65, 0x6e,
-	0x61, 0x62, 0x6c, 0x65, 0x64, 0x18, 0x05, 0x20, 0x01, 0x28, 0x08, 0x52, 0x13, 0x6d, 0x75, 0x6c,
-	0x74, 0x69, 0x4d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x73, 0x45, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x64,
-	0x22, 0x9f, 0x06, 0x0a, 0x16, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x54, 0x68, 0x72, 0x6f, 0x74, 0x74,
-	0x6c, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x1f, 0x0a, 0x0b, 0x73,
-	0x74, 0x61, 0x74, 0x75, 0x73, 0x5f, 0x63, 0x6f, 0x64, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05,
-	0x52, 0x0a, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x43, 0x6f, 0x64, 0x65, 0x12, 0x14, 0x0a, 0x05,
-	0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x01, 0x52, 0x05, 0x76, 0x61, 0x6c,
-	0x75, 0x65, 0x12, 0x1c, 0x0a, 0x09, 0x74, 0x68, 0x72, 0x65, 0x73, 0x68, 0x6f, 0x6c, 0x64, 0x18,
-	0x03, 0x20, 0x01, 0x28, 0x01, 0x52, 0x09, 0x74, 0x68, 0x72, 0x65, 0x73, 0x68, 0x6f, 0x6c, 0x64,
-	0x12, 0x14, 0x0a, 0x05, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52,
-	0x05, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x12, 0x18, 0x0a, 0x07, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67,
-	0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65,
-	0x12, 0x29, 0x0a, 0x10, 0x72, 0x65, 0x63, 0x65, 0x6e, 0x74, 0x6c, 0x79, 0x5f, 0x63, 0x68, 0x65,
-	0x63, 0x6b, 0x65, 0x64, 0x18, 0x06, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0f, 0x72, 0x65, 0x63, 0x65,
-	0x6e, 0x74, 0x6c, 0x79, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x65, 0x64, 0x12, 0x50, 0x0a, 0x07, 0x6d,
-	0x65, 0x74, 0x72, 0x69, 0x63, 0x73, 0x18, 0x07, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x36, 0x2e, 0x74,
-	0x61, 0x62, 0x6c, 0x65, 0x74, 0x6d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x72, 0x64, 0x61, 0x74, 0x61,
-	0x2e, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x54, 0x68, 0x72, 0x6f, 0x74, 0x74, 0x6c, 0x65, 0x72, 0x52,
-	0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x2e, 0x4d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x73, 0x45,
-	0x6e, 0x74, 0x72, 0x79, 0x52, 0x07, 0x6d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x73, 0x12, 0x19, 0x0a,
-	0x08, 0x61, 0x70, 0x70, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x08, 0x20, 0x01, 0x28, 0x09, 0x52,
-	0x07, 0x61, 0x70, 0x70, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x73, 0x75, 0x6d, 0x6d,
-	0x61, 0x72, 0x79, 0x18, 0x09, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x73, 0x75, 0x6d, 0x6d, 0x61,
-	0x72, 0x79, 0x12, 0x52, 0x0a, 0x0d, 0x72, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x5f, 0x63,
-	0x6f, 0x64, 0x65, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x2d, 0x2e, 0x74, 0x61, 0x62, 0x6c,
-	0x65, 0x74, 0x6d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x72, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x43, 0x68,
+	0x6b, 0x49, 0x66, 0x4e, 0x6f, 0x74, 0x45, 0x78, 0x69, 0x73, 0x74, 0x73, 0x4a, 0x04, 0x08, 0x05,
+	0x10, 0x06, 0x52, 0x15, 0x6d, 0x75, 0x6c, 0x74, 0x69, 0x5f, 0x6d, 0x65, 0x74, 0x72, 0x69, 0x63,
+	0x73, 0x5f, 0x65, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x64, 0x22, 0xf6, 0x05, 0x0a, 0x16, 0x43, 0x68,
 	0x65, 0x63, 0x6b, 0x54, 0x68, 0x72, 0x6f, 0x74, 0x74, 0x6c, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70,
-	0x6f, 0x6e, 0x73, 0x65, 0x43, 0x6f, 0x64, 0x65, 0x52, 0x0c, 0x72, 0x65, 0x73, 0x70, 0x6f, 0x6e,
-	0x73, 0x65, 0x43, 0x6f, 0x64, 0x65, 0x1a, 0x8b, 0x02, 0x0a, 0x06, 0x4d, 0x65, 0x74, 0x72, 0x69,
-	0x63, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52,
-	0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x1f, 0x0a, 0x0b, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x5f,
-	0x63, 0x6f, 0x64, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x73, 0x74, 0x61, 0x74,
-	0x75, 0x73, 0x43, 0x6f, 0x64, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18,
-	0x03, 0x20, 0x01, 0x28, 0x01, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x12, 0x1c, 0x0a, 0x09,
-	0x74, 0x68, 0x72, 0x65, 0x73, 0x68, 0x6f, 0x6c, 0x64, 0x18, 0x04, 0x20, 0x01, 0x28, 0x01, 0x52,
-	0x09, 0x74, 0x68, 0x72, 0x65, 0x73, 0x68, 0x6f, 0x6c, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x65, 0x72,
-	0x72, 0x6f, 0x72, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x65, 0x72, 0x72, 0x6f, 0x72,
-	0x12, 0x18, 0x0a, 0x07, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28,
-	0x09, 0x52, 0x07, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x63,
-	0x6f, 0x70, 0x65, 0x18, 0x07, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x73, 0x63, 0x6f, 0x70, 0x65,
-	0x12, 0x52, 0x0a, 0x0d, 0x72, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x5f, 0x63, 0x6f, 0x64,
-	0x65, 0x18, 0x08, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x2d, 0x2e, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x74,
-	0x6d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x72, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x43, 0x68, 0x65, 0x63,
-	0x6b, 0x54, 0x68, 0x72, 0x6f, 0x74, 0x74, 0x6c, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e,
-	0x73, 0x65, 0x43, 0x6f, 0x64, 0x65, 0x52, 0x0c, 0x72, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65,
-	0x43, 0x6f, 0x64, 0x65, 0x1a, 0x6c, 0x0a, 0x0c, 0x4d, 0x65, 0x74, 0x72, 0x69, 0x63, 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, 0x46, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18,
-	0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x30, 0x2e, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x6d, 0x61,
-	0x6e, 0x61, 0x67, 0x65, 0x72, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x54,
-	0x68, 0x72, 0x6f, 0x74, 0x74, 0x6c, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65,
-	0x2e, 0x4d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02,
-	0x38, 0x01, 0x22, 0x1b, 0x0a, 0x19, 0x47, 0x65, 0x74, 0x54, 0x68, 0x72, 0x6f, 0x74, 0x74, 0x6c,
+	0x6f, 0x6e, 0x73, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20,
+	0x01, 0x28, 0x01, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x12, 0x1c, 0x0a, 0x09, 0x74, 0x68,
+	0x72, 0x65, 0x73, 0x68, 0x6f, 0x6c, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x01, 0x52, 0x09, 0x74,
+	0x68, 0x72, 0x65, 0x73, 0x68, 0x6f, 0x6c, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x65, 0x72, 0x72, 0x6f,
+	0x72, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x12, 0x18,
+	0x0a, 0x07, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52,
+	0x07, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x12, 0x29, 0x0a, 0x10, 0x72, 0x65, 0x63, 0x65,
+	0x6e, 0x74, 0x6c, 0x79, 0x5f, 0x63, 0x68, 0x65, 0x63, 0x6b, 0x65, 0x64, 0x18, 0x06, 0x20, 0x01,
+	0x28, 0x08, 0x52, 0x0f, 0x72, 0x65, 0x63, 0x65, 0x6e, 0x74, 0x6c, 0x79, 0x43, 0x68, 0x65, 0x63,
+	0x6b, 0x65, 0x64, 0x12, 0x50, 0x0a, 0x07, 0x6d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x73, 0x18, 0x07,
+	0x20, 0x03, 0x28, 0x0b, 0x32, 0x36, 0x2e, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x6d, 0x61, 0x6e,
+	0x61, 0x67, 0x65, 0x72, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x54, 0x68,
+	0x72, 0x6f, 0x74, 0x74, 0x6c, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x2e,
+	0x4d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x07, 0x6d, 0x65,
+	0x74, 0x72, 0x69, 0x63, 0x73, 0x12, 0x19, 0x0a, 0x08, 0x61, 0x70, 0x70, 0x5f, 0x6e, 0x61, 0x6d,
+	0x65, 0x18, 0x08, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x61, 0x70, 0x70, 0x4e, 0x61, 0x6d, 0x65,
+	0x12, 0x18, 0x0a, 0x07, 0x73, 0x75, 0x6d, 0x6d, 0x61, 0x72, 0x79, 0x18, 0x09, 0x20, 0x01, 0x28,
+	0x09, 0x52, 0x07, 0x73, 0x75, 0x6d, 0x6d, 0x61, 0x72, 0x79, 0x12, 0x52, 0x0a, 0x0d, 0x72, 0x65,
+	0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x5f, 0x63, 0x6f, 0x64, 0x65, 0x18, 0x0a, 0x20, 0x01, 0x28,
+	0x0e, 0x32, 0x2d, 0x2e, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x6d, 0x61, 0x6e, 0x61, 0x67, 0x65,
+	0x72, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x54, 0x68, 0x72, 0x6f, 0x74,
+	0x74, 0x6c, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x43, 0x6f, 0x64, 0x65,
+	0x52, 0x0c, 0x72, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x43, 0x6f, 0x64, 0x65, 0x1a, 0xf0,
+	0x01, 0x0a, 0x06, 0x4d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d,
+	0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x14, 0x0a,
+	0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x01, 0x52, 0x05, 0x76, 0x61,
+	0x6c, 0x75, 0x65, 0x12, 0x1c, 0x0a, 0x09, 0x74, 0x68, 0x72, 0x65, 0x73, 0x68, 0x6f, 0x6c, 0x64,
+	0x18, 0x04, 0x20, 0x01, 0x28, 0x01, 0x52, 0x09, 0x74, 0x68, 0x72, 0x65, 0x73, 0x68, 0x6f, 0x6c,
+	0x64, 0x12, 0x14, 0x0a, 0x05, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09,
+	0x52, 0x05, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x12, 0x18, 0x0a, 0x07, 0x6d, 0x65, 0x73, 0x73, 0x61,
+	0x67, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67,
+	0x65, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x63, 0x6f, 0x70, 0x65, 0x18, 0x07, 0x20, 0x01, 0x28, 0x09,
+	0x52, 0x05, 0x73, 0x63, 0x6f, 0x70, 0x65, 0x12, 0x52, 0x0a, 0x0d, 0x72, 0x65, 0x73, 0x70, 0x6f,
+	0x6e, 0x73, 0x65, 0x5f, 0x63, 0x6f, 0x64, 0x65, 0x18, 0x08, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x2d,
+	0x2e, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x6d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x72, 0x64, 0x61,
+	0x74, 0x61, 0x2e, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x54, 0x68, 0x72, 0x6f, 0x74, 0x74, 0x6c, 0x65,
+	0x72, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x43, 0x6f, 0x64, 0x65, 0x52, 0x0c, 0x72,
+	0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x43, 0x6f, 0x64, 0x65, 0x4a, 0x04, 0x08, 0x02, 0x10,
+	0x03, 0x1a, 0x6c, 0x0a, 0x0c, 0x4d, 0x65, 0x74, 0x72, 0x69, 0x63, 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, 0x46, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01,
+	0x28, 0x0b, 0x32, 0x30, 0x2e, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x6d, 0x61, 0x6e, 0x61, 0x67,
+	0x65, 0x72, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x54, 0x68, 0x72, 0x6f,
+	0x74, 0x74, 0x6c, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x2e, 0x4d, 0x65,
+	0x74, 0x72, 0x69, 0x63, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x4a,
+	0x04, 0x08, 0x01, 0x10, 0x02, 0x52, 0x0b, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x5f, 0x63, 0x6f,
+	0x64, 0x65, 0x22, 0x1b, 0x0a, 0x19, 0x47, 0x65, 0x74, 0x54, 0x68, 0x72, 0x6f, 0x74, 0x74, 0x6c,
 	0x65, 0x72, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x22,
-	0xb6, 0x10, 0x0a, 0x1a, 0x47, 0x65, 0x74, 0x54, 0x68, 0x72, 0x6f, 0x74, 0x74, 0x6c, 0x65, 0x72,
+	0x9b, 0x10, 0x0a, 0x1a, 0x47, 0x65, 0x74, 0x54, 0x68, 0x72, 0x6f, 0x74, 0x74, 0x6c, 0x65, 0x72,
 	0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x21,
 	0x0a, 0x0c, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x5f, 0x61, 0x6c, 0x69, 0x61, 0x73, 0x18, 0x01,
 	0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x41, 0x6c, 0x69, 0x61,
@@ -9197,61 +9157,59 @@ var file_tabletmanagerdata_proto_rawDesc = string([]byte{
 	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,
-	0x1a, 0xad, 0x01, 0x0a, 0x09, 0x52, 0x65, 0x63, 0x65, 0x6e, 0x74, 0x41, 0x70, 0x70, 0x12, 0x2b,
+	0x1a, 0x92, 0x01, 0x0a, 0x09, 0x52, 0x65, 0x63, 0x65, 0x6e, 0x74, 0x41, 0x70, 0x70, 0x12, 0x2b,
 	0x0a, 0x0a, 0x63, 0x68, 0x65, 0x63, 0x6b, 0x65, 0x64, 0x5f, 0x61, 0x74, 0x18, 0x01, 0x20, 0x01,
 	0x28, 0x0b, 0x32, 0x0c, 0x2e, 0x76, 0x74, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x54, 0x69, 0x6d, 0x65,
-	0x52, 0x09, 0x63, 0x68, 0x65, 0x63, 0x6b, 0x65, 0x64, 0x41, 0x74, 0x12, 0x1f, 0x0a, 0x0b, 0x73,
-	0x74, 0x61, 0x74, 0x75, 0x73, 0x5f, 0x63, 0x6f, 0x64, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05,
-	0x52, 0x0a, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x43, 0x6f, 0x64, 0x65, 0x12, 0x52, 0x0a, 0x0d,
-	0x72, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x5f, 0x63, 0x6f, 0x64, 0x65, 0x18, 0x03, 0x20,
-	0x01, 0x28, 0x0e, 0x32, 0x2d, 0x2e, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x6d, 0x61, 0x6e, 0x61,
-	0x67, 0x65, 0x72, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x54, 0x68, 0x72,
-	0x6f, 0x74, 0x74, 0x6c, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x43, 0x6f,
-	0x64, 0x65, 0x52, 0x0c, 0x72, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x43, 0x6f, 0x64, 0x65,
-	0x1a, 0x76, 0x0a, 0x0f, 0x52, 0x65, 0x63, 0x65, 0x6e, 0x74, 0x41, 0x70, 0x70, 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, 0x4d, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02,
-	0x20, 0x01, 0x28, 0x0b, 0x32, 0x37, 0x2e, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x6d, 0x61, 0x6e,
-	0x61, 0x67, 0x65, 0x72, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x47, 0x65, 0x74, 0x54, 0x68, 0x72, 0x6f,
-	0x74, 0x74, 0x6c, 0x65, 0x72, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f,
-	0x6e, 0x73, 0x65, 0x2e, 0x52, 0x65, 0x63, 0x65, 0x6e, 0x74, 0x41, 0x70, 0x70, 0x52, 0x05, 0x76,
-	0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0xaa, 0x01, 0x0a, 0x11, 0x43, 0x68, 0x61,
-	0x6e, 0x67, 0x65, 0x54, 0x61, 0x67, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x42,
-	0x0a, 0x04, 0x74, 0x61, 0x67, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x2e, 0x2e, 0x74,
-	0x61, 0x62, 0x6c, 0x65, 0x74, 0x6d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x72, 0x64, 0x61, 0x74, 0x61,
-	0x2e, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x54, 0x61, 0x67, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65,
-	0x73, 0x74, 0x2e, 0x54, 0x61, 0x67, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x04, 0x74, 0x61,
-	0x67, 0x73, 0x12, 0x18, 0x0a, 0x07, 0x72, 0x65, 0x70, 0x6c, 0x61, 0x63, 0x65, 0x18, 0x02, 0x20,
-	0x01, 0x28, 0x08, 0x52, 0x07, 0x72, 0x65, 0x70, 0x6c, 0x61, 0x63, 0x65, 0x1a, 0x37, 0x0a, 0x09,
-	0x54, 0x61, 0x67, 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, 0x92, 0x01, 0x0a, 0x12, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65,
-	0x54, 0x61, 0x67, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x43, 0x0a, 0x04,
-	0x74, 0x61, 0x67, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x2f, 0x2e, 0x74, 0x61, 0x62,
-	0x6c, 0x65, 0x74, 0x6d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x72, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x43,
-	0x68, 0x61, 0x6e, 0x67, 0x65, 0x54, 0x61, 0x67, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73,
-	0x65, 0x2e, 0x54, 0x61, 0x67, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x04, 0x74, 0x61, 0x67,
-	0x73, 0x1a, 0x37, 0x0a, 0x09, 0x54, 0x61, 0x67, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10,
+	0x52, 0x09, 0x63, 0x68, 0x65, 0x63, 0x6b, 0x65, 0x64, 0x41, 0x74, 0x12, 0x52, 0x0a, 0x0d, 0x72,
+	0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x5f, 0x63, 0x6f, 0x64, 0x65, 0x18, 0x03, 0x20, 0x01,
+	0x28, 0x0e, 0x32, 0x2d, 0x2e, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x6d, 0x61, 0x6e, 0x61, 0x67,
+	0x65, 0x72, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x54, 0x68, 0x72, 0x6f,
+	0x74, 0x74, 0x6c, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x43, 0x6f, 0x64,
+	0x65, 0x52, 0x0c, 0x72, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x43, 0x6f, 0x64, 0x65, 0x4a,
+	0x04, 0x08, 0x02, 0x10, 0x03, 0x1a, 0x76, 0x0a, 0x0f, 0x52, 0x65, 0x63, 0x65, 0x6e, 0x74, 0x41,
+	0x70, 0x70, 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, 0x4d, 0x0a, 0x05, 0x76, 0x61,
+	0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x37, 0x2e, 0x74, 0x61, 0x62, 0x6c,
+	0x65, 0x74, 0x6d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x72, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x47, 0x65,
+	0x74, 0x54, 0x68, 0x72, 0x6f, 0x74, 0x74, 0x6c, 0x65, 0x72, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73,
+	0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x2e, 0x52, 0x65, 0x63, 0x65, 0x6e, 0x74, 0x41,
+	0x70, 0x70, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0xaa, 0x01,
+	0x0a, 0x11, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x54, 0x61, 0x67, 0x73, 0x52, 0x65, 0x71, 0x75,
+	0x65, 0x73, 0x74, 0x12, 0x42, 0x0a, 0x04, 0x74, 0x61, 0x67, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28,
+	0x0b, 0x32, 0x2e, 0x2e, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x6d, 0x61, 0x6e, 0x61, 0x67, 0x65,
+	0x72, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x54, 0x61, 0x67, 0x73,
+	0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x2e, 0x54, 0x61, 0x67, 0x73, 0x45, 0x6e, 0x74, 0x72,
+	0x79, 0x52, 0x04, 0x74, 0x61, 0x67, 0x73, 0x12, 0x18, 0x0a, 0x07, 0x72, 0x65, 0x70, 0x6c, 0x61,
+	0x63, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x07, 0x72, 0x65, 0x70, 0x6c, 0x61, 0x63,
+	0x65, 0x1a, 0x37, 0x0a, 0x09, 0x54, 0x61, 0x67, 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, 0x2a, 0x3e, 0x0a, 0x19, 0x54, 0x61,
-	0x62, 0x6c, 0x65, 0x74, 0x53, 0x65, 0x6c, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x50, 0x72, 0x65,
-	0x66, 0x65, 0x72, 0x65, 0x6e, 0x63, 0x65, 0x12, 0x07, 0x0a, 0x03, 0x41, 0x4e, 0x59, 0x10, 0x00,
-	0x12, 0x0b, 0x0a, 0x07, 0x49, 0x4e, 0x4f, 0x52, 0x44, 0x45, 0x52, 0x10, 0x01, 0x12, 0x0b, 0x0a,
-	0x07, 0x55, 0x4e, 0x4b, 0x4e, 0x4f, 0x57, 0x4e, 0x10, 0x03, 0x2a, 0x83, 0x01, 0x0a, 0x1a, 0x43,
-	0x68, 0x65, 0x63, 0x6b, 0x54, 0x68, 0x72, 0x6f, 0x74, 0x74, 0x6c, 0x65, 0x72, 0x52, 0x65, 0x73,
-	0x70, 0x6f, 0x6e, 0x73, 0x65, 0x43, 0x6f, 0x64, 0x65, 0x12, 0x0d, 0x0a, 0x09, 0x55, 0x4e, 0x44,
-	0x45, 0x46, 0x49, 0x4e, 0x45, 0x44, 0x10, 0x00, 0x12, 0x06, 0x0a, 0x02, 0x4f, 0x4b, 0x10, 0x01,
-	0x12, 0x16, 0x0a, 0x12, 0x54, 0x48, 0x52, 0x45, 0x53, 0x48, 0x4f, 0x4c, 0x44, 0x5f, 0x45, 0x58,
-	0x43, 0x45, 0x45, 0x44, 0x45, 0x44, 0x10, 0x02, 0x12, 0x0e, 0x0a, 0x0a, 0x41, 0x50, 0x50, 0x5f,
-	0x44, 0x45, 0x4e, 0x49, 0x45, 0x44, 0x10, 0x03, 0x12, 0x12, 0x0a, 0x0e, 0x55, 0x4e, 0x4b, 0x4e,
-	0x4f, 0x57, 0x4e, 0x5f, 0x4d, 0x45, 0x54, 0x52, 0x49, 0x43, 0x10, 0x04, 0x12, 0x12, 0x0a, 0x0e,
-	0x49, 0x4e, 0x54, 0x45, 0x52, 0x4e, 0x41, 0x4c, 0x5f, 0x45, 0x52, 0x52, 0x4f, 0x52, 0x10, 0x05,
-	0x42, 0x30, 0x5a, 0x2e, 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, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x6d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x72, 0x64, 0x61,
-	0x74, 0x61, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x92, 0x01, 0x0a, 0x12, 0x43,
+	0x68, 0x61, 0x6e, 0x67, 0x65, 0x54, 0x61, 0x67, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73,
+	0x65, 0x12, 0x43, 0x0a, 0x04, 0x74, 0x61, 0x67, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32,
+	0x2f, 0x2e, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x6d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x72, 0x64,
+	0x61, 0x74, 0x61, 0x2e, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x54, 0x61, 0x67, 0x73, 0x52, 0x65,
+	0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x2e, 0x54, 0x61, 0x67, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79,
+	0x52, 0x04, 0x74, 0x61, 0x67, 0x73, 0x1a, 0x37, 0x0a, 0x09, 0x54, 0x61, 0x67, 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, 0x2a,
+	0x3e, 0x0a, 0x19, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x53, 0x65, 0x6c, 0x65, 0x63, 0x74, 0x69,
+	0x6f, 0x6e, 0x50, 0x72, 0x65, 0x66, 0x65, 0x72, 0x65, 0x6e, 0x63, 0x65, 0x12, 0x07, 0x0a, 0x03,
+	0x41, 0x4e, 0x59, 0x10, 0x00, 0x12, 0x0b, 0x0a, 0x07, 0x49, 0x4e, 0x4f, 0x52, 0x44, 0x45, 0x52,
+	0x10, 0x01, 0x12, 0x0b, 0x0a, 0x07, 0x55, 0x4e, 0x4b, 0x4e, 0x4f, 0x57, 0x4e, 0x10, 0x03, 0x2a,
+	0x83, 0x01, 0x0a, 0x1a, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x54, 0x68, 0x72, 0x6f, 0x74, 0x74, 0x6c,
+	0x65, 0x72, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x43, 0x6f, 0x64, 0x65, 0x12, 0x0d,
+	0x0a, 0x09, 0x55, 0x4e, 0x44, 0x45, 0x46, 0x49, 0x4e, 0x45, 0x44, 0x10, 0x00, 0x12, 0x06, 0x0a,
+	0x02, 0x4f, 0x4b, 0x10, 0x01, 0x12, 0x16, 0x0a, 0x12, 0x54, 0x48, 0x52, 0x45, 0x53, 0x48, 0x4f,
+	0x4c, 0x44, 0x5f, 0x45, 0x58, 0x43, 0x45, 0x45, 0x44, 0x45, 0x44, 0x10, 0x02, 0x12, 0x0e, 0x0a,
+	0x0a, 0x41, 0x50, 0x50, 0x5f, 0x44, 0x45, 0x4e, 0x49, 0x45, 0x44, 0x10, 0x03, 0x12, 0x12, 0x0a,
+	0x0e, 0x55, 0x4e, 0x4b, 0x4e, 0x4f, 0x57, 0x4e, 0x5f, 0x4d, 0x45, 0x54, 0x52, 0x49, 0x43, 0x10,
+	0x04, 0x12, 0x12, 0x0a, 0x0e, 0x49, 0x4e, 0x54, 0x45, 0x52, 0x4e, 0x41, 0x4c, 0x5f, 0x45, 0x52,
+	0x52, 0x4f, 0x52, 0x10, 0x05, 0x42, 0x30, 0x5a, 0x2e, 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, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x6d, 0x61, 0x6e, 0x61,
+	0x67, 0x65, 0x72, 0x64, 0x61, 0x74, 0x61, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 })
 
 var (
diff --git a/go/vt/proto/tabletmanagerdata/tabletmanagerdata_vtproto.pb.go b/go/vt/proto/tabletmanagerdata/tabletmanagerdata_vtproto.pb.go
index dc7f132ec2e..8916da22868 100644
--- a/go/vt/proto/tabletmanagerdata/tabletmanagerdata_vtproto.pb.go
+++ b/go/vt/proto/tabletmanagerdata/tabletmanagerdata_vtproto.pb.go
@@ -2771,7 +2771,6 @@ func (m *CheckThrottlerRequest) CloneVT() *CheckThrottlerRequest {
 	r.Scope = m.Scope
 	r.SkipRequestHeartbeats = m.SkipRequestHeartbeats
 	r.OkIfNotExists = m.OkIfNotExists
-	r.MultiMetricsEnabled = m.MultiMetricsEnabled
 	if len(m.unknownFields) > 0 {
 		r.unknownFields = make([]byte, len(m.unknownFields))
 		copy(r.unknownFields, m.unknownFields)
@@ -2789,7 +2788,6 @@ func (m *CheckThrottlerResponse_Metric) CloneVT() *CheckThrottlerResponse_Metric
 	}
 	r := new(CheckThrottlerResponse_Metric)
 	r.Name = m.Name
-	r.StatusCode = m.StatusCode
 	r.Value = m.Value
 	r.Threshold = m.Threshold
 	r.Error = m.Error
@@ -2812,7 +2810,6 @@ func (m *CheckThrottlerResponse) CloneVT() *CheckThrottlerResponse {
 		return (*CheckThrottlerResponse)(nil)
 	}
 	r := new(CheckThrottlerResponse)
-	r.StatusCode = m.StatusCode
 	r.Value = m.Value
 	r.Threshold = m.Threshold
 	r.Error = m.Error
@@ -2897,7 +2894,6 @@ func (m *GetThrottlerStatusResponse_RecentApp) CloneVT() *GetThrottlerStatusResp
 	}
 	r := new(GetThrottlerStatusResponse_RecentApp)
 	r.CheckedAt = m.CheckedAt.CloneVT()
-	r.StatusCode = m.StatusCode
 	r.ResponseCode = m.ResponseCode
 	if len(m.unknownFields) > 0 {
 		r.unknownFields = make([]byte, len(m.unknownFields))
@@ -9821,16 +9817,6 @@ func (m *CheckThrottlerRequest) MarshalToSizedBufferVT(dAtA []byte) (int, error)
 		i -= len(m.unknownFields)
 		copy(dAtA[i:], m.unknownFields)
 	}
-	if m.MultiMetricsEnabled {
-		i--
-		if m.MultiMetricsEnabled {
-			dAtA[i] = 1
-		} else {
-			dAtA[i] = 0
-		}
-		i--
-		dAtA[i] = 0x28
-	}
 	if m.OkIfNotExists {
 		i--
 		if m.OkIfNotExists {
@@ -9936,11 +9922,6 @@ func (m *CheckThrottlerResponse_Metric) MarshalToSizedBufferVT(dAtA []byte) (int
 		i--
 		dAtA[i] = 0x19
 	}
-	if m.StatusCode != 0 {
-		i = protohelpers.EncodeVarint(dAtA, i, uint64(m.StatusCode))
-		i--
-		dAtA[i] = 0x10
-	}
 	if len(m.Name) > 0 {
 		i -= len(m.Name)
 		copy(dAtA[i:], m.Name)
@@ -10058,11 +10039,6 @@ func (m *CheckThrottlerResponse) MarshalToSizedBufferVT(dAtA []byte) (int, error
 		i--
 		dAtA[i] = 0x11
 	}
-	if m.StatusCode != 0 {
-		i = protohelpers.EncodeVarint(dAtA, i, uint64(m.StatusCode))
-		i--
-		dAtA[i] = 0x8
-	}
 	return len(dAtA) - i, nil
 }
 
@@ -10228,11 +10204,6 @@ func (m *GetThrottlerStatusResponse_RecentApp) MarshalToSizedBufferVT(dAtA []byt
 		i--
 		dAtA[i] = 0x18
 	}
-	if m.StatusCode != 0 {
-		i = protohelpers.EncodeVarint(dAtA, i, uint64(m.StatusCode))
-		i--
-		dAtA[i] = 0x10
-	}
 	if m.CheckedAt != nil {
 		size, err := m.CheckedAt.MarshalToSizedBufferVT(dAtA[:i])
 		if err != nil {
@@ -13050,9 +13021,6 @@ func (m *CheckThrottlerRequest) SizeVT() (n int) {
 	if m.OkIfNotExists {
 		n += 2
 	}
-	if m.MultiMetricsEnabled {
-		n += 2
-	}
 	n += len(m.unknownFields)
 	return n
 }
@@ -13067,9 +13035,6 @@ func (m *CheckThrottlerResponse_Metric) SizeVT() (n int) {
 	if l > 0 {
 		n += 1 + l + protohelpers.SizeOfVarint(uint64(l))
 	}
-	if m.StatusCode != 0 {
-		n += 1 + protohelpers.SizeOfVarint(uint64(m.StatusCode))
-	}
 	if m.Value != 0 {
 		n += 9
 	}
@@ -13101,9 +13066,6 @@ func (m *CheckThrottlerResponse) SizeVT() (n int) {
 	}
 	var l int
 	_ = l
-	if m.StatusCode != 0 {
-		n += 1 + protohelpers.SizeOfVarint(uint64(m.StatusCode))
-	}
 	if m.Value != 0 {
 		n += 9
 	}
@@ -13203,9 +13165,6 @@ func (m *GetThrottlerStatusResponse_RecentApp) SizeVT() (n int) {
 		l = m.CheckedAt.SizeVT()
 		n += 1 + l + protohelpers.SizeOfVarint(uint64(l))
 	}
-	if m.StatusCode != 0 {
-		n += 1 + protohelpers.SizeOfVarint(uint64(m.StatusCode))
-	}
 	if m.ResponseCode != 0 {
 		n += 1 + protohelpers.SizeOfVarint(uint64(m.ResponseCode))
 	}
@@ -28606,26 +28565,6 @@ func (m *CheckThrottlerRequest) UnmarshalVT(dAtA []byte) error {
 				}
 			}
 			m.OkIfNotExists = bool(v != 0)
-		case 5:
-			if wireType != 0 {
-				return fmt.Errorf("proto: wrong wireType = %d for field MultiMetricsEnabled", 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.MultiMetricsEnabled = bool(v != 0)
 		default:
 			iNdEx = preIndex
 			skippy, err := protohelpers.Skip(dAtA[iNdEx:])
@@ -28709,25 +28648,6 @@ func (m *CheckThrottlerResponse_Metric) UnmarshalVT(dAtA []byte) error {
 			}
 			m.Name = string(dAtA[iNdEx:postIndex])
 			iNdEx = postIndex
-		case 2:
-			if wireType != 0 {
-				return fmt.Errorf("proto: wrong wireType = %d for field StatusCode", wireType)
-			}
-			m.StatusCode = 0
-			for shift := uint(0); ; shift += 7 {
-				if shift >= 64 {
-					return protohelpers.ErrIntOverflow
-				}
-				if iNdEx >= l {
-					return io.ErrUnexpectedEOF
-				}
-				b := dAtA[iNdEx]
-				iNdEx++
-				m.StatusCode |= int32(b&0x7F) << shift
-				if b < 0x80 {
-					break
-				}
-			}
 		case 3:
 			if wireType != 1 {
 				return fmt.Errorf("proto: wrong wireType = %d for field Value", wireType)
@@ -28916,25 +28836,6 @@ func (m *CheckThrottlerResponse) UnmarshalVT(dAtA []byte) error {
 			return fmt.Errorf("proto: CheckThrottlerResponse: illegal tag %d (wire type %d)", fieldNum, wire)
 		}
 		switch fieldNum {
-		case 1:
-			if wireType != 0 {
-				return fmt.Errorf("proto: wrong wireType = %d for field StatusCode", wireType)
-			}
-			m.StatusCode = 0
-			for shift := uint(0); ; shift += 7 {
-				if shift >= 64 {
-					return protohelpers.ErrIntOverflow
-				}
-				if iNdEx >= l {
-					return io.ErrUnexpectedEOF
-				}
-				b := dAtA[iNdEx]
-				iNdEx++
-				m.StatusCode |= int32(b&0x7F) << shift
-				if b < 0x80 {
-					break
-				}
-			}
 		case 2:
 			if wireType != 1 {
 				return fmt.Errorf("proto: wrong wireType = %d for field Value", wireType)
@@ -29591,25 +29492,6 @@ func (m *GetThrottlerStatusResponse_RecentApp) UnmarshalVT(dAtA []byte) error {
 				return err
 			}
 			iNdEx = postIndex
-		case 2:
-			if wireType != 0 {
-				return fmt.Errorf("proto: wrong wireType = %d for field StatusCode", wireType)
-			}
-			m.StatusCode = 0
-			for shift := uint(0); ; shift += 7 {
-				if shift >= 64 {
-					return protohelpers.ErrIntOverflow
-				}
-				if iNdEx >= l {
-					return io.ErrUnexpectedEOF
-				}
-				b := dAtA[iNdEx]
-				iNdEx++
-				m.StatusCode |= int32(b&0x7F) << shift
-				if b < 0x80 {
-					break
-				}
-			}
 		case 3:
 			if wireType != 0 {
 				return fmt.Errorf("proto: wrong wireType = %d for field ResponseCode", wireType)
diff --git a/go/vt/vtctl/grpcvtctldserver/server.go b/go/vt/vtctl/grpcvtctldserver/server.go
index ec9fd80db89..2afb508e4a6 100644
--- a/go/vt/vtctl/grpcvtctldserver/server.go
+++ b/go/vt/vtctl/grpcvtctldserver/server.go
@@ -737,7 +737,6 @@ func (s *VtctldServer) CheckThrottler(ctx context.Context, req *vtctldatapb.Chec
 		Scope:                 req.Scope,
 		SkipRequestHeartbeats: req.SkipRequestHeartbeats,
 		OkIfNotExists:         req.OkIfNotExists,
-		MultiMetricsEnabled:   true,
 	}
 	r, err := s.tmc.CheckThrottler(ctx, ti.Tablet, tmReq)
 	if err != nil {
@@ -2058,9 +2057,6 @@ func (s *VtctldServer) UpdateThrottlerConfig(ctx context.Context, req *vtctldata
 	if req.Enable && req.Disable {
 		return nil, fmt.Errorf("--enable and --disable are mutually exclusive")
 	}
-	if req.CheckAsCheckSelf && req.CheckAsCheckShard {
-		return nil, fmt.Errorf("--check-as-check-self and --check-as-check-shard are mutually exclusive")
-	}
 
 	if req.MetricName != "" && !base.KnownMetricNames.Contains(base.MetricName(req.MetricName)) {
 		return nil, fmt.Errorf("unknown metric name: %s", req.MetricName)
@@ -2126,12 +2122,6 @@ func (s *VtctldServer) UpdateThrottlerConfig(ctx context.Context, req *vtctldata
 		if req.Disable {
 			throttlerConfig.Enabled = false
 		}
-		if req.CheckAsCheckSelf {
-			throttlerConfig.CheckAsCheckSelf = true
-		}
-		if req.CheckAsCheckShard {
-			throttlerConfig.CheckAsCheckSelf = false
-		}
 		if req.ThrottledApp != nil && req.ThrottledApp.Name != "" {
 			timeNow := time.Now()
 			if protoutil.TimeFromProto(req.ThrottledApp.ExpiresAt).After(timeNow) {
diff --git a/go/vt/vtctl/vtctl.go b/go/vt/vtctl/vtctl.go
index 975a8c98a5e..db419327799 100644
--- a/go/vt/vtctl/vtctl.go
+++ b/go/vt/vtctl/vtctl.go
@@ -708,7 +708,7 @@ var commands = []commandGroup{
 			{
 				name:   "UpdateThrottlerConfig",
 				method: commandUpdateThrottlerConfig,
-				params: "[--enable|--disable] [--threshold=<float64>] [--custom-query=<query>] [--check-as-check-self|--check-as-check-shard] [--throttle-app|unthrottle-app=<name>] [--throttle-app-ratio=<float, range [0..1]>] [--throttle-app-duration=<duration>] [--throttle-app-exempt] <keyspace>",
+				params: "[--enable|--disable] [--threshold=<float64>] [--custom-query=<query>] [--throttle-app|unthrottle-app=<name>] [--throttle-app-ratio=<float, range [0..1]>] [--throttle-app-duration=<duration>] [--throttle-app-exempt] <keyspace>",
 				help:   "Update the table throttler configuration for all cells and tablets of a given keyspace",
 			},
 			{
@@ -3598,8 +3598,6 @@ func commandUpdateThrottlerConfig(ctx context.Context, wr *wrangler.Wrangler, su
 	disable := subFlags.Bool("disable", false, "Disable the throttler")
 	threshold := subFlags.Float64("threshold", 0, "threshold for the either default check (replication lag seconds) or custom check")
 	customQuery := subFlags.String("custom-query", "", "custom throttler check query")
-	checkAsCheckSelf := subFlags.Bool("check-as-check-self", false, "/throttler/check requests behave as is /throttler/check-self was called")
-	checkAsCheckShard := subFlags.Bool("check-as-check-shard", false, "use standard behavior for /throttler/check requests")
 	unthrottledApp := subFlags.String("unthrottle-app", "", "an app name to unthrottle")
 	throttledApp := subFlags.String("throttle-app", "", "an app name to throttle")
 	throttledAppRatio := subFlags.Float64("throttle-app-ratio", throttle.DefaultThrottleRatio, "ratio to throttle app (app specififed in --throttled-app)")
@@ -3615,9 +3613,6 @@ func commandUpdateThrottlerConfig(ctx context.Context, wr *wrangler.Wrangler, su
 	if *enable && *disable {
 		return fmt.Errorf("--enable and --disable are mutually exclusive")
 	}
-	if *checkAsCheckSelf && *checkAsCheckShard {
-		return fmt.Errorf("--check-as-check-self and --check-as-check-shard are mutually exclusive")
-	}
 
 	if *throttledApp != "" && *unthrottledApp != "" {
 		return fmt.Errorf("--throttle-app and --unthrottle-app are mutually exclusive")
@@ -3635,14 +3630,12 @@ func commandUpdateThrottlerConfig(ctx context.Context, wr *wrangler.Wrangler, su
 	keyspace := subFlags.Arg(0)
 
 	req := &vtctldatapb.UpdateThrottlerConfigRequest{
-		Keyspace:          keyspace,
-		Enable:            *enable,
-		Disable:           *disable,
-		CustomQuery:       *customQuery,
-		CustomQuerySet:    customQuerySet,
-		Threshold:         *threshold,
-		CheckAsCheckSelf:  *checkAsCheckSelf,
-		CheckAsCheckShard: *checkAsCheckShard,
+		Keyspace:       keyspace,
+		Enable:         *enable,
+		Disable:        *disable,
+		CustomQuery:    *customQuery,
+		CustomQuerySet: customQuerySet,
+		Threshold:      *threshold,
 	}
 	if *throttledApp != "" {
 		req.ThrottledApp = &topodatapb.ThrottledAppRule{
diff --git a/go/vt/vttablet/grpctmclient/client_test.go b/go/vt/vttablet/grpctmclient/client_test.go
index 2a5ae3ff6d0..9c3638461ba 100644
--- a/go/vt/vttablet/grpctmclient/client_test.go
+++ b/go/vt/vttablet/grpctmclient/client_test.go
@@ -76,7 +76,7 @@ func TestDialDedicatedPool(t *testing.T) {
 		ctx, cancel := context.WithTimeout(ctx, time.Second)
 		defer cancel()
 
-		req := &tabletmanagerdatapb.CheckThrottlerRequest{MultiMetricsEnabled: true}
+		req := &tabletmanagerdatapb.CheckThrottlerRequest{}
 		_, err := client.CheckThrottler(ctx, tablet, req)
 		assert.Error(t, err)
 	})
@@ -141,7 +141,7 @@ func TestDialPool(t *testing.T) {
 		ctx, cancel := context.WithTimeout(ctx, time.Second)
 		defer cancel()
 
-		req := &tabletmanagerdatapb.CheckThrottlerRequest{MultiMetricsEnabled: true}
+		req := &tabletmanagerdatapb.CheckThrottlerRequest{}
 		_, err := client.CheckThrottler(ctx, tablet, req)
 		assert.Error(t, err)
 	})
diff --git a/go/vt/vttablet/tabletmanager/rpc_throttler.go b/go/vt/vttablet/tabletmanager/rpc_throttler.go
index 1617a5b275b..734ae0172ed 100644
--- a/go/vt/vttablet/tabletmanager/rpc_throttler.go
+++ b/go/vt/vttablet/tabletmanager/rpc_throttler.go
@@ -47,15 +47,13 @@ func (tm *TabletManager) CheckThrottler(ctx context.Context, req *tabletmanagerd
 		Scope:                 base.Scope(req.Scope),
 		SkipRequestHeartbeats: req.SkipRequestHeartbeats,
 		OKIfNotExists:         req.OkIfNotExists,
-		MultiMetricsEnabled:   req.MultiMetricsEnabled,
 	}
 	checkResult := tm.QueryServiceControl.CheckThrottler(ctx, req.AppName, flags)
 	if checkResult == nil {
 		return nil, vterrors.Errorf(vtrpc.Code_INTERNAL, "nil checkResult")
 	}
 	resp := &tabletmanagerdatapb.CheckThrottlerResponse{
-		ResponseCode:    throttle.ResponseCodeFromStatus(checkResult.ResponseCode, checkResult.StatusCode),
-		StatusCode:      int32(checkResult.StatusCode),
+		ResponseCode:    checkResult.ResponseCode,
 		Value:           checkResult.Value,
 		Threshold:       checkResult.Threshold,
 		Message:         checkResult.Message,
@@ -68,8 +66,7 @@ func (tm *TabletManager) CheckThrottler(ctx context.Context, req *tabletmanagerd
 		resp.Metrics[name] = &tabletmanagerdatapb.CheckThrottlerResponse_Metric{
 			Name:         name,
 			Scope:        metric.Scope,
-			StatusCode:   int32(metric.StatusCode),
-			ResponseCode: throttle.ResponseCodeFromStatus(metric.ResponseCode, metric.StatusCode),
+			ResponseCode: metric.ResponseCode,
 			Value:        metric.Value,
 			Threshold:    metric.Threshold,
 			Message:      metric.Message,
@@ -79,8 +76,7 @@ func (tm *TabletManager) CheckThrottler(ctx context.Context, req *tabletmanagerd
 		// For backwards compatibility, when the checked tablet is of lower version, it does not return a
 		// matrics map, but only the one metric.
 		resp.Metrics[base.DefaultMetricName.String()] = &tabletmanagerdatapb.CheckThrottlerResponse_Metric{
-			StatusCode:   int32(checkResult.StatusCode),
-			ResponseCode: throttle.ResponseCodeFromStatus(checkResult.ResponseCode, checkResult.StatusCode),
+			ResponseCode: checkResult.ResponseCode,
 			Value:        checkResult.Value,
 			Threshold:    checkResult.Threshold,
 			Message:      checkResult.Message,
@@ -145,7 +141,6 @@ func (tm *TabletManager) GetThrottlerStatus(ctx context.Context, req *tabletmana
 	for _, recentApp := range status.RecentApps {
 		resp.RecentApps[recentApp.AppName] = &tabletmanagerdatapb.GetThrottlerStatusResponse_RecentApp{
 			CheckedAt:    protoutil.TimeToProto(recentApp.CheckedAt),
-			StatusCode:   int32(recentApp.StatusCode),
 			ResponseCode: recentApp.ResponseCode,
 		}
 	}
diff --git a/go/vt/vttablet/tabletserver/tabletserver.go b/go/vt/vttablet/tabletserver/tabletserver.go
index 1120e09deef..e09e04a9679 100644
--- a/go/vt/vttablet/tabletserver/tabletserver.go
+++ b/go/vt/vttablet/tabletserver/tabletserver.go
@@ -1917,19 +1917,32 @@ func (tsv *TabletServer) registerThrottlerCheckHandlers() {
 			flags := &throttle.CheckFlags{
 				Scope:                 scope,
 				SkipRequestHeartbeats: (r.URL.Query().Get("s") == "true"),
-				MultiMetricsEnabled:   true,
 			}
 			metricNames := tsv.lagThrottler.MetricNames(r.URL.Query()["m"])
 			checkResult := tsv.lagThrottler.Check(ctx, appName, metricNames, flags)
 			if checkResult.ResponseCode == tabletmanagerdatapb.CheckThrottlerResponseCode_UNKNOWN_METRIC && flags.OKIfNotExists {
-				checkResult.StatusCode = http.StatusOK // 200
 				checkResult.ResponseCode = tabletmanagerdatapb.CheckThrottlerResponseCode_OK
 			}
 
 			if r.Method == http.MethodGet {
 				w.Header().Set("Content-Type", "application/json")
 			}
-			w.WriteHeader(checkResult.StatusCode)
+			var httpStatusCode int
+			switch checkResult.ResponseCode {
+			case tabletmanagerdatapb.CheckThrottlerResponseCode_OK:
+				httpStatusCode = http.StatusOK
+			case tabletmanagerdatapb.CheckThrottlerResponseCode_APP_DENIED:
+				httpStatusCode = http.StatusExpectationFailed
+			case tabletmanagerdatapb.CheckThrottlerResponseCode_THRESHOLD_EXCEEDED:
+				httpStatusCode = http.StatusTooManyRequests
+			case tabletmanagerdatapb.CheckThrottlerResponseCode_UNKNOWN_METRIC:
+				httpStatusCode = http.StatusNotFound
+			case tabletmanagerdatapb.CheckThrottlerResponseCode_INTERNAL_ERROR:
+				httpStatusCode = http.StatusInternalServerError
+			default:
+				httpStatusCode = http.StatusInternalServerError
+			}
+			w.WriteHeader(httpStatusCode)
 			if r.Method == http.MethodGet {
 				json.NewEncoder(w).Encode(checkResult)
 			}
diff --git a/go/vt/vttablet/tabletserver/throttle/base/recent_app.go b/go/vt/vttablet/tabletserver/throttle/base/recent_app.go
index 7ae2bf789af..b8756ffee5b 100644
--- a/go/vt/vttablet/tabletserver/throttle/base/recent_app.go
+++ b/go/vt/vttablet/tabletserver/throttle/base/recent_app.go
@@ -50,16 +50,14 @@ import (
 type RecentApp struct {
 	AppName      string
 	CheckedAt    time.Time
-	StatusCode   int
 	ResponseCode tabletmanagerdatapb.CheckThrottlerResponseCode
 }
 
 // NewRecentApp creates a RecentApp
-func NewRecentApp(appName string, statusCode int, responseCode tabletmanagerdatapb.CheckThrottlerResponseCode) *RecentApp {
+func NewRecentApp(appName string, responseCode tabletmanagerdatapb.CheckThrottlerResponseCode) *RecentApp {
 	result := &RecentApp{
 		AppName:      appName,
 		CheckedAt:    time.Now(),
-		StatusCode:   statusCode,
 		ResponseCode: responseCode,
 	}
 	return result
diff --git a/go/vt/vttablet/tabletserver/throttle/check.go b/go/vt/vttablet/tabletserver/throttle/check.go
index d7f43d85e9d..888daeb5801 100644
--- a/go/vt/vttablet/tabletserver/throttle/check.go
+++ b/go/vt/vttablet/tabletserver/throttle/check.go
@@ -44,7 +44,6 @@ package throttle
 import (
 	"context"
 	"fmt"
-	"net/http"
 	"time"
 
 	"vitess.io/vitess/go/stats"
@@ -71,13 +70,10 @@ type CheckFlags struct {
 	OverrideThreshold     float64
 	OKIfNotExists         bool
 	SkipRequestHeartbeats bool
-	MultiMetricsEnabled   bool
 }
 
 // selfCheckFlags have no special hints
-var selfCheckFlags = &CheckFlags{
-	MultiMetricsEnabled: true,
-}
+var selfCheckFlags = &CheckFlags{}
 
 // ThrottlerCheck provides methods for an app checking on metrics
 type ThrottlerCheck struct {
@@ -102,42 +98,34 @@ func (check *ThrottlerCheck) checkAppMetricResult(ctx context.Context, appName s
 	}
 	value, err := metricResult.Get()
 	if appName == "" {
-		return NewCheckResult(tabletmanagerdatapb.CheckThrottlerResponseCode_APP_DENIED, http.StatusExpectationFailed, value, threshold, "", fmt.Errorf("no app indicated"))
+		return NewCheckResult(tabletmanagerdatapb.CheckThrottlerResponseCode_APP_DENIED, value, threshold, "", fmt.Errorf("no app indicated"))
 	}
 
-	var statusCode int
 	var responseCode tabletmanagerdatapb.CheckThrottlerResponseCode
-
 	switch {
 	case err == base.ErrAppDenied:
 		// app specifically not allowed to get metrics
-		statusCode = http.StatusExpectationFailed // 417
 		responseCode = tabletmanagerdatapb.CheckThrottlerResponseCode_APP_DENIED
 	case err == base.ErrNoSuchMetric:
 		// not collected yet, or metric does not exist
-		statusCode = http.StatusNotFound // 404
 		responseCode = tabletmanagerdatapb.CheckThrottlerResponseCode_UNKNOWN_METRIC
 	case err != nil:
 		// any error
-		statusCode = http.StatusInternalServerError // 500
 		responseCode = tabletmanagerdatapb.CheckThrottlerResponseCode_INTERNAL_ERROR
 	case value > threshold:
 		// casual throttling
-		statusCode = http.StatusTooManyRequests // 429
 		responseCode = tabletmanagerdatapb.CheckThrottlerResponseCode_THRESHOLD_EXCEEDED
 		err = base.ErrThresholdExceeded
 	default:
 		// all good!
-		statusCode = http.StatusOK // 200
 		responseCode = tabletmanagerdatapb.CheckThrottlerResponseCode_OK
 	}
-	return NewCheckResult(responseCode, statusCode, value, threshold, matchedApp, err)
+	return NewCheckResult(responseCode, value, threshold, matchedApp, err)
 }
 
 // Check is the core function that runs when a user wants to check a metric
 func (check *ThrottlerCheck) Check(ctx context.Context, appName string, scope base.Scope, metricNames base.MetricNames, flags *CheckFlags) (checkResult *CheckResult) {
 	checkResult = &CheckResult{
-		StatusCode:   http.StatusOK,
 		ResponseCode: tabletmanagerdatapb.CheckThrottlerResponseCode_OK,
 		Metrics:      make(map[string]*MetricResult),
 	}
@@ -146,7 +134,6 @@ func (check *ThrottlerCheck) Check(ctx context.Context, appName string, scope ba
 	}
 	metricNames = metricNames.Unique()
 	applyMetricToCheckResult := func(metricName base.MetricName, metric *MetricResult) {
-		checkResult.StatusCode = metric.StatusCode
 		checkResult.ResponseCode = metric.ResponseCode
 		checkResult.Value = metric.Value
 		checkResult.Threshold = metric.Threshold
@@ -198,7 +185,6 @@ func (check *ThrottlerCheck) Check(ctx context.Context, appName string, scope ba
 			checkResult.RecentlyChecked = true
 		}
 		metric := &MetricResult{
-			StatusCode:   metricCheckResult.StatusCode,
 			ResponseCode: metricCheckResult.ResponseCode,
 			Value:        metricCheckResult.Value,
 			Threshold:    metricCheckResult.Threshold,
@@ -208,11 +194,8 @@ func (check *ThrottlerCheck) Check(ctx context.Context, appName string, scope ba
 			Scope:        metricScope.String(), // This reports back the actual scope used for the check
 		}
 		checkResult.Metrics[metricName.String()] = metric
-		if flags.MultiMetricsEnabled && !metricCheckResult.IsOK() && metricName != base.DefaultMetricName {
+		if !metricCheckResult.IsOK() && metricName != base.DefaultMetricName {
 			// If we're checking multiple metrics, and one of them fails, we should return any of the failing metric.
-			// For backwards compatibility, if flags.MultiMetricsEnabled is not set, we do not report back failing
-			// metrics, because a v20 primary would not know how to deal with it, and is not expecting any of those
-			// metrics.
 			// The only metric we ever report back is the default metric, see below.
 			applyMetricToCheckResult(metricName, metric)
 		}
@@ -233,7 +216,7 @@ func (check *ThrottlerCheck) Check(ctx context.Context, appName string, scope ba
 			statsThrottlerCheckAnyError.Add(1)
 		}
 	}(checkResult)
-	go check.throttler.markRecentApp(appName, checkResult.StatusCode, checkResult.ResponseCode)
+	go check.throttler.markRecentApp(appName, checkResult.ResponseCode)
 	return checkResult
 }
 
diff --git a/go/vt/vttablet/tabletserver/throttle/check_result.go b/go/vt/vttablet/tabletserver/throttle/check_result.go
index 34532b7ce37..b26bf87e3b3 100644
--- a/go/vt/vttablet/tabletserver/throttle/check_result.go
+++ b/go/vt/vttablet/tabletserver/throttle/check_result.go
@@ -43,38 +43,13 @@ package throttle
 
 import (
 	"fmt"
-	"net/http"
 
 	tabletmanagerdatapb "vitess.io/vitess/go/vt/proto/tabletmanagerdata"
 	"vitess.io/vitess/go/vt/vttablet/tabletserver/throttle/base"
 )
 
-// ResponseCodeFromStatus returns a ResponseCode based on either given response code or HTTP status code.
-// It is used to handle the transition period from v20 to v21 where v20 only returns HTTP status code.
-// In v22 and beyond, the HTTP status code will be removed, and so will this function.
-func ResponseCodeFromStatus(responseCode tabletmanagerdatapb.CheckThrottlerResponseCode, statusCode int) tabletmanagerdatapb.CheckThrottlerResponseCode {
-	if responseCode != tabletmanagerdatapb.CheckThrottlerResponseCode_UNDEFINED {
-		return responseCode
-	}
-	switch statusCode {
-	case http.StatusOK:
-		return tabletmanagerdatapb.CheckThrottlerResponseCode_OK
-	case http.StatusExpectationFailed:
-		return tabletmanagerdatapb.CheckThrottlerResponseCode_APP_DENIED
-	case http.StatusTooManyRequests:
-		return tabletmanagerdatapb.CheckThrottlerResponseCode_THRESHOLD_EXCEEDED
-	case http.StatusNotFound:
-		return tabletmanagerdatapb.CheckThrottlerResponseCode_UNKNOWN_METRIC
-	case http.StatusInternalServerError:
-		return tabletmanagerdatapb.CheckThrottlerResponseCode_INTERNAL_ERROR
-	default:
-		return tabletmanagerdatapb.CheckThrottlerResponseCode_UNDEFINED
-	}
-}
-
 type MetricResult struct {
 	ResponseCode tabletmanagerdatapb.CheckThrottlerResponseCode `json:"ResponseCode"`
-	StatusCode   int                                            `json:"StatusCode"`
 	Scope        string                                         `json:"Scope"`
 	Value        float64                                        `json:"Value"`
 	Threshold    float64                                        `json:"Threshold"`
@@ -84,16 +59,12 @@ type MetricResult struct {
 }
 
 func (m *MetricResult) IsOK() bool {
-	if m.ResponseCode != tabletmanagerdatapb.CheckThrottlerResponseCode_UNDEFINED {
-		return m.ResponseCode == tabletmanagerdatapb.CheckThrottlerResponseCode_OK
-	}
-	return m.StatusCode == http.StatusOK
+	return m.ResponseCode == tabletmanagerdatapb.CheckThrottlerResponseCode_OK
 }
 
 // CheckResult is the result for an app inquiring on a metric. It also exports as JSON via the API
 type CheckResult struct {
 	ResponseCode    tabletmanagerdatapb.CheckThrottlerResponseCode `json:"ResponseCode"`
-	StatusCode      int                                            `json:"StatusCode"`
 	Value           float64                                        `json:"Value"`
 	Threshold       float64                                        `json:"Threshold"`
 	Error           error                                          `json:"-"`
@@ -106,10 +77,9 @@ type CheckResult struct {
 }
 
 // NewCheckResult returns a CheckResult
-func NewCheckResult(responseCode tabletmanagerdatapb.CheckThrottlerResponseCode, statusCode int, value float64, threshold float64, appName string, err error) *CheckResult {
+func NewCheckResult(responseCode tabletmanagerdatapb.CheckThrottlerResponseCode, value float64, threshold float64, appName string, err error) *CheckResult {
 	result := &CheckResult{
 		ResponseCode: responseCode,
-		StatusCode:   statusCode,
 		Value:        value,
 		Threshold:    threshold,
 		AppName:      appName,
@@ -122,15 +92,12 @@ func NewCheckResult(responseCode tabletmanagerdatapb.CheckThrottlerResponseCode,
 }
 
 func (c *CheckResult) IsOK() bool {
-	if c.ResponseCode != tabletmanagerdatapb.CheckThrottlerResponseCode_UNDEFINED {
-		return c.ResponseCode == tabletmanagerdatapb.CheckThrottlerResponseCode_OK
-	}
-	return c.StatusCode == http.StatusOK
+	return c.ResponseCode == tabletmanagerdatapb.CheckThrottlerResponseCode_OK
 }
 
 // Summary returns a human-readable summary of the check result
 func (c *CheckResult) Summary() string {
-	switch ResponseCodeFromStatus(c.ResponseCode, c.StatusCode) {
+	switch c.ResponseCode {
 	case tabletmanagerdatapb.CheckThrottlerResponseCode_OK:
 		return fmt.Sprintf("%s is granted access", c.AppName)
 	case tabletmanagerdatapb.CheckThrottlerResponseCode_APP_DENIED:
@@ -149,11 +116,11 @@ func (c *CheckResult) Summary() string {
 }
 
 // NewErrorCheckResult returns a check result that indicates an error
-func NewErrorCheckResult(responseCode tabletmanagerdatapb.CheckThrottlerResponseCode, statusCode int, err error) *CheckResult {
-	return NewCheckResult(responseCode, statusCode, 0, 0, "", err)
+func NewErrorCheckResult(responseCode tabletmanagerdatapb.CheckThrottlerResponseCode, err error) *CheckResult {
+	return NewCheckResult(responseCode, 0, 0, "", err)
 }
 
 // NoSuchMetricCheckResult is a result returns when a metric is unknown
-var NoSuchMetricCheckResult = NewErrorCheckResult(tabletmanagerdatapb.CheckThrottlerResponseCode_UNKNOWN_METRIC, http.StatusNotFound, base.ErrNoSuchMetric)
+var NoSuchMetricCheckResult = NewErrorCheckResult(tabletmanagerdatapb.CheckThrottlerResponseCode_UNKNOWN_METRIC, base.ErrNoSuchMetric)
 
-var okMetricCheckResult = NewCheckResult(tabletmanagerdatapb.CheckThrottlerResponseCode_OK, http.StatusOK, 0, 0, "", nil)
+var okMetricCheckResult = NewCheckResult(tabletmanagerdatapb.CheckThrottlerResponseCode_OK, 0, 0, "", nil)
diff --git a/go/vt/vttablet/tabletserver/throttle/check_result_test.go b/go/vt/vttablet/tabletserver/throttle/check_result_test.go
index fdb0ee600ba..6a550666360 100644
--- a/go/vt/vttablet/tabletserver/throttle/check_result_test.go
+++ b/go/vt/vttablet/tabletserver/throttle/check_result_test.go
@@ -17,7 +17,6 @@ limitations under the License.
 package throttle
 
 import (
-	"net/http"
 	"testing"
 
 	"github.com/stretchr/testify/assert"
@@ -25,56 +24,6 @@ import (
 	tabletmanagerdatapb "vitess.io/vitess/go/vt/proto/tabletmanagerdata"
 )
 
-func TestReponseCodeFromStatus(t *testing.T) {
-	tcases := []struct {
-		responseCode tabletmanagerdatapb.CheckThrottlerResponseCode
-		statusCode   int
-		expect       tabletmanagerdatapb.CheckThrottlerResponseCode
-	}{
-		{
-			tabletmanagerdatapb.CheckThrottlerResponseCode_UNDEFINED,
-			http.StatusOK,
-			tabletmanagerdatapb.CheckThrottlerResponseCode_OK,
-		},
-		{
-			tabletmanagerdatapb.CheckThrottlerResponseCode_UNDEFINED,
-			http.StatusExpectationFailed,
-			tabletmanagerdatapb.CheckThrottlerResponseCode_APP_DENIED,
-		},
-		{
-			tabletmanagerdatapb.CheckThrottlerResponseCode_UNDEFINED,
-			http.StatusNotFound,
-			tabletmanagerdatapb.CheckThrottlerResponseCode_UNKNOWN_METRIC,
-		},
-		{
-			tabletmanagerdatapb.CheckThrottlerResponseCode_UNDEFINED,
-			http.StatusInternalServerError,
-			tabletmanagerdatapb.CheckThrottlerResponseCode_INTERNAL_ERROR,
-		},
-		{
-			tabletmanagerdatapb.CheckThrottlerResponseCode_UNDEFINED,
-			http.StatusTooManyRequests,
-			tabletmanagerdatapb.CheckThrottlerResponseCode_THRESHOLD_EXCEEDED,
-		},
-		{
-			tabletmanagerdatapb.CheckThrottlerResponseCode_THRESHOLD_EXCEEDED,
-			http.StatusTooManyRequests,
-			tabletmanagerdatapb.CheckThrottlerResponseCode_THRESHOLD_EXCEEDED,
-		},
-		{
-			tabletmanagerdatapb.CheckThrottlerResponseCode_THRESHOLD_EXCEEDED,
-			http.StatusOK,
-			tabletmanagerdatapb.CheckThrottlerResponseCode_THRESHOLD_EXCEEDED,
-		},
-	}
-	for _, tcase := range tcases {
-		t.Run("", func(t *testing.T) {
-			result := ResponseCodeFromStatus(tcase.responseCode, tcase.statusCode)
-			assert.Equal(t, tcase.expect, result)
-		})
-	}
-}
-
 func TestCheckResultSummary(t *testing.T) {
 	tcases := []struct {
 		checkResult *CheckResult
@@ -84,31 +33,6 @@ func TestCheckResultSummary(t *testing.T) {
 			checkResult: &CheckResult{},
 			summary:     "",
 		},
-		{
-			checkResult: &CheckResult{
-				StatusCode: http.StatusOK,
-				AppName:    "test",
-			},
-			summary: "test is granted access",
-		},
-		{
-			checkResult: &CheckResult{
-				StatusCode: http.StatusTooManyRequests,
-				AppName:    "test",
-				MetricName: "bugginess",
-				Threshold:  100,
-				Value:      200,
-				Scope:      "self",
-			},
-			summary: "test is denied access due to self/bugginess metric value 200 exceeding threshold 100",
-		},
-		{
-			checkResult: &CheckResult{
-				StatusCode: http.StatusExpectationFailed,
-				AppName:    "test",
-			},
-			summary: "test is explicitly denied access",
-		},
 		{
 			checkResult: &CheckResult{
 				ResponseCode: tabletmanagerdatapb.CheckThrottlerResponseCode_OK,
diff --git a/go/vt/vttablet/tabletserver/throttle/client.go b/go/vt/vttablet/tabletserver/throttle/client.go
index 8549fb099b6..f0f45341a16 100644
--- a/go/vt/vttablet/tabletserver/throttle/client.go
+++ b/go/vt/vttablet/tabletserver/throttle/client.go
@@ -70,8 +70,7 @@ func NewBackgroundClient(throttler *Throttler, appName throttlerapp.Name, scope
 		throttler: throttler,
 		appName:   appName,
 		flags: CheckFlags{
-			Scope:               scope,
-			MultiMetricsEnabled: true,
+			Scope: scope,
 		},
 		lastSuccessfulThrottle: make(map[string]int64),
 	}
diff --git a/go/vt/vttablet/tabletserver/throttle/throttler.go b/go/vt/vttablet/tabletserver/throttle/throttler.go
index 839ba9d43b8..d9abf59ab4b 100644
--- a/go/vt/vttablet/tabletserver/throttle/throttler.go
+++ b/go/vt/vttablet/tabletserver/throttle/throttler.go
@@ -47,7 +47,6 @@ import (
 	"fmt"
 	"math"
 	"math/rand/v2"
-	"net/http"
 	"strings"
 	"sync"
 	"sync/atomic"
@@ -175,7 +174,6 @@ type Throttler struct {
 
 	customMetricsQuery atomic.Value
 	MetricsThreshold   atomic.Uint64
-	checkAsCheckSelf   atomic.Bool
 
 	metricThresholds  *cache.Cache
 	aggregatedMetrics *cache.Cache
@@ -437,7 +435,6 @@ func (throttler *Throttler) applyThrottlerConfig(ctx context.Context, throttlerC
 		// require per-metric threshold.
 		throttler.StoreMetricsThreshold(throttlerConfig.Threshold)
 	}
-	throttler.checkAsCheckSelf.Store(throttlerConfig.CheckAsCheckSelf)
 	{
 		// Throttled apps/rules
 		for _, appRule := range throttlerConfig.ThrottledApps {
@@ -907,7 +904,7 @@ func (throttler *Throttler) generateTabletProbeFunction(scope base.Scope, probe
 		}
 		metrics := make(base.ThrottleMetrics)
 
-		req := &tabletmanagerdatapb.CheckThrottlerRequest{MultiMetricsEnabled: true} // We leave AppName empty; it will default to VitessName anyway, and we can save some proto space
+		req := &tabletmanagerdatapb.CheckThrottlerRequest{} // We leave AppName empty; it will default to VitessName anyway, and we can save some proto space
 		resp, gRPCErr := tmClient.CheckThrottler(ctx, probe.Tablet, req)
 		if gRPCErr != nil {
 			return metricsWithError(fmt.Errorf("gRPC error accessing tablet %v. Err=%v", probe.Alias, gRPCErr))
@@ -916,9 +913,6 @@ func (throttler *Throttler) generateTabletProbeFunction(scope base.Scope, probe
 		if resp.ResponseCode == tabletmanagerdatapb.CheckThrottlerResponseCode_INTERNAL_ERROR {
 			throttleMetric.Err = fmt.Errorf("response code: %d", resp.ResponseCode)
 		}
-		if resp.StatusCode == http.StatusInternalServerError {
-			throttleMetric.Err = fmt.Errorf("status code: %d", resp.StatusCode)
-		}
 		if resp.RecentlyChecked {
 			// We have just probed a tablet, and it reported back that someone just recently "check"ed it.
 			// We therefore renew the heartbeats lease.
@@ -1402,8 +1396,8 @@ func (throttler *Throttler) ThrottledAppsMap() (result map[string](*base.AppThro
 }
 
 // markRecentApp takes note that an app has just asked about throttling, making it "recent"
-func (throttler *Throttler) markRecentApp(appName string, statusCode int, responseCode tabletmanagerdatapb.CheckThrottlerResponseCode) {
-	recentApp := base.NewRecentApp(appName, statusCode, responseCode)
+func (throttler *Throttler) markRecentApp(appName string, responseCode tabletmanagerdatapb.CheckThrottlerResponseCode) {
+	recentApp := base.NewRecentApp(appName, responseCode)
 	throttler.recentApps.Set(appName, recentApp, cache.DefaultExpiration)
 }
 
@@ -1540,9 +1534,6 @@ func (throttler *Throttler) Check(ctx context.Context, appName string, metricNam
 	if flags != nil {
 		scope = flags.Scope
 	}
-	if scope == base.ShardScope && throttler.checkAsCheckSelf.Load() {
-		scope = base.SelfScope
-	}
 	return throttler.checkScope(ctx, appName, scope, metricNames, flags)
 }
 
diff --git a/go/vt/vttablet/tabletserver/throttle/throttler_test.go b/go/vt/vttablet/tabletserver/throttle/throttler_test.go
index 352e641fa35..13a014b52ea 100644
--- a/go/vt/vttablet/tabletserver/throttle/throttler_test.go
+++ b/go/vt/vttablet/tabletserver/throttle/throttler_test.go
@@ -20,7 +20,6 @@ import (
 	"context"
 	"fmt"
 	"math"
-	"net/http"
 	"sync"
 	"sync/atomic"
 	"testing"
@@ -92,37 +91,30 @@ var (
 	}
 	replicaMetrics = map[string]*MetricResult{
 		base.LagMetricName.String(): {
-			StatusCode:   http.StatusOK,
 			ResponseCode: tabletmanagerdatapb.CheckThrottlerResponseCode_OK,
 			Value:        0.9,
 		},
 		base.ThreadsRunningMetricName.String(): {
-			StatusCode:   http.StatusOK,
 			ResponseCode: tabletmanagerdatapb.CheckThrottlerResponseCode_OK,
 			Value:        13,
 		},
 		base.CustomMetricName.String(): {
-			StatusCode:   http.StatusOK,
 			ResponseCode: tabletmanagerdatapb.CheckThrottlerResponseCode_OK,
 			Value:        14,
 		},
 		base.LoadAvgMetricName.String(): {
-			StatusCode:   http.StatusOK,
 			ResponseCode: tabletmanagerdatapb.CheckThrottlerResponseCode_OK,
 			Value:        5.1,
 		},
 		base.HistoryListLengthMetricName.String(): {
-			StatusCode:   http.StatusOK,
 			ResponseCode: tabletmanagerdatapb.CheckThrottlerResponseCode_OK,
 			Value:        6,
 		},
 		base.MysqldLoadAvgMetricName.String(): {
-			StatusCode:   http.StatusOK,
 			ResponseCode: tabletmanagerdatapb.CheckThrottlerResponseCode_OK,
 			Value:        0.2211,
 		},
 		base.MysqldDatadirUsedRatioMetricName.String(): {
-			StatusCode:   http.StatusOK,
 			ResponseCode: tabletmanagerdatapb.CheckThrottlerResponseCode_OK,
 			Value:        0.87,
 		},
@@ -138,7 +130,6 @@ const (
 type fakeTMClient struct {
 	tmclient.TabletManagerClient
 	appNames []string
-	v20      atomic.Bool // help validate v20 backwards compatibility
 
 	mu sync.Mutex
 }
@@ -148,18 +139,16 @@ func (c *fakeTMClient) Close() {
 
 func (c *fakeTMClient) CheckThrottler(ctx context.Context, tablet *topodatapb.Tablet, request *tabletmanagerdatapb.CheckThrottlerRequest) (*tabletmanagerdatapb.CheckThrottlerResponse, error) {
 	resp := &tabletmanagerdatapb.CheckThrottlerResponse{
-		StatusCode:      http.StatusOK,
+		ResponseCode:    tabletmanagerdatapb.CheckThrottlerResponseCode_OK,
 		Value:           0.339,
 		Threshold:       1,
 		RecentlyChecked: false,
 	}
-	if !c.v20.Load() {
-		resp.ResponseCode = tabletmanagerdatapb.CheckThrottlerResponseCode_OK
+	{
 		resp.Metrics = make(map[string]*tabletmanagerdatapb.CheckThrottlerResponse_Metric)
 		for name, metric := range replicaMetrics {
 			resp.Metrics[name] = &tabletmanagerdatapb.CheckThrottlerResponse_Metric{
 				Name:         name,
-				StatusCode:   int32(metric.StatusCode),
 				ResponseCode: metric.ResponseCode,
 				Value:        metric.Value,
 				Threshold:    metric.Threshold,
@@ -167,6 +156,7 @@ func (c *fakeTMClient) CheckThrottler(ctx context.Context, tablet *topodatapb.Ta
 			}
 		}
 	}
+
 	c.mu.Lock()
 	defer c.mu.Unlock()
 	c.appNames = append(c.appNames, request.AppName)
@@ -455,13 +445,11 @@ func TestApplyThrottlerConfigMetricThresholds(t *testing.T) {
 		flags := &CheckFlags{
 			Scope:                 base.SelfScope,
 			SkipRequestHeartbeats: true,
-			MultiMetricsEnabled:   true,
 		}
 		t.Run("check before apply", func(t *testing.T) {
 			checkResult := throttler.Check(ctx, testAppName.String(), nil, flags)
 			require.NotNil(t, checkResult)
 			assert.EqualValues(t, 0.3, checkResult.Value) // self lag value
-			assert.EqualValues(t, http.StatusOK, checkResult.StatusCode)
 			assert.EqualValues(t, tabletmanagerdatapb.CheckThrottlerResponseCode_OK, checkResult.ResponseCode)
 			assert.Len(t, checkResult.Metrics, 1)
 			assert.Contains(t, checkResult.Summary(), testAppName.String()+" is granted access")
@@ -485,7 +473,6 @@ func TestApplyThrottlerConfigMetricThresholds(t *testing.T) {
 			checkResult := throttler.Check(ctx, testAppName.String(), nil, flags)
 			require.NotNil(t, checkResult)
 			assert.EqualValues(t, 0.3, checkResult.Value, "unexpected result: %+v", checkResult) // self lag value
-			assert.NotEqualValues(t, http.StatusOK, checkResult.StatusCode, "unexpected result: %+v", checkResult)
 			assert.NotEqualValues(t, tabletmanagerdatapb.CheckThrottlerResponseCode_OK, checkResult.ResponseCode, "unexpected result: %+v", checkResult)
 			assert.Len(t, checkResult.Metrics, 1)
 			assert.Contains(t, checkResult.Summary(), testAppName.String()+" is denied access due to self/lag metric value")
@@ -510,7 +497,6 @@ func TestApplyThrottlerConfigMetricThresholds(t *testing.T) {
 			checkResult := throttler.Check(ctx, testAppName.String(), nil, flags)
 			require.NotNil(t, checkResult)
 			assert.EqualValues(t, 0.3, checkResult.Value, "unexpected result: %+v", checkResult) // self lag value
-			assert.EqualValues(t, http.StatusOK, checkResult.StatusCode, "unexpected result: %+v", checkResult)
 			assert.EqualValues(t, tabletmanagerdatapb.CheckThrottlerResponseCode_OK, checkResult.ResponseCode, "unexpected result: %+v", checkResult)
 			assert.Len(t, checkResult.Metrics, 1)
 			assert.Contains(t, checkResult.Summary(), testAppName.String()+" is granted access")
@@ -557,7 +543,6 @@ func TestApplyThrottlerConfigAppCheckedMetrics(t *testing.T) {
 		}
 		flags := &CheckFlags{
 			SkipRequestHeartbeats: true,
-			MultiMetricsEnabled:   true,
 		}
 		throttlerConfig := &topodatapb.ThrottlerConfig{
 			Enabled:           true,
@@ -569,7 +554,6 @@ func TestApplyThrottlerConfigAppCheckedMetrics(t *testing.T) {
 			checkResult := throttler.Check(ctx, testAppName.String(), nil, flags)
 			require.NotNil(t, checkResult)
 			assert.EqualValues(t, 0.9, checkResult.Value) // shard lag value
-			assert.NotEqualValues(t, http.StatusOK, checkResult.StatusCode)
 			assert.NotEqualValues(t, tabletmanagerdatapb.CheckThrottlerResponseCode_OK, checkResult.ResponseCode)
 			assert.Len(t, checkResult.Metrics, 1)
 			assert.Contains(t, checkResult.Summary(), testAppName.String()+" is denied access due to shard/lag metric value")
@@ -585,7 +569,6 @@ func TestApplyThrottlerConfigAppCheckedMetrics(t *testing.T) {
 				checkResult := throttler.Check(ctx, testAppName.String(), nil, flags)
 				require.NotNil(t, checkResult)
 				assert.EqualValues(t, 0.9, checkResult.Value) // self lag value
-				assert.EqualValues(t, http.StatusOK, checkResult.StatusCode)
 				assert.EqualValues(t, tabletmanagerdatapb.CheckThrottlerResponseCode_OK, checkResult.ResponseCode)
 				assert.Len(t, checkResult.Metrics, 1)
 				assert.Contains(t, checkResult.Summary(), testAppName.String()+" is granted access")
@@ -601,7 +584,6 @@ func TestApplyThrottlerConfigAppCheckedMetrics(t *testing.T) {
 				checkResult := throttler.Check(ctx, testAppName.String(), nil, flags)
 				require.NotNil(t, checkResult)
 				assert.EqualValues(t, 0.9, checkResult.Value) // shard lag value
-				assert.EqualValues(t, http.StatusOK, checkResult.StatusCode)
 				assert.EqualValues(t, tabletmanagerdatapb.CheckThrottlerResponseCode_OK, checkResult.ResponseCode)
 				assert.Len(t, checkResult.Metrics, 1)
 				assert.Contains(t, checkResult.Summary(), testAppName.String()+" is granted access")
@@ -621,7 +603,6 @@ func TestApplyThrottlerConfigAppCheckedMetrics(t *testing.T) {
 				checkResult := throttler.Check(ctx, testAppName.String(), nil, flags)
 				require.NotNil(t, checkResult)
 				assert.EqualValues(t, 2.718, checkResult.Value) // self loadavg value
-				assert.NotEqualValues(t, http.StatusOK, checkResult.StatusCode, "unexpected result: %+v", checkResult)
 				assert.NotEqualValues(t, tabletmanagerdatapb.CheckThrottlerResponseCode_OK, checkResult.ResponseCode, "unexpected result: %+v", checkResult)
 				assert.Len(t, checkResult.Metrics, 1)
 				assert.Contains(t, checkResult.Summary(), testAppName.String()+" is denied access due to self/loadavg metric value")
@@ -641,7 +622,6 @@ func TestApplyThrottlerConfigAppCheckedMetrics(t *testing.T) {
 				checkResult := throttler.Check(ctx, testAppName.String(), nil, flags)
 				require.NotNil(t, checkResult)
 				assert.EqualValues(t, 5.1, checkResult.Value) // shard loadavg value
-				assert.NotEqualValues(t, http.StatusOK, checkResult.StatusCode, "unexpected result: %+v", checkResult)
 				assert.NotEqualValues(t, tabletmanagerdatapb.CheckThrottlerResponseCode_OK, checkResult.ResponseCode, "unexpected result: %+v", checkResult)
 				assert.Len(t, checkResult.Metrics, 1)
 				assert.Contains(t, checkResult.Summary(), testAppName.String()+" is denied access due to shard/loadavg metric value")
@@ -660,7 +640,6 @@ func TestApplyThrottlerConfigAppCheckedMetrics(t *testing.T) {
 				checkResult := throttler.Check(ctx, testAppName.String(), nil, flags)
 				require.NotNil(t, checkResult)
 				assert.EqualValues(t, 2.718, checkResult.Value) // self loadavg value
-				assert.NotEqualValues(t, http.StatusOK, checkResult.StatusCode, "unexpected result: %+v", checkResult)
 				assert.NotEqualValues(t, tabletmanagerdatapb.CheckThrottlerResponseCode_OK, checkResult.ResponseCode, "unexpected result: %+v", checkResult)
 				assert.Equal(t, 2, len(checkResult.Metrics))
 				assert.Contains(t, checkResult.Summary(), testAppName.String()+" is denied access due to self/loadavg metric value")
@@ -679,7 +658,6 @@ func TestApplyThrottlerConfigAppCheckedMetrics(t *testing.T) {
 				checkResult := throttler.Check(ctx, testAppName.String(), nil, flags)
 				require.NotNil(t, checkResult)
 				assert.EqualValues(t, 5.1, checkResult.Value) // shard loadavg value
-				assert.NotEqualValues(t, http.StatusOK, checkResult.StatusCode, "unexpected result: %+v", checkResult)
 				assert.NotEqualValues(t, tabletmanagerdatapb.CheckThrottlerResponseCode_OK, checkResult.ResponseCode, "unexpected result: %+v", checkResult)
 				assert.Equal(t, 2, len(checkResult.Metrics))
 				assert.Contains(t, checkResult.Summary(), testAppName.String()+" is denied access due to shard/loadavg metric value")
@@ -694,7 +672,6 @@ func TestApplyThrottlerConfigAppCheckedMetrics(t *testing.T) {
 				checkResult := throttler.Check(ctx, testAppName.String(), nil, flags)
 				require.NotNil(t, checkResult)
 				assert.EqualValues(t, 0.9, checkResult.Value) // shard lag value
-				assert.EqualValues(t, http.StatusOK, checkResult.StatusCode, "unexpected result: %+v", checkResult)
 				assert.EqualValues(t, tabletmanagerdatapb.CheckThrottlerResponseCode_OK, checkResult.ResponseCode, "unexpected result: %+v", checkResult)
 				assert.Equal(t, 1, len(checkResult.Metrics), "unexpected metrics: %+v", checkResult.Metrics)
 				assert.Contains(t, checkResult.Summary(), testAppName.String()+" is granted access")
@@ -713,7 +690,6 @@ func TestApplyThrottlerConfigAppCheckedMetrics(t *testing.T) {
 				checkResult := throttler.Check(ctx, testAppName.String(), nil, flags)
 				require.NotNil(t, checkResult)
 				assert.EqualValues(t, 0.9, checkResult.Value) // shard lag value
-				assert.EqualValues(t, http.StatusOK, checkResult.StatusCode, "unexpected result: %+v", checkResult)
 				assert.EqualValues(t, tabletmanagerdatapb.CheckThrottlerResponseCode_OK, checkResult.ResponseCode, "unexpected result: %+v", checkResult)
 				assert.Equal(t, 2, len(checkResult.Metrics))
 				assert.Contains(t, checkResult.Summary(), testAppName.String()+" is granted access")
@@ -732,7 +708,6 @@ func TestApplyThrottlerConfigAppCheckedMetrics(t *testing.T) {
 				checkResult := throttler.Check(ctx, throttlerapp.AllName.String(), nil, flags)
 				require.NotNil(t, checkResult)
 				assert.EqualValues(t, 2.718, checkResult.Value) // loadavg self value exceeds threshold
-				assert.NotEqualValues(t, http.StatusOK, checkResult.StatusCode, "unexpected result: %+v", checkResult)
 				assert.NotEqualValues(t, tabletmanagerdatapb.CheckThrottlerResponseCode_OK, checkResult.ResponseCode, "unexpected result: %+v", checkResult)
 				assert.Equal(t, 2, len(checkResult.Metrics))
 				assert.Contains(t, checkResult.Summary(), throttlerapp.AllName.String()+" is denied access due to self/loadavg metric value")
@@ -748,7 +723,6 @@ func TestApplyThrottlerConfigAppCheckedMetrics(t *testing.T) {
 				checkResult := throttler.Check(ctx, testAppName.String(), nil, flags)
 				require.NotNil(t, checkResult)
 				assert.EqualValues(t, 0.9, checkResult.Value) // shard lag value
-				assert.EqualValues(t, http.StatusOK, checkResult.StatusCode, "unexpected result: %+v", checkResult)
 				assert.EqualValues(t, tabletmanagerdatapb.CheckThrottlerResponseCode_OK, checkResult.ResponseCode, "unexpected result: %+v", checkResult)
 				assert.Equal(t, 2, len(checkResult.Metrics))
 				assert.Contains(t, checkResult.Summary(), testAppName.String()+" is granted access")
@@ -763,7 +737,6 @@ func TestApplyThrottlerConfigAppCheckedMetrics(t *testing.T) {
 				checkResult := throttler.Check(ctx, throttlerapp.OnlineDDLName.String(), nil, flags)
 				require.NotNil(t, checkResult)
 				assert.EqualValues(t, 2.718, checkResult.Value) // loadavg self value exceeds threshold
-				assert.NotEqualValues(t, http.StatusOK, checkResult.StatusCode, "unexpected result: %+v", checkResult)
 				assert.NotEqualValues(t, tabletmanagerdatapb.CheckThrottlerResponseCode_OK, checkResult.ResponseCode, "unexpected result: %+v", checkResult)
 				assert.Equal(t, 2, len(checkResult.Metrics))
 				assert.Contains(t, checkResult.Summary(), throttlerapp.AllName.String()+" is denied access due to self/loadavg metric value")
@@ -775,7 +748,6 @@ func TestApplyThrottlerConfigAppCheckedMetrics(t *testing.T) {
 			checkResult := throttler.Check(ctx, "vreplication:online-ddl:12345", nil, flags)
 			require.NotNil(t, checkResult)
 			assert.EqualValues(t, 2.718, checkResult.Value) // loadavg self value exceeds threshold
-			assert.NotEqualValues(t, http.StatusOK, checkResult.StatusCode, "unexpected result: %+v", checkResult)
 			assert.NotEqualValues(t, tabletmanagerdatapb.CheckThrottlerResponseCode_OK, checkResult.ResponseCode, "unexpected result: %+v", checkResult)
 			assert.Equal(t, 2, len(checkResult.Metrics))
 			assert.Contains(t, checkResult.Summary(), throttlerapp.AllName.String()+" is denied access due to self/loadavg metric value")
@@ -786,7 +758,6 @@ func TestApplyThrottlerConfigAppCheckedMetrics(t *testing.T) {
 			checkResult := throttler.Check(ctx, "vreplication:online-ddl:test", nil, flags)
 			require.NotNil(t, checkResult)
 			assert.EqualValues(t, 0.9, checkResult.Value) // shard lag value
-			assert.EqualValues(t, http.StatusOK, checkResult.StatusCode, "unexpected result: %+v", checkResult)
 			assert.EqualValues(t, tabletmanagerdatapb.CheckThrottlerResponseCode_OK, checkResult.ResponseCode, "unexpected result: %+v", checkResult)
 			assert.Equal(t, 2, len(checkResult.Metrics))
 			assert.Contains(t, checkResult.Summary(), testAppName.String()+" is granted access")
@@ -802,7 +773,6 @@ func TestApplyThrottlerConfigAppCheckedMetrics(t *testing.T) {
 				checkResult := throttler.Check(ctx, throttlerapp.AllName.String(), nil, flags)
 				require.NotNil(t, checkResult)
 				assert.EqualValues(t, 0.9, checkResult.Value) // shard lag value
-				assert.EqualValues(t, http.StatusOK, checkResult.StatusCode, "unexpected result: %+v", checkResult)
 				assert.EqualValues(t, tabletmanagerdatapb.CheckThrottlerResponseCode_OK, checkResult.ResponseCode, "unexpected result: %+v", checkResult)
 				assert.Len(t, checkResult.Metrics, 1)
 				assert.Contains(t, checkResult.Summary(), throttlerapp.AllName.String()+" is granted access")
@@ -818,7 +788,6 @@ func TestApplyThrottlerConfigAppCheckedMetrics(t *testing.T) {
 				checkResult := throttler.Check(ctx, testAppName.String(), nil, flags)
 				require.NotNil(t, checkResult)
 				assert.EqualValues(t, 0.9, checkResult.Value) // shard lag value
-				assert.EqualValues(t, http.StatusOK, checkResult.StatusCode, "unexpected result: %+v", checkResult)
 				assert.EqualValues(t, tabletmanagerdatapb.CheckThrottlerResponseCode_OK, checkResult.ResponseCode, "unexpected result: %+v", checkResult)
 				assert.Equal(t, 2, len(checkResult.Metrics))
 				assert.Contains(t, checkResult.Summary(), testAppName.String()+" is granted access")
@@ -833,7 +802,6 @@ func TestApplyThrottlerConfigAppCheckedMetrics(t *testing.T) {
 				checkResult := throttler.Check(ctx, throttlerapp.OnlineDDLName.String(), nil, flags)
 				require.NotNil(t, checkResult)
 				assert.EqualValues(t, 0.9, checkResult.Value) // shard lag value
-				assert.EqualValues(t, http.StatusOK, checkResult.StatusCode, "unexpected result: %+v", checkResult)
 				assert.EqualValues(t, tabletmanagerdatapb.CheckThrottlerResponseCode_OK, checkResult.ResponseCode, "unexpected result: %+v", checkResult)
 				assert.Len(t, checkResult.Metrics, 1)
 				assert.Contains(t, checkResult.Summary(), throttlerapp.OnlineDDLName.String()+" is granted access")
@@ -851,7 +819,6 @@ func TestApplyThrottlerConfigAppCheckedMetrics(t *testing.T) {
 				checkResult := throttler.Check(ctx, testAppName.String(), nil, flags)
 				require.NotNil(t, checkResult)
 				assert.EqualValues(t, 0.9, checkResult.Value) // shard lag value
-				assert.EqualValues(t, http.StatusOK, checkResult.StatusCode)
 				assert.EqualValues(t, tabletmanagerdatapb.CheckThrottlerResponseCode_OK, checkResult.ResponseCode)
 				assert.Len(t, checkResult.Metrics, 1)
 				assert.Contains(t, checkResult.Summary(), testAppName.String()+" is granted access")
@@ -1593,89 +1560,6 @@ func TestProbesWhileOperating(t *testing.T) {
 	})
 }
 
-// TestProbesWithV20Replicas is similar to TestProbesWhileOperating, but assumes a v20 replica, which does not report any of the named metrics.
-func TestProbesWithV20Replicas(t *testing.T) {
-	ctx := context.Background() // for development, replace with	ctx := utils.LeakCheckContext(t)
-	ctx, cancel := context.WithCancel(ctx)
-	defer cancel()
-
-	throttler := newTestThrottler()
-
-	tmClient, ok := throttler.overrideTmClient.(*fakeTMClient)
-	require.True(t, ok)
-	assert.Empty(t, tmClient.AppNames())
-	tmClient.v20.Store(true)
-
-	t.Run("aggregated initial", func(t *testing.T) {
-		assert.Equal(t, 0, throttler.aggregatedMetrics.ItemCount())
-	})
-
-	runThrottler(t, ctx, throttler, time.Minute, func(t *testing.T, ctx context.Context) {
-		defer cancel() // early termination
-		t.Run("aggregated", func(t *testing.T) {
-			aggr := throttler.aggregatedMetricsSnapshot()
-			assert.Equalf(t, 2*len(base.KnownMetricNames), len(aggr), "aggregated: %+v", aggr)     // "self" and "shard", per known metric
-			assert.Equal(t, 2*len(base.KnownMetricNames), throttler.aggregatedMetrics.ItemCount()) // flushed upon Disable()
-			for aggregatedMetricName, metricResult := range aggr {
-				assert.NotEmpty(t, aggregatedMetricName)
-				scope, metricName, err := base.DisaggregateMetricName(aggregatedMetricName)
-				assert.NotEmpty(t, metricName)
-				require.NoError(t, err)
-
-				val, metricResultErr := metricResult.Get()
-				expectMetricNotCollectedYet := false
-				switch base.Scope(scope) {
-				case base.SelfScope:
-					switch metricName {
-					case base.DefaultMetricName:
-						assert.Equalf(t, float64(0.3), val, "scope=%v, metricName=%v", scope, metricName) // same value as "lag"
-					case base.LagMetricName:
-						assert.Equalf(t, float64(0.3), val, "scope=%v, metricName=%v", scope, metricName)
-					case base.ThreadsRunningMetricName:
-						assert.Equalf(t, float64(26), val, "scope=%v, metricName=%v", scope, metricName)
-					case base.CustomMetricName:
-						assert.Equalf(t, float64(17), val, "scope=%v, metricName=%v", scope, metricName)
-					case base.LoadAvgMetricName:
-						assert.Equalf(t, float64(2.718), val, "scope=%v, metricName=%v", scope, metricName)
-					}
-				case base.ShardScope:
-					// Replicas will nto report named metrics, since they now assume v20 behavior. They will only
-					// produce the single v20 metric (which we call "default", though they don't advertise it under the name "base.DefaultMetricName")
-					switch metricName {
-					case base.DefaultMetricName:
-						assert.Equalf(t, float64(0.339), val, "scope=%v, metricName=%v", scope, metricName) // same value as "lag"
-					case base.LagMetricName:
-						assert.Equalf(t, float64(0.339), val, "scope=%v, metricName=%v", scope, metricName) //
-					default:
-						assert.Zero(t, val, "scope=%v, metricName=%v", scope, metricName)
-						expectMetricNotCollectedYet = true
-					}
-				default:
-					assert.Failf(t, "unknown scope", "scope=%v", scope)
-				}
-				if expectMetricNotCollectedYet {
-					assert.ErrorIs(t, metricResultErr, base.ErrNoResultYet)
-				} else {
-					assert.NoErrorf(t, metricResultErr, "aggregatedMetricName: %v", aggregatedMetricName)
-				}
-			}
-			assert.NotEmpty(t, tmClient.AppNames())
-			// The throttler here emulates a PRIMARY tablet, and therefore should probe the replicas using
-			// the "vitess" app name.
-			uniqueNames := map[string]int{}
-			for _, appName := range tmClient.AppNames() {
-				uniqueNames[appName]++
-			}
-			// PRIMARY throttler probes replicas with empty app name, which is then
-			// interpreted as "vitess" name.
-			_, ok := uniqueNames[""]
-			assert.Truef(t, ok, "%+v", uniqueNames)
-			// And that's the only app we expect to see.
-			assert.Equalf(t, 1, len(uniqueNames), "%+v", uniqueNames)
-		})
-	})
-}
-
 // TestProbesPostDisable runs the throttler for some time, and then investigates the internal throttler maps and values.
 func TestProbesPostDisable(t *testing.T) {
 	ctx := context.Background() // for development, replace with	ctx := utils.LeakCheckContext(t)
@@ -1730,8 +1614,7 @@ func TestDormant(t *testing.T) {
 		assert.True(t, throttler.isDormant())
 		assert.EqualValues(t, 1, heartbeatWriter.Requests()) // once upon Enable()
 		flags := &CheckFlags{
-			Scope:               base.SelfScope,
-			MultiMetricsEnabled: true,
+			Scope: base.SelfScope,
 		}
 		throttler.Check(ctx, throttlerapp.VitessName.String(), nil, flags)
 		go func() {
@@ -1830,14 +1713,12 @@ func TestChecks(t *testing.T) {
 		validateAppNames(t)
 		t.Run("checks, self scope", func(t *testing.T) {
 			flags := &CheckFlags{
-				Scope:               base.SelfScope,
-				MultiMetricsEnabled: true,
+				Scope: base.SelfScope,
 			}
 			t.Run("implicit names", func(t *testing.T) {
 				checkResult := throttler.Check(ctx, testAppName.String(), nil, flags)
 				require.NotNil(t, checkResult)
 				assert.EqualValues(t, 0.3, checkResult.Value) // self lag value
-				assert.EqualValues(t, http.StatusOK, checkResult.StatusCode)
 				assert.EqualValues(t, tabletmanagerdatapb.CheckThrottlerResponseCode_OK, checkResult.ResponseCode)
 				assert.Equal(t, testAppName.String(), checkResult.AppName)
 				assert.Len(t, checkResult.Metrics, 1)
@@ -1846,11 +1727,6 @@ func TestChecks(t *testing.T) {
 				checkResult := throttler.Check(ctx, testAppName.String(), base.KnownMetricNames, flags)
 				require.NotNil(t, checkResult)
 				assert.EqualValues(t, 0.3, checkResult.Value, "unexpected result: %+v", checkResult) // self lag value
-				if !assert.EqualValues(t, http.StatusOK, checkResult.StatusCode, "unexpected result: %+v", checkResult) {
-					for k, v := range checkResult.Metrics {
-						t.Logf("%s: %+v", k, v)
-					}
-				}
 				if !assert.EqualValues(t, tabletmanagerdatapb.CheckThrottlerResponseCode_OK, checkResult.ResponseCode, "unexpected result: %+v", checkResult) {
 					for k, v := range checkResult.Metrics {
 						t.Logf("%s: %+v", k, v)
@@ -1876,7 +1752,6 @@ func TestChecks(t *testing.T) {
 			// "vitess" app always checks all known metrics.
 			flags := &CheckFlags{
 				// scope not important for this test
-				MultiMetricsEnabled: true,
 			}
 			t.Run("implicit names, always all known", func(t *testing.T) {
 				checkResult := throttler.Check(ctx, throttlerapp.VitessName.String(), nil, flags)
@@ -1899,14 +1774,12 @@ func TestChecks(t *testing.T) {
 
 		t.Run("checks, shard scope", func(t *testing.T) {
 			flags := &CheckFlags{
-				Scope:               base.ShardScope,
-				MultiMetricsEnabled: true,
+				Scope: base.ShardScope,
 			}
 			t.Run("implicit names", func(t *testing.T) {
 				checkResult := throttler.Check(ctx, testAppName.String(), nil, flags)
 				require.NotNil(t, checkResult)
 				assert.EqualValues(t, 0.9, checkResult.Value) // shard lag value
-				assert.NotEqualValues(t, http.StatusOK, checkResult.StatusCode)
 				assert.NotEqualValues(t, tabletmanagerdatapb.CheckThrottlerResponseCode_OK, checkResult.ResponseCode)
 				assert.ErrorIs(t, checkResult.Error, base.ErrThresholdExceeded)
 				assert.Equal(t, testAppName.String(), checkResult.AppName)
@@ -1916,7 +1789,6 @@ func TestChecks(t *testing.T) {
 				checkResult := throttler.Check(ctx, testAppName.String(), base.KnownMetricNames, flags)
 				require.NotNil(t, checkResult)
 				assert.EqualValues(t, 0.9, checkResult.Value) // shard lag value
-				assert.NotEqualValues(t, http.StatusOK, checkResult.StatusCode)
 				assert.NotEqualValues(t, tabletmanagerdatapb.CheckThrottlerResponseCode_OK, checkResult.ResponseCode)
 				assert.ErrorIs(t, checkResult.Error, base.ErrThresholdExceeded)
 				assert.Equal(t, testAppName.String(), checkResult.AppName)
@@ -1937,13 +1809,11 @@ func TestChecks(t *testing.T) {
 		t.Run("checks, undefined scope", func(t *testing.T) {
 			flags := &CheckFlags{
 				// Leaving scope undefined, so that each metrics picks its own scope
-				MultiMetricsEnabled: true,
 			}
 			t.Run("implicit names", func(t *testing.T) {
 				checkResult := throttler.Check(ctx, testAppName.String(), nil, flags)
 				require.NotNil(t, checkResult)
 				assert.EqualValues(t, 0.9, checkResult.Value) // shard lag value
-				assert.NotEqualValues(t, http.StatusOK, checkResult.StatusCode)
 				assert.NotEqualValues(t, tabletmanagerdatapb.CheckThrottlerResponseCode_OK, checkResult.ResponseCode)
 				assert.ErrorIs(t, checkResult.Error, base.ErrThresholdExceeded)
 				assert.Len(t, checkResult.Metrics, 1)
@@ -1952,7 +1822,6 @@ func TestChecks(t *testing.T) {
 				checkResult := throttler.Check(ctx, testAppName.String(), base.KnownMetricNames, flags)
 				require.NotNil(t, checkResult)
 				assert.EqualValues(t, 0.9, checkResult.Value) // shard lag value
-				assert.NotEqualValues(t, http.StatusOK, checkResult.StatusCode)
 				assert.NotEqualValues(t, tabletmanagerdatapb.CheckThrottlerResponseCode_OK, checkResult.ResponseCode)
 				assert.ErrorIs(t, checkResult.Error, base.ErrThresholdExceeded)
 				assert.Equal(t, len(base.KnownMetricNames), len(checkResult.Metrics))
@@ -1974,8 +1843,7 @@ func TestChecks(t *testing.T) {
 		})
 		t.Run("checks, defined scope masks explicit scope metrics", func(t *testing.T) {
 			flags := &CheckFlags{
-				Scope:               base.ShardScope,
-				MultiMetricsEnabled: true,
+				Scope: base.ShardScope,
 			}
 			t.Run("explicit names", func(t *testing.T) {
 				metricNames := base.MetricNames{
@@ -1992,7 +1860,6 @@ func TestChecks(t *testing.T) {
 
 				require.NotNil(t, checkResult)
 				assert.EqualValues(t, 0.9, checkResult.Value) // shard lag value
-				assert.NotEqualValues(t, http.StatusOK, checkResult.StatusCode)
 				assert.NotEqualValues(t, tabletmanagerdatapb.CheckThrottlerResponseCode_OK, checkResult.ResponseCode)
 				assert.ErrorIs(t, checkResult.Error, base.ErrThresholdExceeded)
 				assert.Equal(t, len(metricNames), len(checkResult.Metrics))
@@ -2012,7 +1879,6 @@ func TestChecks(t *testing.T) {
 		t.Run("checks, undefined scope and explicit scope metrics", func(t *testing.T) {
 			flags := &CheckFlags{
 				// Leaving scope undefined
-				MultiMetricsEnabled: true,
 			}
 			t.Run("explicit names", func(t *testing.T) {
 				metricNames := base.MetricNames{
@@ -2024,7 +1890,6 @@ func TestChecks(t *testing.T) {
 				checkResult := throttler.Check(ctx, testAppName.String(), metricNames, flags)
 				require.NotNil(t, checkResult)
 				assert.EqualValues(t, 0.3, checkResult.Value) // explicitly set self lag value
-				assert.EqualValues(t, http.StatusOK, checkResult.StatusCode)
 				assert.EqualValues(t, tabletmanagerdatapb.CheckThrottlerResponseCode_OK, checkResult.ResponseCode)
 				assert.Equal(t, len(metricNames), len(checkResult.Metrics))
 
@@ -2061,8 +1926,7 @@ func TestReplica(t *testing.T) {
 	runThrottler(t, ctx, throttler, time.Minute, func(t *testing.T, ctx context.Context) {
 		assert.Empty(t, tmClient.AppNames())
 		flags := &CheckFlags{
-			Scope:               base.SelfScope,
-			MultiMetricsEnabled: true,
+			Scope: base.SelfScope,
 		}
 		{
 			checkResult := throttler.Check(ctx, throttlerapp.VitessName.String(), nil, flags)
@@ -2087,7 +1951,6 @@ func TestReplica(t *testing.T) {
 					checkResult := throttler.Check(ctx, throttlerapp.OnlineDDLName.String(), nil, flags)
 					require.NotNil(t, checkResult)
 					assert.EqualValues(t, 0.3, checkResult.Value) // self lag value
-					assert.EqualValues(t, http.StatusOK, checkResult.StatusCode)
 					assert.EqualValues(t, tabletmanagerdatapb.CheckThrottlerResponseCode_OK, checkResult.ResponseCode)
 					assert.Len(t, checkResult.Metrics, 1)
 					select {
@@ -2105,7 +1968,6 @@ func TestReplica(t *testing.T) {
 						checkResult := throttler.Check(ctx, throttlerapp.OnlineDDLName.String(), nil, flags)
 						require.NotNil(t, checkResult)
 						assert.EqualValues(t, 0.3, checkResult.Value) // self lag value
-						assert.EqualValues(t, http.StatusOK, checkResult.StatusCode)
 						assert.EqualValues(t, tabletmanagerdatapb.CheckThrottlerResponseCode_OK, checkResult.ResponseCode)
 						assert.Len(t, checkResult.Metrics, 1)
 						assert.True(t, checkResult.RecentlyChecked)
@@ -2113,7 +1975,6 @@ func TestReplica(t *testing.T) {
 						{
 							recentApp, ok := throttler.recentAppsSnapshot()[throttlerapp.OnlineDDLName.String()]
 							require.True(t, ok)
-							assert.EqualValues(t, http.StatusOK, recentApp.StatusCode)
 							assert.EqualValues(t, tabletmanagerdatapb.CheckThrottlerResponseCode_OK, recentApp.ResponseCode)
 						}
 					}
@@ -2144,29 +2005,9 @@ func TestReplica(t *testing.T) {
 					require.NotNil(t, checkResult)
 					// loadavg value exceeds threshold. This will show up in the check result as an error.
 					assert.EqualValues(t, 2.718, checkResult.Value, "unexpected result: %+v", checkResult) // self lag value
-					assert.NotEqualValues(t, http.StatusOK, checkResult.StatusCode, "unexpected result: %+v", checkResult)
 					assert.NotEqualValues(t, tabletmanagerdatapb.CheckThrottlerResponseCode_OK, checkResult.ResponseCode, "unexpected result: %+v", checkResult)
 					assert.Equal(t, len(base.KnownMetricNames), len(checkResult.Metrics))
 				})
-				t.Run("validate v20 non-multi-metric results", func(t *testing.T) {
-					flags := &CheckFlags{
-						Scope:               base.SelfScope,
-						MultiMetricsEnabled: false,
-					}
-					checkResult := throttler.Check(ctx, throttlerapp.VitessName.String(), nil, flags)
-					require.NotNil(t, checkResult)
-					// loadavg value exceeds threshold. But since "MultiMetricsEnabled: false", the
-					// throttler, acting as a replica, assumes it's being probed by a v20 primary, and
-					// therefore does not report any of the multi-metric errors back. It only ever
-					// reports the default metric.
-					assert.EqualValues(t, 0.3, checkResult.Value) // self lag value
-					assert.EqualValues(t, http.StatusOK, checkResult.StatusCode)
-					assert.EqualValues(t, tabletmanagerdatapb.CheckThrottlerResponseCode_OK, checkResult.ResponseCode)
-					assert.EqualValues(t, 0.75, checkResult.Threshold)
-					// The replica will still report the multi-metrics, and that's fine. As long
-					// as it does not reflect any of their values in the checkResult.Value/StatusCode/Threshold/Error/Message.
-					assert.Equal(t, len(base.KnownMetricNames), len(checkResult.Metrics))
-				})
 			})
 
 			t.Run("metrics", func(t *testing.T) {
diff --git a/proto/tabletmanagerdata.proto b/proto/tabletmanagerdata.proto
index 9ca4eb11b06..cda173ac044 100644
--- a/proto/tabletmanagerdata.proto
+++ b/proto/tabletmanagerdata.proto
@@ -824,9 +824,8 @@ message CheckThrottlerRequest {
   bool skip_request_heartbeats = 3;
   // OKIfNotExists asks the throttler to return OK even if the metric does not exist
   bool ok_if_not_exists = 4;
-  // MultiMetricsEnabled is always set to "true" and is how a multi-metrics enabled replica
-  // throttler knows its being probed by a multi-metrics enabled primary vttablet.
-  bool multi_metrics_enabled = 5;
+  reserved 5; // used to be multi_metrics_enabled, introduced in v21 for backwards compatibility, and removed in v22
+  reserved "multi_metrics_enabled";
 }
 
 enum CheckThrottlerResponseCode {
@@ -839,8 +838,8 @@ enum CheckThrottlerResponseCode {
 }
 
 message CheckThrottlerResponse {
-  // StatusCode is HTTP compliant response code (e.g. 200 for OK)
-  int32 status_code = 1;
+  reserved 1; // was `status_code`, HTTP compliant, deprecated
+  reserved "status_code";
   // Value is the metric value collected by the tablet
   double value = 2;
   // Threshold is the throttling threshold the table was comparing the value with
@@ -856,8 +855,7 @@ message CheckThrottlerResponse {
   message Metric {
     // Name of the metric
     string name = 1;
-    // StatusCode is HTTP compliant response code (e.g. 200 for OK)
-    int32 status_code = 2;
+    reserved 2; // was `status_code`, HTTP compliant, deprecated
     // Value is the metric value collected by the tablet
     double value = 3;
     // Threshold is the throttling threshold the table was comparing the value with
@@ -940,7 +938,7 @@ message GetThrottlerStatusResponse {
 
   message RecentApp {
     vttime.Time checked_at = 1;
-    int32 status_code = 2;
+    reserved 2; // was HTTP `status_code`, deprecated
     // ResponseCode is the enum representation of the response
     CheckThrottlerResponseCode response_code = 3;
   }
diff --git a/web/vtadmin/src/proto/vtadmin.d.ts b/web/vtadmin/src/proto/vtadmin.d.ts
index 2175e3508f4..527adc01326 100644
--- a/web/vtadmin/src/proto/vtadmin.d.ts
+++ b/web/vtadmin/src/proto/vtadmin.d.ts
@@ -35130,9 +35130,6 @@ export namespace tabletmanagerdata {
 
         /** CheckThrottlerRequest ok_if_not_exists */
         ok_if_not_exists?: (boolean|null);
-
-        /** CheckThrottlerRequest multi_metrics_enabled */
-        multi_metrics_enabled?: (boolean|null);
     }
 
     /** Represents a CheckThrottlerRequest. */
@@ -35156,9 +35153,6 @@ export namespace tabletmanagerdata {
         /** CheckThrottlerRequest ok_if_not_exists. */
         public ok_if_not_exists: boolean;
 
-        /** CheckThrottlerRequest multi_metrics_enabled. */
-        public multi_metrics_enabled: boolean;
-
         /**
          * Creates a new CheckThrottlerRequest instance using the specified properties.
          * @param [properties] Properties to set
@@ -35250,9 +35244,6 @@ export namespace tabletmanagerdata {
     /** Properties of a CheckThrottlerResponse. */
     interface ICheckThrottlerResponse {
 
-        /** CheckThrottlerResponse status_code */
-        status_code?: (number|null);
-
         /** CheckThrottlerResponse value */
         value?: (number|null);
 
@@ -35290,9 +35281,6 @@ export namespace tabletmanagerdata {
          */
         constructor(properties?: tabletmanagerdata.ICheckThrottlerResponse);
 
-        /** CheckThrottlerResponse status_code. */
-        public status_code: number;
-
         /** CheckThrottlerResponse value. */
         public value: number;
 
@@ -35406,9 +35394,6 @@ export namespace tabletmanagerdata {
             /** Metric name */
             name?: (string|null);
 
-            /** Metric status_code */
-            status_code?: (number|null);
-
             /** Metric value */
             value?: (number|null);
 
@@ -35440,9 +35425,6 @@ export namespace tabletmanagerdata {
             /** Metric name. */
             public name: string;
 
-            /** Metric status_code. */
-            public status_code: number;
-
             /** Metric value. */
             public value: number;
 
@@ -36044,9 +36026,6 @@ export namespace tabletmanagerdata {
             /** RecentApp checked_at */
             checked_at?: (vttime.ITime|null);
 
-            /** RecentApp status_code */
-            status_code?: (number|null);
-
             /** RecentApp response_code */
             response_code?: (tabletmanagerdata.CheckThrottlerResponseCode|null);
         }
@@ -36063,9 +36042,6 @@ export namespace tabletmanagerdata {
             /** RecentApp checked_at. */
             public checked_at?: (vttime.ITime|null);
 
-            /** RecentApp status_code. */
-            public status_code: number;
-
             /** RecentApp response_code. */
             public response_code: tabletmanagerdata.CheckThrottlerResponseCode;
 
diff --git a/web/vtadmin/src/proto/vtadmin.js b/web/vtadmin/src/proto/vtadmin.js
index 17a941acfcf..1209c59cbe9 100644
--- a/web/vtadmin/src/proto/vtadmin.js
+++ b/web/vtadmin/src/proto/vtadmin.js
@@ -81562,7 +81562,6 @@ export const tabletmanagerdata = $root.tabletmanagerdata = (() => {
          * @property {string|null} [scope] CheckThrottlerRequest scope
          * @property {boolean|null} [skip_request_heartbeats] CheckThrottlerRequest skip_request_heartbeats
          * @property {boolean|null} [ok_if_not_exists] CheckThrottlerRequest ok_if_not_exists
-         * @property {boolean|null} [multi_metrics_enabled] CheckThrottlerRequest multi_metrics_enabled
          */
 
         /**
@@ -81612,14 +81611,6 @@ export const tabletmanagerdata = $root.tabletmanagerdata = (() => {
          */
         CheckThrottlerRequest.prototype.ok_if_not_exists = false;
 
-        /**
-         * CheckThrottlerRequest multi_metrics_enabled.
-         * @member {boolean} multi_metrics_enabled
-         * @memberof tabletmanagerdata.CheckThrottlerRequest
-         * @instance
-         */
-        CheckThrottlerRequest.prototype.multi_metrics_enabled = false;
-
         /**
          * Creates a new CheckThrottlerRequest instance using the specified properties.
          * @function create
@@ -81652,8 +81643,6 @@ export const tabletmanagerdata = $root.tabletmanagerdata = (() => {
                 writer.uint32(/* id 3, wireType 0 =*/24).bool(message.skip_request_heartbeats);
             if (message.ok_if_not_exists != null && Object.hasOwnProperty.call(message, "ok_if_not_exists"))
                 writer.uint32(/* id 4, wireType 0 =*/32).bool(message.ok_if_not_exists);
-            if (message.multi_metrics_enabled != null && Object.hasOwnProperty.call(message, "multi_metrics_enabled"))
-                writer.uint32(/* id 5, wireType 0 =*/40).bool(message.multi_metrics_enabled);
             return writer;
         };
 
@@ -81704,10 +81693,6 @@ export const tabletmanagerdata = $root.tabletmanagerdata = (() => {
                         message.ok_if_not_exists = reader.bool();
                         break;
                     }
-                case 5: {
-                        message.multi_metrics_enabled = reader.bool();
-                        break;
-                    }
                 default:
                     reader.skipType(tag & 7);
                     break;
@@ -81755,9 +81740,6 @@ export const tabletmanagerdata = $root.tabletmanagerdata = (() => {
             if (message.ok_if_not_exists != null && message.hasOwnProperty("ok_if_not_exists"))
                 if (typeof message.ok_if_not_exists !== "boolean")
                     return "ok_if_not_exists: boolean expected";
-            if (message.multi_metrics_enabled != null && message.hasOwnProperty("multi_metrics_enabled"))
-                if (typeof message.multi_metrics_enabled !== "boolean")
-                    return "multi_metrics_enabled: boolean expected";
             return null;
         };
 
@@ -81781,8 +81763,6 @@ export const tabletmanagerdata = $root.tabletmanagerdata = (() => {
                 message.skip_request_heartbeats = Boolean(object.skip_request_heartbeats);
             if (object.ok_if_not_exists != null)
                 message.ok_if_not_exists = Boolean(object.ok_if_not_exists);
-            if (object.multi_metrics_enabled != null)
-                message.multi_metrics_enabled = Boolean(object.multi_metrics_enabled);
             return message;
         };
 
@@ -81804,7 +81784,6 @@ export const tabletmanagerdata = $root.tabletmanagerdata = (() => {
                 object.scope = "";
                 object.skip_request_heartbeats = false;
                 object.ok_if_not_exists = false;
-                object.multi_metrics_enabled = false;
             }
             if (message.app_name != null && message.hasOwnProperty("app_name"))
                 object.app_name = message.app_name;
@@ -81814,8 +81793,6 @@ export const tabletmanagerdata = $root.tabletmanagerdata = (() => {
                 object.skip_request_heartbeats = message.skip_request_heartbeats;
             if (message.ok_if_not_exists != null && message.hasOwnProperty("ok_if_not_exists"))
                 object.ok_if_not_exists = message.ok_if_not_exists;
-            if (message.multi_metrics_enabled != null && message.hasOwnProperty("multi_metrics_enabled"))
-                object.multi_metrics_enabled = message.multi_metrics_enabled;
             return object;
         };
 
@@ -81876,7 +81853,6 @@ export const tabletmanagerdata = $root.tabletmanagerdata = (() => {
          * Properties of a CheckThrottlerResponse.
          * @memberof tabletmanagerdata
          * @interface ICheckThrottlerResponse
-         * @property {number|null} [status_code] CheckThrottlerResponse status_code
          * @property {number|null} [value] CheckThrottlerResponse value
          * @property {number|null} [threshold] CheckThrottlerResponse threshold
          * @property {string|null} [error] CheckThrottlerResponse error
@@ -81904,14 +81880,6 @@ export const tabletmanagerdata = $root.tabletmanagerdata = (() => {
                         this[keys[i]] = properties[keys[i]];
         }
 
-        /**
-         * CheckThrottlerResponse status_code.
-         * @member {number} status_code
-         * @memberof tabletmanagerdata.CheckThrottlerResponse
-         * @instance
-         */
-        CheckThrottlerResponse.prototype.status_code = 0;
-
         /**
          * CheckThrottlerResponse value.
          * @member {number} value
@@ -82008,8 +81976,6 @@ export const tabletmanagerdata = $root.tabletmanagerdata = (() => {
         CheckThrottlerResponse.encode = function encode(message, writer) {
             if (!writer)
                 writer = $Writer.create();
-            if (message.status_code != null && Object.hasOwnProperty.call(message, "status_code"))
-                writer.uint32(/* id 1, wireType 0 =*/8).int32(message.status_code);
             if (message.value != null && Object.hasOwnProperty.call(message, "value"))
                 writer.uint32(/* id 2, wireType 1 =*/17).double(message.value);
             if (message.threshold != null && Object.hasOwnProperty.call(message, "threshold"))
@@ -82065,10 +82031,6 @@ export const tabletmanagerdata = $root.tabletmanagerdata = (() => {
             while (reader.pos < end) {
                 let tag = reader.uint32();
                 switch (tag >>> 3) {
-                case 1: {
-                        message.status_code = reader.int32();
-                        break;
-                    }
                 case 2: {
                         message.value = reader.double();
                         break;
@@ -82159,9 +82121,6 @@ export const tabletmanagerdata = $root.tabletmanagerdata = (() => {
         CheckThrottlerResponse.verify = function verify(message) {
             if (typeof message !== "object" || message === null)
                 return "object expected";
-            if (message.status_code != null && message.hasOwnProperty("status_code"))
-                if (!$util.isInteger(message.status_code))
-                    return "status_code: integer expected";
             if (message.value != null && message.hasOwnProperty("value"))
                 if (typeof message.value !== "number")
                     return "value: number expected";
@@ -82220,8 +82179,6 @@ export const tabletmanagerdata = $root.tabletmanagerdata = (() => {
             if (object instanceof $root.tabletmanagerdata.CheckThrottlerResponse)
                 return object;
             let message = new $root.tabletmanagerdata.CheckThrottlerResponse();
-            if (object.status_code != null)
-                message.status_code = object.status_code | 0;
             if (object.value != null)
                 message.value = Number(object.value);
             if (object.threshold != null)
@@ -82297,7 +82254,6 @@ export const tabletmanagerdata = $root.tabletmanagerdata = (() => {
             if (options.objects || options.defaults)
                 object.metrics = {};
             if (options.defaults) {
-                object.status_code = 0;
                 object.value = 0;
                 object.threshold = 0;
                 object.error = "";
@@ -82307,8 +82263,6 @@ export const tabletmanagerdata = $root.tabletmanagerdata = (() => {
                 object.summary = "";
                 object.response_code = options.enums === String ? "UNDEFINED" : 0;
             }
-            if (message.status_code != null && message.hasOwnProperty("status_code"))
-                object.status_code = message.status_code;
             if (message.value != null && message.hasOwnProperty("value"))
                 object.value = options.json && !isFinite(message.value) ? String(message.value) : message.value;
             if (message.threshold != null && message.hasOwnProperty("threshold"))
@@ -82367,7 +82321,6 @@ export const tabletmanagerdata = $root.tabletmanagerdata = (() => {
              * @memberof tabletmanagerdata.CheckThrottlerResponse
              * @interface IMetric
              * @property {string|null} [name] Metric name
-             * @property {number|null} [status_code] Metric status_code
              * @property {number|null} [value] Metric value
              * @property {number|null} [threshold] Metric threshold
              * @property {string|null} [error] Metric error
@@ -82399,14 +82352,6 @@ export const tabletmanagerdata = $root.tabletmanagerdata = (() => {
              */
             Metric.prototype.name = "";
 
-            /**
-             * Metric status_code.
-             * @member {number} status_code
-             * @memberof tabletmanagerdata.CheckThrottlerResponse.Metric
-             * @instance
-             */
-            Metric.prototype.status_code = 0;
-
             /**
              * Metric value.
              * @member {number} value
@@ -82481,8 +82426,6 @@ export const tabletmanagerdata = $root.tabletmanagerdata = (() => {
                     writer = $Writer.create();
                 if (message.name != null && Object.hasOwnProperty.call(message, "name"))
                     writer.uint32(/* id 1, wireType 2 =*/10).string(message.name);
-                if (message.status_code != null && Object.hasOwnProperty.call(message, "status_code"))
-                    writer.uint32(/* id 2, wireType 0 =*/16).int32(message.status_code);
                 if (message.value != null && Object.hasOwnProperty.call(message, "value"))
                     writer.uint32(/* id 3, wireType 1 =*/25).double(message.value);
                 if (message.threshold != null && Object.hasOwnProperty.call(message, "threshold"))
@@ -82533,10 +82476,6 @@ export const tabletmanagerdata = $root.tabletmanagerdata = (() => {
                             message.name = reader.string();
                             break;
                         }
-                    case 2: {
-                            message.status_code = reader.int32();
-                            break;
-                        }
                     case 3: {
                             message.value = reader.double();
                             break;
@@ -82599,9 +82538,6 @@ export const tabletmanagerdata = $root.tabletmanagerdata = (() => {
                 if (message.name != null && message.hasOwnProperty("name"))
                     if (!$util.isString(message.name))
                         return "name: string expected";
-                if (message.status_code != null && message.hasOwnProperty("status_code"))
-                    if (!$util.isInteger(message.status_code))
-                        return "status_code: integer expected";
                 if (message.value != null && message.hasOwnProperty("value"))
                     if (typeof message.value !== "number")
                         return "value: number expected";
@@ -82646,8 +82582,6 @@ export const tabletmanagerdata = $root.tabletmanagerdata = (() => {
                 let message = new $root.tabletmanagerdata.CheckThrottlerResponse.Metric();
                 if (object.name != null)
                     message.name = String(object.name);
-                if (object.status_code != null)
-                    message.status_code = object.status_code | 0;
                 if (object.value != null)
                     message.value = Number(object.value);
                 if (object.threshold != null)
@@ -82708,7 +82642,6 @@ export const tabletmanagerdata = $root.tabletmanagerdata = (() => {
                 let object = {};
                 if (options.defaults) {
                     object.name = "";
-                    object.status_code = 0;
                     object.value = 0;
                     object.threshold = 0;
                     object.error = "";
@@ -82718,8 +82651,6 @@ export const tabletmanagerdata = $root.tabletmanagerdata = (() => {
                 }
                 if (message.name != null && message.hasOwnProperty("name"))
                     object.name = message.name;
-                if (message.status_code != null && message.hasOwnProperty("status_code"))
-                    object.status_code = message.status_code;
                 if (message.value != null && message.hasOwnProperty("value"))
                     object.value = options.json && !isFinite(message.value) ? String(message.value) : message.value;
                 if (message.threshold != null && message.hasOwnProperty("threshold"))
@@ -84249,7 +84180,6 @@ export const tabletmanagerdata = $root.tabletmanagerdata = (() => {
              * @memberof tabletmanagerdata.GetThrottlerStatusResponse
              * @interface IRecentApp
              * @property {vttime.ITime|null} [checked_at] RecentApp checked_at
-             * @property {number|null} [status_code] RecentApp status_code
              * @property {tabletmanagerdata.CheckThrottlerResponseCode|null} [response_code] RecentApp response_code
              */
 
@@ -84276,14 +84206,6 @@ export const tabletmanagerdata = $root.tabletmanagerdata = (() => {
              */
             RecentApp.prototype.checked_at = null;
 
-            /**
-             * RecentApp status_code.
-             * @member {number} status_code
-             * @memberof tabletmanagerdata.GetThrottlerStatusResponse.RecentApp
-             * @instance
-             */
-            RecentApp.prototype.status_code = 0;
-
             /**
              * RecentApp response_code.
              * @member {tabletmanagerdata.CheckThrottlerResponseCode} response_code
@@ -84318,8 +84240,6 @@ export const tabletmanagerdata = $root.tabletmanagerdata = (() => {
                     writer = $Writer.create();
                 if (message.checked_at != null && Object.hasOwnProperty.call(message, "checked_at"))
                     $root.vttime.Time.encode(message.checked_at, writer.uint32(/* id 1, wireType 2 =*/10).fork()).ldelim();
-                if (message.status_code != null && Object.hasOwnProperty.call(message, "status_code"))
-                    writer.uint32(/* id 2, wireType 0 =*/16).int32(message.status_code);
                 if (message.response_code != null && Object.hasOwnProperty.call(message, "response_code"))
                     writer.uint32(/* id 3, wireType 0 =*/24).int32(message.response_code);
                 return writer;
@@ -84360,10 +84280,6 @@ export const tabletmanagerdata = $root.tabletmanagerdata = (() => {
                             message.checked_at = $root.vttime.Time.decode(reader, reader.uint32());
                             break;
                         }
-                    case 2: {
-                            message.status_code = reader.int32();
-                            break;
-                        }
                     case 3: {
                             message.response_code = reader.int32();
                             break;
@@ -84408,9 +84324,6 @@ export const tabletmanagerdata = $root.tabletmanagerdata = (() => {
                     if (error)
                         return "checked_at." + error;
                 }
-                if (message.status_code != null && message.hasOwnProperty("status_code"))
-                    if (!$util.isInteger(message.status_code))
-                        return "status_code: integer expected";
                 if (message.response_code != null && message.hasOwnProperty("response_code"))
                     switch (message.response_code) {
                     default:
@@ -84443,8 +84356,6 @@ export const tabletmanagerdata = $root.tabletmanagerdata = (() => {
                         throw TypeError(".tabletmanagerdata.GetThrottlerStatusResponse.RecentApp.checked_at: object expected");
                     message.checked_at = $root.vttime.Time.fromObject(object.checked_at);
                 }
-                if (object.status_code != null)
-                    message.status_code = object.status_code | 0;
                 switch (object.response_code) {
                 default:
                     if (typeof object.response_code === "number") {
@@ -84495,13 +84406,10 @@ export const tabletmanagerdata = $root.tabletmanagerdata = (() => {
                 let object = {};
                 if (options.defaults) {
                     object.checked_at = null;
-                    object.status_code = 0;
                     object.response_code = options.enums === String ? "UNDEFINED" : 0;
                 }
                 if (message.checked_at != null && message.hasOwnProperty("checked_at"))
                     object.checked_at = $root.vttime.Time.toObject(message.checked_at, options);
-                if (message.status_code != null && message.hasOwnProperty("status_code"))
-                    object.status_code = message.status_code;
                 if (message.response_code != null && message.hasOwnProperty("response_code"))
                     object.response_code = options.enums === String ? $root.tabletmanagerdata.CheckThrottlerResponseCode[message.response_code] === undefined ? message.response_code : $root.tabletmanagerdata.CheckThrottlerResponseCode[message.response_code] : message.response_code;
                 return object;

From 10a69160202b55c59410b349f38572f345420dd2 Mon Sep 17 00:00:00 2001
From: Shlomi Noach <2607934+shlomi-noach@users.noreply.github.com>
Date: Thu, 6 Feb 2025 14:45:10 +0200
Subject: [PATCH 34/68] schemadiff: `ViewDependencyUnresolvedError` lists
 missing referenced entities (#17711)

Signed-off-by: Shlomi Noach <2607934+shlomi-noach@users.noreply.github.com>
Signed-off-by: Dirkjan Bussink <d.bussink@gmail.com>
Co-authored-by: Dirkjan Bussink <d.bussink@gmail.com>
---
 go/vt/schemadiff/errors.go      | 13 +++++++++++--
 go/vt/schemadiff/schema.go      |  9 ++++++++-
 go/vt/schemadiff/schema_test.go | 22 ++++++++++++++++++----
 3 files changed, 37 insertions(+), 7 deletions(-)

diff --git a/go/vt/schemadiff/errors.go b/go/vt/schemadiff/errors.go
index 74d1c231a19..cb015c42f52 100644
--- a/go/vt/schemadiff/errors.go
+++ b/go/vt/schemadiff/errors.go
@@ -389,11 +389,20 @@ func (e *IndexNeededByForeignKeyError) Error() string {
 }
 
 type ViewDependencyUnresolvedError struct {
-	View string
+	View                      string
+	MissingReferencedEntities []string
 }
 
 func (e *ViewDependencyUnresolvedError) Error() string {
-	return fmt.Sprintf("view %s has unresolved/loop dependencies", sqlescape.EscapeID(e.View))
+	var b strings.Builder
+	fmt.Fprintf(&b, "view %s has unresolved/loop dependencies: ", sqlescape.EscapeID(e.View))
+	for i, entity := range e.MissingReferencedEntities {
+		if i > 0 {
+			b.WriteString(", ")
+		}
+		sqlescape.WriteEscapeID(&b, entity)
+	}
+	return b.String()
 }
 
 type InvalidColumnReferencedInViewError struct {
diff --git a/go/vt/schemadiff/schema.go b/go/vt/schemadiff/schema.go
index c251779061c..658fdab37c5 100644
--- a/go/vt/schemadiff/schema.go
+++ b/go/vt/schemadiff/schema.go
@@ -341,7 +341,14 @@ func (s *Schema) normalize(hints *DiffHints) error {
 			if _, ok := dependencyLevels[v.Name()]; !ok {
 				// We _know_ that in this iteration, at least one view is found unassigned a dependency level.
 				// We gather all the errors.
-				errs = errors.Join(errs, &ViewDependencyUnresolvedError{View: v.ViewName.Name.String()})
+				dependentNames := getViewDependentTableNames(v.CreateView)
+				missingReferencedEntities := []string{}
+				for _, name := range dependentNames {
+					if _, ok := dependencyLevels[name]; !ok {
+						missingReferencedEntities = append(missingReferencedEntities, name)
+					}
+				}
+				errs = errors.Join(errs, &ViewDependencyUnresolvedError{View: v.ViewName.Name.String(), MissingReferencedEntities: missingReferencedEntities})
 				// We still add it so it shows up in the output if that is used for anything.
 				s.sorted = append(s.sorted, v)
 			}
diff --git a/go/vt/schemadiff/schema_test.go b/go/vt/schemadiff/schema_test.go
index 43cfcf78bdc..1c98e71011b 100644
--- a/go/vt/schemadiff/schema_test.go
+++ b/go/vt/schemadiff/schema_test.go
@@ -119,12 +119,26 @@ func TestNewSchemaFromQueriesUnresolved(t *testing.T) {
 	)
 	schema, err := NewSchemaFromQueries(NewTestEnv(), queries)
 	assert.Error(t, err)
-	assert.EqualError(t, err, (&ViewDependencyUnresolvedError{View: "v7"}).Error())
+	assert.EqualError(t, err, (&ViewDependencyUnresolvedError{View: "v7", MissingReferencedEntities: []string{"v8"}}).Error())
 	v := schema.sorted[len(schema.sorted)-1]
 	assert.IsType(t, &CreateViewEntity{}, v)
 	assert.Equal(t, "CREATE VIEW `v7` AS SELECT * FROM `v8`, `t2`", v.Create().CanonicalStatementString())
 }
 
+func TestNewSchemaFromQueriesUnresolvedMulti(t *testing.T) {
+	// v8 does not exist
+	queries := append(schemaTestCreateQueries,
+		"create view v7 as select * from v8, t2, t20, v21",
+	)
+	schema, err := NewSchemaFromQueries(NewTestEnv(), queries)
+	assert.Error(t, err)
+	assert.EqualError(t, err, (&ViewDependencyUnresolvedError{View: "v7", MissingReferencedEntities: []string{"v8", "t20", "v21"}}).Error())
+	assert.Equal(t, "view `v7` has unresolved/loop dependencies: `v8`, `t20`, `v21`", err.Error())
+	v := schema.sorted[len(schema.sorted)-1]
+	assert.IsType(t, &CreateViewEntity{}, v)
+	assert.Equal(t, "CREATE VIEW `v7` AS SELECT * FROM `v8`, `t2`, `t20`, `v21`", v.Create().CanonicalStatementString())
+}
+
 func TestNewSchemaFromQueriesWithSQLKeyword(t *testing.T) {
 	queries := []string{
 		"create table `order` (id int primary key, info int not null)",
@@ -141,7 +155,7 @@ func TestNewSchemaFromQueriesUnresolvedAlias(t *testing.T) {
 	)
 	_, err := NewSchemaFromQueries(NewTestEnv(), queries)
 	assert.Error(t, err)
-	assert.EqualError(t, err, (&ViewDependencyUnresolvedError{View: "v7"}).Error())
+	assert.EqualError(t, err, (&ViewDependencyUnresolvedError{View: "v7", MissingReferencedEntities: []string{"something_else"}}).Error())
 }
 
 func TestNewSchemaFromQueriesViewFromDual(t *testing.T) {
@@ -171,7 +185,7 @@ func TestNewSchemaFromQueriesLoop(t *testing.T) {
 	_, err := NewSchemaFromQueries(NewTestEnv(), queries)
 	require.Error(t, err)
 	err = vterrors.UnwrapFirst(err)
-	assert.EqualError(t, err, (&ViewDependencyUnresolvedError{View: "v7"}).Error())
+	assert.EqualError(t, err, (&ViewDependencyUnresolvedError{View: "v7", MissingReferencedEntities: []string{"v8"}}).Error())
 }
 
 func TestToSQL(t *testing.T) {
@@ -582,7 +596,7 @@ SELECT
     ) AS ranking
 FROM users AS u JOIN earnings AS e ON e.user_id = u.id;
 `,
-			expectErr: &ViewDependencyUnresolvedError{View: "user_earnings_ranking"},
+			expectErr: &ViewDependencyUnresolvedError{View: "user_earnings_ranking", MissingReferencedEntities: []string{"earnings"}},
 		},
 	}
 	for _, ts := range tt {

From 4c9de0b96d1b028d00c04f0c8001a8a8624aeb1a Mon Sep 17 00:00:00 2001
From: Rohit Nayak <57520317+rohit-nayak-ps@users.noreply.github.com>
Date: Sat, 8 Feb 2025 21:53:00 +0100
Subject: [PATCH 35/68] VTAdmin: update logo and favicon for the new Vitess
 logos (#17715)

Signed-off-by: Rohit Nayak <rohit@planetscale.com>
---
 web/vtadmin/public/favicon.ico                | Bin 25715 -> 224318 bytes
 .../src/components/NavRail.module.scss        |   3 +-
 web/vtadmin/src/components/NavRail.tsx        |   3 -
 web/vtadmin/src/components/VitessLogo.tsx     |  61 +++++++++---------
 4 files changed, 32 insertions(+), 35 deletions(-)

diff --git a/web/vtadmin/public/favicon.ico b/web/vtadmin/public/favicon.ico
index ecd6c9efcc3756418114b60938e95c04b6194ce9..209eff7d8f5685d7c2dff1bd790f4027bc13eadc 100644
GIT binary patch
literal 224318
zcmeHQ378bswJzvk29Z^Eh8aKvH$YKDMOg#{hGAC3Er}ZQ;u3v66Ju5r(P&)Q-1GAC
zjJrl7=H;3AvY3b);FiRFOLPQfN1?0NS-RhUZq@CsuCA)?p6RW+PxBqBs&997)v5E}
z|D1Ery`w0-@b4`}!T;lx!!GqGBd~uMgx*tnYwy#p((F+tPE&-4WB#wGHPEyss<f<)
zD$Q{jg#9BS$3kkFZ;ke*Hu@Y1zgPpTfn*H;Cra}=U?h&C!NAS=kf$M^LUuylhTIN0
zk}%f@slS;qm8?yEr(8AAcnfd@o&iRLG_8wPV!saZCrCRaY9Vjoy^{%3%Ynfa*z$`t
zQ0^LN1di%;EG@cG;AuK=@=M5m3k;cYwGp2g4H2AH?z-grFJBE%+_RkgJ77VNm1?nn
z4P-0Cj2pY-E_{~!L8Xa(zVbDuGQM+)k4Rc*3miZw*YGvS-ywFmaeDv1npQ`Z*1Oo>
zD`T@N%Ud_%sO6SuAK+&R<PQ+L7|97ovhDH4)zRJ!z!bk&1LdHB7Wj58uy^1_nQ@8O
z9)<m1K=wf-F1ov2zwD-{r~U@UQ#sgDIp1R|Fw`LZI&C`^`1vv9lPus!;*arE&PG-S
z_r7SAmSZrCBMk(8z6$wU7IDOQDg#?8_ge&BWS)U)7br$r1o=HA43QYf=9c-X+>NdT
z@4pFSvdiw!#(^4We0FVg8sz7YFLHz<iAly&3EES+-cmjC)GZkM0cJ#v1AM${>|X_G
z%Q21^PvvTKC3xQrKiBXh#*;K3ZvgOfF67lb;fV26f_7Dow*<VzYgX4qD{#CJ@+2fz
zF_OfN)t3Feax}scxM!;6KIL}Jw_C2&+)V|Beg^p*VrA?3c#rW^0=897x6mgXACJ{*
z?ZyB<KY)B(KpaV|GM>uG7+rp^a?YMUpMqkfuRvabM2Y}Qgek_8%WbUGFMq{K#7FSw
zsLmAjN?VGN7C`<N5`su>D26TLsniY9#rM~Wx}bSFj#_RLc$xzI+y&WNWH^#oW<0sr
z-b(e-6XwTi`EQ!1_dUo*MT(<>;i&=hwob#Cb*rA65%s>%nVio>TYi<N24sz$o@XHc
zu0Q0<ke4CF5+h0MSZ(vhPeNCe*VJ;Ga@!ZjgP^}E`F_Jsk-q`A^Q(L`Z~?|+u}*{1
ztknk5{5}uxa|-0QkRZg$c8l@7oZ{&`#FCBB6LAo9qKQ_QNOMjo$4Rw`H1Ga*kZ(h3
zAxbOp7q<K=eGSm_{`&7V+h{^9IF65i+yU7GDMrjVT~ki*bQ<(Rb%>OgflkDnVr+*%
z8X*rrwn40}i+Ft&eXrvFsB#w0!>`iRKr5cH;3TpSO-5n+UC2KnR<_}W_p*v7^4VIo
zK1S$>=KexAheED^yZ{M6Qt9P2eCA+?vK+#%($WB7h}LT`tl4lNp7q&~%@8-lNKW?K
zV?5FLfZ(EdKSNleu{Nrs`cFt3#OWHW+I~#&7W;gqgC&ZQU<WZA!KbGfX)fdmh?`<0
zD|?mibsJA)?+vmx9{bB^y|OjY@zBkMkf$MDi2R*Qw|_;BqCe$%_~m{Lzz$^oNuf3F
zaC|uAHpp&BrnXVcpU)UiB2P!T7}Aj@2Vi>=WG&=<2(3fb(|djsSQ^QAayOPJ4<+m+
zZYv{U8&^Wy93wf|c3OC9##qsEa8b<X)yAx8jE%+ysO}@%<JIo~OQRT1?!^;qLiV?`
zr5Nc<2<39K(ce1RbRpXu@g&wLGw20)s)Rm{fm{oD9nucT#q~3uTnZ(@N19JZ`CW>U
z=0Mg%(#b{T!j|%RPFp<T{*C?1FdVl+9)awD<oX&JPcFj~`7UQ*%?2??RvVW+40duW
zq|{<0C)-bjr-9H1<+@*jgdk4m%4Qqm$t8HAd3~^pxU7p(j6^o`K_2ZTo3_`JbEU%5
zROsaM0_cVD<N`cVd`klRAn6A=9r7Zilw%|(ysdA*`mmJiHou?~($O?XwsQ?m*CX2)
zPv!?wM8~4;MURm%=1wuv$&kk(<q#uD8;x(*MWgU{qtMG^r>^YuEV(X{^t7NG##543
z%KMFa<aN)~=LJxlgxteq*vUG`E=b(I%4DA~g!}GV`qR$PtZ({*M}Fn=2Zt}%>X~%r
zt|UXj=NL~(S}D&r1Rv>Rj^y6~N5f$s--6J1V_D*;ado6);nnT_V=mn9J-BsOpnA#n
z=$OUZ*4HfE;;C8sNs^&3o|05jc5k%OoLIxyJ#cgYWCd)4YB9?yM$)+`Qh#Gtc=nY6
z^@uNj?yFt4BRppD_DJ>O?NP!L1bEu&sjX)`l^s}8+_3QH^uO7M^^2*lc^2d`h#yim
zoTSG^or|vN2psnfRXt?+?!ef(?VZ4p#E@}YmUx1WlxEa>(BEZ*ZHOF|@MG|IdzPba
zQ;8<$XHuA7$uu|K34O@AOsx)P5_Gf%va@V(q~#YP%WmpwpZmR_Z_2q}sN))ThKP%7
za3nER7I+eC<WM|l@LdQ;&Dt6t2LekpN4SriBTRK?^%#>Zr<a&VK|0X|ejSbB{|Dqf
zNLlca@afh>yO#W<BY6D3`@EA*-{S`tb)>+M#1d^w7Edc4)A(np8AEHudQ&tHxCL?x
z<S!7aEBiI%e8>>uDw5^+ZmGW-Z-Sn1pN4T+s&8Hnc@EMEDQzt2x$cIWBkiaBAmlsh
z{C(>9rkx>Rqbma(NlcX#o*Jlc1?SKldlMItjT`|XygUe@vHLK@Y%63xzky7Eh`zd%
z@dOTv)qgKr7mJa8g?lgg7)j4Bbk$wo89ecFzk2AId;K*_ceHl{LlR3R!B6zJP*+eN
ztB)@d4rpF4@H80vCqS-*JO%j-l5S4wQG9;@VY0OZ*IR-f67+@RLm;al`KZk__hETG
zCLA@cigYaaQP@BI>-*ISExUr<<RT-E<i0EUNpKHro%&a@4HA8BJ<TDhgWLe2x|i<O
zO3{2#@&`)_Pc5_-0dcp~+ZqugU54X#A$hgyeEy!!MUna&x<V&i5l|2R(q3O}z2G8a
zu3KWFCtKIyDP{|>3E+w5k5K;UY{-8@-hyPS=H=G2wEULqUA_j~hl~lKAHoy)zcgRq
zSxCvoNQ9%N)sfCqSGN0)y~wLhY~4-cu6DWZp5RD+*R6P>+|wlxnpg7)qyv)e{`J@B
z%PVkRSL2DUU-CFGMdL{113wJ$L9(s0f}c-t(Yk148OB}bd?%=)21u=4w$nWBD(yep
zTesqA9&91kG4m7n4cFp{Fw{V6dSFZ3gzZGgO^}j|kpvg5iFPi&wj(g}5{$d95aX_y
z<hrwgt)jvc=|uD|YooM&gynp9vJc372;<3uInTr2kQKRa87Hla4u!5Rg}ehPIDcgI
z8Z>)}G~C?PKJWV>-_-Lk?%If4_u_8lx=R92I));YbD_Rv*5&@du@`#pYg!elY+h|!
z_s)1SVQB^RGsto3Tts<?zOdaU$TN_Vijnj_w`<9D9l;YW^Qn{1z_{zu9r@-WEBqCN
zpQJvho`dq1#LtJFz1K%I9f%jBV-{_@bNV;-E1N9peqbBSPbMshzp0>)7qqU9_JWRP
zLTH>#g_H&->Anm4-S+uE4EvA%+CFtcQ&w}`R`|&Dz5L)w*9FFiI%%%Ryzhm4(=XVs
zPFk_YU!&(OP2*^HRX1-}z}qIvQA9id8)1HeX2g2MdJa<0gC7jt+z8oLDmapTuRg~}
zJ?yN#K4~-5_ZFGt3{TRJL%y<u>Y*s_PyX$}ExV{bm$=!fwvh3Z)RV;Dn1?laV}2d@
z8oE9R`1uBe#tTY<kH~(+9HSp&j?o2}W0c)-*IeN+t9TN9338QG3w7$%?E&&_X`aY<
ziV<br-@4A-e1D~bC-|&qU5%VI&3&NwhVlfE?!LtLHJ_Kbx(d<=p&G<oj2Yw=o5Fsu
zhB=M9p8RdwIYwq%DW>C|;Ys)7@GQG%o)y&-(zqGLhcwr!2YD9P;%PbZYZq@w<PYda
zX+cd?i=MxxW5N`1OuBPJ#5r^vAzq>w={U#(5HBRJcAxFvBOFmIuxMp_V8+E>??lWo
zs<xkFR806WUrWY#qI=iwKhjxuU1xC4l|fOHOFGbVEKYu$`S<OPU4tjeP0R68*qMy)
zh==;%nChQqLnvQ;C**F(RgmNHx5H>1layQ~=8(wTw|4#s_})(;RFCLd9O-sMbBw}s
zzneJ6$S~j4&OVCu{j~5T@11hmG*6N0aWU@f6ZsX{kEG|vrK^Xc#gnLEx5g0F@Q|%9
zfqWlA^FQ8(?1z}`p4Kn9791sNZmoR3m57lNaJokP{j7`dy*Dk+XFh+?9&3Fu#$A8X
z5jg%*Rpg{HoMV)(4He>Zws=A;h#J$#RMc&3UvO2J=K6Y3)9$Nn*cnDF)SbB@ncSZn
z@I?4I971()*FmU;{Ub=a^@B7fbPasB3L~D*GRzr9yNr<<u>Ul~oiUQ;(}=j5VuEQj
z$4HB*b8SbN*jzR~Yl|o3B^8Vb9SJ|~Q{*R8<>Rt(Eyi;c1)k8CCe<4m=7oF(_Dy-|
zc1U;mU<bZChw!urwco@?joMnp3dWHLOEVz%L0lOl5f|awyC^Qu<{0hqWnqqy(N2nM
zzi#{b+Im`#Ws9+k6#K|$E0AgMW%m{!$De;Z>2V=!AOg%p!OM>=xvsMUxuyi&$T{(_
zlW#$~izDOrRtdjOACJ}Z;Nx*_;=E6@^c%+C%lSUxNX#+1O3X3xPG~N=ao6nOuuhDD
zMaG=^S!CqAPaYmR^KH+_IUgk03>^SNB-0?Ji6<RDh+!f$&VhNFA@W6LUaEQ#8-~Ek
zkJK*PUV(9s1l<_$^vx{U`v0EwqgWn;=0IKmc_T~b&N+7EbxJP6xT_dzq&Y@KJnq^v
zJZTu}8olt-(D0K#@(rH;wtC>?*TQ`#y!2?V>gPPY$G@0hGo^?pdfxgok2IiW1@Ulj
z4)RLK?|TnFd#|7R(6My}zjpDqC#sixR#ClpTY_$KfTus|IXs$=|0Kj!F%s#N#_TcP
z=tte<{)w%-{OE&oImf7HSm<s|1z~9Mw$4%Ww*-fs_@Qs$)Hl_BhrAM~8n?Nls%BH9
zs&-Qpvc7li3m&ER`2?FO1w0w>(?vO18rwMeihvJuoV|x)d<=ESVT^G&#f2K4mgE6X
zYooM2%rmmDFZQkIm%!^7a}3eij(MJAlpj1vKW@=y?IY*41r9pyeRaSQ|L`4f@XI0K
zrV|(<{FtRQ@T7AOo-@ThorrnDRA-AA*f;H~`_w~D+fC!k?XurA)e71@pM2u!W?(4d
z1{{fT*K0fc$6ca&Nv|c8>yDy-C0igrE<9rPNB+UbyrUj?=-+(s<HEpBmkoxDm~tJS
zfEgMqoe%L_#6Ieg=X~yi&k-QsopeLkNfSS2T;&r_|14T8X?>L#cQwv2f=){#*Dd|H
z1zSVIX8qGQ=%}~Uev@7e^c}akUHEa<JY>X>ao=@#!dRHH@JHdfn9IC##zkHq;$AKG
z(dNHswHetNTh1q*dXjU`NzMWNRTOa@%`u`nOz-5=_xOrrj*+?F%j`Jj$8GCCJ}xly
z_z%<pN4~BeF!7b3gCA$ajMIK`;|V!N^9$n_3gi@U&;A~8Pdd*apLog%CNkzc-EXFR
z4dxj6j=~%xtnHZ1^|aE_d-gx0`*Fx=w~v_fv46<1@2dR|`#bq@6bq%}$2noh*j5~P
zqWi6*zf-WS6TWLF`i<KroTn-y=d_vOB=h+5fhWo%WncI4bCwOB1Q*e`E5;1)cZ`aC
zj!}BgT*uI8_;JHe`j>C;(QkW^(+>0<4?nIJ`MAvdI3s49_6vh2$+?7|1zUq7ki#D`
z<2}K<{SJAxz3=#!ZX0mI8wz|_##462j4k<(aHP#K3ey}Tnwv&k<j!2T-Y4U4Fm;YP
zWlM1A2_LEhr@mp8({{o`Puuc?C%v!0JoXN{SHykl;OXzE{SW`UkNj5PrXzuOYc}0g
zHF=YQK7{d<WjyIzM01S7Vvf<5@OO;rlm3oTdK?hv^1^&x_REyho{O9|^~tGo+C9aL
z)AzHFC#|0#{dU1$4U3o$eFf!BkbCqS^7l@h%XrEGjwsiSwH@PgjNHgYdfyzcO%OS4
zKYW^WbJ|XL=xJNe@ucBL#y%m$dx3*yzVD^+W6fU`_lfbZjnNEzR>o5n@I+h$5xH)v
z1(|Y=_&Y}VTH7&uoJBS!Y7@4iHUT;9X;ho=YP>cfH?dH6u$4KUwEh8k>1`c)?Bhr5
z<E5M<?lGvxd&rppKgr|A>AuH!>H(ezN5n;9ZAa82(z-XU8h4d8wrCq_6F#B-nPTfy
zwF&9kRxUqhkEgmFN_E|iX~?^Yde||GKI=g3QefCD<Vv*IhjR8IQNNVkoFm;Y<Ei_2
ziqLx9R2L%V7`bKKRl`u%Xv7F3W`FD(a?HD4<h0ccY7=salXTB*izn30Dv+tjlWalk
z<EOfdG-IE1f7|JEjHmA5DME9{Y0RjbH6hva(bCCP2tRJS$ng%J^)HICz5OP=hFGXu
zwFyr4l&?16=|xYk+82`YXy6?MG7Vg@Tf{y2^-&p5nc@jP-Xg58i#qv0(PD}4gK<WR
z6+})OwFv{Kh}s0iLYs_r+WE5o9{$c|`abe%8#^k;KG#(_<}VNT8u^q*8U5!ZJXO|i
zQXqt<y^tRMZpPndJY|X}jK>~xp;rZ#A~_!C&WyukEF@|Z+Gw27i*XY5fC-{bJDar$
zd9YE5pBLLJtDg;4j{1|o&#>QmD~3Gk^9;Pd(=*_nM|%yp-=hqAi1C!{pSY?%0&5<I
zu}+(}D7Z<+La5UoesZiff&92)$Z4mEJHn2@4>11%@bgTda^xR;eTM!<tr+|W;V10r
z|H}?f|GOiQDE3L#_Zs*B@bn<#$>n&${QP#*)%yyz)|QBcV)O0v+5|&RJO4gTnz)g^
zlfVz=1#axD8vA@0zMH?#h^N$wq3hL(K@a&o1MVaIbeixZaU{1oo|vC3d?Z)#la42U
zzVSpgFCwR%-h8_ZZCu)VF1FHl6R}UIa`e-_KEt2%Rvh$eU&WvY1D*l*wgW$12JVrV
zaoRGTl6gtS2aG3s-C%rmdl%|VMa@`|)F!0Bs>F|oeFBJmRKz~}wb<u@pr`*mgdd~t
z=7bx&HpY{^%`l$qb<>6U-(C?9<u~t}0yC1wgzrY5rPwEIh<)}W_VFY32?0Ci*vAed
znY_<<vbPz=lZ|dL-b(dyG<PUX`_A>}l42hpVjmx3A1`7bpCR@EHe$JhOmLF!XBkg6
zHiLMI@no%=F3f}Q^{}2SdpM-AAIcpJe^N#4gWN&4W1n;}<McVkleNuI48?e|&<*Ac
z1hKw?uNb(gvU)>+Fr?=WdK&vU;UwKQ#*>B3=(#?|lZ9?j106u!rdnt`p&lVvG5BF$
zj{UcEaU?&-c(Sk=#*_Uz0veuPE;OFHFs|y=#)8B+s<h`qZy8UFCpkWl*0w14Y3y@h
z&p^s?7ZsKW%Zw++Q(8FEIXhZ-JZ+9vj`{0;#7va)E;JvRf1mNhcyb?}MnAnD<FAaT
z^v5f>zC6SF@_f}B6$L*ro-!S8U_3FNY-|Sp9^=VIH@4&Ej3>sEjm<Egx-nM4cw#&;
zp3;wxY;+alE5;M!$;L*QpO~K<|IY3oGhVmf0&AR)D2m)U=gT=?&iV4}jbkyM7*C8R
z#uNX&8k5h*{vP{#4sjLdBTRTn6=N};7*C8Rk*DB%L`HdG&hI(k#wI7q>zAkEBXc|R
z6Z4Y;&e-2$f6u0`WqxwNjg8KjpUnJ|>X`Y7`N;ui%umcuHhnGglLKySbjJLYijU0g
z%umcu4me|eVt%seYnh)MaATu0<|i}%q&jAPVt#VK8S@kKlTBaC{N#We8=WyfrQ#!V
zJM$CslLO9}pO~L)`da2E2i(}`jQPpTKdFwHpO~K<aK`+^{AAPDGCw)s#ztq%PpSCG
z+|K;O{N#W$<|pPSo4%I$$pJSuI%9q^^G~W{<|pPS2b?iKF+bV#waiZrxUtb0^HVB5
zGPg57F+VxrjQNTA$)>MmesaK#jn0^#%>0w;nE8qM$pL4~Ps~p?eJ%5o18!_|#{86u
zkIe1NPs~paIAeZdezNInnV%eRW1}<XCo}(~I%a-iesaJW^Aq!vO<&9W<bWF+oiRV9
z;v;iA^Aq!v1J0PAn4fI=TIMGQ+}P-h`N_;bsg9YSn4cVQ#{9(mWYgC&KRMvWMrX`V
zsrbm;&iusu<bX5gC*~)czLxpP0XH@}V}3I8PpV_)C*~&yoH0K!KiTxP%uf!uvC$dx
zQz||(w=+L6KRMux`HA_-rmtmwa=?v^&X}Lf{FCaK`HA_-0cXrl%uhCbE%TEDZftbM
z{FI81%<ari%ufzDV}4?OvgvD?pB!*wqci3wGykMIW`1IRa=;n$6Z4ZzU(5XDfEyc~
zF+Zi^BXc|R6Z4Y;&X}K=pKSVC<|hZ-*yxP;$;>~gj+vjBpB!+;{KWiZ)7LUTIpD@d
zXUtEj_{iMO{KWj^fHUSN<|muJmifs6H#RzBelqh<s$=FS<|hZ7F+VXs+4Qx{PY$@T
z(HZkoDn2r|Ge0puIpB=>iTTN<uVsF6z>SU0n4ir2lj@lHiTTL^XUtE`Pd0rm^OFN^
zY;?x_l!}kc?aWWiPYyU^eqw&I>1&yv9B^Z!Gv+5V|D-x*eqw%dz!~!s^OH?q%lzbk
z8ylT5Kc(U$b35}B^OFP4n4g%RZ2DT}CkNcv=#2Tv%s;7)nV*=S9B{_`#QbE_*D^mj
z;KoL0%ulKK$lT8S#QfxdGv+7eC!4;O`N;t{HacT|GV@QWW9BF3CkLD{KQTYq^tH@S
z4!E(=8S_&rJ~Fp6KQTW!;Eef+`N^iQWqxwNjg8KjpUnJ|>X`Y7`N;ui%umcuHhrz&
zr+uFO_k=wCivmMY!*#6hHShtCGUy@2{Hm<oq(G*@=Jz_-z0Eyu>goH8C&rVl4ONbL
zM)eH1H*BzDqfHlbpYgP0d$ihGo~T~(Sw;1dZ3$gX^O~pv-;3m%seG_B+y9v6=b}!Z
zD<6LkeRa(X?G=L__A{Q+<}K!@qUNWU)dKh|M!t&l8S#5B@YGpkm|}ji<|g7S<|hl?
zj9&0*;DCv*cngdtaMX((eTF`<zsNAfc(Sk=-Tz}eS?FfWqR+wy9{QTUswQn;!^kVy
z-6u?qcuEz%-++7Dfvql2|GPPUs!e(}?C%w+zlXjiGI;tsD)1C3I7exA6QOvja?D?S
zeMUazs~Gx(7x?md2HZ#a3iyL}NAid<<|m6jnEA;zM<a4Kqvmf3_B-U&;^3%+zIZe7
zUl)AAaAoy|K;@`E`uYs}pZyg>e&zEFyg!H>J8@Vp@x^#zJlW+p9p4`@`(uB<Nx+n_
z-z5JcyMA2)W-|FLfiLja#*WId&jl+-|5@!b{7G-ckjGTdzz6-F0rwDxWz$DwJTaae
zaiep!<!46C-x?Zn?7QlLhyKmqcl=A?;>H%?P{&v8#*V77&xb0<{6(caVZ}k~5raJh
zeD&BzWIQpREV1H*BU4)hIg0j?b3gGPblm&ufFu6lJK*4#gTPj2QRFNfxsC88eMH1y
z)zA3*jQj(9#NVhDgC8Lu5j7b1bYu{NF`h~VPd9b7Ph7rRtzPUL`<SrMQ!FKZzYf2>
zcv~mMSHn*HP#rYwO%-ugpzpZN?M0NoNa2f0AMr)t>)BxCs6YAp4F4^B#7BXz2ZHbs
zonkP?Q;FcIado8q@U!=-V+x5Uqb><sOSX57UifKf#K|A2$O(Gk7y8`c7aC(UqmTGp
zsB-kv{yrmq2OsfqAAH1sUiTzpFda`1Ce+l>0oU)jYdp7QT{LpSWj-(2a85bMh?#Wv
zHEijAVO!v!<KB~gVaOeRp&4HSWAJB1o*q8p|EU;T4#7u!u-72e!wz|j@sw;Et{Ts!
z+P?Z5yTXT_xz|@T9F?q7%|EQ$9vLJ3!V^C94xFm_g;lQd3(XkAam|a5^&Y#yqtrZ`
zjHepZm)CH8xm)UCMXl_*Xms(l9YOegK5$fL(c_BnX7CG#$NfT=<O_|M68r0W*S_FU
zYM)QSQ@_ctDX1%%f_QRU-|?F}v|Q-M6tP^=`Mdjhu8+vDJ|b3o4oodWZsO!C0_x#k
z+Uu*W-w_6`A_dJ;*zuJ4{Y1aeH)O_pUOivv7QfIIPso8PV-{_jig<GSh&gS+p)=nX
zynNu~*8+VfyrkdXMvRqZ4MRrkF`l}MC;fYfr=rMFbS(H$*gyU2`_+S6b_FT6as_8e
z-qQTSj!~y<2@XBsLv`TPH;^xUB>=y$qe%0Gws?Z>705KmUct#aFONADV-52@2@E^&
zpX%VF-}d!C?C;um!??{f-jFSPF`jyeC&^cYE9`eIy}mOv>zjV{u(S61YU+2i3(hk0
zLopvG`h~v1)8AGPoGiwX+ly!%IXygC={d&D+d42#9vptsM?Q>|`@qlChXlo#L-%V@
z7*AQklf+dsa7EZ^SQTlXe^uCb)YtZ@6PjGcS<()r?NQ%8w=F<^VgJKLzg}p+u={wD
z_a?XcJ<@od7;~8Ou^2BG96bp>qE?ThjhUzR5gAX}#*^WElCzdv*AYD7KYZ%sGxqq#
zF5S`L8edS_9Bn1G7NcKJ^b3Op@C&ntC*wWJ`_%5W3qE3)d_?kr2Oaem)q4dFnDDaf
zORRiE#*@MRV;qz1_cYFmG~66%pZEQcZ`xP)spA`WhLF2(Pn>0CcQlT?;M36Xlm6vH
zOyWh%k9;9&G`jCE8Do2={oLWne4i3y6caD{O!OtgW+4VU<{h>F;s5Ys&L`ESP#zI^
z{Ec^3P2Qwbjop}(chuv$`Plj)iS;hoJ<jL&Q)kXFlO_g<vzpdKJCSb>%)C_fPC9*$
ze{9`$cXF1rgLr@5K5|Z*Kjs%|eL3cJWIdObUp&eCl-oF0caC1LH8f&2Vz3$S1>qyE
zsXg~|W#AF7mkXY@78+0T_X$^!2y*V>x!(=?rkwkQI<8@7i1HV%^aqn|P4f$n|3Do$
z<qZ}6csBjQ!s1EZtK4e%LQUoNJ8DkfrC^(cCyc8rkokDFrNmGFCGEMGwvw|JUDF<z
z@eS2`$Z5L+uIH>oTNC{_`GtdyrhH+{FSLq5ocui5R$O?J_qt^JUDeIV*IVET{iQPX
zyf5Y<@4IJw)2@*Ie6_wayS1SC^Y_+7rvOK<7Za9@*Fw0$aRl{Dq1jgkyhnWbbG3Gv
zi^hrLc4ZwO#QnnX2;|XdP8W>>>Eo=K_=T>+lfM4l{Ki$0{dL!OhAEDod5NkX`IXOo
z7_$t}*ous&d+49!4NtIFTF-9|<W-{`7vnx*i^hphy}I3h>_uMh#MWH_#If$EZAyhJ
zYL_v{qHP@`PeBe1e&K*Auj_u{CK^YUTx7L%AD*<eB<I7{{BleM&p1M{bo~uoVblZo
zPQ2Xjn|A&_b<&F6{@P_b!}{~i)c?;Lo^b67?u9Tl4st!@Gl=8*m4$BCIjd{wPdh^=
zT@mn7ZBuNVIJ<s=HK(M5jcj~|@U?im@C%2{f?r7a=}ESJp}X;9VRQ7H<+G-kdeJo<
zf!W^<_@-a5-;3I7Kjnkd^bzxhC&E(wDuE~E%-f^AfR*DQ_d~pe#!WiEPx^+x;NIG%
zba7|x7y98B(p-PaOF!Pb2KBHt$@Q@4)8q9<>Hc2!K4%+0;rUWOuJMxvp3KkRfUgLi
zc{`0^&i!7<cO2qt!~x_Z25XiIAJH6x<qc1iboug~Q3cm3gzm9vZL|v82FPC^9gw2t
zE4n_}kHHTQ!AGFlCcn;Eh2@y+*=77bjD8`Ft<HQOdFeMFsyyUnPv0Z|mXt>;6+9)`
zq0V1;_K_yU0q|GCsK4=JE}n`!hwqT(@Db~G(44%-$1Kjv`sM#;RQ~*HHJ-wCQ@=qn
z1acANO-RvWN?fC^W7IZv%>SXRZQALsdfZGgsNw6^)l0T`#@2mee57K(WbtHSlRAe*
zkn8Bgy87XTSGR|e$NJTbi@X)6Ax+Rt4*nj%y$L^{A2bnH$-h0IZ70B1T@hOuaW6Sb
z)Hb2dLT!`ZwY5#DF}A*D=~ho|y#=1?wkwD;rUF;HdzdGSb7bo4k)O?)zh`{5>F(?J
zdIH-DNP@W=@N{{)=X3a65N+oq{DA3zaMgH=##O)<#a1&Qu8FN;_pWgkYMZ)Br?x5C
zo^A1j7(+oWdMfHAw;XxS7yb#&s70>R^P;)W-xL&2x(z&mZ3QI3!pXkrJ;-FpcOj2J
z$QRoO$<!bF9lkR(;RkFETH^j6{kDv)p2of_Vk@I=sJ}AQHX#pN0<}#Vwruf4{W4@4
zWDoAW3o&MJ&Ub>oqfzIN7$ZP2Ja{Y99JJ)0RNJD)Q_K(3Y`g;bxskA!SrCeIegWAG
z*$Hu~%X<OsQ;F}=ea%~mXOf7kgK!Ra#a4zshj0ZEwM}#4wM}9^aRGdyR5qDTyDgsZ
zoTwk12H6XV%CR2ochR~Zh%@~&E>=}q|AWTL;TLAJCb?+wByE4;Pom0~?$)^~&RNRx
zwZbPGtn2P9Y*#~wM?QqKL0*Pj1F3~ADfK@~A5ZePi6dJRaplU`3Ob1KIbn-9OVl=9
z>{a#JCbx|fr;jJYy^|j3{(-Rw%}+aZWqaU6%%h<ih4D?O_m|`4-S-QN9#7J?<#q+~
z-Ax!nGVurXNeVdVKx}Iu6Cp#y_$}UFaVugYY`gms=hm?dd{J!Ws&Ok^ZwyazU)Ysa
z+eA4bpUY~Sx{W7!|Fk6?i2h}Dq_gh2&fx4TgDTDc#CoLxJ(rWIU+6kKSz#iUyO4Rh
zL{72#O1IvF?ls(M=XZ5%WwxtWZPSHb_2A;KZORIsj5;v;g{S;5<eLHhKJ?5zsQpRX
zFDwZ>bqgHb{E~>R5^?3~*ve>AlC$*MCb4c)k=8b4A5SI@7rHR`g*0wT9G=22WIS~f
zSHy{}cW8X2`<3Hio30zTGUCa&Pxe&AwM{w4lUWzg2h}BX()b?yWA!N1txjw;`Gt$O
z-!*Q<PNm;bA17HA&PTpY+Vw`p-_LO0GGCr_K}Gro`~;;%AGca@S8UwsKIp&|HG!#~
zmCjj|cb2tHK0W80P982-pUEqp5_F`;TzIbwb>X2?eh~7Z{-4IrL#SE3<BU6_y%w%)
zPqJ2gp7E5V73((yrU+NMABb(q#8xp|((Q=yVu&sL6t~0oDO7D!;qYYT7b35NwLv=J
zCqE0nh5Y{{Lt#86sU+nar&H}Z;Y#a^s6TRFO`yqMVt6vVFF8xEZSoeNwy9|FWYiCy
z`@4|Q^!&{)9Zw6e4H>_agMC-~duF}SF^yR*)iG6yu~p0lG|r0GHlfZrPwO@nC7z&{
zcYvi)4tS#Z;m<%mkLl3RPi5)7^*B#by^)ojy6rvUs@BBVipH%<Cblv@f8s0}C)U?(
zqB*9yTm!>(c*49Or4e<Z*isF`Ovn|GCn2;(kW+n6(%2zB@ATe1&8wrmDPLBKuUKp)
zYi(U#6PV&z#_A7f{s3y5RDIp1Y}Yoq4o}b<`TsQEF1E#fU%Yo1<Xp%vA#X#dcH0Rr
zsoE|hn**jw5l*ptYQ_CQPbD8)8Ervw7S;98*eKOD#cI8iYsNFl1-cGT(h$x=ZD_-7
zsM&$dOKg!{G^~mC#&I?F>mfHoHbK6Cq{5G}{Vja{U`Wa1N$T@V;Hr`Ok2to*W4~m^
zt#B{K=PUO0`~|Js6s9#1vQXRPT0BWRkXxz|t%EJV7mVSn<z`_Yl*^*p?{7nX523YA
zx*$pV)!(D`W}0)f9C@*Fdy)RoCkb3N+#0J1EXml)Xaj^Ts%^qtQvWgCuWc$BJQ?kt
z{In*jPlZ5dF+qOg0306yIUhoE^4^2c_$K*=G{54vka<Txq<x2cp>ljtZLiRw&R5V$
z>5W_2^rt#!$#t7l`dg0~)HanQo{Sh+0X$uPJ?2HgHYi^R+Ykbu(1ZQ45L)+cG3<xt
zru2g-#C0U){t`9wI#-ciASF3&h5NGfRRm`l)@>4VYMtjLl{}t|m}tBS@z$?^74VKR
z=F)9N;EZZ?8p@QHjJh)Jp98%$=y^b0SL3n04nn@Mr7f1y`;xP0POZLflU;37S>efO
zBfOuv251bJ;wxZ9sncRBTFav3W2;!-AZwfO_kC#I1l69JYMa*A)LXB|LOO$x52Ve{
z&2K+sJD!`l74SE*tpTzP$?upCSvIj1?mNcCg0rv=1l2Yjf0@ra`Sd+u#95DyUigV;
zT>X|Lm6OgOjHe{c@EfFoMS4x3#1*)UVylZG?pY_$fDc@E3@aJ!>$Oc-i#W3I$Kgkg
z{kqpP_ljVWk>H$+rzEZL8)gkGN36LFu@&J;$JTh*PT9m(M(lyJ);F$-dY0XooXcW7
znJtHpoisqXQ@KVA?5Y>+r(|majTkcRuU~dk)Kh<hBc3v?E$AL^Ch{%EPfo^L#BF*%
zOumf*ACO|JWe{55$#v@l;+iwH<y3eg?tUK9-i>o-dM(D!GoFeVGpR0(VylF)J}tJo
z5H|Eip6$qJQ~B7p#S^XBi24BHZCb05){&$63%eotxGu(1Dx-BlJK0bp)<lctEY?P4
zZ1riL>?j|$YWxjHJjK>Q)#^@&yJ>#JjS#9A%_V;`o?L*JbT5&(O7d019b&Fcsg7IO
z;z{a?YS{kmQf&+m7*ZN;7rLQ3o%0}1L2?maF`ncDD3L9V1siJu!C9pkTcyO4e4HyV
zKZ5iT<1AncSfYBj*^qUR4<Jr;+eThYwf{EyGt2q8@_KmdP7Tzde@6a~Y)1%iMdMbb
z5?iH>C*#wjIjc>m=^}iQUQWM7#90%tPvd!%%jxNwR4?Nkmg}(?uY>p9s{vYP`ZTg5
z!WD5>X~b6D!jpW8gr`>MLi)zKUIsunr$YV{(gsPzMON*<Y+V=iK;%#HwnQ~R`3j05
zU?)oB&qcp{EcV@66WAj>86PoWsYPFxlyuW_E7o3E8$A^AEyxQHKg0?<=J#lgm4y)D
z7Z`to_e)a)t(a#m=g81=hfr)q^Q-?1$z|TlY<oRD&KjQNlNRw6)%HstnYP;a1L=qQ
z9j9EW5AEN9(A*?(4tZYQmc9mPo{V_z8m4I9ZLw9>@g$%63e+%>Zcd}E<{uM2D)1hy
z_4NbDW(eg50}$dQ8aF;0v1%V|#dqbocw1f?XaZlg=-ATpU*lmD*Fl{6;+}F#Hol)T
zJQ*#3;wvMcQ|=UT=uqhA1V|l(#<i#~ipOHu=T~`apb37?GW@+cvWv#sMQl~<<5qdW
zleCKE@cn3=lScBFp(E0hQU3iqQRNJ(&5bgaq|VBHOR<%R9pdqW9JeaQ*eb7hDtFu9
z`|p_sjD0Wmi!ruhJoW4m^SAS?frg)px>C)r(c<#)z*e!uR*a`S+XMexb~HdfAmuHH
zvs!;vG~-r`r|djlK1+c#P-L+c<EcP)z(1Qk4J-pk#cFi499N-YE5=jy9xI=zz#5>u
z@p5gAZ8_$d@7Rj*RA3w6pU=JqD5j#ZE7~?_u@#M5-3#eyop!1*U&d4RA19x&NHma8
zLlB>DmCJD}##50zd%ld^Xn<lX!B_EZE@LakQ*It3pS8#|KwPzg*5D*u<!;=H@l<5b
zoi8W18W3Ei$5yBfr1gff8Cz+1vRKbDw|B*7XAKlq17bW_uL%Tq$(q2Pt`qop!>VZS
zWymq|i#1Sg8lb;l)J$9@Yi)a86Zi`n2U}K#f7i0yY=`gHUIWJUVMKhTtz~gN_A~kW
zR<st;*XaAFVGcjPSOev*0a0Ti=f2(<i>=aK%VHC-G=}g*^OE?*8ek15N;Az1CjT$)
z1Ev#Oy#pN0p*ejGsL`PHruoGhU=74IK<k+i*BFGxt^N)2421l^U66MncR{Am--)F;
z`mKn`_{ADv4OnZSiT<{Mo?i!U2w#IC^mhhnjfQcJSl13)rJ3pmnU}1UnCEw+hF3%x
zXE@r2ssHg;NEsAAh$gnRDOI*@8ywmc`?gMpwva<xn?u`5`?d(QZg&s36x+6a4s9D8
z+R$WoPP!DkHr%;wTbo1M2KzSgb2h(6cW(E4bmyWiBF!Xj6B}e(NV!@wjCh-9qTkz~
z%r&)XmqKldGS1W{?wo!P*JN&Mljp>axoxFv!;ZO4Yf`G{cTH{Do#XfDHcf5%r6^S!
zlH1zw7QL!g;y=^(=q-9#wCQ(l*(NW=>U-Klus-Jo`Yn1{{GQfe*%tdbi|@%hkDrsC
zul8))%;(%k&sS?(X>MCdx)E)$JD2Cwp08+&Uy6P$_ziSIqAhmk@_YCR*|s6}bK3W6
z4Q=tJq&CB)B(=rwT>m}8Ioll0xzeG{&}9BS!<{Gnp5e|D+S)ExqHWgaq&thQv~Fv|
z+r~RLoO2+3!+7WBHu`S-CG3p!BEGjW-hjQtwuB~bi|LH@A~nGF0!;`UNsVY*)(h(;
z(IU8SRk;5&n*?(z+XUN$K?BU2PzL)G28&?cWZq0L2XRo?eqv?91tnffn?svZj2?0L
zo=r|b^b^R>8D6n#8MG4bA_Zf3#oOpQC_xv0#oMAAjy5eNYiJWWot5#g#r+pOr_<)p
zX1sgzIgJ-%ZZnSMCADpc|6o#^;qH^#3>TBsW_T2$ZQROu&dTs8v^Jbb=E$OLv5V2#
zwEU>ZgBc!$-qse+yT$KbZ|jWb>*9B>w?*ltoiqOIE!tvtZ_yUJdyBT%-CMN9?%t|R
z-n~_uycnxCdG}Ur^6snX<j^y{^m~uWi>ac!87G?JZS;A(s^|pfHvR6aNPXru{qC!x
z_>j3xznH2hK9tmkbKzA*S2Z^(Ua{-cpFP?{u9X_&ZQ9+VO+53&Htk~27JJ3Nr#*X{
zwl@7*tiC7i-sXGa2W{HK-P^To(C*#p_r%@XeUI+mu8l6nu8p3(ZCjf|8}8ord$<_e
WHr%~^+XjcWHitH+u{!e@-~R*b2Eb|n

literal 25715
zcmb?@g;yLu6z(ok+@W}JhvHV;-QC@bJCwz>#l29VxD<C?iaW*K-JJy%dHkOK121!O
za+68sOfs?i-7f<G0N=0w91uVbFtP*yKEBJ*s>(8G$VABRBAT46r22n%|MQ3+-UCCo
zQtSU>?&>n)fT{_SqxXo9m9Ct%k`jRNT}A}J0f_+c|7Cgi!a(BxD@z0E0kHow9R>i1
zv;)BX?>x%y;eSr{-TznSe}%Al!2g~5JuMIB|KtV&@?ig;{9iFmtIweK0LevG&m90j
z!THYv0Y9?|002>doTQkh5AZAiDceXZ;B9T41FHCu8i=d<5eH^Fuj!+i>et5k`T4*@
zliK-k>ht;eCwz)w%TRMQOi3E^ipDgaN1br;dHK=Vz|?$Hg`u!88qBl=%cQZVd;g2a
zK=8r3z|H>n%0>XEv-SB4_04)aWVQZz;*sUR8}vONP6rSSfC0k6Ai`lHl4FXJ2Z{dw
zN^r-7v3G-xkQHoPbid&|kYUGUxc92!aThR-BrVnsdE*BhZ8e%l=2z&@&u0_M{@aQO
z@0M_Am%w+tm=t`?ys44}Cp>oj!jkw|Zr}ZpxwF+1ILM-;W-tYj5d#?e`%>FK3ntg$
zX~8p&SJn=#Bma<uJ(3rh%O~;6KZ~t?-3ol(f6e){Q`aTzj*d=u=(ZykWJ?itIQQYr
z`k-qI1pPBrSV_<plNGzLq%Kr9b#z}-^~3TH(~rYtx^o3blg9#=<k!Knu+)K3ifWiR
zmMrq!SL@bO|8>ZzO4@K$DA?E6st$b6PKR=kGTBOJQqP<ix2Rv($>~X&1MajrQeVfY
z0>E%fnC5v~*;-wQ`rTfD9x{u5E$dCvj5QQ9P|SFx>)!WRIkbXN)^5&kW+akMz1NQE
za%v5Kk1~xOBpF%-_(2}Z=rgS)P~r<Kp{&b|fhDxgW%kar3^e;SD+Comg5-h27muKW
z^_vl!K)($=9%$fwz(qSG)4;iFLl46DL92Goh1o94NbT-Al&t*$WA>K-3$PY#GK48e
zbPjW|R(~q`83MWYh`_rlg5wjx>=g}9K3T%bMtQSdTIE=WP9#5H><izl4?~Vp@0N#O
zZ@YGcxGWP~^u#+OM5p@B)_xED6l!Pr{f%xqpQ&7xLrcPe$E1NGR*&eON8Ik?{YNjU
z{v5Qh#BQ|rw$KtYz1v$$lB?2pd;UJf<7u~yo03F2pr;jE|D;~bQs`i}(siQ*IrR@(
zu~hPH-B3$IvT|p%rlD94o09U^Zr79B$r-W?ZPAnWS#97@pnN*XF>$|=vE+7Wm#YkY
zuTeiHW@k)s)yd>(=T(mmH{mwxX-3iF$CkjR79-cn`uh+xWdfpc-Qw~Ho*MjBS_k`T
za}8u$ecsCs)zqw5>tB=mDIbjLd=whtiU3kmGigO!4qg{57vF5C6JYp${nf&Q`+Sy|
z4buDGTGp!dT~vM|XnaiT+*$1^QmLC|%^O2-Tm#K1`PbhTb<tVGwFIK(xNwhD{{wz1
zc*IkKu%g45aCcNi)oI+!ezli|H_zomli_HL!l3f`H*t{M?LEP<Rlxq=>dvlq8tPX;
zJcK8UH$nWy*TZJVpfiapZ^~cO&9255dgrpQNdQ&kpkmHHpob|l!FJ>CBP;IW$O!^~
zC_v9FbCk6k=<+w+bQ-qS8SC@)BnUz+4;0X@PRmC_ATtEQ$%~sx<>KB7^k%Y9Y{Gv0
z7@tDwsXv@fTop8j4WnFf?CJcv)Q#l!X1pore<TZds59RQ(tMRdXX%7*3$mf4h*cNu
z%`MP)PUn<D5)FFW`S5D{&!f0KUwV*GX-9pfwe6(4PxngR1s;<g5$Gz?B7!;`x9aux
zqKTL3LUFLR1P+q!Fs`nM3ER4hto=_HV~n2qDY4<@cJXl7#A4xm>HPTRG604l=u1c&
zps{%}?6YY-Hl=}QVnywT6fke`K=c;LFv^C6g`9?+dVfiduKU$eFz%)p?E^DXaE>s;
zOVeQ*Zn{xe`dI%<PUE!vJWmC@Y?=5^$?vgTKay8P9Q;MZ0G6x^_X=?v4c41v>aNf&
zSxu@r2OowYTW6cuvSpAW{)gP79|Zd8l)JT?$El$>aOT=JG`1aP6y%xY8C!`f6K|#p
z6<%t{O*FbDI6ni~<cF>Hhr~GyP{#>Ib>G~lssi5NzNy+xWTQPZz;!3XSOQn{Cle>a
zgY)ATf0t?JbP*N&Lu`snVahRZAI>WBfZbE(0fbxt;RF#)O_<|f{QPwy4Ltn|%+0e-
zSr{*7m=x!i7xDc|<t(JMUa;Gj7iKt>FnGcNHJFn^M~XNvi#U*wrxz019?1*_&Corf
zqojN=11YClyHxG?*N}0qdV43&Pxs@QGqJ0G;lL*-!Lg%lG$G%v3tw^_ofak(i{KYJ
zd)W-b2KAGX0bi4eUpQ9GZj&2M$xJ*TuTZ<Gj7eT=B49$n@(NXC2~w@GC3P1jBAUVt
z`N;}pff{_q1+o|%2YzJZ==*>iCcEwnh30*O5A{dEhw0gS#W02p^pCd%H2z9B0VP?q
zIiL)VcZWsj05Nr1&+*J0PWUSn5J<E4A*W2Nz)Q)!%eGDoYsIU{MC+P=(sS^6HX)_X
z!3*{2zC*Zu<akwvZ0H<C>XA@#T=x<#Vv@fQcobkdG<PPoqpelxWSarol$}&$zq?!v
zpOcjB=`YdSJ~8OJFDJ6CUE;At<iPI<(1};mb5$I=(k)FOCd(-<I1*~Sj#7VlbSM1;
z#LXcToZ2b=rAIO~>F>JM?_i|@yOXDvQ8VyW{ZzMdwDN+qIzUUaS=egeFMl}G6R&mp
z_q!44Y#2Xi>`Gc~CVcybknd?a)LaZE&lu?Zg#<-<;oKj4?7E4KB;18N=QCiDg+v74
zF;jrp+MAN1pde8;Lw$PJTpi%e84vGIaj(QmxT@!Zse7D_UKHMih3<+qs(tPL)(Rx3
zh?N!*Z{3Q8pp&H0f~%%fy3X-s01J|fnyHR#=tL3#I6maE>mOVuR`qTeaH5S`2HmJF
zVXD<7%mSUIaw2yasW{V;K06dLN1RMA=tPc)h~48lKc9;)bX|W}F^~;>p~Gh=rNVAX
z_+S&RH~t5G6xqSvmd~-X#z*d0`o3_5`;ld~A|EaYnNuEE>2Oc-H^_OmD4NaCiD-A5
zdUNQbbvG_-Oif@j_#b@OHiJTR={5@ZRdsTBTCKFXnI4tMvQ&)s7%uqJ!tO%ToTH!a
zXZXS0W>NotyxeXCYy!xPA37F22E20>(zaho%#Zpn_>rRzWAox7dp?ka=XtUMatS-p
z8W7fZL=?G2)8ymAIbg=%IgQjh?;2`a#k}tSRmmw`{J0mk{n|u99t$$P{@#)S#*enW
zP^8&BJt2kec~yz&fwXy*B%glwP8K*XHoggT<T~6YYk6%u*cG}K0qEtnyPGQQ;i^>+
z)&c2Mz&xrn>xvYBES9{<6Q5#OLCjrkFb3EvJOu_u=J&K}Ry@r-e_FM!jKS{mmKv50
zWVOBSiKWU6QufGdLqLNR^rsJA(_<~ix!7XfSXDtDSnotBNCC9OTq-rZjhuzOqM0G&
zo~5DiuO~4vr8Jz-&(yJ^hD2UwEP~c^rLyjLyAN4lXT5)bVt!~QMNv-L93>+4=f?H6
z<#ul6&|MTMNqB=LR^{(Xm|;X2vH%uVAH@rLOx365l72<BC~kX5>DY3m)(W8Rbs|)?
z-LmAYNl0<Sg&#1(4KeT5lKtAit(9~Au{P2JPvIGcMn_A4gcDkq%@-IDAk_D-?qB^M
zvC+&3T+wds>XmlR%o-34X*iJta(9(+r8!ykGS(t*<58xg+c#n;Un4GKh(nizX*&+>
z=c1xlm_d+DA;<J?b3V7`N3U@JNv-J&Y1F0#GPHe7WNE=<?2yjHdxRE{lz-bg0Vm$7
zT@EA+v`J%)vE+l<r7$f@7misp``-IxkYjL@2H6hy4L2Z`+T${jntsjnY$Oc^ottMw
zg4D=ISPwx<KL1Q%i{TXsu3j`46fUeb(6g6J61fbgx(O+xwKby1d;-5XZjjo|%W`vm
z^=bMX4Jj_y5leh5uW>Z6n<Fs-;Dxm4@H1pq{zW*`Mh7nJ@)EIEMT~Cbb6v}s5~fVP
z5IcBwA0imxZ&!fbFK`fiPrdsmMsRQOumDJBopE!xY*qzFyV#=2IoJ2Zsgv4?yir#f
zs2^aYn7hAKbxRrN_*nK8M%OgKsD+9AZ6BghRmbAG^18HA7VGAGR9XkES0s`i)T`Ro
zzggLhb_VzC_w~g%z}bir2MdcQn8!ESAK#stFcgqEqb}v*;Q-3mB!&v-8)4&@)1Dw4
z>D^zyAd4aP6q5fIyRTt<swz>G#%h|sc#u?aFeTB%I^EYcOZOG~x(<iH`{Ch_?l$bX
z4z>9LmgvWcm*E%QTz|-Gt=kXK^<9xU3^^0wX)<<mr9qY{NlL^>qGkg!gP=+J2$&A?
z!Uh`w7v#aBHA<mBVvcLJv-^E~4Bzr3*j4p0nN3E1gdU9Oo!(`!M=TNHR)oLTJbkW#
zWqc&yNgq#uPt*eLY=-90Ia|D}t&9rXkDe)L!36<ve3=(L=5P?yw#I+!x#3dwCw>gl
zwqxpE4L*3D-}yoLXEE^c5Mjelo*aHx)JFLERuL3lr&Uz{gQ`*c$C$dF;P=bR7G~00
zikPpaI@FNrB%qEIVE4fYXDg+6HK=p;s>TDiToI_oL_+awLByRwo8kzsTPinhj=M!$
zu(xZg4x@!s7$jcv(;Y&m2)f|AFk&<J7f9Nij;hS>1oPVFd>Oyq>wDy^H0dx~=n5>7
zacEr4-6{PED6NWi8PtNM!(`d~FgHxYRsf|sLg;qcTm;O1VaQm(+(w{G530M5ZcP7^
zk1MKDtAB#Fo@<1tYFRRc;SbE6s^oUmtR1nG%+n*mZtG5f#Qe6?sV7d?HoZ-*UeUq<
z=w;$d=|-=j8g;uTVsavn|7gF2qew#%1El?w3;IJbgEf^Z)w9}jb%zSaFmS{2lizca
z`$^7O<brC;`o)uD#F-*8R~>dI|7JcDqIXOhm}_I1En@II8t#1t#Y^`87;~%PRL_kC
zIFBs!=@-oxKav8tH3)F(t7E)g!p#O~juBX}VV$Eo1m2!%;X{UScY<+M&-LwF+&)3@
zn>#-EzDQPcJ+k0&=P%ON9DXx&=+_^Cj47PkZQUw4X=JW)n*5bNpOXYwN>mkK{s`?t
zVAxE|^uSF*CX@%f8VM@bWa1P_)i?9c-H#tO4S;{caWi~^ILEwdHE4;T(Sm>6YIIGh
ze8QYa!^TvYwscc5eXewF^WI2Szlz+=@om$cs{Dx*L>=?~a4!Sm!YECY)XF?);XuuH
zl`ra&lDVK_q3P$?Lub%^xx%aF@s|+#o+a|1I2(k^#$TSl-8?66?m?wSqpuC>l@Y!G
zh`P)&#}2Jdl(WHRmXE6=X%*~G!wVKB2{JH5%R`6DLJ;cY`@kNxsKWBs^Pbg^3`B$+
zXUoPl4W$gk=A(UDc&yM;%+vk{`w9*pe`yM~S(XE)qLqan-OAV!L0j-Xe>VIs-Qs&K
z*g8(uZwmqjE4ZJA5#D|RIrQw}|0w9(IV1=ta;f(Qek<GP*ATUYE065hlEjKTKIm{c
z>{4-s6MOD{8ZX%3R>^n<?L52JIK1H|`MXifkG)uloV4ZNi1#R++mWi8ICW;y)Fu1x
z2NZ;4bzuP}ON2YDA#dG(w@pMn3A6uz)B#Jvy}_KHOi3jHvsFb2y1(Tbt6L!>-c1TS
zc>^^t6{ddpwrUHzI!H?f88a~1$%8?!f9{_CG=|_v`StGRn7R{xKE9YtfI{Sn^FpdM
zZ@bCzcDXXOHGd*%a1GXyqop0Y^CO9^5?<wUoZR9Xkj$xk0sG#5cY`~5Un!r)3IiKQ
zX4lysV>fEAy(uH=e)6-Z3M`nN;m<FQWxFbQ%qg8Sd^+v&f5Z6q+_0O2LsRj*%>+zP
z2jGS{I@}8ezkZt;r%|mhc3WPII_>k{cTO+>yw&D9=4(@>act333q$@bkD4$P1(Acu
z#by%lu_RqJ{HZ)Hw8L8~TjjrX&?1Tkq#1gtOu;A`UM+mQ=l+(!+G=x;GWQLV3K&9f
zq3uabsDoD*Rg4^^JclyE`_#ygW18Cu!Mj`QC{e|@+~U%7sl~BIk?D?q$;$M0y5R9q
zOmDN8^UsSqm!nHqUa9T`GucjziCQv6-ISaZq+QSOuHWni;>w@vIRt*A16(iusGS!U
zbRlSZ3UuI-z>h-hZ1m!S2Jqw00+IllI4Jb(b=Vu33Z|&EJuE-36JJg~w~Na2zmGi_
z`}&(j&PS<~^vYf6=YmTFPj{x9l6mo<?R&yn#xQIh@r63o-@7^CjP#JM3pi1pQ+eQ4
z!&B;P%U#_@oOm`0Cf=eI6+w*v`yP7Bw3}^YA#JaRf)Qn7<uoMpniCetYU}6*^(701
z@v~x#r3Zst1JVCVJ$zy1#n9b-wU?(4d}}glC#&L`$kmbK&-J7L;HY=gAq)Up9Fg6T
z9$L^g4Tqvd#WBAoAG@MvptS!Z*hcV*Xz&)Q-`^g!qf~VK>hyaPaw-at?)upv^%!|$
zP(!tvSGXHD^VS$U7comgD2H+^gJgPJ5EjAdbsc5>m0I#U4df5r_ABi0NumQKNvr)P
zaRSV}OwSO_W{G$NHlQasRA|AOv7>eqCl>KI<%_0I%GPlgsag`<gShtJ&66>S?%11j
z<;>j3;R_DB2@^+Ju+#^&g}aCmt8DO(^7V(D_WO>_lK1^H`&=vlQ>3UMVRwoR%Nh<g
zH&N>g%s3{tx%m&*3`B44BWFMB8G&_#R*74LE7+ULGQ!RS*SEz={LlE}Q1MO;e~Z!R
zaKq-&7*RVAr6bvT3G)+&!PV$)vugZ_G{7=+j0OM~`)945im>@p6qjAY!1nr|eTAgt
zAJuW9@K8yi&<_@<C~Bc`62vVJAv9TdR*e&@4kRXj@k0^rB7?HFmcEra1W@BSMd;JR
zN^3NG8XXL$4GU?+bnO**zttV{1*QTzor28isFSvBr9nDpXcK06BJ7KD(N=8#<fRRy
z^vGK@`P?d8snh<=ath3l{z_aRd6L<gscVazf3h&wm)iLF#KbW{7IpbBS#4Nk**7?l
z({ltyn*tl_#`Lq9A#93VVjW<ticsBmSuJ$)>IU!+3pt!g8zBJ%=u$a{XfTbSeF6W*
zUg6XMYwQkbFhL2ZAM_U_M5CV{EDnGAT<w`j2{bC%nXFf3QOOn2l!J~Anyb%)>^_=P
z+|HB6H7ehBeA_@<%>ShL)hRM7N9YsB*^VkVy8;|tH99_`s1OhEw5B|mmp1%!{L6^a
zx!wt;jmMV#PhDp<i4$tGKTa_Z9~lH2-?WP0Do`!IB)sk6SeT=toZ_vOlxh!5&lJlx
zdrPJn|08tEM}&}-4-a<KeS$AS0@_`FpUJp_in#e&GQZ?Z{Vpt`^z8Jd7hg&6BQJv!
zOe1R$5uOB|TI!=2k@1{$<@nz}NBPCNCHv1WClgWtj`0LoVjQ+A?uC<T`yhvTVz-rT
zH>(DSl0L~>-D=-AaC#WkN`eF4YOh-OzVH=yZ9nf(P9rUlQzwN5ThrqyFsT_mjt+JO
z?3KL_@H<6qXnwijJe|_Fx!=1yd$uI<MC3wzU;<uEsP3XRs-h|BeE918Q%Aq)<S_nD
zlPelfUCwRN9(dTvOZ7h9n|hE;3iX$*GZ0IFy=><?&Xi-Sn;$J{MJF%54^{8XZuj|2
z3xE4+=%7FQ$D{HK(oj5iWZVqzsQBmLrh69;z4k@=m5oobK+vSb?<ct1&ysz8;DE!)
zpULyY7BUuuEn|dk+!TUgk8ZkJ(}?GNb7wc#qMpJ9U@nfC&D!TlXXtQ_2@=`%GhT>6
z7nD;PP>2h_**c{ABm#JDO>Kn(496&i@#iLd%D}`G#s;ad9!tS~NC@OhYluf33_5D6
z+kLj8TqRO-!~ym$^08_WL|-*blc-nw?UTLt$g0rK0K(+#$iEwYVtMI6{Zj8>iZr&$
z_1l|*+qA!hEjJ<K8Keu`Cx{OU+=Nu$J+fnL8ukuIRus!&3&<QK9rP!Qy`L}-s)sO(
zg?_TbkQ>~SgloDQ`K=Pc<ZCg*yZkKT2hsrcr9BS<mWRq)#M;d%-(;C-&@uXJIP2#Q
zlRi#0nwQ!CWpaUev|79L2+H+UaF9Jhj2^$9H$4+0syMt4@w3_?<4e-sHaY;IFS$-A
zcJieqt>&g=;p=f>ZU~a7r50*qFmw;%Me+s8o@Z(|7_7TOdQ~*8yu&eEUr9t$Al}kQ
z-C@yeZb+v2uhI@l<D;F1zH6THa<pIne#m=5>ucDLdRBd4*conkxkl1u+rdVpX~(^%
zk>)By_JQBSCSFDAADr>B`Tm+?^R^X`F3&)h08{*TzMA+QdMRiI`$zwqW2HflqxYgD
z?RgEf$I;b>K{^@hHN%EY=TKys27ocwRglP3RwO0~99I@|<u&}F>=A@CfV$qC0#(L4
z?hHgS4>u&u{rYjj@B+GR^nJx|shC^X6xV~vgjd_O?1W>AY()R+c#3ZR^d~__17wt6
zCY(eUza(*aaq<5pN_{)NN@U*SYWWxV*}Vna)Z!T6u29(PXUB|$<?=){@J$`Ln@6<K
zq6TeKJLvmB{C9<k$Trp3C7APE&4!cLXBlvs>no$u+1a2=G3;c#{`XmS3ixmPc6<V5
zSrlEh9(%G>8X>`S3$n1(*P)@*u1%2XEA~TxOBdqUhe3Qg&s<6_68HqDz)+5}X?bFl
z%~;j^zkY<btC6>&`}^hX`$oPW=$}O>Hv1k|a^%h*y7~Fep_<Q^E#_n@5rxsdT@f{Z
zHkn|;O~a^r5K=se5+g*ptN3RvrE6Y<(mqapB@vJtc&wo5)alwv_jew6pBVQa9eFF)
zZoCnf8VvTaOC>3Wkl2dinpa)-Sq>-ymmB&}2BmBFnzhi9f{@<c=5;(7&ul!(X(6wz
zl-A0QZl1sEnxYo_WYj5io0AW-2k=KGi$bx_nAeu4SFz?!3u;r6xI7na4-SShaPee<
z`LH$5*rNa-Szu|swt{FpHbo;o<dyj8=}GbEGC2^}Gj~mo0zfh+Vf+~=rFY@xs$7GR
zn-41^M#0e-4oi1E)3qVlafl!NEbCHgp+0oR-Ir+i^t5*fD;1n?boGhosxb5D7_r*t
zYJy3G*7+WRw&#<J{Y#3pNcvr7G+Echw(X)WDVdV~$X3hNpDaq8K0J6S_Sn#ooMC+d
zgY5v1;jcVg7JO8%2h&EdZ(-{d_5CkPb9z*OH4og7ehrVa?zN!>ufRgN5^f{C!4Oen
zQ>WGz{s3u`-NEIc43&xaL$K*}DMr17W8h!~{`aPtFPqOAKcW7O1<JoJnh4Eb&N>~k
zd^P*2m@a%T^+@4%4clE`gP0fWhSo}d6th4j#Y2m<UDL#t0Ta%-h-LGLeL#^Pp|YCx
zZMJ`l>E*Pb*cE2kBAUZF6C>OXD4OU`)1Q`v3(xNoz(_%EO7^Z367Ja}X0(a9u{+FH
zMLPwQi9A|FFGDDt1(9gAyFFHdz|yFmJl1zOx4~OF4ScY=c%YZ-ZMmoU>A4aaCZSL^
zYY_DCI;W(x)oj|O=*ksQ&q-vJS_{yHvnTyd+aoCQc_-EUC2UQPWoTqK=f{n=&g2>_
z<ojHVv4h*Bc>v47(jP2<mvXqS49?a+Em&|E`uW>C$os<JL^*~8SD645)02b8x0%r6
zEZ2O9rQ@8vlG`CWzZw49Zrm=()tRqUbmCmr8R#@qYBJe3Bj1Oa8~D6(;SXOFMCuYY
z!h-+&83Shbb@~ut<^#D?1Xdj7rk@oUl^9Jji$*%VLpQ7~Xe$9(F3;X5sF1jHpw5!<
zr<?x7*-yoDei(#n_Lb<H1>QvsD*h42{OgT+d4Q$25sul|)dzYwxx6wlRuE&i?eHxu
z^}~oR?AOSCU6TARA78`?q39IG#9WN4AZ?JeyDoDVV0FVo5%gG^gd#M(d6IB`7}XFQ
zAzNKFCt*~Nu_OOsO4iCqXe65S0&1w?@UYqv%@^3qVDzI<6u@R@HPK0et^GY52Y3iq
zo($9CW8cn93mGe2ZU$Y@wL@k(CroJ8vhVukb_f~as5sJt9zMDw0TQoIU<8?qj}nHX
znFHZvcM)cMd~LI>yEdPbZ6pNmsRm8Ht;<m^&oPsNe5yy7Qi5FdXEAeEn|F2&hH!#K
zkxL0uQnH6$$ez~`@IzIrC;KP}?8}|D9#p!;XYlq$D$+;aTTV@)F-{EmQUYJqc+{AI
z@ZdsnBn~Z;CCjHi$Mv;Cdh{{d6NWr^%CmU)p~=cAyg-%2M}Jk4;0EJjwGR6EfNbzl
zM#lX9pHI)!z5hR8PBK*HOTPJ4c`_XdsADiSP+U-LR?$F4(@5|-JNs*&N7c`tn(MF6
zKE27=6F>A9dhXgdEvTk3Zn;Mi3F07pcY8R2NLU{uPcl+qII3_}<?vEd#xr3Qg$te;
z8I-_VMv&Kim(HE%JuZ`5n<ZJzhBP8Fzc}%6vcPMa()BKLF0(-diK<n5euRWgD?XQ}
zUHMGmX4MI2#uxfyjJSdRD=dV^`tJ!dy`w73t)`iXdtaU{@tF?<h<BXu1jc8lN-Fp9
zb6;lYUVY}A{oCT)$`MBZ-*#VJs{Hm5E<{k0W=oP2N`r2{pazB!gi_fRZG#as<$<zV
z7Nlqb>OtP%Y!y@X1(PB#fMKPXQuuJS&(?2QXzbVHoV}Nsc`tsWQkl#Ma)6tu1GH#S
zq$)EIg<(^ckD3!%35dH?+VJ}R%6$8&Fj0~q=CmCPIad$9s;$+)V}Ytej7T!6FVB~Y
ztR=E#JhVCW>=A+u>f*%f)#bxtD8S<ssb87n%9&l;ezDOpA*?xlvv_LF4Nc*mmiCjT
z>)d;ne4dvXy=61HJblywA8dl-gObX7j0i4t?2)4GEM@Xmlo^)y!K;s=A*<l#=CHVm
zQ{bF&jTs`~Qdt_y_-X3J0&v5_t@0VDZmKL~4&-2zneyDEcynR4BKzBA!Wet=7bQXz
z2VLZ&j%=5B|9P#BZu$?u9HNg;|AeKu2Y(lFiL>_!>5^!D4zxb=y~s!6q66zH{pA$B
zel-ro#u+OQEMduivHQjxOCM<Z;U6I8Z_DTl(hVc)A0L4-hkY!1I6G3^Bdw(;wk*s&
z?;+fH<2r{;be?d&z{fj-)cf9&YcvVKu8*MimW01^DDI`D(`R7xGyRZhp6F$W#umk!
zt>Cze@iEuL<bbH_SC{8vt1~H5kR=%T#Z2Nf!Wxm~zOFJ}ICd`ln^g*2jWJ81+y^6#
zWjuG33dDRwe3(LalL<SO>XfHtD)THc5iBS8Egrf!8eFVU^zQm4dSk7vk_?U`dJh6I
z32aYS{4_^_LU==DCh~phr&iMQE+1X^IR?RO{ah|wAbEO9E8HcLkV*B}x%_WdDCM$&
zz8Ir?cA=RHb7n2ZuOK!x#bTMYJ^p7)@9vk02+R#!Ezw;O@`kGepu#|rIKq`qj(UbT
zS#ww`b-wY#>CaTMB<ByUaMysD&c-$NC*Q5yb;$Ze)4!r<$pOm;?jYT$bc$C6dxL~?
z{3>1u(vkdtCvJIiJDXp$hg+Mld6|g+iBSB8LdAmT%S*qbp&OJR7EBxiaOvQPVXG<i
z9q;~i)N+^it|PXCk#tQ7qZ*Ju3cOq=kj<O(oI)ugINc6!M>(JD1UfZRPA)l%K1M(9
zUPo<xxh+&p9^{gu6?Rkjtp*&%>-auiK`4o5uQi5Np;L`Mio4@Rp;E^F0L)Omk`Zl)
zY-B+;jd+A@9>6B$4d=@drPnk6d?Xr+U!GTxz>O&L+w~N-1&_W!pDUJ}OMbmEeTK?O
z)yi$sRjNI0lHh=~L{Z}T>yYwaQKE8>vFP%ugTA0>oWyK~d_~7{>(AEiMlQLz;>M-;
z2r_2QXDxU8p>+qB^}9WLrTE;b?2pPq%!g-?$S~ot7tom0>mPa53fThsIS{5kPVo@4
z-Sk9DtNSKrU5+Sng6YsJXN^VUY&^;90h7quIu^)L(2D(Uq*&s{z*MfR`19cNlUFU{
zAIcL|+^ZHQec+x)NFr#qP!$Ym_rCD8E#7(7f+-lF21Gr`+Y=kr9~_jWyv)=jD~QSi
zQ>uQ$<}nQRN$r-{m^2wUQw(qHyiRW&X!1R$Y@IU^n^TzrRz=He)5C<HP%*PVFjyic
zcV1~niZ;Nm-hqyh2#BQcPL2biht8}?>Hx`}Xdv??>sUq2b<8ijeLY)_zD8|vWEeP}
zLi!<Kq($C2^<%P26`|#y81-&fiF)agbeIuaoq<Q<k;O6!rZ%;-3%gaEya>ZEw_;v?
zN}ME`Kg|rv7Hut`Tu?*xvJ?@w$wlU)Jx)k9IEsr#8r4mUhhB<$Cr`|-nL_10(q{x1
z@btWNu{0#YE-r$ja)P!kk!Y9tmy{B->vXv#aVDAVr$1JzM}p}`+ZZbAHVkSu)}lu6
zJ;K0<Hs#4Rp$f1eU!*|nNgvG-w?&#^G(?YK8+Ik-7=juG(wEhWa1K=Fx}K{1$@mv#
zr9~de=M&(9NVWX8=))fTwz%UVRK|mlOa(wQXU*PxM~dmE>z!=f4xenNPQFh7<Bvb(
z;-NEJC69&k*CZfIDmSn*u>`bsLxkNEoQtN#GbRP^XVvRPW0RFXsE){4yp-#^D^V@*
zOT8Q2C)5hug$YiEx?g}H2p55PKR~Y>;j*KEg8E6?361CK+1qAA(R_*=#6^iA8a6oB
zAUB$Wn(qE0(GTjob>eJK{Ao?`=zUpErmcQ-5a#Lhx=-B9z=Te+)8v02Bj&$bh~X##
zh|E$Y0rVf>6AL$8PK4MQw;2X2n>TOszBct@fN}ItjI$jL1vhk(C3x<km#RS+ZDY>*
zHFzb;D8Fu|Ba}bR)p$)CVX@RPXRmg*=~SOG%)@@neACIT$NMs@%0o3Np7HpR&6eN{
zhO6ccPX;p&4@4}*UjLDPn9!vNaK0Qfj(FhaCVbOq&nspxR+w9Pa(+U#RO@GzL1*xY
z%rnv%LHiCaECSyxJ2D9hqH0duoAhBRn=o&+qAl{ce+#;<`U>AWZ+8-D`q`z#uFW4g
zMB?R#?~4~AXtg2G0FKjbrl1$>v1r9usR{EQdBpf4=BYn17$U9vp49~@?jqP?xW_l&
zz!wBBw?Bs}E+gin?*B?ME5UJ<zNBxzVJZg7*t5N`AOvMAyMVqRFVQ8am5$*A3u=w-
z=CC~mY$qA{JMY~vd7*Qy)|xnhiGKoyCcN$xkcrgt7m6(AqwJ~D0n~t)o5+ZPep?c!
z&P7sODFt#$eozCaJ*#o!kEXYo1a}xV!*63IBT?j3ll1zhG+Lq+n;ohRcqPc#fNVgJ
zY_O@~EF<`m&OXQ@s@#Kdn5AQ>z9Bw!KV>%=-sO&OwU#OWtCS?Y(=Y0!!u)j1;A@Nw
zxgG)7O);i@1vd2SYvlbb`=!{9fW)GAV?>qh3BS9O+vK-KuGu~wLEvQ}U=e`?wy28&
zduuqs=@V&O^l#UN%4WEX;TJ~|jL*V>nb`Jd4%8o7i9Pt4L_v1bS#pcZ|3Fd-=v#+!
zIm%i*c8L00pMd-RlR=&pYgp>9o2?bvU0Q2M3?&Qv_hULfUF-gciOE`x3!tkBjE;(m
z{)aUm)K7XtNmLB{M~=ugZ!%V!7^)%IIEG9Kx<a179X>1qkG1fd*=Xb6mN^rq?u#*e
zfmFp0{RZA>&rHZ=oT;mvD!fc>bC+<UaqsI3^4sHjR#NXseQ&ML?xO7~x)_71n_WwO
z;EXzNuZnOanX|H|L}|2z8@O5@k>A7~Yyz0QMy$DXN<u{+p_B?HQkMs^;n*Dpm<OB9
zyBTy2aX;CypPo<~Z^iFcW~11@#fv?YP0l(!891><H<H85n>`@1Rg(+suzVKob*9g9
z)b$f!IO?>ak3dQt78*>s<o@c^wDVkxv1jZa0suS=AuOTA{iZfq%v#1)p>|~~9IiAk
z3m%aQr|O}pHmDjx6=_8mF?2ZxnUMB^0#5<PztOx2p)Z25_0^P_2Y+V`C}e^A+fh&Z
zp$^)H6iRvc2?dzR{@5gu7aeX&HZl*-aFmQYbniPZlvg0C!`*Z8oaO_<Vs}Rf?G5sm
z&O|)REx#^gv+D}Gou;;%v-VF==VK3RfeDi?<&SN=bcg_fi*RLOsK5Ukh}ltS;NM6K
zOKd1ITAXE840wOfG5_W(UGF6BRPGQf1j@!w2116uNT`19xv@lkWYzUwNBA?XJcZ1D
zv2&Wmc#TQV64MwB7daTx**WVlaWSfJ(Rgy-I6jrIXu4yYQs1pM+9@&#wZMFfpSn#K
zWex^`LQs^3E&diHz>JJC*%mZ&v>w!K^*s`2Z|&wZq6bbe^D)D3F>1GHR)wS2bfCEP
zOfTdj+pP~@?zj<L6L^EkaNNMTM6M7hH#47CQrA~iYn29#mh^X0hpVOl<gsD`3isX7
z5OF~4y~}SL#{_(;#Zi%x^&(QzSnYvtQTr`Gpd*=G4A#xzR*clJ2@jkq{58v!se^fd
zMYHa;{fxA8a`7}}p)w)uHi`Yh^yo8z35eUJ^wF5|DfVCJ^4}(OCBtKF`Sn%`kK1FN
z{i?Ia_w3^y^U{?@&<A>x>x&jo7-ob(aWMDQDb!$Ye)7RE*M7UyRS=_C`jfeEs=GGB
zs1$~Bf=>JMXN5`O6vp<m(DSdiPQgD6Z*-)i98Za%l<@shlVCd=dQL8T#TXCVFUR|M
zV?CIkNr`;r)<gH;fixbJED;#xQ<bM{U#Z`X1dMvU6^-SYzJX=L@_L8!jSPc~qk!~`
zID4On83C6!jeqRtV^@C(Q=kFar?JBEFR%64qva6jj5IS6ARCj@iq(WP5(kkep9T6W
zuHaoctgFhBbOad(#FYl>S1hlrW7$W9(?vJef8ZCHeU0Bn+zX4(37iwfUdwA|b4M~&
z*!=T(g5_z5MiMzFP}xmItNrz*{V9Ix(1s_;Uz@Yz)O()<m=_WrllJ}G?^uj&h3wx6
zay`2g{$|FrzC5%7KYD&<*~-hLm5wf5#?;sGf#G*Q232#$s^u5XEVNX6u=`eFH)ZL}
zK?uVR%rE4>H%igv^9R2V4QY#l=5AQiyI<H&v{_HMF}_^{9PoxWa3f_r!$`lYG@@Ab
zY^l>Xtl@c#R`hBk0B29Be|QY=ExzzYCxlpJ`0e4<+L8m0^|>#D>G`}@ugCnRx4oc!
zWA`|K3m`P^3ibYSeqicH_;~&p&89LIEuwBwq^Ik2c!{k4Cw?oz$;ltXFI_)B{W|Z-
zLdmoTxx2c&iA*I=r<#hDv5^!OsE*pnKNEFLZFrh0Pbkz*-J^a^Rkf2Lx=Z^=0_o*P
z-lJ<3N&UiC8GN4`)-6_VjyDe_^bdj+*~f$X{WC+20k}!mJ3@zNvE%hsVGl`5s^0iw
zBHiRI+t3!b5%Kmr=$Y%ATmQnB1Q#GaJ}&h)+t<Xk<`YB92mUgtWJ1sn%n3+*8#Evz
zZNKI6TFB({XB-mXHtc9gz5-b!F6PI3y8CJ)&ni?>p7=t5-EHVI214NF>nMIB!9~O{
zt3;8do-WY5;fNsQV1q3gWU8l}XDH=zTg^t7NZT{SWQ)-&+{caefu-i%Iw0dVX#zQ2
zz6szt{H6N1@Gv&VMTZmw*G8<r#L;jPIdgju63ynaAx%xF3td9IQR+n-qr8VwA%ych
zkqpR#6wK9f=cJ1NQgz2nk!53wD-?5<mmBr0QkMkoJrB_U;>x_L*FHDfo>AO=DK`bY
z9N~0BWh^dlGAL$Dkan>HWd~fv6&Qj726RiY*ba}`s|eNgcf3+=jPr{l0t9W40I@do
z@Eu1o&^S80vw@Ep^IMl|`>ogccnYaQNj&4ql$HyK_t0pnDtxko-{|iBj5PNJUQUjC
zJ!L)<5*7?A(q3CkIZ#A5q<^Gs-k<o8TZe@()*fF)PEHX!DJJ*=+3GW4NMTUZx-s9h
z2x0zwa_1`g%Ms{eOaYI$k4F-MONgE6<r4Ugta?5g#cwPi4hxNv$o(~UPXo9}LcV%q
zGq3V`P3uH*Y(FMAM)r`Zxlh5DP|OpHd&Qp0h<4RJokHBj<O>h5@(w;^Lpy$K=sIiT
z!pMKmNgI^s!Ws~o7o=l#3oM41Gxu3btWh6^g>NYmVj|1UZ0s;lNY@HEh=SxZC;S+Y
z1<d*h!o&E}Ty~zhMcpR#@dvVL0iFMvHINU_P85ng0+NI88h7tX^sxeD)#70vvG@y}
zpf83)7Fsu|6(LmJt3(gPapGx>^nbeUHf40WvecE|4CBZSX(1hZD&n~(hp4%UiV6j}
zWvgVN15Ku0ih(!dqUS>Drl)WHEl%7R+-261ORp1ei}hJ2PM<TM_t8h8LM2E5ge@9<
zpV9dHXQTbyv{wz~SeX<HggkJOer9hk>O`MZ)4nfId*jm|GdoPC6z%cVG5h`UkYR=M
z$9nL~PV!HQZTn&+y6RjQB4xCOBTDou6TjEQn2CSil#XPt$V3B!3)Q!FB7a<M(I{o<
zK6NMT6dON}4+MTWKmv#|b0TBS(sjzMl*UjTI+Dwn8;uiOx8E?UKd1+z1wr-CBe6!K
z#_~(=+tRD_ugs#cH+fpaiC&u1S8sZxWU8H<F+45D{#b}q->5%F8oy*XJSj-zNw@!_
z8K34DC%x1=d<XQr!LLIU!H*f=-_;0F0W!p(WQ9DPskF+Iw_#huPS$C--{S*ujuEUM
zVBqJ<eDMm<SzvLtXvddpdPix3uEsB2%AJ%?yXAy;o*kpJ=L)TaGk?@G!aa_4mOfMY
z2M`8}kUu>D+Ezc>zd4p!w{YTpa{A<d71%SNV;PQ?vRXe6oXC{Yvd;^Uk0%+mm2Qs^
zQ2GkkWHmfydCPHUm_aPHKJ{)Zq%);m!JAWl`&A_rNZ~wABlEimok02AaCT*R9lI{<
z!;USxXQivt&=tjb)Xvc3fzC7rxH#nnR&V;tj`nV0N)lV+_{I5IynklJv%PiGN#+-Z
z`n4>gW$>5~kH8sc{0otGv3G<4COe=E#=f-fS%>Cc;z@?u6ig48&&`qKyQS@a-L76W
zgz0n_Mc$k$^2;>;)UtQV+az@hq2o|nyjxZ-%>5db^kwE2Lf;n%P6k;vYm9rBz6=XD
z^t0D{x_;phtP*VccCxdPrd8?iXE$dKl@<ES_Z_v#)8^YR9-Mg^=xZ526^lA0_ugBw
zxQ7Vv!!HSkq$-mDuZ?5z)5$}&iz(neI`xU$e$H{XwX;RUItfh0wl(Z(Q-$ya`f)ay
zYyQ|Z#C<b+M41%n*gJ)HlOLN<S*8eAGB81|zbbAh)@|c3CpIy+DSecw4#-$rBGm8F
zKEMO2nmNg1oz3M2+%ibswX=lL_q13`;;YhQy9no{`^U$LkI`Ui_u1SVdA<_Hp3~0;
z`ZxbA7{zxIg8uq7zI`^VNpO|bdpYkR+uPS7v`3Z%qL--omA3uXH?ssa@3n8Bv2sut
zB+Od0M~}S4VYsTFX%_ZljRo1}3;F-5P#L|60mx#uG7KO@+&b2>`%@PxWZeid56J{2
zv6!+Pe1|hsVA}l7NSX0hQWwRW;V8DQ>H`nfxt9g+`$uHied>v#ge2K4Vvzgd`_kXr
zC_V)vjw_=BE|$Iqz&tj_6;`r@2*co`Tg1XOnM(9T-;|8akf7hh0TN)<kXv>Y;!$Z?
z&OV@R6}!&qAa5p_F^(?B1C|!b@IP+T7Y11yJwIxYb#98=QLYBXiL3K}$Ob*8=>*nv
zYI&3-tZE!8QBdFI<pjDZe!ga+O$PN9-pv1zpIf~s2whHc{oO?80hc{Uk6Yg=r?ZoG
zzqatzw<UKF6b9WT-=A#ul>zL|wy1Yk6?}J!iCvzQ5oes7I+1~^iFp13lik!n(r8|c
z*FM?r=a&3Ucu_Y_9A-qW*wdul%du3C*WV0VDSH986W+vaE<X=2eS=X9u0MN>d=WPE
zuh~Gj=C!KXpgU*cX~QRqT`Ef-Km34n;p=gl-rluO^R8e8VL<L_#QJ%eJaF?B^-I1#
zI8)(!{3^F;{H?Z&ZOfkGjZx`4Uc?xZuS%gcc+Xhjr`L>I-}L9{(Pm`@FXMTdoQM`A
z&3Qb${rX2s9`L{iGb!@U0D7~`FDY)Q%nf@1A+BJOi{K-@W~%X7Zi*fZXsv*5dcM6A
z3x6&8$^rOfU8ouAe%%hQZ4i<*lcC61M#Q&8x&FY3gq7io+Yea)Z<H=0&$Nim)PTJd
z!-5q&zt(ni-Pk6rzP%ZN%PWR!sy<M_L7F`?Ri)zdld_G?QIV$$<R-yOU!a2^6K4gz
zWo+tC6sQbHva;pci>kd;?9fZtVf4&Z4cDUK>pXUd{I~&3cPa$a1DKtZQD$;7&USH=
z!;0^)-4mQjpAr;Tb8d2`(H3PNTl*t+c4pZiV*b}1ovk)kNWnkpbZE6LF}ST#%LuMh
zkLW6WE11w)mv(4YF9z$0hvR7QictA!ODsv8=rFknF)^=wn+Vfn<T=?=bMZrAe^`<8
zYXR$<+t<A2t7LyaiHduT=}vo-9F&XU7Y5u=sttWl6aVkmO`1LXYH=dloQc1vxmZqb
zKM}yR$SIt_<1_0}=gt0TvBU8A8hG8|*QnvtIlYUIWSHA>v^t~meE<^4jU^oc|9hEG
zOEP^q{{)7dfU2o=6g38j_j~zIWc=d&Uo|5!TT`-O*DI&dmoBT5@22S_>~xZ^f6~X&
zYOKl0j=J;5Ve8RX{($E0PQIl9NV<)VGY~O~Zqax`Jw@Te5niwCL=*0w0^l;7=YvHg
zUlsi&P57J6PaByf&^){9INc_>AB7mQR~M(tBYs<jONfY}@>KBdRF9fj$y`N_fcZjb
zQMXGSX-NZ1?W3$qPbEP6f<vr(fEa{w4kx>Xns&4z3$w^$k8%HZa(=|nmnd2PCmXUC
zJoWJx6s0hrLZBzGu^p(x(aDhxi2C~^;gHU&utR>@%T(4KUzY^!-GwY=P56;sLj&ju
zds{_N)3e)x6{NopLVg+e&?^OY7Lri|UK6)^B(@(xOc1E*{n6r2#ZyR0hk27E)&Z;C
z+aOc35D33$p!GOH$V$`dIpZo^Lpt}Fbz8bn=%WU2-yjRI-}~%vXZPqzT2lJZ<2MK)
zZ1Fh!$Kj~<GHYG5=U&&T=Yf0tqcCwf3sxs_I2jXQ>3d(zyJh?_LV`ea0M75Vc2rpn
zRI$)s+`4fQrbG{cYED^~QFU1Bp-PMRArtp*{rKDph8g6rAvZ32gtn3+zLO6wO@!{L
z(Lr6xIA)49tm*)KdBS1Q7h^F$l4YK}S^NRvm!CzPEbywWBMoP)Yi{>@ztr}O%39El
zOcF}5iMqKTUJtPlA}@8OfiB<J2MWm+Ll+F7Dgn$SJw>i62G|=x&mGy|>k0@$GY8w#
z)Bwi_#zYGU5;~n}mqYa8V=?h+hzTc(-g2U7hj97qbJDa}%6*(3%|>Ie595)p%k%Z*
z(I}L{s931Hd4(azW%DNmLr_wj&Gm|XVN<sQdT}~>g|{R*ZZ}d;c`t@S4j|7N4jZX^
ziZ6<0Vs+T$#8a&gBUAL1{S><P0@`Z&>cPZ?+<)oX?kn{DjKqax1R2Z$&S55aC(#ED
ze!+jftBxxUf3-pz_$0b~Tm)bcFlP^fEUja0DpsM<!wn|c8e-*=7`dM>rN9v6x1Ad;
zqDPW#UT;-{p8|I@_nMRBe2jYbo$HJaVd!7|Tk%T`sCsq|H-t$fW=$x;DR{IdS0`B~
zW3X0a*}e%a3*6@n>YaGuWj@Q(PG7uFs&k8`Ch-Kku}e|*_1WNpINQv30A7AEZVQQ0
zCeg7gtkZ|EOpQ-S2l{D=L05W%p5wwQ?Id1V1JOZo$<49f)@L{?Q>uA`niyk2LEVg$
zFJC{X!=}oi*M&Ja0d0YYw19*m<+C?L#lXmfoA@t_ew*Nvu}}-)3CT296*0_3Gb6OW
zhX;!VN0**;vx2<ubk%5hDL{*++@2j}c1?p)Tyzax$v&(~w7;&suq4dqDcP;T?t*`|
z)7X5<fp0@HlOQTm?PCV`(=#K6#&_-pXrN?eWwze-8U@qRHSj*wTOUAB2ZB&eki`MD
z1>>_i&V;ItG<bS9N#i(GYF|Lg0@{c{3d>Jv%^UwjI5w0(?gPSC?qXN~e)|P0&m%go
z4fap<-U>KobiW~Rsw1yGje_+uL9Ip>^k|$Tx=%mrQZYI^qFdn|URYeXn(DmC1Dr3i
zmbWq=XfokaE0tSClYC$j&R|8uWGr!x9_ds}11#TGFNoRBe{-tT?~HL434{ld*R!?+
z8lDRHj#@O2nBOo@t8D#N2}t4$)*zc0G|9p3uI=X-_~1reHD%8#4O48+tbkb6R9?QG
ztPXHPYKUlTjyLqYzu?q&H2M*0n7qOJng3~l#c_m5T{&fg<ox0npc`)SrZfNO0x9D)
zj`AQkUQR^N=99${!ET<MO-_<%7%qJYahE*XlO9I2lze#00hJZw()S1k)!u3640g>q
zEOHj{PNw_A=81N2rPNv3qGZM>JR|Q3|L8~uoE1m-&XR$+wSz3@fKoen=bnz0QuH6*
zG`ESL<au>Zw%?o1r0`x!@vcVAzN2^uNlv*XJ7&`d_e0ezmXDt9M!>ebA8Hw|!e4Ax
z5F*T;Q2hSl1naY&Lsl?bOE|0K5_7fEz)9n2h)SST6XxZH1NAtiqg2Vik#TchYBB>w
z9AIp^uJjyTHR4I28CHh90fL|H|1s&q8D4Y2luLyquq?a|5|k9E>Rx=(bHC3WK7Jmf
zZx~xTV2v)cy;j(z>npA%rQ}rsaN$ptJxlmltW+10?XF>RU^WhF3+zlhf~<z(ov0+)
zXS?X8m9s^xfP^o*2G%ol>?UQtKJmz$wHA$_5jwJ$Ia~cDLc7ERjXg3HH<l2D9t_j@
zzPD^UwV5FrQ4npco(nVLDt#{NzUKZ*if5$;$K<!WF)gJw-Q<vA*3a0Zg7`H!$fAdD
zrA|@|-$)c(s<qnBL?F<%_6=vbqwA=6q0+BmnQ62V#0pGr*FR6lUiQQ}pN2Wjd`o@0
z)NgK$H;n1(CRAxVD6r~>Oh#~ag{ng99Yv^s3y9XF2r%!+mixoM-;*P4&j~Qvx2_E%
z`B9B!WrT?1n>OM9(90I-zP+ECkzM@p#1xOj)T_A^c!7a|kzcI!FLRJd=bZo()O$Gi
z#hiE%y5m+Liy!C+5;3a529(@!$OHL43hvCjKsP_T5tD@btSn((8q}hk`0~U9P&||@
zJ_8kx@gqgL$}6;S%!Vn<uKf@9IX@poF$QM;Sh0MAZxuOp{>1{2q9S_xF<MBbj!lkN
zdYtd7!gLQ+NZ4zw;ZzwepCYc0mKJI98jX3k?9#-)n38B;_xl=~is1nGo2#w{znAS-
zz8h#h;B2uyw57OzpAaHkK79wxPjV&<Va}AEuvwCyLYP&Pqg`^tBov0$2T)tP&0hD1
z+&{0vObZADP+>yq{=KeTK1;}xMzEKYyveb)Y(#R#ufy-;z)T48lQP`S@OW?w5;aHW
z5IL+dqOgb-<bLbcyMzl`c61BX3cT7(OsRaWbf7f+$>}l<O-AL~=+Fek+a7J2*?vV`
z<4u_ysOG<DurC5kvh5F5+H~R5g7Hh<4~#vbxCDCP6I95+KLfHaIF1km-^%5lg2xwe
zZ9eV#S))A4#&?)J#p4xE#g{qx-zZ^ZUk+$LH9ne{|9!7}|7YHZ3o5e=#P8{pA29A>
zvJe%x@z;VJ^wL0oSP{5MHl)L7b*Q>~b?nQUP^gshhuN`;i`$cmySt5&O?WPv7Xbh&
zxBvbHAZ0f_uC#l&6cONiLb;GG46uzE0jtrz1i`5Kz3%;w+P;D>s_*-HW*A`Tp}QNU
z1ca}|&><ZHA{_$KAxI5Fhe(K&0s|tUNF&{y(%l`>UBmq6_q>Pa1>Dcw_ujqFUi;j&
z)(K)qYx3QDX8AP<ZwKd1npM#%!#X|g_p}d#4~Hwuod^y0yCY7TzDEdK0N2%k8jmz0
zq~0R(<zIwId;INrPUffIra<lT9!6wzY*>}-rk?+uR&scyDy%ir$var{N<YxM$#?7D
zW(=<9Rmu__1Kil>q-J8~&!3-9l6kB3zT8)dz5o))`hjFm#?A$a+!)gQsucT+JuxfS
zt4e@Za+hXMr<TN>>JiDE!SqLh935G}qMA>pDa95gGVtK)RJek>gQw$GBfQ=l5y(Lj
z`cuXJGw6ehM;Hi&wMnsHTspUw5(#OZ*162@i;9KpDjFq0_qgbmi>#{{tTX7`67G-p
z4_)JbT}3`{wO0203^u?4%2BYC^4#z(M6D&M=ofo>lwhLydANh-`~=tP>c%Q`UI;1_
zuX#|S-d;igY=<T5v4VSCf|@r?|Kg#&UF8(R$G-KsSH&JrsF%~B1!{@<4}Us2y*eB%
zCX#F#(1{cACTd-~!#BA8P1Ck!iG(s~oA{`!23#8-57Z9i@NB691+H5^?8UUcbJ0)R
z5x*T~qywyG0Y-5gB+TIBBup)!FRvudH+`)4-TJp8aPl}gv+?>je+?8c`3;HuS?zdK
z+Qm&H01DXTQx}nRug;1aUH+-zN$XJj@aybj-(RI{aJ)1zQ7z$+J}%T>1j|)Wd#WS)
z?F@FnSI+3dv3QZ^IAY&9SS~MaE(Xpg^qjq*>2`cn!{!@~r?TqDZQuHVuZhuTpMNu|
zBGfEG#}?8Ag~N%HE&hnOytG+Zj{{K>NIyL&{pfData}(DH#i?GZ^S;Uw)(nV{pgzZ
zC-p#wJNDHB_LIyr00u$s-qhW!edZ5X{--3At;cp#QBD-%xnsc=Nw4%_Xu327(nE9Y
zC(!>X2B9bc6Ref#A7-^H8it-*U<)%Z$^@q7zRQx(XJ_*|K4u*73v%}$`W$0lYST4d
zGsiFmmu%Vl6a2C}Ka{W~qM`Bb%=N$N^3gKacT+D!QdKvynl_NX!#?G)(`f++GXaU#
zLMON>!MA&Hfq&lFXZJ@Ez&m&S9B4W!ke*$HC282#S08lvZkFW(b*w$9nN)2ltfB`7
zVYjov2^`(6%3rr$X1`<T$_MirmAb)FDgUhomzq|GcN3ICgwYIU;Ufe;dmKltBP#j}
z_+0gdMzjNUNZykdz58wt3Xy!8>q6E%o5G$G^#$x%VCbnTr4HXnv0uNnH%+#v=N#bu
zy2EWUv5I9$^GhNdIzaP1Y@(8`_S}3t12_AoZwTwZe4QW5O=YPK{c<+C_FprW2d7(F
z&hAvMUi89)m^NR&s>sR41+%PpH{w^V*?tIOs5yq##Xz#l`E{Mx$lP152b*_tdD6HN
zPFS|1w5EQKzI4C$YCoi&2*rucOjw|H#hSl<dVp)vBjQu=M@^DD_xD41;PBFp_D}0F
z1tFFcxA+<doM^zCOMi*{-D>6^5fVV1Br*tZt18WTYcEPB8xtswOguO9lR*oA6OpY&
zz;K0JWhc8wfH%_7IrSK<48xYAh9abLPQOEtkM&VV0QD`G-m>SK-f9|knulf*qJFhP
zPdYz)I)uHcYLhhk7qax<JCQnRF%qT`>s!ynaJzDszOV*=9IlR0=2B|$%n7c1fGU=!
z(7^yoqW<{R(5y>gGpjR?QO9OlQ{$>(dw|<|vJ4=}usfbzZe3S=PetImP&!z~K0D@R
z;JtN3J1V)x2gNx9dqzWpqKNv}#l~aqye7T0r%Wo7N$3)jupq2}#BgmQafRs@hCCC;
zv9gR(J;C+OK;htwfbd$7%7?NxQYOlP&Bkok_JH2vyjgBi;;njgT9?g!qX}KSJpXWC
z#5W-Zax3w+sNbH6n~(-gv$-K}c%7<$!E{@rpWw4VEZ$Zqjx*FA?ZKm*Z)0a@#Rkjt
ztCr93tBjq#dS$FBdKWV{66CZ}Z;|pId$E;Abue@D`}?7VsLuhG7J(1ncHB%Sb1w>d
z_zPO(r`10IkAYOZ?MmuNI`ZjYEFSF8c6KSNrx9;GNS{-YGOUnZs#0*^uUE~}uH8co
z4oI!uu+RR{IHp##q3pE=J)M^*toObCIElxj<F9v|^sw!SQA7Vi<K!`aMm|dz9DPke
ztpkWnUg7v170<VxuM1gyJs;egf%_aqIIVW5Ok~ql+$}Jf?HIqCo3=5Jo8|^TxL<yt
z46x6IeQVL6dZAd^d;B#{<|5A1#(C%knA{57WW;X;T8KSNjOltv=$6Tye1o6A?DTW8
za~b~M2Nwv>OPPNzPn&!z7s@szS8zoNg5`nz;q~Bg)zC4*`vRxem*#f)a+^E8&Lg#F
z<Y_9gnHKqvXK~L6v02hvJsEoapeeSLza#F0f;0VIUWSffe)C3HUYyg%Jd7%Q=rP-B
zYSI}5gLC?Zl5LVdJ}iG~wCRs)dG)rcoByZX4pWwDT999BjGk17Q>grY%2&p9(&hhT
zA4=I&KFnPj+-3Fk)U?NO>heCoc~TMGiNAi+FEm+mh6PqStiLIQv&{cC`=T+>*?V^V
z7?^RNtNO7VmptxK;U0W}l{IF$SOso>p>DfvMJZ#t8$Mc8Pg6T3*nbDgLsquYK@obE
zp7{t)<UDHlR5-xxhnmP2(MsS499c!F#~re81KEhW>8;tVLG~u24n30Z@YgCI^6&K4
z|GOZ&y+Y5qB{|rAWqUz>=e&XCG3c}^1E#e6a~igJ^DXH-VE{Hs9Kd9|s`O)7SXcRN
z_Cd?k8DqaRkqbx3GU``J!U}hSD7B7%nF#<>tz@I;KLAu8?Je0fu&JE^bw^uDuE$Jk
zw1o~nn^Fqlj%lsnMf30U*#Y;<F=?4bs0Vcy(D#dEW@<NVx<(p}@Nb>-%%6fDAI?8(
z_LC?sTo`eSoN0XbJaVInjSg8N@kk)SAI-E*cP*kF7#Px*g#73)Ba6*<w(BDvEYY;E
zywHDc`cW{ovN!{c{Zj}FS>4-Gwclz&@;WU}%I@u|zmtQ`zN30B!9ho^Z2Bgs{N(Bq
zJg6Z@!~Z61Hv31;?31YizTa;ZX2=UJ%YDvfKS!4~KU2!U36*R#y;91Md<Qu{p-sKC
z)tgD>peZpbVbgP)(|k+q9hK3ur+j0qQ6IFo-3#kU+>HxKG!wWnrvattK6G3Tp}EHu
z>qfL3a-BZ?xFxWm)jHHNbooP+na!i}BW+(aFjc<IUv_W-oi_1Y&$mMY^0T6PW??V!
zGqL@ywZT{S%`5tQNH-zg`&omIL2G%ZD2R0jPa7xu0sfv<g}~{5W!83?WPeu<?oP7y
znmgF>Bz@dP8`M&bmyw$ADhr~Poe<f2_mT7cj>fJ3z7VeXFSq(U9ed<ptbHbdO`zGg
zR0Y(u21ALDT5H}DelWnJn|RJ+jhDV@jRoAx5B+Ep*_`v4Dc*PkcNK?0lNAVfu|CbV
z6@$NDT)@+i_?lu$K}BRga>5NBsNRNp5@pQ-Gyqpk@ignxidBC~(!JL%pH?tFQOt@>
zEd0(j$Qw7k_NeaqhL%d-N3DHdoLFEvbaW}dYESDb5)8PJ@fk8CmdP65!{wk6nG6GG
z-+NZHEH>EEcf>lF?D{=9U)O}0d9yFfQ@EpJ<&N;3C|he;EKW4SEpAVj0?6c-m>iR@
zo>eujctgRz>+}wM3!z==UG7joSQg$Uzpszn16lcf$Z6&GuoR73=1?`j<G<HvuV8!F
zlbfu|w^QxMqmtvteXh!z1sWWajrx8pr_ig%=Fzb)3zs>WSRn|2K?9j7`P#<bHh+w;
zq*gDvd(qtM51VlufM*hTEoy&_*AR$nACnmt>{Uy0%5BdD(A3!YXylZeC!tkv4#8@w
ztoegCdN4o<9<arS3O^ci9{)3XTK!>jocZ{cc%hj`=Rxhn=#HBOKq)_z4ElRF6eh^l
z^Pu^HF@k~8GD7UufI*eyJnN}Z{=mO{!33IwHVvcv_X_>$`%>keLmb}|x@CRqVx>Sj
zXNO-2Rw0Io2E2GyeKxI84OyyMVlz#EClH7%WpYdZd!aesAA5tR!uLF)V^9ry6?~S*
z!IRD8#^V8%@R!c|69=b4iL|?B_!*~}rm%<&xJbmt$g^nWtt`G1oUhKEq}!^>4+kaJ
zQgFcpd%^wV>%SKGO%#g)V9YzB2-QfsUvwH*ys7nPRxIFk`9_ywnR&ax9fQgN@CtR)
zCF#VTo(dVi5Nafh*D6KQg{cQegam&?{Mlq5=PZX~y<YsHEA~_qet+jbu<O$Qi`p4j
z?@4{I>qJ}U#P)ECmfESAO>c&g2|$(VQlG~*KdAs>Yq&d~wbJ1soCn4Yc(GN(I@mr*
zy2Nl$ARLThH<Vu9UqOZo78Dx3lFhHQVl057l(Z8(URzkSp_~xzvVdP;rY`e6o-X5a
zRx{Hln&Bwf4*Yxe;o!9u{WYiCkNO#D2#Q2yCZWKQTFS)x;A&-TOY1M|Fy65^)91wW
z9SXFPetogd)*mI)1hOi6>}|uVMpb12?*K2BG%FZK*_?15-JV&Y_{cC6eBR(Dy7|GN
zS7fXV=(V#bKsnc&SBJuPxK<q4@A7Zl@>lOEqNc`%N?3|1W9TPhucoe-@B8GK?#+Pf
zg95llm(cY3z2cSxBGk6B(ve(<(7sqHU7}D4%pT<Vnf|^4jRaY~1oDEfH9Ce87Ntj2
zHy@dM!ZJ9(hz!~i#_`F~m}-eii^DtmtLyBxUHgIRSNH5JfGPRELD~gN^A#p;CRK%k
zDK*Ej)hwZc+S~v9NO}9S{2q~l0&*oToi(~T_$+rjFM$r<tb^YX%D`rEhDI?&mo!mN
z^e}VteVR?kn05)d)Gb^Vz-6V2s%;J<(-eI(moC>vWGY29)G1l)W<CGSVJs4jrWomT
zjQG_A1gGiAvKi>$C*sRS5x$yJohxhKRl)30w!QHo3Ji05??w`j8i+KH2?YXqfH|H_
z`uHCpy`gIfL{d0Wi>+Z4Z8Q6P*Z{N>3@!LvLh+#1kwNj>x2L=a2Iiv{QDEwNaL~`p
z2{{}Ijd#)Ah>wd%GoI<o)z`OBOeNfw^O;mGh!IytH1IN3eV*{dqX=s3h$6!~C2odR
zCRTNr#8TVSJDOqiyS{8J+JJIv4IaS6C~(v#C%Y(me%Me!BvRwlLfZH6Hc9jjPXqpO
z<V}P&7D$J+4WH7;Y$K=OJ=RF4A!-}?1F)Ki)&ux4Cz0=<-_N1#i4p^XB&p<Xpq35l
z4n-I03in90I{dcZXEMS02f6H{B<r8(p4AsRU2J%X5HvO*05|`kODUj4QLd`-Z+b1O
zK-{mV(0P1p?AC6Rc4#CK$sF-Gstbc~9YKWHIYq75mIYYPr&Wi%cebvj9@|jTFERcP
z(&92fBoKr)!dC1H2*=+ja*71@f^e~ZS(x++CW^D4niMnlBVlR8f-(Wy24jN6osaP{
ztY9p%Sa2XCNLGez7tL3<?-^@9K4SYih00<w9JF$gX5`F}cnV~TN?i_BWW#0aGYHdr
zR0DRwqq|#>Xl>?!O~!Oc=NqV8Cn7@!FhCCYo!Q{H4y~`_|E<tB=IYnGL;}<7wy->t
z{Erb1Cx9T3ql#wPF+$oniBG-q$Udj9lavmvJ_h3(BW`>c27L9Yx%%F`WAOJ|ES|8-
z%Rh;!4qDGQ=zU&8N`soj8!xJXTbrWp7Ei?VrMOrvRrFWPZ@;-KHu9vDJ647nKNmCo
zP0Ag|R$x5sq1vC)g)Yv0-7+BEx|~hr$j_PG(i-!x;4MiP$ZUNX=FO8A_&DBp4Ubra
zL9TQGdNPZ|8~|oS`kM%D>=PO9OL`986FjpzEX%iSrXuQ1{iph@Vt!AZMJ_C)O?q)U
zV_zu4wA~n__na7P+faBBcV<9f5xKJ+{t;s=lUd_+A%;GFu1bCee8GJ^RjYb{+(QK$
zx;cWsNX1(Q#)l_gb|K3yo<4^<ivDz<zgyj=Pk*?>nz8<afuJ<r?}E197FF<XnIv&7
ze0hV|e?AiU5scVDd!w^>ACIr7eh!jK8yokN&SI<mQ7&oAxRd!R{KoP^B$Jfn;()G>
zy!DUl1rk5c{{bJPg3j5W=4FiV4~W}NAbEIU_c0hlDjKWt-(VpF#G)Uwcqy2rlU81{
z)<`?YT<EH6vfe>Cfye~Fhl4`lJx}>v41a)WX0Y-DNm!wnJPQjz3{<{2^J?%&vl}X_
zUb3tkePiME(CYa@qf5o+^FMCV%YP7u>2z6t4;?}J4qQA$YuX&uc(w4G+cCTAgFW(M
zN@<C!bLzH;cLWew*1j8Wi<dxmidgtTOksIQD}NkMM;o)_6CGXh4{CfXHw9?Ou6IQA
z$j5nn`sm;evMXT%W!b)u(E*O5z`?Rzg-X`js2D>9C@Mvl)O<uTC`|g2Zq2s1T^tY7
ztA@Jd-8IA6bNdV>@ISFxeXy$so5sgcEMHck?deU4M9)6TjRk}Iae7%Z^cMi$9LfcW
z*tFdbRG3G{jV*$2Fg7yLL*n3Xt>v_8NTCQd<H^HsJ3K$&n@MtYGw|1LII~ZNIb{iL
z?~W_ku8oAgIF}|6wy)lF$PjzM2!60Qy$76QLl7$q!GrE`aOH%bhu`M@9kGmSV<#I0
zjQ!><ZLZ9TWP`frBixM^jI7umth<V46^*me_k8pLrbwVxuk+vwkO%CDj;5Zd0@7+S
zi}oT|6}hja-4V<$vUtpEWR{XY(zbpLj%{a0vO=K%Bu3)gfXBNUi%Zs4#E*YAzsBcQ
zL5`Kwwjh2Voc6Dn(CVv4{bS-Vv2f!_^+#0_5Q|2zG$3g)ISGESgSI)Kw6Mwx85<ED
zok2ya@BCZV8kHpme_k*;k`o9?iDvJ!Y470b5J;nP<k`aE6e)H2D^;36jvX*bWlixe
z$p30fF3>0A8~m%#Cr*m{ZW{<_6M5@_F=mX4x1A)hzzBmHL;BtRf--WE*abn6CKiZc
zp*(1m%fdd+y9G06A3skZq8y4s4<=Ke8LijImXfG-)FgC#cL19r`C7<|5yOQ+27vER
zFpDwkxHc?_xpk^-mm6I@b?+MUv&{FLpd4;X@x4mty!YxsD21XGB3Tc{|8^xoAwR2u
z7Lya?L(r2V(ODT()6g%0VYC0(yIgs@(n`u-@d0=XZ@l_9vl-mw$4c!|P)kb@oGiif
zgztC(|ARaLjb>LH82??ZB!PL+w0~MLbrvqIUN{wkSeU2PNinc#gZ4tT6!yZe+DJ>u
zne69H5#S3I;&){afikQ?<}Dwr`QRudcmbG)WU06R1T9&+{7z67=^tkFQFfKhmV!)(
z)U{zh#^T4sRRV^{Gw~_R6r8$)PMJlYOFtIMkvu0R$C1u>R^PJVJ14~hphVCHdjfRg
zgnO*cC4WSgS&67K<}p8~G_CqyutT6xyW}T}O+H_nS*0<KAa?@Dr*)stgTIs6r~H*1
z&%vEjs3i2aUD$e*GjldK0dzbfR-Bri9Y&u=Ee-j?(MP>Zenpbe7y9f{PH<^VwTG2A
z;7>mBF<F0PV)vXP4_Gz7cM(sMl`%t9qXlCEnMgQi1g%H)9o=Fs$3df<I4Ld2SLR&T
zQb{#rDq=z8$IKE{!7the{aJ5Jf+3j2?NLZzu_K2aTk%zp*NeB@i3V}pU?x7v18S=J
zJ^;tC2Z3RixI}WiT!Krxli*BF;c8<(lLQswfFhptUBlA@l-#$tvZkF<X~C1(<Jc^b
z?HObJ-ktM7ATYgqE=3Ozk3A*UXc2xqtckIGbN{aaU`=0FhDatH<$wWCgg%#P(p^wU
z&)8#anQuNOYEfhYBm~;FS|pk?8GYj5#IR(UZndNOW*D+s1U0;>WrnFLL_=t;_tv*2
zQxN|iy(L?qsIyQSVvsfjfqjiugs1&mV6W-CBrm0P+k2~?YI(^4a0gOl%<}_C_to|F
z<QFd5gVEPC^}%lShKZa3bQDF{AXDphu|a5#2UH=N)6L?RI>``KU@-KZ0tyQ46vln7
zAe^giYY*dm3;Hj2vnu(7n4yM365H1dsa9VNP|T|MV%-WLkcEc*n#ON%Vk3?fw&o3h
zV;I)2j-aY<BtEZxwS(L=IluK2_4?yyg#Tf6E8hb5494$;SJcN7j)G|*xOEeFusoRi
zY!(!#e%~^LG2QLYY_O%Cfe~Ff^Xhs;248gL$9Gj;Jb?Qw_$7jZF*@qwKRA?zgg|Y4
z)uoCv)LPMFm_f%gUXgFTh~w-MnUp|0_n>lp`qV(U7wSNZd}r;~6LTiR1M-bu#CR?1
z1n<*b;?C`3(GMkN_sd-VV>`=V3BNu$QaF+KfEWmubUz`?HpB(eD$ztUVeDFvpN0R4
zlVV_nsW_ImoGg6OQGwYPWQu&-B((dJ`^*cxNhrn#z-Y`ki0{@-W-%h-8S>xapxTg9
zOL;nnXHw)=Q-;%CQO<>|iwYz;U3<lDzpm;gu{B)r_9uNkgJaP`K%b|8Vy9lUBgYu#
zrpwYLlI4{NattAyIR1Um6BfXGY&W|U-?FegXxHX$FD^V%LmuX0XwWI+YWLgbWPU?;
zmGCbWC*TOJS*>oZ(;u-;DA2Z<ok7|;Yuw)`H<uC7Mkw$zgK^f>nJ5}-`(Jeb^!aw=
z4Z%tKrv)jZBFPyfNRSt_3jQq6_F%piVWg4%z^9`hcz7M$v_s4H7|PR13G#@H#RXeN
z0?b@R%mqSHUGABmO|0J^@<$r<q}{h5w?0b&-F>i944k5%7ZgeGcvyZ^?P+%aX2<B|
zs(79q7Dy;>RiLUOM5f<2BKIPmvqY2!@G0!=kZU#tu0Wp_R7d40Z`DR+`jm6quF6;~
z{H8a77*`pVf^gj)!~t7wTbWlXQ9eHdS$pk>Bc&{h_xVdm{YGKz1yw(!+WfKs26+I{
zZ|RF7HZVW6>-{$pqbz@!b4TlpWC3*VT^CPge>s}MzE*3|l;^7${S(Bldj_LKWbjd7
zOj&WboNdC!7o60ORwS{4Tqpm_#6n?EN|+WI(OVvD??C%iu&Bq3c+{4`a5M!=3NeIT
zCk6!d?sSeABN0WnD*BfNuQ@7XOgZGJjSOo+phWDr$oqz7=0IcJ7n4_Ia`+OXU8bOS
zMEy#G3@o+4XdnwEVygw@h0XtodgC3B&>b(i!zZ1mEPzi!1lV`7DEfTB`+#5^KcIMo
zLxTFj?+vA+gy%G112}&bZ_n+7b?RN2TjTwy1sKCV4mZJ~z@Qc^4f!zvj7jedqxK`#
z55!|?Vh^N2?-|dXIVFkOn`ks;55P9Fbrf<&70-9~$N9PHks8m?Crn}y$!LE86=~Rr
zzkijyF6K(A{m(P$P~p}n29)UW=x}j<xw3G1)6%wEC@`T{`w}y1h>zYG38y$x6u+rG
zzP~o^dE|x0?}X0g-v`#S$>QM4X2dpmUp}knrU+&i%t+#Y%EWM=f@8v-f*F6<hm|W@
zejg;6TFlPhNp!s1!1pLKKS+6p<TS&!q_vJ*!jLl^bJ4?;upnC@iK}9&^{Q)gS-@M8
zE6P6y84%y)in5jJE?D)1MBfg12p%>I1d!B9^S)g~uzsig{`-@bfp+j>>vvw4=nf#z
zA=;6riX7u@XFT&fzTh_@blR7<O$|#x0YQ040SW&EXL%dblIy$k*Sih%F|^o<IhA!w
z%z1^{wztWqeeKUqU_JXUlvogU+o!!JIulB+WmaNspivo#zEOpUtOQ*{I#gWxI;-NH
z9~NBygC%9VST74y72xIEK{28@`|J^?H?-G^O^Oz?V^C3N9QU*>wtE&ULXbg@rI>Y~
zmtupCir{kq6^>yZ3=blkH=?73uG9<<$)6GbkE^5Q1_J$O1yCed?EnM(ak;J;{(M0;
zxy)n-@9ZfiE{fQH-X0yn^wr${ue-mT7$$21Z)b7{B%l$vOxaW0+<-5*+Y{JzkgKpu
z0`7Wy(<#Q}6_)y)uIiy~K}=5ytK#xV;p%7(Du)<|vt>Y3bT64Q1uJnH01CJ|Pr>OL
zM;Qi_ZWi$C>?Ju*?a&}s3(Q5u=R5!5FSVeVRVJ>=7A)BaIdIUWN8hPPPSGdKW4#>G
z8HNd;a5}iheICLYm%9q(JVzXbzIus+KtekOLwiE*1~2eW)1dSIe89H;;&0lnce<=s
z=x30kiH_=4s!wo@SN99PE9bN7QdgMwq7^ol*{Hh|n&H)%iDWEDV@Yw(BIoM(N-S0S
z62C0~UkkALJaolNAY;*s$Ax*G{cFpRy<BE117vs%i3v83Tzu|u>Z~|-Ze~=GhDO6p
zE~YQp?qwi*&&De-&<_7Z>ZYu3GaK*KO0}y|uqho%)=ua9^y(=CLbjzp8*7QUA)N>~
zwqT>fD$#Is(CYSampL>DkPq0COE)X+^7U|sDzfCg6NQ`!K*3emNpNM&3VLN2^@&Uj
zIMzVfwh2FMBr;T%1t>b{Z7`P+l21mf@T<mA)G9xuP4Tf(Lezrexd;vhG|lxLU-WoL
zYvK3KAQxe>k9<2nffoNOX04a`W_rFyUv$I2wfs5$?-ixE5rtCv0Rz!XY?gEATeA=0
zo7oNVra!JP7e&gQa6iFweEayw0<$(Sn+$CX$hMfHMy?LS7o9vEy-AsQ&b$aR%-w{*
z>qf_9#ti<T9-#0VnC<mG4eG;4*ofc%!)Re@o6t#f?pXI3UnD&amBr3iNSZz4t_h%$
zsXlF$I+Lq9%3I8}c%?OPrp*nLgcBhHQup*w#I0y<DaB}w^DTcOC_7a*oKp7-Bynp;
z4a-%58q<OHHeNd9fyeYzMud=UlyUhcok;*sB0NmjPUPy4KkR-EKyCJ$KYk=p1!x!n
zdDJD9_D--Yf-kpWi+}E4|GWvyW)0?VU#cezkp-m>R;3jlk4r#4ES(;rU^K(Ct*-o3
zN;DJ*Rb&<pLoLRZkOoD_R6So?5raYDBsn|%C73Enj>&u$x6G8Gp<}#m(!a$hwKL;L
z%?W@a4xY-odTP7;!-e0iI$$PMBHQzQ99miTVFk#jV!E2L%5-*+c7SmJHA7?pEp8H9
zTf0h=)bCmDo>z=&L7H_`^fsxL$F)Av6(Dbg3+r#uXuCOzAqAno_pI1tZGl<V;;}*+
z;mtf96B^-asGk5^3YM3kCQ*)SjbHOPY{6|P#`K|`R!q7UR;eqokk)Oz(S}*$pPDI>
za>Z)fQh3(l^eOzM0q{*lU`VSTkB=53O98&2m$?1XJA3neOop<6%3R@*7G|3LwC{~B
z`^`4IPq4{^x+VIS&`&N{JA9?Fe+g~Vp)M{j!A>^WB~gK$cwGN68*KMW-~AK$-*?WI
zfas#PsW!=23e!5hlrWQbhv86sc|p%pyPXA$SX2BGH|<h*UdMgd7lV>5vqw&}jPRiu
zqInQzuRMr0&*dtr_jrwTlbH$QU4|ErSz@FtC|-AB5|~P8dt(NV7r@n_bKv5H-_Kji
z^C<El7!SbMPApE;U1s?nFKai;wV`%4UiQHX5P;37!H0%_JtPlvqmOT-$*nRUU)Pj;
z?E^xkt>)QBVs;IQU#K37wHCBYI)Fer`10qg^|n{52VZc!HJx)}gf1T0Z16;WvDO#<
zGQWN_L-lS}Sh%@w!$=C64p=b&-&tq)G&B*!a#~zc3wyt#Iu9@J)*<2n<n`)Zg>Y-Z
z2Q?YYFu~j~;4YD{=n#T7PXc9{whsn}wX@mH8_xc$udGz8V>RtaZ(Oh9V~&)t%$8q;
z-&}e*<T?G_U$`$UTN*qTy<4+)=a+)?b(fz+HoL1x)m0}@0R}Aj0$t?wO*lDl3>7rX
sz1BdSG?;<|{Qo(h0tnuw0zbk$dk)7gj%JaV<2e9oN?MAg@|L0h2NQ2;j{pDw

diff --git a/web/vtadmin/src/components/NavRail.module.scss b/web/vtadmin/src/components/NavRail.module.scss
index 2e5ab658b32..a7d9db21800 100644
--- a/web/vtadmin/src/components/NavRail.module.scss
+++ b/web/vtadmin/src/components/NavRail.module.scss
@@ -70,7 +70,7 @@ a.navLink {
     font-size: 1.6rem;
     font-weight: 500;
     outline: none;
-    padding: 13px 24px;
+    padding: 10px 24px;
     text-decoration: none;
     transition: $navRailHoverTransition;
 
@@ -109,6 +109,7 @@ a.navLink:hover .badge {
     fill: var(--colorScaffoldingForeground);
     height: 2rem;
     transition: $navRailHoverTransition;
+    margin-right: 10px;
 }
 
 a.navLinkActive .icon,
diff --git a/web/vtadmin/src/components/NavRail.tsx b/web/vtadmin/src/components/NavRail.tsx
index c5e0c528bdd..e7bd7bbc9a4 100644
--- a/web/vtadmin/src/components/NavRail.tsx
+++ b/web/vtadmin/src/components/NavRail.tsx
@@ -62,9 +62,6 @@ export const NavRail = () => {
                     <li>
                         <NavRailLink hotkey="W" text="Workflows" to="/workflows" count={workflows.length} />
                     </li>
-                </ul>
-
-                <ul className={style.navList}>
                     <li>
                         <NavRailLink hotkey="M" text="Migrations" to="/migrations" />
                     </li>
diff --git a/web/vtadmin/src/components/VitessLogo.tsx b/web/vtadmin/src/components/VitessLogo.tsx
index 9516a97bba4..bfb183f024d 100644
--- a/web/vtadmin/src/components/VitessLogo.tsx
+++ b/web/vtadmin/src/components/VitessLogo.tsx
@@ -2,54 +2,53 @@ import React from 'react';
 
 const VitessLogo: React.FC<{ className?: string }> = ({ className }) => {
     return (
-        <svg xmlns="http://www.w3.org/2000/svg" role="img" viewBox="-5.48 13.27 440.96 403.96" className={className}>
-            <path fill="none" d="M76.774 158.098l-.011.012.011-.012z" />
+        <svg
+            width="207"
+            height="250"
+            viewBox="0 0 207 250"
+            fill="none"
+            xmlns="http://www.w3.org/2000/svg"
+            className={className}
+        >
             <path
-                d="M242.742 258.203l.04-.206 13.593-79.583-13.633 79.789zm98.18-79.977l-44.115 79.726-83.395 151.07.003.006 83.411-151.095 44.116-79.716 48.195-87.421-48.215 87.43zM342.43 21.85l-14.161 25.877 14.167-25.877h-.006zM76.774 158.098l54.081-58.039-54.081 58.039zm11.512 21.02l59.724-47.442-59.724 47.442zm0 0l-4.007-7.304 3.997 7.304 42.494 78.004 6.9 12.722-6.906-12.739-42.478-77.987z"
-                className="fill-[#284e64]"
+                d="M189 194.177L200.111 196.792C203.459 197.581 206.666 195.041 206.666 191.601V57.0542C206.666 53.6199 203.468 51.0809 200.123 51.8599L189 54.4506V194.177Z"
+                fill="#FF8E50"
             />
             <path
-                d="M103.185 151.448l27.67-51.389 17.155 31.617 33.263 61.357-33.244-61.366-17.169-31.634L88.096 21.85h-.009l42.768 78.209-27.67 51.389zm124.483 126.996l.196.361 8.008 14.721-8.204-15.082zm56.527-150.437l-27.835 50.39-30.963 57.017 30.978-57 27.82-50.407z"
-                className="fill-[#284e64]"
+                d="M174.45 210.577L157 205.279V186.642L181.333 192.371V205.474C181.333 209.054 177.876 211.617 174.45 210.577Z"
+                fill="#FF8E50"
             />
-            <path d="M173.214 335.413l40.189 73.625 22.118-113.708-62.307 40.083z" className="fill-[#f16827]" />
             <path
-                d="M235.872 293.526l-8.008-14.721-27.453-50.469-27.197 107.077 62.307-40.083.351-1.804z"
-                className="fill-[#f48029]"
+                d="M181.333 56.2364L157 61.9038V43.3292L174.461 38.0697C177.885 37.0387 181.333 39.6014 181.333 43.1765V56.2364Z"
+                fill="#FF8E50"
             />
+            <path d="M157 186.642L181.333 192.371V56.2363L157 61.9038V186.642Z" fill="#E7481B" />
             <path
-                d="M130.764 257.105l6.906 12.739 35.544 65.569 27.197-107.077-69.647 28.769z"
-                className="fill-[#f89a2e]"
+                d="M141.973 227.98L120 218.968V194.045L149.33 202.95V223.046C149.33 226.839 145.483 229.419 141.973 227.98Z"
+                fill="#FF8E50"
             />
             <path
-                d="M130.764 257.105l69.647-28.769-19.138-35.303-33.263-61.357-17.246 125.429z"
-                className="fill-[#f16827]"
+                d="M149.33 45.6394L120 54.4738V29.619L141.984 20.6584C145.492 19.2287 149.33 21.8092 149.33 25.5973V45.6394Z"
+                fill="#FF8E50"
             />
+            <path d="M149 45.7389L120 54.4739V70.5216L149 63.7672V45.7389Z" fill="#E7481B" />
+            <path d="M149 184.759L120 177.931V194.045L149 202.85V184.759Z" fill="#E7481B" />
+            <path d="M149 63.7671L120 70.5215V177.931L149 184.759V63.7671Z" fill="#C71E07" />
             <path
-                fill="#f89921"
-                d="M242.742 258.203l13.633-79.789-30.978 57-10.562 19.436 12.833 23.594 8.204 15.082 6.87-35.323z"
+                d="M104.02 1.55971L2.68726 59.4645C1.02553 60.414 0 62.1812 0 64.0951V185.756C0 187.668 1.02344 189.433 2.68249 190.384L104.016 248.427C107.571 250.463 112 247.896 112 243.799V215.687L20.9736 178.355C18.9716 177.534 17.6641 175.584 17.6641 173.42V74.9163C17.6641 72.7481 18.9766 70.7958 20.9843 69.9774L112 32.8799V6.19033C112 2.09528 107.576 -0.472012 104.02 1.55971Z"
+                fill="#FF8E50"
             />
-            <path d="M88.286 179.118l42.478 77.987 17.246-125.429-59.724 47.442z" className="fill-[#f89a2e]" />
-            <path d="M296.807 257.952l44.115-79.726-98.14 79.771 54.025-.045z" className="fill-[#f48029]" />
             <path
-                fill="#f4ae5c"
-                d="M130.855 100.059l-27.67 51.389-14.899 27.67 59.724-47.442-17.155-31.617zm111.927 157.938l56.555-157.423-15.142 27.433-27.82 50.407-13.593 79.583z"
+                d="M112 32.8798L20.9843 69.9774C18.9766 70.7957 17.6641 72.7481 17.6641 74.9162V173.42C17.6641 175.584 18.9716 177.534 20.9736 178.355L112 215.687V191.616L46.7839 171.815C44.5365 171.133 43 169.061 43 166.712V81.6302C43 79.2772 44.5421 77.2022 46.7952 76.5235L112 56.8835V32.8798Z"
+                fill="#E7481B"
             />
             <path
-                d="M88.286 179.118l14.899-27.67 27.67-51.389-54.081 58.039-.011.012 7.516 13.704 4.007 7.304z"
-                className="fill-[#cd4e27]"
+                d="M112 56.8834L46.7952 76.5235C44.5421 77.2021 43 79.2771 43 81.6302V166.712C43 169.061 44.5365 171.133 46.7839 171.815L112 191.616V176.047L79.111 168.304C76.7023 167.737 75 165.587 75 163.112V85.2365C75 82.757 76.7087 80.6046 79.1235 80.0422L112 72.3848V56.8834Z"
+                fill="#C71E07"
             />
             <path
-                fill="#f16938"
-                d="M340.922 178.226l-41.585-77.652-56.555 157.423 98.14-79.771zM76.774 158.098l54.081-58.039L88.087 21.85l-.006-.01-11.318 136.27.011-.012z"
-            />
-            <path
-                d="M340.922 178.226l1.519-156.376v-.01l-.005.01-14.167 25.877-28.932 52.847 41.585 77.652zM88.081 21.84H3l73.763 136.27L88.081 21.84z"
-                className="fill-[#f89a2e]"
-            />
-            <path
-                d="M342.441 21.84v.01l-1.519 156.376 48.215-87.43 38.028-68.956h-84.724zm-99.659 236.157l-.04.206-6.87 35.323-.351 1.804-22.118 113.708.009-.016 83.395-151.07-54.025.045z"
-                className="fill-[#cd4e27]"
+                d="M112 72.3849L79.1235 80.0422C76.7087 80.6047 75 82.7571 75 85.2365V163.113C75 165.587 76.7023 167.737 79.111 168.304L112 176.047V72.3849Z"
+                fill="#9E0C03"
             />
         </svg>
     );

From b567098404fa010fdfd89aa16679b8603e15ce78 Mon Sep 17 00:00:00 2001
From: Matt Lord <mattalord@gmail.com>
Date: Mon, 10 Feb 2025 04:03:29 -0500
Subject: [PATCH 36/68] CI: Add some randomness to the ports used in
 VReplication e2e tests (#17712)

Signed-off-by: Matt Lord <mattalord@gmail.com>
---
 go/test/endtoend/vreplication/cluster_test.go | 10 ++++++++--
 go/test/endtoend/vreplication/migrate_test.go |  5 +++--
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/go/test/endtoend/vreplication/cluster_test.go b/go/test/endtoend/vreplication/cluster_test.go
index 1cf44e1d4c7..e6181cad31b 100644
--- a/go/test/endtoend/vreplication/cluster_test.go
+++ b/go/test/endtoend/vreplication/cluster_test.go
@@ -297,11 +297,17 @@ func downloadDBTypeVersion(dbType string, majorVersion string, path string) erro
 }
 
 func getClusterConfig(idx int, dataRootDir string) *ClusterConfig {
+	offset := 0
+	if !debugMode {
+		// Add some randomness to the ports so that multiple tests can run in
+		// parallel on the same host.
+		offset = (idx + 1) * rand.IntN(1000)
+	}
 	basePort := 15000
 	etcdPort := 2379
 
-	basePort += idx * 10000
-	etcdPort += idx * 10000
+	basePort += (idx * 10000) + offset
+	etcdPort += (idx * 10000) + offset
 	if _, err := os.Stat(dataRootDir); os.IsNotExist(err) {
 		os.Mkdir(dataRootDir, 0700)
 	}
diff --git a/go/test/endtoend/vreplication/migrate_test.go b/go/test/endtoend/vreplication/migrate_test.go
index ef20d953781..676ce128fa0 100644
--- a/go/test/endtoend/vreplication/migrate_test.go
+++ b/go/test/endtoend/vreplication/migrate_test.go
@@ -96,8 +96,9 @@ func TestMigrateUnsharded(t *testing.T) {
 	var output, expected string
 
 	t.Run("mount external cluster", func(t *testing.T) {
+		etcdHostPort := fmt.Sprintf("localhost:%d", extVc.ClusterConfig.topoPort)
 		output, err := vc.VtctldClient.ExecuteCommandWithOutput("Mount", "register", "--name=ext1", "--topo-type=etcd2",
-			fmt.Sprintf("--topo-server=localhost:%d", extVc.ClusterConfig.topoPort), "--topo-root=/vitess/global")
+			"--topo-server", etcdHostPort, "--topo-root=/vitess/global")
 		require.NoError(t, err, "Mount Register command failed with %s", output)
 
 		output, err = vc.VtctldClient.ExecuteCommandWithOutput("Mount", "list")
@@ -110,7 +111,7 @@ func TestMigrateUnsharded(t *testing.T) {
 		require.NoError(t, err, "Mount command failed with %s\n", output)
 
 		require.Equal(t, "etcd2", gjson.Get(output, "topo_type").String())
-		require.Equal(t, "localhost:12379", gjson.Get(output, "topo_server").String())
+		require.Equal(t, etcdHostPort, gjson.Get(output, "topo_server").String())
 		require.Equal(t, "/vitess/global", gjson.Get(output, "topo_root").String())
 	})
 

From 8fc98010e904cec328f688d06862658987d33b80 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 10 Feb 2025 15:13:10 -0500
Subject: [PATCH 37/68] Bump io.netty:netty-handler from 4.1.110.Final to
 4.1.118.Final in /java (#17730)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 java/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/java/pom.xml b/java/pom.xml
index bc173282faf..13e1baaff28 100644
--- a/java/pom.xml
+++ b/java/pom.xml
@@ -69,7 +69,7 @@
     <grpc.version>1.67.1</grpc.version>
     <!-- NOTE Netty handler and boring SSL must be kept compatible with grpc
       https://github.com/grpc/grpc-java/blob/master/SECURITY.md#netty -->
-    <netty.handler.version>4.1.110.Final</netty.handler.version>
+    <netty.handler.version>4.1.118.Final</netty.handler.version>
     <tcnative.boring.ssl.version>2.0.65.Final</tcnative.boring.ssl.version>
 
     <protobuf.java.version>3.25.5</protobuf.java.version>

From 4c27ea8caf1881c83a85d7ff6f9a772cd7cb6148 Mon Sep 17 00:00:00 2001
From: Matt Lord <mattalord@gmail.com>
Date: Mon, 10 Feb 2025 17:00:40 -0500
Subject: [PATCH 38/68] VReplication: Support passing VStream filters down to
 MySQL (#17677)

Signed-off-by: Matt Lord <mattalord@gmail.com>
---
 go/test/endtoend/vreplication/config_test.go  |   5 +-
 go/test/endtoend/vreplication/vstream_test.go | 134 +++++++++++++++++
 .../vreplication/vcopier_test.go              |   8 +-
 go/vt/vttablet/tabletserver/vstreamer/copy.go |   2 +-
 .../tabletserver/vstreamer/planbuilder.go     |  21 ++-
 .../vstreamer/planbuilder_test.go             | 140 +++++++++++-------
 .../tabletserver/vstreamer/rowstreamer.go     |  25 +++-
 .../vstreamer/rowstreamer_test.go             |  40 ++++-
 8 files changed, 302 insertions(+), 73 deletions(-)

diff --git a/go/test/endtoend/vreplication/config_test.go b/go/test/endtoend/vreplication/config_test.go
index b856572ab7b..403e39cac66 100644
--- a/go/test/endtoend/vreplication/config_test.go
+++ b/go/test/endtoend/vreplication/config_test.go
@@ -45,8 +45,9 @@ import (
 // default collation as it has to work across versions and the 8.0 default does not exist in 5.7.
 var (
 	// All standard user tables should have a primary key and at least one secondary key.
-	customerTypes         = []string{"'individual'", "'soho'", "'enterprise'"}
-	customerTableTemplate = `create table customer(cid int auto_increment, name varchar(128) collate utf8mb4_bin, meta json default null,
+	customerTypes = []string{"'individual'", "'soho'", "'enterprise'"}
+	// We use utf8mb4_general_ci so that we can test with 5.7 and 8.0+.
+	customerTableTemplate = `create table customer(cid int auto_increment, name varchar(128) collate utf8mb4_general_ci, meta json default null,
   industryCategory varchar(100) generated always as (json_extract(meta, _utf8mb4'$.industry')) virtual, typ enum(%s),
   sport set('football','cricket','baseball'), ts timestamp not null default current_timestamp, bits bit(2) default b'11', date1 datetime not null default '0000-00-00 00:00:00',
 	date2 datetime not null default '2021-00-01 00:00:00', dec80 decimal(8,0), blb blob, primary key(%s), key(name)) CHARSET=utf8mb4`
diff --git a/go/test/endtoend/vreplication/vstream_test.go b/go/test/endtoend/vreplication/vstream_test.go
index 7009bade562..6c0f1919616 100644
--- a/go/test/endtoend/vreplication/vstream_test.go
+++ b/go/test/endtoend/vreplication/vstream_test.go
@@ -1090,3 +1090,137 @@ func TestVStreamHeartbeats(t *testing.T) {
 		})
 	}
 }
+
+// TestVStreamPushdownFilters confirms that pushdown filters are applied correctly
+// when they are specified in the VStream API via the rule.Filter.
+// It also confirms that we use the proper collation for the VStream filter when
+// using VARCHAR fields.
+func TestVStreamPushdownFilters(t *testing.T) {
+	ctx, cancel := context.WithTimeout(context.Background(), 5*time.Minute)
+	defer cancel()
+	setSidecarDBName("_vt")
+	config := *mainClusterConfig
+	vc = NewVitessCluster(t, &clusterOptions{
+		clusterConfig: &config,
+	})
+	defer vc.TearDown()
+	require.NotNil(t, vc)
+	ks := "product"
+	shard := "0"
+	defaultCell := vc.Cells[vc.CellNames[0]]
+
+	_, err := vc.AddKeyspace(t, []*Cell{defaultCell}, ks, shard, initialProductVSchema, initialProductSchema, 0, 0, 100, nil)
+	require.NoError(t, err)
+	verifyClusterHealth(t, vc)
+	insertInitialData(t)
+
+	vtgateConn := getConnection(t, vc.ClusterConfig.hostname, vc.ClusterConfig.vtgateMySQLPort)
+	defer vtgateConn.Close()
+
+	// Make sure that we get at least one paul row event in the copy phase.
+	_, err = vtgateConn.ExecuteFetch(fmt.Sprintf("insert into %s.customer (name) values ('PAUĹ')", ks), 1, false)
+	require.NoError(t, err)
+	res, err := vtgateConn.ExecuteFetch(fmt.Sprintf("select count(*) from %s.customer where name = 'pauĺ'", ks), 1, false)
+	require.NoError(t, err)
+	require.Len(t, res.Rows, 1)
+	startingPauls, err := res.Rows[0][0].ToInt()
+	require.NoError(t, err)
+
+	// Coordinate go-routines.
+	streamCtx, streamCancel := context.WithTimeout(context.Background(), 1*time.Minute)
+	defer streamCancel()
+	done := make(chan struct{})
+
+	// First goroutine that keeps inserting rows into the table being streamed until the
+	// stream context is cancelled.
+	createdPauls := startingPauls
+	createdNonPauls := 0
+	go func() {
+		id := 1
+		for {
+			select {
+			case <-streamCtx.Done():
+				// Give the VStream a little catch-up time before telling it to stop
+				// via the done channel.
+				time.Sleep(10 * time.Second)
+				close(done)
+				return
+			default:
+				if id%10 == 0 {
+					_, err := vtgateConn.ExecuteFetch(fmt.Sprintf("insert into %s.customer (name) values ('paÜl')", ks), 1, false)
+					require.NoError(t, err)
+					createdPauls++
+				} else {
+					insertRow(ks, "customer", id)
+					createdNonPauls++
+				}
+				time.Sleep(10 * time.Millisecond)
+				id++
+			}
+		}
+	}()
+
+	vgtid := &binlogdatapb.VGtid{
+		ShardGtids: []*binlogdatapb.ShardGtid{{
+			Keyspace: ks,
+			Shard:    shard,
+			Gtid:     "",
+		}}}
+
+	filter := &binlogdatapb.Filter{
+		Rules: []*binlogdatapb.Rule{{
+			Match:  "customer",
+			Filter: "select * from customer where name = 'påul'",
+		}},
+	}
+	flags := &vtgatepb.VStreamFlags{}
+	vstreamConn, err := vtgateconn.Dial(ctx, fmt.Sprintf("%s:%d", vc.ClusterConfig.hostname, vc.ClusterConfig.vtgateGrpcPort))
+	require.NoError(t, err)
+	defer vstreamConn.Close()
+
+	// So we should have at least one paul row event in the copy phase.
+	copyPhaseRowEvents := 0
+	// And we should have many paul row events in the running phase.
+	runningPhaseRowEvents := 0
+	copyPhase := true
+
+	func() {
+		reader, err := vstreamConn.VStream(ctx, topodatapb.TabletType_PRIMARY, vgtid, filter, flags)
+		require.NoError(t, err)
+		for {
+			evs, err := reader.Recv()
+
+			switch err {
+			case nil:
+				for _, ev := range evs {
+					switch ev.Type {
+					case binlogdatapb.VEventType_COPY_COMPLETED:
+						copyPhase = false
+					case binlogdatapb.VEventType_ROW:
+						if copyPhase {
+							copyPhaseRowEvents++
+						} else {
+							runningPhaseRowEvents++
+						}
+					}
+				}
+			default:
+				require.FailNow(t, fmt.Sprintf("VStream returned unexpected error: %v", err))
+			}
+			select {
+			case <-done:
+				return
+			default:
+			}
+		}
+	}()
+
+	require.NotZero(t, createdPauls)
+	require.NotZero(t, createdNonPauls)
+	require.Greater(t, createdNonPauls, createdPauls)
+	require.NotZero(t, copyPhaseRowEvents)
+	require.NotZero(t, runningPhaseRowEvents)
+
+	t.Logf("Created pauls: %d, pauls copied: %d, pauls replicated: %d", createdPauls, copyPhaseRowEvents, runningPhaseRowEvents)
+	require.Equal(t, createdPauls, copyPhaseRowEvents+runningPhaseRowEvents)
+}
diff --git a/go/vt/vttablet/tabletmanager/vreplication/vcopier_test.go b/go/vt/vttablet/tabletmanager/vreplication/vcopier_test.go
index a7e4794ba76..dcb5616008d 100644
--- a/go/vt/vttablet/tabletmanager/vreplication/vcopier_test.go
+++ b/go/vt/vttablet/tabletmanager/vreplication/vcopier_test.go
@@ -213,7 +213,7 @@ func testPlayerCopyVarcharPKCaseInsensitive(t *testing.T) {
 	defer func() { waitRetryTime = savedWaitRetryTime }()
 
 	execStatements(t, []string{
-		"create table src(idc varchar(20), val int, primary key(idc)) character set utf8mb3", // Use utf8mb3 to get a consistent default collation across MySQL versions
+		"create table src(idc varchar(20), val int, primary key(idc)) character set utf8mb4 collate utf8mb4_general_ci", // Use general_ci so that we have the same behavior across 5.7 and 8.0
 		"insert into src values('a', 1), ('c', 2)",
 		fmt.Sprintf("create table %s.dst(idc varchar(20), val int, primary key(idc))", vrepldb),
 	})
@@ -282,7 +282,7 @@ func testPlayerCopyVarcharPKCaseInsensitive(t *testing.T) {
 		"/update _vt.vreplication set state='Copying'",
 		// Copy mode.
 		"insert into dst(idc,val) values ('a',1)",
-		`/insert into _vt.copy_state \(lastpk, vrepl_id, table_name\) values \(_binary'fields:{name:"idc" type:VARCHAR charset:33 flags:20483} rows:{lengths:1 values:"a"}'.*`,
+		`/insert into _vt.copy_state \(lastpk, vrepl_id, table_name\) values \(_binary'fields:{name:"idc" type:VARCHAR charset:45 flags:20483} rows:{lengths:1 values:"a"}'.*`,
 		// Copy-catchup mode.
 		`/insert into dst\(idc,val\) select 'B', 3 from dual where \( .* 'B' COLLATE .* \) <= \( .* 'a' COLLATE .* \)`,
 	).Then(func(expect qh.ExpectationSequencer) qh.ExpectationSequencer {
@@ -292,11 +292,11 @@ func testPlayerCopyVarcharPKCaseInsensitive(t *testing.T) {
 		// upd1 := expect.
 		upd1 := expect.Then(qh.Eventually(
 			"insert into dst(idc,val) values ('B',3)",
-			`/insert into _vt.copy_state \(lastpk, vrepl_id, table_name\) values \(_binary'fields:{name:"idc" type:VARCHAR charset:33 flags:20483} rows:{lengths:1 values:"B"}'.*`,
+			`/insert into _vt.copy_state \(lastpk, vrepl_id, table_name\) values \(_binary'fields:{name:"idc" type:VARCHAR charset:45 flags:20483} rows:{lengths:1 values:"B"}'.*`,
 		))
 		upd2 := expect.Then(qh.Eventually(
 			"insert into dst(idc,val) values ('c',2)",
-			`/insert into _vt.copy_state \(lastpk, vrepl_id, table_name\) values \(_binary'fields:{name:"idc" type:VARCHAR charset:33 flags:20483} rows:{lengths:1 values:"c"}'.*`,
+			`/insert into _vt.copy_state \(lastpk, vrepl_id, table_name\) values \(_binary'fields:{name:"idc" type:VARCHAR charset:45 flags:20483} rows:{lengths:1 values:"c"}'.*`,
 		))
 		upd1.Then(upd2.Eventually())
 		return upd2
diff --git a/go/vt/vttablet/tabletserver/vstreamer/copy.go b/go/vt/vttablet/tabletserver/vstreamer/copy.go
index 1e1d432956d..135984844ef 100644
--- a/go/vt/vttablet/tabletserver/vstreamer/copy.go
+++ b/go/vt/vttablet/tabletserver/vstreamer/copy.go
@@ -212,7 +212,7 @@ func (uvs *uvstreamer) copyTable(ctx context.Context, tableName string) error {
 	lastPK := getLastPKFromQR(uvs.plans[tableName].tablePK.Lastpk)
 	filter := uvs.plans[tableName].rule.Filter
 
-	log.Infof("Starting copyTable for %s, PK %v", tableName, lastPK)
+	log.Infof("Starting copyTable for %s, Filter: %s, LastPK: %v", tableName, filter, lastPK)
 	uvs.sendTestEvent(fmt.Sprintf("Copy Start %s", tableName))
 
 	err := uvs.vse.StreamRows(ctx, filter, lastPK, func(rows *binlogdatapb.VStreamRowsResponse) error {
diff --git a/go/vt/vttablet/tabletserver/vstreamer/planbuilder.go b/go/vt/vttablet/tabletserver/vstreamer/planbuilder.go
index 1293efa3112..6416c5c87de 100644
--- a/go/vt/vttablet/tabletserver/vstreamer/planbuilder.go
+++ b/go/vt/vttablet/tabletserver/vstreamer/planbuilder.go
@@ -58,6 +58,16 @@ type Plan struct {
 	// of the table.
 	Filters []Filter
 
+	// Predicates in the Filter query that we can push down to MySQL
+	// to reduce the returned rows we need to filter in the VStreamer
+	// during the copy phase. This will contain any valid expressions
+	// in the Filter's WHERE clause with the exception of the
+	// in_keyrange() function which is a filter that must be applied
+	// by the VStreamer (it's not a valid MySQL function). Note that
+	// the Filter cannot contain any MySQL functions because the
+	// VStreamer cannot filter binlog events using them.
+	whereExprsToPushDown []sqlparser.Expr
+
 	// Convert any integer values seen in the binlog events for ENUM or SET
 	// columns to the string values. The map is keyed on the column number, with
 	// the value being the map of ordinal values to string values.
@@ -564,6 +574,7 @@ func (plan *Plan) analyzeWhere(vschema *localVSchema, where *sqlparser.Where) er
 	if where == nil {
 		return nil
 	}
+	// Only a series of AND expressions are supported.
 	exprs := splitAndExpression(nil, where.Expr)
 	for _, expr := range exprs {
 		switch expr := expr.(type) {
@@ -601,10 +612,6 @@ func (plan *Plan) analyzeWhere(vschema *localVSchema, where *sqlparser.Where) er
 			if !ok {
 				return fmt.Errorf("unexpected: %v", sqlparser.String(expr))
 			}
-			// StrVal is varbinary, we do not support varchar since we would have to implement all collation types
-			if val.Type != sqlparser.IntVal && val.Type != sqlparser.StrVal {
-				return fmt.Errorf("unexpected: %v", sqlparser.String(expr))
-			}
 			pv, err := evalengine.Translate(val, &evalengine.Config{
 				Collation:   plan.env.CollationEnv().DefaultConnectionCharset(),
 				Environment: plan.env,
@@ -622,7 +629,11 @@ func (plan *Plan) analyzeWhere(vschema *localVSchema, where *sqlparser.Where) er
 				ColNum: colnum,
 				Value:  resolved.Value(plan.env.CollationEnv().DefaultConnectionCharset()),
 			})
+			// Add it to the expressions that get pushed down to mysqld.
+			plan.whereExprsToPushDown = append(plan.whereExprsToPushDown, expr)
 		case *sqlparser.FuncExpr:
+			// We cannot filter binlog events in VStreamer using MySQL functions so
+			// we only allow the in_keyrange() function, which is VStreamer specific.
 			if !expr.Name.EqualString("in_keyrange") {
 				return fmt.Errorf("unsupported constraint: %v", sqlparser.String(expr))
 			}
@@ -648,6 +659,8 @@ func (plan *Plan) analyzeWhere(vschema *localVSchema, where *sqlparser.Where) er
 				Opcode: IsNotNull,
 				ColNum: colnum,
 			})
+			// Add it to the expressions that get pushed down to mysqld.
+			plan.whereExprsToPushDown = append(plan.whereExprsToPushDown, expr)
 		default:
 			return fmt.Errorf("unsupported constraint: %v", sqlparser.String(expr))
 		}
diff --git a/go/vt/vttablet/tabletserver/vstreamer/planbuilder_test.go b/go/vt/vttablet/tabletserver/vstreamer/planbuilder_test.go
index aba74368802..3c9e19349e4 100644
--- a/go/vt/vttablet/tabletserver/vstreamer/planbuilder_test.go
+++ b/go/vt/vttablet/tabletserver/vstreamer/planbuilder_test.go
@@ -27,7 +27,6 @@ import (
 	"vitess.io/vitess/go/mysql"
 	"vitess.io/vitess/go/mysql/collations"
 	"vitess.io/vitess/go/sqltypes"
-	"vitess.io/vitess/go/test/utils"
 	"vitess.io/vitess/go/vt/proto/topodata"
 	"vitess.io/vitess/go/vt/sqlparser"
 	"vitess.io/vitess/go/vt/vtenv"
@@ -174,6 +173,7 @@ func TestMustSendDDL(t *testing.T) {
 }
 
 func TestPlanBuilder(t *testing.T) {
+	unicodeCollationID := uint32(collations.MySQL8().DefaultConnectionCharset())
 	t1 := &Table{
 		Name: "t1",
 		Fields: []*querypb.Field{{
@@ -183,9 +183,8 @@ func TestPlanBuilder(t *testing.T) {
 			Flags:   uint32(querypb.MySqlFlag_NUM_FLAG),
 		}, {
 			Name:    "val",
-			Type:    sqltypes.VarBinary,
-			Charset: collations.CollationBinaryID,
-			Flags:   uint32(querypb.MySqlFlag_BINARY_FLAG),
+			Type:    sqltypes.VarChar,
+			Charset: collations.CollationUtf8mb4ID,
 		}},
 	}
 	// t1alt has no id column
@@ -194,8 +193,7 @@ func TestPlanBuilder(t *testing.T) {
 		Fields: []*querypb.Field{{
 			Name:    "val",
 			Type:    sqltypes.VarBinary,
-			Charset: collations.CollationBinaryID,
-			Flags:   uint32(querypb.MySqlFlag_BINARY_FLAG),
+			Charset: unicodeCollationID,
 		}},
 	}
 	t2 := &Table{
@@ -253,9 +251,8 @@ func TestPlanBuilder(t *testing.T) {
 				ColNum: 1,
 				Field: &querypb.Field{
 					Name:    "val",
-					Type:    sqltypes.VarBinary,
-					Charset: collations.CollationBinaryID,
-					Flags:   uint32(querypb.MySqlFlag_BINARY_FLAG),
+					Type:    sqltypes.VarChar,
+					Charset: unicodeCollationID,
 				},
 			}},
 			env: vtenv.NewTestEnv(),
@@ -276,9 +273,8 @@ func TestPlanBuilder(t *testing.T) {
 				ColNum: 1,
 				Field: &querypb.Field{
 					Name:    "val",
-					Type:    sqltypes.VarBinary,
-					Charset: collations.CollationBinaryID,
-					Flags:   uint32(querypb.MySqlFlag_BINARY_FLAG),
+					Type:    sqltypes.VarChar,
+					Charset: unicodeCollationID,
 				},
 			}},
 			Filters: []Filter{{
@@ -307,9 +303,8 @@ func TestPlanBuilder(t *testing.T) {
 				ColNum: 1,
 				Field: &querypb.Field{
 					Name:    "val",
-					Type:    sqltypes.VarBinary,
-					Charset: collations.CollationBinaryID,
-					Flags:   uint32(querypb.MySqlFlag_BINARY_FLAG),
+					Type:    sqltypes.VarChar,
+					Charset: unicodeCollationID,
 				},
 			}},
 			env: vtenv.NewTestEnv(),
@@ -330,9 +325,8 @@ func TestPlanBuilder(t *testing.T) {
 				ColNum: 1,
 				Field: &querypb.Field{
 					Name:    "val",
-					Type:    sqltypes.VarBinary,
-					Charset: collations.CollationBinaryID,
-					Flags:   uint32(querypb.MySqlFlag_BINARY_FLAG),
+					Type:    sqltypes.VarChar,
+					Charset: unicodeCollationID,
 				},
 			}},
 			env: vtenv.NewTestEnv(),
@@ -345,9 +339,8 @@ func TestPlanBuilder(t *testing.T) {
 				ColNum: 1,
 				Field: &querypb.Field{
 					Name:    "val",
-					Type:    sqltypes.VarBinary,
-					Charset: collations.CollationBinaryID,
-					Flags:   uint32(querypb.MySqlFlag_BINARY_FLAG),
+					Type:    sqltypes.VarChar,
+					Charset: unicodeCollationID,
 				},
 			}, {
 				ColNum: 0,
@@ -368,9 +361,8 @@ func TestPlanBuilder(t *testing.T) {
 				ColNum: 1,
 				Field: &querypb.Field{
 					Name:    "val",
-					Type:    sqltypes.VarBinary,
-					Charset: collations.CollationBinaryID,
-					Flags:   uint32(querypb.MySqlFlag_BINARY_FLAG),
+					Type:    sqltypes.VarChar,
+					Charset: unicodeCollationID,
 				},
 			}, {
 				ColNum: 0,
@@ -399,9 +391,8 @@ func TestPlanBuilder(t *testing.T) {
 				ColNum: 1,
 				Field: &querypb.Field{
 					Name:    "val",
-					Type:    sqltypes.VarBinary,
-					Charset: collations.CollationBinaryID,
-					Flags:   uint32(querypb.MySqlFlag_BINARY_FLAG),
+					Type:    sqltypes.VarChar,
+					Charset: unicodeCollationID,
 				},
 			}, {
 				ColNum: 0,
@@ -430,9 +421,8 @@ func TestPlanBuilder(t *testing.T) {
 				ColNum: 1,
 				Field: &querypb.Field{
 					Name:    "val",
-					Type:    sqltypes.VarBinary,
-					Charset: collations.CollationBinaryID,
-					Flags:   uint32(querypb.MySqlFlag_BINARY_FLAG),
+					Type:    sqltypes.VarChar,
+					Charset: unicodeCollationID,
 				},
 			}, {
 				ColNum: 0,
@@ -451,25 +441,24 @@ func TestPlanBuilder(t *testing.T) {
 				VindexColumns: nil,
 				KeyRange:      nil,
 			}},
+			whereExprsToPushDown: []sqlparser.Expr{
+				sqlparser.NewComparisonExpr(sqlparser.EqualOp, sqlparser.Expr(sqlparser.NewColName("id")), sqlparser.Expr(sqlparser.NewIntLiteral("1")), nil),
+			},
 			env: vtenv.NewTestEnv(),
 		},
 	}, {
-		inTable: t2,
-		inRule:  &binlogdatapb.Rule{Match: "/t1/"},
-	}, {
-		inTable: regional,
-		inRule:  &binlogdatapb.Rule{Match: "regional", Filter: "select val, id from regional where in_keyrange('-80')"},
+		inTable: t1,
+		inRule:  &binlogdatapb.Rule{Match: "t1", Filter: "select val, id from t1 where val > 'hey' and val < 'there'"},
 		outPlan: &Plan{
 			ColExprs: []ColExpr{{
-				ColNum: 2,
+				ColNum: 1,
 				Field: &querypb.Field{
 					Name:    "val",
-					Type:    sqltypes.VarBinary,
-					Charset: collations.CollationBinaryID,
-					Flags:   uint32(querypb.MySqlFlag_BINARY_FLAG),
+					Type:    sqltypes.VarChar,
+					Charset: unicodeCollationID,
 				},
 			}, {
-				ColNum: 1,
+				ColNum: 0,
 				Field: &querypb.Field{
 					Name:    "id",
 					Type:    sqltypes.Int64,
@@ -477,14 +466,28 @@ func TestPlanBuilder(t *testing.T) {
 					Flags:   uint32(querypb.MySqlFlag_NUM_FLAG),
 				},
 			}},
-			Filters: []Filter{{
-				Opcode:        VindexMatch,
-				ColNum:        0,
-				Value:         sqltypes.NULL,
-				Vindex:        nil,
-				VindexColumns: []int{0, 1},
-				KeyRange:      nil,
-			}},
+			Filters: []Filter{
+				{
+					Opcode:        GreaterThan,
+					ColNum:        1,
+					Value:         sqltypes.NewVarChar("hey"),
+					Vindex:        nil,
+					VindexColumns: nil,
+					KeyRange:      nil,
+				},
+				{
+					Opcode:        LessThan,
+					ColNum:        1,
+					Value:         sqltypes.NewVarChar("there"),
+					Vindex:        nil,
+					VindexColumns: nil,
+					KeyRange:      nil,
+				},
+			},
+			whereExprsToPushDown: []sqlparser.Expr{
+				sqlparser.NewComparisonExpr(sqlparser.GreaterThanOp, sqlparser.Expr(sqlparser.NewColName("val")), sqlparser.Expr(sqlparser.NewStrLiteral("hey")), nil),
+				sqlparser.NewComparisonExpr(sqlparser.LessThanOp, sqlparser.Expr(sqlparser.NewColName("val")), sqlparser.Expr(sqlparser.NewStrLiteral("there")), nil),
+			},
 			env: vtenv.NewTestEnv(),
 		},
 	}, {
@@ -495,9 +498,8 @@ func TestPlanBuilder(t *testing.T) {
 				ColNum: 1,
 				Field: &querypb.Field{
 					Name:    "val",
-					Type:    sqltypes.VarBinary,
-					Charset: collations.CollationBinaryID,
-					Flags:   uint32(querypb.MySqlFlag_BINARY_FLAG),
+					Type:    sqltypes.VarChar,
+					Charset: unicodeCollationID,
 				},
 			}, {
 				ColNum: 0,
@@ -511,6 +513,40 @@ func TestPlanBuilder(t *testing.T) {
 			convertUsingUTF8Columns: map[string]bool{"val": true},
 			env:                     vtenv.NewTestEnv(),
 		},
+	}, {
+		inTable: t2,
+		inRule:  &binlogdatapb.Rule{Match: "/t1/"},
+	}, {
+		inTable: regional,
+		inRule:  &binlogdatapb.Rule{Match: "regional", Filter: "select val, id from regional where in_keyrange('-80')"},
+		outPlan: &Plan{
+			ColExprs: []ColExpr{{
+				ColNum: 2,
+				Field: &querypb.Field{
+					Name:    "val",
+					Type:    sqltypes.VarBinary,
+					Charset: collations.CollationBinaryID,
+					Flags:   uint32(querypb.MySqlFlag_BINARY_FLAG),
+				},
+			}, {
+				ColNum: 1,
+				Field: &querypb.Field{
+					Name:    "id",
+					Type:    sqltypes.Int64,
+					Charset: collations.CollationBinaryID,
+					Flags:   uint32(querypb.MySqlFlag_NUM_FLAG),
+				},
+			}},
+			Filters: []Filter{{
+				Opcode:        VindexMatch,
+				ColNum:        0,
+				Value:         sqltypes.NULL,
+				Vindex:        nil,
+				VindexColumns: []int{0, 1},
+				KeyRange:      nil,
+			}},
+			env: vtenv.NewTestEnv(),
+		},
 	}, {
 		inTable: regional,
 		inRule:  &binlogdatapb.Rule{Match: "regional", Filter: "select id, keyspace_id() from regional"},
@@ -661,7 +697,7 @@ func TestPlanBuilder(t *testing.T) {
 				plan.Filters[ind].Vindex = nil
 				plan.Filters[ind].Vindex = nil
 			}
-			utils.MustMatch(t, tcase.outPlan, plan)
+			require.EqualValues(t, tcase.outPlan, plan)
 		})
 	}
 }
diff --git a/go/vt/vttablet/tabletserver/vstreamer/rowstreamer.go b/go/vt/vttablet/tabletserver/vstreamer/rowstreamer.go
index 317936e4289..7f63a90650d 100644
--- a/go/vt/vttablet/tabletserver/vstreamer/rowstreamer.go
+++ b/go/vt/vttablet/tabletserver/vstreamer/rowstreamer.go
@@ -260,13 +260,25 @@ func (rs *rowStreamer) buildSelect(st *binlogdatapb.MinimalTable) (string, error
 		}
 		prefix = ", "
 	}
+
+	addPushdownExpressions := func() {
+		for i, expr := range rs.plan.whereExprsToPushDown {
+			if i != 0 {
+				// Only AND expressions are supported.
+				buf.Myprintf(" and ")
+			}
+			buf.Myprintf("(%s)", sqlparser.String(expr))
+		}
+	}
 	// If we know the index name that we should be using then tell MySQL
 	// to use it if possible. This helps to ensure that we are able to
 	// leverage the ordering from the index itself and avoid having to
 	// do a FILESORT of all the results. This index should contain all
 	// of the PK columns which are used in the ORDER BY clause below.
 	var indexHint string
-	if st.PKIndexName != "" {
+	// If we're pushing down any expressions, we need to let the optimizer
+	// choose the best index to use.
+	if st.PKIndexName != "" && len(rs.plan.whereExprsToPushDown) == 0 {
 		escapedPKIndexName, err := sqlescape.EnsureEscaped(st.PKIndexName)
 		if err != nil {
 			return "", err
@@ -274,12 +286,18 @@ func (rs *rowStreamer) buildSelect(st *binlogdatapb.MinimalTable) (string, error
 		indexHint = fmt.Sprintf(" force index (%s)", escapedPKIndexName)
 	}
 	buf.Myprintf(" from %v%s", sqlparser.NewIdentifierCS(rs.plan.Table.Name), indexHint)
-	if len(rs.lastpk) != 0 {
+	if len(rs.lastpk) != 0 { // We're in the Nth copy phase cycle and need to resume
 		if len(rs.lastpk) != len(rs.pkColumns) {
 			return "", fmt.Errorf("cannot build a row streamer plan for the %s table as a lastpk value was provided and the number of primary key values within it (%v) does not match the number of primary key columns in the table (%d)",
 				st.Name, rs.lastpk, rs.pkColumns)
 		}
 		buf.WriteString(" where ")
+		// First we add any predicates that should be pushed down.
+		if len(rs.plan.whereExprsToPushDown) > 0 {
+			addPushdownExpressions()
+			// Only AND expressions are supported.
+			buf.Myprintf(" and ")
+		}
 		prefix := ""
 		// This loop handles the case for composite PKs. For example,
 		// if lastpk was (1,2), the where clause would be:
@@ -298,6 +316,9 @@ func (rs *rowStreamer) buildSelect(st *binlogdatapb.MinimalTable) (string, error
 			rs.lastpk[lastcol].EncodeSQL(buf)
 			buf.Myprintf(")")
 		}
+	} else if len(rs.plan.whereExprsToPushDown) > 0 { // We're in the first copy phase cycle
+		buf.Myprintf(" where ")
+		addPushdownExpressions()
 	}
 	buf.Myprintf(" order by ", sqlparser.NewIdentifierCS(rs.plan.Table.Name))
 	prefix = ""
diff --git a/go/vt/vttablet/tabletserver/vstreamer/rowstreamer_test.go b/go/vt/vttablet/tabletserver/vstreamer/rowstreamer_test.go
index 47db5fb839a..97ed4093c8f 100644
--- a/go/vt/vttablet/tabletserver/vstreamer/rowstreamer_test.go
+++ b/go/vt/vttablet/tabletserver/vstreamer/rowstreamer_test.go
@@ -23,14 +23,13 @@ import (
 	"strconv"
 	"testing"
 
-	vttablet "vitess.io/vitess/go/vt/vttablet/common"
-
 	"github.com/stretchr/testify/require"
 
 	"vitess.io/vitess/go/mysql"
 	"vitess.io/vitess/go/mysql/collations"
 	"vitess.io/vitess/go/sqltypes"
 	"vitess.io/vitess/go/vt/log"
+	vttablet "vitess.io/vitess/go/vt/vttablet/common"
 
 	binlogdatapb "vitess.io/vitess/go/vt/proto/binlogdata"
 )
@@ -343,10 +342,10 @@ func TestStreamRowsFilterInt(t *testing.T) {
 
 	wantStream := []string{
 		`fields:{name:"id1" type:INT32 table:"t1" org_table:"t1" database:"vttest" org_name:"id1" column_length:11 charset:63 column_type:"int(11)"} fields:{name:"val" type:VARBINARY table:"t1" org_table:"t1" database:"vttest" org_name:"val" column_length:128 charset:63 column_type:"varbinary(128)"} pkfields:{name:"id1" type:INT32 charset:63}`,
-		`rows:{lengths:1 lengths:3 values:"1aaa"} rows:{lengths:1 lengths:3 values:"4ddd"} lastpk:{lengths:1 values:"5"}`,
+		`rows:{lengths:1 lengths:3 values:"1aaa"} rows:{lengths:1 lengths:3 values:"4ddd"} lastpk:{lengths:1 values:"4"}`,
 	}
-	wantQuery := "select /*+ MAX_EXECUTION_TIME(3600000) */ id1, id2, val from t1 force index (`PRIMARY`) order by id1"
-	checkStream(t, "select id1, val from t1 where id2 = 100", nil, wantQuery, wantStream)
+	wantQuery := "select /*+ MAX_EXECUTION_TIME(3600000) */ id1, id2, val from t1 where (id2 = 100) order by id1"
+	checkStream(t, "select id1, val from t1 where (id2 = 100)", nil, wantQuery, wantStream)
 	require.Equal(t, int64(0), engine.rowStreamerNumPackets.Get())
 	require.Equal(t, int64(2), engine.rowStreamerNumRows.Get())
 	require.Less(t, int64(0), engine.vstreamerPacketSize.Get())
@@ -373,10 +372,35 @@ func TestStreamRowsFilterVarBinary(t *testing.T) {
 
 	wantStream := []string{
 		`fields:{name:"id1" type:INT32 table:"t1" org_table:"t1" database:"vttest" org_name:"id1" column_length:11 charset:63 column_type:"int(11)"} fields:{name:"val" type:VARBINARY table:"t1" org_table:"t1" database:"vttest" org_name:"val" column_length:128 charset:63 column_type:"varbinary(128)"} pkfields:{name:"id1" type:INT32 charset:63}`,
-		`rows:{lengths:1 lengths:6 values:"2newton"} rows:{lengths:1 lengths:6 values:"3newton"} rows:{lengths:1 lengths:6 values:"5newton"} lastpk:{lengths:1 values:"6"}`,
+		`rows:{lengths:1 lengths:6 values:"2newton"} rows:{lengths:1 lengths:6 values:"3newton"} rows:{lengths:1 lengths:6 values:"5newton"} lastpk:{lengths:1 values:"5"}`,
 	}
-	wantQuery := "select /*+ MAX_EXECUTION_TIME(3600000) */ id1, val from t1 force index (`PRIMARY`) order by id1"
-	checkStream(t, "select id1, val from t1 where val = 'newton'", nil, wantQuery, wantStream)
+	wantQuery := "select /*+ MAX_EXECUTION_TIME(3600000) */ id1, val from t1 where (val = 'newton') order by id1"
+	checkStream(t, "select id1, val from t1 where (val = 'newton')", nil, wantQuery, wantStream)
+}
+
+func TestStreamRowsFilterVarChar(t *testing.T) {
+	if testing.Short() {
+		t.Skip()
+	}
+
+	err := env.SetVSchema(shardedVSchema)
+	require.NoError(t, err)
+	defer env.SetVSchema("{}")
+
+	execStatements(t, []string{
+		"create table t1(id1 int, val varchar(128), primary key(id1)) character set utf8mb4 collate utf8mb4_general_ci", // Use general_ci so that we have the same behavior across 5.7 and 8.0
+		"insert into t1 values (1,'kepler'), (2, 'Ñewton'), (3, 'nEwton'), (4, 'kepler'), (5, 'neẅton'), (6, 'kepler')",
+	})
+	defer execStatements(t, []string{
+		"drop table t1",
+	})
+
+	wantStream := []string{
+		`fields:{name:"id1" type:INT32 table:"t1" org_table:"t1" database:"vttest" org_name:"id1" column_length:11 charset:63 column_type:"int(11)"} fields:{name:"val" type:VARCHAR table:"t1" org_table:"t1" database:"vttest" org_name:"val" column_length:512 charset:45 column_type:"varchar(128)"} pkfields:{name:"id1" type:INT32 charset:63}`,
+		`rows:{lengths:1 lengths:7 values:"2Ñewton"} rows:{lengths:1 lengths:6 values:"3nEwton"} rows:{lengths:1 lengths:8 values:"5neẅton"} lastpk:{lengths:1 values:"5"}`,
+	}
+	wantQuery := "select /*+ MAX_EXECUTION_TIME(3600000) */ id1, val from t1 where (val = 'newton') order by id1"
+	checkStream(t, "select id1, val from t1 where (val = 'newton')", nil, wantQuery, wantStream)
 }
 
 func TestStreamRowsMultiPacket(t *testing.T) {

From 404a55a5c07a5c0d25a3372e38e662d53b1b1d01 Mon Sep 17 00:00:00 2001
From: Manan Gupta <35839558+GuptaManan100@users.noreply.github.com>
Date: Tue, 11 Feb 2025 15:53:25 +0530
Subject: [PATCH 39/68] Fix data race in `TestIsServingLocked` (#17728)

Signed-off-by: Manan Gupta <manan@planetscale.com>
---
 .../tabletserver/state_manager_test.go        | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/go/vt/vttablet/tabletserver/state_manager_test.go b/go/vt/vttablet/tabletserver/state_manager_test.go
index 99a3e7e681d..9af2e061502 100644
--- a/go/vt/vttablet/tabletserver/state_manager_test.go
+++ b/go/vt/vttablet/tabletserver/state_manager_test.go
@@ -150,15 +150,24 @@ func TestStateManagerUnservePrimary(t *testing.T) {
 }
 
 type testDiskMonitor struct {
+	mu            sync.Mutex
 	isDiskStalled bool
 }
 
 func (t *testDiskMonitor) IsDiskStalled() bool {
+	t.mu.Lock()
+	defer t.mu.Unlock()
 	return t.isDiskStalled
 }
 
-// TestIsServingLocked tests isServingLocked() functionality.
-func TestIsServingLocked(t *testing.T) {
+func (t *testDiskMonitor) setDiskStalled(ds bool) {
+	t.mu.Lock()
+	defer t.mu.Unlock()
+	t.isDiskStalled = ds
+}
+
+// TestIsServing tests IsServing() functionality.
+func TestIsServing(t *testing.T) {
 	sm := newTestStateManager()
 	defer sm.StopService()
 	tdm := &testDiskMonitor{isDiskStalled: false}
@@ -166,10 +175,10 @@ func TestIsServingLocked(t *testing.T) {
 
 	err := sm.SetServingType(topodatapb.TabletType_REPLICA, testNow, StateServing, "")
 	require.NoError(t, err)
-	require.True(t, sm.isServingLocked())
+	require.True(t, sm.IsServing())
 
-	tdm.isDiskStalled = true
-	require.False(t, sm.isServingLocked())
+	tdm.setDiskStalled(true)
+	require.False(t, sm.IsServing())
 }
 
 func TestStateManagerUnserveNonPrimary(t *testing.T) {

From 2b21fb47b6c27e33efcef462ef79f666ddba14a1 Mon Sep 17 00:00:00 2001
From: Matt Lord <mattalord@gmail.com>
Date: Tue, 11 Feb 2025 11:11:22 -0500
Subject: [PATCH 40/68] Correct WriteTopologyPath args to match help text
 (#17735)

Signed-off-by: Matt Lord <mattalord@gmail.com>
---
 go/cmd/vtctldclient/command/topology.go                 | 4 ++--
 go/test/endtoend/tabletmanager/custom_rule_topo_test.go | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/go/cmd/vtctldclient/command/topology.go b/go/cmd/vtctldclient/command/topology.go
index a03ce403eb8..24d0da85c55 100644
--- a/go/cmd/vtctldclient/command/topology.go
+++ b/go/cmd/vtctldclient/command/topology.go
@@ -102,8 +102,8 @@ var writeTopologyPathOptions = struct {
 }{}
 
 func commandWriteTopologyPath(cmd *cobra.Command, args []string) error {
-	file := cmd.Flags().Arg(0)
-	path := cmd.Flags().Arg(1)
+	path := cmd.Flags().Arg(0)
+	file := cmd.Flags().Arg(1)
 	ts, err := topo.OpenServer(topoOptions.implementation, strings.Join(topoOptions.globalServerAddresses, ","), topoOptions.globalRoot)
 	if err != nil {
 		return fmt.Errorf("failed to connect to the topology server: %v", err)
diff --git a/go/test/endtoend/tabletmanager/custom_rule_topo_test.go b/go/test/endtoend/tabletmanager/custom_rule_topo_test.go
index c393e7c4646..74ad4b65c28 100644
--- a/go/test/endtoend/tabletmanager/custom_rule_topo_test.go
+++ b/go/test/endtoend/tabletmanager/custom_rule_topo_test.go
@@ -54,7 +54,7 @@ func TestTopoCustomRule(t *testing.T) {
 	require.NoError(t, err)
 
 	// Copy config file into topo.
-	err = clusterInstance.VtctldClientProcess.ExecuteCommand("--server", "internal", "WriteTopologyPath", topoCustomRuleFile, topoCustomRulePath)
+	err = clusterInstance.VtctldClientProcess.ExecuteCommand("--server", "internal", "WriteTopologyPath", topoCustomRulePath, topoCustomRuleFile)
 	require.Nil(t, err, "error should be Nil")
 
 	// Set extra tablet args for topo custom rule
@@ -100,7 +100,7 @@ func TestTopoCustomRule(t *testing.T) {
 	err = os.WriteFile(topoCustomRuleFile, data, 0777)
 	require.NoError(t, err)
 
-	err = clusterInstance.VtctldClientProcess.ExecuteCommand("--server", "internal", "WriteTopologyPath", topoCustomRuleFile, topoCustomRulePath)
+	err = clusterInstance.VtctldClientProcess.ExecuteCommand("--server", "internal", "WriteTopologyPath", topoCustomRulePath, topoCustomRuleFile)
 	require.Nil(t, err, "error should be Nil")
 
 	// And wait until the query fails with the right error.

From cca7b7f9f1f1e5d4a5912efef2e5716fdee0523c Mon Sep 17 00:00:00 2001
From: Matt Lord <mattalord@gmail.com>
Date: Tue, 11 Feb 2025 11:15:02 -0500
Subject: [PATCH 41/68] VReplication: Improve error handling in VTGate VStreams
 (#17558)

Signed-off-by: Matt Lord <mattalord@gmail.com>
---
 go/test/endtoend/vreplication/vstream_test.go |  19 ++--
 go/vt/vtgate/vstream_manager.go               | 101 +++++++++++-------
 .../tabletserver/vstreamer/vstreamer.go       |  46 ++++----
 3 files changed, 97 insertions(+), 69 deletions(-)

diff --git a/go/test/endtoend/vreplication/vstream_test.go b/go/test/endtoend/vreplication/vstream_test.go
index 6c0f1919616..7ce0e7dbd63 100644
--- a/go/test/endtoend/vreplication/vstream_test.go
+++ b/go/test/endtoend/vreplication/vstream_test.go
@@ -22,6 +22,7 @@ import (
 	"io"
 	"strings"
 	"sync"
+	"sync/atomic"
 	"testing"
 	"time"
 
@@ -76,11 +77,13 @@ func testVStreamWithFailover(t *testing.T, failover bool) {
 		}},
 	}
 	flags := &vtgatepb.VStreamFlags{HeartbeatInterval: 3600}
-	done := false
+	done := atomic.Bool{}
+	done.Store(false)
 
 	// don't insert while PRS is going on
 	var insertMu sync.Mutex
-	stopInserting := false
+	stopInserting := atomic.Bool{}
+	stopInserting.Store(false)
 	id := 0
 
 	vtgateConn := vc.GetVTGateConn(t)
@@ -89,7 +92,7 @@ func testVStreamWithFailover(t *testing.T, failover bool) {
 	// first goroutine that keeps inserting rows into table being streamed until some time elapses after second PRS
 	go func() {
 		for {
-			if stopInserting {
+			if stopInserting.Load() {
 				return
 			}
 			insertMu.Lock()
@@ -121,7 +124,7 @@ func testVStreamWithFailover(t *testing.T, failover bool) {
 				log.Infof("%s:: remote error: %v", time.Now(), err)
 			}
 
-			if done {
+			if done.Load() {
 				return
 			}
 		}
@@ -153,12 +156,12 @@ func testVStreamWithFailover(t *testing.T, failover bool) {
 				require.NoError(t, err)
 			}
 			time.Sleep(100 * time.Millisecond)
-			stopInserting = true
-			time.Sleep(2 * time.Second)
-			done = true
+			stopInserting.Store(true)
+			time.Sleep(10 * time.Second) // Give the vstream plenty of time to catchup
+			done.Store(true)
 		}
 
-		if done {
+		if done.Load() {
 			break
 		}
 	}
diff --git a/go/vt/vtgate/vstream_manager.go b/go/vt/vtgate/vstream_manager.go
index beb556f21f5..dc7a77ed62d 100644
--- a/go/vt/vtgate/vstream_manager.go
+++ b/go/vt/vtgate/vstream_manager.go
@@ -162,15 +162,15 @@ func (vsm *vstreamManager) VStream(ctx context.Context, tabletType topodatapb.Ta
 	filter *binlogdatapb.Filter, flags *vtgatepb.VStreamFlags, send func(events []*binlogdatapb.VEvent) error) error {
 	vgtid, filter, flags, err := vsm.resolveParams(ctx, tabletType, vgtid, filter, flags)
 	if err != nil {
-		return err
+		return vterrors.Wrap(err, "failed to resolve vstream parameters")
 	}
 	ts, err := vsm.toposerv.GetTopoServer()
 	if err != nil {
-		return err
+		return vterrors.Wrap(err, "failed to get topology server")
 	}
 	if ts == nil {
 		log.Errorf("unable to get topo server in VStream()")
-		return fmt.Errorf("unable to get topo server")
+		return vterrors.Errorf(vtrpcpb.Code_INTERNAL, "unable to get topoology server")
 	}
 	vs := &vstream{
 		vgtid:                       vgtid,
@@ -215,7 +215,7 @@ func (vsm *vstreamManager) resolveParams(ctx context.Context, tabletType topodat
 		flags = &vtgatepb.VStreamFlags{}
 	}
 	if vgtid == nil || len(vgtid.ShardGtids) == 0 {
-		return nil, nil, nil, vterrors.Errorf(vtrpcpb.Code_INVALID_ARGUMENT, "vgtid must have at least one value with a starting position")
+		return nil, nil, nil, vterrors.Errorf(vtrpcpb.Code_INVALID_ARGUMENT, "vgtid must have at least one value with a starting position in ShardGtids")
 	}
 	// To fetch from all keyspaces, the input must contain a single ShardGtid
 	// that has an empty keyspace, and the Gtid must be "current".
@@ -228,7 +228,7 @@ func (vsm *vstreamManager) resolveParams(ctx context.Context, tabletType topodat
 			newvgtid := &binlogdatapb.VGtid{}
 			keyspaces, err := vsm.toposerv.GetSrvKeyspaceNames(ctx, vsm.cell, false)
 			if err != nil {
-				return nil, nil, nil, err
+				return nil, nil, nil, vterrors.Wrapf(err, "failed to get keyspace names in cell %s", vsm.cell)
 			}
 
 			if isEmpty {
@@ -244,7 +244,7 @@ func (vsm *vstreamManager) resolveParams(ctx context.Context, tabletType topodat
 			} else {
 				re, err := regexp.Compile(strings.Trim(inputKeyspace, "/"))
 				if err != nil {
-					return nil, nil, nil, err
+					return nil, nil, nil, vterrors.Wrapf(err, "failed to compile regexp using %s", inputKeyspace)
 				}
 				for _, keyspace := range keyspaces {
 					if re.MatchString(keyspace) {
@@ -262,12 +262,13 @@ func (vsm *vstreamManager) resolveParams(ctx context.Context, tabletType topodat
 	for _, sgtid := range vgtid.ShardGtids {
 		if sgtid.Shard == "" {
 			if sgtid.Gtid != "current" && sgtid.Gtid != "" {
-				return nil, nil, nil, vterrors.Errorf(vtrpcpb.Code_INVALID_ARGUMENT, "if shards are unspecified, the Gtid value must be 'current' or empty; got: %v", vgtid)
+				return nil, nil, nil, vterrors.Errorf(vtrpcpb.Code_INVALID_ARGUMENT, "if shards are unspecified, the Gtid value must be 'current' or empty; got: %+v",
+					vgtid)
 			}
 			// TODO(sougou): this should work with the new Migrate workflow
 			_, _, allShards, err := vsm.resolver.GetKeyspaceShards(ctx, sgtid.Keyspace, tabletType)
 			if err != nil {
-				return nil, nil, nil, err
+				return nil, nil, nil, vterrors.Wrapf(err, "failed to get shards in keyspace %s", sgtid.Keyspace)
 			}
 			for _, shard := range allShards {
 				newvgtid.ShardGtids = append(newvgtid.ShardGtids, &binlogdatapb.ShardGtid{
@@ -329,9 +330,9 @@ func (vs *vstream) sendEvents(ctx context.Context) {
 	send := func(evs []*binlogdatapb.VEvent) error {
 		if err := vs.send(evs); err != nil {
 			vs.once.Do(func() {
-				vs.setError(err)
+				vs.setError(err, "error sending events")
 			})
-			return err
+			return vterrors.Wrap(err, "error sending events")
 		}
 		return nil
 	}
@@ -339,13 +340,13 @@ func (vs *vstream) sendEvents(ctx context.Context) {
 		select {
 		case <-ctx.Done():
 			vs.once.Do(func() {
-				vs.setError(fmt.Errorf("context canceled"))
+				vs.setError(ctx.Err(), "context ended while sending events")
 			})
 			return
 		case evs := <-vs.eventCh:
 			if err := send(evs); err != nil {
 				vs.once.Do(func() {
-					vs.setError(err)
+					vs.setError(err, "error sending events")
 				})
 				return
 			}
@@ -359,7 +360,7 @@ func (vs *vstream) sendEvents(ctx context.Context) {
 			}}
 			if err := send(evs); err != nil {
 				vs.once.Do(func() {
-					vs.setError(err)
+					vs.setError(err, "error sending heartbeat")
 				})
 				return
 			}
@@ -378,7 +379,7 @@ func (vs *vstream) startOneStream(ctx context.Context, sgtid *binlogdatapb.Shard
 		if err != nil {
 			log.Errorf("Error in vstream for %+v: %s", sgtid, err)
 			vs.once.Do(func() {
-				vs.setError(err)
+				vs.setError(err, fmt.Sprintf("error starting stream from shard GTID %+v", sgtid))
 				vs.cancel()
 			})
 		}
@@ -464,10 +465,12 @@ func (vs *vstream) alignStreams(ctx context.Context, event *binlogdatapb.VEvent,
 		}
 		select {
 		case <-ctx.Done():
-			return ctx.Err()
+			return vterrors.Wrapf(ctx.Err(), "context ended while waiting for skew to reduce for stream %s from %s/%s",
+				streamID, keyspace, shard)
 		case <-time.After(time.Duration(vs.skewTimeoutSeconds) * time.Second):
 			log.Errorf("timed out while waiting for skew to reduce: %s", streamID)
-			return fmt.Errorf("timed out while waiting for skew to reduce: %s", streamID)
+			return vterrors.Errorf(vtrpcpb.Code_CANCELED, "timed out while waiting for skew to reduce for stream %s from %s/%s",
+				streamID, keyspace, shard)
 		case <-vs.skewCh:
 			// once skew is fixed the channel is closed and all waiting streams "wake up"
 		}
@@ -500,7 +503,7 @@ func (vs *vstream) streamFromTablet(ctx context.Context, sgtid *binlogdatapb.Sha
 	for {
 		select {
 		case <-ctx.Done():
-			return ctx.Err()
+			return vterrors.Wrapf(ctx.Err(), "context ended while streaming from %s/%s", sgtid.Keyspace, sgtid.Shard)
 		case <-journalDone:
 			// Unreachable.
 			// This can happen if a server misbehaves and does not end
@@ -544,8 +547,9 @@ func (vs *vstream) streamFromTablet(ctx context.Context, sgtid *binlogdatapb.Sha
 		if err != nil {
 			return tabletPickerErr(err)
 		}
-		log.Infof("Picked a %s tablet for VStream in %s/%s within the %s cell(s)",
-			vs.tabletType.String(), sgtid.GetKeyspace(), sgtid.GetShard(), strings.Join(cells, ","))
+		tabletAliasString := topoproto.TabletAliasString(tablet.Alias)
+		log.Infof("Picked %s tablet %s for VStream in %s/%s within the %s cell(s)",
+			vs.tabletType.String(), tabletAliasString, sgtid.GetKeyspace(), sgtid.GetShard(), strings.Join(cells, ","))
 
 		target := &querypb.Target{
 			Keyspace:   sgtid.Keyspace,
@@ -556,7 +560,7 @@ func (vs *vstream) streamFromTablet(ctx context.Context, sgtid *binlogdatapb.Sha
 		tabletConn, err := vs.vsm.resolver.GetGateway().QueryServiceByAlias(ctx, tablet.Alias, target)
 		if err != nil {
 			log.Errorf(err.Error())
-			return err
+			return vterrors.Wrapf(err, "failed to get tablet connection to %s", tabletAliasString)
 		}
 
 		errCh := make(chan error, 1)
@@ -565,9 +569,9 @@ func (vs *vstream) streamFromTablet(ctx context.Context, sgtid *binlogdatapb.Sha
 				var err error
 				switch {
 				case ctx.Err() != nil:
-					err = fmt.Errorf("context has ended")
+					err = vterrors.Wrapf(ctx.Err(), "context ended while streaming tablet health from %s", tabletAliasString)
 				case shr == nil || shr.RealtimeStats == nil || shr.Target == nil:
-					err = fmt.Errorf("health check failed on %s", topoproto.TabletAliasString(tablet.Alias))
+					err = fmt.Errorf("health check failed on %s", tabletAliasString)
 				case vs.tabletType != shr.Target.TabletType:
 					err = fmt.Errorf("tablet %s type has changed from %s to %s, restarting vstream",
 						topoproto.TabletAliasString(tablet.Alias), vs.tabletType, shr.Target.TabletType)
@@ -580,6 +584,7 @@ func (vs *vstream) streamFromTablet(ctx context.Context, sgtid *binlogdatapb.Sha
 				}
 				if err != nil {
 					log.Warningf("Tablet state changed: %s, attempting to restart", err)
+					err = vterrors.Wrapf(err, "error streaming tablet health from %s", tabletAliasString)
 					errCh <- err
 					return err
 				}
@@ -604,7 +609,7 @@ func (vs *vstream) streamFromTablet(ctx context.Context, sgtid *binlogdatapb.Sha
 			Options:      options,
 		}
 		var vstreamCreatedOnce sync.Once
-		log.Infof("Starting to vstream from %s, with req %+v", topoproto.TabletAliasString(tablet.Alias), req)
+		log.Infof("Starting to vstream from %s, with req %+v", tabletAliasString, req)
 		err = tabletConn.VStream(ctx, req, func(events []*binlogdatapb.VEvent) error {
 			// We received a valid event. Reset error count.
 			errCount = 0
@@ -617,9 +622,12 @@ func (vs *vstream) streamFromTablet(ctx context.Context, sgtid *binlogdatapb.Sha
 
 			select {
 			case <-ctx.Done():
-				return ctx.Err()
+				return vterrors.Wrapf(ctx.Err(), "context ended while streaming from tablet %s in %s/%s",
+					tabletAliasString, sgtid.Keyspace, sgtid.Shard)
 			case streamErr := <-errCh:
-				return vterrors.New(vtrpcpb.Code_UNAVAILABLE, streamErr.Error())
+				// You must return Code_UNAVAILABLE here to trigger a restart.
+				return vterrors.Errorf(vtrpcpb.Code_UNAVAILABLE, "error streaming from tablet %s in %s/%s: %s",
+					tabletAliasString, sgtid.Keyspace, sgtid.Shard, streamErr.Error())
 			case <-journalDone:
 				// Unreachable.
 				// This can happen if a server misbehaves and does not end
@@ -628,6 +636,9 @@ func (vs *vstream) streamFromTablet(ctx context.Context, sgtid *binlogdatapb.Sha
 			default:
 			}
 
+			aligningStreamsErr := fmt.Sprintf("error aligning streams across %s/%s", sgtid.Keyspace, sgtid.Shard)
+			sendingEventsErr := fmt.Sprintf("error sending event batch from tablet %s", tabletAliasString)
+
 			sendevents := make([]*binlogdatapb.VEvent, 0, len(events))
 			for i, event := range events {
 				switch event.Type {
@@ -648,11 +659,11 @@ func (vs *vstream) streamFromTablet(ctx context.Context, sgtid *binlogdatapb.Sha
 					eventss = append(eventss, sendevents)
 
 					if err := vs.alignStreams(ctx, event, sgtid.Keyspace, sgtid.Shard); err != nil {
-						return err
+						return vterrors.Wrap(err, aligningStreamsErr)
 					}
 
 					if err := vs.sendAll(ctx, sgtid, eventss); err != nil {
-						return err
+						return vterrors.Wrap(err, sendingEventsErr)
 					}
 					eventss = nil
 					sendevents = nil
@@ -664,11 +675,11 @@ func (vs *vstream) streamFromTablet(ctx context.Context, sgtid *binlogdatapb.Sha
 					eventss = append(eventss, sendevents)
 
 					if err := vs.alignStreams(ctx, event, sgtid.Keyspace, sgtid.Shard); err != nil {
-						return err
+						return vterrors.Wrap(err, aligningStreamsErr)
 					}
 
 					if err := vs.sendAll(ctx, sgtid, eventss); err != nil {
-						return err
+						return vterrors.Wrap(err, sendingEventsErr)
 					}
 					eventss = nil
 					sendevents = nil
@@ -677,7 +688,7 @@ func (vs *vstream) streamFromTablet(ctx context.Context, sgtid *binlogdatapb.Sha
 					// Otherwise they can accumulate indefinitely if there are no real events.
 					// TODO(sougou): figure out a model for this.
 					if err := vs.alignStreams(ctx, event, sgtid.Keyspace, sgtid.Shard); err != nil {
-						return err
+						return vterrors.Wrap(err, aligningStreamsErr)
 					}
 				case binlogdatapb.VEventType_JOURNAL:
 					journal := event.Journal
@@ -698,14 +709,15 @@ func (vs *vstream) streamFromTablet(ctx context.Context, sgtid *binlogdatapb.Sha
 						}
 						eventss = append(eventss, sendevents)
 						if err := vs.sendAll(ctx, sgtid, eventss); err != nil {
-							return err
+							return vterrors.Wrap(err, sendingEventsErr)
 						}
 						eventss = nil
 						sendevents = nil
 					}
 					je, err := vs.getJournalEvent(ctx, sgtid, journal)
 					if err != nil {
-						return err
+						return vterrors.Wrapf(err, "error getting journal event for shard GTID %+v on tablet %s",
+							sgtid, tabletAliasString)
 					}
 					if je != nil {
 						var endTimer *time.Timer
@@ -725,7 +737,8 @@ func (vs *vstream) streamFromTablet(ctx context.Context, sgtid *binlogdatapb.Sha
 						journalDone = je.done
 						select {
 						case <-ctx.Done():
-							return ctx.Err()
+							return vterrors.Wrapf(ctx.Err(), "context ended while waiting for journal event for shard GTID %+v on tablet %s",
+								sgtid, tabletAliasString)
 						case <-journalDone:
 							if endTimer != nil {
 								<-endTimer.C
@@ -752,13 +765,15 @@ func (vs *vstream) streamFromTablet(ctx context.Context, sgtid *binlogdatapb.Sha
 		}
 		if err == nil {
 			// Unreachable.
-			err = vterrors.Errorf(vtrpcpb.Code_UNKNOWN, "vstream ended unexpectedly")
+			err = vterrors.Errorf(vtrpcpb.Code_UNKNOWN, "vstream ended unexpectedly on tablet %s in %s/%s",
+				tabletAliasString, sgtid.Keyspace, sgtid.Shard)
 		}
 
 		retry, ignoreTablet := vs.shouldRetry(err)
 		if !retry {
 			log.Errorf("vstream for %s/%s error: %v", sgtid.Keyspace, sgtid.Shard, err)
-			return err
+			return vterrors.Wrapf(err, "error in vstream for %s/%s on tablet %s",
+				sgtid.Keyspace, sgtid.Shard, tabletAliasString)
 		}
 		if ignoreTablet {
 			ignoreTablets = append(ignoreTablets, tablet.GetAlias())
@@ -768,7 +783,8 @@ func (vs *vstream) streamFromTablet(ctx context.Context, sgtid *binlogdatapb.Sha
 		// Retry, at most, 3 times if the error can be retried.
 		if errCount >= 3 {
 			log.Errorf("vstream for %s/%s had three consecutive failures: %v", sgtid.Keyspace, sgtid.Shard, err)
-			return err
+			return vterrors.Wrapf(err, "persistent error in vstream for %s/%s on tablet %s; giving up",
+				sgtid.Keyspace, sgtid.Shard, tabletAliasString)
 		}
 		log.Infof("vstream for %s/%s error, retrying: %v", sgtid.Keyspace, sgtid.Shard, err)
 	}
@@ -884,10 +900,10 @@ func (vs *vstream) getError() error {
 	return vs.err
 }
 
-func (vs *vstream) setError(err error) {
+func (vs *vstream) setError(err error, msg string) {
 	vs.errMu.Lock()
 	defer vs.errMu.Unlock()
-	vs.err = err
+	vs.err = vterrors.Wrap(err, msg)
 }
 
 // getJournalEvent returns a journalEvent. The caller has to wait on its done channel.
@@ -936,7 +952,8 @@ func (vs *vstream) getJournalEvent(ctx context.Context, sgtid *binlogdatapb.Shar
 						mode = matchAll
 						je.participants[inner] = false
 					case matchNone:
-						return nil, fmt.Errorf("not all journaling participants are in the stream: journal: %v, stream: %v", journal.Participants, vs.vgtid.ShardGtids)
+						return nil, vterrors.Errorf(vtrpcpb.Code_INTERNAL, "not all journaling participants are in the stream: journal: %v, stream: %v",
+							journal.Participants, vs.vgtid.ShardGtids)
 					}
 					continue nextParticipant
 				}
@@ -945,7 +962,8 @@ func (vs *vstream) getJournalEvent(ctx context.Context, sgtid *binlogdatapb.Shar
 			case undecided, matchNone:
 				mode = matchNone
 			case matchAll:
-				return nil, fmt.Errorf("not all journaling participants are in the stream: journal: %v, stream: %v", journal.Participants, vs.vgtid.ShardGtids)
+				return nil, vterrors.Errorf(vtrpcpb.Code_INTERNAL, "not all journaling participants are in the stream: journal: %v, stream: %v",
+					journal.Participants, vs.vgtid.ShardGtids)
 			}
 		}
 		if mode == matchNone {
@@ -1017,7 +1035,8 @@ func (vs *vstream) keyspaceHasBeenResharded(ctx context.Context, keyspace string
 	for _, s := range ksShardGTIDs {
 		shard := shards[s.GetShard()]
 		if shard == nil {
-			return false, vterrors.Errorf(vtrpcpb.Code_FAILED_PRECONDITION, "shard provided in VGTID, %s, not found in the %s keyspace", s.GetShard(), keyspace)
+			return false, vterrors.Errorf(vtrpcpb.Code_FAILED_PRECONDITION, "shard provided in VGTID, %s, not found in the %s keyspace",
+				s.GetShard(), keyspace)
 		}
 		if !shard.GetIsPrimaryServing() {
 			reshardPossible = true
diff --git a/go/vt/vttablet/tabletserver/vstreamer/vstreamer.go b/go/vt/vttablet/tabletserver/vstreamer/vstreamer.go
index 7384865d7eb..8ee0d4b8835 100644
--- a/go/vt/vttablet/tabletserver/vstreamer/vstreamer.go
+++ b/go/vt/vttablet/tabletserver/vstreamer/vstreamer.go
@@ -184,7 +184,7 @@ func (vs *vstreamer) Stream() error {
 	if err != nil {
 		vs.vse.errorCounts.Add("StreamRows", 1)
 		vs.vse.vstreamersEndedWithErrors.Add(1)
-		return err
+		return vterrors.Wrapf(err, "failed to determine starting position")
 	}
 	vs.pos = pos
 	return vs.replicate(ctx)
@@ -289,7 +289,8 @@ func (vs *vstreamer) parseEvents(ctx context.Context, events <-chan mysql.Binlog
 			bufferedEvents = append(bufferedEvents, vevent)
 		default:
 			vs.vse.errorCounts.Add("BufferAndTransmit", 1)
-			return fmt.Errorf("unexpected event: %v", vevent)
+			return vterrors.Errorf(vtrpcpb.Code_INVALID_ARGUMENT, "usupported event type %s found for event: %+v",
+				vevent.Type.String(), vevent)
 		}
 		return nil
 	}
@@ -369,11 +370,13 @@ func (vs *vstreamer) parseEvents(ctx context.Context, events <-chan mysql.Binlog
 		case ev, ok := <-throttledEvents:
 			if !ok {
 				select {
+				case err := <-errs:
+					return err
 				case <-ctx.Done():
 					return nil
 				default:
 				}
-				return fmt.Errorf("unexpected server EOF")
+				return vterrors.Errorf(vtrpcpb.Code_ABORTED, "unexpected server EOF while parsing events")
 			}
 			vevents, err := vs.parseEvent(ev, bufferAndTransmit)
 			if err != nil {
@@ -386,16 +389,18 @@ func (vs *vstreamer) parseEvents(ctx context.Context, events <-chan mysql.Binlog
 						return nil
 					}
 					vs.vse.errorCounts.Add("BufferAndTransmit", 1)
-					return fmt.Errorf("error sending event: %v", err)
+					return vterrors.Wrapf(err, "error sending event: %+v", vevent)
 				}
 			}
 		case vs.vschema = <-vs.vevents:
 			select {
+			case err := <-errs:
+				return err
 			case <-ctx.Done():
 				return nil
 			default:
 				if err := vs.rebuildPlans(); err != nil {
-					return err
+					return vterrors.Wrap(err, "failed to rebuild replication plans")
 				}
 			}
 		case err := <-errs:
@@ -409,7 +414,7 @@ func (vs *vstreamer) parseEvents(ctx context.Context, events <-chan mysql.Binlog
 					return nil
 				}
 				vs.vse.errorCounts.Add("Send", 1)
-				return fmt.Errorf("error sending event: %v", err)
+				return vterrors.Wrapf(err, "failed to send heartbeat event")
 			}
 		}
 	}
@@ -460,7 +465,7 @@ func (vs *vstreamer) parseEvent(ev mysql.BinlogEvent, bufferAndTransmit func(vev
 	case ev.IsGTID():
 		gtid, hasBegin, err := ev.GTID(vs.format)
 		if err != nil {
-			return nil, fmt.Errorf("can't get GTID from binlog event: %v, event data: %#v", err, ev)
+			return nil, vterrors.Wrapf(err, "failed to get GTID from binlog event: %#v", ev)
 		}
 		if hasBegin {
 			vevents = append(vevents, &binlogdatapb.VEvent{
@@ -478,7 +483,7 @@ func (vs *vstreamer) parseEvent(ev mysql.BinlogEvent, bufferAndTransmit func(vev
 	case ev.IsQuery():
 		q, err := ev.Query(vs.format)
 		if err != nil {
-			return nil, fmt.Errorf("can't get query from binlog event: %v, event data: %#v", err, ev)
+			return nil, vterrors.Wrapf(err, "failed to get query from binlog event: %#v", ev)
 		}
 		// Insert/Delete/Update are supported only to be used in the context of external mysql streams where source databases
 		// could be using SBR. Vitess itself will never run into cases where it needs to consume non rbr statements.
@@ -579,7 +584,7 @@ func (vs *vstreamer) parseEvent(ev mysql.BinlogEvent, bufferAndTransmit func(vev
 
 		tm, err := ev.TableMap(vs.format)
 		if err != nil {
-			return nil, err
+			return nil, vterrors.Wrapf(err, "failed to parse table map from binlog event: %#v", ev)
 		}
 		if plan, ok := vs.plans[id]; ok {
 			// When the underlying mysql server restarts the table map can change.
@@ -618,7 +623,7 @@ func (vs *vstreamer) parseEvent(ev mysql.BinlogEvent, bufferAndTransmit func(vev
 		vevent, err := vs.buildTablePlan(id, tm)
 		if err != nil {
 			vs.vse.errorCounts.Add("TablePlan", 1)
-			return nil, err
+			return nil, vterrors.Wrapf(err, "failed to build table replication plan for table %s", tm.Name)
 		}
 		if vevent != nil {
 			vevents = append(vevents, vevent)
@@ -907,7 +912,7 @@ func getExtColInfos(ctx context.Context, cp dbconfigs.Connector, se *schema.Engi
 	extColInfos := make(map[string]*extColInfo)
 	conn, err := cp.Connect(ctx)
 	if err != nil {
-		return nil, err
+		return nil, vterrors.Wrapf(err, "failed to connect to database %s", database)
 	}
 	defer conn.Close()
 	queryTemplate := "select column_name, column_type, collation_name from information_schema.columns where table_schema=%s and table_name=%s;"
@@ -973,7 +978,7 @@ nextrow:
 	for _, row := range rows.Rows {
 		afterOK, afterValues, _, err := vs.extractRowAndFilter(plan, row.Data, rows.DataColumns, row.NullColumns, row.JSONPartialValues)
 		if err != nil {
-			return nil, err
+			return nil, vterrors.Wrap(err, "failed to extract journal from binlog event and apply filters")
 		}
 		if !afterOK {
 			// This can happen if someone manually deleted rows.
@@ -995,7 +1000,7 @@ nextrow:
 				return nil, err
 			}
 			if err := prototext.Unmarshal(avBytes, journal); err != nil {
-				return nil, err
+				return nil, vterrors.Wrap(err, "failed to unmarshal journal event")
 			}
 			vevents = append(vevents, &binlogdatapb.VEvent{
 				Type:    binlogdatapb.VEventType_JOURNAL,
@@ -1012,13 +1017,13 @@ func (vs *vstreamer) processRowEvent(vevents []*binlogdatapb.VEvent, plan *strea
 		// 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
+			return nil, vterrors.Wrap(err, "failed to extract row's before values from binlog event and apply filters")
 		}
 		// 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
+			return nil, vterrors.Wrap(err, "failed to extract row's after values from binlog event and apply filters")
 		}
 		if !beforeOK && !afterOK {
 			continue
@@ -1123,7 +1128,8 @@ func (vs *vstreamer) extractRowAndFilter(plan *streamerPlan, data []byte, dataCo
 		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)
-			return false, nil, false, err
+			return false, nil, false, vterrors.Wrapf(err, "failed to extract row's value for column %s from binlog event",
+				plan.Table.Fields[colNum].Name)
 		}
 		pos += l
 
@@ -1199,7 +1205,7 @@ func buildEnumStringValue(env *vtenv.Environment, plan *streamerPlan, colNum int
 	// table map event to initialize it.
 	if plan.EnumSetValuesMap == nil {
 		if err := addEnumAndSetMappingstoPlan(env, plan.Plan, plan.Table.Fields, plan.TableMap.Metadata); err != nil {
-			return sqltypes.Value{}, err
+			return sqltypes.Value{}, vterrors.Wrap(err, "failed to build ENUM column integer to string mappings")
 		}
 	}
 	// ENUM columns are stored as an unsigned 16-bit integer as they can contain a maximum
@@ -1207,7 +1213,7 @@ func buildEnumStringValue(env *vtenv.Environment, plan *streamerPlan, colNum int
 	// reserved for any integer value that has no string mapping.
 	iv, err := value.ToUint16()
 	if err != nil {
-		return sqltypes.Value{}, fmt.Errorf("no valid integer value found for column %s in table %s, bytes: %b",
+		return sqltypes.Value{}, vterrors.Wrapf(err, "no valid integer value found for column %s in table %s, bytes: %b",
 			plan.Table.Fields[colNum].Name, plan.Table.Name, iv)
 	}
 	var strVal string
@@ -1234,7 +1240,7 @@ func buildSetStringValue(env *vtenv.Environment, plan *streamerPlan, colNum int,
 	// table map event to initialize it.
 	if plan.EnumSetValuesMap == nil {
 		if err := addEnumAndSetMappingstoPlan(env, plan.Plan, plan.Table.Fields, plan.TableMap.Metadata); err != nil {
-			return sqltypes.Value{}, err
+			return sqltypes.Value{}, vterrors.Wrap(err, "failed to build SET column integer to string mappings")
 		}
 	}
 	// A SET column can have 64 unique values: https://dev.mysql.com/doc/refman/en/set.html
@@ -1243,7 +1249,7 @@ func buildSetStringValue(env *vtenv.Environment, plan *streamerPlan, colNum int,
 	val := bytes.Buffer{}
 	iv, err := value.ToUint64()
 	if err != nil {
-		return value, fmt.Errorf("no valid integer value found for column %s in table %s, bytes: %b",
+		return value, vterrors.Wrapf(err, "no valid integer value found for column %s in table %s, bytes: %b",
 			plan.Table.Fields[colNum].Name, plan.Table.Name, iv)
 	}
 	idx := 1

From 4f2cd1856b35420b2d618483bf8f38e6a7a45201 Mon Sep 17 00:00:00 2001
From: Florent Poinsard <35779988+frouioui@users.noreply.github.com>
Date: Tue, 11 Feb 2025 16:03:35 -0500
Subject: [PATCH 42/68] `operator.yaml`: pass on the `sidecarDbName` when
 creating a keyspace (#17739)

Signed-off-by: Florent Poinsard <florent.poinsard@outlook.fr>
---
 examples/operator/operator.yaml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/examples/operator/operator.yaml b/examples/operator/operator.yaml
index ded85de5285..0098bded632 100644
--- a/examples/operator/operator.yaml
+++ b/examples/operator/operator.yaml
@@ -4422,6 +4422,8 @@ spec:
                         maxItems: 2
                         minItems: 1
                         type: array
+                      sidecarDbName:
+                        type: string
                       turndownPolicy:
                         enum:
                           - RequireIdle
@@ -6239,6 +6241,8 @@ spec:
                   maxItems: 2
                   minItems: 1
                   type: array
+                sidecarDbName:
+                  type: string
                 topologyReconciliation:
                   properties:
                     pruneCells:

From fa54e1d2612917ac9c5d66aa53f934139f688e51 Mon Sep 17 00:00:00 2001
From: Deepthi Sigireddi <deepthi@planetscale.com>
Date: Tue, 11 Feb 2025 22:19:45 -0800
Subject: [PATCH 43/68] Move Andrew Mason to emeritus (#17745)

Signed-off-by: deepthi <deepthi@planetscale.com>
Signed-off-by: Andres Taylor <andres@planetscale.com>
Co-authored-by: Andres Taylor <andres@planetscale.com>
---
 .github/CODEOWNERS | 47 +++++++++++++++++++++++-----------------------
 MAINTAINERS.md     | 10 +++++-----
 2 files changed, 29 insertions(+), 28 deletions(-)

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index dc2968add81..725e723889a 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -1,7 +1,7 @@
 * @deepthi
-bootstrap.sh @ajm188 @deepthi @frouioui @vmg
-go.mod @ajm188 @deepthi @harshit-gangal @mattlord @rohit-nayak-ps @systay @frouioui
-go.sum @ajm188 @deepthi @harshit-gangal @mattlord @rohit-nayak-ps @systay @frouioui
+bootstrap.sh @deepthi @frouioui @vmg
+go.mod @deepthi @harshit-gangal @mattlord @rohit-nayak-ps @systay @frouioui
+go.sum @deepthi @harshit-gangal @mattlord @rohit-nayak-ps @systay @frouioui
 /.github/ @deepthi @mattlord @rohit-nayak-ps @frouioui
 /.github/ISSUE_TEMPLATE/ @deepthi @frouioui @mattlord
 /.github/workflows/ @deepthi @frouioui @mattlord @rohit-nayak-ps
@@ -15,15 +15,15 @@ go.sum @ajm188 @deepthi @harshit-gangal @mattlord @rohit-nayak-ps @systay @froui
 /examples/region_sharding @deepthi @mattlord
 /java/ @harshit-gangal
 /go/cache @vmg
-/go/cmd @ajm188 @deepthi @mattlord
-/go/cmd/vtadmin @ajm188 @notfelineit
-/go/cmd/vtctldclient @ajm188 @mattlord
+/go/cmd @deepthi @mattlord
+/go/cmd/vtadmin @notfelineit
+/go/cmd/vtctldclient @mattlord
 /go/cmd/vtctldclient/command/throttler.go @shlomi-noach @mattlord
 /go/cmd/vtctldclient/command/vreplication @mattlord @rohit-nayak-ps
-/go/internal/flag @ajm188 @rohit-nayak-ps
+/go/internal/flag @rohit-nayak-ps
 /go/mysql @harshit-gangal @systay @mattlord
 /go/pools @deepthi @harshit-gangal
-/go/protoutil @ajm188 @deepthi @mattlord
+/go/protoutil @deepthi @mattlord
 /go/sqltypes @harshit-gangal @shlomi-noach @vmg
 /go/test/endtoend/onlineddl @rohit-nayak-ps @shlomi-noach
 /go/test/endtoend/messaging @mattlord @rohit-nayak-ps @derekperkins
@@ -38,9 +38,9 @@ go.sum @ajm188 @deepthi @harshit-gangal @mattlord @rohit-nayak-ps @systay @froui
 /go/vt/discovery/*tablet_picker* @rohit-nayak-ps @mattlord
 /go/vt/mysqlctl @deepthi @mattlord
 /go/vt/proto @deepthi @harshit-gangal @mattlord
-/go/vt/proto/vtadmin @ajm188 @notfelineit
+/go/vt/proto/vtadmin @notfelineit
 /go/vt/schema @mattlord @shlomi-noach
-/go/vt/servenv @deepthi @ajm188
+/go/vt/servenv @deepthi @dbussink
 /go/vt/schemadiff @shlomi-noach @mattlord
 /go/vt/sqlparser @harshit-gangal @systay @GuptaManan100
 /go/vt/srvtopo @deepthi @mattlord
@@ -48,24 +48,25 @@ go.sum @ajm188 @deepthi @harshit-gangal @mattlord @rohit-nayak-ps @systay @froui
 /go/vt/topo @deepthi @mattlord
 /go/vt/topotools @deepthi @mattlord
 /go/vt/vitessdriver @harshit-gangal
-/go/vt/vtadmin @ajm188 @notfelineit @rohit-nayak-ps
-/go/vt/vtctl @ajm188 @deepthi @rohit-nayak-ps
+/go/vt/vtadmin @notfelineit @rohit-nayak-ps
+/go/vt/vtctl @deepthi @rohit-nayak-ps
 /go/vt/vtctl/vtctl.go @notfelineit @rohit-nayak-ps
-/go/vt/vtctl/grpcvtctldclient @ajm188 @notfelineit @mattlord
-/go/vt/vtctl/grpcvtctldserver @ajm188 @notfelineit @mattlord
-/go/vt/vtctl/reparentutil @ajm188 @GuptaManan100 @deepthi
-/go/vt/vtctl/vtctldclient @ajm188 @notfelineit @mattlord
-/go/vt/vtctld @ajm188 @deepthi @notfelineit @rohit-nayak-ps @mattlord
+/go/vt/vtctl/grpcvtctldclient @notfelineit @mattlord
+/go/vt/vtctl/grpcvtctldserver @notfelineit @mattlord
+/go/vt/vtctl/reparentutil @GuptaManan100 @deepthi
+/go/vt/vtctl/vtctldclient @notfelineit @mattlord
+/go/vt/vtctld @deepthi @notfelineit @rohit-nayak-ps @mattlord
 /go/vt/vterrors @harshit-gangal @systay
 /go/vt/vtexplain @systay @harshit-gangal
 /go/vt/vtgate @harshit-gangal @systay @frouioui @GuptaManan100
 /go/vt/vtgate/endtoend/*vstream* @rohit-nayak-ps @mattlord
 /go/vt/vtgate/planbuilder @harshit-gangal @systay @frouioui @GuptaManan100 @arthurschreiber
 /go/vt/vtgate/*vstream* @rohit-nayak-ps @mattlord
+/go/vt/vtgate/evalengine @dbussink @vmg @systay
 /go/vt/vtorc @deepthi @shlomi-noach @GuptaManan100 @timvaillancourt
 /go/vt/vttablet/*conn* @harshit-gangal @systay
 /go/vt/vttablet/endtoend @harshit-gangal @mattlord @rohit-nayak-ps @systay
-/go/vt/vttablet/grpc* @ajm188 @rohit-nayak-ps @shlomi-noach @harshit-gangal
+/go/vt/vttablet/grpc* @rohit-nayak-ps @shlomi-noach @harshit-gangal
 /go/vt/vttablet/onlineddl @mattlord @rohit-nayak-ps @shlomi-noach
 /go/vt/vttablet/queryservice @harshit-gangal @systay
 /go/vt/vttablet/tabletmanager @deepthi @GuptaManan100 @rohit-nayak-ps @shlomi-noach
@@ -76,15 +77,15 @@ go.sum @ajm188 @deepthi @harshit-gangal @mattlord @rohit-nayak-ps @systay @froui
 /go/vt/vttablet/tabletmanager/vstreamer @rohit-nayak-ps @mattlord
 /go/vt/vttablet/tabletserver* @harshit-gangal @systay @shlomi-noach @rohit-nayak-ps @timvaillancourt
 /go/vt/vttablet/tabletserver/messager @mattlord @rohit-nayak-ps @derekperkins
-/go/vt/vttablet/*tmclient* @ajm188 @GuptaManan100 @rohit-nayak-ps @shlomi-noach
+/go/vt/vttablet/*tmclient* @GuptaManan100 @rohit-nayak-ps @shlomi-noach
 /go/vt/vttablet/vexec @mattlord @rohit-nayak-ps @shlomi-noach
 /go/vt/wrangler @deepthi @mattlord @rohit-nayak-ps
 /go/vt/vtctl/workflow @mattlord @rohit-nayak-ps
 /proto/ @deepthi @harshit-gangal
-/proto/vtadmin.proto @ajm188 @notfelineit @mattlord
-/proto/vtctldata.proto @ajm188 @notfelineit @mattlord
-/proto/vtctlservice.proto @ajm188 @notfelineit @mattlord
+/proto/vtadmin.proto @notfelineit @mattlord
+/proto/vtctldata.proto @notfelineit @mattlord
+/proto/vtctlservice.proto @notfelineit @mattlord
 /test/ @GuptaManan100 @frouioui @rohit-nayak-ps @deepthi @mattlord @harshit-gangal
 /tools/ @frouioui @rohit-nayak-ps
-/web/vtadmin @ajm188 @notfelineit
+/web/vtadmin @notfelineit
 /web/vtadmin/src/proto @deepthi @harshit-gangal @mattlord
diff --git a/MAINTAINERS.md b/MAINTAINERS.md
index 320ce87534b..fb8e8a55f53 100644
--- a/MAINTAINERS.md
+++ b/MAINTAINERS.md
@@ -3,7 +3,6 @@ This page lists all active maintainers and their areas of expertise. This can be
 The following is the full list, alphabetically ordered.
 
 * Andres Taylor ([systay](https://github.com/systay)) andres@planetscale.com
-* Andrew Mason ([amason](https://github.com/ajm188)) amason@hey.com
 * Arthur Schreiber ([arthurschreiber](https://github.com/arthurschreiber)) arthurschreiber@github.com
 * Deepthi Sigireddi ([deepthi](https://github.com/deepthi)) deepthi@planetscale.com
 * Derek Perkins ([derekperkins](https://github.com/derekperkins)) derek@nozzle.io
@@ -24,7 +23,7 @@ The following is the full list, alphabetically ordered.
 deepthi, mattlord, derekperkins
 
 ### Builds
-shlomi-noach, ajm188, vmg, GuptaManan100, frouioui
+shlomi-noach, vmg, GuptaManan100, frouioui
 
 ### Resharding
 rohit-nayak-ps, deepthi, mattlord
@@ -33,7 +32,7 @@ rohit-nayak-ps, deepthi, mattlord
 systay, harshit-gangal, vmg, GuptaManan100, dbussink
 
 ### Evaluation Engine
-vmg
+vmg, dbussink, systay
 
 ### Planner
 systay, harshit-gangal, GuptaManan100, frouioui 
@@ -48,7 +47,7 @@ shlomi-noach, dbussink
 vmg
 
 ### Cluster Management
-deepthi, ajm188, GuptaManan100, dbussink
+deepthi, GuptaManan100, dbussink
 
 ### Java
 harshit-gangal
@@ -57,7 +56,7 @@ harshit-gangal
 derekperkins, GuptaManan100, frouioui
 
 ### VTAdmin
-ajm188, notfelineit
+notfelineit, rohit-nayak-ps
 
 ### Messaging
 derekperkins, mattlord
@@ -67,6 +66,7 @@ We thank the following past maintainers for their contributions.
 
 * Alain Jobart ([alainjobart](https://github.com/alainjobart))
 * Alkin Tezuysal ([askdba](https://github.com/askdba))
+* Andrew Mason ([ajm188](https://github.com/ajm188))
 * Anthony Yeh ([enisoc](https://github.com/enisoc))
 * Dan Kozlowski ([dkhenry](https://github.com/dkhenry))
 * David Weitzman ([dweitzman](https://github.com/dweitzman))

From b5ede71dab7045b783bf95db6f70ed75b721e342 Mon Sep 17 00:00:00 2001
From: Dirkjan Bussink <d.bussink@gmail.com>
Date: Wed, 12 Feb 2025 09:28:00 +0100
Subject: [PATCH 44/68] Fix vtcombo parsing flags incorrectly (#17743)

Signed-off-by: Dirkjan Bussink <d.bussink@gmail.com>
---
 go/cmd/vtcombo/cli/main.go          | 18 +++++++++---------
 go/cmd/vtctldclient/command/root.go | 21 ++++++++++-----------
 2 files changed, 19 insertions(+), 20 deletions(-)

diff --git a/go/cmd/vtcombo/cli/main.go b/go/cmd/vtcombo/cli/main.go
index 5f27e581a24..52e29044268 100644
--- a/go/cmd/vtcombo/cli/main.go
+++ b/go/cmd/vtcombo/cli/main.go
@@ -126,15 +126,6 @@ func init() {
 	// user know about this flag.
 	Main.Flags().MarkHidden("tablet_protocol")
 
-	var err error
-	env, err = vtenv.New(vtenv.Options{
-		MySQLServerVersion: servenv.MySQLServerVersion(),
-		TruncateUILen:      servenv.TruncateUILen,
-		TruncateErrLen:     servenv.TruncateErrLen,
-	})
-	if err != nil {
-		log.Fatalf("unable to initialize env: %v", err)
-	}
 	srvTopoCounts = stats.NewCountersWithSingleLabel("ResilientSrvTopoServer", "Resilient srvtopo server operations", "type")
 }
 
@@ -189,6 +180,15 @@ func run(cmd *cobra.Command, args []string) (err error) {
 		cmd.Flags().Set("log_dir", "$VTDATAROOT/tmp")
 	}
 
+	env, err = vtenv.New(vtenv.Options{
+		MySQLServerVersion: servenv.MySQLServerVersion(),
+		TruncateUILen:      servenv.TruncateUILen,
+		TruncateErrLen:     servenv.TruncateErrLen,
+	})
+	if err != nil {
+		log.Fatalf("unable to initialize env: %v", err)
+	}
+
 	ctx, cancel := context.WithCancel(cmd.Context())
 	defer cancel()
 	if externalTopoServer {
diff --git a/go/cmd/vtctldclient/command/root.go b/go/cmd/vtctldclient/command/root.go
index 2a65a59f606..4b16ab71462 100644
--- a/go/cmd/vtctldclient/command/root.go
+++ b/go/cmd/vtctldclient/command/root.go
@@ -29,7 +29,6 @@ import (
 	"github.com/spf13/cobra"
 
 	"vitess.io/vitess/go/trace"
-	"vitess.io/vitess/go/vt/log"
 	"vitess.io/vitess/go/vt/logutil"
 	"vitess.io/vitess/go/vt/servenv"
 	"vitess.io/vitess/go/vt/topo"
@@ -105,6 +104,15 @@ connect directly to the topo server(s).`, useInternalVtctld),
 		// We use PersistentPreRun to set up the tracer, grpc client, and
 		// command context for every command.
 		PersistentPreRunE: func(cmd *cobra.Command, args []string) (err error) {
+			env, err = vtenv.New(vtenv.Options{
+				MySQLServerVersion: servenv.MySQLServerVersion(),
+				TruncateUILen:      servenv.TruncateUILen,
+				TruncateErrLen:     servenv.TruncateErrLen,
+			})
+			if err != nil {
+				return fmt.Errorf("failed to initialize vtenv: %w", err)
+			}
+
 			logutil.PurgeLogs()
 			traceCloser = trace.StartTracing("vtctldclient")
 			client, err = getClientForCommand(cmd)
@@ -118,6 +126,7 @@ connect directly to the topo server(s).`, useInternalVtctld),
 			}
 			vreplcommon.SetClient(client)
 			vreplcommon.SetCommandCtx(commandCtx)
+
 			return err
 		},
 		// Similarly, PersistentPostRun cleans up the resources spawned by
@@ -220,14 +229,4 @@ func init() {
 	Root.PersistentFlags().StringSliceVar(&topoOptions.globalServerAddresses, "topo-global-server-address", topoOptions.globalServerAddresses, "the address of the global topology server(s)")
 	Root.PersistentFlags().StringVar(&topoOptions.globalRoot, "topo-global-root", topoOptions.globalRoot, "the path of the global topology data in the global topology server")
 	vreplcommon.RegisterCommands(Root)
-
-	var err error
-	env, err = vtenv.New(vtenv.Options{
-		MySQLServerVersion: servenv.MySQLServerVersion(),
-		TruncateUILen:      servenv.TruncateUILen,
-		TruncateErrLen:     servenv.TruncateErrLen,
-	})
-	if err != nil {
-		log.Fatalf("failed to initialize vtenv: %v", err)
-	}
 }

From c47f1bd6cbbb3ab81d3c2f3a8fd217119fdd748f Mon Sep 17 00:00:00 2001
From: Rohit Nayak <57520317+rohit-nayak-ps@users.noreply.github.com>
Date: Wed, 12 Feb 2025 09:51:21 +0100
Subject: [PATCH 45/68] Atomic Copy: Fix panics when the copy phase starts in
 some clusters (#17717)

Signed-off-by: Rohit Nayak <rohit@planetscale.com>
---
 .../vttablet/tabletmanager/vreplication/replicator_plan.go | 4 ++++
 .../vttablet/tabletmanager/vreplication/vcopier_atomic.go  | 7 ++++++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/go/vt/vttablet/tabletmanager/vreplication/replicator_plan.go b/go/vt/vttablet/tabletmanager/vreplication/replicator_plan.go
index a201ce25847..95e4c98dda9 100644
--- a/go/vt/vttablet/tabletmanager/vreplication/replicator_plan.go
+++ b/go/vt/vttablet/tabletmanager/vreplication/replicator_plan.go
@@ -724,6 +724,10 @@ func (tp *TablePlan) appendFromRow(buf *bytes2.Buffer, row *querypb.Row) error {
 		return vterrors.Errorf(vtrpcpb.Code_INTERNAL, "wrong number of fields: got %d fields for %d bind locations",
 			len(tp.Fields), len(bindLocations))
 	}
+	if len(row.Lengths) < len(tp.Fields) {
+		return vterrors.Errorf(vtrpcpb.Code_INTERNAL, "wrong number of lengths: got %d lengths for %d fields",
+			len(row.Lengths), len(tp.Fields))
+	}
 
 	// Bind field values to locations.
 	var (
diff --git a/go/vt/vttablet/tabletmanager/vreplication/vcopier_atomic.go b/go/vt/vttablet/tabletmanager/vreplication/vcopier_atomic.go
index 3a0996e0c39..1e3892c0f05 100644
--- a/go/vt/vttablet/tabletmanager/vreplication/vcopier_atomic.go
+++ b/go/vt/vttablet/tabletmanager/vreplication/vcopier_atomic.go
@@ -84,6 +84,11 @@ func (vc *vcopier) copyAll(ctx context.Context, settings binlogplayer.VRSettings
 	defer rowsCopiedTicker.Stop()
 
 	parallelism := int(math.Max(1, float64(vc.vr.workflowConfig.ParallelInsertWorkers)))
+	// For now do not support concurrent inserts for atomic copies.
+	if parallelism > 1 {
+		parallelism = 1
+		log.Infof("Disabling concurrent inserts for atomic copies")
+	}
 	copyWorkerFactory := vc.newCopyWorkerFactory(parallelism)
 	var copyWorkQueue *vcopierCopyWorkQueue
 
@@ -154,7 +159,7 @@ func (vc *vcopier) copyAll(ctx context.Context, settings binlogplayer.VRSettings
 
 			lastpk = nil
 			// pkfields are only used for logging, so that we can monitor progress.
-			pkfields = make([]*querypb.Field, len(resp.Pkfields))
+			pkfields = make([]*querypb.Field, 0, len(resp.Pkfields))
 			for _, f := range resp.Pkfields {
 				pkfields = append(pkfields, f.CloneVT())
 			}

From e697991b841d506ed52265932b47f5eb78b242b1 Mon Sep 17 00:00:00 2001
From: Dirkjan Bussink <d.bussink@gmail.com>
Date: Wed, 12 Feb 2025 14:34:20 +0100
Subject: [PATCH 46/68] Remove unused code from go/mysql package (#17740)

Signed-off-by: Dirkjan Bussink <d.bussink@gmail.com>
---
 go/mysql/decimal/decimal.go      |  55 --------
 go/mysql/decimal/decimal_test.go | 214 -------------------------------
 go/mysql/decimal/mysql_test.go   |  15 +++
 go/mysql/decimal/scan.go         |  15 ---
 go/mysql/query.go                |   4 +-
 5 files changed, 18 insertions(+), 285 deletions(-)

diff --git a/go/mysql/decimal/decimal.go b/go/mysql/decimal/decimal.go
index a2b505a1232..a41362d52da 100644
--- a/go/mysql/decimal/decimal.go
+++ b/go/mysql/decimal/decimal.go
@@ -183,17 +183,6 @@ func NewFromFloat(value float64) Decimal {
 	return dec
 }
 
-func NewFromFloat32(value float32) Decimal {
-	if value == 0 {
-		return New(0, 0)
-	}
-	dec, err := NewFromString(strconv.FormatFloat(float64(value), 'f', -1, 32))
-	if err != nil {
-		panic(err)
-	}
-	return dec
-}
-
 func NewFromFloatMySQL(value float64) Decimal {
 	if value == 0 {
 		return New(0, 0)
@@ -366,12 +355,6 @@ func (d Decimal) Div(d2 Decimal, scaleIncr int32) Decimal {
 	return q
 }
 
-// div returns d / d2. If it doesn't divide exactly, the result will have
-// divisionPrecision digits after the decimal point.
-func (d Decimal) div(d2 Decimal) Decimal {
-	return d.divRound(d2, int32(divisionPrecision))
-}
-
 // QuoRem does division with remainder
 // d.QuoRem(d2,precision) returns quotient q and remainder r such that
 //
@@ -419,44 +402,6 @@ func (d Decimal) QuoRem(d2 Decimal, precision int32) (Decimal, Decimal) {
 	return dq, dr
 }
 
-// divRound divides and rounds to a given precision
-// i.e. to an integer multiple of 10^(-precision)
-//
-//	for a positive quotient digit 5 is rounded up, away from 0
-//	if the quotient is negative then digit 5 is rounded down, away from 0
-//
-// Note that precision<0 is allowed as input.
-func (d Decimal) divRound(d2 Decimal, precision int32) Decimal {
-	// quoRem already checks initialization
-	q, r := d.QuoRem(d2, precision)
-
-	// the actual rounding decision is based on comparing r*10^precision and d2/2
-	// instead compare 2 r 10 ^precision and d2
-	var rv2 big.Int
-	rv2.Abs(r.value)
-	rv2.Lsh(&rv2, 1)
-	// now rv2 = abs(r.value) * 2
-	r2 := Decimal{value: &rv2, exp: r.exp + precision}
-	// r2 is now 2 * r * 10 ^ precision
-	var c = r2.Cmp(d2.Abs())
-
-	if c < 0 {
-		return q
-	}
-
-	if d.value.Sign()*d2.value.Sign() < 0 {
-		return q.sub(New(1, -precision))
-	}
-
-	return q.Add(New(1, -precision))
-}
-
-// mod returns d % d2.
-func (d Decimal) mod(d2 Decimal) Decimal {
-	quo := d.divRound(d2, -d.exp+1).Truncate(0)
-	return d.sub(d2.mul(quo))
-}
-
 func (d Decimal) Ceil() Decimal {
 	if d.isInteger() {
 		return d
diff --git a/go/mysql/decimal/decimal_test.go b/go/mysql/decimal/decimal_test.go
index 03619a8f272..f8201e38a21 100644
--- a/go/mysql/decimal/decimal_test.go
+++ b/go/mysql/decimal/decimal_test.go
@@ -173,39 +173,6 @@ func TestNewFromFloatQuick(t *testing.T) {
 	}
 }
 
-func TestNewFromFloat32Random(t *testing.T) {
-	n := 0
-	for {
-		n++
-		if n == 10 {
-			break
-		}
-		in := float32((rand.Float64() - 0.5) * math.MaxFloat32 * 2)
-		want, err := NewFromString(strconv.FormatFloat(float64(in), 'f', -1, 32))
-		if err != nil {
-			t.Error(err)
-			continue
-		}
-		got := NewFromFloat32(in)
-		assert.True(t, want.Equal(got))
-
-	}
-}
-
-func TestNewFromFloat32Quick(t *testing.T) {
-	err := quick.Check(func(f float32) bool {
-		want, werr := NewFromString(strconv.FormatFloat(float64(f), 'f', -1, 32))
-		if werr != nil {
-			return true
-		}
-		got := NewFromFloat32(f)
-		return got.Equal(want)
-	}, &quick.Config{})
-	if err != nil {
-		t.Error(err)
-	}
-}
-
 func TestNewFromString(t *testing.T) {
 	for _, x := range testTable {
 		s := x.short
@@ -616,80 +583,6 @@ func TestDecimal_Mul(t *testing.T) {
 
 }
 
-func TestDecimal_Div(t *testing.T) {
-	type Inp struct {
-		a string
-		b string
-	}
-
-	inputs := map[Inp]string{
-		{"6", "3"}:                            "2",
-		{"10", "2"}:                           "5",
-		{"2.2", "1.1"}:                        "2",
-		{"-2.2", "-1.1"}:                      "2",
-		{"12.88", "5.6"}:                      "2.3",
-		{"1023427554493", "43432632"}:         "23563.5628642767953828", // rounded
-		{"1", "434324545566634"}:              "0.0000000000000023",
-		{"1", "3"}:                            "0.3333333333333333",
-		{"2", "3"}:                            "0.6666666666666667", // rounded
-		{"10000", "3"}:                        "3333.3333333333333333",
-		{"10234274355545544493", "-3"}:        "-3411424785181848164.3333333333333333",
-		{"-4612301402398.4753343454", "23.5"}: "-196268144782.9138440146978723",
-	}
-
-	for inp, expectedStr := range inputs {
-		num, err := NewFromString(inp.a)
-		if err != nil {
-			t.FailNow()
-		}
-		denom, err := NewFromString(inp.b)
-		if err != nil {
-			t.FailNow()
-		}
-		got := num.div(denom)
-		expected, _ := NewFromString(expectedStr)
-		assert.True(t, got.Equal(expected))
-
-		got2 := num.divRound(denom, int32(divisionPrecision))
-		assert.True(t, got2.Equal(expected))
-
-	}
-
-	type Inp2 struct {
-		n    int64
-		exp  int32
-		n2   int64
-		exp2 int32
-	}
-
-	// test code path where exp > 0
-	inputs2 := map[Inp2]string{
-		{124, 10, 3, 1}: "41333333333.3333333333333333",
-		{124, 10, 3, 0}: "413333333333.3333333333333333",
-		{124, 10, 6, 1}: "20666666666.6666666666666667",
-		{124, 10, 6, 0}: "206666666666.6666666666666667",
-		{10, 10, 10, 1}: "1000000000",
-	}
-
-	for inp, expectedAbs := range inputs2 {
-		for i := -1; i <= 1; i += 2 {
-			for j := -1; j <= 1; j += 2 {
-				n := inp.n * int64(i)
-				n2 := inp.n2 * int64(j)
-				num := New(n, inp.exp)
-				denom := New(n2, inp.exp2)
-				expected := expectedAbs
-				if i != j {
-					expected = "-" + expectedAbs
-				}
-				got := num.div(denom)
-				assert.Equal(t, expected, got.String())
-
-			}
-		}
-	}
-}
-
 func TestDecimal_QuoRem(t *testing.T) {
 	type Inp4 struct {
 		d   string
@@ -803,113 +696,6 @@ func sign(d Decimal) int {
 	return d.value.Sign()
 }
 
-// rules for rounded divide, rounded to integer
-// rounded_divide(d,d2) = q
-// sign q * sign (d/d2) >= 0
-// for d and d2 >0 :
-// q is already rounded
-// q = d/d2 + r , with r > -0.5 and r <= 0.5
-// thus q-d/d2 = r, with r > -0.5 and r <= 0.5
-// and d2 q -d = r d2 with r d2 > -d2/2 and r d2 <= d2/2
-// and 2 (d2 q -d) = x with x > -d2 and x <= d2
-// if we factor in precision then x > -d2 * 10^(-precision) and x <= d2 * 10(-precision)
-
-func TestDecimal_DivRound(t *testing.T) {
-	cases := []struct {
-		d      string
-		d2     string
-		prec   int32
-		result string
-	}{
-		{"2", "2", 0, "1"},
-		{"1", "2", 0, "1"},
-		{"-1", "2", 0, "-1"},
-		{"-1", "-2", 0, "1"},
-		{"1", "-2", 0, "-1"},
-		{"1", "-20", 1, "-0.1"},
-		{"1", "-20", 2, "-0.05"},
-		{"1", "20.0000000000000000001", 1, "0"},
-		{"1", "19.9999999999999999999", 1, "0.1"},
-	}
-	for _, s := range cases {
-		d, _ := NewFromString(s.d)
-		d2, _ := NewFromString(s.d2)
-		result, _ := NewFromString(s.result)
-		prec := s.prec
-		q := d.divRound(d2, prec)
-		if sign(q)*sign(d)*sign(d2) < 0 {
-			t.Errorf("sign of quotient wrong, got: %v/%v is about %v", d, d2, q)
-		}
-		x := q.mul(d2).Abs().sub(d.Abs()).mul(New(2, 0))
-		if x.Cmp(d2.Abs().mul(New(1, -prec))) > 0 {
-			t.Errorf("wrong rounding, got: %v/%v prec=%d is about %v", d, d2, prec, q)
-		}
-		if x.Cmp(d2.Abs().mul(New(-1, -prec))) <= 0 {
-			t.Errorf("wrong rounding, got: %v/%v prec=%d is about %v", d, d2, prec, q)
-		}
-		assert.True(t, q.Equal(result))
-
-	}
-}
-
-func TestDecimal_DivRound2(t *testing.T) {
-	for _, tc := range createDivTestCases() {
-		d := tc.d
-		if sign(tc.d2) == 0 {
-			continue
-		}
-		d2 := tc.d2
-		prec := tc.prec
-		q := d.divRound(d2, prec)
-		if sign(q)*sign(d)*sign(d2) < 0 {
-			t.Errorf("sign of quotient wrong, got: %v/%v is about %v", d, d2, q)
-		}
-		x := q.mul(d2).Abs().sub(d.Abs()).mul(New(2, 0))
-		if x.Cmp(d2.Abs().mul(New(1, -prec))) > 0 {
-			t.Errorf("wrong rounding, got: %v/%v prec=%d is about %v", d, d2, prec, q)
-		}
-		if x.Cmp(d2.Abs().mul(New(-1, -prec))) <= 0 {
-			t.Errorf("wrong rounding, got: %v/%v prec=%d is about %v", d, d2, prec, q)
-		}
-	}
-}
-
-func TestDecimal_Mod(t *testing.T) {
-	type Inp struct {
-		a string
-		b string
-	}
-
-	inputs := map[Inp]string{
-		{"3", "2"}:                           "1",
-		{"3451204593", "2454495034"}:         "996709559",
-		{"9999999999", "1275"}:               "324",
-		{"9999999999.9999998", "1275.49"}:    "239.2399998",
-		{"24544.95034", "0.3451204593"}:      "0.3283950433",
-		{"0.499999999999999999", "0.25"}:     "0.249999999999999999",
-		{"0.989512958912895912", "0.000001"}: "0.000000958912895912",
-		{"0.1", "0.1"}:                       "0",
-		{"0", "1.001"}:                       "0",
-		{"-7.5", "2"}:                        "-1.5",
-		{"7.5", "-2"}:                        "1.5",
-		{"-7.5", "-2"}:                       "-1.5",
-	}
-
-	for inp, res := range inputs {
-		a, err := NewFromString(inp.a)
-		if err != nil {
-			t.FailNow()
-		}
-		b, err := NewFromString(inp.b)
-		if err != nil {
-			t.FailNow()
-		}
-		c := a.mod(b)
-		assert.Equal(t, res, c.String())
-
-	}
-}
-
 func TestDecimal_Overflow(t *testing.T) {
 	if !didPanic(func() { New(1, math.MinInt32).mul(New(1, math.MinInt32)) }) {
 		t.Fatalf("should have gotten an overflow panic")
diff --git a/go/mysql/decimal/mysql_test.go b/go/mysql/decimal/mysql_test.go
index 602e4b41eef..4ff4795e8a4 100644
--- a/go/mysql/decimal/mysql_test.go
+++ b/go/mysql/decimal/mysql_test.go
@@ -473,3 +473,18 @@ func TestFormatAndRound(t *testing.T) {
 		}
 	}
 }
+
+// RequireFromString returns a new Decimal from a string representation
+// or panics if NewFromString would have returned an error.
+//
+// Example:
+//
+//	d := RequireFromString("-123.45")
+//	d2 := RequireFromString(".0001")
+func RequireFromString(value string) Decimal {
+	dec, err := NewFromString(value)
+	if err != nil {
+		panic(err)
+	}
+	return dec
+}
diff --git a/go/mysql/decimal/scan.go b/go/mysql/decimal/scan.go
index c56fc185287..5518e1ff0b6 100644
--- a/go/mysql/decimal/scan.go
+++ b/go/mysql/decimal/scan.go
@@ -267,21 +267,6 @@ next:
 	return d, err
 }
 
-// RequireFromString returns a new Decimal from a string representation
-// or panics if NewFromString would have returned an error.
-//
-// Example:
-//
-//	d := RequireFromString("-123.45")
-//	d2 := RequireFromString(".0001")
-func RequireFromString(value string) Decimal {
-	dec, err := NewFromString(value)
-	if err != nil {
-		panic(err)
-	}
-	return dec
-}
-
 func mulWW(x, y big.Word) (z1, z0 big.Word) {
 	zz1, zz0 := bits.Mul(uint(x), uint(y))
 	return big.Word(zz1), big.Word(zz0)
diff --git a/go/mysql/query.go b/go/mysql/query.go
index 720a533a772..87a8c8e030a 100644
--- a/go/mysql/query.go
+++ b/go/mysql/query.go
@@ -339,7 +339,9 @@ func (c *Conn) drainMoreResults(more bool, err error) error {
 	for more {
 		var moreErr error
 		_, more, _, moreErr = c.ReadQueryResult(FETCH_NO_ROWS, false)
-		err = errors.Join(err, moreErr)
+		if moreErr != nil {
+			err = errors.Join(err, moreErr)
+		}
 	}
 	return err
 }

From a10d34c5f01c50666676fa8cba88a458a8675273 Mon Sep 17 00:00:00 2001
From: Dirkjan Bussink <d.bussink@gmail.com>
Date: Wed, 12 Feb 2025 14:55:02 +0100
Subject: [PATCH 47/68] Remove unused go/stats code (#17742)

Signed-off-by: Dirkjan Bussink <d.bussink@gmail.com>
---
 go/stats/kebab_case_converter.go      | 63 ---------------------------
 go/stats/kebab_case_converter_test.go | 54 -----------------------
 go/stats/snake_case_converter.go      | 10 +++++
 3 files changed, 10 insertions(+), 117 deletions(-)
 delete mode 100644 go/stats/kebab_case_converter.go
 delete mode 100644 go/stats/kebab_case_converter_test.go

diff --git a/go/stats/kebab_case_converter.go b/go/stats/kebab_case_converter.go
deleted file mode 100644
index e77e09e37b9..00000000000
--- a/go/stats/kebab_case_converter.go
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
-Copyright 2019 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 stats
-
-import (
-	"regexp"
-	"strings"
-	"sync"
-)
-
-// toKebabCase produces a monitoring compliant name from the
-// original. It converts CamelCase to camel-case,
-// and CAMEL_CASE to camel-case. For numbers, it
-// converts 0.5 to v0_5.
-func toKebabCase(name string) (hyphenated string) {
-	memoizer.Lock()
-	defer memoizer.Unlock()
-	if hyphenated = memoizer.memo[name]; hyphenated != "" {
-		return hyphenated
-	}
-	hyphenated = name
-	for _, converter := range kebabConverters {
-		hyphenated = converter.re.ReplaceAllString(hyphenated, converter.repl)
-	}
-	hyphenated = strings.ToLower(hyphenated)
-	memoizer.memo[name] = hyphenated
-	return
-}
-
-var kebabConverters = []struct {
-	re   *regexp.Regexp
-	repl string
-}{
-	// example: LC -> L-C (e.g. CamelCase -> Camel-Case).
-	{regexp.MustCompile("([a-z])([A-Z])"), "$1-$2"},
-	// example: CCa -> C-Ca (e.g. CCamel -> C-Camel).
-	{regexp.MustCompile("([A-Z])([A-Z][a-z])"), "$1-$2"},
-	{regexp.MustCompile("_"), "-"},
-	{regexp.MustCompile(`\.`), "_"},
-}
-
-var memoizer = memoizerType{
-	memo: make(map[string]string),
-}
-
-type memoizerType struct {
-	sync.Mutex
-	memo map[string]string
-}
diff --git a/go/stats/kebab_case_converter_test.go b/go/stats/kebab_case_converter_test.go
deleted file mode 100644
index 2d40a9fff8a..00000000000
--- a/go/stats/kebab_case_converter_test.go
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
-Copyright 2019 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 stats
-
-import (
-	"testing"
-)
-
-func TestToKebabCase(t *testing.T) {
-	var kebabCaseTest = []struct{ input, output string }{
-		{"Camel", "camel"},
-		{"Camel", "camel"},
-		{"CamelCase", "camel-case"},
-		{"CamelCaseAgain", "camel-case-again"},
-		{"CCamel", "c-camel"},
-		{"CCCamel", "cc-camel"},
-		{"CAMEL_CASE", "camel-case"},
-		{"camel-case", "camel-case"},
-		{"0", "0"},
-		{"0.0", "0_0"},
-		{"JSON", "json"},
-	}
-
-	for _, tt := range kebabCaseTest {
-		if got, want := toKebabCase(tt.input), tt.output; got != want {
-			t.Errorf("want '%s', got '%s'", want, got)
-		}
-	}
-}
-
-func TestMemoize(t *testing.T) {
-	key := "Test"
-	if memoizer.memo[key] != "" {
-		t.Errorf("want '', got '%s'", memoizer.memo[key])
-	}
-	toKebabCase(key)
-	if memoizer.memo[key] != "test" {
-		t.Errorf("want 'test', got '%s'", memoizer.memo[key])
-	}
-}
diff --git a/go/stats/snake_case_converter.go b/go/stats/snake_case_converter.go
index 80fd1051529..11646239530 100644
--- a/go/stats/snake_case_converter.go
+++ b/go/stats/snake_case_converter.go
@@ -19,6 +19,7 @@ package stats
 import (
 	"regexp"
 	"strings"
+	"sync"
 )
 
 // GetSnakeName calls toSnakeName on the passed in string. It produces
@@ -59,6 +60,15 @@ var snakeConverters = []struct {
 	{regexp.MustCompile("-"), "_"},
 }
 
+var memoizer = memoizerType{
+	memo: make(map[string]string),
+}
+
+type memoizerType struct {
+	sync.Mutex
+	memo map[string]string
+}
+
 var snakeMemoizer = memoizerType{
 	memo: make(map[string]string),
 }

From 22cf8b6c9b2d1de6e99f98b67435ccd5c8def130 Mon Sep 17 00:00:00 2001
From: Dirkjan Bussink <d.bussink@gmail.com>
Date: Wed, 12 Feb 2025 15:06:26 +0100
Subject: [PATCH 48/68] Remove unused code from go/acl (#17741)

Signed-off-by: Dirkjan Bussink <d.bussink@gmail.com>
---
 go/acl/acl.go                   | 13 -------------
 go/acl/acl_test.go              | 29 ++---------------------------
 go/acl/deny_all_policy.go       |  5 -----
 go/acl/deny_all_policy_test.go  | 11 +----------
 go/acl/read_only_policy.go      | 10 ----------
 go/acl/read_only_policy_test.go | 11 +----------
 6 files changed, 4 insertions(+), 75 deletions(-)

diff --git a/go/acl/acl.go b/go/acl/acl.go
index 2974045676b..9f98a82c688 100644
--- a/go/acl/acl.go
+++ b/go/acl/acl.go
@@ -64,9 +64,6 @@ var (
 // Policy defines the interface that needs to be satisfied by
 // ACL policy implementors.
 type Policy interface {
-	// CheckAccessActor can be called to verify if an actor
-	// has access to the role.
-	CheckAccessActor(actor, role string) error
 	// CheckAccessHTTP can be called to verify if an actor in
 	// the http request has access to the role.
 	CheckAccessHTTP(req *http.Request, role string) error
@@ -101,16 +98,6 @@ func savePolicy() {
 	currentPolicy = denyAllPolicy{}
 }
 
-// CheckAccessActor uses the current security policy to
-// verify if an actor has access to the role.
-func CheckAccessActor(actor, role string) error {
-	once.Do(savePolicy)
-	if currentPolicy != nil {
-		return currentPolicy.CheckAccessActor(actor, role)
-	}
-	return nil
-}
-
 // CheckAccessHTTP uses the current security policy to
 // verify if an actor in an http request has access to
 // the role.
diff --git a/go/acl/acl_test.go b/go/acl/acl_test.go
index 65f6ed2b96d..0b5bc8ab015 100644
--- a/go/acl/acl_test.go
+++ b/go/acl/acl_test.go
@@ -31,13 +31,6 @@ import (
 
 type TestPolicy struct{}
 
-func (tp TestPolicy) CheckAccessActor(actor, role string) error {
-	if role == ADMIN {
-		return errors.New("not allowed")
-	}
-	return nil
-}
-
 func (tp TestPolicy) CheckAccessHTTP(req *http.Request, role string) error {
 	if role == ADMIN {
 		return errors.New("not allowed")
@@ -55,17 +48,8 @@ func init() {
 
 func TestSimplePolicy(t *testing.T) {
 	currentPolicy = policies["test"]
-	err := CheckAccessActor("", ADMIN)
 	want := "not allowed"
-	assert.Equalf(t, err.Error(), want, "got %v, want %s", err, want)
-
-	err = CheckAccessActor("", DEBUGGING)
-	assert.Equalf(t, err, nil, "got %v, want no error", err)
-
-	err = CheckAccessActor("", MONITORING)
-	assert.Equalf(t, err, nil, "got %v, want no error", err)
-
-	err = CheckAccessHTTP(nil, ADMIN)
+	err := CheckAccessHTTP(nil, ADMIN)
 	assert.Equalf(t, err.Error(), want, "got %v, want %s", err, want)
 
 	err = CheckAccessHTTP(nil, DEBUGGING)
@@ -77,16 +61,7 @@ func TestSimplePolicy(t *testing.T) {
 
 func TestEmptyPolicy(t *testing.T) {
 	currentPolicy = nil
-	err := CheckAccessActor("", ADMIN)
-	assert.Equalf(t, err, nil, "got %v, want no error", err)
-
-	err = CheckAccessActor("", DEBUGGING)
-	assert.Equalf(t, err, nil, "got %v, want no error", err)
-
-	err = CheckAccessActor("", MONITORING)
-	assert.Equalf(t, err, nil, "got %v, want no error", err)
-
-	err = CheckAccessHTTP(nil, ADMIN)
+	err := CheckAccessHTTP(nil, ADMIN)
 	assert.Equalf(t, err, nil, "got %v, want no error", err)
 
 	err = CheckAccessHTTP(nil, DEBUGGING)
diff --git a/go/acl/deny_all_policy.go b/go/acl/deny_all_policy.go
index 4179e25e6ff..37d1d51eea3 100644
--- a/go/acl/deny_all_policy.go
+++ b/go/acl/deny_all_policy.go
@@ -26,11 +26,6 @@ var errDenyAll = errors.New("not allowed: deny-all security_policy enforced")
 // denyAllPolicy rejects all access.
 type denyAllPolicy struct{}
 
-// CheckAccessActor disallows all actor access.
-func (denyAllPolicy) CheckAccessActor(actor, role string) error {
-	return errDenyAll
-}
-
 // CheckAccessHTTP disallows all HTTP access.
 func (denyAllPolicy) CheckAccessHTTP(req *http.Request, role string) error {
 	return errDenyAll
diff --git a/go/acl/deny_all_policy_test.go b/go/acl/deny_all_policy_test.go
index b66a344af2e..a16e885a663 100644
--- a/go/acl/deny_all_policy_test.go
+++ b/go/acl/deny_all_policy_test.go
@@ -26,16 +26,7 @@ func TestDenyAllPolicy(t *testing.T) {
 	testDenyAllPolicy := denyAllPolicy{}
 
 	want := errDenyAll
-	err := testDenyAllPolicy.CheckAccessActor("", ADMIN)
-	assert.Equalf(t, err, want, "got %v; want %v", err, want)
-
-	err = testDenyAllPolicy.CheckAccessActor("", DEBUGGING)
-	assert.Equalf(t, err, want, "got %v; want %v", err, want)
-
-	err = testDenyAllPolicy.CheckAccessActor("", MONITORING)
-	assert.Equalf(t, err, want, "got %v; want %v", err, want)
-
-	err = testDenyAllPolicy.CheckAccessHTTP(nil, ADMIN)
+	err := testDenyAllPolicy.CheckAccessHTTP(nil, ADMIN)
 	assert.Equalf(t, err, want, "got %v; want %v", err, want)
 
 	err = testDenyAllPolicy.CheckAccessHTTP(nil, DEBUGGING)
diff --git a/go/acl/read_only_policy.go b/go/acl/read_only_policy.go
index e0655242fdf..05b4817ec61 100644
--- a/go/acl/read_only_policy.go
+++ b/go/acl/read_only_policy.go
@@ -27,16 +27,6 @@ var errReadOnly = errors.New("not allowed: read-only security_policy enforced")
 // while denying any other roles (e.g. ADMIN) for everyone.
 type readOnlyPolicy struct{}
 
-// CheckAccessActor disallows all actor access.
-func (readOnlyPolicy) CheckAccessActor(actor, role string) error {
-	switch role {
-	case DEBUGGING, MONITORING:
-		return nil
-	default:
-		return errReadOnly
-	}
-}
-
 // CheckAccessHTTP disallows all HTTP access.
 func (readOnlyPolicy) CheckAccessHTTP(req *http.Request, role string) error {
 	switch role {
diff --git a/go/acl/read_only_policy_test.go b/go/acl/read_only_policy_test.go
index c5e988a6734..74fb46c734b 100644
--- a/go/acl/read_only_policy_test.go
+++ b/go/acl/read_only_policy_test.go
@@ -26,16 +26,7 @@ func TestReadOnlyPolicy(t *testing.T) {
 	testReadOnlyPolicy := readOnlyPolicy{}
 
 	want := errReadOnly
-	err := testReadOnlyPolicy.CheckAccessActor("", ADMIN)
-	assert.Equalf(t, err, want, "got %v; want %v", err, want)
-
-	err = testReadOnlyPolicy.CheckAccessActor("", DEBUGGING)
-	assert.Equalf(t, err, nil, "got %v; want no error", err)
-
-	err = testReadOnlyPolicy.CheckAccessActor("", MONITORING)
-	assert.Equalf(t, err, nil, "got %v; want no error", err)
-
-	err = testReadOnlyPolicy.CheckAccessHTTP(nil, ADMIN)
+	err := testReadOnlyPolicy.CheckAccessHTTP(nil, ADMIN)
 	assert.Equalf(t, err, want, "got %v; want %v", err, want)
 
 	err = testReadOnlyPolicy.CheckAccessHTTP(nil, DEBUGGING)

From fa965623e25f87afb5af79750c3c51828b2edf6a Mon Sep 17 00:00:00 2001
From: vitess-bot <139342327+vitess-bot@users.noreply.github.com>
Date: Wed, 12 Feb 2025 11:09:44 -0600
Subject: [PATCH 49/68] [main] Copy `v21.0.3` release notes (#17765)

Signed-off-by: Rohit Nayak <rohit@planetscale.com>
Co-authored-by: Rohit Nayak <rohit@planetscale.com>
---
 changelog/21.0/21.0.3/changelog.md     | 30 ++++++++++++++++++++++++++
 changelog/21.0/21.0.3/release_notes.md |  7 ++++++
 changelog/21.0/README.md               |  4 ++++
 3 files changed, 41 insertions(+)
 create mode 100644 changelog/21.0/21.0.3/changelog.md
 create mode 100644 changelog/21.0/21.0.3/release_notes.md

diff --git a/changelog/21.0/21.0.3/changelog.md b/changelog/21.0/21.0.3/changelog.md
new file mode 100644
index 00000000000..fbc873d0a50
--- /dev/null
+++ b/changelog/21.0/21.0.3/changelog.md
@@ -0,0 +1,30 @@
+# Changelog of Vitess v21.0.3
+
+### Bug fixes 
+#### Backup and Restore
+ * [release-21.0] Replace uses of os.Create with os2.Create within backup/restore workflows (#17648) [#17666](https://github.com/vitessio/vitess/pull/17666) 
+#### Query Serving
+ * [release-21.0] Fix how we generate the query serving error documentation (#17516) [#17536](https://github.com/vitessio/vitess/pull/17536)
+ * [release-21.0] Fix panic inside schema tracker (#17659) [#17673](https://github.com/vitessio/vitess/pull/17673)
+ * [release-21.0] smartconnpool: do not allow connections to starve (#17675) [#17685](https://github.com/vitessio/vitess/pull/17685) 
+#### VReplication
+ * [release-21.0] VReplication: Address SwitchTraffic bugs around replication lag and cancel on error (#17616) [#17644](https://github.com/vitessio/vitess/pull/17644)
+ * [release-21.0] VDiff: fix race when a vdiff resumes on vttablet restart (#17638) [#17694](https://github.com/vitessio/vitess/pull/17694)
+ * [release-21.0] Atomic Copy: Fix panics when the copy phase starts in some clusters (#17717) [#17748](https://github.com/vitessio/vitess/pull/17748) 
+#### VTAdmin
+ * [release-21.0] fix SchemaCacheConfig.DefaultExpiration (#17609) [#17612](https://github.com/vitessio/vitess/pull/17612) 
+#### VTGate
+ * [release-21.0] Increase health check buffer size [#17636](https://github.com/vitessio/vitess/pull/17636)
+### Dependencies 
+#### Java
+ * [release-21.0] Bump io.netty:netty-handler from 4.1.110.Final to 4.1.118.Final in /java (#17730) [#17733](https://github.com/vitessio/vitess/pull/17733)
+### Enhancement 
+#### VTAdmin
+ * [release-21.0] VTAdmin: update logo and favicon for the new Vitess logos (#17715) [#17725](https://github.com/vitessio/vitess/pull/17725)
+### Internal Cleanup 
+#### VReplication
+ * [release-21.0] Always make sure to escape all strings (#17649) [#17657](https://github.com/vitessio/vitess/pull/17657)
+### Release 
+#### General
+ * [release-21.0] Bump to `v21.0.3-SNAPSHOT` after the `v21.0.2` release [#17600](https://github.com/vitessio/vitess/pull/17600)
+
diff --git a/changelog/21.0/21.0.3/release_notes.md b/changelog/21.0/21.0.3/release_notes.md
new file mode 100644
index 00000000000..4c427209437
--- /dev/null
+++ b/changelog/21.0/21.0.3/release_notes.md
@@ -0,0 +1,7 @@
+# Release of Vitess v21.0.3
+The entire changelog for this release can be found [here](https://github.com/vitessio/vitess/blob/main/changelog/21.0/21.0.3/changelog.md).
+
+The release includes 13 merged Pull Requests.
+
+Thanks to all our contributors: @GuptaManan100, @app/vitess-bot, @vitess-bot
+
diff --git a/changelog/21.0/README.md b/changelog/21.0/README.md
index 680a294e34b..61467855055 100644
--- a/changelog/21.0/README.md
+++ b/changelog/21.0/README.md
@@ -1,4 +1,8 @@
 ## v21.0
+* **[21.0.3](21.0.3)**
+	* [Changelog](21.0.3/changelog.md)
+	* [Release Notes](21.0.3/release_notes.md)
+
 * **[21.0.2](21.0.2)**
 	* [Changelog](21.0.2/changelog.md)
 	* [Release Notes](21.0.2/release_notes.md)

From 48dba174e65aacd46e59c422eddf9f1cc3ce2688 Mon Sep 17 00:00:00 2001
From: vitess-bot <139342327+vitess-bot@users.noreply.github.com>
Date: Wed, 12 Feb 2025 11:21:09 -0600
Subject: [PATCH 50/68] [main] Copy `v20.0.6` release notes (#17767)

Signed-off-by: Rohit Nayak <rohit@planetscale.com>
Co-authored-by: Rohit Nayak <rohit@planetscale.com>
---
 changelog/20.0/20.0.6/changelog.md     | 29 ++++++++++++++++++++++++++
 changelog/20.0/20.0.6/release_notes.md |  7 +++++++
 changelog/20.0/README.md               |  4 ++++
 3 files changed, 40 insertions(+)
 create mode 100644 changelog/20.0/20.0.6/changelog.md
 create mode 100644 changelog/20.0/20.0.6/release_notes.md

diff --git a/changelog/20.0/20.0.6/changelog.md b/changelog/20.0/20.0.6/changelog.md
new file mode 100644
index 00000000000..cf73219cc68
--- /dev/null
+++ b/changelog/20.0/20.0.6/changelog.md
@@ -0,0 +1,29 @@
+# Changelog of Vitess v20.0.6
+
+### Bug fixes 
+#### Backup and Restore
+ * [release-20.0] Replace uses of os.Create with os2.Create within backup/restore workflows (#17648) [#17665](https://github.com/vitessio/vitess/pull/17665) 
+#### Query Serving
+ * [release-20.0] Fix panic inside schema tracker (#17659) [#17672](https://github.com/vitessio/vitess/pull/17672)
+ * [release-20.0] smartconnpool: do not allow connections to starve (#17675) [#17684](https://github.com/vitessio/vitess/pull/17684) 
+#### VReplication
+ * [release-20.0] VReplication: Address SwitchTraffic bugs around replication lag and cancel on error (#17616) [#17643](https://github.com/vitessio/vitess/pull/17643)
+ * [release-20.0] VDiff: fix race when a vdiff resumes on vttablet restart (#17638) [#17693](https://github.com/vitessio/vitess/pull/17693)
+ * [release-20.0] Atomic Copy: Fix panics when the copy phase starts in some clusters (#17717) [#17747](https://github.com/vitessio/vitess/pull/17747) 
+#### VTAdmin
+ * [release-20.0] fix SchemaCacheConfig.DefaultExpiration (#17609) [#17611](https://github.com/vitessio/vitess/pull/17611) 
+#### VTGate
+ * [release-20.0] Increase health check buffer size (#17636) [#17640](https://github.com/vitessio/vitess/pull/17640)
+### Dependencies 
+#### Java
+ * [release-20.0] Bump io.netty:netty-handler from 4.1.110.Final to 4.1.118.Final in /java (#17730) [#17732](https://github.com/vitessio/vitess/pull/17732)
+### Enhancement 
+#### VTAdmin
+ * [release-20.0] VTAdmin: update logo and favicon for the new Vitess logos (#17715) [#17724](https://github.com/vitessio/vitess/pull/17724)
+### Internal Cleanup 
+#### VReplication
+ * [release-20.0] Always make sure to escape all strings (#17649) [#17656](https://github.com/vitessio/vitess/pull/17656)
+### Release 
+#### General
+ * [release-20.0] Bump to `v20.0.6-SNAPSHOT` after the `v20.0.5` release [#17598](https://github.com/vitessio/vitess/pull/17598)
+
diff --git a/changelog/20.0/20.0.6/release_notes.md b/changelog/20.0/20.0.6/release_notes.md
new file mode 100644
index 00000000000..84495dc9b24
--- /dev/null
+++ b/changelog/20.0/20.0.6/release_notes.md
@@ -0,0 +1,7 @@
+# Release of Vitess v20.0.6
+The entire changelog for this release can be found [here](https://github.com/vitessio/vitess/blob/main/changelog/20.0/20.0.6/changelog.md).
+
+The release includes 12 merged Pull Requests.
+
+Thanks to all our contributors: @app/vitess-bot, @vitess-bot
+
diff --git a/changelog/20.0/README.md b/changelog/20.0/README.md
index 59d34ed7173..2e938aa8f51 100644
--- a/changelog/20.0/README.md
+++ b/changelog/20.0/README.md
@@ -1,4 +1,8 @@
 ## v20.0
+* **[20.0.6](20.0.6)**
+	* [Changelog](20.0.6/changelog.md)
+	* [Release Notes](20.0.6/release_notes.md)
+
 * **[20.0.5](20.0.5)**
 	* [Changelog](20.0.5/changelog.md)
 	* [Release Notes](20.0.5/release_notes.md)

From 01b3e02c2b0734e1d36962c42e209e4bbce8e69c Mon Sep 17 00:00:00 2001
From: vitess-bot <139342327+vitess-bot@users.noreply.github.com>
Date: Wed, 12 Feb 2025 11:33:20 -0600
Subject: [PATCH 51/68] [main] Copy `v19.0.10` release notes (#17769)

Signed-off-by: Rohit Nayak <rohit@planetscale.com>
Co-authored-by: Rohit Nayak <rohit@planetscale.com>
---
 changelog/19.0/19.0.10/changelog.md     | 26 +++++++++++++++++++++++++
 changelog/19.0/19.0.10/release_notes.md |  7 +++++++
 changelog/19.0/README.md                |  4 ++++
 3 files changed, 37 insertions(+)
 create mode 100644 changelog/19.0/19.0.10/changelog.md
 create mode 100644 changelog/19.0/19.0.10/release_notes.md

diff --git a/changelog/19.0/19.0.10/changelog.md b/changelog/19.0/19.0.10/changelog.md
new file mode 100644
index 00000000000..7bdc7ada61b
--- /dev/null
+++ b/changelog/19.0/19.0.10/changelog.md
@@ -0,0 +1,26 @@
+# Changelog of Vitess v19.0.10
+
+### Bug fixes 
+#### Backup and Restore
+ * [release-19.0] Replace uses of os.Create with os2.Create within backup/restore workflows (#17648) [#17664](https://github.com/vitessio/vitess/pull/17664) 
+#### Query Serving
+ * [release-19.0] Fix panic inside schema tracker (#17659) [#17671](https://github.com/vitessio/vitess/pull/17671)
+ * [release-19.0] smartconnpool: do not allow connections to starve (#17675) [#17683](https://github.com/vitessio/vitess/pull/17683) 
+#### VReplication
+ * [release-19.0] VReplication: Address SwitchTraffic bugs around replication lag and cancel on error (#17616) [#17642](https://github.com/vitessio/vitess/pull/17642)
+ * [release-19.0] Atomic Copy: Fix panics when the copy phase starts in some clusters (#17717) [#17746](https://github.com/vitessio/vitess/pull/17746) 
+#### VTGate
+ * [release-19.0] Increase health check buffer size (#17636) [#17639](https://github.com/vitessio/vitess/pull/17639)
+### Dependencies 
+#### Java
+ * [release-19.0] Bump io.netty:netty-handler from 4.1.110.Final to 4.1.118.Final in /java (#17730) [#17731](https://github.com/vitessio/vitess/pull/17731)
+### Enhancement 
+#### VTAdmin
+ * [release-19.0] VTAdmin: update logo and favicon for the new Vitess logos (#17715) [#17723](https://github.com/vitessio/vitess/pull/17723)
+### Internal Cleanup 
+#### VReplication
+ * [release-19.0] Always make sure to escape all strings (#17649) [#17655](https://github.com/vitessio/vitess/pull/17655)
+### Release 
+#### General
+ * [release-19.0] Bump to `v19.0.10-SNAPSHOT` after the `v19.0.9` release [#17596](https://github.com/vitessio/vitess/pull/17596)
+
diff --git a/changelog/19.0/19.0.10/release_notes.md b/changelog/19.0/19.0.10/release_notes.md
new file mode 100644
index 00000000000..281d4717102
--- /dev/null
+++ b/changelog/19.0/19.0.10/release_notes.md
@@ -0,0 +1,7 @@
+# Release of Vitess v19.0.10
+The entire changelog for this release can be found [here](https://github.com/vitessio/vitess/blob/main/changelog/19.0/19.0.10/changelog.md).
+
+The release includes 10 merged Pull Requests.
+
+Thanks to all our contributors: @app/vitess-bot, @vitess-bot
+
diff --git a/changelog/19.0/README.md b/changelog/19.0/README.md
index 4d40372096f..96329bac497 100644
--- a/changelog/19.0/README.md
+++ b/changelog/19.0/README.md
@@ -1,4 +1,8 @@
 ## v19.0
+* **[19.0.10](19.0.10)**
+	* [Changelog](19.0.10/changelog.md)
+	* [Release Notes](19.0.10/release_notes.md)
+
 * **[19.0.9](19.0.9)**
 	* [Changelog](19.0.9/changelog.md)
 	* [Release Notes](19.0.9/release_notes.md)

From d4e0f91367529401bd9d4f838f0d08c5f3d4205a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9s=20Taylor?= <andres@planetscale.com>
Date: Thu, 13 Feb 2025 08:13:49 +0100
Subject: [PATCH 52/68] bugfix: support subqueries inside subqueries when
 merging (#17764)

Signed-off-by: Andres Taylor <andres@planetscale.com>
---
 .../operators/subquery_planning.go            | 50 ++++++++++--------
 .../planbuilder/testdata/select_cases.json    | 52 +++++++++++++++++++
 2 files changed, 81 insertions(+), 21 deletions(-)

diff --git a/go/vt/vtgate/planbuilder/operators/subquery_planning.go b/go/vt/vtgate/planbuilder/operators/subquery_planning.go
index 06ca69dd7f3..87182fa7713 100644
--- a/go/vt/vtgate/planbuilder/operators/subquery_planning.go
+++ b/go/vt/vtgate/planbuilder/operators/subquery_planning.go
@@ -148,30 +148,38 @@ func mergeSubqueryExpr(ctx *plancontext.PlanningContext, pe *ProjExpr) {
 
 func rewriteMergedSubqueryExpr(ctx *plancontext.PlanningContext, se SubQueryExpression, expr sqlparser.Expr) (sqlparser.Expr, bool) {
 	rewritten := false
-	for _, sq := range se {
-		for _, sq2 := range ctx.MergedSubqueries {
-			if sq.originalSubquery == sq2 {
-				expr = sqlparser.Rewrite(expr, nil, func(cursor *sqlparser.Cursor) bool {
-					switch expr := cursor.Node().(type) {
-					case *sqlparser.ColName:
-						if expr.Name.String() != sq.ArgName { // TODO systay 2023.09.15 - This is not safe enough. We should figure out a better way.
+
+	merged := true
+	for merged {
+		// we need to keep rewriting the expression until we can't find any more subqueries to merge
+		// this is because we might have subqueries inside subqueries, and we need to merge them all
+		merged = false
+		for _, sq := range se {
+			for _, sq2 := range ctx.MergedSubqueries {
+				if sq.originalSubquery == sq2 {
+					expr = sqlparser.Rewrite(expr, nil, func(cursor *sqlparser.Cursor) bool {
+						switch expr := cursor.Node().(type) {
+						case *sqlparser.ColName:
+							if expr.Name.String() != sq.ArgName { // TODO systay 2023.09.15 - This is not safe enough. We should figure out a better way.
+								return true
+							}
+						case *sqlparser.Argument:
+							if expr.Name != sq.ArgName {
+								return true
+							}
+						default:
 							return true
 						}
-					case *sqlparser.Argument:
-						if expr.Name != sq.ArgName {
-							return true
+						rewritten = true
+						if sq.FilterType == opcode.PulloutExists {
+							cursor.Replace(&sqlparser.ExistsExpr{Subquery: sq.originalSubquery})
+						} else {
+							cursor.Replace(sq.originalSubquery)
 						}
-					default:
-						return true
-					}
-					rewritten = true
-					if sq.FilterType == opcode.PulloutExists {
-						cursor.Replace(&sqlparser.ExistsExpr{Subquery: sq.originalSubquery})
-					} else {
-						cursor.Replace(sq.originalSubquery)
-					}
-					return false
-				}).(sqlparser.Expr)
+						merged = true
+						return false
+					}).(sqlparser.Expr)
+				}
 			}
 		}
 	}
diff --git a/go/vt/vtgate/planbuilder/testdata/select_cases.json b/go/vt/vtgate/planbuilder/testdata/select_cases.json
index e18fa274d7e..12534699246 100644
--- a/go/vt/vtgate/planbuilder/testdata/select_cases.json
+++ b/go/vt/vtgate/planbuilder/testdata/select_cases.json
@@ -1314,6 +1314,58 @@
     },
     "skip_e2e": true
   },
+  {
+    "comment": "Subquery inside subquery #1",
+    "query": "select (select (select col from `user` where id = 1) from `user` where id = 1) from `user` where id = 1",
+    "plan": {
+      "QueryType": "SELECT",
+      "Original": "select (select (select col from `user` where id = 1) from `user` where id = 1) from `user` where id = 1",
+      "Instructions": {
+        "OperatorType": "Route",
+        "Variant": "EqualUnique",
+        "Keyspace": {
+          "Name": "user",
+          "Sharded": true
+        },
+        "FieldQuery": "select (select (select col from `user` where 1 != 1) from `user` where 1 != 1) from `user` where 1 != 1",
+        "Query": "select (select (select col from `user` where id = 1) from `user` where id = 1) from `user` where id = 1",
+        "Table": "`user`",
+        "Values": [
+          "1"
+        ],
+        "Vindex": "user_index"
+      },
+      "TablesUsed": [
+        "user.user"
+      ]
+    }
+  },
+  {
+    "comment": "Subquery inside subquery #2",
+    "query": "select 1 from `user` where id = 1 and 1 = (select (select intcol from `user` where id = 1) from `user` where id = 1)",
+    "plan": {
+      "QueryType": "SELECT",
+      "Original": "select 1 from `user` where id = 1 and 1 = (select (select intcol from `user` where id = 1) from `user` where id = 1)",
+      "Instructions": {
+        "OperatorType": "Route",
+        "Variant": "EqualUnique",
+        "Keyspace": {
+          "Name": "user",
+          "Sharded": true
+        },
+        "FieldQuery": "select 1 from `user` where 1 != 1",
+        "Query": "select 1 from `user` where id = 1 and 1 = (select (select intcol from `user` where id = 1) from `user` where id = 1)",
+        "Table": "`user`",
+        "Values": [
+          "1"
+        ],
+        "Vindex": "user_index"
+      },
+      "TablesUsed": [
+        "user.user"
+      ]
+    }
+  },
   {
     "comment": "Multiple parenthesized expressions",
     "query": "select * from user where (id = 4 and name ='abc') limit 5",

From f53fa5b062b38eb7123b86f1dfaf35b30c19ce66 Mon Sep 17 00:00:00 2001
From: Manan Gupta <35839558+GuptaManan100@users.noreply.github.com>
Date: Thu, 13 Feb 2025 14:31:05 +0530
Subject: [PATCH 53/68] Fail assignment expressions with the correct message
 (#17752)

Signed-off-by: Manan Gupta <manan@planetscale.com>
---
 go/vt/sqlparser/normalizer.go                            | 5 ++++-
 go/vt/sqlparser/parse_test.go                            | 6 ++++++
 go/vt/vtgate/planbuilder/testdata/unsupported_cases.json | 5 +++++
 3 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/go/vt/sqlparser/normalizer.go b/go/vt/sqlparser/normalizer.go
index dffb90d52b8..dbded43765a 100644
--- a/go/vt/sqlparser/normalizer.go
+++ b/go/vt/sqlparser/normalizer.go
@@ -157,7 +157,10 @@ func newNormalizer(
 // It handles normalization logic based on node types.
 func (nz *normalizer) walkDown(node, _ SQLNode) bool {
 	switch node := node.(type) {
-	case *Begin, *Commit, *Rollback, *Savepoint, *SRollback, *Release, *OtherAdmin, *Analyze, *AssignmentExpr,
+	case *AssignmentExpr:
+		nz.err = vterrors.VT12001("Assignment expression")
+		return false
+	case *Begin, *Commit, *Rollback, *Savepoint, *SRollback, *Release, *OtherAdmin, *Analyze,
 		*PrepareStmt, *ExecuteStmt, *FramePoint, *ColName, TableName, *ConvertType:
 		// These statement don't need normalizing
 		return false
diff --git a/go/vt/sqlparser/parse_test.go b/go/vt/sqlparser/parse_test.go
index 6c4a6e634ec..5bf4d43bca6 100644
--- a/go/vt/sqlparser/parse_test.go
+++ b/go/vt/sqlparser/parse_test.go
@@ -1327,9 +1327,15 @@ var (
 		input: "update /* a.b */ a.b set b = 3",
 	}, {
 		input: "update a.b set d = @v := d + 7 where u = 42",
+		// Assignment expresions aren't supported, so we skip the normalizer test.
+		// We only support parsing these expressions.
+		ignoreNormalizerTest: true,
 	}, {
 		input:  "select @topic3_id:= 10103;",
 		output: "select @topic3_id := 10103 from dual",
+		// Assignment expresions aren't supported, so we skip the normalizer test.
+		// We only support parsing these expressions.
+		ignoreNormalizerTest: true,
 	}, {
 		input: "update /* list */ a set b = 3, c = 4",
 	}, {
diff --git a/go/vt/vtgate/planbuilder/testdata/unsupported_cases.json b/go/vt/vtgate/planbuilder/testdata/unsupported_cases.json
index 55329586b0e..e54050bce86 100644
--- a/go/vt/vtgate/planbuilder/testdata/unsupported_cases.json
+++ b/go/vt/vtgate/planbuilder/testdata/unsupported_cases.json
@@ -229,6 +229,11 @@
     "query": "select @val := 42",
     "plan": "VT12001: unsupported: Assignment expression"
   },
+  {
+    "comment": "Assignment expression in on duplicate clause",
+    "query": "insert into unsharded (id) values (@val := 42)",
+    "plan": "VT12001: unsupported: Assignment expression"
+  },
   {
     "comment": "Assignment expression in union statements",
     "query": "select @val := 42 union select 1",

From 057bcc92191ccb29fbf45fad3c1cf33acc508f80 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vicent=20Mart=C3=AD?= <42793+vmg@users.noreply.github.com>
Date: Thu, 13 Feb 2025 18:34:30 +0100
Subject: [PATCH 54/68] smartconnpool: Better handling for idle expiration
 (#17757)

Signed-off-by: Vicent Marti <vmg@strn.cat>
---
 go/pools/smartconnpool/connection.go |  5 +-
 go/pools/smartconnpool/pool.go       | 83 ++++++++++++++----------
 go/pools/smartconnpool/pool_test.go  |  8 ++-
 go/pools/smartconnpool/stack.go      | 26 ++------
 go/pools/smartconnpool/timestamp.go  | 94 ++++++++++++++++++++++++++++
 5 files changed, 160 insertions(+), 56 deletions(-)
 create mode 100644 go/pools/smartconnpool/timestamp.go

diff --git a/go/pools/smartconnpool/connection.go b/go/pools/smartconnpool/connection.go
index cdb5720596e..dbc235a8218 100644
--- a/go/pools/smartconnpool/connection.go
+++ b/go/pools/smartconnpool/connection.go
@@ -19,7 +19,6 @@ package smartconnpool
 import (
 	"context"
 	"sync/atomic"
-	"time"
 )
 
 type Connection interface {
@@ -33,8 +32,8 @@ type Connection interface {
 
 type Pooled[C Connection] struct {
 	next        atomic.Pointer[Pooled[C]]
-	timeCreated time.Time
-	timeUsed    time.Time
+	timeCreated timestamp
+	timeUsed    timestamp
 	pool        *ConnPool[C]
 
 	Conn C
diff --git a/go/pools/smartconnpool/pool.go b/go/pools/smartconnpool/pool.go
index 52346adb1a4..87a288bec3d 100644
--- a/go/pools/smartconnpool/pool.go
+++ b/go/pools/smartconnpool/pool.go
@@ -19,7 +19,6 @@ package smartconnpool
 import (
 	"context"
 	"math/rand/v2"
-	"slices"
 	"sync"
 	"sync/atomic"
 	"time"
@@ -408,13 +407,13 @@ func (pool *ConnPool[C]) put(conn *Pooled[C]) {
 			return
 		}
 	} else {
-		conn.timeUsed = time.Now()
+		conn.timeUsed.update()
 
 		lifetime := pool.extendedMaxLifetime()
-		if lifetime > 0 && time.Until(conn.timeCreated.Add(lifetime)) < 0 {
+		if lifetime > 0 && conn.timeCreated.elapsed() > lifetime {
 			pool.Metrics.maxLifetimeClosed.Add(1)
 			conn.Close()
-			if err := pool.connReopen(context.Background(), conn, conn.timeUsed); err != nil {
+			if err := pool.connReopen(context.Background(), conn, conn.timeUsed.get()); err != nil {
 				pool.closedConn()
 				return
 			}
@@ -442,12 +441,30 @@ func (pool *ConnPool[C]) tryReturnConn(conn *Pooled[C]) bool {
 	return false
 }
 
+func (pool *ConnPool[C]) pop(stack *connStack[C]) *Pooled[C] {
+	// retry-loop: pop a connection from the stack and atomically check whether
+	// its timeout has elapsed. If the timeout has elapsed, the borrow will fail,
+	// which means that a background worker has already marked this connection
+	// as stale and is in the process of shutting it down. If we successfully mark
+	// the timeout as borrowed, we know that background workers will not be able
+	// to expire this connection (even if it's still visible to them), so it's
+	// safe to return it
+	for conn, ok := stack.Pop(); ok; conn, ok = stack.Pop() {
+		if conn.timeUsed.borrow() {
+			return conn
+		}
+	}
+	return nil
+}
+
 func (pool *ConnPool[C]) tryReturnAnyConn() bool {
-	if conn, ok := pool.clean.Pop(); ok {
+	if conn := pool.pop(&pool.clean); conn != nil {
+		conn.timeUsed.update()
 		return pool.tryReturnConn(conn)
 	}
 	for u := 0; u <= stackMask; u++ {
-		if conn, ok := pool.settings[u].Pop(); ok {
+		if conn := pool.pop(&pool.settings[u]); conn != nil {
+			conn.timeUsed.update()
 			return pool.tryReturnConn(conn)
 		}
 	}
@@ -479,15 +496,15 @@ func (pool *ConnPool[D]) extendedMaxLifetime() time.Duration {
 	return time.Duration(maxLifetime) + time.Duration(rand.Uint32N(uint32(maxLifetime)))
 }
 
-func (pool *ConnPool[C]) connReopen(ctx context.Context, dbconn *Pooled[C], now time.Time) error {
+func (pool *ConnPool[C]) connReopen(ctx context.Context, dbconn *Pooled[C], now time.Duration) error {
 	var err error
 	dbconn.Conn, err = pool.config.connect(ctx)
 	if err != nil {
 		return err
 	}
 
-	dbconn.timeUsed = now
-	dbconn.timeCreated = now
+	dbconn.timeUsed.set(now)
+	dbconn.timeCreated.set(now)
 	return nil
 }
 
@@ -496,13 +513,14 @@ func (pool *ConnPool[C]) connNew(ctx context.Context) (*Pooled[C], error) {
 	if err != nil {
 		return nil, err
 	}
-	now := time.Now()
-	return &Pooled[C]{
-		timeCreated: now,
-		timeUsed:    now,
-		pool:        pool,
-		Conn:        conn,
-	}, nil
+	pooled := &Pooled[C]{
+		pool: pool,
+		Conn: conn,
+	}
+	now := monotonicNow()
+	pooled.timeUsed.set(now)
+	pooled.timeCreated.set(now)
+	return pooled, nil
 }
 
 func (pool *ConnPool[C]) getFromSettingsStack(setting *Setting) *Pooled[C] {
@@ -515,7 +533,7 @@ func (pool *ConnPool[C]) getFromSettingsStack(setting *Setting) *Pooled[C] {
 
 	for i := uint32(0); i <= stackMask; i++ {
 		pos := (i + start) & stackMask
-		if conn, ok := pool.settings[pos].Pop(); ok {
+		if conn := pool.pop(&pool.settings[pos]); conn != nil {
 			return conn
 		}
 	}
@@ -549,7 +567,7 @@ func (pool *ConnPool[C]) get(ctx context.Context) (*Pooled[C], error) {
 	pool.Metrics.getCount.Add(1)
 
 	// best case: if there's a connection in the clean stack, return it right away
-	if conn, ok := pool.clean.Pop(); ok {
+	if conn := pool.pop(&pool.clean); conn != nil {
 		pool.borrowed.Add(1)
 		return conn, nil
 	}
@@ -585,7 +603,7 @@ func (pool *ConnPool[C]) get(ctx context.Context) (*Pooled[C], error) {
 		err = conn.Conn.ResetSetting(ctx)
 		if err != nil {
 			conn.Close()
-			err = pool.connReopen(ctx, conn, time.Now())
+			err = pool.connReopen(ctx, conn, monotonicNow())
 			if err != nil {
 				pool.closedConn()
 				return nil, err
@@ -603,10 +621,10 @@ func (pool *ConnPool[C]) getWithSetting(ctx context.Context, setting *Setting) (
 
 	var err error
 	// best case: check if there's a connection in the setting stack where our Setting belongs
-	conn, _ := pool.settings[setting.bucket&stackMask].Pop()
+	conn := pool.pop(&pool.settings[setting.bucket&stackMask])
 	// if there's connection with our setting, try popping a clean connection
 	if conn == nil {
-		conn, _ = pool.clean.Pop()
+		conn = pool.pop(&pool.clean)
 	}
 	// otherwise try opening a brand new connection and we'll apply the setting to it
 	if conn == nil {
@@ -645,7 +663,7 @@ func (pool *ConnPool[C]) getWithSetting(ctx context.Context, setting *Setting) (
 			err = conn.Conn.ResetSetting(ctx)
 			if err != nil {
 				conn.Close()
-				err = pool.connReopen(ctx, conn, time.Now())
+				err = pool.connReopen(ctx, conn, monotonicNow())
 				if err != nil {
 					pool.closedConn()
 					return nil, err
@@ -710,7 +728,7 @@ func (pool *ConnPool[C]) setCapacity(ctx context.Context, newcap int64) error {
 		// try closing from connections which are currently idle in the stacks
 		conn := pool.getFromSettingsStack(nil)
 		if conn == nil {
-			conn, _ = pool.clean.Pop()
+			conn = pool.pop(&pool.clean)
 		}
 		if conn == nil {
 			time.Sleep(delay)
@@ -732,21 +750,22 @@ func (pool *ConnPool[C]) closeIdleResources(now time.Time) {
 		return
 	}
 
-	var conns []*Pooled[C]
+	mono := monotonicFromTime(now)
 
 	closeInStack := func(s *connStack[C]) {
-		conns = s.PopAll(conns[:0])
-		slices.Reverse(conns)
-
-		for _, conn := range conns {
-			if conn.timeUsed.Add(timeout).Sub(now) < 0 {
+		// Do a read-only best effort iteration of all the connection in this
+		// stack and atomically attempt to mark them as expired.
+		// Any connections that are marked as expired are _not_ removed from
+		// the stack; it's generally unsafe to remove nodes from the stack
+		// besides the head. When clients pop from the stack, they'll immediately
+		// notice the expired connection and ignore it.
+		// see: timestamp.expired
+		for conn := s.Peek(); conn != nil; conn = conn.next.Load() {
+			if conn.timeUsed.expired(mono, timeout) {
 				pool.Metrics.idleClosed.Add(1)
 				conn.Close()
 				pool.closedConn()
-				continue
 			}
-
-			s.Push(conn)
 		}
 	}
 
diff --git a/go/pools/smartconnpool/pool_test.go b/go/pools/smartconnpool/pool_test.go
index 2ac3d1b00e3..202261e6f3b 100644
--- a/go/pools/smartconnpool/pool_test.go
+++ b/go/pools/smartconnpool/pool_test.go
@@ -619,8 +619,14 @@ func TestIdleTimeout(t *testing.T) {
 			p.put(conn)
 		}
 
+		time.Sleep(1 * time.Second)
+
 		for _, closed := range closers {
-			<-closed
+			select {
+			case <-closed:
+			default:
+				t.Fatalf("Connections remain open after 1 second")
+			}
 		}
 
 		// no need to assert anything: all the connections in the pool should are idle-closed
diff --git a/go/pools/smartconnpool/stack.go b/go/pools/smartconnpool/stack.go
index ea7ae50201e..8d656ee4e8d 100644
--- a/go/pools/smartconnpool/stack.go
+++ b/go/pools/smartconnpool/stack.go
@@ -25,6 +25,9 @@ import (
 // connStack is a lock-free stack for Connection objects. It is safe to
 // use from several goroutines.
 type connStack[C Connection] struct {
+	// top is a pointer to the top node on the stack and to an increasing
+	// counter of pop operations, to prevent A-B-A races.
+	// See: https://en.wikipedia.org/wiki/ABA_problem
 	top atomic2.PointerAndUint64[Pooled[C]]
 }
 
@@ -54,24 +57,7 @@ func (s *connStack[C]) Pop() (*Pooled[C], bool) {
 	}
 }
 
-func (s *connStack[C]) PopAll(out []*Pooled[C]) []*Pooled[C] {
-	var oldHead *Pooled[C]
-
-	for {
-		var popCount uint64
-		oldHead, popCount = s.top.Load()
-		if oldHead == nil {
-			return out
-		}
-		if s.top.CompareAndSwap(oldHead, popCount, nil, popCount+1) {
-			break
-		}
-		runtime.Gosched()
-	}
-
-	for oldHead != nil {
-		out = append(out, oldHead)
-		oldHead = oldHead.next.Load()
-	}
-	return out
+func (s *connStack[C]) Peek() *Pooled[C] {
+	top, _ := s.top.Load()
+	return top
 }
diff --git a/go/pools/smartconnpool/timestamp.go b/go/pools/smartconnpool/timestamp.go
new file mode 100644
index 00000000000..961ff18a5c5
--- /dev/null
+++ b/go/pools/smartconnpool/timestamp.go
@@ -0,0 +1,94 @@
+package smartconnpool
+
+import (
+	"math"
+	"sync/atomic"
+	"time"
+)
+
+var monotonicRoot = time.Now()
+
+// timestamp is a monotonic point in time, stored as a number of
+// nanoseconds since the monotonic root. This type is only 8 bytes
+// and hence can always be accessed atomically
+type timestamp struct {
+	nano atomic.Int64
+}
+
+// timestampExpired is a special value that means this timestamp is now past
+// an arbitrary expiration point, and hence doesn't need to store
+const timestampExpired = math.MaxInt64
+
+// timestampBusy is a special value that means this timestamp no longer
+// tracks an expiration point
+const timestampBusy = math.MinInt64
+
+// monotonicNow returns the current monotonic time as a time.Duration.
+// This is a very efficient operation because time.Since performs direct
+// substraction of monotonic times without considering the wall clock times.
+func monotonicNow() time.Duration {
+	return time.Since(monotonicRoot)
+}
+
+// monotonicFromTime converts a wall-clock time from time.Now into a
+// monotonic timestamp.
+// This is a very efficient operation because time.(*Time).Sub performs direct
+// substraction of monotonic times without considering the wall clock times.
+func monotonicFromTime(now time.Time) time.Duration {
+	return now.Sub(monotonicRoot)
+}
+
+// set sets this timestamp to the given monotonic value
+func (t *timestamp) set(mono time.Duration) {
+	t.nano.Store(int64(mono))
+}
+
+// get returns the monotonic time of this timestamp as the number of nanoseconds
+// since the monotonic root.
+func (t *timestamp) get() time.Duration {
+	return time.Duration(t.nano.Load())
+}
+
+// elapsed returns the number of nanoseconds that have passed since
+// this timestamp was updated
+func (t *timestamp) elapsed() time.Duration {
+	return monotonicNow() - t.get()
+}
+
+// update sets this timestamp's value to the current monotonic time
+func (t *timestamp) update() {
+	t.nano.Store(int64(monotonicNow()))
+}
+
+// borrow attempts to borrow this timestamp atomically.
+// It only succeeds if we can ensure that nobody else has marked
+// this timestamp as expired. When succeeded, the timestamp
+// is cleared as "busy" as it no longer tracks an expiration point.
+func (t *timestamp) borrow() bool {
+	stamp := t.nano.Load()
+	switch stamp {
+	case timestampExpired:
+		return false
+	case timestampBusy:
+		panic("timestampBusy when borrowing a time")
+	default:
+		return t.nano.CompareAndSwap(stamp, timestampBusy)
+	}
+}
+
+// expired attempts to atomically expire this timestamp.
+// It only succeeds if we can ensure the timestamp hasn't been
+// concurrently expired or borrowed.
+func (t *timestamp) expired(now time.Duration, timeout time.Duration) bool {
+	stamp := t.nano.Load()
+	if stamp == timestampExpired {
+		return false
+	}
+	if stamp == timestampBusy {
+		return false
+	}
+	if now-time.Duration(stamp) > timeout {
+		return t.nano.CompareAndSwap(stamp, timestampExpired)
+	}
+	return false
+}

From 000fbbe0f848da5bd2d0a9781665fe6e9dc3cd72 Mon Sep 17 00:00:00 2001
From: Lucas <lmorduch@gmail.com>
Date: Thu, 13 Feb 2025 11:08:36 -0800
Subject: [PATCH 55/68] [Feature]: Sort results of getTablets for consistency
 in output/readability (#17771)

Signed-off-by: Lucas Morduchowicz <lmorduch@gmail.com>
Co-authored-by: Lucas Morduchowicz <lmorduchowicz@hubspot.com>
---
 go/vt/vtctl/grpcvtctldserver/server.go              |  8 ++++++++
 go/vt/vtctl/grpcvtctldserver/server_test.go         |  6 +++---
 .../grpcvtctldserver/testutil/proto_compare.go      | 13 -------------
 3 files changed, 11 insertions(+), 16 deletions(-)

diff --git a/go/vt/vtctl/grpcvtctldserver/server.go b/go/vt/vtctl/grpcvtctldserver/server.go
index 2afb508e4a6..09896ffab9d 100644
--- a/go/vt/vtctl/grpcvtctldserver/server.go
+++ b/go/vt/vtctl/grpcvtctldserver/server.go
@@ -2326,6 +2326,10 @@ func (s *VtctldServer) GetTablets(ctx context.Context, req *vtctldatapb.GetTable
 			tablets = append(tablets, ti.Tablet)
 		}
 
+		// Sort the list of tablets alphabetically by alias to improve readability of output.
+		sort.Slice(tablets, func(i, j int) bool {
+			return topoproto.TabletAliasString(tablets[i].Alias) < topoproto.TabletAliasString(tablets[j].Alias)
+		})
 		return &vtctldatapb.GetTabletsResponse{Tablets: tablets}, nil
 	}
 
@@ -2414,6 +2418,10 @@ func (s *VtctldServer) GetTablets(ctx context.Context, req *vtctldatapb.GetTable
 
 		adjustedTablets[i] = ti.Tablet
 	}
+	// Sort the list of tablets alphabetically by alias to improve readability of output.
+	sort.Slice(adjustedTablets, func(i, j int) bool {
+		return topoproto.TabletAliasString(adjustedTablets[i].Alias) < topoproto.TabletAliasString(adjustedTablets[j].Alias)
+	})
 
 	return &vtctldatapb.GetTabletsResponse{
 		Tablets: adjustedTablets,
diff --git a/go/vt/vtctl/grpcvtctldserver/server_test.go b/go/vt/vtctl/grpcvtctldserver/server_test.go
index 252efc7d894..ac90cc0b8e5 100644
--- a/go/vt/vtctl/grpcvtctldserver/server_test.go
+++ b/go/vt/vtctl/grpcvtctldserver/server_test.go
@@ -4605,7 +4605,7 @@ func TestDeleteTablets(t *testing.T) {
 
 				resp, err := vtctld.GetTablets(ctx, &vtctldatapb.GetTabletsRequest{})
 				assert.NoError(t, err, "cannot look up tablets from topo after issuing DeleteTablets request")
-				testutil.AssertSameTablets(t, tt.expectedRemainingTablets, resp.Tablets)
+				utils.MustMatch(t, tt.expectedRemainingTablets, resp.Tablets)
 			}
 
 			// Run the test
@@ -8277,7 +8277,7 @@ func TestGetTablets(t *testing.T) {
 			}
 
 			assert.NoError(t, err)
-			testutil.AssertSameTablets(t, tt.expected, resp.Tablets)
+			utils.MustMatch(t, tt.expected, resp.Tablets)
 		})
 	}
 }
@@ -13338,7 +13338,7 @@ func TestTabletExternallyReparented(t *testing.T) {
 
 					resp, err := vtctld.GetTablets(ctx, &vtctldatapb.GetTabletsRequest{})
 					require.NoError(t, err, "cannot get all tablets in the topo")
-					testutil.AssertSameTablets(t, tt.expectedTopo, resp.Tablets)
+					utils.MustMatch(t, tt.expectedTopo, resp.Tablets)
 				}()
 			}
 
diff --git a/go/vt/vtctl/grpcvtctldserver/testutil/proto_compare.go b/go/vt/vtctl/grpcvtctldserver/testutil/proto_compare.go
index 20ad0f692b0..eaf0786b12d 100644
--- a/go/vt/vtctl/grpcvtctldserver/testutil/proto_compare.go
+++ b/go/vt/vtctl/grpcvtctldserver/testutil/proto_compare.go
@@ -18,15 +18,12 @@ package testutil
 
 import (
 	"encoding/json"
-	"fmt"
-	"sort"
 	"testing"
 
 	"github.com/stretchr/testify/assert"
 
 	"vitess.io/vitess/go/test/utils"
 	logutilpb "vitess.io/vitess/go/vt/proto/logutil"
-	topodatapb "vitess.io/vitess/go/vt/proto/topodata"
 	vtctldatapb "vitess.io/vitess/go/vt/proto/vtctldata"
 )
 
@@ -108,16 +105,6 @@ func AssertPlannedReparentShardResponsesEqual(t *testing.T, expected *vtctldatap
 	utils.MustMatch(t, expected, actual)
 }
 
-func AssertSameTablets(t *testing.T, expected, actual []*topodatapb.Tablet) {
-	sort.Slice(expected, func(i, j int) bool {
-		return fmt.Sprintf("%v", expected[i]) < fmt.Sprintf("%v", expected[j])
-	})
-	sort.Slice(actual, func(i, j int) bool {
-		return fmt.Sprintf("%v", actual[i]) < fmt.Sprintf("%v", actual[j])
-	})
-	utils.MustMatch(t, expected, actual)
-}
-
 // AssertKeyspacesEqual is a convenience function to assert that two
 // vtctldatapb.Keyspace objects are equal, after clearing out any reserved
 // proto XXX_ fields.

From 624a7ea37c8fb53c34bfd1e324de9611d1ad8ade Mon Sep 17 00:00:00 2001
From: Deepthi Sigireddi <deepthi@planetscale.com>
Date: Thu, 13 Feb 2025 15:40:23 -0800
Subject: [PATCH 56/68] Get some CLOMonitor checks passing (#17773)

Signed-off-by: deepthi <deepthi@planetscale.com>
---
 .clomonitor.yml |  8 ++++++++
 README.md       | 29 ++++++++++++++++++-----------
 2 files changed, 26 insertions(+), 11 deletions(-)
 create mode 100644 .clomonitor.yml

diff --git a/.clomonitor.yml b/.clomonitor.yml
new file mode 100644
index 00000000000..92a86f5fc9d
--- /dev/null
+++ b/.clomonitor.yml
@@ -0,0 +1,8 @@
+# CLOMonitor metadata file
+# This file must be located at the root of the repository
+
+# Checks exemptions
+exemptions:
+  - check: slack_presence # Check identifier (see https://github.com/cncf/clomonitor/blob/main/docs/checks.md#exemptions)
+    reason: "This project has a separate Slack workspace that predates its donation to CNCF. A link to it is present in the README." # Justification of this exemption (mandatory, it will be displayed on the UI)
+
diff --git a/README.md b/README.md
index b1247a29469..e8cc7a0c118 100644
--- a/README.md
+++ b/README.md
@@ -7,29 +7,36 @@
 
 # Vitess 
 
-Vitess is a database clustering system for horizontal scaling of MySQL
-through generalized sharding.
+Vitess is a cloud-native horizontally-scalable distributed database system that is built around MySQL.
+Vitess can achieve unlimited scaling through generalized sharding.
 
-By encapsulating shard-routing logic, Vitess allows application code and
-database queries to remain agnostic to the distribution of data onto
-multiple shards. With Vitess, you can even split and merge shards as your needs
+Vitess allows application code and database queries to remain agnostic to the distribution of data onto
+multiple database servers. With Vitess, you can even split and merge shards as your needs
 grow, with an atomic cutover step that takes only a few seconds.
 
-Vitess has been a core component of YouTube's database infrastructure
-since 2011, and has grown to encompass tens of thousands of MySQL nodes.
+Vitess was a core component of YouTube's database infrastructure
+from 2011, and grew to encompass tens of thousands of MySQL nodes. 
+Starting in 2015, Vitess was adopted by many other large companies, including Slack, Square (now Block), and JD.com.
 
 For more about Vitess, please visit [vitess.io](https://vitess.io).
 
-Vitess has a growing community. [View the list of adopters](https://github.com/vitessio/vitess/blob/main/ADOPTERS.md).
+## Community
+
+Vitess has a growing [community](https://github.com/vitessio/vitess/blob/main/ADOPTERS.md).
+
+If you are interested in contributing or participating in our monthly community meetings, please visit the [Community page on our website](https://vitess.io/community/).
+
+We also maintain a [roadmap](https://vitess.io/docs/roadmap/) on our website.
+
+Follow our [blog](https://blog.vitess.io/) for low-frequency updates like new features and releases.
 
 ## Reporting a Problem, Issue, or Bug
-To report a problem, create a [GitHub issue](https://github.com/vitessio/vitess/issues). 
+
+To report a problem, create a [GitHub issue](https://github.com/vitessio/vitess/issues).
 
 For topics that are better discussed live, please join the [Vitess Slack](https://vitess.io/slack) workspace.
 You may post any questions on the #general channel or join some of the special-interest channels.
 
-Follow [Vitess Blog](https://blog.vitess.io/) for low-frequency updates like new features and releases.
-
 ## Security
 
 ### Reporting Security Vulnerabilities

From efa30d4f1a7a56ba81dc5be6fcd684e52703108a Mon Sep 17 00:00:00 2001
From: Tim Vaillancourt <tim@timvaillancourt.com>
Date: Fri, 14 Feb 2025 01:28:53 +0100
Subject: [PATCH 57/68] Simply changing GH Actions runner (#17788)

Signed-off-by: Tim Vaillancourt <tim@timvaillancourt.com>
---
 test/ci_workflow_gen.go                          | 16 +++++++++++-----
 test/templates/cluster_endtoend_test.tpl         |  2 +-
 test/templates/cluster_endtoend_test_docker.tpl  |  2 +-
 test/templates/cluster_endtoend_test_mysql57.tpl |  2 +-
 test/templates/cluster_vitess_tester.tpl         |  2 +-
 test/templates/unit_test.tpl                     |  2 +-
 6 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/test/ci_workflow_gen.go b/test/ci_workflow_gen.go
index bf42825d73c..a8f1a82e56f 100644
--- a/test/ci_workflow_gen.go
+++ b/test/ci_workflow_gen.go
@@ -33,6 +33,8 @@ const (
 	mysql80 mysqlVersion = "mysql80"
 	mysql84 mysqlVersion = "mysql84"
 
+	cores16RunnerName   = "gh-hosted-runners-16cores-1-24.04"
+	defaultRunnerName   = "ubuntu-24.04"
 	defaultMySQLVersion = mysql80
 )
 
@@ -164,13 +166,14 @@ var (
 )
 
 type unitTest struct {
-	Name, Platform, FileName, Evalengine string
+	Name, RunsOn, Platform, FileName, Evalengine string
 }
 
 type clusterTest struct {
 	Name, Shard, Platform              string
 	FileName                           string
 	BuildTag                           string
+	RunsOn                             string
 	MemoryCheck                        bool
 	MakeTools, InstallXtraBackup       bool
 	Docker                             bool
@@ -178,13 +181,13 @@ type clusterTest struct {
 	EnableBinlogTransactionCompression bool
 	EnablePartialJSON                  bool
 	PartialKeyspace                    bool
-	Cores16                            bool
 	NeedsMinio                         bool
 }
 
 type vitessTesterTest struct {
 	FileName string
 	Name     string
+	RunsOn   string
 	Path     string
 }
 
@@ -241,8 +244,9 @@ func canonnizeList(list []string) []string {
 func generateVitessTesterWorkflows(mp map[string]string, tpl string) {
 	for test, testPath := range mp {
 		tt := &vitessTesterTest{
-			Name: fmt.Sprintf("Vitess Tester (%v)", test),
-			Path: testPath,
+			Name:   fmt.Sprintf("Vitess Tester (%v)", test),
+			RunsOn: defaultRunnerName,
+			Path:   testPath,
 		}
 
 		templateFileName := tpl
@@ -263,11 +267,12 @@ func generateClusterWorkflows(list []string, tpl string) {
 				Name:     fmt.Sprintf("Cluster (%s)", cluster),
 				Shard:    cluster,
 				BuildTag: buildTag[cluster],
+				RunsOn:   defaultRunnerName,
 			}
 			cores16Clusters := canonnizeList(clusterRequiring16CoresMachines)
 			for _, cores16Cluster := range cores16Clusters {
 				if cores16Cluster == cluster {
-					test.Cores16 = true
+					test.RunsOn = cores16RunnerName
 					break
 				}
 			}
@@ -339,6 +344,7 @@ func generateUnitTestWorkflows() {
 		for _, evalengine := range []string{"1", "0"} {
 			test := &unitTest{
 				Name:       fmt.Sprintf("Unit Test (%s%s)", evalengineToString(evalengine), platform),
+				RunsOn:     defaultRunnerName,
 				Platform:   string(platform),
 				Evalengine: evalengine,
 			}
diff --git a/test/templates/cluster_endtoend_test.tpl b/test/templates/cluster_endtoend_test.tpl
index c5129805126..632bda5e407 100644
--- a/test/templates/cluster_endtoend_test.tpl
+++ b/test/templates/cluster_endtoend_test.tpl
@@ -15,7 +15,7 @@ jobs:
   build:
     timeout-minutes: 60
     name: Run endtoend tests on {{.Name}}
-    runs-on: {{if .Cores16}}gh-hosted-runners-16cores-1-24.04{{else}}ubuntu-24.04{{end}}
+    runs-on: {{.RunsOn}}
 
     steps:
     - name: Skip CI
diff --git a/test/templates/cluster_endtoend_test_docker.tpl b/test/templates/cluster_endtoend_test_docker.tpl
index 39a36b88c89..619413391c5 100644
--- a/test/templates/cluster_endtoend_test_docker.tpl
+++ b/test/templates/cluster_endtoend_test_docker.tpl
@@ -6,7 +6,7 @@ permissions: read-all
 jobs:
   build:
     name: Run endtoend tests on {{.Name}}
-    runs-on: {{if .Cores16}}gh-hosted-runners-16cores-1-24.04{{else}}ubuntu-24.04{{end}}
+    runs-on: {{.RunsOn}}
 
     steps:
     - name: Skip CI
diff --git a/test/templates/cluster_endtoend_test_mysql57.tpl b/test/templates/cluster_endtoend_test_mysql57.tpl
index a6cbc969c1a..39932816c9b 100644
--- a/test/templates/cluster_endtoend_test_mysql57.tpl
+++ b/test/templates/cluster_endtoend_test_mysql57.tpl
@@ -19,7 +19,7 @@ env:
 jobs:
   build:
     name: Run endtoend tests on {{.Name}}
-    runs-on: {{if .Cores16}}gh-hosted-runners-16cores-1-24.04{{else}}ubuntu-24.04{{end}}
+    runs-on: {{.RunsOn}}
 
     steps:
     - name: Skip CI
diff --git a/test/templates/cluster_vitess_tester.tpl b/test/templates/cluster_vitess_tester.tpl
index 508824dde87..db8eb7d75ff 100644
--- a/test/templates/cluster_vitess_tester.tpl
+++ b/test/templates/cluster_vitess_tester.tpl
@@ -14,7 +14,7 @@ env:
 jobs:
   build:
     name: Run endtoend tests on {{.Name}}
-    runs-on: ubuntu-24.04
+    runs-on: {{.RunsOn}}
 
     steps:
     - name: Skip CI
diff --git a/test/templates/unit_test.tpl b/test/templates/unit_test.tpl
index be71af987ed..3f6ab44bacd 100644
--- a/test/templates/unit_test.tpl
+++ b/test/templates/unit_test.tpl
@@ -14,7 +14,7 @@ env:
 jobs:
   test:
     name: {{.Name}}
-    runs-on: ubuntu-24.04
+    runs-on: {{.RunsOn}}
 
     steps:
     - name: Skip CI

From 420342fddb0ea91df012f7be4d1ae0b59e71448a Mon Sep 17 00:00:00 2001
From: Rohit Nayak <57520317+rohit-nayak-ps@users.noreply.github.com>
Date: Fri, 14 Feb 2025 16:31:20 +0100
Subject: [PATCH 58/68] VReplication Atomic Copy Workflows: fix bugs around
 concurrent inserts (#17772)

Signed-off-by: Rohit Nayak <rohit@planetscale.com>
---
 go/test/endtoend/vreplication/fk_ext_test.go    |  5 ++++-
 go/test/endtoend/vreplication/fk_test.go        | 14 +++++++++-----
 .../vreplication/vcopier_atomic.go              | 17 ++++++++---------
 3 files changed, 21 insertions(+), 15 deletions(-)

diff --git a/go/test/endtoend/vreplication/fk_ext_test.go b/go/test/endtoend/vreplication/fk_ext_test.go
index d6716bcbf2d..74aac2cbed2 100644
--- a/go/test/endtoend/vreplication/fk_ext_test.go
+++ b/go/test/endtoend/vreplication/fk_ext_test.go
@@ -86,7 +86,10 @@ func TestFKExt(t *testing.T) {
 	setSidecarDBName("_vt")
 
 	// Ensure that there are multiple copy phase cycles per table.
-	extraVTTabletArgs = append(extraVTTabletArgs, "--vstream_packet_size=256", "--queryserver-config-schema-change-signal")
+	extraVTTabletArgs = append(extraVTTabletArgs,
+		"--vstream_packet_size=256",
+		"--queryserver-config-schema-change-signal",
+		parallelInsertWorkers)
 	extraVTGateArgs = append(extraVTGateArgs, "--schema_change_signal=true", "--planner-version", "Gen4")
 	defer func() { extraVTTabletArgs = nil }()
 	initFKExtConfig(t)
diff --git a/go/test/endtoend/vreplication/fk_test.go b/go/test/endtoend/vreplication/fk_test.go
index 15664be51d9..a349a94ffa1 100644
--- a/go/test/endtoend/vreplication/fk_test.go
+++ b/go/test/endtoend/vreplication/fk_test.go
@@ -39,6 +39,7 @@ const testWorkflowFlavor = workflowFlavorVtctld
 // It inserts initial data, then simulates load. We insert both child rows with foreign keys and those without,
 // i.e. with foreign_key_checks=0.
 func TestFKWorkflow(t *testing.T) {
+	setSidecarDBName("_vt")
 	extraVTTabletArgs = []string{
 		// Ensure that there are multiple copy phase cycles per table.
 		"--vstream_packet_size=256",
@@ -128,11 +129,14 @@ func TestFKWorkflow(t *testing.T) {
 	vtgateConn, closeConn := getVTGateConn()
 	defer closeConn()
 
-	t11Count := getRowCount(t, vtgateConn, "t11")
-	t12Count := getRowCount(t, vtgateConn, "t12")
-	require.Greater(t, t11Count, 1)
-	require.Greater(t, t12Count, 1)
-	require.Equal(t, t11Count, t12Count)
+	if withLoad {
+		t11Count := getRowCount(t, vtgateConn, "t11")
+		t12Count := getRowCount(t, vtgateConn, "t12")
+		require.Greater(t, t11Count, 1)
+		require.Greater(t, t12Count, 1)
+		require.Equal(t, t11Count, t12Count)
+	}
+
 }
 
 func insertInitialFKData(t *testing.T) {
diff --git a/go/vt/vttablet/tabletmanager/vreplication/vcopier_atomic.go b/go/vt/vttablet/tabletmanager/vreplication/vcopier_atomic.go
index 1e3892c0f05..aae17027bc4 100644
--- a/go/vt/vttablet/tabletmanager/vreplication/vcopier_atomic.go
+++ b/go/vt/vttablet/tabletmanager/vreplication/vcopier_atomic.go
@@ -84,11 +84,7 @@ func (vc *vcopier) copyAll(ctx context.Context, settings binlogplayer.VRSettings
 	defer rowsCopiedTicker.Stop()
 
 	parallelism := int(math.Max(1, float64(vc.vr.workflowConfig.ParallelInsertWorkers)))
-	// For now do not support concurrent inserts for atomic copies.
-	if parallelism > 1 {
-		parallelism = 1
-		log.Infof("Disabling concurrent inserts for atomic copies")
-	}
+
 	copyWorkerFactory := vc.newCopyWorkerFactory(parallelism)
 	var copyWorkQueue *vcopierCopyWorkQueue
 
@@ -115,7 +111,6 @@ func (vc *vcopier) copyAll(ctx context.Context, settings binlogplayer.VRSettings
 			resp.TableName, len(resp.Fields), len(resp.Rows), resp.Gtid, resp.Lastpk)
 		tableName := resp.TableName
 		gtid = resp.Gtid
-
 		updateRowsCopied := func() error {
 			updateRowsQuery := binlogplayer.GenerateUpdateRowsCopied(vc.vr.id, vc.vr.stats.CopyRowCount.Get())
 			_, err := vc.vr.dbClient.Execute(updateRowsQuery)
@@ -205,6 +200,10 @@ func (vc *vcopier) copyAll(ctx context.Context, settings binlogplayer.VRSettings
 		log.Infof("copying table %s with lastpk %v", tableName, lastpkbv)
 		// Prepare a vcopierCopyTask for the current batch of work.
 		currCh := make(chan *vcopierCopyTaskResult, 1)
+
+		if parallelism > 1 {
+			resp = resp.CloneVT()
+		}
 		currT := newVCopierCopyTask(newVCopierCopyTaskArgs(resp.Rows, resp.Lastpk))
 
 		// Send result to the global resultCh and currCh. resultCh is used by
@@ -292,12 +291,12 @@ func (vc *vcopier) copyAll(ctx context.Context, settings binlogplayer.VRSettings
 		log.Infof("Copy of %v stopped", state.currentTableName)
 		return fmt.Errorf("CopyAll was interrupted due to context expiration")
 	default:
-		if err := vc.deleteCopyState(state.currentTableName); err != nil {
-			return err
-		}
 		if copyWorkQueue != nil {
 			copyWorkQueue.close()
 		}
+		if err := vc.deleteCopyState(state.currentTableName); err != nil {
+			return err
+		}
 		if err := vc.updatePos(ctx, gtid); err != nil {
 			return err
 		}

From 70114ad687660d8fe4d6cb50bf4bf890ee0c66f5 Mon Sep 17 00:00:00 2001
From: Rohit Nayak <57520317+rohit-nayak-ps@users.noreply.github.com>
Date: Fri, 14 Feb 2025 16:53:10 +0100
Subject: [PATCH 59/68] Multi-tenant workflow SwitchWrites: Don't add denied
 tables on cancelMigration() (#17782)

Signed-off-by: Rohit Nayak <rohit@planetscale.com>
---
 go/vt/topotools/mirror_rules.go               |  2 +-
 go/vt/vtctl/workflow/server.go                |  1 -
 go/vt/vtctl/workflow/traffic_switcher.go      | 25 +++++++++++++------
 .../tabletmanager/vreplication/controller.go  |  3 ++-
 .../tabletmanager/vreplication/vplayer.go     |  5 ++--
 5 files changed, 24 insertions(+), 12 deletions(-)

diff --git a/go/vt/topotools/mirror_rules.go b/go/vt/topotools/mirror_rules.go
index 3076a12b394..067b0544dab 100644
--- a/go/vt/topotools/mirror_rules.go
+++ b/go/vt/topotools/mirror_rules.go
@@ -55,7 +55,7 @@ func GetMirrorRules(ctx context.Context, ts *topo.Server) (map[string]map[string
 // SaveMirrorRules converts a mapping of fromTable=>[]toTables into a
 // vschemapb.MirrorRules protobuf message and saves it in the topology.
 func SaveMirrorRules(ctx context.Context, ts *topo.Server, rules map[string]map[string]float32) error {
-	log.Infof("Saving mirror rules %v\n", rules)
+	log.V(2).Infof("Saving mirror rules %v\n", rules)
 
 	rrs := &vschemapb.MirrorRules{Rules: make([]*vschemapb.MirrorRule, 0)}
 	for fromTable, mrs := range rules {
diff --git a/go/vt/vtctl/workflow/server.go b/go/vt/vtctl/workflow/server.go
index 4a1fb2e461a..efa7d6448b0 100644
--- a/go/vt/vtctl/workflow/server.go
+++ b/go/vt/vtctl/workflow/server.go
@@ -2977,7 +2977,6 @@ func (s *Server) switchWrites(ctx context.Context, req *vtctldatapb.WorkflowSwit
 				time.Sleep(lockTablesCycleDelay)
 			}
 		}
-
 		// Get the source positions now that writes are stopped, the streams were stopped (e.g.
 		// intra-keyspace materializations that write on the source), and we know for certain
 		// that any in progress writes are done.
diff --git a/go/vt/vtctl/workflow/traffic_switcher.go b/go/vt/vtctl/workflow/traffic_switcher.go
index 4463e30b711..7e1df4a07ce 100644
--- a/go/vt/vtctl/workflow/traffic_switcher.go
+++ b/go/vt/vtctl/workflow/traffic_switcher.go
@@ -1154,9 +1154,9 @@ func (ts *trafficSwitcher) cancelMigration(ctx context.Context, sm *StreamMigrat
 	if ctx.Err() != nil {
 		// Even though we create a new context later on we still record any context error:
 		// for forensics in case of failures.
-		ts.Logger().Infof("In Cancel migration: original context invalid: %s", ctx.Err())
+		ts.Logger().Infof("cancelMigration (%v): original context invalid: %s", ts.WorkflowName(), ctx.Err())
 	}
-
+	ts.Logger().Infof("cancelMigration (%v): starting", ts.WorkflowName())
 	// We create a new context while canceling the migration, so that we are independent of the original
 	// context being canceled prior to or during the cancel operation itself.
 	// First we create a copy of the parent context, so that we maintain the locks, but which cannot be
@@ -1168,20 +1168,27 @@ func (ts *trafficSwitcher) cancelMigration(ctx context.Context, sm *StreamMigrat
 	defer cmCancel()
 
 	if ts.MigrationType() == binlogdatapb.MigrationType_TABLES {
-		err = ts.switchDeniedTables(cmCtx, true /* revert */)
+		if !ts.IsMultiTenantMigration() {
+			ts.Logger().Infof("cancelMigration (%v): adding denied tables to target", ts.WorkflowName())
+			err = ts.switchDeniedTables(cmCtx, true /* revert */)
+		} else {
+			ts.Logger().Infof("cancelMigration (%v): multi-tenant, not adding denied tables to target", ts.WorkflowName())
+		}
 	} else {
+		ts.Logger().Infof("cancelMigration (%v): allowing writes on source shards", ts.WorkflowName())
 		err = ts.changeShardsAccess(cmCtx, ts.SourceKeyspaceName(), ts.SourceShards(), allowWrites)
 	}
 	if err != nil {
 		cancelErrs.RecordError(fmt.Errorf("could not revert denied tables / shard access: %v", err))
-		ts.Logger().Errorf("Cancel migration failed: could not revert denied tables / shard access: %v", err)
+		ts.Logger().Errorf("Cancel migration failed (%v): could not revert denied tables / shard access: %v", ts.WorkflowName(), err)
 	}
 
 	if err := sm.CancelStreamMigrations(cmCtx); err != nil {
 		cancelErrs.RecordError(fmt.Errorf("could not cancel stream migrations: %v", err))
-		ts.Logger().Errorf("Cancel migration failed: could not cancel stream migrations: %v", err)
+		ts.Logger().Errorf("Cancel migration failed (%v): could not cancel stream migrations: %v", ts.WorkflowName(), err)
 	}
 
+	ts.Logger().Infof("cancelMigration (%v): restarting vreplication workflows", ts.WorkflowName())
 	err = ts.ForAllTargets(func(target *MigrationTarget) error {
 		query := fmt.Sprintf("update _vt.vreplication set state='Running', message='' where db_name=%s and workflow=%s",
 			encodeString(target.GetPrimary().DbName()), encodeString(ts.WorkflowName()))
@@ -1190,17 +1197,21 @@ func (ts *trafficSwitcher) cancelMigration(ctx context.Context, sm *StreamMigrat
 	})
 	if err != nil {
 		cancelErrs.RecordError(fmt.Errorf("could not restart vreplication: %v", err))
-		ts.Logger().Errorf("Cancel migration failed: could not restart vreplication: %v", err)
+		ts.Logger().Errorf("Cancel migration failed (%v): could not restart vreplication: %v", ts.WorkflowName(), err)
 	}
 
+	ts.Logger().Infof("cancelMigration (%v): deleting reverse vreplication workflows", ts.WorkflowName())
 	if err := ts.deleteReverseVReplication(cmCtx); err != nil {
 		cancelErrs.RecordError(fmt.Errorf("could not delete reverse vreplication streams: %v", err))
-		ts.Logger().Errorf("Cancel migration failed: could not delete reverse vreplication streams: %v", err)
+		ts.Logger().Errorf("Cancel migration failed (%v): could not delete reverse vreplication streams: %v", ts.WorkflowName(), err)
 	}
 
 	if cancelErrs.HasErrors() {
+		ts.Logger().Errorf("Cancel migration failed for %v, manual cleanup work may be necessary: %v", ts.WorkflowName(), cancelErrs.AggrError(vterrors.Aggregate))
 		return vterrors.Wrap(cancelErrs.AggrError(vterrors.Aggregate), "cancel migration failed, manual cleanup work may be necessary")
 	}
+
+	ts.Logger().Infof("cancelMigration (%v): completed", ts.WorkflowName())
 	return nil
 }
 
diff --git a/go/vt/vttablet/tabletmanager/vreplication/controller.go b/go/vt/vttablet/tabletmanager/vreplication/controller.go
index 7067211ff10..113cb2314a0 100644
--- a/go/vt/vttablet/tabletmanager/vreplication/controller.go
+++ b/go/vt/vttablet/tabletmanager/vreplication/controller.go
@@ -115,7 +115,6 @@ func newController(ctx context.Context, params map[string]string, dbClientFactor
 	}
 	blpStats.WorkflowConfig = workflowConfig.String()
 	ct.sourceTablet.Store(&topodatapb.TabletAlias{})
-	log.Infof("creating controller with cell: %v, tabletTypes: %v, and params: %v", cell, tabletTypesStr, params)
 
 	id, err := strconv.ParseInt(params["id"], 10, 32)
 	if err != nil {
@@ -123,6 +122,8 @@ func newController(ctx context.Context, params map[string]string, dbClientFactor
 	}
 	ct.id = int32(id)
 	ct.workflow = params["workflow"]
+	log.Infof("creating controller with id: %v, name: %v, cell: %v, tabletTypes: %v", ct.id, ct.workflow, cell, tabletTypesStr)
+
 	ct.lastWorkflowError = vterrors.NewLastError(fmt.Sprintf("VReplication controller %d for workflow %q", ct.id, ct.workflow), workflowConfig.MaxTimeToRetryError)
 
 	state := params["state"]
diff --git a/go/vt/vttablet/tabletmanager/vreplication/vplayer.go b/go/vt/vttablet/tabletmanager/vreplication/vplayer.go
index 31ab895934c..ae7a19db4dd 100644
--- a/go/vt/vttablet/tabletmanager/vreplication/vplayer.go
+++ b/go/vt/vttablet/tabletmanager/vreplication/vplayer.go
@@ -125,7 +125,8 @@ func newVPlayer(vr *vreplicator, settings binlogplayer.VRSettings, copyState map
 		settings.StopPos = pausePos
 		saveStop = false
 	}
-	log.Infof("Starting VReplication player id: %v, startPos: %v, stop: %v, filter: %+v",
+	log.Infof("Starting VReplication player id: %v, name: %v, startPos: %v, stop: %v", vr.id, vr.WorkflowName, settings.StartPos, settings.StopPos)
+	log.V(2).Infof("Starting VReplication player id: %v, startPos: %v, stop: %v, filter: %+v",
 		vr.id, settings.StartPos, settings.StopPos, vr.source.Filter)
 	queryFunc := func(ctx context.Context, sql string) (*sqltypes.Result, error) {
 		return vr.dbClient.ExecuteWithRetry(ctx, sql)
@@ -266,7 +267,7 @@ func (vp *vplayer) updateFKCheck(ctx context.Context, flags2 uint32) error {
 // one. This allows for the apply thread to catch up more quickly if
 // a backlog builds up.
 func (vp *vplayer) fetchAndApply(ctx context.Context) (err error) {
-	log.Infof("Starting VReplication player id: %v, startPos: %v, stop: %v, filter: %v", vp.vr.id, vp.startPos, vp.stopPos, vp.vr.source)
+	log.Infof("Starting VReplication player id: %v, name: %v, startPos: %v, stop: %v", vp.vr.id, vp.vr.WorkflowName, vp.startPos, vp.stopPos)
 
 	ctx, cancel := context.WithCancel(ctx)
 	defer cancel()

From 1c064271cc056f1a604d5d8ef326f27e12431b3c Mon Sep 17 00:00:00 2001
From: Tim Vaillancourt <tim@timvaillancourt.com>
Date: Fri, 14 Feb 2025 23:21:17 +0100
Subject: [PATCH 60/68] `vtorc`: improve handling of partial cell topo results
 (#17718)

Signed-off-by: Tim Vaillancourt <tim@timvaillancourt.com>
---
 go/vt/topo/faketopo/faketopo.go            | 70 +++++++++++++++++-----
 go/vt/vtorc/logic/tablet_discovery.go      | 67 ++++++++++++---------
 go/vt/vtorc/logic/tablet_discovery_test.go | 60 +++++++++++++++++++
 3 files changed, 156 insertions(+), 41 deletions(-)

diff --git a/go/vt/topo/faketopo/faketopo.go b/go/vt/topo/faketopo/faketopo.go
index 0c88b95e3da..c49072c043f 100644
--- a/go/vt/topo/faketopo/faketopo.go
+++ b/go/vt/topo/faketopo/faketopo.go
@@ -45,17 +45,26 @@ func NewFakeTopoFactory() *FakeFactory {
 		mu:    sync.Mutex{},
 		cells: map[string][]*FakeConn{},
 	}
-	factory.cells[topo.GlobalCell] = []*FakeConn{newFakeConnection()}
+	factory.cells[topo.GlobalCell] = []*FakeConn{NewFakeConnection()}
 	return factory
 }
 
 // AddCell is used to add a cell to the factory. It returns the fake connection created. This connection can then be used to set get and update errors
 func (f *FakeFactory) AddCell(cell string) *FakeConn {
-	conn := newFakeConnection()
+	f.mu.Lock()
+	defer f.mu.Unlock()
+	conn := NewFakeConnection()
 	f.cells[cell] = []*FakeConn{conn}
 	return conn
 }
 
+// SetCell is used to set a cell in the factory.
+func (f *FakeFactory) SetCell(cell string, fakeConn *FakeConn) {
+	f.mu.Lock()
+	defer f.mu.Unlock()
+	f.cells[cell] = []*FakeConn{fakeConn}
+}
+
 // HasGlobalReadOnlyCell implements the Factory interface
 func (f *FakeFactory) HasGlobalReadOnlyCell(serverAddr, root string) bool {
 	return false
@@ -70,7 +79,7 @@ func (f *FakeFactory) Create(cell, serverAddr, root string) (topo.Conn, error) {
 	if !ok || len(connections) == 0 {
 		return nil, topo.NewError(topo.NoNode, cell)
 	}
-	// pick the first connection and remove it from the list
+	// pick the first connection and remove it from the list.
 	conn := connections[0]
 	f.cells[cell] = connections[1:]
 
@@ -84,15 +93,19 @@ type FakeConn struct {
 	cell       string
 	serverAddr string
 
-	// mutex to protect all the operations
+	// mutex to protect all the operations.
 	mu sync.Mutex
 
-	// getResultMap is a map storing the results for each filepath
+	// getResultMap is a map storing the results for each filepath.
 	getResultMap map[string]result
-	// updateErrors stores whether update function call should error or not
+	// listResultMap is a map storing the resuls for each filepath prefix.
+	listResultMap map[string][]topo.KVInfo
+	// updateErrors stores whether update function call should error or not.
 	updateErrors []updateError
-	// getErrors stores whether the get function call should error or not
+	// getErrors stores whether the get function call should error or not.
 	getErrors []bool
+	// listErrors stores whether the list function call should error or not.
+	listErrors []bool
 
 	// watches is a map of all watches for this connection to the cell keyed by the filepath.
 	watches map[string][]chan *topo.WatchData
@@ -105,13 +118,15 @@ type updateError struct {
 	writePersists bool
 }
 
-// newFakeConnection creates a new fake connection
-func newFakeConnection() *FakeConn {
+// NewFakeConnection creates a new fake connection
+func NewFakeConnection() *FakeConn {
 	return &FakeConn{
-		getResultMap: map[string]result{},
-		watches:      map[string][]chan *topo.WatchData{},
-		getErrors:    []bool{},
-		updateErrors: []updateError{},
+		getResultMap:  map[string]result{},
+		listResultMap: map[string][]topo.KVInfo{},
+		watches:       map[string][]chan *topo.WatchData{},
+		getErrors:     []bool{},
+		listErrors:    []bool{},
+		updateErrors:  []updateError{},
 	}
 }
 
@@ -122,6 +137,20 @@ func (f *FakeConn) AddGetError(shouldErr bool) {
 	f.getErrors = append(f.getErrors, shouldErr)
 }
 
+// AddListError is used to add a list error to the fake connection
+func (f *FakeConn) AddListError(shouldErr bool) {
+	f.mu.Lock()
+	defer f.mu.Unlock()
+	f.listErrors = append(f.listErrors, shouldErr)
+}
+
+// AddListResult is used to add a list result to the fake connection
+func (f *FakeConn) AddListResult(filePathPrefix string, result []topo.KVInfo) {
+	f.mu.Lock()
+	defer f.mu.Unlock()
+	f.listResultMap[filePathPrefix] = result
+}
+
 // AddUpdateError is used to add an update error to the fake connection
 func (f *FakeConn) AddUpdateError(shouldErr bool, writePersists bool) {
 	f.mu.Lock()
@@ -261,7 +290,20 @@ func (f *FakeConn) GetVersion(ctx context.Context, filePath string, version int6
 
 // List is part of the topo.Conn interface.
 func (f *FakeConn) List(ctx context.Context, filePathPrefix string) ([]topo.KVInfo, error) {
-	return nil, topo.NewError(topo.NoImplementation, "List not supported in fake topo")
+	f.mu.Lock()
+	defer f.mu.Unlock()
+	if len(f.listErrors) > 0 {
+		shouldErr := f.listErrors[0]
+		f.listErrors = f.listErrors[1:]
+		if shouldErr {
+			return nil, topo.NewError(topo.Timeout, filePathPrefix)
+		}
+	}
+	kvInfos, isPresent := f.listResultMap[filePathPrefix]
+	if !isPresent {
+		return nil, topo.NewError(topo.NoNode, filePathPrefix)
+	}
+	return kvInfos, nil
 }
 
 // Delete implements the Conn interface
diff --git a/go/vt/vtorc/logic/tablet_discovery.go b/go/vt/vtorc/logic/tablet_discovery.go
index c5c23df0cd0..d90247409aa 100644
--- a/go/vt/vtorc/logic/tablet_discovery.go
+++ b/go/vt/vtorc/logic/tablet_discovery.go
@@ -150,26 +150,30 @@ func OpenTabletDiscovery() <-chan time.Time {
 	return time.Tick(config.GetTopoInformationRefreshDuration()) //nolint SA1015: using time.Tick leaks the underlying ticker
 }
 
-// getAllTablets gets all tablets from all cells using a goroutine per cell.
-func getAllTablets(ctx context.Context, cells []string) []*topo.TabletInfo {
-	var tabletsMu sync.Mutex
-	tablets := make([]*topo.TabletInfo, 0)
+// getAllTablets gets all tablets from all cells using a goroutine per cell. It returns a map of
+// cells (string) to slices of tablets (as topo.TabletInfo) and a slice of cells (string) that
+// failed to return a result.
+func getAllTablets(ctx context.Context, cells []string) (tabletsByCell map[string][]*topo.TabletInfo, failedCells []string) {
+	var mu sync.Mutex
+	failedCells = make([]string, 0, len(cells))
+	tabletsByCell = make(map[string][]*topo.TabletInfo, len(cells))
 	eg, ctx := errgroup.WithContext(ctx)
 	for _, cell := range cells {
 		eg.Go(func() error {
-			t, err := ts.GetTabletsByCell(ctx, cell, nil)
+			tablets, err := ts.GetTabletsByCell(ctx, cell, nil)
+			mu.Lock()
+			defer mu.Unlock()
 			if err != nil {
 				log.Errorf("Failed to load tablets from cell %s: %+v", cell, err)
-				return nil
+				failedCells = append(failedCells, cell)
+			} else {
+				tabletsByCell[cell] = tablets
 			}
-			tabletsMu.Lock()
-			defer tabletsMu.Unlock()
-			tablets = append(tablets, t...)
 			return nil
 		})
 	}
 	_ = eg.Wait() // always nil
-	return tablets
+	return tabletsByCell, failedCells
 }
 
 // refreshAllTablets reloads the tablets from topo and discovers the ones which haven't been refreshed in a while
@@ -182,9 +186,9 @@ func refreshAllTablets(ctx context.Context) error {
 // refreshTabletsUsing refreshes tablets using a provided loader.
 func refreshTabletsUsing(ctx context.Context, loader func(tabletAlias string), forceRefresh bool) error {
 	// Get all cells.
-	ctx, cancel := context.WithTimeout(ctx, topo.RemoteOperationTimeout)
-	defer cancel()
-	cells, err := ts.GetKnownCells(ctx)
+	cellsCtx, cellsCancel := context.WithTimeout(ctx, topo.RemoteOperationTimeout)
+	defer cellsCancel()
+	cells, err := ts.GetKnownCells(cellsCtx)
 	if err != nil {
 		return err
 	}
@@ -192,25 +196,34 @@ func refreshTabletsUsing(ctx context.Context, loader func(tabletAlias string), f
 	// Get all tablets from all cells.
 	getTabletsCtx, getTabletsCancel := context.WithTimeout(ctx, topo.RemoteOperationTimeout)
 	defer getTabletsCancel()
-	tablets := getAllTablets(getTabletsCtx, cells)
-	if len(tablets) == 0 {
-		log.Error("Found no tablets")
+	tabletsByCell, failedCells := getAllTablets(getTabletsCtx, cells)
+	if len(tabletsByCell) == 0 {
+		log.Error("Found no cells with tablets")
 		return nil
 	}
+	if len(failedCells) > 0 {
+		log.Errorf("Got partial topo result. Failed cells: %s", strings.Join(failedCells, ", "))
+	}
 
-	// Filter tablets that should not be watched using shardsToWatch map.
-	matchedTablets := make([]*topo.TabletInfo, 0, len(tablets))
-	func() {
-		for _, t := range tablets {
-			if shouldWatchTablet(t.Tablet) {
-				matchedTablets = append(matchedTablets, t)
+	// Update each cell that provided a response. This ensures only cells that provided a
+	// response are updated in the backend and are considered for forgetting stale tablets.
+	for cell, tablets := range tabletsByCell {
+		// Filter tablets that should not be watched using func shouldWatchTablet.
+		matchedTablets := make([]*topo.TabletInfo, 0, len(tablets))
+		func() {
+			for _, t := range tablets {
+				if shouldWatchTablet(t.Tablet) {
+					matchedTablets = append(matchedTablets, t)
+				}
 			}
-		}
-	}()
+		}()
+
+		// Refresh the filtered tablets and forget stale tablets.
+		query := "select alias from vitess_tablet where cell = ?"
+		args := sqlutils.Args(cell)
+		refreshTablets(matchedTablets, query, args, loader, forceRefresh, nil)
+	}
 
-	// Refresh the filtered tablets.
-	query := "select alias from vitess_tablet"
-	refreshTablets(matchedTablets, query, nil, loader, forceRefresh, nil)
 	return nil
 }
 
diff --git a/go/vt/vtorc/logic/tablet_discovery_test.go b/go/vt/vtorc/logic/tablet_discovery_test.go
index 4514ef81724..c351fb41c0a 100644
--- a/go/vt/vtorc/logic/tablet_discovery_test.go
+++ b/go/vt/vtorc/logic/tablet_discovery_test.go
@@ -19,6 +19,7 @@ package logic
 import (
 	"context"
 	"fmt"
+	"slices"
 	"strings"
 	"sync/atomic"
 	"testing"
@@ -34,6 +35,7 @@ import (
 	topodatapb "vitess.io/vitess/go/vt/proto/topodata"
 	"vitess.io/vitess/go/vt/proto/vttime"
 	"vitess.io/vitess/go/vt/topo"
+	"vitess.io/vitess/go/vt/topo/faketopo"
 	"vitess.io/vitess/go/vt/topo/memorytopo"
 	"vitess.io/vitess/go/vt/topo/topoproto"
 	"vitess.io/vitess/go/vt/vtctl/grpcvtctldserver/testutil"
@@ -840,3 +842,61 @@ func TestSetReplicationSource(t *testing.T) {
 		})
 	}
 }
+
+func TestGetAllTablets(t *testing.T) {
+	tablet := &topodatapb.Tablet{
+		Hostname: t.Name(),
+	}
+	tabletProto, _ := tablet.MarshalVT()
+
+	factory := faketopo.NewFakeTopoFactory()
+
+	// zone1 (success)
+	goodCell1 := faketopo.NewFakeConnection()
+	goodCell1.AddListResult("tablets", []topo.KVInfo{
+		{
+			Key:   []byte("zone1-00000001"),
+			Value: tabletProto,
+		},
+	})
+	factory.SetCell("zone1", goodCell1)
+
+	// zone2 (success)
+	goodCell2 := faketopo.NewFakeConnection()
+	goodCell2.AddListResult("tablets", []topo.KVInfo{
+		{
+			Key:   []byte("zone2-00000002"),
+			Value: tabletProto,
+		},
+	})
+	factory.SetCell("zone2", goodCell2)
+
+	// zone3 (fail)
+	badCell1 := faketopo.NewFakeConnection()
+	badCell1.AddListError(true)
+	factory.SetCell("zone3", badCell1)
+
+	// zone4 (fail)
+	badCell2 := faketopo.NewFakeConnection()
+	badCell2.AddListError(true)
+	factory.SetCell("zone4", badCell2)
+
+	oldTs := ts
+	defer func() {
+		ts = oldTs
+	}()
+	ctx := context.Background()
+	ts = faketopo.NewFakeTopoServer(ctx, factory)
+
+	// confirm zone1 + zone2 succeeded and zone3 + zone4 failed
+	tabletsByCell, failedCells := getAllTablets(ctx, []string{"zone1", "zone2", "zone3", "zone4"})
+	require.Len(t, tabletsByCell, 2)
+	slices.Sort(failedCells)
+	require.Equal(t, []string{"zone3", "zone4"}, failedCells)
+	for _, tablets := range tabletsByCell {
+		require.Len(t, tablets, 1)
+		for _, tablet := range tablets {
+			require.Equal(t, t.Name(), tablet.Tablet.GetHostname())
+		}
+	}
+}

From cf7fa682d12f19eeefe90891bc3090982a99c71a Mon Sep 17 00:00:00 2001
From: Tim Vaillancourt <tim@timvaillancourt.com>
Date: Fri, 14 Feb 2025 23:22:10 +0100
Subject: [PATCH 61/68] nit: move new `const`s to own section (#17802)

Signed-off-by: Tim Vaillancourt <tim@timvaillancourt.com>
---
 test/ci_workflow_gen.go | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/test/ci_workflow_gen.go b/test/ci_workflow_gen.go
index a8f1a82e56f..a00d5bec9bf 100644
--- a/test/ci_workflow_gen.go
+++ b/test/ci_workflow_gen.go
@@ -33,8 +33,6 @@ const (
 	mysql80 mysqlVersion = "mysql80"
 	mysql84 mysqlVersion = "mysql84"
 
-	cores16RunnerName   = "gh-hosted-runners-16cores-1-24.04"
-	defaultRunnerName   = "ubuntu-24.04"
 	defaultMySQLVersion = mysql80
 )
 
@@ -48,6 +46,11 @@ var (
 	unitTestDatabases = []mysqlVersion{mysql57, mysql80, mysql84}
 )
 
+const (
+	cores16RunnerName = "gh-hosted-runners-16cores-1-24.04"
+	defaultRunnerName = "ubuntu-24.04"
+)
+
 const (
 	workflowConfigDir = "../.github/workflows"
 

From f131dd6d3142f05b6b1265d403df242aca1ff0ca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9s=20Taylor?= <andres@planetscale.com>
Date: Sat, 15 Feb 2025 08:26:47 +0100
Subject: [PATCH 62/68] Use ast-paths for subquery planning to improve
 performance (#17738)

Signed-off-by: Andres Taylor <andres@planetscale.com>
Signed-off-by: Manan Gupta <manan@planetscale.com>
Signed-off-by: Vicent Marti <vmg@strn.cat>
Signed-off-by: Harshit Gangal <harshit@planetscale.com>
Co-authored-by: Manan Gupta <manan@planetscale.com>
Co-authored-by: Vicent Marti <vmg@strn.cat>
Co-authored-by: Harshit Gangal <harshit@planetscale.com>
---
 go/tools/asthelpergen/asthelpergen.go         |   10 +-
 go/tools/asthelpergen/clone_gen.go            |    2 +-
 go/tools/asthelpergen/copy_on_rewrite_gen.go  |    2 +-
 go/tools/asthelpergen/equals_gen.go           |    6 +-
 .../asthelpergen/integration/ast_clone.go     |   27 +-
 .../integration/ast_copy_on_rewrite.go        |   26 +-
 .../asthelpergen/integration/ast_equals.go    |   36 +-
 go/tools/asthelpergen/integration/ast_path.go |  136 +
 .../asthelpergen/integration/ast_path_test.go |   65 +
 .../asthelpergen/integration/ast_rewrite.go   |  163 +-
 .../asthelpergen/integration/ast_visit.go     |   14 +-
 .../integration/integration_rewriter_test.go  |    6 +-
 .../integration/integration_visit_test.go     |    4 +-
 go/tools/asthelpergen/integration/paths.go    |   43 +
 .../asthelpergen/integration/test_helpers.go  |   69 +
 go/tools/asthelpergen/integration/types.go    |  138 +-
 go/tools/asthelpergen/paths_gen.go            |  266 ++
 go/tools/asthelpergen/rewrite_gen.go          |  152 +-
 go/tools/asthelpergen/visit_gen.go            |    5 +-
 go/vt/sqlparser/ast_clone.go                  |    2 +-
 go/vt/sqlparser/ast_copy_on_rewrite.go        |    2 +-
 go/vt/sqlparser/ast_equals.go                 |    2 +-
 go/vt/sqlparser/ast_path.go                   | 2777 ++++++++++++++
 go/vt/sqlparser/ast_rewrite.go                | 3329 ++++++++++++++++-
 go/vt/sqlparser/ast_visit.go                  |    2 +-
 go/vt/sqlparser/pathbuilder/builder.go        |   71 +
 go/vt/sqlparser/pathbuilder/builder_test.go   |  134 +
 go/vt/sqlparser/paths.go                      |   88 +
 go/vt/sqlparser/paths_test.go                 |   51 +
 go/vt/sqlparser/rewriter_api.go               |   31 +-
 go/vt/sqlparser/rewriter_test.go              |   39 +
 go/vt/vtgate/planbuilder/operators/join.go    |    2 +-
 .../planbuilder/operators/subquery_builder.go |   59 +-
 go/vt/vtgate/semantics/semantic_table.go      |   15 +
 34 files changed, 7571 insertions(+), 203 deletions(-)
 create mode 100644 go/tools/asthelpergen/integration/ast_path.go
 create mode 100644 go/tools/asthelpergen/integration/ast_path_test.go
 create mode 100644 go/tools/asthelpergen/integration/paths.go
 create mode 100644 go/tools/asthelpergen/paths_gen.go
 create mode 100644 go/vt/sqlparser/ast_path.go
 create mode 100644 go/vt/sqlparser/pathbuilder/builder.go
 create mode 100644 go/vt/sqlparser/pathbuilder/builder_test.go
 create mode 100644 go/vt/sqlparser/paths.go
 create mode 100644 go/vt/sqlparser/paths_test.go

diff --git a/go/tools/asthelpergen/asthelpergen.go b/go/tools/asthelpergen/asthelpergen.go
index ebb015b7339..746463767bd 100644
--- a/go/tools/asthelpergen/asthelpergen.go
+++ b/go/tools/asthelpergen/asthelpergen.go
@@ -32,7 +32,7 @@ import (
 	"vitess.io/vitess/go/tools/codegen"
 )
 
-const licenseFileHeader = `Copyright 2023 The Vitess Authors.
+const licenseFileHeader = `Copyright 2025 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.
@@ -51,10 +51,10 @@ type (
 		addType(t types.Type)
 		scope() *types.Scope
 		findImplementations(iff *types.Interface, impl func(types.Type) error) error
-		iface() *types.Interface
+		iface() *types.Interface // the root interface that all nodes are expected to implement
 	}
 	generator interface {
-		genFile() (string, *jen.File)
+		genFile(generatorSPI) (string, *jen.File)
 		interfaceMethod(t types.Type, iface *types.Interface, spi generatorSPI) error
 		structMethod(t types.Type, strct *types.Struct, spi generatorSPI) error
 		ptrToStructMethod(t types.Type, strct *types.Struct, spi generatorSPI) error
@@ -206,9 +206,11 @@ func GenerateASTHelpers(options *Options) (map[string]*jen.File, error) {
 
 	nt := tt.Type().(*types.Named)
 	pName := nt.Obj().Pkg().Name()
+	ifaceName := types.TypeString(nt, noQualifier)
 	generator := newGenerator(loaded[0].Module, loaded[0].TypesSizes, nt,
 		newEqualsGen(pName, &options.Equals),
 		newCloneGen(pName, &options.Clone),
+		newPathGen(pName, ifaceName),
 		newVisitGen(pName),
 		newRewriterGen(pName, types.TypeString(nt, noQualifier)),
 		newCOWGen(pName, nt),
@@ -298,7 +300,7 @@ func (gen *astHelperGen) createFiles() map[string]*jen.File {
 
 	result := map[string]*jen.File{}
 	for _, g := range gen.gens {
-		fName, jenFile := g.genFile()
+		fName, jenFile := g.genFile(gen)
 		result[fName] = jenFile
 	}
 	return result
diff --git a/go/tools/asthelpergen/clone_gen.go b/go/tools/asthelpergen/clone_gen.go
index 10387a5dc25..eed3ff685ee 100644
--- a/go/tools/asthelpergen/clone_gen.go
+++ b/go/tools/asthelpergen/clone_gen.go
@@ -56,7 +56,7 @@ func (c *cloneGen) addFunc(name string, code *jen.Statement) {
 	c.file.Add(code)
 }
 
-func (c *cloneGen) genFile() (string, *jen.File) {
+func (c *cloneGen) genFile(generatorSPI) (string, *jen.File) {
 	return "ast_clone.go", c.file
 }
 
diff --git a/go/tools/asthelpergen/copy_on_rewrite_gen.go b/go/tools/asthelpergen/copy_on_rewrite_gen.go
index 1daa8d18981..a12e71cbe8f 100644
--- a/go/tools/asthelpergen/copy_on_rewrite_gen.go
+++ b/go/tools/asthelpergen/copy_on_rewrite_gen.go
@@ -44,7 +44,7 @@ func (c *cowGen) addFunc(code *jen.Statement) {
 	c.file.Add(code)
 }
 
-func (c *cowGen) genFile() (string, *jen.File) {
+func (c *cowGen) genFile(generatorSPI) (string, *jen.File) {
 	return "ast_copy_on_rewrite.go", c.file
 }
 
diff --git a/go/tools/asthelpergen/equals_gen.go b/go/tools/asthelpergen/equals_gen.go
index e00c3ef596a..2e34eb5a36c 100644
--- a/go/tools/asthelpergen/equals_gen.go
+++ b/go/tools/asthelpergen/equals_gen.go
@@ -62,7 +62,7 @@ func (e *equalsGen) customComparatorField(t types.Type) string {
 	return printableTypeName(t) + "_"
 }
 
-func (e *equalsGen) genFile() (string, *jen.File) {
+func (e *equalsGen) genFile(generatorSPI) (string, *jen.File) {
 	e.file.Type().Id(Comparator).StructFunc(func(g *jen.Group) {
 		for tname, t := range e.comparators {
 			if t == nil {
@@ -303,6 +303,4 @@ func (e *equalsGen) sliceMethod(t types.Type, slice *types.Slice, spi generatorS
 	return nil
 }
 
-func (e *equalsGen) basicMethod(types.Type, *types.Basic, generatorSPI) error {
-	return nil
-}
+func (*equalsGen) basicMethod(types.Type, *types.Basic, generatorSPI) error { return nil }
diff --git a/go/tools/asthelpergen/integration/ast_clone.go b/go/tools/asthelpergen/integration/ast_clone.go
index d5857c89834..7b085a4c034 100644
--- a/go/tools/asthelpergen/integration/ast_clone.go
+++ b/go/tools/asthelpergen/integration/ast_clone.go
@@ -1,5 +1,5 @@
 /*
-Copyright 2023 The Vitess Authors.
+Copyright 2025 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.
@@ -115,6 +115,7 @@ func CloneRefOfRefContainer(n *RefContainer) *RefContainer {
 	}
 	out := *n
 	out.ASTType = CloneAST(n.ASTType)
+	out.Opts = CloneSliceOfRefOfOptions(n.Opts)
 	out.ASTImplementationType = CloneRefOfLeaf(n.ASTImplementationType)
 	return &out
 }
@@ -176,6 +177,18 @@ func CloneRefOfInterfaceContainer(n *InterfaceContainer) *InterfaceContainer {
 	return &out
 }
 
+// CloneSliceOfRefOfOptions creates a deep clone of the input.
+func CloneSliceOfRefOfOptions(n []*Options) []*Options {
+	if n == nil {
+		return nil
+	}
+	res := make([]*Options, len(n))
+	for i, x := range n {
+		res[i] = CloneRefOfOptions(x)
+	}
+	return res
+}
+
 // CloneSliceOfAST creates a deep clone of the input.
 func CloneSliceOfAST(n []AST) []AST {
 	if n == nil {
@@ -238,6 +251,16 @@ func CloneRefOfValueSliceContainer(n *ValueSliceContainer) *ValueSliceContainer
 	out := *n
 	out.ASTElements = CloneSliceOfAST(n.ASTElements)
 	out.NotASTElements = CloneSliceOfInt(n.NotASTElements)
-	out.ASTImplementationElements = CloneSliceOfRefOfLeaf(n.ASTImplementationElements)
+	out.ASTImplementationElements = CloneLeafSlice(n.ASTImplementationElements)
+	return &out
+}
+
+// CloneRefOfOptions creates a deep clone of the input.
+func CloneRefOfOptions(n *Options) *Options {
+	if n == nil {
+		return nil
+	}
+	out := *n
+	out.l = CloneRefOfLeaf(n.l)
 	return &out
 }
diff --git a/go/tools/asthelpergen/integration/ast_copy_on_rewrite.go b/go/tools/asthelpergen/integration/ast_copy_on_rewrite.go
index d48e8621692..84c13fac6a7 100644
--- a/go/tools/asthelpergen/integration/ast_copy_on_rewrite.go
+++ b/go/tools/asthelpergen/integration/ast_copy_on_rewrite.go
@@ -1,5 +1,5 @@
 /*
-Copyright 2023 The Vitess Authors.
+Copyright 2025 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.
@@ -262,19 +262,11 @@ func (c *cow) copyOnRewriteValueSliceContainer(n ValueSliceContainer, parent AST
 				changedASTElements = true
 			}
 		}
-		var changedASTImplementationElements bool
-		_ASTImplementationElements := make([]*Leaf, len(n.ASTImplementationElements))
-		for x, el := range n.ASTImplementationElements {
-			this, changed := c.copyOnRewriteRefOfLeaf(el, n)
-			_ASTImplementationElements[x] = this.(*Leaf)
-			if changed {
-				changedASTImplementationElements = true
-			}
-		}
+		_ASTImplementationElements, changedASTImplementationElements := c.copyOnRewriteLeafSlice(n.ASTImplementationElements, n)
 		if changedASTElements || changedASTImplementationElements {
 			res := n
 			res.ASTElements = _ASTElements
-			res.ASTImplementationElements = _ASTImplementationElements
+			res.ASTImplementationElements, _ = _ASTImplementationElements.(LeafSlice)
 			out = &res
 			if c.cloned != nil {
 				c.cloned(n, out)
@@ -364,19 +356,11 @@ func (c *cow) copyOnRewriteRefOfValueSliceContainer(n *ValueSliceContainer, pare
 				changedASTElements = true
 			}
 		}
-		var changedASTImplementationElements bool
-		_ASTImplementationElements := make([]*Leaf, len(n.ASTImplementationElements))
-		for x, el := range n.ASTImplementationElements {
-			this, changed := c.copyOnRewriteRefOfLeaf(el, n)
-			_ASTImplementationElements[x] = this.(*Leaf)
-			if changed {
-				changedASTImplementationElements = true
-			}
-		}
+		_ASTImplementationElements, changedASTImplementationElements := c.copyOnRewriteLeafSlice(n.ASTImplementationElements, n)
 		if changedASTElements || changedASTImplementationElements {
 			res := *n
 			res.ASTElements = _ASTElements
-			res.ASTImplementationElements = _ASTImplementationElements
+			res.ASTImplementationElements, _ = _ASTImplementationElements.(LeafSlice)
 			out = &res
 			if c.cloned != nil {
 				c.cloned(n, out)
diff --git a/go/tools/asthelpergen/integration/ast_equals.go b/go/tools/asthelpergen/integration/ast_equals.go
index 553851a8c97..5ca81b6e90a 100644
--- a/go/tools/asthelpergen/integration/ast_equals.go
+++ b/go/tools/asthelpergen/integration/ast_equals.go
@@ -1,5 +1,5 @@
 /*
-Copyright 2023 The Vitess Authors.
+Copyright 2025 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.
@@ -180,6 +180,7 @@ func (cmp *Comparator) RefOfRefContainer(a, b *RefContainer) bool {
 	}
 	return a.NotASTType == b.NotASTType &&
 		cmp.AST(a.ASTType, b.ASTType) &&
+		cmp.SliceOfRefOfOptions(a.Opts, b.Opts) &&
 		cmp.RefOfLeaf(a.ASTImplementationType, b.ASTImplementationType)
 }
 
@@ -191,7 +192,8 @@ func (cmp *Comparator) RefOfRefSliceContainer(a, b *RefSliceContainer) bool {
 	if a == nil || b == nil {
 		return false
 	}
-	return cmp.SliceOfAST(a.ASTElements, b.ASTElements) &&
+	return a.something == b.something &&
+		cmp.SliceOfAST(a.ASTElements, b.ASTElements) &&
 		cmp.SliceOfInt(a.NotASTElements, b.NotASTElements) &&
 		cmp.SliceOfRefOfLeaf(a.ASTImplementationElements, b.ASTImplementationElements)
 }
@@ -219,7 +221,7 @@ func (cmp *Comparator) ValueContainer(a, b ValueContainer) bool {
 func (cmp *Comparator) ValueSliceContainer(a, b ValueSliceContainer) bool {
 	return cmp.SliceOfAST(a.ASTElements, b.ASTElements) &&
 		cmp.SliceOfInt(a.NotASTElements, b.NotASTElements) &&
-		cmp.SliceOfRefOfLeaf(a.ASTImplementationElements, b.ASTImplementationElements)
+		cmp.LeafSlice(a.ASTImplementationElements, b.ASTImplementationElements)
 }
 
 // SubIface does deep equals between the two objects.
@@ -254,6 +256,19 @@ func (cmp *Comparator) RefOfInterfaceContainer(a, b *InterfaceContainer) bool {
 	return true
 }
 
+// SliceOfRefOfOptions does deep equals between the two objects.
+func (cmp *Comparator) SliceOfRefOfOptions(a, b []*Options) bool {
+	if len(a) != len(b) {
+		return false
+	}
+	for i := 0; i < len(a); i++ {
+		if !cmp.RefOfOptions(a[i], b[i]) {
+			return false
+		}
+	}
+	return true
+}
+
 // SliceOfAST does deep equals between the two objects.
 func (cmp *Comparator) SliceOfAST(a, b []AST) bool {
 	if len(a) != len(b) {
@@ -327,7 +342,20 @@ func (cmp *Comparator) RefOfValueSliceContainer(a, b *ValueSliceContainer) bool
 	}
 	return cmp.SliceOfAST(a.ASTElements, b.ASTElements) &&
 		cmp.SliceOfInt(a.NotASTElements, b.NotASTElements) &&
-		cmp.SliceOfRefOfLeaf(a.ASTImplementationElements, b.ASTImplementationElements)
+		cmp.LeafSlice(a.ASTImplementationElements, b.ASTImplementationElements)
+}
+
+// RefOfOptions does deep equals between the two objects.
+func (cmp *Comparator) RefOfOptions(a, b *Options) bool {
+	if a == b {
+		return true
+	}
+	if a == nil || b == nil {
+		return false
+	}
+	return a.a == b.a &&
+		a.b == b.b &&
+		cmp.RefOfLeaf(a.l, b.l)
 }
 
 type Comparator struct{}
diff --git a/go/tools/asthelpergen/integration/ast_path.go b/go/tools/asthelpergen/integration/ast_path.go
new file mode 100644
index 00000000000..a1fd838b170
--- /dev/null
+++ b/go/tools/asthelpergen/integration/ast_path.go
@@ -0,0 +1,136 @@
+/*
+Copyright 2025 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.
+*/
+// Code generated by ASTHelperGen. DO NOT EDIT.
+
+package integration
+
+type ASTStep uint16
+
+const (
+	InterfaceSliceOffset ASTStep = iota
+	LeafSliceOffset
+	RefOfRefContainerASTType
+	RefOfRefContainerASTImplementationType
+	RefOfRefSliceContainerASTElementsOffset
+	RefOfRefSliceContainerASTImplementationElementsOffset
+	RefOfSubImplinner
+	ValueContainerASTType
+	ValueContainerASTImplementationType
+	ValueSliceContainerASTElementsOffset
+	ValueSliceContainerASTImplementationElements
+	SliceOfASTOffset
+	SliceOfRefOfLeafOffset
+	RefOfValueContainerASTType
+	RefOfValueContainerASTImplementationType
+	RefOfValueSliceContainerASTElementsOffset
+	RefOfValueSliceContainerASTImplementationElements
+	RefOfOptionsl
+)
+
+func (s ASTStep) DebugString() string {
+	switch s {
+	case InterfaceSliceOffset:
+		return "(InterfaceSlice)[]Offset"
+	case LeafSliceOffset:
+		return "(LeafSlice)[]Offset"
+	case RefOfRefContainerASTType:
+		return "(*RefContainer).ASTType"
+	case RefOfRefContainerASTImplementationType:
+		return "(*RefContainer).ASTImplementationType"
+	case RefOfRefSliceContainerASTElementsOffset:
+		return "(*RefSliceContainer).ASTElementsOffset"
+	case RefOfRefSliceContainerASTImplementationElementsOffset:
+		return "(*RefSliceContainer).ASTImplementationElementsOffset"
+	case RefOfSubImplinner:
+		return "(*SubImpl).inner"
+	case ValueContainerASTType:
+		return "(ValueContainer).ASTType"
+	case ValueContainerASTImplementationType:
+		return "(ValueContainer).ASTImplementationType"
+	case ValueSliceContainerASTElementsOffset:
+		return "(ValueSliceContainer).ASTElementsOffset"
+	case ValueSliceContainerASTImplementationElements:
+		return "(ValueSliceContainer).ASTImplementationElements"
+	case SliceOfASTOffset:
+		return "([]AST)[]Offset"
+	case SliceOfRefOfLeafOffset:
+		return "([]*Leaf)[]Offset"
+	case RefOfValueContainerASTType:
+		return "(*ValueContainer).ASTType"
+	case RefOfValueContainerASTImplementationType:
+		return "(*ValueContainer).ASTImplementationType"
+	case RefOfValueSliceContainerASTElementsOffset:
+		return "(*ValueSliceContainer).ASTElementsOffset"
+	case RefOfValueSliceContainerASTImplementationElements:
+		return "(*ValueSliceContainer).ASTImplementationElements"
+	case RefOfOptionsl:
+		return "(*Options).l"
+	}
+	panic("unknown ASTStep")
+}
+func GetNodeFromPath(node AST, path ASTPath) AST {
+	for len(path) >= 2 {
+		step := path.nextPathStep()
+		path = path[2:]
+		switch step {
+		case InterfaceSliceOffset:
+			idx, bytesRead := path.nextPathOffset()
+			path = path[bytesRead:]
+			node = node.(InterfaceSlice)[idx]
+		case LeafSliceOffset:
+			idx, bytesRead := path.nextPathOffset()
+			path = path[bytesRead:]
+			node = node.(LeafSlice)[idx]
+		case RefOfRefContainerASTType:
+			node = node.(*RefContainer).ASTType
+		case RefOfRefContainerASTImplementationType:
+			node = node.(*RefContainer).ASTImplementationType
+		case RefOfRefSliceContainerASTElementsOffset:
+			idx, bytesRead := path.nextPathOffset()
+			path = path[bytesRead:]
+			node = node.(*RefSliceContainer).ASTElements[idx]
+		case RefOfRefSliceContainerASTImplementationElementsOffset:
+			idx, bytesRead := path.nextPathOffset()
+			path = path[bytesRead:]
+			node = node.(*RefSliceContainer).ASTImplementationElements[idx]
+		case RefOfSubImplinner:
+			node = node.(*SubImpl).inner
+		case ValueContainerASTType:
+			node = node.(ValueContainer).ASTType
+		case ValueContainerASTImplementationType:
+			node = node.(ValueContainer).ASTImplementationType
+		case ValueSliceContainerASTElementsOffset:
+			idx, bytesRead := path.nextPathOffset()
+			path = path[bytesRead:]
+			node = node.(ValueSliceContainer).ASTElements[idx]
+		case ValueSliceContainerASTImplementationElements:
+			node = node.(ValueSliceContainer).ASTImplementationElements
+		case RefOfValueContainerASTType:
+			node = node.(*ValueContainer).ASTType
+		case RefOfValueContainerASTImplementationType:
+			node = node.(*ValueContainer).ASTImplementationType
+		case RefOfValueSliceContainerASTElementsOffset:
+			idx, bytesRead := path.nextPathOffset()
+			path = path[bytesRead:]
+			node = node.(*ValueSliceContainer).ASTElements[idx]
+		case RefOfValueSliceContainerASTImplementationElements:
+			node = node.(*ValueSliceContainer).ASTImplementationElements
+		default:
+			return nil
+		}
+	}
+	return node
+}
diff --git a/go/tools/asthelpergen/integration/ast_path_test.go b/go/tools/asthelpergen/integration/ast_path_test.go
new file mode 100644
index 00000000000..36ef35951aa
--- /dev/null
+++ b/go/tools/asthelpergen/integration/ast_path_test.go
@@ -0,0 +1,65 @@
+/*
+Copyright 2025 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 integration
+
+import (
+	"fmt"
+	"reflect"
+	"testing"
+
+	"github.com/stretchr/testify/require"
+)
+
+func TestWalkAllPartsOfAST(t *testing.T) {
+	sliceContainer := &RefSliceContainer{
+		something:                 12,
+		ASTElements:               []AST{},
+		NotASTElements:            []int{1, 2},
+		ASTImplementationElements: []*Leaf{{v: 1}, {v: 2}},
+	}
+
+	for i := range 20 {
+		sliceContainer.ASTImplementationElements = append(sliceContainer.ASTImplementationElements, &Leaf{v: 3 + i})
+	}
+
+	ast := &RefContainer{
+		ASTType:               sliceContainer,
+		NotASTType:            2,
+		ASTImplementationType: &Leaf{v: 23},
+	}
+
+	var leafPaths []ASTPath
+	RewriteWithPaths(ast, func(c *Cursor) bool {
+		node := c.Node()
+		if !reflect.TypeOf(node).Comparable() {
+			return true
+		}
+		if _, isLeaf := node.(*Leaf); isLeaf {
+			leafPaths = append(leafPaths, c.Path())
+		}
+		fmt.Println(c.Path().DebugString())
+		return true
+	}, nil)
+
+	require.Len(t, leafPaths, 23)
+	for idx, path := range leafPaths {
+		fmt.Println("Walking: " + path.DebugString())
+		node := GetNodeFromPath(ast, path)
+		require.IsType(t, &Leaf{}, node)
+		require.EqualValues(t, idx+1, node.(*Leaf).v)
+	}
+}
diff --git a/go/tools/asthelpergen/integration/ast_rewrite.go b/go/tools/asthelpergen/integration/ast_rewrite.go
index 74dc743a581..89f6966558e 100644
--- a/go/tools/asthelpergen/integration/ast_rewrite.go
+++ b/go/tools/asthelpergen/integration/ast_rewrite.go
@@ -1,5 +1,5 @@
 /*
-Copyright 2023 The Vitess Authors.
+Copyright 2025 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.
@@ -17,6 +17,7 @@ limitations under the License.
 
 package integration
 
+// Function Generation Source: InterfaceMethod
 func (a *application) rewriteAST(parent AST, node AST, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -51,6 +52,8 @@ func (a *application) rewriteAST(parent AST, node AST, replacer replacerFunc) bo
 		return true
 	}
 }
+
+// Function Generation Source: SliceMethod
 func (a *application) rewriteBytes(parent AST, node Bytes, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -80,6 +83,8 @@ func (a *application) rewriteBytes(parent AST, node Bytes, replacer replacerFunc
 	}
 	return true
 }
+
+// Function Generation Source: StructMethod
 func (a *application) rewriteInterfaceContainer(parent AST, node InterfaceContainer, replacer replacerFunc) bool {
 	if a.pre != nil {
 		a.cur.replacer = replacer
@@ -106,6 +111,8 @@ func (a *application) rewriteInterfaceContainer(parent AST, node InterfaceContai
 	}
 	return true
 }
+
+// Function Generation Source: SliceMethod
 func (a *application) rewriteInterfaceSlice(parent AST, node InterfaceSlice, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -124,6 +131,13 @@ func (a *application) rewriteInterfaceSlice(parent AST, node InterfaceSlice, rep
 		}
 	}
 	for x, el := range node {
+		if a.collectPaths {
+			if x == 0 {
+				a.cur.current.AddStepWithOffset(uint16(InterfaceSliceOffset))
+			} else {
+				a.cur.current.ChangeOffset(x)
+			}
+		}
 		if !a.rewriteAST(node, el, func(idx int) replacerFunc {
 			return func(newNode, parent AST) {
 				parent.(InterfaceSlice)[idx] = newNode.(AST)
@@ -132,6 +146,9 @@ func (a *application) rewriteInterfaceSlice(parent AST, node InterfaceSlice, rep
 			return false
 		}
 	}
+	if a.collectPaths && len(node) > 0 {
+		a.cur.current.Pop()
+	}
 	if a.post != nil {
 		a.cur.replacer = replacer
 		a.cur.parent = parent
@@ -142,6 +159,8 @@ func (a *application) rewriteInterfaceSlice(parent AST, node InterfaceSlice, rep
 	}
 	return true
 }
+
+// Function Generation Source: PtrToStructMethod
 func (a *application) rewriteRefOfLeaf(parent AST, node *Leaf, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -171,6 +190,8 @@ func (a *application) rewriteRefOfLeaf(parent AST, node *Leaf, replacer replacer
 	}
 	return true
 }
+
+// Function Generation Source: SliceMethod
 func (a *application) rewriteLeafSlice(parent AST, node LeafSlice, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -189,6 +210,13 @@ func (a *application) rewriteLeafSlice(parent AST, node LeafSlice, replacer repl
 		}
 	}
 	for x, el := range node {
+		if a.collectPaths {
+			if x == 0 {
+				a.cur.current.AddStepWithOffset(uint16(LeafSliceOffset))
+			} else {
+				a.cur.current.ChangeOffset(x)
+			}
+		}
 		if !a.rewriteRefOfLeaf(node, el, func(idx int) replacerFunc {
 			return func(newNode, parent AST) {
 				parent.(LeafSlice)[idx] = newNode.(*Leaf)
@@ -197,6 +225,9 @@ func (a *application) rewriteLeafSlice(parent AST, node LeafSlice, replacer repl
 			return false
 		}
 	}
+	if a.collectPaths && len(node) > 0 {
+		a.cur.current.Pop()
+	}
 	if a.post != nil {
 		a.cur.replacer = replacer
 		a.cur.parent = parent
@@ -207,6 +238,8 @@ func (a *application) rewriteLeafSlice(parent AST, node LeafSlice, replacer repl
 	}
 	return true
 }
+
+// Function Generation Source: PtrToStructMethod
 func (a *application) rewriteRefOfNoCloneType(parent AST, node *NoCloneType, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -236,6 +269,8 @@ func (a *application) rewriteRefOfNoCloneType(parent AST, node *NoCloneType, rep
 	}
 	return true
 }
+
+// Function Generation Source: PtrToStructMethod
 func (a *application) rewriteRefOfRefContainer(parent AST, node *RefContainer, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -253,16 +288,26 @@ func (a *application) rewriteRefOfRefContainer(parent AST, node *RefContainer, r
 			return true
 		}
 	}
+	if a.collectPaths {
+		a.cur.current.AddStep(uint16(RefOfRefContainerASTType))
+	}
 	if !a.rewriteAST(node, node.ASTType, func(newNode, parent AST) {
 		parent.(*RefContainer).ASTType = newNode.(AST)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+		a.cur.current.AddStep(uint16(RefOfRefContainerASTImplementationType))
+	}
 	if !a.rewriteRefOfLeaf(node, node.ASTImplementationType, func(newNode, parent AST) {
 		parent.(*RefContainer).ASTImplementationType = newNode.(*Leaf)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+	}
 	if a.post != nil {
 		a.cur.replacer = replacer
 		a.cur.parent = parent
@@ -273,6 +318,8 @@ func (a *application) rewriteRefOfRefContainer(parent AST, node *RefContainer, r
 	}
 	return true
 }
+
+// Function Generation Source: PtrToStructMethod
 func (a *application) rewriteRefOfRefSliceContainer(parent AST, node *RefSliceContainer, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -291,6 +338,13 @@ func (a *application) rewriteRefOfRefSliceContainer(parent AST, node *RefSliceCo
 		}
 	}
 	for x, el := range node.ASTElements {
+		if a.collectPaths {
+			if x == 0 {
+				a.cur.current.AddStepWithOffset(uint16(RefOfRefSliceContainerASTElementsOffset))
+			} else {
+				a.cur.current.ChangeOffset(x)
+			}
+		}
 		if !a.rewriteAST(node, el, func(idx int) replacerFunc {
 			return func(newNode, parent AST) {
 				parent.(*RefSliceContainer).ASTElements[idx] = newNode.(AST)
@@ -299,7 +353,17 @@ func (a *application) rewriteRefOfRefSliceContainer(parent AST, node *RefSliceCo
 			return false
 		}
 	}
+	if a.collectPaths && len(node.ASTElements) > 0 {
+		a.cur.current.Pop()
+	}
 	for x, el := range node.ASTImplementationElements {
+		if a.collectPaths {
+			if x == 0 {
+				a.cur.current.AddStepWithOffset(uint16(RefOfRefSliceContainerASTImplementationElementsOffset))
+			} else {
+				a.cur.current.ChangeOffset(x)
+			}
+		}
 		if !a.rewriteRefOfLeaf(node, el, func(idx int) replacerFunc {
 			return func(newNode, parent AST) {
 				parent.(*RefSliceContainer).ASTImplementationElements[idx] = newNode.(*Leaf)
@@ -308,6 +372,9 @@ func (a *application) rewriteRefOfRefSliceContainer(parent AST, node *RefSliceCo
 			return false
 		}
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+	}
 	if a.post != nil {
 		a.cur.replacer = replacer
 		a.cur.parent = parent
@@ -318,6 +385,8 @@ func (a *application) rewriteRefOfRefSliceContainer(parent AST, node *RefSliceCo
 	}
 	return true
 }
+
+// Function Generation Source: PtrToStructMethod
 func (a *application) rewriteRefOfSubImpl(parent AST, node *SubImpl, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -335,11 +404,17 @@ func (a *application) rewriteRefOfSubImpl(parent AST, node *SubImpl, replacer re
 			return true
 		}
 	}
+	if a.collectPaths {
+		a.cur.current.AddStep(uint16(RefOfSubImplinner))
+	}
 	if !a.rewriteSubIface(node, node.inner, func(newNode, parent AST) {
 		parent.(*SubImpl).inner = newNode.(SubIface)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+	}
 	if a.post != nil {
 		a.cur.replacer = replacer
 		a.cur.parent = parent
@@ -350,6 +425,8 @@ func (a *application) rewriteRefOfSubImpl(parent AST, node *SubImpl, replacer re
 	}
 	return true
 }
+
+// Function Generation Source: StructMethod
 func (a *application) rewriteValueContainer(parent AST, node ValueContainer, replacer replacerFunc) bool {
 	if a.pre != nil {
 		a.cur.replacer = replacer
@@ -364,16 +441,26 @@ func (a *application) rewriteValueContainer(parent AST, node ValueContainer, rep
 			return true
 		}
 	}
+	if a.collectPaths {
+		a.cur.current.AddStep(uint16(ValueContainerASTType))
+	}
 	if !a.rewriteAST(node, node.ASTType, func(newNode, parent AST) {
 		panic("[BUG] tried to replace 'ASTType' on 'ValueContainer'")
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+		a.cur.current.AddStep(uint16(ValueContainerASTImplementationType))
+	}
 	if !a.rewriteRefOfLeaf(node, node.ASTImplementationType, func(newNode, parent AST) {
 		panic("[BUG] tried to replace 'ASTImplementationType' on 'ValueContainer'")
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+	}
 	if a.post != nil {
 		a.cur.replacer = replacer
 		a.cur.parent = parent
@@ -384,6 +471,8 @@ func (a *application) rewriteValueContainer(parent AST, node ValueContainer, rep
 	}
 	return true
 }
+
+// Function Generation Source: StructMethod
 func (a *application) rewriteValueSliceContainer(parent AST, node ValueSliceContainer, replacer replacerFunc) bool {
 	if a.pre != nil {
 		a.cur.replacer = replacer
@@ -398,19 +487,31 @@ func (a *application) rewriteValueSliceContainer(parent AST, node ValueSliceCont
 			return true
 		}
 	}
-	for _, el := range node.ASTElements {
+	for x, el := range node.ASTElements {
+		if a.collectPaths {
+			if x == 0 {
+				a.cur.current.AddStepWithOffset(uint16(ValueSliceContainerASTElementsOffset))
+			} else {
+				a.cur.current.ChangeOffset(x)
+			}
+		}
 		if !a.rewriteAST(node, el, func(newNode, parent AST) {
 			panic("[BUG] tried to replace 'ASTElements' on 'ValueSliceContainer'")
 		}) {
 			return false
 		}
 	}
-	for _, el := range node.ASTImplementationElements {
-		if !a.rewriteRefOfLeaf(node, el, func(newNode, parent AST) {
-			panic("[BUG] tried to replace 'ASTImplementationElements' on 'ValueSliceContainer'")
-		}) {
-			return false
-		}
+	if a.collectPaths && len(node.ASTElements) > 0 {
+		a.cur.current.Pop()
+		a.cur.current.AddStep(uint16(ValueSliceContainerASTImplementationElements))
+	}
+	if !a.rewriteLeafSlice(node, node.ASTImplementationElements, func(newNode, parent AST) {
+		panic("[BUG] tried to replace 'ASTImplementationElements' on 'ValueSliceContainer'")
+	}) {
+		return false
+	}
+	if a.collectPaths {
+		a.cur.current.Pop()
 	}
 	if a.post != nil {
 		a.cur.replacer = replacer
@@ -422,6 +523,8 @@ func (a *application) rewriteValueSliceContainer(parent AST, node ValueSliceCont
 	}
 	return true
 }
+
+// Function Generation Source: InterfaceMethod
 func (a *application) rewriteSubIface(parent AST, node SubIface, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -434,6 +537,8 @@ func (a *application) rewriteSubIface(parent AST, node SubIface, replacer replac
 		return true
 	}
 }
+
+// Function Generation Source: BasicMethod
 func (a *application) rewriteBasicType(parent AST, node BasicType, replacer replacerFunc) bool {
 	if a.pre != nil {
 		a.cur.replacer = replacer
@@ -460,6 +565,8 @@ func (a *application) rewriteBasicType(parent AST, node BasicType, replacer repl
 	}
 	return true
 }
+
+// Function Generation Source: PtrToStructMethod
 func (a *application) rewriteRefOfInterfaceContainer(parent AST, node *InterfaceContainer, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -489,6 +596,8 @@ func (a *application) rewriteRefOfInterfaceContainer(parent AST, node *Interface
 	}
 	return true
 }
+
+// Function Generation Source: PtrToStructMethod
 func (a *application) rewriteRefOfValueContainer(parent AST, node *ValueContainer, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -506,16 +615,26 @@ func (a *application) rewriteRefOfValueContainer(parent AST, node *ValueContaine
 			return true
 		}
 	}
+	if a.collectPaths {
+		a.cur.current.AddStep(uint16(RefOfValueContainerASTType))
+	}
 	if !a.rewriteAST(node, node.ASTType, func(newNode, parent AST) {
 		parent.(*ValueContainer).ASTType = newNode.(AST)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+		a.cur.current.AddStep(uint16(RefOfValueContainerASTImplementationType))
+	}
 	if !a.rewriteRefOfLeaf(node, node.ASTImplementationType, func(newNode, parent AST) {
 		parent.(*ValueContainer).ASTImplementationType = newNode.(*Leaf)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+	}
 	if a.post != nil {
 		a.cur.replacer = replacer
 		a.cur.parent = parent
@@ -526,6 +645,8 @@ func (a *application) rewriteRefOfValueContainer(parent AST, node *ValueContaine
 	}
 	return true
 }
+
+// Function Generation Source: PtrToStructMethod
 func (a *application) rewriteRefOfValueSliceContainer(parent AST, node *ValueSliceContainer, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -544,6 +665,13 @@ func (a *application) rewriteRefOfValueSliceContainer(parent AST, node *ValueSli
 		}
 	}
 	for x, el := range node.ASTElements {
+		if a.collectPaths {
+			if x == 0 {
+				a.cur.current.AddStepWithOffset(uint16(RefOfValueSliceContainerASTElementsOffset))
+			} else {
+				a.cur.current.ChangeOffset(x)
+			}
+		}
 		if !a.rewriteAST(node, el, func(idx int) replacerFunc {
 			return func(newNode, parent AST) {
 				parent.(*ValueSliceContainer).ASTElements[idx] = newNode.(AST)
@@ -552,14 +680,17 @@ func (a *application) rewriteRefOfValueSliceContainer(parent AST, node *ValueSli
 			return false
 		}
 	}
-	for x, el := range node.ASTImplementationElements {
-		if !a.rewriteRefOfLeaf(node, el, func(idx int) replacerFunc {
-			return func(newNode, parent AST) {
-				parent.(*ValueSliceContainer).ASTImplementationElements[idx] = newNode.(*Leaf)
-			}
-		}(x)) {
-			return false
-		}
+	if a.collectPaths && len(node.ASTElements) > 0 {
+		a.cur.current.Pop()
+		a.cur.current.AddStep(uint16(RefOfValueSliceContainerASTImplementationElements))
+	}
+	if !a.rewriteLeafSlice(node, node.ASTImplementationElements, func(newNode, parent AST) {
+		parent.(*ValueSliceContainer).ASTImplementationElements = newNode.(LeafSlice)
+	}) {
+		return false
+	}
+	if a.collectPaths {
+		a.cur.current.Pop()
 	}
 	if a.post != nil {
 		a.cur.replacer = replacer
diff --git a/go/tools/asthelpergen/integration/ast_visit.go b/go/tools/asthelpergen/integration/ast_visit.go
index 6ceec4e2fc5..252541677eb 100644
--- a/go/tools/asthelpergen/integration/ast_visit.go
+++ b/go/tools/asthelpergen/integration/ast_visit.go
@@ -1,5 +1,5 @@
 /*
-Copyright 2023 The Vitess Authors.
+Copyright 2025 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.
@@ -174,10 +174,8 @@ func VisitValueSliceContainer(in ValueSliceContainer, f Visit) error {
 			return err
 		}
 	}
-	for _, el := range in.ASTImplementationElements {
-		if err := VisitRefOfLeaf(el, f); err != nil {
-			return err
-		}
+	if err := VisitLeafSlice(in.ASTImplementationElements, f); err != nil {
+		return err
 	}
 	return nil
 }
@@ -233,10 +231,8 @@ func VisitRefOfValueSliceContainer(in *ValueSliceContainer, f Visit) error {
 			return err
 		}
 	}
-	for _, el := range in.ASTImplementationElements {
-		if err := VisitRefOfLeaf(el, f); err != nil {
-			return err
-		}
+	if err := VisitLeafSlice(in.ASTImplementationElements, f); err != nil {
+		return err
 	}
 	return nil
 }
diff --git a/go/tools/asthelpergen/integration/integration_rewriter_test.go b/go/tools/asthelpergen/integration/integration_rewriter_test.go
index af7483b5916..067417ecbf9 100644
--- a/go/tools/asthelpergen/integration/integration_rewriter_test.go
+++ b/go/tools/asthelpergen/integration/integration_rewriter_test.go
@@ -105,7 +105,8 @@ func TestRewriteVisitValueSliceContainer(t *testing.T) {
 	leaf2 := &Leaf{2}
 	leaf3 := &Leaf{3}
 	leaf4 := &Leaf{4}
-	container := ValueSliceContainer{ASTElements: []AST{leaf1, leaf2}, ASTImplementationElements: []*Leaf{leaf3, leaf4}}
+	ls := LeafSlice{leaf3, leaf4}
+	container := ValueSliceContainer{ASTElements: []AST{leaf1, leaf2}, ASTImplementationElements: ls}
 	containerContainer := ValueSliceContainer{ASTElements: []AST{container}}
 
 	tv := &rewriteTestVisitor{}
@@ -119,10 +120,12 @@ func TestRewriteVisitValueSliceContainer(t *testing.T) {
 		Post{leaf1},
 		Pre{leaf2},
 		Post{leaf2},
+		Pre{ls},
 		Pre{leaf3},
 		Post{leaf3},
 		Pre{leaf4},
 		Post{leaf4},
+		Post{ls},
 		Post{container},
 		Post{containerContainer},
 	})
@@ -402,6 +405,7 @@ func (tv *rewriteTestVisitor) assertEquals(t *testing.T, expected []step) {
 	expectedSize := len(expected)
 	for i, step := range tv.walk {
 		t.Run(fmt.Sprintf("step %d", i), func(t *testing.T) {
+			t.Helper()
 			if expectedSize <= i {
 				t.Fatalf("❌️ - Expected less elements %v", tv.walk[i:])
 			} else {
diff --git a/go/tools/asthelpergen/integration/integration_visit_test.go b/go/tools/asthelpergen/integration/integration_visit_test.go
index 31c0d6451c4..05773e73b8c 100644
--- a/go/tools/asthelpergen/integration/integration_visit_test.go
+++ b/go/tools/asthelpergen/integration/integration_visit_test.go
@@ -100,7 +100,8 @@ func TestVisitValueSliceContainer(t *testing.T) {
 	leaf2 := &Leaf{2}
 	leaf3 := &Leaf{3}
 	leaf4 := &Leaf{4}
-	container := ValueSliceContainer{ASTElements: []AST{leaf1, leaf2}, ASTImplementationElements: []*Leaf{leaf3, leaf4}}
+	ls := LeafSlice{leaf3, leaf4}
+	container := ValueSliceContainer{ASTElements: []AST{leaf1, leaf2}, ASTImplementationElements: ls}
 	containerContainer := ValueSliceContainer{ASTElements: []AST{container}}
 
 	tv := &testVisitor{}
@@ -113,6 +114,7 @@ func TestVisitValueSliceContainer(t *testing.T) {
 		container,
 		leaf1,
 		leaf2,
+		ls,
 		leaf3,
 		leaf4,
 	})
diff --git a/go/tools/asthelpergen/integration/paths.go b/go/tools/asthelpergen/integration/paths.go
new file mode 100644
index 00000000000..c0ac1b588ce
--- /dev/null
+++ b/go/tools/asthelpergen/integration/paths.go
@@ -0,0 +1,43 @@
+/*
+Copyright 2025 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 integration
+
+// This file is a copy of the file go/vt/sqlparser/paths.go
+// We need it here to be able to test the path accumulation of the rewriter
+
+type ASTPath string
+
+// nextPathOffset is an implementation of binary.Uvarint that works directly on
+// the ASTPath without having to cast and allocate a byte slice
+func (path ASTPath) nextPathOffset() (uint64, int) {
+	var x uint64
+	var s uint
+	for i := 0; i < len(path); i++ {
+		b := path[i]
+		if b < 0x80 {
+			return x | uint64(b)<<s, i + 1
+		}
+		x |= uint64(b&0x7f) << s
+		s += 7
+	}
+	return 0, 0
+}
+
+func (path ASTPath) nextPathStep() ASTStep {
+	_ = path[1] // bounds check hint to compiler; see golang.org/issue/14808
+	return ASTStep(uint16(path[1]) | uint16(path[0])<<8)
+}
diff --git a/go/tools/asthelpergen/integration/test_helpers.go b/go/tools/asthelpergen/integration/test_helpers.go
index 9a0cd186c34..f79feff12dc 100644
--- a/go/tools/asthelpergen/integration/test_helpers.go
+++ b/go/tools/asthelpergen/integration/test_helpers.go
@@ -17,7 +17,11 @@ limitations under the License.
 package integration
 
 import (
+	"encoding/binary"
+	"fmt"
 	"strings"
+
+	"vitess.io/vitess/go/vt/sqlparser/pathbuilder"
 )
 
 // ast type helpers
@@ -49,11 +53,15 @@ type Cursor struct {
 	node     AST
 	// marks that the node has been replaced, and the new node should be visited
 	revisit bool
+	current *pathbuilder.ASTPathBuilder
 }
 
 // Node returns the current Node.
 func (c *Cursor) Node() AST { return c.node }
 
+// Path returns the current path of the Node.
+func (c *Cursor) Path() ASTPath { return ASTPath(c.current.ToPath()) }
+
 // Parent returns the parent of the current Node.
 func (c *Cursor) Parent() AST { return c.parent }
 
@@ -91,6 +99,23 @@ func Rewrite(node AST, pre, post ApplyFunc) AST {
 	return outer.AST
 }
 
+func RewriteWithPaths(node AST, pre, post ApplyFunc) AST {
+	outer := &struct{ AST }{node}
+
+	a := &application{
+		pre:          pre,
+		post:         post,
+		collectPaths: true,
+	}
+	a.cur.current = pathbuilder.NewASTPathBuilder()
+
+	a.rewriteAST(outer, node, func(newNode, parent AST) {
+		outer.AST = newNode
+	})
+
+	return outer.AST
+}
+
 type (
 	cow struct {
 		pre    func(node, parent AST) bool
@@ -106,3 +131,47 @@ type (
 func (c *cow) postVisit(a, b AST, d bool) (AST, bool) {
 	return a, d
 }
+
+func (path ASTPath) DebugString() string {
+	var sb strings.Builder
+
+	remaining := []byte(path)
+	stepCount := 0
+
+	for len(remaining) >= 2 {
+		// Read the step code (2 bytes)
+		stepVal := binary.BigEndian.Uint16(remaining[:2])
+		remaining = remaining[2:]
+
+		step := ASTStep(stepVal)
+		stepStr := step.DebugString() // e.g. "CaseExprWhens8" or "CaseExprWhens32"
+
+		// If this isn't the very first step in the path, prepend a separator
+		if stepCount > 0 {
+			sb.WriteString("->")
+		}
+		stepCount++
+
+		// Write the step name
+		sb.WriteString(stepStr)
+
+		// Check suffix to see if we need to read an offset
+		switch {
+		case strings.HasSuffix(stepStr, "Offset"):
+			if len(remaining) < 1 {
+				sb.WriteString("(ERR-no-offset-byte)")
+				return sb.String()
+			}
+			offset, readBytes := binary.Varint(remaining)
+			remaining = remaining[readBytes:]
+			sb.WriteString(fmt.Sprintf("(%d)", offset))
+		}
+	}
+
+	// If there's leftover data that doesn't fit into 2 (or more) bytes, you could note it:
+	if len(remaining) != 0 {
+		sb.WriteString("->(ERR-unaligned-extra-bytes)")
+	}
+
+	return sb.String()
+}
diff --git a/go/tools/asthelpergen/integration/types.go b/go/tools/asthelpergen/integration/types.go
index 921759f3ad1..b190fbb2fcf 100644
--- a/go/tools/asthelpergen/integration/types.go
+++ b/go/tools/asthelpergen/integration/types.go
@@ -24,15 +24,74 @@ import (
 
 //go:generate go run ../main --in . --iface vitess.io/vitess/go/tools/asthelpergen/integration.AST --clone_exclude "*NoCloneType"
 
-// AST is the interface all interface types implement
-type AST interface {
-	String() string
-}
+type (
+	// AST is the interface all interface types implement
+	AST interface {
+		String() string
+	}
+	// Empty struct impl of the iface
+	Leaf struct {
+		v int
+	}
 
-// Empty struct impl of the iface
-type Leaf struct {
-	v int
-}
+	// Options have been added to test the behaviour
+	// of a struct that doesn't implement the AST interface
+	// but includes a field that does.
+	Options struct {
+		a int
+		b string
+		l *Leaf
+	}
+
+	// Container implements the interface ByRef
+	RefContainer struct {
+		ASTType               AST
+		NotASTType            int
+		Opts                  []*Options
+		ASTImplementationType *Leaf
+	}
+	// Container implements the interface ByRef
+	RefSliceContainer struct {
+		something                 int // want a non-AST field first
+		ASTElements               []AST
+		NotASTElements            []int
+		ASTImplementationElements []*Leaf
+	}
+	// Container implements the interface ByValue
+	ValueContainer struct {
+		ASTType               AST
+		NotASTType            int
+		ASTImplementationType *Leaf
+	}
+	// Container implements the interface ByValue
+	ValueSliceContainer struct {
+		ASTElements               []AST
+		NotASTElements            []int
+		ASTImplementationElements LeafSlice
+	}
+	// We need to support these types - a slice of AST elements can implement the interface
+	InterfaceSlice []AST
+	// We need to support these types - a slice of AST elements can implement the interface
+	Bytes       []byte
+	LeafSlice   []*Leaf
+	BasicType   int
+	NoCloneType struct {
+		v int
+	}
+	// We want to support all types that are used as field types, which can include interfaces.
+	// Example would be sqlparser.Expr that implements sqlparser.SQLNode
+	SubIface interface {
+		AST
+		iface()
+	}
+	SubImpl struct {
+		inner SubIface
+		field *bool
+	}
+	InterfaceContainer struct {
+		v any
+	}
+)
 
 func (l *Leaf) String() string {
 	if l == nil {
@@ -41,13 +100,6 @@ func (l *Leaf) String() string {
 	return fmt.Sprintf("Leaf(%d)", l.v)
 }
 
-// Container implements the interface ByRef
-type RefContainer struct {
-	ASTType               AST
-	NotASTType            int
-	ASTImplementationType *Leaf
-}
-
 func (r *RefContainer) String() string {
 	if r == nil {
 		return "nil"
@@ -61,42 +113,18 @@ func (r *RefContainer) String() string {
 	return fmt.Sprintf("RefContainer{%s, %d, %s}", astType, r.NotASTType, r.ASTImplementationType.String())
 }
 
-// Container implements the interface ByRef
-type RefSliceContainer struct {
-	ASTElements               []AST
-	NotASTElements            []int
-	ASTImplementationElements []*Leaf
-}
-
 func (r *RefSliceContainer) String() string {
 	return fmt.Sprintf("RefSliceContainer{%s, %s, %s}", sliceStringAST(r.ASTElements...), "r.NotASTType", sliceStringLeaf(r.ASTImplementationElements...))
 }
 
-// Container implements the interface ByValue
-type ValueContainer struct {
-	ASTType               AST
-	NotASTType            int
-	ASTImplementationType *Leaf
-}
-
 func (r ValueContainer) String() string {
 	return fmt.Sprintf("ValueContainer{%s, %d, %s}", r.ASTType.String(), r.NotASTType, r.ASTImplementationType.String())
 }
 
-// Container implements the interface ByValue
-type ValueSliceContainer struct {
-	ASTElements               []AST
-	NotASTElements            []int
-	ASTImplementationElements []*Leaf
-}
-
 func (r ValueSliceContainer) String() string {
 	return fmt.Sprintf("ValueSliceContainer{%s, %s, %s}", sliceStringAST(r.ASTElements...), "r.NotASTType", sliceStringLeaf(r.ASTImplementationElements...))
 }
 
-// We need to support these types - a slice of AST elements can implement the interface
-type InterfaceSlice []AST
-
 func (r InterfaceSlice) String() string {
 	var elements []string
 	for _, el := range r {
@@ -106,15 +134,10 @@ func (r InterfaceSlice) String() string {
 	return "[" + strings.Join(elements, ", ") + "]"
 }
 
-// We need to support these types - a slice of AST elements can implement the interface
-type Bytes []byte
-
 func (r Bytes) String() string {
 	return string(r)
 }
 
-type LeafSlice []*Leaf
-
 func (r LeafSlice) String() string {
 	var elements []string
 	for _, el := range r {
@@ -123,8 +146,6 @@ func (r LeafSlice) String() string {
 	return strings.Join(elements, ", ")
 }
 
-type BasicType int
-
 func (r BasicType) String() string {
 	return fmt.Sprintf("int(%d)", r)
 }
@@ -135,35 +156,15 @@ const (
 	thisIsNotAType2 BasicType = 2
 )
 
-// We want to support all types that are used as field types, which can include interfaces.
-// Example would be sqlparser.Expr that implements sqlparser.SQLNode
-type SubIface interface {
-	AST
-	iface()
-}
-
-type SubImpl struct {
-	inner SubIface
-	field *bool
-}
-
 func (r *SubImpl) String() string {
 	return "SubImpl"
 }
 func (r *SubImpl) iface() {}
 
-type InterfaceContainer struct {
-	v any
-}
-
 func (r InterfaceContainer) String() string {
 	return fmt.Sprintf("%v", r.v)
 }
 
-type NoCloneType struct {
-	v int
-}
-
 func (r *NoCloneType) String() string {
 	return fmt.Sprintf("NoClone(%d)", r.v)
 }
@@ -171,8 +172,9 @@ func (r *NoCloneType) String() string {
 type Visit func(node AST) (bool, error)
 
 type application struct {
-	pre, post ApplyFunc
-	cur       Cursor
+	pre, post    ApplyFunc
+	cur          Cursor
+	collectPaths bool
 }
 
 var Equals = &Comparator{}
diff --git a/go/tools/asthelpergen/paths_gen.go b/go/tools/asthelpergen/paths_gen.go
new file mode 100644
index 00000000000..d5d114e2554
--- /dev/null
+++ b/go/tools/asthelpergen/paths_gen.go
@@ -0,0 +1,266 @@
+/*
+Copyright 2025 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 asthelpergen
+
+import (
+	"fmt"
+	"go/types"
+
+	"github.com/dave/jennifer/jen"
+)
+
+type (
+	pathGen struct {
+		file      *jen.File
+		steps     []step
+		ifaceName string
+	}
+	step struct {
+		container types.Type // the type of the container
+		typ       types.Type // the type of the field
+		name      string     // the name of the field
+		slice     bool       // whether the field is a slice
+	}
+)
+
+const sliceMarker = " -SLICE- "
+
+var _ generator = (*pathGen)(nil)
+
+func newPathGen(pkgname, ifaceName string) *pathGen {
+	file := jen.NewFile(pkgname)
+	file.HeaderComment(licenseFileHeader)
+	file.HeaderComment("Code generated by ASTHelperGen. DO NOT EDIT.")
+
+	return &pathGen{
+		file:      file,
+		ifaceName: ifaceName,
+	}
+}
+
+func (s step) AsEnum() string {
+	if s.name == sliceMarker {
+		return printableTypeName(s.container)
+	}
+	return printableTypeName(s.container) + s.name
+}
+
+func (p *pathGen) genFile(spi generatorSPI) (string, *jen.File) {
+	p.file.ImportName("fmt", "fmt")
+
+	// Declare the ASTStep type with underlying type uint16
+	p.file.Add(jen.Type().Id("ASTStep").Uint16())
+
+	// Add the const block
+	p.file.Add(p.buildConstWithEnum())
+
+	// Add the ASTStep#DebugString() method to the file
+	p.file.Add(p.debugString())
+
+	// Add the generated GetNodeFromPath method
+	p.file.Add(p.generateGetNodeFromPath(spi))
+
+	return "ast_path.go", p.file
+}
+
+func (p *pathGen) interfaceMethod(t types.Type, iface *types.Interface, spi generatorSPI) error {
+	return nil
+}
+
+func (p *pathGen) structMethod(t types.Type, strct *types.Struct, spi generatorSPI) error {
+	p.addStructFields(t, strct, spi)
+	return nil
+}
+
+func (p *pathGen) ptrToStructMethod(t types.Type, strct *types.Struct, spi generatorSPI) error {
+	p.addStructFields(t, strct, spi)
+	return nil
+}
+
+func (p *pathGen) addStep(
+	container types.Type, // the name of the container type
+	typ types.Type, // the type of the field
+	name string, // the name of the field
+	slice bool, // whether the field is a slice
+) {
+	s := step{
+		container: container,
+		name:      name,
+		typ:       typ,
+		slice:     slice,
+	}
+	p.steps = append(p.steps, s)
+
+}
+
+func (p *pathGen) addStructFields(t types.Type, strct *types.Struct, spi generatorSPI) {
+	val := types.TypeString(t, noQualifier)
+	_ = val
+	for i := 0; i < strct.NumFields(); i++ {
+		field := strct.Field(i)
+		// Check if the field type implements the interface
+		if types.Implements(field.Type(), spi.iface()) {
+			p.addStep(t, field.Type(), field.Name(), false)
+			continue
+		}
+		// Check if the field type is a slice
+		slice, isSlice := field.Type().(*types.Slice)
+		if isSlice {
+			// Check if the slice type implements the interface
+			if types.Implements(slice, spi.iface()) {
+				p.addStep(t, slice, field.Name(), true)
+			} else if types.Implements(slice.Elem(), spi.iface()) {
+				// Check if the element type of the slice implements the interface
+				p.addStep(t, slice.Elem(), field.Name(), true)
+			}
+		}
+	}
+}
+
+func (p *pathGen) ptrToBasicMethod(t types.Type, basic *types.Basic, spi generatorSPI) error {
+	return nil
+}
+
+func (p *pathGen) sliceMethod(t types.Type, slice *types.Slice, spi generatorSPI) error {
+	elemType := slice.Elem()
+	if types.Implements(elemType, spi.iface()) {
+		p.addStep(t, elemType, sliceMarker, true)
+	}
+
+	return nil
+}
+
+func (p *pathGen) basicMethod(t types.Type, basic *types.Basic, spi generatorSPI) error {
+	return nil
+}
+
+func (p *pathGen) debugString() *jen.Statement {
+	var switchCases []jen.Code
+
+	for _, step := range p.steps {
+		stepName := step.AsEnum()
+
+		// Generate the debug string using the helper function
+		var debugStr string
+		if step.name == sliceMarker {
+			debugStr = fmt.Sprintf("(%s)[]", types.TypeString(step.container, noQualifier))
+		} else {
+			debugStr = fmt.Sprintf("(%s).%s", types.TypeString(step.container, noQualifier), step.name)
+		}
+
+		if !step.slice {
+			switchCases = append(switchCases, jen.Case(jen.Id(stepName)).Block(
+				jen.Return(jen.Lit(debugStr)),
+			))
+			continue
+		}
+
+		switchCases = append(switchCases, jen.Case(jen.Id(stepName+"Offset")).Block(
+			jen.Return(jen.Lit(debugStr+"Offset")),
+		))
+
+	}
+
+	debugStringMethod := jen.Func().Params(jen.Id("s").Id("ASTStep")).Id("DebugString").Params().String().Block(
+		jen.Switch(jen.Id("s")).Block(switchCases...),
+		jen.Panic(jen.Lit("unknown ASTStep")),
+	)
+	return debugStringMethod
+}
+
+func (p *pathGen) buildConstWithEnum() *jen.Statement {
+	// Create the const block with all step constants
+	var constDefs []jen.Code
+	addStep := func(step string) {
+		if constDefs == nil {
+			// Use iota for the first constant
+			constDefs = append(constDefs, jen.Id(step).Id("ASTStep").Op("=").Id("iota"))
+			return
+		}
+
+		constDefs = append(constDefs, jen.Id(step))
+	}
+	for _, step := range p.steps {
+		stepName := step.AsEnum()
+		if step.slice {
+			addStep(stepName + "Offset")
+			continue
+		}
+
+		addStep(stepName)
+	}
+
+	constBlock := jen.Const().Defs(constDefs...)
+	return constBlock
+}
+
+func (p *pathGen) generateGetNodeFromPath(spi generatorSPI) *jen.Statement {
+	method := jen.Func().Id("GetNodeFromPath").Params(
+		jen.Id("node").Id(p.ifaceName),
+		jen.Id("path").Id("ASTPath"),
+	).Id(p.ifaceName).Block(
+		jen.For(jen.Len(jen.Id("path")).Op(">=").Lit(2)).Block(
+			jen.Id("step").Op(":=").Id("path").Dot("nextPathStep").Call(),
+			jen.Id("path").Op("=").Id("path[2:]"),
+			jen.Switch(jen.Id("step")).Block(p.generateWalkCases(spi)...),
+		),
+		jen.Return(jen.Id("node")), // Fallback return
+	)
+	return method
+}
+
+func (p *pathGen) generateWalkCases(spi generatorSPI) []jen.Code {
+	var cases []jen.Code
+
+	for _, step := range p.steps {
+		stepName := step.AsEnum()
+
+		// Check if the type implements the interface
+		if !types.Implements(step.container, spi.iface()) {
+			continue
+		}
+
+		if !step.slice {
+			// return GetNodeFromPath(node.(*RefContainer).ASTType, path)
+			t := types.TypeString(step.container, noQualifier)
+
+			cases = append(cases, jen.Case(jen.Id(stepName)).Block(
+				jen.Id("node").Op("=").Id("node").Dot(fmt.Sprintf("(%s)", t)).Dot(step.name),
+			))
+			continue
+		}
+
+		var assignNode jen.Code
+		t := types.TypeString(step.container, noQualifier)
+		if step.name == sliceMarker {
+			assignNode = jen.Id("node").Dot(fmt.Sprintf("(%s)", t)).Index(jen.Id("idx"))
+		} else {
+			assignNode = jen.Id("node").Dot(fmt.Sprintf("(%s)", t)).Dot(step.name).Index(jen.Id("idx"))
+		}
+
+		cases = append(cases, jen.Case(jen.Id(stepName+"Offset")).Block(
+			jen.Id("idx, bytesRead").Op(":=").Id("path").Dot("nextPathOffset").Call(),
+			jen.Id("path").Op("=").Id("path[bytesRead:]"),
+			jen.Id("node").Op("=").Add(assignNode),
+		))
+	}
+
+	cases = append(cases, jen.Default().Block(
+		jen.Return(jen.Nil()),
+	))
+	return cases
+}
diff --git a/go/tools/asthelpergen/rewrite_gen.go b/go/tools/asthelpergen/rewrite_gen.go
index 29ffcee3d5b..52b476a7c9d 100644
--- a/go/tools/asthelpergen/rewrite_gen.go
+++ b/go/tools/asthelpergen/rewrite_gen.go
@@ -45,7 +45,7 @@ func newRewriterGen(pkgname string, ifaceName string) *rewriteGen {
 	}
 }
 
-func (r *rewriteGen) genFile() (string, *jen.File) {
+func (r *rewriteGen) genFile(generatorSPI) (string, *jen.File) {
 	return "ast_rewrite.go", r.file
 }
 
@@ -95,22 +95,29 @@ func (r *rewriteGen) interfaceMethod(t types.Type, iface *types.Interface, spi g
 		cases...,
 	)))
 
-	r.rewriteFunc(t, stmts)
+	r.rewriteFunc(t, stmts, "InterfaceMethod")
 	return nil
 }
 
+func (r *rewriteGen) visitStructFields(t types.Type, strct *types.Struct, spi generatorSPI, fail bool) (stmts []jen.Code) {
+	fields := r.rewriteAllStructFields(t, strct, spi, fail)
+	stmts = append(stmts, r.executePre())
+	stmts = append(stmts, fields...)
+
+	if len(fields) > 0 {
+		stmts = append(stmts, jen.If(jen.Id("a.collectPaths")).Block(jen.Id("a.cur.current.Pop").Params()))
+	}
+	stmts = append(stmts, executePost(len(fields) > 0))
+	stmts = append(stmts, returnTrue())
+	return
+}
+
 func (r *rewriteGen) structMethod(t types.Type, strct *types.Struct, spi generatorSPI) error {
 	if !shouldAdd(t, spi.iface()) {
 		return nil
 	}
-	fields := r.rewriteAllStructFields(t, strct, spi, true)
-
-	stmts := []jen.Code{r.executePre()}
-	stmts = append(stmts, fields...)
-	stmts = append(stmts, executePost(len(fields) > 0))
-	stmts = append(stmts, returnTrue())
 
-	r.rewriteFunc(t, stmts)
+	r.rewriteFunc(t, r.visitStructFields(t, strct, spi, true), "StructMethod")
 
 	return nil
 }
@@ -124,19 +131,9 @@ func (r *rewriteGen) ptrToStructMethod(t types.Type, strct *types.Struct, spi ge
 		if node == nil { return nil }
 	*/
 	stmts := []jen.Code{jen.If(jen.Id("node == nil").Block(returnTrue()))}
+	stmts = append(stmts, r.visitStructFields(t, strct, spi, false)...)
 
-	/*
-		if !pre(&cur) {
-			return nil
-		}
-	*/
-	stmts = append(stmts, r.executePre())
-	fields := r.rewriteAllStructFields(t, strct, spi, false)
-	stmts = append(stmts, fields...)
-	stmts = append(stmts, executePost(len(fields) > 0))
-	stmts = append(stmts, returnTrue())
-
-	r.rewriteFunc(t, stmts)
+	r.rewriteFunc(t, stmts, "PtrToStructMethod")
 
 	return nil
 }
@@ -146,13 +143,10 @@ func (r *rewriteGen) ptrToBasicMethod(t types.Type, _ *types.Basic, spi generato
 		return nil
 	}
 
-	/*
-	 */
-
 	stmts := []jen.Code{
 		jen.Comment("ptrToBasicMethod"),
 	}
-	r.rewriteFunc(t, stmts)
+	r.rewriteFunc(t, stmts, "PtrToBasicMethod")
 
 	return nil
 }
@@ -189,29 +183,41 @@ func (r *rewriteGen) sliceMethod(t types.Type, slice *types.Slice, spi generator
 		jen.If(jen.Id("kontinue").Block(jen.Return(jen.True()))),
 	)
 
-	stmts = append(stmts, jen.If(jen.Id("a.pre!= nil").Block(preStmts...)))
+	stmts = append(stmts,
+		jen.If(jen.Id("a.pre != nil").Block(preStmts...)),
+	)
 
 	haveChildren := false
 	if shouldAdd(slice.Elem(), spi.iface()) {
 		/*
+			var path ASTPath
+			if a.collectPaths {
+			  path = a.cur.current
+			}
 			for i, el := range node {
-						if err := rewriteRefOfLeaf(node, el, func(newNode, parent AST) {
-							parent.(LeafSlice)[i] = newNode.(*Leaf)
-						}, pre, post); err != nil {
-							return err
-						}
-					}
+				if err := rewriteRefOfLeaf(node, el, func(newNode, parent AST) {
+					parent.(LeafSlice)[i] = newNode.(*Leaf)
+				}, pre, post); err != nil {
+					return err
+				}
+			}
 		*/
 		haveChildren = true
+		rewriteChild := r.rewriteChildSlice(t, slice.Elem(), "", jen.Id("el"), jen.Index(jen.Id("idx")), false)
+
 		stmts = append(stmts,
 			jen.For(jen.Id("x, el").Op(":=").Id("range node")).
-				Block(r.rewriteChildSlice(t, slice.Elem(), "notUsed", jen.Id("el"), jen.Index(jen.Id("idx")), false)))
+				Block(rewriteChild...))
+	}
+
+	if haveChildren {
+		stmts = append(stmts, jen.If(jen.Id("a.collectPaths").Op("&&").Len(jen.Id("node")).Op(">").Lit(0)).Block(jen.Id("a.cur.current.Pop").Params()))
 	}
 
 	stmts = append(stmts, executePost(haveChildren))
 	stmts = append(stmts, returnTrue())
 
-	r.rewriteFunc(t, stmts)
+	r.rewriteFunc(t, stmts, "SliceMethod")
 	return nil
 }
 
@@ -233,7 +239,7 @@ func (r *rewriteGen) executePre() jen.Code {
 		)),
 		jen.If(jen.Id("kontinue").Block(jen.Return(jen.True()))),
 	)
-	return jen.If(jen.Id("a.pre!= nil").Block(curStmts...))
+	return jen.If(jen.Id("a.pre != nil").Block(curStmts...))
 }
 
 func executePost(seenChildren bool) jen.Code {
@@ -257,11 +263,11 @@ func (r *rewriteGen) basicMethod(t types.Type, _ *types.Basic, spi generatorSPI)
 	}
 
 	stmts := []jen.Code{r.executePre(), executePost(false), returnTrue()}
-	r.rewriteFunc(t, stmts)
+	r.rewriteFunc(t, stmts, "BasicMethod")
 	return nil
 }
 
-func (r *rewriteGen) rewriteFunc(t types.Type, stmts []jen.Code) {
+func (r *rewriteGen) rewriteFunc(t types.Type, stmts []jen.Code, source string) {
 
 	/*
 		func (a *application) rewriteNodeType(parent AST, node NodeType, replacer replacerFunc) {
@@ -269,7 +275,7 @@ func (r *rewriteGen) rewriteFunc(t types.Type, stmts []jen.Code) {
 
 	typeString := types.TypeString(t, noQualifier)
 	funcName := fmt.Sprintf("%s%s", rewriteName, printableTypeName(t))
-	code := jen.Func().Params(
+	code := jen.Commentf("Function Generation Source: %s", source).Line().Func().Params(
 		jen.Id("a").Op("*").Id("application"),
 	).Id(funcName).Params(
 		jen.Id(fmt.Sprintf("parent %s, node %s, replacer replacerFunc", r.ifaceName, typeString)),
@@ -288,23 +294,36 @@ func (r *rewriteGen) rewriteAllStructFields(t types.Type, strct *types.Struct, s
 
 	*/
 	var output []jen.Code
+	fieldNumber := 0
+	prevSliceField := ""
 	for i := 0; i < strct.NumFields(); i++ {
 		field := strct.Field(i)
 		if types.Implements(field.Type(), spi.iface()) {
 			spi.addType(field.Type())
-			output = append(output, r.rewriteChild(t, field.Type(), field.Name(), jen.Id("node").Dot(field.Name()), jen.Dot(field.Name()), fail))
+			rewriteLines := r.rewriteChild(t, field.Type(), field.Name(), jen.Id("node").Dot(field.Name()), jen.Dot(field.Name()), fail, fieldNumber == 0, prevSliceField)
+			prevSliceField = ""
+			output = append(output, rewriteLines...)
+			fieldNumber++
 			continue
 		}
 		slice, isSlice := field.Type().(*types.Slice)
 		if isSlice && types.Implements(slice.Elem(), spi.iface()) {
-			spi.addType(slice.Elem())
-			id := jen.Id("x")
-			if fail {
-				id = jen.Id("_")
+			ifCondition := jen.Id("a.collectPaths")
+			if prevSliceField != "" {
+				ifCondition = ifCondition.Op("&&").Len(jen.Id("node." + prevSliceField)).Op(">").Lit(0)
 			}
+			ifCollectPath := jen.If(ifCondition).Block(
+				jen.Id("a.cur.current.Pop").Params(),
+			)
+			if fieldNumber != 0 {
+				output = append(output, ifCollectPath)
+			}
+			prevSliceField = field.Name()
+			spi.addType(slice.Elem())
 			output = append(output,
-				jen.For(jen.List(id, jen.Id("el")).Op(":=").Id("range node."+field.Name())).
-					Block(r.rewriteChildSlice(t, slice.Elem(), field.Name(), jen.Id("el"), jen.Dot(field.Name()).Index(jen.Id("idx")), fail)))
+				jen.For(jen.List(jen.Id("x"), jen.Id("el")).Op(":=").Id("range node."+field.Name())).
+					Block(r.rewriteChildSlice(t, slice.Elem(), field.Name(), jen.Id("el"), jen.Dot(field.Name()).Index(jen.Id("idx")), fail)...))
+			fieldNumber++
 		}
 	}
 	return output
@@ -315,7 +334,7 @@ func failReplacer(t types.Type, f string) *jen.Statement {
 	return jen.Panic(jen.Lit(fmt.Sprintf("[BUG] tried to replace '%s' on '%s'", f, typeString)))
 }
 
-func (r *rewriteGen) rewriteChild(t, field types.Type, fieldName string, param jen.Code, replace jen.Code, fail bool) jen.Code {
+func (r *rewriteGen) rewriteChild(t, field types.Type, fieldName string, param jen.Code, replace jen.Code, fail, firstChild bool, prevSliceField string) []jen.Code {
 	/*
 		if errF := rewriteAST(node, node.ASTType, func(newNode, parent AST) {
 			parent.(*RefContainer).ASTType = newNode.(AST)
@@ -351,10 +370,27 @@ func (r *rewriteGen) rewriteChild(t, field types.Type, fieldName string, param j
 			param,
 			funcBlock).Block(returnFalse()))
 
-	return rewriteField
+	collectPathBlock := []jen.Code{
+		jen.Id("a.cur.current.AddStep").Params(jen.Id("uint16").Params(jen.Id(printableTypeName(t) + fieldName))),
+	}
+	if !firstChild {
+		collectPathBlock = append([]jen.Code{jen.Id("a.cur.current.Pop").Params()}, collectPathBlock...)
+	}
+	ifCondition := jen.Id("a.collectPaths")
+	if prevSliceField != "" {
+		ifCondition = ifCondition.Op("&&").Len(jen.Id("node." + prevSliceField)).Op(">").Lit(0)
+	}
+	ifCollectPath := jen.If(ifCondition).Block(
+		collectPathBlock...,
+	)
+
+	return []jen.Code{
+		ifCollectPath,
+		rewriteField,
+	}
 }
 
-func (r *rewriteGen) rewriteChildSlice(t, field types.Type, fieldName string, param jen.Code, replace jen.Code, fail bool) jen.Code {
+func (r *rewriteGen) rewriteChildSlice(t, field types.Type, fieldName string, param jen.Code, replace jen.Code, fail bool) []jen.Code {
 	/*
 				if errF := a.rewriteAST(node, el, func(idx int) replacerFunc {
 				return func(newNode, parent AST) {
@@ -390,7 +426,25 @@ func (r *rewriteGen) rewriteChildSlice(t, field types.Type, fieldName string, pa
 			param,
 			funcBlock).Block(returnFalse()))
 
-	return rewriteField
+	// if a.collectPaths {
+	//   if x == 0 {
+	//        a.cur.current.AddStepWithOffset(LeafSliceOffset)
+	//   } else {
+	//        a.cur.current.ChangeOffset(x)
+	//   }
+	// }
+	savePath := jen.If(jen.Id("a.collectPaths")).Block(
+		jen.If(jen.Id("x").Op("==").Lit(0)).Block(
+			jen.Id("a.cur.current.AddStepWithOffset").Params(jen.Id("uint16").Params(jen.Id(printableTypeName(t) + fieldName + "Offset"))),
+		).Else().Block(
+			jen.Id("a.cur.current.ChangeOffset").Params(jen.Id("x")),
+		),
+	)
+
+	return []jen.Code{
+		savePath,
+		rewriteField,
+	}
 }
 
 var noQualifier = func(p *types.Package) string {
diff --git a/go/tools/asthelpergen/visit_gen.go b/go/tools/asthelpergen/visit_gen.go
index 51d8651f090..dca2cfcd0f0 100644
--- a/go/tools/asthelpergen/visit_gen.go
+++ b/go/tools/asthelpergen/visit_gen.go
@@ -40,7 +40,7 @@ func newVisitGen(pkgname string) *visitGen {
 	}
 }
 
-func (v *visitGen) genFile() (string, *jen.File) {
+func (v *visitGen) genFile(generatorSPI) (string, *jen.File) {
 	return "ast_visit.go", v.file
 }
 
@@ -220,7 +220,8 @@ func visitAllStructFields(strct *types.Struct, spi generatorSPI) []jen.Code {
 	output := []jen.Code{
 		visitIn(),
 	}
-	for i := 0; i < strct.NumFields(); i++ {
+
+	for i := range strct.NumFields() {
 		field := strct.Field(i)
 		if types.Implements(field.Type(), spi.iface()) {
 			spi.addType(field.Type())
diff --git a/go/vt/sqlparser/ast_clone.go b/go/vt/sqlparser/ast_clone.go
index 997485e086c..9d476801eaf 100644
--- a/go/vt/sqlparser/ast_clone.go
+++ b/go/vt/sqlparser/ast_clone.go
@@ -1,5 +1,5 @@
 /*
-Copyright 2023 The Vitess Authors.
+Copyright 2025 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.
diff --git a/go/vt/sqlparser/ast_copy_on_rewrite.go b/go/vt/sqlparser/ast_copy_on_rewrite.go
index 46ce38ee29d..dee416599e6 100644
--- a/go/vt/sqlparser/ast_copy_on_rewrite.go
+++ b/go/vt/sqlparser/ast_copy_on_rewrite.go
@@ -1,5 +1,5 @@
 /*
-Copyright 2023 The Vitess Authors.
+Copyright 2025 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.
diff --git a/go/vt/sqlparser/ast_equals.go b/go/vt/sqlparser/ast_equals.go
index 2795daab2c5..1e5fbb1f6d3 100644
--- a/go/vt/sqlparser/ast_equals.go
+++ b/go/vt/sqlparser/ast_equals.go
@@ -1,5 +1,5 @@
 /*
-Copyright 2023 The Vitess Authors.
+Copyright 2025 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.
diff --git a/go/vt/sqlparser/ast_path.go b/go/vt/sqlparser/ast_path.go
new file mode 100644
index 00000000000..0218f7ca9e9
--- /dev/null
+++ b/go/vt/sqlparser/ast_path.go
@@ -0,0 +1,2777 @@
+/*
+Copyright 2025 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.
+*/
+// Code generated by ASTHelperGen. DO NOT EDIT.
+
+package sqlparser
+
+type ASTStep uint16
+
+const (
+	RefOfAddColumnsColumnsOffset ASTStep = iota
+	RefOfAddColumnsAfter
+	RefOfAddConstraintDefinitionConstraintDefinition
+	RefOfAddIndexDefinitionIndexDefinition
+	RefOfAliasedExprExpr
+	RefOfAliasedExprAs
+	RefOfAliasedTableExprExpr
+	RefOfAliasedTableExprPartitions
+	RefOfAliasedTableExprAs
+	RefOfAliasedTableExprHints
+	RefOfAliasedTableExprColumns
+	RefOfAlterCheckName
+	RefOfAlterColumnColumn
+	RefOfAlterColumnDefaultVal
+	RefOfAlterDatabaseComments
+	RefOfAlterDatabaseDBName
+	RefOfAlterIndexName
+	RefOfAlterMigrationRatio
+	RefOfAlterTableTable
+	RefOfAlterTableAlterOptionsOffset
+	RefOfAlterTablePartitionSpec
+	RefOfAlterTablePartitionOption
+	RefOfAlterTableComments
+	RefOfAlterViewViewName
+	RefOfAlterViewDefiner
+	RefOfAlterViewColumns
+	RefOfAlterViewSelect
+	RefOfAlterViewComments
+	RefOfAlterVschemaTable
+	RefOfAlterVschemaVindexSpec
+	RefOfAlterVschemaVindexColsOffset
+	RefOfAlterVschemaAutoIncSpec
+	RefOfAnalyzeTable
+	RefOfAndExprLeft
+	RefOfAndExprRight
+	RefOfAnyValueArg
+	RefOfArgumentLessWindowExprOverClause
+	RefOfAssignmentExprLeft
+	RefOfAssignmentExprRight
+	RefOfAutoIncSpecColumn
+	RefOfAutoIncSpecSequence
+	RefOfAvgArg
+	RefOfAvgOverClause
+	RefOfBetweenExprLeft
+	RefOfBetweenExprFrom
+	RefOfBetweenExprTo
+	RefOfBinaryExprLeft
+	RefOfBinaryExprRight
+	RefOfBitAndArg
+	RefOfBitAndOverClause
+	RefOfBitOrArg
+	RefOfBitOrOverClause
+	RefOfBitXorArg
+	RefOfBitXorOverClause
+	RefOfCallProcName
+	RefOfCallProcParamsOffset
+	RefOfCaseExprExpr
+	RefOfCaseExprWhensOffset
+	RefOfCaseExprElse
+	RefOfCastExprExpr
+	RefOfCastExprType
+	RefOfChangeColumnOldColumn
+	RefOfChangeColumnNewColDefinition
+	RefOfChangeColumnAfter
+	RefOfCharExprExprsOffset
+	RefOfCheckConstraintDefinitionExpr
+	RefOfColNameName
+	RefOfColNameQualifier
+	RefOfCollateExprExpr
+	RefOfColumnDefinitionName
+	RefOfColumnDefinitionType
+	ColumnsOffset
+	RefOfCommonTableExprID
+	RefOfCommonTableExprColumns
+	RefOfCommonTableExprSubquery
+	RefOfComparisonExprLeft
+	RefOfComparisonExprRight
+	RefOfComparisonExprEscape
+	RefOfConstraintDefinitionName
+	RefOfConstraintDefinitionDetails
+	RefOfConvertExprExpr
+	RefOfConvertExprType
+	RefOfConvertUsingExprExpr
+	RefOfCountArgsOffset
+	RefOfCountOverClause
+	RefOfCountStarOverClause
+	RefOfCreateDatabaseComments
+	RefOfCreateDatabaseDBName
+	RefOfCreateTableTable
+	RefOfCreateTableTableSpec
+	RefOfCreateTableOptLike
+	RefOfCreateTableComments
+	RefOfCreateViewViewName
+	RefOfCreateViewDefiner
+	RefOfCreateViewColumns
+	RefOfCreateViewSelect
+	RefOfCreateViewComments
+	RefOfCurTimeFuncExprName
+	RefOfDeallocateStmtComments
+	RefOfDeallocateStmtName
+	RefOfDeleteWith
+	RefOfDeleteComments
+	RefOfDeleteTableExprsOffset
+	RefOfDeleteTargets
+	RefOfDeletePartitions
+	RefOfDeleteWhere
+	RefOfDeleteOrderBy
+	RefOfDeleteLimit
+	RefOfDerivedTableSelect
+	RefOfDropColumnName
+	RefOfDropDatabaseComments
+	RefOfDropDatabaseDBName
+	RefOfDropKeyName
+	RefOfDropTableFromTables
+	RefOfDropTableComments
+	RefOfDropViewFromTables
+	RefOfDropViewComments
+	RefOfExecuteStmtName
+	RefOfExecuteStmtComments
+	RefOfExecuteStmtArgumentsOffset
+	RefOfExistsExprSubquery
+	RefOfExplainStmtStatement
+	RefOfExplainStmtComments
+	RefOfExplainTabTable
+	RefOfExprsExprsOffset
+	RefOfExtractFuncExprExpr
+	RefOfExtractValueExprFragment
+	RefOfExtractValueExprXPathExpr
+	RefOfFirstOrLastValueExprExpr
+	RefOfFirstOrLastValueExprNullTreatmentClause
+	RefOfFirstOrLastValueExprOverClause
+	RefOfFlushTableNames
+	RefOfForeignKeyDefinitionSource
+	RefOfForeignKeyDefinitionIndexName
+	RefOfForeignKeyDefinitionReferenceDefinition
+	RefOfFrameClauseStart
+	RefOfFrameClauseEnd
+	RefOfFramePointExpr
+	RefOfFuncExprQualifier
+	RefOfFuncExprName
+	RefOfFuncExprExprsOffset
+	RefOfGTIDFuncExprSet1
+	RefOfGTIDFuncExprSet2
+	RefOfGTIDFuncExprTimeout
+	RefOfGTIDFuncExprChannel
+	RefOfGeoHashFromLatLongExprLatitude
+	RefOfGeoHashFromLatLongExprLongitude
+	RefOfGeoHashFromLatLongExprMaxLength
+	RefOfGeoHashFromPointExprPoint
+	RefOfGeoHashFromPointExprMaxLength
+	RefOfGeoJSONFromGeomExprGeom
+	RefOfGeoJSONFromGeomExprMaxDecimalDigits
+	RefOfGeoJSONFromGeomExprBitmask
+	RefOfGeomCollPropertyFuncExprGeomColl
+	RefOfGeomCollPropertyFuncExprPropertyDefArg
+	RefOfGeomFormatExprGeom
+	RefOfGeomFormatExprAxisOrderOpt
+	RefOfGeomFromGeoHashExprGeoHash
+	RefOfGeomFromGeoHashExprSridOpt
+	RefOfGeomFromGeoJSONExprGeoJSON
+	RefOfGeomFromGeoJSONExprHigherDimHandlerOpt
+	RefOfGeomFromGeoJSONExprSrid
+	RefOfGeomFromTextExprWktText
+	RefOfGeomFromTextExprSrid
+	RefOfGeomFromTextExprAxisOrderOpt
+	RefOfGeomFromWKBExprWkbBlob
+	RefOfGeomFromWKBExprSrid
+	RefOfGeomFromWKBExprAxisOrderOpt
+	RefOfGeomPropertyFuncExprGeom
+	RefOfGroupByExprsOffset
+	RefOfGroupConcatExprExprsOffset
+	RefOfGroupConcatExprOrderBy
+	RefOfGroupConcatExprLimit
+	RefOfIndexDefinitionInfo
+	RefOfIndexHintIndexesOffset
+	IndexHintsOffset
+	RefOfIndexInfoName
+	RefOfIndexInfoConstraintName
+	RefOfInsertComments
+	RefOfInsertTable
+	RefOfInsertPartitions
+	RefOfInsertColumns
+	RefOfInsertRows
+	RefOfInsertRowAlias
+	RefOfInsertOnDup
+	RefOfInsertExprStr
+	RefOfInsertExprPos
+	RefOfInsertExprLen
+	RefOfInsertExprNewStr
+	RefOfIntervalDateExprDate
+	RefOfIntervalDateExprInterval
+	RefOfIntervalFuncExprExpr
+	RefOfIntervalFuncExprExprsOffset
+	RefOfIntroducerExprExpr
+	RefOfIsExprLeft
+	RefOfJSONArrayAggExpr
+	RefOfJSONArrayAggOverClause
+	RefOfJSONArrayExprParamsOffset
+	RefOfJSONAttributesExprJSONDoc
+	RefOfJSONAttributesExprPath
+	RefOfJSONContainsExprTarget
+	RefOfJSONContainsExprCandidate
+	RefOfJSONContainsExprPathListOffset
+	RefOfJSONContainsPathExprJSONDoc
+	RefOfJSONContainsPathExprOneOrAll
+	RefOfJSONContainsPathExprPathListOffset
+	RefOfJSONExtractExprJSONDoc
+	RefOfJSONExtractExprPathListOffset
+	RefOfJSONKeysExprJSONDoc
+	RefOfJSONKeysExprPath
+	RefOfJSONObjectAggKey
+	RefOfJSONObjectAggValue
+	RefOfJSONObjectAggOverClause
+	RefOfJSONObjectExprParamsOffset
+	RefOfJSONObjectParamKey
+	RefOfJSONObjectParamValue
+	RefOfJSONOverlapsExprJSONDoc1
+	RefOfJSONOverlapsExprJSONDoc2
+	RefOfJSONPrettyExprJSONVal
+	RefOfJSONQuoteExprStringArg
+	RefOfJSONRemoveExprJSONDoc
+	RefOfJSONRemoveExprPathListOffset
+	RefOfJSONSchemaValidFuncExprSchema
+	RefOfJSONSchemaValidFuncExprDocument
+	RefOfJSONSchemaValidationReportFuncExprSchema
+	RefOfJSONSchemaValidationReportFuncExprDocument
+	RefOfJSONSearchExprJSONDoc
+	RefOfJSONSearchExprOneOrAll
+	RefOfJSONSearchExprSearchStr
+	RefOfJSONSearchExprEscapeChar
+	RefOfJSONSearchExprPathListOffset
+	RefOfJSONStorageFreeExprJSONVal
+	RefOfJSONStorageSizeExprJSONVal
+	RefOfJSONTableExprExpr
+	RefOfJSONTableExprAlias
+	RefOfJSONTableExprFilter
+	RefOfJSONTableExprColumnsOffset
+	RefOfJSONUnquoteExprJSONValue
+	RefOfJSONValueExprJSONDoc
+	RefOfJSONValueExprPath
+	RefOfJSONValueExprReturningType
+	RefOfJSONValueExprEmptyOnResponse
+	RefOfJSONValueExprErrorOnResponse
+	RefOfJSONValueMergeExprJSONDoc
+	RefOfJSONValueMergeExprJSONDocListOffset
+	RefOfJSONValueModifierExprJSONDoc
+	RefOfJSONValueModifierExprParamsOffset
+	RefOfJoinConditionOn
+	RefOfJoinConditionUsing
+	RefOfJoinTableExprLeftExpr
+	RefOfJoinTableExprRightExpr
+	RefOfJoinTableExprCondition
+	RefOfJtOnResponseExpr
+	RefOfLagLeadExprExpr
+	RefOfLagLeadExprN
+	RefOfLagLeadExprDefault
+	RefOfLagLeadExprOverClause
+	RefOfLagLeadExprNullTreatmentClause
+	RefOfLimitOffset
+	RefOfLimitRowcount
+	RefOfLineStringExprPointParamsOffset
+	RefOfLinestrPropertyFuncExprLinestring
+	RefOfLinestrPropertyFuncExprPropertyDefArg
+	RefOfLocateExprSubStr
+	RefOfLocateExprStr
+	RefOfLocateExprPos
+	RefOfLockingFuncName
+	RefOfLockingFuncTimeout
+	RefOfMatchExprColumnsOffset
+	RefOfMatchExprExpr
+	RefOfMaxArg
+	RefOfMaxOverClause
+	RefOfMemberOfExprValue
+	RefOfMemberOfExprJSONArr
+	RefOfMinArg
+	RefOfMinOverClause
+	RefOfModifyColumnNewColDefinition
+	RefOfModifyColumnAfter
+	RefOfMultiLinestringExprLinestringParamsOffset
+	RefOfMultiPointExprPointParamsOffset
+	RefOfMultiPolygonExprPolygonParamsOffset
+	RefOfNTHValueExprExpr
+	RefOfNTHValueExprN
+	RefOfNTHValueExprOverClause
+	RefOfNTHValueExprFromFirstLastClause
+	RefOfNTHValueExprNullTreatmentClause
+	RefOfNamedWindowWindows
+	NamedWindowsOffset
+	RefOfNextvalExpr
+	RefOfNotExprExpr
+	RefOfNtileExprN
+	RefOfNtileExprOverClause
+	RefOfOffsetOriginal
+	OnDupOffset
+	RefOfOptLikeLikeTable
+	RefOfOrExprLeft
+	RefOfOrExprRight
+	RefOfOrderExpr
+	OrderByOffset
+	RefOfOrderByOptionCols
+	RefOfOverClauseWindowName
+	RefOfOverClauseWindowSpec
+	RefOfParenTableExprExprs
+	RefOfPartitionDefinitionName
+	RefOfPartitionDefinitionOptions
+	RefOfPartitionDefinitionOptionsValueRange
+	RefOfPartitionDefinitionOptionsComment
+	RefOfPartitionDefinitionOptionsEngine
+	RefOfPartitionDefinitionOptionsDataDirectory
+	RefOfPartitionDefinitionOptionsIndexDirectory
+	RefOfPartitionDefinitionOptionsSubPartitionDefinitions
+	RefOfPartitionOptionColList
+	RefOfPartitionOptionExpr
+	RefOfPartitionOptionSubPartition
+	RefOfPartitionOptionDefinitionsOffset
+	RefOfPartitionSpecNames
+	RefOfPartitionSpecNumber
+	RefOfPartitionSpecTableName
+	RefOfPartitionSpecDefinitionsOffset
+	RefOfPartitionValueRangeRange
+	PartitionsOffset
+	RefOfPerformanceSchemaFuncExprArgument
+	RefOfPointExprXCordinate
+	RefOfPointExprYCordinate
+	RefOfPointPropertyFuncExprPoint
+	RefOfPointPropertyFuncExprValueToSet
+	RefOfPolygonExprLinestringParamsOffset
+	RefOfPolygonPropertyFuncExprPolygon
+	RefOfPolygonPropertyFuncExprPropertyDefArg
+	RefOfPrepareStmtName
+	RefOfPrepareStmtStatement
+	RefOfPrepareStmtComments
+	RefOfReferenceDefinitionReferencedTable
+	RefOfReferenceDefinitionReferencedColumns
+	RefOfReferenceDefinitionMatch
+	RefOfReferenceDefinitionOnDelete
+	RefOfReferenceDefinitionOnUpdate
+	RefOfRegexpInstrExprExpr
+	RefOfRegexpInstrExprPattern
+	RefOfRegexpInstrExprPosition
+	RefOfRegexpInstrExprOccurrence
+	RefOfRegexpInstrExprReturnOption
+	RefOfRegexpInstrExprMatchType
+	RefOfRegexpLikeExprExpr
+	RefOfRegexpLikeExprPattern
+	RefOfRegexpLikeExprMatchType
+	RefOfRegexpReplaceExprExpr
+	RefOfRegexpReplaceExprPattern
+	RefOfRegexpReplaceExprRepl
+	RefOfRegexpReplaceExprOccurrence
+	RefOfRegexpReplaceExprPosition
+	RefOfRegexpReplaceExprMatchType
+	RefOfRegexpSubstrExprExpr
+	RefOfRegexpSubstrExprPattern
+	RefOfRegexpSubstrExprOccurrence
+	RefOfRegexpSubstrExprPosition
+	RefOfRegexpSubstrExprMatchType
+	RefOfReleaseName
+	RefOfRenameColumnOldName
+	RefOfRenameColumnNewName
+	RefOfRenameIndexOldName
+	RefOfRenameIndexNewName
+	RefOfRenameTableNameTable
+	RefOfRevertMigrationComments
+	RootNodeSQLNode
+	RefOfRowAliasTableName
+	RefOfRowAliasColumns
+	RefOfSRollbackName
+	RefOfSavepointName
+	RefOfSelectWith
+	RefOfSelectFromOffset
+	RefOfSelectComments
+	RefOfSelectSelectExprs
+	RefOfSelectWhere
+	RefOfSelectGroupBy
+	RefOfSelectHaving
+	RefOfSelectWindows
+	RefOfSelectOrderBy
+	RefOfSelectLimit
+	RefOfSelectInto
+	RefOfSelectExprsExprsOffset
+	RefOfSetComments
+	RefOfSetExprs
+	RefOfSetExprVar
+	RefOfSetExprExpr
+	SetExprsOffset
+	RefOfShowInternal
+	RefOfShowBasicTbl
+	RefOfShowBasicDbName
+	RefOfShowBasicFilter
+	RefOfShowCreateOp
+	RefOfShowFilterFilter
+	RefOfShowMigrationLogsComments
+	RefOfStarExprTableName
+	RefOfStdArg
+	RefOfStdOverClause
+	RefOfStdDevArg
+	RefOfStdDevOverClause
+	RefOfStdPopArg
+	RefOfStdPopOverClause
+	RefOfStdSampArg
+	RefOfStdSampOverClause
+	RefOfStreamComments
+	RefOfStreamSelectExpr
+	RefOfStreamTable
+	RefOfSubPartitionColList
+	RefOfSubPartitionExpr
+	RefOfSubPartitionDefinitionName
+	RefOfSubPartitionDefinitionOptions
+	RefOfSubPartitionDefinitionOptionsComment
+	RefOfSubPartitionDefinitionOptionsEngine
+	RefOfSubPartitionDefinitionOptionsDataDirectory
+	RefOfSubPartitionDefinitionOptionsIndexDirectory
+	SubPartitionDefinitionsOffset
+	RefOfSubquerySelect
+	RefOfSubstrExprName
+	RefOfSubstrExprFrom
+	RefOfSubstrExprTo
+	RefOfSumArg
+	RefOfSumOverClause
+	TableExprsOffset
+	TableNameName
+	TableNameQualifier
+	TableNamesOffset
+	RefOfTableSpecColumnsOffset
+	RefOfTableSpecIndexesOffset
+	RefOfTableSpecConstraintsOffset
+	RefOfTableSpecOptions
+	RefOfTableSpecPartitionOption
+	RefOfTimestampDiffExprExpr1
+	RefOfTimestampDiffExprExpr2
+	RefOfTrimFuncExprTrimArg
+	RefOfTrimFuncExprStringArg
+	RefOfTruncateTableTable
+	RefOfUnaryExprExpr
+	RefOfUnionWith
+	RefOfUnionLeft
+	RefOfUnionRight
+	RefOfUnionOrderBy
+	RefOfUnionLimit
+	RefOfUnionInto
+	RefOfUpdateWith
+	RefOfUpdateComments
+	RefOfUpdateTableExprsOffset
+	RefOfUpdateExprs
+	RefOfUpdateWhere
+	RefOfUpdateOrderBy
+	RefOfUpdateLimit
+	RefOfUpdateExprName
+	RefOfUpdateExprExpr
+	UpdateExprsOffset
+	RefOfUpdateXMLExprTarget
+	RefOfUpdateXMLExprXPathExpr
+	RefOfUpdateXMLExprNewXML
+	RefOfUseDBName
+	RefOfVExplainStmtStatement
+	RefOfVExplainStmtComments
+	RefOfVStreamComments
+	RefOfVStreamSelectExpr
+	RefOfVStreamTable
+	RefOfVStreamWhere
+	RefOfVStreamLimit
+	ValTupleOffset
+	ValuesOffset
+	RefOfValuesFuncExprName
+	RefOfValuesStatementWith
+	RefOfValuesStatementRows
+	RefOfValuesStatementListArg
+	RefOfValuesStatementComments
+	RefOfValuesStatementOrder
+	RefOfValuesStatementLimit
+	RefOfVarPopArg
+	RefOfVarPopOverClause
+	RefOfVarSampArg
+	RefOfVarSampOverClause
+	RefOfVariableName
+	RefOfVarianceArg
+	RefOfVarianceOverClause
+	VindexParamKey
+	RefOfVindexSpecName
+	RefOfVindexSpecType
+	RefOfVindexSpecParamsOffset
+	RefOfWeightStringFuncExprExpr
+	RefOfWeightStringFuncExprAs
+	RefOfWhenCond
+	RefOfWhenVal
+	RefOfWhereExpr
+	RefOfWindowDefinitionName
+	RefOfWindowDefinitionWindowSpec
+	WindowDefinitionsOffset
+	RefOfWindowSpecificationName
+	RefOfWindowSpecificationPartitionClauseOffset
+	RefOfWindowSpecificationOrderClause
+	RefOfWindowSpecificationFrameClause
+	RefOfWithCTEsOffset
+	RefOfXorExprLeft
+	RefOfXorExprRight
+	SliceOfRefOfColumnDefinitionOffset
+	SliceOfAlterOptionOffset
+	SliceOfIdentifierCIOffset
+	SliceOfExprOffset
+	SliceOfRefOfWhenOffset
+	RefOfColumnTypeOptionsDefault
+	RefOfColumnTypeOptionsOnUpdate
+	RefOfColumnTypeOptionsAs
+	RefOfColumnTypeOptionsComment
+	RefOfColumnTypeOptionsReference
+	RefOfColumnTypeOptionsEngineAttribute
+	RefOfColumnTypeOptionsSecondaryEngineAttribute
+	RefOfColumnTypeOptionsSRID
+	SliceOfTableExprOffset
+	SliceOfRefOfVariableOffset
+	SliceOfRefOfJSONObjectParamOffset
+	SliceOfRefOfJtColumnDefinitionOffset
+	RefOfJtOrdinalColDefName
+	RefOfJtPathColDefName
+	RefOfJtPathColDefType
+	RefOfJtPathColDefPath
+	RefOfJtPathColDefEmptyOnResponse
+	RefOfJtPathColDefErrorOnResponse
+	RefOfJtNestedPathColDefPath
+	RefOfJtNestedPathColDefColumnsOffset
+	SliceOfRefOfColNameOffset
+	SliceOfRefOfPartitionDefinitionOffset
+	RefOfRootNodeSQLNode
+	SliceOfSelectExprOffset
+	RefOfTableNameName
+	RefOfTableNameQualifier
+	RefOfTableOptionValue
+	RefOfTableOptionTables
+	SliceOfRefOfIndexDefinitionOffset
+	SliceOfRefOfConstraintDefinitionOffset
+	RefOfVindexParamKey
+	SliceOfVindexParamOffset
+	SliceOfRefOfCommonTableExprOffset
+	RefOfIndexColumnColumn
+	RefOfIndexColumnExpression
+	RefOfIndexOptionValue
+	RefOfTableAndLockTypeTable
+	RefOfRenameTablePairFromTable
+	RefOfRenameTablePairToTable
+)
+
+func (s ASTStep) DebugString() string {
+	switch s {
+	case RefOfAddColumnsColumnsOffset:
+		return "(*AddColumns).ColumnsOffset"
+	case RefOfAddColumnsAfter:
+		return "(*AddColumns).After"
+	case RefOfAddConstraintDefinitionConstraintDefinition:
+		return "(*AddConstraintDefinition).ConstraintDefinition"
+	case RefOfAddIndexDefinitionIndexDefinition:
+		return "(*AddIndexDefinition).IndexDefinition"
+	case RefOfAliasedExprExpr:
+		return "(*AliasedExpr).Expr"
+	case RefOfAliasedExprAs:
+		return "(*AliasedExpr).As"
+	case RefOfAliasedTableExprExpr:
+		return "(*AliasedTableExpr).Expr"
+	case RefOfAliasedTableExprPartitions:
+		return "(*AliasedTableExpr).Partitions"
+	case RefOfAliasedTableExprAs:
+		return "(*AliasedTableExpr).As"
+	case RefOfAliasedTableExprHints:
+		return "(*AliasedTableExpr).Hints"
+	case RefOfAliasedTableExprColumns:
+		return "(*AliasedTableExpr).Columns"
+	case RefOfAlterCheckName:
+		return "(*AlterCheck).Name"
+	case RefOfAlterColumnColumn:
+		return "(*AlterColumn).Column"
+	case RefOfAlterColumnDefaultVal:
+		return "(*AlterColumn).DefaultVal"
+	case RefOfAlterDatabaseComments:
+		return "(*AlterDatabase).Comments"
+	case RefOfAlterDatabaseDBName:
+		return "(*AlterDatabase).DBName"
+	case RefOfAlterIndexName:
+		return "(*AlterIndex).Name"
+	case RefOfAlterMigrationRatio:
+		return "(*AlterMigration).Ratio"
+	case RefOfAlterTableTable:
+		return "(*AlterTable).Table"
+	case RefOfAlterTableAlterOptionsOffset:
+		return "(*AlterTable).AlterOptionsOffset"
+	case RefOfAlterTablePartitionSpec:
+		return "(*AlterTable).PartitionSpec"
+	case RefOfAlterTablePartitionOption:
+		return "(*AlterTable).PartitionOption"
+	case RefOfAlterTableComments:
+		return "(*AlterTable).Comments"
+	case RefOfAlterViewViewName:
+		return "(*AlterView).ViewName"
+	case RefOfAlterViewDefiner:
+		return "(*AlterView).Definer"
+	case RefOfAlterViewColumns:
+		return "(*AlterView).Columns"
+	case RefOfAlterViewSelect:
+		return "(*AlterView).Select"
+	case RefOfAlterViewComments:
+		return "(*AlterView).Comments"
+	case RefOfAlterVschemaTable:
+		return "(*AlterVschema).Table"
+	case RefOfAlterVschemaVindexSpec:
+		return "(*AlterVschema).VindexSpec"
+	case RefOfAlterVschemaVindexColsOffset:
+		return "(*AlterVschema).VindexColsOffset"
+	case RefOfAlterVschemaAutoIncSpec:
+		return "(*AlterVschema).AutoIncSpec"
+	case RefOfAnalyzeTable:
+		return "(*Analyze).Table"
+	case RefOfAndExprLeft:
+		return "(*AndExpr).Left"
+	case RefOfAndExprRight:
+		return "(*AndExpr).Right"
+	case RefOfAnyValueArg:
+		return "(*AnyValue).Arg"
+	case RefOfArgumentLessWindowExprOverClause:
+		return "(*ArgumentLessWindowExpr).OverClause"
+	case RefOfAssignmentExprLeft:
+		return "(*AssignmentExpr).Left"
+	case RefOfAssignmentExprRight:
+		return "(*AssignmentExpr).Right"
+	case RefOfAutoIncSpecColumn:
+		return "(*AutoIncSpec).Column"
+	case RefOfAutoIncSpecSequence:
+		return "(*AutoIncSpec).Sequence"
+	case RefOfAvgArg:
+		return "(*Avg).Arg"
+	case RefOfAvgOverClause:
+		return "(*Avg).OverClause"
+	case RefOfBetweenExprLeft:
+		return "(*BetweenExpr).Left"
+	case RefOfBetweenExprFrom:
+		return "(*BetweenExpr).From"
+	case RefOfBetweenExprTo:
+		return "(*BetweenExpr).To"
+	case RefOfBinaryExprLeft:
+		return "(*BinaryExpr).Left"
+	case RefOfBinaryExprRight:
+		return "(*BinaryExpr).Right"
+	case RefOfBitAndArg:
+		return "(*BitAnd).Arg"
+	case RefOfBitAndOverClause:
+		return "(*BitAnd).OverClause"
+	case RefOfBitOrArg:
+		return "(*BitOr).Arg"
+	case RefOfBitOrOverClause:
+		return "(*BitOr).OverClause"
+	case RefOfBitXorArg:
+		return "(*BitXor).Arg"
+	case RefOfBitXorOverClause:
+		return "(*BitXor).OverClause"
+	case RefOfCallProcName:
+		return "(*CallProc).Name"
+	case RefOfCallProcParamsOffset:
+		return "(*CallProc).ParamsOffset"
+	case RefOfCaseExprExpr:
+		return "(*CaseExpr).Expr"
+	case RefOfCaseExprWhensOffset:
+		return "(*CaseExpr).WhensOffset"
+	case RefOfCaseExprElse:
+		return "(*CaseExpr).Else"
+	case RefOfCastExprExpr:
+		return "(*CastExpr).Expr"
+	case RefOfCastExprType:
+		return "(*CastExpr).Type"
+	case RefOfChangeColumnOldColumn:
+		return "(*ChangeColumn).OldColumn"
+	case RefOfChangeColumnNewColDefinition:
+		return "(*ChangeColumn).NewColDefinition"
+	case RefOfChangeColumnAfter:
+		return "(*ChangeColumn).After"
+	case RefOfCharExprExprsOffset:
+		return "(*CharExpr).ExprsOffset"
+	case RefOfCheckConstraintDefinitionExpr:
+		return "(*CheckConstraintDefinition).Expr"
+	case RefOfColNameName:
+		return "(*ColName).Name"
+	case RefOfColNameQualifier:
+		return "(*ColName).Qualifier"
+	case RefOfCollateExprExpr:
+		return "(*CollateExpr).Expr"
+	case RefOfColumnDefinitionName:
+		return "(*ColumnDefinition).Name"
+	case RefOfColumnDefinitionType:
+		return "(*ColumnDefinition).Type"
+	case ColumnsOffset:
+		return "(Columns)[]Offset"
+	case RefOfCommonTableExprID:
+		return "(*CommonTableExpr).ID"
+	case RefOfCommonTableExprColumns:
+		return "(*CommonTableExpr).Columns"
+	case RefOfCommonTableExprSubquery:
+		return "(*CommonTableExpr).Subquery"
+	case RefOfComparisonExprLeft:
+		return "(*ComparisonExpr).Left"
+	case RefOfComparisonExprRight:
+		return "(*ComparisonExpr).Right"
+	case RefOfComparisonExprEscape:
+		return "(*ComparisonExpr).Escape"
+	case RefOfConstraintDefinitionName:
+		return "(*ConstraintDefinition).Name"
+	case RefOfConstraintDefinitionDetails:
+		return "(*ConstraintDefinition).Details"
+	case RefOfConvertExprExpr:
+		return "(*ConvertExpr).Expr"
+	case RefOfConvertExprType:
+		return "(*ConvertExpr).Type"
+	case RefOfConvertUsingExprExpr:
+		return "(*ConvertUsingExpr).Expr"
+	case RefOfCountArgsOffset:
+		return "(*Count).ArgsOffset"
+	case RefOfCountOverClause:
+		return "(*Count).OverClause"
+	case RefOfCountStarOverClause:
+		return "(*CountStar).OverClause"
+	case RefOfCreateDatabaseComments:
+		return "(*CreateDatabase).Comments"
+	case RefOfCreateDatabaseDBName:
+		return "(*CreateDatabase).DBName"
+	case RefOfCreateTableTable:
+		return "(*CreateTable).Table"
+	case RefOfCreateTableTableSpec:
+		return "(*CreateTable).TableSpec"
+	case RefOfCreateTableOptLike:
+		return "(*CreateTable).OptLike"
+	case RefOfCreateTableComments:
+		return "(*CreateTable).Comments"
+	case RefOfCreateViewViewName:
+		return "(*CreateView).ViewName"
+	case RefOfCreateViewDefiner:
+		return "(*CreateView).Definer"
+	case RefOfCreateViewColumns:
+		return "(*CreateView).Columns"
+	case RefOfCreateViewSelect:
+		return "(*CreateView).Select"
+	case RefOfCreateViewComments:
+		return "(*CreateView).Comments"
+	case RefOfCurTimeFuncExprName:
+		return "(*CurTimeFuncExpr).Name"
+	case RefOfDeallocateStmtComments:
+		return "(*DeallocateStmt).Comments"
+	case RefOfDeallocateStmtName:
+		return "(*DeallocateStmt).Name"
+	case RefOfDeleteWith:
+		return "(*Delete).With"
+	case RefOfDeleteComments:
+		return "(*Delete).Comments"
+	case RefOfDeleteTableExprsOffset:
+		return "(*Delete).TableExprsOffset"
+	case RefOfDeleteTargets:
+		return "(*Delete).Targets"
+	case RefOfDeletePartitions:
+		return "(*Delete).Partitions"
+	case RefOfDeleteWhere:
+		return "(*Delete).Where"
+	case RefOfDeleteOrderBy:
+		return "(*Delete).OrderBy"
+	case RefOfDeleteLimit:
+		return "(*Delete).Limit"
+	case RefOfDerivedTableSelect:
+		return "(*DerivedTable).Select"
+	case RefOfDropColumnName:
+		return "(*DropColumn).Name"
+	case RefOfDropDatabaseComments:
+		return "(*DropDatabase).Comments"
+	case RefOfDropDatabaseDBName:
+		return "(*DropDatabase).DBName"
+	case RefOfDropKeyName:
+		return "(*DropKey).Name"
+	case RefOfDropTableFromTables:
+		return "(*DropTable).FromTables"
+	case RefOfDropTableComments:
+		return "(*DropTable).Comments"
+	case RefOfDropViewFromTables:
+		return "(*DropView).FromTables"
+	case RefOfDropViewComments:
+		return "(*DropView).Comments"
+	case RefOfExecuteStmtName:
+		return "(*ExecuteStmt).Name"
+	case RefOfExecuteStmtComments:
+		return "(*ExecuteStmt).Comments"
+	case RefOfExecuteStmtArgumentsOffset:
+		return "(*ExecuteStmt).ArgumentsOffset"
+	case RefOfExistsExprSubquery:
+		return "(*ExistsExpr).Subquery"
+	case RefOfExplainStmtStatement:
+		return "(*ExplainStmt).Statement"
+	case RefOfExplainStmtComments:
+		return "(*ExplainStmt).Comments"
+	case RefOfExplainTabTable:
+		return "(*ExplainTab).Table"
+	case RefOfExprsExprsOffset:
+		return "(*Exprs).ExprsOffset"
+	case RefOfExtractFuncExprExpr:
+		return "(*ExtractFuncExpr).Expr"
+	case RefOfExtractValueExprFragment:
+		return "(*ExtractValueExpr).Fragment"
+	case RefOfExtractValueExprXPathExpr:
+		return "(*ExtractValueExpr).XPathExpr"
+	case RefOfFirstOrLastValueExprExpr:
+		return "(*FirstOrLastValueExpr).Expr"
+	case RefOfFirstOrLastValueExprNullTreatmentClause:
+		return "(*FirstOrLastValueExpr).NullTreatmentClause"
+	case RefOfFirstOrLastValueExprOverClause:
+		return "(*FirstOrLastValueExpr).OverClause"
+	case RefOfFlushTableNames:
+		return "(*Flush).TableNames"
+	case RefOfForeignKeyDefinitionSource:
+		return "(*ForeignKeyDefinition).Source"
+	case RefOfForeignKeyDefinitionIndexName:
+		return "(*ForeignKeyDefinition).IndexName"
+	case RefOfForeignKeyDefinitionReferenceDefinition:
+		return "(*ForeignKeyDefinition).ReferenceDefinition"
+	case RefOfFrameClauseStart:
+		return "(*FrameClause).Start"
+	case RefOfFrameClauseEnd:
+		return "(*FrameClause).End"
+	case RefOfFramePointExpr:
+		return "(*FramePoint).Expr"
+	case RefOfFuncExprQualifier:
+		return "(*FuncExpr).Qualifier"
+	case RefOfFuncExprName:
+		return "(*FuncExpr).Name"
+	case RefOfFuncExprExprsOffset:
+		return "(*FuncExpr).ExprsOffset"
+	case RefOfGTIDFuncExprSet1:
+		return "(*GTIDFuncExpr).Set1"
+	case RefOfGTIDFuncExprSet2:
+		return "(*GTIDFuncExpr).Set2"
+	case RefOfGTIDFuncExprTimeout:
+		return "(*GTIDFuncExpr).Timeout"
+	case RefOfGTIDFuncExprChannel:
+		return "(*GTIDFuncExpr).Channel"
+	case RefOfGeoHashFromLatLongExprLatitude:
+		return "(*GeoHashFromLatLongExpr).Latitude"
+	case RefOfGeoHashFromLatLongExprLongitude:
+		return "(*GeoHashFromLatLongExpr).Longitude"
+	case RefOfGeoHashFromLatLongExprMaxLength:
+		return "(*GeoHashFromLatLongExpr).MaxLength"
+	case RefOfGeoHashFromPointExprPoint:
+		return "(*GeoHashFromPointExpr).Point"
+	case RefOfGeoHashFromPointExprMaxLength:
+		return "(*GeoHashFromPointExpr).MaxLength"
+	case RefOfGeoJSONFromGeomExprGeom:
+		return "(*GeoJSONFromGeomExpr).Geom"
+	case RefOfGeoJSONFromGeomExprMaxDecimalDigits:
+		return "(*GeoJSONFromGeomExpr).MaxDecimalDigits"
+	case RefOfGeoJSONFromGeomExprBitmask:
+		return "(*GeoJSONFromGeomExpr).Bitmask"
+	case RefOfGeomCollPropertyFuncExprGeomColl:
+		return "(*GeomCollPropertyFuncExpr).GeomColl"
+	case RefOfGeomCollPropertyFuncExprPropertyDefArg:
+		return "(*GeomCollPropertyFuncExpr).PropertyDefArg"
+	case RefOfGeomFormatExprGeom:
+		return "(*GeomFormatExpr).Geom"
+	case RefOfGeomFormatExprAxisOrderOpt:
+		return "(*GeomFormatExpr).AxisOrderOpt"
+	case RefOfGeomFromGeoHashExprGeoHash:
+		return "(*GeomFromGeoHashExpr).GeoHash"
+	case RefOfGeomFromGeoHashExprSridOpt:
+		return "(*GeomFromGeoHashExpr).SridOpt"
+	case RefOfGeomFromGeoJSONExprGeoJSON:
+		return "(*GeomFromGeoJSONExpr).GeoJSON"
+	case RefOfGeomFromGeoJSONExprHigherDimHandlerOpt:
+		return "(*GeomFromGeoJSONExpr).HigherDimHandlerOpt"
+	case RefOfGeomFromGeoJSONExprSrid:
+		return "(*GeomFromGeoJSONExpr).Srid"
+	case RefOfGeomFromTextExprWktText:
+		return "(*GeomFromTextExpr).WktText"
+	case RefOfGeomFromTextExprSrid:
+		return "(*GeomFromTextExpr).Srid"
+	case RefOfGeomFromTextExprAxisOrderOpt:
+		return "(*GeomFromTextExpr).AxisOrderOpt"
+	case RefOfGeomFromWKBExprWkbBlob:
+		return "(*GeomFromWKBExpr).WkbBlob"
+	case RefOfGeomFromWKBExprSrid:
+		return "(*GeomFromWKBExpr).Srid"
+	case RefOfGeomFromWKBExprAxisOrderOpt:
+		return "(*GeomFromWKBExpr).AxisOrderOpt"
+	case RefOfGeomPropertyFuncExprGeom:
+		return "(*GeomPropertyFuncExpr).Geom"
+	case RefOfGroupByExprsOffset:
+		return "(*GroupBy).ExprsOffset"
+	case RefOfGroupConcatExprExprsOffset:
+		return "(*GroupConcatExpr).ExprsOffset"
+	case RefOfGroupConcatExprOrderBy:
+		return "(*GroupConcatExpr).OrderBy"
+	case RefOfGroupConcatExprLimit:
+		return "(*GroupConcatExpr).Limit"
+	case RefOfIndexDefinitionInfo:
+		return "(*IndexDefinition).Info"
+	case RefOfIndexHintIndexesOffset:
+		return "(*IndexHint).IndexesOffset"
+	case IndexHintsOffset:
+		return "(IndexHints)[]Offset"
+	case RefOfIndexInfoName:
+		return "(*IndexInfo).Name"
+	case RefOfIndexInfoConstraintName:
+		return "(*IndexInfo).ConstraintName"
+	case RefOfInsertComments:
+		return "(*Insert).Comments"
+	case RefOfInsertTable:
+		return "(*Insert).Table"
+	case RefOfInsertPartitions:
+		return "(*Insert).Partitions"
+	case RefOfInsertColumns:
+		return "(*Insert).Columns"
+	case RefOfInsertRows:
+		return "(*Insert).Rows"
+	case RefOfInsertRowAlias:
+		return "(*Insert).RowAlias"
+	case RefOfInsertOnDup:
+		return "(*Insert).OnDup"
+	case RefOfInsertExprStr:
+		return "(*InsertExpr).Str"
+	case RefOfInsertExprPos:
+		return "(*InsertExpr).Pos"
+	case RefOfInsertExprLen:
+		return "(*InsertExpr).Len"
+	case RefOfInsertExprNewStr:
+		return "(*InsertExpr).NewStr"
+	case RefOfIntervalDateExprDate:
+		return "(*IntervalDateExpr).Date"
+	case RefOfIntervalDateExprInterval:
+		return "(*IntervalDateExpr).Interval"
+	case RefOfIntervalFuncExprExpr:
+		return "(*IntervalFuncExpr).Expr"
+	case RefOfIntervalFuncExprExprsOffset:
+		return "(*IntervalFuncExpr).ExprsOffset"
+	case RefOfIntroducerExprExpr:
+		return "(*IntroducerExpr).Expr"
+	case RefOfIsExprLeft:
+		return "(*IsExpr).Left"
+	case RefOfJSONArrayAggExpr:
+		return "(*JSONArrayAgg).Expr"
+	case RefOfJSONArrayAggOverClause:
+		return "(*JSONArrayAgg).OverClause"
+	case RefOfJSONArrayExprParamsOffset:
+		return "(*JSONArrayExpr).ParamsOffset"
+	case RefOfJSONAttributesExprJSONDoc:
+		return "(*JSONAttributesExpr).JSONDoc"
+	case RefOfJSONAttributesExprPath:
+		return "(*JSONAttributesExpr).Path"
+	case RefOfJSONContainsExprTarget:
+		return "(*JSONContainsExpr).Target"
+	case RefOfJSONContainsExprCandidate:
+		return "(*JSONContainsExpr).Candidate"
+	case RefOfJSONContainsExprPathListOffset:
+		return "(*JSONContainsExpr).PathListOffset"
+	case RefOfJSONContainsPathExprJSONDoc:
+		return "(*JSONContainsPathExpr).JSONDoc"
+	case RefOfJSONContainsPathExprOneOrAll:
+		return "(*JSONContainsPathExpr).OneOrAll"
+	case RefOfJSONContainsPathExprPathListOffset:
+		return "(*JSONContainsPathExpr).PathListOffset"
+	case RefOfJSONExtractExprJSONDoc:
+		return "(*JSONExtractExpr).JSONDoc"
+	case RefOfJSONExtractExprPathListOffset:
+		return "(*JSONExtractExpr).PathListOffset"
+	case RefOfJSONKeysExprJSONDoc:
+		return "(*JSONKeysExpr).JSONDoc"
+	case RefOfJSONKeysExprPath:
+		return "(*JSONKeysExpr).Path"
+	case RefOfJSONObjectAggKey:
+		return "(*JSONObjectAgg).Key"
+	case RefOfJSONObjectAggValue:
+		return "(*JSONObjectAgg).Value"
+	case RefOfJSONObjectAggOverClause:
+		return "(*JSONObjectAgg).OverClause"
+	case RefOfJSONObjectExprParamsOffset:
+		return "(*JSONObjectExpr).ParamsOffset"
+	case RefOfJSONObjectParamKey:
+		return "(*JSONObjectParam).Key"
+	case RefOfJSONObjectParamValue:
+		return "(*JSONObjectParam).Value"
+	case RefOfJSONOverlapsExprJSONDoc1:
+		return "(*JSONOverlapsExpr).JSONDoc1"
+	case RefOfJSONOverlapsExprJSONDoc2:
+		return "(*JSONOverlapsExpr).JSONDoc2"
+	case RefOfJSONPrettyExprJSONVal:
+		return "(*JSONPrettyExpr).JSONVal"
+	case RefOfJSONQuoteExprStringArg:
+		return "(*JSONQuoteExpr).StringArg"
+	case RefOfJSONRemoveExprJSONDoc:
+		return "(*JSONRemoveExpr).JSONDoc"
+	case RefOfJSONRemoveExprPathListOffset:
+		return "(*JSONRemoveExpr).PathListOffset"
+	case RefOfJSONSchemaValidFuncExprSchema:
+		return "(*JSONSchemaValidFuncExpr).Schema"
+	case RefOfJSONSchemaValidFuncExprDocument:
+		return "(*JSONSchemaValidFuncExpr).Document"
+	case RefOfJSONSchemaValidationReportFuncExprSchema:
+		return "(*JSONSchemaValidationReportFuncExpr).Schema"
+	case RefOfJSONSchemaValidationReportFuncExprDocument:
+		return "(*JSONSchemaValidationReportFuncExpr).Document"
+	case RefOfJSONSearchExprJSONDoc:
+		return "(*JSONSearchExpr).JSONDoc"
+	case RefOfJSONSearchExprOneOrAll:
+		return "(*JSONSearchExpr).OneOrAll"
+	case RefOfJSONSearchExprSearchStr:
+		return "(*JSONSearchExpr).SearchStr"
+	case RefOfJSONSearchExprEscapeChar:
+		return "(*JSONSearchExpr).EscapeChar"
+	case RefOfJSONSearchExprPathListOffset:
+		return "(*JSONSearchExpr).PathListOffset"
+	case RefOfJSONStorageFreeExprJSONVal:
+		return "(*JSONStorageFreeExpr).JSONVal"
+	case RefOfJSONStorageSizeExprJSONVal:
+		return "(*JSONStorageSizeExpr).JSONVal"
+	case RefOfJSONTableExprExpr:
+		return "(*JSONTableExpr).Expr"
+	case RefOfJSONTableExprAlias:
+		return "(*JSONTableExpr).Alias"
+	case RefOfJSONTableExprFilter:
+		return "(*JSONTableExpr).Filter"
+	case RefOfJSONTableExprColumnsOffset:
+		return "(*JSONTableExpr).ColumnsOffset"
+	case RefOfJSONUnquoteExprJSONValue:
+		return "(*JSONUnquoteExpr).JSONValue"
+	case RefOfJSONValueExprJSONDoc:
+		return "(*JSONValueExpr).JSONDoc"
+	case RefOfJSONValueExprPath:
+		return "(*JSONValueExpr).Path"
+	case RefOfJSONValueExprReturningType:
+		return "(*JSONValueExpr).ReturningType"
+	case RefOfJSONValueExprEmptyOnResponse:
+		return "(*JSONValueExpr).EmptyOnResponse"
+	case RefOfJSONValueExprErrorOnResponse:
+		return "(*JSONValueExpr).ErrorOnResponse"
+	case RefOfJSONValueMergeExprJSONDoc:
+		return "(*JSONValueMergeExpr).JSONDoc"
+	case RefOfJSONValueMergeExprJSONDocListOffset:
+		return "(*JSONValueMergeExpr).JSONDocListOffset"
+	case RefOfJSONValueModifierExprJSONDoc:
+		return "(*JSONValueModifierExpr).JSONDoc"
+	case RefOfJSONValueModifierExprParamsOffset:
+		return "(*JSONValueModifierExpr).ParamsOffset"
+	case RefOfJoinConditionOn:
+		return "(*JoinCondition).On"
+	case RefOfJoinConditionUsing:
+		return "(*JoinCondition).Using"
+	case RefOfJoinTableExprLeftExpr:
+		return "(*JoinTableExpr).LeftExpr"
+	case RefOfJoinTableExprRightExpr:
+		return "(*JoinTableExpr).RightExpr"
+	case RefOfJoinTableExprCondition:
+		return "(*JoinTableExpr).Condition"
+	case RefOfJtOnResponseExpr:
+		return "(*JtOnResponse).Expr"
+	case RefOfLagLeadExprExpr:
+		return "(*LagLeadExpr).Expr"
+	case RefOfLagLeadExprN:
+		return "(*LagLeadExpr).N"
+	case RefOfLagLeadExprDefault:
+		return "(*LagLeadExpr).Default"
+	case RefOfLagLeadExprOverClause:
+		return "(*LagLeadExpr).OverClause"
+	case RefOfLagLeadExprNullTreatmentClause:
+		return "(*LagLeadExpr).NullTreatmentClause"
+	case RefOfLimitOffset:
+		return "(*Limit).Offset"
+	case RefOfLimitRowcount:
+		return "(*Limit).Rowcount"
+	case RefOfLineStringExprPointParamsOffset:
+		return "(*LineStringExpr).PointParamsOffset"
+	case RefOfLinestrPropertyFuncExprLinestring:
+		return "(*LinestrPropertyFuncExpr).Linestring"
+	case RefOfLinestrPropertyFuncExprPropertyDefArg:
+		return "(*LinestrPropertyFuncExpr).PropertyDefArg"
+	case RefOfLocateExprSubStr:
+		return "(*LocateExpr).SubStr"
+	case RefOfLocateExprStr:
+		return "(*LocateExpr).Str"
+	case RefOfLocateExprPos:
+		return "(*LocateExpr).Pos"
+	case RefOfLockingFuncName:
+		return "(*LockingFunc).Name"
+	case RefOfLockingFuncTimeout:
+		return "(*LockingFunc).Timeout"
+	case RefOfMatchExprColumnsOffset:
+		return "(*MatchExpr).ColumnsOffset"
+	case RefOfMatchExprExpr:
+		return "(*MatchExpr).Expr"
+	case RefOfMaxArg:
+		return "(*Max).Arg"
+	case RefOfMaxOverClause:
+		return "(*Max).OverClause"
+	case RefOfMemberOfExprValue:
+		return "(*MemberOfExpr).Value"
+	case RefOfMemberOfExprJSONArr:
+		return "(*MemberOfExpr).JSONArr"
+	case RefOfMinArg:
+		return "(*Min).Arg"
+	case RefOfMinOverClause:
+		return "(*Min).OverClause"
+	case RefOfModifyColumnNewColDefinition:
+		return "(*ModifyColumn).NewColDefinition"
+	case RefOfModifyColumnAfter:
+		return "(*ModifyColumn).After"
+	case RefOfMultiLinestringExprLinestringParamsOffset:
+		return "(*MultiLinestringExpr).LinestringParamsOffset"
+	case RefOfMultiPointExprPointParamsOffset:
+		return "(*MultiPointExpr).PointParamsOffset"
+	case RefOfMultiPolygonExprPolygonParamsOffset:
+		return "(*MultiPolygonExpr).PolygonParamsOffset"
+	case RefOfNTHValueExprExpr:
+		return "(*NTHValueExpr).Expr"
+	case RefOfNTHValueExprN:
+		return "(*NTHValueExpr).N"
+	case RefOfNTHValueExprOverClause:
+		return "(*NTHValueExpr).OverClause"
+	case RefOfNTHValueExprFromFirstLastClause:
+		return "(*NTHValueExpr).FromFirstLastClause"
+	case RefOfNTHValueExprNullTreatmentClause:
+		return "(*NTHValueExpr).NullTreatmentClause"
+	case RefOfNamedWindowWindows:
+		return "(*NamedWindow).Windows"
+	case NamedWindowsOffset:
+		return "(NamedWindows)[]Offset"
+	case RefOfNextvalExpr:
+		return "(*Nextval).Expr"
+	case RefOfNotExprExpr:
+		return "(*NotExpr).Expr"
+	case RefOfNtileExprN:
+		return "(*NtileExpr).N"
+	case RefOfNtileExprOverClause:
+		return "(*NtileExpr).OverClause"
+	case RefOfOffsetOriginal:
+		return "(*Offset).Original"
+	case OnDupOffset:
+		return "(OnDup)[]Offset"
+	case RefOfOptLikeLikeTable:
+		return "(*OptLike).LikeTable"
+	case RefOfOrExprLeft:
+		return "(*OrExpr).Left"
+	case RefOfOrExprRight:
+		return "(*OrExpr).Right"
+	case RefOfOrderExpr:
+		return "(*Order).Expr"
+	case OrderByOffset:
+		return "(OrderBy)[]Offset"
+	case RefOfOrderByOptionCols:
+		return "(*OrderByOption).Cols"
+	case RefOfOverClauseWindowName:
+		return "(*OverClause).WindowName"
+	case RefOfOverClauseWindowSpec:
+		return "(*OverClause).WindowSpec"
+	case RefOfParenTableExprExprs:
+		return "(*ParenTableExpr).Exprs"
+	case RefOfPartitionDefinitionName:
+		return "(*PartitionDefinition).Name"
+	case RefOfPartitionDefinitionOptions:
+		return "(*PartitionDefinition).Options"
+	case RefOfPartitionDefinitionOptionsValueRange:
+		return "(*PartitionDefinitionOptions).ValueRange"
+	case RefOfPartitionDefinitionOptionsComment:
+		return "(*PartitionDefinitionOptions).Comment"
+	case RefOfPartitionDefinitionOptionsEngine:
+		return "(*PartitionDefinitionOptions).Engine"
+	case RefOfPartitionDefinitionOptionsDataDirectory:
+		return "(*PartitionDefinitionOptions).DataDirectory"
+	case RefOfPartitionDefinitionOptionsIndexDirectory:
+		return "(*PartitionDefinitionOptions).IndexDirectory"
+	case RefOfPartitionDefinitionOptionsSubPartitionDefinitions:
+		return "(*PartitionDefinitionOptions).SubPartitionDefinitions"
+	case RefOfPartitionOptionColList:
+		return "(*PartitionOption).ColList"
+	case RefOfPartitionOptionExpr:
+		return "(*PartitionOption).Expr"
+	case RefOfPartitionOptionSubPartition:
+		return "(*PartitionOption).SubPartition"
+	case RefOfPartitionOptionDefinitionsOffset:
+		return "(*PartitionOption).DefinitionsOffset"
+	case RefOfPartitionSpecNames:
+		return "(*PartitionSpec).Names"
+	case RefOfPartitionSpecNumber:
+		return "(*PartitionSpec).Number"
+	case RefOfPartitionSpecTableName:
+		return "(*PartitionSpec).TableName"
+	case RefOfPartitionSpecDefinitionsOffset:
+		return "(*PartitionSpec).DefinitionsOffset"
+	case RefOfPartitionValueRangeRange:
+		return "(*PartitionValueRange).Range"
+	case PartitionsOffset:
+		return "(Partitions)[]Offset"
+	case RefOfPerformanceSchemaFuncExprArgument:
+		return "(*PerformanceSchemaFuncExpr).Argument"
+	case RefOfPointExprXCordinate:
+		return "(*PointExpr).XCordinate"
+	case RefOfPointExprYCordinate:
+		return "(*PointExpr).YCordinate"
+	case RefOfPointPropertyFuncExprPoint:
+		return "(*PointPropertyFuncExpr).Point"
+	case RefOfPointPropertyFuncExprValueToSet:
+		return "(*PointPropertyFuncExpr).ValueToSet"
+	case RefOfPolygonExprLinestringParamsOffset:
+		return "(*PolygonExpr).LinestringParamsOffset"
+	case RefOfPolygonPropertyFuncExprPolygon:
+		return "(*PolygonPropertyFuncExpr).Polygon"
+	case RefOfPolygonPropertyFuncExprPropertyDefArg:
+		return "(*PolygonPropertyFuncExpr).PropertyDefArg"
+	case RefOfPrepareStmtName:
+		return "(*PrepareStmt).Name"
+	case RefOfPrepareStmtStatement:
+		return "(*PrepareStmt).Statement"
+	case RefOfPrepareStmtComments:
+		return "(*PrepareStmt).Comments"
+	case RefOfReferenceDefinitionReferencedTable:
+		return "(*ReferenceDefinition).ReferencedTable"
+	case RefOfReferenceDefinitionReferencedColumns:
+		return "(*ReferenceDefinition).ReferencedColumns"
+	case RefOfReferenceDefinitionMatch:
+		return "(*ReferenceDefinition).Match"
+	case RefOfReferenceDefinitionOnDelete:
+		return "(*ReferenceDefinition).OnDelete"
+	case RefOfReferenceDefinitionOnUpdate:
+		return "(*ReferenceDefinition).OnUpdate"
+	case RefOfRegexpInstrExprExpr:
+		return "(*RegexpInstrExpr).Expr"
+	case RefOfRegexpInstrExprPattern:
+		return "(*RegexpInstrExpr).Pattern"
+	case RefOfRegexpInstrExprPosition:
+		return "(*RegexpInstrExpr).Position"
+	case RefOfRegexpInstrExprOccurrence:
+		return "(*RegexpInstrExpr).Occurrence"
+	case RefOfRegexpInstrExprReturnOption:
+		return "(*RegexpInstrExpr).ReturnOption"
+	case RefOfRegexpInstrExprMatchType:
+		return "(*RegexpInstrExpr).MatchType"
+	case RefOfRegexpLikeExprExpr:
+		return "(*RegexpLikeExpr).Expr"
+	case RefOfRegexpLikeExprPattern:
+		return "(*RegexpLikeExpr).Pattern"
+	case RefOfRegexpLikeExprMatchType:
+		return "(*RegexpLikeExpr).MatchType"
+	case RefOfRegexpReplaceExprExpr:
+		return "(*RegexpReplaceExpr).Expr"
+	case RefOfRegexpReplaceExprPattern:
+		return "(*RegexpReplaceExpr).Pattern"
+	case RefOfRegexpReplaceExprRepl:
+		return "(*RegexpReplaceExpr).Repl"
+	case RefOfRegexpReplaceExprOccurrence:
+		return "(*RegexpReplaceExpr).Occurrence"
+	case RefOfRegexpReplaceExprPosition:
+		return "(*RegexpReplaceExpr).Position"
+	case RefOfRegexpReplaceExprMatchType:
+		return "(*RegexpReplaceExpr).MatchType"
+	case RefOfRegexpSubstrExprExpr:
+		return "(*RegexpSubstrExpr).Expr"
+	case RefOfRegexpSubstrExprPattern:
+		return "(*RegexpSubstrExpr).Pattern"
+	case RefOfRegexpSubstrExprOccurrence:
+		return "(*RegexpSubstrExpr).Occurrence"
+	case RefOfRegexpSubstrExprPosition:
+		return "(*RegexpSubstrExpr).Position"
+	case RefOfRegexpSubstrExprMatchType:
+		return "(*RegexpSubstrExpr).MatchType"
+	case RefOfReleaseName:
+		return "(*Release).Name"
+	case RefOfRenameColumnOldName:
+		return "(*RenameColumn).OldName"
+	case RefOfRenameColumnNewName:
+		return "(*RenameColumn).NewName"
+	case RefOfRenameIndexOldName:
+		return "(*RenameIndex).OldName"
+	case RefOfRenameIndexNewName:
+		return "(*RenameIndex).NewName"
+	case RefOfRenameTableNameTable:
+		return "(*RenameTableName).Table"
+	case RefOfRevertMigrationComments:
+		return "(*RevertMigration).Comments"
+	case RootNodeSQLNode:
+		return "(RootNode).SQLNode"
+	case RefOfRowAliasTableName:
+		return "(*RowAlias).TableName"
+	case RefOfRowAliasColumns:
+		return "(*RowAlias).Columns"
+	case RefOfSRollbackName:
+		return "(*SRollback).Name"
+	case RefOfSavepointName:
+		return "(*Savepoint).Name"
+	case RefOfSelectWith:
+		return "(*Select).With"
+	case RefOfSelectFromOffset:
+		return "(*Select).FromOffset"
+	case RefOfSelectComments:
+		return "(*Select).Comments"
+	case RefOfSelectSelectExprs:
+		return "(*Select).SelectExprs"
+	case RefOfSelectWhere:
+		return "(*Select).Where"
+	case RefOfSelectGroupBy:
+		return "(*Select).GroupBy"
+	case RefOfSelectHaving:
+		return "(*Select).Having"
+	case RefOfSelectWindows:
+		return "(*Select).Windows"
+	case RefOfSelectOrderBy:
+		return "(*Select).OrderBy"
+	case RefOfSelectLimit:
+		return "(*Select).Limit"
+	case RefOfSelectInto:
+		return "(*Select).Into"
+	case RefOfSelectExprsExprsOffset:
+		return "(*SelectExprs).ExprsOffset"
+	case RefOfSetComments:
+		return "(*Set).Comments"
+	case RefOfSetExprs:
+		return "(*Set).Exprs"
+	case RefOfSetExprVar:
+		return "(*SetExpr).Var"
+	case RefOfSetExprExpr:
+		return "(*SetExpr).Expr"
+	case SetExprsOffset:
+		return "(SetExprs)[]Offset"
+	case RefOfShowInternal:
+		return "(*Show).Internal"
+	case RefOfShowBasicTbl:
+		return "(*ShowBasic).Tbl"
+	case RefOfShowBasicDbName:
+		return "(*ShowBasic).DbName"
+	case RefOfShowBasicFilter:
+		return "(*ShowBasic).Filter"
+	case RefOfShowCreateOp:
+		return "(*ShowCreate).Op"
+	case RefOfShowFilterFilter:
+		return "(*ShowFilter).Filter"
+	case RefOfShowMigrationLogsComments:
+		return "(*ShowMigrationLogs).Comments"
+	case RefOfStarExprTableName:
+		return "(*StarExpr).TableName"
+	case RefOfStdArg:
+		return "(*Std).Arg"
+	case RefOfStdOverClause:
+		return "(*Std).OverClause"
+	case RefOfStdDevArg:
+		return "(*StdDev).Arg"
+	case RefOfStdDevOverClause:
+		return "(*StdDev).OverClause"
+	case RefOfStdPopArg:
+		return "(*StdPop).Arg"
+	case RefOfStdPopOverClause:
+		return "(*StdPop).OverClause"
+	case RefOfStdSampArg:
+		return "(*StdSamp).Arg"
+	case RefOfStdSampOverClause:
+		return "(*StdSamp).OverClause"
+	case RefOfStreamComments:
+		return "(*Stream).Comments"
+	case RefOfStreamSelectExpr:
+		return "(*Stream).SelectExpr"
+	case RefOfStreamTable:
+		return "(*Stream).Table"
+	case RefOfSubPartitionColList:
+		return "(*SubPartition).ColList"
+	case RefOfSubPartitionExpr:
+		return "(*SubPartition).Expr"
+	case RefOfSubPartitionDefinitionName:
+		return "(*SubPartitionDefinition).Name"
+	case RefOfSubPartitionDefinitionOptions:
+		return "(*SubPartitionDefinition).Options"
+	case RefOfSubPartitionDefinitionOptionsComment:
+		return "(*SubPartitionDefinitionOptions).Comment"
+	case RefOfSubPartitionDefinitionOptionsEngine:
+		return "(*SubPartitionDefinitionOptions).Engine"
+	case RefOfSubPartitionDefinitionOptionsDataDirectory:
+		return "(*SubPartitionDefinitionOptions).DataDirectory"
+	case RefOfSubPartitionDefinitionOptionsIndexDirectory:
+		return "(*SubPartitionDefinitionOptions).IndexDirectory"
+	case SubPartitionDefinitionsOffset:
+		return "(SubPartitionDefinitions)[]Offset"
+	case RefOfSubquerySelect:
+		return "(*Subquery).Select"
+	case RefOfSubstrExprName:
+		return "(*SubstrExpr).Name"
+	case RefOfSubstrExprFrom:
+		return "(*SubstrExpr).From"
+	case RefOfSubstrExprTo:
+		return "(*SubstrExpr).To"
+	case RefOfSumArg:
+		return "(*Sum).Arg"
+	case RefOfSumOverClause:
+		return "(*Sum).OverClause"
+	case TableExprsOffset:
+		return "(TableExprs)[]Offset"
+	case TableNameName:
+		return "(TableName).Name"
+	case TableNameQualifier:
+		return "(TableName).Qualifier"
+	case TableNamesOffset:
+		return "(TableNames)[]Offset"
+	case RefOfTableSpecColumnsOffset:
+		return "(*TableSpec).ColumnsOffset"
+	case RefOfTableSpecIndexesOffset:
+		return "(*TableSpec).IndexesOffset"
+	case RefOfTableSpecConstraintsOffset:
+		return "(*TableSpec).ConstraintsOffset"
+	case RefOfTableSpecOptions:
+		return "(*TableSpec).Options"
+	case RefOfTableSpecPartitionOption:
+		return "(*TableSpec).PartitionOption"
+	case RefOfTimestampDiffExprExpr1:
+		return "(*TimestampDiffExpr).Expr1"
+	case RefOfTimestampDiffExprExpr2:
+		return "(*TimestampDiffExpr).Expr2"
+	case RefOfTrimFuncExprTrimArg:
+		return "(*TrimFuncExpr).TrimArg"
+	case RefOfTrimFuncExprStringArg:
+		return "(*TrimFuncExpr).StringArg"
+	case RefOfTruncateTableTable:
+		return "(*TruncateTable).Table"
+	case RefOfUnaryExprExpr:
+		return "(*UnaryExpr).Expr"
+	case RefOfUnionWith:
+		return "(*Union).With"
+	case RefOfUnionLeft:
+		return "(*Union).Left"
+	case RefOfUnionRight:
+		return "(*Union).Right"
+	case RefOfUnionOrderBy:
+		return "(*Union).OrderBy"
+	case RefOfUnionLimit:
+		return "(*Union).Limit"
+	case RefOfUnionInto:
+		return "(*Union).Into"
+	case RefOfUpdateWith:
+		return "(*Update).With"
+	case RefOfUpdateComments:
+		return "(*Update).Comments"
+	case RefOfUpdateTableExprsOffset:
+		return "(*Update).TableExprsOffset"
+	case RefOfUpdateExprs:
+		return "(*Update).Exprs"
+	case RefOfUpdateWhere:
+		return "(*Update).Where"
+	case RefOfUpdateOrderBy:
+		return "(*Update).OrderBy"
+	case RefOfUpdateLimit:
+		return "(*Update).Limit"
+	case RefOfUpdateExprName:
+		return "(*UpdateExpr).Name"
+	case RefOfUpdateExprExpr:
+		return "(*UpdateExpr).Expr"
+	case UpdateExprsOffset:
+		return "(UpdateExprs)[]Offset"
+	case RefOfUpdateXMLExprTarget:
+		return "(*UpdateXMLExpr).Target"
+	case RefOfUpdateXMLExprXPathExpr:
+		return "(*UpdateXMLExpr).XPathExpr"
+	case RefOfUpdateXMLExprNewXML:
+		return "(*UpdateXMLExpr).NewXML"
+	case RefOfUseDBName:
+		return "(*Use).DBName"
+	case RefOfVExplainStmtStatement:
+		return "(*VExplainStmt).Statement"
+	case RefOfVExplainStmtComments:
+		return "(*VExplainStmt).Comments"
+	case RefOfVStreamComments:
+		return "(*VStream).Comments"
+	case RefOfVStreamSelectExpr:
+		return "(*VStream).SelectExpr"
+	case RefOfVStreamTable:
+		return "(*VStream).Table"
+	case RefOfVStreamWhere:
+		return "(*VStream).Where"
+	case RefOfVStreamLimit:
+		return "(*VStream).Limit"
+	case ValTupleOffset:
+		return "(ValTuple)[]Offset"
+	case ValuesOffset:
+		return "(Values)[]Offset"
+	case RefOfValuesFuncExprName:
+		return "(*ValuesFuncExpr).Name"
+	case RefOfValuesStatementWith:
+		return "(*ValuesStatement).With"
+	case RefOfValuesStatementRows:
+		return "(*ValuesStatement).Rows"
+	case RefOfValuesStatementListArg:
+		return "(*ValuesStatement).ListArg"
+	case RefOfValuesStatementComments:
+		return "(*ValuesStatement).Comments"
+	case RefOfValuesStatementOrder:
+		return "(*ValuesStatement).Order"
+	case RefOfValuesStatementLimit:
+		return "(*ValuesStatement).Limit"
+	case RefOfVarPopArg:
+		return "(*VarPop).Arg"
+	case RefOfVarPopOverClause:
+		return "(*VarPop).OverClause"
+	case RefOfVarSampArg:
+		return "(*VarSamp).Arg"
+	case RefOfVarSampOverClause:
+		return "(*VarSamp).OverClause"
+	case RefOfVariableName:
+		return "(*Variable).Name"
+	case RefOfVarianceArg:
+		return "(*Variance).Arg"
+	case RefOfVarianceOverClause:
+		return "(*Variance).OverClause"
+	case VindexParamKey:
+		return "(VindexParam).Key"
+	case RefOfVindexSpecName:
+		return "(*VindexSpec).Name"
+	case RefOfVindexSpecType:
+		return "(*VindexSpec).Type"
+	case RefOfVindexSpecParamsOffset:
+		return "(*VindexSpec).ParamsOffset"
+	case RefOfWeightStringFuncExprExpr:
+		return "(*WeightStringFuncExpr).Expr"
+	case RefOfWeightStringFuncExprAs:
+		return "(*WeightStringFuncExpr).As"
+	case RefOfWhenCond:
+		return "(*When).Cond"
+	case RefOfWhenVal:
+		return "(*When).Val"
+	case RefOfWhereExpr:
+		return "(*Where).Expr"
+	case RefOfWindowDefinitionName:
+		return "(*WindowDefinition).Name"
+	case RefOfWindowDefinitionWindowSpec:
+		return "(*WindowDefinition).WindowSpec"
+	case WindowDefinitionsOffset:
+		return "(WindowDefinitions)[]Offset"
+	case RefOfWindowSpecificationName:
+		return "(*WindowSpecification).Name"
+	case RefOfWindowSpecificationPartitionClauseOffset:
+		return "(*WindowSpecification).PartitionClauseOffset"
+	case RefOfWindowSpecificationOrderClause:
+		return "(*WindowSpecification).OrderClause"
+	case RefOfWindowSpecificationFrameClause:
+		return "(*WindowSpecification).FrameClause"
+	case RefOfWithCTEsOffset:
+		return "(*With).CTEsOffset"
+	case RefOfXorExprLeft:
+		return "(*XorExpr).Left"
+	case RefOfXorExprRight:
+		return "(*XorExpr).Right"
+	case SliceOfRefOfColumnDefinitionOffset:
+		return "([]*ColumnDefinition)[]Offset"
+	case SliceOfAlterOptionOffset:
+		return "([]AlterOption)[]Offset"
+	case SliceOfIdentifierCIOffset:
+		return "([]IdentifierCI)[]Offset"
+	case SliceOfExprOffset:
+		return "([]Expr)[]Offset"
+	case SliceOfRefOfWhenOffset:
+		return "([]*When)[]Offset"
+	case RefOfColumnTypeOptionsDefault:
+		return "(*ColumnTypeOptions).Default"
+	case RefOfColumnTypeOptionsOnUpdate:
+		return "(*ColumnTypeOptions).OnUpdate"
+	case RefOfColumnTypeOptionsAs:
+		return "(*ColumnTypeOptions).As"
+	case RefOfColumnTypeOptionsComment:
+		return "(*ColumnTypeOptions).Comment"
+	case RefOfColumnTypeOptionsReference:
+		return "(*ColumnTypeOptions).Reference"
+	case RefOfColumnTypeOptionsEngineAttribute:
+		return "(*ColumnTypeOptions).EngineAttribute"
+	case RefOfColumnTypeOptionsSecondaryEngineAttribute:
+		return "(*ColumnTypeOptions).SecondaryEngineAttribute"
+	case RefOfColumnTypeOptionsSRID:
+		return "(*ColumnTypeOptions).SRID"
+	case SliceOfTableExprOffset:
+		return "([]TableExpr)[]Offset"
+	case SliceOfRefOfVariableOffset:
+		return "([]*Variable)[]Offset"
+	case SliceOfRefOfJSONObjectParamOffset:
+		return "([]*JSONObjectParam)[]Offset"
+	case SliceOfRefOfJtColumnDefinitionOffset:
+		return "([]*JtColumnDefinition)[]Offset"
+	case RefOfJtOrdinalColDefName:
+		return "(*JtOrdinalColDef).Name"
+	case RefOfJtPathColDefName:
+		return "(*JtPathColDef).Name"
+	case RefOfJtPathColDefType:
+		return "(*JtPathColDef).Type"
+	case RefOfJtPathColDefPath:
+		return "(*JtPathColDef).Path"
+	case RefOfJtPathColDefEmptyOnResponse:
+		return "(*JtPathColDef).EmptyOnResponse"
+	case RefOfJtPathColDefErrorOnResponse:
+		return "(*JtPathColDef).ErrorOnResponse"
+	case RefOfJtNestedPathColDefPath:
+		return "(*JtNestedPathColDef).Path"
+	case RefOfJtNestedPathColDefColumnsOffset:
+		return "(*JtNestedPathColDef).ColumnsOffset"
+	case SliceOfRefOfColNameOffset:
+		return "([]*ColName)[]Offset"
+	case SliceOfRefOfPartitionDefinitionOffset:
+		return "([]*PartitionDefinition)[]Offset"
+	case RefOfRootNodeSQLNode:
+		return "(*RootNode).SQLNode"
+	case SliceOfSelectExprOffset:
+		return "([]SelectExpr)[]Offset"
+	case RefOfTableNameName:
+		return "(*TableName).Name"
+	case RefOfTableNameQualifier:
+		return "(*TableName).Qualifier"
+	case RefOfTableOptionValue:
+		return "(*TableOption).Value"
+	case RefOfTableOptionTables:
+		return "(*TableOption).Tables"
+	case SliceOfRefOfIndexDefinitionOffset:
+		return "([]*IndexDefinition)[]Offset"
+	case SliceOfRefOfConstraintDefinitionOffset:
+		return "([]*ConstraintDefinition)[]Offset"
+	case RefOfVindexParamKey:
+		return "(*VindexParam).Key"
+	case SliceOfVindexParamOffset:
+		return "([]VindexParam)[]Offset"
+	case SliceOfRefOfCommonTableExprOffset:
+		return "([]*CommonTableExpr)[]Offset"
+	case RefOfIndexColumnColumn:
+		return "(*IndexColumn).Column"
+	case RefOfIndexColumnExpression:
+		return "(*IndexColumn).Expression"
+	case RefOfIndexOptionValue:
+		return "(*IndexOption).Value"
+	case RefOfTableAndLockTypeTable:
+		return "(*TableAndLockType).Table"
+	case RefOfRenameTablePairFromTable:
+		return "(*RenameTablePair).FromTable"
+	case RefOfRenameTablePairToTable:
+		return "(*RenameTablePair).ToTable"
+	}
+	panic("unknown ASTStep")
+}
+func GetNodeFromPath(node SQLNode, path ASTPath) SQLNode {
+	for len(path) >= 2 {
+		step := path.nextPathStep()
+		path = path[2:]
+		switch step {
+		case RefOfAddColumnsColumnsOffset:
+			idx, bytesRead := path.nextPathOffset()
+			path = path[bytesRead:]
+			node = node.(*AddColumns).Columns[idx]
+		case RefOfAddColumnsAfter:
+			node = node.(*AddColumns).After
+		case RefOfAddConstraintDefinitionConstraintDefinition:
+			node = node.(*AddConstraintDefinition).ConstraintDefinition
+		case RefOfAddIndexDefinitionIndexDefinition:
+			node = node.(*AddIndexDefinition).IndexDefinition
+		case RefOfAliasedExprExpr:
+			node = node.(*AliasedExpr).Expr
+		case RefOfAliasedExprAs:
+			node = node.(*AliasedExpr).As
+		case RefOfAliasedTableExprExpr:
+			node = node.(*AliasedTableExpr).Expr
+		case RefOfAliasedTableExprPartitions:
+			node = node.(*AliasedTableExpr).Partitions
+		case RefOfAliasedTableExprAs:
+			node = node.(*AliasedTableExpr).As
+		case RefOfAliasedTableExprHints:
+			node = node.(*AliasedTableExpr).Hints
+		case RefOfAliasedTableExprColumns:
+			node = node.(*AliasedTableExpr).Columns
+		case RefOfAlterCheckName:
+			node = node.(*AlterCheck).Name
+		case RefOfAlterColumnColumn:
+			node = node.(*AlterColumn).Column
+		case RefOfAlterColumnDefaultVal:
+			node = node.(*AlterColumn).DefaultVal
+		case RefOfAlterDatabaseComments:
+			node = node.(*AlterDatabase).Comments
+		case RefOfAlterDatabaseDBName:
+			node = node.(*AlterDatabase).DBName
+		case RefOfAlterIndexName:
+			node = node.(*AlterIndex).Name
+		case RefOfAlterMigrationRatio:
+			node = node.(*AlterMigration).Ratio
+		case RefOfAlterTableTable:
+			node = node.(*AlterTable).Table
+		case RefOfAlterTableAlterOptionsOffset:
+			idx, bytesRead := path.nextPathOffset()
+			path = path[bytesRead:]
+			node = node.(*AlterTable).AlterOptions[idx]
+		case RefOfAlterTablePartitionSpec:
+			node = node.(*AlterTable).PartitionSpec
+		case RefOfAlterTablePartitionOption:
+			node = node.(*AlterTable).PartitionOption
+		case RefOfAlterTableComments:
+			node = node.(*AlterTable).Comments
+		case RefOfAlterViewViewName:
+			node = node.(*AlterView).ViewName
+		case RefOfAlterViewDefiner:
+			node = node.(*AlterView).Definer
+		case RefOfAlterViewColumns:
+			node = node.(*AlterView).Columns
+		case RefOfAlterViewSelect:
+			node = node.(*AlterView).Select
+		case RefOfAlterViewComments:
+			node = node.(*AlterView).Comments
+		case RefOfAlterVschemaTable:
+			node = node.(*AlterVschema).Table
+		case RefOfAlterVschemaVindexSpec:
+			node = node.(*AlterVschema).VindexSpec
+		case RefOfAlterVschemaVindexColsOffset:
+			idx, bytesRead := path.nextPathOffset()
+			path = path[bytesRead:]
+			node = node.(*AlterVschema).VindexCols[idx]
+		case RefOfAlterVschemaAutoIncSpec:
+			node = node.(*AlterVschema).AutoIncSpec
+		case RefOfAnalyzeTable:
+			node = node.(*Analyze).Table
+		case RefOfAndExprLeft:
+			node = node.(*AndExpr).Left
+		case RefOfAndExprRight:
+			node = node.(*AndExpr).Right
+		case RefOfAnyValueArg:
+			node = node.(*AnyValue).Arg
+		case RefOfArgumentLessWindowExprOverClause:
+			node = node.(*ArgumentLessWindowExpr).OverClause
+		case RefOfAssignmentExprLeft:
+			node = node.(*AssignmentExpr).Left
+		case RefOfAssignmentExprRight:
+			node = node.(*AssignmentExpr).Right
+		case RefOfAutoIncSpecColumn:
+			node = node.(*AutoIncSpec).Column
+		case RefOfAutoIncSpecSequence:
+			node = node.(*AutoIncSpec).Sequence
+		case RefOfAvgArg:
+			node = node.(*Avg).Arg
+		case RefOfAvgOverClause:
+			node = node.(*Avg).OverClause
+		case RefOfBetweenExprLeft:
+			node = node.(*BetweenExpr).Left
+		case RefOfBetweenExprFrom:
+			node = node.(*BetweenExpr).From
+		case RefOfBetweenExprTo:
+			node = node.(*BetweenExpr).To
+		case RefOfBinaryExprLeft:
+			node = node.(*BinaryExpr).Left
+		case RefOfBinaryExprRight:
+			node = node.(*BinaryExpr).Right
+		case RefOfBitAndArg:
+			node = node.(*BitAnd).Arg
+		case RefOfBitAndOverClause:
+			node = node.(*BitAnd).OverClause
+		case RefOfBitOrArg:
+			node = node.(*BitOr).Arg
+		case RefOfBitOrOverClause:
+			node = node.(*BitOr).OverClause
+		case RefOfBitXorArg:
+			node = node.(*BitXor).Arg
+		case RefOfBitXorOverClause:
+			node = node.(*BitXor).OverClause
+		case RefOfCallProcName:
+			node = node.(*CallProc).Name
+		case RefOfCallProcParamsOffset:
+			idx, bytesRead := path.nextPathOffset()
+			path = path[bytesRead:]
+			node = node.(*CallProc).Params[idx]
+		case RefOfCaseExprExpr:
+			node = node.(*CaseExpr).Expr
+		case RefOfCaseExprWhensOffset:
+			idx, bytesRead := path.nextPathOffset()
+			path = path[bytesRead:]
+			node = node.(*CaseExpr).Whens[idx]
+		case RefOfCaseExprElse:
+			node = node.(*CaseExpr).Else
+		case RefOfCastExprExpr:
+			node = node.(*CastExpr).Expr
+		case RefOfCastExprType:
+			node = node.(*CastExpr).Type
+		case RefOfChangeColumnOldColumn:
+			node = node.(*ChangeColumn).OldColumn
+		case RefOfChangeColumnNewColDefinition:
+			node = node.(*ChangeColumn).NewColDefinition
+		case RefOfChangeColumnAfter:
+			node = node.(*ChangeColumn).After
+		case RefOfCharExprExprsOffset:
+			idx, bytesRead := path.nextPathOffset()
+			path = path[bytesRead:]
+			node = node.(*CharExpr).Exprs[idx]
+		case RefOfCheckConstraintDefinitionExpr:
+			node = node.(*CheckConstraintDefinition).Expr
+		case RefOfColNameName:
+			node = node.(*ColName).Name
+		case RefOfColNameQualifier:
+			node = node.(*ColName).Qualifier
+		case RefOfCollateExprExpr:
+			node = node.(*CollateExpr).Expr
+		case RefOfColumnDefinitionName:
+			node = node.(*ColumnDefinition).Name
+		case RefOfColumnDefinitionType:
+			node = node.(*ColumnDefinition).Type
+		case ColumnsOffset:
+			idx, bytesRead := path.nextPathOffset()
+			path = path[bytesRead:]
+			node = node.(Columns)[idx]
+		case RefOfCommonTableExprID:
+			node = node.(*CommonTableExpr).ID
+		case RefOfCommonTableExprColumns:
+			node = node.(*CommonTableExpr).Columns
+		case RefOfCommonTableExprSubquery:
+			node = node.(*CommonTableExpr).Subquery
+		case RefOfComparisonExprLeft:
+			node = node.(*ComparisonExpr).Left
+		case RefOfComparisonExprRight:
+			node = node.(*ComparisonExpr).Right
+		case RefOfComparisonExprEscape:
+			node = node.(*ComparisonExpr).Escape
+		case RefOfConstraintDefinitionName:
+			node = node.(*ConstraintDefinition).Name
+		case RefOfConstraintDefinitionDetails:
+			node = node.(*ConstraintDefinition).Details
+		case RefOfConvertExprExpr:
+			node = node.(*ConvertExpr).Expr
+		case RefOfConvertExprType:
+			node = node.(*ConvertExpr).Type
+		case RefOfConvertUsingExprExpr:
+			node = node.(*ConvertUsingExpr).Expr
+		case RefOfCountArgsOffset:
+			idx, bytesRead := path.nextPathOffset()
+			path = path[bytesRead:]
+			node = node.(*Count).Args[idx]
+		case RefOfCountOverClause:
+			node = node.(*Count).OverClause
+		case RefOfCountStarOverClause:
+			node = node.(*CountStar).OverClause
+		case RefOfCreateDatabaseComments:
+			node = node.(*CreateDatabase).Comments
+		case RefOfCreateDatabaseDBName:
+			node = node.(*CreateDatabase).DBName
+		case RefOfCreateTableTable:
+			node = node.(*CreateTable).Table
+		case RefOfCreateTableTableSpec:
+			node = node.(*CreateTable).TableSpec
+		case RefOfCreateTableOptLike:
+			node = node.(*CreateTable).OptLike
+		case RefOfCreateTableComments:
+			node = node.(*CreateTable).Comments
+		case RefOfCreateViewViewName:
+			node = node.(*CreateView).ViewName
+		case RefOfCreateViewDefiner:
+			node = node.(*CreateView).Definer
+		case RefOfCreateViewColumns:
+			node = node.(*CreateView).Columns
+		case RefOfCreateViewSelect:
+			node = node.(*CreateView).Select
+		case RefOfCreateViewComments:
+			node = node.(*CreateView).Comments
+		case RefOfCurTimeFuncExprName:
+			node = node.(*CurTimeFuncExpr).Name
+		case RefOfDeallocateStmtComments:
+			node = node.(*DeallocateStmt).Comments
+		case RefOfDeallocateStmtName:
+			node = node.(*DeallocateStmt).Name
+		case RefOfDeleteWith:
+			node = node.(*Delete).With
+		case RefOfDeleteComments:
+			node = node.(*Delete).Comments
+		case RefOfDeleteTableExprsOffset:
+			idx, bytesRead := path.nextPathOffset()
+			path = path[bytesRead:]
+			node = node.(*Delete).TableExprs[idx]
+		case RefOfDeleteTargets:
+			node = node.(*Delete).Targets
+		case RefOfDeletePartitions:
+			node = node.(*Delete).Partitions
+		case RefOfDeleteWhere:
+			node = node.(*Delete).Where
+		case RefOfDeleteOrderBy:
+			node = node.(*Delete).OrderBy
+		case RefOfDeleteLimit:
+			node = node.(*Delete).Limit
+		case RefOfDerivedTableSelect:
+			node = node.(*DerivedTable).Select
+		case RefOfDropColumnName:
+			node = node.(*DropColumn).Name
+		case RefOfDropDatabaseComments:
+			node = node.(*DropDatabase).Comments
+		case RefOfDropDatabaseDBName:
+			node = node.(*DropDatabase).DBName
+		case RefOfDropKeyName:
+			node = node.(*DropKey).Name
+		case RefOfDropTableFromTables:
+			node = node.(*DropTable).FromTables
+		case RefOfDropTableComments:
+			node = node.(*DropTable).Comments
+		case RefOfDropViewFromTables:
+			node = node.(*DropView).FromTables
+		case RefOfDropViewComments:
+			node = node.(*DropView).Comments
+		case RefOfExecuteStmtName:
+			node = node.(*ExecuteStmt).Name
+		case RefOfExecuteStmtComments:
+			node = node.(*ExecuteStmt).Comments
+		case RefOfExecuteStmtArgumentsOffset:
+			idx, bytesRead := path.nextPathOffset()
+			path = path[bytesRead:]
+			node = node.(*ExecuteStmt).Arguments[idx]
+		case RefOfExistsExprSubquery:
+			node = node.(*ExistsExpr).Subquery
+		case RefOfExplainStmtStatement:
+			node = node.(*ExplainStmt).Statement
+		case RefOfExplainStmtComments:
+			node = node.(*ExplainStmt).Comments
+		case RefOfExplainTabTable:
+			node = node.(*ExplainTab).Table
+		case RefOfExprsExprsOffset:
+			idx, bytesRead := path.nextPathOffset()
+			path = path[bytesRead:]
+			node = node.(*Exprs).Exprs[idx]
+		case RefOfExtractFuncExprExpr:
+			node = node.(*ExtractFuncExpr).Expr
+		case RefOfExtractValueExprFragment:
+			node = node.(*ExtractValueExpr).Fragment
+		case RefOfExtractValueExprXPathExpr:
+			node = node.(*ExtractValueExpr).XPathExpr
+		case RefOfFirstOrLastValueExprExpr:
+			node = node.(*FirstOrLastValueExpr).Expr
+		case RefOfFirstOrLastValueExprNullTreatmentClause:
+			node = node.(*FirstOrLastValueExpr).NullTreatmentClause
+		case RefOfFirstOrLastValueExprOverClause:
+			node = node.(*FirstOrLastValueExpr).OverClause
+		case RefOfFlushTableNames:
+			node = node.(*Flush).TableNames
+		case RefOfForeignKeyDefinitionSource:
+			node = node.(*ForeignKeyDefinition).Source
+		case RefOfForeignKeyDefinitionIndexName:
+			node = node.(*ForeignKeyDefinition).IndexName
+		case RefOfForeignKeyDefinitionReferenceDefinition:
+			node = node.(*ForeignKeyDefinition).ReferenceDefinition
+		case RefOfFrameClauseStart:
+			node = node.(*FrameClause).Start
+		case RefOfFrameClauseEnd:
+			node = node.(*FrameClause).End
+		case RefOfFramePointExpr:
+			node = node.(*FramePoint).Expr
+		case RefOfFuncExprQualifier:
+			node = node.(*FuncExpr).Qualifier
+		case RefOfFuncExprName:
+			node = node.(*FuncExpr).Name
+		case RefOfFuncExprExprsOffset:
+			idx, bytesRead := path.nextPathOffset()
+			path = path[bytesRead:]
+			node = node.(*FuncExpr).Exprs[idx]
+		case RefOfGTIDFuncExprSet1:
+			node = node.(*GTIDFuncExpr).Set1
+		case RefOfGTIDFuncExprSet2:
+			node = node.(*GTIDFuncExpr).Set2
+		case RefOfGTIDFuncExprTimeout:
+			node = node.(*GTIDFuncExpr).Timeout
+		case RefOfGTIDFuncExprChannel:
+			node = node.(*GTIDFuncExpr).Channel
+		case RefOfGeoHashFromLatLongExprLatitude:
+			node = node.(*GeoHashFromLatLongExpr).Latitude
+		case RefOfGeoHashFromLatLongExprLongitude:
+			node = node.(*GeoHashFromLatLongExpr).Longitude
+		case RefOfGeoHashFromLatLongExprMaxLength:
+			node = node.(*GeoHashFromLatLongExpr).MaxLength
+		case RefOfGeoHashFromPointExprPoint:
+			node = node.(*GeoHashFromPointExpr).Point
+		case RefOfGeoHashFromPointExprMaxLength:
+			node = node.(*GeoHashFromPointExpr).MaxLength
+		case RefOfGeoJSONFromGeomExprGeom:
+			node = node.(*GeoJSONFromGeomExpr).Geom
+		case RefOfGeoJSONFromGeomExprMaxDecimalDigits:
+			node = node.(*GeoJSONFromGeomExpr).MaxDecimalDigits
+		case RefOfGeoJSONFromGeomExprBitmask:
+			node = node.(*GeoJSONFromGeomExpr).Bitmask
+		case RefOfGeomCollPropertyFuncExprGeomColl:
+			node = node.(*GeomCollPropertyFuncExpr).GeomColl
+		case RefOfGeomCollPropertyFuncExprPropertyDefArg:
+			node = node.(*GeomCollPropertyFuncExpr).PropertyDefArg
+		case RefOfGeomFormatExprGeom:
+			node = node.(*GeomFormatExpr).Geom
+		case RefOfGeomFormatExprAxisOrderOpt:
+			node = node.(*GeomFormatExpr).AxisOrderOpt
+		case RefOfGeomFromGeoHashExprGeoHash:
+			node = node.(*GeomFromGeoHashExpr).GeoHash
+		case RefOfGeomFromGeoHashExprSridOpt:
+			node = node.(*GeomFromGeoHashExpr).SridOpt
+		case RefOfGeomFromGeoJSONExprGeoJSON:
+			node = node.(*GeomFromGeoJSONExpr).GeoJSON
+		case RefOfGeomFromGeoJSONExprHigherDimHandlerOpt:
+			node = node.(*GeomFromGeoJSONExpr).HigherDimHandlerOpt
+		case RefOfGeomFromGeoJSONExprSrid:
+			node = node.(*GeomFromGeoJSONExpr).Srid
+		case RefOfGeomFromTextExprWktText:
+			node = node.(*GeomFromTextExpr).WktText
+		case RefOfGeomFromTextExprSrid:
+			node = node.(*GeomFromTextExpr).Srid
+		case RefOfGeomFromTextExprAxisOrderOpt:
+			node = node.(*GeomFromTextExpr).AxisOrderOpt
+		case RefOfGeomFromWKBExprWkbBlob:
+			node = node.(*GeomFromWKBExpr).WkbBlob
+		case RefOfGeomFromWKBExprSrid:
+			node = node.(*GeomFromWKBExpr).Srid
+		case RefOfGeomFromWKBExprAxisOrderOpt:
+			node = node.(*GeomFromWKBExpr).AxisOrderOpt
+		case RefOfGeomPropertyFuncExprGeom:
+			node = node.(*GeomPropertyFuncExpr).Geom
+		case RefOfGroupByExprsOffset:
+			idx, bytesRead := path.nextPathOffset()
+			path = path[bytesRead:]
+			node = node.(*GroupBy).Exprs[idx]
+		case RefOfGroupConcatExprExprsOffset:
+			idx, bytesRead := path.nextPathOffset()
+			path = path[bytesRead:]
+			node = node.(*GroupConcatExpr).Exprs[idx]
+		case RefOfGroupConcatExprOrderBy:
+			node = node.(*GroupConcatExpr).OrderBy
+		case RefOfGroupConcatExprLimit:
+			node = node.(*GroupConcatExpr).Limit
+		case RefOfIndexDefinitionInfo:
+			node = node.(*IndexDefinition).Info
+		case RefOfIndexHintIndexesOffset:
+			idx, bytesRead := path.nextPathOffset()
+			path = path[bytesRead:]
+			node = node.(*IndexHint).Indexes[idx]
+		case IndexHintsOffset:
+			idx, bytesRead := path.nextPathOffset()
+			path = path[bytesRead:]
+			node = node.(IndexHints)[idx]
+		case RefOfIndexInfoName:
+			node = node.(*IndexInfo).Name
+		case RefOfIndexInfoConstraintName:
+			node = node.(*IndexInfo).ConstraintName
+		case RefOfInsertComments:
+			node = node.(*Insert).Comments
+		case RefOfInsertTable:
+			node = node.(*Insert).Table
+		case RefOfInsertPartitions:
+			node = node.(*Insert).Partitions
+		case RefOfInsertColumns:
+			node = node.(*Insert).Columns
+		case RefOfInsertRows:
+			node = node.(*Insert).Rows
+		case RefOfInsertRowAlias:
+			node = node.(*Insert).RowAlias
+		case RefOfInsertOnDup:
+			node = node.(*Insert).OnDup
+		case RefOfInsertExprStr:
+			node = node.(*InsertExpr).Str
+		case RefOfInsertExprPos:
+			node = node.(*InsertExpr).Pos
+		case RefOfInsertExprLen:
+			node = node.(*InsertExpr).Len
+		case RefOfInsertExprNewStr:
+			node = node.(*InsertExpr).NewStr
+		case RefOfIntervalDateExprDate:
+			node = node.(*IntervalDateExpr).Date
+		case RefOfIntervalDateExprInterval:
+			node = node.(*IntervalDateExpr).Interval
+		case RefOfIntervalFuncExprExpr:
+			node = node.(*IntervalFuncExpr).Expr
+		case RefOfIntervalFuncExprExprsOffset:
+			idx, bytesRead := path.nextPathOffset()
+			path = path[bytesRead:]
+			node = node.(*IntervalFuncExpr).Exprs[idx]
+		case RefOfIntroducerExprExpr:
+			node = node.(*IntroducerExpr).Expr
+		case RefOfIsExprLeft:
+			node = node.(*IsExpr).Left
+		case RefOfJSONArrayAggExpr:
+			node = node.(*JSONArrayAgg).Expr
+		case RefOfJSONArrayAggOverClause:
+			node = node.(*JSONArrayAgg).OverClause
+		case RefOfJSONArrayExprParamsOffset:
+			idx, bytesRead := path.nextPathOffset()
+			path = path[bytesRead:]
+			node = node.(*JSONArrayExpr).Params[idx]
+		case RefOfJSONAttributesExprJSONDoc:
+			node = node.(*JSONAttributesExpr).JSONDoc
+		case RefOfJSONAttributesExprPath:
+			node = node.(*JSONAttributesExpr).Path
+		case RefOfJSONContainsExprTarget:
+			node = node.(*JSONContainsExpr).Target
+		case RefOfJSONContainsExprCandidate:
+			node = node.(*JSONContainsExpr).Candidate
+		case RefOfJSONContainsExprPathListOffset:
+			idx, bytesRead := path.nextPathOffset()
+			path = path[bytesRead:]
+			node = node.(*JSONContainsExpr).PathList[idx]
+		case RefOfJSONContainsPathExprJSONDoc:
+			node = node.(*JSONContainsPathExpr).JSONDoc
+		case RefOfJSONContainsPathExprOneOrAll:
+			node = node.(*JSONContainsPathExpr).OneOrAll
+		case RefOfJSONContainsPathExprPathListOffset:
+			idx, bytesRead := path.nextPathOffset()
+			path = path[bytesRead:]
+			node = node.(*JSONContainsPathExpr).PathList[idx]
+		case RefOfJSONExtractExprJSONDoc:
+			node = node.(*JSONExtractExpr).JSONDoc
+		case RefOfJSONExtractExprPathListOffset:
+			idx, bytesRead := path.nextPathOffset()
+			path = path[bytesRead:]
+			node = node.(*JSONExtractExpr).PathList[idx]
+		case RefOfJSONKeysExprJSONDoc:
+			node = node.(*JSONKeysExpr).JSONDoc
+		case RefOfJSONKeysExprPath:
+			node = node.(*JSONKeysExpr).Path
+		case RefOfJSONObjectAggKey:
+			node = node.(*JSONObjectAgg).Key
+		case RefOfJSONObjectAggValue:
+			node = node.(*JSONObjectAgg).Value
+		case RefOfJSONObjectAggOverClause:
+			node = node.(*JSONObjectAgg).OverClause
+		case RefOfJSONObjectExprParamsOffset:
+			idx, bytesRead := path.nextPathOffset()
+			path = path[bytesRead:]
+			node = node.(*JSONObjectExpr).Params[idx]
+		case RefOfJSONObjectParamKey:
+			node = node.(*JSONObjectParam).Key
+		case RefOfJSONObjectParamValue:
+			node = node.(*JSONObjectParam).Value
+		case RefOfJSONOverlapsExprJSONDoc1:
+			node = node.(*JSONOverlapsExpr).JSONDoc1
+		case RefOfJSONOverlapsExprJSONDoc2:
+			node = node.(*JSONOverlapsExpr).JSONDoc2
+		case RefOfJSONPrettyExprJSONVal:
+			node = node.(*JSONPrettyExpr).JSONVal
+		case RefOfJSONQuoteExprStringArg:
+			node = node.(*JSONQuoteExpr).StringArg
+		case RefOfJSONRemoveExprJSONDoc:
+			node = node.(*JSONRemoveExpr).JSONDoc
+		case RefOfJSONRemoveExprPathListOffset:
+			idx, bytesRead := path.nextPathOffset()
+			path = path[bytesRead:]
+			node = node.(*JSONRemoveExpr).PathList[idx]
+		case RefOfJSONSchemaValidFuncExprSchema:
+			node = node.(*JSONSchemaValidFuncExpr).Schema
+		case RefOfJSONSchemaValidFuncExprDocument:
+			node = node.(*JSONSchemaValidFuncExpr).Document
+		case RefOfJSONSchemaValidationReportFuncExprSchema:
+			node = node.(*JSONSchemaValidationReportFuncExpr).Schema
+		case RefOfJSONSchemaValidationReportFuncExprDocument:
+			node = node.(*JSONSchemaValidationReportFuncExpr).Document
+		case RefOfJSONSearchExprJSONDoc:
+			node = node.(*JSONSearchExpr).JSONDoc
+		case RefOfJSONSearchExprOneOrAll:
+			node = node.(*JSONSearchExpr).OneOrAll
+		case RefOfJSONSearchExprSearchStr:
+			node = node.(*JSONSearchExpr).SearchStr
+		case RefOfJSONSearchExprEscapeChar:
+			node = node.(*JSONSearchExpr).EscapeChar
+		case RefOfJSONSearchExprPathListOffset:
+			idx, bytesRead := path.nextPathOffset()
+			path = path[bytesRead:]
+			node = node.(*JSONSearchExpr).PathList[idx]
+		case RefOfJSONStorageFreeExprJSONVal:
+			node = node.(*JSONStorageFreeExpr).JSONVal
+		case RefOfJSONStorageSizeExprJSONVal:
+			node = node.(*JSONStorageSizeExpr).JSONVal
+		case RefOfJSONTableExprExpr:
+			node = node.(*JSONTableExpr).Expr
+		case RefOfJSONTableExprAlias:
+			node = node.(*JSONTableExpr).Alias
+		case RefOfJSONTableExprFilter:
+			node = node.(*JSONTableExpr).Filter
+		case RefOfJSONTableExprColumnsOffset:
+			idx, bytesRead := path.nextPathOffset()
+			path = path[bytesRead:]
+			node = node.(*JSONTableExpr).Columns[idx]
+		case RefOfJSONUnquoteExprJSONValue:
+			node = node.(*JSONUnquoteExpr).JSONValue
+		case RefOfJSONValueExprJSONDoc:
+			node = node.(*JSONValueExpr).JSONDoc
+		case RefOfJSONValueExprPath:
+			node = node.(*JSONValueExpr).Path
+		case RefOfJSONValueExprReturningType:
+			node = node.(*JSONValueExpr).ReturningType
+		case RefOfJSONValueExprEmptyOnResponse:
+			node = node.(*JSONValueExpr).EmptyOnResponse
+		case RefOfJSONValueExprErrorOnResponse:
+			node = node.(*JSONValueExpr).ErrorOnResponse
+		case RefOfJSONValueMergeExprJSONDoc:
+			node = node.(*JSONValueMergeExpr).JSONDoc
+		case RefOfJSONValueMergeExprJSONDocListOffset:
+			idx, bytesRead := path.nextPathOffset()
+			path = path[bytesRead:]
+			node = node.(*JSONValueMergeExpr).JSONDocList[idx]
+		case RefOfJSONValueModifierExprJSONDoc:
+			node = node.(*JSONValueModifierExpr).JSONDoc
+		case RefOfJSONValueModifierExprParamsOffset:
+			idx, bytesRead := path.nextPathOffset()
+			path = path[bytesRead:]
+			node = node.(*JSONValueModifierExpr).Params[idx]
+		case RefOfJoinConditionOn:
+			node = node.(*JoinCondition).On
+		case RefOfJoinConditionUsing:
+			node = node.(*JoinCondition).Using
+		case RefOfJoinTableExprLeftExpr:
+			node = node.(*JoinTableExpr).LeftExpr
+		case RefOfJoinTableExprRightExpr:
+			node = node.(*JoinTableExpr).RightExpr
+		case RefOfJoinTableExprCondition:
+			node = node.(*JoinTableExpr).Condition
+		case RefOfJtOnResponseExpr:
+			node = node.(*JtOnResponse).Expr
+		case RefOfLagLeadExprExpr:
+			node = node.(*LagLeadExpr).Expr
+		case RefOfLagLeadExprN:
+			node = node.(*LagLeadExpr).N
+		case RefOfLagLeadExprDefault:
+			node = node.(*LagLeadExpr).Default
+		case RefOfLagLeadExprOverClause:
+			node = node.(*LagLeadExpr).OverClause
+		case RefOfLagLeadExprNullTreatmentClause:
+			node = node.(*LagLeadExpr).NullTreatmentClause
+		case RefOfLimitOffset:
+			node = node.(*Limit).Offset
+		case RefOfLimitRowcount:
+			node = node.(*Limit).Rowcount
+		case RefOfLineStringExprPointParamsOffset:
+			idx, bytesRead := path.nextPathOffset()
+			path = path[bytesRead:]
+			node = node.(*LineStringExpr).PointParams[idx]
+		case RefOfLinestrPropertyFuncExprLinestring:
+			node = node.(*LinestrPropertyFuncExpr).Linestring
+		case RefOfLinestrPropertyFuncExprPropertyDefArg:
+			node = node.(*LinestrPropertyFuncExpr).PropertyDefArg
+		case RefOfLocateExprSubStr:
+			node = node.(*LocateExpr).SubStr
+		case RefOfLocateExprStr:
+			node = node.(*LocateExpr).Str
+		case RefOfLocateExprPos:
+			node = node.(*LocateExpr).Pos
+		case RefOfLockingFuncName:
+			node = node.(*LockingFunc).Name
+		case RefOfLockingFuncTimeout:
+			node = node.(*LockingFunc).Timeout
+		case RefOfMatchExprColumnsOffset:
+			idx, bytesRead := path.nextPathOffset()
+			path = path[bytesRead:]
+			node = node.(*MatchExpr).Columns[idx]
+		case RefOfMatchExprExpr:
+			node = node.(*MatchExpr).Expr
+		case RefOfMaxArg:
+			node = node.(*Max).Arg
+		case RefOfMaxOverClause:
+			node = node.(*Max).OverClause
+		case RefOfMemberOfExprValue:
+			node = node.(*MemberOfExpr).Value
+		case RefOfMemberOfExprJSONArr:
+			node = node.(*MemberOfExpr).JSONArr
+		case RefOfMinArg:
+			node = node.(*Min).Arg
+		case RefOfMinOverClause:
+			node = node.(*Min).OverClause
+		case RefOfModifyColumnNewColDefinition:
+			node = node.(*ModifyColumn).NewColDefinition
+		case RefOfModifyColumnAfter:
+			node = node.(*ModifyColumn).After
+		case RefOfMultiLinestringExprLinestringParamsOffset:
+			idx, bytesRead := path.nextPathOffset()
+			path = path[bytesRead:]
+			node = node.(*MultiLinestringExpr).LinestringParams[idx]
+		case RefOfMultiPointExprPointParamsOffset:
+			idx, bytesRead := path.nextPathOffset()
+			path = path[bytesRead:]
+			node = node.(*MultiPointExpr).PointParams[idx]
+		case RefOfMultiPolygonExprPolygonParamsOffset:
+			idx, bytesRead := path.nextPathOffset()
+			path = path[bytesRead:]
+			node = node.(*MultiPolygonExpr).PolygonParams[idx]
+		case RefOfNTHValueExprExpr:
+			node = node.(*NTHValueExpr).Expr
+		case RefOfNTHValueExprN:
+			node = node.(*NTHValueExpr).N
+		case RefOfNTHValueExprOverClause:
+			node = node.(*NTHValueExpr).OverClause
+		case RefOfNTHValueExprFromFirstLastClause:
+			node = node.(*NTHValueExpr).FromFirstLastClause
+		case RefOfNTHValueExprNullTreatmentClause:
+			node = node.(*NTHValueExpr).NullTreatmentClause
+		case RefOfNamedWindowWindows:
+			node = node.(*NamedWindow).Windows
+		case NamedWindowsOffset:
+			idx, bytesRead := path.nextPathOffset()
+			path = path[bytesRead:]
+			node = node.(NamedWindows)[idx]
+		case RefOfNextvalExpr:
+			node = node.(*Nextval).Expr
+		case RefOfNotExprExpr:
+			node = node.(*NotExpr).Expr
+		case RefOfNtileExprN:
+			node = node.(*NtileExpr).N
+		case RefOfNtileExprOverClause:
+			node = node.(*NtileExpr).OverClause
+		case RefOfOffsetOriginal:
+			node = node.(*Offset).Original
+		case OnDupOffset:
+			idx, bytesRead := path.nextPathOffset()
+			path = path[bytesRead:]
+			node = node.(OnDup)[idx]
+		case RefOfOptLikeLikeTable:
+			node = node.(*OptLike).LikeTable
+		case RefOfOrExprLeft:
+			node = node.(*OrExpr).Left
+		case RefOfOrExprRight:
+			node = node.(*OrExpr).Right
+		case RefOfOrderExpr:
+			node = node.(*Order).Expr
+		case OrderByOffset:
+			idx, bytesRead := path.nextPathOffset()
+			path = path[bytesRead:]
+			node = node.(OrderBy)[idx]
+		case RefOfOrderByOptionCols:
+			node = node.(*OrderByOption).Cols
+		case RefOfOverClauseWindowName:
+			node = node.(*OverClause).WindowName
+		case RefOfOverClauseWindowSpec:
+			node = node.(*OverClause).WindowSpec
+		case RefOfParenTableExprExprs:
+			node = node.(*ParenTableExpr).Exprs
+		case RefOfPartitionDefinitionName:
+			node = node.(*PartitionDefinition).Name
+		case RefOfPartitionDefinitionOptions:
+			node = node.(*PartitionDefinition).Options
+		case RefOfPartitionDefinitionOptionsValueRange:
+			node = node.(*PartitionDefinitionOptions).ValueRange
+		case RefOfPartitionDefinitionOptionsComment:
+			node = node.(*PartitionDefinitionOptions).Comment
+		case RefOfPartitionDefinitionOptionsEngine:
+			node = node.(*PartitionDefinitionOptions).Engine
+		case RefOfPartitionDefinitionOptionsDataDirectory:
+			node = node.(*PartitionDefinitionOptions).DataDirectory
+		case RefOfPartitionDefinitionOptionsIndexDirectory:
+			node = node.(*PartitionDefinitionOptions).IndexDirectory
+		case RefOfPartitionDefinitionOptionsSubPartitionDefinitions:
+			node = node.(*PartitionDefinitionOptions).SubPartitionDefinitions
+		case RefOfPartitionOptionColList:
+			node = node.(*PartitionOption).ColList
+		case RefOfPartitionOptionExpr:
+			node = node.(*PartitionOption).Expr
+		case RefOfPartitionOptionSubPartition:
+			node = node.(*PartitionOption).SubPartition
+		case RefOfPartitionOptionDefinitionsOffset:
+			idx, bytesRead := path.nextPathOffset()
+			path = path[bytesRead:]
+			node = node.(*PartitionOption).Definitions[idx]
+		case RefOfPartitionSpecNames:
+			node = node.(*PartitionSpec).Names
+		case RefOfPartitionSpecNumber:
+			node = node.(*PartitionSpec).Number
+		case RefOfPartitionSpecTableName:
+			node = node.(*PartitionSpec).TableName
+		case RefOfPartitionSpecDefinitionsOffset:
+			idx, bytesRead := path.nextPathOffset()
+			path = path[bytesRead:]
+			node = node.(*PartitionSpec).Definitions[idx]
+		case RefOfPartitionValueRangeRange:
+			node = node.(*PartitionValueRange).Range
+		case PartitionsOffset:
+			idx, bytesRead := path.nextPathOffset()
+			path = path[bytesRead:]
+			node = node.(Partitions)[idx]
+		case RefOfPerformanceSchemaFuncExprArgument:
+			node = node.(*PerformanceSchemaFuncExpr).Argument
+		case RefOfPointExprXCordinate:
+			node = node.(*PointExpr).XCordinate
+		case RefOfPointExprYCordinate:
+			node = node.(*PointExpr).YCordinate
+		case RefOfPointPropertyFuncExprPoint:
+			node = node.(*PointPropertyFuncExpr).Point
+		case RefOfPointPropertyFuncExprValueToSet:
+			node = node.(*PointPropertyFuncExpr).ValueToSet
+		case RefOfPolygonExprLinestringParamsOffset:
+			idx, bytesRead := path.nextPathOffset()
+			path = path[bytesRead:]
+			node = node.(*PolygonExpr).LinestringParams[idx]
+		case RefOfPolygonPropertyFuncExprPolygon:
+			node = node.(*PolygonPropertyFuncExpr).Polygon
+		case RefOfPolygonPropertyFuncExprPropertyDefArg:
+			node = node.(*PolygonPropertyFuncExpr).PropertyDefArg
+		case RefOfPrepareStmtName:
+			node = node.(*PrepareStmt).Name
+		case RefOfPrepareStmtStatement:
+			node = node.(*PrepareStmt).Statement
+		case RefOfPrepareStmtComments:
+			node = node.(*PrepareStmt).Comments
+		case RefOfReferenceDefinitionReferencedTable:
+			node = node.(*ReferenceDefinition).ReferencedTable
+		case RefOfReferenceDefinitionReferencedColumns:
+			node = node.(*ReferenceDefinition).ReferencedColumns
+		case RefOfReferenceDefinitionMatch:
+			node = node.(*ReferenceDefinition).Match
+		case RefOfReferenceDefinitionOnDelete:
+			node = node.(*ReferenceDefinition).OnDelete
+		case RefOfReferenceDefinitionOnUpdate:
+			node = node.(*ReferenceDefinition).OnUpdate
+		case RefOfRegexpInstrExprExpr:
+			node = node.(*RegexpInstrExpr).Expr
+		case RefOfRegexpInstrExprPattern:
+			node = node.(*RegexpInstrExpr).Pattern
+		case RefOfRegexpInstrExprPosition:
+			node = node.(*RegexpInstrExpr).Position
+		case RefOfRegexpInstrExprOccurrence:
+			node = node.(*RegexpInstrExpr).Occurrence
+		case RefOfRegexpInstrExprReturnOption:
+			node = node.(*RegexpInstrExpr).ReturnOption
+		case RefOfRegexpInstrExprMatchType:
+			node = node.(*RegexpInstrExpr).MatchType
+		case RefOfRegexpLikeExprExpr:
+			node = node.(*RegexpLikeExpr).Expr
+		case RefOfRegexpLikeExprPattern:
+			node = node.(*RegexpLikeExpr).Pattern
+		case RefOfRegexpLikeExprMatchType:
+			node = node.(*RegexpLikeExpr).MatchType
+		case RefOfRegexpReplaceExprExpr:
+			node = node.(*RegexpReplaceExpr).Expr
+		case RefOfRegexpReplaceExprPattern:
+			node = node.(*RegexpReplaceExpr).Pattern
+		case RefOfRegexpReplaceExprRepl:
+			node = node.(*RegexpReplaceExpr).Repl
+		case RefOfRegexpReplaceExprOccurrence:
+			node = node.(*RegexpReplaceExpr).Occurrence
+		case RefOfRegexpReplaceExprPosition:
+			node = node.(*RegexpReplaceExpr).Position
+		case RefOfRegexpReplaceExprMatchType:
+			node = node.(*RegexpReplaceExpr).MatchType
+		case RefOfRegexpSubstrExprExpr:
+			node = node.(*RegexpSubstrExpr).Expr
+		case RefOfRegexpSubstrExprPattern:
+			node = node.(*RegexpSubstrExpr).Pattern
+		case RefOfRegexpSubstrExprOccurrence:
+			node = node.(*RegexpSubstrExpr).Occurrence
+		case RefOfRegexpSubstrExprPosition:
+			node = node.(*RegexpSubstrExpr).Position
+		case RefOfRegexpSubstrExprMatchType:
+			node = node.(*RegexpSubstrExpr).MatchType
+		case RefOfReleaseName:
+			node = node.(*Release).Name
+		case RefOfRenameColumnOldName:
+			node = node.(*RenameColumn).OldName
+		case RefOfRenameColumnNewName:
+			node = node.(*RenameColumn).NewName
+		case RefOfRenameIndexOldName:
+			node = node.(*RenameIndex).OldName
+		case RefOfRenameIndexNewName:
+			node = node.(*RenameIndex).NewName
+		case RefOfRenameTableNameTable:
+			node = node.(*RenameTableName).Table
+		case RefOfRevertMigrationComments:
+			node = node.(*RevertMigration).Comments
+		case RootNodeSQLNode:
+			node = node.(RootNode).SQLNode
+		case RefOfRowAliasTableName:
+			node = node.(*RowAlias).TableName
+		case RefOfRowAliasColumns:
+			node = node.(*RowAlias).Columns
+		case RefOfSRollbackName:
+			node = node.(*SRollback).Name
+		case RefOfSavepointName:
+			node = node.(*Savepoint).Name
+		case RefOfSelectWith:
+			node = node.(*Select).With
+		case RefOfSelectFromOffset:
+			idx, bytesRead := path.nextPathOffset()
+			path = path[bytesRead:]
+			node = node.(*Select).From[idx]
+		case RefOfSelectComments:
+			node = node.(*Select).Comments
+		case RefOfSelectSelectExprs:
+			node = node.(*Select).SelectExprs
+		case RefOfSelectWhere:
+			node = node.(*Select).Where
+		case RefOfSelectGroupBy:
+			node = node.(*Select).GroupBy
+		case RefOfSelectHaving:
+			node = node.(*Select).Having
+		case RefOfSelectWindows:
+			node = node.(*Select).Windows
+		case RefOfSelectOrderBy:
+			node = node.(*Select).OrderBy
+		case RefOfSelectLimit:
+			node = node.(*Select).Limit
+		case RefOfSelectInto:
+			node = node.(*Select).Into
+		case RefOfSelectExprsExprsOffset:
+			idx, bytesRead := path.nextPathOffset()
+			path = path[bytesRead:]
+			node = node.(*SelectExprs).Exprs[idx]
+		case RefOfSetComments:
+			node = node.(*Set).Comments
+		case RefOfSetExprs:
+			node = node.(*Set).Exprs
+		case RefOfSetExprVar:
+			node = node.(*SetExpr).Var
+		case RefOfSetExprExpr:
+			node = node.(*SetExpr).Expr
+		case SetExprsOffset:
+			idx, bytesRead := path.nextPathOffset()
+			path = path[bytesRead:]
+			node = node.(SetExprs)[idx]
+		case RefOfShowInternal:
+			node = node.(*Show).Internal
+		case RefOfShowBasicTbl:
+			node = node.(*ShowBasic).Tbl
+		case RefOfShowBasicDbName:
+			node = node.(*ShowBasic).DbName
+		case RefOfShowBasicFilter:
+			node = node.(*ShowBasic).Filter
+		case RefOfShowCreateOp:
+			node = node.(*ShowCreate).Op
+		case RefOfShowFilterFilter:
+			node = node.(*ShowFilter).Filter
+		case RefOfShowMigrationLogsComments:
+			node = node.(*ShowMigrationLogs).Comments
+		case RefOfStarExprTableName:
+			node = node.(*StarExpr).TableName
+		case RefOfStdArg:
+			node = node.(*Std).Arg
+		case RefOfStdOverClause:
+			node = node.(*Std).OverClause
+		case RefOfStdDevArg:
+			node = node.(*StdDev).Arg
+		case RefOfStdDevOverClause:
+			node = node.(*StdDev).OverClause
+		case RefOfStdPopArg:
+			node = node.(*StdPop).Arg
+		case RefOfStdPopOverClause:
+			node = node.(*StdPop).OverClause
+		case RefOfStdSampArg:
+			node = node.(*StdSamp).Arg
+		case RefOfStdSampOverClause:
+			node = node.(*StdSamp).OverClause
+		case RefOfStreamComments:
+			node = node.(*Stream).Comments
+		case RefOfStreamSelectExpr:
+			node = node.(*Stream).SelectExpr
+		case RefOfStreamTable:
+			node = node.(*Stream).Table
+		case RefOfSubPartitionColList:
+			node = node.(*SubPartition).ColList
+		case RefOfSubPartitionExpr:
+			node = node.(*SubPartition).Expr
+		case RefOfSubPartitionDefinitionName:
+			node = node.(*SubPartitionDefinition).Name
+		case RefOfSubPartitionDefinitionOptions:
+			node = node.(*SubPartitionDefinition).Options
+		case RefOfSubPartitionDefinitionOptionsComment:
+			node = node.(*SubPartitionDefinitionOptions).Comment
+		case RefOfSubPartitionDefinitionOptionsEngine:
+			node = node.(*SubPartitionDefinitionOptions).Engine
+		case RefOfSubPartitionDefinitionOptionsDataDirectory:
+			node = node.(*SubPartitionDefinitionOptions).DataDirectory
+		case RefOfSubPartitionDefinitionOptionsIndexDirectory:
+			node = node.(*SubPartitionDefinitionOptions).IndexDirectory
+		case SubPartitionDefinitionsOffset:
+			idx, bytesRead := path.nextPathOffset()
+			path = path[bytesRead:]
+			node = node.(SubPartitionDefinitions)[idx]
+		case RefOfSubquerySelect:
+			node = node.(*Subquery).Select
+		case RefOfSubstrExprName:
+			node = node.(*SubstrExpr).Name
+		case RefOfSubstrExprFrom:
+			node = node.(*SubstrExpr).From
+		case RefOfSubstrExprTo:
+			node = node.(*SubstrExpr).To
+		case RefOfSumArg:
+			node = node.(*Sum).Arg
+		case RefOfSumOverClause:
+			node = node.(*Sum).OverClause
+		case TableExprsOffset:
+			idx, bytesRead := path.nextPathOffset()
+			path = path[bytesRead:]
+			node = node.(TableExprs)[idx]
+		case TableNameName:
+			node = node.(TableName).Name
+		case TableNameQualifier:
+			node = node.(TableName).Qualifier
+		case TableNamesOffset:
+			idx, bytesRead := path.nextPathOffset()
+			path = path[bytesRead:]
+			node = node.(TableNames)[idx]
+		case RefOfTableSpecColumnsOffset:
+			idx, bytesRead := path.nextPathOffset()
+			path = path[bytesRead:]
+			node = node.(*TableSpec).Columns[idx]
+		case RefOfTableSpecIndexesOffset:
+			idx, bytesRead := path.nextPathOffset()
+			path = path[bytesRead:]
+			node = node.(*TableSpec).Indexes[idx]
+		case RefOfTableSpecConstraintsOffset:
+			idx, bytesRead := path.nextPathOffset()
+			path = path[bytesRead:]
+			node = node.(*TableSpec).Constraints[idx]
+		case RefOfTableSpecOptions:
+			node = node.(*TableSpec).Options
+		case RefOfTableSpecPartitionOption:
+			node = node.(*TableSpec).PartitionOption
+		case RefOfTimestampDiffExprExpr1:
+			node = node.(*TimestampDiffExpr).Expr1
+		case RefOfTimestampDiffExprExpr2:
+			node = node.(*TimestampDiffExpr).Expr2
+		case RefOfTrimFuncExprTrimArg:
+			node = node.(*TrimFuncExpr).TrimArg
+		case RefOfTrimFuncExprStringArg:
+			node = node.(*TrimFuncExpr).StringArg
+		case RefOfTruncateTableTable:
+			node = node.(*TruncateTable).Table
+		case RefOfUnaryExprExpr:
+			node = node.(*UnaryExpr).Expr
+		case RefOfUnionWith:
+			node = node.(*Union).With
+		case RefOfUnionLeft:
+			node = node.(*Union).Left
+		case RefOfUnionRight:
+			node = node.(*Union).Right
+		case RefOfUnionOrderBy:
+			node = node.(*Union).OrderBy
+		case RefOfUnionLimit:
+			node = node.(*Union).Limit
+		case RefOfUnionInto:
+			node = node.(*Union).Into
+		case RefOfUpdateWith:
+			node = node.(*Update).With
+		case RefOfUpdateComments:
+			node = node.(*Update).Comments
+		case RefOfUpdateTableExprsOffset:
+			idx, bytesRead := path.nextPathOffset()
+			path = path[bytesRead:]
+			node = node.(*Update).TableExprs[idx]
+		case RefOfUpdateExprs:
+			node = node.(*Update).Exprs
+		case RefOfUpdateWhere:
+			node = node.(*Update).Where
+		case RefOfUpdateOrderBy:
+			node = node.(*Update).OrderBy
+		case RefOfUpdateLimit:
+			node = node.(*Update).Limit
+		case RefOfUpdateExprName:
+			node = node.(*UpdateExpr).Name
+		case RefOfUpdateExprExpr:
+			node = node.(*UpdateExpr).Expr
+		case UpdateExprsOffset:
+			idx, bytesRead := path.nextPathOffset()
+			path = path[bytesRead:]
+			node = node.(UpdateExprs)[idx]
+		case RefOfUpdateXMLExprTarget:
+			node = node.(*UpdateXMLExpr).Target
+		case RefOfUpdateXMLExprXPathExpr:
+			node = node.(*UpdateXMLExpr).XPathExpr
+		case RefOfUpdateXMLExprNewXML:
+			node = node.(*UpdateXMLExpr).NewXML
+		case RefOfUseDBName:
+			node = node.(*Use).DBName
+		case RefOfVExplainStmtStatement:
+			node = node.(*VExplainStmt).Statement
+		case RefOfVExplainStmtComments:
+			node = node.(*VExplainStmt).Comments
+		case RefOfVStreamComments:
+			node = node.(*VStream).Comments
+		case RefOfVStreamSelectExpr:
+			node = node.(*VStream).SelectExpr
+		case RefOfVStreamTable:
+			node = node.(*VStream).Table
+		case RefOfVStreamWhere:
+			node = node.(*VStream).Where
+		case RefOfVStreamLimit:
+			node = node.(*VStream).Limit
+		case ValTupleOffset:
+			idx, bytesRead := path.nextPathOffset()
+			path = path[bytesRead:]
+			node = node.(ValTuple)[idx]
+		case ValuesOffset:
+			idx, bytesRead := path.nextPathOffset()
+			path = path[bytesRead:]
+			node = node.(Values)[idx]
+		case RefOfValuesFuncExprName:
+			node = node.(*ValuesFuncExpr).Name
+		case RefOfValuesStatementWith:
+			node = node.(*ValuesStatement).With
+		case RefOfValuesStatementRows:
+			node = node.(*ValuesStatement).Rows
+		case RefOfValuesStatementListArg:
+			node = node.(*ValuesStatement).ListArg
+		case RefOfValuesStatementComments:
+			node = node.(*ValuesStatement).Comments
+		case RefOfValuesStatementOrder:
+			node = node.(*ValuesStatement).Order
+		case RefOfValuesStatementLimit:
+			node = node.(*ValuesStatement).Limit
+		case RefOfVarPopArg:
+			node = node.(*VarPop).Arg
+		case RefOfVarPopOverClause:
+			node = node.(*VarPop).OverClause
+		case RefOfVarSampArg:
+			node = node.(*VarSamp).Arg
+		case RefOfVarSampOverClause:
+			node = node.(*VarSamp).OverClause
+		case RefOfVariableName:
+			node = node.(*Variable).Name
+		case RefOfVarianceArg:
+			node = node.(*Variance).Arg
+		case RefOfVarianceOverClause:
+			node = node.(*Variance).OverClause
+		case VindexParamKey:
+			node = node.(VindexParam).Key
+		case RefOfVindexSpecName:
+			node = node.(*VindexSpec).Name
+		case RefOfVindexSpecType:
+			node = node.(*VindexSpec).Type
+		case RefOfVindexSpecParamsOffset:
+			idx, bytesRead := path.nextPathOffset()
+			path = path[bytesRead:]
+			node = node.(*VindexSpec).Params[idx]
+		case RefOfWeightStringFuncExprExpr:
+			node = node.(*WeightStringFuncExpr).Expr
+		case RefOfWeightStringFuncExprAs:
+			node = node.(*WeightStringFuncExpr).As
+		case RefOfWhenCond:
+			node = node.(*When).Cond
+		case RefOfWhenVal:
+			node = node.(*When).Val
+		case RefOfWhereExpr:
+			node = node.(*Where).Expr
+		case RefOfWindowDefinitionName:
+			node = node.(*WindowDefinition).Name
+		case RefOfWindowDefinitionWindowSpec:
+			node = node.(*WindowDefinition).WindowSpec
+		case WindowDefinitionsOffset:
+			idx, bytesRead := path.nextPathOffset()
+			path = path[bytesRead:]
+			node = node.(WindowDefinitions)[idx]
+		case RefOfWindowSpecificationName:
+			node = node.(*WindowSpecification).Name
+		case RefOfWindowSpecificationPartitionClauseOffset:
+			idx, bytesRead := path.nextPathOffset()
+			path = path[bytesRead:]
+			node = node.(*WindowSpecification).PartitionClause[idx]
+		case RefOfWindowSpecificationOrderClause:
+			node = node.(*WindowSpecification).OrderClause
+		case RefOfWindowSpecificationFrameClause:
+			node = node.(*WindowSpecification).FrameClause
+		case RefOfWithCTEsOffset:
+			idx, bytesRead := path.nextPathOffset()
+			path = path[bytesRead:]
+			node = node.(*With).CTEs[idx]
+		case RefOfXorExprLeft:
+			node = node.(*XorExpr).Left
+		case RefOfXorExprRight:
+			node = node.(*XorExpr).Right
+		case RefOfRootNodeSQLNode:
+			node = node.(*RootNode).SQLNode
+		case RefOfTableNameName:
+			node = node.(*TableName).Name
+		case RefOfTableNameQualifier:
+			node = node.(*TableName).Qualifier
+		case RefOfVindexParamKey:
+			node = node.(*VindexParam).Key
+		default:
+			return nil
+		}
+	}
+	return node
+}
diff --git a/go/vt/sqlparser/ast_rewrite.go b/go/vt/sqlparser/ast_rewrite.go
index a4cfeb4f01c..33e5b0cda42 100644
--- a/go/vt/sqlparser/ast_rewrite.go
+++ b/go/vt/sqlparser/ast_rewrite.go
@@ -1,5 +1,5 @@
 /*
-Copyright 2023 The Vitess Authors.
+Copyright 2025 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.
@@ -17,6 +17,7 @@ limitations under the License.
 
 package sqlparser
 
+// Function Generation Source: InterfaceMethod
 func (a *application) rewriteSQLNode(parent SQLNode, node SQLNode, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -569,6 +570,8 @@ func (a *application) rewriteSQLNode(parent SQLNode, node SQLNode, replacer repl
 		return true
 	}
 }
+
+// Function Generation Source: PtrToStructMethod
 func (a *application) rewriteRefOfAddColumns(parent SQLNode, node *AddColumns, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -587,6 +590,13 @@ func (a *application) rewriteRefOfAddColumns(parent SQLNode, node *AddColumns, r
 		}
 	}
 	for x, el := range node.Columns {
+		if a.collectPaths {
+			if x == 0 {
+				a.cur.current.AddStepWithOffset(uint16(RefOfAddColumnsColumnsOffset))
+			} else {
+				a.cur.current.ChangeOffset(x)
+			}
+		}
 		if !a.rewriteRefOfColumnDefinition(node, el, func(idx int) replacerFunc {
 			return func(newNode, parent SQLNode) {
 				parent.(*AddColumns).Columns[idx] = newNode.(*ColumnDefinition)
@@ -595,11 +605,18 @@ func (a *application) rewriteRefOfAddColumns(parent SQLNode, node *AddColumns, r
 			return false
 		}
 	}
+	if a.collectPaths && len(node.Columns) > 0 {
+		a.cur.current.Pop()
+		a.cur.current.AddStep(uint16(RefOfAddColumnsAfter))
+	}
 	if !a.rewriteRefOfColName(node, node.After, func(newNode, parent SQLNode) {
 		parent.(*AddColumns).After = newNode.(*ColName)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+	}
 	if a.post != nil {
 		a.cur.replacer = replacer
 		a.cur.parent = parent
@@ -610,6 +627,8 @@ func (a *application) rewriteRefOfAddColumns(parent SQLNode, node *AddColumns, r
 	}
 	return true
 }
+
+// Function Generation Source: PtrToStructMethod
 func (a *application) rewriteRefOfAddConstraintDefinition(parent SQLNode, node *AddConstraintDefinition, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -627,11 +646,17 @@ func (a *application) rewriteRefOfAddConstraintDefinition(parent SQLNode, node *
 			return true
 		}
 	}
+	if a.collectPaths {
+		a.cur.current.AddStep(uint16(RefOfAddConstraintDefinitionConstraintDefinition))
+	}
 	if !a.rewriteRefOfConstraintDefinition(node, node.ConstraintDefinition, func(newNode, parent SQLNode) {
 		parent.(*AddConstraintDefinition).ConstraintDefinition = newNode.(*ConstraintDefinition)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+	}
 	if a.post != nil {
 		a.cur.replacer = replacer
 		a.cur.parent = parent
@@ -642,6 +667,8 @@ func (a *application) rewriteRefOfAddConstraintDefinition(parent SQLNode, node *
 	}
 	return true
 }
+
+// Function Generation Source: PtrToStructMethod
 func (a *application) rewriteRefOfAddIndexDefinition(parent SQLNode, node *AddIndexDefinition, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -659,11 +686,17 @@ func (a *application) rewriteRefOfAddIndexDefinition(parent SQLNode, node *AddIn
 			return true
 		}
 	}
+	if a.collectPaths {
+		a.cur.current.AddStep(uint16(RefOfAddIndexDefinitionIndexDefinition))
+	}
 	if !a.rewriteRefOfIndexDefinition(node, node.IndexDefinition, func(newNode, parent SQLNode) {
 		parent.(*AddIndexDefinition).IndexDefinition = newNode.(*IndexDefinition)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+	}
 	if a.post != nil {
 		a.cur.replacer = replacer
 		a.cur.parent = parent
@@ -674,6 +707,8 @@ func (a *application) rewriteRefOfAddIndexDefinition(parent SQLNode, node *AddIn
 	}
 	return true
 }
+
+// Function Generation Source: PtrToStructMethod
 func (a *application) rewriteRefOfAliasedExpr(parent SQLNode, node *AliasedExpr, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -691,16 +726,26 @@ func (a *application) rewriteRefOfAliasedExpr(parent SQLNode, node *AliasedExpr,
 			return true
 		}
 	}
+	if a.collectPaths {
+		a.cur.current.AddStep(uint16(RefOfAliasedExprExpr))
+	}
 	if !a.rewriteExpr(node, node.Expr, func(newNode, parent SQLNode) {
 		parent.(*AliasedExpr).Expr = newNode.(Expr)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+		a.cur.current.AddStep(uint16(RefOfAliasedExprAs))
+	}
 	if !a.rewriteIdentifierCI(node, node.As, func(newNode, parent SQLNode) {
 		parent.(*AliasedExpr).As = newNode.(IdentifierCI)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+	}
 	if a.post != nil {
 		a.cur.replacer = replacer
 		a.cur.parent = parent
@@ -711,6 +756,8 @@ func (a *application) rewriteRefOfAliasedExpr(parent SQLNode, node *AliasedExpr,
 	}
 	return true
 }
+
+// Function Generation Source: PtrToStructMethod
 func (a *application) rewriteRefOfAliasedTableExpr(parent SQLNode, node *AliasedTableExpr, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -728,31 +775,53 @@ func (a *application) rewriteRefOfAliasedTableExpr(parent SQLNode, node *Aliased
 			return true
 		}
 	}
+	if a.collectPaths {
+		a.cur.current.AddStep(uint16(RefOfAliasedTableExprExpr))
+	}
 	if !a.rewriteSimpleTableExpr(node, node.Expr, func(newNode, parent SQLNode) {
 		parent.(*AliasedTableExpr).Expr = newNode.(SimpleTableExpr)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+		a.cur.current.AddStep(uint16(RefOfAliasedTableExprPartitions))
+	}
 	if !a.rewritePartitions(node, node.Partitions, func(newNode, parent SQLNode) {
 		parent.(*AliasedTableExpr).Partitions = newNode.(Partitions)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+		a.cur.current.AddStep(uint16(RefOfAliasedTableExprAs))
+	}
 	if !a.rewriteIdentifierCS(node, node.As, func(newNode, parent SQLNode) {
 		parent.(*AliasedTableExpr).As = newNode.(IdentifierCS)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+		a.cur.current.AddStep(uint16(RefOfAliasedTableExprHints))
+	}
 	if !a.rewriteIndexHints(node, node.Hints, func(newNode, parent SQLNode) {
 		parent.(*AliasedTableExpr).Hints = newNode.(IndexHints)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+		a.cur.current.AddStep(uint16(RefOfAliasedTableExprColumns))
+	}
 	if !a.rewriteColumns(node, node.Columns, func(newNode, parent SQLNode) {
 		parent.(*AliasedTableExpr).Columns = newNode.(Columns)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+	}
 	if a.post != nil {
 		a.cur.replacer = replacer
 		a.cur.parent = parent
@@ -763,6 +832,8 @@ func (a *application) rewriteRefOfAliasedTableExpr(parent SQLNode, node *Aliased
 	}
 	return true
 }
+
+// Function Generation Source: PtrToStructMethod
 func (a *application) rewriteRefOfAlterCharset(parent SQLNode, node *AlterCharset, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -792,6 +863,8 @@ func (a *application) rewriteRefOfAlterCharset(parent SQLNode, node *AlterCharse
 	}
 	return true
 }
+
+// Function Generation Source: PtrToStructMethod
 func (a *application) rewriteRefOfAlterCheck(parent SQLNode, node *AlterCheck, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -809,11 +882,17 @@ func (a *application) rewriteRefOfAlterCheck(parent SQLNode, node *AlterCheck, r
 			return true
 		}
 	}
+	if a.collectPaths {
+		a.cur.current.AddStep(uint16(RefOfAlterCheckName))
+	}
 	if !a.rewriteIdentifierCI(node, node.Name, func(newNode, parent SQLNode) {
 		parent.(*AlterCheck).Name = newNode.(IdentifierCI)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+	}
 	if a.post != nil {
 		a.cur.replacer = replacer
 		a.cur.parent = parent
@@ -824,6 +903,8 @@ func (a *application) rewriteRefOfAlterCheck(parent SQLNode, node *AlterCheck, r
 	}
 	return true
 }
+
+// Function Generation Source: PtrToStructMethod
 func (a *application) rewriteRefOfAlterColumn(parent SQLNode, node *AlterColumn, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -841,16 +922,26 @@ func (a *application) rewriteRefOfAlterColumn(parent SQLNode, node *AlterColumn,
 			return true
 		}
 	}
+	if a.collectPaths {
+		a.cur.current.AddStep(uint16(RefOfAlterColumnColumn))
+	}
 	if !a.rewriteRefOfColName(node, node.Column, func(newNode, parent SQLNode) {
 		parent.(*AlterColumn).Column = newNode.(*ColName)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+		a.cur.current.AddStep(uint16(RefOfAlterColumnDefaultVal))
+	}
 	if !a.rewriteExpr(node, node.DefaultVal, func(newNode, parent SQLNode) {
 		parent.(*AlterColumn).DefaultVal = newNode.(Expr)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+	}
 	if a.post != nil {
 		a.cur.replacer = replacer
 		a.cur.parent = parent
@@ -861,6 +952,8 @@ func (a *application) rewriteRefOfAlterColumn(parent SQLNode, node *AlterColumn,
 	}
 	return true
 }
+
+// Function Generation Source: PtrToStructMethod
 func (a *application) rewriteRefOfAlterDatabase(parent SQLNode, node *AlterDatabase, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -878,16 +971,26 @@ func (a *application) rewriteRefOfAlterDatabase(parent SQLNode, node *AlterDatab
 			return true
 		}
 	}
+	if a.collectPaths {
+		a.cur.current.AddStep(uint16(RefOfAlterDatabaseComments))
+	}
 	if !a.rewriteRefOfParsedComments(node, node.Comments, func(newNode, parent SQLNode) {
 		parent.(*AlterDatabase).Comments = newNode.(*ParsedComments)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+		a.cur.current.AddStep(uint16(RefOfAlterDatabaseDBName))
+	}
 	if !a.rewriteIdentifierCS(node, node.DBName, func(newNode, parent SQLNode) {
 		parent.(*AlterDatabase).DBName = newNode.(IdentifierCS)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+	}
 	if a.post != nil {
 		a.cur.replacer = replacer
 		a.cur.parent = parent
@@ -898,6 +1001,8 @@ func (a *application) rewriteRefOfAlterDatabase(parent SQLNode, node *AlterDatab
 	}
 	return true
 }
+
+// Function Generation Source: PtrToStructMethod
 func (a *application) rewriteRefOfAlterIndex(parent SQLNode, node *AlterIndex, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -915,11 +1020,17 @@ func (a *application) rewriteRefOfAlterIndex(parent SQLNode, node *AlterIndex, r
 			return true
 		}
 	}
+	if a.collectPaths {
+		a.cur.current.AddStep(uint16(RefOfAlterIndexName))
+	}
 	if !a.rewriteIdentifierCI(node, node.Name, func(newNode, parent SQLNode) {
 		parent.(*AlterIndex).Name = newNode.(IdentifierCI)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+	}
 	if a.post != nil {
 		a.cur.replacer = replacer
 		a.cur.parent = parent
@@ -930,6 +1041,8 @@ func (a *application) rewriteRefOfAlterIndex(parent SQLNode, node *AlterIndex, r
 	}
 	return true
 }
+
+// Function Generation Source: PtrToStructMethod
 func (a *application) rewriteRefOfAlterMigration(parent SQLNode, node *AlterMigration, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -947,11 +1060,17 @@ func (a *application) rewriteRefOfAlterMigration(parent SQLNode, node *AlterMigr
 			return true
 		}
 	}
+	if a.collectPaths {
+		a.cur.current.AddStep(uint16(RefOfAlterMigrationRatio))
+	}
 	if !a.rewriteRefOfLiteral(node, node.Ratio, func(newNode, parent SQLNode) {
 		parent.(*AlterMigration).Ratio = newNode.(*Literal)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+	}
 	if a.post != nil {
 		a.cur.replacer = replacer
 		a.cur.parent = parent
@@ -962,6 +1081,8 @@ func (a *application) rewriteRefOfAlterMigration(parent SQLNode, node *AlterMigr
 	}
 	return true
 }
+
+// Function Generation Source: PtrToStructMethod
 func (a *application) rewriteRefOfAlterTable(parent SQLNode, node *AlterTable, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -979,12 +1100,25 @@ func (a *application) rewriteRefOfAlterTable(parent SQLNode, node *AlterTable, r
 			return true
 		}
 	}
+	if a.collectPaths {
+		a.cur.current.AddStep(uint16(RefOfAlterTableTable))
+	}
 	if !a.rewriteTableName(node, node.Table, func(newNode, parent SQLNode) {
 		parent.(*AlterTable).Table = newNode.(TableName)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+	}
 	for x, el := range node.AlterOptions {
+		if a.collectPaths {
+			if x == 0 {
+				a.cur.current.AddStepWithOffset(uint16(RefOfAlterTableAlterOptionsOffset))
+			} else {
+				a.cur.current.ChangeOffset(x)
+			}
+		}
 		if !a.rewriteAlterOption(node, el, func(idx int) replacerFunc {
 			return func(newNode, parent SQLNode) {
 				parent.(*AlterTable).AlterOptions[idx] = newNode.(AlterOption)
@@ -993,21 +1127,36 @@ func (a *application) rewriteRefOfAlterTable(parent SQLNode, node *AlterTable, r
 			return false
 		}
 	}
+	if a.collectPaths && len(node.AlterOptions) > 0 {
+		a.cur.current.Pop()
+		a.cur.current.AddStep(uint16(RefOfAlterTablePartitionSpec))
+	}
 	if !a.rewriteRefOfPartitionSpec(node, node.PartitionSpec, func(newNode, parent SQLNode) {
 		parent.(*AlterTable).PartitionSpec = newNode.(*PartitionSpec)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+		a.cur.current.AddStep(uint16(RefOfAlterTablePartitionOption))
+	}
 	if !a.rewriteRefOfPartitionOption(node, node.PartitionOption, func(newNode, parent SQLNode) {
 		parent.(*AlterTable).PartitionOption = newNode.(*PartitionOption)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+		a.cur.current.AddStep(uint16(RefOfAlterTableComments))
+	}
 	if !a.rewriteRefOfParsedComments(node, node.Comments, func(newNode, parent SQLNode) {
 		parent.(*AlterTable).Comments = newNode.(*ParsedComments)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+	}
 	if a.post != nil {
 		a.cur.replacer = replacer
 		a.cur.parent = parent
@@ -1018,6 +1167,8 @@ func (a *application) rewriteRefOfAlterTable(parent SQLNode, node *AlterTable, r
 	}
 	return true
 }
+
+// Function Generation Source: PtrToStructMethod
 func (a *application) rewriteRefOfAlterView(parent SQLNode, node *AlterView, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -1035,31 +1186,53 @@ func (a *application) rewriteRefOfAlterView(parent SQLNode, node *AlterView, rep
 			return true
 		}
 	}
+	if a.collectPaths {
+		a.cur.current.AddStep(uint16(RefOfAlterViewViewName))
+	}
 	if !a.rewriteTableName(node, node.ViewName, func(newNode, parent SQLNode) {
 		parent.(*AlterView).ViewName = newNode.(TableName)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+		a.cur.current.AddStep(uint16(RefOfAlterViewDefiner))
+	}
 	if !a.rewriteRefOfDefiner(node, node.Definer, func(newNode, parent SQLNode) {
 		parent.(*AlterView).Definer = newNode.(*Definer)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+		a.cur.current.AddStep(uint16(RefOfAlterViewColumns))
+	}
 	if !a.rewriteColumns(node, node.Columns, func(newNode, parent SQLNode) {
 		parent.(*AlterView).Columns = newNode.(Columns)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+		a.cur.current.AddStep(uint16(RefOfAlterViewSelect))
+	}
 	if !a.rewriteTableStatement(node, node.Select, func(newNode, parent SQLNode) {
 		parent.(*AlterView).Select = newNode.(TableStatement)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+		a.cur.current.AddStep(uint16(RefOfAlterViewComments))
+	}
 	if !a.rewriteRefOfParsedComments(node, node.Comments, func(newNode, parent SQLNode) {
 		parent.(*AlterView).Comments = newNode.(*ParsedComments)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+	}
 	if a.post != nil {
 		a.cur.replacer = replacer
 		a.cur.parent = parent
@@ -1070,6 +1243,8 @@ func (a *application) rewriteRefOfAlterView(parent SQLNode, node *AlterView, rep
 	}
 	return true
 }
+
+// Function Generation Source: PtrToStructMethod
 func (a *application) rewriteRefOfAlterVschema(parent SQLNode, node *AlterVschema, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -1087,17 +1262,34 @@ func (a *application) rewriteRefOfAlterVschema(parent SQLNode, node *AlterVschem
 			return true
 		}
 	}
+	if a.collectPaths {
+		a.cur.current.AddStep(uint16(RefOfAlterVschemaTable))
+	}
 	if !a.rewriteTableName(node, node.Table, func(newNode, parent SQLNode) {
 		parent.(*AlterVschema).Table = newNode.(TableName)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+		a.cur.current.AddStep(uint16(RefOfAlterVschemaVindexSpec))
+	}
 	if !a.rewriteRefOfVindexSpec(node, node.VindexSpec, func(newNode, parent SQLNode) {
 		parent.(*AlterVschema).VindexSpec = newNode.(*VindexSpec)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+	}
 	for x, el := range node.VindexCols {
+		if a.collectPaths {
+			if x == 0 {
+				a.cur.current.AddStepWithOffset(uint16(RefOfAlterVschemaVindexColsOffset))
+			} else {
+				a.cur.current.ChangeOffset(x)
+			}
+		}
 		if !a.rewriteIdentifierCI(node, el, func(idx int) replacerFunc {
 			return func(newNode, parent SQLNode) {
 				parent.(*AlterVschema).VindexCols[idx] = newNode.(IdentifierCI)
@@ -1106,11 +1298,18 @@ func (a *application) rewriteRefOfAlterVschema(parent SQLNode, node *AlterVschem
 			return false
 		}
 	}
+	if a.collectPaths && len(node.VindexCols) > 0 {
+		a.cur.current.Pop()
+		a.cur.current.AddStep(uint16(RefOfAlterVschemaAutoIncSpec))
+	}
 	if !a.rewriteRefOfAutoIncSpec(node, node.AutoIncSpec, func(newNode, parent SQLNode) {
 		parent.(*AlterVschema).AutoIncSpec = newNode.(*AutoIncSpec)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+	}
 	if a.post != nil {
 		a.cur.replacer = replacer
 		a.cur.parent = parent
@@ -1121,6 +1320,8 @@ func (a *application) rewriteRefOfAlterVschema(parent SQLNode, node *AlterVschem
 	}
 	return true
 }
+
+// Function Generation Source: PtrToStructMethod
 func (a *application) rewriteRefOfAnalyze(parent SQLNode, node *Analyze, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -1138,11 +1339,17 @@ func (a *application) rewriteRefOfAnalyze(parent SQLNode, node *Analyze, replace
 			return true
 		}
 	}
+	if a.collectPaths {
+		a.cur.current.AddStep(uint16(RefOfAnalyzeTable))
+	}
 	if !a.rewriteTableName(node, node.Table, func(newNode, parent SQLNode) {
 		parent.(*Analyze).Table = newNode.(TableName)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+	}
 	if a.post != nil {
 		a.cur.replacer = replacer
 		a.cur.parent = parent
@@ -1153,6 +1360,8 @@ func (a *application) rewriteRefOfAnalyze(parent SQLNode, node *Analyze, replace
 	}
 	return true
 }
+
+// Function Generation Source: PtrToStructMethod
 func (a *application) rewriteRefOfAndExpr(parent SQLNode, node *AndExpr, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -1170,16 +1379,26 @@ func (a *application) rewriteRefOfAndExpr(parent SQLNode, node *AndExpr, replace
 			return true
 		}
 	}
+	if a.collectPaths {
+		a.cur.current.AddStep(uint16(RefOfAndExprLeft))
+	}
 	if !a.rewriteExpr(node, node.Left, func(newNode, parent SQLNode) {
 		parent.(*AndExpr).Left = newNode.(Expr)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+		a.cur.current.AddStep(uint16(RefOfAndExprRight))
+	}
 	if !a.rewriteExpr(node, node.Right, func(newNode, parent SQLNode) {
 		parent.(*AndExpr).Right = newNode.(Expr)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+	}
 	if a.post != nil {
 		a.cur.replacer = replacer
 		a.cur.parent = parent
@@ -1190,6 +1409,8 @@ func (a *application) rewriteRefOfAndExpr(parent SQLNode, node *AndExpr, replace
 	}
 	return true
 }
+
+// Function Generation Source: PtrToStructMethod
 func (a *application) rewriteRefOfAnyValue(parent SQLNode, node *AnyValue, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -1207,11 +1428,17 @@ func (a *application) rewriteRefOfAnyValue(parent SQLNode, node *AnyValue, repla
 			return true
 		}
 	}
+	if a.collectPaths {
+		a.cur.current.AddStep(uint16(RefOfAnyValueArg))
+	}
 	if !a.rewriteExpr(node, node.Arg, func(newNode, parent SQLNode) {
 		parent.(*AnyValue).Arg = newNode.(Expr)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+	}
 	if a.post != nil {
 		a.cur.replacer = replacer
 		a.cur.parent = parent
@@ -1222,6 +1449,8 @@ func (a *application) rewriteRefOfAnyValue(parent SQLNode, node *AnyValue, repla
 	}
 	return true
 }
+
+// Function Generation Source: PtrToStructMethod
 func (a *application) rewriteRefOfArgument(parent SQLNode, node *Argument, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -1251,6 +1480,8 @@ func (a *application) rewriteRefOfArgument(parent SQLNode, node *Argument, repla
 	}
 	return true
 }
+
+// Function Generation Source: PtrToStructMethod
 func (a *application) rewriteRefOfArgumentLessWindowExpr(parent SQLNode, node *ArgumentLessWindowExpr, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -1268,11 +1499,17 @@ func (a *application) rewriteRefOfArgumentLessWindowExpr(parent SQLNode, node *A
 			return true
 		}
 	}
+	if a.collectPaths {
+		a.cur.current.AddStep(uint16(RefOfArgumentLessWindowExprOverClause))
+	}
 	if !a.rewriteRefOfOverClause(node, node.OverClause, func(newNode, parent SQLNode) {
 		parent.(*ArgumentLessWindowExpr).OverClause = newNode.(*OverClause)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+	}
 	if a.post != nil {
 		a.cur.replacer = replacer
 		a.cur.parent = parent
@@ -1283,6 +1520,8 @@ func (a *application) rewriteRefOfArgumentLessWindowExpr(parent SQLNode, node *A
 	}
 	return true
 }
+
+// Function Generation Source: PtrToStructMethod
 func (a *application) rewriteRefOfAssignmentExpr(parent SQLNode, node *AssignmentExpr, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -1300,16 +1539,26 @@ func (a *application) rewriteRefOfAssignmentExpr(parent SQLNode, node *Assignmen
 			return true
 		}
 	}
+	if a.collectPaths {
+		a.cur.current.AddStep(uint16(RefOfAssignmentExprLeft))
+	}
 	if !a.rewriteExpr(node, node.Left, func(newNode, parent SQLNode) {
 		parent.(*AssignmentExpr).Left = newNode.(Expr)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+		a.cur.current.AddStep(uint16(RefOfAssignmentExprRight))
+	}
 	if !a.rewriteExpr(node, node.Right, func(newNode, parent SQLNode) {
 		parent.(*AssignmentExpr).Right = newNode.(Expr)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+	}
 	if a.post != nil {
 		a.cur.replacer = replacer
 		a.cur.parent = parent
@@ -1320,6 +1569,8 @@ func (a *application) rewriteRefOfAssignmentExpr(parent SQLNode, node *Assignmen
 	}
 	return true
 }
+
+// Function Generation Source: PtrToStructMethod
 func (a *application) rewriteRefOfAutoIncSpec(parent SQLNode, node *AutoIncSpec, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -1337,16 +1588,26 @@ func (a *application) rewriteRefOfAutoIncSpec(parent SQLNode, node *AutoIncSpec,
 			return true
 		}
 	}
+	if a.collectPaths {
+		a.cur.current.AddStep(uint16(RefOfAutoIncSpecColumn))
+	}
 	if !a.rewriteIdentifierCI(node, node.Column, func(newNode, parent SQLNode) {
 		parent.(*AutoIncSpec).Column = newNode.(IdentifierCI)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+		a.cur.current.AddStep(uint16(RefOfAutoIncSpecSequence))
+	}
 	if !a.rewriteTableName(node, node.Sequence, func(newNode, parent SQLNode) {
 		parent.(*AutoIncSpec).Sequence = newNode.(TableName)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+	}
 	if a.post != nil {
 		a.cur.replacer = replacer
 		a.cur.parent = parent
@@ -1357,6 +1618,8 @@ func (a *application) rewriteRefOfAutoIncSpec(parent SQLNode, node *AutoIncSpec,
 	}
 	return true
 }
+
+// Function Generation Source: PtrToStructMethod
 func (a *application) rewriteRefOfAvg(parent SQLNode, node *Avg, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -1374,16 +1637,26 @@ func (a *application) rewriteRefOfAvg(parent SQLNode, node *Avg, replacer replac
 			return true
 		}
 	}
+	if a.collectPaths {
+		a.cur.current.AddStep(uint16(RefOfAvgArg))
+	}
 	if !a.rewriteExpr(node, node.Arg, func(newNode, parent SQLNode) {
 		parent.(*Avg).Arg = newNode.(Expr)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+		a.cur.current.AddStep(uint16(RefOfAvgOverClause))
+	}
 	if !a.rewriteRefOfOverClause(node, node.OverClause, func(newNode, parent SQLNode) {
 		parent.(*Avg).OverClause = newNode.(*OverClause)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+	}
 	if a.post != nil {
 		a.cur.replacer = replacer
 		a.cur.parent = parent
@@ -1394,6 +1667,8 @@ func (a *application) rewriteRefOfAvg(parent SQLNode, node *Avg, replacer replac
 	}
 	return true
 }
+
+// Function Generation Source: PtrToStructMethod
 func (a *application) rewriteRefOfBegin(parent SQLNode, node *Begin, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -1423,6 +1698,8 @@ func (a *application) rewriteRefOfBegin(parent SQLNode, node *Begin, replacer re
 	}
 	return true
 }
+
+// Function Generation Source: PtrToStructMethod
 func (a *application) rewriteRefOfBetweenExpr(parent SQLNode, node *BetweenExpr, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -1440,21 +1717,35 @@ func (a *application) rewriteRefOfBetweenExpr(parent SQLNode, node *BetweenExpr,
 			return true
 		}
 	}
+	if a.collectPaths {
+		a.cur.current.AddStep(uint16(RefOfBetweenExprLeft))
+	}
 	if !a.rewriteExpr(node, node.Left, func(newNode, parent SQLNode) {
 		parent.(*BetweenExpr).Left = newNode.(Expr)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+		a.cur.current.AddStep(uint16(RefOfBetweenExprFrom))
+	}
 	if !a.rewriteExpr(node, node.From, func(newNode, parent SQLNode) {
 		parent.(*BetweenExpr).From = newNode.(Expr)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+		a.cur.current.AddStep(uint16(RefOfBetweenExprTo))
+	}
 	if !a.rewriteExpr(node, node.To, func(newNode, parent SQLNode) {
 		parent.(*BetweenExpr).To = newNode.(Expr)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+	}
 	if a.post != nil {
 		a.cur.replacer = replacer
 		a.cur.parent = parent
@@ -1465,6 +1756,8 @@ func (a *application) rewriteRefOfBetweenExpr(parent SQLNode, node *BetweenExpr,
 	}
 	return true
 }
+
+// Function Generation Source: PtrToStructMethod
 func (a *application) rewriteRefOfBinaryExpr(parent SQLNode, node *BinaryExpr, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -1482,16 +1775,26 @@ func (a *application) rewriteRefOfBinaryExpr(parent SQLNode, node *BinaryExpr, r
 			return true
 		}
 	}
+	if a.collectPaths {
+		a.cur.current.AddStep(uint16(RefOfBinaryExprLeft))
+	}
 	if !a.rewriteExpr(node, node.Left, func(newNode, parent SQLNode) {
 		parent.(*BinaryExpr).Left = newNode.(Expr)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+		a.cur.current.AddStep(uint16(RefOfBinaryExprRight))
+	}
 	if !a.rewriteExpr(node, node.Right, func(newNode, parent SQLNode) {
 		parent.(*BinaryExpr).Right = newNode.(Expr)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+	}
 	if a.post != nil {
 		a.cur.replacer = replacer
 		a.cur.parent = parent
@@ -1502,6 +1805,8 @@ func (a *application) rewriteRefOfBinaryExpr(parent SQLNode, node *BinaryExpr, r
 	}
 	return true
 }
+
+// Function Generation Source: PtrToStructMethod
 func (a *application) rewriteRefOfBitAnd(parent SQLNode, node *BitAnd, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -1519,16 +1824,26 @@ func (a *application) rewriteRefOfBitAnd(parent SQLNode, node *BitAnd, replacer
 			return true
 		}
 	}
+	if a.collectPaths {
+		a.cur.current.AddStep(uint16(RefOfBitAndArg))
+	}
 	if !a.rewriteExpr(node, node.Arg, func(newNode, parent SQLNode) {
 		parent.(*BitAnd).Arg = newNode.(Expr)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+		a.cur.current.AddStep(uint16(RefOfBitAndOverClause))
+	}
 	if !a.rewriteRefOfOverClause(node, node.OverClause, func(newNode, parent SQLNode) {
 		parent.(*BitAnd).OverClause = newNode.(*OverClause)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+	}
 	if a.post != nil {
 		a.cur.replacer = replacer
 		a.cur.parent = parent
@@ -1539,6 +1854,8 @@ func (a *application) rewriteRefOfBitAnd(parent SQLNode, node *BitAnd, replacer
 	}
 	return true
 }
+
+// Function Generation Source: PtrToStructMethod
 func (a *application) rewriteRefOfBitOr(parent SQLNode, node *BitOr, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -1556,16 +1873,26 @@ func (a *application) rewriteRefOfBitOr(parent SQLNode, node *BitOr, replacer re
 			return true
 		}
 	}
+	if a.collectPaths {
+		a.cur.current.AddStep(uint16(RefOfBitOrArg))
+	}
 	if !a.rewriteExpr(node, node.Arg, func(newNode, parent SQLNode) {
 		parent.(*BitOr).Arg = newNode.(Expr)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+		a.cur.current.AddStep(uint16(RefOfBitOrOverClause))
+	}
 	if !a.rewriteRefOfOverClause(node, node.OverClause, func(newNode, parent SQLNode) {
 		parent.(*BitOr).OverClause = newNode.(*OverClause)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+	}
 	if a.post != nil {
 		a.cur.replacer = replacer
 		a.cur.parent = parent
@@ -1576,6 +1903,8 @@ func (a *application) rewriteRefOfBitOr(parent SQLNode, node *BitOr, replacer re
 	}
 	return true
 }
+
+// Function Generation Source: PtrToStructMethod
 func (a *application) rewriteRefOfBitXor(parent SQLNode, node *BitXor, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -1593,16 +1922,26 @@ func (a *application) rewriteRefOfBitXor(parent SQLNode, node *BitXor, replacer
 			return true
 		}
 	}
+	if a.collectPaths {
+		a.cur.current.AddStep(uint16(RefOfBitXorArg))
+	}
 	if !a.rewriteExpr(node, node.Arg, func(newNode, parent SQLNode) {
 		parent.(*BitXor).Arg = newNode.(Expr)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+		a.cur.current.AddStep(uint16(RefOfBitXorOverClause))
+	}
 	if !a.rewriteRefOfOverClause(node, node.OverClause, func(newNode, parent SQLNode) {
 		parent.(*BitXor).OverClause = newNode.(*OverClause)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+	}
 	if a.post != nil {
 		a.cur.replacer = replacer
 		a.cur.parent = parent
@@ -1613,6 +1952,8 @@ func (a *application) rewriteRefOfBitXor(parent SQLNode, node *BitXor, replacer
 	}
 	return true
 }
+
+// Function Generation Source: PtrToStructMethod
 func (a *application) rewriteRefOfCallProc(parent SQLNode, node *CallProc, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -1630,12 +1971,25 @@ func (a *application) rewriteRefOfCallProc(parent SQLNode, node *CallProc, repla
 			return true
 		}
 	}
+	if a.collectPaths {
+		a.cur.current.AddStep(uint16(RefOfCallProcName))
+	}
 	if !a.rewriteTableName(node, node.Name, func(newNode, parent SQLNode) {
 		parent.(*CallProc).Name = newNode.(TableName)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+	}
 	for x, el := range node.Params {
+		if a.collectPaths {
+			if x == 0 {
+				a.cur.current.AddStepWithOffset(uint16(RefOfCallProcParamsOffset))
+			} else {
+				a.cur.current.ChangeOffset(x)
+			}
+		}
 		if !a.rewriteExpr(node, el, func(idx int) replacerFunc {
 			return func(newNode, parent SQLNode) {
 				parent.(*CallProc).Params[idx] = newNode.(Expr)
@@ -1644,6 +1998,9 @@ func (a *application) rewriteRefOfCallProc(parent SQLNode, node *CallProc, repla
 			return false
 		}
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+	}
 	if a.post != nil {
 		a.cur.replacer = replacer
 		a.cur.parent = parent
@@ -1654,6 +2011,8 @@ func (a *application) rewriteRefOfCallProc(parent SQLNode, node *CallProc, repla
 	}
 	return true
 }
+
+// Function Generation Source: PtrToStructMethod
 func (a *application) rewriteRefOfCaseExpr(parent SQLNode, node *CaseExpr, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -1671,12 +2030,25 @@ func (a *application) rewriteRefOfCaseExpr(parent SQLNode, node *CaseExpr, repla
 			return true
 		}
 	}
+	if a.collectPaths {
+		a.cur.current.AddStep(uint16(RefOfCaseExprExpr))
+	}
 	if !a.rewriteExpr(node, node.Expr, func(newNode, parent SQLNode) {
 		parent.(*CaseExpr).Expr = newNode.(Expr)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+	}
 	for x, el := range node.Whens {
+		if a.collectPaths {
+			if x == 0 {
+				a.cur.current.AddStepWithOffset(uint16(RefOfCaseExprWhensOffset))
+			} else {
+				a.cur.current.ChangeOffset(x)
+			}
+		}
 		if !a.rewriteRefOfWhen(node, el, func(idx int) replacerFunc {
 			return func(newNode, parent SQLNode) {
 				parent.(*CaseExpr).Whens[idx] = newNode.(*When)
@@ -1685,11 +2057,18 @@ func (a *application) rewriteRefOfCaseExpr(parent SQLNode, node *CaseExpr, repla
 			return false
 		}
 	}
+	if a.collectPaths && len(node.Whens) > 0 {
+		a.cur.current.Pop()
+		a.cur.current.AddStep(uint16(RefOfCaseExprElse))
+	}
 	if !a.rewriteExpr(node, node.Else, func(newNode, parent SQLNode) {
 		parent.(*CaseExpr).Else = newNode.(Expr)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+	}
 	if a.post != nil {
 		a.cur.replacer = replacer
 		a.cur.parent = parent
@@ -1700,6 +2079,8 @@ func (a *application) rewriteRefOfCaseExpr(parent SQLNode, node *CaseExpr, repla
 	}
 	return true
 }
+
+// Function Generation Source: PtrToStructMethod
 func (a *application) rewriteRefOfCastExpr(parent SQLNode, node *CastExpr, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -1717,16 +2098,26 @@ func (a *application) rewriteRefOfCastExpr(parent SQLNode, node *CastExpr, repla
 			return true
 		}
 	}
+	if a.collectPaths {
+		a.cur.current.AddStep(uint16(RefOfCastExprExpr))
+	}
 	if !a.rewriteExpr(node, node.Expr, func(newNode, parent SQLNode) {
 		parent.(*CastExpr).Expr = newNode.(Expr)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+		a.cur.current.AddStep(uint16(RefOfCastExprType))
+	}
 	if !a.rewriteRefOfConvertType(node, node.Type, func(newNode, parent SQLNode) {
 		parent.(*CastExpr).Type = newNode.(*ConvertType)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+	}
 	if a.post != nil {
 		a.cur.replacer = replacer
 		a.cur.parent = parent
@@ -1737,6 +2128,8 @@ func (a *application) rewriteRefOfCastExpr(parent SQLNode, node *CastExpr, repla
 	}
 	return true
 }
+
+// Function Generation Source: PtrToStructMethod
 func (a *application) rewriteRefOfChangeColumn(parent SQLNode, node *ChangeColumn, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -1754,21 +2147,35 @@ func (a *application) rewriteRefOfChangeColumn(parent SQLNode, node *ChangeColum
 			return true
 		}
 	}
+	if a.collectPaths {
+		a.cur.current.AddStep(uint16(RefOfChangeColumnOldColumn))
+	}
 	if !a.rewriteRefOfColName(node, node.OldColumn, func(newNode, parent SQLNode) {
 		parent.(*ChangeColumn).OldColumn = newNode.(*ColName)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+		a.cur.current.AddStep(uint16(RefOfChangeColumnNewColDefinition))
+	}
 	if !a.rewriteRefOfColumnDefinition(node, node.NewColDefinition, func(newNode, parent SQLNode) {
 		parent.(*ChangeColumn).NewColDefinition = newNode.(*ColumnDefinition)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+		a.cur.current.AddStep(uint16(RefOfChangeColumnAfter))
+	}
 	if !a.rewriteRefOfColName(node, node.After, func(newNode, parent SQLNode) {
 		parent.(*ChangeColumn).After = newNode.(*ColName)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+	}
 	if a.post != nil {
 		a.cur.replacer = replacer
 		a.cur.parent = parent
@@ -1779,6 +2186,8 @@ func (a *application) rewriteRefOfChangeColumn(parent SQLNode, node *ChangeColum
 	}
 	return true
 }
+
+// Function Generation Source: PtrToStructMethod
 func (a *application) rewriteRefOfCharExpr(parent SQLNode, node *CharExpr, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -1797,6 +2206,13 @@ func (a *application) rewriteRefOfCharExpr(parent SQLNode, node *CharExpr, repla
 		}
 	}
 	for x, el := range node.Exprs {
+		if a.collectPaths {
+			if x == 0 {
+				a.cur.current.AddStepWithOffset(uint16(RefOfCharExprExprsOffset))
+			} else {
+				a.cur.current.ChangeOffset(x)
+			}
+		}
 		if !a.rewriteExpr(node, el, func(idx int) replacerFunc {
 			return func(newNode, parent SQLNode) {
 				parent.(*CharExpr).Exprs[idx] = newNode.(Expr)
@@ -1805,6 +2221,9 @@ func (a *application) rewriteRefOfCharExpr(parent SQLNode, node *CharExpr, repla
 			return false
 		}
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+	}
 	if a.post != nil {
 		a.cur.replacer = replacer
 		a.cur.parent = parent
@@ -1815,6 +2234,8 @@ func (a *application) rewriteRefOfCharExpr(parent SQLNode, node *CharExpr, repla
 	}
 	return true
 }
+
+// Function Generation Source: PtrToStructMethod
 func (a *application) rewriteRefOfCheckConstraintDefinition(parent SQLNode, node *CheckConstraintDefinition, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -1832,11 +2253,17 @@ func (a *application) rewriteRefOfCheckConstraintDefinition(parent SQLNode, node
 			return true
 		}
 	}
+	if a.collectPaths {
+		a.cur.current.AddStep(uint16(RefOfCheckConstraintDefinitionExpr))
+	}
 	if !a.rewriteExpr(node, node.Expr, func(newNode, parent SQLNode) {
 		parent.(*CheckConstraintDefinition).Expr = newNode.(Expr)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+	}
 	if a.post != nil {
 		a.cur.replacer = replacer
 		a.cur.parent = parent
@@ -1847,6 +2274,8 @@ func (a *application) rewriteRefOfCheckConstraintDefinition(parent SQLNode, node
 	}
 	return true
 }
+
+// Function Generation Source: PtrToStructMethod
 func (a *application) rewriteRefOfColName(parent SQLNode, node *ColName, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -1864,16 +2293,26 @@ func (a *application) rewriteRefOfColName(parent SQLNode, node *ColName, replace
 			return true
 		}
 	}
+	if a.collectPaths {
+		a.cur.current.AddStep(uint16(RefOfColNameName))
+	}
 	if !a.rewriteIdentifierCI(node, node.Name, func(newNode, parent SQLNode) {
 		parent.(*ColName).Name = newNode.(IdentifierCI)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+		a.cur.current.AddStep(uint16(RefOfColNameQualifier))
+	}
 	if !a.rewriteTableName(node, node.Qualifier, func(newNode, parent SQLNode) {
 		parent.(*ColName).Qualifier = newNode.(TableName)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+	}
 	if a.post != nil {
 		a.cur.replacer = replacer
 		a.cur.parent = parent
@@ -1884,6 +2323,8 @@ func (a *application) rewriteRefOfColName(parent SQLNode, node *ColName, replace
 	}
 	return true
 }
+
+// Function Generation Source: PtrToStructMethod
 func (a *application) rewriteRefOfCollateExpr(parent SQLNode, node *CollateExpr, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -1901,11 +2342,17 @@ func (a *application) rewriteRefOfCollateExpr(parent SQLNode, node *CollateExpr,
 			return true
 		}
 	}
+	if a.collectPaths {
+		a.cur.current.AddStep(uint16(RefOfCollateExprExpr))
+	}
 	if !a.rewriteExpr(node, node.Expr, func(newNode, parent SQLNode) {
 		parent.(*CollateExpr).Expr = newNode.(Expr)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+	}
 	if a.post != nil {
 		a.cur.replacer = replacer
 		a.cur.parent = parent
@@ -1916,6 +2363,8 @@ func (a *application) rewriteRefOfCollateExpr(parent SQLNode, node *CollateExpr,
 	}
 	return true
 }
+
+// Function Generation Source: PtrToStructMethod
 func (a *application) rewriteRefOfColumnDefinition(parent SQLNode, node *ColumnDefinition, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -1933,16 +2382,26 @@ func (a *application) rewriteRefOfColumnDefinition(parent SQLNode, node *ColumnD
 			return true
 		}
 	}
+	if a.collectPaths {
+		a.cur.current.AddStep(uint16(RefOfColumnDefinitionName))
+	}
 	if !a.rewriteIdentifierCI(node, node.Name, func(newNode, parent SQLNode) {
 		parent.(*ColumnDefinition).Name = newNode.(IdentifierCI)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+		a.cur.current.AddStep(uint16(RefOfColumnDefinitionType))
+	}
 	if !a.rewriteRefOfColumnType(node, node.Type, func(newNode, parent SQLNode) {
 		parent.(*ColumnDefinition).Type = newNode.(*ColumnType)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+	}
 	if a.post != nil {
 		a.cur.replacer = replacer
 		a.cur.parent = parent
@@ -1953,6 +2412,8 @@ func (a *application) rewriteRefOfColumnDefinition(parent SQLNode, node *ColumnD
 	}
 	return true
 }
+
+// Function Generation Source: PtrToStructMethod
 func (a *application) rewriteRefOfColumnType(parent SQLNode, node *ColumnType, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -1982,6 +2443,8 @@ func (a *application) rewriteRefOfColumnType(parent SQLNode, node *ColumnType, r
 	}
 	return true
 }
+
+// Function Generation Source: SliceMethod
 func (a *application) rewriteColumns(parent SQLNode, node Columns, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -2000,6 +2463,13 @@ func (a *application) rewriteColumns(parent SQLNode, node Columns, replacer repl
 		}
 	}
 	for x, el := range node {
+		if a.collectPaths {
+			if x == 0 {
+				a.cur.current.AddStepWithOffset(uint16(ColumnsOffset))
+			} else {
+				a.cur.current.ChangeOffset(x)
+			}
+		}
 		if !a.rewriteIdentifierCI(node, el, func(idx int) replacerFunc {
 			return func(newNode, parent SQLNode) {
 				parent.(Columns)[idx] = newNode.(IdentifierCI)
@@ -2008,6 +2478,9 @@ func (a *application) rewriteColumns(parent SQLNode, node Columns, replacer repl
 			return false
 		}
 	}
+	if a.collectPaths && len(node) > 0 {
+		a.cur.current.Pop()
+	}
 	if a.post != nil {
 		a.cur.replacer = replacer
 		a.cur.parent = parent
@@ -2018,6 +2491,8 @@ func (a *application) rewriteColumns(parent SQLNode, node Columns, replacer repl
 	}
 	return true
 }
+
+// Function Generation Source: PtrToStructMethod
 func (a *application) rewriteRefOfCommentOnly(parent SQLNode, node *CommentOnly, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -2047,6 +2522,8 @@ func (a *application) rewriteRefOfCommentOnly(parent SQLNode, node *CommentOnly,
 	}
 	return true
 }
+
+// Function Generation Source: PtrToStructMethod
 func (a *application) rewriteRefOfCommit(parent SQLNode, node *Commit, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -2076,6 +2553,8 @@ func (a *application) rewriteRefOfCommit(parent SQLNode, node *Commit, replacer
 	}
 	return true
 }
+
+// Function Generation Source: PtrToStructMethod
 func (a *application) rewriteRefOfCommonTableExpr(parent SQLNode, node *CommonTableExpr, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -2093,21 +2572,35 @@ func (a *application) rewriteRefOfCommonTableExpr(parent SQLNode, node *CommonTa
 			return true
 		}
 	}
+	if a.collectPaths {
+		a.cur.current.AddStep(uint16(RefOfCommonTableExprID))
+	}
 	if !a.rewriteIdentifierCS(node, node.ID, func(newNode, parent SQLNode) {
 		parent.(*CommonTableExpr).ID = newNode.(IdentifierCS)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+		a.cur.current.AddStep(uint16(RefOfCommonTableExprColumns))
+	}
 	if !a.rewriteColumns(node, node.Columns, func(newNode, parent SQLNode) {
 		parent.(*CommonTableExpr).Columns = newNode.(Columns)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+		a.cur.current.AddStep(uint16(RefOfCommonTableExprSubquery))
+	}
 	if !a.rewriteTableStatement(node, node.Subquery, func(newNode, parent SQLNode) {
 		parent.(*CommonTableExpr).Subquery = newNode.(TableStatement)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+	}
 	if a.post != nil {
 		a.cur.replacer = replacer
 		a.cur.parent = parent
@@ -2118,6 +2611,8 @@ func (a *application) rewriteRefOfCommonTableExpr(parent SQLNode, node *CommonTa
 	}
 	return true
 }
+
+// Function Generation Source: PtrToStructMethod
 func (a *application) rewriteRefOfComparisonExpr(parent SQLNode, node *ComparisonExpr, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -2135,21 +2630,35 @@ func (a *application) rewriteRefOfComparisonExpr(parent SQLNode, node *Compariso
 			return true
 		}
 	}
+	if a.collectPaths {
+		a.cur.current.AddStep(uint16(RefOfComparisonExprLeft))
+	}
 	if !a.rewriteExpr(node, node.Left, func(newNode, parent SQLNode) {
 		parent.(*ComparisonExpr).Left = newNode.(Expr)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+		a.cur.current.AddStep(uint16(RefOfComparisonExprRight))
+	}
 	if !a.rewriteExpr(node, node.Right, func(newNode, parent SQLNode) {
 		parent.(*ComparisonExpr).Right = newNode.(Expr)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+		a.cur.current.AddStep(uint16(RefOfComparisonExprEscape))
+	}
 	if !a.rewriteExpr(node, node.Escape, func(newNode, parent SQLNode) {
 		parent.(*ComparisonExpr).Escape = newNode.(Expr)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+	}
 	if a.post != nil {
 		a.cur.replacer = replacer
 		a.cur.parent = parent
@@ -2160,6 +2669,8 @@ func (a *application) rewriteRefOfComparisonExpr(parent SQLNode, node *Compariso
 	}
 	return true
 }
+
+// Function Generation Source: PtrToStructMethod
 func (a *application) rewriteRefOfConstraintDefinition(parent SQLNode, node *ConstraintDefinition, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -2177,16 +2688,26 @@ func (a *application) rewriteRefOfConstraintDefinition(parent SQLNode, node *Con
 			return true
 		}
 	}
+	if a.collectPaths {
+		a.cur.current.AddStep(uint16(RefOfConstraintDefinitionName))
+	}
 	if !a.rewriteIdentifierCI(node, node.Name, func(newNode, parent SQLNode) {
 		parent.(*ConstraintDefinition).Name = newNode.(IdentifierCI)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+		a.cur.current.AddStep(uint16(RefOfConstraintDefinitionDetails))
+	}
 	if !a.rewriteConstraintInfo(node, node.Details, func(newNode, parent SQLNode) {
 		parent.(*ConstraintDefinition).Details = newNode.(ConstraintInfo)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+	}
 	if a.post != nil {
 		a.cur.replacer = replacer
 		a.cur.parent = parent
@@ -2197,6 +2718,8 @@ func (a *application) rewriteRefOfConstraintDefinition(parent SQLNode, node *Con
 	}
 	return true
 }
+
+// Function Generation Source: PtrToStructMethod
 func (a *application) rewriteRefOfConvertExpr(parent SQLNode, node *ConvertExpr, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -2214,16 +2737,26 @@ func (a *application) rewriteRefOfConvertExpr(parent SQLNode, node *ConvertExpr,
 			return true
 		}
 	}
+	if a.collectPaths {
+		a.cur.current.AddStep(uint16(RefOfConvertExprExpr))
+	}
 	if !a.rewriteExpr(node, node.Expr, func(newNode, parent SQLNode) {
 		parent.(*ConvertExpr).Expr = newNode.(Expr)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+		a.cur.current.AddStep(uint16(RefOfConvertExprType))
+	}
 	if !a.rewriteRefOfConvertType(node, node.Type, func(newNode, parent SQLNode) {
 		parent.(*ConvertExpr).Type = newNode.(*ConvertType)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+	}
 	if a.post != nil {
 		a.cur.replacer = replacer
 		a.cur.parent = parent
@@ -2234,6 +2767,8 @@ func (a *application) rewriteRefOfConvertExpr(parent SQLNode, node *ConvertExpr,
 	}
 	return true
 }
+
+// Function Generation Source: PtrToStructMethod
 func (a *application) rewriteRefOfConvertType(parent SQLNode, node *ConvertType, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -2263,6 +2798,8 @@ func (a *application) rewriteRefOfConvertType(parent SQLNode, node *ConvertType,
 	}
 	return true
 }
+
+// Function Generation Source: PtrToStructMethod
 func (a *application) rewriteRefOfConvertUsingExpr(parent SQLNode, node *ConvertUsingExpr, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -2280,11 +2817,17 @@ func (a *application) rewriteRefOfConvertUsingExpr(parent SQLNode, node *Convert
 			return true
 		}
 	}
+	if a.collectPaths {
+		a.cur.current.AddStep(uint16(RefOfConvertUsingExprExpr))
+	}
 	if !a.rewriteExpr(node, node.Expr, func(newNode, parent SQLNode) {
 		parent.(*ConvertUsingExpr).Expr = newNode.(Expr)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+	}
 	if a.post != nil {
 		a.cur.replacer = replacer
 		a.cur.parent = parent
@@ -2295,6 +2838,8 @@ func (a *application) rewriteRefOfConvertUsingExpr(parent SQLNode, node *Convert
 	}
 	return true
 }
+
+// Function Generation Source: PtrToStructMethod
 func (a *application) rewriteRefOfCount(parent SQLNode, node *Count, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -2313,6 +2858,13 @@ func (a *application) rewriteRefOfCount(parent SQLNode, node *Count, replacer re
 		}
 	}
 	for x, el := range node.Args {
+		if a.collectPaths {
+			if x == 0 {
+				a.cur.current.AddStepWithOffset(uint16(RefOfCountArgsOffset))
+			} else {
+				a.cur.current.ChangeOffset(x)
+			}
+		}
 		if !a.rewriteExpr(node, el, func(idx int) replacerFunc {
 			return func(newNode, parent SQLNode) {
 				parent.(*Count).Args[idx] = newNode.(Expr)
@@ -2321,11 +2873,18 @@ func (a *application) rewriteRefOfCount(parent SQLNode, node *Count, replacer re
 			return false
 		}
 	}
+	if a.collectPaths && len(node.Args) > 0 {
+		a.cur.current.Pop()
+		a.cur.current.AddStep(uint16(RefOfCountOverClause))
+	}
 	if !a.rewriteRefOfOverClause(node, node.OverClause, func(newNode, parent SQLNode) {
 		parent.(*Count).OverClause = newNode.(*OverClause)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+	}
 	if a.post != nil {
 		a.cur.replacer = replacer
 		a.cur.parent = parent
@@ -2336,6 +2895,8 @@ func (a *application) rewriteRefOfCount(parent SQLNode, node *Count, replacer re
 	}
 	return true
 }
+
+// Function Generation Source: PtrToStructMethod
 func (a *application) rewriteRefOfCountStar(parent SQLNode, node *CountStar, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -2353,11 +2914,17 @@ func (a *application) rewriteRefOfCountStar(parent SQLNode, node *CountStar, rep
 			return true
 		}
 	}
+	if a.collectPaths {
+		a.cur.current.AddStep(uint16(RefOfCountStarOverClause))
+	}
 	if !a.rewriteRefOfOverClause(node, node.OverClause, func(newNode, parent SQLNode) {
 		parent.(*CountStar).OverClause = newNode.(*OverClause)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+	}
 	if a.post != nil {
 		a.cur.replacer = replacer
 		a.cur.parent = parent
@@ -2368,6 +2935,8 @@ func (a *application) rewriteRefOfCountStar(parent SQLNode, node *CountStar, rep
 	}
 	return true
 }
+
+// Function Generation Source: PtrToStructMethod
 func (a *application) rewriteRefOfCreateDatabase(parent SQLNode, node *CreateDatabase, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -2385,16 +2954,26 @@ func (a *application) rewriteRefOfCreateDatabase(parent SQLNode, node *CreateDat
 			return true
 		}
 	}
+	if a.collectPaths {
+		a.cur.current.AddStep(uint16(RefOfCreateDatabaseComments))
+	}
 	if !a.rewriteRefOfParsedComments(node, node.Comments, func(newNode, parent SQLNode) {
 		parent.(*CreateDatabase).Comments = newNode.(*ParsedComments)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+		a.cur.current.AddStep(uint16(RefOfCreateDatabaseDBName))
+	}
 	if !a.rewriteIdentifierCS(node, node.DBName, func(newNode, parent SQLNode) {
 		parent.(*CreateDatabase).DBName = newNode.(IdentifierCS)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+	}
 	if a.post != nil {
 		a.cur.replacer = replacer
 		a.cur.parent = parent
@@ -2405,6 +2984,8 @@ func (a *application) rewriteRefOfCreateDatabase(parent SQLNode, node *CreateDat
 	}
 	return true
 }
+
+// Function Generation Source: PtrToStructMethod
 func (a *application) rewriteRefOfCreateTable(parent SQLNode, node *CreateTable, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -2422,26 +3003,44 @@ func (a *application) rewriteRefOfCreateTable(parent SQLNode, node *CreateTable,
 			return true
 		}
 	}
+	if a.collectPaths {
+		a.cur.current.AddStep(uint16(RefOfCreateTableTable))
+	}
 	if !a.rewriteTableName(node, node.Table, func(newNode, parent SQLNode) {
 		parent.(*CreateTable).Table = newNode.(TableName)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+		a.cur.current.AddStep(uint16(RefOfCreateTableTableSpec))
+	}
 	if !a.rewriteRefOfTableSpec(node, node.TableSpec, func(newNode, parent SQLNode) {
 		parent.(*CreateTable).TableSpec = newNode.(*TableSpec)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+		a.cur.current.AddStep(uint16(RefOfCreateTableOptLike))
+	}
 	if !a.rewriteRefOfOptLike(node, node.OptLike, func(newNode, parent SQLNode) {
 		parent.(*CreateTable).OptLike = newNode.(*OptLike)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+		a.cur.current.AddStep(uint16(RefOfCreateTableComments))
+	}
 	if !a.rewriteRefOfParsedComments(node, node.Comments, func(newNode, parent SQLNode) {
 		parent.(*CreateTable).Comments = newNode.(*ParsedComments)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+	}
 	if a.post != nil {
 		a.cur.replacer = replacer
 		a.cur.parent = parent
@@ -2452,6 +3051,8 @@ func (a *application) rewriteRefOfCreateTable(parent SQLNode, node *CreateTable,
 	}
 	return true
 }
+
+// Function Generation Source: PtrToStructMethod
 func (a *application) rewriteRefOfCreateView(parent SQLNode, node *CreateView, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -2469,31 +3070,53 @@ func (a *application) rewriteRefOfCreateView(parent SQLNode, node *CreateView, r
 			return true
 		}
 	}
+	if a.collectPaths {
+		a.cur.current.AddStep(uint16(RefOfCreateViewViewName))
+	}
 	if !a.rewriteTableName(node, node.ViewName, func(newNode, parent SQLNode) {
 		parent.(*CreateView).ViewName = newNode.(TableName)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+		a.cur.current.AddStep(uint16(RefOfCreateViewDefiner))
+	}
 	if !a.rewriteRefOfDefiner(node, node.Definer, func(newNode, parent SQLNode) {
 		parent.(*CreateView).Definer = newNode.(*Definer)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+		a.cur.current.AddStep(uint16(RefOfCreateViewColumns))
+	}
 	if !a.rewriteColumns(node, node.Columns, func(newNode, parent SQLNode) {
 		parent.(*CreateView).Columns = newNode.(Columns)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+		a.cur.current.AddStep(uint16(RefOfCreateViewSelect))
+	}
 	if !a.rewriteTableStatement(node, node.Select, func(newNode, parent SQLNode) {
 		parent.(*CreateView).Select = newNode.(TableStatement)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+		a.cur.current.AddStep(uint16(RefOfCreateViewComments))
+	}
 	if !a.rewriteRefOfParsedComments(node, node.Comments, func(newNode, parent SQLNode) {
 		parent.(*CreateView).Comments = newNode.(*ParsedComments)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+	}
 	if a.post != nil {
 		a.cur.replacer = replacer
 		a.cur.parent = parent
@@ -2504,6 +3127,8 @@ func (a *application) rewriteRefOfCreateView(parent SQLNode, node *CreateView, r
 	}
 	return true
 }
+
+// Function Generation Source: PtrToStructMethod
 func (a *application) rewriteRefOfCurTimeFuncExpr(parent SQLNode, node *CurTimeFuncExpr, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -2521,11 +3146,17 @@ func (a *application) rewriteRefOfCurTimeFuncExpr(parent SQLNode, node *CurTimeF
 			return true
 		}
 	}
+	if a.collectPaths {
+		a.cur.current.AddStep(uint16(RefOfCurTimeFuncExprName))
+	}
 	if !a.rewriteIdentifierCI(node, node.Name, func(newNode, parent SQLNode) {
 		parent.(*CurTimeFuncExpr).Name = newNode.(IdentifierCI)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+	}
 	if a.post != nil {
 		a.cur.replacer = replacer
 		a.cur.parent = parent
@@ -2536,6 +3167,8 @@ func (a *application) rewriteRefOfCurTimeFuncExpr(parent SQLNode, node *CurTimeF
 	}
 	return true
 }
+
+// Function Generation Source: PtrToStructMethod
 func (a *application) rewriteRefOfDeallocateStmt(parent SQLNode, node *DeallocateStmt, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -2553,16 +3186,26 @@ func (a *application) rewriteRefOfDeallocateStmt(parent SQLNode, node *Deallocat
 			return true
 		}
 	}
+	if a.collectPaths {
+		a.cur.current.AddStep(uint16(RefOfDeallocateStmtComments))
+	}
 	if !a.rewriteRefOfParsedComments(node, node.Comments, func(newNode, parent SQLNode) {
 		parent.(*DeallocateStmt).Comments = newNode.(*ParsedComments)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+		a.cur.current.AddStep(uint16(RefOfDeallocateStmtName))
+	}
 	if !a.rewriteIdentifierCI(node, node.Name, func(newNode, parent SQLNode) {
 		parent.(*DeallocateStmt).Name = newNode.(IdentifierCI)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+	}
 	if a.post != nil {
 		a.cur.replacer = replacer
 		a.cur.parent = parent
@@ -2573,6 +3216,8 @@ func (a *application) rewriteRefOfDeallocateStmt(parent SQLNode, node *Deallocat
 	}
 	return true
 }
+
+// Function Generation Source: PtrToStructMethod
 func (a *application) rewriteRefOfDefault(parent SQLNode, node *Default, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -2602,6 +3247,8 @@ func (a *application) rewriteRefOfDefault(parent SQLNode, node *Default, replace
 	}
 	return true
 }
+
+// Function Generation Source: PtrToStructMethod
 func (a *application) rewriteRefOfDefiner(parent SQLNode, node *Definer, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -2631,6 +3278,8 @@ func (a *application) rewriteRefOfDefiner(parent SQLNode, node *Definer, replace
 	}
 	return true
 }
+
+// Function Generation Source: PtrToStructMethod
 func (a *application) rewriteRefOfDelete(parent SQLNode, node *Delete, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -2648,17 +3297,34 @@ func (a *application) rewriteRefOfDelete(parent SQLNode, node *Delete, replacer
 			return true
 		}
 	}
+	if a.collectPaths {
+		a.cur.current.AddStep(uint16(RefOfDeleteWith))
+	}
 	if !a.rewriteRefOfWith(node, node.With, func(newNode, parent SQLNode) {
 		parent.(*Delete).With = newNode.(*With)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+		a.cur.current.AddStep(uint16(RefOfDeleteComments))
+	}
 	if !a.rewriteRefOfParsedComments(node, node.Comments, func(newNode, parent SQLNode) {
 		parent.(*Delete).Comments = newNode.(*ParsedComments)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+	}
 	for x, el := range node.TableExprs {
+		if a.collectPaths {
+			if x == 0 {
+				a.cur.current.AddStepWithOffset(uint16(RefOfDeleteTableExprsOffset))
+			} else {
+				a.cur.current.ChangeOffset(x)
+			}
+		}
 		if !a.rewriteTableExpr(node, el, func(idx int) replacerFunc {
 			return func(newNode, parent SQLNode) {
 				parent.(*Delete).TableExprs[idx] = newNode.(TableExpr)
@@ -2667,31 +3333,54 @@ func (a *application) rewriteRefOfDelete(parent SQLNode, node *Delete, replacer
 			return false
 		}
 	}
+	if a.collectPaths && len(node.TableExprs) > 0 {
+		a.cur.current.Pop()
+		a.cur.current.AddStep(uint16(RefOfDeleteTargets))
+	}
 	if !a.rewriteTableNames(node, node.Targets, func(newNode, parent SQLNode) {
 		parent.(*Delete).Targets = newNode.(TableNames)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+		a.cur.current.AddStep(uint16(RefOfDeletePartitions))
+	}
 	if !a.rewritePartitions(node, node.Partitions, func(newNode, parent SQLNode) {
 		parent.(*Delete).Partitions = newNode.(Partitions)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+		a.cur.current.AddStep(uint16(RefOfDeleteWhere))
+	}
 	if !a.rewriteRefOfWhere(node, node.Where, func(newNode, parent SQLNode) {
 		parent.(*Delete).Where = newNode.(*Where)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+		a.cur.current.AddStep(uint16(RefOfDeleteOrderBy))
+	}
 	if !a.rewriteOrderBy(node, node.OrderBy, func(newNode, parent SQLNode) {
 		parent.(*Delete).OrderBy = newNode.(OrderBy)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+		a.cur.current.AddStep(uint16(RefOfDeleteLimit))
+	}
 	if !a.rewriteRefOfLimit(node, node.Limit, func(newNode, parent SQLNode) {
 		parent.(*Delete).Limit = newNode.(*Limit)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+	}
 	if a.post != nil {
 		a.cur.replacer = replacer
 		a.cur.parent = parent
@@ -2702,6 +3391,8 @@ func (a *application) rewriteRefOfDelete(parent SQLNode, node *Delete, replacer
 	}
 	return true
 }
+
+// Function Generation Source: PtrToStructMethod
 func (a *application) rewriteRefOfDerivedTable(parent SQLNode, node *DerivedTable, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -2719,11 +3410,17 @@ func (a *application) rewriteRefOfDerivedTable(parent SQLNode, node *DerivedTabl
 			return true
 		}
 	}
+	if a.collectPaths {
+		a.cur.current.AddStep(uint16(RefOfDerivedTableSelect))
+	}
 	if !a.rewriteTableStatement(node, node.Select, func(newNode, parent SQLNode) {
 		parent.(*DerivedTable).Select = newNode.(TableStatement)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+	}
 	if a.post != nil {
 		a.cur.replacer = replacer
 		a.cur.parent = parent
@@ -2734,6 +3431,8 @@ func (a *application) rewriteRefOfDerivedTable(parent SQLNode, node *DerivedTabl
 	}
 	return true
 }
+
+// Function Generation Source: PtrToStructMethod
 func (a *application) rewriteRefOfDropColumn(parent SQLNode, node *DropColumn, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -2751,11 +3450,17 @@ func (a *application) rewriteRefOfDropColumn(parent SQLNode, node *DropColumn, r
 			return true
 		}
 	}
+	if a.collectPaths {
+		a.cur.current.AddStep(uint16(RefOfDropColumnName))
+	}
 	if !a.rewriteRefOfColName(node, node.Name, func(newNode, parent SQLNode) {
 		parent.(*DropColumn).Name = newNode.(*ColName)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+	}
 	if a.post != nil {
 		a.cur.replacer = replacer
 		a.cur.parent = parent
@@ -2766,6 +3471,8 @@ func (a *application) rewriteRefOfDropColumn(parent SQLNode, node *DropColumn, r
 	}
 	return true
 }
+
+// Function Generation Source: PtrToStructMethod
 func (a *application) rewriteRefOfDropDatabase(parent SQLNode, node *DropDatabase, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -2783,16 +3490,26 @@ func (a *application) rewriteRefOfDropDatabase(parent SQLNode, node *DropDatabas
 			return true
 		}
 	}
+	if a.collectPaths {
+		a.cur.current.AddStep(uint16(RefOfDropDatabaseComments))
+	}
 	if !a.rewriteRefOfParsedComments(node, node.Comments, func(newNode, parent SQLNode) {
 		parent.(*DropDatabase).Comments = newNode.(*ParsedComments)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+		a.cur.current.AddStep(uint16(RefOfDropDatabaseDBName))
+	}
 	if !a.rewriteIdentifierCS(node, node.DBName, func(newNode, parent SQLNode) {
 		parent.(*DropDatabase).DBName = newNode.(IdentifierCS)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+	}
 	if a.post != nil {
 		a.cur.replacer = replacer
 		a.cur.parent = parent
@@ -2803,6 +3520,8 @@ func (a *application) rewriteRefOfDropDatabase(parent SQLNode, node *DropDatabas
 	}
 	return true
 }
+
+// Function Generation Source: PtrToStructMethod
 func (a *application) rewriteRefOfDropKey(parent SQLNode, node *DropKey, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -2820,11 +3539,17 @@ func (a *application) rewriteRefOfDropKey(parent SQLNode, node *DropKey, replace
 			return true
 		}
 	}
+	if a.collectPaths {
+		a.cur.current.AddStep(uint16(RefOfDropKeyName))
+	}
 	if !a.rewriteIdentifierCI(node, node.Name, func(newNode, parent SQLNode) {
 		parent.(*DropKey).Name = newNode.(IdentifierCI)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+	}
 	if a.post != nil {
 		a.cur.replacer = replacer
 		a.cur.parent = parent
@@ -2835,6 +3560,8 @@ func (a *application) rewriteRefOfDropKey(parent SQLNode, node *DropKey, replace
 	}
 	return true
 }
+
+// Function Generation Source: PtrToStructMethod
 func (a *application) rewriteRefOfDropTable(parent SQLNode, node *DropTable, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -2852,16 +3579,26 @@ func (a *application) rewriteRefOfDropTable(parent SQLNode, node *DropTable, rep
 			return true
 		}
 	}
+	if a.collectPaths {
+		a.cur.current.AddStep(uint16(RefOfDropTableFromTables))
+	}
 	if !a.rewriteTableNames(node, node.FromTables, func(newNode, parent SQLNode) {
 		parent.(*DropTable).FromTables = newNode.(TableNames)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+		a.cur.current.AddStep(uint16(RefOfDropTableComments))
+	}
 	if !a.rewriteRefOfParsedComments(node, node.Comments, func(newNode, parent SQLNode) {
 		parent.(*DropTable).Comments = newNode.(*ParsedComments)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+	}
 	if a.post != nil {
 		a.cur.replacer = replacer
 		a.cur.parent = parent
@@ -2872,6 +3609,8 @@ func (a *application) rewriteRefOfDropTable(parent SQLNode, node *DropTable, rep
 	}
 	return true
 }
+
+// Function Generation Source: PtrToStructMethod
 func (a *application) rewriteRefOfDropView(parent SQLNode, node *DropView, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -2889,16 +3628,26 @@ func (a *application) rewriteRefOfDropView(parent SQLNode, node *DropView, repla
 			return true
 		}
 	}
+	if a.collectPaths {
+		a.cur.current.AddStep(uint16(RefOfDropViewFromTables))
+	}
 	if !a.rewriteTableNames(node, node.FromTables, func(newNode, parent SQLNode) {
 		parent.(*DropView).FromTables = newNode.(TableNames)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+		a.cur.current.AddStep(uint16(RefOfDropViewComments))
+	}
 	if !a.rewriteRefOfParsedComments(node, node.Comments, func(newNode, parent SQLNode) {
 		parent.(*DropView).Comments = newNode.(*ParsedComments)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+	}
 	if a.post != nil {
 		a.cur.replacer = replacer
 		a.cur.parent = parent
@@ -2909,6 +3658,8 @@ func (a *application) rewriteRefOfDropView(parent SQLNode, node *DropView, repla
 	}
 	return true
 }
+
+// Function Generation Source: PtrToStructMethod
 func (a *application) rewriteRefOfExecuteStmt(parent SQLNode, node *ExecuteStmt, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -2926,17 +3677,34 @@ func (a *application) rewriteRefOfExecuteStmt(parent SQLNode, node *ExecuteStmt,
 			return true
 		}
 	}
+	if a.collectPaths {
+		a.cur.current.AddStep(uint16(RefOfExecuteStmtName))
+	}
 	if !a.rewriteIdentifierCI(node, node.Name, func(newNode, parent SQLNode) {
 		parent.(*ExecuteStmt).Name = newNode.(IdentifierCI)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+		a.cur.current.AddStep(uint16(RefOfExecuteStmtComments))
+	}
 	if !a.rewriteRefOfParsedComments(node, node.Comments, func(newNode, parent SQLNode) {
 		parent.(*ExecuteStmt).Comments = newNode.(*ParsedComments)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+	}
 	for x, el := range node.Arguments {
+		if a.collectPaths {
+			if x == 0 {
+				a.cur.current.AddStepWithOffset(uint16(RefOfExecuteStmtArgumentsOffset))
+			} else {
+				a.cur.current.ChangeOffset(x)
+			}
+		}
 		if !a.rewriteRefOfVariable(node, el, func(idx int) replacerFunc {
 			return func(newNode, parent SQLNode) {
 				parent.(*ExecuteStmt).Arguments[idx] = newNode.(*Variable)
@@ -2945,6 +3713,9 @@ func (a *application) rewriteRefOfExecuteStmt(parent SQLNode, node *ExecuteStmt,
 			return false
 		}
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+	}
 	if a.post != nil {
 		a.cur.replacer = replacer
 		a.cur.parent = parent
@@ -2955,6 +3726,8 @@ func (a *application) rewriteRefOfExecuteStmt(parent SQLNode, node *ExecuteStmt,
 	}
 	return true
 }
+
+// Function Generation Source: PtrToStructMethod
 func (a *application) rewriteRefOfExistsExpr(parent SQLNode, node *ExistsExpr, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -2972,11 +3745,17 @@ func (a *application) rewriteRefOfExistsExpr(parent SQLNode, node *ExistsExpr, r
 			return true
 		}
 	}
+	if a.collectPaths {
+		a.cur.current.AddStep(uint16(RefOfExistsExprSubquery))
+	}
 	if !a.rewriteRefOfSubquery(node, node.Subquery, func(newNode, parent SQLNode) {
 		parent.(*ExistsExpr).Subquery = newNode.(*Subquery)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+	}
 	if a.post != nil {
 		a.cur.replacer = replacer
 		a.cur.parent = parent
@@ -2987,6 +3766,8 @@ func (a *application) rewriteRefOfExistsExpr(parent SQLNode, node *ExistsExpr, r
 	}
 	return true
 }
+
+// Function Generation Source: PtrToStructMethod
 func (a *application) rewriteRefOfExplainStmt(parent SQLNode, node *ExplainStmt, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -3004,16 +3785,26 @@ func (a *application) rewriteRefOfExplainStmt(parent SQLNode, node *ExplainStmt,
 			return true
 		}
 	}
+	if a.collectPaths {
+		a.cur.current.AddStep(uint16(RefOfExplainStmtStatement))
+	}
 	if !a.rewriteStatement(node, node.Statement, func(newNode, parent SQLNode) {
 		parent.(*ExplainStmt).Statement = newNode.(Statement)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+		a.cur.current.AddStep(uint16(RefOfExplainStmtComments))
+	}
 	if !a.rewriteRefOfParsedComments(node, node.Comments, func(newNode, parent SQLNode) {
 		parent.(*ExplainStmt).Comments = newNode.(*ParsedComments)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+	}
 	if a.post != nil {
 		a.cur.replacer = replacer
 		a.cur.parent = parent
@@ -3024,6 +3815,8 @@ func (a *application) rewriteRefOfExplainStmt(parent SQLNode, node *ExplainStmt,
 	}
 	return true
 }
+
+// Function Generation Source: PtrToStructMethod
 func (a *application) rewriteRefOfExplainTab(parent SQLNode, node *ExplainTab, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -3041,11 +3834,17 @@ func (a *application) rewriteRefOfExplainTab(parent SQLNode, node *ExplainTab, r
 			return true
 		}
 	}
+	if a.collectPaths {
+		a.cur.current.AddStep(uint16(RefOfExplainTabTable))
+	}
 	if !a.rewriteTableName(node, node.Table, func(newNode, parent SQLNode) {
 		parent.(*ExplainTab).Table = newNode.(TableName)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+	}
 	if a.post != nil {
 		a.cur.replacer = replacer
 		a.cur.parent = parent
@@ -3056,6 +3855,8 @@ func (a *application) rewriteRefOfExplainTab(parent SQLNode, node *ExplainTab, r
 	}
 	return true
 }
+
+// Function Generation Source: PtrToStructMethod
 func (a *application) rewriteRefOfExprs(parent SQLNode, node *Exprs, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -3074,6 +3875,13 @@ func (a *application) rewriteRefOfExprs(parent SQLNode, node *Exprs, replacer re
 		}
 	}
 	for x, el := range node.Exprs {
+		if a.collectPaths {
+			if x == 0 {
+				a.cur.current.AddStepWithOffset(uint16(RefOfExprsExprsOffset))
+			} else {
+				a.cur.current.ChangeOffset(x)
+			}
+		}
 		if !a.rewriteExpr(node, el, func(idx int) replacerFunc {
 			return func(newNode, parent SQLNode) {
 				parent.(*Exprs).Exprs[idx] = newNode.(Expr)
@@ -3082,6 +3890,9 @@ func (a *application) rewriteRefOfExprs(parent SQLNode, node *Exprs, replacer re
 			return false
 		}
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+	}
 	if a.post != nil {
 		a.cur.replacer = replacer
 		a.cur.parent = parent
@@ -3092,6 +3903,8 @@ func (a *application) rewriteRefOfExprs(parent SQLNode, node *Exprs, replacer re
 	}
 	return true
 }
+
+// Function Generation Source: PtrToStructMethod
 func (a *application) rewriteRefOfExtractFuncExpr(parent SQLNode, node *ExtractFuncExpr, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -3109,11 +3922,17 @@ func (a *application) rewriteRefOfExtractFuncExpr(parent SQLNode, node *ExtractF
 			return true
 		}
 	}
+	if a.collectPaths {
+		a.cur.current.AddStep(uint16(RefOfExtractFuncExprExpr))
+	}
 	if !a.rewriteExpr(node, node.Expr, func(newNode, parent SQLNode) {
 		parent.(*ExtractFuncExpr).Expr = newNode.(Expr)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+	}
 	if a.post != nil {
 		a.cur.replacer = replacer
 		a.cur.parent = parent
@@ -3124,6 +3943,8 @@ func (a *application) rewriteRefOfExtractFuncExpr(parent SQLNode, node *ExtractF
 	}
 	return true
 }
+
+// Function Generation Source: PtrToStructMethod
 func (a *application) rewriteRefOfExtractValueExpr(parent SQLNode, node *ExtractValueExpr, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -3141,16 +3962,26 @@ func (a *application) rewriteRefOfExtractValueExpr(parent SQLNode, node *Extract
 			return true
 		}
 	}
+	if a.collectPaths {
+		a.cur.current.AddStep(uint16(RefOfExtractValueExprFragment))
+	}
 	if !a.rewriteExpr(node, node.Fragment, func(newNode, parent SQLNode) {
 		parent.(*ExtractValueExpr).Fragment = newNode.(Expr)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+		a.cur.current.AddStep(uint16(RefOfExtractValueExprXPathExpr))
+	}
 	if !a.rewriteExpr(node, node.XPathExpr, func(newNode, parent SQLNode) {
 		parent.(*ExtractValueExpr).XPathExpr = newNode.(Expr)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+	}
 	if a.post != nil {
 		a.cur.replacer = replacer
 		a.cur.parent = parent
@@ -3161,6 +3992,8 @@ func (a *application) rewriteRefOfExtractValueExpr(parent SQLNode, node *Extract
 	}
 	return true
 }
+
+// Function Generation Source: PtrToStructMethod
 func (a *application) rewriteRefOfFirstOrLastValueExpr(parent SQLNode, node *FirstOrLastValueExpr, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -3178,21 +4011,35 @@ func (a *application) rewriteRefOfFirstOrLastValueExpr(parent SQLNode, node *Fir
 			return true
 		}
 	}
+	if a.collectPaths {
+		a.cur.current.AddStep(uint16(RefOfFirstOrLastValueExprExpr))
+	}
 	if !a.rewriteExpr(node, node.Expr, func(newNode, parent SQLNode) {
 		parent.(*FirstOrLastValueExpr).Expr = newNode.(Expr)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+		a.cur.current.AddStep(uint16(RefOfFirstOrLastValueExprNullTreatmentClause))
+	}
 	if !a.rewriteRefOfNullTreatmentClause(node, node.NullTreatmentClause, func(newNode, parent SQLNode) {
 		parent.(*FirstOrLastValueExpr).NullTreatmentClause = newNode.(*NullTreatmentClause)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+		a.cur.current.AddStep(uint16(RefOfFirstOrLastValueExprOverClause))
+	}
 	if !a.rewriteRefOfOverClause(node, node.OverClause, func(newNode, parent SQLNode) {
 		parent.(*FirstOrLastValueExpr).OverClause = newNode.(*OverClause)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+	}
 	if a.post != nil {
 		a.cur.replacer = replacer
 		a.cur.parent = parent
@@ -3203,6 +4050,8 @@ func (a *application) rewriteRefOfFirstOrLastValueExpr(parent SQLNode, node *Fir
 	}
 	return true
 }
+
+// Function Generation Source: PtrToStructMethod
 func (a *application) rewriteRefOfFlush(parent SQLNode, node *Flush, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -3220,11 +4069,17 @@ func (a *application) rewriteRefOfFlush(parent SQLNode, node *Flush, replacer re
 			return true
 		}
 	}
+	if a.collectPaths {
+		a.cur.current.AddStep(uint16(RefOfFlushTableNames))
+	}
 	if !a.rewriteTableNames(node, node.TableNames, func(newNode, parent SQLNode) {
 		parent.(*Flush).TableNames = newNode.(TableNames)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+	}
 	if a.post != nil {
 		a.cur.replacer = replacer
 		a.cur.parent = parent
@@ -3235,6 +4090,8 @@ func (a *application) rewriteRefOfFlush(parent SQLNode, node *Flush, replacer re
 	}
 	return true
 }
+
+// Function Generation Source: PtrToStructMethod
 func (a *application) rewriteRefOfForce(parent SQLNode, node *Force, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -3264,6 +4121,8 @@ func (a *application) rewriteRefOfForce(parent SQLNode, node *Force, replacer re
 	}
 	return true
 }
+
+// Function Generation Source: PtrToStructMethod
 func (a *application) rewriteRefOfForeignKeyDefinition(parent SQLNode, node *ForeignKeyDefinition, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -3281,21 +4140,35 @@ func (a *application) rewriteRefOfForeignKeyDefinition(parent SQLNode, node *For
 			return true
 		}
 	}
+	if a.collectPaths {
+		a.cur.current.AddStep(uint16(RefOfForeignKeyDefinitionSource))
+	}
 	if !a.rewriteColumns(node, node.Source, func(newNode, parent SQLNode) {
 		parent.(*ForeignKeyDefinition).Source = newNode.(Columns)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+		a.cur.current.AddStep(uint16(RefOfForeignKeyDefinitionIndexName))
+	}
 	if !a.rewriteIdentifierCI(node, node.IndexName, func(newNode, parent SQLNode) {
 		parent.(*ForeignKeyDefinition).IndexName = newNode.(IdentifierCI)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+		a.cur.current.AddStep(uint16(RefOfForeignKeyDefinitionReferenceDefinition))
+	}
 	if !a.rewriteRefOfReferenceDefinition(node, node.ReferenceDefinition, func(newNode, parent SQLNode) {
 		parent.(*ForeignKeyDefinition).ReferenceDefinition = newNode.(*ReferenceDefinition)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+	}
 	if a.post != nil {
 		a.cur.replacer = replacer
 		a.cur.parent = parent
@@ -3306,6 +4179,8 @@ func (a *application) rewriteRefOfForeignKeyDefinition(parent SQLNode, node *For
 	}
 	return true
 }
+
+// Function Generation Source: PtrToStructMethod
 func (a *application) rewriteRefOfFrameClause(parent SQLNode, node *FrameClause, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -3323,16 +4198,26 @@ func (a *application) rewriteRefOfFrameClause(parent SQLNode, node *FrameClause,
 			return true
 		}
 	}
+	if a.collectPaths {
+		a.cur.current.AddStep(uint16(RefOfFrameClauseStart))
+	}
 	if !a.rewriteRefOfFramePoint(node, node.Start, func(newNode, parent SQLNode) {
 		parent.(*FrameClause).Start = newNode.(*FramePoint)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+		a.cur.current.AddStep(uint16(RefOfFrameClauseEnd))
+	}
 	if !a.rewriteRefOfFramePoint(node, node.End, func(newNode, parent SQLNode) {
 		parent.(*FrameClause).End = newNode.(*FramePoint)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+	}
 	if a.post != nil {
 		a.cur.replacer = replacer
 		a.cur.parent = parent
@@ -3343,6 +4228,8 @@ func (a *application) rewriteRefOfFrameClause(parent SQLNode, node *FrameClause,
 	}
 	return true
 }
+
+// Function Generation Source: PtrToStructMethod
 func (a *application) rewriteRefOfFramePoint(parent SQLNode, node *FramePoint, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -3360,11 +4247,17 @@ func (a *application) rewriteRefOfFramePoint(parent SQLNode, node *FramePoint, r
 			return true
 		}
 	}
+	if a.collectPaths {
+		a.cur.current.AddStep(uint16(RefOfFramePointExpr))
+	}
 	if !a.rewriteExpr(node, node.Expr, func(newNode, parent SQLNode) {
 		parent.(*FramePoint).Expr = newNode.(Expr)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+	}
 	if a.post != nil {
 		a.cur.replacer = replacer
 		a.cur.parent = parent
@@ -3375,6 +4268,8 @@ func (a *application) rewriteRefOfFramePoint(parent SQLNode, node *FramePoint, r
 	}
 	return true
 }
+
+// Function Generation Source: PtrToStructMethod
 func (a *application) rewriteRefOfFromFirstLastClause(parent SQLNode, node *FromFirstLastClause, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -3404,6 +4299,8 @@ func (a *application) rewriteRefOfFromFirstLastClause(parent SQLNode, node *From
 	}
 	return true
 }
+
+// Function Generation Source: PtrToStructMethod
 func (a *application) rewriteRefOfFuncExpr(parent SQLNode, node *FuncExpr, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -3421,17 +4318,34 @@ func (a *application) rewriteRefOfFuncExpr(parent SQLNode, node *FuncExpr, repla
 			return true
 		}
 	}
+	if a.collectPaths {
+		a.cur.current.AddStep(uint16(RefOfFuncExprQualifier))
+	}
 	if !a.rewriteIdentifierCS(node, node.Qualifier, func(newNode, parent SQLNode) {
 		parent.(*FuncExpr).Qualifier = newNode.(IdentifierCS)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+		a.cur.current.AddStep(uint16(RefOfFuncExprName))
+	}
 	if !a.rewriteIdentifierCI(node, node.Name, func(newNode, parent SQLNode) {
 		parent.(*FuncExpr).Name = newNode.(IdentifierCI)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+	}
 	for x, el := range node.Exprs {
+		if a.collectPaths {
+			if x == 0 {
+				a.cur.current.AddStepWithOffset(uint16(RefOfFuncExprExprsOffset))
+			} else {
+				a.cur.current.ChangeOffset(x)
+			}
+		}
 		if !a.rewriteExpr(node, el, func(idx int) replacerFunc {
 			return func(newNode, parent SQLNode) {
 				parent.(*FuncExpr).Exprs[idx] = newNode.(Expr)
@@ -3440,6 +4354,9 @@ func (a *application) rewriteRefOfFuncExpr(parent SQLNode, node *FuncExpr, repla
 			return false
 		}
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+	}
 	if a.post != nil {
 		a.cur.replacer = replacer
 		a.cur.parent = parent
@@ -3450,6 +4367,8 @@ func (a *application) rewriteRefOfFuncExpr(parent SQLNode, node *FuncExpr, repla
 	}
 	return true
 }
+
+// Function Generation Source: PtrToStructMethod
 func (a *application) rewriteRefOfGTIDFuncExpr(parent SQLNode, node *GTIDFuncExpr, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -3467,26 +4386,44 @@ func (a *application) rewriteRefOfGTIDFuncExpr(parent SQLNode, node *GTIDFuncExp
 			return true
 		}
 	}
+	if a.collectPaths {
+		a.cur.current.AddStep(uint16(RefOfGTIDFuncExprSet1))
+	}
 	if !a.rewriteExpr(node, node.Set1, func(newNode, parent SQLNode) {
 		parent.(*GTIDFuncExpr).Set1 = newNode.(Expr)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+		a.cur.current.AddStep(uint16(RefOfGTIDFuncExprSet2))
+	}
 	if !a.rewriteExpr(node, node.Set2, func(newNode, parent SQLNode) {
 		parent.(*GTIDFuncExpr).Set2 = newNode.(Expr)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+		a.cur.current.AddStep(uint16(RefOfGTIDFuncExprTimeout))
+	}
 	if !a.rewriteExpr(node, node.Timeout, func(newNode, parent SQLNode) {
 		parent.(*GTIDFuncExpr).Timeout = newNode.(Expr)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+		a.cur.current.AddStep(uint16(RefOfGTIDFuncExprChannel))
+	}
 	if !a.rewriteExpr(node, node.Channel, func(newNode, parent SQLNode) {
 		parent.(*GTIDFuncExpr).Channel = newNode.(Expr)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+	}
 	if a.post != nil {
 		a.cur.replacer = replacer
 		a.cur.parent = parent
@@ -3497,6 +4434,8 @@ func (a *application) rewriteRefOfGTIDFuncExpr(parent SQLNode, node *GTIDFuncExp
 	}
 	return true
 }
+
+// Function Generation Source: PtrToStructMethod
 func (a *application) rewriteRefOfGeoHashFromLatLongExpr(parent SQLNode, node *GeoHashFromLatLongExpr, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -3514,21 +4453,35 @@ func (a *application) rewriteRefOfGeoHashFromLatLongExpr(parent SQLNode, node *G
 			return true
 		}
 	}
+	if a.collectPaths {
+		a.cur.current.AddStep(uint16(RefOfGeoHashFromLatLongExprLatitude))
+	}
 	if !a.rewriteExpr(node, node.Latitude, func(newNode, parent SQLNode) {
 		parent.(*GeoHashFromLatLongExpr).Latitude = newNode.(Expr)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+		a.cur.current.AddStep(uint16(RefOfGeoHashFromLatLongExprLongitude))
+	}
 	if !a.rewriteExpr(node, node.Longitude, func(newNode, parent SQLNode) {
 		parent.(*GeoHashFromLatLongExpr).Longitude = newNode.(Expr)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+		a.cur.current.AddStep(uint16(RefOfGeoHashFromLatLongExprMaxLength))
+	}
 	if !a.rewriteExpr(node, node.MaxLength, func(newNode, parent SQLNode) {
 		parent.(*GeoHashFromLatLongExpr).MaxLength = newNode.(Expr)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+	}
 	if a.post != nil {
 		a.cur.replacer = replacer
 		a.cur.parent = parent
@@ -3539,6 +4492,8 @@ func (a *application) rewriteRefOfGeoHashFromLatLongExpr(parent SQLNode, node *G
 	}
 	return true
 }
+
+// Function Generation Source: PtrToStructMethod
 func (a *application) rewriteRefOfGeoHashFromPointExpr(parent SQLNode, node *GeoHashFromPointExpr, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -3556,16 +4511,26 @@ func (a *application) rewriteRefOfGeoHashFromPointExpr(parent SQLNode, node *Geo
 			return true
 		}
 	}
+	if a.collectPaths {
+		a.cur.current.AddStep(uint16(RefOfGeoHashFromPointExprPoint))
+	}
 	if !a.rewriteExpr(node, node.Point, func(newNode, parent SQLNode) {
 		parent.(*GeoHashFromPointExpr).Point = newNode.(Expr)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+		a.cur.current.AddStep(uint16(RefOfGeoHashFromPointExprMaxLength))
+	}
 	if !a.rewriteExpr(node, node.MaxLength, func(newNode, parent SQLNode) {
 		parent.(*GeoHashFromPointExpr).MaxLength = newNode.(Expr)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+	}
 	if a.post != nil {
 		a.cur.replacer = replacer
 		a.cur.parent = parent
@@ -3576,6 +4541,8 @@ func (a *application) rewriteRefOfGeoHashFromPointExpr(parent SQLNode, node *Geo
 	}
 	return true
 }
+
+// Function Generation Source: PtrToStructMethod
 func (a *application) rewriteRefOfGeoJSONFromGeomExpr(parent SQLNode, node *GeoJSONFromGeomExpr, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -3593,21 +4560,35 @@ func (a *application) rewriteRefOfGeoJSONFromGeomExpr(parent SQLNode, node *GeoJ
 			return true
 		}
 	}
+	if a.collectPaths {
+		a.cur.current.AddStep(uint16(RefOfGeoJSONFromGeomExprGeom))
+	}
 	if !a.rewriteExpr(node, node.Geom, func(newNode, parent SQLNode) {
 		parent.(*GeoJSONFromGeomExpr).Geom = newNode.(Expr)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+		a.cur.current.AddStep(uint16(RefOfGeoJSONFromGeomExprMaxDecimalDigits))
+	}
 	if !a.rewriteExpr(node, node.MaxDecimalDigits, func(newNode, parent SQLNode) {
 		parent.(*GeoJSONFromGeomExpr).MaxDecimalDigits = newNode.(Expr)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+		a.cur.current.AddStep(uint16(RefOfGeoJSONFromGeomExprBitmask))
+	}
 	if !a.rewriteExpr(node, node.Bitmask, func(newNode, parent SQLNode) {
 		parent.(*GeoJSONFromGeomExpr).Bitmask = newNode.(Expr)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+	}
 	if a.post != nil {
 		a.cur.replacer = replacer
 		a.cur.parent = parent
@@ -3618,6 +4599,8 @@ func (a *application) rewriteRefOfGeoJSONFromGeomExpr(parent SQLNode, node *GeoJ
 	}
 	return true
 }
+
+// Function Generation Source: PtrToStructMethod
 func (a *application) rewriteRefOfGeomCollPropertyFuncExpr(parent SQLNode, node *GeomCollPropertyFuncExpr, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -3635,16 +4618,26 @@ func (a *application) rewriteRefOfGeomCollPropertyFuncExpr(parent SQLNode, node
 			return true
 		}
 	}
+	if a.collectPaths {
+		a.cur.current.AddStep(uint16(RefOfGeomCollPropertyFuncExprGeomColl))
+	}
 	if !a.rewriteExpr(node, node.GeomColl, func(newNode, parent SQLNode) {
 		parent.(*GeomCollPropertyFuncExpr).GeomColl = newNode.(Expr)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+		a.cur.current.AddStep(uint16(RefOfGeomCollPropertyFuncExprPropertyDefArg))
+	}
 	if !a.rewriteExpr(node, node.PropertyDefArg, func(newNode, parent SQLNode) {
 		parent.(*GeomCollPropertyFuncExpr).PropertyDefArg = newNode.(Expr)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+	}
 	if a.post != nil {
 		a.cur.replacer = replacer
 		a.cur.parent = parent
@@ -3655,6 +4648,8 @@ func (a *application) rewriteRefOfGeomCollPropertyFuncExpr(parent SQLNode, node
 	}
 	return true
 }
+
+// Function Generation Source: PtrToStructMethod
 func (a *application) rewriteRefOfGeomFormatExpr(parent SQLNode, node *GeomFormatExpr, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -3672,16 +4667,26 @@ func (a *application) rewriteRefOfGeomFormatExpr(parent SQLNode, node *GeomForma
 			return true
 		}
 	}
+	if a.collectPaths {
+		a.cur.current.AddStep(uint16(RefOfGeomFormatExprGeom))
+	}
 	if !a.rewriteExpr(node, node.Geom, func(newNode, parent SQLNode) {
 		parent.(*GeomFormatExpr).Geom = newNode.(Expr)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+		a.cur.current.AddStep(uint16(RefOfGeomFormatExprAxisOrderOpt))
+	}
 	if !a.rewriteExpr(node, node.AxisOrderOpt, func(newNode, parent SQLNode) {
 		parent.(*GeomFormatExpr).AxisOrderOpt = newNode.(Expr)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+	}
 	if a.post != nil {
 		a.cur.replacer = replacer
 		a.cur.parent = parent
@@ -3692,6 +4697,8 @@ func (a *application) rewriteRefOfGeomFormatExpr(parent SQLNode, node *GeomForma
 	}
 	return true
 }
+
+// Function Generation Source: PtrToStructMethod
 func (a *application) rewriteRefOfGeomFromGeoHashExpr(parent SQLNode, node *GeomFromGeoHashExpr, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -3709,16 +4716,26 @@ func (a *application) rewriteRefOfGeomFromGeoHashExpr(parent SQLNode, node *Geom
 			return true
 		}
 	}
+	if a.collectPaths {
+		a.cur.current.AddStep(uint16(RefOfGeomFromGeoHashExprGeoHash))
+	}
 	if !a.rewriteExpr(node, node.GeoHash, func(newNode, parent SQLNode) {
 		parent.(*GeomFromGeoHashExpr).GeoHash = newNode.(Expr)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+		a.cur.current.AddStep(uint16(RefOfGeomFromGeoHashExprSridOpt))
+	}
 	if !a.rewriteExpr(node, node.SridOpt, func(newNode, parent SQLNode) {
 		parent.(*GeomFromGeoHashExpr).SridOpt = newNode.(Expr)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+	}
 	if a.post != nil {
 		a.cur.replacer = replacer
 		a.cur.parent = parent
@@ -3729,6 +4746,8 @@ func (a *application) rewriteRefOfGeomFromGeoHashExpr(parent SQLNode, node *Geom
 	}
 	return true
 }
+
+// Function Generation Source: PtrToStructMethod
 func (a *application) rewriteRefOfGeomFromGeoJSONExpr(parent SQLNode, node *GeomFromGeoJSONExpr, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -3746,21 +4765,35 @@ func (a *application) rewriteRefOfGeomFromGeoJSONExpr(parent SQLNode, node *Geom
 			return true
 		}
 	}
+	if a.collectPaths {
+		a.cur.current.AddStep(uint16(RefOfGeomFromGeoJSONExprGeoJSON))
+	}
 	if !a.rewriteExpr(node, node.GeoJSON, func(newNode, parent SQLNode) {
 		parent.(*GeomFromGeoJSONExpr).GeoJSON = newNode.(Expr)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+		a.cur.current.AddStep(uint16(RefOfGeomFromGeoJSONExprHigherDimHandlerOpt))
+	}
 	if !a.rewriteExpr(node, node.HigherDimHandlerOpt, func(newNode, parent SQLNode) {
 		parent.(*GeomFromGeoJSONExpr).HigherDimHandlerOpt = newNode.(Expr)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+		a.cur.current.AddStep(uint16(RefOfGeomFromGeoJSONExprSrid))
+	}
 	if !a.rewriteExpr(node, node.Srid, func(newNode, parent SQLNode) {
 		parent.(*GeomFromGeoJSONExpr).Srid = newNode.(Expr)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+	}
 	if a.post != nil {
 		a.cur.replacer = replacer
 		a.cur.parent = parent
@@ -3771,6 +4804,8 @@ func (a *application) rewriteRefOfGeomFromGeoJSONExpr(parent SQLNode, node *Geom
 	}
 	return true
 }
+
+// Function Generation Source: PtrToStructMethod
 func (a *application) rewriteRefOfGeomFromTextExpr(parent SQLNode, node *GeomFromTextExpr, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -3788,21 +4823,35 @@ func (a *application) rewriteRefOfGeomFromTextExpr(parent SQLNode, node *GeomFro
 			return true
 		}
 	}
+	if a.collectPaths {
+		a.cur.current.AddStep(uint16(RefOfGeomFromTextExprWktText))
+	}
 	if !a.rewriteExpr(node, node.WktText, func(newNode, parent SQLNode) {
 		parent.(*GeomFromTextExpr).WktText = newNode.(Expr)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+		a.cur.current.AddStep(uint16(RefOfGeomFromTextExprSrid))
+	}
 	if !a.rewriteExpr(node, node.Srid, func(newNode, parent SQLNode) {
 		parent.(*GeomFromTextExpr).Srid = newNode.(Expr)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+		a.cur.current.AddStep(uint16(RefOfGeomFromTextExprAxisOrderOpt))
+	}
 	if !a.rewriteExpr(node, node.AxisOrderOpt, func(newNode, parent SQLNode) {
 		parent.(*GeomFromTextExpr).AxisOrderOpt = newNode.(Expr)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+	}
 	if a.post != nil {
 		a.cur.replacer = replacer
 		a.cur.parent = parent
@@ -3813,6 +4862,8 @@ func (a *application) rewriteRefOfGeomFromTextExpr(parent SQLNode, node *GeomFro
 	}
 	return true
 }
+
+// Function Generation Source: PtrToStructMethod
 func (a *application) rewriteRefOfGeomFromWKBExpr(parent SQLNode, node *GeomFromWKBExpr, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -3830,21 +4881,35 @@ func (a *application) rewriteRefOfGeomFromWKBExpr(parent SQLNode, node *GeomFrom
 			return true
 		}
 	}
+	if a.collectPaths {
+		a.cur.current.AddStep(uint16(RefOfGeomFromWKBExprWkbBlob))
+	}
 	if !a.rewriteExpr(node, node.WkbBlob, func(newNode, parent SQLNode) {
 		parent.(*GeomFromWKBExpr).WkbBlob = newNode.(Expr)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+		a.cur.current.AddStep(uint16(RefOfGeomFromWKBExprSrid))
+	}
 	if !a.rewriteExpr(node, node.Srid, func(newNode, parent SQLNode) {
 		parent.(*GeomFromWKBExpr).Srid = newNode.(Expr)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+		a.cur.current.AddStep(uint16(RefOfGeomFromWKBExprAxisOrderOpt))
+	}
 	if !a.rewriteExpr(node, node.AxisOrderOpt, func(newNode, parent SQLNode) {
 		parent.(*GeomFromWKBExpr).AxisOrderOpt = newNode.(Expr)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+	}
 	if a.post != nil {
 		a.cur.replacer = replacer
 		a.cur.parent = parent
@@ -3855,6 +4920,8 @@ func (a *application) rewriteRefOfGeomFromWKBExpr(parent SQLNode, node *GeomFrom
 	}
 	return true
 }
+
+// Function Generation Source: PtrToStructMethod
 func (a *application) rewriteRefOfGeomPropertyFuncExpr(parent SQLNode, node *GeomPropertyFuncExpr, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -3872,11 +4939,17 @@ func (a *application) rewriteRefOfGeomPropertyFuncExpr(parent SQLNode, node *Geo
 			return true
 		}
 	}
+	if a.collectPaths {
+		a.cur.current.AddStep(uint16(RefOfGeomPropertyFuncExprGeom))
+	}
 	if !a.rewriteExpr(node, node.Geom, func(newNode, parent SQLNode) {
 		parent.(*GeomPropertyFuncExpr).Geom = newNode.(Expr)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+	}
 	if a.post != nil {
 		a.cur.replacer = replacer
 		a.cur.parent = parent
@@ -3887,6 +4960,8 @@ func (a *application) rewriteRefOfGeomPropertyFuncExpr(parent SQLNode, node *Geo
 	}
 	return true
 }
+
+// Function Generation Source: PtrToStructMethod
 func (a *application) rewriteRefOfGroupBy(parent SQLNode, node *GroupBy, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -3905,6 +4980,13 @@ func (a *application) rewriteRefOfGroupBy(parent SQLNode, node *GroupBy, replace
 		}
 	}
 	for x, el := range node.Exprs {
+		if a.collectPaths {
+			if x == 0 {
+				a.cur.current.AddStepWithOffset(uint16(RefOfGroupByExprsOffset))
+			} else {
+				a.cur.current.ChangeOffset(x)
+			}
+		}
 		if !a.rewriteExpr(node, el, func(idx int) replacerFunc {
 			return func(newNode, parent SQLNode) {
 				parent.(*GroupBy).Exprs[idx] = newNode.(Expr)
@@ -3913,6 +4995,9 @@ func (a *application) rewriteRefOfGroupBy(parent SQLNode, node *GroupBy, replace
 			return false
 		}
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+	}
 	if a.post != nil {
 		a.cur.replacer = replacer
 		a.cur.parent = parent
@@ -3923,6 +5008,8 @@ func (a *application) rewriteRefOfGroupBy(parent SQLNode, node *GroupBy, replace
 	}
 	return true
 }
+
+// Function Generation Source: PtrToStructMethod
 func (a *application) rewriteRefOfGroupConcatExpr(parent SQLNode, node *GroupConcatExpr, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -3941,6 +5028,13 @@ func (a *application) rewriteRefOfGroupConcatExpr(parent SQLNode, node *GroupCon
 		}
 	}
 	for x, el := range node.Exprs {
+		if a.collectPaths {
+			if x == 0 {
+				a.cur.current.AddStepWithOffset(uint16(RefOfGroupConcatExprExprsOffset))
+			} else {
+				a.cur.current.ChangeOffset(x)
+			}
+		}
 		if !a.rewriteExpr(node, el, func(idx int) replacerFunc {
 			return func(newNode, parent SQLNode) {
 				parent.(*GroupConcatExpr).Exprs[idx] = newNode.(Expr)
@@ -3949,16 +5043,27 @@ func (a *application) rewriteRefOfGroupConcatExpr(parent SQLNode, node *GroupCon
 			return false
 		}
 	}
+	if a.collectPaths && len(node.Exprs) > 0 {
+		a.cur.current.Pop()
+		a.cur.current.AddStep(uint16(RefOfGroupConcatExprOrderBy))
+	}
 	if !a.rewriteOrderBy(node, node.OrderBy, func(newNode, parent SQLNode) {
 		parent.(*GroupConcatExpr).OrderBy = newNode.(OrderBy)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+		a.cur.current.AddStep(uint16(RefOfGroupConcatExprLimit))
+	}
 	if !a.rewriteRefOfLimit(node, node.Limit, func(newNode, parent SQLNode) {
 		parent.(*GroupConcatExpr).Limit = newNode.(*Limit)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+	}
 	if a.post != nil {
 		a.cur.replacer = replacer
 		a.cur.parent = parent
@@ -3969,6 +5074,8 @@ func (a *application) rewriteRefOfGroupConcatExpr(parent SQLNode, node *GroupCon
 	}
 	return true
 }
+
+// Function Generation Source: StructMethod
 func (a *application) rewriteIdentifierCI(parent SQLNode, node IdentifierCI, replacer replacerFunc) bool {
 	if a.pre != nil {
 		a.cur.replacer = replacer
@@ -3995,6 +5102,8 @@ func (a *application) rewriteIdentifierCI(parent SQLNode, node IdentifierCI, rep
 	}
 	return true
 }
+
+// Function Generation Source: StructMethod
 func (a *application) rewriteIdentifierCS(parent SQLNode, node IdentifierCS, replacer replacerFunc) bool {
 	if a.pre != nil {
 		a.cur.replacer = replacer
@@ -4021,6 +5130,8 @@ func (a *application) rewriteIdentifierCS(parent SQLNode, node IdentifierCS, rep
 	}
 	return true
 }
+
+// Function Generation Source: PtrToStructMethod
 func (a *application) rewriteRefOfIndexDefinition(parent SQLNode, node *IndexDefinition, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -4038,11 +5149,17 @@ func (a *application) rewriteRefOfIndexDefinition(parent SQLNode, node *IndexDef
 			return true
 		}
 	}
+	if a.collectPaths {
+		a.cur.current.AddStep(uint16(RefOfIndexDefinitionInfo))
+	}
 	if !a.rewriteRefOfIndexInfo(node, node.Info, func(newNode, parent SQLNode) {
 		parent.(*IndexDefinition).Info = newNode.(*IndexInfo)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+	}
 	if a.post != nil {
 		a.cur.replacer = replacer
 		a.cur.parent = parent
@@ -4053,6 +5170,8 @@ func (a *application) rewriteRefOfIndexDefinition(parent SQLNode, node *IndexDef
 	}
 	return true
 }
+
+// Function Generation Source: PtrToStructMethod
 func (a *application) rewriteRefOfIndexHint(parent SQLNode, node *IndexHint, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -4071,6 +5190,13 @@ func (a *application) rewriteRefOfIndexHint(parent SQLNode, node *IndexHint, rep
 		}
 	}
 	for x, el := range node.Indexes {
+		if a.collectPaths {
+			if x == 0 {
+				a.cur.current.AddStepWithOffset(uint16(RefOfIndexHintIndexesOffset))
+			} else {
+				a.cur.current.ChangeOffset(x)
+			}
+		}
 		if !a.rewriteIdentifierCI(node, el, func(idx int) replacerFunc {
 			return func(newNode, parent SQLNode) {
 				parent.(*IndexHint).Indexes[idx] = newNode.(IdentifierCI)
@@ -4079,6 +5205,9 @@ func (a *application) rewriteRefOfIndexHint(parent SQLNode, node *IndexHint, rep
 			return false
 		}
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+	}
 	if a.post != nil {
 		a.cur.replacer = replacer
 		a.cur.parent = parent
@@ -4089,6 +5218,8 @@ func (a *application) rewriteRefOfIndexHint(parent SQLNode, node *IndexHint, rep
 	}
 	return true
 }
+
+// Function Generation Source: SliceMethod
 func (a *application) rewriteIndexHints(parent SQLNode, node IndexHints, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -4107,6 +5238,13 @@ func (a *application) rewriteIndexHints(parent SQLNode, node IndexHints, replace
 		}
 	}
 	for x, el := range node {
+		if a.collectPaths {
+			if x == 0 {
+				a.cur.current.AddStepWithOffset(uint16(IndexHintsOffset))
+			} else {
+				a.cur.current.ChangeOffset(x)
+			}
+		}
 		if !a.rewriteRefOfIndexHint(node, el, func(idx int) replacerFunc {
 			return func(newNode, parent SQLNode) {
 				parent.(IndexHints)[idx] = newNode.(*IndexHint)
@@ -4115,6 +5253,9 @@ func (a *application) rewriteIndexHints(parent SQLNode, node IndexHints, replace
 			return false
 		}
 	}
+	if a.collectPaths && len(node) > 0 {
+		a.cur.current.Pop()
+	}
 	if a.post != nil {
 		a.cur.replacer = replacer
 		a.cur.parent = parent
@@ -4125,6 +5266,8 @@ func (a *application) rewriteIndexHints(parent SQLNode, node IndexHints, replace
 	}
 	return true
 }
+
+// Function Generation Source: PtrToStructMethod
 func (a *application) rewriteRefOfIndexInfo(parent SQLNode, node *IndexInfo, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -4142,16 +5285,26 @@ func (a *application) rewriteRefOfIndexInfo(parent SQLNode, node *IndexInfo, rep
 			return true
 		}
 	}
+	if a.collectPaths {
+		a.cur.current.AddStep(uint16(RefOfIndexInfoName))
+	}
 	if !a.rewriteIdentifierCI(node, node.Name, func(newNode, parent SQLNode) {
 		parent.(*IndexInfo).Name = newNode.(IdentifierCI)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+		a.cur.current.AddStep(uint16(RefOfIndexInfoConstraintName))
+	}
 	if !a.rewriteIdentifierCI(node, node.ConstraintName, func(newNode, parent SQLNode) {
 		parent.(*IndexInfo).ConstraintName = newNode.(IdentifierCI)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+	}
 	if a.post != nil {
 		a.cur.replacer = replacer
 		a.cur.parent = parent
@@ -4162,6 +5315,8 @@ func (a *application) rewriteRefOfIndexInfo(parent SQLNode, node *IndexInfo, rep
 	}
 	return true
 }
+
+// Function Generation Source: PtrToStructMethod
 func (a *application) rewriteRefOfInsert(parent SQLNode, node *Insert, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -4179,41 +5334,71 @@ func (a *application) rewriteRefOfInsert(parent SQLNode, node *Insert, replacer
 			return true
 		}
 	}
+	if a.collectPaths {
+		a.cur.current.AddStep(uint16(RefOfInsertComments))
+	}
 	if !a.rewriteRefOfParsedComments(node, node.Comments, func(newNode, parent SQLNode) {
 		parent.(*Insert).Comments = newNode.(*ParsedComments)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+		a.cur.current.AddStep(uint16(RefOfInsertTable))
+	}
 	if !a.rewriteRefOfAliasedTableExpr(node, node.Table, func(newNode, parent SQLNode) {
 		parent.(*Insert).Table = newNode.(*AliasedTableExpr)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+		a.cur.current.AddStep(uint16(RefOfInsertPartitions))
+	}
 	if !a.rewritePartitions(node, node.Partitions, func(newNode, parent SQLNode) {
 		parent.(*Insert).Partitions = newNode.(Partitions)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+		a.cur.current.AddStep(uint16(RefOfInsertColumns))
+	}
 	if !a.rewriteColumns(node, node.Columns, func(newNode, parent SQLNode) {
 		parent.(*Insert).Columns = newNode.(Columns)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+		a.cur.current.AddStep(uint16(RefOfInsertRows))
+	}
 	if !a.rewriteInsertRows(node, node.Rows, func(newNode, parent SQLNode) {
 		parent.(*Insert).Rows = newNode.(InsertRows)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+		a.cur.current.AddStep(uint16(RefOfInsertRowAlias))
+	}
 	if !a.rewriteRefOfRowAlias(node, node.RowAlias, func(newNode, parent SQLNode) {
 		parent.(*Insert).RowAlias = newNode.(*RowAlias)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+		a.cur.current.AddStep(uint16(RefOfInsertOnDup))
+	}
 	if !a.rewriteOnDup(node, node.OnDup, func(newNode, parent SQLNode) {
 		parent.(*Insert).OnDup = newNode.(OnDup)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+	}
 	if a.post != nil {
 		a.cur.replacer = replacer
 		a.cur.parent = parent
@@ -4224,6 +5409,8 @@ func (a *application) rewriteRefOfInsert(parent SQLNode, node *Insert, replacer
 	}
 	return true
 }
+
+// Function Generation Source: PtrToStructMethod
 func (a *application) rewriteRefOfInsertExpr(parent SQLNode, node *InsertExpr, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -4241,26 +5428,44 @@ func (a *application) rewriteRefOfInsertExpr(parent SQLNode, node *InsertExpr, r
 			return true
 		}
 	}
+	if a.collectPaths {
+		a.cur.current.AddStep(uint16(RefOfInsertExprStr))
+	}
 	if !a.rewriteExpr(node, node.Str, func(newNode, parent SQLNode) {
 		parent.(*InsertExpr).Str = newNode.(Expr)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+		a.cur.current.AddStep(uint16(RefOfInsertExprPos))
+	}
 	if !a.rewriteExpr(node, node.Pos, func(newNode, parent SQLNode) {
 		parent.(*InsertExpr).Pos = newNode.(Expr)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+		a.cur.current.AddStep(uint16(RefOfInsertExprLen))
+	}
 	if !a.rewriteExpr(node, node.Len, func(newNode, parent SQLNode) {
 		parent.(*InsertExpr).Len = newNode.(Expr)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+		a.cur.current.AddStep(uint16(RefOfInsertExprNewStr))
+	}
 	if !a.rewriteExpr(node, node.NewStr, func(newNode, parent SQLNode) {
 		parent.(*InsertExpr).NewStr = newNode.(Expr)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+	}
 	if a.post != nil {
 		a.cur.replacer = replacer
 		a.cur.parent = parent
@@ -4271,6 +5476,8 @@ func (a *application) rewriteRefOfInsertExpr(parent SQLNode, node *InsertExpr, r
 	}
 	return true
 }
+
+// Function Generation Source: PtrToStructMethod
 func (a *application) rewriteRefOfIntervalDateExpr(parent SQLNode, node *IntervalDateExpr, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -4288,16 +5495,26 @@ func (a *application) rewriteRefOfIntervalDateExpr(parent SQLNode, node *Interva
 			return true
 		}
 	}
+	if a.collectPaths {
+		a.cur.current.AddStep(uint16(RefOfIntervalDateExprDate))
+	}
 	if !a.rewriteExpr(node, node.Date, func(newNode, parent SQLNode) {
 		parent.(*IntervalDateExpr).Date = newNode.(Expr)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+		a.cur.current.AddStep(uint16(RefOfIntervalDateExprInterval))
+	}
 	if !a.rewriteExpr(node, node.Interval, func(newNode, parent SQLNode) {
 		parent.(*IntervalDateExpr).Interval = newNode.(Expr)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+	}
 	if a.post != nil {
 		a.cur.replacer = replacer
 		a.cur.parent = parent
@@ -4308,6 +5525,8 @@ func (a *application) rewriteRefOfIntervalDateExpr(parent SQLNode, node *Interva
 	}
 	return true
 }
+
+// Function Generation Source: PtrToStructMethod
 func (a *application) rewriteRefOfIntervalFuncExpr(parent SQLNode, node *IntervalFuncExpr, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -4325,12 +5544,25 @@ func (a *application) rewriteRefOfIntervalFuncExpr(parent SQLNode, node *Interva
 			return true
 		}
 	}
+	if a.collectPaths {
+		a.cur.current.AddStep(uint16(RefOfIntervalFuncExprExpr))
+	}
 	if !a.rewriteExpr(node, node.Expr, func(newNode, parent SQLNode) {
 		parent.(*IntervalFuncExpr).Expr = newNode.(Expr)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+	}
 	for x, el := range node.Exprs {
+		if a.collectPaths {
+			if x == 0 {
+				a.cur.current.AddStepWithOffset(uint16(RefOfIntervalFuncExprExprsOffset))
+			} else {
+				a.cur.current.ChangeOffset(x)
+			}
+		}
 		if !a.rewriteExpr(node, el, func(idx int) replacerFunc {
 			return func(newNode, parent SQLNode) {
 				parent.(*IntervalFuncExpr).Exprs[idx] = newNode.(Expr)
@@ -4339,6 +5571,9 @@ func (a *application) rewriteRefOfIntervalFuncExpr(parent SQLNode, node *Interva
 			return false
 		}
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+	}
 	if a.post != nil {
 		a.cur.replacer = replacer
 		a.cur.parent = parent
@@ -4349,6 +5584,8 @@ func (a *application) rewriteRefOfIntervalFuncExpr(parent SQLNode, node *Interva
 	}
 	return true
 }
+
+// Function Generation Source: PtrToStructMethod
 func (a *application) rewriteRefOfIntroducerExpr(parent SQLNode, node *IntroducerExpr, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -4366,11 +5603,17 @@ func (a *application) rewriteRefOfIntroducerExpr(parent SQLNode, node *Introduce
 			return true
 		}
 	}
+	if a.collectPaths {
+		a.cur.current.AddStep(uint16(RefOfIntroducerExprExpr))
+	}
 	if !a.rewriteExpr(node, node.Expr, func(newNode, parent SQLNode) {
 		parent.(*IntroducerExpr).Expr = newNode.(Expr)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+	}
 	if a.post != nil {
 		a.cur.replacer = replacer
 		a.cur.parent = parent
@@ -4381,6 +5624,8 @@ func (a *application) rewriteRefOfIntroducerExpr(parent SQLNode, node *Introduce
 	}
 	return true
 }
+
+// Function Generation Source: PtrToStructMethod
 func (a *application) rewriteRefOfIsExpr(parent SQLNode, node *IsExpr, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -4398,11 +5643,17 @@ func (a *application) rewriteRefOfIsExpr(parent SQLNode, node *IsExpr, replacer
 			return true
 		}
 	}
+	if a.collectPaths {
+		a.cur.current.AddStep(uint16(RefOfIsExprLeft))
+	}
 	if !a.rewriteExpr(node, node.Left, func(newNode, parent SQLNode) {
 		parent.(*IsExpr).Left = newNode.(Expr)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+	}
 	if a.post != nil {
 		a.cur.replacer = replacer
 		a.cur.parent = parent
@@ -4413,6 +5664,8 @@ func (a *application) rewriteRefOfIsExpr(parent SQLNode, node *IsExpr, replacer
 	}
 	return true
 }
+
+// Function Generation Source: PtrToStructMethod
 func (a *application) rewriteRefOfJSONArrayAgg(parent SQLNode, node *JSONArrayAgg, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -4430,16 +5683,26 @@ func (a *application) rewriteRefOfJSONArrayAgg(parent SQLNode, node *JSONArrayAg
 			return true
 		}
 	}
+	if a.collectPaths {
+		a.cur.current.AddStep(uint16(RefOfJSONArrayAggExpr))
+	}
 	if !a.rewriteExpr(node, node.Expr, func(newNode, parent SQLNode) {
 		parent.(*JSONArrayAgg).Expr = newNode.(Expr)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+		a.cur.current.AddStep(uint16(RefOfJSONArrayAggOverClause))
+	}
 	if !a.rewriteRefOfOverClause(node, node.OverClause, func(newNode, parent SQLNode) {
 		parent.(*JSONArrayAgg).OverClause = newNode.(*OverClause)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+	}
 	if a.post != nil {
 		a.cur.replacer = replacer
 		a.cur.parent = parent
@@ -4450,6 +5713,8 @@ func (a *application) rewriteRefOfJSONArrayAgg(parent SQLNode, node *JSONArrayAg
 	}
 	return true
 }
+
+// Function Generation Source: PtrToStructMethod
 func (a *application) rewriteRefOfJSONArrayExpr(parent SQLNode, node *JSONArrayExpr, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -4468,6 +5733,13 @@ func (a *application) rewriteRefOfJSONArrayExpr(parent SQLNode, node *JSONArrayE
 		}
 	}
 	for x, el := range node.Params {
+		if a.collectPaths {
+			if x == 0 {
+				a.cur.current.AddStepWithOffset(uint16(RefOfJSONArrayExprParamsOffset))
+			} else {
+				a.cur.current.ChangeOffset(x)
+			}
+		}
 		if !a.rewriteExpr(node, el, func(idx int) replacerFunc {
 			return func(newNode, parent SQLNode) {
 				parent.(*JSONArrayExpr).Params[idx] = newNode.(Expr)
@@ -4476,6 +5748,9 @@ func (a *application) rewriteRefOfJSONArrayExpr(parent SQLNode, node *JSONArrayE
 			return false
 		}
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+	}
 	if a.post != nil {
 		a.cur.replacer = replacer
 		a.cur.parent = parent
@@ -4486,6 +5761,8 @@ func (a *application) rewriteRefOfJSONArrayExpr(parent SQLNode, node *JSONArrayE
 	}
 	return true
 }
+
+// Function Generation Source: PtrToStructMethod
 func (a *application) rewriteRefOfJSONAttributesExpr(parent SQLNode, node *JSONAttributesExpr, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -4503,16 +5780,26 @@ func (a *application) rewriteRefOfJSONAttributesExpr(parent SQLNode, node *JSONA
 			return true
 		}
 	}
+	if a.collectPaths {
+		a.cur.current.AddStep(uint16(RefOfJSONAttributesExprJSONDoc))
+	}
 	if !a.rewriteExpr(node, node.JSONDoc, func(newNode, parent SQLNode) {
 		parent.(*JSONAttributesExpr).JSONDoc = newNode.(Expr)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+		a.cur.current.AddStep(uint16(RefOfJSONAttributesExprPath))
+	}
 	if !a.rewriteExpr(node, node.Path, func(newNode, parent SQLNode) {
 		parent.(*JSONAttributesExpr).Path = newNode.(Expr)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+	}
 	if a.post != nil {
 		a.cur.replacer = replacer
 		a.cur.parent = parent
@@ -4523,6 +5810,8 @@ func (a *application) rewriteRefOfJSONAttributesExpr(parent SQLNode, node *JSONA
 	}
 	return true
 }
+
+// Function Generation Source: PtrToStructMethod
 func (a *application) rewriteRefOfJSONContainsExpr(parent SQLNode, node *JSONContainsExpr, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -4540,17 +5829,34 @@ func (a *application) rewriteRefOfJSONContainsExpr(parent SQLNode, node *JSONCon
 			return true
 		}
 	}
+	if a.collectPaths {
+		a.cur.current.AddStep(uint16(RefOfJSONContainsExprTarget))
+	}
 	if !a.rewriteExpr(node, node.Target, func(newNode, parent SQLNode) {
 		parent.(*JSONContainsExpr).Target = newNode.(Expr)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+		a.cur.current.AddStep(uint16(RefOfJSONContainsExprCandidate))
+	}
 	if !a.rewriteExpr(node, node.Candidate, func(newNode, parent SQLNode) {
 		parent.(*JSONContainsExpr).Candidate = newNode.(Expr)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+	}
 	for x, el := range node.PathList {
+		if a.collectPaths {
+			if x == 0 {
+				a.cur.current.AddStepWithOffset(uint16(RefOfJSONContainsExprPathListOffset))
+			} else {
+				a.cur.current.ChangeOffset(x)
+			}
+		}
 		if !a.rewriteExpr(node, el, func(idx int) replacerFunc {
 			return func(newNode, parent SQLNode) {
 				parent.(*JSONContainsExpr).PathList[idx] = newNode.(Expr)
@@ -4559,6 +5865,9 @@ func (a *application) rewriteRefOfJSONContainsExpr(parent SQLNode, node *JSONCon
 			return false
 		}
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+	}
 	if a.post != nil {
 		a.cur.replacer = replacer
 		a.cur.parent = parent
@@ -4569,6 +5878,8 @@ func (a *application) rewriteRefOfJSONContainsExpr(parent SQLNode, node *JSONCon
 	}
 	return true
 }
+
+// Function Generation Source: PtrToStructMethod
 func (a *application) rewriteRefOfJSONContainsPathExpr(parent SQLNode, node *JSONContainsPathExpr, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -4586,17 +5897,34 @@ func (a *application) rewriteRefOfJSONContainsPathExpr(parent SQLNode, node *JSO
 			return true
 		}
 	}
+	if a.collectPaths {
+		a.cur.current.AddStep(uint16(RefOfJSONContainsPathExprJSONDoc))
+	}
 	if !a.rewriteExpr(node, node.JSONDoc, func(newNode, parent SQLNode) {
 		parent.(*JSONContainsPathExpr).JSONDoc = newNode.(Expr)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+		a.cur.current.AddStep(uint16(RefOfJSONContainsPathExprOneOrAll))
+	}
 	if !a.rewriteExpr(node, node.OneOrAll, func(newNode, parent SQLNode) {
 		parent.(*JSONContainsPathExpr).OneOrAll = newNode.(Expr)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+	}
 	for x, el := range node.PathList {
+		if a.collectPaths {
+			if x == 0 {
+				a.cur.current.AddStepWithOffset(uint16(RefOfJSONContainsPathExprPathListOffset))
+			} else {
+				a.cur.current.ChangeOffset(x)
+			}
+		}
 		if !a.rewriteExpr(node, el, func(idx int) replacerFunc {
 			return func(newNode, parent SQLNode) {
 				parent.(*JSONContainsPathExpr).PathList[idx] = newNode.(Expr)
@@ -4605,6 +5933,9 @@ func (a *application) rewriteRefOfJSONContainsPathExpr(parent SQLNode, node *JSO
 			return false
 		}
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+	}
 	if a.post != nil {
 		a.cur.replacer = replacer
 		a.cur.parent = parent
@@ -4615,6 +5946,8 @@ func (a *application) rewriteRefOfJSONContainsPathExpr(parent SQLNode, node *JSO
 	}
 	return true
 }
+
+// Function Generation Source: PtrToStructMethod
 func (a *application) rewriteRefOfJSONExtractExpr(parent SQLNode, node *JSONExtractExpr, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -4632,12 +5965,25 @@ func (a *application) rewriteRefOfJSONExtractExpr(parent SQLNode, node *JSONExtr
 			return true
 		}
 	}
+	if a.collectPaths {
+		a.cur.current.AddStep(uint16(RefOfJSONExtractExprJSONDoc))
+	}
 	if !a.rewriteExpr(node, node.JSONDoc, func(newNode, parent SQLNode) {
 		parent.(*JSONExtractExpr).JSONDoc = newNode.(Expr)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+	}
 	for x, el := range node.PathList {
+		if a.collectPaths {
+			if x == 0 {
+				a.cur.current.AddStepWithOffset(uint16(RefOfJSONExtractExprPathListOffset))
+			} else {
+				a.cur.current.ChangeOffset(x)
+			}
+		}
 		if !a.rewriteExpr(node, el, func(idx int) replacerFunc {
 			return func(newNode, parent SQLNode) {
 				parent.(*JSONExtractExpr).PathList[idx] = newNode.(Expr)
@@ -4646,6 +5992,9 @@ func (a *application) rewriteRefOfJSONExtractExpr(parent SQLNode, node *JSONExtr
 			return false
 		}
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+	}
 	if a.post != nil {
 		a.cur.replacer = replacer
 		a.cur.parent = parent
@@ -4656,6 +6005,8 @@ func (a *application) rewriteRefOfJSONExtractExpr(parent SQLNode, node *JSONExtr
 	}
 	return true
 }
+
+// Function Generation Source: PtrToStructMethod
 func (a *application) rewriteRefOfJSONKeysExpr(parent SQLNode, node *JSONKeysExpr, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -4673,16 +6024,26 @@ func (a *application) rewriteRefOfJSONKeysExpr(parent SQLNode, node *JSONKeysExp
 			return true
 		}
 	}
+	if a.collectPaths {
+		a.cur.current.AddStep(uint16(RefOfJSONKeysExprJSONDoc))
+	}
 	if !a.rewriteExpr(node, node.JSONDoc, func(newNode, parent SQLNode) {
 		parent.(*JSONKeysExpr).JSONDoc = newNode.(Expr)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+		a.cur.current.AddStep(uint16(RefOfJSONKeysExprPath))
+	}
 	if !a.rewriteExpr(node, node.Path, func(newNode, parent SQLNode) {
 		parent.(*JSONKeysExpr).Path = newNode.(Expr)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+	}
 	if a.post != nil {
 		a.cur.replacer = replacer
 		a.cur.parent = parent
@@ -4693,6 +6054,8 @@ func (a *application) rewriteRefOfJSONKeysExpr(parent SQLNode, node *JSONKeysExp
 	}
 	return true
 }
+
+// Function Generation Source: PtrToStructMethod
 func (a *application) rewriteRefOfJSONObjectAgg(parent SQLNode, node *JSONObjectAgg, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -4710,21 +6073,35 @@ func (a *application) rewriteRefOfJSONObjectAgg(parent SQLNode, node *JSONObject
 			return true
 		}
 	}
+	if a.collectPaths {
+		a.cur.current.AddStep(uint16(RefOfJSONObjectAggKey))
+	}
 	if !a.rewriteExpr(node, node.Key, func(newNode, parent SQLNode) {
 		parent.(*JSONObjectAgg).Key = newNode.(Expr)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+		a.cur.current.AddStep(uint16(RefOfJSONObjectAggValue))
+	}
 	if !a.rewriteExpr(node, node.Value, func(newNode, parent SQLNode) {
 		parent.(*JSONObjectAgg).Value = newNode.(Expr)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+		a.cur.current.AddStep(uint16(RefOfJSONObjectAggOverClause))
+	}
 	if !a.rewriteRefOfOverClause(node, node.OverClause, func(newNode, parent SQLNode) {
 		parent.(*JSONObjectAgg).OverClause = newNode.(*OverClause)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+	}
 	if a.post != nil {
 		a.cur.replacer = replacer
 		a.cur.parent = parent
@@ -4735,6 +6112,8 @@ func (a *application) rewriteRefOfJSONObjectAgg(parent SQLNode, node *JSONObject
 	}
 	return true
 }
+
+// Function Generation Source: PtrToStructMethod
 func (a *application) rewriteRefOfJSONObjectExpr(parent SQLNode, node *JSONObjectExpr, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -4753,6 +6132,13 @@ func (a *application) rewriteRefOfJSONObjectExpr(parent SQLNode, node *JSONObjec
 		}
 	}
 	for x, el := range node.Params {
+		if a.collectPaths {
+			if x == 0 {
+				a.cur.current.AddStepWithOffset(uint16(RefOfJSONObjectExprParamsOffset))
+			} else {
+				a.cur.current.ChangeOffset(x)
+			}
+		}
 		if !a.rewriteRefOfJSONObjectParam(node, el, func(idx int) replacerFunc {
 			return func(newNode, parent SQLNode) {
 				parent.(*JSONObjectExpr).Params[idx] = newNode.(*JSONObjectParam)
@@ -4761,6 +6147,9 @@ func (a *application) rewriteRefOfJSONObjectExpr(parent SQLNode, node *JSONObjec
 			return false
 		}
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+	}
 	if a.post != nil {
 		a.cur.replacer = replacer
 		a.cur.parent = parent
@@ -4771,6 +6160,8 @@ func (a *application) rewriteRefOfJSONObjectExpr(parent SQLNode, node *JSONObjec
 	}
 	return true
 }
+
+// Function Generation Source: PtrToStructMethod
 func (a *application) rewriteRefOfJSONObjectParam(parent SQLNode, node *JSONObjectParam, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -4788,16 +6179,26 @@ func (a *application) rewriteRefOfJSONObjectParam(parent SQLNode, node *JSONObje
 			return true
 		}
 	}
+	if a.collectPaths {
+		a.cur.current.AddStep(uint16(RefOfJSONObjectParamKey))
+	}
 	if !a.rewriteExpr(node, node.Key, func(newNode, parent SQLNode) {
 		parent.(*JSONObjectParam).Key = newNode.(Expr)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+		a.cur.current.AddStep(uint16(RefOfJSONObjectParamValue))
+	}
 	if !a.rewriteExpr(node, node.Value, func(newNode, parent SQLNode) {
 		parent.(*JSONObjectParam).Value = newNode.(Expr)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+	}
 	if a.post != nil {
 		a.cur.replacer = replacer
 		a.cur.parent = parent
@@ -4808,6 +6209,8 @@ func (a *application) rewriteRefOfJSONObjectParam(parent SQLNode, node *JSONObje
 	}
 	return true
 }
+
+// Function Generation Source: PtrToStructMethod
 func (a *application) rewriteRefOfJSONOverlapsExpr(parent SQLNode, node *JSONOverlapsExpr, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -4825,16 +6228,26 @@ func (a *application) rewriteRefOfJSONOverlapsExpr(parent SQLNode, node *JSONOve
 			return true
 		}
 	}
+	if a.collectPaths {
+		a.cur.current.AddStep(uint16(RefOfJSONOverlapsExprJSONDoc1))
+	}
 	if !a.rewriteExpr(node, node.JSONDoc1, func(newNode, parent SQLNode) {
 		parent.(*JSONOverlapsExpr).JSONDoc1 = newNode.(Expr)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+		a.cur.current.AddStep(uint16(RefOfJSONOverlapsExprJSONDoc2))
+	}
 	if !a.rewriteExpr(node, node.JSONDoc2, func(newNode, parent SQLNode) {
 		parent.(*JSONOverlapsExpr).JSONDoc2 = newNode.(Expr)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+	}
 	if a.post != nil {
 		a.cur.replacer = replacer
 		a.cur.parent = parent
@@ -4845,6 +6258,8 @@ func (a *application) rewriteRefOfJSONOverlapsExpr(parent SQLNode, node *JSONOve
 	}
 	return true
 }
+
+// Function Generation Source: PtrToStructMethod
 func (a *application) rewriteRefOfJSONPrettyExpr(parent SQLNode, node *JSONPrettyExpr, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -4862,11 +6277,17 @@ func (a *application) rewriteRefOfJSONPrettyExpr(parent SQLNode, node *JSONPrett
 			return true
 		}
 	}
+	if a.collectPaths {
+		a.cur.current.AddStep(uint16(RefOfJSONPrettyExprJSONVal))
+	}
 	if !a.rewriteExpr(node, node.JSONVal, func(newNode, parent SQLNode) {
 		parent.(*JSONPrettyExpr).JSONVal = newNode.(Expr)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+	}
 	if a.post != nil {
 		a.cur.replacer = replacer
 		a.cur.parent = parent
@@ -4877,6 +6298,8 @@ func (a *application) rewriteRefOfJSONPrettyExpr(parent SQLNode, node *JSONPrett
 	}
 	return true
 }
+
+// Function Generation Source: PtrToStructMethod
 func (a *application) rewriteRefOfJSONQuoteExpr(parent SQLNode, node *JSONQuoteExpr, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -4894,11 +6317,17 @@ func (a *application) rewriteRefOfJSONQuoteExpr(parent SQLNode, node *JSONQuoteE
 			return true
 		}
 	}
+	if a.collectPaths {
+		a.cur.current.AddStep(uint16(RefOfJSONQuoteExprStringArg))
+	}
 	if !a.rewriteExpr(node, node.StringArg, func(newNode, parent SQLNode) {
 		parent.(*JSONQuoteExpr).StringArg = newNode.(Expr)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+	}
 	if a.post != nil {
 		a.cur.replacer = replacer
 		a.cur.parent = parent
@@ -4909,6 +6338,8 @@ func (a *application) rewriteRefOfJSONQuoteExpr(parent SQLNode, node *JSONQuoteE
 	}
 	return true
 }
+
+// Function Generation Source: PtrToStructMethod
 func (a *application) rewriteRefOfJSONRemoveExpr(parent SQLNode, node *JSONRemoveExpr, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -4926,12 +6357,25 @@ func (a *application) rewriteRefOfJSONRemoveExpr(parent SQLNode, node *JSONRemov
 			return true
 		}
 	}
+	if a.collectPaths {
+		a.cur.current.AddStep(uint16(RefOfJSONRemoveExprJSONDoc))
+	}
 	if !a.rewriteExpr(node, node.JSONDoc, func(newNode, parent SQLNode) {
 		parent.(*JSONRemoveExpr).JSONDoc = newNode.(Expr)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+	}
 	for x, el := range node.PathList {
+		if a.collectPaths {
+			if x == 0 {
+				a.cur.current.AddStepWithOffset(uint16(RefOfJSONRemoveExprPathListOffset))
+			} else {
+				a.cur.current.ChangeOffset(x)
+			}
+		}
 		if !a.rewriteExpr(node, el, func(idx int) replacerFunc {
 			return func(newNode, parent SQLNode) {
 				parent.(*JSONRemoveExpr).PathList[idx] = newNode.(Expr)
@@ -4940,6 +6384,9 @@ func (a *application) rewriteRefOfJSONRemoveExpr(parent SQLNode, node *JSONRemov
 			return false
 		}
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+	}
 	if a.post != nil {
 		a.cur.replacer = replacer
 		a.cur.parent = parent
@@ -4950,6 +6397,8 @@ func (a *application) rewriteRefOfJSONRemoveExpr(parent SQLNode, node *JSONRemov
 	}
 	return true
 }
+
+// Function Generation Source: PtrToStructMethod
 func (a *application) rewriteRefOfJSONSchemaValidFuncExpr(parent SQLNode, node *JSONSchemaValidFuncExpr, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -4967,16 +6416,26 @@ func (a *application) rewriteRefOfJSONSchemaValidFuncExpr(parent SQLNode, node *
 			return true
 		}
 	}
+	if a.collectPaths {
+		a.cur.current.AddStep(uint16(RefOfJSONSchemaValidFuncExprSchema))
+	}
 	if !a.rewriteExpr(node, node.Schema, func(newNode, parent SQLNode) {
 		parent.(*JSONSchemaValidFuncExpr).Schema = newNode.(Expr)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+		a.cur.current.AddStep(uint16(RefOfJSONSchemaValidFuncExprDocument))
+	}
 	if !a.rewriteExpr(node, node.Document, func(newNode, parent SQLNode) {
 		parent.(*JSONSchemaValidFuncExpr).Document = newNode.(Expr)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+	}
 	if a.post != nil {
 		a.cur.replacer = replacer
 		a.cur.parent = parent
@@ -4987,6 +6446,8 @@ func (a *application) rewriteRefOfJSONSchemaValidFuncExpr(parent SQLNode, node *
 	}
 	return true
 }
+
+// Function Generation Source: PtrToStructMethod
 func (a *application) rewriteRefOfJSONSchemaValidationReportFuncExpr(parent SQLNode, node *JSONSchemaValidationReportFuncExpr, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -5004,16 +6465,26 @@ func (a *application) rewriteRefOfJSONSchemaValidationReportFuncExpr(parent SQLN
 			return true
 		}
 	}
+	if a.collectPaths {
+		a.cur.current.AddStep(uint16(RefOfJSONSchemaValidationReportFuncExprSchema))
+	}
 	if !a.rewriteExpr(node, node.Schema, func(newNode, parent SQLNode) {
 		parent.(*JSONSchemaValidationReportFuncExpr).Schema = newNode.(Expr)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+		a.cur.current.AddStep(uint16(RefOfJSONSchemaValidationReportFuncExprDocument))
+	}
 	if !a.rewriteExpr(node, node.Document, func(newNode, parent SQLNode) {
 		parent.(*JSONSchemaValidationReportFuncExpr).Document = newNode.(Expr)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+	}
 	if a.post != nil {
 		a.cur.replacer = replacer
 		a.cur.parent = parent
@@ -5024,6 +6495,8 @@ func (a *application) rewriteRefOfJSONSchemaValidationReportFuncExpr(parent SQLN
 	}
 	return true
 }
+
+// Function Generation Source: PtrToStructMethod
 func (a *application) rewriteRefOfJSONSearchExpr(parent SQLNode, node *JSONSearchExpr, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -5041,27 +6514,52 @@ func (a *application) rewriteRefOfJSONSearchExpr(parent SQLNode, node *JSONSearc
 			return true
 		}
 	}
+	if a.collectPaths {
+		a.cur.current.AddStep(uint16(RefOfJSONSearchExprJSONDoc))
+	}
 	if !a.rewriteExpr(node, node.JSONDoc, func(newNode, parent SQLNode) {
 		parent.(*JSONSearchExpr).JSONDoc = newNode.(Expr)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+		a.cur.current.AddStep(uint16(RefOfJSONSearchExprOneOrAll))
+	}
 	if !a.rewriteExpr(node, node.OneOrAll, func(newNode, parent SQLNode) {
 		parent.(*JSONSearchExpr).OneOrAll = newNode.(Expr)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+		a.cur.current.AddStep(uint16(RefOfJSONSearchExprSearchStr))
+	}
 	if !a.rewriteExpr(node, node.SearchStr, func(newNode, parent SQLNode) {
 		parent.(*JSONSearchExpr).SearchStr = newNode.(Expr)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+		a.cur.current.AddStep(uint16(RefOfJSONSearchExprEscapeChar))
+	}
 	if !a.rewriteExpr(node, node.EscapeChar, func(newNode, parent SQLNode) {
 		parent.(*JSONSearchExpr).EscapeChar = newNode.(Expr)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+	}
 	for x, el := range node.PathList {
+		if a.collectPaths {
+			if x == 0 {
+				a.cur.current.AddStepWithOffset(uint16(RefOfJSONSearchExprPathListOffset))
+			} else {
+				a.cur.current.ChangeOffset(x)
+			}
+		}
 		if !a.rewriteExpr(node, el, func(idx int) replacerFunc {
 			return func(newNode, parent SQLNode) {
 				parent.(*JSONSearchExpr).PathList[idx] = newNode.(Expr)
@@ -5070,6 +6568,9 @@ func (a *application) rewriteRefOfJSONSearchExpr(parent SQLNode, node *JSONSearc
 			return false
 		}
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+	}
 	if a.post != nil {
 		a.cur.replacer = replacer
 		a.cur.parent = parent
@@ -5080,6 +6581,8 @@ func (a *application) rewriteRefOfJSONSearchExpr(parent SQLNode, node *JSONSearc
 	}
 	return true
 }
+
+// Function Generation Source: PtrToStructMethod
 func (a *application) rewriteRefOfJSONStorageFreeExpr(parent SQLNode, node *JSONStorageFreeExpr, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -5097,11 +6600,17 @@ func (a *application) rewriteRefOfJSONStorageFreeExpr(parent SQLNode, node *JSON
 			return true
 		}
 	}
+	if a.collectPaths {
+		a.cur.current.AddStep(uint16(RefOfJSONStorageFreeExprJSONVal))
+	}
 	if !a.rewriteExpr(node, node.JSONVal, func(newNode, parent SQLNode) {
 		parent.(*JSONStorageFreeExpr).JSONVal = newNode.(Expr)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+	}
 	if a.post != nil {
 		a.cur.replacer = replacer
 		a.cur.parent = parent
@@ -5112,6 +6621,8 @@ func (a *application) rewriteRefOfJSONStorageFreeExpr(parent SQLNode, node *JSON
 	}
 	return true
 }
+
+// Function Generation Source: PtrToStructMethod
 func (a *application) rewriteRefOfJSONStorageSizeExpr(parent SQLNode, node *JSONStorageSizeExpr, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -5129,11 +6640,17 @@ func (a *application) rewriteRefOfJSONStorageSizeExpr(parent SQLNode, node *JSON
 			return true
 		}
 	}
+	if a.collectPaths {
+		a.cur.current.AddStep(uint16(RefOfJSONStorageSizeExprJSONVal))
+	}
 	if !a.rewriteExpr(node, node.JSONVal, func(newNode, parent SQLNode) {
 		parent.(*JSONStorageSizeExpr).JSONVal = newNode.(Expr)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+	}
 	if a.post != nil {
 		a.cur.replacer = replacer
 		a.cur.parent = parent
@@ -5144,6 +6661,8 @@ func (a *application) rewriteRefOfJSONStorageSizeExpr(parent SQLNode, node *JSON
 	}
 	return true
 }
+
+// Function Generation Source: PtrToStructMethod
 func (a *application) rewriteRefOfJSONTableExpr(parent SQLNode, node *JSONTableExpr, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -5161,22 +6680,43 @@ func (a *application) rewriteRefOfJSONTableExpr(parent SQLNode, node *JSONTableE
 			return true
 		}
 	}
+	if a.collectPaths {
+		a.cur.current.AddStep(uint16(RefOfJSONTableExprExpr))
+	}
 	if !a.rewriteExpr(node, node.Expr, func(newNode, parent SQLNode) {
 		parent.(*JSONTableExpr).Expr = newNode.(Expr)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+		a.cur.current.AddStep(uint16(RefOfJSONTableExprAlias))
+	}
 	if !a.rewriteIdentifierCS(node, node.Alias, func(newNode, parent SQLNode) {
 		parent.(*JSONTableExpr).Alias = newNode.(IdentifierCS)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+		a.cur.current.AddStep(uint16(RefOfJSONTableExprFilter))
+	}
 	if !a.rewriteExpr(node, node.Filter, func(newNode, parent SQLNode) {
 		parent.(*JSONTableExpr).Filter = newNode.(Expr)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+	}
 	for x, el := range node.Columns {
+		if a.collectPaths {
+			if x == 0 {
+				a.cur.current.AddStepWithOffset(uint16(RefOfJSONTableExprColumnsOffset))
+			} else {
+				a.cur.current.ChangeOffset(x)
+			}
+		}
 		if !a.rewriteRefOfJtColumnDefinition(node, el, func(idx int) replacerFunc {
 			return func(newNode, parent SQLNode) {
 				parent.(*JSONTableExpr).Columns[idx] = newNode.(*JtColumnDefinition)
@@ -5185,6 +6725,9 @@ func (a *application) rewriteRefOfJSONTableExpr(parent SQLNode, node *JSONTableE
 			return false
 		}
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+	}
 	if a.post != nil {
 		a.cur.replacer = replacer
 		a.cur.parent = parent
@@ -5195,6 +6738,8 @@ func (a *application) rewriteRefOfJSONTableExpr(parent SQLNode, node *JSONTableE
 	}
 	return true
 }
+
+// Function Generation Source: PtrToStructMethod
 func (a *application) rewriteRefOfJSONUnquoteExpr(parent SQLNode, node *JSONUnquoteExpr, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -5212,11 +6757,17 @@ func (a *application) rewriteRefOfJSONUnquoteExpr(parent SQLNode, node *JSONUnqu
 			return true
 		}
 	}
+	if a.collectPaths {
+		a.cur.current.AddStep(uint16(RefOfJSONUnquoteExprJSONValue))
+	}
 	if !a.rewriteExpr(node, node.JSONValue, func(newNode, parent SQLNode) {
 		parent.(*JSONUnquoteExpr).JSONValue = newNode.(Expr)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+	}
 	if a.post != nil {
 		a.cur.replacer = replacer
 		a.cur.parent = parent
@@ -5227,6 +6778,8 @@ func (a *application) rewriteRefOfJSONUnquoteExpr(parent SQLNode, node *JSONUnqu
 	}
 	return true
 }
+
+// Function Generation Source: PtrToStructMethod
 func (a *application) rewriteRefOfJSONValueExpr(parent SQLNode, node *JSONValueExpr, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -5244,31 +6797,53 @@ func (a *application) rewriteRefOfJSONValueExpr(parent SQLNode, node *JSONValueE
 			return true
 		}
 	}
+	if a.collectPaths {
+		a.cur.current.AddStep(uint16(RefOfJSONValueExprJSONDoc))
+	}
 	if !a.rewriteExpr(node, node.JSONDoc, func(newNode, parent SQLNode) {
 		parent.(*JSONValueExpr).JSONDoc = newNode.(Expr)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+		a.cur.current.AddStep(uint16(RefOfJSONValueExprPath))
+	}
 	if !a.rewriteExpr(node, node.Path, func(newNode, parent SQLNode) {
 		parent.(*JSONValueExpr).Path = newNode.(Expr)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+		a.cur.current.AddStep(uint16(RefOfJSONValueExprReturningType))
+	}
 	if !a.rewriteRefOfConvertType(node, node.ReturningType, func(newNode, parent SQLNode) {
 		parent.(*JSONValueExpr).ReturningType = newNode.(*ConvertType)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+		a.cur.current.AddStep(uint16(RefOfJSONValueExprEmptyOnResponse))
+	}
 	if !a.rewriteRefOfJtOnResponse(node, node.EmptyOnResponse, func(newNode, parent SQLNode) {
 		parent.(*JSONValueExpr).EmptyOnResponse = newNode.(*JtOnResponse)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+		a.cur.current.AddStep(uint16(RefOfJSONValueExprErrorOnResponse))
+	}
 	if !a.rewriteRefOfJtOnResponse(node, node.ErrorOnResponse, func(newNode, parent SQLNode) {
 		parent.(*JSONValueExpr).ErrorOnResponse = newNode.(*JtOnResponse)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+	}
 	if a.post != nil {
 		a.cur.replacer = replacer
 		a.cur.parent = parent
@@ -5279,6 +6854,8 @@ func (a *application) rewriteRefOfJSONValueExpr(parent SQLNode, node *JSONValueE
 	}
 	return true
 }
+
+// Function Generation Source: PtrToStructMethod
 func (a *application) rewriteRefOfJSONValueMergeExpr(parent SQLNode, node *JSONValueMergeExpr, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -5296,12 +6873,25 @@ func (a *application) rewriteRefOfJSONValueMergeExpr(parent SQLNode, node *JSONV
 			return true
 		}
 	}
+	if a.collectPaths {
+		a.cur.current.AddStep(uint16(RefOfJSONValueMergeExprJSONDoc))
+	}
 	if !a.rewriteExpr(node, node.JSONDoc, func(newNode, parent SQLNode) {
 		parent.(*JSONValueMergeExpr).JSONDoc = newNode.(Expr)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+	}
 	for x, el := range node.JSONDocList {
+		if a.collectPaths {
+			if x == 0 {
+				a.cur.current.AddStepWithOffset(uint16(RefOfJSONValueMergeExprJSONDocListOffset))
+			} else {
+				a.cur.current.ChangeOffset(x)
+			}
+		}
 		if !a.rewriteExpr(node, el, func(idx int) replacerFunc {
 			return func(newNode, parent SQLNode) {
 				parent.(*JSONValueMergeExpr).JSONDocList[idx] = newNode.(Expr)
@@ -5310,6 +6900,9 @@ func (a *application) rewriteRefOfJSONValueMergeExpr(parent SQLNode, node *JSONV
 			return false
 		}
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+	}
 	if a.post != nil {
 		a.cur.replacer = replacer
 		a.cur.parent = parent
@@ -5320,6 +6913,8 @@ func (a *application) rewriteRefOfJSONValueMergeExpr(parent SQLNode, node *JSONV
 	}
 	return true
 }
+
+// Function Generation Source: PtrToStructMethod
 func (a *application) rewriteRefOfJSONValueModifierExpr(parent SQLNode, node *JSONValueModifierExpr, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -5337,12 +6932,25 @@ func (a *application) rewriteRefOfJSONValueModifierExpr(parent SQLNode, node *JS
 			return true
 		}
 	}
+	if a.collectPaths {
+		a.cur.current.AddStep(uint16(RefOfJSONValueModifierExprJSONDoc))
+	}
 	if !a.rewriteExpr(node, node.JSONDoc, func(newNode, parent SQLNode) {
 		parent.(*JSONValueModifierExpr).JSONDoc = newNode.(Expr)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+	}
 	for x, el := range node.Params {
+		if a.collectPaths {
+			if x == 0 {
+				a.cur.current.AddStepWithOffset(uint16(RefOfJSONValueModifierExprParamsOffset))
+			} else {
+				a.cur.current.ChangeOffset(x)
+			}
+		}
 		if !a.rewriteRefOfJSONObjectParam(node, el, func(idx int) replacerFunc {
 			return func(newNode, parent SQLNode) {
 				parent.(*JSONValueModifierExpr).Params[idx] = newNode.(*JSONObjectParam)
@@ -5351,6 +6959,9 @@ func (a *application) rewriteRefOfJSONValueModifierExpr(parent SQLNode, node *JS
 			return false
 		}
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+	}
 	if a.post != nil {
 		a.cur.replacer = replacer
 		a.cur.parent = parent
@@ -5361,6 +6972,8 @@ func (a *application) rewriteRefOfJSONValueModifierExpr(parent SQLNode, node *JS
 	}
 	return true
 }
+
+// Function Generation Source: PtrToStructMethod
 func (a *application) rewriteRefOfJoinCondition(parent SQLNode, node *JoinCondition, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -5378,16 +6991,26 @@ func (a *application) rewriteRefOfJoinCondition(parent SQLNode, node *JoinCondit
 			return true
 		}
 	}
+	if a.collectPaths {
+		a.cur.current.AddStep(uint16(RefOfJoinConditionOn))
+	}
 	if !a.rewriteExpr(node, node.On, func(newNode, parent SQLNode) {
 		parent.(*JoinCondition).On = newNode.(Expr)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+		a.cur.current.AddStep(uint16(RefOfJoinConditionUsing))
+	}
 	if !a.rewriteColumns(node, node.Using, func(newNode, parent SQLNode) {
 		parent.(*JoinCondition).Using = newNode.(Columns)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+	}
 	if a.post != nil {
 		a.cur.replacer = replacer
 		a.cur.parent = parent
@@ -5398,6 +7021,8 @@ func (a *application) rewriteRefOfJoinCondition(parent SQLNode, node *JoinCondit
 	}
 	return true
 }
+
+// Function Generation Source: PtrToStructMethod
 func (a *application) rewriteRefOfJoinTableExpr(parent SQLNode, node *JoinTableExpr, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -5415,21 +7040,35 @@ func (a *application) rewriteRefOfJoinTableExpr(parent SQLNode, node *JoinTableE
 			return true
 		}
 	}
+	if a.collectPaths {
+		a.cur.current.AddStep(uint16(RefOfJoinTableExprLeftExpr))
+	}
 	if !a.rewriteTableExpr(node, node.LeftExpr, func(newNode, parent SQLNode) {
 		parent.(*JoinTableExpr).LeftExpr = newNode.(TableExpr)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+		a.cur.current.AddStep(uint16(RefOfJoinTableExprRightExpr))
+	}
 	if !a.rewriteTableExpr(node, node.RightExpr, func(newNode, parent SQLNode) {
 		parent.(*JoinTableExpr).RightExpr = newNode.(TableExpr)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+		a.cur.current.AddStep(uint16(RefOfJoinTableExprCondition))
+	}
 	if !a.rewriteRefOfJoinCondition(node, node.Condition, func(newNode, parent SQLNode) {
 		parent.(*JoinTableExpr).Condition = newNode.(*JoinCondition)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+	}
 	if a.post != nil {
 		a.cur.replacer = replacer
 		a.cur.parent = parent
@@ -5440,6 +7079,8 @@ func (a *application) rewriteRefOfJoinTableExpr(parent SQLNode, node *JoinTableE
 	}
 	return true
 }
+
+// Function Generation Source: PtrToStructMethod
 func (a *application) rewriteRefOfJtColumnDefinition(parent SQLNode, node *JtColumnDefinition, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -5469,6 +7110,8 @@ func (a *application) rewriteRefOfJtColumnDefinition(parent SQLNode, node *JtCol
 	}
 	return true
 }
+
+// Function Generation Source: PtrToStructMethod
 func (a *application) rewriteRefOfJtOnResponse(parent SQLNode, node *JtOnResponse, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -5486,11 +7129,17 @@ func (a *application) rewriteRefOfJtOnResponse(parent SQLNode, node *JtOnRespons
 			return true
 		}
 	}
+	if a.collectPaths {
+		a.cur.current.AddStep(uint16(RefOfJtOnResponseExpr))
+	}
 	if !a.rewriteExpr(node, node.Expr, func(newNode, parent SQLNode) {
 		parent.(*JtOnResponse).Expr = newNode.(Expr)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+	}
 	if a.post != nil {
 		a.cur.replacer = replacer
 		a.cur.parent = parent
@@ -5501,6 +7150,8 @@ func (a *application) rewriteRefOfJtOnResponse(parent SQLNode, node *JtOnRespons
 	}
 	return true
 }
+
+// Function Generation Source: PtrToStructMethod
 func (a *application) rewriteRefOfKeyState(parent SQLNode, node *KeyState, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -5530,6 +7181,8 @@ func (a *application) rewriteRefOfKeyState(parent SQLNode, node *KeyState, repla
 	}
 	return true
 }
+
+// Function Generation Source: PtrToStructMethod
 func (a *application) rewriteRefOfKill(parent SQLNode, node *Kill, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -5559,6 +7212,8 @@ func (a *application) rewriteRefOfKill(parent SQLNode, node *Kill, replacer repl
 	}
 	return true
 }
+
+// Function Generation Source: PtrToStructMethod
 func (a *application) rewriteRefOfLagLeadExpr(parent SQLNode, node *LagLeadExpr, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -5576,31 +7231,53 @@ func (a *application) rewriteRefOfLagLeadExpr(parent SQLNode, node *LagLeadExpr,
 			return true
 		}
 	}
+	if a.collectPaths {
+		a.cur.current.AddStep(uint16(RefOfLagLeadExprExpr))
+	}
 	if !a.rewriteExpr(node, node.Expr, func(newNode, parent SQLNode) {
 		parent.(*LagLeadExpr).Expr = newNode.(Expr)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+		a.cur.current.AddStep(uint16(RefOfLagLeadExprN))
+	}
 	if !a.rewriteExpr(node, node.N, func(newNode, parent SQLNode) {
 		parent.(*LagLeadExpr).N = newNode.(Expr)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+		a.cur.current.AddStep(uint16(RefOfLagLeadExprDefault))
+	}
 	if !a.rewriteExpr(node, node.Default, func(newNode, parent SQLNode) {
 		parent.(*LagLeadExpr).Default = newNode.(Expr)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+		a.cur.current.AddStep(uint16(RefOfLagLeadExprOverClause))
+	}
 	if !a.rewriteRefOfOverClause(node, node.OverClause, func(newNode, parent SQLNode) {
 		parent.(*LagLeadExpr).OverClause = newNode.(*OverClause)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+		a.cur.current.AddStep(uint16(RefOfLagLeadExprNullTreatmentClause))
+	}
 	if !a.rewriteRefOfNullTreatmentClause(node, node.NullTreatmentClause, func(newNode, parent SQLNode) {
 		parent.(*LagLeadExpr).NullTreatmentClause = newNode.(*NullTreatmentClause)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+	}
 	if a.post != nil {
 		a.cur.replacer = replacer
 		a.cur.parent = parent
@@ -5611,6 +7288,8 @@ func (a *application) rewriteRefOfLagLeadExpr(parent SQLNode, node *LagLeadExpr,
 	}
 	return true
 }
+
+// Function Generation Source: PtrToStructMethod
 func (a *application) rewriteRefOfLimit(parent SQLNode, node *Limit, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -5628,16 +7307,26 @@ func (a *application) rewriteRefOfLimit(parent SQLNode, node *Limit, replacer re
 			return true
 		}
 	}
+	if a.collectPaths {
+		a.cur.current.AddStep(uint16(RefOfLimitOffset))
+	}
 	if !a.rewriteExpr(node, node.Offset, func(newNode, parent SQLNode) {
 		parent.(*Limit).Offset = newNode.(Expr)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+		a.cur.current.AddStep(uint16(RefOfLimitRowcount))
+	}
 	if !a.rewriteExpr(node, node.Rowcount, func(newNode, parent SQLNode) {
 		parent.(*Limit).Rowcount = newNode.(Expr)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+	}
 	if a.post != nil {
 		a.cur.replacer = replacer
 		a.cur.parent = parent
@@ -5648,6 +7337,8 @@ func (a *application) rewriteRefOfLimit(parent SQLNode, node *Limit, replacer re
 	}
 	return true
 }
+
+// Function Generation Source: PtrToStructMethod
 func (a *application) rewriteRefOfLineStringExpr(parent SQLNode, node *LineStringExpr, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -5666,6 +7357,13 @@ func (a *application) rewriteRefOfLineStringExpr(parent SQLNode, node *LineStrin
 		}
 	}
 	for x, el := range node.PointParams {
+		if a.collectPaths {
+			if x == 0 {
+				a.cur.current.AddStepWithOffset(uint16(RefOfLineStringExprPointParamsOffset))
+			} else {
+				a.cur.current.ChangeOffset(x)
+			}
+		}
 		if !a.rewriteExpr(node, el, func(idx int) replacerFunc {
 			return func(newNode, parent SQLNode) {
 				parent.(*LineStringExpr).PointParams[idx] = newNode.(Expr)
@@ -5674,6 +7372,9 @@ func (a *application) rewriteRefOfLineStringExpr(parent SQLNode, node *LineStrin
 			return false
 		}
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+	}
 	if a.post != nil {
 		a.cur.replacer = replacer
 		a.cur.parent = parent
@@ -5684,6 +7385,8 @@ func (a *application) rewriteRefOfLineStringExpr(parent SQLNode, node *LineStrin
 	}
 	return true
 }
+
+// Function Generation Source: PtrToStructMethod
 func (a *application) rewriteRefOfLinestrPropertyFuncExpr(parent SQLNode, node *LinestrPropertyFuncExpr, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -5701,16 +7404,26 @@ func (a *application) rewriteRefOfLinestrPropertyFuncExpr(parent SQLNode, node *
 			return true
 		}
 	}
+	if a.collectPaths {
+		a.cur.current.AddStep(uint16(RefOfLinestrPropertyFuncExprLinestring))
+	}
 	if !a.rewriteExpr(node, node.Linestring, func(newNode, parent SQLNode) {
 		parent.(*LinestrPropertyFuncExpr).Linestring = newNode.(Expr)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+		a.cur.current.AddStep(uint16(RefOfLinestrPropertyFuncExprPropertyDefArg))
+	}
 	if !a.rewriteExpr(node, node.PropertyDefArg, func(newNode, parent SQLNode) {
 		parent.(*LinestrPropertyFuncExpr).PropertyDefArg = newNode.(Expr)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+	}
 	if a.post != nil {
 		a.cur.replacer = replacer
 		a.cur.parent = parent
@@ -5721,6 +7434,8 @@ func (a *application) rewriteRefOfLinestrPropertyFuncExpr(parent SQLNode, node *
 	}
 	return true
 }
+
+// Function Generation Source: PtrToStructMethod
 func (a *application) rewriteRefOfLiteral(parent SQLNode, node *Literal, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -5750,6 +7465,8 @@ func (a *application) rewriteRefOfLiteral(parent SQLNode, node *Literal, replace
 	}
 	return true
 }
+
+// Function Generation Source: PtrToStructMethod
 func (a *application) rewriteRefOfLoad(parent SQLNode, node *Load, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -5779,6 +7496,8 @@ func (a *application) rewriteRefOfLoad(parent SQLNode, node *Load, replacer repl
 	}
 	return true
 }
+
+// Function Generation Source: PtrToStructMethod
 func (a *application) rewriteRefOfLocateExpr(parent SQLNode, node *LocateExpr, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -5796,21 +7515,35 @@ func (a *application) rewriteRefOfLocateExpr(parent SQLNode, node *LocateExpr, r
 			return true
 		}
 	}
+	if a.collectPaths {
+		a.cur.current.AddStep(uint16(RefOfLocateExprSubStr))
+	}
 	if !a.rewriteExpr(node, node.SubStr, func(newNode, parent SQLNode) {
 		parent.(*LocateExpr).SubStr = newNode.(Expr)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+		a.cur.current.AddStep(uint16(RefOfLocateExprStr))
+	}
 	if !a.rewriteExpr(node, node.Str, func(newNode, parent SQLNode) {
 		parent.(*LocateExpr).Str = newNode.(Expr)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+		a.cur.current.AddStep(uint16(RefOfLocateExprPos))
+	}
 	if !a.rewriteExpr(node, node.Pos, func(newNode, parent SQLNode) {
 		parent.(*LocateExpr).Pos = newNode.(Expr)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+	}
 	if a.post != nil {
 		a.cur.replacer = replacer
 		a.cur.parent = parent
@@ -5821,6 +7554,8 @@ func (a *application) rewriteRefOfLocateExpr(parent SQLNode, node *LocateExpr, r
 	}
 	return true
 }
+
+// Function Generation Source: PtrToStructMethod
 func (a *application) rewriteRefOfLockOption(parent SQLNode, node *LockOption, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -5850,6 +7585,8 @@ func (a *application) rewriteRefOfLockOption(parent SQLNode, node *LockOption, r
 	}
 	return true
 }
+
+// Function Generation Source: PtrToStructMethod
 func (a *application) rewriteRefOfLockTables(parent SQLNode, node *LockTables, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -5879,6 +7616,8 @@ func (a *application) rewriteRefOfLockTables(parent SQLNode, node *LockTables, r
 	}
 	return true
 }
+
+// Function Generation Source: PtrToStructMethod
 func (a *application) rewriteRefOfLockingFunc(parent SQLNode, node *LockingFunc, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -5896,16 +7635,26 @@ func (a *application) rewriteRefOfLockingFunc(parent SQLNode, node *LockingFunc,
 			return true
 		}
 	}
+	if a.collectPaths {
+		a.cur.current.AddStep(uint16(RefOfLockingFuncName))
+	}
 	if !a.rewriteExpr(node, node.Name, func(newNode, parent SQLNode) {
 		parent.(*LockingFunc).Name = newNode.(Expr)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+		a.cur.current.AddStep(uint16(RefOfLockingFuncTimeout))
+	}
 	if !a.rewriteExpr(node, node.Timeout, func(newNode, parent SQLNode) {
 		parent.(*LockingFunc).Timeout = newNode.(Expr)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+	}
 	if a.post != nil {
 		a.cur.replacer = replacer
 		a.cur.parent = parent
@@ -5916,6 +7665,8 @@ func (a *application) rewriteRefOfLockingFunc(parent SQLNode, node *LockingFunc,
 	}
 	return true
 }
+
+// Function Generation Source: PtrToStructMethod
 func (a *application) rewriteRefOfMatchExpr(parent SQLNode, node *MatchExpr, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -5934,6 +7685,13 @@ func (a *application) rewriteRefOfMatchExpr(parent SQLNode, node *MatchExpr, rep
 		}
 	}
 	for x, el := range node.Columns {
+		if a.collectPaths {
+			if x == 0 {
+				a.cur.current.AddStepWithOffset(uint16(RefOfMatchExprColumnsOffset))
+			} else {
+				a.cur.current.ChangeOffset(x)
+			}
+		}
 		if !a.rewriteRefOfColName(node, el, func(idx int) replacerFunc {
 			return func(newNode, parent SQLNode) {
 				parent.(*MatchExpr).Columns[idx] = newNode.(*ColName)
@@ -5942,11 +7700,18 @@ func (a *application) rewriteRefOfMatchExpr(parent SQLNode, node *MatchExpr, rep
 			return false
 		}
 	}
+	if a.collectPaths && len(node.Columns) > 0 {
+		a.cur.current.Pop()
+		a.cur.current.AddStep(uint16(RefOfMatchExprExpr))
+	}
 	if !a.rewriteExpr(node, node.Expr, func(newNode, parent SQLNode) {
 		parent.(*MatchExpr).Expr = newNode.(Expr)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+	}
 	if a.post != nil {
 		a.cur.replacer = replacer
 		a.cur.parent = parent
@@ -5957,6 +7722,8 @@ func (a *application) rewriteRefOfMatchExpr(parent SQLNode, node *MatchExpr, rep
 	}
 	return true
 }
+
+// Function Generation Source: PtrToStructMethod
 func (a *application) rewriteRefOfMax(parent SQLNode, node *Max, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -5974,16 +7741,26 @@ func (a *application) rewriteRefOfMax(parent SQLNode, node *Max, replacer replac
 			return true
 		}
 	}
+	if a.collectPaths {
+		a.cur.current.AddStep(uint16(RefOfMaxArg))
+	}
 	if !a.rewriteExpr(node, node.Arg, func(newNode, parent SQLNode) {
 		parent.(*Max).Arg = newNode.(Expr)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+		a.cur.current.AddStep(uint16(RefOfMaxOverClause))
+	}
 	if !a.rewriteRefOfOverClause(node, node.OverClause, func(newNode, parent SQLNode) {
 		parent.(*Max).OverClause = newNode.(*OverClause)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+	}
 	if a.post != nil {
 		a.cur.replacer = replacer
 		a.cur.parent = parent
@@ -5994,6 +7771,8 @@ func (a *application) rewriteRefOfMax(parent SQLNode, node *Max, replacer replac
 	}
 	return true
 }
+
+// Function Generation Source: PtrToStructMethod
 func (a *application) rewriteRefOfMemberOfExpr(parent SQLNode, node *MemberOfExpr, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -6011,16 +7790,26 @@ func (a *application) rewriteRefOfMemberOfExpr(parent SQLNode, node *MemberOfExp
 			return true
 		}
 	}
+	if a.collectPaths {
+		a.cur.current.AddStep(uint16(RefOfMemberOfExprValue))
+	}
 	if !a.rewriteExpr(node, node.Value, func(newNode, parent SQLNode) {
 		parent.(*MemberOfExpr).Value = newNode.(Expr)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+		a.cur.current.AddStep(uint16(RefOfMemberOfExprJSONArr))
+	}
 	if !a.rewriteExpr(node, node.JSONArr, func(newNode, parent SQLNode) {
 		parent.(*MemberOfExpr).JSONArr = newNode.(Expr)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+	}
 	if a.post != nil {
 		a.cur.replacer = replacer
 		a.cur.parent = parent
@@ -6031,6 +7820,8 @@ func (a *application) rewriteRefOfMemberOfExpr(parent SQLNode, node *MemberOfExp
 	}
 	return true
 }
+
+// Function Generation Source: PtrToStructMethod
 func (a *application) rewriteRefOfMin(parent SQLNode, node *Min, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -6048,16 +7839,26 @@ func (a *application) rewriteRefOfMin(parent SQLNode, node *Min, replacer replac
 			return true
 		}
 	}
+	if a.collectPaths {
+		a.cur.current.AddStep(uint16(RefOfMinArg))
+	}
 	if !a.rewriteExpr(node, node.Arg, func(newNode, parent SQLNode) {
 		parent.(*Min).Arg = newNode.(Expr)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+		a.cur.current.AddStep(uint16(RefOfMinOverClause))
+	}
 	if !a.rewriteRefOfOverClause(node, node.OverClause, func(newNode, parent SQLNode) {
 		parent.(*Min).OverClause = newNode.(*OverClause)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+	}
 	if a.post != nil {
 		a.cur.replacer = replacer
 		a.cur.parent = parent
@@ -6068,6 +7869,8 @@ func (a *application) rewriteRefOfMin(parent SQLNode, node *Min, replacer replac
 	}
 	return true
 }
+
+// Function Generation Source: PtrToStructMethod
 func (a *application) rewriteRefOfModifyColumn(parent SQLNode, node *ModifyColumn, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -6085,16 +7888,26 @@ func (a *application) rewriteRefOfModifyColumn(parent SQLNode, node *ModifyColum
 			return true
 		}
 	}
+	if a.collectPaths {
+		a.cur.current.AddStep(uint16(RefOfModifyColumnNewColDefinition))
+	}
 	if !a.rewriteRefOfColumnDefinition(node, node.NewColDefinition, func(newNode, parent SQLNode) {
 		parent.(*ModifyColumn).NewColDefinition = newNode.(*ColumnDefinition)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+		a.cur.current.AddStep(uint16(RefOfModifyColumnAfter))
+	}
 	if !a.rewriteRefOfColName(node, node.After, func(newNode, parent SQLNode) {
 		parent.(*ModifyColumn).After = newNode.(*ColName)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+	}
 	if a.post != nil {
 		a.cur.replacer = replacer
 		a.cur.parent = parent
@@ -6105,6 +7918,8 @@ func (a *application) rewriteRefOfModifyColumn(parent SQLNode, node *ModifyColum
 	}
 	return true
 }
+
+// Function Generation Source: PtrToStructMethod
 func (a *application) rewriteRefOfMultiLinestringExpr(parent SQLNode, node *MultiLinestringExpr, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -6123,6 +7938,13 @@ func (a *application) rewriteRefOfMultiLinestringExpr(parent SQLNode, node *Mult
 		}
 	}
 	for x, el := range node.LinestringParams {
+		if a.collectPaths {
+			if x == 0 {
+				a.cur.current.AddStepWithOffset(uint16(RefOfMultiLinestringExprLinestringParamsOffset))
+			} else {
+				a.cur.current.ChangeOffset(x)
+			}
+		}
 		if !a.rewriteExpr(node, el, func(idx int) replacerFunc {
 			return func(newNode, parent SQLNode) {
 				parent.(*MultiLinestringExpr).LinestringParams[idx] = newNode.(Expr)
@@ -6131,6 +7953,9 @@ func (a *application) rewriteRefOfMultiLinestringExpr(parent SQLNode, node *Mult
 			return false
 		}
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+	}
 	if a.post != nil {
 		a.cur.replacer = replacer
 		a.cur.parent = parent
@@ -6141,6 +7966,8 @@ func (a *application) rewriteRefOfMultiLinestringExpr(parent SQLNode, node *Mult
 	}
 	return true
 }
+
+// Function Generation Source: PtrToStructMethod
 func (a *application) rewriteRefOfMultiPointExpr(parent SQLNode, node *MultiPointExpr, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -6159,6 +7986,13 @@ func (a *application) rewriteRefOfMultiPointExpr(parent SQLNode, node *MultiPoin
 		}
 	}
 	for x, el := range node.PointParams {
+		if a.collectPaths {
+			if x == 0 {
+				a.cur.current.AddStepWithOffset(uint16(RefOfMultiPointExprPointParamsOffset))
+			} else {
+				a.cur.current.ChangeOffset(x)
+			}
+		}
 		if !a.rewriteExpr(node, el, func(idx int) replacerFunc {
 			return func(newNode, parent SQLNode) {
 				parent.(*MultiPointExpr).PointParams[idx] = newNode.(Expr)
@@ -6167,6 +8001,9 @@ func (a *application) rewriteRefOfMultiPointExpr(parent SQLNode, node *MultiPoin
 			return false
 		}
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+	}
 	if a.post != nil {
 		a.cur.replacer = replacer
 		a.cur.parent = parent
@@ -6177,6 +8014,8 @@ func (a *application) rewriteRefOfMultiPointExpr(parent SQLNode, node *MultiPoin
 	}
 	return true
 }
+
+// Function Generation Source: PtrToStructMethod
 func (a *application) rewriteRefOfMultiPolygonExpr(parent SQLNode, node *MultiPolygonExpr, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -6195,6 +8034,13 @@ func (a *application) rewriteRefOfMultiPolygonExpr(parent SQLNode, node *MultiPo
 		}
 	}
 	for x, el := range node.PolygonParams {
+		if a.collectPaths {
+			if x == 0 {
+				a.cur.current.AddStepWithOffset(uint16(RefOfMultiPolygonExprPolygonParamsOffset))
+			} else {
+				a.cur.current.ChangeOffset(x)
+			}
+		}
 		if !a.rewriteExpr(node, el, func(idx int) replacerFunc {
 			return func(newNode, parent SQLNode) {
 				parent.(*MultiPolygonExpr).PolygonParams[idx] = newNode.(Expr)
@@ -6203,6 +8049,9 @@ func (a *application) rewriteRefOfMultiPolygonExpr(parent SQLNode, node *MultiPo
 			return false
 		}
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+	}
 	if a.post != nil {
 		a.cur.replacer = replacer
 		a.cur.parent = parent
@@ -6213,6 +8062,8 @@ func (a *application) rewriteRefOfMultiPolygonExpr(parent SQLNode, node *MultiPo
 	}
 	return true
 }
+
+// Function Generation Source: PtrToStructMethod
 func (a *application) rewriteRefOfNTHValueExpr(parent SQLNode, node *NTHValueExpr, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -6230,31 +8081,53 @@ func (a *application) rewriteRefOfNTHValueExpr(parent SQLNode, node *NTHValueExp
 			return true
 		}
 	}
+	if a.collectPaths {
+		a.cur.current.AddStep(uint16(RefOfNTHValueExprExpr))
+	}
 	if !a.rewriteExpr(node, node.Expr, func(newNode, parent SQLNode) {
 		parent.(*NTHValueExpr).Expr = newNode.(Expr)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+		a.cur.current.AddStep(uint16(RefOfNTHValueExprN))
+	}
 	if !a.rewriteExpr(node, node.N, func(newNode, parent SQLNode) {
 		parent.(*NTHValueExpr).N = newNode.(Expr)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+		a.cur.current.AddStep(uint16(RefOfNTHValueExprOverClause))
+	}
 	if !a.rewriteRefOfOverClause(node, node.OverClause, func(newNode, parent SQLNode) {
 		parent.(*NTHValueExpr).OverClause = newNode.(*OverClause)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+		a.cur.current.AddStep(uint16(RefOfNTHValueExprFromFirstLastClause))
+	}
 	if !a.rewriteRefOfFromFirstLastClause(node, node.FromFirstLastClause, func(newNode, parent SQLNode) {
 		parent.(*NTHValueExpr).FromFirstLastClause = newNode.(*FromFirstLastClause)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+		a.cur.current.AddStep(uint16(RefOfNTHValueExprNullTreatmentClause))
+	}
 	if !a.rewriteRefOfNullTreatmentClause(node, node.NullTreatmentClause, func(newNode, parent SQLNode) {
 		parent.(*NTHValueExpr).NullTreatmentClause = newNode.(*NullTreatmentClause)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+	}
 	if a.post != nil {
 		a.cur.replacer = replacer
 		a.cur.parent = parent
@@ -6265,6 +8138,8 @@ func (a *application) rewriteRefOfNTHValueExpr(parent SQLNode, node *NTHValueExp
 	}
 	return true
 }
+
+// Function Generation Source: PtrToStructMethod
 func (a *application) rewriteRefOfNamedWindow(parent SQLNode, node *NamedWindow, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -6282,11 +8157,17 @@ func (a *application) rewriteRefOfNamedWindow(parent SQLNode, node *NamedWindow,
 			return true
 		}
 	}
+	if a.collectPaths {
+		a.cur.current.AddStep(uint16(RefOfNamedWindowWindows))
+	}
 	if !a.rewriteWindowDefinitions(node, node.Windows, func(newNode, parent SQLNode) {
 		parent.(*NamedWindow).Windows = newNode.(WindowDefinitions)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+	}
 	if a.post != nil {
 		a.cur.replacer = replacer
 		a.cur.parent = parent
@@ -6297,6 +8178,8 @@ func (a *application) rewriteRefOfNamedWindow(parent SQLNode, node *NamedWindow,
 	}
 	return true
 }
+
+// Function Generation Source: SliceMethod
 func (a *application) rewriteNamedWindows(parent SQLNode, node NamedWindows, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -6315,6 +8198,13 @@ func (a *application) rewriteNamedWindows(parent SQLNode, node NamedWindows, rep
 		}
 	}
 	for x, el := range node {
+		if a.collectPaths {
+			if x == 0 {
+				a.cur.current.AddStepWithOffset(uint16(NamedWindowsOffset))
+			} else {
+				a.cur.current.ChangeOffset(x)
+			}
+		}
 		if !a.rewriteRefOfNamedWindow(node, el, func(idx int) replacerFunc {
 			return func(newNode, parent SQLNode) {
 				parent.(NamedWindows)[idx] = newNode.(*NamedWindow)
@@ -6323,6 +8213,9 @@ func (a *application) rewriteNamedWindows(parent SQLNode, node NamedWindows, rep
 			return false
 		}
 	}
+	if a.collectPaths && len(node) > 0 {
+		a.cur.current.Pop()
+	}
 	if a.post != nil {
 		a.cur.replacer = replacer
 		a.cur.parent = parent
@@ -6333,6 +8226,8 @@ func (a *application) rewriteNamedWindows(parent SQLNode, node NamedWindows, rep
 	}
 	return true
 }
+
+// Function Generation Source: PtrToStructMethod
 func (a *application) rewriteRefOfNextval(parent SQLNode, node *Nextval, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -6350,11 +8245,17 @@ func (a *application) rewriteRefOfNextval(parent SQLNode, node *Nextval, replace
 			return true
 		}
 	}
+	if a.collectPaths {
+		a.cur.current.AddStep(uint16(RefOfNextvalExpr))
+	}
 	if !a.rewriteExpr(node, node.Expr, func(newNode, parent SQLNode) {
 		parent.(*Nextval).Expr = newNode.(Expr)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+	}
 	if a.post != nil {
 		a.cur.replacer = replacer
 		a.cur.parent = parent
@@ -6365,6 +8266,8 @@ func (a *application) rewriteRefOfNextval(parent SQLNode, node *Nextval, replace
 	}
 	return true
 }
+
+// Function Generation Source: PtrToStructMethod
 func (a *application) rewriteRefOfNotExpr(parent SQLNode, node *NotExpr, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -6382,11 +8285,17 @@ func (a *application) rewriteRefOfNotExpr(parent SQLNode, node *NotExpr, replace
 			return true
 		}
 	}
+	if a.collectPaths {
+		a.cur.current.AddStep(uint16(RefOfNotExprExpr))
+	}
 	if !a.rewriteExpr(node, node.Expr, func(newNode, parent SQLNode) {
 		parent.(*NotExpr).Expr = newNode.(Expr)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+	}
 	if a.post != nil {
 		a.cur.replacer = replacer
 		a.cur.parent = parent
@@ -6397,6 +8306,8 @@ func (a *application) rewriteRefOfNotExpr(parent SQLNode, node *NotExpr, replace
 	}
 	return true
 }
+
+// Function Generation Source: PtrToStructMethod
 func (a *application) rewriteRefOfNtileExpr(parent SQLNode, node *NtileExpr, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -6414,16 +8325,26 @@ func (a *application) rewriteRefOfNtileExpr(parent SQLNode, node *NtileExpr, rep
 			return true
 		}
 	}
+	if a.collectPaths {
+		a.cur.current.AddStep(uint16(RefOfNtileExprN))
+	}
 	if !a.rewriteExpr(node, node.N, func(newNode, parent SQLNode) {
 		parent.(*NtileExpr).N = newNode.(Expr)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+		a.cur.current.AddStep(uint16(RefOfNtileExprOverClause))
+	}
 	if !a.rewriteRefOfOverClause(node, node.OverClause, func(newNode, parent SQLNode) {
 		parent.(*NtileExpr).OverClause = newNode.(*OverClause)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+	}
 	if a.post != nil {
 		a.cur.replacer = replacer
 		a.cur.parent = parent
@@ -6434,6 +8355,8 @@ func (a *application) rewriteRefOfNtileExpr(parent SQLNode, node *NtileExpr, rep
 	}
 	return true
 }
+
+// Function Generation Source: PtrToStructMethod
 func (a *application) rewriteRefOfNullTreatmentClause(parent SQLNode, node *NullTreatmentClause, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -6463,6 +8386,8 @@ func (a *application) rewriteRefOfNullTreatmentClause(parent SQLNode, node *Null
 	}
 	return true
 }
+
+// Function Generation Source: PtrToStructMethod
 func (a *application) rewriteRefOfNullVal(parent SQLNode, node *NullVal, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -6492,6 +8417,8 @@ func (a *application) rewriteRefOfNullVal(parent SQLNode, node *NullVal, replace
 	}
 	return true
 }
+
+// Function Generation Source: PtrToStructMethod
 func (a *application) rewriteRefOfOffset(parent SQLNode, node *Offset, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -6509,11 +8436,17 @@ func (a *application) rewriteRefOfOffset(parent SQLNode, node *Offset, replacer
 			return true
 		}
 	}
+	if a.collectPaths {
+		a.cur.current.AddStep(uint16(RefOfOffsetOriginal))
+	}
 	if !a.rewriteExpr(node, node.Original, func(newNode, parent SQLNode) {
 		parent.(*Offset).Original = newNode.(Expr)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+	}
 	if a.post != nil {
 		a.cur.replacer = replacer
 		a.cur.parent = parent
@@ -6524,6 +8457,8 @@ func (a *application) rewriteRefOfOffset(parent SQLNode, node *Offset, replacer
 	}
 	return true
 }
+
+// Function Generation Source: SliceMethod
 func (a *application) rewriteOnDup(parent SQLNode, node OnDup, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -6542,6 +8477,13 @@ func (a *application) rewriteOnDup(parent SQLNode, node OnDup, replacer replacer
 		}
 	}
 	for x, el := range node {
+		if a.collectPaths {
+			if x == 0 {
+				a.cur.current.AddStepWithOffset(uint16(OnDupOffset))
+			} else {
+				a.cur.current.ChangeOffset(x)
+			}
+		}
 		if !a.rewriteRefOfUpdateExpr(node, el, func(idx int) replacerFunc {
 			return func(newNode, parent SQLNode) {
 				parent.(OnDup)[idx] = newNode.(*UpdateExpr)
@@ -6550,6 +8492,9 @@ func (a *application) rewriteOnDup(parent SQLNode, node OnDup, replacer replacer
 			return false
 		}
 	}
+	if a.collectPaths && len(node) > 0 {
+		a.cur.current.Pop()
+	}
 	if a.post != nil {
 		a.cur.replacer = replacer
 		a.cur.parent = parent
@@ -6560,6 +8505,8 @@ func (a *application) rewriteOnDup(parent SQLNode, node OnDup, replacer replacer
 	}
 	return true
 }
+
+// Function Generation Source: PtrToStructMethod
 func (a *application) rewriteRefOfOptLike(parent SQLNode, node *OptLike, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -6577,11 +8524,17 @@ func (a *application) rewriteRefOfOptLike(parent SQLNode, node *OptLike, replace
 			return true
 		}
 	}
+	if a.collectPaths {
+		a.cur.current.AddStep(uint16(RefOfOptLikeLikeTable))
+	}
 	if !a.rewriteTableName(node, node.LikeTable, func(newNode, parent SQLNode) {
 		parent.(*OptLike).LikeTable = newNode.(TableName)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+	}
 	if a.post != nil {
 		a.cur.replacer = replacer
 		a.cur.parent = parent
@@ -6592,6 +8545,8 @@ func (a *application) rewriteRefOfOptLike(parent SQLNode, node *OptLike, replace
 	}
 	return true
 }
+
+// Function Generation Source: PtrToStructMethod
 func (a *application) rewriteRefOfOrExpr(parent SQLNode, node *OrExpr, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -6609,16 +8564,26 @@ func (a *application) rewriteRefOfOrExpr(parent SQLNode, node *OrExpr, replacer
 			return true
 		}
 	}
+	if a.collectPaths {
+		a.cur.current.AddStep(uint16(RefOfOrExprLeft))
+	}
 	if !a.rewriteExpr(node, node.Left, func(newNode, parent SQLNode) {
 		parent.(*OrExpr).Left = newNode.(Expr)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+		a.cur.current.AddStep(uint16(RefOfOrExprRight))
+	}
 	if !a.rewriteExpr(node, node.Right, func(newNode, parent SQLNode) {
 		parent.(*OrExpr).Right = newNode.(Expr)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+	}
 	if a.post != nil {
 		a.cur.replacer = replacer
 		a.cur.parent = parent
@@ -6629,6 +8594,8 @@ func (a *application) rewriteRefOfOrExpr(parent SQLNode, node *OrExpr, replacer
 	}
 	return true
 }
+
+// Function Generation Source: PtrToStructMethod
 func (a *application) rewriteRefOfOrder(parent SQLNode, node *Order, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -6646,11 +8613,17 @@ func (a *application) rewriteRefOfOrder(parent SQLNode, node *Order, replacer re
 			return true
 		}
 	}
+	if a.collectPaths {
+		a.cur.current.AddStep(uint16(RefOfOrderExpr))
+	}
 	if !a.rewriteExpr(node, node.Expr, func(newNode, parent SQLNode) {
 		parent.(*Order).Expr = newNode.(Expr)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+	}
 	if a.post != nil {
 		a.cur.replacer = replacer
 		a.cur.parent = parent
@@ -6661,6 +8634,8 @@ func (a *application) rewriteRefOfOrder(parent SQLNode, node *Order, replacer re
 	}
 	return true
 }
+
+// Function Generation Source: SliceMethod
 func (a *application) rewriteOrderBy(parent SQLNode, node OrderBy, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -6679,6 +8654,13 @@ func (a *application) rewriteOrderBy(parent SQLNode, node OrderBy, replacer repl
 		}
 	}
 	for x, el := range node {
+		if a.collectPaths {
+			if x == 0 {
+				a.cur.current.AddStepWithOffset(uint16(OrderByOffset))
+			} else {
+				a.cur.current.ChangeOffset(x)
+			}
+		}
 		if !a.rewriteRefOfOrder(node, el, func(idx int) replacerFunc {
 			return func(newNode, parent SQLNode) {
 				parent.(OrderBy)[idx] = newNode.(*Order)
@@ -6687,6 +8669,9 @@ func (a *application) rewriteOrderBy(parent SQLNode, node OrderBy, replacer repl
 			return false
 		}
 	}
+	if a.collectPaths && len(node) > 0 {
+		a.cur.current.Pop()
+	}
 	if a.post != nil {
 		a.cur.replacer = replacer
 		a.cur.parent = parent
@@ -6697,6 +8682,8 @@ func (a *application) rewriteOrderBy(parent SQLNode, node OrderBy, replacer repl
 	}
 	return true
 }
+
+// Function Generation Source: PtrToStructMethod
 func (a *application) rewriteRefOfOrderByOption(parent SQLNode, node *OrderByOption, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -6714,11 +8701,17 @@ func (a *application) rewriteRefOfOrderByOption(parent SQLNode, node *OrderByOpt
 			return true
 		}
 	}
+	if a.collectPaths {
+		a.cur.current.AddStep(uint16(RefOfOrderByOptionCols))
+	}
 	if !a.rewriteColumns(node, node.Cols, func(newNode, parent SQLNode) {
 		parent.(*OrderByOption).Cols = newNode.(Columns)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+	}
 	if a.post != nil {
 		a.cur.replacer = replacer
 		a.cur.parent = parent
@@ -6729,6 +8722,8 @@ func (a *application) rewriteRefOfOrderByOption(parent SQLNode, node *OrderByOpt
 	}
 	return true
 }
+
+// Function Generation Source: PtrToStructMethod
 func (a *application) rewriteRefOfOtherAdmin(parent SQLNode, node *OtherAdmin, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -6758,6 +8753,8 @@ func (a *application) rewriteRefOfOtherAdmin(parent SQLNode, node *OtherAdmin, r
 	}
 	return true
 }
+
+// Function Generation Source: PtrToStructMethod
 func (a *application) rewriteRefOfOverClause(parent SQLNode, node *OverClause, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -6775,16 +8772,26 @@ func (a *application) rewriteRefOfOverClause(parent SQLNode, node *OverClause, r
 			return true
 		}
 	}
+	if a.collectPaths {
+		a.cur.current.AddStep(uint16(RefOfOverClauseWindowName))
+	}
 	if !a.rewriteIdentifierCI(node, node.WindowName, func(newNode, parent SQLNode) {
 		parent.(*OverClause).WindowName = newNode.(IdentifierCI)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+		a.cur.current.AddStep(uint16(RefOfOverClauseWindowSpec))
+	}
 	if !a.rewriteRefOfWindowSpecification(node, node.WindowSpec, func(newNode, parent SQLNode) {
 		parent.(*OverClause).WindowSpec = newNode.(*WindowSpecification)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+	}
 	if a.post != nil {
 		a.cur.replacer = replacer
 		a.cur.parent = parent
@@ -6795,6 +8802,8 @@ func (a *application) rewriteRefOfOverClause(parent SQLNode, node *OverClause, r
 	}
 	return true
 }
+
+// Function Generation Source: PtrToStructMethod
 func (a *application) rewriteRefOfParenTableExpr(parent SQLNode, node *ParenTableExpr, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -6812,11 +8821,17 @@ func (a *application) rewriteRefOfParenTableExpr(parent SQLNode, node *ParenTabl
 			return true
 		}
 	}
+	if a.collectPaths {
+		a.cur.current.AddStep(uint16(RefOfParenTableExprExprs))
+	}
 	if !a.rewriteTableExprs(node, node.Exprs, func(newNode, parent SQLNode) {
 		parent.(*ParenTableExpr).Exprs = newNode.(TableExprs)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+	}
 	if a.post != nil {
 		a.cur.replacer = replacer
 		a.cur.parent = parent
@@ -6827,6 +8842,8 @@ func (a *application) rewriteRefOfParenTableExpr(parent SQLNode, node *ParenTabl
 	}
 	return true
 }
+
+// Function Generation Source: PtrToStructMethod
 func (a *application) rewriteRefOfParsedComments(parent SQLNode, node *ParsedComments, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -6856,6 +8873,8 @@ func (a *application) rewriteRefOfParsedComments(parent SQLNode, node *ParsedCom
 	}
 	return true
 }
+
+// Function Generation Source: PtrToStructMethod
 func (a *application) rewriteRefOfPartitionDefinition(parent SQLNode, node *PartitionDefinition, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -6873,16 +8892,26 @@ func (a *application) rewriteRefOfPartitionDefinition(parent SQLNode, node *Part
 			return true
 		}
 	}
+	if a.collectPaths {
+		a.cur.current.AddStep(uint16(RefOfPartitionDefinitionName))
+	}
 	if !a.rewriteIdentifierCI(node, node.Name, func(newNode, parent SQLNode) {
 		parent.(*PartitionDefinition).Name = newNode.(IdentifierCI)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+		a.cur.current.AddStep(uint16(RefOfPartitionDefinitionOptions))
+	}
 	if !a.rewriteRefOfPartitionDefinitionOptions(node, node.Options, func(newNode, parent SQLNode) {
 		parent.(*PartitionDefinition).Options = newNode.(*PartitionDefinitionOptions)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+	}
 	if a.post != nil {
 		a.cur.replacer = replacer
 		a.cur.parent = parent
@@ -6893,6 +8922,8 @@ func (a *application) rewriteRefOfPartitionDefinition(parent SQLNode, node *Part
 	}
 	return true
 }
+
+// Function Generation Source: PtrToStructMethod
 func (a *application) rewriteRefOfPartitionDefinitionOptions(parent SQLNode, node *PartitionDefinitionOptions, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -6910,36 +8941,62 @@ func (a *application) rewriteRefOfPartitionDefinitionOptions(parent SQLNode, nod
 			return true
 		}
 	}
+	if a.collectPaths {
+		a.cur.current.AddStep(uint16(RefOfPartitionDefinitionOptionsValueRange))
+	}
 	if !a.rewriteRefOfPartitionValueRange(node, node.ValueRange, func(newNode, parent SQLNode) {
 		parent.(*PartitionDefinitionOptions).ValueRange = newNode.(*PartitionValueRange)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+		a.cur.current.AddStep(uint16(RefOfPartitionDefinitionOptionsComment))
+	}
 	if !a.rewriteRefOfLiteral(node, node.Comment, func(newNode, parent SQLNode) {
 		parent.(*PartitionDefinitionOptions).Comment = newNode.(*Literal)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+		a.cur.current.AddStep(uint16(RefOfPartitionDefinitionOptionsEngine))
+	}
 	if !a.rewriteRefOfPartitionEngine(node, node.Engine, func(newNode, parent SQLNode) {
 		parent.(*PartitionDefinitionOptions).Engine = newNode.(*PartitionEngine)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+		a.cur.current.AddStep(uint16(RefOfPartitionDefinitionOptionsDataDirectory))
+	}
 	if !a.rewriteRefOfLiteral(node, node.DataDirectory, func(newNode, parent SQLNode) {
 		parent.(*PartitionDefinitionOptions).DataDirectory = newNode.(*Literal)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+		a.cur.current.AddStep(uint16(RefOfPartitionDefinitionOptionsIndexDirectory))
+	}
 	if !a.rewriteRefOfLiteral(node, node.IndexDirectory, func(newNode, parent SQLNode) {
 		parent.(*PartitionDefinitionOptions).IndexDirectory = newNode.(*Literal)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+		a.cur.current.AddStep(uint16(RefOfPartitionDefinitionOptionsSubPartitionDefinitions))
+	}
 	if !a.rewriteSubPartitionDefinitions(node, node.SubPartitionDefinitions, func(newNode, parent SQLNode) {
 		parent.(*PartitionDefinitionOptions).SubPartitionDefinitions = newNode.(SubPartitionDefinitions)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+	}
 	if a.post != nil {
 		a.cur.replacer = replacer
 		a.cur.parent = parent
@@ -6950,6 +9007,8 @@ func (a *application) rewriteRefOfPartitionDefinitionOptions(parent SQLNode, nod
 	}
 	return true
 }
+
+// Function Generation Source: PtrToStructMethod
 func (a *application) rewriteRefOfPartitionEngine(parent SQLNode, node *PartitionEngine, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -6979,6 +9038,8 @@ func (a *application) rewriteRefOfPartitionEngine(parent SQLNode, node *Partitio
 	}
 	return true
 }
+
+// Function Generation Source: PtrToStructMethod
 func (a *application) rewriteRefOfPartitionOption(parent SQLNode, node *PartitionOption, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -6996,22 +9057,43 @@ func (a *application) rewriteRefOfPartitionOption(parent SQLNode, node *Partitio
 			return true
 		}
 	}
+	if a.collectPaths {
+		a.cur.current.AddStep(uint16(RefOfPartitionOptionColList))
+	}
 	if !a.rewriteColumns(node, node.ColList, func(newNode, parent SQLNode) {
 		parent.(*PartitionOption).ColList = newNode.(Columns)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+		a.cur.current.AddStep(uint16(RefOfPartitionOptionExpr))
+	}
 	if !a.rewriteExpr(node, node.Expr, func(newNode, parent SQLNode) {
 		parent.(*PartitionOption).Expr = newNode.(Expr)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+		a.cur.current.AddStep(uint16(RefOfPartitionOptionSubPartition))
+	}
 	if !a.rewriteRefOfSubPartition(node, node.SubPartition, func(newNode, parent SQLNode) {
 		parent.(*PartitionOption).SubPartition = newNode.(*SubPartition)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+	}
 	for x, el := range node.Definitions {
+		if a.collectPaths {
+			if x == 0 {
+				a.cur.current.AddStepWithOffset(uint16(RefOfPartitionOptionDefinitionsOffset))
+			} else {
+				a.cur.current.ChangeOffset(x)
+			}
+		}
 		if !a.rewriteRefOfPartitionDefinition(node, el, func(idx int) replacerFunc {
 			return func(newNode, parent SQLNode) {
 				parent.(*PartitionOption).Definitions[idx] = newNode.(*PartitionDefinition)
@@ -7020,6 +9102,9 @@ func (a *application) rewriteRefOfPartitionOption(parent SQLNode, node *Partitio
 			return false
 		}
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+	}
 	if a.post != nil {
 		a.cur.replacer = replacer
 		a.cur.parent = parent
@@ -7030,6 +9115,8 @@ func (a *application) rewriteRefOfPartitionOption(parent SQLNode, node *Partitio
 	}
 	return true
 }
+
+// Function Generation Source: PtrToStructMethod
 func (a *application) rewriteRefOfPartitionSpec(parent SQLNode, node *PartitionSpec, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -7047,22 +9134,43 @@ func (a *application) rewriteRefOfPartitionSpec(parent SQLNode, node *PartitionS
 			return true
 		}
 	}
+	if a.collectPaths {
+		a.cur.current.AddStep(uint16(RefOfPartitionSpecNames))
+	}
 	if !a.rewritePartitions(node, node.Names, func(newNode, parent SQLNode) {
 		parent.(*PartitionSpec).Names = newNode.(Partitions)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+		a.cur.current.AddStep(uint16(RefOfPartitionSpecNumber))
+	}
 	if !a.rewriteRefOfLiteral(node, node.Number, func(newNode, parent SQLNode) {
 		parent.(*PartitionSpec).Number = newNode.(*Literal)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+		a.cur.current.AddStep(uint16(RefOfPartitionSpecTableName))
+	}
 	if !a.rewriteTableName(node, node.TableName, func(newNode, parent SQLNode) {
 		parent.(*PartitionSpec).TableName = newNode.(TableName)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+	}
 	for x, el := range node.Definitions {
+		if a.collectPaths {
+			if x == 0 {
+				a.cur.current.AddStepWithOffset(uint16(RefOfPartitionSpecDefinitionsOffset))
+			} else {
+				a.cur.current.ChangeOffset(x)
+			}
+		}
 		if !a.rewriteRefOfPartitionDefinition(node, el, func(idx int) replacerFunc {
 			return func(newNode, parent SQLNode) {
 				parent.(*PartitionSpec).Definitions[idx] = newNode.(*PartitionDefinition)
@@ -7071,6 +9179,9 @@ func (a *application) rewriteRefOfPartitionSpec(parent SQLNode, node *PartitionS
 			return false
 		}
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+	}
 	if a.post != nil {
 		a.cur.replacer = replacer
 		a.cur.parent = parent
@@ -7081,6 +9192,8 @@ func (a *application) rewriteRefOfPartitionSpec(parent SQLNode, node *PartitionS
 	}
 	return true
 }
+
+// Function Generation Source: PtrToStructMethod
 func (a *application) rewriteRefOfPartitionValueRange(parent SQLNode, node *PartitionValueRange, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -7098,11 +9211,17 @@ func (a *application) rewriteRefOfPartitionValueRange(parent SQLNode, node *Part
 			return true
 		}
 	}
+	if a.collectPaths {
+		a.cur.current.AddStep(uint16(RefOfPartitionValueRangeRange))
+	}
 	if !a.rewriteValTuple(node, node.Range, func(newNode, parent SQLNode) {
 		parent.(*PartitionValueRange).Range = newNode.(ValTuple)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+	}
 	if a.post != nil {
 		a.cur.replacer = replacer
 		a.cur.parent = parent
@@ -7113,6 +9232,8 @@ func (a *application) rewriteRefOfPartitionValueRange(parent SQLNode, node *Part
 	}
 	return true
 }
+
+// Function Generation Source: SliceMethod
 func (a *application) rewritePartitions(parent SQLNode, node Partitions, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -7131,6 +9252,13 @@ func (a *application) rewritePartitions(parent SQLNode, node Partitions, replace
 		}
 	}
 	for x, el := range node {
+		if a.collectPaths {
+			if x == 0 {
+				a.cur.current.AddStepWithOffset(uint16(PartitionsOffset))
+			} else {
+				a.cur.current.ChangeOffset(x)
+			}
+		}
 		if !a.rewriteIdentifierCI(node, el, func(idx int) replacerFunc {
 			return func(newNode, parent SQLNode) {
 				parent.(Partitions)[idx] = newNode.(IdentifierCI)
@@ -7139,6 +9267,9 @@ func (a *application) rewritePartitions(parent SQLNode, node Partitions, replace
 			return false
 		}
 	}
+	if a.collectPaths && len(node) > 0 {
+		a.cur.current.Pop()
+	}
 	if a.post != nil {
 		a.cur.replacer = replacer
 		a.cur.parent = parent
@@ -7149,6 +9280,8 @@ func (a *application) rewritePartitions(parent SQLNode, node Partitions, replace
 	}
 	return true
 }
+
+// Function Generation Source: PtrToStructMethod
 func (a *application) rewriteRefOfPerformanceSchemaFuncExpr(parent SQLNode, node *PerformanceSchemaFuncExpr, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -7166,11 +9299,17 @@ func (a *application) rewriteRefOfPerformanceSchemaFuncExpr(parent SQLNode, node
 			return true
 		}
 	}
+	if a.collectPaths {
+		a.cur.current.AddStep(uint16(RefOfPerformanceSchemaFuncExprArgument))
+	}
 	if !a.rewriteExpr(node, node.Argument, func(newNode, parent SQLNode) {
 		parent.(*PerformanceSchemaFuncExpr).Argument = newNode.(Expr)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+	}
 	if a.post != nil {
 		a.cur.replacer = replacer
 		a.cur.parent = parent
@@ -7181,6 +9320,8 @@ func (a *application) rewriteRefOfPerformanceSchemaFuncExpr(parent SQLNode, node
 	}
 	return true
 }
+
+// Function Generation Source: PtrToStructMethod
 func (a *application) rewriteRefOfPointExpr(parent SQLNode, node *PointExpr, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -7198,16 +9339,26 @@ func (a *application) rewriteRefOfPointExpr(parent SQLNode, node *PointExpr, rep
 			return true
 		}
 	}
+	if a.collectPaths {
+		a.cur.current.AddStep(uint16(RefOfPointExprXCordinate))
+	}
 	if !a.rewriteExpr(node, node.XCordinate, func(newNode, parent SQLNode) {
 		parent.(*PointExpr).XCordinate = newNode.(Expr)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+		a.cur.current.AddStep(uint16(RefOfPointExprYCordinate))
+	}
 	if !a.rewriteExpr(node, node.YCordinate, func(newNode, parent SQLNode) {
 		parent.(*PointExpr).YCordinate = newNode.(Expr)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+	}
 	if a.post != nil {
 		a.cur.replacer = replacer
 		a.cur.parent = parent
@@ -7218,6 +9369,8 @@ func (a *application) rewriteRefOfPointExpr(parent SQLNode, node *PointExpr, rep
 	}
 	return true
 }
+
+// Function Generation Source: PtrToStructMethod
 func (a *application) rewriteRefOfPointPropertyFuncExpr(parent SQLNode, node *PointPropertyFuncExpr, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -7235,16 +9388,26 @@ func (a *application) rewriteRefOfPointPropertyFuncExpr(parent SQLNode, node *Po
 			return true
 		}
 	}
+	if a.collectPaths {
+		a.cur.current.AddStep(uint16(RefOfPointPropertyFuncExprPoint))
+	}
 	if !a.rewriteExpr(node, node.Point, func(newNode, parent SQLNode) {
 		parent.(*PointPropertyFuncExpr).Point = newNode.(Expr)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+		a.cur.current.AddStep(uint16(RefOfPointPropertyFuncExprValueToSet))
+	}
 	if !a.rewriteExpr(node, node.ValueToSet, func(newNode, parent SQLNode) {
 		parent.(*PointPropertyFuncExpr).ValueToSet = newNode.(Expr)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+	}
 	if a.post != nil {
 		a.cur.replacer = replacer
 		a.cur.parent = parent
@@ -7255,6 +9418,8 @@ func (a *application) rewriteRefOfPointPropertyFuncExpr(parent SQLNode, node *Po
 	}
 	return true
 }
+
+// Function Generation Source: PtrToStructMethod
 func (a *application) rewriteRefOfPolygonExpr(parent SQLNode, node *PolygonExpr, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -7273,6 +9438,13 @@ func (a *application) rewriteRefOfPolygonExpr(parent SQLNode, node *PolygonExpr,
 		}
 	}
 	for x, el := range node.LinestringParams {
+		if a.collectPaths {
+			if x == 0 {
+				a.cur.current.AddStepWithOffset(uint16(RefOfPolygonExprLinestringParamsOffset))
+			} else {
+				a.cur.current.ChangeOffset(x)
+			}
+		}
 		if !a.rewriteExpr(node, el, func(idx int) replacerFunc {
 			return func(newNode, parent SQLNode) {
 				parent.(*PolygonExpr).LinestringParams[idx] = newNode.(Expr)
@@ -7281,6 +9453,9 @@ func (a *application) rewriteRefOfPolygonExpr(parent SQLNode, node *PolygonExpr,
 			return false
 		}
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+	}
 	if a.post != nil {
 		a.cur.replacer = replacer
 		a.cur.parent = parent
@@ -7291,6 +9466,8 @@ func (a *application) rewriteRefOfPolygonExpr(parent SQLNode, node *PolygonExpr,
 	}
 	return true
 }
+
+// Function Generation Source: PtrToStructMethod
 func (a *application) rewriteRefOfPolygonPropertyFuncExpr(parent SQLNode, node *PolygonPropertyFuncExpr, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -7308,16 +9485,26 @@ func (a *application) rewriteRefOfPolygonPropertyFuncExpr(parent SQLNode, node *
 			return true
 		}
 	}
+	if a.collectPaths {
+		a.cur.current.AddStep(uint16(RefOfPolygonPropertyFuncExprPolygon))
+	}
 	if !a.rewriteExpr(node, node.Polygon, func(newNode, parent SQLNode) {
 		parent.(*PolygonPropertyFuncExpr).Polygon = newNode.(Expr)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+		a.cur.current.AddStep(uint16(RefOfPolygonPropertyFuncExprPropertyDefArg))
+	}
 	if !a.rewriteExpr(node, node.PropertyDefArg, func(newNode, parent SQLNode) {
 		parent.(*PolygonPropertyFuncExpr).PropertyDefArg = newNode.(Expr)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+	}
 	if a.post != nil {
 		a.cur.replacer = replacer
 		a.cur.parent = parent
@@ -7328,6 +9515,8 @@ func (a *application) rewriteRefOfPolygonPropertyFuncExpr(parent SQLNode, node *
 	}
 	return true
 }
+
+// Function Generation Source: PtrToStructMethod
 func (a *application) rewriteRefOfPrepareStmt(parent SQLNode, node *PrepareStmt, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -7345,21 +9534,35 @@ func (a *application) rewriteRefOfPrepareStmt(parent SQLNode, node *PrepareStmt,
 			return true
 		}
 	}
+	if a.collectPaths {
+		a.cur.current.AddStep(uint16(RefOfPrepareStmtName))
+	}
 	if !a.rewriteIdentifierCI(node, node.Name, func(newNode, parent SQLNode) {
 		parent.(*PrepareStmt).Name = newNode.(IdentifierCI)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+		a.cur.current.AddStep(uint16(RefOfPrepareStmtStatement))
+	}
 	if !a.rewriteExpr(node, node.Statement, func(newNode, parent SQLNode) {
 		parent.(*PrepareStmt).Statement = newNode.(Expr)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+		a.cur.current.AddStep(uint16(RefOfPrepareStmtComments))
+	}
 	if !a.rewriteRefOfParsedComments(node, node.Comments, func(newNode, parent SQLNode) {
 		parent.(*PrepareStmt).Comments = newNode.(*ParsedComments)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+	}
 	if a.post != nil {
 		a.cur.replacer = replacer
 		a.cur.parent = parent
@@ -7370,6 +9573,8 @@ func (a *application) rewriteRefOfPrepareStmt(parent SQLNode, node *PrepareStmt,
 	}
 	return true
 }
+
+// Function Generation Source: PtrToStructMethod
 func (a *application) rewriteRefOfPurgeBinaryLogs(parent SQLNode, node *PurgeBinaryLogs, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -7399,6 +9604,8 @@ func (a *application) rewriteRefOfPurgeBinaryLogs(parent SQLNode, node *PurgeBin
 	}
 	return true
 }
+
+// Function Generation Source: PtrToStructMethod
 func (a *application) rewriteRefOfReferenceDefinition(parent SQLNode, node *ReferenceDefinition, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -7416,31 +9623,53 @@ func (a *application) rewriteRefOfReferenceDefinition(parent SQLNode, node *Refe
 			return true
 		}
 	}
+	if a.collectPaths {
+		a.cur.current.AddStep(uint16(RefOfReferenceDefinitionReferencedTable))
+	}
 	if !a.rewriteTableName(node, node.ReferencedTable, func(newNode, parent SQLNode) {
 		parent.(*ReferenceDefinition).ReferencedTable = newNode.(TableName)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+		a.cur.current.AddStep(uint16(RefOfReferenceDefinitionReferencedColumns))
+	}
 	if !a.rewriteColumns(node, node.ReferencedColumns, func(newNode, parent SQLNode) {
 		parent.(*ReferenceDefinition).ReferencedColumns = newNode.(Columns)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+		a.cur.current.AddStep(uint16(RefOfReferenceDefinitionMatch))
+	}
 	if !a.rewriteMatchAction(node, node.Match, func(newNode, parent SQLNode) {
 		parent.(*ReferenceDefinition).Match = newNode.(MatchAction)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+		a.cur.current.AddStep(uint16(RefOfReferenceDefinitionOnDelete))
+	}
 	if !a.rewriteReferenceAction(node, node.OnDelete, func(newNode, parent SQLNode) {
 		parent.(*ReferenceDefinition).OnDelete = newNode.(ReferenceAction)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+		a.cur.current.AddStep(uint16(RefOfReferenceDefinitionOnUpdate))
+	}
 	if !a.rewriteReferenceAction(node, node.OnUpdate, func(newNode, parent SQLNode) {
 		parent.(*ReferenceDefinition).OnUpdate = newNode.(ReferenceAction)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+	}
 	if a.post != nil {
 		a.cur.replacer = replacer
 		a.cur.parent = parent
@@ -7451,6 +9680,8 @@ func (a *application) rewriteRefOfReferenceDefinition(parent SQLNode, node *Refe
 	}
 	return true
 }
+
+// Function Generation Source: PtrToStructMethod
 func (a *application) rewriteRefOfRegexpInstrExpr(parent SQLNode, node *RegexpInstrExpr, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -7468,36 +9699,62 @@ func (a *application) rewriteRefOfRegexpInstrExpr(parent SQLNode, node *RegexpIn
 			return true
 		}
 	}
+	if a.collectPaths {
+		a.cur.current.AddStep(uint16(RefOfRegexpInstrExprExpr))
+	}
 	if !a.rewriteExpr(node, node.Expr, func(newNode, parent SQLNode) {
 		parent.(*RegexpInstrExpr).Expr = newNode.(Expr)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+		a.cur.current.AddStep(uint16(RefOfRegexpInstrExprPattern))
+	}
 	if !a.rewriteExpr(node, node.Pattern, func(newNode, parent SQLNode) {
 		parent.(*RegexpInstrExpr).Pattern = newNode.(Expr)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+		a.cur.current.AddStep(uint16(RefOfRegexpInstrExprPosition))
+	}
 	if !a.rewriteExpr(node, node.Position, func(newNode, parent SQLNode) {
 		parent.(*RegexpInstrExpr).Position = newNode.(Expr)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+		a.cur.current.AddStep(uint16(RefOfRegexpInstrExprOccurrence))
+	}
 	if !a.rewriteExpr(node, node.Occurrence, func(newNode, parent SQLNode) {
 		parent.(*RegexpInstrExpr).Occurrence = newNode.(Expr)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+		a.cur.current.AddStep(uint16(RefOfRegexpInstrExprReturnOption))
+	}
 	if !a.rewriteExpr(node, node.ReturnOption, func(newNode, parent SQLNode) {
 		parent.(*RegexpInstrExpr).ReturnOption = newNode.(Expr)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+		a.cur.current.AddStep(uint16(RefOfRegexpInstrExprMatchType))
+	}
 	if !a.rewriteExpr(node, node.MatchType, func(newNode, parent SQLNode) {
 		parent.(*RegexpInstrExpr).MatchType = newNode.(Expr)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+	}
 	if a.post != nil {
 		a.cur.replacer = replacer
 		a.cur.parent = parent
@@ -7508,6 +9765,8 @@ func (a *application) rewriteRefOfRegexpInstrExpr(parent SQLNode, node *RegexpIn
 	}
 	return true
 }
+
+// Function Generation Source: PtrToStructMethod
 func (a *application) rewriteRefOfRegexpLikeExpr(parent SQLNode, node *RegexpLikeExpr, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -7525,21 +9784,35 @@ func (a *application) rewriteRefOfRegexpLikeExpr(parent SQLNode, node *RegexpLik
 			return true
 		}
 	}
+	if a.collectPaths {
+		a.cur.current.AddStep(uint16(RefOfRegexpLikeExprExpr))
+	}
 	if !a.rewriteExpr(node, node.Expr, func(newNode, parent SQLNode) {
 		parent.(*RegexpLikeExpr).Expr = newNode.(Expr)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+		a.cur.current.AddStep(uint16(RefOfRegexpLikeExprPattern))
+	}
 	if !a.rewriteExpr(node, node.Pattern, func(newNode, parent SQLNode) {
 		parent.(*RegexpLikeExpr).Pattern = newNode.(Expr)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+		a.cur.current.AddStep(uint16(RefOfRegexpLikeExprMatchType))
+	}
 	if !a.rewriteExpr(node, node.MatchType, func(newNode, parent SQLNode) {
 		parent.(*RegexpLikeExpr).MatchType = newNode.(Expr)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+	}
 	if a.post != nil {
 		a.cur.replacer = replacer
 		a.cur.parent = parent
@@ -7550,6 +9823,8 @@ func (a *application) rewriteRefOfRegexpLikeExpr(parent SQLNode, node *RegexpLik
 	}
 	return true
 }
+
+// Function Generation Source: PtrToStructMethod
 func (a *application) rewriteRefOfRegexpReplaceExpr(parent SQLNode, node *RegexpReplaceExpr, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -7567,36 +9842,62 @@ func (a *application) rewriteRefOfRegexpReplaceExpr(parent SQLNode, node *Regexp
 			return true
 		}
 	}
+	if a.collectPaths {
+		a.cur.current.AddStep(uint16(RefOfRegexpReplaceExprExpr))
+	}
 	if !a.rewriteExpr(node, node.Expr, func(newNode, parent SQLNode) {
 		parent.(*RegexpReplaceExpr).Expr = newNode.(Expr)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+		a.cur.current.AddStep(uint16(RefOfRegexpReplaceExprPattern))
+	}
 	if !a.rewriteExpr(node, node.Pattern, func(newNode, parent SQLNode) {
 		parent.(*RegexpReplaceExpr).Pattern = newNode.(Expr)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+		a.cur.current.AddStep(uint16(RefOfRegexpReplaceExprRepl))
+	}
 	if !a.rewriteExpr(node, node.Repl, func(newNode, parent SQLNode) {
 		parent.(*RegexpReplaceExpr).Repl = newNode.(Expr)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+		a.cur.current.AddStep(uint16(RefOfRegexpReplaceExprOccurrence))
+	}
 	if !a.rewriteExpr(node, node.Occurrence, func(newNode, parent SQLNode) {
 		parent.(*RegexpReplaceExpr).Occurrence = newNode.(Expr)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+		a.cur.current.AddStep(uint16(RefOfRegexpReplaceExprPosition))
+	}
 	if !a.rewriteExpr(node, node.Position, func(newNode, parent SQLNode) {
 		parent.(*RegexpReplaceExpr).Position = newNode.(Expr)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+		a.cur.current.AddStep(uint16(RefOfRegexpReplaceExprMatchType))
+	}
 	if !a.rewriteExpr(node, node.MatchType, func(newNode, parent SQLNode) {
 		parent.(*RegexpReplaceExpr).MatchType = newNode.(Expr)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+	}
 	if a.post != nil {
 		a.cur.replacer = replacer
 		a.cur.parent = parent
@@ -7607,6 +9908,8 @@ func (a *application) rewriteRefOfRegexpReplaceExpr(parent SQLNode, node *Regexp
 	}
 	return true
 }
+
+// Function Generation Source: PtrToStructMethod
 func (a *application) rewriteRefOfRegexpSubstrExpr(parent SQLNode, node *RegexpSubstrExpr, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -7624,31 +9927,53 @@ func (a *application) rewriteRefOfRegexpSubstrExpr(parent SQLNode, node *RegexpS
 			return true
 		}
 	}
+	if a.collectPaths {
+		a.cur.current.AddStep(uint16(RefOfRegexpSubstrExprExpr))
+	}
 	if !a.rewriteExpr(node, node.Expr, func(newNode, parent SQLNode) {
 		parent.(*RegexpSubstrExpr).Expr = newNode.(Expr)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+		a.cur.current.AddStep(uint16(RefOfRegexpSubstrExprPattern))
+	}
 	if !a.rewriteExpr(node, node.Pattern, func(newNode, parent SQLNode) {
 		parent.(*RegexpSubstrExpr).Pattern = newNode.(Expr)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+		a.cur.current.AddStep(uint16(RefOfRegexpSubstrExprOccurrence))
+	}
 	if !a.rewriteExpr(node, node.Occurrence, func(newNode, parent SQLNode) {
 		parent.(*RegexpSubstrExpr).Occurrence = newNode.(Expr)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+		a.cur.current.AddStep(uint16(RefOfRegexpSubstrExprPosition))
+	}
 	if !a.rewriteExpr(node, node.Position, func(newNode, parent SQLNode) {
 		parent.(*RegexpSubstrExpr).Position = newNode.(Expr)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+		a.cur.current.AddStep(uint16(RefOfRegexpSubstrExprMatchType))
+	}
 	if !a.rewriteExpr(node, node.MatchType, func(newNode, parent SQLNode) {
 		parent.(*RegexpSubstrExpr).MatchType = newNode.(Expr)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+	}
 	if a.post != nil {
 		a.cur.replacer = replacer
 		a.cur.parent = parent
@@ -7659,6 +9984,8 @@ func (a *application) rewriteRefOfRegexpSubstrExpr(parent SQLNode, node *RegexpS
 	}
 	return true
 }
+
+// Function Generation Source: PtrToStructMethod
 func (a *application) rewriteRefOfRelease(parent SQLNode, node *Release, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -7676,11 +10003,17 @@ func (a *application) rewriteRefOfRelease(parent SQLNode, node *Release, replace
 			return true
 		}
 	}
+	if a.collectPaths {
+		a.cur.current.AddStep(uint16(RefOfReleaseName))
+	}
 	if !a.rewriteIdentifierCI(node, node.Name, func(newNode, parent SQLNode) {
 		parent.(*Release).Name = newNode.(IdentifierCI)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+	}
 	if a.post != nil {
 		a.cur.replacer = replacer
 		a.cur.parent = parent
@@ -7691,6 +10024,8 @@ func (a *application) rewriteRefOfRelease(parent SQLNode, node *Release, replace
 	}
 	return true
 }
+
+// Function Generation Source: PtrToStructMethod
 func (a *application) rewriteRefOfRenameColumn(parent SQLNode, node *RenameColumn, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -7708,16 +10043,26 @@ func (a *application) rewriteRefOfRenameColumn(parent SQLNode, node *RenameColum
 			return true
 		}
 	}
+	if a.collectPaths {
+		a.cur.current.AddStep(uint16(RefOfRenameColumnOldName))
+	}
 	if !a.rewriteRefOfColName(node, node.OldName, func(newNode, parent SQLNode) {
 		parent.(*RenameColumn).OldName = newNode.(*ColName)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+		a.cur.current.AddStep(uint16(RefOfRenameColumnNewName))
+	}
 	if !a.rewriteRefOfColName(node, node.NewName, func(newNode, parent SQLNode) {
 		parent.(*RenameColumn).NewName = newNode.(*ColName)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+	}
 	if a.post != nil {
 		a.cur.replacer = replacer
 		a.cur.parent = parent
@@ -7728,6 +10073,8 @@ func (a *application) rewriteRefOfRenameColumn(parent SQLNode, node *RenameColum
 	}
 	return true
 }
+
+// Function Generation Source: PtrToStructMethod
 func (a *application) rewriteRefOfRenameIndex(parent SQLNode, node *RenameIndex, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -7745,16 +10092,26 @@ func (a *application) rewriteRefOfRenameIndex(parent SQLNode, node *RenameIndex,
 			return true
 		}
 	}
+	if a.collectPaths {
+		a.cur.current.AddStep(uint16(RefOfRenameIndexOldName))
+	}
 	if !a.rewriteIdentifierCI(node, node.OldName, func(newNode, parent SQLNode) {
 		parent.(*RenameIndex).OldName = newNode.(IdentifierCI)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+		a.cur.current.AddStep(uint16(RefOfRenameIndexNewName))
+	}
 	if !a.rewriteIdentifierCI(node, node.NewName, func(newNode, parent SQLNode) {
 		parent.(*RenameIndex).NewName = newNode.(IdentifierCI)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+	}
 	if a.post != nil {
 		a.cur.replacer = replacer
 		a.cur.parent = parent
@@ -7765,6 +10122,8 @@ func (a *application) rewriteRefOfRenameIndex(parent SQLNode, node *RenameIndex,
 	}
 	return true
 }
+
+// Function Generation Source: PtrToStructMethod
 func (a *application) rewriteRefOfRenameTable(parent SQLNode, node *RenameTable, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -7794,6 +10153,8 @@ func (a *application) rewriteRefOfRenameTable(parent SQLNode, node *RenameTable,
 	}
 	return true
 }
+
+// Function Generation Source: PtrToStructMethod
 func (a *application) rewriteRefOfRenameTableName(parent SQLNode, node *RenameTableName, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -7811,11 +10172,17 @@ func (a *application) rewriteRefOfRenameTableName(parent SQLNode, node *RenameTa
 			return true
 		}
 	}
+	if a.collectPaths {
+		a.cur.current.AddStep(uint16(RefOfRenameTableNameTable))
+	}
 	if !a.rewriteTableName(node, node.Table, func(newNode, parent SQLNode) {
 		parent.(*RenameTableName).Table = newNode.(TableName)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+	}
 	if a.post != nil {
 		a.cur.replacer = replacer
 		a.cur.parent = parent
@@ -7826,6 +10193,8 @@ func (a *application) rewriteRefOfRenameTableName(parent SQLNode, node *RenameTa
 	}
 	return true
 }
+
+// Function Generation Source: PtrToStructMethod
 func (a *application) rewriteRefOfRevertMigration(parent SQLNode, node *RevertMigration, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -7843,11 +10212,17 @@ func (a *application) rewriteRefOfRevertMigration(parent SQLNode, node *RevertMi
 			return true
 		}
 	}
+	if a.collectPaths {
+		a.cur.current.AddStep(uint16(RefOfRevertMigrationComments))
+	}
 	if !a.rewriteRefOfParsedComments(node, node.Comments, func(newNode, parent SQLNode) {
 		parent.(*RevertMigration).Comments = newNode.(*ParsedComments)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+	}
 	if a.post != nil {
 		a.cur.replacer = replacer
 		a.cur.parent = parent
@@ -7858,6 +10233,8 @@ func (a *application) rewriteRefOfRevertMigration(parent SQLNode, node *RevertMi
 	}
 	return true
 }
+
+// Function Generation Source: PtrToStructMethod
 func (a *application) rewriteRefOfRollback(parent SQLNode, node *Rollback, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -7887,6 +10264,8 @@ func (a *application) rewriteRefOfRollback(parent SQLNode, node *Rollback, repla
 	}
 	return true
 }
+
+// Function Generation Source: StructMethod
 func (a *application) rewriteRootNode(parent SQLNode, node RootNode, replacer replacerFunc) bool {
 	if a.pre != nil {
 		a.cur.replacer = replacer
@@ -7901,11 +10280,17 @@ func (a *application) rewriteRootNode(parent SQLNode, node RootNode, replacer re
 			return true
 		}
 	}
+	if a.collectPaths {
+		a.cur.current.AddStep(uint16(RootNodeSQLNode))
+	}
 	if !a.rewriteSQLNode(node, node.SQLNode, func(newNode, parent SQLNode) {
 		panic("[BUG] tried to replace 'SQLNode' on 'RootNode'")
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+	}
 	if a.post != nil {
 		a.cur.replacer = replacer
 		a.cur.parent = parent
@@ -7916,6 +10301,8 @@ func (a *application) rewriteRootNode(parent SQLNode, node RootNode, replacer re
 	}
 	return true
 }
+
+// Function Generation Source: PtrToStructMethod
 func (a *application) rewriteRefOfRowAlias(parent SQLNode, node *RowAlias, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -7933,16 +10320,26 @@ func (a *application) rewriteRefOfRowAlias(parent SQLNode, node *RowAlias, repla
 			return true
 		}
 	}
+	if a.collectPaths {
+		a.cur.current.AddStep(uint16(RefOfRowAliasTableName))
+	}
 	if !a.rewriteIdentifierCS(node, node.TableName, func(newNode, parent SQLNode) {
 		parent.(*RowAlias).TableName = newNode.(IdentifierCS)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+		a.cur.current.AddStep(uint16(RefOfRowAliasColumns))
+	}
 	if !a.rewriteColumns(node, node.Columns, func(newNode, parent SQLNode) {
 		parent.(*RowAlias).Columns = newNode.(Columns)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+	}
 	if a.post != nil {
 		a.cur.replacer = replacer
 		a.cur.parent = parent
@@ -7953,6 +10350,8 @@ func (a *application) rewriteRefOfRowAlias(parent SQLNode, node *RowAlias, repla
 	}
 	return true
 }
+
+// Function Generation Source: PtrToStructMethod
 func (a *application) rewriteRefOfSRollback(parent SQLNode, node *SRollback, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -7970,11 +10369,17 @@ func (a *application) rewriteRefOfSRollback(parent SQLNode, node *SRollback, rep
 			return true
 		}
 	}
+	if a.collectPaths {
+		a.cur.current.AddStep(uint16(RefOfSRollbackName))
+	}
 	if !a.rewriteIdentifierCI(node, node.Name, func(newNode, parent SQLNode) {
 		parent.(*SRollback).Name = newNode.(IdentifierCI)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+	}
 	if a.post != nil {
 		a.cur.replacer = replacer
 		a.cur.parent = parent
@@ -7985,6 +10390,8 @@ func (a *application) rewriteRefOfSRollback(parent SQLNode, node *SRollback, rep
 	}
 	return true
 }
+
+// Function Generation Source: PtrToStructMethod
 func (a *application) rewriteRefOfSavepoint(parent SQLNode, node *Savepoint, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -8002,11 +10409,17 @@ func (a *application) rewriteRefOfSavepoint(parent SQLNode, node *Savepoint, rep
 			return true
 		}
 	}
+	if a.collectPaths {
+		a.cur.current.AddStep(uint16(RefOfSavepointName))
+	}
 	if !a.rewriteIdentifierCI(node, node.Name, func(newNode, parent SQLNode) {
 		parent.(*Savepoint).Name = newNode.(IdentifierCI)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+	}
 	if a.post != nil {
 		a.cur.replacer = replacer
 		a.cur.parent = parent
@@ -8017,6 +10430,8 @@ func (a *application) rewriteRefOfSavepoint(parent SQLNode, node *Savepoint, rep
 	}
 	return true
 }
+
+// Function Generation Source: PtrToStructMethod
 func (a *application) rewriteRefOfSelect(parent SQLNode, node *Select, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -8034,12 +10449,25 @@ func (a *application) rewriteRefOfSelect(parent SQLNode, node *Select, replacer
 			return true
 		}
 	}
+	if a.collectPaths {
+		a.cur.current.AddStep(uint16(RefOfSelectWith))
+	}
 	if !a.rewriteRefOfWith(node, node.With, func(newNode, parent SQLNode) {
 		parent.(*Select).With = newNode.(*With)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+	}
 	for x, el := range node.From {
+		if a.collectPaths {
+			if x == 0 {
+				a.cur.current.AddStepWithOffset(uint16(RefOfSelectFromOffset))
+			} else {
+				a.cur.current.ChangeOffset(x)
+			}
+		}
 		if !a.rewriteTableExpr(node, el, func(idx int) replacerFunc {
 			return func(newNode, parent SQLNode) {
 				parent.(*Select).From[idx] = newNode.(TableExpr)
@@ -8048,51 +10476,90 @@ func (a *application) rewriteRefOfSelect(parent SQLNode, node *Select, replacer
 			return false
 		}
 	}
+	if a.collectPaths && len(node.From) > 0 {
+		a.cur.current.Pop()
+		a.cur.current.AddStep(uint16(RefOfSelectComments))
+	}
 	if !a.rewriteRefOfParsedComments(node, node.Comments, func(newNode, parent SQLNode) {
 		parent.(*Select).Comments = newNode.(*ParsedComments)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+		a.cur.current.AddStep(uint16(RefOfSelectSelectExprs))
+	}
 	if !a.rewriteRefOfSelectExprs(node, node.SelectExprs, func(newNode, parent SQLNode) {
 		parent.(*Select).SelectExprs = newNode.(*SelectExprs)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+		a.cur.current.AddStep(uint16(RefOfSelectWhere))
+	}
 	if !a.rewriteRefOfWhere(node, node.Where, func(newNode, parent SQLNode) {
 		parent.(*Select).Where = newNode.(*Where)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+		a.cur.current.AddStep(uint16(RefOfSelectGroupBy))
+	}
 	if !a.rewriteRefOfGroupBy(node, node.GroupBy, func(newNode, parent SQLNode) {
 		parent.(*Select).GroupBy = newNode.(*GroupBy)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+		a.cur.current.AddStep(uint16(RefOfSelectHaving))
+	}
 	if !a.rewriteRefOfWhere(node, node.Having, func(newNode, parent SQLNode) {
 		parent.(*Select).Having = newNode.(*Where)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+		a.cur.current.AddStep(uint16(RefOfSelectWindows))
+	}
 	if !a.rewriteNamedWindows(node, node.Windows, func(newNode, parent SQLNode) {
 		parent.(*Select).Windows = newNode.(NamedWindows)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+		a.cur.current.AddStep(uint16(RefOfSelectOrderBy))
+	}
 	if !a.rewriteOrderBy(node, node.OrderBy, func(newNode, parent SQLNode) {
 		parent.(*Select).OrderBy = newNode.(OrderBy)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+		a.cur.current.AddStep(uint16(RefOfSelectLimit))
+	}
 	if !a.rewriteRefOfLimit(node, node.Limit, func(newNode, parent SQLNode) {
 		parent.(*Select).Limit = newNode.(*Limit)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+		a.cur.current.AddStep(uint16(RefOfSelectInto))
+	}
 	if !a.rewriteRefOfSelectInto(node, node.Into, func(newNode, parent SQLNode) {
 		parent.(*Select).Into = newNode.(*SelectInto)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+	}
 	if a.post != nil {
 		a.cur.replacer = replacer
 		a.cur.parent = parent
@@ -8103,6 +10570,8 @@ func (a *application) rewriteRefOfSelect(parent SQLNode, node *Select, replacer
 	}
 	return true
 }
+
+// Function Generation Source: PtrToStructMethod
 func (a *application) rewriteRefOfSelectExprs(parent SQLNode, node *SelectExprs, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -8121,6 +10590,13 @@ func (a *application) rewriteRefOfSelectExprs(parent SQLNode, node *SelectExprs,
 		}
 	}
 	for x, el := range node.Exprs {
+		if a.collectPaths {
+			if x == 0 {
+				a.cur.current.AddStepWithOffset(uint16(RefOfSelectExprsExprsOffset))
+			} else {
+				a.cur.current.ChangeOffset(x)
+			}
+		}
 		if !a.rewriteSelectExpr(node, el, func(idx int) replacerFunc {
 			return func(newNode, parent SQLNode) {
 				parent.(*SelectExprs).Exprs[idx] = newNode.(SelectExpr)
@@ -8129,6 +10605,9 @@ func (a *application) rewriteRefOfSelectExprs(parent SQLNode, node *SelectExprs,
 			return false
 		}
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+	}
 	if a.post != nil {
 		a.cur.replacer = replacer
 		a.cur.parent = parent
@@ -8139,6 +10618,8 @@ func (a *application) rewriteRefOfSelectExprs(parent SQLNode, node *SelectExprs,
 	}
 	return true
 }
+
+// Function Generation Source: PtrToStructMethod
 func (a *application) rewriteRefOfSelectInto(parent SQLNode, node *SelectInto, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -8168,6 +10649,8 @@ func (a *application) rewriteRefOfSelectInto(parent SQLNode, node *SelectInto, r
 	}
 	return true
 }
+
+// Function Generation Source: PtrToStructMethod
 func (a *application) rewriteRefOfSet(parent SQLNode, node *Set, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -8185,16 +10668,26 @@ func (a *application) rewriteRefOfSet(parent SQLNode, node *Set, replacer replac
 			return true
 		}
 	}
+	if a.collectPaths {
+		a.cur.current.AddStep(uint16(RefOfSetComments))
+	}
 	if !a.rewriteRefOfParsedComments(node, node.Comments, func(newNode, parent SQLNode) {
 		parent.(*Set).Comments = newNode.(*ParsedComments)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+		a.cur.current.AddStep(uint16(RefOfSetExprs))
+	}
 	if !a.rewriteSetExprs(node, node.Exprs, func(newNode, parent SQLNode) {
 		parent.(*Set).Exprs = newNode.(SetExprs)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+	}
 	if a.post != nil {
 		a.cur.replacer = replacer
 		a.cur.parent = parent
@@ -8205,6 +10698,8 @@ func (a *application) rewriteRefOfSet(parent SQLNode, node *Set, replacer replac
 	}
 	return true
 }
+
+// Function Generation Source: PtrToStructMethod
 func (a *application) rewriteRefOfSetExpr(parent SQLNode, node *SetExpr, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -8222,16 +10717,26 @@ func (a *application) rewriteRefOfSetExpr(parent SQLNode, node *SetExpr, replace
 			return true
 		}
 	}
+	if a.collectPaths {
+		a.cur.current.AddStep(uint16(RefOfSetExprVar))
+	}
 	if !a.rewriteRefOfVariable(node, node.Var, func(newNode, parent SQLNode) {
 		parent.(*SetExpr).Var = newNode.(*Variable)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+		a.cur.current.AddStep(uint16(RefOfSetExprExpr))
+	}
 	if !a.rewriteExpr(node, node.Expr, func(newNode, parent SQLNode) {
 		parent.(*SetExpr).Expr = newNode.(Expr)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+	}
 	if a.post != nil {
 		a.cur.replacer = replacer
 		a.cur.parent = parent
@@ -8242,6 +10747,8 @@ func (a *application) rewriteRefOfSetExpr(parent SQLNode, node *SetExpr, replace
 	}
 	return true
 }
+
+// Function Generation Source: SliceMethod
 func (a *application) rewriteSetExprs(parent SQLNode, node SetExprs, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -8260,6 +10767,13 @@ func (a *application) rewriteSetExprs(parent SQLNode, node SetExprs, replacer re
 		}
 	}
 	for x, el := range node {
+		if a.collectPaths {
+			if x == 0 {
+				a.cur.current.AddStepWithOffset(uint16(SetExprsOffset))
+			} else {
+				a.cur.current.ChangeOffset(x)
+			}
+		}
 		if !a.rewriteRefOfSetExpr(node, el, func(idx int) replacerFunc {
 			return func(newNode, parent SQLNode) {
 				parent.(SetExprs)[idx] = newNode.(*SetExpr)
@@ -8268,6 +10782,9 @@ func (a *application) rewriteSetExprs(parent SQLNode, node SetExprs, replacer re
 			return false
 		}
 	}
+	if a.collectPaths && len(node) > 0 {
+		a.cur.current.Pop()
+	}
 	if a.post != nil {
 		a.cur.replacer = replacer
 		a.cur.parent = parent
@@ -8278,6 +10795,8 @@ func (a *application) rewriteSetExprs(parent SQLNode, node SetExprs, replacer re
 	}
 	return true
 }
+
+// Function Generation Source: PtrToStructMethod
 func (a *application) rewriteRefOfShow(parent SQLNode, node *Show, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -8295,11 +10814,17 @@ func (a *application) rewriteRefOfShow(parent SQLNode, node *Show, replacer repl
 			return true
 		}
 	}
+	if a.collectPaths {
+		a.cur.current.AddStep(uint16(RefOfShowInternal))
+	}
 	if !a.rewriteShowInternal(node, node.Internal, func(newNode, parent SQLNode) {
 		parent.(*Show).Internal = newNode.(ShowInternal)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+	}
 	if a.post != nil {
 		a.cur.replacer = replacer
 		a.cur.parent = parent
@@ -8310,6 +10835,8 @@ func (a *application) rewriteRefOfShow(parent SQLNode, node *Show, replacer repl
 	}
 	return true
 }
+
+// Function Generation Source: PtrToStructMethod
 func (a *application) rewriteRefOfShowBasic(parent SQLNode, node *ShowBasic, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -8327,21 +10854,35 @@ func (a *application) rewriteRefOfShowBasic(parent SQLNode, node *ShowBasic, rep
 			return true
 		}
 	}
+	if a.collectPaths {
+		a.cur.current.AddStep(uint16(RefOfShowBasicTbl))
+	}
 	if !a.rewriteTableName(node, node.Tbl, func(newNode, parent SQLNode) {
 		parent.(*ShowBasic).Tbl = newNode.(TableName)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+		a.cur.current.AddStep(uint16(RefOfShowBasicDbName))
+	}
 	if !a.rewriteIdentifierCS(node, node.DbName, func(newNode, parent SQLNode) {
 		parent.(*ShowBasic).DbName = newNode.(IdentifierCS)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+		a.cur.current.AddStep(uint16(RefOfShowBasicFilter))
+	}
 	if !a.rewriteRefOfShowFilter(node, node.Filter, func(newNode, parent SQLNode) {
 		parent.(*ShowBasic).Filter = newNode.(*ShowFilter)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+	}
 	if a.post != nil {
 		a.cur.replacer = replacer
 		a.cur.parent = parent
@@ -8352,6 +10893,8 @@ func (a *application) rewriteRefOfShowBasic(parent SQLNode, node *ShowBasic, rep
 	}
 	return true
 }
+
+// Function Generation Source: PtrToStructMethod
 func (a *application) rewriteRefOfShowCreate(parent SQLNode, node *ShowCreate, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -8369,11 +10912,17 @@ func (a *application) rewriteRefOfShowCreate(parent SQLNode, node *ShowCreate, r
 			return true
 		}
 	}
+	if a.collectPaths {
+		a.cur.current.AddStep(uint16(RefOfShowCreateOp))
+	}
 	if !a.rewriteTableName(node, node.Op, func(newNode, parent SQLNode) {
 		parent.(*ShowCreate).Op = newNode.(TableName)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+	}
 	if a.post != nil {
 		a.cur.replacer = replacer
 		a.cur.parent = parent
@@ -8384,6 +10933,8 @@ func (a *application) rewriteRefOfShowCreate(parent SQLNode, node *ShowCreate, r
 	}
 	return true
 }
+
+// Function Generation Source: PtrToStructMethod
 func (a *application) rewriteRefOfShowFilter(parent SQLNode, node *ShowFilter, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -8401,11 +10952,17 @@ func (a *application) rewriteRefOfShowFilter(parent SQLNode, node *ShowFilter, r
 			return true
 		}
 	}
+	if a.collectPaths {
+		a.cur.current.AddStep(uint16(RefOfShowFilterFilter))
+	}
 	if !a.rewriteExpr(node, node.Filter, func(newNode, parent SQLNode) {
 		parent.(*ShowFilter).Filter = newNode.(Expr)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+	}
 	if a.post != nil {
 		a.cur.replacer = replacer
 		a.cur.parent = parent
@@ -8416,6 +10973,8 @@ func (a *application) rewriteRefOfShowFilter(parent SQLNode, node *ShowFilter, r
 	}
 	return true
 }
+
+// Function Generation Source: PtrToStructMethod
 func (a *application) rewriteRefOfShowMigrationLogs(parent SQLNode, node *ShowMigrationLogs, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -8433,11 +10992,17 @@ func (a *application) rewriteRefOfShowMigrationLogs(parent SQLNode, node *ShowMi
 			return true
 		}
 	}
+	if a.collectPaths {
+		a.cur.current.AddStep(uint16(RefOfShowMigrationLogsComments))
+	}
 	if !a.rewriteRefOfParsedComments(node, node.Comments, func(newNode, parent SQLNode) {
 		parent.(*ShowMigrationLogs).Comments = newNode.(*ParsedComments)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+	}
 	if a.post != nil {
 		a.cur.replacer = replacer
 		a.cur.parent = parent
@@ -8448,6 +11013,8 @@ func (a *application) rewriteRefOfShowMigrationLogs(parent SQLNode, node *ShowMi
 	}
 	return true
 }
+
+// Function Generation Source: PtrToStructMethod
 func (a *application) rewriteRefOfShowOther(parent SQLNode, node *ShowOther, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -8477,6 +11044,8 @@ func (a *application) rewriteRefOfShowOther(parent SQLNode, node *ShowOther, rep
 	}
 	return true
 }
+
+// Function Generation Source: PtrToStructMethod
 func (a *application) rewriteRefOfShowThrottledApps(parent SQLNode, node *ShowThrottledApps, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -8506,6 +11075,8 @@ func (a *application) rewriteRefOfShowThrottledApps(parent SQLNode, node *ShowTh
 	}
 	return true
 }
+
+// Function Generation Source: PtrToStructMethod
 func (a *application) rewriteRefOfShowThrottlerStatus(parent SQLNode, node *ShowThrottlerStatus, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -8535,6 +11106,8 @@ func (a *application) rewriteRefOfShowThrottlerStatus(parent SQLNode, node *Show
 	}
 	return true
 }
+
+// Function Generation Source: PtrToStructMethod
 func (a *application) rewriteRefOfShowTransactionStatus(parent SQLNode, node *ShowTransactionStatus, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -8564,6 +11137,8 @@ func (a *application) rewriteRefOfShowTransactionStatus(parent SQLNode, node *Sh
 	}
 	return true
 }
+
+// Function Generation Source: PtrToStructMethod
 func (a *application) rewriteRefOfStarExpr(parent SQLNode, node *StarExpr, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -8581,11 +11156,17 @@ func (a *application) rewriteRefOfStarExpr(parent SQLNode, node *StarExpr, repla
 			return true
 		}
 	}
+	if a.collectPaths {
+		a.cur.current.AddStep(uint16(RefOfStarExprTableName))
+	}
 	if !a.rewriteTableName(node, node.TableName, func(newNode, parent SQLNode) {
 		parent.(*StarExpr).TableName = newNode.(TableName)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+	}
 	if a.post != nil {
 		a.cur.replacer = replacer
 		a.cur.parent = parent
@@ -8596,6 +11177,8 @@ func (a *application) rewriteRefOfStarExpr(parent SQLNode, node *StarExpr, repla
 	}
 	return true
 }
+
+// Function Generation Source: PtrToStructMethod
 func (a *application) rewriteRefOfStd(parent SQLNode, node *Std, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -8613,16 +11196,26 @@ func (a *application) rewriteRefOfStd(parent SQLNode, node *Std, replacer replac
 			return true
 		}
 	}
+	if a.collectPaths {
+		a.cur.current.AddStep(uint16(RefOfStdArg))
+	}
 	if !a.rewriteExpr(node, node.Arg, func(newNode, parent SQLNode) {
 		parent.(*Std).Arg = newNode.(Expr)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+		a.cur.current.AddStep(uint16(RefOfStdOverClause))
+	}
 	if !a.rewriteRefOfOverClause(node, node.OverClause, func(newNode, parent SQLNode) {
 		parent.(*Std).OverClause = newNode.(*OverClause)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+	}
 	if a.post != nil {
 		a.cur.replacer = replacer
 		a.cur.parent = parent
@@ -8633,6 +11226,8 @@ func (a *application) rewriteRefOfStd(parent SQLNode, node *Std, replacer replac
 	}
 	return true
 }
+
+// Function Generation Source: PtrToStructMethod
 func (a *application) rewriteRefOfStdDev(parent SQLNode, node *StdDev, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -8650,16 +11245,26 @@ func (a *application) rewriteRefOfStdDev(parent SQLNode, node *StdDev, replacer
 			return true
 		}
 	}
+	if a.collectPaths {
+		a.cur.current.AddStep(uint16(RefOfStdDevArg))
+	}
 	if !a.rewriteExpr(node, node.Arg, func(newNode, parent SQLNode) {
 		parent.(*StdDev).Arg = newNode.(Expr)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+		a.cur.current.AddStep(uint16(RefOfStdDevOverClause))
+	}
 	if !a.rewriteRefOfOverClause(node, node.OverClause, func(newNode, parent SQLNode) {
 		parent.(*StdDev).OverClause = newNode.(*OverClause)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+	}
 	if a.post != nil {
 		a.cur.replacer = replacer
 		a.cur.parent = parent
@@ -8670,6 +11275,8 @@ func (a *application) rewriteRefOfStdDev(parent SQLNode, node *StdDev, replacer
 	}
 	return true
 }
+
+// Function Generation Source: PtrToStructMethod
 func (a *application) rewriteRefOfStdPop(parent SQLNode, node *StdPop, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -8687,16 +11294,26 @@ func (a *application) rewriteRefOfStdPop(parent SQLNode, node *StdPop, replacer
 			return true
 		}
 	}
+	if a.collectPaths {
+		a.cur.current.AddStep(uint16(RefOfStdPopArg))
+	}
 	if !a.rewriteExpr(node, node.Arg, func(newNode, parent SQLNode) {
 		parent.(*StdPop).Arg = newNode.(Expr)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+		a.cur.current.AddStep(uint16(RefOfStdPopOverClause))
+	}
 	if !a.rewriteRefOfOverClause(node, node.OverClause, func(newNode, parent SQLNode) {
 		parent.(*StdPop).OverClause = newNode.(*OverClause)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+	}
 	if a.post != nil {
 		a.cur.replacer = replacer
 		a.cur.parent = parent
@@ -8707,6 +11324,8 @@ func (a *application) rewriteRefOfStdPop(parent SQLNode, node *StdPop, replacer
 	}
 	return true
 }
+
+// Function Generation Source: PtrToStructMethod
 func (a *application) rewriteRefOfStdSamp(parent SQLNode, node *StdSamp, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -8724,16 +11343,26 @@ func (a *application) rewriteRefOfStdSamp(parent SQLNode, node *StdSamp, replace
 			return true
 		}
 	}
+	if a.collectPaths {
+		a.cur.current.AddStep(uint16(RefOfStdSampArg))
+	}
 	if !a.rewriteExpr(node, node.Arg, func(newNode, parent SQLNode) {
 		parent.(*StdSamp).Arg = newNode.(Expr)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+		a.cur.current.AddStep(uint16(RefOfStdSampOverClause))
+	}
 	if !a.rewriteRefOfOverClause(node, node.OverClause, func(newNode, parent SQLNode) {
 		parent.(*StdSamp).OverClause = newNode.(*OverClause)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+	}
 	if a.post != nil {
 		a.cur.replacer = replacer
 		a.cur.parent = parent
@@ -8744,6 +11373,8 @@ func (a *application) rewriteRefOfStdSamp(parent SQLNode, node *StdSamp, replace
 	}
 	return true
 }
+
+// Function Generation Source: PtrToStructMethod
 func (a *application) rewriteRefOfStream(parent SQLNode, node *Stream, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -8761,21 +11392,35 @@ func (a *application) rewriteRefOfStream(parent SQLNode, node *Stream, replacer
 			return true
 		}
 	}
+	if a.collectPaths {
+		a.cur.current.AddStep(uint16(RefOfStreamComments))
+	}
 	if !a.rewriteRefOfParsedComments(node, node.Comments, func(newNode, parent SQLNode) {
 		parent.(*Stream).Comments = newNode.(*ParsedComments)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+		a.cur.current.AddStep(uint16(RefOfStreamSelectExpr))
+	}
 	if !a.rewriteSelectExpr(node, node.SelectExpr, func(newNode, parent SQLNode) {
 		parent.(*Stream).SelectExpr = newNode.(SelectExpr)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+		a.cur.current.AddStep(uint16(RefOfStreamTable))
+	}
 	if !a.rewriteTableName(node, node.Table, func(newNode, parent SQLNode) {
 		parent.(*Stream).Table = newNode.(TableName)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+	}
 	if a.post != nil {
 		a.cur.replacer = replacer
 		a.cur.parent = parent
@@ -8786,6 +11431,8 @@ func (a *application) rewriteRefOfStream(parent SQLNode, node *Stream, replacer
 	}
 	return true
 }
+
+// Function Generation Source: PtrToStructMethod
 func (a *application) rewriteRefOfSubPartition(parent SQLNode, node *SubPartition, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -8803,16 +11450,26 @@ func (a *application) rewriteRefOfSubPartition(parent SQLNode, node *SubPartitio
 			return true
 		}
 	}
+	if a.collectPaths {
+		a.cur.current.AddStep(uint16(RefOfSubPartitionColList))
+	}
 	if !a.rewriteColumns(node, node.ColList, func(newNode, parent SQLNode) {
 		parent.(*SubPartition).ColList = newNode.(Columns)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+		a.cur.current.AddStep(uint16(RefOfSubPartitionExpr))
+	}
 	if !a.rewriteExpr(node, node.Expr, func(newNode, parent SQLNode) {
 		parent.(*SubPartition).Expr = newNode.(Expr)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+	}
 	if a.post != nil {
 		a.cur.replacer = replacer
 		a.cur.parent = parent
@@ -8823,6 +11480,8 @@ func (a *application) rewriteRefOfSubPartition(parent SQLNode, node *SubPartitio
 	}
 	return true
 }
+
+// Function Generation Source: PtrToStructMethod
 func (a *application) rewriteRefOfSubPartitionDefinition(parent SQLNode, node *SubPartitionDefinition, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -8840,16 +11499,26 @@ func (a *application) rewriteRefOfSubPartitionDefinition(parent SQLNode, node *S
 			return true
 		}
 	}
+	if a.collectPaths {
+		a.cur.current.AddStep(uint16(RefOfSubPartitionDefinitionName))
+	}
 	if !a.rewriteIdentifierCI(node, node.Name, func(newNode, parent SQLNode) {
 		parent.(*SubPartitionDefinition).Name = newNode.(IdentifierCI)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+		a.cur.current.AddStep(uint16(RefOfSubPartitionDefinitionOptions))
+	}
 	if !a.rewriteRefOfSubPartitionDefinitionOptions(node, node.Options, func(newNode, parent SQLNode) {
 		parent.(*SubPartitionDefinition).Options = newNode.(*SubPartitionDefinitionOptions)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+	}
 	if a.post != nil {
 		a.cur.replacer = replacer
 		a.cur.parent = parent
@@ -8860,6 +11529,8 @@ func (a *application) rewriteRefOfSubPartitionDefinition(parent SQLNode, node *S
 	}
 	return true
 }
+
+// Function Generation Source: PtrToStructMethod
 func (a *application) rewriteRefOfSubPartitionDefinitionOptions(parent SQLNode, node *SubPartitionDefinitionOptions, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -8877,26 +11548,44 @@ func (a *application) rewriteRefOfSubPartitionDefinitionOptions(parent SQLNode,
 			return true
 		}
 	}
+	if a.collectPaths {
+		a.cur.current.AddStep(uint16(RefOfSubPartitionDefinitionOptionsComment))
+	}
 	if !a.rewriteRefOfLiteral(node, node.Comment, func(newNode, parent SQLNode) {
 		parent.(*SubPartitionDefinitionOptions).Comment = newNode.(*Literal)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+		a.cur.current.AddStep(uint16(RefOfSubPartitionDefinitionOptionsEngine))
+	}
 	if !a.rewriteRefOfPartitionEngine(node, node.Engine, func(newNode, parent SQLNode) {
 		parent.(*SubPartitionDefinitionOptions).Engine = newNode.(*PartitionEngine)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+		a.cur.current.AddStep(uint16(RefOfSubPartitionDefinitionOptionsDataDirectory))
+	}
 	if !a.rewriteRefOfLiteral(node, node.DataDirectory, func(newNode, parent SQLNode) {
 		parent.(*SubPartitionDefinitionOptions).DataDirectory = newNode.(*Literal)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+		a.cur.current.AddStep(uint16(RefOfSubPartitionDefinitionOptionsIndexDirectory))
+	}
 	if !a.rewriteRefOfLiteral(node, node.IndexDirectory, func(newNode, parent SQLNode) {
 		parent.(*SubPartitionDefinitionOptions).IndexDirectory = newNode.(*Literal)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+	}
 	if a.post != nil {
 		a.cur.replacer = replacer
 		a.cur.parent = parent
@@ -8907,6 +11596,8 @@ func (a *application) rewriteRefOfSubPartitionDefinitionOptions(parent SQLNode,
 	}
 	return true
 }
+
+// Function Generation Source: SliceMethod
 func (a *application) rewriteSubPartitionDefinitions(parent SQLNode, node SubPartitionDefinitions, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -8925,6 +11616,13 @@ func (a *application) rewriteSubPartitionDefinitions(parent SQLNode, node SubPar
 		}
 	}
 	for x, el := range node {
+		if a.collectPaths {
+			if x == 0 {
+				a.cur.current.AddStepWithOffset(uint16(SubPartitionDefinitionsOffset))
+			} else {
+				a.cur.current.ChangeOffset(x)
+			}
+		}
 		if !a.rewriteRefOfSubPartitionDefinition(node, el, func(idx int) replacerFunc {
 			return func(newNode, parent SQLNode) {
 				parent.(SubPartitionDefinitions)[idx] = newNode.(*SubPartitionDefinition)
@@ -8933,6 +11631,9 @@ func (a *application) rewriteSubPartitionDefinitions(parent SQLNode, node SubPar
 			return false
 		}
 	}
+	if a.collectPaths && len(node) > 0 {
+		a.cur.current.Pop()
+	}
 	if a.post != nil {
 		a.cur.replacer = replacer
 		a.cur.parent = parent
@@ -8943,6 +11644,8 @@ func (a *application) rewriteSubPartitionDefinitions(parent SQLNode, node SubPar
 	}
 	return true
 }
+
+// Function Generation Source: PtrToStructMethod
 func (a *application) rewriteRefOfSubquery(parent SQLNode, node *Subquery, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -8960,11 +11663,17 @@ func (a *application) rewriteRefOfSubquery(parent SQLNode, node *Subquery, repla
 			return true
 		}
 	}
+	if a.collectPaths {
+		a.cur.current.AddStep(uint16(RefOfSubquerySelect))
+	}
 	if !a.rewriteTableStatement(node, node.Select, func(newNode, parent SQLNode) {
 		parent.(*Subquery).Select = newNode.(TableStatement)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+	}
 	if a.post != nil {
 		a.cur.replacer = replacer
 		a.cur.parent = parent
@@ -8975,6 +11684,8 @@ func (a *application) rewriteRefOfSubquery(parent SQLNode, node *Subquery, repla
 	}
 	return true
 }
+
+// Function Generation Source: PtrToStructMethod
 func (a *application) rewriteRefOfSubstrExpr(parent SQLNode, node *SubstrExpr, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -8992,21 +11703,35 @@ func (a *application) rewriteRefOfSubstrExpr(parent SQLNode, node *SubstrExpr, r
 			return true
 		}
 	}
+	if a.collectPaths {
+		a.cur.current.AddStep(uint16(RefOfSubstrExprName))
+	}
 	if !a.rewriteExpr(node, node.Name, func(newNode, parent SQLNode) {
 		parent.(*SubstrExpr).Name = newNode.(Expr)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+		a.cur.current.AddStep(uint16(RefOfSubstrExprFrom))
+	}
 	if !a.rewriteExpr(node, node.From, func(newNode, parent SQLNode) {
 		parent.(*SubstrExpr).From = newNode.(Expr)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+		a.cur.current.AddStep(uint16(RefOfSubstrExprTo))
+	}
 	if !a.rewriteExpr(node, node.To, func(newNode, parent SQLNode) {
 		parent.(*SubstrExpr).To = newNode.(Expr)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+	}
 	if a.post != nil {
 		a.cur.replacer = replacer
 		a.cur.parent = parent
@@ -9017,6 +11742,8 @@ func (a *application) rewriteRefOfSubstrExpr(parent SQLNode, node *SubstrExpr, r
 	}
 	return true
 }
+
+// Function Generation Source: PtrToStructMethod
 func (a *application) rewriteRefOfSum(parent SQLNode, node *Sum, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -9034,16 +11761,26 @@ func (a *application) rewriteRefOfSum(parent SQLNode, node *Sum, replacer replac
 			return true
 		}
 	}
+	if a.collectPaths {
+		a.cur.current.AddStep(uint16(RefOfSumArg))
+	}
 	if !a.rewriteExpr(node, node.Arg, func(newNode, parent SQLNode) {
 		parent.(*Sum).Arg = newNode.(Expr)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+		a.cur.current.AddStep(uint16(RefOfSumOverClause))
+	}
 	if !a.rewriteRefOfOverClause(node, node.OverClause, func(newNode, parent SQLNode) {
 		parent.(*Sum).OverClause = newNode.(*OverClause)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+	}
 	if a.post != nil {
 		a.cur.replacer = replacer
 		a.cur.parent = parent
@@ -9054,6 +11791,8 @@ func (a *application) rewriteRefOfSum(parent SQLNode, node *Sum, replacer replac
 	}
 	return true
 }
+
+// Function Generation Source: SliceMethod
 func (a *application) rewriteTableExprs(parent SQLNode, node TableExprs, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -9072,6 +11811,13 @@ func (a *application) rewriteTableExprs(parent SQLNode, node TableExprs, replace
 		}
 	}
 	for x, el := range node {
+		if a.collectPaths {
+			if x == 0 {
+				a.cur.current.AddStepWithOffset(uint16(TableExprsOffset))
+			} else {
+				a.cur.current.ChangeOffset(x)
+			}
+		}
 		if !a.rewriteTableExpr(node, el, func(idx int) replacerFunc {
 			return func(newNode, parent SQLNode) {
 				parent.(TableExprs)[idx] = newNode.(TableExpr)
@@ -9080,6 +11826,9 @@ func (a *application) rewriteTableExprs(parent SQLNode, node TableExprs, replace
 			return false
 		}
 	}
+	if a.collectPaths && len(node) > 0 {
+		a.cur.current.Pop()
+	}
 	if a.post != nil {
 		a.cur.replacer = replacer
 		a.cur.parent = parent
@@ -9090,6 +11839,8 @@ func (a *application) rewriteTableExprs(parent SQLNode, node TableExprs, replace
 	}
 	return true
 }
+
+// Function Generation Source: StructMethod
 func (a *application) rewriteTableName(parent SQLNode, node TableName, replacer replacerFunc) bool {
 	if a.pre != nil {
 		a.cur.replacer = replacer
@@ -9104,16 +11855,26 @@ func (a *application) rewriteTableName(parent SQLNode, node TableName, replacer
 			return true
 		}
 	}
+	if a.collectPaths {
+		a.cur.current.AddStep(uint16(TableNameName))
+	}
 	if !a.rewriteIdentifierCS(node, node.Name, func(newNode, parent SQLNode) {
 		panic("[BUG] tried to replace 'Name' on 'TableName'")
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+		a.cur.current.AddStep(uint16(TableNameQualifier))
+	}
 	if !a.rewriteIdentifierCS(node, node.Qualifier, func(newNode, parent SQLNode) {
 		panic("[BUG] tried to replace 'Qualifier' on 'TableName'")
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+	}
 	if a.post != nil {
 		a.cur.replacer = replacer
 		a.cur.parent = parent
@@ -9124,6 +11885,8 @@ func (a *application) rewriteTableName(parent SQLNode, node TableName, replacer
 	}
 	return true
 }
+
+// Function Generation Source: SliceMethod
 func (a *application) rewriteTableNames(parent SQLNode, node TableNames, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -9142,6 +11905,13 @@ func (a *application) rewriteTableNames(parent SQLNode, node TableNames, replace
 		}
 	}
 	for x, el := range node {
+		if a.collectPaths {
+			if x == 0 {
+				a.cur.current.AddStepWithOffset(uint16(TableNamesOffset))
+			} else {
+				a.cur.current.ChangeOffset(x)
+			}
+		}
 		if !a.rewriteTableName(node, el, func(idx int) replacerFunc {
 			return func(newNode, parent SQLNode) {
 				parent.(TableNames)[idx] = newNode.(TableName)
@@ -9150,6 +11920,9 @@ func (a *application) rewriteTableNames(parent SQLNode, node TableNames, replace
 			return false
 		}
 	}
+	if a.collectPaths && len(node) > 0 {
+		a.cur.current.Pop()
+	}
 	if a.post != nil {
 		a.cur.replacer = replacer
 		a.cur.parent = parent
@@ -9160,6 +11933,8 @@ func (a *application) rewriteTableNames(parent SQLNode, node TableNames, replace
 	}
 	return true
 }
+
+// Function Generation Source: SliceMethod
 func (a *application) rewriteTableOptions(parent SQLNode, node TableOptions, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -9189,6 +11964,8 @@ func (a *application) rewriteTableOptions(parent SQLNode, node TableOptions, rep
 	}
 	return true
 }
+
+// Function Generation Source: PtrToStructMethod
 func (a *application) rewriteRefOfTableSpec(parent SQLNode, node *TableSpec, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -9207,6 +11984,13 @@ func (a *application) rewriteRefOfTableSpec(parent SQLNode, node *TableSpec, rep
 		}
 	}
 	for x, el := range node.Columns {
+		if a.collectPaths {
+			if x == 0 {
+				a.cur.current.AddStepWithOffset(uint16(RefOfTableSpecColumnsOffset))
+			} else {
+				a.cur.current.ChangeOffset(x)
+			}
+		}
 		if !a.rewriteRefOfColumnDefinition(node, el, func(idx int) replacerFunc {
 			return func(newNode, parent SQLNode) {
 				parent.(*TableSpec).Columns[idx] = newNode.(*ColumnDefinition)
@@ -9215,7 +11999,17 @@ func (a *application) rewriteRefOfTableSpec(parent SQLNode, node *TableSpec, rep
 			return false
 		}
 	}
+	if a.collectPaths && len(node.Columns) > 0 {
+		a.cur.current.Pop()
+	}
 	for x, el := range node.Indexes {
+		if a.collectPaths {
+			if x == 0 {
+				a.cur.current.AddStepWithOffset(uint16(RefOfTableSpecIndexesOffset))
+			} else {
+				a.cur.current.ChangeOffset(x)
+			}
+		}
 		if !a.rewriteRefOfIndexDefinition(node, el, func(idx int) replacerFunc {
 			return func(newNode, parent SQLNode) {
 				parent.(*TableSpec).Indexes[idx] = newNode.(*IndexDefinition)
@@ -9224,7 +12018,17 @@ func (a *application) rewriteRefOfTableSpec(parent SQLNode, node *TableSpec, rep
 			return false
 		}
 	}
+	if a.collectPaths && len(node.Indexes) > 0 {
+		a.cur.current.Pop()
+	}
 	for x, el := range node.Constraints {
+		if a.collectPaths {
+			if x == 0 {
+				a.cur.current.AddStepWithOffset(uint16(RefOfTableSpecConstraintsOffset))
+			} else {
+				a.cur.current.ChangeOffset(x)
+			}
+		}
 		if !a.rewriteRefOfConstraintDefinition(node, el, func(idx int) replacerFunc {
 			return func(newNode, parent SQLNode) {
 				parent.(*TableSpec).Constraints[idx] = newNode.(*ConstraintDefinition)
@@ -9233,16 +12037,27 @@ func (a *application) rewriteRefOfTableSpec(parent SQLNode, node *TableSpec, rep
 			return false
 		}
 	}
+	if a.collectPaths && len(node.Constraints) > 0 {
+		a.cur.current.Pop()
+		a.cur.current.AddStep(uint16(RefOfTableSpecOptions))
+	}
 	if !a.rewriteTableOptions(node, node.Options, func(newNode, parent SQLNode) {
 		parent.(*TableSpec).Options = newNode.(TableOptions)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+		a.cur.current.AddStep(uint16(RefOfTableSpecPartitionOption))
+	}
 	if !a.rewriteRefOfPartitionOption(node, node.PartitionOption, func(newNode, parent SQLNode) {
 		parent.(*TableSpec).PartitionOption = newNode.(*PartitionOption)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+	}
 	if a.post != nil {
 		a.cur.replacer = replacer
 		a.cur.parent = parent
@@ -9253,6 +12068,8 @@ func (a *application) rewriteRefOfTableSpec(parent SQLNode, node *TableSpec, rep
 	}
 	return true
 }
+
+// Function Generation Source: PtrToStructMethod
 func (a *application) rewriteRefOfTablespaceOperation(parent SQLNode, node *TablespaceOperation, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -9282,6 +12099,8 @@ func (a *application) rewriteRefOfTablespaceOperation(parent SQLNode, node *Tabl
 	}
 	return true
 }
+
+// Function Generation Source: PtrToStructMethod
 func (a *application) rewriteRefOfTimestampDiffExpr(parent SQLNode, node *TimestampDiffExpr, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -9299,16 +12118,26 @@ func (a *application) rewriteRefOfTimestampDiffExpr(parent SQLNode, node *Timest
 			return true
 		}
 	}
+	if a.collectPaths {
+		a.cur.current.AddStep(uint16(RefOfTimestampDiffExprExpr1))
+	}
 	if !a.rewriteExpr(node, node.Expr1, func(newNode, parent SQLNode) {
 		parent.(*TimestampDiffExpr).Expr1 = newNode.(Expr)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+		a.cur.current.AddStep(uint16(RefOfTimestampDiffExprExpr2))
+	}
 	if !a.rewriteExpr(node, node.Expr2, func(newNode, parent SQLNode) {
 		parent.(*TimestampDiffExpr).Expr2 = newNode.(Expr)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+	}
 	if a.post != nil {
 		a.cur.replacer = replacer
 		a.cur.parent = parent
@@ -9319,6 +12148,8 @@ func (a *application) rewriteRefOfTimestampDiffExpr(parent SQLNode, node *Timest
 	}
 	return true
 }
+
+// Function Generation Source: PtrToStructMethod
 func (a *application) rewriteRefOfTrimFuncExpr(parent SQLNode, node *TrimFuncExpr, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -9336,16 +12167,26 @@ func (a *application) rewriteRefOfTrimFuncExpr(parent SQLNode, node *TrimFuncExp
 			return true
 		}
 	}
+	if a.collectPaths {
+		a.cur.current.AddStep(uint16(RefOfTrimFuncExprTrimArg))
+	}
 	if !a.rewriteExpr(node, node.TrimArg, func(newNode, parent SQLNode) {
 		parent.(*TrimFuncExpr).TrimArg = newNode.(Expr)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+		a.cur.current.AddStep(uint16(RefOfTrimFuncExprStringArg))
+	}
 	if !a.rewriteExpr(node, node.StringArg, func(newNode, parent SQLNode) {
 		parent.(*TrimFuncExpr).StringArg = newNode.(Expr)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+	}
 	if a.post != nil {
 		a.cur.replacer = replacer
 		a.cur.parent = parent
@@ -9356,6 +12197,8 @@ func (a *application) rewriteRefOfTrimFuncExpr(parent SQLNode, node *TrimFuncExp
 	}
 	return true
 }
+
+// Function Generation Source: PtrToStructMethod
 func (a *application) rewriteRefOfTruncateTable(parent SQLNode, node *TruncateTable, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -9373,11 +12216,17 @@ func (a *application) rewriteRefOfTruncateTable(parent SQLNode, node *TruncateTa
 			return true
 		}
 	}
+	if a.collectPaths {
+		a.cur.current.AddStep(uint16(RefOfTruncateTableTable))
+	}
 	if !a.rewriteTableName(node, node.Table, func(newNode, parent SQLNode) {
 		parent.(*TruncateTable).Table = newNode.(TableName)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+	}
 	if a.post != nil {
 		a.cur.replacer = replacer
 		a.cur.parent = parent
@@ -9388,6 +12237,8 @@ func (a *application) rewriteRefOfTruncateTable(parent SQLNode, node *TruncateTa
 	}
 	return true
 }
+
+// Function Generation Source: PtrToStructMethod
 func (a *application) rewriteRefOfUnaryExpr(parent SQLNode, node *UnaryExpr, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -9405,11 +12256,17 @@ func (a *application) rewriteRefOfUnaryExpr(parent SQLNode, node *UnaryExpr, rep
 			return true
 		}
 	}
+	if a.collectPaths {
+		a.cur.current.AddStep(uint16(RefOfUnaryExprExpr))
+	}
 	if !a.rewriteExpr(node, node.Expr, func(newNode, parent SQLNode) {
 		parent.(*UnaryExpr).Expr = newNode.(Expr)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+	}
 	if a.post != nil {
 		a.cur.replacer = replacer
 		a.cur.parent = parent
@@ -9420,6 +12277,8 @@ func (a *application) rewriteRefOfUnaryExpr(parent SQLNode, node *UnaryExpr, rep
 	}
 	return true
 }
+
+// Function Generation Source: PtrToStructMethod
 func (a *application) rewriteRefOfUnion(parent SQLNode, node *Union, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -9437,36 +12296,62 @@ func (a *application) rewriteRefOfUnion(parent SQLNode, node *Union, replacer re
 			return true
 		}
 	}
+	if a.collectPaths {
+		a.cur.current.AddStep(uint16(RefOfUnionWith))
+	}
 	if !a.rewriteRefOfWith(node, node.With, func(newNode, parent SQLNode) {
 		parent.(*Union).With = newNode.(*With)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+		a.cur.current.AddStep(uint16(RefOfUnionLeft))
+	}
 	if !a.rewriteTableStatement(node, node.Left, func(newNode, parent SQLNode) {
 		parent.(*Union).Left = newNode.(TableStatement)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+		a.cur.current.AddStep(uint16(RefOfUnionRight))
+	}
 	if !a.rewriteTableStatement(node, node.Right, func(newNode, parent SQLNode) {
 		parent.(*Union).Right = newNode.(TableStatement)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+		a.cur.current.AddStep(uint16(RefOfUnionOrderBy))
+	}
 	if !a.rewriteOrderBy(node, node.OrderBy, func(newNode, parent SQLNode) {
 		parent.(*Union).OrderBy = newNode.(OrderBy)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+		a.cur.current.AddStep(uint16(RefOfUnionLimit))
+	}
 	if !a.rewriteRefOfLimit(node, node.Limit, func(newNode, parent SQLNode) {
 		parent.(*Union).Limit = newNode.(*Limit)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+		a.cur.current.AddStep(uint16(RefOfUnionInto))
+	}
 	if !a.rewriteRefOfSelectInto(node, node.Into, func(newNode, parent SQLNode) {
 		parent.(*Union).Into = newNode.(*SelectInto)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+	}
 	if a.post != nil {
 		a.cur.replacer = replacer
 		a.cur.parent = parent
@@ -9477,6 +12362,8 @@ func (a *application) rewriteRefOfUnion(parent SQLNode, node *Union, replacer re
 	}
 	return true
 }
+
+// Function Generation Source: PtrToStructMethod
 func (a *application) rewriteRefOfUnlockTables(parent SQLNode, node *UnlockTables, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -9506,6 +12393,8 @@ func (a *application) rewriteRefOfUnlockTables(parent SQLNode, node *UnlockTable
 	}
 	return true
 }
+
+// Function Generation Source: PtrToStructMethod
 func (a *application) rewriteRefOfUpdate(parent SQLNode, node *Update, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -9523,17 +12412,34 @@ func (a *application) rewriteRefOfUpdate(parent SQLNode, node *Update, replacer
 			return true
 		}
 	}
+	if a.collectPaths {
+		a.cur.current.AddStep(uint16(RefOfUpdateWith))
+	}
 	if !a.rewriteRefOfWith(node, node.With, func(newNode, parent SQLNode) {
 		parent.(*Update).With = newNode.(*With)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+		a.cur.current.AddStep(uint16(RefOfUpdateComments))
+	}
 	if !a.rewriteRefOfParsedComments(node, node.Comments, func(newNode, parent SQLNode) {
 		parent.(*Update).Comments = newNode.(*ParsedComments)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+	}
 	for x, el := range node.TableExprs {
+		if a.collectPaths {
+			if x == 0 {
+				a.cur.current.AddStepWithOffset(uint16(RefOfUpdateTableExprsOffset))
+			} else {
+				a.cur.current.ChangeOffset(x)
+			}
+		}
 		if !a.rewriteTableExpr(node, el, func(idx int) replacerFunc {
 			return func(newNode, parent SQLNode) {
 				parent.(*Update).TableExprs[idx] = newNode.(TableExpr)
@@ -9542,26 +12448,45 @@ func (a *application) rewriteRefOfUpdate(parent SQLNode, node *Update, replacer
 			return false
 		}
 	}
+	if a.collectPaths && len(node.TableExprs) > 0 {
+		a.cur.current.Pop()
+		a.cur.current.AddStep(uint16(RefOfUpdateExprs))
+	}
 	if !a.rewriteUpdateExprs(node, node.Exprs, func(newNode, parent SQLNode) {
 		parent.(*Update).Exprs = newNode.(UpdateExprs)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+		a.cur.current.AddStep(uint16(RefOfUpdateWhere))
+	}
 	if !a.rewriteRefOfWhere(node, node.Where, func(newNode, parent SQLNode) {
 		parent.(*Update).Where = newNode.(*Where)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+		a.cur.current.AddStep(uint16(RefOfUpdateOrderBy))
+	}
 	if !a.rewriteOrderBy(node, node.OrderBy, func(newNode, parent SQLNode) {
 		parent.(*Update).OrderBy = newNode.(OrderBy)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+		a.cur.current.AddStep(uint16(RefOfUpdateLimit))
+	}
 	if !a.rewriteRefOfLimit(node, node.Limit, func(newNode, parent SQLNode) {
 		parent.(*Update).Limit = newNode.(*Limit)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+	}
 	if a.post != nil {
 		a.cur.replacer = replacer
 		a.cur.parent = parent
@@ -9572,6 +12497,8 @@ func (a *application) rewriteRefOfUpdate(parent SQLNode, node *Update, replacer
 	}
 	return true
 }
+
+// Function Generation Source: PtrToStructMethod
 func (a *application) rewriteRefOfUpdateExpr(parent SQLNode, node *UpdateExpr, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -9589,16 +12516,26 @@ func (a *application) rewriteRefOfUpdateExpr(parent SQLNode, node *UpdateExpr, r
 			return true
 		}
 	}
+	if a.collectPaths {
+		a.cur.current.AddStep(uint16(RefOfUpdateExprName))
+	}
 	if !a.rewriteRefOfColName(node, node.Name, func(newNode, parent SQLNode) {
 		parent.(*UpdateExpr).Name = newNode.(*ColName)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+		a.cur.current.AddStep(uint16(RefOfUpdateExprExpr))
+	}
 	if !a.rewriteExpr(node, node.Expr, func(newNode, parent SQLNode) {
 		parent.(*UpdateExpr).Expr = newNode.(Expr)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+	}
 	if a.post != nil {
 		a.cur.replacer = replacer
 		a.cur.parent = parent
@@ -9609,6 +12546,8 @@ func (a *application) rewriteRefOfUpdateExpr(parent SQLNode, node *UpdateExpr, r
 	}
 	return true
 }
+
+// Function Generation Source: SliceMethod
 func (a *application) rewriteUpdateExprs(parent SQLNode, node UpdateExprs, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -9627,6 +12566,13 @@ func (a *application) rewriteUpdateExprs(parent SQLNode, node UpdateExprs, repla
 		}
 	}
 	for x, el := range node {
+		if a.collectPaths {
+			if x == 0 {
+				a.cur.current.AddStepWithOffset(uint16(UpdateExprsOffset))
+			} else {
+				a.cur.current.ChangeOffset(x)
+			}
+		}
 		if !a.rewriteRefOfUpdateExpr(node, el, func(idx int) replacerFunc {
 			return func(newNode, parent SQLNode) {
 				parent.(UpdateExprs)[idx] = newNode.(*UpdateExpr)
@@ -9635,6 +12581,9 @@ func (a *application) rewriteUpdateExprs(parent SQLNode, node UpdateExprs, repla
 			return false
 		}
 	}
+	if a.collectPaths && len(node) > 0 {
+		a.cur.current.Pop()
+	}
 	if a.post != nil {
 		a.cur.replacer = replacer
 		a.cur.parent = parent
@@ -9645,6 +12594,8 @@ func (a *application) rewriteUpdateExprs(parent SQLNode, node UpdateExprs, repla
 	}
 	return true
 }
+
+// Function Generation Source: PtrToStructMethod
 func (a *application) rewriteRefOfUpdateXMLExpr(parent SQLNode, node *UpdateXMLExpr, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -9662,21 +12613,35 @@ func (a *application) rewriteRefOfUpdateXMLExpr(parent SQLNode, node *UpdateXMLE
 			return true
 		}
 	}
+	if a.collectPaths {
+		a.cur.current.AddStep(uint16(RefOfUpdateXMLExprTarget))
+	}
 	if !a.rewriteExpr(node, node.Target, func(newNode, parent SQLNode) {
 		parent.(*UpdateXMLExpr).Target = newNode.(Expr)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+		a.cur.current.AddStep(uint16(RefOfUpdateXMLExprXPathExpr))
+	}
 	if !a.rewriteExpr(node, node.XPathExpr, func(newNode, parent SQLNode) {
 		parent.(*UpdateXMLExpr).XPathExpr = newNode.(Expr)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+		a.cur.current.AddStep(uint16(RefOfUpdateXMLExprNewXML))
+	}
 	if !a.rewriteExpr(node, node.NewXML, func(newNode, parent SQLNode) {
 		parent.(*UpdateXMLExpr).NewXML = newNode.(Expr)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+	}
 	if a.post != nil {
 		a.cur.replacer = replacer
 		a.cur.parent = parent
@@ -9687,6 +12652,8 @@ func (a *application) rewriteRefOfUpdateXMLExpr(parent SQLNode, node *UpdateXMLE
 	}
 	return true
 }
+
+// Function Generation Source: PtrToStructMethod
 func (a *application) rewriteRefOfUse(parent SQLNode, node *Use, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -9704,11 +12671,17 @@ func (a *application) rewriteRefOfUse(parent SQLNode, node *Use, replacer replac
 			return true
 		}
 	}
+	if a.collectPaths {
+		a.cur.current.AddStep(uint16(RefOfUseDBName))
+	}
 	if !a.rewriteIdentifierCS(node, node.DBName, func(newNode, parent SQLNode) {
 		parent.(*Use).DBName = newNode.(IdentifierCS)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+	}
 	if a.post != nil {
 		a.cur.replacer = replacer
 		a.cur.parent = parent
@@ -9719,6 +12692,8 @@ func (a *application) rewriteRefOfUse(parent SQLNode, node *Use, replacer replac
 	}
 	return true
 }
+
+// Function Generation Source: PtrToStructMethod
 func (a *application) rewriteRefOfVExplainStmt(parent SQLNode, node *VExplainStmt, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -9736,16 +12711,26 @@ func (a *application) rewriteRefOfVExplainStmt(parent SQLNode, node *VExplainStm
 			return true
 		}
 	}
+	if a.collectPaths {
+		a.cur.current.AddStep(uint16(RefOfVExplainStmtStatement))
+	}
 	if !a.rewriteStatement(node, node.Statement, func(newNode, parent SQLNode) {
 		parent.(*VExplainStmt).Statement = newNode.(Statement)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+		a.cur.current.AddStep(uint16(RefOfVExplainStmtComments))
+	}
 	if !a.rewriteRefOfParsedComments(node, node.Comments, func(newNode, parent SQLNode) {
 		parent.(*VExplainStmt).Comments = newNode.(*ParsedComments)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+	}
 	if a.post != nil {
 		a.cur.replacer = replacer
 		a.cur.parent = parent
@@ -9756,6 +12741,8 @@ func (a *application) rewriteRefOfVExplainStmt(parent SQLNode, node *VExplainStm
 	}
 	return true
 }
+
+// Function Generation Source: PtrToStructMethod
 func (a *application) rewriteRefOfVStream(parent SQLNode, node *VStream, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -9773,31 +12760,53 @@ func (a *application) rewriteRefOfVStream(parent SQLNode, node *VStream, replace
 			return true
 		}
 	}
+	if a.collectPaths {
+		a.cur.current.AddStep(uint16(RefOfVStreamComments))
+	}
 	if !a.rewriteRefOfParsedComments(node, node.Comments, func(newNode, parent SQLNode) {
 		parent.(*VStream).Comments = newNode.(*ParsedComments)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+		a.cur.current.AddStep(uint16(RefOfVStreamSelectExpr))
+	}
 	if !a.rewriteSelectExpr(node, node.SelectExpr, func(newNode, parent SQLNode) {
 		parent.(*VStream).SelectExpr = newNode.(SelectExpr)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+		a.cur.current.AddStep(uint16(RefOfVStreamTable))
+	}
 	if !a.rewriteTableName(node, node.Table, func(newNode, parent SQLNode) {
 		parent.(*VStream).Table = newNode.(TableName)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+		a.cur.current.AddStep(uint16(RefOfVStreamWhere))
+	}
 	if !a.rewriteRefOfWhere(node, node.Where, func(newNode, parent SQLNode) {
 		parent.(*VStream).Where = newNode.(*Where)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+		a.cur.current.AddStep(uint16(RefOfVStreamLimit))
+	}
 	if !a.rewriteRefOfLimit(node, node.Limit, func(newNode, parent SQLNode) {
 		parent.(*VStream).Limit = newNode.(*Limit)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+	}
 	if a.post != nil {
 		a.cur.replacer = replacer
 		a.cur.parent = parent
@@ -9808,6 +12817,8 @@ func (a *application) rewriteRefOfVStream(parent SQLNode, node *VStream, replace
 	}
 	return true
 }
+
+// Function Generation Source: SliceMethod
 func (a *application) rewriteValTuple(parent SQLNode, node ValTuple, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -9826,6 +12837,13 @@ func (a *application) rewriteValTuple(parent SQLNode, node ValTuple, replacer re
 		}
 	}
 	for x, el := range node {
+		if a.collectPaths {
+			if x == 0 {
+				a.cur.current.AddStepWithOffset(uint16(ValTupleOffset))
+			} else {
+				a.cur.current.ChangeOffset(x)
+			}
+		}
 		if !a.rewriteExpr(node, el, func(idx int) replacerFunc {
 			return func(newNode, parent SQLNode) {
 				parent.(ValTuple)[idx] = newNode.(Expr)
@@ -9834,6 +12852,9 @@ func (a *application) rewriteValTuple(parent SQLNode, node ValTuple, replacer re
 			return false
 		}
 	}
+	if a.collectPaths && len(node) > 0 {
+		a.cur.current.Pop()
+	}
 	if a.post != nil {
 		a.cur.replacer = replacer
 		a.cur.parent = parent
@@ -9844,6 +12865,8 @@ func (a *application) rewriteValTuple(parent SQLNode, node ValTuple, replacer re
 	}
 	return true
 }
+
+// Function Generation Source: PtrToStructMethod
 func (a *application) rewriteRefOfValidation(parent SQLNode, node *Validation, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -9873,6 +12896,8 @@ func (a *application) rewriteRefOfValidation(parent SQLNode, node *Validation, r
 	}
 	return true
 }
+
+// Function Generation Source: SliceMethod
 func (a *application) rewriteValues(parent SQLNode, node Values, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -9891,6 +12916,13 @@ func (a *application) rewriteValues(parent SQLNode, node Values, replacer replac
 		}
 	}
 	for x, el := range node {
+		if a.collectPaths {
+			if x == 0 {
+				a.cur.current.AddStepWithOffset(uint16(ValuesOffset))
+			} else {
+				a.cur.current.ChangeOffset(x)
+			}
+		}
 		if !a.rewriteValTuple(node, el, func(idx int) replacerFunc {
 			return func(newNode, parent SQLNode) {
 				parent.(Values)[idx] = newNode.(ValTuple)
@@ -9899,6 +12931,9 @@ func (a *application) rewriteValues(parent SQLNode, node Values, replacer replac
 			return false
 		}
 	}
+	if a.collectPaths && len(node) > 0 {
+		a.cur.current.Pop()
+	}
 	if a.post != nil {
 		a.cur.replacer = replacer
 		a.cur.parent = parent
@@ -9909,6 +12944,8 @@ func (a *application) rewriteValues(parent SQLNode, node Values, replacer replac
 	}
 	return true
 }
+
+// Function Generation Source: PtrToStructMethod
 func (a *application) rewriteRefOfValuesFuncExpr(parent SQLNode, node *ValuesFuncExpr, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -9926,11 +12963,17 @@ func (a *application) rewriteRefOfValuesFuncExpr(parent SQLNode, node *ValuesFun
 			return true
 		}
 	}
+	if a.collectPaths {
+		a.cur.current.AddStep(uint16(RefOfValuesFuncExprName))
+	}
 	if !a.rewriteRefOfColName(node, node.Name, func(newNode, parent SQLNode) {
 		parent.(*ValuesFuncExpr).Name = newNode.(*ColName)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+	}
 	if a.post != nil {
 		a.cur.replacer = replacer
 		a.cur.parent = parent
@@ -9941,6 +12984,8 @@ func (a *application) rewriteRefOfValuesFuncExpr(parent SQLNode, node *ValuesFun
 	}
 	return true
 }
+
+// Function Generation Source: PtrToStructMethod
 func (a *application) rewriteRefOfValuesStatement(parent SQLNode, node *ValuesStatement, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -9958,36 +13003,62 @@ func (a *application) rewriteRefOfValuesStatement(parent SQLNode, node *ValuesSt
 			return true
 		}
 	}
+	if a.collectPaths {
+		a.cur.current.AddStep(uint16(RefOfValuesStatementWith))
+	}
 	if !a.rewriteRefOfWith(node, node.With, func(newNode, parent SQLNode) {
 		parent.(*ValuesStatement).With = newNode.(*With)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+		a.cur.current.AddStep(uint16(RefOfValuesStatementRows))
+	}
 	if !a.rewriteValues(node, node.Rows, func(newNode, parent SQLNode) {
 		parent.(*ValuesStatement).Rows = newNode.(Values)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+		a.cur.current.AddStep(uint16(RefOfValuesStatementListArg))
+	}
 	if !a.rewriteListArg(node, node.ListArg, func(newNode, parent SQLNode) {
 		parent.(*ValuesStatement).ListArg = newNode.(ListArg)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+		a.cur.current.AddStep(uint16(RefOfValuesStatementComments))
+	}
 	if !a.rewriteRefOfParsedComments(node, node.Comments, func(newNode, parent SQLNode) {
 		parent.(*ValuesStatement).Comments = newNode.(*ParsedComments)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+		a.cur.current.AddStep(uint16(RefOfValuesStatementOrder))
+	}
 	if !a.rewriteOrderBy(node, node.Order, func(newNode, parent SQLNode) {
 		parent.(*ValuesStatement).Order = newNode.(OrderBy)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+		a.cur.current.AddStep(uint16(RefOfValuesStatementLimit))
+	}
 	if !a.rewriteRefOfLimit(node, node.Limit, func(newNode, parent SQLNode) {
 		parent.(*ValuesStatement).Limit = newNode.(*Limit)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+	}
 	if a.post != nil {
 		a.cur.replacer = replacer
 		a.cur.parent = parent
@@ -9998,6 +13069,8 @@ func (a *application) rewriteRefOfValuesStatement(parent SQLNode, node *ValuesSt
 	}
 	return true
 }
+
+// Function Generation Source: PtrToStructMethod
 func (a *application) rewriteRefOfVarPop(parent SQLNode, node *VarPop, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -10015,16 +13088,26 @@ func (a *application) rewriteRefOfVarPop(parent SQLNode, node *VarPop, replacer
 			return true
 		}
 	}
+	if a.collectPaths {
+		a.cur.current.AddStep(uint16(RefOfVarPopArg))
+	}
 	if !a.rewriteExpr(node, node.Arg, func(newNode, parent SQLNode) {
 		parent.(*VarPop).Arg = newNode.(Expr)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+		a.cur.current.AddStep(uint16(RefOfVarPopOverClause))
+	}
 	if !a.rewriteRefOfOverClause(node, node.OverClause, func(newNode, parent SQLNode) {
 		parent.(*VarPop).OverClause = newNode.(*OverClause)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+	}
 	if a.post != nil {
 		a.cur.replacer = replacer
 		a.cur.parent = parent
@@ -10035,6 +13118,8 @@ func (a *application) rewriteRefOfVarPop(parent SQLNode, node *VarPop, replacer
 	}
 	return true
 }
+
+// Function Generation Source: PtrToStructMethod
 func (a *application) rewriteRefOfVarSamp(parent SQLNode, node *VarSamp, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -10052,16 +13137,26 @@ func (a *application) rewriteRefOfVarSamp(parent SQLNode, node *VarSamp, replace
 			return true
 		}
 	}
+	if a.collectPaths {
+		a.cur.current.AddStep(uint16(RefOfVarSampArg))
+	}
 	if !a.rewriteExpr(node, node.Arg, func(newNode, parent SQLNode) {
 		parent.(*VarSamp).Arg = newNode.(Expr)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+		a.cur.current.AddStep(uint16(RefOfVarSampOverClause))
+	}
 	if !a.rewriteRefOfOverClause(node, node.OverClause, func(newNode, parent SQLNode) {
 		parent.(*VarSamp).OverClause = newNode.(*OverClause)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+	}
 	if a.post != nil {
 		a.cur.replacer = replacer
 		a.cur.parent = parent
@@ -10072,6 +13167,8 @@ func (a *application) rewriteRefOfVarSamp(parent SQLNode, node *VarSamp, replace
 	}
 	return true
 }
+
+// Function Generation Source: PtrToStructMethod
 func (a *application) rewriteRefOfVariable(parent SQLNode, node *Variable, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -10089,11 +13186,17 @@ func (a *application) rewriteRefOfVariable(parent SQLNode, node *Variable, repla
 			return true
 		}
 	}
+	if a.collectPaths {
+		a.cur.current.AddStep(uint16(RefOfVariableName))
+	}
 	if !a.rewriteIdentifierCI(node, node.Name, func(newNode, parent SQLNode) {
 		parent.(*Variable).Name = newNode.(IdentifierCI)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+	}
 	if a.post != nil {
 		a.cur.replacer = replacer
 		a.cur.parent = parent
@@ -10104,6 +13207,8 @@ func (a *application) rewriteRefOfVariable(parent SQLNode, node *Variable, repla
 	}
 	return true
 }
+
+// Function Generation Source: PtrToStructMethod
 func (a *application) rewriteRefOfVariance(parent SQLNode, node *Variance, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -10121,16 +13226,26 @@ func (a *application) rewriteRefOfVariance(parent SQLNode, node *Variance, repla
 			return true
 		}
 	}
+	if a.collectPaths {
+		a.cur.current.AddStep(uint16(RefOfVarianceArg))
+	}
 	if !a.rewriteExpr(node, node.Arg, func(newNode, parent SQLNode) {
 		parent.(*Variance).Arg = newNode.(Expr)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+		a.cur.current.AddStep(uint16(RefOfVarianceOverClause))
+	}
 	if !a.rewriteRefOfOverClause(node, node.OverClause, func(newNode, parent SQLNode) {
 		parent.(*Variance).OverClause = newNode.(*OverClause)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+	}
 	if a.post != nil {
 		a.cur.replacer = replacer
 		a.cur.parent = parent
@@ -10141,6 +13256,8 @@ func (a *application) rewriteRefOfVariance(parent SQLNode, node *Variance, repla
 	}
 	return true
 }
+
+// Function Generation Source: StructMethod
 func (a *application) rewriteVindexParam(parent SQLNode, node VindexParam, replacer replacerFunc) bool {
 	if a.pre != nil {
 		a.cur.replacer = replacer
@@ -10155,11 +13272,17 @@ func (a *application) rewriteVindexParam(parent SQLNode, node VindexParam, repla
 			return true
 		}
 	}
+	if a.collectPaths {
+		a.cur.current.AddStep(uint16(VindexParamKey))
+	}
 	if !a.rewriteIdentifierCI(node, node.Key, func(newNode, parent SQLNode) {
 		panic("[BUG] tried to replace 'Key' on 'VindexParam'")
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+	}
 	if a.post != nil {
 		a.cur.replacer = replacer
 		a.cur.parent = parent
@@ -10170,6 +13293,8 @@ func (a *application) rewriteVindexParam(parent SQLNode, node VindexParam, repla
 	}
 	return true
 }
+
+// Function Generation Source: PtrToStructMethod
 func (a *application) rewriteRefOfVindexSpec(parent SQLNode, node *VindexSpec, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -10187,17 +13312,34 @@ func (a *application) rewriteRefOfVindexSpec(parent SQLNode, node *VindexSpec, r
 			return true
 		}
 	}
+	if a.collectPaths {
+		a.cur.current.AddStep(uint16(RefOfVindexSpecName))
+	}
 	if !a.rewriteIdentifierCI(node, node.Name, func(newNode, parent SQLNode) {
 		parent.(*VindexSpec).Name = newNode.(IdentifierCI)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+		a.cur.current.AddStep(uint16(RefOfVindexSpecType))
+	}
 	if !a.rewriteIdentifierCI(node, node.Type, func(newNode, parent SQLNode) {
 		parent.(*VindexSpec).Type = newNode.(IdentifierCI)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+	}
 	for x, el := range node.Params {
+		if a.collectPaths {
+			if x == 0 {
+				a.cur.current.AddStepWithOffset(uint16(RefOfVindexSpecParamsOffset))
+			} else {
+				a.cur.current.ChangeOffset(x)
+			}
+		}
 		if !a.rewriteVindexParam(node, el, func(idx int) replacerFunc {
 			return func(newNode, parent SQLNode) {
 				parent.(*VindexSpec).Params[idx] = newNode.(VindexParam)
@@ -10206,6 +13348,9 @@ func (a *application) rewriteRefOfVindexSpec(parent SQLNode, node *VindexSpec, r
 			return false
 		}
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+	}
 	if a.post != nil {
 		a.cur.replacer = replacer
 		a.cur.parent = parent
@@ -10216,6 +13361,8 @@ func (a *application) rewriteRefOfVindexSpec(parent SQLNode, node *VindexSpec, r
 	}
 	return true
 }
+
+// Function Generation Source: PtrToStructMethod
 func (a *application) rewriteRefOfWeightStringFuncExpr(parent SQLNode, node *WeightStringFuncExpr, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -10233,16 +13380,26 @@ func (a *application) rewriteRefOfWeightStringFuncExpr(parent SQLNode, node *Wei
 			return true
 		}
 	}
+	if a.collectPaths {
+		a.cur.current.AddStep(uint16(RefOfWeightStringFuncExprExpr))
+	}
 	if !a.rewriteExpr(node, node.Expr, func(newNode, parent SQLNode) {
 		parent.(*WeightStringFuncExpr).Expr = newNode.(Expr)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+		a.cur.current.AddStep(uint16(RefOfWeightStringFuncExprAs))
+	}
 	if !a.rewriteRefOfConvertType(node, node.As, func(newNode, parent SQLNode) {
 		parent.(*WeightStringFuncExpr).As = newNode.(*ConvertType)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+	}
 	if a.post != nil {
 		a.cur.replacer = replacer
 		a.cur.parent = parent
@@ -10253,6 +13410,8 @@ func (a *application) rewriteRefOfWeightStringFuncExpr(parent SQLNode, node *Wei
 	}
 	return true
 }
+
+// Function Generation Source: PtrToStructMethod
 func (a *application) rewriteRefOfWhen(parent SQLNode, node *When, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -10270,16 +13429,26 @@ func (a *application) rewriteRefOfWhen(parent SQLNode, node *When, replacer repl
 			return true
 		}
 	}
+	if a.collectPaths {
+		a.cur.current.AddStep(uint16(RefOfWhenCond))
+	}
 	if !a.rewriteExpr(node, node.Cond, func(newNode, parent SQLNode) {
 		parent.(*When).Cond = newNode.(Expr)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+		a.cur.current.AddStep(uint16(RefOfWhenVal))
+	}
 	if !a.rewriteExpr(node, node.Val, func(newNode, parent SQLNode) {
 		parent.(*When).Val = newNode.(Expr)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+	}
 	if a.post != nil {
 		a.cur.replacer = replacer
 		a.cur.parent = parent
@@ -10290,6 +13459,8 @@ func (a *application) rewriteRefOfWhen(parent SQLNode, node *When, replacer repl
 	}
 	return true
 }
+
+// Function Generation Source: PtrToStructMethod
 func (a *application) rewriteRefOfWhere(parent SQLNode, node *Where, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -10307,11 +13478,17 @@ func (a *application) rewriteRefOfWhere(parent SQLNode, node *Where, replacer re
 			return true
 		}
 	}
+	if a.collectPaths {
+		a.cur.current.AddStep(uint16(RefOfWhereExpr))
+	}
 	if !a.rewriteExpr(node, node.Expr, func(newNode, parent SQLNode) {
 		parent.(*Where).Expr = newNode.(Expr)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+	}
 	if a.post != nil {
 		a.cur.replacer = replacer
 		a.cur.parent = parent
@@ -10322,6 +13499,8 @@ func (a *application) rewriteRefOfWhere(parent SQLNode, node *Where, replacer re
 	}
 	return true
 }
+
+// Function Generation Source: PtrToStructMethod
 func (a *application) rewriteRefOfWindowDefinition(parent SQLNode, node *WindowDefinition, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -10339,16 +13518,26 @@ func (a *application) rewriteRefOfWindowDefinition(parent SQLNode, node *WindowD
 			return true
 		}
 	}
+	if a.collectPaths {
+		a.cur.current.AddStep(uint16(RefOfWindowDefinitionName))
+	}
 	if !a.rewriteIdentifierCI(node, node.Name, func(newNode, parent SQLNode) {
 		parent.(*WindowDefinition).Name = newNode.(IdentifierCI)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+		a.cur.current.AddStep(uint16(RefOfWindowDefinitionWindowSpec))
+	}
 	if !a.rewriteRefOfWindowSpecification(node, node.WindowSpec, func(newNode, parent SQLNode) {
 		parent.(*WindowDefinition).WindowSpec = newNode.(*WindowSpecification)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+	}
 	if a.post != nil {
 		a.cur.replacer = replacer
 		a.cur.parent = parent
@@ -10359,6 +13548,8 @@ func (a *application) rewriteRefOfWindowDefinition(parent SQLNode, node *WindowD
 	}
 	return true
 }
+
+// Function Generation Source: SliceMethod
 func (a *application) rewriteWindowDefinitions(parent SQLNode, node WindowDefinitions, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -10377,6 +13568,13 @@ func (a *application) rewriteWindowDefinitions(parent SQLNode, node WindowDefini
 		}
 	}
 	for x, el := range node {
+		if a.collectPaths {
+			if x == 0 {
+				a.cur.current.AddStepWithOffset(uint16(WindowDefinitionsOffset))
+			} else {
+				a.cur.current.ChangeOffset(x)
+			}
+		}
 		if !a.rewriteRefOfWindowDefinition(node, el, func(idx int) replacerFunc {
 			return func(newNode, parent SQLNode) {
 				parent.(WindowDefinitions)[idx] = newNode.(*WindowDefinition)
@@ -10385,6 +13583,9 @@ func (a *application) rewriteWindowDefinitions(parent SQLNode, node WindowDefini
 			return false
 		}
 	}
+	if a.collectPaths && len(node) > 0 {
+		a.cur.current.Pop()
+	}
 	if a.post != nil {
 		a.cur.replacer = replacer
 		a.cur.parent = parent
@@ -10395,6 +13596,8 @@ func (a *application) rewriteWindowDefinitions(parent SQLNode, node WindowDefini
 	}
 	return true
 }
+
+// Function Generation Source: PtrToStructMethod
 func (a *application) rewriteRefOfWindowSpecification(parent SQLNode, node *WindowSpecification, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -10412,12 +13615,25 @@ func (a *application) rewriteRefOfWindowSpecification(parent SQLNode, node *Wind
 			return true
 		}
 	}
+	if a.collectPaths {
+		a.cur.current.AddStep(uint16(RefOfWindowSpecificationName))
+	}
 	if !a.rewriteIdentifierCI(node, node.Name, func(newNode, parent SQLNode) {
 		parent.(*WindowSpecification).Name = newNode.(IdentifierCI)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+	}
 	for x, el := range node.PartitionClause {
+		if a.collectPaths {
+			if x == 0 {
+				a.cur.current.AddStepWithOffset(uint16(RefOfWindowSpecificationPartitionClauseOffset))
+			} else {
+				a.cur.current.ChangeOffset(x)
+			}
+		}
 		if !a.rewriteExpr(node, el, func(idx int) replacerFunc {
 			return func(newNode, parent SQLNode) {
 				parent.(*WindowSpecification).PartitionClause[idx] = newNode.(Expr)
@@ -10426,16 +13642,27 @@ func (a *application) rewriteRefOfWindowSpecification(parent SQLNode, node *Wind
 			return false
 		}
 	}
+	if a.collectPaths && len(node.PartitionClause) > 0 {
+		a.cur.current.Pop()
+		a.cur.current.AddStep(uint16(RefOfWindowSpecificationOrderClause))
+	}
 	if !a.rewriteOrderBy(node, node.OrderClause, func(newNode, parent SQLNode) {
 		parent.(*WindowSpecification).OrderClause = newNode.(OrderBy)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+		a.cur.current.AddStep(uint16(RefOfWindowSpecificationFrameClause))
+	}
 	if !a.rewriteRefOfFrameClause(node, node.FrameClause, func(newNode, parent SQLNode) {
 		parent.(*WindowSpecification).FrameClause = newNode.(*FrameClause)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+	}
 	if a.post != nil {
 		a.cur.replacer = replacer
 		a.cur.parent = parent
@@ -10446,6 +13673,8 @@ func (a *application) rewriteRefOfWindowSpecification(parent SQLNode, node *Wind
 	}
 	return true
 }
+
+// Function Generation Source: PtrToStructMethod
 func (a *application) rewriteRefOfWith(parent SQLNode, node *With, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -10464,6 +13693,13 @@ func (a *application) rewriteRefOfWith(parent SQLNode, node *With, replacer repl
 		}
 	}
 	for x, el := range node.CTEs {
+		if a.collectPaths {
+			if x == 0 {
+				a.cur.current.AddStepWithOffset(uint16(RefOfWithCTEsOffset))
+			} else {
+				a.cur.current.ChangeOffset(x)
+			}
+		}
 		if !a.rewriteRefOfCommonTableExpr(node, el, func(idx int) replacerFunc {
 			return func(newNode, parent SQLNode) {
 				parent.(*With).CTEs[idx] = newNode.(*CommonTableExpr)
@@ -10472,6 +13708,9 @@ func (a *application) rewriteRefOfWith(parent SQLNode, node *With, replacer repl
 			return false
 		}
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+	}
 	if a.post != nil {
 		a.cur.replacer = replacer
 		a.cur.parent = parent
@@ -10482,6 +13721,8 @@ func (a *application) rewriteRefOfWith(parent SQLNode, node *With, replacer repl
 	}
 	return true
 }
+
+// Function Generation Source: PtrToStructMethod
 func (a *application) rewriteRefOfXorExpr(parent SQLNode, node *XorExpr, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -10499,16 +13740,26 @@ func (a *application) rewriteRefOfXorExpr(parent SQLNode, node *XorExpr, replace
 			return true
 		}
 	}
+	if a.collectPaths {
+		a.cur.current.AddStep(uint16(RefOfXorExprLeft))
+	}
 	if !a.rewriteExpr(node, node.Left, func(newNode, parent SQLNode) {
 		parent.(*XorExpr).Left = newNode.(Expr)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+		a.cur.current.AddStep(uint16(RefOfXorExprRight))
+	}
 	if !a.rewriteExpr(node, node.Right, func(newNode, parent SQLNode) {
 		parent.(*XorExpr).Right = newNode.(Expr)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+	}
 	if a.post != nil {
 		a.cur.replacer = replacer
 		a.cur.parent = parent
@@ -10519,6 +13770,8 @@ func (a *application) rewriteRefOfXorExpr(parent SQLNode, node *XorExpr, replace
 	}
 	return true
 }
+
+// Function Generation Source: InterfaceMethod
 func (a *application) rewriteAggrFunc(parent SQLNode, node AggrFunc, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -10569,6 +13822,8 @@ func (a *application) rewriteAggrFunc(parent SQLNode, node AggrFunc, replacer re
 		return true
 	}
 }
+
+// Function Generation Source: InterfaceMethod
 func (a *application) rewriteAlterOption(parent SQLNode, node AlterOption, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -10623,6 +13878,8 @@ func (a *application) rewriteAlterOption(parent SQLNode, node AlterOption, repla
 		return true
 	}
 }
+
+// Function Generation Source: InterfaceMethod
 func (a *application) rewriteCallable(parent SQLNode, node Callable, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -10789,6 +14046,8 @@ func (a *application) rewriteCallable(parent SQLNode, node Callable, replacer re
 		return true
 	}
 }
+
+// Function Generation Source: InterfaceMethod
 func (a *application) rewriteColTuple(parent SQLNode, node ColTuple, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -10805,6 +14064,8 @@ func (a *application) rewriteColTuple(parent SQLNode, node ColTuple, replacer re
 		return true
 	}
 }
+
+// Function Generation Source: InterfaceMethod
 func (a *application) rewriteConstraintInfo(parent SQLNode, node ConstraintInfo, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -10819,6 +14080,8 @@ func (a *application) rewriteConstraintInfo(parent SQLNode, node ConstraintInfo,
 		return true
 	}
 }
+
+// Function Generation Source: InterfaceMethod
 func (a *application) rewriteDBDDLStatement(parent SQLNode, node DBDDLStatement, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -10835,6 +14098,8 @@ func (a *application) rewriteDBDDLStatement(parent SQLNode, node DBDDLStatement,
 		return true
 	}
 }
+
+// Function Generation Source: InterfaceMethod
 func (a *application) rewriteDDLStatement(parent SQLNode, node DDLStatement, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -10861,6 +14126,8 @@ func (a *application) rewriteDDLStatement(parent SQLNode, node DDLStatement, rep
 		return true
 	}
 }
+
+// Function Generation Source: InterfaceMethod
 func (a *application) rewriteExplain(parent SQLNode, node Explain, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -10875,6 +14142,8 @@ func (a *application) rewriteExplain(parent SQLNode, node Explain, replacer repl
 		return true
 	}
 }
+
+// Function Generation Source: InterfaceMethod
 func (a *application) rewriteExpr(parent SQLNode, node Expr, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -11119,6 +14388,8 @@ func (a *application) rewriteExpr(parent SQLNode, node Expr, replacer replacerFu
 		return true
 	}
 }
+
+// Function Generation Source: InterfaceMethod
 func (a *application) rewriteInsertRows(parent SQLNode, node InsertRows, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -11137,6 +14408,8 @@ func (a *application) rewriteInsertRows(parent SQLNode, node InsertRows, replace
 		return true
 	}
 }
+
+// Function Generation Source: InterfaceMethod
 func (a *application) rewriteSelectExpr(parent SQLNode, node SelectExpr, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -11153,6 +14426,8 @@ func (a *application) rewriteSelectExpr(parent SQLNode, node SelectExpr, replace
 		return true
 	}
 }
+
+// Function Generation Source: InterfaceMethod
 func (a *application) rewriteSelectStatement(parent SQLNode, node SelectStatement, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -11167,6 +14442,8 @@ func (a *application) rewriteSelectStatement(parent SQLNode, node SelectStatemen
 		return true
 	}
 }
+
+// Function Generation Source: InterfaceMethod
 func (a *application) rewriteShowInternal(parent SQLNode, node ShowInternal, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -11185,6 +14462,8 @@ func (a *application) rewriteShowInternal(parent SQLNode, node ShowInternal, rep
 		return true
 	}
 }
+
+// Function Generation Source: InterfaceMethod
 func (a *application) rewriteSimpleTableExpr(parent SQLNode, node SimpleTableExpr, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -11199,6 +14478,8 @@ func (a *application) rewriteSimpleTableExpr(parent SQLNode, node SimpleTableExp
 		return true
 	}
 }
+
+// Function Generation Source: InterfaceMethod
 func (a *application) rewriteStatement(parent SQLNode, node Statement, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -11309,6 +14590,8 @@ func (a *application) rewriteStatement(parent SQLNode, node Statement, replacer
 		return true
 	}
 }
+
+// Function Generation Source: InterfaceMethod
 func (a *application) rewriteTableExpr(parent SQLNode, node TableExpr, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -11327,6 +14610,8 @@ func (a *application) rewriteTableExpr(parent SQLNode, node TableExpr, replacer
 		return true
 	}
 }
+
+// Function Generation Source: InterfaceMethod
 func (a *application) rewriteTableStatement(parent SQLNode, node TableStatement, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -11343,6 +14628,8 @@ func (a *application) rewriteTableStatement(parent SQLNode, node TableStatement,
 		return true
 	}
 }
+
+// Function Generation Source: BasicMethod
 func (a *application) rewriteAlgorithmValue(parent SQLNode, node AlgorithmValue, replacer replacerFunc) bool {
 	if a.pre != nil {
 		a.cur.replacer = replacer
@@ -11369,6 +14656,8 @@ func (a *application) rewriteAlgorithmValue(parent SQLNode, node AlgorithmValue,
 	}
 	return true
 }
+
+// Function Generation Source: BasicMethod
 func (a *application) rewriteBoolVal(parent SQLNode, node BoolVal, replacer replacerFunc) bool {
 	if a.pre != nil {
 		a.cur.replacer = replacer
@@ -11395,6 +14684,8 @@ func (a *application) rewriteBoolVal(parent SQLNode, node BoolVal, replacer repl
 	}
 	return true
 }
+
+// Function Generation Source: BasicMethod
 func (a *application) rewriteListArg(parent SQLNode, node ListArg, replacer replacerFunc) bool {
 	if a.pre != nil {
 		a.cur.replacer = replacer
@@ -11421,6 +14712,8 @@ func (a *application) rewriteListArg(parent SQLNode, node ListArg, replacer repl
 	}
 	return true
 }
+
+// Function Generation Source: BasicMethod
 func (a *application) rewriteMatchAction(parent SQLNode, node MatchAction, replacer replacerFunc) bool {
 	if a.pre != nil {
 		a.cur.replacer = replacer
@@ -11447,6 +14740,8 @@ func (a *application) rewriteMatchAction(parent SQLNode, node MatchAction, repla
 	}
 	return true
 }
+
+// Function Generation Source: BasicMethod
 func (a *application) rewriteReferenceAction(parent SQLNode, node ReferenceAction, replacer replacerFunc) bool {
 	if a.pre != nil {
 		a.cur.replacer = replacer
@@ -11473,6 +14768,8 @@ func (a *application) rewriteReferenceAction(parent SQLNode, node ReferenceActio
 	}
 	return true
 }
+
+// Function Generation Source: PtrToStructMethod
 func (a *application) rewriteRefOfIdentifierCI(parent SQLNode, node *IdentifierCI, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -11502,6 +14799,8 @@ func (a *application) rewriteRefOfIdentifierCI(parent SQLNode, node *IdentifierC
 	}
 	return true
 }
+
+// Function Generation Source: PtrToStructMethod
 func (a *application) rewriteRefOfIdentifierCS(parent SQLNode, node *IdentifierCS, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -11531,6 +14830,8 @@ func (a *application) rewriteRefOfIdentifierCS(parent SQLNode, node *IdentifierC
 	}
 	return true
 }
+
+// Function Generation Source: PtrToStructMethod
 func (a *application) rewriteRefOfRootNode(parent SQLNode, node *RootNode, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -11548,11 +14849,17 @@ func (a *application) rewriteRefOfRootNode(parent SQLNode, node *RootNode, repla
 			return true
 		}
 	}
+	if a.collectPaths {
+		a.cur.current.AddStep(uint16(RefOfRootNodeSQLNode))
+	}
 	if !a.rewriteSQLNode(node, node.SQLNode, func(newNode, parent SQLNode) {
 		parent.(*RootNode).SQLNode = newNode.(SQLNode)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+	}
 	if a.post != nil {
 		a.cur.replacer = replacer
 		a.cur.parent = parent
@@ -11563,6 +14870,8 @@ func (a *application) rewriteRefOfRootNode(parent SQLNode, node *RootNode, repla
 	}
 	return true
 }
+
+// Function Generation Source: PtrToStructMethod
 func (a *application) rewriteRefOfTableName(parent SQLNode, node *TableName, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -11580,16 +14889,26 @@ func (a *application) rewriteRefOfTableName(parent SQLNode, node *TableName, rep
 			return true
 		}
 	}
+	if a.collectPaths {
+		a.cur.current.AddStep(uint16(RefOfTableNameName))
+	}
 	if !a.rewriteIdentifierCS(node, node.Name, func(newNode, parent SQLNode) {
 		parent.(*TableName).Name = newNode.(IdentifierCS)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+		a.cur.current.AddStep(uint16(RefOfTableNameQualifier))
+	}
 	if !a.rewriteIdentifierCS(node, node.Qualifier, func(newNode, parent SQLNode) {
 		parent.(*TableName).Qualifier = newNode.(IdentifierCS)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+	}
 	if a.post != nil {
 		a.cur.replacer = replacer
 		a.cur.parent = parent
@@ -11600,6 +14919,8 @@ func (a *application) rewriteRefOfTableName(parent SQLNode, node *TableName, rep
 	}
 	return true
 }
+
+// Function Generation Source: PtrToStructMethod
 func (a *application) rewriteRefOfVindexParam(parent SQLNode, node *VindexParam, replacer replacerFunc) bool {
 	if node == nil {
 		return true
@@ -11617,11 +14938,17 @@ func (a *application) rewriteRefOfVindexParam(parent SQLNode, node *VindexParam,
 			return true
 		}
 	}
+	if a.collectPaths {
+		a.cur.current.AddStep(uint16(RefOfVindexParamKey))
+	}
 	if !a.rewriteIdentifierCI(node, node.Key, func(newNode, parent SQLNode) {
 		parent.(*VindexParam).Key = newNode.(IdentifierCI)
 	}) {
 		return false
 	}
+	if a.collectPaths {
+		a.cur.current.Pop()
+	}
 	if a.post != nil {
 		a.cur.replacer = replacer
 		a.cur.parent = parent
diff --git a/go/vt/sqlparser/ast_visit.go b/go/vt/sqlparser/ast_visit.go
index b8ece9e3ae3..c2cc02887f0 100644
--- a/go/vt/sqlparser/ast_visit.go
+++ b/go/vt/sqlparser/ast_visit.go
@@ -1,5 +1,5 @@
 /*
-Copyright 2023 The Vitess Authors.
+Copyright 2025 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.
diff --git a/go/vt/sqlparser/pathbuilder/builder.go b/go/vt/sqlparser/pathbuilder/builder.go
new file mode 100644
index 00000000000..321c1d217e7
--- /dev/null
+++ b/go/vt/sqlparser/pathbuilder/builder.go
@@ -0,0 +1,71 @@
+/*
+Copyright 2025 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 pathbuilder
+
+import (
+	"encoding/binary"
+)
+
+// ASTPathBuilder is used to build
+// paths for an AST. The steps are uints.
+type ASTPathBuilder struct {
+	path  []byte
+	sizes []int
+}
+
+const initialCap = 16
+
+// NewASTPathBuilder creates a new ASTPathBuilder
+func NewASTPathBuilder() *ASTPathBuilder {
+	return &ASTPathBuilder{
+		path: make([]byte, 0, initialCap),
+	}
+}
+
+// ToPath returns the current path as a string of the used bytes.
+func (apb *ASTPathBuilder) ToPath() string {
+	return string(apb.path)
+}
+
+// AddStep appends a single step (2 bytes) to path.
+func (apb *ASTPathBuilder) AddStep(step uint16) {
+	apb.sizes = append(apb.sizes, len(apb.path))
+	apb.path = binary.BigEndian.AppendUint16(apb.path, step)
+}
+
+// AddStepWithOffset appends a single step (2 bytes) + varint offset with value 0 to path.
+func (apb *ASTPathBuilder) AddStepWithOffset(step uint16) {
+	apb.sizes = append(apb.sizes, len(apb.path))
+	apb.path = binary.BigEndian.AppendUint16(apb.path, step)
+	apb.path = binary.AppendUvarint(apb.path, 0) // 0 offset
+}
+
+// ChangeOffset modifies the offset of the last step (which must have included an offset).
+func (apb *ASTPathBuilder) ChangeOffset(newOffset int) {
+	pos := apb.sizes[len(apb.sizes)-1] + 2
+	apb.path = binary.AppendUvarint(apb.path[:pos], uint64(newOffset))
+}
+
+// Pop removes the last step (including offset, if any) from the path.
+func (apb *ASTPathBuilder) Pop() {
+	if len(apb.sizes) == 0 {
+		return
+	}
+	n := len(apb.sizes) - 1
+	apb.path = apb.path[:apb.sizes[n]]
+	apb.sizes = apb.sizes[:n]
+}
diff --git a/go/vt/sqlparser/pathbuilder/builder_test.go b/go/vt/sqlparser/pathbuilder/builder_test.go
new file mode 100644
index 00000000000..3164922efc4
--- /dev/null
+++ b/go/vt/sqlparser/pathbuilder/builder_test.go
@@ -0,0 +1,134 @@
+/*
+Copyright 2025 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 pathbuilder
+
+import (
+	"testing"
+
+	"github.com/stretchr/testify/require"
+)
+
+func TestASTPathBuilderAddStep(t *testing.T) {
+	tests := []struct {
+		name     string
+		steps    []uint16
+		wantPath string
+	}{
+		{
+			name:     "single step",
+			steps:    []uint16{1},
+			wantPath: "\x00\x01",
+		},
+		{
+			name:     "multiple steps",
+			steps:    []uint16{1, 0x24, 0x913},
+			wantPath: "\x00\x01\x00\x24\x09\x13",
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			apb := NewASTPathBuilder()
+			for _, step := range tt.steps {
+				apb.AddStep(step)
+			}
+			require.Equal(t, tt.wantPath, apb.ToPath())
+		})
+	}
+}
+
+func TestASTPathBuilderAddStepOffset(t *testing.T) {
+	tests := []struct {
+		name     string
+		steps    []uint16
+		offsets  []int
+		wantPath string
+	}{
+		{
+			name:     "single step",
+			steps:    []uint16{1},
+			offsets:  []int{0},
+			wantPath: "\x00\x01\x00",
+		},
+		{
+			name:     "multiple steps",
+			steps:    []uint16{1, 0x24, 0x913, 0x913},
+			offsets:  []int{0, -1, 0, 1}, // the 0 is overwritten by the last offset
+			wantPath: "\x00\x01\x00\x00\x24\x09\x13\x01",
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			apb := NewASTPathBuilder()
+			for idx, step := range tt.steps {
+				switch {
+				case tt.offsets[idx] == -1:
+					apb.AddStep(step)
+				case tt.offsets[idx] == 0:
+					apb.AddStepWithOffset(step)
+				default:
+					apb.ChangeOffset(tt.offsets[idx])
+				}
+			}
+			require.Equal(t, tt.wantPath, apb.ToPath())
+		})
+	}
+}
+
+func TestASTPathBuilderPop(t *testing.T) {
+	tests := []struct {
+		name     string
+		steps    []uint16
+		offsets  []int
+		wantPath string
+	}{
+		{
+			name:     "single step",
+			steps:    []uint16{1},
+			offsets:  []int{0},
+			wantPath: "",
+		},
+		{
+			name:     "multiple steps - final step with offset",
+			steps:    []uint16{1, 0x24, 0x913},
+			offsets:  []int{0, -1, 0, 1},
+			wantPath: "\x00\x01\x00\x00\x24",
+		},
+		{
+			name:     "multiple steps - final step without offset",
+			steps:    []uint16{1, 0x24, 0x913},
+			offsets:  []int{0, -1, -1},
+			wantPath: "\x00\x01\x00\x00\x24",
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			apb := NewASTPathBuilder()
+			for idx, step := range tt.steps {
+				switch {
+				case tt.offsets[idx] == -1:
+					apb.AddStep(step)
+				case tt.offsets[idx] == 0:
+					apb.AddStepWithOffset(step)
+				default:
+					apb.ChangeOffset(tt.offsets[idx])
+				}
+			}
+			apb.Pop()
+			require.Equal(t, tt.wantPath, apb.ToPath())
+		})
+	}
+}
diff --git a/go/vt/sqlparser/paths.go b/go/vt/sqlparser/paths.go
new file mode 100644
index 00000000000..0e9020dc07b
--- /dev/null
+++ b/go/vt/sqlparser/paths.go
@@ -0,0 +1,88 @@
+/*
+Copyright 2025 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 sqlparser
+
+import (
+	"fmt"
+	"strings"
+)
+
+// ASTPath is stored as a string.
+// Each 2 bytes => one step (big-endian).
+// Some steps (e.g., referencing a slice) consume *additional* bytes for an index
+type ASTPath string
+
+// nextPathOffset is an implementation of binary.Uvarint that works directly on
+// the ASTPath without having to cast and allocate a byte slice
+func (path ASTPath) nextPathOffset() (uint64, int) {
+	var x uint64
+	var s uint
+	for i := 0; i < len(path); i++ {
+		b := path[i]
+		if b < 0x80 {
+			return x | uint64(b)<<s, i + 1
+		}
+		x |= uint64(b&0x7f) << s
+		s += 7
+	}
+	return 0, 0
+}
+
+func (path ASTPath) nextPathStep() ASTStep {
+	_ = path[1] // bounds check hint to compiler; see golang.org/issue/14808
+	return ASTStep(uint16(path[1]) | uint16(path[0])<<8)
+}
+
+func (path ASTPath) DebugString() string {
+	var sb strings.Builder
+	stepCount := 0
+
+	for len(path) >= 2 {
+		// If this isn't the very first step in the path, prepend a separator
+		if stepCount > 0 {
+			sb.WriteString("->")
+		}
+		stepCount++
+
+		// Read the step code (2 bytes)
+		step := path.nextPathStep()
+		path = path[2:]
+
+		// Write the step name
+		stepStr := step.DebugString()
+		sb.WriteString(stepStr)
+
+		// Check suffix to see if we need to read an offset
+		switch {
+		case strings.HasSuffix(stepStr, "Offset"):
+			if len(path) < 1 {
+				sb.WriteString("(ERR-no-offset-byte)")
+				return sb.String()
+			}
+			offset, readBytes := path.nextPathOffset()
+			path = path[readBytes:]
+			sb.WriteString(fmt.Sprintf("(%d)", offset))
+		}
+	}
+
+	// If there's leftover data that doesn't fit into 2 (or more) bytes, you could note it:
+	if len(path) != 0 {
+		sb.WriteString("->(ERR-unaligned-extra-bytes)")
+	}
+
+	return sb.String()
+}
diff --git a/go/vt/sqlparser/paths_test.go b/go/vt/sqlparser/paths_test.go
new file mode 100644
index 00000000000..14de7101854
--- /dev/null
+++ b/go/vt/sqlparser/paths_test.go
@@ -0,0 +1,51 @@
+/*
+Copyright 2025 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 sqlparser
+
+import (
+	"encoding/binary"
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+)
+
+// AddStep appends a single step (2 bytes) to path.
+func AddStep(path ASTPath, step ASTStep) ASTPath {
+	b := make([]byte, 2)
+	binary.BigEndian.PutUint16(b, uint16(step))
+	return path + ASTPath(b)
+}
+
+func AddStepWithOffset(path ASTPath, step ASTStep, offset int) ASTPath {
+	var buf [10]byte
+	binary.BigEndian.PutUint16(buf[0:], uint16(step))
+	n := binary.PutUvarint(buf[2:], uint64(offset))
+
+	return path + ASTPath(buf[:2+n])
+}
+
+func TestASTPathDebugString(t *testing.T) {
+	// select * from t where func(1,2,x) = 10
+	// path to X
+	p := ASTPath("")
+	p = AddStep(p, RefOfSelectWhere)
+	p = AddStep(p, RefOfWhereExpr)
+	p = AddStep(p, RefOfBinaryExprLeft)
+	p = AddStepWithOffset(p, RefOfFuncExprExprsOffset, 2)
+	expected := "(*Select).Where->(*Where).Expr->(*BinaryExpr).Left->(*FuncExpr).ExprsOffset(2)"
+	assert.Equal(t, expected, p.DebugString())
+}
diff --git a/go/vt/sqlparser/rewriter_api.go b/go/vt/sqlparser/rewriter_api.go
index 5dc4b30cc59..e159987e8e1 100644
--- a/go/vt/sqlparser/rewriter_api.go
+++ b/go/vt/sqlparser/rewriter_api.go
@@ -16,7 +16,7 @@ limitations under the License.
 
 package sqlparser
 
-// The rewriter was heavily inspired by https://github.com/golang/tools/blob/master/go/ast/astutil/rewrite.go
+import "vitess.io/vitess/go/vt/sqlparser/pathbuilder"
 
 // Rewrite traverses a syntax tree recursively, starting with root,
 // and calling pre and post for each node as described below.
@@ -34,6 +34,10 @@ package sqlparser
 // Only fields that refer to AST nodes are considered children;
 // i.e., fields of basic types (strings, []byte, etc.) are ignored.
 func Rewrite(node SQLNode, pre, post ApplyFunc) (result SQLNode) {
+	return rewriteNode(node, pre, post, false)
+}
+
+func rewriteNode(node SQLNode, pre ApplyFunc, post ApplyFunc, collectPaths bool) SQLNode {
 	parent := &RootNode{node}
 
 	// this is the root-replacer, used when the user replaces the root of the ast
@@ -42,8 +46,13 @@ func Rewrite(node SQLNode, pre, post ApplyFunc) (result SQLNode) {
 	}
 
 	a := &application{
-		pre:  pre,
-		post: post,
+		pre:          pre,
+		post:         post,
+		collectPaths: collectPaths,
+	}
+
+	if collectPaths {
+		a.cur.current = pathbuilder.NewASTPathBuilder()
 	}
 
 	a.rewriteSQLNode(parent, node, replacer)
@@ -51,6 +60,10 @@ func Rewrite(node SQLNode, pre, post ApplyFunc) (result SQLNode) {
 	return parent.SQLNode
 }
 
+func RewriteWithPath(node SQLNode, pre, post ApplyFunc) (result SQLNode) {
+	return rewriteNode(node, pre, post, true)
+}
+
 // SafeRewrite does not allow replacing nodes on the down walk of the tree walking
 // Long term this is the only Rewrite functionality we want
 func SafeRewrite(
@@ -97,6 +110,7 @@ type Cursor struct {
 
 	// marks that the node has been replaced, and the new node should be visited
 	revisit bool
+	current *pathbuilder.ASTPathBuilder
 }
 
 // Node returns the current Node.
@@ -130,10 +144,17 @@ func (c *Cursor) ReplaceAndRevisit(newNode SQLNode) {
 	c.revisit = true
 }
 
+// Path returns the current path that got us to the current location in the AST
+// Only works if the AST walk was configured to collect path as walking
+func (c *Cursor) Path() ASTPath {
+	return ASTPath(c.current.ToPath())
+}
+
 type replacerFunc func(newNode, parent SQLNode)
 
 // application carries all the shared data so we can pass it around cheaply.
 type application struct {
-	pre, post ApplyFunc
-	cur       Cursor
+	pre, post    ApplyFunc
+	cur          Cursor
+	collectPaths bool
 }
diff --git a/go/vt/sqlparser/rewriter_test.go b/go/vt/sqlparser/rewriter_test.go
index b7d24406677..5811c672b7a 100644
--- a/go/vt/sqlparser/rewriter_test.go
+++ b/go/vt/sqlparser/rewriter_test.go
@@ -65,6 +65,45 @@ func TestReplaceWorksInLaterCalls(t *testing.T) {
 	assert.Equal(t, 2, count)
 }
 
+func TestFindColNamesWithPaths(t *testing.T) {
+	// this is the tpch query #1
+	q := `
+select l_returnflag,
+       l_linestatus,
+       sum(l_quantity)                                       as sum_qty,
+       sum(l_extendedprice)                                  as sum_base_price,
+       sum(l_extendedprice * (1 - l_discount))               as sum_disc_price,
+       sum(l_extendedprice * (1 - l_discount) * (1 + l_tax)) as sum_charge,
+       avg(l_quantity)                                       as avg_qty,
+       avg(l_extendedprice)                                  as avg_price,
+       avg(l_discount)                                       as avg_disc,
+       count(*)                                              as count_order
+from lineitem
+where l_shipdate <= '1998-12-01' - interval '108' day
+group by l_returnflag, l_linestatus
+order by l_returnflag, l_linestatus`
+	ast, err := NewTestParser().Parse(q)
+	require.NoError(t, err)
+
+	var foundColNamePaths []ASTPath
+	var foundColNames []*ColName
+	RewriteWithPath(ast,
+		func(cursor *Cursor) bool {
+			colName, ok := cursor.Node().(*ColName)
+			if ok {
+				foundColNames = append(foundColNames, colName)
+				foundColNamePaths = append(foundColNamePaths, cursor.Path())
+			}
+
+			return true
+		}, nil)
+
+	for idx, path := range foundColNamePaths {
+		node := GetNodeFromPath(ast, path)
+		require.Same(t, foundColNames[idx], node)
+	}
+}
+
 func TestReplaceAndRevisitWorksInLaterCalls(t *testing.T) {
 	q := "select * from tbl1"
 	parser := NewTestParser()
diff --git a/go/vt/vtgate/planbuilder/operators/join.go b/go/vt/vtgate/planbuilder/operators/join.go
index ff4915527a7..5e8dbc4eabd 100644
--- a/go/vt/vtgate/planbuilder/operators/join.go
+++ b/go/vt/vtgate/planbuilder/operators/join.go
@@ -103,7 +103,7 @@ func createLeftOuterJoin(ctx *plancontext.PlanningContext, join *sqlparser.JoinT
 
 	// for outer joins we have to be careful with the predicates we use
 	var op Operator
-	subq, _ := getSubQuery(join.Condition.On)
+	subq, _, _ := getSubQuery(join.Condition.On)
 	if subq != nil {
 		panic(vterrors.VT12001("subquery in outer join predicate"))
 	}
diff --git a/go/vt/vtgate/planbuilder/operators/subquery_builder.go b/go/vt/vtgate/planbuilder/operators/subquery_builder.go
index cc7dc9afe69..d9c29d936ab 100644
--- a/go/vt/vtgate/planbuilder/operators/subquery_builder.go
+++ b/go/vt/vtgate/planbuilder/operators/subquery_builder.go
@@ -53,22 +53,23 @@ func (sqb *SubQueryBuilder) handleSubquery(
 	expr sqlparser.Expr,
 	outerID semantics.TableSet,
 ) *SubQuery {
-	subq, parentExpr := getSubQuery(expr)
+	subq, parentExpr, path := getSubQuery(expr)
 	if subq == nil {
 		return nil
 	}
 	argName := ctx.GetReservedArgumentFor(subq)
-	sqInner := createSubqueryOp(ctx, parentExpr, expr, subq, outerID, argName)
+	sqInner := createSubqueryOp(ctx, parentExpr, expr, subq, outerID, argName, path)
 	sqb.Inner = append(sqb.Inner, sqInner)
 
 	return sqInner
 }
 
-func getSubQuery(expr sqlparser.Expr) (subqueryExprExists *sqlparser.Subquery, parentExpr sqlparser.Expr) {
+func getSubQuery(expr sqlparser.Expr) (subqueryExprExists *sqlparser.Subquery, parentExpr sqlparser.Expr, path sqlparser.ASTPath) {
 	flipped := false
-	_ = sqlparser.Rewrite(expr, func(cursor *sqlparser.Cursor) bool {
+	_ = sqlparser.RewriteWithPath(expr, func(cursor *sqlparser.Cursor) bool {
 		if subq, ok := cursor.Node().(*sqlparser.Subquery); ok {
 			subqueryExprExists = subq
+			path = cursor.Path()
 			parentExpr = subq
 			if expr, ok := cursor.Parent().(sqlparser.Expr); ok {
 				parentExpr = expr
@@ -95,21 +96,22 @@ func createSubqueryOp(
 	subq *sqlparser.Subquery,
 	outerID semantics.TableSet,
 	name string,
+	path sqlparser.ASTPath,
 ) *SubQuery {
 	switch parent := parent.(type) {
 	case *sqlparser.NotExpr:
 		switch parent.Expr.(type) {
 		case *sqlparser.ExistsExpr:
-			return createSubquery(ctx, original, subq, outerID, parent, name, opcode.PulloutNotExists, false)
+			return createSubqueryFromPath(ctx, original, subq, path, outerID, parent, name, opcode.PulloutNotExists, false)
 		case *sqlparser.ComparisonExpr:
 			panic("should have been rewritten")
 		}
 	case *sqlparser.ExistsExpr:
-		return createSubquery(ctx, original, subq, outerID, parent, name, opcode.PulloutExists, false)
+		return createSubqueryFromPath(ctx, original, subq, path, outerID, parent, name, opcode.PulloutExists, false)
 	case *sqlparser.ComparisonExpr:
-		return createComparisonSubQuery(ctx, parent, original, subq, outerID, name)
+		return createComparisonSubQuery(ctx, parent, original, subq, path, outerID, name)
 	}
-	return createSubquery(ctx, original, subq, outerID, parent, name, opcode.PulloutValue, false)
+	return createSubqueryFromPath(ctx, original, subq, path, outerID, parent, name, opcode.PulloutValue, false)
 }
 
 // inspectStatement goes through all the predicates contained in the AST
@@ -188,6 +190,44 @@ func createSubquery(
 	}
 }
 
+func createSubqueryFromPath(
+	ctx *plancontext.PlanningContext,
+	original sqlparser.Expr,
+	subq *sqlparser.Subquery,
+	path sqlparser.ASTPath,
+	outerID semantics.TableSet,
+	parent sqlparser.Expr,
+	argName string,
+	filterType opcode.PulloutOpcode,
+	isArg bool,
+) *SubQuery {
+	topLevel := ctx.SemTable.EqualsExpr(original, parent)
+	original = cloneASTAndSemState(ctx, original)
+	originalSq := sqlparser.GetNodeFromPath(original, path).(*sqlparser.Subquery)
+	subqID := findTablesContained(ctx, originalSq.Select)
+	totalID := subqID.Merge(outerID)
+	sqc := &SubQueryBuilder{totalID: totalID, subqID: subqID, outerID: outerID}
+
+	predicates, joinCols := sqc.inspectStatement(ctx, subq.Select)
+	correlated := !ctx.SemTable.RecursiveDeps(subq).IsEmpty()
+
+	opInner := translateQueryToOp(ctx, subq.Select)
+
+	opInner = sqc.getRootOperator(opInner, nil)
+	return &SubQuery{
+		FilterType:       filterType,
+		Subquery:         opInner,
+		Predicates:       predicates,
+		Original:         original,
+		ArgName:          argName,
+		originalSubquery: originalSq,
+		IsArgument:       isArg,
+		TopLevel:         topLevel,
+		JoinColumns:      joinCols,
+		correlated:       correlated,
+	}
+}
+
 func (sqb *SubQueryBuilder) inspectWhere(
 	ctx *plancontext.PlanningContext,
 	in *sqlparser.Where,
@@ -260,6 +300,7 @@ func createComparisonSubQuery(
 	parent *sqlparser.ComparisonExpr,
 	original sqlparser.Expr,
 	subFromOutside *sqlparser.Subquery,
+	path sqlparser.ASTPath,
 	outerID semantics.TableSet,
 	name string,
 ) *SubQuery {
@@ -276,7 +317,7 @@ func createComparisonSubQuery(
 		filterType = opcode.PulloutNotIn
 	}
 
-	subquery := createSubquery(ctx, original, subq, outerID, parent, name, filterType, false)
+	subquery := createSubqueryFromPath(ctx, original, subq, path, outerID, parent, name, filterType, false)
 
 	// if we are comparing with a column from the inner subquery,
 	// we add this extra predicate to check if the two sides are mergable or not
diff --git a/go/vt/vtgate/semantics/semantic_table.go b/go/vt/vtgate/semantics/semantic_table.go
index efe574501c1..c8e4ca35350 100644
--- a/go/vt/vtgate/semantics/semantic_table.go
+++ b/go/vt/vtgate/semantics/semantic_table.go
@@ -654,6 +654,21 @@ func (st *SemTable) GetExprAndEqualities(expr sqlparser.Expr) []sqlparser.Expr {
 	return result
 }
 
+// ForEachExprEquality returns a slice containing the given expression, and it's known equalities if any
+func (st *SemTable) ForEachExprEquality(in sqlparser.Expr, forEach func(sqlparser.Expr) error) error {
+	switch expr := in.(type) {
+	case *sqlparser.ColName:
+		table := st.DirectDeps(expr)
+		k := columnName{Table: table, ColumnName: expr.Name.String()}
+		for _, expr := range st.ColumnEqualities[k] {
+			if err := forEach(expr); err != nil {
+				return err
+			}
+		}
+	}
+	return nil
+}
+
 // TableInfoForExpr returns the table info of the table that this expression depends on.
 // Careful: this only works for expressions that have a single table dependency
 func (st *SemTable) TableInfoForExpr(expr sqlparser.Expr) (TableInfo, error) {

From 67d081a7a33cac32d1639f22afad91b9a52d999c Mon Sep 17 00:00:00 2001
From: Dirkjan Bussink <d.bussink@gmail.com>
Date: Sun, 16 Feb 2025 13:10:46 +0100
Subject: [PATCH 63/68] Remove bits of unused code across various packages
 (#17785)

---
 go/bytes2/buffer.go                           |  5 -----
 go/bytes2/buffer_test.go                      |  2 +-
 go/cache/theine/bf/bf.go                      | 10 ----------
 go/cache/theine/bf/bf_test.go                 |  5 +----
 go/cmd/vtctldclient/command/framework_test.go |  8 --------
 go/sqltypes/value_test.go                     | 15 ++-------------
 go/test/vschemawrapper/vschema_wrapper.go     | 14 --------------
 go/vt/schemadiff/table.go                     | 10 ----------
 go/vt/sqlparser/rewriter_api.go               |  9 ---------
 go/vt/sqlparser/tracked_buffer.go             |  6 ------
 go/vt/vttablet/onlineddl/executor.go          |  5 -----
 go/vt/vttablet/onlineddl/vrepl.go             | 13 -------------
 go/vt/wrangler/testlib/fake_tablet.go         |  8 --------
 13 files changed, 4 insertions(+), 106 deletions(-)

diff --git a/go/bytes2/buffer.go b/go/bytes2/buffer.go
index 48561c5e493..ba0b1ec2265 100644
--- a/go/bytes2/buffer.go
+++ b/go/bytes2/buffer.go
@@ -28,11 +28,6 @@ type Buffer struct {
 	bytes []byte
 }
 
-// NewBuffer is equivalent to bytes.NewBuffer.
-func NewBuffer(b []byte) *Buffer {
-	return &Buffer{bytes: b}
-}
-
 // Write is equivalent to bytes.Buffer.Write.
 func (buf *Buffer) Write(b []byte) (int, error) {
 	buf.bytes = append(buf.bytes, b...)
diff --git a/go/bytes2/buffer_test.go b/go/bytes2/buffer_test.go
index 1652f176df4..5171059d375 100644
--- a/go/bytes2/buffer_test.go
+++ b/go/bytes2/buffer_test.go
@@ -23,7 +23,7 @@ import (
 )
 
 func TestBuffer(t *testing.T) {
-	b := NewBuffer(nil)
+	var b Buffer
 
 	// Test Write function
 	b.Write([]byte("ab"))
diff --git a/go/cache/theine/bf/bf.go b/go/cache/theine/bf/bf.go
index 97b27a5c217..3549d709d97 100644
--- a/go/cache/theine/bf/bf.go
+++ b/go/cache/theine/bf/bf.go
@@ -19,16 +19,6 @@ func New(falsePositiveRate float64) *Bloomfilter {
 	return d
 }
 
-// create new bloomfilter with given size in bytes
-func NewWithSize(size uint32) *Bloomfilter {
-	d := &Bloomfilter{}
-	bits := size * 8
-	m := nextPowerOfTwo(uint32(bits))
-	d.M = m
-	d.Filter = newbv(m)
-	return d
-}
-
 func (d *Bloomfilter) EnsureCapacity(capacity int) {
 	if capacity <= d.Capacity {
 		return
diff --git a/go/cache/theine/bf/bf_test.go b/go/cache/theine/bf/bf_test.go
index 135826195ac..12999cdcbc9 100644
--- a/go/cache/theine/bf/bf_test.go
+++ b/go/cache/theine/bf/bf_test.go
@@ -7,11 +7,8 @@ import (
 )
 
 func TestBloom(t *testing.T) {
-	bf := NewWithSize(5)
-	bf.FalsePositiveRate = 0.1
-	bf.EnsureCapacity(5)
+	bf := New(0.1)
 	bf.EnsureCapacity(500)
-	bf.EnsureCapacity(200)
 
 	exist := bf.Insert(123)
 	require.False(t, exist)
diff --git a/go/cmd/vtctldclient/command/framework_test.go b/go/cmd/vtctldclient/command/framework_test.go
index 3e4a6753411..351356ea3a0 100644
--- a/go/cmd/vtctldclient/command/framework_test.go
+++ b/go/cmd/vtctldclient/command/framework_test.go
@@ -101,14 +101,6 @@ func TabletKeyspaceShard(t *testing.T, keyspace, shard string) TabletOption {
 	}
 }
 
-// ForceInitTablet is the tablet option to set the 'force' flag during InitTablet
-func ForceInitTablet() TabletOption {
-	return func(tablet *topodatapb.Tablet) {
-		// set the force_init field into the portmap as a hack
-		tablet.PortMap["force_init"] = 1
-	}
-}
-
 // StartHTTPServer is the tablet option to start the HTTP server when
 // starting a tablet.
 func StartHTTPServer() TabletOption {
diff --git a/go/sqltypes/value_test.go b/go/sqltypes/value_test.go
index f6360c8b5c4..e71e866c9f5 100644
--- a/go/sqltypes/value_test.go
+++ b/go/sqltypes/value_test.go
@@ -20,7 +20,6 @@ import (
 	"math"
 	"strings"
 	"testing"
-	"time"
 
 	"github.com/stretchr/testify/assert"
 
@@ -612,16 +611,6 @@ func TestToUint32(t *testing.T) {
 	}
 }
 
-var randomLocation = time.FixedZone("Nowhere", 3*60*60)
-
-func DatetimeValue(str string) Value {
-	return TestValue(Datetime, str)
-}
-
-func DateValue(str string) Value {
-	return TestValue(Date, str)
-}
-
 func TestEncodeSQLStringBuilder(t *testing.T) {
 	testcases := []struct {
 		in     Value
@@ -680,9 +669,9 @@ func TestEncodeSQLBytes2(t *testing.T) {
 		outSQL: "\x89\x02\x011\x950\x03foo",
 	}}
 	for _, tcase := range testcases {
-		buf := bytes2.NewBuffer([]byte{})
+		var buf bytes2.Buffer
 
-		tcase.in.EncodeSQLBytes2(buf)
+		tcase.in.EncodeSQLBytes2(&buf)
 		assert.Equal(t, tcase.outSQL, buf.String())
 	}
 }
diff --git a/go/test/vschemawrapper/vschema_wrapper.go b/go/test/vschemawrapper/vschema_wrapper.go
index 02daa646bf8..b48d7f5d0b7 100644
--- a/go/test/vschemawrapper/vschema_wrapper.go
+++ b/go/test/vschemawrapper/vschema_wrapper.go
@@ -288,20 +288,6 @@ func (vw *VSchemaWrapper) FindTableOrVindex(tab sqlparser.TableName) (*vindexes.
 	return vw.Vcursor.FindTableOrVindex(tab)
 }
 
-func (vw *VSchemaWrapper) getActualKeyspace() string {
-	if vw.Keyspace == nil {
-		return ""
-	}
-	if !sqlparser.SystemSchema(vw.Keyspace.Name) {
-		return vw.Keyspace.Name
-	}
-	ks, err := vw.AnyKeyspace()
-	if err != nil {
-		return ""
-	}
-	return ks.Name
-}
-
 func (vw *VSchemaWrapper) SelectedKeyspace() (*vindexes.Keyspace, error) {
 	return vw.AnyKeyspace()
 }
diff --git a/go/vt/schemadiff/table.go b/go/vt/schemadiff/table.go
index 88f8e7d4ce8..182aa9537e7 100644
--- a/go/vt/schemadiff/table.go
+++ b/go/vt/schemadiff/table.go
@@ -1099,16 +1099,6 @@ func (c *CreateTableEntity) TableDiff(other *CreateTableEntity, hints *DiffHints
 	return parentAlterTableEntityDiff, nil
 }
 
-func (c *CreateTableEntity) diffTableCharset(
-	t1cc *charsetCollate,
-	t2cc *charsetCollate,
-) string {
-	if t1cc.charset != t2cc.charset {
-		return t2cc.charset
-	}
-	return ""
-}
-
 // isDefaultTableOptionValue sees if the value for a TableOption is also its default value
 func isDefaultTableOptionValue(option *sqlparser.TableOption) bool {
 	var value string
diff --git a/go/vt/sqlparser/rewriter_api.go b/go/vt/sqlparser/rewriter_api.go
index e159987e8e1..5641681b447 100644
--- a/go/vt/sqlparser/rewriter_api.go
+++ b/go/vt/sqlparser/rewriter_api.go
@@ -126,15 +126,6 @@ func (c *Cursor) Replace(newNode SQLNode) {
 	c.node = newNode
 }
 
-// ReplacerF returns a replace func that will work even when the cursor has moved to a different node.
-func (c *Cursor) ReplacerF() func(newNode SQLNode) {
-	replacer := c.replacer
-	parent := c.parent
-	return func(newNode SQLNode) {
-		replacer(newNode, parent)
-	}
-}
-
 // ReplaceAndRevisit replaces the current node in the parent field with this new object.
 // When used, this will abort the visitation of the current node - no post or children visited,
 // and the new node visited.
diff --git a/go/vt/sqlparser/tracked_buffer.go b/go/vt/sqlparser/tracked_buffer.go
index 9ef0cfd1f93..7fdb741aed6 100644
--- a/go/vt/sqlparser/tracked_buffer.go
+++ b/go/vt/sqlparser/tracked_buffer.go
@@ -430,12 +430,6 @@ func CanonicalString(node SQLNode) string {
 	return buf.String()
 }
 
-func FormatSlice[T SQLNode](buf *TrackedBuffer, valueExprs []T) {
-	for _, expr := range valueExprs {
-		buf.Myprintf("%v", expr)
-	}
-}
-
 func SliceString[T SQLNode](valueExprs []T) string {
 	return SliceStringWithSep(valueExprs, ", ")
 }
diff --git a/go/vt/vttablet/onlineddl/executor.go b/go/vt/vttablet/onlineddl/executor.go
index ea6ea8732d2..3a3d1a9906e 100644
--- a/go/vt/vttablet/onlineddl/executor.go
+++ b/go/vt/vttablet/onlineddl/executor.go
@@ -25,7 +25,6 @@ import (
 	"errors"
 	"fmt"
 	"os"
-	"path"
 	"strconv"
 	"strings"
 	"sync"
@@ -425,10 +424,6 @@ func (e *Executor) isAnyConflictingMigrationRunning(onlineDDL *schema.OnlineDDL)
 	return (conflictingMigration != nil), conflictingMigration
 }
 
-func (e *Executor) ptPidFileName(uuid string) string {
-	return path.Join(os.TempDir(), fmt.Sprintf("pt-online-schema-change.%s.pid", uuid))
-}
-
 // tableExists checks if a given table exists.
 func (e *Executor) tableExists(ctx context.Context, tableName string) (bool, error) {
 	tableName = strings.ReplaceAll(tableName, `_`, `\_`)
diff --git a/go/vt/vttablet/onlineddl/vrepl.go b/go/vt/vttablet/onlineddl/vrepl.go
index 7423b05a574..52ac775adfe 100644
--- a/go/vt/vttablet/onlineddl/vrepl.go
+++ b/go/vt/vttablet/onlineddl/vrepl.go
@@ -226,19 +226,6 @@ func (v *VRepl) readTableStatus(ctx context.Context, conn *dbconnpool.DBConnecti
 	return tableRows, err
 }
 
-// formalizeColumns
-func formalizeColumns(columnsLists ...*schemadiff.ColumnDefinitionEntityList) error {
-	for _, colList := range columnsLists {
-		for _, col := range colList.Entities {
-			col.SetExplicitDefaultAndNull()
-			if err := col.SetExplicitCharsetCollate(); err != nil {
-				return err
-			}
-		}
-	}
-	return nil
-}
-
 func (v *VRepl) analyzeAlter() error {
 	if v.alterTableAnalysis.IsRenameTable {
 		return fmt.Errorf("renaming the table is not supported in ALTER TABLE")
diff --git a/go/vt/wrangler/testlib/fake_tablet.go b/go/vt/wrangler/testlib/fake_tablet.go
index 97d74edf3f7..9649d717d73 100644
--- a/go/vt/wrangler/testlib/fake_tablet.go
+++ b/go/vt/wrangler/testlib/fake_tablet.go
@@ -102,14 +102,6 @@ func TabletKeyspaceShard(t *testing.T, keyspace, shard string) TabletOption {
 	}
 }
 
-// ForceInitTablet is the tablet option to set the 'force' flag during InitTablet
-func ForceInitTablet() TabletOption {
-	return func(tablet *topodatapb.Tablet) {
-		// set the force_init field into the portmap as a hack
-		tablet.PortMap["force_init"] = 1
-	}
-}
-
 // StartHTTPServer is the tablet option to start the HTTP server when
 // starting a tablet.
 func StartHTTPServer() TabletOption {

From c88ac785d668fe244a5f756b297aa92c8a99f19b Mon Sep 17 00:00:00 2001
From: Arthur Schreiber <arthurschreiber@github.com>
Date: Mon, 17 Feb 2025 15:26:50 +0100
Subject: [PATCH 64/68] Fix a potential connection pool leak. (#17807)

Signed-off-by: Arthur Schreiber <arthurschreiber@github.com>
---
 go/pools/smartconnpool/stack.go      |  1 +
 go/pools/smartconnpool/stack_test.go | 26 ++++++++++++++++++++++++++
 2 files changed, 27 insertions(+)
 create mode 100644 go/pools/smartconnpool/stack_test.go

diff --git a/go/pools/smartconnpool/stack.go b/go/pools/smartconnpool/stack.go
index 8d656ee4e8d..af86fa354bd 100644
--- a/go/pools/smartconnpool/stack.go
+++ b/go/pools/smartconnpool/stack.go
@@ -51,6 +51,7 @@ func (s *connStack[C]) Pop() (*Pooled[C], bool) {
 
 		newHead := oldHead.next.Load()
 		if s.top.CompareAndSwap(oldHead, popCount, newHead, popCount+1) {
+			oldHead.next.Store(nil)
 			return oldHead, true
 		}
 		runtime.Gosched()
diff --git a/go/pools/smartconnpool/stack_test.go b/go/pools/smartconnpool/stack_test.go
new file mode 100644
index 00000000000..a8150bd8186
--- /dev/null
+++ b/go/pools/smartconnpool/stack_test.go
@@ -0,0 +1,26 @@
+package smartconnpool
+
+import (
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+)
+
+type testPooled struct {
+	Connection
+}
+
+func TestStackPop(t *testing.T) {
+	s := &connStack[testPooled]{}
+
+	first := &Pooled[testPooled]{}
+	s.Push(first)
+
+	second := &Pooled[testPooled]{}
+	s.Push(second)
+
+	c, ok := s.Pop()
+	assert.True(t, ok)
+
+	assert.Nil(t, c.next.Load())
+}

From 0c6ad63126012a7bb3daa6b86b2736dd30e65a9d Mon Sep 17 00:00:00 2001
From: Dirkjan Bussink <d.bussink@gmail.com>
Date: Tue, 18 Feb 2025 11:16:52 +0100
Subject: [PATCH 65/68] Update to Go 1.24.0 (#17790)

Signed-off-by: Dirkjan Bussink <d.bussink@gmail.com>
Signed-off-by: Florent Poinsard <florent.poinsard@outlook.fr>
Signed-off-by: Vicent Marti <vmg@strn.cat>
Co-authored-by: Florent Poinsard <florent.poinsard@outlook.fr>
Co-authored-by: Vicent Marti <vmg@strn.cat>
---
 .github/workflows/static_checks_etc.yml       |   2 +-
 .../upgrade_downgrade_test_backups_e2e.yml    |   2 +-
 .../upgrade_downgrade_test_backups_manual.yml |   2 +-
 .../upgrade_downgrade_test_onlineddl_flow.yml |   2 +-
 ...e_downgrade_test_query_serving_queries.yml |   2 +-
 ...downgrade_test_query_serving_queries_2.yml |   2 +-
 ...de_downgrade_test_query_serving_schema.yml |   2 +-
 ...rade_downgrade_test_reparent_old_vtctl.yml |   2 +-
 ...e_downgrade_test_reparent_old_vttablet.yml |   2 +-
 .../upgrade_downgrade_test_semi_sync.yml      |   2 +-
 .golangci.yml                                 |   4 +-
 Makefile                                      |   2 +-
 build.env                                     |   2 +-
 docker/bootstrap/CHANGELOG.md                 |   5 +-
 docker/bootstrap/Dockerfile.common            |   2 +-
 docker/lite/Dockerfile                        |   2 +-
 docker/lite/Dockerfile.mysql84                |   2 +-
 docker/lite/Dockerfile.percona80              |   2 +-
 docker/vttestserver/Dockerfile.mysql80        |   2 +-
 docker/vttestserver/Dockerfile.mysql84        |   2 +-
 go.mod                                        |   2 +-
 go/hack/ensure_swiss_map.go                   |  39 +++++++
 go/hack/hack_test.go                          |  46 ++++++++
 go/hack/msize.go                              | 102 ++++++++++++++++++
 go/mysql/collations/cached_size.go            |  55 ++--------
 go/mysql/collations/colldata/cached_size.go   |   2 +-
 go/mysql/decimal/cached_size.go               |   2 +-
 go/mysql/json/cached_size.go                  |   2 +-
 go/pools/smartconnpool/cached_size.go         |   2 +-
 go/sqltypes/cached_size.go                    |   2 +-
 go/tools/sizegen/integration/cached_size.go   |  37 +------
 .../sizegen/integration/integration_test.go   |  23 ++--
 go/tools/sizegen/integration/types.go         |   2 +
 go/tools/sizegen/sizegen.go                   |  59 +++-------
 go/vt/key/cached_size.go                      |   2 +-
 go/vt/proto/query/cached_size.go              |   2 +-
 go/vt/proto/topodata/cached_size.go           |   2 +-
 go/vt/proto/vttime/cached_size.go             |   2 +-
 go/vt/schema/cached_size.go                   |   2 +-
 go/vt/sqlparser/cached_size.go                |  19 +---
 go/vt/srvtopo/cached_size.go                  |   2 +-
 go/vt/tableacl/cached_size.go                 |   2 +-
 go/vt/vtenv/cached_size.go                    |   2 +-
 go/vt/vtgate/engine/cached_size.go            |  91 ++--------------
 go/vt/vtgate/evalengine/cached_size.go        |   2 +-
 go/vt/vtgate/vindexes/cached_size.go          |  64 ++---------
 go/vt/vttablet/tabletserver/cached_size.go    |   2 +-
 .../tabletserver/planbuilder/cached_size.go   |   2 +-
 .../tabletserver/rules/cached_size.go         |   2 +-
 .../tabletserver/schema/cached_size.go        |   2 +-
 go/vt/vttablet/tabletserver/schema/schema.go  |  11 +-
 .../tabletserver/schema/schemaz_test.go       |   4 +-
 misc/git/hooks/golangci-lint                  |   4 +-
 test.go                                       |   2 +-
 test/templates/dockerfile.tpl                 |   2 +-
 55 files changed, 301 insertions(+), 342 deletions(-)
 create mode 100644 go/hack/ensure_swiss_map.go

diff --git a/.github/workflows/static_checks_etc.yml b/.github/workflows/static_checks_etc.yml
index b7f14688b95..8af08fbb9eb 100644
--- a/.github/workflows/static_checks_etc.yml
+++ b/.github/workflows/static_checks_etc.yml
@@ -197,7 +197,7 @@ jobs:
 
       - name: Install golangci-lint
         if: steps.skip-workflow.outputs.skip-workflow == 'false' && steps.changes.outputs.go_files == 'true'
-        run: go install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.60.2
+        run: go install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.64.5
 
       - name: Clean Env
         if: steps.skip-workflow.outputs.skip-workflow == 'false' && steps.changes.outputs.go_files == 'true'
diff --git a/.github/workflows/upgrade_downgrade_test_backups_e2e.yml b/.github/workflows/upgrade_downgrade_test_backups_e2e.yml
index 9fc4c00e18e..6363811f5b5 100644
--- a/.github/workflows/upgrade_downgrade_test_backups_e2e.yml
+++ b/.github/workflows/upgrade_downgrade_test_backups_e2e.yml
@@ -74,7 +74,7 @@ jobs:
       if: steps.skip-workflow.outputs.skip-workflow == 'false' && steps.changes.outputs.end_to_end == 'true'
       uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2
       with:
-        go-version: 1.23.5
+        go-version: 1.24.0
 
     - name: Set up python
       if: steps.skip-workflow.outputs.skip-workflow == 'false' && steps.changes.outputs.end_to_end == 'true'
diff --git a/.github/workflows/upgrade_downgrade_test_backups_manual.yml b/.github/workflows/upgrade_downgrade_test_backups_manual.yml
index 7ca2c3ebbea..6175883c1b7 100644
--- a/.github/workflows/upgrade_downgrade_test_backups_manual.yml
+++ b/.github/workflows/upgrade_downgrade_test_backups_manual.yml
@@ -78,7 +78,7 @@ jobs:
       if: steps.skip-workflow.outputs.skip-workflow == 'false' && steps.changes.outputs.end_to_end == 'true'
       uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2
       with:
-        go-version: 1.23.5
+        go-version: 1.24.0
 
     - name: Set up python
       if: steps.skip-workflow.outputs.skip-workflow == 'false' && steps.changes.outputs.end_to_end == 'true'
diff --git a/.github/workflows/upgrade_downgrade_test_onlineddl_flow.yml b/.github/workflows/upgrade_downgrade_test_onlineddl_flow.yml
index 03dd28c2e2a..91062f46211 100644
--- a/.github/workflows/upgrade_downgrade_test_onlineddl_flow.yml
+++ b/.github/workflows/upgrade_downgrade_test_onlineddl_flow.yml
@@ -86,7 +86,7 @@ jobs:
       if: steps.skip-workflow.outputs.skip-workflow == 'false' && steps.changes.outputs.end_to_end == 'true'
       uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2
       with:
-        go-version: 1.23.5
+        go-version: 1.24.0
 
     - name: Set up python
       if: steps.skip-workflow.outputs.skip-workflow == 'false' && steps.changes.outputs.end_to_end == 'true'
diff --git a/.github/workflows/upgrade_downgrade_test_query_serving_queries.yml b/.github/workflows/upgrade_downgrade_test_query_serving_queries.yml
index e155be9f389..17b73a9dca4 100644
--- a/.github/workflows/upgrade_downgrade_test_query_serving_queries.yml
+++ b/.github/workflows/upgrade_downgrade_test_query_serving_queries.yml
@@ -78,7 +78,7 @@ jobs:
       if: steps.skip-workflow.outputs.skip-workflow == 'false' && steps.changes.outputs.end_to_end == 'true'
       uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2
       with:
-        go-version: 1.23.5
+        go-version: 1.24.0
 
     - name: Set up python
       if: steps.skip-workflow.outputs.skip-workflow == 'false' && steps.changes.outputs.end_to_end == 'true'
diff --git a/.github/workflows/upgrade_downgrade_test_query_serving_queries_2.yml b/.github/workflows/upgrade_downgrade_test_query_serving_queries_2.yml
index 2d58d4c8fae..adff191250c 100644
--- a/.github/workflows/upgrade_downgrade_test_query_serving_queries_2.yml
+++ b/.github/workflows/upgrade_downgrade_test_query_serving_queries_2.yml
@@ -78,7 +78,7 @@ jobs:
       if: steps.skip-workflow.outputs.skip-workflow == 'false' && steps.changes.outputs.end_to_end == 'true'
       uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2
       with:
-        go-version: 1.23.5
+        go-version: 1.24.0
 
     - name: Set up python
       if: steps.skip-workflow.outputs.skip-workflow == 'false' && steps.changes.outputs.end_to_end == 'true'
diff --git a/.github/workflows/upgrade_downgrade_test_query_serving_schema.yml b/.github/workflows/upgrade_downgrade_test_query_serving_schema.yml
index 8c82838594d..41861a063c9 100644
--- a/.github/workflows/upgrade_downgrade_test_query_serving_schema.yml
+++ b/.github/workflows/upgrade_downgrade_test_query_serving_schema.yml
@@ -78,7 +78,7 @@ jobs:
       if: steps.skip-workflow.outputs.skip-workflow == 'false' && steps.changes.outputs.end_to_end == 'true'
       uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2
       with:
-        go-version: 1.23.5
+        go-version: 1.24.0
 
     - name: Set up python
       if: steps.skip-workflow.outputs.skip-workflow == 'false' && steps.changes.outputs.end_to_end == 'true'
diff --git a/.github/workflows/upgrade_downgrade_test_reparent_old_vtctl.yml b/.github/workflows/upgrade_downgrade_test_reparent_old_vtctl.yml
index b3e2cf6451e..6ed7293a1d4 100644
--- a/.github/workflows/upgrade_downgrade_test_reparent_old_vtctl.yml
+++ b/.github/workflows/upgrade_downgrade_test_reparent_old_vtctl.yml
@@ -78,7 +78,7 @@ jobs:
       if: steps.skip-workflow.outputs.skip-workflow == 'false' && steps.changes.outputs.end_to_end == 'true'
       uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2
       with:
-        go-version: 1.23.5
+        go-version: 1.24.0
 
     - name: Set up python
       if: steps.skip-workflow.outputs.skip-workflow == 'false' && steps.changes.outputs.end_to_end == 'true'
diff --git a/.github/workflows/upgrade_downgrade_test_reparent_old_vttablet.yml b/.github/workflows/upgrade_downgrade_test_reparent_old_vttablet.yml
index fe0702b2fff..17467c5d57c 100644
--- a/.github/workflows/upgrade_downgrade_test_reparent_old_vttablet.yml
+++ b/.github/workflows/upgrade_downgrade_test_reparent_old_vttablet.yml
@@ -78,7 +78,7 @@ jobs:
       if: steps.skip-workflow.outputs.skip-workflow == 'false' && steps.changes.outputs.end_to_end == 'true'
       uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2
       with:
-        go-version: 1.23.5
+        go-version: 1.24.0
 
     - name: Set up python
       if: steps.skip-workflow.outputs.skip-workflow == 'false' && steps.changes.outputs.end_to_end == 'true'
diff --git a/.github/workflows/upgrade_downgrade_test_semi_sync.yml b/.github/workflows/upgrade_downgrade_test_semi_sync.yml
index cb950d43e4e..50863df04d2 100644
--- a/.github/workflows/upgrade_downgrade_test_semi_sync.yml
+++ b/.github/workflows/upgrade_downgrade_test_semi_sync.yml
@@ -74,7 +74,7 @@ jobs:
         if: steps.skip-workflow.outputs.skip-workflow == 'false' && steps.changes.outputs.end_to_end == 'true'
         uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2
         with:
-          go-version: 1.23.5
+          go-version: 1.24.0
 
       - name: Set up python
         if: steps.skip-workflow.outputs.skip-workflow == 'false' && steps.changes.outputs.end_to_end == 'true'
diff --git a/.golangci.yml b/.golangci.yml
index e907f56743b..63c547fcee9 100644
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -1,5 +1,5 @@
 run:
-  go: 1.23
+  go: 1.24
   timeout: 10m
 
 linters-settings:
@@ -191,4 +191,4 @@ issues:
 
 # https://github.com/golangci/golangci/wiki/Configuration
 service:
-  golangci-lint-version: 1.52.2 # use the fixed version to not introduce new linters unexpectedly
+  golangci-lint-version: 1.64.5 # use the fixed version to not introduce new linters unexpectedly
diff --git a/Makefile b/Makefile
index aeb1955bf18..2ed645315c1 100644
--- a/Makefile
+++ b/Makefile
@@ -286,7 +286,7 @@ $(PROTO_GO_OUTS): minimaltools install_protoc-gen-go proto/*.proto
 # This rule builds the bootstrap images for all flavors.
 DOCKER_IMAGES_FOR_TEST = mysql80 mysql84 percona80
 DOCKER_IMAGES = common $(DOCKER_IMAGES_FOR_TEST)
-BOOTSTRAP_VERSION=41
+BOOTSTRAP_VERSION=42
 ensure_bootstrap_version:
 	find docker/ -type f -exec sed -i "s/^\(ARG bootstrap_version\)=.*/\1=${BOOTSTRAP_VERSION}/" {} \;
 	sed -i 's/\(^.*flag.String(\"bootstrap-version\",\) *\"[^\"]\+\"/\1 \"${BOOTSTRAP_VERSION}\"/' test.go
diff --git a/build.env b/build.env
index 6818975103f..9f513ec8f54 100755
--- a/build.env
+++ b/build.env
@@ -17,7 +17,7 @@
 source ./tools/shell_functions.inc
 
 go version >/dev/null 2>&1 || fail "Go is not installed or is not in \$PATH. See https://vitess.io/contributing/build-from-source for install instructions."
-goversion_min 1.23.5 || echo "Go version reported: `go version`. Version 1.23.5+ recommended. See https://vitess.io/contributing/build-from-source for install instructions."
+goversion_min 1.24.0 || echo "Go version reported: `go version`. Version 1.24.0+ recommended. See https://vitess.io/contributing/build-from-source for install instructions."
 
 mkdir -p dist
 mkdir -p bin
diff --git a/docker/bootstrap/CHANGELOG.md b/docker/bootstrap/CHANGELOG.md
index 9728dffbab8..176540c0430 100644
--- a/docker/bootstrap/CHANGELOG.md
+++ b/docker/bootstrap/CHANGELOG.md
@@ -162,4 +162,7 @@ List of changes between bootstrap image versions.
 ## [41] - 2025-01-15
 ### Changes
 - Update base image to bookworm
-- Add MySQL84 image
\ No newline at end of file
+- Add MySQL84 image
+
+## [42] - 2025-02-14
+- Update build to golang 1.24.0
diff --git a/docker/bootstrap/Dockerfile.common b/docker/bootstrap/Dockerfile.common
index e0866fe4bda..fcbe8b0c629 100644
--- a/docker/bootstrap/Dockerfile.common
+++ b/docker/bootstrap/Dockerfile.common
@@ -1,4 +1,4 @@
-FROM --platform=linux/amd64 golang:1.23.5-bookworm
+FROM --platform=linux/amd64 golang:1.24.0-bookworm
 
 # Install Vitess build dependencies
 RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
diff --git a/docker/lite/Dockerfile b/docker/lite/Dockerfile
index c75a0a5ad4c..70d4787686c 100644
--- a/docker/lite/Dockerfile
+++ b/docker/lite/Dockerfile
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM --platform=linux/amd64 golang:1.23.5-bookworm AS builder
+FROM --platform=linux/amd64 golang:1.24.0-bookworm AS builder
 
 # Allows docker builds to set the BUILD_NUMBER
 ARG BUILD_NUMBER
diff --git a/docker/lite/Dockerfile.mysql84 b/docker/lite/Dockerfile.mysql84
index e2836ca3047..047e3d1f90c 100644
--- a/docker/lite/Dockerfile.mysql84
+++ b/docker/lite/Dockerfile.mysql84
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM --platform=linux/amd64 golang:1.23.5-bookworm AS builder
+FROM --platform=linux/amd64 golang:1.24.0-bookworm AS builder
 
 # Allows docker builds to set the BUILD_NUMBER
 ARG BUILD_NUMBER
diff --git a/docker/lite/Dockerfile.percona80 b/docker/lite/Dockerfile.percona80
index 16e1da78627..011f20c4022 100644
--- a/docker/lite/Dockerfile.percona80
+++ b/docker/lite/Dockerfile.percona80
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM --platform=linux/amd64 golang:1.23.5-bookworm AS builder
+FROM --platform=linux/amd64 golang:1.24.0-bookworm AS builder
 
 # Allows docker builds to set the BUILD_NUMBER
 ARG BUILD_NUMBER
diff --git a/docker/vttestserver/Dockerfile.mysql80 b/docker/vttestserver/Dockerfile.mysql80
index 989aebe8740..ec01244e7a7 100644
--- a/docker/vttestserver/Dockerfile.mysql80
+++ b/docker/vttestserver/Dockerfile.mysql80
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM --platform=linux/amd64 golang:1.23.5-bookworm AS builder
+FROM --platform=linux/amd64 golang:1.24.0-bookworm AS builder
 
 # Allows docker builds to set the BUILD_NUMBER
 ARG BUILD_NUMBER
diff --git a/docker/vttestserver/Dockerfile.mysql84 b/docker/vttestserver/Dockerfile.mysql84
index ad944f500a0..9ddc78b640f 100644
--- a/docker/vttestserver/Dockerfile.mysql84
+++ b/docker/vttestserver/Dockerfile.mysql84
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM --platform=linux/amd64 golang:1.23.5-bookworm AS builder
+FROM --platform=linux/amd64 golang:1.24.0-bookworm AS builder
 
 # Allows docker builds to set the BUILD_NUMBER
 ARG BUILD_NUMBER
diff --git a/go.mod b/go.mod
index d4e98fda37a..3e73e0a74ef 100644
--- a/go.mod
+++ b/go.mod
@@ -1,6 +1,6 @@
 module vitess.io/vitess
 
-go 1.23.5
+go 1.24.0
 
 require (
 	cloud.google.com/go/storage v1.50.0
diff --git a/go/hack/ensure_swiss_map.go b/go/hack/ensure_swiss_map.go
new file mode 100644
index 00000000000..b09bde1121c
--- /dev/null
+++ b/go/hack/ensure_swiss_map.go
@@ -0,0 +1,39 @@
+//go:build !goexperiment.swissmap
+
+/*
+Copyright (c) 2009 The Go Authors. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+   * Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+   * Redistributions in binary form must reproduce the above
+copyright notice, this list of conditions and the following disclaimer
+in the documentation and/or other materials provided with the
+distribution.
+   * Neither the name of Google Inc. nor the names of its
+contributors may be used to endorse or promote products derived from
+this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+// This is invalid Go code, and it will fail to compile if you disable
+// Swiss maps when building Vitess. Our runtime memory accounting system
+// expects the map implementation in Go 1.24 to be Swiss.
+
+package hack
+
+var EnsureSwissMapIsAlwaysEnabled = [-1]struct{}{}
diff --git a/go/hack/hack_test.go b/go/hack/hack_test.go
index 9f71d82cf11..094bd14f5df 100644
--- a/go/hack/hack_test.go
+++ b/go/hack/hack_test.go
@@ -19,6 +19,7 @@ limitations under the License.
 package hack
 
 import (
+	"runtime"
 	"testing"
 
 	"github.com/stretchr/testify/assert"
@@ -47,3 +48,48 @@ func TestStringToByte(t *testing.T) {
 	b = StringBytes(s)
 	assert.Nil(t, b)
 }
+
+func testMapSize[K comparable, V any](t *testing.T, gen func(i int) (K, V)) {
+	for _, size := range []int{16 * 1024, 128 * 1024, 256 * 1024, 512 * 1024, 1024 * 1024} {
+		var before, after runtime.MemStats
+		runtime.GC()
+		runtime.ReadMemStats(&before)
+
+		m := make(map[K]V, size)
+		for i := 0; i < size; i++ {
+			k, v := gen(i)
+			m[k] = v
+		}
+
+		runtime.GC()
+		runtime.ReadMemStats(&after)
+
+		heapDiff := after.HeapAlloc - before.HeapAlloc
+		calcSize := RuntimeMapSize(m)
+
+		assert.InEpsilonf(t, heapDiff, calcSize, 0.1, "%Tx%v heapDiff = %v, calcSize = %v", m, size, heapDiff, calcSize)
+		runtime.KeepAlive(m)
+	}
+}
+
+func TestMapSize(t *testing.T) {
+	testMapSize(t, func(i int) (int, int) {
+		return i, i
+	})
+
+	testMapSize(t, func(i int) (uint32, uint32) {
+		return uint32(i), uint32(i)
+	})
+
+	testMapSize(t, func(i int) ([32]uint32, uint32) {
+		return [32]uint32{0: uint32(i)}, uint32(i)
+	})
+
+	testMapSize(t, func(i int) (uint32, [32]uint32) {
+		return uint32(i), [32]uint32{0: uint32(i)}
+	})
+
+	testMapSize(t, func(i int) ([32]uint32, [32]uint32) {
+		return [32]uint32{0: uint32(i)}, [32]uint32{0: uint32(i)}
+	})
+}
diff --git a/go/hack/msize.go b/go/hack/msize.go
index aead790e627..04024a2a282 100644
--- a/go/hack/msize.go
+++ b/go/hack/msize.go
@@ -32,6 +32,10 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 package hack
 
+import (
+	"unsafe"
+)
+
 const (
 	_MaxSmallSize   = 32768
 	smallSizeDiv    = 8
@@ -74,3 +78,101 @@ func roundupsize(size uintptr) uintptr {
 func RuntimeAllocSize(size int64) int64 {
 	return int64(roundupsize(uintptr(size)))
 }
+
+// RuntimeMapSize returns the size of the internal data structures of a Map.
+// This is an internal implementation detail based on the Swiss Map implementation
+// as of Go 1.24 and needs to be kept up-to-date after every Go release.
+func RuntimeMapSize[K comparable, V any](themap map[K]V) (internalSize int64) {
+	// The following are copies of internal data structures as of Go 1.24
+	// THEY MUST BE KEPT UP TO DATE
+
+	// internal/abi/type.go
+	const SizeofType = 48
+
+	// internal/abi/map_swiss.go
+	type SwissMapType struct {
+		pad       [SizeofType]uint8
+		Key       unsafe.Pointer
+		Elem      unsafe.Pointer
+		Group     unsafe.Pointer
+		Hasher    func(unsafe.Pointer, uintptr) uintptr
+		GroupSize uintptr // == Group.Size_
+		SlotSize  uintptr // size of key/elem slot
+		ElemOff   uintptr // offset of elem in key/elem slot
+		Flags     uint32
+	}
+
+	// internal/runtime/maps/map.go
+	type Map struct {
+		used        uint64
+		seed        uintptr
+		dirPtr      unsafe.Pointer
+		dirLen      int
+		globalDepth uint8
+		globalShift uint8
+		writing     uint8
+		clearSeq    uint64
+	}
+
+	// internal/runtime/maps/groups.go
+	type groupsReference struct {
+		data       unsafe.Pointer // data *[length]typ.Group
+		lengthMask uint64
+	}
+
+	// internal/runtime/maps/table.go
+	type table struct {
+		used       uint16
+		capacity   uint16
+		growthLeft uint16
+		localDepth uint8
+		index      int
+		groups     groupsReference
+	}
+
+	directoryAt := func(m *Map, i uintptr) *table {
+		const PtrSize = 4 << (^uintptr(0) >> 63)
+		return *(**table)(unsafe.Pointer(uintptr(m.dirPtr) + PtrSize*i))
+	}
+
+	// Converting the map to an interface will result in two ptr-sized words;
+	// like all interfaces, the first word points to an *abi.Type instance,
+	// which is specialized as SwissMapType for maps, and to the actual
+	// memory allocation, which is `*Map`
+	type MapInterface struct {
+		Type *SwissMapType
+		Data *Map
+	}
+
+	mapiface := any(themap)
+	iface := (*MapInterface)(unsafe.Pointer(&mapiface))
+	m := iface.Data
+
+	var groupSize = int64(iface.Type.GroupSize)
+	internalSize = int64(unsafe.Sizeof(Map{}))
+
+	if m.dirLen <= 0 {
+		// Small map optimization: we don't allocate tables at all if all the
+		// entries in a map fit in a single group
+		if m.dirPtr != nil {
+			internalSize += RuntimeAllocSize(groupSize)
+		}
+	} else {
+		// For normal maps, we iterate each table and add the size of all the
+		// groups it contains.
+		// See: internal/runtime/maps/export_test.go
+		var lastTab *table
+		for i := range m.dirLen {
+			t := directoryAt(m, uintptr(i))
+			if t == lastTab {
+				continue
+			}
+			lastTab = t
+
+			gc := int64(t.groups.lengthMask + 1)
+			internalSize += RuntimeAllocSize(groupSize * gc)
+		}
+	}
+
+	return internalSize
+}
diff --git a/go/mysql/collations/cached_size.go b/go/mysql/collations/cached_size.go
index 630bf41230a..407c02c4ee9 100644
--- a/go/mysql/collations/cached_size.go
+++ b/go/mysql/collations/cached_size.go
@@ -1,5 +1,5 @@
 /*
-Copyright 2021 The Vitess Authors.
+Copyright 2025 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.
@@ -17,13 +17,7 @@ limitations under the License.
 
 package collations
 
-import (
-	"math"
-	"reflect"
-	"unsafe"
-
-	hack "vitess.io/vitess/go/hack"
-)
+import hack "vitess.io/vitess/go/hack"
 
 //go:nocheckptr
 func (cached *Environment) CachedSize(alloc bool) int64 {
@@ -36,28 +30,14 @@ func (cached *Environment) CachedSize(alloc bool) int64 {
 	}
 	// field byName map[string]vitess.io/vitess/go/mysql/collations.ID
 	if cached.byName != nil {
-		size += int64(48)
-		hmap := reflect.ValueOf(cached.byName)
-		numBuckets := int(math.Pow(2, float64((*(*uint8)(unsafe.Pointer(hmap.Pointer() + uintptr(9)))))))
-		numOldBuckets := (*(*uint16)(unsafe.Pointer(hmap.Pointer() + uintptr(10))))
-		size += hack.RuntimeAllocSize(int64(numOldBuckets * 160))
-		if len(cached.byName) > 0 || numBuckets > 1 {
-			size += hack.RuntimeAllocSize(int64(numBuckets * 160))
-		}
+		size += hack.RuntimeMapSize(cached.byName)
 		for k := range cached.byName {
 			size += hack.RuntimeAllocSize(int64(len(k)))
 		}
 	}
 	// field byCharset map[string]*vitess.io/vitess/go/mysql/collations.colldefaults
 	if cached.byCharset != nil {
-		size += int64(48)
-		hmap := reflect.ValueOf(cached.byCharset)
-		numBuckets := int(math.Pow(2, float64((*(*uint8)(unsafe.Pointer(hmap.Pointer() + uintptr(9)))))))
-		numOldBuckets := (*(*uint16)(unsafe.Pointer(hmap.Pointer() + uintptr(10))))
-		size += hack.RuntimeAllocSize(int64(numOldBuckets * 208))
-		if len(cached.byCharset) > 0 || numBuckets > 1 {
-			size += hack.RuntimeAllocSize(int64(numBuckets * 208))
-		}
+		size += hack.RuntimeMapSize(cached.byCharset)
 		for k, v := range cached.byCharset {
 			size += hack.RuntimeAllocSize(int64(len(k)))
 			if v != nil {
@@ -67,42 +47,21 @@ func (cached *Environment) CachedSize(alloc bool) int64 {
 	}
 	// field byCharsetName map[vitess.io/vitess/go/mysql/collations.ID]string
 	if cached.byCharsetName != nil {
-		size += int64(48)
-		hmap := reflect.ValueOf(cached.byCharsetName)
-		numBuckets := int(math.Pow(2, float64((*(*uint8)(unsafe.Pointer(hmap.Pointer() + uintptr(9)))))))
-		numOldBuckets := (*(*uint16)(unsafe.Pointer(hmap.Pointer() + uintptr(10))))
-		size += hack.RuntimeAllocSize(int64(numOldBuckets * 160))
-		if len(cached.byCharsetName) > 0 || numBuckets > 1 {
-			size += hack.RuntimeAllocSize(int64(numBuckets * 160))
-		}
+		size += hack.RuntimeMapSize(cached.byCharsetName)
 		for _, v := range cached.byCharsetName {
 			size += hack.RuntimeAllocSize(int64(len(v)))
 		}
 	}
 	// field unsupported map[string]vitess.io/vitess/go/mysql/collations.ID
 	if cached.unsupported != nil {
-		size += int64(48)
-		hmap := reflect.ValueOf(cached.unsupported)
-		numBuckets := int(math.Pow(2, float64((*(*uint8)(unsafe.Pointer(hmap.Pointer() + uintptr(9)))))))
-		numOldBuckets := (*(*uint16)(unsafe.Pointer(hmap.Pointer() + uintptr(10))))
-		size += hack.RuntimeAllocSize(int64(numOldBuckets * 160))
-		if len(cached.unsupported) > 0 || numBuckets > 1 {
-			size += hack.RuntimeAllocSize(int64(numBuckets * 160))
-		}
+		size += hack.RuntimeMapSize(cached.unsupported)
 		for k := range cached.unsupported {
 			size += hack.RuntimeAllocSize(int64(len(k)))
 		}
 	}
 	// field byID map[vitess.io/vitess/go/mysql/collations.ID]string
 	if cached.byID != nil {
-		size += int64(48)
-		hmap := reflect.ValueOf(cached.byID)
-		numBuckets := int(math.Pow(2, float64((*(*uint8)(unsafe.Pointer(hmap.Pointer() + uintptr(9)))))))
-		numOldBuckets := (*(*uint16)(unsafe.Pointer(hmap.Pointer() + uintptr(10))))
-		size += hack.RuntimeAllocSize(int64(numOldBuckets * 160))
-		if len(cached.byID) > 0 || numBuckets > 1 {
-			size += hack.RuntimeAllocSize(int64(numBuckets * 160))
-		}
+		size += hack.RuntimeMapSize(cached.byID)
 		for _, v := range cached.byID {
 			size += hack.RuntimeAllocSize(int64(len(v)))
 		}
diff --git a/go/mysql/collations/colldata/cached_size.go b/go/mysql/collations/colldata/cached_size.go
index 190e1731651..a82cacc073b 100644
--- a/go/mysql/collations/colldata/cached_size.go
+++ b/go/mysql/collations/colldata/cached_size.go
@@ -1,5 +1,5 @@
 /*
-Copyright 2021 The Vitess Authors.
+Copyright 2025 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.
diff --git a/go/mysql/decimal/cached_size.go b/go/mysql/decimal/cached_size.go
index 87f6c201b80..10c5b15381d 100644
--- a/go/mysql/decimal/cached_size.go
+++ b/go/mysql/decimal/cached_size.go
@@ -1,5 +1,5 @@
 /*
-Copyright 2021 The Vitess Authors.
+Copyright 2025 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.
diff --git a/go/mysql/json/cached_size.go b/go/mysql/json/cached_size.go
index 27fd511dafc..0d57d9000d8 100644
--- a/go/mysql/json/cached_size.go
+++ b/go/mysql/json/cached_size.go
@@ -1,5 +1,5 @@
 /*
-Copyright 2021 The Vitess Authors.
+Copyright 2025 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.
diff --git a/go/pools/smartconnpool/cached_size.go b/go/pools/smartconnpool/cached_size.go
index 8c985349db3..2c794c46eca 100644
--- a/go/pools/smartconnpool/cached_size.go
+++ b/go/pools/smartconnpool/cached_size.go
@@ -1,5 +1,5 @@
 /*
-Copyright 2021 The Vitess Authors.
+Copyright 2025 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.
diff --git a/go/sqltypes/cached_size.go b/go/sqltypes/cached_size.go
index 53bc407278d..67bf017ed83 100644
--- a/go/sqltypes/cached_size.go
+++ b/go/sqltypes/cached_size.go
@@ -1,5 +1,5 @@
 /*
-Copyright 2021 The Vitess Authors.
+Copyright 2025 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.
diff --git a/go/tools/sizegen/integration/cached_size.go b/go/tools/sizegen/integration/cached_size.go
index 6023b29b7e4..619e77ad817 100644
--- a/go/tools/sizegen/integration/cached_size.go
+++ b/go/tools/sizegen/integration/cached_size.go
@@ -1,5 +1,5 @@
 /*
-Copyright 2021 The Vitess Authors.
+Copyright 2025 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.
@@ -17,13 +17,7 @@ limitations under the License.
 
 package integration
 
-import (
-	"math"
-	"reflect"
-	"unsafe"
-
-	hack "vitess.io/vitess/go/hack"
-)
+import hack "vitess.io/vitess/go/hack"
 
 type cachedObject interface {
 	CachedSize(alloc bool) int64
@@ -89,14 +83,7 @@ func (cached *Map1) CachedSize(alloc bool) int64 {
 	}
 	// field field1 map[uint8]uint8
 	if cached.field1 != nil {
-		size += int64(48)
-		hmap := reflect.ValueOf(cached.field1)
-		numBuckets := int(math.Pow(2, float64((*(*uint8)(unsafe.Pointer(hmap.Pointer() + uintptr(9)))))))
-		numOldBuckets := (*(*uint16)(unsafe.Pointer(hmap.Pointer() + uintptr(10))))
-		size += hack.RuntimeAllocSize(int64(numOldBuckets * 32))
-		if len(cached.field1) > 0 || numBuckets > 1 {
-			size += hack.RuntimeAllocSize(int64(numBuckets * 32))
-		}
+		size += hack.RuntimeMapSize(cached.field1)
 	}
 	return size
 }
@@ -112,14 +99,7 @@ func (cached *Map2) CachedSize(alloc bool) int64 {
 	}
 	// field field1 map[uint64]vitess.io/vitess/go/tools/sizegen/integration.A
 	if cached.field1 != nil {
-		size += int64(48)
-		hmap := reflect.ValueOf(cached.field1)
-		numBuckets := int(math.Pow(2, float64((*(*uint8)(unsafe.Pointer(hmap.Pointer() + uintptr(9)))))))
-		numOldBuckets := (*(*uint16)(unsafe.Pointer(hmap.Pointer() + uintptr(10))))
-		size += hack.RuntimeAllocSize(int64(numOldBuckets * 208))
-		if len(cached.field1) > 0 || numBuckets > 1 {
-			size += hack.RuntimeAllocSize(int64(numBuckets * 208))
-		}
+		size += hack.RuntimeMapSize(cached.field1)
 	}
 	return size
 }
@@ -135,14 +115,7 @@ func (cached *Map3) CachedSize(alloc bool) int64 {
 	}
 	// field field1 map[uint64]vitess.io/vitess/go/tools/sizegen/integration.B
 	if cached.field1 != nil {
-		size += int64(48)
-		hmap := reflect.ValueOf(cached.field1)
-		numBuckets := int(math.Pow(2, float64((*(*uint8)(unsafe.Pointer(hmap.Pointer() + uintptr(9)))))))
-		numOldBuckets := (*(*uint16)(unsafe.Pointer(hmap.Pointer() + uintptr(10))))
-		size += hack.RuntimeAllocSize(int64(numOldBuckets * 208))
-		if len(cached.field1) > 0 || numBuckets > 1 {
-			size += hack.RuntimeAllocSize(int64(numBuckets * 208))
-		}
+		size += hack.RuntimeMapSize(cached.field1)
 		for _, v := range cached.field1 {
 			if cc, ok := v.(cachedObject); ok {
 				size += cc.CachedSize(true)
diff --git a/go/tools/sizegen/integration/integration_test.go b/go/tools/sizegen/integration/integration_test.go
index f394f019b5a..cc2b269924e 100644
--- a/go/tools/sizegen/integration/integration_test.go
+++ b/go/tools/sizegen/integration/integration_test.go
@@ -20,6 +20,8 @@ import (
 	"fmt"
 	"testing"
 
+	"github.com/stretchr/testify/assert"
+
 	"vitess.io/vitess/go/hack"
 )
 
@@ -27,9 +29,6 @@ func TestTypeSizes(t *testing.T) {
 	var PtrSize = hack.RuntimeAllocSize(8)
 	var SliceHeaderSize = hack.RuntimeAllocSize(3 * PtrSize)
 	var FatPointerSize = hack.RuntimeAllocSize(2 * PtrSize)
-	var BucketHeaderSize = hack.RuntimeAllocSize(8)
-	var BucketSize = hack.RuntimeAllocSize(8)
-	var HashMapHeaderSize = hack.RuntimeAllocSize(48)
 
 	cases := []struct {
 		obj  cachedObject
@@ -60,17 +59,17 @@ func TestTypeSizes(t *testing.T) {
 		{&Slice3{field1: []*Bimpl{{}, {}, {}, {}}}, SliceHeaderSize + PtrSize*4 + 8*4},
 
 		{&Map1{field1: nil}, PtrSize},
-		{&Map1{field1: map[uint8]uint8{}}, PtrSize + HashMapHeaderSize},
-		{&Map1{field1: map[uint8]uint8{0: 0}}, PtrSize + HashMapHeaderSize + BucketHeaderSize + 1*BucketSize + 1*BucketSize + PtrSize},
+		{&Map1{field1: map[uint8]uint8{}}, 56},
+		{&Map1{field1: map[uint8]uint8{0: 0}}, 80},
 
 		{&Map2{field1: nil}, PtrSize},
-		{&Map2{field1: map[uint64]A{}}, PtrSize + HashMapHeaderSize},
-		{&Map2{field1: map[uint64]A{0: {}}}, PtrSize + HashMapHeaderSize + BucketHeaderSize + 8*BucketSize + 16*BucketSize + PtrSize},
+		{&Map2{field1: map[uint64]A{}}, 56},
+		{&Map2{field1: map[uint64]A{0: {}}}, 264},
 
 		{&Map3{field1: nil}, PtrSize},
-		{&Map3{field1: map[uint64]B{}}, PtrSize + HashMapHeaderSize},
-		{&Map3{field1: map[uint64]B{0: &Bimpl{}}}, PtrSize + HashMapHeaderSize + BucketHeaderSize + 8*BucketSize + FatPointerSize*BucketSize + PtrSize + 8},
-		{&Map3{field1: map[uint64]B{0: nil}}, PtrSize + HashMapHeaderSize + BucketHeaderSize + 8*BucketSize + FatPointerSize*BucketSize + PtrSize},
+		{&Map3{field1: map[uint64]B{}}, 56},
+		{&Map3{field1: map[uint64]B{0: &Bimpl{}}}, 272},
+		{&Map3{field1: map[uint64]B{0: nil}}, 264},
 
 		{&String1{}, hack.RuntimeAllocSize(PtrSize*2 + 8)},
 		{&String1{field1: "1234"}, hack.RuntimeAllocSize(PtrSize*2+8) + hack.RuntimeAllocSize(4)},
@@ -79,9 +78,7 @@ func TestTypeSizes(t *testing.T) {
 	for _, tt := range cases {
 		t.Run(fmt.Sprintf("sizeof(%T)", tt.obj), func(t *testing.T) {
 			size := tt.obj.CachedSize(true)
-			if size != tt.size {
-				t.Errorf("expected %T to be %d bytes, got %d", tt.obj, tt.size, size)
-			}
+			assert.Equalf(t, tt.size, size, "expected %T to be %d bytes, got %d", tt.obj, tt.size, size)
 		})
 	}
 }
diff --git a/go/tools/sizegen/integration/types.go b/go/tools/sizegen/integration/types.go
index ff2a676b998..f38e66e690c 100644
--- a/go/tools/sizegen/integration/types.go
+++ b/go/tools/sizegen/integration/types.go
@@ -14,6 +14,8 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
+//go:generate go run ../sizegen.go --in . --gen vitess.io/vitess/go/tools/sizegen/integration.*
+
 // nolint
 package integration
 
diff --git a/go/tools/sizegen/sizegen.go b/go/tools/sizegen/sizegen.go
index cc733c8826d..32a22ea186f 100644
--- a/go/tools/sizegen/sizegen.go
+++ b/go/tools/sizegen/sizegen.go
@@ -34,7 +34,7 @@ import (
 	"vitess.io/vitess/go/tools/codegen"
 )
 
-const licenseFileHeader = `Copyright 2021 The Vitess Authors.
+const licenseFileHeader = `Copyright 2025 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.
@@ -340,7 +340,7 @@ func (sizegen *sizegen) sizeImplForSlice(name *types.TypeName, st *types.Slice)
 }
 
 func (sizegen *sizegen) sizeImplForMap(name *types.TypeName, st *types.Map) (jen.Code, codeFlag) {
-	stmt := sizegen.sizeStmtForMap(jen.Op("*").Add(jen.Id("cached")), st)
+	stmt := sizegen.sizeStmtForMap(jen.Op("*").Add(jen.Id("cached")))
 
 	f := jen.Func()
 	f.Params(jen.Id("cached").Op("*").Id(name.Name()))
@@ -388,49 +388,9 @@ func (sizegen *sizegen) sizeImplForSignature(name *types.TypeName, _ *types.Sign
 	return f, 0
 }
 
-func (sizegen *sizegen) sizeStmtForMap(fieldName *jen.Statement, m *types.Map) []jen.Code {
-	const bucketCnt = 8
-	const sizeofHmap = int64(6 * 8)
-
-	/*
-		type bmap struct {
-			// tophash generally contains the top byte of the hash value
-			// for each key in this bucket. If tophash[0] < minTopHash,
-			// tophash[0] is a bucket evacuation state instead.
-			tophash [bucketCnt]uint8
-			// Followed by bucketCnt keys and then bucketCnt elems.
-			// NOTE: packing all the keys together and then all the elems together makes the
-			// code a bit more complicated than alternating key/elem/key/elem/... but it allows
-			// us to eliminate padding which would be needed for, e.g., map[int64]int8.
-			// Followed by an overflow pointer.
-		}
-	*/
-	sizeOfBucket := int(
-		bucketCnt + // tophash
-			bucketCnt*sizegen.sizes.Sizeof(m.Key()) +
-			bucketCnt*sizegen.sizes.Sizeof(m.Elem()) +
-			8, // overflow pointer
-	)
-
+func (sizegen *sizegen) sizeStmtForMap(fieldName *jen.Statement) []jen.Code {
 	return []jen.Code{
-		jen.Id("size").Op("+=").Lit(hack.RuntimeAllocSize(sizeofHmap)),
-
-		jen.Id("hmap").Op(":=").Qual("reflect", "ValueOf").Call(fieldName),
-
-		jen.Id("numBuckets").Op(":=").Id("int").Call(
-			jen.Qual("math", "Pow").Call(jen.Lit(2), jen.Id("float64").Call(
-				jen.Parens(jen.Op("*").Parens(jen.Op("*").Id("uint8")).Call(
-					jen.Qual("unsafe", "Pointer").Call(jen.Id("hmap").Dot("Pointer").Call().
-						Op("+").Id("uintptr").Call(jen.Lit(9)))))))),
-
-		jen.Id("numOldBuckets").Op(":=").Parens(jen.Op("*").Parens(jen.Op("*").Id("uint16")).Call(
-			jen.Qual("unsafe", "Pointer").Call(
-				jen.Id("hmap").Dot("Pointer").Call().Op("+").Id("uintptr").Call(jen.Lit(10))))),
-
-		jen.Id("size").Op("+=").Do(mallocsize(jen.Int64().Call(jen.Id("numOldBuckets").Op("*").Lit(sizeOfBucket)))),
-
-		jen.If(jen.Id("len").Call(fieldName).Op(">").Lit(0).Op("||").Id("numBuckets").Op(">").Lit(1)).Block(
-			jen.Id("size").Op("+=").Do(mallocsize(jen.Int64().Call(jen.Id("numBuckets").Op("*").Lit(sizeOfBucket))))),
+		jen.Id("size").Op("+=").Qual("vitess.io/vitess/go/hack", "RuntimeMapSize").Call(fieldName),
 	}
 }
 
@@ -512,11 +472,16 @@ func (sizegen *sizegen) sizeStmtForType(fieldName *jen.Statement, field types.Ty
 		return nil, 0
 
 	case *types.Map:
-		keySize, keyFlag := sizegen.sizeStmtForType(jen.Id("k"), node.Key(), false)
-		valSize, valFlag := sizegen.sizeStmtForType(jen.Id("v"), node.Elem(), false)
+		const (
+			SwissMapMaxKeyBytes  = 128
+			SwissMapMaxElemBytes = 128
+		)
+
+		keySize, keyFlag := sizegen.sizeStmtForType(jen.Id("k"), node.Key(), sizegen.sizes.Sizeof(node.Key()) > SwissMapMaxKeyBytes)
+		valSize, valFlag := sizegen.sizeStmtForType(jen.Id("v"), node.Elem(), sizegen.sizes.Sizeof(node.Elem()) > SwissMapMaxElemBytes)
 
 		return jen.If(fieldName.Clone().Op("!=").Nil()).BlockFunc(func(block *jen.Group) {
-			for _, stmt := range sizegen.sizeStmtForMap(fieldName, node) {
+			for _, stmt := range sizegen.sizeStmtForMap(fieldName) {
 				block.Add(stmt)
 			}
 
diff --git a/go/vt/key/cached_size.go b/go/vt/key/cached_size.go
index ef4e6e79896..1f20a8404d9 100644
--- a/go/vt/key/cached_size.go
+++ b/go/vt/key/cached_size.go
@@ -1,5 +1,5 @@
 /*
-Copyright 2021 The Vitess Authors.
+Copyright 2025 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.
diff --git a/go/vt/proto/query/cached_size.go b/go/vt/proto/query/cached_size.go
index 58054d3c445..1f3d69513aa 100644
--- a/go/vt/proto/query/cached_size.go
+++ b/go/vt/proto/query/cached_size.go
@@ -1,5 +1,5 @@
 /*
-Copyright 2021 The Vitess Authors.
+Copyright 2025 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.
diff --git a/go/vt/proto/topodata/cached_size.go b/go/vt/proto/topodata/cached_size.go
index 165c9ee4226..0fda6448975 100644
--- a/go/vt/proto/topodata/cached_size.go
+++ b/go/vt/proto/topodata/cached_size.go
@@ -1,5 +1,5 @@
 /*
-Copyright 2021 The Vitess Authors.
+Copyright 2025 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.
diff --git a/go/vt/proto/vttime/cached_size.go b/go/vt/proto/vttime/cached_size.go
index f2b69dbefae..42252ec9d2c 100644
--- a/go/vt/proto/vttime/cached_size.go
+++ b/go/vt/proto/vttime/cached_size.go
@@ -1,5 +1,5 @@
 /*
-Copyright 2021 The Vitess Authors.
+Copyright 2025 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.
diff --git a/go/vt/schema/cached_size.go b/go/vt/schema/cached_size.go
index 5ed67c01696..6f82d741c38 100644
--- a/go/vt/schema/cached_size.go
+++ b/go/vt/schema/cached_size.go
@@ -1,5 +1,5 @@
 /*
-Copyright 2021 The Vitess Authors.
+Copyright 2025 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.
diff --git a/go/vt/sqlparser/cached_size.go b/go/vt/sqlparser/cached_size.go
index 4f17041bdbe..36bc371c0c8 100644
--- a/go/vt/sqlparser/cached_size.go
+++ b/go/vt/sqlparser/cached_size.go
@@ -1,5 +1,5 @@
 /*
-Copyright 2021 The Vitess Authors.
+Copyright 2025 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.
@@ -17,13 +17,7 @@ limitations under the License.
 
 package sqlparser
 
-import (
-	"math"
-	"reflect"
-	"unsafe"
-
-	hack "vitess.io/vitess/go/hack"
-)
+import hack "vitess.io/vitess/go/hack"
 
 type cachedObject interface {
 	CachedSize(alloc bool) int64
@@ -814,14 +808,7 @@ func (cached *CommentDirectives) CachedSize(alloc bool) int64 {
 	}
 	// field m map[string]string
 	if cached.m != nil {
-		size += int64(48)
-		hmap := reflect.ValueOf(cached.m)
-		numBuckets := int(math.Pow(2, float64((*(*uint8)(unsafe.Pointer(hmap.Pointer() + uintptr(9)))))))
-		numOldBuckets := (*(*uint16)(unsafe.Pointer(hmap.Pointer() + uintptr(10))))
-		size += hack.RuntimeAllocSize(int64(numOldBuckets * 272))
-		if len(cached.m) > 0 || numBuckets > 1 {
-			size += hack.RuntimeAllocSize(int64(numBuckets * 272))
-		}
+		size += hack.RuntimeMapSize(cached.m)
 		for k, v := range cached.m {
 			size += hack.RuntimeAllocSize(int64(len(k)))
 			size += hack.RuntimeAllocSize(int64(len(v)))
diff --git a/go/vt/srvtopo/cached_size.go b/go/vt/srvtopo/cached_size.go
index 03dd1ceb0da..06a908fee70 100644
--- a/go/vt/srvtopo/cached_size.go
+++ b/go/vt/srvtopo/cached_size.go
@@ -1,5 +1,5 @@
 /*
-Copyright 2021 The Vitess Authors.
+Copyright 2025 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.
diff --git a/go/vt/tableacl/cached_size.go b/go/vt/tableacl/cached_size.go
index 0bc5cc6c042..aa8c1511d54 100644
--- a/go/vt/tableacl/cached_size.go
+++ b/go/vt/tableacl/cached_size.go
@@ -1,5 +1,5 @@
 /*
-Copyright 2021 The Vitess Authors.
+Copyright 2025 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.
diff --git a/go/vt/vtenv/cached_size.go b/go/vt/vtenv/cached_size.go
index 808cc4cdca3..44a982db830 100644
--- a/go/vt/vtenv/cached_size.go
+++ b/go/vt/vtenv/cached_size.go
@@ -1,5 +1,5 @@
 /*
-Copyright 2021 The Vitess Authors.
+Copyright 2025 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.
diff --git a/go/vt/vtgate/engine/cached_size.go b/go/vt/vtgate/engine/cached_size.go
index 50d3a4b6bbf..23412990b0a 100644
--- a/go/vt/vtgate/engine/cached_size.go
+++ b/go/vt/vtgate/engine/cached_size.go
@@ -1,5 +1,5 @@
 /*
-Copyright 2021 The Vitess Authors.
+Copyright 2025 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.
@@ -17,13 +17,7 @@ limitations under the License.
 
 package engine
 
-import (
-	"math"
-	"reflect"
-	"unsafe"
-
-	hack "vitess.io/vitess/go/hack"
-)
+import hack "vitess.io/vitess/go/hack"
 
 type cachedObject interface {
 	CachedSize(alloc bool) int64
@@ -102,14 +96,7 @@ func (cached *Concatenate) CachedSize(alloc bool) int64 {
 	}
 	// field NoNeedToTypeCheck map[int]any
 	if cached.NoNeedToTypeCheck != nil {
-		size += int64(48)
-		hmap := reflect.ValueOf(cached.NoNeedToTypeCheck)
-		numBuckets := int(math.Pow(2, float64((*(*uint8)(unsafe.Pointer(hmap.Pointer() + uintptr(9)))))))
-		numOldBuckets := (*(*uint16)(unsafe.Pointer(hmap.Pointer() + uintptr(10))))
-		size += hack.RuntimeAllocSize(int64(numOldBuckets * 208))
-		if len(cached.NoNeedToTypeCheck) > 0 || numBuckets > 1 {
-			size += hack.RuntimeAllocSize(int64(numBuckets * 208))
-		}
+		size += hack.RuntimeMapSize(cached.NoNeedToTypeCheck)
 	}
 	return size
 }
@@ -222,14 +209,7 @@ func (cached *DMLWithInput) CachedSize(alloc bool) int64 {
 		size += hack.RuntimeAllocSize(int64(cap(cached.BVList)) * int64(8))
 		for _, elem := range cached.BVList {
 			if elem != nil {
-				size += int64(48)
-				hmap := reflect.ValueOf(elem)
-				numBuckets := int(math.Pow(2, float64((*(*uint8)(unsafe.Pointer(hmap.Pointer() + uintptr(9)))))))
-				numOldBuckets := (*(*uint16)(unsafe.Pointer(hmap.Pointer() + uintptr(10))))
-				size += hack.RuntimeAllocSize(int64(numOldBuckets * 208))
-				if len(elem) > 0 || numBuckets > 1 {
-					size += hack.RuntimeAllocSize(int64(numBuckets * 208))
-				}
+				size += hack.RuntimeMapSize(elem)
 				for k := range elem {
 					size += hack.RuntimeAllocSize(int64(len(k)))
 				}
@@ -589,14 +569,7 @@ func (cached *Join) CachedSize(alloc bool) int64 {
 	}
 	// field Vars map[string]int
 	if cached.Vars != nil {
-		size += int64(48)
-		hmap := reflect.ValueOf(cached.Vars)
-		numBuckets := int(math.Pow(2, float64((*(*uint8)(unsafe.Pointer(hmap.Pointer() + uintptr(9)))))))
-		numOldBuckets := (*(*uint16)(unsafe.Pointer(hmap.Pointer() + uintptr(10))))
-		size += hack.RuntimeAllocSize(int64(numOldBuckets * 208))
-		if len(cached.Vars) > 0 || numBuckets > 1 {
-			size += hack.RuntimeAllocSize(int64(numBuckets * 208))
-		}
+		size += hack.RuntimeMapSize(cached.Vars)
 		for k := range cached.Vars {
 			size += hack.RuntimeAllocSize(int64(len(k)))
 		}
@@ -881,14 +854,7 @@ func (cached *RecurseCTE) CachedSize(alloc bool) int64 {
 	}
 	// field Vars map[string]int
 	if cached.Vars != nil {
-		size += int64(48)
-		hmap := reflect.ValueOf(cached.Vars)
-		numBuckets := int(math.Pow(2, float64((*(*uint8)(unsafe.Pointer(hmap.Pointer() + uintptr(9)))))))
-		numOldBuckets := (*(*uint16)(unsafe.Pointer(hmap.Pointer() + uintptr(10))))
-		size += hack.RuntimeAllocSize(int64(numOldBuckets * 208))
-		if len(cached.Vars) > 0 || numBuckets > 1 {
-			size += hack.RuntimeAllocSize(int64(numBuckets * 208))
-		}
+		size += hack.RuntimeMapSize(cached.Vars)
 		for k := range cached.Vars {
 			size += hack.RuntimeAllocSize(int64(len(k)))
 		}
@@ -1002,14 +968,7 @@ func (cached *RoutingParameters) CachedSize(alloc bool) int64 {
 	}
 	// field SysTableTableName map[string]vitess.io/vitess/go/vt/vtgate/evalengine.Expr
 	if cached.SysTableTableName != nil {
-		size += int64(48)
-		hmap := reflect.ValueOf(cached.SysTableTableName)
-		numBuckets := int(math.Pow(2, float64((*(*uint8)(unsafe.Pointer(hmap.Pointer() + uintptr(9)))))))
-		numOldBuckets := (*(*uint16)(unsafe.Pointer(hmap.Pointer() + uintptr(10))))
-		size += hack.RuntimeAllocSize(int64(numOldBuckets * 272))
-		if len(cached.SysTableTableName) > 0 || numBuckets > 1 {
-			size += hack.RuntimeAllocSize(int64(numBuckets * 272))
-		}
+		size += hack.RuntimeMapSize(cached.SysTableTableName)
 		for k, v := range cached.SysTableTableName {
 			size += hack.RuntimeAllocSize(int64(len(k)))
 			if cc, ok := v.(cachedObject); ok {
@@ -1124,14 +1083,7 @@ func (cached *SemiJoin) CachedSize(alloc bool) int64 {
 	}
 	// field Vars map[string]int
 	if cached.Vars != nil {
-		size += int64(48)
-		hmap := reflect.ValueOf(cached.Vars)
-		numBuckets := int(math.Pow(2, float64((*(*uint8)(unsafe.Pointer(hmap.Pointer() + uintptr(9)))))))
-		numOldBuckets := (*(*uint16)(unsafe.Pointer(hmap.Pointer() + uintptr(10))))
-		size += hack.RuntimeAllocSize(int64(numOldBuckets * 208))
-		if len(cached.Vars) > 0 || numBuckets > 1 {
-			size += hack.RuntimeAllocSize(int64(numBuckets * 208))
-		}
+		size += hack.RuntimeMapSize(cached.Vars)
 		for k := range cached.Vars {
 			size += hack.RuntimeAllocSize(int64(len(k)))
 		}
@@ -1381,14 +1333,7 @@ func (cached *Update) CachedSize(alloc bool) int64 {
 	size += cached.DML.CachedSize(true)
 	// field ChangedVindexValues map[string]*vitess.io/vitess/go/vt/vtgate/engine.VindexValues
 	if cached.ChangedVindexValues != nil {
-		size += int64(48)
-		hmap := reflect.ValueOf(cached.ChangedVindexValues)
-		numBuckets := int(math.Pow(2, float64((*(*uint8)(unsafe.Pointer(hmap.Pointer() + uintptr(9)))))))
-		numOldBuckets := (*(*uint16)(unsafe.Pointer(hmap.Pointer() + uintptr(10))))
-		size += hack.RuntimeAllocSize(int64(numOldBuckets * 208))
-		if len(cached.ChangedVindexValues) > 0 || numBuckets > 1 {
-			size += hack.RuntimeAllocSize(int64(numBuckets * 208))
-		}
+		size += hack.RuntimeMapSize(cached.ChangedVindexValues)
 		for k, v := range cached.ChangedVindexValues {
 			size += hack.RuntimeAllocSize(int64(len(k)))
 			size += v.CachedSize(true)
@@ -1570,14 +1515,7 @@ func (cached *VindexValues) CachedSize(alloc bool) int64 {
 	}
 	// field EvalExprMap map[string]vitess.io/vitess/go/vt/vtgate/evalengine.Expr
 	if cached.EvalExprMap != nil {
-		size += int64(48)
-		hmap := reflect.ValueOf(cached.EvalExprMap)
-		numBuckets := int(math.Pow(2, float64((*(*uint8)(unsafe.Pointer(hmap.Pointer() + uintptr(9)))))))
-		numOldBuckets := (*(*uint16)(unsafe.Pointer(hmap.Pointer() + uintptr(10))))
-		size += hack.RuntimeAllocSize(int64(numOldBuckets * 272))
-		if len(cached.EvalExprMap) > 0 || numBuckets > 1 {
-			size += hack.RuntimeAllocSize(int64(numBuckets * 272))
-		}
+		size += hack.RuntimeMapSize(cached.EvalExprMap)
 		for k, v := range cached.EvalExprMap {
 			size += hack.RuntimeAllocSize(int64(len(k)))
 			if cc, ok := v.(cachedObject); ok {
@@ -1635,14 +1573,7 @@ func (cached *shardRoute) CachedSize(alloc bool) int64 {
 	size += cached.rs.CachedSize(true)
 	// field bv map[string]*vitess.io/vitess/go/vt/proto/query.BindVariable
 	if cached.bv != nil {
-		size += int64(48)
-		hmap := reflect.ValueOf(cached.bv)
-		numBuckets := int(math.Pow(2, float64((*(*uint8)(unsafe.Pointer(hmap.Pointer() + uintptr(9)))))))
-		numOldBuckets := (*(*uint16)(unsafe.Pointer(hmap.Pointer() + uintptr(10))))
-		size += hack.RuntimeAllocSize(int64(numOldBuckets * 208))
-		if len(cached.bv) > 0 || numBuckets > 1 {
-			size += hack.RuntimeAllocSize(int64(numBuckets * 208))
-		}
+		size += hack.RuntimeMapSize(cached.bv)
 		for k, v := range cached.bv {
 			size += hack.RuntimeAllocSize(int64(len(k)))
 			size += v.CachedSize(true)
diff --git a/go/vt/vtgate/evalengine/cached_size.go b/go/vt/vtgate/evalengine/cached_size.go
index b953afda95c..fc7a02e84c1 100644
--- a/go/vt/vtgate/evalengine/cached_size.go
+++ b/go/vt/vtgate/evalengine/cached_size.go
@@ -1,5 +1,5 @@
 /*
-Copyright 2021 The Vitess Authors.
+Copyright 2025 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.
diff --git a/go/vt/vtgate/vindexes/cached_size.go b/go/vt/vtgate/vindexes/cached_size.go
index ac68887c00d..94f6daa0c05 100644
--- a/go/vt/vtgate/vindexes/cached_size.go
+++ b/go/vt/vtgate/vindexes/cached_size.go
@@ -1,5 +1,5 @@
 /*
-Copyright 2021 The Vitess Authors.
+Copyright 2025 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.
@@ -17,13 +17,7 @@ limitations under the License.
 
 package vindexes
 
-import (
-	"math"
-	"reflect"
-	"unsafe"
-
-	hack "vitess.io/vitess/go/hack"
-)
+import hack "vitess.io/vitess/go/hack"
 
 type cachedObject interface {
 	CachedSize(alloc bool) int64
@@ -327,14 +321,7 @@ func (cached *MultiCol) CachedSize(alloc bool) int64 {
 	size += hack.RuntimeAllocSize(int64(len(cached.name)))
 	// field columnVdx map[int]vitess.io/vitess/go/vt/vtgate/vindexes.Hashing
 	if cached.columnVdx != nil {
-		size += int64(48)
-		hmap := reflect.ValueOf(cached.columnVdx)
-		numBuckets := int(math.Pow(2, float64((*(*uint8)(unsafe.Pointer(hmap.Pointer() + uintptr(9)))))))
-		numOldBuckets := (*(*uint16)(unsafe.Pointer(hmap.Pointer() + uintptr(10))))
-		size += hack.RuntimeAllocSize(int64(numOldBuckets * 208))
-		if len(cached.columnVdx) > 0 || numBuckets > 1 {
-			size += hack.RuntimeAllocSize(int64(numBuckets * 208))
-		}
+		size += hack.RuntimeMapSize(cached.columnVdx)
 		for _, v := range cached.columnVdx {
 			if cc, ok := v.(cachedObject); ok {
 				size += cc.CachedSize(true)
@@ -343,14 +330,7 @@ func (cached *MultiCol) CachedSize(alloc bool) int64 {
 	}
 	// field columnBytes map[int]int
 	if cached.columnBytes != nil {
-		size += int64(48)
-		hmap := reflect.ValueOf(cached.columnBytes)
-		numBuckets := int(math.Pow(2, float64((*(*uint8)(unsafe.Pointer(hmap.Pointer() + uintptr(9)))))))
-		numOldBuckets := (*(*uint16)(unsafe.Pointer(hmap.Pointer() + uintptr(10))))
-		size += hack.RuntimeAllocSize(int64(numOldBuckets * 144))
-		if len(cached.columnBytes) > 0 || numBuckets > 1 {
-			size += hack.RuntimeAllocSize(int64(numBuckets * 144))
-		}
+		size += hack.RuntimeMapSize(cached.columnBytes)
 	}
 	return size
 }
@@ -400,14 +380,7 @@ func (cached *NumericLookupTable) CachedSize(alloc bool) int64 {
 	if alloc {
 		size += int64(8)
 	}
-	size += int64(48)
-	hmap := reflect.ValueOf(*cached)
-	numBuckets := int(math.Pow(2, float64((*(*uint8)(unsafe.Pointer(hmap.Pointer() + uintptr(9)))))))
-	numOldBuckets := (*(*uint16)(unsafe.Pointer(hmap.Pointer() + uintptr(10))))
-	size += hack.RuntimeAllocSize(int64(numOldBuckets * 144))
-	if len(*cached) > 0 || numBuckets > 1 {
-		size += hack.RuntimeAllocSize(int64(numBuckets * 144))
-	}
+	size += hack.RuntimeMapSize(*cached)
 	return size
 }
 
@@ -428,14 +401,7 @@ func (cached *NumericStaticMap) CachedSize(alloc bool) int64 {
 	}
 	// field lookup vitess.io/vitess/go/vt/vtgate/vindexes.NumericLookupTable
 	if cached.lookup != nil {
-		size += int64(48)
-		hmap := reflect.ValueOf(cached.lookup)
-		numBuckets := int(math.Pow(2, float64((*(*uint8)(unsafe.Pointer(hmap.Pointer() + uintptr(9)))))))
-		numOldBuckets := (*(*uint16)(unsafe.Pointer(hmap.Pointer() + uintptr(10))))
-		size += hack.RuntimeAllocSize(int64(numOldBuckets * 144))
-		if len(cached.lookup) > 0 || numBuckets > 1 {
-			size += hack.RuntimeAllocSize(int64(numBuckets * 144))
-		}
+		size += hack.RuntimeMapSize(cached.lookup)
 	}
 	// field unknownParams []string
 	{
@@ -479,14 +445,7 @@ func (cached *RegionJSON) CachedSize(alloc bool) int64 {
 	size += hack.RuntimeAllocSize(int64(len(cached.name)))
 	// field regionMap vitess.io/vitess/go/vt/vtgate/vindexes.RegionMap
 	if cached.regionMap != nil {
-		size += int64(48)
-		hmap := reflect.ValueOf(cached.regionMap)
-		numBuckets := int(math.Pow(2, float64((*(*uint8)(unsafe.Pointer(hmap.Pointer() + uintptr(9)))))))
-		numOldBuckets := (*(*uint16)(unsafe.Pointer(hmap.Pointer() + uintptr(10))))
-		size += hack.RuntimeAllocSize(int64(numOldBuckets * 208))
-		if len(cached.regionMap) > 0 || numBuckets > 1 {
-			size += hack.RuntimeAllocSize(int64(numBuckets * 208))
-		}
+		size += hack.RuntimeMapSize(cached.regionMap)
 		for k := range cached.regionMap {
 			size += hack.RuntimeAllocSize(int64(len(k)))
 		}
@@ -508,14 +467,7 @@ func (cached *RegionMap) CachedSize(alloc bool) int64 {
 	if alloc {
 		size += int64(8)
 	}
-	size += int64(48)
-	hmap := reflect.ValueOf(*cached)
-	numBuckets := int(math.Pow(2, float64((*(*uint8)(unsafe.Pointer(hmap.Pointer() + uintptr(9)))))))
-	numOldBuckets := (*(*uint16)(unsafe.Pointer(hmap.Pointer() + uintptr(10))))
-	size += hack.RuntimeAllocSize(int64(numOldBuckets * 208))
-	if len(*cached) > 0 || numBuckets > 1 {
-		size += hack.RuntimeAllocSize(int64(numBuckets * 208))
-	}
+	size += hack.RuntimeMapSize(*cached)
 	return size
 }
 func (cached *ReverseBits) CachedSize(alloc bool) int64 {
diff --git a/go/vt/vttablet/tabletserver/cached_size.go b/go/vt/vttablet/tabletserver/cached_size.go
index 96d09826356..5d357738d7b 100644
--- a/go/vt/vttablet/tabletserver/cached_size.go
+++ b/go/vt/vttablet/tabletserver/cached_size.go
@@ -1,5 +1,5 @@
 /*
-Copyright 2021 The Vitess Authors.
+Copyright 2025 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.
diff --git a/go/vt/vttablet/tabletserver/planbuilder/cached_size.go b/go/vt/vttablet/tabletserver/planbuilder/cached_size.go
index 7e7f2f3ef4b..e10fce93cb6 100644
--- a/go/vt/vttablet/tabletserver/planbuilder/cached_size.go
+++ b/go/vt/vttablet/tabletserver/planbuilder/cached_size.go
@@ -1,5 +1,5 @@
 /*
-Copyright 2021 The Vitess Authors.
+Copyright 2025 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.
diff --git a/go/vt/vttablet/tabletserver/rules/cached_size.go b/go/vt/vttablet/tabletserver/rules/cached_size.go
index d06a31ab8cb..5ea45661e27 100644
--- a/go/vt/vttablet/tabletserver/rules/cached_size.go
+++ b/go/vt/vttablet/tabletserver/rules/cached_size.go
@@ -1,5 +1,5 @@
 /*
-Copyright 2021 The Vitess Authors.
+Copyright 2025 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.
diff --git a/go/vt/vttablet/tabletserver/schema/cached_size.go b/go/vt/vttablet/tabletserver/schema/cached_size.go
index 4db9f313644..13132e6acb2 100644
--- a/go/vt/vttablet/tabletserver/schema/cached_size.go
+++ b/go/vt/vttablet/tabletserver/schema/cached_size.go
@@ -1,5 +1,5 @@
 /*
-Copyright 2021 The Vitess Authors.
+Copyright 2025 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.
diff --git a/go/vt/vttablet/tabletserver/schema/schema.go b/go/vt/vttablet/tabletserver/schema/schema.go
index e800477da3b..d5d1a6d29bc 100644
--- a/go/vt/vttablet/tabletserver/schema/schema.go
+++ b/go/vt/vttablet/tabletserver/schema/schema.go
@@ -17,12 +17,11 @@ limitations under the License.
 package schema
 
 import (
+	"fmt"
 	"sync"
 	"time"
 
 	"vitess.io/vitess/go/sqltypes"
-	"vitess.io/vitess/go/vt/log"
-
 	"vitess.io/vitess/go/vt/sqlparser"
 
 	querypb "vitess.io/vitess/go/vt/proto/query"
@@ -85,10 +84,10 @@ func (seq *SequenceInfo) Reset() {
 	seq.LastVal = 0
 }
 
-func (seq *SequenceInfo) String() {
+func (seq *SequenceInfo) String() string {
 	seq.Lock()
 	defer seq.Unlock()
-	log.Infof("SequenceInfo: NextVal: %d, LastVal: %d", seq.NextVal, seq.LastVal)
+	return fmt.Sprintf("SequenceInfo: NextVal: %d, LastVal: %d", seq.NextVal, seq.LastVal)
 }
 
 // MessageInfo contains info specific to message tables.
@@ -131,6 +130,10 @@ type MessageInfo struct {
 	IDType sqltypes.Type
 }
 
+func (mi *MessageInfo) String() string {
+	return fmt.Sprintf("MessageInfo: AckWaitDuration: %v, PurgeAfterDuration: %v, BatchSize: %v, CacheSize: %v, PollInterval: %v, MinBackoff: %v, MaxBackoff: %v, IDType: %v", mi.AckWaitDuration, mi.PurgeAfterDuration, mi.BatchSize, mi.CacheSize, mi.PollInterval, mi.MinBackoff, mi.MaxBackoff, mi.IDType)
+}
+
 // NewTable creates a new Table.
 func NewTable(name string, tableType int) *Table {
 	return &Table{
diff --git a/go/vt/vttablet/tabletserver/schema/schemaz_test.go b/go/vt/vttablet/tabletserver/schema/schemaz_test.go
index 0127c796f67..c41d34bc82d 100644
--- a/go/vt/vttablet/tabletserver/schema/schemaz_test.go
+++ b/go/vt/vttablet/tabletserver/schema/schemaz_test.go
@@ -28,7 +28,7 @@ import (
 	"github.com/stretchr/testify/require"
 )
 
-func TestSchamazHandler1(t *testing.T) {
+func TestSchemazHandler1(t *testing.T) {
 	resp := httptest.NewRecorder()
 	req, _ := http.NewRequest("GET", "/schemaz", nil)
 	tables := initialSchema()
@@ -50,7 +50,7 @@ func TestSchamazHandler1(t *testing.T) {
 		`<td>id: INT32<br>next_id: INT64<br>cache: INT64<br>increment: INT64<br></td>`,
 		`<td>id<br></td>`,
 		`<td>sequence</td>`,
-		`<td>{{0 0} 0 0}&lt;nil&gt;</td>`,
+		`<td>SequenceInfo: NextVal: 0, LastVal: 0&lt;nil&gt;</td>`,
 	}
 	matched, err = regexp.Match(strings.Join(seq, `\s*`), body)
 	require.NoError(t, err)
diff --git a/misc/git/hooks/golangci-lint b/misc/git/hooks/golangci-lint
index 21313316a12..3fd30f65533 100755
--- a/misc/git/hooks/golangci-lint
+++ b/misc/git/hooks/golangci-lint
@@ -14,7 +14,7 @@
 # limitations under the License.
 
 # Required version of golangci-lint
-REQUIRED_VERSION="v1.60.2"
+REQUIRED_VERSION="v1.64.5"
 
 # Function to compare versions in pure Bash
 version_greater_or_equal() {
@@ -67,4 +67,4 @@ gopackages=$(echo "$gofiles" | xargs -n1 dirname | sort -u | paste -sd ' ' -)
 
 # Lint the Go packages
 echo "Linting $gopackages"
-golangci-lint run $gopackages
\ No newline at end of file
+golangci-lint run $gopackages
diff --git a/test.go b/test.go
index 247541009a6..e3d9222a96d 100755
--- a/test.go
+++ b/test.go
@@ -77,7 +77,7 @@ For example:
 // Flags
 var (
 	flavor           = flag.String("flavor", "mysql80", "comma-separated bootstrap flavor(s) to run against (when using Docker mode). Available flavors: all,"+flavors)
-	bootstrapVersion = flag.String("bootstrap-version", "41", "the version identifier to use for the docker images")
+	bootstrapVersion = flag.String("bootstrap-version", "42", "the version identifier to use for the docker images")
 	runCount         = flag.Int("runs", 1, "run each test this many times")
 	retryMax         = flag.Int("retry", 3, "max number of retries, to detect flaky tests")
 	logPass          = flag.Bool("log-pass", false, "log test output even if it passes")
diff --git a/test/templates/dockerfile.tpl b/test/templates/dockerfile.tpl
index 733377418f8..b3138a30f08 100644
--- a/test/templates/dockerfile.tpl
+++ b/test/templates/dockerfile.tpl
@@ -1,4 +1,4 @@
-ARG bootstrap_version=41
+ARG bootstrap_version=42
 ARG image="vitess/bootstrap:${bootstrap_version}-{{.Platform}}"
 
 FROM "${image}"

From 83e2a4f5b117641c76fd43723ad62375edc65b14 Mon Sep 17 00:00:00 2001
From: Noble Mittal <62551163+beingnoble03@users.noreply.github.com>
Date: Wed, 19 Feb 2025 20:14:51 +0530
Subject: [PATCH 66/68] VReplication: Support for `BETWEEN`/`NOT BETWEEN`
 filter in VStream (#17721)

Signed-off-by: Noble Mittal <noblemittal@outlook.com>
Signed-off-by: Rohit Nayak <rohit@planetscale.com>
Co-authored-by: Rohit Nayak <rohit@planetscale.com>
---
 go/test/endtoend/vreplication/vstream_test.go |  38 +++---
 .../tabletserver/vstreamer/planbuilder.go     | 107 ++++++++++++++--
 .../vstreamer/planbuilder_test.go             | 100 ++++++++++++++-
 .../vstreamer/rowstreamer_test.go             |  79 ++++++++++++
 .../tabletserver/vstreamer/vstreamer_test.go  | 121 ++++++++++++++++++
 5 files changed, 414 insertions(+), 31 deletions(-)

diff --git a/go/test/endtoend/vreplication/vstream_test.go b/go/test/endtoend/vreplication/vstream_test.go
index 7ce0e7dbd63..f37ba1750f0 100644
--- a/go/test/endtoend/vreplication/vstream_test.go
+++ b/go/test/endtoend/vreplication/vstream_test.go
@@ -1130,7 +1130,7 @@ func TestVStreamPushdownFilters(t *testing.T) {
 	require.NoError(t, err)
 
 	// Coordinate go-routines.
-	streamCtx, streamCancel := context.WithTimeout(context.Background(), 1*time.Minute)
+	streamCtx, streamCancel := context.WithTimeout(context.Background(), 10*time.Second)
 	defer streamCancel()
 	done := make(chan struct{})
 
@@ -1176,19 +1176,31 @@ func TestVStreamPushdownFilters(t *testing.T) {
 			Filter: "select * from customer where name = 'påul'",
 		}},
 	}
-	flags := &vtgatepb.VStreamFlags{}
 	vstreamConn, err := vtgateconn.Dial(ctx, fmt.Sprintf("%s:%d", vc.ClusterConfig.hostname, vc.ClusterConfig.vtgateGrpcPort))
 	require.NoError(t, err)
 	defer vstreamConn.Close()
 
-	// So we should have at least one paul row event in the copy phase.
-	copyPhaseRowEvents := 0
-	// And we should have many paul row events in the running phase.
-	runningPhaseRowEvents := 0
-	copyPhase := true
+	// So we should have at least one paul row event in the copy phase, and
+	// we should have many paul row events in the running phase.
+	copyPhaseRowEvents, runningPhaseRowEvents := runVStreamAndGetNumOfRowEvents(t, ctx, vstreamConn, vgtid, filter, done)
+
+	require.NotZero(t, createdPauls)
+	require.NotZero(t, createdNonPauls)
+	require.Greater(t, createdNonPauls, createdPauls)
+	require.NotZero(t, copyPhaseRowEvents)
+	require.NotZero(t, runningPhaseRowEvents)
+
+	t.Logf("Created pauls: %d, pauls copied: %d, pauls replicated: %d", createdPauls, copyPhaseRowEvents, runningPhaseRowEvents)
+	require.Equal(t, createdPauls, copyPhaseRowEvents+runningPhaseRowEvents)
+}
 
+// runVStreamAndGetNumOfRowEvents runs VStream with the specified filter and
+// returns number of copy phase and running phase row events.
+func runVStreamAndGetNumOfRowEvents(t *testing.T, ctx context.Context, vstreamConn *vtgateconn.VTGateConn,
+	vgtid *binlogdatapb.VGtid, filter *binlogdatapb.Filter, done chan struct{}) (copyPhaseRowEvents int, runningPhaseRowEvents int) {
+	copyPhase := true
 	func() {
-		reader, err := vstreamConn.VStream(ctx, topodatapb.TabletType_PRIMARY, vgtid, filter, flags)
+		reader, err := vstreamConn.VStream(ctx, topodatapb.TabletType_PRIMARY, vgtid, filter, &vtgatepb.VStreamFlags{})
 		require.NoError(t, err)
 		for {
 			evs, err := reader.Recv()
@@ -1217,13 +1229,5 @@ func TestVStreamPushdownFilters(t *testing.T) {
 			}
 		}
 	}()
-
-	require.NotZero(t, createdPauls)
-	require.NotZero(t, createdNonPauls)
-	require.Greater(t, createdNonPauls, createdPauls)
-	require.NotZero(t, copyPhaseRowEvents)
-	require.NotZero(t, runningPhaseRowEvents)
-
-	t.Logf("Created pauls: %d, pauls copied: %d, pauls replicated: %d", createdPauls, copyPhaseRowEvents, runningPhaseRowEvents)
-	require.Equal(t, createdPauls, copyPhaseRowEvents+runningPhaseRowEvents)
+	return
 }
diff --git a/go/vt/vttablet/tabletserver/vstreamer/planbuilder.go b/go/vt/vttablet/tabletserver/vstreamer/planbuilder.go
index 6416c5c87de..c35208be93e 100644
--- a/go/vt/vttablet/tabletserver/vstreamer/planbuilder.go
+++ b/go/vt/vttablet/tabletserver/vstreamer/planbuilder.go
@@ -101,6 +101,10 @@ const (
 	IsNotNull
 	// In is used to filter a comparable column if equals any of the values from a specific tuple
 	In
+	// Note that we do not implement filtering for BETWEEN because
+	// in the plan we rewrite `x BETWEEN a AND b` to `x >= a AND x <= b`
+	// NotBetween is used to filter a comparable column if it doesn't lie within a specific range
+	NotBetween
 )
 
 // Filter contains opcodes for filtering.
@@ -273,6 +277,26 @@ func (plan *Plan) filter(values, result []sqltypes.Value, charsets []collations.
 			if !found {
 				return false, nil
 			}
+		case NotBetween:
+			// Note that we do not implement filtering for BETWEEN because
+			// in the plan we rewrite `x BETWEEN a AND b` to `x >= a AND x <= b`
+			// This is the filtering for NOT BETWEEN since we don't have support
+			// for OR yet.
+			if filter.Values == nil || len(filter.Values) != 2 {
+				return false, vterrors.Errorf(vtrpcpb.Code_INTERNAL, "expected 2 filter values when performing NOT BETWEEN")
+			}
+			leftFilterValue, rightFilterValue := filter.Values[0], filter.Values[1]
+			isValueLessThanLeftFilter, err := compare(LessThan, values[filter.ColNum], leftFilterValue, plan.env.CollationEnv(), charsets[filter.ColNum])
+			if err != nil {
+				return false, err
+			}
+			if isValueLessThanLeftFilter {
+				continue
+			}
+			isValueGreaterThanRightFilter, err := compare(GreaterThan, values[filter.ColNum], rightFilterValue, plan.env.CollationEnv(), charsets[filter.ColNum])
+			if err != nil || !isValueGreaterThanRightFilter {
+				return false, err
+			}
 		default:
 			match, err := compare(filter.Opcode, values[filter.ColNum], filter.Value, plan.env.CollationEnv(), charsets[filter.ColNum])
 			if err != nil {
@@ -570,6 +594,23 @@ func (plan *Plan) appendTupleFilter(values sqlparser.ValTuple, opcode Opcode, co
 	return nil
 }
 
+func (plan *Plan) getEvalResultForLiteral(expr sqlparser.Expr) (*evalengine.EvalResult, error) {
+	literalExpr, ok := expr.(*sqlparser.Literal)
+	if !ok {
+		return nil, fmt.Errorf("unexpected: %v", sqlparser.String(expr))
+	}
+	pv, err := evalengine.Translate(literalExpr, &evalengine.Config{
+		Collation:   plan.env.CollationEnv().DefaultConnectionCharset(),
+		Environment: plan.env,
+	})
+	if err != nil {
+		return nil, err
+	}
+	env := evalengine.EmptyExpressionEnv(plan.env)
+	resolved, err := env.Evaluate(pv)
+	return &resolved, err
+}
+
 func (plan *Plan) analyzeWhere(vschema *localVSchema, where *sqlparser.Where) error {
 	if where == nil {
 		return nil
@@ -606,21 +647,11 @@ func (plan *Plan) analyzeWhere(vschema *localVSchema, where *sqlparser.Where) er
 				if err != nil {
 					return err
 				}
+				// Add it to the expressions that get pushed down to mysqld.
+				plan.whereExprsToPushDown = append(plan.whereExprsToPushDown, expr)
 				continue
 			}
-			val, ok := expr.Right.(*sqlparser.Literal)
-			if !ok {
-				return fmt.Errorf("unexpected: %v", sqlparser.String(expr))
-			}
-			pv, err := evalengine.Translate(val, &evalengine.Config{
-				Collation:   plan.env.CollationEnv().DefaultConnectionCharset(),
-				Environment: plan.env,
-			})
-			if err != nil {
-				return err
-			}
-			env := evalengine.EmptyExpressionEnv(plan.env)
-			resolved, err := env.Evaluate(pv)
+			resolved, err := plan.getEvalResultForLiteral(expr.Right)
 			if err != nil {
 				return err
 			}
@@ -661,6 +692,56 @@ func (plan *Plan) analyzeWhere(vschema *localVSchema, where *sqlparser.Where) er
 			})
 			// Add it to the expressions that get pushed down to mysqld.
 			plan.whereExprsToPushDown = append(plan.whereExprsToPushDown, expr)
+		case *sqlparser.BetweenExpr:
+			qualifiedName, ok := expr.Left.(*sqlparser.ColName)
+			if !ok {
+				return fmt.Errorf("unexpected: %v", sqlparser.String(expr))
+			}
+			if !qualifiedName.Qualifier.IsEmpty() {
+				return fmt.Errorf("unsupported qualifier for column: %v", sqlparser.String(qualifiedName))
+			}
+			colnum, err := findColumn(plan.Table, qualifiedName.Name)
+			if err != nil {
+				return err
+			}
+			fromResolved, err := plan.getEvalResultForLiteral(expr.From)
+			if err != nil {
+				return err
+			}
+			toResolved, err := plan.getEvalResultForLiteral(expr.To)
+			if err != nil {
+				return err
+			}
+
+			if !expr.IsBetween {
+				// `x NOT BETWEEN a AND b` means: `x < a OR x > b`
+				// Also, since we do not have OR implemented yet,
+				// NOT BETWEEN needs to be handled separately.
+				plan.Filters = append(plan.Filters, Filter{
+					Opcode: NotBetween,
+					ColNum: colnum,
+					Values: []sqltypes.Value{
+						fromResolved.Value(plan.env.CollationEnv().DefaultConnectionCharset()),
+						toResolved.Value(plan.env.CollationEnv().DefaultConnectionCharset()),
+					},
+				})
+				// Add it to the expressions that get pushed down to mysqld.
+				plan.whereExprsToPushDown = append(plan.whereExprsToPushDown, expr)
+				continue
+			}
+
+			// `x BETWEEN a AND b` means: `x >= a AND x <= b`
+			plan.Filters = append(plan.Filters, Filter{
+				Opcode: GreaterThanEqual,
+				ColNum: colnum,
+				Value:  fromResolved.Value(plan.env.CollationEnv().DefaultConnectionCharset()),
+			}, Filter{
+				Opcode: LessThanEqual,
+				ColNum: colnum,
+				Value:  toResolved.Value(plan.env.CollationEnv().DefaultConnectionCharset()),
+			})
+			// Add it to the expressions that get pushed down to mysqld.
+			plan.whereExprsToPushDown = append(plan.whereExprsToPushDown, expr)
 		default:
 			return fmt.Errorf("unsupported constraint: %v", sqlparser.String(expr))
 		}
diff --git a/go/vt/vttablet/tabletserver/vstreamer/planbuilder_test.go b/go/vt/vttablet/tabletserver/vstreamer/planbuilder_test.go
index 3c9e19349e4..b2b48db216d 100644
--- a/go/vt/vttablet/tabletserver/vstreamer/planbuilder_test.go
+++ b/go/vt/vttablet/tabletserver/vstreamer/planbuilder_test.go
@@ -571,6 +571,89 @@ func TestPlanBuilder(t *testing.T) {
 			}},
 			env: vtenv.NewTestEnv(),
 		},
+	}, {
+		inTable: t1,
+		inRule:  &binlogdatapb.Rule{Match: "t1", Filter: "select val, id from t1 where id between 2 and 5"},
+		outPlan: &Plan{
+			ColExprs: []ColExpr{{
+				ColNum: 1,
+				Field: &querypb.Field{
+					Name:    "val",
+					Type:    sqltypes.VarChar,
+					Charset: unicodeCollationID,
+				},
+			}, {
+				ColNum: 0,
+				Field: &querypb.Field{
+					Name:    "id",
+					Type:    sqltypes.Int64,
+					Charset: collations.CollationBinaryID,
+					Flags:   uint32(querypb.MySqlFlag_NUM_FLAG),
+				},
+			}},
+			Filters: []Filter{{
+				Opcode:        GreaterThanEqual,
+				ColNum:        0,
+				Value:         sqltypes.NewInt64(2),
+				Vindex:        nil,
+				VindexColumns: nil,
+				KeyRange:      nil,
+			}, {
+				Opcode:        LessThanEqual,
+				ColNum:        0,
+				Value:         sqltypes.NewInt64(5),
+				Vindex:        nil,
+				VindexColumns: nil,
+				KeyRange:      nil,
+			}},
+			whereExprsToPushDown: []sqlparser.Expr{
+				&sqlparser.BetweenExpr{
+					IsBetween: true,
+					Left:      sqlparser.NewColName("id"),
+					From:      sqlparser.NewIntLiteral("2"),
+					To:        sqlparser.NewIntLiteral("5"),
+				},
+			},
+			env: vtenv.NewTestEnv(),
+		},
+	}, {
+		inTable: t1,
+		inRule:  &binlogdatapb.Rule{Match: "t1", Filter: "select val, id from t1 where id not between 2 and 5"},
+		outPlan: &Plan{
+			ColExprs: []ColExpr{{
+				ColNum: 1,
+				Field: &querypb.Field{
+					Name:    "val",
+					Type:    sqltypes.VarChar,
+					Charset: unicodeCollationID,
+				},
+			}, {
+				ColNum: 0,
+				Field: &querypb.Field{
+					Name:    "id",
+					Type:    sqltypes.Int64,
+					Charset: collations.CollationBinaryID,
+					Flags:   uint32(querypb.MySqlFlag_NUM_FLAG),
+				},
+			}},
+			Filters: []Filter{{
+				Opcode:        NotBetween,
+				ColNum:        0,
+				Values:        []sqltypes.Value{sqltypes.NewInt64(2), sqltypes.NewInt64(5)},
+				Vindex:        nil,
+				VindexColumns: nil,
+				KeyRange:      nil,
+			}},
+			whereExprsToPushDown: []sqlparser.Expr{
+				&sqlparser.BetweenExpr{
+					IsBetween: false,
+					Left:      sqlparser.NewColName("id"),
+					From:      sqlparser.NewIntLiteral("2"),
+					To:        sqlparser.NewIntLiteral("5"),
+				},
+			},
+			env: vtenv.NewTestEnv(),
+		},
 	}, {
 		inTable: t1,
 		inRule:  &binlogdatapb.Rule{Match: "/*/"},
@@ -752,9 +835,22 @@ func TestPlanBuilderFilterComparison(t *testing.T) {
 		outFilters: []Filter{
 			{Opcode: In, ColNum: 0, Values: []sqltypes.Value{sqltypes.NewInt64(1), sqltypes.NewInt64(2)}},
 		},
+	}, {
+		name:     "between-operator",
+		inFilter: "select * from t1 where id between 1 and 5",
+		outFilters: []Filter{
+			{Opcode: GreaterThanEqual, ColNum: 0, Value: sqltypes.NewInt64(1)},
+			{Opcode: LessThanEqual, ColNum: 0, Value: sqltypes.NewInt64(5)},
+		},
+	}, {
+		name:     "not-between-operator",
+		inFilter: "select * from t1 where id not between 1 and 5",
+		outFilters: []Filter{
+			{Opcode: NotBetween, ColNum: 0, Values: []sqltypes.Value{sqltypes.NewInt64(1), sqltypes.NewInt64(5)}},
+		},
 	}, {
 		name:     "vindex-and-operators",
-		inFilter: "select * from t1 where in_keyrange(id, 'hash', '-80') and id = 2 and val <> 'xyz' and id in (100, 30)",
+		inFilter: "select * from t1 where in_keyrange(id, 'hash', '-80') and id = 2 and val <> 'xyz' and id in (100, 30) and id between 20 and 60",
 		outFilters: []Filter{
 			{
 				Opcode:        VindexMatch,
@@ -770,6 +866,8 @@ func TestPlanBuilderFilterComparison(t *testing.T) {
 			{Opcode: Equal, ColNum: 0, Value: sqltypes.NewInt64(2)},
 			{Opcode: NotEqual, ColNum: 1, Value: sqltypes.NewVarChar("xyz")},
 			{Opcode: In, ColNum: 0, Values: []sqltypes.Value{sqltypes.NewInt64(100), sqltypes.NewInt64(30)}},
+			{Opcode: GreaterThanEqual, ColNum: 0, Value: sqltypes.NewInt64(20)},
+			{Opcode: LessThanEqual, ColNum: 0, Value: sqltypes.NewInt64(60)},
 		},
 	}}
 
diff --git a/go/vt/vttablet/tabletserver/vstreamer/rowstreamer_test.go b/go/vt/vttablet/tabletserver/vstreamer/rowstreamer_test.go
index 97ed4093c8f..f2c1c226c73 100644
--- a/go/vt/vttablet/tabletserver/vstreamer/rowstreamer_test.go
+++ b/go/vt/vttablet/tabletserver/vstreamer/rowstreamer_test.go
@@ -351,6 +351,85 @@ func TestStreamRowsFilterInt(t *testing.T) {
 	require.Less(t, int64(0), engine.vstreamerPacketSize.Get())
 }
 
+func TestStreamRowsFilterBetween(t *testing.T) {
+	if testing.Short() {
+		t.Skip()
+	}
+	engine.rowStreamerNumPackets.Reset()
+	engine.rowStreamerNumRows.Reset()
+
+	if err := env.SetVSchema(shardedVSchema); err != nil {
+		t.Fatal(err)
+	}
+	defer env.SetVSchema("{}")
+
+	execStatements(t, []string{
+		"create table t1(id1 int, id2 int, val varbinary(128), primary key(id1))",
+		"insert into t1 values (1, 100, 'aaa'), (2, 200, 'bbb'), (3, 200, 'ccc'), (4, 100, 'ddd'), (5, 200, 'eee')",
+	})
+
+	defer execStatements(t, []string{
+		"drop table t1",
+	})
+
+	// Test for BETWEEN
+	wantStream := []string{
+		`fields:{name:"id1" type:INT32 table:"t1" org_table:"t1" database:"vttest" org_name:"id1" column_length:11 charset:63 column_type:"int(11)"} fields:{name:"val" type:VARBINARY table:"t1" org_table:"t1" database:"vttest" org_name:"val" column_length:128 charset:63 column_type:"varbinary(128)"} pkfields:{name:"id1" type:INT32 charset:63}`,
+		`rows:{lengths:1 lengths:3 values:"2bbb"} rows:{lengths:1 lengths:3 values:"3ccc"} rows:{lengths:1 lengths:3 values:"4ddd"} lastpk:{lengths:1 values:"4"}`,
+	}
+	wantQuery := "select /*+ MAX_EXECUTION_TIME(3600000) */ id1, id2, val from t1 where (id1 between 2 and 4) order by id1"
+	checkStream(t, "select id1, val from t1 where (id1 between 2 and 4)", nil, wantQuery, wantStream)
+	require.Equal(t, int64(0), engine.rowStreamerNumPackets.Get())
+	require.Equal(t, int64(3), engine.rowStreamerNumRows.Get())
+	require.NotZero(t, engine.vstreamerPacketSize.Get())
+
+	engine.rowStreamerNumPackets.Reset()
+	engine.rowStreamerNumRows.Reset()
+
+	// Test for NOT BETWEEN
+	wantStream = []string{
+		`fields:{name:"id1" type:INT32 table:"t1" org_table:"t1" database:"vttest" org_name:"id1" column_length:11 charset:63 column_type:"int(11)"} fields:{name:"val" type:VARBINARY table:"t1" org_table:"t1" database:"vttest" org_name:"val" column_length:128 charset:63 column_type:"varbinary(128)"} pkfields:{name:"id1" type:INT32 charset:63}`,
+		`rows:{lengths:1 lengths:3 values:"1aaa"} rows:{lengths:1 lengths:3 values:"5eee"} lastpk:{lengths:1 values:"5"}`,
+	}
+	wantQuery = "select /*+ MAX_EXECUTION_TIME(3600000) */ id1, id2, val from t1 where (id1 not between 2 and 4) order by id1"
+	checkStream(t, "select id1, val from t1 where (id1 not between 2 and 4)", nil, wantQuery, wantStream)
+	require.Equal(t, int64(0), engine.rowStreamerNumPackets.Get())
+	require.Equal(t, int64(2), engine.rowStreamerNumRows.Get())
+	require.NotZero(t, engine.vstreamerPacketSize.Get())
+}
+
+func TestStreamRowsFilterIn(t *testing.T) {
+	if testing.Short() {
+		t.Skip()
+	}
+	engine.rowStreamerNumPackets.Reset()
+	engine.rowStreamerNumRows.Reset()
+
+	if err := env.SetVSchema(shardedVSchema); err != nil {
+		t.Fatal(err)
+	}
+	defer env.SetVSchema("{}")
+
+	execStatements(t, []string{
+		"create table t1(id1 int, id2 int, val varbinary(128), primary key(id1))",
+		"insert into t1 values (1, 100, 'aaa'), (2, 200, 'bbb'), (3, 200, 'ccc'), (4, 100, 'ddd'), (5, 200, 'eee')",
+	})
+
+	defer execStatements(t, []string{
+		"drop table t1",
+	})
+
+	wantStream := []string{
+		`fields:{name:"id1" type:INT32 table:"t1" org_table:"t1" database:"vttest" org_name:"id1" column_length:11 charset:63 column_type:"int(11)"} fields:{name:"val" type:VARBINARY table:"t1" org_table:"t1" database:"vttest" org_name:"val" column_length:128 charset:63 column_type:"varbinary(128)"} pkfields:{name:"id1" type:INT32 charset:63}`,
+		`rows:{lengths:1 lengths:3 values:"1aaa"} rows:{lengths:1 lengths:3 values:"2bbb"} rows:{lengths:1 lengths:3 values:"3ccc"} lastpk:{lengths:1 values:"3"}`,
+	}
+	wantQuery := "select /*+ MAX_EXECUTION_TIME(3600000) */ id1, id2, val from t1 where (id1 in (1, 2, 3)) order by id1"
+	checkStream(t, "select id1, val from t1 where id1 in (1, 2, 3)", nil, wantQuery, wantStream)
+	require.Equal(t, int64(0), engine.rowStreamerNumPackets.Get())
+	require.Equal(t, int64(3), engine.rowStreamerNumRows.Get())
+	require.NotZero(t, engine.vstreamerPacketSize.Get())
+}
+
 func TestStreamRowsFilterVarBinary(t *testing.T) {
 	if testing.Short() {
 		t.Skip()
diff --git a/go/vt/vttablet/tabletserver/vstreamer/vstreamer_test.go b/go/vt/vttablet/tabletserver/vstreamer/vstreamer_test.go
index 7281be1d60c..0fb7d4cd62d 100644
--- a/go/vt/vttablet/tabletserver/vstreamer/vstreamer_test.go
+++ b/go/vt/vttablet/tabletserver/vstreamer/vstreamer_test.go
@@ -2115,3 +2115,124 @@ func TestFilteredInOperator(t *testing.T) {
 	}}
 	ts.Run()
 }
+
+func TestFilteredBetweenOperator(t *testing.T) {
+	testCases := []struct {
+		name        string
+		filter      string
+		testQueries []*TestQuery
+	}{
+		{
+			name:   "between-int",
+			filter: "select id1, val from t1 where id1 between 2 and 5",
+			testQueries: []*TestQuery{
+				{"begin", nil},
+				{"insert into t1 values (1, 100, 'aaa')", noEvents},
+				{"insert into t1 values (2, 200, 'bbb')", nil},
+				{"insert into t1 values (3, 100, 'ccc')", nil},
+				{"insert into t1 values (4, 200, 'ddd')", nil},
+				{"insert into t1 values (5, 200, 'eee')", nil},
+				{"insert into t1 values (6, 200, 'fff')", noEvents},
+				{"commit", nil},
+			},
+		},
+		{
+			name:   "between-varchar",
+			filter: "select id1, val from t1 where val between 'c' and 'e'",
+			testQueries: []*TestQuery{
+				{"begin", nil},
+				{"insert into t1 values (1, 100, 'a')", noEvents},
+				{"insert into t1 values (2, 200, 'b')", noEvents},
+				{"insert into t1 values (3, 100, 'c')", nil},
+				{"insert into t1 values (4, 200, 'd')", nil},
+				{"insert into t1 values (5, 200, 'e')", nil},
+				{"insert into t1 values (6, 200, 'f')", noEvents},
+				{"commit", nil},
+			},
+		},
+		{
+			name:   "not-between-int",
+			filter: "select id1, val from t1 where id1 not between 3 and 5",
+			testQueries: []*TestQuery{
+				{"begin", nil},
+				{"insert into t1 values (1, 100, 'aaa')", nil},
+				{"insert into t1 values (2, 200, 'bbb')", nil},
+				{"insert into t1 values (3, 100, 'ccc')", noEvents},
+				{"insert into t1 values (4, 200, 'ddd')", noEvents},
+				{"insert into t1 values (5, 200, 'eee')", noEvents},
+				{"insert into t1 values (6, 200, 'fff')", nil},
+				{"commit", nil},
+			},
+		},
+		{
+			name:   "not-between-varchar",
+			filter: "select id1, val from t1 where val not between 'b' and 'e'",
+			testQueries: []*TestQuery{
+				{"begin", nil},
+				{"insert into t1 values (1, 100, 'a')", nil},
+				{"insert into t1 values (2, 200, 'b')", noEvents},
+				{"insert into t1 values (3, 100, 'c')", noEvents},
+				{"insert into t1 values (4, 200, 'd')", noEvents},
+				{"insert into t1 values (5, 200, 'e')", noEvents},
+				{"insert into t1 values (6, 200, 'f')", nil},
+				{"insert into t1 values (7, 100, 'g')", nil},
+				{"commit", nil},
+			},
+		},
+		{
+			name:   "between-and-not-between",
+			filter: "select id1, val from t1 where id1 between 2 and 6 and val not between 'd' and 'f'",
+			testQueries: []*TestQuery{
+				{"begin", nil},
+				{"insert into t1 values (1, 100, 'a')", noEvents},
+				{"insert into t1 values (2, 200, 'b')", nil},
+				{"insert into t1 values (3, 100, 'c')", nil},
+				{"insert into t1 values (4, 200, 'd')", noEvents},
+				{"insert into t1 values (5, 200, 'e')", noEvents},
+				{"insert into t1 values (6, 200, 'f')", noEvents},
+				{"insert into t1 values (7, 100, 'g')", noEvents},
+				{"commit", nil},
+			},
+		},
+		{
+			name:   "between-and-not-between-and-additional-compare",
+			filter: "select id1, val from t1 where id1 between 2 and 10 and id1 != 9 and val not between 'd' and 'f' and val in ('a','e')",
+			testQueries: []*TestQuery{
+				{"begin", nil},
+				{"insert into t1 values (1, 100, 'a')", noEvents},
+				{"insert into t1 values (2, 200, 'b')", noEvents},
+				{"insert into t1 values (3, 100, 'c')", noEvents},
+				{"insert into t1 values (4, 200, 'd')", noEvents},
+				{"insert into t1 values (5, 200, 'e')", noEvents},
+				{"insert into t1 values (6, 200, 'f')", noEvents},
+				{"insert into t1 values (7, 100, 'g')", noEvents},
+				{"insert into t1 values (8, 100, 'a')", nil},
+				{"insert into t1 values (9, 100, 'a')", noEvents},
+				{"commit", nil},
+			},
+		},
+	}
+	for _, tc := range testCases {
+		t.Run(tc.name, func(t *testing.T) {
+			ts := &TestSpec{
+				t: t,
+				ddls: []string{
+					"create table t1(id1 int, id2 int, val varbinary(128), primary key(id1))",
+				},
+				options: &TestSpecOptions{
+					filter: &binlogdatapb.Filter{
+						Rules: []*binlogdatapb.Rule{{
+							Match:  "t1",
+							Filter: tc.filter,
+						}},
+					},
+				},
+			}
+			defer ts.Close()
+			ts.Init()
+			ts.fieldEvents["t1"].cols[1].skip = true
+			ts.tests = [][]*TestQuery{tc.testQueries}
+			ts.Run()
+		})
+	}
+}

From 5c27b400a81fca6023e809985826e01976632e6a Mon Sep 17 00:00:00 2001
From: Matt Lord <mattalord@gmail.com>
Date: Wed, 19 Feb 2025 10:59:24 -0500
Subject: [PATCH 67/68] VReplication: Align VReplication and VTGate VStream
 Retry Logic (#17783)

Signed-off-by: Matt Lord <mattalord@gmail.com>
---
 go/vt/vtgate/vstream_manager.go               | 32 ++++++++++++++-----
 go/vt/vtgate/vstream_manager_test.go          | 11 +++++--
 .../tabletmanager/vreplication/utils.go       |  3 +-
 .../tabletmanager/vreplication/utils_test.go  |  3 +-
 .../tabletserver/vstreamer/uvstreamer.go      |  8 ++---
 5 files changed, 40 insertions(+), 17 deletions(-)

diff --git a/go/vt/vtgate/vstream_manager.go b/go/vt/vtgate/vstream_manager.go
index dc7a77ed62d..2a48fa9fc6d 100644
--- a/go/vt/vtgate/vstream_manager.go
+++ b/go/vt/vtgate/vstream_manager.go
@@ -27,6 +27,7 @@ import (
 
 	"golang.org/x/exp/maps"
 
+	"vitess.io/vitess/go/mysql/sqlerror"
 	"vitess.io/vitess/go/stats"
 	"vitess.io/vitess/go/vt/discovery"
 	"vitess.io/vitess/go/vt/key"
@@ -798,20 +799,35 @@ func (vs *vstream) streamFromTablet(ctx context.Context, sgtid *binlogdatapb.Sha
 // An error should be retried if it is expected to be transient.
 // A tablet should be ignored upon retry if it's likely another tablet will not
 // produce the same error.
-func (vs *vstream) shouldRetry(err error) (bool, bool) {
+func (vs *vstream) shouldRetry(err error) (retry bool, ignoreTablet bool) {
 	errCode := vterrors.Code(err)
-
+	// In this context, where we will run the tablet picker again on retry, these
+	// codes indicate that it's worth a retry as the error is likely a transient
+	// one with a tablet or within the shard.
 	if errCode == vtrpcpb.Code_FAILED_PRECONDITION || errCode == vtrpcpb.Code_UNAVAILABLE {
 		return true, false
 	}
-
-	// If there is a GTIDSet Mismatch on the tablet, omit it from the candidate
-	// list in the TabletPicker on retry.
-	if errCode == vtrpcpb.Code_INVALID_ARGUMENT && strings.Contains(err.Error(), "GTIDSet Mismatch") {
-		return true, true
+	// This typically indicates that the user provided invalid arguments for the
+	// VStream so we should not retry.
+	if errCode == vtrpcpb.Code_INVALID_ARGUMENT {
+		// But if there is a GTIDSet Mismatch on the tablet, omit that tablet from
+		// the candidate list in the TabletPicker and retry. The argument was invalid
+		// *for that specific *tablet* but it's not generally invalid.
+		if strings.Contains(err.Error(), "GTIDSet Mismatch") {
+			return true, true
+		}
+		return false, false
+	}
+	// Internal errors such as not having all journaling partipants require a new
+	// VStream.
+	if errCode == vtrpcpb.Code_INTERNAL {
+		return false, false
 	}
 
-	return false, false
+	// For anything else, if this is an ephemeral SQL error -- such as a
+	// MAX_EXECUTION_TIME SQL error during the copy phase -- or any other
+	// type of non-SQL error, then retry.
+	return sqlerror.IsEphemeralError(err), false
 }
 
 // sendAll sends a group of events together while holding the lock.
diff --git a/go/vt/vtgate/vstream_manager_test.go b/go/vt/vtgate/vstream_manager_test.go
index 4e10e60c758..e209e15fb3d 100644
--- a/go/vt/vtgate/vstream_manager_test.go
+++ b/go/vt/vtgate/vstream_manager_test.go
@@ -420,12 +420,19 @@ func TestVStreamRetriableErrors(t *testing.T) {
 			ignoreTablet: false,
 		},
 		{
-			name:         "should not retry",
+			name:         "invalid argument",
 			code:         vtrpcpb.Code_INVALID_ARGUMENT,
 			msg:          "final error",
 			shouldRetry:  false,
 			ignoreTablet: false,
 		},
+		{
+			name:         "query interrupted",
+			code:         vtrpcpb.Code_UNKNOWN,
+			msg:          "vttablet: rpc error: code = Unknown desc = Query execution was interrupted, maximum statement execution time exceeded (errno 3024) (sqlstate HY000)",
+			shouldRetry:  true,
+			ignoreTablet: false,
+		},
 	}
 
 	commit := []*binlogdatapb.VEvent{
@@ -928,7 +935,7 @@ func TestVStreamJournalPartialMatch(t *testing.T) {
 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()
 
-	// Variable names are maintained like in OneToMany, but order is different.1
+	// Variable names are maintained like in OneToMany, but order is different.
 	ks := "TestVStream"
 	cell := "aa"
 	_ = createSandbox(ks)
diff --git a/go/vt/vttablet/tabletmanager/vreplication/utils.go b/go/vt/vttablet/tabletmanager/vreplication/utils.go
index 67b52c56261..cff53ce55ee 100644
--- a/go/vt/vttablet/tabletmanager/vreplication/utils.go
+++ b/go/vt/vttablet/tabletmanager/vreplication/utils.go
@@ -129,7 +129,8 @@ func insertLogWithParams(dbClient *vdbClient, action string, vreplID int32, para
 	insertLog(dbClient, action, vreplID, params["state"], message)
 }
 
-// isUnrecoverableError returns true if vreplication cannot recover from the given error and should completely terminate.
+// isUnrecoverableError returns true if vreplication cannot recover from the given error and
+// should completely terminate.
 func isUnrecoverableError(err error) bool {
 	if err == nil {
 		return false
diff --git a/go/vt/vttablet/tabletmanager/vreplication/utils_test.go b/go/vt/vttablet/tabletmanager/vreplication/utils_test.go
index 15093e299fc..2406796aace 100644
--- a/go/vt/vttablet/tabletmanager/vreplication/utils_test.go
+++ b/go/vt/vttablet/tabletmanager/vreplication/utils_test.go
@@ -22,8 +22,6 @@ import (
 	"strings"
 	"testing"
 
-	vttablet "vitess.io/vitess/go/vt/vttablet/common"
-
 	"github.com/stretchr/testify/require"
 
 	"vitess.io/vitess/go/mysql/sqlerror"
@@ -31,6 +29,7 @@ import (
 	"vitess.io/vitess/go/textutil"
 	"vitess.io/vitess/go/vt/binlog/binlogplayer"
 	"vitess.io/vitess/go/vt/vterrors"
+	vttablet "vitess.io/vitess/go/vt/vttablet/common"
 
 	binlogdatapb "vitess.io/vitess/go/vt/proto/binlogdata"
 	vtrpcpb "vitess.io/vitess/go/vt/proto/vtrpc"
diff --git a/go/vt/vttablet/tabletserver/vstreamer/uvstreamer.go b/go/vt/vttablet/tabletserver/vstreamer/uvstreamer.go
index ea475d19676..bf8d4330831 100644
--- a/go/vt/vttablet/tabletserver/vstreamer/uvstreamer.go
+++ b/go/vt/vttablet/tabletserver/vstreamer/uvstreamer.go
@@ -27,17 +27,17 @@ import (
 	"time"
 
 	"vitess.io/vitess/go/mysql/replication"
-	vtrpcpb "vitess.io/vitess/go/vt/proto/vtrpc"
-
 	"vitess.io/vitess/go/vt/dbconfigs"
 	"vitess.io/vitess/go/vt/key"
 	"vitess.io/vitess/go/vt/log"
-	binlogdatapb "vitess.io/vitess/go/vt/proto/binlogdata"
-	querypb "vitess.io/vitess/go/vt/proto/query"
 	"vitess.io/vitess/go/vt/sqlparser"
 	"vitess.io/vitess/go/vt/vterrors"
 	"vitess.io/vitess/go/vt/vttablet/tabletserver/schema"
 	"vitess.io/vitess/go/vt/vttablet/tabletserver/throttle/throttlerapp"
+
+	binlogdatapb "vitess.io/vitess/go/vt/proto/binlogdata"
+	querypb "vitess.io/vitess/go/vt/proto/query"
+	vtrpcpb "vitess.io/vitess/go/vt/proto/vtrpc"
 )
 
 var uvstreamerTestMode = false // Only used for testing

From 2118bc35d4711f2070b3dd1ae2d14decc28ca060 Mon Sep 17 00:00:00 2001
From: Harshit Gangal <harshit@planetscale.com>
Date: Wed, 19 Feb 2025 22:00:58 +0530
Subject: [PATCH 68/68] pool: reopen connection closed by idle timeout (#17818)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Harshit Gangal <harshit@planetscale.com>
Signed-off-by: Vicent Martí <42793+vmg@users.noreply.github.com>
Co-authored-by: Vicent Martí <42793+vmg@users.noreply.github.com>
---
 go/pools/smartconnpool/pool.go      | 24 ++++++++--
 go/pools/smartconnpool/pool_test.go | 73 +++++++++++++++++++++++------
 2 files changed, 78 insertions(+), 19 deletions(-)

diff --git a/go/pools/smartconnpool/pool.go b/go/pools/smartconnpool/pool.go
index 87a288bec3d..7e4b296e634 100644
--- a/go/pools/smartconnpool/pool.go
+++ b/go/pools/smartconnpool/pool.go
@@ -136,7 +136,6 @@ type ConnPool[C Connection] struct {
 		connect Connector[C]
 		// refresh is the callback to check whether the pool needs to be refreshed
 		refresh RefreshCheck
-
 		// maxCapacity is the maximum value to which capacity can be set; when the pool
 		// is re-opened, it defaults to this capacity
 		maxCapacity int64
@@ -401,6 +400,8 @@ func (pool *ConnPool[C]) put(conn *Pooled[C]) {
 
 	if conn == nil {
 		var err error
+		// Using context.Background() is fine since MySQL connection already enforces
+		// a connect timeout via the `db_connect_timeout_ms` config param.
 		conn, err = pool.connNew(context.Background())
 		if err != nil {
 			pool.closedConn()
@@ -413,6 +414,8 @@ func (pool *ConnPool[C]) put(conn *Pooled[C]) {
 		if lifetime > 0 && conn.timeCreated.elapsed() > lifetime {
 			pool.Metrics.maxLifetimeClosed.Add(1)
 			conn.Close()
+			// Using context.Background() is fine since MySQL connection already enforces
+			// a connect timeout via the `db_connect_timeout_ms` config param.
 			if err := pool.connReopen(context.Background(), conn, conn.timeUsed.get()); err != nil {
 				pool.closedConn()
 				return
@@ -496,15 +499,22 @@ func (pool *ConnPool[D]) extendedMaxLifetime() time.Duration {
 	return time.Duration(maxLifetime) + time.Duration(rand.Uint32N(uint32(maxLifetime)))
 }
 
-func (pool *ConnPool[C]) connReopen(ctx context.Context, dbconn *Pooled[C], now time.Duration) error {
-	var err error
+func (pool *ConnPool[C]) connReopen(ctx context.Context, dbconn *Pooled[C], now time.Duration) (err error) {
 	dbconn.Conn, err = pool.config.connect(ctx)
 	if err != nil {
 		return err
 	}
 
-	dbconn.timeUsed.set(now)
+	if setting := dbconn.Conn.Setting(); setting != nil {
+		err = dbconn.Conn.ApplySetting(ctx, setting)
+		if err != nil {
+			dbconn.Close()
+			return err
+		}
+	}
+
 	dbconn.timeCreated.set(now)
+	dbconn.timeUsed.set(now)
 	return nil
 }
 
@@ -764,7 +774,11 @@ func (pool *ConnPool[C]) closeIdleResources(now time.Time) {
 			if conn.timeUsed.expired(mono, timeout) {
 				pool.Metrics.idleClosed.Add(1)
 				conn.Close()
-				pool.closedConn()
+				// Using context.Background() is fine since MySQL connection already enforces
+				// a connect timeout via the `db_connect_timeout_ms` config param.
+				if err := pool.connReopen(context.Background(), conn, mono); err != nil {
+					pool.closedConn()
+				}
 			}
 		}
 	}
diff --git a/go/pools/smartconnpool/pool_test.go b/go/pools/smartconnpool/pool_test.go
index 202261e6f3b..4e249622fb0 100644
--- a/go/pools/smartconnpool/pool_test.go
+++ b/go/pools/smartconnpool/pool_test.go
@@ -36,12 +36,11 @@ var (
 
 type TestState struct {
 	lastID, open, close, reset atomic.Int64
-	waits                      []time.Time
 	mu                         sync.Mutex
-
-	chaos struct {
+	waits                      []time.Time
+	chaos                      struct {
 		delayConnect time.Duration
-		failConnect  bool
+		failConnect  atomic.Bool
 		failApply    bool
 	}
 }
@@ -109,7 +108,7 @@ func newConnector(state *TestState) Connector[*TestConn] {
 		if state.chaos.delayConnect != 0 {
 			time.Sleep(state.chaos.delayConnect)
 		}
-		if state.chaos.failConnect {
+		if state.chaos.failConnect.Load() {
 			return nil, fmt.Errorf("failed to connect: forced failure")
 		}
 		return &TestConn{
@@ -586,6 +585,45 @@ func TestUserClosing(t *testing.T) {
 	}
 }
 
+func TestConnReopen(t *testing.T) {
+	var state TestState
+
+	p := NewPool(&Config[*TestConn]{
+		Capacity:    1,
+		IdleTimeout: 200 * time.Millisecond,
+		MaxLifetime: 10 * time.Millisecond,
+		LogWait:     state.LogWait,
+	}).Open(newConnector(&state), nil)
+
+	defer p.Close()
+
+	conn, err := p.Get(context.Background(), nil)
+	require.NoError(t, err)
+	assert.EqualValues(t, 1, state.lastID.Load())
+	assert.EqualValues(t, 1, p.Active())
+
+	// wait enough to reach maxlifetime.
+	time.Sleep(50 * time.Millisecond)
+
+	p.put(conn)
+	assert.EqualValues(t, 2, state.lastID.Load())
+	assert.EqualValues(t, 1, p.Active())
+
+	// wait enough to reach idle timeout.
+	time.Sleep(300 * time.Millisecond)
+	assert.GreaterOrEqual(t, state.lastID.Load(), int64(3))
+	assert.EqualValues(t, 1, p.Active())
+	assert.GreaterOrEqual(t, p.Metrics.IdleClosed(), int64(1))
+
+	// mark connect to fail
+	state.chaos.failConnect.Store(true)
+	// wait enough to reach idle timeout and connect to fail.
+	time.Sleep(300 * time.Millisecond)
+	// no active connection should be left.
+	assert.Zero(t, p.Active())
+
+}
+
 func TestIdleTimeout(t *testing.T) {
 	testTimeout := func(t *testing.T, setting *Setting) {
 		var state TestState
@@ -608,6 +646,7 @@ func TestIdleTimeout(t *testing.T) {
 
 			conns = append(conns, r)
 		}
+		assert.GreaterOrEqual(t, state.open.Load(), int64(5))
 
 		// wait a long while; ensure that none of the conns have been closed
 		time.Sleep(1 * time.Second)
@@ -628,9 +667,15 @@ func TestIdleTimeout(t *testing.T) {
 				t.Fatalf("Connections remain open after 1 second")
 			}
 		}
+		// At least 5 connections should have been closed by now.
+		assert.GreaterOrEqual(t, p.Metrics.IdleClosed(), int64(5), "At least 5 connections should have been closed by now.")
+
+		// At any point, at least 4 connections should be open, with 1 either in the process of opening or already opened.
+		// The idle connection closer shuts down one connection at a time.
+		assert.GreaterOrEqual(t, state.open.Load(), int64(4))
 
-		// no need to assert anything: all the connections in the pool should are idle-closed
-		// now and if they're not the test will timeout and fail
+		// The number of available connections in the pool should remain at 5.
+		assert.EqualValues(t, 5, p.Available())
 	}
 
 	t.Run("WithoutSettings", func(t *testing.T) { testTimeout(t, nil) })
@@ -656,7 +701,7 @@ func TestIdleTimeoutCreateFail(t *testing.T) {
 		// Change the factory before putting back
 		// to prevent race with the idle closer, who will
 		// try to use it.
-		state.chaos.failConnect = true
+		state.chaos.failConnect.Store(true)
 		p.put(r)
 		timeout := time.After(1 * time.Second)
 		for p.Active() != 0 {
@@ -667,7 +712,7 @@ func TestIdleTimeoutCreateFail(t *testing.T) {
 			}
 		}
 		// reset factory for next run.
-		state.chaos.failConnect = false
+		state.chaos.failConnect.Store(false)
 	}
 }
 
@@ -803,7 +848,7 @@ func TestMaxIdleCount(t *testing.T) {
 
 func TestCreateFail(t *testing.T) {
 	var state TestState
-	state.chaos.failConnect = true
+	state.chaos.failConnect.Store(true)
 
 	ctx := context.Background()
 	p := NewPool(&Config[*TestConn]{
@@ -850,12 +895,12 @@ func TestCreateFailOnPut(t *testing.T) {
 		require.NoError(t, err)
 
 		// change factory to fail the put.
-		state.chaos.failConnect = true
+		state.chaos.failConnect.Store(true)
 		p.put(nil)
 		assert.Zero(t, p.Active())
 
 		// change back for next iteration.
-		state.chaos.failConnect = false
+		state.chaos.failConnect.Store(false)
 	}
 }
 
@@ -873,7 +918,7 @@ func TestSlowCreateFail(t *testing.T) {
 			LogWait:     state.LogWait,
 		}).Open(newConnector(&state), nil)
 
-		state.chaos.failConnect = true
+		state.chaos.failConnect.Store(true)
 
 		for i := 0; i < 3; i++ {
 			go func() {
@@ -892,7 +937,7 @@ func TestSlowCreateFail(t *testing.T) {
 		default:
 		}
 
-		state.chaos.failConnect = false
+		state.chaos.failConnect.Store(false)
 		conn, err := p.Get(ctx, setting)
 		require.NoError(t, err)