Cleanup after master merged

davidlatwe · davidlatwe · Apr 27, 2021 · Apr 27, 2021 · Apr 28, 2021 · Apr 28, 2021
commit c3a2faaed676fdeb212fd68c2217fee916f0f798
diff --git a/Makefile b/Makefile
@@ -25,7 +25,7 @@ lint:  ## Run linting with flake8
 	poetry run flake8 . \
 	--count \
 	--ignore=F841,W503 \
-	--max-complexity=26 \
+	--max-complexity=32 \
 	--max-line-length=88 \
 	--statistics \
 	--exclude .venv

diff --git a/montydb/configure.py b/montydb/configure.py
@@ -292,50 +292,41 @@ def _bson_init(use_bson):
 def _mongo_compat(version):
     from .engine import queries, project
 
-    def patch(mod, func, ver_func):
-        setattr(mod, func, getattr(mod, ver_func))
+    def patch(mod, attr, ver):
+        setattr(mod, attr, getattr(mod, attr + ver))
 
     if version.startswith("3"):
-        patch(queries, "_is_comparable", "_is_comparable_ver3")
-        patch(queries, "_regex_options_check", "_regex_options_")
-        patch(queries, "_mod_remainder_not_num", "_mod_remainder_not_num_")
+        patch(queries, "_is_comparable", "_ver3")
+        patch(queries, "_regex_options", "_")
+        patch(queries, "_mod_check_numeric_remainder", "_")
+        patch(project, "_positional_mismatch", "_")
+        patch(project, "_check_positional_key", "_")
+        patch(project, "_check_path_collision", "_")
+        patch(project, "_include_positional_non_located_match", "_")
 
     elif version == "4.0":
-        patch(queries, "_is_comparable", "_is_comparable_ver4")
-        patch(queries, "_regex_options_check", "_regex_options_")
-        patch(queries, "_mod_remainder_not_num", "_mod_remainder_not_num_")
+        patch(queries, "_is_comparable", "_ver4")
+        patch(queries, "_regex_options", "_")
+        patch(queries, "_mod_check_numeric_remainder", "_")
+        patch(project, "_positional_mismatch", "_")
+        patch(project, "_check_positional_key", "_")
+        patch(project, "_check_path_collision", "_")
+        patch(project, "_include_positional_non_located_match", "_")
 
     elif version == "4.2":
-        patch(queries, "_is_comparable", "_is_comparable_ver4")
-        patch(queries, "_regex_options_check", "_regex_options_v42")
-        patch(queries, "_mod_remainder_not_num", "_mod_remainder_not_num_")
-
-    else:
-        patch(queries, "_is_comparable", "_is_comparable_ver4")
-        patch(queries, "_regex_options_check", "_regex_options_")
-        patch(queries, "_mod_remainder_not_num", "_mod_remainder_not_num_v44")
-
-    if version == "4.4":
-        # $mod checking remainder is starting from mongo-4.3.1 but since 4.3 is not
-        #   a stable release so we match this behavior in 4.4
-        setattr(queries, "_mod_check_numeric_remainder",
-                getattr(queries, "_mod_check_numeric_remainder_v431_"))
-        setattr(project, "_positional_mismatch",
-                getattr(project, "_positional_mismatch_v44"))
-        setattr(project, "_check_positional_key",
-                getattr(project, "_check_positional_key_v44"))
-        setattr(project, "_check_path_collision",
-                getattr(project, "_check_path_collision_v44"))
-        setattr(project, "_include_positional_non_located_match",
-                getattr(project, "_include_positional_non_located_match_v44"))
-    else:
-        setattr(queries, "_mod_check_numeric_remainder",
-                getattr(queries, "_mod_check_numeric_remainder_"))
-        setattr(project, "_positional_mismatch",
-                getattr(project, "_positional_mismatch_"))
-        setattr(project, "_check_positional_key",
-                getattr(project, "_check_positional_key_"))
-        setattr(project, "_check_path_collision",
-                getattr(project, "_check_path_collision_"))
-        setattr(project, "_include_positional_non_located_match",
-                getattr(project, "_include_positional_non_located_match_"))
+        patch(queries, "_is_comparable", "_ver4")
+        patch(queries, "_regex_options", "_v42")
+        patch(queries, "_mod_check_numeric_remainder", "_")
+        patch(project, "_positional_mismatch", "_")
+        patch(project, "_check_positional_key", "_")
+        patch(project, "_check_path_collision", "_")
+        patch(project, "_include_positional_non_located_match", "_")
+
+    else:  # 4.4+ (default)
+        patch(queries, "_is_comparable", "_ver4")
+        patch(queries, "_regex_options", "_")
+        patch(queries, "_mod_check_numeric_remainder", "_v431_")
+        patch(project, "_positional_mismatch", "_v44")
+        patch(project, "_check_positional_key", "_v44")
+        patch(project, "_check_path_collision", "_v44")
+        patch(project, "_include_positional_non_located_match", "_v44")
diff --git a/montydb/engine/queries.py b/montydb/engine/queries.py
@@ -421,7 +421,7 @@ def _regex_options_v42(regex_flag, opt_flag):
         raise OperationFailure("options set in both $regex and $options")
 
 
-_regex_options_check = _regex_options_v42
+_regex_options = _regex_options_v42
 
 
 def _modify_regex_optins(sub_spec):
@@ -451,7 +451,7 @@ def _modify_regex_optins(sub_spec):
             _re = sub_spec["$regex"]
             sub_spec["$regex"] = None
 
-    _regex_options_check(regex_flags, opt_flags)
+    _regex_options(regex_flags, opt_flags)
 
     new_sub_spec = deepcopy(sub_spec)
     new_sub_spec["$regex"] = {
@@ -897,18 +897,6 @@ def _regex(fieldwalker):
     return _regex
 
 
-def _mod_remainder_not_num_():
-    pass
-
-
-def _mod_remainder_not_num_v44():
-    # https://jira.mongodb.org/browse/SERVER-23664
-    raise OperationFailure("malformed mod, remainder not a number")
-
-
-_mod_remainder_not_num = _mod_remainder_not_num_v44
-
-
 _mod_check_numeric_remainder_ = False
 _mod_check_numeric_remainder_v431_ = True
 _mod_check_numeric_remainder = _mod_check_numeric_remainder_v431_
@@ -930,7 +918,6 @@ def parse_mod(query):
     if not isinstance(divisor, num_types):
         raise OperationFailure("malformed mod, divisor not a number")
     if not isinstance(remainder, num_types):
-        # _mod_remainder_not_num()
         if _mod_check_numeric_remainder:
             raise OperationFailure("malformed mod, remainder not a number")
         remainder = 0

diff --git a/tests/test_engine/test_queries/test_queryop_evaluation_mod.py b/tests/test_engine/test_queries/test_queryop_evaluation_mod.py
@@ -4,9 +4,6 @@
 from montydb.errors import OperationFailure as monty_op_fail
 from montydb.types import bson
 
-from pymongo.errors import OperationFailure as MongoOpFail
-from montydb.errors import OperationFailure as MontyOpFail
-
 from ...conftest import skip_if_no_bson