Revert "Refine cancel for read thread stream (#8511)" (#8541)

close #8539
pingcap · Dec 18, 2023 · 72db405 · 72db405
1 parent 1a67f37
commit 72db405
Showing 1 changed file with 5 additions and 15 deletions.
diff --git a/dbms/src/Storages/DeltaMerge/ReadThread/UnorderedInputStream.h b/dbms/src/Storages/DeltaMerge/ReadThread/UnorderedInputStream.h
@@ -46,9 +46,11 @@ class UnorderedInputStream : public IProfilingBlockInputStream
         LOG_DEBUG(log, "Created, pool_id={} ref_no={}", task_pool->pool_id, ref_no);
     }
 
-    void cancel(bool /*kill*/) override { decreaseRefCount(true); }
-
-    ~UnorderedInputStream() override { decreaseRefCount(false); }
+    ~UnorderedInputStream() override
+    {
+        task_pool->decreaseUnorderedInputStreamRefCount();
+        LOG_DEBUG(log, "Destroy, pool_id={} ref_no={}", task_pool->pool_id, ref_no);
+    }
 
     String getName() const override { return NAME; }
 
@@ -65,16 +67,6 @@ class UnorderedInputStream : public IProfilingBlockInputStream
     }
 
 protected:
-    void decreaseRefCount(bool is_cancel)
-    {
-        bool ori = false;
-        if (is_stopped.compare_exchange_strong(ori, true))
-        {
-            task_pool->decreaseUnorderedInputStreamRefCount();
-            LOG_DEBUG(log, "{}, pool_id={} ref_no={}", is_cancel ? "Cancel" : "Destroy", task_pool->pool_id, ref_no);
-        }
-    }
-
     Block readImpl() override
     {
         FilterPtr filter_ignored;
@@ -154,7 +146,5 @@ class UnorderedInputStream : public IProfilingBlockInputStream
     // runtime filter
     std::vector<RuntimeFilterPtr> runtime_filter_list;
     int max_wait_time_ms;
-
-    std::atomic_bool is_stopped = false;
 };
 } // namespace DB::DM