refactor: do some internal refactor.
This commit is contained in:
parent
d7e1f37cd4
commit
f8d8061260
|
@ -184,8 +184,8 @@ int32_t uploadRsync(const char* id, const char* path) {
|
|||
|
||||
int32_t code = execCommand(command);
|
||||
if (code != 0) {
|
||||
uError("[rsync] s-task:%s upload checkpoint data in:%s to %s failed, code:%d", id, path, tsSnodeAddress,
|
||||
ERRNO_ERR_FORMAT, code, ERRNO_ERR_DATA);
|
||||
uError("[rsync] s-task:%s upload checkpoint data in %s to %s failed, code:%d," ERRNO_ERR_FORMAT, id, path,
|
||||
tsSnodeAddress, code, ERRNO_ERR_DATA);
|
||||
return -1;
|
||||
}
|
||||
|
||||
|
|
|
@ -1320,6 +1320,7 @@ int32_t tRowKeyAssign(SRowKey *pDst, SRowKey *pSrc) {
|
|||
pVal->val = pSrc->pks[i].val;
|
||||
} else {
|
||||
pVal->nData = pSrc->pks[i].nData;
|
||||
ASSERT(pSrc->pks[i].pData != NULL);
|
||||
memcpy(pVal->pData, pSrc->pks[i].pData, pVal->nData);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -194,6 +194,7 @@ static void tRowGetKeyFromColData(int64_t ts, SColumnInfoData* pPkCol, int32_t r
|
|||
}
|
||||
}
|
||||
|
||||
// only the timestamp is needed to complete the duplicated timestamp check.
|
||||
static bool checkDuplicateTimestamps(STimeSliceOperatorInfo* pSliceInfo, SColumnInfoData* pTsCol,
|
||||
SColumnInfoData* pPkCol, int32_t curIndex, int32_t rows) {
|
||||
int64_t currentTs = *(int64_t*)colDataGetData(pTsCol, curIndex);
|
||||
|
|
|
@ -539,7 +539,7 @@ int32_t rebuildDirFormCheckpoint(const char* path, char* key, int64_t chkptId, c
|
|||
taosMulMkDir(defaultPath);
|
||||
}
|
||||
|
||||
stDebug("prepare local dir:%s, checkpointId:%d, key:%s succ", defaultPath, chkptId, key);
|
||||
stDebug("prepare local dir:%s, checkpointId:%" PRId64 ", key:%s succ", defaultPath, chkptId, key);
|
||||
|
||||
char* chkptPath = taosMemoryCalloc(1, strlen(path) + 256);
|
||||
if (chkptId != 0) {
|
||||
|
|
Loading…
Reference in New Issue