Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix decimal comparision #4901

Merged
merged 1 commit into from
May 27, 2024
Merged

fix decimal comparision #4901

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions ydb/core/formats/arrow/switch/compare.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,9 @@ class TComparator {
case arrow::Type::DURATION:
return CompareView<arrow::DurationArray, notNull>(lhs, lpos, rhs, rpos);
case arrow::Type::DECIMAL256:
return CompareView<arrow::Decimal256Array, notNull>(lhs, lpos, rhs, rpos);
case arrow::Type::DECIMAL:
return CompareView<arrow::Decimal128Array, notNull>(lhs, lpos, rhs, rpos);
case arrow::Type::DENSE_UNION:
case arrow::Type::DICTIONARY:
case arrow::Type::EXTENSION:
Expand Down
16 changes: 6 additions & 10 deletions ydb/core/tx/columnshard/export/actor/export_actor.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@

#include <ydb/core/formats/arrow/serializer/abstract.h>
#include <ydb/core/kqp/compute_actor/kqp_compute_events.h>
#include <ydb/core/tx/columnshard/blobs_action/abstract/storage.h>
#include <ydb/core/tx/columnshard/bg_tasks/manager/actor.h>
#include <ydb/core/tx/columnshard/export/session/session.h>
#include <ydb/core/tx/columnshard/blobs_action/abstract/storage.h>
#include <ydb/core/tx/columnshard/export/common/identifier.h>
#include <ydb/core/tx/columnshard/export/events/events.h>
#include <ydb/core/tx/columnshard/export/session/selector/abstract/selector.h>
#include <ydb/core/tx/columnshard/export/session/session.h>
#include <ydb/core/tx/columnshard/hooks/abstract/abstract.h>

#include <ydb/library/actors/core/actor_bootstrapped.h>
Expand Down Expand Up @@ -87,12 +87,10 @@ class TActor: public NBackground::TSessionActor {
}

public:

TActor(std::shared_ptr<NBackground::TSession> bgSession,
const std::shared_ptr<NBackground::ITabletAdapter>& adapter, const std::shared_ptr<IBlobsStorageOperator>& blobsOperator)
TActor(std::shared_ptr<NBackground::TSession> bgSession, const std::shared_ptr<NBackground::ITabletAdapter>& adapter,
const std::shared_ptr<IBlobsStorageOperator>& blobsOperator)
: TBase(bgSession, adapter)
, BlobsOperator(blobsOperator)
{
, BlobsOperator(blobsOperator) {
ExportSession = bgSession->GetLogicAsVerifiedPtr<NExport::TSession>();
}

Expand All @@ -111,8 +109,6 @@ class TActor: public NBackground::TSessionActor {
AFL_VERIFY(false);
}
}


};

}
} // namespace NKikimr::NOlap::NExport
3 changes: 2 additions & 1 deletion ydb/core/tx/columnshard/export/session/session.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
#include "session.h"

#include <ydb/core/tx/columnshard/bg_tasks/abstract/adapter.h>
#include <ydb/core/tx/columnshard/columnshard_impl.h>
#include <ydb/core/tx/columnshard/export/actor/export_actor.h>
Expand All @@ -16,4 +17,4 @@ NKikimr::TConclusion<std::unique_ptr<NActors::IActor>> TSession::DoCreateActor(c
return std::make_unique<TActor>(context.GetSessionSelfPtr(), context.GetAdapter(), blobsOperator.DetachResult());
}

}
} // namespace NKikimr::NOlap::NExport
9 changes: 5 additions & 4 deletions ydb/core/tx/columnshard/export/session/session.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
#pragma once
#include "task.h"
#include "cursor.h"
#include "task.h"

#include <ydb/core/tablet_flat/flat_database.h>
#include <ydb/core/tx/columnshard/common/tablet_id.h>
#include <ydb/core/tx/columnshard/export/protos/task.pb.h>
#include <ydb/core/tx/columnshard/export/protos/cursor.pb.h>
#include <ydb/core/tx/columnshard/export/protos/task.pb.h>

namespace NKikimr::NColumnShard {
class TColumnShard;
Expand Down Expand Up @@ -76,6 +77,7 @@ class TSession: public NBackground::TSessionProtoAdapter<NKikimrColumnShardExpor
return result;
}
static const inline TFactory::TRegistrator<TSession> Registrator = TFactory::TRegistrator<TSession>(GetClassNameStatic());

public:
std::optional<ui64> GetTxId() const {
return Task->GetTxId();
Expand Down Expand Up @@ -147,6 +149,5 @@ class TSession: public NBackground::TSessionProtoAdapter<NKikimrColumnShardExpor
AFL_VERIFY(Status == EStatus::Started);
Status = EStatus::Finished;
}

};
}
} // namespace NKikimr::NOlap::NExport
Loading