This is an automated email from the ASF dual-hosted git repository. morningman pushed a commit to branch dev-1.0.0 in repository https://gitbox.apache.org/repos/asf/incubator-doris.git
commit 1ca27ca4ef6555aacce54547308ec947b0c73885 Author: Zhengguo Yang <[email protected]> AuthorDate: Thu Mar 17 10:07:55 2022 +0800 [chore](dependency) update Croaring for good performance (#8492) update Croaring for good performance, according to RoaringBitmap/CRoaring#320 --- be/src/util/bitmap_value.h | 12 +++--------- thirdparty/CHANGELOG.md | 3 +++ thirdparty/build-thirdparty.sh | 2 +- thirdparty/patches/aws-c-cal-0.4.5.patch | 11 ----------- 4 files changed, 7 insertions(+), 21 deletions(-) diff --git a/be/src/util/bitmap_value.h b/be/src/util/bitmap_value.h index 0dd6031..d6791c1 100644 --- a/be/src/util/bitmap_value.h +++ b/be/src/util/bitmap_value.h @@ -935,22 +935,16 @@ private: static uint64_t uniteBytes(const uint32_t highBytes, const uint32_t lowBytes) { return (uint64_t(highBytes) << 32) | uint64_t(lowBytes); } - // this is needed to tolerate gcc's C++11 libstdc++ lacking emplace - // prior to version 4.8 void emplaceOrInsert(const uint32_t key, const roaring::Roaring& value) { -#if defined(__GLIBCXX__) && __GLIBCXX__ < 20130322 - roarings.insert(std::make_pair(key, value)); -#else roarings.emplace(std::make_pair(key, value)); -#endif } - void emplace(const uint32_t key, roaring::Roaring&& value) { - roarings.emplace(std::make_pair(key, std::move(value))); + void emplaceOrInsert(const uint32_t key, roaring::Roaring&& value) { + roarings.emplace(key, value); } }; -// Forked from https://github.com/RoaringBitmap/CRoaring/blob/v0.2.60/cpp/roaring64map.hh +// Forked from https://github.com/RoaringBitmap/CRoaring/blob/v0.4.0/cpp/roaring64map.hh // Used to go through the set bits. Not optimally fast, but convenient. class Roaring64MapSetBitForwardIterator { public: diff --git a/thirdparty/CHANGELOG.md b/thirdparty/CHANGELOG.md index 76a70ad..940eda2 100644 --- a/thirdparty/CHANGELOG.md +++ b/thirdparty/CHANGELOG.md @@ -2,6 +2,9 @@ This file contains version of the third-party dependency libraries in the build-env image. The docker build-env image is apache/incubator-doris, and the tag is `build-env-${version}` +## v20220316 +- Modified: CRoaring 0.3.4 -> 0.4.0 + ## v20220310 - Modified: arrow 5.0.0 -> 7.0.0 - Modified: aws-sdk-cpp 1.8.108 -> 1.9.211 diff --git a/thirdparty/build-thirdparty.sh b/thirdparty/build-thirdparty.sh index 66d2988..df43648 100755 --- a/thirdparty/build-thirdparty.sh +++ b/thirdparty/build-thirdparty.sh @@ -906,7 +906,7 @@ build_benchmark() { cmake ../ -DBENCHMARK_ENABLE_GTEST_TESTS=OFF -DBENCHMARK_ENABLE_TESTING=OFF -DCMAKE_BUILD_TYPE=Release -DHAVE_STD_REGEX=1 cmake --build "build" --config Release - mkdir $TP_INCLUDE_DIR/benchmark + mkdir -p $TP_INCLUDE_DIR/benchmark cp $TP_SOURCE_DIR/$BENCHMARK_SOURCE/include/benchmark/benchmark.h $TP_INCLUDE_DIR/benchmark/ cp $TP_SOURCE_DIR/$BENCHMARK_SOURCE/build/src/libbenchmark.a $TP_LIB_DIR/ } diff --git a/thirdparty/patches/aws-c-cal-0.4.5.patch b/thirdparty/patches/aws-c-cal-0.4.5.patch deleted file mode 100644 index aca87f0..0000000 --- a/thirdparty/patches/aws-c-cal-0.4.5.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/source/unix/openssl_platform_init.c 2021-10-18 19:33:56.524537840 +0800 -+++ b/source/unix/openssl_platform_init.c 2021-10-18 19:35:06.534537840 +0800 -@@ -367,7 +367,7 @@ static int s_resolve_libcrypto(void) { - } - - /* Ignore warnings about how CRYPTO_get_locking_callback() always returns NULL on 1.1.1 */ --#if !defined(__GNUC__) || (__GNUC__ >= 4 && __GNUC_MINOR__ > 1) -+#if !defined(__GNUC__) || (__GNUC__ * 100 + __GNUC_MINOR__ * 10 > 410) - # pragma GCC diagnostic push - # pragma GCC diagnostic ignored "-Waddress" - #endif --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
