Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
taosdata
TDengine
提交
9144daed
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,发现更多精彩内容 >>
提交
9144daed
编写于
1月 12, 2021
作者:
S
Shengliang Guan
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
compile error in some env such as windows
上级
7465d0c7
变更
3
显示空白变更内容
内联
并排
Showing
3 changed file
with
10 addition
and
10 deletion
+10
-10
src/mnode/inc/mnodeDef.h
src/mnode/inc/mnodeDef.h
+1
-1
src/mnode/inc/mnodeSdb.h
src/mnode/inc/mnodeSdb.h
+1
-1
src/mnode/src/mnodeSdb.c
src/mnode/src/mnodeSdb.c
+8
-8
未找到文件。
src/mnode/inc/mnodeDef.h
浏览文件 @
9144daed
...
@@ -259,7 +259,7 @@ typedef struct {
...
@@ -259,7 +259,7 @@ typedef struct {
int16_t
bytes
[
TSDB_MAX_COLUMNS
];
int16_t
bytes
[
TSDB_MAX_COLUMNS
];
int32_t
numOfReads
;
int32_t
numOfReads
;
int8_t
maxReplica
;
int8_t
maxReplica
;
int8_t
reserved0
[
0
];
int8_t
reserved0
[
1
];
uint16_t
payloadLen
;
uint16_t
payloadLen
;
char
payload
[];
char
payload
[];
}
SShowObj
;
}
SShowObj
;
...
...
src/mnode/inc/mnodeSdb.h
浏览文件 @
9144daed
...
@@ -60,7 +60,7 @@ typedef struct SSdbRow {
...
@@ -60,7 +60,7 @@ typedef struct SSdbRow {
int32_t
(
*
fpReq
)(
SMnodeMsg
*
pMsg
);
int32_t
(
*
fpReq
)(
SMnodeMsg
*
pMsg
);
int32_t
(
*
fpRsp
)(
SMnodeMsg
*
pMsg
,
int32_t
code
);
int32_t
(
*
fpRsp
)(
SMnodeMsg
*
pMsg
,
int32_t
code
);
char
reserveForSync
[
24
];
char
reserveForSync
[
24
];
SWalHead
pHead
[]
;
SWalHead
pHead
;
}
SSdbRow
;
}
SSdbRow
;
typedef
struct
{
typedef
struct
{
...
...
src/mnode/src/mnodeSdb.c
浏览文件 @
9144daed
...
@@ -274,7 +274,7 @@ static int32_t sdbGetSyncVersion(int32_t vgId, uint64_t *fver, uint64_t *vver) {
...
@@ -274,7 +274,7 @@ static int32_t sdbGetSyncVersion(int32_t vgId, uint64_t *fver, uint64_t *vver) {
// failed to forward, need revert insert
// failed to forward, need revert insert
static
void
sdbHandleFailedConfirm
(
SSdbRow
*
pRow
)
{
static
void
sdbHandleFailedConfirm
(
SSdbRow
*
pRow
)
{
SWalHead
*
pHead
=
pRow
->
pHead
;
SWalHead
*
pHead
=
&
pRow
->
pHead
;
int32_t
action
=
pHead
->
msgType
%
10
;
int32_t
action
=
pHead
->
msgType
%
10
;
sdbError
(
"vgId:1, row:%p:%s hver:%"
PRIu64
" action:%s, failed to foward since %s"
,
pRow
->
pObj
,
sdbError
(
"vgId:1, row:%p:%s hver:%"
PRIu64
" action:%s, failed to foward since %s"
,
pRow
->
pObj
,
...
@@ -1012,7 +1012,7 @@ static void sdbFreeQueue() {
...
@@ -1012,7 +1012,7 @@ static void sdbFreeQueue() {
}
}
static
int32_t
sdbWriteToQueue
(
SSdbRow
*
pRow
,
int32_t
qtype
)
{
static
int32_t
sdbWriteToQueue
(
SSdbRow
*
pRow
,
int32_t
qtype
)
{
SWalHead
*
pHead
=
pRow
->
pHead
;
SWalHead
*
pHead
=
&
pRow
->
pHead
;
if
(
pHead
->
len
>
TSDB_MAX_WAL_SIZE
)
{
if
(
pHead
->
len
>
TSDB_MAX_WAL_SIZE
)
{
sdbError
(
"vgId:1, wal len:%d exceeds limit, hver:%"
PRIu64
,
pHead
->
len
,
pHead
->
version
);
sdbError
(
"vgId:1, wal len:%d exceeds limit, hver:%"
PRIu64
,
pHead
->
len
,
pHead
->
version
);
...
@@ -1051,8 +1051,8 @@ static int32_t sdbWriteFwdToQueue(int32_t vgId, void *wparam, int32_t qtype, voi
...
@@ -1051,8 +1051,8 @@ static int32_t sdbWriteFwdToQueue(int32_t vgId, void *wparam, int32_t qtype, voi
return
TSDB_CODE_VND_OUT_OF_MEMORY
;
return
TSDB_CODE_VND_OUT_OF_MEMORY
;
}
}
memcpy
(
pRow
->
pHead
,
pHead
,
sizeof
(
SWalHead
)
+
pHead
->
len
);
memcpy
(
&
pRow
->
pHead
,
pHead
,
sizeof
(
SWalHead
)
+
pHead
->
len
);
pRow
->
rowData
=
pRow
->
pHead
->
cont
;
pRow
->
rowData
=
pRow
->
pHead
.
cont
;
int32_t
code
=
sdbWriteToQueue
(
pRow
,
qtype
);
int32_t
code
=
sdbWriteToQueue
(
pRow
,
qtype
);
if
(
code
==
TSDB_CODE_MND_ACTION_IN_PROGRESS
)
code
=
0
;
if
(
code
==
TSDB_CODE_MND_ACTION_IN_PROGRESS
)
code
=
0
;
...
@@ -1073,7 +1073,7 @@ static int32_t sdbWriteRowToQueue(SSdbRow *pInputRow, int32_t action) {
...
@@ -1073,7 +1073,7 @@ static int32_t sdbWriteRowToQueue(SSdbRow *pInputRow, int32_t action) {
memcpy
(
pRow
,
pInputRow
,
sizeof
(
SSdbRow
));
memcpy
(
pRow
,
pInputRow
,
sizeof
(
SSdbRow
));
pRow
->
processedCount
=
1
;
pRow
->
processedCount
=
1
;
SWalHead
*
pHead
=
pRow
->
pHead
;
SWalHead
*
pHead
=
&
pRow
->
pHead
;
pRow
->
rowData
=
pHead
->
cont
;
pRow
->
rowData
=
pHead
->
cont
;
(
*
pTable
->
fpEncode
)(
pRow
);
(
*
pTable
->
fpEncode
)(
pRow
);
...
@@ -1103,9 +1103,9 @@ static void *sdbWorkerFp(void *pWorker) {
...
@@ -1103,9 +1103,9 @@ static void *sdbWorkerFp(void *pWorker) {
for
(
int32_t
i
=
0
;
i
<
numOfMsgs
;
++
i
)
{
for
(
int32_t
i
=
0
;
i
<
numOfMsgs
;
++
i
)
{
taosGetQitem
(
tsSdbWQall
,
&
qtype
,
(
void
**
)
&
pRow
);
taosGetQitem
(
tsSdbWQall
,
&
qtype
,
(
void
**
)
&
pRow
);
sdbTrace
(
"vgId:1, msg:%p, row:%p hver:%"
PRIu64
", will be processed in sdb queue"
,
pRow
->
pMsg
,
pRow
->
pObj
,
sdbTrace
(
"vgId:1, msg:%p, row:%p hver:%"
PRIu64
", will be processed in sdb queue"
,
pRow
->
pMsg
,
pRow
->
pObj
,
pRow
->
pHead
->
version
);
pRow
->
pHead
.
version
);
pRow
->
code
=
sdbProcessWrite
((
qtype
==
TAOS_QTYPE_RPC
)
?
pRow
:
NULL
,
pRow
->
pHead
,
qtype
,
NULL
);
pRow
->
code
=
sdbProcessWrite
((
qtype
==
TAOS_QTYPE_RPC
)
?
pRow
:
NULL
,
&
pRow
->
pHead
,
qtype
,
NULL
);
if
(
pRow
->
code
>
0
)
pRow
->
code
=
0
;
if
(
pRow
->
code
>
0
)
pRow
->
code
=
0
;
sdbTrace
(
"vgId:1, msg:%p is processed in sdb queue, code:%x"
,
pRow
->
pMsg
,
pRow
->
code
);
sdbTrace
(
"vgId:1, msg:%p is processed in sdb queue, code:%x"
,
pRow
->
pMsg
,
pRow
->
code
);
...
@@ -1122,7 +1122,7 @@ static void *sdbWorkerFp(void *pWorker) {
...
@@ -1122,7 +1122,7 @@ static void *sdbWorkerFp(void *pWorker) {
sdbConfirmForward
(
1
,
pRow
,
pRow
->
code
);
sdbConfirmForward
(
1
,
pRow
,
pRow
->
code
);
}
else
{
}
else
{
if
(
qtype
==
TAOS_QTYPE_FWD
)
{
if
(
qtype
==
TAOS_QTYPE_FWD
)
{
syncConfirmForward
(
tsSdbMgmt
.
sync
,
pRow
->
pHead
->
version
,
pRow
->
code
);
syncConfirmForward
(
tsSdbMgmt
.
sync
,
pRow
->
pHead
.
version
,
pRow
->
code
);
}
}
sdbFreeFromQueue
(
pRow
);
sdbFreeFromQueue
(
pRow
);
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录