Skip to content

Commit

Permalink
fix compile error
Browse files Browse the repository at this point in the history
  • Loading branch information
1261385937 committed Apr 20, 2024
1 parent 82c59a3 commit 3a3fedf
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 26 deletions.
22 changes: 1 addition & 21 deletions .github/workflows/linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,36 +23,16 @@ jobs:
fail-fast: false
matrix:
os: [ubuntu-20.04]
compiler: [clang-6, clang-10-libc++, gcc-7, gcc-8, gcc-9]
compiler: [clang-10-libc++]
ssl: [ssl_ON, ssl_OFF]
dependencies: [dependencies_BUILT_IN]

include:
- compiler: clang-6
COMPILER_INSTALL: clang-6.0 libc++-dev
C_COMPILER: clang-6.0
CXX_COMPILER: clang++-6.0

- compiler: clang-10-libc++
COMPILER_INSTALL: clang-10 libc++-dev
C_COMPILER: clang-10
CXX_COMPILER: clang++-10

- compiler: gcc-7
COMPILER_INSTALL: gcc-7 g++-7
C_COMPILER: gcc-7
CXX_COMPILER: g++-7

- compiler: gcc-8
COMPILER_INSTALL: gcc-8 g++-8
C_COMPILER: gcc-8
CXX_COMPILER: g++-8

- compiler: gcc-9
COMPILER_INSTALL: gcc-9 g++-9
C_COMPILER: gcc-9
CXX_COMPILER: g++-9

- ssl: ssl_ON
SSL_CMAKE_OPTION: -D WITH_OPENSSL=ON

Expand Down
4 changes: 0 additions & 4 deletions clickhouse/base/compressed.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,7 @@ CompressedInput::CompressedInput(InputStream* input)

CompressedInput::~CompressedInput() {
if (!mem_.Exhausted()) {
#if __cplusplus < 201703L
if (!std::uncaught_exception()) {
#else
if (!std::uncaught_exceptions()) {
#endif
throw LZ4Error("some data was not read");
}
}
Expand Down
3 changes: 2 additions & 1 deletion clickhouse/columns/lowcardinality.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -346,7 +346,8 @@ void ColumnLowCardinality::SavePrefix(OutputStream* output) {
}

void ColumnLowCardinality::SaveBody(OutputStream* output) {
const uint64_t index_serialization_type = indexTypeFromIndexColumn(*index_column_) | IndexFlag::HasAdditionalKeysBit;
const uint64_t index_serialization_type = static_cast<uint64_t>(indexTypeFromIndexColumn(*index_column_))
| static_cast<uint64_t>(IndexFlag::HasAdditionalKeysBit);
WireFormat::WriteFixed(*output, index_serialization_type);

const uint64_t number_of_keys = dictionary_column_->Size();
Expand Down

0 comments on commit 3a3fedf

Please sign in to comment.