[MOD] Store: index strings that are read from store

Author: ChristianGruen

basex-core/src/main/java/org/basex/query/value/seq/StrSeq.java

@@ -47,7 +47,7 @@ public static Value read(final DataInput in, final Type type, final QueryContext
       throws IOException {
     final int size = in.readNum();
     final byte[][] values = new byte[size][];
-    for(int s = 0; s < size; s++) values[s] = in.readToken();
+    for(int s = 0; s < size; s++) values[s] = qc.shared.token(in.readToken());
     return get(values, type);
   }
 

basex-core/src/main/java/org/basex/query/value/type/BasicType.java

@@ -59,7 +59,7 @@ public Atm cast(final Object value, final QueryContext qc, final InputInfo info)
     }
     @Override
     public Atm read(final DataInput in, final QueryContext qc) throws IOException {
-      return Atm.get(in.readToken());
+      return Atm.get(qc.shared.token(in.readToken()));
     }
   },
 
@@ -77,7 +77,7 @@ public Str cast(final Object value, final QueryContext qc, final InputInfo info)
     }
     @Override
     public Str read(final DataInput in, final QueryContext qc) throws IOException {
-      return Str.get(in.readToken());
+      return Str.get(qc.shared.token(in.readToken()));
     }
   },
 
@@ -98,7 +98,7 @@ public Str cast(final Object value, final QueryContext qc, final InputInfo info)
     }
     @Override
     public Str read(final DataInput in, final QueryContext qc) throws IOException {
-      return Str.get(in.readToken(), this);
+      return Str.get(qc.shared.token(in.readToken()), this);
     }
   },
 
@@ -116,7 +116,7 @@ public Str cast(final Object value, final QueryContext qc, final InputInfo info)
     }
     @Override
     public Str read(final DataInput in, final QueryContext qc) throws IOException {
-      return Str.get(in.readToken(), this);
+      return Str.get(qc.shared.token(in.readToken()), this);
     }
   },
 
@@ -136,7 +136,7 @@ public Str cast(final Object value, final QueryContext qc, final InputInfo info)
     }
     @Override
     public Str read(final DataInput in, final QueryContext qc) throws IOException {
-      return Str.get(in.readToken(), this);
+      return Str.get(qc.shared.token(in.readToken()), this);
     }
   },
 
@@ -156,7 +156,7 @@ public Str cast(final Object value, final QueryContext qc, final InputInfo info)
     }
     @Override
     public Str read(final DataInput in, final QueryContext qc) throws IOException {
-      return Str.get(in.readToken(), this);
+      return Str.get(qc.shared.token(in.readToken()), this);
     }
   },
 
@@ -176,7 +176,7 @@ public Str cast(final Object value, final QueryContext qc, final InputInfo info)
     }
     @Override
     public Str read(final DataInput in, final QueryContext qc) throws IOException {
-      return Str.get(in.readToken(), this);
+      return Str.get(qc.shared.token(in.readToken()), this);
     }
   },
 
@@ -194,7 +194,7 @@ public Str cast(final Object value, final QueryContext qc, final InputInfo info)
     }
     @Override
     public Str read(final DataInput in, final QueryContext qc) throws IOException {
-      return Str.get(in.readToken(), this);
+      return Str.get(qc.shared.token(in.readToken()), this);
     }
   },
 
@@ -212,7 +212,7 @@ public Str cast(final Object value, final QueryContext qc, final InputInfo info)
     }
     @Override
     public Str read(final DataInput in, final QueryContext qc) throws IOException {
-      return Str.get(in.readToken(), this);
+      return Str.get(qc.shared.token(in.readToken()), this);
     }
   },
 
@@ -230,7 +230,7 @@ public Str cast(final Object value, final QueryContext qc, final InputInfo info)
     }
     @Override
     public Str read(final DataInput in, final QueryContext qc) throws IOException {
-      return Str.get(in.readToken(), this);
+      return Str.get(qc.shared.token(in.readToken()), this);
     }
   },
 
@@ -248,7 +248,7 @@ public Str cast(final Object value, final QueryContext qc, final InputInfo info)
     }
     @Override
     public Str read(final DataInput in, final QueryContext qc) throws IOException {
-      return Str.get(in.readToken(), this);
+      return Str.get(qc.shared.token(in.readToken()), this);
     }
   },
 
@@ -887,7 +887,7 @@ public Uri cast(final Object value, final QueryContext qc, final InputInfo info)
     }
     @Override
     public Uri read(final DataInput in, final QueryContext qc) throws IOException {
-      return Uri.get(in.readToken());
+      return Uri.get(qc.shared.token(in.readToken()));
     }
   },
 
@@ -913,7 +913,8 @@ public QNm cast(final Object value, final QueryContext qc, final InputInfo info)
     }
     @Override
     public QNm read(final DataInput in, final QueryContext qc) throws IOException {
-      return new QNm(in.readToken(), in.readBool() ? in.readToken() : null);
+      return new QNm(qc.shared.token(in.readToken()),
+          in.readBool() ? qc.shared.token(in.readToken()) : null);
     }
   },