Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[GLUTEN-1632][CH]Daily Update Clickhouse Version (20240823) #6984

Merged
merged 2 commits into from
Aug 23, 2024
Merged

[GLUTEN-1632][CH]Daily Update Clickhouse Version (20240823) #6984

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
72e29bc
[GLUTEN-1632][CH]Daily Update Clickhouse Version (20240823)
Aug 22, 2024
2364f5a
Fix Build due to https://github.com/ClickHouse/ClickHouse/pull/68534
baibaichen Aug 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions cpp-ch/clickhouse.version
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
CH_ORG=Kyligence
CH_BRANCH=rebase_ch/20240822
CH_COMMIT=85d3b05e9e2
CH_BRANCH=rebase_ch/20240823
CH_COMMIT=8532edf7d75
6 changes: 3 additions & 3 deletions cpp-ch/local-engine/Functions/SparkFunctionGetJsonObject.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ class GetJsonObjectImpl
public:
using Element = typename JSONParser::Element;

static DB::DataTypePtr getReturnType(const char *, const DB::ColumnsWithTypeAndName &, const DB::ContextPtr &)
static DB::DataTypePtr getReturnType(const char *, const DB::ColumnsWithTypeAndName &, bool )
{
auto nested_type = std::make_shared<DB::DataTypeString>();
return std::make_shared<DB::DataTypeNullable>(nested_type);
Expand All @@ -81,7 +81,7 @@ class GetJsonObjectImpl
static size_t getNumberOfIndexArguments(const DB::ColumnsWithTypeAndName & arguments) { return arguments.size() - 1; }

bool insertResultToColumn(
DB::IColumn & dest, const Element & root, DB::GeneratorJSONPath<JSONParser> & generator_json_path, const DB::ContextPtr &)
DB::IColumn & dest, const Element & root, DB::GeneratorJSONPath<JSONParser> & generator_json_path, bool )
{
Element current_element = root;
DB::VisitorStatus status;
Expand Down Expand Up @@ -353,7 +353,7 @@ class FlattenJSONStringOnRequiredFunction : public DB::IFunction
for (size_t j = 0; j < tuple_size; ++j)
{
generator_json_paths[j]->reinitialize();
if (!impl.insertResultToColumn(*tuple_columns[j], document, *generator_json_paths[j], context))
if (!impl.insertResultToColumn(*tuple_columns[j], document, *generator_json_paths[j], true))
{
tuple_columns[j]->insertDefault();
}
Expand Down
Loading