From ad89bd3251c6a3deee10f2d993012650799d1eec Mon Sep 17 00:00:00 2001 From: penghuo Date: Fri, 16 Oct 2020 16:14:55 -0700 Subject: [PATCH 1/3] Release ODFE 1.11.0 --- .../draft-release-notes-workflow.yml | 2 +- build.gradle | 2 +- gradle.properties | 2 +- ...lasticsearch-sql.release-notes-1.11.0.0.md | 29 +++++++++++++++++++ sql-cli/src/odfe_sql_cli/__init__.py | 2 +- .../jdbc/internal/Version.java | 2 +- sql-odbc/src/CMakeLists.txt | 4 +-- .../odfe_sql_odbc/manifest.xml | 2 +- .../odfe_sql_odbc_dev/manifest.xml | 2 +- workbench/package.json | 2 +- 10 files changed, 39 insertions(+), 10 deletions(-) create mode 100644 release-notes/opendistro-for-elasticsearch-sql.release-notes-1.11.0.0.md diff --git a/.github/workflows/draft-release-notes-workflow.yml b/.github/workflows/draft-release-notes-workflow.yml index 93b9773488..9dc225fb72 100644 --- 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.10.1.1 + version: 1.11.0.0 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/build.gradle b/build.gradle index 989f43ea93..6727594913 100644 --- a/build.gradle +++ b/build.gradle @@ -43,7 +43,7 @@ repositories { } ext { - opendistroVersion = '1.10.1' + opendistroVersion = '1.11.0' isSnapshot = "true" == System.getProperty("build.snapshot", "true") } diff --git a/gradle.properties b/gradle.properties index c9eef0e13b..4dbad4c225 100644 --- a/gradle.properties +++ b/gradle.properties @@ -13,4 +13,4 @@ # permissions and limitations under the License. # -version=1.10.1 +version=1.11.0 diff --git a/release-notes/opendistro-for-elasticsearch-sql.release-notes-1.11.0.0.md b/release-notes/opendistro-for-elasticsearch-sql.release-notes-1.11.0.0.md new file mode 100644 index 0000000000..789085e633 --- /dev/null +++ b/release-notes/opendistro-for-elasticsearch-sql.release-notes-1.11.0.0.md @@ -0,0 +1,29 @@ +## 2020-10-16 Version 1.11.0.0 + +### Features +* Add support of basic data types byte, short, binary and add data type testing ([#780](https://github.com/opendistro-for-elasticsearch/sql/pull/780)) +* Support ranking window functions ([#753](https://github.com/opendistro-for-elasticsearch/sql/pull/753)) +* Add LogicalPlan optimization ([#763](https://github.com/opendistro-for-elasticsearch/sql/pull/763)) +* Support DATE_FORMAT function ([#764](https://github.com/opendistro-for-elasticsearch/sql/pull/764)) +* Support date and time function: week ([#757](https://github.com/opendistro-for-elasticsearch/sql/pull/757)) +* Support aggregations min, max ([#541](https://github.com/opendistro-for-elasticsearch/sql/pull/541)) +* Support date and time functions ([#746](https://github.com/opendistro-for-elasticsearch/sql/pull/746)) + +### Enhancements +* Support describe index alias ([#775](https://github.com/opendistro-for-elasticsearch/sql/pull/775)) + +### Bug Fixes +* Fix bug, support multiple aggregation ([#771](https://github.com/opendistro-for-elasticsearch/sql/pull/771)) +* Fix cast statement in aggregate function return 0 ([#773](https://github.com/opendistro-for-elasticsearch/sql/pull/773)) +* Bug fix, using Local.Root when format the string ([#767](https://github.com/opendistro-for-elasticsearch/sql/pull/767)) +* Bug fix, order by doesn't work when group by field has alias ([#766](https://github.com/opendistro-for-elasticsearch/sql/pull/766)) +* Bug fix, using matcher to compare the Json result ([#762](https://github.com/opendistro-for-elasticsearch/sql/pull/762)) + + +### Infrastructure +* Enforce 100% branch coverage for sql and es module ([#774](https://github.com/opendistro-for-elasticsearch/sql/pull/774)) + +### Workbench +* Restyle workbench SQL/PPL UI ([#781](https://github.com/opendistro-for-elasticsearch/sql/pull/781)) +* UI Separate SQL and PPL pages ([#761](https://github.com/opendistro-for-elasticsearch/sql/pull/761)) + diff --git a/sql-cli/src/odfe_sql_cli/__init__.py b/sql-cli/src/odfe_sql_cli/__init__.py index 33d8e733e7..182e91869d 100644 --- 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.10.1.1" +__version__ = "1.11.0.0" 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 index 3492f1bd92..32146b802d 100644 --- 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, 10, 1, 1); + Current(1, 11, 0, 0); private int major; private int minor; diff --git a/sql-odbc/src/CMakeLists.txt b/sql-odbc/src/CMakeLists.txt index 64e94ff4f6..457f0c4375 100644 --- 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.10.1.1") -set(DRIVER_PACKAGE_VERSION_COMMA_SEPARATED "1,10,1,1") +set(DRIVER_PACKAGE_VERSION "1.11.0.0") +set(DRIVER_PACKAGE_VERSION_COMMA_SEPARATED "1,11,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 index 197b8d0320..300bd8bb82 100644 --- a/sql-odbc/src/TableauConnector/odfe_sql_odbc/manifest.xml +++ b/sql-odbc/src/TableauConnector/odfe_sql_odbc/manifest.xml @@ -1,6 +1,6 @@ - + diff --git a/sql-odbc/src/TableauConnector/odfe_sql_odbc_dev/manifest.xml b/sql-odbc/src/TableauConnector/odfe_sql_odbc_dev/manifest.xml index 6b38e6078b..296fc6269e 100644 --- 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 @@ - + diff --git a/workbench/package.json b/workbench/package.json index a671ee41f5..a2f3a39aac 100644 --- a/workbench/package.json +++ b/workbench/package.json @@ -1,6 +1,6 @@ { "name": "opendistro-query-workbench", - "version": "1.10.1.1", + "version": "1.11.0.0", "description": "Query Workbench", "main": "index.js", "license": "Apache-2.0", From 2c77c850b902bbfe1dfcfaafc9b76e5f96343919 Mon Sep 17 00:00:00 2001 From: penghuo Date: Fri, 16 Oct 2020 16:44:12 -0700 Subject: [PATCH 2/3] restructure the release notes --- ...ndistro-for-elasticsearch-sql.release-notes-1.11.0.0.md | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/release-notes/opendistro-for-elasticsearch-sql.release-notes-1.11.0.0.md b/release-notes/opendistro-for-elasticsearch-sql.release-notes-1.11.0.0.md index 789085e633..83079f87e5 100644 --- a/release-notes/opendistro-for-elasticsearch-sql.release-notes-1.11.0.0.md +++ b/release-notes/opendistro-for-elasticsearch-sql.release-notes-1.11.0.0.md @@ -11,6 +11,8 @@ ### Enhancements * Support describe index alias ([#775](https://github.com/opendistro-for-elasticsearch/sql/pull/775)) +* Restyle workbench SQL/PPL UI ([#781](https://github.com/opendistro-for-elasticsearch/sql/pull/781)) +* UI Separate SQL and PPL pages ([#761](https://github.com/opendistro-for-elasticsearch/sql/pull/761)) ### Bug Fixes * Fix bug, support multiple aggregation ([#771](https://github.com/opendistro-for-elasticsearch/sql/pull/771)) @@ -19,11 +21,6 @@ * Bug fix, order by doesn't work when group by field has alias ([#766](https://github.com/opendistro-for-elasticsearch/sql/pull/766)) * Bug fix, using matcher to compare the Json result ([#762](https://github.com/opendistro-for-elasticsearch/sql/pull/762)) - ### Infrastructure * Enforce 100% branch coverage for sql and es module ([#774](https://github.com/opendistro-for-elasticsearch/sql/pull/774)) -### Workbench -* Restyle workbench SQL/PPL UI ([#781](https://github.com/opendistro-for-elasticsearch/sql/pull/781)) -* UI Separate SQL and PPL pages ([#761](https://github.com/opendistro-for-elasticsearch/sql/pull/761)) - From 5a901c4f93f99b2407a3275fe318aef58657335c Mon Sep 17 00:00:00 2001 From: penghuo Date: Fri, 16 Oct 2020 16:50:03 -0700 Subject: [PATCH 3/3] update JDBC version --- sql-jdbc/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sql-jdbc/build.gradle b/sql-jdbc/build.gradle index 7546a02ddf..2113279ce9 100644 --- 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.10.1.1' +version '1.11.0.0' boolean snapshot = "true".equals(System.getProperty("build.snapshot", "true")); if (snapshot) {