Move existing comparision code to types (#531)

With minimal code changes. Refs #481.
FerretDB · Apr 26, 2022 · ad8acc0 · ad8acc0
1 parent f6bfa76
commit ad8acc0
Show file tree

Hide file tree

Showing 9 changed files with 452 additions and 379 deletions.
diff --git a/internal/handlers/common/compare.go b/internal/handlers/common/compare.go
diff --git a/internal/handlers/common/error.go b/internal/handlers/common/error.go
@@ -122,14 +122,26 @@ func ProtocolError(err error) (*Error, bool) {
 func formatBitwiseOperatorErr(err error, operator string, maskValue any) error {
 	switch err {
 	case errNotWholeNumber:
-		return NewErrorMsg(ErrFailedToParse, fmt.Sprintf("Expected an integer: %s: %#v", operator, maskValue))
+		return NewErrorMsg(
+			ErrFailedToParse,
+			fmt.Sprintf("Expected an integer: %s: %#v", operator, maskValue),
+		)
 	case errNegativeNumber:
 		if _, ok := maskValue.(float64); ok {
-			return NewErrorMsg(ErrFailedToParse, fmt.Sprintf(`Expected a positive number in: %s: %.1f`, operator, maskValue))
+			return NewErrorMsg(
+				ErrFailedToParse,
+				fmt.Sprintf(`Expected a positive number in: %s: %.1f`, operator, maskValue),
+			)
 		}
-		return NewErrorMsg(ErrFailedToParse, fmt.Sprintf(`Expected a positive number in: %s: %v`, operator, maskValue))
+		return NewErrorMsg(
+			ErrFailedToParse,
+			fmt.Sprintf(`Expected a positive number in: %s: %v`, operator, maskValue),
+		)
 	case errNotBinaryMask:
-		return NewErrorMsg(ErrBadValue, fmt.Sprintf(`value takes an Array, a number, or a BinData but received: %s: %#v`, operator, maskValue))
+		return NewErrorMsg(
+			ErrBadValue,
+			fmt.Sprintf(`value takes an Array, a number, or a BinData but received: %s: %#v`, operator, maskValue),
+		)
 	default:
 		return err
 	}