Support findAndModify

Closes #548
FerretDB · May 23, 2022 · d80126f · d80126f
1 parent 638e107
commit d80126f
Show file tree

Hide file tree

Showing 8 changed files with 1,071 additions and 95 deletions.
diff --git a/integration/findandmodify_test.go b/integration/findandmodify_test.go
diff --git a/internal/handlers/common/error.go b/internal/handlers/common/error.go
@@ -40,6 +40,7 @@ const (
 	ErrNamespaceNotFound = ErrorCode(26)    // NamespaceNotFound
 	ErrNamespaceExists   = ErrorCode(48)    // NamespaceExists
 	ErrCommandNotFound   = ErrorCode(59)    // CommandNotFound
+	ErrInvalidNamespace  = ErrorCode(73)    // InvalidNamespace
 	ErrNotImplemented    = ErrorCode(238)   // NotImplemented
 	ErrSortBadValue      = ErrorCode(15974) // Location15974
 	ErrInvalidArg        = ErrorCode(28667) // Location28667

diff --git a/internal/handlers/common/errorcode_string.go b/internal/handlers/common/errorcode_string.go
diff --git a/internal/handlers/common/params.go b/internal/handlers/common/params.go
@@ -50,13 +50,43 @@ func GetOptionalParam[T types.Type](doc *types.Document, key string, defaultValu
 
 	res, ok := v.(T)
 	if !ok {
-		msg := fmt.Sprintf("parameter %q has type %T (expected %T)", key, v, defaultValue)
-		return defaultValue, NewErrorMsg(ErrBadValue, msg)
+		msg := fmt.Sprintf(
+			`BSON field '%s' is the wrong type '%s', expected type '%s'`,
+			key, AliasFromType(v), AliasFromType(defaultValue),
+		)
+		return defaultValue, NewErrorMsg(ErrTypeMismatch, msg)
 	}
 
 	return res, nil
 }
 
+// GetBoolOptionalParam returns doc's bool value for key, or protocol error for invalid parameter.
+// Non-zero value for double, long and int return true.
+func GetBoolOptionalParam(doc *types.Document, key string) (bool, error) {
+	v, err := doc.Get(key)
+	if err != nil {
+		return false, nil
+	}
+
+	switch v := v.(type) {
+	case float64:
+		return v != 0, nil
+	case bool:
+		return v, nil
+	case int32:
+		return v != 0, nil
+	case int64:
+		return v != 0, nil
+	default:
+		msg := fmt.Sprintf(
+			`BSON field '%s' is the wrong type '%s', expected types '[bool, long, int, decimal, double]'`,
+			key,
+			AliasFromType(v),
+		)
+		return false, NewErrorMsg(ErrTypeMismatch, msg)
+	}
+}
+
 // AssertType asserts value's type, returning protocol error for unexpected types.
 //
 // If a custom error is needed, use a normal Go type assertion instead:

diff --git a/internal/handlers/pg/msg_delete.go b/internal/handlers/pg/msg_delete.go
@@ -19,6 +19,7 @@ import (
 	"fmt"
 	"strings"
 
+	"github.com/jackc/pgconn"
 	"github.com/jackc/pgx/v4"
 
 	"github.com/FerretDB/FerretDB/internal/fjson"
@@ -113,23 +114,9 @@ func (h *Handler) MsgDelete(ctx context.Context, msg *wire.OpMsg) (*wire.OpMsg,
 			continue
 		}
 
-		var p pgdb.Placeholder
-		placeholders := make([]string, len(resDocs))
-		ids := make([]any, len(resDocs))
-		for i, doc := range resDocs {
-			placeholders[i] = p.Next()
-			id := must.NotFail(doc.Get("_id"))
-			ids[i] = must.NotFail(fjson.Marshal(id))
-		}
-
-		sql := fmt.Sprintf(
-			"DELETE FROM %s WHERE _jsonb->'_id' IN (%s)",
-			pgx.Identifier{sp.db, sp.collection}.Sanitize(), strings.Join(placeholders, ", "),
-		)
-		tag, err := h.pgPool.Exec(ctx, sql, ids...)
+		tag, err := h.delete(ctx, sp, resDocs)
 		if err != nil {
-			// TODO check error code
-			return nil, common.NewError(common.ErrNamespaceNotFound, fmt.Errorf("delete: ns not found: %w", err))
+			return nil, err
 		}
 
 		deleted += int32(tag.RowsAffected())
@@ -148,3 +135,26 @@ func (h *Handler) MsgDelete(ctx context.Context, msg *wire.OpMsg) (*wire.OpMsg,
 
 	return &reply, nil
 }
+
+// delete prepares and executes actual DELETE request to Postgres.
+func (h *Handler) delete(ctx context.Context, sp sqlParam, resDocs []*types.Document) (pgconn.CommandTag, error) {
+	var p pgdb.Placeholder
+	placeholders := make([]string, len(resDocs))
+	ids := make([]any, len(resDocs))
+	for i, doc := range resDocs {
+		placeholders[i] = p.Next()
+		id := must.NotFail(doc.Get("_id"))
+		ids[i] = must.NotFail(fjson.Marshal(id))
+	}
+
+	sql := fmt.Sprintf(
+		"DELETE FROM %s WHERE _jsonb->'_id' IN (%s)",
+		pgx.Identifier{sp.db, sp.collection}.Sanitize(), strings.Join(placeholders, ", "),
+	)
+	tag, err := h.pgPool.Exec(ctx, sql, ids...)
+	if err != nil {
+		// TODO check error code
+		return nil, common.NewError(common.ErrNamespaceNotFound, fmt.Errorf("delete: ns not found: %w", err))
+	}
+	return tag, nil
+}