Experimental: Multi-tenant import support in Vitess

go/test/endtoend/vreplication/multi_tenant_test.go

@@ -93,7 +93,7 @@ const (
 {
   "multi_tenant_spec": {
       "tenant_id_column_name": "tenant_id",
-      "tenant_id_column_type": "int64"
+      "tenant_id_column_type": 265
   },
   "tables": {
     "t1": {}

go/vt/vtctl/workflow/utils.go

@@ -28,6 +28,8 @@ import (
 	"strings"
 	"sync"
 
+	querypb "vitess.io/vitess/go/vt/proto/query"
+
 	"vitess.io/vitess/go/vt/vtgate/vindexes"
 
 	"google.golang.org/protobuf/encoding/prototext"
@@ -806,13 +808,13 @@ func getTenantClause(vrOptions *vtctldatapb.WorkflowOptions,
 
 	var tenantId string
 	switch tenantColumnType {
-	case "int", "int64":
+	case querypb.Type_INT64:
 		_, err := strconv.Atoi(vrOptions.TenantId)
 		if err != nil {
 			return nil, fmt.Errorf("tenant id is not a valid int: %s", vrOptions.TenantId)
 		}
 		tenantId = vrOptions.TenantId
-	case "string":
+	case querypb.Type_VARCHAR:
 		tenantId = fmt.Sprintf("'%s'", vrOptions.TenantId)
 	default:
 		return nil, fmt.Errorf("unsupported tenant column type: %s", tenantColumnType)
@@ -847,14 +849,14 @@ func updateKeyspaceRoutingRule(ctx context.Context, ts *topo.Server, routes map[
 	return nil
 }
 
-func validateTenantId(dataType, value string) error {
+func validateTenantId(dataType querypb.Type, value string) error {
 	switch dataType {
-	case "int", "int64":
+	case querypb.Type_INT64:
 		_, err := strconv.Atoi(value)
 		if err != nil {
 			return fmt.Errorf("value %s is not a valid int", value)
 		}
-	case "string":
+	case querypb.Type_VARCHAR:
 	// no validation needed
 	default:
 		return fmt.Errorf("unsupported data type: %s", dataType)

go/vt/vtgate/vindexes/vschema_test.go

@@ -259,23 +259,23 @@ func TestMultiTenantAttribute(t *testing.T) {
 		wanted          *vschemapb.MultiTenantSpec
 	}{
 		{
-			name: "Default Value",
+			name: "Not Set",
 		}, {
-			name: "MultiTenantSpec Set to True",
+			name: "Empty MultiTenantSpec",
+			multiTenantSpec: &vschemapb.MultiTenantSpec{
+				TenantIdColumnName: "",
+			},
+			wanted: &vschemapb.MultiTenantSpec{},
+		}, {
+			name: "String",
 			multiTenantSpec: &vschemapb.MultiTenantSpec{
 				TenantIdColumnName: "tenant_id",
-				TenantIdColumnType: "int64",
+				TenantIdColumnType: querypb.Type_VARCHAR,
 			},
 			wanted: &vschemapb.MultiTenantSpec{
 				TenantIdColumnName: "tenant_id",
-				TenantIdColumnType: "int64",
+				TenantIdColumnType: querypb.Type_VARCHAR,
 			},
-		}, {
-			name: "MultiTenantSpec Set to True",
-			multiTenantSpec: &vschemapb.MultiTenantSpec{
-				TenantIdColumnName: "",
-			},
-			wanted: &vschemapb.MultiTenantSpec{},
 		},
 	}
 	for _, test := range tests {
@@ -2660,7 +2660,7 @@ func TestVSchemaPBJSON(t *testing.T) {
 		"foreignKeyMode": "unmanaged",
         "multi_tenant_spec": {
 			"tenant_id_column_name": "tenant_id",
-			"tenant_id_column_type": "int64"
+			"tenant_id_column_type": 265
 		},
 		"tables": {
 			"t1": {
@@ -2694,7 +2694,7 @@ func TestVSchemaPBJSON(t *testing.T) {
 		ForeignKeyMode: vschemapb.Keyspace_unmanaged,
 		MultiTenantSpec: &vschemapb.MultiTenantSpec{
 			TenantIdColumnName: "tenant_id",
-			TenantIdColumnType: "int64",
+			TenantIdColumnType: querypb.Type_INT64,
 		},
 		Tables: map[string]*vschemapb.Table{
 			"t1": {
@@ -2742,7 +2742,7 @@ func TestVSchemaJSON(t *testing.T) {
 			ForeignKeyMode: vschemapb.Keyspace_managed,
 			MultiTenantSpec: &vschemapb.MultiTenantSpec{
 				TenantIdColumnName: "tenant_id",
-				TenantIdColumnType: "int64",
+				TenantIdColumnType: querypb.Type_INT64,
 			},
 			Keyspace: &Keyspace{
 				Name: "k1",
@@ -2840,7 +2840,7 @@ func TestVSchemaJSON(t *testing.T) {
     },
     "multi_tenant_spec": {
       "tenant_id_column_name": "tenant_id",
-      "tenant_id_column_type": "int64"
+      "tenant_id_column_type": 265
     }
   }
 }`

proto/vschema.proto

@@ -63,7 +63,7 @@ message MultiTenantSpec {
   // tenant_column is the name of the column that specifies the tenant id.
   string tenant_id_column_name = 1;
   // tenant_column_type is the type of the column that specifies the tenant id.
-  string tenant_id_column_type = 2;
+  query.Type tenant_id_column_type = 2;
 }
 
 // Vindex is the vindex info for a Keyspace.