Merge pull request #26 from opensearch-project/main

Pull most recent changes from the upstream project

.github/workflows/sql-test-and-build-workflow.yml

@@ -3,7 +3,7 @@ name: SQL Java CI
 on: [push, pull_request]
 
 env:
-  OPENSEARCH_VERSION: '1.2.1-SNAPSHOT'
+  OPENSEARCH_VERSION: '1.3.0-SNAPSHOT'
 
 jobs:
   build:

README.md

@@ -74,6 +74,8 @@ The following projects have been merged into this repository as separate folders
 | [![features open][feature-badge]][feature-link]                |
 | [![enhancements open][enhancement-badge]][enhancement-link]    |
 | [![bugs open][bug-badge]][bug-link]                            |
+| [![untriaged open][untriaged-badge]][untriaged-link]           |
+| [![nolabel open][nolabel-badge]][nolabel-link]                 |
 
 [dco-badge]: https://github.com/opensearch-project/sql/actions/workflows/dco.yml/badge.svg
 [dco-badge-link]: https://github.com/opensearch-project/sql/actions/workflows/dco.yml
@@ -97,6 +99,10 @@ The following projects have been merged into this repository as separate folders
 [bug-link]: https://github.com/opensearch-project/sql/issues?q=is%3Aopen+is%3Aissue+label%3Abug+
 [enhancement-badge]: https://img.shields.io/github/issues/opensearch-project/sql/enhancement.svg
 [enhancement-link]: https://github.com/opensearch-project/sql/issues?q=is%3Aopen+is%3Aissue+label%3Aenhancement+
+[untriaged-badge]: https://img.shields.io/github/issues/opensearch-project/sql/untriaged.svg
+[untriaged-link]: https://github.com/opensearch-project/sql/issues?q=is%3Aopen+is%3Aissue+label%3Auntriaged+
+[nolabel-badge]: https://img.shields.io/github/issues-search/opensearch-project/sql?color=yellow&label=no%20label%20issues&query=is%3Aopen%20is%3Aissue%20no%3Alabel
+[nolabel-link]: https://github.com/opensearch-project/sql/issues?q=is%3Aopen+is%3Aissue+no%3Alabel+
 [workbench-build-badge]: https://github.com/opensearch-project/sql/actions/workflows/sql-workbench-test-and-build-workflow.yml/badge.svg
 [workbench-build-link]: https://github.com/opensearch-project/sql/actions/workflows/sql-workbench-test-and-build-workflow.yml
 [cypress-test-badge]: https://img.shields.io/badge/Cypress%20tests-in%20progress-yellow

build.gradle

