ref(search): Decouple IN syntax from equals syntax (#26186)

Author: evanpurkhiser

src/sentry/api/event_search.py

@@ -52,16 +52,21 @@
                / specific_time_filter
                / duration_filter
                / boolean_filter
+               / numeric_in_filter
                / numeric_filter
                / aggregate_filter
                / aggregate_date_filter
                / aggregate_rel_date_filter
                / has_filter
                / is_filter
+               / text_in_filter
                / text_filter
 
 # standard key:val filter
-text_filter = negation? text_key sep ((open_bracket text_value (comma spaces text_value)* closed_bracket) / search_value)
+text_filter = negation? text_key sep search_value
+
+# in filter key:[val1, val2]
+text_in_filter = negation? text_key sep text_in_list
 
 # filter for dates
 time_filter = search_key sep operator iso_8601_date_format
@@ -75,13 +80,16 @@
 # exact time filter for dates
 specific_time_filter = search_key sep iso_8601_date_format
 
-# Numeric comparison filter
-numeric_filter = search_key sep ((operator? numeric_value) / (open_bracket numeric_value (comma spaces numeric_value)* closed_bracket))
+# numeric comparison filter
+numeric_filter = search_key sep operator? numeric_value
+
+# numeric in filter
+numeric_in_filter = search_key sep numeric_in_list
 
-# Boolean comparison filter
+# boolean comparison filter
 boolean_filter = negation? search_key sep boolean_value
 
-# Aggregate numeric filter
+# aggregate numeric filter
 aggregate_filter          = negation? aggregate_key sep operator? (duration_format / numeric_value / percentage_format)
 aggregate_date_filter     = negation? aggregate_key sep operator? iso_8601_date_format
 aggregate_rel_date_filter = negation? aggregate_key sep operator? rel_date_format
@@ -104,6 +112,8 @@
 text_key         = explicit_tag_key / search_key
 text_value       = quoted_value / in_value
 quoted_value     = ~r"\"((?:\\\"|[^\"])*)?\""s
+numeric_in_list  = open_bracket numeric_value (comma spaces numeric_value)* closed_bracket
+text_in_list     = open_bracket text_value (comma spaces text_value)* closed_bracket
 
 # Formats
 iso_8601_date_format = ~r"(\d{4}-\d{2}-\d{2}(T\d{2}:\d{2}:\d{2}(\.\d{1,6})?)?(Z|([+-]\d{2}:\d{2}))?)(?=\s|\)|$)"
@@ -375,12 +385,8 @@ def visit_boolean_filter(self, node, children):
                 (
                     search_key,
                     sep,
-                    (
-                        (
-                            "=",
-                            search_value,
-                        ),
-                    ),
+                    "=",
+                    search_value,
                 ),
             )
 
@@ -405,41 +411,38 @@ def process_list(self, first, remaining):
         ]
 
     def visit_numeric_filter(self, node, children):
-        (search_key, _, (value,)) = children
-        operator = value[0]
+        (search_key, _, operator, search_value) = children
         if isinstance(operator, Node):
-            if isinstance(operator.expr, Optional):
-                operator = "="
-            else:
-                operator = operator.text
+            operator = "=" if isinstance(operator.expr, Optional) else operator.text
         else:
             operator = operator[0]
 
-        if operator == "[":
-            operator = "IN"
-            search_value = self.process_list(value[1], value[2])
+        if self.is_numeric_key(search_key.name):
+            try:
+                search_value = SearchValue(parse_numeric_value(*search_value.match.groups()))
+            except InvalidQuery as exc:
+                raise InvalidSearchQuery(str(exc))
+            return SearchFilter(search_key, operator, search_value)
         else:
-            search_value = value[1]
+            search_value = search_value.text
+            search_value = SearchValue(operator + search_value if operator != "=" else search_value)
+            return self._handle_basic_filter(search_key, "=", search_value)
+
+    def visit_numeric_in_filter(self, node, children):
+        (search_key, _, value) = children
+        operator = "IN"
+        search_value = self.process_list(value[1], value[2])
 
         if self.is_numeric_key(search_key.name):
             try:
                 search_value = SearchValue(
                     [parse_numeric_value(*val.match.groups()) for val in search_value]
-                    if operator == "IN"
-                    else parse_numeric_value(*search_value.match.groups())
                 )
             except InvalidQuery as exc:
                 raise InvalidSearchQuery(str(exc))
             return SearchFilter(search_key, operator, search_value)
         else:
-            if operator != "IN":
-                search_value = search_value.text
-            else:
-                search_value = [v.text for v in search_value]
-            search_value = SearchValue(
-                operator + search_value if operator not in ("=", "IN") else search_value
-            )
-            operator = "=" if operator not in ("=", "IN") else operator
+            search_value = SearchValue([v.text for v in search_value])
             return self._handle_basic_filter(search_key, operator, search_value)
 
     def handle_negation(self, negation, operator):
@@ -542,7 +545,7 @@ def visit_duration_filter(self, node, children):
                 raise InvalidSearchQuery(str(exc))
             return SearchFilter(search_key, operator, SearchValue(search_value))
         elif self.is_numeric_key(search_key.name):
-            return self.visit_numeric_filter(node, (search_key, sep, ((operator, search_value),)))
+            return self.visit_numeric_filter(node, (search_key, sep, operator, search_value))
         else:
             search_value = operator + search_value.text if operator != "=" else search_value.text
             return self._handle_basic_filter(search_key, "=", SearchValue(search_value))
@@ -605,18 +608,23 @@ def is_negated(self, node):
         return node.text == "!"
 
     def visit_text_filter(self, node, children):
-        (negation, search_key, _, (search_value,)) = children
+        (negation, search_key, _, search_value) = children
         operator = "="
-        if isinstance(search_value, list):
-            operator = "IN"
-            search_value = SearchValue(
-                self.process_list(search_value[1], [(_, _, val) for _, _, val in search_value[2]])
-            )
-        else:
-            # XXX: We check whether the text in the node itself is actually empty, so
-            # we can tell the difference between an empty quoted string and no string
-            if not search_value.raw_value and not node.children[3].text:
-                raise InvalidSearchQuery(f"Empty string after '{search_key.name}:'")
+        # XXX: We check whether the text in the node itself is actually empty, so
+        # we can tell the difference between an empty quoted string and no string
+        if not search_value.raw_value and not node.children[3].text:
+            raise InvalidSearchQuery(f"Empty string after '{search_key.name}:'")
+
+        operator = self.handle_negation(negation, operator)
+
+        return self._handle_basic_filter(search_key, operator, search_value)
+
+    def visit_text_in_filter(self, node, children):
+        (negation, search_key, _, search_value) = children
+        operator = "IN"
+        search_value = SearchValue(
+            self.process_list(search_value[1], [(_, _, val) for _, _, val in search_value[2]])
+        )
 
         operator = self.handle_negation(negation, operator)