Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
王长生-AnH
TDengine
提交
6fabe650
T
TDengine
项目概览
王长生-AnH
/
TDengine
与 Fork 源项目一致
Fork自
taosdata / TDengine
通知
5
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看板
体验新版 GitCode,发现更多精彩内容 >>
提交
6fabe650
编写于
11月 29, 2019
作者:
H
Hongze Cheng
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
change var name
上级
4aa9c7ad
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
22 addition
and
22 deletion
+22
-22
src/system/detail/src/vnodeShell.c
src/system/detail/src/vnodeShell.c
+22
-22
未找到文件。
src/system/detail/src/vnodeShell.c
浏览文件 @
6fabe650
...
...
@@ -52,7 +52,7 @@ typedef struct {
SShellObj
*
pObj
;
int64_t
offset
;
// offset relative the blks
char
blks
[];
}
SBatch
Impor
tInfo
;
}
SBatch
Submi
tInfo
;
void
*
vnodeProcessMsgFromShell
(
char
*
msg
,
void
*
ahandle
,
void
*
thandle
)
{
int
sid
,
vnode
;
...
...
@@ -613,21 +613,21 @@ _submit_over:
if
(
pSubmit
->
import
)
{
// Import case
if
(
code
==
TSDB_CODE_ACTION_IN_PROGRESS
)
{
SBatch
ImportInfo
*
pImpor
tInfo
=
(
SBatch
ImportInfo
*
)
calloc
(
1
,
sizeof
(
SBatchImpor
tInfo
)
+
msgLen
-
sizeof
(
SShellSubmitMsg
));
if
(
p
Impor
tInfo
==
NULL
)
{
SBatch
SubmitInfo
*
pSubmi
tInfo
=
(
SBatch
SubmitInfo
*
)
calloc
(
1
,
sizeof
(
SBatchSubmi
tInfo
)
+
msgLen
-
sizeof
(
SShellSubmitMsg
));
if
(
p
Submi
tInfo
==
NULL
)
{
code
=
TSDB_CODE_SERV_OUT_OF_MEMORY
;
ret
=
vnodeSendShellSubmitRspMsg
(
pObj
,
code
,
pObj
->
numOfTotalPoints
);
}
else
{
// Start a timer to process the next part of request
p
Impor
tInfo
->
import
=
1
;
p
Impor
tInfo
->
vnode
=
pSubmit
->
vnode
;
p
Impor
tInfo
->
numOfSid
=
pSubmit
->
numOfSid
;
p
Impor
tInfo
->
ssid
=
i
;
// start from this position, not the initial position
p
Impor
tInfo
->
pObj
=
pObj
;
p
Impor
tInfo
->
offset
=
((
char
*
)
pBlocks
)
-
(
pMsg
+
sizeof
(
SShellSubmitMsg
));
assert
(
p
Impor
tInfo
->
offset
>=
0
);
memcpy
((
void
*
)(
p
Impor
tInfo
->
blks
),
(
void
*
)(
pMsg
+
sizeof
(
SShellSubmitMsg
)),
msgLen
-
sizeof
(
SShellSubmitMsg
));
taosTmrStart
(
vnodeProcessBatchImportTimer
,
10
,
(
void
*
)
p
Impor
tInfo
,
vnodeTmrCtrl
);
p
Submi
tInfo
->
import
=
1
;
p
Submi
tInfo
->
vnode
=
pSubmit
->
vnode
;
p
Submi
tInfo
->
numOfSid
=
pSubmit
->
numOfSid
;
p
Submi
tInfo
->
ssid
=
i
;
// start from this position, not the initial position
p
Submi
tInfo
->
pObj
=
pObj
;
p
Submi
tInfo
->
offset
=
((
char
*
)
pBlocks
)
-
(
pMsg
+
sizeof
(
SShellSubmitMsg
));
assert
(
p
Submi
tInfo
->
offset
>=
0
);
memcpy
((
void
*
)(
p
Submi
tInfo
->
blks
),
(
void
*
)(
pMsg
+
sizeof
(
SShellSubmitMsg
)),
msgLen
-
sizeof
(
SShellSubmitMsg
));
taosTmrStart
(
vnodeProcessBatchImportTimer
,
10
,
(
void
*
)
p
Submi
tInfo
,
vnodeTmrCtrl
);
}
}
else
{
if
(
code
==
TSDB_CODE_SUCCESS
)
assert
(
pObj
->
count
==
0
);
...
...
@@ -642,18 +642,18 @@ _submit_over:
}
static
void
vnodeProcessBatchImportTimer
(
void
*
param
,
void
*
tmrId
)
{
SBatch
ImportInfo
*
pImportInfo
=
(
SBatchImpor
tInfo
*
)
param
;
assert
(
p
ImportInfo
!=
NULL
&&
pImpor
tInfo
->
import
);
SBatch
SubmitInfo
*
pSubmitInfo
=
(
SBatchSubmi
tInfo
*
)
param
;
assert
(
p
SubmitInfo
!=
NULL
&&
pSubmi
tInfo
->
import
);
int32_t
i
=
0
,
numOfPoints
=
0
;
int32_t
code
=
TSDB_CODE_SUCCESS
;
SShellObj
*
pShell
=
p
Impor
tInfo
->
pObj
;
SVnodeObj
*
pVnode
=
&
vnodeList
[
p
Impor
tInfo
->
vnode
];
SShellSubmitBlock
*
pBlocks
=
(
SShellSubmitBlock
*
)(
p
ImportInfo
->
blks
+
pImpor
tInfo
->
offset
);
SShellObj
*
pShell
=
p
Submi
tInfo
->
pObj
;
SVnodeObj
*
pVnode
=
&
vnodeList
[
p
Submi
tInfo
->
vnode
];
SShellSubmitBlock
*
pBlocks
=
(
SShellSubmitBlock
*
)(
p
SubmitInfo
->
blks
+
pSubmi
tInfo
->
offset
);
TSKEY
now
=
taosGetTimestamp
(
pVnode
->
cfg
.
precision
);
for
(
i
=
p
ImportInfo
->
ssid
;
i
<
pImpor
tInfo
->
numOfSid
;
i
++
)
{
for
(
i
=
p
SubmitInfo
->
ssid
;
i
<
pSubmi
tInfo
->
numOfSid
;
i
++
)
{
numOfPoints
=
0
;
code
=
vnodeCheckSubmitBlockContext
(
pBlocks
,
pVnode
);
...
...
@@ -676,9 +676,9 @@ static void vnodeProcessBatchImportTimer(void *param, void *tmrId) {
int
ret
=
0
;
if
(
code
==
TSDB_CODE_ACTION_IN_PROGRESS
)
{
p
Impor
tInfo
->
ssid
=
i
;
p
ImportInfo
->
offset
=
((
char
*
)
pBlocks
)
-
pImpor
tInfo
->
blks
;
taosTmrStart
(
vnodeProcessBatchImportTimer
,
10
,
(
void
*
)
p
Impor
tInfo
,
vnodeTmrCtrl
);
p
Submi
tInfo
->
ssid
=
i
;
p
SubmitInfo
->
offset
=
((
char
*
)
pBlocks
)
-
pSubmi
tInfo
->
blks
;
taosTmrStart
(
vnodeProcessBatchImportTimer
,
10
,
(
void
*
)
p
Submi
tInfo
,
vnodeTmrCtrl
);
}
else
{
if
(
code
==
TSDB_CODE_SUCCESS
)
assert
(
pShell
->
count
==
0
);
tfree
(
param
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录