Make index check if doc is indexable

sourcenetwork · May 17, 2023 · 6e13d5a · 6e13d5a
1 parent 3f99bca
commit 6e13d5a
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 12 deletions.
diff --git a/db/collection.go b/db/collection.go
@@ -793,13 +793,7 @@ func (c *collection) indexNewDoc(ctx context.Context, txn datastore.Txn, doc *cl
 		return err
 	}
 	for _, index := range indexes {
-		indexedFieldName := index.Description().Fields[0].Name
-		fieldVal, err := doc.Get(indexedFieldName)
-		if err != nil {
-			return nil
-		}
-		docDataStoreKey := c.getDSKeyFromDockey(doc.Key())
-		err = index.Save(ctx, txn, docDataStoreKey, fieldVal)
+		err = index.Save(ctx, txn, doc)
 		if err != nil {
 			return err
 		}

diff --git a/db/index.go b/db/index.go
@@ -18,7 +18,7 @@ import (
 )
 
 type CollectionIndex interface {
-	Save(context.Context, datastore.Txn, core.DataStoreKey, any) error
+	Save(context.Context, datastore.Txn, *client.Document) error
 	Name() string
 	Description() client.IndexDescription
 }
@@ -97,17 +97,22 @@ var _ CollectionIndex = (*collectionSimpleIndex)(nil)
 func (i *collectionSimpleIndex) Save(
 	ctx context.Context,
 	txn datastore.Txn,
-	key core.DataStoreKey,
-	val any,
+	doc *client.Document,
 ) error {
-	data, err := i.convertFunc(val)
+	indexedFieldName := i.desc.Fields[0].Name
+	fieldVal, err := doc.Get(indexedFieldName)
+	if err != nil {
+		return nil
+	}
+
+	data, err := i.convertFunc(fieldVal)
 	if err != nil {
 		return NewErrCanNotIndexInvalidFieldValue(err)
 	}
 	indexDataStoreKey := core.IndexDataStoreKey{}
 	indexDataStoreKey.CollectionID = strconv.Itoa(int(i.collection.ID()))
 	indexDataStoreKey.IndexID = strconv.Itoa(int(i.desc.ID))
-	indexDataStoreKey.FieldValues = []string{string(data), key.DocKey}
+	indexDataStoreKey.FieldValues = []string{string(data), doc.Key().String()}
 	keyStr := indexDataStoreKey.ToDS()
 	err = txn.Datastore().Put(ctx, keyStr, []byte{})
 	if err != nil {

diff --git a/db/indexed_docs_test.go b/db/indexed_docs_test.go
@@ -359,8 +359,10 @@ func TestNonUnique_StoringIndexedFieldValueOfDifferentTypes(t *testing.T) {
 	testCase := []struct {
 		Name       string
 		FieldKind  client.FieldKind
+		// FieldVal is the value the index will receive for serialization
 		FieldVal   any
 		ShouldFail bool
+		// Stored is the value that is stored as part of the index value key
 		Stored     string
 	}{
 		{Name: "invalid int", FieldKind: client.FieldKind_INT, FieldVal: "invalid", ShouldFail: true},