wip

FerretDB · AlekSi · Oct 24, 2023 · Oct 19, 2023 · Oct 19, 2023 · Oct 19, 2023
commit 799d0493df5cc656caf802a81ac0dde045da6e5a
@@ -103,7 +103,14 @@ func (c *collection) Query(ctx context.Context, params *backends.QueryParams) (*
 
 // InsertAll implements backends.Collection interface.
 func (c *collection) InsertAll(ctx context.Context, params *backends.InsertAllParams) (*backends.InsertAllResult, error) {
-	if _, err := c.r.CollectionCreate(ctx, c.dbName, c.name, nil); err != nil {
+	mparams := metadata.CollectionCreateParams{
+		DBName:          c.dbName,
+		Name:            c.name,
+		CappedSize:      0,
+		CappedDocuments: 0,
+	}
+
+	if _, err := c.r.CollectionCreate(ctx, &mparams); err != nil {
 		return nil, lazyerrors.Error(err)
 	}
 

@@ -53,12 +53,9 @@ func (db *database) ListCollections(ctx context.Context, params *backends.ListCo
 	res := make([]backends.CollectionInfo, len(list))
 	for i, c := range list {
 		res[i] = backends.CollectionInfo{
-			Name: c.Name,
-		}
-
-		if c.Settings.Capped != nil {
-			res[i].CappedSize = c.Settings.Capped.Size
-			res[i].CappedDocuments = c.Settings.Capped.Docs
+			Name:            c.Name,
+			CappedSize:      c.Settings.CappedSize,
+			CappedDocuments: c.Settings.CappedDocuments,
 		}
 	}
 
@@ -69,16 +66,14 @@ func (db *database) ListCollections(ctx context.Context, params *backends.ListCo
 
 // CreateCollection implements backends.Database interface.
 func (db *database) CreateCollection(ctx context.Context, params *backends.CreateCollectionParams) error {
-	var capped *metadata.Capped
-
-	if params.CappedSize != 0 {
-		capped = &metadata.Capped{
-			Size: params.CappedSize,
-			Docs: params.CappedDocuments,
-		}
+	mparams := metadata.CollectionCreateParams{
+		DBName:          db.name,
+		Name:            params.Name,
+		CappedSize:      params.CappedSize,
+		CappedDocuments: params.CappedDocuments,
 	}
 
-	created, err := db.r.CollectionCreate(ctx, db.name, params.Name, capped)
+	created, err := db.r.CollectionCreate(ctx, &mparams)
 	if err != nil {
 		return lazyerrors.Error(err)
 	}

@@ -229,10 +229,10 @@ func (r *Registry) CollectionList(ctx context.Context, dbName string) ([]*Collec
 	return res, nil
 }
 
-// CollectionCreteParams contains parameters for CollectionCreate.
-type CollectionCreteParams struct {
+// CollectionCreateParams contains parameters for CollectionCreate.
+type CollectionCreateParams struct {
 	DBName          string
-	CollectionName  string
+	Name            string
 	CappedSize      int64
 	CappedDocuments int64
 }
@@ -242,13 +242,13 @@ type CollectionCreteParams struct {
 //
 // Returned boolean value indicates whether the collection was created.
 // If collection already exists, (false, nil) is returned.
-func (r *Registry) CollectionCreate(ctx context.Context, dbName, collectionName string, capped *Capped) (bool, error) {
+func (r *Registry) CollectionCreate(ctx context.Context, params *CollectionCreateParams) (bool, error) {
 	defer observability.FuncCall(ctx)()
 
 	r.rw.Lock()
 	defer r.rw.Unlock()
 
-	return r.collectionCreate(ctx, dbName, collectionName, capped)
+	return r.collectionCreate(ctx, params)
 }
 
 // collectionCreate creates a collection in the database.
@@ -258,9 +258,11 @@ func (r *Registry) CollectionCreate(ctx context.Context, dbName, collectionName
 // If collection already exists, (false, nil) is returned.
 //
 // It does not hold the lock.
-func (r *Registry) collectionCreate(ctx context.Context, dbName, collectionName string, capped *Capped) (bool, error) {
+func (r *Registry) collectionCreate(ctx context.Context, params *CollectionCreateParams) (bool, error) {
 	defer observability.FuncCall(ctx)()
 
+	dbName, collectionName := params.DBName, params.Name
+
 	db, err := r.databaseGetOrCreate(ctx, dbName)
 	if err != nil {
 		return false, lazyerrors.Error(err)
@@ -294,7 +296,7 @@ func (r *Registry) collectionCreate(ctx context.Context, dbName, collectionName
 
 	q := fmt.Sprintf("CREATE TABLE %q (", tableName)
 
-	if capped != nil {
+	if params.CappedSize > 0 {
 		q += fmt.Sprintf("%s INTEGER PRIMARY KEY, ", RecordIDColumn)
 	}
 
@@ -316,10 +318,12 @@ func (r *Registry) collectionCreate(ctx context.Context, dbName, collectionName
 	r.colls[dbName][collectionName] = &Collection{
 		Name:      collectionName,
 		TableName: tableName,
+		Settings: Settings{
+			CappedSize:      params.CappedSize,
+			CappedDocuments: params.CappedDocuments,
+		},
 	}
 
-	r.colls[dbName][collectionName].Settings.Capped = capped
-
 	err = r.indexesCreate(ctx, dbName, collectionName, []IndexInfo{{
 		Name:   backends.DefaultIndexName,
 		Key:    []IndexKeyPair{{Field: "_id"}},
@@ -462,7 +466,7 @@ func (r *Registry) IndexesCreate(ctx context.Context, dbName, collectionName str
 func (r *Registry) indexesCreate(ctx context.Context, dbName, collectionName string, indexes []IndexInfo) error {
 	defer observability.FuncCall(ctx)()
 
-	_, err := r.collectionCreate(ctx, dbName, collectionName, nil)
+	_, err := r.collectionCreate(ctx, &CollectionCreateParams{dbName, collectionName, 0, 0})
 	if err != nil {
 		return lazyerrors.Error(err)
 	}

@@ -35,11 +35,11 @@ func testCollection(t *testing.T, ctx context.Context, r *Registry, db *fsql.DB,
 	c := r.CollectionGet(ctx, dbName, collectionName)
 	require.Nil(t, c)
 
-	created, err := r.CollectionCreate(ctx, dbName, collectionName, nil)
+	created, err := r.CollectionCreate(ctx, &CollectionCreateParams{dbName, collectionName, 0, 0})
 	require.NoError(t, err)
 	require.True(t, created)
 
-	created, err = r.CollectionCreate(ctx, dbName, collectionName, nil)
+	created, err = r.CollectionCreate(ctx, &CollectionCreateParams{dbName, collectionName, 0, 0})
 	require.NoError(t, err)
 	require.False(t, created)
 
@@ -190,13 +190,13 @@ func TestCreateSameStress(t *testing.T) {
 				ready <- struct{}{}
 				<-start
 
-				created, err := r.CollectionCreate(ctx, dbName, collectionName, nil)
+				created, err := r.CollectionCreate(ctx, &CollectionCreateParams{dbName, collectionName, 0, 0})
 				require.NoError(t, err)
 				if created {
 					createdTotal.Add(1)
 				}
 
-				created, err = r.CollectionCreate(ctx, dbName, collectionName, nil)
+				created, err = r.CollectionCreate(ctx, &CollectionCreateParams{dbName, collectionName, 0, 0})
 				require.NoError(t, err)
 				require.False(t, created)
 
@@ -255,7 +255,7 @@ func TestDropSameStress(t *testing.T) {
 
 			collectionName := "collection"
 
-			created, err := r.CollectionCreate(ctx, dbName, collectionName, nil)
+			created, err := r.CollectionCreate(ctx, &CollectionCreateParams{dbName, collectionName, 0, 0})
 			require.NoError(t, err)
 			require.True(t, created)
 
@@ -321,7 +321,7 @@ func TestCreateDropSameStress(t *testing.T) {
 				<-start
 
 				if id%2 == 0 {
-					created, err := r.CollectionCreate(ctx, dbName, collectionName, nil)
+					created, err := r.CollectionCreate(ctx, &CollectionCreateParams{dbName, collectionName, 0, 0})
 					require.NoError(t, err)
 					if created {
 						createdTotal.Add(1)

@@ -25,14 +25,9 @@ import (
 
 // Settings represents collection settings.
 type Settings struct {
-	Indexes []IndexInfo `json:"indexes"`
-	Capped  *Capped     `json:"capped,omitempty"` // nil if not capped
-}
-
-// Capped represents capped collection settings.
-type Capped struct {
-	Size int64 `json:"size"`
-	Docs int64 `json:"docs"` // 0 if not set
+	Indexes         []IndexInfo `json:"indexes"`
+	CappedSize      int64       `json:"cappedSize"` // 0 if not capped
+	CappedDocuments int64       `json:"cappedDocs"` // 0 if the limit is not set
 }
 
 // IndexInfo represents information about a single index.
@@ -60,18 +55,11 @@ func (s Settings) deepCopy() Settings {
 		}
 	}
 
-	settings := Settings{
-		Indexes: indexes,
-	}
-
-	if s.Capped != nil {
-		settings.Capped = &Capped{
-			Size: s.Capped.Size,
-			Docs: s.Capped.Docs,
-		}
+	return Settings{
+		Indexes:         indexes,
+		CappedSize:      s.CappedSize,
+		CappedDocuments: s.CappedDocuments,
 	}
-
-	return settings
 }
 
 // Value implements driver.Valuer interface.

@@ -43,7 +43,8 @@ func TestCollectionsStats(t *testing.T) {
 	colls := make([]*metadata.Collection, len(cNames))
 
 	for i, cName := range cNames {
-		_, err = r.CollectionCreate(ctx, dbName, cName, nil)
+		params := &metadata.CollectionCreateParams{DBName: dbName, Name: cName}
+		_, err = r.CollectionCreate(ctx, params)
 		require.NoError(t, err)
 		colls[i] = r.CollectionGet(ctx, dbName, cName)
 	}