[MOD] XQuery: better static typing of arrays

ChristianGruen · ChristianGruen · commit 1cea00c88a18 · 2025-12-19T21:53:53.000+01:00
diff --git a/basex-core/src/main/java/org/basex/query/QueryPlan.java b/basex-core/src/main/java/org/basex/query/QueryPlan.java
@@ -104,9 +104,9 @@ public FBuilder create(final ExprInfo expr, final Object... atts) {
       addAttribute(elem, atts[a], atts[a + 1]);
     }
     if(expr instanceof final Expr ex) {
-      attachType(elem, ex.seqType(), ex.size(), ex.data());
+      attachType(elem, ex.seqType(), ex.size(), ex.structSize(), ex.data());
     } else if(expr instanceof StaticDecl) {
-      attachType(elem, ((StaticDecl) expr).seqType(), -1, null);
+      attachType(elem, ((StaticDecl) expr).seqType(), -1, -1, null);
     }
     final InputInfo info = expr.info();
     if(info != null) attach(elem, info);
@@ -148,7 +148,7 @@ public FBuilder attachVariable(final FBuilder elem, final Var var, final boolean
       addAttribute(elem, NAME, var.toErrorString());
       addAttribute(elem, ID, var.id);
       if(var.declType != null) addAttribute(elem, AS, var.declType);
-      if(type) attachType(elem, var.seqType(), var.size(), var.data());
+      if(type) attachType(elem, var.seqType(), var.size(), -1, var.data());
     }
     return elem;
   }
@@ -158,12 +158,14 @@ public FBuilder attachVariable(final FBuilder elem, final Var var, final boolean
    * @param elem element to which attributes will be added
    * @param seqType sequence type
    * @param size result size
+   * @param structSize struct size
    * @param data data reference (can be {@code null})
    */
   private void attachType(final FBuilder elem, final SeqType seqType, final long size,
-      final Data data) {
+      final long structSize, final Data data) {
     addAttribute(elem, TYPE, seqType);
     if(size != -1) addAttribute(elem, SIZE, size);
+    if(structSize != -1) addAttribute(elem, STRUCT_SIZE, structSize);
     if(data != null) addAttribute(elem, DATABASE, data.meta.name);
   }
 
diff --git a/basex-core/src/main/java/org/basex/query/QueryText.java b/basex-core/src/main/java/org/basex/query/QueryText.java
@@ -346,6 +346,7 @@ public interface QueryText {
   /** Query Info. */ String DIR = "dir";
   /** Query Info. */ String PRE = "pre";
   /** Query Info. */ String SIZE = "size";
+  /** Query Info. */ String STRUCT_SIZE = "structSize";
   /** Query Info. */ String AXIS = "axis";
   /** Query Info. */ String TEST = "test";
   /** Query Info. */ String MIN = "min";
diff --git a/basex-core/src/main/java/org/basex/query/expr/StructFilter.java b/basex-core/src/main/java/org/basex/query/expr/StructFilter.java
@@ -67,7 +67,7 @@ public Item item(final QueryContext qc, final InputInfo ii) throws QueryExceptio
             qf.pos = a.incrementAndGet();
             if(expr.test(qc, info, a.get())) ab.add(value);
           }
-          item = ab.array();
+          item = ab.array(this);
         } else {
           // maps
           final MapBuilder mb = new MapBuilder();
@@ -79,7 +79,7 @@ public Item item(final QueryContext qc, final InputInfo ii) throws QueryExceptio
             qf.pos = a.incrementAndGet();
             if(expr.test(qc, info, a.get())) mb.put(key, value);
           });
-          item = mb.map();
+          item = mb.map(this);
         }
       }
       return item;
