Skip to content

Commit 3c08910

Browse files
authored
Revert "EvWrite: add mvcc snapshot" (#11534)
1 parent d353cb0 commit 3c08910

File tree

4 files changed

+0
-21
lines changed

4 files changed

+0
-21
lines changed

ydb/core/kqp/common/kqp_tx.cpp

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -169,10 +169,6 @@ bool NeedSnapshot(const TKqpTransactionContext& txCtx, const NYql::TKikimrConfig
169169
if (!commitTx)
170170
return true;
171171

172-
if (HasOlapTableWriteInTx(physicalQuery) || HasOlapTableReadInTx(physicalQuery)) {
173-
return true;
174-
}
175-
176172
size_t readPhases = 0;
177173
bool hasEffects = false;
178174
bool hasSourceRead = false;

ydb/core/kqp/executer_actor/kqp_executer_impl.h

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -951,10 +951,6 @@ class TKqpExecuterBase : public TActorBootstrapped<TDerived> {
951951
if (!settings.GetInconsistentTx() && !settings.GetIsOlap()) {
952952
ActorIdToProto(BufferActorId, settings.MutableBufferActorId());
953953
}
954-
if (GetSnapshot().IsValid() && settings.GetIsOlap()) {
955-
settings.MutableMvccSnapshot()->SetStep(GetSnapshot().Step);
956-
settings.MutableMvccSnapshot()->SetTxId(GetSnapshot().TxId);
957-
}
958954
output.SinkSettings.ConstructInPlace();
959955
output.SinkSettings->PackFrom(settings);
960956
} else {

ydb/core/kqp/runtime/kqp_write_actor.cpp

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -170,14 +170,12 @@ class TKqpTableWriteActor : public TActorBootstrapped<TKqpTableWriteActor> {
170170
const bool inconsistentTx,
171171
const NMiniKQL::TTypeEnvironment& typeEnv,
172172
std::shared_ptr<NKikimr::NMiniKQL::TScopedAlloc> alloc,
173-
const std::optional<NKikimrDataEvents::TMvccSnapshot>& mvccSnapshot,
174173
const IKqpTransactionManagerPtr& txManager,
175174
const TActorId sessionActorId,
176175
TIntrusivePtr<TKqpCounters> counters,
177176
NWilson::TTraceId traceId)
178177
: TypeEnv(typeEnv)
179178
, Alloc(alloc)
180-
, MvccSnapshot(mvccSnapshot)
181179
, TableId(tableId)
182180
, TablePath(tablePath)
183181
, LockTxId(lockTxId)
@@ -814,9 +812,6 @@ class TKqpTableWriteActor : public TActorBootstrapped<TKqpTableWriteActor> {
814812
FillEvWritePrepare(evWrite.get(), shardId, *TxId, TxManager);
815813
} else if (!InconsistentTx) {
816814
evWrite->SetLockId(LockTxId, LockNodeId);
817-
if (MvccSnapshot) {
818-
*evWrite->Record.MutableMvccSnapshot() = *MvccSnapshot;
819-
}
820815
}
821816

822817
const auto serializationResult = ShardedWriteController->SerializeMessageToPayload(shardId, *evWrite);
@@ -958,8 +953,6 @@ class TKqpTableWriteActor : public TActorBootstrapped<TKqpTableWriteActor> {
958953
const NMiniKQL::TTypeEnvironment& TypeEnv;
959954
std::shared_ptr<NKikimr::NMiniKQL::TScopedAlloc> Alloc;
960955

961-
std::optional<NKikimrDataEvents::TMvccSnapshot> MvccSnapshot;
962-
963956
const TTableId TableId;
964957
const TString TablePath;
965958

@@ -1025,9 +1018,6 @@ class TKqpDirectWriteActor : public TActorBootstrapped<TKqpDirectWriteActor>, pu
10251018
Settings.GetInconsistentTx(),
10261019
TypeEnv,
10271020
Alloc,
1028-
Settings.GetIsOlap()
1029-
? std::optional<NKikimrDataEvents::TMvccSnapshot>{Settings.GetMvccSnapshot()}
1030-
: std::optional<NKikimrDataEvents::TMvccSnapshot>{},
10311021
nullptr,
10321022
TActorId{},
10331023
Counters,
@@ -1215,7 +1205,6 @@ struct TTransactionSettings {
12151205
ui64 LockTxId = 0;
12161206
ui64 LockNodeId = 0;
12171207
bool InconsistentTx = false;
1218-
NKikimrDataEvents::TMvccSnapshot MvccSnapshot;
12191208
};
12201209

12211210
struct TWriteSettings {
@@ -1344,7 +1333,6 @@ class TKqpBufferWriteActor :public TActorBootstrapped<TKqpBufferWriteActor>, pub
13441333
InconsistentTx,
13451334
TypeEnv,
13461335
Alloc,
1347-
std::nullopt,
13481336
TxManager,
13491337
SessionActorId,
13501338
Counters,

ydb/core/protos/kqp.proto

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -719,7 +719,6 @@ message TKqpTableSinkSettings {
719719
optional NActorsProto.TActorId BufferActorId = 10;
720720
optional int64 Priority = 11;
721721
optional bool IsOlap = 12;
722-
optional NKikimrDataEvents.TMvccSnapshot MvccSnapshot = 13;
723722
}
724723

725724
message TKqpStreamLookupSettings {

0 commit comments

Comments
 (0)