WIP

FerretDB · w84thesun · May 15, 2023 · May 11, 2023 · May 11, 2023 · May 12, 2023
commit 4e382e7904f61dd058e5d1780aaa3f94f5d45cf6
@@ -49,12 +49,15 @@ type FindAndModifyParams struct {
 	Comment           string          `ferretdb:"comment,opt"`
 	Query             *types.Document `ferretdb:"query,opt"`
 	Sort              *types.Document `ferretdb:"sort,opt"`
-	Update            *types.Document `ferretdb:"update,opt"`
+	UpdateValue       any             `ferretdb:"update,opt"`
 	Remove            bool            `ferretdb:"remove,opt"`
 	Upsert            bool            `ferretdb:"upsert,opt"`
 	ReturnNewDocument bool            `ferretdb:"new,opt"`
 	MaxTimeMS         int64           `ferretdb:"maxTimeMS,opt"`
 
+	Update      *types.Document `ferretdb:"-"`
+	Aggregation *types.Array    `ferretdb:"-"`
+
 	HasUpdateOperators bool `ferretdb:"-"`
 
 	Let          *types.Document `ferretdb:"let,unimplemented"`
@@ -91,24 +94,51 @@ func GetFindAndModifyParams(doc *types.Document, l *zap.Logger) (*FindAndModifyP
 		return nil, err
 	}
 
-	if params.Update != nil && params.Remove {
+	if params.UpdateValue == nil && !params.Remove {
 		return nil, commonerrors.NewCommandErrorMsg(
 			commonerrors.ErrFailedToParse,
-			"Cannot specify both an update and remove=true",
+			"Either an update or remove=true must be specified",
 		)
 	}
 
-	if params.Upsert && params.Remove {
+	if params.ReturnNewDocument && params.Remove {
 		return nil, commonerrors.NewCommandErrorMsg(
 			commonerrors.ErrFailedToParse,
-			"Cannot specify both upsert=true and remove=true",
+			"Cannot specify both new=true and remove=true; 'remove' always returns the deleted document",
 		)
 	}
 
-	if params.ReturnNewDocument && params.Remove {
+	if params.UpdateValue != nil {
+		switch updateParam := params.UpdateValue.(type) {
+		case *types.Document:
+			params.Update = updateParam
+		case *types.Array:
+			// TODO aggregation pipeline stages metrics
+			return nil, commonerrors.NewCommandErrorMsgWithArgument(
+				commonerrors.ErrNotImplemented,
+				"Aggregation pipelines are not supported yet",
+				"update",
+			)
+		default:
+			return nil, commonerrors.NewCommandErrorMsgWithArgument(
+				commonerrors.ErrFailedToParse,
+				"Update argument must be either an object or an array",
+				"update",
+			)
+		}
+	}
+
+	if params.Update != nil && params.Remove {
 		return nil, commonerrors.NewCommandErrorMsg(
 			commonerrors.ErrFailedToParse,
-			"Cannot specify both new=true and remove=true; 'remove' always returns the deleted document",
+			"Cannot specify both an update and remove=true",
+		)
+	}
+
+	if params.Upsert && params.Remove {
+		return nil, commonerrors.NewCommandErrorMsg(
+			commonerrors.ErrFailedToParse,
+			"Cannot specify both upsert=true and remove=true",
 		)
 	}
 

@@ -82,38 +82,6 @@ func GetOptionalNullParam[T types.Type](doc *types.Document, key string, default
 	return v, err
 }
 
-// GetBoolOptionalParam returns doc's bool value for key.
-// Non-zero double, long, and int values return true.
-// Zero values for those types, as well as nulls and missing fields, return false.
-// Other types return a protocol error.
-func GetBoolOptionalParam(doc *types.Document, key string) (bool, error) {
-	v, _ := doc.Get(key)
-	if v == nil {
-		return false, nil
-	}
-
-	switch v := v.(type) {
-	case float64:
-		return v != 0, nil
-	case bool:
-		return v, nil
-	case types.NullType:
-		return false, 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,
-			commonparams.AliasFromType(v),
-		)
-
-		return false, commonerrors.NewCommandErrorMsgWithArgument(commonerrors.ErrTypeMismatch, msg, key)
-	}
-}
-
 // AssertType asserts value's type, returning protocol error for unexpected types.
 //
 // If a custom error is needed, use a normal Go type assertion instead:

@@ -61,9 +61,11 @@ func GetUpdateParams(document *types.Document, l *zap.Logger) (*UpdatesParams, e
 		return nil, err
 	}
 
-	for _, update := range params.Updates {
-		if err := ValidateUpdateOperators(document.Command(), update.Update); err != nil {
-			return nil, err
+	if params.Updates != nil {
+		for _, update := range params.Updates {
+			if err := ValidateUpdateOperators(document.Command(), update.Update); err != nil {
+				return nil, err
+			}
 		}
 	}
 

@@ -240,6 +240,15 @@ func setStructField(elem *reflect.Value, i int, command, key string, val any, l
 			return err
 		}
 	case reflect.String, reflect.Bool, reflect.Struct, reflect.Pointer, reflect.Interface:
+		if command == "findAndModify" && key == "new" {
+			settable, err = GetBoolOptionalParam(val, key)
+			if err != nil {
+				return err
+			}
+
+			break
+		}
+
 		settable = val
 	case reflect.Slice:
 		array, ok := val.(*types.Array)
@@ -308,6 +317,11 @@ func setStructField(elem *reflect.Value, i int, command, key string, val any, l
 				)
 			}
 
+			if command == "findAndModify" && key == "update" {
+				fv.Set(reflect.ValueOf(v.Interface()))
+				return nil
+			}
+
 			return commonerrors.NewCommandErrorMsgWithArgument(
 				commonerrors.ErrTypeMismatch,
 				fmt.Sprintf(

@@ -180,3 +180,30 @@ func GetOptionalPositiveNumber(key string, value any) (int64, error) {
 
 	return param, nil
 }
+
+// GetBoolOptionalParam returns doc's bool value for key.
+// Non-zero double, long, and int values return true.
+// Zero values for those types, as well as nulls and missing fields, return false.
+// Other types return a protocol error.
+func GetBoolOptionalParam(v any, key string) (bool, error) {
+	switch v := v.(type) {
+	case float64:
+		return v != 0, nil
+	case bool:
+		return v, nil
+	case types.NullType:
+		return false, 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, commonerrors.NewCommandErrorMsgWithArgument(commonerrors.ErrTypeMismatch, msg, key)
+	}
+}
@@ -20,6 +20,7 @@ import (
 
 	"github.com/FerretDB/FerretDB/internal/handlers/common"
 	"github.com/FerretDB/FerretDB/internal/handlers/commonerrors"
+	"github.com/FerretDB/FerretDB/internal/handlers/commonparams"
 	"github.com/FerretDB/FerretDB/internal/types"
 	"github.com/FerretDB/FerretDB/internal/util/iterator"
 	"github.com/FerretDB/FerretDB/internal/util/lazyerrors"
@@ -130,13 +131,18 @@ func extractParam(document *types.Document) (showDetails, allParameters bool, er
 	}
 
 	if param, ok := getPrm.(*types.Document); ok {
-		showDetails, err = common.GetBoolOptionalParam(param, "showDetails")
-		if err != nil {
-			return false, false, lazyerrors.Error(err)
+		if v, _ := param.Get("showDetails"); v != nil {
+			showDetails, err = commonparams.GetBoolOptionalParam(v, "showDetails")
+			if err != nil {
+				return false, false, lazyerrors.Error(err)
+			}
 		}
-		allParameters, err = common.GetBoolOptionalParam(param, "allParameters")
-		if err != nil {
-			return false, false, lazyerrors.Error(err)
+		if v, _ := document.Get("allParameters"); v != nil {
+
+			allParameters, err = commonparams.GetBoolOptionalParam(v, "allParameters")
+			if err != nil {
+				return false, false, lazyerrors.Error(err)
+			}
 		}
 	}
 	if getPrm == "*" {

@@ -21,6 +21,7 @@ import (
 	"github.com/jackc/pgx/v5"
 
 	"github.com/FerretDB/FerretDB/internal/handlers/common"
+	"github.com/FerretDB/FerretDB/internal/handlers/commonparams"
 	"github.com/FerretDB/FerretDB/internal/handlers/pg/pgdb"
 	"github.com/FerretDB/FerretDB/internal/types"
 	"github.com/FerretDB/FerretDB/internal/util/lazyerrors"
@@ -52,9 +53,12 @@ func (h *Handler) MsgListCollections(ctx context.Context, msg *wire.OpMsg) (*wir
 		return nil, err
 	}
 
-	nameOnly, err := common.GetBoolOptionalParam(document, "nameOnly")
-	if err != nil {
-		return nil, err
+	var nameOnly bool
+	if v, _ := document.Get("nameOnly"); v != nil {
+		nameOnly, err = commonparams.GetBoolOptionalParam(v, "nameOnly")
+		if err != nil {
+			return nil, err
+		}
 	}
 
 	var names []string

@@ -20,6 +20,7 @@ import (
 	"github.com/jackc/pgx/v5"
 
 	"github.com/FerretDB/FerretDB/internal/handlers/common"
+	"github.com/FerretDB/FerretDB/internal/handlers/commonparams"
 	"github.com/FerretDB/FerretDB/internal/handlers/pg/pgdb"
 	"github.com/FerretDB/FerretDB/internal/types"
 	"github.com/FerretDB/FerretDB/internal/util/lazyerrors"
@@ -46,9 +47,12 @@ func (h *Handler) MsgListDatabases(ctx context.Context, msg *wire.OpMsg) (*wire.
 
 	common.Ignored(document, h.L, "comment", "authorizedDatabases")
 
-	nameOnly, err := common.GetBoolOptionalParam(document, "nameOnly")
-	if err != nil {
-		return nil, err
+	var nameOnly bool
+	if v, _ := document.Get("nameOnly"); v != nil {
+		nameOnly, err = commonparams.GetBoolOptionalParam(v, "nameOnly")
+		if err != nil {
+			return nil, err
+		}
 	}
 
 	var totalSize int64

@@ -19,6 +19,7 @@ import (
 	"sort"
 
 	"github.com/FerretDB/FerretDB/internal/handlers/common"
+	"github.com/FerretDB/FerretDB/internal/handlers/commonparams"
 	"github.com/FerretDB/FerretDB/internal/types"
 	"github.com/FerretDB/FerretDB/internal/util/lazyerrors"
 	"github.com/FerretDB/FerretDB/internal/util/must"
@@ -49,9 +50,12 @@ func (h *Handler) MsgListCollections(ctx context.Context, msg *wire.OpMsg) (*wir
 		return nil, err
 	}
 
-	nameOnly, err := common.GetBoolOptionalParam(document, "nameOnly")
-	if err != nil {
-		return nil, err
+	var nameOnly bool
+	if v, _ := document.Get("nameOnly"); v != nil {
+		nameOnly, err = commonparams.GetBoolOptionalParam(v, "nameOnly")
+		if err != nil {
+			return nil, err
+		}
 	}
 
 	names, err := dbPool.Driver.UseDatabase(db).ListCollections(ctx)

@@ -18,6 +18,7 @@ import (
 	"context"
 
 	"github.com/FerretDB/FerretDB/internal/handlers/common"
+	"github.com/FerretDB/FerretDB/internal/handlers/commonparams"
 	"github.com/FerretDB/FerretDB/internal/handlers/tigris/tigrisdb"
 	"github.com/FerretDB/FerretDB/internal/types"
 	"github.com/FerretDB/FerretDB/internal/util/lazyerrors"
@@ -49,9 +50,12 @@ func (h *Handler) MsgListDatabases(ctx context.Context, msg *wire.OpMsg) (*wire.
 		return nil, err
 	}
 
-	nameOnly, err := common.GetBoolOptionalParam(document, "nameOnly")
-	if err != nil {
-		return nil, err
+	var nameOnly bool
+	if v, _ := document.Get("nameOnly"); v != nil {
+		nameOnly, err = commonparams.GetBoolOptionalParam(v, "nameOnly")
+		if err != nil {
+			return nil, err
+		}
 	}
 
 	var totalSize int64