Browse Source

Revert "feat(parser): Rich invalid messages for aggregates in the searchBar (#36888)" (#37764)

This reverts commit cc0542418ac759309b130e3c2472ba1094b483e7.
Malachi Willey 2 years ago
parent
commit
705307c442

+ 2 - 2
fixtures/search-syntax/boolean_filter_passthrough.json

@@ -1,13 +1,13 @@
 [
   {
-    "query": "stack.lineno:1",
+    "query": "project_id:1",
     "result": [
       {"type": "spaces", "value": ""},
       {
         "type": "filter",
         "filter": "numeric",
         "negated": false,
-        "key": {"type": "keySimple", "value": "stack.lineno", "quoted": false},
+        "key": {"type": "keySimple", "value": "project_id", "quoted": false},
         "operator": "",
         "value": {"type": "valueNumber", "value": "1", "rawValue": 1, "unit": null}
       },

+ 2 - 2
fixtures/search-syntax/custom_explicit_tag.json

@@ -1,6 +1,6 @@
 [
   {
-    "query": "tags[fruit]:apple release:1.2.1 tags[stack.lineno]:123",
+    "query": "tags[fruit]:apple release:1.2.1 tags[project_id]:123",
     "result": [
       {"type": "spaces", "value": ""},
       {
@@ -32,7 +32,7 @@
         "key": {
           "type": "keyExplicitTag",
           "prefix": "tags",
-          "key": {"type": "keySimple", "value": "stack.lineno", "quoted": false}
+          "key": {"type": "keySimple", "value": "project_id", "quoted": false}
         },
         "operator": "",
         "value": {"type": "valueText", "value": "123", "quoted": false}

+ 2 - 2
fixtures/search-syntax/invalid_numeric_aggregate_filter.json

@@ -1,9 +1,9 @@
 [
   {
-    "query": "min(measurements.stall_count):3s",
+    "query": "min(measurements.size):3s",
     "result": [
       {"type": "spaces", "value": ""},
-      {"type": "freeText", "quoted": false, "value": "min(measurements.stall_count):3s"},
+      {"type": "freeText", "quoted": false, "value": "min(measurements.size):3s"},
       {"type": "spaces", "value": ""}
     ]
   }

+ 4 - 4
fixtures/search-syntax/invalid_numeric_fields.json

@@ -1,6 +1,6 @@
 [
   {
-    "query": "measurements.stall_count:one",
+    "query": "project.id:one",
     "result": [
       {"type": "spaces", "value": ""},
       {
@@ -11,7 +11,7 @@
           "reason": "Invalid number. Expected number then optional k, m, or b suffix (e.g. 500k)",
           "expectedType": ["numeric", "numericIn"]
         },
-        "key": {"type": "keySimple", "value": "measurements.stall_count", "quoted": false},
+        "key": {"type": "keySimple", "value": "project.id", "quoted": false},
         "operator": "",
         "value": {"type": "valueText", "value": "one", "quoted": false}
       },
@@ -19,7 +19,7 @@
     ]
   },
   {
-    "query": "stack.lineno:two",
+    "query": "issue.id:two",
     "result": [
       {"type": "spaces", "value": ""},
       {
@@ -30,7 +30,7 @@
           "reason": "Invalid number. Expected number then optional k, m, or b suffix (e.g. 500k)",
           "expectedType": ["numeric", "numericIn"]
         },
-        "key": {"type": "keySimple", "value": "stack.lineno", "quoted": false},
+        "key": {"type": "keySimple", "value": "issue.id", "quoted": false},
         "operator": "",
         "value": {"type": "valueText", "value": "two", "quoted": false}
       },

+ 10 - 10
fixtures/search-syntax/numeric_aggregate_measurements_filter.json

@@ -1,6 +1,6 @@
 [
   {
-    "query": "min(measurements.stall_count):3.1415",
+    "query": "min(measurements.size):3.1415",
     "result": [
       {"type": "spaces", "value": ""},
       {
@@ -17,7 +17,7 @@
                 "separator": "",
                 "value": {
                   "type": "keyAggregateParam",
-                  "value": "measurements.stall_count",
+                  "value": "measurements.size",
                   "quoted": false
                 }
               }
@@ -38,7 +38,7 @@
     ]
   },
   {
-    "query": "min(measurements.stall_count):>3.1415",
+    "query": "min(measurements.size):>3.1415",
     "result": [
       {"type": "spaces", "value": ""},
       {
@@ -55,7 +55,7 @@
                 "separator": "",
                 "value": {
                   "type": "keyAggregateParam",
-                  "value": "measurements.stall_count",
+                  "value": "measurements.size",
                   "quoted": false
                 }
               }
@@ -76,7 +76,7 @@
     ]
   },
   {
-    "query": "min(measurements.stall_count):<3.1415",
+    "query": "min(measurements.size):<3.1415",
     "result": [
       {"type": "spaces", "value": ""},
       {
@@ -93,7 +93,7 @@
                 "separator": "",
                 "value": {
                   "type": "keyAggregateParam",
-                  "value": "measurements.stall_count",
+                  "value": "measurements.size",
                   "quoted": false
                 }
               }
@@ -114,7 +114,7 @@
     ]
   },
   {
-    "query": "min(measurements.stall_count):<3k",
+    "query": "min(measurements.size):<3k",
     "result": [
       {"type": "spaces", "value": ""},
       {
@@ -131,7 +131,7 @@
                 "separator": "",
                 "value": {
                   "type": "keyAggregateParam",
-                  "value": "measurements.stall_count",
+                  "value": "measurements.size",
                   "quoted": false
                 }
               }
@@ -147,7 +147,7 @@
     ]
   },
   {
-    "query": "min(measurements.stall_count):2m",
+    "query": "min(measurements.size):2m",
     "result": [
       {"type": "spaces", "value": ""},
       {
@@ -164,7 +164,7 @@
                 "separator": "",
                 "value": {
                   "type": "keyAggregateParam",
-                  "value": "measurements.stall_count",
+                  "value": "measurements.size",
                   "quoted": false
                 }
               }

+ 14 - 14
fixtures/search-syntax/numeric_aggregate_op_breakdowns_filter.json

@@ -1,6 +1,6 @@
 [
   {
-    "query": "min(transaction.duration):3.1415",
+    "query": "min(spans.browser):3.1415",
     "result": [
       {
         "type": "spaces",
@@ -24,7 +24,7 @@
                 "separator": "",
                 "value": {
                   "type": "keyAggregateParam",
-                  "value": "transaction.duration",
+                  "value": "spans.browser",
                   "quoted": false
                 }
               }
@@ -54,7 +54,7 @@
     ]
   },
   {
-    "query": "min(transaction.duration):>3.1415",
+    "query": "min(spans.browser):>3.1415",
     "result": [
       {
         "type": "spaces",
@@ -78,7 +78,7 @@
                 "separator": "",
                 "value": {
                   "type": "keyAggregateParam",
-                  "value": "transaction.duration",
+                  "value": "spans.browser",
                   "quoted": false
                 }
               }
@@ -108,7 +108,7 @@
     ]
   },
   {
-    "query": "min(transaction.duration):<3.1415",
+    "query": "min(spans.browser):<3.1415",
     "result": [
       {
         "type": "spaces",
@@ -132,7 +132,7 @@
                 "separator": "",
                 "value": {
                   "type": "keyAggregateParam",
-                  "value": "transaction.duration",
+                  "value": "spans.browser",
                   "quoted": false
                 }
               }
@@ -162,7 +162,7 @@
     ]
   },
   {
-    "query": "min(measurements.stall_count):<3k",
+    "query": "min(spans.browser):<3k",
     "result": [
       {
         "type": "spaces",
@@ -186,7 +186,7 @@
                 "separator": "",
                 "value": {
                   "type": "keyAggregateParam",
-                  "value": "measurements.stall_count",
+                  "value": "spans.browser",
                   "quoted": false
                 }
               }
@@ -216,7 +216,8 @@
     ]
   },
   {
-    "query": "min(measurements.stall_count):2m",
+    "query": "min(spans.browser):2m",
+    "desc": "XXX: Questionable if this should actually be parsed as a duration? This is how it was written when moved from the original python test",
     "result": [
       {
         "type": "spaces",
@@ -224,7 +225,7 @@
       },
       {
         "type": "filter",
-        "filter": "aggregateNumeric",
+        "filter": "aggregateDuration",
         "negated": false,
         "key": {
           "type": "keyAggregate",
@@ -240,7 +241,7 @@
                 "separator": "",
                 "value": {
                   "type": "keyAggregateParam",
-                  "value": "measurements.stall_count",
+                  "value": "spans.browser",
                   "quoted": false
                 }
               }
@@ -257,9 +258,8 @@
         },
         "operator": "",
         "value": {
-          "type": "valueNumber",
-          "value": "2",
-          "rawValue": 2000000,
+          "type": "valueDuration",
+          "value": 2,
           "unit": "m"
         }
       },

+ 6 - 6
fixtures/search-syntax/numeric_filter.json

@@ -47,14 +47,14 @@
     ]
   },
   {
-    "query": "stack.lineno:-500",
+    "query": "project_id:-500",
     "result": [
       {"type": "spaces", "value": ""},
       {
         "type": "filter",
         "filter": "numeric",
         "negated": false,
-        "key": {"type": "keySimple", "value": "stack.lineno", "quoted": false},
+        "key": {"type": "keySimple", "value": "project_id", "quoted": false},
         "operator": "",
         "value": {"type": "valueNumber", "value": "-500", "rawValue": -500, "unit": null}
       },
@@ -62,14 +62,14 @@
     ]
   },
   {
-    "query": "!stack.colno:500",
+    "query": "!issue.id:500",
     "result": [
       {"type": "spaces", "value": ""},
       {
         "type": "filter",
         "filter": "numeric",
         "negated": true,
-        "key": {"type": "keySimple", "value": "stack.colno", "quoted": false},
+        "key": {"type": "keySimple", "value": "issue.id", "quoted": false},
         "operator": "",
         "value": {"type": "valueNumber", "value": "500", "rawValue": 500, "unit": null}
       },
@@ -77,14 +77,14 @@
     ]
   },
   {
-    "query": "measurements.stall_count:<500",
+    "query": "issue.id:<500",
     "result": [
       {"type": "spaces", "value": ""},
       {
         "type": "filter",
         "filter": "numeric",
         "negated": false,
-        "key": {"type": "keySimple", "value": "measurements.stall_count", "quoted": false},
+        "key": {"type": "keySimple", "value": "issue.id", "quoted": false},
         "operator": "<",
         "value": {"type": "valueNumber", "value": "500", "rawValue": 500, "unit": null}
       },

+ 2 - 2
fixtures/search-syntax/numeric_filter_with_decimals.json

@@ -1,13 +1,13 @@
 [
   {
-    "query": "stack.lineno:>3.1415",
+    "query": "transaction.duration:>3.1415",
     "result": [
       {"type": "spaces", "value": ""},
       {
         "type": "filter",
         "filter": "numeric",
         "negated": false,
-        "key": {"type": "keySimple", "value": "stack.lineno", "quoted": false},
+        "key": {"type": "keySimple", "value": "transaction.duration", "quoted": false},
         "operator": ">",
         "value": {
           "type": "valueNumber",

+ 15 - 15
fixtures/search-syntax/numeric_in_filter.json

@@ -1,13 +1,13 @@
 [
   {
-    "query": "stack.lineno:[500,501,502]",
+    "query": "project_id:[500,501,502]",
     "result": [
       {"type": "spaces", "value": ""},
       {
         "type": "filter",
         "filter": "numericIn",
         "negated": false,
-        "key": {"type": "keySimple", "value": "stack.lineno", "quoted": false},
+        "key": {"type": "keySimple", "value": "project_id", "quoted": false},
         "operator": "",
         "value": {
           "type": "valueNumberList",
@@ -46,14 +46,14 @@
     ]
   },
   {
-    "query": "stack.lineno:[500, 501,     502]",
+    "query": "project_id:[500, 501,     502]",
     "result": [
       {"type": "spaces", "value": ""},
       {
         "type": "filter",
         "filter": "numericIn",
         "negated": false,
-        "key": {"type": "keySimple", "value": "stack.lineno", "quoted": false},
+        "key": {"type": "keySimple", "value": "project_id", "quoted": false},
         "operator": "",
         "value": {
           "type": "valueNumberList",
@@ -92,14 +92,14 @@
     ]
   },
   {
-    "query": "stack.lineno:[500, 501 ,502]",
+    "query": "project_id:[500, 501 ,502]",
     "result": [
       {"type": "spaces", "value": ""},
       {
         "type": "filter",
         "filter": "numericIn",
         "negated": false,
-        "key": {"type": "keySimple", "value": "stack.lineno", "quoted": false},
+        "key": {"type": "keySimple", "value": "project_id", "quoted": false},
         "operator": "",
         "value": {
           "type": "valueNumberList",
@@ -138,14 +138,14 @@
     ]
   },
   {
-    "query": "stack.lineno:[500,501,502] stack.colno:[100]",
+    "query": "project_id:[500,501,502] issue.id:[100]",
     "result": [
       {"type": "spaces", "value": ""},
       {
         "type": "filter",
         "filter": "numericIn",
         "negated": false,
-        "key": {"type": "keySimple", "value": "stack.lineno", "quoted": false},
+        "key": {"type": "keySimple", "value": "project_id", "quoted": false},
         "operator": "",
         "value": {
           "type": "valueNumberList",
@@ -185,7 +185,7 @@
         "type": "filter",
         "filter": "numericIn",
         "negated": false,
-        "key": {"type": "keySimple", "value": "stack.colno", "quoted": false},
+        "key": {"type": "keySimple", "value": "issue.id", "quoted": false},
         "operator": "",
         "value": {
           "type": "valueNumberList",
@@ -207,14 +207,14 @@
   },
   {
     "desc": "Numeric format should still return a string if field isn't allowed",
-    "query": "stack.lineno:[500,501,502] random_field:[500,501,502]",
+    "query": "project_id:[500,501,502] random_field:[500,501,502]",
     "result": [
       {"type": "spaces", "value": ""},
       {
         "type": "filter",
         "filter": "numericIn",
         "negated": false,
-        "key": {"type": "keySimple", "value": "stack.lineno", "quoted": false},
+        "key": {"type": "keySimple", "value": "project_id", "quoted": false},
         "operator": "",
         "value": {
           "type": "valueNumberList",
@@ -278,7 +278,7 @@
     ]
   },
   {
-    "query": "stack.lineno:[500,501,]",
+    "query": "project_id:[500,501,]",
     "result": [
       {"type": "spaces", "value": ""},
       {
@@ -286,7 +286,7 @@
         "filter": "numericIn",
         "invalid": {"reason": "Lists should not have empty values"},
         "negated": false,
-        "key": {"type": "keySimple", "value": "stack.lineno", "quoted": false},
+        "key": {"type": "keySimple", "value": "project_id", "quoted": false},
         "operator": "",
         "value": {
           "type": "valueNumberList",
@@ -320,14 +320,14 @@
     ]
   },
   {
-    "query": "!stack.lineno:[500,501]",
+    "query": "!project_id:[500,501]",
     "result": [
       {"type": "spaces", "value": ""},
       {
         "type": "filter",
         "filter": "numericIn",
         "negated": true,
-        "key": {"type": "keySimple", "value": "stack.lineno", "quoted": false},
+        "key": {"type": "keySimple", "value": "project_id", "quoted": false},
         "operator": "",
         "value": {
           "type": "valueNumberList",

+ 6 - 6
fixtures/search-syntax/numeric_measurements_filter.json

@@ -1,13 +1,13 @@
 [
   {
-    "query": "measurements.stall_count:3.1415",
+    "query": "measurements.size:3.1415",
     "result": [
       {"type": "spaces", "value": ""},
       {
         "type": "filter",
         "filter": "numeric",
         "negated": false,
-        "key": {"type": "keySimple", "value": "measurements.stall_count", "quoted": false},
+        "key": {"type": "keySimple", "value": "measurements.size", "quoted": false},
         "operator": "",
         "value": {
           "type": "valueNumber",
@@ -20,14 +20,14 @@
     ]
   },
   {
-    "query": "measurements.stall_count:>3.1415",
+    "query": "measurements.size:>3.1415",
     "result": [
       {"type": "spaces", "value": ""},
       {
         "type": "filter",
         "filter": "numeric",
         "negated": false,
-        "key": {"type": "keySimple", "value": "measurements.stall_count", "quoted": false},
+        "key": {"type": "keySimple", "value": "measurements.size", "quoted": false},
         "operator": ">",
         "value": {
           "type": "valueNumber",
@@ -40,14 +40,14 @@
     ]
   },
   {
-    "query": "measurements.stall_count:<3.1415",
+    "query": "measurements.size:<3.1415",
     "result": [
       {"type": "spaces", "value": ""},
       {
         "type": "filter",
         "filter": "numeric",
         "negated": false,
-        "key": {"type": "keySimple", "value": "measurements.stall_count", "quoted": false},
+        "key": {"type": "keySimple", "value": "measurements.size", "quoted": false},
         "operator": "<",
         "value": {
           "type": "valueNumber",

Some files were not shown because too many files changed in this diff