WIP - Namespace headstore docs

Will soon be adding collections to the headstore, and we dont want the keys to intermingle
AndrewSisley · Nov 5, 2024 · 4dfeab2 · 4dfeab2
1 parent 6496449
commit 4dfeab2
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 13 deletions.
diff --git a/internal/keys/headstore.go b/internal/keys/headstore.go
@@ -0,0 +1,15 @@
+// Copyright 2024 Democratized Data Foundation
+//
+// Use of this software is governed by the Business Source License
+// included in the file licenses/BSL.txt.
+//
+// As of the Change Date specified in that file, in accordance with
+// the Business Source License, use of this software will be governed
+// by the Apache License, Version 2.0, included in the file
+// licenses/APL.txt.
+
+package keys
+
+const (
+	HEADSTORE_DOC = "/d"
+)
diff --git a/internal/keys/headstore_doc.go b/internal/keys/headstore_doc.go
@@ -34,19 +34,19 @@ var _ Walkable = (*HeadStoreKey)(nil)
 // Any properties before the above are ignored
 func NewHeadStoreKey(key string) (HeadStoreKey, error) {
 	elements := strings.Split(key, "/")
-	if len(elements) != 4 {
+	if len(elements) != 5 {
 		return HeadStoreKey{}, ErrInvalidKey
 	}
 
-	cid, err := cid.Decode(elements[3])
+	cid, err := cid.Decode(elements[4])
 	if err != nil {
 		return HeadStoreKey{}, err
 	}
 
 	return HeadStoreKey{
 		// elements[0] is empty (key has leading '/')
-		DocID:   elements[1],
-		FieldID: elements[2],
+		DocID:   elements[2],
+		FieldID: elements[3],
 		Cid:     cid,
 	}, nil
 }
@@ -70,7 +70,7 @@ func (k HeadStoreKey) WithFieldID(fieldID string) HeadStoreKey {
 }
 
 func (k HeadStoreKey) ToString() string {
-	var result string
+	result := HEADSTORE_DOC
 
 	if k.DocID != "" {
 		result = result + "/" + k.DocID

diff --git a/tests/integration/explain/default/dagscan_test.go b/tests/integration/explain/default/dagscan_test.go
@@ -60,8 +60,8 @@ func TestDefaultExplainCommitsDagScanQueryOp(t *testing.T) {
 							"fieldId": "1",
 							"spans": []dataMap{
 								{
-									"start": "/bae-7aabc9d2-fbbc-5911-b0d0-b49a2a1d0e84/1",
-									"end":   "/bae-7aabc9d2-fbbc-5911-b0d0-b49a2a1d0e84/2",
+									"start": "/d/bae-7aabc9d2-fbbc-5911-b0d0-b49a2a1d0e84/1",
+									"end":   "/d/bae-7aabc9d2-fbbc-5911-b0d0-b49a2a1d0e84/2",
 								},
 							},
 						},
@@ -103,8 +103,8 @@ func TestDefaultExplainCommitsDagScanQueryOpWithoutField(t *testing.T) {
 							"fieldId": nil,
 							"spans": []dataMap{
 								{
-									"start": "/bae-7aabc9d2-fbbc-5911-b0d0-b49a2a1d0e84",
-									"end":   "/bae-7aabc9d2-fbbc-5911-b0d0-b49a2a1d0e85",
+									"start": "/d/bae-7aabc9d2-fbbc-5911-b0d0-b49a2a1d0e84",
+									"end":   "/d/bae-7aabc9d2-fbbc-5911-b0d0-b49a2a1d0e85",
 								},
 							},
 						},
@@ -147,8 +147,8 @@ func TestDefaultExplainLatestCommitsDagScanQueryOp(t *testing.T) {
 							"fieldId": "1",
 							"spans": []dataMap{
 								{
-									"start": "/bae-7aabc9d2-fbbc-5911-b0d0-b49a2a1d0e84/1",
-									"end":   "/bae-7aabc9d2-fbbc-5911-b0d0-b49a2a1d0e84/2",
+									"start": "/d/bae-7aabc9d2-fbbc-5911-b0d0-b49a2a1d0e84/1",
+									"end":   "/d/bae-7aabc9d2-fbbc-5911-b0d0-b49a2a1d0e84/2",
 								},
 							},
 						},
@@ -191,8 +191,8 @@ func TestDefaultExplainLatestCommitsDagScanQueryOpWithoutField(t *testing.T) {
 							"fieldId": "C",
 							"spans": []dataMap{
 								{
-									"start": "/bae-7aabc9d2-fbbc-5911-b0d0-b49a2a1d0e84/C",
-									"end":   "/bae-7aabc9d2-fbbc-5911-b0d0-b49a2a1d0e84/D",
+									"start": "/d/bae-7aabc9d2-fbbc-5911-b0d0-b49a2a1d0e84/C",
+									"end":   "/d/bae-7aabc9d2-fbbc-5911-b0d0-b49a2a1d0e84/D",
 								},
 							},
 						},