Revert "rename has_any and has_all queries to any and all"

This reverts commit 38218c6.

Author: bckohan

django_enum/query.py

@@ -1,5 +1,5 @@
 """
-Specialized any and all query lookups for flag enumerations.
+Specialized has_any and has_all query lookups for flag enumerations.
 """
 
 # from django.core.exceptions import FieldError
@@ -15,7 +15,7 @@ class HasAllFlagsLookup(Exact):
     to the lookup value.
     """
 
-    lookup_name = "all"
+    lookup_name = "has_all"
 
     def process_lhs(self, compiler, connection, lhs=None):
         lhs_sql, lhs_params = super().process_lhs(compiler, connection, lhs)
@@ -49,7 +49,7 @@ def get_rhs_op(self, connection, rhs):
 #     HasAllFlagsLookup
 # ):
 #     """
-#     Support for bitwise all lookup on extra big integers (>64 bits)
+#     Support for bitwise has_all lookup on extra big integers (>64 bits)
 #     stored as binary columns.
 #
 #     get_bit(, 0) AND get_bit(, 7) = 1;
@@ -82,7 +82,7 @@ class HasAnyFlagsLookup(HasAllFlagsLookup):
     than zero.
     """
 
-    lookup_name = "any"
+    lookup_name = "has_any"
 
     def process_rhs(self, compiler, connection):
         rhs_sql, rhs_params = super().process_rhs(compiler, connection)
@@ -101,7 +101,7 @@ def get_rhs_op(self, connection, rhs):
 #     HasAnyFlagsLookup
 # ):
 #     """
-#     Support for bitwise any lookup on extra big integers (>64 bits)
+#     Support for bitwise has_any lookup on extra big integers (>64 bits)
 #     stored as binary columns.
 #     """
 #

tests/benchmarks.py

@@ -461,15 +461,15 @@ def test_size_benchmark(self):
             bf.write(json.dumps(data, indent=4))
 
     def test_query_performance(self):
-        any_flag_count = {}
-        all_flag_count = {}
-        any_flag_load = {}
-        all_flag_load = {}
+        has_any_flag_count = {}
+        has_all_flag_count = {}
+        has_any_flag_load = {}
+        has_all_flag_load = {}
 
-        any_bool_count = {}
-        all_bool_count = {}
-        any_bool_load = {}
-        all_bool_load = {}
+        has_any_bool_count = {}
+        has_all_bool_count = {}
+        has_any_bool_load = {}
+        has_all_bool_load = {}
 
         with connection.cursor() as cursor:
             for FlagModel, BoolModel in zip(self.FLAG_MODELS, self.BOOL_MODELS):
@@ -480,8 +480,8 @@ def test_query_performance(self):
                     mask = 1
                 mask_en = FlagModel._meta.get_field("flags").enum(mask)
 