diff --git a/basex-core/src/main/java/org/basex/query/expr/constr/CArray.java b/basex-core/src/main/java/org/basex/query/expr/constr/CArray.java
@@ -47,7 +47,7 @@ public Expr optimize(final CompileContext cc) throws QueryException {
 
   @Override
   public XQArray item(final QueryContext qc, final InputInfo ii) throws QueryException {
-    final ArrayBuilder ab = new ArrayBuilder(qc);
+    final ArrayBuilder ab = new ArrayBuilder(qc, exprs.length);
     for(final Expr expr : exprs) ab.add(expr.value(qc));
     return ab.array(this);
   }
@@ -70,6 +70,11 @@ public boolean equals(final Object obj) {
     return obj instanceof CArray && super.equals(obj);
   }
 
+  @Override
+  public long structSize() {
+    return exprs.length;
+  }
+
   @Override
   public String description() {
     return "squared " + ARRAY + " constructor";
diff --git a/basex-core/src/main/java/org/basex/query/expr/constr/CItemArray.java b/basex-core/src/main/java/org/basex/query/expr/constr/CItemArray.java
@@ -63,6 +63,11 @@ public boolean equals(final Object obj) {
     return obj instanceof CItemArray && super.equals(obj);
   }
 
+  @Override
+  public long structSize() {
+    return expr.size();
+  }
+
   @Override
   public String description() {
     return "curly " + ARRAY + " constructor";
diff --git a/basex-core/src/main/java/org/basex/query/func/array/ArrayAppend.java b/basex-core/src/main/java/org/basex/query/func/array/ArrayAppend.java
@@ -34,4 +34,10 @@ protected Expr opt(final CompileContext cc) throws QueryException {
     }
     return this;
   }
+
+  @Override
+  public long structSize() {
+    final long as = arg(0).structSize();
+    return as != -1 ? as + 1 : -1;
+  }
 }
diff --git a/basex-core/src/main/java/org/basex/query/func/array/ArrayBuild.java b/basex-core/src/main/java/org/basex/query/func/array/ArrayBuild.java
@@ -23,12 +23,12 @@ public XQArray item(final QueryContext qc, final InputInfo ii) throws QueryExcep
     if(action == null) return XQArray.items(arg(0).value(qc));
 
     final Iter input = arg(0).iter(qc);
-    final ArrayBuilder ab = new ArrayBuilder(qc);
+    final ArrayBuilder ab = new ArrayBuilder(qc, input.size());
     final HofArgs args = new HofArgs(2, action);
     for(Item item; (item = qc.next(input)) != null;) {
       ab.add(invoke(action, args.set(0, item).inc(), qc));
     }
-    return ab.array();
+    return ab.array(this);
   }
 
   @Override
diff --git a/basex-core/src/main/java/org/basex/query/func/array/ArrayEmpty.java b/basex-core/src/main/java/org/basex/query/func/array/ArrayEmpty.java
@@ -31,7 +31,7 @@ protected Expr opt(final CompileContext cc) {
     final Expr array = arg(0);
     if(array.seqType().type instanceof ArrayType) {
       final long size = array.structSize();
-      if(size >= 0 && !array.has(Flag.NDT)) return Bln.get(size == 0);
+      if(size != -1 && !array.has(Flag.NDT)) return Bln.get(size == 0);
     }
     return this;
   }
diff --git a/basex-core/src/main/java/org/basex/query/func/array/ArrayForEach.java b/basex-core/src/main/java/org/basex/query/func/array/ArrayForEach.java
@@ -22,7 +22,7 @@ public XQArray item(final QueryContext qc, final InputInfo ii) throws QueryExcep
     final FItem action = toFunction(arg(1), 2, qc);
 
     final HofArgs args = new HofArgs(2, action);
-    final ArrayBuilder ab = new ArrayBuilder(qc);
+    final ArrayBuilder ab = new ArrayBuilder(qc, array.structSize());
     for(final Value value : array.iterable()) {
       ab.add(invoke(action, args.set(0, value).inc(), qc));
     }
@@ -46,6 +46,11 @@ protected Expr opt(final CompileContext cc) throws QueryException {
     return this;
   }
 
