提交 039f20ac 编写于 作者: X xywang

[TD-2573]<fix>: recovered checkUpdateTagPrjFunctions

上级 68ffa3b5
...@@ -7169,22 +7169,14 @@ static int32_t checkUpdateTagPrjFunctions(SQueryInfo* pQueryInfo, char* msg) { ...@@ -7169,22 +7169,14 @@ static int32_t checkUpdateTagPrjFunctions(SQueryInfo* pQueryInfo, char* msg) {
/* /*
* if numOfSelectivity equals to 0, it is a super table projection query * if numOfSelectivity equals to 0, it is a super table projection query
*/ */
if (numOfSelectivity == 1 || numOfScalar == 1) { if (numOfSelectivity == 1) {
if (numOfSelectivity == numOfScalar) {
return TSDB_CODE_TSC_INVALID_OPERATION;
}
doUpdateSqlFunctionForTagPrj(pQueryInfo); doUpdateSqlFunctionForTagPrj(pQueryInfo);
int32_t code = doUpdateSqlFunctionForColPrj(pQueryInfo); int32_t code = doUpdateSqlFunctionForColPrj(pQueryInfo);
if (numOfSelectivity == 1 && code != TSDB_CODE_SUCCESS) { if (code != TSDB_CODE_SUCCESS) {
return code; return code;
} }
} else if (numOfSelectivity > 1 || numOfScalar > 1) { } else if (numOfSelectivity > 1) {
if (numOfSelectivity > 1 && numOfScalar > 1) {
return TSDB_CODE_TSC_INVALID_OPERATION;
}
/* /*
* If more than one selectivity functions exist, all the selectivity functions must be last_row. * If more than one selectivity functions exist, all the selectivity functions must be last_row.
* Otherwise, return with error code. * Otherwise, return with error code.
...@@ -7206,7 +7198,7 @@ static int32_t checkUpdateTagPrjFunctions(SQueryInfo* pQueryInfo, char* msg) { ...@@ -7206,7 +7198,7 @@ static int32_t checkUpdateTagPrjFunctions(SQueryInfo* pQueryInfo, char* msg) {
doUpdateSqlFunctionForTagPrj(pQueryInfo); doUpdateSqlFunctionForTagPrj(pQueryInfo);
int32_t code = doUpdateSqlFunctionForColPrj(pQueryInfo); int32_t code = doUpdateSqlFunctionForColPrj(pQueryInfo);
if (numOfSelectivity == 1 && code != TSDB_CODE_SUCCESS) { if (code != TSDB_CODE_SUCCESS) {
return code; return code;
} }
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册