backport of 2647 (vitessio#2670)

planetscale · Jul 18, 2023 · cf40bc8 · cf40bc8
1 parent ab1142a
commit cf40bc8
Show file tree

Hide file tree

Showing 6 changed files with 541 additions and 200 deletions.
diff --git a/go/vt/vtgate/planbuilder/operators/sharded_routing.go b/go/vt/vtgate/planbuilder/operators/sharded_routing.go
@@ -79,6 +79,10 @@ func newShardedRouting(vtable *vindexes.Table, id semantics.TableSet) Routing {
 
  }
  for _, columnVindex := range vtable.ColumnVindexes {
+ // ignore any backfilling vindexes from vindex selection.
+ if columnVindex.IsBackfilling() {
+ continue
+ }
  routing.VindexPreds = append(routing.VindexPreds, &VindexPlusPredicates{ColVindex: columnVindex, TableID: id})
  }
  return routing

diff --git a/go/vt/vtgate/planbuilder/plan_test.go b/go/vt/vtgate/planbuilder/plan_test.go
@@ -52,199 +52,6 @@ import (
  "vitess.io/vitess/go/vt/vtgate/vindexes"
 )
 
-// hashIndex is a functional, unique Vindex.
-type hashIndex struct{ name string }
-
-func (v *hashIndex) String() string { return v.name }
-
-func (*hashIndex) Cost() int { return 1 }
-
-func (*hashIndex) IsUnique() bool { return true }
-
-func (*hashIndex) NeedsVCursor() bool { return false }
-
-func (*hashIndex) Verify(context.Context, vindexes.VCursor, []sqltypes.Value, [][]byte) ([]bool, error) {
- return []bool{}, nil
-}
-
-func (*hashIndex) Map(ctx context.Context, vcursor vindexes.VCursor, ids []sqltypes.Value) ([]key.Destination, error) {
- return nil, nil
-}
-
-func newHashIndex(name string, _ map[string]string) (vindexes.Vindex, error) {
- return &hashIndex{name: name}, nil
-}
-
-// lookupIndex is a unique Vindex, and satisfies Lookup.
-type lookupIndex struct{ name string }
-
-func (v *lookupIndex) String() string { return v.name }
-
-func (*lookupIndex) Cost() int { return 2 }
-
-func (*lookupIndex) IsUnique() bool { return true }
-
-func (*lookupIndex) NeedsVCursor() bool { return false }
-
-func (*lookupIndex) Verify(context.Context, vindexes.VCursor, []sqltypes.Value, [][]byte) ([]bool, error) {
- return []bool{}, nil
-}
-
-func (*lookupIndex) Map(ctx context.Context, vcursor vindexes.VCursor, ids []sqltypes.Value) ([]key.Destination, error) {
- return nil, nil
-}
-
-func (*lookupIndex) Create(context.Context, vindexes.VCursor, [][]sqltypes.Value, [][]byte, bool) error {
- return nil
-}
-
-func (*lookupIndex) Delete(context.Context, vindexes.VCursor, [][]sqltypes.Value, []byte) error {
- return nil
-}
-
-func (*lookupIndex) Update(context.Context, vindexes.VCursor, []sqltypes.Value, []byte, []sqltypes.Value) error {
- return nil
-}
-
-func newLookupIndex(name string, _ map[string]string) (vindexes.Vindex, error) {
- return &lookupIndex{name: name}, nil
-}
-
-var _ vindexes.Lookup = (*lookupIndex)(nil)
-
-// nameLkpIndex satisfies Lookup, NonUnique.
-type nameLkpIndex struct{ name string }
-
-func (v *nameLkpIndex) String() string { return v.name }
-
-func (*nameLkpIndex) Cost() int { return 3 }
-
-func (*nameLkpIndex) IsUnique() bool { return false }
-
-func (*nameLkpIndex) NeedsVCursor() bool { return false }
-
-func (*nameLkpIndex) AllowBatch() bool { return true }
-
-func (*nameLkpIndex) AutoCommitEnabled() bool { return false }
-
-func (*nameLkpIndex) GetCommitOrder() vtgatepb.CommitOrder { return vtgatepb.CommitOrder_NORMAL }
-
-func (*nameLkpIndex) Verify(context.Context, vindexes.VCursor, []sqltypes.Value, [][]byte) ([]bool, error) {
- return []bool{}, nil
-}
-
-func (*nameLkpIndex) Map(ctx context.Context, vcursor vindexes.VCursor, ids []sqltypes.Value) ([]key.Destination, error) {
- return nil, nil
-}
-
-func (*nameLkpIndex) Create(context.Context, vindexes.VCursor, [][]sqltypes.Value, [][]byte, bool) error {
- return nil
-}
-
-func (*nameLkpIndex) Delete(context.Context, vindexes.VCursor, [][]sqltypes.Value, []byte) error {
- return nil
-}
-
-func (*nameLkpIndex) Update(context.Context, vindexes.VCursor, []sqltypes.Value, []byte, []sqltypes.Value) error {
- return nil
-}
-
-func (v *nameLkpIndex) Query() (string, []string) {
- return "select name, keyspace_id from name_user_vdx where name in ::name", []string{"name"}
-}
-
-func (*nameLkpIndex) MapResult([]sqltypes.Value, []*sqltypes.Result) ([]key.Destination, error) {
- return nil, nil
-}
-
-func newNameLkpIndex(name string, _ map[string]string) (vindexes.Vindex, error) {
- return &nameLkpIndex{name: name}, nil
-}
-
-var _ vindexes.Vindex = (*nameLkpIndex)(nil)
-
-var _ vindexes.Lookup = (*nameLkpIndex)(nil)
-
-var _ vindexes.LookupPlanable = (*nameLkpIndex)(nil)
-
-// costlyIndex satisfies Lookup, NonUnique.
-type costlyIndex struct{ name string }
-
-func (v *costlyIndex) String() string { return v.name }
-
-func (*costlyIndex) Cost() int { return 10 }
-
-func (*costlyIndex) IsUnique() bool { return false }
-
-func (*costlyIndex) NeedsVCursor() bool { return false }
-
-func (*costlyIndex) Verify(context.Context, vindexes.VCursor, []sqltypes.Value, [][]byte) ([]bool, error) {
- return []bool{}, nil
-}
-
-func (*costlyIndex) Map(ctx context.Context, vcursor vindexes.VCursor, ids []sqltypes.Value) ([]key.Destination, error) {
- return nil, nil
-}
-
-func (*costlyIndex) Create(context.Context, vindexes.VCursor, [][]sqltypes.Value, [][]byte, bool) error {
- return nil
-}
-
-func (*costlyIndex) Delete(context.Context, vindexes.VCursor, [][]sqltypes.Value, []byte) error {
- return nil
-}
-
-func (*costlyIndex) Update(context.Context, vindexes.VCursor, []sqltypes.Value, []byte, []sqltypes.Value) error {
- return nil
-}
-
-func newCostlyIndex(name string, _ map[string]string) (vindexes.Vindex, error) {
- return &costlyIndex{name: name}, nil
-}
-
-var _ vindexes.Vindex = (*costlyIndex)(nil)
-
-var _ vindexes.Lookup = (*costlyIndex)(nil)
-
-// multiColIndex satisfies multi column vindex.
-type multiColIndex struct {
- name string
-}
-
-func newMultiColIndex(name string, _ map[string]string) (vindexes.Vindex, error) {
- return &multiColIndex{name: name}, nil
-}
-
-var _ vindexes.MultiColumn = (*multiColIndex)(nil)
-
-func (m *multiColIndex) String() string { return m.name }
-
-func (m *multiColIndex) Cost() int { return 1 }
-
-func (m *multiColIndex) IsUnique() bool { return true }
-
-func (m *multiColIndex) NeedsVCursor() bool { return false }
-
-func (m *multiColIndex) Map(ctx context.Context, vcursor vindexes.VCursor, rowsColValues [][]sqltypes.Value) ([]key.Destination, error) {
- return nil, nil
-}
-
-func (m *multiColIndex) Verify(ctx context.Context, vcursor vindexes.VCursor, rowsColValues [][]sqltypes.Value, ksids [][]byte) ([]bool, error) {
- return []bool{}, nil
-}
-
-func (m *multiColIndex) PartialVindex() bool {
- return true
-}
-
-func init() {
- vindexes.Register("hash_test", newHashIndex)
- vindexes.Register("lookup_test", newLookupIndex)
- vindexes.Register("name_lkp_test", newNameLkpIndex)
- vindexes.Register("costly", newCostlyIndex)
- vindexes.Register("multiCol_test", newMultiColIndex)
-}
-
 func makeTestOutput(t *testing.T) string {
  testOutputTempDir := utils.MakeTestOutput(t, "testdata", "plan_test")