[MOD] Arrays & Maps: improved size estimations

Author: ChristianGruen

basex-core/src/main/java/org/basex/query/func/array/ArrayAppend.java

@@ -37,7 +37,7 @@ protected Expr opt(final CompileContext cc) throws QueryException {
 
   @Override
   public long structSize() {
-    final long as = arg(0).structSize();
+    final long as = structSize(0);
     return as != -1 ? as + 1 : -1;
   }
 }

basex-core/src/main/java/org/basex/query/func/array/ArrayFn.java

@@ -3,8 +3,10 @@
 import static org.basex.query.QueryError.*;
 
 import org.basex.query.*;
+import org.basex.query.expr.*;
 import org.basex.query.func.*;
 import org.basex.query.value.array.*;
+import org.basex.query.value.type.*;
 
 /**
  * Functions on arrays.
@@ -26,4 +28,14 @@ final long toPos(final XQArray array, final long pos, final boolean incl) throws
     if(pos > 0 && pos <= size) return pos - 1;
     throw (size == 0 ? ARRAYEMPTY : ARRAYBOUNDS_X_X).get(info, pos, size);
   }
+
+  /**
+   * Returns the size of the array passed via the specified argument.
+   * @param a index of argument
+   * @return array size
+   */
+  final long structSize(final int a) {
+    final Expr expr1 = arg(a);
+    return expr1.seqType().instanceOf(Types.ARRAY_O) ? expr1.structSize() : -1;
+  }
 }

basex-core/src/main/java/org/basex/query/func/array/ArrayForEach.java

@@ -48,7 +48,7 @@ protected Expr opt(final CompileContext cc) throws QueryException {
 
   @Override
   public long structSize() {
-    return arg(0).structSize();
+    return structSize(0);
   }
 
   @Override

basex-core/src/main/java/org/basex/query/func/array/ArrayForEachPair.java

@@ -53,7 +53,7 @@ protected Expr opt(final CompileContext cc) throws QueryException {
 
   @Override
   public long structSize() {
-    final long as1 = arg(0).structSize(), as2 = arg(0).structSize();
+    final long as1 = structSize(0), as2 = structSize(1);
     return as1 != -1 && as2 != -1 ? Math.min(as1, as2) : -1;
   }
 

basex-core/src/main/java/org/basex/query/func/array/ArrayInsertBefore.java

@@ -33,7 +33,7 @@ protected ArrayInsertBefore opt(final CompileContext cc) {
 
   @Override
   public long structSize() {
-    final long as = arg(0).structSize();
+    final long as = structSize(0);
     return as != -1 ? as + 1 : -1;
   }
 }

basex-core/src/main/java/org/basex/query/func/array/ArrayMembers.java

@@ -55,7 +55,7 @@ protected Expr opt(final CompileContext cc) {
     final Expr array = arg(0);
     final Type type = array.seqType().type;
     if(type instanceof final ArrayType at) {
-      exprType.assign(cc.qc.shared.record(Str.VALUE, at.valueType()));
+      exprType.assign(cc.qc.shared.record(Str.VALUE, at.valueType()).seqType(), array.structSize());
     }
     return this;
   }

basex-core/src/main/java/org/basex/query/func/array/ArrayPut.java

@@ -33,6 +33,6 @@ protected Expr opt(final CompileContext cc) {
 
   @Override
   public long structSize() {
-    return arg(0).structSize();
+    return structSize(0);
   }
 }

basex-core/src/main/java/org/basex/query/func/array/ArrayRemove.java

@@ -51,7 +51,7 @@ protected Expr opt(final CompileContext cc) {
 
   @Override
   public long structSize() {
-    final long as = arg(0).structSize();
+    final long as = structSize(0);
     return as != -1 ? as - 1 : -1;
   }
 }

basex-core/src/main/java/org/basex/query/func/array/ArrayReverse.java

@@ -28,6 +28,6 @@ protected Expr opt(final CompileContext cc) {
 
   @Override
   public long structSize() {
-    return arg(0).structSize();
+    return structSize(0);
   }
 }

basex-core/src/main/java/org/basex/query/func/array/ArraySort.java

@@ -43,6 +43,7 @@ public int hofIndex() {
 
   @Override
   public long structSize() {
-    return arg(0).structSize();
+    final Expr expr1 = arg(0);
+    return expr1.seqType().instanceOf(Types.ARRAY_O) ? expr1.structSize() : -1;
   }
 }