@@ -869,7 +869,7 @@ static int32_t genStableTagFilterDigest(const SNode* pTagCond, T_MD5_CTX* pConte
869869 tMD5Final (pContext );
870870
871871 taosMemoryFree (payload );
872- return TSDB_CODE_SUCCESS ;
872+ return code ;
873873}
874874
875875static int32_t genTagFilterDigest (const SNode * pTagCond , T_MD5_CTX * pContext ) {
@@ -879,11 +879,9 @@ static int32_t genTagFilterDigest(const SNode* pTagCond, T_MD5_CTX* pContext) {
879879
880880 char * payload = NULL ;
881881 int32_t len = 0 ;
882- int32_t code = TSDB_CODE_SUCCESS ;
883- code = nodesNodeToMsg (pTagCond , & payload , & len );
882+ int32_t code = nodesNodeToMsg (pTagCond , & payload , & len );
884883 if (code != TSDB_CODE_SUCCESS ) {
885- qError ("%s failed at line %d since %s" ,
886- __func__ , __LINE__ , tstrerror (code ));
884+ qError ("%s failed at line %d since %s" , __func__ , __LINE__ , tstrerror (code ));
887885 return code ;
888886 }
889887
@@ -2069,10 +2067,10 @@ int32_t getTableList(void* pVnode, SScanPhysiNode* pScanNode, SNode* pTagCond, S
20692067 } else {
20702068 T_MD5_CTX context = {0 };
20712069
2072- if (pTagCond != NULL && pStreamInfo != NULL &&
2070+ if (pTagCond != NULL &&
20732071 tsStableTagFilterCache && canOptimizeTagFilter (pTagCond )) {
20742072 qDebug ("stable tag filter condition can be optimized" );
2075- if (((SStreamRuntimeFuncInfo * )pStreamInfo )-> hasPlaceHolder ) {
2073+ if (pStreamInfo != NULL && ((SStreamRuntimeFuncInfo * )pStreamInfo )-> hasPlaceHolder ) {
20762074 SNode * tmp = NULL ;
20772075 code = nodesCloneNode ((SNode * )pTagCond , & tmp );
20782076 QUERY_CHECK_CODE (code , lino , _error );
@@ -2130,7 +2128,9 @@ int32_t getTableList(void* pVnode, SScanPhysiNode* pScanNode, SNode* pTagCond, S
21302128 // try to retrieve the result from meta cache
21312129 QUERY_CHECK_CODE (code , lino , _error );
21322130 bool acquired = false;
2133- code = pStorageAPI -> metaFn .getCachedTableList (pVnode , pScanNode -> suid , context .digest , tListLen (context .digest ), pUidList , & acquired );
2131+ code = pStorageAPI -> metaFn .getCachedTableList (
2132+ pVnode , pScanNode -> suid , context .digest ,
2133+ tListLen (context .digest ), pUidList , & acquired );
21342134 QUERY_CHECK_CODE (code , lino , _error );
21352135
21362136 if (acquired ) {
@@ -2191,7 +2191,7 @@ int32_t getTableList(void* pVnode, SScanPhysiNode* pScanNode, SNode* pTagCond, S
21912191 digest [0 ] = 1 ;
21922192 memcpy (digest + 1 , context .digest , tListLen (context .digest ));
21932193 }
2194- if (pTagCond != NULL && pStreamInfo != NULL &&
2194+ if (pTagCond != NULL &&
21952195 tsStableTagFilterCache && canOptimizeTagFilter (pTagCond )) {
21962196 qDebug ("tag filter condition can be optimized, cache separately" );
21972197 char * pTagCondKey ;
0 commit comments