Skip to content

Commit

Permalink
WIP - Add support for col-level tt queries
Browse files Browse the repository at this point in the history
  • Loading branch information
AndrewSisley committed Nov 19, 2024
1 parent 7bb1873 commit 0d021ad
Show file tree
Hide file tree
Showing 2 changed files with 65 additions and 0 deletions.
6 changes: 6 additions & 0 deletions internal/db/fetcher/versioned.go
Original file line number Diff line number Diff line change
Expand Up @@ -326,6 +326,12 @@ func (vf *VersionedFetcher) merge(c cid.Cid) error {

var mcrdt merklecrdt.MerkleCRDT
switch {
case block.Delta.IsCollection():
mcrdt = merklecrdt.NewMerkleCollection(
vf.store,
keys.CollectionSchemaVersionKey{},
keys.NewHeadstoreColKey(vf.col.Description().RootID),
)
case block.Delta.IsComposite():
mcrdt = merklecrdt.NewMerkleCompositeDAG(
vf.store,
Expand Down
59 changes: 59 additions & 0 deletions tests/integration/query/simple/with_cid_branchable_test.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
// 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 simple

import (
"testing"

testUtils "github.com/sourcenetwork/defradb/tests/integration"
)

func TestQuerySimpleWithCidOfBranchableCollection_FirstCid(t *testing.T) {
test := testUtils.TestCase{
Actions: []any{
testUtils.SchemaUpdate{
Schema: `
type Users @branchable {
name: String
}
`,
},
testUtils.CreateDoc{
Doc: `{
"name": "Fred"
}`,
},
testUtils.CreateDoc{
Doc: `{
"name": "John"
}`,
},
testUtils.Request{ // bafyreiewwsnu2ld5qlntamdm77ayb7xtmxz3p5difvaaakaome7zbtpo4u
Request: `query {
Users (
cid: "bafyreiewwsnu2ld5qlntamdm77ayb7xtmxz3p5difvaaakaome7zbtpo4u"
) {
name
}
}`,
Results: map[string]any{
"Users": []map[string]any{
{
"name": "Fred",
},
},
},
},
},
}

testUtils.ExecuteTestCase(t, test)
}

0 comments on commit 0d021ad

Please sign in to comment.