From dc0269cf4c2f9d20a0816e1fd0aef9ddbea4a1bf Mon Sep 17 00:00:00 2001
From: Cai Yudong <yudong.cai@zilliz.com>
Date: Fri, 15 Oct 2021 20:37:04 +0800
Subject: [PATCH] Optimize proxy getChannels (#9964)

Signed-off-by: yudong.cai <yudong.cai@zilliz.com>
---
 internal/proxy/task.go | 24 ++++++++++++++++--------
 1 file changed, 16 insertions(+), 8 deletions(-)

diff --git a/internal/proxy/task.go b/internal/proxy/task.go
index b3fd6ac841..bd332f9c5b 100644
--- a/internal/proxy/task.go
+++ b/internal/proxy/task.go
@@ -1410,15 +1410,17 @@ func (st *searchTask) getChannels() ([]pChan, error) {
 		return nil, err
 	}
 
-	_, err = st.chMgr.getChannels(collID)
+	var channels []pChan
+	channels, err = st.chMgr.getChannels(collID)
 	if err != nil {
 		err := st.chMgr.createDMLMsgStream(collID)
 		if err != nil {
 			return nil, err
 		}
+		return st.chMgr.getChannels(collID)
 	}
 
-	return st.chMgr.getChannels(collID)
+	return channels, nil
 }
 
 func (st *searchTask) getVChannels() ([]vChan, error) {
@@ -1427,15 +1429,17 @@ func (st *searchTask) getVChannels() ([]vChan, error) {
 		return nil, err
 	}
 
-	_, err = st.chMgr.getChannels(collID)
+	var channels []vChan
+	channels, err = st.chMgr.getVChannels(collID)
 	if err != nil {
 		err := st.chMgr.createDMLMsgStream(collID)
 		if err != nil {
 			return nil, err
 		}
+		return st.chMgr.getVChannels(collID)
 	}
 
-	return st.chMgr.getVChannels(collID)
+	return channels, nil
 }
 
 func (st *searchTask) PreExecute(ctx context.Context) error {
@@ -2129,15 +2133,17 @@ func (qt *queryTask) getChannels() ([]pChan, error) {
 		return nil, err
 	}
 
-	_, err = qt.chMgr.getChannels(collID)
+	var channels []pChan
+	channels, err = qt.chMgr.getChannels(collID)
 	if err != nil {
 		err := qt.chMgr.createDMLMsgStream(collID)
 		if err != nil {
 			return nil, err
 		}
+		return qt.chMgr.getChannels(collID)
 	}
 
-	return qt.chMgr.getChannels(collID)
+	return channels, nil
 }
 
 func (qt *queryTask) getVChannels() ([]vChan, error) {
@@ -2146,15 +2152,17 @@ func (qt *queryTask) getVChannels() ([]vChan, error) {
 		return nil, err
 	}
 
-	_, err = qt.chMgr.getChannels(collID)
+	var channels []vChan
+	channels, err = qt.chMgr.getVChannels(collID)
 	if err != nil {
 		err := qt.chMgr.createDMLMsgStream(collID)
 		if err != nil {
 			return nil, err
 		}
+		return qt.chMgr.getVChannels(collID)
 	}
 
-	return qt.chMgr.getVChannels(collID)
+	return channels, nil
 }
 
 func IDs2Expr(fieldName string, ids []int64) string {