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

move tx_extension.h to a common place #13165

Merged
merged 3 commits into from
Jan 4, 2025
Merged

move tx_extension.h to a common place #13165

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0c5657d
move tx_extension.h to a common place
zverevgeny Jan 4, 2025
ccc8239
Update ya.make
zverevgeny Jan 4, 2025
7cceec3
fix build
zverevgeny Jan 4, 2025
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
10 changes: 5 additions & 5 deletions ydb/core/tx/columnshard/blobs_action/transaction/tx_blobs_written.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#pragma once
#include <ydb/core/tx/columnshard/blobs_action/abstract/write.h>
#include <ydb/core/tx/columnshard/columnshard_impl.h>
#include <ydb/core/tx/columnshard/data_sharing/common/transactions/tx_extension.h>
#include <ydb/core/tx/columnshard/tablet/ext_tx_base.h>
#include <ydb/core/tx/columnshard/engines/portions/portion_info.h>
#include <ydb/core/tx/columnshard/engines/portions/write_with_blobs.h>
#include <ydb/core/tx/columnshard/engines/writer/indexed_blob_constructor.h>
Expand All @@ -12,9 +12,9 @@ namespace NKikimr::NColumnShard {

class TColumnShard;

class TTxBlobsWritingFinished: public NOlap::NDataSharing::TExtendedTransactionBase<TColumnShard> {
class TTxBlobsWritingFinished: public TExtendedTransactionBase<TColumnShard> {
private:
using TBase = NOlap::NDataSharing::TExtendedTransactionBase<TColumnShard>;
using TBase = TExtendedTransactionBase<TColumnShard>;
std::vector<TInsertedPortions> Packs;
const std::shared_ptr<NOlap::IBlobsWritingAction> WritingActions;
std::optional<NOlap::TSnapshot> CommitSnapshot;
Expand Down Expand Up @@ -51,9 +51,9 @@ class TTxBlobsWritingFinished: public NOlap::NDataSharing::TExtendedTransactionB
}
};

class TTxBlobsWritingFailed: public NOlap::NDataSharing::TExtendedTransactionBase<TColumnShard> {
class TTxBlobsWritingFailed: public TExtendedTransactionBase<TColumnShard> {
private:
using TBase = NOlap::NDataSharing::TExtendedTransactionBase<TColumnShard>;
using TBase = TExtendedTransactionBase<TColumnShard>;
const NKikimrProto::EReplyStatus PutBlobResult;
std::vector<TInsertedPortions> Packs;

Expand Down
6 changes: 3 additions & 3 deletions ydb/core/tx/columnshard/blobs_action/transaction/tx_write.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
#pragma once
#include <ydb/core/tx/columnshard/columnshard_impl.h>
#include <ydb/core/tx/columnshard/data_sharing/common/transactions/tx_extension.h>
#include <ydb/core/tx/columnshard/tablet/ext_tx_base.h>
#include <ydb/core/tx/columnshard/engines/writer/indexed_blob_constructor.h>

namespace NKikimr::NColumnShard {

class TTxWrite: public NOlap::NDataSharing::TExtendedTransactionBase<TColumnShard> {
class TTxWrite: public TExtendedTransactionBase<TColumnShard> {
private:
using TBase = NOlap::NDataSharing::TExtendedTransactionBase<TColumnShard>;
using TBase = TExtendedTransactionBase<TColumnShard>;

public:
TTxWrite(TColumnShard* self, const TEvPrivate::TEvWriteBlobsResult::TPtr& putBlobResult)
Expand Down
2 changes: 1 addition & 1 deletion ydb/core/tx/columnshard/columnshard_impl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
#include "blobs_action/events/delete_blobs.h"
#include "counters/columnshard.h"
#include "counters/counters_manager.h"
#include "data_sharing/common/transactions/tx_extension.h"
#include "tablet/ext_tx_base.h"
#include "data_sharing/destination/events/control.h"
#include "data_sharing/destination/events/transfer.h"
#include "data_sharing/manager/sessions.h"
Expand Down
17 changes: 0 additions & 17 deletions ydb/core/tx/columnshard/data_sharing/common/transactions/ya.make
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion ydb/core/tx/columnshard/data_sharing/common/ya.make
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ LIBRARY()

PEERDIR(
ydb/core/tx/columnshard/data_sharing/common/session
ydb/core/tx/columnshard/data_sharing/common/transactions
ydb/core/tx/columnshard/data_sharing/common/context
)

Expand Down
2 changes: 1 addition & 1 deletion ydb/core/tx/columnshard/data_sharing/destination/session/ya.make
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ SRCS(
PEERDIR(
ydb/core/tx/columnshard/data_sharing/initiator/controller
ydb/core/tx/columnshard/data_sharing/common/session
ydb/core/tx/columnshard/data_sharing/common/transactions
ydb/core/tx/columnshard/tablet
ydb/core/tx/columnshard/data_sharing/destination/transactions
)

Expand Down
6 changes: 3 additions & 3 deletions ydb/core/tx/columnshard/data_sharing/destination/transactions/tx_data_from_source.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
#pragma once
#include <ydb/core/tx/columnshard/blob_cache.h>
#include <ydb/core/tx/columnshard/columnshard_impl.h>
#include <ydb/core/tx/columnshard/data_sharing/common/transactions/tx_extension.h>
#include <ydb/core/tx/columnshard/tablet/ext_tx_base.h>
#include <ydb/core/tx/columnshard/data_sharing/destination/events/transfer.h>
#include <ydb/core/tx/columnshard/data_sharing/destination/session/destination.h>
#include <ydb/core/tx/columnshard/data_sharing/manager/shared_blobs.h>
#include <ydb/core/tx/columnshard/engines/scheme/schema_version.h>

namespace NKikimr::NOlap::NDataSharing {

class TTxDataFromSource: public TExtendedTransactionBase<NColumnShard::TColumnShard> {
class TTxDataFromSource: public NColumnShard::TExtendedTransactionBase<NColumnShard::TColumnShard> {
private:
using TBase = TExtendedTransactionBase<NColumnShard::TColumnShard>;
using TBase = NColumnShard::TExtendedTransactionBase<NColumnShard::TColumnShard>;
std::shared_ptr<TDestinationSession> Session;
THashMap<ui64, NEvents::TPathIdData> PortionsByPathId;
THashMap<TString, THashSet<NBlobCache::TUnifiedBlobId>> SharedBlobIds;
Expand Down
6 changes: 3 additions & 3 deletions ydb/core/tx/columnshard/data_sharing/destination/transactions/tx_finish_ack_from_initiator.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
#pragma once
#include <ydb/core/tx/columnshard/columnshard_impl.h>
#include <ydb/core/tx/columnshard/data_sharing/common/transactions/tx_extension.h>
#include <ydb/core/tx/columnshard/tablet/ext_tx_base.h>
#include <ydb/core/tx/columnshard/data_sharing/destination/session/destination.h>

namespace NKikimr::NOlap::NDataSharing {

class TTxFinishAckFromInitiator: public TExtendedTransactionBase<NColumnShard::TColumnShard> {
class TTxFinishAckFromInitiator: public NColumnShard::TExtendedTransactionBase<NColumnShard::TColumnShard> {
private:
using TBase = TExtendedTransactionBase<NColumnShard::TColumnShard>;
using TBase = NColumnShard::TExtendedTransactionBase<NColumnShard::TColumnShard>;
std::shared_ptr<TDestinationSession> Session;
protected:
virtual bool DoExecute(NTabletFlatExecutor::TTransactionContext& txc, const TActorContext& ctx) override;
Expand Down
6 changes: 3 additions & 3 deletions ydb/core/tx/columnshard/data_sharing/destination/transactions/tx_finish_from_source.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
#pragma once
#include <ydb/core/tx/columnshard/columnshard_impl.h>
#include <ydb/core/tx/columnshard/data_sharing/common/transactions/tx_extension.h>
#include <ydb/core/tx/columnshard/tablet/ext_tx_base.h>
#include <ydb/core/tx/columnshard/data_sharing/destination/session/destination.h>

namespace NKikimr::NOlap::NDataSharing {

class TTxFinishFromSource: public TExtendedTransactionBase<NColumnShard::TColumnShard> {
class TTxFinishFromSource: public NColumnShard::TExtendedTransactionBase<NColumnShard::TColumnShard> {
private:
using TBase = TExtendedTransactionBase<NColumnShard::TColumnShard>;
using TBase = NColumnShard::TExtendedTransactionBase<NColumnShard::TColumnShard>;
std::shared_ptr<TDestinationSession> Session;
const TTabletId SourceTabletId;
bool Finished = false;
Expand Down
10 changes: 5 additions & 5 deletions ydb/core/tx/columnshard/data_sharing/destination/transactions/tx_start_from_initiator.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
#pragma once
#include <ydb/core/tx/columnshard/columnshard_impl.h>
#include <ydb/core/tx/columnshard/data_sharing/common/transactions/tx_extension.h>
#include <ydb/core/tx/columnshard/tablet/ext_tx_base.h>
#include <ydb/core/tx/columnshard/data_sharing/destination/session/destination.h>

namespace NKikimr::NOlap::NDataSharing {

class TTxProposeFromInitiator: public TExtendedTransactionBase<NColumnShard::TColumnShard> {
class TTxProposeFromInitiator: public NColumnShard::TExtendedTransactionBase<NColumnShard::TColumnShard> {
private:
using TBase = TExtendedTransactionBase<NColumnShard::TColumnShard>;
using TBase = NColumnShard::TExtendedTransactionBase<NColumnShard::TColumnShard>;
std::shared_ptr<TDestinationSession> Session;
THashMap<TString, std::shared_ptr<TDestinationSession>>* Sessions;
protected:
Expand All @@ -23,9 +23,9 @@ class TTxProposeFromInitiator: public TExtendedTransactionBase<NColumnShard::TCo
TTxType GetTxType() const override { return NColumnShard::TXTYPE_DATA_SHARING_PROPOSE_FROM_INITIATOR; }
};

class TTxConfirmFromInitiator: public TExtendedTransactionBase<NColumnShard::TColumnShard> {
class TTxConfirmFromInitiator: public NColumnShard::TExtendedTransactionBase<NColumnShard::TColumnShard> {
private:
using TBase = TExtendedTransactionBase<NColumnShard::TColumnShard>;
using TBase = NColumnShard::TExtendedTransactionBase<NColumnShard::TColumnShard>;
std::shared_ptr<TDestinationSession> Session;
protected:
virtual bool DoExecute(NTabletFlatExecutor::TTransactionContext& txc, const TActorContext& ctx) override;
Expand Down
2 changes: 1 addition & 1 deletion ydb/core/tx/columnshard/data_sharing/destination/transactions/ya.make
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ SRCS(
PEERDIR(
ydb/core/tx/tiering
ydb/core/tx/columnshard/data_sharing/protos
ydb/core/tx/columnshard/data_sharing/common/transactions
ydb/core/tx/columnshard/tablet
)

END()
2 changes: 1 addition & 1 deletion ydb/core/tx/columnshard/data_sharing/modification/tasks/ya.make
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ SRCS(
PEERDIR(
ydb/core/tx/columnshard/data_sharing/initiator/controller
ydb/core/tx/columnshard/data_sharing/common/session
ydb/core/tx/columnshard/data_sharing/common/transactions
ydb/core/tx/columnshard/tablet
ydb/core/tx/columnshard/data_sharing/destination/transactions
)

Expand Down
6 changes: 3 additions & 3 deletions ydb/core/tx/columnshard/data_sharing/modification/transactions/tx_change_blobs_owning.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
#pragma once
#include <ydb/core/tx/columnshard/columnshard_impl.h>
#include <ydb/core/tx/columnshard/engines/writer/indexed_blob_constructor.h>
#include <ydb/core/tx/columnshard/data_sharing/common/transactions/tx_extension.h>
#include <ydb/core/tx/columnshard/tablet/ext_tx_base.h>

namespace NKikimr::NOlap::NDataSharing {

class TTaskForTablet;

class TTxApplyLinksModification: public TExtendedTransactionBase<NColumnShard::TColumnShard> {
class TTxApplyLinksModification: public NColumnShard::TExtendedTransactionBase<NColumnShard::TColumnShard> {
private:
using TBase = TExtendedTransactionBase<NColumnShard::TColumnShard>;
using TBase = NColumnShard::TExtendedTransactionBase<NColumnShard::TColumnShard>;
std::shared_ptr<TTaskForTablet> Task;
const TTabletId InitiatorTabletId;
const TString SessionId;
Expand Down
6 changes: 3 additions & 3 deletions ydb/core/tx/columnshard/data_sharing/source/transactions/tx_data_ack_to_source.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
#pragma once
#include <ydb/core/tx/columnshard/columnshard_impl.h>
#include <ydb/core/tx/columnshard/data_sharing/common/transactions/tx_extension.h>
#include <ydb/core/tx/columnshard/tablet/ext_tx_base.h>
#include <ydb/core/tx/columnshard/data_sharing/source/session/source.h>
#include <ydb/core/tx/columnshard/blob_cache.h>

namespace NKikimr::NOlap::NDataSharing {

class TTxDataAckToSource: public TExtendedTransactionBase<NColumnShard::TColumnShard> {
class TTxDataAckToSource: public NColumnShard::TExtendedTransactionBase<NColumnShard::TColumnShard> {
private:
using TBase = TExtendedTransactionBase<NColumnShard::TColumnShard>;
using TBase = NColumnShard::TExtendedTransactionBase<NColumnShard::TColumnShard>;
std::shared_ptr<TSourceSession> Session;
THashMap<TString, TTabletsByBlob> SharedBlobIds;
protected:
Expand Down
6 changes: 3 additions & 3 deletions ydb/core/tx/columnshard/data_sharing/source/transactions/tx_finish_ack_to_source.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
#pragma once
#include <ydb/core/tx/columnshard/columnshard_impl.h>
#include <ydb/core/tx/columnshard/data_sharing/common/transactions/tx_extension.h>
#include <ydb/core/tx/columnshard/tablet/ext_tx_base.h>
#include <ydb/core/tx/columnshard/data_sharing/source/session/source.h>

namespace NKikimr::NOlap::NDataSharing {

class TTxFinishAckToSource: public TExtendedTransactionBase<NColumnShard::TColumnShard> {
class TTxFinishAckToSource: public NColumnShard::TExtendedTransactionBase<NColumnShard::TColumnShard> {
private:
using TBase = TExtendedTransactionBase<NColumnShard::TColumnShard>;
using TBase = NColumnShard::TExtendedTransactionBase<NColumnShard::TColumnShard>;
std::shared_ptr<TSourceSession> Session;
protected:
virtual bool DoExecute(NTabletFlatExecutor::TTransactionContext& txc, const TActorContext& ctx) override;
Expand Down
6 changes: 3 additions & 3 deletions ydb/core/tx/columnshard/data_sharing/source/transactions/tx_start_source_cursor.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
#pragma once
#include <ydb/core/tx/columnshard/columnshard_impl.h>
#include <ydb/core/tx/columnshard/data_sharing/common/transactions/tx_extension.h>
#include <ydb/core/tx/columnshard/tablet/ext_tx_base.h>
#include <ydb/core/tx/columnshard/data_sharing/source/session/source.h>

namespace NKikimr::NOlap::NDataSharing {

class TTxStartSourceCursor: public TExtendedTransactionBase<NColumnShard::TColumnShard> {
class TTxStartSourceCursor: public NColumnShard::TExtendedTransactionBase<NColumnShard::TColumnShard> {
private:
using TBase = TExtendedTransactionBase<NColumnShard::TColumnShard>;
using TBase = NColumnShard::TExtendedTransactionBase<NColumnShard::TColumnShard>;

TSourceSession* Session;
THashMap<ui64, std::vector<TPortionDataAccessor>> Portions;
Expand Down
6 changes: 3 additions & 3 deletions ydb/core/tx/columnshard/data_sharing/source/transactions/tx_start_to_source.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
#pragma once
#include <ydb/core/tx/columnshard/columnshard_impl.h>
#include <ydb/core/tx/columnshard/data_sharing/common/transactions/tx_extension.h>
#include <ydb/core/tx/columnshard/tablet/ext_tx_base.h>
#include <ydb/core/tx/columnshard/data_sharing/source/session/source.h>

namespace NKikimr::NOlap::NDataSharing {

class TTxStartToSource: public TExtendedTransactionBase<NColumnShard::TColumnShard> {
class TTxStartToSource: public NColumnShard::TExtendedTransactionBase<NColumnShard::TColumnShard> {
private:
using TBase = TExtendedTransactionBase<NColumnShard::TColumnShard>;
using TBase = NColumnShard::TExtendedTransactionBase<NColumnShard::TColumnShard>;
std::shared_ptr<TSourceSession> Session;
THashMap<TString, std::shared_ptr<TSourceSession>>* Sessions;
protected:
Expand Down
6 changes: 3 additions & 3 deletions ydb/core/tx/columnshard/data_sharing/source/transactions/tx_write_source_cursor.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
#pragma once
#include <ydb/core/tx/columnshard/columnshard_impl.h>
#include <ydb/core/tx/columnshard/data_sharing/common/transactions/tx_extension.h>
#include <ydb/core/tx/columnshard/tablet/ext_tx_base.h>
#include <ydb/core/tx/columnshard/data_sharing/source/session/source.h>
#include <ydb/core/tx/columnshard/blob_cache.h>

namespace NKikimr::NOlap::NDataSharing {

class TTxWriteSourceCursor: public TExtendedTransactionBase<NColumnShard::TColumnShard> {
class TTxWriteSourceCursor: public NColumnShard::TExtendedTransactionBase<NColumnShard::TColumnShard> {
private:
using TBase = TExtendedTransactionBase<NColumnShard::TColumnShard>;
using TBase = NColumnShard::TExtendedTransactionBase<NColumnShard::TColumnShard>;
std::shared_ptr<TSourceSession> Session;
protected:
virtual bool DoExecute(NTabletFlatExecutor::TTransactionContext& txc, const TActorContext& ctx) override;
Expand Down
2 changes: 1 addition & 1 deletion ydb/core/tx/columnshard/data_sharing/source/transactions/ya.make
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ SRCS(
)

PEERDIR(
ydb/core/tx/columnshard/data_sharing/common/transactions
ydb/core/tx/columnshard/tablet
)

END()
7 changes: 3 additions & 4 deletions ydb/core/tx/columnshard/inflight_request_tracker.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
#include "columnshard_impl.h"
#include "columnshard_schema.h"
#include "inflight_request_tracker.h"

#include "data_sharing/common/transactions/tx_extension.h"
#include "tablet/ext_tx_base.h"
#include "engines/column_engine.h"
#include "engines/reader/plain_reader/constructor/read_metadata.h"
#include "hooks/abstract/abstract.h"
Expand Down Expand Up @@ -60,9 +59,9 @@ void TInFlightReadsTracker::AddToInFlightRequest(
}

namespace {
class TTransactionSavePersistentSnapshots: public NOlap::NDataSharing::TExtendedTransactionBase<NColumnShard::TColumnShard> {
class TTransactionSavePersistentSnapshots: public TExtendedTransactionBase<NColumnShard::TColumnShard> {
private:
using TBase = NOlap::NDataSharing::TExtendedTransactionBase<NColumnShard::TColumnShard>;
using TBase = TExtendedTransactionBase<NColumnShard::TColumnShard>;
const std::set<NOlap::TSnapshot> SaveSnapshots;
const std::set<NOlap::TSnapshot> RemoveSnapshots;
virtual bool DoExecute(NTabletFlatExecutor::TTransactionContext& txc, const TActorContext& /*ctx*/) override {
Expand Down
0 ...ring/common/transactions/tx_extension.cpp → ...ore/tx/columnshard/tablet/ext_tx_base.cpp
View file
Open in desktop
File renamed without changes.
5 changes: 3 additions & 2 deletions ...haring/common/transactions/tx_extension.h → ydb/core/tx/columnshard/tablet/ext_tx_base.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,9 @@
#include <ydb/core/tablet_flat/tablet_flat_executor.h>
#include <ydb/library/actors/core/actor.h>

namespace NKikimr::NOlap::NDataSharing {
namespace NKikimr::NColumnShard {

//Base class for LocalDB transactions with ColumnShard specific
template <class TShard>
class TExtendedTransactionBase: public NTabletFlatExecutor::TTransactionBase<TShard> {
private:
Expand Down Expand Up @@ -32,4 +33,4 @@ class TExtendedTransactionBase: public NTabletFlatExecutor::TTransactionBase<TSh
}
};

}
} //namespace NKikimr::NColumnShard
1 change: 1 addition & 0 deletions ydb/core/tx/columnshard/tablet/ya.make
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
LIBRARY()

SRCS(
ext_tx_base.h
write_queue.cpp
)

Expand Down
Loading
Loading