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

fxi: use the same agg func outside of cols

This commit is contained in:
factosea 2025-01-23 19:27:32 +08:00
parent b1f1c2e860
commit 7e553f7bc9
2 changed files with 40 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
source/libs/nodes/src/nodesEqualFuncs.c
View File

@ -139,10 +139,13 @@ static bool functionNodeEqual(const SFunctionNode* a, const SFunctionNode* b) {
COMPARE_STRING_FIELD(functionName);
COMPARE_NODE_LIST_FIELD(pParameterList);
if (a->funcType == FUNCTION_TYPE_SELECT_VALUE) {
if ((a->node.bindTupleFuncIdx != b->node.bindTupleFuncIdx) &&
(a->node.bindTupleFuncIdx != 0 || b->node.bindTupleFuncIdx != 0))
if ((a->node.bindTupleFuncIdx != b->node.bindTupleFuncIdx)) return false;
} else {
if ((a->node.tupleFuncIdx != b->node.tupleFuncIdx)) {
return false;
}
}
return true;
}

37
tests/system-test/2-query/cols_function.py
View File

@ -471,8 +471,41 @@ class TDTestCase:
tdSql.checkData(1, 3, 2)
tdSql.checkData(1, 4, 4)
# todo 1 , has same select function outof cols func
#select cols(last_row(c0), ts as t1, c1 as c11), cols(first(c0), ts as t2, c1 c21), first(c0) from test.meters where c0 < 4;
# fixed: has same select function outof cols func
tdSql.query(f'select cols(last_row(c0), ts as t1, c1 as c11), cols(first(c0), ts as t2, c1 c21), first(c0) from test.meters where c0 < 4 group by tbname order by t1')
tdSql.checkResColNameList(['t1', 'c11', 't2', 'c21', 'first(c0)'])
tdSql.checkRows(2)
tdSql.checkCols(5)
tdSql.checkData(0, 0, 1734574929000)
tdSql.checkData(0, 1, 1)
tdSql.checkData(0, 2, 1734574929000)
tdSql.checkData(0, 3, 1)
tdSql.checkData(0, 4, 1)
tdSql.checkData(1, 0, 1734574929003)
tdSql.checkData(1, 1, 3)
tdSql.checkData(1, 2, 1734574929000)
tdSql.checkData(1, 3, 1)
tdSql.checkData(1, 4, 1)
tdSql.query(f'select cols(last_row(c0), ts as t1, c1 as c11), cols(first(c0), ts as t2, c1 c21), first(c0), cols(last(c0), ts, c1) from test.meters where c0 < 4 group by tbname order by t1;')
tdSql.checkResColNameList(['t1', 'c11', 't2', 'c21', 'first(c0)', 'ts', 'c1'])
tdSql.checkRows(2)
tdSql.checkCols(7)
tdSql.checkData(0, 0, 1734574929000)
tdSql.checkData(0, 1, 1)
tdSql.checkData(0, 2, 1734574929000)
tdSql.checkData(0, 3, 1)
tdSql.checkData(0, 4, 1)
tdSql.checkData(0, 5, 1734574929000)
tdSql.checkData(0, 6, 1)
tdSql.checkData(1, 0, 1734574929003)
tdSql.checkData(1, 1, 3)
tdSql.checkData(1, 2, 1734574929000)
tdSql.checkData(1, 3, 1)
tdSql.checkData(1, 4, 1)
tdSql.checkData(1, 5, 1734574929003)
tdSql.checkData(1, 6, 3)
# todo 2, sub query has cols func
# select * from (select cols(last_row(c0), ts as t1, c1 as c11), cols(first(c0), ts as t2, c1 c21), first(c0) from test.meters where c0 < 4);
# todo 3, cols on system table