diff --git a/cpp-ch/clickhouse.version b/cpp-ch/clickhouse.version index 04bd6960ee83..1bc0454a1f1d 100644 --- a/cpp-ch/clickhouse.version +++ b/cpp-ch/clickhouse.version @@ -1,3 +1,3 @@ CH_ORG=Kyligence -CH_BRANCH=rebase_ch/20240522 -CH_COMMIT=327f885e4bd \ No newline at end of file +CH_BRANCH=rebase_ch/20240524 +CH_COMMIT=b1a2a14bdd2 \ No newline at end of file diff --git a/cpp-ch/local-engine/Storages/IO/NativeReader.cpp b/cpp-ch/local-engine/Storages/IO/NativeReader.cpp index 30d8af593421..48e6950e27eb 100644 --- a/cpp-ch/local-engine/Storages/IO/NativeReader.cpp +++ b/cpp-ch/local-engine/Storages/IO/NativeReader.cpp @@ -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); } @@ -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()); }