From ed97a45958dafd27313c0abc87dd96d6646dd438 Mon Sep 17 00:00:00 2001
From: Mike Barry <msb5014@gmail.com>
Date: Sun, 25 Apr 2021 17:08:01 -0400
Subject: [PATCH] iterator tweaks

---
 .idea/codeStyles/Project.xml                                | 4 ++--
 src/main/java/com/onthegomap/flatmap/MbtilesWriter.java     | 6 +++---
 .../onthegomap/flatmap/collections/MergeSortFeatureMap.java | 6 ++++--
 src/main/java/com/onthegomap/flatmap/worker/Topology.java   | 3 ++-
 .../flatmap/collections/MergeSortFeatureMapTest.java        | 4 ++--
 .../java/com/onthegomap/flatmap/worker/TopologyTest.java    | 2 +-
 6 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index 1d2b54d7..65cb4b6e 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -54,6 +54,8 @@
           <package name="" withSubpackages="true" static="false" />
         </value>
       </option>
+      <option name="NEW_LINE_AFTER_LPAREN_IN_RECORD_HEADER" value="true" />
+      <option name="RPAREN_ON_NEW_LINE_IN_RECORD_HEADER" value="true" />
     </JavaCodeStyleSettings>
     <Objective-C>
       <option name="INDENT_NAMESPACE_MEMBERS" value="0" />
@@ -578,9 +580,7 @@
     <codeStyleSettings language="protobuf">
       <option name="RIGHT_MARGIN" value="80" />
       <indentOptions>
-        <option name="INDENT_SIZE" value="2" />
         <option name="CONTINUATION_INDENT_SIZE" value="2" />
-        <option name="TAB_SIZE" value="2" />
       </indentOptions>
     </codeStyleSettings>
   </code_scheme>
diff --git a/src/main/java/com/onthegomap/flatmap/MbtilesWriter.java b/src/main/java/com/onthegomap/flatmap/MbtilesWriter.java
index d256cf64..adfd5aef 100644
--- a/src/main/java/com/onthegomap/flatmap/MbtilesWriter.java
+++ b/src/main/java/com/onthegomap/flatmap/MbtilesWriter.java
@@ -18,6 +18,8 @@ import org.slf4j.LoggerFactory;
 
 public class MbtilesWriter {
 
+  private static final Logger LOGGER = LoggerFactory.getLogger(MbtilesWriter.class);
+
   private final AtomicLong featuresProcessed = new AtomicLong(0);
   private final AtomicLong memoizedTiles = new AtomicLong(0);
   private final AtomicLong tiles = new AtomicLong(0);
@@ -27,8 +29,6 @@ public class MbtilesWriter {
     this.stats = stats;
   }
 
-  private static final Logger LOGGER = LoggerFactory.getLogger(MbtilesWriter.class);
-
   private static record RenderedTile(TileCoord tile, byte[] contents) {
 
   }
@@ -39,7 +39,7 @@ public class MbtilesWriter {
     MbtilesWriter writer = new MbtilesWriter(config.stats());
 
     var topology = Topology.start("mbtiles", stats)
-      .readFromIterator("reader", features.getAll())
+      .readFrom("reader", features)
       .addBuffer("reader_queue", 50_000, 1_000)
       .addWorker("encoder", config.threads(), writer::tileEncoder)
       .addBuffer("writer_queue", 50_000, 1_000)
diff --git a/src/main/java/com/onthegomap/flatmap/collections/MergeSortFeatureMap.java b/src/main/java/com/onthegomap/flatmap/collections/MergeSortFeatureMap.java
index 62ad2bae..a6e3966a 100644
--- a/src/main/java/com/onthegomap/flatmap/collections/MergeSortFeatureMap.java
+++ b/src/main/java/com/onthegomap/flatmap/collections/MergeSortFeatureMap.java
@@ -3,6 +3,7 @@ package com.onthegomap.flatmap.collections;
 import com.carrotsearch.hppc.LongArrayList;
 import com.onthegomap.flatmap.RenderedFeature;
 import com.onthegomap.flatmap.VectorTileEncoder;
+import com.onthegomap.flatmap.collections.MergeSortFeatureMap.TileFeatures;
 import com.onthegomap.flatmap.geo.TileCoord;
 import com.onthegomap.flatmap.monitoring.Stats;
 import java.nio.file.Path;
@@ -11,7 +12,7 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.function.Consumer;
 
-public class MergeSortFeatureMap implements Consumer<RenderedFeature> {
+public class MergeSortFeatureMap implements Consumer<RenderedFeature>, Iterable<TileFeatures> {
 
   private volatile boolean prepared = false;
 
@@ -34,7 +35,8 @@ public class MergeSortFeatureMap implements Consumer<RenderedFeature> {
     return 0;
   }
 
-  public Iterator<TileFeatures> getAll() {
+  @Override
+  public Iterator<TileFeatures> iterator() {
     if (!prepared) {
       throw new IllegalStateException("Attempting to iterate over features but not prepared yet");
     }
diff --git a/src/main/java/com/onthegomap/flatmap/worker/Topology.java b/src/main/java/com/onthegomap/flatmap/worker/Topology.java
index 9311a828..73e7bbe7 100644
--- a/src/main/java/com/onthegomap/flatmap/worker/Topology.java
+++ b/src/main/java/com/onthegomap/flatmap/worker/Topology.java
@@ -91,7 +91,8 @@ public record Topology<T>(
       return fromGenerator(name, producer, 1);
     }
 
-    public <T> Bufferable<?, T> readFromIterator(String name, Iterator<T> iter) {
+    public <T> Bufferable<?, T> readFrom(String name, Iterable<T> iterable) {
+      Iterator<T> iter = iterable.iterator();
       return fromGenerator(name, next -> {
         while (iter.hasNext()) {
           next.accept(iter.next());
diff --git a/src/test/java/com/onthegomap/flatmap/collections/MergeSortFeatureMapTest.java b/src/test/java/com/onthegomap/flatmap/collections/MergeSortFeatureMapTest.java
index a626c031..98fa29ff 100644
--- a/src/test/java/com/onthegomap/flatmap/collections/MergeSortFeatureMapTest.java
+++ b/src/test/java/com/onthegomap/flatmap/collections/MergeSortFeatureMapTest.java
@@ -18,14 +18,14 @@ public class MergeSortFeatureMapTest {
   public void testEmpty() {
     var features = new MergeSortFeatureMap(tmpDir, new InMemory());
     features.sort();
-    assertFalse(features.getAll().hasNext());
+    assertFalse(features.iterator().hasNext());
   }
 
   @Test
   public void testThrowsWhenPreparedOutOfOrder() {
     var features = new MergeSortFeatureMap(tmpDir, new InMemory());
     features.accept(new RenderedFeature(1, new byte[]{}));
-    assertThrows(IllegalStateException.class, features::getAll);
+    assertThrows(IllegalStateException.class, features::iterator);
     features.sort();
     assertThrows(IllegalStateException.class, () -> features.accept(new RenderedFeature(1, new byte[]{})));
   }
diff --git a/src/test/java/com/onthegomap/flatmap/worker/TopologyTest.java b/src/test/java/com/onthegomap/flatmap/worker/TopologyTest.java
index e826a9da..fed6e0a1 100644
--- a/src/test/java/com/onthegomap/flatmap/worker/TopologyTest.java
+++ b/src/test/java/com/onthegomap/flatmap/worker/TopologyTest.java
@@ -71,7 +71,7 @@ public class TopologyTest {
   public void testTopologyFromIterator() {
     Set<Integer> result = Collections.synchronizedSet(new TreeSet<>());
     var topology = Topology.start("test", stats)
-      .readFromIterator("reader", List.of(0, 1).iterator())
+      .readFrom("reader", List.of(0, 1))
       .addBuffer("reader_queue", 1)
       .<Integer>addWorker("process", 1, (prev, next) -> {
         Integer item;