+  @Override
+  public long structSize() {
+    return arg(0).structSize();
+  }
+
   @Override
   public int hofIndex() {
     return 1;
diff --git a/basex-core/src/main/java/org/basex/query/func/array/ArrayForEachPair.java b/basex-core/src/main/java/org/basex/query/func/array/ArrayForEachPair.java
@@ -24,10 +24,11 @@ public XQArray item(final QueryContext qc, final InputInfo ii) throws QueryExcep
     final FItem action = toFunction(arg(2), 3, qc);
 
     final HofArgs args = new HofArgs(3, action);
-    final ArrayBuilder ab = new ArrayBuilder(qc);
-    final Iterator<Value> as = array1.iterator(0), bs = array2.iterator(0);
-    while(as.hasNext() && bs.hasNext()) {
-      ab.add(invoke(action, args.set(0, as.next()).set(1, bs.next()).inc(), qc));
+    final long as = Math.min(array1.structSize(), array2.structSize());
+    final ArrayBuilder ab = new ArrayBuilder(qc, as);
+    final Iterator<Value> iter1 = array1.iterator(0), iter2 = array2.iterator(0);
+    while(iter1.hasNext() && iter2.hasNext()) {
+      ab.add(invoke(action, args.set(0, iter1.next()).set(1, iter2.next()).inc(), qc));
     }
     return ab.array(this);
   }
@@ -50,6 +51,12 @@ protected Expr opt(final CompileContext cc) throws QueryException {
     return this;
   }
 
+  @Override
+  public long structSize() {
+    final long as1 = arg(0).structSize(), as2 = arg(0).structSize();
+    return as1 != -1 && as2 != -1 ? Math.min(as1, as2) : -1;
+  }
+
   @Override
   public int hofIndex() {
     return 2;
diff --git a/basex-core/src/main/java/org/basex/query/func/array/ArrayInsertBefore.java b/basex-core/src/main/java/org/basex/query/func/array/ArrayInsertBefore.java
@@ -30,4 +30,10 @@ protected ArrayInsertBefore opt(final CompileContext cc) {
     }
     return this;
   }
+
+  @Override
+  public long structSize() {
+    final long as = arg(0).structSize();
+    return as != -1 ? as + 1 : -1;
+  }
 }
diff --git a/basex-core/src/main/java/org/basex/query/func/array/ArrayOfMembers.java b/basex-core/src/main/java/org/basex/query/func/array/ArrayOfMembers.java
@@ -20,7 +20,7 @@ public final class ArrayOfMembers extends ArrayFn {
   public XQArray item(final QueryContext qc, final InputInfo ii) throws QueryException {
     final Iter input = arg(0).iter(qc);
 
-    final ArrayBuilder ab = new ArrayBuilder(qc);
+    final ArrayBuilder ab = new ArrayBuilder(qc, input.size());
     for(Item item; (item = qc.next(input)) != null;) {
       ab.add(toRecord(item, Records.MEMBER.get(), qc).get(Str.VALUE));
     }
diff --git a/basex-core/src/main/java/org/basex/query/func/array/ArrayPut.java b/basex-core/src/main/java/org/basex/query/func/array/ArrayPut.java
@@ -30,4 +30,9 @@ protected Expr opt(final CompileContext cc) {
     }
     return this;
   }
+
+  @Override
+  public long structSize() {
+    return arg(0).structSize();
+  }
 }
diff --git a/basex-core/src/main/java/org/basex/query/func/array/ArrayRemove.java b/basex-core/src/main/java/org/basex/query/func/array/ArrayRemove.java
@@ -48,4 +48,10 @@ protected Expr opt(final CompileContext cc) {
     if(type instanceof ArrayType) exprType.assign(type);
     return this;
   }
+
+  @Override
+  public long structSize() {
+    final long as = arg(0).structSize();
+    return as != -1 ? as - 1 : -1;
+  }
 }
