eqrel: Simplify insertAll

langston-barrett · langston-barrett · commit 0ebb75fe27fa · 2022-04-29T09:38:02.000-04:00
This loop isn't parallel, so there's no reason to use getChunks. Also, use
modern C++ for-each loops and structured bindings.
diff --git a/src/include/souffle/datastructure/EquivalenceRelation.h b/src/include/souffle/datastructure/EquivalenceRelation.h
@@ -114,14 +114,10 @@ class EquivalenceRelation {
         other.genAllDisjointSetLists();
 
         // iterate over partitions at a time
-        for (typename StatesMap::chunk it : other.equivalencePartition.getChunks(MAX_THREADS)) {
-            for (auto& p : it) {
-                value_type rep = p.first;
-                StatesList& pl = *p.second;
-                const std::size_t ksize = pl.size();
-                for (std::size_t i = 0; i < ksize; ++i) {
-                    this->sds.unionNodes(rep, pl.get(i));
-                }
+        for (auto&& [rep, pl] : other.equivalencePartition) {
+            const std::size_t ksize = pl->size();
+            for (std::size_t i = 0; i < ksize; ++i) {
+                this->sds.unionNodes(rep, pl->get(i));
             }
         }
         // invalidate iterators unconditionally
