Skip to content

Commit ddddf0c

Browse files
authored
Revert "Add SZ3 compression codec"
1 parent d8c0b0e commit ddddf0c

36 files changed

Lines changed: 78 additions & 860 deletions

.gitmodules

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -357,9 +357,6 @@
357357
[submodule "contrib/mongo-c-driver"]
358358
path = contrib/mongo-c-driver
359359
url = https://github.com/ClickHouse/mongo-c-driver.git
360-
[submodule "contrib/sz3"]
361-
path = contrib/sz3
362-
url = https://github.com/ClickHouse/SZ3.git
363360
[submodule "contrib/numactl"]
364361
path = contrib/numactl
365362
url = https://github.com/ClickHouse/numactl.git

ci/jobs/scripts/check_style/aspell-ignore/en/aspell-dict.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -584,7 +584,6 @@ LogsLevel
584584
Logstash
585585
LookML
586586
LoongArch
587-
Lossy
588587
LowCardinality
589588
LpDistance
590589
LpNorm
@@ -2215,7 +2214,6 @@ loghouse
22152214
london
22162215
lookups
22172216
loongarch
2218-
lossy
22192217
lowCardinalityIndices
22202218
lowCardinalityKeys
22212219
lowcardinality

contrib/CMakeLists.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -250,8 +250,6 @@ add_contrib (sha3iuf-cmake SHA3IUF)
250250

251251
add_contrib (bech32)
252252

253-
add_contrib (sz3-cmake sz3)
254-
255253
# Put all targets defined here and in subdirectories under "contrib/<immediate-subdir>" folders in GUI-based IDEs.
256254
# Some of third-party projects may override CMAKE_FOLDER or FOLDER property of their targets, so they would not appear
257255
# in "contrib/..." as originally planned, so we workaround this by fixing FOLDER properties of all targets manually,

contrib/sz3

Lines changed: 0 additions & 1 deletion
This file was deleted.

contrib/sz3-cmake/CMakeLists.txt

Lines changed: 0 additions & 23 deletions
This file was deleted.

contrib/sz3-cmake/SZ3/version.hpp

Lines changed: 0 additions & 36 deletions
This file was deleted.

docs/en/sql-reference/statements/create/table.md

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -465,10 +465,6 @@ These codecs are designed to make compression more effective by exploiting speci
465465

466466
`FPC(level, float_size)` - Repeatedly predicts the next floating point value in the sequence using the better of two predictors, then XORs the actual with the predicted value, and leading-zero compresses the result. Similar to Gorilla, this is efficient when storing a series of floating point values that change slowly. For 64-bit values (double), FPC is faster than Gorilla, for 32-bit values your mileage may vary. Possible `level` values: 1-28, the default value is 12. Possible `float_size` values: 4, 8, the default value is `sizeof(type)` if type is Float. In all other cases, it's 4. For a detailed description of the algorithm see [High Throughput Compression of Double-Precision Floating-Point Data](https://userweb.cs.txstate.edu/~burtscher/papers/dcc07a.pdf).
467467

468-
#### SZ3 {#sz3}
469-
470-
`SZ3` or `SZ3(algorithm, error_bound_mode, error_bound)` - A lossy but error-bound codec ([SZ3 Lossy Compressor](https://szcompressor.org/)) for columns of type Float32, Float64, Array(Float32), or Array(Float64). If the column type is of array type, then all inserted arrays must have the same length. Supported values for 'algorithm' are `ALGO_LORENZO_REG`, `ALGO_INTERP_LORENZO` and `ALGO_INTERP`. Supported values for 'error_bound_mode' are `ABS`, `REL`, `PSNR` and `ABS_AND_REL`. Argument 'error_bound' is the maximum error and of type Float64.
471-
472468
#### T64 {#t64}
473469

474470
`T64` — Compression approach that crops unused high bits of values in integer data types (including `Enum`, `Date` and `DateTime`). At each step of its algorithm, codec takes a block of 64 values, puts them into 64x64 bit matrix, transposes it, crops the unused bits of values and returns the rest as a sequence. Unused bits are the bits, that do not differ between maximum and minimum values in the whole data part for which the compression is used.

src/CMakeLists.txt

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -111,10 +111,6 @@ list (REMOVE_ITEM clickhouse_common_io_sources Common/malloc.cpp Common/new_dele
111111
add_headers_and_sources(clickhouse_compression Compression)
112112
add_library(clickhouse_compression ${clickhouse_compression_headers} ${clickhouse_compression_sources})
113113

114-
if (TARGET ch_contrib::sz3)
115-
target_link_libraries (clickhouse_compression PUBLIC ch_contrib::sz3)
116-
endif()
117-
118114
add_headers_and_sources(dbms Disks/IO)
119115
add_headers_and_sources(dbms Disks/ObjectStorages)
120116
if (TARGET ch_contrib::sqlite)

src/Common/config.h.in

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,6 @@
5656
#cmakedefine01 USE_SQLITE
5757
#cmakedefine01 USE_NURAFT
5858
#cmakedefine01 USE_KRB5
59-
#cmakedefine01 USE_SZ3
6059
#cmakedefine01 USE_FILELOG
6160
#cmakedefine01 USE_BLAKE3
6261
#cmakedefine01 USE_USEARCH

src/Compression/CompressionCodecDeflateQpl.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ class CompressionCodecDeflateQpl final : public ICompressionCodec
110110
bool isGenericCompression() const override { return true; }
111111
bool isDeflateQpl() const override { return true; }
112112

113-
String getDescription() const override
113+
std::string getDescription() const override
114114
{
115115
return "Requires hardware support for Intel’s QuickAssist Technology for DEFLATE compression; enhanced performance for specific hardware.";
116116
}

0 commit comments

Comments
 (0)