You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@gluten.apache.org by ch...@apache.org on 2024/12/10 07:38:19 UTC

(incubator-gluten) branch main updated: [GLUTEN-1632][CH]Daily Update Clickhouse Version (20241210) (#8191)

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 a24183f923 [GLUTEN-1632][CH]Daily Update Clickhouse Version (20241210) (#8191)
a24183f923 is described below

commit a24183f9231e98c27ec7629440110ff3ed12c27c
Author: Kyligence Git <we...@kyligence.io>
AuthorDate: Tue Dec 10 01:38:15 2024 -0600

    [GLUTEN-1632][CH]Daily Update Clickhouse Version (20241210) (#8191)
    
    * [GLUTEN-1632][CH]Daily Update Clickhouse Version (20241210)
    
    * Fix build due to https://github.com/ClickHouse/ClickHouse/pull/72716
    
    * Fix Build due to https://github.com/ClickHouse/ClickHouse/pull/69445
    
    ---------
    
    Co-authored-by: kyligence-git <gl...@kyligence.io>
    Co-authored-by: Chang Chen <ba...@gmail.com>
---
 cpp-ch/clickhouse.version                          | 4 ++--
 cpp-ch/local-engine/Common/GlutenSignalHandler.cpp | 1 +
 cpp-ch/local-engine/tests/gtest_write_pipeline.cpp | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/cpp-ch/clickhouse.version b/cpp-ch/clickhouse.version
index 7c94e253c7..476b745069 100644
--- a/cpp-ch/clickhouse.version
+++ b/cpp-ch/clickhouse.version
@@ -1,3 +1,3 @@
 CH_ORG=Kyligence
-CH_BRANCH=rebase_ch/20241205
-CH_COMMIT=7b8b1c0b554
+CH_BRANCH=rebase_ch/20241210
+CH_COMMIT=c3d3e02fa85
diff --git a/cpp-ch/local-engine/Common/GlutenSignalHandler.cpp b/cpp-ch/local-engine/Common/GlutenSignalHandler.cpp
index 712d8ddcf5..c4dcbfa364 100644
--- a/cpp-ch/local-engine/Common/GlutenSignalHandler.cpp
+++ b/cpp-ch/local-engine/Common/GlutenSignalHandler.cpp
@@ -16,6 +16,7 @@
  */
 #include <cstring>
 #include <vector>
+#include <thread>
 #include <Core/Settings.h>
 #include <IO/ReadBufferFromFileDescriptor.h>
 #include <IO/ReadHelpers.h>
diff --git a/cpp-ch/local-engine/tests/gtest_write_pipeline.cpp b/cpp-ch/local-engine/tests/gtest_write_pipeline.cpp
index 288cd6f0ec..a01dd363c5 100644
--- a/cpp-ch/local-engine/tests/gtest_write_pipeline.cpp
+++ b/cpp-ch/local-engine/tests/gtest_write_pipeline.cpp
@@ -94,7 +94,7 @@ TEST(LocalExecutor, StorageObjectStorageSink)
     EXPECT_TRUE(func && func->name == "HDFS");
 
     DB::StorageHDFSConfiguration config;
-    StorageObjectStorage::Configuration::initialize(config, arg->children[0]->children, QueryContext::globalContext(), false);
+    StorageObjectStorage::Configuration::initialize(config, arg->children[0]->children, QueryContext::globalContext(), false, nullptr);
 
     const std::shared_ptr<DB::HDFSObjectStorage> object_storage
         = std::dynamic_pointer_cast<DB::HDFSObjectStorage>(config.createObjectStorage(QueryContext::globalContext(), false));


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@gluten.apache.org
For additional commands, e-mail: commits-help@gluten.apache.org