Skip to content

Commit 42437c0

Browse files
Sicheng PanSicheng-Pan
authored andcommitted
Fix tests
1 parent a485e01 commit 42437c0

File tree

2 files changed

+13
-7
lines changed

2 files changed

+13
-7
lines changed

go/pkg/log/store/queries/queries.sql

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,9 @@ FROM record_log r
4646
WHERE r.collection_id = $1;
4747

4848
-- name: GetBoundsForCollection :one
49-
SELECT record_compaction_offset_position, record_enumeration_offset_position
49+
SELECT
50+
COALESCE(record_compaction_offset_position, 0) AS record_compaction_offset_position,
51+
COALESCE(record_enumeration_offset_position, 0) AS record_enumeration_offset_position
5052
FROM collection
5153
WHERE id = $1;
5254

go/pkg/sysdb/coordinator/coordinator_test.go

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1435,9 +1435,11 @@ func (suite *APIsTestSuite) TestForkCollection() {
14351435

14361436
// Fork source collection
14371437
forkCollection := &model.ForkCollection{
1438-
SourceCollectionID: sourceCreateCollection.ID,
1439-
TargetCollectionID: types.NewUniqueID(),
1440-
TargetCollectionName: "test_fork_collection_fork_1",
1438+
SourceCollectionID: sourceCreateCollection.ID,
1439+
SourceCollectionLogCompactionOffset: 800,
1440+
SourceCollectionLogEnumerationOffset: 1200,
1441+
TargetCollectionID: types.NewUniqueID(),
1442+
TargetCollectionName: "test_fork_collection_fork_1",
14411443
}
14421444

14431445
collection, collection_segments, err := suite.coordinator.ForkCollection(ctx, forkCollection)
@@ -1467,9 +1469,11 @@ func (suite *APIsTestSuite) TestForkCollection() {
14671469

14681470
// Attempt to fork a collcetion with same name (should fail)
14691471
forkCollectionWithSameName := &model.ForkCollection{
1470-
SourceCollectionID: sourceCreateCollection.ID,
1471-
TargetCollectionID: types.NewUniqueID(),
1472-
TargetCollectionName: "test_fork_collection_source",
1472+
SourceCollectionID: sourceCreateCollection.ID,
1473+
SourceCollectionLogCompactionOffset: 800,
1474+
SourceCollectionLogEnumerationOffset: 1200,
1475+
TargetCollectionID: types.NewUniqueID(),
1476+
TargetCollectionName: "test_fork_collection_source",
14731477
}
14741478
_, _, err = suite.coordinator.ForkCollection(ctx, forkCollectionWithSameName)
14751479
suite.Error(err)

0 commit comments

Comments
 (0)