thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-17 13:13:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix encoding/decoding

Browse Source
This commit is contained in:
Nikolay Degterinsky 2021-08-19 11:10:56 +03:00
parent 6ee6fb2ef2
commit 7a5c5b4208
2 changed files with 18 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/IO/Lz4DeflatingWriteBuffer.cpp
View File

@ -12,7 +12,12 @@ namespace ErrorCodes
Lz4DeflatingWriteBuffer::Lz4DeflatingWriteBuffer(
std::unique_ptr<WriteBuffer> out_, int /*compression_level*/, size_t buf_size, char * existing_memory, size_t alignment)
: BufferWithOwnMemory<WriteBuffer>(buf_size, existing_memory, alignment), out(std::move(out_))
: BufferWithOwnMemory<WriteBuffer>(buf_size, existing_memory, alignment)
, out(std::move(out_))
, in_chunk_size(0)
, out_capacity(0)
, count_in(0)
, count_out(0)
{
count_in = 0;
kPrefs = {
@ -146,7 +151,7 @@ void Lz4DeflatingWriteBuffer::finishImpl()
ErrorCodes::LZ4_ENCODER_FAILED);
}
count_out += end_size;
out->position() = out->buffer().end() - count_out;
out->position() = out->buffer().begin() + count_out;
}
}

30
src/IO/Lz4InflatingReadBuffer.cpp
View File

@ -8,7 +8,11 @@ namespace ErrorCodes
}
Lz4InflatingReadBuffer::Lz4InflatingReadBuffer(std::unique_ptr<ReadBuffer> in_, size_t buf_size, char * existing_memory, size_t alignment)
: BufferWithOwnMemory<ReadBuffer>(buf_size, existing_memory, alignment), in(std::move(in_))
: BufferWithOwnMemory<ReadBuffer>(buf_size, existing_memory, alignment)
, in(std::move(in_))
, src_capacity(0)
, dst_capacity(0)
, in_available(0)
{
ret = 1;
@ -44,24 +48,11 @@ bool Lz4InflatingReadBuffer::nextImpl()
}
src_capacity = internal_buffer.size();
src_capacity = in_available;
dst_capacity = internal_buffer.size();
dst = reinterpret_cast<void *>(internal_buffer.begin());
LZ4F_frameInfo_t info;
size_t consumed_size = src_capacity;
{ size_t const frame_info_res = LZ4F_getFrameInfo(dctx, &info, &src, &consumed_size);
if (LZ4F_isError(frame_info_res)) {
throw Exception(
ErrorCodes::LZ4_DECODER_FAILED,
"LZ4 failed to fetch get info LZ4F_getFrameInfo. LZ4F version: {}. Error: {}",
LZ4F_VERSION,
LZ4F_getErrorName(frame_info_res),
ErrorCodes::LZ4_DECODER_FAILED);
}
}
ret = LZ4F_decompress(dctx, dst, &dst_capacity, &src, &src_capacity, /* LZ4F_decompressOptions_t */ nullptr);
ret = LZ4F_decompress(dctx, dst, &dst_capacity, src, &src_capacity, /* LZ4F_decompressOptions_t */ nullptr);
if (LZ4F_isError(ret)) {
printf("Decompression error: %s\n", LZ4F_getErrorName(ret));
throw Exception(
@ -72,9 +63,10 @@ bool Lz4InflatingReadBuffer::nextImpl()
ErrorCodes::LZ4_DECODER_FAILED);
}
in->position() = in->buffer().end() - in_available;
working_buffer.resize(internal_buffer.size() - src_capacity);
in->position() = in->buffer().begin() + src_capacity;
working_buffer.resize(dst_capacity);
in_available -= src_capacity;
if (in->eof())
{