[kql] Remove named args and unused geo functions (elastic#118973)

* [kql] Remove named args and unused geo functions * Fix tests * Re-format grammar output
TinLe · Dec 22, 2021 · 62a30ac · 62a30ac
1 parent 8d5b73a
commit 62a30ac
Show file tree

Hide file tree

Showing 14 changed files with 48 additions and 588 deletions.
diff --git a/packages/kbn-es-query/grammar/grammar.peggy b/packages/kbn-es-query/grammar/grammar.peggy
@@ -12,7 +12,6 @@
   const buildFunctionNode = nodeTypes.function.buildNodeWithArgumentNodes;
   const buildLiteralNode = nodeTypes.literal.buildNode;
   const buildWildcardNode = nodeTypes.wildcard.buildNode;
-  const buildNamedArgNode = nodeTypes.namedArg.buildNode;
   const { wildcardSymbol } = nodeTypes.wildcard;
 }
 
@@ -100,8 +99,7 @@ FieldRangeExpression
         suggestionTypes: ['conjunction']
       };
     }
-    const range = buildNamedArgNode(operator, value);
-    return buildFunctionNode('range', [field, range]);
+    return buildFunctionNode('range', [field, operator, value]);
   }
 
 FieldValueExpression

diff --git a/packages/kbn-es-query/src/kuery/ast/ast.test.ts b/packages/kbn-es-query/src/kuery/ast/ast.test.ts
@@ -174,25 +174,17 @@ describe('kuery AST API', () => {
 
     test('should support exclusive range operators', () => {
       const expected = nodeTypes.function.buildNode('and', [
-        nodeTypes.function.buildNode('range', 'bytes', {
-          gt: '1000',
-        }),
-        nodeTypes.function.buildNode('range', 'bytes', {
-          lt: '8000',
-        }),
+        nodeTypes.function.buildNode('range', 'bytes', 'gt', '1000'),
+        nodeTypes.function.buildNode('range', 'bytes', 'lt', '8000'),
       ]);
       const actual = fromKueryExpression('bytes > 1000 and bytes < 8000');
       expect(actual).toEqual(expected);
     });
 
     test('should support inclusive range operators', () => {
       const expected = nodeTypes.function.buildNode('and', [
-        nodeTypes.function.buildNode('range', 'bytes', {
-          gte: '1000',
-        }),
-        nodeTypes.function.buildNode('range', 'bytes', {
-          lte: '8000',
-        }),
+        nodeTypes.function.buildNode('range', 'bytes', 'gte', '1000'),
+        nodeTypes.function.buildNode('range', 'bytes', 'lte', '8000'),
       ]);
       const actual = fromKueryExpression('bytes >= 1000 and bytes <= 8000');
       expect(actual).toEqual(expected);

diff --git a/packages/kbn-es-query/src/kuery/functions/geo_bounding_box.test.ts b/packages/kbn-es-query/src/kuery/functions/geo_bounding_box.test.ts
diff --git a/packages/kbn-es-query/src/kuery/functions/geo_bounding_box.ts b/packages/kbn-es-query/src/kuery/functions/geo_bounding_box.ts
diff --git a/packages/kbn-es-query/src/kuery/functions/geo_polygon.test.ts b/packages/kbn-es-query/src/kuery/functions/geo_polygon.test.ts