[FIX] ArrayBuilder/ValueBuilder: Always pass interruptible job. Closes #2568

Author: ChristianGruen

basex-core/src/main/java/org/basex/io/parse/csv/CsvW3Converter.java

@@ -38,7 +38,8 @@ protected Value finish(final InputInfo ii, final QueryContext qc) throws QueryEx
     final XQMap map = (XQMap) super.finish(ii, qc);
     Value columns = copts.get(CsvOptions.HEADER);
     if(columns.seqType().instanceOf(BOOLEAN_O)) {
-      columns = map.get(CsvXQueryConverter.NAMES).atomValue(qc, ii);
+      columns = map.get(CsvXQueryConverter.NAMES);
+      if(qc != null) columns = columns.atomValue(qc, ii);
     }
     final MapBuilder columnIndexBuilder = new MapBuilder();
     int i = 0;

basex-core/src/main/java/org/basex/io/parse/json/JsonConverter.java

@@ -3,6 +3,7 @@
 import java.io.*;
 
 import org.basex.build.json.*;
+import org.basex.core.jobs.*;
 import org.basex.io.*;
 import org.basex.io.in.*;
 import org.basex.query.*;
@@ -18,7 +19,7 @@
  * @author BaseX Team, BSD License
  * @author Leo Woerteler
  */
