Skip to content

Commit 7cceec3

Browse files
committed
fix build
1 parent ccc8239 commit 7cceec3

File tree

10 files changed

+22
-22
lines changed

10 files changed

+22
-22
lines changed

ydb/core/tx/columnshard/data_sharing/destination/transactions/tx_data_from_source.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@
99

1010
namespace NKikimr::NOlap::NDataSharing {
1111

12-
class TTxDataFromSource: public TExtendedTransactionBase<NColumnShard::TColumnShard> {
12+
class TTxDataFromSource: public NColumnShard::TExtendedTransactionBase<NColumnShard::TColumnShard> {
1313
private:
14-
using TBase = TExtendedTransactionBase<NColumnShard::TColumnShard>;
14+
using TBase = NColumnShard::TExtendedTransactionBase<NColumnShard::TColumnShard>;
1515
std::shared_ptr<TDestinationSession> Session;
1616
THashMap<ui64, NEvents::TPathIdData> PortionsByPathId;
1717
THashMap<TString, THashSet<NBlobCache::TUnifiedBlobId>> SharedBlobIds;

ydb/core/tx/columnshard/data_sharing/destination/transactions/tx_finish_ack_from_initiator.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55

66
namespace NKikimr::NOlap::NDataSharing {
77

8-
class TTxFinishAckFromInitiator: public TExtendedTransactionBase<NColumnShard::TColumnShard> {
8+
class TTxFinishAckFromInitiator: public NColumnShard::TExtendedTransactionBase<NColumnShard::TColumnShard> {
99
private:
10-
using TBase = TExtendedTransactionBase<NColumnShard::TColumnShard>;
10+
using TBase = NColumnShard::TExtendedTransactionBase<NColumnShard::TColumnShard>;
1111
std::shared_ptr<TDestinationSession> Session;
1212
protected:
1313
virtual bool DoExecute(NTabletFlatExecutor::TTransactionContext& txc, const TActorContext& ctx) override;

ydb/core/tx/columnshard/data_sharing/destination/transactions/tx_finish_from_source.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55

66
namespace NKikimr::NOlap::NDataSharing {
77

8-
class TTxFinishFromSource: public TExtendedTransactionBase<NColumnShard::TColumnShard> {
8+
class TTxFinishFromSource: public NColumnShard::TExtendedTransactionBase<NColumnShard::TColumnShard> {
99
private:
10-
using TBase = TExtendedTransactionBase<NColumnShard::TColumnShard>;
10+
using TBase = NColumnShard::TExtendedTransactionBase<NColumnShard::TColumnShard>;
1111
std::shared_ptr<TDestinationSession> Session;
1212
const TTabletId SourceTabletId;
1313
bool Finished = false;

ydb/core/tx/columnshard/data_sharing/destination/transactions/tx_start_from_initiator.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55

66
namespace NKikimr::NOlap::NDataSharing {
77

8-
class TTxProposeFromInitiator: public TExtendedTransactionBase<NColumnShard::TColumnShard> {
8+
class TTxProposeFromInitiator: public NColumnShard::TExtendedTransactionBase<NColumnShard::TColumnShard> {
99
private:
10-
using TBase = TExtendedTransactionBase<NColumnShard::TColumnShard>;
10+
using TBase = NColumnShard::TExtendedTransactionBase<NColumnShard::TColumnShard>;
1111
std::shared_ptr<TDestinationSession> Session;
1212
THashMap<TString, std::shared_ptr<TDestinationSession>>* Sessions;
1313
protected:
@@ -23,9 +23,9 @@ class TTxProposeFromInitiator: public TExtendedTransactionBase<NColumnShard::TCo
2323
TTxType GetTxType() const override { return NColumnShard::TXTYPE_DATA_SHARING_PROPOSE_FROM_INITIATOR; }
2424
};
2525

26-
class TTxConfirmFromInitiator: public TExtendedTransactionBase<NColumnShard::TColumnShard> {
26+
class TTxConfirmFromInitiator: public NColumnShard::TExtendedTransactionBase<NColumnShard::TColumnShard> {
2727
private:
28-
using TBase = TExtendedTransactionBase<NColumnShard::TColumnShard>;
28+
using TBase = NColumnShard::TExtendedTransactionBase<NColumnShard::TColumnShard>;
2929
std::shared_ptr<TDestinationSession> Session;
3030
protected:
3131
virtual bool DoExecute(NTabletFlatExecutor::TTransactionContext& txc, const TActorContext& ctx) override;

ydb/core/tx/columnshard/data_sharing/modification/transactions/tx_change_blobs_owning.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ namespace NKikimr::NOlap::NDataSharing {
77

88
class TTaskForTablet;
99

10-
class TTxApplyLinksModification: public TExtendedTransactionBase<NColumnShard::TColumnShard> {
10+
class TTxApplyLinksModification: public NColumnShard::TExtendedTransactionBase<NColumnShard::TColumnShard> {
1111
private:
12-
using TBase = TExtendedTransactionBase<NColumnShard::TColumnShard>;
12+
using TBase = NColumnShard::TExtendedTransactionBase<NColumnShard::TColumnShard>;
1313
std::shared_ptr<TTaskForTablet> Task;
1414
const TTabletId InitiatorTabletId;
1515
const TString SessionId;

ydb/core/tx/columnshard/data_sharing/source/transactions/tx_data_ack_to_source.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66

77
namespace NKikimr::NOlap::NDataSharing {
88

9-
class TTxDataAckToSource: public TExtendedTransactionBase<NColumnShard::TColumnShard> {
9+
class TTxDataAckToSource: public NColumnShard::TExtendedTransactionBase<NColumnShard::TColumnShard> {
1010
private:
11-
using TBase = TExtendedTransactionBase<NColumnShard::TColumnShard>;
11+
using TBase = NColumnShard::TExtendedTransactionBase<NColumnShard::TColumnShard>;
1212
std::shared_ptr<TSourceSession> Session;
1313
THashMap<TString, TTabletsByBlob> SharedBlobIds;
1414
protected:

ydb/core/tx/columnshard/data_sharing/source/transactions/tx_finish_ack_to_source.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55

66
namespace NKikimr::NOlap::NDataSharing {
77

8-
class TTxFinishAckToSource: public TExtendedTransactionBase<NColumnShard::TColumnShard> {
8+
class TTxFinishAckToSource: public NColumnShard::TExtendedTransactionBase<NColumnShard::TColumnShard> {
99
private:
10-
using TBase = TExtendedTransactionBase<NColumnShard::TColumnShard>;
10+
using TBase = NColumnShard::TExtendedTransactionBase<NColumnShard::TColumnShard>;
1111
std::shared_ptr<TSourceSession> Session;
1212
protected:
1313
virtual bool DoExecute(NTabletFlatExecutor::TTransactionContext& txc, const TActorContext& ctx) override;

ydb/core/tx/columnshard/data_sharing/source/transactions/tx_start_source_cursor.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55

66
namespace NKikimr::NOlap::NDataSharing {
77

8-
class TTxStartSourceCursor: public TExtendedTransactionBase<NColumnShard::TColumnShard> {
8+
class TTxStartSourceCursor: public NColumnShard::TExtendedTransactionBase<NColumnShard::TColumnShard> {
99
private:
10-
using TBase = TExtendedTransactionBase<NColumnShard::TColumnShard>;
10+
using TBase = NColumnShard::TExtendedTransactionBase<NColumnShard::TColumnShard>;
1111

1212
TSourceSession* Session;
1313
THashMap<ui64, std::vector<TPortionDataAccessor>> Portions;

ydb/core/tx/columnshard/data_sharing/source/transactions/tx_start_to_source.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55

66
namespace NKikimr::NOlap::NDataSharing {
77

8-
class TTxStartToSource: public TExtendedTransactionBase<NColumnShard::TColumnShard> {
8+
class TTxStartToSource: public NColumnShard::TExtendedTransactionBase<NColumnShard::TColumnShard> {
99
private:
10-
using TBase = TExtendedTransactionBase<NColumnShard::TColumnShard>;
10+
using TBase = NColumnShard::TExtendedTransactionBase<NColumnShard::TColumnShard>;
1111
std::shared_ptr<TSourceSession> Session;
1212
THashMap<TString, std::shared_ptr<TSourceSession>>* Sessions;
1313
protected:

ydb/core/tx/columnshard/data_sharing/source/transactions/tx_write_source_cursor.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66

77
namespace NKikimr::NOlap::NDataSharing {
88

9-
class TTxWriteSourceCursor: public TExtendedTransactionBase<NColumnShard::TColumnShard> {
9+
class TTxWriteSourceCursor: public NColumnShard::TExtendedTransactionBase<NColumnShard::TColumnShard> {
1010
private:
11-
using TBase = TExtendedTransactionBase<NColumnShard::TColumnShard>;
11+
using TBase = NColumnShard::TExtendedTransactionBase<NColumnShard::TColumnShard>;
1212
std::shared_ptr<TSourceSession> Session;
1313
protected:
1414
virtual bool DoExecute(NTabletFlatExecutor::TTransactionContext& txc, const TActorContext& ctx) override;

0 commit comments

Comments
 (0)