-                flag_any_q = FlagModel.objects.filter(flags__any=mask_en)
-                flag_all_q = FlagModel.objects.filter(flags__all=mask_en)
+                flag_any_q = FlagModel.objects.filter(flags__has_any=mask_en)
+                flag_all_q = FlagModel.objects.filter(flags__has_all=mask_en)
 
                 bool_q = [
                     Q(**{f"flg_{flg}": bool(mask & (1 << flg) != 0)})
@@ -502,11 +502,11 @@ def test_query_performance(self):
 
                 start = perf_counter()
                 flag_any_count = flag_any_q.count()
-                any_flag_count[FlagModel.num_flags] = perf_counter() - start
+                has_any_flag_count[FlagModel.num_flags] = perf_counter() - start
 
                 start = perf_counter()
                 bool_any_count = bool_any_q.count()
-                any_bool_count[BoolModel.num_flags] = perf_counter() - start
+                has_any_bool_count[BoolModel.num_flags] = perf_counter() - start
 
                 try:
                     # make sure our queries are equivalent
@@ -518,75 +518,83 @@ def test_query_performance(self):
 
                 start = perf_counter()
                 flag_all_count = flag_all_q.count()
-                all_flag_count[FlagModel.num_flags] = perf_counter() - start
+                has_all_flag_count[FlagModel.num_flags] = perf_counter() - start
 
                 start = perf_counter()
                 bool_all_count = bool_all_q.count()
-                all_bool_count[BoolModel.num_flags] = perf_counter() - start
+                has_all_bool_count[BoolModel.num_flags] = perf_counter() - start
 
                 # make sure our queries are equivalent
                 self.assertEqual(flag_all_count, bool_all_count)
 
                 start = perf_counter()
                 flag_any_list = list(flag_any_q.all())
-                any_flag_load[FlagModel.num_flags] = perf_counter() - start
+                has_any_flag_load[FlagModel.num_flags] = perf_counter() - start
 
                 start = perf_counter()
                 bool_any_list = list(bool_any_q.all())
-                any_bool_load[BoolModel.num_flags] = perf_counter() - start
+                has_any_bool_load[BoolModel.num_flags] = perf_counter() - start
 
                 # make sure our queries are equivalent
                 self.assertEqual(len(flag_any_list), len(bool_any_list))
 
                 start = perf_counter()
                 flag_all_list = list(flag_all_q.all())
-                all_flag_load[FlagModel.num_flags] = perf_counter() - start
+                has_all_flag_load[FlagModel.num_flags] = perf_counter() - start
 
                 start = perf_counter()
                 bool_all_list = list(bool_all_q.all())
-                all_bool_load[BoolModel.num_flags] = perf_counter() - start
+                has_all_bool_load[BoolModel.num_flags] = perf_counter() - start
 
                 # make sure our queries are equivalent
                 self.assertEqual(len(flag_all_list), len(bool_all_list))
 
-        num_flags = sorted(any_flag_count.keys())
+        num_flags = sorted(has_any_flag_count.keys())
 
-        any_count_diff = [
-            any_bool_count[flg] - any_flag_count[flg] for flg in num_flags
+        has_any_count_diff = [
+            has_any_bool_count[flg] - has_any_flag_count[flg] for flg in num_flags
         ]
-        all_count_diff = [
-            all_bool_count[flg] - all_flag_count[flg] for flg in num_flags
+        has_all_count_diff = [
+            has_all_bool_count[flg] - has_all_flag_count[flg] for flg in num_flags
         ]
 
-        any_load_diff = [any_bool_load[flg] - any_flag_load[flg] for flg in num_flags]
-        all_load_diff = [all_bool_load[flg] - all_flag_load[flg] for flg in num_flags]
+        has_any_load_diff = [
+            has_any_bool_load[flg] - has_any_flag_load[flg] for flg in num_flags
+        ]
+        has_all_load_diff = [
+            has_all_bool_load[flg] - has_all_flag_load[flg] for flg in num_flags
+        ]
 
-        # print(any_count_diff)
+        # print(has_any_count_diff)
         # print('--------------------------------')
-        # print(all_count_diff)
+        # print(has_all_count_diff)
         # print('--------------------------------')
-        # print(any_load_diff)
+        # print(has_any_load_diff)
         # print('--------------------------------')
-        # print(all_load_diff)
+        # print(has_all_load_diff)
 
-        any_count_tpl = [
-            (any_bool_count[flg], any_flag_count[flg]) for flg in num_flags
+        has_any_count_tpl = [
+            (has_any_bool_count[flg], has_any_flag_count[flg]) for flg in num_flags
         ]
-        all_count_tpl = [
-            (all_bool_count[flg], all_flag_count[flg]) for flg in num_flags
+        has_all_count_tpl = [
+            (has_all_bool_count[flg], has_all_flag_count[flg]) for flg in num_flags
         ]
 
-        any_load_tpl = [(any_bool_load[flg], any_flag_load[flg]) for flg in num_flags]
-        all_load_tpl = [(all_bool_load[flg], all_flag_load[flg]) for flg in num_flags]
+        has_any_load_tpl = [
+            (has_any_bool_load[flg], has_any_flag_load[flg]) for flg in num_flags
+        ]
+        has_all_load_tpl = [
+            (has_all_bool_load[flg], has_all_flag_load[flg]) for flg in num_flags
+        ]
 
-        print("------------ any_cnt ----------------")
-        print(any_count_tpl)
-        print("------------ all_cnt ----------------")
-        print(all_count_tpl)
-        print("------------ any_load ---------------")
-        print(any_load_tpl)
-        print("------------ all_load ---------------")
-        print(all_load_tpl)
+        print("------------ has_any_cnt ----------------")
+        print(has_any_count_tpl)
+        print("------------ has_all_cnt ----------------")
+        print(has_all_count_tpl)
+        print("------------ has_any_load ---------------")
+        print(has_any_load_tpl)
+        print("------------ has_all_load ---------------")
+        print(has_all_load_tpl)
 
 
 class CreateRowMixin(BulkCreateMixin):
@@ -709,11 +717,11 @@ def do_flag_query(self, masks):
             # dont change query order
 
             start = perf_counter()
-            flg_all.append(self.FlagModel.objects.filter(flags__all=mask).count())
+            flg_all.append(self.FlagModel.objects.filter(flags__has_all=mask).count())
             flg_all_time += perf_counter() - start
 
             all_explanation = json.loads(
-                self.FlagModel.objects.filter(flags__all=mask).explain(
+                self.FlagModel.objects.filter(flags__has_all=mask).explain(
                     format="json",
                     analyze=True,
                     buffers=True,
@@ -728,11 +736,11 @@ def do_flag_query(self, masks):
                 flg_all_ftr_time += all_explanation["Execution Time"]
 
             start = perf_counter()
-            flg_any.append(self.FlagModel.objects.filter(flags__any=mask).count())
+            flg_any.append(self.FlagModel.objects.filter(flags__has_any=mask).count())
             flg_any_time += perf_counter() - start
 
             any_explanation = json.loads(
-                self.FlagModel.objects.filter(flags__any=mask).explain(
+                self.FlagModel.objects.filter(flags__has_any=mask).explain(
                     format="json",
                     analyze=True,
                     buffers=True,
@@ -826,7 +834,7 @@ def get_all_q(set_bits):
 
                 bq_all = reduce(and_, get_all_q(set_bits))
 
-                # todo there is not a better way to formulate a any query
+                # todo there is not a better way to formulate a has_any query
                 #  that will use the index ??
 
                 # bq_any = reduce(
@@ -1008,9 +1016,11 @@ def optimize():
                                 any_ftr_time,
                                 exact_ftr_time,
                             ) = query(masks)
-                            queries[f"{name} all"] = ctx.captured_queries[0]["sql"]
-                            queries[f"{name} any"] = ctx.captured_queries[1]["sql"]
-                            queries[f"{name} exact"] = ctx.captured_queries[2]["sql"]
+                            queries[f"{name} has_all"] = ctx.captured_queries[0]["sql"]
+                            queries[f"{name} has_any"] = ctx.captured_queries[1]["sql"]
+                            queries[f"{name} has_exact"] = ctx.captured_queries[2][
+                                "sql"
+                            ]
 
                         pbar.refresh()
 

tests/test_field_types_ep.py

@@ -97,23 +97,23 @@ def test_large_bitfields(self):
             bit_field_large_neg=None,
         )
 
-        # any and all are not supported on ExtraLarge bit fields
+        # has_any and has_all are not supported on ExtraLarge bit fields
         with self.assertRaises(FieldError):
-            BitFieldModel.objects.filter(bit_field_large__any=LargeBitField.ONE)
+            BitFieldModel.objects.filter(bit_field_large__has_any=LargeBitField.ONE)
 
         with self.assertRaises(FieldError):
             BitFieldModel.objects.filter(
-                bit_field_large__all=LargeBitField.ONE | LargeBitField.TWO
+                bit_field_large__has_all=LargeBitField.ONE | LargeBitField.TWO
             )
 
         with self.assertRaises(FieldError):
             BitFieldModel.objects.filter(
-                bit_field_large_neg__any=LargeNegativeField.NEG_ONE
+                bit_field_large_neg__has_any=LargeNegativeField.NEG_ONE
             )
 
         with self.assertRaises(FieldError):
             BitFieldModel.objects.filter(
-                bit_field_large_neg__all=LargeNegativeField.NEG_ONE
+                bit_field_large_neg__has_all=LargeNegativeField.NEG_ONE
                 | LargeNegativeField.ZERO
             )