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

more code

This commit is contained in:
Hongze Cheng 2024-03-06 15:52:34 +08:00
parent dfd725fbdb
commit 5ed903dd01
3 changed files with 12 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/common/tdataformat.h
View File

@ -349,7 +349,6 @@ int32_t tCompressData(void *input, // input
SBuffer *buffer // assistant buffer provided by caller, can be NULL SBuffer *buffer // assistant buffer provided by caller, can be NULL
); );
int32_t tDecompressData(void *input, // input int32_t tDecompressData(void *input, // input
int32_t inputSize, // input size
const SCompressInfo *info, // compress info const SCompressInfo *info, // compress info
void *output, // output void *output, // output
int32_t outputSize, // output size int32_t outputSize, // output size

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

@ -2717,7 +2717,7 @@ int32_t tColDataDecompress(void *input, int32_t inputSize, SColDataCompressInfo
return code; return code;
} }
code = tDecompressData(inputStart, cinfo.compressedSize, &cinfo, colData->pBitMap, cinfo.originalSize, assist); code = tDecompressData(inputStart, &cinfo, colData->pBitMap, cinfo.originalSize, assist);
if (code) { if (code) {
tBufferDestroy(&local); tBufferDestroy(&local);
return code; return code;
@ -2745,7 +2745,7 @@ int32_t tColDataDecompress(void *input, int32_t inputSize, SColDataCompressInfo
return code; return code;
} }
code = tDecompressData(inputStart, cinfo.compressedSize, &cinfo, colData->aOffset, cinfo.originalSize, assist); code = tDecompressData(inputStart, &cinfo, colData->aOffset, cinfo.originalSize, assist);
if (code) { if (code) {
tBufferDestroy(&local); tBufferDestroy(&local);
return code; return code;
@ -2771,7 +2771,7 @@ int32_t tColDataDecompress(void *input, int32_t inputSize, SColDataCompressInfo
return code; return code;
} }
code = tDecompressData(inputStart, cinfo.compressedSize, &cinfo, colData->pData, cinfo.originalSize, assist); code = tDecompressData(inputStart, &cinfo, colData->pData, cinfo.originalSize, assist);
if (code) { if (code) {
tBufferDestroy(&local); tBufferDestroy(&local);
return code; return code;
@ -4105,7 +4105,7 @@ int32_t tValueColumnDecompress(void *input, int32_t inputSize, const SValueColum
return code; return code;
} }
code = tDecompressData(inputStart, cinfo.compressedSize, &cinfo, valCol->offsets.data, cinfo.originalSize, buffer); code = tDecompressData(inputStart, &cinfo, valCol->offsets.data, cinfo.originalSize, buffer);
if (code) { if (code) {
tBufferDestroy(&local); tBufferDestroy(&local);
return code; return code;
@ -4130,7 +4130,7 @@ int32_t tValueColumnDecompress(void *input, int32_t inputSize, const SValueColum
return code; return code;
} }
code = tDecompressData(inputStart, cinfo.compressedSize, &cinfo, valCol->data.data, cinfo.originalSize, buffer); code = tDecompressData(inputStart, &cinfo, valCol->data.data, cinfo.originalSize, buffer);
if (code) { if (code) {
tBufferDestroy(&local); tBufferDestroy(&local);
return code; return code;
@ -4236,7 +4236,6 @@ int32_t tCompressData(void *input, // input
} }
int32_t tDecompressData(void *input, // input int32_t tDecompressData(void *input, // input
int32_t inputSize, // input size
const SCompressInfo *info, // compress info const SCompressInfo *info, // compress info
void *output, // output void *output, // output
int32_t outputSize, // output size int32_t outputSize, // output size
@ -4247,8 +4246,8 @@ int32_t tDecompressData(void *input, // input
ASSERT(outputSize >= info->originalSize); ASSERT(outputSize >= info->originalSize);
if (info->cmprAlg == NO_COMPRESSION) { if (info->cmprAlg == NO_COMPRESSION) {
ASSERT(inputSize == info->originalSize); ASSERT(info->compressedSize == info->originalSize);
memcpy(output, input, inputSize); memcpy(output, input, info->compressedSize);
} else { } else {
SBuffer local; SBuffer local;
@ -4267,7 +4266,7 @@ int32_t tDecompressData(void *input, // input
int32_t decompressedSize = tDataTypes[info->dataType].decompFunc( int32_t decompressedSize = tDataTypes[info->dataType].decompFunc(
input, // input input, // input
inputSize, // inputSize info->compressedSize, // inputSize
info->originalSize / tDataTypes[info->dataType].bytes, // number of elements info->originalSize / tDataTypes[info->dataType].bytes, // number of elements
output, // output output, // output
outputSize, // output size outputSize, // output size
@ -4306,8 +4305,7 @@ int32_t tDecompressDataToBuffer(void *input, SCompressInfo *info, SBuffer *outpu
code = tBufferEnsureCapacity(output, output->size + info->originalSize); code = tBufferEnsureCapacity(output, output->size + info->originalSize);
if (code) return code; if (code) return code;
code = tDecompressData(input, info->compressedSize, info, tBufferGetDataEnd(output), output->capacity - output->size, code = tDecompressData(input, info, tBufferGetDataEnd(output), output->capacity - output->size, assist);
assist);
if (code) return code; if (code) return code;
output->size += info->originalSize; output->size += info->originalSize;

6
source/dnode/vnode/src/tsdb/tsdbUtil.c
View File

@ -1587,7 +1587,7 @@ int32_t tBlockDataDecompressKeyPart(const SDiskDataHdr *hdr, SBufferReader *br,
code = tRealloc((uint8_t **)&blockData->aUid, cinfo.originalSize); code = tRealloc((uint8_t **)&blockData->aUid, cinfo.originalSize);
TSDB_CHECK_CODE(code, lino, _exit); TSDB_CHECK_CODE(code, lino, _exit);
code = tDecompressData(BR_PTR(br), cinfo.compressedSize, &cinfo, blockData->aUid, cinfo.originalSize, assist); code = tDecompressData(BR_PTR(br), &cinfo, blockData->aUid, cinfo.originalSize, assist);
TSDB_CHECK_CODE(code, lino, _exit); TSDB_CHECK_CODE(code, lino, _exit);
br->offset += cinfo.compressedSize; br->offset += cinfo.compressedSize;
} }
@ -1601,7 +1601,7 @@ int32_t tBlockDataDecompressKeyPart(const SDiskDataHdr *hdr, SBufferReader *br,
}; };
code = tRealloc((uint8_t **)&blockData->aVersion, cinfo.originalSize); code = tRealloc((uint8_t **)&blockData->aVersion, cinfo.originalSize);
TSDB_CHECK_CODE(code, lino, _exit); TSDB_CHECK_CODE(code, lino, _exit);
code = tDecompressData(BR_PTR(br), cinfo.compressedSize, &cinfo, blockData->aVersion, cinfo.originalSize, assist); code = tDecompressData(BR_PTR(br), &cinfo, blockData->aVersion, cinfo.originalSize, assist);
TSDB_CHECK_CODE(code, lino, _exit); TSDB_CHECK_CODE(code, lino, _exit);
br->offset += cinfo.compressedSize; br->offset += cinfo.compressedSize;
@ -1614,7 +1614,7 @@ int32_t tBlockDataDecompressKeyPart(const SDiskDataHdr *hdr, SBufferReader *br,
}; };
code = tRealloc((uint8_t **)&blockData->aTSKEY, cinfo.originalSize); code = tRealloc((uint8_t **)&blockData->aTSKEY, cinfo.originalSize);
TSDB_CHECK_CODE(code, lino, _exit); TSDB_CHECK_CODE(code, lino, _exit);
code = tDecompressData(BR_PTR(br), cinfo.compressedSize, &cinfo, blockData->aTSKEY, cinfo.originalSize, assist); code = tDecompressData(BR_PTR(br), &cinfo, blockData->aTSKEY, cinfo.originalSize, assist);
TSDB_CHECK_CODE(code, lino, _exit); TSDB_CHECK_CODE(code, lino, _exit);
br->offset += cinfo.compressedSize; br->offset += cinfo.compressedSize;