vecindex: delete Manager.GetWithDesc() method

This method was added because backfilling indexes are not considered
deletable. In retrospect, there's no reason why we need to restrict an
internal interface this way and deleting it removes a fair bit of
complexity from upcoming changes to the vector store.

Informs: #146046
Release note: None

Author: mw5h

pkg/sql/backfill/backfill.go

@@ -891,7 +891,7 @@ func (ib *IndexBackfiller) initIndexes(
 			return err
 		}
 
-		vecIndex, err := vecIndexManager.GetWithDesc(ctx, desc, idx)
+		vecIndex, err := vecIndexManager.Get(ctx, desc.GetID(), idx.GetID())
 		if err != nil {
 			return err
 		}

pkg/sql/vecindex/manager.go

@@ -89,14 +89,11 @@ func (m *Manager) Metrics() metric.Struct {
 	return &m.metrics
 }
 
-// getImpl returns the vector index for the given DB table and index. If the DB
+// Get returns the vector index for the given DB table and index. If the DB
 // index does not currently have an active vector index, one is created and
 // cached.
-func (m *Manager) getImpl(
-	ctx context.Context,
-	tableID catid.DescID,
-	indexID catid.IndexID,
-	makeIndex func() (*cspann.Index, error),
+func (m *Manager) Get(
+	ctx context.Context, tableID catid.DescID, indexID catid.IndexID,
 ) (*cspann.Index, error) {
 	m.mu.Lock()
 	defer m.mu.Unlock()
@@ -133,8 +130,24 @@ func (m *Manager) getImpl(
 		if m.testingKnobs != nil && m.testingKnobs.DuringVecIndexPull != nil {
 			m.testingKnobs.DuringVecIndexPull()
 		}
-
-		idx, err := makeIndex()
+		config, err := m.getVecConfig(ctx, tableID, indexID)
+		if err != nil {
+			return nil, err
+		}
+		// TODO(drewk): use the config to populate the index options as well.
+		quantizer := quantize.NewRaBitQuantizer(int(config.Dims), config.Seed, config.DistanceMetric)
+		store, err := vecstore.New(ctx, m.db, quantizer, m.codec, tableID, indexID)
+		if err != nil {
+			return nil, err
+		}
+		// Use the stored context so that the vector index can outlive the context
+		// of the Get call. The fixup process gets a child context from the context
+		// passed to cspann.NewIndex, and we don't want that to be the context of
+		// the Get call.
+		idx, err := cspann.NewIndex(
+			m.ctx, store, quantizer, config.Seed,
+			m.getIndexOptions(&config, store.ReadOnly()), m.stopper,
+		)
 		if err != nil {
 			return nil, err
 		}
@@ -158,68 +171,6 @@ func (m *Manager) getImpl(
 	return idx, err
 }
 
-// GetWithDesc returns a cached cspann vector index for a given table and index
-// using the provided table descriptor and index.
-func (m *Manager) GetWithDesc(
-	ctx context.Context, desc catalog.TableDescriptor, index catalog.Index,
-) (*cspann.Index, error) {
-	return m.getImpl(
-		ctx,
-		desc.GetID(),
-		index.GetID(),
-		func() (*cspann.Index, error) {
-			// TODO(drewk): use the config to populate the index options as well.
-			config := index.GetVecConfig()
-			quantizer := quantize.NewRaBitQuantizer(
-				int(config.Dims), config.Seed, config.DistanceMetric)
-			store, err := vecstore.NewWithColumnID(
-				ctx, m.db, quantizer, m.codec, desc, index.GetID(), index.VectorColumnID(),
-			)
-			if err != nil {
-				return nil, err
-			}
-
-			return cspann.NewIndex(
-				m.ctx, store, quantizer, config.Seed,
-				m.getIndexOptions(&config, store.ReadOnly()), m.stopper,
-			)
-		},
-	)
-}
-
-// Get returns a cached cspann vector index for a given table and index using the
-// descriptor IDs for both.
-func (m *Manager) Get(
-	ctx context.Context, tableID catid.DescID, indexID catid.IndexID,
-) (*cspann.Index, error) {
-	return m.getImpl(
-		ctx,
-		tableID,
-		indexID,
-		func() (*cspann.Index, error) {
-			config, err := m.getVecConfig(ctx, tableID, indexID)
-			if err != nil {
-				return nil, err
-			}
-			// TODO(drewk): use the config to populate the index options as well.
-			quantizer := quantize.NewRaBitQuantizer(
-				int(config.Dims), config.Seed, config.DistanceMetric)
-			store, err := vecstore.New(ctx, m.db, quantizer, m.codec, tableID, indexID)
-			if err != nil {
-				return nil, err
-			}
-			// Use the stored context so that the vector index can outlive the context
-			// of the Get call. The fixup process gets a child context from the context
-			// passed to cspann.NewIndex, and we don't want that to be the context of
-			// the Get call.
-			return cspann.NewIndex(
-				m.ctx, store, quantizer, config.Seed,
-				m.getIndexOptions(&config, store.ReadOnly()), m.stopper,
-			)
-		},
-	)
-}
-
 func (m *Manager) getIndexOptions(config *vecpb.Config, readOnly bool) *cspann.IndexOptions {
 	return &cspann.IndexOptions{
 		RotAlgorithm:     config.RotAlgorithm,
@@ -256,7 +207,7 @@ func (m *Manager) getVecConfig(
 		return vecpb.Config{}, errTableNotFound
 	}
 	var idxDesc catalog.Index
-	for _, desc := range tableDesc.DeletableNonPrimaryIndexes() {
+	for _, desc := range tableDesc.NonPrimaryIndexes() {
 		if desc.GetID() == indexID {
 			idxDesc = desc
 			break

pkg/sql/vecindex/manager_test.go

@@ -188,29 +188,6 @@ func TestVectorManager(t *testing.T) {
 		require.Error(t, err)
 	})
 
-	t.Run("test GetWithDesc functionality", func(t *testing.T) {
-		var tableDesc catalog.TableDescriptor
-		err := internalDB.DescsTxn(ctx, func(ctx context.Context, txn descs.Txn) error {
-			var err error
-			tableDesc, err = txn.Descriptors().ByIDWithLeased(txn.KV()).Get().Table(ctx, 141)
-			return err
-		})
-		require.NoError(t, err)
-		var idxDesc catalog.Index
-		for _, desc := range tableDesc.DeletableNonPrimaryIndexes() {
-			if desc.GetID() == 2 {
-				idxDesc = desc
-				break
-			}
-		}
-		// Pull an index using descriptors.
-		_, err = vectorMgr.GetWithDesc(ctx, tableDesc, idxDesc)
-		require.NoError(t, err)
-		// Pull the index again.
-		_, err = vectorMgr.GetWithDesc(ctx, tableDesc, idxDesc)
-		require.NoError(t, err)
-	})
-
 	t.Run("test multiple threaded functionality", func(t *testing.T) {
 		pullDelayer := sync.WaitGroup{}
 		pullDelayer.Add(10)

pkg/sql/vecindex/vecstore/store.go

@@ -125,7 +125,7 @@ func New(
 	}
 
 	var index catalog.Index
-	for _, desc := range tableDesc.DeletableNonPrimaryIndexes() {
+	for _, desc := range tableDesc.NonPrimaryIndexes() {
 		if desc.GetID() == indexID {
 			index = desc
 			break