diff --git a/buildSrc/src/test/java/org/elasticsearch/gradle/BuildExamplePluginsIT.java b/buildSrc/src/test/java/org/elasticsearch/gradle/BuildExamplePluginsIT.java index 239e6d37c81e3..deefd4fc8de93 100644 --- a/buildSrc/src/test/java/org/elasticsearch/gradle/BuildExamplePluginsIT.java +++ b/buildSrc/src/test/java/org/elasticsearch/gradle/BuildExamplePluginsIT.java @@ -23,6 +23,7 @@ import org.elasticsearch.gradle.test.GradleIntegrationTestCase; import org.gradle.testkit.runner.GradleRunner; import org.junit.BeforeClass; +import org.junit.Ignore; import org.junit.Rule; import org.junit.rules.TemporaryFolder; @@ -38,6 +39,7 @@ import java.util.Objects; import java.util.stream.Collectors; +@Ignore // https://github.com/elastic/elasticsearch/issues/38784 public class BuildExamplePluginsIT extends GradleIntegrationTestCase { private static final List EXAMPLE_PLUGINS = Collections.unmodifiableList( diff --git a/distribution/packages/src/deb/init.d/elasticsearch b/distribution/packages/src/deb/init.d/elasticsearch index 1e503fa0cfad0..72eb635bba3f5 100755 --- a/distribution/packages/src/deb/init.d/elasticsearch +++ b/distribution/packages/src/deb/init.d/elasticsearch @@ -122,7 +122,7 @@ case "$1" in ulimit -l $MAX_LOCKED_MEMORY fi - if [ -n "$MAX_MAP_COUNT" -a -f /proc/sys/vm/max_map_count -a "$MAX_MAP_COUNT" -gt $(cat /proc/sys/vm/max_map_count) ]; then + if [ -n "$MAX_MAP_COUNT" -a -f /proc/sys/vm/max_map_count ] && [ "$MAX_MAP_COUNT" -gt $(cat /proc/sys/vm/max_map_count) ]; then sysctl -q -w vm.max_map_count=$MAX_MAP_COUNT fi diff --git a/distribution/packages/src/rpm/init.d/elasticsearch b/distribution/packages/src/rpm/init.d/elasticsearch index bdaf8fbec37de..99d8ef45ef6a9 100644 --- a/distribution/packages/src/rpm/init.d/elasticsearch +++ b/distribution/packages/src/rpm/init.d/elasticsearch @@ -90,7 +90,7 @@ start() { if [ -n "$MAX_LOCKED_MEMORY" ]; then ulimit -l $MAX_LOCKED_MEMORY fi - if [ -n "$MAX_MAP_COUNT" -a -f /proc/sys/vm/max_map_count -a "$MAX_MAP_COUNT" -gt $(cat /proc/sys/vm/max_map_count) ]; then + if [ -n "$MAX_MAP_COUNT" -a -f /proc/sys/vm/max_map_count ] && [ "$MAX_MAP_COUNT" -gt $(cat /proc/sys/vm/max_map_count) ]; then sysctl -q -w vm.max_map_count=$MAX_MAP_COUNT fi diff --git a/docs/reference/sql/functions/operators.asciidoc b/docs/reference/sql/functions/operators.asciidoc index b9f6a31a44346..77ec9d93ff2da 100644 --- a/docs/reference/sql/functions/operators.asciidoc +++ b/docs/reference/sql/functions/operators.asciidoc @@ -126,9 +126,21 @@ include-tagged::{sql-specs}/arithmetic.sql-spec[multiply] include-tagged::{sql-specs}/arithmetic.sql-spec[divide] -------------------------------------------------- -* https://en.wikipedia.org/wiki/Modulo_operation[Modulo] or Reminder(`%`) +* https://en.wikipedia.org/wiki/Modulo_operation[Modulo] or Remainder(`%`) ["source","sql",subs="attributes,callouts,macros"] -------------------------------------------------- include-tagged::{sql-specs}/arithmetic.sql-spec[mod] -------------------------------------------------- + +[[sql-operators-cast]] +=== Cast Operators + +* Cast (`::`) + +`::` provides an alternative syntax to the <> function. + +["source","sql",subs="attributes,callouts,macros"] +-------------------------------------------------- +include-tagged::{sql-specs}/docs.csv-spec[conversionStringToLongCastOperator] +-------------------------------------------------- diff --git a/qa/logging-config/src/test/java/org/elasticsearch/common/logging/JsonLoggerTests.java b/qa/logging-config/src/test/java/org/elasticsearch/common/logging/JsonLoggerTests.java index b484ba90a4da3..1f7479dd3dee5 100644 --- a/qa/logging-config/src/test/java/org/elasticsearch/common/logging/JsonLoggerTests.java +++ b/qa/logging-config/src/test/java/org/elasticsearch/common/logging/JsonLoggerTests.java @@ -46,6 +46,7 @@ * It has to be in a org.elasticsearch.common.logging package to use PrefixLogger */ public class JsonLoggerTests extends ESTestCase { + private static final String LINE_SEPARATOR = System.lineSeparator(); @BeforeClass public static void initNodeName() { @@ -109,15 +110,15 @@ public void testPrefixLoggerInJson() throws IOException { public void testJsonInMessage() throws IOException { final Logger testLogger = LogManager.getLogger("test"); - String json = "{\n" + - " \"terms\" : {\n" + - " \"user\" : [\n" + - " \"u1\",\n" + - " \"u2\",\n" + - " \"u3\"\n" + - " ],\n" + - " \"boost\" : 1.0\n" + - " }\n" + + String json = "{" + LINE_SEPARATOR + + " \"terms\" : {" + LINE_SEPARATOR + + " \"user\" : [" + LINE_SEPARATOR + + " \"u1\"," + LINE_SEPARATOR + + " \"u2\"," + LINE_SEPARATOR + + " \"u3\"" + LINE_SEPARATOR + + " ]," + LINE_SEPARATOR + + " \"boost\" : 1.0" + LINE_SEPARATOR + + " }" + LINE_SEPARATOR + "}"; testLogger.info(json); @@ -151,15 +152,15 @@ public void testStacktrace() throws IOException { public void testJsonInStacktraceMessageIsSplitted() throws IOException { final Logger testLogger = LogManager.getLogger("test"); - String json = "{\n" + - " \"terms\" : {\n" + - " \"user\" : [\n" + - " \"u1\",\n" + - " \"u2\",\n" + - " \"u3\"\n" + - " ],\n" + - " \"boost\" : 1.0\n" + - " }\n" + + String json = "{" + LINE_SEPARATOR + + " \"terms\" : {" + LINE_SEPARATOR + + " \"user\" : [" + LINE_SEPARATOR + + " \"u1\"," + LINE_SEPARATOR + + " \"u2\"," + LINE_SEPARATOR + + " \"u3\"" + LINE_SEPARATOR + + " ]," + LINE_SEPARATOR + + " \"boost\" : 1.0" + LINE_SEPARATOR + + " }" + LINE_SEPARATOR + "}"; testLogger.error("error message " + json, new Exception(json)); diff --git a/server/src/main/java/org/elasticsearch/index/seqno/LocalCheckpointTracker.java b/server/src/main/java/org/elasticsearch/index/seqno/LocalCheckpointTracker.java index 8249e2600ad55..50f4e311c8d81 100644 --- a/server/src/main/java/org/elasticsearch/index/seqno/LocalCheckpointTracker.java +++ b/server/src/main/java/org/elasticsearch/index/seqno/LocalCheckpointTracker.java @@ -157,11 +157,11 @@ public boolean contains(final long seqNo) { return true; } final long bitSetKey = getBitSetKey(seqNo); - final CountedBitSet bitSet; + final int bitSetOffset = seqNoToBitSetOffset(seqNo); synchronized (this) { - bitSet = processedSeqNo.get(bitSetKey); + final CountedBitSet bitSet = processedSeqNo.get(bitSetKey); + return bitSet != null && bitSet.get(bitSetOffset); } - return bitSet != null && bitSet.get(seqNoToBitSetOffset(seqNo)); } /** diff --git a/server/src/main/java/org/elasticsearch/index/shard/IndexShard.java b/server/src/main/java/org/elasticsearch/index/shard/IndexShard.java index 4b2d134f5385c..50400c6961741 100644 --- a/server/src/main/java/org/elasticsearch/index/shard/IndexShard.java +++ b/server/src/main/java/org/elasticsearch/index/shard/IndexShard.java @@ -779,7 +779,8 @@ private Engine.IndexResult index(Engine engine, Engine.Index index) throws IOExc try { if (logger.isTraceEnabled()) { // don't use index.source().utf8ToString() here source might not be valid UTF-8 - logger.trace("index [{}][{}] (seq# [{}])", index.type(), index.id(), index.seqNo()); + logger.trace("index [{}][{}] seq# [{}] allocation-id {}", + index.type(), index.id(), index.seqNo(), routingEntry().allocationId()); } result = engine.index(index); } catch (Exception e) { diff --git a/server/src/test/java/org/elasticsearch/common/logging/JsonThrowablePatternConverterTests.java b/server/src/test/java/org/elasticsearch/common/logging/JsonThrowablePatternConverterTests.java index 2f1fee1208540..111e94eb2b050 100644 --- a/server/src/test/java/org/elasticsearch/common/logging/JsonThrowablePatternConverterTests.java +++ b/server/src/test/java/org/elasticsearch/common/logging/JsonThrowablePatternConverterTests.java @@ -32,7 +32,8 @@ import static org.hamcrest.Matchers.equalTo; public class JsonThrowablePatternConverterTests extends ESTestCase { - JsonThrowablePatternConverter converter = JsonThrowablePatternConverter.newInstance(null, null); + private static final String LINE_SEPARATOR = System.lineSeparator(); + private JsonThrowablePatternConverter converter = JsonThrowablePatternConverter.newInstance(null, null); public void testNoStacktrace() throws IOException { LogEvent event = Log4jLogEvent.newBuilder() @@ -48,15 +49,15 @@ public void testNoStacktrace() throws IOException { public void testStacktraceWithJson() throws IOException { - String json = "{\n" + - " \"terms\" : {\n" + - " \"user\" : [\n" + - " \"u1\",\n" + - " \"u2\",\n" + - " \"u3\"\n" + - " ],\n" + - " \"boost\" : 1.0\n" + - " }\n" + + String json = "{" + LINE_SEPARATOR + + " \"terms\" : {" + LINE_SEPARATOR + + " \"user\" : [" + LINE_SEPARATOR + + " \"u1\"," + LINE_SEPARATOR + + " \"u2\"," + LINE_SEPARATOR + + " \"u3\"" + LINE_SEPARATOR + + " ]," + LINE_SEPARATOR + + " \"boost\" : 1.0" + LINE_SEPARATOR + + " }" + LINE_SEPARATOR + "}"; Exception thrown = new Exception(json); LogEvent event = Log4jLogEvent.newBuilder() @@ -73,7 +74,7 @@ public void testStacktraceWithJson() throws IOException { .findFirst() .orElseThrow(() -> new AssertionError("no logs parsed")); - int jsonLength = json.split("\n").length; + int jsonLength = json.split(LINE_SEPARATOR).length; int stacktraceLength = thrown.getStackTrace().length; assertThat("stacktrace should formatted in multiple lines. JsonLogLine= " + jsonLogLine+" result= "+result, jsonLogLine.stacktrace().size(), equalTo(jsonLength + stacktraceLength)); diff --git a/test/framework/src/main/java/org/elasticsearch/index/engine/EngineTestCase.java b/test/framework/src/main/java/org/elasticsearch/index/engine/EngineTestCase.java index 855f1b2e2fd72..005bfb42f8a22 100644 --- a/test/framework/src/main/java/org/elasticsearch/index/engine/EngineTestCase.java +++ b/test/framework/src/main/java/org/elasticsearch/index/engine/EngineTestCase.java @@ -997,8 +997,9 @@ public static List getDocIds(Engine engine, boolean refresh) } } } - docs.sort(Comparator.comparing(DocIdSeqNoAndTerm::getId) - .thenComparingLong(DocIdSeqNoAndTerm::getSeqNo).thenComparingLong(DocIdSeqNoAndTerm::getPrimaryTerm)); + docs.sort(Comparator.comparingLong(DocIdSeqNoAndTerm::getSeqNo) + .thenComparingLong(DocIdSeqNoAndTerm::getPrimaryTerm) + .thenComparing((DocIdSeqNoAndTerm::getId))); return docs; } } diff --git a/x-pack/plugin/ccr/src/test/java/org/elasticsearch/xpack/CcrIntegTestCase.java b/x-pack/plugin/ccr/src/test/java/org/elasticsearch/xpack/CcrIntegTestCase.java index 5936a813f4bd3..81b90a3ff60b0 100644 --- a/x-pack/plugin/ccr/src/test/java/org/elasticsearch/xpack/CcrIntegTestCase.java +++ b/x-pack/plugin/ccr/src/test/java/org/elasticsearch/xpack/CcrIntegTestCase.java @@ -38,6 +38,7 @@ import org.elasticsearch.common.network.NetworkModule; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.unit.TimeValue; +import org.elasticsearch.common.util.set.Sets; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.core.internal.io.IOUtils; import org.elasticsearch.env.NodeEnvironment; @@ -451,8 +452,18 @@ protected void assertIndexFullyReplicatedToFollower(String leaderIndex, String f logger.info("--> asserting <> between {} and {}", leaderIndex, followerIndex); assertBusy(() -> { Map> docsOnFollower = getDocIdAndSeqNos(clusterGroup.followerCluster, followerIndex); - logger.info("--> docs on the follower {}", docsOnFollower); - assertThat(docsOnFollower, equalTo(getDocIdAndSeqNos(clusterGroup.leaderCluster, leaderIndex))); + Map> docsOnLeader = getDocIdAndSeqNos(clusterGroup.leaderCluster, leaderIndex); + Map> mismatchedDocs = new HashMap<>(); + for (Map.Entry> fe : docsOnFollower.entrySet()) { + Set d1 = Sets.difference( + Sets.newHashSet(fe.getValue()), Sets.newHashSet(docsOnLeader.getOrDefault(fe.getKey(), Collections.emptyList()))); + Set d2 = Sets.difference( + Sets.newHashSet(docsOnLeader.getOrDefault(fe.getKey(), Collections.emptyList())), Sets.newHashSet(fe.getValue())); + if (d1.isEmpty() == false || d2.isEmpty() == false) { + mismatchedDocs.put(fe.getKey(), Sets.union(d1, d2)); + } + } + assertThat("mismatched documents [" + mismatchedDocs + "]", docsOnFollower, equalTo(docsOnLeader)); }, 120, TimeUnit.SECONDS); logger.info("--> asserting seq_no_stats between {} and {}", leaderIndex, followerIndex); @@ -481,13 +492,15 @@ private Map> getDocIdAndSeqNos(InternalTestClus Randomness.shuffle(shardRoutings); final Map> docs = new HashMap<>(); for (ShardRouting shardRouting : shardRoutings) { - if (shardRouting == null || shardRouting.assignedToNode() == false || docs.containsKey(shardRouting.shardId().id())) { + if (shardRouting == null || shardRouting.assignedToNode() == false) { continue; } IndexShard indexShard = cluster.getInstance(IndicesService.class, state.nodes().get(shardRouting.currentNodeId()).getName()) .indexServiceSafe(shardRouting.index()).getShard(shardRouting.id()); try { - docs.put(shardRouting.shardId().id(), IndexShardTestCase.getDocIdAndSeqNos(indexShard).stream() + final List docsOnShard = IndexShardTestCase.getDocIdAndSeqNos(indexShard); + logger.info("--> shard {} docs {} seq_no_stats {}", shardRouting, docsOnShard, indexShard.seqNoStats()); + docs.put(shardRouting.shardId().id(), docsOnShard.stream() // normalize primary term as the follower use its own term .map(d -> new DocIdSeqNoAndTerm(d.getId(), d.getSeqNo(), 1L)) .collect(Collectors.toList())); diff --git a/x-pack/plugin/ccr/src/test/java/org/elasticsearch/xpack/ccr/FollowStatsIT.java b/x-pack/plugin/ccr/src/test/java/org/elasticsearch/xpack/ccr/FollowStatsIT.java index 1f1c6cd5c64e3..e6662f3770d24 100644 --- a/x-pack/plugin/ccr/src/test/java/org/elasticsearch/xpack/ccr/FollowStatsIT.java +++ b/x-pack/plugin/ccr/src/test/java/org/elasticsearch/xpack/ccr/FollowStatsIT.java @@ -149,6 +149,7 @@ public void testFollowStatsApiResourceNotFound() throws Exception { assertAcked(client().execute(PauseFollowAction.INSTANCE, new PauseFollowAction.Request("follower1")).actionGet()); } + @AwaitsFix(bugUrl = "https://github.com/elastic/elasticsearch/issues/38779") public void testFollowStatsApiIncludeShardFollowStatsWithRemovedFollowerIndex() throws Exception { final String leaderIndexSettings = getIndexSettings(1, 0, singletonMap(IndexSettings.INDEX_SOFT_DELETES_SETTING.getKey(), "true")); diff --git a/x-pack/plugin/ccr/src/test/java/org/elasticsearch/xpack/ccr/FollowerFailOverIT.java b/x-pack/plugin/ccr/src/test/java/org/elasticsearch/xpack/ccr/FollowerFailOverIT.java index 2adbc36107ac4..d2df76e047c21 100644 --- a/x-pack/plugin/ccr/src/test/java/org/elasticsearch/xpack/ccr/FollowerFailOverIT.java +++ b/x-pack/plugin/ccr/src/test/java/org/elasticsearch/xpack/ccr/FollowerFailOverIT.java @@ -45,7 +45,8 @@ import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcked; import static org.hamcrest.Matchers.equalTo; -@TestLogging("org.elasticsearch.xpack.ccr:TRACE,org.elasticsearch.index.shard:DEBUG") +@TestLogging("org.elasticsearch.xpack.ccr:TRACE,org.elasticsearch.xpack.ccr.action.ShardChangesAction:DEBUG," + + "org.elasticsearch.index.shard:TRACE") public class FollowerFailOverIT extends CcrIntegTestCase { @Override @@ -53,14 +54,15 @@ protected boolean reuseClusters() { return false; } - @AwaitsFix(bugUrl="https://github.com/elastic/elasticsearch/issues/38633") public void testFailOverOnFollower() throws Exception { + final String leaderIndex = "leader_test_failover"; + final String followerIndex = "follower_test_failover"; int numberOfReplicas = between(1, 2); getFollowerCluster().startMasterOnlyNode(); getFollowerCluster().ensureAtLeastNumDataNodes(numberOfReplicas + between(1, 2)); String leaderIndexSettings = getIndexSettings(1, numberOfReplicas, singletonMap(IndexSettings.INDEX_SOFT_DELETES_SETTING.getKey(), "true")); - assertAcked(leaderClient().admin().indices().prepareCreate("leader-index").setSource(leaderIndexSettings, XContentType.JSON)); + assertAcked(leaderClient().admin().indices().prepareCreate(leaderIndex).setSource(leaderIndexSettings, XContentType.JSON)); AtomicBoolean stopped = new AtomicBoolean(); Thread[] threads = new Thread[between(1, 8)]; AtomicInteger docID = new AtomicInteger(); @@ -77,20 +79,20 @@ public void testFailOverOnFollower() throws Exception { } if (frequently()) { String id = Integer.toString(frequently() ? docID.incrementAndGet() : between(0, 10)); // sometimes update - IndexResponse indexResponse = leaderClient().prepareIndex("leader-index", "doc", id) + IndexResponse indexResponse = leaderClient().prepareIndex(leaderIndex, "doc", id) .setSource("{\"f\":" + id + "}", XContentType.JSON).get(); - logger.info("--> index id={} seq_no={}", indexResponse.getId(), indexResponse.getSeqNo()); + logger.info("--> index {} id={} seq_no={}", leaderIndex, indexResponse.getId(), indexResponse.getSeqNo()); } else { String id = Integer.toString(between(0, docID.get())); - DeleteResponse deleteResponse = leaderClient().prepareDelete("leader-index", "doc", id).get(); - logger.info("--> delete id={} seq_no={}", deleteResponse.getId(), deleteResponse.getSeqNo()); + DeleteResponse deleteResponse = leaderClient().prepareDelete(leaderIndex, "doc", id).get(); + logger.info("--> delete {} id={} seq_no={}", leaderIndex, deleteResponse.getId(), deleteResponse.getSeqNo()); } } }); threads[i].start(); } availableDocs.release(between(100, 200)); - PutFollowAction.Request follow = putFollow("leader-index", "follower-index"); + PutFollowAction.Request follow = putFollow(leaderIndex, followerIndex); follow.getParameters().setMaxReadRequestOperationCount(randomIntBetween(32, 2048)); follow.getParameters().setMaxReadRequestSize(new ByteSizeValue(randomIntBetween(1, 4096), ByteSizeUnit.KB)); follow.getParameters().setMaxOutstandingReadRequests(randomIntBetween(1, 10)); @@ -99,11 +101,11 @@ public void testFailOverOnFollower() throws Exception { follow.getParameters().setMaxOutstandingWriteRequests(randomIntBetween(1, 10)); logger.info("--> follow request {}", Strings.toString(follow)); followerClient().execute(PutFollowAction.INSTANCE, follow).get(); - disableDelayedAllocation("follower-index"); - ensureFollowerGreen("follower-index"); - awaitGlobalCheckpointAtLeast(followerClient(), new ShardId(resolveFollowerIndex("follower-index"), 0), between(30, 80)); + disableDelayedAllocation(followerIndex); + ensureFollowerGreen(followerIndex); + awaitGlobalCheckpointAtLeast(followerClient(), new ShardId(resolveFollowerIndex(followerIndex), 0), between(30, 80)); final ClusterState clusterState = getFollowerCluster().clusterService().state(); - for (ShardRouting shardRouting : clusterState.routingTable().allShards("follower-index")) { + for (ShardRouting shardRouting : clusterState.routingTable().allShards(followerIndex)) { if (shardRouting.primary()) { DiscoveryNode assignedNode = clusterState.nodes().get(shardRouting.currentNodeId()); getFollowerCluster().restartNode(assignedNode.getName(), new InternalTestCluster.RestartCallback()); @@ -111,15 +113,15 @@ public void testFailOverOnFollower() throws Exception { } } availableDocs.release(between(50, 200)); - ensureFollowerGreen("follower-index"); + ensureFollowerGreen(followerIndex); availableDocs.release(between(50, 200)); - awaitGlobalCheckpointAtLeast(followerClient(), new ShardId(resolveFollowerIndex("follower-index"), 0), between(100, 150)); + awaitGlobalCheckpointAtLeast(followerClient(), new ShardId(resolveFollowerIndex(followerIndex), 0), between(100, 150)); stopped.set(true); for (Thread thread : threads) { thread.join(); } - assertIndexFullyReplicatedToFollower("leader-index", "follower-index"); - pauseFollow("follower-index"); + assertIndexFullyReplicatedToFollower(leaderIndex, followerIndex); + pauseFollow(followerIndex); } @AwaitsFix(bugUrl = "https://github.com/elastic/elasticsearch/issues/33337") diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/watcher/watch/WatchStatus.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/watcher/watch/WatchStatus.java index 0da93fe9ab2d7..df63022aa5734 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/watcher/watch/WatchStatus.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/watcher/watch/WatchStatus.java @@ -80,6 +80,10 @@ public ZonedDateTime lastChecked() { return lastChecked; } + public ZonedDateTime lastMetCondition() { + return lastMetCondition; + } + public ActionStatus actionStatus(String actionId) { return actions.get(actionId); } @@ -252,10 +256,10 @@ public XContentBuilder toXContent(XContentBuilder builder, Params params) throws builder.field(Field.STATE.getPreferredName(), state, params); } if (lastChecked != null) { - builder.timeField(Field.LAST_CHECKED.getPreferredName(), lastChecked); + writeDate(Field.LAST_CHECKED.getPreferredName(), builder, lastChecked); } if (lastMetCondition != null) { - builder.timeField(Field.LAST_MET_CONDITION.getPreferredName(), lastMetCondition); + writeDate(Field.LAST_MET_CONDITION.getPreferredName(), builder, lastMetCondition); } if (actions != null) { builder.startObject(Field.ACTIONS.getPreferredName()); diff --git a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ssl/SSLConfigurationReloaderTests.java b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ssl/SSLConfigurationReloaderTests.java index 674e14ca0e196..f8adc85cdf8d4 100644 --- a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ssl/SSLConfigurationReloaderTests.java +++ b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ssl/SSLConfigurationReloaderTests.java @@ -5,9 +5,24 @@ */ package org.elasticsearch.xpack.core.ssl; +import org.apache.http.HttpConnectionMetrics; +import org.apache.http.HttpEntityEnclosingRequest; +import org.apache.http.HttpException; +import org.apache.http.HttpRequest; +import org.apache.http.HttpResponse; import org.apache.http.client.methods.HttpGet; +import org.apache.http.config.RegistryBuilder; +import org.apache.http.conn.HttpConnectionFactory; +import org.apache.http.conn.ManagedHttpClientConnection; +import org.apache.http.conn.routing.HttpRoute; +import org.apache.http.conn.socket.ConnectionSocketFactory; +import org.apache.http.conn.socket.PlainConnectionSocketFactory; +import org.apache.http.conn.ssl.DefaultHostnameVerifier; +import org.apache.http.conn.ssl.SSLConnectionSocketFactory; import org.apache.http.impl.client.CloseableHttpClient; import org.apache.http.impl.client.HttpClients; +import org.apache.http.impl.conn.ManagedHttpClientConnectionFactory; +import org.apache.http.impl.conn.PoolingHttpClientConnectionManager; import org.apache.http.ssl.SSLContextBuilder; import org.elasticsearch.common.CheckedRunnable; import org.elasticsearch.common.settings.MockSecureSettings; @@ -26,9 +41,13 @@ import javax.net.ssl.SSLContext; import javax.net.ssl.SSLHandshakeException; +import javax.net.ssl.SSLSession; +import javax.net.ssl.SSLSocket; import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; +import java.net.InetAddress; +import java.net.Socket; import java.nio.file.AtomicMoveNotSupportedException; import java.nio.file.Files; import java.nio.file.Path; @@ -47,6 +66,7 @@ import java.util.Collections; import java.util.List; import java.util.concurrent.CountDownLatch; +import java.util.concurrent.TimeUnit; import java.util.function.Consumer; import static org.hamcrest.Matchers.containsString; @@ -91,7 +111,6 @@ public void testReloadingKeyStore() throws Exception { final Settings settings = Settings.builder() .put("path.home", createTempDir()) .put("xpack.security.transport.ssl.keystore.path", keystorePath) - .put("xpack.security.transport.ssl.supported_protocols", "TLSv1.2") .setSecureSettings(secureSettings) .build(); final Environment env = randomBoolean() ? null : TestEnvironment.newEnvironment(settings); @@ -150,7 +169,6 @@ public void testPEMKeyConfigReloading() throws Exception { .put("xpack.security.transport.ssl.key", keyPath) .put("xpack.security.transport.ssl.certificate", certPath) .putList("xpack.security.transport.ssl.certificate_authorities", certPath.toString()) - .put("xpack.security.transport.ssl.supported_protocols", "TLSv1.2") .setSecureSettings(secureSettings) .build(); final Environment env = randomBoolean() ? null : @@ -207,7 +225,6 @@ public void testReloadingTrustStore() throws Exception { secureSettings.setString("xpack.security.transport.ssl.truststore.secure_password", "testnode"); Settings settings = Settings.builder() .put("xpack.security.transport.ssl.truststore.path", trustStorePath) - .put("xpack.security.transport.ssl.supported_protocols", "TLSv1.2") .put("path.home", createTempDir()) .setSecureSettings(secureSettings) .build(); @@ -215,7 +232,7 @@ public void testReloadingTrustStore() throws Exception { // Create the MockWebServer once for both pre and post checks try (MockWebServer server = getSslServer(trustStorePath, "testnode")) { final Consumer trustMaterialPreChecks = (context) -> { - try (CloseableHttpClient client = HttpClients.custom().setSSLContext(context).build()) { + try (CloseableHttpClient client = createHttpClient(context)) { privilegedConnect(() -> client.execute(new HttpGet("https://localhost:" + server.getPort())).close()); } catch (Exception e) { throw new RuntimeException("Error connecting to the mock server", e); @@ -232,7 +249,7 @@ public void testReloadingTrustStore() throws Exception { // Client's truststore doesn't contain the server's certificate anymore so SSLHandshake should fail final Consumer trustMaterialPostChecks = (updatedContext) -> { - try (CloseableHttpClient client = HttpClients.custom().setSSLContext(updatedContext).build()) { + try (CloseableHttpClient client = createHttpClient(updatedContext)) { SSLHandshakeException sslException = expectThrows(SSLHandshakeException.class, () -> privilegedConnect(() -> client.execute(new HttpGet("https://localhost:" + server.getPort())).close())); assertThat(sslException.getCause().getMessage(), containsString("PKIX path building failed")); @@ -259,14 +276,13 @@ public void testReloadingPEMTrustConfig() throws Exception { Files.copy(getDataPath("/org/elasticsearch/xpack/security/transport/ssl/certs/simple/testnode_updated.crt"), updatedCert); Settings settings = Settings.builder() .putList("xpack.security.transport.ssl.certificate_authorities", serverCertPath.toString()) - .put("xpack.security.transport.ssl.supported_protocols", "TLSv1.2") .put("path.home", createTempDir()) .build(); Environment env = randomBoolean() ? null : TestEnvironment.newEnvironment(settings); // Create the MockWebServer once for both pre and post checks try (MockWebServer server = getSslServer(serverKeyPath, serverCertPath, "testnode")) { final Consumer trustMaterialPreChecks = (context) -> { - try (CloseableHttpClient client = HttpClients.custom().setSSLContext(context).build()) { + try (CloseableHttpClient client = createHttpClient(context)) { privilegedConnect(() -> client.execute(new HttpGet("https://localhost:" + server.getPort())));//.close()); } catch (Exception e) { throw new RuntimeException("Exception connecting to the mock server", e); @@ -283,7 +299,7 @@ public void testReloadingPEMTrustConfig() throws Exception { // Client doesn't trust the Server certificate anymore so SSLHandshake should fail final Consumer trustMaterialPostChecks = (updatedContext) -> { - try (CloseableHttpClient client = HttpClients.custom().setSSLContext(updatedContext).build()) { + try (CloseableHttpClient client = createHttpClient(updatedContext)) { SSLHandshakeException sslException = expectThrows(SSLHandshakeException.class, () -> privilegedConnect(() -> client.execute(new HttpGet("https://localhost:" + server.getPort())).close())); assertThat(sslException.getCause().getMessage(), containsString("PKIX path validation failed")); @@ -308,7 +324,6 @@ public void testReloadingKeyStoreException() throws Exception { secureSettings.setString("xpack.security.transport.ssl.keystore.secure_password", "testnode"); Settings settings = Settings.builder() .put("xpack.security.transport.ssl.keystore.path", keystorePath) - .put("xpack.security.transport.ssl.supported_protocols", "TLSv1.2") .setSecureSettings(secureSettings) .put("path.home", createTempDir()) .build(); @@ -350,7 +365,6 @@ public void testReloadingPEMKeyConfigException() throws Exception { .put("xpack.security.transport.ssl.key", keyPath) .put("xpack.security.transport.ssl.certificate", certPath) .putList("xpack.security.transport.ssl.certificate_authorities", certPath.toString(), clientCertPath.toString()) - .put("xpack.security.transport.ssl.supported_protocols", "TLSv1.2") .put("path.home", createTempDir()) .setSecureSettings(secureSettings) .build(); @@ -386,7 +400,6 @@ public void testTrustStoreReloadException() throws Exception { secureSettings.setString("xpack.security.transport.ssl.truststore.secure_password", "testnode"); Settings settings = Settings.builder() .put("xpack.security.transport.ssl.truststore.path", trustStorePath) - .put("xpack.security.transport.ssl.supported_protocols", "TLSv1.2") .put("path.home", createTempDir()) .setSecureSettings(secureSettings) .build(); @@ -420,7 +433,6 @@ public void testPEMTrustReloadException() throws Exception { Files.copy(getDataPath("/org/elasticsearch/xpack/security/transport/ssl/certs/simple/testclient.crt"), clientCertPath); Settings settings = Settings.builder() .putList("xpack.security.transport.ssl.certificate_authorities", clientCertPath.toString()) - .put("xpack.security.transport.ssl.supported_protocols", "TLSv1.2") .put("path.home", createTempDir()) .build(); Environment env = randomBoolean() ? null : TestEnvironment.newEnvironment(settings); @@ -490,7 +502,6 @@ private static MockWebServer getSslServer(Path keyStorePath, String keyStorePass } final SSLContext sslContext = new SSLContextBuilder() .loadKeyMaterial(keyStore, keyStorePass.toCharArray()) - .setProtocol("TLSv1.2") .build(); MockWebServer server = new MockWebServer(sslContext, false); server.enqueue(new MockResponse().setResponseCode(200).setBody("body")); @@ -506,7 +517,6 @@ private static MockWebServer getSslServer(Path keyPath, Path certPath, String pa CertParsingUtils.readCertificates(Collections.singletonList(certPath))); final SSLContext sslContext = new SSLContextBuilder() .loadKeyMaterial(keyStore, password.toCharArray()) - .setProtocol("TLSv1.2") .build(); MockWebServer server = new MockWebServer(sslContext, false); server.enqueue(new MockResponse().setResponseCode(200).setBody("body")); @@ -523,9 +533,8 @@ private static CloseableHttpClient getSSLClient(Path trustStorePath, String trus } final SSLContext sslContext = new SSLContextBuilder() .loadTrustMaterial(trustStore, null) - .setProtocol("TLSv1.2") .build(); - return HttpClients.custom().setSSLContext(sslContext).build(); + return createHttpClient(sslContext); } /** @@ -543,9 +552,138 @@ private static CloseableHttpClient getSSLClient(List trustedCertificatePat } final SSLContext sslContext = new SSLContextBuilder() .loadTrustMaterial(trustStore, null) - .setProtocol("TLSv1.2") .build(); - return HttpClients.custom().setSSLContext(sslContext).build(); + return createHttpClient(sslContext); + } + + private static CloseableHttpClient createHttpClient(SSLContext sslContext) { + return HttpClients.custom() + .setConnectionManager(new PoolingHttpClientConnectionManager( + RegistryBuilder.create() + .register("http", PlainConnectionSocketFactory.getSocketFactory()) + .register("https", new SSLConnectionSocketFactory(sslContext, null, null, new DefaultHostnameVerifier())) + .build(), getHttpClientConnectionFactory(), null, null, -1, TimeUnit.MILLISECONDS)) + .build(); + } + + /** + * Creates our own HttpConnectionFactory that changes how the connection is closed to prevent issues with + * the MockWebServer going into an endless loop based on the way that HttpClient closes its connection. + */ + private static HttpConnectionFactory getHttpClientConnectionFactory() { + return (route, config) -> { + ManagedHttpClientConnection delegate = ManagedHttpClientConnectionFactory.INSTANCE.create(route, config); + return new ManagedHttpClientConnection() { + @Override + public String getId() { + return delegate.getId(); + } + + @Override + public void bind(Socket socket) throws IOException { + delegate.bind(socket); + } + + @Override + public Socket getSocket() { + return delegate.getSocket(); + } + + @Override + public SSLSession getSSLSession() { + return delegate.getSSLSession(); + } + + @Override + public boolean isResponseAvailable(int timeout) throws IOException { + return delegate.isResponseAvailable(timeout); + } + + @Override + public void sendRequestHeader(HttpRequest request) throws HttpException, IOException { + delegate.sendRequestHeader(request); + } + + @Override + public void sendRequestEntity(HttpEntityEnclosingRequest request) throws HttpException, IOException { + delegate.sendRequestEntity(request); + } + + @Override + public HttpResponse receiveResponseHeader() throws HttpException, IOException { + return delegate.receiveResponseHeader(); + } + + @Override + public void receiveResponseEntity(HttpResponse response) throws HttpException, IOException { + delegate.receiveResponseEntity(response); + } + + @Override + public void flush() throws IOException { + delegate.flush(); + } + + @Override + public InetAddress getLocalAddress() { + return delegate.getLocalAddress(); + } + + @Override + public int getLocalPort() { + return delegate.getLocalPort(); + } + + @Override + public InetAddress getRemoteAddress() { + return delegate.getRemoteAddress(); + } + + @Override + public int getRemotePort() { + return delegate.getRemotePort(); + } + + @Override + public void close() throws IOException { + if (delegate.getSocket() instanceof SSLSocket) { + try (SSLSocket socket = (SSLSocket) delegate.getSocket()) { + } + } + delegate.close(); + } + + @Override + public boolean isOpen() { + return delegate.isOpen(); + } + + @Override + public boolean isStale() { + return delegate.isStale(); + } + + @Override + public void setSocketTimeout(int timeout) { + delegate.setSocketTimeout(timeout); + } + + @Override + public int getSocketTimeout() { + return delegate.getSocketTimeout(); + } + + @Override + public void shutdown() throws IOException { + delegate.shutdown(); + } + + @Override + public HttpConnectionMetrics getMetrics() { + return delegate.getMetrics(); + } + }; + }; } private static void privilegedConnect(CheckedRunnable runnable) throws Exception { diff --git a/x-pack/plugin/monitoring/src/main/resources/monitoring/watches/elasticsearch_cluster_status.json b/x-pack/plugin/monitoring/src/main/resources/monitoring/watches/elasticsearch_cluster_status.json index fca6171b62329..5d6111ab8c766 100644 --- a/x-pack/plugin/monitoring/src/main/resources/monitoring/watches/elasticsearch_cluster_status.json +++ b/x-pack/plugin/monitoring/src/main/resources/monitoring/watches/elasticsearch_cluster_status.json @@ -47,19 +47,8 @@ } }, { - "bool": { - "should": [ - { - "term": { - "_type": "cluster_state" - } - }, - { - "term": { - "type": "cluster_stats" - } - } - ] + "term": { + "type": "cluster_stats" } }, { diff --git a/x-pack/plugin/monitoring/src/main/resources/monitoring/watches/elasticsearch_version_mismatch.json b/x-pack/plugin/monitoring/src/main/resources/monitoring/watches/elasticsearch_version_mismatch.json index 61d77d2b602fb..45ae5277bcd53 100644 --- a/x-pack/plugin/monitoring/src/main/resources/monitoring/watches/elasticsearch_version_mismatch.json +++ b/x-pack/plugin/monitoring/src/main/resources/monitoring/watches/elasticsearch_version_mismatch.json @@ -40,19 +40,8 @@ } }, { - "bool": { - "should": [ - { - "term": { - "_type": "cluster_stats" - } - }, - { - "term": { - "type": "cluster_stats" - } - } - ] + "term": { + "type": "cluster_stats" } }, { diff --git a/x-pack/plugin/monitoring/src/main/resources/monitoring/watches/kibana_version_mismatch.json b/x-pack/plugin/monitoring/src/main/resources/monitoring/watches/kibana_version_mismatch.json index 95de1a1a6383e..c03363854a3ef 100644 --- a/x-pack/plugin/monitoring/src/main/resources/monitoring/watches/kibana_version_mismatch.json +++ b/x-pack/plugin/monitoring/src/main/resources/monitoring/watches/kibana_version_mismatch.json @@ -44,19 +44,8 @@ } }, { - "bool": { - "should": [ - { - "term": { - "_type": "kibana_stats" - } - }, - { - "term": { - "type": "kibana_stats" - } - } - ] + "term": { + "type": "kibana_stats" } } ] diff --git a/x-pack/plugin/monitoring/src/main/resources/monitoring/watches/logstash_version_mismatch.json b/x-pack/plugin/monitoring/src/main/resources/monitoring/watches/logstash_version_mismatch.json index 7448000fa8516..0afce0bf74e2f 100644 --- a/x-pack/plugin/monitoring/src/main/resources/monitoring/watches/logstash_version_mismatch.json +++ b/x-pack/plugin/monitoring/src/main/resources/monitoring/watches/logstash_version_mismatch.json @@ -44,19 +44,8 @@ } }, { - "bool": { - "should": [ - { - "term": { - "_type": "logstash_stats" - } - }, - { - "term": { - "type": "logstash_stats" - } - } - ] + "term": { + "type": "logstash_stats" } } ] diff --git a/x-pack/plugin/sql/qa/src/main/resources/docs.csv-spec b/x-pack/plugin/sql/qa/src/main/resources/docs.csv-spec index bb572ecca9d1a..b0b43e3f09aeb 100644 --- a/x-pack/plugin/sql/qa/src/main/resources/docs.csv-spec +++ b/x-pack/plugin/sql/qa/src/main/resources/docs.csv-spec @@ -1541,6 +1541,16 @@ SELECT CONVERT('123', SQL_INTEGER) AS int; // end::conversionStringToIntConvertODBCDataType ; +conversionStringToLongCastOperator +// tag::conversionStringToLongCastOperator +SELECT '123'::long AS long; + + long +--------------- +123 +// end::conversionStringToLongCastOperator +; + /////////////////////////////// // diff --git a/x-pack/plugin/sql/src/main/antlr/SqlBase.g4 b/x-pack/plugin/sql/src/main/antlr/SqlBase.g4 index a11121feaa2bc..eca6f27087189 100644 --- a/x-pack/plugin/sql/src/main/antlr/SqlBase.g4 +++ b/x-pack/plugin/sql/src/main/antlr/SqlBase.g4 @@ -210,6 +210,7 @@ valueExpression | left=valueExpression operator=(ASTERISK | SLASH | PERCENT) right=valueExpression #arithmeticBinary | left=valueExpression operator=(PLUS | MINUS) right=valueExpression #arithmeticBinary | left=valueExpression comparisonOperator right=valueExpression #comparison + | valueExpression CAST_OP dataType #castOperatorExpression ; primaryExpression @@ -224,22 +225,22 @@ primaryExpression | '(' expression ')' #parenthesizedExpression ; +builtinDateTimeFunction + : name=CURRENT_DATE ('(' ')')? + | name=CURRENT_TIMESTAMP ('(' precision=INTEGER_VALUE? ')')? + ; + castExpression - : castTemplate - | FUNCTION_ESC castTemplate ESC_END + : castTemplate + | FUNCTION_ESC castTemplate ESC_END | convertTemplate | FUNCTION_ESC convertTemplate ESC_END ; - + castTemplate : CAST '(' expression AS dataType ')' ; -builtinDateTimeFunction - : name=CURRENT_DATE ('(' ')')? - | name=CURRENT_TIMESTAMP ('(' precision=INTEGER_VALUE? ')')? - ; - convertTemplate : CONVERT '(' expression ',' dataType ')' ; @@ -457,6 +458,7 @@ GUID_ESC: '{GUID'; ESC_END: '}'; +// Operators EQ : '='; NULLEQ: '<=>'; NEQ : '<>' | '!='; @@ -470,6 +472,7 @@ MINUS: '-'; ASTERISK: '*'; SLASH: '/'; PERCENT: '%'; +CAST_OP: '::'; CONCAT: '||'; DOT: '.'; PARAM: '?'; @@ -494,7 +497,7 @@ IDENTIFIER ; DIGIT_IDENTIFIER - : DIGIT (LETTER | DIGIT | '_' | '@' | ':')+ + : DIGIT (LETTER | DIGIT | '_' | '@')+ ; TABLE_IDENTIFIER diff --git a/x-pack/plugin/sql/src/main/antlr/SqlBase.tokens b/x-pack/plugin/sql/src/main/antlr/SqlBase.tokens index 4c3cc5de06421..45d65eff5a223 100644 --- a/x-pack/plugin/sql/src/main/antlr/SqlBase.tokens +++ b/x-pack/plugin/sql/src/main/antlr/SqlBase.tokens @@ -109,22 +109,23 @@ MINUS=108 ASTERISK=109 SLASH=110 PERCENT=111 -CONCAT=112 -DOT=113 -PARAM=114 -STRING=115 -INTEGER_VALUE=116 -DECIMAL_VALUE=117 -IDENTIFIER=118 -DIGIT_IDENTIFIER=119 -TABLE_IDENTIFIER=120 -QUOTED_IDENTIFIER=121 -BACKQUOTED_IDENTIFIER=122 -SIMPLE_COMMENT=123 -BRACKETED_COMMENT=124 -WS=125 -UNRECOGNIZED=126 -DELIMITER=127 +CAST_OP=112 +CONCAT=113 +DOT=114 +PARAM=115 +STRING=116 +INTEGER_VALUE=117 +DECIMAL_VALUE=118 +IDENTIFIER=119 +DIGIT_IDENTIFIER=120 +TABLE_IDENTIFIER=121 +QUOTED_IDENTIFIER=122 +BACKQUOTED_IDENTIFIER=123 +SIMPLE_COMMENT=124 +BRACKETED_COMMENT=125 +WS=126 +UNRECOGNIZED=127 +DELIMITER=128 '('=1 ')'=2 ','=3 @@ -235,6 +236,7 @@ DELIMITER=127 '*'=109 '/'=110 '%'=111 -'||'=112 -'.'=113 -'?'=114 +'::'=112 +'||'=113 +'.'=114 +'?'=115 diff --git a/x-pack/plugin/sql/src/main/antlr/SqlBaseLexer.tokens b/x-pack/plugin/sql/src/main/antlr/SqlBaseLexer.tokens index 6d4252c0e723e..c12442664bd9c 100644 --- a/x-pack/plugin/sql/src/main/antlr/SqlBaseLexer.tokens +++ b/x-pack/plugin/sql/src/main/antlr/SqlBaseLexer.tokens @@ -109,21 +109,22 @@ MINUS=108 ASTERISK=109 SLASH=110 PERCENT=111 -CONCAT=112 -DOT=113 -PARAM=114 -STRING=115 -INTEGER_VALUE=116 -DECIMAL_VALUE=117 -IDENTIFIER=118 -DIGIT_IDENTIFIER=119 -TABLE_IDENTIFIER=120 -QUOTED_IDENTIFIER=121 -BACKQUOTED_IDENTIFIER=122 -SIMPLE_COMMENT=123 -BRACKETED_COMMENT=124 -WS=125 -UNRECOGNIZED=126 +CAST_OP=112 +CONCAT=113 +DOT=114 +PARAM=115 +STRING=116 +INTEGER_VALUE=117 +DECIMAL_VALUE=118 +IDENTIFIER=119 +DIGIT_IDENTIFIER=120 +TABLE_IDENTIFIER=121 +QUOTED_IDENTIFIER=122 +BACKQUOTED_IDENTIFIER=123 +SIMPLE_COMMENT=124 +BRACKETED_COMMENT=125 +WS=126 +UNRECOGNIZED=127 '('=1 ')'=2 ','=3 @@ -234,6 +235,7 @@ UNRECOGNIZED=126 '*'=109 '/'=110 '%'=111 -'||'=112 -'.'=113 -'?'=114 +'::'=112 +'||'=113 +'.'=114 +'?'=115 diff --git a/x-pack/plugin/sql/src/main/java/org/elasticsearch/xpack/sql/parser/ExpressionBuilder.java b/x-pack/plugin/sql/src/main/java/org/elasticsearch/xpack/sql/parser/ExpressionBuilder.java index 05069ef42a14e..e829915c35f1e 100644 --- a/x-pack/plugin/sql/src/main/java/org/elasticsearch/xpack/sql/parser/ExpressionBuilder.java +++ b/x-pack/plugin/sql/src/main/java/org/elasticsearch/xpack/sql/parser/ExpressionBuilder.java @@ -423,7 +423,7 @@ public DataType visitPrimitiveDataType(PrimitiveDataTypeContext ctx) { case "ip": return DataType.IP; default: - throw new ParsingException(source(ctx), "Does not recognize type {}", type); + throw new ParsingException(source(ctx), "Does not recognize type [{}]", ctx.getText()); } } @@ -443,7 +443,7 @@ public Cast visitCastExpression(CastExpressionContext ctx) { dataType = DataType.fromOdbcType(convertDataType); if (dataType == null) { throw new ParsingException(source(convertTc.dataType()), "Invalid data type [{}] provided", convertDataType); - } + } } else { try { dataType = DataType.valueOf(convertDataType); @@ -455,6 +455,11 @@ public Cast visitCastExpression(CastExpressionContext ctx) { } } + @Override + public Object visitCastOperatorExpression(SqlBaseParser.CastOperatorExpressionContext ctx) { + return new Cast(source(ctx), expression(ctx.valueExpression()), typedParsing(ctx.dataType(), DataType.class)); + } + @Override public Function visitExtractExpression(ExtractExpressionContext ctx) { ExtractTemplateContext template = ctx.extractTemplate(); diff --git a/x-pack/plugin/sql/src/main/java/org/elasticsearch/xpack/sql/parser/SqlBaseBaseListener.java b/x-pack/plugin/sql/src/main/java/org/elasticsearch/xpack/sql/parser/SqlBaseBaseListener.java index a62c5b4083fa3..07352baa93e82 100644 --- a/x-pack/plugin/sql/src/main/java/org/elasticsearch/xpack/sql/parser/SqlBaseBaseListener.java +++ b/x-pack/plugin/sql/src/main/java/org/elasticsearch/xpack/sql/parser/SqlBaseBaseListener.java @@ -599,6 +599,18 @@ class SqlBaseBaseListener implements SqlBaseListener { *

