From 7c1f0918e916535329d6b25e24d31e7fe1cbd484 Mon Sep 17 00:00:00 2001 From: Costin Leau Date: Tue, 6 Feb 2024 14:34:51 -0800 Subject: [PATCH 01/12] ESQL: Grammar - FROM METADATA no longer require [] Remove usage of [ ] through-out the grammar, in this case inside FROM METADATA. --- docs/reference/esql/metadata-fields.asciidoc | 2 +- .../esql/source-commands/from.asciidoc | 4 +- .../xpack/esql/qa/rest/RestEsqlTestCase.java | 2 +- .../src/main/resources/id.csv-spec | 18 +- .../resources/metadata-IT_tests_only.csv-spec | 30 +- .../esql/action/CrossClustersQueryIT.java | 2 +- .../xpack/esql/action/EsqlActionIT.java | 8 +- .../esql/src/main/antlr/EsqlBaseParser.g4 | 10 +- .../xpack/esql/parser/EsqlBaseParser.interp | 4 +- .../xpack/esql/parser/EsqlBaseParser.java | 1523 +++++++++-------- .../parser/EsqlBaseParserBaseListener.java | 24 + .../parser/EsqlBaseParserBaseVisitor.java | 14 + .../esql/parser/EsqlBaseParserListener.java | 20 + .../esql/parser/EsqlBaseParserVisitor.java | 12 + .../xpack/esql/parser/LogicalPlanBuilder.java | 13 +- .../optimizer/LogicalPlanOptimizerTests.java | 4 +- .../optimizer/PhysicalPlanOptimizerTests.java | 10 +- .../esql/parser/StatementParserTests.java | 21 +- .../session/IndexResolverFieldNamesTests.java | 25 +- .../rest-api-spec/test/esql/100_bug_fix.yml | 2 +- .../rest-api-spec/test/esql/30_types.yml | 8 +- .../rest-api-spec/test/esql/40_tsdb.yml | 4 +- 22 files changed, 983 insertions(+), 777 deletions(-) diff --git a/docs/reference/esql/metadata-fields.asciidoc b/docs/reference/esql/metadata-fields.asciidoc index eb08ee085de38..c5c4f31111e07 100644 --- a/docs/reference/esql/metadata-fields.asciidoc +++ b/docs/reference/esql/metadata-fields.asciidoc @@ -22,7 +22,7 @@ to be provided with a dedicated directive: [source,esql] ---- -FROM index [METADATA _index, _id] +FROM index METADATA _index, _id ---- Metadata fields are only available if the source of the data is an index. diff --git a/docs/reference/esql/source-commands/from.asciidoc b/docs/reference/esql/source-commands/from.asciidoc index 6f54a42ddad35..5263a17b48df9 100644 --- a/docs/reference/esql/source-commands/from.asciidoc +++ b/docs/reference/esql/source-commands/from.asciidoc @@ -66,9 +66,9 @@ or aliases: FROM employees-00001,other-employees-* ---- -Use the `METADATA` directive to enable <>: +Use the optional `METADATA` directive to enable <>: [source,esql] ---- -FROM employees [METADATA _id] +FROM employees METADATA _id ---- diff --git a/x-pack/plugin/esql/qa/server/src/main/java/org/elasticsearch/xpack/esql/qa/rest/RestEsqlTestCase.java b/x-pack/plugin/esql/qa/server/src/main/java/org/elasticsearch/xpack/esql/qa/rest/RestEsqlTestCase.java index 9009441945509..6dea60476c3d1 100644 --- a/x-pack/plugin/esql/qa/server/src/main/java/org/elasticsearch/xpack/esql/qa/rest/RestEsqlTestCase.java +++ b/x-pack/plugin/esql/qa/server/src/main/java/org/elasticsearch/xpack/esql/qa/rest/RestEsqlTestCase.java @@ -441,7 +441,7 @@ public void testMetadataFieldsOnMultipleIndices() throws IOException { request.setJsonEntity("{\"a\": 3}"); assertEquals(201, client().performRequest(request).getStatusLine().getStatusCode()); - var query = fromIndex() + "* [metadata _index, _version, _id] | sort _version"; + var query = fromIndex() + "* metadata _index, _version, _id | sort _version"; Map result = runEsql(new RequestObjectBuilder().query(query)); var columns = List.of( Map.of("name", "a", "type", "long"), diff --git a/x-pack/plugin/esql/qa/testFixtures/src/main/resources/id.csv-spec b/x-pack/plugin/esql/qa/testFixtures/src/main/resources/id.csv-spec index 238135ef4c53f..455303775cfa0 100644 --- a/x-pack/plugin/esql/qa/testFixtures/src/main/resources/id.csv-spec +++ b/x-pack/plugin/esql/qa/testFixtures/src/main/resources/id.csv-spec @@ -3,7 +3,7 @@ // selectAll -FROM apps [metadata _id]; +FROM apps metadata _id; ignoreOrder:true id:integer |name:keyword |version:version | _id:keyword @@ -24,21 +24,21 @@ id:integer |name:keyword |version:version | _id:keyword ; filterById -FROM apps [metadata _id]| WHERE _id == "4"; +FROM apps metadata _id| WHERE _id == "4"; id:i |name:k |version:v | _id:k 4 |ddddd |2.12.0 | 4 ; keepId -FROM apps [metadata _id] | WHERE id == 3 | KEEP _id; +FROM apps metadata _id | WHERE id == 3 | KEEP _id; _id:k 3 ; idRangeAndSort -FROM apps [metadata _id] | WHERE _id >= "2" AND _id <= "7" | SORT _id | keep id, name, _id; +FROM apps metadata _id | WHERE _id >= "2" AND _id <= "7" | SORT _id | keep id, name, _id; id:i |name:k | _id:k 2 |bbbbb | 2 @@ -50,7 +50,7 @@ id:i |name:k | _id:k ; orderById -FROM apps [metadata _id] | KEEP _id, name | SORT _id; +FROM apps metadata _id | KEEP _id, name | SORT _id; _id:k | name:s 1 | aaaaa @@ -70,7 +70,7 @@ _id:k | name:s ; orderByIdDesc -FROM apps [metadata _id] | KEEP _id, name | SORT _id DESC; +FROM apps metadata _id | KEEP _id, name | SORT _id DESC; _id:k | name:s @@ -91,7 +91,7 @@ _id:k | name:s ; concatId -FROM apps [metadata _id] | eval c = concat(_id, name) | SORT _id | KEEP c; +FROM apps metadata _id | eval c = concat(_id, name) | SORT _id | KEEP c; c:k 1aaaaa @@ -111,7 +111,7 @@ c:k ; statsOnId -FROM apps [metadata _id] | stats c = count(_id), d = count_distinct(_id); +FROM apps metadata _id | stats c = count(_id), d = count_distinct(_id); c:l | d:l 14 | 14 @@ -119,7 +119,7 @@ c:l | d:l statsOnIdByGroup -FROM apps [metadata _id] | stats c = count(_id) by name | sort c desc, name | limit 5; +FROM apps metadata _id | stats c = count(_id) by name | sort c desc, name | limit 5; c:l | name:k 2 | aaaaa diff --git a/x-pack/plugin/esql/qa/testFixtures/src/main/resources/metadata-IT_tests_only.csv-spec b/x-pack/plugin/esql/qa/testFixtures/src/main/resources/metadata-IT_tests_only.csv-spec index d89f3337c081b..72d47d4644697 100644 --- a/x-pack/plugin/esql/qa/testFixtures/src/main/resources/metadata-IT_tests_only.csv-spec +++ b/x-pack/plugin/esql/qa/testFixtures/src/main/resources/metadata-IT_tests_only.csv-spec @@ -1,6 +1,6 @@ simpleKeep -from employees [metadata _index, _version] | sort emp_no | limit 2 | keep emp_no, _index, _version; +from employees metadata _index, _version | sort emp_no | limit 2 | keep emp_no, _index, _version; emp_no:integer |_index:keyword |_version:long 10001 |employees |1 @@ -8,7 +8,7 @@ emp_no:integer |_index:keyword |_version:long ; aliasWithSameName -from employees [metadata _index, _version] | sort emp_no | limit 2 | eval _index = _index, _version = _version | keep emp_no, _index, _version; +from employees metadata _index, _version | sort emp_no | limit 2 | eval _index = _index, _version = _version | keep emp_no, _index, _version; emp_no:integer |_index:keyword |_version:long 10001 |employees |1 @@ -16,7 +16,7 @@ emp_no:integer |_index:keyword |_version:long ; inComparison -from employees [metadata _index, _version] | sort emp_no | where _index == "employees" | where _version == 1 | keep emp_no | limit 2; +from employees metadata _index, _version | sort emp_no | where _index == "employees" | where _version == 1 | keep emp_no | limit 2; emp_no:integer 10001 @@ -25,7 +25,7 @@ emp_no:integer metaIndexInAggs // tag::metaIndexInAggs[] -FROM employees [METADATA _index, _id] +FROM employees METADATA _index, _id | STATS max = MAX(emp_no) BY _index // end::metaIndexInAggs[] ; @@ -37,42 +37,42 @@ max:integer |_index:keyword ; metaIndexAliasedInAggs -from employees [metadata _index] | eval _i = _index | stats max = max(emp_no) by _i; +from employees metadata _index | eval _i = _index | stats max = max(emp_no) by _i; max:integer |_i:keyword 10100 |employees ; metaVersionInAggs -from employees [metadata _version] | stats min = min(emp_no) by _version; +from employees metadata _version | stats min = min(emp_no) by _version; min:integer |_version:long 10001 |1 ; metaVersionAliasedInAggs -from employees [metadata _version] | eval _v = _version | stats min = min(emp_no) by _v; +from employees metadata _version | eval _v = _version | stats min = min(emp_no) by _v; min:integer |_v:long 10001 |1 ; inAggsAndAsGroups -from employees [metadata _index, _version] | stats max = max(_version) by _index; +from employees metadata _index, _version | stats max = max(_version) by _index; max:long |_index:keyword 1 |employees ; inAggsAndAsGroupsAliased -from employees [metadata _index, _version] | eval _i = _index, _v = _version | stats max = max(_v) by _i; +from employees metadata _index, _version | eval _i = _index, _v = _version | stats max = max(_v) by _i; max:long |_i:keyword 1 |employees ; inFunction -from employees [metadata _index, _version] | sort emp_no | where length(_index) == length("employees") | where abs(_version) == 1 | keep emp_no | limit 2; +from employees metadata _index, _version | sort emp_no | where length(_index) == length("employees") | where abs(_version) == 1 | keep emp_no | limit 2; emp_no:integer 10001 @@ -80,14 +80,14 @@ emp_no:integer ; inArithmetics -from employees [metadata _index, _version] | eval i = _version + 2 | stats min = min(emp_no) by i; +from employees metadata _index, _version | eval i = _version + 2 | stats min = min(emp_no) by i; min:integer |i:long 10001 |3 ; inSort -from employees [metadata _index, _version] | sort _version, _index, emp_no | keep emp_no, _version, _index | limit 2; +from employees metadata _index, _version | sort _version, _index, emp_no | keep emp_no, _version, _index | limit 2; emp_no:integer |_version:long |_index:keyword 10001 |1 |employees @@ -95,14 +95,14 @@ emp_no:integer |_version:long |_index:keyword ; withMvFunction -from employees [metadata _version] | eval i = mv_avg(_version) + 2 | stats min = min(emp_no) by i; +from employees metadata _version | eval i = mv_avg(_version) + 2 | stats min = min(emp_no) by i; min:integer |i:double 10001 |3.0 ; overwritten -from employees [metadata _index, _version] | sort emp_no | eval _index = 3, _version = "version" | keep emp_no, _index, _version | limit 3; +from employees metadata _index, _version | sort emp_no | eval _index = 3, _version = "version" | keep emp_no, _index, _version | limit 3; emp_no:integer |_index:integer |_version:keyword 10001 |3 |version @@ -112,7 +112,7 @@ emp_no:integer |_index:integer |_version:keyword multipleIndices // tag::multipleIndices[] -FROM ul_logs, apps [METADATA _index, _version] +FROM ul_logs, apps metadata _index, _version | WHERE id IN (13, 14) AND _version == 1 | EVAL key = CONCAT(_index, "_", TO_STR(id)) | SORT id, _index diff --git a/x-pack/plugin/esql/src/internalClusterTest/java/org/elasticsearch/xpack/esql/action/CrossClustersQueryIT.java b/x-pack/plugin/esql/src/internalClusterTest/java/org/elasticsearch/xpack/esql/action/CrossClustersQueryIT.java index 35e019e3a140b..c9ee644040a43 100644 --- a/x-pack/plugin/esql/src/internalClusterTest/java/org/elasticsearch/xpack/esql/action/CrossClustersQueryIT.java +++ b/x-pack/plugin/esql/src/internalClusterTest/java/org/elasticsearch/xpack/esql/action/CrossClustersQueryIT.java @@ -114,7 +114,7 @@ public void testSimple() { } public void testMetadataIndex() { - try (EsqlQueryResponse resp = runQuery("FROM logs*,*:logs* [METADATA _index] | stats sum(v) by _index | sort _index")) { + try (EsqlQueryResponse resp = runQuery("FROM logs*,*:logs* METADATA _index | stats sum(v) by _index | sort _index")) { List> values = getValuesList(resp); assertThat(values.get(0), equalTo(List.of(285L, "cluster-a:logs-2"))); assertThat(values.get(1), equalTo(List.of(45L, "logs-1"))); diff --git a/x-pack/plugin/esql/src/internalClusterTest/java/org/elasticsearch/xpack/esql/action/EsqlActionIT.java b/x-pack/plugin/esql/src/internalClusterTest/java/org/elasticsearch/xpack/esql/action/EsqlActionIT.java index 3fa2c86b6ceb9..b23c75df6fa4f 100644 --- a/x-pack/plugin/esql/src/internalClusterTest/java/org/elasticsearch/xpack/esql/action/EsqlActionIT.java +++ b/x-pack/plugin/esql/src/internalClusterTest/java/org/elasticsearch/xpack/esql/action/EsqlActionIT.java @@ -1222,7 +1222,7 @@ public void testGroupingMultiValueByOrdinals() { } public void testLoadId() { - try (EsqlQueryResponse results = run("from test [metadata _id] | keep _id | sort _id ")) { + try (EsqlQueryResponse results = run("from test metadata _id | keep _id | sort _id ")) { assertThat(results.columns(), equalTo(List.of(new ColumnInfo("_id", "keyword")))); ListMatcher values = matchesList(); for (int i = 10; i < 50; i++) { @@ -1427,7 +1427,7 @@ public void testQueryOnEmptyMappingIndex() { assertEmptyIndexQueries(from); - try (EsqlQueryResponse resp = run(from + "[METADATA _source] | EVAL x = 123")) { + try (EsqlQueryResponse resp = run(from + "METADATA _source | EVAL x = 123")) { assertFalse(resp.values().hasNext()); assertThat(resp.columns(), equalTo(List.of(new ColumnInfo("_source", "_source"), new ColumnInfo("x", "integer")))); } @@ -1455,7 +1455,7 @@ public void testQueryOnEmptyDataIndex() { assertEmptyIndexQueries(from); - try (EsqlQueryResponse resp = run(from + "[METADATA _source] | EVAL x = 123")) { + try (EsqlQueryResponse resp = run(from + "METADATA _source | EVAL x = 123")) { assertFalse(resp.values().hasNext()); assertThat( resp.columns(), @@ -1470,7 +1470,7 @@ public void testQueryOnEmptyDataIndex() { } private void assertEmptyIndexQueries(String from) { - try (EsqlQueryResponse resp = run(from + "[METADATA _source] | KEEP _source | LIMIT 1")) { + try (EsqlQueryResponse resp = run(from + "METADATA _source | KEEP _source | LIMIT 1")) { assertFalse(resp.values().hasNext()); assertThat(resp.columns(), equalTo(List.of(new ColumnInfo("_source", "_source")))); } diff --git a/x-pack/plugin/esql/src/main/antlr/EsqlBaseParser.g4 b/x-pack/plugin/esql/src/main/antlr/EsqlBaseParser.g4 index 34b009c3900e8..13e9a36b8e91f 100644 --- a/x-pack/plugin/esql/src/main/antlr/EsqlBaseParser.g4 +++ b/x-pack/plugin/esql/src/main/antlr/EsqlBaseParser.g4 @@ -102,9 +102,17 @@ fromCommand ; metadata - : OPENING_BRACKET METADATA fromIdentifier (COMMA fromIdentifier)* CLOSING_BRACKET + : metadataOption + | deprecated_metadata ; +metadataOption + : METADATA fromIdentifier (COMMA fromIdentifier)* + ; + +deprecated_metadata + : OPENING_BRACKET metadataOption CLOSING_BRACKET + ; evalCommand : EVAL fields diff --git a/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/parser/EsqlBaseParser.interp b/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/parser/EsqlBaseParser.interp index 8a0a7cd0bf46e..1e4fe0763dc3f 100644 --- a/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/parser/EsqlBaseParser.interp +++ b/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/parser/EsqlBaseParser.interp @@ -229,6 +229,8 @@ fields field fromCommand metadata +metadataOption +deprecated_metadata evalCommand statsCommand inlinestatsCommand @@ -265,4 +267,4 @@ setting atn: -[4, 1, 104, 512, 2, 0, 7, 0, 2, 1, 7, 1, 2, 2, 7, 2, 2, 3, 7, 3, 2, 4, 7, 4, 2, 5, 7, 5, 2, 6, 7, 6, 2, 7, 7, 7, 2, 8, 7, 8, 2, 9, 7, 9, 2, 10, 7, 10, 2, 11, 7, 11, 2, 12, 7, 12, 2, 13, 7, 13, 2, 14, 7, 14, 2, 15, 7, 15, 2, 16, 7, 16, 2, 17, 7, 17, 2, 18, 7, 18, 2, 19, 7, 19, 2, 20, 7, 20, 2, 21, 7, 21, 2, 22, 7, 22, 2, 23, 7, 23, 2, 24, 7, 24, 2, 25, 7, 25, 2, 26, 7, 26, 2, 27, 7, 27, 2, 28, 7, 28, 2, 29, 7, 29, 2, 30, 7, 30, 2, 31, 7, 31, 2, 32, 7, 32, 2, 33, 7, 33, 2, 34, 7, 34, 2, 35, 7, 35, 2, 36, 7, 36, 2, 37, 7, 37, 2, 38, 7, 38, 2, 39, 7, 39, 2, 40, 7, 40, 2, 41, 7, 41, 2, 42, 7, 42, 2, 43, 7, 43, 2, 44, 7, 44, 2, 45, 7, 45, 2, 46, 7, 46, 2, 47, 7, 47, 2, 48, 7, 48, 1, 0, 1, 0, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 5, 1, 108, 8, 1, 10, 1, 12, 1, 111, 9, 1, 1, 2, 1, 2, 1, 2, 1, 2, 3, 2, 117, 8, 2, 1, 3, 1, 3, 1, 3, 1, 3, 1, 3, 1, 3, 1, 3, 1, 3, 1, 3, 1, 3, 1, 3, 1, 3, 1, 3, 3, 3, 132, 8, 3, 1, 4, 1, 4, 1, 4, 1, 5, 1, 5, 1, 5, 1, 5, 1, 5, 1, 5, 1, 5, 3, 5, 144, 8, 5, 1, 5, 1, 5, 1, 5, 1, 5, 1, 5, 5, 5, 151, 8, 5, 10, 5, 12, 5, 154, 9, 5, 1, 5, 1, 5, 1, 5, 1, 5, 1, 5, 3, 5, 161, 8, 5, 1, 5, 1, 5, 3, 5, 165, 8, 5, 1, 5, 1, 5, 1, 5, 1, 5, 1, 5, 1, 5, 5, 5, 173, 8, 5, 10, 5, 12, 5, 176, 9, 5, 1, 6, 1, 6, 3, 6, 180, 8, 6, 1, 6, 1, 6, 1, 6, 1, 6, 1, 6, 3, 6, 187, 8, 6, 1, 6, 1, 6, 1, 6, 3, 6, 192, 8, 6, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 3, 7, 199, 8, 7, 1, 8, 1, 8, 1, 8, 1, 8, 3, 8, 205, 8, 8, 1, 8, 1, 8, 1, 8, 1, 8, 1, 8, 1, 8, 5, 8, 213, 8, 8, 10, 8, 12, 8, 216, 9, 8, 1, 9, 1, 9, 1, 9, 1, 9, 1, 9, 1, 9, 1, 9, 3, 9, 225, 8, 9, 1, 10, 1, 10, 1, 10, 1, 10, 1, 10, 1, 10, 5, 10, 233, 8, 10, 10, 10, 12, 10, 236, 9, 10, 3, 10, 238, 8, 10, 1, 10, 1, 10, 1, 11, 1, 11, 1, 11, 1, 12, 1, 12, 1, 12, 5, 12, 248, 8, 12, 10, 12, 12, 12, 251, 9, 12, 1, 13, 1, 13, 1, 13, 1, 13, 1, 13, 3, 13, 258, 8, 13, 1, 14, 1, 14, 1, 14, 1, 14, 5, 14, 264, 8, 14, 10, 14, 12, 14, 267, 9, 14, 1, 14, 3, 14, 270, 8, 14, 1, 15, 1, 15, 1, 15, 1, 15, 1, 15, 5, 15, 277, 8, 15, 10, 15, 12, 15, 280, 9, 15, 1, 15, 1, 15, 1, 16, 1, 16, 1, 16, 1, 17, 1, 17, 3, 17, 289, 8, 17, 1, 17, 1, 17, 3, 17, 293, 8, 17, 1, 18, 1, 18, 1, 18, 1, 18, 3, 18, 299, 8, 18, 1, 19, 1, 19, 1, 20, 1, 20, 1, 20, 5, 20, 306, 8, 20, 10, 20, 12, 20, 309, 9, 20, 1, 21, 1, 21, 1, 21, 5, 21, 314, 8, 21, 10, 21, 12, 21, 317, 9, 21, 1, 22, 1, 22, 1, 23, 1, 23, 1, 24, 1, 24, 1, 24, 1, 24, 1, 24, 1, 24, 1, 24, 1, 24, 1, 24, 1, 24, 1, 24, 1, 24, 1, 24, 5, 24, 336, 8, 24, 10, 24, 12, 24, 339, 9, 24, 1, 24, 1, 24, 1, 24, 1, 24, 1, 24, 1, 24, 5, 24, 347, 8, 24, 10, 24, 12, 24, 350, 9, 24, 1, 24, 1, 24, 1, 24, 1, 24, 1, 24, 1, 24, 5, 24, 358, 8, 24, 10, 24, 12, 24, 361, 9, 24, 1, 24, 1, 24, 3, 24, 365, 8, 24, 1, 25, 1, 25, 1, 25, 1, 26, 1, 26, 1, 26, 1, 26, 5, 26, 374, 8, 26, 10, 26, 12, 26, 377, 9, 26, 1, 27, 1, 27, 3, 27, 381, 8, 27, 1, 27, 1, 27, 3, 27, 385, 8, 27, 1, 28, 1, 28, 1, 28, 1, 28, 5, 28, 391, 8, 28, 10, 28, 12, 28, 394, 9, 28, 1, 29, 1, 29, 1, 29, 1, 29, 5, 29, 400, 8, 29, 10, 29, 12, 29, 403, 9, 29, 1, 30, 1, 30, 1, 30, 1, 30, 5, 30, 409, 8, 30, 10, 30, 12, 30, 412, 9, 30, 1, 31, 1, 31, 1, 31, 1, 31, 1, 32, 1, 32, 1, 32, 1, 32, 3, 32, 422, 8, 32, 1, 33, 1, 33, 1, 33, 1, 33, 1, 34, 1, 34, 1, 34, 1, 35, 1, 35, 1, 35, 5, 35, 434, 8, 35, 10, 35, 12, 35, 437, 9, 35, 1, 36, 1, 36, 1, 36, 1, 36, 1, 37, 1, 37, 1, 38, 1, 38, 3, 38, 447, 8, 38, 1, 39, 3, 39, 450, 8, 39, 1, 39, 1, 39, 1, 40, 3, 40, 455, 8, 40, 1, 40, 1, 40, 1, 41, 1, 41, 1, 42, 1, 42, 1, 43, 1, 43, 1, 43, 1, 44, 1, 44, 1, 44, 1, 44, 1, 45, 1, 45, 1, 45, 1, 45, 3, 45, 474, 8, 45, 1, 46, 1, 46, 5, 46, 478, 8, 46, 10, 46, 12, 46, 481, 9, 46, 1, 46, 1, 46, 1, 46, 3, 46, 486, 8, 46, 1, 46, 1, 46, 1, 46, 1, 46, 5, 46, 492, 8, 46, 10, 46, 12, 46, 495, 9, 46, 3, 46, 497, 8, 46, 1, 47, 1, 47, 1, 47, 3, 47, 502, 8, 47, 1, 47, 1, 47, 1, 48, 1, 48, 1, 48, 1, 48, 1, 48, 1, 48, 1, 48, 0, 3, 2, 10, 16, 49, 0, 2, 4, 6, 8, 10, 12, 14, 16, 18, 20, 22, 24, 26, 28, 30, 32, 34, 36, 38, 40, 42, 44, 46, 48, 50, 52, 54, 56, 58, 60, 62, 64, 66, 68, 70, 72, 74, 76, 78, 80, 82, 84, 86, 88, 90, 92, 94, 96, 0, 9, 1, 0, 58, 59, 1, 0, 60, 62, 2, 0, 66, 66, 71, 71, 1, 0, 65, 66, 2, 0, 66, 66, 75, 75, 2, 0, 31, 31, 34, 34, 1, 0, 37, 38, 2, 0, 36, 36, 50, 50, 1, 0, 51, 57, 539, 0, 98, 1, 0, 0, 0, 2, 101, 1, 0, 0, 0, 4, 116, 1, 0, 0, 0, 6, 131, 1, 0, 0, 0, 8, 133, 1, 0, 0, 0, 10, 164, 1, 0, 0, 0, 12, 191, 1, 0, 0, 0, 14, 198, 1, 0, 0, 0, 16, 204, 1, 0, 0, 0, 18, 224, 1, 0, 0, 0, 20, 226, 1, 0, 0, 0, 22, 241, 1, 0, 0, 0, 24, 244, 1, 0, 0, 0, 26, 257, 1, 0, 0, 0, 28, 259, 1, 0, 0, 0, 30, 271, 1, 0, 0, 0, 32, 283, 1, 0, 0, 0, 34, 286, 1, 0, 0, 0, 36, 294, 1, 0, 0, 0, 38, 300, 1, 0, 0, 0, 40, 302, 1, 0, 0, 0, 42, 310, 1, 0, 0, 0, 44, 318, 1, 0, 0, 0, 46, 320, 1, 0, 0, 0, 48, 364, 1, 0, 0, 0, 50, 366, 1, 0, 0, 0, 52, 369, 1, 0, 0, 0, 54, 378, 1, 0, 0, 0, 56, 386, 1, 0, 0, 0, 58, 395, 1, 0, 0, 0, 60, 404, 1, 0, 0, 0, 62, 413, 1, 0, 0, 0, 64, 417, 1, 0, 0, 0, 66, 423, 1, 0, 0, 0, 68, 427, 1, 0, 0, 0, 70, 430, 1, 0, 0, 0, 72, 438, 1, 0, 0, 0, 74, 442, 1, 0, 0, 0, 76, 446, 1, 0, 0, 0, 78, 449, 1, 0, 0, 0, 80, 454, 1, 0, 0, 0, 82, 458, 1, 0, 0, 0, 84, 460, 1, 0, 0, 0, 86, 462, 1, 0, 0, 0, 88, 465, 1, 0, 0, 0, 90, 473, 1, 0, 0, 0, 92, 475, 1, 0, 0, 0, 94, 501, 1, 0, 0, 0, 96, 505, 1, 0, 0, 0, 98, 99, 3, 2, 1, 0, 99, 100, 5, 0, 0, 1, 100, 1, 1, 0, 0, 0, 101, 102, 6, 1, -1, 0, 102, 103, 3, 4, 2, 0, 103, 109, 1, 0, 0, 0, 104, 105, 10, 1, 0, 0, 105, 106, 5, 25, 0, 0, 106, 108, 3, 6, 3, 0, 107, 104, 1, 0, 0, 0, 108, 111, 1, 0, 0, 0, 109, 107, 1, 0, 0, 0, 109, 110, 1, 0, 0, 0, 110, 3, 1, 0, 0, 0, 111, 109, 1, 0, 0, 0, 112, 117, 3, 86, 43, 0, 113, 117, 3, 28, 14, 0, 114, 117, 3, 22, 11, 0, 115, 117, 3, 90, 45, 0, 116, 112, 1, 0, 0, 0, 116, 113, 1, 0, 0, 0, 116, 114, 1, 0, 0, 0, 116, 115, 1, 0, 0, 0, 117, 5, 1, 0, 0, 0, 118, 132, 3, 32, 16, 0, 119, 132, 3, 36, 18, 0, 120, 132, 3, 50, 25, 0, 121, 132, 3, 56, 28, 0, 122, 132, 3, 52, 26, 0, 123, 132, 3, 34, 17, 0, 124, 132, 3, 8, 4, 0, 125, 132, 3, 58, 29, 0, 126, 132, 3, 60, 30, 0, 127, 132, 3, 64, 32, 0, 128, 132, 3, 66, 33, 0, 129, 132, 3, 92, 46, 0, 130, 132, 3, 68, 34, 0, 131, 118, 1, 0, 0, 0, 131, 119, 1, 0, 0, 0, 131, 120, 1, 0, 0, 0, 131, 121, 1, 0, 0, 0, 131, 122, 1, 0, 0, 0, 131, 123, 1, 0, 0, 0, 131, 124, 1, 0, 0, 0, 131, 125, 1, 0, 0, 0, 131, 126, 1, 0, 0, 0, 131, 127, 1, 0, 0, 0, 131, 128, 1, 0, 0, 0, 131, 129, 1, 0, 0, 0, 131, 130, 1, 0, 0, 0, 132, 7, 1, 0, 0, 0, 133, 134, 5, 17, 0, 0, 134, 135, 3, 10, 5, 0, 135, 9, 1, 0, 0, 0, 136, 137, 6, 5, -1, 0, 137, 138, 5, 43, 0, 0, 138, 165, 3, 10, 5, 7, 139, 165, 3, 14, 7, 0, 140, 165, 3, 12, 6, 0, 141, 143, 3, 14, 7, 0, 142, 144, 5, 43, 0, 0, 143, 142, 1, 0, 0, 0, 143, 144, 1, 0, 0, 0, 144, 145, 1, 0, 0, 0, 145, 146, 5, 40, 0, 0, 146, 147, 5, 39, 0, 0, 147, 152, 3, 14, 7, 0, 148, 149, 5, 33, 0, 0, 149, 151, 3, 14, 7, 0, 150, 148, 1, 0, 0, 0, 151, 154, 1, 0, 0, 0, 152, 150, 1, 0, 0, 0, 152, 153, 1, 0, 0, 0, 153, 155, 1, 0, 0, 0, 154, 152, 1, 0, 0, 0, 155, 156, 5, 49, 0, 0, 156, 165, 1, 0, 0, 0, 157, 158, 3, 14, 7, 0, 158, 160, 5, 41, 0, 0, 159, 161, 5, 43, 0, 0, 160, 159, 1, 0, 0, 0, 160, 161, 1, 0, 0, 0, 161, 162, 1, 0, 0, 0, 162, 163, 5, 44, 0, 0, 163, 165, 1, 0, 0, 0, 164, 136, 1, 0, 0, 0, 164, 139, 1, 0, 0, 0, 164, 140, 1, 0, 0, 0, 164, 141, 1, 0, 0, 0, 164, 157, 1, 0, 0, 0, 165, 174, 1, 0, 0, 0, 166, 167, 10, 4, 0, 0, 167, 168, 5, 30, 0, 0, 168, 173, 3, 10, 5, 5, 169, 170, 10, 3, 0, 0, 170, 171, 5, 46, 0, 0, 171, 173, 3, 10, 5, 4, 172, 166, 1, 0, 0, 0, 172, 169, 1, 0, 0, 0, 173, 176, 1, 0, 0, 0, 174, 172, 1, 0, 0, 0, 174, 175, 1, 0, 0, 0, 175, 11, 1, 0, 0, 0, 176, 174, 1, 0, 0, 0, 177, 179, 3, 14, 7, 0, 178, 180, 5, 43, 0, 0, 179, 178, 1, 0, 0, 0, 179, 180, 1, 0, 0, 0, 180, 181, 1, 0, 0, 0, 181, 182, 5, 42, 0, 0, 182, 183, 3, 82, 41, 0, 183, 192, 1, 0, 0, 0, 184, 186, 3, 14, 7, 0, 185, 187, 5, 43, 0, 0, 186, 185, 1, 0, 0, 0, 186, 187, 1, 0, 0, 0, 187, 188, 1, 0, 0, 0, 188, 189, 5, 48, 0, 0, 189, 190, 3, 82, 41, 0, 190, 192, 1, 0, 0, 0, 191, 177, 1, 0, 0, 0, 191, 184, 1, 0, 0, 0, 192, 13, 1, 0, 0, 0, 193, 199, 3, 16, 8, 0, 194, 195, 3, 16, 8, 0, 195, 196, 3, 84, 42, 0, 196, 197, 3, 16, 8, 0, 197, 199, 1, 0, 0, 0, 198, 193, 1, 0, 0, 0, 198, 194, 1, 0, 0, 0, 199, 15, 1, 0, 0, 0, 200, 201, 6, 8, -1, 0, 201, 205, 3, 18, 9, 0, 202, 203, 7, 0, 0, 0, 203, 205, 3, 16, 8, 3, 204, 200, 1, 0, 0, 0, 204, 202, 1, 0, 0, 0, 205, 214, 1, 0, 0, 0, 206, 207, 10, 2, 0, 0, 207, 208, 7, 1, 0, 0, 208, 213, 3, 16, 8, 3, 209, 210, 10, 1, 0, 0, 210, 211, 7, 0, 0, 0, 211, 213, 3, 16, 8, 2, 212, 206, 1, 0, 0, 0, 212, 209, 1, 0, 0, 0, 213, 216, 1, 0, 0, 0, 214, 212, 1, 0, 0, 0, 214, 215, 1, 0, 0, 0, 215, 17, 1, 0, 0, 0, 216, 214, 1, 0, 0, 0, 217, 225, 3, 48, 24, 0, 218, 225, 3, 40, 20, 0, 219, 225, 3, 20, 10, 0, 220, 221, 5, 39, 0, 0, 221, 222, 3, 10, 5, 0, 222, 223, 5, 49, 0, 0, 223, 225, 1, 0, 0, 0, 224, 217, 1, 0, 0, 0, 224, 218, 1, 0, 0, 0, 224, 219, 1, 0, 0, 0, 224, 220, 1, 0, 0, 0, 225, 19, 1, 0, 0, 0, 226, 227, 3, 44, 22, 0, 227, 237, 5, 39, 0, 0, 228, 238, 5, 60, 0, 0, 229, 234, 3, 10, 5, 0, 230, 231, 5, 33, 0, 0, 231, 233, 3, 10, 5, 0, 232, 230, 1, 0, 0, 0, 233, 236, 1, 0, 0, 0, 234, 232, 1, 0, 0, 0, 234, 235, 1, 0, 0, 0, 235, 238, 1, 0, 0, 0, 236, 234, 1, 0, 0, 0, 237, 228, 1, 0, 0, 0, 237, 229, 1, 0, 0, 0, 237, 238, 1, 0, 0, 0, 238, 239, 1, 0, 0, 0, 239, 240, 5, 49, 0, 0, 240, 21, 1, 0, 0, 0, 241, 242, 5, 13, 0, 0, 242, 243, 3, 24, 12, 0, 243, 23, 1, 0, 0, 0, 244, 249, 3, 26, 13, 0, 245, 246, 5, 33, 0, 0, 246, 248, 3, 26, 13, 0, 247, 245, 1, 0, 0, 0, 248, 251, 1, 0, 0, 0, 249, 247, 1, 0, 0, 0, 249, 250, 1, 0, 0, 0, 250, 25, 1, 0, 0, 0, 251, 249, 1, 0, 0, 0, 252, 258, 3, 10, 5, 0, 253, 254, 3, 40, 20, 0, 254, 255, 5, 32, 0, 0, 255, 256, 3, 10, 5, 0, 256, 258, 1, 0, 0, 0, 257, 252, 1, 0, 0, 0, 257, 253, 1, 0, 0, 0, 258, 27, 1, 0, 0, 0, 259, 260, 5, 6, 0, 0, 260, 265, 3, 38, 19, 0, 261, 262, 5, 33, 0, 0, 262, 264, 3, 38, 19, 0, 263, 261, 1, 0, 0, 0, 264, 267, 1, 0, 0, 0, 265, 263, 1, 0, 0, 0, 265, 266, 1, 0, 0, 0, 266, 269, 1, 0, 0, 0, 267, 265, 1, 0, 0, 0, 268, 270, 3, 30, 15, 0, 269, 268, 1, 0, 0, 0, 269, 270, 1, 0, 0, 0, 270, 29, 1, 0, 0, 0, 271, 272, 5, 63, 0, 0, 272, 273, 5, 70, 0, 0, 273, 278, 3, 38, 19, 0, 274, 275, 5, 33, 0, 0, 275, 277, 3, 38, 19, 0, 276, 274, 1, 0, 0, 0, 277, 280, 1, 0, 0, 0, 278, 276, 1, 0, 0, 0, 278, 279, 1, 0, 0, 0, 279, 281, 1, 0, 0, 0, 280, 278, 1, 0, 0, 0, 281, 282, 5, 64, 0, 0, 282, 31, 1, 0, 0, 0, 283, 284, 5, 4, 0, 0, 284, 285, 3, 24, 12, 0, 285, 33, 1, 0, 0, 0, 286, 288, 5, 16, 0, 0, 287, 289, 3, 24, 12, 0, 288, 287, 1, 0, 0, 0, 288, 289, 1, 0, 0, 0, 289, 292, 1, 0, 0, 0, 290, 291, 5, 29, 0, 0, 291, 293, 3, 24, 12, 0, 292, 290, 1, 0, 0, 0, 292, 293, 1, 0, 0, 0, 293, 35, 1, 0, 0, 0, 294, 295, 5, 8, 0, 0, 295, 298, 3, 24, 12, 0, 296, 297, 5, 29, 0, 0, 297, 299, 3, 24, 12, 0, 298, 296, 1, 0, 0, 0, 298, 299, 1, 0, 0, 0, 299, 37, 1, 0, 0, 0, 300, 301, 7, 2, 0, 0, 301, 39, 1, 0, 0, 0, 302, 307, 3, 44, 22, 0, 303, 304, 5, 35, 0, 0, 304, 306, 3, 44, 22, 0, 305, 303, 1, 0, 0, 0, 306, 309, 1, 0, 0, 0, 307, 305, 1, 0, 0, 0, 307, 308, 1, 0, 0, 0, 308, 41, 1, 0, 0, 0, 309, 307, 1, 0, 0, 0, 310, 315, 3, 46, 23, 0, 311, 312, 5, 35, 0, 0, 312, 314, 3, 46, 23, 0, 313, 311, 1, 0, 0, 0, 314, 317, 1, 0, 0, 0, 315, 313, 1, 0, 0, 0, 315, 316, 1, 0, 0, 0, 316, 43, 1, 0, 0, 0, 317, 315, 1, 0, 0, 0, 318, 319, 7, 3, 0, 0, 319, 45, 1, 0, 0, 0, 320, 321, 7, 4, 0, 0, 321, 47, 1, 0, 0, 0, 322, 365, 5, 44, 0, 0, 323, 324, 3, 80, 40, 0, 324, 325, 5, 65, 0, 0, 325, 365, 1, 0, 0, 0, 326, 365, 3, 78, 39, 0, 327, 365, 3, 80, 40, 0, 328, 365, 3, 74, 37, 0, 329, 365, 5, 47, 0, 0, 330, 365, 3, 82, 41, 0, 331, 332, 5, 63, 0, 0, 332, 337, 3, 76, 38, 0, 333, 334, 5, 33, 0, 0, 334, 336, 3, 76, 38, 0, 335, 333, 1, 0, 0, 0, 336, 339, 1, 0, 0, 0, 337, 335, 1, 0, 0, 0, 337, 338, 1, 0, 0, 0, 338, 340, 1, 0, 0, 0, 339, 337, 1, 0, 0, 0, 340, 341, 5, 64, 0, 0, 341, 365, 1, 0, 0, 0, 342, 343, 5, 63, 0, 0, 343, 348, 3, 74, 37, 0, 344, 345, 5, 33, 0, 0, 345, 347, 3, 74, 37, 0, 346, 344, 1, 0, 0, 0, 347, 350, 1, 0, 0, 0, 348, 346, 1, 0, 0, 0, 348, 349, 1, 0, 0, 0, 349, 351, 1, 0, 0, 0, 350, 348, 1, 0, 0, 0, 351, 352, 5, 64, 0, 0, 352, 365, 1, 0, 0, 0, 353, 354, 5, 63, 0, 0, 354, 359, 3, 82, 41, 0, 355, 356, 5, 33, 0, 0, 356, 358, 3, 82, 41, 0, 357, 355, 1, 0, 0, 0, 358, 361, 1, 0, 0, 0, 359, 357, 1, 0, 0, 0, 359, 360, 1, 0, 0, 0, 360, 362, 1, 0, 0, 0, 361, 359, 1, 0, 0, 0, 362, 363, 5, 64, 0, 0, 363, 365, 1, 0, 0, 0, 364, 322, 1, 0, 0, 0, 364, 323, 1, 0, 0, 0, 364, 326, 1, 0, 0, 0, 364, 327, 1, 0, 0, 0, 364, 328, 1, 0, 0, 0, 364, 329, 1, 0, 0, 0, 364, 330, 1, 0, 0, 0, 364, 331, 1, 0, 0, 0, 364, 342, 1, 0, 0, 0, 364, 353, 1, 0, 0, 0, 365, 49, 1, 0, 0, 0, 366, 367, 5, 10, 0, 0, 367, 368, 5, 27, 0, 0, 368, 51, 1, 0, 0, 0, 369, 370, 5, 15, 0, 0, 370, 375, 3, 54, 27, 0, 371, 372, 5, 33, 0, 0, 372, 374, 3, 54, 27, 0, 373, 371, 1, 0, 0, 0, 374, 377, 1, 0, 0, 0, 375, 373, 1, 0, 0, 0, 375, 376, 1, 0, 0, 0, 376, 53, 1, 0, 0, 0, 377, 375, 1, 0, 0, 0, 378, 380, 3, 10, 5, 0, 379, 381, 7, 5, 0, 0, 380, 379, 1, 0, 0, 0, 380, 381, 1, 0, 0, 0, 381, 384, 1, 0, 0, 0, 382, 383, 5, 45, 0, 0, 383, 385, 7, 6, 0, 0, 384, 382, 1, 0, 0, 0, 384, 385, 1, 0, 0, 0, 385, 55, 1, 0, 0, 0, 386, 387, 5, 9, 0, 0, 387, 392, 3, 42, 21, 0, 388, 389, 5, 33, 0, 0, 389, 391, 3, 42, 21, 0, 390, 388, 1, 0, 0, 0, 391, 394, 1, 0, 0, 0, 392, 390, 1, 0, 0, 0, 392, 393, 1, 0, 0, 0, 393, 57, 1, 0, 0, 0, 394, 392, 1, 0, 0, 0, 395, 396, 5, 2, 0, 0, 396, 401, 3, 42, 21, 0, 397, 398, 5, 33, 0, 0, 398, 400, 3, 42, 21, 0, 399, 397, 1, 0, 0, 0, 400, 403, 1, 0, 0, 0, 401, 399, 1, 0, 0, 0, 401, 402, 1, 0, 0, 0, 402, 59, 1, 0, 0, 0, 403, 401, 1, 0, 0, 0, 404, 405, 5, 12, 0, 0, 405, 410, 3, 62, 31, 0, 406, 407, 5, 33, 0, 0, 407, 409, 3, 62, 31, 0, 408, 406, 1, 0, 0, 0, 409, 412, 1, 0, 0, 0, 410, 408, 1, 0, 0, 0, 410, 411, 1, 0, 0, 0, 411, 61, 1, 0, 0, 0, 412, 410, 1, 0, 0, 0, 413, 414, 3, 42, 21, 0, 414, 415, 5, 79, 0, 0, 415, 416, 3, 42, 21, 0, 416, 63, 1, 0, 0, 0, 417, 418, 5, 1, 0, 0, 418, 419, 3, 18, 9, 0, 419, 421, 3, 82, 41, 0, 420, 422, 3, 70, 35, 0, 421, 420, 1, 0, 0, 0, 421, 422, 1, 0, 0, 0, 422, 65, 1, 0, 0, 0, 423, 424, 5, 7, 0, 0, 424, 425, 3, 18, 9, 0, 425, 426, 3, 82, 41, 0, 426, 67, 1, 0, 0, 0, 427, 428, 5, 11, 0, 0, 428, 429, 3, 40, 20, 0, 429, 69, 1, 0, 0, 0, 430, 435, 3, 72, 36, 0, 431, 432, 5, 33, 0, 0, 432, 434, 3, 72, 36, 0, 433, 431, 1, 0, 0, 0, 434, 437, 1, 0, 0, 0, 435, 433, 1, 0, 0, 0, 435, 436, 1, 0, 0, 0, 436, 71, 1, 0, 0, 0, 437, 435, 1, 0, 0, 0, 438, 439, 3, 44, 22, 0, 439, 440, 5, 32, 0, 0, 440, 441, 3, 48, 24, 0, 441, 73, 1, 0, 0, 0, 442, 443, 7, 7, 0, 0, 443, 75, 1, 0, 0, 0, 444, 447, 3, 78, 39, 0, 445, 447, 3, 80, 40, 0, 446, 444, 1, 0, 0, 0, 446, 445, 1, 0, 0, 0, 447, 77, 1, 0, 0, 0, 448, 450, 7, 0, 0, 0, 449, 448, 1, 0, 0, 0, 449, 450, 1, 0, 0, 0, 450, 451, 1, 0, 0, 0, 451, 452, 5, 28, 0, 0, 452, 79, 1, 0, 0, 0, 453, 455, 7, 0, 0, 0, 454, 453, 1, 0, 0, 0, 454, 455, 1, 0, 0, 0, 455, 456, 1, 0, 0, 0, 456, 457, 5, 27, 0, 0, 457, 81, 1, 0, 0, 0, 458, 459, 5, 26, 0, 0, 459, 83, 1, 0, 0, 0, 460, 461, 7, 8, 0, 0, 461, 85, 1, 0, 0, 0, 462, 463, 5, 5, 0, 0, 463, 464, 3, 88, 44, 0, 464, 87, 1, 0, 0, 0, 465, 466, 5, 63, 0, 0, 466, 467, 3, 2, 1, 0, 467, 468, 5, 64, 0, 0, 468, 89, 1, 0, 0, 0, 469, 470, 5, 14, 0, 0, 470, 474, 5, 95, 0, 0, 471, 472, 5, 14, 0, 0, 472, 474, 5, 96, 0, 0, 473, 469, 1, 0, 0, 0, 473, 471, 1, 0, 0, 0, 474, 91, 1, 0, 0, 0, 475, 479, 5, 3, 0, 0, 476, 478, 3, 96, 48, 0, 477, 476, 1, 0, 0, 0, 478, 481, 1, 0, 0, 0, 479, 477, 1, 0, 0, 0, 479, 480, 1, 0, 0, 0, 480, 482, 1, 0, 0, 0, 481, 479, 1, 0, 0, 0, 482, 485, 5, 85, 0, 0, 483, 484, 5, 83, 0, 0, 484, 486, 3, 42, 21, 0, 485, 483, 1, 0, 0, 0, 485, 486, 1, 0, 0, 0, 486, 496, 1, 0, 0, 0, 487, 488, 5, 84, 0, 0, 488, 493, 3, 94, 47, 0, 489, 490, 5, 33, 0, 0, 490, 492, 3, 94, 47, 0, 491, 489, 1, 0, 0, 0, 492, 495, 1, 0, 0, 0, 493, 491, 1, 0, 0, 0, 493, 494, 1, 0, 0, 0, 494, 497, 1, 0, 0, 0, 495, 493, 1, 0, 0, 0, 496, 487, 1, 0, 0, 0, 496, 497, 1, 0, 0, 0, 497, 93, 1, 0, 0, 0, 498, 499, 3, 42, 21, 0, 499, 500, 5, 32, 0, 0, 500, 502, 1, 0, 0, 0, 501, 498, 1, 0, 0, 0, 501, 502, 1, 0, 0, 0, 502, 503, 1, 0, 0, 0, 503, 504, 3, 42, 21, 0, 504, 95, 1, 0, 0, 0, 505, 506, 5, 63, 0, 0, 506, 507, 5, 101, 0, 0, 507, 508, 5, 100, 0, 0, 508, 509, 5, 101, 0, 0, 509, 510, 5, 64, 0, 0, 510, 97, 1, 0, 0, 0, 50, 109, 116, 131, 143, 152, 160, 164, 172, 174, 179, 186, 191, 198, 204, 212, 214, 224, 234, 237, 249, 257, 265, 269, 278, 288, 292, 298, 307, 315, 337, 348, 359, 364, 375, 380, 384, 392, 401, 410, 421, 435, 446, 449, 454, 473, 479, 485, 493, 496, 501] \ No newline at end of file +[4, 1, 104, 521, 2, 0, 7, 0, 2, 1, 7, 1, 2, 2, 7, 2, 2, 3, 7, 3, 2, 4, 7, 4, 2, 5, 7, 5, 2, 6, 7, 6, 2, 7, 7, 7, 2, 8, 7, 8, 2, 9, 7, 9, 2, 10, 7, 10, 2, 11, 7, 11, 2, 12, 7, 12, 2, 13, 7, 13, 2, 14, 7, 14, 2, 15, 7, 15, 2, 16, 7, 16, 2, 17, 7, 17, 2, 18, 7, 18, 2, 19, 7, 19, 2, 20, 7, 20, 2, 21, 7, 21, 2, 22, 7, 22, 2, 23, 7, 23, 2, 24, 7, 24, 2, 25, 7, 25, 2, 26, 7, 26, 2, 27, 7, 27, 2, 28, 7, 28, 2, 29, 7, 29, 2, 30, 7, 30, 2, 31, 7, 31, 2, 32, 7, 32, 2, 33, 7, 33, 2, 34, 7, 34, 2, 35, 7, 35, 2, 36, 7, 36, 2, 37, 7, 37, 2, 38, 7, 38, 2, 39, 7, 39, 2, 40, 7, 40, 2, 41, 7, 41, 2, 42, 7, 42, 2, 43, 7, 43, 2, 44, 7, 44, 2, 45, 7, 45, 2, 46, 7, 46, 2, 47, 7, 47, 2, 48, 7, 48, 2, 49, 7, 49, 2, 50, 7, 50, 1, 0, 1, 0, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 5, 1, 112, 8, 1, 10, 1, 12, 1, 115, 9, 1, 1, 2, 1, 2, 1, 2, 1, 2, 3, 2, 121, 8, 2, 1, 3, 1, 3, 1, 3, 1, 3, 1, 3, 1, 3, 1, 3, 1, 3, 1, 3, 1, 3, 1, 3, 1, 3, 1, 3, 3, 3, 136, 8, 3, 1, 4, 1, 4, 1, 4, 1, 5, 1, 5, 1, 5, 1, 5, 1, 5, 1, 5, 1, 5, 3, 5, 148, 8, 5, 1, 5, 1, 5, 1, 5, 1, 5, 1, 5, 5, 5, 155, 8, 5, 10, 5, 12, 5, 158, 9, 5, 1, 5, 1, 5, 1, 5, 1, 5, 1, 5, 3, 5, 165, 8, 5, 1, 5, 1, 5, 3, 5, 169, 8, 5, 1, 5, 1, 5, 1, 5, 1, 5, 1, 5, 1, 5, 5, 5, 177, 8, 5, 10, 5, 12, 5, 180, 9, 5, 1, 6, 1, 6, 3, 6, 184, 8, 6, 1, 6, 1, 6, 1, 6, 1, 6, 1, 6, 3, 6, 191, 8, 6, 1, 6, 1, 6, 1, 6, 3, 6, 196, 8, 6, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 3, 7, 203, 8, 7, 1, 8, 1, 8, 1, 8, 1, 8, 3, 8, 209, 8, 8, 1, 8, 1, 8, 1, 8, 1, 8, 1, 8, 1, 8, 5, 8, 217, 8, 8, 10, 8, 12, 8, 220, 9, 8, 1, 9, 1, 9, 1, 9, 1, 9, 1, 9, 1, 9, 1, 9, 3, 9, 229, 8, 9, 1, 10, 1, 10, 1, 10, 1, 10, 1, 10, 1, 10, 5, 10, 237, 8, 10, 10, 10, 12, 10, 240, 9, 10, 3, 10, 242, 8, 10, 1, 10, 1, 10, 1, 11, 1, 11, 1, 11, 1, 12, 1, 12, 1, 12, 5, 12, 252, 8, 12, 10, 12, 12, 12, 255, 9, 12, 1, 13, 1, 13, 1, 13, 1, 13, 1, 13, 3, 13, 262, 8, 13, 1, 14, 1, 14, 1, 14, 1, 14, 5, 14, 268, 8, 14, 10, 14, 12, 14, 271, 9, 14, 1, 14, 3, 14, 274, 8, 14, 1, 15, 1, 15, 3, 15, 278, 8, 15, 1, 16, 1, 16, 1, 16, 1, 16, 5, 16, 284, 8, 16, 10, 16, 12, 16, 287, 9, 16, 1, 17, 1, 17, 1, 17, 1, 17, 1, 18, 1, 18, 1, 18, 1, 19, 1, 19, 3, 19, 298, 8, 19, 1, 19, 1, 19, 3, 19, 302, 8, 19, 1, 20, 1, 20, 1, 20, 1, 20, 3, 20, 308, 8, 20, 1, 21, 1, 21, 1, 22, 1, 22, 1, 22, 5, 22, 315, 8, 22, 10, 22, 12, 22, 318, 9, 22, 1, 23, 1, 23, 1, 23, 5, 23, 323, 8, 23, 10, 23, 12, 23, 326, 9, 23, 1, 24, 1, 24, 1, 25, 1, 25, 1, 26, 1, 26, 1, 26, 1, 26, 1, 26, 1, 26, 1, 26, 1, 26, 1, 26, 1, 26, 1, 26, 1, 26, 1, 26, 5, 26, 345, 8, 26, 10, 26, 12, 26, 348, 9, 26, 1, 26, 1, 26, 1, 26, 1, 26, 1, 26, 1, 26, 5, 26, 356, 8, 26, 10, 26, 12, 26, 359, 9, 26, 1, 26, 1, 26, 1, 26, 1, 26, 1, 26, 1, 26, 5, 26, 367, 8, 26, 10, 26, 12, 26, 370, 9, 26, 1, 26, 1, 26, 3, 26, 374, 8, 26, 1, 27, 1, 27, 1, 27, 1, 28, 1, 28, 1, 28, 1, 28, 5, 28, 383, 8, 28, 10, 28, 12, 28, 386, 9, 28, 1, 29, 1, 29, 3, 29, 390, 8, 29, 1, 29, 1, 29, 3, 29, 394, 8, 29, 1, 30, 1, 30, 1, 30, 1, 30, 5, 30, 400, 8, 30, 10, 30, 12, 30, 403, 9, 30, 1, 31, 1, 31, 1, 31, 1, 31, 5, 31, 409, 8, 31, 10, 31, 12, 31, 412, 9, 31, 1, 32, 1, 32, 1, 32, 1, 32, 5, 32, 418, 8, 32, 10, 32, 12, 32, 421, 9, 32, 1, 33, 1, 33, 1, 33, 1, 33, 1, 34, 1, 34, 1, 34, 1, 34, 3, 34, 431, 8, 34, 1, 35, 1, 35, 1, 35, 1, 35, 1, 36, 1, 36, 1, 36, 1, 37, 1, 37, 1, 37, 5, 37, 443, 8, 37, 10, 37, 12, 37, 446, 9, 37, 1, 38, 1, 38, 1, 38, 1, 38, 1, 39, 1, 39, 1, 40, 1, 40, 3, 40, 456, 8, 40, 1, 41, 3, 41, 459, 8, 41, 1, 41, 1, 41, 1, 42, 3, 42, 464, 8, 42, 1, 42, 1, 42, 1, 43, 1, 43, 1, 44, 1, 44, 1, 45, 1, 45, 1, 45, 1, 46, 1, 46, 1, 46, 1, 46, 1, 47, 1, 47, 1, 47, 1, 47, 3, 47, 483, 8, 47, 1, 48, 1, 48, 5, 48, 487, 8, 48, 10, 48, 12, 48, 490, 9, 48, 1, 48, 1, 48, 1, 48, 3, 48, 495, 8, 48, 1, 48, 1, 48, 1, 48, 1, 48, 5, 48, 501, 8, 48, 10, 48, 12, 48, 504, 9, 48, 3, 48, 506, 8, 48, 1, 49, 1, 49, 1, 49, 3, 49, 511, 8, 49, 1, 49, 1, 49, 1, 50, 1, 50, 1, 50, 1, 50, 1, 50, 1, 50, 1, 50, 0, 3, 2, 10, 16, 51, 0, 2, 4, 6, 8, 10, 12, 14, 16, 18, 20, 22, 24, 26, 28, 30, 32, 34, 36, 38, 40, 42, 44, 46, 48, 50, 52, 54, 56, 58, 60, 62, 64, 66, 68, 70, 72, 74, 76, 78, 80, 82, 84, 86, 88, 90, 92, 94, 96, 98, 100, 0, 9, 1, 0, 58, 59, 1, 0, 60, 62, 2, 0, 66, 66, 71, 71, 1, 0, 65, 66, 2, 0, 66, 66, 75, 75, 2, 0, 31, 31, 34, 34, 1, 0, 37, 38, 2, 0, 36, 36, 50, 50, 1, 0, 51, 57, 547, 0, 102, 1, 0, 0, 0, 2, 105, 1, 0, 0, 0, 4, 120, 1, 0, 0, 0, 6, 135, 1, 0, 0, 0, 8, 137, 1, 0, 0, 0, 10, 168, 1, 0, 0, 0, 12, 195, 1, 0, 0, 0, 14, 202, 1, 0, 0, 0, 16, 208, 1, 0, 0, 0, 18, 228, 1, 0, 0, 0, 20, 230, 1, 0, 0, 0, 22, 245, 1, 0, 0, 0, 24, 248, 1, 0, 0, 0, 26, 261, 1, 0, 0, 0, 28, 263, 1, 0, 0, 0, 30, 277, 1, 0, 0, 0, 32, 279, 1, 0, 0, 0, 34, 288, 1, 0, 0, 0, 36, 292, 1, 0, 0, 0, 38, 295, 1, 0, 0, 0, 40, 303, 1, 0, 0, 0, 42, 309, 1, 0, 0, 0, 44, 311, 1, 0, 0, 0, 46, 319, 1, 0, 0, 0, 48, 327, 1, 0, 0, 0, 50, 329, 1, 0, 0, 0, 52, 373, 1, 0, 0, 0, 54, 375, 1, 0, 0, 0, 56, 378, 1, 0, 0, 0, 58, 387, 1, 0, 0, 0, 60, 395, 1, 0, 0, 0, 62, 404, 1, 0, 0, 0, 64, 413, 1, 0, 0, 0, 66, 422, 1, 0, 0, 0, 68, 426, 1, 0, 0, 0, 70, 432, 1, 0, 0, 0, 72, 436, 1, 0, 0, 0, 74, 439, 1, 0, 0, 0, 76, 447, 1, 0, 0, 0, 78, 451, 1, 0, 0, 0, 80, 455, 1, 0, 0, 0, 82, 458, 1, 0, 0, 0, 84, 463, 1, 0, 0, 0, 86, 467, 1, 0, 0, 0, 88, 469, 1, 0, 0, 0, 90, 471, 1, 0, 0, 0, 92, 474, 1, 0, 0, 0, 94, 482, 1, 0, 0, 0, 96, 484, 1, 0, 0, 0, 98, 510, 1, 0, 0, 0, 100, 514, 1, 0, 0, 0, 102, 103, 3, 2, 1, 0, 103, 104, 5, 0, 0, 1, 104, 1, 1, 0, 0, 0, 105, 106, 6, 1, -1, 0, 106, 107, 3, 4, 2, 0, 107, 113, 1, 0, 0, 0, 108, 109, 10, 1, 0, 0, 109, 110, 5, 25, 0, 0, 110, 112, 3, 6, 3, 0, 111, 108, 1, 0, 0, 0, 112, 115, 1, 0, 0, 0, 113, 111, 1, 0, 0, 0, 113, 114, 1, 0, 0, 0, 114, 3, 1, 0, 0, 0, 115, 113, 1, 0, 0, 0, 116, 121, 3, 90, 45, 0, 117, 121, 3, 28, 14, 0, 118, 121, 3, 22, 11, 0, 119, 121, 3, 94, 47, 0, 120, 116, 1, 0, 0, 0, 120, 117, 1, 0, 0, 0, 120, 118, 1, 0, 0, 0, 120, 119, 1, 0, 0, 0, 121, 5, 1, 0, 0, 0, 122, 136, 3, 36, 18, 0, 123, 136, 3, 40, 20, 0, 124, 136, 3, 54, 27, 0, 125, 136, 3, 60, 30, 0, 126, 136, 3, 56, 28, 0, 127, 136, 3, 38, 19, 0, 128, 136, 3, 8, 4, 0, 129, 136, 3, 62, 31, 0, 130, 136, 3, 64, 32, 0, 131, 136, 3, 68, 34, 0, 132, 136, 3, 70, 35, 0, 133, 136, 3, 96, 48, 0, 134, 136, 3, 72, 36, 0, 135, 122, 1, 0, 0, 0, 135, 123, 1, 0, 0, 0, 135, 124, 1, 0, 0, 0, 135, 125, 1, 0, 0, 0, 135, 126, 1, 0, 0, 0, 135, 127, 1, 0, 0, 0, 135, 128, 1, 0, 0, 0, 135, 129, 1, 0, 0, 0, 135, 130, 1, 0, 0, 0, 135, 131, 1, 0, 0, 0, 135, 132, 1, 0, 0, 0, 135, 133, 1, 0, 0, 0, 135, 134, 1, 0, 0, 0, 136, 7, 1, 0, 0, 0, 137, 138, 5, 17, 0, 0, 138, 139, 3, 10, 5, 0, 139, 9, 1, 0, 0, 0, 140, 141, 6, 5, -1, 0, 141, 142, 5, 43, 0, 0, 142, 169, 3, 10, 5, 7, 143, 169, 3, 14, 7, 0, 144, 169, 3, 12, 6, 0, 145, 147, 3, 14, 7, 0, 146, 148, 5, 43, 0, 0, 147, 146, 1, 0, 0, 0, 147, 148, 1, 0, 0, 0, 148, 149, 1, 0, 0, 0, 149, 150, 5, 40, 0, 0, 150, 151, 5, 39, 0, 0, 151, 156, 3, 14, 7, 0, 152, 153, 5, 33, 0, 0, 153, 155, 3, 14, 7, 0, 154, 152, 1, 0, 0, 0, 155, 158, 1, 0, 0, 0, 156, 154, 1, 0, 0, 0, 156, 157, 1, 0, 0, 0, 157, 159, 1, 0, 0, 0, 158, 156, 1, 0, 0, 0, 159, 160, 5, 49, 0, 0, 160, 169, 1, 0, 0, 0, 161, 162, 3, 14, 7, 0, 162, 164, 5, 41, 0, 0, 163, 165, 5, 43, 0, 0, 164, 163, 1, 0, 0, 0, 164, 165, 1, 0, 0, 0, 165, 166, 1, 0, 0, 0, 166, 167, 5, 44, 0, 0, 167, 169, 1, 0, 0, 0, 168, 140, 1, 0, 0, 0, 168, 143, 1, 0, 0, 0, 168, 144, 1, 0, 0, 0, 168, 145, 1, 0, 0, 0, 168, 161, 1, 0, 0, 0, 169, 178, 1, 0, 0, 0, 170, 171, 10, 4, 0, 0, 171, 172, 5, 30, 0, 0, 172, 177, 3, 10, 5, 5, 173, 174, 10, 3, 0, 0, 174, 175, 5, 46, 0, 0, 175, 177, 3, 10, 5, 4, 176, 170, 1, 0, 0, 0, 176, 173, 1, 0, 0, 0, 177, 180, 1, 0, 0, 0, 178, 176, 1, 0, 0, 0, 178, 179, 1, 0, 0, 0, 179, 11, 1, 0, 0, 0, 180, 178, 1, 0, 0, 0, 181, 183, 3, 14, 7, 0, 182, 184, 5, 43, 0, 0, 183, 182, 1, 0, 0, 0, 183, 184, 1, 0, 0, 0, 184, 185, 1, 0, 0, 0, 185, 186, 5, 42, 0, 0, 186, 187, 3, 86, 43, 0, 187, 196, 1, 0, 0, 0, 188, 190, 3, 14, 7, 0, 189, 191, 5, 43, 0, 0, 190, 189, 1, 0, 0, 0, 190, 191, 1, 0, 0, 0, 191, 192, 1, 0, 0, 0, 192, 193, 5, 48, 0, 0, 193, 194, 3, 86, 43, 0, 194, 196, 1, 0, 0, 0, 195, 181, 1, 0, 0, 0, 195, 188, 1, 0, 0, 0, 196, 13, 1, 0, 0, 0, 197, 203, 3, 16, 8, 0, 198, 199, 3, 16, 8, 0, 199, 200, 3, 88, 44, 0, 200, 201, 3, 16, 8, 0, 201, 203, 1, 0, 0, 0, 202, 197, 1, 0, 0, 0, 202, 198, 1, 0, 0, 0, 203, 15, 1, 0, 0, 0, 204, 205, 6, 8, -1, 0, 205, 209, 3, 18, 9, 0, 206, 207, 7, 0, 0, 0, 207, 209, 3, 16, 8, 3, 208, 204, 1, 0, 0, 0, 208, 206, 1, 0, 0, 0, 209, 218, 1, 0, 0, 0, 210, 211, 10, 2, 0, 0, 211, 212, 7, 1, 0, 0, 212, 217, 3, 16, 8, 3, 213, 214, 10, 1, 0, 0, 214, 215, 7, 0, 0, 0, 215, 217, 3, 16, 8, 2, 216, 210, 1, 0, 0, 0, 216, 213, 1, 0, 0, 0, 217, 220, 1, 0, 0, 0, 218, 216, 1, 0, 0, 0, 218, 219, 1, 0, 0, 0, 219, 17, 1, 0, 0, 0, 220, 218, 1, 0, 0, 0, 221, 229, 3, 52, 26, 0, 222, 229, 3, 44, 22, 0, 223, 229, 3, 20, 10, 0, 224, 225, 5, 39, 0, 0, 225, 226, 3, 10, 5, 0, 226, 227, 5, 49, 0, 0, 227, 229, 1, 0, 0, 0, 228, 221, 1, 0, 0, 0, 228, 222, 1, 0, 0, 0, 228, 223, 1, 0, 0, 0, 228, 224, 1, 0, 0, 0, 229, 19, 1, 0, 0, 0, 230, 231, 3, 48, 24, 0, 231, 241, 5, 39, 0, 0, 232, 242, 5, 60, 0, 0, 233, 238, 3, 10, 5, 0, 234, 235, 5, 33, 0, 0, 235, 237, 3, 10, 5, 0, 236, 234, 1, 0, 0, 0, 237, 240, 1, 0, 0, 0, 238, 236, 1, 0, 0, 0, 238, 239, 1, 0, 0, 0, 239, 242, 1, 0, 0, 0, 240, 238, 1, 0, 0, 0, 241, 232, 1, 0, 0, 0, 241, 233, 1, 0, 0, 0, 241, 242, 1, 0, 0, 0, 242, 243, 1, 0, 0, 0, 243, 244, 5, 49, 0, 0, 244, 21, 1, 0, 0, 0, 245, 246, 5, 13, 0, 0, 246, 247, 3, 24, 12, 0, 247, 23, 1, 0, 0, 0, 248, 253, 3, 26, 13, 0, 249, 250, 5, 33, 0, 0, 250, 252, 3, 26, 13, 0, 251, 249, 1, 0, 0, 0, 252, 255, 1, 0, 0, 0, 253, 251, 1, 0, 0, 0, 253, 254, 1, 0, 0, 0, 254, 25, 1, 0, 0, 0, 255, 253, 1, 0, 0, 0, 256, 262, 3, 10, 5, 0, 257, 258, 3, 44, 22, 0, 258, 259, 5, 32, 0, 0, 259, 260, 3, 10, 5, 0, 260, 262, 1, 0, 0, 0, 261, 256, 1, 0, 0, 0, 261, 257, 1, 0, 0, 0, 262, 27, 1, 0, 0, 0, 263, 264, 5, 6, 0, 0, 264, 269, 3, 42, 21, 0, 265, 266, 5, 33, 0, 0, 266, 268, 3, 42, 21, 0, 267, 265, 1, 0, 0, 0, 268, 271, 1, 0, 0, 0, 269, 267, 1, 0, 0, 0, 269, 270, 1, 0, 0, 0, 270, 273, 1, 0, 0, 0, 271, 269, 1, 0, 0, 0, 272, 274, 3, 30, 15, 0, 273, 272, 1, 0, 0, 0, 273, 274, 1, 0, 0, 0, 274, 29, 1, 0, 0, 0, 275, 278, 3, 32, 16, 0, 276, 278, 3, 34, 17, 0, 277, 275, 1, 0, 0, 0, 277, 276, 1, 0, 0, 0, 278, 31, 1, 0, 0, 0, 279, 280, 5, 70, 0, 0, 280, 285, 3, 42, 21, 0, 281, 282, 5, 33, 0, 0, 282, 284, 3, 42, 21, 0, 283, 281, 1, 0, 0, 0, 284, 287, 1, 0, 0, 0, 285, 283, 1, 0, 0, 0, 285, 286, 1, 0, 0, 0, 286, 33, 1, 0, 0, 0, 287, 285, 1, 0, 0, 0, 288, 289, 5, 63, 0, 0, 289, 290, 3, 32, 16, 0, 290, 291, 5, 64, 0, 0, 291, 35, 1, 0, 0, 0, 292, 293, 5, 4, 0, 0, 293, 294, 3, 24, 12, 0, 294, 37, 1, 0, 0, 0, 295, 297, 5, 16, 0, 0, 296, 298, 3, 24, 12, 0, 297, 296, 1, 0, 0, 0, 297, 298, 1, 0, 0, 0, 298, 301, 1, 0, 0, 0, 299, 300, 5, 29, 0, 0, 300, 302, 3, 24, 12, 0, 301, 299, 1, 0, 0, 0, 301, 302, 1, 0, 0, 0, 302, 39, 1, 0, 0, 0, 303, 304, 5, 8, 0, 0, 304, 307, 3, 24, 12, 0, 305, 306, 5, 29, 0, 0, 306, 308, 3, 24, 12, 0, 307, 305, 1, 0, 0, 0, 307, 308, 1, 0, 0, 0, 308, 41, 1, 0, 0, 0, 309, 310, 7, 2, 0, 0, 310, 43, 1, 0, 0, 0, 311, 316, 3, 48, 24, 0, 312, 313, 5, 35, 0, 0, 313, 315, 3, 48, 24, 0, 314, 312, 1, 0, 0, 0, 315, 318, 1, 0, 0, 0, 316, 314, 1, 0, 0, 0, 316, 317, 1, 0, 0, 0, 317, 45, 1, 0, 0, 0, 318, 316, 1, 0, 0, 0, 319, 324, 3, 50, 25, 0, 320, 321, 5, 35, 0, 0, 321, 323, 3, 50, 25, 0, 322, 320, 1, 0, 0, 0, 323, 326, 1, 0, 0, 0, 324, 322, 1, 0, 0, 0, 324, 325, 1, 0, 0, 0, 325, 47, 1, 0, 0, 0, 326, 324, 1, 0, 0, 0, 327, 328, 7, 3, 0, 0, 328, 49, 1, 0, 0, 0, 329, 330, 7, 4, 0, 0, 330, 51, 1, 0, 0, 0, 331, 374, 5, 44, 0, 0, 332, 333, 3, 84, 42, 0, 333, 334, 5, 65, 0, 0, 334, 374, 1, 0, 0, 0, 335, 374, 3, 82, 41, 0, 336, 374, 3, 84, 42, 0, 337, 374, 3, 78, 39, 0, 338, 374, 5, 47, 0, 0, 339, 374, 3, 86, 43, 0, 340, 341, 5, 63, 0, 0, 341, 346, 3, 80, 40, 0, 342, 343, 5, 33, 0, 0, 343, 345, 3, 80, 40, 0, 344, 342, 1, 0, 0, 0, 345, 348, 1, 0, 0, 0, 346, 344, 1, 0, 0, 0, 346, 347, 1, 0, 0, 0, 347, 349, 1, 0, 0, 0, 348, 346, 1, 0, 0, 0, 349, 350, 5, 64, 0, 0, 350, 374, 1, 0, 0, 0, 351, 352, 5, 63, 0, 0, 352, 357, 3, 78, 39, 0, 353, 354, 5, 33, 0, 0, 354, 356, 3, 78, 39, 0, 355, 353, 1, 0, 0, 0, 356, 359, 1, 0, 0, 0, 357, 355, 1, 0, 0, 0, 357, 358, 1, 0, 0, 0, 358, 360, 1, 0, 0, 0, 359, 357, 1, 0, 0, 0, 360, 361, 5, 64, 0, 0, 361, 374, 1, 0, 0, 0, 362, 363, 5, 63, 0, 0, 363, 368, 3, 86, 43, 0, 364, 365, 5, 33, 0, 0, 365, 367, 3, 86, 43, 0, 366, 364, 1, 0, 0, 0, 367, 370, 1, 0, 0, 0, 368, 366, 1, 0, 0, 0, 368, 369, 1, 0, 0, 0, 369, 371, 1, 0, 0, 0, 370, 368, 1, 0, 0, 0, 371, 372, 5, 64, 0, 0, 372, 374, 1, 0, 0, 0, 373, 331, 1, 0, 0, 0, 373, 332, 1, 0, 0, 0, 373, 335, 1, 0, 0, 0, 373, 336, 1, 0, 0, 0, 373, 337, 1, 0, 0, 0, 373, 338, 1, 0, 0, 0, 373, 339, 1, 0, 0, 0, 373, 340, 1, 0, 0, 0, 373, 351, 1, 0, 0, 0, 373, 362, 1, 0, 0, 0, 374, 53, 1, 0, 0, 0, 375, 376, 5, 10, 0, 0, 376, 377, 5, 27, 0, 0, 377, 55, 1, 0, 0, 0, 378, 379, 5, 15, 0, 0, 379, 384, 3, 58, 29, 0, 380, 381, 5, 33, 0, 0, 381, 383, 3, 58, 29, 0, 382, 380, 1, 0, 0, 0, 383, 386, 1, 0, 0, 0, 384, 382, 1, 0, 0, 0, 384, 385, 1, 0, 0, 0, 385, 57, 1, 0, 0, 0, 386, 384, 1, 0, 0, 0, 387, 389, 3, 10, 5, 0, 388, 390, 7, 5, 0, 0, 389, 388, 1, 0, 0, 0, 389, 390, 1, 0, 0, 0, 390, 393, 1, 0, 0, 0, 391, 392, 5, 45, 0, 0, 392, 394, 7, 6, 0, 0, 393, 391, 1, 0, 0, 0, 393, 394, 1, 0, 0, 0, 394, 59, 1, 0, 0, 0, 395, 396, 5, 9, 0, 0, 396, 401, 3, 46, 23, 0, 397, 398, 5, 33, 0, 0, 398, 400, 3, 46, 23, 0, 399, 397, 1, 0, 0, 0, 400, 403, 1, 0, 0, 0, 401, 399, 1, 0, 0, 0, 401, 402, 1, 0, 0, 0, 402, 61, 1, 0, 0, 0, 403, 401, 1, 0, 0, 0, 404, 405, 5, 2, 0, 0, 405, 410, 3, 46, 23, 0, 406, 407, 5, 33, 0, 0, 407, 409, 3, 46, 23, 0, 408, 406, 1, 0, 0, 0, 409, 412, 1, 0, 0, 0, 410, 408, 1, 0, 0, 0, 410, 411, 1, 0, 0, 0, 411, 63, 1, 0, 0, 0, 412, 410, 1, 0, 0, 0, 413, 414, 5, 12, 0, 0, 414, 419, 3, 66, 33, 0, 415, 416, 5, 33, 0, 0, 416, 418, 3, 66, 33, 0, 417, 415, 1, 0, 0, 0, 418, 421, 1, 0, 0, 0, 419, 417, 1, 0, 0, 0, 419, 420, 1, 0, 0, 0, 420, 65, 1, 0, 0, 0, 421, 419, 1, 0, 0, 0, 422, 423, 3, 46, 23, 0, 423, 424, 5, 79, 0, 0, 424, 425, 3, 46, 23, 0, 425, 67, 1, 0, 0, 0, 426, 427, 5, 1, 0, 0, 427, 428, 3, 18, 9, 0, 428, 430, 3, 86, 43, 0, 429, 431, 3, 74, 37, 0, 430, 429, 1, 0, 0, 0, 430, 431, 1, 0, 0, 0, 431, 69, 1, 0, 0, 0, 432, 433, 5, 7, 0, 0, 433, 434, 3, 18, 9, 0, 434, 435, 3, 86, 43, 0, 435, 71, 1, 0, 0, 0, 436, 437, 5, 11, 0, 0, 437, 438, 3, 44, 22, 0, 438, 73, 1, 0, 0, 0, 439, 444, 3, 76, 38, 0, 440, 441, 5, 33, 0, 0, 441, 443, 3, 76, 38, 0, 442, 440, 1, 0, 0, 0, 443, 446, 1, 0, 0, 0, 444, 442, 1, 0, 0, 0, 444, 445, 1, 0, 0, 0, 445, 75, 1, 0, 0, 0, 446, 444, 1, 0, 0, 0, 447, 448, 3, 48, 24, 0, 448, 449, 5, 32, 0, 0, 449, 450, 3, 52, 26, 0, 450, 77, 1, 0, 0, 0, 451, 452, 7, 7, 0, 0, 452, 79, 1, 0, 0, 0, 453, 456, 3, 82, 41, 0, 454, 456, 3, 84, 42, 0, 455, 453, 1, 0, 0, 0, 455, 454, 1, 0, 0, 0, 456, 81, 1, 0, 0, 0, 457, 459, 7, 0, 0, 0, 458, 457, 1, 0, 0, 0, 458, 459, 1, 0, 0, 0, 459, 460, 1, 0, 0, 0, 460, 461, 5, 28, 0, 0, 461, 83, 1, 0, 0, 0, 462, 464, 7, 0, 0, 0, 463, 462, 1, 0, 0, 0, 463, 464, 1, 0, 0, 0, 464, 465, 1, 0, 0, 0, 465, 466, 5, 27, 0, 0, 466, 85, 1, 0, 0, 0, 467, 468, 5, 26, 0, 0, 468, 87, 1, 0, 0, 0, 469, 470, 7, 8, 0, 0, 470, 89, 1, 0, 0, 0, 471, 472, 5, 5, 0, 0, 472, 473, 3, 92, 46, 0, 473, 91, 1, 0, 0, 0, 474, 475, 5, 63, 0, 0, 475, 476, 3, 2, 1, 0, 476, 477, 5, 64, 0, 0, 477, 93, 1, 0, 0, 0, 478, 479, 5, 14, 0, 0, 479, 483, 5, 95, 0, 0, 480, 481, 5, 14, 0, 0, 481, 483, 5, 96, 0, 0, 482, 478, 1, 0, 0, 0, 482, 480, 1, 0, 0, 0, 483, 95, 1, 0, 0, 0, 484, 488, 5, 3, 0, 0, 485, 487, 3, 100, 50, 0, 486, 485, 1, 0, 0, 0, 487, 490, 1, 0, 0, 0, 488, 486, 1, 0, 0, 0, 488, 489, 1, 0, 0, 0, 489, 491, 1, 0, 0, 0, 490, 488, 1, 0, 0, 0, 491, 494, 5, 85, 0, 0, 492, 493, 5, 83, 0, 0, 493, 495, 3, 46, 23, 0, 494, 492, 1, 0, 0, 0, 494, 495, 1, 0, 0, 0, 495, 505, 1, 0, 0, 0, 496, 497, 5, 84, 0, 0, 497, 502, 3, 98, 49, 0, 498, 499, 5, 33, 0, 0, 499, 501, 3, 98, 49, 0, 500, 498, 1, 0, 0, 0, 501, 504, 1, 0, 0, 0, 502, 500, 1, 0, 0, 0, 502, 503, 1, 0, 0, 0, 503, 506, 1, 0, 0, 0, 504, 502, 1, 0, 0, 0, 505, 496, 1, 0, 0, 0, 505, 506, 1, 0, 0, 0, 506, 97, 1, 0, 0, 0, 507, 508, 3, 46, 23, 0, 508, 509, 5, 32, 0, 0, 509, 511, 1, 0, 0, 0, 510, 507, 1, 0, 0, 0, 510, 511, 1, 0, 0, 0, 511, 512, 1, 0, 0, 0, 512, 513, 3, 46, 23, 0, 513, 99, 1, 0, 0, 0, 514, 515, 5, 63, 0, 0, 515, 516, 5, 101, 0, 0, 516, 517, 5, 100, 0, 0, 517, 518, 5, 101, 0, 0, 518, 519, 5, 64, 0, 0, 519, 101, 1, 0, 0, 0, 51, 113, 120, 135, 147, 156, 164, 168, 176, 178, 183, 190, 195, 202, 208, 216, 218, 228, 238, 241, 253, 261, 269, 273, 277, 285, 297, 301, 307, 316, 324, 346, 357, 368, 373, 384, 389, 393, 401, 410, 419, 430, 444, 455, 458, 463, 482, 488, 494, 502, 505, 510] \ No newline at end of file diff --git a/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/parser/EsqlBaseParser.java b/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/parser/EsqlBaseParser.java index 6fd3d0008474a..ec3f9c25b4218 100644 --- a/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/parser/EsqlBaseParser.java +++ b/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/parser/EsqlBaseParser.java @@ -42,31 +42,31 @@ public class EsqlBaseParser extends Parser { RULE_whereCommand = 4, RULE_booleanExpression = 5, RULE_regexBooleanExpression = 6, RULE_valueExpression = 7, RULE_operatorExpression = 8, RULE_primaryExpression = 9, RULE_functionExpression = 10, RULE_rowCommand = 11, RULE_fields = 12, - RULE_field = 13, RULE_fromCommand = 14, RULE_metadata = 15, RULE_evalCommand = 16, - RULE_statsCommand = 17, RULE_inlinestatsCommand = 18, RULE_fromIdentifier = 19, - RULE_qualifiedName = 20, RULE_qualifiedNamePattern = 21, RULE_identifier = 22, - RULE_identifierPattern = 23, RULE_constant = 24, RULE_limitCommand = 25, - RULE_sortCommand = 26, RULE_orderExpression = 27, RULE_keepCommand = 28, - RULE_dropCommand = 29, RULE_renameCommand = 30, RULE_renameClause = 31, - RULE_dissectCommand = 32, RULE_grokCommand = 33, RULE_mvExpandCommand = 34, - RULE_commandOptions = 35, RULE_commandOption = 36, RULE_booleanValue = 37, - RULE_numericValue = 38, RULE_decimalValue = 39, RULE_integerValue = 40, - RULE_string = 41, RULE_comparisonOperator = 42, RULE_explainCommand = 43, - RULE_subqueryExpression = 44, RULE_showCommand = 45, RULE_enrichCommand = 46, - RULE_enrichWithClause = 47, RULE_setting = 48; + RULE_field = 13, RULE_fromCommand = 14, RULE_metadata = 15, RULE_metadataOption = 16, + RULE_deprecated_metadata = 17, RULE_evalCommand = 18, RULE_statsCommand = 19, + RULE_inlinestatsCommand = 20, RULE_fromIdentifier = 21, RULE_qualifiedName = 22, + RULE_qualifiedNamePattern = 23, RULE_identifier = 24, RULE_identifierPattern = 25, + RULE_constant = 26, RULE_limitCommand = 27, RULE_sortCommand = 28, RULE_orderExpression = 29, + RULE_keepCommand = 30, RULE_dropCommand = 31, RULE_renameCommand = 32, + RULE_renameClause = 33, RULE_dissectCommand = 34, RULE_grokCommand = 35, + RULE_mvExpandCommand = 36, RULE_commandOptions = 37, RULE_commandOption = 38, + RULE_booleanValue = 39, RULE_numericValue = 40, RULE_decimalValue = 41, + RULE_integerValue = 42, RULE_string = 43, RULE_comparisonOperator = 44, + RULE_explainCommand = 45, RULE_subqueryExpression = 46, RULE_showCommand = 47, + RULE_enrichCommand = 48, RULE_enrichWithClause = 49, RULE_setting = 50; private static String[] makeRuleNames() { return new String[] { "singleStatement", "query", "sourceCommand", "processingCommand", "whereCommand", "booleanExpression", "regexBooleanExpression", "valueExpression", "operatorExpression", "primaryExpression", "functionExpression", "rowCommand", "fields", "field", - "fromCommand", "metadata", "evalCommand", "statsCommand", "inlinestatsCommand", - "fromIdentifier", "qualifiedName", "qualifiedNamePattern", "identifier", - "identifierPattern", "constant", "limitCommand", "sortCommand", "orderExpression", - "keepCommand", "dropCommand", "renameCommand", "renameClause", "dissectCommand", - "grokCommand", "mvExpandCommand", "commandOptions", "commandOption", - "booleanValue", "numericValue", "decimalValue", "integerValue", "string", - "comparisonOperator", "explainCommand", "subqueryExpression", "showCommand", - "enrichCommand", "enrichWithClause", "setting" + "fromCommand", "metadata", "metadataOption", "deprecated_metadata", "evalCommand", + "statsCommand", "inlinestatsCommand", "fromIdentifier", "qualifiedName", + "qualifiedNamePattern", "identifier", "identifierPattern", "constant", + "limitCommand", "sortCommand", "orderExpression", "keepCommand", "dropCommand", + "renameCommand", "renameClause", "dissectCommand", "grokCommand", "mvExpandCommand", + "commandOptions", "commandOption", "booleanValue", "numericValue", "decimalValue", + "integerValue", "string", "comparisonOperator", "explainCommand", "subqueryExpression", + "showCommand", "enrichCommand", "enrichWithClause", "setting" }; } public static final String[] ruleNames = makeRuleNames(); @@ -195,9 +195,9 @@ public final SingleStatementContext singleStatement() throws RecognitionExceptio try { enterOuterAlt(_localctx, 1); { - setState(98); + setState(102); query(0); - setState(99); + setState(103); match(EOF); } } @@ -293,11 +293,11 @@ private QueryContext query(int _p) throws RecognitionException { _ctx = _localctx; _prevctx = _localctx; - setState(102); + setState(106); sourceCommand(); } _ctx.stop = _input.LT(-1); - setState(109); + setState(113); _errHandler.sync(this); _alt = getInterpreter().adaptivePredict(_input,0,_ctx); while ( _alt!=2 && _alt!=org.antlr.v4.runtime.atn.ATN.INVALID_ALT_NUMBER ) { @@ -308,16 +308,16 @@ private QueryContext query(int _p) throws RecognitionException { { _localctx = new CompositeQueryContext(new QueryContext(_parentctx, _parentState)); pushNewRecursionContext(_localctx, _startState, RULE_query); - setState(104); + setState(108); if (!(precpred(_ctx, 1))) throw new FailedPredicateException(this, "precpred(_ctx, 1)"); - setState(105); + setState(109); match(PIPE); - setState(106); + setState(110); processingCommand(); } } } - setState(111); + setState(115); _errHandler.sync(this); _alt = getInterpreter().adaptivePredict(_input,0,_ctx); } @@ -372,34 +372,34 @@ public final SourceCommandContext sourceCommand() throws RecognitionException { SourceCommandContext _localctx = new SourceCommandContext(_ctx, getState()); enterRule(_localctx, 4, RULE_sourceCommand); try { - setState(116); + setState(120); _errHandler.sync(this); switch (_input.LA(1)) { case EXPLAIN: enterOuterAlt(_localctx, 1); { - setState(112); + setState(116); explainCommand(); } break; case FROM: enterOuterAlt(_localctx, 2); { - setState(113); + setState(117); fromCommand(); } break; case ROW: enterOuterAlt(_localctx, 3); { - setState(114); + setState(118); rowCommand(); } break; case SHOW: enterOuterAlt(_localctx, 4); { - setState(115); + setState(119); showCommand(); } break; @@ -483,97 +483,97 @@ public final ProcessingCommandContext processingCommand() throws RecognitionExce ProcessingCommandContext _localctx = new ProcessingCommandContext(_ctx, getState()); enterRule(_localctx, 6, RULE_processingCommand); try { - setState(131); + setState(135); _errHandler.sync(this); switch (_input.LA(1)) { case EVAL: enterOuterAlt(_localctx, 1); { - setState(118); + setState(122); evalCommand(); } break; case INLINESTATS: enterOuterAlt(_localctx, 2); { - setState(119); + setState(123); inlinestatsCommand(); } break; case LIMIT: enterOuterAlt(_localctx, 3); { - setState(120); + setState(124); limitCommand(); } break; case KEEP: enterOuterAlt(_localctx, 4); { - setState(121); + setState(125); keepCommand(); } break; case SORT: enterOuterAlt(_localctx, 5); { - setState(122); + setState(126); sortCommand(); } break; case STATS: enterOuterAlt(_localctx, 6); { - setState(123); + setState(127); statsCommand(); } break; case WHERE: enterOuterAlt(_localctx, 7); { - setState(124); + setState(128); whereCommand(); } break; case DROP: enterOuterAlt(_localctx, 8); { - setState(125); + setState(129); dropCommand(); } break; case RENAME: enterOuterAlt(_localctx, 9); { - setState(126); + setState(130); renameCommand(); } break; case DISSECT: enterOuterAlt(_localctx, 10); { - setState(127); + setState(131); dissectCommand(); } break; case GROK: enterOuterAlt(_localctx, 11); { - setState(128); + setState(132); grokCommand(); } break; case ENRICH: enterOuterAlt(_localctx, 12); { - setState(129); + setState(133); enrichCommand(); } break; case MV_EXPAND: enterOuterAlt(_localctx, 13); { - setState(130); + setState(134); mvExpandCommand(); } break; @@ -624,9 +624,9 @@ public final WhereCommandContext whereCommand() throws RecognitionException { try { enterOuterAlt(_localctx, 1); { - setState(133); + setState(137); match(WHERE); - setState(134); + setState(138); booleanExpression(0); } } @@ -821,7 +821,7 @@ private BooleanExpressionContext booleanExpression(int _p) throws RecognitionExc int _alt; enterOuterAlt(_localctx, 1); { - setState(164); + setState(168); _errHandler.sync(this); switch ( getInterpreter().adaptivePredict(_input,6,_ctx) ) { case 1: @@ -830,9 +830,9 @@ private BooleanExpressionContext booleanExpression(int _p) throws RecognitionExc _ctx = _localctx; _prevctx = _localctx; - setState(137); + setState(141); match(NOT); - setState(138); + setState(142); booleanExpression(7); } break; @@ -841,7 +841,7 @@ private BooleanExpressionContext booleanExpression(int _p) throws RecognitionExc _localctx = new BooleanDefaultContext(_localctx); _ctx = _localctx; _prevctx = _localctx; - setState(139); + setState(143); valueExpression(); } break; @@ -850,7 +850,7 @@ private BooleanExpressionContext booleanExpression(int _p) throws RecognitionExc _localctx = new RegexExpressionContext(_localctx); _ctx = _localctx; _prevctx = _localctx; - setState(140); + setState(144); regexBooleanExpression(); } break; @@ -859,41 +859,41 @@ private BooleanExpressionContext booleanExpression(int _p) throws RecognitionExc _localctx = new LogicalInContext(_localctx); _ctx = _localctx; _prevctx = _localctx; - setState(141); + setState(145); valueExpression(); - setState(143); + setState(147); _errHandler.sync(this); _la = _input.LA(1); if (_la==NOT) { { - setState(142); + setState(146); match(NOT); } } - setState(145); + setState(149); match(IN); - setState(146); + setState(150); match(LP); - setState(147); + setState(151); valueExpression(); - setState(152); + setState(156); _errHandler.sync(this); _la = _input.LA(1); while (_la==COMMA) { { { - setState(148); + setState(152); match(COMMA); - setState(149); + setState(153); valueExpression(); } } - setState(154); + setState(158); _errHandler.sync(this); _la = _input.LA(1); } - setState(155); + setState(159); match(RP); } break; @@ -902,27 +902,27 @@ private BooleanExpressionContext booleanExpression(int _p) throws RecognitionExc _localctx = new IsNullContext(_localctx); _ctx = _localctx; _prevctx = _localctx; - setState(157); + setState(161); valueExpression(); - setState(158); + setState(162); match(IS); - setState(160); + setState(164); _errHandler.sync(this); _la = _input.LA(1); if (_la==NOT) { { - setState(159); + setState(163); match(NOT); } } - setState(162); + setState(166); match(NULL); } break; } _ctx.stop = _input.LT(-1); - setState(174); + setState(178); _errHandler.sync(this); _alt = getInterpreter().adaptivePredict(_input,8,_ctx); while ( _alt!=2 && _alt!=org.antlr.v4.runtime.atn.ATN.INVALID_ALT_NUMBER ) { @@ -930,7 +930,7 @@ private BooleanExpressionContext booleanExpression(int _p) throws RecognitionExc if ( _parseListeners!=null ) triggerExitRuleEvent(); _prevctx = _localctx; { - setState(172); + setState(176); _errHandler.sync(this); switch ( getInterpreter().adaptivePredict(_input,7,_ctx) ) { case 1: @@ -938,11 +938,11 @@ private BooleanExpressionContext booleanExpression(int _p) throws RecognitionExc _localctx = new LogicalBinaryContext(new BooleanExpressionContext(_parentctx, _parentState)); ((LogicalBinaryContext)_localctx).left = _prevctx; pushNewRecursionContext(_localctx, _startState, RULE_booleanExpression); - setState(166); + setState(170); if (!(precpred(_ctx, 4))) throw new FailedPredicateException(this, "precpred(_ctx, 4)"); - setState(167); + setState(171); ((LogicalBinaryContext)_localctx).operator = match(AND); - setState(168); + setState(172); ((LogicalBinaryContext)_localctx).right = booleanExpression(5); } break; @@ -951,18 +951,18 @@ private BooleanExpressionContext booleanExpression(int _p) throws RecognitionExc _localctx = new LogicalBinaryContext(new BooleanExpressionContext(_parentctx, _parentState)); ((LogicalBinaryContext)_localctx).left = _prevctx; pushNewRecursionContext(_localctx, _startState, RULE_booleanExpression); - setState(169); + setState(173); if (!(precpred(_ctx, 3))) throw new FailedPredicateException(this, "precpred(_ctx, 3)"); - setState(170); + setState(174); ((LogicalBinaryContext)_localctx).operator = match(OR); - setState(171); + setState(175); ((LogicalBinaryContext)_localctx).right = booleanExpression(4); } break; } } } - setState(176); + setState(180); _errHandler.sync(this); _alt = getInterpreter().adaptivePredict(_input,8,_ctx); } @@ -1017,48 +1017,48 @@ public final RegexBooleanExpressionContext regexBooleanExpression() throws Recog enterRule(_localctx, 12, RULE_regexBooleanExpression); int _la; try { - setState(191); + setState(195); _errHandler.sync(this); switch ( getInterpreter().adaptivePredict(_input,11,_ctx) ) { case 1: enterOuterAlt(_localctx, 1); { - setState(177); + setState(181); valueExpression(); - setState(179); + setState(183); _errHandler.sync(this); _la = _input.LA(1); if (_la==NOT) { { - setState(178); + setState(182); match(NOT); } } - setState(181); + setState(185); ((RegexBooleanExpressionContext)_localctx).kind = match(LIKE); - setState(182); + setState(186); ((RegexBooleanExpressionContext)_localctx).pattern = string(); } break; case 2: enterOuterAlt(_localctx, 2); { - setState(184); + setState(188); valueExpression(); - setState(186); + setState(190); _errHandler.sync(this); _la = _input.LA(1); if (_la==NOT) { { - setState(185); + setState(189); match(NOT); } } - setState(188); + setState(192); ((RegexBooleanExpressionContext)_localctx).kind = match(RLIKE); - setState(189); + setState(193); ((RegexBooleanExpressionContext)_localctx).pattern = string(); } break; @@ -1144,14 +1144,14 @@ public final ValueExpressionContext valueExpression() throws RecognitionExceptio ValueExpressionContext _localctx = new ValueExpressionContext(_ctx, getState()); enterRule(_localctx, 14, RULE_valueExpression); try { - setState(198); + setState(202); _errHandler.sync(this); switch ( getInterpreter().adaptivePredict(_input,12,_ctx) ) { case 1: _localctx = new ValueExpressionDefaultContext(_localctx); enterOuterAlt(_localctx, 1); { - setState(193); + setState(197); operatorExpression(0); } break; @@ -1159,11 +1159,11 @@ public final ValueExpressionContext valueExpression() throws RecognitionExceptio _localctx = new ComparisonContext(_localctx); enterOuterAlt(_localctx, 2); { - setState(194); + setState(198); ((ComparisonContext)_localctx).left = operatorExpression(0); - setState(195); + setState(199); comparisonOperator(); - setState(196); + setState(200); ((ComparisonContext)_localctx).right = operatorExpression(0); } break; @@ -1288,7 +1288,7 @@ private OperatorExpressionContext operatorExpression(int _p) throws RecognitionE int _alt; enterOuterAlt(_localctx, 1); { - setState(204); + setState(208); _errHandler.sync(this); switch ( getInterpreter().adaptivePredict(_input,13,_ctx) ) { case 1: @@ -1297,7 +1297,7 @@ private OperatorExpressionContext operatorExpression(int _p) throws RecognitionE _ctx = _localctx; _prevctx = _localctx; - setState(201); + setState(205); primaryExpression(); } break; @@ -1306,7 +1306,7 @@ private OperatorExpressionContext operatorExpression(int _p) throws RecognitionE _localctx = new ArithmeticUnaryContext(_localctx); _ctx = _localctx; _prevctx = _localctx; - setState(202); + setState(206); ((ArithmeticUnaryContext)_localctx).operator = _input.LT(1); _la = _input.LA(1); if ( !(_la==PLUS || _la==MINUS) ) { @@ -1317,13 +1317,13 @@ private OperatorExpressionContext operatorExpression(int _p) throws RecognitionE _errHandler.reportMatch(this); consume(); } - setState(203); + setState(207); operatorExpression(3); } break; } _ctx.stop = _input.LT(-1); - setState(214); + setState(218); _errHandler.sync(this); _alt = getInterpreter().adaptivePredict(_input,15,_ctx); while ( _alt!=2 && _alt!=org.antlr.v4.runtime.atn.ATN.INVALID_ALT_NUMBER ) { @@ -1331,7 +1331,7 @@ private OperatorExpressionContext operatorExpression(int _p) throws RecognitionE if ( _parseListeners!=null ) triggerExitRuleEvent(); _prevctx = _localctx; { - setState(212); + setState(216); _errHandler.sync(this); switch ( getInterpreter().adaptivePredict(_input,14,_ctx) ) { case 1: @@ -1339,9 +1339,9 @@ private OperatorExpressionContext operatorExpression(int _p) throws RecognitionE _localctx = new ArithmeticBinaryContext(new OperatorExpressionContext(_parentctx, _parentState)); ((ArithmeticBinaryContext)_localctx).left = _prevctx; pushNewRecursionContext(_localctx, _startState, RULE_operatorExpression); - setState(206); + setState(210); if (!(precpred(_ctx, 2))) throw new FailedPredicateException(this, "precpred(_ctx, 2)"); - setState(207); + setState(211); ((ArithmeticBinaryContext)_localctx).operator = _input.LT(1); _la = _input.LA(1); if ( !(((_la) & ~0x3f) == 0 && ((1L << _la) & 8070450532247928832L) != 0) ) { @@ -1352,7 +1352,7 @@ private OperatorExpressionContext operatorExpression(int _p) throws RecognitionE _errHandler.reportMatch(this); consume(); } - setState(208); + setState(212); ((ArithmeticBinaryContext)_localctx).right = operatorExpression(3); } break; @@ -1361,9 +1361,9 @@ private OperatorExpressionContext operatorExpression(int _p) throws RecognitionE _localctx = new ArithmeticBinaryContext(new OperatorExpressionContext(_parentctx, _parentState)); ((ArithmeticBinaryContext)_localctx).left = _prevctx; pushNewRecursionContext(_localctx, _startState, RULE_operatorExpression); - setState(209); + setState(213); if (!(precpred(_ctx, 1))) throw new FailedPredicateException(this, "precpred(_ctx, 1)"); - setState(210); + setState(214); ((ArithmeticBinaryContext)_localctx).operator = _input.LT(1); _la = _input.LA(1); if ( !(_la==PLUS || _la==MINUS) ) { @@ -1374,14 +1374,14 @@ private OperatorExpressionContext operatorExpression(int _p) throws RecognitionE _errHandler.reportMatch(this); consume(); } - setState(211); + setState(215); ((ArithmeticBinaryContext)_localctx).right = operatorExpression(2); } break; } } } - setState(216); + setState(220); _errHandler.sync(this); _alt = getInterpreter().adaptivePredict(_input,15,_ctx); } @@ -1503,14 +1503,14 @@ public final PrimaryExpressionContext primaryExpression() throws RecognitionExce PrimaryExpressionContext _localctx = new PrimaryExpressionContext(_ctx, getState()); enterRule(_localctx, 18, RULE_primaryExpression); try { - setState(224); + setState(228); _errHandler.sync(this); switch ( getInterpreter().adaptivePredict(_input,16,_ctx) ) { case 1: _localctx = new ConstantDefaultContext(_localctx); enterOuterAlt(_localctx, 1); { - setState(217); + setState(221); constant(); } break; @@ -1518,7 +1518,7 @@ public final PrimaryExpressionContext primaryExpression() throws RecognitionExce _localctx = new DereferenceContext(_localctx); enterOuterAlt(_localctx, 2); { - setState(218); + setState(222); qualifiedName(); } break; @@ -1526,7 +1526,7 @@ public final PrimaryExpressionContext primaryExpression() throws RecognitionExce _localctx = new FunctionContext(_localctx); enterOuterAlt(_localctx, 3); { - setState(219); + setState(223); functionExpression(); } break; @@ -1534,11 +1534,11 @@ public final PrimaryExpressionContext primaryExpression() throws RecognitionExce _localctx = new ParenthesizedExpressionContext(_localctx); enterOuterAlt(_localctx, 4); { - setState(220); + setState(224); match(LP); - setState(221); + setState(225); booleanExpression(0); - setState(222); + setState(226); match(RP); } break; @@ -1600,16 +1600,16 @@ public final FunctionExpressionContext functionExpression() throws RecognitionEx try { enterOuterAlt(_localctx, 1); { - setState(226); + setState(230); identifier(); - setState(227); + setState(231); match(LP); - setState(237); + setState(241); _errHandler.sync(this); switch (_input.LA(1)) { case ASTERISK: { - setState(228); + setState(232); match(ASTERISK); } break; @@ -1629,21 +1629,21 @@ public final FunctionExpressionContext functionExpression() throws RecognitionEx case QUOTED_IDENTIFIER: { { - setState(229); + setState(233); booleanExpression(0); - setState(234); + setState(238); _errHandler.sync(this); _la = _input.LA(1); while (_la==COMMA) { { { - setState(230); + setState(234); match(COMMA); - setState(231); + setState(235); booleanExpression(0); } } - setState(236); + setState(240); _errHandler.sync(this); _la = _input.LA(1); } @@ -1655,7 +1655,7 @@ public final FunctionExpressionContext functionExpression() throws RecognitionEx default: break; } - setState(239); + setState(243); match(RP); } } @@ -1702,9 +1702,9 @@ public final RowCommandContext rowCommand() throws RecognitionException { try { enterOuterAlt(_localctx, 1); { - setState(241); + setState(245); match(ROW); - setState(242); + setState(246); fields(); } } @@ -1758,23 +1758,23 @@ public final FieldsContext fields() throws RecognitionException { int _alt; enterOuterAlt(_localctx, 1); { - setState(244); + setState(248); field(); - setState(249); + setState(253); _errHandler.sync(this); _alt = getInterpreter().adaptivePredict(_input,19,_ctx); while ( _alt!=2 && _alt!=org.antlr.v4.runtime.atn.ATN.INVALID_ALT_NUMBER ) { if ( _alt==1 ) { { { - setState(245); + setState(249); match(COMMA); - setState(246); + setState(250); field(); } } } - setState(251); + setState(255); _errHandler.sync(this); _alt = getInterpreter().adaptivePredict(_input,19,_ctx); } @@ -1824,24 +1824,24 @@ public final FieldContext field() throws RecognitionException { FieldContext _localctx = new FieldContext(_ctx, getState()); enterRule(_localctx, 26, RULE_field); try { - setState(257); + setState(261); _errHandler.sync(this); switch ( getInterpreter().adaptivePredict(_input,20,_ctx) ) { case 1: enterOuterAlt(_localctx, 1); { - setState(252); + setState(256); booleanExpression(0); } break; case 2: enterOuterAlt(_localctx, 2); { - setState(253); + setState(257); qualifiedName(); - setState(254); + setState(258); match(ASSIGN); - setState(255); + setState(259); booleanExpression(0); } break; @@ -1901,34 +1901,34 @@ public final FromCommandContext fromCommand() throws RecognitionException { int _alt; enterOuterAlt(_localctx, 1); { - setState(259); + setState(263); match(FROM); - setState(260); + setState(264); fromIdentifier(); - setState(265); + setState(269); _errHandler.sync(this); _alt = getInterpreter().adaptivePredict(_input,21,_ctx); while ( _alt!=2 && _alt!=org.antlr.v4.runtime.atn.ATN.INVALID_ALT_NUMBER ) { if ( _alt==1 ) { { { - setState(261); + setState(265); match(COMMA); - setState(262); + setState(266); fromIdentifier(); } } } - setState(267); + setState(271); _errHandler.sync(this); _alt = getInterpreter().adaptivePredict(_input,21,_ctx); } - setState(269); + setState(273); _errHandler.sync(this); switch ( getInterpreter().adaptivePredict(_input,22,_ctx) ) { case 1: { - setState(268); + setState(272); metadata(); } break; @@ -1948,7 +1948,70 @@ public final FromCommandContext fromCommand() throws RecognitionException { @SuppressWarnings("CheckReturnValue") public static class MetadataContext extends ParserRuleContext { - public TerminalNode OPENING_BRACKET() { return getToken(EsqlBaseParser.OPENING_BRACKET, 0); } + public MetadataOptionContext metadataOption() { + return getRuleContext(MetadataOptionContext.class,0); + } + public Deprecated_metadataContext deprecated_metadata() { + return getRuleContext(Deprecated_metadataContext.class,0); + } + @SuppressWarnings("this-escape") + public MetadataContext(ParserRuleContext parent, int invokingState) { + super(parent, invokingState); + } + @Override public int getRuleIndex() { return RULE_metadata; } + @Override + public void enterRule(ParseTreeListener listener) { + if ( listener instanceof EsqlBaseParserListener ) ((EsqlBaseParserListener)listener).enterMetadata(this); + } + @Override + public void exitRule(ParseTreeListener listener) { + if ( listener instanceof EsqlBaseParserListener ) ((EsqlBaseParserListener)listener).exitMetadata(this); + } + @Override + public T accept(ParseTreeVisitor visitor) { + if ( visitor instanceof EsqlBaseParserVisitor ) return ((EsqlBaseParserVisitor)visitor).visitMetadata(this); + else return visitor.visitChildren(this); + } + } + + public final MetadataContext metadata() throws RecognitionException { + MetadataContext _localctx = new MetadataContext(_ctx, getState()); + enterRule(_localctx, 30, RULE_metadata); + try { + setState(277); + _errHandler.sync(this); + switch (_input.LA(1)) { + case METADATA: + enterOuterAlt(_localctx, 1); + { + setState(275); + metadataOption(); + } + break; + case OPENING_BRACKET: + enterOuterAlt(_localctx, 2); + { + setState(276); + deprecated_metadata(); + } + break; + default: + throw new NoViableAltException(this); + } + } + catch (RecognitionException re) { + _localctx.exception = re; + _errHandler.reportError(this, re); + _errHandler.recover(this, re); + } + finally { + exitRule(); + } + return _localctx; + } + + @SuppressWarnings("CheckReturnValue") + public static class MetadataOptionContext extends ParserRuleContext { public TerminalNode METADATA() { return getToken(EsqlBaseParser.METADATA, 0); } public List fromIdentifier() { return getRuleContexts(FromIdentifierContext.class); @@ -1956,61 +2019,109 @@ public List fromIdentifier() { public FromIdentifierContext fromIdentifier(int i) { return getRuleContext(FromIdentifierContext.class,i); } - public TerminalNode CLOSING_BRACKET() { return getToken(EsqlBaseParser.CLOSING_BRACKET, 0); } public List COMMA() { return getTokens(EsqlBaseParser.COMMA); } public TerminalNode COMMA(int i) { return getToken(EsqlBaseParser.COMMA, i); } @SuppressWarnings("this-escape") - public MetadataContext(ParserRuleContext parent, int invokingState) { + public MetadataOptionContext(ParserRuleContext parent, int invokingState) { super(parent, invokingState); } - @Override public int getRuleIndex() { return RULE_metadata; } + @Override public int getRuleIndex() { return RULE_metadataOption; } @Override public void enterRule(ParseTreeListener listener) { - if ( listener instanceof EsqlBaseParserListener ) ((EsqlBaseParserListener)listener).enterMetadata(this); + if ( listener instanceof EsqlBaseParserListener ) ((EsqlBaseParserListener)listener).enterMetadataOption(this); } @Override public void exitRule(ParseTreeListener listener) { - if ( listener instanceof EsqlBaseParserListener ) ((EsqlBaseParserListener)listener).exitMetadata(this); + if ( listener instanceof EsqlBaseParserListener ) ((EsqlBaseParserListener)listener).exitMetadataOption(this); } @Override public T accept(ParseTreeVisitor visitor) { - if ( visitor instanceof EsqlBaseParserVisitor ) return ((EsqlBaseParserVisitor)visitor).visitMetadata(this); + if ( visitor instanceof EsqlBaseParserVisitor ) return ((EsqlBaseParserVisitor)visitor).visitMetadataOption(this); else return visitor.visitChildren(this); } } - public final MetadataContext metadata() throws RecognitionException { - MetadataContext _localctx = new MetadataContext(_ctx, getState()); - enterRule(_localctx, 30, RULE_metadata); - int _la; + public final MetadataOptionContext metadataOption() throws RecognitionException { + MetadataOptionContext _localctx = new MetadataOptionContext(_ctx, getState()); + enterRule(_localctx, 32, RULE_metadataOption); try { + int _alt; enterOuterAlt(_localctx, 1); { - setState(271); - match(OPENING_BRACKET); - setState(272); + setState(279); match(METADATA); - setState(273); + setState(280); fromIdentifier(); - setState(278); + setState(285); _errHandler.sync(this); - _la = _input.LA(1); - while (_la==COMMA) { - { - { - setState(274); - match(COMMA); - setState(275); - fromIdentifier(); - } + _alt = getInterpreter().adaptivePredict(_input,24,_ctx); + while ( _alt!=2 && _alt!=org.antlr.v4.runtime.atn.ATN.INVALID_ALT_NUMBER ) { + if ( _alt==1 ) { + { + { + setState(281); + match(COMMA); + setState(282); + fromIdentifier(); + } + } } - setState(280); + setState(287); _errHandler.sync(this); - _la = _input.LA(1); + _alt = getInterpreter().adaptivePredict(_input,24,_ctx); + } } - setState(281); + } + catch (RecognitionException re) { + _localctx.exception = re; + _errHandler.reportError(this, re); + _errHandler.recover(this, re); + } + finally { + exitRule(); + } + return _localctx; + } + + @SuppressWarnings("CheckReturnValue") + public static class Deprecated_metadataContext extends ParserRuleContext { + public TerminalNode OPENING_BRACKET() { return getToken(EsqlBaseParser.OPENING_BRACKET, 0); } + public MetadataOptionContext metadataOption() { + return getRuleContext(MetadataOptionContext.class,0); + } + public TerminalNode CLOSING_BRACKET() { return getToken(EsqlBaseParser.CLOSING_BRACKET, 0); } + public Deprecated_metadataContext(ParserRuleContext parent, int invokingState) { + super(parent, invokingState); + } + @Override public int getRuleIndex() { return RULE_deprecated_metadata; } + @Override + public void enterRule(ParseTreeListener listener) { + if ( listener instanceof EsqlBaseParserListener ) ((EsqlBaseParserListener)listener).enterDeprecated_metadata(this); + } + @Override + public void exitRule(ParseTreeListener listener) { + if ( listener instanceof EsqlBaseParserListener ) ((EsqlBaseParserListener)listener).exitDeprecated_metadata(this); + } + @Override + public T accept(ParseTreeVisitor visitor) { + if ( visitor instanceof EsqlBaseParserVisitor ) return ((EsqlBaseParserVisitor)visitor).visitDeprecated_metadata(this); + else return visitor.visitChildren(this); + } + } + + public final Deprecated_metadataContext deprecated_metadata() throws RecognitionException { + Deprecated_metadataContext _localctx = new Deprecated_metadataContext(_ctx, getState()); + enterRule(_localctx, 34, RULE_deprecated_metadata); + try { + enterOuterAlt(_localctx, 1); + { + setState(288); + match(OPENING_BRACKET); + setState(289); + metadataOption(); + setState(290); match(CLOSING_BRACKET); } } @@ -2053,13 +2164,13 @@ public T accept(ParseTreeVisitor visitor) { public final EvalCommandContext evalCommand() throws RecognitionException { EvalCommandContext _localctx = new EvalCommandContext(_ctx, getState()); - enterRule(_localctx, 32, RULE_evalCommand); + enterRule(_localctx, 36, RULE_evalCommand); try { enterOuterAlt(_localctx, 1); { - setState(283); + setState(292); match(EVAL); - setState(284); + setState(293); fields(); } } @@ -2108,30 +2219,30 @@ public T accept(ParseTreeVisitor visitor) { public final StatsCommandContext statsCommand() throws RecognitionException { StatsCommandContext _localctx = new StatsCommandContext(_ctx, getState()); - enterRule(_localctx, 34, RULE_statsCommand); + enterRule(_localctx, 38, RULE_statsCommand); try { enterOuterAlt(_localctx, 1); { - setState(286); + setState(295); match(STATS); - setState(288); + setState(297); _errHandler.sync(this); - switch ( getInterpreter().adaptivePredict(_input,24,_ctx) ) { + switch ( getInterpreter().adaptivePredict(_input,25,_ctx) ) { case 1: { - setState(287); + setState(296); ((StatsCommandContext)_localctx).stats = fields(); } break; } - setState(292); + setState(301); _errHandler.sync(this); - switch ( getInterpreter().adaptivePredict(_input,25,_ctx) ) { + switch ( getInterpreter().adaptivePredict(_input,26,_ctx) ) { case 1: { - setState(290); + setState(299); match(BY); - setState(291); + setState(300); ((StatsCommandContext)_localctx).grouping = fields(); } break; @@ -2183,22 +2294,22 @@ public T accept(ParseTreeVisitor visitor) { public final InlinestatsCommandContext inlinestatsCommand() throws RecognitionException { InlinestatsCommandContext _localctx = new InlinestatsCommandContext(_ctx, getState()); - enterRule(_localctx, 36, RULE_inlinestatsCommand); + enterRule(_localctx, 40, RULE_inlinestatsCommand); try { enterOuterAlt(_localctx, 1); { - setState(294); + setState(303); match(INLINESTATS); - setState(295); + setState(304); ((InlinestatsCommandContext)_localctx).stats = fields(); - setState(298); + setState(307); _errHandler.sync(this); - switch ( getInterpreter().adaptivePredict(_input,26,_ctx) ) { + switch ( getInterpreter().adaptivePredict(_input,27,_ctx) ) { case 1: { - setState(296); + setState(305); match(BY); - setState(297); + setState(306); ((InlinestatsCommandContext)_localctx).grouping = fields(); } break; @@ -2242,12 +2353,12 @@ public T accept(ParseTreeVisitor visitor) { public final FromIdentifierContext fromIdentifier() throws RecognitionException { FromIdentifierContext _localctx = new FromIdentifierContext(_ctx, getState()); - enterRule(_localctx, 38, RULE_fromIdentifier); + enterRule(_localctx, 42, RULE_fromIdentifier); int _la; try { enterOuterAlt(_localctx, 1); { - setState(300); + setState(309); _la = _input.LA(1); if ( !(_la==QUOTED_IDENTIFIER || _la==FROM_UNQUOTED_IDENTIFIER) ) { _errHandler.recoverInline(this); @@ -2304,30 +2415,30 @@ public T accept(ParseTreeVisitor visitor) { public final QualifiedNameContext qualifiedName() throws RecognitionException { QualifiedNameContext _localctx = new QualifiedNameContext(_ctx, getState()); - enterRule(_localctx, 40, RULE_qualifiedName); + enterRule(_localctx, 44, RULE_qualifiedName); try { int _alt; enterOuterAlt(_localctx, 1); { - setState(302); + setState(311); identifier(); - setState(307); + setState(316); _errHandler.sync(this); - _alt = getInterpreter().adaptivePredict(_input,27,_ctx); + _alt = getInterpreter().adaptivePredict(_input,28,_ctx); while ( _alt!=2 && _alt!=org.antlr.v4.runtime.atn.ATN.INVALID_ALT_NUMBER ) { if ( _alt==1 ) { { { - setState(303); + setState(312); match(DOT); - setState(304); + setState(313); identifier(); } } } - setState(309); + setState(318); _errHandler.sync(this); - _alt = getInterpreter().adaptivePredict(_input,27,_ctx); + _alt = getInterpreter().adaptivePredict(_input,28,_ctx); } } } @@ -2376,30 +2487,30 @@ public T accept(ParseTreeVisitor visitor) { public final QualifiedNamePatternContext qualifiedNamePattern() throws RecognitionException { QualifiedNamePatternContext _localctx = new QualifiedNamePatternContext(_ctx, getState()); - enterRule(_localctx, 42, RULE_qualifiedNamePattern); + enterRule(_localctx, 46, RULE_qualifiedNamePattern); try { int _alt; enterOuterAlt(_localctx, 1); { - setState(310); + setState(319); identifierPattern(); - setState(315); + setState(324); _errHandler.sync(this); - _alt = getInterpreter().adaptivePredict(_input,28,_ctx); + _alt = getInterpreter().adaptivePredict(_input,29,_ctx); while ( _alt!=2 && _alt!=org.antlr.v4.runtime.atn.ATN.INVALID_ALT_NUMBER ) { if ( _alt==1 ) { { { - setState(311); + setState(320); match(DOT); - setState(312); + setState(321); identifierPattern(); } } } - setState(317); + setState(326); _errHandler.sync(this); - _alt = getInterpreter().adaptivePredict(_input,28,_ctx); + _alt = getInterpreter().adaptivePredict(_input,29,_ctx); } } } @@ -2440,12 +2551,12 @@ public T accept(ParseTreeVisitor visitor) { public final IdentifierContext identifier() throws RecognitionException { IdentifierContext _localctx = new IdentifierContext(_ctx, getState()); - enterRule(_localctx, 44, RULE_identifier); + enterRule(_localctx, 48, RULE_identifier); int _la; try { enterOuterAlt(_localctx, 1); { - setState(318); + setState(327); _la = _input.LA(1); if ( !(_la==UNQUOTED_IDENTIFIER || _la==QUOTED_IDENTIFIER) ) { _errHandler.recoverInline(this); @@ -2494,12 +2605,12 @@ public T accept(ParseTreeVisitor visitor) { public final IdentifierPatternContext identifierPattern() throws RecognitionException { IdentifierPatternContext _localctx = new IdentifierPatternContext(_ctx, getState()); - enterRule(_localctx, 46, RULE_identifierPattern); + enterRule(_localctx, 50, RULE_identifierPattern); int _la; try { enterOuterAlt(_localctx, 1); { - setState(320); + setState(329); _la = _input.LA(1); if ( !(_la==QUOTED_IDENTIFIER || _la==UNQUOTED_ID_PATTERN) ) { _errHandler.recoverInline(this); @@ -2773,17 +2884,17 @@ public T accept(ParseTreeVisitor visitor) { public final ConstantContext constant() throws RecognitionException { ConstantContext _localctx = new ConstantContext(_ctx, getState()); - enterRule(_localctx, 48, RULE_constant); + enterRule(_localctx, 52, RULE_constant); int _la; try { - setState(364); + setState(373); _errHandler.sync(this); - switch ( getInterpreter().adaptivePredict(_input,32,_ctx) ) { + switch ( getInterpreter().adaptivePredict(_input,33,_ctx) ) { case 1: _localctx = new NullLiteralContext(_localctx); enterOuterAlt(_localctx, 1); { - setState(322); + setState(331); match(NULL); } break; @@ -2791,9 +2902,9 @@ public final ConstantContext constant() throws RecognitionException { _localctx = new QualifiedIntegerLiteralContext(_localctx); enterOuterAlt(_localctx, 2); { - setState(323); + setState(332); integerValue(); - setState(324); + setState(333); match(UNQUOTED_IDENTIFIER); } break; @@ -2801,7 +2912,7 @@ public final ConstantContext constant() throws RecognitionException { _localctx = new DecimalLiteralContext(_localctx); enterOuterAlt(_localctx, 3); { - setState(326); + setState(335); decimalValue(); } break; @@ -2809,7 +2920,7 @@ public final ConstantContext constant() throws RecognitionException { _localctx = new IntegerLiteralContext(_localctx); enterOuterAlt(_localctx, 4); { - setState(327); + setState(336); integerValue(); } break; @@ -2817,7 +2928,7 @@ public final ConstantContext constant() throws RecognitionException { _localctx = new BooleanLiteralContext(_localctx); enterOuterAlt(_localctx, 5); { - setState(328); + setState(337); booleanValue(); } break; @@ -2825,7 +2936,7 @@ public final ConstantContext constant() throws RecognitionException { _localctx = new InputParamContext(_localctx); enterOuterAlt(_localctx, 6); { - setState(329); + setState(338); match(PARAM); } break; @@ -2833,7 +2944,7 @@ public final ConstantContext constant() throws RecognitionException { _localctx = new StringLiteralContext(_localctx); enterOuterAlt(_localctx, 7); { - setState(330); + setState(339); string(); } break; @@ -2841,27 +2952,27 @@ public final ConstantContext constant() throws RecognitionException { _localctx = new NumericArrayLiteralContext(_localctx); enterOuterAlt(_localctx, 8); { - setState(331); + setState(340); match(OPENING_BRACKET); - setState(332); + setState(341); numericValue(); - setState(337); + setState(346); _errHandler.sync(this); _la = _input.LA(1); while (_la==COMMA) { { { - setState(333); + setState(342); match(COMMA); - setState(334); + setState(343); numericValue(); } } - setState(339); + setState(348); _errHandler.sync(this); _la = _input.LA(1); } - setState(340); + setState(349); match(CLOSING_BRACKET); } break; @@ -2869,27 +2980,27 @@ public final ConstantContext constant() throws RecognitionException { _localctx = new BooleanArrayLiteralContext(_localctx); enterOuterAlt(_localctx, 9); { - setState(342); + setState(351); match(OPENING_BRACKET); - setState(343); + setState(352); booleanValue(); - setState(348); + setState(357); _errHandler.sync(this); _la = _input.LA(1); while (_la==COMMA) { { { - setState(344); + setState(353); match(COMMA); - setState(345); + setState(354); booleanValue(); } } - setState(350); + setState(359); _errHandler.sync(this); _la = _input.LA(1); } - setState(351); + setState(360); match(CLOSING_BRACKET); } break; @@ -2897,27 +3008,27 @@ public final ConstantContext constant() throws RecognitionException { _localctx = new StringArrayLiteralContext(_localctx); enterOuterAlt(_localctx, 10); { - setState(353); + setState(362); match(OPENING_BRACKET); - setState(354); + setState(363); string(); - setState(359); + setState(368); _errHandler.sync(this); _la = _input.LA(1); while (_la==COMMA) { { { - setState(355); + setState(364); match(COMMA); - setState(356); + setState(365); string(); } } - setState(361); + setState(370); _errHandler.sync(this); _la = _input.LA(1); } - setState(362); + setState(371); match(CLOSING_BRACKET); } break; @@ -2960,13 +3071,13 @@ public T accept(ParseTreeVisitor visitor) { public final LimitCommandContext limitCommand() throws RecognitionException { LimitCommandContext _localctx = new LimitCommandContext(_ctx, getState()); - enterRule(_localctx, 50, RULE_limitCommand); + enterRule(_localctx, 54, RULE_limitCommand); try { enterOuterAlt(_localctx, 1); { - setState(366); + setState(375); match(LIMIT); - setState(367); + setState(376); match(INTEGER_LITERAL); } } @@ -3016,32 +3127,32 @@ public T accept(ParseTreeVisitor visitor) { public final SortCommandContext sortCommand() throws RecognitionException { SortCommandContext _localctx = new SortCommandContext(_ctx, getState()); - enterRule(_localctx, 52, RULE_sortCommand); + enterRule(_localctx, 56, RULE_sortCommand); try { int _alt; enterOuterAlt(_localctx, 1); { - setState(369); + setState(378); match(SORT); - setState(370); + setState(379); orderExpression(); - setState(375); + setState(384); _errHandler.sync(this); - _alt = getInterpreter().adaptivePredict(_input,33,_ctx); + _alt = getInterpreter().adaptivePredict(_input,34,_ctx); while ( _alt!=2 && _alt!=org.antlr.v4.runtime.atn.ATN.INVALID_ALT_NUMBER ) { if ( _alt==1 ) { { { - setState(371); + setState(380); match(COMMA); - setState(372); + setState(381); orderExpression(); } } } - setState(377); + setState(386); _errHandler.sync(this); - _alt = getInterpreter().adaptivePredict(_input,33,_ctx); + _alt = getInterpreter().adaptivePredict(_input,34,_ctx); } } } @@ -3090,19 +3201,19 @@ public T accept(ParseTreeVisitor visitor) { public final OrderExpressionContext orderExpression() throws RecognitionException { OrderExpressionContext _localctx = new OrderExpressionContext(_ctx, getState()); - enterRule(_localctx, 54, RULE_orderExpression); + enterRule(_localctx, 58, RULE_orderExpression); int _la; try { enterOuterAlt(_localctx, 1); { - setState(378); + setState(387); booleanExpression(0); - setState(380); + setState(389); _errHandler.sync(this); - switch ( getInterpreter().adaptivePredict(_input,34,_ctx) ) { + switch ( getInterpreter().adaptivePredict(_input,35,_ctx) ) { case 1: { - setState(379); + setState(388); ((OrderExpressionContext)_localctx).ordering = _input.LT(1); _la = _input.LA(1); if ( !(_la==ASC || _la==DESC) ) { @@ -3116,14 +3227,14 @@ public final OrderExpressionContext orderExpression() throws RecognitionExceptio } break; } - setState(384); + setState(393); _errHandler.sync(this); - switch ( getInterpreter().adaptivePredict(_input,35,_ctx) ) { + switch ( getInterpreter().adaptivePredict(_input,36,_ctx) ) { case 1: { - setState(382); + setState(391); match(NULLS); - setState(383); + setState(392); ((OrderExpressionContext)_localctx).nullOrdering = _input.LT(1); _la = _input.LA(1); if ( !(_la==FIRST || _la==LAST) ) { @@ -3185,32 +3296,32 @@ public T accept(ParseTreeVisitor visitor) { public final KeepCommandContext keepCommand() throws RecognitionException { KeepCommandContext _localctx = new KeepCommandContext(_ctx, getState()); - enterRule(_localctx, 56, RULE_keepCommand); + enterRule(_localctx, 60, RULE_keepCommand); try { int _alt; enterOuterAlt(_localctx, 1); { - setState(386); + setState(395); match(KEEP); - setState(387); + setState(396); qualifiedNamePattern(); - setState(392); + setState(401); _errHandler.sync(this); - _alt = getInterpreter().adaptivePredict(_input,36,_ctx); + _alt = getInterpreter().adaptivePredict(_input,37,_ctx); while ( _alt!=2 && _alt!=org.antlr.v4.runtime.atn.ATN.INVALID_ALT_NUMBER ) { if ( _alt==1 ) { { { - setState(388); + setState(397); match(COMMA); - setState(389); + setState(398); qualifiedNamePattern(); } } } - setState(394); + setState(403); _errHandler.sync(this); - _alt = getInterpreter().adaptivePredict(_input,36,_ctx); + _alt = getInterpreter().adaptivePredict(_input,37,_ctx); } } } @@ -3260,32 +3371,32 @@ public T accept(ParseTreeVisitor visitor) { public final DropCommandContext dropCommand() throws RecognitionException { DropCommandContext _localctx = new DropCommandContext(_ctx, getState()); - enterRule(_localctx, 58, RULE_dropCommand); + enterRule(_localctx, 62, RULE_dropCommand); try { int _alt; enterOuterAlt(_localctx, 1); { - setState(395); + setState(404); match(DROP); - setState(396); + setState(405); qualifiedNamePattern(); - setState(401); + setState(410); _errHandler.sync(this); - _alt = getInterpreter().adaptivePredict(_input,37,_ctx); + _alt = getInterpreter().adaptivePredict(_input,38,_ctx); while ( _alt!=2 && _alt!=org.antlr.v4.runtime.atn.ATN.INVALID_ALT_NUMBER ) { if ( _alt==1 ) { { { - setState(397); + setState(406); match(COMMA); - setState(398); + setState(407); qualifiedNamePattern(); } } } - setState(403); + setState(412); _errHandler.sync(this); - _alt = getInterpreter().adaptivePredict(_input,37,_ctx); + _alt = getInterpreter().adaptivePredict(_input,38,_ctx); } } } @@ -3335,32 +3446,32 @@ public T accept(ParseTreeVisitor visitor) { public final RenameCommandContext renameCommand() throws RecognitionException { RenameCommandContext _localctx = new RenameCommandContext(_ctx, getState()); - enterRule(_localctx, 60, RULE_renameCommand); + enterRule(_localctx, 64, RULE_renameCommand); try { int _alt; enterOuterAlt(_localctx, 1); { - setState(404); + setState(413); match(RENAME); - setState(405); + setState(414); renameClause(); - setState(410); + setState(419); _errHandler.sync(this); - _alt = getInterpreter().adaptivePredict(_input,38,_ctx); + _alt = getInterpreter().adaptivePredict(_input,39,_ctx); while ( _alt!=2 && _alt!=org.antlr.v4.runtime.atn.ATN.INVALID_ALT_NUMBER ) { if ( _alt==1 ) { { { - setState(406); + setState(415); match(COMMA); - setState(407); + setState(416); renameClause(); } } } - setState(412); + setState(421); _errHandler.sync(this); - _alt = getInterpreter().adaptivePredict(_input,38,_ctx); + _alt = getInterpreter().adaptivePredict(_input,39,_ctx); } } } @@ -3408,15 +3519,15 @@ public T accept(ParseTreeVisitor visitor) { public final RenameClauseContext renameClause() throws RecognitionException { RenameClauseContext _localctx = new RenameClauseContext(_ctx, getState()); - enterRule(_localctx, 62, RULE_renameClause); + enterRule(_localctx, 66, RULE_renameClause); try { enterOuterAlt(_localctx, 1); { - setState(413); + setState(422); ((RenameClauseContext)_localctx).oldName = qualifiedNamePattern(); - setState(414); + setState(423); match(AS); - setState(415); + setState(424); ((RenameClauseContext)_localctx).newName = qualifiedNamePattern(); } } @@ -3465,22 +3576,22 @@ public T accept(ParseTreeVisitor visitor) { public final DissectCommandContext dissectCommand() throws RecognitionException { DissectCommandContext _localctx = new DissectCommandContext(_ctx, getState()); - enterRule(_localctx, 64, RULE_dissectCommand); + enterRule(_localctx, 68, RULE_dissectCommand); try { enterOuterAlt(_localctx, 1); { - setState(417); + setState(426); match(DISSECT); - setState(418); + setState(427); primaryExpression(); - setState(419); + setState(428); string(); - setState(421); + setState(430); _errHandler.sync(this); - switch ( getInterpreter().adaptivePredict(_input,39,_ctx) ) { + switch ( getInterpreter().adaptivePredict(_input,40,_ctx) ) { case 1: { - setState(420); + setState(429); commandOptions(); } break; @@ -3529,15 +3640,15 @@ public T accept(ParseTreeVisitor visitor) { public final GrokCommandContext grokCommand() throws RecognitionException { GrokCommandContext _localctx = new GrokCommandContext(_ctx, getState()); - enterRule(_localctx, 66, RULE_grokCommand); + enterRule(_localctx, 70, RULE_grokCommand); try { enterOuterAlt(_localctx, 1); { - setState(423); + setState(432); match(GROK); - setState(424); + setState(433); primaryExpression(); - setState(425); + setState(434); string(); } } @@ -3580,13 +3691,13 @@ public T accept(ParseTreeVisitor visitor) { public final MvExpandCommandContext mvExpandCommand() throws RecognitionException { MvExpandCommandContext _localctx = new MvExpandCommandContext(_ctx, getState()); - enterRule(_localctx, 68, RULE_mvExpandCommand); + enterRule(_localctx, 72, RULE_mvExpandCommand); try { enterOuterAlt(_localctx, 1); { - setState(427); + setState(436); match(MV_EXPAND); - setState(428); + setState(437); qualifiedName(); } } @@ -3635,30 +3746,30 @@ public T accept(ParseTreeVisitor visitor) { public final CommandOptionsContext commandOptions() throws RecognitionException { CommandOptionsContext _localctx = new CommandOptionsContext(_ctx, getState()); - enterRule(_localctx, 70, RULE_commandOptions); + enterRule(_localctx, 74, RULE_commandOptions); try { int _alt; enterOuterAlt(_localctx, 1); { - setState(430); + setState(439); commandOption(); - setState(435); + setState(444); _errHandler.sync(this); - _alt = getInterpreter().adaptivePredict(_input,40,_ctx); + _alt = getInterpreter().adaptivePredict(_input,41,_ctx); while ( _alt!=2 && _alt!=org.antlr.v4.runtime.atn.ATN.INVALID_ALT_NUMBER ) { if ( _alt==1 ) { { { - setState(431); + setState(440); match(COMMA); - setState(432); + setState(441); commandOption(); } } } - setState(437); + setState(446); _errHandler.sync(this); - _alt = getInterpreter().adaptivePredict(_input,40,_ctx); + _alt = getInterpreter().adaptivePredict(_input,41,_ctx); } } } @@ -3704,15 +3815,15 @@ public T accept(ParseTreeVisitor visitor) { public final CommandOptionContext commandOption() throws RecognitionException { CommandOptionContext _localctx = new CommandOptionContext(_ctx, getState()); - enterRule(_localctx, 72, RULE_commandOption); + enterRule(_localctx, 76, RULE_commandOption); try { enterOuterAlt(_localctx, 1); { - setState(438); + setState(447); identifier(); - setState(439); + setState(448); match(ASSIGN); - setState(440); + setState(449); constant(); } } @@ -3753,12 +3864,12 @@ public T accept(ParseTreeVisitor visitor) { public final BooleanValueContext booleanValue() throws RecognitionException { BooleanValueContext _localctx = new BooleanValueContext(_ctx, getState()); - enterRule(_localctx, 74, RULE_booleanValue); + enterRule(_localctx, 78, RULE_booleanValue); int _la; try { enterOuterAlt(_localctx, 1); { - setState(442); + setState(451); _la = _input.LA(1); if ( !(_la==FALSE || _la==TRUE) ) { _errHandler.recoverInline(this); @@ -3811,22 +3922,22 @@ public T accept(ParseTreeVisitor visitor) { public final NumericValueContext numericValue() throws RecognitionException { NumericValueContext _localctx = new NumericValueContext(_ctx, getState()); - enterRule(_localctx, 76, RULE_numericValue); + enterRule(_localctx, 80, RULE_numericValue); try { - setState(446); + setState(455); _errHandler.sync(this); - switch ( getInterpreter().adaptivePredict(_input,41,_ctx) ) { + switch ( getInterpreter().adaptivePredict(_input,42,_ctx) ) { case 1: enterOuterAlt(_localctx, 1); { - setState(444); + setState(453); decimalValue(); } break; case 2: enterOuterAlt(_localctx, 2); { - setState(445); + setState(454); integerValue(); } break; @@ -3870,17 +3981,17 @@ public T accept(ParseTreeVisitor visitor) { public final DecimalValueContext decimalValue() throws RecognitionException { DecimalValueContext _localctx = new DecimalValueContext(_ctx, getState()); - enterRule(_localctx, 78, RULE_decimalValue); + enterRule(_localctx, 82, RULE_decimalValue); int _la; try { enterOuterAlt(_localctx, 1); { - setState(449); + setState(458); _errHandler.sync(this); _la = _input.LA(1); if (_la==PLUS || _la==MINUS) { { - setState(448); + setState(457); _la = _input.LA(1); if ( !(_la==PLUS || _la==MINUS) ) { _errHandler.recoverInline(this); @@ -3893,7 +4004,7 @@ public final DecimalValueContext decimalValue() throws RecognitionException { } } - setState(451); + setState(460); match(DECIMAL_LITERAL); } } @@ -3935,17 +4046,17 @@ public T accept(ParseTreeVisitor visitor) { public final IntegerValueContext integerValue() throws RecognitionException { IntegerValueContext _localctx = new IntegerValueContext(_ctx, getState()); - enterRule(_localctx, 80, RULE_integerValue); + enterRule(_localctx, 84, RULE_integerValue); int _la; try { enterOuterAlt(_localctx, 1); { - setState(454); + setState(463); _errHandler.sync(this); _la = _input.LA(1); if (_la==PLUS || _la==MINUS) { { - setState(453); + setState(462); _la = _input.LA(1); if ( !(_la==PLUS || _la==MINUS) ) { _errHandler.recoverInline(this); @@ -3958,7 +4069,7 @@ public final IntegerValueContext integerValue() throws RecognitionException { } } - setState(456); + setState(465); match(INTEGER_LITERAL); } } @@ -3998,11 +4109,11 @@ public T accept(ParseTreeVisitor visitor) { public final StringContext string() throws RecognitionException { StringContext _localctx = new StringContext(_ctx, getState()); - enterRule(_localctx, 82, RULE_string); + enterRule(_localctx, 86, RULE_string); try { enterOuterAlt(_localctx, 1); { - setState(458); + setState(467); match(STRING); } } @@ -4048,12 +4159,12 @@ public T accept(ParseTreeVisitor visitor) { public final ComparisonOperatorContext comparisonOperator() throws RecognitionException { ComparisonOperatorContext _localctx = new ComparisonOperatorContext(_ctx, getState()); - enterRule(_localctx, 84, RULE_comparisonOperator); + enterRule(_localctx, 88, RULE_comparisonOperator); int _la; try { enterOuterAlt(_localctx, 1); { - setState(460); + setState(469); _la = _input.LA(1); if ( !(((_la) & ~0x3f) == 0 && ((1L << _la) & 285978576338026496L) != 0) ) { _errHandler.recoverInline(this); @@ -4104,13 +4215,13 @@ public T accept(ParseTreeVisitor visitor) { public final ExplainCommandContext explainCommand() throws RecognitionException { ExplainCommandContext _localctx = new ExplainCommandContext(_ctx, getState()); - enterRule(_localctx, 86, RULE_explainCommand); + enterRule(_localctx, 90, RULE_explainCommand); try { enterOuterAlt(_localctx, 1); { - setState(462); + setState(471); match(EXPLAIN); - setState(463); + setState(472); subqueryExpression(); } } @@ -4154,15 +4265,15 @@ public T accept(ParseTreeVisitor visitor) { public final SubqueryExpressionContext subqueryExpression() throws RecognitionException { SubqueryExpressionContext _localctx = new SubqueryExpressionContext(_ctx, getState()); - enterRule(_localctx, 88, RULE_subqueryExpression); + enterRule(_localctx, 92, RULE_subqueryExpression); try { enterOuterAlt(_localctx, 1); { - setState(465); + setState(474); match(OPENING_BRACKET); - setState(466); + setState(475); query(0); - setState(467); + setState(476); match(CLOSING_BRACKET); } } @@ -4234,18 +4345,18 @@ public T accept(ParseTreeVisitor visitor) { public final ShowCommandContext showCommand() throws RecognitionException { ShowCommandContext _localctx = new ShowCommandContext(_ctx, getState()); - enterRule(_localctx, 90, RULE_showCommand); + enterRule(_localctx, 94, RULE_showCommand); try { - setState(473); + setState(482); _errHandler.sync(this); - switch ( getInterpreter().adaptivePredict(_input,44,_ctx) ) { + switch ( getInterpreter().adaptivePredict(_input,45,_ctx) ) { case 1: _localctx = new ShowInfoContext(_localctx); enterOuterAlt(_localctx, 1); { - setState(469); + setState(478); match(SHOW); - setState(470); + setState(479); match(INFO); } break; @@ -4253,9 +4364,9 @@ public final ShowCommandContext showCommand() throws RecognitionException { _localctx = new ShowFunctionsContext(_localctx); enterOuterAlt(_localctx, 2); { - setState(471); + setState(480); match(SHOW); - setState(472); + setState(481); match(FUNCTIONS); } break; @@ -4321,68 +4432,68 @@ public T accept(ParseTreeVisitor visitor) { public final EnrichCommandContext enrichCommand() throws RecognitionException { EnrichCommandContext _localctx = new EnrichCommandContext(_ctx, getState()); - enterRule(_localctx, 92, RULE_enrichCommand); + enterRule(_localctx, 96, RULE_enrichCommand); int _la; try { int _alt; enterOuterAlt(_localctx, 1); { - setState(475); + setState(484); match(ENRICH); - setState(479); + setState(488); _errHandler.sync(this); _la = _input.LA(1); while (_la==OPENING_BRACKET) { { { - setState(476); + setState(485); setting(); } } - setState(481); + setState(490); _errHandler.sync(this); _la = _input.LA(1); } - setState(482); + setState(491); ((EnrichCommandContext)_localctx).policyName = match(ENRICH_POLICY_NAME); - setState(485); + setState(494); _errHandler.sync(this); - switch ( getInterpreter().adaptivePredict(_input,46,_ctx) ) { + switch ( getInterpreter().adaptivePredict(_input,47,_ctx) ) { case 1: { - setState(483); + setState(492); match(ON); - setState(484); + setState(493); ((EnrichCommandContext)_localctx).matchField = qualifiedNamePattern(); } break; } - setState(496); + setState(505); _errHandler.sync(this); - switch ( getInterpreter().adaptivePredict(_input,48,_ctx) ) { + switch ( getInterpreter().adaptivePredict(_input,49,_ctx) ) { case 1: { - setState(487); + setState(496); match(WITH); - setState(488); + setState(497); enrichWithClause(); - setState(493); + setState(502); _errHandler.sync(this); - _alt = getInterpreter().adaptivePredict(_input,47,_ctx); + _alt = getInterpreter().adaptivePredict(_input,48,_ctx); while ( _alt!=2 && _alt!=org.antlr.v4.runtime.atn.ATN.INVALID_ALT_NUMBER ) { if ( _alt==1 ) { { { - setState(489); + setState(498); match(COMMA); - setState(490); + setState(499); enrichWithClause(); } } } - setState(495); + setState(504); _errHandler.sync(this); - _alt = getInterpreter().adaptivePredict(_input,47,_ctx); + _alt = getInterpreter().adaptivePredict(_input,48,_ctx); } } break; @@ -4433,23 +4544,23 @@ public T accept(ParseTreeVisitor visitor) { public final EnrichWithClauseContext enrichWithClause() throws RecognitionException { EnrichWithClauseContext _localctx = new EnrichWithClauseContext(_ctx, getState()); - enterRule(_localctx, 94, RULE_enrichWithClause); + enterRule(_localctx, 98, RULE_enrichWithClause); try { enterOuterAlt(_localctx, 1); { - setState(501); + setState(510); _errHandler.sync(this); - switch ( getInterpreter().adaptivePredict(_input,49,_ctx) ) { + switch ( getInterpreter().adaptivePredict(_input,50,_ctx) ) { case 1: { - setState(498); + setState(507); ((EnrichWithClauseContext)_localctx).newName = qualifiedNamePattern(); - setState(499); + setState(508); match(ASSIGN); } break; } - setState(503); + setState(512); ((EnrichWithClauseContext)_localctx).enrichField = qualifiedNamePattern(); } } @@ -4497,19 +4608,19 @@ public T accept(ParseTreeVisitor visitor) { public final SettingContext setting() throws RecognitionException { SettingContext _localctx = new SettingContext(_ctx, getState()); - enterRule(_localctx, 96, RULE_setting); + enterRule(_localctx, 100, RULE_setting); try { enterOuterAlt(_localctx, 1); { - setState(505); + setState(514); match(OPENING_BRACKET); - setState(506); + setState(515); ((SettingContext)_localctx).name = match(SETTING); - setState(507); + setState(516); match(COLON); - setState(508); + setState(517); ((SettingContext)_localctx).value = match(SETTING); - setState(509); + setState(518); match(CLOSING_BRACKET); } } @@ -4562,7 +4673,7 @@ private boolean operatorExpression_sempred(OperatorExpressionContext _localctx, } public static final String _serializedATN = - "\u0004\u0001h\u0200\u0002\u0000\u0007\u0000\u0002\u0001\u0007\u0001\u0002"+ + "\u0004\u0001h\u0209\u0002\u0000\u0007\u0000\u0002\u0001\u0007\u0001\u0002"+ "\u0002\u0007\u0002\u0002\u0003\u0007\u0003\u0002\u0004\u0007\u0004\u0002"+ "\u0005\u0007\u0005\u0002\u0006\u0007\u0006\u0002\u0007\u0007\u0007\u0002"+ "\b\u0007\b\u0002\t\u0007\t\u0002\n\u0007\n\u0002\u000b\u0007\u000b\u0002"+ @@ -4575,321 +4686,325 @@ private boolean operatorExpression_sempred(OperatorExpressionContext _localctx, "\u0002\u001f\u0007\u001f\u0002 \u0007 \u0002!\u0007!\u0002\"\u0007\"\u0002"+ "#\u0007#\u0002$\u0007$\u0002%\u0007%\u0002&\u0007&\u0002\'\u0007\'\u0002"+ "(\u0007(\u0002)\u0007)\u0002*\u0007*\u0002+\u0007+\u0002,\u0007,\u0002"+ - "-\u0007-\u0002.\u0007.\u0002/\u0007/\u00020\u00070\u0001\u0000\u0001\u0000"+ - "\u0001\u0000\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001"+ - "\u0001\u0001\u0005\u0001l\b\u0001\n\u0001\f\u0001o\t\u0001\u0001\u0002"+ - "\u0001\u0002\u0001\u0002\u0001\u0002\u0003\u0002u\b\u0002\u0001\u0003"+ - "\u0001\u0003\u0001\u0003\u0001\u0003\u0001\u0003\u0001\u0003\u0001\u0003"+ - "\u0001\u0003\u0001\u0003\u0001\u0003\u0001\u0003\u0001\u0003\u0001\u0003"+ - "\u0003\u0003\u0084\b\u0003\u0001\u0004\u0001\u0004\u0001\u0004\u0001\u0005"+ - "\u0001\u0005\u0001\u0005\u0001\u0005\u0001\u0005\u0001\u0005\u0001\u0005"+ - "\u0003\u0005\u0090\b\u0005\u0001\u0005\u0001\u0005\u0001\u0005\u0001\u0005"+ - "\u0001\u0005\u0005\u0005\u0097\b\u0005\n\u0005\f\u0005\u009a\t\u0005\u0001"+ - "\u0005\u0001\u0005\u0001\u0005\u0001\u0005\u0001\u0005\u0003\u0005\u00a1"+ - "\b\u0005\u0001\u0005\u0001\u0005\u0003\u0005\u00a5\b\u0005\u0001\u0005"+ - "\u0001\u0005\u0001\u0005\u0001\u0005\u0001\u0005\u0001\u0005\u0005\u0005"+ - "\u00ad\b\u0005\n\u0005\f\u0005\u00b0\t\u0005\u0001\u0006\u0001\u0006\u0003"+ - "\u0006\u00b4\b\u0006\u0001\u0006\u0001\u0006\u0001\u0006\u0001\u0006\u0001"+ - "\u0006\u0003\u0006\u00bb\b\u0006\u0001\u0006\u0001\u0006\u0001\u0006\u0003"+ - "\u0006\u00c0\b\u0006\u0001\u0007\u0001\u0007\u0001\u0007\u0001\u0007\u0001"+ - "\u0007\u0003\u0007\u00c7\b\u0007\u0001\b\u0001\b\u0001\b\u0001\b\u0003"+ - "\b\u00cd\b\b\u0001\b\u0001\b\u0001\b\u0001\b\u0001\b\u0001\b\u0005\b\u00d5"+ - "\b\b\n\b\f\b\u00d8\t\b\u0001\t\u0001\t\u0001\t\u0001\t\u0001\t\u0001\t"+ - "\u0001\t\u0003\t\u00e1\b\t\u0001\n\u0001\n\u0001\n\u0001\n\u0001\n\u0001"+ - "\n\u0005\n\u00e9\b\n\n\n\f\n\u00ec\t\n\u0003\n\u00ee\b\n\u0001\n\u0001"+ - "\n\u0001\u000b\u0001\u000b\u0001\u000b\u0001\f\u0001\f\u0001\f\u0005\f"+ - "\u00f8\b\f\n\f\f\f\u00fb\t\f\u0001\r\u0001\r\u0001\r\u0001\r\u0001\r\u0003"+ - "\r\u0102\b\r\u0001\u000e\u0001\u000e\u0001\u000e\u0001\u000e\u0005\u000e"+ - "\u0108\b\u000e\n\u000e\f\u000e\u010b\t\u000e\u0001\u000e\u0003\u000e\u010e"+ - "\b\u000e\u0001\u000f\u0001\u000f\u0001\u000f\u0001\u000f\u0001\u000f\u0005"+ - "\u000f\u0115\b\u000f\n\u000f\f\u000f\u0118\t\u000f\u0001\u000f\u0001\u000f"+ - "\u0001\u0010\u0001\u0010\u0001\u0010\u0001\u0011\u0001\u0011\u0003\u0011"+ - "\u0121\b\u0011\u0001\u0011\u0001\u0011\u0003\u0011\u0125\b\u0011\u0001"+ - "\u0012\u0001\u0012\u0001\u0012\u0001\u0012\u0003\u0012\u012b\b\u0012\u0001"+ - "\u0013\u0001\u0013\u0001\u0014\u0001\u0014\u0001\u0014\u0005\u0014\u0132"+ - "\b\u0014\n\u0014\f\u0014\u0135\t\u0014\u0001\u0015\u0001\u0015\u0001\u0015"+ - "\u0005\u0015\u013a\b\u0015\n\u0015\f\u0015\u013d\t\u0015\u0001\u0016\u0001"+ - "\u0016\u0001\u0017\u0001\u0017\u0001\u0018\u0001\u0018\u0001\u0018\u0001"+ - "\u0018\u0001\u0018\u0001\u0018\u0001\u0018\u0001\u0018\u0001\u0018\u0001"+ - "\u0018\u0001\u0018\u0001\u0018\u0001\u0018\u0005\u0018\u0150\b\u0018\n"+ - "\u0018\f\u0018\u0153\t\u0018\u0001\u0018\u0001\u0018\u0001\u0018\u0001"+ - "\u0018\u0001\u0018\u0001\u0018\u0005\u0018\u015b\b\u0018\n\u0018\f\u0018"+ - "\u015e\t\u0018\u0001\u0018\u0001\u0018\u0001\u0018\u0001\u0018\u0001\u0018"+ - "\u0001\u0018\u0005\u0018\u0166\b\u0018\n\u0018\f\u0018\u0169\t\u0018\u0001"+ - "\u0018\u0001\u0018\u0003\u0018\u016d\b\u0018\u0001\u0019\u0001\u0019\u0001"+ - "\u0019\u0001\u001a\u0001\u001a\u0001\u001a\u0001\u001a\u0005\u001a\u0176"+ - "\b\u001a\n\u001a\f\u001a\u0179\t\u001a\u0001\u001b\u0001\u001b\u0003\u001b"+ - "\u017d\b\u001b\u0001\u001b\u0001\u001b\u0003\u001b\u0181\b\u001b\u0001"+ - "\u001c\u0001\u001c\u0001\u001c\u0001\u001c\u0005\u001c\u0187\b\u001c\n"+ - "\u001c\f\u001c\u018a\t\u001c\u0001\u001d\u0001\u001d\u0001\u001d\u0001"+ - "\u001d\u0005\u001d\u0190\b\u001d\n\u001d\f\u001d\u0193\t\u001d\u0001\u001e"+ - "\u0001\u001e\u0001\u001e\u0001\u001e\u0005\u001e\u0199\b\u001e\n\u001e"+ - "\f\u001e\u019c\t\u001e\u0001\u001f\u0001\u001f\u0001\u001f\u0001\u001f"+ - "\u0001 \u0001 \u0001 \u0001 \u0003 \u01a6\b \u0001!\u0001!\u0001!\u0001"+ - "!\u0001\"\u0001\"\u0001\"\u0001#\u0001#\u0001#\u0005#\u01b2\b#\n#\f#\u01b5"+ - "\t#\u0001$\u0001$\u0001$\u0001$\u0001%\u0001%\u0001&\u0001&\u0003&\u01bf"+ - "\b&\u0001\'\u0003\'\u01c2\b\'\u0001\'\u0001\'\u0001(\u0003(\u01c7\b(\u0001"+ - "(\u0001(\u0001)\u0001)\u0001*\u0001*\u0001+\u0001+\u0001+\u0001,\u0001"+ - ",\u0001,\u0001,\u0001-\u0001-\u0001-\u0001-\u0003-\u01da\b-\u0001.\u0001"+ - ".\u0005.\u01de\b.\n.\f.\u01e1\t.\u0001.\u0001.\u0001.\u0003.\u01e6\b."+ - "\u0001.\u0001.\u0001.\u0001.\u0005.\u01ec\b.\n.\f.\u01ef\t.\u0003.\u01f1"+ - "\b.\u0001/\u0001/\u0001/\u0003/\u01f6\b/\u0001/\u0001/\u00010\u00010\u0001"+ - "0\u00010\u00010\u00010\u00010\u0000\u0003\u0002\n\u00101\u0000\u0002\u0004"+ - "\u0006\b\n\f\u000e\u0010\u0012\u0014\u0016\u0018\u001a\u001c\u001e \""+ - "$&(*,.02468:<>@BDFHJLNPRTVXZ\\^`\u0000\t\u0001\u0000:;\u0001\u0000<>\u0002"+ - "\u0000BBGG\u0001\u0000AB\u0002\u0000BBKK\u0002\u0000\u001f\u001f\"\"\u0001"+ - "\u0000%&\u0002\u0000$$22\u0001\u000039\u021b\u0000b\u0001\u0000\u0000"+ - "\u0000\u0002e\u0001\u0000\u0000\u0000\u0004t\u0001\u0000\u0000\u0000\u0006"+ - "\u0083\u0001\u0000\u0000\u0000\b\u0085\u0001\u0000\u0000\u0000\n\u00a4"+ - "\u0001\u0000\u0000\u0000\f\u00bf\u0001\u0000\u0000\u0000\u000e\u00c6\u0001"+ - "\u0000\u0000\u0000\u0010\u00cc\u0001\u0000\u0000\u0000\u0012\u00e0\u0001"+ - "\u0000\u0000\u0000\u0014\u00e2\u0001\u0000\u0000\u0000\u0016\u00f1\u0001"+ - "\u0000\u0000\u0000\u0018\u00f4\u0001\u0000\u0000\u0000\u001a\u0101\u0001"+ - "\u0000\u0000\u0000\u001c\u0103\u0001\u0000\u0000\u0000\u001e\u010f\u0001"+ - "\u0000\u0000\u0000 \u011b\u0001\u0000\u0000\u0000\"\u011e\u0001\u0000"+ - "\u0000\u0000$\u0126\u0001\u0000\u0000\u0000&\u012c\u0001\u0000\u0000\u0000"+ - "(\u012e\u0001\u0000\u0000\u0000*\u0136\u0001\u0000\u0000\u0000,\u013e"+ - "\u0001\u0000\u0000\u0000.\u0140\u0001\u0000\u0000\u00000\u016c\u0001\u0000"+ - "\u0000\u00002\u016e\u0001\u0000\u0000\u00004\u0171\u0001\u0000\u0000\u0000"+ - "6\u017a\u0001\u0000\u0000\u00008\u0182\u0001\u0000\u0000\u0000:\u018b"+ - "\u0001\u0000\u0000\u0000<\u0194\u0001\u0000\u0000\u0000>\u019d\u0001\u0000"+ - "\u0000\u0000@\u01a1\u0001\u0000\u0000\u0000B\u01a7\u0001\u0000\u0000\u0000"+ - "D\u01ab\u0001\u0000\u0000\u0000F\u01ae\u0001\u0000\u0000\u0000H\u01b6"+ - "\u0001\u0000\u0000\u0000J\u01ba\u0001\u0000\u0000\u0000L\u01be\u0001\u0000"+ - "\u0000\u0000N\u01c1\u0001\u0000\u0000\u0000P\u01c6\u0001\u0000\u0000\u0000"+ - "R\u01ca\u0001\u0000\u0000\u0000T\u01cc\u0001\u0000\u0000\u0000V\u01ce"+ - "\u0001\u0000\u0000\u0000X\u01d1\u0001\u0000\u0000\u0000Z\u01d9\u0001\u0000"+ - "\u0000\u0000\\\u01db\u0001\u0000\u0000\u0000^\u01f5\u0001\u0000\u0000"+ - "\u0000`\u01f9\u0001\u0000\u0000\u0000bc\u0003\u0002\u0001\u0000cd\u0005"+ - "\u0000\u0000\u0001d\u0001\u0001\u0000\u0000\u0000ef\u0006\u0001\uffff"+ - "\uffff\u0000fg\u0003\u0004\u0002\u0000gm\u0001\u0000\u0000\u0000hi\n\u0001"+ - "\u0000\u0000ij\u0005\u0019\u0000\u0000jl\u0003\u0006\u0003\u0000kh\u0001"+ - "\u0000\u0000\u0000lo\u0001\u0000\u0000\u0000mk\u0001\u0000\u0000\u0000"+ - "mn\u0001\u0000\u0000\u0000n\u0003\u0001\u0000\u0000\u0000om\u0001\u0000"+ - "\u0000\u0000pu\u0003V+\u0000qu\u0003\u001c\u000e\u0000ru\u0003\u0016\u000b"+ - "\u0000su\u0003Z-\u0000tp\u0001\u0000\u0000\u0000tq\u0001\u0000\u0000\u0000"+ - "tr\u0001\u0000\u0000\u0000ts\u0001\u0000\u0000\u0000u\u0005\u0001\u0000"+ - "\u0000\u0000v\u0084\u0003 \u0010\u0000w\u0084\u0003$\u0012\u0000x\u0084"+ - "\u00032\u0019\u0000y\u0084\u00038\u001c\u0000z\u0084\u00034\u001a\u0000"+ - "{\u0084\u0003\"\u0011\u0000|\u0084\u0003\b\u0004\u0000}\u0084\u0003:\u001d"+ - "\u0000~\u0084\u0003<\u001e\u0000\u007f\u0084\u0003@ \u0000\u0080\u0084"+ - "\u0003B!\u0000\u0081\u0084\u0003\\.\u0000\u0082\u0084\u0003D\"\u0000\u0083"+ - "v\u0001\u0000\u0000\u0000\u0083w\u0001\u0000\u0000\u0000\u0083x\u0001"+ - "\u0000\u0000\u0000\u0083y\u0001\u0000\u0000\u0000\u0083z\u0001\u0000\u0000"+ - "\u0000\u0083{\u0001\u0000\u0000\u0000\u0083|\u0001\u0000\u0000\u0000\u0083"+ - "}\u0001\u0000\u0000\u0000\u0083~\u0001\u0000\u0000\u0000\u0083\u007f\u0001"+ - "\u0000\u0000\u0000\u0083\u0080\u0001\u0000\u0000\u0000\u0083\u0081\u0001"+ - "\u0000\u0000\u0000\u0083\u0082\u0001\u0000\u0000\u0000\u0084\u0007\u0001"+ - "\u0000\u0000\u0000\u0085\u0086\u0005\u0011\u0000\u0000\u0086\u0087\u0003"+ - "\n\u0005\u0000\u0087\t\u0001\u0000\u0000\u0000\u0088\u0089\u0006\u0005"+ - "\uffff\uffff\u0000\u0089\u008a\u0005+\u0000\u0000\u008a\u00a5\u0003\n"+ - "\u0005\u0007\u008b\u00a5\u0003\u000e\u0007\u0000\u008c\u00a5\u0003\f\u0006"+ - "\u0000\u008d\u008f\u0003\u000e\u0007\u0000\u008e\u0090\u0005+\u0000\u0000"+ - "\u008f\u008e\u0001\u0000\u0000\u0000\u008f\u0090\u0001\u0000\u0000\u0000"+ - "\u0090\u0091\u0001\u0000\u0000\u0000\u0091\u0092\u0005(\u0000\u0000\u0092"+ - "\u0093\u0005\'\u0000\u0000\u0093\u0098\u0003\u000e\u0007\u0000\u0094\u0095"+ - "\u0005!\u0000\u0000\u0095\u0097\u0003\u000e\u0007\u0000\u0096\u0094\u0001"+ - "\u0000\u0000\u0000\u0097\u009a\u0001\u0000\u0000\u0000\u0098\u0096\u0001"+ - "\u0000\u0000\u0000\u0098\u0099\u0001\u0000\u0000\u0000\u0099\u009b\u0001"+ - "\u0000\u0000\u0000\u009a\u0098\u0001\u0000\u0000\u0000\u009b\u009c\u0005"+ - "1\u0000\u0000\u009c\u00a5\u0001\u0000\u0000\u0000\u009d\u009e\u0003\u000e"+ - "\u0007\u0000\u009e\u00a0\u0005)\u0000\u0000\u009f\u00a1\u0005+\u0000\u0000"+ - "\u00a0\u009f\u0001\u0000\u0000\u0000\u00a0\u00a1\u0001\u0000\u0000\u0000"+ - "\u00a1\u00a2\u0001\u0000\u0000\u0000\u00a2\u00a3\u0005,\u0000\u0000\u00a3"+ - "\u00a5\u0001\u0000\u0000\u0000\u00a4\u0088\u0001\u0000\u0000\u0000\u00a4"+ - "\u008b\u0001\u0000\u0000\u0000\u00a4\u008c\u0001\u0000\u0000\u0000\u00a4"+ - "\u008d\u0001\u0000\u0000\u0000\u00a4\u009d\u0001\u0000\u0000\u0000\u00a5"+ - "\u00ae\u0001\u0000\u0000\u0000\u00a6\u00a7\n\u0004\u0000\u0000\u00a7\u00a8"+ - "\u0005\u001e\u0000\u0000\u00a8\u00ad\u0003\n\u0005\u0005\u00a9\u00aa\n"+ - "\u0003\u0000\u0000\u00aa\u00ab\u0005.\u0000\u0000\u00ab\u00ad\u0003\n"+ - "\u0005\u0004\u00ac\u00a6\u0001\u0000\u0000\u0000\u00ac\u00a9\u0001\u0000"+ - "\u0000\u0000\u00ad\u00b0\u0001\u0000\u0000\u0000\u00ae\u00ac\u0001\u0000"+ - "\u0000\u0000\u00ae\u00af\u0001\u0000\u0000\u0000\u00af\u000b\u0001\u0000"+ - "\u0000\u0000\u00b0\u00ae\u0001\u0000\u0000\u0000\u00b1\u00b3\u0003\u000e"+ - "\u0007\u0000\u00b2\u00b4\u0005+\u0000\u0000\u00b3\u00b2\u0001\u0000\u0000"+ - "\u0000\u00b3\u00b4\u0001\u0000\u0000\u0000\u00b4\u00b5\u0001\u0000\u0000"+ - "\u0000\u00b5\u00b6\u0005*\u0000\u0000\u00b6\u00b7\u0003R)\u0000\u00b7"+ - "\u00c0\u0001\u0000\u0000\u0000\u00b8\u00ba\u0003\u000e\u0007\u0000\u00b9"+ - "\u00bb\u0005+\u0000\u0000\u00ba\u00b9\u0001\u0000\u0000\u0000\u00ba\u00bb"+ - "\u0001\u0000\u0000\u0000\u00bb\u00bc\u0001\u0000\u0000\u0000\u00bc\u00bd"+ - "\u00050\u0000\u0000\u00bd\u00be\u0003R)\u0000\u00be\u00c0\u0001\u0000"+ - "\u0000\u0000\u00bf\u00b1\u0001\u0000\u0000\u0000\u00bf\u00b8\u0001\u0000"+ - "\u0000\u0000\u00c0\r\u0001\u0000\u0000\u0000\u00c1\u00c7\u0003\u0010\b"+ - "\u0000\u00c2\u00c3\u0003\u0010\b\u0000\u00c3\u00c4\u0003T*\u0000\u00c4"+ - "\u00c5\u0003\u0010\b\u0000\u00c5\u00c7\u0001\u0000\u0000\u0000\u00c6\u00c1"+ - "\u0001\u0000\u0000\u0000\u00c6\u00c2\u0001\u0000\u0000\u0000\u00c7\u000f"+ - "\u0001\u0000\u0000\u0000\u00c8\u00c9\u0006\b\uffff\uffff\u0000\u00c9\u00cd"+ - "\u0003\u0012\t\u0000\u00ca\u00cb\u0007\u0000\u0000\u0000\u00cb\u00cd\u0003"+ - "\u0010\b\u0003\u00cc\u00c8\u0001\u0000\u0000\u0000\u00cc\u00ca\u0001\u0000"+ - "\u0000\u0000\u00cd\u00d6\u0001\u0000\u0000\u0000\u00ce\u00cf\n\u0002\u0000"+ - "\u0000\u00cf\u00d0\u0007\u0001\u0000\u0000\u00d0\u00d5\u0003\u0010\b\u0003"+ - "\u00d1\u00d2\n\u0001\u0000\u0000\u00d2\u00d3\u0007\u0000\u0000\u0000\u00d3"+ - "\u00d5\u0003\u0010\b\u0002\u00d4\u00ce\u0001\u0000\u0000\u0000\u00d4\u00d1"+ - "\u0001\u0000\u0000\u0000\u00d5\u00d8\u0001\u0000\u0000\u0000\u00d6\u00d4"+ - "\u0001\u0000\u0000\u0000\u00d6\u00d7\u0001\u0000\u0000\u0000\u00d7\u0011"+ - "\u0001\u0000\u0000\u0000\u00d8\u00d6\u0001\u0000\u0000\u0000\u00d9\u00e1"+ - "\u00030\u0018\u0000\u00da\u00e1\u0003(\u0014\u0000\u00db\u00e1\u0003\u0014"+ - "\n\u0000\u00dc\u00dd\u0005\'\u0000\u0000\u00dd\u00de\u0003\n\u0005\u0000"+ - "\u00de\u00df\u00051\u0000\u0000\u00df\u00e1\u0001\u0000\u0000\u0000\u00e0"+ - "\u00d9\u0001\u0000\u0000\u0000\u00e0\u00da\u0001\u0000\u0000\u0000\u00e0"+ - "\u00db\u0001\u0000\u0000\u0000\u00e0\u00dc\u0001\u0000\u0000\u0000\u00e1"+ - "\u0013\u0001\u0000\u0000\u0000\u00e2\u00e3\u0003,\u0016\u0000\u00e3\u00ed"+ - "\u0005\'\u0000\u0000\u00e4\u00ee\u0005<\u0000\u0000\u00e5\u00ea\u0003"+ - "\n\u0005\u0000\u00e6\u00e7\u0005!\u0000\u0000\u00e7\u00e9\u0003\n\u0005"+ - "\u0000\u00e8\u00e6\u0001\u0000\u0000\u0000\u00e9\u00ec\u0001\u0000\u0000"+ - "\u0000\u00ea\u00e8\u0001\u0000\u0000\u0000\u00ea\u00eb\u0001\u0000\u0000"+ - "\u0000\u00eb\u00ee\u0001\u0000\u0000\u0000\u00ec\u00ea\u0001\u0000\u0000"+ - "\u0000\u00ed\u00e4\u0001\u0000\u0000\u0000\u00ed\u00e5\u0001\u0000\u0000"+ - "\u0000\u00ed\u00ee\u0001\u0000\u0000\u0000\u00ee\u00ef\u0001\u0000\u0000"+ - "\u0000\u00ef\u00f0\u00051\u0000\u0000\u00f0\u0015\u0001\u0000\u0000\u0000"+ - "\u00f1\u00f2\u0005\r\u0000\u0000\u00f2\u00f3\u0003\u0018\f\u0000\u00f3"+ - "\u0017\u0001\u0000\u0000\u0000\u00f4\u00f9\u0003\u001a\r\u0000\u00f5\u00f6"+ - "\u0005!\u0000\u0000\u00f6\u00f8\u0003\u001a\r\u0000\u00f7\u00f5\u0001"+ - "\u0000\u0000\u0000\u00f8\u00fb\u0001\u0000\u0000\u0000\u00f9\u00f7\u0001"+ - "\u0000\u0000\u0000\u00f9\u00fa\u0001\u0000\u0000\u0000\u00fa\u0019\u0001"+ - "\u0000\u0000\u0000\u00fb\u00f9\u0001\u0000\u0000\u0000\u00fc\u0102\u0003"+ - "\n\u0005\u0000\u00fd\u00fe\u0003(\u0014\u0000\u00fe\u00ff\u0005 \u0000"+ - "\u0000\u00ff\u0100\u0003\n\u0005\u0000\u0100\u0102\u0001\u0000\u0000\u0000"+ - "\u0101\u00fc\u0001\u0000\u0000\u0000\u0101\u00fd\u0001\u0000\u0000\u0000"+ - "\u0102\u001b\u0001\u0000\u0000\u0000\u0103\u0104\u0005\u0006\u0000\u0000"+ - "\u0104\u0109\u0003&\u0013\u0000\u0105\u0106\u0005!\u0000\u0000\u0106\u0108"+ - "\u0003&\u0013\u0000\u0107\u0105\u0001\u0000\u0000\u0000\u0108\u010b\u0001"+ - "\u0000\u0000\u0000\u0109\u0107\u0001\u0000\u0000\u0000\u0109\u010a\u0001"+ - "\u0000\u0000\u0000\u010a\u010d\u0001\u0000\u0000\u0000\u010b\u0109\u0001"+ - "\u0000\u0000\u0000\u010c\u010e\u0003\u001e\u000f\u0000\u010d\u010c\u0001"+ - "\u0000\u0000\u0000\u010d\u010e\u0001\u0000\u0000\u0000\u010e\u001d\u0001"+ - "\u0000\u0000\u0000\u010f\u0110\u0005?\u0000\u0000\u0110\u0111\u0005F\u0000"+ - "\u0000\u0111\u0116\u0003&\u0013\u0000\u0112\u0113\u0005!\u0000\u0000\u0113"+ - "\u0115\u0003&\u0013\u0000\u0114\u0112\u0001\u0000\u0000\u0000\u0115\u0118"+ - "\u0001\u0000\u0000\u0000\u0116\u0114\u0001\u0000\u0000\u0000\u0116\u0117"+ - "\u0001\u0000\u0000\u0000\u0117\u0119\u0001\u0000\u0000\u0000\u0118\u0116"+ - "\u0001\u0000\u0000\u0000\u0119\u011a\u0005@\u0000\u0000\u011a\u001f\u0001"+ - "\u0000\u0000\u0000\u011b\u011c\u0005\u0004\u0000\u0000\u011c\u011d\u0003"+ - "\u0018\f\u0000\u011d!\u0001\u0000\u0000\u0000\u011e\u0120\u0005\u0010"+ - "\u0000\u0000\u011f\u0121\u0003\u0018\f\u0000\u0120\u011f\u0001\u0000\u0000"+ - "\u0000\u0120\u0121\u0001\u0000\u0000\u0000\u0121\u0124\u0001\u0000\u0000"+ - "\u0000\u0122\u0123\u0005\u001d\u0000\u0000\u0123\u0125\u0003\u0018\f\u0000"+ - "\u0124\u0122\u0001\u0000\u0000\u0000\u0124\u0125\u0001\u0000\u0000\u0000"+ - "\u0125#\u0001\u0000\u0000\u0000\u0126\u0127\u0005\b\u0000\u0000\u0127"+ - "\u012a\u0003\u0018\f\u0000\u0128\u0129\u0005\u001d\u0000\u0000\u0129\u012b"+ - "\u0003\u0018\f\u0000\u012a\u0128\u0001\u0000\u0000\u0000\u012a\u012b\u0001"+ - "\u0000\u0000\u0000\u012b%\u0001\u0000\u0000\u0000\u012c\u012d\u0007\u0002"+ - "\u0000\u0000\u012d\'\u0001\u0000\u0000\u0000\u012e\u0133\u0003,\u0016"+ - "\u0000\u012f\u0130\u0005#\u0000\u0000\u0130\u0132\u0003,\u0016\u0000\u0131"+ - "\u012f\u0001\u0000\u0000\u0000\u0132\u0135\u0001\u0000\u0000\u0000\u0133"+ + "-\u0007-\u0002.\u0007.\u0002/\u0007/\u00020\u00070\u00021\u00071\u0002"+ + "2\u00072\u0001\u0000\u0001\u0000\u0001\u0000\u0001\u0001\u0001\u0001\u0001"+ + "\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0005\u0001p\b\u0001\n\u0001"+ + "\f\u0001s\t\u0001\u0001\u0002\u0001\u0002\u0001\u0002\u0001\u0002\u0003"+ + "\u0002y\b\u0002\u0001\u0003\u0001\u0003\u0001\u0003\u0001\u0003\u0001"+ + "\u0003\u0001\u0003\u0001\u0003\u0001\u0003\u0001\u0003\u0001\u0003\u0001"+ + "\u0003\u0001\u0003\u0001\u0003\u0003\u0003\u0088\b\u0003\u0001\u0004\u0001"+ + "\u0004\u0001\u0004\u0001\u0005\u0001\u0005\u0001\u0005\u0001\u0005\u0001"+ + "\u0005\u0001\u0005\u0001\u0005\u0003\u0005\u0094\b\u0005\u0001\u0005\u0001"+ + "\u0005\u0001\u0005\u0001\u0005\u0001\u0005\u0005\u0005\u009b\b\u0005\n"+ + "\u0005\f\u0005\u009e\t\u0005\u0001\u0005\u0001\u0005\u0001\u0005\u0001"+ + "\u0005\u0001\u0005\u0003\u0005\u00a5\b\u0005\u0001\u0005\u0001\u0005\u0003"+ + "\u0005\u00a9\b\u0005\u0001\u0005\u0001\u0005\u0001\u0005\u0001\u0005\u0001"+ + "\u0005\u0001\u0005\u0005\u0005\u00b1\b\u0005\n\u0005\f\u0005\u00b4\t\u0005"+ + "\u0001\u0006\u0001\u0006\u0003\u0006\u00b8\b\u0006\u0001\u0006\u0001\u0006"+ + "\u0001\u0006\u0001\u0006\u0001\u0006\u0003\u0006\u00bf\b\u0006\u0001\u0006"+ + "\u0001\u0006\u0001\u0006\u0003\u0006\u00c4\b\u0006\u0001\u0007\u0001\u0007"+ + "\u0001\u0007\u0001\u0007\u0001\u0007\u0003\u0007\u00cb\b\u0007\u0001\b"+ + "\u0001\b\u0001\b\u0001\b\u0003\b\u00d1\b\b\u0001\b\u0001\b\u0001\b\u0001"+ + "\b\u0001\b\u0001\b\u0005\b\u00d9\b\b\n\b\f\b\u00dc\t\b\u0001\t\u0001\t"+ + "\u0001\t\u0001\t\u0001\t\u0001\t\u0001\t\u0003\t\u00e5\b\t\u0001\n\u0001"+ + "\n\u0001\n\u0001\n\u0001\n\u0001\n\u0005\n\u00ed\b\n\n\n\f\n\u00f0\t\n"+ + "\u0003\n\u00f2\b\n\u0001\n\u0001\n\u0001\u000b\u0001\u000b\u0001\u000b"+ + "\u0001\f\u0001\f\u0001\f\u0005\f\u00fc\b\f\n\f\f\f\u00ff\t\f\u0001\r\u0001"+ + "\r\u0001\r\u0001\r\u0001\r\u0003\r\u0106\b\r\u0001\u000e\u0001\u000e\u0001"+ + "\u000e\u0001\u000e\u0005\u000e\u010c\b\u000e\n\u000e\f\u000e\u010f\t\u000e"+ + "\u0001\u000e\u0003\u000e\u0112\b\u000e\u0001\u000f\u0001\u000f\u0003\u000f"+ + "\u0116\b\u000f\u0001\u0010\u0001\u0010\u0001\u0010\u0001\u0010\u0005\u0010"+ + "\u011c\b\u0010\n\u0010\f\u0010\u011f\t\u0010\u0001\u0011\u0001\u0011\u0001"+ + "\u0011\u0001\u0011\u0001\u0012\u0001\u0012\u0001\u0012\u0001\u0013\u0001"+ + "\u0013\u0003\u0013\u012a\b\u0013\u0001\u0013\u0001\u0013\u0003\u0013\u012e"+ + "\b\u0013\u0001\u0014\u0001\u0014\u0001\u0014\u0001\u0014\u0003\u0014\u0134"+ + "\b\u0014\u0001\u0015\u0001\u0015\u0001\u0016\u0001\u0016\u0001\u0016\u0005"+ + "\u0016\u013b\b\u0016\n\u0016\f\u0016\u013e\t\u0016\u0001\u0017\u0001\u0017"+ + "\u0001\u0017\u0005\u0017\u0143\b\u0017\n\u0017\f\u0017\u0146\t\u0017\u0001"+ + "\u0018\u0001\u0018\u0001\u0019\u0001\u0019\u0001\u001a\u0001\u001a\u0001"+ + "\u001a\u0001\u001a\u0001\u001a\u0001\u001a\u0001\u001a\u0001\u001a\u0001"+ + "\u001a\u0001\u001a\u0001\u001a\u0001\u001a\u0001\u001a\u0005\u001a\u0159"+ + "\b\u001a\n\u001a\f\u001a\u015c\t\u001a\u0001\u001a\u0001\u001a\u0001\u001a"+ + "\u0001\u001a\u0001\u001a\u0001\u001a\u0005\u001a\u0164\b\u001a\n\u001a"+ + "\f\u001a\u0167\t\u001a\u0001\u001a\u0001\u001a\u0001\u001a\u0001\u001a"+ + "\u0001\u001a\u0001\u001a\u0005\u001a\u016f\b\u001a\n\u001a\f\u001a\u0172"+ + "\t\u001a\u0001\u001a\u0001\u001a\u0003\u001a\u0176\b\u001a\u0001\u001b"+ + "\u0001\u001b\u0001\u001b\u0001\u001c\u0001\u001c\u0001\u001c\u0001\u001c"+ + "\u0005\u001c\u017f\b\u001c\n\u001c\f\u001c\u0182\t\u001c\u0001\u001d\u0001"+ + "\u001d\u0003\u001d\u0186\b\u001d\u0001\u001d\u0001\u001d\u0003\u001d\u018a"+ + "\b\u001d\u0001\u001e\u0001\u001e\u0001\u001e\u0001\u001e\u0005\u001e\u0190"+ + "\b\u001e\n\u001e\f\u001e\u0193\t\u001e\u0001\u001f\u0001\u001f\u0001\u001f"+ + "\u0001\u001f\u0005\u001f\u0199\b\u001f\n\u001f\f\u001f\u019c\t\u001f\u0001"+ + " \u0001 \u0001 \u0001 \u0005 \u01a2\b \n \f \u01a5\t \u0001!\u0001!\u0001"+ + "!\u0001!\u0001\"\u0001\"\u0001\"\u0001\"\u0003\"\u01af\b\"\u0001#\u0001"+ + "#\u0001#\u0001#\u0001$\u0001$\u0001$\u0001%\u0001%\u0001%\u0005%\u01bb"+ + "\b%\n%\f%\u01be\t%\u0001&\u0001&\u0001&\u0001&\u0001\'\u0001\'\u0001("+ + "\u0001(\u0003(\u01c8\b(\u0001)\u0003)\u01cb\b)\u0001)\u0001)\u0001*\u0003"+ + "*\u01d0\b*\u0001*\u0001*\u0001+\u0001+\u0001,\u0001,\u0001-\u0001-\u0001"+ + "-\u0001.\u0001.\u0001.\u0001.\u0001/\u0001/\u0001/\u0001/\u0003/\u01e3"+ + "\b/\u00010\u00010\u00050\u01e7\b0\n0\f0\u01ea\t0\u00010\u00010\u00010"+ + "\u00030\u01ef\b0\u00010\u00010\u00010\u00010\u00050\u01f5\b0\n0\f0\u01f8"+ + "\t0\u00030\u01fa\b0\u00011\u00011\u00011\u00031\u01ff\b1\u00011\u0001"+ + "1\u00012\u00012\u00012\u00012\u00012\u00012\u00012\u0000\u0003\u0002\n"+ + "\u00103\u0000\u0002\u0004\u0006\b\n\f\u000e\u0010\u0012\u0014\u0016\u0018"+ + "\u001a\u001c\u001e \"$&(*,.02468:<>@BDFHJLNPRTVXZ\\^`bd\u0000\t\u0001"+ + "\u0000:;\u0001\u0000<>\u0002\u0000BBGG\u0001\u0000AB\u0002\u0000BBKK\u0002"+ + "\u0000\u001f\u001f\"\"\u0001\u0000%&\u0002\u0000$$22\u0001\u000039\u0223"+ + "\u0000f\u0001\u0000\u0000\u0000\u0002i\u0001\u0000\u0000\u0000\u0004x"+ + "\u0001\u0000\u0000\u0000\u0006\u0087\u0001\u0000\u0000\u0000\b\u0089\u0001"+ + "\u0000\u0000\u0000\n\u00a8\u0001\u0000\u0000\u0000\f\u00c3\u0001\u0000"+ + "\u0000\u0000\u000e\u00ca\u0001\u0000\u0000\u0000\u0010\u00d0\u0001\u0000"+ + "\u0000\u0000\u0012\u00e4\u0001\u0000\u0000\u0000\u0014\u00e6\u0001\u0000"+ + "\u0000\u0000\u0016\u00f5\u0001\u0000\u0000\u0000\u0018\u00f8\u0001\u0000"+ + "\u0000\u0000\u001a\u0105\u0001\u0000\u0000\u0000\u001c\u0107\u0001\u0000"+ + "\u0000\u0000\u001e\u0115\u0001\u0000\u0000\u0000 \u0117\u0001\u0000\u0000"+ + "\u0000\"\u0120\u0001\u0000\u0000\u0000$\u0124\u0001\u0000\u0000\u0000"+ + "&\u0127\u0001\u0000\u0000\u0000(\u012f\u0001\u0000\u0000\u0000*\u0135"+ + "\u0001\u0000\u0000\u0000,\u0137\u0001\u0000\u0000\u0000.\u013f\u0001\u0000"+ + "\u0000\u00000\u0147\u0001\u0000\u0000\u00002\u0149\u0001\u0000\u0000\u0000"+ + "4\u0175\u0001\u0000\u0000\u00006\u0177\u0001\u0000\u0000\u00008\u017a"+ + "\u0001\u0000\u0000\u0000:\u0183\u0001\u0000\u0000\u0000<\u018b\u0001\u0000"+ + "\u0000\u0000>\u0194\u0001\u0000\u0000\u0000@\u019d\u0001\u0000\u0000\u0000"+ + "B\u01a6\u0001\u0000\u0000\u0000D\u01aa\u0001\u0000\u0000\u0000F\u01b0"+ + "\u0001\u0000\u0000\u0000H\u01b4\u0001\u0000\u0000\u0000J\u01b7\u0001\u0000"+ + "\u0000\u0000L\u01bf\u0001\u0000\u0000\u0000N\u01c3\u0001\u0000\u0000\u0000"+ + "P\u01c7\u0001\u0000\u0000\u0000R\u01ca\u0001\u0000\u0000\u0000T\u01cf"+ + "\u0001\u0000\u0000\u0000V\u01d3\u0001\u0000\u0000\u0000X\u01d5\u0001\u0000"+ + "\u0000\u0000Z\u01d7\u0001\u0000\u0000\u0000\\\u01da\u0001\u0000\u0000"+ + "\u0000^\u01e2\u0001\u0000\u0000\u0000`\u01e4\u0001\u0000\u0000\u0000b"+ + "\u01fe\u0001\u0000\u0000\u0000d\u0202\u0001\u0000\u0000\u0000fg\u0003"+ + "\u0002\u0001\u0000gh\u0005\u0000\u0000\u0001h\u0001\u0001\u0000\u0000"+ + "\u0000ij\u0006\u0001\uffff\uffff\u0000jk\u0003\u0004\u0002\u0000kq\u0001"+ + "\u0000\u0000\u0000lm\n\u0001\u0000\u0000mn\u0005\u0019\u0000\u0000np\u0003"+ + "\u0006\u0003\u0000ol\u0001\u0000\u0000\u0000ps\u0001\u0000\u0000\u0000"+ + "qo\u0001\u0000\u0000\u0000qr\u0001\u0000\u0000\u0000r\u0003\u0001\u0000"+ + "\u0000\u0000sq\u0001\u0000\u0000\u0000ty\u0003Z-\u0000uy\u0003\u001c\u000e"+ + "\u0000vy\u0003\u0016\u000b\u0000wy\u0003^/\u0000xt\u0001\u0000\u0000\u0000"+ + "xu\u0001\u0000\u0000\u0000xv\u0001\u0000\u0000\u0000xw\u0001\u0000\u0000"+ + "\u0000y\u0005\u0001\u0000\u0000\u0000z\u0088\u0003$\u0012\u0000{\u0088"+ + "\u0003(\u0014\u0000|\u0088\u00036\u001b\u0000}\u0088\u0003<\u001e\u0000"+ + "~\u0088\u00038\u001c\u0000\u007f\u0088\u0003&\u0013\u0000\u0080\u0088"+ + "\u0003\b\u0004\u0000\u0081\u0088\u0003>\u001f\u0000\u0082\u0088\u0003"+ + "@ \u0000\u0083\u0088\u0003D\"\u0000\u0084\u0088\u0003F#\u0000\u0085\u0088"+ + "\u0003`0\u0000\u0086\u0088\u0003H$\u0000\u0087z\u0001\u0000\u0000\u0000"+ + "\u0087{\u0001\u0000\u0000\u0000\u0087|\u0001\u0000\u0000\u0000\u0087}"+ + "\u0001\u0000\u0000\u0000\u0087~\u0001\u0000\u0000\u0000\u0087\u007f\u0001"+ + "\u0000\u0000\u0000\u0087\u0080\u0001\u0000\u0000\u0000\u0087\u0081\u0001"+ + "\u0000\u0000\u0000\u0087\u0082\u0001\u0000\u0000\u0000\u0087\u0083\u0001"+ + "\u0000\u0000\u0000\u0087\u0084\u0001\u0000\u0000\u0000\u0087\u0085\u0001"+ + "\u0000\u0000\u0000\u0087\u0086\u0001\u0000\u0000\u0000\u0088\u0007\u0001"+ + "\u0000\u0000\u0000\u0089\u008a\u0005\u0011\u0000\u0000\u008a\u008b\u0003"+ + "\n\u0005\u0000\u008b\t\u0001\u0000\u0000\u0000\u008c\u008d\u0006\u0005"+ + "\uffff\uffff\u0000\u008d\u008e\u0005+\u0000\u0000\u008e\u00a9\u0003\n"+ + "\u0005\u0007\u008f\u00a9\u0003\u000e\u0007\u0000\u0090\u00a9\u0003\f\u0006"+ + "\u0000\u0091\u0093\u0003\u000e\u0007\u0000\u0092\u0094\u0005+\u0000\u0000"+ + "\u0093\u0092\u0001\u0000\u0000\u0000\u0093\u0094\u0001\u0000\u0000\u0000"+ + "\u0094\u0095\u0001\u0000\u0000\u0000\u0095\u0096\u0005(\u0000\u0000\u0096"+ + "\u0097\u0005\'\u0000\u0000\u0097\u009c\u0003\u000e\u0007\u0000\u0098\u0099"+ + "\u0005!\u0000\u0000\u0099\u009b\u0003\u000e\u0007\u0000\u009a\u0098\u0001"+ + "\u0000\u0000\u0000\u009b\u009e\u0001\u0000\u0000\u0000\u009c\u009a\u0001"+ + "\u0000\u0000\u0000\u009c\u009d\u0001\u0000\u0000\u0000\u009d\u009f\u0001"+ + "\u0000\u0000\u0000\u009e\u009c\u0001\u0000\u0000\u0000\u009f\u00a0\u0005"+ + "1\u0000\u0000\u00a0\u00a9\u0001\u0000\u0000\u0000\u00a1\u00a2\u0003\u000e"+ + "\u0007\u0000\u00a2\u00a4\u0005)\u0000\u0000\u00a3\u00a5\u0005+\u0000\u0000"+ + "\u00a4\u00a3\u0001\u0000\u0000\u0000\u00a4\u00a5\u0001\u0000\u0000\u0000"+ + "\u00a5\u00a6\u0001\u0000\u0000\u0000\u00a6\u00a7\u0005,\u0000\u0000\u00a7"+ + "\u00a9\u0001\u0000\u0000\u0000\u00a8\u008c\u0001\u0000\u0000\u0000\u00a8"+ + "\u008f\u0001\u0000\u0000\u0000\u00a8\u0090\u0001\u0000\u0000\u0000\u00a8"+ + "\u0091\u0001\u0000\u0000\u0000\u00a8\u00a1\u0001\u0000\u0000\u0000\u00a9"+ + "\u00b2\u0001\u0000\u0000\u0000\u00aa\u00ab\n\u0004\u0000\u0000\u00ab\u00ac"+ + "\u0005\u001e\u0000\u0000\u00ac\u00b1\u0003\n\u0005\u0005\u00ad\u00ae\n"+ + "\u0003\u0000\u0000\u00ae\u00af\u0005.\u0000\u0000\u00af\u00b1\u0003\n"+ + "\u0005\u0004\u00b0\u00aa\u0001\u0000\u0000\u0000\u00b0\u00ad\u0001\u0000"+ + "\u0000\u0000\u00b1\u00b4\u0001\u0000\u0000\u0000\u00b2\u00b0\u0001\u0000"+ + "\u0000\u0000\u00b2\u00b3\u0001\u0000\u0000\u0000\u00b3\u000b\u0001\u0000"+ + "\u0000\u0000\u00b4\u00b2\u0001\u0000\u0000\u0000\u00b5\u00b7\u0003\u000e"+ + "\u0007\u0000\u00b6\u00b8\u0005+\u0000\u0000\u00b7\u00b6\u0001\u0000\u0000"+ + "\u0000\u00b7\u00b8\u0001\u0000\u0000\u0000\u00b8\u00b9\u0001\u0000\u0000"+ + "\u0000\u00b9\u00ba\u0005*\u0000\u0000\u00ba\u00bb\u0003V+\u0000\u00bb"+ + "\u00c4\u0001\u0000\u0000\u0000\u00bc\u00be\u0003\u000e\u0007\u0000\u00bd"+ + "\u00bf\u0005+\u0000\u0000\u00be\u00bd\u0001\u0000\u0000\u0000\u00be\u00bf"+ + "\u0001\u0000\u0000\u0000\u00bf\u00c0\u0001\u0000\u0000\u0000\u00c0\u00c1"+ + "\u00050\u0000\u0000\u00c1\u00c2\u0003V+\u0000\u00c2\u00c4\u0001\u0000"+ + "\u0000\u0000\u00c3\u00b5\u0001\u0000\u0000\u0000\u00c3\u00bc\u0001\u0000"+ + "\u0000\u0000\u00c4\r\u0001\u0000\u0000\u0000\u00c5\u00cb\u0003\u0010\b"+ + "\u0000\u00c6\u00c7\u0003\u0010\b\u0000\u00c7\u00c8\u0003X,\u0000\u00c8"+ + "\u00c9\u0003\u0010\b\u0000\u00c9\u00cb\u0001\u0000\u0000\u0000\u00ca\u00c5"+ + "\u0001\u0000\u0000\u0000\u00ca\u00c6\u0001\u0000\u0000\u0000\u00cb\u000f"+ + "\u0001\u0000\u0000\u0000\u00cc\u00cd\u0006\b\uffff\uffff\u0000\u00cd\u00d1"+ + "\u0003\u0012\t\u0000\u00ce\u00cf\u0007\u0000\u0000\u0000\u00cf\u00d1\u0003"+ + "\u0010\b\u0003\u00d0\u00cc\u0001\u0000\u0000\u0000\u00d0\u00ce\u0001\u0000"+ + "\u0000\u0000\u00d1\u00da\u0001\u0000\u0000\u0000\u00d2\u00d3\n\u0002\u0000"+ + "\u0000\u00d3\u00d4\u0007\u0001\u0000\u0000\u00d4\u00d9\u0003\u0010\b\u0003"+ + "\u00d5\u00d6\n\u0001\u0000\u0000\u00d6\u00d7\u0007\u0000\u0000\u0000\u00d7"+ + "\u00d9\u0003\u0010\b\u0002\u00d8\u00d2\u0001\u0000\u0000\u0000\u00d8\u00d5"+ + "\u0001\u0000\u0000\u0000\u00d9\u00dc\u0001\u0000\u0000\u0000\u00da\u00d8"+ + "\u0001\u0000\u0000\u0000\u00da\u00db\u0001\u0000\u0000\u0000\u00db\u0011"+ + "\u0001\u0000\u0000\u0000\u00dc\u00da\u0001\u0000\u0000\u0000\u00dd\u00e5"+ + "\u00034\u001a\u0000\u00de\u00e5\u0003,\u0016\u0000\u00df\u00e5\u0003\u0014"+ + "\n\u0000\u00e0\u00e1\u0005\'\u0000\u0000\u00e1\u00e2\u0003\n\u0005\u0000"+ + "\u00e2\u00e3\u00051\u0000\u0000\u00e3\u00e5\u0001\u0000\u0000\u0000\u00e4"+ + "\u00dd\u0001\u0000\u0000\u0000\u00e4\u00de\u0001\u0000\u0000\u0000\u00e4"+ + "\u00df\u0001\u0000\u0000\u0000\u00e4\u00e0\u0001\u0000\u0000\u0000\u00e5"+ + "\u0013\u0001\u0000\u0000\u0000\u00e6\u00e7\u00030\u0018\u0000\u00e7\u00f1"+ + "\u0005\'\u0000\u0000\u00e8\u00f2\u0005<\u0000\u0000\u00e9\u00ee\u0003"+ + "\n\u0005\u0000\u00ea\u00eb\u0005!\u0000\u0000\u00eb\u00ed\u0003\n\u0005"+ + "\u0000\u00ec\u00ea\u0001\u0000\u0000\u0000\u00ed\u00f0\u0001\u0000\u0000"+ + "\u0000\u00ee\u00ec\u0001\u0000\u0000\u0000\u00ee\u00ef\u0001\u0000\u0000"+ + "\u0000\u00ef\u00f2\u0001\u0000\u0000\u0000\u00f0\u00ee\u0001\u0000\u0000"+ + "\u0000\u00f1\u00e8\u0001\u0000\u0000\u0000\u00f1\u00e9\u0001\u0000\u0000"+ + "\u0000\u00f1\u00f2\u0001\u0000\u0000\u0000\u00f2\u00f3\u0001\u0000\u0000"+ + "\u0000\u00f3\u00f4\u00051\u0000\u0000\u00f4\u0015\u0001\u0000\u0000\u0000"+ + "\u00f5\u00f6\u0005\r\u0000\u0000\u00f6\u00f7\u0003\u0018\f\u0000\u00f7"+ + "\u0017\u0001\u0000\u0000\u0000\u00f8\u00fd\u0003\u001a\r\u0000\u00f9\u00fa"+ + "\u0005!\u0000\u0000\u00fa\u00fc\u0003\u001a\r\u0000\u00fb\u00f9\u0001"+ + "\u0000\u0000\u0000\u00fc\u00ff\u0001\u0000\u0000\u0000\u00fd\u00fb\u0001"+ + "\u0000\u0000\u0000\u00fd\u00fe\u0001\u0000\u0000\u0000\u00fe\u0019\u0001"+ + "\u0000\u0000\u0000\u00ff\u00fd\u0001\u0000\u0000\u0000\u0100\u0106\u0003"+ + "\n\u0005\u0000\u0101\u0102\u0003,\u0016\u0000\u0102\u0103\u0005 \u0000"+ + "\u0000\u0103\u0104\u0003\n\u0005\u0000\u0104\u0106\u0001\u0000\u0000\u0000"+ + "\u0105\u0100\u0001\u0000\u0000\u0000\u0105\u0101\u0001\u0000\u0000\u0000"+ + "\u0106\u001b\u0001\u0000\u0000\u0000\u0107\u0108\u0005\u0006\u0000\u0000"+ + "\u0108\u010d\u0003*\u0015\u0000\u0109\u010a\u0005!\u0000\u0000\u010a\u010c"+ + "\u0003*\u0015\u0000\u010b\u0109\u0001\u0000\u0000\u0000\u010c\u010f\u0001"+ + "\u0000\u0000\u0000\u010d\u010b\u0001\u0000\u0000\u0000\u010d\u010e\u0001"+ + "\u0000\u0000\u0000\u010e\u0111\u0001\u0000\u0000\u0000\u010f\u010d\u0001"+ + "\u0000\u0000\u0000\u0110\u0112\u0003\u001e\u000f\u0000\u0111\u0110\u0001"+ + "\u0000\u0000\u0000\u0111\u0112\u0001\u0000\u0000\u0000\u0112\u001d\u0001"+ + "\u0000\u0000\u0000\u0113\u0116\u0003 \u0010\u0000\u0114\u0116\u0003\""+ + "\u0011\u0000\u0115\u0113\u0001\u0000\u0000\u0000\u0115\u0114\u0001\u0000"+ + "\u0000\u0000\u0116\u001f\u0001\u0000\u0000\u0000\u0117\u0118\u0005F\u0000"+ + "\u0000\u0118\u011d\u0003*\u0015\u0000\u0119\u011a\u0005!\u0000\u0000\u011a"+ + "\u011c\u0003*\u0015\u0000\u011b\u0119\u0001\u0000\u0000\u0000\u011c\u011f"+ + "\u0001\u0000\u0000\u0000\u011d\u011b\u0001\u0000\u0000\u0000\u011d\u011e"+ + "\u0001\u0000\u0000\u0000\u011e!\u0001\u0000\u0000\u0000\u011f\u011d\u0001"+ + "\u0000\u0000\u0000\u0120\u0121\u0005?\u0000\u0000\u0121\u0122\u0003 \u0010"+ + "\u0000\u0122\u0123\u0005@\u0000\u0000\u0123#\u0001\u0000\u0000\u0000\u0124"+ + "\u0125\u0005\u0004\u0000\u0000\u0125\u0126\u0003\u0018\f\u0000\u0126%"+ + "\u0001\u0000\u0000\u0000\u0127\u0129\u0005\u0010\u0000\u0000\u0128\u012a"+ + "\u0003\u0018\f\u0000\u0129\u0128\u0001\u0000\u0000\u0000\u0129\u012a\u0001"+ + "\u0000\u0000\u0000\u012a\u012d\u0001\u0000\u0000\u0000\u012b\u012c\u0005"+ + "\u001d\u0000\u0000\u012c\u012e\u0003\u0018\f\u0000\u012d\u012b\u0001\u0000"+ + "\u0000\u0000\u012d\u012e\u0001\u0000\u0000\u0000\u012e\'\u0001\u0000\u0000"+ + "\u0000\u012f\u0130\u0005\b\u0000\u0000\u0130\u0133\u0003\u0018\f\u0000"+ + "\u0131\u0132\u0005\u001d\u0000\u0000\u0132\u0134\u0003\u0018\f\u0000\u0133"+ "\u0131\u0001\u0000\u0000\u0000\u0133\u0134\u0001\u0000\u0000\u0000\u0134"+ - ")\u0001\u0000\u0000\u0000\u0135\u0133\u0001\u0000\u0000\u0000\u0136\u013b"+ - "\u0003.\u0017\u0000\u0137\u0138\u0005#\u0000\u0000\u0138\u013a\u0003."+ - "\u0017\u0000\u0139\u0137\u0001\u0000\u0000\u0000\u013a\u013d\u0001\u0000"+ - "\u0000\u0000\u013b\u0139\u0001\u0000\u0000\u0000\u013b\u013c\u0001\u0000"+ - "\u0000\u0000\u013c+\u0001\u0000\u0000\u0000\u013d\u013b\u0001\u0000\u0000"+ - "\u0000\u013e\u013f\u0007\u0003\u0000\u0000\u013f-\u0001\u0000\u0000\u0000"+ - "\u0140\u0141\u0007\u0004\u0000\u0000\u0141/\u0001\u0000\u0000\u0000\u0142"+ - "\u016d\u0005,\u0000\u0000\u0143\u0144\u0003P(\u0000\u0144\u0145\u0005"+ - "A\u0000\u0000\u0145\u016d\u0001\u0000\u0000\u0000\u0146\u016d\u0003N\'"+ - "\u0000\u0147\u016d\u0003P(\u0000\u0148\u016d\u0003J%\u0000\u0149\u016d"+ - "\u0005/\u0000\u0000\u014a\u016d\u0003R)\u0000\u014b\u014c\u0005?\u0000"+ - "\u0000\u014c\u0151\u0003L&\u0000\u014d\u014e\u0005!\u0000\u0000\u014e"+ - "\u0150\u0003L&\u0000\u014f\u014d\u0001\u0000\u0000\u0000\u0150\u0153\u0001"+ - "\u0000\u0000\u0000\u0151\u014f\u0001\u0000\u0000\u0000\u0151\u0152\u0001"+ - "\u0000\u0000\u0000\u0152\u0154\u0001\u0000\u0000\u0000\u0153\u0151\u0001"+ - "\u0000\u0000\u0000\u0154\u0155\u0005@\u0000\u0000\u0155\u016d\u0001\u0000"+ - "\u0000\u0000\u0156\u0157\u0005?\u0000\u0000\u0157\u015c\u0003J%\u0000"+ - "\u0158\u0159\u0005!\u0000\u0000\u0159\u015b\u0003J%\u0000\u015a\u0158"+ - "\u0001\u0000\u0000\u0000\u015b\u015e\u0001\u0000\u0000\u0000\u015c\u015a"+ - "\u0001\u0000\u0000\u0000\u015c\u015d\u0001\u0000\u0000\u0000\u015d\u015f"+ - "\u0001\u0000\u0000\u0000\u015e\u015c\u0001\u0000\u0000\u0000\u015f\u0160"+ - "\u0005@\u0000\u0000\u0160\u016d\u0001\u0000\u0000\u0000\u0161\u0162\u0005"+ - "?\u0000\u0000\u0162\u0167\u0003R)\u0000\u0163\u0164\u0005!\u0000\u0000"+ - "\u0164\u0166\u0003R)\u0000\u0165\u0163\u0001\u0000\u0000\u0000\u0166\u0169"+ - "\u0001\u0000\u0000\u0000\u0167\u0165\u0001\u0000\u0000\u0000\u0167\u0168"+ - "\u0001\u0000\u0000\u0000\u0168\u016a\u0001\u0000\u0000\u0000\u0169\u0167"+ - "\u0001\u0000\u0000\u0000\u016a\u016b\u0005@\u0000\u0000\u016b\u016d\u0001"+ - "\u0000\u0000\u0000\u016c\u0142\u0001\u0000\u0000\u0000\u016c\u0143\u0001"+ - "\u0000\u0000\u0000\u016c\u0146\u0001\u0000\u0000\u0000\u016c\u0147\u0001"+ - "\u0000\u0000\u0000\u016c\u0148\u0001\u0000\u0000\u0000\u016c\u0149\u0001"+ - "\u0000\u0000\u0000\u016c\u014a\u0001\u0000\u0000\u0000\u016c\u014b\u0001"+ - "\u0000\u0000\u0000\u016c\u0156\u0001\u0000\u0000\u0000\u016c\u0161\u0001"+ - "\u0000\u0000\u0000\u016d1\u0001\u0000\u0000\u0000\u016e\u016f\u0005\n"+ - "\u0000\u0000\u016f\u0170\u0005\u001b\u0000\u0000\u01703\u0001\u0000\u0000"+ - "\u0000\u0171\u0172\u0005\u000f\u0000\u0000\u0172\u0177\u00036\u001b\u0000"+ - "\u0173\u0174\u0005!\u0000\u0000\u0174\u0176\u00036\u001b\u0000\u0175\u0173"+ - "\u0001\u0000\u0000\u0000\u0176\u0179\u0001\u0000\u0000\u0000\u0177\u0175"+ - "\u0001\u0000\u0000\u0000\u0177\u0178\u0001\u0000\u0000\u0000\u01785\u0001"+ - "\u0000\u0000\u0000\u0179\u0177\u0001\u0000\u0000\u0000\u017a\u017c\u0003"+ - "\n\u0005\u0000\u017b\u017d\u0007\u0005\u0000\u0000\u017c\u017b\u0001\u0000"+ - "\u0000\u0000\u017c\u017d\u0001\u0000\u0000\u0000\u017d\u0180\u0001\u0000"+ - "\u0000\u0000\u017e\u017f\u0005-\u0000\u0000\u017f\u0181\u0007\u0006\u0000"+ - "\u0000\u0180\u017e\u0001\u0000\u0000\u0000\u0180\u0181\u0001\u0000\u0000"+ - "\u0000\u01817\u0001\u0000\u0000\u0000\u0182\u0183\u0005\t\u0000\u0000"+ - "\u0183\u0188\u0003*\u0015\u0000\u0184\u0185\u0005!\u0000\u0000\u0185\u0187"+ - "\u0003*\u0015\u0000\u0186\u0184\u0001\u0000\u0000\u0000\u0187\u018a\u0001"+ - "\u0000\u0000\u0000\u0188\u0186\u0001\u0000\u0000\u0000\u0188\u0189\u0001"+ - "\u0000\u0000\u0000\u01899\u0001\u0000\u0000\u0000\u018a\u0188\u0001\u0000"+ - "\u0000\u0000\u018b\u018c\u0005\u0002\u0000\u0000\u018c\u0191\u0003*\u0015"+ - "\u0000\u018d\u018e\u0005!\u0000\u0000\u018e\u0190\u0003*\u0015\u0000\u018f"+ - "\u018d\u0001\u0000\u0000\u0000\u0190\u0193\u0001\u0000\u0000\u0000\u0191"+ - "\u018f\u0001\u0000\u0000\u0000\u0191\u0192\u0001\u0000\u0000\u0000\u0192"+ - ";\u0001\u0000\u0000\u0000\u0193\u0191\u0001\u0000\u0000\u0000\u0194\u0195"+ - "\u0005\f\u0000\u0000\u0195\u019a\u0003>\u001f\u0000\u0196\u0197\u0005"+ - "!\u0000\u0000\u0197\u0199\u0003>\u001f\u0000\u0198\u0196\u0001\u0000\u0000"+ - "\u0000\u0199\u019c\u0001\u0000\u0000\u0000\u019a\u0198\u0001\u0000\u0000"+ - "\u0000\u019a\u019b\u0001\u0000\u0000\u0000\u019b=\u0001\u0000\u0000\u0000"+ - "\u019c\u019a\u0001\u0000\u0000\u0000\u019d\u019e\u0003*\u0015\u0000\u019e"+ - "\u019f\u0005O\u0000\u0000\u019f\u01a0\u0003*\u0015\u0000\u01a0?\u0001"+ - "\u0000\u0000\u0000\u01a1\u01a2\u0005\u0001\u0000\u0000\u01a2\u01a3\u0003"+ - "\u0012\t\u0000\u01a3\u01a5\u0003R)\u0000\u01a4\u01a6\u0003F#\u0000\u01a5"+ - "\u01a4\u0001\u0000\u0000\u0000\u01a5\u01a6\u0001\u0000\u0000\u0000\u01a6"+ - "A\u0001\u0000\u0000\u0000\u01a7\u01a8\u0005\u0007\u0000\u0000\u01a8\u01a9"+ - "\u0003\u0012\t\u0000\u01a9\u01aa\u0003R)\u0000\u01aaC\u0001\u0000\u0000"+ - "\u0000\u01ab\u01ac\u0005\u000b\u0000\u0000\u01ac\u01ad\u0003(\u0014\u0000"+ - "\u01adE\u0001\u0000\u0000\u0000\u01ae\u01b3\u0003H$\u0000\u01af\u01b0"+ - "\u0005!\u0000\u0000\u01b0\u01b2\u0003H$\u0000\u01b1\u01af\u0001\u0000"+ - "\u0000\u0000\u01b2\u01b5\u0001\u0000\u0000\u0000\u01b3\u01b1\u0001\u0000"+ - "\u0000\u0000\u01b3\u01b4\u0001\u0000\u0000\u0000\u01b4G\u0001\u0000\u0000"+ - "\u0000\u01b5\u01b3\u0001\u0000\u0000\u0000\u01b6\u01b7\u0003,\u0016\u0000"+ - "\u01b7\u01b8\u0005 \u0000\u0000\u01b8\u01b9\u00030\u0018\u0000\u01b9I"+ - "\u0001\u0000\u0000\u0000\u01ba\u01bb\u0007\u0007\u0000\u0000\u01bbK\u0001"+ - "\u0000\u0000\u0000\u01bc\u01bf\u0003N\'\u0000\u01bd\u01bf\u0003P(\u0000"+ - "\u01be\u01bc\u0001\u0000\u0000\u0000\u01be\u01bd\u0001\u0000\u0000\u0000"+ - "\u01bfM\u0001\u0000\u0000\u0000\u01c0\u01c2\u0007\u0000\u0000\u0000\u01c1"+ - "\u01c0\u0001\u0000\u0000\u0000\u01c1\u01c2\u0001\u0000\u0000\u0000\u01c2"+ - "\u01c3\u0001\u0000\u0000\u0000\u01c3\u01c4\u0005\u001c\u0000\u0000\u01c4"+ - "O\u0001\u0000\u0000\u0000\u01c5\u01c7\u0007\u0000\u0000\u0000\u01c6\u01c5"+ - "\u0001\u0000\u0000\u0000\u01c6\u01c7\u0001\u0000\u0000\u0000\u01c7\u01c8"+ - "\u0001\u0000\u0000\u0000\u01c8\u01c9\u0005\u001b\u0000\u0000\u01c9Q\u0001"+ - "\u0000\u0000\u0000\u01ca\u01cb\u0005\u001a\u0000\u0000\u01cbS\u0001\u0000"+ - "\u0000\u0000\u01cc\u01cd\u0007\b\u0000\u0000\u01cdU\u0001\u0000\u0000"+ - "\u0000\u01ce\u01cf\u0005\u0005\u0000\u0000\u01cf\u01d0\u0003X,\u0000\u01d0"+ - "W\u0001\u0000\u0000\u0000\u01d1\u01d2\u0005?\u0000\u0000\u01d2\u01d3\u0003"+ - "\u0002\u0001\u0000\u01d3\u01d4\u0005@\u0000\u0000\u01d4Y\u0001\u0000\u0000"+ - "\u0000\u01d5\u01d6\u0005\u000e\u0000\u0000\u01d6\u01da\u0005_\u0000\u0000"+ - "\u01d7\u01d8\u0005\u000e\u0000\u0000\u01d8\u01da\u0005`\u0000\u0000\u01d9"+ - "\u01d5\u0001\u0000\u0000\u0000\u01d9\u01d7\u0001\u0000\u0000\u0000\u01da"+ - "[\u0001\u0000\u0000\u0000\u01db\u01df\u0005\u0003\u0000\u0000\u01dc\u01de"+ - "\u0003`0\u0000\u01dd\u01dc\u0001\u0000\u0000\u0000\u01de\u01e1\u0001\u0000"+ - "\u0000\u0000\u01df\u01dd\u0001\u0000\u0000\u0000\u01df\u01e0\u0001\u0000"+ - "\u0000\u0000\u01e0\u01e2\u0001\u0000\u0000\u0000\u01e1\u01df\u0001\u0000"+ - "\u0000\u0000\u01e2\u01e5\u0005U\u0000\u0000\u01e3\u01e4\u0005S\u0000\u0000"+ - "\u01e4\u01e6\u0003*\u0015\u0000\u01e5\u01e3\u0001\u0000\u0000\u0000\u01e5"+ - "\u01e6\u0001\u0000\u0000\u0000\u01e6\u01f0\u0001\u0000\u0000\u0000\u01e7"+ - "\u01e8\u0005T\u0000\u0000\u01e8\u01ed\u0003^/\u0000\u01e9\u01ea\u0005"+ - "!\u0000\u0000\u01ea\u01ec\u0003^/\u0000\u01eb\u01e9\u0001\u0000\u0000"+ - "\u0000\u01ec\u01ef\u0001\u0000\u0000\u0000\u01ed\u01eb\u0001\u0000\u0000"+ - "\u0000\u01ed\u01ee\u0001\u0000\u0000\u0000\u01ee\u01f1\u0001\u0000\u0000"+ - "\u0000\u01ef\u01ed\u0001\u0000\u0000\u0000\u01f0\u01e7\u0001\u0000\u0000"+ - "\u0000\u01f0\u01f1\u0001\u0000\u0000\u0000\u01f1]\u0001\u0000\u0000\u0000"+ - "\u01f2\u01f3\u0003*\u0015\u0000\u01f3\u01f4\u0005 \u0000\u0000\u01f4\u01f6"+ - "\u0001\u0000\u0000\u0000\u01f5\u01f2\u0001\u0000\u0000\u0000\u01f5\u01f6"+ - "\u0001\u0000\u0000\u0000\u01f6\u01f7\u0001\u0000\u0000\u0000\u01f7\u01f8"+ - "\u0003*\u0015\u0000\u01f8_\u0001\u0000\u0000\u0000\u01f9\u01fa\u0005?"+ - "\u0000\u0000\u01fa\u01fb\u0005e\u0000\u0000\u01fb\u01fc\u0005d\u0000\u0000"+ - "\u01fc\u01fd\u0005e\u0000\u0000\u01fd\u01fe\u0005@\u0000\u0000\u01fea"+ - "\u0001\u0000\u0000\u00002mt\u0083\u008f\u0098\u00a0\u00a4\u00ac\u00ae"+ - "\u00b3\u00ba\u00bf\u00c6\u00cc\u00d4\u00d6\u00e0\u00ea\u00ed\u00f9\u0101"+ - "\u0109\u010d\u0116\u0120\u0124\u012a\u0133\u013b\u0151\u015c\u0167\u016c"+ - "\u0177\u017c\u0180\u0188\u0191\u019a\u01a5\u01b3\u01be\u01c1\u01c6\u01d9"+ - "\u01df\u01e5\u01ed\u01f0\u01f5"; + ")\u0001\u0000\u0000\u0000\u0135\u0136\u0007\u0002\u0000\u0000\u0136+\u0001"+ + "\u0000\u0000\u0000\u0137\u013c\u00030\u0018\u0000\u0138\u0139\u0005#\u0000"+ + "\u0000\u0139\u013b\u00030\u0018\u0000\u013a\u0138\u0001\u0000\u0000\u0000"+ + "\u013b\u013e\u0001\u0000\u0000\u0000\u013c\u013a\u0001\u0000\u0000\u0000"+ + "\u013c\u013d\u0001\u0000\u0000\u0000\u013d-\u0001\u0000\u0000\u0000\u013e"+ + "\u013c\u0001\u0000\u0000\u0000\u013f\u0144\u00032\u0019\u0000\u0140\u0141"+ + "\u0005#\u0000\u0000\u0141\u0143\u00032\u0019\u0000\u0142\u0140\u0001\u0000"+ + "\u0000\u0000\u0143\u0146\u0001\u0000\u0000\u0000\u0144\u0142\u0001\u0000"+ + "\u0000\u0000\u0144\u0145\u0001\u0000\u0000\u0000\u0145/\u0001\u0000\u0000"+ + "\u0000\u0146\u0144\u0001\u0000\u0000\u0000\u0147\u0148\u0007\u0003\u0000"+ + "\u0000\u01481\u0001\u0000\u0000\u0000\u0149\u014a\u0007\u0004\u0000\u0000"+ + "\u014a3\u0001\u0000\u0000\u0000\u014b\u0176\u0005,\u0000\u0000\u014c\u014d"+ + "\u0003T*\u0000\u014d\u014e\u0005A\u0000\u0000\u014e\u0176\u0001\u0000"+ + "\u0000\u0000\u014f\u0176\u0003R)\u0000\u0150\u0176\u0003T*\u0000\u0151"+ + "\u0176\u0003N\'\u0000\u0152\u0176\u0005/\u0000\u0000\u0153\u0176\u0003"+ + "V+\u0000\u0154\u0155\u0005?\u0000\u0000\u0155\u015a\u0003P(\u0000\u0156"+ + "\u0157\u0005!\u0000\u0000\u0157\u0159\u0003P(\u0000\u0158\u0156\u0001"+ + "\u0000\u0000\u0000\u0159\u015c\u0001\u0000\u0000\u0000\u015a\u0158\u0001"+ + "\u0000\u0000\u0000\u015a\u015b\u0001\u0000\u0000\u0000\u015b\u015d\u0001"+ + "\u0000\u0000\u0000\u015c\u015a\u0001\u0000\u0000\u0000\u015d\u015e\u0005"+ + "@\u0000\u0000\u015e\u0176\u0001\u0000\u0000\u0000\u015f\u0160\u0005?\u0000"+ + "\u0000\u0160\u0165\u0003N\'\u0000\u0161\u0162\u0005!\u0000\u0000\u0162"+ + "\u0164\u0003N\'\u0000\u0163\u0161\u0001\u0000\u0000\u0000\u0164\u0167"+ + "\u0001\u0000\u0000\u0000\u0165\u0163\u0001\u0000\u0000\u0000\u0165\u0166"+ + "\u0001\u0000\u0000\u0000\u0166\u0168\u0001\u0000\u0000\u0000\u0167\u0165"+ + "\u0001\u0000\u0000\u0000\u0168\u0169\u0005@\u0000\u0000\u0169\u0176\u0001"+ + "\u0000\u0000\u0000\u016a\u016b\u0005?\u0000\u0000\u016b\u0170\u0003V+"+ + "\u0000\u016c\u016d\u0005!\u0000\u0000\u016d\u016f\u0003V+\u0000\u016e"+ + "\u016c\u0001\u0000\u0000\u0000\u016f\u0172\u0001\u0000\u0000\u0000\u0170"+ + "\u016e\u0001\u0000\u0000\u0000\u0170\u0171\u0001\u0000\u0000\u0000\u0171"+ + "\u0173\u0001\u0000\u0000\u0000\u0172\u0170\u0001\u0000\u0000\u0000\u0173"+ + "\u0174\u0005@\u0000\u0000\u0174\u0176\u0001\u0000\u0000\u0000\u0175\u014b"+ + "\u0001\u0000\u0000\u0000\u0175\u014c\u0001\u0000\u0000\u0000\u0175\u014f"+ + "\u0001\u0000\u0000\u0000\u0175\u0150\u0001\u0000\u0000\u0000\u0175\u0151"+ + "\u0001\u0000\u0000\u0000\u0175\u0152\u0001\u0000\u0000\u0000\u0175\u0153"+ + "\u0001\u0000\u0000\u0000\u0175\u0154\u0001\u0000\u0000\u0000\u0175\u015f"+ + "\u0001\u0000\u0000\u0000\u0175\u016a\u0001\u0000\u0000\u0000\u01765\u0001"+ + "\u0000\u0000\u0000\u0177\u0178\u0005\n\u0000\u0000\u0178\u0179\u0005\u001b"+ + "\u0000\u0000\u01797\u0001\u0000\u0000\u0000\u017a\u017b\u0005\u000f\u0000"+ + "\u0000\u017b\u0180\u0003:\u001d\u0000\u017c\u017d\u0005!\u0000\u0000\u017d"+ + "\u017f\u0003:\u001d\u0000\u017e\u017c\u0001\u0000\u0000\u0000\u017f\u0182"+ + "\u0001\u0000\u0000\u0000\u0180\u017e\u0001\u0000\u0000\u0000\u0180\u0181"+ + "\u0001\u0000\u0000\u0000\u01819\u0001\u0000\u0000\u0000\u0182\u0180\u0001"+ + "\u0000\u0000\u0000\u0183\u0185\u0003\n\u0005\u0000\u0184\u0186\u0007\u0005"+ + "\u0000\u0000\u0185\u0184\u0001\u0000\u0000\u0000\u0185\u0186\u0001\u0000"+ + "\u0000\u0000\u0186\u0189\u0001\u0000\u0000\u0000\u0187\u0188\u0005-\u0000"+ + "\u0000\u0188\u018a\u0007\u0006\u0000\u0000\u0189\u0187\u0001\u0000\u0000"+ + "\u0000\u0189\u018a\u0001\u0000\u0000\u0000\u018a;\u0001\u0000\u0000\u0000"+ + "\u018b\u018c\u0005\t\u0000\u0000\u018c\u0191\u0003.\u0017\u0000\u018d"+ + "\u018e\u0005!\u0000\u0000\u018e\u0190\u0003.\u0017\u0000\u018f\u018d\u0001"+ + "\u0000\u0000\u0000\u0190\u0193\u0001\u0000\u0000\u0000\u0191\u018f\u0001"+ + "\u0000\u0000\u0000\u0191\u0192\u0001\u0000\u0000\u0000\u0192=\u0001\u0000"+ + "\u0000\u0000\u0193\u0191\u0001\u0000\u0000\u0000\u0194\u0195\u0005\u0002"+ + "\u0000\u0000\u0195\u019a\u0003.\u0017\u0000\u0196\u0197\u0005!\u0000\u0000"+ + "\u0197\u0199\u0003.\u0017\u0000\u0198\u0196\u0001\u0000\u0000\u0000\u0199"+ + "\u019c\u0001\u0000\u0000\u0000\u019a\u0198\u0001\u0000\u0000\u0000\u019a"+ + "\u019b\u0001\u0000\u0000\u0000\u019b?\u0001\u0000\u0000\u0000\u019c\u019a"+ + "\u0001\u0000\u0000\u0000\u019d\u019e\u0005\f\u0000\u0000\u019e\u01a3\u0003"+ + "B!\u0000\u019f\u01a0\u0005!\u0000\u0000\u01a0\u01a2\u0003B!\u0000\u01a1"+ + "\u019f\u0001\u0000\u0000\u0000\u01a2\u01a5\u0001\u0000\u0000\u0000\u01a3"+ + "\u01a1\u0001\u0000\u0000\u0000\u01a3\u01a4\u0001\u0000\u0000\u0000\u01a4"+ + "A\u0001\u0000\u0000\u0000\u01a5\u01a3\u0001\u0000\u0000\u0000\u01a6\u01a7"+ + "\u0003.\u0017\u0000\u01a7\u01a8\u0005O\u0000\u0000\u01a8\u01a9\u0003."+ + "\u0017\u0000\u01a9C\u0001\u0000\u0000\u0000\u01aa\u01ab\u0005\u0001\u0000"+ + "\u0000\u01ab\u01ac\u0003\u0012\t\u0000\u01ac\u01ae\u0003V+\u0000\u01ad"+ + "\u01af\u0003J%\u0000\u01ae\u01ad\u0001\u0000\u0000\u0000\u01ae\u01af\u0001"+ + "\u0000\u0000\u0000\u01afE\u0001\u0000\u0000\u0000\u01b0\u01b1\u0005\u0007"+ + "\u0000\u0000\u01b1\u01b2\u0003\u0012\t\u0000\u01b2\u01b3\u0003V+\u0000"+ + "\u01b3G\u0001\u0000\u0000\u0000\u01b4\u01b5\u0005\u000b\u0000\u0000\u01b5"+ + "\u01b6\u0003,\u0016\u0000\u01b6I\u0001\u0000\u0000\u0000\u01b7\u01bc\u0003"+ + "L&\u0000\u01b8\u01b9\u0005!\u0000\u0000\u01b9\u01bb\u0003L&\u0000\u01ba"+ + "\u01b8\u0001\u0000\u0000\u0000\u01bb\u01be\u0001\u0000\u0000\u0000\u01bc"+ + "\u01ba\u0001\u0000\u0000\u0000\u01bc\u01bd\u0001\u0000\u0000\u0000\u01bd"+ + "K\u0001\u0000\u0000\u0000\u01be\u01bc\u0001\u0000\u0000\u0000\u01bf\u01c0"+ + "\u00030\u0018\u0000\u01c0\u01c1\u0005 \u0000\u0000\u01c1\u01c2\u00034"+ + "\u001a\u0000\u01c2M\u0001\u0000\u0000\u0000\u01c3\u01c4\u0007\u0007\u0000"+ + "\u0000\u01c4O\u0001\u0000\u0000\u0000\u01c5\u01c8\u0003R)\u0000\u01c6"+ + "\u01c8\u0003T*\u0000\u01c7\u01c5\u0001\u0000\u0000\u0000\u01c7\u01c6\u0001"+ + "\u0000\u0000\u0000\u01c8Q\u0001\u0000\u0000\u0000\u01c9\u01cb\u0007\u0000"+ + "\u0000\u0000\u01ca\u01c9\u0001\u0000\u0000\u0000\u01ca\u01cb\u0001\u0000"+ + "\u0000\u0000\u01cb\u01cc\u0001\u0000\u0000\u0000\u01cc\u01cd\u0005\u001c"+ + "\u0000\u0000\u01cdS\u0001\u0000\u0000\u0000\u01ce\u01d0\u0007\u0000\u0000"+ + "\u0000\u01cf\u01ce\u0001\u0000\u0000\u0000\u01cf\u01d0\u0001\u0000\u0000"+ + "\u0000\u01d0\u01d1\u0001\u0000\u0000\u0000\u01d1\u01d2\u0005\u001b\u0000"+ + "\u0000\u01d2U\u0001\u0000\u0000\u0000\u01d3\u01d4\u0005\u001a\u0000\u0000"+ + "\u01d4W\u0001\u0000\u0000\u0000\u01d5\u01d6\u0007\b\u0000\u0000\u01d6"+ + "Y\u0001\u0000\u0000\u0000\u01d7\u01d8\u0005\u0005\u0000\u0000\u01d8\u01d9"+ + "\u0003\\.\u0000\u01d9[\u0001\u0000\u0000\u0000\u01da\u01db\u0005?\u0000"+ + "\u0000\u01db\u01dc\u0003\u0002\u0001\u0000\u01dc\u01dd\u0005@\u0000\u0000"+ + "\u01dd]\u0001\u0000\u0000\u0000\u01de\u01df\u0005\u000e\u0000\u0000\u01df"+ + "\u01e3\u0005_\u0000\u0000\u01e0\u01e1\u0005\u000e\u0000\u0000\u01e1\u01e3"+ + "\u0005`\u0000\u0000\u01e2\u01de\u0001\u0000\u0000\u0000\u01e2\u01e0\u0001"+ + "\u0000\u0000\u0000\u01e3_\u0001\u0000\u0000\u0000\u01e4\u01e8\u0005\u0003"+ + "\u0000\u0000\u01e5\u01e7\u0003d2\u0000\u01e6\u01e5\u0001\u0000\u0000\u0000"+ + "\u01e7\u01ea\u0001\u0000\u0000\u0000\u01e8\u01e6\u0001\u0000\u0000\u0000"+ + "\u01e8\u01e9\u0001\u0000\u0000\u0000\u01e9\u01eb\u0001\u0000\u0000\u0000"+ + "\u01ea\u01e8\u0001\u0000\u0000\u0000\u01eb\u01ee\u0005U\u0000\u0000\u01ec"+ + "\u01ed\u0005S\u0000\u0000\u01ed\u01ef\u0003.\u0017\u0000\u01ee\u01ec\u0001"+ + "\u0000\u0000\u0000\u01ee\u01ef\u0001\u0000\u0000\u0000\u01ef\u01f9\u0001"+ + "\u0000\u0000\u0000\u01f0\u01f1\u0005T\u0000\u0000\u01f1\u01f6\u0003b1"+ + "\u0000\u01f2\u01f3\u0005!\u0000\u0000\u01f3\u01f5\u0003b1\u0000\u01f4"+ + "\u01f2\u0001\u0000\u0000\u0000\u01f5\u01f8\u0001\u0000\u0000\u0000\u01f6"+ + "\u01f4\u0001\u0000\u0000\u0000\u01f6\u01f7\u0001\u0000\u0000\u0000\u01f7"+ + "\u01fa\u0001\u0000\u0000\u0000\u01f8\u01f6\u0001\u0000\u0000\u0000\u01f9"+ + "\u01f0\u0001\u0000\u0000\u0000\u01f9\u01fa\u0001\u0000\u0000\u0000\u01fa"+ + "a\u0001\u0000\u0000\u0000\u01fb\u01fc\u0003.\u0017\u0000\u01fc\u01fd\u0005"+ + " \u0000\u0000\u01fd\u01ff\u0001\u0000\u0000\u0000\u01fe\u01fb\u0001\u0000"+ + "\u0000\u0000\u01fe\u01ff\u0001\u0000\u0000\u0000\u01ff\u0200\u0001\u0000"+ + "\u0000\u0000\u0200\u0201\u0003.\u0017\u0000\u0201c\u0001\u0000\u0000\u0000"+ + "\u0202\u0203\u0005?\u0000\u0000\u0203\u0204\u0005e\u0000\u0000\u0204\u0205"+ + "\u0005d\u0000\u0000\u0205\u0206\u0005e\u0000\u0000\u0206\u0207\u0005@"+ + "\u0000\u0000\u0207e\u0001\u0000\u0000\u00003qx\u0087\u0093\u009c\u00a4"+ + "\u00a8\u00b0\u00b2\u00b7\u00be\u00c3\u00ca\u00d0\u00d8\u00da\u00e4\u00ee"+ + "\u00f1\u00fd\u0105\u010d\u0111\u0115\u011d\u0129\u012d\u0133\u013c\u0144"+ + "\u015a\u0165\u0170\u0175\u0180\u0185\u0189\u0191\u019a\u01a3\u01ae\u01bc"+ + "\u01c7\u01ca\u01cf\u01e2\u01e8\u01ee\u01f6\u01f9\u01fe"; public static final ATN _ATN = new ATNDeserializer().deserialize(_serializedATN.toCharArray()); static { diff --git a/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/parser/EsqlBaseParserBaseListener.java b/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/parser/EsqlBaseParserBaseListener.java index 40946a2236d2f..b74f79bd49240 100644 --- a/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/parser/EsqlBaseParserBaseListener.java +++ b/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/parser/EsqlBaseParserBaseListener.java @@ -348,6 +348,30 @@ public class EsqlBaseParserBaseListener implements EsqlBaseParserListener { *

The default implementation does nothing.

*/ @Override public void exitMetadata(EsqlBaseParser.MetadataContext ctx) { } + /** + * {@inheritDoc} + * + *

The default implementation does nothing.

+ */ + @Override public void enterMetadataOption(EsqlBaseParser.MetadataOptionContext ctx) { } + /** + * {@inheritDoc} + * + *

The default implementation does nothing.

+ */ + @Override public void exitMetadataOption(EsqlBaseParser.MetadataOptionContext ctx) { } + /** + * {@inheritDoc} + * + *

The default implementation does nothing.

+ */ + @Override public void enterDeprecated_metadata(EsqlBaseParser.Deprecated_metadataContext ctx) { } + /** + * {@inheritDoc} + * + *

The default implementation does nothing.

+ */ + @Override public void exitDeprecated_metadata(EsqlBaseParser.Deprecated_metadataContext ctx) { } /** * {@inheritDoc} * diff --git a/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/parser/EsqlBaseParserBaseVisitor.java b/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/parser/EsqlBaseParserBaseVisitor.java index 43c30c0a063cf..df66173d18784 100644 --- a/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/parser/EsqlBaseParserBaseVisitor.java +++ b/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/parser/EsqlBaseParserBaseVisitor.java @@ -208,6 +208,20 @@ public class EsqlBaseParserBaseVisitor extends AbstractParseTreeVisitor im * {@link #visitChildren} on {@code ctx}.

*/ @Override public T visitMetadata(EsqlBaseParser.MetadataContext ctx) { return visitChildren(ctx); } + /** + * {@inheritDoc} + * + *

The default implementation returns the result of calling + * {@link #visitChildren} on {@code ctx}.

+ */ + @Override public T visitMetadataOption(EsqlBaseParser.MetadataOptionContext ctx) { return visitChildren(ctx); } + /** + * {@inheritDoc} + * + *

The default implementation returns the result of calling + * {@link #visitChildren} on {@code ctx}.

+ */ + @Override public T visitDeprecated_metadata(EsqlBaseParser.Deprecated_metadataContext ctx) { return visitChildren(ctx); } /** * {@inheritDoc} * diff --git a/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/parser/EsqlBaseParserListener.java b/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/parser/EsqlBaseParserListener.java index 712227ab36787..bf6c1860252b5 100644 --- a/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/parser/EsqlBaseParserListener.java +++ b/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/parser/EsqlBaseParserListener.java @@ -321,6 +321,26 @@ public interface EsqlBaseParserListener extends ParseTreeListener { * @param ctx the parse tree */ void exitMetadata(EsqlBaseParser.MetadataContext ctx); + /** + * Enter a parse tree produced by {@link EsqlBaseParser#metadataOption}. + * @param ctx the parse tree + */ + void enterMetadataOption(EsqlBaseParser.MetadataOptionContext ctx); + /** + * Exit a parse tree produced by {@link EsqlBaseParser#metadataOption}. + * @param ctx the parse tree + */ + void exitMetadataOption(EsqlBaseParser.MetadataOptionContext ctx); + /** + * Enter a parse tree produced by {@link EsqlBaseParser#deprecated_metadata}. + * @param ctx the parse tree + */ + void enterDeprecated_metadata(EsqlBaseParser.Deprecated_metadataContext ctx); + /** + * Exit a parse tree produced by {@link EsqlBaseParser#deprecated_metadata}. + * @param ctx the parse tree + */ + void exitDeprecated_metadata(EsqlBaseParser.Deprecated_metadataContext ctx); /** * Enter a parse tree produced by {@link EsqlBaseParser#evalCommand}. * @param ctx the parse tree diff --git a/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/parser/EsqlBaseParserVisitor.java b/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/parser/EsqlBaseParserVisitor.java index d5c871641f3b7..cf951c1a9bcb6 100644 --- a/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/parser/EsqlBaseParserVisitor.java +++ b/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/parser/EsqlBaseParserVisitor.java @@ -195,6 +195,18 @@ public interface EsqlBaseParserVisitor extends ParseTreeVisitor { * @return the visitor result */ T visitMetadata(EsqlBaseParser.MetadataContext ctx); + /** + * Visit a parse tree produced by {@link EsqlBaseParser#metadataOption}. + * @param ctx the parse tree + * @return the visitor result + */ + T visitMetadataOption(EsqlBaseParser.MetadataOptionContext ctx); + /** + * Visit a parse tree produced by {@link EsqlBaseParser#deprecated_metadata}. + * @param ctx the parse tree + * @return the visitor result + */ + T visitDeprecated_metadata(EsqlBaseParser.Deprecated_metadataContext ctx); /** * Visit a parse tree produced by {@link EsqlBaseParser#evalCommand}. * @param ctx the parse tree diff --git a/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/parser/LogicalPlanBuilder.java b/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/parser/LogicalPlanBuilder.java index 7784e48a41efc..b20102a9a28c8 100644 --- a/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/parser/LogicalPlanBuilder.java +++ b/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/parser/LogicalPlanBuilder.java @@ -12,6 +12,7 @@ import org.antlr.v4.runtime.tree.ParseTree; import org.elasticsearch.dissect.DissectException; import org.elasticsearch.dissect.DissectParser; +import org.elasticsearch.xpack.esql.parser.EsqlBaseParser.MetadataOptionContext; import org.elasticsearch.xpack.esql.parser.EsqlBaseParser.QualifiedNamePatternContext; import org.elasticsearch.xpack.esql.plan.logical.Dissect; import org.elasticsearch.xpack.esql.plan.logical.Drop; @@ -60,6 +61,7 @@ import java.util.Set; import java.util.function.Function; +import static org.elasticsearch.common.logging.HeaderWarning.addWarning; import static org.elasticsearch.xpack.esql.plan.logical.Enrich.Mode; import static org.elasticsearch.xpack.ql.parser.ParserUtils.source; import static org.elasticsearch.xpack.ql.parser.ParserUtils.typedParsing; @@ -180,7 +182,16 @@ public LogicalPlan visitFromCommand(EsqlBaseParser.FromCommandContext ctx) { TableIdentifier table = new TableIdentifier(source, null, visitFromIdentifiers(ctx.fromIdentifier())); Map metadataMap = new LinkedHashMap<>(); if (ctx.metadata() != null) { - for (var c : ctx.metadata().fromIdentifier()) { + var deprecatedContext = ctx.metadata().deprecated_metadata(); + MetadataOptionContext metadataOptionContext = null; + if (deprecatedContext != null) { + addWarning("Remove [ ] in FROM METADATA declaration"); + metadataOptionContext = deprecatedContext.metadataOption(); + } else { + metadataOptionContext = ctx.metadata().metadataOption(); + + } + for (var c : metadataOptionContext.fromIdentifier()) { String id = visitFromIdentifier(c); Source src = source(c); if (MetadataAttribute.isSupported(id) == false) { diff --git a/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/optimizer/LogicalPlanOptimizerTests.java b/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/optimizer/LogicalPlanOptimizerTests.java index a0b186621a1dd..63cd96a7a6fb8 100644 --- a/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/optimizer/LogicalPlanOptimizerTests.java +++ b/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/optimizer/LogicalPlanOptimizerTests.java @@ -3219,11 +3219,11 @@ public void testEmptyMappingIndex() { as(plan, LocalRelation.class); assertThat(plan.output(), equalTo(NO_FIELDS)); - plan = logicalOptimizer.optimize(analyzer.analyze(parser.createStatement("from empty_test [metadata _id] | eval x = 1"))); + plan = logicalOptimizer.optimize(analyzer.analyze(parser.createStatement("from empty_test metadata _id | eval x = 1"))); as(plan, LocalRelation.class); assertThat(Expressions.names(plan.output()), contains("_id", "x")); - plan = logicalOptimizer.optimize(analyzer.analyze(parser.createStatement("from empty_test [metadata _id, _version] | limit 5"))); + plan = logicalOptimizer.optimize(analyzer.analyze(parser.createStatement("from empty_test metadata _id, _version | limit 5"))); as(plan, LocalRelation.class); assertThat(Expressions.names(plan.output()), contains("_id", "_version")); diff --git a/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/optimizer/PhysicalPlanOptimizerTests.java b/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/optimizer/PhysicalPlanOptimizerTests.java index 1d4136216057e..a2ce375f21662 100644 --- a/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/optimizer/PhysicalPlanOptimizerTests.java +++ b/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/optimizer/PhysicalPlanOptimizerTests.java @@ -1739,7 +1739,7 @@ public void testDissect() { public void testPushDownMetadataIndexInWildcard() { var plan = physicalPlan(""" - from test [metadata _index] + from test metadata _index | where _index like "test*" """); @@ -1766,7 +1766,7 @@ public void testPushDownMetadataIndexInWildcard() { */ public void testPushDownMetadataIndexInEquality() { var plan = physicalPlan(""" - from test [metadata _index] + from test metadata _index | where _index == "test" """); @@ -1793,7 +1793,7 @@ public void testPushDownMetadataIndexInEquality() { */ public void testPushDownMetadataIndexInNotEquality() { var plan = physicalPlan(""" - from test [metadata _index] + from test metadata _index | where _index != "test" """); @@ -1830,7 +1830,7 @@ public void testDontPushDownMetadataIndexInInequality() { tuple("<=", LessThanOrEqual.class) // no NullEquals use )) { - var plan = physicalPlan("from test [metadata _index] | where _index " + t.v1() + " \"test\""); + var plan = physicalPlan("from test metadata _index | where _index " + t.v1() + " \"test\""); var optimized = optimizedPlan(plan); var limit = as(optimized, LimitExec.class); @@ -1851,7 +1851,7 @@ public void testDontPushDownMetadataIndexInInequality() { public void testDontPushDownMetadataVersionAndId() { for (var t : List.of(tuple("_version", "2"), tuple("_id", "\"2\""))) { - var plan = physicalPlan("from test [metadata " + t.v1() + "] | where " + t.v1() + " == " + t.v2()); + var plan = physicalPlan("from test metadata " + t.v1() + " | where " + t.v1() + " == " + t.v2()); var optimized = optimizedPlan(plan); var limit = as(optimized, LimitExec.class); diff --git a/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/parser/StatementParserTests.java b/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/parser/StatementParserTests.java index ef93f60b4f1c6..a701ce27f6060 100644 --- a/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/parser/StatementParserTests.java +++ b/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/parser/StatementParserTests.java @@ -581,31 +581,34 @@ public void testDeprecatedIsNullFunction() { public void testMetadataFieldOnOtherSources() { expectError( - "row a = 1 [metadata _index]", - "1:11: mismatched input '[' expecting {, '|', 'and', ',', 'or', '+', '-', '*', '/', '%'}" + "row a = 1 metadata _index", + "line 1:20: extraneous input '_index' expecting " + ); + expectError("show functions metadata _index", "line 1:16: token recognition error at: 'm'"); + expectError( + "explain [from foo] metadata _index", + "line 1:20: mismatched input 'metadata' expecting {'|', ',', OPENING_BRACKET, ']', 'metadata'}" ); - expectError("show functions [metadata _index]", "line 1:16: token recognition error at: '['"); - expectError("explain [from foo] [metadata _index]", "line 1:20: mismatched input '[' expecting {'|', ',', OPENING_BRACKET, ']'}"); } public void testMetadataFieldMultipleDeclarations() { - expectError("from test [metadata _index, _version, _index]", "1:40: metadata field [_index] already declared [@1:21]"); + expectError("from test metadata _index, _version, _index", "1:39: metadata field [_index] already declared [@1:20]"); } public void testMetadataFieldUnsupportedPrimitiveType() { - expectError("from test [metadata _tier]", "line 1:22: unsupported metadata field [_tier]"); + expectError("from test metadata _tier", "line 1:21: unsupported metadata field [_tier]"); } public void testMetadataFieldUnsupportedCustomType() { - expectError("from test [metadata _feature]", "line 1:22: unsupported metadata field [_feature]"); + expectError("from test metadata _feature", "line 1:21: unsupported metadata field [_feature]"); } public void testMetadataFieldNotFoundNonExistent() { - expectError("from test [metadata _doesnot_compute]", "line 1:22: unsupported metadata field [_doesnot_compute]"); + expectError("from test metadata _doesnot_compute", "line 1:21: unsupported metadata field [_doesnot_compute]"); } public void testMetadataFieldNotFoundNormalField() { - expectError("from test [metadata emp_no]", "line 1:22: unsupported metadata field [emp_no]"); + expectError("from test metadata emp_no", "line 1:21: unsupported metadata field [emp_no]"); } public void testDissectPattern() { diff --git a/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/session/IndexResolverFieldNamesTests.java b/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/session/IndexResolverFieldNamesTests.java index fb5135d1de54c..b41e168c3a46d 100644 --- a/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/session/IndexResolverFieldNamesTests.java +++ b/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/session/IndexResolverFieldNamesTests.java @@ -26,7 +26,7 @@ public void testBasicFromCommand() { } public void testBasicFromCommandWithMetadata() { - assertFieldNames("from test [metadata _index, _id, _version]", ALL_FIELDS); + assertFieldNames("from test metadata _index, _id, _version", ALL_FIELDS); } public void testBasicEvalAndDrop() { @@ -620,43 +620,43 @@ public void testMultivalueInput() { } public void testSelectAll() { - assertFieldNames("FROM apps [metadata _id]", ALL_FIELDS); + assertFieldNames("FROM apps metadata _id", ALL_FIELDS); } public void testFilterById() { - assertFieldNames("FROM apps [metadata _id]| WHERE _id == \"4\"", ALL_FIELDS); + assertFieldNames("FROM apps metadata _id| WHERE _id == \"4\"", ALL_FIELDS); } public void testKeepId() { - assertFieldNames("FROM apps [metadata _id] | WHERE id == 3 | KEEP _id", Set.of("id", "id.*")); + assertFieldNames("FROM apps metadata _id | WHERE id == 3 | KEEP _id", Set.of("id", "id.*")); } public void testIdRangeAndSort() { assertFieldNames(""" - FROM apps [metadata _id] + FROM apps metadata _id | WHERE _id >= "2" AND _id <= "7" | SORT _id | keep id, name, _id""", Set.of("id", "id.*", "name", "name.*")); } public void testOrderById() { - assertFieldNames("FROM apps [metadata _id] | KEEP _id, name | SORT _id", Set.of("name", "name.*")); + assertFieldNames("FROM apps metadata _id | KEEP _id, name | SORT _id", Set.of("name", "name.*")); } public void testOrderByIdDesc() { - assertFieldNames("FROM apps [metadata _id] | KEEP _id, name | SORT _id DESC", Set.of("name", "name.*")); + assertFieldNames("FROM apps metadata _id | KEEP _id, name | SORT _id DESC", Set.of("name", "name.*")); } public void testConcatId() { - assertFieldNames("FROM apps [metadata _id] | eval c = concat(_id, name) | SORT _id | KEEP c", Set.of("name", "name.*")); + assertFieldNames("FROM apps metadata _id | eval c = concat(_id, name) | SORT _id | KEEP c", Set.of("name", "name.*")); } public void testStatsOnId() { - assertFieldNames("FROM apps [metadata _id] | stats c = count(_id), d = count_distinct(_id)", INDEX_METADATA_FIELD); + assertFieldNames("FROM apps metadata _id | stats c = count(_id), d = count_distinct(_id)", INDEX_METADATA_FIELD); } public void testStatsOnIdByGroup() { - assertFieldNames("FROM apps [metadata _id] | stats c = count(_id) by name | sort c desc, name | limit 5", Set.of("name", "name.*")); + assertFieldNames("FROM apps metadata _id | stats c = count(_id) by name | sort c desc, name | limit 5", Set.of("name", "name.*")); } public void testSimpleProject() { @@ -709,10 +709,7 @@ public void testMvSum() { } public void testMetaIndexAliasedInAggs() { - assertFieldNames( - "from employees [metadata _index] | eval _i = _index | stats max = max(emp_no) by _i", - Set.of("emp_no", "emp_no.*") - ); + assertFieldNames("from employees metadata _index | eval _i = _index | stats max = max(emp_no) by _i", Set.of("emp_no", "emp_no.*")); } public void testCoalesceFolding() { diff --git a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/esql/100_bug_fix.yml b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/esql/100_bug_fix.yml index 6cbc9a225588b..bbbc87fafc146 100644 --- a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/esql/100_bug_fix.yml +++ b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/esql/100_bug_fix.yml @@ -107,7 +107,7 @@ - do: esql.query: body: - query: 'from index* [metadata _index] | limit 5 | sort _index desc' + query: 'from index* metadata _index | limit 5 | sort _index desc' - match: { columns.0.name: http.headers } - match: { columns.0.type: unsupported } - match: { columns.1.name: http.headers.location } diff --git a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/esql/30_types.yml b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/esql/30_types.yml index 4d30f3a39afcc..b8ac2fd6ba73a 100644 --- a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/esql/30_types.yml +++ b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/esql/30_types.yml @@ -643,7 +643,7 @@ id: - "No limit defined, adding default limit of [500]" esql.query: body: - query: 'from test [metadata _id] | keep _id, kw' + query: 'from test metadata _id | keep _id, kw' - match: { columns.0.name: _id } - match: { columns.0.type: keyword } - length: { values: 1 } @@ -697,7 +697,7 @@ _source: - do: esql.query: body: - query: 'FROM test [METADATA _source] | KEEP _source | LIMIT 1' + query: 'FROM test METADATA _source | KEEP _source | LIMIT 1' - match: { columns.0.name: _source } - match: { columns.0.type: _source } - length: { values: 1 } @@ -732,7 +732,7 @@ _source keep all: - do: esql.query: body: - query: 'FROM test [METADATA _source] | LIMIT 1' + query: 'FROM test METADATA _source | LIMIT 1' - match: { columns.0.name: _source } - match: { columns.0.type: _source } - length: { values: 1 } @@ -768,7 +768,7 @@ _source disabled: - do: esql.query: body: - query: 'FROM test [METADATA _source] | KEEP _source | LIMIT 1' + query: 'FROM test METADATA _source | KEEP _source | LIMIT 1' - match: { columns.0.name: _source } - match: { columns.0.type: _source } - length: { values: 1 } diff --git a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/esql/40_tsdb.yml b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/esql/40_tsdb.yml index 69bd944430f04..bc832c11c4ff0 100644 --- a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/esql/40_tsdb.yml +++ b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/esql/40_tsdb.yml @@ -113,7 +113,7 @@ load everything: - "No limit defined, adding default limit of \\[.*\\]" esql.query: body: - query: 'from test [metadata _id]' + query: 'from test metadata _id' - match: {columns.0.name: "@timestamp"} - match: {columns.0.type: "date"} @@ -245,7 +245,7 @@ _source: - do: esql.query: body: - query: 'FROM test [METADATA _source] | WHERE @timestamp == "2021-04-28T18:50:23.142Z" | KEEP _source | LIMIT 1' + query: 'FROM test METADATA _source | WHERE @timestamp == "2021-04-28T18:50:23.142Z" | KEEP _source | LIMIT 1' - match: { columns.0.name: _source } - match: { columns.0.type: _source } - length: { values: 1 } From 77402903ec5cb95d75fdadb1dffaa5ae8382777e Mon Sep 17 00:00:00 2001 From: Costin Leau Date: Wed, 7 Feb 2024 00:54:07 +0200 Subject: [PATCH 02/12] Update docs/changelog/105221.yaml --- docs/changelog/105221.yaml | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 docs/changelog/105221.yaml diff --git a/docs/changelog/105221.yaml b/docs/changelog/105221.yaml new file mode 100644 index 0000000000000..612b86eafbdf7 --- /dev/null +++ b/docs/changelog/105221.yaml @@ -0,0 +1,12 @@ +pr: 105221 +summary: "ESQL: Grammar - FROM METADATA no longer require []" +area: Compute Engine +type: breaking +issues: [] +breaking: + title: "ESQL: Grammar - FROM METADATA no longer require []" + area: Compute Engine + details: Please describe the details of this change for the release notes. You can + use asciidoc. + impact: Please describe the impact of this change to users + notable: false From bcdf4176c4835f1cf6c36fab20ba02d181b48607 Mon Sep 17 00:00:00 2001 From: Costin Leau Date: Tue, 6 Feb 2024 15:02:36 -0800 Subject: [PATCH 03/12] Update changelog --- docs/changelog/105221.yaml | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/docs/changelog/105221.yaml b/docs/changelog/105221.yaml index 612b86eafbdf7..2f39390a4c8c3 100644 --- a/docs/changelog/105221.yaml +++ b/docs/changelog/105221.yaml @@ -5,8 +5,10 @@ type: breaking issues: [] breaking: title: "ESQL: Grammar - FROM METADATA no longer require []" - area: Compute Engine - details: Please describe the details of this change for the release notes. You can - use asciidoc. - impact: Please describe the impact of this change to users + area: ES|QL + details: "Remove [ ] for METADATA option inside FROM command statements" + impact: "Previously to return metadata fields, one had to use square brackets:\ + \(eg. 'FROM index [METADATA _index]')\ + \Since this release, the [ ] are dropped and do not have to be specified,\ + \thus simplifying the command above to:'FROM index METADATA _index'" notable: false From 167e17bf6ae3f3fa146a149593230c7d077ce386 Mon Sep 17 00:00:00 2001 From: Costin Leau Date: Tue, 6 Feb 2024 17:53:34 -0800 Subject: [PATCH 04/12] wrangling the yaml tests --- .../src/main/resources/id.csv-spec | 18 +++--- .../resources/metadata-IT_tests_only.csv-spec | 56 +++++++++++++------ .../xpack/esql/parser/LogicalPlanBuilder.java | 7 ++- .../esql/parser/StatementParserTests.java | 5 +- .../test/querying_cluster/80_esql.yml | 4 ++ 5 files changed, 60 insertions(+), 30 deletions(-) diff --git a/x-pack/plugin/esql/qa/testFixtures/src/main/resources/id.csv-spec b/x-pack/plugin/esql/qa/testFixtures/src/main/resources/id.csv-spec index 455303775cfa0..238135ef4c53f 100644 --- a/x-pack/plugin/esql/qa/testFixtures/src/main/resources/id.csv-spec +++ b/x-pack/plugin/esql/qa/testFixtures/src/main/resources/id.csv-spec @@ -3,7 +3,7 @@ // selectAll -FROM apps metadata _id; +FROM apps [metadata _id]; ignoreOrder:true id:integer |name:keyword |version:version | _id:keyword @@ -24,21 +24,21 @@ id:integer |name:keyword |version:version | _id:keyword ; filterById -FROM apps metadata _id| WHERE _id == "4"; +FROM apps [metadata _id]| WHERE _id == "4"; id:i |name:k |version:v | _id:k 4 |ddddd |2.12.0 | 4 ; keepId -FROM apps metadata _id | WHERE id == 3 | KEEP _id; +FROM apps [metadata _id] | WHERE id == 3 | KEEP _id; _id:k 3 ; idRangeAndSort -FROM apps metadata _id | WHERE _id >= "2" AND _id <= "7" | SORT _id | keep id, name, _id; +FROM apps [metadata _id] | WHERE _id >= "2" AND _id <= "7" | SORT _id | keep id, name, _id; id:i |name:k | _id:k 2 |bbbbb | 2 @@ -50,7 +50,7 @@ id:i |name:k | _id:k ; orderById -FROM apps metadata _id | KEEP _id, name | SORT _id; +FROM apps [metadata _id] | KEEP _id, name | SORT _id; _id:k | name:s 1 | aaaaa @@ -70,7 +70,7 @@ _id:k | name:s ; orderByIdDesc -FROM apps metadata _id | KEEP _id, name | SORT _id DESC; +FROM apps [metadata _id] | KEEP _id, name | SORT _id DESC; _id:k | name:s @@ -91,7 +91,7 @@ _id:k | name:s ; concatId -FROM apps metadata _id | eval c = concat(_id, name) | SORT _id | KEEP c; +FROM apps [metadata _id] | eval c = concat(_id, name) | SORT _id | KEEP c; c:k 1aaaaa @@ -111,7 +111,7 @@ c:k ; statsOnId -FROM apps metadata _id | stats c = count(_id), d = count_distinct(_id); +FROM apps [metadata _id] | stats c = count(_id), d = count_distinct(_id); c:l | d:l 14 | 14 @@ -119,7 +119,7 @@ c:l | d:l statsOnIdByGroup -FROM apps metadata _id | stats c = count(_id) by name | sort c desc, name | limit 5; +FROM apps [metadata _id] | stats c = count(_id) by name | sort c desc, name | limit 5; c:l | name:k 2 | aaaaa diff --git a/x-pack/plugin/esql/qa/testFixtures/src/main/resources/metadata-IT_tests_only.csv-spec b/x-pack/plugin/esql/qa/testFixtures/src/main/resources/metadata-IT_tests_only.csv-spec index 72d47d4644697..9b2ab65d71f3c 100644 --- a/x-pack/plugin/esql/qa/testFixtures/src/main/resources/metadata-IT_tests_only.csv-spec +++ b/x-pack/plugin/esql/qa/testFixtures/src/main/resources/metadata-IT_tests_only.csv-spec @@ -1,6 +1,7 @@ simpleKeep -from employees metadata _index, _version | sort emp_no | limit 2 | keep emp_no, _index, _version; +from employees [metadata _index, _version] | sort emp_no | limit 2 | keep emp_no, _index, _version; +warning:Line 1:16: Square brackets '[]' need to be removed in FROM METADATA declaration. emp_no:integer |_index:keyword |_version:long 10001 |employees |1 @@ -8,7 +9,8 @@ emp_no:integer |_index:keyword |_version:long ; aliasWithSameName -from employees metadata _index, _version | sort emp_no | limit 2 | eval _index = _index, _version = _version | keep emp_no, _index, _version; +from employees [metadata _index, _version] | sort emp_no | limit 2 | eval _index = _index, _version = _version | keep emp_no, _index, _version; +warning:Line 1:16: Square brackets '[]' need to be removed in FROM METADATA declaration. emp_no:integer |_index:keyword |_version:long 10001 |employees |1 @@ -16,14 +18,16 @@ emp_no:integer |_index:keyword |_version:long ; inComparison -from employees metadata _index, _version | sort emp_no | where _index == "employees" | where _version == 1 | keep emp_no | limit 2; +from employees [metadata _index, _version] | sort emp_no | where _index == "employees" | where _version == 1 | keep emp_no | limit 2; +warning:Line 1:16: Square brackets '[]' need to be removed in FROM METADATA declaration. + emp_no:integer 10001 10002 ; -metaIndexInAggs +metaIndexInAggs[skip:-8.12.99] // tag::metaIndexInAggs[] FROM employees METADATA _index, _id | STATS max = MAX(emp_no) BY _index @@ -37,42 +41,54 @@ max:integer |_index:keyword ; metaIndexAliasedInAggs -from employees metadata _index | eval _i = _index | stats max = max(emp_no) by _i; +from employees [metadata _index] | eval _i = _index | stats max = max(emp_no) by _i; +warning:Line 1:16: Square brackets '[]' need to be removed in FROM METADATA declaration. + max:integer |_i:keyword 10100 |employees ; metaVersionInAggs -from employees metadata _version | stats min = min(emp_no) by _version; +from employees [metadata _version] | stats min = min(emp_no) by _version; +warning:Line 1:16: Square brackets '[]' need to be removed in FROM METADATA declaration. + min:integer |_version:long 10001 |1 ; metaVersionAliasedInAggs -from employees metadata _version | eval _v = _version | stats min = min(emp_no) by _v; +from employees [metadata _version] | eval _v = _version | stats min = min(emp_no) by _v; +warning:Line 1:16: Square brackets '[]' need to be removed in FROM METADATA declaration. + min:integer |_v:long 10001 |1 ; inAggsAndAsGroups -from employees metadata _index, _version | stats max = max(_version) by _index; +from employees [metadata _index, _version] | stats max = max(_version) by _index; +warning:Line 1:16: Square brackets '[]' need to be removed in FROM METADATA declaration. + max:long |_index:keyword 1 |employees ; inAggsAndAsGroupsAliased -from employees metadata _index, _version | eval _i = _index, _v = _version | stats max = max(_v) by _i; +from employees [metadata _index, _version] | eval _i = _index, _v = _version | stats max = max(_v) by _i; +warning:Line 1:16: Square brackets '[]' need to be removed in FROM METADATA declaration. + max:long |_i:keyword 1 |employees ; inFunction -from employees metadata _index, _version | sort emp_no | where length(_index) == length("employees") | where abs(_version) == 1 | keep emp_no | limit 2; +from employees [metadata _index, _version] | sort emp_no | where length(_index) == length("employees") | where abs(_version) == 1 | keep emp_no | limit 2; +warning:Line 1:16: Square brackets '[]' need to be removed in FROM METADATA declaration. + emp_no:integer 10001 @@ -80,14 +96,18 @@ emp_no:integer ; inArithmetics -from employees metadata _index, _version | eval i = _version + 2 | stats min = min(emp_no) by i; +from employees [metadata _index, _version] | eval i = _version + 2 | stats min = min(emp_no) by i; +warning:Line 1:16: Square brackets '[]' need to be removed in FROM METADATA declaration. + min:integer |i:long 10001 |3 ; inSort -from employees metadata _index, _version | sort _version, _index, emp_no | keep emp_no, _version, _index | limit 2; +from employees [metadata _index, _version] | sort _version, _index, emp_no | keep emp_no, _version, _index | limit 2; +warning:Line 1:16: Square brackets '[]' need to be removed in FROM METADATA declaration. + emp_no:integer |_version:long |_index:keyword 10001 |1 |employees @@ -95,14 +115,18 @@ emp_no:integer |_version:long |_index:keyword ; withMvFunction -from employees metadata _version | eval i = mv_avg(_version) + 2 | stats min = min(emp_no) by i; +from employees [metadata _version] | eval i = mv_avg(_version) + 2 | stats min = min(emp_no) by i; +warning:Line 1:16: Square brackets '[]' need to be removed in FROM METADATA declaration. + min:integer |i:double 10001 |3.0 ; overwritten -from employees metadata _index, _version | sort emp_no | eval _index = 3, _version = "version" | keep emp_no, _index, _version | limit 3; +from employees [metadata _index, _version] | sort emp_no | eval _index = 3, _version = "version" | keep emp_no, _index, _version | limit 3; +warning:Line 1:16: Square brackets '[]' need to be removed in FROM METADATA declaration. + emp_no:integer |_index:integer |_version:keyword 10001 |3 |version @@ -110,9 +134,9 @@ emp_no:integer |_index:integer |_version:keyword 10003 |3 |version ; -multipleIndices +multipleIndices#[skip:-8.12.99] // tag::multipleIndices[] -FROM ul_logs, apps metadata _index, _version +FROM ul_logs, apps METADATA _index, _version | WHERE id IN (13, 14) AND _version == 1 | EVAL key = CONCAT(_index, "_", TO_STR(id)) | SORT id, _index diff --git a/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/parser/LogicalPlanBuilder.java b/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/parser/LogicalPlanBuilder.java index b20102a9a28c8..58de286106052 100644 --- a/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/parser/LogicalPlanBuilder.java +++ b/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/parser/LogicalPlanBuilder.java @@ -185,7 +185,12 @@ public LogicalPlan visitFromCommand(EsqlBaseParser.FromCommandContext ctx) { var deprecatedContext = ctx.metadata().deprecated_metadata(); MetadataOptionContext metadataOptionContext = null; if (deprecatedContext != null) { - addWarning("Remove [ ] in FROM METADATA declaration"); + var s = source(deprecatedContext).source(); + addWarning( + "Line {}:{}: Square brackets '[]' need to be removed in FROM METADATA declaration", + s.getLineNumber(), + s.getColumnNumber() + ); metadataOptionContext = deprecatedContext.metadataOption(); } else { metadataOptionContext = ctx.metadata().metadataOption(); diff --git a/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/parser/StatementParserTests.java b/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/parser/StatementParserTests.java index a701ce27f6060..1a70131da00f0 100644 --- a/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/parser/StatementParserTests.java +++ b/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/parser/StatementParserTests.java @@ -580,10 +580,7 @@ public void testDeprecatedIsNullFunction() { } public void testMetadataFieldOnOtherSources() { - expectError( - "row a = 1 metadata _index", - "line 1:20: extraneous input '_index' expecting " - ); + expectError("row a = 1 metadata _index", "line 1:20: extraneous input '_index' expecting "); expectError("show functions metadata _index", "line 1:16: token recognition error at: 'm'"); expectError( "explain [from foo] metadata _index", diff --git a/x-pack/qa/multi-cluster-search-security/legacy-with-basic-license/src/test/resources/rest-api-spec/test/querying_cluster/80_esql.yml b/x-pack/qa/multi-cluster-search-security/legacy-with-basic-license/src/test/resources/rest-api-spec/test/querying_cluster/80_esql.yml index 30c30365276f4..59d9adf4cf6dd 100644 --- a/x-pack/qa/multi-cluster-search-security/legacy-with-basic-license/src/test/resources/rest-api-spec/test/querying_cluster/80_esql.yml +++ b/x-pack/qa/multi-cluster-search-security/legacy-with-basic-license/src/test/resources/rest-api-spec/test/querying_cluster/80_esql.yml @@ -87,6 +87,8 @@ teardown: --- "Index data and search on the mixed cluster": + - skip: + features: allowed_warnings - do: headers: { Authorization: "Basic am9lOnMza3JpdC1wYXNzd29yZA==" } @@ -111,6 +113,8 @@ teardown: - match: {values.4.1: "tablet" } - do: + allowed_warnings: + - "Line 1:19: Square brackets '[]' need to be removed in FROM METADATA declaration" headers: { Authorization: "Basic am9lOnMza3JpdC1wYXNzd29yZA==" } esql.query: body: From 96a2feaead3f4c3d57f6a233e53322805253745e Mon Sep 17 00:00:00 2001 From: Costin Leau Date: Tue, 6 Feb 2024 17:57:55 -0800 Subject: [PATCH 05/12] Update changelog --- docs/changelog/105221.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/changelog/105221.yaml b/docs/changelog/105221.yaml index 2f39390a4c8c3..22a594f9a0a1a 100644 --- a/docs/changelog/105221.yaml +++ b/docs/changelog/105221.yaml @@ -8,7 +8,7 @@ breaking: area: ES|QL details: "Remove [ ] for METADATA option inside FROM command statements" impact: "Previously to return metadata fields, one had to use square brackets:\ - \(eg. 'FROM index [METADATA _index]')\ - \Since this release, the [ ] are dropped and do not have to be specified,\ - \thus simplifying the command above to:'FROM index METADATA _index'" + \ (eg. 'FROM index [METADATA _index]').\ + \ This is no longer needed: the [ ] are dropped and do not have to be specified,\ + \ thus simplifying the command above to:'FROM index METADATA _index'." notable: false From b210e2bddcc0d4b44c51522829d3b57b1c6725ca Mon Sep 17 00:00:00 2001 From: Costin Leau Date: Tue, 6 Feb 2024 18:26:32 -0800 Subject: [PATCH 06/12] More yml massaging --- .../src/main/resources/id.csv-spec | 10 +++++++ .../resources/metadata-IT_tests_only.csv-spec | 26 +++++++++---------- .../test/querying_cluster/80_esql.yml | 4 ++- 3 files changed, 26 insertions(+), 14 deletions(-) diff --git a/x-pack/plugin/esql/qa/testFixtures/src/main/resources/id.csv-spec b/x-pack/plugin/esql/qa/testFixtures/src/main/resources/id.csv-spec index 238135ef4c53f..e0f43ef280299 100644 --- a/x-pack/plugin/esql/qa/testFixtures/src/main/resources/id.csv-spec +++ b/x-pack/plugin/esql/qa/testFixtures/src/main/resources/id.csv-spec @@ -4,6 +4,7 @@ selectAll FROM apps [metadata _id]; +warning:Line 1:11: Square brackets '[]' need to be removed in FROM METADATA declaration ignoreOrder:true id:integer |name:keyword |version:version | _id:keyword @@ -25,6 +26,7 @@ id:integer |name:keyword |version:version | _id:keyword filterById FROM apps [metadata _id]| WHERE _id == "4"; +warning:Line 1:11: Square brackets '[]' need to be removed in FROM METADATA declaration id:i |name:k |version:v | _id:k 4 |ddddd |2.12.0 | 4 @@ -32,6 +34,8 @@ id:i |name:k |version:v | _id:k keepId FROM apps [metadata _id] | WHERE id == 3 | KEEP _id; +warning:Line 1:11: Square brackets '[]' need to be removed in FROM METADATA declaration + _id:k 3 @@ -39,6 +43,7 @@ _id:k idRangeAndSort FROM apps [metadata _id] | WHERE _id >= "2" AND _id <= "7" | SORT _id | keep id, name, _id; +warning:Line 1:11: Square brackets '[]' need to be removed in FROM METADATA declaration id:i |name:k | _id:k 2 |bbbbb | 2 @@ -51,6 +56,7 @@ id:i |name:k | _id:k orderById FROM apps [metadata _id] | KEEP _id, name | SORT _id; +warning:Line 1:11: Square brackets '[]' need to be removed in FROM METADATA declaration _id:k | name:s 1 | aaaaa @@ -71,6 +77,7 @@ _id:k | name:s orderByIdDesc FROM apps [metadata _id] | KEEP _id, name | SORT _id DESC; +warning:Line 1:11: Square brackets '[]' need to be removed in FROM METADATA declaration _id:k | name:s @@ -92,6 +99,7 @@ _id:k | name:s concatId FROM apps [metadata _id] | eval c = concat(_id, name) | SORT _id | KEEP c; +warning:Line 1:11: Square brackets '[]' need to be removed in FROM METADATA declaration c:k 1aaaaa @@ -112,6 +120,7 @@ c:k statsOnId FROM apps [metadata _id] | stats c = count(_id), d = count_distinct(_id); +warning:Line 1:11: Square brackets '[]' need to be removed in FROM METADATA declaration c:l | d:l 14 | 14 @@ -120,6 +129,7 @@ c:l | d:l statsOnIdByGroup FROM apps [metadata _id] | stats c = count(_id) by name | sort c desc, name | limit 5; +warning:Line 1:11: Square brackets '[]' need to be removed in FROM METADATA declaration c:l | name:k 2 | aaaaa diff --git a/x-pack/plugin/esql/qa/testFixtures/src/main/resources/metadata-IT_tests_only.csv-spec b/x-pack/plugin/esql/qa/testFixtures/src/main/resources/metadata-IT_tests_only.csv-spec index 9b2ab65d71f3c..082804cb63f10 100644 --- a/x-pack/plugin/esql/qa/testFixtures/src/main/resources/metadata-IT_tests_only.csv-spec +++ b/x-pack/plugin/esql/qa/testFixtures/src/main/resources/metadata-IT_tests_only.csv-spec @@ -1,7 +1,7 @@ simpleKeep from employees [metadata _index, _version] | sort emp_no | limit 2 | keep emp_no, _index, _version; -warning:Line 1:16: Square brackets '[]' need to be removed in FROM METADATA declaration. +warning:Line 1:16: Square brackets '[]' need to be removed in FROM METADATA declaration emp_no:integer |_index:keyword |_version:long 10001 |employees |1 @@ -10,7 +10,7 @@ emp_no:integer |_index:keyword |_version:long aliasWithSameName from employees [metadata _index, _version] | sort emp_no | limit 2 | eval _index = _index, _version = _version | keep emp_no, _index, _version; -warning:Line 1:16: Square brackets '[]' need to be removed in FROM METADATA declaration. +warning:Line 1:16: Square brackets '[]' need to be removed in FROM METADATA declaration emp_no:integer |_index:keyword |_version:long 10001 |employees |1 @@ -19,7 +19,7 @@ emp_no:integer |_index:keyword |_version:long inComparison from employees [metadata _index, _version] | sort emp_no | where _index == "employees" | where _version == 1 | keep emp_no | limit 2; -warning:Line 1:16: Square brackets '[]' need to be removed in FROM METADATA declaration. +warning:Line 1:16: Square brackets '[]' need to be removed in FROM METADATA declaration emp_no:integer @@ -42,7 +42,7 @@ max:integer |_index:keyword metaIndexAliasedInAggs from employees [metadata _index] | eval _i = _index | stats max = max(emp_no) by _i; -warning:Line 1:16: Square brackets '[]' need to be removed in FROM METADATA declaration. +warning:Line 1:16: Square brackets '[]' need to be removed in FROM METADATA declaration max:integer |_i:keyword @@ -51,7 +51,7 @@ max:integer |_i:keyword metaVersionInAggs from employees [metadata _version] | stats min = min(emp_no) by _version; -warning:Line 1:16: Square brackets '[]' need to be removed in FROM METADATA declaration. +warning:Line 1:16: Square brackets '[]' need to be removed in FROM METADATA declaration min:integer |_version:long @@ -60,7 +60,7 @@ min:integer |_version:long metaVersionAliasedInAggs from employees [metadata _version] | eval _v = _version | stats min = min(emp_no) by _v; -warning:Line 1:16: Square brackets '[]' need to be removed in FROM METADATA declaration. +warning:Line 1:16: Square brackets '[]' need to be removed in FROM METADATA declaration min:integer |_v:long @@ -69,7 +69,7 @@ min:integer |_v:long inAggsAndAsGroups from employees [metadata _index, _version] | stats max = max(_version) by _index; -warning:Line 1:16: Square brackets '[]' need to be removed in FROM METADATA declaration. +warning:Line 1:16: Square brackets '[]' need to be removed in FROM METADATA declaration max:long |_index:keyword @@ -78,7 +78,7 @@ max:long |_index:keyword inAggsAndAsGroupsAliased from employees [metadata _index, _version] | eval _i = _index, _v = _version | stats max = max(_v) by _i; -warning:Line 1:16: Square brackets '[]' need to be removed in FROM METADATA declaration. +warning:Line 1:16: Square brackets '[]' need to be removed in FROM METADATA declaration max:long |_i:keyword @@ -87,7 +87,7 @@ max:long |_i:keyword inFunction from employees [metadata _index, _version] | sort emp_no | where length(_index) == length("employees") | where abs(_version) == 1 | keep emp_no | limit 2; -warning:Line 1:16: Square brackets '[]' need to be removed in FROM METADATA declaration. +warning:Line 1:16: Square brackets '[]' need to be removed in FROM METADATA declaration emp_no:integer @@ -97,7 +97,7 @@ emp_no:integer inArithmetics from employees [metadata _index, _version] | eval i = _version + 2 | stats min = min(emp_no) by i; -warning:Line 1:16: Square brackets '[]' need to be removed in FROM METADATA declaration. +warning:Line 1:16: Square brackets '[]' need to be removed in FROM METADATA declaration min:integer |i:long @@ -106,7 +106,7 @@ min:integer |i:long inSort from employees [metadata _index, _version] | sort _version, _index, emp_no | keep emp_no, _version, _index | limit 2; -warning:Line 1:16: Square brackets '[]' need to be removed in FROM METADATA declaration. +warning:Line 1:16: Square brackets '[]' need to be removed in FROM METADATA declaration emp_no:integer |_version:long |_index:keyword @@ -116,7 +116,7 @@ emp_no:integer |_version:long |_index:keyword withMvFunction from employees [metadata _version] | eval i = mv_avg(_version) + 2 | stats min = min(emp_no) by i; -warning:Line 1:16: Square brackets '[]' need to be removed in FROM METADATA declaration. +warning:Line 1:16: Square brackets '[]' need to be removed in FROM METADATA declaration min:integer |i:double @@ -125,7 +125,7 @@ min:integer |i:double overwritten from employees [metadata _index, _version] | sort emp_no | eval _index = 3, _version = "version" | keep emp_no, _index, _version | limit 3; -warning:Line 1:16: Square brackets '[]' need to be removed in FROM METADATA declaration. +warning:Line 1:16: Square brackets '[]' need to be removed in FROM METADATA declaration emp_no:integer |_index:integer |_version:keyword diff --git a/x-pack/qa/multi-cluster-search-security/legacy-with-basic-license/src/test/resources/rest-api-spec/test/querying_cluster/80_esql.yml b/x-pack/qa/multi-cluster-search-security/legacy-with-basic-license/src/test/resources/rest-api-spec/test/querying_cluster/80_esql.yml index 59d9adf4cf6dd..aef1375be01d5 100644 --- a/x-pack/qa/multi-cluster-search-security/legacy-with-basic-license/src/test/resources/rest-api-spec/test/querying_cluster/80_esql.yml +++ b/x-pack/qa/multi-cluster-search-security/legacy-with-basic-license/src/test/resources/rest-api-spec/test/querying_cluster/80_esql.yml @@ -91,6 +91,8 @@ teardown: features: allowed_warnings - do: + allowed_warnings: + - "Line 1:21: Square brackets '[]' need to be removed in FROM METADATA declaration" headers: { Authorization: "Basic am9lOnMza3JpdC1wYXNzd29yZA==" } esql.query: body: @@ -114,7 +116,7 @@ teardown: - do: allowed_warnings: - - "Line 1:19: Square brackets '[]' need to be removed in FROM METADATA declaration" + - "Line 1:21: Square brackets '[]' need to be removed in FROM METADATA declaration" headers: { Authorization: "Basic am9lOnMza3JpdC1wYXNzd29yZA==" } esql.query: body: From 4a5c346acb2baead5000a57b4204dfa3b552aeb8 Mon Sep 17 00:00:00 2001 From: Costin Leau Date: Tue, 6 Feb 2024 18:58:50 -0800 Subject: [PATCH 07/12] Update the changelog again --- docs/changelog/105221.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/changelog/105221.yaml b/docs/changelog/105221.yaml index 22a594f9a0a1a..2663895910483 100644 --- a/docs/changelog/105221.yaml +++ b/docs/changelog/105221.yaml @@ -1,11 +1,11 @@ pr: 105221 summary: "ESQL: Grammar - FROM METADATA no longer require []" -area: Compute Engine +area: ES|QL type: breaking issues: [] breaking: title: "ESQL: Grammar - FROM METADATA no longer require []" - area: ES|QL + area: REST API details: "Remove [ ] for METADATA option inside FROM command statements" impact: "Previously to return metadata fields, one had to use square brackets:\ \ (eg. 'FROM index [METADATA _index]').\ From 6b0e12da2ef4803a44cbee3192ef663ce29196fc Mon Sep 17 00:00:00 2001 From: Costin Leau Date: Tue, 6 Feb 2024 20:27:38 -0800 Subject: [PATCH 08/12] Fix skip test name --- .../src/main/resources/metadata-IT_tests_only.csv-spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/x-pack/plugin/esql/qa/testFixtures/src/main/resources/metadata-IT_tests_only.csv-spec b/x-pack/plugin/esql/qa/testFixtures/src/main/resources/metadata-IT_tests_only.csv-spec index 082804cb63f10..547e1897f6b2a 100644 --- a/x-pack/plugin/esql/qa/testFixtures/src/main/resources/metadata-IT_tests_only.csv-spec +++ b/x-pack/plugin/esql/qa/testFixtures/src/main/resources/metadata-IT_tests_only.csv-spec @@ -27,7 +27,7 @@ emp_no:integer 10002 ; -metaIndexInAggs[skip:-8.12.99] +metaIndexInAggs#[skip:-8.12.99] // tag::metaIndexInAggs[] FROM employees METADATA _index, _id | STATS max = MAX(emp_no) BY _index From ea1097b3c7ecc9f856d223ba1d69cf5033b5043e Mon Sep 17 00:00:00 2001 From: Costin Leau Date: Wed, 7 Feb 2024 17:26:17 -0800 Subject: [PATCH 09/12] Update tests --- .../src/main/resources/id.csv-spec | 18 ++++++------- .../resources/metadata-IT_tests_only.csv-spec | 26 +++++++++---------- 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/x-pack/plugin/esql/qa/testFixtures/src/main/resources/id.csv-spec b/x-pack/plugin/esql/qa/testFixtures/src/main/resources/id.csv-spec index e0f43ef280299..d119ad4f3b496 100644 --- a/x-pack/plugin/esql/qa/testFixtures/src/main/resources/id.csv-spec +++ b/x-pack/plugin/esql/qa/testFixtures/src/main/resources/id.csv-spec @@ -2,7 +2,7 @@ // Tests for _id fields // -selectAll +selectAll#[skip:-8.12.99] FROM apps [metadata _id]; warning:Line 1:11: Square brackets '[]' need to be removed in FROM METADATA declaration ignoreOrder:true @@ -24,7 +24,7 @@ id:integer |name:keyword |version:version | _id:keyword 14 |mmmmm |5.2.9 | 14 ; -filterById +filterById#[skip:-8.12.99] FROM apps [metadata _id]| WHERE _id == "4"; warning:Line 1:11: Square brackets '[]' need to be removed in FROM METADATA declaration @@ -32,7 +32,7 @@ id:i |name:k |version:v | _id:k 4 |ddddd |2.12.0 | 4 ; -keepId +keepId#[skip:-8.12.99] FROM apps [metadata _id] | WHERE id == 3 | KEEP _id; warning:Line 1:11: Square brackets '[]' need to be removed in FROM METADATA declaration @@ -41,7 +41,7 @@ _id:k 3 ; -idRangeAndSort +idRangeAndSort#[skip:-8.12.99] FROM apps [metadata _id] | WHERE _id >= "2" AND _id <= "7" | SORT _id | keep id, name, _id; warning:Line 1:11: Square brackets '[]' need to be removed in FROM METADATA declaration @@ -54,7 +54,7 @@ id:i |name:k | _id:k 7 |ggggg | 7 ; -orderById +orderById#[skip:-8.12.99] FROM apps [metadata _id] | KEEP _id, name | SORT _id; warning:Line 1:11: Square brackets '[]' need to be removed in FROM METADATA declaration @@ -75,7 +75,7 @@ _id:k | name:s 9 | iiiii ; -orderByIdDesc +orderByIdDesc#[skip:-8.12.99] FROM apps [metadata _id] | KEEP _id, name | SORT _id DESC; warning:Line 1:11: Square brackets '[]' need to be removed in FROM METADATA declaration @@ -97,7 +97,7 @@ _id:k | name:s 1 | aaaaa ; -concatId +concatId#[skip:-8.12.99] FROM apps [metadata _id] | eval c = concat(_id, name) | SORT _id | KEEP c; warning:Line 1:11: Square brackets '[]' need to be removed in FROM METADATA declaration @@ -118,7 +118,7 @@ c:k 9iiiii ; -statsOnId +statsOnId#[skip:-8.12.99] FROM apps [metadata _id] | stats c = count(_id), d = count_distinct(_id); warning:Line 1:11: Square brackets '[]' need to be removed in FROM METADATA declaration @@ -127,7 +127,7 @@ c:l | d:l ; -statsOnIdByGroup +statsOnIdByGroup#[skip:-8.12.99] FROM apps [metadata _id] | stats c = count(_id) by name | sort c desc, name | limit 5; warning:Line 1:11: Square brackets '[]' need to be removed in FROM METADATA declaration diff --git a/x-pack/plugin/esql/qa/testFixtures/src/main/resources/metadata-IT_tests_only.csv-spec b/x-pack/plugin/esql/qa/testFixtures/src/main/resources/metadata-IT_tests_only.csv-spec index 547e1897f6b2a..1c24cd8c629dc 100644 --- a/x-pack/plugin/esql/qa/testFixtures/src/main/resources/metadata-IT_tests_only.csv-spec +++ b/x-pack/plugin/esql/qa/testFixtures/src/main/resources/metadata-IT_tests_only.csv-spec @@ -1,5 +1,5 @@ -simpleKeep +simpleKeep#[skip:-8.12.99] from employees [metadata _index, _version] | sort emp_no | limit 2 | keep emp_no, _index, _version; warning:Line 1:16: Square brackets '[]' need to be removed in FROM METADATA declaration @@ -8,7 +8,7 @@ emp_no:integer |_index:keyword |_version:long 10002 |employees |1 ; -aliasWithSameName +aliasWithSameName#[skip:-8.12.99] from employees [metadata _index, _version] | sort emp_no | limit 2 | eval _index = _index, _version = _version | keep emp_no, _index, _version; warning:Line 1:16: Square brackets '[]' need to be removed in FROM METADATA declaration @@ -17,7 +17,7 @@ emp_no:integer |_index:keyword |_version:long 10002 |employees |1 ; -inComparison +inComparison#[skip:-8.12.99] from employees [metadata _index, _version] | sort emp_no | where _index == "employees" | where _version == 1 | keep emp_no | limit 2; warning:Line 1:16: Square brackets '[]' need to be removed in FROM METADATA declaration @@ -40,7 +40,7 @@ max:integer |_index:keyword // end::metaIndexInAggs-result[] ; -metaIndexAliasedInAggs +metaIndexAliasedInAggs#[skip:-8.12.99] from employees [metadata _index] | eval _i = _index | stats max = max(emp_no) by _i; warning:Line 1:16: Square brackets '[]' need to be removed in FROM METADATA declaration @@ -49,7 +49,7 @@ max:integer |_i:keyword 10100 |employees ; -metaVersionInAggs +metaVersionInAggs#[skip:-8.12.99] from employees [metadata _version] | stats min = min(emp_no) by _version; warning:Line 1:16: Square brackets '[]' need to be removed in FROM METADATA declaration @@ -58,7 +58,7 @@ min:integer |_version:long 10001 |1 ; -metaVersionAliasedInAggs +metaVersionAliasedInAggs#[skip:-8.12.99] from employees [metadata _version] | eval _v = _version | stats min = min(emp_no) by _v; warning:Line 1:16: Square brackets '[]' need to be removed in FROM METADATA declaration @@ -67,7 +67,7 @@ min:integer |_v:long 10001 |1 ; -inAggsAndAsGroups +inAggsAndAsGroups#[skip:-8.12.99] from employees [metadata _index, _version] | stats max = max(_version) by _index; warning:Line 1:16: Square brackets '[]' need to be removed in FROM METADATA declaration @@ -76,7 +76,7 @@ max:long |_index:keyword 1 |employees ; -inAggsAndAsGroupsAliased +inAggsAndAsGroupsAliased#[skip:-8.12.99] from employees [metadata _index, _version] | eval _i = _index, _v = _version | stats max = max(_v) by _i; warning:Line 1:16: Square brackets '[]' need to be removed in FROM METADATA declaration @@ -85,7 +85,7 @@ max:long |_i:keyword 1 |employees ; -inFunction +inFunction#[skip:-8.12.99] from employees [metadata _index, _version] | sort emp_no | where length(_index) == length("employees") | where abs(_version) == 1 | keep emp_no | limit 2; warning:Line 1:16: Square brackets '[]' need to be removed in FROM METADATA declaration @@ -95,7 +95,7 @@ emp_no:integer 10002 ; -inArithmetics +inArithmetics#[skip:-8.12.99] from employees [metadata _index, _version] | eval i = _version + 2 | stats min = min(emp_no) by i; warning:Line 1:16: Square brackets '[]' need to be removed in FROM METADATA declaration @@ -104,7 +104,7 @@ min:integer |i:long 10001 |3 ; -inSort +inSort#[skip:-8.12.99] from employees [metadata _index, _version] | sort _version, _index, emp_no | keep emp_no, _version, _index | limit 2; warning:Line 1:16: Square brackets '[]' need to be removed in FROM METADATA declaration @@ -114,7 +114,7 @@ emp_no:integer |_version:long |_index:keyword 10002 |1 |employees ; -withMvFunction +withMvFunction#[skip:-8.12.99] from employees [metadata _version] | eval i = mv_avg(_version) + 2 | stats min = min(emp_no) by i; warning:Line 1:16: Square brackets '[]' need to be removed in FROM METADATA declaration @@ -123,7 +123,7 @@ min:integer |i:double 10001 |3.0 ; -overwritten +overwritten#[skip:-8.12.99] from employees [metadata _index, _version] | sort emp_no | eval _index = 3, _version = "version" | keep emp_no, _index, _version | limit 3; warning:Line 1:16: Square brackets '[]' need to be removed in FROM METADATA declaration From fe81918b0ac6ac5676320128d0e6cf1099d5d695 Mon Sep 17 00:00:00 2001 From: Costin Leau Date: Wed, 7 Feb 2024 20:43:13 -0800 Subject: [PATCH 10/12] Another round at fixing the tests --- .../xpack/esql/ccq/MultiClusterSpecIT.java | 10 ++-- .../src/main/resources/id.csv-spec | 28 ++++------- .../resources/metadata-IT_tests_only.csv-spec | 48 +++++-------------- 3 files changed, 28 insertions(+), 58 deletions(-) diff --git a/x-pack/plugin/esql/qa/server/multi-clusters/src/javaRestTest/java/org/elasticsearch/xpack/esql/ccq/MultiClusterSpecIT.java b/x-pack/plugin/esql/qa/server/multi-clusters/src/javaRestTest/java/org/elasticsearch/xpack/esql/ccq/MultiClusterSpecIT.java index 9ca7bd2aaf020..e5e53f34df312 100644 --- a/x-pack/plugin/esql/qa/server/multi-clusters/src/javaRestTest/java/org/elasticsearch/xpack/esql/ccq/MultiClusterSpecIT.java +++ b/x-pack/plugin/esql/qa/server/multi-clusters/src/javaRestTest/java/org/elasticsearch/xpack/esql/ccq/MultiClusterSpecIT.java @@ -161,16 +161,18 @@ static CsvSpecReader.CsvTestCase convertToRemoteIndices(CsvSpecReader.CsvTestCas String query = testCase.query; String[] commands = query.split("\\|"); String first = commands[0].trim(); + if (commands[0].toLowerCase(Locale.ROOT).startsWith("from")) { - String[] parts = commands[0].split("\\["); + String[] parts = commands[0].split("(?i)metadata"); assert parts.length >= 1 : parts; String fromStatement = parts[0]; + String[] localIndices = fromStatement.substring("FROM ".length()).split(","); String remoteIndices = Arrays.stream(localIndices) .map(index -> "*:" + index.trim() + "," + index.trim()) .collect(Collectors.joining(",")); - var newFrom = "FROM " + remoteIndices + commands[0].substring(fromStatement.length()); - testCase.query = newFrom + " " + query.substring(first.length()); + var newFrom = "FROM " + remoteIndices + " " + commands[0].substring(fromStatement.length()); + testCase.query = newFrom + query.substring(first.length()); } int offset = testCase.query.length() - query.length(); if (offset != 0) { @@ -195,7 +197,7 @@ static CsvSpecReader.CsvTestCase convertToRemoteIndices(CsvSpecReader.CsvTestCas static boolean hasIndexMetadata(String query) { String[] commands = query.split("\\|"); if (commands[0].trim().toLowerCase(Locale.ROOT).startsWith("from")) { - String[] parts = commands[0].split("\\["); + String[] parts = commands[0].split("(?i)metadata"); return parts.length > 1 && parts[1].contains("_index"); } return false; diff --git a/x-pack/plugin/esql/qa/testFixtures/src/main/resources/id.csv-spec b/x-pack/plugin/esql/qa/testFixtures/src/main/resources/id.csv-spec index d119ad4f3b496..d5e2aa5cc2bcf 100644 --- a/x-pack/plugin/esql/qa/testFixtures/src/main/resources/id.csv-spec +++ b/x-pack/plugin/esql/qa/testFixtures/src/main/resources/id.csv-spec @@ -1,10 +1,8 @@ // -// Tests for _id fields // selectAll#[skip:-8.12.99] -FROM apps [metadata _id]; -warning:Line 1:11: Square brackets '[]' need to be removed in FROM METADATA declaration +FROM apps metadata _id; ignoreOrder:true id:integer |name:keyword |version:version | _id:keyword @@ -25,16 +23,14 @@ id:integer |name:keyword |version:version | _id:keyword ; filterById#[skip:-8.12.99] -FROM apps [metadata _id]| WHERE _id == "4"; -warning:Line 1:11: Square brackets '[]' need to be removed in FROM METADATA declaration +FROM apps metadata _id | WHERE _id == "4"; id:i |name:k |version:v | _id:k 4 |ddddd |2.12.0 | 4 ; keepId#[skip:-8.12.99] -FROM apps [metadata _id] | WHERE id == 3 | KEEP _id; -warning:Line 1:11: Square brackets '[]' need to be removed in FROM METADATA declaration +FROM apps metadata _id | WHERE id == 3 | KEEP _id; _id:k @@ -42,8 +38,7 @@ _id:k ; idRangeAndSort#[skip:-8.12.99] -FROM apps [metadata _id] | WHERE _id >= "2" AND _id <= "7" | SORT _id | keep id, name, _id; -warning:Line 1:11: Square brackets '[]' need to be removed in FROM METADATA declaration +FROM apps metadata _id | WHERE _id >= "2" AND _id <= "7" | SORT _id | keep id, name, _id; id:i |name:k | _id:k 2 |bbbbb | 2 @@ -55,8 +50,7 @@ id:i |name:k | _id:k ; orderById#[skip:-8.12.99] -FROM apps [metadata _id] | KEEP _id, name | SORT _id; -warning:Line 1:11: Square brackets '[]' need to be removed in FROM METADATA declaration +FROM apps metadata _id | KEEP _id, name | SORT _id; _id:k | name:s 1 | aaaaa @@ -76,8 +70,7 @@ _id:k | name:s ; orderByIdDesc#[skip:-8.12.99] -FROM apps [metadata _id] | KEEP _id, name | SORT _id DESC; -warning:Line 1:11: Square brackets '[]' need to be removed in FROM METADATA declaration +FROM apps metadata _id | KEEP _id, name | SORT _id DESC; _id:k | name:s @@ -98,8 +91,7 @@ _id:k | name:s ; concatId#[skip:-8.12.99] -FROM apps [metadata _id] | eval c = concat(_id, name) | SORT _id | KEEP c; -warning:Line 1:11: Square brackets '[]' need to be removed in FROM METADATA declaration +FROM apps metadata _id | eval c = concat(_id, name) | SORT _id | KEEP c; c:k 1aaaaa @@ -119,8 +111,7 @@ c:k ; statsOnId#[skip:-8.12.99] -FROM apps [metadata _id] | stats c = count(_id), d = count_distinct(_id); -warning:Line 1:11: Square brackets '[]' need to be removed in FROM METADATA declaration +FROM apps metadata _id | stats c = count(_id), d = count_distinct(_id); c:l | d:l 14 | 14 @@ -128,8 +119,7 @@ c:l | d:l statsOnIdByGroup#[skip:-8.12.99] -FROM apps [metadata _id] | stats c = count(_id) by name | sort c desc, name | limit 5; -warning:Line 1:11: Square brackets '[]' need to be removed in FROM METADATA declaration +FROM apps metadata _id | stats c = count(_id) by name | sort c desc, name | limit 5; c:l | name:k 2 | aaaaa diff --git a/x-pack/plugin/esql/qa/testFixtures/src/main/resources/metadata-IT_tests_only.csv-spec b/x-pack/plugin/esql/qa/testFixtures/src/main/resources/metadata-IT_tests_only.csv-spec index 1c24cd8c629dc..0e970cccd3ddf 100644 --- a/x-pack/plugin/esql/qa/testFixtures/src/main/resources/metadata-IT_tests_only.csv-spec +++ b/x-pack/plugin/esql/qa/testFixtures/src/main/resources/metadata-IT_tests_only.csv-spec @@ -1,7 +1,6 @@ simpleKeep#[skip:-8.12.99] -from employees [metadata _index, _version] | sort emp_no | limit 2 | keep emp_no, _index, _version; -warning:Line 1:16: Square brackets '[]' need to be removed in FROM METADATA declaration +from employees metadata _index, _version | sort emp_no | limit 2 | keep emp_no, _index, _version; emp_no:integer |_index:keyword |_version:long 10001 |employees |1 @@ -9,8 +8,7 @@ emp_no:integer |_index:keyword |_version:long ; aliasWithSameName#[skip:-8.12.99] -from employees [metadata _index, _version] | sort emp_no | limit 2 | eval _index = _index, _version = _version | keep emp_no, _index, _version; -warning:Line 1:16: Square brackets '[]' need to be removed in FROM METADATA declaration +from employees metadata _index, _version | sort emp_no | limit 2 | eval _index = _index, _version = _version | keep emp_no, _index, _version; emp_no:integer |_index:keyword |_version:long 10001 |employees |1 @@ -18,8 +16,7 @@ emp_no:integer |_index:keyword |_version:long ; inComparison#[skip:-8.12.99] -from employees [metadata _index, _version] | sort emp_no | where _index == "employees" | where _version == 1 | keep emp_no | limit 2; -warning:Line 1:16: Square brackets '[]' need to be removed in FROM METADATA declaration +from employees metadata _index, _version | sort emp_no | where _index == "employees" | where _version == 1 | keep emp_no | limit 2; emp_no:integer @@ -41,8 +38,7 @@ max:integer |_index:keyword ; metaIndexAliasedInAggs#[skip:-8.12.99] -from employees [metadata _index] | eval _i = _index | stats max = max(emp_no) by _i; -warning:Line 1:16: Square brackets '[]' need to be removed in FROM METADATA declaration +from employees metadata _index | eval _i = _index | stats max = max(emp_no) by _i; max:integer |_i:keyword @@ -50,45 +46,35 @@ max:integer |_i:keyword ; metaVersionInAggs#[skip:-8.12.99] -from employees [metadata _version] | stats min = min(emp_no) by _version; -warning:Line 1:16: Square brackets '[]' need to be removed in FROM METADATA declaration - +from employees metadata _version | stats min = min(emp_no) by _version; min:integer |_version:long 10001 |1 ; metaVersionAliasedInAggs#[skip:-8.12.99] -from employees [metadata _version] | eval _v = _version | stats min = min(emp_no) by _v; -warning:Line 1:16: Square brackets '[]' need to be removed in FROM METADATA declaration - +from employees metadata _version | eval _v = _version | stats min = min(emp_no) by _v; min:integer |_v:long 10001 |1 ; inAggsAndAsGroups#[skip:-8.12.99] -from employees [metadata _index, _version] | stats max = max(_version) by _index; -warning:Line 1:16: Square brackets '[]' need to be removed in FROM METADATA declaration - +from employees metadata _index, _version | stats max = max(_version) by _index; max:long |_index:keyword 1 |employees ; inAggsAndAsGroupsAliased#[skip:-8.12.99] -from employees [metadata _index, _version] | eval _i = _index, _v = _version | stats max = max(_v) by _i; -warning:Line 1:16: Square brackets '[]' need to be removed in FROM METADATA declaration - +from employees metadata _index, _version | eval _i = _index, _v = _version | stats max = max(_v) by _i; max:long |_i:keyword 1 |employees ; inFunction#[skip:-8.12.99] -from employees [metadata _index, _version] | sort emp_no | where length(_index) == length("employees") | where abs(_version) == 1 | keep emp_no | limit 2; -warning:Line 1:16: Square brackets '[]' need to be removed in FROM METADATA declaration - +from employees metadata _index, _version | sort emp_no | where length(_index) == length("employees") | where abs(_version) == 1 | keep emp_no | limit 2; emp_no:integer 10001 @@ -96,18 +82,14 @@ emp_no:integer ; inArithmetics#[skip:-8.12.99] -from employees [metadata _index, _version] | eval i = _version + 2 | stats min = min(emp_no) by i; -warning:Line 1:16: Square brackets '[]' need to be removed in FROM METADATA declaration - +from employees metadata _index, _version | eval i = _version + 2 | stats min = min(emp_no) by i; min:integer |i:long 10001 |3 ; inSort#[skip:-8.12.99] -from employees [metadata _index, _version] | sort _version, _index, emp_no | keep emp_no, _version, _index | limit 2; -warning:Line 1:16: Square brackets '[]' need to be removed in FROM METADATA declaration - +from employees metadata _index, _version | sort _version, _index, emp_no | keep emp_no, _version, _index | limit 2; emp_no:integer |_version:long |_index:keyword 10001 |1 |employees @@ -115,18 +97,14 @@ emp_no:integer |_version:long |_index:keyword ; withMvFunction#[skip:-8.12.99] -from employees [metadata _version] | eval i = mv_avg(_version) + 2 | stats min = min(emp_no) by i; -warning:Line 1:16: Square brackets '[]' need to be removed in FROM METADATA declaration - +from employees metadata _version | eval i = mv_avg(_version) + 2 | stats min = min(emp_no) by i; min:integer |i:double 10001 |3.0 ; overwritten#[skip:-8.12.99] -from employees [metadata _index, _version] | sort emp_no | eval _index = 3, _version = "version" | keep emp_no, _index, _version | limit 3; -warning:Line 1:16: Square brackets '[]' need to be removed in FROM METADATA declaration - +from employees metadata _index, _version | sort emp_no | eval _index = 3, _version = "version" | keep emp_no, _index, _version | limit 3; emp_no:integer |_index:integer |_version:keyword 10001 |3 |version From ab01f0bf214088acca7712d8b597c51a64af1ac1 Mon Sep 17 00:00:00 2001 From: Costin Leau Date: Wed, 7 Feb 2024 21:59:43 -0800 Subject: [PATCH 11/12] Fix yaml tests --- .../resources/rest-api-spec/test/esql/100_bug_fix.yml | 4 ++-- .../resources/rest-api-spec/test/esql/30_types.yml | 11 +++++++---- .../resources/rest-api-spec/test/esql/40_tsdb.yml | 7 +++++-- 3 files changed, 14 insertions(+), 8 deletions(-) diff --git a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/esql/100_bug_fix.yml b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/esql/100_bug_fix.yml index bbbc87fafc146..f44b45a8be1d2 100644 --- a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/esql/100_bug_fix.yml +++ b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/esql/100_bug_fix.yml @@ -58,8 +58,8 @@ --- "unsupported and invalid mapped fields": - skip: - version: " - 8.11.99" - reason: "fixes in 8.12 or later" + version: " - 8.12.99" + reason: "fixes in 8.13 or later" - do: indices.create: index: index1 diff --git a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/esql/30_types.yml b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/esql/30_types.yml index b8ac2fd6ba73a..217ab4f7879ed 100644 --- a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/esql/30_types.yml +++ b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/esql/30_types.yml @@ -621,6 +621,9 @@ version: --- id: + - skip: + version: " - 8.12.99" + reason: "_source is available in 8.13+" - do: indices.create: index: test @@ -683,8 +686,8 @@ unsigned_long: --- _source: - skip: - version: " - 8.11.99" - reason: "_source is available in 8.12+" + version: " - 8.12.99" + reason: "_source is available in 8.13+" - do: bulk: @@ -746,8 +749,8 @@ _source keep all: --- _source disabled: - skip: - version: " - 8.11.99" - reason: "_source is available in 8.12+" + version: " - 8.12.99" + reason: "_source is available in 8.13+" - do: indices.create: diff --git a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/esql/40_tsdb.yml b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/esql/40_tsdb.yml index bc832c11c4ff0..26fc26d5c0449 100644 --- a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/esql/40_tsdb.yml +++ b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/esql/40_tsdb.yml @@ -107,6 +107,9 @@ setup: --- load everything: + - skip: + version: " - 8.12.99" + reason: "_source is available in 8.13+" - do: allowed_warnings_regex: - "Field \\[.*\\] cannot be retrieved, it is unsupported or not indexed; returning null" @@ -231,8 +234,8 @@ from index pattern explicit counter use: --- _source: - skip: - version: " - 8.11.99" - reason: "_source is available in 8.12+" + version: " - 8.12.99" + reason: "_source is available in 8.13+" - do: bulk: From ea3b1426bbaf84f700c69a79c7674c4cbb19f088 Mon Sep 17 00:00:00 2001 From: Costin Leau Date: Wed, 7 Feb 2024 22:59:30 -0800 Subject: [PATCH 12/12] Minor adjustment --- .../resources/rest-api-spec/test/esql/30_types.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/esql/30_types.yml b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/esql/30_types.yml index 217ab4f7879ed..41e6d6b2cca77 100644 --- a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/esql/30_types.yml +++ b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/esql/30_types.yml @@ -714,8 +714,8 @@ _source: --- _source keep all: - skip: - version: " - 8.11.99" - reason: "_source is available in 8.12+" + version: " - 8.12.99" + reason: "_source is available in 8.13+" - do: indices.create: