wip

Author: AdRiley

engine/runtime-instrument-common/src/main/java/org/enso/interpreter/service/ProgressAggregator.java

@@ -41,11 +41,13 @@ public ProgressAggregator(BiConsumer<Double, String> updateStatus) {
   public synchronized void create(Object key, long max) {
     Progress p;
     if (stack.isEmpty()) {
-      p = new Progress(max, 0.0, 1.0);
+      current = 0.0;
+      message = null;
+      p = new Progress(key, max, 0.0, 1.0);
     } else {
       var previous = stack.peek();
       var current = previous.from + previous.singleStep() * previous.current;
-      p = new Progress(max, current, current + previous.singleStep());
+      p = new Progress(key, max, current, current + previous.singleStep());
     }
     stack.addFirst(p);
     map.put(key, p);
@@ -54,7 +56,7 @@ public synchronized void create(Object key, long max) {
   public void closeProgress(Object key) {
     if (findBy(key) instanceof Progress p) {
       p.advance(p.max);
-      stack.remove(p);
+      p.detach();
     }
   }
 
@@ -91,12 +93,14 @@ private void advanceTo(double now) {
   }
 
   final class Progress implements AutoCloseable {
+    private final Object key;
     private final long max;
     private long current;
     private final double from;
     private final double to;
 
-    private Progress(long max, double from, double to) {
+    private Progress(Object key, long max, double from, double to) {
+      this.key = key;
       assert 0.0 <= from && from <= 1.0;
       assert 0.0 <= to && to <= 1.0;
       assert from <= to;
@@ -125,19 +129,28 @@ public final void advance(long steps) {
       try {
         this.current = Math.min(Math.addExact(this.current, steps), this.max);
         advanceTo(from + this.current * singleStep());
+        if (this.current >= this.max) {
+          detach();
+        }
       } catch (ArithmeticException e) {
         // keep unchanged
       }
     }
 
+    private void detach() {
+      synchronized (ProgressAggregator.this) {
+        stack.remove(this);
+        map.remove(key);
+      }
+    }
+
     /**
      * Closes the progress and removes it from the stack of currently active progresses. Most
      * importantly, no new progress will become child of this progress anymore.
      */
     @Override
     public void close() {
       advance(max);
-      closeProgress(this);
     }
   }
 }

engine/runtime-instrument-common/src/test/java/org/enso/interpreter/service/ProgressAggregatorTest.java

@@ -55,6 +55,18 @@ public void halfAndThird() {
     assertEquals("All done", 1.0, current, 0.001);
   }
 
+  @Test
+  public void reopeningStartsFromZero() {
+    var agg = new ProgressAggregator(this);
+    var first = create(agg, 2);
+    first.close();
+    assertEquals("First run completes", 1.0, current, 0.001);
+
+    var second = create(agg, 10);
+    second.advance(1);
+    assertEquals("Second run starts from zero again", 0.1, current, 0.001);
+  }
+
   @Override
   public void accept(Double t, String msg) {
     this.current = t;

std-bits/database/src/main/java/org/enso/database/JDBCBatchInsert.java

@@ -12,9 +12,12 @@
 import java.time.LocalDate;
 import java.time.LocalTime;
 import java.time.ZonedDateTime;
+
+import org.enso.base.ProgressReporter;
 import org.enso.base.polyglot.EnsoExceptionWrapper;
 import org.enso.base.polyglot.EnsoMeta;
 import org.enso.table.data.column.builder.Builder;
+import static org.enso.table.data.column.operation.StorageIterators.PROGRESS_STEP;
 import org.enso.table.data.column.storage.ColumnStorage;
 import org.graalvm.polyglot.Value;
 
@@ -71,6 +74,8 @@ private static void batchInsertImpl(
       var localisedStorages =
           stream(storages).map(Builder::makeLocal).toArray(ColumnStorage<?>[]::new);
 
+    try (var progressReporter =
+        ProgressReporter.createWithStep("batchInsert", numRows, batchSize)) {
       for (int rowId = 0; rowId < numRows; rowId++) {
         for (int columnId = 0; columnId < columnCount; columnId++) {
           ColumnStorage<?> columnStorage = localisedStorages[columnId];
@@ -92,7 +97,9 @@ private static void batchInsertImpl(
         if ((rowId + 1) % batchSize == 0) {
           checkRows(stmt.executeBatch(), batchSize);
         }
+        progressReporter.advance();
       }
+        }
 
       int remainingRows = numRows % batchSize;
       if (remainingRows != 0) {