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

dataroaring 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 738fb88ee79 branch-3.0: [fix](regression)Fix insert p2 cases. #48636 
(#48683)
738fb88ee79 is described below

commit 738fb88ee799c2b1244e5d342e3d8da48bbb2424
Author: github-actions[bot] 
<41898282+github-actions[bot]@users.noreply.github.com>
AuthorDate: Thu Mar 6 12:21:53 2025 +0800

    branch-3.0: [fix](regression)Fix insert p2 cases. #48636 (#48683)
    
    Cherry-picked from #48636
    
    Co-authored-by: James <[email protected]>
---
 .../test_group_commit_insert_into_lineitem_multiple_client.groovy | 8 ++++++--
 .../test_group_commit_insert_into_lineitem_multiple_table.groovy  | 8 ++++++--
 .../test_group_commit_insert_into_lineitem_normal.groovy          | 5 +++--
 .../test_group_commit_insert_into_lineitem_scheme_change.groovy   | 8 ++++++--
 4 files changed, 21 insertions(+), 8 deletions(-)

diff --git 
a/regression-test/suites/insert_p2/test_group_commit_insert_into_lineitem_multiple_client.groovy
 
b/regression-test/suites/insert_p2/test_group_commit_insert_into_lineitem_multiple_client.groovy
index 07b0b1d9c1c..44cbc690d4a 100644
--- 
a/regression-test/suites/insert_p2/test_group_commit_insert_into_lineitem_multiple_client.groovy
+++ 
b/regression-test/suites/insert_p2/test_group_commit_insert_into_lineitem_multiple_client.groovy
@@ -50,7 +50,8 @@ 
suite("test_group_commit_insert_into_lineitem_multiple_client") {
         }
     }
     def insert_table = "test_insert_into_lineitem_multiple_client"
-    def batch = 100;
+    // Set batch to 90 to avoid JDBC driver bug. Larger batch size may trigger 
JDBC send COM_STMT_FETCH command.
+    def batch = 90;
     def total = 0;
     def rwLock = new ReentrantReadWriteLock();
     def wlock = rwLock.writeLock();
@@ -114,6 +115,9 @@ PROPERTIES (
                 break
             } catch (Exception e) {
                 logger.info("got exception:" + e)
+                Thread.sleep(2000)
+                context.reconnectFe()
+                sql """ set group_commit = async_mode; """
             }
             i++;
             if (i >= 30) {
@@ -214,4 +218,4 @@ PROPERTIES (
     } finally {
 
     }
-}
\ No newline at end of file
+}
diff --git 
a/regression-test/suites/insert_p2/test_group_commit_insert_into_lineitem_multiple_table.groovy
 
b/regression-test/suites/insert_p2/test_group_commit_insert_into_lineitem_multiple_table.groovy
index 471eb85373a..5a262c6760e 100644
--- 
a/regression-test/suites/insert_p2/test_group_commit_insert_into_lineitem_multiple_table.groovy
+++ 
b/regression-test/suites/insert_p2/test_group_commit_insert_into_lineitem_multiple_table.groovy
@@ -49,7 +49,8 @@ 
suite("test_group_commit_insert_into_lineitem_multiple_table") {
         }
     }
     def insert_table_base = "test_insert_into_lineitem_multiple_table"
-    def batch = 100;
+    // Set batch to 90 to avoid JDBC driver bug. Larger batch size may trigger 
JDBC send COM_STMT_FETCH command.
+    def batch = 90;
     def total = 0;
     def rwLock = new ReentrantReadWriteLock();
     def wlock = rwLock.writeLock();
@@ -113,6 +114,9 @@ PROPERTIES (
                 break
             } catch (Exception e) {
                 logger.info("got exception:" + e)
+                Thread.sleep(2000)
+                context.reconnectFe()
+                sql """ set group_commit = async_mode; """
             }
             i++;
             if (i >= 30) {
@@ -219,4 +223,4 @@ PROPERTIES (
     }
 
 
-}
\ No newline at end of file
+}
diff --git 
a/regression-test/suites/insert_p2/test_group_commit_insert_into_lineitem_normal.groovy
 
b/regression-test/suites/insert_p2/test_group_commit_insert_into_lineitem_normal.groovy
index da4474c7b21..9bf393a11e3 100644
--- 
a/regression-test/suites/insert_p2/test_group_commit_insert_into_lineitem_normal.groovy
+++ 
b/regression-test/suites/insert_p2/test_group_commit_insert_into_lineitem_normal.groovy
@@ -46,7 +46,8 @@ suite("test_group_commit_insert_into_lineitem_normal") {
         }
     }
     def insert_table = "test_insert_into_lineitem_normal"
-    def batch = 100;
+    // Set batch to 90 to avoid JDBC driver bug. Larger batch size may trigger 
JDBC send COM_STMT_FETCH command.
+    def batch = 90;
     def count = 0;
     def total = 0;
 
@@ -192,4 +193,4 @@ PROPERTIES (
         }
     } finally {
     }
-}
\ No newline at end of file
+}
diff --git 
a/regression-test/suites/insert_p2/test_group_commit_insert_into_lineitem_scheme_change.groovy
 
b/regression-test/suites/insert_p2/test_group_commit_insert_into_lineitem_scheme_change.groovy
index 4043c7660ce..5b15eaf92e4 100644
--- 
a/regression-test/suites/insert_p2/test_group_commit_insert_into_lineitem_scheme_change.groovy
+++ 
b/regression-test/suites/insert_p2/test_group_commit_insert_into_lineitem_scheme_change.groovy
@@ -81,7 +81,8 @@ suite("test_group_commit_insert_into_lineitem_scheme_change") 
{
         }
     }
     def insert_table = "test_lineitem_scheme_change"
-    def batch = 100;
+    // Set batch to 90 to avoid JDBC driver bug. Larger batch size may trigger 
JDBC send COM_STMT_FETCH command.
+    def batch = 90;
     def count = 0;
     def total = 0;
 
@@ -181,6 +182,9 @@ PROPERTIES (
                 if (e.getMessage().contains("is blocked on schema change")) {
                     Thread.sleep(10000)
                 }
+                Thread.sleep(2000)
+                context.reconnectFe()
+                sql """ set group_commit = async_mode; """
             }
             i++;
             if (i >= 30) {
@@ -442,4 +446,4 @@ PROPERTIES (
 
     }
 
-}
\ No newline at end of file
+}


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

Reply via email to