Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
jobily
TDengine
提交
07053ae5
T
TDengine
项目概览
jobily
/
TDengine
9 个月 前同步成功
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
T
TDengine
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
未验证
提交
07053ae5
编写于
9月 05, 2023
作者:
D
dapan1121
提交者:
GitHub
9月 05, 2023
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #22725 from taosdata/fix/TS-3895
fix: fix last(*)/last_row(*) return MD5 hashed column name
上级
8f27724f
74b9eab6
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
58 addition
and
2 deletion
+58
-2
source/libs/parser/src/parTranslater.c
source/libs/parser/src/parTranslater.c
+2
-2
tests/script/tsim/query/multires_func.sim
tests/script/tsim/query/multires_func.sim
+20
-0
tests/script/tsim/query/r/multires_func.result
tests/script/tsim/query/r/multires_func.result
+31
-0
tests/script/tsim/query/t/multires_func.sql
tests/script/tsim/query/t/multires_func.sql
+5
-0
未找到文件。
source/libs/parser/src/parTranslater.c
浏览文件 @
07053ae5
...
@@ -2902,7 +2902,7 @@ static SNode* createMultiResFunc(SFunctionNode* pSrcFunc, SExprNode* pExpr) {
...
@@ -2902,7 +2902,7 @@ static SNode* createMultiResFunc(SFunctionNode* pSrcFunc, SExprNode* pExpr) {
taosCreateMD5Hash
(
buf
,
len
);
taosCreateMD5Hash
(
buf
,
len
);
strncpy
(
pFunc
->
node
.
aliasName
,
buf
,
TSDB_COL_NAME_LEN
-
1
);
strncpy
(
pFunc
->
node
.
aliasName
,
buf
,
TSDB_COL_NAME_LEN
-
1
);
len
=
snprintf
(
buf
,
sizeof
(
buf
)
-
1
,
"%s(%s)"
,
pSrcFunc
->
functionName
,
pCol
->
colName
);
len
=
snprintf
(
buf
,
sizeof
(
buf
)
-
1
,
"%s(%s)"
,
pSrcFunc
->
functionName
,
pCol
->
colName
);
taosCreateMD5Hash
(
buf
,
len
);
// note: userAlias could be truncated here
strncpy
(
pFunc
->
node
.
userAlias
,
buf
,
TSDB_COL_NAME_LEN
-
1
);
strncpy
(
pFunc
->
node
.
userAlias
,
buf
,
TSDB_COL_NAME_LEN
-
1
);
}
}
}
else
{
}
else
{
...
@@ -2910,7 +2910,7 @@ static SNode* createMultiResFunc(SFunctionNode* pSrcFunc, SExprNode* pExpr) {
...
@@ -2910,7 +2910,7 @@ static SNode* createMultiResFunc(SFunctionNode* pSrcFunc, SExprNode* pExpr) {
taosCreateMD5Hash
(
buf
,
len
);
taosCreateMD5Hash
(
buf
,
len
);
strncpy
(
pFunc
->
node
.
aliasName
,
buf
,
TSDB_COL_NAME_LEN
-
1
);
strncpy
(
pFunc
->
node
.
aliasName
,
buf
,
TSDB_COL_NAME_LEN
-
1
);
len
=
snprintf
(
buf
,
sizeof
(
buf
)
-
1
,
"%s(%s)"
,
pSrcFunc
->
functionName
,
pExpr
->
userAlias
);
len
=
snprintf
(
buf
,
sizeof
(
buf
)
-
1
,
"%s(%s)"
,
pSrcFunc
->
functionName
,
pExpr
->
userAlias
);
taosCreateMD5Hash
(
buf
,
len
);
// note: userAlias could be truncated here
strncpy
(
pFunc
->
node
.
userAlias
,
buf
,
TSDB_COL_NAME_LEN
-
1
);
strncpy
(
pFunc
->
node
.
userAlias
,
buf
,
TSDB_COL_NAME_LEN
-
1
);
}
}
...
...
tests/script/tsim/query/multires_func.sim
0 → 100644
浏览文件 @
07053ae5
system sh/stop_dnodes.sh
system sh/deploy.sh -n dnode1 -i 1
system sh/exec.sh -n dnode1 -s start
sql connect
sql create database test
sql use test
sql CREATE TABLE `tb` (`ts` TIMESTAMP, `c0` INT, `c1` FLOAT, `c2` BINARY(10))
sql insert into tb values("2022-05-15 00:01:08.000", 1, 1.0, "abc")
sql insert into tb values("2022-05-16 00:01:08.000", 2, 2.0, "bcd")
sql insert into tb values("2022-05-17 00:01:08.000", 3, 3.0, "cde")
#sleep 10000000
system taos -P7100 -s 'source tsim/query/t/multires_func.sql' | grep -v 'Query OK' | grep -v 'Client Version' > /tmp/multires_func.result
system echo ----------------------diff start-----------------------
system git diff --exit-code --color tsim/query/r/multires_func.result /tmp/multires_func.result
system echo ----------------------diff succeed-----------------------
tests/script/tsim/query/r/multires_func.result
0 → 100644
浏览文件 @
07053ae5
Copyright (c) 2022 by TDengine, all rights reserved.
taos> source tsim/query/t/multires_func.sql
taos> use test;
Database changed.
taos> select count(*) from tb\G;
*************************** 1.row ***************************
count(*): 3
taos> select last(*) from tb\G;
*************************** 1.row ***************************
ts: 2022-05-17 00:01:08.000
c0: 3
c1: 3.0000000
c2: cde
taos> select last_row(*) from tb\G;
*************************** 1.row ***************************
ts: 2022-05-17 00:01:08.000
c0: 3
c1: 3.0000000
c2: cde
taos> select first(*) from tb\G;
*************************** 1.row ***************************
ts: 2022-05-15 00:01:08.000
c0: 1
c1: 1.0000000
c2: abc
tests/script/tsim/query/t/multires_func.sql
0 → 100644
浏览文件 @
07053ae5
use
test
;
select
count
(
*
)
from
tb
\
G
;
select
last
(
*
)
from
tb
\
G
;
select
last_row
(
*
)
from
tb
\
G
;
select
first
(
*
)
from
tb
\
G
;
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录