wip

FerretDB · AlekSi · Oct 24, 2023 · Oct 19, 2023 · Oct 19, 2023 · Oct 19, 2023
commit 578badec522a1489c8a6df7103e53f09f1d1e07d
@@ -317,7 +317,7 @@ func TestCreateCappedCommandInvalidSpec(t *testing.T) {
 				Name:    "TypeMismatch",
 				Message: "BSON field 'create.capped' is the wrong type 'string', expected types '[bool, long, int, decimal, double']",
 			},
-			altMessage: "BSON field 'capped' is the wrong type 'string', expected type 'bool'",
+			altMessage: "BSON field 'capped' is the wrong type 'string', expected types '[bool, long, int, decimal, double]'",
 		},
 		"NegativeSize": {
 			collectionName: "negative_size",

@@ -61,7 +61,7 @@ var (
 
 	disableFilterPushdownF = flag.Bool("disable-filter-pushdown", false, "disable filter pushdown")
 	enableSortPushdownF    = flag.Bool("enable-sort-pushdown", false, "enable sort pushdown")
-	enableOplogF           = flag.Bool("enable-oplog", false, "enable OpLog")
+	enableOplogF           = flag.Bool("enable-oplog", true, "enable OpLog")
 
 	useNewHanaF = flag.Bool("use-new-hana", false, "use new SAP HANA backend")
 )

@@ -74,33 +74,37 @@ func (h *Handler) MsgCreate(ctx context.Context, msg *wire.OpMsg) (*wire.OpMsg,
 		Name: collectionName,
 	}
 
-	capped, err := common.GetOptionalParam[bool](document, "capped", false)
-	if err != nil {
-		return nil, err
+	var capped bool
+	if v, _ := document.Get("capped"); v != nil {
+		capped, err = commonparams.GetBoolOptionalParam("capped", v)
+		if err != nil {
+			return nil, err
+		}
 	}
 
 	if h.EnableOplog && capped {
-		// size param is required
 		var size any
 
 		size, err = document.Get("size")
 		if err != nil {
 			return nil, err
 		}
 
+		if _, ok := size.(types.NullType); ok {
+			msg := "the 'size' field is required when 'capped' is true"
+			return nil, commonerrors.NewCommandErrorMsgWithArgument(commonerrors.ErrInvalidOptions, msg, "create")
+		}
+
 		params.CappedSize, err = commonparams.GetValidatedNumberParamWithMinValue(document.Command(), "size", size, 1)
 		if err != nil {
 			return nil, err
 		}
 
 		if params.CappedSize%256 != 0 {
-			params.CappedSize = (params.CappedSize/256 + 1) * 256 // there is a requirement to round up to 256 bytes' multiplier
+			params.CappedSize = (params.CappedSize/256 + 1) * 256
 		}
 
-		// max param is optional
-		var max any
-
-		if max, err = document.Get("max"); err == nil {
+		if max, _ := document.Get("max"); max != nil {
 			params.CappedDocuments, err = commonparams.GetValidatedNumberParamWithMinValue(document.Command(), "max", max, 0)
 			if err != nil {
 				return nil, err