Merge branch 'main' into feature/json-extract

Signed-off-by: Kenrick Yap <[email protected]>

# Conflicts:
#	core/src/main/java/org/opensearch/sql/expression/DSL.java
#	core/src/main/java/org/opensearch/sql/expression/function/BuiltinFunctionName.java
#	core/src/main/java/org/opensearch/sql/expression/json/JsonFunctions.java
#	core/src/main/java/org/opensearch/sql/utils/JsonUtils.java
#	core/src/test/java/org/opensearch/sql/expression/json/JsonFunctionsTest.java
#	docs/user/ppl/functions/json.rst
#	doctest/test_data/json_test.json
#	integ-test/src/test/java/org/opensearch/sql/ppl/JsonFunctionsIT.java
#	integ-test/src/test/resources/json_test.json
#	ppl/src/main/antlr/OpenSearchPPLLexer.g4

Author: kenrickyap

core/src/test/java/org/opensearch/sql/expression/json/JsonFunctionsTest.java

@@ -8,6 +8,7 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.junit.jupiter.api.Assertions.assertTrue;
+
 import static org.opensearch.sql.data.model.ExprValueUtils.LITERAL_FALSE;
 import static org.opensearch.sql.data.model.ExprValueUtils.LITERAL_MISSING;
 import static org.opensearch.sql.data.model.ExprValueUtils.LITERAL_NULL;

docs/user/ppl/functions/json.rst

@@ -14,7 +14,7 @@ JSON_VALID
 Description
 >>>>>>>>>>>
 
-Usage: `json_valid(json_string)` checks if `json_string` is a valid STRING string.
+Usage: `json_valid(json_string)` checks if `json_string` is a valid JSON-encoded string.
 
 Argument type: STRING
 
@@ -23,7 +23,7 @@ Return type: BOOLEAN
 Example::
 
     > source=json_test | eval is_valid = json_valid(json_string) | fields test_name, json_string, is_valid
-    fetched rows / total rows = 6/6
+    fetched rows / total rows = 7/7
     +---------------------+-------------------------------------+----------+
     | test_name           | json_string                         | is_valid |
     |---------------------|-------------------------------------|----------|

integ-test/build.gradle

@@ -44,7 +44,10 @@ apply plugin: 'java'
 apply plugin: 'io.freefair.lombok'
 apply plugin: 'com.wiredforcode.spawn'
 
-String baseVersion = "2.17.0"
+// The next major version is only API compat w/ the last minor of the previous major.
+// baseVersion need to roll-froward accordingly, as new 2.x of OpenSearch being released.
+// See: https://github.com/opensearch-project/OpenSearch/issues/3615
+String baseVersion = "2.19.0"
 String bwcVersion = baseVersion + ".0";
 String baseName = "sqlBwcCluster"
 String bwcFilePath = "src/test/resources/bwc/"

ppl/src/main/antlr/OpenSearchPPLLexer.g4

@@ -202,10 +202,6 @@ FIRST:                              'FIRST';
 LAST:                               'LAST';
 LIST:                               'LIST';
 VALUES:                             'VALUES';
-EARLIEST:                           'EARLIEST';
-EARLIEST_TIME:                      'EARLIEST_TIME';
-LATEST:                             'LATEST';
-LATEST_TIME:                        'LATEST_TIME';
 PER_DAY:                            'PER_DAY';
 PER_HOUR:                           'PER_HOUR';
 PER_MINUTE:                         'PER_MINUTE';

ppl/src/main/antlr/OpenSearchPPLParser.g4

@@ -959,10 +959,6 @@ keywordsCanBeId
    | LAST
    | LIST
    | VALUES
-   | EARLIEST
-   | EARLIEST_TIME
-   | LATEST
-   | LATEST_TIME
    | PER_DAY
    | PER_HOUR
    | PER_MINUTE

release-notes/opendistro-for-elasticsearch-sql.release-notes-1.6.0.0.md

@@ -23,5 +23,5 @@
 ### Bugfixes
 * Bugfix [#310](https://github.com/opendistro-for-elasticsearch/sql/pull/310): Add DATETIME cast support (issue: [#268](https://github.com/opendistro-for-elasticsearch/sql/issues/268))
 * BugFix [#365](https://github.com/opendistro-for-elasticsearch/sql/pull/365): Return Correct Type Information for Fields (issue: [#316](https://github.com/opendistro-for-elasticsearch/sql/issues/316))
-* BugFix [#377](https://github.com/opendistro-for-elasticsearch/sql/pull/377): Return object type for field which has implicit object datatype when describe the table (issue:[sql-jdbc#57](https://github.com/opendistro-for-elasticsearch/sql-jdbc/issues/57))
+* BugFix [#377](https://github.com/opendistro-for-elasticsearch/sql/pull/377): Return object type for field which has implicit object datatype when describe the table (issue:[sql-jdbc#57](https://github.com/amazon-archives/sql-jdbc/issues/57))
 * BugFix [#381](https://github.com/opendistro-for-elasticsearch/sql/pull/381): FIX field function name letter case preserved in select with group by (issue: [#373](https://github.com/opendistro-for-elasticsearch/sql/issues/373))