diff --git a/basex-core/src/main/java/org/basex/query/func/array/ArrayReverse.java b/basex-core/src/main/java/org/basex/query/func/array/ArrayReverse.java
@@ -25,4 +25,9 @@ protected Expr opt(final CompileContext cc) {
     if(type instanceof ArrayType) exprType.assign(type);
     return this;
   }
+
+  @Override
+  public long structSize() {
+    return arg(0).structSize();
+  }
 }
diff --git a/basex-core/src/main/java/org/basex/query/func/array/ArraySize.java b/basex-core/src/main/java/org/basex/query/func/array/ArraySize.java
@@ -26,7 +26,7 @@ protected Expr opt(final CompileContext cc) {
     final Expr array = arg(0);
     if(array.seqType().type instanceof ArrayType) {
       final long size = array.structSize();
-      if(size >= 0 && !array.has(Flag.NDT)) return Itr.get(size);
+      if(size != -1 && !array.has(Flag.NDT)) return Itr.get(size);
     }
     return this;
   }
diff --git a/basex-core/src/main/java/org/basex/query/func/array/ArraySlice.java b/basex-core/src/main/java/org/basex/query/func/array/ArraySlice.java
@@ -26,7 +26,7 @@ public XQArray value(final QueryContext qc) throws QueryException {
     for(long i = slice.start; i <= slice.end; i += slice.step) {
       ab.add(array.memberAt(i - 1));
     }
-    return ab.array();
+    return ab.array(this);
   }
 
   @Override
diff --git a/basex-core/src/main/java/org/basex/query/func/array/ArraySort.java b/basex-core/src/main/java/org/basex/query/func/array/ArraySort.java
@@ -40,4 +40,9 @@ protected Expr opt(final CompileContext cc) throws QueryException {
   public int hofIndex() {
     return 2;
   }
+
+  @Override
+  public long structSize() {
+    return arg(0).structSize();
+  }
 }
diff --git a/basex-core/src/main/java/org/basex/query/func/array/ArraySortBy.java b/basex-core/src/main/java/org/basex/query/func/array/ArraySortBy.java
@@ -33,7 +33,7 @@ public final Value value(final QueryContext qc) throws QueryException {
     final Integer[] index = index(values, qc);
     if(sorted(index)) return array;
 
-    final ArrayBuilder ab = new ArrayBuilder(qc);
+    final ArrayBuilder ab = new ArrayBuilder(qc, as);
     for(final int i : index) ab.add(values[i]);
     return ab.array(this);
   }
@@ -46,4 +46,9 @@ protected Expr opt(final CompileContext cc) throws QueryException {
     if(array.seqType().type instanceof final ArrayType at) exprType.assign(at);
     return this;
   }
+
+  @Override
+  public long structSize() {
+    return arg(0).structSize();
+  }
 }
diff --git a/basex-core/src/main/java/org/basex/query/func/array/ArraySortWith.java b/basex-core/src/main/java/org/basex/query/func/array/ArraySortWith.java
@@ -25,12 +25,13 @@ public Iter iter(final QueryContext qc) throws QueryException {
   @Override
   public Value value(final QueryContext qc) throws QueryException {
     final XQArray array = toArray(arg(0), qc);
+    final long as = array.structSize();
 
-    final ValueList values = new ValueList(Seq.initialCapacity(array.structSize()));
+    final ValueList values = new ValueList(Seq.initialCapacity(as));
     for(final Value member : array.iterable()) values.add(member);
     sort(values, qc);
 
-    final ArrayBuilder ab = new ArrayBuilder(qc, values.size());
+    final ArrayBuilder ab = new ArrayBuilder(qc, as);
     for(final Value value : values) ab.add(value);
     return ab.array(this);
   }
@@ -42,4 +43,9 @@ protected Expr opt(final CompileContext cc) {
     if(array.seqType().type instanceof final ArrayType at) exprType.assign(at);
     return this;
   }
+
+  @Override
+  public long structSize() {
+    return arg(0).structSize();
+  }
 }
