(doris) branch branch-3.0 updated: [fix](jni)fix jni use timezone_obj get timezone be core. (#41956) (#42070)

[morningman]

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

morningman pushed a commit to branch branch-3.0
in repository https://gitbox.apache.org/repos/asf/doris.git


The following commit(s) were added to refs/heads/branch-3.0 by this push:
     new f707a398c23 [fix](jni)fix jni use timezone_obj get timezone be core. 
(#41956) (#42070)
f707a398c23 is described below

commit f707a398c23005886bb404fcdb52ee6d670b82ee
Author: daidai <2017501...@qq.com>
AuthorDate: Sat Oct 19 00:03:57 2024 +0800

    [fix](jni)fix jni use timezone_obj get timezone be core. (#41956) (#42070)
    
    bp #41956
---
 be/src/vec/exec/jni_connector.cpp                                     | 2 +-
 .../maxcompute/test_external_catalog_maxcompute.groovy                | 4 ++--
 .../external_table_p2/maxcompute/test_max_compute_all_type.groovy     | 4 ++--
 .../external_table_p2/maxcompute/test_max_compute_complex_type.groovy | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/be/src/vec/exec/jni_connector.cpp 
b/be/src/vec/exec/jni_connector.cpp
index 071d36313d2..f06524944ff 100644
--- a/be/src/vec/exec/jni_connector.cpp
+++ b/be/src/vec/exec/jni_connector.cpp
@@ -84,7 +84,7 @@ Status JniConnector::open(RuntimeState* state, 
RuntimeProfile* profile) {
         return Status::InternalError("Failed to get/create JVM");
     }
     SCOPED_TIMER(_open_scanner_time);
-    _scanner_params.emplace("time_zone", _state->timezone_obj().name());
+    _scanner_params.emplace("time_zone", _state->timezone());
     RETURN_IF_ERROR(_init_jni_scanner(env, batch_size));
     // Call org.apache.doris.common.jni.JniScanner#open
     env->CallVoidMethod(_jni_scanner_obj, _jni_scanner_open);
diff --git 
a/regression-test/suites/external_table_p2/maxcompute/test_external_catalog_maxcompute.groovy
 
b/regression-test/suites/external_table_p2/maxcompute/test_external_catalog_maxcompute.groovy
index ffb633c7b72..0539dde5981 100644
--- 
a/regression-test/suites/external_table_p2/maxcompute/test_external_catalog_maxcompute.groovy
+++ 
b/regression-test/suites/external_table_p2/maxcompute/test_external_catalog_maxcompute.groovy
@@ -320,8 +320,8 @@
 suite("test_external_catalog_maxcompute", 
"p2,external,maxcompute,external_remote,external_remote_maxcompute") {
     String enabled = context.config.otherConfigs.get("enableMaxComputeTest")
     if (enabled != null && enabled.equalsIgnoreCase("true")) {
-        String ak = context.config.otherConfigs.get("aliYunAk")
-        String sk = context.config.otherConfigs.get("aliYunSk");
+        String ak = context.config.otherConfigs.get("ak")
+        String sk = context.config.otherConfigs.get("sk");
         String mc_db = "mc_datalake"
         String mc_catalog_name = "test_external_mc_catalog"
 
diff --git 
a/regression-test/suites/external_table_p2/maxcompute/test_max_compute_all_type.groovy
 
b/regression-test/suites/external_table_p2/maxcompute/test_max_compute_all_type.groovy
index 875f3b97c3a..f1405c441ed 100644
--- 
a/regression-test/suites/external_table_p2/maxcompute/test_max_compute_all_type.groovy
+++ 
b/regression-test/suites/external_table_p2/maxcompute/test_max_compute_all_type.groovy
@@ -315,8 +315,8 @@ select * from mc_all_types;
 suite("test_max_compute_all_type", 
"p2,external,maxcompute,external_remote,external_remote_maxcompute") {
     String enabled = context.config.otherConfigs.get("enableMaxComputeTest")
     if (enabled != null && enabled.equalsIgnoreCase("true")) {
-        String ak = context.config.otherConfigs.get("aliYunAk")
-        String sk = context.config.otherConfigs.get("aliYunSk")
+        String ak = context.config.otherConfigs.get("ak")
+        String sk = context.config.otherConfigs.get("sk")
         String mc_catalog_name = "test_max_compute_all_type"
         sql """drop catalog if exists ${mc_catalog_name} """
         
diff --git 
a/regression-test/suites/external_table_p2/maxcompute/test_max_compute_complex_type.groovy
 
b/regression-test/suites/external_table_p2/maxcompute/test_max_compute_complex_type.groovy
index 764f0398f50..61ed4ef8ff6 100644
--- 
a/regression-test/suites/external_table_p2/maxcompute/test_max_compute_complex_type.groovy
+++ 
b/regression-test/suites/external_table_p2/maxcompute/test_max_compute_complex_type.groovy
@@ -160,8 +160,8 @@
 suite("test_max_compute_complex_type", 
"p2,external,maxcompute,external_remote,external_remote_maxcompute") {
     String enabled = context.config.otherConfigs.get("enableMaxComputeTest")
     if (enabled != null && enabled.equalsIgnoreCase("true")) {
-        String ak = context.config.otherConfigs.get("aliYunAk")
-        String sk = context.config.otherConfigs.get("aliYunSk")
+        String ak = context.config.otherConfigs.get("ak")
+        String sk = context.config.otherConfigs.get("sk")
         String mc_catalog_name = "test_max_compute_complex_type"
         sql """drop catalog if exists ${mc_catalog_name} """
         sql """


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org