This is an automated email from the ASF dual-hosted git repository.
changchen pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/incubator-gluten.git
The following commit(s) were added to refs/heads/main by this push:
new 7cc3fce329 [GLUTEN-1632][CH]Daily Update Clickhouse Version (20250313)
(#8979)
7cc3fce329 is described below
commit 7cc3fce3293b5a991b0c48cccd18b67aa3000dcf
Author: Kyligence Git <[email protected]>
AuthorDate: Thu Mar 13 02:57:12 2025 -0500
[GLUTEN-1632][CH]Daily Update Clickhouse Version (20250313) (#8979)
* [GLUTEN-1632][CH]Daily Update Clickhouse Version (20250313)
* Remove unnecessary option for CMake
* Fix build due to https://github.com/ClickHouse/ClickHouse/pull/77447
(which revert #70102)
* Fix gtest due to #8947
* fix style
---------
Co-authored-by: kyligence-git <[email protected]>
Co-authored-by: Chang Chen <[email protected]>
---
cpp-ch/CMakeLists.txt | 8 +++---
cpp-ch/clickhouse.version | 4 +--
cpp-ch/local-engine/Common/CHUtil.cpp | 14 +----------
.../tests/gtest_clickhouse_roaring_bitmap.cpp | 29 +++++++++++-----------
4 files changed, 21 insertions(+), 34 deletions(-)
diff --git a/cpp-ch/CMakeLists.txt b/cpp-ch/CMakeLists.txt
index c2f653b9f3..6988d79f93 100644
--- a/cpp-ch/CMakeLists.txt
+++ b/cpp-ch/CMakeLists.txt
@@ -106,12 +106,12 @@ else()
-DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -DENABLE_PROTOBUF=ON
-DENABLE_TESTS=OFF -DENABLE_JEMALLOC=ON -DENABLE_MULTITARGET_CODE=ON
- -DENABLE_EXTERN_LOCAL_ENGINE=ON -DENABLE_ODBC=OFF -DENABLE_CAPNP=OFF
- -DENABLE_GRPC=OFF -DENABLE_RUST=OFF -DENABLE_H3=OFF -DENABLE_AMQPCPP=OFF
+ -DENABLE_EXTERN_LOCAL_ENGINE=ON -DENABLE_CAPNP=OFF -DENABLE_GRPC=OFF
+ -DENABLE_RUST=OFF -DENABLE_H3=OFF -DENABLE_AMQPCPP=OFF
-DENABLE_CASSANDRA=OFF -DENABLE_KAFKA=ON -DENABLE_NATS=OFF
-DENABLE_LIBPQXX=OFF -DENABLE_NURAFT=OFF -DENABLE_DATASKETCHES=OFF
- -DENABLE_SQLITE=OFF -DENABLE_S2_GEOMETRY=OFF -DENABLE_ANNOY=OFF
- -DENABLE_ULID=OFF -DENABLE_MYSQL=OFF -DENABLE_BCRYPT=OFF
-DENABLE_LDAP=OFF
+ -DENABLE_SQLITE=OFF -DENABLE_S2_GEOMETRY=OFF -DENABLE_ULID=OFF
+ -DENABLE_MYSQL=OFF -DENABLE_BCRYPT=OFF -DENABLE_LDAP=OFF
-DENABLE_MSGPACK=OFF -DUSE_REPLXX=OFF -DENABLE_CLICKHOUSE_ALL=OFF
-DENABLE_GWP_ASAN=OFF -DCOMPILER_FLAGS='-fvisibility=hidden
-fvisibility-inlines-hidden' -S ${CH_SOURCE_DIR} -G Ninja -B
diff --git a/cpp-ch/clickhouse.version b/cpp-ch/clickhouse.version
index 579cfbdc91..10161ed37b 100644
--- a/cpp-ch/clickhouse.version
+++ b/cpp-ch/clickhouse.version
@@ -1,3 +1,3 @@
CH_ORG=Kyligence
-CH_BRANCH=rebase_ch/20250308
-CH_COMMIT=5cf4c5b0dc5
+CH_BRANCH=rebase_ch/20250313
+CH_COMMIT=492d430db43
diff --git a/cpp-ch/local-engine/Common/CHUtil.cpp
b/cpp-ch/local-engine/Common/CHUtil.cpp
index 75c9c56978..ff21e29701 100644
--- a/cpp-ch/local-engine/Common/CHUtil.cpp
+++ b/cpp-ch/local-engine/Common/CHUtil.cpp
@@ -80,10 +80,6 @@ namespace ServerSetting
extern const ServerSettingsString primary_index_cache_policy;
extern const ServerSettingsUInt64 primary_index_cache_size;
extern const ServerSettingsDouble primary_index_cache_size_ratio;
-extern const ServerSettingsString skipping_index_cache_policy;
-extern const ServerSettingsUInt64 skipping_index_cache_size;
-extern const ServerSettingsUInt64 skipping_index_cache_max_entries;
-extern const ServerSettingsDouble skipping_index_cache_size_ratio;
extern const ServerSettingsUInt64
max_prefixes_deserialization_thread_pool_size;
extern const ServerSettingsUInt64
max_prefixes_deserialization_thread_pool_free_size;
extern const ServerSettingsUInt64
prefixes_deserialization_thread_pool_thread_pool_queue_size;
@@ -816,15 +812,7 @@ void
BackendInitializerUtil::initContexts(DB::Context::ConfigurationPtr config)
size_t index_mark_cache_size =
config->getUInt64("index_mark_cache_size", DEFAULT_INDEX_MARK_CACHE_MAX_SIZE);
double index_mark_cache_size_ratio =
config->getDouble("index_mark_cache_size_ratio",
DEFAULT_INDEX_MARK_CACHE_SIZE_RATIO);
global_context->setIndexMarkCache(index_mark_cache_policy,
index_mark_cache_size, index_mark_cache_size_ratio);
-
- String skipping_index_cache_policy =
server_settings[ServerSetting::skipping_index_cache_policy];
- size_t skipping_index_cache_size =
server_settings[ServerSetting::skipping_index_cache_size];
- size_t skipping_index_cache_max_entries =
server_settings[ServerSetting::skipping_index_cache_max_entries];
- double skipping_index_cache_size_ratio =
server_settings[ServerSetting::skipping_index_cache_size_ratio];
- LOG_INFO(log, "Skipping index cache size to {}",
formatReadableSizeWithBinarySuffix(skipping_index_cache_size));
- global_context->setSkippingIndexCache(
- skipping_index_cache_policy, skipping_index_cache_size,
skipping_index_cache_max_entries, skipping_index_cache_size_ratio);
-
+
getMergeTreePrefixesDeserializationThreadPool().initialize(
server_settings[ServerSetting::max_prefixes_deserialization_thread_pool_size],
server_settings[ServerSetting::max_prefixes_deserialization_thread_pool_free_size],
diff --git a/cpp-ch/local-engine/tests/gtest_clickhouse_roaring_bitmap.cpp
b/cpp-ch/local-engine/tests/gtest_clickhouse_roaring_bitmap.cpp
index 01cc015147..758bc8e610 100644
--- a/cpp-ch/local-engine/tests/gtest_clickhouse_roaring_bitmap.cpp
+++ b/cpp-ch/local-engine/tests/gtest_clickhouse_roaring_bitmap.cpp
@@ -14,17 +14,16 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-#include <tests/utils/gluten_test_util.h>
-#include <iostream>
+#include <zlib.h>
#include <Core/Settings.h>
#include <Interpreters/Context.h>
#include <Parser/SerializedPlanParser.h>
-#include <gtest/gtest.h>
-#include <Common/QueryContext.h>
-#include <zlib.h>
+#include <Storages/SubstraitSource/Delta/Bitmap/DeltaDVRoaringBitmapArray.h>
#include <Storages/SubstraitSource/ReadBufferBuilder.h>
+#include <gtest/gtest.h>
+#include <tests/utils/gluten_test_util.h>
#include <roaring.hh>
-#include <Storages/SubstraitSource/Delta/Bitmap/DeltaDVRoaringBitmapArray.h>
+#include <Common/QueryContext.h>
namespace DB::Setting
{
@@ -136,11 +135,11 @@ TEST(Delta_DV, DeltaDVRoaringBitmapArray)
{
const auto context =
DB::Context::createCopy(QueryContext::globalContext());
- const Poco::URI file_uri(test::gtest_data("deletion_vector_multiple.bin"));
- const Poco::URI
file_uri1(test::gtest_data("deletion_vector_only_one.bin"));
+ const std::string
file_uri(test::gtest_uri("deletion_vector_multiple.bin"));
+ const std::string
file_uri1(test::gtest_uri("deletion_vector_only_one.bin"));
- local_engine::DeltaDVRoaringBitmapArray bitmap_array(context);
- bitmap_array.rb_read(file_uri.getPath(), 426433, 426424);
+ DeltaDVRoaringBitmapArray bitmap_array(context);
+ bitmap_array.rb_read(file_uri, 426433, 426424);
EXPECT_TRUE(bitmap_array.rb_contains(5));
EXPECT_TRUE(bitmap_array.rb_contains(3618));
EXPECT_TRUE(bitmap_array.rb_contains(155688));
@@ -158,8 +157,8 @@ TEST(Delta_DV, DeltaDVRoaringBitmapArray)
bitmap_array.rb_add(10000000000);
EXPECT_TRUE(bitmap_array.rb_contains(10000000000));
- local_engine::DeltaDVRoaringBitmapArray bitmap_array1(context);
- bitmap_array1.rb_read(file_uri1.getPath(), 1, 539);
+ DeltaDVRoaringBitmapArray bitmap_array1(context);
+ bitmap_array1.rb_read(file_uri1, 1, 539);
EXPECT_TRUE(bitmap_array1.rb_contains(0));
EXPECT_TRUE(bitmap_array1.rb_contains(1003));
EXPECT_TRUE(bitmap_array1.rb_contains(880));
@@ -172,10 +171,10 @@ TEST(Delta_DV, DeltaDVRoaringBitmapArray)
EXPECT_TRUE(bitmap_array.rb_contains(1003));
EXPECT_TRUE(bitmap_array.rb_contains(880));
- const Poco::URI
file_uri2(test::gtest_data("deletion_vector_long_values.bin"));
+ const std::string
file_uri2(test::gtest_uri("deletion_vector_long_values.bin"));
- local_engine::DeltaDVRoaringBitmapArray bitmap_array2(context);
- bitmap_array2.rb_read(file_uri2.getPath(), 1, 4047);
+ DeltaDVRoaringBitmapArray bitmap_array2(context);
+ bitmap_array2.rb_read(file_uri2, 1, 4047);
EXPECT_FALSE(bitmap_array2.rb_is_empty());
EXPECT_EQ(2098, bitmap_array2.rb_size());
EXPECT_TRUE(bitmap_array2.rb_contains(0));
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
