lot of changes

FerretDB · AlekSi · Jul 26, 2023 · Jun 20, 2023 · Jun 21, 2023 · Jun 21, 2023
commit f05bf627e5b8b3fdda33ca1534a5d1dcb62c2612
@@ -36,6 +36,7 @@ const (
 	ErrorCodeCollectionDoesNotExist
 	ErrorCodeCollectionAlreadyExists
 	ErrorCodeCollectionNameIsInvalid
+	ErrorCodeCollectionStartsWithDot
 )
 
 // Error represents a backend error returned by all Backend, Database and Collection methods.

@@ -73,7 +73,8 @@ func (c *collection) Query(ctx context.Context, params *backends.QueryParams) (*
 // Insert implements backends.Collection interface.
 func (c *collection) Insert(ctx context.Context, params *backends.InsertParams) (*backends.InsertResult, error) {
 	if _, err := c.r.CollectionCreate(ctx, c.dbName, c.name); err != nil {
-		if errors.Is(err, metadata.ErrInvalidCollectionName) {
+		if backends.ErrorCodeIs(err, backends.ErrorCodeCollectionNameIsInvalid) {
+			//TODO
 			return nil, err
 		}
 		return nil, lazyerrors.Error(err)

@@ -16,7 +16,6 @@ package sqlite
 
 import (
 	"context"
-	"errors"
 
 	"github.com/FerretDB/FerretDB/internal/backends"
 	"github.com/FerretDB/FerretDB/internal/backends/sqlite/metadata"
@@ -72,7 +71,8 @@ func (db *database) ListCollections(ctx context.Context, params *backends.ListCo
 func (db *database) CreateCollection(ctx context.Context, params *backends.CreateCollectionParams) error {
 	created, err := db.r.CollectionCreate(ctx, db.name, params.Name)
 	if err != nil {
-		if errors.Is(err, metadata.ErrInvalidCollectionName) {
+		if backends.ErrorCodeIs(err, backends.ErrorCodeCollectionNameIsInvalid) {
+			//TODO
 			return err
 		}
 		return lazyerrors.Error(err)

@@ -28,6 +28,7 @@ import (
 	"modernc.org/sqlite"
 	sqlitelib "modernc.org/sqlite/lib"
 
+	"github.com/FerretDB/FerretDB/internal/backends"
 	"github.com/FerretDB/FerretDB/internal/backends/sqlite/metadata/pool"
 	"github.com/FerretDB/FerretDB/internal/util/lazyerrors"
 	"github.com/FerretDB/FerretDB/internal/util/must"
@@ -45,14 +46,6 @@ const (
 	metadataTableName = reservedPrefix + "collections"
 )
 
-var (
-	// ErrInvalidCollectionName indicates that a collection didn't pass name checks.
-	ErrInvalidCollectionName = fmt.Errorf("invalid FerretDB collection name")
-
-	// ErrCollectionDoesNotExist indicates that collection does not exist.
-	ErrCollectionDoesNotExist = fmt.Errorf("collection does not exist")
-)
-
 // Registry provides access to SQLite databases and collections information.
 type Registry struct {
 	p *pool.Pool
@@ -81,7 +74,7 @@ func (r *Registry) Close() {
 // It returns ErrInvalidCollectionName error if the name is incorrect for SQLite backend.
 func collectionToTable(collectionName string) (string, error) {
 	if strings.HasPrefix(collectionName, reservedPrefix) {
-		return "", ErrInvalidCollectionName
+		return "", backends.NewError(backends.ErrorCodeCollectionNameIsInvalid, nil)
 	}
 
 	hash32 := fnv.New32a()
@@ -223,7 +216,7 @@ func (r *Registry) CollectionGet(ctx context.Context, dbName string, collectionN
 	defer rows.Close()
 
 	if !rows.Next() {
-		return "", ErrCollectionDoesNotExist
+		return "", backends.NewError(backends.ErrorCodeCollectionDoesNotExist, nil)
 	}
 
 	var name string
@@ -245,7 +238,7 @@ func (r *Registry) CollectionDrop(ctx context.Context, dbName string, collection
 	}
 
 	tableName, err := r.CollectionGet(ctx, dbName, collectionName)
-	if errors.Is(err, ErrCollectionDoesNotExist) {
+	if backends.ErrorCodeIs(err, backends.ErrorCodeCollectionDoesNotExist) {
 		return false, nil
 	}
 

@@ -16,14 +16,12 @@ package sqlite
 
 import (
 	"context"
-	"errors"
 	"fmt"
 	"regexp"
 	"strings"
 	"unicode/utf8"
 
 	"github.com/FerretDB/FerretDB/internal/backends"
-	"github.com/FerretDB/FerretDB/internal/backends/sqlite/metadata"
 	"github.com/FerretDB/FerretDB/internal/handlers/common"
 	"github.com/FerretDB/FerretDB/internal/handlers/commonerrors"
 	"github.com/FerretDB/FerretDB/internal/types"
@@ -99,52 +97,49 @@ func (h *Handler) MsgCreate(ctx context.Context, msg *wire.OpMsg) (*wire.OpMsg,
 
 		return &reply, nil
 
-	case errors.Is(err, ErrInvalidCollectionName):
+	case backends.ErrorCodeIs(err, backends.ErrorCodeCollectionNameIsInvalid):
 		msg := fmt.Sprintf("Invalid collection name: '%s.%s'", dbName, collectionName)
 		return nil, commonerrors.NewCommandErrorMsgWithArgument(commonerrors.ErrInvalidNamespace, msg, "create")
 
-	case errors.Is(err, ErrCollectionStartsWithDot):
+	case backends.ErrorCodeIs(err, backends.ErrorCodeCollectionStartsWithDot):
 		msg := fmt.Sprintf("Collection names cannot start with '.': %s", collectionName)
 		return nil, commonerrors.NewCommandErrorMsgWithArgument(commonerrors.ErrInvalidNamespace, msg, "create")
 
 	case backends.ErrorCodeIs(err, backends.ErrorCodeCollectionAlreadyExists):
 		msg := fmt.Sprintf("Collection %s.%s already exists.", dbName, collectionName)
 		return nil, commonerrors.NewCommandErrorMsgWithArgument(commonerrors.ErrNamespaceExists, msg, "create")
 
-	case backends.ErrorCodeIs(err, backends.ErrorCodeCollectionNameIsInvalid):
-		msg := fmt.Sprintf("Invalid namespace: %s.%s", dbName, collectionName)
-		return nil, commonerrors.NewCommandErrorMsgWithArgument(commonerrors.ErrInvalidNamespace, msg, "create")
-
 	default:
 		return nil, lazyerrors.Error(err)
 	}
 }
 
-// validateCollectionNameRe validates collection names.
-// Empty collection name, names with `$` and `\x00`,
-// or exceeding the 255 bytes limit are not allowed.
-// Collection names that start with `.` are also not allowed.
-var validateCollectionNameRe = regexp.MustCompile("^[^.$\x00][^$\x00]{0,234}$")
-
 // createCollection validates the collection name and creates collection.
 // It returns ErrInvalidCollectionName when the collection name is invalid.
 // It returns ErrCollectionStartsWithDot if collection starts with a dot.
 func createCollection(ctx context.Context, db backends.Database, collectionName string) error {
+	// validateCollectionNameRe validates collection names.
+	// Empty collection name, names with `$` and `\x00`,
+	// or exceeding the 255 bytes limit are not allowed.
+	// Collection names that start with `.` are also not allowed.
+	validateCollectionNameRe := regexp.MustCompile("^[^.$\x00][^$\x00]{0,234}$")
+
 	if strings.HasPrefix(collectionName, ".") {
-		return ErrCollectionStartsWithDot
+		return backends.NewError(backends.ErrorCodeCollectionStartsWithDot, nil)
 	}
 
 	if !validateCollectionNameRe.MatchString(collectionName) ||
 		!utf8.ValidString(collectionName) {
-		return ErrInvalidCollectionName
+		return backends.NewError(backends.ErrorCodeCollectionNameIsInvalid, nil)
 	}
 
-	err := db.CreateCollection(ctx, &backends.CreateCollectionParams{
+	return db.CreateCollection(ctx, &backends.CreateCollectionParams{
 		Name: collectionName,
 	})
-	if errors.Is(err, metadata.ErrInvalidCollectionName) {
-		return ErrInvalidCollectionName
-	}
 
-	return err
+	//if errors.Is(err, metadata.ErrInvalidCollectionName) {
+	//	return ErrInvalidCollectionName
+	//}
+
+	//return err
 }
@@ -19,7 +19,6 @@ import (
 	"errors"
 
 	"github.com/FerretDB/FerretDB/internal/backends"
-	"github.com/FerretDB/FerretDB/internal/backends/sqlite/metadata"
 	"github.com/FerretDB/FerretDB/internal/handlers/common"
 	"github.com/FerretDB/FerretDB/internal/types"
 	"github.com/FerretDB/FerretDB/internal/util/iterator"
@@ -77,8 +76,9 @@ func (h *Handler) updateDocument(ctx context.Context, params *common.UpdatesPara
 		err = nil
 	}
 
-	if errors.Is(err, metadata.ErrInvalidCollectionName) {
-		return 0, 0, nil, ErrInvalidCollectionName
+	if backends.ErrorCodeIs(err, backends.ErrorCodeCollectionNameIsInvalid) {
+		//TODO: check if its needed
+		return 0, 0, nil, err
 	}
 
 	if err != nil {

diff --git a/internal/handlers/sqlite/sqlite.go b/internal/handlers/sqlite/sqlite.go
@@ -18,8 +18,6 @@
 package sqlite
 
 import (
-	"fmt"
-
 	"github.com/prometheus/client_golang/prometheus"
 	"go.uber.org/zap"
 
@@ -32,14 +30,6 @@ import (
 	"github.com/FerretDB/FerretDB/internal/util/state"
 )
 
-var (
-	// ErrInvalidCollectionName indicates that a collection didn't pass name checks.
-	ErrInvalidCollectionName = fmt.Errorf("invalid FerretDB collection name")
-
-	// ErrCollectionStartsWithDot indicates that collection name starts with dot, but it shouldn't.
-	ErrCollectionStartsWithDot = fmt.Errorf("Collection names cannot start with '.'")
-)
-
 // notImplemented returns error for stub command handlers.
 func notImplemented(command string) error {
 	return commonerrors.NewCommandErrorMsg(