thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-09-20 08:40:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove some debug output

Browse Source
This commit is contained in:
alesapin 2018-12-18 17:41:58 +03:00
parent 3d0da644f1
commit 314fbbd71f
2 changed files with 0 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
dbms/src/Compression/CompressionCodecMultiple.cpp
View File

@ -59,41 +59,21 @@ size_t CompressionCodecMultiple::compress(char * source, size_t source_size, cha
dest[0] = static_cast<char>(getMethodByte());
dest[1] = static_cast<char>(codecs.size());
//std::cerr << "(compress) codecs size:" << codecs.size() << std::endl;
//std::cerr << "(compress) desc:" << codec_desc << std::endl;
//std::cerr << "(compress) SOURCE WRITE:\n";
//for (size_t i = 0 ; i < source_size; ++i) {
// std::cerr << std::hex << +source[i] << std::endl;
//}
//std::cerr << "(compress) UNCOMPRESSED BUF:\n";
//for(size_t i = 0; i < source_size; ++i)
// std::cerr << std::hex << +uncompressed_buf[i] << " ";
//std::cerr << std::dec << std::endl;
size_t codecs_byte_pos = 2;
for (size_t idx = 0; idx < codecs.size(); ++idx, ++codecs_byte_pos)
{
const auto codec = codecs[idx];
dest[codecs_byte_pos] = codec->getMethodByte();
//String name;
//codec->getCodecDesc(name);
//std::cerr << std::hex << "(compress) Compression method byte:" << +codec->getMethodByte() << " name:" << name << std::endl;
compressed_buf.resize(header_for_size_store + codec->getCompressedReserveSize(source_size));
size_t size_compressed = header_for_size_store;
size_compressed += codec->compress(&uncompressed_buf[0], source_size, &compressed_buf[header_for_size_store]);
UInt32 compressed_size_32 = size_compressed;
UInt32 uncompressed_size_32 = source_size;
//std::cerr << std::dec << "(compress) Compressed size:" << compressed_size_32 << std::endl;
//std::cerr << std::dec << "(compress) Uncompressed size:" << uncompressed_size_32 << std::endl;
unalignedStore(&compressed_buf[0], compressed_size_32);
unalignedStore(&compressed_buf[4], uncompressed_size_32);
//std::cerr << "(compress) COMPRESSED BUF:\n";
//for(size_t i = 0; i < size_compressed; ++i)
// std::cerr << std::hex << +compressed_buf[i] << " ";
//std::cerr << std::dec << std::endl;
uncompressed_buf.swap(compressed_buf);
source_size = size_compressed;
@ -101,12 +81,6 @@ size_t CompressionCodecMultiple::compress(char * source, size_t source_size, cha
memcpy(&dest[2 + codecs.size()], &uncompressed_buf[0], source_size);
//std::cerr << std::dec;
//std::cerr << "(compress) WRITING BUF:" << 2 + codecs.size() + source_size << std::endl;
//for(size_t i = 0; i < 2 + codecs.size() + source_size; ++i)
// std::cerr << std::hex << +dest[i] << " ";
//std::cerr << std::endl;
return 2 + codecs.size() + source_size;
}
@ -120,16 +94,6 @@ size_t CompressionCodecMultiple::decompress(char * source, size_t source_size, c
ErrorCodes::UNKNOWN_CODEC);
UInt8 compression_methods_size = source[1];
//std::cerr << std::dec;
//std::cerr << "(decompress) Source size:" << source_size << std::endl;
//std::cerr << "(decompress) decompressed size:" << decompressed_size << std::endl;
//std::cerr << "(decompress) Methods size:" << +compression_methods_size << std::endl;
//std::cerr << "READING BUF:" << std::dec << source_size << std::endl;
//for(size_t i = 0; i < source_size; ++i)
// std::cerr << std::hex << +source[i] << " ";
//std::cerr << std::endl;
PODArray<char> compressed_buf;
PODArray<char> uncompressed_buf;
/// Insert all data into compressed buf
@ -139,31 +103,14 @@ size_t CompressionCodecMultiple::decompress(char * source, size_t source_size, c
{
UInt8 compression_method = source[idx + 2];
const auto codec = CompressionCodecFactory::instance().get(compression_method);
//String name;
//codec->getCodecDesc(name);
//std::cerr << std::hex << "(decompress) Compression method byte:" << +compression_method << " name:" << name << std::endl;
UInt32 compressed_size = unalignedLoad<UInt32>(&compressed_buf[0]);
UInt32 uncompressed_size = unalignedLoad<UInt32>(&compressed_buf[4]);
if (idx == 0 && uncompressed_size != decompressed_size)
throw Exception("Wrong final decompressed size in codec Multiple, got " + toString(uncompressed_size) + ", expected " + toString(decompressed_size), ErrorCodes::CORRUPTED_DATA);
uncompressed_buf.resize(uncompressed_size);
//std::cerr << std::dec << "(decompress) expected compressed size:" << compressed_size << std::endl;
//std::cerr << std::dec << "(decompress) expected uncompressed size:" << uncompressed_size << std::endl;
//std::cerr << "COMPRESSED BUF:\n";
//for(size_t i = 0; i < compressed_size; ++i)
// std::cerr<< std::hex << +compressed_buf[i] << " ";
//std::cerr << std::dec << std::endl;
codec->decompress(&compressed_buf[header_for_size_store], compressed_size - header_for_size_store, &uncompressed_buf[0], uncompressed_size);
//std::cerr << "FINAL UNCOMPRESSED:\n";
//for (size_t i = 0; i < uncompressed_size; ++i) {
// std::cerr << std::hex << +uncompressed_buf[i] << std::endl;
//}
uncompressed_buf.swap(compressed_buf);
}
//std::cerr << "FINISHED\n";
memcpy(dest, compressed_buf.data(), decompressed_size);
return decompressed_size;

1
dbms/tests/queries/0_stateless/00804_test_custom_compression_codecs.sql
View File

@ -33,7 +33,6 @@ DROP TABLE IF EXISTS test.params_when_no_params;
DROP TABLE IF EXISTS test.too_many_params;
DROP TABLE IF EXISTS test.codec_multiple_direct_specification;
DROP TABLE IF EXISTS test.compression_codec_multiple;
CREATE TABLE test.compression_codec_multiple (