mirror of
https://github.com/ClickHouse/ClickHouse.git
synced 2024-12-17 20:02:05 +00:00
Build fixes (#4471)
This commit is contained in:
proller
GitHub
parent
ec6984dfe8
commit
00e50f1502
@ -22,6 +22,9 @@ if (ENABLE_EMBEDDED_COMPILER)
|
||||
if (NOT LLVM_FOUND)
|
||||
find_package (LLVM 6 CONFIG PATHS ${LLVM_PATHS})
|
||||
endif ()
|
||||
if (NOT LLVM_FOUND)
|
||||
find_package (LLVM 8 CONFIG PATHS ${LLVM_PATHS})
|
||||
endif ()
|
||||
if (NOT LLVM_FOUND)
|
||||
find_package (LLVM 5 CONFIG PATHS ${LLVM_PATHS})
|
||||
endif ()
|
||||
|
||||
@ -29,15 +29,9 @@
|
||||
# include <common/DateLUTImpl.h>
|
||||
# include <ext/range.h>
|
||||
# include <arrow/api.h>
|
||||
//# include <arrow/buffer.h>
|
||||
//# include <arrow/io/api.h>
|
||||
# include <parquet/arrow/reader.h>
|
||||
//# include <parquet/arrow/writer.h>
|
||||
//# include <parquet/exception.h>
|
||||
# include <parquet/file_reader.h>
|
||||
|
||||
# include <Core/iostream_debug_helpers.h> // REMOVE ME
|
||||
|
||||
namespace DB
|
||||
{
|
||||
namespace ErrorCodes
|
||||
@ -329,7 +323,6 @@ Block ParquetBlockInputStream::readImpl()
|
||||
row_group_total = file_reader->num_row_groups();
|
||||
row_group_current = 0;
|
||||
}
|
||||
//DUMP(row_group_current, row_group_total);
|
||||
if (row_group_current >= row_group_total)
|
||||
return res;
|
||||
|
||||
|
||||
@ -286,16 +286,16 @@ UInt64 ProtobufReader::SimpleReader::readVarint()
|
||||
return result; \
|
||||
} \
|
||||
}
|
||||
PROTOBUF_READER_VARINT_READ_HELPER(0);
|
||||
PROTOBUF_READER_VARINT_READ_HELPER(1);
|
||||
PROTOBUF_READER_VARINT_READ_HELPER(2);
|
||||
PROTOBUF_READER_VARINT_READ_HELPER(3);
|
||||
PROTOBUF_READER_VARINT_READ_HELPER(4);
|
||||
PROTOBUF_READER_VARINT_READ_HELPER(5);
|
||||
PROTOBUF_READER_VARINT_READ_HELPER(6);
|
||||
PROTOBUF_READER_VARINT_READ_HELPER(7);
|
||||
PROTOBUF_READER_VARINT_READ_HELPER(8);
|
||||
PROTOBUF_READER_VARINT_READ_HELPER(9);
|
||||
PROTOBUF_READER_VARINT_READ_HELPER(0)
|
||||
PROTOBUF_READER_VARINT_READ_HELPER(1)
|
||||
PROTOBUF_READER_VARINT_READ_HELPER(2)
|
||||
PROTOBUF_READER_VARINT_READ_HELPER(3)
|
||||
PROTOBUF_READER_VARINT_READ_HELPER(4)
|
||||
PROTOBUF_READER_VARINT_READ_HELPER(5)
|
||||
PROTOBUF_READER_VARINT_READ_HELPER(6)
|
||||
PROTOBUF_READER_VARINT_READ_HELPER(7)
|
||||
PROTOBUF_READER_VARINT_READ_HELPER(8)
|
||||
PROTOBUF_READER_VARINT_READ_HELPER(9)
|
||||
#undef PROTOBUF_READER_VARINT_READ_HELPER
|
||||
|
||||
unknownFormat();
|
||||
@ -324,16 +324,16 @@ void ProtobufReader::SimpleReader::ignoreVarint()
|
||||
return; \
|
||||
} \
|
||||
}
|
||||
PROTOBUF_READER_VARINT_IGNORE_HELPER(0);
|
||||
PROTOBUF_READER_VARINT_IGNORE_HELPER(1);
|
||||
PROTOBUF_READER_VARINT_IGNORE_HELPER(2);
|
||||
PROTOBUF_READER_VARINT_IGNORE_HELPER(3);
|
||||
PROTOBUF_READER_VARINT_IGNORE_HELPER(4);
|
||||
PROTOBUF_READER_VARINT_IGNORE_HELPER(5);
|
||||
PROTOBUF_READER_VARINT_IGNORE_HELPER(6);
|
||||
PROTOBUF_READER_VARINT_IGNORE_HELPER(7);
|
||||
PROTOBUF_READER_VARINT_IGNORE_HELPER(8);
|
||||
PROTOBUF_READER_VARINT_IGNORE_HELPER(9);
|
||||
PROTOBUF_READER_VARINT_IGNORE_HELPER(0)
|
||||
PROTOBUF_READER_VARINT_IGNORE_HELPER(1)
|
||||
PROTOBUF_READER_VARINT_IGNORE_HELPER(2)
|
||||
PROTOBUF_READER_VARINT_IGNORE_HELPER(3)
|
||||
PROTOBUF_READER_VARINT_IGNORE_HELPER(4)
|
||||
PROTOBUF_READER_VARINT_IGNORE_HELPER(5)
|
||||
PROTOBUF_READER_VARINT_IGNORE_HELPER(6)
|
||||
PROTOBUF_READER_VARINT_IGNORE_HELPER(7)
|
||||
PROTOBUF_READER_VARINT_IGNORE_HELPER(8)
|
||||
PROTOBUF_READER_VARINT_IGNORE_HELPER(9)
|
||||
#undef PROTOBUF_READER_VARINT_IGNORE_HELPER
|
||||
|
||||
unknownFormat();
|
||||
|
||||
@ -26,7 +26,9 @@ namespace protobuf
|
||||
# define EMPTY_DEF_RET(a) {return a;}
|
||||
# pragma GCC diagnostic push
|
||||
# pragma GCC diagnostic ignored "-Wunused-parameter"
|
||||
# pragma GCC diagnostic ignored "-Wextra-semi"
|
||||
# if defined(__clang__)
|
||||
# pragma GCC diagnostic ignored "-Wextra-semi"
|
||||
# endif
|
||||
#endif
|
||||
|
||||
|
||||
|
||||
16
debian/.pbuilderrc
vendored
16
debian/.pbuilderrc
vendored
@ -3,6 +3,8 @@
|
||||
#
|
||||
# ubuntu:
|
||||
# prepare old (trusty or earlier) host system:
|
||||
# sudo ln -s gutsy /usr/share/debootstrap/scripts/disco
|
||||
# sudo ln -s gutsy /usr/share/debootstrap/scripts/cosmic
|
||||
# sudo ln -s gutsy /usr/share/debootstrap/scripts/artful
|
||||
# sudo ln -s gutsy /usr/share/debootstrap/scripts/bionic
|
||||
# build ubuntu:
|
||||
@ -27,7 +29,8 @@
|
||||
# sudo DIST=testing ARCH=i386 pbuilder create --configfile debian/.pbuilderrc && DIST=testing ARCH=i386 pdebuild --configfile debian/.pbuilderrc
|
||||
# sudo DIST=experimental ARCH=i386 pbuilder create --configfile debian/.pbuilderrc && DIST=experimental ARCH=i386 pdebuild --configfile debian/.pbuilderrc
|
||||
# use only clang:
|
||||
# env DEB_CC=clang-5.0 DEB_CXX=clang++-5.0 EXTRAPACKAGES="clang-5.0" DIST=artful pdebuild --configfile debian/.pbuilderrc
|
||||
# env DEB_CC=clang-5.0 DEB_CXX=clang++-5.0 EXTRAPACKAGES=clang-5.0 DIST=artful pdebuild --configfile debian/.pbuilderrc
|
||||
# env DEB_CC=clang-8 DEB_CXX=clang++-8 EXTRAPACKAGES=clang-8 DIST=disco pdebuild --configfile debian/.pbuilderrc
|
||||
# clang+asan:
|
||||
# env DEB_CC=clang-5.0 DEB_CXX=clang++-5.0 EXTRAPACKAGES="clang-5.0 libc++abi-dev libc++-dev" CMAKE_FLAGS="-DENABLE_TCMALLOC=0 -DENABLE_UNWIND=0 -DCMAKE_BUILD_TYPE=Asan" DIST=artful pdebuild --configfile debian/.pbuilderrc
|
||||
# clang+tsan:
|
||||
@ -53,7 +56,7 @@ DEBIAN_SUITES=($UNSTABLE_CODENAME $TESTING_CODENAME $STABLE_CODENAME $STABLE_BAC
|
||||
"experimental" "unstable" "testing" "stable")
|
||||
|
||||
# List of Ubuntu suites. Update these when needed.
|
||||
UBUNTU_SUITES=("cosmic" "bionic" "artful" "zesty" "xenial" "trusty" "devel")
|
||||
UBUNTU_SUITES=("disco" "cosmic" "bionic" "artful" "zesty" "xenial" "trusty" "devel")
|
||||
|
||||
# Set a default distribution if none is used. Note that you can set your own default (i.e. ${DIST:="unstable"}).
|
||||
HOST_DIST=`lsb_release --short --codename`
|
||||
@ -164,17 +167,18 @@ esac
|
||||
|
||||
if [ "$ARCH" != arm64 ]; then
|
||||
case "$DIST" in
|
||||
# TODO: fix llvm-8 and use for "disco"
|
||||
"experimental")
|
||||
EXTRAPACKAGES+=" liblld-8-dev libclang-8-dev llvm-8-dev liblld-8 "
|
||||
export CMAKE_FLAGS="-DLLVM_VERSION_POSTFIX=-8 $CMAKE_FLAGS"
|
||||
export CMAKE_FLAGS="-DLLVM_VERSION=8 $CMAKE_FLAGS"
|
||||
;;
|
||||
"cosmic" | "testing" | "unstable")
|
||||
"disco" | "cosmic" | "testing" | "unstable")
|
||||
EXTRAPACKAGES+=" liblld-7-dev libclang-7-dev llvm-7-dev liblld-7 "
|
||||
export CMAKE_FLAGS="-DLLVM_VERSION_POSTFIX=-7 $CMAKE_FLAGS"
|
||||
export CMAKE_FLAGS="-DLLVM_VERSION=7 $CMAKE_FLAGS"
|
||||
;;
|
||||
"bionic")
|
||||
EXTRAPACKAGES+=" liblld-6.0-dev libclang-6.0-dev liblld-6.0 "
|
||||
export CMAKE_FLAGS="-DLLVM_VERSION_POSTFIX=-6.0 $CMAKE_FLAGS"
|
||||
export CMAKE_FLAGS="-DLLVM_VERSION=6 $CMAKE_FLAGS"
|
||||
;;
|
||||
"artful" )
|
||||
EXTRAPACKAGES+=" liblld-5.0-dev libclang-5.0-dev liblld-5.0 "
|
||||
|
||||
2
debian/changelog.in
vendored
2
debian/changelog.in
vendored
@ -1,4 +1,4 @@
|
||||
clickhouse (@VERSION_STRING@) unstable; urgency=low
|
||||
clickhouse (2:@VERSION_STRING@) unstable; urgency=low
|
||||
|
||||
* Modified source code
|
||||
|
||||
|
||||
9
debian/control
vendored
9
debian/control
vendored
@ -3,13 +3,14 @@ Section: database
|
||||
Priority: optional
|
||||
Maintainer: Alexey Milovidov <milovidov@yandex-team.ru>
|
||||
Build-Depends: debhelper (>= 9),
|
||||
cmake3 | cmake,
|
||||
cmake | cmake3,
|
||||
ninja-build,
|
||||
gcc-7 [amd64 i386] | gcc-8 [amd64 i386], g++-7 [amd64 i386] | g++-8 [amd64 i386],
|
||||
clang-6.0 [arm64 armhf] | clang-5.0 [arm64 armhf] | clang-7 [arm64 armhf],
|
||||
gcc-7 [amd64 i386] | gcc-8 [amd64 i386] | gcc-9 [amd64 i386], g++-7 [amd64 i386] | g++-8 [amd64 i386] | g++-9 [amd64 i386],
|
||||
clang-8 [arm64 armhf] | clang-7 [arm64 armhf] | clang-6.0 [arm64 armhf],
|
||||
libc6-dev,
|
||||
libicu-dev,
|
||||
libreadline-dev
|
||||
libreadline-dev,
|
||||
tzdata
|
||||
Standards-Version: 3.9.8
|
||||
|
||||
Package: clickhouse-client
|
||||
|
||||
1
debian/source/options
vendored
1
debian/source/options
vendored
@ -1,5 +1,6 @@
|
||||
tar-ignore
|
||||
tar-ignore="build_*/*"
|
||||
tar-ignore="workspace/*"
|
||||
tar-ignore="contrib/poco/openssl/*"
|
||||
tar-ignore="contrib/poco/gradle/*"
|
||||
tar-ignore="contrib/poco/Data/SQLite/*"
|
||||
|
||||
Loading…
Reference in New Issue
Block a user