Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
taosdata
TDengine
提交
ed3fc6bd
T
TDengine
项目概览
taosdata
/
TDengine
1 年多 前同步成功
通知
1185
Star
22016
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看板
提交
ed3fc6bd
编写于
3月 17, 2023
作者:
K
kailixu
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix: select ins_columns from stb/ctb
上级
a85e30ef
变更
2
显示空白变更内容
内联
并排
Showing
2 changed file
with
7 addition
and
8 deletion
+7
-8
source/libs/executor/src/sysscanoperator.c
source/libs/executor/src/sysscanoperator.c
+6
-6
tests/system-test/0-others/information_schema.py
tests/system-test/0-others/information_schema.py
+1
-2
未找到文件。
source/libs/executor/src/sysscanoperator.c
浏览文件 @
ed3fc6bd
...
@@ -547,21 +547,21 @@ static SSDataBlock* sysTableScanUserCols(SOperatorInfo* pOperator) {
...
@@ -547,21 +547,21 @@ static SSDataBlock* sysTableScanUserCols(SOperatorInfo* pOperator) {
if
(
schema
!=
NULL
)
{
if
(
schema
!=
NULL
)
{
schemaRow
=
*
(
SSchemaWrapper
**
)
schema
;
schemaRow
=
*
(
SSchemaWrapper
**
)
schema
;
}
else
{
}
else
{
SMetaReader
metaReader
=
{
0
};
SMetaReader
smrSuperTable
=
{
0
};
metaReaderInit
(
&
metaReader
,
pInfo
->
readHandle
.
meta
,
0
);
metaReaderInit
(
&
smrSuperTable
,
pInfo
->
readHandle
.
meta
,
0
);
int
code
=
metaGetTableEntryByUid
(
&
metaReader
,
suid
);
int
code
=
metaGetTableEntryByUid
(
&
smrSuperTable
,
suid
);
if
(
code
!=
TSDB_CODE_SUCCESS
)
{
if
(
code
!=
TSDB_CODE_SUCCESS
)
{
// terrno has been set by metaGetTableEntryByName, therefore, return directly
// terrno has been set by metaGetTableEntryByName, therefore, return directly
qError
(
"sysTableScanUserCols get meta by suid:%"
PRId64
" error, code:%d"
,
suid
,
code
);
qError
(
"sysTableScanUserCols get meta by suid:%"
PRId64
" error, code:%d"
,
suid
,
code
);
metaReaderClear
(
&
metaReader
);
metaReaderClear
(
&
smrSuperTable
);
blockDataDestroy
(
dataBlock
);
blockDataDestroy
(
dataBlock
);
pInfo
->
loadInfo
.
totalRows
=
0
;
pInfo
->
loadInfo
.
totalRows
=
0
;
return
NULL
;
return
NULL
;
}
}
SSchemaWrapper
*
schemaWrapper
=
tCloneSSchemaWrapper
(
&
metaReader
.
me
.
stbEntry
.
schemaRow
);
SSchemaWrapper
*
schemaWrapper
=
tCloneSSchemaWrapper
(
&
smrSuperTable
.
me
.
stbEntry
.
schemaRow
);
taosHashPut
(
pInfo
->
pSchema
,
&
suid
,
sizeof
(
int64_t
),
&
schemaWrapper
,
POINTER_BYTES
);
taosHashPut
(
pInfo
->
pSchema
,
&
suid
,
sizeof
(
int64_t
),
&
schemaWrapper
,
POINTER_BYTES
);
schemaRow
=
schemaWrapper
;
schemaRow
=
schemaWrapper
;
metaReaderClear
(
&
metaReader
);
metaReaderClear
(
&
smrSuperTable
);
}
}
}
else
if
(
pInfo
->
pCur
->
mr
.
me
.
type
==
TSDB_NORMAL_TABLE
)
{
}
else
if
(
pInfo
->
pCur
->
mr
.
me
.
type
==
TSDB_NORMAL_TABLE
)
{
qDebug
(
"sysTableScanUserCols cursor get normal table"
);
qDebug
(
"sysTableScanUserCols cursor get normal table"
);
...
...
tests/system-test/0-others/information_schema.py
浏览文件 @
ed3fc6bd
...
@@ -107,7 +107,6 @@ class TDTestCase:
...
@@ -107,7 +107,6 @@ class TDTestCase:
for
i
in
range
(
5
):
for
i
in
range
(
5
):
self
.
stb4096
=
'create table db2.stb%d (ts timestamp'
%
(
i
)
self
.
stb4096
=
'create table db2.stb%d (ts timestamp'
%
(
i
)
for
j
in
range
(
4094
-
i
):
for
j
in
range
(
4094
-
i
):
# for j in range (499):
self
.
stb4096
+=
', c%d int'
%
(
j
)
self
.
stb4096
+=
', c%d int'
%
(
j
)
self
.
stb4096
+=
') tags (t1 int)'
self
.
stb4096
+=
') tags (t1 int)'
tdSql
.
execute
(
self
.
stb4096
)
tdSql
.
execute
(
self
.
stb4096
)
...
@@ -125,7 +124,7 @@ class TDTestCase:
...
@@ -125,7 +124,7 @@ class TDTestCase:
self
.
ntb4096
+=
')'
self
.
ntb4096
+=
')'
tdSql
.
execute
(
self
.
ntb4096
)
tdSql
.
execute
(
self
.
ntb4096
)
tdSql
.
query
(
f
'select * from information_schema.ins_columns where db_name="db2" and table_type=="NORMAL_TABLE"'
)
tdSql
.
query
(
f
'select * from information_schema.ins_columns where db_name="db2" and table_type=="NORMAL_TABLE"'
)
tdSql
.
checkEqual
(
20470
0
,
len
(
tdSql
.
queryResult
))
tdSql
.
checkEqual
(
20470
,
len
(
tdSql
.
queryResult
))
def
run
(
self
):
def
run
(
self
):
self
.
prepare_data
()
self
.
prepare_data
()
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录