wip

FerretDB · noisersup · Nov 13, 2023 · Nov 3, 2023 · Nov 3, 2023 · Nov 6, 2023
commit 0f8479fe04afb040f14da4f80020aebdcbc10310
@@ -1072,20 +1072,20 @@ func TestQueryTailableCursors(t *testing.T) {
 	_, err := collection.InsertOne(ctx, bson.D{{"v", int32(42)}})
 	require.NoError(t, err)
 
-	expectedErr := mongo.CommandError{
-		Code:    238,
-		Message: "find: support for field \"tailable\" with non-default value true is not implemented yet",
-		Name:    "NotImplemented",
-	}
+	//expectedErr := mongo.CommandError{
+	//	Code:    238,
+	//	Message: "find: support for field \"tailable\" with non-default value true is not implemented yet",
+	//	Name:    "NotImplemented",
+	//}
 
-	if setup.IsMongoDB(t) {
-		expectedErr = mongo.CommandError{
-			Code: 2,
-			Message: "error processing query: ns=TestQueryTailableCursors.TestQueryTailableCursorsTree:" +
-				"  $eq null\nSort: {}\nProj: {}\n tailable cursor requested on non capped collection",
-			Name: "BadValue",
-		}
+	//if setup.IsMongoDB(t) {
+	expectedErr := mongo.CommandError{
+		Code: 2,
+		Message: "error processing query: ns=TestQueryTailableCursors.TestQueryTailableCursorsTree:" +
+			"  $eq null\nSort: {}\nProj: {}\n tailable cursor requested on non capped collection",
+		Name: "BadValue",
 	}
+	//}
 
 	_, err = collection.Find(ctx, bson.D{{}}, options.Find().SetCursorType(options.Tailable))
 	AssertEqualCommandError(t, expectedErr, err)

diff --git a/internal/backends/collection.go b/internal/backends/collection.go
@@ -48,6 +48,7 @@ type Collection interface {
 
 	Stats(context.Context, *CollectionStatsParams) (*CollectionStatsResult, error)
 	Compact(context.Context, *CompactParams) (*CompactResult, error)
+	Capped(context.Context) (bool, error)
 
 	ListIndexes(context.Context, *ListIndexesParams) (*ListIndexesResult, error)
 	CreateIndexes(context.Context, *CreateIndexesParams) (*CreateIndexesResult, error)
@@ -288,6 +289,18 @@ func (cc *collectionContract) Compact(ctx context.Context, params *CompactParams
 	return res, err
 }
 
+// Capped returns true if collection is capped.
+//
+// The errors for non-existing database and non-existing collection are the same.
+func (cc *collectionContract) Capped(ctx context.Context) (bool, error) {
+	defer observability.FuncCall(ctx)()
+
+	res, err := cc.c.Capped(ctx)
+	checkError(err, ErrorCodeCollectionDoesNotExist)
+
+	return res, err
+}
+
 // ListIndexesParams represents the parameters of Collection.ListIndexes method.
 type ListIndexesParams struct{}
 

diff --git a/internal/backends/postgresql/collection.go b/internal/backends/postgresql/collection.go
@@ -464,6 +464,35 @@ func (c *collection) Compact(ctx context.Context, params *backends.CompactParams
 	return new(backends.CompactResult), nil
 }
 
+// Capped implements backends.Collection interface.
+func (c *collection) Capped(ctx context.Context) (bool, error) {
+	db, err := c.r.DatabaseGetExisting(ctx, c.dbName)
+	if err != nil {
+		return false, lazyerrors.Error(err)
+	}
+
+	if db == nil {
+		return false, backends.NewError(
+			backends.ErrorCodeCollectionDoesNotExist,
+			lazyerrors.Errorf("no ns %s.%s", c.dbName, c.name),
+		)
+	}
+
+	coll, err := c.r.CollectionGet(ctx, c.dbName, c.name)
+	if err != nil {
+		return false, lazyerrors.Error(err)
+	}
+
+	if coll == nil {
+		return false, backends.NewError(
+			backends.ErrorCodeCollectionDoesNotExist,
+			lazyerrors.Errorf("no ns %s.%s", c.dbName, c.name),
+		)
+	}
+
+	return coll.Capped(), nil
+}
+
 // ListIndexes implements backends.Collection interface.
 func (c *collection) ListIndexes(ctx context.Context, params *backends.ListIndexesParams) (*backends.ListIndexesResult, error) {
 	db, err := c.r.DatabaseGetExisting(ctx, c.dbName)

@@ -39,6 +39,7 @@ type FindParams struct {
 	SingleBatch bool            `ferretdb:"singleBatch,opt"`
 	Comment     string          `ferretdb:"comment,opt"`
 	MaxTimeMS   int64           `ferretdb:"maxTimeMS,opt,wholePositiveNumber"`
+	Tailable    bool            `ferretdb:"tailable,opt"`
 
 	Collation *types.Document `ferretdb:"collation,unimplemented"`
 	Let       *types.Document `ferretdb:"let,unimplemented"`
@@ -52,7 +53,6 @@ type FindParams struct {
 
 	ReturnKey           bool `ferretdb:"returnKey,unimplemented-non-default"`
 	ShowRecordId        bool `ferretdb:"showRecordId,unimplemented-non-default"` //nolint:lll // TODO https://github.com/FerretDB/FerretDB/issues/3467
-	Tailable            bool `ferretdb:"tailable,unimplemented-non-default"`
 	OplogReplay         bool `ferretdb:"oplogReplay,unimplemented-non-default"`
 	NoCursorTimeout     bool `ferretdb:"noCursorTimeout,unimplemented-non-default"`
 	AwaitData           bool `ferretdb:"awaitData,unimplemented-non-default"`