adding the first level of changes for ListCollections and ListDatabases

FerretDB · AlekSi · Jan 4, 2024 · Dec 13, 2023 · Dec 13, 2023 · Dec 13, 2023
commit 1a00290e377d3886fd9fd7b76efbe17b3a901b96
@@ -15,9 +15,7 @@
 package backends
 
 import (
-	"cmp"
 	"context"
-	"slices"
 
 	"github.com/prometheus/client_golang/prometheus"
 
@@ -149,17 +147,6 @@ func (bc *backendContract) ListDatabases(ctx context.Context, params *ListDataba
 	res, err := bc.b.ListDatabases(ctx, params)
 	checkError(err)
 
-	if res != nil && len(res.Databases) > 0 {
-		must.BeTrue(slices.IsSortedFunc(res.Databases, func(a, b DatabaseInfo) int {
-			return cmp.Compare(a.Name, b.Name)
-		}))
-
-		if params != nil && params.Name != "" {
-			must.BeTrue(len(res.Databases) == 1)
-			must.BeTrue(res.Databases[0].Name == params.Name)
-		}
-	}
-
 	return res, err
 }
 

@@ -15,9 +15,7 @@
 package backends
 
 import (
-	"cmp"
 	"context"
-	"slices"
 
 	"github.com/FerretDB/FerretDB/internal/util/must"
 	"github.com/FerretDB/FerretDB/internal/util/observability"
@@ -112,17 +110,6 @@ func (dbc *databaseContract) ListCollections(ctx context.Context, params *ListCo
 	res, err := dbc.db.ListCollections(ctx, params)
 	checkError(err)
 
-	if res != nil && len(res.Collections) > 0 {
-		must.BeTrue(slices.IsSortedFunc(res.Collections, func(a, b CollectionInfo) int {
-			return cmp.Compare(a.Name, b.Name)
-		}))
-
-		if params != nil && params.Name != "" {
-			must.BeTrue(len(res.Collections) == 1)
-			must.BeTrue(res.Collections[0].Name == params.Name)
-		}
-	}
-
 	return res, err
 }
 

@@ -15,9 +15,7 @@
 package oplog
 
 import (
-	"cmp"
 	"context"
-	"slices"
 	"time"
 
 	"go.uber.org/zap"
@@ -218,21 +216,19 @@ func (c *collection) DropIndexes(ctx context.Context, params *backends.DropIndex
 func (c *collection) oplogCollection(ctx context.Context) backends.Collection {
 	db := must.NotFail(c.origB.Database(oplogDatabase))
 
-	cList, err := db.ListCollections(ctx, nil)
+	cList, err := db.ListCollections(ctx, &backends.ListCollectionsParams{Name: oplogCollection})
 	if err != nil {
 		c.l.Error("Failed to list collections", zap.Error(err))
 		return nil
 	}
 
-	// TODO https://github.com/FerretDB/FerretDB/issues/3601
-	_, found := slices.BinarySearchFunc(cList.Collections, oplogCollection, func(e backends.CollectionInfo, t string) int {
-		return cmp.Compare(e.Name, t)
-	})
-	if !found {
+	if len(cList.Collections) == 0 {
 		c.l.Debug("Collection not found")
 		return nil
 	}
 
+	// TODO https://github.com/FerretDB/FerretDB/issues/3601
+	// TODO(SP) - Check what to return here
 	return must.NotFail(db.Collection(oplogCollection))
 }
 

@@ -15,7 +15,9 @@
 package postgresql
 
 import (
+	"cmp"
 	"context"
+	"slices"
 
 	"github.com/prometheus/client_golang/prometheus"
 	"go.uber.org/zap"
@@ -126,7 +128,26 @@ func (b *backend) ListDatabases(ctx context.Context, params *backends.ListDataba
 		return nil, err
 	}
 
-	res := &backends.ListDatabasesResult{
+	var res *backends.ListDatabasesResult
+
+	// TODO https://github.com/FerretDB/FerretDB/issues/3601
+	if params != nil && len(params.Name) > 0 {
+		res = &backends.ListDatabasesResult{
+			Databases: make([]backends.DatabaseInfo, 1),
+		}
+		_, found := slices.BinarySearchFunc(list, params.Name, func(dbName, t string) int {
+			return cmp.Compare(dbName, t)
+		})
+
+		if found {
+			res.Databases[0] = backends.DatabaseInfo{
+				Name: params.Name,
+			}
+		}
+		return res, nil
+	}
+
+	res = &backends.ListDatabasesResult{
 		Databases: make([]backends.DatabaseInfo, len(list)),
 	}
 
@@ -135,7 +156,6 @@ func (b *backend) ListDatabases(ctx context.Context, params *backends.ListDataba
 			Name: dbName,
 		}
 	}
-
 	return res, nil
 }
 

@@ -15,7 +15,9 @@
 package sqlite
 
 import (
+	"cmp"
 	"context"
+	"slices"
 
 	"github.com/prometheus/client_golang/prometheus"
 	"go.uber.org/zap"
@@ -102,7 +104,25 @@ func (b *backend) Database(name string) (backends.Database, error) {
 func (b *backend) ListDatabases(ctx context.Context, params *backends.ListDatabasesParams) (*backends.ListDatabasesResult, error) {
 	list := b.r.DatabaseList(ctx)
 
-	res := &backends.ListDatabasesResult{
+	var res *backends.ListDatabasesResult
+
+	// TODO https://github.com/FerretDB/FerretDB/issues/3601
+	if params != nil && len(params.Name) > 0 {
+		res = &backends.ListDatabasesResult{
+			Databases: make([]backends.DatabaseInfo, 1),
+		}
+		_, found := slices.BinarySearchFunc(list, params.Name, func(dbName, t string) int {
+			return cmp.Compare(dbName, t)
+		})
+		if found {
+			res.Databases[0] = backends.DatabaseInfo{
+				Name: params.Name,
+			}
+		}
+		return res, nil
+	}
+
+	res = &backends.ListDatabasesResult{
 		Databases: make([]backends.DatabaseInfo, len(list)),
 	}
 

@@ -286,14 +286,23 @@ func (h *Handler) MsgAggregate(ctx context.Context, msg *wire.OpMsg) (*wire.OpMs
 		}
 
 		var cList *backends.ListCollectionsResult
-
-		if cList, err = db.ListCollections(ctx, nil); err != nil {
+		// TODO https://github.com/FerretDB/FerretDB/issues/3601
+		collectionParam := backends.ListCollectionsParams{Name: cName}
+		if cList, err = db.ListCollections(ctx, &collectionParam); err != nil {
 			return nil, err
 		}
 
+		if len(cList.Collections) == 0 {
+			return nil, handlererrors.NewCommandErrorMsgWithArgument(
+				handlererrors.ErrNamespaceNotFound,
+				fmt.Sprintf("collection not found: %s", cName),
+				document.Command(),
+			)
+		}
+
 		var cInfo backends.CollectionInfo
+		cInfo = cList.Collections[0]
 
-		// TODO https://github.com/FerretDB/FerretDB/issues/3601
 		if i, found := slices.BinarySearchFunc(cList.Collections, cName, func(e backends.CollectionInfo, t string) int {
 			return cmp.Compare(e.Name, t)
 		}); found {
@@ -464,18 +473,22 @@ func processStagesStats(ctx context.Context, closer *iterator.MultiCloser, p *st
 		}
 
 		var cList *backends.ListCollectionsResult
-
-		if cList, err = p.db.ListCollections(ctx, new(backends.ListCollectionsParams)); err != nil {
+		collectionParam := backends.ListCollectionsParams{Name: p.cName}
+		if cList, err = p.db.ListCollections(ctx, &collectionParam); err != nil {
 			return nil, lazyerrors.Error(err)
 		}
 
 		// TODO https://github.com/FerretDB/FerretDB/issues/3601
-		if i, found := slices.BinarySearchFunc(cList.Collections, p.cName, func(e backends.CollectionInfo, t string) int {
-			return cmp.Compare(e.Name, t)
-		}); found {
-			cInfo = cList.Collections[i]
+		if len(cList.Collections) == 0 {
+			return nil, handlererrors.NewCommandErrorMsgWithArgument(
+				handlererrors.ErrNamespaceNotFound,
+				fmt.Sprintf("ns not found: %s.%s", p.dbName, p.cName),
+				"aggregate",
+			)
 		}
 
+		cInfo = cList.Collections[0]
+
 		var iList *backends.ListIndexesResult
 
 		iList, err = p.c.ListIndexes(ctx, new(backends.ListIndexesParams))

@@ -15,10 +15,8 @@
 package handler
 
 import (
-	"cmp"
 	"context"
 	"fmt"
-	"slices"
 
 	"github.com/FerretDB/FerretDB/internal/backends"
 	"github.com/FerretDB/FerretDB/internal/handler/common"
@@ -78,22 +76,23 @@ func (h *Handler) MsgCollStats(ctx context.Context, msg *wire.OpMsg) (*wire.OpMs
 		return nil, lazyerrors.Error(err)
 	}
 
-	collections, err := db.ListCollections(ctx, new(backends.ListCollectionsParams))
+	collectionParam := backends.ListCollectionsParams{Name: collection}
+	collections, err := db.ListCollections(ctx, &collectionParam)
 	if err != nil {
 		return nil, lazyerrors.Error(err)
 	}
 
-	var i int
+	// TODO https://github.com/FerretDB/FerretDB/issues/3601
 	var found bool
 	var cInfo backends.CollectionInfo
-
-	// TODO https://github.com/FerretDB/FerretDB/issues/3601
-	if i, found = slices.BinarySearchFunc(collections.Collections, collection, func(e backends.CollectionInfo, t string) int {
-		return cmp.Compare(e.Name, t)
-	}); found {
-		cInfo = collections.Collections[i]
+	found = len(collections.Collections) > 0
+	if !found {
+		msg := fmt.Sprintf("Invalid collection name: %s", collectionParam.Name)
+		return nil, handlererrors.NewCommandErrorMsgWithArgument(handlererrors.ErrInvalidNamespace, msg, document.Command())
 	}
 
+	cInfo = collections.Collections[0]
+
 	indexes, err := c.ListIndexes(ctx, new(backends.ListIndexesParams))
 	if backends.ErrorCodeIs(err, backends.ErrorCodeCollectionDoesNotExist) {
 		indexes = new(backends.ListIndexesResult)

@@ -15,12 +15,10 @@
 package handler
 
 import (
-	"cmp"
 	"context"
 	"errors"
 	"fmt"
 	"os"
-	"slices"
 
 	"github.com/FerretDB/FerretDB/build/version"
 	"github.com/FerretDB/FerretDB/internal/backends"
@@ -107,18 +105,19 @@ func (h *Handler) MsgExplain(ctx context.Context, msg *wire.OpMsg) (*wire.OpMsg,
 
 	var cList *backends.ListCollectionsResult
 
-	if cList, err = db.ListCollections(ctx, nil); err != nil {
+	collectionParam := backends.ListCollectionsParams{Name: params.Collection}
+	if cList, err = db.ListCollections(ctx, &collectionParam); err != nil {
 		return nil, err
 	}
 
-	var cInfo backends.CollectionInfo
+	if len(cList.Collections) == 0 {
+		msg := fmt.Sprintf("Invalid collection name: %s", collectionParam.Name)
+		return nil, handlererrors.NewCommandErrorMsgWithArgument(handlererrors.ErrInvalidNamespace, msg, document.Command())
+	}
 
 	// TODO https://github.com/FerretDB/FerretDB/issues/3601
-	if i, found := slices.BinarySearchFunc(cList.Collections, params.Collection, func(e backends.CollectionInfo, t string) int {
-		return cmp.Compare(e.Name, t)
-	}); found {
-		cInfo = cList.Collections[i]
-	}
+	var cInfo backends.CollectionInfo
+	cInfo = cList.Collections[0]
 
 	switch {
 	case h.DisablePushdown:

@@ -15,11 +15,9 @@
 package handler
 
 import (
-	"cmp"
 	"context"
 	"errors"
 	"fmt"
-	"slices"
 	"time"
 
 	"go.uber.org/zap"
@@ -71,20 +69,21 @@ func (h *Handler) MsgFind(ctx context.Context, msg *wire.OpMsg) (*wire.OpMsg, er
 	}
 
 	var cList *backends.ListCollectionsResult
-
-	if cList, err = db.ListCollections(ctx, nil); err != nil {
+	collectionParam := backends.ListCollectionsParams{Name: params.Collection}
+	if cList, err = db.ListCollections(ctx, &collectionParam); err != nil {
 		return nil, err
 	}
 
 	var cInfo backends.CollectionInfo
 
-	// TODO https://github.com/FerretDB/FerretDB/issues/3601
-	if i, found := slices.BinarySearchFunc(cList.Collections, params.Collection, func(e backends.CollectionInfo, t string) int {
-		return cmp.Compare(e.Name, t)
-	}); found {
-		cInfo = cList.Collections[i]
+	if len(cList.Collections) == 0 {
+		// TODO https://github.com/FerretDB/FerretDB/issues/3601
+		msg := fmt.Sprintf("Invalid collection name: %s", collectionParam.Name)
+		return nil, handlererrors.NewCommandErrorMsgWithArgument(handlererrors.ErrInvalidNamespace, msg, document.Command())
 	}
 
+	cInfo = cList.Collections[0]
+
 	capped := cInfo.Capped()
 	if params.Tailable {
 		if !capped {