Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
慢慢CG
TDengine
提交
524245bb
T
TDengine
项目概览
慢慢CG
/
TDengine
与 Fork 源项目一致
Fork自
taosdata / TDengine
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
T
TDengine
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
提交
524245bb
编写于
10月 08, 2021
作者:
sangshuduo
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[TD-10530]<fix>: taosdump infinite loop
query table des fail on normal table. and value is NULL.
上级
1006aeea
变更
1
显示空白变更内容
内联
并排
Showing
1 changed file
with
22 addition
and
4 deletion
+22
-4
src/kit/taosdump/taosdump.c
src/kit/taosdump/taosdump.c
+22
-4
未找到文件。
src/kit/taosdump/taosdump.c
浏览文件 @
524245bb
...
@@ -1149,6 +1149,10 @@ static int64_t dumpNormalTable(
...
@@ -1149,6 +1149,10 @@ static int64_t dumpNormalTable(
colCount
=
getTableDes
(
dbName
,
tbName
,
tableDes
,
false
);
colCount
=
getTableDes
(
dbName
,
tbName
,
tableDes
,
false
);
if
(
colCount
<
0
)
{
if
(
colCount
<
0
)
{
errorPrint
(
"%s() LN%d, failed to get table[%s] schema
\n
"
,
__func__
,
__LINE__
,
tbName
);
free
(
tableDes
);
free
(
tableDes
);
return
-
1
;
return
-
1
;
}
}
...
@@ -1160,6 +1164,10 @@ static int64_t dumpNormalTable(
...
@@ -1160,6 +1164,10 @@ static int64_t dumpNormalTable(
colCount
=
getTableDes
(
dbName
,
tbName
,
tableDes
,
false
);
colCount
=
getTableDes
(
dbName
,
tbName
,
tableDes
,
false
);
if
(
colCount
<
0
)
{
if
(
colCount
<
0
)
{
errorPrint
(
"%s() LN%d, failed to get table[%s] schema
\n
"
,
__func__
,
__LINE__
,
tbName
);
free
(
tableDes
);
free
(
tableDes
);
return
-
1
;
return
-
1
;
}
}
...
@@ -1172,6 +1180,9 @@ static int64_t dumpNormalTable(
...
@@ -1172,6 +1180,9 @@ static int64_t dumpNormalTable(
if
(
g_args
.
avro
)
{
if
(
g_args
.
avro
)
{
if
(
0
!=
convertTbDesToAvroSchema
(
if
(
0
!=
convertTbDesToAvroSchema
(
dbName
,
tbName
,
tableDes
,
colCount
,
&
jsonAvroSchema
))
{
dbName
,
tbName
,
tableDes
,
colCount
,
&
jsonAvroSchema
))
{
errorPrint
(
"%s() LN%d, convertTbDesToAvroSchema failed
\n
"
,
__func__
,
__LINE__
);
freeTbDes
(
tableDes
);
freeTbDes
(
tableDes
);
return
-
1
;
return
-
1
;
}
}
...
@@ -1281,20 +1292,23 @@ static void *dumpNtbOfDb(void *arg) {
...
@@ -1281,20 +1292,23 @@ static void *dumpNtbOfDb(void *arg) {
return
NULL
;
return
NULL
;
}
}
int64_t
count
;
for
(
int64_t
i
=
0
;
i
<
pThreadInfo
->
tablesOfDumpOut
;
i
++
)
{
for
(
int64_t
i
=
0
;
i
<
pThreadInfo
->
tablesOfDumpOut
;
i
++
)
{
debugPrint
(
"[%d] No.
\t
%"
PRId64
" table name: %s
\n
"
,
debugPrint
(
"[%d] No.
\t
%"
PRId64
" table name: %s
\n
"
,
pThreadInfo
->
threadIndex
,
i
,
pThreadInfo
->
threadIndex
,
i
,
((
TableInfo
*
)(
g_tablesList
+
pThreadInfo
->
tableFrom
+
i
))
->
name
);
((
TableInfo
*
)(
g_tablesList
+
pThreadInfo
->
tableFrom
+
i
))
->
name
);
dumpNormalTable
(
count
=
dumpNormalTable
(
pThreadInfo
->
dbName
,
pThreadInfo
->
dbName
,
((
TableInfo
*
)(
g_tablesList
+
pThreadInfo
->
tableFrom
+
i
))
->
stable
,
((
TableInfo
*
)(
g_tablesList
+
pThreadInfo
->
tableFrom
+
i
))
->
stable
,
((
TableInfo
*
)(
g_tablesList
+
pThreadInfo
->
tableFrom
+
i
))
->
name
,
((
TableInfo
*
)(
g_tablesList
+
pThreadInfo
->
tableFrom
+
i
))
->
name
,
pThreadInfo
->
precision
,
pThreadInfo
->
precision
,
fp
);
fp
);
if
(
count
<
0
)
{
break
;
}
}
}
fclose
(
fp
);
fclose
(
fp
);
return
NULL
;
return
NULL
;
}
}
...
@@ -1340,16 +1354,20 @@ static void *dumpNormalTablesOfStb(void *arg) {
...
@@ -1340,16 +1354,20 @@ static void *dumpNormalTablesOfStb(void *arg) {
TAOS_ROW
row
=
NULL
;
TAOS_ROW
row
=
NULL
;
int64_t
i
=
0
;
int64_t
i
=
0
;
int64_t
count
;
while
((
row
=
taos_fetch_row
(
res
))
!=
NULL
)
{
while
((
row
=
taos_fetch_row
(
res
))
!=
NULL
)
{
debugPrint
(
"[%d] sub table %"
PRId64
": name: %s
\n
"
,
debugPrint
(
"[%d] sub table %"
PRId64
": name: %s
\n
"
,
pThreadInfo
->
threadIndex
,
i
++
,
(
char
*
)
row
[
TSDB_SHOW_TABLES_NAME_INDEX
]);
pThreadInfo
->
threadIndex
,
i
++
,
(
char
*
)
row
[
TSDB_SHOW_TABLES_NAME_INDEX
]);
dumpNormalTable
(
count
=
dumpNormalTable
(
pThreadInfo
->
dbName
,
pThreadInfo
->
dbName
,
pThreadInfo
->
stbName
,
pThreadInfo
->
stbName
,
(
char
*
)
row
[
TSDB_SHOW_TABLES_NAME_INDEX
],
(
char
*
)
row
[
TSDB_SHOW_TABLES_NAME_INDEX
],
pThreadInfo
->
precision
,
pThreadInfo
->
precision
,
fp
);
fp
);
if
(
count
<
0
)
{
break
;
}
}
}
fclose
(
fp
);
fclose
(
fp
);
...
@@ -2006,9 +2024,9 @@ static int getTableDes(
...
@@ -2006,9 +2024,9 @@ static int getTableDes(
if
(
row
[
TSDB_SHOW_TABLES_NAME_INDEX
]
==
NULL
)
{
if
(
row
[
TSDB_SHOW_TABLES_NAME_INDEX
]
==
NULL
)
{
sprintf
(
tableDes
->
cols
[
i
].
note
,
"%s"
,
"NUL"
);
sprintf
(
tableDes
->
cols
[
i
].
note
,
"%s"
,
"NUL"
);
sprintf
(
tableDes
->
cols
[
i
].
value
,
"%s"
,
"NULL"
);
taos_free_result
(
res
);
taos_free_result
(
res
);
res
=
NULL
;
res
=
NULL
;
taos_close
(
taos
);
continue
;
continue
;
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录