Revert "quic: Try to unlock the circle reference in dataqueue"

This reverts commit 242dd7c.

Author: martenrichter

src/dataqueue/queue.cc

@@ -77,12 +77,6 @@ class DataQueueImpl final : public DataQueue,
   DataQueueImpl& operator=(const DataQueueImpl&) = delete;
   DataQueueImpl& operator=(DataQueueImpl&&) = delete;
 
-  ~DataQueueImpl() {
-    for (auto cur = readers_.begin(); cur != readers_.end(); cur++) {
-      (*cur)->clearPendingReads();
-    }
-  }
-
   std::shared_ptr<DataQueue> slice(
       uint64_t start,
       std::optional<uint64_t> maybeEnd = std::nullopt) override {
@@ -232,7 +226,6 @@ class DataQueueImpl final : public DataQueue,
   class NotifyReader {
    public:
     virtual void newDataOrEnd() = 0;
-    virtual void clearPendingReads() = 0;
   };
 
   void reader_destructed(NotifyReader* reader) { readers_.erase(reader); }
@@ -288,10 +281,6 @@ class IdempotentDataQueueReader final
     // Currently nothing, but it may change
   }
 
-  void clearPendingReads() override {
-    // Currently nothing, but it may change
-  }
-
   int Pull(Next next,
            int options,
            DataQueue::Vec* data,
@@ -446,7 +435,10 @@ class NonIdempotentDataQueueReader final
   }
 
   ~NonIdempotentDataQueueReader() {
-    clearPendingReads();
+    if (waited_next_) {
+      std::move(waited_next_)(
+          bob::Status::STATUS_EOS, nullptr, 0, [](uint64_t) {});
+    }
     data_queue_->reader_destructed(this);
   }
 
@@ -470,13 +462,6 @@ class NonIdempotentDataQueueReader final
     }
   }
 
-  void clearPendingReads() override {
-    if (waited_next_) {
-      std::move(waited_next_)(
-          bob::Status::STATUS_EOS, nullptr, 0, [](uint64_t) {});
-    }
-  }
-
   int Pull(Next next,
            int options,
            DataQueue::Vec* data,