Skip to content

Commit f9d6f7a

Browse files
carlosdelestcarlosdelest
committed
Fix merge
1 parent e9f54a1 commit f9d6f7a

File tree

12 files changed

+969
-982
lines changed

12 files changed

+969
-982
lines changed

‎x-pack/plugin/esql/src/main/antlr/EsqlBaseLexer.tokens‎

Lines changed: 2 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎x-pack/plugin/esql/src/main/antlr/EsqlBaseParser.tokens‎

Lines changed: 2 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/math/HypotEvaluator.java‎

Lines changed: 19 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/action/EsqlCapabilities.java‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -351,11 +351,6 @@ public enum Cap {
351351
*/
352352
MATCH_FUNCTION,
353353

354-
/**
355-
* MATCH function
356-
*/
357-
MATCH_FUNCTION(true),
358-
359354
/**
360355
* Don't optimize CASE IS NOT NULL function by not requiring the fields to be not null as well.
361356
* https://github.com/elastic/elasticsearch/issues/112704

‎x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/parser/EsqlBaseLexer.interp‎

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/parser/EsqlBaseLexer.java‎

Lines changed: 484 additions & 493 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/parser/EsqlBaseParser.interp‎

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)