diff --git a/basex-core/src/main/java/org/basex/query/func/array/ArraySplit.java b/basex-core/src/main/java/org/basex/query/func/array/ArraySplit.java
@@ -55,7 +55,9 @@ protected Expr opt(final CompileContext cc) {
     if(array == XQArray.empty()) return Empty.VALUE;
 
     final Type ft = array.seqType().type;
-    if(ft instanceof ArrayType) exprType.assign(ft.seqType(Occ.ZERO_OR_MORE));
+    if(ft instanceof ArrayType) {
+      exprType.assign(ft.seqType(Occ.ZERO_OR_MORE), array.structSize());
+    }
     return this;
   }
 }
diff --git a/basex-core/src/main/java/org/basex/query/func/array/ArrayTail.java b/basex-core/src/main/java/org/basex/query/func/array/ArrayTail.java
@@ -28,4 +28,10 @@ protected Expr opt(final CompileContext cc) {
     if(type instanceof ArrayType) exprType.assign(type);
     return this;
   }
+
+  @Override
+  public long structSize() {
+    final long as = arg(0).structSize();
+    return as != -1 ? as - 1 : -1;
+  }
 }
diff --git a/basex-core/src/main/java/org/basex/query/func/array/ArrayTrunk.java b/basex-core/src/main/java/org/basex/query/func/array/ArrayTrunk.java
@@ -28,4 +28,10 @@ protected Expr opt(final CompileContext cc) {
     if(type instanceof ArrayType) exprType.assign(type);
     return this;
   }
+
+  @Override
+  public long structSize() {
+    final long as = arg(0).structSize();
+    return as != -1 ? as - 1 : -1;
+  }
 }
