OD 1.4 Release (#314)

Preparing branch for OD 1.4 release
opendistro-for-elasticsearch · Dec 11, 2019 · b29cc87 · b29cc87
1 parent 0692849
commit b29cc87
Show file tree

Hide file tree

Showing 9 changed files with 35 additions and 14 deletions.
diff --git a/build.gradle b/build.gradle
@@ -18,7 +18,7 @@ buildscript {
     ext {
         // When upgrading to version after 7.3.0, must remove also
         // project substitution from configurations.all (line 39)
-        es_version = System.getProperty("es.version", "7.3.2")
+        es_version = System.getProperty("es.version", "7.4.2")
     }
     // This isn't applying from repositories.gradle so repeating it here
     repositories {
@@ -54,7 +54,7 @@ repositories {
 }
 
 ext {
-    opendistroVersion = '1.3.0'
+    opendistroVersion = '1.4.0'
     isSnapshot = "true" == System.getProperty("build.snapshot", "true")
 }
 

diff --git a/config/checkstyle/checkstyle.xml b/config/checkstyle/checkstyle.xml
@@ -7,7 +7,7 @@
   <property name="charset" value="UTF-8" />
 
   <module name="SuppressionFilter">
-    <property name="file" value="${config_loc}/suppressions.xml" />
+    <property name="file" value="${config_loc}/../../config/checkstyle/suppressions.xml" />
   </module>
 
   <!-- Checks Java files and forbids empty Javadoc comments -->

diff --git a/gradle.properties b/gradle.properties
@@ -13,4 +13,4 @@
 #   permissions and limitations under the License.
 #
 
-version=1.3
+version=1.4
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -13,8 +13,8 @@
 #   permissions and limitations under the License.
 #
 
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.2-all.zip
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.5.1-bin.zip
-zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
diff --git a/opendistro-elasticsearch-sql.release-notes b/opendistro-elasticsearch-sql.release-notes
@@ -1,4 +1,30 @@
-## 2019-10-29, Version 1.3.0 (Current)
+## 2019-12-10, Version 1.4.0 (Current)
+
+### Notable changes
+
+* Feature [#312](https://github.com/opendistro-for-elasticsearch/sql/issues/312): OD 1.4 Release components
+* Feature [#283](https://github.com/opendistro-for-elasticsearch/sql/pull/283): Added github action to build and run tests
+* Feature [#302](https://github.com/opendistro-for-elasticsearch/sql/pull/302): Documentation for basic usage of plugin
+
+* Enhancement [#273](https://github.com/opendistro-for-elasticsearch/sql/pull/273): Support conditional functions: IF, IFNULL, ISNULL
+* Enhancement [#274](https://github.com/opendistro-for-elasticsearch/sql/pull/274): Support JOIN without table alias
+* Enhancement [#278](https://github.com/opendistro-for-elasticsearch/sql/pull/278): Support subquery in from with parent only has select
+* Enhancement [#282](https://github.com/opendistro-for-elasticsearch/sql/pull/282): Support datetime functions: MONTH, DAYOFMONTH, DATE, MONTHNAME, TIMESTAMP, MAKETIME, NOW, CURDATE
+* Enhancement [#286](https://github.com/opendistro-for-elasticsearch/sql/pull/286): Better error reporting for unsupported case like max(x) - min(y)
+* Enhancement [#287](https://github.com/opendistro-for-elasticsearch/sql/pull/287): Gradle build will publish compiled plugin, that is ready to install into elastic
+* Enhancement [#300](https://github.com/opendistro-for-elasticsearch/sql/pull/300): Support DISTINCT feature in SELECT clause
+* Enhancement [#303](https://github.com/opendistro-for-elasticsearch/sql/pull/303): Attributions
+* Enhancement [#305](https://github.com/opendistro-for-elasticsearch/sql/pull/305): Improve contributing docs
+
+* BugFix [#267](https://github.com/opendistro-for-elasticsearch/sql/pull/267): Fixed operatorReplace Integration Test
+* BugFix [#275](https://github.com/opendistro-for-elasticsearch/sql/pull/275): Fix issue that IP type cannot pass JDBC formatter
+* BugFix [#284](https://github.com/opendistro-for-elasticsearch/sql/pull/284): Fixed flaky test suite, that was breaking github action build
+* BugFix [#295](https://github.com/opendistro-for-elasticsearch/sql/pull/295): Corrected the selected field names displayed in the schema of JDBC formatted response
+* BugFix [#296](https://github.com/opendistro-for-elasticsearch/sql/pull/296): Fixed functions work improperly with fieldvalue/constant param for current use
+* BugFix [#298](https://github.com/opendistro-for-elasticsearch/sql/pull/298): Fixed issue of log10 function gets inaccurate results
+* BugFix [#307](https://github.com/opendistro-for-elasticsearch/sql/pull/307): Fix the issue of column alias not working for GROUP BY
+
+## 2019-10-29, Version 1.3.0
 
 ### Notable changes
 

diff --git a/src/main/java/com/amazon/opendistroforelasticsearch/sql/plugin/RestSqlAction.java b/src/main/java/com/amazon/opendistroforelasticsearch/sql/plugin/RestSqlAction.java
@@ -79,7 +79,7 @@ public class RestSqlAction extends BaseRestHandler {
 
     RestSqlAction(Settings settings, RestController restController) {
 
-        super(settings);
+        super();
         restController.registerHandler(RestRequest.Method.POST, QUERY_API_ENDPOINT, this);
         restController.registerHandler(RestRequest.Method.GET, QUERY_API_ENDPOINT, this);
         restController.registerHandler(RestRequest.Method.POST, EXPLAIN_API_ENDPOINT, this);

diff --git a/src/main/java/com/amazon/opendistroforelasticsearch/sql/plugin/RestSqlStatsAction.java b/src/main/java/com/amazon/opendistroforelasticsearch/sql/plugin/RestSqlStatsAction.java
@@ -47,7 +47,7 @@ public class RestSqlStatsAction extends BaseRestHandler {
     public static final String STATS_API_ENDPOINT = "/_opendistro/_sql/stats";
 
     public RestSqlStatsAction(Settings settings, RestController restController) {
-        super(settings);
+        super();
         restController.registerHandler(RestRequest.Method.POST, STATS_API_ENDPOINT, this);
         restController.registerHandler(RestRequest.Method.GET, STATS_API_ENDPOINT, this);
     }

diff --git a/src/test/java/com/amazon/opendistroforelasticsearch/sql/esintgtest/SQLFunctionsIT.java b/src/test/java/com/amazon/opendistroforelasticsearch/sql/esintgtest/SQLFunctionsIT.java
@@ -24,20 +24,16 @@
 import org.elasticsearch.search.SearchHit;
 import org.elasticsearch.search.SearchHits;
 import org.hamcrest.collection.IsMapContaining;
-
-import org.json.JSONArray;
 import org.json.JSONObject;
 import org.junit.Assert;
 import org.junit.Ignore;
 import org.junit.Test;
 
 import java.io.IOException;
 import java.util.Date;
-
 import java.util.stream.IntStream;
 
 import static com.amazon.opendistroforelasticsearch.sql.esintgtest.TestsConstants.TEST_INDEX_ACCOUNT;
-import static com.amazon.opendistroforelasticsearch.sql.util.MatcherUtils.hit;
 import static com.amazon.opendistroforelasticsearch.sql.util.MatcherUtils.hitAny;
 import static com.amazon.opendistroforelasticsearch.sql.util.MatcherUtils.kvDouble;
 import static com.amazon.opendistroforelasticsearch.sql.util.MatcherUtils.kvInt;

diff --git a/src/test/resources/expectedOutput/search_spatial_explain.json b/src/test/resources/expectedOutput/search_spatial_explain.json
@@ -12,7 +12,6 @@
                                     "place" : {
                                         "shape" : {
                                             "type" : "polygon",
-                                            "orientation" : "right",
                                             "coordinates" : [
                                                 [
                                                     [