[MOD] GUI: full-text position handling revised

Author: ChristianGruen

basex-core/src/main/java/org/basex/query/QueryContext.java

@@ -170,7 +170,7 @@ public QueryContext(final Context context, final QueryContext parent, final Quer
     this.parent = parent;
     this.info = info != null ? info : new QueryInfo(context);
     this.resources = parent != null ? parent.resources : new QueryResources(this);
-    this.ftPosData = parent != null ? parent.ftPosData : FTPosData.get(context);
+    this.ftPosData = parent != null ? parent.ftPosData : null;
     this.user = context.user();
   }
 
@@ -565,40 +565,38 @@ public String toString() {
   // CLASS METHODS ================================================================================
 
   /**
-   * This function is called by the GUI.
-   * Caches the result of the specified query. If all nodes are of the same database
-   * instance, the returned value will be of type {@link DBNodes}.
+   * Caches the result of the specified query.
+   * This function is called by the GUI and must only be called after optimizing the query.
    * @param cmd query command
-   * @param max maximum number of items to cache (negative: return full result)
+   * @param max maximum number of items to cache
    */
   void cache(final AQuery cmd, final int max) {
     final ItemList items = new ItemList();
     final IntList pres = new IntList();
     final Data data = resources.globalData();
+    if(data != null) ftPosData = new FTPosData(data);
     try {
-      optimize();
       run(info.evaluating, () -> {
         // evaluates the query
-        final int mx = max >= 0 ? max : Integer.MAX_VALUE;
-        final Iter iter = iter();
+        final Iter iter = updating ? update().iter() : main.iter(this);
         Item item;
 
         do {
           // collect pre values if a database is opened globally
           if(defaultOutput && data != null) {
-            while((item = next(iter)) != null && item.data() == data && pres.size() < mx) {
+            while((item = next(iter)) != null && item.data() == data && pres.size() < max) {
               pres.add(((DBNode) item).pre());
             }
             // skip if all results have been collected
-            if(item == null || pres.size() == mx) break;
+            if(item == null || pres.size() >= max) break;
 
             // otherwise, add nodes to standard iterator
             for(final int pre : pres.finish()) items.add(new DBNode(data, pre));
             items.add(item);
           }
 
           // use standard iterator
-          while((item = next(iter)) != null && items.size() < mx) {
+          while((item = next(iter)) != null && items.size() < max) {
             item.cache(false, null);
             items.add(item);
           }

basex-core/src/main/java/org/basex/query/util/ft/FTPosData.java

@@ -2,7 +2,6 @@
 
 import java.util.*;
 
-import org.basex.core.*;
 import org.basex.data.*;
 import org.basex.util.*;
 import org.basex.util.hash.*;
@@ -24,17 +23,18 @@ public final class FTPosData {
   /** Number of values. */
   private int size;
 
+  /**
+   * Constructor.
+   */
+  public FTPosData() {
+  }
+
   /**
    * Creates a new instance of this class.
-   * @param context database context
-   * @return new instance or {@code null}
+   * @param data data reference
    */
-  public static FTPosData get(final Context context) {
-    final Data data = context.data();
-    if(data == null) return null;
-    final FTPosData ftp = new FTPosData();
-    ftp.dt = data;
-    return ftp;
+  public FTPosData(final Data data) {
+    dt = data;
   }
 
   /**