diff options
| author | a-romanov <Anton.Romanov@ydb.tech> | 2022-09-07 13:15:08 +0300 |
|---|---|---|
| committer | a-romanov <Anton.Romanov@ydb.tech> | 2022-09-07 13:15:08 +0300 |
| commit | 8defe59106983bbb7d3fe3cd71b752a743d0bbba (patch) | |
| tree | 7e940b45f7a84867853cdbfbafb4cdd4141fc864 | |
| parent | a241100808747712c798cb6b0635e7099b03fbc7 (diff) | |
| download | ydb-8defe59106983bbb7d3fe3cd71b752a743d0bbba.tar.gz | |
hotfix: always only one block per file.
| -rw-r--r-- | ydb/library/yql/providers/s3/actors/yql_s3_write_actor.cpp | 3 | ||||
| -rw-r--r-- | ydb/library/yql/udfs/common/clickhouse/client/clickhouse_client_udf.cpp | 8 |
2 files changed, 6 insertions, 5 deletions
diff --git a/ydb/library/yql/providers/s3/actors/yql_s3_write_actor.cpp b/ydb/library/yql/providers/s3/actors/yql_s3_write_actor.cpp index 6c5e30ae448..dc403589bb5 100644 --- a/ydb/library/yql/providers/s3/actors/yql_s3_write_actor.cpp +++ b/ydb/library/yql/providers/s3/actors/yql_s3_write_actor.cpp @@ -131,7 +131,8 @@ public: void SendData(TString&& data) { Parts->Push(std::move(data)); - if (10000U == Tags.size() + Parts->Size() || SizeLimit <= SentSize + Parts->Volume()) + Y_UNUSED(SizeLimit); +//TODO: if (10000U == Tags.size() + Parts->Size() || SizeLimit <= SentSize + Parts->Volume()) Parts->Seal(); if (!UploadId.empty()) diff --git a/ydb/library/yql/udfs/common/clickhouse/client/clickhouse_client_udf.cpp b/ydb/library/yql/udfs/common/clickhouse/client/clickhouse_client_udf.cpp index d0aa043feb5..569cbc6a04c 100644 --- a/ydb/library/yql/udfs/common/clickhouse/client/clickhouse_client_udf.cpp +++ b/ydb/library/yql/udfs/common/clickhouse/client/clickhouse_client_udf.cpp @@ -98,7 +98,7 @@ TPgConvertInfo GetPgConvertInfo(IFunctionTypeInfoBuilder& typeInfoBuilder, const Y_ENSURE(pgDescription); info.TypeLen = pgDescription->Typelen; info.TypeName = pgDescription->Name; - + std::tie(info.SourceLogicalSlot, info.SourceDataType) = InferSlotFromPgType(typeInfoBuilder, pgDescription->Name); if (info.SourceDataType) { info.SourceDataType = typeInfoBuilder.Optional()->Item(info.SourceDataType).Build(); @@ -156,7 +156,7 @@ NDB::DataTypePtr PgMetaToClickHouse(const TPgConvertInfo& info) { if (info.TypeName == TStringRef("int4")) { return std::make_shared<NDB::DataTypeInt32>(); } - + if (info.TypeName == TStringRef("int8")) { return std::make_shared<NDB::DataTypeInt64>(); } @@ -1005,9 +1005,9 @@ class TSerializeFormat : public TBoxedValue { it->second.second->writePrefix(); } it->second.second->write(it->second.first); - if (IsFinished) - it->second.second->writeSuffix(); + it->second.second->writeSuffix(); it->second.second->flush(); + it->second.second.reset(); it->second.first = HeaderBlock.cloneEmpty(); if (KeysIndexes.empty()) |