diff --git a/src/client/src/tscSubquery.c b/src/client/src/tscSubquery.c
index 48c1880ebcc3dd505b42aa3753279aec706e46ce..f759cf8eb4b99256102ae79fd3c8e137831b619d 100644
--- a/src/client/src/tscSubquery.c
+++ b/src/client/src/tscSubquery.c
@@ -2861,7 +2861,7 @@ static void tscRetrieveFromDnodeCallBack(void *param, TAOS_RES *tres, int numOfR
     tscDebug("0x%"PRIx64" sub:%p retrieve numOfRows:%d totalNumOfRows:%" PRIu64 " from ep:%s, orderOfSub:%d",
         pParentSql->self, pSql, pRes->numOfRows, pState->numOfRetrievedRows, pSql->epSet.fqdn[pSql->epSet.inUse], idx);
 
-    if (num > tsMaxNumOfOrderedResults && tscIsProjectionQueryOnSTable(pQueryInfo, 0) && !(tscGetQueryInfoDetail(&pParentSql->cmd, 0)->distinctTag)) {
+    if (num > tsMaxNumOfOrderedResults && tscIsProjectionQueryOnSTable(pQueryInfo, 0) && !(tscGetQueryInfo(&pParentSql->cmd, 0)->distinctTag)) {
       tscError("0x%"PRIx64" sub:0x%"PRIx64" num of OrderedRes is too many, max allowed:%" PRId32 " , current:%" PRId64,
                pParentSql->self, pSql->self, tsMaxNumOfOrderedResults, num);
       tscAbortFurtherRetryRetrieval(trsupport, tres, TSDB_CODE_TSC_SORTED_RES_TOO_MANY);
diff --git a/src/common/inc/texpr.h b/src/common/inc/texpr.h
index 3376a7c251d037e890167c87501eb97dbe4fdd1a..275dd12fd7ca9f9771592039d846593fa958f240 100644
--- a/src/common/inc/texpr.h
+++ b/src/common/inc/texpr.h
@@ -89,7 +89,7 @@ tExprNode* exprdup(tExprNode* pTree);
 
 void exprTreeToBinary(SBufferWriter* bw, tExprNode* pExprTree);
 
-bool exprTreeApplayFilter(tExprNode *pExpr, const void *pItem, SExprTraverseSupp *param);
+bool exprTreeApplyFilter(tExprNode *pExpr, const void *pItem, SExprTraverseSupp *param);
 
 void arithmeticTreeTraverse(tExprNode *pExprs, int32_t numOfRows, char *pOutput, void *param, int32_t order,
                             char *(*cb)(void *, const char*, int32_t));
diff --git a/src/connector/go b/src/connector/go
index 050667e5b4d0eafa5387e4283e713559b421203f..7a26c432f8b4203e42344ff3290b9b9b01b983d5 160000
--- a/src/connector/go
+++ b/src/connector/go
@@ -1 +1 @@
-Subproject commit 050667e5b4d0eafa5387e4283e713559b421203f
+Subproject commit 7a26c432f8b4203e42344ff3290b9b9b01b983d5
diff --git a/src/connector/grafanaplugin b/src/connector/grafanaplugin
index 3530c6df097134a410bacec6b3cd013ef38a61aa..32e2c97a4cf7bedaa99f5d6dd8cb036e7f4470df 160000
--- a/src/connector/grafanaplugin
+++ b/src/connector/grafanaplugin
@@ -1 +1 @@
-Subproject commit 3530c6df097134a410bacec6b3cd013ef38a61aa
+Subproject commit 32e2c97a4cf7bedaa99f5d6dd8cb036e7f4470df