Corrections for jn:size
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/functions/builtin-functions.xml b/vxquery-core/src/main/java/org/apache/vxquery/functions/builtin-functions.xml
index 9156331..10ca007 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/functions/builtin-functions.xml
+++ b/vxquery-core/src/main/java/org/apache/vxquery/functions/builtin-functions.xml
@@ -254,11 +254,11 @@
</property>
</function>
- <!-- fn:size($expr as item()*) as xs:anyAtomicType* -->
- <function name="fn:size">
+ <!-- jn:size($expr as item()*) as xs:anyAtomicType* -->
+ <function name="jn:size">
<param name="expr" type="item()*"/>
<return type="xs:integer"/>
- <runtime type="scalar" class="org.apache.vxquery.runtime.functions.misc.FnSizeScalarEvaluatorFactory"/>
+ <runtime type="scalar" class="org.apache.vxquery.runtime.functions.misc.JnSizeScalarEvaluatorFactory"/>
</function>
<!-- fn:dateTime($arg1 as xs:date?, $arg2 as xs:time?) as xs:dateTime? -->
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/misc/FnSizeScalarEvaluatorFactory.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/misc/JnSizeScalarEvaluatorFactory.java
similarity index 91%
rename from vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/misc/FnSizeScalarEvaluatorFactory.java
rename to vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/misc/JnSizeScalarEvaluatorFactory.java
index 3ff935f..9ad34fa 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/misc/FnSizeScalarEvaluatorFactory.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/misc/JnSizeScalarEvaluatorFactory.java
@@ -33,25 +33,25 @@
import org.apache.vxquery.runtime.functions.base.AbstractTaggedValueArgumentScalarEvaluator;
import org.apache.vxquery.runtime.functions.base.AbstractTaggedValueArgumentScalarEvaluatorFactory;
-public class FnSizeScalarEvaluatorFactory extends AbstractTaggedValueArgumentScalarEvaluatorFactory {
+public class JnSizeScalarEvaluatorFactory extends AbstractTaggedValueArgumentScalarEvaluatorFactory {
private static final long serialVersionUID = 1L;
- public FnSizeScalarEvaluatorFactory(IScalarEvaluatorFactory[] args) {
+ public JnSizeScalarEvaluatorFactory(IScalarEvaluatorFactory[] args) {
super(args);
}
@Override
protected IScalarEvaluator createEvaluator(IHyracksTaskContext ctx, IScalarEvaluator[] args)
throws AlgebricksException {
- return new FnSizeScalarEvaluator(args);
+ return new JnSizeScalarEvaluator(args);
}
- private static class FnSizeScalarEvaluator extends AbstractTaggedValueArgumentScalarEvaluator {
+ private static class JnSizeScalarEvaluator extends AbstractTaggedValueArgumentScalarEvaluator {
final ArrayBackedValueStorage abvs = new ArrayBackedValueStorage();
final ArrayPointable ap = (ArrayPointable) ArrayPointable.FACTORY.createPointable();
- public FnSizeScalarEvaluator(IScalarEvaluator[] args) {
+ public JnSizeScalarEvaluator(IScalarEvaluator[] args) {
super(args);
}
diff --git a/vxquery-xtest/src/test/resources/Queries/XQuery/Json/Array/Navigation/q03_array_navigation.xq b/vxquery-xtest/src/test/resources/Queries/XQuery/Json/Array/Navigation/q03_array_navigation.xq
index 00afac3..179fb11 100644
--- a/vxquery-xtest/src/test/resources/Queries/XQuery/Json/Array/Navigation/q03_array_navigation.xq
+++ b/vxquery-xtest/src/test/resources/Queries/XQuery/Json/Array/Navigation/q03_array_navigation.xq
@@ -18,5 +18,5 @@
(: Json Array Size Query :)
(: Size of an array :)
let $x:=[2,[2,1,3]]
- return size($x)
+ return jn:size($x)
\ No newline at end of file
