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

remove some compile warnings

This commit is contained in:
slguan 2019-08-01 11:34:50 +08:00
parent b0971e8f0e
commit b37a95fc53
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
deps/pthread/op.lnk vendored
View File

Binary file not shown.

4
src/system/src/vnodeImport.c
View File

@ -131,7 +131,7 @@ int vnodeCloseFileForImport(SMeterObj *pObj, SHeadInfo *pHinfo) {
lseek(pVnode->nfd, pHinfo->compInfoOffset, SEEK_SET); lseek(pVnode->nfd, pHinfo->compInfoOffset, SEEK_SET);
write(pVnode->nfd, &pHinfo->compInfo, sizeof(SCompInfo)); write(pVnode->nfd, &pHinfo->compInfo, sizeof(SCompInfo));
chksum = taosCalcChecksum(0, buffer, size); chksum = taosCalcChecksum(0, (uint8_t *)buffer, size);
lseek(pVnode->nfd, pHinfo->compInfoOffset + sizeof(SCompInfo) + size, SEEK_SET); lseek(pVnode->nfd, pHinfo->compInfoOffset + sizeof(SCompInfo) + size, SEEK_SET);
write(pVnode->nfd, &chksum, sizeof(TSCKSUM)); write(pVnode->nfd, &chksum, sizeof(TSCKSUM));
free(buffer); free(buffer);
@ -395,7 +395,7 @@ int vnodeImportToFile(SImportInfo *pImport) {
if (*((TSKEY *)payload) > pVnode->commitLastKey) break; if (*((TSKEY *)payload) > pVnode->commitLastKey) break;
for (col = 0; col < pObj->numOfColumns; ++col) { for (col = 0; col < pObj->numOfColumns; ++col) {
memcpy(offset[col], payload, pObj->schema[col].bytes); memcpy((void *)offset[col], payload, pObj->schema[col].bytes);
payload += pObj->schema[col].bytes; payload += pObj->schema[col].bytes;
offset[col] += pObj->schema[col].bytes; offset[col] += pObj->schema[col].bytes;
} }