SQL: Support for escape sequences #31884

costin · 2018-07-08T16:54:53Z

Enhance grammar to allow JDBC/ODBC escape sequences, namely

date, time and timestamp {d ''}, {t ''} and {ts ''}
guid {guid ''}
LIKE escape {escape ''}
scalar function {fn }

Enhance grammar to allow JDBC/ODBC escape sequences, namely - date, time and timestamp {d ''}, {t ''} and {ts ''} - guid {guid ''} - LIKE escape {escape ''} - scalar function {fn } Fix elastic#31883

elasticmachine · 2018-07-08T16:54:54Z

Pinging @elastic/es-search-aggs

astefan · 2018-07-09T08:56:58Z

x-pack/plugin/sql/src/test/java/org/elasticsearch/xpack/sql/parser/EscapedFunctionsTests.java

+        assertThat(l.dataType(), is(DataType.KEYWORD));
+    }
+
+    public void testGUIDValidation() {


Worth adding some more tests here? Like uppercase/lowercase combined letters and other letters from the alphabet?

The upper/lower case mix is addressed in the following test. Nevertheless I've added a couple of tests that check the different validations of GUID.

…unctions

costin · 2018-07-09T13:50:06Z

run gradle build tests

nik9000

LGTM.

I left a question about naming but 🤷‍♂️, the name is fine, just not one I would have used.

nik9000 · 2018-07-09T17:40:26Z

x-pack/plugin/sql/src/main/antlr/SqlBase.g4

+    | FUNCTION_ESC extractTemplate ESC_END
+    ;
+
+extractTemplate


Why call these xxTemplate?

Out of names to use (which need to be unique between rules and callbacks).

nik9000 · 2018-07-09T17:44:32Z

x-pack/plugin/sql/src/main/java/org/elasticsearch/xpack/sql/parser/ExpressionBuilder.java

@@ -222,17 +235,18 @@ public LikePattern visitPattern(PatternContext ctx) {
        }

        char escape = 0;
-        String escapeString = string(ctx.escape);
+        PatternEscapeContext escapeCtx = ctx.patternEscape();
+        String escapeString = string(escapeCtx != null ? escapeCtx.escape : null);


escapeCtx == null ? null : string(escapeCtx.escape); feels a little cleaner to me. No need to pitch null through string and make the reader wonder what string does with null.

nik9000 · 2018-07-09T17:49:03Z

x-pack/plugin/sql/src/main/java/org/elasticsearch/xpack/sql/parser/SqlBaseBaseListener.java

@@ -1,8 +1,3 @@
-/*


bpintea

LGTM

Enhance grammar to allow JDBC/ODBC escape sequences, namely - date, time and timestamp {d ''}, {t ''} and {ts ''} - guid {guid ''} - LIKE escape {escape ''} - scalar function {fn } Fix #31883 (cherry picked from commit dc633e0)

* master: [TEST] Mute SlackMessageTests.testTemplateRender Docs: Explain closing the high level client [ML] Re-enable memory limit integration tests (#31328) [test] disable packaging tests for suse boxes Add nio transport to security plugin (#31942) XContentTests : Insert random fields at random positions (#30867) Force execution of fetch tasks (#31974) Fix unreachable error condition in AmazonS3Fixture (#32005) Tests: Fix SearchFieldsIT.testDocValueFields (#31995) Add Expected Reciprocal Rank metric (#31891) [ML] Get ForecastRequestStats doc in RestoreModelSnapshotIT (#31973) SQL: Add support for single parameter text manipulating functions (#31874) [ML] Ensure immutability of MlMetadata (#31957) Tests: Mute SearchFieldsIT.testDocValueFields() muted tests due to #31940 Work around reported problem in eclipse (#31960) Move build integration tests out of :buildSrc project (#31961) Tests: Remove use of joda time in some tests (#31922) [Test] Reactive 3rd party tests on CI (#31919) SQL: Support for escape sequences (#31884) SQL: HAVING clause should accept only aggregates (#31872) Docs: fix typo in datehistogram (#31972) Switch url repository rest tests to new style requests (#31944) Switch reindex tests to new style requests (#31941) Docs: Added note about cloud service to installation and getting started [DOCS] Removes alternative docker pull example (#31934) Add Snapshots Status API to High Level Rest Client (#31515) ingest: date_index_name processor template resolution (#31841) Test: fix null failure in watcher test (#31968) Switch test framework to new style requests (#31939) Switch low level rest tests to new style Requests (#31938) Switch high level rest tests to new style requests (#31937) [ML] Mute test failing due to Java 11 date time format parsing bug (#31899) [TEST] Mute SlackMessageTests.testTemplateRender Fix assertIngestDocument wrongfully passing (#31913) Remove unused reference to filePermissionsCache (#31923) rolling upgrade should use a replica to prevent relocations while running a scroll HLREST: Bundle the x-pack protocol project (#31904) Increase logging level for testStressMaybeFlush Added lenient flag for synonym token filter (#31484) [X-Pack] Beats centralized management: security role + licensing (#30520) HLRest: Move xPackInfo() to xPack().info() (#31905) Docs: add security delete role to api call table (#31907) [test] port archive distribution packaging tests (#31314) Watcher: Slack message empty text (#31596) [ML] Mute failing DetectionRulesIT.testCondition() test Fix broken NaN check in MovingFunctions#stdDev() (#31888) Date: Add DateFormatters class that uses java.time (#31856) [ML] Switch native QA tests to a 3 node cluster (#31757) Change trappy float comparison (#31889) Fix building AD URL from domain name (#31849) Add opaque_id to audit logging (#31878) re-enable backcompat tests add support for is_write_index in put-alias body parsing (#31674) Improve release notes script (#31833) [DOCS] Fix broken link in painless example Handle missing values in painless (#30975) Remove the ability to index or query context suggestions without context (#31007) Ingest: Enable Templated Fieldnames in Rename (#31690) [Docs] Fix typo in the Rollup API Quick Reference (#31855) Ingest: Add ignore_missing option to RemoveProc (#31693) Add template config for Beat state to X-Pack Monitoring (#31809) Watcher: Add ssl.trust email account setting (#31684) Remove link to oss-MSI (#31844) Painless: Restructure Definition/Whitelist (#31879) HLREST: Add x-pack-info API (#31870)

* 6.x: Force execution of fetch tasks (#31974) [TEST] Mute SlackMessageTests.testTemplateRender Docs: Explain closing the high level client [test] disable java packaging tests for suse XContentTests : Insert random fields at random positions (#30867) Add Get Snapshots High Level REST API (#31980) Fix unreachable error condition in AmazonS3Fixture (#32005) [6.x][ML] Ensure immutability of MlMetadata (#31994) Add Expected Reciprocal Rank metric (#31891) SQL: Add support for single parameter text manipulating functions (#31874) muted tests due to #31940 Work around reported problem in eclipse (#31960) Move build integration tests out of :buildSrc project (#31961) [Test] Reactive 3rd party tests on CI (#31919) Fix assertIngestDocument wrongfully passing (#31913) (#31951) SQL: Support for escape sequences (#31884) SQL: HAVING clause should accept only aggregates (#31872) Docs: fix typo in datehistogram (#31972) Switch url repository rest tests to new style requests (#31944) Switch reindex tests to new style requests (#31941) Switch test framework to new style requests (#31939) Docs: Added note about cloud service to installation and getting started [DOCS] Removes alternative docker pull example (#31934) ingest: date_index_name processor template resolution (#31841) Test: fix null failure in watcher test (#31968) Watcher: Slack message empty text (#31596) Switch low level rest tests to new style Requests (#31938) Switch high level rest tests to new style requests (#31937) HLREST: Bundle the x-pack protocol project (#31904) [ML] Mute test failing due to Java 11 date time format parsing bug (#31899) Increase logging level for testStressMaybeFlush rolling upgrade should use a replica to prevent relocations while running a scroll [test] port archive distribution packaging tests (#31314) HLRest: Move xPackInfo() to xPack().info() (#31905) Increase logging level for :qa:rolling-upgrade Backport: Add template config for Beat state to X-Pack Monitoring (#31809) (#31893) Fix building AD URL from domain name (#31849) Fix broken NaN check in MovingFunctions#stdDev() (#31888) Change trappy float comparison (#31889) Add opaque_id to audit logging (#31878) add support for is_write_index in put-alias body parsing (#31674) Ingest: Enable Templated Fieldnames in Rename (#31690) (#31896) Ingest: Add ignore_missing option to RemoveProc (#31693) (#31892) [Docs] Fix typo in the Rollup API Quick Reference (#31855) Watcher: Add ssl.trust email account setting (#31684) [PkiRealm] Invalidate cache on role mappings change (#31510) [Security] Check auth scheme case insensitively (#31490) HLREST: Add x-pack-info API (#31870) Remove link to oss-MSI (#31844) Painless: Restructure Definition/Whitelist (#31879)

SQL: Support for escape sequences

0553afb

Enhance grammar to allow JDBC/ODBC escape sequences, namely - date, time and timestamp {d ''}, {t ''} and {ts ''} - guid {guid ''} - LIKE escape {escape ''} - scalar function {fn } Fix elastic#31883

costin added >enhancement v7.0.0 :Analytics/SQL SQL querying v6.4.0 labels Jul 8, 2018

costin self-assigned this Jul 8, 2018

costin requested review from nik9000, astefan and bpintea July 8, 2018 16:54

costin added >feature and removed >enhancement labels Jul 8, 2018

astefan reviewed Jul 9, 2018

View reviewed changes

astefan approved these changes Jul 9, 2018

View reviewed changes

costin added 2 commits July 9, 2018 15:02

More tests

fc1ba95

Merge remote-tracking branch 'remotes/upstream/master' into escaped_f…

99d1714

…unctions

nik9000 approved these changes Jul 9, 2018

View reviewed changes

bpintea approved these changes Jul 10, 2018

View reviewed changes

Code style improvement

503bab2

costin merged commit dc633e0 into elastic:master Jul 11, 2018

costin deleted the escaped_functions branch July 11, 2018 20:36

jimczi added v7.0.0-beta1 and removed v7.0.0 labels Feb 7, 2019

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

SQL: Support for escape sequences #31884

SQL: Support for escape sequences #31884

costin commented Jul 8, 2018

elasticmachine commented Jul 8, 2018

astefan Jul 9, 2018

costin Jul 9, 2018

costin commented Jul 9, 2018

nik9000 left a comment

nik9000 Jul 9, 2018

costin Jul 11, 2018

nik9000 Jul 9, 2018

costin Jul 11, 2018

nik9000 Jul 9, 2018

bpintea left a comment

SQL: Support for escape sequences #31884

SQL: Support for escape sequences #31884

Conversation

costin commented Jul 8, 2018

elasticmachine commented Jul 8, 2018

astefan Jul 9, 2018

Choose a reason for hiding this comment

costin Jul 9, 2018

Choose a reason for hiding this comment

costin commented Jul 9, 2018

nik9000 left a comment

Choose a reason for hiding this comment

nik9000 Jul 9, 2018

Choose a reason for hiding this comment

costin Jul 11, 2018

Choose a reason for hiding this comment

nik9000 Jul 9, 2018

Choose a reason for hiding this comment

costin Jul 11, 2018

Choose a reason for hiding this comment

nik9000 Jul 9, 2018

Choose a reason for hiding this comment

bpintea left a comment

Choose a reason for hiding this comment