Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
taosdata
TDengine
提交
17f953da
T
TDengine
项目概览
taosdata
/
TDengine
大约 2 年 前同步成功
通知
1193
Star
22018
Fork
4786
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
1
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
T
TDengine
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
1
Issue
1
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
提交
17f953da
编写于
12月 01, 2021
作者:
X
xywang
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[TS-715]<fix>: fixed coredump caused by result column id underflow
上级
41a9d069
变更
4
显示空白变更内容
内联
并排
Showing
4 changed file
with
34 addition
and
5 deletion
+34
-5
src/client/src/tscServer.c
src/client/src/tscServer.c
+5
-1
src/inc/taoserror.h
src/inc/taoserror.h
+1
-0
src/util/src/terror.c
src/util/src/terror.c
+4
-3
tests/pytest/query/unionAllTest.py
tests/pytest/query/unionAllTest.py
+24
-1
未找到文件。
src/client/src/tscServer.c
浏览文件 @
17f953da
...
@@ -980,7 +980,11 @@ static int32_t serializeSqlExpr(SSqlExpr* pExpr, STableMetaInfo* pTableMetaInfo,
...
@@ -980,7 +980,11 @@ static int32_t serializeSqlExpr(SSqlExpr* pExpr, STableMetaInfo* pTableMetaInfo,
return
TSDB_CODE_TSC_INVALID_OPERATION
;
return
TSDB_CODE_TSC_INVALID_OPERATION
;
}
}
assert
(
pExpr
->
resColId
<
0
);
if
(
pExpr
->
resColId
>=
0
)
{
tscError
(
"result column id underflowed: %d"
,
pExpr
->
resColId
);
return
TSDB_CODE_TSC_RES_TOO_MANY
;
}
SSqlExpr
*
pSqlExpr
=
(
SSqlExpr
*
)(
*
pMsg
);
SSqlExpr
*
pSqlExpr
=
(
SSqlExpr
*
)(
*
pMsg
);
SColIndex
*
pIndex
=
&
pSqlExpr
->
colInfo
;
SColIndex
*
pIndex
=
&
pSqlExpr
->
colInfo
;
...
...
src/inc/taoserror.h
浏览文件 @
17f953da
...
@@ -106,6 +106,7 @@ int32_t* taosGetErrno();
...
@@ -106,6 +106,7 @@ int32_t* taosGetErrno();
#define TSDB_CODE_TSC_DUP_COL_NAMES TAOS_DEF_ERROR_CODE(0, 0x021D) //"duplicated column names")
#define TSDB_CODE_TSC_DUP_COL_NAMES TAOS_DEF_ERROR_CODE(0, 0x021D) //"duplicated column names")
#define TSDB_CODE_TSC_INVALID_TAG_LENGTH TAOS_DEF_ERROR_CODE(0, 0x021E) //"Invalid tag length")
#define TSDB_CODE_TSC_INVALID_TAG_LENGTH TAOS_DEF_ERROR_CODE(0, 0x021E) //"Invalid tag length")
#define TSDB_CODE_TSC_INVALID_COLUMN_LENGTH TAOS_DEF_ERROR_CODE(0, 0x021F) //"Invalid column length")
#define TSDB_CODE_TSC_INVALID_COLUMN_LENGTH TAOS_DEF_ERROR_CODE(0, 0x021F) //"Invalid column length")
#define TSDB_CODE_TSC_RES_TOO_MANY TAOS_DEF_ERROR_CODE(0, 0x0227) //"Result set too large to be output")
// mnode
// mnode
#define TSDB_CODE_MND_MSG_NOT_PROCESSED TAOS_DEF_ERROR_CODE(0, 0x0300) //"Message not processed")
#define TSDB_CODE_MND_MSG_NOT_PROCESSED TAOS_DEF_ERROR_CODE(0, 0x0300) //"Message not processed")
...
...
src/util/src/terror.c
浏览文件 @
17f953da
...
@@ -115,6 +115,7 @@ TAOS_DEFINE_ERROR(TSDB_CODE_TSC_NO_META_CACHED, "No table meta cached"
...
@@ -115,6 +115,7 @@ TAOS_DEFINE_ERROR(TSDB_CODE_TSC_NO_META_CACHED, "No table meta cached"
TAOS_DEFINE_ERROR
(
TSDB_CODE_TSC_DUP_COL_NAMES
,
"duplicated column names"
)
TAOS_DEFINE_ERROR
(
TSDB_CODE_TSC_DUP_COL_NAMES
,
"duplicated column names"
)
TAOS_DEFINE_ERROR
(
TSDB_CODE_TSC_INVALID_TAG_LENGTH
,
"Invalid tag length"
)
TAOS_DEFINE_ERROR
(
TSDB_CODE_TSC_INVALID_TAG_LENGTH
,
"Invalid tag length"
)
TAOS_DEFINE_ERROR
(
TSDB_CODE_TSC_INVALID_COLUMN_LENGTH
,
"Invalid column length"
)
TAOS_DEFINE_ERROR
(
TSDB_CODE_TSC_INVALID_COLUMN_LENGTH
,
"Invalid column length"
)
TAOS_DEFINE_ERROR
(
TSDB_CODE_TSC_RES_TOO_MANY
,
"Result set too large to be output"
)
// mnode
// mnode
TAOS_DEFINE_ERROR
(
TSDB_CODE_MND_MSG_NOT_PROCESSED
,
"Message not processed"
)
TAOS_DEFINE_ERROR
(
TSDB_CODE_MND_MSG_NOT_PROCESSED
,
"Message not processed"
)
...
...
tests/pytest/query/unionAllTest.py
浏览文件 @
17f953da
...
@@ -103,6 +103,29 @@ class TDTestCase:
...
@@ -103,6 +103,29 @@ class TDTestCase:
select count(*) as count, loc from st where ts between 1600000000000 and 1600000000010 group by loc'''
)
select count(*) as count, loc from st where ts between 1600000000000 and 1600000000010 group by loc'''
)
tdSql
.
checkRows
(
6
)
tdSql
.
checkRows
(
6
)
# https://jira.taosdata.com:18080/browse/TS-715
tdLog
.
info
(
"test case for TS-715"
)
sql
=
""
tdSql
.
execute
(
"create table st2(ts timestamp, c1 int, c2 int, c3 int) tags(loc nchar(20))"
)
for
i
in
range
(
7000
):
if
i
==
0
:
sql
=
"select last(*) from sub0 "
else
:
sql
+=
f
"union all select last(*) from sub
{
i
}
"
tdSql
.
execute
(
"create table sub%d using st2 tags('nchar%d')"
%
(
i
,
i
))
tdSql
.
execute
(
"insert into sub%d values(%d, %d, %d, %d)"
%
(
i
,
self
.
ts
+
i
,
i
,
i
,
i
))
exception
=
"Exception(
\"
ProgrammingError('Result set too large to be output', -2147483097)
\"
)"
try
:
tdSql
.
query
(
sql
)
except
Exception
as
e
:
if
{
exception
}
!=
{
repr
(
e
)}:
tdLog
.
info
(
f
"sql:
{
sql
}
,
{
exception
}
expected, actually raises
{
repr
(
e
)
}
"
)
raise
e
def
stop
(
self
):
def
stop
(
self
):
tdSql
.
close
()
tdSql
.
close
()
tdLog
.
success
(
"%s successfully executed"
%
__file__
)
tdLog
.
success
(
"%s successfully executed"
%
__file__
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录