From f7e06cf9acef34fb12df381f6740b10495cf965f Mon Sep 17 00:00:00 2001 From: alesapin Date: Mon, 24 Dec 2018 19:03:22 +0300 Subject: [PATCH] Remove random changes --- dbms/src/Storages/MergeTree/MergeTreeReader.h | 3 +-- .../configs/compression_config.xml | 10 ---------- 2 files changed, 1 insertion(+), 12 deletions(-) delete mode 100644 dbms/tests/integration/test_non_default_compression/configs/compression_config.xml diff --git a/dbms/src/Storages/MergeTree/MergeTreeReader.h b/dbms/src/Storages/MergeTree/MergeTreeReader.h index 00973592c9e..988ca570ddd 100644 --- a/dbms/src/Storages/MergeTree/MergeTreeReader.h +++ b/dbms/src/Storages/MergeTree/MergeTreeReader.h @@ -8,12 +8,12 @@ #include #include -class CachedCompressedReadBuffer; namespace DB { class IDataType; +class CachedCompressedReadBuffer; /// Reads the data between pairs of marks in the same part. When reading consecutive ranges, avoids unnecessary seeks. /// When ranges are almost consecutive, seeks are fast because they are performed inside the buffer. @@ -90,7 +90,6 @@ private: bool save_marks_in_cache; MarkCache::MappedPtr marks; - std::unique_ptr cached_buffer; std::unique_ptr non_cached_buffer; }; diff --git a/dbms/tests/integration/test_non_default_compression/configs/compression_config.xml b/dbms/tests/integration/test_non_default_compression/configs/compression_config.xml deleted file mode 100644 index 71c92738b9c..00000000000 --- a/dbms/tests/integration/test_non_default_compression/configs/compression_config.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - 0 - 0 - - zstd - 2 - -