Fixing atlas.sum & other issues after merge conflicts.

chroma-core · Jan 22, 2025 · b1b4eeb · b1b4eeb
1 parent 3ceb2b0
commit b1b4eeb
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 11 deletions.
diff --git a/go/pkg/sysdb/coordinator/coordinator.go b/go/pkg/sysdb/coordinator/coordinator.go
@@ -231,15 +231,10 @@ func (s *Coordinator) FlushCollectionCompaction(ctx context.Context, flushCollec
 	return s.catalog.FlushCollectionCompaction(ctx, flushCollectionCompaction)
 }
 
-<<<<<<< HEAD
-<<<<<<< HEAD
 func (s *Coordinator) ListCollectionsToGc(ctx context.Context) ([]*model.CollectionToGc, error) {
 	return s.catalog.ListCollectionsToGc(ctx)
-=======
-func (s *Coordinator) ListCollectionVersions(ctx context.Context, collectionID types.UniqueID, tenantID string, maxCount *int64, versionsBefore *time.Time, versionsAtOrAfter *time.Time) ([]*coordinatorpb.CollectionVersionInfo, error) {
-=======
+}
+
 func (s *Coordinator) ListCollectionVersions(ctx context.Context, collectionID types.UniqueID, tenantID string, maxCount *int64, versionsBefore int64, versionsAtOrAfter int64) ([]*coordinatorpb.CollectionVersionInfo, error) {
->>>>>>> b2e9d2884 (Add more tests, and logic for create collection.)
 	return s.catalog.ListCollectionVersions(ctx, collectionID, tenantID, maxCount, versionsBefore, versionsAtOrAfter)
->>>>>>> a1075ad11 ([ENH] Create VersionFiles in S3 from Sysdb.)
 }
diff --git a/go/pkg/sysdb/coordinator/coordinator_test.go b/go/pkg/sysdb/coordinator/coordinator_test.go
@@ -41,7 +41,7 @@ type APIsTestSuite struct {
 
 func (suite *APIsTestSuite) SetupSuite() {
 	log.Info("setup suite")
-	suite.db = dbcore.ConfigDatabaseForTesting()
+	suite.db, suite.read_db = dbcore.ConfigDatabaseForTesting()
 
 	ctx := context.Background()
 	// Add timeout context

diff --git a/go/pkg/sysdb/coordinator/table_catalog_test.go b/go/pkg/sysdb/coordinator/table_catalog_test.go
@@ -142,7 +142,7 @@ func TestCatalog_GetCollections(t *testing.T) {
 
 func TestCatalog_GetCollectionSize(t *testing.T) {
 	mockMetaDomain := &mocks.IMetaDomain{}
-	catalog := NewTableCatalog(nil, mockMetaDomain)
+	catalog := NewTableCatalog(nil, mockMetaDomain, nil, false)
 	collectionID := types.MustParse("00000000-0000-0000-0000-000000000001")
 	mockMetaDomain.On("CollectionDb", context.Background()).Return(&mocks.ICollectionDb{})
 	var total_records_post_compaction uint64 = uint64(100)

diff --git a/go/pkg/sysdb/metastore/db/dbmodel/collection.go b/go/pkg/sysdb/metastore/db/dbmodel/collection.go
@@ -48,7 +48,7 @@ type ICollectionDb interface {
 	Update(in *Collection) error
 	DeleteAll() error
 	UpdateLogPositionVersionAndTotalRecords(collectionID string, logPosition int64, currentCollectionVersion int32, totalRecordsPostCompaction uint64) (int32, error)
-	UpdateLogPositionAndVersionInfo(collectionID string, logPosition int64, currentCollectionVersion int32, currentVersionFileName string, newCollectionVersion int32, newVersionFileName string) (int32, error)
+	UpdateLogPositionAndVersionInfo(collectionID string, logPosition int64, currentCollectionVersion int32, currentVersionFileName string, newCollectionVersion int32, newVersionFileName string) (int64, error)
 	GetCollectionEntry(collectionID *string, databaseName *string) (*Collection, error)
 	GetCollectionSize(collectionID string) (uint64, error)
 	ListCollectionsToGc() ([]*CollectionToGc, error)

diff --git a/go/pkg/sysdb/metastore/db/migrations/atlas.sum b/go/pkg/sysdb/metastore/db/migrations/atlas.sum
@@ -1,4 +1,4 @@
-h1:tHeZoWb7PdWh9oOHH9g4j69+xbuHhzdNXwzWKQltxEk=
+h1:B5EpHGrFsu8biESz9C3eo9GdQZYfrzJ5N4B/pugfVio=
 20240313233558.sql h1:Gv0TiSYsqGoOZ2T2IWvX4BOasauxool8PrBOIjmmIdg=
 20240321194713.sql h1:kVkNpqSFhrXGVGFFvL7JdK3Bw31twFcEhI6A0oCFCkg=
 20240327075032.sql h1:nlr2J74XRU8erzHnKJgMr/tKqJxw9+R6RiiEBuvuzgo=
@@ -9,3 +9,4 @@ h1:tHeZoWb7PdWh9oOHH9g4j69+xbuHhzdNXwzWKQltxEk=
 20241003212820.sql h1:zHloxrMr7EMcqV008a3aqQdU5fHjWY3m66CIoThexbo=
 20241016181945.sql h1:O8UmR8rvD1LyKIld5OO9c0j+xSXW51MHL//gYUTQ2jo=
 20250109224431.sql h1:RjJ2Q3jAWj48T2vmEo7X9rI9cKFC6zIcBUTq4RaE14A=
+20250115204645.sql h1:Wc/JBG18UxkoFpxHWO6hADnOeggii95ysCqN1knHtiA=