Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
冷面1992
TDengine
提交
c9a3b750
TDengine
项目概览
冷面1992
/
TDengine
与 Fork 源项目一致
Fork自
taosdata / TDengine
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
TDengine
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
未验证
提交
c9a3b750
编写于
7月 19, 2021
作者:
H
Haojun Liao
提交者:
GitHub
7月 19, 2021
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #6908 from taosdata/fix/TD-5055
[TD-5055]<fix> handle incorret result
上级
c1fa46d5
58ba4d00
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
41 addition
and
38 deletion
+41
-38
src/client/src/tscSQLParser.c
src/client/src/tscSQLParser.c
+3
-1
tests/pytest/query/nestquery_last_row.py
tests/pytest/query/nestquery_last_row.py
+38
-37
未找到文件。
src/client/src/tscSQLParser.c
浏览文件 @
c9a3b750
...
@@ -8277,7 +8277,9 @@ static int32_t doValidateSubquery(SSqlNode* pSqlNode, int32_t index, SSqlObj* pS
...
@@ -8277,7 +8277,9 @@ static int32_t doValidateSubquery(SSqlNode* pSqlNode, int32_t index, SSqlObj* pS
// union all is not support currently
// union all is not support currently
SSqlNode
*
p
=
taosArrayGetP
(
subInfo
->
pSubquery
,
0
);
SSqlNode
*
p
=
taosArrayGetP
(
subInfo
->
pSubquery
,
0
);
if
(
taosArrayGetSize
(
subInfo
->
pSubquery
)
>=
2
)
{
return
invalidOperationMsg
(
msgBuf
,
"not support union in subquery"
);
}
SQueryInfo
*
pSub
=
calloc
(
1
,
sizeof
(
SQueryInfo
));
SQueryInfo
*
pSub
=
calloc
(
1
,
sizeof
(
SQueryInfo
));
tscInitQueryInfo
(
pSub
);
tscInitQueryInfo
(
pSub
);
...
...
tests/pytest/query/nestquery_last_row.py
浏览文件 @
c9a3b750
...
@@ -160,22 +160,23 @@ class TDTestCase:
...
@@ -160,22 +160,23 @@ class TDTestCase:
tdSql
.
checkData
(
0
,
9
,
9.000000000
)
tdSql
.
checkData
(
0
,
9
,
9.000000000
)
tdSql
.
checkData
(
0
,
10
,
'2020-09-13 20:26:40.009'
)
tdSql
.
checkData
(
0
,
10
,
'2020-09-13 20:26:40.009'
)
# incorrect result, not support nest > 2
sql
=
'''select last_row(*) from
sql
=
'''select last_row(*) from
((select * from table_0) union all
((select * from table_0) union all
(select * from table_1) union all
(select * from table_1) union all
(select * from table_2));'''
(select * from table_2));'''
tdSql
.
query
(
sql
)
tdSql
.
error
(
sql
)
tdSql
.
checkRows
(
1
)
#
tdSql.checkRows(1)
tdSql
.
checkData
(
0
,
1
,
self
.
num
-
1
)
#
tdSql.checkData(0,1,self.num-1)
tdSql
.
checkData
(
0
,
2
,
self
.
num
-
1
)
#
tdSql.checkData(0,2,self.num-1)
tdSql
.
checkData
(
0
,
3
,
self
.
num
-
1
)
#
tdSql.checkData(0,3,self.num-1)
tdSql
.
checkData
(
0
,
4
,
self
.
num
-
1
)
#
tdSql.checkData(0,4,self.num-1)
tdSql
.
checkData
(
0
,
5
,
'False'
)
#
tdSql.checkData(0,5,'False')
tdSql
.
checkData
(
0
,
6
,
'binary.9'
)
#
tdSql.checkData(0,6,'binary.9')
tdSql
.
checkData
(
0
,
7
,
'nchar.9'
)
#
tdSql.checkData(0,7,'nchar.9')
tdSql
.
checkData
(
0
,
8
,
9.00000
)
#
tdSql.checkData(0,8,9.00000)
tdSql
.
checkData
(
0
,
9
,
9.000000000
)
#
tdSql.checkData(0,9,9.000000000)
tdSql
.
checkData
(
0
,
10
,
'2020-09-13 20:26:40.009'
)
#
tdSql.checkData(0,10,'2020-09-13 20:26:40.009')
# bug 5055
# bug 5055
# sql = '''select last_row(*) from
# sql = '''select last_row(*) from
...
@@ -189,18 +190,18 @@ class TDTestCase:
...
@@ -189,18 +190,18 @@ class TDTestCase:
((select last_row(*) from table_0) union all
((select last_row(*) from table_0) union all
(select last_row(*) from table_1) union all
(select last_row(*) from table_1) union all
(select last_row(*) from table_2));'''
(select last_row(*) from table_2));'''
tdSql
.
query
(
sql
)
tdSql
.
error
(
sql
)
tdSql
.
checkRows
(
1
)
#
tdSql.checkRows(1)
tdSql
.
checkData
(
0
,
1
,
self
.
num
-
1
)
#
tdSql.checkData(0,1,self.num-1)
tdSql
.
checkData
(
0
,
2
,
self
.
num
-
1
)
#
tdSql.checkData(0,2,self.num-1)
tdSql
.
checkData
(
0
,
3
,
self
.
num
-
1
)
#
tdSql.checkData(0,3,self.num-1)
tdSql
.
checkData
(
0
,
4
,
self
.
num
-
1
)
#
tdSql.checkData(0,4,self.num-1)
tdSql
.
checkData
(
0
,
5
,
'False'
)
#
tdSql.checkData(0,5,'False')
tdSql
.
checkData
(
0
,
6
,
'binary.9'
)
#
tdSql.checkData(0,6,'binary.9')
tdSql
.
checkData
(
0
,
7
,
'nchar.9'
)
#
tdSql.checkData(0,7,'nchar.9')
tdSql
.
checkData
(
0
,
8
,
9.00000
)
#
tdSql.checkData(0,8,9.00000)
tdSql
.
checkData
(
0
,
9
,
9.000000000
)
#
tdSql.checkData(0,9,9.000000000)
tdSql
.
checkData
(
0
,
10
,
'2020-09-13 20:26:40.009'
)
#
tdSql.checkData(0,10,'2020-09-13 20:26:40.009')
# bug 5055
# bug 5055
# sql = '''select last_row(*) from
# sql = '''select last_row(*) from
...
@@ -214,18 +215,18 @@ class TDTestCase:
...
@@ -214,18 +215,18 @@ class TDTestCase:
((select * from table_0 limit 5 offset 5) union all
((select * from table_0 limit 5 offset 5) union all
(select * from table_1 limit 5 offset 5) union all
(select * from table_1 limit 5 offset 5) union all
(select * from regular_table_1 limit 5 offset 5));'''
(select * from regular_table_1 limit 5 offset 5));'''
tdSql
.
query
(
sql
)
tdSql
.
error
(
sql
)
tdSql
.
checkRows
(
1
)
#
tdSql.checkRows(1)
tdSql
.
checkData
(
0
,
1
,
self
.
num
-
1
)
#
tdSql.checkData(0,1,self.num-1)
tdSql
.
checkData
(
0
,
2
,
self
.
num
-
1
)
#
tdSql.checkData(0,2,self.num-1)
tdSql
.
checkData
(
0
,
3
,
self
.
num
-
1
)
#
tdSql.checkData(0,3,self.num-1)
tdSql
.
checkData
(
0
,
4
,
self
.
num
-
1
)
#
tdSql.checkData(0,4,self.num-1)
tdSql
.
checkData
(
0
,
5
,
'False'
)
#
tdSql.checkData(0,5,'False')
tdSql
.
checkData
(
0
,
6
,
'binary.9'
)
#
tdSql.checkData(0,6,'binary.9')
tdSql
.
checkData
(
0
,
7
,
'nchar.9'
)
#
tdSql.checkData(0,7,'nchar.9')
tdSql
.
checkData
(
0
,
8
,
9.00000
)
#
tdSql.checkData(0,8,9.00000)
tdSql
.
checkData
(
0
,
9
,
9.000000000
)
#
tdSql.checkData(0,9,9.000000000)
tdSql
.
checkData
(
0
,
10
,
'2020-09-13 20:26:40.009'
)
#
tdSql.checkData(0,10,'2020-09-13 20:26:40.009')
sql
=
'''select last_row(*) from
sql
=
'''select last_row(*) from
...
@@ -260,4 +261,4 @@ class TDTestCase:
...
@@ -260,4 +261,4 @@ class TDTestCase:
tdCases
.
addWindows
(
__file__
,
TDTestCase
())
tdCases
.
addWindows
(
__file__
,
TDTestCase
())
tdCases
.
addLinux
(
__file__
,
TDTestCase
())
tdCases
.
addLinux
(
__file__
,
TDTestCase
())
\ No newline at end of file
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录