The default implementation does nothing.

*/ @Override public void exitComparison(SqlBaseParser.ComparisonContext ctx) { } + /** + * {@inheritDoc} + * + *

The default implementation does nothing.

+ */ + @Override public void enterCastOperatorExpression(SqlBaseParser.CastOperatorExpressionContext ctx) { } + /** + * {@inheritDoc} + * + *

The default implementation does nothing.

+ */ + @Override public void exitCastOperatorExpression(SqlBaseParser.CastOperatorExpressionContext ctx) { } /** * {@inheritDoc} * @@ -736,37 +748,37 @@ class SqlBaseBaseListener implements SqlBaseListener { * *

The default implementation does nothing.

*/ - @Override public void enterCastExpression(SqlBaseParser.CastExpressionContext ctx) { } + @Override public void enterBuiltinDateTimeFunction(SqlBaseParser.BuiltinDateTimeFunctionContext ctx) { } /** * {@inheritDoc} * *

The default implementation does nothing.

*/ - @Override public void exitCastExpression(SqlBaseParser.CastExpressionContext ctx) { } + @Override public void exitBuiltinDateTimeFunction(SqlBaseParser.BuiltinDateTimeFunctionContext ctx) { } /** * {@inheritDoc} * *

The default implementation does nothing.

*/ - @Override public void enterCastTemplate(SqlBaseParser.CastTemplateContext ctx) { } + @Override public void enterCastExpression(SqlBaseParser.CastExpressionContext ctx) { } /** * {@inheritDoc} * *

The default implementation does nothing.

*/ - @Override public void exitCastTemplate(SqlBaseParser.CastTemplateContext ctx) { } + @Override public void exitCastExpression(SqlBaseParser.CastExpressionContext ctx) { } /** * {@inheritDoc} * *

The default implementation does nothing.

*/ - @Override public void enterBuiltinDateTimeFunction(SqlBaseParser.BuiltinDateTimeFunctionContext ctx) { } + @Override public void enterCastTemplate(SqlBaseParser.CastTemplateContext ctx) { } /** * {@inheritDoc} * *

The default implementation does nothing.

*/ - @Override public void exitBuiltinDateTimeFunction(SqlBaseParser.BuiltinDateTimeFunctionContext ctx) { } + @Override public void exitCastTemplate(SqlBaseParser.CastTemplateContext ctx) { } /** * {@inheritDoc} * diff --git a/x-pack/plugin/sql/src/main/java/org/elasticsearch/xpack/sql/parser/SqlBaseBaseVisitor.java b/x-pack/plugin/sql/src/main/java/org/elasticsearch/xpack/sql/parser/SqlBaseBaseVisitor.java index 13722407570a7..dbede024d7321 100644 --- a/x-pack/plugin/sql/src/main/java/org/elasticsearch/xpack/sql/parser/SqlBaseBaseVisitor.java +++ b/x-pack/plugin/sql/src/main/java/org/elasticsearch/xpack/sql/parser/SqlBaseBaseVisitor.java @@ -354,6 +354,13 @@ class SqlBaseBaseVisitor extends AbstractParseTreeVisitor implements SqlBa * {@link #visitChildren} on {@code ctx}.

*/ @Override public T visitComparison(SqlBaseParser.ComparisonContext ctx) { return visitChildren(ctx); } + /** + * {@inheritDoc} + * + *

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

+ */ + @Override public T visitCastOperatorExpression(SqlBaseParser.CastOperatorExpressionContext ctx) { return visitChildren(ctx); } /** * {@inheritDoc} * @@ -437,21 +444,21 @@ class SqlBaseBaseVisitor extends AbstractParseTreeVisitor implements SqlBa *

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

*/ - @Override public T visitCastExpression(SqlBaseParser.CastExpressionContext ctx) { return visitChildren(ctx); } + @Override public T visitBuiltinDateTimeFunction(SqlBaseParser.BuiltinDateTimeFunctionContext ctx) { return visitChildren(ctx); } /** * {@inheritDoc} * *

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

*/ - @Override public T visitCastTemplate(SqlBaseParser.CastTemplateContext ctx) { return visitChildren(ctx); } + @Override public T visitCastExpression(SqlBaseParser.CastExpressionContext ctx) { return visitChildren(ctx); } /** * {@inheritDoc} * *

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

*/ - @Override public T visitBuiltinDateTimeFunction(SqlBaseParser.BuiltinDateTimeFunctionContext ctx) { return visitChildren(ctx); } + @Override public T visitCastTemplate(SqlBaseParser.CastTemplateContext ctx) { return visitChildren(ctx); } /** * {@inheritDoc} * diff --git a/x-pack/plugin/sql/src/main/java/org/elasticsearch/xpack/sql/parser/SqlBaseLexer.java b/x-pack/plugin/sql/src/main/java/org/elasticsearch/xpack/sql/parser/SqlBaseLexer.java index f62130b14fb07..0d18c606147b0 100644 --- a/x-pack/plugin/sql/src/main/java/org/elasticsearch/xpack/sql/parser/SqlBaseLexer.java +++ b/x-pack/plugin/sql/src/main/java/org/elasticsearch/xpack/sql/parser/SqlBaseLexer.java @@ -32,10 +32,10 @@ class SqlBaseLexer extends Lexer { WITH=89, YEAR=90, YEARS=91, ESCAPE_ESC=92, FUNCTION_ESC=93, LIMIT_ESC=94, DATE_ESC=95, TIME_ESC=96, TIMESTAMP_ESC=97, GUID_ESC=98, ESC_END=99, EQ=100, NULLEQ=101, NEQ=102, LT=103, LTE=104, GT=105, GTE=106, PLUS=107, MINUS=108, - ASTERISK=109, SLASH=110, PERCENT=111, CONCAT=112, DOT=113, PARAM=114, - STRING=115, INTEGER_VALUE=116, DECIMAL_VALUE=117, IDENTIFIER=118, DIGIT_IDENTIFIER=119, - TABLE_IDENTIFIER=120, QUOTED_IDENTIFIER=121, BACKQUOTED_IDENTIFIER=122, - SIMPLE_COMMENT=123, BRACKETED_COMMENT=124, WS=125, UNRECOGNIZED=126; + ASTERISK=109, SLASH=110, PERCENT=111, CAST_OP=112, CONCAT=113, DOT=114, + PARAM=115, STRING=116, INTEGER_VALUE=117, DECIMAL_VALUE=118, IDENTIFIER=119, + DIGIT_IDENTIFIER=120, TABLE_IDENTIFIER=121, QUOTED_IDENTIFIER=122, BACKQUOTED_IDENTIFIER=123, + SIMPLE_COMMENT=124, BRACKETED_COMMENT=125, WS=126, UNRECOGNIZED=127; public static String[] modeNames = { "DEFAULT_MODE" }; @@ -55,7 +55,7 @@ class SqlBaseLexer extends Lexer { "WITH", "YEAR", "YEARS", "ESCAPE_ESC", "FUNCTION_ESC", "LIMIT_ESC", "DATE_ESC", "TIME_ESC", "TIMESTAMP_ESC", "GUID_ESC", "ESC_END", "EQ", "NULLEQ", "NEQ", "LT", "LTE", "GT", "GTE", "PLUS", "MINUS", "ASTERISK", "SLASH", "PERCENT", - "CONCAT", "DOT", "PARAM", "STRING", "INTEGER_VALUE", "DECIMAL_VALUE", + "CAST_OP", "CONCAT", "DOT", "PARAM", "STRING", "INTEGER_VALUE", "DECIMAL_VALUE", "IDENTIFIER", "DIGIT_IDENTIFIER", "TABLE_IDENTIFIER", "QUOTED_IDENTIFIER", "BACKQUOTED_IDENTIFIER", "EXPONENT", "DIGIT", "LETTER", "SIMPLE_COMMENT", "BRACKETED_COMMENT", "WS", "UNRECOGNIZED" @@ -77,8 +77,8 @@ class SqlBaseLexer extends Lexer { "'TEXT'", "'TRUE'", "'TO'", "'TYPE'", "'TYPES'", "'USING'", "'VERIFY'", "'WHERE'", "'WITH'", "'YEAR'", "'YEARS'", "'{ESCAPE'", "'{FN'", "'{LIMIT'", "'{D'", "'{T'", "'{TS'", "'{GUID'", "'}'", "'='", "'<=>'", null, "'<'", - "'<='", "'>'", "'>='", "'+'", "'-'", "'*'", "'/'", "'%'", "'||'", "'.'", - "'?'" + "'<='", "'>'", "'>='", "'+'", "'-'", "'*'", "'/'", "'%'", "'::'", "'||'", + "'.'", "'?'" }; private static final String[] _SYMBOLIC_NAMES = { null, null, null, null, null, "ALL", "ANALYZE", "ANALYZED", "AND", "ANY", @@ -95,7 +95,7 @@ class SqlBaseLexer extends Lexer { "WITH", "YEAR", "YEARS", "ESCAPE_ESC", "FUNCTION_ESC", "LIMIT_ESC", "DATE_ESC", "TIME_ESC", "TIMESTAMP_ESC", "GUID_ESC", "ESC_END", "EQ", "NULLEQ", "NEQ", "LT", "LTE", "GT", "GTE", "PLUS", "MINUS", "ASTERISK", "SLASH", "PERCENT", - "CONCAT", "DOT", "PARAM", "STRING", "INTEGER_VALUE", "DECIMAL_VALUE", + "CAST_OP", "CONCAT", "DOT", "PARAM", "STRING", "INTEGER_VALUE", "DECIMAL_VALUE", "IDENTIFIER", "DIGIT_IDENTIFIER", "TABLE_IDENTIFIER", "QUOTED_IDENTIFIER", "BACKQUOTED_IDENTIFIER", "SIMPLE_COMMENT", "BRACKETED_COMMENT", "WS", "UNRECOGNIZED" @@ -155,7 +155,7 @@ public SqlBaseLexer(CharStream input) { public ATN getATN() { return _ATN; } public static final String _serializedATN = - "\3\u0430\ud6d1\u8206\uad2d\u4417\uaef1\u8d80\uaadd\2\u0080\u0428\b\1\4"+ + "\3\u0430\ud6d1\u8206\uad2d\u4417\uaef1\u8d80\uaadd\2\u0081\u042d\b\1\4"+ "\2\t\2\4\3\t\3\4\4\t\4\4\5\t\5\4\6\t\6\4\7\t\7\4\b\t\b\4\t\t\t\4\n\t\n"+ "\4\13\t\13\4\f\t\f\4\r\t\r\4\16\t\16\4\17\t\17\4\20\t\20\4\21\t\21\4\22"+ "\t\22\4\23\t\23\4\24\t\24\4\25\t\25\4\26\t\26\4\27\t\27\4\30\t\30\4\31"+ @@ -169,66 +169,67 @@ public SqlBaseLexer(CharStream input) { "\4`\t`\4a\ta\4b\tb\4c\tc\4d\td\4e\te\4f\tf\4g\tg\4h\th\4i\ti\4j\tj\4k"+ "\tk\4l\tl\4m\tm\4n\tn\4o\to\4p\tp\4q\tq\4r\tr\4s\ts\4t\tt\4u\tu\4v\tv"+ "\4w\tw\4x\tx\4y\ty\4z\tz\4{\t{\4|\t|\4}\t}\4~\t~\4\177\t\177\4\u0080\t"+ - "\u0080\4\u0081\t\u0081\4\u0082\t\u0082\3\2\3\2\3\3\3\3\3\4\3\4\3\5\3\5"+ - "\3\6\3\6\3\6\3\6\3\7\3\7\3\7\3\7\3\7\3\7\3\7\3\7\3\b\3\b\3\b\3\b\3\b\3"+ - "\b\3\b\3\b\3\b\3\t\3\t\3\t\3\t\3\n\3\n\3\n\3\n\3\13\3\13\3\13\3\f\3\f"+ - "\3\f\3\f\3\r\3\r\3\r\3\r\3\r\3\r\3\r\3\r\3\16\3\16\3\16\3\17\3\17\3\17"+ - "\3\17\3\17\3\20\3\20\3\20\3\20\3\20\3\20\3\20\3\20\3\21\3\21\3\21\3\21"+ - "\3\21\3\21\3\21\3\21\3\21\3\22\3\22\3\22\3\22\3\22\3\22\3\22\3\22\3\23"+ - "\3\23\3\23\3\23\3\23\3\23\3\23\3\23\3\24\3\24\3\24\3\24\3\24\3\24\3\24"+ - "\3\24\3\24\3\24\3\24\3\24\3\24\3\25\3\25\3\25\3\25\3\25\3\25\3\25\3\25"+ - "\3\25\3\25\3\25\3\25\3\25\3\25\3\25\3\25\3\25\3\25\3\26\3\26\3\26\3\26"+ - "\3\27\3\27\3\27\3\27\3\27\3\30\3\30\3\30\3\30\3\30\3\30\3\31\3\31\3\31"+ - "\3\31\3\31\3\32\3\32\3\32\3\32\3\32\3\32\3\32\3\32\3\32\3\33\3\33\3\33"+ - "\3\33\3\33\3\33\3\33\3\33\3\33\3\34\3\34\3\34\3\34\3\34\3\34\3\34\3\35"+ - "\3\35\3\35\3\35\3\35\3\35\3\35\3\35\3\35\3\35\3\35\3\36\3\36\3\36\3\36"+ - "\3\36\3\36\3\36\3\37\3\37\3\37\3\37\3\37\3\37\3\37\3\37\3 \3 \3 \3 \3"+ - " \3 \3 \3 \3!\3!\3!\3!\3!\3!\3\"\3\"\3\"\3\"\3\"\3\"\3#\3#\3#\3#\3#\3"+ - "#\3#\3$\3$\3$\3$\3$\3%\3%\3%\3%\3%\3&\3&\3&\3&\3&\3&\3&\3&\3&\3&\3\'\3"+ - "\'\3\'\3\'\3\'\3\'\3\'\3\'\3\'\3(\3(\3(\3(\3(\3(\3)\3)\3)\3)\3)\3)\3)"+ - "\3*\3*\3*\3*\3*\3+\3+\3+\3+\3+\3+\3,\3,\3,\3-\3-\3-\3-\3-\3-\3.\3.\3."+ - "\3.\3.\3.\3.\3.\3.\3/\3/\3/\3\60\3\60\3\60\3\60\3\60\3\61\3\61\3\61\3"+ - "\61\3\61\3\62\3\62\3\62\3\62\3\62\3\63\3\63\3\63\3\63\3\63\3\64\3\64\3"+ - "\64\3\64\3\64\3\64\3\65\3\65\3\65\3\65\3\65\3\65\3\65\3\66\3\66\3\66\3"+ - "\66\3\66\3\66\3\67\3\67\3\67\3\67\3\67\3\67\3\67\38\38\38\38\38\38\38"+ - "\38\39\39\39\39\39\39\3:\3:\3:\3:\3:\3:\3:\3;\3;\3;\3;\3;\3;\3;\3;\3<"+ - "\3<\3<\3<\3=\3=\3=\3=\3=\3>\3>\3>\3>\3>\3>\3?\3?\3?\3@\3@\3@\3@\3@\3@"+ - "\3@\3@\3@\3@\3A\3A\3A\3B\3B\3B\3B\3B\3B\3C\3C\3C\3C\3C\3C\3D\3D\3D\3D"+ - "\3D\3D\3D\3E\3E\3E\3E\3E\3E\3E\3E\3E\3F\3F\3F\3F\3F\3G\3G\3G\3G\3G\3G"+ - "\3H\3H\3H\3H\3H\3H\3I\3I\3I\3I\3I\3I\3J\3J\3J\3J\3J\3J\3J\3J\3K\3K\3K"+ - "\3K\3K\3K\3K\3L\3L\3L\3L\3L\3L\3L\3L\3M\3M\3M\3M\3M\3M\3M\3N\3N\3N\3N"+ - "\3N\3O\3O\3O\3O\3P\3P\3P\3P\3P\3P\3Q\3Q\3Q\3Q\3Q\3Q\3Q\3R\3R\3R\3R\3R"+ - "\3S\3S\3S\3S\3S\3T\3T\3T\3U\3U\3U\3U\3U\3V\3V\3V\3V\3V\3V\3W\3W\3W\3W"+ - "\3W\3W\3X\3X\3X\3X\3X\3X\3X\3Y\3Y\3Y\3Y\3Y\3Y\3Z\3Z\3Z\3Z\3Z\3[\3[\3["+ - "\3[\3[\3\\\3\\\3\\\3\\\3\\\3\\\3]\3]\3]\3]\3]\3]\3]\3]\3^\3^\3^\3^\3_"+ - "\3_\3_\3_\3_\3_\3_\3`\3`\3`\3a\3a\3a\3b\3b\3b\3b\3c\3c\3c\3c\3c\3c\3d"+ - "\3d\3e\3e\3f\3f\3f\3f\3g\3g\3g\3g\5g\u0369\ng\3h\3h\3i\3i\3i\3j\3j\3k"+ - "\3k\3k\3l\3l\3m\3m\3n\3n\3o\3o\3p\3p\3q\3q\3q\3r\3r\3s\3s\3t\3t\3t\3t"+ - "\7t\u038a\nt\ft\16t\u038d\13t\3t\3t\3u\6u\u0392\nu\ru\16u\u0393\3v\6v"+ - "\u0397\nv\rv\16v\u0398\3v\3v\7v\u039d\nv\fv\16v\u03a0\13v\3v\3v\6v\u03a4"+ - "\nv\rv\16v\u03a5\3v\6v\u03a9\nv\rv\16v\u03aa\3v\3v\7v\u03af\nv\fv\16v"+ - "\u03b2\13v\5v\u03b4\nv\3v\3v\3v\3v\6v\u03ba\nv\rv\16v\u03bb\3v\3v\5v\u03c0"+ - "\nv\3w\3w\5w\u03c4\nw\3w\3w\3w\7w\u03c9\nw\fw\16w\u03cc\13w\3x\3x\3x\3"+ - "x\6x\u03d2\nx\rx\16x\u03d3\3y\3y\3y\6y\u03d9\ny\ry\16y\u03da\3z\3z\3z"+ - "\3z\7z\u03e1\nz\fz\16z\u03e4\13z\3z\3z\3{\3{\3{\3{\7{\u03ec\n{\f{\16{"+ - "\u03ef\13{\3{\3{\3|\3|\5|\u03f5\n|\3|\6|\u03f8\n|\r|\16|\u03f9\3}\3}\3"+ - "~\3~\3\177\3\177\3\177\3\177\7\177\u0404\n\177\f\177\16\177\u0407\13\177"+ - "\3\177\5\177\u040a\n\177\3\177\5\177\u040d\n\177\3\177\3\177\3\u0080\3"+ - "\u0080\3\u0080\3\u0080\3\u0080\7\u0080\u0416\n\u0080\f\u0080\16\u0080"+ - "\u0419\13\u0080\3\u0080\3\u0080\3\u0080\3\u0080\3\u0080\3\u0081\6\u0081"+ - "\u0421\n\u0081\r\u0081\16\u0081\u0422\3\u0081\3\u0081\3\u0082\3\u0082"+ - "\3\u0417\2\u0083\3\3\5\4\7\5\t\6\13\7\r\b\17\t\21\n\23\13\25\f\27\r\31"+ - "\16\33\17\35\20\37\21!\22#\23%\24\'\25)\26+\27-\30/\31\61\32\63\33\65"+ - "\34\67\359\36;\37= ?!A\"C#E$G%I&K\'M(O)Q*S+U,W-Y.[/]\60_\61a\62c\63e\64"+ - "g\65i\66k\67m8o9q:s;u{?}@\177A\u0081B\u0083C\u0085D\u0087E\u0089"+ - "F\u008bG\u008dH\u008fI\u0091J\u0093K\u0095L\u0097M\u0099N\u009bO\u009d"+ - "P\u009fQ\u00a1R\u00a3S\u00a5T\u00a7U\u00a9V\u00abW\u00adX\u00afY\u00b1"+ - "Z\u00b3[\u00b5\\\u00b7]\u00b9^\u00bb_\u00bd`\u00bfa\u00c1b\u00c3c\u00c5"+ - "d\u00c7e\u00c9f\u00cbg\u00cdh\u00cfi\u00d1j\u00d3k\u00d5l\u00d7m\u00d9"+ - "n\u00dbo\u00ddp\u00dfq\u00e1r\u00e3s\u00e5t\u00e7u\u00e9v\u00ebw\u00ed"+ - "x\u00efy\u00f1z\u00f3{\u00f5|\u00f7\2\u00f9\2\u00fb\2\u00fd}\u00ff~\u0101"+ - "\177\u0103\u0080\3\2\f\3\2))\4\2BBaa\5\2<\3>\3>\3>\3>\3>\3?\3?\3?\3@"+ + "\3@\3@\3@\3@\3@\3@\3@\3@\3@\3A\3A\3A\3B\3B\3B\3B\3B\3B\3C\3C\3C\3C\3C"+ + "\3C\3D\3D\3D\3D\3D\3D\3D\3E\3E\3E\3E\3E\3E\3E\3E\3E\3F\3F\3F\3F\3F\3G"+ + "\3G\3G\3G\3G\3G\3H\3H\3H\3H\3H\3H\3I\3I\3I\3I\3I\3I\3J\3J\3J\3J\3J\3J"+ + "\3J\3J\3K\3K\3K\3K\3K\3K\3K\3L\3L\3L\3L\3L\3L\3L\3L\3M\3M\3M\3M\3M\3M"+ + "\3M\3N\3N\3N\3N\3N\3O\3O\3O\3O\3P\3P\3P\3P\3P\3P\3Q\3Q\3Q\3Q\3Q\3Q\3Q"+ + "\3R\3R\3R\3R\3R\3S\3S\3S\3S\3S\3T\3T\3T\3U\3U\3U\3U\3U\3V\3V\3V\3V\3V"+ + "\3V\3W\3W\3W\3W\3W\3W\3X\3X\3X\3X\3X\3X\3X\3Y\3Y\3Y\3Y\3Y\3Y\3Z\3Z\3Z"+ + "\3Z\3Z\3[\3[\3[\3[\3[\3\\\3\\\3\\\3\\\3\\\3\\\3]\3]\3]\3]\3]\3]\3]\3]"+ + "\3^\3^\3^\3^\3_\3_\3_\3_\3_\3_\3_\3`\3`\3`\3a\3a\3a\3b\3b\3b\3b\3c\3c"+ + "\3c\3c\3c\3c\3d\3d\3e\3e\3f\3f\3f\3f\3g\3g\3g\3g\5g\u036b\ng\3h\3h\3i"+ + "\3i\3i\3j\3j\3k\3k\3k\3l\3l\3m\3m\3n\3n\3o\3o\3p\3p\3q\3q\3q\3r\3r\3r"+ + "\3s\3s\3t\3t\3u\3u\3u\3u\7u\u038f\nu\fu\16u\u0392\13u\3u\3u\3v\6v\u0397"+ + "\nv\rv\16v\u0398\3w\6w\u039c\nw\rw\16w\u039d\3w\3w\7w\u03a2\nw\fw\16w"+ + "\u03a5\13w\3w\3w\6w\u03a9\nw\rw\16w\u03aa\3w\6w\u03ae\nw\rw\16w\u03af"+ + "\3w\3w\7w\u03b4\nw\fw\16w\u03b7\13w\5w\u03b9\nw\3w\3w\3w\3w\6w\u03bf\n"+ + "w\rw\16w\u03c0\3w\3w\5w\u03c5\nw\3x\3x\5x\u03c9\nx\3x\3x\3x\7x\u03ce\n"+ + "x\fx\16x\u03d1\13x\3y\3y\3y\3y\6y\u03d7\ny\ry\16y\u03d8\3z\3z\3z\6z\u03de"+ + "\nz\rz\16z\u03df\3{\3{\3{\3{\7{\u03e6\n{\f{\16{\u03e9\13{\3{\3{\3|\3|"+ + "\3|\3|\7|\u03f1\n|\f|\16|\u03f4\13|\3|\3|\3}\3}\5}\u03fa\n}\3}\6}\u03fd"+ + "\n}\r}\16}\u03fe\3~\3~\3\177\3\177\3\u0080\3\u0080\3\u0080\3\u0080\7\u0080"+ + "\u0409\n\u0080\f\u0080\16\u0080\u040c\13\u0080\3\u0080\5\u0080\u040f\n"+ + "\u0080\3\u0080\5\u0080\u0412\n\u0080\3\u0080\3\u0080\3\u0081\3\u0081\3"+ + "\u0081\3\u0081\3\u0081\7\u0081\u041b\n\u0081\f\u0081\16\u0081\u041e\13"+ + "\u0081\3\u0081\3\u0081\3\u0081\3\u0081\3\u0081\3\u0082\6\u0082\u0426\n"+ + "\u0082\r\u0082\16\u0082\u0427\3\u0082\3\u0082\3\u0083\3\u0083\3\u041c"+ + "\2\u0084\3\3\5\4\7\5\t\6\13\7\r\b\17\t\21\n\23\13\25\f\27\r\31\16\33\17"+ + "\35\20\37\21!\22#\23%\24\'\25)\26+\27-\30/\31\61\32\63\33\65\34\67\35"+ + "9\36;\37= ?!A\"C#E$G%I&K\'M(O)Q*S+U,W-Y.[/]\60_\61a\62c\63e\64g\65i\66"+ + "k\67m8o9q:s;u{?}@\177A\u0081B\u0083C\u0085D\u0087E\u0089F\u008bG"+ + "\u008dH\u008fI\u0091J\u0093K\u0095L\u0097M\u0099N\u009bO\u009dP\u009f"+ + "Q\u00a1R\u00a3S\u00a5T\u00a7U\u00a9V\u00abW\u00adX\u00afY\u00b1Z\u00b3"+ + "[\u00b5\\\u00b7]\u00b9^\u00bb_\u00bd`\u00bfa\u00c1b\u00c3c\u00c5d\u00c7"+ + "e\u00c9f\u00cbg\u00cdh\u00cfi\u00d1j\u00d3k\u00d5l\u00d7m\u00d9n\u00db"+ + "o\u00ddp\u00dfq\u00e1r\u00e3s\u00e5t\u00e7u\u00e9v\u00ebw\u00edx\u00ef"+ + "y\u00f1z\u00f3{\u00f5|\u00f7}\u00f9\2\u00fb\2\u00fd\2\u00ff~\u0101\177"+ + "\u0103\u0080\u0105\u0081\3\2\13\3\2))\4\2BBaa\3\2$$\3\2bb\4\2--//\3\2"+ + "\62;\3\2C\\\4\2\f\f\17\17\5\2\13\f\17\17\"\"\u044d\2\3\3\2\2\2\2\5\3\2"+ "\2\2\2\7\3\2\2\2\2\t\3\2\2\2\2\13\3\2\2\2\2\r\3\2\2\2\2\17\3\2\2\2\2\21"+ "\3\2\2\2\2\23\3\2\2\2\2\25\3\2\2\2\2\27\3\2\2\2\2\31\3\2\2\2\2\33\3\2"+ "\2\2\2\35\3\2\2\2\2\37\3\2\2\2\2!\3\2\2\2\2#\3\2\2\2\2%\3\2\2\2\2\'\3"+ @@ -252,270 +253,272 @@ public SqlBaseLexer(CharStream input) { "\2\2\u00d9\3\2\2\2\2\u00db\3\2\2\2\2\u00dd\3\2\2\2\2\u00df\3\2\2\2\2\u00e1"+ "\3\2\2\2\2\u00e3\3\2\2\2\2\u00e5\3\2\2\2\2\u00e7\3\2\2\2\2\u00e9\3\2\2"+ "\2\2\u00eb\3\2\2\2\2\u00ed\3\2\2\2\2\u00ef\3\2\2\2\2\u00f1\3\2\2\2\2\u00f3"+ - "\3\2\2\2\2\u00f5\3\2\2\2\2\u00fd\3\2\2\2\2\u00ff\3\2\2\2\2\u0101\3\2\2"+ - "\2\2\u0103\3\2\2\2\3\u0105\3\2\2\2\5\u0107\3\2\2\2\7\u0109\3\2\2\2\t\u010b"+ - "\3\2\2\2\13\u010d\3\2\2\2\r\u0111\3\2\2\2\17\u0119\3\2\2\2\21\u0122\3"+ - "\2\2\2\23\u0126\3\2\2\2\25\u012a\3\2\2\2\27\u012d\3\2\2\2\31\u0131\3\2"+ - "\2\2\33\u0139\3\2\2\2\35\u013c\3\2\2\2\37\u0141\3\2\2\2!\u0149\3\2\2\2"+ - "#\u0152\3\2\2\2%\u015a\3\2\2\2\'\u0162\3\2\2\2)\u016f\3\2\2\2+\u0181\3"+ - "\2\2\2-\u0185\3\2\2\2/\u018a\3\2\2\2\61\u0190\3\2\2\2\63\u0195\3\2\2\2"+ - "\65\u019e\3\2\2\2\67\u01a7\3\2\2\29\u01ae\3\2\2\2;\u01b9\3\2\2\2=\u01c0"+ - "\3\2\2\2?\u01c8\3\2\2\2A\u01d0\3\2\2\2C\u01d6\3\2\2\2E\u01dc\3\2\2\2G"+ - "\u01e3\3\2\2\2I\u01e8\3\2\2\2K\u01ed\3\2\2\2M\u01f7\3\2\2\2O\u0200\3\2"+ - "\2\2Q\u0206\3\2\2\2S\u020d\3\2\2\2U\u0212\3\2\2\2W\u0218\3\2\2\2Y\u021b"+ - "\3\2\2\2[\u0221\3\2\2\2]\u022a\3\2\2\2_\u022d\3\2\2\2a\u0232\3\2\2\2c"+ - "\u0237\3\2\2\2e\u023c\3\2\2\2g\u0241\3\2\2\2i\u0247\3\2\2\2k\u024e\3\2"+ - "\2\2m\u0254\3\2\2\2o\u025b\3\2\2\2q\u0263\3\2\2\2s\u0269\3\2\2\2u\u0270"+ - "\3\2\2\2w\u0278\3\2\2\2y\u027c\3\2\2\2{\u0281\3\2\2\2}\u0287\3\2\2\2\177"+ - "\u028a\3\2\2\2\u0081\u0294\3\2\2\2\u0083\u0297\3\2\2\2\u0085\u029d\3\2"+ - "\2\2\u0087\u02a3\3\2\2\2\u0089\u02aa\3\2\2\2\u008b\u02b3\3\2\2\2\u008d"+ - "\u02b8\3\2\2\2\u008f\u02be\3\2\2\2\u0091\u02c4\3\2\2\2\u0093\u02ca\3\2"+ - "\2\2\u0095\u02d2\3\2\2\2\u0097\u02d9\3\2\2\2\u0099\u02e1\3\2\2\2\u009b"+ - "\u02e8\3\2\2\2\u009d\u02ed\3\2\2\2\u009f\u02f1\3\2\2\2\u00a1\u02f7\3\2"+ - "\2\2\u00a3\u02fe\3\2\2\2\u00a5\u0303\3\2\2\2\u00a7\u0308\3\2\2\2\u00a9"+ - "\u030b\3\2\2\2\u00ab\u0310\3\2\2\2\u00ad\u0316\3\2\2\2\u00af\u031c\3\2"+ - "\2\2\u00b1\u0323\3\2\2\2\u00b3\u0329\3\2\2\2\u00b5\u032e\3\2\2\2\u00b7"+ - "\u0333\3\2\2\2\u00b9\u0339\3\2\2\2\u00bb\u0341\3\2\2\2\u00bd\u0345\3\2"+ - "\2\2\u00bf\u034c\3\2\2\2\u00c1\u034f\3\2\2\2\u00c3\u0352\3\2\2\2\u00c5"+ - "\u0356\3\2\2\2\u00c7\u035c\3\2\2\2\u00c9\u035e\3\2\2\2\u00cb\u0360\3\2"+ - "\2\2\u00cd\u0368\3\2\2\2\u00cf\u036a\3\2\2\2\u00d1\u036c\3\2\2\2\u00d3"+ - "\u036f\3\2\2\2\u00d5\u0371\3\2\2\2\u00d7\u0374\3\2\2\2\u00d9\u0376\3\2"+ - "\2\2\u00db\u0378\3\2\2\2\u00dd\u037a\3\2\2\2\u00df\u037c\3\2\2\2\u00e1"+ - "\u037e\3\2\2\2\u00e3\u0381\3\2\2\2\u00e5\u0383\3\2\2\2\u00e7\u0385\3\2"+ - "\2\2\u00e9\u0391\3\2\2\2\u00eb\u03bf\3\2\2\2\u00ed\u03c3\3\2\2\2\u00ef"+ - "\u03cd\3\2\2\2\u00f1\u03d8\3\2\2\2\u00f3\u03dc\3\2\2\2\u00f5\u03e7\3\2"+ - "\2\2\u00f7\u03f2\3\2\2\2\u00f9\u03fb\3\2\2\2\u00fb\u03fd\3\2\2\2\u00fd"+ - "\u03ff\3\2\2\2\u00ff\u0410\3\2\2\2\u0101\u0420\3\2\2\2\u0103\u0426\3\2"+ - "\2\2\u0105\u0106\7*\2\2\u0106\4\3\2\2\2\u0107\u0108\7+\2\2\u0108\6\3\2"+ - "\2\2\u0109\u010a\7.\2\2\u010a\b\3\2\2\2\u010b\u010c\7<\2\2\u010c\n\3\2"+ - "\2\2\u010d\u010e\7C\2\2\u010e\u010f\7N\2\2\u010f\u0110\7N\2\2\u0110\f"+ - "\3\2\2\2\u0111\u0112\7C\2\2\u0112\u0113\7P\2\2\u0113\u0114\7C\2\2\u0114"+ - "\u0115\7N\2\2\u0115\u0116\7[\2\2\u0116\u0117\7\\\2\2\u0117\u0118\7G\2"+ - "\2\u0118\16\3\2\2\2\u0119\u011a\7C\2\2\u011a\u011b\7P\2\2\u011b\u011c"+ - "\7C\2\2\u011c\u011d\7N\2\2\u011d\u011e\7[\2\2\u011e\u011f\7\\\2\2\u011f"+ - "\u0120\7G\2\2\u0120\u0121\7F\2\2\u0121\20\3\2\2\2\u0122\u0123\7C\2\2\u0123"+ - "\u0124\7P\2\2\u0124\u0125\7F\2\2\u0125\22\3\2\2\2\u0126\u0127\7C\2\2\u0127"+ - "\u0128\7P\2\2\u0128\u0129\7[\2\2\u0129\24\3\2\2\2\u012a\u012b\7C\2\2\u012b"+ - "\u012c\7U\2\2\u012c\26\3\2\2\2\u012d\u012e\7C\2\2\u012e\u012f\7U\2\2\u012f"+ - "\u0130\7E\2\2\u0130\30\3\2\2\2\u0131\u0132\7D\2\2\u0132\u0133\7G\2\2\u0133"+ - "\u0134\7V\2\2\u0134\u0135\7Y\2\2\u0135\u0136\7G\2\2\u0136\u0137\7G\2\2"+ - "\u0137\u0138\7P\2\2\u0138\32\3\2\2\2\u0139\u013a\7D\2\2\u013a\u013b\7"+ - "[\2\2\u013b\34\3\2\2\2\u013c\u013d\7E\2\2\u013d\u013e\7C\2\2\u013e\u013f"+ - "\7U\2\2\u013f\u0140\7V\2\2\u0140\36\3\2\2\2\u0141\u0142\7E\2\2\u0142\u0143"+ - "\7C\2\2\u0143\u0144\7V\2\2\u0144\u0145\7C\2\2\u0145\u0146\7N\2\2\u0146"+ - "\u0147\7Q\2\2\u0147\u0148\7I\2\2\u0148 \3\2\2\2\u0149\u014a\7E\2\2\u014a"+ - "\u014b\7C\2\2\u014b\u014c\7V\2\2\u014c\u014d\7C\2\2\u014d\u014e\7N\2\2"+ - "\u014e\u014f\7Q\2\2\u014f\u0150\7I\2\2\u0150\u0151\7U\2\2\u0151\"\3\2"+ - "\2\2\u0152\u0153\7E\2\2\u0153\u0154\7Q\2\2\u0154\u0155\7N\2\2\u0155\u0156"+ - "\7W\2\2\u0156\u0157\7O\2\2\u0157\u0158\7P\2\2\u0158\u0159\7U\2\2\u0159"+ - "$\3\2\2\2\u015a\u015b\7E\2\2\u015b\u015c\7Q\2\2\u015c\u015d\7P\2\2\u015d"+ - "\u015e\7X\2\2\u015e\u015f\7G\2\2\u015f\u0160\7T\2\2\u0160\u0161\7V\2\2"+ - "\u0161&\3\2\2\2\u0162\u0163\7E\2\2\u0163\u0164\7W\2\2\u0164\u0165\7T\2"+ - "\2\u0165\u0166\7T\2\2\u0166\u0167\7G\2\2\u0167\u0168\7P\2\2\u0168\u0169"+ - "\7V\2\2\u0169\u016a\7a\2\2\u016a\u016b\7F\2\2\u016b\u016c\7C\2\2\u016c"+ - "\u016d\7V\2\2\u016d\u016e\7G\2\2\u016e(\3\2\2\2\u016f\u0170\7E\2\2\u0170"+ - "\u0171\7W\2\2\u0171\u0172\7T\2\2\u0172\u0173\7T\2\2\u0173\u0174\7G\2\2"+ - "\u0174\u0175\7P\2\2\u0175\u0176\7V\2\2\u0176\u0177\7a\2\2\u0177\u0178"+ - "\7V\2\2\u0178\u0179\7K\2\2\u0179\u017a\7O\2\2\u017a\u017b\7G\2\2\u017b"+ - "\u017c\7U\2\2\u017c\u017d\7V\2\2\u017d\u017e\7C\2\2\u017e\u017f\7O\2\2"+ - "\u017f\u0180\7R\2\2\u0180*\3\2\2\2\u0181\u0182\7F\2\2\u0182\u0183\7C\2"+ - "\2\u0183\u0184\7[\2\2\u0184,\3\2\2\2\u0185\u0186\7F\2\2\u0186\u0187\7"+ - "C\2\2\u0187\u0188\7[\2\2\u0188\u0189\7U\2\2\u0189.\3\2\2\2\u018a\u018b"+ - "\7F\2\2\u018b\u018c\7G\2\2\u018c\u018d\7D\2\2\u018d\u018e\7W\2\2\u018e"+ - "\u018f\7I\2\2\u018f\60\3\2\2\2\u0190\u0191\7F\2\2\u0191\u0192\7G\2\2\u0192"+ - "\u0193\7U\2\2\u0193\u0194\7E\2\2\u0194\62\3\2\2\2\u0195\u0196\7F\2\2\u0196"+ - "\u0197\7G\2\2\u0197\u0198\7U\2\2\u0198\u0199\7E\2\2\u0199\u019a\7T\2\2"+ - "\u019a\u019b\7K\2\2\u019b\u019c\7D\2\2\u019c\u019d\7G\2\2\u019d\64\3\2"+ - "\2\2\u019e\u019f\7F\2\2\u019f\u01a0\7K\2\2\u01a0\u01a1\7U\2\2\u01a1\u01a2"+ - "\7V\2\2\u01a2\u01a3\7K\2\2\u01a3\u01a4\7P\2\2\u01a4\u01a5\7E\2\2\u01a5"+ - "\u01a6\7V\2\2\u01a6\66\3\2\2\2\u01a7\u01a8\7G\2\2\u01a8\u01a9\7U\2\2\u01a9"+ - "\u01aa\7E\2\2\u01aa\u01ab\7C\2\2\u01ab\u01ac\7R\2\2\u01ac\u01ad\7G\2\2"+ - "\u01ad8\3\2\2\2\u01ae\u01af\7G\2\2\u01af\u01b0\7Z\2\2\u01b0\u01b1\7G\2"+ - "\2\u01b1\u01b2\7E\2\2\u01b2\u01b3\7W\2\2\u01b3\u01b4\7V\2\2\u01b4\u01b5"+ - "\7C\2\2\u01b5\u01b6\7D\2\2\u01b6\u01b7\7N\2\2\u01b7\u01b8\7G\2\2\u01b8"+ - ":\3\2\2\2\u01b9\u01ba\7G\2\2\u01ba\u01bb\7Z\2\2\u01bb\u01bc\7K\2\2\u01bc"+ - "\u01bd\7U\2\2\u01bd\u01be\7V\2\2\u01be\u01bf\7U\2\2\u01bf<\3\2\2\2\u01c0"+ - "\u01c1\7G\2\2\u01c1\u01c2\7Z\2\2\u01c2\u01c3\7R\2\2\u01c3\u01c4\7N\2\2"+ - "\u01c4\u01c5\7C\2\2\u01c5\u01c6\7K\2\2\u01c6\u01c7\7P\2\2\u01c7>\3\2\2"+ - "\2\u01c8\u01c9\7G\2\2\u01c9\u01ca\7Z\2\2\u01ca\u01cb\7V\2\2\u01cb\u01cc"+ - "\7T\2\2\u01cc\u01cd\7C\2\2\u01cd\u01ce\7E\2\2\u01ce\u01cf\7V\2\2\u01cf"+ - "@\3\2\2\2\u01d0\u01d1\7H\2\2\u01d1\u01d2\7C\2\2\u01d2\u01d3\7N\2\2\u01d3"+ - "\u01d4\7U\2\2\u01d4\u01d5\7G\2\2\u01d5B\3\2\2\2\u01d6\u01d7\7H\2\2\u01d7"+ - "\u01d8\7K\2\2\u01d8\u01d9\7T\2\2\u01d9\u01da\7U\2\2\u01da\u01db\7V\2\2"+ - "\u01dbD\3\2\2\2\u01dc\u01dd\7H\2\2\u01dd\u01de\7Q\2\2\u01de\u01df\7T\2"+ - "\2\u01df\u01e0\7O\2\2\u01e0\u01e1\7C\2\2\u01e1\u01e2\7V\2\2\u01e2F\3\2"+ - "\2\2\u01e3\u01e4\7H\2\2\u01e4\u01e5\7T\2\2\u01e5\u01e6\7Q\2\2\u01e6\u01e7"+ - "\7O\2\2\u01e7H\3\2\2\2\u01e8\u01e9\7H\2\2\u01e9\u01ea\7W\2\2\u01ea\u01eb"+ - "\7N\2\2\u01eb\u01ec\7N\2\2\u01ecJ\3\2\2\2\u01ed\u01ee\7H\2\2\u01ee\u01ef"+ - "\7W\2\2\u01ef\u01f0\7P\2\2\u01f0\u01f1\7E\2\2\u01f1\u01f2\7V\2\2\u01f2"+ - "\u01f3\7K\2\2\u01f3\u01f4\7Q\2\2\u01f4\u01f5\7P\2\2\u01f5\u01f6\7U\2\2"+ - "\u01f6L\3\2\2\2\u01f7\u01f8\7I\2\2\u01f8\u01f9\7T\2\2\u01f9\u01fa\7C\2"+ - "\2\u01fa\u01fb\7R\2\2\u01fb\u01fc\7J\2\2\u01fc\u01fd\7X\2\2\u01fd\u01fe"+ - "\7K\2\2\u01fe\u01ff\7\\\2\2\u01ffN\3\2\2\2\u0200\u0201\7I\2\2\u0201\u0202"+ - "\7T\2\2\u0202\u0203\7Q\2\2\u0203\u0204\7W\2\2\u0204\u0205\7R\2\2\u0205"+ - "P\3\2\2\2\u0206\u0207\7J\2\2\u0207\u0208\7C\2\2\u0208\u0209\7X\2\2\u0209"+ - "\u020a\7K\2\2\u020a\u020b\7P\2\2\u020b\u020c\7I\2\2\u020cR\3\2\2\2\u020d"+ - "\u020e\7J\2\2\u020e\u020f\7Q\2\2\u020f\u0210\7W\2\2\u0210\u0211\7T\2\2"+ - "\u0211T\3\2\2\2\u0212\u0213\7J\2\2\u0213\u0214\7Q\2\2\u0214\u0215\7W\2"+ - "\2\u0215\u0216\7T\2\2\u0216\u0217\7U\2\2\u0217V\3\2\2\2\u0218\u0219\7"+ - "K\2\2\u0219\u021a\7P\2\2\u021aX\3\2\2\2\u021b\u021c\7K\2\2\u021c\u021d"+ - "\7P\2\2\u021d\u021e\7P\2\2\u021e\u021f\7G\2\2\u021f\u0220\7T\2\2\u0220"+ - "Z\3\2\2\2\u0221\u0222\7K\2\2\u0222\u0223\7P\2\2\u0223\u0224\7V\2\2\u0224"+ - "\u0225\7G\2\2\u0225\u0226\7T\2\2\u0226\u0227\7X\2\2\u0227\u0228\7C\2\2"+ - "\u0228\u0229\7N\2\2\u0229\\\3\2\2\2\u022a\u022b\7K\2\2\u022b\u022c\7U"+ - "\2\2\u022c^\3\2\2\2\u022d\u022e\7L\2\2\u022e\u022f\7Q\2\2\u022f\u0230"+ - "\7K\2\2\u0230\u0231\7P\2\2\u0231`\3\2\2\2\u0232\u0233\7N\2\2\u0233\u0234"+ - "\7C\2\2\u0234\u0235\7U\2\2\u0235\u0236\7V\2\2\u0236b\3\2\2\2\u0237\u0238"+ - "\7N\2\2\u0238\u0239\7G\2\2\u0239\u023a\7H\2\2\u023a\u023b\7V\2\2\u023b"+ - "d\3\2\2\2\u023c\u023d\7N\2\2\u023d\u023e\7K\2\2\u023e\u023f\7M\2\2\u023f"+ - "\u0240\7G\2\2\u0240f\3\2\2\2\u0241\u0242\7N\2\2\u0242\u0243\7K\2\2\u0243"+ - "\u0244\7O\2\2\u0244\u0245\7K\2\2\u0245\u0246\7V\2\2\u0246h\3\2\2\2\u0247"+ - "\u0248\7O\2\2\u0248\u0249\7C\2\2\u0249\u024a\7R\2\2\u024a\u024b\7R\2\2"+ - "\u024b\u024c\7G\2\2\u024c\u024d\7F\2\2\u024dj\3\2\2\2\u024e\u024f\7O\2"+ - "\2\u024f\u0250\7C\2\2\u0250\u0251\7V\2\2\u0251\u0252\7E\2\2\u0252\u0253"+ - "\7J\2\2\u0253l\3\2\2\2\u0254\u0255\7O\2\2\u0255\u0256\7K\2\2\u0256\u0257"+ - "\7P\2\2\u0257\u0258\7W\2\2\u0258\u0259\7V\2\2\u0259\u025a\7G\2\2\u025a"+ - "n\3\2\2\2\u025b\u025c\7O\2\2\u025c\u025d\7K\2\2\u025d\u025e\7P\2\2\u025e"+ - "\u025f\7W\2\2\u025f\u0260\7V\2\2\u0260\u0261\7G\2\2\u0261\u0262\7U\2\2"+ - "\u0262p\3\2\2\2\u0263\u0264\7O\2\2\u0264\u0265\7Q\2\2\u0265\u0266\7P\2"+ - "\2\u0266\u0267\7V\2\2\u0267\u0268\7J\2\2\u0268r\3\2\2\2\u0269\u026a\7"+ - "O\2\2\u026a\u026b\7Q\2\2\u026b\u026c\7P\2\2\u026c\u026d\7V\2\2\u026d\u026e"+ - "\7J\2\2\u026e\u026f\7U\2\2\u026ft\3\2\2\2\u0270\u0271\7P\2\2\u0271\u0272"+ - "\7C\2\2\u0272\u0273\7V\2\2\u0273\u0274\7W\2\2\u0274\u0275\7T\2\2\u0275"+ - "\u0276\7C\2\2\u0276\u0277\7N\2\2\u0277v\3\2\2\2\u0278\u0279\7P\2\2\u0279"+ - "\u027a\7Q\2\2\u027a\u027b\7V\2\2\u027bx\3\2\2\2\u027c\u027d\7P\2\2\u027d"+ - "\u027e\7W\2\2\u027e\u027f\7N\2\2\u027f\u0280\7N\2\2\u0280z\3\2\2\2\u0281"+ - "\u0282\7P\2\2\u0282\u0283\7W\2\2\u0283\u0284\7N\2\2\u0284\u0285\7N\2\2"+ - "\u0285\u0286\7U\2\2\u0286|\3\2\2\2\u0287\u0288\7Q\2\2\u0288\u0289\7P\2"+ - "\2\u0289~\3\2\2\2\u028a\u028b\7Q\2\2\u028b\u028c\7R\2\2\u028c\u028d\7"+ - "V\2\2\u028d\u028e\7K\2\2\u028e\u028f\7O\2\2\u028f\u0290\7K\2\2\u0290\u0291"+ - "\7\\\2\2\u0291\u0292\7G\2\2\u0292\u0293\7F\2\2\u0293\u0080\3\2\2\2\u0294"+ - "\u0295\7Q\2\2\u0295\u0296\7T\2\2\u0296\u0082\3\2\2\2\u0297\u0298\7Q\2"+ - "\2\u0298\u0299\7T\2\2\u0299\u029a\7F\2\2\u029a\u029b\7G\2\2\u029b\u029c"+ - "\7T\2\2\u029c\u0084\3\2\2\2\u029d\u029e\7Q\2\2\u029e\u029f\7W\2\2\u029f"+ - "\u02a0\7V\2\2\u02a0\u02a1\7G\2\2\u02a1\u02a2\7T\2\2\u02a2\u0086\3\2\2"+ - "\2\u02a3\u02a4\7R\2\2\u02a4\u02a5\7C\2\2\u02a5\u02a6\7T\2\2\u02a6\u02a7"+ - "\7U\2\2\u02a7\u02a8\7G\2\2\u02a8\u02a9\7F\2\2\u02a9\u0088\3\2\2\2\u02aa"+ - "\u02ab\7R\2\2\u02ab\u02ac\7J\2\2\u02ac\u02ad\7[\2\2\u02ad\u02ae\7U\2\2"+ - "\u02ae\u02af\7K\2\2\u02af\u02b0\7E\2\2\u02b0\u02b1\7C\2\2\u02b1\u02b2"+ - "\7N\2\2\u02b2\u008a\3\2\2\2\u02b3\u02b4\7R\2\2\u02b4\u02b5\7N\2\2\u02b5"+ - "\u02b6\7C\2\2\u02b6\u02b7\7P\2\2\u02b7\u008c\3\2\2\2\u02b8\u02b9\7T\2"+ - "\2\u02b9\u02ba\7K\2\2\u02ba\u02bb\7I\2\2\u02bb\u02bc\7J\2\2\u02bc\u02bd"+ - "\7V\2\2\u02bd\u008e\3\2\2\2\u02be\u02bf\7T\2\2\u02bf\u02c0\7N\2\2\u02c0"+ - "\u02c1\7K\2\2\u02c1\u02c2\7M\2\2\u02c2\u02c3\7G\2\2\u02c3\u0090\3\2\2"+ - "\2\u02c4\u02c5\7S\2\2\u02c5\u02c6\7W\2\2\u02c6\u02c7\7G\2\2\u02c7\u02c8"+ - "\7T\2\2\u02c8\u02c9\7[\2\2\u02c9\u0092\3\2\2\2\u02ca\u02cb\7U\2\2\u02cb"+ - "\u02cc\7E\2\2\u02cc\u02cd\7J\2\2\u02cd\u02ce\7G\2\2\u02ce\u02cf\7O\2\2"+ - "\u02cf\u02d0\7C\2\2\u02d0\u02d1\7U\2\2\u02d1\u0094\3\2\2\2\u02d2\u02d3"+ - "\7U\2\2\u02d3\u02d4\7G\2\2\u02d4\u02d5\7E\2\2\u02d5\u02d6\7Q\2\2\u02d6"+ - "\u02d7\7P\2\2\u02d7\u02d8\7F\2\2\u02d8\u0096\3\2\2\2\u02d9\u02da\7U\2"+ - "\2\u02da\u02db\7G\2\2\u02db\u02dc\7E\2\2\u02dc\u02dd\7Q\2\2\u02dd\u02de"+ - "\7P\2\2\u02de\u02df\7F\2\2\u02df\u02e0\7U\2\2\u02e0\u0098\3\2\2\2\u02e1"+ - "\u02e2\7U\2\2\u02e2\u02e3\7G\2\2\u02e3\u02e4\7N\2\2\u02e4\u02e5\7G\2\2"+ - "\u02e5\u02e6\7E\2\2\u02e6\u02e7\7V\2\2\u02e7\u009a\3\2\2\2\u02e8\u02e9"+ - "\7U\2\2\u02e9\u02ea\7J\2\2\u02ea\u02eb\7Q\2\2\u02eb\u02ec\7Y\2\2\u02ec"+ - "\u009c\3\2\2\2\u02ed\u02ee\7U\2\2\u02ee\u02ef\7[\2\2\u02ef\u02f0\7U\2"+ - "\2\u02f0\u009e\3\2\2\2\u02f1\u02f2\7V\2\2\u02f2\u02f3\7C\2\2\u02f3\u02f4"+ - "\7D\2\2\u02f4\u02f5\7N\2\2\u02f5\u02f6\7G\2\2\u02f6\u00a0\3\2\2\2\u02f7"+ - "\u02f8\7V\2\2\u02f8\u02f9\7C\2\2\u02f9\u02fa\7D\2\2\u02fa\u02fb\7N\2\2"+ - "\u02fb\u02fc\7G\2\2\u02fc\u02fd\7U\2\2\u02fd\u00a2\3\2\2\2\u02fe\u02ff"+ - "\7V\2\2\u02ff\u0300\7G\2\2\u0300\u0301\7Z\2\2\u0301\u0302\7V\2\2\u0302"+ - "\u00a4\3\2\2\2\u0303\u0304\7V\2\2\u0304\u0305\7T\2\2\u0305\u0306\7W\2"+ - "\2\u0306\u0307\7G\2\2\u0307\u00a6\3\2\2\2\u0308\u0309\7V\2\2\u0309\u030a"+ - "\7Q\2\2\u030a\u00a8\3\2\2\2\u030b\u030c\7V\2\2\u030c\u030d\7[\2\2\u030d"+ - "\u030e\7R\2\2\u030e\u030f\7G\2\2\u030f\u00aa\3\2\2\2\u0310\u0311\7V\2"+ - "\2\u0311\u0312\7[\2\2\u0312\u0313\7R\2\2\u0313\u0314\7G\2\2\u0314\u0315"+ - "\7U\2\2\u0315\u00ac\3\2\2\2\u0316\u0317\7W\2\2\u0317\u0318\7U\2\2\u0318"+ - "\u0319\7K\2\2\u0319\u031a\7P\2\2\u031a\u031b\7I\2\2\u031b\u00ae\3\2\2"+ - "\2\u031c\u031d\7X\2\2\u031d\u031e\7G\2\2\u031e\u031f\7T\2\2\u031f\u0320"+ - "\7K\2\2\u0320\u0321\7H\2\2\u0321\u0322\7[\2\2\u0322\u00b0\3\2\2\2\u0323"+ - "\u0324\7Y\2\2\u0324\u0325\7J\2\2\u0325\u0326\7G\2\2\u0326\u0327\7T\2\2"+ - "\u0327\u0328\7G\2\2\u0328\u00b2\3\2\2\2\u0329\u032a\7Y\2\2\u032a\u032b"+ - "\7K\2\2\u032b\u032c\7V\2\2\u032c\u032d\7J\2\2\u032d\u00b4\3\2\2\2\u032e"+ - "\u032f\7[\2\2\u032f\u0330\7G\2\2\u0330\u0331\7C\2\2\u0331\u0332\7T\2\2"+ - "\u0332\u00b6\3\2\2\2\u0333\u0334\7[\2\2\u0334\u0335\7G\2\2\u0335\u0336"+ - "\7C\2\2\u0336\u0337\7T\2\2\u0337\u0338\7U\2\2\u0338\u00b8\3\2\2\2\u0339"+ - "\u033a\7}\2\2\u033a\u033b\7G\2\2\u033b\u033c\7U\2\2\u033c\u033d\7E\2\2"+ - "\u033d\u033e\7C\2\2\u033e\u033f\7R\2\2\u033f\u0340\7G\2\2\u0340\u00ba"+ - "\3\2\2\2\u0341\u0342\7}\2\2\u0342\u0343\7H\2\2\u0343\u0344\7P\2\2\u0344"+ - "\u00bc\3\2\2\2\u0345\u0346\7}\2\2\u0346\u0347\7N\2\2\u0347\u0348\7K\2"+ - "\2\u0348\u0349\7O\2\2\u0349\u034a\7K\2\2\u034a\u034b\7V\2\2\u034b\u00be"+ - "\3\2\2\2\u034c\u034d\7}\2\2\u034d\u034e\7F\2\2\u034e\u00c0\3\2\2\2\u034f"+ - "\u0350\7}\2\2\u0350\u0351\7V\2\2\u0351\u00c2\3\2\2\2\u0352\u0353\7}\2"+ - "\2\u0353\u0354\7V\2\2\u0354\u0355\7U\2\2\u0355\u00c4\3\2\2\2\u0356\u0357"+ - "\7}\2\2\u0357\u0358\7I\2\2\u0358\u0359\7W\2\2\u0359\u035a\7K\2\2\u035a"+ - "\u035b\7F\2\2\u035b\u00c6\3\2\2\2\u035c\u035d\7\177\2\2\u035d\u00c8\3"+ - "\2\2\2\u035e\u035f\7?\2\2\u035f\u00ca\3\2\2\2\u0360\u0361\7>\2\2\u0361"+ - "\u0362\7?\2\2\u0362\u0363\7@\2\2\u0363\u00cc\3\2\2\2\u0364\u0365\7>\2"+ - "\2\u0365\u0369\7@\2\2\u0366\u0367\7#\2\2\u0367\u0369\7?\2\2\u0368\u0364"+ - "\3\2\2\2\u0368\u0366\3\2\2\2\u0369\u00ce\3\2\2\2\u036a\u036b\7>\2\2\u036b"+ - "\u00d0\3\2\2\2\u036c\u036d\7>\2\2\u036d\u036e\7?\2\2\u036e\u00d2\3\2\2"+ - "\2\u036f\u0370\7@\2\2\u0370\u00d4\3\2\2\2\u0371\u0372\7@\2\2\u0372\u0373"+ - "\7?\2\2\u0373\u00d6\3\2\2\2\u0374\u0375\7-\2\2\u0375\u00d8\3\2\2\2\u0376"+ - "\u0377\7/\2\2\u0377\u00da\3\2\2\2\u0378\u0379\7,\2\2\u0379\u00dc\3\2\2"+ - "\2\u037a\u037b\7\61\2\2\u037b\u00de\3\2\2\2\u037c\u037d\7\'\2\2\u037d"+ - "\u00e0\3\2\2\2\u037e\u037f\7~\2\2\u037f\u0380\7~\2\2\u0380\u00e2\3\2\2"+ - "\2\u0381\u0382\7\60\2\2\u0382\u00e4\3\2\2\2\u0383\u0384\7A\2\2\u0384\u00e6"+ - "\3\2\2\2\u0385\u038b\7)\2\2\u0386\u038a\n\2\2\2\u0387\u0388\7)\2\2\u0388"+ - "\u038a\7)\2\2\u0389\u0386\3\2\2\2\u0389\u0387\3\2\2\2\u038a\u038d\3\2"+ - "\2\2\u038b\u0389\3\2\2\2\u038b\u038c\3\2\2\2\u038c\u038e\3\2\2\2\u038d"+ - "\u038b\3\2\2\2\u038e\u038f\7)\2\2\u038f\u00e8\3\2\2\2\u0390\u0392\5\u00f9"+ - "}\2\u0391\u0390\3\2\2\2\u0392\u0393\3\2\2\2\u0393\u0391\3\2\2\2\u0393"+ - "\u0394\3\2\2\2\u0394\u00ea\3\2\2\2\u0395\u0397\5\u00f9}\2\u0396\u0395"+ - "\3\2\2\2\u0397\u0398\3\2\2\2\u0398\u0396\3\2\2\2\u0398\u0399\3\2\2\2\u0399"+ - "\u039a\3\2\2\2\u039a\u039e\5\u00e3r\2\u039b\u039d\5\u00f9}\2\u039c\u039b"+ - "\3\2\2\2\u039d\u03a0\3\2\2\2\u039e\u039c\3\2\2\2\u039e\u039f\3\2\2\2\u039f"+ - "\u03c0\3\2\2\2\u03a0\u039e\3\2\2\2\u03a1\u03a3\5\u00e3r\2\u03a2\u03a4"+ - "\5\u00f9}\2\u03a3\u03a2\3\2\2\2\u03a4\u03a5\3\2\2\2\u03a5\u03a3\3\2\2"+ - "\2\u03a5\u03a6\3\2\2\2\u03a6\u03c0\3\2\2\2\u03a7\u03a9\5\u00f9}\2\u03a8"+ - "\u03a7\3\2\2\2\u03a9\u03aa\3\2\2\2\u03aa\u03a8\3\2\2\2\u03aa\u03ab\3\2"+ - "\2\2\u03ab\u03b3\3\2\2\2\u03ac\u03b0\5\u00e3r\2\u03ad\u03af\5\u00f9}\2"+ - "\u03ae\u03ad\3\2\2\2\u03af\u03b2\3\2\2\2\u03b0\u03ae\3\2\2\2\u03b0\u03b1"+ - "\3\2\2\2\u03b1\u03b4\3\2\2\2\u03b2\u03b0\3\2\2\2\u03b3\u03ac\3\2\2\2\u03b3"+ - "\u03b4\3\2\2\2\u03b4\u03b5\3\2\2\2\u03b5\u03b6\5\u00f7|\2\u03b6\u03c0"+ - "\3\2\2\2\u03b7\u03b9\5\u00e3r\2\u03b8\u03ba\5\u00f9}\2\u03b9\u03b8\3\2"+ - "\2\2\u03ba\u03bb\3\2\2\2\u03bb\u03b9\3\2\2\2\u03bb\u03bc\3\2\2\2\u03bc"+ - "\u03bd\3\2\2\2\u03bd\u03be\5\u00f7|\2\u03be\u03c0\3\2\2\2\u03bf\u0396"+ - "\3\2\2\2\u03bf\u03a1\3\2\2\2\u03bf\u03a8\3\2\2\2\u03bf\u03b7\3\2\2\2\u03c0"+ - "\u00ec\3\2\2\2\u03c1\u03c4\5\u00fb~\2\u03c2\u03c4\7a\2\2\u03c3\u03c1\3"+ - "\2\2\2\u03c3\u03c2\3\2\2\2\u03c4\u03ca\3\2\2\2\u03c5\u03c9\5\u00fb~\2"+ - "\u03c6\u03c9\5\u00f9}\2\u03c7\u03c9\t\3\2\2\u03c8\u03c5\3\2\2\2\u03c8"+ - "\u03c6\3\2\2\2\u03c8\u03c7\3\2\2\2\u03c9\u03cc\3\2\2\2\u03ca\u03c8\3\2"+ - "\2\2\u03ca\u03cb\3\2\2\2\u03cb\u00ee\3\2\2\2\u03cc\u03ca\3\2\2\2\u03cd"+ - "\u03d1\5\u00f9}\2\u03ce\u03d2\5\u00fb~\2\u03cf\u03d2\5\u00f9}\2\u03d0"+ - "\u03d2\t\4\2\2\u03d1\u03ce\3\2\2\2\u03d1\u03cf\3\2\2\2\u03d1\u03d0\3\2"+ - "\2\2\u03d2\u03d3\3\2\2\2\u03d3\u03d1\3\2\2\2\u03d3\u03d4\3\2\2\2\u03d4"+ - "\u00f0\3\2\2\2\u03d5\u03d9\5\u00fb~\2\u03d6\u03d9\5\u00f9}\2\u03d7\u03d9"+ - "\7a\2\2\u03d8\u03d5\3\2\2\2\u03d8\u03d6\3\2\2\2\u03d8\u03d7\3\2\2\2\u03d9"+ - "\u03da\3\2\2\2\u03da\u03d8\3\2\2\2\u03da\u03db\3\2\2\2\u03db\u00f2\3\2"+ - "\2\2\u03dc\u03e2\7$\2\2\u03dd\u03e1\n\5\2\2\u03de\u03df\7$\2\2\u03df\u03e1"+ - "\7$\2\2\u03e0\u03dd\3\2\2\2\u03e0\u03de\3\2\2\2\u03e1\u03e4\3\2\2\2\u03e2"+ - "\u03e0\3\2\2\2\u03e2\u03e3\3\2\2\2\u03e3\u03e5\3\2\2\2\u03e4\u03e2\3\2"+ - "\2\2\u03e5\u03e6\7$\2\2\u03e6\u00f4\3\2\2\2\u03e7\u03ed\7b\2\2\u03e8\u03ec"+ - "\n\6\2\2\u03e9\u03ea\7b\2\2\u03ea\u03ec\7b\2\2\u03eb\u03e8\3\2\2\2\u03eb"+ - "\u03e9\3\2\2\2\u03ec\u03ef\3\2\2\2\u03ed\u03eb\3\2\2\2\u03ed\u03ee\3\2"+ - "\2\2\u03ee\u03f0\3\2\2\2\u03ef\u03ed\3\2\2\2\u03f0\u03f1\7b\2\2\u03f1"+ - "\u00f6\3\2\2\2\u03f2\u03f4\7G\2\2\u03f3\u03f5\t\7\2\2\u03f4\u03f3\3\2"+ - "\2\2\u03f4\u03f5\3\2\2\2\u03f5\u03f7\3\2\2\2\u03f6\u03f8\5\u00f9}\2\u03f7"+ - "\u03f6\3\2\2\2\u03f8\u03f9\3\2\2\2\u03f9\u03f7\3\2\2\2\u03f9\u03fa\3\2"+ - "\2\2\u03fa\u00f8\3\2\2\2\u03fb\u03fc\t\b\2\2\u03fc\u00fa\3\2\2\2\u03fd"+ - "\u03fe\t\t\2\2\u03fe\u00fc\3\2\2\2\u03ff\u0400\7/\2\2\u0400\u0401\7/\2"+ - "\2\u0401\u0405\3\2\2\2\u0402\u0404\n\n\2\2\u0403\u0402\3\2\2\2\u0404\u0407"+ - "\3\2\2\2\u0405\u0403\3\2\2\2\u0405\u0406\3\2\2\2\u0406\u0409\3\2\2\2\u0407"+ - "\u0405\3\2\2\2\u0408\u040a\7\17\2\2\u0409\u0408\3\2\2\2\u0409\u040a\3"+ - "\2\2\2\u040a\u040c\3\2\2\2\u040b\u040d\7\f\2\2\u040c\u040b\3\2\2\2\u040c"+ - "\u040d\3\2\2\2\u040d\u040e\3\2\2\2\u040e\u040f\b\177\2\2\u040f\u00fe\3"+ - "\2\2\2\u0410\u0411\7\61\2\2\u0411\u0412\7,\2\2\u0412\u0417\3\2\2\2\u0413"+ - "\u0416\5\u00ff\u0080\2\u0414\u0416\13\2\2\2\u0415\u0413\3\2\2\2\u0415"+ - "\u0414\3\2\2\2\u0416\u0419\3\2\2\2\u0417\u0418\3\2\2\2\u0417\u0415\3\2"+ - "\2\2\u0418\u041a\3\2\2\2\u0419\u0417\3\2\2\2\u041a\u041b\7,\2\2\u041b"+ - "\u041c\7\61\2\2\u041c\u041d\3\2\2\2\u041d\u041e\b\u0080\2\2\u041e\u0100"+ - "\3\2\2\2\u041f\u0421\t\13\2\2\u0420\u041f\3\2\2\2\u0421\u0422\3\2\2\2"+ - "\u0422\u0420\3\2\2\2\u0422\u0423\3\2\2\2\u0423\u0424\3\2\2\2\u0424\u0425"+ - "\b\u0081\2\2\u0425\u0102\3\2\2\2\u0426\u0427\13\2\2\2\u0427\u0104\3\2"+ - "\2\2\"\2\u0368\u0389\u038b\u0393\u0398\u039e\u03a5\u03aa\u03b0\u03b3\u03bb"+ - "\u03bf\u03c3\u03c8\u03ca\u03d1\u03d3\u03d8\u03da\u03e0\u03e2\u03eb\u03ed"+ - "\u03f4\u03f9\u0405\u0409\u040c\u0415\u0417\u0422\3\2\3\2"; + "\3\2\2\2\2\u00f5\3\2\2\2\2\u00f7\3\2\2\2\2\u00ff\3\2\2\2\2\u0101\3\2\2"+ + "\2\2\u0103\3\2\2\2\2\u0105\3\2\2\2\3\u0107\3\2\2\2\5\u0109\3\2\2\2\7\u010b"+ + "\3\2\2\2\t\u010d\3\2\2\2\13\u010f\3\2\2\2\r\u0113\3\2\2\2\17\u011b\3\2"+ + "\2\2\21\u0124\3\2\2\2\23\u0128\3\2\2\2\25\u012c\3\2\2\2\27\u012f\3\2\2"+ + "\2\31\u0133\3\2\2\2\33\u013b\3\2\2\2\35\u013e\3\2\2\2\37\u0143\3\2\2\2"+ + "!\u014b\3\2\2\2#\u0154\3\2\2\2%\u015c\3\2\2\2\'\u0164\3\2\2\2)\u0171\3"+ + "\2\2\2+\u0183\3\2\2\2-\u0187\3\2\2\2/\u018c\3\2\2\2\61\u0192\3\2\2\2\63"+ + "\u0197\3\2\2\2\65\u01a0\3\2\2\2\67\u01a9\3\2\2\29\u01b0\3\2\2\2;\u01bb"+ + "\3\2\2\2=\u01c2\3\2\2\2?\u01ca\3\2\2\2A\u01d2\3\2\2\2C\u01d8\3\2\2\2E"+ + "\u01de\3\2\2\2G\u01e5\3\2\2\2I\u01ea\3\2\2\2K\u01ef\3\2\2\2M\u01f9\3\2"+ + "\2\2O\u0202\3\2\2\2Q\u0208\3\2\2\2S\u020f\3\2\2\2U\u0214\3\2\2\2W\u021a"+ + "\3\2\2\2Y\u021d\3\2\2\2[\u0223\3\2\2\2]\u022c\3\2\2\2_\u022f\3\2\2\2a"+ + "\u0234\3\2\2\2c\u0239\3\2\2\2e\u023e\3\2\2\2g\u0243\3\2\2\2i\u0249\3\2"+ + "\2\2k\u0250\3\2\2\2m\u0256\3\2\2\2o\u025d\3\2\2\2q\u0265\3\2\2\2s\u026b"+ + "\3\2\2\2u\u0272\3\2\2\2w\u027a\3\2\2\2y\u027e\3\2\2\2{\u0283\3\2\2\2}"+ + "\u0289\3\2\2\2\177\u028c\3\2\2\2\u0081\u0296\3\2\2\2\u0083\u0299\3\2\2"+ + "\2\u0085\u029f\3\2\2\2\u0087\u02a5\3\2\2\2\u0089\u02ac\3\2\2\2\u008b\u02b5"+ + "\3\2\2\2\u008d\u02ba\3\2\2\2\u008f\u02c0\3\2\2\2\u0091\u02c6\3\2\2\2\u0093"+ + "\u02cc\3\2\2\2\u0095\u02d4\3\2\2\2\u0097\u02db\3\2\2\2\u0099\u02e3\3\2"+ + "\2\2\u009b\u02ea\3\2\2\2\u009d\u02ef\3\2\2\2\u009f\u02f3\3\2\2\2\u00a1"+ + "\u02f9\3\2\2\2\u00a3\u0300\3\2\2\2\u00a5\u0305\3\2\2\2\u00a7\u030a\3\2"+ + "\2\2\u00a9\u030d\3\2\2\2\u00ab\u0312\3\2\2\2\u00ad\u0318\3\2\2\2\u00af"+ + "\u031e\3\2\2\2\u00b1\u0325\3\2\2\2\u00b3\u032b\3\2\2\2\u00b5\u0330\3\2"+ + "\2\2\u00b7\u0335\3\2\2\2\u00b9\u033b\3\2\2\2\u00bb\u0343\3\2\2\2\u00bd"+ + "\u0347\3\2\2\2\u00bf\u034e\3\2\2\2\u00c1\u0351\3\2\2\2\u00c3\u0354\3\2"+ + "\2\2\u00c5\u0358\3\2\2\2\u00c7\u035e\3\2\2\2\u00c9\u0360\3\2\2\2\u00cb"+ + "\u0362\3\2\2\2\u00cd\u036a\3\2\2\2\u00cf\u036c\3\2\2\2\u00d1\u036e\3\2"+ + "\2\2\u00d3\u0371\3\2\2\2\u00d5\u0373\3\2\2\2\u00d7\u0376\3\2\2\2\u00d9"+ + "\u0378\3\2\2\2\u00db\u037a\3\2\2\2\u00dd\u037c\3\2\2\2\u00df\u037e\3\2"+ + "\2\2\u00e1\u0380\3\2\2\2\u00e3\u0383\3\2\2\2\u00e5\u0386\3\2\2\2\u00e7"+ + "\u0388\3\2\2\2\u00e9\u038a\3\2\2\2\u00eb\u0396\3\2\2\2\u00ed\u03c4\3\2"+ + "\2\2\u00ef\u03c8\3\2\2\2\u00f1\u03d2\3\2\2\2\u00f3\u03dd\3\2\2\2\u00f5"+ + "\u03e1\3\2\2\2\u00f7\u03ec\3\2\2\2\u00f9\u03f7\3\2\2\2\u00fb\u0400\3\2"+ + "\2\2\u00fd\u0402\3\2\2\2\u00ff\u0404\3\2\2\2\u0101\u0415\3\2\2\2\u0103"+ + "\u0425\3\2\2\2\u0105\u042b\3\2\2\2\u0107\u0108\7*\2\2\u0108\4\3\2\2\2"+ + "\u0109\u010a\7+\2\2\u010a\6\3\2\2\2\u010b\u010c\7.\2\2\u010c\b\3\2\2\2"+ + "\u010d\u010e\7<\2\2\u010e\n\3\2\2\2\u010f\u0110\7C\2\2\u0110\u0111\7N"+ + "\2\2\u0111\u0112\7N\2\2\u0112\f\3\2\2\2\u0113\u0114\7C\2\2\u0114\u0115"+ + "\7P\2\2\u0115\u0116\7C\2\2\u0116\u0117\7N\2\2\u0117\u0118\7[\2\2\u0118"+ + "\u0119\7\\\2\2\u0119\u011a\7G\2\2\u011a\16\3\2\2\2\u011b\u011c\7C\2\2"+ + "\u011c\u011d\7P\2\2\u011d\u011e\7C\2\2\u011e\u011f\7N\2\2\u011f\u0120"+ + "\7[\2\2\u0120\u0121\7\\\2\2\u0121\u0122\7G\2\2\u0122\u0123\7F\2\2\u0123"+ + "\20\3\2\2\2\u0124\u0125\7C\2\2\u0125\u0126\7P\2\2\u0126\u0127\7F\2\2\u0127"+ + "\22\3\2\2\2\u0128\u0129\7C\2\2\u0129\u012a\7P\2\2\u012a\u012b\7[\2\2\u012b"+ + "\24\3\2\2\2\u012c\u012d\7C\2\2\u012d\u012e\7U\2\2\u012e\26\3\2\2\2\u012f"+ + "\u0130\7C\2\2\u0130\u0131\7U\2\2\u0131\u0132\7E\2\2\u0132\30\3\2\2\2\u0133"+ + "\u0134\7D\2\2\u0134\u0135\7G\2\2\u0135\u0136\7V\2\2\u0136\u0137\7Y\2\2"+ + "\u0137\u0138\7G\2\2\u0138\u0139\7G\2\2\u0139\u013a\7P\2\2\u013a\32\3\2"+ + "\2\2\u013b\u013c\7D\2\2\u013c\u013d\7[\2\2\u013d\34\3\2\2\2\u013e\u013f"+ + "\7E\2\2\u013f\u0140\7C\2\2\u0140\u0141\7U\2\2\u0141\u0142\7V\2\2\u0142"+ + "\36\3\2\2\2\u0143\u0144\7E\2\2\u0144\u0145\7C\2\2\u0145\u0146\7V\2\2\u0146"+ + "\u0147\7C\2\2\u0147\u0148\7N\2\2\u0148\u0149\7Q\2\2\u0149\u014a\7I\2\2"+ + "\u014a \3\2\2\2\u014b\u014c\7E\2\2\u014c\u014d\7C\2\2\u014d\u014e\7V\2"+ + "\2\u014e\u014f\7C\2\2\u014f\u0150\7N\2\2\u0150\u0151\7Q\2\2\u0151\u0152"+ + "\7I\2\2\u0152\u0153\7U\2\2\u0153\"\3\2\2\2\u0154\u0155\7E\2\2\u0155\u0156"+ + "\7Q\2\2\u0156\u0157\7N\2\2\u0157\u0158\7W\2\2\u0158\u0159\7O\2\2\u0159"+ + "\u015a\7P\2\2\u015a\u015b\7U\2\2\u015b$\3\2\2\2\u015c\u015d\7E\2\2\u015d"+ + "\u015e\7Q\2\2\u015e\u015f\7P\2\2\u015f\u0160\7X\2\2\u0160\u0161\7G\2\2"+ + "\u0161\u0162\7T\2\2\u0162\u0163\7V\2\2\u0163&\3\2\2\2\u0164\u0165\7E\2"+ + "\2\u0165\u0166\7W\2\2\u0166\u0167\7T\2\2\u0167\u0168\7T\2\2\u0168\u0169"+ + "\7G\2\2\u0169\u016a\7P\2\2\u016a\u016b\7V\2\2\u016b\u016c\7a\2\2\u016c"+ + "\u016d\7F\2\2\u016d\u016e\7C\2\2\u016e\u016f\7V\2\2\u016f\u0170\7G\2\2"+ + "\u0170(\3\2\2\2\u0171\u0172\7E\2\2\u0172\u0173\7W\2\2\u0173\u0174\7T\2"+ + "\2\u0174\u0175\7T\2\2\u0175\u0176\7G\2\2\u0176\u0177\7P\2\2\u0177\u0178"+ + "\7V\2\2\u0178\u0179\7a\2\2\u0179\u017a\7V\2\2\u017a\u017b\7K\2\2\u017b"+ + "\u017c\7O\2\2\u017c\u017d\7G\2\2\u017d\u017e\7U\2\2\u017e\u017f\7V\2\2"+ + "\u017f\u0180\7C\2\2\u0180\u0181\7O\2\2\u0181\u0182\7R\2\2\u0182*\3\2\2"+ + "\2\u0183\u0184\7F\2\2\u0184\u0185\7C\2\2\u0185\u0186\7[\2\2\u0186,\3\2"+ + "\2\2\u0187\u0188\7F\2\2\u0188\u0189\7C\2\2\u0189\u018a\7[\2\2\u018a\u018b"+ + "\7U\2\2\u018b.\3\2\2\2\u018c\u018d\7F\2\2\u018d\u018e\7G\2\2\u018e\u018f"+ + "\7D\2\2\u018f\u0190\7W\2\2\u0190\u0191\7I\2\2\u0191\60\3\2\2\2\u0192\u0193"+ + "\7F\2\2\u0193\u0194\7G\2\2\u0194\u0195\7U\2\2\u0195\u0196\7E\2\2\u0196"+ + "\62\3\2\2\2\u0197\u0198\7F\2\2\u0198\u0199\7G\2\2\u0199\u019a\7U\2\2\u019a"+ + "\u019b\7E\2\2\u019b\u019c\7T\2\2\u019c\u019d\7K\2\2\u019d\u019e\7D\2\2"+ + "\u019e\u019f\7G\2\2\u019f\64\3\2\2\2\u01a0\u01a1\7F\2\2\u01a1\u01a2\7"+ + "K\2\2\u01a2\u01a3\7U\2\2\u01a3\u01a4\7V\2\2\u01a4\u01a5\7K\2\2\u01a5\u01a6"+ + "\7P\2\2\u01a6\u01a7\7E\2\2\u01a7\u01a8\7V\2\2\u01a8\66\3\2\2\2\u01a9\u01aa"+ + "\7G\2\2\u01aa\u01ab\7U\2\2\u01ab\u01ac\7E\2\2\u01ac\u01ad\7C\2\2\u01ad"+ + "\u01ae\7R\2\2\u01ae\u01af\7G\2\2\u01af8\3\2\2\2\u01b0\u01b1\7G\2\2\u01b1"+ + "\u01b2\7Z\2\2\u01b2\u01b3\7G\2\2\u01b3\u01b4\7E\2\2\u01b4\u01b5\7W\2\2"+ + "\u01b5\u01b6\7V\2\2\u01b6\u01b7\7C\2\2\u01b7\u01b8\7D\2\2\u01b8\u01b9"+ + "\7N\2\2\u01b9\u01ba\7G\2\2\u01ba:\3\2\2\2\u01bb\u01bc\7G\2\2\u01bc\u01bd"+ + "\7Z\2\2\u01bd\u01be\7K\2\2\u01be\u01bf\7U\2\2\u01bf\u01c0\7V\2\2\u01c0"+ + "\u01c1\7U\2\2\u01c1<\3\2\2\2\u01c2\u01c3\7G\2\2\u01c3\u01c4\7Z\2\2\u01c4"+ + "\u01c5\7R\2\2\u01c5\u01c6\7N\2\2\u01c6\u01c7\7C\2\2\u01c7\u01c8\7K\2\2"+ + "\u01c8\u01c9\7P\2\2\u01c9>\3\2\2\2\u01ca\u01cb\7G\2\2\u01cb\u01cc\7Z\2"+ + "\2\u01cc\u01cd\7V\2\2\u01cd\u01ce\7T\2\2\u01ce\u01cf\7C\2\2\u01cf\u01d0"+ + "\7E\2\2\u01d0\u01d1\7V\2\2\u01d1@\3\2\2\2\u01d2\u01d3\7H\2\2\u01d3\u01d4"+ + "\7C\2\2\u01d4\u01d5\7N\2\2\u01d5\u01d6\7U\2\2\u01d6\u01d7\7G\2\2\u01d7"+ + "B\3\2\2\2\u01d8\u01d9\7H\2\2\u01d9\u01da\7K\2\2\u01da\u01db\7T\2\2\u01db"+ + "\u01dc\7U\2\2\u01dc\u01dd\7V\2\2\u01ddD\3\2\2\2\u01de\u01df\7H\2\2\u01df"+ + "\u01e0\7Q\2\2\u01e0\u01e1\7T\2\2\u01e1\u01e2\7O\2\2\u01e2\u01e3\7C\2\2"+ + "\u01e3\u01e4\7V\2\2\u01e4F\3\2\2\2\u01e5\u01e6\7H\2\2\u01e6\u01e7\7T\2"+ + "\2\u01e7\u01e8\7Q\2\2\u01e8\u01e9\7O\2\2\u01e9H\3\2\2\2\u01ea\u01eb\7"+ + "H\2\2\u01eb\u01ec\7W\2\2\u01ec\u01ed\7N\2\2\u01ed\u01ee\7N\2\2\u01eeJ"+ + "\3\2\2\2\u01ef\u01f0\7H\2\2\u01f0\u01f1\7W\2\2\u01f1\u01f2\7P\2\2\u01f2"+ + "\u01f3\7E\2\2\u01f3\u01f4\7V\2\2\u01f4\u01f5\7K\2\2\u01f5\u01f6\7Q\2\2"+ + "\u01f6\u01f7\7P\2\2\u01f7\u01f8\7U\2\2\u01f8L\3\2\2\2\u01f9\u01fa\7I\2"+ + "\2\u01fa\u01fb\7T\2\2\u01fb\u01fc\7C\2\2\u01fc\u01fd\7R\2\2\u01fd\u01fe"+ + "\7J\2\2\u01fe\u01ff\7X\2\2\u01ff\u0200\7K\2\2\u0200\u0201\7\\\2\2\u0201"+ + "N\3\2\2\2\u0202\u0203\7I\2\2\u0203\u0204\7T\2\2\u0204\u0205\7Q\2\2\u0205"+ + "\u0206\7W\2\2\u0206\u0207\7R\2\2\u0207P\3\2\2\2\u0208\u0209\7J\2\2\u0209"+ + "\u020a\7C\2\2\u020a\u020b\7X\2\2\u020b\u020c\7K\2\2\u020c\u020d\7P\2\2"+ + "\u020d\u020e\7I\2\2\u020eR\3\2\2\2\u020f\u0210\7J\2\2\u0210\u0211\7Q\2"+ + "\2\u0211\u0212\7W\2\2\u0212\u0213\7T\2\2\u0213T\3\2\2\2\u0214\u0215\7"+ + "J\2\2\u0215\u0216\7Q\2\2\u0216\u0217\7W\2\2\u0217\u0218\7T\2\2\u0218\u0219"+ + "\7U\2\2\u0219V\3\2\2\2\u021a\u021b\7K\2\2\u021b\u021c\7P\2\2\u021cX\3"+ + "\2\2\2\u021d\u021e\7K\2\2\u021e\u021f\7P\2\2\u021f\u0220\7P\2\2\u0220"+ + "\u0221\7G\2\2\u0221\u0222\7T\2\2\u0222Z\3\2\2\2\u0223\u0224\7K\2\2\u0224"+ + "\u0225\7P\2\2\u0225\u0226\7V\2\2\u0226\u0227\7G\2\2\u0227\u0228\7T\2\2"+ + "\u0228\u0229\7X\2\2\u0229\u022a\7C\2\2\u022a\u022b\7N\2\2\u022b\\\3\2"+ + "\2\2\u022c\u022d\7K\2\2\u022d\u022e\7U\2\2\u022e^\3\2\2\2\u022f\u0230"+ + "\7L\2\2\u0230\u0231\7Q\2\2\u0231\u0232\7K\2\2\u0232\u0233\7P\2\2\u0233"+ + "`\3\2\2\2\u0234\u0235\7N\2\2\u0235\u0236\7C\2\2\u0236\u0237\7U\2\2\u0237"+ + "\u0238\7V\2\2\u0238b\3\2\2\2\u0239\u023a\7N\2\2\u023a\u023b\7G\2\2\u023b"+ + "\u023c\7H\2\2\u023c\u023d\7V\2\2\u023dd\3\2\2\2\u023e\u023f\7N\2\2\u023f"+ + "\u0240\7K\2\2\u0240\u0241\7M\2\2\u0241\u0242\7G\2\2\u0242f\3\2\2\2\u0243"+ + "\u0244\7N\2\2\u0244\u0245\7K\2\2\u0245\u0246\7O\2\2\u0246\u0247\7K\2\2"+ + "\u0247\u0248\7V\2\2\u0248h\3\2\2\2\u0249\u024a\7O\2\2\u024a\u024b\7C\2"+ + "\2\u024b\u024c\7R\2\2\u024c\u024d\7R\2\2\u024d\u024e\7G\2\2\u024e\u024f"+ + "\7F\2\2\u024fj\3\2\2\2\u0250\u0251\7O\2\2\u0251\u0252\7C\2\2\u0252\u0253"+ + "\7V\2\2\u0253\u0254\7E\2\2\u0254\u0255\7J\2\2\u0255l\3\2\2\2\u0256\u0257"+ + "\7O\2\2\u0257\u0258\7K\2\2\u0258\u0259\7P\2\2\u0259\u025a\7W\2\2\u025a"+ + "\u025b\7V\2\2\u025b\u025c\7G\2\2\u025cn\3\2\2\2\u025d\u025e\7O\2\2\u025e"+ + "\u025f\7K\2\2\u025f\u0260\7P\2\2\u0260\u0261\7W\2\2\u0261\u0262\7V\2\2"+ + "\u0262\u0263\7G\2\2\u0263\u0264\7U\2\2\u0264p\3\2\2\2\u0265\u0266\7O\2"+ + "\2\u0266\u0267\7Q\2\2\u0267\u0268\7P\2\2\u0268\u0269\7V\2\2\u0269\u026a"+ + "\7J\2\2\u026ar\3\2\2\2\u026b\u026c\7O\2\2\u026c\u026d\7Q\2\2\u026d\u026e"+ + "\7P\2\2\u026e\u026f\7V\2\2\u026f\u0270\7J\2\2\u0270\u0271\7U\2\2\u0271"+ + "t\3\2\2\2\u0272\u0273\7P\2\2\u0273\u0274\7C\2\2\u0274\u0275\7V\2\2\u0275"+ + "\u0276\7W\2\2\u0276\u0277\7T\2\2\u0277\u0278\7C\2\2\u0278\u0279\7N\2\2"+ + "\u0279v\3\2\2\2\u027a\u027b\7P\2\2\u027b\u027c\7Q\2\2\u027c\u027d\7V\2"+ + "\2\u027dx\3\2\2\2\u027e\u027f\7P\2\2\u027f\u0280\7W\2\2\u0280\u0281\7"+ + "N\2\2\u0281\u0282\7N\2\2\u0282z\3\2\2\2\u0283\u0284\7P\2\2\u0284\u0285"+ + "\7W\2\2\u0285\u0286\7N\2\2\u0286\u0287\7N\2\2\u0287\u0288\7U\2\2\u0288"+ + "|\3\2\2\2\u0289\u028a\7Q\2\2\u028a\u028b\7P\2\2\u028b~\3\2\2\2\u028c\u028d"+ + "\7Q\2\2\u028d\u028e\7R\2\2\u028e\u028f\7V\2\2\u028f\u0290\7K\2\2\u0290"+ + "\u0291\7O\2\2\u0291\u0292\7K\2\2\u0292\u0293\7\\\2\2\u0293\u0294\7G\2"+ + "\2\u0294\u0295\7F\2\2\u0295\u0080\3\2\2\2\u0296\u0297\7Q\2\2\u0297\u0298"+ + "\7T\2\2\u0298\u0082\3\2\2\2\u0299\u029a\7Q\2\2\u029a\u029b\7T\2\2\u029b"+ + "\u029c\7F\2\2\u029c\u029d\7G\2\2\u029d\u029e\7T\2\2\u029e\u0084\3\2\2"+ + "\2\u029f\u02a0\7Q\2\2\u02a0\u02a1\7W\2\2\u02a1\u02a2\7V\2\2\u02a2\u02a3"+ + "\7G\2\2\u02a3\u02a4\7T\2\2\u02a4\u0086\3\2\2\2\u02a5\u02a6\7R\2\2\u02a6"+ + "\u02a7\7C\2\2\u02a7\u02a8\7T\2\2\u02a8\u02a9\7U\2\2\u02a9\u02aa\7G\2\2"+ + "\u02aa\u02ab\7F\2\2\u02ab\u0088\3\2\2\2\u02ac\u02ad\7R\2\2\u02ad\u02ae"+ + "\7J\2\2\u02ae\u02af\7[\2\2\u02af\u02b0\7U\2\2\u02b0\u02b1\7K\2\2\u02b1"+ + "\u02b2\7E\2\2\u02b2\u02b3\7C\2\2\u02b3\u02b4\7N\2\2\u02b4\u008a\3\2\2"+ + "\2\u02b5\u02b6\7R\2\2\u02b6\u02b7\7N\2\2\u02b7\u02b8\7C\2\2\u02b8\u02b9"+ + "\7P\2\2\u02b9\u008c\3\2\2\2\u02ba\u02bb\7T\2\2\u02bb\u02bc\7K\2\2\u02bc"+ + "\u02bd\7I\2\2\u02bd\u02be\7J\2\2\u02be\u02bf\7V\2\2\u02bf\u008e\3\2\2"+ + "\2\u02c0\u02c1\7T\2\2\u02c1\u02c2\7N\2\2\u02c2\u02c3\7K\2\2\u02c3\u02c4"+ + "\7M\2\2\u02c4\u02c5\7G\2\2\u02c5\u0090\3\2\2\2\u02c6\u02c7\7S\2\2\u02c7"+ + "\u02c8\7W\2\2\u02c8\u02c9\7G\2\2\u02c9\u02ca\7T\2\2\u02ca\u02cb\7[\2\2"+ + "\u02cb\u0092\3\2\2\2\u02cc\u02cd\7U\2\2\u02cd\u02ce\7E\2\2\u02ce\u02cf"+ + "\7J\2\2\u02cf\u02d0\7G\2\2\u02d0\u02d1\7O\2\2\u02d1\u02d2\7C\2\2\u02d2"+ + "\u02d3\7U\2\2\u02d3\u0094\3\2\2\2\u02d4\u02d5\7U\2\2\u02d5\u02d6\7G\2"+ + "\2\u02d6\u02d7\7E\2\2\u02d7\u02d8\7Q\2\2\u02d8\u02d9\7P\2\2\u02d9\u02da"+ + "\7F\2\2\u02da\u0096\3\2\2\2\u02db\u02dc\7U\2\2\u02dc\u02dd\7G\2\2\u02dd"+ + "\u02de\7E\2\2\u02de\u02df\7Q\2\2\u02df\u02e0\7P\2\2\u02e0\u02e1\7F\2\2"+ + "\u02e1\u02e2\7U\2\2\u02e2\u0098\3\2\2\2\u02e3\u02e4\7U\2\2\u02e4\u02e5"+ + "\7G\2\2\u02e5\u02e6\7N\2\2\u02e6\u02e7\7G\2\2\u02e7\u02e8\7E\2\2\u02e8"+ + "\u02e9\7V\2\2\u02e9\u009a\3\2\2\2\u02ea\u02eb\7U\2\2\u02eb\u02ec\7J\2"+ + "\2\u02ec\u02ed\7Q\2\2\u02ed\u02ee\7Y\2\2\u02ee\u009c\3\2\2\2\u02ef\u02f0"+ + "\7U\2\2\u02f0\u02f1\7[\2\2\u02f1\u02f2\7U\2\2\u02f2\u009e\3\2\2\2\u02f3"+ + "\u02f4\7V\2\2\u02f4\u02f5\7C\2\2\u02f5\u02f6\7D\2\2\u02f6\u02f7\7N\2\2"+ + "\u02f7\u02f8\7G\2\2\u02f8\u00a0\3\2\2\2\u02f9\u02fa\7V\2\2\u02fa\u02fb"+ + "\7C\2\2\u02fb\u02fc\7D\2\2\u02fc\u02fd\7N\2\2\u02fd\u02fe\7G\2\2\u02fe"+ + "\u02ff\7U\2\2\u02ff\u00a2\3\2\2\2\u0300\u0301\7V\2\2\u0301\u0302\7G\2"+ + "\2\u0302\u0303\7Z\2\2\u0303\u0304\7V\2\2\u0304\u00a4\3\2\2\2\u0305\u0306"+ + "\7V\2\2\u0306\u0307\7T\2\2\u0307\u0308\7W\2\2\u0308\u0309\7G\2\2\u0309"+ + "\u00a6\3\2\2\2\u030a\u030b\7V\2\2\u030b\u030c\7Q\2\2\u030c\u00a8\3\2\2"+ + "\2\u030d\u030e\7V\2\2\u030e\u030f\7[\2\2\u030f\u0310\7R\2\2\u0310\u0311"+ + "\7G\2\2\u0311\u00aa\3\2\2\2\u0312\u0313\7V\2\2\u0313\u0314\7[\2\2\u0314"+ + "\u0315\7R\2\2\u0315\u0316\7G\2\2\u0316\u0317\7U\2\2\u0317\u00ac\3\2\2"+ + "\2\u0318\u0319\7W\2\2\u0319\u031a\7U\2\2\u031a\u031b\7K\2\2\u031b\u031c"+ + "\7P\2\2\u031c\u031d\7I\2\2\u031d\u00ae\3\2\2\2\u031e\u031f\7X\2\2\u031f"+ + "\u0320\7G\2\2\u0320\u0321\7T\2\2\u0321\u0322\7K\2\2\u0322\u0323\7H\2\2"+ + "\u0323\u0324\7[\2\2\u0324\u00b0\3\2\2\2\u0325\u0326\7Y\2\2\u0326\u0327"+ + "\7J\2\2\u0327\u0328\7G\2\2\u0328\u0329\7T\2\2\u0329\u032a\7G\2\2\u032a"+ + "\u00b2\3\2\2\2\u032b\u032c\7Y\2\2\u032c\u032d\7K\2\2\u032d\u032e\7V\2"+ + "\2\u032e\u032f\7J\2\2\u032f\u00b4\3\2\2\2\u0330\u0331\7[\2\2\u0331\u0332"+ + "\7G\2\2\u0332\u0333\7C\2\2\u0333\u0334\7T\2\2\u0334\u00b6\3\2\2\2\u0335"+ + "\u0336\7[\2\2\u0336\u0337\7G\2\2\u0337\u0338\7C\2\2\u0338\u0339\7T\2\2"+ + "\u0339\u033a\7U\2\2\u033a\u00b8\3\2\2\2\u033b\u033c\7}\2\2\u033c\u033d"+ + "\7G\2\2\u033d\u033e\7U\2\2\u033e\u033f\7E\2\2\u033f\u0340\7C\2\2\u0340"+ + "\u0341\7R\2\2\u0341\u0342\7G\2\2\u0342\u00ba\3\2\2\2\u0343\u0344\7}\2"+ + "\2\u0344\u0345\7H\2\2\u0345\u0346\7P\2\2\u0346\u00bc\3\2\2\2\u0347\u0348"+ + "\7}\2\2\u0348\u0349\7N\2\2\u0349\u034a\7K\2\2\u034a\u034b\7O\2\2\u034b"+ + "\u034c\7K\2\2\u034c\u034d\7V\2\2\u034d\u00be\3\2\2\2\u034e\u034f\7}\2"+ + "\2\u034f\u0350\7F\2\2\u0350\u00c0\3\2\2\2\u0351\u0352\7}\2\2\u0352\u0353"+ + "\7V\2\2\u0353\u00c2\3\2\2\2\u0354\u0355\7}\2\2\u0355\u0356\7V\2\2\u0356"+ + "\u0357\7U\2\2\u0357\u00c4\3\2\2\2\u0358\u0359\7}\2\2\u0359\u035a\7I\2"+ + "\2\u035a\u035b\7W\2\2\u035b\u035c\7K\2\2\u035c\u035d\7F\2\2\u035d\u00c6"+ + "\3\2\2\2\u035e\u035f\7\177\2\2\u035f\u00c8\3\2\2\2\u0360\u0361\7?\2\2"+ + "\u0361\u00ca\3\2\2\2\u0362\u0363\7>\2\2\u0363\u0364\7?\2\2\u0364\u0365"+ + "\7@\2\2\u0365\u00cc\3\2\2\2\u0366\u0367\7>\2\2\u0367\u036b\7@\2\2\u0368"+ + "\u0369\7#\2\2\u0369\u036b\7?\2\2\u036a\u0366\3\2\2\2\u036a\u0368\3\2\2"+ + "\2\u036b\u00ce\3\2\2\2\u036c\u036d\7>\2\2\u036d\u00d0\3\2\2\2\u036e\u036f"+ + "\7>\2\2\u036f\u0370\7?\2\2\u0370\u00d2\3\2\2\2\u0371\u0372\7@\2\2\u0372"+ + "\u00d4\3\2\2\2\u0373\u0374\7@\2\2\u0374\u0375\7?\2\2\u0375\u00d6\3\2\2"+ + "\2\u0376\u0377\7-\2\2\u0377\u00d8\3\2\2\2\u0378\u0379\7/\2\2\u0379\u00da"+ + "\3\2\2\2\u037a\u037b\7,\2\2\u037b\u00dc\3\2\2\2\u037c\u037d\7\61\2\2\u037d"+ + "\u00de\3\2\2\2\u037e\u037f\7\'\2\2\u037f\u00e0\3\2\2\2\u0380\u0381\7<"+ + "\2\2\u0381\u0382\7<\2\2\u0382\u00e2\3\2\2\2\u0383\u0384\7~\2\2\u0384\u0385"+ + "\7~\2\2\u0385\u00e4\3\2\2\2\u0386\u0387\7\60\2\2\u0387\u00e6\3\2\2\2\u0388"+ + "\u0389\7A\2\2\u0389\u00e8\3\2\2\2\u038a\u0390\7)\2\2\u038b\u038f\n\2\2"+ + "\2\u038c\u038d\7)\2\2\u038d\u038f\7)\2\2\u038e\u038b\3\2\2\2\u038e\u038c"+ + "\3\2\2\2\u038f\u0392\3\2\2\2\u0390\u038e\3\2\2\2\u0390\u0391\3\2\2\2\u0391"+ + "\u0393\3\2\2\2\u0392\u0390\3\2\2\2\u0393\u0394\7)\2\2\u0394\u00ea\3\2"+ + "\2\2\u0395\u0397\5\u00fb~\2\u0396\u0395\3\2\2\2\u0397\u0398\3\2\2\2\u0398"+ + "\u0396\3\2\2\2\u0398\u0399\3\2\2\2\u0399\u00ec\3\2\2\2\u039a\u039c\5\u00fb"+ + "~\2\u039b\u039a\3\2\2\2\u039c\u039d\3\2\2\2\u039d\u039b\3\2\2\2\u039d"+ + "\u039e\3\2\2\2\u039e\u039f\3\2\2\2\u039f\u03a3\5\u00e5s\2\u03a0\u03a2"+ + "\5\u00fb~\2\u03a1\u03a0\3\2\2\2\u03a2\u03a5\3\2\2\2\u03a3\u03a1\3\2\2"+ + "\2\u03a3\u03a4\3\2\2\2\u03a4\u03c5\3\2\2\2\u03a5\u03a3\3\2\2\2\u03a6\u03a8"+ + "\5\u00e5s\2\u03a7\u03a9\5\u00fb~\2\u03a8\u03a7\3\2\2\2\u03a9\u03aa\3\2"+ + "\2\2\u03aa\u03a8\3\2\2\2\u03aa\u03ab\3\2\2\2\u03ab\u03c5\3\2\2\2\u03ac"+ + "\u03ae\5\u00fb~\2\u03ad\u03ac\3\2\2\2\u03ae\u03af\3\2\2\2\u03af\u03ad"+ + "\3\2\2\2\u03af\u03b0\3\2\2\2\u03b0\u03b8\3\2\2\2\u03b1\u03b5\5\u00e5s"+ + "\2\u03b2\u03b4\5\u00fb~\2\u03b3\u03b2\3\2\2\2\u03b4\u03b7\3\2\2\2\u03b5"+ + "\u03b3\3\2\2\2\u03b5\u03b6\3\2\2\2\u03b6\u03b9\3\2\2\2\u03b7\u03b5\3\2"+ + "\2\2\u03b8\u03b1\3\2\2\2\u03b8\u03b9\3\2\2\2\u03b9\u03ba\3\2\2\2\u03ba"+ + "\u03bb\5\u00f9}\2\u03bb\u03c5\3\2\2\2\u03bc\u03be\5\u00e5s\2\u03bd\u03bf"+ + "\5\u00fb~\2\u03be\u03bd\3\2\2\2\u03bf\u03c0\3\2\2\2\u03c0\u03be\3\2\2"+ + "\2\u03c0\u03c1\3\2\2\2\u03c1\u03c2\3\2\2\2\u03c2\u03c3\5\u00f9}\2\u03c3"+ + "\u03c5\3\2\2\2\u03c4\u039b\3\2\2\2\u03c4\u03a6\3\2\2\2\u03c4\u03ad\3\2"+ + "\2\2\u03c4\u03bc\3\2\2\2\u03c5\u00ee\3\2\2\2\u03c6\u03c9\5\u00fd\177\2"+ + "\u03c7\u03c9\7a\2\2\u03c8\u03c6\3\2\2\2\u03c8\u03c7\3\2\2\2\u03c9\u03cf"+ + "\3\2\2\2\u03ca\u03ce\5\u00fd\177\2\u03cb\u03ce\5\u00fb~\2\u03cc\u03ce"+ + "\t\3\2\2\u03cd\u03ca\3\2\2\2\u03cd\u03cb\3\2\2\2\u03cd\u03cc\3\2\2\2\u03ce"+ + "\u03d1\3\2\2\2\u03cf\u03cd\3\2\2\2\u03cf\u03d0\3\2\2\2\u03d0\u00f0\3\2"+ + "\2\2\u03d1\u03cf\3\2\2\2\u03d2\u03d6\5\u00fb~\2\u03d3\u03d7\5\u00fd\177"+ + "\2\u03d4\u03d7\5\u00fb~\2\u03d5\u03d7\t\3\2\2\u03d6\u03d3\3\2\2\2\u03d6"+ + "\u03d4\3\2\2\2\u03d6\u03d5\3\2\2\2\u03d7\u03d8\3\2\2\2\u03d8\u03d6\3\2"+ + "\2\2\u03d8\u03d9\3\2\2\2\u03d9\u00f2\3\2\2\2\u03da\u03de\5\u00fd\177\2"+ + "\u03db\u03de\5\u00fb~\2\u03dc\u03de\7a\2\2\u03dd\u03da\3\2\2\2\u03dd\u03db"+ + "\3\2\2\2\u03dd\u03dc\3\2\2\2\u03de\u03df\3\2\2\2\u03df\u03dd\3\2\2\2\u03df"+ + "\u03e0\3\2\2\2\u03e0\u00f4\3\2\2\2\u03e1\u03e7\7$\2\2\u03e2\u03e6\n\4"+ + "\2\2\u03e3\u03e4\7$\2\2\u03e4\u03e6\7$\2\2\u03e5\u03e2\3\2\2\2\u03e5\u03e3"+ + "\3\2\2\2\u03e6\u03e9\3\2\2\2\u03e7\u03e5\3\2\2\2\u03e7\u03e8\3\2\2\2\u03e8"+ + "\u03ea\3\2\2\2\u03e9\u03e7\3\2\2\2\u03ea\u03eb\7$\2\2\u03eb\u00f6\3\2"+ + "\2\2\u03ec\u03f2\7b\2\2\u03ed\u03f1\n\5\2\2\u03ee\u03ef\7b\2\2\u03ef\u03f1"+ + "\7b\2\2\u03f0\u03ed\3\2\2\2\u03f0\u03ee\3\2\2\2\u03f1\u03f4\3\2\2\2\u03f2"+ + "\u03f0\3\2\2\2\u03f2\u03f3\3\2\2\2\u03f3\u03f5\3\2\2\2\u03f4\u03f2\3\2"+ + "\2\2\u03f5\u03f6\7b\2\2\u03f6\u00f8\3\2\2\2\u03f7\u03f9\7G\2\2\u03f8\u03fa"+ + "\t\6\2\2\u03f9\u03f8\3\2\2\2\u03f9\u03fa\3\2\2\2\u03fa\u03fc\3\2\2\2\u03fb"+ + "\u03fd\5\u00fb~\2\u03fc\u03fb\3\2\2\2\u03fd\u03fe\3\2\2\2\u03fe\u03fc"+ + "\3\2\2\2\u03fe\u03ff\3\2\2\2\u03ff\u00fa\3\2\2\2\u0400\u0401\t\7\2\2\u0401"+ + "\u00fc\3\2\2\2\u0402\u0403\t\b\2\2\u0403\u00fe\3\2\2\2\u0404\u0405\7/"+ + "\2\2\u0405\u0406\7/\2\2\u0406\u040a\3\2\2\2\u0407\u0409\n\t\2\2\u0408"+ + "\u0407\3\2\2\2\u0409\u040c\3\2\2\2\u040a\u0408\3\2\2\2\u040a\u040b\3\2"+ + "\2\2\u040b\u040e\3\2\2\2\u040c\u040a\3\2\2\2\u040d\u040f\7\17\2\2\u040e"+ + "\u040d\3\2\2\2\u040e\u040f\3\2\2\2\u040f\u0411\3\2\2\2\u0410\u0412\7\f"+ + "\2\2\u0411\u0410\3\2\2\2\u0411\u0412\3\2\2\2\u0412\u0413\3\2\2\2\u0413"+ + "\u0414\b\u0080\2\2\u0414\u0100\3\2\2\2\u0415\u0416\7\61\2\2\u0416\u0417"+ + "\7,\2\2\u0417\u041c\3\2\2\2\u0418\u041b\5\u0101\u0081\2\u0419\u041b\13"+ + "\2\2\2\u041a\u0418\3\2\2\2\u041a\u0419\3\2\2\2\u041b\u041e\3\2\2\2\u041c"+ + "\u041d\3\2\2\2\u041c\u041a\3\2\2\2\u041d\u041f\3\2\2\2\u041e\u041c\3\2"+ + "\2\2\u041f\u0420\7,\2\2\u0420\u0421\7\61\2\2\u0421\u0422\3\2\2\2\u0422"+ + "\u0423\b\u0081\2\2\u0423\u0102\3\2\2\2\u0424\u0426\t\n\2\2\u0425\u0424"+ + "\3\2\2\2\u0426\u0427\3\2\2\2\u0427\u0425\3\2\2\2\u0427\u0428\3\2\2\2\u0428"+ + "\u0429\3\2\2\2\u0429\u042a\b\u0082\2\2\u042a\u0104\3\2\2\2\u042b\u042c"+ + "\13\2\2\2\u042c\u0106\3\2\2\2\"\2\u036a\u038e\u0390\u0398\u039d\u03a3"+ + "\u03aa\u03af\u03b5\u03b8\u03c0\u03c4\u03c8\u03cd\u03cf\u03d6\u03d8\u03dd"+ + "\u03df\u03e5\u03e7\u03f0\u03f2\u03f9\u03fe\u040a\u040e\u0411\u041a\u041c"+ + "\u0427\3\2\3\2"; public static final ATN _ATN = new ATNDeserializer().deserialize(_serializedATN.toCharArray()); static { diff --git a/x-pack/plugin/sql/src/main/java/org/elasticsearch/xpack/sql/parser/SqlBaseListener.java b/x-pack/plugin/sql/src/main/java/org/elasticsearch/xpack/sql/parser/SqlBaseListener.java index 7b5a8ea5fbad9..d6ad9907b6fbf 100644 --- a/x-pack/plugin/sql/src/main/java/org/elasticsearch/xpack/sql/parser/SqlBaseListener.java +++ b/x-pack/plugin/sql/src/main/java/org/elasticsearch/xpack/sql/parser/SqlBaseListener.java @@ -549,6 +549,18 @@ interface SqlBaseListener extends ParseTreeListener { * @param ctx the parse tree */ void exitComparison(SqlBaseParser.ComparisonContext ctx); + /** + * Enter a parse tree produced by the {@code castOperatorExpression} + * labeled alternative in {@link SqlBaseParser#valueExpression}. + * @param ctx the parse tree + */ + void enterCastOperatorExpression(SqlBaseParser.CastOperatorExpressionContext ctx); + /** + * Exit a parse tree produced by the {@code castOperatorExpression} + * labeled alternative in {@link SqlBaseParser#valueExpression}. + * @param ctx the parse tree + */ + void exitCastOperatorExpression(SqlBaseParser.CastOperatorExpressionContext ctx); /** * Enter a parse tree produced by the {@code arithmeticBinary} * labeled alternative in {@link SqlBaseParser#valueExpression}. @@ -681,6 +693,16 @@ interface SqlBaseListener extends ParseTreeListener { * @param ctx the parse tree */ void exitParenthesizedExpression(SqlBaseParser.ParenthesizedExpressionContext ctx); + /** + * Enter a parse tree produced by {@link SqlBaseParser#builtinDateTimeFunction}. + * @param ctx the parse tree + */ + void enterBuiltinDateTimeFunction(SqlBaseParser.BuiltinDateTimeFunctionContext ctx); + /** + * Exit a parse tree produced by {@link SqlBaseParser#builtinDateTimeFunction}. + * @param ctx the parse tree + */ + void exitBuiltinDateTimeFunction(SqlBaseParser.BuiltinDateTimeFunctionContext ctx); /** * Enter a parse tree produced by {@link SqlBaseParser#castExpression}. * @param ctx the parse tree @@ -701,16 +723,6 @@ interface SqlBaseListener extends ParseTreeListener { * @param ctx the parse tree */ void exitCastTemplate(SqlBaseParser.CastTemplateContext ctx); - /** - * Enter a parse tree produced by {@link SqlBaseParser#builtinDateTimeFunction}. - * @param ctx the parse tree - */ - void enterBuiltinDateTimeFunction(SqlBaseParser.BuiltinDateTimeFunctionContext ctx); - /** - * Exit a parse tree produced by {@link SqlBaseParser#builtinDateTimeFunction}. - * @param ctx the parse tree - */ - void exitBuiltinDateTimeFunction(SqlBaseParser.BuiltinDateTimeFunctionContext ctx); /** * Enter a parse tree produced by {@link SqlBaseParser#convertTemplate}. * @param ctx the parse tree diff --git a/x-pack/plugin/sql/src/main/java/org/elasticsearch/xpack/sql/parser/SqlBaseParser.java b/x-pack/plugin/sql/src/main/java/org/elasticsearch/xpack/sql/parser/SqlBaseParser.java index a690169409e81..34af98c1afcdf 100644 --- a/x-pack/plugin/sql/src/main/java/org/elasticsearch/xpack/sql/parser/SqlBaseParser.java +++ b/x-pack/plugin/sql/src/main/java/org/elasticsearch/xpack/sql/parser/SqlBaseParser.java @@ -32,10 +32,10 @@ class SqlBaseParser extends Parser { WITH=89, YEAR=90, YEARS=91, ESCAPE_ESC=92, FUNCTION_ESC=93, LIMIT_ESC=94, DATE_ESC=95, TIME_ESC=96, TIMESTAMP_ESC=97, GUID_ESC=98, ESC_END=99, EQ=100, NULLEQ=101, NEQ=102, LT=103, LTE=104, GT=105, GTE=106, PLUS=107, MINUS=108, - ASTERISK=109, SLASH=110, PERCENT=111, CONCAT=112, DOT=113, PARAM=114, - STRING=115, INTEGER_VALUE=116, DECIMAL_VALUE=117, IDENTIFIER=118, DIGIT_IDENTIFIER=119, - TABLE_IDENTIFIER=120, QUOTED_IDENTIFIER=121, BACKQUOTED_IDENTIFIER=122, - SIMPLE_COMMENT=123, BRACKETED_COMMENT=124, WS=125, UNRECOGNIZED=126, DELIMITER=127; + ASTERISK=109, SLASH=110, PERCENT=111, CAST_OP=112, CONCAT=113, DOT=114, + PARAM=115, STRING=116, INTEGER_VALUE=117, DECIMAL_VALUE=118, IDENTIFIER=119, + DIGIT_IDENTIFIER=120, TABLE_IDENTIFIER=121, QUOTED_IDENTIFIER=122, BACKQUOTED_IDENTIFIER=123, + SIMPLE_COMMENT=124, BRACKETED_COMMENT=125, WS=126, UNRECOGNIZED=127, DELIMITER=128; public static final int RULE_singleStatement = 0, RULE_singleExpression = 1, RULE_statement = 2, RULE_query = 3, RULE_queryNoWith = 4, RULE_limitClause = 5, RULE_queryTerm = 6, @@ -46,7 +46,7 @@ class SqlBaseParser extends Parser { RULE_expression = 21, RULE_booleanExpression = 22, RULE_matchQueryOptions = 23, RULE_predicated = 24, RULE_predicate = 25, RULE_likePattern = 26, RULE_pattern = 27, RULE_patternEscape = 28, RULE_valueExpression = 29, RULE_primaryExpression = 30, - RULE_castExpression = 31, RULE_castTemplate = 32, RULE_builtinDateTimeFunction = 33, + RULE_builtinDateTimeFunction = 31, RULE_castExpression = 32, RULE_castTemplate = 33, RULE_convertTemplate = 34, RULE_extractExpression = 35, RULE_extractTemplate = 36, RULE_functionExpression = 37, RULE_functionTemplate = 38, RULE_functionName = 39, RULE_constant = 40, RULE_comparisonOperator = 41, RULE_booleanValue = 42, @@ -60,8 +60,8 @@ class SqlBaseParser extends Parser { "selectItem", "relation", "joinRelation", "joinType", "joinCriteria", "relationPrimary", "expression", "booleanExpression", "matchQueryOptions", "predicated", "predicate", "likePattern", "pattern", "patternEscape", - "valueExpression", "primaryExpression", "castExpression", "castTemplate", - "builtinDateTimeFunction", "convertTemplate", "extractExpression", "extractTemplate", + "valueExpression", "primaryExpression", "builtinDateTimeFunction", "castExpression", + "castTemplate", "convertTemplate", "extractExpression", "extractTemplate", "functionExpression", "functionTemplate", "functionName", "constant", "comparisonOperator", "booleanValue", "interval", "intervalField", "dataType", "qualifiedName", "identifier", "tableIdentifier", "quoteIdentifier", "unquoteIdentifier", @@ -84,8 +84,8 @@ class SqlBaseParser extends Parser { "'TEXT'", "'TRUE'", "'TO'", "'TYPE'", "'TYPES'", "'USING'", "'VERIFY'", "'WHERE'", "'WITH'", "'YEAR'", "'YEARS'", "'{ESCAPE'", "'{FN'", "'{LIMIT'", "'{D'", "'{T'", "'{TS'", "'{GUID'", "'}'", "'='", "'<=>'", null, "'<'", - "'<='", "'>'", "'>='", "'+'", "'-'", "'*'", "'/'", "'%'", "'||'", "'.'", - "'?'" + "'<='", "'>'", "'>='", "'+'", "'-'", "'*'", "'/'", "'%'", "'::'", "'||'", + "'.'", "'?'" }; private static final String[] _SYMBOLIC_NAMES = { null, null, null, null, null, "ALL", "ANALYZE", "ANALYZED", "AND", "ANY", @@ -102,7 +102,7 @@ class SqlBaseParser extends Parser { "WITH", "YEAR", "YEARS", "ESCAPE_ESC", "FUNCTION_ESC", "LIMIT_ESC", "DATE_ESC", "TIME_ESC", "TIMESTAMP_ESC", "GUID_ESC", "ESC_END", "EQ", "NULLEQ", "NEQ", "LT", "LTE", "GT", "GTE", "PLUS", "MINUS", "ASTERISK", "SLASH", "PERCENT", - "CONCAT", "DOT", "PARAM", "STRING", "INTEGER_VALUE", "DECIMAL_VALUE", + "CAST_OP", "CONCAT", "DOT", "PARAM", "STRING", "INTEGER_VALUE", "DECIMAL_VALUE", "IDENTIFIER", "DIGIT_IDENTIFIER", "TABLE_IDENTIFIER", "QUOTED_IDENTIFIER", "BACKQUOTED_IDENTIFIER", "SIMPLE_COMMENT", "BRACKETED_COMMENT", "WS", "UNRECOGNIZED", "DELIMITER" @@ -3723,6 +3723,29 @@ public T accept(ParseTreeVisitor visitor) { else return visitor.visitChildren(this); } } + public static class CastOperatorExpressionContext extends ValueExpressionContext { + public ValueExpressionContext valueExpression() { + return getRuleContext(ValueExpressionContext.class,0); + } + public TerminalNode CAST_OP() { return getToken(SqlBaseParser.CAST_OP, 0); } + public DataTypeContext dataType() { + return getRuleContext(DataTypeContext.class,0); + } + public CastOperatorExpressionContext(ValueExpressionContext ctx) { copyFrom(ctx); } + @Override + public void enterRule(ParseTreeListener listener) { + if ( listener instanceof SqlBaseListener ) ((SqlBaseListener)listener).enterCastOperatorExpression(this); + } + @Override + public void exitRule(ParseTreeListener listener) { + if ( listener instanceof SqlBaseListener ) ((SqlBaseListener)listener).exitCastOperatorExpression(this); + } + @Override + public T accept(ParseTreeVisitor visitor) { + if ( visitor instanceof SqlBaseVisitor ) return ((SqlBaseVisitor)visitor).visitCastOperatorExpression(this); + else return visitor.visitChildren(this); + } + } public static class ArithmeticBinaryContext extends ValueExpressionContext { public ValueExpressionContext left; public Token operator; @@ -3879,14 +3902,14 @@ private ValueExpressionContext valueExpression(int _p) throws RecognitionExcepti consume(); } setState(551); - valueExpression(4); + valueExpression(5); } break; default: throw new NoViableAltException(this); } _ctx.stop = _input.LT(-1); - setState(566); + setState(569); _errHandler.sync(this); _alt = getInterpreter().adaptivePredict(_input,77,_ctx); while ( _alt!=2 && _alt!=org.antlr.v4.runtime.atn.ATN.INVALID_ALT_NUMBER ) { @@ -3894,7 +3917,7 @@ private ValueExpressionContext valueExpression(int _p) throws RecognitionExcepti if ( _parseListeners!=null ) triggerExitRuleEvent(); _prevctx = _localctx; { - setState(564); + setState(567); _errHandler.sync(this); switch ( getInterpreter().adaptivePredict(_input,76,_ctx) ) { case 1: @@ -3903,7 +3926,7 @@ private ValueExpressionContext valueExpression(int _p) throws RecognitionExcepti ((ArithmeticBinaryContext)_localctx).left = _prevctx; pushNewRecursionContext(_localctx, _startState, RULE_valueExpression); setState(554); - if (!(precpred(_ctx, 3))) throw new FailedPredicateException(this, "precpred(_ctx, 3)"); + if (!(precpred(_ctx, 4))) throw new FailedPredicateException(this, "precpred(_ctx, 4)"); setState(555); ((ArithmeticBinaryContext)_localctx).operator = _input.LT(1); _la = _input.LA(1); @@ -3913,7 +3936,7 @@ private ValueExpressionContext valueExpression(int _p) throws RecognitionExcepti consume(); } setState(556); - ((ArithmeticBinaryContext)_localctx).right = valueExpression(4); + ((ArithmeticBinaryContext)_localctx).right = valueExpression(5); } break; case 2: @@ -3922,7 +3945,7 @@ private ValueExpressionContext valueExpression(int _p) throws RecognitionExcepti ((ArithmeticBinaryContext)_localctx).left = _prevctx; pushNewRecursionContext(_localctx, _startState, RULE_valueExpression); setState(557); - if (!(precpred(_ctx, 2))) throw new FailedPredicateException(this, "precpred(_ctx, 2)"); + if (!(precpred(_ctx, 3))) throw new FailedPredicateException(this, "precpred(_ctx, 3)"); setState(558); ((ArithmeticBinaryContext)_localctx).operator = _input.LT(1); _la = _input.LA(1); @@ -3932,7 +3955,7 @@ private ValueExpressionContext valueExpression(int _p) throws RecognitionExcepti consume(); } setState(559); - ((ArithmeticBinaryContext)_localctx).right = valueExpression(3); + ((ArithmeticBinaryContext)_localctx).right = valueExpression(4); } break; case 3: @@ -3941,17 +3964,29 @@ private ValueExpressionContext valueExpression(int _p) throws RecognitionExcepti ((ComparisonContext)_localctx).left = _prevctx; pushNewRecursionContext(_localctx, _startState, RULE_valueExpression); setState(560); - if (!(precpred(_ctx, 1))) throw new FailedPredicateException(this, "precpred(_ctx, 1)"); + if (!(precpred(_ctx, 2))) throw new FailedPredicateException(this, "precpred(_ctx, 2)"); setState(561); comparisonOperator(); setState(562); - ((ComparisonContext)_localctx).right = valueExpression(2); + ((ComparisonContext)_localctx).right = valueExpression(3); + } + break; + case 4: + { + _localctx = new CastOperatorExpressionContext(new ValueExpressionContext(_parentctx, _parentState)); + pushNewRecursionContext(_localctx, _startState, RULE_valueExpression); + setState(564); + if (!(precpred(_ctx, 1))) throw new FailedPredicateException(this, "precpred(_ctx, 1)"); + setState(565); + match(CAST_OP); + setState(566); + dataType(); } break; } } } - setState(568); + setState(571); _errHandler.sync(this); _alt = getInterpreter().adaptivePredict(_input,77,_ctx); } @@ -4158,14 +4193,14 @@ public final PrimaryExpressionContext primaryExpression() throws RecognitionExce enterRule(_localctx, 60, RULE_primaryExpression); int _la; try { - setState(589); + setState(592); _errHandler.sync(this); switch ( getInterpreter().adaptivePredict(_input,79,_ctx) ) { case 1: _localctx = new CastContext(_localctx); enterOuterAlt(_localctx, 1); { - setState(569); + setState(572); castExpression(); } break; @@ -4173,7 +4208,7 @@ public final PrimaryExpressionContext primaryExpression() throws RecognitionExce _localctx = new ExtractContext(_localctx); enterOuterAlt(_localctx, 2); { - setState(570); + setState(573); extractExpression(); } break; @@ -4181,7 +4216,7 @@ public final PrimaryExpressionContext primaryExpression() throws RecognitionExce _localctx = new CurrentDateTimeFunctionContext(_localctx); enterOuterAlt(_localctx, 3); { - setState(571); + setState(574); builtinDateTimeFunction(); } break; @@ -4189,7 +4224,7 @@ public final PrimaryExpressionContext primaryExpression() throws RecognitionExce _localctx = new ConstantDefaultContext(_localctx); enterOuterAlt(_localctx, 4); { - setState(572); + setState(575); constant(); } break; @@ -4197,18 +4232,18 @@ public final PrimaryExpressionContext primaryExpression() throws RecognitionExce _localctx = new StarContext(_localctx); enterOuterAlt(_localctx, 5); { - setState(576); + setState(579); _la = _input.LA(1); if ((((_la) & ~0x3f) == 0 && ((1L << _la) & ((1L << ANALYZE) | (1L << ANALYZED) | (1L << CATALOGS) | (1L << COLUMNS) | (1L << DAY) | (1L << DEBUG) | (1L << EXECUTABLE) | (1L << EXPLAIN) | (1L << FIRST) | (1L << FORMAT) | (1L << FULL) | (1L << FUNCTIONS) | (1L << GRAPHVIZ) | (1L << HOUR) | (1L << INTERVAL) | (1L << LAST) | (1L << LIMIT) | (1L << MAPPED) | (1L << MINUTE) | (1L << MONTH) | (1L << OPTIMIZED))) != 0) || ((((_la - 67)) & ~0x3f) == 0 && ((1L << (_la - 67)) & ((1L << (PARSED - 67)) | (1L << (PHYSICAL - 67)) | (1L << (PLAN - 67)) | (1L << (RLIKE - 67)) | (1L << (QUERY - 67)) | (1L << (SCHEMAS - 67)) | (1L << (SECOND - 67)) | (1L << (SHOW - 67)) | (1L << (SYS - 67)) | (1L << (TABLES - 67)) | (1L << (TEXT - 67)) | (1L << (TYPE - 67)) | (1L << (TYPES - 67)) | (1L << (VERIFY - 67)) | (1L << (YEAR - 67)) | (1L << (IDENTIFIER - 67)) | (1L << (DIGIT_IDENTIFIER - 67)) | (1L << (QUOTED_IDENTIFIER - 67)) | (1L << (BACKQUOTED_IDENTIFIER - 67)))) != 0)) { { - setState(573); + setState(576); qualifiedName(); - setState(574); + setState(577); match(DOT); } } - setState(578); + setState(581); match(ASTERISK); } break; @@ -4216,7 +4251,7 @@ public final PrimaryExpressionContext primaryExpression() throws RecognitionExce _localctx = new FunctionContext(_localctx); enterOuterAlt(_localctx, 6); { - setState(579); + setState(582); functionExpression(); } break; @@ -4224,11 +4259,11 @@ public final PrimaryExpressionContext primaryExpression() throws RecognitionExce _localctx = new SubqueryExpressionContext(_localctx); enterOuterAlt(_localctx, 7); { - setState(580); + setState(583); match(T__0); - setState(581); + setState(584); query(); - setState(582); + setState(585); match(T__1); } break; @@ -4236,7 +4271,7 @@ public final PrimaryExpressionContext primaryExpression() throws RecognitionExce _localctx = new DereferenceContext(_localctx); enterOuterAlt(_localctx, 8); { - setState(584); + setState(587); qualifiedName(); } break; @@ -4244,11 +4279,11 @@ public final PrimaryExpressionContext primaryExpression() throws RecognitionExce _localctx = new ParenthesizedExpressionContext(_localctx); enterOuterAlt(_localctx, 9); { - setState(585); + setState(588); match(T__0); - setState(586); + setState(589); expression(); - setState(587); + setState(590); match(T__1); } break; @@ -4265,6 +4300,100 @@ public final PrimaryExpressionContext primaryExpression() throws RecognitionExce return _localctx; } + public static class BuiltinDateTimeFunctionContext extends ParserRuleContext { + public Token name; + public Token precision; + public TerminalNode CURRENT_DATE() { return getToken(SqlBaseParser.CURRENT_DATE, 0); } + public TerminalNode CURRENT_TIMESTAMP() { return getToken(SqlBaseParser.CURRENT_TIMESTAMP, 0); } + public TerminalNode INTEGER_VALUE() { return getToken(SqlBaseParser.INTEGER_VALUE, 0); } + public BuiltinDateTimeFunctionContext(ParserRuleContext parent, int invokingState) { + super(parent, invokingState); + } + @Override public int getRuleIndex() { return RULE_builtinDateTimeFunction; } + @Override + public void enterRule(ParseTreeListener listener) { + if ( listener instanceof SqlBaseListener ) ((SqlBaseListener)listener).enterBuiltinDateTimeFunction(this); + } + @Override + public void exitRule(ParseTreeListener listener) { + if ( listener instanceof SqlBaseListener ) ((SqlBaseListener)listener).exitBuiltinDateTimeFunction(this); + } + @Override + public T accept(ParseTreeVisitor visitor) { + if ( visitor instanceof SqlBaseVisitor ) return ((SqlBaseVisitor)visitor).visitBuiltinDateTimeFunction(this); + else return visitor.visitChildren(this); + } + } + + public final BuiltinDateTimeFunctionContext builtinDateTimeFunction() throws RecognitionException { + BuiltinDateTimeFunctionContext _localctx = new BuiltinDateTimeFunctionContext(_ctx, getState()); + enterRule(_localctx, 62, RULE_builtinDateTimeFunction); + int _la; + try { + setState(607); + switch (_input.LA(1)) { + case CURRENT_DATE: + enterOuterAlt(_localctx, 1); + { + setState(594); + ((BuiltinDateTimeFunctionContext)_localctx).name = match(CURRENT_DATE); + setState(597); + _errHandler.sync(this); + switch ( getInterpreter().adaptivePredict(_input,80,_ctx) ) { + case 1: + { + setState(595); + match(T__0); + setState(596); + match(T__1); + } + break; + } + } + break; + case CURRENT_TIMESTAMP: + enterOuterAlt(_localctx, 2); + { + setState(599); + ((BuiltinDateTimeFunctionContext)_localctx).name = match(CURRENT_TIMESTAMP); + setState(605); + _errHandler.sync(this); + switch ( getInterpreter().adaptivePredict(_input,82,_ctx) ) { + case 1: + { + setState(600); + match(T__0); + setState(602); + _la = _input.LA(1); + if (_la==INTEGER_VALUE) { + { + setState(601); + ((BuiltinDateTimeFunctionContext)_localctx).precision = match(INTEGER_VALUE); + } + } + + setState(604); + match(T__1); + } + break; + } + } + break; + default: + throw new NoViableAltException(this); + } + } + catch (RecognitionException re) { + _localctx.exception = re; + _errHandler.reportError(this, re); + _errHandler.recover(this, re); + } + finally { + exitRule(); + } + return _localctx; + } + public static class CastExpressionContext extends ParserRuleContext { public CastTemplateContext castTemplate() { return getRuleContext(CastTemplateContext.class,0); @@ -4295,44 +4424,44 @@ public T accept(ParseTreeVisitor visitor) { public final CastExpressionContext castExpression() throws RecognitionException { CastExpressionContext _localctx = new CastExpressionContext(_ctx, getState()); - enterRule(_localctx, 62, RULE_castExpression); + enterRule(_localctx, 64, RULE_castExpression); try { - setState(601); + setState(619); _errHandler.sync(this); - switch ( getInterpreter().adaptivePredict(_input,80,_ctx) ) { + switch ( getInterpreter().adaptivePredict(_input,84,_ctx) ) { case 1: enterOuterAlt(_localctx, 1); { - setState(591); + setState(609); castTemplate(); } break; case 2: enterOuterAlt(_localctx, 2); { - setState(592); + setState(610); match(FUNCTION_ESC); - setState(593); + setState(611); castTemplate(); - setState(594); + setState(612); match(ESC_END); } break; case 3: enterOuterAlt(_localctx, 3); { - setState(596); + setState(614); convertTemplate(); } break; case 4: enterOuterAlt(_localctx, 4); { - setState(597); + setState(615); match(FUNCTION_ESC); - setState(598); + setState(616); convertTemplate(); - setState(599); + setState(617); match(ESC_END); } break; @@ -4379,21 +4508,21 @@ public T accept(ParseTreeVisitor visitor) { public final CastTemplateContext castTemplate() throws RecognitionException { CastTemplateContext _localctx = new CastTemplateContext(_ctx, getState()); - enterRule(_localctx, 64, RULE_castTemplate); + enterRule(_localctx, 66, RULE_castTemplate); try { enterOuterAlt(_localctx, 1); { - setState(603); + setState(621); match(CAST); - setState(604); + setState(622); match(T__0); - setState(605); + setState(623); expression(); - setState(606); + setState(624); match(AS); - setState(607); + setState(625); dataType(); - setState(608); + setState(626); match(T__1); } } @@ -4408,100 +4537,6 @@ public final CastTemplateContext castTemplate() throws RecognitionException { return _localctx; } - public static class BuiltinDateTimeFunctionContext extends ParserRuleContext { - public Token name; - public Token precision; - public TerminalNode CURRENT_DATE() { return getToken(SqlBaseParser.CURRENT_DATE, 0); } - public TerminalNode CURRENT_TIMESTAMP() { return getToken(SqlBaseParser.CURRENT_TIMESTAMP, 0); } - public TerminalNode INTEGER_VALUE() { return getToken(SqlBaseParser.INTEGER_VALUE, 0); } - public BuiltinDateTimeFunctionContext(ParserRuleContext parent, int invokingState) { - super(parent, invokingState); - } - @Override public int getRuleIndex() { return RULE_builtinDateTimeFunction; } - @Override - public void enterRule(ParseTreeListener listener) { - if ( listener instanceof SqlBaseListener ) ((SqlBaseListener)listener).enterBuiltinDateTimeFunction(this); - } - @Override - public void exitRule(ParseTreeListener listener) { - if ( listener instanceof SqlBaseListener ) ((SqlBaseListener)listener).exitBuiltinDateTimeFunction(this); - } - @Override - public T accept(ParseTreeVisitor visitor) { - if ( visitor instanceof SqlBaseVisitor ) return ((SqlBaseVisitor)visitor).visitBuiltinDateTimeFunction(this); - else return visitor.visitChildren(this); - } - } - - public final BuiltinDateTimeFunctionContext builtinDateTimeFunction() throws RecognitionException { - BuiltinDateTimeFunctionContext _localctx = new BuiltinDateTimeFunctionContext(_ctx, getState()); - enterRule(_localctx, 66, RULE_builtinDateTimeFunction); - int _la; - try { - setState(623); - switch (_input.LA(1)) { - case CURRENT_DATE: - enterOuterAlt(_localctx, 1); - { - setState(610); - ((BuiltinDateTimeFunctionContext)_localctx).name = match(CURRENT_DATE); - setState(613); - _errHandler.sync(this); - switch ( getInterpreter().adaptivePredict(_input,81,_ctx) ) { - case 1: - { - setState(611); - match(T__0); - setState(612); - match(T__1); - } - break; - } - } - break; - case CURRENT_TIMESTAMP: - enterOuterAlt(_localctx, 2); - { - setState(615); - ((BuiltinDateTimeFunctionContext)_localctx).name = match(CURRENT_TIMESTAMP); - setState(621); - _errHandler.sync(this); - switch ( getInterpreter().adaptivePredict(_input,83,_ctx) ) { - case 1: - { - setState(616); - match(T__0); - setState(618); - _la = _input.LA(1); - if (_la==INTEGER_VALUE) { - { - setState(617); - ((BuiltinDateTimeFunctionContext)_localctx).precision = match(INTEGER_VALUE); - } - } - - setState(620); - match(T__1); - } - break; - } - } - break; - default: - throw new NoViableAltException(this); - } - } - catch (RecognitionException re) { - _localctx.exception = re; - _errHandler.reportError(this, re); - _errHandler.recover(this, re); - } - finally { - exitRule(); - } - return _localctx; - } - public static class ConvertTemplateContext extends ParserRuleContext { public TerminalNode CONVERT() { return getToken(SqlBaseParser.CONVERT, 0); } public ExpressionContext expression() { @@ -4535,17 +4570,17 @@ public final ConvertTemplateContext convertTemplate() throws RecognitionExceptio try { enterOuterAlt(_localctx, 1); { - setState(625); + setState(628); match(CONVERT); - setState(626); + setState(629); match(T__0); - setState(627); + setState(630); expression(); - setState(628); + setState(631); match(T__2); - setState(629); + setState(632); dataType(); - setState(630); + setState(633); match(T__1); } } @@ -4589,23 +4624,23 @@ public final ExtractExpressionContext extractExpression() throws RecognitionExce ExtractExpressionContext _localctx = new ExtractExpressionContext(_ctx, getState()); enterRule(_localctx, 70, RULE_extractExpression); try { - setState(637); + setState(640); switch (_input.LA(1)) { case EXTRACT: enterOuterAlt(_localctx, 1); { - setState(632); + setState(635); extractTemplate(); } break; case FUNCTION_ESC: enterOuterAlt(_localctx, 2); { - setState(633); + setState(636); match(FUNCTION_ESC); - setState(634); + setState(637); extractTemplate(); - setState(635); + setState(638); match(ESC_END); } break; @@ -4659,17 +4694,17 @@ public final ExtractTemplateContext extractTemplate() throws RecognitionExceptio try { enterOuterAlt(_localctx, 1); { - setState(639); + setState(642); match(EXTRACT); - setState(640); + setState(643); match(T__0); - setState(641); + setState(644); ((ExtractTemplateContext)_localctx).field = identifier(); - setState(642); + setState(645); match(FROM); - setState(643); + setState(646); valueExpression(0); - setState(644); + setState(647); match(T__1); } } @@ -4712,7 +4747,7 @@ public final FunctionExpressionContext functionExpression() throws RecognitionEx FunctionExpressionContext _localctx = new FunctionExpressionContext(_ctx, getState()); enterRule(_localctx, 74, RULE_functionExpression); try { - setState(651); + setState(654); switch (_input.LA(1)) { case ANALYZE: case ANALYZED: @@ -4758,18 +4793,18 @@ public final FunctionExpressionContext functionExpression() throws RecognitionEx case BACKQUOTED_IDENTIFIER: enterOuterAlt(_localctx, 1); { - setState(646); + setState(649); functionTemplate(); } break; case FUNCTION_ESC: enterOuterAlt(_localctx, 2); { - setState(647); + setState(650); match(FUNCTION_ESC); - setState(648); + setState(651); functionTemplate(); - setState(649); + setState(652); match(ESC_END); } break; @@ -4827,45 +4862,45 @@ public final FunctionTemplateContext functionTemplate() throws RecognitionExcept try { enterOuterAlt(_localctx, 1); { - setState(653); + setState(656); functionName(); - setState(654); + setState(657); match(T__0); - setState(666); + setState(669); _la = _input.LA(1); if ((((_la) & ~0x3f) == 0 && ((1L << _la) & ((1L << T__0) | (1L << ALL) | (1L << ANALYZE) | (1L << ANALYZED) | (1L << CAST) | (1L << CATALOGS) | (1L << COLUMNS) | (1L << CONVERT) | (1L << CURRENT_DATE) | (1L << CURRENT_TIMESTAMP) | (1L << DAY) | (1L << DEBUG) | (1L << DISTINCT) | (1L << EXECUTABLE) | (1L << EXISTS) | (1L << EXPLAIN) | (1L << EXTRACT) | (1L << FALSE) | (1L << FIRST) | (1L << FORMAT) | (1L << FULL) | (1L << FUNCTIONS) | (1L << GRAPHVIZ) | (1L << HOUR) | (1L << INTERVAL) | (1L << LAST) | (1L << LEFT) | (1L << LIMIT) | (1L << MAPPED) | (1L << MATCH) | (1L << MINUTE) | (1L << MONTH) | (1L << NOT) | (1L << NULL) | (1L << OPTIMIZED))) != 0) || ((((_la - 67)) & ~0x3f) == 0 && ((1L << (_la - 67)) & ((1L << (PARSED - 67)) | (1L << (PHYSICAL - 67)) | (1L << (PLAN - 67)) | (1L << (RIGHT - 67)) | (1L << (RLIKE - 67)) | (1L << (QUERY - 67)) | (1L << (SCHEMAS - 67)) | (1L << (SECOND - 67)) | (1L << (SHOW - 67)) | (1L << (SYS - 67)) | (1L << (TABLES - 67)) | (1L << (TEXT - 67)) | (1L << (TRUE - 67)) | (1L << (TYPE - 67)) | (1L << (TYPES - 67)) | (1L << (VERIFY - 67)) | (1L << (YEAR - 67)) | (1L << (FUNCTION_ESC - 67)) | (1L << (DATE_ESC - 67)) | (1L << (TIME_ESC - 67)) | (1L << (TIMESTAMP_ESC - 67)) | (1L << (GUID_ESC - 67)) | (1L << (PLUS - 67)) | (1L << (MINUS - 67)) | (1L << (ASTERISK - 67)) | (1L << (PARAM - 67)) | (1L << (STRING - 67)) | (1L << (INTEGER_VALUE - 67)) | (1L << (DECIMAL_VALUE - 67)) | (1L << (IDENTIFIER - 67)) | (1L << (DIGIT_IDENTIFIER - 67)) | (1L << (QUOTED_IDENTIFIER - 67)) | (1L << (BACKQUOTED_IDENTIFIER - 67)))) != 0)) { { - setState(656); + setState(659); _la = _input.LA(1); if (_la==ALL || _la==DISTINCT) { { - setState(655); + setState(658); setQuantifier(); } } - setState(658); + setState(661); expression(); - setState(663); + setState(666); _errHandler.sync(this); _la = _input.LA(1); while (_la==T__2) { { { - setState(659); + setState(662); match(T__2); - setState(660); + setState(663); expression(); } } - setState(665); + setState(668); _errHandler.sync(this); _la = _input.LA(1); } } } - setState(668); + setState(671); match(T__1); } } @@ -4909,19 +4944,19 @@ public final FunctionNameContext functionName() throws RecognitionException { FunctionNameContext _localctx = new FunctionNameContext(_ctx, getState()); enterRule(_localctx, 78, RULE_functionName); try { - setState(673); + setState(676); switch (_input.LA(1)) { case LEFT: enterOuterAlt(_localctx, 1); { - setState(670); + setState(673); match(LEFT); } break; case RIGHT: enterOuterAlt(_localctx, 2); { - setState(671); + setState(674); match(RIGHT); } break; @@ -4967,7 +5002,7 @@ public final FunctionNameContext functionName() throws RecognitionException { case BACKQUOTED_IDENTIFIER: enterOuterAlt(_localctx, 3); { - setState(672); + setState(675); identifier(); } break; @@ -5198,13 +5233,13 @@ public final ConstantContext constant() throws RecognitionException { enterRule(_localctx, 80, RULE_constant); try { int _alt; - setState(701); + setState(704); switch (_input.LA(1)) { case NULL: _localctx = new NullLiteralContext(_localctx); enterOuterAlt(_localctx, 1); { - setState(675); + setState(678); match(NULL); } break; @@ -5212,7 +5247,7 @@ public final ConstantContext constant() throws RecognitionException { _localctx = new IntervalLiteralContext(_localctx); enterOuterAlt(_localctx, 2); { - setState(676); + setState(679); interval(); } break; @@ -5221,7 +5256,7 @@ public final ConstantContext constant() throws RecognitionException { _localctx = new NumericLiteralContext(_localctx); enterOuterAlt(_localctx, 3); { - setState(677); + setState(680); number(); } break; @@ -5230,7 +5265,7 @@ public final ConstantContext constant() throws RecognitionException { _localctx = new BooleanLiteralContext(_localctx); enterOuterAlt(_localctx, 4); { - setState(678); + setState(681); booleanValue(); } break; @@ -5238,7 +5273,7 @@ public final ConstantContext constant() throws RecognitionException { _localctx = new StringLiteralContext(_localctx); enterOuterAlt(_localctx, 5); { - setState(680); + setState(683); _errHandler.sync(this); _alt = 1; do { @@ -5246,7 +5281,7 @@ public final ConstantContext constant() throws RecognitionException { case 1: { { - setState(679); + setState(682); match(STRING); } } @@ -5254,7 +5289,7 @@ public final ConstantContext constant() throws RecognitionException { default: throw new NoViableAltException(this); } - setState(682); + setState(685); _errHandler.sync(this); _alt = getInterpreter().adaptivePredict(_input,91,_ctx); } while ( _alt!=2 && _alt!=org.antlr.v4.runtime.atn.ATN.INVALID_ALT_NUMBER ); @@ -5264,7 +5299,7 @@ public final ConstantContext constant() throws RecognitionException { _localctx = new ParamLiteralContext(_localctx); enterOuterAlt(_localctx, 6); { - setState(684); + setState(687); match(PARAM); } break; @@ -5272,11 +5307,11 @@ public final ConstantContext constant() throws RecognitionException { _localctx = new DateEscapedLiteralContext(_localctx); enterOuterAlt(_localctx, 7); { - setState(685); + setState(688); match(DATE_ESC); - setState(686); + setState(689); string(); - setState(687); + setState(690); match(ESC_END); } break; @@ -5284,11 +5319,11 @@ public final ConstantContext constant() throws RecognitionException { _localctx = new TimeEscapedLiteralContext(_localctx); enterOuterAlt(_localctx, 8); { - setState(689); + setState(692); match(TIME_ESC); - setState(690); + setState(693); string(); - setState(691); + setState(694); match(ESC_END); } break; @@ -5296,11 +5331,11 @@ public final ConstantContext constant() throws RecognitionException { _localctx = new TimestampEscapedLiteralContext(_localctx); enterOuterAlt(_localctx, 9); { - setState(693); + setState(696); match(TIMESTAMP_ESC); - setState(694); + setState(697); string(); - setState(695); + setState(698); match(ESC_END); } break; @@ -5308,11 +5343,11 @@ public final ConstantContext constant() throws RecognitionException { _localctx = new GuidEscapedLiteralContext(_localctx); enterOuterAlt(_localctx, 10); { - setState(697); + setState(700); match(GUID_ESC); - setState(698); + setState(701); string(); - setState(699); + setState(702); match(ESC_END); } break; @@ -5365,7 +5400,7 @@ public final ComparisonOperatorContext comparisonOperator() throws RecognitionEx try { enterOuterAlt(_localctx, 1); { - setState(703); + setState(706); _la = _input.LA(1); if ( !(((((_la - 100)) & ~0x3f) == 0 && ((1L << (_la - 100)) & ((1L << (EQ - 100)) | (1L << (NULLEQ - 100)) | (1L << (NEQ - 100)) | (1L << (LT - 100)) | (1L << (LTE - 100)) | (1L << (GT - 100)) | (1L << (GTE - 100)))) != 0)) ) { _errHandler.recoverInline(this); @@ -5414,7 +5449,7 @@ public final BooleanValueContext booleanValue() throws RecognitionException { try { enterOuterAlt(_localctx, 1); { - setState(705); + setState(708); _la = _input.LA(1); if ( !(_la==FALSE || _la==TRUE) ) { _errHandler.recoverInline(this); @@ -5482,13 +5517,13 @@ public final IntervalContext interval() throws RecognitionException { try { enterOuterAlt(_localctx, 1); { - setState(707); + setState(710); match(INTERVAL); - setState(709); + setState(712); _la = _input.LA(1); if (_la==PLUS || _la==MINUS) { { - setState(708); + setState(711); ((IntervalContext)_localctx).sign = _input.LT(1); _la = _input.LA(1); if ( !(_la==PLUS || _la==MINUS) ) { @@ -5499,35 +5534,35 @@ public final IntervalContext interval() throws RecognitionException { } } - setState(713); + setState(716); switch (_input.LA(1)) { case INTEGER_VALUE: case DECIMAL_VALUE: { - setState(711); + setState(714); ((IntervalContext)_localctx).valueNumeric = number(); } break; case PARAM: case STRING: { - setState(712); + setState(715); ((IntervalContext)_localctx).valuePattern = string(); } break; default: throw new NoViableAltException(this); } - setState(715); - ((IntervalContext)_localctx).leading = intervalField(); setState(718); + ((IntervalContext)_localctx).leading = intervalField(); + setState(721); _errHandler.sync(this); switch ( getInterpreter().adaptivePredict(_input,95,_ctx) ) { case 1: { - setState(716); + setState(719); match(TO); - setState(717); + setState(720); ((IntervalContext)_localctx).trailing = intervalField(); } break; @@ -5584,7 +5619,7 @@ public final IntervalFieldContext intervalField() throws RecognitionException { try { enterOuterAlt(_localctx, 1); { - setState(720); + setState(723); _la = _input.LA(1); if ( !((((_la) & ~0x3f) == 0 && ((1L << _la) & ((1L << DAY) | (1L << DAYS) | (1L << HOUR) | (1L << HOURS) | (1L << MINUTE) | (1L << MINUTES) | (1L << MONTH) | (1L << MONTHS))) != 0) || ((((_la - 74)) & ~0x3f) == 0 && ((1L << (_la - 74)) & ((1L << (SECOND - 74)) | (1L << (SECONDS - 74)) | (1L << (YEAR - 74)) | (1L << (YEARS - 74)))) != 0)) ) { _errHandler.recoverInline(this); @@ -5642,7 +5677,7 @@ public final DataTypeContext dataType() throws RecognitionException { _localctx = new PrimitiveDataTypeContext(_localctx); enterOuterAlt(_localctx, 1); { - setState(722); + setState(725); identifier(); } } @@ -5694,25 +5729,25 @@ public final QualifiedNameContext qualifiedName() throws RecognitionException { int _alt; enterOuterAlt(_localctx, 1); { - setState(729); + setState(732); _errHandler.sync(this); _alt = getInterpreter().adaptivePredict(_input,96,_ctx); while ( _alt!=2 && _alt!=org.antlr.v4.runtime.atn.ATN.INVALID_ALT_NUMBER ) { if ( _alt==1 ) { { { - setState(724); + setState(727); identifier(); - setState(725); + setState(728); match(DOT); } } } - setState(731); + setState(734); _errHandler.sync(this); _alt = getInterpreter().adaptivePredict(_input,96,_ctx); } - setState(732); + setState(735); identifier(); } } @@ -5757,13 +5792,13 @@ public final IdentifierContext identifier() throws RecognitionException { IdentifierContext _localctx = new IdentifierContext(_ctx, getState()); enterRule(_localctx, 94, RULE_identifier); try { - setState(736); + setState(739); switch (_input.LA(1)) { case QUOTED_IDENTIFIER: case BACKQUOTED_IDENTIFIER: enterOuterAlt(_localctx, 1); { - setState(734); + setState(737); quoteIdentifier(); } break; @@ -5807,7 +5842,7 @@ public final IdentifierContext identifier() throws RecognitionException { case DIGIT_IDENTIFIER: enterOuterAlt(_localctx, 2); { - setState(735); + setState(738); unquoteIdentifier(); } break; @@ -5860,43 +5895,43 @@ public final TableIdentifierContext tableIdentifier() throws RecognitionExceptio enterRule(_localctx, 96, RULE_tableIdentifier); int _la; try { - setState(750); + setState(753); _errHandler.sync(this); switch ( getInterpreter().adaptivePredict(_input,100,_ctx) ) { case 1: enterOuterAlt(_localctx, 1); { - setState(741); + setState(744); _la = _input.LA(1); if ((((_la) & ~0x3f) == 0 && ((1L << _la) & ((1L << ANALYZE) | (1L << ANALYZED) | (1L << CATALOGS) | (1L << COLUMNS) | (1L << DAY) | (1L << DEBUG) | (1L << EXECUTABLE) | (1L << EXPLAIN) | (1L << FIRST) | (1L << FORMAT) | (1L << FULL) | (1L << FUNCTIONS) | (1L << GRAPHVIZ) | (1L << HOUR) | (1L << INTERVAL) | (1L << LAST) | (1L << LIMIT) | (1L << MAPPED) | (1L << MINUTE) | (1L << MONTH) | (1L << OPTIMIZED))) != 0) || ((((_la - 67)) & ~0x3f) == 0 && ((1L << (_la - 67)) & ((1L << (PARSED - 67)) | (1L << (PHYSICAL - 67)) | (1L << (PLAN - 67)) | (1L << (RLIKE - 67)) | (1L << (QUERY - 67)) | (1L << (SCHEMAS - 67)) | (1L << (SECOND - 67)) | (1L << (SHOW - 67)) | (1L << (SYS - 67)) | (1L << (TABLES - 67)) | (1L << (TEXT - 67)) | (1L << (TYPE - 67)) | (1L << (TYPES - 67)) | (1L << (VERIFY - 67)) | (1L << (YEAR - 67)) | (1L << (IDENTIFIER - 67)) | (1L << (DIGIT_IDENTIFIER - 67)) | (1L << (QUOTED_IDENTIFIER - 67)) | (1L << (BACKQUOTED_IDENTIFIER - 67)))) != 0)) { { - setState(738); + setState(741); ((TableIdentifierContext)_localctx).catalog = identifier(); - setState(739); + setState(742); match(T__3); } } - setState(743); + setState(746); match(TABLE_IDENTIFIER); } break; case 2: enterOuterAlt(_localctx, 2); { - setState(747); + setState(750); _errHandler.sync(this); switch ( getInterpreter().adaptivePredict(_input,99,_ctx) ) { case 1: { - setState(744); + setState(747); ((TableIdentifierContext)_localctx).catalog = identifier(); - setState(745); + setState(748); match(T__3); } break; } - setState(749); + setState(752); ((TableIdentifierContext)_localctx).name = identifier(); } break; @@ -5963,13 +5998,13 @@ public final QuoteIdentifierContext quoteIdentifier() throws RecognitionExceptio QuoteIdentifierContext _localctx = new QuoteIdentifierContext(_ctx, getState()); enterRule(_localctx, 98, RULE_quoteIdentifier); try { - setState(754); + setState(757); switch (_input.LA(1)) { case QUOTED_IDENTIFIER: _localctx = new QuotedIdentifierContext(_localctx); enterOuterAlt(_localctx, 1); { - setState(752); + setState(755); match(QUOTED_IDENTIFIER); } break; @@ -5977,7 +6012,7 @@ public final QuoteIdentifierContext quoteIdentifier() throws RecognitionExceptio _localctx = new BackQuotedIdentifierContext(_localctx); enterOuterAlt(_localctx, 2); { - setState(753); + setState(756); match(BACKQUOTED_IDENTIFIER); } break; @@ -6049,13 +6084,13 @@ public final UnquoteIdentifierContext unquoteIdentifier() throws RecognitionExce UnquoteIdentifierContext _localctx = new UnquoteIdentifierContext(_ctx, getState()); enterRule(_localctx, 100, RULE_unquoteIdentifier); try { - setState(759); + setState(762); switch (_input.LA(1)) { case IDENTIFIER: _localctx = new UnquotedIdentifierContext(_localctx); enterOuterAlt(_localctx, 1); { - setState(756); + setState(759); match(IDENTIFIER); } break; @@ -6098,7 +6133,7 @@ public final UnquoteIdentifierContext unquoteIdentifier() throws RecognitionExce _localctx = new UnquotedIdentifierContext(_localctx); enterOuterAlt(_localctx, 2); { - setState(757); + setState(760); nonReserved(); } break; @@ -6106,7 +6141,7 @@ public final UnquoteIdentifierContext unquoteIdentifier() throws RecognitionExce _localctx = new DigitIdentifierContext(_localctx); enterOuterAlt(_localctx, 3); { - setState(758); + setState(761); match(DIGIT_IDENTIFIER); } break; @@ -6175,13 +6210,13 @@ public final NumberContext number() throws RecognitionException { NumberContext _localctx = new NumberContext(_ctx, getState()); enterRule(_localctx, 102, RULE_number); try { - setState(763); + setState(766); switch (_input.LA(1)) { case DECIMAL_VALUE: _localctx = new DecimalLiteralContext(_localctx); enterOuterAlt(_localctx, 1); { - setState(761); + setState(764); match(DECIMAL_VALUE); } break; @@ -6189,7 +6224,7 @@ public final NumberContext number() throws RecognitionException { _localctx = new IntegerLiteralContext(_localctx); enterOuterAlt(_localctx, 2); { - setState(762); + setState(765); match(INTEGER_VALUE); } break; @@ -6237,7 +6272,7 @@ public final StringContext string() throws RecognitionException { try { enterOuterAlt(_localctx, 1); { - setState(765); + setState(768); _la = _input.LA(1); if ( !(_la==PARAM || _la==STRING) ) { _errHandler.recoverInline(this); @@ -6320,7 +6355,7 @@ public final NonReservedContext nonReserved() throws RecognitionException { try { enterOuterAlt(_localctx, 1); { - setState(767); + setState(770); _la = _input.LA(1); if ( !((((_la) & ~0x3f) == 0 && ((1L << _la) & ((1L << ANALYZE) | (1L << ANALYZED) | (1L << CATALOGS) | (1L << COLUMNS) | (1L << DAY) | (1L << DEBUG) | (1L << EXECUTABLE) | (1L << EXPLAIN) | (1L << FIRST) | (1L << FORMAT) | (1L << FULL) | (1L << FUNCTIONS) | (1L << GRAPHVIZ) | (1L << HOUR) | (1L << INTERVAL) | (1L << LAST) | (1L << LIMIT) | (1L << MAPPED) | (1L << MINUTE) | (1L << MONTH) | (1L << OPTIMIZED))) != 0) || ((((_la - 67)) & ~0x3f) == 0 && ((1L << (_la - 67)) & ((1L << (PARSED - 67)) | (1L << (PHYSICAL - 67)) | (1L << (PLAN - 67)) | (1L << (RLIKE - 67)) | (1L << (QUERY - 67)) | (1L << (SCHEMAS - 67)) | (1L << (SECOND - 67)) | (1L << (SHOW - 67)) | (1L << (SYS - 67)) | (1L << (TABLES - 67)) | (1L << (TEXT - 67)) | (1L << (TYPE - 67)) | (1L << (TYPES - 67)) | (1L << (VERIFY - 67)) | (1L << (YEAR - 67)))) != 0)) ) { _errHandler.recoverInline(this); @@ -6361,17 +6396,19 @@ private boolean booleanExpression_sempred(BooleanExpressionContext _localctx, in private boolean valueExpression_sempred(ValueExpressionContext _localctx, int predIndex) { switch (predIndex) { case 2: - return precpred(_ctx, 3); + return precpred(_ctx, 4); case 3: - return precpred(_ctx, 2); + return precpred(_ctx, 3); case 4: + return precpred(_ctx, 2); + case 5: return precpred(_ctx, 1); } return true; } public static final String _serializedATN = - "\3\u0430\ud6d1\u8206\uad2d\u4417\uaef1\u8d80\uaadd\3\u0081\u0304\4\2\t"+ + "\3\u0430\ud6d1\u8206\uad2d\u4417\uaef1\u8d80\uaadd\3\u0082\u0307\4\2\t"+ "\2\4\3\t\3\4\4\t\4\4\5\t\5\4\6\t\6\4\7\t\7\4\b\t\b\4\t\t\t\4\n\t\n\4\13"+ "\t\13\4\f\t\f\4\r\t\r\4\16\t\16\4\17\t\17\4\20\t\20\4\21\t\21\4\22\t\22"+ "\4\23\t\23\4\24\t\24\4\25\t\25\4\26\t\26\4\27\t\27\4\30\t\30\4\31\t\31"+ @@ -6415,268 +6452,270 @@ private boolean valueExpression_sempred(ValueExpressionContext _localctx, int pr "\n\33\3\33\3\33\3\33\5\33\u020d\n\33\3\33\3\33\3\33\3\33\5\33\u0213\n"+ "\33\3\33\5\33\u0216\n\33\3\34\3\34\3\34\3\35\3\35\5\35\u021d\n\35\3\36"+ "\3\36\3\36\3\36\3\36\3\36\5\36\u0225\n\36\3\37\3\37\3\37\3\37\5\37\u022b"+ - "\n\37\3\37\3\37\3\37\3\37\3\37\3\37\3\37\3\37\3\37\3\37\7\37\u0237\n\37"+ - "\f\37\16\37\u023a\13\37\3 \3 \3 \3 \3 \3 \3 \5 \u0243\n \3 \3 \3 \3 \3"+ - " \3 \3 \3 \3 \3 \3 \5 \u0250\n \3!\3!\3!\3!\3!\3!\3!\3!\3!\3!\5!\u025c"+ - "\n!\3\"\3\"\3\"\3\"\3\"\3\"\3\"\3#\3#\3#\5#\u0268\n#\3#\3#\3#\5#\u026d"+ - "\n#\3#\5#\u0270\n#\5#\u0272\n#\3$\3$\3$\3$\3$\3$\3$\3%\3%\3%\3%\3%\5%"+ - "\u0280\n%\3&\3&\3&\3&\3&\3&\3&\3\'\3\'\3\'\3\'\3\'\5\'\u028e\n\'\3(\3"+ - "(\3(\5(\u0293\n(\3(\3(\3(\7(\u0298\n(\f(\16(\u029b\13(\5(\u029d\n(\3("+ - "\3(\3)\3)\3)\5)\u02a4\n)\3*\3*\3*\3*\3*\6*\u02ab\n*\r*\16*\u02ac\3*\3"+ - "*\3*\3*\3*\3*\3*\3*\3*\3*\3*\3*\3*\3*\3*\3*\3*\5*\u02c0\n*\3+\3+\3,\3"+ - ",\3-\3-\5-\u02c8\n-\3-\3-\5-\u02cc\n-\3-\3-\3-\5-\u02d1\n-\3.\3.\3/\3"+ - "/\3\60\3\60\3\60\7\60\u02da\n\60\f\60\16\60\u02dd\13\60\3\60\3\60\3\61"+ - "\3\61\5\61\u02e3\n\61\3\62\3\62\3\62\5\62\u02e8\n\62\3\62\3\62\3\62\3"+ - "\62\5\62\u02ee\n\62\3\62\5\62\u02f1\n\62\3\63\3\63\5\63\u02f5\n\63\3\64"+ - "\3\64\3\64\5\64\u02fa\n\64\3\65\3\65\5\65\u02fe\n\65\3\66\3\66\3\67\3"+ - "\67\3\67\2\4.<8\2\4\6\b\n\f\16\20\22\24\26\30\32\34\36 \"$&(*,.\60\62"+ - "\64\668:<>@BDFHJLNPRTVXZ\\^`bdfhjl\2\22\b\2\7\7\t\t\36\36\66\66AAEE\4"+ - "\2((SS\4\2\t\tAA\4\2%%--\3\2\32\33\3\2mn\4\2\7\7vv\4\2\r\r\32\32\4\2#"+ - "#\62\62\4\2\7\7\34\34\3\2oq\3\2fl\4\2\"\"TT\7\2\27\30+,8;LM\\]\3\2tu\30"+ - "\2\b\t\22\23\27\27\31\31\36\36 #$&(++//\62\62\65\6688::AAEGILOPRSVWY"+ - "Y\\\\\u0361\2n\3\2\2\2\4q\3\2\2\2\6\u00d9\3\2\2\2\b\u00e4\3\2\2\2\n\u00e8"+ - "\3\2\2\2\f\u00fd\3\2\2\2\16\u0104\3\2\2\2\20\u0106\3\2\2\2\22\u010e\3"+ - "\2\2\2\24\u012a\3\2\2\2\26\u0134\3\2\2\2\30\u013e\3\2\2\2\32\u014d\3\2"+ - "\2\2\34\u014f\3\2\2\2\36\u0155\3\2\2\2 \u0157\3\2\2\2\"\u015e\3\2\2\2"+ - "$\u0170\3\2\2\2&\u0181\3\2\2\2(\u0191\3\2\2\2*\u01ac\3\2\2\2,\u01ae\3"+ - "\2\2\2.\u01cf\3\2\2\2\60\u01e0\3\2\2\2\62\u01e3\3\2\2\2\64\u0215\3\2\2"+ - "\2\66\u0217\3\2\2\28\u021a\3\2\2\2:\u0224\3\2\2\2<\u022a\3\2\2\2>\u024f"+ - "\3\2\2\2@\u025b\3\2\2\2B\u025d\3\2\2\2D\u0271\3\2\2\2F\u0273\3\2\2\2H"+ - "\u027f\3\2\2\2J\u0281\3\2\2\2L\u028d\3\2\2\2N\u028f\3\2\2\2P\u02a3\3\2"+ - "\2\2R\u02bf\3\2\2\2T\u02c1\3\2\2\2V\u02c3\3\2\2\2X\u02c5\3\2\2\2Z\u02d2"+ - "\3\2\2\2\\\u02d4\3\2\2\2^\u02db\3\2\2\2`\u02e2\3\2\2\2b\u02f0\3\2\2\2"+ - "d\u02f4\3\2\2\2f\u02f9\3\2\2\2h\u02fd\3\2\2\2j\u02ff\3\2\2\2l\u0301\3"+ - "\2\2\2no\5\6\4\2op\7\2\2\3p\3\3\2\2\2qr\5,\27\2rs\7\2\2\3s\5\3\2\2\2t"+ - "\u00da\5\b\5\2u\u0083\7 \2\2v\177\7\3\2\2wx\7G\2\2x~\t\2\2\2yz\7$\2\2"+ - "z~\t\3\2\2{|\7Y\2\2|~\5V,\2}w\3\2\2\2}y\3\2\2\2}{\3\2\2\2~\u0081\3\2\2"+ - "\2\177}\3\2\2\2\177\u0080\3\2\2\2\u0080\u0082\3\2\2\2\u0081\177\3\2\2"+ - "\2\u0082\u0084\7\4\2\2\u0083v\3\2\2\2\u0083\u0084\3\2\2\2\u0084\u0085"+ - "\3\2\2\2\u0085\u00da\5\6\4\2\u0086\u0092\7\31\2\2\u0087\u008e\7\3\2\2"+ - "\u0088\u0089\7G\2\2\u0089\u008d\t\4\2\2\u008a\u008b\7$\2\2\u008b\u008d"+ - "\t\3\2\2\u008c\u0088\3\2\2\2\u008c\u008a\3\2\2\2\u008d\u0090\3\2\2\2\u008e"+ - "\u008c\3\2\2\2\u008e\u008f\3\2\2\2\u008f\u0091\3\2\2\2\u0090\u008e\3\2"+ - "\2\2\u0091\u0093\7\4\2\2\u0092\u0087\3\2\2\2\u0092\u0093\3\2\2\2\u0093"+ - "\u0094\3\2\2\2\u0094\u00da\5\6\4\2\u0095\u0096\7O\2\2\u0096\u0099\7R\2"+ - "\2\u0097\u009a\5\66\34\2\u0098\u009a\5b\62\2\u0099\u0097\3\2\2\2\u0099"+ - "\u0098\3\2\2\2\u0099\u009a\3\2\2\2\u009a\u00da\3\2\2\2\u009b\u009c\7O"+ - "\2\2\u009c\u009d\7\23\2\2\u009d\u00a0\t\5\2\2\u009e\u00a1\5\66\34\2\u009f"+ - "\u00a1\5b\62\2\u00a0\u009e\3\2\2\2\u00a0\u009f\3\2\2\2\u00a1\u00da\3\2"+ - "\2\2\u00a2\u00a5\t\6\2\2\u00a3\u00a6\5\66\34\2\u00a4\u00a6\5b\62\2\u00a5"+ - "\u00a3\3\2\2\2\u00a5\u00a4\3\2\2\2\u00a6\u00da\3\2\2\2\u00a7\u00a8\7O"+ - "\2\2\u00a8\u00aa\7\'\2\2\u00a9\u00ab\5\66\34\2\u00aa\u00a9\3\2\2\2\u00aa"+ - "\u00ab\3\2\2\2\u00ab\u00da\3\2\2\2\u00ac\u00ad\7O\2\2\u00ad\u00da\7K\2"+ - "\2\u00ae\u00af\7P\2\2\u00af\u00b2\7R\2\2\u00b0\u00b1\7\21\2\2\u00b1\u00b3"+ - "\5\66\34\2\u00b2\u00b0\3\2\2\2\u00b2\u00b3\3\2\2\2\u00b3\u00b6\3\2\2\2"+ - "\u00b4\u00b7\5\66\34\2\u00b5\u00b7\5b\62\2\u00b6\u00b4\3\2\2\2\u00b6\u00b5"+ - "\3\2\2\2\u00b6\u00b7\3\2\2\2\u00b7\u00c1\3\2\2\2\u00b8\u00b9\7V\2\2\u00b9"+ - "\u00be\5j\66\2\u00ba\u00bb\7\5\2\2\u00bb\u00bd\5j\66\2\u00bc\u00ba\3\2"+ - "\2\2\u00bd\u00c0\3\2\2\2\u00be\u00bc\3\2\2\2\u00be\u00bf\3\2\2\2\u00bf"+ - "\u00c2\3\2\2\2\u00c0\u00be\3\2\2\2\u00c1\u00b8\3\2\2\2\u00c1\u00c2\3\2"+ - "\2\2\u00c2\u00da\3\2\2\2\u00c3\u00c4\7P\2\2\u00c4\u00c7\7\23\2\2\u00c5"+ - "\u00c6\7\21\2\2\u00c6\u00c8\5j\66\2\u00c7\u00c5\3\2\2\2\u00c7\u00c8\3"+ - "\2\2\2\u00c8\u00cc\3\2\2\2\u00c9\u00ca\7Q\2\2\u00ca\u00cd\5\66\34\2\u00cb"+ - "\u00cd\5b\62\2\u00cc\u00c9\3\2\2\2\u00cc\u00cb\3\2\2\2\u00cc\u00cd\3\2"+ - "\2\2\u00cd\u00cf\3\2\2\2\u00ce\u00d0\5\66\34\2\u00cf\u00ce\3\2\2\2\u00cf"+ - "\u00d0\3\2\2\2\u00d0\u00da\3\2\2\2\u00d1\u00d2\7P\2\2\u00d2\u00d7\7W\2"+ - "\2\u00d3\u00d5\t\7\2\2\u00d4\u00d3\3\2\2\2\u00d4\u00d5\3\2\2\2\u00d5\u00d6"+ - "\3\2\2\2\u00d6\u00d8\5h\65\2\u00d7\u00d4\3\2\2\2\u00d7\u00d8\3\2\2\2\u00d8"+ - "\u00da\3\2\2\2\u00d9t\3\2\2\2\u00d9u\3\2\2\2\u00d9\u0086\3\2\2\2\u00d9"+ - "\u0095\3\2\2\2\u00d9\u009b\3\2\2\2\u00d9\u00a2\3\2\2\2\u00d9\u00a7\3\2"+ - "\2\2\u00d9\u00ac\3\2\2\2\u00d9\u00ae\3\2\2\2\u00d9\u00c3\3\2\2\2\u00d9"+ - "\u00d1\3\2\2\2\u00da\7\3\2\2\2\u00db\u00dc\7[\2\2\u00dc\u00e1\5\34\17"+ - "\2\u00dd\u00de\7\5\2\2\u00de\u00e0\5\34\17\2\u00df\u00dd\3\2\2\2\u00e0"+ - "\u00e3\3\2\2\2\u00e1\u00df\3\2\2\2\u00e1\u00e2\3\2\2\2\u00e2\u00e5\3\2"+ - "\2\2\u00e3\u00e1\3\2\2\2\u00e4\u00db\3\2\2\2\u00e4\u00e5\3\2\2\2\u00e5"+ - "\u00e6\3\2\2\2\u00e6\u00e7\5\n\6\2\u00e7\t\3\2\2\2\u00e8\u00f3\5\16\b"+ - "\2\u00e9\u00ea\7C\2\2\u00ea\u00eb\7\17\2\2\u00eb\u00f0\5\20\t\2\u00ec"+ - "\u00ed\7\5\2\2\u00ed\u00ef\5\20\t\2\u00ee\u00ec\3\2\2\2\u00ef\u00f2\3"+ - "\2\2\2\u00f0\u00ee\3\2\2\2\u00f0\u00f1\3\2\2\2\u00f1\u00f4\3\2\2\2\u00f2"+ - "\u00f0\3\2\2\2\u00f3\u00e9\3\2\2\2\u00f3\u00f4\3\2\2\2\u00f4\u00f6\3\2"+ - "\2\2\u00f5\u00f7\5\f\7\2\u00f6\u00f5\3\2\2\2\u00f6\u00f7\3\2\2\2\u00f7"+ - "\13\3\2\2\2\u00f8\u00f9\7\65\2\2\u00f9\u00fe\t\b\2\2\u00fa\u00fb\7`\2"+ - "\2\u00fb\u00fc\t\b\2\2\u00fc\u00fe\7e\2\2\u00fd\u00f8\3\2\2\2\u00fd\u00fa"+ - "\3\2\2\2\u00fe\r\3\2\2\2\u00ff\u0105\5\22\n\2\u0100\u0101\7\3\2\2\u0101"+ - "\u0102\5\n\6\2\u0102\u0103\7\4\2\2\u0103\u0105\3\2\2\2\u0104\u00ff\3\2"+ - "\2\2\u0104\u0100\3\2\2\2\u0105\17\3\2\2\2\u0106\u0108\5,\27\2\u0107\u0109"+ - "\t\t\2\2\u0108\u0107\3\2\2\2\u0108\u0109\3\2\2\2\u0109\u010c\3\2\2\2\u010a"+ - "\u010b\7?\2\2\u010b\u010d\t\n\2\2\u010c\u010a\3\2\2\2\u010c\u010d\3\2"+ - "\2\2\u010d\21\3\2\2\2\u010e\u0110\7N\2\2\u010f\u0111\5\36\20\2\u0110\u010f"+ - "\3\2\2\2\u0110\u0111\3\2\2\2\u0111\u0112\3\2\2\2\u0112\u0117\5 \21\2\u0113"+ - "\u0114\7\5\2\2\u0114\u0116\5 \21\2\u0115\u0113\3\2\2\2\u0116\u0119\3\2"+ - "\2\2\u0117\u0115\3\2\2\2\u0117\u0118\3\2\2\2\u0118\u011b\3\2\2\2\u0119"+ - "\u0117\3\2\2\2\u011a\u011c\5\24\13\2\u011b\u011a\3\2\2\2\u011b\u011c\3"+ - "\2\2\2\u011c\u011f\3\2\2\2\u011d\u011e\7Z\2\2\u011e\u0120\5.\30\2\u011f"+ - "\u011d\3\2\2\2\u011f\u0120\3\2\2\2\u0120\u0124\3\2\2\2\u0121\u0122\7)"+ - "\2\2\u0122\u0123\7\17\2\2\u0123\u0125\5\26\f\2\u0124\u0121\3\2\2\2\u0124"+ - "\u0125\3\2\2\2\u0125\u0128\3\2\2\2\u0126\u0127\7*\2\2\u0127\u0129\5.\30"+ - "\2\u0128\u0126\3\2\2\2\u0128\u0129\3\2\2\2\u0129\23\3\2\2\2\u012a\u012b"+ - "\7%\2\2\u012b\u0130\5\"\22\2\u012c\u012d\7\5\2\2\u012d\u012f\5\"\22\2"+ - "\u012e\u012c\3\2\2\2\u012f\u0132\3\2\2\2\u0130\u012e\3\2\2\2\u0130\u0131"+ - "\3\2\2\2\u0131\25\3\2\2\2\u0132\u0130\3\2\2\2\u0133\u0135\5\36\20\2\u0134"+ - "\u0133\3\2\2\2\u0134\u0135\3\2\2\2\u0135\u0136\3\2\2\2\u0136\u013b\5\30"+ - "\r\2\u0137\u0138\7\5\2\2\u0138\u013a\5\30\r\2\u0139\u0137\3\2\2\2\u013a"+ - "\u013d\3\2\2\2\u013b\u0139\3\2\2\2\u013b\u013c\3\2\2\2\u013c\27\3\2\2"+ - "\2\u013d\u013b\3\2\2\2\u013e\u013f\5\32\16\2\u013f\31\3\2\2\2\u0140\u0149"+ - "\7\3\2\2\u0141\u0146\5,\27\2\u0142\u0143\7\5\2\2\u0143\u0145\5,\27\2\u0144"+ - "\u0142\3\2\2\2\u0145\u0148\3\2\2\2\u0146\u0144\3\2\2\2\u0146\u0147\3\2"+ - "\2\2\u0147\u014a\3\2\2\2\u0148\u0146\3\2\2\2\u0149\u0141\3\2\2\2\u0149"+ - "\u014a\3\2\2\2\u014a\u014b\3\2\2\2\u014b\u014e\7\4\2\2\u014c\u014e\5,"+ - "\27\2\u014d\u0140\3\2\2\2\u014d\u014c\3\2\2\2\u014e\33\3\2\2\2\u014f\u0150"+ - "\5`\61\2\u0150\u0151\7\f\2\2\u0151\u0152\7\3\2\2\u0152\u0153\5\n\6\2\u0153"+ - "\u0154\7\4\2\2\u0154\35\3\2\2\2\u0155\u0156\t\13\2\2\u0156\37\3\2\2\2"+ - "\u0157\u015c\5,\27\2\u0158\u015a\7\f\2\2\u0159\u0158\3\2\2\2\u0159\u015a"+ - "\3\2\2\2\u015a\u015b\3\2\2\2\u015b\u015d\5`\61\2\u015c\u0159\3\2\2\2\u015c"+ - "\u015d\3\2\2\2\u015d!\3\2\2\2\u015e\u0162\5*\26\2\u015f\u0161\5$\23\2"+ - "\u0160\u015f\3\2\2\2\u0161\u0164\3\2\2\2\u0162\u0160\3\2\2\2\u0162\u0163"+ - "\3\2\2\2\u0163#\3\2\2\2\u0164\u0162\3\2\2\2\u0165\u0166\5&\24\2\u0166"+ - "\u0167\7\61\2\2\u0167\u0169\5*\26\2\u0168\u016a\5(\25\2\u0169\u0168\3"+ - "\2\2\2\u0169\u016a\3\2\2\2\u016a\u0171\3\2\2\2\u016b\u016c\7<\2\2\u016c"+ - "\u016d\5&\24\2\u016d\u016e\7\61\2\2\u016e\u016f\5*\26\2\u016f\u0171\3"+ - "\2\2\2\u0170\u0165\3\2\2\2\u0170\u016b\3\2\2\2\u0171%\3\2\2\2\u0172\u0174"+ - "\7.\2\2\u0173\u0172\3\2\2\2\u0173\u0174\3\2\2\2\u0174\u0182\3\2\2\2\u0175"+ - "\u0177\7\63\2\2\u0176\u0178\7D\2\2\u0177\u0176\3\2\2\2\u0177\u0178\3\2"+ - "\2\2\u0178\u0182\3\2\2\2\u0179\u017b\7H\2\2\u017a\u017c\7D\2\2\u017b\u017a"+ - "\3\2\2\2\u017b\u017c\3\2\2\2\u017c\u0182\3\2\2\2\u017d\u017f\7&\2\2\u017e"+ - "\u0180\7D\2\2\u017f\u017e\3\2\2\2\u017f\u0180\3\2\2\2\u0180\u0182\3\2"+ - "\2\2\u0181\u0173\3\2\2\2\u0181\u0175\3\2\2\2\u0181\u0179\3\2\2\2\u0181"+ - "\u017d\3\2\2\2\u0182\'\3\2\2\2\u0183\u0184\7@\2\2\u0184\u0192\5.\30\2"+ - "\u0185\u0186\7X\2\2\u0186\u0187\7\3\2\2\u0187\u018c\5`\61\2\u0188\u0189"+ - "\7\5\2\2\u0189\u018b\5`\61\2\u018a\u0188\3\2\2\2\u018b\u018e\3\2\2\2\u018c"+ - "\u018a\3\2\2\2\u018c\u018d\3\2\2\2\u018d\u018f\3\2\2\2\u018e\u018c\3\2"+ - "\2\2\u018f\u0190\7\4\2\2\u0190\u0192\3\2\2\2\u0191\u0183\3\2\2\2\u0191"+ - "\u0185\3\2\2\2\u0192)\3\2\2\2\u0193\u0198\5b\62\2\u0194\u0196\7\f\2\2"+ - "\u0195\u0194\3\2\2\2\u0195\u0196\3\2\2\2\u0196\u0197\3\2\2\2\u0197\u0199"+ - "\5^\60\2\u0198\u0195\3\2\2\2\u0198\u0199\3\2\2\2\u0199\u01ad\3\2\2\2\u019a"+ - "\u019b\7\3\2\2\u019b\u019c\5\n\6\2\u019c\u01a1\7\4\2\2\u019d\u019f\7\f"+ - "\2\2\u019e\u019d\3\2\2\2\u019e\u019f\3\2\2\2\u019f\u01a0\3\2\2\2\u01a0"+ - "\u01a2\5^\60\2\u01a1\u019e\3\2\2\2\u01a1\u01a2\3\2\2\2\u01a2\u01ad\3\2"+ - "\2\2\u01a3\u01a4\7\3\2\2\u01a4\u01a5\5\"\22\2\u01a5\u01aa\7\4\2\2\u01a6"+ - "\u01a8\7\f\2\2\u01a7\u01a6\3\2\2\2\u01a7\u01a8\3\2\2\2\u01a8\u01a9\3\2"+ - "\2\2\u01a9\u01ab\5^\60\2\u01aa\u01a7\3\2\2\2\u01aa\u01ab\3\2\2\2\u01ab"+ - "\u01ad\3\2\2\2\u01ac\u0193\3\2\2\2\u01ac\u019a\3\2\2\2\u01ac\u01a3\3\2"+ - "\2\2\u01ad+\3\2\2\2\u01ae\u01af\5.\30\2\u01af-\3\2\2\2\u01b0\u01b1\b\30"+ - "\1\2\u01b1\u01b2\7=\2\2\u01b2\u01d0\5.\30\n\u01b3\u01b4\7\37\2\2\u01b4"+ - "\u01b5\7\3\2\2\u01b5\u01b6\5\b\5\2\u01b6\u01b7\7\4\2\2\u01b7\u01d0\3\2"+ - "\2\2\u01b8\u01b9\7J\2\2\u01b9\u01ba\7\3\2\2\u01ba\u01bb\5j\66\2\u01bb"+ - "\u01bc\5\60\31\2\u01bc\u01bd\7\4\2\2\u01bd\u01d0\3\2\2\2\u01be\u01bf\7"+ - "\67\2\2\u01bf\u01c0\7\3\2\2\u01c0\u01c1\5^\60\2\u01c1\u01c2\7\5\2\2\u01c2"+ - "\u01c3\5j\66\2\u01c3\u01c4\5\60\31\2\u01c4\u01c5\7\4\2\2\u01c5\u01d0\3"+ - "\2\2\2\u01c6\u01c7\7\67\2\2\u01c7\u01c8\7\3\2\2\u01c8\u01c9\5j\66\2\u01c9"+ - "\u01ca\7\5\2\2\u01ca\u01cb\5j\66\2\u01cb\u01cc\5\60\31\2\u01cc\u01cd\7"+ - "\4\2\2\u01cd\u01d0\3\2\2\2\u01ce\u01d0\5\62\32\2\u01cf\u01b0\3\2\2\2\u01cf"+ - "\u01b3\3\2\2\2\u01cf\u01b8\3\2\2\2\u01cf\u01be\3\2\2\2\u01cf\u01c6\3\2"+ - "\2\2\u01cf\u01ce\3\2\2\2\u01d0\u01d9\3\2\2\2\u01d1\u01d2\f\4\2\2\u01d2"+ - "\u01d3\7\n\2\2\u01d3\u01d8\5.\30\5\u01d4\u01d5\f\3\2\2\u01d5\u01d6\7B"+ - "\2\2\u01d6\u01d8\5.\30\4\u01d7\u01d1\3\2\2\2\u01d7\u01d4\3\2\2\2\u01d8"+ - "\u01db\3\2\2\2\u01d9\u01d7\3\2\2\2\u01d9\u01da\3\2\2\2\u01da/\3\2\2\2"+ - "\u01db\u01d9\3\2\2\2\u01dc\u01dd\7\5\2\2\u01dd\u01df\5j\66\2\u01de\u01dc"+ - "\3\2\2\2\u01df\u01e2\3\2\2\2\u01e0\u01de\3\2\2\2\u01e0\u01e1\3\2\2\2\u01e1"+ - "\61\3\2\2\2\u01e2\u01e0\3\2\2\2\u01e3\u01e5\5<\37\2\u01e4\u01e6\5\64\33"+ - "\2\u01e5\u01e4\3\2\2\2\u01e5\u01e6\3\2\2\2\u01e6\63\3\2\2\2\u01e7\u01e9"+ - "\7=\2\2\u01e8\u01e7\3\2\2\2\u01e8\u01e9\3\2\2\2\u01e9\u01ea\3\2\2\2\u01ea"+ - "\u01eb\7\16\2\2\u01eb\u01ec\5<\37\2\u01ec\u01ed\7\n\2\2\u01ed\u01ee\5"+ - "<\37\2\u01ee\u0216\3\2\2\2\u01ef\u01f1\7=\2\2\u01f0\u01ef\3\2\2\2\u01f0"+ - "\u01f1\3\2\2\2\u01f1\u01f2\3\2\2\2\u01f2\u01f3\7-\2\2\u01f3\u01f4\7\3"+ - "\2\2\u01f4\u01f9\5<\37\2\u01f5\u01f6\7\5\2\2\u01f6\u01f8\5<\37\2\u01f7"+ - "\u01f5\3\2\2\2\u01f8\u01fb\3\2\2\2\u01f9\u01f7\3\2\2\2\u01f9\u01fa\3\2"+ - "\2\2\u01fa\u01fc\3\2\2\2\u01fb\u01f9\3\2\2\2\u01fc\u01fd\7\4\2\2\u01fd"+ - "\u0216\3\2\2\2\u01fe\u0200\7=\2\2\u01ff\u01fe\3\2\2\2\u01ff\u0200\3\2"+ - "\2\2\u0200\u0201\3\2\2\2\u0201\u0202\7-\2\2\u0202\u0203\7\3\2\2\u0203"+ - "\u0204\5\b\5\2\u0204\u0205\7\4\2\2\u0205\u0216\3\2\2\2\u0206\u0208\7="+ - "\2\2\u0207\u0206\3\2\2\2\u0207\u0208\3\2\2\2\u0208\u0209\3\2\2\2\u0209"+ - "\u020a\7\64\2\2\u020a\u0216\58\35\2\u020b\u020d\7=\2\2\u020c\u020b\3\2"+ - "\2\2\u020c\u020d\3\2\2\2\u020d\u020e\3\2\2\2\u020e\u020f\7I\2\2\u020f"+ - "\u0216\5j\66\2\u0210\u0212\7\60\2\2\u0211\u0213\7=\2\2\u0212\u0211\3\2"+ - "\2\2\u0212\u0213\3\2\2\2\u0213\u0214\3\2\2\2\u0214\u0216\7>\2\2\u0215"+ - "\u01e8\3\2\2\2\u0215\u01f0\3\2\2\2\u0215\u01ff\3\2\2\2\u0215\u0207\3\2"+ - "\2\2\u0215\u020c\3\2\2\2\u0215\u0210\3\2\2\2\u0216\65\3\2\2\2\u0217\u0218"+ - "\7\64\2\2\u0218\u0219\58\35\2\u0219\67\3\2\2\2\u021a\u021c\5j\66\2\u021b"+ - "\u021d\5:\36\2\u021c\u021b\3\2\2\2\u021c\u021d\3\2\2\2\u021d9\3\2\2\2"+ - "\u021e\u021f\7\35\2\2\u021f\u0225\5j\66\2\u0220\u0221\7^\2\2\u0221\u0222"+ - "\5j\66\2\u0222\u0223\7e\2\2\u0223\u0225\3\2\2\2\u0224\u021e\3\2\2\2\u0224"+ - "\u0220\3\2\2\2\u0225;\3\2\2\2\u0226\u0227\b\37\1\2\u0227\u022b\5> \2\u0228"+ - "\u0229\t\7\2\2\u0229\u022b\5<\37\6\u022a\u0226\3\2\2\2\u022a\u0228\3\2"+ - "\2\2\u022b\u0238\3\2\2\2\u022c\u022d\f\5\2\2\u022d\u022e\t\f\2\2\u022e"+ - "\u0237\5<\37\6\u022f\u0230\f\4\2\2\u0230\u0231\t\7\2\2\u0231\u0237\5<"+ - "\37\5\u0232\u0233\f\3\2\2\u0233\u0234\5T+\2\u0234\u0235\5<\37\4\u0235"+ - "\u0237\3\2\2\2\u0236\u022c\3\2\2\2\u0236\u022f\3\2\2\2\u0236\u0232\3\2"+ - "\2\2\u0237\u023a\3\2\2\2\u0238\u0236\3\2\2\2\u0238\u0239\3\2\2\2\u0239"+ - "=\3\2\2\2\u023a\u0238\3\2\2\2\u023b\u0250\5@!\2\u023c\u0250\5H%\2\u023d"+ - "\u0250\5D#\2\u023e\u0250\5R*\2\u023f\u0240\5^\60\2\u0240\u0241\7s\2\2"+ - "\u0241\u0243\3\2\2\2\u0242\u023f\3\2\2\2\u0242\u0243\3\2\2\2\u0243\u0244"+ - "\3\2\2\2\u0244\u0250\7o\2\2\u0245\u0250\5L\'\2\u0246\u0247\7\3\2\2\u0247"+ - "\u0248\5\b\5\2\u0248\u0249\7\4\2\2\u0249\u0250\3\2\2\2\u024a\u0250\5^"+ - "\60\2\u024b\u024c\7\3\2\2\u024c\u024d\5,\27\2\u024d\u024e\7\4\2\2\u024e"+ - "\u0250\3\2\2\2\u024f\u023b\3\2\2\2\u024f\u023c\3\2\2\2\u024f\u023d\3\2"+ - "\2\2\u024f\u023e\3\2\2\2\u024f\u0242\3\2\2\2\u024f\u0245\3\2\2\2\u024f"+ - "\u0246\3\2\2\2\u024f\u024a\3\2\2\2\u024f\u024b\3\2\2\2\u0250?\3\2\2\2"+ - "\u0251\u025c\5B\"\2\u0252\u0253\7_\2\2\u0253\u0254\5B\"\2\u0254\u0255"+ - "\7e\2\2\u0255\u025c\3\2\2\2\u0256\u025c\5F$\2\u0257\u0258\7_\2\2\u0258"+ - "\u0259\5F$\2\u0259\u025a\7e\2\2\u025a\u025c\3\2\2\2\u025b\u0251\3\2\2"+ - "\2\u025b\u0252\3\2\2\2\u025b\u0256\3\2\2\2\u025b\u0257\3\2\2\2\u025cA"+ - "\3\2\2\2\u025d\u025e\7\20\2\2\u025e\u025f\7\3\2\2\u025f\u0260\5,\27\2"+ - "\u0260\u0261\7\f\2\2\u0261\u0262\5\\/\2\u0262\u0263\7\4\2\2\u0263C\3\2"+ - "\2\2\u0264\u0267\7\25\2\2\u0265\u0266\7\3\2\2\u0266\u0268\7\4\2\2\u0267"+ - "\u0265\3\2\2\2\u0267\u0268\3\2\2\2\u0268\u0272\3\2\2\2\u0269\u026f\7\26"+ - "\2\2\u026a\u026c\7\3\2\2\u026b\u026d\7v\2\2\u026c\u026b\3\2\2\2\u026c"+ - "\u026d\3\2\2\2\u026d\u026e\3\2\2\2\u026e\u0270\7\4\2\2\u026f\u026a\3\2"+ - "\2\2\u026f\u0270\3\2\2\2\u0270\u0272\3\2\2\2\u0271\u0264\3\2\2\2\u0271"+ - "\u0269\3\2\2\2\u0272E\3\2\2\2\u0273\u0274\7\24\2\2\u0274\u0275\7\3\2\2"+ - "\u0275\u0276\5,\27\2\u0276\u0277\7\5\2\2\u0277\u0278\5\\/\2\u0278\u0279"+ - "\7\4\2\2\u0279G\3\2\2\2\u027a\u0280\5J&\2\u027b\u027c\7_\2\2\u027c\u027d"+ - "\5J&\2\u027d\u027e\7e\2\2\u027e\u0280\3\2\2\2\u027f\u027a\3\2\2\2\u027f"+ - "\u027b\3\2\2\2\u0280I\3\2\2\2\u0281\u0282\7!\2\2\u0282\u0283\7\3\2\2\u0283"+ - "\u0284\5`\61\2\u0284\u0285\7%\2\2\u0285\u0286\5<\37\2\u0286\u0287\7\4"+ - "\2\2\u0287K\3\2\2\2\u0288\u028e\5N(\2\u0289\u028a\7_\2\2\u028a\u028b\5"+ - "N(\2\u028b\u028c\7e\2\2\u028c\u028e\3\2\2\2\u028d\u0288\3\2\2\2\u028d"+ - "\u0289\3\2\2\2\u028eM\3\2\2\2\u028f\u0290\5P)\2\u0290\u029c\7\3\2\2\u0291"+ - "\u0293\5\36\20\2\u0292\u0291\3\2\2\2\u0292\u0293\3\2\2\2\u0293\u0294\3"+ - "\2\2\2\u0294\u0299\5,\27\2\u0295\u0296\7\5\2\2\u0296\u0298\5,\27\2\u0297"+ - "\u0295\3\2\2\2\u0298\u029b\3\2\2\2\u0299\u0297\3\2\2\2\u0299\u029a\3\2"+ - "\2\2\u029a\u029d\3\2\2\2\u029b\u0299\3\2\2\2\u029c\u0292\3\2\2\2\u029c"+ - "\u029d\3\2\2\2\u029d\u029e\3\2\2\2\u029e\u029f\7\4\2\2\u029fO\3\2\2\2"+ - "\u02a0\u02a4\7\63\2\2\u02a1\u02a4\7H\2\2\u02a2\u02a4\5`\61\2\u02a3\u02a0"+ - "\3\2\2\2\u02a3\u02a1\3\2\2\2\u02a3\u02a2\3\2\2\2\u02a4Q\3\2\2\2\u02a5"+ - "\u02c0\7>\2\2\u02a6\u02c0\5X-\2\u02a7\u02c0\5h\65\2\u02a8\u02c0\5V,\2"+ - "\u02a9\u02ab\7u\2\2\u02aa\u02a9\3\2\2\2\u02ab\u02ac\3\2\2\2\u02ac\u02aa"+ - "\3\2\2\2\u02ac\u02ad\3\2\2\2\u02ad\u02c0\3\2\2\2\u02ae\u02c0\7t\2\2\u02af"+ - "\u02b0\7a\2\2\u02b0\u02b1\5j\66\2\u02b1\u02b2\7e\2\2\u02b2\u02c0\3\2\2"+ - "\2\u02b3\u02b4\7b\2\2\u02b4\u02b5\5j\66\2\u02b5\u02b6\7e\2\2\u02b6\u02c0"+ - "\3\2\2\2\u02b7\u02b8\7c\2\2\u02b8\u02b9\5j\66\2\u02b9\u02ba\7e\2\2\u02ba"+ - "\u02c0\3\2\2\2\u02bb\u02bc\7d\2\2\u02bc\u02bd\5j\66\2\u02bd\u02be\7e\2"+ - "\2\u02be\u02c0\3\2\2\2\u02bf\u02a5\3\2\2\2\u02bf\u02a6\3\2\2\2\u02bf\u02a7"+ - "\3\2\2\2\u02bf\u02a8\3\2\2\2\u02bf\u02aa\3\2\2\2\u02bf\u02ae\3\2\2\2\u02bf"+ - "\u02af\3\2\2\2\u02bf\u02b3\3\2\2\2\u02bf\u02b7\3\2\2\2\u02bf\u02bb\3\2"+ - "\2\2\u02c0S\3\2\2\2\u02c1\u02c2\t\r\2\2\u02c2U\3\2\2\2\u02c3\u02c4\t\16"+ - "\2\2\u02c4W\3\2\2\2\u02c5\u02c7\7/\2\2\u02c6\u02c8\t\7\2\2\u02c7\u02c6"+ - "\3\2\2\2\u02c7\u02c8\3\2\2\2\u02c8\u02cb\3\2\2\2\u02c9\u02cc\5h\65\2\u02ca"+ - "\u02cc\5j\66\2\u02cb\u02c9\3\2\2\2\u02cb\u02ca\3\2\2\2\u02cc\u02cd\3\2"+ - "\2\2\u02cd\u02d0\5Z.\2\u02ce\u02cf\7U\2\2\u02cf\u02d1\5Z.\2\u02d0\u02ce"+ - "\3\2\2\2\u02d0\u02d1\3\2\2\2\u02d1Y\3\2\2\2\u02d2\u02d3\t\17\2\2\u02d3"+ - "[\3\2\2\2\u02d4\u02d5\5`\61\2\u02d5]\3\2\2\2\u02d6\u02d7\5`\61\2\u02d7"+ - "\u02d8\7s\2\2\u02d8\u02da\3\2\2\2\u02d9\u02d6\3\2\2\2\u02da\u02dd\3\2"+ - "\2\2\u02db\u02d9\3\2\2\2\u02db\u02dc\3\2\2\2\u02dc\u02de\3\2\2\2\u02dd"+ - "\u02db\3\2\2\2\u02de\u02df\5`\61\2\u02df_\3\2\2\2\u02e0\u02e3\5d\63\2"+ - "\u02e1\u02e3\5f\64\2\u02e2\u02e0\3\2\2\2\u02e2\u02e1\3\2\2\2\u02e3a\3"+ - "\2\2\2\u02e4\u02e5\5`\61\2\u02e5\u02e6\7\6\2\2\u02e6\u02e8\3\2\2\2\u02e7"+ - "\u02e4\3\2\2\2\u02e7\u02e8\3\2\2\2\u02e8\u02e9\3\2\2\2\u02e9\u02f1\7z"+ - "\2\2\u02ea\u02eb\5`\61\2\u02eb\u02ec\7\6\2\2\u02ec\u02ee\3\2\2\2\u02ed"+ - "\u02ea\3\2\2\2\u02ed\u02ee\3\2\2\2\u02ee\u02ef\3\2\2\2\u02ef\u02f1\5`"+ - "\61\2\u02f0\u02e7\3\2\2\2\u02f0\u02ed\3\2\2\2\u02f1c\3\2\2\2\u02f2\u02f5"+ - "\7{\2\2\u02f3\u02f5\7|\2\2\u02f4\u02f2\3\2\2\2\u02f4\u02f3\3\2\2\2\u02f5"+ - "e\3\2\2\2\u02f6\u02fa\7x\2\2\u02f7\u02fa\5l\67\2\u02f8\u02fa\7y\2\2\u02f9"+ - "\u02f6\3\2\2\2\u02f9\u02f7\3\2\2\2\u02f9\u02f8\3\2\2\2\u02fag\3\2\2\2"+ - "\u02fb\u02fe\7w\2\2\u02fc\u02fe\7v\2\2\u02fd\u02fb\3\2\2\2\u02fd\u02fc"+ - "\3\2\2\2\u02fei\3\2\2\2\u02ff\u0300\t\20\2\2\u0300k\3\2\2\2\u0301\u0302"+ - "\t\21\2\2\u0302m\3\2\2\2j}\177\u0083\u008c\u008e\u0092\u0099\u00a0\u00a5"+ - "\u00aa\u00b2\u00b6\u00be\u00c1\u00c7\u00cc\u00cf\u00d4\u00d7\u00d9\u00e1"+ - "\u00e4\u00f0\u00f3\u00f6\u00fd\u0104\u0108\u010c\u0110\u0117\u011b\u011f"+ - "\u0124\u0128\u0130\u0134\u013b\u0146\u0149\u014d\u0159\u015c\u0162\u0169"+ - "\u0170\u0173\u0177\u017b\u017f\u0181\u018c\u0191\u0195\u0198\u019e\u01a1"+ - "\u01a7\u01aa\u01ac\u01cf\u01d7\u01d9\u01e0\u01e5\u01e8\u01f0\u01f9\u01ff"+ - "\u0207\u020c\u0212\u0215\u021c\u0224\u022a\u0236\u0238\u0242\u024f\u025b"+ - "\u0267\u026c\u026f\u0271\u027f\u028d\u0292\u0299\u029c\u02a3\u02ac\u02bf"+ - "\u02c7\u02cb\u02d0\u02db\u02e2\u02e7\u02ed\u02f0\u02f4\u02f9\u02fd"; + "\n\37\3\37\3\37\3\37\3\37\3\37\3\37\3\37\3\37\3\37\3\37\3\37\3\37\3\37"+ + "\7\37\u023a\n\37\f\37\16\37\u023d\13\37\3 \3 \3 \3 \3 \3 \3 \5 \u0246"+ + "\n \3 \3 \3 \3 \3 \3 \3 \3 \3 \3 \3 \5 \u0253\n \3!\3!\3!\5!\u0258\n!"+ + "\3!\3!\3!\5!\u025d\n!\3!\5!\u0260\n!\5!\u0262\n!\3\"\3\"\3\"\3\"\3\"\3"+ + "\"\3\"\3\"\3\"\3\"\5\"\u026e\n\"\3#\3#\3#\3#\3#\3#\3#\3$\3$\3$\3$\3$\3"+ + "$\3$\3%\3%\3%\3%\3%\5%\u0283\n%\3&\3&\3&\3&\3&\3&\3&\3\'\3\'\3\'\3\'\3"+ + "\'\5\'\u0291\n\'\3(\3(\3(\5(\u0296\n(\3(\3(\3(\7(\u029b\n(\f(\16(\u029e"+ + "\13(\5(\u02a0\n(\3(\3(\3)\3)\3)\5)\u02a7\n)\3*\3*\3*\3*\3*\6*\u02ae\n"+ + "*\r*\16*\u02af\3*\3*\3*\3*\3*\3*\3*\3*\3*\3*\3*\3*\3*\3*\3*\3*\3*\5*\u02c3"+ + "\n*\3+\3+\3,\3,\3-\3-\5-\u02cb\n-\3-\3-\5-\u02cf\n-\3-\3-\3-\5-\u02d4"+ + "\n-\3.\3.\3/\3/\3\60\3\60\3\60\7\60\u02dd\n\60\f\60\16\60\u02e0\13\60"+ + "\3\60\3\60\3\61\3\61\5\61\u02e6\n\61\3\62\3\62\3\62\5\62\u02eb\n\62\3"+ + "\62\3\62\3\62\3\62\5\62\u02f1\n\62\3\62\5\62\u02f4\n\62\3\63\3\63\5\63"+ + "\u02f8\n\63\3\64\3\64\3\64\5\64\u02fd\n\64\3\65\3\65\5\65\u0301\n\65\3"+ + "\66\3\66\3\67\3\67\3\67\2\4.<8\2\4\6\b\n\f\16\20\22\24\26\30\32\34\36"+ + " \"$&(*,.\60\62\64\668:<>@BDFHJLNPRTVXZ\\^`bdfhjl\2\22\b\2\7\7\t\t\36"+ + "\36\66\66AAEE\4\2((SS\4\2\t\tAA\4\2%%--\3\2\32\33\3\2mn\4\2\7\7ww\4\2"+ + "\r\r\32\32\4\2##\62\62\4\2\7\7\34\34\3\2oq\3\2fl\4\2\"\"TT\7\2\27\30+"+ + ",8;LM\\]\3\2uv\30\2\b\t\22\23\27\27\31\31\36\36 #$&(++//\62\62\65\66"+ + "88::AAEGILOPRSVWYY\\\\\u0365\2n\3\2\2\2\4q\3\2\2\2\6\u00d9\3\2\2\2\b\u00e4"+ + "\3\2\2\2\n\u00e8\3\2\2\2\f\u00fd\3\2\2\2\16\u0104\3\2\2\2\20\u0106\3\2"+ + "\2\2\22\u010e\3\2\2\2\24\u012a\3\2\2\2\26\u0134\3\2\2\2\30\u013e\3\2\2"+ + "\2\32\u014d\3\2\2\2\34\u014f\3\2\2\2\36\u0155\3\2\2\2 \u0157\3\2\2\2\""+ + "\u015e\3\2\2\2$\u0170\3\2\2\2&\u0181\3\2\2\2(\u0191\3\2\2\2*\u01ac\3\2"+ + "\2\2,\u01ae\3\2\2\2.\u01cf\3\2\2\2\60\u01e0\3\2\2\2\62\u01e3\3\2\2\2\64"+ + "\u0215\3\2\2\2\66\u0217\3\2\2\28\u021a\3\2\2\2:\u0224\3\2\2\2<\u022a\3"+ + "\2\2\2>\u0252\3\2\2\2@\u0261\3\2\2\2B\u026d\3\2\2\2D\u026f\3\2\2\2F\u0276"+ + "\3\2\2\2H\u0282\3\2\2\2J\u0284\3\2\2\2L\u0290\3\2\2\2N\u0292\3\2\2\2P"+ + "\u02a6\3\2\2\2R\u02c2\3\2\2\2T\u02c4\3\2\2\2V\u02c6\3\2\2\2X\u02c8\3\2"+ + "\2\2Z\u02d5\3\2\2\2\\\u02d7\3\2\2\2^\u02de\3\2\2\2`\u02e5\3\2\2\2b\u02f3"+ + "\3\2\2\2d\u02f7\3\2\2\2f\u02fc\3\2\2\2h\u0300\3\2\2\2j\u0302\3\2\2\2l"+ + "\u0304\3\2\2\2no\5\6\4\2op\7\2\2\3p\3\3\2\2\2qr\5,\27\2rs\7\2\2\3s\5\3"+ + "\2\2\2t\u00da\5\b\5\2u\u0083\7 \2\2v\177\7\3\2\2wx\7G\2\2x~\t\2\2\2yz"+ + "\7$\2\2z~\t\3\2\2{|\7Y\2\2|~\5V,\2}w\3\2\2\2}y\3\2\2\2}{\3\2\2\2~\u0081"+ + "\3\2\2\2\177}\3\2\2\2\177\u0080\3\2\2\2\u0080\u0082\3\2\2\2\u0081\177"+ + "\3\2\2\2\u0082\u0084\7\4\2\2\u0083v\3\2\2\2\u0083\u0084\3\2\2\2\u0084"+ + "\u0085\3\2\2\2\u0085\u00da\5\6\4\2\u0086\u0092\7\31\2\2\u0087\u008e\7"+ + "\3\2\2\u0088\u0089\7G\2\2\u0089\u008d\t\4\2\2\u008a\u008b\7$\2\2\u008b"+ + "\u008d\t\3\2\2\u008c\u0088\3\2\2\2\u008c\u008a\3\2\2\2\u008d\u0090\3\2"+ + "\2\2\u008e\u008c\3\2\2\2\u008e\u008f\3\2\2\2\u008f\u0091\3\2\2\2\u0090"+ + "\u008e\3\2\2\2\u0091\u0093\7\4\2\2\u0092\u0087\3\2\2\2\u0092\u0093\3\2"+ + "\2\2\u0093\u0094\3\2\2\2\u0094\u00da\5\6\4\2\u0095\u0096\7O\2\2\u0096"+ + "\u0099\7R\2\2\u0097\u009a\5\66\34\2\u0098\u009a\5b\62\2\u0099\u0097\3"+ + "\2\2\2\u0099\u0098\3\2\2\2\u0099\u009a\3\2\2\2\u009a\u00da\3\2\2\2\u009b"+ + "\u009c\7O\2\2\u009c\u009d\7\23\2\2\u009d\u00a0\t\5\2\2\u009e\u00a1\5\66"+ + "\34\2\u009f\u00a1\5b\62\2\u00a0\u009e\3\2\2\2\u00a0\u009f\3\2\2\2\u00a1"+ + "\u00da\3\2\2\2\u00a2\u00a5\t\6\2\2\u00a3\u00a6\5\66\34\2\u00a4\u00a6\5"+ + "b\62\2\u00a5\u00a3\3\2\2\2\u00a5\u00a4\3\2\2\2\u00a6\u00da\3\2\2\2\u00a7"+ + "\u00a8\7O\2\2\u00a8\u00aa\7\'\2\2\u00a9\u00ab\5\66\34\2\u00aa\u00a9\3"+ + "\2\2\2\u00aa\u00ab\3\2\2\2\u00ab\u00da\3\2\2\2\u00ac\u00ad\7O\2\2\u00ad"+ + "\u00da\7K\2\2\u00ae\u00af\7P\2\2\u00af\u00b2\7R\2\2\u00b0\u00b1\7\21\2"+ + "\2\u00b1\u00b3\5\66\34\2\u00b2\u00b0\3\2\2\2\u00b2\u00b3\3\2\2\2\u00b3"+ + "\u00b6\3\2\2\2\u00b4\u00b7\5\66\34\2\u00b5\u00b7\5b\62\2\u00b6\u00b4\3"+ + "\2\2\2\u00b6\u00b5\3\2\2\2\u00b6\u00b7\3\2\2\2\u00b7\u00c1\3\2\2\2\u00b8"+ + "\u00b9\7V\2\2\u00b9\u00be\5j\66\2\u00ba\u00bb\7\5\2\2\u00bb\u00bd\5j\66"+ + "\2\u00bc\u00ba\3\2\2\2\u00bd\u00c0\3\2\2\2\u00be\u00bc\3\2\2\2\u00be\u00bf"+ + "\3\2\2\2\u00bf\u00c2\3\2\2\2\u00c0\u00be\3\2\2\2\u00c1\u00b8\3\2\2\2\u00c1"+ + "\u00c2\3\2\2\2\u00c2\u00da\3\2\2\2\u00c3\u00c4\7P\2\2\u00c4\u00c7\7\23"+ + "\2\2\u00c5\u00c6\7\21\2\2\u00c6\u00c8\5j\66\2\u00c7\u00c5\3\2\2\2\u00c7"+ + "\u00c8\3\2\2\2\u00c8\u00cc\3\2\2\2\u00c9\u00ca\7Q\2\2\u00ca\u00cd\5\66"+ + "\34\2\u00cb\u00cd\5b\62\2\u00cc\u00c9\3\2\2\2\u00cc\u00cb\3\2\2\2\u00cc"+ + "\u00cd\3\2\2\2\u00cd\u00cf\3\2\2\2\u00ce\u00d0\5\66\34\2\u00cf\u00ce\3"+ + "\2\2\2\u00cf\u00d0\3\2\2\2\u00d0\u00da\3\2\2\2\u00d1\u00d2\7P\2\2\u00d2"+ + "\u00d7\7W\2\2\u00d3\u00d5\t\7\2\2\u00d4\u00d3\3\2\2\2\u00d4\u00d5\3\2"+ + "\2\2\u00d5\u00d6\3\2\2\2\u00d6\u00d8\5h\65\2\u00d7\u00d4\3\2\2\2\u00d7"+ + "\u00d8\3\2\2\2\u00d8\u00da\3\2\2\2\u00d9t\3\2\2\2\u00d9u\3\2\2\2\u00d9"+ + "\u0086\3\2\2\2\u00d9\u0095\3\2\2\2\u00d9\u009b\3\2\2\2\u00d9\u00a2\3\2"+ + "\2\2\u00d9\u00a7\3\2\2\2\u00d9\u00ac\3\2\2\2\u00d9\u00ae\3\2\2\2\u00d9"+ + "\u00c3\3\2\2\2\u00d9\u00d1\3\2\2\2\u00da\7\3\2\2\2\u00db\u00dc\7[\2\2"+ + "\u00dc\u00e1\5\34\17\2\u00dd\u00de\7\5\2\2\u00de\u00e0\5\34\17\2\u00df"+ + "\u00dd\3\2\2\2\u00e0\u00e3\3\2\2\2\u00e1\u00df\3\2\2\2\u00e1\u00e2\3\2"+ + "\2\2\u00e2\u00e5\3\2\2\2\u00e3\u00e1\3\2\2\2\u00e4\u00db\3\2\2\2\u00e4"+ + "\u00e5\3\2\2\2\u00e5\u00e6\3\2\2\2\u00e6\u00e7\5\n\6\2\u00e7\t\3\2\2\2"+ + "\u00e8\u00f3\5\16\b\2\u00e9\u00ea\7C\2\2\u00ea\u00eb\7\17\2\2\u00eb\u00f0"+ + "\5\20\t\2\u00ec\u00ed\7\5\2\2\u00ed\u00ef\5\20\t\2\u00ee\u00ec\3\2\2\2"+ + "\u00ef\u00f2\3\2\2\2\u00f0\u00ee\3\2\2\2\u00f0\u00f1\3\2\2\2\u00f1\u00f4"+ + "\3\2\2\2\u00f2\u00f0\3\2\2\2\u00f3\u00e9\3\2\2\2\u00f3\u00f4\3\2\2\2\u00f4"+ + "\u00f6\3\2\2\2\u00f5\u00f7\5\f\7\2\u00f6\u00f5\3\2\2\2\u00f6\u00f7\3\2"+ + "\2\2\u00f7\13\3\2\2\2\u00f8\u00f9\7\65\2\2\u00f9\u00fe\t\b\2\2\u00fa\u00fb"+ + "\7`\2\2\u00fb\u00fc\t\b\2\2\u00fc\u00fe\7e\2\2\u00fd\u00f8\3\2\2\2\u00fd"+ + "\u00fa\3\2\2\2\u00fe\r\3\2\2\2\u00ff\u0105\5\22\n\2\u0100\u0101\7\3\2"+ + "\2\u0101\u0102\5\n\6\2\u0102\u0103\7\4\2\2\u0103\u0105\3\2\2\2\u0104\u00ff"+ + "\3\2\2\2\u0104\u0100\3\2\2\2\u0105\17\3\2\2\2\u0106\u0108\5,\27\2\u0107"+ + "\u0109\t\t\2\2\u0108\u0107\3\2\2\2\u0108\u0109\3\2\2\2\u0109\u010c\3\2"+ + "\2\2\u010a\u010b\7?\2\2\u010b\u010d\t\n\2\2\u010c\u010a\3\2\2\2\u010c"+ + "\u010d\3\2\2\2\u010d\21\3\2\2\2\u010e\u0110\7N\2\2\u010f\u0111\5\36\20"+ + "\2\u0110\u010f\3\2\2\2\u0110\u0111\3\2\2\2\u0111\u0112\3\2\2\2\u0112\u0117"+ + "\5 \21\2\u0113\u0114\7\5\2\2\u0114\u0116\5 \21\2\u0115\u0113\3\2\2\2\u0116"+ + "\u0119\3\2\2\2\u0117\u0115\3\2\2\2\u0117\u0118\3\2\2\2\u0118\u011b\3\2"+ + "\2\2\u0119\u0117\3\2\2\2\u011a\u011c\5\24\13\2\u011b\u011a\3\2\2\2\u011b"+ + "\u011c\3\2\2\2\u011c\u011f\3\2\2\2\u011d\u011e\7Z\2\2\u011e\u0120\5.\30"+ + "\2\u011f\u011d\3\2\2\2\u011f\u0120\3\2\2\2\u0120\u0124\3\2\2\2\u0121\u0122"+ + "\7)\2\2\u0122\u0123\7\17\2\2\u0123\u0125\5\26\f\2\u0124\u0121\3\2\2\2"+ + "\u0124\u0125\3\2\2\2\u0125\u0128\3\2\2\2\u0126\u0127\7*\2\2\u0127\u0129"+ + "\5.\30\2\u0128\u0126\3\2\2\2\u0128\u0129\3\2\2\2\u0129\23\3\2\2\2\u012a"+ + "\u012b\7%\2\2\u012b\u0130\5\"\22\2\u012c\u012d\7\5\2\2\u012d\u012f\5\""+ + "\22\2\u012e\u012c\3\2\2\2\u012f\u0132\3\2\2\2\u0130\u012e\3\2\2\2\u0130"+ + "\u0131\3\2\2\2\u0131\25\3\2\2\2\u0132\u0130\3\2\2\2\u0133\u0135\5\36\20"+ + "\2\u0134\u0133\3\2\2\2\u0134\u0135\3\2\2\2\u0135\u0136\3\2\2\2\u0136\u013b"+ + "\5\30\r\2\u0137\u0138\7\5\2\2\u0138\u013a\5\30\r\2\u0139\u0137\3\2\2\2"+ + "\u013a\u013d\3\2\2\2\u013b\u0139\3\2\2\2\u013b\u013c\3\2\2\2\u013c\27"+ + "\3\2\2\2\u013d\u013b\3\2\2\2\u013e\u013f\5\32\16\2\u013f\31\3\2\2\2\u0140"+ + "\u0149\7\3\2\2\u0141\u0146\5,\27\2\u0142\u0143\7\5\2\2\u0143\u0145\5,"+ + "\27\2\u0144\u0142\3\2\2\2\u0145\u0148\3\2\2\2\u0146\u0144\3\2\2\2\u0146"+ + "\u0147\3\2\2\2\u0147\u014a\3\2\2\2\u0148\u0146\3\2\2\2\u0149\u0141\3\2"+ + "\2\2\u0149\u014a\3\2\2\2\u014a\u014b\3\2\2\2\u014b\u014e\7\4\2\2\u014c"+ + "\u014e\5,\27\2\u014d\u0140\3\2\2\2\u014d\u014c\3\2\2\2\u014e\33\3\2\2"+ + "\2\u014f\u0150\5`\61\2\u0150\u0151\7\f\2\2\u0151\u0152\7\3\2\2\u0152\u0153"+ + "\5\n\6\2\u0153\u0154\7\4\2\2\u0154\35\3\2\2\2\u0155\u0156\t\13\2\2\u0156"+ + "\37\3\2\2\2\u0157\u015c\5,\27\2\u0158\u015a\7\f\2\2\u0159\u0158\3\2\2"+ + "\2\u0159\u015a\3\2\2\2\u015a\u015b\3\2\2\2\u015b\u015d\5`\61\2\u015c\u0159"+ + "\3\2\2\2\u015c\u015d\3\2\2\2\u015d!\3\2\2\2\u015e\u0162\5*\26\2\u015f"+ + "\u0161\5$\23\2\u0160\u015f\3\2\2\2\u0161\u0164\3\2\2\2\u0162\u0160\3\2"+ + "\2\2\u0162\u0163\3\2\2\2\u0163#\3\2\2\2\u0164\u0162\3\2\2\2\u0165\u0166"+ + "\5&\24\2\u0166\u0167\7\61\2\2\u0167\u0169\5*\26\2\u0168\u016a\5(\25\2"+ + "\u0169\u0168\3\2\2\2\u0169\u016a\3\2\2\2\u016a\u0171\3\2\2\2\u016b\u016c"+ + "\7<\2\2\u016c\u016d\5&\24\2\u016d\u016e\7\61\2\2\u016e\u016f\5*\26\2\u016f"+ + "\u0171\3\2\2\2\u0170\u0165\3\2\2\2\u0170\u016b\3\2\2\2\u0171%\3\2\2\2"+ + "\u0172\u0174\7.\2\2\u0173\u0172\3\2\2\2\u0173\u0174\3\2\2\2\u0174\u0182"+ + "\3\2\2\2\u0175\u0177\7\63\2\2\u0176\u0178\7D\2\2\u0177\u0176\3\2\2\2\u0177"+ + "\u0178\3\2\2\2\u0178\u0182\3\2\2\2\u0179\u017b\7H\2\2\u017a\u017c\7D\2"+ + "\2\u017b\u017a\3\2\2\2\u017b\u017c\3\2\2\2\u017c\u0182\3\2\2\2\u017d\u017f"+ + "\7&\2\2\u017e\u0180\7D\2\2\u017f\u017e\3\2\2\2\u017f\u0180\3\2\2\2\u0180"+ + "\u0182\3\2\2\2\u0181\u0173\3\2\2\2\u0181\u0175\3\2\2\2\u0181\u0179\3\2"+ + "\2\2\u0181\u017d\3\2\2\2\u0182\'\3\2\2\2\u0183\u0184\7@\2\2\u0184\u0192"+ + "\5.\30\2\u0185\u0186\7X\2\2\u0186\u0187\7\3\2\2\u0187\u018c\5`\61\2\u0188"+ + "\u0189\7\5\2\2\u0189\u018b\5`\61\2\u018a\u0188\3\2\2\2\u018b\u018e\3\2"+ + "\2\2\u018c\u018a\3\2\2\2\u018c\u018d\3\2\2\2\u018d\u018f\3\2\2\2\u018e"+ + "\u018c\3\2\2\2\u018f\u0190\7\4\2\2\u0190\u0192\3\2\2\2\u0191\u0183\3\2"+ + "\2\2\u0191\u0185\3\2\2\2\u0192)\3\2\2\2\u0193\u0198\5b\62\2\u0194\u0196"+ + "\7\f\2\2\u0195\u0194\3\2\2\2\u0195\u0196\3\2\2\2\u0196\u0197\3\2\2\2\u0197"+ + "\u0199\5^\60\2\u0198\u0195\3\2\2\2\u0198\u0199\3\2\2\2\u0199\u01ad\3\2"+ + "\2\2\u019a\u019b\7\3\2\2\u019b\u019c\5\n\6\2\u019c\u01a1\7\4\2\2\u019d"+ + "\u019f\7\f\2\2\u019e\u019d\3\2\2\2\u019e\u019f\3\2\2\2\u019f\u01a0\3\2"+ + "\2\2\u01a0\u01a2\5^\60\2\u01a1\u019e\3\2\2\2\u01a1\u01a2\3\2\2\2\u01a2"+ + "\u01ad\3\2\2\2\u01a3\u01a4\7\3\2\2\u01a4\u01a5\5\"\22\2\u01a5\u01aa\7"+ + "\4\2\2\u01a6\u01a8\7\f\2\2\u01a7\u01a6\3\2\2\2\u01a7\u01a8\3\2\2\2\u01a8"+ + "\u01a9\3\2\2\2\u01a9\u01ab\5^\60\2\u01aa\u01a7\3\2\2\2\u01aa\u01ab\3\2"+ + "\2\2\u01ab\u01ad\3\2\2\2\u01ac\u0193\3\2\2\2\u01ac\u019a\3\2\2\2\u01ac"+ + "\u01a3\3\2\2\2\u01ad+\3\2\2\2\u01ae\u01af\5.\30\2\u01af-\3\2\2\2\u01b0"+ + "\u01b1\b\30\1\2\u01b1\u01b2\7=\2\2\u01b2\u01d0\5.\30\n\u01b3\u01b4\7\37"+ + "\2\2\u01b4\u01b5\7\3\2\2\u01b5\u01b6\5\b\5\2\u01b6\u01b7\7\4\2\2\u01b7"+ + "\u01d0\3\2\2\2\u01b8\u01b9\7J\2\2\u01b9\u01ba\7\3\2\2\u01ba\u01bb\5j\66"+ + "\2\u01bb\u01bc\5\60\31\2\u01bc\u01bd\7\4\2\2\u01bd\u01d0\3\2\2\2\u01be"+ + "\u01bf\7\67\2\2\u01bf\u01c0\7\3\2\2\u01c0\u01c1\5^\60\2\u01c1\u01c2\7"+ + "\5\2\2\u01c2\u01c3\5j\66\2\u01c3\u01c4\5\60\31\2\u01c4\u01c5\7\4\2\2\u01c5"+ + "\u01d0\3\2\2\2\u01c6\u01c7\7\67\2\2\u01c7\u01c8\7\3\2\2\u01c8\u01c9\5"+ + "j\66\2\u01c9\u01ca\7\5\2\2\u01ca\u01cb\5j\66\2\u01cb\u01cc\5\60\31\2\u01cc"+ + "\u01cd\7\4\2\2\u01cd\u01d0\3\2\2\2\u01ce\u01d0\5\62\32\2\u01cf\u01b0\3"+ + "\2\2\2\u01cf\u01b3\3\2\2\2\u01cf\u01b8\3\2\2\2\u01cf\u01be\3\2\2\2\u01cf"+ + "\u01c6\3\2\2\2\u01cf\u01ce\3\2\2\2\u01d0\u01d9\3\2\2\2\u01d1\u01d2\f\4"+ + "\2\2\u01d2\u01d3\7\n\2\2\u01d3\u01d8\5.\30\5\u01d4\u01d5\f\3\2\2\u01d5"+ + "\u01d6\7B\2\2\u01d6\u01d8\5.\30\4\u01d7\u01d1\3\2\2\2\u01d7\u01d4\3\2"+ + "\2\2\u01d8\u01db\3\2\2\2\u01d9\u01d7\3\2\2\2\u01d9\u01da\3\2\2\2\u01da"+ + "/\3\2\2\2\u01db\u01d9\3\2\2\2\u01dc\u01dd\7\5\2\2\u01dd\u01df\5j\66\2"+ + "\u01de\u01dc\3\2\2\2\u01df\u01e2\3\2\2\2\u01e0\u01de\3\2\2\2\u01e0\u01e1"+ + "\3\2\2\2\u01e1\61\3\2\2\2\u01e2\u01e0\3\2\2\2\u01e3\u01e5\5<\37\2\u01e4"+ + "\u01e6\5\64\33\2\u01e5\u01e4\3\2\2\2\u01e5\u01e6\3\2\2\2\u01e6\63\3\2"+ + "\2\2\u01e7\u01e9\7=\2\2\u01e8\u01e7\3\2\2\2\u01e8\u01e9\3\2\2\2\u01e9"+ + "\u01ea\3\2\2\2\u01ea\u01eb\7\16\2\2\u01eb\u01ec\5<\37\2\u01ec\u01ed\7"+ + "\n\2\2\u01ed\u01ee\5<\37\2\u01ee\u0216\3\2\2\2\u01ef\u01f1\7=\2\2\u01f0"+ + "\u01ef\3\2\2\2\u01f0\u01f1\3\2\2\2\u01f1\u01f2\3\2\2\2\u01f2\u01f3\7-"+ + "\2\2\u01f3\u01f4\7\3\2\2\u01f4\u01f9\5<\37\2\u01f5\u01f6\7\5\2\2\u01f6"+ + "\u01f8\5<\37\2\u01f7\u01f5\3\2\2\2\u01f8\u01fb\3\2\2\2\u01f9\u01f7\3\2"+ + "\2\2\u01f9\u01fa\3\2\2\2\u01fa\u01fc\3\2\2\2\u01fb\u01f9\3\2\2\2\u01fc"+ + "\u01fd\7\4\2\2\u01fd\u0216\3\2\2\2\u01fe\u0200\7=\2\2\u01ff\u01fe\3\2"+ + "\2\2\u01ff\u0200\3\2\2\2\u0200\u0201\3\2\2\2\u0201\u0202\7-\2\2\u0202"+ + "\u0203\7\3\2\2\u0203\u0204\5\b\5\2\u0204\u0205\7\4\2\2\u0205\u0216\3\2"+ + "\2\2\u0206\u0208\7=\2\2\u0207\u0206\3\2\2\2\u0207\u0208\3\2\2\2\u0208"+ + "\u0209\3\2\2\2\u0209\u020a\7\64\2\2\u020a\u0216\58\35\2\u020b\u020d\7"+ + "=\2\2\u020c\u020b\3\2\2\2\u020c\u020d\3\2\2\2\u020d\u020e\3\2\2\2\u020e"+ + "\u020f\7I\2\2\u020f\u0216\5j\66\2\u0210\u0212\7\60\2\2\u0211\u0213\7="+ + "\2\2\u0212\u0211\3\2\2\2\u0212\u0213\3\2\2\2\u0213\u0214\3\2\2\2\u0214"+ + "\u0216\7>\2\2\u0215\u01e8\3\2\2\2\u0215\u01f0\3\2\2\2\u0215\u01ff\3\2"+ + "\2\2\u0215\u0207\3\2\2\2\u0215\u020c\3\2\2\2\u0215\u0210\3\2\2\2\u0216"+ + "\65\3\2\2\2\u0217\u0218\7\64\2\2\u0218\u0219\58\35\2\u0219\67\3\2\2\2"+ + "\u021a\u021c\5j\66\2\u021b\u021d\5:\36\2\u021c\u021b\3\2\2\2\u021c\u021d"+ + "\3\2\2\2\u021d9\3\2\2\2\u021e\u021f\7\35\2\2\u021f\u0225\5j\66\2\u0220"+ + "\u0221\7^\2\2\u0221\u0222\5j\66\2\u0222\u0223\7e\2\2\u0223\u0225\3\2\2"+ + "\2\u0224\u021e\3\2\2\2\u0224\u0220\3\2\2\2\u0225;\3\2\2\2\u0226\u0227"+ + "\b\37\1\2\u0227\u022b\5> \2\u0228\u0229\t\7\2\2\u0229\u022b\5<\37\7\u022a"+ + "\u0226\3\2\2\2\u022a\u0228\3\2\2\2\u022b\u023b\3\2\2\2\u022c\u022d\f\6"+ + "\2\2\u022d\u022e\t\f\2\2\u022e\u023a\5<\37\7\u022f\u0230\f\5\2\2\u0230"+ + "\u0231\t\7\2\2\u0231\u023a\5<\37\6\u0232\u0233\f\4\2\2\u0233\u0234\5T"+ + "+\2\u0234\u0235\5<\37\5\u0235\u023a\3\2\2\2\u0236\u0237\f\3\2\2\u0237"+ + "\u0238\7r\2\2\u0238\u023a\5\\/\2\u0239\u022c\3\2\2\2\u0239\u022f\3\2\2"+ + "\2\u0239\u0232\3\2\2\2\u0239\u0236\3\2\2\2\u023a\u023d\3\2\2\2\u023b\u0239"+ + "\3\2\2\2\u023b\u023c\3\2\2\2\u023c=\3\2\2\2\u023d\u023b\3\2\2\2\u023e"+ + "\u0253\5B\"\2\u023f\u0253\5H%\2\u0240\u0253\5@!\2\u0241\u0253\5R*\2\u0242"+ + "\u0243\5^\60\2\u0243\u0244\7t\2\2\u0244\u0246\3\2\2\2\u0245\u0242\3\2"+ + "\2\2\u0245\u0246\3\2\2\2\u0246\u0247\3\2\2\2\u0247\u0253\7o\2\2\u0248"+ + "\u0253\5L\'\2\u0249\u024a\7\3\2\2\u024a\u024b\5\b\5\2\u024b\u024c\7\4"+ + "\2\2\u024c\u0253\3\2\2\2\u024d\u0253\5^\60\2\u024e\u024f\7\3\2\2\u024f"+ + "\u0250\5,\27\2\u0250\u0251\7\4\2\2\u0251\u0253\3\2\2\2\u0252\u023e\3\2"+ + "\2\2\u0252\u023f\3\2\2\2\u0252\u0240\3\2\2\2\u0252\u0241\3\2\2\2\u0252"+ + "\u0245\3\2\2\2\u0252\u0248\3\2\2\2\u0252\u0249\3\2\2\2\u0252\u024d\3\2"+ + "\2\2\u0252\u024e\3\2\2\2\u0253?\3\2\2\2\u0254\u0257\7\25\2\2\u0255\u0256"+ + "\7\3\2\2\u0256\u0258\7\4\2\2\u0257\u0255\3\2\2\2\u0257\u0258\3\2\2\2\u0258"+ + "\u0262\3\2\2\2\u0259\u025f\7\26\2\2\u025a\u025c\7\3\2\2\u025b\u025d\7"+ + "w\2\2\u025c\u025b\3\2\2\2\u025c\u025d\3\2\2\2\u025d\u025e\3\2\2\2\u025e"+ + "\u0260\7\4\2\2\u025f\u025a\3\2\2\2\u025f\u0260\3\2\2\2\u0260\u0262\3\2"+ + "\2\2\u0261\u0254\3\2\2\2\u0261\u0259\3\2\2\2\u0262A\3\2\2\2\u0263\u026e"+ + "\5D#\2\u0264\u0265\7_\2\2\u0265\u0266\5D#\2\u0266\u0267\7e\2\2\u0267\u026e"+ + "\3\2\2\2\u0268\u026e\5F$\2\u0269\u026a\7_\2\2\u026a\u026b\5F$\2\u026b"+ + "\u026c\7e\2\2\u026c\u026e\3\2\2\2\u026d\u0263\3\2\2\2\u026d\u0264\3\2"+ + "\2\2\u026d\u0268\3\2\2\2\u026d\u0269\3\2\2\2\u026eC\3\2\2\2\u026f\u0270"+ + "\7\20\2\2\u0270\u0271\7\3\2\2\u0271\u0272\5,\27\2\u0272\u0273\7\f\2\2"+ + "\u0273\u0274\5\\/\2\u0274\u0275\7\4\2\2\u0275E\3\2\2\2\u0276\u0277\7\24"+ + "\2\2\u0277\u0278\7\3\2\2\u0278\u0279\5,\27\2\u0279\u027a\7\5\2\2\u027a"+ + "\u027b\5\\/\2\u027b\u027c\7\4\2\2\u027cG\3\2\2\2\u027d\u0283\5J&\2\u027e"+ + "\u027f\7_\2\2\u027f\u0280\5J&\2\u0280\u0281\7e\2\2\u0281\u0283\3\2\2\2"+ + "\u0282\u027d\3\2\2\2\u0282\u027e\3\2\2\2\u0283I\3\2\2\2\u0284\u0285\7"+ + "!\2\2\u0285\u0286\7\3\2\2\u0286\u0287\5`\61\2\u0287\u0288\7%\2\2\u0288"+ + "\u0289\5<\37\2\u0289\u028a\7\4\2\2\u028aK\3\2\2\2\u028b\u0291\5N(\2\u028c"+ + "\u028d\7_\2\2\u028d\u028e\5N(\2\u028e\u028f\7e\2\2\u028f\u0291\3\2\2\2"+ + "\u0290\u028b\3\2\2\2\u0290\u028c\3\2\2\2\u0291M\3\2\2\2\u0292\u0293\5"+ + "P)\2\u0293\u029f\7\3\2\2\u0294\u0296\5\36\20\2\u0295\u0294\3\2\2\2\u0295"+ + "\u0296\3\2\2\2\u0296\u0297\3\2\2\2\u0297\u029c\5,\27\2\u0298\u0299\7\5"+ + "\2\2\u0299\u029b\5,\27\2\u029a\u0298\3\2\2\2\u029b\u029e\3\2\2\2\u029c"+ + "\u029a\3\2\2\2\u029c\u029d\3\2\2\2\u029d\u02a0\3\2\2\2\u029e\u029c\3\2"+ + "\2\2\u029f\u0295\3\2\2\2\u029f\u02a0\3\2\2\2\u02a0\u02a1\3\2\2\2\u02a1"+ + "\u02a2\7\4\2\2\u02a2O\3\2\2\2\u02a3\u02a7\7\63\2\2\u02a4\u02a7\7H\2\2"+ + "\u02a5\u02a7\5`\61\2\u02a6\u02a3\3\2\2\2\u02a6\u02a4\3\2\2\2\u02a6\u02a5"+ + "\3\2\2\2\u02a7Q\3\2\2\2\u02a8\u02c3\7>\2\2\u02a9\u02c3\5X-\2\u02aa\u02c3"+ + "\5h\65\2\u02ab\u02c3\5V,\2\u02ac\u02ae\7v\2\2\u02ad\u02ac\3\2\2\2\u02ae"+ + "\u02af\3\2\2\2\u02af\u02ad\3\2\2\2\u02af\u02b0\3\2\2\2\u02b0\u02c3\3\2"+ + "\2\2\u02b1\u02c3\7u\2\2\u02b2\u02b3\7a\2\2\u02b3\u02b4\5j\66\2\u02b4\u02b5"+ + "\7e\2\2\u02b5\u02c3\3\2\2\2\u02b6\u02b7\7b\2\2\u02b7\u02b8\5j\66\2\u02b8"+ + "\u02b9\7e\2\2\u02b9\u02c3\3\2\2\2\u02ba\u02bb\7c\2\2\u02bb\u02bc\5j\66"+ + "\2\u02bc\u02bd\7e\2\2\u02bd\u02c3\3\2\2\2\u02be\u02bf\7d\2\2\u02bf\u02c0"+ + "\5j\66\2\u02c0\u02c1\7e\2\2\u02c1\u02c3\3\2\2\2\u02c2\u02a8\3\2\2\2\u02c2"+ + "\u02a9\3\2\2\2\u02c2\u02aa\3\2\2\2\u02c2\u02ab\3\2\2\2\u02c2\u02ad\3\2"+ + "\2\2\u02c2\u02b1\3\2\2\2\u02c2\u02b2\3\2\2\2\u02c2\u02b6\3\2\2\2\u02c2"+ + "\u02ba\3\2\2\2\u02c2\u02be\3\2\2\2\u02c3S\3\2\2\2\u02c4\u02c5\t\r\2\2"+ + "\u02c5U\3\2\2\2\u02c6\u02c7\t\16\2\2\u02c7W\3\2\2\2\u02c8\u02ca\7/\2\2"+ + "\u02c9\u02cb\t\7\2\2\u02ca\u02c9\3\2\2\2\u02ca\u02cb\3\2\2\2\u02cb\u02ce"+ + "\3\2\2\2\u02cc\u02cf\5h\65\2\u02cd\u02cf\5j\66\2\u02ce\u02cc\3\2\2\2\u02ce"+ + "\u02cd\3\2\2\2\u02cf\u02d0\3\2\2\2\u02d0\u02d3\5Z.\2\u02d1\u02d2\7U\2"+ + "\2\u02d2\u02d4\5Z.\2\u02d3\u02d1\3\2\2\2\u02d3\u02d4\3\2\2\2\u02d4Y\3"+ + "\2\2\2\u02d5\u02d6\t\17\2\2\u02d6[\3\2\2\2\u02d7\u02d8\5`\61\2\u02d8]"+ + "\3\2\2\2\u02d9\u02da\5`\61\2\u02da\u02db\7t\2\2\u02db\u02dd\3\2\2\2\u02dc"+ + "\u02d9\3\2\2\2\u02dd\u02e0\3\2\2\2\u02de\u02dc\3\2\2\2\u02de\u02df\3\2"+ + "\2\2\u02df\u02e1\3\2\2\2\u02e0\u02de\3\2\2\2\u02e1\u02e2\5`\61\2\u02e2"+ + "_\3\2\2\2\u02e3\u02e6\5d\63\2\u02e4\u02e6\5f\64\2\u02e5\u02e3\3\2\2\2"+ + "\u02e5\u02e4\3\2\2\2\u02e6a\3\2\2\2\u02e7\u02e8\5`\61\2\u02e8\u02e9\7"+ + "\6\2\2\u02e9\u02eb\3\2\2\2\u02ea\u02e7\3\2\2\2\u02ea\u02eb\3\2\2\2\u02eb"+ + "\u02ec\3\2\2\2\u02ec\u02f4\7{\2\2\u02ed\u02ee\5`\61\2\u02ee\u02ef\7\6"+ + "\2\2\u02ef\u02f1\3\2\2\2\u02f0\u02ed\3\2\2\2\u02f0\u02f1\3\2\2\2\u02f1"+ + "\u02f2\3\2\2\2\u02f2\u02f4\5`\61\2\u02f3\u02ea\3\2\2\2\u02f3\u02f0\3\2"+ + "\2\2\u02f4c\3\2\2\2\u02f5\u02f8\7|\2\2\u02f6\u02f8\7}\2\2\u02f7\u02f5"+ + "\3\2\2\2\u02f7\u02f6\3\2\2\2\u02f8e\3\2\2\2\u02f9\u02fd\7y\2\2\u02fa\u02fd"+ + "\5l\67\2\u02fb\u02fd\7z\2\2\u02fc\u02f9\3\2\2\2\u02fc\u02fa\3\2\2\2\u02fc"+ + "\u02fb\3\2\2\2\u02fdg\3\2\2\2\u02fe\u0301\7x\2\2\u02ff\u0301\7w\2\2\u0300"+ + "\u02fe\3\2\2\2\u0300\u02ff\3\2\2\2\u0301i\3\2\2\2\u0302\u0303\t\20\2\2"+ + "\u0303k\3\2\2\2\u0304\u0305\t\21\2\2\u0305m\3\2\2\2j}\177\u0083\u008c"+ + "\u008e\u0092\u0099\u00a0\u00a5\u00aa\u00b2\u00b6\u00be\u00c1\u00c7\u00cc"+ + "\u00cf\u00d4\u00d7\u00d9\u00e1\u00e4\u00f0\u00f3\u00f6\u00fd\u0104\u0108"+ + "\u010c\u0110\u0117\u011b\u011f\u0124\u0128\u0130\u0134\u013b\u0146\u0149"+ + "\u014d\u0159\u015c\u0162\u0169\u0170\u0173\u0177\u017b\u017f\u0181\u018c"+ + "\u0191\u0195\u0198\u019e\u01a1\u01a7\u01aa\u01ac\u01cf\u01d7\u01d9\u01e0"+ + "\u01e5\u01e8\u01f0\u01f9\u01ff\u0207\u020c\u0212\u0215\u021c\u0224\u022a"+ + "\u0239\u023b\u0245\u0252\u0257\u025c\u025f\u0261\u026d\u0282\u0290\u0295"+ + "\u029c\u029f\u02a6\u02af\u02c2\u02ca\u02ce\u02d3\u02de\u02e5\u02ea\u02f0"+ + "\u02f3\u02f7\u02fc\u0300"; public static final ATN _ATN = new ATNDeserializer().deserialize(_serializedATN.toCharArray()); static { diff --git a/x-pack/plugin/sql/src/main/java/org/elasticsearch/xpack/sql/parser/SqlBaseVisitor.java b/x-pack/plugin/sql/src/main/java/org/elasticsearch/xpack/sql/parser/SqlBaseVisitor.java index ed64045191be0..8e8b9e5ab9ed7 100644 --- a/x-pack/plugin/sql/src/main/java/org/elasticsearch/xpack/sql/parser/SqlBaseVisitor.java +++ b/x-pack/plugin/sql/src/main/java/org/elasticsearch/xpack/sql/parser/SqlBaseVisitor.java @@ -330,6 +330,13 @@ interface SqlBaseVisitor extends ParseTreeVisitor { * @return the visitor result */ T visitComparison(SqlBaseParser.ComparisonContext ctx); + /** + * Visit a parse tree produced by the {@code castOperatorExpression} + * labeled alternative in {@link SqlBaseParser#valueExpression}. + * @param ctx the parse tree + * @return the visitor result + */ + T visitCastOperatorExpression(SqlBaseParser.CastOperatorExpressionContext ctx); /** * Visit a parse tree produced by the {@code arithmeticBinary} * labeled alternative in {@link SqlBaseParser#valueExpression}. @@ -408,23 +415,23 @@ interface SqlBaseVisitor extends ParseTreeVisitor { */ T visitParenthesizedExpression(SqlBaseParser.ParenthesizedExpressionContext ctx); /** - * Visit a parse tree produced by {@link SqlBaseParser#castExpression}. + * Visit a parse tree produced by {@link SqlBaseParser#builtinDateTimeFunction}. * @param ctx the parse tree * @return the visitor result */ - T visitCastExpression(SqlBaseParser.CastExpressionContext ctx); + T visitBuiltinDateTimeFunction(SqlBaseParser.BuiltinDateTimeFunctionContext ctx); /** - * Visit a parse tree produced by {@link SqlBaseParser#castTemplate}. + * Visit a parse tree produced by {@link SqlBaseParser#castExpression}. * @param ctx the parse tree * @return the visitor result */ - T visitCastTemplate(SqlBaseParser.CastTemplateContext ctx); + T visitCastExpression(SqlBaseParser.CastExpressionContext ctx); /** - * Visit a parse tree produced by {@link SqlBaseParser#builtinDateTimeFunction}. + * Visit a parse tree produced by {@link SqlBaseParser#castTemplate}. * @param ctx the parse tree * @return the visitor result */ - T visitBuiltinDateTimeFunction(SqlBaseParser.BuiltinDateTimeFunctionContext ctx); + T visitCastTemplate(SqlBaseParser.CastTemplateContext ctx); /** * Visit a parse tree produced by {@link SqlBaseParser#convertTemplate}. * @param ctx the parse tree diff --git a/x-pack/plugin/sql/src/test/java/org/elasticsearch/xpack/sql/parser/ExpressionTests.java b/x-pack/plugin/sql/src/test/java/org/elasticsearch/xpack/sql/parser/ExpressionTests.java index 229d39705cd82..66c93c9a3f035 100644 --- a/x-pack/plugin/sql/src/test/java/org/elasticsearch/xpack/sql/parser/ExpressionTests.java +++ b/x-pack/plugin/sql/src/test/java/org/elasticsearch/xpack/sql/parser/ExpressionTests.java @@ -86,7 +86,7 @@ public void testLiteralLongNegative() { } public void testLiteralLongPositive() { - Expression lt = parser.createExpression("+" + String.valueOf(Long.MAX_VALUE)); + Expression lt = parser.createExpression("+" + Long.MAX_VALUE); assertEquals(Literal.class, lt.getClass()); Literal l = (Literal) lt; assertEquals(Long.MAX_VALUE, l.value()); @@ -127,7 +127,7 @@ public void testLiteralDecimalTooBig() { assertEquals("Number [1.9976931348623157e+308] is too large", ex.getErrorMessage()); } - public void testExactDayTimeInterval() throws Exception { + public void testExactDayTimeInterval() { int number = randomIntBetween(-100, 100); assertEquals(Duration.ofDays(number), intervalOf("INTERVAL " + number + " DAY")); number = randomIntBetween(-100, 100); @@ -138,14 +138,14 @@ public void testExactDayTimeInterval() throws Exception { assertEquals(Duration.ofSeconds(number), intervalOf("INTERVAL " + number + " SECOND")); } - public void testExactYearMonthInterval() throws Exception { + public void testExactYearMonthInterval() { int number = randomIntBetween(-100, 100); assertEquals(Period.ofYears(number), intervalOf("INTERVAL " + number + " YEAR")); number = randomIntBetween(-100, 100); assertEquals(Period.ofMonths(number), intervalOf("INTERVAL " + number + " MONTH")); } - public void testStringInterval() throws Exception { + public void testStringInterval() { int randomDay = randomInt(1024); int randomHour = randomInt(23); int randomMinute = randomInt(59); @@ -158,7 +158,7 @@ public void testStringInterval() throws Exception { .plusMillis(randomMilli), intervalOf(value)); } - public void testNegativeStringInterval() throws Exception { + public void testNegativeStringInterval() { int randomDay = randomInt(1024); int randomHour = randomInt(23); int randomMinute = randomInt(59); @@ -218,13 +218,13 @@ public void testComplexArithmetic() { assertEquals("(a-2)-(-3)", sub1.sourceText()); assertEquals(2, sub1.children().size()); assertEquals(Literal.class, sub1.children().get(1).getClass()); - assertEquals("-3", ((Literal) sub1.children().get(1)).sourceText()); + assertEquals("-3", sub1.children().get(1).sourceText()); assertEquals(Sub.class, sub1.children().get(0).getClass()); Sub sub2 = (Sub) sub1.children().get(0); assertEquals(2, sub2.children().size()); assertEquals("?a", sub2.children().get(0).toString()); assertEquals(Literal.class, sub2.children().get(1).getClass()); - assertEquals("2", ((Literal) sub2.children().get(1)).sourceText()); + assertEquals("2", sub2.children().get(1).sourceText()); } public void testEquals() { @@ -278,8 +278,39 @@ public void testCastWithQuotedDataType() { } public void testCastWithInvalidDataType() { - ParsingException ex = expectThrows(ParsingException.class, () -> parser.createExpression("CAST(1 AS INVALID)")); - assertEquals("line 1:12: Does not recognize type invalid", ex.getMessage()); + ParsingException ex = expectThrows(ParsingException.class, () -> parser.createExpression("CAST(1 AS InVaLiD)")); + assertEquals("line 1:12: Does not recognize type [InVaLiD]", ex.getMessage()); + } + + public void testCastOperatorWithUnquotedDataType() { + Expression expr = parser.createExpression("(10* 2)::long"); + assertEquals(Cast.class, expr.getClass()); + Cast cast = (Cast) expr; + assertEquals(DataType.INTEGER, cast.from()); + assertEquals(DataType.LONG, cast.to()); + assertEquals(DataType.LONG, cast.dataType()); + assertEquals(Mul.class, cast.field().getClass()); + Mul mul = (Mul) cast.field(); + assertEquals("10* 2", mul.sourceText()); + assertEquals(DataType.INTEGER, mul.dataType()); + } + + public void testCastOperatorWithQuotedDataType() { + Expression expr = parser.createExpression("(10*2)::\"LonG\""); + assertEquals(Cast.class, expr.getClass()); + Cast cast = (Cast) expr; + assertEquals(DataType.INTEGER, cast.from()); + assertEquals(DataType.LONG, cast.to()); + assertEquals(DataType.LONG, cast.dataType()); + assertEquals(Mul.class, cast.field().getClass()); + Mul mul = (Mul) cast.field(); + assertEquals("10*2", mul.sourceText()); + assertEquals(DataType.INTEGER, mul.dataType()); + } + + public void testCastOperatorWithInvalidDataType() { + ParsingException ex = expectThrows(ParsingException.class, () -> parser.createExpression("-1::InVaLiD")); + assertEquals("line 1:6: Does not recognize type [InVaLiD]", ex.getMessage()); } public void testConvertWithUnquotedDataType() { @@ -378,13 +409,13 @@ public void testCurrentTimestampInvalidPrecision() { assertEquals("line 1:20: Precision needs to be between [0-9], received [100]", ex.getMessage()); } - public void testSourceKeyword() throws Exception { + public void testSourceKeyword() { String s = "CUrrENT_timestamP"; Expression expr = parser.createExpression(s); assertEquals(s, expr.sourceText()); } - public void testSourceFunction() throws Exception { + public void testSourceFunction() { String s = "PerCentile_RaNK(fOO, 12 )"; Expression expr = parser.createExpression(s); assertEquals(s, expr.sourceText()); diff --git a/x-pack/plugin/watcher/src/test/java/org/elasticsearch/xpack/watcher/test/WatcherTestUtils.java b/x-pack/plugin/watcher/src/test/java/org/elasticsearch/xpack/watcher/test/WatcherTestUtils.java index 7f7ff8c93601b..9636d159b52b4 100644 --- a/x-pack/plugin/watcher/src/test/java/org/elasticsearch/xpack/watcher/test/WatcherTestUtils.java +++ b/x-pack/plugin/watcher/src/test/java/org/elasticsearch/xpack/watcher/test/WatcherTestUtils.java @@ -21,6 +21,7 @@ import org.elasticsearch.xpack.core.watcher.common.secret.Secret; import org.elasticsearch.xpack.core.watcher.execution.WatchExecutionContext; import org.elasticsearch.xpack.core.watcher.execution.Wid; +import org.elasticsearch.xpack.core.watcher.support.WatcherDateTimeUtils; import org.elasticsearch.xpack.core.watcher.support.xcontent.XContentSource; import org.elasticsearch.xpack.core.watcher.trigger.TriggerEvent; import org.elasticsearch.xpack.core.watcher.watch.Payload; @@ -52,6 +53,7 @@ import org.elasticsearch.xpack.watcher.trigger.schedule.IntervalSchedule; import org.elasticsearch.xpack.watcher.trigger.schedule.ScheduleTrigger; import org.elasticsearch.xpack.watcher.trigger.schedule.ScheduleTriggerEvent; +import org.hamcrest.Matcher; import javax.mail.internet.AddressException; import java.io.IOException; @@ -69,6 +71,7 @@ import static org.elasticsearch.index.query.QueryBuilders.matchAllQuery; import static org.elasticsearch.search.builder.SearchSourceBuilder.searchSource; import static org.elasticsearch.test.ESTestCase.randomFrom; +import static org.hamcrest.Matchers.is; public final class WatcherTestUtils { @@ -188,4 +191,13 @@ public static Watch createTestWatch(String watchName, Client client, HttpClient public static SearchType getRandomSupportedSearchType() { return randomFrom(SearchType.QUERY_THEN_FETCH, SearchType.DFS_QUERY_THEN_FETCH); } + + public static Matcher isSameDate(ZonedDateTime zonedDateTime) { + /* + When comparing timestamps returned from _search/.watcher-history* the same format of date has to be used + during serialisation to json on index time. + The toString of ZonedDateTime is omitting the millisecond part when is 0. This was not the case in joda. + */ + return is(WatcherDateTimeUtils.formatDate(zonedDateTime)); + } } diff --git a/x-pack/plugin/watcher/src/test/java/org/elasticsearch/xpack/watcher/test/integration/HistoryIntegrationTests.java b/x-pack/plugin/watcher/src/test/java/org/elasticsearch/xpack/watcher/test/integration/HistoryIntegrationTests.java index 35bd7077c3fa1..93d5cb1b4bed5 100644 --- a/x-pack/plugin/watcher/src/test/java/org/elasticsearch/xpack/watcher/test/integration/HistoryIntegrationTests.java +++ b/x-pack/plugin/watcher/src/test/java/org/elasticsearch/xpack/watcher/test/integration/HistoryIntegrationTests.java @@ -17,15 +17,13 @@ import org.elasticsearch.xpack.core.watcher.actions.ActionStatus; import org.elasticsearch.xpack.core.watcher.client.WatchSourceBuilder; import org.elasticsearch.xpack.core.watcher.input.Input; -import org.elasticsearch.xpack.core.watcher.support.WatcherDateTimeUtils; import org.elasticsearch.xpack.core.watcher.support.xcontent.XContentSource; import org.elasticsearch.xpack.core.watcher.watch.WatchStatus; import org.elasticsearch.xpack.watcher.support.search.WatcherSearchTemplateRequest; import org.elasticsearch.xpack.watcher.test.AbstractWatcherIntegrationTestCase; +import org.elasticsearch.xpack.watcher.test.WatcherTestUtils; import org.elasticsearch.xpack.watcher.trigger.schedule.IntervalSchedule; -import org.hamcrest.Matcher; -import java.time.ZonedDateTime; import java.util.Locale; import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder; @@ -152,7 +150,6 @@ public void testPayloadInputWithDotsInFieldNameWorks() throws Exception { } } - @AwaitsFix(bugUrl = "https://github.com/elastic/elasticsearch/issues/38693") public void testThatHistoryContainsStatus() throws Exception { watcherClient().preparePutWatch("test_watch") .setSource(watchBuilder() @@ -176,10 +173,12 @@ public void testThatHistoryContainsStatus() throws Exception { assertThat(active, is(status.state().isActive())); String timestamp = source.getValue("status.state.timestamp"); - assertThat(timestamp, isSameDate(status.state().getTimestamp())); + assertThat(timestamp, WatcherTestUtils.isSameDate(status.state().getTimestamp())); String lastChecked = source.getValue("status.last_checked"); - assertThat(lastChecked, isSameDate(status.lastChecked())); + assertThat(lastChecked, WatcherTestUtils.isSameDate(status.lastChecked())); + String lastMetCondition = source.getValue("status.last_met_condition"); + assertThat(lastMetCondition, WatcherTestUtils.isSameDate(status.lastMetCondition())); Integer version = source.getValue("status.version"); int expectedVersion = (int) (status.version() - 1); @@ -202,12 +201,4 @@ public void testThatHistoryContainsStatus() throws Exception { } - private Matcher isSameDate(ZonedDateTime zonedDateTime) { - /* - When comparing timestamps returned from _search/.watcher-history* the same format of date has to be used - during serialisation to json on index time. - The toString of ZonedDateTime is omitting the millisecond part when is 0. This was not the case in joda. - */ - return is(WatcherDateTimeUtils.formatDate(zonedDateTime)); - } } diff --git a/x-pack/plugin/watcher/src/test/java/org/elasticsearch/xpack/watcher/watch/WatchStatusIntegrationTests.java b/x-pack/plugin/watcher/src/test/java/org/elasticsearch/xpack/watcher/watch/WatchStatusIntegrationTests.java index 20e27bd8b8d15..5d1a24a8d91c1 100644 --- a/x-pack/plugin/watcher/src/test/java/org/elasticsearch/xpack/watcher/watch/WatchStatusIntegrationTests.java +++ b/x-pack/plugin/watcher/src/test/java/org/elasticsearch/xpack/watcher/watch/WatchStatusIntegrationTests.java @@ -12,6 +12,12 @@ import org.elasticsearch.xpack.core.watcher.transport.actions.get.GetWatchResponse; import org.elasticsearch.xpack.watcher.condition.NeverCondition; import org.elasticsearch.xpack.watcher.test.AbstractWatcherIntegrationTestCase; +import org.elasticsearch.xpack.watcher.test.WatcherTestUtils; +import org.hamcrest.FeatureMatcher; +import org.hamcrest.Matcher; + +import java.time.ZonedDateTime; +import java.time.temporal.ChronoField; import static org.elasticsearch.xpack.watcher.actions.ActionBuilders.loggingAction; import static org.elasticsearch.xpack.watcher.client.WatchSourceBuilders.watchBuilder; @@ -19,12 +25,13 @@ import static org.elasticsearch.xpack.watcher.trigger.TriggerBuilders.schedule; import static org.elasticsearch.xpack.watcher.trigger.schedule.IntervalSchedule.Interval.Unit.SECONDS; import static org.elasticsearch.xpack.watcher.trigger.schedule.Schedules.interval; +import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.notNullValue; +import static org.hamcrest.Matchers.nullValue; public class WatchStatusIntegrationTests extends AbstractWatcherIntegrationTestCase { - @AwaitsFix(bugUrl="https://github.com/elastic/elasticsearch/issues/38619") public void testThatStatusGetsUpdated() { WatcherClient watcherClient = watcherClient(); watcherClient.preparePutWatch("_name") @@ -44,10 +51,24 @@ public void testThatStatusGetsUpdated() { GetResponse getResponse = client().prepareGet(".watches", "doc", "_name").get(); getResponse.getSource(); XContentSource source = new XContentSource(getResponse.getSourceAsBytesRef(), XContentType.JSON); + String lastChecked = source.getValue("status.last_checked"); + assertThat(lastChecked, WatcherTestUtils.isSameDate(getWatchResponse.getStatus().lastChecked())); + assertThat(getWatchResponse.getStatus().lastChecked(), isMillisResolution()); + // not started yet, so both nulls + String lastMetCondition = source.getValue("status.last_met_condition"); + assertThat(lastMetCondition, is(nullValue())); + assertThat(getWatchResponse.getStatus().lastMetCondition(), is(nullValue())); + } - assertThat(lastChecked, is(notNullValue())); - assertThat(getWatchResponse.getStatus().lastChecked().toString(), is(lastChecked)); + private Matcher isMillisResolution() { + return new FeatureMatcher(equalTo(true), "has millisecond precision", "precission") { + @Override + protected Boolean featureValueOf(ZonedDateTime actual) { + //if date has millisecond precision its nanosecond field will be rounded to millis (equal millis * 10^6) + return actual.getNano() == actual.get(ChronoField.MILLI_OF_SECOND) * 1000_000; + } + }; } }