@@ -6,7 +6,7 @@
 
 buildscript {
     ext {
-        opensearch_version = System.getProperty("opensearch.version", "1.2.1-SNAPSHOT")
+        opensearch_version = System.getProperty("opensearch.version", "1.3.0-SNAPSHOT")
     }
 
     repositories {

common/build.gradle

@@ -35,7 +35,7 @@ dependencies {
     compile "org.antlr:antlr4-runtime:4.7.1"
     // https://github.com/google/guava/wiki/CVE-2018-10237
     compile group: 'com.google.guava', name: 'guava', version: '29.0-jre'
-    compile group: 'org.apache.logging.log4j', name: 'log4j-core', version:'2.15.0'
+    compile group: 'org.apache.logging.log4j', name: 'log4j-core', version:'2.17.1'
 
     testCompile group: 'junit', name: 'junit', version: '4.12'
 }

integ-test/build.gradle

@@ -60,7 +60,7 @@ dependencies {
     testCompile group: 'org.opensearch.client', name: 'opensearch-rest-high-level-client', version: "${opensearch_version}"
     testCompile group: 'org.opensearch.client', name: 'opensearch-rest-client', version: "${opensearch_version}"
     testCompile group: 'org.hamcrest', name: 'hamcrest', version: '2.1'
-    testCompile group: 'org.apache.logging.log4j', name: 'log4j-core', version:'2.15.0'
+    testCompile group: 'org.apache.logging.log4j', name: 'log4j-core', version:'2.17.1'
     testCompile project(':plugin')
     testCompile project(':legacy')
     testImplementation('org.junit.jupiter:junit-jupiter-api:5.6.2')
@@ -212,7 +212,7 @@ String bwcFilePath = "src/test/resources/bwc/"
     testClusters {
         "${baseName}$i" {
             testDistribution = "ARCHIVE"
-            versions = ["7.10.2", "1.2.1-SNAPSHOT"]
+            versions = ["7.10.2", opensearch_version]
             numberOfNodes = 3
             plugin(provider(new Callable<RegularFile>() {
                 @Override

ppl/build.gradle

@@ -51,7 +51,7 @@ dependencies {
     compile group: 'org.json', name: 'json', version: '20180813'
     compile group: 'org.springframework', name: 'spring-context', version: '5.2.5.RELEASE'
     compile group: 'org.springframework', name: 'spring-beans', version: '5.2.5.RELEASE'
-    compile group: 'org.apache.logging.log4j', name: 'log4j-core', version:'2.15.0'
+    compile group: 'org.apache.logging.log4j', name: 'log4j-core', version:'2.17.1'
     compile project(':common')
     compile project(':core')
     compile project(':protocol')

release-notes/opensearch-sql.release-notes-1.2.2.0.md

@@ -0,0 +1,6 @@
+### Version 1.2.2.0 Release Notes
+Compatible with OpenSearch and OpenSearch Dashboards Version 1.2.2
+
+### Bug fixes
+
+* Bump log4j to 2.16 and plugin to 1.2.2 ([#338](https://github.com/opensearch-project/sql/pull/338))

release-notes/opensearch-sql.release-notes-1.2.3.0.md

@@ -0,0 +1,6 @@
+### Version 1.2.3.0 Release Notes
+Compatible with OpenSearch Version 1.2.3 and OpenSearch Dashboards Version 1.2.x
+
+### Bug fixes
+
+* Bump log4j to 2.17 and plugin to 1.2.3 ([#345](https://github.com/opensearch-project/sql/pull/345))

sql-odbc/src/IntegrationTests/ITODBCCatalog/test_odbc_catalog.cpp

@@ -496,6 +496,8 @@ const std::vector< sample_data_getTypeInfo_struct > sample_data_all_types_info{
     {"float", SQL_REAL, 7, "", "", "", 2, 0, 3, 0, 0, 0, "", 0, 0, SQL_REAL, 0,
      10, 0},
     {"date", SQL_TYPE_TIMESTAMP, 24, "", "", "", 2, 0, 3, 1, 0, 0, "", 0, 0,
+     SQL_TYPE_TIMESTAMP, 0, 10, 0},
+    {"timestamp", SQL_TYPE_TIMESTAMP, 24, "", "", "", 2, 0, 3, 1, 0, 0, "", 0, 0,
      SQL_TYPE_TIMESTAMP, 0, 10, 0}};
 
 const std::vector< sample_data_getTypeInfo_struct >

sql-odbc/src/sqlodbc/opensearch_info.cpp

@@ -67,7 +67,7 @@ const std::unordered_map< int, std::vector< int > > sql_opensearch_type_map = {
     {SQL_WVARCHAR,
      {OPENSEARCH_TYPE_KEYWORD, OPENSEARCH_TYPE_TEXT, OPENSEARCH_TYPE_NESTED,
       OPENSEARCH_TYPE_OBJECT}},
-    {SQL_TYPE_TIMESTAMP, {OPENSEARCH_TYPE_DATETIME}}};
+    {SQL_TYPE_TIMESTAMP, {OPENSEARCH_TYPE_DATETIME, OPENSEARCH_TYPE_TIMESTAMP}}};
 
 const std::unordered_map< std::string, int > data_name_data_type_map = {
     {OPENSEARCH_TYPE_NAME_BOOLEAN, SQL_BIT},
@@ -82,6 +82,7 @@ const std::unordered_map< std::string, int > data_name_data_type_map = {
     {OPENSEARCH_TYPE_NAME_KEYWORD, SQL_WVARCHAR},
     {OPENSEARCH_TYPE_NAME_TEXT, SQL_WVARCHAR},
     {OPENSEARCH_TYPE_NAME_DATE, SQL_TYPE_TIMESTAMP},
+    {OPENSEARCH_TYPE_NAME_TIMESTAMP, SQL_TYPE_TIMESTAMP},
     {OPENSEARCH_TYPE_NAME_OBJECT, SQL_WVARCHAR},
     {OPENSEARCH_TYPE_NAME_NESTED, SQL_WVARCHAR}};
 

sql-odbc/src/sqlodbc/opensearch_types.c

@@ -488,6 +488,8 @@ const char *opensearchtype_attr_to_name(const ConnectionClass *conn, OID type,
             return OPENSEARCH_TYPE_NAME_NESTED;
         case OPENSEARCH_TYPE_DATETIME:
             return OPENSEARCH_TYPE_NAME_DATE;
+        case OPENSEARCH_TYPE_TIMESTAMP:
+            return OPENSEARCH_TYPE_NAME_TIMESTAMP;
         case OPENSEARCH_TYPE_OBJECT:
             return OPENSEARCH_TYPE_NAME_OBJECT;
         case OPENSEARCH_TYPE_VARCHAR:
@@ -528,6 +530,8 @@ opensearchtype_attr_column_size(const ConnectionClass *conn, OID type, int attty
             return 0;
         case OPENSEARCH_TYPE_DATETIME:
             return 24;
+        case OPENSEARCH_TYPE_TIMESTAMP:
+            return 24;
         case OPENSEARCH_TYPE_OBJECT:
             return 0;
         default:
@@ -984,7 +988,7 @@ OID sqltype_to_opensearchtype(const ConnectionClass *conn, SQLSMALLINT fSqlType)
 
         case SQL_TIMESTAMP:
         case SQL_TYPE_TIMESTAMP:
-            openSearchType = OPENSEARCH_TYPE_DATETIME;
+            openSearchType = OPENSEARCH_TYPE_TIMESTAMP;
             break;
 
         case SQL_VARBINARY:
@@ -1305,6 +1309,7 @@ Int2 opensearchtype_unsigned(const ConnectionClass *conn, OID type) {
         case OPENSEARCH_TYPE_TEXT:
         case OPENSEARCH_TYPE_NESTED:
         case OPENSEARCH_TYPE_DATETIME:
+        case OPENSEARCH_TYPE_TIMESTAMP:
         case OPENSEARCH_TYPE_OBJECT:
             return SQL_TRUE;
 

sql-odbc/src/sqlodbc/opensearch_types.h

@@ -27,6 +27,7 @@ extern "C" {
 #define OPENSEARCH_TYPE_NAME_TEXT "text"
 #define OPENSEARCH_TYPE_NAME_NESTED "nested"
 #define OPENSEARCH_TYPE_NAME_DATE "date"
+#define OPENSEARCH_TYPE_NAME_TIMESTAMP "timestamp"
 #define OPENSEARCH_TYPE_NAME_OBJECT "object"
 #define OPENSEARCH_TYPE_NAME_VARCHAR "varchar"
 #define OPENSEARCH_TYPE_NAME_UNSUPPORTED "unsupported"

workbench/README.md

@@ -5,7 +5,7 @@ The OpenSearch Dashboards Query Workbench enables you to query your OpenSearch d
 
 ## Documentation
 
-Please see our technical [documentation](https://docs-beta.opensearch.org/search-plugins/sql/workbench/) to learn more about its features.
+Please see our technical [documentation](https://opensearch.org/docs/latest/search-plugins/sql/workbench/) to learn more about its features.
 
 
 ## Contributing
@@ -16,7 +16,7 @@ See [developer guide](DEVELOPER_GUIDE.md) and [how to contribute to this project
 
 If you find a bug, or have a feature request, please don't hesitate to open an issue in this repository.
 
-For more information, see [project website](https://opensearch.org/) and [documentation](https://docs-beta.opensearch.org/). If you need help and are unsure where to open an issue, try [forums](https://discuss.opendistrocommunity.dev/).
+For more information, see [project website](https://opensearch.org/) and [documentation](https://opensearch.org/docs/latest/). If you need help and are unsure where to open an issue, try [forums](https://discuss.opendistrocommunity.dev/).
 
 ## Code of Conduct
 

workbench/public/components/Main/__snapshots__/main.test.tsx.snap

@@ -98,7 +98,7 @@ exports[`<Main /> spec click clear button 1`] = `
           >
             <a
               class="euiButton euiButton--primary"
-              href="https://docs-beta.opensearch.org/search-plugins/sql/index/"
+              href="https://opensearch.org/docs/latest/search-plugins/sql/index/"
               rel="noopener noreferrer"
               target="_blank"
             >
@@ -477,7 +477,7 @@ exports[`<Main /> spec click run button, and response causes an error 1`] = `
           >
             <a
               class="euiButton euiButton--primary"
-              href="https://docs-beta.opensearch.org/search-plugins/sql/index/"
+              href="https://opensearch.org/docs/latest/search-plugins/sql/index/"
               rel="noopener noreferrer"
               target="_blank"
             >
@@ -856,7 +856,7 @@ exports[`<Main /> spec click run button, and response is not ok 1`] = `
           >
             <a
               class="euiButton euiButton--primary"
-              href="https://docs-beta.opensearch.org/search-plugins/sql/index/"
+              href="https://opensearch.org/docs/latest/search-plugins/sql/index/"
               rel="noopener noreferrer"
               target="_blank"
             >
@@ -1235,7 +1235,7 @@ exports[`<Main /> spec click run button, and response is ok 1`] = `
           >
             <a
               class="euiButton euiButton--primary"
-              href="https://docs-beta.opensearch.org/search-plugins/sql/index/"
+              href="https://opensearch.org/docs/latest/search-plugins/sql/index/"
               rel="noopener noreferrer"
               target="_blank"
             >
@@ -1614,7 +1614,7 @@ exports[`<Main /> spec click run button, response fills null and missing values
           >
             <a
               class="euiButton euiButton--primary"
-              href="https://docs-beta.opensearch.org/search-plugins/sql/index/"
+              href="https://opensearch.org/docs/latest/search-plugins/sql/index/"
               rel="noopener noreferrer"
               target="_blank"
             >
@@ -1996,7 +1996,7 @@ exports[`<Main /> spec click translation button, and response is ok 1`] = `
           >
             <a
               class="euiButton euiButton--primary"
-              href="https://docs-beta.opensearch.org/search-plugins/sql/index/"
+              href="https://opensearch.org/docs/latest/search-plugins/sql/index/"
               rel="noopener noreferrer"
               target="_blank"
             >
@@ -2375,7 +2375,7 @@ exports[`<Main /> spec renders the component 1`] = `
           >
             <a
               class="euiButton euiButton--primary"
-              href="https://docs-beta.opensearch.org/search-plugins/sql/index/"
+              href="https://opensearch.org/docs/latest/search-plugins/sql/index/"
               rel="noopener noreferrer"
               target="_blank"
             >

workbench/public/components/Main/main.tsx

@@ -627,7 +627,7 @@ export class Main extends React.Component<MainProps, MainState> {
           updateSQLQueries={this.updateSQLQueries}
         />
       );
-      link = 'https://docs-beta.opensearch.org/search-plugins/sql/index/';
+      link = 'https://opensearch.org/docs/latest/search-plugins/sql/index/';
       linkTitle = 'SQL documentation';
     } else {
       page = (
@@ -640,7 +640,7 @@ export class Main extends React.Component<MainProps, MainState> {
           updatePPLQueries={this.updatePPLQueries}
         />
       );
-      link = 'https://docs-beta.opensearch.org/search-plugins/ppl/index/';
+      link = 'https://opensearch.org/docs/latest/observability/ppl/index/';
       linkTitle = 'PPL documentation';
     }