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

merge 3.0

This commit is contained in:
Xiaoyu Wang 2022-02-24 05:39:41 -05:00
parent dafe0dae7a
commit 2fb0af814d
4 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/libs/scalar/src/filter.c
View File

@ -3487,7 +3487,7 @@ EDealRes fltReviseRewriter(SNode** pNode, void* pContext) {
return DEAL_RES_CONTINUE; return DEAL_RES_CONTINUE;
} }
if (QUERY_NODE_VALUE == nodeType(*pNode) || QUERY_NODE_NODE_LIST == nodeType(*pNode) || QUERY_NODE_COLUMN_REF == nodeType(*pNode)) { if (QUERY_NODE_VALUE == nodeType(*pNode) || QUERY_NODE_NODE_LIST == nodeType(*pNode) || QUERY_NODE_COLUMN == nodeType(*pNode)) {
return DEAL_RES_CONTINUE; return DEAL_RES_CONTINUE;
} }

2
source/libs/scalar/src/scalar.c
View File

@ -601,7 +601,7 @@ EDealRes sclWalkOperator(SNode* pNode, void* pContext) {
EDealRes sclCalcWalker(SNode* pNode, void* pContext) { EDealRes sclCalcWalker(SNode* pNode, void* pContext) {
if (QUERY_NODE_VALUE == nodeType(pNode) || QUERY_NODE_NODE_LIST == nodeType(pNode) || QUERY_NODE_COLUMN_REF == nodeType(pNode)) { if (QUERY_NODE_VALUE == nodeType(pNode) || QUERY_NODE_NODE_LIST == nodeType(pNode) || QUERY_NODE_COLUMN == nodeType(pNode)) {
return DEAL_RES_CONTINUE; return DEAL_RES_CONTINUE;
} }

18
source/libs/scalar/test/filter/filterTests.cpp
View File

@ -76,15 +76,15 @@ void flttMakeValueNode(SNode **pNode, int32_t dataType, void *value) {
} }
void flttMakeColRefNode(SNode **pNode, SSDataBlock **block, int32_t dataType, int32_t dataBytes, int32_t rowNum, void *value) { void flttMakeColRefNode(SNode **pNode, SSDataBlock **block, int32_t dataType, int32_t dataBytes, int32_t rowNum, void *value) {
SNode *node = nodesMakeNode(QUERY_NODE_COLUMN_REF); SNode *node = nodesMakeNode(QUERY_NODE_COLUMN);
SColumnRefNode *rnode = (SColumnRefNode *)node; SColumnNode *rnode = (SColumnNode *)node;
rnode->dataType.type = dataType; rnode->node.resType.type = dataType;
rnode->dataType.bytes = dataBytes; rnode->node.resType.bytes = dataBytes;
rnode->tupleId = 0; rnode->tupleId = 0;
if (NULL == block) { if (NULL == block) {
rnode->slotId = 2; rnode->slotId = 2;
rnode->columnId = 55; rnode->colId = 55;
*pNode = (SNode *)rnode; *pNode = (SNode *)rnode;
return; return;
@ -120,7 +120,7 @@ void flttMakeColRefNode(SNode **pNode, SSDataBlock **block, int32_t dataType, in
taosArrayPush(res->pDataBlock, &idata); taosArrayPush(res->pDataBlock, &idata);
rnode->slotId = 2; rnode->slotId = 2;
rnode->columnId = 55; rnode->colId = 55;
*block = res; *block = res;
} else { } else {
@ -137,7 +137,7 @@ void flttMakeColRefNode(SNode **pNode, SSDataBlock **block, int32_t dataType, in
res->info.numOfCols++; res->info.numOfCols++;
rnode->slotId = idx; rnode->slotId = idx;
rnode->columnId = 55 + idx; rnode->colId = 55 + idx;
} }
*pNode = (SNode *)rnode; *pNode = (SNode *)rnode;
@ -259,7 +259,7 @@ TEST(columnTest, smallint_column_greater_double_value) {
ASSERT_EQ(code, 0); ASSERT_EQ(code, 0);
SColumnDataAgg stat = {0}; SColumnDataAgg stat = {0};
stat.colId = ((SColumnRefNode *)pLeft)->columnId; stat.colId = ((SColumnNode *)pLeft)->colId;
stat.max = 10; stat.max = 10;
stat.min = 5; stat.min = 5;
stat.numOfNull = 0; stat.numOfNull = 0;
@ -310,7 +310,7 @@ TEST(columnTest, int_column_greater_smallint_value) {
ASSERT_EQ(code, 0); ASSERT_EQ(code, 0);
SColumnDataAgg stat = {0}; SColumnDataAgg stat = {0};
stat.colId = ((SColumnRefNode *)pLeft)->columnId; stat.colId = ((SColumnNode *)pLeft)->colId;
stat.max = 10; stat.max = 10;
stat.min = 5; stat.min = 5;
stat.numOfNull = 0; stat.numOfNull = 0;

12
source/libs/scalar/test/scalar/scalarTests.cpp
View File

@ -75,10 +75,10 @@ void scltMakeValueNode(SNode **pNode, int32_t dataType, void *value) {
} }
void scltMakeColRefNode(SNode **pNode, SSDataBlock **block, int32_t dataType, int32_t dataBytes, int32_t rowNum, void *value) { void scltMakeColRefNode(SNode **pNode, SSDataBlock **block, int32_t dataType, int32_t dataBytes, int32_t rowNum, void *value) {
SNode *node = nodesMakeNode(QUERY_NODE_COLUMN_REF); SNode *node = nodesMakeNode(QUERY_NODE_COLUMN);
SColumnRefNode *rnode = (SColumnRefNode *)node; SColumnNode *rnode = (SColumnNode *)node;
rnode->dataType.type = dataType; rnode->node.resType.type = dataType;
rnode->dataType.bytes = dataBytes; rnode->node.resType.bytes = dataBytes;
rnode->tupleId = 0; rnode->tupleId = 0;
if (NULL == *block) { if (NULL == *block) {
@ -111,7 +111,7 @@ void scltMakeColRefNode(SNode **pNode, SSDataBlock **block, int32_t dataType, in
taosArrayPush(res->pDataBlock, &idata); taosArrayPush(res->pDataBlock, &idata);
rnode->slotId = 2; rnode->slotId = 2;
rnode->columnId = 55; rnode->colId = 55;
*block = res; *block = res;
} else { } else {
@ -126,7 +126,7 @@ void scltMakeColRefNode(SNode **pNode, SSDataBlock **block, int32_t dataType, in
taosArrayPush(res->pDataBlock, &idata); taosArrayPush(res->pDataBlock, &idata);
rnode->slotId = idx; rnode->slotId = idx;
rnode->columnId = 55 + idx; rnode->colId = 55 + idx;
} }
*pNode = (SNode *)rnode; *pNode = (SNode *)rnode;