Add support for showing global vgtid executed

go/sqltypes/testing.go

@@ -145,9 +145,5 @@ func PrintResults(results []*Result) string {
 }
 
 func split(str string) []string {
- splits := strings.Split(str, "|")
- for i, v := range splits {
- splits[i] = strings.TrimSpace(v)
- }
- return splits
+ return strings.Split(str, "|")
 }

go/test/endtoend/vtgate/misc_test.go

@@ -21,17 +21,14 @@ import (
  "fmt"
  "testing"
 
- "vitess.io/vitess/go/test/utils"
-
  "github.com/google/go-cmp/cmp"
-
  "github.com/stretchr/testify/assert"
-
  "github.com/stretchr/testify/require"
 
  "vitess.io/vitess/go/mysql"
  "vitess.io/vitess/go/sqltypes"
  "vitess.io/vitess/go/test/endtoend/cluster"
+ "vitess.io/vitess/go/test/utils"
 )
 
 func TestSelectNull(t *testing.T) {
@@ -595,6 +592,26 @@ func TestSubQueryOnTopOfSubQuery(t *testing.T) {
  assertMatches(t, conn, "select id1 from t1 where id1 not in (select id3 from t2) and id2 in (select id4 from t2) order by id1", `[[INT64(3)] [INT64(4)]]`)
 }
 
+func TestShowVGtid(t *testing.T) {
+ conn, err := mysql.Connect(context.Background(), &vtParams)
+ require.NoError(t, err)
+ defer conn.Close()
+
+ query := "show global vgtid_executed from ks"
+ qr := exec(t, conn, query)
+ require.Equal(t, 1, len(qr.Rows))
+ require.Equal(t, 2, len(qr.Rows[0]))
+
+ defer exec(t, conn, `delete from t1`)
+ exec(t, conn, `insert into t1(id1, id2) values (1, 1), (2, 2), (3, 3), (4, 4), (5, 5)`)
+ qr2 := exec(t, conn, query)
+ require.Equal(t, 1, len(qr2.Rows))
+ require.Equal(t, 2, len(qr2.Rows[0]))
+
+ require.Equal(t, qr.Rows[0][0], qr2.Rows[0][0], "keyspace should be same")
+ require.NotEqual(t, qr.Rows[0][1].ToString(), qr2.Rows[0][1].ToString(), "vgtid should have changed")
+}
+
 func assertMatches(t *testing.T, conn *mysql.Conn, query, expected string) {
  t.Helper()
  qr := exec(t, conn, query)

go/vt/sqlparser/ast_funcs.go

@@ -1253,6 +1253,8 @@ func (ty ShowCommandType) ToString() string {
  return VariableGlobalStr
  case VariableSession:
  return VariableSessionStr
+ case VGtidExecGlobal:
+ return VGtidExecGlobalStr
  case VitessMigrations:
  return VitessMigrationsStr
  case Keyspace:

go/vt/sqlparser/constants.go

@@ -236,6 +236,7 @@ const (
  TriggerStr = " triggers"
  VariableGlobalStr = " global variables"
  VariableSessionStr = " variables"
+ VGtidExecGlobalStr = " global vgtid_executed"
  KeyspaceStr = " keyspaces"
  VitessMigrationsStr = " vitess_migrations"
 
@@ -493,6 +494,7 @@ const (
  Trigger
  VariableGlobal
  VariableSession
+ VGtidExecGlobal
  VitessMigrations
  Keyspace
 )
@@ -512,6 +514,7 @@ const (
  ExclusiveType
 )
 
+// AlterMigrationType constants
 const (
  RetryMigrationType AlterMigrationType = iota
  CompleteMigrationType

go/vt/sqlparser/keywords.go

@@ -458,6 +458,7 @@ var keywords = []keyword{
  {"varchar", VARCHAR},
  {"varcharacter", UNUSED},
  {"varying", UNUSED},
+ {"vgtid_executed", VGTID_EXECUTED},
  {"virtual", UNUSED},
  {"vindex", VINDEX},
  {"vindexes", VINDEXES},

go/vt/sqlparser/parse_test.go

@@ -1518,6 +1518,10 @@ var (
  }, {
  input: "show session variables",
  output: "show variables",
+ }, {
+ input: "show global vgtid_executed",
+ }, {
+ input: "show global vgtid_executed from ks",
  }, {
  input: "show vitess_keyspaces",
  output: "show keyspaces",