Create document with actual docID not user provided value

This is a bug I accidentally fixed (originally in another commit), we should probably have more tests that cover this, but I'm not interested in adding them in this PR.
AndrewSisley · Nov 20, 2024 · 2747b2d · 2747b2d
1 parent 32dcb73
commit 2747b2d
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 10 deletions.
diff --git a/internal/db/fetcher/versioned.go b/internal/db/fetcher/versioned.go
@@ -88,8 +88,6 @@ type VersionedFetcher struct {
 	root  datastore.Rootstore
 	store datastore.Txn
 
-	dsKey keys.DataStoreKey
-
 	queuedCids *list.List
 
 	acp immutable.Option[acp.ACP]
@@ -157,10 +155,6 @@ func (vf *VersionedFetcher) Start(ctx context.Context, spans ...core.Span) error
 	prefix := spans[0].Start.(keys.HeadstoreDocKey)
 
 	vf.ctx = ctx
-	vf.dsKey = keys.DataStoreKey{
-		CollectionRootID: vf.col.Description().RootID,
-		DocID:            prefix.DocID,
-	}
 
 	if err := vf.seekTo(prefix.Cid); err != nil {
 		return NewErrFailedToSeek(prefix.Cid, err)
@@ -329,7 +323,11 @@ func (vf *VersionedFetcher) merge(c cid.Cid) error {
 		mcrdt = merklecrdt.NewMerkleCompositeDAG(
 			vf.store,
 			keys.NewCollectionSchemaVersionKey(block.Delta.GetSchemaVersionID(), vf.col.Description().RootID),
-			vf.dsKey.WithFieldID(core.COMPOSITE_NAMESPACE),
+			keys.DataStoreKey{
+				CollectionRootID: vf.col.Description().RootID,
+				DocID:            string(block.Delta.GetDocID()),
+				FieldID:          fmt.Sprint(core.COMPOSITE_NAMESPACE),
+			},
 		)
 		vf.mCRDTs[0] = mcrdt
 	}
@@ -358,7 +356,11 @@ func (vf *VersionedFetcher) merge(c cid.Cid) error {
 				keys.NewCollectionSchemaVersionKey(block.Delta.GetSchemaVersionID(), vf.col.Description().RootID),
 				field.Typ,
 				field.Kind,
-				vf.dsKey.WithFieldID(fmt.Sprint(field.ID)),
+				keys.DataStoreKey{
+					CollectionRootID: vf.col.Description().RootID,
+					DocID:            string(block.Delta.GetDocID()),
+					FieldID:          fmt.Sprint(field.ID),
+				},
 				field.Name,
 			)
 			if err != nil {

diff --git a/tests/integration/query/simple/with_cid_doc_id_test.go b/tests/integration/query/simple/with_cid_doc_id_test.go
@@ -335,7 +335,7 @@ func TestCidAndDocIDQuery_ContainsPNCounterWithIntKind_NoError(t *testing.T) {
 				Request: `query {
 					Users (
 						cid: "bafyreihsqayh6zvmjrvmma3sjmrb4bkeiyy6l56nt6y2t2tm4xajkif3gu",
-						docID: "bae-d8cb53d4-ac5a-5c55-8306-64df633d400d"
+						docID: "bae-bc5464e4-26a6-5307-b516-aada0abeb089"
 					) {
 						name
 						points
@@ -389,7 +389,7 @@ func TestCidAndDocIDQuery_ContainsPNCounterWithFloatKind_NoError(t *testing.T) {
 				Request: `query {
 					Users (
 						cid: "bafyreigkdjnvkpqfjoqoke3aqc3b6ibb45xjuxx5djpk7c6tart2lw3dcm",
-						docID: "bae-d420ebcd-023a-5800-ae2e-8ea89442318e"
+						docID: "bae-2c7c40a7-92c1-5ed4-8a00-9e8595514945"
 					) {
 						name
 						points