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 3e33591c1 [GLUTEN-1632][CH]Daily Update Clickhouse Version (20240522)
(#5835)
3e33591c1 is described below
commit 3e33591c145048d4cda10de9deb1f8c7b370552c
Author: Kyligence Git <[email protected]>
AuthorDate: Wed May 22 02:59:45 2024 -0500
[GLUTEN-1632][CH]Daily Update Clickhouse Version (20240522) (#5835)
* [GLUTEN-1632][CH]Daily Update Clickhouse Version (20240522)
* Fxi build due to https://github.com/ClickHouse/ClickHouse/pull/64108
which move StringUtils.h from src/Common/StringUtils/StringUtils.h to
src/Common/StringUtils.h.
To avoid conflict, we rename StringUtils.h to GlutenStringUtils.h
(cherry picked from commit 60f2b9e16accafd97e3135feb1036d877dbb363e)
---------
Co-authored-by: kyligence-git <[email protected]>
Co-authored-by: Chang Chen <[email protected]>
---
cpp-ch/clickhouse.version | 4 ++--
.../local-engine/Common/{StringUtils.cpp => GlutenStringUtils.cpp} | 6 +++---
cpp-ch/local-engine/Common/{StringUtils.h => GlutenStringUtils.h} | 2 +-
cpp-ch/local-engine/Operator/PartitionColumnFillingTransform.cpp | 4 ++--
cpp-ch/local-engine/Parser/AggregateRelParser.cpp | 4 ----
cpp-ch/local-engine/Storages/Serializations/ExcelReadHelpers.cpp | 4 +---
cpp-ch/local-engine/Storages/Serializations/ExcelReadHelpers.h | 4 ++--
cpp-ch/local-engine/Storages/Serializations/ExcelStringReader.cpp | 2 +-
cpp-ch/local-engine/Storages/SubstraitSource/FormatFile.cpp | 6 +++---
.../local-engine/Storages/SubstraitSource/SubstraitFileSource.cpp | 4 ++--
cpp-ch/local-engine/tests/gtest_utils.cpp | 4 ++--
11 files changed, 19 insertions(+), 25 deletions(-)
diff --git a/cpp-ch/clickhouse.version b/cpp-ch/clickhouse.version
index 6a58dce0f..04bd6960e 100644
--- a/cpp-ch/clickhouse.version
+++ b/cpp-ch/clickhouse.version
@@ -1,3 +1,3 @@
CH_ORG=Kyligence
-CH_BRANCH=rebase_ch/20240515
-CH_COMMIT=00867009134
\ No newline at end of file
+CH_BRANCH=rebase_ch/20240522
+CH_COMMIT=327f885e4bd
\ No newline at end of file
diff --git a/cpp-ch/local-engine/Common/StringUtils.cpp
b/cpp-ch/local-engine/Common/GlutenStringUtils.cpp
similarity index 87%
rename from cpp-ch/local-engine/Common/StringUtils.cpp
rename to cpp-ch/local-engine/Common/GlutenStringUtils.cpp
index 6ac6e57af..b6d11ac1b 100644
--- a/cpp-ch/local-engine/Common/StringUtils.cpp
+++ b/cpp-ch/local-engine/Common/GlutenStringUtils.cpp
@@ -14,14 +14,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-#include "StringUtils.h"
+#include "GlutenStringUtils.h"
#include <filesystem>
#include <boost/algorithm/string.hpp>
#include <Poco/StringTokenizer.h>
namespace local_engine
{
-PartitionValues StringUtils::parsePartitionTablePath(const std::string & file)
+PartitionValues GlutenStringUtils::parsePartitionTablePath(const std::string &
file)
{
PartitionValues result;
Poco::StringTokenizer path(file, "/");
@@ -35,7 +35,7 @@ PartitionValues StringUtils::parsePartitionTablePath(const
std::string & file)
}
return result;
}
-bool StringUtils::isNullPartitionValue(const std::string & value)
+bool GlutenStringUtils::isNullPartitionValue(const std::string & value)
{
return value == "__HIVE_DEFAULT_PARTITION__";
}
diff --git a/cpp-ch/local-engine/Common/StringUtils.h
b/cpp-ch/local-engine/Common/GlutenStringUtils.h
similarity index 97%
rename from cpp-ch/local-engine/Common/StringUtils.h
rename to cpp-ch/local-engine/Common/GlutenStringUtils.h
index 64e0ee6db..023cb2b8d 100644
--- a/cpp-ch/local-engine/Common/StringUtils.h
+++ b/cpp-ch/local-engine/Common/GlutenStringUtils.h
@@ -23,7 +23,7 @@ namespace local_engine
using PartitionValue = std::pair<std::string, std::string>;
using PartitionValues = std::vector<PartitionValue>;
-class StringUtils
+class GlutenStringUtils
{
public:
static PartitionValues parsePartitionTablePath(const std::string & file);
diff --git a/cpp-ch/local-engine/Operator/PartitionColumnFillingTransform.cpp
b/cpp-ch/local-engine/Operator/PartitionColumnFillingTransform.cpp
index f73b06ded..724a02f5b 100644
--- a/cpp-ch/local-engine/Operator/PartitionColumnFillingTransform.cpp
+++ b/cpp-ch/local-engine/Operator/PartitionColumnFillingTransform.cpp
@@ -21,7 +21,7 @@
#include <Functions/FunctionHelpers.h>
#include <IO/ReadBufferFromString.h>
#include <IO/ReadHelpers.h>
-#include <Common/StringUtils.h>
+#include <Common/GlutenStringUtils.h>
using namespace DB;
@@ -77,7 +77,7 @@ ColumnPtr
PartitionColumnFillingTransform::createPartitionColumn()
if (const DataTypeNullable * nullable_type =
checkAndGetDataType<DataTypeNullable>(partition_col_type.get()))
{
nested_type = nullable_type->getNestedType();
- if (StringUtils::isNullPartitionValue(partition_col_value))
+ if (GlutenStringUtils::isNullPartitionValue(partition_col_value))
{
return nullable_type->createColumnConstWithDefaultValue(1);
}
diff --git a/cpp-ch/local-engine/Parser/AggregateRelParser.cpp
b/cpp-ch/local-engine/Parser/AggregateRelParser.cpp
index d20f30e41..085799557 100644
--- a/cpp-ch/local-engine/Parser/AggregateRelParser.cpp
+++ b/cpp-ch/local-engine/Parser/AggregateRelParser.cpp
@@ -18,9 +18,7 @@
#include <memory>
#include <AggregateFunctions/Combinators/AggregateFunctionIf.h>
#include <DataTypes/DataTypeAggregateFunction.h>
-#include <DataTypes/DataTypeNullable.h>
#include <DataTypes/DataTypeTuple.h>
-#include <DataTypes/IDataType.h>
#include <Functions/FunctionFactory.h>
#include <Functions/FunctionHelpers.h>
#include <Operator/DefaultHashAggregateResult.h>
@@ -31,8 +29,6 @@
#include <Processors/QueryPlan/ExpressionStep.h>
#include <Processors/QueryPlan/MergingAggregatedStep.h>
#include <Common/CHUtil.h>
-#include "Common/PODArray.h"
-#include <Common/StringUtils/StringUtils.h>
namespace DB
{
diff --git a/cpp-ch/local-engine/Storages/Serializations/ExcelReadHelpers.cpp
b/cpp-ch/local-engine/Storages/Serializations/ExcelReadHelpers.cpp
index 621349732..6a7b7b2e2 100644
--- a/cpp-ch/local-engine/Storages/Serializations/ExcelReadHelpers.cpp
+++ b/cpp-ch/local-engine/Storages/Serializations/ExcelReadHelpers.cpp
@@ -16,11 +16,9 @@
*/
#include "ExcelReadHelpers.h"
-
#include <IO/PeekableReadBuffer.h>
#include <IO/ReadBuffer.h>
-#include <Common/Exception.h>
-
+#include <IO/parseDateTimeBestEffort.h>
namespace DB
{
diff --git a/cpp-ch/local-engine/Storages/Serializations/ExcelReadHelpers.h
b/cpp-ch/local-engine/Storages/Serializations/ExcelReadHelpers.h
index cf5aeda6f..f96b31f70 100644
--- a/cpp-ch/local-engine/Storages/Serializations/ExcelReadHelpers.h
+++ b/cpp-ch/local-engine/Storages/Serializations/ExcelReadHelpers.h
@@ -19,10 +19,10 @@
#include <Formats/FormatSettings.h>
#include <IO/ReadBuffer.h>
#include <IO/ReadHelpers.h>
-#include <IO/parseDateTimeBestEffort.h>
+
#include <Common/LocalDate.h>
-#include <Common/StringUtils/StringUtils.h>
+#include <Common/StringUtils.h>
#include "ExcelNumberReader.h"
diff --git a/cpp-ch/local-engine/Storages/Serializations/ExcelStringReader.cpp
b/cpp-ch/local-engine/Storages/Serializations/ExcelStringReader.cpp
index 9aac8d0af..72637f910 100644
--- a/cpp-ch/local-engine/Storages/Serializations/ExcelStringReader.cpp
+++ b/cpp-ch/local-engine/Storages/Serializations/ExcelStringReader.cpp
@@ -19,7 +19,7 @@
#include <IO/PeekableReadBuffer.h>
#include <base/hex.h>
#include <Common/PODArray.h>
-#include <Common/StringUtils/StringUtils.h>
+#include <Common/StringUtils.h>
#include <Common/memcpySmall.h>
#include "ExcelStringReader.h"
diff --git a/cpp-ch/local-engine/Storages/SubstraitSource/FormatFile.cpp
b/cpp-ch/local-engine/Storages/SubstraitSource/FormatFile.cpp
index 819910799..0221afd88 100644
--- a/cpp-ch/local-engine/Storages/SubstraitSource/FormatFile.cpp
+++ b/cpp-ch/local-engine/Storages/SubstraitSource/FormatFile.cpp
@@ -18,9 +18,9 @@
#include <memory>
#include <IO/ReadBufferFromFile.h>
-#include "Common/CHUtil.h"
+#include <Common/CHUtil.h>
#include <Common/Exception.h>
-#include <Common/StringUtils.h>
+#include <Common/GlutenStringUtils.h>
#include <Common/logger_useful.h>
#if USE_PARQUET
@@ -53,7 +53,7 @@ FormatFile::FormatFile(
const ReadBufferBuilderPtr & read_buffer_builder_)
: context(context_), file_info(file_info_),
read_buffer_builder(read_buffer_builder_)
{
- PartitionValues part_vals =
StringUtils::parsePartitionTablePath(file_info.uri_file());
+ PartitionValues part_vals =
GlutenStringUtils::parsePartitionTablePath(file_info.uri_file());
String partition_values_str = "[";
for (size_t i = 0; i < part_vals.size(); ++i)
{
diff --git
a/cpp-ch/local-engine/Storages/SubstraitSource/SubstraitFileSource.cpp
b/cpp-ch/local-engine/Storages/SubstraitSource/SubstraitFileSource.cpp
index 44da624d4..80dccf759 100644
--- a/cpp-ch/local-engine/Storages/SubstraitSource/SubstraitFileSource.cpp
+++ b/cpp-ch/local-engine/Storages/SubstraitSource/SubstraitFileSource.cpp
@@ -33,7 +33,7 @@
#include <Storages/SubstraitSource/SubstraitFileSource.h>
#include <Common/CHUtil.h>
#include <Common/Exception.h>
-#include <Common/StringUtils.h>
+#include <Common/GlutenStringUtils.h>
#include <Common/typeid_cast.h>
#include "DataTypes/DataTypesDecimal.h"
@@ -152,7 +152,7 @@ DB::ColumnPtr
FileReaderWrapper::createConstColumn(DB::DataTypePtr data_type, co
DB::ColumnPtr FileReaderWrapper::createColumn(const String & value,
DB::DataTypePtr type, size_t rows)
{
- if (StringUtils::isNullPartitionValue(value))
+ if (GlutenStringUtils::isNullPartitionValue(value))
{
if (!type->isNullable())
throw DB::Exception(DB::ErrorCodes::LOGICAL_ERROR, "Partition
column is null value,but column data type is not nullable.");
diff --git a/cpp-ch/local-engine/tests/gtest_utils.cpp
b/cpp-ch/local-engine/tests/gtest_utils.cpp
index b01656eb7..4ea713921 100644
--- a/cpp-ch/local-engine/tests/gtest_utils.cpp
+++ b/cpp-ch/local-engine/tests/gtest_utils.cpp
@@ -15,14 +15,14 @@
* limitations under the License.
*/
#include <gtest/gtest.h>
-#include <Common/StringUtils.h>
+#include <Common/GlutenStringUtils.h>
using namespace local_engine;
TEST(TestStringUtils, TestExtractPartitionValues)
{
std::string path = "/tmp/col1=1/col2=test/a.parquet";
- auto values = StringUtils::parsePartitionTablePath(path);
+ auto values = GlutenStringUtils::parsePartitionTablePath(path);
ASSERT_EQ(2, values.size());
ASSERT_EQ("col1", values[0].first);
ASSERT_EQ("1", values[0].second);
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
