Skip to content

Commit f3f4064

Browse files
serialize not in tablet
1 parent f60b60f commit f3f4064

File tree

4 files changed

+9
-8
lines changed

4 files changed

+9
-8
lines changed

ydb/core/formats/arrow/size_calcer.cpp

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -242,11 +242,12 @@ ui64 GetArrayDataSize(const std::shared_ptr<arrow::Array>& column) {
242242
}
243243

244244
NKikimr::NArrow::TSerializedBatch TSerializedBatch::Build(std::shared_ptr<arrow::RecordBatch> batch, const TBatchSplitttingContext& context) {
245-
std::optional<TFirstLastSpecialKeys> specialKeys;
245+
std::optional<TString> specialKeys;
246246
if (context.GetFieldsForSpecialKeys().size()) {
247-
specialKeys = TFirstLastSpecialKeys(batch, context.GetFieldsForSpecialKeys());
247+
specialKeys = TFirstLastSpecialKeys(batch, context.GetFieldsForSpecialKeys()).SerializeToString();
248248
}
249-
return TSerializedBatch(NArrow::SerializeSchema(*batch->schema()), NArrow::SerializeBatchNoCompression(batch), batch->num_rows(), NArrow::GetBatchDataSize(batch), specialKeys);
249+
return TSerializedBatch(NArrow::SerializeSchema(*batch->schema()), NArrow::SerializeBatchNoCompression(batch), batch->num_rows(),
250+
NArrow::GetBatchDataSize(batch), specialKeys);
250251
}
251252

252253
TConclusionStatus TSerializedBatch::BuildWithLimit(std::shared_ptr<arrow::RecordBatch> batch, const TBatchSplitttingContext& context, std::optional<TSerializedBatch>& sbL, std::optional<TSerializedBatch>& sbR) {

ydb/core/formats/arrow/size_calcer.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -74,13 +74,13 @@ class TSerializedBatch {
7474
YDB_READONLY_DEF(TString, Data);
7575
YDB_READONLY(ui32, RowsCount, 0);
7676
YDB_READONLY(ui32, RawBytes, 0);
77-
std::optional<TFirstLastSpecialKeys> SpecialKeys;
77+
std::optional<TString> SpecialKeys;
7878
public:
7979
size_t GetSize() const {
8080
return Data.size();
8181
}
8282

83-
const TFirstLastSpecialKeys& GetSpecialKeysSafe() const {
83+
const TString& GetSpecialKeysSafe() const {
8484
AFL_VERIFY(SpecialKeys);
8585
return *SpecialKeys;
8686
}
@@ -95,7 +95,7 @@ class TSerializedBatch {
9595
static TConclusionStatus BuildWithLimit(std::shared_ptr<arrow::RecordBatch> batch, const TBatchSplitttingContext& context, std::optional<TSerializedBatch>& sbL, std::optional<TSerializedBatch>& sbR);
9696
static TSerializedBatch Build(std::shared_ptr<arrow::RecordBatch> batch, const TBatchSplitttingContext& context);
9797

98-
TSerializedBatch(TString&& schemaData, TString&& data, const ui32 rowsCount, const ui32 rawBytes, const std::optional<TFirstLastSpecialKeys>& specialKeys)
98+
TSerializedBatch(TString&& schemaData, TString&& data, const ui32 rowsCount, const ui32 rawBytes, const std::optional<TString>& specialKeys)
9999
: SchemaData(schemaData)
100100
, Data(data)
101101
, RowsCount(rowsCount)

ydb/core/tx/columnshard/background_controller.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ void TBackgroundController::CheckDeadlines() {
2020
void TBackgroundController::CheckDeadlinesIndexation() {
2121
for (auto&& i : ActiveIndexationTasks) {
2222
if (TMonotonic::Now() - i.second > NOlap::TCompactionLimits::CompactionTimeout) {
23-
AFL_CRIT(NKikimrServices::TX_COLUMNSHARD)("event", "deadline_compaction")("task_id", i.first);
23+
AFL_CRIT(NKikimrServices::TX_COLUMNSHARD)("event", "deadline_indexation")("task_id", i.first);
2424
Y_DEBUG_ABORT_UNLESS(false);
2525
}
2626
}

ydb/core/tx/columnshard/blobs_action/transaction/tx_write.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ bool TTxWrite::InsertOneBlob(TTransactionContext& txc, const NOlap::TWideSeriali
77
meta.SetNumRows(batch->GetRowsCount());
88
meta.SetRawBytes(batch->GetRawBytes());
99
meta.SetDirtyWriteTimeSeconds(batch.GetStartInstant().Seconds());
10-
meta.SetSpecialKeysRawData(batch->GetSpecialKeysSafe().SerializeToString());
10+
meta.SetSpecialKeysRawData(batch->GetSpecialKeysSafe());
1111

1212
const auto& blobRange = batch.GetRange();
1313
Y_ABORT_UNLESS(blobRange.GetBlobId().IsValid());

0 commit comments

Comments
 (0)