xxq250
/
homework-jianmu
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

refactor: do some internal refactor.

This commit is contained in:
Haojun Liao 2024-05-11 11:08:51 +08:00
parent d7e1f37cd4
commit f8d8061260
4 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source/common/src/rsync.c
View File

@ -184,8 +184,8 @@ int32_t uploadRsync(const char* id, const char* path) {
int32_t code = execCommand(command); int32_t code = execCommand(command);
if (code != 0) { if (code != 0) {
uError("[rsync] s-task:%s upload checkpoint data in:%s to %s failed, code:%d", id, path, tsSnodeAddress, uError("[rsync] s-task:%s upload checkpoint data in %s to %s failed, code:%d," ERRNO_ERR_FORMAT, id, path,
ERRNO_ERR_FORMAT, code, ERRNO_ERR_DATA); tsSnodeAddress, code, ERRNO_ERR_DATA);
return -1; return -1;
} }

1
source/common/src/tdataformat.c
View File

@ -1320,6 +1320,7 @@ int32_t tRowKeyAssign(SRowKey *pDst, SRowKey *pSrc) {
pVal->val = pSrc->pks[i].val; pVal->val = pSrc->pks[i].val;
} else { } else {
pVal->nData = pSrc->pks[i].nData; pVal->nData = pSrc->pks[i].nData;
ASSERT(pSrc->pks[i].pData != NULL);
memcpy(pVal->pData, pSrc->pks[i].pData, pVal->nData); memcpy(pVal->pData, pSrc->pks[i].pData, pVal->nData);
} }
} }

1
source/libs/executor/src/timesliceoperator.c
View File

@ -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, static bool checkDuplicateTimestamps(STimeSliceOperatorInfo* pSliceInfo, SColumnInfoData* pTsCol,
SColumnInfoData* pPkCol, int32_t curIndex, int32_t rows) { SColumnInfoData* pPkCol, int32_t curIndex, int32_t rows) {
int64_t currentTs = *(int64_t*)colDataGetData(pTsCol, curIndex); int64_t currentTs = *(int64_t*)colDataGetData(pTsCol, curIndex);

2
source/libs/stream/src/streamBackendRocksdb.c
View File

@ -539,7 +539,7 @@ int32_t rebuildDirFormCheckpoint(const char* path, char* key, int64_t chkptId, c
taosMulMkDir(defaultPath); 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); char* chkptPath = taosMemoryCalloc(1, strlen(path) + 256);
if (chkptId != 0) { if (chkptId != 0) {