From 42bf26214df73fb8151760e6c03cb3cbb6982e0d Mon Sep 17 00:00:00 2001
From: "18523270951@163.com" <18523270951@163.com>
Date: Thu, 23 May 2024 08:16:29 +0000
Subject: [PATCH] adjust max_batch_size for hash gby

---
 src/sql/engine/aggregate/ob_hash_groupby_op.cpp     | 6 +++---
 src/sql/engine/aggregate/ob_hash_groupby_vec_op.cpp | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/sql/engine/aggregate/ob_hash_groupby_op.cpp b/src/sql/engine/aggregate/ob_hash_groupby_op.cpp
index 07e7237a1..6e9674807 100644
--- a/src/sql/engine/aggregate/ob_hash_groupby_op.cpp
+++ b/src/sql/engine/aggregate/ob_hash_groupby_op.cpp
@@ -1538,7 +1538,7 @@ int ObHashGroupByOp::inner_get_next_batch(const int64_t max_row_cnt)
       curr_group_id_ = 0;
       bypass_ctrl_.start_by_pass();
       LOG_TRACE("force by pass open");
-    } else if (OB_FAIL(load_data_batch(op_max_batch_size))) {
+    } else if (OB_FAIL(load_data_batch(MY_SPEC.max_batch_size_))) {
       LOG_WARN("load data failed", K(ret));
     } else {
       curr_group_id_ = 0;
@@ -1558,7 +1558,7 @@ int ObHashGroupByOp::inner_get_next_batch(const int64_t max_row_cnt)
         brs_.size_ = 0;
         reset();
       } else {
-        if (OB_FAIL(load_data_batch(op_max_batch_size))) {
+        if (OB_FAIL(load_data_batch(MY_SPEC.max_batch_size_))) {
           LOG_WARN("load data failed", K(ret));
         } else {
           op_monitor_info_.otherstat_3_value_ =
@@ -1586,7 +1586,7 @@ int ObHashGroupByOp::inner_get_next_batch(const int64_t max_row_cnt)
           LOG_WARN("failed to restart", K(ret));
         } else if (OB_FAIL(init_by_pass_group_batch_item())) {
           LOG_WARN("failed to init by pass row", K(ret));
-        } else if (OB_FAIL(load_data_batch(op_max_batch_size))) {
+        } else if (OB_FAIL(load_data_batch(MY_SPEC.max_batch_size_))) {
           LOG_WARN("failed to laod data", K(ret));
         } else if (curr_group_id_ >= local_group_rows_.size()) {
           iter_end_ = true;
diff --git a/src/sql/engine/aggregate/ob_hash_groupby_vec_op.cpp b/src/sql/engine/aggregate/ob_hash_groupby_vec_op.cpp
index 1ada565d6..7ae93e213 100644
--- a/src/sql/engine/aggregate/ob_hash_groupby_vec_op.cpp
+++ b/src/sql/engine/aggregate/ob_hash_groupby_vec_op.cpp
@@ -936,7 +936,7 @@ int ObHashGroupByVecOp::inner_get_next_batch(const int64_t max_row_cnt)
       curr_group_id_ = 0;
       bypass_ctrl_.start_by_pass();
       LOG_TRACE("force by pass open");
-    } else if (OB_FAIL(load_data_batch(op_max_batch_size))) {
+    } else if (OB_FAIL(load_data_batch(MY_SPEC.max_batch_size_))) {
       LOG_WARN("load data failed", K(ret));
     } else {
       curr_group_id_ = 0;
@@ -956,7 +956,7 @@ int ObHashGroupByVecOp::inner_get_next_batch(const int64_t max_row_cnt)
         brs_.size_ = 0;
         reset(false);
       } else {
-        if (OB_FAIL(load_data_batch(op_max_batch_size))) {
+        if (OB_FAIL(load_data_batch(MY_SPEC.max_batch_size_))) {
           LOG_WARN("load data failed", K(ret));
         } else {
           op_monitor_info_.otherstat_3_value_ =
@@ -988,7 +988,7 @@ int ObHashGroupByVecOp::inner_get_next_batch(const int64_t max_row_cnt)
           LOG_WARN("failed to restart", K(ret));
         } else if (OB_FAIL(init_by_pass_group_batch_item())) {
           LOG_WARN("failed to init by pass row", K(ret));
-        } else if (OB_FAIL(load_data_batch(op_max_batch_size))) {
+        } else if (OB_FAIL(load_data_batch(MY_SPEC.max_batch_size_))) {
           LOG_WARN("failed to laod data", K(ret));
         } else if (curr_group_id_ >= local_group_rows_.size()) {
           iter_end_ = true;