This is an automated email from the ASF dual-hosted git repository.

zouxinyi pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/doris.git


The following commit(s) were added to refs/heads/master by this push:
     new b5dc1e4ce02 [fix](arrow-flight) Fix arrow flight sql compatible with 
JDK 17 and upgrade arrow 15.0.2 (#32796)
b5dc1e4ce02 is described below

commit b5dc1e4ce02217376e7bad73dd939e4f27a268ad
Author: Xinyi Zou <[email protected]>
AuthorDate: Thu Mar 28 10:13:55 2024 +0800

    [fix](arrow-flight) Fix arrow flight sql compatible with JDK 17 and upgrade 
arrow 15.0.2 (#32796)
    
    --add-opens=java.base/java.nio=ALL-UNNAMED, see: 
https://arrow.apache.org/docs/java/install.html#java-compatibility
    groovy use flight sql connection to execute query SUM(MAX(c1) OVER 
(PARTITION BY)) report error: AGGREGATE clause must not contain analytic 
expressions, but no problem in Java execute it with jdbc::arrow-flight-sql.
    groovy not support print arrow array type, throw IndexOutOfBoundsException.
    "arrow_flight_sql" not support two phase read
    ./run-regression-test.sh --run --clean -g arrow_flight_sql
---
 fe/pom.xml                                                       | 9 ++++++++-
 regression-test/framework/pom.xml                                | 2 +-
 .../suites/query_p0/sql_functions/test_in_expr.groovy            | 2 +-
 .../sql_functions/window_functions/test_window_fn.groovy         | 4 +++-
 .../suites/query_p0/test_two_phase_read_with_having.groovy       | 2 +-
 run-regression-test.sh                                           | 1 +
 6 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/fe/pom.xml b/fe/pom.xml
index 8c7af48aff7..159fbbed41f 100644
--- a/fe/pom.xml
+++ b/fe/pom.xml
@@ -206,6 +206,13 @@ under the License.
                 </plugin>
             </plugins>
         </pluginManagement>
+        <extensions>
+            <extension>
+                <groupId>kr.motd.maven</groupId>
+                <artifactId>os-maven-plugin</artifactId>
+                <version>1.7.0</version>
+            </extension>
+        </extensions>
     </build>
     <modules>
         <module>fe-common</module>
@@ -305,7 +312,7 @@ under the License.
         <iceberg.version>1.4.3</iceberg.version>
         <maxcompute.version>0.45.2-public</maxcompute.version>
         <avro.version>1.11.3</avro.version>
-        <arrow.version>15.0.0</arrow.version>
+        <arrow.version>15.0.2</arrow.version>
         <!-- hudi -->
         <hudi.version>0.14.1</hudi.version>
         <presto.hadoop.version>2.7.4-11</presto.hadoop.version>
diff --git a/regression-test/framework/pom.xml 
b/regression-test/framework/pom.xml
index 6447218f029..9cf3b554092 100644
--- a/regression-test/framework/pom.xml
+++ b/regression-test/framework/pom.xml
@@ -75,7 +75,7 @@ under the License.
         <antlr.version>4.9.3</antlr.version>
         <hadoop.version>2.8.0</hadoop.version>
         <aws-java-sdk-s3.version>1.11.95</aws-java-sdk-s3.version>
-        <arrow.version>15.0.0</arrow.version>
+        <arrow.version>15.0.2</arrow.version>
     </properties>
     <build>
         <plugins>
diff --git a/regression-test/suites/query_p0/sql_functions/test_in_expr.groovy 
b/regression-test/suites/query_p0/sql_functions/test_in_expr.groovy
index 9829c9d61a7..b6955e8df12 100644
--- a/regression-test/suites/query_p0/sql_functions/test_in_expr.groovy
+++ b/regression-test/suites/query_p0/sql_functions/test_in_expr.groovy
@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-suite("test_in_expr", "query,arrow_flight_sql") {
+suite("test_in_expr", "query") { // "arrow_flight_sql", groovy not support 
print arrow array type, throw IndexOutOfBoundsException.
     def nullTableName = "in_expr_test_null"
     def notNullTableName = "in_expr_test_not_null"
 
diff --git 
a/regression-test/suites/query_p0/sql_functions/window_functions/test_window_fn.groovy
 
b/regression-test/suites/query_p0/sql_functions/window_functions/test_window_fn.groovy
index 165d5cf1d42..66bbab89d24 100644
--- 
a/regression-test/suites/query_p0/sql_functions/window_functions/test_window_fn.groovy
+++ 
b/regression-test/suites/query_p0/sql_functions/window_functions/test_window_fn.groovy
@@ -14,7 +14,9 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
-suite("test_window_fn", "arrow_flight_sql") {
+suite("test_window_fn") {
+    // "arrow_flight_sql", groovy use flight sql connection to execute query 
`SUM(MAX(c1) OVER (PARTITION BY))` report error:
+    // `AGGREGATE clause must not contain analytic expressions`, but no 
problem in Java execute it with `jdbc::arrow-flight-sql`.
     def tbName1 = "empsalary"
     def tbName2 = "tenk1"
     sql """ DROP TABLE IF EXISTS ${tbName1} """
diff --git 
a/regression-test/suites/query_p0/test_two_phase_read_with_having.groovy 
b/regression-test/suites/query_p0/test_two_phase_read_with_having.groovy
index d0207960db8..28e5e0405e5 100644
--- a/regression-test/suites/query_p0/test_two_phase_read_with_having.groovy
+++ b/regression-test/suites/query_p0/test_two_phase_read_with_having.groovy
@@ -14,7 +14,7 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
-suite("test_two_phase_read_with_having", "arrow_flight_sql") {
+suite("test_two_phase_read_with_having") { // "arrow_flight_sql" not support 
two phase read
 
     sql """ set enable_partition_topn = 1; """
     sql """ set topn_opt_limit_threshold = 1024; """
diff --git a/run-regression-test.sh b/run-regression-test.sh
index 78523ea2200..dc90f4b648d 100755
--- a/run-regression-test.sh
+++ b/run-regression-test.sh
@@ -200,6 +200,7 @@ fi
 
 echo "===== Run Regression Test ====="
 
+# if use jdk17, add java option "--add-opens=java.base/java.nio=ALL-UNNAMED"
 if [[ "${TEAMCITY}" -eq 1 ]]; then
     JAVA_OPTS="${JAVA_OPTS} -DstdoutAppenderType=teamcity -Xmx2048m"
 fi


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to