Skip to content

Commit

Permalink
[GLUTEN-1632][CH]Daily Update Clickhouse Version (20240524) (apache#5857
Browse files Browse the repository at this point in the history
)

* [GLUTEN-1632][CH]Daily Update Clickhouse Version (20240524)

* Fix build due to ClickHouse/ClickHouse#63058

---------

Co-authored-by: kyligence-git <[email protected]>
Co-authored-by: Chang Chen <[email protected]>
  • Loading branch information
3 people authored May 24, 2024
1 parent aeea649 commit 891ab83
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions cpp-ch/clickhouse.version
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
CH_ORG=Kyligence
CH_BRANCH=rebase_ch/20240522
CH_COMMIT=327f885e4bd
CH_BRANCH=rebase_ch/20240524
CH_COMMIT=b1a2a14bdd2
4 changes: 2 additions & 2 deletions cpp-ch/local-engine/Storages/IO/NativeReader.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ static void readNormalSimpleData(DB::ReadBuffer &in, DB::ColumnPtr & column, siz

ISerialization::DeserializeBinaryBulkStatePtr state;

column_parse_util.serializer->deserializeBinaryBulkStatePrefix(settings, state);
column_parse_util.serializer->deserializeBinaryBulkStatePrefix(settings, state, nullptr);
column_parse_util.serializer->deserializeBinaryBulkWithMultipleStreams(column, rows, settings, state, nullptr);
}

Expand All @@ -145,7 +145,7 @@ readNormalComplexData(DB::ReadBuffer & in, DB::ColumnPtr & column, size_t rows,
ISerialization::DeserializeBinaryBulkStatePtr state;

DB::ColumnPtr new_col = column->cloneResized(0);
column_parse_util.serializer->deserializeBinaryBulkStatePrefix(settings, state);
column_parse_util.serializer->deserializeBinaryBulkStatePrefix(settings, state ,nullptr);
column_parse_util.serializer->deserializeBinaryBulkWithMultipleStreams(new_col, rows, settings, state, nullptr);
column->assumeMutable()->insertRangeFrom(*new_col, 0, new_col->size());
}
Expand Down

0 comments on commit 891ab83

Please sign in to comment.