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

Revert changes in compressor tool, because everything is already available in --codec argument

Browse Source
This commit is contained in:
Alexey Milovidov 2021-05-23 03:12:50 +03:00
parent de69a9f3af
commit 7afc052a11
1 changed files with 1 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
programs/compressor/Compressor.cpp
View File

@ -23,6 +23,7 @@
#include <sys/times.h>
#include <sys/time.h>
namespace DB
{
namespace ErrorCodes
@ -80,11 +81,6 @@ int mainEntryClickHouseCompressor(int argc, char ** argv)
("block-size,b", po::value<unsigned>()->default_value(DBMS_DEFAULT_BUFFER_SIZE), "compress in blocks of specified size")
("hc", "use LZ4HC instead of LZ4")
("zstd", "use ZSTD instead of LZ4")
("lizard", "use Lizard instread of LZ4")
("lzsse2", "use lzsse2 instread of LZ4")
("lzsse4", "use lzsse4 instread of LZ4")
("lzsse8", "use lzsse8 instread of LZ4")
("density", "use Density instread of LZ4")
("param", po::value<std::string>(), "extra params for compresion algorithm")
("codec", po::value<std::vector<std::string>>()->multitoken(), "use codecs combination instead of LZ4")
("level", po::value<int>(), "compression level for codecs specified via flags")
@ -112,11 +108,6 @@ int mainEntryClickHouseCompressor(int argc, char ** argv)
bool decompress = options.count("decompress");
bool use_lz4hc = options.count("hc");
bool use_zstd = options.count("zstd");
bool use_lizard = options.count("lizard");
bool use_lzsse2 = options.count("lzsse2");
bool use_lzsse4 = options.count("lzsse4");
bool use_lzsse8 = options.count("lzsse8");
bool use_density = options.count("density");
bool stat_mode = options.count("stat");
bool use_none = options.count("none");
unsigned block_size = options["block-size"].as<unsigned>();
@ -124,10 +115,6 @@ int mainEntryClickHouseCompressor(int argc, char ** argv)
if (options.count("codec"))
codecs = options["codec"].as<std::vector<std::string>>();
std::optional<std::string> param;
if (options.count("param"))
param = options["param"].as<std::string>();
if ((use_lz4hc || use_zstd || use_none) && !codecs.empty())
throw Exception("Wrong options, codec flags like --zstd and --codec options are mutually exclusive", ErrorCodes::BAD_ARGUMENTS);
@ -140,16 +127,6 @@ int mainEntryClickHouseCompressor(int argc, char ** argv)
method_family = "LZ4HC";
else if (use_zstd)
method_family = "ZSTD";
else if (use_lizard)
method_family = "Lizard";
else if (use_lzsse2)
method_family = "LZSSE2";
else if (use_lzsse4)
method_family = "LZSSE4";
else if (use_lzsse8)
method_family = "LZSSE8";
else if (use_density)
method_family = "Density";
else if (use_none)
method_family = "NONE";
@ -165,8 +142,6 @@ int mainEntryClickHouseCompressor(int argc, char ** argv)
std::string codecs_line = boost::algorithm::join(codecs, ",");
auto ast = parseQuery(codec_parser, "(" + codecs_line + ")", 0, DBMS_DEFAULT_MAX_PARSER_DEPTH);
codec = CompressionCodecFactory::instance().get(ast, nullptr);
} else if (param.has_value()) {
codec = CompressionCodecFactory::instance().get(method_family, level, param);
}
else
codec = CompressionCodecFactory::instance().get(method_family, level);
@ -185,9 +160,6 @@ int mainEntryClickHouseCompressor(int argc, char ** argv)
else
wb = std::make_unique<WriteBufferFromFileDescriptor>(STDOUT_FILENO);
struct tms tv1, tv2;
times(&tv1);
if (stat_mode)
{
/// Output statistic for compressed file.
@ -218,10 +190,6 @@ int mainEntryClickHouseCompressor(int argc, char ** argv)
CompressedWriteBuffer to(*wb, codec, block_size);
copyData(*rb, to);
}
times(&tv2);
int tics_per_second = sysconf(_SC_CLK_TCK);
std::cerr << static_cast<double>(tv2.tms_utime - tv1.tms_utime) / tics_per_second << std::endl;
}
catch (...)
{