deprecate TKqpLocks::Validate operation

refactor(kqp): deprecate TKqpLocks::Validate

3 files changed, 2 insertions, 10 deletions

diff --git a/ydb/core/kqp/executer_actor/kqp_data_executer.cpp b/ydb/core/kqp/executer_actor/kqp_data_executer.cpp
index bce4d003c9a..a3b82b31596 100644
--- a/ydb/core/kqp/executer_actor/kqp_data_executer.cpp
+++ b/ydb/core/kqp/executer_actor/kqp_data_executer.cpp
@@ -1979,9 +1979,7 @@ private:
 
             auto locksOp = needCommit
                 ? NKikimrTxDataShard::TKqpLocks::Commit
-                : (Request.ValidateLocks
-                        ? NKikimrTxDataShard::TKqpLocks::Validate
-                        : NKikimrTxDataShard::TKqpLocks::Rollback);
+                : NKikimrTxDataShard::TKqpLocks::Rollback;
 
             absl::flat_hash_set<ui64> sendingShardsSet;
             absl::flat_hash_set<ui64> receivingShardsSet;
@@ -2054,9 +2052,6 @@ private:
                     case NKikimrTxDataShard::TKqpLocks::Commit:
                         tx.SetOp(NKikimrPQ::TDataTransaction::Commit);
                         break;
-                    case NKikimrTxDataShard::TKqpLocks::Validate:
-                        tx.SetOp(NKikimrPQ::TDataTransaction::Validate);
-                        break;
                     case NKikimrTxDataShard::TKqpLocks::Rollback:
                         tx.SetOp(NKikimrPQ::TDataTransaction::Rollback);
                         break;
diff --git a/ydb/core/protos/tx_datashard.proto b/ydb/core/protos/tx_datashard.proto
index 8a1f68e16cb..9efbc6adc4c 100644
--- a/ydb/core/protos/tx_datashard.proto
+++ b/ydb/core/protos/tx_datashard.proto
@@ -120,7 +120,7 @@ message TKqpLocks {
 
     enum ELocksOp {
         Unspecified = 0;
-        Validate = 1;
+        reserved 1; // Validate op is deprecated
         Commit = 2; // Validate locks, commit buffered changes and erase locks
         Rollback = 3; // Rollback buffered changes and erase locks
     }
diff --git a/ydb/core/tx/datashard/datashard_kqp.cpp b/ydb/core/tx/datashard/datashard_kqp.cpp
index fa3a4842d47..29399bce451 100644
--- a/ydb/core/tx/datashard/datashard_kqp.cpp
+++ b/ydb/core/tx/datashard/datashard_kqp.cpp
@@ -208,7 +208,6 @@ NDq::ERunStatus RunKqpTransactionInternal(const TActorContext& ctx, ui64 txId,
 
 bool NeedValidateLocks(NKikimrTxDataShard::TKqpLocks_ELocksOp op) {
     switch (op) {
-        case NKikimrTxDataShard::TKqpLocks::Validate:
         case NKikimrTxDataShard::TKqpLocks::Commit:
             return true;
 
@@ -224,7 +223,6 @@ bool NeedEraseLocks(NKikimrTxDataShard::TKqpLocks_ELocksOp op) {
         case NKikimrTxDataShard::TKqpLocks::Rollback:
             return true;
 
-        case NKikimrTxDataShard::TKqpLocks::Validate:
         case NKikimrTxDataShard::TKqpLocks::Unspecified:
             return false;
     }
@@ -235,7 +233,6 @@ bool NeedCommitLocks(NKikimrTxDataShard::TKqpLocks_ELocksOp op) {
         case NKikimrTxDataShard::TKqpLocks::Commit:
             return true;
 
-        case NKikimrTxDataShard::TKqpLocks::Validate:
         case NKikimrTxDataShard::TKqpLocks::Rollback:
         case NKikimrTxDataShard::TKqpLocks::Unspecified:
             return false;