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

fix codestyle

Browse Source
This commit is contained in:
a.palagashvili 2020-11-04 19:39:26 +03:00
parent 53a064b6e3
commit 87cc3546ca
1 changed files with 30 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
src/IO/LzmaReadBuffer.cpp
View File

@ -1,10 +1,12 @@
#include <IO/LzmaReadBuffer.h> #include <IO/LzmaReadBuffer.h>
namespace DB { namespace DB
namespace ErrorCodes { {
namespace ErrorCodes
{
extern const int LZMA_STREAM_DECODER_FAILED; extern const int LZMA_STREAM_DECODER_FAILED;
} }
LzmaReadBuffer::LzmaReadBuffer(std::unique_ptr<ReadBuffer> in_, size_t buf_size, char* existing_memory, size_t alignment) LzmaReadBuffer::LzmaReadBuffer(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_)), eof(false) : BufferWithOwnMemory<ReadBuffer>(buf_size, existing_memory, alignment), in(std::move(in_)), eof(false)
{ {
lstr = LZMA_STREAM_INIT; lstr = LZMA_STREAM_INIT;
@ -20,9 +22,10 @@ LzmaReadBuffer::LzmaReadBuffer(std::unique_ptr<ReadBuffer> in_, size_t buf_size,
lzma_ret ret = lzma_stream_decoder(&lstr, memlimit, LZMA_CONCATENATED); lzma_ret ret = lzma_stream_decoder(&lstr, memlimit, LZMA_CONCATENATED);
// lzma does not provide api for converting error code to string unlike zlib // lzma does not provide api for converting error code to string unlike zlib
if (ret != LZMA_OK) if (ret != LZMA_OK)
throw Exception(std::string("lzma_stream_decoder initialization failed: error code: ") + std::to_string(ret) + "; lzma version: " throw Exception(
+ LZMA_VERSION_STRING, std::string("lzma_stream_decoder initialization failed: error code: ") + std::to_string(ret)
ErrorCodes::LZMA_STREAM_DECODER_FAILED); + "; lzma version: " + LZMA_VERSION_STRING,
ErrorCodes::LZMA_STREAM_DECODER_FAILED);
} }
LzmaReadBuffer::~LzmaReadBuffer() LzmaReadBuffer::~LzmaReadBuffer()
@ -35,12 +38,13 @@ bool LzmaReadBuffer::nextImpl()
if (eof) if (eof)
return false; return false;
if (!lstr.avail_in) { if (!lstr.avail_in)
{
in->nextIfAtEnd(); in->nextIfAtEnd();
lstr.next_in = reinterpret_cast<unsigned char*>(in->position()); lstr.next_in = reinterpret_cast<unsigned char *>(in->position());
lstr.avail_in = in->buffer().end() - in->position(); lstr.avail_in = in->buffer().end() - in->position();
} }
lstr.next_out = reinterpret_cast<unsigned char*>(internal_buffer.begin()); lstr.next_out = reinterpret_cast<unsigned char *>(internal_buffer.begin());
lstr.avail_out = internal_buffer.size(); lstr.avail_out = internal_buffer.size();
lzma_ret ret = lzma_code(&lstr, LZMA_RUN); lzma_ret ret = lzma_code(&lstr, LZMA_RUN);
@ -48,23 +52,29 @@ bool LzmaReadBuffer::nextImpl()
in->position() = in->buffer().end() - lstr.avail_in; in->position() = in->buffer().end() - lstr.avail_in;
working_buffer.resize(internal_buffer.size() - lstr.avail_out); working_buffer.resize(internal_buffer.size() - lstr.avail_out);
if (ret == LZMA_STREAM_END) { if (ret == LZMA_STREAM_END)
if (in->eof()) { {
if (in->eof())
{
eof = true; eof = true;
return working_buffer.size() != 0; return working_buffer.size() != 0;
} else { }
throw Exception(ErrorCodes::LZMA_STREAM_DECODER_FAILED, else
"lzma decoder finished, but stream is still alive: error code: {}; lzma version: {}", {
ret, throw Exception(
LZMA_VERSION_STRING); ErrorCodes::LZMA_STREAM_DECODER_FAILED,
"lzma decoder finished, but stream is still alive: error code: {}; lzma version: {}",
ret,
LZMA_VERSION_STRING);
} }
} }
if (ret != LZMA_OK) if (ret != LZMA_OK)
throw Exception(ErrorCodes::LZMA_STREAM_DECODER_FAILED, throw Exception(
"lzma_stream_decoder failed: error code: error codeL {}; lzma version: {}", ErrorCodes::LZMA_STREAM_DECODER_FAILED,
ret, "lzma_stream_decoder failed: error code: error codeL {}; lzma version: {}",
LZMA_VERSION_STRING); ret,
LZMA_VERSION_STRING);
return true; return true;
} }