[FIX] XQuery, GUI: improved full-text caching

Author: ChristianGruen

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

@@ -85,8 +85,8 @@ public final class QueryContext extends Job implements Closeable {
   /** User. */
   public User user;
 
-  /** Full-text position data (needed for highlighting full-text results). */
-  public FTPosData ftPosData = Prop.gui ? new FTPosData() : null;
+  /** Cached full-text position data. */
+  public FTPosData ftPosData;
   /** Current full-text lexer. */
   public FTLexer ftLexer;
   /** Current full-text options. */
@@ -146,7 +146,7 @@ public final class QueryContext extends Job implements Closeable {
    * @param parent parent context
    */
   public QueryContext(final QueryContext parent) {
-    this(parent.context, parent, parent.resources, parent.info);
+    this(parent.context, parent, parent.info);
     parent.pushJob(this);
     updates = parent.updates;
   }
@@ -156,22 +156,21 @@ public QueryContext(final QueryContext parent) {
    * @param context database context
    */
   public QueryContext(final Context context) {
-    this(context, null, null, null);
+    this(context, null, null);
   }
 
   /**
    * Constructor.
    * @param context database context
    * @param parent parent context (can be {@code null})
    * @param info query info (can be {@code null})
-   * @param resources resources (can be {@code null})
    */
-  public QueryContext(final Context context, final QueryContext parent,
-      final QueryResources resources, final QueryInfo info) {
+  public QueryContext(final Context context, final QueryContext parent, final QueryInfo info) {
     this.context = context;
     this.parent = parent;
     this.info = info != null ? info : new QueryInfo(context);
-    this.resources = resources != null ? resources : new QueryResources(this);
+    this.resources = parent != null ? parent.resources : new QueryResources(this);
+    this.ftPosData = parent != null ? parent.ftPosData : FTPosData.get(context);
     this.user = context.user();
   }
 

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

@@ -47,7 +47,7 @@ public QueryProcessor(final String query, final Context ctx) {
   public QueryProcessor(final String query, final String uri, final Context ctx,
       final QueryInfo info) {
     this.query = query;
-    qc = pushJob(new QueryContext(ctx, null, null, info));
+    qc = pushJob(new QueryContext(ctx, null, info));
     sc = new StaticContext(qc);
     sc.baseURI(uri != null && uri.isEmpty() ? "./" : uri);
   }

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

@@ -2,6 +2,7 @@
 
 import java.util.*;
 
+import org.basex.core.*;
 import org.basex.data.*;
 import org.basex.util.*;
 import org.basex.util.hash.*;
@@ -23,6 +24,19 @@ public final class FTPosData {
   /** Number of values. */
   private int size;
 
+  /**
+   * Creates a new instance of this class.
+   * @param context database context
+   * @return new instance or {@code null}
+   */
+  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;
+  }
+
   /**
    * Adds position data.
    * @param data data reference