Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
taosdata
TDengine
提交
30b60002
TDengine
项目概览
taosdata
/
TDengine
接近 2 年 前同步成功
通知
1192
Star
22018
Fork
4786
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
1
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
TDengine
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
1
Issue
1
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
未验证
提交
30b60002
编写于
10月 19, 2022
作者:
S
Shengliang Guan
提交者:
GitHub
10月 19, 2022
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #17459 from taosdata/FIX/TD-19593-3.0
enh: enable the -Wformat=2 compiler option
上级
7db984bd
228640af
变更
51
展开全部
隐藏空白更改
内联
并排
Showing
51 changed file
with
262 addition
and
254 deletion
+262
-254
cmake/cmake.define
cmake/cmake.define
+2
-2
source/client/src/clientImpl.c
source/client/src/clientImpl.c
+3
-3
source/client/src/clientRawBlockWrite.c
source/client/src/clientRawBlockWrite.c
+2
-2
source/client/src/clientTmq.c
source/client/src/clientTmq.c
+5
-3
source/common/src/tdatablock.c
source/common/src/tdatablock.c
+4
-4
source/dnode/mnode/impl/src/mndConsumer.c
source/dnode/mnode/impl/src/mndConsumer.c
+4
-4
source/dnode/mnode/impl/src/mndSubscribe.c
source/dnode/mnode/impl/src/mndSubscribe.c
+2
-2
source/dnode/vnode/src/sma/smaEnv.c
source/dnode/vnode/src/sma/smaEnv.c
+2
-2
source/dnode/vnode/src/sma/smaOpen.c
source/dnode/vnode/src/sma/smaOpen.c
+2
-3
source/dnode/vnode/src/sma/smaRollup.c
source/dnode/vnode/src/sma/smaRollup.c
+5
-5
source/dnode/vnode/src/tq/tq.c
source/dnode/vnode/src/tq/tq.c
+11
-8
source/dnode/vnode/src/tq/tqMeta.c
source/dnode/vnode/src/tq/tqMeta.c
+2
-2
source/dnode/vnode/src/tq/tqPush.c
source/dnode/vnode/src/tq/tqPush.c
+3
-3
source/dnode/vnode/src/tq/tqSink.c
source/dnode/vnode/src/tq/tqSink.c
+5
-3
source/dnode/vnode/src/tsdb/tsdbRead.c
source/dnode/vnode/src/tsdb/tsdbRead.c
+7
-7
source/dnode/vnode/src/vnd/vnodeSvr.c
source/dnode/vnode/src/vnd/vnodeSvr.c
+1
-1
source/dnode/vnode/src/vnd/vnodeSync.c
source/dnode/vnode/src/vnd/vnodeSync.c
+3
-3
source/libs/catalog/src/ctgAsync.c
source/libs/catalog/src/ctgAsync.c
+5
-5
source/libs/executor/src/dataDeleter.c
source/libs/executor/src/dataDeleter.c
+1
-1
source/libs/executor/src/executil.c
source/libs/executor/src/executil.c
+2
-2
source/libs/executor/src/executor.c
source/libs/executor/src/executor.c
+2
-2
source/libs/executor/src/executorimpl.c
source/libs/executor/src/executorimpl.c
+1
-1
source/libs/executor/src/scanoperator.c
source/libs/executor/src/scanoperator.c
+3
-3
source/libs/executor/src/tsimplehash.c
source/libs/executor/src/tsimplehash.c
+3
-3
source/libs/function/src/builtinsimpl.c
source/libs/function/src/builtinsimpl.c
+5
-4
source/libs/function/src/tudf.c
source/libs/function/src/tudf.c
+1
-1
source/libs/qworker/src/qworker.c
source/libs/qworker/src/qworker.c
+2
-2
source/libs/sync/src/syncAppendEntries.c
source/libs/sync/src/syncAppendEntries.c
+3
-2
source/libs/sync/src/syncCommit.c
source/libs/sync/src/syncCommit.c
+2
-2
source/libs/sync/src/syncIndexMgr.c
source/libs/sync/src/syncIndexMgr.c
+4
-4
source/libs/sync/src/syncMain.c
source/libs/sync/src/syncMain.c
+20
-20
source/libs/sync/src/syncMessage.c
source/libs/sync/src/syncMessage.c
+68
-68
source/libs/sync/src/syncRaftCfg.c
source/libs/sync/src/syncRaftCfg.c
+13
-13
source/libs/sync/src/syncRaftEntry.c
source/libs/sync/src/syncRaftEntry.c
+9
-9
source/libs/sync/src/syncRaftLog.c
source/libs/sync/src/syncRaftLog.c
+9
-9
source/libs/sync/src/syncRaftStore.c
source/libs/sync/src/syncRaftStore.c
+4
-4
source/libs/sync/src/syncRequestVoteReply.c
source/libs/sync/src/syncRequestVoteReply.c
+2
-2
source/libs/sync/src/syncRespMgr.c
source/libs/sync/src/syncRespMgr.c
+1
-1
source/libs/sync/src/syncTimeout.c
source/libs/sync/src/syncTimeout.c
+4
-4
source/libs/sync/src/syncVoteMgr.c
source/libs/sync/src/syncVoteMgr.c
+8
-8
source/libs/tdb/src/db/tdbDb.c
source/libs/tdb/src/db/tdbDb.c
+1
-1
source/libs/tdb/src/db/tdbPCache.c
source/libs/tdb/src/db/tdbPCache.c
+2
-2
source/libs/tdb/src/db/tdbPager.c
source/libs/tdb/src/db/tdbPager.c
+2
-2
source/libs/transport/src/trans.c
source/libs/transport/src/trans.c
+2
-2
source/libs/transport/test/svrBench.c
source/libs/transport/test/svrBench.c
+1
-1
source/libs/wal/src/walMeta.c
source/libs/wal/src/walMeta.c
+7
-7
source/libs/wal/src/walRead.c
source/libs/wal/src/walRead.c
+2
-2
source/libs/wal/src/walWrite.c
source/libs/wal/src/walWrite.c
+6
-6
source/util/src/tcache.c
source/util/src/tcache.c
+1
-1
utils/test/c/tmqSim.c
utils/test/c/tmqSim.c
+1
-1
utils/tsim/src/simExe.c
utils/tsim/src/simExe.c
+2
-2
未找到文件。
cmake/cmake.define
浏览文件 @
30b60002
...
...
@@ -117,8 +117,8 @@ ELSE ()
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror -Wno-literal-suffix -Werror=return-type -fPIC -gdwarf-2 -fsanitize=address -fsanitize=undefined -fsanitize-recover=all -fsanitize=float-divide-by-zero -fsanitize=float-cast-overflow -fno-sanitize=shift-base -fno-sanitize=alignment -g3 -Wformat=0")
MESSAGE(STATUS "Will compile with Address Sanitizer!")
ELSE ()
SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror -Werror=return-type -fPIC -gdwarf-2 -g3 -Wformat=
0
")
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror -Wno-literal-suffix -Werror=return-type -fPIC -gdwarf-2 -g3 -Wformat=
0
")
SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror -Werror=return-type -fPIC -gdwarf-2 -g3 -Wformat=
2 -Wno-format-nonliteral -Wno-format-truncation -Wno-format-y2k
")
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror -Wno-literal-suffix -Werror=return-type -fPIC -gdwarf-2 -g3 -Wformat=
2 -Wno-format-nonliteral -Wno-format-truncation -Wno-format-y2k
")
ENDIF ()
MESSAGE("System processor ID: ${CMAKE_SYSTEM_PROCESSOR}")
...
...
source/client/src/clientImpl.c
浏览文件 @
30b60002
...
...
@@ -186,7 +186,7 @@ int32_t buildRequest(uint64_t connId, const char* sql, int sqlLen, void* param,
STscObj
*
pTscObj
=
(
*
pRequest
)
->
pTscObj
;
if
(
taosHashPut
(
pTscObj
->
pRequests
,
&
(
*
pRequest
)
->
self
,
sizeof
((
*
pRequest
)
->
self
),
&
(
*
pRequest
)
->
self
,
sizeof
((
*
pRequest
)
->
self
)))
{
tscError
(
"%"
PRI
x64
" failed to add to request container, reqId:0x%"
PRIu64
", conn:%"
PRIx
64
", %s"
,
tscError
(
"%"
PRI
d64
" failed to add to request container, reqId:0x%"
PRIx64
", conn:%"
PRId
64
", %s"
,
(
*
pRequest
)
->
self
,
(
*
pRequest
)
->
requestId
,
pTscObj
->
id
,
sql
);
taosMemoryFree
(
param
);
...
...
@@ -369,8 +369,8 @@ int32_t updateQnodeList(SAppInstInfo* pInfo, SArray* pNodeList) {
if
(
pNodeList
)
{
pInfo
->
pQnodeList
=
taosArrayDup
(
pNodeList
);
taosArraySort
(
pInfo
->
pQnodeList
,
compareQueryNodeLoad
);
tscDebug
(
"QnodeList updated in cluster 0x%"
PRIx64
", num:%d"
,
pInfo
->
clusterId
,
(
int
)
taosArrayGetSize
(
pInfo
->
pQnodeList
));
tscDebug
(
"QnodeList updated in cluster 0x%"
PRIx64
", num:%
l
d"
,
pInfo
->
clusterId
,
taosArrayGetSize
(
pInfo
->
pQnodeList
));
}
taosThreadMutexUnlock
(
&
pInfo
->
qnodeMutex
);
...
...
source/client/src/clientRawBlockWrite.c
浏览文件 @
30b60002
...
...
@@ -1071,8 +1071,8 @@ static int32_t taosDeleteData(TAOS* taos, void* meta, int32_t metaLen) {
// getTbName(req.tableFName);
char
sql
[
256
]
=
{
0
};
s
printf
(
sql
,
"delete from `%s` where `%s` >= %"
PRId64
" and `%s` <= %"
PRId64
,
req
.
tableFName
,
req
.
tsCol
Name
,
req
.
skey
,
req
.
tsColName
,
req
.
ekey
);
s
nprintf
(
sql
,
sizeof
(
sql
),
"delete from `%s` where `%s` >= %"
PRId64
" and `%s` <= %"
PRId64
,
req
.
tableF
Name
,
req
.
tsColName
,
req
.
skey
,
req
.
tsColName
,
req
.
ekey
);
printf
(
"delete sql:%s
\n
"
,
sql
);
TAOS_RES
*
res
=
taos_query
(
taos
,
sql
);
...
...
source/client/src/clientTmq.c
浏览文件 @
30b60002
...
...
@@ -638,7 +638,7 @@ static int32_t tmqCommitConsumerImpl(tmq_t* tmq, int8_t automatic, int8_t async,
pVg
->
vgId
);
if
(
pVg
->
currentOffset
.
type
>
0
&&
!
tOffsetEqual
(
&
pVg
->
currentOffset
,
&
pVg
->
committedOffset
))
{
tscDebug
(
"consumer: %
ld, vg:%d, current %ld, committed %ld
"
,
tmq
->
consumerId
,
pVg
->
vgId
,
tscDebug
(
"consumer: %
"
PRId64
", vg:%d, current %"
PRId64
", committed %"
PRId64
"
"
,
tmq
->
consumerId
,
pVg
->
vgId
,
pVg
->
currentOffset
.
version
,
pVg
->
committedOffset
.
version
);
if
(
tmqSendCommitReq
(
tmq
,
pVg
,
pTopic
,
pParamSet
)
<
0
)
{
continue
;
...
...
@@ -982,7 +982,7 @@ int32_t tmq_subscribe(tmq_t* tmq, const tmq_list_t* topic_list) {
SCMSubscribeReq
req
=
{
0
};
int32_t
code
=
-
1
;
tscDebug
(
"call tmq subscribe, consumer: %
ld
, topic num %d"
,
tmq
->
consumerId
,
sz
);
tscDebug
(
"call tmq subscribe, consumer: %
"
PRId64
"
, topic num %d"
,
tmq
->
consumerId
,
sz
);
req
.
consumerId
=
tmq
->
consumerId
;
tstrncpy
(
req
.
clientId
,
tmq
->
clientId
,
256
);
...
...
@@ -990,6 +990,8 @@ int32_t tmq_subscribe(tmq_t* tmq, const tmq_list_t* topic_list) {
req
.
topicNames
=
taosArrayInit
(
sz
,
sizeof
(
void
*
));
if
(
req
.
topicNames
==
NULL
)
goto
FAIL
;
tscDebug
(
"call tmq subscribe, consumer: %"
PRId64
", topic num %d"
,
tmq
->
consumerId
,
sz
);
for
(
int32_t
i
=
0
;
i
<
sz
;
i
++
)
{
char
*
topic
=
taosArrayGetP
(
container
,
i
);
...
...
@@ -1620,7 +1622,7 @@ void* tmqHandleAllRsp(tmq_t* tmq, int64_t timeout, bool pollIfReset) {
return
NULL
;
}
else
if
(
rspWrapper
->
tmqRspType
==
TMQ_MSG_TYPE__POLL_RSP
)
{
SMqPollRspWrapper
*
pollRspWrapper
=
(
SMqPollRspWrapper
*
)
rspWrapper
;
tscDebug
(
"consumer %
ld
actual process poll rsp"
,
tmq
->
consumerId
);
tscDebug
(
"consumer %
"
PRId64
"
actual process poll rsp"
,
tmq
->
consumerId
);
/*atomic_sub_fetch_32(&tmq->readyRequest, 1);*/
int32_t
consumerEpoch
=
atomic_load_32
(
&
tmq
->
epoch
);
if
(
pollRspWrapper
->
dataRsp
.
head
.
epoch
==
consumerEpoch
)
{
...
...
source/common/src/tdatablock.c
浏览文件 @
30b60002
...
...
@@ -1836,10 +1836,10 @@ void blockDebugShowDataBlocks(const SArray* dataBlocks, const char* flag) {
printf
(
" %15u |"
,
*
(
uint32_t
*
)
var
);
break
;
case
TSDB_DATA_TYPE_BIGINT
:
printf
(
" %15
ld
|"
,
*
(
int64_t
*
)
var
);
printf
(
" %15
"
PRId64
"
|"
,
*
(
int64_t
*
)
var
);
break
;
case
TSDB_DATA_TYPE_UBIGINT
:
printf
(
" %15
lu
|"
,
*
(
uint64_t
*
)
var
);
printf
(
" %15
"
PRIu64
"
|"
,
*
(
uint64_t
*
)
var
);
break
;
case
TSDB_DATA_TYPE_FLOAT
:
printf
(
" %15f |"
,
*
(
float
*
)
var
);
...
...
@@ -1915,11 +1915,11 @@ char* dumpBlockData(SSDataBlock* pDataBlock, const char* flag, char** pDataBuf)
if
(
len
>=
size
-
1
)
return
dumpBuf
;
break
;
case
TSDB_DATA_TYPE_BIGINT
:
len
+=
snprintf
(
dumpBuf
+
len
,
size
-
len
,
" %15
ld
|"
,
*
(
int64_t
*
)
var
);
len
+=
snprintf
(
dumpBuf
+
len
,
size
-
len
,
" %15
"
PRId64
"
|"
,
*
(
int64_t
*
)
var
);
if
(
len
>=
size
-
1
)
return
dumpBuf
;
break
;
case
TSDB_DATA_TYPE_UBIGINT
:
len
+=
snprintf
(
dumpBuf
+
len
,
size
-
len
,
" %15
lu
|"
,
*
(
uint64_t
*
)
var
);
len
+=
snprintf
(
dumpBuf
+
len
,
size
-
len
,
" %15
"
PRIu64
"
|"
,
*
(
uint64_t
*
)
var
);
if
(
len
>=
size
-
1
)
return
dumpBuf
;
break
;
case
TSDB_DATA_TYPE_FLOAT
:
...
...
source/dnode/mnode/impl/src/mndConsumer.c
浏览文件 @
30b60002
...
...
@@ -278,7 +278,7 @@ static int32_t mndProcessMqHbReq(SRpcMsg *pMsg) {
SMqConsumerObj
*
pConsumer
=
mndAcquireConsumer
(
pMnode
,
consumerId
);
if
(
pConsumer
==
NULL
)
{
mError
(
"consumer %
ld
not exist"
,
consumerId
);
mError
(
"consumer %
"
PRId64
"
not exist"
,
consumerId
);
terrno
=
TSDB_CODE_MND_CONSUMER_NOT_EXIST
;
return
-
1
;
}
...
...
@@ -288,7 +288,7 @@ static int32_t mndProcessMqHbReq(SRpcMsg *pMsg) {
int32_t
status
=
atomic_load_32
(
&
pConsumer
->
status
);
if
(
status
==
MQ_CONSUMER_STATUS__LOST_REBD
)
{
mInfo
(
"try to recover consumer %
ld
"
,
consumerId
);
mInfo
(
"try to recover consumer %
"
PRId64
"
"
,
consumerId
);
SMqConsumerRecoverMsg
*
pRecoverMsg
=
rpcMallocCont
(
sizeof
(
SMqConsumerRecoverMsg
));
pRecoverMsg
->
consumerId
=
consumerId
;
...
...
@@ -327,7 +327,7 @@ static int32_t mndProcessAskEpReq(SRpcMsg *pMsg) {
#if 1
if
(
status
==
MQ_CONSUMER_STATUS__LOST_REBD
)
{
mInfo
(
"try to recover consumer %
ld
"
,
consumerId
);
mInfo
(
"try to recover consumer %
"
PRId64
"
"
,
consumerId
);
SMqConsumerRecoverMsg
*
pRecoverMsg
=
rpcMallocCont
(
sizeof
(
SMqConsumerRecoverMsg
));
pRecoverMsg
->
consumerId
=
consumerId
;
...
...
@@ -341,7 +341,7 @@ static int32_t mndProcessAskEpReq(SRpcMsg *pMsg) {
#endif
if
(
status
!=
MQ_CONSUMER_STATUS__READY
)
{
mInfo
(
"consumer %
ld
not ready, status: %s"
,
consumerId
,
mndConsumerStatusName
(
status
));
mInfo
(
"consumer %
"
PRId64
"
not ready, status: %s"
,
consumerId
,
mndConsumerStatusName
(
status
));
terrno
=
TSDB_CODE_MND_CONSUMER_NOT_READY
;
return
-
1
;
}
...
...
source/dnode/mnode/impl/src/mndSubscribe.c
浏览文件 @
30b60002
...
...
@@ -426,10 +426,10 @@ static int32_t mndDoRebalance(SMnode *pMnode, const SMqRebInputObj *pInput, SMqR
if
(
pIter
==
NULL
)
break
;
SMqConsumerEp
*
pConsumerEp
=
(
SMqConsumerEp
*
)
pIter
;
int32_t
sz
=
taosArrayGetSize
(
pConsumerEp
->
vgs
);
mInfo
(
"mq rebalance: final cfg: consumer %
ld
has %d vg"
,
pConsumerEp
->
consumerId
,
sz
);
mInfo
(
"mq rebalance: final cfg: consumer %
"
PRId64
"
has %d vg"
,
pConsumerEp
->
consumerId
,
sz
);
for
(
int32_t
i
=
0
;
i
<
sz
;
i
++
)
{
SMqVgEp
*
pVgEp
=
taosArrayGetP
(
pConsumerEp
->
vgs
,
i
);
mInfo
(
"mq rebalance: final cfg: vg %d to consumer %
ld
"
,
pVgEp
->
vgId
,
pConsumerEp
->
consumerId
);
mInfo
(
"mq rebalance: final cfg: vg %d to consumer %
"
PRId64
"
"
,
pVgEp
->
vgId
,
pConsumerEp
->
consumerId
);
}
}
}
...
...
source/dnode/vnode/src/sma/smaEnv.c
浏览文件 @
30b60002
...
...
@@ -455,7 +455,7 @@ static int32_t tdRsmaStopExecutor(const SSma *pSma) {
for
(
int32_t
i
=
0
;
i
<
tsNumOfVnodeRsmaThreads
;
++
i
)
{
if
(
taosCheckPthreadValid
(
pthread
[
i
]))
{
smaDebug
(
"vgId:%d, start to join pthread for rsma:%"
PRId64
,
SMA_VID
(
pSma
),
pthread
[
i
]
);
smaDebug
(
"vgId:%d, start to join pthread for rsma:%"
PRId64
""
,
SMA_VID
(
pSma
),
taosGetPthreadId
(
pthread
[
i
])
);
taosThreadJoin
(
pthread
[
i
],
NULL
);
}
}
...
...
@@ -463,4 +463,4 @@ static int32_t tdRsmaStopExecutor(const SSma *pSma) {
smaInfo
(
"vgId:%d, rsma executor stopped, number:%d"
,
SMA_VID
(
pSma
),
tsNumOfVnodeRsmaThreads
);
}
return
0
;
}
\ No newline at end of file
}
source/dnode/vnode/src/sma/smaOpen.c
浏览文件 @
30b60002
...
...
@@ -92,8 +92,7 @@ static int32_t smaEvalDays(SVnode *pVnode, SRetention *r, int8_t level, int8_t p
days
=
freqDuration
;
}
end:
smaInfo
(
"vgId:%d, evaluated duration for level %"
PRIi8
" is %d, raw val:%d"
,
TD_VID
(
pVnode
),
level
+
1
,
days
,
duration
);
smaInfo
(
"vgId:%d, evaluated duration for level %d is %d, raw val:%d"
,
TD_VID
(
pVnode
),
level
+
1
,
days
,
duration
);
return
days
;
}
...
...
@@ -186,4 +185,4 @@ int32_t tdRSmaRestore(SSma *pSma, int8_t type, int64_t committedVer) {
ASSERT
(
VND_IS_RSMA
(
pSma
->
pVnode
));
return
tdRSmaProcessRestoreImpl
(
pSma
,
type
,
committedVer
);
}
\ No newline at end of file
}
source/dnode/vnode/src/sma/smaRollup.c
浏览文件 @
30b60002
...
...
@@ -342,7 +342,7 @@ static int32_t tdSetRSmaInfoItemParams(SSma *pSma, SRSmaParam *param, SRSmaStat
smaInfo
(
"vgId:%d, item:%p table:%"
PRIi64
" level:%"
PRIi8
" maxdelay:%"
PRIi64
" watermark:%"
PRIi64
", finally maxdelay:%"
PRIi32
,
TD_VID
(
pVnode
),
pItem
,
pRSmaInfo
->
suid
,
idx
+
1
,
param
->
maxdelay
[
idx
],
param
->
watermark
[
idx
],
TD_VID
(
pVnode
),
pItem
,
pRSmaInfo
->
suid
,
(
int8_t
)(
idx
+
1
)
,
param
->
maxdelay
[
idx
],
param
->
watermark
[
idx
],
pItem
->
maxDelay
);
}
return
TSDB_CODE_SUCCESS
;
...
...
@@ -1387,7 +1387,7 @@ static int32_t tdRSmaFetchAllResult(SSma *pSma, SRSmaInfo *pInfo) {
}
if
((
++
pItem
->
nScanned
*
pItem
->
maxDelay
)
>
RSMA_FETCH_DELAY_MAX
)
{
smaDebug
(
"vgId:%d, suid:%"
PRIi64
" level:%"
PRIi8
" nScanned:%"
PRIi
8
" maxDelay:%d, fetch executed"
,
smaDebug
(
"vgId:%d, suid:%"
PRIi64
" level:%"
PRIi8
" nScanned:%"
PRIi
16
" maxDelay:%d, fetch executed"
,
SMA_VID
(
pSma
),
pInfo
->
suid
,
i
,
pItem
->
nScanned
,
pItem
->
maxDelay
);
}
else
{
int64_t
curMs
=
taosGetTimestampMs
();
...
...
@@ -1411,10 +1411,10 @@ static int32_t tdRSmaFetchAllResult(SSma *pSma, SRSmaInfo *pInfo) {
goto
_err
;
}
smaDebug
(
"vgId:%d, suid:%"
PRIi64
" level:%"
PRIi8
" nScanned:%"
PRIi
8
" maxDelay:%d, fetch finished"
,
smaDebug
(
"vgId:%d, suid:%"
PRIi64
" level:%"
PRIi8
" nScanned:%"
PRIi
16
" maxDelay:%d, fetch finished"
,
SMA_VID
(
pSma
),
pInfo
->
suid
,
i
,
pItem
->
nScanned
,
pItem
->
maxDelay
);
}
else
{
smaDebug
(
"vgId:%d, suid:%"
PRIi64
" level:%"
PRIi8
" nScanned:%"
PRIi
8
smaDebug
(
"vgId:%d, suid:%"
PRIi64
" level:%"
PRIi8
" nScanned:%"
PRIi
16
" maxDelay:%d, fetch not executed as fetch level is %"
PRIi8
,
SMA_VID
(
pSma
),
pInfo
->
suid
,
i
,
pItem
->
nScanned
,
pItem
->
maxDelay
,
pItem
->
fetchLevel
);
}
...
...
@@ -1513,7 +1513,7 @@ int32_t tdRSmaProcessExecImpl(SSma *pSma, ERsmaExecType type) {
int32_t
qallItemSize
=
taosQallItemSize
(
pInfo
->
qall
);
if
(
qallItemSize
>
0
)
{
tdRSmaBatchExec
(
pSma
,
pInfo
,
pInfo
->
qall
,
pSubmitArr
,
type
);
smaDebug
(
"vgId:%d, batchSize:%d, execType:%"
PRIi
8
,
SMA_VID
(
pSma
),
qallItemSize
,
type
);
smaDebug
(
"vgId:%d, batchSize:%d, execType:%"
PRIi
32
,
SMA_VID
(
pSma
),
qallItemSize
,
type
);
}
if
(
RSMA_INFO_ITEM
(
pInfo
,
0
)
->
fetchLevel
||
RSMA_INFO_ITEM
(
pInfo
,
1
)
->
fetchLevel
)
{
...
...
source/dnode/vnode/src/tq/tq.c
浏览文件 @
30b60002
...
...
@@ -564,7 +564,7 @@ int32_t tqProcessPollReq(STQ* pTq, SRpcMsg* pMsg) {
pPushEntry
->
dataRsp
.
head
.
epoch
=
reqEpoch
;
pPushEntry
->
dataRsp
.
head
.
mqMsgType
=
TMQ_MSG_TYPE__POLL_RSP
;
taosHashPut
(
pTq
->
pPushMgr
,
pHandle
->
subKey
,
strlen
(
pHandle
->
subKey
)
+
1
,
&
pPushEntry
,
sizeof
(
void
*
));
tqDebug
(
"tmq poll: consumer %
ld
, subkey %s, vg %d save handle to push mgr"
,
consumerId
,
pHandle
->
subKey
,
tqDebug
(
"tmq poll: consumer %
"
PRId64
"
, subkey %s, vg %d save handle to push mgr"
,
consumerId
,
pHandle
->
subKey
,
TD_VID
(
pTq
->
pVnode
));
// unlock
taosWUnLockLatch
(
&
pTq
->
pushLock
);
...
...
@@ -578,7 +578,8 @@ int32_t tqProcessPollReq(STQ* pTq, SRpcMsg* pMsg) {
code
=
-
1
;
}
tqDebug
(
"tmq poll: consumer %ld, subkey %s, vg %d, send data blockNum:%d, offset type:%d, uid:%ld, version:%ld"
,
tqDebug
(
"tmq poll: consumer %"
PRId64
", subkey %s, vg %d, send data blockNum:%d, offset type:%d, uid:%"
PRId64
", version:%"
PRId64
""
,
consumerId
,
pHandle
->
subKey
,
TD_VID
(
pTq
->
pVnode
),
dataRsp
.
blockNum
,
dataRsp
.
rspOffset
.
type
,
dataRsp
.
rspOffset
.
uid
,
dataRsp
.
rspOffset
.
version
);
...
...
@@ -601,8 +602,9 @@ int32_t tqProcessPollReq(STQ* pTq, SRpcMsg* pMsg) {
if
(
tqSendMetaPollRsp
(
pTq
,
pMsg
,
pReq
,
&
metaRsp
)
<
0
)
{
code
=
-
1
;
}
tqDebug
(
"tmq poll: consumer %ld, subkey %s, vg %d, send meta offset type:%d,uid:%ld,version:%ld"
,
consumerId
,
pHandle
->
subKey
,
TD_VID
(
pTq
->
pVnode
),
metaRsp
.
rspOffset
.
type
,
metaRsp
.
rspOffset
.
uid
,
tqDebug
(
"tmq poll: consumer %"
PRId64
", subkey %s, vg %d, send meta offset type:%d,uid:%"
PRId64
",version:%"
PRId64
""
,
consumerId
,
pHandle
->
subKey
,
TD_VID
(
pTq
->
pVnode
),
metaRsp
.
rspOffset
.
type
,
metaRsp
.
rspOffset
.
uid
,
metaRsp
.
rspOffset
.
version
);
taosMemoryFree
(
metaRsp
.
metaRsp
);
tDeleteSTaosxRsp
(
&
taosxRsp
);
...
...
@@ -619,7 +621,8 @@ int32_t tqProcessPollReq(STQ* pTq, SRpcMsg* pMsg) {
fetchOffsetNew
=
taosxRsp
.
rspOffset
;
}
tqDebug
(
"taosx poll: consumer %ld, subkey %s, vg %d, send data blockNum:%d, offset type:%d,uid:%ld,version:%ld"
,
tqDebug
(
"taosx poll: consumer %"
PRId64
", subkey %s, vg %d, send data blockNum:%d, offset type:%d,uid:%"
PRId64
",version:%"
PRId64
""
,
consumerId
,
pHandle
->
subKey
,
TD_VID
(
pTq
->
pVnode
),
taosxRsp
.
blockNum
,
taosxRsp
.
rspOffset
.
type
,
taosxRsp
.
rspOffset
.
uid
,
taosxRsp
.
rspOffset
.
version
);
}
...
...
@@ -769,11 +772,11 @@ int32_t tqProcessVgChangeReq(STQ* pTq, int64_t version, char* msg, int32_t msgLe
STqHandle
*
pHandle
=
taosHashGet
(
pTq
->
pHandle
,
req
.
subKey
,
strlen
(
req
.
subKey
));
if
(
pHandle
==
NULL
)
{
if
(
req
.
oldConsumerId
!=
-
1
)
{
tqError
(
"vgId:%d, build new consumer handle %s for consumer %
ld, but old consumerId is %ld"
,
req
.
vgId
,
req
.
subKey
,
req
.
newConsumerId
,
req
.
oldConsumerId
);
tqError
(
"vgId:%d, build new consumer handle %s for consumer %
"
PRId64
", but old consumerId is %"
PRId64
""
,
req
.
vgId
,
req
.
subKey
,
req
.
newConsumerId
,
req
.
oldConsumerId
);
}
if
(
req
.
newConsumerId
==
-
1
)
{
tqError
(
"vgId:%d, tq invalid rebalance request, new consumerId %
ld
"
,
req
.
vgId
,
req
.
newConsumerId
);
tqError
(
"vgId:%d, tq invalid rebalance request, new consumerId %
"
PRId64
"
"
,
req
.
vgId
,
req
.
newConsumerId
);
return
0
;
}
STqHandle
tqHandle
=
{
0
};
...
...
source/dnode/vnode/src/tq/tqMeta.c
浏览文件 @
30b60002
...
...
@@ -193,8 +193,8 @@ int32_t tqMetaSaveHandle(STQ* pTq, const char* key, const STqHandle* pHandle) {
tEncodeSize
(
tEncodeSTqHandle
,
pHandle
,
vlen
,
code
);
ASSERT
(
code
==
0
);
tqDebug
(
"tq save %s(%d) consumer %
ld vgId:%d"
,
pHandle
->
subKey
,
(
int32_t
)
strlen
(
pHandle
->
subKey
),
pHandle
->
consumerId
,
TD_VID
(
pTq
->
pVnode
));
tqDebug
(
"tq save %s(%d) consumer %
"
PRId64
" vgId:%d"
,
pHandle
->
subKey
,
(
int32_t
)
strlen
(
pHandle
->
subKey
)
,
pHandle
->
consumerId
,
TD_VID
(
pTq
->
pVnode
));
void
*
buf
=
taosMemoryCalloc
(
1
,
vlen
);
if
(
buf
==
NULL
)
{
...
...
source/dnode/vnode/src/tq/tqPush.c
浏览文件 @
30b60002
...
...
@@ -213,7 +213,7 @@ int32_t tqPushMsgNew(STQ* pTq, void* msg, int32_t msgLen, tmsg_t msgType, int64_
#endif
int
tqPushMsg
(
STQ
*
pTq
,
void
*
msg
,
int32_t
msgLen
,
tmsg_t
msgType
,
int64_t
ver
)
{
tqDebug
(
"vgId:%d tq push msg ver %
ld
, type: %s"
,
pTq
->
pVnode
->
config
.
vgId
,
ver
,
TMSG_INFO
(
msgType
));
tqDebug
(
"vgId:%d tq push msg ver %
"
PRId64
"
, type: %s"
,
pTq
->
pVnode
->
config
.
vgId
,
ver
,
TMSG_INFO
(
msgType
));
if
(
msgType
==
TDMT_VND_SUBMIT
)
{
// lock push mgr to avoid potential msg lost
...
...
@@ -246,8 +246,8 @@ int tqPushMsg(STQ* pTq, void* msg, int32_t msgLen, tmsg_t msgType, int64_t ver)
continue
;
}
if
(
pPushEntry
->
dataRsp
.
reqOffset
.
version
>=
ver
)
{
tqDebug
(
"vgId:%d push entry req version %
ld, while push version %ld, skip"
,
pTq
->
pVnode
->
config
.
vgId
,
pPushEntry
->
dataRsp
.
reqOffset
.
version
,
ver
);
tqDebug
(
"vgId:%d push entry req version %
"
PRId64
", while push version %"
PRId64
", skip"
,
p
Tq
->
pVnode
->
config
.
vgId
,
p
PushEntry
->
dataRsp
.
reqOffset
.
version
,
ver
);
continue
;
}
STqExecHandle
*
pExec
=
&
pHandle
->
execHandle
;
...
...
source/dnode/vnode/src/tq/tqSink.c
浏览文件 @
30b60002
...
...
@@ -36,7 +36,7 @@ int32_t tqBuildDeleteReq(SVnode* pVnode, const char* stbFullName, const SSDataBl
}
else
{
name
=
buildCtbNameByGroupId
(
stbFullName
,
groupId
);
}
tqDebug
(
"stream delete msg: groupId :%
ld
, name: %s"
,
groupId
,
name
);
tqDebug
(
"stream delete msg: groupId :%
"
PRId64
"
, name: %s"
,
groupId
,
name
);
SMetaReader
mr
=
{
0
};
metaReaderInit
(
&
mr
,
pVnode
->
pMeta
,
0
);
if
(
metaGetTableEntryByName
(
&
mr
,
name
)
<
0
)
{
...
...
@@ -435,7 +435,8 @@ void tqSinkToTablePipeline(SStreamTask* pTask, void* vnode, int64_t ver, void* d
continue
;
}
if
(
mr
.
me
.
ctbEntry
.
suid
!=
suid
)
{
tqError
(
"vgId:%d, failed to write into %s, since suid mismatch, expect suid: %ld, actual suid %ld"
,
tqError
(
"vgId:%d, failed to write into %s, since suid mismatch, expect suid: %"
PRId64
", actual suid %"
PRId64
""
,
TD_VID
(
pVnode
),
ctbName
,
suid
,
mr
.
me
.
ctbEntry
.
suid
);
metaReaderClear
(
&
mr
);
taosMemoryFree
(
ctbName
);
...
...
@@ -446,7 +447,8 @@ void tqSinkToTablePipeline(SStreamTask* pTask, void* vnode, int64_t ver, void* d
uid
=
mr
.
me
.
uid
;
metaReaderClear
(
&
mr
);
tqDebug
(
"vgId:%d, stream write, table %s, uid %ld already exist, skip create"
,
TD_VID
(
pVnode
),
ctbName
,
uid
);
tqDebug
(
"vgId:%d, stream write, table %s, uid %"
PRId64
" already exist, skip create"
,
TD_VID
(
pVnode
),
ctbName
,
uid
);
taosMemoryFreeClear
(
ctbName
);
}
...
...
source/dnode/vnode/src/tsdb/tsdbRead.c
浏览文件 @
30b60002
...
...
@@ -340,7 +340,7 @@ static int32_t initFilesetIterator(SFilesetIter* pIter, SArray* aDFileSet, STsdb
pIter
->
pLastBlockReader
=
taosMemoryCalloc
(
1
,
sizeof
(
struct
SLastBlockReader
));
if
(
pIter
->
pLastBlockReader
==
NULL
)
{
int32_t
code
=
TSDB_CODE_OUT_OF_MEMORY
;
tsdbError
(
"failed to prepare the last block iterator,
cod
e:%s %s"
,
tstrerror
(
code
),
pReader
->
idStr
);
tsdbError
(
"failed to prepare the last block iterator,
sinc
e:%s %s"
,
tstrerror
(
code
),
pReader
->
idStr
);
return
code
;
}
}
...
...
@@ -645,11 +645,11 @@ static int32_t doLoadFileBlock(STsdbReader* pReader, SArray* pIndexList, SBlockN
int32_t
total
=
pBlockNum
->
numOfLastFiles
+
pBlockNum
->
numOfBlocks
;
double
el
=
(
taosGetTimestampUs
()
-
st
)
/
1000
.
0
;
tsdbDebug
(
"load block of %"
PRIzu
"
tables completed, blocks:%d in %d tables, last-files:%d, block-info-size:%.2f Kb, elapsed "
"time:%.2f ms %s"
,
numOfTables
,
pBlockNum
->
numOfBlocks
,
numOfQTable
,
pBlockNum
->
numOfLastFiles
,
sizeInDisk
/
1000
.
0
,
el
,
pReader
->
idStr
);
tsdbDebug
(
"load block of %ld
tables completed, blocks:%d in %d tables, last-files:%d, block-info-size:%.2f Kb, elapsed "
"time:%.2f ms %s"
,
numOfTables
,
pBlockNum
->
numOfBlocks
,
numOfQTable
,
pBlockNum
->
numOfLastFiles
,
sizeInDisk
/
1000
.
0
,
el
,
pReader
->
idStr
);
pReader
->
cost
.
numOfBlocks
+=
total
;
pReader
->
cost
.
headFileLoadTime
+=
el
;
...
...
@@ -2555,7 +2555,7 @@ static int32_t doBuildDataBlock(STsdbReader* pReader) {
}
if
(
pScanInfo
==
NULL
)
{
tsdbError
(
"failed to get table, uid:
"
PRIu64
", %s"
,
pBlockInfo
->
uid
,
pReader
->
idStr
);
tsdbError
(
"failed to get table, uid:
%"
PRIu64
", %s"
,
pBlockInfo
->
uid
,
pReader
->
idStr
);
code
=
TSDB_CODE_INVALID_PARA
;
return
code
;
}
...
...
source/dnode/vnode/src/vnd/vnodeSvr.c
浏览文件 @
30b60002
...
...
@@ -1090,7 +1090,7 @@ static int32_t vnodeProcessAlterConfigReq(SVnode *pVnode, int64_t version, void
if
(
pVnode
->
config
.
szBuf
!=
req
.
buffer
*
1024LL
*
1024LL
)
{
vInfo
(
"vgId:%d vnode buffer is changed from %"
PRId64
" to %"
PRId64
,
TD_VID
(
pVnode
),
pVnode
->
config
.
szBuf
,
req
.
buffer
*
1024LL
*
1024LL
);
(
uint64_t
)(
req
.
buffer
*
1024LL
*
1024LL
)
);
pVnode
->
config
.
szBuf
=
req
.
buffer
*
1024LL
*
1024LL
;
}
...
...
source/dnode/vnode/src/vnd/vnodeSync.c
浏览文件 @
30b60002
...
...
@@ -328,14 +328,14 @@ int32_t vnodeProcessSyncCtrlMsg(SVnode *pVnode, SRpcMsg *pMsg, SRpcMsg **pRsp) {
const
STraceId
*
trace
=
&
pMsg
->
info
.
traceId
;
if
(
!
syncEnvIsStart
())
{
vGError
(
"vgId:%d, msg:%p failed to process since sync env not start"
,
pVnode
->
config
.
vgId
);
vGError
(
"vgId:%d, msg:%p failed to process since sync env not start"
,
pVnode
->
config
.
vgId
,
pMsg
);
terrno
=
TSDB_CODE_APP_ERROR
;
return
-
1
;
}
SSyncNode
*
pSyncNode
=
syncNodeAcquire
(
pVnode
->
sync
);
if
(
pSyncNode
==
NULL
)
{
vGError
(
"vgId:%d, msg:%p failed to process since invalid sync node"
,
pVnode
->
config
.
vgId
);
vGError
(
"vgId:%d, msg:%p failed to process since invalid sync node"
,
pVnode
->
config
.
vgId
,
pMsg
);
terrno
=
TSDB_CODE_SYN_INTERNAL_ERROR
;
return
-
1
;
}
...
...
@@ -353,7 +353,7 @@ int32_t vnodeProcessSyncCtrlMsg(SVnode *pVnode, SRpcMsg *pMsg, SRpcMsg **pRsp) {
syncHeartbeatReplyDestroy
(
pSyncMsg
);
}
else
{
vGError
(
"vgId:%d, msg:%p failed to process since error msg type:%d"
,
pVnode
->
config
.
vgId
,
pMsg
->
msgType
);
vGError
(
"vgId:%d, msg:%p failed to process since error msg type:%d"
,
pVnode
->
config
.
vgId
,
pMsg
,
pMsg
->
msgType
);
code
=
-
1
;
}
...
...
source/libs/catalog/src/ctgAsync.c
浏览文件 @
30b60002
...
...
@@ -70,8 +70,8 @@ int32_t ctgInitGetTbMetasTask(SCtgJob* pJob, int32_t taskIdx, void* param) {
taosArrayPush
(
pJob
->
pTasks
,
&
task
);
qDebug
(
"QID:0x%"
PRIx64
" the %dth task type %s initialized, dbNum:%
d
, tbNum:%d"
,
pJob
->
queryId
,
taskIdx
,
ctgTaskTypeStr
(
task
.
type
),
(
int32_t
)
taosArrayGetSize
(
ctx
->
pNames
),
pJob
->
tbMetaNum
);
qDebug
(
"QID:0x%"
PRIx64
" the %dth task type %s initialized, dbNum:%
lu
, tbNum:%d"
,
pJob
->
queryId
,
taskIdx
,
ctgTaskTypeStr
(
task
.
type
),
taosArrayGetSize
(
ctx
->
pNames
),
pJob
->
tbMetaNum
);
return
TSDB_CODE_SUCCESS
;
}
...
...
@@ -201,8 +201,8 @@ int32_t ctgInitGetTbHashsTask(SCtgJob* pJob, int32_t taskIdx, void* param) {
taosArrayPush
(
pJob
->
pTasks
,
&
task
);
qDebug
(
"QID:0x%"
PRIx64
" the %dth task type %s initialized, dbNum:%
d
, tbNum:%d"
,
pJob
->
queryId
,
taskIdx
,
ctgTaskTypeStr
(
task
.
type
),
(
int32_t
)
taosArrayGetSize
(
ctx
->
pNames
),
pJob
->
tbHashNum
);
qDebug
(
"QID:0x%"
PRIx64
" the %dth task type %s initialized, dbNum:%
lu
, tbNum:%d"
,
pJob
->
queryId
,
taskIdx
,
ctgTaskTypeStr
(
task
.
type
),
taosArrayGetSize
(
ctx
->
pNames
),
pJob
->
tbHashNum
);
return
TSDB_CODE_SUCCESS
;
}
...
...
@@ -1667,7 +1667,7 @@ int32_t ctgLaunchGetTbMetasTask(SCtgTask* pTask) {
int32_t
baseResIdx
=
0
;
for
(
int32_t
i
=
0
;
i
<
dbNum
;
++
i
)
{
STablesReq
*
pReq
=
taosArrayGet
(
pCtx
->
pNames
,
i
);
ctgDebug
(
"start to check tb metas in db %s, tbNum %
d"
,
pReq
->
dbFName
,
(
int32_t
)
taosArrayGetSize
(
pReq
->
pTables
));
ctgDebug
(
"start to check tb metas in db %s, tbNum %
ld"
,
pReq
->
dbFName
,
taosArrayGetSize
(
pReq
->
pTables
));
CTG_ERR_RET
(
ctgGetTbMetasFromCache
(
pCtg
,
pConn
,
pCtx
,
i
,
&
fetchIdx
,
baseResIdx
,
pReq
->
pTables
));
baseResIdx
+=
taosArrayGetSize
(
pReq
->
pTables
);
}
...
...
source/libs/executor/src/dataDeleter.c
浏览文件 @
30b60002
...
...
@@ -103,7 +103,7 @@ static void toDataCacheEntry(SDataDeleterHandle* pHandle, const SInputData* pInp
pRes
->
ekey
=
pHandle
->
pDeleter
->
deleteTimeRange
.
ekey
;
}
qDebug
(
"delete %
ld rows, from %ld to %ld
"
,
pRes
->
affectedRows
,
pRes
->
skey
,
pRes
->
ekey
);
qDebug
(
"delete %
"
PRId64
" rows, from %"
PRId64
" to %"
PRId64
"
"
,
pRes
->
affectedRows
,
pRes
->
skey
,
pRes
->
ekey
);
pBuf
->
useSize
+=
pEntry
->
dataLen
;
...
...
source/libs/executor/src/executil.c
浏览文件 @
30b60002
...
...
@@ -930,7 +930,7 @@ int32_t getTableList(void* metaHandle, void* pVnode, SScanPhysiNode* pScanNode,
void
*
var
=
POINTER_SHIFT
(
pColInfoData
->
pData
,
j
*
pColInfoData
->
info
.
bytes
);
int64_t
*
uid
=
taosArrayGet
(
res
,
i
);
qDebug
(
"tagfilter get uid:%
ld
, res:%d"
,
*
uid
,
*
(
bool
*
)
var
);
qDebug
(
"tagfilter get uid:%
"
PRId64
"
, res:%d"
,
*
uid
,
*
(
bool
*
)
var
);
if
(
*
(
bool
*
)
var
==
false
)
{
taosArrayRemove
(
res
,
i
);
j
++
;
...
...
@@ -952,7 +952,7 @@ int32_t getTableList(void* metaHandle, void* pVnode, SScanPhysiNode* pScanNode,
return
TSDB_CODE_OUT_OF_MEMORY
;
}
qDebug
(
"tagfilter get uid:%
ld
"
,
info
.
uid
);
qDebug
(
"tagfilter get uid:%
"
PRId64
"
"
,
info
.
uid
);
}
taosArrayDestroy
(
res
);
...
...
source/libs/executor/src/executor.c
浏览文件 @
30b60002
...
...
@@ -858,7 +858,7 @@ int32_t qStreamPrepareScan(qTaskInfo_t tinfo, STqOffsetVal* pOffset, int8_t subT
tDeleteSSchemaWrapper
(
pTaskInfo
->
streamInfo
.
schema
);
pTaskInfo
->
streamInfo
.
schema
=
mtInfo
.
schema
;
qDebug
(
"tmqsnap qStreamPrepareScan snapshot data uid %
ld ts %"
PRId64
,
mtInfo
.
uid
,
pOffset
->
ts
);
qDebug
(
"tmqsnap qStreamPrepareScan snapshot data uid %
"
PRId64
" ts %"
PRId64
,
mtInfo
.
uid
,
pOffset
->
ts
);
}
else
if
(
pOffset
->
type
==
TMQ_OFFSET__SNAPSHOT_META
)
{
SStreamRawScanInfo
*
pInfo
=
pOperator
->
info
;
SSnapContext
*
sContext
=
pInfo
->
sContext
;
...
...
@@ -866,7 +866,7 @@ int32_t qStreamPrepareScan(qTaskInfo_t tinfo, STqOffsetVal* pOffset, int8_t subT
qError
(
"setForSnapShot error. uid:%"
PRIu64
" ,version:%"
PRId64
,
pOffset
->
uid
,
pOffset
->
version
);
return
-
1
;
}
qDebug
(
"tmqsnap qStreamPrepareScan snapshot meta uid %
ld ts %"
PRId64
,
pOffset
->
uid
,
pOffset
->
ts
);
qDebug
(
"tmqsnap qStreamPrepareScan snapshot meta uid %
"
PRId64
" ts %"
PRId64
,
pOffset
->
uid
,
pOffset
->
ts
);
}
else
if
(
pOffset
->
type
==
TMQ_OFFSET__LOG
)
{
SStreamRawScanInfo
*
pInfo
=
pOperator
->
info
;
tsdbReaderClose
(
pInfo
->
dataReader
);
...
...
source/libs/executor/src/executorimpl.c
浏览文件 @
30b60002
...
...
@@ -1776,7 +1776,7 @@ int32_t loadRemoteDataCallback(void* param, SDataBuf* pMsg, int32_t code) {
}
else
{
taosMemoryFree
(
pMsg
->
pData
);
pSourceDataInfo
->
code
=
code
;
qDebug
(
"%s fetch rsp received, index:%d,
code
:%s"
,
pSourceDataInfo
->
taskId
,
index
,
tstrerror
(
code
));
qDebug
(
"%s fetch rsp received, index:%d,
error
:%s"
,
pSourceDataInfo
->
taskId
,
index
,
tstrerror
(
code
));
}
pSourceDataInfo
->
status
=
EX_SOURCE_DATA_READY
;
...
...
source/libs/executor/src/scanoperator.c
浏览文件 @
30b60002
...
...
@@ -1549,7 +1549,7 @@ static SSDataBlock* doQueueScan(SOperatorInfo* pOperator) {
tsdbReaderClose
(
pTSInfo
->
dataReader
);
pTSInfo
->
dataReader
=
NULL
;
tqOffsetResetToLog
(
&
pTaskInfo
->
streamInfo
.
prepareStatus
,
pTaskInfo
->
streamInfo
.
snapshotVer
);
qDebug
(
"queue scan tsdb over, switch to wal ver %"
PRId64
,
pTaskInfo
->
streamInfo
.
snapshotVer
+
1
);
qDebug
(
"queue scan tsdb over, switch to wal ver %"
PRId64
""
,
pTaskInfo
->
streamInfo
.
snapshotVer
+
1
);
if
(
tqSeekVer
(
pInfo
->
tqReader
,
pTaskInfo
->
streamInfo
.
snapshotVer
+
1
)
<
0
)
{
return
NULL
;
}
...
...
@@ -1982,7 +1982,7 @@ static SSDataBlock* doRawScan(SOperatorInfo* pOperator) {
longjmp
(
pTaskInfo
->
env
,
terrno
);
}
qDebug
(
"tmqsnap doRawScan get data uid:%
ld
"
,
pBlock
->
info
.
uid
);
qDebug
(
"tmqsnap doRawScan get data uid:%
"
PRId64
"
"
,
pBlock
->
info
.
uid
);
pTaskInfo
->
streamInfo
.
lastStatus
.
type
=
TMQ_OFFSET__SNAPSHOT_DATA
;
pTaskInfo
->
streamInfo
.
lastStatus
.
uid
=
pBlock
->
info
.
uid
;
pTaskInfo
->
streamInfo
.
lastStatus
.
ts
=
pBlock
->
info
.
window
.
ekey
;
...
...
@@ -1998,7 +1998,7 @@ static SSDataBlock* doRawScan(SOperatorInfo* pOperator) {
}
else
{
pTaskInfo
->
streamInfo
.
prepareStatus
.
uid
=
mtInfo
.
uid
;
pTaskInfo
->
streamInfo
.
prepareStatus
.
ts
=
INT64_MIN
;
qDebug
(
"tmqsnap change get data uid:%
ld
"
,
mtInfo
.
uid
);
qDebug
(
"tmqsnap change get data uid:%
"
PRId64
"
"
,
mtInfo
.
uid
);
qStreamPrepareScan
(
pTaskInfo
,
&
pTaskInfo
->
streamInfo
.
prepareStatus
,
pInfo
->
sContext
->
subType
);
}
tDeleteSSchemaWrapper
(
mtInfo
.
schema
);
...
...
source/libs/executor/src/tsimplehash.c
浏览文件 @
30b60002
...
...
@@ -105,8 +105,8 @@ static void tSimpleHashTableResize(SSHashObj *pHashObj) {
int32_t
newCapacity
=
(
int32_t
)(
pHashObj
->
capacity
<<
1u
);
if
(
newCapacity
>
HASH_MAX_CAPACITY
)
{
uDebug
(
"current capacity:%"
PRIzu
", maximum capacity:%"
PRIu64
", no resize applied due to limitation is reached"
,
pHashObj
->
capacity
,
HASH_MAX_CAPACITY
);
uDebug
(
"current capacity:%"
PRIzu
", maximum capacity:%"
PRId32
", no resize applied due to limitation is reached"
,
pHashObj
->
capacity
,
(
int32_t
)
HASH_MAX_CAPACITY
);
return
;
}
...
...
@@ -388,4 +388,4 @@ void *tSimpleHashIterate(const SSHashObj *pHashObj, void *data, int32_t *iter) {
}
return
NULL
;
}
\ No newline at end of file
}
source/libs/function/src/builtinsimpl.c
浏览文件 @
30b60002
...
...
@@ -2545,7 +2545,7 @@ int32_t apercentileFunction(SqlFunctionCtx* pCtx) {
// might be a race condition here that pHisto can be overwritten or setup function
// has not been called, need to relink the buffer pHisto points to.
buildHistogramInfo
(
pInfo
);
qDebug
(
"%s before add %d elements into histogram, total:%
d
, numOfEntry:%d, pHisto:%p, elems: %p"
,
__FUNCTION__
,
qDebug
(
"%s before add %d elements into histogram, total:%
"
PRId64
"
, numOfEntry:%d, pHisto:%p, elems: %p"
,
__FUNCTION__
,
numOfElems
,
pInfo
->
pHisto
->
numOfElems
,
pInfo
->
pHisto
->
numOfEntries
,
pInfo
->
pHisto
,
pInfo
->
pHisto
->
elems
);
for
(
int32_t
i
=
start
;
i
<
pInput
->
numOfRows
+
start
;
++
i
)
{
if
(
colDataIsNull_f
(
pCol
->
nullbitmap
,
i
))
{
...
...
@@ -2559,8 +2559,9 @@ int32_t apercentileFunction(SqlFunctionCtx* pCtx) {
tHistogramAdd
(
&
pInfo
->
pHisto
,
v
);
}
qDebug
(
"%s after add %d elements into histogram, total:%d, numOfEntry:%d, pHisto:%p, elems: %p"
,
__FUNCTION__
,
numOfElems
,
pInfo
->
pHisto
->
numOfElems
,
pInfo
->
pHisto
->
numOfEntries
,
pInfo
->
pHisto
,
pInfo
->
pHisto
->
elems
);
qDebug
(
"%s after add %d elements into histogram, total:%"
PRId64
", numOfEntry:%d, pHisto:%p, elems: %p"
,
__FUNCTION__
,
numOfElems
,
pInfo
->
pHisto
->
numOfElems
,
pInfo
->
pHisto
->
numOfEntries
,
pInfo
->
pHisto
,
pInfo
->
pHisto
->
elems
);
}
SET_VAL
(
pResInfo
,
numOfElems
,
1
);
...
...
@@ -2640,7 +2641,7 @@ int32_t apercentileFunctionMerge(SqlFunctionCtx* pCtx) {
}
if
(
pInfo
->
algo
!=
APERCT_ALGO_TDIGEST
)
{
qDebug
(
"%s after merge, total:%
d
, numOfEntry:%d, %p"
,
__FUNCTION__
,
pInfo
->
pHisto
->
numOfElems
,
qDebug
(
"%s after merge, total:%
"
PRId64
"
, numOfEntry:%d, %p"
,
__FUNCTION__
,
pInfo
->
pHisto
->
numOfElems
,
pInfo
->
pHisto
->
numOfEntries
,
pInfo
->
pHisto
);
}
...
...
source/libs/function/src/tudf.c
浏览文件 @
30b60002
...
...
@@ -1269,7 +1269,7 @@ void udfcUvHandleRsp(SClientUvConn *conn) {
SClientUvTaskNode
*
task
=
QUEUE_DATA
(
h
,
SClientUvTaskNode
,
connTaskQueue
);
while
(
h
!=
&
conn
->
taskQueue
)
{
fnDebug
(
"udfc handle response iterate through queue. uvTask:%
d
-%p"
,
task
->
seqNum
,
task
);
fnDebug
(
"udfc handle response iterate through queue. uvTask:%
"
PRId64
"
-%p"
,
task
->
seqNum
,
task
);
if
(
task
->
seqNum
==
seqNum
)
{
if
(
found
==
false
)
{
found
=
true
;
...
...
source/libs/qworker/src/qworker.c
浏览文件 @
30b60002
...
...
@@ -258,7 +258,7 @@ int32_t qwGetQueryResFromSink(QW_FPARAMS_DEF, SQWTaskCtx *ctx, int32_t *dataLen,
dsGetDataLength
(
ctx
->
sinkHandle
,
&
len
,
&
queryEnd
);
if
(
len
<
0
)
{
QW_TASK_ELOG
(
"invalid length from dsGetDataLength, length:%"
PRId64
,
len
);
QW_TASK_ELOG
(
"invalid length from dsGetDataLength, length:%"
PRId64
""
,
len
);
QW_ERR_RET
(
TSDB_CODE_QRY_INVALID_INPUT
);
}
...
...
@@ -292,7 +292,7 @@ int32_t qwGetQueryResFromSink(QW_FPARAMS_DEF, SQWTaskCtx *ctx, int32_t *dataLen,
}
// Got data from sink
QW_TASK_DLOG
(
"there are data in sink, dataLength:%"
PRId64
,
len
);
QW_TASK_DLOG
(
"there are data in sink, dataLength:%"
PRId64
""
,
len
);
*
dataLen
+=
len
;
...
...
source/libs/sync/src/syncAppendEntries.c
浏览文件 @
30b60002
...
...
@@ -408,7 +408,7 @@ static int32_t syncNodeDoMakeLogSame(SSyncNode* ths, SyncIndex FromIndex) {
do
{
char
logBuf
[
128
];
snprintf
(
logBuf
,
sizeof
(
logBuf
),
"update delete begin to %
ld"
,
delBegin
);
snprintf
(
logBuf
,
sizeof
(
logBuf
),
"update delete begin to %
"
PRId64
,
delBegin
);
syncNodeEventLog
(
ths
,
logBuf
);
}
while
(
0
);
}
...
...
@@ -419,7 +419,8 @@ static int32_t syncNodeDoMakeLogSame(SSyncNode* ths, SyncIndex FromIndex) {
do
{
char
logBuf
[
128
];
snprintf
(
logBuf
,
sizeof
(
logBuf
),
"make log same from:%ld, delbegin:%ld, pass:%d"
,
FromIndex
,
delBegin
,
pass
);
snprintf
(
logBuf
,
sizeof
(
logBuf
),
"make log same from:%"
PRId64
", delbegin:%"
PRId64
", pass:%d"
,
FromIndex
,
delBegin
,
pass
);
syncNodeEventLog
(
ths
,
logBuf
);
}
while
(
0
);
...
...
source/libs/sync/src/syncCommit.c
浏览文件 @
30b60002
...
...
@@ -77,8 +77,8 @@ void syncMaybeAdvanceCommitIndex(SSyncNode* pSyncNode) {
}
else
{
pEntry
=
pSyncNode
->
pLogStore
->
getEntry
(
pSyncNode
->
pLogStore
,
index
);
if
(
pEntry
==
NULL
)
{
sError
(
"failed to get entry since %s. index:%lld"
,
tstrerror
(
terrno
),
index
);
return
;
sError
(
"failed to get entry since %s. index:%"
PRId64
,
tstrerror
(
terrno
),
index
);
return
;
}
}
// cannot commit, even if quorum agree. need check term!
...
...
source/libs/sync/src/syncIndexMgr.c
浏览文件 @
30b60002
...
...
@@ -200,28 +200,28 @@ int64_t syncIndexMgrGetRecvTime(SSyncIndexMgr *pSyncIndexMgr, const SRaftId *pRa
// for debug -------------------
void
syncIndexMgrPrint
(
SSyncIndexMgr
*
pObj
)
{
char
*
serialized
=
syncIndexMgr2Str
(
pObj
);
printf
(
"syncIndexMgrPrint | len:%"
PRIu64
" | %s
\n
"
,
strlen
(
serialized
),
serialized
);
printf
(
"syncIndexMgrPrint | len:%"
PRIu64
" | %s
\n
"
,
(
uint64_t
)
strlen
(
serialized
),
serialized
);
fflush
(
NULL
);
taosMemoryFree
(
serialized
);
}
void
syncIndexMgrPrint2
(
char
*
s
,
SSyncIndexMgr
*
pObj
)
{
char
*
serialized
=
syncIndexMgr2Str
(
pObj
);
printf
(
"syncIndexMgrPrint2 | len:%"
PRIu64
" | %s | %s
\n
"
,
strlen
(
serialized
),
s
,
serialized
);
printf
(
"syncIndexMgrPrint2 | len:%"
PRIu64
" | %s | %s
\n
"
,
(
uint64_t
)
strlen
(
serialized
),
s
,
serialized
);
fflush
(
NULL
);
taosMemoryFree
(
serialized
);
}
void
syncIndexMgrLog
(
SSyncIndexMgr
*
pObj
)
{
char
*
serialized
=
syncIndexMgr2Str
(
pObj
);
sTrace
(
"syncIndexMgrLog | len:%"
PRIu64
" | %s"
,
strlen
(
serialized
),
serialized
);
sTrace
(
"syncIndexMgrLog | len:%"
PRIu64
" | %s"
,
(
uint64_t
)
strlen
(
serialized
),
serialized
);
taosMemoryFree
(
serialized
);
}
void
syncIndexMgrLog2
(
char
*
s
,
SSyncIndexMgr
*
pObj
)
{
if
(
gRaftDetailLog
)
{
char
*
serialized
=
syncIndexMgr2Str
(
pObj
);
sTrace
(
"syncIndexMgrLog2 | len:%"
PRIu64
" | %s | %s"
,
strlen
(
serialized
),
s
,
serialized
);
sTrace
(
"syncIndexMgrLog2 | len:%"
PRIu64
" | %s | %s"
,
(
uint64_t
)
strlen
(
serialized
),
s
,
serialized
);
taosMemoryFree
(
serialized
);
}
}
...
...
source/libs/sync/src/syncMain.c
浏览文件 @
30b60002
...
...
@@ -67,7 +67,7 @@ int32_t syncInit() {
syncCleanUp
();
ret
=
-
1
;
}
else
{
sDebug
(
"sync rsetId:%"
PRId
64
" is open"
,
tsNodeRefId
);
sDebug
(
"sync rsetId:%"
PRId
32
" is open"
,
tsNodeRefId
);
ret
=
syncEnvStart
();
}
}
...
...
@@ -80,7 +80,7 @@ void syncCleanUp() {
ASSERT
(
ret
==
0
);
if
(
tsNodeRefId
!=
-
1
)
{
sDebug
(
"sync rsetId:%"
PRId
64
" is closed"
,
tsNodeRefId
);
sDebug
(
"sync rsetId:%"
PRId
32
" is closed"
,
tsNodeRefId
);
taosCloseRef
(
tsNodeRefId
);
tsNodeRefId
=
-
1
;
}
...
...
@@ -100,7 +100,7 @@ int64_t syncOpen(SSyncInfo* pSyncInfo) {
return
-
1
;
}
sDebug
(
"vgId:%d, sync rid:%"
PRId64
" is added to rsetId:%"
PRId
64
,
pSyncInfo
->
vgId
,
pSyncNode
->
rid
,
tsNodeRefId
);
sDebug
(
"vgId:%d, sync rid:%"
PRId64
" is added to rsetId:%"
PRId
32
,
pSyncInfo
->
vgId
,
pSyncNode
->
rid
,
tsNodeRefId
);
return
pSyncNode
->
rid
;
}
...
...
@@ -146,7 +146,7 @@ void syncStop(int64_t rid) {
taosReleaseRef
(
tsNodeRefId
,
pSyncNode
->
rid
);
taosRemoveRef
(
tsNodeRefId
,
rid
);
sDebug
(
"vgId:%d, sync rid:%"
PRId64
" is removed from rsetId:%"
PRId64
,
vgId
,
rid
,
tsNodeRefId
);
sDebug
(
"vgId:%d, sync rid:%"
PRId64
" is removed from rsetId:%"
PRId64
,
vgId
,
rid
,
(
int64_t
)
tsNodeRefId
);
}
int32_t
syncSetStandby
(
int64_t
rid
)
{
...
...
@@ -316,7 +316,7 @@ int32_t syncNodeLeaderTransferTo(SSyncNode* pSyncNode, SNodeInfo newLeader) {
}
do
{
char
logBuf
[
128
];
char
logBuf
[
256
];
snprintf
(
logBuf
,
sizeof
(
logBuf
),
"begin leader transfer to %s:%u"
,
newLeader
.
nodeFqdn
,
newLeader
.
nodePort
);
syncNodeEventLog
(
pSyncNode
,
logBuf
);
}
while
(
0
);
...
...
@@ -867,8 +867,8 @@ int32_t syncNodePropose(SSyncNode* pSyncNode, SRpcMsg* pMsg, bool isWeak) {
if
(
!
pSyncNode
->
restoreFinish
&&
pSyncNode
->
vgId
!=
1
)
{
ret
=
-
1
;
terrno
=
TSDB_CODE_SYN_PROPOSE_NOT_READY
;
sError
(
"vgId:%d, failed to sync propose since not ready, type:%s, last:%
ld, cmt:%ld"
,
pSyncNode
->
vgId
,
TMSG_INFO
(
pMsg
->
msgType
),
syncNodeGetLastIndex
(
pSyncNode
),
pSyncNode
->
commitIndex
);
sError
(
"vgId:%d, failed to sync propose since not ready, type:%s, last:%
"
PRId64
", cmt:%"
PRId64
""
,
pSyncNode
->
vgId
,
TMSG_INFO
(
pMsg
->
msgType
),
syncNodeGetLastIndex
(
pSyncNode
),
pSyncNode
->
commitIndex
);
goto
_END
;
}
...
...
@@ -2475,35 +2475,35 @@ int32_t syncNodeGetPreIndexTerm(SSyncNode* pSyncNode, SyncIndex index, SyncIndex
// for debug --------------
void
syncNodePrint
(
SSyncNode
*
pObj
)
{
char
*
serialized
=
syncNode2Str
(
pObj
);
printf
(
"syncNodePrint | len:%
"
PRIu64
"
| %s
\n
"
,
strlen
(
serialized
),
serialized
);
printf
(
"syncNodePrint | len:%
lu
| %s
\n
"
,
strlen
(
serialized
),
serialized
);
fflush
(
NULL
);
taosMemoryFree
(
serialized
);
}
void
syncNodePrint2
(
char
*
s
,
SSyncNode
*
pObj
)
{
char
*
serialized
=
syncNode2Str
(
pObj
);
printf
(
"syncNodePrint2 | len:%
"
PRIu64
"
| %s | %s
\n
"
,
strlen
(
serialized
),
s
,
serialized
);
printf
(
"syncNodePrint2 | len:%
lu
| %s | %s
\n
"
,
strlen
(
serialized
),
s
,
serialized
);
fflush
(
NULL
);
taosMemoryFree
(
serialized
);
}
void
syncNodeLog
(
SSyncNode
*
pObj
)
{
char
*
serialized
=
syncNode2Str
(
pObj
);
sTraceLong
(
"syncNodeLog | len:%
"
PRIu64
"
| %s"
,
strlen
(
serialized
),
serialized
);
sTraceLong
(
"syncNodeLog | len:%
lu
| %s"
,
strlen
(
serialized
),
serialized
);
taosMemoryFree
(
serialized
);
}
void
syncNodeLog2
(
char
*
s
,
SSyncNode
*
pObj
)
{
if
(
gRaftDetailLog
)
{
char
*
serialized
=
syncNode2Str
(
pObj
);
sTraceLong
(
"syncNodeLog2 | len:%
"
PRIu64
"
| %s | %s"
,
strlen
(
serialized
),
s
,
serialized
);
sTraceLong
(
"syncNodeLog2 | len:%
lu
| %s | %s"
,
strlen
(
serialized
),
s
,
serialized
);
taosMemoryFree
(
serialized
);
}
}
void
syncNodeLog3
(
char
*
s
,
SSyncNode
*
pObj
)
{
char
*
serialized
=
syncNode2Str
(
pObj
);
sTraceLong
(
"syncNodeLog3 | len:%
"
PRIu64
"
| %s | %s"
,
strlen
(
serialized
),
s
,
serialized
);
sTraceLong
(
"syncNodeLog3 | len:%
lu
| %s | %s"
,
strlen
(
serialized
),
s
,
serialized
);
taosMemoryFree
(
serialized
);
}
...
...
@@ -2919,14 +2919,14 @@ int32_t syncDoLeaderTransfer(SSyncNode* ths, SRpcMsg* pRpcMsg, SSyncRaftEntry* p
if
(
pEntry
->
term
<
ths
->
pRaftStore
->
currentTerm
)
{
char
logBuf
[
128
];
snprintf
(
logBuf
,
sizeof
(
logBuf
),
"little term:%
lu
, can not do leader transfer"
,
pEntry
->
term
);
snprintf
(
logBuf
,
sizeof
(
logBuf
),
"little term:%
"
PRIu64
"
, can not do leader transfer"
,
pEntry
->
term
);
syncNodeEventLog
(
ths
,
logBuf
);
return
0
;
}
if
(
pEntry
->
index
<
syncNodeGetLastIndex
(
ths
))
{
char
logBuf
[
128
];
snprintf
(
logBuf
,
sizeof
(
logBuf
),
"little index:%
ld
, can not do leader transfer"
,
pEntry
->
index
);
snprintf
(
logBuf
,
sizeof
(
logBuf
),
"little index:%
"
PRId64
"
, can not do leader transfer"
,
pEntry
->
index
);
syncNodeEventLog
(
ths
,
logBuf
);
return
0
;
}
...
...
@@ -2942,7 +2942,7 @@ int32_t syncDoLeaderTransfer(SSyncNode* ths, SRpcMsg* pRpcMsg, SSyncRaftEntry* p
do
{
char
logBuf
[
128
];
snprintf
(
logBuf
,
sizeof
(
logBuf
),
"do leader transfer, index:%
ld
"
,
pEntry
->
index
);
snprintf
(
logBuf
,
sizeof
(
logBuf
),
"do leader transfer, index:%
"
PRId64
"
"
,
pEntry
->
index
);
syncNodeEventLog
(
ths
,
logBuf
);
}
while
(
0
);
...
...
@@ -3122,9 +3122,9 @@ int32_t syncNodeCommit(SSyncNode* ths, SyncIndex beginIndex, SyncIndex endIndex,
}
else
{
code
=
ths
->
pLogStore
->
syncLogGetEntry
(
ths
->
pLogStore
,
i
,
&
pEntry
);
if
(
code
!=
0
)
{
sError
(
"vgId:%d, failed to get log entry since %s. index:%
lld
"
,
ths
->
vgId
,
tstrerror
(
terrno
),
i
);
sError
(
"vgId:%d, failed to get log entry since %s. index:%
"
PRId64
"
"
,
ths
->
vgId
,
tstrerror
(
terrno
),
i
);
return
-
1
;
}
}
ASSERT
(
pEntry
!=
NULL
);
}
...
...
@@ -3203,8 +3203,8 @@ int32_t syncNodeCommit(SSyncNode* ths, SyncIndex beginIndex, SyncIndex endIndex,
int64_t
restoreDelay
=
taosGetTimestampMs
()
-
ths
->
leaderTime
;
char
eventLog
[
128
];
snprintf
(
eventLog
,
sizeof
(
eventLog
),
"restore finish, index:%
ld, elapsed:%ld ms, "
,
pEntry
->
index
,
restoreDelay
);
snprintf
(
eventLog
,
sizeof
(
eventLog
),
"restore finish, index:%
"
PRId64
", elapsed:%"
PRId64
" ms, "
,
pEntry
->
index
,
restoreDelay
);
syncNodeEventLog
(
ths
,
eventLog
);
}
}
...
...
@@ -3427,4 +3427,4 @@ void syncLogRecvHeartbeatReply(SSyncNode* pSyncNode, const SyncHeartbeatReply* p
snprintf
(
logBuf
,
sizeof
(
logBuf
),
"recv sync-heartbeat-reply from %s:%d {term:%"
PRIu64
", pterm:%"
PRIu64
"}, %s"
,
host
,
port
,
pMsg
->
term
,
pMsg
->
privateTerm
,
s
);
syncNodeEventLog
(
pSyncNode
,
logBuf
);
}
\ No newline at end of file
}
source/libs/sync/src/syncMessage.c
浏览文件 @
30b60002
此差异已折叠。
点击以展开。
source/libs/sync/src/syncRaftCfg.c
浏览文件 @
30b60002
...
...
@@ -447,85 +447,85 @@ int32_t raftCfgFromStr(const char *s, SRaftCfg *pRaftCfg) {
// for debug ----------------------
void
syncCfgPrint
(
SSyncCfg
*
pCfg
)
{
char
*
serialized
=
syncCfg2Str
(
pCfg
);
printf
(
"syncCfgPrint | len:%
"
PRIu64
"
| %s
\n
"
,
strlen
(
serialized
),
serialized
);
printf
(
"syncCfgPrint | len:%
lu
| %s
\n
"
,
strlen
(
serialized
),
serialized
);
fflush
(
NULL
);
taosMemoryFree
(
serialized
);
}
void
syncCfgPrint2
(
char
*
s
,
SSyncCfg
*
pCfg
)
{
char
*
serialized
=
syncCfg2Str
(
pCfg
);
printf
(
"syncCfgPrint2 | len:%
"
PRIu64
"
| %s | %s
\n
"
,
strlen
(
serialized
),
s
,
serialized
);
printf
(
"syncCfgPrint2 | len:%
lu
| %s | %s
\n
"
,
strlen
(
serialized
),
s
,
serialized
);
fflush
(
NULL
);
taosMemoryFree
(
serialized
);
}
void
syncCfgLog
(
SSyncCfg
*
pCfg
)
{
char
*
serialized
=
syncCfg2Str
(
pCfg
);
sTrace
(
"syncCfgLog | len:%
"
PRIu64
"
| %s"
,
strlen
(
serialized
),
serialized
);
sTrace
(
"syncCfgLog | len:%
lu
| %s"
,
strlen
(
serialized
),
serialized
);
taosMemoryFree
(
serialized
);
}
void
syncCfgLog2
(
char
*
s
,
SSyncCfg
*
pCfg
)
{
char
*
serialized
=
syncCfg2Str
(
pCfg
);
sTrace
(
"syncCfgLog2 | len:%
"
PRIu64
"
| %s | %s"
,
strlen
(
serialized
),
s
,
serialized
);
sTrace
(
"syncCfgLog2 | len:%
lu
| %s | %s"
,
strlen
(
serialized
),
s
,
serialized
);
taosMemoryFree
(
serialized
);
}
void
syncCfgLog3
(
char
*
s
,
SSyncCfg
*
pCfg
)
{
char
*
serialized
=
syncCfg2SimpleStr
(
pCfg
);
sTrace
(
"syncCfgLog3 | len:%
"
PRIu64
"
| %s | %s"
,
strlen
(
serialized
),
s
,
serialized
);
sTrace
(
"syncCfgLog3 | len:%
lu
| %s | %s"
,
strlen
(
serialized
),
s
,
serialized
);
taosMemoryFree
(
serialized
);
}
void
raftCfgPrint
(
SRaftCfg
*
pCfg
)
{
char
*
serialized
=
raftCfg2Str
(
pCfg
);
printf
(
"raftCfgPrint | len:%
"
PRIu64
"
| %s
\n
"
,
strlen
(
serialized
),
serialized
);
printf
(
"raftCfgPrint | len:%
lu
| %s
\n
"
,
strlen
(
serialized
),
serialized
);
fflush
(
NULL
);
taosMemoryFree
(
serialized
);
}
void
raftCfgPrint2
(
char
*
s
,
SRaftCfg
*
pCfg
)
{
char
*
serialized
=
raftCfg2Str
(
pCfg
);
printf
(
"raftCfgPrint2 | len:%
"
PRIu64
"
| %s | %s
\n
"
,
strlen
(
serialized
),
s
,
serialized
);
printf
(
"raftCfgPrint2 | len:%
lu
| %s | %s
\n
"
,
strlen
(
serialized
),
s
,
serialized
);
fflush
(
NULL
);
taosMemoryFree
(
serialized
);
}
void
raftCfgLog
(
SRaftCfg
*
pCfg
)
{
char
*
serialized
=
raftCfg2Str
(
pCfg
);
sTrace
(
"raftCfgLog | len:%
"
PRIu64
"
| %s"
,
strlen
(
serialized
),
serialized
);
sTrace
(
"raftCfgLog | len:%
lu
| %s"
,
strlen
(
serialized
),
serialized
);
taosMemoryFree
(
serialized
);
}
void
raftCfgLog2
(
char
*
s
,
SRaftCfg
*
pCfg
)
{
char
*
serialized
=
raftCfg2Str
(
pCfg
);
sTrace
(
"raftCfgLog2 | len:%
"
PRIu64
"
| %s | %s"
,
strlen
(
serialized
),
s
,
serialized
);
sTrace
(
"raftCfgLog2 | len:%
lu
| %s | %s"
,
strlen
(
serialized
),
s
,
serialized
);
taosMemoryFree
(
serialized
);
}
// ---------
void
raftCfgIndexPrint
(
SRaftCfgIndex
*
pCfg
)
{
char
*
serialized
=
raftCfgIndex2Str
(
pCfg
);
printf
(
"raftCfgIndexPrint | len:%
"
PRIu64
"
| %s
\n
"
,
strlen
(
serialized
),
serialized
);
printf
(
"raftCfgIndexPrint | len:%
lu
| %s
\n
"
,
strlen
(
serialized
),
serialized
);
fflush
(
NULL
);
taosMemoryFree
(
serialized
);
}
void
raftCfgIndexPrint2
(
char
*
s
,
SRaftCfgIndex
*
pCfg
)
{
char
*
serialized
=
raftCfgIndex2Str
(
pCfg
);
printf
(
"raftCfgIndexPrint2 | len:%
"
PRIu64
"
| %s | %s
\n
"
,
strlen
(
serialized
),
s
,
serialized
);
printf
(
"raftCfgIndexPrint2 | len:%
lu
| %s | %s
\n
"
,
strlen
(
serialized
),
s
,
serialized
);
fflush
(
NULL
);
taosMemoryFree
(
serialized
);
}
void
raftCfgIndexLog
(
SRaftCfgIndex
*
pCfg
)
{
char
*
serialized
=
raftCfgIndex2Str
(
pCfg
);
sTrace
(
"raftCfgIndexLog | len:%
"
PRIu64
"
| %s"
,
strlen
(
serialized
),
serialized
);
sTrace
(
"raftCfgIndexLog | len:%
lu
| %s"
,
strlen
(
serialized
),
serialized
);
taosMemoryFree
(
serialized
);
}
void
raftCfgIndexLog2
(
char
*
s
,
SRaftCfgIndex
*
pCfg
)
{
char
*
serialized
=
raftCfgIndex2Str
(
pCfg
);
sTrace
(
"raftCfgIndexLog2 | len:%
"
PRIu64
"
| %s | %s"
,
strlen
(
serialized
),
s
,
serialized
);
sTrace
(
"raftCfgIndexLog2 | len:%
lu
| %s | %s"
,
strlen
(
serialized
),
s
,
serialized
);
taosMemoryFree
(
serialized
);
}
source/libs/sync/src/syncRaftEntry.c
浏览文件 @
30b60002
...
...
@@ -418,28 +418,28 @@ char* raftCache2Str(SRaftEntryHashCache* pCache) {
void
raftCachePrint
(
SRaftEntryHashCache
*
pCache
)
{
char
*
serialized
=
raftCache2Str
(
pCache
);
printf
(
"raftCachePrint | len:%
"
PRIu64
"
| %s
\n
"
,
strlen
(
serialized
),
serialized
);
printf
(
"raftCachePrint | len:%
lu
| %s
\n
"
,
strlen
(
serialized
),
serialized
);
fflush
(
NULL
);
taosMemoryFree
(
serialized
);
}
void
raftCachePrint2
(
char
*
s
,
SRaftEntryHashCache
*
pCache
)
{
char
*
serialized
=
raftCache2Str
(
pCache
);
printf
(
"raftCachePrint2 | len:%
"
PRIu64
"
| %s | %s
\n
"
,
strlen
(
serialized
),
s
,
serialized
);
printf
(
"raftCachePrint2 | len:%
lu
| %s | %s
\n
"
,
strlen
(
serialized
),
s
,
serialized
);
fflush
(
NULL
);
taosMemoryFree
(
serialized
);
}
void
raftCacheLog
(
SRaftEntryHashCache
*
pCache
)
{
char
*
serialized
=
raftCache2Str
(
pCache
);
sTrace
(
"raftCacheLog | len:%
"
PRIu64
"
| %s"
,
strlen
(
serialized
),
serialized
);
sTrace
(
"raftCacheLog | len:%
lu
| %s"
,
strlen
(
serialized
),
serialized
);
taosMemoryFree
(
serialized
);
}
void
raftCacheLog2
(
char
*
s
,
SRaftEntryHashCache
*
pCache
)
{
if
(
gRaftDetailLog
)
{
char
*
serialized
=
raftCache2Str
(
pCache
);
sTraceLong
(
"raftCacheLog2 | len:%
"
PRIu64
"
| %s | %s"
,
strlen
(
serialized
),
s
,
serialized
);
sTraceLong
(
"raftCacheLog2 | len:%
lu
| %s | %s"
,
strlen
(
serialized
),
s
,
serialized
);
taosMemoryFree
(
serialized
);
}
}
...
...
@@ -677,28 +677,28 @@ char* raftEntryCache2Str(SRaftEntryCache* pObj) {
void
raftEntryCachePrint
(
SRaftEntryCache
*
pObj
)
{
char
*
serialized
=
raftEntryCache2Str
(
pObj
);
printf
(
"raftEntryCachePrint | len:%
"
PRIu64
"
| %s
\n
"
,
strlen
(
serialized
),
serialized
);
printf
(
"raftEntryCachePrint | len:%
lu
| %s
\n
"
,
strlen
(
serialized
),
serialized
);
fflush
(
NULL
);
taosMemoryFree
(
serialized
);
}
void
raftEntryCachePrint2
(
char
*
s
,
SRaftEntryCache
*
pObj
)
{
char
*
serialized
=
raftEntryCache2Str
(
pObj
);
printf
(
"raftEntryCachePrint2 | len:%
"
PRIu64
"
| %s | %s
\n
"
,
strlen
(
serialized
),
s
,
serialized
);
printf
(
"raftEntryCachePrint2 | len:%
lu
| %s | %s
\n
"
,
strlen
(
serialized
),
s
,
serialized
);
fflush
(
NULL
);
taosMemoryFree
(
serialized
);
}
void
raftEntryCacheLog
(
SRaftEntryCache
*
pObj
)
{
char
*
serialized
=
raftEntryCache2Str
(
pObj
);
sTrace
(
"raftEntryCacheLog | len:%
"
PRIu64
"
| %s"
,
strlen
(
serialized
),
serialized
);
sTrace
(
"raftEntryCacheLog | len:%
lu
| %s"
,
strlen
(
serialized
),
serialized
);
taosMemoryFree
(
serialized
);
}
void
raftEntryCacheLog2
(
char
*
s
,
SRaftEntryCache
*
pObj
)
{
if
(
gRaftDetailLog
)
{
char
*
serialized
=
raftEntryCache2Str
(
pObj
);
sTraceLong
(
"raftEntryCacheLog2 | len:%
"
PRIu64
"
| %s | %s"
,
strlen
(
serialized
),
s
,
serialized
);
sTraceLong
(
"raftEntryCacheLog2 | len:%
lu
| %s | %s"
,
strlen
(
serialized
),
s
,
serialized
);
taosMemoryFree
(
serialized
);
}
}
\ No newline at end of file
}
source/libs/sync/src/syncRaftLog.c
浏览文件 @
30b60002
...
...
@@ -440,7 +440,7 @@ SSyncRaftEntry* logStoreGetEntryWithoutLock(SSyncLogStore* pLogStore, SyncIndex
}
}
while
(
0
);
sError
(
"failed to read ver since %s. index:%
lld
"
,
tstrerror
(
terrno
),
index
);
sError
(
"failed to read ver since %s. index:%
"
PRId64
"
"
,
tstrerror
(
terrno
),
index
);
return
NULL
;
}
...
...
@@ -675,14 +675,14 @@ SyncIndex logStoreWalCommitVer(SSyncLogStore* pLogStore) {
// for debug -----------------
void
logStorePrint
(
SSyncLogStore
*
pLogStore
)
{
char
*
serialized
=
logStore2Str
(
pLogStore
);
printf
(
"logStorePrint | len:%
"
PRIu64
"
| %s
\n
"
,
strlen
(
serialized
),
serialized
);
printf
(
"logStorePrint | len:%
lu
| %s
\n
"
,
strlen
(
serialized
),
serialized
);
fflush
(
NULL
);
taosMemoryFree
(
serialized
);
}
void
logStorePrint2
(
char
*
s
,
SSyncLogStore
*
pLogStore
)
{
char
*
serialized
=
logStore2Str
(
pLogStore
);
printf
(
"logStorePrint2 | len:%
"
PRIu64
"
| %s | %s
\n
"
,
strlen
(
serialized
),
s
,
serialized
);
printf
(
"logStorePrint2 | len:%
lu
| %s | %s
\n
"
,
strlen
(
serialized
),
s
,
serialized
);
fflush
(
NULL
);
taosMemoryFree
(
serialized
);
}
...
...
@@ -690,7 +690,7 @@ void logStorePrint2(char* s, SSyncLogStore* pLogStore) {
void
logStoreLog
(
SSyncLogStore
*
pLogStore
)
{
if
(
gRaftDetailLog
)
{
char
*
serialized
=
logStore2Str
(
pLogStore
);
sTraceLong
(
"logStoreLog | len:%
"
PRIu64
"
| %s"
,
strlen
(
serialized
),
serialized
);
sTraceLong
(
"logStoreLog | len:%
lu
| %s"
,
strlen
(
serialized
),
serialized
);
taosMemoryFree
(
serialized
);
}
}
...
...
@@ -698,7 +698,7 @@ void logStoreLog(SSyncLogStore* pLogStore) {
void
logStoreLog2
(
char
*
s
,
SSyncLogStore
*
pLogStore
)
{
if
(
gRaftDetailLog
)
{
char
*
serialized
=
logStore2Str
(
pLogStore
);
sTraceLong
(
"logStoreLog2 | len:%
"
PRIu64
"
| %s | %s"
,
strlen
(
serialized
),
s
,
serialized
);
sTraceLong
(
"logStoreLog2 | len:%
lu
| %s | %s"
,
strlen
(
serialized
),
s
,
serialized
);
taosMemoryFree
(
serialized
);
}
}
...
...
@@ -706,28 +706,28 @@ void logStoreLog2(char* s, SSyncLogStore* pLogStore) {
// for debug -----------------
void
logStoreSimplePrint
(
SSyncLogStore
*
pLogStore
)
{
char
*
serialized
=
logStoreSimple2Str
(
pLogStore
);
printf
(
"logStoreSimplePrint | len:%
"
PRIu64
"
| %s
\n
"
,
strlen
(
serialized
),
serialized
);
printf
(
"logStoreSimplePrint | len:%
lu
| %s
\n
"
,
strlen
(
serialized
),
serialized
);
fflush
(
NULL
);
taosMemoryFree
(
serialized
);
}
void
logStoreSimplePrint2
(
char
*
s
,
SSyncLogStore
*
pLogStore
)
{
char
*
serialized
=
logStoreSimple2Str
(
pLogStore
);
printf
(
"logStoreSimplePrint2 | len:%
"
PRIu64
"
| %s | %s
\n
"
,
strlen
(
serialized
),
s
,
serialized
);
printf
(
"logStoreSimplePrint2 | len:%
lu
| %s | %s
\n
"
,
strlen
(
serialized
),
s
,
serialized
);
fflush
(
NULL
);
taosMemoryFree
(
serialized
);
}
void
logStoreSimpleLog
(
SSyncLogStore
*
pLogStore
)
{
char
*
serialized
=
logStoreSimple2Str
(
pLogStore
);
sTrace
(
"logStoreSimpleLog | len:%
"
PRIu64
"
| %s"
,
strlen
(
serialized
),
serialized
);
sTrace
(
"logStoreSimpleLog | len:%
lu
| %s"
,
strlen
(
serialized
),
serialized
);
taosMemoryFree
(
serialized
);
}
void
logStoreSimpleLog2
(
char
*
s
,
SSyncLogStore
*
pLogStore
)
{
if
(
gRaftDetailLog
)
{
char
*
serialized
=
logStoreSimple2Str
(
pLogStore
);
sTrace
(
"logStoreSimpleLog2 | len:%
"
PRIu64
"
| %s | %s"
,
strlen
(
serialized
),
s
,
serialized
);
sTrace
(
"logStoreSimpleLog2 | len:%
lu
| %s | %s"
,
strlen
(
serialized
),
s
,
serialized
);
taosMemoryFree
(
serialized
);
}
}
source/libs/sync/src/syncRaftStore.c
浏览文件 @
30b60002
...
...
@@ -226,25 +226,25 @@ char *raftStore2Str(SRaftStore *pRaftStore) {
// for debug -------------------
void
raftStorePrint
(
SRaftStore
*
pObj
)
{
char
*
serialized
=
raftStore2Str
(
pObj
);
printf
(
"raftStorePrint | len:%
"
PRIu64
"
| %s
\n
"
,
strlen
(
serialized
),
serialized
);
printf
(
"raftStorePrint | len:%
lu
| %s
\n
"
,
strlen
(
serialized
),
serialized
);
fflush
(
NULL
);
taosMemoryFree
(
serialized
);
}
void
raftStorePrint2
(
char
*
s
,
SRaftStore
*
pObj
)
{
char
*
serialized
=
raftStore2Str
(
pObj
);
printf
(
"raftStorePrint2 | len:%
"
PRIu64
"
| %s | %s
\n
"
,
strlen
(
serialized
),
s
,
serialized
);
printf
(
"raftStorePrint2 | len:%
lu
| %s | %s
\n
"
,
strlen
(
serialized
),
s
,
serialized
);
fflush
(
NULL
);
taosMemoryFree
(
serialized
);
}
void
raftStoreLog
(
SRaftStore
*
pObj
)
{
char
*
serialized
=
raftStore2Str
(
pObj
);
sTrace
(
"raftStoreLog | len:%
"
PRIu64
"
| %s"
,
strlen
(
serialized
),
serialized
);
sTrace
(
"raftStoreLog | len:%
lu
| %s"
,
strlen
(
serialized
),
serialized
);
taosMemoryFree
(
serialized
);
}
void
raftStoreLog2
(
char
*
s
,
SRaftStore
*
pObj
)
{
char
*
serialized
=
raftStore2Str
(
pObj
);
sTrace
(
"raftStoreLog2 | len:%
"
PRIu64
"
| %s | %s"
,
strlen
(
serialized
),
s
,
serialized
);
sTrace
(
"raftStoreLog2 | len:%
lu
| %s | %s"
,
strlen
(
serialized
),
s
,
serialized
);
taosMemoryFree
(
serialized
);
}
source/libs/sync/src/syncRequestVoteReply.c
浏览文件 @
30b60002
...
...
@@ -127,7 +127,7 @@ int32_t syncNodeOnRequestVoteReplySnapshotCb(SSyncNode* ths, SyncRequestVoteRepl
if
(
ths
->
state
==
TAOS_SYNC_STATE_CANDIDATE
)
{
if
(
ths
->
pVotesRespond
->
term
!=
pMsg
->
term
)
{
char
logBuf
[
128
];
snprintf
(
logBuf
,
sizeof
(
logBuf
),
"vote respond error vote-respond-mgr term:%
lu, msg term:lu
"
,
snprintf
(
logBuf
,
sizeof
(
logBuf
),
"vote respond error vote-respond-mgr term:%
"
PRIu64
", msg term:%"
PRIu64
"
"
,
ths
->
pVotesRespond
->
term
,
pMsg
->
term
);
syncNodeErrorLog
(
ths
,
logBuf
);
return
-
1
;
...
...
@@ -155,4 +155,4 @@ int32_t syncNodeOnRequestVoteReplySnapshotCb(SSyncNode* ths, SyncRequestVoteRepl
}
return
0
;
}
\ No newline at end of file
}
source/libs/sync/src/syncRespMgr.c
浏览文件 @
30b60002
...
...
@@ -177,7 +177,7 @@ void syncRespCleanByTTL(SSyncRespMgr *pObj, int64_t ttl, bool rsp) {
for
(
int32_t
i
=
0
;
i
<
arraySize
;
++
i
)
{
uint64_t
*
pSeqNum
=
taosArrayGet
(
delIndexArray
,
i
);
taosHashRemove
(
pObj
->
pRespHash
,
pSeqNum
,
sizeof
(
uint64_t
));
sDebug
(
"vgId:%d, resp mgr clean by ttl, seq:%
d
"
,
pSyncNode
->
vgId
,
*
pSeqNum
);
sDebug
(
"vgId:%d, resp mgr clean by ttl, seq:%
"
PRId64
"
"
,
pSyncNode
->
vgId
,
*
pSeqNum
);
}
taosArrayDestroy
(
delIndexArray
);
}
source/libs/sync/src/syncTimeout.c
浏览文件 @
30b60002
...
...
@@ -91,7 +91,7 @@ int32_t syncNodeOnTimeoutCb(SSyncNode* ths, SyncTimeout* pMsg) {
}
else
if
(
pMsg
->
timeoutType
==
SYNC_TIMEOUT_ELECTION
)
{
if
(
atomic_load_64
(
&
ths
->
electTimerLogicClockUser
)
<=
pMsg
->
logicClock
)
{
++
(
ths
->
electTimerCounter
);
sTrace
(
"vgId:%d, sync timer, type:election count:%
d, electTimerLogicClockUser:%ld
"
,
ths
->
vgId
,
sTrace
(
"vgId:%d, sync timer, type:election count:%
"
PRId64
", electTimerLogicClockUser:%"
PRId64
"
"
,
ths
->
vgId
,
ths
->
electTimerCounter
,
ths
->
electTimerLogicClockUser
);
syncNodeElect
(
ths
);
}
...
...
@@ -99,8 +99,8 @@ int32_t syncNodeOnTimeoutCb(SSyncNode* ths, SyncTimeout* pMsg) {
}
else
if
(
pMsg
->
timeoutType
==
SYNC_TIMEOUT_HEARTBEAT
)
{
if
(
atomic_load_64
(
&
ths
->
heartbeatTimerLogicClockUser
)
<=
pMsg
->
logicClock
)
{
++
(
ths
->
heartbeatTimerCounter
);
sTrace
(
"vgId:%d, sync timer, type:replicate count:%
d, heartbeatTimerLogicClockUser:%ld"
,
ths
->
vgId
,
ths
->
heartbeatTimerCounter
,
ths
->
heartbeatTimerLogicClockUser
);
sTrace
(
"vgId:%d, sync timer, type:replicate count:%
"
PRId64
", heartbeatTimerLogicClockUser:%"
PRId64
""
,
ths
->
vgId
,
ths
->
heartbeatTimerCounter
,
ths
->
heartbeatTimerLogicClockUser
);
syncNodeReplicate
(
ths
,
true
);
}
}
else
{
...
...
@@ -108,4 +108,4 @@ int32_t syncNodeOnTimeoutCb(SSyncNode* ths, SyncTimeout* pMsg) {
}
return
ret
;
}
\ No newline at end of file
}
source/libs/sync/src/syncVoteMgr.c
浏览文件 @
30b60002
...
...
@@ -138,27 +138,27 @@ char *voteGranted2Str(SVotesGranted *pVotesGranted) {
// for debug -------------------
void
voteGrantedPrint
(
SVotesGranted
*
pObj
)
{
char
*
serialized
=
voteGranted2Str
(
pObj
);
printf
(
"voteGrantedPrint | len:%
"
PRIu64
"
| %s
\n
"
,
strlen
(
serialized
),
serialized
);
printf
(
"voteGrantedPrint | len:%
lu
| %s
\n
"
,
strlen
(
serialized
),
serialized
);
fflush
(
NULL
);
taosMemoryFree
(
serialized
);
}
void
voteGrantedPrint2
(
char
*
s
,
SVotesGranted
*
pObj
)
{
char
*
serialized
=
voteGranted2Str
(
pObj
);
printf
(
"voteGrantedPrint2 | len:%
"
PRIu64
"
| %s | %s
\n
"
,
strlen
(
serialized
),
s
,
serialized
);
printf
(
"voteGrantedPrint2 | len:%
lu
| %s | %s
\n
"
,
strlen
(
serialized
),
s
,
serialized
);
fflush
(
NULL
);
taosMemoryFree
(
serialized
);
}
void
voteGrantedLog
(
SVotesGranted
*
pObj
)
{
char
*
serialized
=
voteGranted2Str
(
pObj
);
sTrace
(
"voteGrantedLog | len:%
"
PRIu64
"
| %s"
,
strlen
(
serialized
),
serialized
);
sTrace
(
"voteGrantedLog | len:%
lu
| %s"
,
strlen
(
serialized
),
serialized
);
taosMemoryFree
(
serialized
);
}
void
voteGrantedLog2
(
char
*
s
,
SVotesGranted
*
pObj
)
{
char
*
serialized
=
voteGranted2Str
(
pObj
);
sTrace
(
"voteGrantedLog2 | len:%
"
PRIu64
"
| %s | %s"
,
strlen
(
serialized
),
s
,
serialized
);
sTrace
(
"voteGrantedLog2 | len:%
lu
| %s | %s"
,
strlen
(
serialized
),
s
,
serialized
);
taosMemoryFree
(
serialized
);
}
...
...
@@ -267,26 +267,26 @@ char *votesRespond2Str(SVotesRespond *pVotesRespond) {
// for debug -------------------
void
votesRespondPrint
(
SVotesRespond
*
pObj
)
{
char
*
serialized
=
votesRespond2Str
(
pObj
);
printf
(
"votesRespondPrint | len:%
"
PRIu64
"
| %s
\n
"
,
strlen
(
serialized
),
serialized
);
printf
(
"votesRespondPrint | len:%
lu
| %s
\n
"
,
strlen
(
serialized
),
serialized
);
fflush
(
NULL
);
taosMemoryFree
(
serialized
);
}
void
votesRespondPrint2
(
char
*
s
,
SVotesRespond
*
pObj
)
{
char
*
serialized
=
votesRespond2Str
(
pObj
);
printf
(
"votesRespondPrint2 | len:%
"
PRIu64
"
| %s | %s
\n
"
,
strlen
(
serialized
),
s
,
serialized
);
printf
(
"votesRespondPrint2 | len:%
lu
| %s | %s
\n
"
,
strlen
(
serialized
),
s
,
serialized
);
fflush
(
NULL
);
taosMemoryFree
(
serialized
);
}
void
votesRespondLog
(
SVotesRespond
*
pObj
)
{
char
*
serialized
=
votesRespond2Str
(
pObj
);
sTrace
(
"votesRespondLog | len:%
"
PRIu64
"
| %s"
,
strlen
(
serialized
),
serialized
);
sTrace
(
"votesRespondLog | len:%
lu
| %s"
,
strlen
(
serialized
),
serialized
);
taosMemoryFree
(
serialized
);
}
void
votesRespondLog2
(
char
*
s
,
SVotesRespond
*
pObj
)
{
char
*
serialized
=
votesRespond2Str
(
pObj
);
sTrace
(
"votesRespondLog2 | len:%
"
PRIu64
"
| %s | %s"
,
strlen
(
serialized
),
s
,
serialized
);
sTrace
(
"votesRespondLog2 | len:%
lu
| %s | %s"
,
strlen
(
serialized
),
s
,
serialized
);
taosMemoryFree
(
serialized
);
}
source/libs/tdb/src/db/tdbDb.c
浏览文件 @
30b60002
...
...
@@ -138,7 +138,7 @@ int32_t tdbPostCommit(TDB *pDb, TXN *pTxn) {
for
(
pPager
=
pDb
->
pgrList
;
pPager
;
pPager
=
pPager
->
pNext
)
{
ret
=
tdbPagerPostCommit
(
pPager
,
pTxn
);
if
(
ret
<
0
)
{
tdbError
(
"failed to commit pager since %s. dbName:%s, txnId:%
d"
,
tstrerror
(
terrno
),
pDb
->
dbName
,
pTxn
->
txnId
);
tdbError
(
"failed to commit pager since %s. dbName:%s, txnId:%
"
PRId64
,
tstrerror
(
terrno
),
pDb
->
dbName
,
pTxn
->
txnId
);
return
-
1
;
}
}
...
...
source/libs/tdb/src/db/tdbPCache.c
浏览文件 @
30b60002
...
...
@@ -301,8 +301,8 @@ static SPage *tdbPCacheFetchImpl(SPCache *pCache, const SPgid *pPgid, TXN *pTxn)
pPage
->
pPager
=
pPageH
->
pPager
;
memcpy
(
pPage
->
pData
,
pPageH
->
pData
,
pPage
->
pageSize
);
// tdbDebug("pcache/pPageH: %p %
d %p %p %d
", pPageH, pPageH->pPageHdr - pPageH->pData, pPageH->xCellSize, pPage,
// TDB_PAGE_PGNO(pPageH));
// tdbDebug("pcache/pPageH: %p %
ld %p %p %u
", pPageH, pPageH->pPageHdr - pPageH->pData, pPageH->xCellSize, pPage,
//
TDB_PAGE_PGNO(pPageH));
tdbPageInit
(
pPage
,
pPageH
->
pPageHdr
-
pPageH
->
pData
,
pPageH
->
xCellSize
);
pPage
->
kLen
=
pPageH
->
kLen
;
pPage
->
vLen
=
pPageH
->
vLen
;
...
...
source/libs/tdb/src/db/tdbPager.c
浏览文件 @
30b60002
...
...
@@ -553,8 +553,8 @@ static int tdbPagerWritePageToJournal(SPager *pPager, SPage *pPage) {
ret
=
tdbOsWrite
(
pPager
->
jfd
,
pPage
->
pData
,
pPage
->
pageSize
);
if
(
ret
<
0
)
{
tdbError
(
"failed to write page data due to %s. file:%s, pageSize:%d"
,
strerror
(
errno
),
pPager
->
jFileName
,
pPage
->
pageSize
);
tdbError
(
"failed to write page data due to %s. file:%s, pageSize:%
l
d"
,
strerror
(
errno
),
pPager
->
jFileName
,
(
long
)
pPage
->
pageSize
);
terrno
=
TAOS_SYSTEM_ERROR
(
errno
);
return
-
1
;
}
...
...
source/libs/transport/src/trans.c
浏览文件 @
30b60002
...
...
@@ -100,11 +100,11 @@ void* rpcMallocCont(int64_t contLen) {
int64_t
size
=
contLen
+
TRANS_MSG_OVERHEAD
;
char
*
start
=
taosMemoryCalloc
(
1
,
size
);
if
(
start
==
NULL
)
{
tError
(
"failed to malloc msg, size:%
d"
,
size
);
tError
(
"failed to malloc msg, size:%
"
PRId64
,
size
);
terrno
=
TSDB_CODE_OUT_OF_MEMORY
;
return
NULL
;
}
else
{
tTrace
(
"malloc mem:%p size:%
d"
,
start
,
size
);
tTrace
(
"malloc mem:%p size:%
"
PRId64
,
start
,
size
);
}
return
start
+
sizeof
(
STransMsgHead
);
...
...
source/libs/transport/test/svrBench.c
浏览文件 @
30b60002
...
...
@@ -134,7 +134,7 @@ int main(int argc, char *argv[]) {
dDebugFlag
=
rpcDebugFlag
;
uDebugFlag
=
rpcDebugFlag
;
}
else
{
printf
(
"
\n
usage:% [options]
\n
"
,
argv
[
0
]);
printf
(
"
\n
usage:%
s
[options]
\n
"
,
argv
[
0
]);
printf
(
" [-p port]: server port number, default is:%d
\n
"
,
rpcInit
.
localPort
);
printf
(
" [-t threads]: number of rpc threads, default is:%d
\n
"
,
rpcInit
.
numOfThreads
);
printf
(
" [-s sessions]: number of sessions, default is:%d
\n
"
,
rpcInit
.
sessions
);
...
...
source/libs/wal/src/walMeta.c
浏览文件 @
30b60002
...
...
@@ -69,8 +69,8 @@ static FORCE_INLINE int64_t walScanLogGetLastVer(SWal* pWal, int32_t fileIdx) {
int64_t
walCkHeadSz
=
sizeof
(
SWalCkHead
);
int64_t
end
=
fileSize
;
int64_t
offset
=
0
;
int
32
_t
capacity
=
0
;
int
32
_t
readSize
=
0
;
int
64
_t
capacity
=
0
;
int
64
_t
readSize
=
0
;
char
*
buf
=
NULL
;
char
*
found
=
NULL
;
bool
firstTrial
=
pFileInfo
->
fileSize
<
fileSize
;
...
...
@@ -200,8 +200,8 @@ static FORCE_INLINE int64_t walScanLogGetLastVer(SWal* pWal, int32_t fileIdx) {
// truncate file
if
(
lastEntryEndOffset
!=
fileSize
)
{
wWarn
(
"vgId:%d, repair meta truncate file %s to %
ld, orig size %ld"
,
pWal
->
cfg
.
vgId
,
fnameStr
,
lastEntryEndOffset
,
fileSize
);
wWarn
(
"vgId:%d, repair meta truncate file %s to %
"
PRId64
", orig size %"
PRId64
,
pWal
->
cfg
.
vgId
,
fnameStr
,
lastEntryEndOffset
,
fileSize
);
if
(
taosFtruncateFile
(
pFile
,
lastEntryEndOffset
)
<
0
)
{
wError
(
"failed to truncate file due to %s. file:%s"
,
strerror
(
errno
),
fnameStr
);
terrno
=
TAOS_SYSTEM_ERROR
(
errno
);
...
...
@@ -464,7 +464,7 @@ int walCheckAndRepairIdxFile(SWal* pWal, int32_t fileIdx) {
// determine the last valid entry end, i.e. offset
while
((
offset
-=
sizeof
(
SWalIdxEntry
))
>=
0
)
{
if
(
taosLSeekFile
(
pIdxFile
,
offset
,
SEEK_SET
)
<
0
)
{
wError
(
"vgId:%d, failed to seek file due to %s. offset:"
PRId64
", file:%s"
,
pWal
->
cfg
.
vgId
,
strerror
(
errno
),
wError
(
"vgId:%d, failed to seek file due to %s. offset:
%
"
PRId64
", file:%s"
,
pWal
->
cfg
.
vgId
,
strerror
(
errno
),
offset
,
fnameStr
);
terrno
=
TAOS_SYSTEM_ERROR
(
errno
);
goto
_err
;
...
...
@@ -511,7 +511,7 @@ int walCheckAndRepairIdxFile(SWal* pWal, int32_t fileIdx) {
// rebuild idx file
if
(
taosLSeekFile
(
pIdxFile
,
0
,
SEEK_END
)
<
0
)
{
wError
(
"vgId:%d, failed to seek file due to %s. offset:"
PRId64
", file:%s"
,
pWal
->
cfg
.
vgId
,
strerror
(
errno
),
wError
(
"vgId:%d, failed to seek file due to %s. offset:
%
"
PRId64
", file:%s"
,
pWal
->
cfg
.
vgId
,
strerror
(
errno
),
offset
,
fnameStr
);
terrno
=
TAOS_SYSTEM_ERROR
(
errno
);
goto
_err
;
...
...
@@ -528,7 +528,7 @@ int walCheckAndRepairIdxFile(SWal* pWal, int32_t fileIdx) {
idxEntry
.
offset
,
fLogNameStr
);
goto
_err
;
}
wWarn
(
"vgId:%d wal idx append new entry %
ld %ld"
,
pWal
->
cfg
.
vgId
,
idxEntry
.
ver
,
idxEntry
.
offset
);
wWarn
(
"vgId:%d wal idx append new entry %
"
PRId64
" %"
PRId64
,
pWal
->
cfg
.
vgId
,
idxEntry
.
ver
,
idxEntry
.
offset
);
if
(
taosWriteFile
(
pIdxFile
,
&
idxEntry
,
sizeof
(
SWalIdxEntry
))
<
0
)
{
wError
(
"vgId:%d, failed to append file since %s. file:%s"
,
pWal
->
cfg
.
vgId
,
terrstr
(),
fnameStr
);
goto
_err
;
...
...
source/libs/wal/src/walRead.c
浏览文件 @
30b60002
...
...
@@ -126,7 +126,7 @@ static int64_t walReadSeekFilePos(SWalReader *pReader, int64_t fileFirstVer, int
wError
(
"vgId:%d, failed to read idx file, since %s"
,
pReader
->
pWal
->
cfg
.
vgId
,
terrstr
());
}
else
{
terrno
=
TSDB_CODE_WAL_FILE_CORRUPTED
;
wError
(
"vgId:%d, read idx file incompletely, read bytes %"
PRId64
", bytes should be %
"
PRIu64
,
wError
(
"vgId:%d, read idx file incompletely, read bytes %"
PRId64
", bytes should be %
ld"
,
pReader
->
pWal
->
cfg
.
vgId
,
ret
,
sizeof
(
SWalIdxEntry
));
}
return
-
1
;
...
...
@@ -182,7 +182,7 @@ int32_t walReadSeekVerImpl(SWalReader *pReader, int64_t ver) {
tmpInfo
.
firstVer
=
ver
;
SWalFileInfo
*
pRet
=
taosArraySearch
(
pWal
->
fileInfoSet
,
&
tmpInfo
,
compareWalFileInfo
,
TD_LE
);
if
(
pRet
==
NULL
)
{
wError
(
"failed to find WAL log file with ver:%
lld"
,
ver
);
wError
(
"failed to find WAL log file with ver:%
"
PRId64
,
ver
);
terrno
=
TSDB_CODE_WAL_INVALID_VER
;
return
-
1
;
}
...
...
source/libs/wal/src/walWrite.c
浏览文件 @
30b60002
...
...
@@ -419,7 +419,7 @@ static int32_t walWriteIndex(SWal *pWal, int64_t ver, int64_t offset) {
int64_t
size
=
taosWriteFile
(
pWal
->
pIdxFile
,
&
entry
,
sizeof
(
SWalIdxEntry
));
if
(
size
!=
sizeof
(
SWalIdxEntry
))
{
wError
(
"vgId:%d, failed to write idx entry due to %s. ver:%
lld"
,
pWal
->
cfg
.
vgId
,
strerror
(
errno
),
ver
);
wError
(
"vgId:%d, failed to write idx entry due to %s. ver:%
"
PRId64
,
pWal
->
cfg
.
vgId
,
strerror
(
errno
),
ver
);
terrno
=
TAOS_SYSTEM_ERROR
(
errno
);
return
-
1
;
}
...
...
@@ -449,7 +449,7 @@ static FORCE_INLINE int32_t walWriteImpl(SWal *pWal, int64_t index, tmsg_t msgTy
pWal
->
writeHead
.
cksumHead
=
walCalcHeadCksum
(
&
pWal
->
writeHead
);
pWal
->
writeHead
.
cksumBody
=
walCalcBodyCksum
(
body
,
bodyLen
);
wDebug
(
"vgId:%d, wal write log %
ld
, msgType: %s"
,
pWal
->
cfg
.
vgId
,
index
,
TMSG_INFO
(
msgType
));
wDebug
(
"vgId:%d, wal write log %
"
PRId64
"
, msgType: %s"
,
pWal
->
cfg
.
vgId
,
index
,
TMSG_INFO
(
msgType
));
code
=
walWriteIndex
(
pWal
,
index
,
offset
);
if
(
code
<
0
)
{
...
...
@@ -484,16 +484,16 @@ static FORCE_INLINE int32_t walWriteImpl(SWal *pWal, int64_t index, tmsg_t msgTy
END:
// recover in a reverse order
if
(
taosFtruncateFile
(
pWal
->
pLogFile
,
offset
)
<
0
)
{
wFatal
(
"vgId:%d, failed to ftruncate logfile to offset:%
lld during recovery due to %s"
,
pWal
->
cfg
.
vgId
,
offset
,
strerror
(
errno
));
wFatal
(
"vgId:%d, failed to ftruncate logfile to offset:%
"
PRId64
" during recovery due to %s"
,
pWal
->
cfg
.
vgId
,
offset
,
strerror
(
errno
));
terrno
=
TAOS_SYSTEM_ERROR
(
errno
);
ASSERT
(
0
&&
"failed to recover from error"
);
}
int64_t
idxOffset
=
(
index
-
pFileInfo
->
firstVer
)
*
sizeof
(
SWalIdxEntry
);
if
(
taosFtruncateFile
(
pWal
->
pIdxFile
,
idxOffset
)
<
0
)
{
wFatal
(
"vgId:%d, failed to ftruncate idxfile to offset:%
lld during recovery due to %s"
,
pWal
->
cfg
.
vgId
,
idxOffset
,
strerror
(
errno
));
wFatal
(
"vgId:%d, failed to ftruncate idxfile to offset:%
"
PRId64
"during recovery due to %s"
,
pWal
->
cfg
.
vgId
,
idxOffset
,
strerror
(
errno
));
terrno
=
TAOS_SYSTEM_ERROR
(
errno
);
ASSERT
(
0
&&
"failed to recover from error"
);
}
...
...
source/util/src/tcache.c
浏览文件 @
30b60002
...
...
@@ -227,7 +227,7 @@ static FORCE_INLINE void taosCacheReleaseNode(SCacheObj *pCacheObj, SCacheNode *
static
FORCE_INLINE
STrashElem
*
doRemoveElemInTrashcan
(
SCacheObj
*
pCacheObj
,
STrashElem
*
pElem
)
{
if
(
pElem
->
pData
->
signature
!=
pElem
->
pData
)
{
uWarn
(
"key:sig:0x%"
PRIx64
" %p data has been released, ignore"
,
pElem
->
pData
->
signature
,
pElem
->
pData
);
uWarn
(
"key:sig:0x%"
PRIx64
" %p data has been released, ignore"
,
(
int64_t
)
pElem
->
pData
->
signature
,
pElem
->
pData
);
return
NULL
;
}
...
...
utils/test/c/tmqSim.c
浏览文件 @
30b60002
...
...
@@ -1262,7 +1262,7 @@ void* ombProduceThreadFunc(void* param) {
printf
(
"Produce Info: totalSendLoopTimes: %d, batchPerTblTimes: %d, producerRate: %d
\n
"
,
totalSendLoopTimes
,
batchPerTblTimes
,
pInfo
->
producerRate
);
char
ctbName
[
64
]
=
{
0
};
char
ctbName
[
128
]
=
{
0
};
sprintf
(
ctbName
,
"%s.ctb%d"
,
g_stConfInfo
.
dbName
,
pInfo
->
consumerId
);
int64_t
lastPrintTime
=
taosGetTimestampUs
();
...
...
utils/tsim/src/simExe.c
浏览文件 @
30b60002
...
...
@@ -292,7 +292,7 @@ int32_t simExecuteExpression(SScript *script, char *exp) {
sprintf
(
t3
,
"%"
PRId64
,
t1l
/
t2l
);
}
}
else
if
(
op2
[
0
]
==
'.'
)
{
s
printf
(
t3
,
"%s%s"
,
t1
,
t2
);
s
nprintf
(
t3
,
sizeof
(
t3
)
,
"%s%s"
,
t1
,
t2
);
}
}
else
{
tstrncpy
(
t3
,
t1
,
sizeof
(
t3
));
...
...
@@ -1040,4 +1040,4 @@ bool simExecuteLineInsertErrorCmd(SScript *script, char *rest) {
return
true
;
}
}
#endif
\ No newline at end of file
#endif
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录