From d43870aaced05e0fba3a87647cd770145a0517fe Mon Sep 17 00:00:00 2001 From: ivanmorozov333 Date: Mon, 27 May 2024 18:58:47 +0300 Subject: [PATCH] fix decimal comparision formatting --- ydb/core/formats/arrow/switch/compare.h | 2 ++ .../tx/columnshard/export/actor/export_actor.h | 16 ++++++---------- .../tx/columnshard/export/session/session.cpp | 3 ++- ydb/core/tx/columnshard/export/session/session.h | 9 +++++---- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/ydb/core/formats/arrow/switch/compare.h b/ydb/core/formats/arrow/switch/compare.h index 4d93de573c40..481810147472 100644 --- a/ydb/core/formats/arrow/switch/compare.h +++ b/ydb/core/formats/arrow/switch/compare.h @@ -51,7 +51,9 @@ class TComparator { case arrow::Type::DURATION: return CompareView(lhs, lpos, rhs, rpos); case arrow::Type::DECIMAL256: + return CompareView(lhs, lpos, rhs, rpos); case arrow::Type::DECIMAL: + return CompareView(lhs, lpos, rhs, rpos); case arrow::Type::DENSE_UNION: case arrow::Type::DICTIONARY: case arrow::Type::EXTENSION: diff --git a/ydb/core/tx/columnshard/export/actor/export_actor.h b/ydb/core/tx/columnshard/export/actor/export_actor.h index 92a470a14ff6..ce4c4d517ecc 100644 --- a/ydb/core/tx/columnshard/export/actor/export_actor.h +++ b/ydb/core/tx/columnshard/export/actor/export_actor.h @@ -3,12 +3,12 @@ #include #include -#include #include -#include +#include #include #include #include +#include #include #include @@ -87,12 +87,10 @@ class TActor: public NBackground::TSessionActor { } public: - - TActor(std::shared_ptr bgSession, - const std::shared_ptr& adapter, const std::shared_ptr& blobsOperator) + TActor(std::shared_ptr bgSession, const std::shared_ptr& adapter, + const std::shared_ptr& blobsOperator) : TBase(bgSession, adapter) - , BlobsOperator(blobsOperator) - { + , BlobsOperator(blobsOperator) { ExportSession = bgSession->GetLogicAsVerifiedPtr(); } @@ -111,8 +109,6 @@ class TActor: public NBackground::TSessionActor { AFL_VERIFY(false); } } - - }; -} \ No newline at end of file +} // namespace NKikimr::NOlap::NExport diff --git a/ydb/core/tx/columnshard/export/session/session.cpp b/ydb/core/tx/columnshard/export/session/session.cpp index c9d8bde49646..b0db89bc155e 100644 --- a/ydb/core/tx/columnshard/export/session/session.cpp +++ b/ydb/core/tx/columnshard/export/session/session.cpp @@ -1,4 +1,5 @@ #include "session.h" + #include #include #include @@ -16,4 +17,4 @@ NKikimr::TConclusion> TSession::DoCreateActor(c return std::make_unique(context.GetSessionSelfPtr(), context.GetAdapter(), blobsOperator.DetachResult()); } -} +} // namespace NKikimr::NOlap::NExport diff --git a/ydb/core/tx/columnshard/export/session/session.h b/ydb/core/tx/columnshard/export/session/session.h index 7d73595a0e11..9c8915ed230b 100644 --- a/ydb/core/tx/columnshard/export/session/session.h +++ b/ydb/core/tx/columnshard/export/session/session.h @@ -1,10 +1,11 @@ #pragma once -#include "task.h" #include "cursor.h" +#include "task.h" + #include #include -#include #include +#include namespace NKikimr::NColumnShard { class TColumnShard; @@ -76,6 +77,7 @@ class TSession: public NBackground::TSessionProtoAdapter Registrator = TFactory::TRegistrator(GetClassNameStatic()); + public: std::optional GetTxId() const { return Task->GetTxId(); @@ -147,6 +149,5 @@ class TSession: public NBackground::TSessionProtoAdapter