xxq250
/
homework-jianmu
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

[TD-2220]<fix>: fix the bug in column arithmetic expression.

This commit is contained in:
Haojun Liao 2020-11-25 12:13:11 +08:00
parent 12bbecc52b
commit 9fba096e46
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/query/src/qAst.c
View File

@ -497,7 +497,7 @@ void tExprTreeCalcTraverse(tExprNode *pExprs, int32_t numOfRows, char *pOutput,
_bi_consumer_fn_t fp = tGetBiConsumerFn(pLeft->pSchema->type, pRight->pSchema->type, pExprs->_node.optr); _bi_consumer_fn_t fp = tGetBiConsumerFn(pLeft->pSchema->type, pRight->pSchema->type, pExprs->_node.optr);
// both columns are descending order, do not reverse the source data // both columns are descending order, do not reverse the source data
fp(pLeftInputData, pRightInputData, numOfRows, numOfRows, pOutput, TSDB_ORDER_DESC); fp(pLeftInputData, pRightInputData, numOfRows, numOfRows, pOutput, order);
} else if (pRight->nodeType == TSQL_NODE_VALUE) { // columnLeft + 12 } else if (pRight->nodeType == TSQL_NODE_VALUE) { // columnLeft + 12
_bi_consumer_fn_t fp = tGetBiConsumerFn(pLeft->pSchema->type, pRight->pVal->nType, pExprs->_node.optr); _bi_consumer_fn_t fp = tGetBiConsumerFn(pLeft->pSchema->type, pRight->pVal->nType, pExprs->_node.optr);

8
tests/script/general/parser/col_arithmetic_query.sim
View File

@ -113,19 +113,19 @@ if $data90 != 0.000000000 then
return -1 return -1
endi endi
if $data11 != 0.000000000 then if $data91 != 0.000000000 then
return -1 return -1
endi endi
if $data12 != 0.000000000 then if $data92 != 0.000000000 then
return -1 return -1
endi endi
if $data13 != 0.000000000 then if $data93 != 0.000000000 then
return -1 return -1
endi endi
if $data14 != 0.000000000 then if $data94 != 0.000000000 then
return -1 return -1
endi endi