Version Upgrade for ODFE 1.13 Release (#1028)

opendistro-for-elasticsearch · Feb 4, 2021 · 0a16ecf · 0a16ecf
1 parent 316726c
commit 0a16ecf
Show file tree

Hide file tree

Showing 17 changed files with 87 additions and 25 deletions.
diff --git a/.github/workflows/draft-release-notes-workflow.yml b/.github/workflows/draft-release-notes-workflow.yml
@@ -16,6 +16,6 @@ jobs:
         with:
           config-name: draft-release-notes-config.yml
           tag: (None)
-          version: 1.12.0.0
+          version: 1.13.0.0
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/sql-odbc-release-workflow.yml b/.github/workflows/sql-odbc-release-workflow.yml
@@ -12,7 +12,7 @@ env:
   ODBC_BUILD_PATH: "./build/odbc/build"
   AWS_SDK_INSTALL_PATH: "./build/aws-sdk/install"
   PLUGIN_NAME: opendistro-sql-odbc
-  OD_VERSION: 1.12.0.0
+  OD_VERSION: 1.13.0.0
 
 jobs:
   build-mac:

diff --git a/.github/workflows/sql-odbc-rename-and-release-workflow.yml b/.github/workflows/sql-odbc-rename-and-release-workflow.yml
@@ -8,7 +8,7 @@ on:
       - rename*
 
 env:
-  OD_VERSION: 1.12.0.0
+  OD_VERSION: 1.13.0.0
 
 jobs:
   upload-odbc:

diff --git a/.github/workflows/sql-workbench-release-workflow.yml b/.github/workflows/sql-workbench-release-workflow.yml
@@ -7,7 +7,7 @@ on:
 
 env: 
   PLUGIN_NAME: opendistroQueryWorkbenchKibana
-  OD_VERSION: 1.12.0.0
+  OD_VERSION: 1.13.0.0
 
 jobs:
 
@@ -31,14 +31,14 @@ jobs:
         uses: actions/checkout@v1
         with:
           repository: opendistro-for-elasticsearch/kibana-oss
-          ref: 7.10.0
+          ref: 7.10.2
           token: ${{secrets.OD_ACCESS}}
           path: sql/kibana
 
       - name: Setup Node
         uses: actions/setup-node@v1
         with:
-          node-version: '10.22.1'
+          node-version: '10.23.1'
 
       - name: Move Workbench to Plugins Dir
         run: |

diff --git a/.github/workflows/sql-workbench-test-and-build-workflow.yml b/.github/workflows/sql-workbench-test-and-build-workflow.yml
@@ -4,7 +4,7 @@ on: [pull_request, push]
 
 env: 
   PLUGIN_NAME: opendistroQueryWorkbenchKibana
-  OD_VERSION: 1.12.0.0
+  OD_VERSION: 1.13.0.0
 
 jobs:
 
@@ -19,12 +19,12 @@ jobs:
         uses: actions/checkout@v1
         with:
           repository: elastic/kibana
-          ref: v7.10.0
+          ref: v7.10.2
           path: sql/kibana
       - name: Setup Node
         uses: actions/setup-node@v1
         with:
-          node-version: '10.22.1'
+          node-version: '10.23.1'
       - name: Move Workbench to Plugins Dir
         run: |
           mv workbench kibana/plugins

diff --git a/build.gradle b/build.gradle
@@ -15,7 +15,7 @@
 
 buildscript {
     ext {
-        es_version = "7.10.0"
+        es_version = "7.10.2"
     }
 
     repositories {
@@ -43,7 +43,7 @@ repositories {
 }
 
 ext {
-    opendistroVersion = '1.12.0'
+    opendistroVersion = '1.13.0'
     isSnapshot = "true" == System.getProperty("build.snapshot", "true")
 }
 

diff --git a/gradle.properties b/gradle.properties
@@ -13,5 +13,5 @@
 #   permissions and limitations under the License.
 #
 
-version=1.12.0
+version=1.13.0
 org.gradle.jvmargs=-Duser.language=en -Duser.country=US
diff --git a/release-notes/opendistro-for-elasticsearch-sql.release-notes-1.13.0.0.md b/release-notes/opendistro-for-elasticsearch-sql.release-notes-1.13.0.0.md
@@ -0,0 +1,62 @@
+## 20201-2-3 Version 1.13.0.0
+
+### Breaking Changes
+* Refine PPL head command syntax ([#1022](https://github.com/opendistro-for-elasticsearch/sql/pull/1022))
+* Disable access to the field keyword in the new SQL engine ([#1025](https://github.com/opendistro-for-elasticsearch/sql/pull/1025))
+
+### Features
+* Added keywords option as alias identifier in SQL parser ([#866](https://github.com/opendistro-for-elasticsearch/sql/pull/866))
+* Support show and describe statement ([#907](https://github.com/opendistro-for-elasticsearch/sql/pull/907))
+* Support cast function in SQL ([#926](https://github.com/opendistro-for-elasticsearch/sql/pull/926))
+* Support NULLS FIRST/LAST ordering for window functions ([#929](https://github.com/opendistro-for-elasticsearch/sql/pull/929))
+* Project operator pushdown ([#933](https://github.com/opendistro-for-elasticsearch/sql/pull/933))
+* add string function RIGHT ([#938](https://github.com/opendistro-for-elasticsearch/sql/pull/938))
+* Add Flow control function IF(expr1, expr2, expr3) ([#990](https://github.com/opendistro-for-elasticsearch/sql/pull/990))
+* Support Struct Data Query in SQL/PPL ([#1018](https://github.com/opendistro-for-elasticsearch/sql/pull/1018))
+
+### Enhancements
+* Enable new SQL query engine ([#989](https://github.com/opendistro-for-elasticsearch/sql/pull/989))
+* Add metrics for SQL query requests in new engine ([#905](https://github.com/opendistro-for-elasticsearch/sql/pull/905))
+* Enable failed test logging and fix flaky UT ([#910](https://github.com/opendistro-for-elasticsearch/sql/pull/910))
+* Improve logging in new SQL engine ([#912](https://github.com/opendistro-for-elasticsearch/sql/pull/912))
+* Enable date type input in function Count() ([#931](https://github.com/opendistro-for-elasticsearch/sql/pull/931))
+* Use name and alias in JDBC format ([#932](https://github.com/opendistro-for-elasticsearch/sql/pull/932))
+* Throw exception when access unknown field type ([#942](https://github.com/opendistro-for-elasticsearch/sql/pull/942))
+* Fill hyphen strings to workbench table cells that have null and missing values ([#944](https://github.com/opendistro-for-elasticsearch/sql/pull/944))
+* Support aggregate window functions ([#946](https://github.com/opendistro-for-elasticsearch/sql/pull/946))
+* Support filter clause in aggregations ([#960](https://github.com/opendistro-for-elasticsearch/sql/pull/960))
+* Enable sql function ifnull, nullif and isnull ([#962](https://github.com/opendistro-for-elasticsearch/sql/pull/962))
+* Double quoted as string literal instead of identifier ([#974](https://github.com/opendistro-for-elasticsearch/sql/pull/974))
+* [PPL] Support index name with date suffix ([#983](https://github.com/opendistro-for-elasticsearch/sql/pull/983))
+* Support NULL literal as function argument ([#985](https://github.com/opendistro-for-elasticsearch/sql/pull/985))
+* Allow Timestamp/Datetime values to use up to 6 digits of microsecond precision ([#988](https://github.com/opendistro-for-elasticsearch/sql/pull/988))
+* Protect window operator by circuit breaker ([#1006](https://github.com/opendistro-for-elasticsearch/sql/pull/1006))
+* Removed stack trace when catches anonymizing data error ([#1014](https://github.com/opendistro-for-elasticsearch/sql/pull/1014))
+* Disable access to the field keyword in the new SQL engine ([#1025](https://github.com/opendistro-for-elasticsearch/sql/pull/1025))
+* Only keep the first element of multivalue field response ([#1026](https://github.com/opendistro-for-elasticsearch/sql/pull/1026))
+* Remove request id in response listener logging ([#1027](https://github.com/opendistro-for-elasticsearch/sql/pull/1027))
+
+### Bug Fixes
+* Fix round fix issue when input is negative and end with .5 ([#914](https://github.com/opendistro-for-elasticsearch/sql/pull/914))
+* Add fix to handle functions applied to literal ([#913](https://github.com/opendistro-for-elasticsearch/sql/pull/913))
+* Fetch error message in root cause for new default formatter ([#1001](https://github.com/opendistro-for-elasticsearch/sql/pull/1001))
+* Fixed interval type null/missing check failure ([#1011](https://github.com/opendistro-for-elasticsearch/sql/pull/1011))
+* Fix workbench issue that csv result not written to downloaded file ([#1024](https://github.com/opendistro-for-elasticsearch/sql/pull/1024))
+
+### Infrastructure
+* Bump ini from 1.3.5 to 1.3.7 in /workbench ([#911](https://github.com/opendistro-for-elasticsearch/sql/pull/911))
+* Backport workbench fixes to 7.9.1 ([#937](https://github.com/opendistro-for-elasticsearch/sql/pull/937))
+* Backport workbench fixes to 7.9 on old platform ([#940](https://github.com/opendistro-for-elasticsearch/sql/pull/940))
+* Backporting latest change from develop to opendistro-1.11 ([#945](https://github.com/opendistro-for-elasticsearch/sql/pull/945))
+* Bump jackson-databind version to 2.10.5.1 ([#984](https://github.com/opendistro-for-elasticsearch/sql/pull/984))
+* Rename sql release artifacts ([#1007](https://github.com/opendistro-for-elasticsearch/sql/pull/1007))
+* Rename odbc release artifacts ([#1010](https://github.com/opendistro-for-elasticsearch/sql/pull/1010))
+* Rename sql-cli wheel to use dashes instead of underscore ([#1015](https://github.com/opendistro-for-elasticsearch/sql/pull/1015))
+
+### Documentation
+* Keep development doc sync with latest code ([#961](https://github.com/opendistro-for-elasticsearch/sql/pull/961))
+* Update ODBC documentation ([#1012](https://github.com/opendistro-for-elasticsearch/sql/pull/1012))
+
+### Maintenance
+* Fix workbench issue in backported 1.11 branch: error message cannot display ([#943](https://github.com/opendistro-for-elasticsearch/sql/pull/943))
+* Fix URI Encoding in 1.12 ([#955](https://github.com/opendistro-for-elasticsearch/sql/pull/955))
diff --git a/sql-cli/src/odfe_sql_cli/__init__.py b/sql-cli/src/odfe_sql_cli/__init__.py
@@ -12,4 +12,4 @@
 express or implied. See the License for the specific language governing
 permissions and limitations under the License.
 """
-__version__ = "1.12.0.0"
+__version__ = "1.13.0.0"
diff --git a/sql-jdbc/build.gradle b/sql-jdbc/build.gradle
@@ -32,7 +32,7 @@ plugins {
 group 'com.amazon.opendistroforelasticsearch.client'
 
 // keep version in sync with version in Driver source
-version '1.12.0.0'
+version '1.13.0.0'
 
 boolean snapshot = "true".equals(System.getProperty("build.snapshot", "true"));
 if (snapshot) {

diff --git a/sql-jdbc/src/main/java/com/amazon/opendistroforelasticsearch/jdbc/internal/Version.java b/sql-jdbc/src/main/java/com/amazon/opendistroforelasticsearch/jdbc/internal/Version.java
@@ -19,7 +19,7 @@
 public enum Version {
 
     // keep this in sync with the gradle version
-    Current(1, 12, 0, 0);
+    Current(1, 13, 0, 0);
 
     private int major;
     private int minor;

diff --git a/sql-odbc/src/CMakeLists.txt b/sql-odbc/src/CMakeLists.txt
@@ -78,8 +78,8 @@ set(INSTALL_SRC "${CMAKE_CURRENT_SOURCE_DIR}/installer")
 set(DSN_INSTALLER_SRC "${CMAKE_CURRENT_SOURCE_DIR}/DSNInstaller")
 
 # ODBC Driver version 
-set(DRIVER_PACKAGE_VERSION "1.12.0.0")
-set(DRIVER_PACKAGE_VERSION_COMMA_SEPARATED "1,12,0,0")
+set(DRIVER_PACKAGE_VERSION "1.13.0.0")
+set(DRIVER_PACKAGE_VERSION_COMMA_SEPARATED "1,13,0,0")
 add_compile_definitions( ES_ODBC_VERSION="${DRIVER_PACKAGE_VERSION}"
                          # Comma separated version is required for odbc administrator's driver file.
                          ES_ODBC_DRVFILE_VERSION=${DRIVER_PACKAGE_VERSION_COMMA_SEPARATED} )

diff --git a/sql-odbc/src/TableauConnector/odfe_sql_odbc/manifest.xml b/sql-odbc/src/TableauConnector/odfe_sql_odbc/manifest.xml
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='utf-8' ?>
 
-<connector-plugin class='odfe_sql_odbc' superclass='odbc' plugin-version='1.12.0.0' name='SQL' version='18.1' min-version-tableau='2020.1'>
+<connector-plugin class='odfe_sql_odbc' superclass='odbc' plugin-version='1.13.0.0' name='SQL' version='18.1' min-version-tableau='2020.1'>
   <vendor-information>
       <company name="Open Distro for ES"/>
       <support-link url="https://github.com/opendistro-for-elasticsearch/sql"/>

diff --git a/sql-odbc/src/TableauConnector/odfe_sql_odbc_dev/manifest.xml b/sql-odbc/src/TableauConnector/odfe_sql_odbc_dev/manifest.xml
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='utf-8' ?>
 
-<connector-plugin class='odfe_sql_odbc_dev' superclass='odbc' plugin-version='1.12.0.0' name='Open Distro for Elasticsearch SQL ODBC DEV' version='18.1' min-version-tableau='2020.1'>
+<connector-plugin class='odfe_sql_odbc_dev' superclass='odbc' plugin-version='1.13.0.0' name='Open Distro for Elasticsearch SQL ODBC DEV' version='18.1' min-version-tableau='2020.1'>
   <vendor-information>
       <company name="Open Distro for Elasticsearch"/>
       <support-link url="https://github.com/opendistro-for-elasticsearch/sql"/>

diff --git a/workbench/.cypress/integration/ui.spec.js b/workbench/.cypress/integration/ui.spec.js
@@ -169,7 +169,7 @@ describe('Test and verify SQL downloads', () => {
         url: url,
         headers: {
           'content-type': 'application/json;charset=UTF-8',
-          'kbn-version': '7.10.0',
+          'kbn-version': '7.10.2',
         },
         body: {
           'query': 'select * from accounts where balance > 49500'

diff --git a/workbench/kibana.json b/workbench/kibana.json
@@ -1,7 +1,7 @@
 {
   "id": "opendistroQueryWorkbenchKibana",
-  "version": "1.12.0.0",
-  "kibanaVersion": "7.10.0",
+  "version": "1.13.0.0",
+  "kibanaVersion": "7.10.2",
   "server": true,
   "ui": true,
   "requiredPlugins": ["navigation"],

diff --git a/workbench/package.json b/workbench/package.json
@@ -1,12 +1,12 @@
 {
   "name": "opendistro-query-workbench",
-  "version": "1.12.0.0",
+  "version": "1.13.0.0",
   "description": "Query Workbench",
   "main": "index.js",
   "license": "Apache-2.0",
   "homepage": "https://github.com/opendistro-for-elasticsearch/sql/tree/master/workbench",
   "kibana": {
-    "version": "7.10.0",
+    "version": "7.10.2",
     "templateVersion": "6.3.3"
   },
   "repository": {
@@ -46,7 +46,7 @@
     "tslint-plugin-prettier": "^2.0.1"
   },
   "engines": {
-    "node": "10.22.1",
+    "node": "10.23.1",
     "yarn": "^1.21.1"
   },
   "resolutions": {
-Original file line number
+Diff line change
@@ Expand Up / @@ -8,7 +8,7 @@ on: @@
           - rename*
     env:
-      OD_VERSION: 1.12.0.0
+      OD_VERSION: 1.13.0.0
     jobs:
       upload-odbc:
@@ Expand Down @@