Merge develop to master for ODFE 1.9.0.1 release (#633)

Merge develop to master for ODFE 1.9.0.1 release

Author: joshuali925

.github/draft-release-notes-config.yml

@@ -0,0 +1,42 @@
+# The overall template of the release notes
+template: |
+  Open Distro for Elasticsearch Version $RESOLVED_VERSION
+  $CHANGES
+
+# Setting the formatting and sorting for the release notes body
+name-template: Version $RESOLVED_VERSION
+change-template: "- $TITLE (PR [#$NUMBER](https://github.com/opendistro-for-elasticsearch/sql/pull/$NUMBER))"
+sort-by: merged_at
+sort-direction: ascending
+
+# Organizing the tagged PRs into categories
+categories:
+  - title: "Version Upgrades"
+    labels:
+      - "version compatibility"
+  - title: "SQL and PPL"
+    labels:
+      - "SQL"
+      - "PPL"
+  - title: "SQL CLI"
+    labels:
+      - "CLI"
+  - title: "SQL JDBC"
+    labels:
+      - "JDBC"
+  - title: "SQL ODBC"
+    labels:
+      - "ODBC"
+  - title: "SQL Workbench"
+    labels:
+      - "Workbench"
+  - title: "Enhancements"
+    labels:
+      - "enhancement"
+      - "maintenance"
+  - title: "Bug Fixes"
+    labels:
+      - "bug"
+  - title: "Documentation"
+    labels:
+      - "documentation"

.github/workflows/draft-release-notes-workflow.yml

@@ -0,0 +1,21 @@
+name: Release Drafter
+
+on:
+  push:
+    branches:
+      - master
+
+jobs:
+  update_release_draft:
+    name: Update draft release notes
+    runs-on: ubuntu-latest
+    steps:
+      # Drafts your next Release notes as Pull Requests are merged into "master"
+      - name: Update draft release notes
+        uses: release-drafter/release-drafter@v5
+        with:
+          config-name: draft-release-notes-config.yml
+          tag: (None)
+          version: 1.9.0.1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/sql-odbc-main.yml

@@ -26,26 +26,16 @@ jobs:
         brew install curl
         brew install cmake
         brew install libiodbc
-    - name: aws-sdk-cpp-setup
-      run: |
-        sh aws_sdk_cpp_setup.sh
-    - name: configure
-      run: |
-        prefix_path=$(pwd)
-        mkdir cmake-build
-        cd cmake-build
-        cmake ../src -DCMAKE_INSTALL_PREFIX=$prefix_path/AWSSDK/ -DCMAKE_BUILD_TYPE=Release -DBUILD_ONLY="core" -DCUSTOM_MEMORY_MANAGEMENT="OFF" -DENABLE_RTTI="OFF" -DENABLE_TESTING="OFF"
-        cd ..
-    - name: build-driver
+    - name: configure-and-build-driver
       run: |
-        cmake --build cmake-build
+        ./build_mac_release64.sh
     #- name: test
     #  run: | 
     #    bash ./run_test_runner.sh
     - name: build-installer
       if: success()
       run: |
-        cd cmake-build
+        cd cmake-build64
         cmake ../src 
         make
         cpack .
@@ -59,7 +49,7 @@ jobs:
         cp ./lib64/*.dylib build
         cp ./lib64/*.a build
         cp $(ls -d bin64/* | grep -v "\.") build
-        cp ./cmake-build/*.pkg installer
+        cp ./cmake-build64/*.pkg installer
     #    cp ./bin64/*.html test-output
     #    cp ./bin64/*.log test-output
     - name: upload-build

README.md

@@ -8,6 +8,17 @@
 
 Open Distro for Elasticsearch enables you to extract insights out of Elasticsearch using the familiar SQL query syntax. Use aggregations, group by, and where clauses to investigate your data. Read your data as JSON documents or CSV tables so you have the flexibility to use the format that works best for you.
 
+
+## SQL Related Projects
+
+The following projects have been merged into this repository as separate folders as of July 9, 2020. Please refer to links below for details. This document will focus on the SQL plugin for Elasticsearch.
+
+* [SQL CLI](https://github.com/opendistro-for-elasticsearch/sql/tree/master/sql-cli)
+* [SQL JDBC](https://github.com/opendistro-for-elasticsearch/sql/tree/master/sql-jdbc)
+* [SQL ODBC](https://github.com/opendistro-for-elasticsearch/sql/tree/master/sql-odbc)
+* [SQL Workbench](https://github.com/opendistro-for-elasticsearch/sql/tree/master/sql-workbench)
+
+
 ## Documentation
 
 Please refer to the [reference manual](./docs/user/index.rst) and [technical documentation](https://opendistro.github.io/for-elasticsearch-docs) for detailed information on installing and configuring opendistro-elasticsearch-sql plugin. Looking to contribute? Read the instructions on [Development Guide](./docs/developing.rst) and then submit a patch!

build.gradle

@@ -48,7 +48,7 @@ ext {
 }
 
 allprojects {
-    version = "${opendistroVersion}.0"
+    version = "${opendistroVersion}.1"
 
     plugins.withId('java') {
         sourceCompatibility = targetCompatibility = "1.8"

common/build.gradle

@@ -9,7 +9,8 @@ repositories {
 
 dependencies {
     compile "org.antlr:antlr4-runtime:4.7.1"
-    compile group: 'com.google.guava', name: 'guava', version: '23.0'
+    // https://github.com/google/guava/wiki/CVE-2018-10237
+    compile group: 'com.google.guava', name: 'guava', version: '29.0-jre'
 
     testCompile group: 'junit', name: 'junit', version: '4.12'
 }

core/build.gradle

@@ -9,7 +9,8 @@ repositories {
 }
 
 dependencies {
-    compile group: 'com.google.guava', name: 'guava', version: '23.0'
+    // https://github.com/google/guava/wiki/CVE-2018-10237
+    compile group: 'com.google.guava', name: 'guava', version: '29.0-jre'
     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.commons', name: 'commons-lang3', version: '3.10'

core/src/main/java/com/amazon/opendistroforelasticsearch/sql/analysis/ExpressionAnalyzer.java

@@ -78,7 +78,8 @@ public Expression visitEqualTo(EqualTo node, AnalysisContext context) {
 
   @Override
   public Expression visitLiteral(Literal node, AnalysisContext context) {
-    return DSL.literal(ExprValueUtils.fromObjectValue(node.getValue()));
+    return DSL
+        .literal(ExprValueUtils.fromObjectValue(node.getValue(), node.getType().getCoreType()));
   }
 
   @Override

core/src/main/java/com/amazon/opendistroforelasticsearch/sql/ast/dsl/AstDSL.java

@@ -123,6 +123,18 @@ public static Literal intLiteral(Integer value) {
     return literal(value, DataType.INTEGER);
   }
 
+  public static Literal dateLiteral(String value) {
+    return literal(value, DataType.DATE);
+  }
+
+  public static Literal timeLiteral(String value) {
+    return literal(value, DataType.TIME);
+  }
+
+  public static Literal timestampLiteral(String value) {
+    return literal(value, DataType.TIMESTAMP);
+  }
+
   public static Literal doubleLiteral(Double value) {
     return literal(value, DataType.DOUBLE);
   }

core/src/main/java/com/amazon/opendistroforelasticsearch/sql/ast/expression/DataType.java

@@ -15,12 +15,28 @@
 
 package com.amazon.opendistroforelasticsearch.sql.ast.expression;
 
+import com.amazon.opendistroforelasticsearch.sql.data.type.ExprCoreType;
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+
+/**
+ * The DataType defintion in AST.
+ * Question, could we use {@link ExprCoreType} directly in AST?
+ */
+@RequiredArgsConstructor
 public enum DataType {
-  TYPE_ERROR,
-  NULL,
+  TYPE_ERROR(ExprCoreType.UNKNOWN),
+  NULL(ExprCoreType.UNKNOWN),
+
+  INTEGER(ExprCoreType.INTEGER),
+  DOUBLE(ExprCoreType.DOUBLE),
+  STRING(ExprCoreType.STRING),
+  BOOLEAN(ExprCoreType.BOOLEAN),
+
+  DATE(ExprCoreType.DATE),
+  TIME(ExprCoreType.TIME),
+  TIMESTAMP(ExprCoreType.TIMESTAMP);
 
-  INTEGER,
-  DOUBLE,
-  STRING,
-  BOOLEAN
+  @Getter
+  private final ExprCoreType coreType;
 }