Merge 8cd317b into 54d3846

Author: Alek5andr-Kotov

ydb/core/persqueue/pqtablet/pq_impl.cpp

@@ -3509,11 +3509,6 @@ bool TPersQueue::CanProcessWriteTxs() const
     return !WriteTxs.empty();
 }
 
-bool TPersQueue::CanProcessDeleteTxs() const
-{
-    return !DeleteTxs.empty();
-}
-
 bool TPersQueue::CanProcessTxWrites() const
 {
     return !NewSupportivePartitions.empty();
@@ -3551,7 +3546,6 @@ void TPersQueue::BeginWriteTxs(const TActorContext& ctx)
     bool canProcess =
         CanProcessProposeTransactionQueue() ||
         CanProcessWriteTxs() ||
-        CanProcessDeleteTxs() ||
         CanProcessTxWrites() ||
         TxWritesChanged
         ;
@@ -3562,9 +3556,8 @@ void TPersQueue::BeginWriteTxs(const TActorContext& ctx)
     auto request = MakeHolder<TEvKeyValue::TEvRequest>();
     request->Record.SetCookie(WRITE_TX_COOKIE);
 
-    ProcessProposeTransactionQueue(ctx);
+    ProcessProposeTransactionQueue(ctx, request->Record);
     ProcessWriteTxs(ctx, request->Record);
-    ProcessDeleteTxs(ctx, request->Record);
     AddCmdWriteTabletTxInfo(request->Record);
 
     WriteTxsInProgress = true;
@@ -3620,10 +3613,15 @@ void TPersQueue::TryWriteTxs(const TActorContext& ctx)
     }
 }
 
-void TPersQueue::ProcessProposeTransactionQueue(const TActorContext& ctx)
+void TPersQueue::ProcessProposeTransactionQueue(const TActorContext& ctx,
+                                                NKikimrClient::TKeyValueRequest& request)
 {
     PQ_ENSURE(!WriteTxsInProgress);
 
+    if (CanProcessProposeTransactionQueue()) {
+        ProcessDeleteTxs(ctx, request);
+    }
+
     while (CanProcessProposeTransactionQueue()) {
         const auto front = std::move(EvProposeTransactionQueue.front());
         EvProposeTransactionQueue.pop_front();

ydb/core/persqueue/pqtablet/pq_impl.h

@@ -354,7 +354,8 @@ class TPersQueue : public NKeyValue::TKeyValueFlat {
                      const TActorContext& ctx);
     void TryWriteTxs(const TActorContext& ctx);
 
-    void ProcessProposeTransactionQueue(const TActorContext& ctx);
+    void ProcessProposeTransactionQueue(const TActorContext& ctx,
+                                        NKikimrClient::TKeyValueRequest& request);
     void ProcessPlanStep(const TActorId& sender, std::unique_ptr<TEvTxProcessing::TEvPlanStep>&& ev,
                          const TActorContext& ctx);
     void ProcessWriteTxs(const TActorContext& ctx,
@@ -503,7 +504,6 @@ class TPersQueue : public NKeyValue::TKeyValueFlat {
 
     bool CanProcessProposeTransactionQueue() const;
     bool CanProcessWriteTxs() const;
-    bool CanProcessDeleteTxs() const;
     bool CanProcessTxWrites() const;
 
     ui64 GetGeneration();