Skip to content

T
TDengine

taosdata / TDengine
1 年多 前同步成功

通知 1185
Star 22016
Fork 4786
T
TDengine
提交 449e2393 编写于 作者: Z zhaoyanggh
浏览文件
操作

Merge branch 'feature/TD-2573' of https://github.com/taosdata/TDengine into feature/TD-2573

上级 8dc2ee3a 7642098c
隐藏空白更改
内联 并排
Showing with 63 addition and 14 deletion
src/client/src/tscUtil.c
浏览文件 @ 449e2393
......@@ -268,7 +268,10 @@ bool tscIsProjectionQueryOnSTable(SQueryInfo* pQueryInfo, int32_t tableIndex) {
functionId != TSDB_FUNC_DIFF &&
functionId != TSDB_FUNC_DERIVATIVE &&
functionId != TSDB_FUNC_TS_DUMMY &&
functionId != TSDB_FUNC_TID_TAG) {
functionId != TSDB_FUNC_TID_TAG &&
functionId != TSDB_FUNC_CEIL &&
functionId != TSDB_FUNC_FLOOR &&
functionId != TSDB_FUNC_ROUND) {
return false;
}
}
......
src/query/src/qPlan.c
浏览文件 @ 449e2393
......@@ -645,6 +645,12 @@ SArray* createExecOperatorPlan(SQueryAttr* pQueryAttr) {
} else {
op = OP_Project;
taosArrayPush(plan, &op);
if (pQueryAttr->pExpr2 != NULL) {
op = OP_Project;
taosArrayPush(plan, &op);
}
if (pQueryAttr->distinct) {
op = OP_Distinct;
taosArrayPush(plan, &op);
......
tests/pytest/functions/function_ceil.py
浏览文件 @ 449e2393
......@@ -286,16 +286,6 @@ class TDTestCase:
"derivative(ceil(ubigint_col), 1s, 0)",
"derivative(ceil(usmallint_col), 1s, 0)",
"derivative(ceil(utinyint_col), 1s, 0)",
"ceil(int_col) + ceil(int_col)",
"ceil(bigint_col) + ceil(bigint_col)",
"ceil(float_col) + ceil(float_col)",
"ceil(double_col) + ceil(double_col)",
"ceil(smallint_col) + ceil(smallint_col)",
"ceil(tinyint_col) + ceil(tinyint_col)",
"ceil(uint_col) + ceil(uint_col)",
"ceil(ubigint_col) + ceil(ubigint_col)",
"ceil(usmallint_col) + ceil(usmallint_col)",
"ceil(utinyint_col) + ceil(utinyint_col)",
"ceil(int_col) - ceil(int_col)",
"ceil(bigint_col) - ceil(bigint_col)",
"ceil(float_col) - ceil(float_col)",
......@@ -1434,16 +1424,66 @@ class TDTestCase:
or select_command[s] == "distinct ceil(uint_col)"\
or select_command[s] == "distinct ceil(ubigint_col)"\
or select_command[s] == "distinct ceil(usmallint_col)"\
or select_command[s] == "distinct ceil(utinyint_col)"):
or select_command[s] == "distinct ceil(utinyint_col)"\
or select_command[s] == "ceil(int_col) + ceil(int_col)"\
or select_command[s] == "ceil(bigint_col) + ceil(bigint_col)"\
or select_command[s] == "ceil(float_col) + ceil(float_col)"\
or select_command[s] == "ceil(double_col) + ceil(double_col)"\
or select_command[s] == "ceil(smallint_col) + ceil(smallint_col)"\
or select_command[s] == "ceil(tinyint_col) + ceil(tinyint_col)"\
or select_command[s] == "ceil(uint_col) + ceil(uint_col)"\
or select_command[s] == "ceil(ubigint_col) + ceil(ubigint_col)"\
or select_command[s] == "ceil(usmallint_col) + ceil(usmallint_col)"\
or select_command[s] == "ceil(utinyint_col) + ceil(utinyint_col)"\
or select_command[s] == "ceil(int_col) + ceil(int_col)"\
or select_command[s] == "ceil(bigint_col) + ceil(bigint_col)"\
or select_command[s] == "ceil(float_col) + ceil(float_col)"\
or select_command[s] == "ceil(double_col) + ceil(double_col)"\
or select_command[s] == "ceil(smallint_col) + ceil(smallint_col)"\
or select_command[s] == "ceil(tinyint_col) + ceil(tinyint_col)"\
or select_command[s] == "ceil(uint_col) + ceil(uint_col)"\
or select_command[s] == "ceil(ubigint_col) + ceil(ubigint_col)"\
or select_command[s] == "ceil(usmallint_col) + ceil(usmallint_col)"\
or select_command[s] == "ceil(utinyint_col) + cei(utinyint_col)"\
or select_command[s] == "ceil(int_col) - ceil(int_col)"\
or select_command[s] == "ceil(bigint_col) - ceil(bigint_col)"\
or select_command[s] == "ceil(float_col) - ceil(float_col)"\
or select_command[s] == "ceil(double_col) - ceil(double_col)"\
or select_command[s] == "ceil(smallint_col) - ceil(smallint_col)"\
or select_command[s] == "ceil(tinyint_col) - ceil(tinyint_col)"\
or select_command[s] == "ceil(uint_col) - ceil(uint_col)"\
or select_command[s] == "ceil(ubigint_col) - ceil(ubigint_col)"\
or select_command[s] == "ceil(usmallint_col) - ceil(usmallint_col)"\
or select_command[s] == "ceil(utinyint_col) - ceil(utinyint_col)"\
or select_command[s] == "ceil(int_col) * ceil(int_col)"\
or select_command[s] == "ceil(bigint_col) * ceil(bigint_col)"\
or select_command[s] == "ceil(float_col) * ceil(float_col)"\
or select_command[s] == "ceil(double_col) * ceil(double_col)"\
or select_command[s] == "ceil(smallint_col) * ceil(smallint_col)"\
or select_command[s] == "ceil(tinyint_col) * ceil(tinyint_col)"\
or select_command[s] == "ceil(uint_col) * ceil(uint_col)"\
or select_command[s] == "ceil(ubigint_col) * ceil(ubigint_col)"\
or select_command[s] == "ceil(usmallint_col) * ceil(usmallint_col)"\
or select_command[s] == "ceil(utinyint_col) * ceil(utinyint_col)"\
or select_command[s] == "ceil(int_col) / ceil(int_col)"\
or select_command[s] == "ceil(bigint_col) / ceil(bigint_col)"\
or select_command[s] == "ceil(float_col) / ceil(float_col)"\
or select_command[s] == "ceil(double_col) / ceil(double_col)"\
or select_command[s] == "ceil(smallint_col) / ceil(smallint_col)"\
or select_command[s] == "ceil(tinyint_col) / ceil(tinyint_col)"\
or select_command[s] == "ceil(uint_col) / ceil(uint_col)"\
or select_command[s] == "ceil(ubigint_col) / ceil(ubigint_col)"\
or select_command[s] == "ceil(usmallint_col) / ceil(usmallint_col)"\
or select_command[s] == "ceil(utinyint_col) / ceil(utinyint_col)"):
tdSql.query(sql)
else:
tdSql.error(sql)
for s in range(len(simple_select_command)):
for sim in range(len(simple_select_command)):
for fr in range(len(advance_from_command)):
for filter in range(len(filter_command)):
for fill in range(len(fill_command)):
sql = "select " + simple_select_command[
s] + from_command[fr] + filter_command[
sim] + advance_from_command[fr] + filter_command[
filter] + fill_command[fill]
if sql == "select ceil(t1.int_col) from t1"\
or sql == "select ceil(super.int_col) from super"\
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或