From 44fcd386bdacc662b63de5320ad88c8fa4fe7763 Mon Sep 17 00:00:00 2001
From: Changhai Man <changhai0109@hotmail.com>
Date: Fri, 19 Jan 2024 17:29:58 -0500
Subject: [PATCH] [chakra][et_feeder] changed readNextWindow to remove extra
 resolveDep

---
 et_feeder/et_feeder.cpp | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/et_feeder/et_feeder.cpp b/et_feeder/et_feeder.cpp
index 714b5d6d..901149e7 100644
--- a/et_feeder/et_feeder.cpp
+++ b/et_feeder/et_feeder.cpp
@@ -144,17 +144,21 @@ void ETFeeder::readNextWindow() {
   }
   uint32_t num_read = 0;
   do {
-    shared_ptr<ETFeederNode> new_node = readNode();
-    if (new_node == nullptr) {
-      et_complete_ = true;
-      break;
+    if (this->et_complete_) {
+      // graph read finished, but still nodes unresolved
+      // which means the graph is broken
+      assert(false);
+    }
+    for (uint32_t num_read = 0; num_read < this->window_size_; num_read++) {
+      std::shared_ptr<ETFeederNode> new_node = readNode();
+      if (new_node == nullptr) {
+        et_complete_ = true;
+        break;
+      }
+      addNode(new_node);
     }
-
-    addNode(new_node);
-    ++num_read;
-
     resolveDep();
-  } while ((num_read < window_size_) || (dep_unresolved_node_set_.size() != 0));
+  } while (dep_unresolved_node_set_.size() != 0);
 
   for (auto node_id_node : dep_graph_) {
     uint64_t node_id = node_id_node.first;