From 6428a15e686dbdee826ddafe60f4576ed3ee0964 Mon Sep 17 00:00:00 2001
From: Mijamind <quemingjian2@huawei.com>
Date: Tue, 30 Jan 2024 19:15:03 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E8=B5=84=E6=BA=90=E6=B1=A0=E5=8C=96?=
 =?UTF-8?q?=E3=80=91SPQ=E4=BF=AE=E5=A4=8Dvector=20stream=E5=88=86=E5=8F=91?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../process/stream/streamProducer.cpp         | 24 ++++---------------
 1 file changed, 5 insertions(+), 19 deletions(-)

diff --git a/src/gausskernel/process/stream/streamProducer.cpp b/src/gausskernel/process/stream/streamProducer.cpp
index 64d8f5285..9ad1c0a36 100755
--- a/src/gausskernel/process/stream/streamProducer.cpp
+++ b/src/gausskernel/process/stream/streamProducer.cpp
@@ -1376,30 +1376,16 @@ void StreamProducer::DispatchBatchRedistrFunctionByRedisType()
         case PARALLEL_NONE:
 #ifdef ENABLE_MULTIPLE_NODES
         case REMOTE_DISTRIBUTE:
-            if (m_hasExprKey) {
-                m_channelCalFun = ((list_length(m_consumerNodes->nodeList) == 1) ?
-                                  &StreamProducer::redistributeTupleChannelWithExpr<REMOTE_DIRECT_DISTRIBUTE> :
-                                  &StreamProducer::redistributeTupleChannelWithExpr<REMOTE_DISTRIBUTE>);
-            } else {
-                m_channelCalFun = ((list_length(m_consumerNodes->nodeList) == 1) ?
-                                  &StreamProducer::redistributeTupleChannel<len, REMOTE_DIRECT_DISTRIBUTE> :
-                                  &StreamProducer::redistributeTupleChannel<len, REMOTE_DISTRIBUTE>);
-            }
+            m_channelCalVecFun = (list_length(m_consumerNodes->nodeList) == 1) ?
+                                 &StreamProducer::redistributeBatchChannel<len, REMOTE_DIRECT_DISTRIBUTE> :
+                                 &StreamProducer::redistributeBatchChannel<len, REMOTE_DISTRIBUTE>;
             break;
         case REMOTE_SPLIT_DISTRIBUTE:
-            if (m_hasExprKey) {
-                m_channelCalFun = &StreamProducer::redistributeTupleChannelWithExpr<REMOTE_SPLIT_DISTRIBUTE>;
-            } else {
-                m_channelCalFun = &StreamProducer::redistributeTupleChannel<len, REMOTE_SPLIT_DISTRIBUTE>;
-            }
+            m_channelCalVecFun = &StreamProducer::redistributeBatchChannel<len, REMOTE_SPLIT_DISTRIBUTE>;
             break;
 #endif
         case LOCAL_DISTRIBUTE:
-            if (m_hasExprKey) {
-                m_channelCalFun = &StreamProducer::redistributeTupleChannelWithExpr<LOCAL_DISTRIBUTE>;
-            } else {
-                m_channelCalFun = &StreamProducer::redistributeTupleChannel<len, LOCAL_DISTRIBUTE>;
-            }
+            m_channelCalVecFun = &StreamProducer::redistributeBatchChannel<len, LOCAL_DISTRIBUTE>;
             break;
 
         default: