Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
taosdata
TDengine
提交
1f1d4946
T
TDengine
项目概览
taosdata
/
TDengine
大约 1 年 前同步成功
通知
1184
Star
22015
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看板
体验新版 GitCode,发现更多精彩内容 >>
提交
1f1d4946
编写于
3月 30, 2021
作者:
H
Haojun Liao
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[td-2819] refactor codes.
上级
80c5a16c
变更
3
显示空白变更内容
内联
并排
Showing
3 changed file
with
49 addition
and
47 deletion
+49
-47
src/client/src/tscSubquery.c
src/client/src/tscSubquery.c
+3
-1
src/client/src/tscUtil.c
src/client/src/tscUtil.c
+1
-1
tests/script/general/parser/testSuite.sim
tests/script/general/parser/testSuite.sim
+45
-45
未找到文件。
src/client/src/tscSubquery.c
浏览文件 @
1f1d4946
...
@@ -723,7 +723,9 @@ static void issueTsCompQuery(SSqlObj* pSql, SJoinSupporter* pSupporter, SSqlObj*
...
@@ -723,7 +723,9 @@ static void issueTsCompQuery(SSqlObj* pSql, SJoinSupporter* pSupporter, SSqlObj*
if
(
UTIL_TABLE_IS_SUPER_TABLE
(
pTableMetaInfo
))
{
if
(
UTIL_TABLE_IS_SUPER_TABLE
(
pTableMetaInfo
))
{
SExprInfo
*
pExpr
=
tscSqlExprGet
(
pQueryInfo
,
0
);
SExprInfo
*
pExpr
=
tscSqlExprGet
(
pQueryInfo
,
0
);
int16_t
tagColId
=
tscGetJoinTagColIdByUid
(
&
pSupporter
->
tagCond
,
pTableMetaInfo
->
pTableMeta
->
id
.
uid
);
int16_t
tagColId
=
tscGetJoinTagColIdByUid
(
&
pSupporter
->
tagCond
,
pTableMetaInfo
->
pTableMeta
->
id
.
uid
);
pExpr
->
base
.
param
->
i64
=
tagColId
;
pExpr
->
base
.
param
[
0
].
i64
=
tagColId
;
pExpr
->
base
.
param
[
0
].
nLen
=
sizeof
(
int64_t
);
pExpr
->
base
.
param
[
0
].
nType
=
TSDB_DATA_TYPE_BIGINT
;
pExpr
->
base
.
numOfParams
=
1
;
pExpr
->
base
.
numOfParams
=
1
;
}
}
...
...
src/client/src/tscUtil.c
浏览文件 @
1f1d4946
...
@@ -460,7 +460,7 @@ void tscSetResRawPtr(SSqlRes* pRes, SQueryInfo* pQueryInfo) {
...
@@ -460,7 +460,7 @@ void tscSetResRawPtr(SSqlRes* pRes, SQueryInfo* pQueryInfo) {
int32_t
offset
=
0
;
int32_t
offset
=
0
;
for
(
int32_t
i
=
0
;
i
<
p
Res
->
numOfCols
;
++
i
)
{
for
(
int32_t
i
=
0
;
i
<
p
QueryInfo
->
fieldsInfo
.
numOfOutput
;
++
i
)
{
SInternalField
*
pInfo
=
(
SInternalField
*
)
TARRAY_GET_ELEM
(
pQueryInfo
->
fieldsInfo
.
internalField
,
i
);
SInternalField
*
pInfo
=
(
SInternalField
*
)
TARRAY_GET_ELEM
(
pQueryInfo
->
fieldsInfo
.
internalField
,
i
);
pRes
->
urow
[
i
]
=
pRes
->
data
+
offset
*
pRes
->
numOfRows
;
pRes
->
urow
[
i
]
=
pRes
->
data
+
offset
*
pRes
->
numOfRows
;
...
...
tests/script/general/parser/testSuite.sim
浏览文件 @
1f1d4946
#
run general/parser/alter.sim
run general/parser/alter.sim
#
run general/parser/alter1.sim
run general/parser/alter1.sim
#
run general/parser/alter_stable.sim
run general/parser/alter_stable.sim
#
run general/parser/auto_create_tb.sim
run general/parser/auto_create_tb.sim
#
run general/parser/auto_create_tb_drop_tb.sim
run general/parser/auto_create_tb_drop_tb.sim
#
run general/parser/col_arithmetic_operation.sim
run general/parser/col_arithmetic_operation.sim
#
run general/parser/columnValue.sim
run general/parser/columnValue.sim
#
run general/parser/commit.sim
run general/parser/commit.sim
#
run general/parser/create_db.sim
run general/parser/create_db.sim
#
run general/parser/create_mt.sim
run general/parser/create_mt.sim
#
run general/parser/create_tb.sim
run general/parser/create_tb.sim
#
run general/parser/dbtbnameValidate.sim
run general/parser/dbtbnameValidate.sim
#
run general/parser/fill.sim
run general/parser/fill.sim
#
run general/parser/fill_stb.sim
run general/parser/fill_stb.sim
#
#
run general/parser/fill_us.sim #
#run general/parser/fill_us.sim #
#
run general/parser/first_last.sim
run general/parser/first_last.sim
#
run general/parser/import_commit1.sim
run general/parser/import_commit1.sim
#
run general/parser/import_commit2.sim
run general/parser/import_commit2.sim
#
run general/parser/import_commit3.sim
run general/parser/import_commit3.sim
#
#
run general/parser/import_file.sim
#run general/parser/import_file.sim
#
run general/parser/insert_tb.sim
run general/parser/insert_tb.sim
#
run general/parser/tags_dynamically_specifiy.sim
run general/parser/tags_dynamically_specifiy.sim
#
run general/parser/interp.sim
run general/parser/interp.sim
#
run general/parser/lastrow.sim
run general/parser/lastrow.sim
#
run general/parser/limit.sim
run general/parser/limit.sim
#
run general/parser/limit1.sim
run general/parser/limit1.sim
#
run general/parser/limit1_tblocks100.sim
run general/parser/limit1_tblocks100.sim
#
run general/parser/limit2.sim
run general/parser/limit2.sim
#
run general/parser/mixed_blocks.sim
run general/parser/mixed_blocks.sim
#
run general/parser/nchar.sim
run general/parser/nchar.sim
#
run general/parser/null_char.sim
run general/parser/null_char.sim
#
run general/parser/selectResNum.sim
run general/parser/selectResNum.sim
#
run general/parser/select_across_vnodes.sim
run general/parser/select_across_vnodes.sim
#
run general/parser/select_from_cache_disk.sim
run general/parser/select_from_cache_disk.sim
#
run general/parser/set_tag_vals.sim
run general/parser/set_tag_vals.sim
#
run general/parser/single_row_in_tb.sim
run general/parser/single_row_in_tb.sim
#
run general/parser/slimit.sim
run general/parser/slimit.sim
#
run general/parser/slimit1.sim
run general/parser/slimit1.sim
#
run general/parser/slimit_alter_tags.sim
run general/parser/slimit_alter_tags.sim
#
run general/parser/tbnameIn.sim
run general/parser/tbnameIn.sim
#
run general/parser/slimit_alter_tags.sim # persistent failed
run general/parser/slimit_alter_tags.sim # persistent failed
#
run general/parser/join.sim
run general/parser/join.sim
#
run general/parser/join_multivnode.sim
run general/parser/join_multivnode.sim
#
run general/parser/join_manyblocks.sim
run general/parser/join_manyblocks.sim
run general/parser/projection_limit_offset.sim
run general/parser/projection_limit_offset.sim
run general/parser/select_with_tags.sim
run general/parser/select_with_tags.sim
#
run general/parser/groupby.sim
run general/parser/groupby.sim
run general/parser/tags_filter.sim
run general/parser/tags_filter.sim
run general/parser/topbot.sim
run general/parser/topbot.sim
run general/parser/union.sim
run general/parser/union.sim
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录