diff --git a/basex-core/src/main/java/org/basex/query/func/fn/FnPartition.java b/basex-core/src/main/java/org/basex/query/func/fn/FnPartition.java
@@ -35,7 +35,7 @@ public Item next() throws QueryException {
             final Value val = value;
             value = item;
             if(!val.isEmpty()) {
-              final ArrayBuilder ab = new ArrayBuilder(qc);
+              final ArrayBuilder ab = new ArrayBuilder(qc, val.size());
               for(final Item it : val) ab.add(it);
               return ab.array();
             }
diff --git a/basex-core/src/main/java/org/basex/query/func/xslt/XsltReport.java b/basex-core/src/main/java/org/basex/query/func/xslt/XsltReport.java
@@ -91,10 +91,9 @@ void addMessage() throws QueryException {
     final ValueBuilder vb = new ValueBuilder(qc);
     try {
       for(final Object message : messages) {
-        final ArrayBuilder ab = new ArrayBuilder(qc);
-        for(final Item item : convert(new IOContent(MW_GW.invoke(message).toString()), false)) {
-          ab.add(item);
-        }
+        final Value value = convert(new IOContent(MW_GW.invoke(message).toString()), false);
+        final ArrayBuilder ab = new ArrayBuilder(qc, value.size());
+        for(final Item item : value) ab.add(item);
         vb.add(ab.array());
       }
     } catch(final Exception ex) {
diff --git a/basex-core/src/main/java/org/basex/query/value/array/XQArray.java b/basex-core/src/main/java/org/basex/query/value/array/XQArray.java
@@ -356,7 +356,7 @@ public final Item materialize(final Predicate<Data> test, final InputInfo ii,
 
     if(materialized(test, ii)) return this;
 
-    final ArrayBuilder ab = new ArrayBuilder(qc);
+    final ArrayBuilder ab = new ArrayBuilder(qc, structSize());
     for(final Value value : iterable()) {
       qc.checkStop();
       ab.add(value.materialize(test, ii, qc));
@@ -410,12 +410,12 @@ public final boolean instanceOf(final Type tp, final boolean coerce) {
   public final XQArray coerceTo(final ArrayType at, final QueryContext qc, final CompileContext cc,
       final InputInfo ii) throws QueryException {
 
-    final ArrayBuilder ab = new ArrayBuilder(qc);
+    final ArrayBuilder ab = new ArrayBuilder(qc, structSize());
     for(final Value value : iterable()) {
       qc.checkStop();
       ab.add(at.valueType().coerce(value, null, qc, cc, ii));
     }
-    return ab.array();
+    return ab.array(at);
   }
 
   @Override
diff --git a/basex-core/src/main/java/org/basex/query/value/type/ArrayType.java b/basex-core/src/main/java/org/basex/query/value/type/ArrayType.java
@@ -60,7 +60,7 @@ public XQArray read(final DataInput in, final QueryContext qc)
     int size = in.readNum();
     final ArrayBuilder ab = new ArrayBuilder(qc, size);
     while(--size >= 0) ab.add(Stores.read(in, qc));
-    return ab.array();
+    return ab.array(this);
   }
 
   @Override

Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,7 @@ public Item item(final QueryContext qc, final InputInfo ii) throws QueryExceptio`
`67`	`67`	`qf.pos = a.incrementAndGet();`
`68`	`68`	`if(expr.test(qc, info, a.get())) ab.add(value);`
`69`	`69`	`}`
`70`		`- item = ab.array();`
	`70`	`+ item = ab.array(this);`
`71`	`71`	`} else {`
`72`	`72`	`// maps`
`73`	`73`	`final MapBuilder mb = new MapBuilder();`
`@@ -79,7 +79,7 @@ public Item item(final QueryContext qc, final InputInfo ii) throws QueryExceptio`
`79`	`79`	`qf.pos = a.incrementAndGet();`
`80`	`80`	`if(expr.test(qc, info, a.get())) mb.put(key, value);`
`81`	`81`	`});`
`82`		`- item = mb.map();`
	`82`	`+ item = mb.map(this);`
`83`	`83`	`}`
`84`	`84`	`}`
`85`	`85`	`return item;`
Original file line number	Diff line number	Diff line change
`@@ -34,4 +34,10 @@ protected Expr opt(final CompileContext cc) throws QueryException {`
`34`	`34`	`}`
`35`	`35`	`return this;`
`36`	`36`	`}`
	`37`	`+`
	`38`	`+ @Override`
	`39`	`+ public long structSize() {`
	`40`	`+ final long as = arg(0).structSize();`
	`41`	`+ return as != -1 ? as + 1 : -1;`
	`42`	`+ }`
`37`	`43`	`}`
Original file line number	Diff line number	Diff line change
`@@ -23,12 +23,12 @@ public XQArray item(final QueryContext qc, final InputInfo ii) throws QueryExcep`
`23`	`23`	`if(action == null) return XQArray.items(arg(0).value(qc));`
`24`	`24`
`25`	`25`	`final Iter input = arg(0).iter(qc);`
`26`		`- final ArrayBuilder ab = new ArrayBuilder(qc);`
	`26`	`+ final ArrayBuilder ab = new ArrayBuilder(qc, input.size());`
`27`	`27`	`final HofArgs args = new HofArgs(2, action);`
`28`	`28`	`for(Item item; (item = qc.next(input)) != null;) {`
`29`	`29`	`ab.add(invoke(action, args.set(0, item).inc(), qc));`
`30`	`30`	`}`
`31`		`- return ab.array();`
	`31`	`+ return ab.array(this);`
`32`	`32`	`}`
`33`	`33`
`34`	`34`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ protected Expr opt(final CompileContext cc) {`
`31`	`31`	`final Expr array = arg(0);`
`32`	`32`	`if(array.seqType().type instanceof ArrayType) {`
`33`	`33`	`final long size = array.structSize();`
`34`		`- if(size >= 0 && !array.has(Flag.NDT)) return Bln.get(size == 0);`
	`34`	`+ if(size != -1 && !array.has(Flag.NDT)) return Bln.get(size == 0);`
`35`	`35`	`}`
`36`	`36`	`return this;`
`37`	`37`	`}`