Slight robustness tweak to ReadStreamToList

Author: Yaytay

query-engine/docs/query-engine-compose.yml

@@ -50,7 +50,7 @@ services:
     - 16686:16686
 
   query-engine:
-    image: ghcr.io/yaytay/query-engine-design-mode:0.0.64-main
+    image: ghcr.io/yaytay/query-engine-design-mode:0.0.64-1-main
     ports:
     - 2000:8080
     volumes:

query-engine/src/main/java/uk/co/spudsoft/query/exec/fmts/ReadStreamToList.java

@@ -62,11 +62,17 @@ public static <T, U> Future<List<U>> map(ReadStream<T> input, Function<T, U> map
     List<U> collected = new ArrayList<>();
 
     input.endHandler(v -> {
-      promise.complete(collected);
+      promise.tryComplete(collected);
     }).exceptionHandler(ex -> {
-      promise.fail(ex);
+      logger.warn("Exception capturing stream: {}", ex);
+      promise.tryFail(ex);
     }).handler(item -> {
-      collected.add(mapper.apply(item));
+      try {
+        U value = mapper.apply(item);
+        collected.add(value);
+      } catch (Throwable ex) {
+        logger.warn("Failed to map value ({}): ", item, ex);
+      }
     });
 
     input.resume();
@@ -87,9 +93,9 @@ public static <T> Future<List<T>> captureByBatch(ReadStream<T> input, int initia
     List<T> collected = new ArrayList<>();
 
     input.endHandler(v -> {
-      promise.complete(collected);
+      promise.tryComplete(collected);
     }).exceptionHandler(ex -> {
-      promise.fail(ex);
+      promise.tryFail(ex);
     }).handler(item -> {
       logger.debug("Got item: {}", item);
       collected.add(item);

query-engine/src/main/java/uk/co/spudsoft/query/exec/fmts/json/FormatJsonInstance.java

@@ -210,7 +210,7 @@ private Future<Void> start() {
           if (defn.isCompatibleTypeNames()) {
             if (cd.type() == DataType.Boolean) {
               typeName = "bool";
-            } if (cd.type() == DataType.Integer || cd.type() == DataType.Long) {
+            } else if (cd.type() == DataType.Integer || cd.type() == DataType.Long) {
               typeName = "bool";
             } else {
               typeName = typeName.toLowerCase(Locale.ROOT);

query-engine/src/main/java/uk/co/spudsoft/query/main/Version.java

@@ -34,7 +34,7 @@ public final class Version {
   /**
    * The project version, as set in the Maven pom.xml.
    */
-  public static final String MAVEN_PROJECT_VERSION = "0.0.64-main";
+  public static final String MAVEN_PROJECT_VERSION = "0.0.64-1-main";
 
   private Version() {
   }