-public abstract class JsonConverter {
+public abstract class JsonConverter extends Job {
   /** Shared data references. */
   protected final SharedData shared = new SharedData();
   /** JSON options. */
@@ -30,8 +31,8 @@ public abstract class JsonConverter {
   protected QueryFunction<byte[], Item> numberParser;
   /** Null value. */
   protected Value nullValue = Empty.VALUE;
-  /** Query context (can be {@code null}). */
-  protected QueryContext qctx;
+  /** Interruptible job. */
+  protected Job job;
 
   /**
    * Returns a JSON converter for the given configuration.
@@ -92,7 +93,7 @@ public final void nullValue(final Value item) {
   public final Value convert(final IO input) throws QueryException, IOException {
     final String encoding = jopts.get(JsonParserOptions.ENCODING);
     try(NewlineInput ni = new NewlineInput(input, encoding)) {
-      return convert(ni, input.url(), null, null);
+      return convert(ni, input.url(), null, this);
     }
   }
 
@@ -101,14 +102,14 @@ public final Value convert(final IO input) throws QueryException, IOException {
    * @param input input
    * @param uri uri (can be empty)
    * @param ii input info (can be {@code null})
-   * @param qc query context (if {@code null}, result may lack XQuery-specific contents)
+   * @param jb interruptible job
    * @return result
    * @throws QueryException query exception
    * @throws IOException I/O exception
    */
   public final Value convert(final TextInput input, final String uri, final InputInfo ii,
-      final QueryContext qc) throws QueryException, IOException {
-    qctx = qc;
+      final Job jb) throws QueryException, IOException {
+    job = jb;
     init(uri);
     new JsonParser(input, jopts, this).parse(ii);
     return finish();

basex-core/src/main/java/org/basex/io/parse/json/JsonW3Converter.java

@@ -88,7 +88,7 @@ protected void closeObject() {
 
   @Override
   protected void openArray() {
-    arrays.push(new ArrayBuilder(qctx));
+    arrays.push(new ArrayBuilder(job));
   }
 
   @Override

basex-core/src/main/java/org/basex/query/util/DataBuilder.java

@@ -5,6 +5,7 @@
 import java.util.*;
 
 import org.basex.core.*;
+import org.basex.core.jobs.*;
 import org.basex.data.*;
 import org.basex.query.*;
 import org.basex.query.iter.*;
@@ -24,8 +25,8 @@
  * @author Christian Gruen
  */
 public final class DataBuilder {
-  /** Query context. */
-  private final QueryContext qc;
+  /** Interruptible job. */
+  private final Job job;
   /** Target data instance. */
   private final MemData data;
   /** Full-text result builder. */
@@ -34,11 +35,11 @@ public final class DataBuilder {
   /**
    * Constructor.
    * @param data target data
-   * @param qc query context (can be {@code null})
+   * @param job interruptible job (can be {@code null})
    */
-  public DataBuilder(final MemData data, final QueryContext qc) {
+  public DataBuilder(final MemData data, final Job job) {
     this.data = data;
-    this.qc = qc;
+    this.job = job != null ? job : new Job() { };
   }
 
   /**
@@ -99,7 +100,7 @@ private static void limit(final int value, final int limit, final String message
    * @return PRE value of next node
    */
   private int addNode(final ANode node, final int pre, final int par) {
-    if(qc != null) qc.checkStop();
+    job.checkStop();
     return switch((NodeType) node.type) {
       case DOCUMENT_NODE -> addDoc(node, pre);
       case ELEMENT -> addElem(node, pre, par);

basex-core/src/main/java/org/basex/query/util/DeepEqual.java

@@ -21,14 +21,14 @@ public final class DeepEqual {
 
   /** Input info (can be {@code null}). */
   public final InputInfo info;
-  /** Query context (to interrupt process, can be {@code null}). */
+  /** Query context (can be {@code null}). */
   public final QueryContext qc;
   /** Collation. */
   public final Collation coll;
   /** Options. */
   public final DeepEqualOptions options;
 
-  /** Comparison function. */
+  /** Comparison function (requires {@link #qc} to be assigned). */
   public FItem itemsEqual;
   /** Flag for nested node comparisons. */
   public boolean nested;

basex-core/src/main/java/org/basex/query/util/fingertree/DeepTree.java

@@ -1,6 +1,6 @@
 package org.basex.query.util.fingertree;
 
-import org.basex.query.*;
+import org.basex.core.jobs.*;
 import org.basex.util.*;
 
 /**
@@ -245,14 +245,14 @@ public DeepTree<N, E> concat(final Node<N, E>[] nodes, final long sz,
   }
 
   @Override
-  public FingerTree<N, E> reverse(final QueryContext qc) {
-    qc.checkStop();
+  public FingerTree<N, E> reverse(final Job job) {
+    job.checkStop();
     final int l = left.length, r = right.length;
     @SuppressWarnings("unchecked")
     final Node<N, E>[] newLeft = new Node[r], newRight = new Node[l];
     for(int i = 0; i < r; i++) newLeft[i] = right[r - 1 - i].reverse();
     for(int i = 0; i < l; i++) newRight[i] = left[l - 1 - i].reverse();
-    return new DeepTree<>(newLeft, rightSize(), middle.reverse(qc), newRight, size);
+    return new DeepTree<>(newLeft, rightSize(), middle.reverse(job), newRight, size);
   }
 
   @Override
@@ -289,8 +289,8 @@ public FingerTree<N, E> set(final long pos, final E val) {
   }
 
   @Override
-  public FingerTree<N, E> insert(final long pos, final E val, final QueryContext qc) {
-    qc.checkStop();
+  public FingerTree<N, E> insert(final long pos, final E val, final Job job) {
+    job.checkStop();
     if(pos <= leftSize) {
       // insert into left digit
       int i = 0;
@@ -338,7 +338,7 @@ public FingerTree<N, E> insert(final long pos, final E val, final QueryContext q
     long p = pos - leftSize;
     final long midSize = middle.size();
     if(p < midSize)
-      return new DeepTree<>(left, leftSize, middle.insert(p, val, qc), right, size + 1);
+      return new DeepTree<>(left, leftSize, middle.insert(p, val, job), right, size + 1);
 
     // insert into right digit
     p -= midSize;
@@ -384,13 +384,13 @@ public FingerTree<N, E> insert(final long pos, final E val, final QueryContext q
   }
 
   @Override
-  public TreeSlice<N, E> remove(final long pos, final QueryContext qc) {
-    qc.checkStop();
+  public TreeSlice<N, E> remove(final long pos, final Job job) {
+    job.checkStop();
     if(pos < leftSize) return new TreeSlice<>(removeLeft(pos));
     final long rightStart = leftSize + middle.size();
     if(pos >= rightStart) return new TreeSlice<>(removeRight(pos - rightStart));
 
-    final TreeSlice<Node<N, E>, E> slice = middle.remove(pos - leftSize, qc);
+    final TreeSlice<Node<N, E>, E> slice = middle.remove(pos - leftSize, job);
     if(slice.isTree()) {
       // no underflow
       final FingerTree<Node<N, E>, E> newMiddle = slice.getTree();

basex-core/src/main/java/org/basex/query/util/fingertree/EmptyTree.java

@@ -1,6 +1,6 @@
 package org.basex.query.util.fingertree;
 
-import org.basex.query.*;
+import org.basex.core.jobs.*;
 import org.basex.util.*;
 
 /**
@@ -83,17 +83,17 @@ public TreeSlice<N, E> slice(final long pos, final long len) {
   }
 
   @Override
-  public FingerTree<N, E> reverse(final QueryContext qc) {
+  public FingerTree<N, E> reverse(final Job job) {
     return this;
   }
 
   @Override
-  public FingerTree<N, E> insert(final long pos, final E val, final QueryContext qc) {
+  public FingerTree<N, E> insert(final long pos, final E val, final Job job) {
     throw Util.notExpected();
   }
 
   @Override
-  public TreeSlice<N, E> remove(final long pos, final QueryContext qc) {
+  public TreeSlice<N, E> remove(final long pos, final Job job) {
     throw Util.notExpected();
   }
 

basex-core/src/main/java/org/basex/query/util/fingertree/FingerTree.java

@@ -2,7 +2,7 @@
 
 import java.util.*;
 
-import org.basex.query.*;
+import org.basex.core.jobs.*;
 import org.basex.util.*;
 
 /**
@@ -184,28 +184,28 @@ public final E get(final long index) {
 
   /**
    * Creates a reversed version of this tree.
-   * @param qc query context
+   * @param job interruptible job
    * @return reversed tree
    */
-  public abstract FingerTree<N, E> reverse(QueryContext qc);
+  public abstract FingerTree<N, E> reverse(Job job);
 
   /**
    * Inserts the given value at the given position into this tree.
    * @param pos position to insert at
    * @param val value to insert
-   * @param qc query context
+   * @param job interruptible job
    * @return resulting tree
    */
-  public abstract FingerTree<N, E> insert(long pos, E val, QueryContext qc);
+  public abstract FingerTree<N, E> insert(long pos, E val, Job job);
 
   /**
    * Removes an element from this tree.
    * @param pos position of the element to remove
-   * @param qc query context
+   * @param job interruptible job
    * @return resulting (potentially partial) tree
    * @throws AssertionError if this tree is empty
    */
-  public abstract TreeSlice<N, E> remove(long pos, QueryContext qc);
+  public abstract TreeSlice<N, E> remove(long pos, Job job);
 
   /**
    * Extracts a slice from this tree containing the {@code len} elements starting with that at

basex-core/src/main/java/org/basex/query/util/fingertree/SingletonTree.java

@@ -1,6 +1,6 @@
 package org.basex.query.util.fingertree;
 
-import org.basex.query.*;
+import org.basex.core.jobs.*;
 
 /**
  * A tree consisting of a single value.
@@ -71,7 +71,7 @@ public FingerTree<N, E> concat(final Node<N, E>[] mid, final long size,
   }
 
   @Override
-  public FingerTree<N, E> reverse(final QueryContext qc) {
+  public FingerTree<N, E> reverse(final Job job) {
     return new SingletonTree<>(elem.reverse());
   }
 
@@ -81,7 +81,7 @@ public FingerTree<N, E> set(final long pos, final E val) {
   }
 
   @Override
-  public FingerTree<N, E> insert(final long pos, final E val, final QueryContext qc) {
+  public FingerTree<N, E> insert(final long pos, final E val, final Job job) {
     @SuppressWarnings("unchecked")
     final Node<N, E>[] siblings = new Node[4];
     if(!elem.insert(siblings, pos, val)) {
@@ -96,7 +96,7 @@ public FingerTree<N, E> insert(final long pos, final E val, final QueryContext q
   }
 
   @Override
-  public TreeSlice<N, E> remove(final long pos, final QueryContext qc) {
+  public TreeSlice<N, E> remove(final long pos, final Job job) {
     final NodeLike<N, E>[] removed = elem.remove(null, null, pos);
     return new TreeSlice<>(removed[1]);
   }