You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@vxquery.apache.org by sj...@apache.org on 2016/05/26 17:39:18 UTC
[01/50] [abbrv] vxquery git commit: More site clean up for pushing
site updates.
Repository: vxquery
Updated Branches:
refs/heads/site a506d0512 -> 7b0801e25
More site clean up for pushing site updates.
Project: http://git-wip-us.apache.org/repos/asf/vxquery/repo
Commit: http://git-wip-us.apache.org/repos/asf/vxquery/commit/14a231c4
Tree: http://git-wip-us.apache.org/repos/asf/vxquery/tree/14a231c4
Diff: http://git-wip-us.apache.org/repos/asf/vxquery/diff/14a231c4
Branch: refs/heads/site
Commit: 14a231c45805af8be54a64b354851be695d8302e
Parents: 7521b53
Author: Preston Carman <pr...@apache.org>
Authored: Thu Jul 16 10:33:42 2015 -0700
Committer: Preston Carman <pr...@apache.org>
Committed: Thu Jul 23 15:23:36 2015 -0700
----------------------------------------------------------------------
src/site/apt/development_site_update.apt | 41 +++++++++++++++++++++++++--
src/site/site.xml | 12 ++++----
2 files changed, 45 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/vxquery/blob/14a231c4/src/site/apt/development_site_update.apt
----------------------------------------------------------------------
diff --git a/src/site/apt/development_site_update.apt b/src/site/apt/development_site_update.apt
index 2d37f99..3783512 100644
--- a/src/site/apt/development_site_update.apt
+++ b/src/site/apt/development_site_update.apt
@@ -15,13 +15,50 @@
Updating the Apache VXQuery\x99 site
+* One time steps
+
+ * set up directory structure
+
+ There usually are 2 directories at the same level
+
+ * the source directory <<<vxquery>>>,
+
+ * the <<<site>>> directory, and
+
+ The source directory is version-controlled by <<<git>>>, the other is
+ version controlled by <<<svn>>>.
+ While the source directory can have an arbitrary name and location,
+ the <<<site>>> directory has to be called <<<site>>> and it needs to
+ be at the same level as the source directory to enable site deployment.
+
+ Assuming that the source directory is available one can create the
+ directory structure by going to the directory that contains the
+ source directory and checking out the distribution and site
+ directories:
+
+---
+$ svn co https://dist.apache.org/repos/dist/release/vxquery dist
+$ svn co https://svn.apache.org/repos/asf/vxquery/site
+---
+
* update the <<<site>>> branch in git
- When pushing changes to the site without a code release, the following git
- command will create a patch of only differences with in the site.
+ * New release steps
+
+ Please switch to the {{{http://vxquery.apache.org/development_release.html}release steps}}
+ and follow their directions.
+
+ * Incremental site update
+
+ When pushing changes to the site without a code release, the following git
+ commands will create a patch of only differences within the src/site folder.
+ Please verify the patch before applying it the site
-----
+git checkout master
git diff site src/site/ > ../site.patch"
+git checkout site
+git apply ../site.patch
----
* build a new site and deploy it to <<<../site>>>
http://git-wip-us.apache.org/repos/asf/vxquery/blob/14a231c4/src/site/site.xml
----------------------------------------------------------------------
diff --git a/src/site/site.xml b/src/site/site.xml
index 6758899..08e4522 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -84,12 +84,6 @@ limitations under the License.
name="Data Handling"
href="development_data_handling.html" />
<item
- name="XML Data and Node Types"
- href="development_xml_node_details.html" />
- <item
- name="XML Data Model Example"
- href="development_xml_document.html" />
- <item
name="Eclipse Setup"
href="development_eclipse_setup.html" />
<item
@@ -101,6 +95,12 @@ limitations under the License.
<item
name="Update Local Git XQTS Results"
href="development_update_xqts_results.html" />
+ <item
+ name="XML Data and Node Types"
+ href="development_xml_node_details.html" />
+ <item
+ name="XML Data Model Example"
+ href="development_xml_document.html" />
<!-- <item
name="XQuery Benchmarks"
href="development_benchmarks.html" /> -->
[48/50] [abbrv] vxquery git commit: [maven-release-plugin] prepare
release apache-vxquery-0.6
Posted by sj...@apache.org.
[maven-release-plugin] prepare release apache-vxquery-0.6
Project: http://git-wip-us.apache.org/repos/asf/vxquery/repo
Commit: http://git-wip-us.apache.org/repos/asf/vxquery/commit/a6784446
Tree: http://git-wip-us.apache.org/repos/asf/vxquery/tree/a6784446
Diff: http://git-wip-us.apache.org/repos/asf/vxquery/diff/a6784446
Branch: refs/heads/site
Commit: a678444605bfe7a1edaea13d5a07a1bc7b675939
Parents: 43435f7
Author: Steven Jacobs <sj...@ucr.edu>
Authored: Thu May 19 16:14:55 2016 -0700
Committer: Steven Jacobs <sj...@ucr.edu>
Committed: Thu May 19 16:14:55 2016 -0700
----------------------------------------------------------------------
pom.xml | 7 +++----
vxquery-benchmark/pom.xml | 2 +-
vxquery-cli/pom.xml | 4 ++--
vxquery-core/pom.xml | 11 ++++-------
vxquery-server/pom.xml | 4 ++--
vxquery-xtest/pom.xml | 9 +++------
6 files changed, 15 insertions(+), 22 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/vxquery/blob/a6784446/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 911206d..dd7dff9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,8 +14,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
@@ -27,7 +26,7 @@
<groupId>org.apache.vxquery</groupId>
<artifactId>apache-vxquery</artifactId>
- <version>0.6-SNAPSHOT</version>
+ <version>0.6</version>
<packaging>pom</packaging>
<name>VXQuery</name>
<description>A Versatile XQuery Processor</description>
@@ -51,7 +50,7 @@
<connection>scm:git:https://git-wip-us.apache.org/repos/asf/vxquery.git</connection>
<developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/vxquery.git</developerConnection>
<url>https://git-wip-us.apache.org/repos/asf/vxquery.git</url>
- <tag>HEAD</tag>
+ <tag>apache-vxquery-0.6</tag>
</scm>
<issueManagement>
http://git-wip-us.apache.org/repos/asf/vxquery/blob/a6784446/vxquery-benchmark/pom.xml
----------------------------------------------------------------------
diff --git a/vxquery-benchmark/pom.xml b/vxquery-benchmark/pom.xml
index d55f05e..da420f8 100644
--- a/vxquery-benchmark/pom.xml
+++ b/vxquery-benchmark/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.vxquery</groupId>
<artifactId>apache-vxquery</artifactId>
- <version>0.6-SNAPSHOT</version>
+ <version>0.6</version>
</parent>
<artifactId>apache-vxquery-benchmark</artifactId>
http://git-wip-us.apache.org/repos/asf/vxquery/blob/a6784446/vxquery-cli/pom.xml
----------------------------------------------------------------------
diff --git a/vxquery-cli/pom.xml b/vxquery-cli/pom.xml
index c4e11cb..6e8d240 100644
--- a/vxquery-cli/pom.xml
+++ b/vxquery-cli/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.vxquery</groupId>
<artifactId>apache-vxquery</artifactId>
- <version>0.6-SNAPSHOT</version>
+ <version>0.6</version>
</parent>
<artifactId>apache-vxquery-cli</artifactId>
@@ -83,7 +83,7 @@
<dependency>
<groupId>org.apache.vxquery</groupId>
<artifactId>apache-vxquery-core</artifactId>
- <version>0.6-SNAPSHOT</version>
+ <version>0.6</version>
<scope>compile</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/vxquery/blob/a6784446/vxquery-core/pom.xml
----------------------------------------------------------------------
diff --git a/vxquery-core/pom.xml b/vxquery-core/pom.xml
index d244818..d1d1dcb 100644
--- a/vxquery-core/pom.xml
+++ b/vxquery-core/pom.xml
@@ -14,14 +14,13 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.vxquery</groupId>
<artifactId>apache-vxquery</artifactId>
- <version>0.6-SNAPSHOT</version>
+ <version>0.6</version>
</parent>
<artifactId>apache-vxquery-core</artifactId>
@@ -64,8 +63,7 @@
<configuration>
<target>
<ant antfile="build-xslt.xml" target="build">
- <property name="build.gen-src.dir"
- value="${project.build.directory}/generated-sources/main/java" />
+ <property name="build.gen-src.dir" value="${project.build.directory}/generated-sources/main/java" />
<property name="src.code.dir" value="${basedir}/src/main/java" />
<property name="xslt.dir" value="${basedir}/src/main/xslt" />
<property name="classpath.xslt" refid="maven.compile.classpath" />
@@ -82,8 +80,7 @@
<configuration>
<target>
<ant antfile="build-site.xml" target="build">
- <property name="build.gen-site.dir"
- value="${project.build.directory}/generated-site/apt" />
+ <property name="build.gen-site.dir" value="${project.build.directory}/generated-site/apt" />
<property name="src.code.dir" value="${basedir}/src/main/java" />
<property name="xslt.dir" value="${basedir}/src/main/xslt" />
<property name="classpath.xslt" refid="maven.compile.classpath" />
http://git-wip-us.apache.org/repos/asf/vxquery/blob/a6784446/vxquery-server/pom.xml
----------------------------------------------------------------------
diff --git a/vxquery-server/pom.xml b/vxquery-server/pom.xml
index 04ea34a..5fae1f8 100644
--- a/vxquery-server/pom.xml
+++ b/vxquery-server/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.vxquery</groupId>
<artifactId>apache-vxquery</artifactId>
- <version>0.6-SNAPSHOT</version>
+ <version>0.6</version>
</parent>
<artifactId>apache-vxquery-server</artifactId>
@@ -140,7 +140,7 @@
<dependency>
<groupId>org.apache.vxquery</groupId>
<artifactId>apache-vxquery-core</artifactId>
- <version>0.6-SNAPSHOT</version>
+ <version>0.6</version>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/vxquery/blob/a6784446/vxquery-xtest/pom.xml
----------------------------------------------------------------------
diff --git a/vxquery-xtest/pom.xml b/vxquery-xtest/pom.xml
index 4cb7c60..347d164 100644
--- a/vxquery-xtest/pom.xml
+++ b/vxquery-xtest/pom.xml
@@ -14,16 +14,13 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<project
- xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.vxquery</groupId>
<artifactId>apache-vxquery</artifactId>
- <version>0.6-SNAPSHOT</version>
+ <version>0.6</version>
</parent>
<artifactId>apache-vxquery-xtest</artifactId>
@@ -132,7 +129,7 @@
<dependency>
<groupId>org.apache.vxquery</groupId>
<artifactId>apache-vxquery-core</artifactId>
- <version>0.6-SNAPSHOT</version>
+ <version>0.6</version>
</dependency>
<dependency>
[21/50] [abbrv] vxquery git commit: VXQUERY-181 - Move to Hyracks
0.2.16
Posted by sj...@apache.org.
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/basex_scripts/run_basex_tests.sh
----------------------------------------------------------------------
diff --git a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/basex_scripts/run_basex_tests.sh b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/basex_scripts/run_basex_tests.sh
new file mode 100755
index 0000000..1e91498
--- /dev/null
+++ b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/basex_scripts/run_basex_tests.sh
@@ -0,0 +1,45 @@
+#!/bin/bash
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+NODES=${2}
+REPEAT=${3}
+DATASET=${4}
+EMAIL=${5}
+
+
+mkdir -p ~/logs/basex/
+
+for j in $(find ${1} -name '*q??.xq')
+do
+ date
+ echo "Running BaseX query: ${j}"
+ time JAVA_OPTS="-Xmx8g" java -cp BaseX823.jar org.basex.BaseX -V -x -w -r${REPEAT} ${j} >> ~/logs/basex/$(basename "${j}").log 2>&1
+done
+
+
+if which programname >/dev/null;
+then
+ echo "Sending out e-mail notification."
+ SUBJECT="BaseX Tests Finished (${DATASET})"
+ /bin/mail -s "${SUBJECT}" "${EMAIL}" <<EOM
+ Completed all BaseX tests on ${DATASET}.
+ EOM
+else
+ echo "No mail command to use."
+fi;
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql_scripts/run_group_test.sh
----------------------------------------------------------------------
diff --git a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql_scripts/run_group_test.sh b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql_scripts/run_group_test.sh
index 9c2f3ad..0c14d5f 100755
--- a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql_scripts/run_group_test.sh
+++ b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql_scripts/run_group_test.sh
@@ -31,6 +31,7 @@ fi
DATASET=${1}
NODES=${2}
+EMAIL=${3}
REPEAT=1
DATA_FILES=${NODES}
@@ -68,7 +69,7 @@ done
# Start test
-sh vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql_scripts/run_mrql_tests.sh vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql/ ${NODES} ${REPEAT} ${DATASET}
+sh vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql_scripts/run_mrql_tests.sh vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql/ ${NODES} ${REPEAT} ${DATASET} ${EMAIL}
# Stop Flink
kill ${FLINK_PID}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql_scripts/run_mrql_tests.sh
----------------------------------------------------------------------
diff --git a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql_scripts/run_mrql_tests.sh b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql_scripts/run_mrql_tests.sh
index c000727..eb64431 100755
--- a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql_scripts/run_mrql_tests.sh
+++ b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql_scripts/run_mrql_tests.sh
@@ -23,6 +23,7 @@
NODES=${2}
REPEAT=${3}
DATASET=${4}
+EMAIL=${5}
# Make log folder
@@ -40,7 +41,6 @@ if which programname >/dev/null;
then
echo "Sending out e-mail notification."
SUBJECT="MRQL Tests Finished (${DATASET})"
- EMAIL="ecarm002@ucr.edu"
/bin/mail -s "${SUBJECT}" "${EMAIL}" <<EOM
Completed all MRQL tests on ${DATASET}.
EOM
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/saxon_scripts/run_saxon_tests.sh
----------------------------------------------------------------------
diff --git a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/saxon_scripts/run_saxon_tests.sh b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/saxon_scripts/run_saxon_tests.sh
index c1c2132..b7b5316 100755
--- a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/saxon_scripts/run_saxon_tests.sh
+++ b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/saxon_scripts/run_saxon_tests.sh
@@ -7,9 +7,9 @@
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
-#
+#
# http://www.apache.org/licenses/LICENSE-2.0
-#
+#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,8 +17,10 @@
# limitations under the License.
#
+NODES=${2}
REPEAT=${3}
-DATASET="hcn"
+DATASET=${4}
+EMAIL=${5}
mkdir -p ~/logs/saxon/
@@ -35,7 +37,6 @@ if which programname >/dev/null;
then
echo "Sending out e-mail notification."
SUBJECT="Saxon Tests Finished (${DATASET})"
- EMAIL="ecarm002@ucr.edu"
/bin/mail -s "${SUBJECT}" "${EMAIL}" <<EOM
Completed all Saxon tests on ${DATASET}.
EOM
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-cli/pom.xml
----------------------------------------------------------------------
diff --git a/vxquery-cli/pom.xml b/vxquery-cli/pom.xml
index 620a4a8..7bf1ff9 100644
--- a/vxquery-cli/pom.xml
+++ b/vxquery-cli/pom.xml
@@ -88,42 +88,42 @@
</dependency>
<dependency>
- <groupId>edu.uci.ics.hyracks</groupId>
+ <groupId>org.apache.hyracks</groupId>
<artifactId>hyracks-api</artifactId>
</dependency>
<dependency>
- <groupId>edu.uci.ics.hyracks</groupId>
+ <groupId>org.apache.hyracks</groupId>
<artifactId>hyracks-client</artifactId>
</dependency>
<dependency>
- <groupId>edu.uci.ics.hyracks</groupId>
+ <groupId>org.apache.hyracks</groupId>
<artifactId>hyracks-control-cc</artifactId>
</dependency>
<dependency>
- <groupId>edu.uci.ics.hyracks</groupId>
+ <groupId>org.apache.hyracks</groupId>
<artifactId>hyracks-control-nc</artifactId>
</dependency>
<dependency>
- <groupId>edu.uci.ics.hyracks</groupId>
+ <groupId>org.apache.hyracks</groupId>
<artifactId>algebricks-common</artifactId>
</dependency>
<dependency>
- <groupId>edu.uci.ics.hyracks</groupId>
+ <groupId>org.apache.hyracks</groupId>
<artifactId>algebricks-core</artifactId>
</dependency>
<dependency>
- <groupId>edu.uci.ics.hyracks</groupId>
+ <groupId>org.apache.hyracks</groupId>
<artifactId>hyracks-control-common</artifactId>
</dependency>
<dependency>
- <groupId>edu.uci.ics.hyracks</groupId>
+ <groupId>org.apache.hyracks</groupId>
<artifactId>hyracks-dataflow-std</artifactId>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-cli/src/main/java/org/apache/vxquery/cli/VXQuery.java
----------------------------------------------------------------------
diff --git a/vxquery-cli/src/main/java/org/apache/vxquery/cli/VXQuery.java b/vxquery-cli/src/main/java/org/apache/vxquery/cli/VXQuery.java
index 0e88539..53b352f 100644
--- a/vxquery-cli/src/main/java/org/apache/vxquery/cli/VXQuery.java
+++ b/vxquery-cli/src/main/java/org/apache/vxquery/cli/VXQuery.java
@@ -20,7 +20,6 @@ import java.io.IOException;
import java.io.OutputStream;
import java.io.PrintWriter;
import java.io.StringReader;
-import java.nio.ByteBuffer;
import java.nio.file.Files;
import java.util.ArrayList;
import java.util.Date;
@@ -30,6 +29,25 @@ import java.util.List;
import java.util.Map;
import org.apache.commons.io.FileUtils;
+import org.apache.hyracks.api.client.HyracksConnection;
+import org.apache.hyracks.api.client.IHyracksClientConnection;
+import org.apache.hyracks.api.client.NodeControllerInfo;
+import org.apache.hyracks.api.comm.IFrame;
+import org.apache.hyracks.api.comm.IFrameTupleAccessor;
+import org.apache.hyracks.api.comm.VSizeFrame;
+import org.apache.hyracks.api.dataset.IHyracksDataset;
+import org.apache.hyracks.api.dataset.IHyracksDatasetReader;
+import org.apache.hyracks.api.dataset.ResultSetId;
+import org.apache.hyracks.api.job.JobFlag;
+import org.apache.hyracks.api.job.JobId;
+import org.apache.hyracks.api.job.JobSpecification;
+import org.apache.hyracks.client.dataset.HyracksDataset;
+import org.apache.hyracks.control.cc.ClusterControllerService;
+import org.apache.hyracks.control.common.controllers.CCConfig;
+import org.apache.hyracks.control.common.controllers.NCConfig;
+import org.apache.hyracks.control.nc.NodeControllerService;
+import org.apache.hyracks.control.nc.resources.memory.FrameManager;
+import org.apache.hyracks.dataflow.common.comm.io.ResultFrameTupleAccessor;
import org.apache.vxquery.compiler.CompilerControlBlock;
import org.apache.vxquery.compiler.algebricks.VXQueryGlobalDataFactory;
import org.apache.vxquery.context.DynamicContext;
@@ -45,23 +63,6 @@ import org.kohsuke.args4j.Argument;
import org.kohsuke.args4j.CmdLineParser;
import org.kohsuke.args4j.Option;
-import edu.uci.ics.hyracks.api.client.HyracksConnection;
-import edu.uci.ics.hyracks.api.client.IHyracksClientConnection;
-import edu.uci.ics.hyracks.api.client.NodeControllerInfo;
-import edu.uci.ics.hyracks.api.comm.IFrameTupleAccessor;
-import edu.uci.ics.hyracks.api.dataset.IHyracksDataset;
-import edu.uci.ics.hyracks.api.dataset.IHyracksDatasetReader;
-import edu.uci.ics.hyracks.api.dataset.ResultSetId;
-import edu.uci.ics.hyracks.api.job.JobFlag;
-import edu.uci.ics.hyracks.api.job.JobId;
-import edu.uci.ics.hyracks.api.job.JobSpecification;
-import edu.uci.ics.hyracks.client.dataset.HyracksDataset;
-import edu.uci.ics.hyracks.control.cc.ClusterControllerService;
-import edu.uci.ics.hyracks.control.common.controllers.CCConfig;
-import edu.uci.ics.hyracks.control.common.controllers.NCConfig;
-import edu.uci.ics.hyracks.control.nc.NodeControllerService;
-import edu.uci.ics.hyracks.dataflow.common.comm.io.ResultFrameTupleAccessor;
-
public class VXQuery {
private final CmdLineOptions opts;
@@ -266,15 +267,15 @@ public class VXQuery {
JobId jobId = hcc.startJob(spec, EnumSet.of(JobFlag.PROFILE_RUNTIME));
- ByteBuffer buffer = ByteBuffer.allocate(spec.getFrameSize());
+ FrameManager resultDisplayFrameMgr = new FrameManager(spec.getFrameSize());
+ IFrame frame = new VSizeFrame(resultDisplayFrameMgr);
IHyracksDatasetReader reader = hds.createReader(jobId, resultSetId);
- IFrameTupleAccessor frameTupleAccessor = new ResultFrameTupleAccessor(spec.getFrameSize());
- buffer.clear();
+ IFrameTupleAccessor frameTupleAccessor = new ResultFrameTupleAccessor();
- while (reader.read(buffer) > 0) {
- buffer.clear();
- writer.print(ResultUtils.getStringFromBuffer(buffer, frameTupleAccessor));
+ while (reader.read(frame) > 0) {
+ writer.print(ResultUtils.getStringFromBuffer(frame.getBuffer(), frameTupleAccessor));
writer.flush();
+ frame.getBuffer().clear();
}
hcc.waitForCompletion(jobId);
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/pom.xml
----------------------------------------------------------------------
diff --git a/vxquery-core/pom.xml b/vxquery-core/pom.xml
index 968e5c7..59cc987 100644
--- a/vxquery-core/pom.xml
+++ b/vxquery-core/pom.xml
@@ -179,32 +179,32 @@
</dependency>
<dependency>
- <groupId>edu.uci.ics.hyracks</groupId>
+ <groupId>org.apache.hyracks</groupId>
<artifactId>algebricks-compiler</artifactId>
</dependency>
<dependency>
- <groupId>edu.uci.ics.hyracks</groupId>
+ <groupId>org.apache.hyracks</groupId>
<artifactId>algebricks-data</artifactId>
</dependency>
<dependency>
- <groupId>edu.uci.ics.hyracks</groupId>
+ <groupId>org.apache.hyracks</groupId>
<artifactId>hyracks-api</artifactId>
</dependency>
<dependency>
- <groupId>edu.uci.ics.hyracks</groupId>
+ <groupId>org.apache.hyracks</groupId>
<artifactId>hyracks-data-std</artifactId>
</dependency>
<dependency>
- <groupId>edu.uci.ics.hyracks</groupId>
+ <groupId>org.apache.hyracks</groupId>
<artifactId>hyracks-dataflow-common</artifactId>
</dependency>
<dependency>
- <groupId>edu.uci.ics.hyracks</groupId>
+ <groupId>org.apache.hyracks</groupId>
<artifactId>hyracks-dataflow-std</artifactId>
</dependency>
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/collations/CodepointCollation.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/collations/CodepointCollation.java b/vxquery-core/src/main/java/org/apache/vxquery/collations/CodepointCollation.java
index 12291fe..c50ff56 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/collations/CodepointCollation.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/collations/CodepointCollation.java
@@ -93,4 +93,4 @@ public class CodepointCollation implements Collation {
public boolean supportsStringMatching() {
return true;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/collations/Collation.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/collations/Collation.java b/vxquery-core/src/main/java/org/apache/vxquery/collations/Collation.java
index 51debb0..e8cb40f 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/collations/Collation.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/collations/Collation.java
@@ -32,4 +32,4 @@ public interface Collation {
public CharSequence substringBefore(CharSequence cs1, CharSequence cs2);
public CharSequence substringAfter(CharSequence cs1, CharSequence cs2);
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/compiler/CompilerControlBlock.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/compiler/CompilerControlBlock.java b/vxquery-core/src/main/java/org/apache/vxquery/compiler/CompilerControlBlock.java
index ab58442..efc2ada 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/compiler/CompilerControlBlock.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/compiler/CompilerControlBlock.java
@@ -21,7 +21,7 @@ import java.util.Map;
import org.apache.vxquery.context.StaticContext;
-import edu.uci.ics.hyracks.api.dataset.ResultSetId;
+import org.apache.hyracks.api.dataset.ResultSetId;
public class CompilerControlBlock {
private final StaticContext ctx;
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/compiler/algebricks/VXQueryBinaryBooleanInspectorFactory.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/compiler/algebricks/VXQueryBinaryBooleanInspectorFactory.java b/vxquery-core/src/main/java/org/apache/vxquery/compiler/algebricks/VXQueryBinaryBooleanInspectorFactory.java
index afb4d58..09860d6 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/compiler/algebricks/VXQueryBinaryBooleanInspectorFactory.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/compiler/algebricks/VXQueryBinaryBooleanInspectorFactory.java
@@ -19,10 +19,10 @@ package org.apache.vxquery.compiler.algebricks;
import org.apache.vxquery.datamodel.accessors.TaggedValuePointable;
import org.apache.vxquery.datamodel.values.ValueTag;
-import edu.uci.ics.hyracks.algebricks.data.IBinaryBooleanInspector;
-import edu.uci.ics.hyracks.algebricks.data.IBinaryBooleanInspectorFactory;
-import edu.uci.ics.hyracks.api.context.IHyracksTaskContext;
-import edu.uci.ics.hyracks.data.std.primitive.BooleanPointable;
+import org.apache.hyracks.algebricks.data.IBinaryBooleanInspector;
+import org.apache.hyracks.algebricks.data.IBinaryBooleanInspectorFactory;
+import org.apache.hyracks.api.context.IHyracksTaskContext;
+import org.apache.hyracks.data.std.primitive.BooleanPointable;
public class VXQueryBinaryBooleanInspectorFactory implements IBinaryBooleanInspectorFactory {
private static final long serialVersionUID = 1L;
@@ -41,4 +41,4 @@ public class VXQueryBinaryBooleanInspectorFactory implements IBinaryBooleanInspe
}
};
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/compiler/algebricks/VXQueryBinaryIntegerInspectorFactory.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/compiler/algebricks/VXQueryBinaryIntegerInspectorFactory.java b/vxquery-core/src/main/java/org/apache/vxquery/compiler/algebricks/VXQueryBinaryIntegerInspectorFactory.java
index ccab60c..2979c1f 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/compiler/algebricks/VXQueryBinaryIntegerInspectorFactory.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/compiler/algebricks/VXQueryBinaryIntegerInspectorFactory.java
@@ -19,10 +19,10 @@ package org.apache.vxquery.compiler.algebricks;
import org.apache.vxquery.datamodel.accessors.TaggedValuePointable;
import org.apache.vxquery.datamodel.values.ValueTag;
-import edu.uci.ics.hyracks.algebricks.data.IBinaryIntegerInspector;
-import edu.uci.ics.hyracks.algebricks.data.IBinaryIntegerInspectorFactory;
-import edu.uci.ics.hyracks.api.context.IHyracksTaskContext;
-import edu.uci.ics.hyracks.data.std.primitive.IntegerPointable;
+import org.apache.hyracks.algebricks.data.IBinaryIntegerInspector;
+import org.apache.hyracks.algebricks.data.IBinaryIntegerInspectorFactory;
+import org.apache.hyracks.api.context.IHyracksTaskContext;
+import org.apache.hyracks.data.std.primitive.IntegerPointable;
public class VXQueryBinaryIntegerInspectorFactory implements IBinaryIntegerInspectorFactory {
private static final long serialVersionUID = 1L;
@@ -41,4 +41,4 @@ public class VXQueryBinaryIntegerInspectorFactory implements IBinaryIntegerInspe
}
};
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/compiler/algebricks/VXQueryComparatorFactoryProvider.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/compiler/algebricks/VXQueryComparatorFactoryProvider.java b/vxquery-core/src/main/java/org/apache/vxquery/compiler/algebricks/VXQueryComparatorFactoryProvider.java
index 10da31e..2643dc5 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/compiler/algebricks/VXQueryComparatorFactoryProvider.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/compiler/algebricks/VXQueryComparatorFactoryProvider.java
@@ -18,10 +18,10 @@ package org.apache.vxquery.compiler.algebricks;
import org.apache.vxquery.datamodel.accessors.TaggedValuePointable;
-import edu.uci.ics.hyracks.algebricks.common.exceptions.AlgebricksException;
-import edu.uci.ics.hyracks.algebricks.data.IBinaryComparatorFactoryProvider;
-import edu.uci.ics.hyracks.api.dataflow.value.IBinaryComparator;
-import edu.uci.ics.hyracks.api.dataflow.value.IBinaryComparatorFactory;
+import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
+import org.apache.hyracks.algebricks.data.IBinaryComparatorFactoryProvider;
+import org.apache.hyracks.api.dataflow.value.IBinaryComparator;
+import org.apache.hyracks.api.dataflow.value.IBinaryComparatorFactory;
public class VXQueryComparatorFactoryProvider implements IBinaryComparatorFactoryProvider {
@Override
@@ -58,4 +58,4 @@ public class VXQueryComparatorFactoryProvider implements IBinaryComparatorFactor
};
}
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/compiler/algebricks/VXQueryConstantValue.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/compiler/algebricks/VXQueryConstantValue.java b/vxquery-core/src/main/java/org/apache/vxquery/compiler/algebricks/VXQueryConstantValue.java
index 1cbe74e..e105546 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/compiler/algebricks/VXQueryConstantValue.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/compiler/algebricks/VXQueryConstantValue.java
@@ -19,7 +19,7 @@ package org.apache.vxquery.compiler.algebricks;
import org.apache.commons.codec.binary.Hex;
import org.apache.vxquery.types.SequenceType;
-import edu.uci.ics.hyracks.algebricks.core.algebra.expressions.IAlgebricksConstantValue;
+import org.apache.hyracks.algebricks.core.algebra.expressions.IAlgebricksConstantValue;
public class VXQueryConstantValue implements IAlgebricksConstantValue {
private final SequenceType type;
@@ -61,4 +61,4 @@ public class VXQueryConstantValue implements IAlgebricksConstantValue {
.append("])");
return buffer.toString();
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/compiler/algebricks/VXQueryExpressionRuntimeProvider.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/compiler/algebricks/VXQueryExpressionRuntimeProvider.java b/vxquery-core/src/main/java/org/apache/vxquery/compiler/algebricks/VXQueryExpressionRuntimeProvider.java
index bfafdae..1246141 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/compiler/algebricks/VXQueryExpressionRuntimeProvider.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/compiler/algebricks/VXQueryExpressionRuntimeProvider.java
@@ -23,29 +23,29 @@ import org.apache.vxquery.datamodel.values.XDMConstants;
import org.apache.vxquery.exceptions.SystemException;
import org.apache.vxquery.functions.Function;
-import edu.uci.ics.hyracks.algebricks.common.exceptions.AlgebricksException;
-import edu.uci.ics.hyracks.algebricks.core.algebra.base.ILogicalExpression;
-import edu.uci.ics.hyracks.algebricks.core.algebra.expressions.AggregateFunctionCallExpression;
-import edu.uci.ics.hyracks.algebricks.core.algebra.expressions.ConstantExpression;
-import edu.uci.ics.hyracks.algebricks.core.algebra.expressions.IAlgebricksConstantValue;
-import edu.uci.ics.hyracks.algebricks.core.algebra.expressions.IExpressionRuntimeProvider;
-import edu.uci.ics.hyracks.algebricks.core.algebra.expressions.IVariableTypeEnvironment;
-import edu.uci.ics.hyracks.algebricks.core.algebra.expressions.ScalarFunctionCallExpression;
-import edu.uci.ics.hyracks.algebricks.core.algebra.expressions.StatefulFunctionCallExpression;
-import edu.uci.ics.hyracks.algebricks.core.algebra.expressions.UnnestingFunctionCallExpression;
-import edu.uci.ics.hyracks.algebricks.core.algebra.expressions.VariableReferenceExpression;
-import edu.uci.ics.hyracks.algebricks.core.algebra.operators.logical.IOperatorSchema;
-import edu.uci.ics.hyracks.algebricks.core.jobgen.impl.JobGenContext;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IAggregateEvaluatorFactory;
-import edu.uci.ics.hyracks.algebricks.runtime.base.ICopySerializableAggregateFunctionFactory;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IRunningAggregateEvaluatorFactory;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IUnnestingEvaluatorFactory;
-import edu.uci.ics.hyracks.algebricks.runtime.evaluators.ConstantEvaluatorFactory;
-import edu.uci.ics.hyracks.algebricks.runtime.evaluators.TupleFieldEvaluatorFactory;
-import edu.uci.ics.hyracks.data.std.api.IPointable;
-import edu.uci.ics.hyracks.data.std.primitive.BooleanPointable;
-import edu.uci.ics.hyracks.data.std.primitive.VoidPointable;
+import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
+import org.apache.hyracks.algebricks.core.algebra.base.ILogicalExpression;
+import org.apache.hyracks.algebricks.core.algebra.expressions.AggregateFunctionCallExpression;
+import org.apache.hyracks.algebricks.core.algebra.expressions.ConstantExpression;
+import org.apache.hyracks.algebricks.core.algebra.expressions.IAlgebricksConstantValue;
+import org.apache.hyracks.algebricks.core.algebra.expressions.IExpressionRuntimeProvider;
+import org.apache.hyracks.algebricks.core.algebra.expressions.IVariableTypeEnvironment;
+import org.apache.hyracks.algebricks.core.algebra.expressions.ScalarFunctionCallExpression;
+import org.apache.hyracks.algebricks.core.algebra.expressions.StatefulFunctionCallExpression;
+import org.apache.hyracks.algebricks.core.algebra.expressions.UnnestingFunctionCallExpression;
+import org.apache.hyracks.algebricks.core.algebra.expressions.VariableReferenceExpression;
+import org.apache.hyracks.algebricks.core.algebra.operators.logical.IOperatorSchema;
+import org.apache.hyracks.algebricks.core.jobgen.impl.JobGenContext;
+import org.apache.hyracks.algebricks.runtime.base.IAggregateEvaluatorFactory;
+import org.apache.hyracks.algebricks.runtime.base.ICopySerializableAggregateFunctionFactory;
+import org.apache.hyracks.algebricks.runtime.base.IRunningAggregateEvaluatorFactory;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
+import org.apache.hyracks.algebricks.runtime.base.IUnnestingEvaluatorFactory;
+import org.apache.hyracks.algebricks.runtime.evaluators.ConstantEvaluatorFactory;
+import org.apache.hyracks.algebricks.runtime.evaluators.TupleFieldEvaluatorFactory;
+import org.apache.hyracks.data.std.api.IPointable;
+import org.apache.hyracks.data.std.primitive.BooleanPointable;
+import org.apache.hyracks.data.std.primitive.VoidPointable;
public class VXQueryExpressionRuntimeProvider implements IExpressionRuntimeProvider {
@Override
@@ -145,4 +145,4 @@ public class VXQueryExpressionRuntimeProvider implements IExpressionRuntimeProvi
throw new AlgebricksException(e);
}
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/compiler/algebricks/VXQueryGlobalDataFactory.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/compiler/algebricks/VXQueryGlobalDataFactory.java b/vxquery-core/src/main/java/org/apache/vxquery/compiler/algebricks/VXQueryGlobalDataFactory.java
index 07a210f..4bb58f8 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/compiler/algebricks/VXQueryGlobalDataFactory.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/compiler/algebricks/VXQueryGlobalDataFactory.java
@@ -18,8 +18,8 @@ package org.apache.vxquery.compiler.algebricks;
import org.apache.vxquery.context.IDynamicContextFactory;
-import edu.uci.ics.hyracks.api.context.IHyracksJobletContext;
-import edu.uci.ics.hyracks.api.job.IGlobalJobDataFactory;
+import org.apache.hyracks.api.context.IHyracksJobletContext;
+import org.apache.hyracks.api.job.IGlobalJobDataFactory;
public class VXQueryGlobalDataFactory implements IGlobalJobDataFactory {
private static final long serialVersionUID = 1L;
@@ -34,4 +34,4 @@ public class VXQueryGlobalDataFactory implements IGlobalJobDataFactory {
public Object createGlobalJobData(IHyracksJobletContext ctx) {
return dcf.createDynamicContext(ctx);
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/compiler/algebricks/VXQueryNullWriterFactory.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/compiler/algebricks/VXQueryNullWriterFactory.java b/vxquery-core/src/main/java/org/apache/vxquery/compiler/algebricks/VXQueryNullWriterFactory.java
index 7fe21d5..f0220dd 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/compiler/algebricks/VXQueryNullWriterFactory.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/compiler/algebricks/VXQueryNullWriterFactory.java
@@ -21,10 +21,10 @@ import java.io.IOException;
import org.apache.vxquery.datamodel.values.XDMConstants;
-import edu.uci.ics.hyracks.api.dataflow.value.INullWriter;
-import edu.uci.ics.hyracks.api.dataflow.value.INullWriterFactory;
-import edu.uci.ics.hyracks.api.exceptions.HyracksDataException;
-import edu.uci.ics.hyracks.data.std.primitive.VoidPointable;
+import org.apache.hyracks.api.dataflow.value.INullWriter;
+import org.apache.hyracks.api.dataflow.value.INullWriterFactory;
+import org.apache.hyracks.api.exceptions.HyracksDataException;
+import org.apache.hyracks.data.std.primitive.VoidPointable;
public class VXQueryNullWriterFactory implements INullWriterFactory {
private static final long serialVersionUID = 1L;
@@ -44,4 +44,4 @@ public class VXQueryNullWriterFactory implements INullWriterFactory {
}
};
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/compiler/algebricks/VXQueryPrinterFactory.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/compiler/algebricks/VXQueryPrinterFactory.java b/vxquery-core/src/main/java/org/apache/vxquery/compiler/algebricks/VXQueryPrinterFactory.java
index 8089775..4a2dc4c 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/compiler/algebricks/VXQueryPrinterFactory.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/compiler/algebricks/VXQueryPrinterFactory.java
@@ -18,8 +18,8 @@ package org.apache.vxquery.compiler.algebricks;
import org.apache.vxquery.serializer.XMLSerializer;
-import edu.uci.ics.hyracks.algebricks.data.IPrinter;
-import edu.uci.ics.hyracks.algebricks.data.IPrinterFactory;
+import org.apache.hyracks.algebricks.data.IPrinter;
+import org.apache.hyracks.algebricks.data.IPrinterFactory;
public class VXQueryPrinterFactory implements IPrinterFactory {
private static final long serialVersionUID = 1L;
@@ -28,4 +28,4 @@ public class VXQueryPrinterFactory implements IPrinterFactory {
public IPrinter createPrinter() {
return new XMLSerializer();
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/compiler/algebricks/VXQueryPrinterFactoryProvider.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/compiler/algebricks/VXQueryPrinterFactoryProvider.java b/vxquery-core/src/main/java/org/apache/vxquery/compiler/algebricks/VXQueryPrinterFactoryProvider.java
index b781239..65ef917 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/compiler/algebricks/VXQueryPrinterFactoryProvider.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/compiler/algebricks/VXQueryPrinterFactoryProvider.java
@@ -16,9 +16,9 @@
*/
package org.apache.vxquery.compiler.algebricks;
-import edu.uci.ics.hyracks.algebricks.common.exceptions.AlgebricksException;
-import edu.uci.ics.hyracks.algebricks.data.IPrinterFactory;
-import edu.uci.ics.hyracks.algebricks.data.IPrinterFactoryProvider;
+import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
+import org.apache.hyracks.algebricks.data.IPrinterFactory;
+import org.apache.hyracks.algebricks.data.IPrinterFactoryProvider;
public class VXQueryPrinterFactoryProvider implements IPrinterFactoryProvider {
public static final IPrinterFactoryProvider INSTANCE = new VXQueryPrinterFactoryProvider();
@@ -28,4 +28,4 @@ public class VXQueryPrinterFactoryProvider implements IPrinterFactoryProvider {
return new VXQueryPrinterFactory();
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/compiler/algebricks/prettyprint/VXQueryLogicalExpressionPrettyPrintVisitor.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/compiler/algebricks/prettyprint/VXQueryLogicalExpressionPrettyPrintVisitor.java b/vxquery-core/src/main/java/org/apache/vxquery/compiler/algebricks/prettyprint/VXQueryLogicalExpressionPrettyPrintVisitor.java
index e6d8dd1..02842b3 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/compiler/algebricks/prettyprint/VXQueryLogicalExpressionPrettyPrintVisitor.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/compiler/algebricks/prettyprint/VXQueryLogicalExpressionPrettyPrintVisitor.java
@@ -28,21 +28,21 @@ import org.apache.vxquery.functions.BuiltinOperators;
import org.apache.vxquery.serializer.XMLSerializer;
import org.apache.vxquery.types.SequenceType;
-import edu.uci.ics.hyracks.algebricks.common.exceptions.AlgebricksException;
-import edu.uci.ics.hyracks.algebricks.core.algebra.base.ILogicalExpression;
-import edu.uci.ics.hyracks.algebricks.core.algebra.base.LogicalExpressionTag;
-import edu.uci.ics.hyracks.algebricks.core.algebra.expressions.AbstractFunctionCallExpression;
-import edu.uci.ics.hyracks.algebricks.core.algebra.expressions.AggregateFunctionCallExpression;
-import edu.uci.ics.hyracks.algebricks.core.algebra.expressions.ConstantExpression;
-import edu.uci.ics.hyracks.algebricks.core.algebra.expressions.IAlgebricksConstantValue;
-import edu.uci.ics.hyracks.algebricks.core.algebra.expressions.ScalarFunctionCallExpression;
-import edu.uci.ics.hyracks.algebricks.core.algebra.expressions.StatefulFunctionCallExpression;
-import edu.uci.ics.hyracks.algebricks.core.algebra.expressions.UnnestingFunctionCallExpression;
-import edu.uci.ics.hyracks.algebricks.core.algebra.expressions.VariableReferenceExpression;
-import edu.uci.ics.hyracks.algebricks.core.algebra.functions.FunctionIdentifier;
-import edu.uci.ics.hyracks.algebricks.core.algebra.functions.IFunctionInfo;
-import edu.uci.ics.hyracks.algebricks.core.algebra.visitors.ILogicalExpressionVisitor;
-import edu.uci.ics.hyracks.data.std.primitive.IntegerPointable;
+import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
+import org.apache.hyracks.algebricks.core.algebra.base.ILogicalExpression;
+import org.apache.hyracks.algebricks.core.algebra.base.LogicalExpressionTag;
+import org.apache.hyracks.algebricks.core.algebra.expressions.AbstractFunctionCallExpression;
+import org.apache.hyracks.algebricks.core.algebra.expressions.AggregateFunctionCallExpression;
+import org.apache.hyracks.algebricks.core.algebra.expressions.ConstantExpression;
+import org.apache.hyracks.algebricks.core.algebra.expressions.IAlgebricksConstantValue;
+import org.apache.hyracks.algebricks.core.algebra.expressions.ScalarFunctionCallExpression;
+import org.apache.hyracks.algebricks.core.algebra.expressions.StatefulFunctionCallExpression;
+import org.apache.hyracks.algebricks.core.algebra.expressions.UnnestingFunctionCallExpression;
+import org.apache.hyracks.algebricks.core.algebra.expressions.VariableReferenceExpression;
+import org.apache.hyracks.algebricks.core.algebra.functions.FunctionIdentifier;
+import org.apache.hyracks.algebricks.core.algebra.functions.IFunctionInfo;
+import org.apache.hyracks.algebricks.core.algebra.visitors.ILogicalExpressionVisitor;
+import org.apache.hyracks.data.std.primitive.IntegerPointable;
public class VXQueryLogicalExpressionPrettyPrintVisitor implements ILogicalExpressionVisitor<String, Integer> {
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/RewriteRuleset.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/RewriteRuleset.java b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/RewriteRuleset.java
index c3d0358..075fb3e 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/RewriteRuleset.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/RewriteRuleset.java
@@ -45,47 +45,47 @@ import org.apache.vxquery.compiler.rewriter.rules.algebricksalternatives.Extract
import org.apache.vxquery.compiler.rewriter.rules.algebricksalternatives.InlineNestedVariablesRule;
import org.apache.vxquery.compiler.rewriter.rules.algebricksalternatives.MoveFreeVariableOperatorOutOfSubplanRule;
-import edu.uci.ics.hyracks.algebricks.core.rewriter.base.HeuristicOptimizer;
-import edu.uci.ics.hyracks.algebricks.core.rewriter.base.IAlgebraicRewriteRule;
-import edu.uci.ics.hyracks.algebricks.rewriter.rules.BreakSelectIntoConjunctsRule;
-import edu.uci.ics.hyracks.algebricks.rewriter.rules.ComplexJoinInferenceRule;
-import edu.uci.ics.hyracks.algebricks.rewriter.rules.ComplexUnnestToProductRule;
-import edu.uci.ics.hyracks.algebricks.rewriter.rules.ConsolidateAssignsRule;
-import edu.uci.ics.hyracks.algebricks.rewriter.rules.ConsolidateSelectsRule;
-import edu.uci.ics.hyracks.algebricks.rewriter.rules.CopyLimitDownRule;
-import edu.uci.ics.hyracks.algebricks.rewriter.rules.EliminateGroupByEmptyKeyRule;
-import edu.uci.ics.hyracks.algebricks.rewriter.rules.EliminateSubplanRule;
-import edu.uci.ics.hyracks.algebricks.rewriter.rules.EliminateSubplanWithInputCardinalityOneRule;
-import edu.uci.ics.hyracks.algebricks.rewriter.rules.EnforceStructuralPropertiesRule;
-import edu.uci.ics.hyracks.algebricks.rewriter.rules.ExtractCommonOperatorsRule;
-import edu.uci.ics.hyracks.algebricks.rewriter.rules.ExtractGbyExpressionsRule;
-import edu.uci.ics.hyracks.algebricks.rewriter.rules.FactorRedundantGroupAndDecorVarsRule;
-import edu.uci.ics.hyracks.algebricks.rewriter.rules.InferTypesRule;
-import edu.uci.ics.hyracks.algebricks.rewriter.rules.InlineAssignIntoAggregateRule;
-import edu.uci.ics.hyracks.algebricks.rewriter.rules.InlineVariablesRule;
-import edu.uci.ics.hyracks.algebricks.rewriter.rules.InsertOuterJoinRule;
-import edu.uci.ics.hyracks.algebricks.rewriter.rules.IntroJoinInsideSubplanRule;
-import edu.uci.ics.hyracks.algebricks.rewriter.rules.IntroduceAggregateCombinerRule;
-import edu.uci.ics.hyracks.algebricks.rewriter.rules.IntroduceGroupByCombinerRule;
-import edu.uci.ics.hyracks.algebricks.rewriter.rules.IntroduceGroupByForSubplanRule;
-import edu.uci.ics.hyracks.algebricks.rewriter.rules.IntroduceProjectsRule;
-import edu.uci.ics.hyracks.algebricks.rewriter.rules.IsolateHyracksOperatorsRule;
-import edu.uci.ics.hyracks.algebricks.rewriter.rules.NestedSubplanToJoinRule;
-import edu.uci.ics.hyracks.algebricks.rewriter.rules.PullSelectOutOfEqJoin;
-import edu.uci.ics.hyracks.algebricks.rewriter.rules.PushMapOperatorDownThroughProductRule;
-import edu.uci.ics.hyracks.algebricks.rewriter.rules.PushProjectDownRule;
-import edu.uci.ics.hyracks.algebricks.rewriter.rules.PushProjectIntoDataSourceScanRule;
-import edu.uci.ics.hyracks.algebricks.rewriter.rules.PushSelectDownRule;
-import edu.uci.ics.hyracks.algebricks.rewriter.rules.PushSelectIntoJoinRule;
-import edu.uci.ics.hyracks.algebricks.rewriter.rules.PushSubplanIntoGroupByRule;
-import edu.uci.ics.hyracks.algebricks.rewriter.rules.PushSubplanWithAggregateDownThroughProductRule;
-import edu.uci.ics.hyracks.algebricks.rewriter.rules.ReinferAllTypesRule;
-import edu.uci.ics.hyracks.algebricks.rewriter.rules.RemoveRedundantVariablesRule;
-import edu.uci.ics.hyracks.algebricks.rewriter.rules.RemoveUnusedAssignAndAggregateRule;
-import edu.uci.ics.hyracks.algebricks.rewriter.rules.SetAlgebricksPhysicalOperatorsRule;
-import edu.uci.ics.hyracks.algebricks.rewriter.rules.SetExecutionModeRule;
-import edu.uci.ics.hyracks.algebricks.rewriter.rules.SimpleUnnestToProductRule;
-import edu.uci.ics.hyracks.algebricks.rewriter.rules.SubplanOutOfGroupRule;
+import org.apache.hyracks.algebricks.core.rewriter.base.HeuristicOptimizer;
+import org.apache.hyracks.algebricks.core.rewriter.base.IAlgebraicRewriteRule;
+import org.apache.hyracks.algebricks.rewriter.rules.BreakSelectIntoConjunctsRule;
+import org.apache.hyracks.algebricks.rewriter.rules.ComplexJoinInferenceRule;
+import org.apache.hyracks.algebricks.rewriter.rules.ComplexUnnestToProductRule;
+import org.apache.hyracks.algebricks.rewriter.rules.ConsolidateAssignsRule;
+import org.apache.hyracks.algebricks.rewriter.rules.ConsolidateSelectsRule;
+import org.apache.hyracks.algebricks.rewriter.rules.CopyLimitDownRule;
+import org.apache.hyracks.algebricks.rewriter.rules.EliminateGroupByEmptyKeyRule;
+import org.apache.hyracks.algebricks.rewriter.rules.EliminateSubplanRule;
+import org.apache.hyracks.algebricks.rewriter.rules.EliminateSubplanWithInputCardinalityOneRule;
+import org.apache.hyracks.algebricks.rewriter.rules.EnforceStructuralPropertiesRule;
+import org.apache.hyracks.algebricks.rewriter.rules.ExtractCommonOperatorsRule;
+import org.apache.hyracks.algebricks.rewriter.rules.ExtractGbyExpressionsRule;
+import org.apache.hyracks.algebricks.rewriter.rules.FactorRedundantGroupAndDecorVarsRule;
+import org.apache.hyracks.algebricks.rewriter.rules.InferTypesRule;
+import org.apache.hyracks.algebricks.rewriter.rules.InlineAssignIntoAggregateRule;
+import org.apache.hyracks.algebricks.rewriter.rules.InlineVariablesRule;
+import org.apache.hyracks.algebricks.rewriter.rules.InsertOuterJoinRule;
+import org.apache.hyracks.algebricks.rewriter.rules.IntroJoinInsideSubplanRule;
+import org.apache.hyracks.algebricks.rewriter.rules.IntroduceAggregateCombinerRule;
+import org.apache.hyracks.algebricks.rewriter.rules.IntroduceGroupByCombinerRule;
+import org.apache.hyracks.algebricks.rewriter.rules.IntroduceGroupByForSubplanRule;
+import org.apache.hyracks.algebricks.rewriter.rules.IntroduceProjectsRule;
+import org.apache.hyracks.algebricks.rewriter.rules.IsolateHyracksOperatorsRule;
+import org.apache.hyracks.algebricks.rewriter.rules.NestedSubplanToJoinRule;
+import org.apache.hyracks.algebricks.rewriter.rules.PullSelectOutOfEqJoin;
+import org.apache.hyracks.algebricks.rewriter.rules.PushMapOperatorDownThroughProductRule;
+import org.apache.hyracks.algebricks.rewriter.rules.PushProjectDownRule;
+import org.apache.hyracks.algebricks.rewriter.rules.PushProjectIntoDataSourceScanRule;
+import org.apache.hyracks.algebricks.rewriter.rules.PushSelectDownRule;
+import org.apache.hyracks.algebricks.rewriter.rules.PushSelectIntoJoinRule;
+import org.apache.hyracks.algebricks.rewriter.rules.PushSubplanIntoGroupByRule;
+import org.apache.hyracks.algebricks.rewriter.rules.PushSubplanWithAggregateDownThroughProductRule;
+import org.apache.hyracks.algebricks.rewriter.rules.ReinferAllTypesRule;
+import org.apache.hyracks.algebricks.rewriter.rules.RemoveRedundantVariablesRule;
+import org.apache.hyracks.algebricks.rewriter.rules.RemoveUnusedAssignAndAggregateRule;
+import org.apache.hyracks.algebricks.rewriter.rules.SetAlgebricksPhysicalOperatorsRule;
+import org.apache.hyracks.algebricks.rewriter.rules.SetExecutionModeRule;
+import org.apache.hyracks.algebricks.rewriter.rules.SimpleUnnestToProductRule;
+import org.apache.hyracks.algebricks.rewriter.rules.SubplanOutOfGroupRule;
public class RewriteRuleset {
/**
@@ -327,4 +327,4 @@ public class RewriteRuleset {
prepareForJobGenRewrites.add(new SetExecutionModeRule());
return prepareForJobGenRewrites;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/VXQueryOptimizationContext.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/VXQueryOptimizationContext.java b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/VXQueryOptimizationContext.java
index b2a6f1a..eef9495 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/VXQueryOptimizationContext.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/VXQueryOptimizationContext.java
@@ -21,14 +21,14 @@ import org.apache.vxquery.compiler.rewriter.rules.propagationpolicies.cardinalit
import org.apache.vxquery.compiler.rewriter.rules.propagationpolicies.documentorder.DocumentOrder;
import org.apache.vxquery.compiler.rewriter.rules.propagationpolicies.uniquenodes.UniqueNodes;
-import edu.uci.ics.hyracks.algebricks.core.algebra.base.ILogicalOperator;
-import edu.uci.ics.hyracks.algebricks.core.algebra.expressions.IExpressionEvalSizeComputer;
-import edu.uci.ics.hyracks.algebricks.core.algebra.expressions.IExpressionTypeComputer;
-import edu.uci.ics.hyracks.algebricks.core.algebra.expressions.IMergeAggregationExpressionFactory;
-import edu.uci.ics.hyracks.algebricks.core.algebra.expressions.INullableTypeComputer;
-import edu.uci.ics.hyracks.algebricks.core.algebra.prettyprint.LogicalOperatorPrettyPrintVisitor;
-import edu.uci.ics.hyracks.algebricks.core.rewriter.base.AlgebricksOptimizationContext;
-import edu.uci.ics.hyracks.algebricks.core.rewriter.base.PhysicalOptimizationConfig;
+import org.apache.hyracks.algebricks.core.algebra.base.ILogicalOperator;
+import org.apache.hyracks.algebricks.core.algebra.expressions.IExpressionEvalSizeComputer;
+import org.apache.hyracks.algebricks.core.algebra.expressions.IExpressionTypeComputer;
+import org.apache.hyracks.algebricks.core.algebra.expressions.IMergeAggregationExpressionFactory;
+import org.apache.hyracks.algebricks.core.algebra.expressions.INullableTypeComputer;
+import org.apache.hyracks.algebricks.core.algebra.prettyprint.LogicalOperatorPrettyPrintVisitor;
+import org.apache.hyracks.algebricks.core.rewriter.base.AlgebricksOptimizationContext;
+import org.apache.hyracks.algebricks.core.rewriter.base.PhysicalOptimizationConfig;
public class VXQueryOptimizationContext extends AlgebricksOptimizationContext {
@@ -95,4 +95,4 @@ public class VXQueryOptimizationContext extends AlgebricksOptimizationContext {
this.uniqueNodesOperatorVariableMap.put(op, variableMap);
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/AbstractCollectionRule.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/AbstractCollectionRule.java b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/AbstractCollectionRule.java
index 717914a..f343b41 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/AbstractCollectionRule.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/AbstractCollectionRule.java
@@ -31,21 +31,21 @@ import org.apache.vxquery.types.BuiltinTypeRegistry;
import org.apache.vxquery.types.Quantifier;
import org.apache.vxquery.types.SequenceType;
-import edu.uci.ics.hyracks.algebricks.common.exceptions.AlgebricksException;
-import edu.uci.ics.hyracks.algebricks.core.algebra.base.ILogicalExpression;
-import edu.uci.ics.hyracks.algebricks.core.algebra.base.ILogicalOperator;
-import edu.uci.ics.hyracks.algebricks.core.algebra.base.IOptimizationContext;
-import edu.uci.ics.hyracks.algebricks.core.algebra.base.LogicalExpressionTag;
-import edu.uci.ics.hyracks.algebricks.core.algebra.base.LogicalOperatorTag;
-import edu.uci.ics.hyracks.algebricks.core.algebra.expressions.AbstractFunctionCallExpression;
-import edu.uci.ics.hyracks.algebricks.core.algebra.expressions.ConstantExpression;
-import edu.uci.ics.hyracks.algebricks.core.algebra.expressions.VariableReferenceExpression;
-import edu.uci.ics.hyracks.algebricks.core.algebra.operators.logical.AbstractLogicalOperator;
-import edu.uci.ics.hyracks.algebricks.core.algebra.operators.logical.AssignOperator;
-import edu.uci.ics.hyracks.algebricks.core.algebra.operators.logical.UnnestOperator;
-import edu.uci.ics.hyracks.algebricks.core.rewriter.base.IAlgebraicRewriteRule;
-import edu.uci.ics.hyracks.data.std.primitive.UTF8StringPointable;
-import edu.uci.ics.hyracks.dataflow.common.comm.util.ByteBufferInputStream;
+import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
+import org.apache.hyracks.algebricks.core.algebra.base.ILogicalExpression;
+import org.apache.hyracks.algebricks.core.algebra.base.ILogicalOperator;
+import org.apache.hyracks.algebricks.core.algebra.base.IOptimizationContext;
+import org.apache.hyracks.algebricks.core.algebra.base.LogicalExpressionTag;
+import org.apache.hyracks.algebricks.core.algebra.base.LogicalOperatorTag;
+import org.apache.hyracks.algebricks.core.algebra.expressions.AbstractFunctionCallExpression;
+import org.apache.hyracks.algebricks.core.algebra.expressions.ConstantExpression;
+import org.apache.hyracks.algebricks.core.algebra.expressions.VariableReferenceExpression;
+import org.apache.hyracks.algebricks.core.algebra.operators.logical.AbstractLogicalOperator;
+import org.apache.hyracks.algebricks.core.algebra.operators.logical.AssignOperator;
+import org.apache.hyracks.algebricks.core.algebra.operators.logical.UnnestOperator;
+import org.apache.hyracks.algebricks.core.rewriter.base.IAlgebraicRewriteRule;
+import org.apache.hyracks.data.std.primitive.UTF8StringPointable;
+import org.apache.hyracks.dataflow.common.comm.util.ByteBufferInputStream;
public abstract class AbstractCollectionRule implements IAlgebraicRewriteRule {
final ByteBufferInputStream bbis = new ByteBufferInputStream();
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/AbstractRemoveRedundantTypeExpressionsRule.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/AbstractRemoveRedundantTypeExpressionsRule.java b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/AbstractRemoveRedundantTypeExpressionsRule.java
index 5d83be7..2430b5d 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/AbstractRemoveRedundantTypeExpressionsRule.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/AbstractRemoveRedundantTypeExpressionsRule.java
@@ -26,13 +26,13 @@ import org.apache.vxquery.context.RootStaticContextImpl;
import org.apache.vxquery.context.StaticContextImpl;
import org.apache.vxquery.types.SequenceType;
-import edu.uci.ics.hyracks.algebricks.common.exceptions.AlgebricksException;
-import edu.uci.ics.hyracks.algebricks.core.algebra.base.ILogicalExpression;
-import edu.uci.ics.hyracks.algebricks.core.algebra.base.ILogicalOperator;
-import edu.uci.ics.hyracks.algebricks.core.algebra.base.IOptimizationContext;
-import edu.uci.ics.hyracks.algebricks.core.algebra.expressions.AbstractFunctionCallExpression;
-import edu.uci.ics.hyracks.algebricks.core.algebra.functions.FunctionIdentifier;
-import edu.uci.ics.hyracks.algebricks.core.rewriter.base.IAlgebraicRewriteRule;
+import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
+import org.apache.hyracks.algebricks.core.algebra.base.ILogicalExpression;
+import org.apache.hyracks.algebricks.core.algebra.base.ILogicalOperator;
+import org.apache.hyracks.algebricks.core.algebra.base.IOptimizationContext;
+import org.apache.hyracks.algebricks.core.algebra.expressions.AbstractFunctionCallExpression;
+import org.apache.hyracks.algebricks.core.algebra.functions.FunctionIdentifier;
+import org.apache.hyracks.algebricks.core.rewriter.base.IAlgebraicRewriteRule;
public abstract class AbstractRemoveRedundantTypeExpressionsRule implements IAlgebraicRewriteRule {
final StaticContextImpl dCtx = new StaticContextImpl(RootStaticContextImpl.INSTANCE);
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/AbstractUsedVariablesProcessingRule.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/AbstractUsedVariablesProcessingRule.java b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/AbstractUsedVariablesProcessingRule.java
index 5c95a0e..7ee05c0 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/AbstractUsedVariablesProcessingRule.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/AbstractUsedVariablesProcessingRule.java
@@ -21,15 +21,15 @@ import java.util.List;
import org.apache.commons.lang3.mutable.Mutable;
-import edu.uci.ics.hyracks.algebricks.common.exceptions.AlgebricksException;
-import edu.uci.ics.hyracks.algebricks.core.algebra.base.ILogicalOperator;
-import edu.uci.ics.hyracks.algebricks.core.algebra.base.ILogicalPlan;
-import edu.uci.ics.hyracks.algebricks.core.algebra.base.IOptimizationContext;
-import edu.uci.ics.hyracks.algebricks.core.algebra.base.LogicalVariable;
-import edu.uci.ics.hyracks.algebricks.core.algebra.operators.logical.AbstractLogicalOperator;
-import edu.uci.ics.hyracks.algebricks.core.algebra.operators.logical.AbstractOperatorWithNestedPlans;
-import edu.uci.ics.hyracks.algebricks.core.algebra.operators.logical.visitors.VariableUtilities;
-import edu.uci.ics.hyracks.algebricks.core.rewriter.base.IAlgebraicRewriteRule;
+import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
+import org.apache.hyracks.algebricks.core.algebra.base.ILogicalOperator;
+import org.apache.hyracks.algebricks.core.algebra.base.ILogicalPlan;
+import org.apache.hyracks.algebricks.core.algebra.base.IOptimizationContext;
+import org.apache.hyracks.algebricks.core.algebra.base.LogicalVariable;
+import org.apache.hyracks.algebricks.core.algebra.operators.logical.AbstractLogicalOperator;
+import org.apache.hyracks.algebricks.core.algebra.operators.logical.AbstractOperatorWithNestedPlans;
+import org.apache.hyracks.algebricks.core.algebra.operators.logical.visitors.VariableUtilities;
+import org.apache.hyracks.algebricks.core.rewriter.base.IAlgebraicRewriteRule;
/**
* The AbstractUsedVariablesProcessingRule provides a frame work to track used
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/AbstractVXQueryAggregateRule.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/AbstractVXQueryAggregateRule.java b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/AbstractVXQueryAggregateRule.java
index 80834c9..f9db614 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/AbstractVXQueryAggregateRule.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/AbstractVXQueryAggregateRule.java
@@ -18,9 +18,9 @@ package org.apache.vxquery.compiler.rewriter.rules;
import org.apache.vxquery.functions.BuiltinFunctions;
-import edu.uci.ics.hyracks.algebricks.core.algebra.expressions.AbstractFunctionCallExpression;
-import edu.uci.ics.hyracks.algebricks.core.algebra.functions.IFunctionInfo;
-import edu.uci.ics.hyracks.algebricks.core.rewriter.base.IAlgebraicRewriteRule;
+import org.apache.hyracks.algebricks.core.algebra.expressions.AbstractFunctionCallExpression;
+import org.apache.hyracks.algebricks.core.algebra.functions.IFunctionInfo;
+import org.apache.hyracks.algebricks.core.rewriter.base.IAlgebraicRewriteRule;
public abstract class AbstractVXQueryAggregateRule implements IAlgebraicRewriteRule {
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/CollectionFileDomain.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/CollectionFileDomain.java b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/CollectionFileDomain.java
index 2331838..79a38e8 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/CollectionFileDomain.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/CollectionFileDomain.java
@@ -16,7 +16,7 @@
*/
package org.apache.vxquery.compiler.rewriter.rules;
-import edu.uci.ics.hyracks.algebricks.core.algebra.properties.INodeDomain;
+import org.apache.hyracks.algebricks.core.algebra.properties.INodeDomain;
public class CollectionFileDomain implements INodeDomain {
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/ConsolidateAssignAggregateRule.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/ConsolidateAssignAggregateRule.java b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/ConsolidateAssignAggregateRule.java
index 6a471c5..ecc105e 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/ConsolidateAssignAggregateRule.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/ConsolidateAssignAggregateRule.java
@@ -26,23 +26,23 @@ import org.apache.vxquery.types.BuiltinTypeRegistry;
import org.apache.vxquery.types.Quantifier;
import org.apache.vxquery.types.SequenceType;
-import edu.uci.ics.hyracks.algebricks.common.exceptions.AlgebricksException;
-import edu.uci.ics.hyracks.algebricks.core.algebra.base.ILogicalExpression;
-import edu.uci.ics.hyracks.algebricks.core.algebra.base.ILogicalOperator;
-import edu.uci.ics.hyracks.algebricks.core.algebra.base.IOptimizationContext;
-import edu.uci.ics.hyracks.algebricks.core.algebra.base.LogicalExpressionTag;
-import edu.uci.ics.hyracks.algebricks.core.algebra.base.LogicalOperatorTag;
-import edu.uci.ics.hyracks.algebricks.core.algebra.base.LogicalVariable;
-import edu.uci.ics.hyracks.algebricks.core.algebra.expressions.AbstractFunctionCallExpression;
-import edu.uci.ics.hyracks.algebricks.core.algebra.expressions.ConstantExpression;
-import edu.uci.ics.hyracks.algebricks.core.algebra.expressions.VariableReferenceExpression;
-import edu.uci.ics.hyracks.algebricks.core.algebra.functions.IFunctionInfo;
-import edu.uci.ics.hyracks.algebricks.core.algebra.operators.logical.AbstractLogicalOperator;
-import edu.uci.ics.hyracks.algebricks.core.algebra.operators.logical.AggregateOperator;
-import edu.uci.ics.hyracks.algebricks.core.algebra.operators.logical.AssignOperator;
-import edu.uci.ics.hyracks.algebricks.core.algebra.operators.logical.SubplanOperator;
-import edu.uci.ics.hyracks.data.std.api.IPointable;
-import edu.uci.ics.hyracks.data.std.primitive.BooleanPointable;
+import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
+import org.apache.hyracks.algebricks.core.algebra.base.ILogicalExpression;
+import org.apache.hyracks.algebricks.core.algebra.base.ILogicalOperator;
+import org.apache.hyracks.algebricks.core.algebra.base.IOptimizationContext;
+import org.apache.hyracks.algebricks.core.algebra.base.LogicalExpressionTag;
+import org.apache.hyracks.algebricks.core.algebra.base.LogicalOperatorTag;
+import org.apache.hyracks.algebricks.core.algebra.base.LogicalVariable;
+import org.apache.hyracks.algebricks.core.algebra.expressions.AbstractFunctionCallExpression;
+import org.apache.hyracks.algebricks.core.algebra.expressions.ConstantExpression;
+import org.apache.hyracks.algebricks.core.algebra.expressions.VariableReferenceExpression;
+import org.apache.hyracks.algebricks.core.algebra.functions.IFunctionInfo;
+import org.apache.hyracks.algebricks.core.algebra.operators.logical.AbstractLogicalOperator;
+import org.apache.hyracks.algebricks.core.algebra.operators.logical.AggregateOperator;
+import org.apache.hyracks.algebricks.core.algebra.operators.logical.AssignOperator;
+import org.apache.hyracks.algebricks.core.algebra.operators.logical.SubplanOperator;
+import org.apache.hyracks.data.std.api.IPointable;
+import org.apache.hyracks.data.std.primitive.BooleanPointable;
/**
* The rule searches for assign operator with an aggregate function expression
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/ConsolidateDescandantChild.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/ConsolidateDescandantChild.java b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/ConsolidateDescandantChild.java
index a83b952..8f244ef 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/ConsolidateDescandantChild.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/ConsolidateDescandantChild.java
@@ -7,16 +7,16 @@ import org.apache.vxquery.compiler.rewriter.rules.util.ExpressionToolbox;
import org.apache.vxquery.compiler.rewriter.rules.util.OperatorToolbox;
import org.apache.vxquery.functions.BuiltinOperators;
-import edu.uci.ics.hyracks.algebricks.common.exceptions.AlgebricksException;
-import edu.uci.ics.hyracks.algebricks.core.algebra.base.ILogicalExpression;
-import edu.uci.ics.hyracks.algebricks.core.algebra.base.ILogicalOperator;
-import edu.uci.ics.hyracks.algebricks.core.algebra.base.IOptimizationContext;
-import edu.uci.ics.hyracks.algebricks.core.algebra.base.LogicalExpressionTag;
-import edu.uci.ics.hyracks.algebricks.core.algebra.base.LogicalOperatorTag;
-import edu.uci.ics.hyracks.algebricks.core.algebra.expressions.AbstractFunctionCallExpression;
-import edu.uci.ics.hyracks.algebricks.core.algebra.expressions.VariableReferenceExpression;
-import edu.uci.ics.hyracks.algebricks.core.algebra.operators.logical.AbstractUnnestOperator;
-import edu.uci.ics.hyracks.algebricks.core.rewriter.base.IAlgebraicRewriteRule;
+import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
+import org.apache.hyracks.algebricks.core.algebra.base.ILogicalExpression;
+import org.apache.hyracks.algebricks.core.algebra.base.ILogicalOperator;
+import org.apache.hyracks.algebricks.core.algebra.base.IOptimizationContext;
+import org.apache.hyracks.algebricks.core.algebra.base.LogicalExpressionTag;
+import org.apache.hyracks.algebricks.core.algebra.base.LogicalOperatorTag;
+import org.apache.hyracks.algebricks.core.algebra.expressions.AbstractFunctionCallExpression;
+import org.apache.hyracks.algebricks.core.algebra.expressions.VariableReferenceExpression;
+import org.apache.hyracks.algebricks.core.algebra.operators.logical.AbstractUnnestOperator;
+import org.apache.hyracks.algebricks.core.rewriter.base.IAlgebraicRewriteRule;
/**
* The rule searches for assign operator with an aggregate function expression
@@ -101,4 +101,4 @@ public class ConsolidateDescandantChild implements IAlgebraicRewriteRule {
lo.getInputs().get(0).setValue((ILogicalOperator) ilo);
return true;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/ConsolidateUnnestsRule.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/ConsolidateUnnestsRule.java b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/ConsolidateUnnestsRule.java
index f1b2196..b634f5b 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/ConsolidateUnnestsRule.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/ConsolidateUnnestsRule.java
@@ -21,16 +21,16 @@ import org.apache.vxquery.compiler.rewriter.rules.util.ExpressionToolbox;
import org.apache.vxquery.functions.BuiltinOperators;
import org.apache.vxquery.functions.Function;
-import edu.uci.ics.hyracks.algebricks.common.exceptions.AlgebricksException;
-import edu.uci.ics.hyracks.algebricks.core.algebra.base.ILogicalExpression;
-import edu.uci.ics.hyracks.algebricks.core.algebra.base.ILogicalOperator;
-import edu.uci.ics.hyracks.algebricks.core.algebra.base.IOptimizationContext;
-import edu.uci.ics.hyracks.algebricks.core.algebra.base.LogicalExpressionTag;
-import edu.uci.ics.hyracks.algebricks.core.algebra.base.LogicalOperatorTag;
-import edu.uci.ics.hyracks.algebricks.core.algebra.expressions.AbstractFunctionCallExpression;
-import edu.uci.ics.hyracks.algebricks.core.algebra.expressions.ScalarFunctionCallExpression;
-import edu.uci.ics.hyracks.algebricks.core.algebra.operators.logical.AbstractLogicalOperator;
-import edu.uci.ics.hyracks.algebricks.core.algebra.operators.logical.UnnestOperator;
+import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
+import org.apache.hyracks.algebricks.core.algebra.base.ILogicalExpression;
+import org.apache.hyracks.algebricks.core.algebra.base.ILogicalOperator;
+import org.apache.hyracks.algebricks.core.algebra.base.IOptimizationContext;
+import org.apache.hyracks.algebricks.core.algebra.base.LogicalExpressionTag;
+import org.apache.hyracks.algebricks.core.algebra.base.LogicalOperatorTag;
+import org.apache.hyracks.algebricks.core.algebra.expressions.AbstractFunctionCallExpression;
+import org.apache.hyracks.algebricks.core.algebra.expressions.ScalarFunctionCallExpression;
+import org.apache.hyracks.algebricks.core.algebra.operators.logical.AbstractLogicalOperator;
+import org.apache.hyracks.algebricks.core.algebra.operators.logical.UnnestOperator;
/**
* The rule searches for an unnest operator (1) immediately following an unnest
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/ConvertAssignSortDistinctNodesToOperatorsRule.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/ConvertAssignSortDistinctNodesToOperatorsRule.java b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/ConvertAssignSortDistinctNodesToOperatorsRule.java
index f3d7d48..f70e656 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/ConvertAssignSortDistinctNodesToOperatorsRule.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/ConvertAssignSortDistinctNodesToOperatorsRule.java
@@ -23,30 +23,30 @@ import org.apache.commons.lang3.mutable.Mutable;
import org.apache.commons.lang3.mutable.MutableObject;
import org.apache.vxquery.functions.BuiltinOperators;
-import edu.uci.ics.hyracks.algebricks.common.exceptions.AlgebricksException;
-import edu.uci.ics.hyracks.algebricks.common.utils.Pair;
-import edu.uci.ics.hyracks.algebricks.core.algebra.base.ILogicalExpression;
-import edu.uci.ics.hyracks.algebricks.core.algebra.base.ILogicalOperator;
-import edu.uci.ics.hyracks.algebricks.core.algebra.base.IOptimizationContext;
-import edu.uci.ics.hyracks.algebricks.core.algebra.base.LogicalExpressionTag;
-import edu.uci.ics.hyracks.algebricks.core.algebra.base.LogicalOperatorTag;
-import edu.uci.ics.hyracks.algebricks.core.algebra.base.LogicalVariable;
-import edu.uci.ics.hyracks.algebricks.core.algebra.expressions.AbstractFunctionCallExpression;
-import edu.uci.ics.hyracks.algebricks.core.algebra.expressions.AggregateFunctionCallExpression;
-import edu.uci.ics.hyracks.algebricks.core.algebra.expressions.ScalarFunctionCallExpression;
-import edu.uci.ics.hyracks.algebricks.core.algebra.expressions.UnnestingFunctionCallExpression;
-import edu.uci.ics.hyracks.algebricks.core.algebra.expressions.VariableReferenceExpression;
-import edu.uci.ics.hyracks.algebricks.core.algebra.functions.IFunctionInfo;
-import edu.uci.ics.hyracks.algebricks.core.algebra.operators.logical.AbstractLogicalOperator;
-import edu.uci.ics.hyracks.algebricks.core.algebra.operators.logical.AggregateOperator;
-import edu.uci.ics.hyracks.algebricks.core.algebra.operators.logical.AssignOperator;
-import edu.uci.ics.hyracks.algebricks.core.algebra.operators.logical.GroupByOperator;
-import edu.uci.ics.hyracks.algebricks.core.algebra.operators.logical.NestedTupleSourceOperator;
-import edu.uci.ics.hyracks.algebricks.core.algebra.operators.logical.OrderOperator;
-import edu.uci.ics.hyracks.algebricks.core.algebra.operators.logical.OrderOperator.IOrder;
-import edu.uci.ics.hyracks.algebricks.core.algebra.operators.logical.SubplanOperator;
-import edu.uci.ics.hyracks.algebricks.core.algebra.operators.logical.UnnestOperator;
-import edu.uci.ics.hyracks.algebricks.core.rewriter.base.IAlgebraicRewriteRule;
+import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
+import org.apache.hyracks.algebricks.common.utils.Pair;
+import org.apache.hyracks.algebricks.core.algebra.base.ILogicalExpression;
+import org.apache.hyracks.algebricks.core.algebra.base.ILogicalOperator;
+import org.apache.hyracks.algebricks.core.algebra.base.IOptimizationContext;
+import org.apache.hyracks.algebricks.core.algebra.base.LogicalExpressionTag;
+import org.apache.hyracks.algebricks.core.algebra.base.LogicalOperatorTag;
+import org.apache.hyracks.algebricks.core.algebra.base.LogicalVariable;
+import org.apache.hyracks.algebricks.core.algebra.expressions.AbstractFunctionCallExpression;
+import org.apache.hyracks.algebricks.core.algebra.expressions.AggregateFunctionCallExpression;
+import org.apache.hyracks.algebricks.core.algebra.expressions.ScalarFunctionCallExpression;
+import org.apache.hyracks.algebricks.core.algebra.expressions.UnnestingFunctionCallExpression;
+import org.apache.hyracks.algebricks.core.algebra.expressions.VariableReferenceExpression;
+import org.apache.hyracks.algebricks.core.algebra.functions.IFunctionInfo;
+import org.apache.hyracks.algebricks.core.algebra.operators.logical.AbstractLogicalOperator;
+import org.apache.hyracks.algebricks.core.algebra.operators.logical.AggregateOperator;
+import org.apache.hyracks.algebricks.core.algebra.operators.logical.AssignOperator;
+import org.apache.hyracks.algebricks.core.algebra.operators.logical.GroupByOperator;
+import org.apache.hyracks.algebricks.core.algebra.operators.logical.NestedTupleSourceOperator;
+import org.apache.hyracks.algebricks.core.algebra.operators.logical.OrderOperator;
+import org.apache.hyracks.algebricks.core.algebra.operators.logical.OrderOperator.IOrder;
+import org.apache.hyracks.algebricks.core.algebra.operators.logical.SubplanOperator;
+import org.apache.hyracks.algebricks.core.algebra.operators.logical.UnnestOperator;
+import org.apache.hyracks.algebricks.core.rewriter.base.IAlgebraicRewriteRule;
public class ConvertAssignSortDistinctNodesToOperatorsRule implements IAlgebraicRewriteRule {
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/ConvertAssignToAggregateRule.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/ConvertAssignToAggregateRule.java b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/ConvertAssignToAggregateRule.java
index 09815d0..7ea0614 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/ConvertAssignToAggregateRule.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/ConvertAssignToAggregateRule.java
@@ -24,24 +24,24 @@ import org.apache.commons.lang3.mutable.MutableObject;
import org.apache.vxquery.compiler.rewriter.rules.util.ExpressionToolbox;
import org.apache.vxquery.functions.BuiltinOperators;
-import edu.uci.ics.hyracks.algebricks.common.exceptions.AlgebricksException;
-import edu.uci.ics.hyracks.algebricks.core.algebra.base.ILogicalExpression;
-import edu.uci.ics.hyracks.algebricks.core.algebra.base.ILogicalOperator;
-import edu.uci.ics.hyracks.algebricks.core.algebra.base.IOptimizationContext;
-import edu.uci.ics.hyracks.algebricks.core.algebra.base.LogicalExpressionTag;
-import edu.uci.ics.hyracks.algebricks.core.algebra.base.LogicalOperatorTag;
-import edu.uci.ics.hyracks.algebricks.core.algebra.base.LogicalVariable;
-import edu.uci.ics.hyracks.algebricks.core.algebra.expressions.AbstractFunctionCallExpression;
-import edu.uci.ics.hyracks.algebricks.core.algebra.expressions.AggregateFunctionCallExpression;
-import edu.uci.ics.hyracks.algebricks.core.algebra.expressions.UnnestingFunctionCallExpression;
-import edu.uci.ics.hyracks.algebricks.core.algebra.expressions.VariableReferenceExpression;
-import edu.uci.ics.hyracks.algebricks.core.algebra.functions.IFunctionInfo;
-import edu.uci.ics.hyracks.algebricks.core.algebra.operators.logical.AbstractLogicalOperator;
-import edu.uci.ics.hyracks.algebricks.core.algebra.operators.logical.AggregateOperator;
-import edu.uci.ics.hyracks.algebricks.core.algebra.operators.logical.AssignOperator;
-import edu.uci.ics.hyracks.algebricks.core.algebra.operators.logical.NestedTupleSourceOperator;
-import edu.uci.ics.hyracks.algebricks.core.algebra.operators.logical.SubplanOperator;
-import edu.uci.ics.hyracks.algebricks.core.algebra.operators.logical.UnnestOperator;
+import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
+import org.apache.hyracks.algebricks.core.algebra.base.ILogicalExpression;
+import org.apache.hyracks.algebricks.core.algebra.base.ILogicalOperator;
+import org.apache.hyracks.algebricks.core.algebra.base.IOptimizationContext;
+import org.apache.hyracks.algebricks.core.algebra.base.LogicalExpressionTag;
+import org.apache.hyracks.algebricks.core.algebra.base.LogicalOperatorTag;
+import org.apache.hyracks.algebricks.core.algebra.base.LogicalVariable;
+import org.apache.hyracks.algebricks.core.algebra.expressions.AbstractFunctionCallExpression;
+import org.apache.hyracks.algebricks.core.algebra.expressions.AggregateFunctionCallExpression;
+import org.apache.hyracks.algebricks.core.algebra.expressions.UnnestingFunctionCallExpression;
+import org.apache.hyracks.algebricks.core.algebra.expressions.VariableReferenceExpression;
+import org.apache.hyracks.algebricks.core.algebra.functions.IFunctionInfo;
+import org.apache.hyracks.algebricks.core.algebra.operators.logical.AbstractLogicalOperator;
+import org.apache.hyracks.algebricks.core.algebra.operators.logical.AggregateOperator;
+import org.apache.hyracks.algebricks.core.algebra.operators.logical.AssignOperator;
+import org.apache.hyracks.algebricks.core.algebra.operators.logical.NestedTupleSourceOperator;
+import org.apache.hyracks.algebricks.core.algebra.operators.logical.SubplanOperator;
+import org.apache.hyracks.algebricks.core.algebra.operators.logical.UnnestOperator;
/**
* The rule searches for assign operators that have a xquery aggregate function.
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/ConvertAssignToUnnestRule.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/ConvertAssignToUnnestRule.java b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/ConvertAssignToUnnestRule.java
index 28e54e4..3ea4965 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/ConvertAssignToUnnestRule.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/ConvertAssignToUnnestRule.java
@@ -20,17 +20,17 @@ import org.apache.commons.lang3.mutable.Mutable;
import org.apache.vxquery.functions.BuiltinOperators;
import org.apache.vxquery.functions.Function;
-import edu.uci.ics.hyracks.algebricks.common.exceptions.AlgebricksException;
-import edu.uci.ics.hyracks.algebricks.core.algebra.base.ILogicalExpression;
-import edu.uci.ics.hyracks.algebricks.core.algebra.base.ILogicalOperator;
-import edu.uci.ics.hyracks.algebricks.core.algebra.base.IOptimizationContext;
-import edu.uci.ics.hyracks.algebricks.core.algebra.base.LogicalExpressionTag;
-import edu.uci.ics.hyracks.algebricks.core.algebra.base.LogicalOperatorTag;
-import edu.uci.ics.hyracks.algebricks.core.algebra.expressions.AbstractFunctionCallExpression;
-import edu.uci.ics.hyracks.algebricks.core.algebra.expressions.UnnestingFunctionCallExpression;
-import edu.uci.ics.hyracks.algebricks.core.algebra.operators.logical.AbstractLogicalOperator;
-import edu.uci.ics.hyracks.algebricks.core.algebra.operators.logical.AssignOperator;
-import edu.uci.ics.hyracks.algebricks.core.algebra.operators.logical.UnnestOperator;
+import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
+import org.apache.hyracks.algebricks.core.algebra.base.ILogicalExpression;
+import org.apache.hyracks.algebricks.core.algebra.base.ILogicalOperator;
+import org.apache.hyracks.algebricks.core.algebra.base.IOptimizationContext;
+import org.apache.hyracks.algebricks.core.algebra.base.LogicalExpressionTag;
+import org.apache.hyracks.algebricks.core.algebra.base.LogicalOperatorTag;
+import org.apache.hyracks.algebricks.core.algebra.expressions.AbstractFunctionCallExpression;
+import org.apache.hyracks.algebricks.core.algebra.expressions.UnnestingFunctionCallExpression;
+import org.apache.hyracks.algebricks.core.algebra.operators.logical.AbstractLogicalOperator;
+import org.apache.hyracks.algebricks.core.algebra.operators.logical.AssignOperator;
+import org.apache.hyracks.algebricks.core.algebra.operators.logical.UnnestOperator;
/**
* The rule searches for unnest(iterate) operator followed by an assign(child)
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/ConvertFromAlgebricksExpressionsRule.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/ConvertFromAlgebricksExpressionsRule.java b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/ConvertFromAlgebricksExpressionsRule.java
index b363c85..d830ccc 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/ConvertFromAlgebricksExpressionsRule.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/ConvertFromAlgebricksExpressionsRule.java
@@ -28,18 +28,18 @@ import org.apache.vxquery.compiler.rewriter.rules.util.OperatorToolbox;
import org.apache.vxquery.functions.BuiltinFunctions;
import org.apache.vxquery.functions.BuiltinOperators;
-import edu.uci.ics.hyracks.algebricks.common.exceptions.AlgebricksException;
-import edu.uci.ics.hyracks.algebricks.common.utils.Pair;
-import edu.uci.ics.hyracks.algebricks.core.algebra.base.ILogicalExpression;
-import edu.uci.ics.hyracks.algebricks.core.algebra.base.ILogicalOperator;
-import edu.uci.ics.hyracks.algebricks.core.algebra.base.IOptimizationContext;
-import edu.uci.ics.hyracks.algebricks.core.algebra.expressions.AbstractFunctionCallExpression;
-import edu.uci.ics.hyracks.algebricks.core.algebra.expressions.IExpressionAnnotation;
-import edu.uci.ics.hyracks.algebricks.core.algebra.expressions.ScalarFunctionCallExpression;
-import edu.uci.ics.hyracks.algebricks.core.algebra.functions.AlgebricksBuiltinFunctions;
-import edu.uci.ics.hyracks.algebricks.core.algebra.functions.FunctionIdentifier;
-import edu.uci.ics.hyracks.algebricks.core.algebra.functions.IFunctionInfo;
-import edu.uci.ics.hyracks.algebricks.core.rewriter.base.IAlgebraicRewriteRule;
+import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
+import org.apache.hyracks.algebricks.common.utils.Pair;
+import org.apache.hyracks.algebricks.core.algebra.base.ILogicalExpression;
+import org.apache.hyracks.algebricks.core.algebra.base.ILogicalOperator;
+import org.apache.hyracks.algebricks.core.algebra.base.IOptimizationContext;
+import org.apache.hyracks.algebricks.core.algebra.expressions.AbstractFunctionCallExpression;
+import org.apache.hyracks.algebricks.core.algebra.expressions.IExpressionAnnotation;
+import org.apache.hyracks.algebricks.core.algebra.expressions.ScalarFunctionCallExpression;
+import org.apache.hyracks.algebricks.core.algebra.functions.AlgebricksBuiltinFunctions;
+import org.apache.hyracks.algebricks.core.algebra.functions.FunctionIdentifier;
+import org.apache.hyracks.algebricks.core.algebra.functions.IFunctionInfo;
+import org.apache.hyracks.algebricks.core.rewriter.base.IAlgebraicRewriteRule;
/**
* The rule searches for where the Algebricks builtin function are temporarly in the plan in place of XQuery function.
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/ConvertToAlgebricksExpressionsRule.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/ConvertToAlgebricksExpressionsRule.java b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/ConvertToAlgebricksExpressionsRule.java
index 394c622..cf74bea 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/ConvertToAlgebricksExpressionsRule.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/ConvertToAlgebricksExpressionsRule.java
@@ -25,18 +25,18 @@ import org.apache.vxquery.compiler.rewriter.rules.util.OperatorToolbox;
import org.apache.vxquery.functions.BuiltinFunctions;
import org.apache.vxquery.functions.BuiltinOperators;
-import edu.uci.ics.hyracks.algebricks.common.exceptions.AlgebricksException;
-import edu.uci.ics.hyracks.algebricks.core.algebra.base.ILogicalExpression;
-import edu.uci.ics.hyracks.algebricks.core.algebra.base.ILogicalOperator;
-import edu.uci.ics.hyracks.algebricks.core.algebra.base.IOptimizationContext;
-import edu.uci.ics.hyracks.algebricks.core.algebra.base.LogicalExpressionTag;
-import edu.uci.ics.hyracks.algebricks.core.algebra.expressions.AbstractFunctionCallExpression;
-import edu.uci.ics.hyracks.algebricks.core.algebra.expressions.ExpressionAnnotationNoCopyImpl;
-import edu.uci.ics.hyracks.algebricks.core.algebra.expressions.IExpressionAnnotation;
-import edu.uci.ics.hyracks.algebricks.core.algebra.functions.AlgebricksBuiltinFunctions;
-import edu.uci.ics.hyracks.algebricks.core.algebra.functions.FunctionIdentifier;
-import edu.uci.ics.hyracks.algebricks.core.algebra.functions.IFunctionInfo;
-import edu.uci.ics.hyracks.algebricks.core.rewriter.base.IAlgebraicRewriteRule;
+import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
+import org.apache.hyracks.algebricks.core.algebra.base.ILogicalExpression;
+import org.apache.hyracks.algebricks.core.algebra.base.ILogicalOperator;
+import org.apache.hyracks.algebricks.core.algebra.base.IOptimizationContext;
+import org.apache.hyracks.algebricks.core.algebra.base.LogicalExpressionTag;
+import org.apache.hyracks.algebricks.core.algebra.expressions.AbstractFunctionCallExpression;
+import org.apache.hyracks.algebricks.core.algebra.expressions.ExpressionAnnotationNoCopyImpl;
+import org.apache.hyracks.algebricks.core.algebra.expressions.IExpressionAnnotation;
+import org.apache.hyracks.algebricks.core.algebra.functions.AlgebricksBuiltinFunctions;
+import org.apache.hyracks.algebricks.core.algebra.functions.FunctionIdentifier;
+import org.apache.hyracks.algebricks.core.algebra.functions.IFunctionInfo;
+import org.apache.hyracks.algebricks.core.rewriter.base.IAlgebraicRewriteRule;
/**
* The rule searches for where the XQuery function are used in place of Algebricks builtin function.
@@ -150,4 +150,4 @@ public class ConvertToAlgebricksExpressionsRule implements IAlgebraicRewriteRule
}
return modified;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/EliminateSubplanForSingleItemsRule.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/EliminateSubplanForSingleItemsRule.java b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/EliminateSubplanForSingleItemsRule.java
index 4ba642a..953a0b2 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/EliminateSubplanForSingleItemsRule.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/EliminateSubplanForSingleItemsRule.java
@@ -25,22 +25,22 @@ import org.apache.vxquery.functions.BuiltinOperators;
import org.apache.vxquery.types.Quantifier;
import org.apache.vxquery.types.SequenceType;
-import edu.uci.ics.hyracks.algebricks.common.exceptions.AlgebricksException;
-import edu.uci.ics.hyracks.algebricks.core.algebra.base.ILogicalExpression;
-import edu.uci.ics.hyracks.algebricks.core.algebra.base.ILogicalOperator;
-import edu.uci.ics.hyracks.algebricks.core.algebra.base.IOptimizationContext;
-import edu.uci.ics.hyracks.algebricks.core.algebra.base.LogicalExpressionTag;
-import edu.uci.ics.hyracks.algebricks.core.algebra.base.LogicalOperatorTag;
-import edu.uci.ics.hyracks.algebricks.core.algebra.expressions.AbstractFunctionCallExpression;
-import edu.uci.ics.hyracks.algebricks.core.algebra.expressions.ConstantExpression;
-import edu.uci.ics.hyracks.algebricks.core.algebra.expressions.VariableReferenceExpression;
-import edu.uci.ics.hyracks.algebricks.core.algebra.operators.logical.AbstractLogicalOperator;
-import edu.uci.ics.hyracks.algebricks.core.algebra.operators.logical.AggregateOperator;
-import edu.uci.ics.hyracks.algebricks.core.algebra.operators.logical.AssignOperator;
-import edu.uci.ics.hyracks.algebricks.core.algebra.operators.logical.SubplanOperator;
-import edu.uci.ics.hyracks.algebricks.core.algebra.operators.logical.UnnestOperator;
-import edu.uci.ics.hyracks.algebricks.core.rewriter.base.IAlgebraicRewriteRule;
-import edu.uci.ics.hyracks.data.std.primitive.IntegerPointable;
+import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
+import org.apache.hyracks.algebricks.core.algebra.base.ILogicalExpression;
+import org.apache.hyracks.algebricks.core.algebra.base.ILogicalOperator;
+import org.apache.hyracks.algebricks.core.algebra.base.IOptimizationContext;
+import org.apache.hyracks.algebricks.core.algebra.base.LogicalExpressionTag;
+import org.apache.hyracks.algebricks.core.algebra.base.LogicalOperatorTag;
+import org.apache.hyracks.algebricks.core.algebra.expressions.AbstractFunctionCallExpression;
+import org.apache.hyracks.algebricks.core.algebra.expressions.ConstantExpression;
+import org.apache.hyracks.algebricks.core.algebra.expressions.VariableReferenceExpression;
+import org.apache.hyracks.algebricks.core.algebra.operators.logical.AbstractLogicalOperator;
+import org.apache.hyracks.algebricks.core.algebra.operators.logical.AggregateOperator;
+import org.apache.hyracks.algebricks.core.algebra.operators.logical.AssignOperator;
+import org.apache.hyracks.algebricks.core.algebra.operators.logical.SubplanOperator;
+import org.apache.hyracks.algebricks.core.algebra.operators.logical.UnnestOperator;
+import org.apache.hyracks.algebricks.core.rewriter.base.IAlgebraicRewriteRule;
+import org.apache.hyracks.data.std.primitive.IntegerPointable;
/**
* The rule searches for subplans that only have one item per tuple.
[23/50] [abbrv] vxquery git commit: Updated all the javadoc comments
for java 1.8's new doclint.
Posted by sj...@apache.org.
http://git-wip-us.apache.org/repos/asf/vxquery/blob/51a98938/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/util/tests/BufferedReaderStream.java
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/util/tests/BufferedReaderStream.java b/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/util/tests/BufferedReaderStream.java
deleted file mode 100644
index 7100025..0000000
--- a/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/util/tests/BufferedReaderStream.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.vxquery.xtest.util.tests;
-
-import java.io.BufferedReader;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStreamReader;
-
-public class BufferedReaderStream extends AbstractDiskTest {
- @Override
- public String getMessage() {
- return "Buffered Reader - Stream";
- }
-
- @Override
- public long test(String filename, int bufferSize) throws IOException {
- BufferedReader f;
- if (bufferSize > 0) {
- f = new BufferedReader(new InputStreamReader(new FileInputStream(filename)), bufferSize);
- } else {
- f = new BufferedReader(new InputStreamReader(new FileInputStream(filename)));
- }
- int b;
- long byteCount = 0L;
- long checkSum = 0L;
- while ((b = f.read()) != -1) {
- checkSum += b;
- byteCount++;
- }
- f.close();
- return byteCount;
- }
-}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/51a98938/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/util/tests/BufferedStream.java
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/util/tests/BufferedStream.java b/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/util/tests/BufferedStream.java
deleted file mode 100644
index 5751307..0000000
--- a/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/util/tests/BufferedStream.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.vxquery.xtest.util.tests;
-
-import java.io.BufferedInputStream;
-import java.io.FileInputStream;
-import java.io.IOException;
-
-public class BufferedStream extends AbstractDiskTest {
- @Override
- public String getMessage() {
- return "Buffered Stream";
- }
-
- @Override
- public long test(String filename, int bufferSize) throws IOException {
- BufferedInputStream f;
- if (bufferSize > 0) {
- f = new BufferedInputStream(new FileInputStream(filename), bufferSize);
- } else {
- f = new BufferedInputStream(new FileInputStream(filename));
- }
- int b;
- long byteCount = 0L;
- long checkSum = 0L;
- while ((b = f.read()) != -1) {
- checkSum += b;
- byteCount++;
- }
- f.close();
- return byteCount;
- }
-}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/51a98938/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/util/tests/IDiskTest.java
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/util/tests/IDiskTest.java b/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/util/tests/IDiskTest.java
deleted file mode 100644
index 581d783..0000000
--- a/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/util/tests/IDiskTest.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.vxquery.xtest.util.tests;
-
-import java.io.File;
-
-import org.xml.sax.XMLReader;
-
-public interface IDiskTest {
- public void setBufferSize(int bufferSize);
-
- public void setFile(File file);
-
- public void setParser(XMLReader parser);
-
- public void run();
-
- public void start();
-}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/51a98938/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/util/tests/ParsedBufferedByteStream.java
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/util/tests/ParsedBufferedByteStream.java b/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/util/tests/ParsedBufferedByteStream.java
deleted file mode 100644
index 9fc93c4..0000000
--- a/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/util/tests/ParsedBufferedByteStream.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.vxquery.xtest.util.tests;
-
-import java.io.BufferedInputStream;
-import java.io.FileInputStream;
-import java.io.IOException;
-
-import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
-
-public class ParsedBufferedByteStream extends AbstractDiskTest {
- @Override
- public String getMessage() {
- return "Parsed - Buffered Byte Stream";
- }
-
- @Override
- public long test(String filename, int bufferSize) throws IOException {
- try {
- BufferedInputStream f;
- if (bufferSize > 0) {
- f = new BufferedInputStream(new FileInputStream(filename), bufferSize);
- } else {
- f = new BufferedInputStream(new FileInputStream(filename));
- }
- InputSource in = new InputSource();
- in.setByteStream(f);
- in.setEncoding("UTF-8");
- parser.parse(in);
- } catch (SAXException e) {
- e.printStackTrace();
- }
- return -1;
- }
-}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/51a98938/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/util/tests/ParsedBufferedCharacterStream.java
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/util/tests/ParsedBufferedCharacterStream.java b/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/util/tests/ParsedBufferedCharacterStream.java
deleted file mode 100644
index 1cacee6..0000000
--- a/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/util/tests/ParsedBufferedCharacterStream.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.vxquery.xtest.util.tests;
-
-import java.io.BufferedReader;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStreamReader;
-
-import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
-
-public class ParsedBufferedCharacterStream extends AbstractDiskTest implements IDiskTest {
- @Override
- public String getMessage() {
- return "Parsed - Buffered Character Stream";
- }
-
- @Override
- public long test(String filename, int bufferSize) throws IOException {
- try {
- BufferedReader f;
- if (bufferSize > 0) {
- f = new BufferedReader(new InputStreamReader(new FileInputStream(filename)), bufferSize);
- } else {
- f = new BufferedReader(new InputStreamReader(new FileInputStream(filename)));
- }
- InputSource in = new InputSource();
- in.setCharacterStream(f);
- parser.parse(in);
- } catch (SAXException e) {
- e.printStackTrace();
- }
- return -1;
- }
-}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/51a98938/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/util/tests/ParsedByteStream.java
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/util/tests/ParsedByteStream.java b/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/util/tests/ParsedByteStream.java
deleted file mode 100644
index 783424a..0000000
--- a/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/util/tests/ParsedByteStream.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.vxquery.xtest.util.tests;
-
-import java.io.FileInputStream;
-import java.io.IOException;
-
-import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
-
-public class ParsedByteStream extends AbstractDiskTest {
- @Override
- public String getMessage() {
- return "Parsed - Byte Stream";
- }
-
- @Override
- public boolean isBuffered() {
- return false;
- }
-
- @Override
- public long test(String filename, int bufferSize) throws IOException {
- try {
- InputSource in = new InputSource();
- in.setByteStream(new FileInputStream(filename));
- in.setEncoding("UTF-8");
- parser.parse(in);
- } catch (SAXException e) {
- e.printStackTrace();
- }
- return -1;
- }
-}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/51a98938/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/util/tests/ParsedCharacterStream.java
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/util/tests/ParsedCharacterStream.java b/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/util/tests/ParsedCharacterStream.java
deleted file mode 100644
index 0b292a3..0000000
--- a/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/util/tests/ParsedCharacterStream.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.vxquery.xtest.util.tests;
-
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStreamReader;
-
-import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
-
-public class ParsedCharacterStream extends AbstractDiskTest {
- @Override
- public String getMessage() {
- return "Parsed - Character Stream";
- }
-
- @Override
- public boolean isBuffered() {
- return false;
- }
-
- @Override
- public long test(String filename, int bufferSize) throws IOException {
- try {
- InputStreamReader f = new InputStreamReader(new FileInputStream(filename));
- InputSource in = new InputSource();
- in.setCharacterStream(f);
- parser.parse(in);
- } catch (SAXException e) {
- e.printStackTrace();
- }
- return -1;
- }
-}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/51a98938/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/util/tests/ReaderBufferedStream.java
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/util/tests/ReaderBufferedStream.java b/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/util/tests/ReaderBufferedStream.java
deleted file mode 100644
index 721dd3a..0000000
--- a/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/util/tests/ReaderBufferedStream.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.vxquery.xtest.util.tests;
-
-import java.io.BufferedInputStream;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStreamReader;
-
-public class ReaderBufferedStream extends AbstractDiskTest {
- @Override
- public String getMessage() {
- return "Reader - Buffered Stream";
- }
-
- @Override
- public long test(String filename, int bufferSize) throws IOException {
- InputStreamReader f;
- if (bufferSize > 0) {
- f = new InputStreamReader(new BufferedInputStream(new FileInputStream(filename), bufferSize));
- } else {
- f = new InputStreamReader(new BufferedInputStream(new FileInputStream(filename)));
- }
- int b;
- long byteCount = 0L;
- long checkSum = 0L;
- while ((b = f.read()) != -1) {
- checkSum += b;
- byteCount++;
- }
- f.close();
- return byteCount;
- }
-}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/51a98938/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/util/tests/ReaderStream.java
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/util/tests/ReaderStream.java b/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/util/tests/ReaderStream.java
deleted file mode 100644
index 4fdbdf9..0000000
--- a/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/util/tests/ReaderStream.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.vxquery.xtest.util.tests;
-
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStreamReader;
-
-public class ReaderStream extends AbstractDiskTest {
- @Override
- public String getMessage() {
- return "Reader - Stream";
- }
-
- @Override
- public boolean isBuffered() {
- return false;
- }
-
- @Override
- public long test(String filename, int bufferSize) throws IOException {
- InputStreamReader f = new InputStreamReader(new FileInputStream(filename));
- int b;
- long byteCount = 0L;
- long checkSum = 0L;
- while ((b = f.read()) != -1) {
- checkSum += b;
- byteCount++;
- }
- f.close();
- return byteCount;
- }
-}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/51a98938/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/util/tests/Stream.java
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/util/tests/Stream.java b/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/util/tests/Stream.java
deleted file mode 100644
index 7890b2a..0000000
--- a/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/util/tests/Stream.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.vxquery.xtest.util.tests;
-
-import java.io.FileInputStream;
-import java.io.IOException;
-
-public class Stream extends AbstractDiskTest {
- @Override
- public String getMessage() {
- return "Stream";
- }
-
- @Override
- public boolean isBuffered() {
- return false;
- }
-
- @Override
- public long test(String filename, int bufferSize) throws IOException {
- FileInputStream f = new FileInputStream(filename);
- int b;
- long byteCount = 0L;
- long checkSum = 0L;
- while ((b = f.read()) != -1) {
- checkSum += b;
- byteCount++;
- }
- f.close();
- return byteCount;
- }
-}
[37/50] [abbrv] vxquery git commit: Windows documentation suggestions
taken from mtawa002 pull request.
Posted by sj...@apache.org.
Windows documentation suggestions taken from mtawa002 pull request.
Note: The pull request is out of sync with master so only the changes that were easy to find were taken.
Project: http://git-wip-us.apache.org/repos/asf/vxquery/repo
Commit: http://git-wip-us.apache.org/repos/asf/vxquery/commit/08919109
Tree: http://git-wip-us.apache.org/repos/asf/vxquery/tree/08919109
Diff: http://git-wip-us.apache.org/repos/asf/vxquery/diff/08919109
Branch: refs/heads/site
Commit: 0891910923c2d5a426960b160b374c62f319d7cb
Parents: 0ad460a
Author: Preston Carman <pr...@apache.org>
Authored: Mon May 16 15:49:38 2016 -0700
Committer: Preston Carman <pr...@apache.org>
Committed: Mon May 16 17:22:43 2016 -0700
----------------------------------------------------------------------
src/site/apt/development_eclipse_setup.apt | 53 +++++++++++++------------
src/site/apt/user_query.apt | 15 +++----
2 files changed, 36 insertions(+), 32 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/vxquery/blob/08919109/src/site/apt/development_eclipse_setup.apt
----------------------------------------------------------------------
diff --git a/src/site/apt/development_eclipse_setup.apt b/src/site/apt/development_eclipse_setup.apt
index 14b30bd..19b5776 100644
--- a/src/site/apt/development_eclipse_setup.apt
+++ b/src/site/apt/development_eclipse_setup.apt
@@ -15,44 +15,44 @@
Eclipse Setup
- Eclipse is a nice IDE for developing in Java and below are the instructions to setting up
+ Eclipse is a nice IDE for developing in Java and below are the instructions to setting up
Eclipse for Apache VXQuery\x99 development.
* Installation
* Install Java Development Kit (JDK) 1.7 or Later
-
+
* Install Classic Eclipse
- Follow the instruction for eclipse on from {{{http://www.eclipse.org}www.eclipse.org}} for
+ Follow the instruction for eclipse on from {{{http://www.eclipse.org}www.eclipse.org}} for
the "Classic" eclipse version.
* Install Apache Maven
* Install Maven Integration (m2e)
-
+
VXQuery uses {{{http://maven.apache.org/}Maven}} to define external libraries and build instructions.
The Eclipse plugin for Maven integeration can be found at {{{http://eclipse.org/m2e/}m2e}}.
* Code Formatter Setup
- For VXQuery, the Hyracks project Eclipse formating template has been adopted as the standard. The
- template file can be found at {{{http://hyracks.googlecode.com/files/HyracksCodeFormatProfile.xml}http://hyracks.googlecode.com/files/HyracksCodeFormatProfile.xml}}
-
+ For VXQuery, the Hyracks project Eclipse formating template has been adopted as the standard. The
+ template file can be found at {{{http://hyracks.googlecode.com/files/HyracksCodeFormatProfile.xml}http://hyracks.googlecode.com/files/HyracksCodeFormatProfile.xml}}
+
Menu Options from Preferences:
-
+
* Java
-
+
* Code Style
-
+
* Formatter
-
+
* Code Import Setup
-
+
[[1]] Import Hyracks Code Base
Download and install the Hyracks Full Stack Staging branch to get the latest Hyracks support
- for development. This is required since some new features being build are affecting Hyracks
+ for development. This is required since some new features being build are affecting Hyracks
development.
----------------------------------------
@@ -62,6 +62,9 @@ $ mvn install
$ cd ..
----------------------------------------
+ Note: VXQuery has only been lightly testing on Windows based machines. If you run into issues please file an
+ {{{https://issues.apache.org/jira/browse/VXQUERY}issue}}.
+
The mvn "-DskipTests" option can be used to save about 20 minutes, but will skip the verification tests.
Finally, from Eclipse's File menu "import" the Maven Hyracks project you have just downloaded through git.
@@ -78,27 +81,27 @@ $ cd apache-vxquery
$ mvn package
$ cd ..
----------------------------------------
-
- Finally, from Eclipse's File menu "import" the Maven VXQuery project you have just downloaded through git.
-
+
+ Finally, from Eclipse's File menu "import" the Maven VXQuery project you have just downloaded through git.
+
[[1]] Additional Project Configuration
-
- Some eclipse build errors will show up. To remove these display errors, add
+
+ Some eclipse build errors will show up. To remove these display errors, add
"target/generated-sources/javacc" as a source folder in VXQuery Core.
* Debugging
- Eclipse can be used to debug VXQuery. Using the following java option will allow eclipse to pause the
+ Eclipse can be used to debug VXQuery. Using the following java option will allow eclipse to pause the
execution and allow eclipse to step through the code.
-
- "-Xdebug -Xrunjdwp:transport=dt_socket,address=127.0.0.1:8000,server=y,suspend=y"
-
- Realize you may need to update the address for your system. More details can be found at
+
+ "-Xdebug -Xrunjdwp:transport=dt_socket,address=127.0.0.1:8000,server=y,suspend=y"
+
+ Realize you may need to update the address for your system. More details can be found at
{{{http://www.ibm.com/developerworks/opensource/library/os-eclipse-javadebug/index.html}IBM}}
-
+
In eclipse create a debug configuration for VXQuery using Java remote application settings. The default
- setting will most likely work out of the box. To show all the source code for debugging, add all the
+ setting will most likely work out of the box. To show all the source code for debugging, add all the
source code for the eclipse workspace.
To begin the debug process, execute the command below. In eclipse select the new debug configuration
http://git-wip-us.apache.org/repos/asf/vxquery/blob/08919109/src/site/apt/user_query.apt
----------------------------------------------------------------------
diff --git a/src/site/apt/user_query.apt b/src/site/apt/user_query.apt
index a022825..8ea6429 100644
--- a/src/site/apt/user_query.apt
+++ b/src/site/apt/user_query.apt
@@ -25,8 +25,9 @@ sh ./apache-vxquery-X.Y/vxquery-cli/target/appassembler/bin/vxq
* Commands On Windows Based Systems
----------------------------------------
-cd apache-vxquery-X.Y/vxquery-cli/target/appassembler/bin
-vxq.bat
+set JAVA_OPTS=-Xmx1024m
+set PATH=%PATH%;"path-to"\apache-vxquery-X.Y\vxquery-cli\target\appassembler\bin\
+vxq "path-to"\test.xq
----------------------------------------
* Command Line Options
@@ -56,14 +57,14 @@ vxq.bat
JAVA_OPTS="-Xmx1024m"
----------------------------------------
-
+
* Example
- The following example query is from {{{http://www.w3schools.com/xquery/default.asp}W3Schools XQuery Tutorial}}.
+ The following example query is from {{{http://www.w3schools.com/xquery/default.asp}W3Schools XQuery Tutorial}}.
If you are new to XQuery, the W3Schools tutorial is a great place to start.
-
+
[[i]] Query file (test.xq)
-
+
----------------------------------------
for $x in doc("books.xml")/bookstore/book
where $x/price>30
@@ -72,7 +73,7 @@ return $x/title
----------------------------------------
[[i]] Command line
-
+
----------------------------------------
JAVA_OPTS="-Xmx1024m" sh ./apache-vxquery-X.Y/vxquery-cli/target/appassembler/bin/vxq test.xq
----------------------------------------
[09/50] [abbrv] vxquery git commit: Fix for issue VXQUERY-177.
Posted by sj...@apache.org.
Fix for issue VXQUERY-177.
Project: http://git-wip-us.apache.org/repos/asf/vxquery/repo
Commit: http://git-wip-us.apache.org/repos/asf/vxquery/commit/a849cdc0
Tree: http://git-wip-us.apache.org/repos/asf/vxquery/tree/a849cdc0
Diff: http://git-wip-us.apache.org/repos/asf/vxquery/diff/a849cdc0
Branch: refs/heads/site
Commit: a849cdc025799b196e1942e2700afb18261d5011
Parents: 44717b2
Author: Preston Carman <pr...@apache.org>
Authored: Fri Sep 11 11:50:08 2015 -0700
Committer: Preston Carman <pr...@apache.org>
Committed: Fri Sep 11 11:50:08 2015 -0700
----------------------------------------------------------------------
.../main/java/org/apache/vxquery/cli/VXQuery.java | 17 ++++++++++++++---
1 file changed, 14 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/vxquery/blob/a849cdc0/vxquery-cli/src/main/java/org/apache/vxquery/cli/VXQuery.java
----------------------------------------------------------------------
diff --git a/vxquery-cli/src/main/java/org/apache/vxquery/cli/VXQuery.java b/vxquery-cli/src/main/java/org/apache/vxquery/cli/VXQuery.java
index cf21c76..2a48f84 100644
--- a/vxquery-cli/src/main/java/org/apache/vxquery/cli/VXQuery.java
+++ b/vxquery-cli/src/main/java/org/apache/vxquery/cli/VXQuery.java
@@ -15,7 +15,9 @@
package org.apache.vxquery.cli;
import java.io.File;
+import java.io.FileOutputStream;
import java.io.IOException;
+import java.io.OutputStream;
import java.io.PrintWriter;
import java.io.StringReader;
import java.nio.ByteBuffer;
@@ -115,8 +117,9 @@ public class VXQuery {
timingMessage("Execution time: " + (end.getTime() - start.getTime()) + " ms");
if (opts.repeatExec > opts.timingIgnoreQueries) {
long mean = sumTiming / (opts.repeatExec - opts.timingIgnoreQueries);
- double sd = Math.sqrt(sumSquaredTiming
- / (opts.repeatExec - new Integer(opts.timingIgnoreQueries).doubleValue()) - mean * mean);
+ double sd = Math
+ .sqrt(sumSquaredTiming / (opts.repeatExec - new Integer(opts.timingIgnoreQueries).doubleValue())
+ - mean * mean);
timingMessage("Average execution time: " + mean + " ms");
timingMessage("Standard deviation: " + String.format("%.4f", sd));
timingMessage("Coefficient of variation: " + String.format("%.4f", (sd / mean)));
@@ -199,7 +202,12 @@ public class VXQuery {
DynamicContext dCtx = new DynamicContextImpl(module.getModuleContext());
js.setGlobalJobDataFactory(new VXQueryGlobalDataFactory(dCtx.createFactory()));
- PrintWriter writer = new PrintWriter(System.out, true);
+ OutputStream resultWriter = System.out;
+ if (opts.resultFile != null) {
+ resultWriter = new FileOutputStream(new File(opts.resultFile));
+ }
+
+ PrintWriter writer = new PrintWriter(resultWriter, true);
// Repeat execution for number of times provided in -repeatexec argument
for (int i = 0; i < opts.repeatExec; ++i) {
start = opts.timing ? new Date() : null;
@@ -401,6 +409,9 @@ public class VXQuery {
@Option(name = "-repeatexec", usage = "Number of times to repeat execution.")
private int repeatExec = 1;
+ @Option(name = "-result-file", usage = "File path to save the query result.")
+ private String resultFile = null;
+
@Option(name = "-timing", usage = "Produce timing information.")
private boolean timing;
[47/50] [abbrv] vxquery git commit: Fixed License issues
Posted by sj...@apache.org.
Fixed License issues
Project: http://git-wip-us.apache.org/repos/asf/vxquery/repo
Commit: http://git-wip-us.apache.org/repos/asf/vxquery/commit/43435f71
Tree: http://git-wip-us.apache.org/repos/asf/vxquery/tree/43435f71
Diff: http://git-wip-us.apache.org/repos/asf/vxquery/diff/43435f71
Branch: refs/heads/site
Commit: 43435f712307d2c88a22ca0c0604443ca03e1e44
Parents: 39c4aca
Author: Steven Jacobs <sj...@ucr.edu>
Authored: Thu May 19 14:48:23 2016 -0700
Committer: Steven Jacobs <sj...@ucr.edu>
Committed: Thu May 19 14:48:23 2016 -0700
----------------------------------------------------------------------
.rat-excludes | 1 +
.../basex_index/sensors_database_add.bxs | 17 +++++++++++++++++
.../basex_index/sensors_database_remove.bxs | 17 +++++++++++++++++
.../basex_index/stations_database_add.bxs | 17 +++++++++++++++++
.../basex_index/stations_database_remove.bxs | 17 +++++++++++++++++
.../rewriter/rules/ConsolidateDescandantChild.java | 17 +++++++++++++++++
6 files changed, 86 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/vxquery/blob/43435f71/.rat-excludes
----------------------------------------------------------------------
diff --git a/.rat-excludes b/.rat-excludes
index 47ceedb..de2de17 100644
--- a/.rat-excludes
+++ b/.rat-excludes
@@ -4,3 +4,4 @@
.classpath
ExpectedTestResults
xqts.txt
+.basex
http://git-wip-us.apache.org/repos/asf/vxquery/blob/43435f71/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/basex_index/sensors_database_add.bxs
----------------------------------------------------------------------
diff --git a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/basex_index/sensors_database_add.bxs b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/basex_index/sensors_database_add.bxs
index b56f86a..8495822 100644
--- a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/basex_index/sensors_database_add.bxs
+++ b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/basex_index/sensors_database_add.bxs
@@ -1,2 +1,19 @@
+(: Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License. :)
+
CREATE DB db_sensors
ADD /tmp/1.0_partition_ghcnd_all_xml/
http://git-wip-us.apache.org/repos/asf/vxquery/blob/43435f71/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/basex_index/sensors_database_remove.bxs
----------------------------------------------------------------------
diff --git a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/basex_index/sensors_database_remove.bxs b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/basex_index/sensors_database_remove.bxs
index f923fd4..f6d46d9 100644
--- a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/basex_index/sensors_database_remove.bxs
+++ b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/basex_index/sensors_database_remove.bxs
@@ -1 +1,18 @@
+(: Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License. :)
+
DROP DB db_sensors
http://git-wip-us.apache.org/repos/asf/vxquery/blob/43435f71/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/basex_index/stations_database_add.bxs
----------------------------------------------------------------------
diff --git a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/basex_index/stations_database_add.bxs b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/basex_index/stations_database_add.bxs
index cb1ea21..abc640e 100644
--- a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/basex_index/stations_database_add.bxs
+++ b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/basex_index/stations_database_add.bxs
@@ -1,2 +1,19 @@
+(: Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License. :)
+
CREATE DB db_stations
ADD ../weather_data/dataset-tiny-local/data_links/local_speed_up/d0_p1_i0/stations/
http://git-wip-us.apache.org/repos/asf/vxquery/blob/43435f71/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/basex_index/stations_database_remove.bxs
----------------------------------------------------------------------
diff --git a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/basex_index/stations_database_remove.bxs b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/basex_index/stations_database_remove.bxs
index 33b9722..c54237d 100644
--- a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/basex_index/stations_database_remove.bxs
+++ b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/basex_index/stations_database_remove.bxs
@@ -1 +1,18 @@
+(: Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License. :)
+
DROP DB db_stations
http://git-wip-us.apache.org/repos/asf/vxquery/blob/43435f71/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/ConsolidateDescandantChild.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/ConsolidateDescandantChild.java b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/ConsolidateDescandantChild.java
index 8f244ef..8554012 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/ConsolidateDescandantChild.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/ConsolidateDescandantChild.java
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package org.apache.vxquery.compiler.rewriter.rules;
import java.util.List;
[04/50] [abbrv] vxquery git commit: Shivani's changes for different
issues I have been working on (Q14, Q19 and desc-self).
Posted by sj...@apache.org.
Shivani's changes for different issues I have been working on (Q14, Q19 and desc-self).
Project: http://git-wip-us.apache.org/repos/asf/vxquery/repo
Commit: http://git-wip-us.apache.org/repos/asf/vxquery/commit/3e40e5a7
Tree: http://git-wip-us.apache.org/repos/asf/vxquery/tree/3e40e5a7
Diff: http://git-wip-us.apache.org/repos/asf/vxquery/diff/3e40e5a7
Branch: refs/heads/site
Commit: 3e40e5a712e1edfb244d1f9b67961f947fcbe8c6
Parents: d94c51f
Author: Preston Carman <pr...@apache.org>
Authored: Mon Aug 10 16:13:21 2015 -0700
Committer: Preston Carman <pr...@apache.org>
Committed: Mon Aug 10 16:13:21 2015 -0700
----------------------------------------------------------------------
.../compiler/rewriter/RewriteRuleset.java | 3 +
.../rules/ConsolidateDescandantChild.java | 104 +++++++++++++++++++
.../vxquery/context/StaticContextImpl.java | 5 +-
.../step/DescendantOrSelfPathStepUnnesting.java | 33 ++++--
.../strings/FnStringScalarEvaluatorFactory.java | 14 ++-
.../vxquery/xmlparser/SAXContentHandler.java | 20 +++-
.../xmlquery/translator/XMLQueryTranslator.java | 17 ++-
.../XQuery/XMark/Original/simple_query1.xq | 22 ----
.../XQuery/XMark/Original/simple_query2.xq | 22 ----
.../src/test/resources/XMarkCatalog.xml | 13 ---
.../test/resources/cat/XMarkOriginalQueries.xml | 10 --
11 files changed, 180 insertions(+), 83 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/vxquery/blob/3e40e5a7/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/RewriteRuleset.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/RewriteRuleset.java b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/RewriteRuleset.java
index 687164e..7b55856 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/RewriteRuleset.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/RewriteRuleset.java
@@ -19,6 +19,7 @@ package org.apache.vxquery.compiler.rewriter;
import java.util.LinkedList;
import java.util.List;
+import org.apache.vxquery.compiler.rewriter.rules.ConsolidateDescandantChild;
import org.apache.vxquery.compiler.rewriter.rules.ConsolidateAssignAggregateRule;
import org.apache.vxquery.compiler.rewriter.rules.ConvertAssignToUnnestRule;
import org.apache.vxquery.compiler.rewriter.rules.ReplaceSourceMapInDocExpression;
@@ -118,6 +119,8 @@ public class RewriteRuleset {
normalization.add(new IntroduceCollectionRule());
normalization.add(new RemoveUnusedAssignAndAggregateRule());
+ normalization.add(new ConsolidateDescandantChild());
+
normalization.add(new ReplaceSourceMapInDocExpression());
// Adds child steps to the data source scan.
// TODO Replace consolidate with a new child function that takes multiple paths.
http://git-wip-us.apache.org/repos/asf/vxquery/blob/3e40e5a7/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/ConsolidateDescandantChild.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/ConsolidateDescandantChild.java b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/ConsolidateDescandantChild.java
new file mode 100644
index 0000000..a83b952
--- /dev/null
+++ b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/ConsolidateDescandantChild.java
@@ -0,0 +1,104 @@
+package org.apache.vxquery.compiler.rewriter.rules;
+
+import java.util.List;
+
+import org.apache.commons.lang3.mutable.Mutable;
+import org.apache.vxquery.compiler.rewriter.rules.util.ExpressionToolbox;
+import org.apache.vxquery.compiler.rewriter.rules.util.OperatorToolbox;
+import org.apache.vxquery.functions.BuiltinOperators;
+
+import edu.uci.ics.hyracks.algebricks.common.exceptions.AlgebricksException;
+import edu.uci.ics.hyracks.algebricks.core.algebra.base.ILogicalExpression;
+import edu.uci.ics.hyracks.algebricks.core.algebra.base.ILogicalOperator;
+import edu.uci.ics.hyracks.algebricks.core.algebra.base.IOptimizationContext;
+import edu.uci.ics.hyracks.algebricks.core.algebra.base.LogicalExpressionTag;
+import edu.uci.ics.hyracks.algebricks.core.algebra.base.LogicalOperatorTag;
+import edu.uci.ics.hyracks.algebricks.core.algebra.expressions.AbstractFunctionCallExpression;
+import edu.uci.ics.hyracks.algebricks.core.algebra.expressions.VariableReferenceExpression;
+import edu.uci.ics.hyracks.algebricks.core.algebra.operators.logical.AbstractUnnestOperator;
+import edu.uci.ics.hyracks.algebricks.core.rewriter.base.IAlgebraicRewriteRule;
+
+/**
+ * The rule searches for assign operator with an aggregate function expression
+ * immediately following an aggregate operator with a sequence expression.
+ * XQuery aggregate functions are implemented in both scalar (one XDM Instance
+ * input as a sequence) and iterative (a stream of XDM Instances each one is
+ * single object).
+ *
+ * <pre>
+ * Before
+ *
+ * plan__parent
+ * UNNEST( $v3 : fn:child( args[$v1], args[$filter] ) )
+ * UNNEST( $v1 : fn:descandant( args[$v0] ) )
+ * plan__child
+ *
+ * After
+ *
+ * plan__parent
+ * UNNEST( $v3 : fn:descandant( args[$v0], args[$filter] ) )
+ * plan__child
+ *
+ *
+ * </pre>
+ *
+ * @author shivanimall
+ */
+
+public class ConsolidateDescandantChild implements IAlgebraicRewriteRule {
+
+ @Override
+ public boolean rewritePre(Mutable<ILogicalOperator> opRef, IOptimizationContext context) throws AlgebricksException {
+ return false;
+ }
+
+ @Override
+ public boolean rewritePost(Mutable<ILogicalOperator> opRef, IOptimizationContext context)
+ throws AlgebricksException {
+
+ ILogicalOperator lo = opRef.getValue();
+ if (!(lo.getOperatorTag().equals(LogicalOperatorTag.UNNEST))) {
+ return false;
+ }
+ AbstractUnnestOperator auo = (AbstractUnnestOperator) lo;
+ Mutable<ILogicalExpression> childExpression = ExpressionToolbox.findFirstFunctionExpression(
+ auo.getExpressionRef(), BuiltinOperators.CHILD.getFunctionIdentifier());
+ if (childExpression == null) {
+ return false;
+ }
+ AbstractFunctionCallExpression childFnCall = (AbstractFunctionCallExpression) childExpression.getValue();
+ List<Mutable<ILogicalExpression>> list = (List<Mutable<ILogicalExpression>>) childFnCall.getArguments();
+ Mutable<ILogicalExpression> mle = (Mutable<ILogicalExpression>) (list).get(0);
+ ILogicalExpression le = mle.getValue();
+ if (!(le.getExpressionTag().equals(LogicalExpressionTag.VARIABLE))) {
+ return false;
+ }
+ VariableReferenceExpression varLogicalExpression = (VariableReferenceExpression) le;
+ Mutable<ILogicalOperator> lop = OperatorToolbox.findProducerOf(opRef,
+ varLogicalExpression.getVariableReference());
+ ILogicalOperator lop1 = lop.getValue();
+ if (!(lop1.getOperatorTag().equals(LogicalOperatorTag.UNNEST))) {
+ return false;
+ }
+ if (OperatorToolbox.getExpressionOf(lop, varLogicalExpression.getVariableReference()) == null) {
+ return false;
+ }
+ ILogicalExpression variableLogicalExpression = (ILogicalExpression) OperatorToolbox.getExpressionOf(lop,
+ varLogicalExpression.getVariableReference()).getValue();
+ if (!(variableLogicalExpression.getExpressionTag().equals(LogicalExpressionTag.FUNCTION_CALL))) {
+ return false;
+ }
+ AbstractFunctionCallExpression afce = (AbstractFunctionCallExpression) variableLogicalExpression;
+ if (!(afce.getFunctionIdentifier().equals(BuiltinOperators.DESCENDANT_OR_SELF.getFunctionIdentifier()))) {
+ return false;
+ }
+ //All conditions have been met.
+ childFnCall.setFunctionInfo(BuiltinOperators.DESCENDANT_OR_SELF);
+ childFnCall.getArguments().get(0).setValue(afce.getArguments().get(0).getValue());
+ ILogicalOperator lo1 = opRef.getValue();
+ Mutable<ILogicalOperator> mlistOfLo = lo1.getInputs().get(0).getValue().getInputs().get(0);
+ ILogicalOperator ilo = (ILogicalOperator) mlistOfLo.getValue();
+ lo.getInputs().get(0).setValue((ILogicalOperator) ilo);
+ return true;
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/vxquery/blob/3e40e5a7/vxquery-core/src/main/java/org/apache/vxquery/context/StaticContextImpl.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/context/StaticContextImpl.java b/vxquery-core/src/main/java/org/apache/vxquery/context/StaticContextImpl.java
index d244595..09cfaff 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/context/StaticContextImpl.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/context/StaticContextImpl.java
@@ -379,10 +379,7 @@ public class StaticContextImpl implements StaticContext {
sequenceTypeList.add(type);
return code;
}
- if (sequenceTypeMap.containsKey(type)) {
- return sequenceTypeMap.get(type);
- }
- return -1;
+ return code;
}
List<SequenceType> getSequenceTypeList() {
http://git-wip-us.apache.org/repos/asf/vxquery/blob/3e40e5a7/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/step/DescendantOrSelfPathStepUnnesting.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/step/DescendantOrSelfPathStepUnnesting.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/step/DescendantOrSelfPathStepUnnesting.java
index 090655b..d03e441 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/step/DescendantOrSelfPathStepUnnesting.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/step/DescendantOrSelfPathStepUnnesting.java
@@ -26,10 +26,13 @@ import org.apache.vxquery.datamodel.accessors.TaggedValuePointable;
import org.apache.vxquery.datamodel.values.ValueTag;
import org.apache.vxquery.exceptions.ErrorCode;
import org.apache.vxquery.exceptions.SystemException;
+import org.apache.vxquery.runtime.functions.step.NodeTestFilter.INodeFilter;
+import org.apache.vxquery.types.SequenceType;
import edu.uci.ics.hyracks.algebricks.common.exceptions.AlgebricksException;
import edu.uci.ics.hyracks.api.context.IHyracksTaskContext;
import edu.uci.ics.hyracks.data.std.api.IPointable;
+import edu.uci.ics.hyracks.data.std.primitive.IntegerPointable;
public class DescendantOrSelfPathStepUnnesting extends AbstractForwardAxisPathStep {
private boolean testSelf;
@@ -39,10 +42,14 @@ public class DescendantOrSelfPathStepUnnesting extends AbstractForwardAxisPathSt
private List<Integer> indexSequence = new ArrayList<Integer>();
private List<Integer> returnSequence = new ArrayList<Integer>();
+ private final IntegerPointable ip = (IntegerPointable) IntegerPointable.FACTORY.createPointable();
private final SequencePointable seqNtp = (SequencePointable) SequencePointable.FACTORY.createPointable();
private final TaggedValuePointable tvpItem = (TaggedValuePointable) TaggedValuePointable.FACTORY.createPointable();
private final TaggedValuePointable tvpNtp = (TaggedValuePointable) TaggedValuePointable.FACTORY.createPointable();
private final TaggedValuePointable tvpStep = (TaggedValuePointable) TaggedValuePointable.FACTORY.createPointable();
+ private INodeFilter filter;
+ private int filterLookupID = -1;
+ private boolean isfilter = false;
public DescendantOrSelfPathStepUnnesting(IHyracksTaskContext ctx, PointablePool pp, boolean testSelf) {
super(ctx, pp);
@@ -55,6 +62,18 @@ public class DescendantOrSelfPathStepUnnesting extends AbstractForwardAxisPathSt
indexSequence.add(0);
returnSequence.add(0);
+ if (args.length > 1) {
+ isfilter = true;
+ if (args[1].getTag() != ValueTag.XS_INT_TAG) {
+ throw new IllegalArgumentException("Expected int value tag, got: " + args[1].getTag());
+ }
+ args[1].getValue(ip);
+ if (ip.getInteger() != filterLookupID) {
+ filterLookupID = ip.getInteger();
+ SequenceType sType = dCtx.getStaticContext().lookupSequenceType(ip.getInteger());
+ filter = NodeTestFilter.getNodeTestFilter(sType);
+ }
+ }
// Check the argument passed in as sequence or node tree.
if (args[0].getTag() == ValueTag.SEQUENCE_TAG) {
args[0].getValue(seqNtp);
@@ -99,14 +118,15 @@ public class DescendantOrSelfPathStepUnnesting extends AbstractForwardAxisPathSt
returnSelf = false;
tvpItem.set(rootTVP);
try {
- setNodeToResult(tvpItem, result);
- return true;
+ if (!isfilter || (isfilter && filter.accept(ntp, tvpItem))) {
+ setNodeToResult(tvpItem, result);
+ return true;
+ }
} catch (IOException e) {
String description = ErrorCode.SYSE0001 + ": " + ErrorCode.SYSE0001.getDescription();
throw new AlgebricksException(description);
}
}
-
// Solve for descendants.
return stepNodeTree(rootTVP, 0, result);
}
@@ -132,12 +152,13 @@ public class DescendantOrSelfPathStepUnnesting extends AbstractForwardAxisPathSt
while (indexSequence.get(level) < seqLength) {
// Get the next item
seqItem.getEntry(indexSequence.get(level), tvpItem);
-
// Check current node
if (indexSequence.get(level) == returnSequence.get(level)) {
returnSequence.set(level, returnSequence.get(level) + 1);
- setNodeToResult(tvpItem, result);
- return true;
+ if (!isfilter || (isfilter && filter.accept(ntp, tvpItem))) {
+ setNodeToResult(tvpItem, result);
+ return true;
+ }
}
// Check children nodes
if (level + 1 <= indexSequence.size()) {
http://git-wip-us.apache.org/repos/asf/vxquery/blob/3e40e5a7/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/strings/FnStringScalarEvaluatorFactory.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/strings/FnStringScalarEvaluatorFactory.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/strings/FnStringScalarEvaluatorFactory.java
index d248502..fa929da 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/strings/FnStringScalarEvaluatorFactory.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/strings/FnStringScalarEvaluatorFactory.java
@@ -28,12 +28,14 @@ import org.apache.vxquery.exceptions.SystemException;
import org.apache.vxquery.runtime.functions.base.AbstractTaggedValueArgumentScalarEvaluator;
import org.apache.vxquery.runtime.functions.base.AbstractTaggedValueArgumentScalarEvaluatorFactory;
import org.apache.vxquery.runtime.functions.cast.CastToStringOperation;
+import org.apache.vxquery.runtime.functions.util.AtomizeHelper;
import edu.uci.ics.hyracks.algebricks.common.exceptions.AlgebricksException;
import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluator;
import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
import edu.uci.ics.hyracks.api.context.IHyracksTaskContext;
import edu.uci.ics.hyracks.data.std.api.IPointable;
+import edu.uci.ics.hyracks.data.std.primitive.UTF8StringPointable;
import edu.uci.ics.hyracks.data.std.util.ArrayBackedValueStorage;
public class FnStringScalarEvaluatorFactory extends AbstractTaggedValueArgumentScalarEvaluatorFactory {
@@ -50,6 +52,9 @@ public class FnStringScalarEvaluatorFactory extends AbstractTaggedValueArgumentS
final DataOutput dOut = abvs.getDataOutput();
final CastToStringOperation castToString = new CastToStringOperation();
final TypedPointables tp = new TypedPointables();
+ final AtomizeHelper ah = new AtomizeHelper();
+ final UTF8StringPointable stringNode = (UTF8StringPointable) UTF8StringPointable.FACTORY.createPointable();
+ final TaggedValuePointable tvpNode = (TaggedValuePointable) TaggedValuePointable.FACTORY.createPointable();
return new AbstractTaggedValueArgumentScalarEvaluator(args) {
@Override
@@ -57,6 +62,7 @@ public class FnStringScalarEvaluatorFactory extends AbstractTaggedValueArgumentS
TaggedValuePointable tvp1 = args[0];
try {
abvs.reset();
+
switch (tvp1.getTag()) {
case ValueTag.XS_ANY_URI_TAG:
tvp1.getValue(tp.utf8sp);
@@ -182,11 +188,15 @@ public class FnStringScalarEvaluatorFactory extends AbstractTaggedValueArgumentS
XDMConstants.setEmptyString(result);
return;
}
- // Pass through if not empty sequence.
+ case ValueTag.NODE_TREE_TAG:
+ ah.atomize(tvp1, ppool, tvpNode);
+ tvpNode.getValue(stringNode);
+ castToString.convertUntypedAtomic(stringNode, dOut);
+ break;
+ // Pass through if not empty sequence.
default:
throw new SystemException(ErrorCode.XPDY0002);
}
-
result.set(abvs);
} catch (IOException e) {
throw new SystemException(ErrorCode.SYSE0001, e);
http://git-wip-us.apache.org/repos/asf/vxquery/blob/3e40e5a7/vxquery-core/src/main/java/org/apache/vxquery/xmlparser/SAXContentHandler.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/xmlparser/SAXContentHandler.java b/vxquery-core/src/main/java/org/apache/vxquery/xmlparser/SAXContentHandler.java
index 296d062..323b608 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/xmlparser/SAXContentHandler.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/xmlparser/SAXContentHandler.java
@@ -282,12 +282,23 @@ public class SAXContentHandler implements ContentHandler, LexicalHandler {
}
}
+ /**
+ * The filter settings here are similar to one in the class linked below.
+ *
+ * @see org.apache.vxquery.runtime.functions.step.NodeTestFilter.java
+ */
private boolean startElementChildPathStep(String uri, String localName) {
if (subElement != null && depth <= subElement.length) {
// Check path step if it exists.
- if (uri.compareTo(childUri[depth - 1]) == 0) {
- if (localName.compareTo(childLocalName[depth - 1]) == 0) {
- subElement[depth - 1] = true;
+ subElement[depth - 1] = true;
+ if (uri != null) {
+ if (childUri[depth - 1] != null && uri.compareTo(childUri[depth - 1]) != 0) {
+ subElement[depth - 1] = false;
+ }
+ }
+ if (localName != null) {
+ if (childLocalName[depth - 1] != null && localName.compareTo(childLocalName[depth - 1]) != 0) {
+ subElement[depth - 1] = false;
}
}
}
@@ -535,6 +546,9 @@ public class SAXContentHandler implements ContentHandler, LexicalHandler {
}
private String getStringFromBytes(byte[] bytes) {
+ if (bytes == null) {
+ return null;
+ }
StringBuilder sb = new StringBuilder();
UTF8StringPointable.toString(sb, bytes, 0);
return sb.toString();
http://git-wip-us.apache.org/repos/asf/vxquery/blob/3e40e5a7/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/translator/XMLQueryTranslator.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/translator/XMLQueryTranslator.java b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/translator/XMLQueryTranslator.java
index a8ffade..2507d6c 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/translator/XMLQueryTranslator.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/translator/XMLQueryTranslator.java
@@ -161,7 +161,6 @@ import edu.uci.ics.hyracks.algebricks.core.algebra.base.ILogicalOperator;
import edu.uci.ics.hyracks.algebricks.core.algebra.base.ILogicalPlan;
import edu.uci.ics.hyracks.algebricks.core.algebra.base.LogicalExpressionTag;
import edu.uci.ics.hyracks.algebricks.core.algebra.base.LogicalVariable;
-import edu.uci.ics.hyracks.algebricks.core.algebra.expressions.AbstractLogicalExpression;
import edu.uci.ics.hyracks.algebricks.core.algebra.expressions.AggregateFunctionCallExpression;
import edu.uci.ics.hyracks.algebricks.core.algebra.expressions.ConstantExpression;
import edu.uci.ics.hyracks.algebricks.core.algebra.expressions.ScalarFunctionCallExpression;
@@ -1446,8 +1445,23 @@ public class XMLQueryTranslator {
for (RelativePathExprNode rpen : pe.getPaths()) {
boolean asc = true;
if (PathType.SLASH_SLASH.equals(rpen.getPathType())) {
+ tCtx = tCtx.pushContext();
+ tCtx.pushVariableScope();
+ iterateOver(ctxExpr, tCtx);
+ ctxExpr = vre(tCtx.varScope.lookupVariable(XMLQueryCompilerConstants.DOT_VAR_NAME)
+ .getLogicalVariable());
ctxExpr = sfce(BuiltinOperators.DESCENDANT_OR_SELF,
treat(ctxExpr, SequenceType.create(AnyNodeType.INSTANCE, Quantifier.QUANT_STAR)));
+ List<LogicalVariable> vars = new ArrayList<LogicalVariable>();
+ List<Mutable<ILogicalExpression>> exprs = new ArrayList<Mutable<ILogicalExpression>>();
+ LogicalVariable var = newLogicalVariable();
+ vars.add(var);
+ exprs.add(mutable(afce(BuiltinOperators.SEQUENCE, false, ctxExpr)));
+ AggregateOperator aop = new AggregateOperator(vars, exprs);
+ aop.getInputs().add(mutable(tCtx.op));
+ tCtx.op = aop;
+ tCtx = tCtx.popContext();
+ ctxExpr = vre(var);
}
boolean popScope = false;
if (ctxExpr != null) {
@@ -1484,6 +1498,7 @@ public class XMLQueryTranslator {
throw new IllegalStateException("Unknown path node: " + pathNode.getTag());
}
if (predicates != null && !predicates.isEmpty()) {
+ ctxExpr = vre(createAssignment(ctxExpr, tCtx));
ctxExpr = sfce(asc ? BuiltinOperators.SORT_DISTINCT_NODES_ASC_OR_ATOMICS
: BuiltinOperators.SORT_DISTINCT_NODES_DESC_OR_ATOMICS, ctxExpr);
for (ASTNode pn : predicates) {
http://git-wip-us.apache.org/repos/asf/vxquery/blob/3e40e5a7/vxquery-xtest/src/test/resources/Queries/XQuery/XMark/Original/simple_query1.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/Queries/XQuery/XMark/Original/simple_query1.xq b/vxquery-xtest/src/test/resources/Queries/XQuery/XMark/Original/simple_query1.xq
deleted file mode 100644
index 4938f64..0000000
--- a/vxquery-xtest/src/test/resources/Queries/XQuery/XMark/Original/simple_query1.xq
+++ /dev/null
@@ -1,22 +0,0 @@
-(: Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License. :)
-
-(: XMark Query see README.md for full details. :)
-
-let $test := "auction_data"
-for $x in ($test)
-return $x
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/vxquery/blob/3e40e5a7/vxquery-xtest/src/test/resources/Queries/XQuery/XMark/Original/simple_query2.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/Queries/XQuery/XMark/Original/simple_query2.xq b/vxquery-xtest/src/test/resources/Queries/XQuery/XMark/Original/simple_query2.xq
deleted file mode 100644
index 4bd3ab8..0000000
--- a/vxquery-xtest/src/test/resources/Queries/XQuery/XMark/Original/simple_query2.xq
+++ /dev/null
@@ -1,22 +0,0 @@
-(: Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License. :)
-
-(: XMark Query see README.md for full details. :)
-
-let $test := "auction_data"
-for $b in doc($test)/site/catgraph
-return $b
http://git-wip-us.apache.org/repos/asf/vxquery/blob/3e40e5a7/vxquery-xtest/src/test/resources/XMarkCatalog.xml
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/XMarkCatalog.xml b/vxquery-xtest/src/test/resources/XMarkCatalog.xml
index c3829a0..11e9a92 100644
--- a/vxquery-xtest/src/test/resources/XMarkCatalog.xml
+++ b/vxquery-xtest/src/test/resources/XMarkCatalog.xml
@@ -45,19 +45,6 @@
<source ID="auction_data" FileName="TestSources/XMark/SingleFile/auction.xml" Creator="Shivani Mall">
<description last-mod="2015-03-25">Collection of files</description>
</source>
- <test-group name="SingleQuery" featureOwner="Preston Carman">
- <GroupInfo>
- <title>Single Query</title>
- <description/>
- </GroupInfo>
- <test-group name="SingleTest" featureOwner="Preston Carman">
- <GroupInfo>
- <title>Single Test</title>
- <description/>
- </GroupInfo>
- &SingleQuery;
- </test-group>
- </test-group>
<test-group name="XMarkQueries" featureOwner="Shivani Mall">
<GroupInfo>
<title>XMark Queries</title>
http://git-wip-us.apache.org/repos/asf/vxquery/blob/3e40e5a7/vxquery-xtest/src/test/resources/cat/XMarkOriginalQueries.xml
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/cat/XMarkOriginalQueries.xml b/vxquery-xtest/src/test/resources/cat/XMarkOriginalQueries.xml
index 87a57d1..8fdcf51 100644
--- a/vxquery-xtest/src/test/resources/cat/XMarkOriginalQueries.xml
+++ b/vxquery-xtest/src/test/resources/cat/XMarkOriginalQueries.xml
@@ -120,14 +120,4 @@
<query name="q20" date="2015-03-25"/>
<output-file compare="Text">q20.txt</output-file>
</test-case>
- <test-case name="Simple-Query-1" FilePath="XMark/Original/" Creator="Shivani Mall">
- <description>Simple Query 1</description>
- <query name="simple_query1" date="2015-03-25"/>
- <output-file compare="Text">simple_query1.txt</output-file>
- </test-case>
- <test-case name="Simple-Query-2" FilePath="XMark/Original/" Creator="Shivani Mall">
- <description>Simple Query 2</description>
- <query name="simple_query2" date="2015-03-25"/>
- <output-file compare="Text">simple_query2.txt</output-file>
- </test-case>
</test-group>
\ No newline at end of file
[17/50] [abbrv] vxquery git commit: VXQUERY-181 - Move to Hyracks
0.2.16
Posted by sj...@apache.org.
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/CastToDecimalOperation.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/CastToDecimalOperation.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/CastToDecimalOperation.java
index f44a8e0..8117d0e 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/CastToDecimalOperation.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/CastToDecimalOperation.java
@@ -26,16 +26,16 @@ import org.apache.vxquery.exceptions.SystemException;
import org.apache.vxquery.runtime.functions.strings.ICharacterIterator;
import org.apache.vxquery.runtime.functions.strings.UTF8StringCharacterIterator;
-import edu.uci.ics.hyracks.data.std.api.INumeric;
-import edu.uci.ics.hyracks.data.std.primitive.BooleanPointable;
-import edu.uci.ics.hyracks.data.std.primitive.BytePointable;
-import edu.uci.ics.hyracks.data.std.primitive.DoublePointable;
-import edu.uci.ics.hyracks.data.std.primitive.FloatPointable;
-import edu.uci.ics.hyracks.data.std.primitive.IntegerPointable;
-import edu.uci.ics.hyracks.data.std.primitive.LongPointable;
-import edu.uci.ics.hyracks.data.std.primitive.ShortPointable;
-import edu.uci.ics.hyracks.data.std.primitive.UTF8StringPointable;
-import edu.uci.ics.hyracks.data.std.util.ArrayBackedValueStorage;
+import org.apache.hyracks.data.std.api.INumeric;
+import org.apache.hyracks.data.std.primitive.BooleanPointable;
+import org.apache.hyracks.data.std.primitive.BytePointable;
+import org.apache.hyracks.data.std.primitive.DoublePointable;
+import org.apache.hyracks.data.std.primitive.FloatPointable;
+import org.apache.hyracks.data.std.primitive.IntegerPointable;
+import org.apache.hyracks.data.std.primitive.LongPointable;
+import org.apache.hyracks.data.std.primitive.ShortPointable;
+import org.apache.hyracks.data.std.primitive.UTF8StringPointable;
+import org.apache.hyracks.data.std.util.ArrayBackedValueStorage;
public class CastToDecimalOperation extends AbstractCastToOperation {
private ArrayBackedValueStorage abvsInner = new ArrayBackedValueStorage();
@@ -243,4 +243,4 @@ public class CastToDecimalOperation extends AbstractCastToOperation {
dOut.writeLong(value);
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/CastToDoubleOperation.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/CastToDoubleOperation.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/CastToDoubleOperation.java
index 43b06ff..ee03928 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/CastToDoubleOperation.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/CastToDoubleOperation.java
@@ -26,15 +26,15 @@ import org.apache.vxquery.exceptions.SystemException;
import org.apache.vxquery.runtime.functions.strings.ICharacterIterator;
import org.apache.vxquery.runtime.functions.strings.UTF8StringCharacterIterator;
-import edu.uci.ics.hyracks.data.std.api.INumeric;
-import edu.uci.ics.hyracks.data.std.primitive.BooleanPointable;
-import edu.uci.ics.hyracks.data.std.primitive.BytePointable;
-import edu.uci.ics.hyracks.data.std.primitive.DoublePointable;
-import edu.uci.ics.hyracks.data.std.primitive.FloatPointable;
-import edu.uci.ics.hyracks.data.std.primitive.IntegerPointable;
-import edu.uci.ics.hyracks.data.std.primitive.LongPointable;
-import edu.uci.ics.hyracks.data.std.primitive.ShortPointable;
-import edu.uci.ics.hyracks.data.std.primitive.UTF8StringPointable;
+import org.apache.hyracks.data.std.api.INumeric;
+import org.apache.hyracks.data.std.primitive.BooleanPointable;
+import org.apache.hyracks.data.std.primitive.BytePointable;
+import org.apache.hyracks.data.std.primitive.DoublePointable;
+import org.apache.hyracks.data.std.primitive.FloatPointable;
+import org.apache.hyracks.data.std.primitive.IntegerPointable;
+import org.apache.hyracks.data.std.primitive.LongPointable;
+import org.apache.hyracks.data.std.primitive.ShortPointable;
+import org.apache.hyracks.data.std.primitive.UTF8StringPointable;
public class CastToDoubleOperation extends AbstractCastToOperation {
@Override
@@ -178,4 +178,4 @@ public class CastToDoubleOperation extends AbstractCastToOperation {
dOut.writeDouble(numericp.doubleValue());
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/CastToDurationOperation.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/CastToDurationOperation.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/CastToDurationOperation.java
index 070c108..776f39a 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/CastToDurationOperation.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/CastToDurationOperation.java
@@ -27,9 +27,9 @@ import org.apache.vxquery.exceptions.SystemException;
import org.apache.vxquery.runtime.functions.strings.ICharacterIterator;
import org.apache.vxquery.runtime.functions.strings.UTF8StringCharacterIterator;
-import edu.uci.ics.hyracks.data.std.primitive.IntegerPointable;
-import edu.uci.ics.hyracks.data.std.primitive.LongPointable;
-import edu.uci.ics.hyracks.data.std.primitive.UTF8StringPointable;
+import org.apache.hyracks.data.std.primitive.IntegerPointable;
+import org.apache.hyracks.data.std.primitive.LongPointable;
+import org.apache.hyracks.data.std.primitive.UTF8StringPointable;
public class CastToDurationOperation extends AbstractCastToOperation {
@@ -129,4 +129,4 @@ public class CastToDurationOperation extends AbstractCastToOperation {
convertString(stringp, dOut);
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/CastToEntityOperation.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/CastToEntityOperation.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/CastToEntityOperation.java
index 88676d5..bdcf4cc 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/CastToEntityOperation.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/CastToEntityOperation.java
@@ -24,4 +24,4 @@ public class CastToEntityOperation extends CastToStringOperation {
returnTag = ValueTag.XS_ENTITY_TAG;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/CastToFloatOperation.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/CastToFloatOperation.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/CastToFloatOperation.java
index 6dbf917..5009a64 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/CastToFloatOperation.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/CastToFloatOperation.java
@@ -26,15 +26,15 @@ import org.apache.vxquery.exceptions.SystemException;
import org.apache.vxquery.runtime.functions.strings.ICharacterIterator;
import org.apache.vxquery.runtime.functions.strings.UTF8StringCharacterIterator;
-import edu.uci.ics.hyracks.data.std.api.INumeric;
-import edu.uci.ics.hyracks.data.std.primitive.BooleanPointable;
-import edu.uci.ics.hyracks.data.std.primitive.BytePointable;
-import edu.uci.ics.hyracks.data.std.primitive.DoublePointable;
-import edu.uci.ics.hyracks.data.std.primitive.FloatPointable;
-import edu.uci.ics.hyracks.data.std.primitive.IntegerPointable;
-import edu.uci.ics.hyracks.data.std.primitive.LongPointable;
-import edu.uci.ics.hyracks.data.std.primitive.ShortPointable;
-import edu.uci.ics.hyracks.data.std.primitive.UTF8StringPointable;
+import org.apache.hyracks.data.std.api.INumeric;
+import org.apache.hyracks.data.std.primitive.BooleanPointable;
+import org.apache.hyracks.data.std.primitive.BytePointable;
+import org.apache.hyracks.data.std.primitive.DoublePointable;
+import org.apache.hyracks.data.std.primitive.FloatPointable;
+import org.apache.hyracks.data.std.primitive.IntegerPointable;
+import org.apache.hyracks.data.std.primitive.LongPointable;
+import org.apache.hyracks.data.std.primitive.ShortPointable;
+import org.apache.hyracks.data.std.primitive.UTF8StringPointable;
public class CastToFloatOperation extends AbstractCastToOperation {
/*
@@ -186,4 +186,4 @@ public class CastToFloatOperation extends AbstractCastToOperation {
dOut.writeFloat(numericp.floatValue());
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/CastToGDayOperation.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/CastToGDayOperation.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/CastToGDayOperation.java
index 0e01d3f..76bac78 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/CastToGDayOperation.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/CastToGDayOperation.java
@@ -28,7 +28,7 @@ import org.apache.vxquery.exceptions.SystemException;
import org.apache.vxquery.runtime.functions.strings.ICharacterIterator;
import org.apache.vxquery.runtime.functions.strings.UTF8StringCharacterIterator;
-import edu.uci.ics.hyracks.data.std.primitive.UTF8StringPointable;
+import org.apache.hyracks.data.std.primitive.UTF8StringPointable;
public class CastToGDayOperation extends AbstractCastToOperation {
@@ -117,4 +117,4 @@ public class CastToGDayOperation extends AbstractCastToOperation {
convertString(stringp, dOut);
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/CastToGMonthDayOperation.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/CastToGMonthDayOperation.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/CastToGMonthDayOperation.java
index ab92cc2..92832a9 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/CastToGMonthDayOperation.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/CastToGMonthDayOperation.java
@@ -28,7 +28,7 @@ import org.apache.vxquery.exceptions.SystemException;
import org.apache.vxquery.runtime.functions.strings.ICharacterIterator;
import org.apache.vxquery.runtime.functions.strings.UTF8StringCharacterIterator;
-import edu.uci.ics.hyracks.data.std.primitive.UTF8StringPointable;
+import org.apache.hyracks.data.std.primitive.UTF8StringPointable;
public class CastToGMonthDayOperation extends AbstractCastToOperation {
@@ -117,4 +117,4 @@ public class CastToGMonthDayOperation extends AbstractCastToOperation {
convertString(stringp, dOut);
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/CastToGMonthOperation.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/CastToGMonthOperation.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/CastToGMonthOperation.java
index 3cd1edf..f8979c6 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/CastToGMonthOperation.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/CastToGMonthOperation.java
@@ -28,7 +28,7 @@ import org.apache.vxquery.exceptions.SystemException;
import org.apache.vxquery.runtime.functions.strings.ICharacterIterator;
import org.apache.vxquery.runtime.functions.strings.UTF8StringCharacterIterator;
-import edu.uci.ics.hyracks.data.std.primitive.UTF8StringPointable;
+import org.apache.hyracks.data.std.primitive.UTF8StringPointable;
public class CastToGMonthOperation extends AbstractCastToOperation {
@@ -117,4 +117,4 @@ public class CastToGMonthOperation extends AbstractCastToOperation {
convertString(stringp, dOut);
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/CastToGYearMonthOperation.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/CastToGYearMonthOperation.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/CastToGYearMonthOperation.java
index 99cdb48..1817824 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/CastToGYearMonthOperation.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/CastToGYearMonthOperation.java
@@ -28,7 +28,7 @@ import org.apache.vxquery.exceptions.SystemException;
import org.apache.vxquery.runtime.functions.strings.ICharacterIterator;
import org.apache.vxquery.runtime.functions.strings.UTF8StringCharacterIterator;
-import edu.uci.ics.hyracks.data.std.primitive.UTF8StringPointable;
+import org.apache.hyracks.data.std.primitive.UTF8StringPointable;
public class CastToGYearMonthOperation extends AbstractCastToOperation {
@@ -138,4 +138,4 @@ public class CastToGYearMonthOperation extends AbstractCastToOperation {
convertString(stringp, dOut);
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/CastToGYearOperation.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/CastToGYearOperation.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/CastToGYearOperation.java
index 08d589a..22c1168 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/CastToGYearOperation.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/CastToGYearOperation.java
@@ -28,7 +28,7 @@ import org.apache.vxquery.exceptions.SystemException;
import org.apache.vxquery.runtime.functions.strings.ICharacterIterator;
import org.apache.vxquery.runtime.functions.strings.UTF8StringCharacterIterator;
-import edu.uci.ics.hyracks.data.std.primitive.UTF8StringPointable;
+import org.apache.hyracks.data.std.primitive.UTF8StringPointable;
public class CastToGYearOperation extends AbstractCastToOperation {
@@ -124,4 +124,4 @@ public class CastToGYearOperation extends AbstractCastToOperation {
convertString(stringp, dOut);
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/CastToHexBinaryOperation.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/CastToHexBinaryOperation.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/CastToHexBinaryOperation.java
index 8bd6e35..f29c71a 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/CastToHexBinaryOperation.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/CastToHexBinaryOperation.java
@@ -26,8 +26,8 @@ import org.apache.vxquery.exceptions.SystemException;
import org.apache.vxquery.runtime.functions.strings.ICharacterIterator;
import org.apache.vxquery.runtime.functions.strings.UTF8StringCharacterIterator;
-import edu.uci.ics.hyracks.data.std.primitive.UTF8StringPointable;
-import edu.uci.ics.hyracks.data.std.util.ArrayBackedValueStorage;
+import org.apache.hyracks.data.std.primitive.UTF8StringPointable;
+import org.apache.hyracks.data.std.util.ArrayBackedValueStorage;
public class CastToHexBinaryOperation extends AbstractCastToOperation {
private ArrayBackedValueStorage abvsInner = new ArrayBackedValueStorage();
@@ -76,4 +76,4 @@ public class CastToHexBinaryOperation extends AbstractCastToOperation {
public void convertUntypedAtomic(UTF8StringPointable stringp, DataOutput dOut) throws SystemException, IOException {
convertString(stringp, dOut);
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/CastToIDOperation.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/CastToIDOperation.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/CastToIDOperation.java
index 9827247..13d00e3 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/CastToIDOperation.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/CastToIDOperation.java
@@ -24,4 +24,4 @@ public class CastToIDOperation extends CastToStringOperation {
returnTag = ValueTag.XS_ID_TAG;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/CastToIDREFOperation.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/CastToIDREFOperation.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/CastToIDREFOperation.java
index 745bbf0..f1ea0f8 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/CastToIDREFOperation.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/CastToIDREFOperation.java
@@ -24,4 +24,4 @@ public class CastToIDREFOperation extends CastToStringOperation {
returnTag = ValueTag.XS_IDREF_TAG;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/CastToIntOperation.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/CastToIntOperation.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/CastToIntOperation.java
index 43227ad..fc6742b 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/CastToIntOperation.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/CastToIntOperation.java
@@ -26,15 +26,15 @@ import org.apache.vxquery.exceptions.SystemException;
import org.apache.vxquery.runtime.functions.strings.ICharacterIterator;
import org.apache.vxquery.runtime.functions.strings.UTF8StringCharacterIterator;
-import edu.uci.ics.hyracks.data.std.api.INumeric;
-import edu.uci.ics.hyracks.data.std.primitive.BooleanPointable;
-import edu.uci.ics.hyracks.data.std.primitive.BytePointable;
-import edu.uci.ics.hyracks.data.std.primitive.DoublePointable;
-import edu.uci.ics.hyracks.data.std.primitive.FloatPointable;
-import edu.uci.ics.hyracks.data.std.primitive.IntegerPointable;
-import edu.uci.ics.hyracks.data.std.primitive.LongPointable;
-import edu.uci.ics.hyracks.data.std.primitive.ShortPointable;
-import edu.uci.ics.hyracks.data.std.primitive.UTF8StringPointable;
+import org.apache.hyracks.data.std.api.INumeric;
+import org.apache.hyracks.data.std.primitive.BooleanPointable;
+import org.apache.hyracks.data.std.primitive.BytePointable;
+import org.apache.hyracks.data.std.primitive.DoublePointable;
+import org.apache.hyracks.data.std.primitive.FloatPointable;
+import org.apache.hyracks.data.std.primitive.IntegerPointable;
+import org.apache.hyracks.data.std.primitive.LongPointable;
+import org.apache.hyracks.data.std.primitive.ShortPointable;
+import org.apache.hyracks.data.std.primitive.UTF8StringPointable;
public class CastToIntOperation extends AbstractCastToOperation {
boolean negativeAllowed = true;
@@ -188,4 +188,4 @@ public class CastToIntOperation extends AbstractCastToOperation {
dOut.write(returnTag);
dOut.writeInt(numericp.intValue());
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/CastToIntegerOperation.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/CastToIntegerOperation.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/CastToIntegerOperation.java
index 440c802..fa7c858 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/CastToIntegerOperation.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/CastToIntegerOperation.java
@@ -26,15 +26,15 @@ import org.apache.vxquery.exceptions.SystemException;
import org.apache.vxquery.runtime.functions.strings.ICharacterIterator;
import org.apache.vxquery.runtime.functions.strings.UTF8StringCharacterIterator;
-import edu.uci.ics.hyracks.data.std.api.INumeric;
-import edu.uci.ics.hyracks.data.std.primitive.BooleanPointable;
-import edu.uci.ics.hyracks.data.std.primitive.BytePointable;
-import edu.uci.ics.hyracks.data.std.primitive.DoublePointable;
-import edu.uci.ics.hyracks.data.std.primitive.FloatPointable;
-import edu.uci.ics.hyracks.data.std.primitive.IntegerPointable;
-import edu.uci.ics.hyracks.data.std.primitive.LongPointable;
-import edu.uci.ics.hyracks.data.std.primitive.ShortPointable;
-import edu.uci.ics.hyracks.data.std.primitive.UTF8StringPointable;
+import org.apache.hyracks.data.std.api.INumeric;
+import org.apache.hyracks.data.std.primitive.BooleanPointable;
+import org.apache.hyracks.data.std.primitive.BytePointable;
+import org.apache.hyracks.data.std.primitive.DoublePointable;
+import org.apache.hyracks.data.std.primitive.FloatPointable;
+import org.apache.hyracks.data.std.primitive.IntegerPointable;
+import org.apache.hyracks.data.std.primitive.LongPointable;
+import org.apache.hyracks.data.std.primitive.ShortPointable;
+import org.apache.hyracks.data.std.primitive.UTF8StringPointable;
public class CastToIntegerOperation extends AbstractCastToOperation {
boolean negativeAllowed = true;
@@ -190,4 +190,4 @@ public class CastToIntegerOperation extends AbstractCastToOperation {
dOut.write(returnTag);
dOut.writeLong(numericp.longValue());
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/CastToLanguageOperation.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/CastToLanguageOperation.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/CastToLanguageOperation.java
index 244117b..37c5e22 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/CastToLanguageOperation.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/CastToLanguageOperation.java
@@ -24,4 +24,4 @@ public class CastToLanguageOperation extends CastToStringOperation {
returnTag = ValueTag.XS_LANGUAGE_TAG;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/CastToLongOperation.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/CastToLongOperation.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/CastToLongOperation.java
index 599afe6..c5e64a3 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/CastToLongOperation.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/CastToLongOperation.java
@@ -25,4 +25,4 @@ public class CastToLongOperation extends CastToIntegerOperation {
returnTag = ValueTag.XS_LONG_TAG;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/CastToNCNameOperation.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/CastToNCNameOperation.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/CastToNCNameOperation.java
index 21010e8..3150fca 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/CastToNCNameOperation.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/CastToNCNameOperation.java
@@ -24,4 +24,4 @@ public class CastToNCNameOperation extends CastToStringOperation {
returnTag = ValueTag.XS_NCNAME_TAG;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/CastToNMTokenOperation.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/CastToNMTokenOperation.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/CastToNMTokenOperation.java
index 058b903..bab5137 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/CastToNMTokenOperation.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/CastToNMTokenOperation.java
@@ -24,4 +24,4 @@ public class CastToNMTokenOperation extends CastToStringOperation {
returnTag = ValueTag.XS_NMTOKEN_TAG;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/CastToNameOperation.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/CastToNameOperation.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/CastToNameOperation.java
index 719156d..06e9120 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/CastToNameOperation.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/CastToNameOperation.java
@@ -24,4 +24,4 @@ public class CastToNameOperation extends CastToStringOperation {
returnTag = ValueTag.XS_NAME_TAG;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/CastToNegativeIntegerOperation.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/CastToNegativeIntegerOperation.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/CastToNegativeIntegerOperation.java
index 3c719f1..9bcc108 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/CastToNegativeIntegerOperation.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/CastToNegativeIntegerOperation.java
@@ -26,4 +26,4 @@ public class CastToNegativeIntegerOperation extends CastToIntegerOperation {
returnTag = ValueTag.XS_NEGATIVE_INTEGER_TAG;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/CastToNonNegativeIntegerOperation.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/CastToNonNegativeIntegerOperation.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/CastToNonNegativeIntegerOperation.java
index 9d57ccf..0d79aad 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/CastToNonNegativeIntegerOperation.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/CastToNonNegativeIntegerOperation.java
@@ -25,4 +25,4 @@ public class CastToNonNegativeIntegerOperation extends CastToIntegerOperation {
returnTag = ValueTag.XS_NON_NEGATIVE_INTEGER_TAG;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/CastToNonPositiveIntegerOperation.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/CastToNonPositiveIntegerOperation.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/CastToNonPositiveIntegerOperation.java
index 081fc1e..f00a733 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/CastToNonPositiveIntegerOperation.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/CastToNonPositiveIntegerOperation.java
@@ -26,4 +26,4 @@ public class CastToNonPositiveIntegerOperation extends CastToIntegerOperation {
returnTag = ValueTag.XS_NON_POSITIVE_INTEGER_TAG;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/CastToNormalizedStringOperation.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/CastToNormalizedStringOperation.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/CastToNormalizedStringOperation.java
index 832a159..eadf9eb 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/CastToNormalizedStringOperation.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/CastToNormalizedStringOperation.java
@@ -24,4 +24,4 @@ public class CastToNormalizedStringOperation extends CastToStringOperation {
returnTag = ValueTag.XS_NORMALIZED_STRING_TAG;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/CastToNotationOperation.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/CastToNotationOperation.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/CastToNotationOperation.java
index f49e862..4cc1025 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/CastToNotationOperation.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/CastToNotationOperation.java
@@ -22,7 +22,7 @@ import java.io.IOException;
import org.apache.vxquery.datamodel.values.ValueTag;
import org.apache.vxquery.exceptions.SystemException;
-import edu.uci.ics.hyracks.data.std.primitive.UTF8StringPointable;
+import org.apache.hyracks.data.std.primitive.UTF8StringPointable;
public class CastToNotationOperation extends AbstractCastToOperation {
@@ -38,4 +38,4 @@ public class CastToNotationOperation extends AbstractCastToOperation {
dOut.write(stringp.getByteArray(), stringp.getStartOffset(), stringp.getLength());
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/CastToPositiveIntegerOperation.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/CastToPositiveIntegerOperation.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/CastToPositiveIntegerOperation.java
index 93a06d6..050eb04 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/CastToPositiveIntegerOperation.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/CastToPositiveIntegerOperation.java
@@ -25,4 +25,4 @@ public class CastToPositiveIntegerOperation extends CastToIntegerOperation {
returnTag = ValueTag.XS_POSITIVE_INTEGER_TAG;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/CastToQNameOperation.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/CastToQNameOperation.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/CastToQNameOperation.java
index da7e6d4..e400af7 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/CastToQNameOperation.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/CastToQNameOperation.java
@@ -26,8 +26,8 @@ import org.apache.vxquery.runtime.functions.strings.ICharacterIterator;
import org.apache.vxquery.runtime.functions.strings.UTF8StringCharacterIterator;
import org.apache.vxquery.runtime.functions.util.FunctionHelper;
-import edu.uci.ics.hyracks.data.std.primitive.UTF8StringPointable;
-import edu.uci.ics.hyracks.data.std.util.ArrayBackedValueStorage;
+import org.apache.hyracks.data.std.primitive.UTF8StringPointable;
+import org.apache.hyracks.data.std.util.ArrayBackedValueStorage;
public class CastToQNameOperation extends AbstractCastToOperation {
ArrayBackedValueStorage abvsInner = new ArrayBackedValueStorage();
@@ -69,4 +69,4 @@ public class CastToQNameOperation extends AbstractCastToOperation {
dOut.write(abvsInner.getByteArray(), abvsInner.getStartOffset() + prefixLength, localNameLength);
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/CastToShortOperation.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/CastToShortOperation.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/CastToShortOperation.java
index ab7c310..5b63dec 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/CastToShortOperation.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/CastToShortOperation.java
@@ -26,15 +26,15 @@ import org.apache.vxquery.exceptions.SystemException;
import org.apache.vxquery.runtime.functions.strings.ICharacterIterator;
import org.apache.vxquery.runtime.functions.strings.UTF8StringCharacterIterator;
-import edu.uci.ics.hyracks.data.std.api.INumeric;
-import edu.uci.ics.hyracks.data.std.primitive.BooleanPointable;
-import edu.uci.ics.hyracks.data.std.primitive.BytePointable;
-import edu.uci.ics.hyracks.data.std.primitive.DoublePointable;
-import edu.uci.ics.hyracks.data.std.primitive.FloatPointable;
-import edu.uci.ics.hyracks.data.std.primitive.IntegerPointable;
-import edu.uci.ics.hyracks.data.std.primitive.LongPointable;
-import edu.uci.ics.hyracks.data.std.primitive.ShortPointable;
-import edu.uci.ics.hyracks.data.std.primitive.UTF8StringPointable;
+import org.apache.hyracks.data.std.api.INumeric;
+import org.apache.hyracks.data.std.primitive.BooleanPointable;
+import org.apache.hyracks.data.std.primitive.BytePointable;
+import org.apache.hyracks.data.std.primitive.DoublePointable;
+import org.apache.hyracks.data.std.primitive.FloatPointable;
+import org.apache.hyracks.data.std.primitive.IntegerPointable;
+import org.apache.hyracks.data.std.primitive.LongPointable;
+import org.apache.hyracks.data.std.primitive.ShortPointable;
+import org.apache.hyracks.data.std.primitive.UTF8StringPointable;
public class CastToShortOperation extends AbstractCastToOperation {
boolean negativeAllowed = true;
@@ -188,4 +188,4 @@ public class CastToShortOperation extends AbstractCastToOperation {
dOut.write(returnTag);
dOut.writeShort(numericp.shortValue());
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/CastToStringOperation.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/CastToStringOperation.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/CastToStringOperation.java
index 5f84682..1622aaa 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/CastToStringOperation.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/CastToStringOperation.java
@@ -32,16 +32,16 @@ import org.apache.vxquery.datamodel.values.ValueTag;
import org.apache.vxquery.exceptions.SystemException;
import org.apache.vxquery.runtime.functions.util.FunctionHelper;
-import edu.uci.ics.hyracks.data.std.primitive.BooleanPointable;
-import edu.uci.ics.hyracks.data.std.primitive.BytePointable;
-import edu.uci.ics.hyracks.data.std.primitive.DoublePointable;
-import edu.uci.ics.hyracks.data.std.primitive.FloatPointable;
-import edu.uci.ics.hyracks.data.std.primitive.IntegerPointable;
-import edu.uci.ics.hyracks.data.std.primitive.LongPointable;
-import edu.uci.ics.hyracks.data.std.primitive.ShortPointable;
-import edu.uci.ics.hyracks.data.std.primitive.UTF8StringPointable;
-import edu.uci.ics.hyracks.data.std.util.ArrayBackedValueStorage;
-import edu.uci.ics.hyracks.data.std.util.ByteArrayAccessibleOutputStream;
+import org.apache.hyracks.data.std.primitive.BooleanPointable;
+import org.apache.hyracks.data.std.primitive.BytePointable;
+import org.apache.hyracks.data.std.primitive.DoublePointable;
+import org.apache.hyracks.data.std.primitive.FloatPointable;
+import org.apache.hyracks.data.std.primitive.IntegerPointable;
+import org.apache.hyracks.data.std.primitive.LongPointable;
+import org.apache.hyracks.data.std.primitive.ShortPointable;
+import org.apache.hyracks.data.std.primitive.UTF8StringPointable;
+import org.apache.hyracks.data.std.util.ArrayBackedValueStorage;
+import org.apache.hyracks.data.std.util.ByteArrayAccessibleOutputStream;
public class CastToStringOperation extends AbstractCastToOperation {
private ByteArrayAccessibleOutputStream baaos = new ByteArrayAccessibleOutputStream();
@@ -692,4 +692,4 @@ public class CastToStringOperation extends AbstractCastToOperation {
sendStringDataOutput(dOut);
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/CastToTimeOperation.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/CastToTimeOperation.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/CastToTimeOperation.java
index 0f4015c..45c1888 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/CastToTimeOperation.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/CastToTimeOperation.java
@@ -28,7 +28,7 @@ import org.apache.vxquery.exceptions.SystemException;
import org.apache.vxquery.runtime.functions.strings.ICharacterIterator;
import org.apache.vxquery.runtime.functions.strings.UTF8StringCharacterIterator;
-import edu.uci.ics.hyracks.data.std.primitive.UTF8StringPointable;
+import org.apache.hyracks.data.std.primitive.UTF8StringPointable;
public class CastToTimeOperation extends AbstractCastToOperation {
@@ -123,4 +123,4 @@ public class CastToTimeOperation extends AbstractCastToOperation {
convertString(stringp, dOut);
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/CastToTokenOperation.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/CastToTokenOperation.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/CastToTokenOperation.java
index 3d6cf5e..bdd8e84 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/CastToTokenOperation.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/CastToTokenOperation.java
@@ -24,4 +24,4 @@ public class CastToTokenOperation extends CastToStringOperation {
returnTag = ValueTag.XS_TOKEN_TAG;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/CastToUnsignedByteOperation.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/CastToUnsignedByteOperation.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/CastToUnsignedByteOperation.java
index f6866d8..ca9b05b 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/CastToUnsignedByteOperation.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/CastToUnsignedByteOperation.java
@@ -25,4 +25,4 @@ public class CastToUnsignedByteOperation extends CastToShortOperation {
returnTag = ValueTag.XS_UNSIGNED_BYTE_TAG;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/CastToUnsignedIntOperation.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/CastToUnsignedIntOperation.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/CastToUnsignedIntOperation.java
index 84dbd1e..45dec6b 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/CastToUnsignedIntOperation.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/CastToUnsignedIntOperation.java
@@ -25,4 +25,4 @@ public class CastToUnsignedIntOperation extends CastToLongOperation {
returnTag = ValueTag.XS_UNSIGNED_INT_TAG;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/CastToUnsignedLongOperation.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/CastToUnsignedLongOperation.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/CastToUnsignedLongOperation.java
index ad513e9..646b8bc 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/CastToUnsignedLongOperation.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/CastToUnsignedLongOperation.java
@@ -25,4 +25,4 @@ public class CastToUnsignedLongOperation extends CastToIntegerOperation {
returnTag = ValueTag.XS_UNSIGNED_LONG_TAG;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/CastToUnsignedShortOperation.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/CastToUnsignedShortOperation.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/CastToUnsignedShortOperation.java
index e51d0d5..931b3d5 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/CastToUnsignedShortOperation.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/CastToUnsignedShortOperation.java
@@ -25,4 +25,4 @@ public class CastToUnsignedShortOperation extends CastToIntOperation {
returnTag = ValueTag.XS_UNSIGNED_SHORT_TAG;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/CastToUntypedAtomicOperation.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/CastToUntypedAtomicOperation.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/CastToUntypedAtomicOperation.java
index 8697596..17a3e1e 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/CastToUntypedAtomicOperation.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/CastToUntypedAtomicOperation.java
@@ -24,4 +24,4 @@ public class CastToUntypedAtomicOperation extends CastToStringOperation {
returnTag = ValueTag.XS_UNTYPED_ATOMIC_TAG;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/CastToYMDurationOperation.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/CastToYMDurationOperation.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/CastToYMDurationOperation.java
index d1ed0a0..c4dce86 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/CastToYMDurationOperation.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/CastToYMDurationOperation.java
@@ -26,9 +26,9 @@ import org.apache.vxquery.exceptions.SystemException;
import org.apache.vxquery.runtime.functions.strings.ICharacterIterator;
import org.apache.vxquery.runtime.functions.strings.UTF8StringCharacterIterator;
-import edu.uci.ics.hyracks.data.std.primitive.IntegerPointable;
-import edu.uci.ics.hyracks.data.std.primitive.LongPointable;
-import edu.uci.ics.hyracks.data.std.primitive.UTF8StringPointable;
+import org.apache.hyracks.data.std.primitive.IntegerPointable;
+import org.apache.hyracks.data.std.primitive.LongPointable;
+import org.apache.hyracks.data.std.primitive.UTF8StringPointable;
public class CastToYMDurationOperation extends AbstractCastToOperation {
@@ -95,4 +95,4 @@ public class CastToYMDurationOperation extends AbstractCastToOperation {
dOut.write(intp.getByteArray(), intp.getStartOffset(), intp.getLength());
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/AbstractCastableAsOperation.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/AbstractCastableAsOperation.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/AbstractCastableAsOperation.java
index 9332c25..2c042e7 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/AbstractCastableAsOperation.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/AbstractCastableAsOperation.java
@@ -29,14 +29,14 @@ import org.apache.vxquery.datamodel.accessors.atomic.XSTimePointable;
import org.apache.vxquery.datamodel.values.ValueTag;
import org.apache.vxquery.exceptions.SystemException;
-import edu.uci.ics.hyracks.data.std.primitive.BooleanPointable;
-import edu.uci.ics.hyracks.data.std.primitive.BytePointable;
-import edu.uci.ics.hyracks.data.std.primitive.DoublePointable;
-import edu.uci.ics.hyracks.data.std.primitive.FloatPointable;
-import edu.uci.ics.hyracks.data.std.primitive.IntegerPointable;
-import edu.uci.ics.hyracks.data.std.primitive.LongPointable;
-import edu.uci.ics.hyracks.data.std.primitive.ShortPointable;
-import edu.uci.ics.hyracks.data.std.primitive.UTF8StringPointable;
+import org.apache.hyracks.data.std.primitive.BooleanPointable;
+import org.apache.hyracks.data.std.primitive.BytePointable;
+import org.apache.hyracks.data.std.primitive.DoublePointable;
+import org.apache.hyracks.data.std.primitive.FloatPointable;
+import org.apache.hyracks.data.std.primitive.IntegerPointable;
+import org.apache.hyracks.data.std.primitive.LongPointable;
+import org.apache.hyracks.data.std.primitive.ShortPointable;
+import org.apache.hyracks.data.std.primitive.UTF8StringPointable;
public abstract class AbstractCastableAsOperation {
public void convertAnyURI(UTF8StringPointable stringp, DataOutput dOut) throws SystemException, IOException {
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsAnyURIOperation.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsAnyURIOperation.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsAnyURIOperation.java
index 1c17ad7..6ee2d7f 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsAnyURIOperation.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsAnyURIOperation.java
@@ -22,7 +22,7 @@ import java.io.IOException;
import org.apache.vxquery.datamodel.values.ValueTag;
import org.apache.vxquery.exceptions.SystemException;
-import edu.uci.ics.hyracks.data.std.primitive.UTF8StringPointable;
+import org.apache.hyracks.data.std.primitive.UTF8StringPointable;
public class CastableAsAnyURIOperation extends AbstractCastableAsOperation {
@@ -43,4 +43,4 @@ public class CastableAsAnyURIOperation extends AbstractCastableAsOperation {
convertString(stringp, dOut);
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsBase64BinaryOperation.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsBase64BinaryOperation.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsBase64BinaryOperation.java
index 6c7d974..293fc81 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsBase64BinaryOperation.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsBase64BinaryOperation.java
@@ -24,8 +24,8 @@ import org.apache.vxquery.datamodel.values.ValueTag;
import org.apache.vxquery.exceptions.SystemException;
import org.apache.vxquery.runtime.functions.cast.CastToBase64BinaryOperation;
-import edu.uci.ics.hyracks.data.std.primitive.UTF8StringPointable;
-import edu.uci.ics.hyracks.data.std.util.ArrayBackedValueStorage;
+import org.apache.hyracks.data.std.primitive.UTF8StringPointable;
+import org.apache.hyracks.data.std.util.ArrayBackedValueStorage;
public class CastableAsBase64BinaryOperation extends AbstractCastableAsOperation {
private ArrayBackedValueStorage abvsInner = new ArrayBackedValueStorage();
@@ -61,4 +61,4 @@ public class CastableAsBase64BinaryOperation extends AbstractCastableAsOperation
public void convertUntypedAtomic(UTF8StringPointable stringp, DataOutput dOut) throws SystemException, IOException {
convertString(stringp, dOut);
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsBooleanOperation.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsBooleanOperation.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsBooleanOperation.java
index 10ad2a0..33f4f96 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsBooleanOperation.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsBooleanOperation.java
@@ -24,12 +24,12 @@ import org.apache.vxquery.datamodel.values.ValueTag;
import org.apache.vxquery.exceptions.SystemException;
import org.apache.vxquery.runtime.functions.cast.CastToBooleanOperation;
-import edu.uci.ics.hyracks.data.std.primitive.BooleanPointable;
-import edu.uci.ics.hyracks.data.std.primitive.DoublePointable;
-import edu.uci.ics.hyracks.data.std.primitive.FloatPointable;
-import edu.uci.ics.hyracks.data.std.primitive.LongPointable;
-import edu.uci.ics.hyracks.data.std.primitive.UTF8StringPointable;
-import edu.uci.ics.hyracks.data.std.util.ArrayBackedValueStorage;
+import org.apache.hyracks.data.std.primitive.BooleanPointable;
+import org.apache.hyracks.data.std.primitive.DoublePointable;
+import org.apache.hyracks.data.std.primitive.FloatPointable;
+import org.apache.hyracks.data.std.primitive.LongPointable;
+import org.apache.hyracks.data.std.primitive.UTF8StringPointable;
+import org.apache.hyracks.data.std.util.ArrayBackedValueStorage;
public class CastableAsBooleanOperation extends AbstractCastableAsOperation {
private ArrayBackedValueStorage abvsInner = new ArrayBackedValueStorage();
@@ -82,4 +82,4 @@ public class CastableAsBooleanOperation extends AbstractCastableAsOperation {
public void convertUntypedAtomic(UTF8StringPointable stringp, DataOutput dOut) throws SystemException, IOException {
convertString(stringp, dOut);
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsByteOperation.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsByteOperation.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsByteOperation.java
index d3efe10..31bf45e 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsByteOperation.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsByteOperation.java
@@ -24,13 +24,13 @@ import org.apache.vxquery.datamodel.values.ValueTag;
import org.apache.vxquery.exceptions.SystemException;
import org.apache.vxquery.runtime.functions.cast.CastToByteOperation;
-import edu.uci.ics.hyracks.data.std.primitive.BooleanPointable;
-import edu.uci.ics.hyracks.data.std.primitive.BytePointable;
-import edu.uci.ics.hyracks.data.std.primitive.DoublePointable;
-import edu.uci.ics.hyracks.data.std.primitive.FloatPointable;
-import edu.uci.ics.hyracks.data.std.primitive.LongPointable;
-import edu.uci.ics.hyracks.data.std.primitive.UTF8StringPointable;
-import edu.uci.ics.hyracks.data.std.util.ArrayBackedValueStorage;
+import org.apache.hyracks.data.std.primitive.BooleanPointable;
+import org.apache.hyracks.data.std.primitive.BytePointable;
+import org.apache.hyracks.data.std.primitive.DoublePointable;
+import org.apache.hyracks.data.std.primitive.FloatPointable;
+import org.apache.hyracks.data.std.primitive.LongPointable;
+import org.apache.hyracks.data.std.primitive.UTF8StringPointable;
+import org.apache.hyracks.data.std.util.ArrayBackedValueStorage;
public class CastableAsByteOperation extends AbstractCastableAsOperation {
private ArrayBackedValueStorage abvsInner = new ArrayBackedValueStorage();
@@ -109,4 +109,4 @@ public class CastableAsByteOperation extends AbstractCastableAsOperation {
dOut.write((byte) 1);
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsDTDurationOperation.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsDTDurationOperation.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsDTDurationOperation.java
index ec2e4c0..1e68cc5 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsDTDurationOperation.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsDTDurationOperation.java
@@ -24,10 +24,10 @@ import org.apache.vxquery.datamodel.values.ValueTag;
import org.apache.vxquery.exceptions.SystemException;
import org.apache.vxquery.runtime.functions.cast.CastToDTDurationOperation;
-import edu.uci.ics.hyracks.data.std.primitive.IntegerPointable;
-import edu.uci.ics.hyracks.data.std.primitive.LongPointable;
-import edu.uci.ics.hyracks.data.std.primitive.UTF8StringPointable;
-import edu.uci.ics.hyracks.data.std.util.ArrayBackedValueStorage;
+import org.apache.hyracks.data.std.primitive.IntegerPointable;
+import org.apache.hyracks.data.std.primitive.LongPointable;
+import org.apache.hyracks.data.std.primitive.UTF8StringPointable;
+import org.apache.hyracks.data.std.util.ArrayBackedValueStorage;
public class CastableAsDTDurationOperation extends AbstractCastableAsOperation {
private ArrayBackedValueStorage abvsInner = new ArrayBackedValueStorage();
@@ -70,4 +70,4 @@ public class CastableAsDTDurationOperation extends AbstractCastableAsOperation {
convertString(stringp, dOut);
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsDateOperation.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsDateOperation.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsDateOperation.java
index e54d436..822a073 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsDateOperation.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsDateOperation.java
@@ -25,8 +25,8 @@ import org.apache.vxquery.datamodel.values.ValueTag;
import org.apache.vxquery.exceptions.SystemException;
import org.apache.vxquery.runtime.functions.cast.CastToDateOperation;
-import edu.uci.ics.hyracks.data.std.primitive.UTF8StringPointable;
-import edu.uci.ics.hyracks.data.std.util.ArrayBackedValueStorage;
+import org.apache.hyracks.data.std.primitive.UTF8StringPointable;
+import org.apache.hyracks.data.std.util.ArrayBackedValueStorage;
public class CastableAsDateOperation extends AbstractCastableAsOperation {
private ArrayBackedValueStorage abvsInner = new ArrayBackedValueStorage();
@@ -62,4 +62,4 @@ public class CastableAsDateOperation extends AbstractCastableAsOperation {
public void convertUntypedAtomic(UTF8StringPointable stringp, DataOutput dOut) throws SystemException, IOException {
convertString(stringp, dOut);
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsDateTimeOperation.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsDateTimeOperation.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsDateTimeOperation.java
index 5bdc333..ef731c3 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsDateTimeOperation.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsDateTimeOperation.java
@@ -25,8 +25,8 @@ import org.apache.vxquery.datamodel.values.ValueTag;
import org.apache.vxquery.exceptions.SystemException;
import org.apache.vxquery.runtime.functions.cast.CastToDateTimeOperation;
-import edu.uci.ics.hyracks.data.std.primitive.UTF8StringPointable;
-import edu.uci.ics.hyracks.data.std.util.ArrayBackedValueStorage;
+import org.apache.hyracks.data.std.primitive.UTF8StringPointable;
+import org.apache.hyracks.data.std.util.ArrayBackedValueStorage;
public class CastableAsDateTimeOperation extends AbstractCastableAsOperation {
private ArrayBackedValueStorage abvsInner = new ArrayBackedValueStorage();
@@ -63,4 +63,4 @@ public class CastableAsDateTimeOperation extends AbstractCastableAsOperation {
convertString(stringp, dOut);
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsDecimalOperation.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsDecimalOperation.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsDecimalOperation.java
index 96b10e5..7d32581 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsDecimalOperation.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsDecimalOperation.java
@@ -24,12 +24,12 @@ import org.apache.vxquery.datamodel.values.ValueTag;
import org.apache.vxquery.exceptions.SystemException;
import org.apache.vxquery.runtime.functions.cast.CastToDecimalOperation;
-import edu.uci.ics.hyracks.data.std.primitive.BooleanPointable;
-import edu.uci.ics.hyracks.data.std.primitive.DoublePointable;
-import edu.uci.ics.hyracks.data.std.primitive.FloatPointable;
-import edu.uci.ics.hyracks.data.std.primitive.LongPointable;
-import edu.uci.ics.hyracks.data.std.primitive.UTF8StringPointable;
-import edu.uci.ics.hyracks.data.std.util.ArrayBackedValueStorage;
+import org.apache.hyracks.data.std.primitive.BooleanPointable;
+import org.apache.hyracks.data.std.primitive.DoublePointable;
+import org.apache.hyracks.data.std.primitive.FloatPointable;
+import org.apache.hyracks.data.std.primitive.LongPointable;
+import org.apache.hyracks.data.std.primitive.UTF8StringPointable;
+import org.apache.hyracks.data.std.util.ArrayBackedValueStorage;
public class CastableAsDecimalOperation extends AbstractCastableAsOperation {
private ArrayBackedValueStorage abvsInner = new ArrayBackedValueStorage();
@@ -100,4 +100,4 @@ public class CastableAsDecimalOperation extends AbstractCastableAsOperation {
convertString(stringp, dOut);
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsDoubleOperation.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsDoubleOperation.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsDoubleOperation.java
index 22205df..1b3978e 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsDoubleOperation.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsDoubleOperation.java
@@ -24,15 +24,15 @@ import org.apache.vxquery.datamodel.values.ValueTag;
import org.apache.vxquery.exceptions.SystemException;
import org.apache.vxquery.runtime.functions.cast.CastToDoubleOperation;
-import edu.uci.ics.hyracks.data.std.primitive.BooleanPointable;
-import edu.uci.ics.hyracks.data.std.primitive.BytePointable;
-import edu.uci.ics.hyracks.data.std.primitive.DoublePointable;
-import edu.uci.ics.hyracks.data.std.primitive.FloatPointable;
-import edu.uci.ics.hyracks.data.std.primitive.IntegerPointable;
-import edu.uci.ics.hyracks.data.std.primitive.LongPointable;
-import edu.uci.ics.hyracks.data.std.primitive.ShortPointable;
-import edu.uci.ics.hyracks.data.std.primitive.UTF8StringPointable;
-import edu.uci.ics.hyracks.data.std.util.ArrayBackedValueStorage;
+import org.apache.hyracks.data.std.primitive.BooleanPointable;
+import org.apache.hyracks.data.std.primitive.BytePointable;
+import org.apache.hyracks.data.std.primitive.DoublePointable;
+import org.apache.hyracks.data.std.primitive.FloatPointable;
+import org.apache.hyracks.data.std.primitive.IntegerPointable;
+import org.apache.hyracks.data.std.primitive.LongPointable;
+import org.apache.hyracks.data.std.primitive.ShortPointable;
+import org.apache.hyracks.data.std.primitive.UTF8StringPointable;
+import org.apache.hyracks.data.std.util.ArrayBackedValueStorage;
public class CastableAsDoubleOperation extends AbstractCastableAsOperation {
private ArrayBackedValueStorage abvsInner = new ArrayBackedValueStorage();
@@ -149,4 +149,4 @@ public class CastableAsDoubleOperation extends AbstractCastableAsOperation {
dOut.write(ValueTag.XS_BOOLEAN_TAG);
dOut.write((byte) 1);
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsDurationOperation.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsDurationOperation.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsDurationOperation.java
index 9f2cc38..01a9c4f 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsDurationOperation.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsDurationOperation.java
@@ -24,10 +24,10 @@ import org.apache.vxquery.datamodel.values.ValueTag;
import org.apache.vxquery.exceptions.SystemException;
import org.apache.vxquery.runtime.functions.cast.CastToDurationOperation;
-import edu.uci.ics.hyracks.data.std.primitive.IntegerPointable;
-import edu.uci.ics.hyracks.data.std.primitive.LongPointable;
-import edu.uci.ics.hyracks.data.std.primitive.UTF8StringPointable;
-import edu.uci.ics.hyracks.data.std.util.ArrayBackedValueStorage;
+import org.apache.hyracks.data.std.primitive.IntegerPointable;
+import org.apache.hyracks.data.std.primitive.LongPointable;
+import org.apache.hyracks.data.std.primitive.UTF8StringPointable;
+import org.apache.hyracks.data.std.util.ArrayBackedValueStorage;
public class CastableAsDurationOperation extends AbstractCastableAsOperation {
private ArrayBackedValueStorage abvsInner = new ArrayBackedValueStorage();
@@ -70,4 +70,4 @@ public class CastableAsDurationOperation extends AbstractCastableAsOperation {
convertString(stringp, dOut);
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsFloatOperation.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsFloatOperation.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsFloatOperation.java
index cd42c5f..7c2ecf9 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsFloatOperation.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsFloatOperation.java
@@ -24,15 +24,15 @@ import org.apache.vxquery.datamodel.values.ValueTag;
import org.apache.vxquery.exceptions.SystemException;
import org.apache.vxquery.runtime.functions.cast.CastToFloatOperation;
-import edu.uci.ics.hyracks.data.std.primitive.BooleanPointable;
-import edu.uci.ics.hyracks.data.std.primitive.BytePointable;
-import edu.uci.ics.hyracks.data.std.primitive.DoublePointable;
-import edu.uci.ics.hyracks.data.std.primitive.FloatPointable;
-import edu.uci.ics.hyracks.data.std.primitive.IntegerPointable;
-import edu.uci.ics.hyracks.data.std.primitive.LongPointable;
-import edu.uci.ics.hyracks.data.std.primitive.ShortPointable;
-import edu.uci.ics.hyracks.data.std.primitive.UTF8StringPointable;
-import edu.uci.ics.hyracks.data.std.util.ArrayBackedValueStorage;
+import org.apache.hyracks.data.std.primitive.BooleanPointable;
+import org.apache.hyracks.data.std.primitive.BytePointable;
+import org.apache.hyracks.data.std.primitive.DoublePointable;
+import org.apache.hyracks.data.std.primitive.FloatPointable;
+import org.apache.hyracks.data.std.primitive.IntegerPointable;
+import org.apache.hyracks.data.std.primitive.LongPointable;
+import org.apache.hyracks.data.std.primitive.ShortPointable;
+import org.apache.hyracks.data.std.primitive.UTF8StringPointable;
+import org.apache.hyracks.data.std.util.ArrayBackedValueStorage;
public class CastableAsFloatOperation extends AbstractCastableAsOperation {
private ArrayBackedValueStorage abvsInner = new ArrayBackedValueStorage();
@@ -149,4 +149,4 @@ public class CastableAsFloatOperation extends AbstractCastableAsOperation {
dOut.write(ValueTag.XS_BOOLEAN_TAG);
dOut.write((byte) 1);
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsGDayOperation.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsGDayOperation.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsGDayOperation.java
index 98cfc32..c0d9ad1 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsGDayOperation.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsGDayOperation.java
@@ -25,8 +25,8 @@ import org.apache.vxquery.datamodel.values.ValueTag;
import org.apache.vxquery.exceptions.SystemException;
import org.apache.vxquery.runtime.functions.cast.CastToGDayOperation;
-import edu.uci.ics.hyracks.data.std.primitive.UTF8StringPointable;
-import edu.uci.ics.hyracks.data.std.util.ArrayBackedValueStorage;
+import org.apache.hyracks.data.std.primitive.UTF8StringPointable;
+import org.apache.hyracks.data.std.util.ArrayBackedValueStorage;
public class CastableAsGDayOperation extends AbstractCastableAsOperation {
private ArrayBackedValueStorage abvsInner = new ArrayBackedValueStorage();
@@ -69,4 +69,4 @@ public class CastableAsGDayOperation extends AbstractCastableAsOperation {
convertString(stringp, dOut);
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsGMonthDayOperation.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsGMonthDayOperation.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsGMonthDayOperation.java
index f2f837f..59d24e6 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsGMonthDayOperation.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsGMonthDayOperation.java
@@ -25,8 +25,8 @@ import org.apache.vxquery.datamodel.values.ValueTag;
import org.apache.vxquery.exceptions.SystemException;
import org.apache.vxquery.runtime.functions.cast.CastToGMonthDayOperation;
-import edu.uci.ics.hyracks.data.std.primitive.UTF8StringPointable;
-import edu.uci.ics.hyracks.data.std.util.ArrayBackedValueStorage;
+import org.apache.hyracks.data.std.primitive.UTF8StringPointable;
+import org.apache.hyracks.data.std.util.ArrayBackedValueStorage;
public class CastableAsGMonthDayOperation extends AbstractCastableAsOperation {
private ArrayBackedValueStorage abvsInner = new ArrayBackedValueStorage();
@@ -69,4 +69,4 @@ public class CastableAsGMonthDayOperation extends AbstractCastableAsOperation {
convertString(stringp, dOut);
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsGMonthOperation.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsGMonthOperation.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsGMonthOperation.java
index b1c9cb9..0584627 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsGMonthOperation.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsGMonthOperation.java
@@ -25,8 +25,8 @@ import org.apache.vxquery.datamodel.values.ValueTag;
import org.apache.vxquery.exceptions.SystemException;
import org.apache.vxquery.runtime.functions.cast.CastToGMonthOperation;
-import edu.uci.ics.hyracks.data.std.primitive.UTF8StringPointable;
-import edu.uci.ics.hyracks.data.std.util.ArrayBackedValueStorage;
+import org.apache.hyracks.data.std.primitive.UTF8StringPointable;
+import org.apache.hyracks.data.std.util.ArrayBackedValueStorage;
public class CastableAsGMonthOperation extends AbstractCastableAsOperation {
private ArrayBackedValueStorage abvsInner = new ArrayBackedValueStorage();
@@ -69,4 +69,4 @@ public class CastableAsGMonthOperation extends AbstractCastableAsOperation {
convertString(stringp, dOut);
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsGYearMonthOperation.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsGYearMonthOperation.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsGYearMonthOperation.java
index 4d9b17d..e012e65 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsGYearMonthOperation.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsGYearMonthOperation.java
@@ -25,8 +25,8 @@ import org.apache.vxquery.datamodel.values.ValueTag;
import org.apache.vxquery.exceptions.SystemException;
import org.apache.vxquery.runtime.functions.cast.CastToGYearMonthOperation;
-import edu.uci.ics.hyracks.data.std.primitive.UTF8StringPointable;
-import edu.uci.ics.hyracks.data.std.util.ArrayBackedValueStorage;
+import org.apache.hyracks.data.std.primitive.UTF8StringPointable;
+import org.apache.hyracks.data.std.util.ArrayBackedValueStorage;
public class CastableAsGYearMonthOperation extends AbstractCastableAsOperation {
private ArrayBackedValueStorage abvsInner = new ArrayBackedValueStorage();
@@ -70,4 +70,4 @@ public class CastableAsGYearMonthOperation extends AbstractCastableAsOperation {
dOut.write((byte) 1);
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsGYearOperation.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsGYearOperation.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsGYearOperation.java
index 846ac07..c926ae6 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsGYearOperation.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsGYearOperation.java
@@ -25,8 +25,8 @@ import org.apache.vxquery.datamodel.values.ValueTag;
import org.apache.vxquery.exceptions.SystemException;
import org.apache.vxquery.runtime.functions.cast.CastToGYearOperation;
-import edu.uci.ics.hyracks.data.std.primitive.UTF8StringPointable;
-import edu.uci.ics.hyracks.data.std.util.ArrayBackedValueStorage;
+import org.apache.hyracks.data.std.primitive.UTF8StringPointable;
+import org.apache.hyracks.data.std.util.ArrayBackedValueStorage;
public class CastableAsGYearOperation extends AbstractCastableAsOperation {
private ArrayBackedValueStorage abvsInner = new ArrayBackedValueStorage();
@@ -69,4 +69,4 @@ public class CastableAsGYearOperation extends AbstractCastableAsOperation {
convertString(stringp, dOut);
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsHexBinaryOperation.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsHexBinaryOperation.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsHexBinaryOperation.java
index c177d53..99c7b77 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsHexBinaryOperation.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsHexBinaryOperation.java
@@ -24,8 +24,8 @@ import org.apache.vxquery.datamodel.values.ValueTag;
import org.apache.vxquery.exceptions.SystemException;
import org.apache.vxquery.runtime.functions.cast.CastToHexBinaryOperation;
-import edu.uci.ics.hyracks.data.std.primitive.UTF8StringPointable;
-import edu.uci.ics.hyracks.data.std.util.ArrayBackedValueStorage;
+import org.apache.hyracks.data.std.primitive.UTF8StringPointable;
+import org.apache.hyracks.data.std.util.ArrayBackedValueStorage;
public class CastableAsHexBinaryOperation extends AbstractCastableAsOperation {
private ArrayBackedValueStorage abvsInner = new ArrayBackedValueStorage();
@@ -61,4 +61,4 @@ public class CastableAsHexBinaryOperation extends AbstractCastableAsOperation {
public void convertUntypedAtomic(UTF8StringPointable stringp, DataOutput dOut) throws SystemException, IOException {
convertString(stringp, dOut);
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsIntOperation.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsIntOperation.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsIntOperation.java
index 168160c..0186508 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsIntOperation.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsIntOperation.java
@@ -24,15 +24,15 @@ import org.apache.vxquery.datamodel.values.ValueTag;
import org.apache.vxquery.exceptions.SystemException;
import org.apache.vxquery.runtime.functions.cast.CastToIntOperation;
-import edu.uci.ics.hyracks.data.std.primitive.BooleanPointable;
-import edu.uci.ics.hyracks.data.std.primitive.BytePointable;
-import edu.uci.ics.hyracks.data.std.primitive.DoublePointable;
-import edu.uci.ics.hyracks.data.std.primitive.FloatPointable;
-import edu.uci.ics.hyracks.data.std.primitive.IntegerPointable;
-import edu.uci.ics.hyracks.data.std.primitive.LongPointable;
-import edu.uci.ics.hyracks.data.std.primitive.ShortPointable;
-import edu.uci.ics.hyracks.data.std.primitive.UTF8StringPointable;
-import edu.uci.ics.hyracks.data.std.util.ArrayBackedValueStorage;
+import org.apache.hyracks.data.std.primitive.BooleanPointable;
+import org.apache.hyracks.data.std.primitive.BytePointable;
+import org.apache.hyracks.data.std.primitive.DoublePointable;
+import org.apache.hyracks.data.std.primitive.FloatPointable;
+import org.apache.hyracks.data.std.primitive.IntegerPointable;
+import org.apache.hyracks.data.std.primitive.LongPointable;
+import org.apache.hyracks.data.std.primitive.ShortPointable;
+import org.apache.hyracks.data.std.primitive.UTF8StringPointable;
+import org.apache.hyracks.data.std.util.ArrayBackedValueStorage;
public class CastableAsIntOperation extends AbstractCastableAsOperation {
private ArrayBackedValueStorage abvsInner = new ArrayBackedValueStorage();
@@ -130,4 +130,4 @@ public class CastableAsIntOperation extends AbstractCastableAsOperation {
dOut.write(ValueTag.XS_BOOLEAN_TAG);
dOut.write((byte) 1);
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsIntegerOperation.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsIntegerOperation.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsIntegerOperation.java
index b1707f2..7a31393 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsIntegerOperation.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsIntegerOperation.java
@@ -24,15 +24,15 @@ import org.apache.vxquery.datamodel.values.ValueTag;
import org.apache.vxquery.exceptions.SystemException;
import org.apache.vxquery.runtime.functions.cast.CastToIntegerOperation;
-import edu.uci.ics.hyracks.data.std.primitive.BooleanPointable;
-import edu.uci.ics.hyracks.data.std.primitive.BytePointable;
-import edu.uci.ics.hyracks.data.std.primitive.DoublePointable;
-import edu.uci.ics.hyracks.data.std.primitive.FloatPointable;
-import edu.uci.ics.hyracks.data.std.primitive.IntegerPointable;
-import edu.uci.ics.hyracks.data.std.primitive.LongPointable;
-import edu.uci.ics.hyracks.data.std.primitive.ShortPointable;
-import edu.uci.ics.hyracks.data.std.primitive.UTF8StringPointable;
-import edu.uci.ics.hyracks.data.std.util.ArrayBackedValueStorage;
+import org.apache.hyracks.data.std.primitive.BooleanPointable;
+import org.apache.hyracks.data.std.primitive.BytePointable;
+import org.apache.hyracks.data.std.primitive.DoublePointable;
+import org.apache.hyracks.data.std.primitive.FloatPointable;
+import org.apache.hyracks.data.std.primitive.IntegerPointable;
+import org.apache.hyracks.data.std.primitive.LongPointable;
+import org.apache.hyracks.data.std.primitive.ShortPointable;
+import org.apache.hyracks.data.std.primitive.UTF8StringPointable;
+import org.apache.hyracks.data.std.util.ArrayBackedValueStorage;
public class CastableAsIntegerOperation extends AbstractCastableAsOperation {
private ArrayBackedValueStorage abvsInner = new ArrayBackedValueStorage();
@@ -165,4 +165,4 @@ public class CastableAsIntegerOperation extends AbstractCastableAsOperation {
dOut.write(ValueTag.XS_BOOLEAN_TAG);
dOut.write((byte) 1);
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsLongOperation.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsLongOperation.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsLongOperation.java
index 894a5cc..31b123b 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsLongOperation.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsLongOperation.java
@@ -18,4 +18,4 @@ package org.apache.vxquery.runtime.functions.castable;
public class CastableAsLongOperation extends CastableAsIntegerOperation {
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsNegativeIntegerOperation.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsNegativeIntegerOperation.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsNegativeIntegerOperation.java
index 994b17f..b3b7499 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsNegativeIntegerOperation.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsNegativeIntegerOperation.java
@@ -18,4 +18,4 @@ package org.apache.vxquery.runtime.functions.castable;
public class CastableAsNegativeIntegerOperation extends CastableAsIntegerOperation {
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsNonNegativeIntegerOperation.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsNonNegativeIntegerOperation.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsNonNegativeIntegerOperation.java
index c066a99..0002946 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsNonNegativeIntegerOperation.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsNonNegativeIntegerOperation.java
@@ -18,4 +18,4 @@ package org.apache.vxquery.runtime.functions.castable;
public class CastableAsNonNegativeIntegerOperation extends CastableAsIntegerOperation {
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsNonPositiveIntegerOperation.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsNonPositiveIntegerOperation.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsNonPositiveIntegerOperation.java
index ab6ebd8..100d11e 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsNonPositiveIntegerOperation.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsNonPositiveIntegerOperation.java
@@ -18,4 +18,4 @@ package org.apache.vxquery.runtime.functions.castable;
public class CastableAsNonPositiveIntegerOperation extends CastableAsIntegerOperation {
-}
\ No newline at end of file
+}
[19/50] [abbrv] vxquery git commit: VXQUERY-181 - Move to Hyracks
0.2.16
Posted by sj...@apache.org.
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/SequencePointable.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/SequencePointable.java b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/SequencePointable.java
index 1c81b48..0aa66f7 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/SequencePointable.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/SequencePointable.java
@@ -16,12 +16,12 @@
*/
package org.apache.vxquery.datamodel.accessors;
-import edu.uci.ics.hyracks.api.dataflow.value.ITypeTraits;
-import edu.uci.ics.hyracks.data.std.api.AbstractPointable;
-import edu.uci.ics.hyracks.data.std.api.IPointable;
-import edu.uci.ics.hyracks.data.std.api.IPointableFactory;
-import edu.uci.ics.hyracks.data.std.primitive.IntegerPointable;
-import edu.uci.ics.hyracks.data.std.primitive.VoidPointable;
+import org.apache.hyracks.api.dataflow.value.ITypeTraits;
+import org.apache.hyracks.data.std.api.AbstractPointable;
+import org.apache.hyracks.data.std.api.IPointable;
+import org.apache.hyracks.data.std.api.IPointableFactory;
+import org.apache.hyracks.data.std.primitive.IntegerPointable;
+import org.apache.hyracks.data.std.primitive.VoidPointable;
public class SequencePointable extends AbstractPointable {
private static final int ENTRY_COUNT_SIZE = 4;
@@ -77,4 +77,4 @@ public class SequencePointable extends AbstractPointable {
private static int getDataAreaOffset(byte[] bytes, int start) {
return getSlotArrayOffset(start) + getEntryCount(bytes, start) * SLOT_SIZE;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/TaggedValuePointable.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/TaggedValuePointable.java b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/TaggedValuePointable.java
index 5760fc1..ac40491 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/TaggedValuePointable.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/TaggedValuePointable.java
@@ -16,12 +16,12 @@
*/
package org.apache.vxquery.datamodel.accessors;
-import edu.uci.ics.hyracks.api.dataflow.value.ITypeTraits;
-import edu.uci.ics.hyracks.data.std.api.AbstractPointable;
-import edu.uci.ics.hyracks.data.std.api.IPointable;
-import edu.uci.ics.hyracks.data.std.api.IPointableFactory;
-import edu.uci.ics.hyracks.data.std.primitive.BytePointable;
-import edu.uci.ics.hyracks.data.std.primitive.VoidPointable;
+import org.apache.hyracks.api.dataflow.value.ITypeTraits;
+import org.apache.hyracks.data.std.api.AbstractPointable;
+import org.apache.hyracks.data.std.api.IPointable;
+import org.apache.hyracks.data.std.api.IPointableFactory;
+import org.apache.hyracks.data.std.primitive.BytePointable;
+import org.apache.hyracks.data.std.primitive.VoidPointable;
public class TaggedValuePointable extends AbstractPointable {
public static final IPointableFactory FACTORY = new IPointableFactory() {
@@ -45,4 +45,4 @@ public class TaggedValuePointable extends AbstractPointable {
public void getValue(IPointable value) {
value.set(bytes, start + 1, length - 1);
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/TypedPointables.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/TypedPointables.java b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/TypedPointables.java
index d303dfe..32eed34 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/TypedPointables.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/TypedPointables.java
@@ -30,14 +30,14 @@ import org.apache.vxquery.datamodel.accessors.nodes.NodeTreePointable;
import org.apache.vxquery.datamodel.accessors.nodes.PINodePointable;
import org.apache.vxquery.datamodel.accessors.nodes.TextOrCommentNodePointable;
-import edu.uci.ics.hyracks.data.std.primitive.BooleanPointable;
-import edu.uci.ics.hyracks.data.std.primitive.BytePointable;
-import edu.uci.ics.hyracks.data.std.primitive.DoublePointable;
-import edu.uci.ics.hyracks.data.std.primitive.FloatPointable;
-import edu.uci.ics.hyracks.data.std.primitive.IntegerPointable;
-import edu.uci.ics.hyracks.data.std.primitive.LongPointable;
-import edu.uci.ics.hyracks.data.std.primitive.ShortPointable;
-import edu.uci.ics.hyracks.data.std.primitive.UTF8StringPointable;
+import org.apache.hyracks.data.std.primitive.BooleanPointable;
+import org.apache.hyracks.data.std.primitive.BytePointable;
+import org.apache.hyracks.data.std.primitive.DoublePointable;
+import org.apache.hyracks.data.std.primitive.FloatPointable;
+import org.apache.hyracks.data.std.primitive.IntegerPointable;
+import org.apache.hyracks.data.std.primitive.LongPointable;
+import org.apache.hyracks.data.std.primitive.ShortPointable;
+import org.apache.hyracks.data.std.primitive.UTF8StringPointable;
/**
* One pointable for each type.
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/atomic/CodedQNamePointable.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/atomic/CodedQNamePointable.java b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/atomic/CodedQNamePointable.java
index 83a3d3b..7c3d390 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/atomic/CodedQNamePointable.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/atomic/CodedQNamePointable.java
@@ -16,11 +16,11 @@
*/
package org.apache.vxquery.datamodel.accessors.atomic;
-import edu.uci.ics.hyracks.api.dataflow.value.ITypeTraits;
-import edu.uci.ics.hyracks.data.std.api.AbstractPointable;
-import edu.uci.ics.hyracks.data.std.api.IPointable;
-import edu.uci.ics.hyracks.data.std.api.IPointableFactory;
-import edu.uci.ics.hyracks.data.std.primitive.IntegerPointable;
+import org.apache.hyracks.api.dataflow.value.ITypeTraits;
+import org.apache.hyracks.data.std.api.AbstractPointable;
+import org.apache.hyracks.data.std.api.IPointable;
+import org.apache.hyracks.data.std.api.IPointableFactory;
+import org.apache.hyracks.data.std.primitive.IntegerPointable;
public class CodedQNamePointable extends AbstractPointable {
public static final int SIZE = 12;
@@ -68,4 +68,4 @@ public class CodedQNamePointable extends AbstractPointable {
public int getLocalCode() {
return IntegerPointable.getInteger(bytes, start + OFF_LOCAL);
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/atomic/XSBinaryPointable.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/atomic/XSBinaryPointable.java b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/atomic/XSBinaryPointable.java
index ccd9936..36af614 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/atomic/XSBinaryPointable.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/atomic/XSBinaryPointable.java
@@ -16,10 +16,10 @@
*/
package org.apache.vxquery.datamodel.accessors.atomic;
-import edu.uci.ics.hyracks.api.dataflow.value.ITypeTraits;
-import edu.uci.ics.hyracks.data.std.api.AbstractPointable;
-import edu.uci.ics.hyracks.data.std.api.IPointable;
-import edu.uci.ics.hyracks.data.std.api.IPointableFactory;
+import org.apache.hyracks.api.dataflow.value.ITypeTraits;
+import org.apache.hyracks.data.std.api.AbstractPointable;
+import org.apache.hyracks.data.std.api.IPointable;
+import org.apache.hyracks.data.std.api.IPointableFactory;
public class XSBinaryPointable extends AbstractPointable {
public static final ITypeTraits TYPE_TRAITS = new ITypeTraits() {
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/atomic/XSDatePointable.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/atomic/XSDatePointable.java b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/atomic/XSDatePointable.java
index e7aaf8a..d728927 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/atomic/XSDatePointable.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/atomic/XSDatePointable.java
@@ -19,12 +19,12 @@ package org.apache.vxquery.datamodel.accessors.atomic;
import org.apache.vxquery.datamodel.api.IDate;
import org.apache.vxquery.datamodel.api.ITimezone;
-import edu.uci.ics.hyracks.api.dataflow.value.ITypeTraits;
-import edu.uci.ics.hyracks.data.std.api.AbstractPointable;
-import edu.uci.ics.hyracks.data.std.api.IPointable;
-import edu.uci.ics.hyracks.data.std.api.IPointableFactory;
-import edu.uci.ics.hyracks.data.std.primitive.BytePointable;
-import edu.uci.ics.hyracks.data.std.primitive.ShortPointable;
+import org.apache.hyracks.api.dataflow.value.ITypeTraits;
+import org.apache.hyracks.data.std.api.AbstractPointable;
+import org.apache.hyracks.data.std.api.IPointable;
+import org.apache.hyracks.data.std.api.IPointableFactory;
+import org.apache.hyracks.data.std.primitive.BytePointable;
+import org.apache.hyracks.data.std.primitive.ShortPointable;
/**
* The date is split up into five sections. Due to leap year, we have decided to keep the
@@ -156,4 +156,4 @@ public class XSDatePointable extends AbstractPointable implements IDate, ITimezo
return getDay(bytes, start) * CHRONON_OF_DAY;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/atomic/XSDateTimePointable.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/atomic/XSDateTimePointable.java b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/atomic/XSDateTimePointable.java
index a40dc01..5691d73 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/atomic/XSDateTimePointable.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/atomic/XSDateTimePointable.java
@@ -24,13 +24,13 @@ import org.apache.vxquery.datamodel.api.ITime;
import org.apache.vxquery.datamodel.api.ITimezone;
import org.apache.vxquery.datamodel.util.DateTime;
-import edu.uci.ics.hyracks.api.dataflow.value.ITypeTraits;
-import edu.uci.ics.hyracks.data.std.api.AbstractPointable;
-import edu.uci.ics.hyracks.data.std.api.IPointable;
-import edu.uci.ics.hyracks.data.std.api.IPointableFactory;
-import edu.uci.ics.hyracks.data.std.primitive.BytePointable;
-import edu.uci.ics.hyracks.data.std.primitive.IntegerPointable;
-import edu.uci.ics.hyracks.data.std.primitive.ShortPointable;
+import org.apache.hyracks.api.dataflow.value.ITypeTraits;
+import org.apache.hyracks.data.std.api.AbstractPointable;
+import org.apache.hyracks.data.std.api.IPointable;
+import org.apache.hyracks.data.std.api.IPointableFactory;
+import org.apache.hyracks.data.std.primitive.BytePointable;
+import org.apache.hyracks.data.std.primitive.IntegerPointable;
+import org.apache.hyracks.data.std.primitive.ShortPointable;
/**
* The datetime is split up into eight sections. Due to leap year, we have decided to keep the
@@ -245,4 +245,4 @@ public class XSDateTimePointable extends AbstractPointable implements IDate, ITi
+ getTimezoneHour(bytes, start) + ":" + getTimezoneMinute(bytes, start) : "");
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/atomic/XSDecimalPointable.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/atomic/XSDecimalPointable.java b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/atomic/XSDecimalPointable.java
index f60d9bd..1559b06 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/atomic/XSDecimalPointable.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/atomic/XSDecimalPointable.java
@@ -16,15 +16,15 @@
*/
package org.apache.vxquery.datamodel.accessors.atomic;
-import edu.uci.ics.hyracks.api.dataflow.value.ITypeTraits;
-import edu.uci.ics.hyracks.data.std.api.AbstractPointable;
-import edu.uci.ics.hyracks.data.std.api.IComparable;
-import edu.uci.ics.hyracks.data.std.api.IHashable;
-import edu.uci.ics.hyracks.data.std.api.INumeric;
-import edu.uci.ics.hyracks.data.std.api.IPointable;
-import edu.uci.ics.hyracks.data.std.api.IPointableFactory;
-import edu.uci.ics.hyracks.data.std.primitive.BytePointable;
-import edu.uci.ics.hyracks.data.std.primitive.LongPointable;
+import org.apache.hyracks.api.dataflow.value.ITypeTraits;
+import org.apache.hyracks.data.std.api.AbstractPointable;
+import org.apache.hyracks.data.std.api.IComparable;
+import org.apache.hyracks.data.std.api.IHashable;
+import org.apache.hyracks.data.std.api.INumeric;
+import org.apache.hyracks.data.std.api.IPointable;
+import org.apache.hyracks.data.std.api.IPointableFactory;
+import org.apache.hyracks.data.std.primitive.BytePointable;
+import org.apache.hyracks.data.std.primitive.LongPointable;
public class XSDecimalPointable extends AbstractPointable implements IHashable, IComparable, INumeric {
private final static int DECIMAL_PLACE_OFFSET = 0;
@@ -200,4 +200,4 @@ public class XSDecimalPointable extends AbstractPointable implements IHashable,
return ((double) getDecimalValue()) / Math.pow(10, getDecimalPlace());
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/atomic/XSDurationPointable.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/atomic/XSDurationPointable.java b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/atomic/XSDurationPointable.java
index 0a9bd1f..e997349 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/atomic/XSDurationPointable.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/atomic/XSDurationPointable.java
@@ -16,12 +16,12 @@
*/
package org.apache.vxquery.datamodel.accessors.atomic;
-import edu.uci.ics.hyracks.api.dataflow.value.ITypeTraits;
-import edu.uci.ics.hyracks.data.std.api.AbstractPointable;
-import edu.uci.ics.hyracks.data.std.api.IPointable;
-import edu.uci.ics.hyracks.data.std.api.IPointableFactory;
-import edu.uci.ics.hyracks.data.std.primitive.IntegerPointable;
-import edu.uci.ics.hyracks.data.std.primitive.LongPointable;
+import org.apache.hyracks.api.dataflow.value.ITypeTraits;
+import org.apache.hyracks.data.std.api.AbstractPointable;
+import org.apache.hyracks.data.std.api.IPointable;
+import org.apache.hyracks.data.std.api.IPointableFactory;
+import org.apache.hyracks.data.std.primitive.IntegerPointable;
+import org.apache.hyracks.data.std.primitive.LongPointable;
public class XSDurationPointable extends AbstractPointable {
private final static int YEAR_MONTH_OFFSET = 0;
@@ -86,4 +86,4 @@ public class XSDurationPointable extends AbstractPointable {
public void setDayTime(long value) {
setDayTime(bytes, start, value);
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/atomic/XSQNamePointable.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/atomic/XSQNamePointable.java b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/atomic/XSQNamePointable.java
index f35c067..f8e63b6 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/atomic/XSQNamePointable.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/atomic/XSQNamePointable.java
@@ -16,11 +16,11 @@
*/
package org.apache.vxquery.datamodel.accessors.atomic;
-import edu.uci.ics.hyracks.api.dataflow.value.ITypeTraits;
-import edu.uci.ics.hyracks.data.std.api.AbstractPointable;
-import edu.uci.ics.hyracks.data.std.api.IPointable;
-import edu.uci.ics.hyracks.data.std.api.IPointableFactory;
-import edu.uci.ics.hyracks.data.std.primitive.UTF8StringPointable;
+import org.apache.hyracks.api.dataflow.value.ITypeTraits;
+import org.apache.hyracks.data.std.api.AbstractPointable;
+import org.apache.hyracks.data.std.api.IPointable;
+import org.apache.hyracks.data.std.api.IPointableFactory;
+import org.apache.hyracks.data.std.primitive.UTF8StringPointable;
/**
* The XSQNamePointable holds three strings: URI, Prefix and Local Name.
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/atomic/XSTimePointable.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/atomic/XSTimePointable.java b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/atomic/XSTimePointable.java
index 2919bc0..62eedde 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/atomic/XSTimePointable.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/atomic/XSTimePointable.java
@@ -19,12 +19,12 @@ package org.apache.vxquery.datamodel.accessors.atomic;
import org.apache.vxquery.datamodel.api.ITime;
import org.apache.vxquery.datamodel.api.ITimezone;
-import edu.uci.ics.hyracks.api.dataflow.value.ITypeTraits;
-import edu.uci.ics.hyracks.data.std.api.AbstractPointable;
-import edu.uci.ics.hyracks.data.std.api.IPointable;
-import edu.uci.ics.hyracks.data.std.api.IPointableFactory;
-import edu.uci.ics.hyracks.data.std.primitive.BytePointable;
-import edu.uci.ics.hyracks.data.std.primitive.IntegerPointable;
+import org.apache.hyracks.api.dataflow.value.ITypeTraits;
+import org.apache.hyracks.data.std.api.AbstractPointable;
+import org.apache.hyracks.data.std.api.IPointable;
+import org.apache.hyracks.data.std.api.IPointableFactory;
+import org.apache.hyracks.data.std.primitive.BytePointable;
+import org.apache.hyracks.data.std.primitive.IntegerPointable;
/**
* The time is split up into five sections. Due to leap year, we have decided to keep the
@@ -153,4 +153,4 @@ public class XSTimePointable extends AbstractPointable implements ITime, ITimezo
return 0;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/nodes/AbstractNodePointable.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/nodes/AbstractNodePointable.java b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/nodes/AbstractNodePointable.java
index b5ced2c..7601688 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/nodes/AbstractNodePointable.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/nodes/AbstractNodePointable.java
@@ -17,8 +17,8 @@
package org.apache.vxquery.datamodel.accessors.nodes;
-import edu.uci.ics.hyracks.data.std.api.AbstractPointable;
-import edu.uci.ics.hyracks.data.std.primitive.IntegerPointable;
+import org.apache.hyracks.data.std.api.AbstractPointable;
+import org.apache.hyracks.data.std.primitive.IntegerPointable;
public abstract class AbstractNodePointable extends AbstractPointable {
public int getLocalNodeId(NodeTreePointable nodeTree) {
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/nodes/AttributeNodePointable.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/nodes/AttributeNodePointable.java b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/nodes/AttributeNodePointable.java
index 030222b..fd4cfc6 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/nodes/AttributeNodePointable.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/nodes/AttributeNodePointable.java
@@ -18,10 +18,10 @@ package org.apache.vxquery.datamodel.accessors.nodes;
import org.apache.vxquery.datamodel.accessors.atomic.CodedQNamePointable;
-import edu.uci.ics.hyracks.api.dataflow.value.ITypeTraits;
-import edu.uci.ics.hyracks.data.std.api.IPointable;
-import edu.uci.ics.hyracks.data.std.api.IPointableFactory;
-import edu.uci.ics.hyracks.data.std.primitive.VoidPointable;
+import org.apache.hyracks.api.dataflow.value.ITypeTraits;
+import org.apache.hyracks.data.std.api.IPointable;
+import org.apache.hyracks.data.std.api.IPointableFactory;
+import org.apache.hyracks.data.std.primitive.VoidPointable;
/*
* Attribute {
@@ -100,4 +100,4 @@ public class AttributeNodePointable extends AbstractNodePointable {
private int getValueSize(NodeTreePointable nodeTree) {
return length - (getValueOffset(nodeTree) - start);
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/nodes/DocumentNodePointable.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/nodes/DocumentNodePointable.java b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/nodes/DocumentNodePointable.java
index d2dc5d0..95dc404 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/nodes/DocumentNodePointable.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/nodes/DocumentNodePointable.java
@@ -18,10 +18,10 @@ package org.apache.vxquery.datamodel.accessors.nodes;
import org.apache.vxquery.datamodel.accessors.SequencePointable;
-import edu.uci.ics.hyracks.api.dataflow.value.ITypeTraits;
-import edu.uci.ics.hyracks.data.std.api.IPointable;
-import edu.uci.ics.hyracks.data.std.api.IPointableFactory;
-import edu.uci.ics.hyracks.data.std.primitive.VoidPointable;
+import org.apache.hyracks.api.dataflow.value.ITypeTraits;
+import org.apache.hyracks.data.std.api.IPointable;
+import org.apache.hyracks.data.std.api.IPointableFactory;
+import org.apache.hyracks.data.std.primitive.VoidPointable;
/*
* Document {
@@ -64,4 +64,4 @@ public class DocumentNodePointable extends AbstractNodePointable {
private int getContentSize(NodeTreePointable nodeTree) {
return length - (getContentOffset(nodeTree) - start);
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/nodes/ElementNodePointable.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/nodes/ElementNodePointable.java b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/nodes/ElementNodePointable.java
index faadd33..4367d91 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/nodes/ElementNodePointable.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/nodes/ElementNodePointable.java
@@ -19,12 +19,12 @@ package org.apache.vxquery.datamodel.accessors.nodes;
import org.apache.vxquery.datamodel.accessors.SequencePointable;
import org.apache.vxquery.datamodel.accessors.atomic.CodedQNamePointable;
-import edu.uci.ics.hyracks.api.dataflow.value.ITypeTraits;
-import edu.uci.ics.hyracks.data.std.api.IPointable;
-import edu.uci.ics.hyracks.data.std.api.IPointableFactory;
-import edu.uci.ics.hyracks.data.std.primitive.BytePointable;
-import edu.uci.ics.hyracks.data.std.primitive.IntegerPointable;
-import edu.uci.ics.hyracks.data.std.primitive.VoidPointable;
+import org.apache.hyracks.api.dataflow.value.ITypeTraits;
+import org.apache.hyracks.data.std.api.IPointable;
+import org.apache.hyracks.data.std.api.IPointableFactory;
+import org.apache.hyracks.data.std.primitive.BytePointable;
+import org.apache.hyracks.data.std.primitive.IntegerPointable;
+import org.apache.hyracks.data.std.primitive.VoidPointable;
/*
* Element {
@@ -201,4 +201,4 @@ public class ElementNodePointable extends AbstractNodePointable {
private int getChildrenChunkSize(NodeTreePointable nodeTree) {
return childrenChunkExists() ? SequencePointable.getSequenceLength(bytes, getChildrenChunkOffset(nodeTree)) : 0;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/nodes/NodeTreePointable.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/nodes/NodeTreePointable.java b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/nodes/NodeTreePointable.java
index 4b0697f..db03e28 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/nodes/NodeTreePointable.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/nodes/NodeTreePointable.java
@@ -18,16 +18,16 @@ package org.apache.vxquery.datamodel.accessors.nodes;
import org.apache.vxquery.datamodel.accessors.TaggedValuePointable;
-import edu.uci.ics.hyracks.api.dataflow.value.ITypeTraits;
-import edu.uci.ics.hyracks.data.std.algorithms.BinarySearchAlgorithm;
-import edu.uci.ics.hyracks.data.std.api.AbstractPointable;
-import edu.uci.ics.hyracks.data.std.api.IPointable;
-import edu.uci.ics.hyracks.data.std.api.IPointableFactory;
-import edu.uci.ics.hyracks.data.std.collections.api.IValueReferenceVector;
-import edu.uci.ics.hyracks.data.std.primitive.BytePointable;
-import edu.uci.ics.hyracks.data.std.primitive.IntegerPointable;
-import edu.uci.ics.hyracks.data.std.primitive.UTF8StringPointable;
-import edu.uci.ics.hyracks.data.std.primitive.VoidPointable;
+import org.apache.hyracks.api.dataflow.value.ITypeTraits;
+import org.apache.hyracks.data.std.algorithms.BinarySearchAlgorithm;
+import org.apache.hyracks.data.std.api.AbstractPointable;
+import org.apache.hyracks.data.std.api.IPointable;
+import org.apache.hyracks.data.std.api.IPointableFactory;
+import org.apache.hyracks.data.std.collections.api.IValueReferenceVector;
+import org.apache.hyracks.data.std.primitive.BytePointable;
+import org.apache.hyracks.data.std.primitive.IntegerPointable;
+import org.apache.hyracks.data.std.primitive.UTF8StringPointable;
+import org.apache.hyracks.data.std.primitive.VoidPointable;
/*
* NodeTree {
@@ -204,4 +204,4 @@ public class NodeTreePointable extends AbstractPointable {
private int getRootNodeOffset() {
return getDictionaryOffset() + getDictionarySize();
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/nodes/PINodePointable.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/nodes/PINodePointable.java b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/nodes/PINodePointable.java
index 2318ba6..3ae5126 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/nodes/PINodePointable.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/nodes/PINodePointable.java
@@ -16,11 +16,11 @@
*/
package org.apache.vxquery.datamodel.accessors.nodes;
-import edu.uci.ics.hyracks.api.dataflow.value.ITypeTraits;
-import edu.uci.ics.hyracks.data.std.api.IPointable;
-import edu.uci.ics.hyracks.data.std.api.IPointableFactory;
-import edu.uci.ics.hyracks.data.std.primitive.UTF8StringPointable;
-import edu.uci.ics.hyracks.data.std.primitive.VoidPointable;
+import org.apache.hyracks.api.dataflow.value.ITypeTraits;
+import org.apache.hyracks.data.std.api.IPointable;
+import org.apache.hyracks.data.std.api.IPointableFactory;
+import org.apache.hyracks.data.std.primitive.UTF8StringPointable;
+import org.apache.hyracks.data.std.primitive.VoidPointable;
/*
* PI {
@@ -76,4 +76,4 @@ public class PINodePointable extends AbstractNodePointable {
private int getContentSize(NodeTreePointable nodeTree) {
return UTF8StringPointable.getUTFLength(bytes, getContentOffset(nodeTree)) + 2;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/nodes/TextOrCommentNodePointable.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/nodes/TextOrCommentNodePointable.java b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/nodes/TextOrCommentNodePointable.java
index 2ab2555..cea7c02 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/nodes/TextOrCommentNodePointable.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/nodes/TextOrCommentNodePointable.java
@@ -16,10 +16,10 @@
*/
package org.apache.vxquery.datamodel.accessors.nodes;
-import edu.uci.ics.hyracks.api.dataflow.value.ITypeTraits;
-import edu.uci.ics.hyracks.data.std.api.IPointable;
-import edu.uci.ics.hyracks.data.std.api.IPointableFactory;
-import edu.uci.ics.hyracks.data.std.primitive.VoidPointable;
+import org.apache.hyracks.api.dataflow.value.ITypeTraits;
+import org.apache.hyracks.data.std.api.IPointable;
+import org.apache.hyracks.data.std.api.IPointableFactory;
+import org.apache.hyracks.data.std.primitive.VoidPointable;
/*
* Text | Comment {
@@ -63,4 +63,4 @@ public class TextOrCommentNodePointable extends AbstractNodePointable {
return length - (getValueOffset(nodeTree) - start);
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/atomic/StringValueBuilder.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/atomic/StringValueBuilder.java b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/atomic/StringValueBuilder.java
index ad59a5c..215d1b1 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/atomic/StringValueBuilder.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/atomic/StringValueBuilder.java
@@ -19,7 +19,7 @@ package org.apache.vxquery.datamodel.builders.atomic;
import java.io.DataOutput;
import java.io.IOException;
-import edu.uci.ics.hyracks.data.std.primitive.UTF8StringWriter;
+import org.apache.hyracks.data.std.primitive.UTF8StringWriter;
public class StringValueBuilder {
private final UTF8StringWriter writer;
@@ -31,4 +31,4 @@ public class StringValueBuilder {
public void write(CharSequence string, DataOutput out) throws IOException {
writer.writeUTF8String(string, out);
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/atomic/UTF8StringBuilder.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/atomic/UTF8StringBuilder.java b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/atomic/UTF8StringBuilder.java
index f1961ff..51c026b 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/atomic/UTF8StringBuilder.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/atomic/UTF8StringBuilder.java
@@ -23,8 +23,8 @@ import java.io.UTFDataFormatException;
import org.apache.vxquery.datamodel.builders.base.AbstractBuilder;
import org.apache.vxquery.runtime.functions.util.FunctionHelper;
-import edu.uci.ics.hyracks.data.std.api.IMutableValueStorage;
-import edu.uci.ics.hyracks.data.std.primitive.BytePointable;
+import org.apache.hyracks.data.std.api.IMutableValueStorage;
+import org.apache.hyracks.data.std.primitive.BytePointable;
public class UTF8StringBuilder extends AbstractBuilder {
private IMutableValueStorage mvs;
@@ -51,4 +51,4 @@ public class UTF8StringBuilder extends AbstractBuilder {
throw new UTFDataFormatException("encoded string too long: " + mvs.getLength() + " bytes");
}
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/base/AbstractBuilder.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/base/AbstractBuilder.java b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/base/AbstractBuilder.java
index 4ba9a14..bacad26 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/base/AbstractBuilder.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/base/AbstractBuilder.java
@@ -18,10 +18,10 @@ package org.apache.vxquery.datamodel.builders.base;
import java.io.IOException;
-import edu.uci.ics.hyracks.data.std.api.IMutableValueStorage;
+import org.apache.hyracks.data.std.api.IMutableValueStorage;
public abstract class AbstractBuilder {
public abstract void reset(IMutableValueStorage mvs) throws IOException;
public abstract void finish() throws IOException;
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/base/AbstractValueBuilder.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/base/AbstractValueBuilder.java b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/base/AbstractValueBuilder.java
index 15eea32..abe8eb1 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/base/AbstractValueBuilder.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/base/AbstractValueBuilder.java
@@ -17,4 +17,4 @@
package org.apache.vxquery.datamodel.builders.base;
public abstract class AbstractValueBuilder implements IValueBuilder {
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/base/IValueBuilder.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/base/IValueBuilder.java b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/base/IValueBuilder.java
index a83b6b1..fc38cda 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/base/IValueBuilder.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/base/IValueBuilder.java
@@ -22,4 +22,4 @@ public interface IValueBuilder {
public void reset();
public void write(DataOutput out);
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/nodes/AbstractNodeBuilder.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/nodes/AbstractNodeBuilder.java b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/nodes/AbstractNodeBuilder.java
index 1c5c7a5..955668f 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/nodes/AbstractNodeBuilder.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/nodes/AbstractNodeBuilder.java
@@ -18,10 +18,10 @@ package org.apache.vxquery.datamodel.builders.nodes;
import java.io.IOException;
-import edu.uci.ics.hyracks.data.std.api.IMutableValueStorage;
+import org.apache.hyracks.data.std.api.IMutableValueStorage;
public abstract class AbstractNodeBuilder {
public abstract void reset(IMutableValueStorage mvs) throws IOException;
public abstract void finish() throws IOException;
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/nodes/AttributeNodeBuilder.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/nodes/AttributeNodeBuilder.java b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/nodes/AttributeNodeBuilder.java
index cea7799..7743cd8 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/nodes/AttributeNodeBuilder.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/nodes/AttributeNodeBuilder.java
@@ -21,8 +21,8 @@ import java.io.IOException;
import org.apache.vxquery.datamodel.values.ValueTag;
-import edu.uci.ics.hyracks.data.std.api.IMutableValueStorage;
-import edu.uci.ics.hyracks.data.std.api.IValueReference;
+import org.apache.hyracks.data.std.api.IMutableValueStorage;
+import org.apache.hyracks.data.std.api.IValueReference;
public class AttributeNodeBuilder extends AbstractNodeBuilder {
private DataOutput out;
@@ -56,4 +56,4 @@ public class AttributeNodeBuilder extends AbstractNodeBuilder {
public void setValue(IValueReference value) throws IOException {
out.write(value.getByteArray(), value.getStartOffset(), value.getLength());
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/nodes/CommentNodeBuilder.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/nodes/CommentNodeBuilder.java b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/nodes/CommentNodeBuilder.java
index 104868f..d79bb88 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/nodes/CommentNodeBuilder.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/nodes/CommentNodeBuilder.java
@@ -21,8 +21,8 @@ import java.io.IOException;
import org.apache.vxquery.datamodel.values.ValueTag;
-import edu.uci.ics.hyracks.data.std.api.IMutableValueStorage;
-import edu.uci.ics.hyracks.data.std.api.IValueReference;
+import org.apache.hyracks.data.std.api.IMutableValueStorage;
+import org.apache.hyracks.data.std.api.IValueReference;
public class CommentNodeBuilder extends AbstractNodeBuilder {
private DataOutput out;
@@ -44,4 +44,4 @@ public class CommentNodeBuilder extends AbstractNodeBuilder {
public void setValue(IValueReference value) throws IOException {
out.write(value.getByteArray(), value.getStartOffset(), value.getLength());
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/nodes/DictionaryBuilder.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/nodes/DictionaryBuilder.java b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/nodes/DictionaryBuilder.java
index bee221d..dae149f 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/nodes/DictionaryBuilder.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/nodes/DictionaryBuilder.java
@@ -24,12 +24,12 @@ import java.util.TreeMap;
import org.apache.vxquery.util.GrowableIntArray;
-import edu.uci.ics.hyracks.data.std.algorithms.BinarySearchAlgorithm;
-import edu.uci.ics.hyracks.data.std.collections.api.IValueReferenceVector;
-import edu.uci.ics.hyracks.data.std.primitive.IntegerPointable;
-import edu.uci.ics.hyracks.data.std.primitive.UTF8StringPointable;
-import edu.uci.ics.hyracks.data.std.util.ArrayBackedValueStorage;
-import edu.uci.ics.hyracks.data.std.util.ByteArrayAccessibleOutputStream;
+import org.apache.hyracks.data.std.algorithms.BinarySearchAlgorithm;
+import org.apache.hyracks.data.std.collections.api.IValueReferenceVector;
+import org.apache.hyracks.data.std.primitive.IntegerPointable;
+import org.apache.hyracks.data.std.primitive.UTF8StringPointable;
+import org.apache.hyracks.data.std.util.ArrayBackedValueStorage;
+import org.apache.hyracks.data.std.util.ByteArrayAccessibleOutputStream;
public class DictionaryBuilder {
private final GrowableIntArray stringEndOffsets;
@@ -158,4 +158,4 @@ public class DictionaryBuilder {
cacheReady = false;
return slotIndex;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/nodes/DocumentNodeBuilder.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/nodes/DocumentNodeBuilder.java b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/nodes/DocumentNodeBuilder.java
index 176580e..47c811c 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/nodes/DocumentNodeBuilder.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/nodes/DocumentNodeBuilder.java
@@ -22,8 +22,8 @@ import java.io.IOException;
import org.apache.vxquery.datamodel.values.ValueTag;
import org.apache.vxquery.util.GrowableIntArray;
-import edu.uci.ics.hyracks.data.std.api.IMutableValueStorage;
-import edu.uci.ics.hyracks.data.std.util.ArrayBackedValueStorage;
+import org.apache.hyracks.data.std.api.IMutableValueStorage;
+import org.apache.hyracks.data.std.util.ArrayBackedValueStorage;
public class DocumentNodeBuilder extends AbstractNodeBuilder {
private final GrowableIntArray childrenSlots;
@@ -79,4 +79,4 @@ public class DocumentNodeBuilder extends AbstractNodeBuilder {
out.write(childrenDataArea.getByteArray(), childrenDataArea.getStartOffset(), childrenDataArea.getLength());
}
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/nodes/ElementNodeBuilder.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/nodes/ElementNodeBuilder.java b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/nodes/ElementNodeBuilder.java
index d455fd5..89aaddc 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/nodes/ElementNodeBuilder.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/nodes/ElementNodeBuilder.java
@@ -23,11 +23,11 @@ import org.apache.vxquery.datamodel.accessors.nodes.ElementNodePointable;
import org.apache.vxquery.datamodel.values.ValueTag;
import org.apache.vxquery.util.GrowableIntArray;
-import edu.uci.ics.hyracks.data.std.api.IMutableValueStorage;
-import edu.uci.ics.hyracks.data.std.api.IValueReference;
-import edu.uci.ics.hyracks.data.std.primitive.BytePointable;
-import edu.uci.ics.hyracks.data.std.primitive.IntegerPointable;
-import edu.uci.ics.hyracks.data.std.util.ArrayBackedValueStorage;
+import org.apache.hyracks.data.std.api.IMutableValueStorage;
+import org.apache.hyracks.data.std.api.IValueReference;
+import org.apache.hyracks.data.std.primitive.BytePointable;
+import org.apache.hyracks.data.std.primitive.IntegerPointable;
+import org.apache.hyracks.data.std.util.ArrayBackedValueStorage;
public class ElementNodeBuilder extends AbstractNodeBuilder {
private final GrowableIntArray attrSlots;
@@ -176,4 +176,4 @@ public class ElementNodeBuilder extends AbstractNodeBuilder {
out.write(childrenDataArea.getByteArray(), childrenDataArea.getStartOffset(), childrenDataArea.getLength());
}
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/nodes/NodeSubTreeBuilder.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/nodes/NodeSubTreeBuilder.java b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/nodes/NodeSubTreeBuilder.java
index c890f3b..5eb08df 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/nodes/NodeSubTreeBuilder.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/nodes/NodeSubTreeBuilder.java
@@ -23,7 +23,7 @@ import org.apache.vxquery.datamodel.accessors.TaggedValuePointable;
import org.apache.vxquery.datamodel.accessors.nodes.NodeTreePointable;
import org.apache.vxquery.datamodel.values.ValueTag;
-import edu.uci.ics.hyracks.data.std.api.IMutableValueStorage;
+import org.apache.hyracks.data.std.api.IMutableValueStorage;
public class NodeSubTreeBuilder extends AbstractNodeBuilder {
private DataOutput mainOut;
@@ -67,4 +67,4 @@ public class NodeSubTreeBuilder extends AbstractNodeBuilder {
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/nodes/PINodeBuilder.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/nodes/PINodeBuilder.java b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/nodes/PINodeBuilder.java
index a472143..ee37511 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/nodes/PINodeBuilder.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/nodes/PINodeBuilder.java
@@ -21,8 +21,8 @@ import java.io.IOException;
import org.apache.vxquery.datamodel.values.ValueTag;
-import edu.uci.ics.hyracks.data.std.api.IMutableValueStorage;
-import edu.uci.ics.hyracks.data.std.api.IValueReference;
+import org.apache.hyracks.data.std.api.IMutableValueStorage;
+import org.apache.hyracks.data.std.api.IValueReference;
public class PINodeBuilder extends AbstractNodeBuilder {
private DataOutput out;
@@ -48,4 +48,4 @@ public class PINodeBuilder extends AbstractNodeBuilder {
public void setContent(IValueReference value) throws IOException {
out.write(value.getByteArray(), value.getStartOffset(), value.getLength());
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/nodes/TextNodeBuilder.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/nodes/TextNodeBuilder.java b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/nodes/TextNodeBuilder.java
index acddb8b..84ee20e 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/nodes/TextNodeBuilder.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/nodes/TextNodeBuilder.java
@@ -21,8 +21,8 @@ import java.io.IOException;
import org.apache.vxquery.datamodel.values.ValueTag;
-import edu.uci.ics.hyracks.data.std.api.IMutableValueStorage;
-import edu.uci.ics.hyracks.data.std.api.IValueReference;
+import org.apache.hyracks.data.std.api.IMutableValueStorage;
+import org.apache.hyracks.data.std.api.IValueReference;
public class TextNodeBuilder extends AbstractNodeBuilder {
private DataOutput out;
@@ -44,4 +44,4 @@ public class TextNodeBuilder extends AbstractNodeBuilder {
public void setValue(IValueReference value) throws IOException {
out.write(value.getByteArray(), value.getStartOffset(), value.getLength());
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/sequence/SequenceBuilder.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/sequence/SequenceBuilder.java b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/sequence/SequenceBuilder.java
index 96d6c3d..12f4ad7 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/sequence/SequenceBuilder.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/sequence/SequenceBuilder.java
@@ -22,9 +22,9 @@ import java.io.IOException;
import org.apache.vxquery.datamodel.values.ValueTag;
import org.apache.vxquery.util.GrowableIntArray;
-import edu.uci.ics.hyracks.data.std.api.IMutableValueStorage;
-import edu.uci.ics.hyracks.data.std.api.IValueReference;
-import edu.uci.ics.hyracks.data.std.util.ArrayBackedValueStorage;
+import org.apache.hyracks.data.std.api.IMutableValueStorage;
+import org.apache.hyracks.data.std.api.IValueReference;
+import org.apache.hyracks.data.std.util.ArrayBackedValueStorage;
public class SequenceBuilder {
private final GrowableIntArray slots = new GrowableIntArray();
@@ -62,4 +62,4 @@ public class SequenceBuilder {
out.write(dataArea.getByteArray(), dataArea.getStartOffset(), dataArea.getLength());
}
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/values/ValueTag.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/datamodel/values/ValueTag.java b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/values/ValueTag.java
index c30c77b..e2c89e9 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/datamodel/values/ValueTag.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/values/ValueTag.java
@@ -100,4 +100,4 @@ public class ValueTag {
return false;
}
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/values/XDMConstants.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/datamodel/values/XDMConstants.java b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/values/XDMConstants.java
index 8f1d7b3..bc058c7 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/datamodel/values/XDMConstants.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/values/XDMConstants.java
@@ -21,9 +21,9 @@ import java.util.Arrays;
import org.apache.vxquery.datamodel.builders.sequence.SequenceBuilder;
-import edu.uci.ics.hyracks.data.std.api.IPointable;
-import edu.uci.ics.hyracks.data.std.primitive.BooleanPointable;
-import edu.uci.ics.hyracks.data.std.util.ArrayBackedValueStorage;
+import org.apache.hyracks.data.std.api.IPointable;
+import org.apache.hyracks.data.std.primitive.BooleanPointable;
+import org.apache.hyracks.data.std.util.ArrayBackedValueStorage;
public class XDMConstants {
private static final byte[] BOOLEAN_TRUE_CONSTANT;
@@ -81,4 +81,4 @@ public class XDMConstants {
private XDMConstants() {
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/exceptions/DefaultSystemExceptionFactory.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/exceptions/DefaultSystemExceptionFactory.java b/vxquery-core/src/main/java/org/apache/vxquery/exceptions/DefaultSystemExceptionFactory.java
index 3c0e143..6dfd040 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/exceptions/DefaultSystemExceptionFactory.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/exceptions/DefaultSystemExceptionFactory.java
@@ -38,4 +38,4 @@ public final class DefaultSystemExceptionFactory implements SystemExceptionFacto
public SystemException createException(ErrorCode code, SourceLocation location) {
return new SystemException(code, location);
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/exceptions/ErrorReporter.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/exceptions/ErrorReporter.java b/vxquery-core/src/main/java/org/apache/vxquery/exceptions/ErrorReporter.java
index d271095..8a1cdb0 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/exceptions/ErrorReporter.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/exceptions/ErrorReporter.java
@@ -18,4 +18,4 @@ package org.apache.vxquery.exceptions;
public interface ErrorReporter {
public void reportError(Exception e);
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/exceptions/SystemException.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/exceptions/SystemException.java b/vxquery-core/src/main/java/org/apache/vxquery/exceptions/SystemException.java
index 697d76c..39b12b9 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/exceptions/SystemException.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/exceptions/SystemException.java
@@ -65,4 +65,4 @@ public class SystemException extends Exception {
public ErrorCode getCode() {
return code;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/exceptions/SystemExceptionFactory.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/exceptions/SystemExceptionFactory.java b/vxquery-core/src/main/java/org/apache/vxquery/exceptions/SystemExceptionFactory.java
index d26f5af..15dcc61 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/exceptions/SystemExceptionFactory.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/exceptions/SystemExceptionFactory.java
@@ -24,4 +24,4 @@ public interface SystemExceptionFactory {
public SystemException createException(ErrorCode eCode);
public SystemException createException(ErrorCode eCode, SourceLocation location);
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/exceptions/VXQueryDataException.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/exceptions/VXQueryDataException.java b/vxquery-core/src/main/java/org/apache/vxquery/exceptions/VXQueryDataException.java
index 79a37af..e41872c 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/exceptions/VXQueryDataException.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/exceptions/VXQueryDataException.java
@@ -18,7 +18,7 @@ package org.apache.vxquery.exceptions;
import java.io.File;
-import edu.uci.ics.hyracks.api.exceptions.HyracksDataException;
+import org.apache.hyracks.api.exceptions.HyracksDataException;
public class VXQueryDataException extends HyracksDataException {
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/exceptions/WarningReporter.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/exceptions/WarningReporter.java b/vxquery-core/src/main/java/org/apache/vxquery/exceptions/WarningReporter.java
index 419b6ed..0e7da5d 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/exceptions/WarningReporter.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/exceptions/WarningReporter.java
@@ -18,4 +18,4 @@ package org.apache.vxquery.exceptions;
public interface WarningReporter {
public void reportWarning(Exception e);
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/functions/BuiltinFunction.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/functions/BuiltinFunction.java b/vxquery-core/src/main/java/org/apache/vxquery/functions/BuiltinFunction.java
index c85be26..1b002be 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/functions/BuiltinFunction.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/functions/BuiltinFunction.java
@@ -34,4 +34,4 @@ public class BuiltinFunction extends Function {
public boolean useContextImplicitly() {
return implicitContext;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/functions/ExternalFunction.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/functions/ExternalFunction.java b/vxquery-core/src/main/java/org/apache/vxquery/functions/ExternalFunction.java
index 9d0891d..e80826d 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/functions/ExternalFunction.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/functions/ExternalFunction.java
@@ -32,4 +32,4 @@ public class ExternalFunction extends Function {
public boolean useContextImplicitly() {
return false;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/functions/Function.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/functions/Function.java b/vxquery-core/src/main/java/org/apache/vxquery/functions/Function.java
index c725743..1305536 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/functions/Function.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/functions/Function.java
@@ -26,11 +26,11 @@ import org.apache.vxquery.compiler.rewriter.rules.propagationpolicies.uniquenode
import org.apache.vxquery.exceptions.ErrorCode;
import org.apache.vxquery.exceptions.SystemException;
-import edu.uci.ics.hyracks.algebricks.core.algebra.functions.FunctionIdentifier;
-import edu.uci.ics.hyracks.algebricks.core.algebra.functions.IFunctionInfo;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IAggregateEvaluatorFactory;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IUnnestingEvaluatorFactory;
+import org.apache.hyracks.algebricks.core.algebra.functions.FunctionIdentifier;
+import org.apache.hyracks.algebricks.core.algebra.functions.IFunctionInfo;
+import org.apache.hyracks.algebricks.runtime.base.IAggregateEvaluatorFactory;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
+import org.apache.hyracks.algebricks.runtime.base.IUnnestingEvaluatorFactory;
public abstract class Function implements IFunctionInfo {
private static final String VXQUERY = "vxquery";
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/functions/Operator.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/functions/Operator.java b/vxquery-core/src/main/java/org/apache/vxquery/functions/Operator.java
index 1819129..ddce15c 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/functions/Operator.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/functions/Operator.java
@@ -32,4 +32,4 @@ public class Operator extends Function {
public boolean useContextImplicitly() {
return false;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/functions/Signature.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/functions/Signature.java b/vxquery-core/src/main/java/org/apache/vxquery/functions/Signature.java
index 609e005..8604212 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/functions/Signature.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/functions/Signature.java
@@ -71,4 +71,4 @@ public final class Signature {
public void serialize(StringBuffer buffer) {
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/functions/UserDefinedXQueryFunction.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/functions/UserDefinedXQueryFunction.java b/vxquery-core/src/main/java/org/apache/vxquery/functions/UserDefinedXQueryFunction.java
index 63b8c12..6d00845 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/functions/UserDefinedXQueryFunction.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/functions/UserDefinedXQueryFunction.java
@@ -18,7 +18,7 @@ import javax.xml.namespace.QName;
import org.apache.vxquery.context.XQueryVariable;
-import edu.uci.ics.hyracks.algebricks.core.algebra.base.ILogicalPlan;
+import org.apache.hyracks.algebricks.core.algebra.base.ILogicalPlan;
public class UserDefinedXQueryFunction extends Function {
private XQueryVariable[] params;
@@ -54,4 +54,4 @@ public class UserDefinedXQueryFunction extends Function {
public boolean useContextImplicitly() {
return false;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/metadata/QueryResultDataSink.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/metadata/QueryResultDataSink.java b/vxquery-core/src/main/java/org/apache/vxquery/metadata/QueryResultDataSink.java
index 9fc639f..8286d1b 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/metadata/QueryResultDataSink.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/metadata/QueryResultDataSink.java
@@ -16,11 +16,11 @@
*/
package org.apache.vxquery.metadata;
-import edu.uci.ics.hyracks.algebricks.core.algebra.metadata.IDataSink;
-import edu.uci.ics.hyracks.algebricks.core.algebra.properties.FileSplitDomain;
-import edu.uci.ics.hyracks.algebricks.core.algebra.properties.IPartitioningProperty;
-import edu.uci.ics.hyracks.algebricks.core.algebra.properties.RandomPartitioningProperty;
-import edu.uci.ics.hyracks.dataflow.std.file.FileSplit;
+import org.apache.hyracks.algebricks.core.algebra.metadata.IDataSink;
+import org.apache.hyracks.algebricks.core.algebra.properties.FileSplitDomain;
+import org.apache.hyracks.algebricks.core.algebra.properties.IPartitioningProperty;
+import org.apache.hyracks.algebricks.core.algebra.properties.RandomPartitioningProperty;
+import org.apache.hyracks.dataflow.std.file.FileSplit;
public class QueryResultDataSink implements IDataSink {
private final FileSplit[] fileSplits;
@@ -49,4 +49,4 @@ public class QueryResultDataSink implements IDataSink {
public FileSplit[] getFileSplits() {
return fileSplits;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/metadata/QueryResultSetDataSink.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/metadata/QueryResultSetDataSink.java b/vxquery-core/src/main/java/org/apache/vxquery/metadata/QueryResultSetDataSink.java
index 1e4e781..80166e7 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/metadata/QueryResultSetDataSink.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/metadata/QueryResultSetDataSink.java
@@ -16,11 +16,11 @@
*/
package org.apache.vxquery.metadata;
-import edu.uci.ics.hyracks.algebricks.core.algebra.metadata.IDataSink;
-import edu.uci.ics.hyracks.algebricks.core.algebra.properties.IPartitioningProperty;
-import edu.uci.ics.hyracks.algebricks.core.algebra.properties.RandomPartitioningProperty;
-import edu.uci.ics.hyracks.algebricks.core.algebra.properties.ResultSetDomain;
-import edu.uci.ics.hyracks.api.dataset.ResultSetId;
+import org.apache.hyracks.algebricks.core.algebra.metadata.IDataSink;
+import org.apache.hyracks.algebricks.core.algebra.properties.IPartitioningProperty;
+import org.apache.hyracks.algebricks.core.algebra.properties.RandomPartitioningProperty;
+import org.apache.hyracks.algebricks.core.algebra.properties.ResultSetDomain;
+import org.apache.hyracks.api.dataset.ResultSetId;
public class QueryResultSetDataSink implements IDataSink {
@@ -46,4 +46,4 @@ public class QueryResultSetDataSink implements IDataSink {
public IPartitioningProperty getPartitioningProperty() {
return new RandomPartitioningProperty(new ResultSetDomain());
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/metadata/VXQueryCollectionDataSource.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/metadata/VXQueryCollectionDataSource.java b/vxquery-core/src/main/java/org/apache/vxquery/metadata/VXQueryCollectionDataSource.java
index d17a1a9..62d1ca7 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/metadata/VXQueryCollectionDataSource.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/metadata/VXQueryCollectionDataSource.java
@@ -21,14 +21,14 @@ import java.util.List;
import org.apache.vxquery.compiler.rewriter.rules.CollectionFileDomain;
-import edu.uci.ics.hyracks.algebricks.core.algebra.base.LogicalVariable;
-import edu.uci.ics.hyracks.algebricks.core.algebra.metadata.IDataSource;
-import edu.uci.ics.hyracks.algebricks.core.algebra.metadata.IDataSourcePropertiesProvider;
-import edu.uci.ics.hyracks.algebricks.core.algebra.properties.FunctionalDependency;
-import edu.uci.ics.hyracks.algebricks.core.algebra.properties.ILocalStructuralProperty;
-import edu.uci.ics.hyracks.algebricks.core.algebra.properties.IPhysicalPropertiesVector;
-import edu.uci.ics.hyracks.algebricks.core.algebra.properties.RandomPartitioningProperty;
-import edu.uci.ics.hyracks.algebricks.core.algebra.properties.StructuralPropertiesVector;
+import org.apache.hyracks.algebricks.core.algebra.base.LogicalVariable;
+import org.apache.hyracks.algebricks.core.algebra.metadata.IDataSource;
+import org.apache.hyracks.algebricks.core.algebra.metadata.IDataSourcePropertiesProvider;
+import org.apache.hyracks.algebricks.core.algebra.properties.FunctionalDependency;
+import org.apache.hyracks.algebricks.core.algebra.properties.ILocalStructuralProperty;
+import org.apache.hyracks.algebricks.core.algebra.properties.IPhysicalPropertiesVector;
+import org.apache.hyracks.algebricks.core.algebra.properties.RandomPartitioningProperty;
+import org.apache.hyracks.algebricks.core.algebra.properties.StructuralPropertiesVector;
public class VXQueryCollectionDataSource implements IDataSource<String> {
private static final String DELIMITER = "\\|";
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/metadata/VXQueryCollectionOperatorDescriptor.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/metadata/VXQueryCollectionOperatorDescriptor.java b/vxquery-core/src/main/java/org/apache/vxquery/metadata/VXQueryCollectionOperatorDescriptor.java
index 8fdd1ec..d5966b8 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/metadata/VXQueryCollectionOperatorDescriptor.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/metadata/VXQueryCollectionOperatorDescriptor.java
@@ -25,23 +25,24 @@ import java.util.logging.Logger;
import org.apache.commons.io.FileUtils;
import org.apache.commons.io.filefilter.TrueFileFilter;
+import org.apache.hyracks.api.comm.IFrame;
+import org.apache.hyracks.api.comm.IFrameFieldAppender;
+import org.apache.hyracks.api.comm.VSizeFrame;
+import org.apache.hyracks.api.context.IHyracksTaskContext;
+import org.apache.hyracks.api.dataflow.IOperatorNodePushable;
+import org.apache.hyracks.api.dataflow.value.IRecordDescriptorProvider;
+import org.apache.hyracks.api.dataflow.value.RecordDescriptor;
+import org.apache.hyracks.api.exceptions.HyracksDataException;
+import org.apache.hyracks.api.job.IOperatorDescriptorRegistry;
+import org.apache.hyracks.dataflow.common.comm.io.FrameFixedFieldTupleAppender;
+import org.apache.hyracks.dataflow.common.comm.io.FrameTupleAccessor;
+import org.apache.hyracks.dataflow.std.base.AbstractSingleActivityOperatorDescriptor;
+import org.apache.hyracks.dataflow.std.base.AbstractUnaryInputUnaryOutputOperatorNodePushable;
import org.apache.vxquery.context.DynamicContext;
import org.apache.vxquery.xmlparser.ITreeNodeIdProvider;
import org.apache.vxquery.xmlparser.TreeNodeIdProvider;
import org.apache.vxquery.xmlparser.XMLParser;
-import edu.uci.ics.hyracks.api.context.IHyracksTaskContext;
-import edu.uci.ics.hyracks.api.dataflow.IOperatorNodePushable;
-import edu.uci.ics.hyracks.api.dataflow.value.IRecordDescriptorProvider;
-import edu.uci.ics.hyracks.api.dataflow.value.RecordDescriptor;
-import edu.uci.ics.hyracks.api.exceptions.HyracksDataException;
-import edu.uci.ics.hyracks.api.job.IOperatorDescriptorRegistry;
-import edu.uci.ics.hyracks.dataflow.common.comm.io.FrameTupleAccessor;
-import edu.uci.ics.hyracks.dataflow.common.comm.io.FrameTupleAppender;
-import edu.uci.ics.hyracks.dataflow.common.comm.util.FrameUtils;
-import edu.uci.ics.hyracks.dataflow.std.base.AbstractSingleActivityOperatorDescriptor;
-import edu.uci.ics.hyracks.dataflow.std.base.AbstractUnaryInputUnaryOutputOperatorNodePushable;
-
public class VXQueryCollectionOperatorDescriptor extends AbstractSingleActivityOperatorDescriptor {
private static final long serialVersionUID = 1L;
private short dataSourceId;
@@ -63,18 +64,18 @@ public class VXQueryCollectionOperatorDescriptor extends AbstractSingleActivityO
@Override
public IOperatorNodePushable createPushRuntime(IHyracksTaskContext ctx,
IRecordDescriptorProvider recordDescProvider, int partition, int nPartitions) throws HyracksDataException {
- final FrameTupleAccessor fta = new FrameTupleAccessor(ctx.getFrameSize(),
+ final FrameTupleAccessor fta = new FrameTupleAccessor(
recordDescProvider.getInputRecordDescriptor(getActivityId(), 0));
final int fieldOutputCount = recordDescProvider.getOutputRecordDescriptor(getActivityId(), 0).getFieldCount();
- final ByteBuffer frame = ctx.allocateFrame();
- final FrameTupleAppender appender = new FrameTupleAppender(ctx.getFrameSize(), fieldOutputCount);
+ final IFrame frame = new VSizeFrame(ctx);
+ final IFrameFieldAppender appender = new FrameFixedFieldTupleAppender(fieldOutputCount);
final short partitionId = (short) ctx.getTaskAttemptId().getTaskId().getPartition();
final ITreeNodeIdProvider nodeIdProvider = new TreeNodeIdProvider(partitionId, dataSourceId, totalDataSources);
final String nodeId = ctx.getJobletContext().getApplicationContext().getNodeId();
final DynamicContext dCtx = (DynamicContext) ctx.getJobletContext().getGlobalJobData();
final String collectionName = collectionPartitions[partition % collectionPartitions.length];
- final XMLParser parser = new XMLParser(false, nodeIdProvider, nodeId, frame, appender, childSeq,
+ final XMLParser parser = new XMLParser(false, nodeIdProvider, nodeId, appender, childSeq,
dCtx.getStaticContext());
return new AbstractUnaryInputUnaryOutputOperatorNodePushable() {
@@ -101,7 +102,7 @@ public class VXQueryCollectionOperatorDescriptor extends AbstractSingleActivityO
if (LOGGER.isLoggable(Level.FINE)) {
LOGGER.fine("Starting to read XML document: " + xmlDocument.getAbsolutePath());
}
- parser.parseElements(xmlDocument, writer, fta, tupleIndex);
+ parser.parseElements(xmlDocument, writer, tupleIndex);
}
}
} else {
@@ -118,12 +119,11 @@ public class VXQueryCollectionOperatorDescriptor extends AbstractSingleActivityO
@Override
public void close() throws HyracksDataException {
// Check if needed?
- fta.reset(frame);
- if (fta.getTupleCount() > 0) {
- FrameUtils.flushFrame(frame, writer);
+ if (appender.getTupleCount() > 0) {
+ appender.flush(writer, true);
}
writer.close();
}
};
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/metadata/VXQueryIOFileFilter.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/metadata/VXQueryIOFileFilter.java b/vxquery-core/src/main/java/org/apache/vxquery/metadata/VXQueryIOFileFilter.java
index 104f254..70070dc 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/metadata/VXQueryIOFileFilter.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/metadata/VXQueryIOFileFilter.java
@@ -34,4 +34,4 @@ public class VXQueryIOFileFilter implements IOFileFilter {
}
return false;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/metadata/VXQueryMetadataProvider.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/metadata/VXQueryMetadataProvider.java b/vxquery-core/src/main/java/org/apache/vxquery/metadata/VXQueryMetadataProvider.java
index ea4bdb1..238f6d3 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/metadata/VXQueryMetadataProvider.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/metadata/VXQueryMetadataProvider.java
@@ -24,34 +24,34 @@ import java.util.Map;
import org.apache.vxquery.context.StaticContext;
-import edu.uci.ics.hyracks.algebricks.common.constraints.AlgebricksAbsolutePartitionConstraint;
-import edu.uci.ics.hyracks.algebricks.common.constraints.AlgebricksPartitionConstraint;
-import edu.uci.ics.hyracks.algebricks.common.exceptions.AlgebricksException;
-import edu.uci.ics.hyracks.algebricks.common.utils.Pair;
-import edu.uci.ics.hyracks.algebricks.core.algebra.base.ILogicalExpression;
-import edu.uci.ics.hyracks.algebricks.core.algebra.base.LogicalVariable;
-import edu.uci.ics.hyracks.algebricks.core.algebra.expressions.IVariableTypeEnvironment;
-import edu.uci.ics.hyracks.algebricks.core.algebra.functions.FunctionIdentifier;
-import edu.uci.ics.hyracks.algebricks.core.algebra.functions.IFunctionInfo;
-import edu.uci.ics.hyracks.algebricks.core.algebra.metadata.IDataSink;
-import edu.uci.ics.hyracks.algebricks.core.algebra.metadata.IDataSource;
-import edu.uci.ics.hyracks.algebricks.core.algebra.metadata.IDataSourceIndex;
-import edu.uci.ics.hyracks.algebricks.core.algebra.metadata.IMetadataProvider;
-import edu.uci.ics.hyracks.algebricks.core.algebra.operators.logical.IOperatorSchema;
-import edu.uci.ics.hyracks.algebricks.core.jobgen.impl.JobGenContext;
-import edu.uci.ics.hyracks.algebricks.data.IAWriterFactory;
-import edu.uci.ics.hyracks.algebricks.data.IPrinterFactory;
-import edu.uci.ics.hyracks.algebricks.data.IResultSerializerFactoryProvider;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IPushRuntimeFactory;
-import edu.uci.ics.hyracks.algebricks.runtime.serializer.ResultSerializerFactoryProvider;
-import edu.uci.ics.hyracks.algebricks.runtime.writers.PrinterBasedWriterFactory;
-import edu.uci.ics.hyracks.api.dataflow.IOperatorDescriptor;
-import edu.uci.ics.hyracks.api.dataflow.value.IResultSerializerFactory;
-import edu.uci.ics.hyracks.api.dataflow.value.ISerializerDeserializer;
-import edu.uci.ics.hyracks.api.dataflow.value.RecordDescriptor;
-import edu.uci.ics.hyracks.api.dataset.ResultSetId;
-import edu.uci.ics.hyracks.api.job.JobSpecification;
-import edu.uci.ics.hyracks.dataflow.std.result.ResultWriterOperatorDescriptor;
+import org.apache.hyracks.algebricks.common.constraints.AlgebricksAbsolutePartitionConstraint;
+import org.apache.hyracks.algebricks.common.constraints.AlgebricksPartitionConstraint;
+import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
+import org.apache.hyracks.algebricks.common.utils.Pair;
+import org.apache.hyracks.algebricks.core.algebra.base.ILogicalExpression;
+import org.apache.hyracks.algebricks.core.algebra.base.LogicalVariable;
+import org.apache.hyracks.algebricks.core.algebra.expressions.IVariableTypeEnvironment;
+import org.apache.hyracks.algebricks.core.algebra.functions.FunctionIdentifier;
+import org.apache.hyracks.algebricks.core.algebra.functions.IFunctionInfo;
+import org.apache.hyracks.algebricks.core.algebra.metadata.IDataSink;
+import org.apache.hyracks.algebricks.core.algebra.metadata.IDataSource;
+import org.apache.hyracks.algebricks.core.algebra.metadata.IDataSourceIndex;
+import org.apache.hyracks.algebricks.core.algebra.metadata.IMetadataProvider;
+import org.apache.hyracks.algebricks.core.algebra.operators.logical.IOperatorSchema;
+import org.apache.hyracks.algebricks.core.jobgen.impl.JobGenContext;
+import org.apache.hyracks.algebricks.data.IAWriterFactory;
+import org.apache.hyracks.algebricks.data.IPrinterFactory;
+import org.apache.hyracks.algebricks.data.IResultSerializerFactoryProvider;
+import org.apache.hyracks.algebricks.runtime.base.IPushRuntimeFactory;
+import org.apache.hyracks.algebricks.runtime.serializer.ResultSerializerFactoryProvider;
+import org.apache.hyracks.algebricks.runtime.writers.PrinterBasedWriterFactory;
+import org.apache.hyracks.api.dataflow.IOperatorDescriptor;
+import org.apache.hyracks.api.dataflow.value.IResultSerializerFactory;
+import org.apache.hyracks.api.dataflow.value.ISerializerDeserializer;
+import org.apache.hyracks.api.dataflow.value.RecordDescriptor;
+import org.apache.hyracks.api.dataset.ResultSetId;
+import org.apache.hyracks.api.job.JobSpecification;
+import org.apache.hyracks.dataflow.std.result.ResultWriterOperatorDescriptor;
public class VXQueryMetadataProvider implements IMetadataProvider<String, String> {
private final String[] nodeList;
@@ -229,4 +229,4 @@ public class VXQueryMetadataProvider implements IMetadataProvider<String, String
throw new UnsupportedOperationException();
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/result/ResultUtils.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/result/ResultUtils.java b/vxquery-core/src/main/java/org/apache/vxquery/result/ResultUtils.java
index 923706e..ae7f5a1 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/result/ResultUtils.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/result/ResultUtils.java
@@ -17,9 +17,9 @@ package org.apache.vxquery.result;
import java.io.IOException;
import java.nio.ByteBuffer;
-import edu.uci.ics.hyracks.api.comm.IFrameTupleAccessor;
-import edu.uci.ics.hyracks.api.exceptions.HyracksDataException;
-import edu.uci.ics.hyracks.dataflow.common.comm.util.ByteBufferInputStream;
+import org.apache.hyracks.api.comm.IFrameTupleAccessor;
+import org.apache.hyracks.api.exceptions.HyracksDataException;
+import org.apache.hyracks.dataflow.common.comm.util.ByteBufferInputStream;
public class ResultUtils {
public static String getStringFromBuffer(ByteBuffer buffer, IFrameTupleAccessor fta) throws HyracksDataException {
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/factory/hashfunction/VXQueryRawBinaryHashFunctionFactory.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/factory/hashfunction/VXQueryRawBinaryHashFunctionFactory.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/factory/hashfunction/VXQueryRawBinaryHashFunctionFactory.java
index 4f9437b..5ec14ee 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/factory/hashfunction/VXQueryRawBinaryHashFunctionFactory.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/factory/hashfunction/VXQueryRawBinaryHashFunctionFactory.java
@@ -16,9 +16,9 @@
*/
package org.apache.vxquery.runtime.factory.hashfunction;
-import edu.uci.ics.hyracks.api.dataflow.value.IBinaryHashFunction;
-import edu.uci.ics.hyracks.api.dataflow.value.IBinaryHashFunctionFactory;
-import edu.uci.ics.hyracks.data.std.accessors.MurmurHash3BinaryHashFunctionFamily;
+import org.apache.hyracks.api.dataflow.value.IBinaryHashFunction;
+import org.apache.hyracks.api.dataflow.value.IBinaryHashFunctionFactory;
+import org.apache.hyracks.data.std.accessors.MurmurHash3BinaryHashFunctionFamily;
public class VXQueryRawBinaryHashFunctionFactory implements IBinaryHashFunctionFactory {
private static final long serialVersionUID = 1L;
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/aggregate/AbstractMaxMinAggregateEvaluatorFactory.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/aggregate/AbstractMaxMinAggregateEvaluatorFactory.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/aggregate/AbstractMaxMinAggregateEvaluatorFactory.java
index ba31783..325fb71 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/aggregate/AbstractMaxMinAggregateEvaluatorFactory.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/aggregate/AbstractMaxMinAggregateEvaluatorFactory.java
@@ -31,12 +31,12 @@ import org.apache.vxquery.runtime.functions.base.AbstractTaggedValueArgumentAggr
import org.apache.vxquery.runtime.functions.comparison.AbstractValueComparisonOperation;
import org.apache.vxquery.runtime.functions.util.FunctionHelper;
-import edu.uci.ics.hyracks.algebricks.common.exceptions.AlgebricksException;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IAggregateEvaluator;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluator;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
-import edu.uci.ics.hyracks.data.std.api.IPointable;
-import edu.uci.ics.hyracks.data.std.util.ArrayBackedValueStorage;
+import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
+import org.apache.hyracks.algebricks.runtime.base.IAggregateEvaluator;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluator;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
+import org.apache.hyracks.data.std.api.IPointable;
+import org.apache.hyracks.data.std.util.ArrayBackedValueStorage;
public abstract class AbstractMaxMinAggregateEvaluatorFactory extends
AbstractTaggedValueArgumentAggregateEvaluatorFactory {
@@ -110,4 +110,4 @@ public abstract class AbstractMaxMinAggregateEvaluatorFactory extends
}
protected abstract AbstractValueComparisonOperation createValueComparisonOperation();
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/aggregate/AbstractMaxMinScalarEvaluatorFactory.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/aggregate/AbstractMaxMinScalarEvaluatorFactory.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/aggregate/AbstractMaxMinScalarEvaluatorFactory.java
index b2aa0b9..82d938e 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/aggregate/AbstractMaxMinScalarEvaluatorFactory.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/aggregate/AbstractMaxMinScalarEvaluatorFactory.java
@@ -28,12 +28,12 @@ import org.apache.vxquery.runtime.functions.base.AbstractTaggedValueArgumentScal
import org.apache.vxquery.runtime.functions.comparison.AbstractValueComparisonOperation;
import org.apache.vxquery.runtime.functions.util.FunctionHelper;
-import edu.uci.ics.hyracks.algebricks.common.exceptions.AlgebricksException;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluator;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
-import edu.uci.ics.hyracks.api.context.IHyracksTaskContext;
-import edu.uci.ics.hyracks.data.std.api.IPointable;
-import edu.uci.ics.hyracks.data.std.primitive.VoidPointable;
+import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluator;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
+import org.apache.hyracks.api.context.IHyracksTaskContext;
+import org.apache.hyracks.data.std.api.IPointable;
+import org.apache.hyracks.data.std.primitive.VoidPointable;
public abstract class AbstractMaxMinScalarEvaluatorFactory extends AbstractTaggedValueArgumentScalarEvaluatorFactory {
private static final long serialVersionUID = 1L;
@@ -87,4 +87,4 @@ public abstract class AbstractMaxMinScalarEvaluatorFactory extends AbstractTagge
}
protected abstract AbstractValueComparisonOperation createValueComparisonOperation();
-}
\ No newline at end of file
+}
[30/50] [abbrv] vxquery git commit: Switched the xqts fiel to use
version sort order. Easier to read.
Posted by sj...@apache.org.
Switched the xqts fiel to use version sort order. Easier to read.
Project: http://git-wip-us.apache.org/repos/asf/vxquery/repo
Commit: http://git-wip-us.apache.org/repos/asf/vxquery/commit/43852a54
Tree: http://git-wip-us.apache.org/repos/asf/vxquery/tree/43852a54
Diff: http://git-wip-us.apache.org/repos/asf/vxquery/diff/43852a54
Branch: refs/heads/site
Commit: 43852a5476ccb33bf9ee58e27468b400cc169d6a
Parents: bf8ab73
Author: Preston Carman <pr...@apache.org>
Authored: Fri Mar 4 11:10:03 2016 -0800
Committer: Preston Carman <pr...@apache.org>
Committed: Fri Mar 4 11:10:03 2016 -0800
----------------------------------------------------------------------
.../apt/development_update_xqts_results.apt | 4 +-
src/site/apt/user_running_tests.apt | 22 +-
.../compiler/rewriter/RewriteRuleset.java | 10 +-
vxquery-xtest/results/xqts.txt | 13440 ++++++++---------
4 files changed, 6739 insertions(+), 6737 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/vxquery/blob/43852a54/src/site/apt/development_update_xqts_results.apt
----------------------------------------------------------------------
diff --git a/src/site/apt/development_update_xqts_results.apt b/src/site/apt/development_update_xqts_results.apt
index 115a178..50b36d8 100644
--- a/src/site/apt/development_update_xqts_results.apt
+++ b/src/site/apt/development_update_xqts_results.apt
@@ -15,7 +15,7 @@
Update the XQTS Results
- VXQuery stores the latest XQTS result for the last release.
+ VXQuery stores the latest XQTS result for the last release.
The file can be used to verify that all the previous test still passing.
The following instructions show how to update the XQTS results file.
@@ -45,7 +45,7 @@ sh ./vxquery-xtest/target/appassembler/bin/xtest -catalog vxquery-xtest/test-sui
* Sort the results so they can be compared with previous results.
----------------------------------------
-sort vxquery-xtest/results/xqts_temp.txt --output=vxquery-xtest/results/xqts.txt
+sort -V vxquery-xtest/results/xqts_temp.txt --output=vxquery-xtest/results/xqts.txt
----------------------------------------
* Clean up (remove) the temporary results files.
http://git-wip-us.apache.org/repos/asf/vxquery/blob/43852a54/src/site/apt/user_running_tests.apt
----------------------------------------------------------------------
diff --git a/src/site/apt/user_running_tests.apt b/src/site/apt/user_running_tests.apt
index d5e97b2..c117785 100644
--- a/src/site/apt/user_running_tests.apt
+++ b/src/site/apt/user_running_tests.apt
@@ -45,7 +45,7 @@ xtest.bat
-v : Verbose
-xmlreport VAL : XML Report output file
----------------------------------------
-
+
* Java Options
The command can be run with Java options to increase the amount of memory to one gigabyte.
@@ -55,30 +55,30 @@ xtest.bat
----------------------------------------
JAVA_OPTS="-Xmx1024m -Djava.util.logging.config.file=/path/to/logging.properties"
----------------------------------------
-
+
* VXQuery Testing Options
* VXQuery Test Suite
The VXQuery test suite focuses on parallel processing tests used in our weather benchmark.
-
+
----------------------------------------
sh ./vxquery-xtest/target/appassembler/bin/xtest -catalog vxquery-xtest/src/test/resources/VXQueryCatalog.xml -htmlreport /tmp/vxquery_report.html
----------------------------------------
* view the results at {{{file:///tmp/vxquery_report.html}file:///tmp/vxquery_report.html}}.
-
+
* XQTS (XQuery Test Suite)
To run the complete XQTS on VXQuery.
-
- * Create a folder to hold the XQTS.
+
+ * Create a folder to hold the XQTS.
If you use "vxquery-xtest/test-suites/xqts", then maven will utilize the XQTS to verify VXQuery's passing functions during the build process.
-
+
----------------------------------------
$ mkdir -p vxquery-xtest/test-suites
$ cd vxquery-xtest/test-suites
----------------------------------------
-
+
* Get the archive {{{http://dev.w3.org/2006/xquery-test-suite/PublicPagesStagingArea/XQTS_1_0_3.zip}XQTS_1_0_3.zip}} (e.g. using wget),
----------------------------------------
@@ -88,10 +88,7 @@ $ wget http://dev.w3.org/2006/xquery-test-suite/PublicPagesStagingArea/XQTS_1_0_
* unpack it,
----------------------------------------
-$ mkdir xqts
-$ cd xqts
-$ unzip ../XQTS_1_0_3.zip
-$ cd ..
+$ unzip -d xqts XQTS_1_0_3.zip
----------------------------------------
* go back to the project root,
@@ -123,4 +120,3 @@ sh ./vxquery-xtest/target/appassembler/bin/xtest -catalog vxquery-xtest/test-sui
* view the results at {{{file:///tmp/previous_report.html}file:///tmp/previous_report.html}}.
-
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/vxquery/blob/43852a54/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/RewriteRuleset.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/RewriteRuleset.java b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/RewriteRuleset.java
index 6f09543..fd20465 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/RewriteRuleset.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/RewriteRuleset.java
@@ -90,6 +90,7 @@ import org.apache.hyracks.algebricks.rewriter.rules.SubplanOutOfGroupRule;
public class RewriteRuleset {
/**
* Optimizations specific to XQuery.
+ *
* @return List of algebraic rewrite rules.
*/
public final static List<IAlgebraicRewriteRule> buildPathStepNormalizationRuleCollection() {
@@ -147,6 +148,7 @@ public class RewriteRuleset {
/**
* Optimizations specific to XQuery.
+ *
* @return List of algebraic rewrite rules.
*/
public final static List<IAlgebraicRewriteRule> buildXQueryNormalizationRuleCollection() {
@@ -172,6 +174,7 @@ public class RewriteRuleset {
/**
* Remove expressions known to be redundant.
+ *
* @return List of algebraic rewrite rules.
*/
public final static List<IAlgebraicRewriteRule> buildInlineRedundantExpressionNormalizationRuleCollection() {
@@ -191,6 +194,7 @@ public class RewriteRuleset {
/**
* When a nested data sources exist, convert the plan to use the join operator.
+ *
* @return List of algebraic rewrite rules.
*/
public final static List<IAlgebraicRewriteRule> buildNestedDataSourceRuleCollection() {
@@ -215,6 +219,7 @@ public class RewriteRuleset {
/**
* Unnest more complex structures.
+ *
* @return List of algebraic rewrite rules.
*/
public final static List<IAlgebraicRewriteRule> buildUnnestingRuleCollection() {
@@ -306,6 +311,7 @@ public class RewriteRuleset {
physicalPlanRewrites.add(new PullSelectOutOfEqJoin());
physicalPlanRewrites.add(new PushFunctionsOntoEqJoinBranches());
physicalPlanRewrites.add(new SetAlgebricksPhysicalOperatorsRule());
+ physicalPlanRewrites.add(new SetExecutionModeRule());
physicalPlanRewrites.add(new EnforceStructuralPropertiesRule());
physicalPlanRewrites.add(new PushProjectDownRule());
physicalPlanRewrites.add(new CopyLimitDownRule());
@@ -322,8 +328,8 @@ public class RewriteRuleset {
public final static List<IAlgebraicRewriteRule> prepareForJobGenRuleCollection() {
List<IAlgebraicRewriteRule> prepareForJobGenRewrites = new LinkedList<IAlgebraicRewriteRule>();
prepareForJobGenRewrites.add(new ConvertFromAlgebricksExpressionsRule());
- prepareForJobGenRewrites.add(new IsolateHyracksOperatorsRule(
- HeuristicOptimizer.hyraxOperatorsBelowWhichJobGenIsDisabled));
+ prepareForJobGenRewrites
+ .add(new IsolateHyracksOperatorsRule(HeuristicOptimizer.hyraxOperatorsBelowWhichJobGenIsDisabled));
prepareForJobGenRewrites.add(new ExtractCommonOperatorsRule());
// Re-infer all types, so that, e.g., the effect of not-is-null is
// propagated.
[39/50] [abbrv] vxquery git commit: Improved the sequence test to
correctly identify the item types.
Posted by sj...@apache.org.
Improved the sequence test to correctly identify the item types.
Project: http://git-wip-us.apache.org/repos/asf/vxquery/repo
Commit: http://git-wip-us.apache.org/repos/asf/vxquery/commit/015c5f6c
Tree: http://git-wip-us.apache.org/repos/asf/vxquery/tree/015c5f6c
Diff: http://git-wip-us.apache.org/repos/asf/vxquery/diff/015c5f6c
Branch: refs/heads/site
Commit: 015c5f6ca6bc58db1930da8dd4cbe506d51232ca
Parents: 7d7ab00
Author: Preston Carman <pr...@apache.org>
Authored: Tue May 17 07:14:05 2016 -0700
Committer: Preston Carman <pr...@apache.org>
Committed: Tue May 17 07:14:05 2016 -0700
----------------------------------------------------------------------
.../datamodel/AbstractPointableTest.java | 11 +++++++++-
.../vxquery/datamodel/SequenceByteTest.java | 23 +++++++++++++++-----
2 files changed, 27 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/vxquery/blob/015c5f6c/vxquery-core/src/test/java/org/apache/vxquery/datamodel/AbstractPointableTest.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/test/java/org/apache/vxquery/datamodel/AbstractPointableTest.java b/vxquery-core/src/test/java/org/apache/vxquery/datamodel/AbstractPointableTest.java
index 9343465..fa4e831 100644
--- a/vxquery-core/src/test/java/org/apache/vxquery/datamodel/AbstractPointableTest.java
+++ b/vxquery-core/src/test/java/org/apache/vxquery/datamodel/AbstractPointableTest.java
@@ -28,16 +28,25 @@ public class AbstractPointableTest {
protected void getTaggedValuePointable(Object value, IPointable result) throws IOException {
int start = abvsInput.getLength();
- if (value instanceof java.lang.Long) {
+ if (value instanceof java.lang.Integer) {
+ writeInteger((Integer) value, abvsInput.getDataOutput());
+ } else if (value instanceof java.lang.Long) {
writeLong((Long) value, abvsInput.getDataOutput());
} else if (value instanceof java.lang.Double) {
writeDouble((Double) value, abvsInput.getDataOutput());
} else if (value instanceof java.lang.String) {
writeString((String) value, abvsInput.getDataOutput());
+ } else {
+ throw new IOException("Unknown object type for tagged value pointable.");
}
result.set(abvsInput.getByteArray(), start, abvsInput.getLength() - start);
}
+ protected void writeInteger(Integer value, DataOutput dOut) throws IOException {
+ dOut.write(ValueTag.XS_INT_TAG);
+ dOut.writeInt(value);
+ }
+
protected void writeLong(Long value, DataOutput dOut) throws IOException {
dOut.write(ValueTag.XS_LONG_TAG);
dOut.writeLong(value);
http://git-wip-us.apache.org/repos/asf/vxquery/blob/015c5f6c/vxquery-core/src/test/java/org/apache/vxquery/datamodel/SequenceByteTest.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/test/java/org/apache/vxquery/datamodel/SequenceByteTest.java b/vxquery-core/src/test/java/org/apache/vxquery/datamodel/SequenceByteTest.java
index 776b97a..54cf105 100644
--- a/vxquery-core/src/test/java/org/apache/vxquery/datamodel/SequenceByteTest.java
+++ b/vxquery-core/src/test/java/org/apache/vxquery/datamodel/SequenceByteTest.java
@@ -29,10 +29,9 @@ import junit.framework.Assert;
/**
* The sequence byte test covers empty sequences, single items and multi-item sequences.
- *
* 1. Empty sequence constant
* 2. Empty sequence - {}
- * 3. Single item - "one" (XQuery single item sequences are just the item.)
+ * 3. Single item - 1l (XQuery single item sequences are just the item.)
* 4. Many items - {1, 2.0, "three"}
*/
public class SequenceByteTest extends AbstractPointableTest {
@@ -85,7 +84,7 @@ public class SequenceByteTest extends AbstractPointableTest {
// Build test sequence
try {
sb.reset(abvsResult);
- getTaggedValuePointable("one", tvp1);
+ getTaggedValuePointable(1l, tvp1);
sb.addItem(tvp1);
sb.finish();
} catch (IOException e) {
@@ -94,8 +93,8 @@ public class SequenceByteTest extends AbstractPointableTest {
tvp.set(abvsResult);
// Check results.
- if (tvp.getTag() != ValueTag.XS_STRING_TAG) {
- Assert.fail("Type tag is incorrect. Expected: " + ValueTag.XS_STRING_TAG + " Got: " + tvp.getTag());
+ if (tvp.getTag() != ValueTag.XS_LONG_TAG) {
+ Assert.fail("Type tag is incorrect. Expected: " + ValueTag.XS_LONG_TAG + " Got: " + tvp.getTag());
}
if (!FunctionHelper.arraysEqual(tvp, tvp1)) {
Assert.fail("Item value is incorrect.");
@@ -129,15 +128,27 @@ public class SequenceByteTest extends AbstractPointableTest {
Assert.fail("Sequence size is incorrect. Expected: 3 Got: " + sp.getEntryCount());
}
sp.getEntry(0, tvp);
+ if (tvp.getTag() != ValueTag.XS_INT_TAG) {
+ Assert.fail("Sequence item one type tag is incorrect. Expected: " + ValueTag.XS_INT_TAG + " Got: "
+ + tvp.getTag());
+ }
if (!FunctionHelper.arraysEqual(tvp, tvp1)) {
- Assert.fail("Sequence item one is incorrect. Expected: " + ValueTag.XS_LONG_TAG + " Got: " + tvp.getTag());
+ Assert.fail("Sequence item one is incorrect. Expected: " + ValueTag.XS_INT_TAG + " Got: " + tvp.getTag());
}
sp.getEntry(1, tvp);
+ if (tvp.getTag() != ValueTag.XS_DOUBLE_TAG) {
+ Assert.fail("Sequence item two type tag is incorrect. Expected: " + ValueTag.XS_DOUBLE_TAG + " Got: "
+ + tvp.getTag());
+ }
if (!FunctionHelper.arraysEqual(tvp, tvp2)) {
Assert.fail(
"Sequence item two is incorrect. Expected: " + ValueTag.XS_DOUBLE_TAG + " Got: " + tvp.getTag());
}
sp.getEntry(2, tvp);
+ if (tvp.getTag() != ValueTag.XS_STRING_TAG) {
+ Assert.fail("Sequence item three type tag is incorrect. Expected: " + ValueTag.XS_STRING_TAG + " Got: "
+ + tvp.getTag());
+ }
if (!FunctionHelper.arraysEqual(tvp, tvp3)) {
Assert.fail(
"Sequence item three is incorrect. Expected: " + ValueTag.XS_STRING_TAG + " Got: " + tvp.getTag());
[06/50] [abbrv] vxquery git commit: Unnesting rule and code additions
to support XMark Query 8.
Posted by sj...@apache.org.
http://git-wip-us.apache.org/repos/asf/vxquery/blob/7fc0d93b/vxquery-xtest/results/xqts.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/results/xqts.txt b/vxquery-xtest/results/xqts.txt
index 8b76ab6..8054c36 100644
--- a/vxquery-xtest/results/xqts.txt
+++ b/vxquery-xtest/results/xqts.txt
@@ -3,7 +3,7 @@ Appendices/Annex-E//annex-2, EXPECTED_RESULT_GOT_ERROR
Appendices/Annex-E//annex-3, EXPECTED_RESULT_GOT_ERROR
Appendices/Annex-E//annex-4, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
Appendices/Annex-E//annex-5, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
-Appendices/Annex-E//annex-6, EXPECTED_RESULT_GOT_FAILURE
+Appendices/Annex-E//annex-6, EXPECTED_RESULT_GOT_ERROR
Appendices/Annex-E//annex-7, EXPECTED_RESULT_GOT_ERROR
Appendices/Annex-E//annex-8, EXPECTED_RESULT_GOT_ERROR
Appendices/Appendix-A4//appendix-A4-1, EXPECTED_RESULT_GOT_SAME_RESULT
@@ -62,7 +62,7 @@ CondExpr//K2-CondExpr-6, EXPECTED_ERROR_GOT_SAME_ERROR
CondExpr//K2-CondExpr-7, EXPECTED_RESULT_GOT_SAME_RESULT
Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-1, EXPECTED_ERROR_GOT_SAME_ERROR
Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-10, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-11, EXPECTED_RESULT_GOT_FAILURE
+Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-11, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-12, EXPECTED_ERROR_GOT_SAME_ERROR
Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-13, EXPECTED_ERROR_GOT_SAME_ERROR
Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-14, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
@@ -312,11 +312,11 @@ Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-45, EXPECTED_RES
Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-46, EXPECTED_RESULT_GOT_FAILURE
Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-47, EXPECTED_RESULT_GOT_FAILURE
Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-48, EXPECTED_ERROR_GOT_SAME_ERROR
-Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-49, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-49, EXPECTED_RESULT_GOT_SAME_RESULT
Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-5, EXPECTED_RESULT_GOT_SAME_RESULT
-Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-50, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-50, EXPECTED_RESULT_GOT_SAME_RESULT
Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-51, EXPECTED_ERROR_GOT_SAME_ERROR
-Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-52, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-52, EXPECTED_RESULT_GOT_SAME_RESULT
Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-53, EXPECTED_ERROR_GOT_SAME_ERROR
Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-54, EXPECTED_ERROR_GOT_SAME_ERROR
Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-55, EXPECTED_ERROR_GOT_SAME_ERROR
@@ -571,9 +571,9 @@ Construct/DirectConOther//K2-DirectConOther-70, EXPECTED_RESULT_GOT_DIFFERENT_RE
Construct/DirectConOther//K2-DirectConOther-71, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Construct/DirectConOther//K2-DirectConOther-8, EXPECTED_ERROR_GOT_SAME_ERROR
Construct/DirectConOther//K2-DirectConOther-9, EXPECTED_ERROR_GOT_SAME_ERROR
-ErrorsAndOptimization//errors-and-optimization-1, EXPECTED_RESULT_GOT_ERROR
+ErrorsAndOptimization//errors-and-optimization-1, EXPECTED_RESULT_GOT_SAME_RESULT
ErrorsAndOptimization//errors-and-optimization-2, EXPECTED_ERROR_GOT_SAME_ERROR
-ErrorsAndOptimization//errors-and-optimization-3, EXPECTED_RESULT_GOT_FAILURE
+ErrorsAndOptimization//errors-and-optimization-3, EXPECTED_RESULT_GOT_ERROR
ErrorsAndOptimization//errors-and-optimization-4, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
ErrorsAndOptimization//errors-and-optimization-5, EXPECTED_ERROR_GOT_SAME_ERROR
ErrorsAndOptimization//errors-and-optimization-6, EXPECTED_ERROR_GOT_SAME_ERROR
@@ -598,16 +598,16 @@ Expressions/CondExpr//CondExpr018, EXPECTED_RESULT_GOT_FAILURE
Expressions/CondExpr//CondExpr019, EXPECTED_ERROR_GOT_SAME_ERROR
Expressions/CondExpr//CondExpr020, EXPECTED_RESULT_GOT_FAILURE
Expressions/CondExpr//CondExpr021, EXPECTED_RESULT_GOT_FAILURE
-Expressions/CondExpr//CondExpr022, EXPECTED_RESULT_GOT_ERROR
+Expressions/CondExpr//CondExpr022, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/CondExpr//K-CondExpr-1, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/CondExpr//K-CondExpr-10, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/CondExpr//K-CondExpr-11, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/CondExpr//K-CondExpr-12, EXPECTED_RESULT_GOT_FAILURE
+Expressions/CondExpr//K-CondExpr-12, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/CondExpr//K-CondExpr-2, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/CondExpr//K-CondExpr-3, EXPECTED_RESULT_GOT_FAILURE
-Expressions/CondExpr//K-CondExpr-4, EXPECTED_RESULT_GOT_FAILURE
-Expressions/CondExpr//K-CondExpr-5, EXPECTED_RESULT_GOT_FAILURE
-Expressions/CondExpr//K-CondExpr-6, EXPECTED_RESULT_GOT_FAILURE
+Expressions/CondExpr//K-CondExpr-3, EXPECTED_RESULT_GOT_SAME_RESULT
+Expressions/CondExpr//K-CondExpr-4, EXPECTED_RESULT_GOT_SAME_RESULT
+Expressions/CondExpr//K-CondExpr-5, EXPECTED_RESULT_GOT_SAME_RESULT
+Expressions/CondExpr//K-CondExpr-6, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/CondExpr//K-CondExpr-7, EXPECTED_ERROR_GOT_SAME_ERROR
Expressions/CondExpr//K-CondExpr-8, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/CondExpr//K-CondExpr-9, EXPECTED_RESULT_GOT_SAME_RESULT
@@ -867,13 +867,13 @@ Expressions/Construct/DirectConElem/DirectConElemAttr//Constr-attr-nsprein-2, EX
Expressions/Construct/DirectConElem/DirectConElemAttr//Constr-attr-parent-1, EXPECTED_RESULT_GOT_FAILURE
Expressions/Construct/DirectConElem/DirectConElemAttr//Constr-attr-syntax-1, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Construct/DirectConElem/DirectConElemAttr//Constr-attr-syntax-10, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/Construct/DirectConElem/DirectConElemAttr//Constr-attr-syntax-2, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+Expressions/Construct/DirectConElem/DirectConElemAttr//Constr-attr-syntax-2, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Construct/DirectConElem/DirectConElemAttr//Constr-attr-syntax-3, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Construct/DirectConElem/DirectConElemAttr//Constr-attr-syntax-4, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Expressions/Construct/DirectConElem/DirectConElemAttr//Constr-attr-syntax-5, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Construct/DirectConElem/DirectConElemAttr//Constr-attr-syntax-6, EXPECTED_ERROR_GOT_SAME_ERROR
Expressions/Construct/DirectConElem/DirectConElemAttr//Constr-attr-syntax-7, EXPECTED_ERROR_GOT_SAME_ERROR
-Expressions/Construct/DirectConElem/DirectConElemAttr//Constr-attr-syntax-8, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+Expressions/Construct/DirectConElem/DirectConElemAttr//Constr-attr-syntax-8, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Construct/DirectConElem/DirectConElemAttr//Constr-attr-syntax-9, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Construct/DirectConElem/DirectConElemAttr//Constr-attr-ws-1, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Expressions/Construct/DirectConElem/DirectConElemAttr//Constr-attr-ws-2, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
@@ -1088,26 +1088,26 @@ Expressions/ContextExpr/ExternalContextExpr//externalcontextitem-7, EXPECTED_RES
Expressions/ContextExpr/ExternalContextExpr//externalcontextitem-8, EXPECTED_RESULT_GOT_FAILURE
Expressions/ContextExpr/ExternalContextExpr//externalcontextitem-9, EXPECTED_RESULT_GOT_FAILURE
Expressions/ContextExpr/InternalContextExpr//internalcontextitem-1, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
-Expressions/ContextExpr/InternalContextExpr//internalcontextitem-10, EXPECTED_RESULT_GOT_FAILURE
-Expressions/ContextExpr/InternalContextExpr//internalcontextitem-11, EXPECTED_RESULT_GOT_FAILURE
-Expressions/ContextExpr/InternalContextExpr//internalcontextitem-12, EXPECTED_RESULT_GOT_FAILURE
-Expressions/ContextExpr/InternalContextExpr//internalcontextitem-13, EXPECTED_RESULT_GOT_FAILURE
-Expressions/ContextExpr/InternalContextExpr//internalcontextitem-14, EXPECTED_RESULT_GOT_FAILURE
-Expressions/ContextExpr/InternalContextExpr//internalcontextitem-15, EXPECTED_RESULT_GOT_FAILURE
-Expressions/ContextExpr/InternalContextExpr//internalcontextitem-16, EXPECTED_RESULT_GOT_FAILURE
-Expressions/ContextExpr/InternalContextExpr//internalcontextitem-17, EXPECTED_RESULT_GOT_FAILURE
-Expressions/ContextExpr/InternalContextExpr//internalcontextitem-18, EXPECTED_RESULT_GOT_FAILURE
-Expressions/ContextExpr/InternalContextExpr//internalcontextitem-19, EXPECTED_RESULT_GOT_FAILURE
-Expressions/ContextExpr/InternalContextExpr//internalcontextitem-2, EXPECTED_RESULT_GOT_FAILURE
-Expressions/ContextExpr/InternalContextExpr//internalcontextitem-20, EXPECTED_RESULT_GOT_FAILURE
-Expressions/ContextExpr/InternalContextExpr//internalcontextitem-21, EXPECTED_RESULT_GOT_FAILURE
-Expressions/ContextExpr/InternalContextExpr//internalcontextitem-3, EXPECTED_RESULT_GOT_FAILURE
-Expressions/ContextExpr/InternalContextExpr//internalcontextitem-4, EXPECTED_RESULT_GOT_FAILURE
-Expressions/ContextExpr/InternalContextExpr//internalcontextitem-5, EXPECTED_RESULT_GOT_FAILURE
-Expressions/ContextExpr/InternalContextExpr//internalcontextitem-6, EXPECTED_RESULT_GOT_FAILURE
-Expressions/ContextExpr/InternalContextExpr//internalcontextitem-7, EXPECTED_RESULT_GOT_FAILURE
-Expressions/ContextExpr/InternalContextExpr//internalcontextitem-8, EXPECTED_RESULT_GOT_FAILURE
-Expressions/ContextExpr/InternalContextExpr//internalcontextitem-9, EXPECTED_ERROR_GOT_FAILURE
+Expressions/ContextExpr/InternalContextExpr//internalcontextitem-10, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+Expressions/ContextExpr/InternalContextExpr//internalcontextitem-11, EXPECTED_RESULT_GOT_SAME_RESULT
+Expressions/ContextExpr/InternalContextExpr//internalcontextitem-12, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+Expressions/ContextExpr/InternalContextExpr//internalcontextitem-13, EXPECTED_RESULT_GOT_SAME_RESULT
+Expressions/ContextExpr/InternalContextExpr//internalcontextitem-14, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+Expressions/ContextExpr/InternalContextExpr//internalcontextitem-15, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+Expressions/ContextExpr/InternalContextExpr//internalcontextitem-16, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+Expressions/ContextExpr/InternalContextExpr//internalcontextitem-17, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+Expressions/ContextExpr/InternalContextExpr//internalcontextitem-18, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+Expressions/ContextExpr/InternalContextExpr//internalcontextitem-19, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+Expressions/ContextExpr/InternalContextExpr//internalcontextitem-2, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+Expressions/ContextExpr/InternalContextExpr//internalcontextitem-20, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+Expressions/ContextExpr/InternalContextExpr//internalcontextitem-21, EXPECTED_RESULT_GOT_SAME_RESULT
+Expressions/ContextExpr/InternalContextExpr//internalcontextitem-3, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+Expressions/ContextExpr/InternalContextExpr//internalcontextitem-4, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+Expressions/ContextExpr/InternalContextExpr//internalcontextitem-5, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+Expressions/ContextExpr/InternalContextExpr//internalcontextitem-6, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+Expressions/ContextExpr/InternalContextExpr//internalcontextitem-7, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+Expressions/ContextExpr/InternalContextExpr//internalcontextitem-8, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+Expressions/ContextExpr/InternalContextExpr//internalcontextitem-9, EXPECTED_ERROR_GOT_RESULT
Expressions/ExtensionExpression//K-ExtensionExpression-1, EXPECTED_ERROR_GOT_SAME_ERROR
Expressions/ExtensionExpression//K-ExtensionExpression-2, EXPECTED_ERROR_GOT_SAME_ERROR
Expressions/ExtensionExpression//K-ExtensionExpression-3, EXPECTED_RESULT_GOT_SAME_RESULT
@@ -1325,8 +1325,8 @@ Expressions/FLWORExpr/LetExpr//LetExpr007, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/FLWORExpr/LetExpr//LetExpr008, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/FLWORExpr/LetExpr//LetExpr009, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/FLWORExpr/LetExpr//LetExpr010, EXPECTED_ERROR_GOT_SAME_ERROR
-Expressions/FLWORExpr/LetExpr//LetExpr011, EXPECTED_RESULT_GOT_FAILURE
-Expressions/FLWORExpr/LetExpr//LetExpr012, EXPECTED_RESULT_GOT_FAILURE
+Expressions/FLWORExpr/LetExpr//LetExpr011, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+Expressions/FLWORExpr/LetExpr//LetExpr012, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Expressions/FLWORExpr/LetExpr//LetExpr013, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/FLWORExpr/LetExpr//LetExpr014, EXPECTED_ERROR_GOT_SAME_ERROR
Expressions/FLWORExpr/LetExpr//LetExpr015, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
@@ -1525,7 +1525,7 @@ Expressions/FLWORExpr/ReturnExpr//ReturnExpr003, EXPECTED_RESULT_GOT_FAILURE
Expressions/FLWORExpr/ReturnExpr//ReturnExpr004, EXPECTED_RESULT_GOT_FAILURE
Expressions/FLWORExpr/ReturnExpr//ReturnExpr005, EXPECTED_RESULT_GOT_FAILURE
Expressions/FLWORExpr/ReturnExpr//ReturnExpr006, EXPECTED_RESULT_GOT_FAILURE
-Expressions/FLWORExpr/ReturnExpr//ReturnExpr007, EXPECTED_RESULT_GOT_FAILURE
+Expressions/FLWORExpr/ReturnExpr//ReturnExpr007, EXPECTED_RESULT_GOT_ERROR
Expressions/FLWORExpr/ReturnExpr//ReturnExpr008, EXPECTED_RESULT_GOT_FAILURE
Expressions/FLWORExpr/ReturnExpr//ReturnExpr009, EXPECTED_RESULT_GOT_FAILURE
Expressions/FLWORExpr/ReturnExpr//ReturnExpr010, EXPECTED_ERROR_GOT_FAILURE
@@ -1540,16 +1540,16 @@ Expressions/FLWORExpr/ReturnExpr//ReturnExpr018, EXPECTED_RESULT_GOT_FAILURE
Expressions/FLWORExpr/ReturnExpr//ReturnExpr019, EXPECTED_ERROR_GOT_SAME_ERROR
Expressions/FLWORExpr/ReturnExpr//ReturnExpr020, EXPECTED_RESULT_GOT_FAILURE
Expressions/FLWORExpr/WhereExpr//K-WhereExpr-1, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/FLWORExpr/WhereExpr//K-WhereExpr-10, EXPECTED_RESULT_GOT_FAILURE
-Expressions/FLWORExpr/WhereExpr//K-WhereExpr-11, EXPECTED_RESULT_GOT_FAILURE
+Expressions/FLWORExpr/WhereExpr//K-WhereExpr-10, EXPECTED_RESULT_GOT_SAME_RESULT
+Expressions/FLWORExpr/WhereExpr//K-WhereExpr-11, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/FLWORExpr/WhereExpr//K-WhereExpr-2, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/FLWORExpr/WhereExpr//K-WhereExpr-3, EXPECTED_ERROR_GOT_SAME_ERROR
Expressions/FLWORExpr/WhereExpr//K-WhereExpr-4, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/FLWORExpr/WhereExpr//K-WhereExpr-5, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/FLWORExpr/WhereExpr//K-WhereExpr-6, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/FLWORExpr/WhereExpr//K-WhereExpr-7, EXPECTED_RESULT_GOT_FAILURE
-Expressions/FLWORExpr/WhereExpr//K-WhereExpr-8, EXPECTED_RESULT_GOT_FAILURE
-Expressions/FLWORExpr/WhereExpr//K-WhereExpr-9, EXPECTED_RESULT_GOT_FAILURE
+Expressions/FLWORExpr/WhereExpr//K-WhereExpr-7, EXPECTED_RESULT_GOT_ERROR
+Expressions/FLWORExpr/WhereExpr//K-WhereExpr-8, EXPECTED_RESULT_GOT_ERROR
+Expressions/FLWORExpr/WhereExpr//K-WhereExpr-9, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/FLWORExpr/WhereExpr//WhereExpr001, EXPECTED_RESULT_GOT_FAILURE
Expressions/FLWORExpr/WhereExpr//WhereExpr002, EXPECTED_ERROR_GOT_SAME_ERROR
Expressions/FLWORExpr/WhereExpr//WhereExpr003, EXPECTED_RESULT_GOT_FAILURE
@@ -1557,12 +1557,12 @@ Expressions/FLWORExpr/WhereExpr//WhereExpr004, EXPECTED_RESULT_GOT_FAILURE
Expressions/FLWORExpr/WhereExpr//WhereExpr005, EXPECTED_ERROR_GOT_RESULT
Expressions/FLWORExpr/WhereExpr//WhereExpr006, EXPECTED_RESULT_GOT_FAILURE
Expressions/FLWORExpr/WhereExpr//WhereExpr007, EXPECTED_RESULT_GOT_FAILURE
-Expressions/FLWORExpr/WhereExpr//WhereExpr008, EXPECTED_ERROR_GOT_FAILURE
+Expressions/FLWORExpr/WhereExpr//WhereExpr008, EXPECTED_ERROR_GOT_RESULT
Expressions/FLWORExpr/WhereExpr//WhereExpr009, EXPECTED_RESULT_GOT_FAILURE
Expressions/FLWORExpr/WhereExpr//WhereExpr010, EXPECTED_ERROR_GOT_FAILURE
Expressions/FLWORExpr/WhereExpr//WhereExpr013, EXPECTED_RESULT_GOT_FAILURE
Expressions/FLWORExpr/WhereExpr//WhereExpr014, EXPECTED_RESULT_GOT_FAILURE
-Expressions/FLWORExpr/WhereExpr//WhereExpr015, EXPECTED_ERROR_GOT_FAILURE
+Expressions/FLWORExpr/WhereExpr//WhereExpr015, EXPECTED_ERROR_GOT_RESULT
Expressions/FLWORExpr/WhereExpr//WhereExpr016, EXPECTED_RESULT_GOT_FAILURE
Expressions/FLWORExpr/WhereExpr//WhereExpr017, EXPECTED_ERROR_GOT_SAME_ERROR
Expressions/FLWORExpr/WhereExpr//WhereExpr018, EXPECTED_ERROR_GOT_SAME_ERROR
@@ -1663,8 +1663,8 @@ Expressions/LogicExpr//K-LogicExpr-10, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/LogicExpr//K-LogicExpr-11, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/LogicExpr//K-LogicExpr-12, EXPECTED_RESULT_GOT_ERROR
Expressions/LogicExpr//K-LogicExpr-13, EXPECTED_RESULT_GOT_ERROR
-Expressions/LogicExpr//K-LogicExpr-14, EXPECTED_RESULT_GOT_FAILURE
-Expressions/LogicExpr//K-LogicExpr-15, EXPECTED_RESULT_GOT_FAILURE
+Expressions/LogicExpr//K-LogicExpr-14, EXPECTED_RESULT_GOT_SAME_RESULT
+Expressions/LogicExpr//K-LogicExpr-15, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/LogicExpr//K-LogicExpr-16, EXPECTED_ERROR_GOT_SAME_ERROR
Expressions/LogicExpr//K-LogicExpr-17, EXPECTED_ERROR_GOT_SAME_ERROR
Expressions/LogicExpr//K-LogicExpr-18, EXPECTED_ERROR_GOT_SAME_ERROR
@@ -1675,16 +1675,16 @@ Expressions/LogicExpr//K-LogicExpr-21, EXPECTED_ERROR_GOT_SAME_ERROR
Expressions/LogicExpr//K-LogicExpr-22, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/LogicExpr//K-LogicExpr-23, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/LogicExpr//K-LogicExpr-24, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/LogicExpr//K-LogicExpr-25, EXPECTED_RESULT_GOT_FAILURE
-Expressions/LogicExpr//K-LogicExpr-26, EXPECTED_RESULT_GOT_FAILURE
-Expressions/LogicExpr//K-LogicExpr-27, EXPECTED_RESULT_GOT_FAILURE
+Expressions/LogicExpr//K-LogicExpr-25, EXPECTED_RESULT_GOT_SAME_RESULT
+Expressions/LogicExpr//K-LogicExpr-26, EXPECTED_RESULT_GOT_SAME_RESULT
+Expressions/LogicExpr//K-LogicExpr-27, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/LogicExpr//K-LogicExpr-28, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/LogicExpr//K-LogicExpr-29, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/LogicExpr//K-LogicExpr-3, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/LogicExpr//K-LogicExpr-30, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/LogicExpr//K-LogicExpr-31, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/LogicExpr//K-LogicExpr-32, EXPECTED_RESULT_GOT_FAILURE
-Expressions/LogicExpr//K-LogicExpr-33, EXPECTED_RESULT_GOT_FAILURE
+Expressions/LogicExpr//K-LogicExpr-32, EXPECTED_RESULT_GOT_SAME_RESULT
+Expressions/LogicExpr//K-LogicExpr-33, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/LogicExpr//K-LogicExpr-34, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/LogicExpr//K-LogicExpr-35, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/LogicExpr//K-LogicExpr-36, EXPECTED_RESULT_GOT_SAME_RESULT
@@ -1694,9 +1694,9 @@ Expressions/LogicExpr//K-LogicExpr-39, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/LogicExpr//K-LogicExpr-4, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/LogicExpr//K-LogicExpr-40, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/LogicExpr//K-LogicExpr-41, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/LogicExpr//K-LogicExpr-42, EXPECTED_RESULT_GOT_FAILURE
-Expressions/LogicExpr//K-LogicExpr-43, EXPECTED_RESULT_GOT_FAILURE
-Expressions/LogicExpr//K-LogicExpr-44, EXPECTED_RESULT_GOT_FAILURE
+Expressions/LogicExpr//K-LogicExpr-42, EXPECTED_RESULT_GOT_SAME_RESULT
+Expressions/LogicExpr//K-LogicExpr-43, EXPECTED_RESULT_GOT_SAME_RESULT
+Expressions/LogicExpr//K-LogicExpr-44, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/LogicExpr//K-LogicExpr-45, EXPECTED_ERROR_GOT_SAME_ERROR
Expressions/LogicExpr//K-LogicExpr-46, EXPECTED_ERROR_GOT_RESULT
Expressions/LogicExpr//K-LogicExpr-5, EXPECTED_RESULT_GOT_SAME_RESULT
@@ -3334,14 +3334,14 @@ Expressions/Operators/ArithExpr/NumericOpr/NumericUnaryPlus//op-numeric-unary-pl
Expressions/Operators/ArithExpr/NumericOpr/NumericUnaryPlus//op-numeric-unary-plususht1args-1, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Operators/ArithExpr/NumericOpr/NumericUnaryPlus//op-numeric-unary-plususht1args-2, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Operators/ArithExpr/NumericOpr/NumericUnaryPlus//op-numeric-unary-plususht1args-3, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/Operators/CompExpr/GenComprsn/GenCompEq//GenCompEq-1, EXPECTED_RESULT_GOT_FAILURE
+Expressions/Operators/CompExpr/GenComprsn/GenCompEq//GenCompEq-1, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Operators/CompExpr/GenComprsn/GenCompEq//GenCompEq-2, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Operators/CompExpr/GenComprsn/GenCompEq//GenCompEq-3, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Operators/CompExpr/GenComprsn/GenCompEq//GenCompEq-4, EXPECTED_ERROR_GOT_SAME_ERROR
Expressions/Operators/CompExpr/GenComprsn/GenCompEq//GenCompEq-5, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Operators/CompExpr/GenComprsn/GenCompEq//GenCompEq-6, EXPECTED_ERROR_GOT_SAME_ERROR
Expressions/Operators/CompExpr/GenComprsn/GenCompEq//K-GenCompEq-1, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/Operators/CompExpr/GenComprsn/GenCompEq//K-GenCompEq-10, EXPECTED_ERROR_GOT_FAILURE
+Expressions/Operators/CompExpr/GenComprsn/GenCompEq//K-GenCompEq-10, EXPECTED_ERROR_GOT_RESULT
Expressions/Operators/CompExpr/GenComprsn/GenCompEq//K-GenCompEq-11, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Operators/CompExpr/GenComprsn/GenCompEq//K-GenCompEq-12, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Operators/CompExpr/GenComprsn/GenCompEq//K-GenCompEq-13, EXPECTED_RESULT_GOT_SAME_RESULT
@@ -3390,7 +3390,7 @@ Expressions/Operators/CompExpr/GenComprsn/GenCompEq//K-GenCompEq-51, EXPECTED_ER
Expressions/Operators/CompExpr/GenComprsn/GenCompEq//K-GenCompEq-52, EXPECTED_ERROR_GOT_SAME_ERROR
Expressions/Operators/CompExpr/GenComprsn/GenCompEq//K-GenCompEq-53, EXPECTED_ERROR_GOT_SAME_ERROR
Expressions/Operators/CompExpr/GenComprsn/GenCompEq//K-GenCompEq-54, EXPECTED_ERROR_GOT_SAME_ERROR
-Expressions/Operators/CompExpr/GenComprsn/GenCompEq//K-GenCompEq-55, EXPECTED_ERROR_GOT_FAILURE
+Expressions/Operators/CompExpr/GenComprsn/GenCompEq//K-GenCompEq-55, EXPECTED_ERROR_GOT_SAME_ERROR
Expressions/Operators/CompExpr/GenComprsn/GenCompEq//K-GenCompEq-56, EXPECTED_ERROR_GOT_SAME_ERROR
Expressions/Operators/CompExpr/GenComprsn/GenCompEq//K-GenCompEq-57, EXPECTED_ERROR_GOT_SAME_ERROR
Expressions/Operators/CompExpr/GenComprsn/GenCompEq//K-GenCompEq-58, EXPECTED_ERROR_GOT_SAME_ERROR
@@ -3398,7 +3398,7 @@ Expressions/Operators/CompExpr/GenComprsn/GenCompEq//K-GenCompEq-59, EXPECTED_ER
Expressions/Operators/CompExpr/GenComprsn/GenCompEq//K-GenCompEq-6, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Operators/CompExpr/GenComprsn/GenCompEq//K-GenCompEq-7, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Operators/CompExpr/GenComprsn/GenCompEq//K-GenCompEq-8, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/Operators/CompExpr/GenComprsn/GenCompEq//K-GenCompEq-9, EXPECTED_ERROR_GOT_FAILURE
+Expressions/Operators/CompExpr/GenComprsn/GenCompEq//K-GenCompEq-9, EXPECTED_ERROR_GOT_RESULT
Expressions/Operators/CompExpr/GenComprsn/GenCompEq//generalexpression1, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Operators/CompExpr/GenComprsn/GenCompEq//generalexpression10, EXPECTED_RESULT_GOT_FAILURE
Expressions/Operators/CompExpr/GenComprsn/GenCompEq//generalexpression11, EXPECTED_RESULT_GOT_SAME_RESULT
@@ -3437,9 +3437,9 @@ Expressions/Operators/CompExpr/GenComprsn/GenCompEq//generalexpression40, EXPECT
Expressions/Operators/CompExpr/GenComprsn/GenCompEq//generalexpression41, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Operators/CompExpr/GenComprsn/GenCompEq//generalexpression42, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Operators/CompExpr/GenComprsn/GenCompEq//generalexpression43, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/Operators/CompExpr/GenComprsn/GenCompEq//generalexpression44, EXPECTED_RESULT_GOT_FAILURE
-Expressions/Operators/CompExpr/GenComprsn/GenCompEq//generalexpression45, EXPECTED_RESULT_GOT_FAILURE
-Expressions/Operators/CompExpr/GenComprsn/GenCompEq//generalexpression46, EXPECTED_RESULT_GOT_FAILURE
+Expressions/Operators/CompExpr/GenComprsn/GenCompEq//generalexpression44, EXPECTED_RESULT_GOT_SAME_RESULT
+Expressions/Operators/CompExpr/GenComprsn/GenCompEq//generalexpression45, EXPECTED_RESULT_GOT_SAME_RESULT
+Expressions/Operators/CompExpr/GenComprsn/GenCompEq//generalexpression46, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Operators/CompExpr/GenComprsn/GenCompEq//generalexpression47, EXPECTED_RESULT_GOT_FAILURE
Expressions/Operators/CompExpr/GenComprsn/GenCompEq//generalexpression48, EXPECTED_RESULT_GOT_FAILURE
Expressions/Operators/CompExpr/GenComprsn/GenCompEq//generalexpression49, EXPECTED_RESULT_GOT_FAILURE
@@ -3448,9 +3448,9 @@ Expressions/Operators/CompExpr/GenComprsn/GenCompEq//generalexpression50, EXPECT
Expressions/Operators/CompExpr/GenComprsn/GenCompEq//generalexpression51, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Operators/CompExpr/GenComprsn/GenCompEq//generalexpression52, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Operators/CompExpr/GenComprsn/GenCompEq//generalexpression53, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/Operators/CompExpr/GenComprsn/GenCompEq//generalexpression54, EXPECTED_RESULT_GOT_FAILURE
-Expressions/Operators/CompExpr/GenComprsn/GenCompEq//generalexpression55, EXPECTED_RESULT_GOT_FAILURE
-Expressions/Operators/CompExpr/GenComprsn/GenCompEq//generalexpression56, EXPECTED_RESULT_GOT_FAILURE
+Expressions/Operators/CompExpr/GenComprsn/GenCompEq//generalexpression54, EXPECTED_RESULT_GOT_SAME_RESULT
+Expressions/Operators/CompExpr/GenComprsn/GenCompEq//generalexpression55, EXPECTED_RESULT_GOT_SAME_RESULT
+Expressions/Operators/CompExpr/GenComprsn/GenCompEq//generalexpression56, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Operators/CompExpr/GenComprsn/GenCompEq//generalexpression57, EXPECTED_RESULT_GOT_FAILURE
Expressions/Operators/CompExpr/GenComprsn/GenCompEq//generalexpression58, EXPECTED_RESULT_GOT_FAILURE
Expressions/Operators/CompExpr/GenComprsn/GenCompEq//generalexpression59, EXPECTED_RESULT_GOT_FAILURE
@@ -3459,9 +3459,9 @@ Expressions/Operators/CompExpr/GenComprsn/GenCompEq//generalexpression60, EXPECT
Expressions/Operators/CompExpr/GenComprsn/GenCompEq//generalexpression61, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Operators/CompExpr/GenComprsn/GenCompEq//generalexpression62, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Operators/CompExpr/GenComprsn/GenCompEq//generalexpression63, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/Operators/CompExpr/GenComprsn/GenCompEq//generalexpression64, EXPECTED_RESULT_GOT_FAILURE
-Expressions/Operators/CompExpr/GenComprsn/GenCompEq//generalexpression65, EXPECTED_RESULT_GOT_FAILURE
-Expressions/Operators/CompExpr/GenComprsn/GenCompEq//generalexpression66, EXPECTED_RESULT_GOT_FAILURE
+Expressions/Operators/CompExpr/GenComprsn/GenCompEq//generalexpression64, EXPECTED_RESULT_GOT_SAME_RESULT
+Expressions/Operators/CompExpr/GenComprsn/GenCompEq//generalexpression65, EXPECTED_RESULT_GOT_SAME_RESULT
+Expressions/Operators/CompExpr/GenComprsn/GenCompEq//generalexpression66, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Operators/CompExpr/GenComprsn/GenCompEq//generalexpression67, EXPECTED_RESULT_GOT_FAILURE
Expressions/Operators/CompExpr/GenComprsn/GenCompEq//generalexpression68, EXPECTED_RESULT_GOT_FAILURE
Expressions/Operators/CompExpr/GenComprsn/GenCompEq//generalexpression69, EXPECTED_RESULT_GOT_FAILURE
@@ -3560,9 +3560,9 @@ Expressions/Operators/CompExpr/GenComprsn/GenCompGT//generalexpression436, EXPEC
Expressions/Operators/CompExpr/GenComprsn/GenCompGT//generalexpression437, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Operators/CompExpr/GenComprsn/GenCompGT//generalexpression438, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Operators/CompExpr/GenComprsn/GenCompGT//generalexpression439, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/Operators/CompExpr/GenComprsn/GenCompGT//generalexpression440, EXPECTED_RESULT_GOT_FAILURE
-Expressions/Operators/CompExpr/GenComprsn/GenCompGT//generalexpression441, EXPECTED_RESULT_GOT_FAILURE
-Expressions/Operators/CompExpr/GenComprsn/GenCompGT//generalexpression442, EXPECTED_RESULT_GOT_FAILURE
+Expressions/Operators/CompExpr/GenComprsn/GenCompGT//generalexpression440, EXPECTED_RESULT_GOT_SAME_RESULT
+Expressions/Operators/CompExpr/GenComprsn/GenCompGT//generalexpression441, EXPECTED_RESULT_GOT_SAME_RESULT
+Expressions/Operators/CompExpr/GenComprsn/GenCompGT//generalexpression442, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Operators/CompExpr/GenComprsn/GenCompGT//generalexpression443, EXPECTED_RESULT_GOT_FAILURE
Expressions/Operators/CompExpr/GenComprsn/GenCompGT//generalexpression444, EXPECTED_RESULT_GOT_FAILURE
Expressions/Operators/CompExpr/GenComprsn/GenCompGT//generalexpression445, EXPECTED_RESULT_GOT_FAILURE
@@ -3570,9 +3570,9 @@ Expressions/Operators/CompExpr/GenComprsn/GenCompGT//generalexpression446, EXPEC
Expressions/Operators/CompExpr/GenComprsn/GenCompGT//generalexpression447, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Operators/CompExpr/GenComprsn/GenCompGT//generalexpression448, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Operators/CompExpr/GenComprsn/GenCompGT//generalexpression449, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/Operators/CompExpr/GenComprsn/GenCompGT//generalexpression450, EXPECTED_RESULT_GOT_FAILURE
-Expressions/Operators/CompExpr/GenComprsn/GenCompGT//generalexpression451, EXPECTED_RESULT_GOT_FAILURE
-Expressions/Operators/CompExpr/GenComprsn/GenCompGT//generalexpression452, EXPECTED_RESULT_GOT_FAILURE
+Expressions/Operators/CompExpr/GenComprsn/GenCompGT//generalexpression450, EXPECTED_RESULT_GOT_SAME_RESULT
+Expressions/Operators/CompExpr/GenComprsn/GenCompGT//generalexpression451, EXPECTED_RESULT_GOT_SAME_RESULT
+Expressions/Operators/CompExpr/GenComprsn/GenCompGT//generalexpression452, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Operators/CompExpr/GenComprsn/GenCompGT//generalexpression453, EXPECTED_RESULT_GOT_FAILURE
Expressions/Operators/CompExpr/GenComprsn/GenCompGT//generalexpression454, EXPECTED_RESULT_GOT_FAILURE
Expressions/Operators/CompExpr/GenComprsn/GenCompGT//generalexpression455, EXPECTED_RESULT_GOT_FAILURE
@@ -3580,9 +3580,9 @@ Expressions/Operators/CompExpr/GenComprsn/GenCompGT//generalexpression456, EXPEC
Expressions/Operators/CompExpr/GenComprsn/GenCompGT//generalexpression457, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Operators/CompExpr/GenComprsn/GenCompGT//generalexpression458, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Operators/CompExpr/GenComprsn/GenCompGT//generalexpression459, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/Operators/CompExpr/GenComprsn/GenCompGT//generalexpression460, EXPECTED_RESULT_GOT_FAILURE
-Expressions/Operators/CompExpr/GenComprsn/GenCompGT//generalexpression461, EXPECTED_RESULT_GOT_FAILURE
-Expressions/Operators/CompExpr/GenComprsn/GenCompGT//generalexpression462, EXPECTED_RESULT_GOT_FAILURE
+Expressions/Operators/CompExpr/GenComprsn/GenCompGT//generalexpression460, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+Expressions/Operators/CompExpr/GenComprsn/GenCompGT//generalexpression461, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+Expressions/Operators/CompExpr/GenComprsn/GenCompGT//generalexpression462, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Expressions/Operators/CompExpr/GenComprsn/GenCompGT//generalexpression463, EXPECTED_RESULT_GOT_FAILURE
Expressions/Operators/CompExpr/GenComprsn/GenCompGT//generalexpression464, EXPECTED_RESULT_GOT_FAILURE
Expressions/Operators/CompExpr/GenComprsn/GenCompGT//generalexpression465, EXPECTED_RESULT_GOT_FAILURE
@@ -3669,9 +3669,9 @@ Expressions/Operators/CompExpr/GenComprsn/GenCompGTEQ//generalexpression535, EXP
Expressions/Operators/CompExpr/GenComprsn/GenCompGTEQ//generalexpression536, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Operators/CompExpr/GenComprsn/GenCompGTEQ//generalexpression537, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Operators/CompExpr/GenComprsn/GenCompGTEQ//generalexpression538, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/Operators/CompExpr/GenComprsn/GenCompGTEQ//generalexpression539, EXPECTED_RESULT_GOT_FAILURE
-Expressions/Operators/CompExpr/GenComprsn/GenCompGTEQ//generalexpression540, EXPECTED_RESULT_GOT_FAILURE
-Expressions/Operators/CompExpr/GenComprsn/GenCompGTEQ//generalexpression541, EXPECTED_RESULT_GOT_FAILURE
+Expressions/Operators/CompExpr/GenComprsn/GenCompGTEQ//generalexpression539, EXPECTED_RESULT_GOT_SAME_RESULT
+Expressions/Operators/CompExpr/GenComprsn/GenCompGTEQ//generalexpression540, EXPECTED_RESULT_GOT_SAME_RESULT
+Expressions/Operators/CompExpr/GenComprsn/GenCompGTEQ//generalexpression541, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Operators/CompExpr/GenComprsn/GenCompGTEQ//generalexpression542, EXPECTED_RESULT_GOT_FAILURE
Expressions/Operators/CompExpr/GenComprsn/GenCompGTEQ//generalexpression543, EXPECTED_RESULT_GOT_FAILURE
Expressions/Operators/CompExpr/GenComprsn/GenCompGTEQ//generalexpression544, EXPECTED_RESULT_GOT_FAILURE
@@ -3679,9 +3679,9 @@ Expressions/Operators/CompExpr/GenComprsn/GenCompGTEQ//generalexpression545, EXP
Expressions/Operators/CompExpr/GenComprsn/GenCompGTEQ//generalexpression546, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Operators/CompExpr/GenComprsn/GenCompGTEQ//generalexpression547, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Operators/CompExpr/GenComprsn/GenCompGTEQ//generalexpression548, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/Operators/CompExpr/GenComprsn/GenCompGTEQ//generalexpression549, EXPECTED_RESULT_GOT_FAILURE
-Expressions/Operators/CompExpr/GenComprsn/GenCompGTEQ//generalexpression550, EXPECTED_RESULT_GOT_FAILURE
-Expressions/Operators/CompExpr/GenComprsn/GenCompGTEQ//generalexpression551, EXPECTED_RESULT_GOT_FAILURE
+Expressions/Operators/CompExpr/GenComprsn/GenCompGTEQ//generalexpression549, EXPECTED_RESULT_GOT_SAME_RESULT
+Expressions/Operators/CompExpr/GenComprsn/GenCompGTEQ//generalexpression550, EXPECTED_RESULT_GOT_SAME_RESULT
+Expressions/Operators/CompExpr/GenComprsn/GenCompGTEQ//generalexpression551, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Operators/CompExpr/GenComprsn/GenCompGTEQ//generalexpression552, EXPECTED_RESULT_GOT_FAILURE
Expressions/Operators/CompExpr/GenComprsn/GenCompGTEQ//generalexpression553, EXPECTED_RESULT_GOT_FAILURE
Expressions/Operators/CompExpr/GenComprsn/GenCompGTEQ//generalexpression554, EXPECTED_RESULT_GOT_FAILURE
@@ -3689,9 +3689,9 @@ Expressions/Operators/CompExpr/GenComprsn/GenCompGTEQ//generalexpression555, EXP
Expressions/Operators/CompExpr/GenComprsn/GenCompGTEQ//generalexpression556, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Operators/CompExpr/GenComprsn/GenCompGTEQ//generalexpression557, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Operators/CompExpr/GenComprsn/GenCompGTEQ//generalexpression558, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/Operators/CompExpr/GenComprsn/GenCompGTEQ//generalexpression559, EXPECTED_RESULT_GOT_FAILURE
-Expressions/Operators/CompExpr/GenComprsn/GenCompGTEQ//generalexpression560, EXPECTED_RESULT_GOT_FAILURE
-Expressions/Operators/CompExpr/GenComprsn/GenCompGTEQ//generalexpression561, EXPECTED_RESULT_GOT_FAILURE
+Expressions/Operators/CompExpr/GenComprsn/GenCompGTEQ//generalexpression559, EXPECTED_RESULT_GOT_SAME_RESULT
+Expressions/Operators/CompExpr/GenComprsn/GenCompGTEQ//generalexpression560, EXPECTED_RESULT_GOT_SAME_RESULT
+Expressions/Operators/CompExpr/GenComprsn/GenCompGTEQ//generalexpression561, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Operators/CompExpr/GenComprsn/GenCompGTEQ//generalexpression562, EXPECTED_RESULT_GOT_FAILURE
Expressions/Operators/CompExpr/GenComprsn/GenCompGTEQ//generalexpression563, EXPECTED_RESULT_GOT_FAILURE
Expressions/Operators/CompExpr/GenComprsn/GenCompGTEQ//generalexpression564, EXPECTED_RESULT_GOT_FAILURE
@@ -3788,9 +3788,9 @@ Expressions/Operators/CompExpr/GenComprsn/GenCompLT//generalexpression238, EXPEC
Expressions/Operators/CompExpr/GenComprsn/GenCompLT//generalexpression239, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Operators/CompExpr/GenComprsn/GenCompLT//generalexpression240, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Operators/CompExpr/GenComprsn/GenCompLT//generalexpression241, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/Operators/CompExpr/GenComprsn/GenCompLT//generalexpression242, EXPECTED_RESULT_GOT_FAILURE
-Expressions/Operators/CompExpr/GenComprsn/GenCompLT//generalexpression243, EXPECTED_RESULT_GOT_FAILURE
-Expressions/Operators/CompExpr/GenComprsn/GenCompLT//generalexpression244, EXPECTED_RESULT_GOT_FAILURE
+Expressions/Operators/CompExpr/GenComprsn/GenCompLT//generalexpression242, EXPECTED_RESULT_GOT_SAME_RESULT
+Expressions/Operators/CompExpr/GenComprsn/GenCompLT//generalexpression243, EXPECTED_RESULT_GOT_SAME_RESULT
+Expressions/Operators/CompExpr/GenComprsn/GenCompLT//generalexpression244, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Expressions/Operators/CompExpr/GenComprsn/GenCompLT//generalexpression245, EXPECTED_RESULT_GOT_FAILURE
Expressions/Operators/CompExpr/GenComprsn/GenCompLT//generalexpression246, EXPECTED_RESULT_GOT_FAILURE
Expressions/Operators/CompExpr/GenComprsn/GenCompLT//generalexpression247, EXPECTED_RESULT_GOT_FAILURE
@@ -3798,9 +3798,9 @@ Expressions/Operators/CompExpr/GenComprsn/GenCompLT//generalexpression248, EXPEC
Expressions/Operators/CompExpr/GenComprsn/GenCompLT//generalexpression249, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Operators/CompExpr/GenComprsn/GenCompLT//generalexpression250, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Operators/CompExpr/GenComprsn/GenCompLT//generalexpression251, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/Operators/CompExpr/GenComprsn/GenCompLT//generalexpression252, EXPECTED_RESULT_GOT_FAILURE
-Expressions/Operators/CompExpr/GenComprsn/GenCompLT//generalexpression253, EXPECTED_RESULT_GOT_FAILURE
-Expressions/Operators/CompExpr/GenComprsn/GenCompLT//generalexpression254, EXPECTED_RESULT_GOT_FAILURE
+Expressions/Operators/CompExpr/GenComprsn/GenCompLT//generalexpression252, EXPECTED_RESULT_GOT_SAME_RESULT
+Expressions/Operators/CompExpr/GenComprsn/GenCompLT//generalexpression253, EXPECTED_RESULT_GOT_SAME_RESULT
+Expressions/Operators/CompExpr/GenComprsn/GenCompLT//generalexpression254, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Expressions/Operators/CompExpr/GenComprsn/GenCompLT//generalexpression255, EXPECTED_RESULT_GOT_FAILURE
Expressions/Operators/CompExpr/GenComprsn/GenCompLT//generalexpression256, EXPECTED_RESULT_GOT_FAILURE
Expressions/Operators/CompExpr/GenComprsn/GenCompLT//generalexpression257, EXPECTED_RESULT_GOT_FAILURE
@@ -3808,9 +3808,9 @@ Expressions/Operators/CompExpr/GenComprsn/GenCompLT//generalexpression258, EXPEC
Expressions/Operators/CompExpr/GenComprsn/GenCompLT//generalexpression259, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Operators/CompExpr/GenComprsn/GenCompLT//generalexpression260, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Operators/CompExpr/GenComprsn/GenCompLT//generalexpression261, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/Operators/CompExpr/GenComprsn/GenCompLT//generalexpression262, EXPECTED_RESULT_GOT_FAILURE
-Expressions/Operators/CompExpr/GenComprsn/GenCompLT//generalexpression263, EXPECTED_RESULT_GOT_FAILURE
-Expressions/Operators/CompExpr/GenComprsn/GenCompLT//generalexpression264, EXPECTED_RESULT_GOT_FAILURE
+Expressions/Operators/CompExpr/GenComprsn/GenCompLT//generalexpression262, EXPECTED_RESULT_GOT_SAME_RESULT
+Expressions/Operators/CompExpr/GenComprsn/GenCompLT//generalexpression263, EXPECTED_RESULT_GOT_SAME_RESULT
+Expressions/Operators/CompExpr/GenComprsn/GenCompLT//generalexpression264, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Expressions/Operators/CompExpr/GenComprsn/GenCompLT//generalexpression265, EXPECTED_RESULT_GOT_FAILURE
Expressions/Operators/CompExpr/GenComprsn/GenCompLT//generalexpression266, EXPECTED_RESULT_GOT_FAILURE
Expressions/Operators/CompExpr/GenComprsn/GenCompLT//generalexpression267, EXPECTED_RESULT_GOT_FAILURE
@@ -3896,9 +3896,9 @@ Expressions/Operators/CompExpr/GenComprsn/GenCompLTEQ//generalexpression337, EXP
Expressions/Operators/CompExpr/GenComprsn/GenCompLTEQ//generalexpression338, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Operators/CompExpr/GenComprsn/GenCompLTEQ//generalexpression339, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Operators/CompExpr/GenComprsn/GenCompLTEQ//generalexpression340, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/Operators/CompExpr/GenComprsn/GenCompLTEQ//generalexpression341, EXPECTED_RESULT_GOT_FAILURE
-Expressions/Operators/CompExpr/GenComprsn/GenCompLTEQ//generalexpression342, EXPECTED_RESULT_GOT_FAILURE
-Expressions/Operators/CompExpr/GenComprsn/GenCompLTEQ//generalexpression343, EXPECTED_RESULT_GOT_FAILURE
+Expressions/Operators/CompExpr/GenComprsn/GenCompLTEQ//generalexpression341, EXPECTED_RESULT_GOT_SAME_RESULT
+Expressions/Operators/CompExpr/GenComprsn/GenCompLTEQ//generalexpression342, EXPECTED_RESULT_GOT_SAME_RESULT
+Expressions/Operators/CompExpr/GenComprsn/GenCompLTEQ//generalexpression343, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Operators/CompExpr/GenComprsn/GenCompLTEQ//generalexpression344, EXPECTED_RESULT_GOT_FAILURE
Expressions/Operators/CompExpr/GenComprsn/GenCompLTEQ//generalexpression345, EXPECTED_RESULT_GOT_FAILURE
Expressions/Operators/CompExpr/GenComprsn/GenCompLTEQ//generalexpression346, EXPECTED_RESULT_GOT_FAILURE
@@ -3906,9 +3906,9 @@ Expressions/Operators/CompExpr/GenComprsn/GenCompLTEQ//generalexpression347, EXP
Expressions/Operators/CompExpr/GenComprsn/GenCompLTEQ//generalexpression348, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Operators/CompExpr/GenComprsn/GenCompLTEQ//generalexpression349, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Operators/CompExpr/GenComprsn/GenCompLTEQ//generalexpression350, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/Operators/CompExpr/GenComprsn/GenCompLTEQ//generalexpression351, EXPECTED_RESULT_GOT_FAILURE
-Expressions/Operators/CompExpr/GenComprsn/GenCompLTEQ//generalexpression352, EXPECTED_RESULT_GOT_FAILURE
-Expressions/Operators/CompExpr/GenComprsn/GenCompLTEQ//generalexpression353, EXPECTED_RESULT_GOT_FAILURE
+Expressions/Operators/CompExpr/GenComprsn/GenCompLTEQ//generalexpression351, EXPECTED_RESULT_GOT_SAME_RESULT
+Expressions/Operators/CompExpr/GenComprsn/GenCompLTEQ//generalexpression352, EXPECTED_RESULT_GOT_SAME_RESULT
+Expressions/Operators/CompExpr/GenComprsn/GenCompLTEQ//generalexpression353, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Operators/CompExpr/GenComprsn/GenCompLTEQ//generalexpression354, EXPECTED_RESULT_GOT_FAILURE
Expressions/Operators/CompExpr/GenComprsn/GenCompLTEQ//generalexpression355, EXPECTED_RESULT_GOT_FAILURE
Expressions/Operators/CompExpr/GenComprsn/GenCompLTEQ//generalexpression356, EXPECTED_RESULT_GOT_FAILURE
@@ -3916,9 +3916,9 @@ Expressions/Operators/CompExpr/GenComprsn/GenCompLTEQ//generalexpression357, EXP
Expressions/Operators/CompExpr/GenComprsn/GenCompLTEQ//generalexpression358, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Operators/CompExpr/GenComprsn/GenCompLTEQ//generalexpression359, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Operators/CompExpr/GenComprsn/GenCompLTEQ//generalexpression360, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/Operators/CompExpr/GenComprsn/GenCompLTEQ//generalexpression361, EXPECTED_RESULT_GOT_FAILURE
-Expressions/Operators/CompExpr/GenComprsn/GenCompLTEQ//generalexpression362, EXPECTED_RESULT_GOT_FAILURE
-Expressions/Operators/CompExpr/GenComprsn/GenCompLTEQ//generalexpression363, EXPECTED_RESULT_GOT_FAILURE
+Expressions/Operators/CompExpr/GenComprsn/GenCompLTEQ//generalexpression361, EXPECTED_RESULT_GOT_SAME_RESULT
+Expressions/Operators/CompExpr/GenComprsn/GenCompLTEQ//generalexpression362, EXPECTED_RESULT_GOT_SAME_RESULT
+Expressions/Operators/CompExpr/GenComprsn/GenCompLTEQ//generalexpression363, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Operators/CompExpr/GenComprsn/GenCompLTEQ//generalexpression364, EXPECTED_RESULT_GOT_FAILURE
Expressions/Operators/CompExpr/GenComprsn/GenCompLTEQ//generalexpression365, EXPECTED_RESULT_GOT_FAILURE
Expressions/Operators/CompExpr/GenComprsn/GenCompLTEQ//generalexpression366, EXPECTED_RESULT_GOT_FAILURE
@@ -4037,9 +4037,9 @@ Expressions/Operators/CompExpr/GenComprsn/GenCompNE//generalexpression139, EXPEC
Expressions/Operators/CompExpr/GenComprsn/GenCompNE//generalexpression140, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Operators/CompExpr/GenComprsn/GenCompNE//generalexpression141, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Operators/CompExpr/GenComprsn/GenCompNE//generalexpression142, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/Operators/CompExpr/GenComprsn/GenCompNE//generalexpression143, EXPECTED_RESULT_GOT_FAILURE
-Expressions/Operators/CompExpr/GenComprsn/GenCompNE//generalexpression144, EXPECTED_RESULT_GOT_FAILURE
-Expressions/Operators/CompExpr/GenComprsn/GenCompNE//generalexpression145, EXPECTED_RESULT_GOT_FAILURE
+Expressions/Operators/CompExpr/GenComprsn/GenCompNE//generalexpression143, EXPECTED_RESULT_GOT_SAME_RESULT
+Expressions/Operators/CompExpr/GenComprsn/GenCompNE//generalexpression144, EXPECTED_RESULT_GOT_SAME_RESULT
+Expressions/Operators/CompExpr/GenComprsn/GenCompNE//generalexpression145, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Expressions/Operators/CompExpr/GenComprsn/GenCompNE//generalexpression146, EXPECTED_RESULT_GOT_FAILURE
Expressions/Operators/CompExpr/GenComprsn/GenCompNE//generalexpression147, EXPECTED_RESULT_GOT_FAILURE
Expressions/Operators/CompExpr/GenComprsn/GenCompNE//generalexpression148, EXPECTED_RESULT_GOT_FAILURE
@@ -4047,9 +4047,9 @@ Expressions/Operators/CompExpr/GenComprsn/GenCompNE//generalexpression149, EXPEC
Expressions/Operators/CompExpr/GenComprsn/GenCompNE//generalexpression150, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Operators/CompExpr/GenComprsn/GenCompNE//generalexpression151, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Operators/CompExpr/GenComprsn/GenCompNE//generalexpression152, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/Operators/CompExpr/GenComprsn/GenCompNE//generalexpression153, EXPECTED_RESULT_GOT_FAILURE
-Expressions/Operators/CompExpr/GenComprsn/GenCompNE//generalexpression154, EXPECTED_RESULT_GOT_FAILURE
-Expressions/Operators/CompExpr/GenComprsn/GenCompNE//generalexpression155, EXPECTED_RESULT_GOT_FAILURE
+Expressions/Operators/CompExpr/GenComprsn/GenCompNE//generalexpression153, EXPECTED_RESULT_GOT_SAME_RESULT
+Expressions/Operators/CompExpr/GenComprsn/GenCompNE//generalexpression154, EXPECTED_RESULT_GOT_SAME_RESULT
+Expressions/Operators/CompExpr/GenComprsn/GenCompNE//generalexpression155, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Expressions/Operators/CompExpr/GenComprsn/GenCompNE//generalexpression156, EXPECTED_RESULT_GOT_FAILURE
Expressions/Operators/CompExpr/GenComprsn/GenCompNE//generalexpression157, EXPECTED_RESULT_GOT_FAILURE
Expressions/Operators/CompExpr/GenComprsn/GenCompNE//generalexpression158, EXPECTED_RESULT_GOT_FAILURE
@@ -4057,9 +4057,9 @@ Expressions/Operators/CompExpr/GenComprsn/GenCompNE//generalexpression159, EXPEC
Expressions/Operators/CompExpr/GenComprsn/GenCompNE//generalexpression160, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Operators/CompExpr/GenComprsn/GenCompNE//generalexpression161, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Operators/CompExpr/GenComprsn/GenCompNE//generalexpression162, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/Operators/CompExpr/GenComprsn/GenCompNE//generalexpression163, EXPECTED_RESULT_GOT_FAILURE
-Expressions/Operators/CompExpr/GenComprsn/GenCompNE//generalexpression164, EXPECTED_RESULT_GOT_FAILURE
-Expressions/Operators/CompExpr/GenComprsn/GenCompNE//generalexpression165, EXPECTED_RESULT_GOT_FAILURE
+Expressions/Operators/CompExpr/GenComprsn/GenCompNE//generalexpression163, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+Expressions/Operators/CompExpr/GenComprsn/GenCompNE//generalexpression164, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+Expressions/Operators/CompExpr/GenComprsn/GenCompNE//generalexpression165, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Expressions/Operators/CompExpr/GenComprsn/GenCompNE//generalexpression166, EXPECTED_RESULT_GOT_FAILURE
Expressions/Operators/CompExpr/GenComprsn/GenCompNE//generalexpression167, EXPECTED_RESULT_GOT_FAILURE
Expressions/Operators/CompExpr/GenComprsn/GenCompNE//generalexpression168, EXPECTED_RESULT_GOT_FAILURE
@@ -5597,26 +5597,26 @@ Expressions/Operators/NodeOp/NodeBefore//nodeexpressionhc8, EXPECTED_RESULT_GOT_
Expressions/Operators/NodeOp/NodeBefore//nodeexpressionhc9, EXPECTED_RESULT_GOT_FAILURE
Expressions/Operators/NodeOp/NodeSame//nodecomparisonerr-1, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
Expressions/Operators/NodeOp/NodeSame//nodeexpression1, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
-Expressions/Operators/NodeOp/NodeSame//nodeexpression10, EXPECTED_RESULT_GOT_FAILURE
-Expressions/Operators/NodeOp/NodeSame//nodeexpression11, EXPECTED_RESULT_GOT_FAILURE
-Expressions/Operators/NodeOp/NodeSame//nodeexpression12, EXPECTED_RESULT_GOT_FAILURE
-Expressions/Operators/NodeOp/NodeSame//nodeexpression13, EXPECTED_ERROR_GOT_FAILURE
-Expressions/Operators/NodeOp/NodeSame//nodeexpression14, EXPECTED_RESULT_GOT_FAILURE
-Expressions/Operators/NodeOp/NodeSame//nodeexpression15, EXPECTED_RESULT_GOT_FAILURE
-Expressions/Operators/NodeOp/NodeSame//nodeexpression16, EXPECTED_RESULT_GOT_FAILURE
+Expressions/Operators/NodeOp/NodeSame//nodeexpression10, EXPECTED_RESULT_GOT_ERROR
+Expressions/Operators/NodeOp/NodeSame//nodeexpression11, EXPECTED_RESULT_GOT_ERROR
+Expressions/Operators/NodeOp/NodeSame//nodeexpression12, EXPECTED_RESULT_GOT_ERROR
+Expressions/Operators/NodeOp/NodeSame//nodeexpression13, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
+Expressions/Operators/NodeOp/NodeSame//nodeexpression14, EXPECTED_RESULT_GOT_ERROR
+Expressions/Operators/NodeOp/NodeSame//nodeexpression15, EXPECTED_RESULT_GOT_ERROR
+Expressions/Operators/NodeOp/NodeSame//nodeexpression16, EXPECTED_RESULT_GOT_ERROR
Expressions/Operators/NodeOp/NodeSame//nodeexpression2, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
-Expressions/Operators/NodeOp/NodeSame//nodeexpression3, EXPECTED_ERROR_GOT_FAILURE
-Expressions/Operators/NodeOp/NodeSame//nodeexpression4, EXPECTED_ERROR_GOT_FAILURE
+Expressions/Operators/NodeOp/NodeSame//nodeexpression3, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
+Expressions/Operators/NodeOp/NodeSame//nodeexpression4, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
Expressions/Operators/NodeOp/NodeSame//nodeexpression5, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
Expressions/Operators/NodeOp/NodeSame//nodeexpression6, EXPECTED_RESULT_GOT_ERROR
-Expressions/Operators/NodeOp/NodeSame//nodeexpression7, EXPECTED_RESULT_GOT_FAILURE
-Expressions/Operators/NodeOp/NodeSame//nodeexpression8, EXPECTED_RESULT_GOT_FAILURE
-Expressions/Operators/NodeOp/NodeSame//nodeexpression9, EXPECTED_ERROR_GOT_FAILURE
-Expressions/Operators/NodeOp/NodeSame//nodeexpressionhc1, EXPECTED_RESULT_GOT_FAILURE
-Expressions/Operators/NodeOp/NodeSame//nodeexpressionhc2, EXPECTED_RESULT_GOT_FAILURE
-Expressions/Operators/NodeOp/NodeSame//nodeexpressionhc3, EXPECTED_RESULT_GOT_FAILURE
-Expressions/Operators/NodeOp/NodeSame//nodeexpressionhc4, EXPECTED_RESULT_GOT_FAILURE
-Expressions/Operators/NodeOp/NodeSame//nodeexpressionhc5, EXPECTED_RESULT_GOT_FAILURE
+Expressions/Operators/NodeOp/NodeSame//nodeexpression7, EXPECTED_RESULT_GOT_ERROR
+Expressions/Operators/NodeOp/NodeSame//nodeexpression8, EXPECTED_RESULT_GOT_ERROR
+Expressions/Operators/NodeOp/NodeSame//nodeexpression9, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
+Expressions/Operators/NodeOp/NodeSame//nodeexpressionhc1, EXPECTED_RESULT_GOT_ERROR
+Expressions/Operators/NodeOp/NodeSame//nodeexpressionhc2, EXPECTED_RESULT_GOT_ERROR
+Expressions/Operators/NodeOp/NodeSame//nodeexpressionhc3, EXPECTED_RESULT_GOT_ERROR
+Expressions/Operators/NodeOp/NodeSame//nodeexpressionhc4, EXPECTED_RESULT_GOT_ERROR
+Expressions/Operators/NodeOp/NodeSame//nodeexpressionhc5, EXPECTED_RESULT_GOT_ERROR
Expressions/Operators/SeqOp/SeqConcat//op-concatenate-mix-args-001, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Expressions/Operators/SeqOp/SeqConcat//op-concatenate-mix-args-002, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Expressions/Operators/SeqOp/SeqConcat//op-concatenate-mix-args-003, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
@@ -5637,14 +5637,14 @@ Expressions/Operators/SeqOp/SeqConcat//op-concatenate-mix-args-017, EXPECTED_RES
Expressions/Operators/SeqOp/SeqConcat//op-concatenate-mix-args-018, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Expressions/Operators/SeqOp/SeqConcat//op-concatenate-mix-args-019, EXPECTED_RESULT_GOT_FAILURE
Expressions/Operators/SeqOp/SeqConcat//op-concatenate-mix-args-020, EXPECTED_RESULT_GOT_FAILURE
-Expressions/Operators/SeqOp/SeqExcept//fn-except-node-args-001, EXPECTED_RESULT_GOT_FAILURE
-Expressions/Operators/SeqOp/SeqExcept//fn-except-node-args-002, EXPECTED_RESULT_GOT_FAILURE
-Expressions/Operators/SeqOp/SeqExcept//fn-except-node-args-003, EXPECTED_RESULT_GOT_FAILURE
-Expressions/Operators/SeqOp/SeqExcept//fn-except-node-args-004, EXPECTED_RESULT_GOT_FAILURE
+Expressions/Operators/SeqOp/SeqExcept//fn-except-node-args-001, EXPECTED_RESULT_GOT_ERROR
+Expressions/Operators/SeqOp/SeqExcept//fn-except-node-args-002, EXPECTED_RESULT_GOT_ERROR
+Expressions/Operators/SeqOp/SeqExcept//fn-except-node-args-003, EXPECTED_RESULT_GOT_ERROR
+Expressions/Operators/SeqOp/SeqExcept//fn-except-node-args-004, EXPECTED_RESULT_GOT_ERROR
Expressions/Operators/SeqOp/SeqExcept//fn-except-node-args-005, EXPECTED_RESULT_GOT_FAILURE
Expressions/Operators/SeqOp/SeqExcept//fn-except-node-args-006, EXPECTED_RESULT_GOT_FAILURE
Expressions/Operators/SeqOp/SeqExcept//fn-except-node-args-007, EXPECTED_RESULT_GOT_FAILURE
-Expressions/Operators/SeqOp/SeqExcept//fn-except-node-args-008, EXPECTED_RESULT_GOT_FAILURE
+Expressions/Operators/SeqOp/SeqExcept//fn-except-node-args-008, EXPECTED_RESULT_GOT_ERROR
Expressions/Operators/SeqOp/SeqExcept//fn-except-node-args-009, EXPECTED_RESULT_GOT_FAILURE
Expressions/Operators/SeqOp/SeqExcept//fn-except-node-args-010, EXPECTED_RESULT_GOT_ERROR
Expressions/Operators/SeqOp/SeqExcept//fn-except-node-args-011, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
@@ -5660,14 +5660,14 @@ Expressions/Operators/SeqOp/SeqExcept//fn-except-node-args-020, EXPECTED_RESULT_
Expressions/Operators/SeqOp/SeqExcept//fn-except-node-args-021, EXPECTED_RESULT_GOT_ERROR
Expressions/Operators/SeqOp/SeqExcept//fn-except-node-args-022, EXPECTED_RESULT_GOT_ERROR
Expressions/Operators/SeqOp/SeqExcept//fn-except-node-args-023, EXPECTED_RESULT_GOT_ERROR
-Expressions/Operators/SeqOp/SeqIntersect//fn-intersect-node-args-001, EXPECTED_RESULT_GOT_FAILURE
-Expressions/Operators/SeqOp/SeqIntersect//fn-intersect-node-args-002, EXPECTED_RESULT_GOT_FAILURE
-Expressions/Operators/SeqOp/SeqIntersect//fn-intersect-node-args-003, EXPECTED_RESULT_GOT_FAILURE
-Expressions/Operators/SeqOp/SeqIntersect//fn-intersect-node-args-004, EXPECTED_RESULT_GOT_FAILURE
+Expressions/Operators/SeqOp/SeqIntersect//fn-intersect-node-args-001, EXPECTED_RESULT_GOT_ERROR
+Expressions/Operators/SeqOp/SeqIntersect//fn-intersect-node-args-002, EXPECTED_RESULT_GOT_ERROR
+Expressions/Operators/SeqOp/SeqIntersect//fn-intersect-node-args-003, EXPECTED_RESULT_GOT_ERROR
+Expressions/Operators/SeqOp/SeqIntersect//fn-intersect-node-args-004, EXPECTED_RESULT_GOT_ERROR
Expressions/Operators/SeqOp/SeqIntersect//fn-intersect-node-args-005, EXPECTED_RESULT_GOT_FAILURE
Expressions/Operators/SeqOp/SeqIntersect//fn-intersect-node-args-006, EXPECTED_RESULT_GOT_FAILURE
Expressions/Operators/SeqOp/SeqIntersect//fn-intersect-node-args-007, EXPECTED_RESULT_GOT_FAILURE
-Expressions/Operators/SeqOp/SeqIntersect//fn-intersect-node-args-008, EXPECTED_RESULT_GOT_FAILURE
+Expressions/Operators/SeqOp/SeqIntersect//fn-intersect-node-args-008, EXPECTED_RESULT_GOT_ERROR
Expressions/Operators/SeqOp/SeqIntersect//fn-intersect-node-args-009, EXPECTED_RESULT_GOT_FAILURE
Expressions/Operators/SeqOp/SeqIntersect//fn-intersect-node-args-010, EXPECTED_RESULT_GOT_ERROR
Expressions/Operators/SeqOp/SeqIntersect//fn-intersect-node-args-011, EXPECTED_RESULT_GOT_ERROR
@@ -5683,16 +5683,16 @@ Expressions/Operators/SeqOp/SeqIntersect//fn-intersect-node-args-020, EXPECTED_R
Expressions/Operators/SeqOp/SeqIntersect//fn-intersect-node-args-021, EXPECTED_RESULT_GOT_ERROR
Expressions/Operators/SeqOp/SeqIntersect//fn-intersect-node-args-022, EXPECTED_RESULT_GOT_ERROR
Expressions/Operators/SeqOp/SeqIntersect//fn-intersect-node-args-023, EXPECTED_RESULT_GOT_ERROR
-Expressions/Operators/SeqOp/SeqUnion//fn-union-node-args-001, EXPECTED_RESULT_GOT_FAILURE
+Expressions/Operators/SeqOp/SeqUnion//fn-union-node-args-001, EXPECTED_RESULT_GOT_ERROR
Expressions/Operators/SeqOp/SeqUnion//fn-union-node-args-002, EXPECTED_RESULT_GOT_ERROR
-Expressions/Operators/SeqOp/SeqUnion//fn-union-node-args-003, EXPECTED_RESULT_GOT_FAILURE
-Expressions/Operators/SeqOp/SeqUnion//fn-union-node-args-004, EXPECTED_RESULT_GOT_FAILURE
+Expressions/Operators/SeqOp/SeqUnion//fn-union-node-args-003, EXPECTED_RESULT_GOT_ERROR
+Expressions/Operators/SeqOp/SeqUnion//fn-union-node-args-004, EXPECTED_RESULT_GOT_ERROR
Expressions/Operators/SeqOp/SeqUnion//fn-union-node-args-005, EXPECTED_RESULT_GOT_FAILURE
-Expressions/Operators/SeqOp/SeqUnion//fn-union-node-args-006, EXPECTED_RESULT_GOT_FAILURE
+Expressions/Operators/SeqOp/SeqUnion//fn-union-node-args-006, EXPECTED_RESULT_GOT_ERROR
Expressions/Operators/SeqOp/SeqUnion//fn-union-node-args-007, EXPECTED_RESULT_GOT_FAILURE
-Expressions/Operators/SeqOp/SeqUnion//fn-union-node-args-008, EXPECTED_RESULT_GOT_FAILURE
+Expressions/Operators/SeqOp/SeqUnion//fn-union-node-args-008, EXPECTED_RESULT_GOT_ERROR
Expressions/Operators/SeqOp/SeqUnion//fn-union-node-args-009, EXPECTED_RESULT_GOT_FAILURE
-Expressions/Operators/SeqOp/SeqUnion//fn-union-node-args-010, EXPECTED_RESULT_GOT_FAILURE
+Expressions/Operators/SeqOp/SeqUnion//fn-union-node-args-010, EXPECTED_RESULT_GOT_ERROR
Expressions/Operators/SeqOp/SeqUnion//fn-union-node-args-011, EXPECTED_RESULT_GOT_FAILURE
Expressions/Operators/SeqOp/SeqUnion//fn-union-node-args-012, EXPECTED_RESULT_GOT_ERROR
Expressions/Operators/SeqOp/SeqUnion//fn-union-node-args-013, EXPECTED_RESULT_GOT_ERROR
@@ -5710,22 +5710,22 @@ Expressions/OrderExpr//K-OrderExpr-1, EXPECTED_ERROR_GOT_SAME_ERROR
Expressions/OrderExpr//K-OrderExpr-2, EXPECTED_ERROR_GOT_SAME_ERROR
Expressions/OrderExpr//K-OrderExpr-3, EXPECTED_RESULT_GOT_ERROR
Expressions/OrderExpr//K-OrderExpr-4, EXPECTED_RESULT_GOT_ERROR
-Expressions/OrderExpr//Orderexpr-1, EXPECTED_RESULT_GOT_FAILURE
-Expressions/OrderExpr//Orderexpr-10, EXPECTED_RESULT_GOT_FAILURE
-Expressions/OrderExpr//Orderexpr-11, EXPECTED_RESULT_GOT_FAILURE
-Expressions/OrderExpr//Orderexpr-12, EXPECTED_RESULT_GOT_FAILURE
-Expressions/OrderExpr//Orderexpr-13, EXPECTED_RESULT_GOT_FAILURE
-Expressions/OrderExpr//Orderexpr-14, EXPECTED_RESULT_GOT_FAILURE
+Expressions/OrderExpr//Orderexpr-1, EXPECTED_RESULT_GOT_ERROR
+Expressions/OrderExpr//Orderexpr-10, EXPECTED_RESULT_GOT_ERROR
+Expressions/OrderExpr//Orderexpr-11, EXPECTED_RESULT_GOT_ERROR
+Expressions/OrderExpr//Orderexpr-12, EXPECTED_RESULT_GOT_ERROR
+Expressions/OrderExpr//Orderexpr-13, EXPECTED_RESULT_GOT_ERROR
+Expressions/OrderExpr//Orderexpr-14, EXPECTED_RESULT_GOT_ERROR
Expressions/OrderExpr//Orderexpr-15, EXPECTED_RESULT_GOT_ERROR
Expressions/OrderExpr//Orderexpr-16, EXPECTED_RESULT_GOT_ERROR
Expressions/OrderExpr//Orderexpr-17, EXPECTED_RESULT_GOT_ERROR
Expressions/OrderExpr//Orderexpr-18, EXPECTED_RESULT_GOT_ERROR
-Expressions/OrderExpr//Orderexpr-19, EXPECTED_RESULT_GOT_FAILURE
-Expressions/OrderExpr//Orderexpr-2, EXPECTED_RESULT_GOT_FAILURE
-Expressions/OrderExpr//Orderexpr-20, EXPECTED_RESULT_GOT_FAILURE
-Expressions/OrderExpr//Orderexpr-5, EXPECTED_RESULT_GOT_FAILURE
-Expressions/OrderExpr//Orderexpr-6, EXPECTED_RESULT_GOT_FAILURE
-Expressions/OrderExpr//Orderexpr-9, EXPECTED_RESULT_GOT_FAILURE
+Expressions/OrderExpr//Orderexpr-19, EXPECTED_RESULT_GOT_ERROR
+Expressions/OrderExpr//Orderexpr-2, EXPECTED_RESULT_GOT_ERROR
+Expressions/OrderExpr//Orderexpr-20, EXPECTED_RESULT_GOT_ERROR
+Expressions/OrderExpr//Orderexpr-5, EXPECTED_RESULT_GOT_ERROR
+Expressions/OrderExpr//Orderexpr-6, EXPECTED_RESULT_GOT_ERROR
+Expressions/OrderExpr//Orderexpr-9, EXPECTED_RESULT_GOT_ERROR
Expressions/OrderExpr//orderedunorderedexpr-1, EXPECTED_RESULT_GOT_ERROR
Expressions/OrderExpr//orderedunorderedexpr-2, EXPECTED_RESULT_GOT_ERROR
Expressions/OrderExpr//orderedunorderedexpr-3, EXPECTED_RESULT_GOT_ERROR
@@ -5789,7 +5789,7 @@ Expressions/PathExpr/Predicates//predicates-25, EXPECTED_RESULT_GOT_FAILURE
Expressions/PathExpr/Predicates//predicates-26, EXPECTED_RESULT_GOT_FAILURE
Expressions/PathExpr/Predicates//predicates-27, EXPECTED_RESULT_GOT_FAILURE
Expressions/PathExpr/Predicates//predicates-28, EXPECTED_RESULT_GOT_FAILURE
-Expressions/PathExpr/Predicates//predicates-29, EXPECTED_ERROR_GOT_FAILURE
+Expressions/PathExpr/Predicates//predicates-29, EXPECTED_ERROR_GOT_RESULT
Expressions/PathExpr/Predicates//predicates-3, EXPECTED_RESULT_GOT_FAILURE
Expressions/PathExpr/Predicates//predicates-30, EXPECTED_RESULT_GOT_FAILURE
Expressions/PathExpr/Predicates//predicates-31, EXPECTED_RESULT_GOT_FAILURE
@@ -6021,7 +6021,7 @@ Expressions/PathExpr/Steps/Axes//Axes108, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
Expressions/PathExpr/Steps/Axes//Axes109, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
Expressions/PathExpr/Steps/Axes//Axes110, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
Expressions/PathExpr/Steps/Axes//Axes111, EXPECTED_RESULT_GOT_ERROR
-Expressions/PathExpr/Steps/Axes//axis-err-1, EXPECTED_ERROR_GOT_FAILURE
+Expressions/PathExpr/Steps/Axes//axis-err-1, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
Expressions/PathExpr/Steps/NodeTest//NodeTest001, EXPECTED_RESULT_GOT_FAILURE
Expressions/PathExpr/Steps/NodeTest//NodeTest002, EXPECTED_RESULT_GOT_FAILURE
Expressions/PathExpr/Steps/NodeTest//NodeTest003, EXPECTED_RESULT_GOT_FAILURE
@@ -6052,7 +6052,7 @@ Expressions/PathExpr/Steps/NodeTest//NodeTesthc-8, EXPECTED_RESULT_GOT_FAILURE
Expressions/PathExpr/Steps/NodeTest//nametest-1, EXPECTED_RESULT_GOT_FAILURE
Expressions/PathExpr/Steps/NodeTest//nametest-10, EXPECTED_RESULT_GOT_ERROR
Expressions/PathExpr/Steps/NodeTest//nametest-11, EXPECTED_RESULT_GOT_ERROR
-Expressions/PathExpr/Steps/NodeTest//nametest-12, EXPECTED_RESULT_GOT_FAILURE
+Expressions/PathExpr/Steps/NodeTest//nametest-12, EXPECTED_RESULT_GOT_ERROR
Expressions/PathExpr/Steps/NodeTest//nametest-13, EXPECTED_RESULT_GOT_FAILURE
Expressions/PathExpr/Steps/NodeTest//nametest-14, EXPECTED_RESULT_GOT_FAILURE
Expressions/PathExpr/Steps/NodeTest//nametest-15, EXPECTED_RESULT_GOT_FAILURE
@@ -6066,7 +6066,7 @@ Expressions/PathExpr/Steps/NodeTest//nametest-5, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/PathExpr/Steps/NodeTest//nametest-6, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Expressions/PathExpr/Steps/NodeTest//nametest-7, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/PathExpr/Steps/NodeTest//nametest-8, EXPECTED_RESULT_GOT_ERROR
-Expressions/PathExpr/Steps/NodeTest//nametest-9, EXPECTED_RESULT_GOT_FAILURE
+Expressions/PathExpr/Steps/NodeTest//nametest-9, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Expressions/PathExpr/Steps/NodeTestSection/NameTest//K-NameTest-1, EXPECTED_ERROR_GOT_SAME_ERROR
Expressions/PathExpr/Steps/NodeTestSection/NameTest//K-NameTest-10, EXPECTED_ERROR_GOT_SAME_ERROR
Expressions/PathExpr/Steps/NodeTestSection/NameTest//K-NameTest-11, EXPECTED_ERROR_GOT_SAME_ERROR
@@ -6476,16 +6476,16 @@ Expressions/PrologExpr/DefaultOrderingProlog//orderDecl-18, EXPECTED_RESULT_GOT_
Expressions/PrologExpr/DefaultOrderingProlog//orderDecl-2, EXPECTED_RESULT_GOT_ERROR
Expressions/PrologExpr/DefaultOrderingProlog//orderDecl-20, EXPECTED_RESULT_GOT_FAILURE
Expressions/PrologExpr/DefaultOrderingProlog//orderDecl-21, EXPECTED_RESULT_GOT_FAILURE
-Expressions/PrologExpr/DefaultOrderingProlog//orderDecl-22, EXPECTED_ERROR_GOT_FAILURE
+Expressions/PrologExpr/DefaultOrderingProlog//orderDecl-22, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
Expressions/PrologExpr/DefaultOrderingProlog//orderDecl-23, EXPECTED_RESULT_GOT_FAILURE
Expressions/PrologExpr/DefaultOrderingProlog//orderDecl-4, EXPECTED_RESULT_GOT_ERROR
-Expressions/PrologExpr/DefaultOrderingProlog//orderDecl-7, EXPECTED_RESULT_GOT_FAILURE
+Expressions/PrologExpr/DefaultOrderingProlog//orderDecl-7, EXPECTED_RESULT_GOT_ERROR
Expressions/PrologExpr/DefaultOrderingProlog//orderDecl-8, EXPECTED_RESULT_GOT_FAILURE
Expressions/PrologExpr/DefaultOrderingProlog//orderDecl-9, EXPECTED_RESULT_GOT_FAILURE
Expressions/PrologExpr/DefaultOrderingProlog//orderdecl-14, EXPECTED_RESULT_GOT_FAILURE
Expressions/PrologExpr/DefaultOrderingProlog//orderdecl-3, EXPECTED_RESULT_GOT_ERROR
Expressions/PrologExpr/DefaultOrderingProlog//orderdecl-5, EXPECTED_RESULT_GOT_ERROR
-Expressions/PrologExpr/DefaultOrderingProlog//orderdecl-6, EXPECTED_RESULT_GOT_FAILURE
+Expressions/PrologExpr/DefaultOrderingProlog//orderdecl-6, EXPECTED_RESULT_GOT_ERROR
Expressions/PrologExpr/EmptyOrderProlog//K-EmptyOrderProlog-1, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/PrologExpr/EmptyOrderProlog//K-EmptyOrderProlog-2, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/PrologExpr/EmptyOrderProlog//K-EmptyOrderProlog-3, EXPECTED_ERROR_GOT_RESULT
@@ -7020,18 +7020,18 @@ Expressions/SeqExpr/CombNodeSeq//combiningnodeseqexcepthc4, EXPECTED_RESULT_GOT_
Expressions/SeqExpr/CombNodeSeq//combiningnodeseqexcepthc5, EXPECTED_RESULT_GOT_ERROR
Expressions/SeqExpr/CombNodeSeq//combiningnodeseqexcepthc6, EXPECTED_RESULT_GOT_ERROR
Expressions/SeqExpr/CombNodeSeq//combiningnodeseqhc1, EXPECTED_RESULT_GOT_ERROR
-Expressions/SeqExpr/CombNodeSeq//combiningnodeseqhc10, EXPECTED_RESULT_GOT_FAILURE
+Expressions/SeqExpr/CombNodeSeq//combiningnodeseqhc10, EXPECTED_RESULT_GOT_ERROR
Expressions/SeqExpr/CombNodeSeq//combiningnodeseqhc2, EXPECTED_RESULT_GOT_ERROR
Expressions/SeqExpr/CombNodeSeq//combiningnodeseqhc3, EXPECTED_RESULT_GOT_ERROR
Expressions/SeqExpr/CombNodeSeq//combiningnodeseqhc4, EXPECTED_RESULT_GOT_ERROR
Expressions/SeqExpr/CombNodeSeq//combiningnodeseqhc5, EXPECTED_RESULT_GOT_ERROR
Expressions/SeqExpr/CombNodeSeq//combiningnodeseqhc6, EXPECTED_RESULT_GOT_ERROR
-Expressions/SeqExpr/CombNodeSeq//combiningnodeseqhc7, EXPECTED_RESULT_GOT_FAILURE
-Expressions/SeqExpr/CombNodeSeq//combiningnodeseqhc8, EXPECTED_RESULT_GOT_FAILURE
-Expressions/SeqExpr/CombNodeSeq//combiningnodeseqhc9, EXPECTED_RESULT_GOT_FAILURE
+Expressions/SeqExpr/CombNodeSeq//combiningnodeseqhc7, EXPECTED_RESULT_GOT_ERROR
+Expressions/SeqExpr/CombNodeSeq//combiningnodeseqhc8, EXPECTED_RESULT_GOT_ERROR
+Expressions/SeqExpr/CombNodeSeq//combiningnodeseqhc9, EXPECTED_RESULT_GOT_ERROR
Expressions/SeqExpr/CombNodeSeq//combiningnodeseqintersecthc1, EXPECTED_RESULT_GOT_ERROR
Expressions/SeqExpr/CombNodeSeq//combiningnodeseqintersecthc2, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
-Expressions/SeqExpr/CombNodeSeq//combiningnodeseqintersecthc3, EXPECTED_RESULT_GOT_FAILURE
+Expressions/SeqExpr/CombNodeSeq//combiningnodeseqintersecthc3, EXPECTED_RESULT_GOT_ERROR
Expressions/SeqExpr/CombNodeSeq//combiningnodeseqintersecthc4, EXPECTED_RESULT_GOT_ERROR
Expressions/SeqExpr/ConstructSeq/RangeExpr//K-RangeExpr-1, EXPECTED_ERROR_GOT_RESULT
Expressions/SeqExpr/ConstructSeq/RangeExpr//K-RangeExpr-10, EXPECTED_RESULT_GOT_SAME_RESULT
@@ -7104,121 +7104,121 @@ Expressions/SeqExpr/ConstructSeq/commaOp//sequenceexpressionhc7, EXPECTED_RESULT
Expressions/SeqExpr/ConstructSeq/commaOp//sequenceexpressionhc8, EXPECTED_RESULT_GOT_FAILURE
Expressions/SeqExpr/ConstructSeq/commaOp//sequenceexpressionhc9, EXPECTED_RESULT_GOT_FAILURE
Expressions/SeqExpr/FilterExpr//K-FilterExpr-1, EXPECTED_ERROR_GOT_SAME_ERROR
-Expressions/SeqExpr/FilterExpr//K-FilterExpr-10, EXPECTED_RESULT_GOT_FAILURE
-Expressions/SeqExpr/FilterExpr//K-FilterExpr-11, EXPECTED_RESULT_GOT_FAILURE
-Expressions/SeqExpr/FilterExpr//K-FilterExpr-12, EXPECTED_RESULT_GOT_FAILURE
-Expressions/SeqExpr/FilterExpr//K-FilterExpr-13, EXPECTED_RESULT_GOT_FAILURE
-Expressions/SeqExpr/FilterExpr//K-FilterExpr-14, EXPECTED_RESULT_GOT_FAILURE
-Expressions/SeqExpr/FilterExpr//K-FilterExpr-15, EXPECTED_RESULT_GOT_FAILURE
-Expressions/SeqExpr/FilterExpr//K-FilterExpr-16, EXPECTED_RESULT_GOT_FAILURE
-Expressions/SeqExpr/FilterExpr//K-FilterExpr-17, EXPECTED_RESULT_GOT_FAILURE
-Expressions/SeqExpr/FilterExpr//K-FilterExpr-18, EXPECTED_RESULT_GOT_FAILURE
-Expressions/SeqExpr/FilterExpr//K-FilterExpr-19, EXPECTED_RESULT_GOT_FAILURE
+Expressions/SeqExpr/FilterExpr//K-FilterExpr-10, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+Expressions/SeqExpr/FilterExpr//K-FilterExpr-11, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+Expressions/SeqExpr/FilterExpr//K-FilterExpr-12, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+Expressions/SeqExpr/FilterExpr//K-FilterExpr-13, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+Expressions/SeqExpr/FilterExpr//K-FilterExpr-14, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+Expressions/SeqExpr/FilterExpr//K-FilterExpr-15, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+Expressions/SeqExpr/FilterExpr//K-FilterExpr-16, EXPECTED_RESULT_GOT_SAME_RESULT
+Expressions/SeqExpr/FilterExpr//K-FilterExpr-17, EXPECTED_RESULT_GOT_SAME_RESULT
+Expressions/SeqExpr/FilterExpr//K-FilterExpr-18, EXPECTED_RESULT_GOT_SAME_RESULT
+Expressions/SeqExpr/FilterExpr//K-FilterExpr-19, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/SeqExpr/FilterExpr//K-FilterExpr-2, EXPECTED_ERROR_GOT_SAME_ERROR
-Expressions/SeqExpr/FilterExpr//K-FilterExpr-20, EXPECTED_RESULT_GOT_FAILURE
-Expressions/SeqExpr/FilterExpr//K-FilterExpr-21, EXPECTED_RESULT_GOT_FAILURE
-Expressions/SeqExpr/FilterExpr//K-FilterExpr-22, EXPECTED_RESULT_GOT_FAILURE
-Expressions/SeqExpr/FilterExpr//K-FilterExpr-23, EXPECTED_RESULT_GOT_FAILURE
-Expressions/SeqExpr/FilterExpr//K-FilterExpr-24, EXPECTED_RESULT_GOT_FAILURE
-Expressions/SeqExpr/FilterExpr//K-FilterExpr-25, EXPECTED_RESULT_GOT_FAILURE
-Expressions/SeqExpr/FilterExpr//K-FilterExpr-26, EXPECTED_RESULT_GOT_FAILURE
-Expressions/SeqExpr/FilterExpr//K-FilterExpr-27, EXPECTED_RESULT_GOT_FAILURE
-Expressions/SeqExpr/FilterExpr//K-FilterExpr-28, EXPECTED_RESULT_GOT_FAILURE
-Expressions/SeqExpr/FilterExpr//K-FilterExpr-29, EXPECTED_RESULT_GOT_FAILURE
+Expressions/SeqExpr/FilterExpr//K-FilterExpr-20, EXPECTED_RESULT_GOT_SAME_RESULT
+Expressions/SeqExpr/FilterExpr//K-FilterExpr-21, EXPECTED_RESULT_GOT_SAME_RESULT
+Expressions/SeqExpr/FilterExpr//K-FilterExpr-22, EXPECTED_RESULT_GOT_SAME_RESULT
+Expressions/SeqExpr/FilterExpr//K-FilterExpr-23, EXPECTED_RESULT_GOT_SAME_RESULT
+Expressions/SeqExpr/FilterExpr//K-FilterExpr-24, EXPECTED_RESULT_GOT_SAME_RESULT
+Expressions/SeqExpr/FilterExpr//K-FilterExpr-25, EXPECTED_RESULT_GOT_SAME_RESULT
+Expressions/SeqExpr/FilterExpr//K-FilterExpr-26, EXPECTED_RESULT_GOT_SAME_RESULT
+Expressions/SeqExpr/FilterExpr//K-FilterExpr-27, EXPECTED_RESULT_GOT_SAME_RESULT
+Expressions/SeqExpr/FilterExpr//K-FilterExpr-28, EXPECTED_RESULT_GOT_SAME_RESULT
+Expressions/SeqExpr/FilterExpr//K-FilterExpr-29, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/SeqExpr/FilterExpr//K-FilterExpr-3, EXPECTED_ERROR_GOT_SAME_ERROR
-Expressions/SeqExpr/FilterExpr//K-FilterExpr-30, EXPECTED_ERROR_GOT_FAILURE
-Expressions/SeqExpr/FilterExpr//K-FilterExpr-31, EXPECTED_RESULT_GOT_FAILURE
-Expressions/SeqExpr/FilterExpr//K-FilterExpr-32, EXPECTED_RESULT_GOT_FAILURE
-Expressions/SeqExpr/FilterExpr//K-FilterExpr-33, EXPECTED_RESULT_GOT_FAILURE
-Expressions/SeqExpr/FilterExpr//K-FilterExpr-34, EXPECTED_RESULT_GOT_FAILURE
-Expressions/SeqExpr/FilterExpr//K-FilterExpr-35, EXPECTED_RESULT_GOT_FAILURE
-Expressions/SeqExpr/FilterExpr//K-FilterExpr-36, EXPECTED_RESULT_GOT_FAILURE
-Expressions/SeqExpr/FilterExpr//K-FilterExpr-37, EXPECTED_RESULT_GOT_FAILURE
-Expressions/SeqExpr/FilterExpr//K-FilterExpr-38, EXPECTED_ERROR_GOT_FAILURE
-Expressions/SeqExpr/FilterExpr//K-FilterExpr-39, EXPECTED_RESULT_GOT_FAILURE
+Expressions/SeqExpr/FilterExpr//K-FilterExpr-30, EXPECTED_ERROR_GOT_RESULT
+Expressions/SeqExpr/FilterExpr//K-FilterExpr-31, EXPECTED_RESULT_GOT_ERROR
+Expressions/SeqExpr/FilterExpr//K-FilterExpr-32, EXPECTED_RESULT_GOT_ERROR
+Expressions/SeqExpr/FilterExpr//K-FilterExpr-33, EXPECTED_RESULT_GOT_ERROR
+Expressions/SeqExpr/FilterExpr//K-FilterExpr-34, EXPECTED_RESULT_GOT_ERROR
+Expressions/SeqExpr/FilterExpr//K-FilterExpr-35, EXPECTED_RESULT_GOT_SAME_RESULT
+Expressions/SeqExpr/FilterExpr//K-FilterExpr-36, EXPECTED_RESULT_GOT_SAME_RESULT
+Expressions/SeqExpr/FilterExpr//K-FilterExpr-37, EXPECTED_RESULT_GOT_ERROR
+Expressions/SeqExpr/FilterExpr//K-FilterExpr-38, EXPECTED_ERROR_GOT_RESULT
+Expressions/SeqExpr/FilterExpr//K-FilterExpr-39, EXPECTED_RESULT_GOT_ERROR
Expressions/SeqExpr/FilterExpr//K-FilterExpr-4, EXPECTED_ERROR_GOT_SAME_ERROR
-Expressions/SeqExpr/FilterExpr//K-FilterExpr-40, EXPECTED_ERROR_GOT_FAILURE
-Expressions/SeqExpr/FilterExpr//K-FilterExpr-41, EXPECTED_RESULT_GOT_FAILURE
-Expressions/SeqExpr/FilterExpr//K-FilterExpr-42, EXPECTED_RESULT_GOT_FAILURE
-Expressions/SeqExpr/FilterExpr//K-FilterExpr-43, EXPECTED_RESULT_GOT_FAILURE
-Expressions/SeqExpr/FilterExpr//K-FilterExpr-44, EXPECTED_RESULT_GOT_FAILURE
-Expressions/SeqExpr/FilterExpr//K-FilterExpr-45, EXPECTED_RESULT_GOT_FAILURE
-Expressions/SeqExpr/FilterExpr//K-FilterExpr-46, EXPECTED_RESULT_GOT_FAILURE
-Expressions/SeqExpr/FilterExpr//K-FilterExpr-47, EXPECTED_RESULT_GOT_FAILURE
-Expressions/SeqExpr/FilterExpr//K-FilterExpr-48, EXPECTED_RESULT_GOT_FAILURE
-Expressions/SeqExpr/FilterExpr//K-FilterExpr-49, EXPECTED_ERROR_GOT_FAILURE
+Expressions/SeqExpr/FilterExpr//K-FilterExpr-40, EXPECTED_ERROR_GOT_RESULT
+Expressions/SeqExpr/FilterExpr//K-FilterExpr-41, EXPECTED_RESULT_GOT_SAME_RESULT
+Expressions/SeqExpr/FilterExpr//K-FilterExpr-42, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+Expressions/SeqExpr/FilterExpr//K-FilterExpr-43, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+Expressions/SeqExpr/FilterExpr//K-FilterExpr-44, EXPECTED_RESULT_GOT_ERROR
+Expressions/SeqExpr/FilterExpr//K-FilterExpr-45, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+Expressions/SeqExpr/FilterExpr//K-FilterExpr-46, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+Expressions/SeqExpr/FilterExpr//K-FilterExpr-47, EXPECTED_RESULT_GOT_SAME_RESULT
+Expressions/SeqExpr/FilterExpr//K-FilterExpr-48, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+Expressions/SeqExpr/FilterExpr//K-FilterExpr-49, EXPECTED_ERROR_GOT_RESULT
Expressions/SeqExpr/FilterExpr//K-FilterExpr-5, EXPECTED_ERROR_GOT_SAME_ERROR
-Expressions/SeqExpr/FilterExpr//K-FilterExpr-50, EXPECTED_RESULT_GOT_FAILURE
-Expressions/SeqExpr/FilterExpr//K-FilterExpr-51, EXPECTED_ERROR_GOT_FAILURE
-Expressions/SeqExpr/FilterExpr//K-FilterExpr-52, EXPECTED_ERROR_GOT_FAILURE
-Expressions/SeqExpr/FilterExpr//K-FilterExpr-53, EXPECTED_ERROR_GOT_FAILURE
-Expressions/SeqExpr/FilterExpr//K-FilterExpr-54, EXPECTED_ERROR_GOT_FAILURE
-Expressions/SeqExpr/FilterExpr//K-FilterExpr-55, EXPECTED_ERROR_GOT_FAILURE
-Expressions/SeqExpr/FilterExpr//K-FilterExpr-56, EXPECTED_ERROR_GOT_FAILURE
-Expressions/SeqExpr/FilterExpr//K-FilterExpr-57, EXPECTED_ERROR_GOT_FAILURE
-Expressions/SeqExpr/FilterExpr//K-FilterExpr-58, EXPECTED_ERROR_GOT_FAILURE
-Expressions/SeqExpr/FilterExpr//K-FilterExpr-59, EXPECTED_ERROR_GOT_FAILURE
-Expressions/SeqExpr/FilterExpr//K-FilterExpr-6, EXPECTED_RESULT_GOT_FAILURE
-Expressions/SeqExpr/FilterExpr//K-FilterExpr-60, EXPECTED_RESULT_GOT_FAILURE
-Expressions/SeqExpr/FilterExpr//K-FilterExpr-61, EXPECTED_RESULT_GOT_FAILURE
-Expressions/SeqExpr/FilterExpr//K-FilterExpr-62, EXPECTED_RESULT_GOT_FAILURE
-Expressions/SeqExpr/FilterExpr//K-FilterExpr-63, EXPECTED_RESULT_GOT_FAILURE
-Expressions/SeqExpr/FilterExpr//K-FilterExpr-64, EXPECTED_RESULT_GOT_FAILURE
-Expressions/SeqExpr/FilterExpr//K-FilterExpr-65, EXPECTED_RESULT_GOT_FAILURE
-Expressions/SeqExpr/FilterExpr//K-FilterExpr-66, EXPECTED_RESULT_GOT_FAILURE
-Expressions/SeqExpr/FilterExpr//K-FilterExpr-67, EXPECTED_RESULT_GOT_FAILURE
-Expressions/SeqExpr/FilterExpr//K-FilterExpr-68, EXPECTED_RESULT_GOT_FAILURE
-Expressions/SeqExpr/FilterExpr//K-FilterExpr-69, EXPECTED_RESULT_GOT_FAILURE
-Expressions/SeqExpr/FilterExpr//K-FilterExpr-7, EXPECTED_RESULT_GOT_FAILURE
-Expressions/SeqExpr/FilterExpr//K-FilterExpr-70, EXPECTED_RESULT_GOT_FAILURE
-Expressions/SeqExpr/FilterExpr//K-FilterExpr-71, EXPECTED_RESULT_GOT_FAILURE
-Expressions/SeqExpr/FilterExpr//K-FilterExpr-72, EXPECTED_RESULT_GOT_FAILURE
-Expressions/SeqExpr/FilterExpr//K-FilterExpr-73, EXPECTED_RESULT_GOT_FAILURE
-Expressions/SeqExpr/FilterExpr//K-FilterExpr-74, EXPECTED_RESULT_GOT_FAILURE
-Expressions/SeqExpr/FilterExpr//K-FilterExpr-75, EXPECTED_ERROR_GOT_FAILURE
-Expressions/SeqExpr/FilterExpr//K-FilterExpr-76, EXPECTED_ERROR_GOT_FAILURE
-Expressions/SeqExpr/FilterExpr//K-FilterExpr-77, EXPECTED_ERROR_GOT_FAILURE
-Expressions/SeqExpr/FilterExpr//K-FilterExpr-78, EXPECTED_RESULT_GOT_FAILURE
-Expressions/SeqExpr/FilterExpr//K-FilterExpr-79, EXPECTED_RESULT_GOT_FAILURE
-Expressions/SeqExpr/FilterExpr//K-FilterExpr-8, EXPECTED_RESULT_GOT_FAILURE
-Expressions/SeqExpr/FilterExpr//K-FilterExpr-80, EXPECTED_RESULT_GOT_FAILURE
-Expressions/SeqExpr/FilterExpr//K-FilterExpr-81, EXPECTED_RESULT_GOT_FAILURE
-Expressions/SeqExpr/FilterExpr//K-FilterExpr-82, EXPECTED_ERROR_GOT_FAILURE
-Expressions/SeqExpr/FilterExpr//K-FilterExpr-83, EXPECTED_ERROR_GOT_FAILURE
-Expressions/SeqExpr/FilterExpr//K-FilterExpr-84, EXPECTED_ERROR_GOT_FAILURE
-Expressions/SeqExpr/FilterExpr//K-FilterExpr-85, EXPECTED_ERROR_GOT_FAILURE
-Expressions/SeqExpr/FilterExpr//K-FilterExpr-86, EXPECTED_RESULT_GOT_FAILURE
-Expressions/SeqExpr/FilterExpr//K-FilterExpr-87, EXPECTED_RESULT_GOT_FAILURE
-Expressions/SeqExpr/FilterExpr//K-FilterExpr-88, EXPECTED_ERROR_GOT_FAILURE
-Expressions/SeqExpr/FilterExpr//K-FilterExpr-89, EXPECTED_RESULT_GOT_FAILURE
-Expressions/SeqExpr/FilterExpr//K-FilterExpr-9, EXPECTED_RESULT_GOT_FAILURE
-Expressions/SeqExpr/FilterExpr//K-FilterExpr-90, EXPECTED_RESULT_GOT_FAILURE
-Expressions/SeqExpr/FilterExpr//K-FilterExpr-91, EXPECTED_ERROR_GOT_FAILURE
-Expressions/SeqExpr/FilterExpr//K-FilterExpr-92, EXPECTED_ERROR_GOT_FAILURE
-Expressions/SeqExpr/FilterExpr//K-FilterExpr-93, EXPECTED_ERROR_GOT_FAILURE
-Expressions/SeqExpr/FilterExpr//K-FilterExpr-94, EXPECTED_ERROR_GOT_FAILURE
+Expressions/SeqExpr/FilterExpr//K-FilterExpr-50, EXPECTED_RESULT_GOT_ERROR
+Expressions/SeqExpr/FilterExpr//K-FilterExpr-51, EXPECTED_ERROR_GOT_RESULT
+Expressions/SeqExpr/FilterExpr//K-FilterExpr-52, EXPECTED_ERROR_GOT_RESULT
+Expressions/SeqExpr/FilterExpr//K-FilterExpr-53, EXPECTED_ERROR_GOT_SAME_ERROR
+Expressions/SeqExpr/FilterExpr//K-FilterExpr-54, EXPECTED_ERROR_GOT_RESULT
+Expressions/SeqExpr/FilterExpr//K-FilterExpr-55, EXPECTED_ERROR_GOT_RESULT
+Expressions/SeqExpr/FilterExpr//K-FilterExpr-56, EXPECTED_ERROR_GOT_RESULT
+Expressions/SeqExpr/FilterExpr//K-FilterExpr-57, EXPECTED_ERROR_GOT_RESULT
+Expressions/SeqExpr/FilterExpr//K-FilterExpr-58, EXPECTED_ERROR_GOT_RESULT
+Expressions/SeqExpr/FilterExpr//K-FilterExpr-59, EXPECTED_ERROR_GOT_RESULT
+Expressions/SeqExpr/FilterExpr//K-FilterExpr-6, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+Expressions/SeqExpr/FilterExpr//K-FilterExpr-60, EXPECTED_RESULT_GOT_ERROR
+Expressions/SeqExpr/FilterExpr//K-FilterExpr-61, EXPECTED_RESULT_GOT_ERROR
+Expressions/SeqExpr/FilterExpr//K-FilterExpr-62, EXPECTED_RESULT_GOT_ERROR
+Expressions/SeqExpr/FilterExpr//K-FilterExpr-63, EXPECTED_RESULT_GOT_ERROR
+Expressions/SeqExpr/FilterExpr//K-FilterExpr-64, EXPECTED_RESULT_GOT_ERROR
+Expressions/SeqExpr/FilterExpr//K-FilterExpr-65, EXPECTED_RESULT_GOT_ERROR
+Expressions/SeqExpr/FilterExpr//K-FilterExpr-66, EXPECTED_RESULT_GOT_SAME_RESULT
+Expressions/SeqExpr/FilterExpr//K-FilterExpr-67, EXPECTED_RESULT_GOT_SAME_RESULT
+Expressions/SeqExpr/FilterExpr//K-FilterExpr-68, EXPECTED_RESULT_GOT_SAME_RESULT
+Expressions/SeqExpr/FilterExpr//K-FilterExpr-69, EXPECTED_RESULT_GOT_ERROR
+Expressions/SeqExpr/FilterExpr//K-FilterExpr-7, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+Expressions/SeqExpr/FilterExpr//K-FilterExpr-70, EXPECTED_RESULT_GOT_ERROR
+Expressions/SeqExpr/FilterExpr//K-FilterExpr-71, EXPECTED_RESULT_GOT_ERROR
+Expressions/SeqExpr/FilterExpr//K-FilterExpr-72, EXPECTED_RESULT_GOT_ERROR
+Expressions/SeqExpr/FilterExpr//K-FilterExpr-73, EXPECTED_RESULT_GOT_SAME_RESULT
+Expressions/SeqExpr/FilterExpr//K-FilterExpr-74, EXPECTED_RESULT_GOT_SAME_RESULT
+Expressions/SeqExpr/FilterExpr//K-FilterExpr-75, EXPECTED_ERROR_GOT_SAME_ERROR
+Expressions/SeqExpr/FilterExpr//K-FilterExpr-76, EXPECTED_ERROR_GOT_RESULT
+Expressions/SeqExpr/FilterExpr//K-FilterExpr-77, EXPECTED_ERROR_GOT_RESULT
+Expressions/SeqExpr/FilterExpr//K-FilterExpr-78, EXPECTED_RESULT_GOT_SAME_RESULT
+Expressions/SeqExpr/FilterExpr//K-FilterExpr-79, EXPECTED_RESULT_GOT_SAME_RESULT
+Expressions/SeqExpr/FilterExpr//K-FilterExpr-8, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+Expressions/SeqExpr/FilterExpr//K-FilterExpr-80, EXPECTED_RESULT_GOT_SAME_RESULT
+Expressions/SeqExpr/FilterExpr//K-FilterExpr-81, EXPECTED_RESULT_GOT_ERROR
+Expressions/SeqExpr/FilterExpr//K-FilterExpr-82, EXPECTED_ERROR_GOT_RESULT
+Expressions/SeqExpr/FilterExpr//K-FilterExpr-83, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
+Expressions/SeqExpr/FilterExpr//K-FilterExpr-84, EXPECTED_ERROR_GOT_RESULT
+Expressions/SeqExpr/FilterExpr//K-FilterExpr-85, EXPECTED_ERROR_GOT_RESULT
+Expressions/SeqExpr/FilterExpr//K-FilterExpr-86, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+Expressions/SeqExpr/FilterExpr//K-FilterExpr-87, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+Expressions/SeqExpr/FilterExpr//K-FilterExpr-88, EXPECTED_ERROR_GOT_RESULT
+Expressions/SeqExpr/FilterExpr//K-FilterExpr-89, EXPECTED_RESULT_GOT_ERROR
+Expressions/SeqExpr/FilterExpr//K-FilterExpr-9, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+Expressions/SeqExpr/FilterExpr//K-FilterExpr-90, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+Expressions/SeqExpr/FilterExpr//K-FilterExpr-91, EXPECTED_ERROR_GOT_SAME_ERROR
+Expressions/SeqExpr/FilterExpr//K-FilterExpr-92, EXPECTED_ERROR_GOT_RESULT
+Expressions/SeqExpr/FilterExpr//K-FilterExpr-93, EXPECTED_ERROR_GOT_RESULT
+Expressions/SeqExpr/FilterExpr//K-FilterExpr-94, EXPECTED_ERROR_GOT_RESULT
Expressions/SeqExpr/FilterExpr//filterexpressionhc1, EXPECTED_RESULT_GOT_FAILURE
-Expressions/SeqExpr/FilterExpr//filterexpressionhc10, EXPECTED_RESULT_GOT_FAILURE
-Expressions/SeqExpr/FilterExpr//filterexpressionhc11, EXPECTED_RESULT_GOT_FAILURE
-Expressions/SeqExpr/FilterExpr//filterexpressionhc12, EXPECTED_RESULT_GOT_FAILURE
-Expressions/SeqExpr/FilterExpr//filterexpressionhc13, EXPECTED_RESULT_GOT_FAILURE
-Expressions/SeqExpr/FilterExpr//filterexpressionhc14, EXPECTED_RESULT_GOT_FAILURE
-Expressions/SeqExpr/FilterExpr//filterexpressionhc15, EXPECTED_RESULT_GOT_FAILURE
-Expressions/SeqExpr/FilterExpr//filterexpressionhc16, EXPECTED_RESULT_GOT_FAILURE
-Expressions/SeqExpr/FilterExpr//filterexpressionhc17, EXPECTED_RESULT_GOT_FAILURE
-Expressions/SeqExpr/FilterExpr//filterexpressionhc18, EXPECTED_RESULT_GOT_FAILURE
-Expressions/SeqExpr/FilterExpr//filterexpressionhc19, EXPECTED_RESULT_GOT_FAILURE
-Expressions/SeqExpr/FilterExpr//filterexpressionhc2, EXPECTED_RESULT_GOT_FAILURE
-Expressions/SeqExpr/FilterExpr//filterexpressionhc20, EXPECTED_RESULT_GOT_FAILURE
-Expressions/SeqExpr/FilterExpr//filterexpressionhc21, EXPECTED_RESULT_GOT_FAILURE
-Expressions/SeqExpr/FilterExpr//filterexpressionhc22, EXPECTED_ERROR_GOT_FAILURE
-Expressions/SeqExpr/FilterExpr//filterexpressionhc3, EXPECTED_RESULT_GOT_FAILURE
+Expressions/SeqExpr/FilterExpr//filterexpressionhc10, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+Expressions/SeqExpr/FilterExpr//filterexpressionhc11, EXPECTED_RESULT_GOT_SAME_RESULT
+Expressions/SeqExpr/FilterExpr//filterexpressionhc12, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+Expressions/SeqExpr/FilterExpr//filterexpressionhc13, EXPECTED_RESULT_GOT_SAME_RESULT
+Expressions/SeqExpr/FilterExpr//filterexpressionhc14, EXPECTED_RESULT_GOT_SAME_RESULT
+Expressions/SeqExpr/FilterExpr//filterexpressionhc15, EXPECTED_RESULT_GOT_SAME_RESULT
+Expressions/SeqExpr/FilterExpr//filterexpressionhc16, EXPECTED_RESULT_GOT_SAME_RESULT
+Expressions/SeqExpr/FilterExpr//filterexpressionhc17, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+Expressions/SeqExpr/FilterExpr//filterexpressionhc18, EXPECTED_RESULT_GOT_SAME_RESULT
+Expressions/SeqExpr/FilterExpr//filterexpressionhc19, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+Expressions/SeqExpr/FilterExpr//filterexpressionhc2, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+Expressions/SeqExpr/FilterExpr//filterexpressionhc20, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+Expressions/SeqExpr/FilterExpr//filterexpressionhc21, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+Expressions/SeqExpr/FilterExpr//filterexpressionhc22, EXPECTED_ERROR_GOT_RESULT
+Expressions/SeqExpr/FilterExpr//filterexpressionhc3, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/SeqExpr/FilterExpr//filterexpressionhc4, EXPECTED_RESULT_GOT_ERROR
Expressions/SeqExpr/FilterExpr//filterexpressionhc5, EXPECTED_RESULT_GOT_FAILURE
-Expressions/SeqExpr/FilterExpr//filterexpressionhc6, EXPECTED_RESULT_GOT_FAILURE
-Expressions/SeqExpr/FilterExpr//filterexpressionhc7, EXPECTED_RESULT_GOT_FAILURE
-Expressions/SeqExpr/FilterExpr//filterexpressionhc8, EXPECTED_RESULT_GOT_FAILURE
-Expressions/SeqExpr/FilterExpr//filterexpressionhc9, EXPECTED_RESULT_GOT_FAILURE
+Expressions/SeqExpr/FilterExpr//filterexpressionhc6, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+Expressions/SeqExpr/FilterExpr//filterexpressionhc7, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+Expressions/SeqExpr/FilterExpr//filterexpressionhc8, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+Expressions/SeqExpr/FilterExpr//filterexpressionhc9, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/SeqExpr/RangeExpr//rangeExpr-1, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Expressions/SeqExpr/RangeExpr//rangeExpr-10, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Expressions/SeqExpr/RangeExpr//rangeExpr-11, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
@@ -10600,7 +10600,7 @@ FLWORExpr/OrderbyExpr/OrderbyExprWithout//K2-OrderbyExprWithout-13, EXPECTED_RES
FLWORExpr/OrderbyExpr/OrderbyExprWithout//K2-OrderbyExprWithout-14, EXPECTED_RESULT_GOT_FAILURE
FLWORExpr/OrderbyExpr/OrderbyExprWithout//K2-OrderbyExprWithout-15, EXPECTED_ERROR_GOT_FAILURE
FLWORExpr/OrderbyExpr/OrderbyExprWithout//K2-OrderbyExprWithout-16, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-FLWORExpr/OrderbyExpr/OrderbyExprWithout//K2-OrderbyExprWithout-17, EXPECTED_RESULT_GOT_FAILURE
+FLWORExpr/OrderbyExpr/OrderbyExprWithout//K2-OrderbyExprWithout-17, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
FLWORExpr/OrderbyExpr/OrderbyExprWithout//K2-OrderbyExprWithout-18, EXPECTED_RESULT_GOT_SAME_RESULT
FLWORExpr/OrderbyExpr/OrderbyExprWithout//K2-OrderbyExprWithout-19, EXPECTED_ERROR_GOT_RESULT
FLWORExpr/OrderbyExpr/OrderbyExprWithout//K2-OrderbyExprWithout-2, EXPECTED_ERROR_GOT_RESULT
@@ -10618,10 +10618,10 @@ FLWORExpr/OrderbyExpr/OrderbyExprWithout//K2-OrderbyExprWithout-3, EXPECTED_ERRO
FLWORExpr/OrderbyExpr/OrderbyExprWithout//K2-OrderbyExprWithout-30, EXPECTED_ERROR_GOT_RESULT
FLWORExpr/OrderbyExpr/OrderbyExprWithout//K2-OrderbyExprWithout-31, EXPECTED_ERROR_GOT_RESULT
FLWORExpr/OrderbyExpr/OrderbyExprWithout//K2-OrderbyExprWithout-32, EXPECTED_ERROR_GOT_RESULT
-FLWORExpr/OrderbyExpr/OrderbyExprWithout//K2-OrderbyExprWithout-33, EXPECTED_ERROR_GOT_FAILURE
-FLWORExpr/OrderbyExpr/OrderbyExprWithout//K2-OrderbyExprWithout-34, EXPECTED_ERROR_GOT_FAILURE
-FLWORExpr/OrderbyExpr/OrderbyExprWithout//K2-OrderbyExprWithout-35, EXPECTED_ERROR_GOT_FAILURE
-FLWORExpr/OrderbyExpr/OrderbyExprWithout//K2-OrderbyExprWithout-36, EXPECTED_ERROR_GOT_FAILURE
+FLWORExpr/OrderbyExpr/OrderbyExprWithout//K2-OrderbyExprWithout-33, EXPECTED_ERROR_GOT_RESULT
+FLWORExpr/OrderbyExpr/OrderbyExprWithout//K2-OrderbyExprWithout-34, EXPECTED_ERROR_GOT_RESULT
+FLWORExpr/OrderbyExpr/OrderbyExprWithout//K2-OrderbyExprWithout-35, EXPECTED_ERROR_GOT_RESULT
+FLWORExpr/OrderbyExpr/OrderbyExprWithout//K2-OrderbyExprWithout-36, EXPECTED_ERROR_GOT_RESULT
FLWORExpr/OrderbyExpr/OrderbyExprWithout//K2-OrderbyExprWithout-37, EXPECTED_ERROR_GOT_RESULT
FLWORExpr/OrderbyExpr/OrderbyExprWithout//K2-OrderbyExprWithout-38, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
FLWORExpr/OrderbyExpr/OrderbyExprWithout//K2-OrderbyExprWithout-39, EXPECTED_ERROR_GOT_RESULT
@@ -10645,137 +10645,137 @@ FLWORExpr/ReturnExpr//K2-ReturnExpr-1, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
FLWORExpr/WhereExpr//K2-WhereExpr-1, EXPECTED_ERROR_GOT_SAME_ERROR
FLWORExpr/WhereExpr//K2-WhereExpr-2, EXPECTED_ERROR_GOT_SAME_ERROR
FullAxis/ancestor-or-selfAxis//ancestorself-1, EXPECTED_ERROR_GOT_FAILURE
-FullAxis/ancestor-or-selfAxis//ancestorself-10, EXPECTED_RESULT_GOT_FAILURE
+FullAxis/ancestor-or-selfAxis//ancestorself-10, EXPECTED_RESULT_GOT_ERROR
FullAxis/ancestor-or-selfAxis//ancestorself-11, EXPECTED_RESULT_GOT_FAILURE
FullAxis/ancestor-or-selfAxis//ancestorself-12, EXPECTED_RESULT_GOT_FAILURE
-FullAxis/ancestor-or-selfAxis//ancestorself-13, EXPECTED_RESULT_GOT_FAILURE
-FullAxis/ancestor-or-selfAxis//ancestorself-14, EXPECTED_RESULT_GOT_FAILURE
-FullAxis/ancestor-or-selfAxis//ancestorself-15, EXPECTED_RESULT_GOT_FAILURE
-FullAxis/ancestor-or-selfAxis//ancestorself-16, EXPECTED_RESULT_GOT_FAILURE
-FullAxis/ancestor-or-selfAxis//ancestorself-17, EXPECTED_RESULT_GOT_FAILURE
-FullAxis/ancestor-or-selfAxis//ancestorself-18, EXPECTED_RESULT_GOT_FAILURE
-FullAxis/ancestor-or-selfAxis//ancestorself-19, EXPECTED_RESULT_G
<TRUNCATED>
[25/50] [abbrv] vxquery git commit: VXQUERY-183: remove references to
UCI mvn repo
Posted by sj...@apache.org.
VXQUERY-183: remove references to UCI mvn repo
Project: http://git-wip-us.apache.org/repos/asf/vxquery/repo
Commit: http://git-wip-us.apache.org/repos/asf/vxquery/commit/f2af2334
Tree: http://git-wip-us.apache.org/repos/asf/vxquery/tree/f2af2334
Diff: http://git-wip-us.apache.org/repos/asf/vxquery/diff/f2af2334
Branch: refs/heads/site
Commit: f2af233487ca5b0c271dade1fd8a42c5a3b9e6ae
Parents: 51a9893
Author: Till Westmann <ti...@apache.org>
Authored: Fri Feb 19 18:02:16 2016 -0800
Committer: Till Westmann <ti...@apache.org>
Committed: Fri Feb 19 18:02:16 2016 -0800
----------------------------------------------------------------------
pom.xml | 21 ---------------------
1 file changed, 21 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/vxquery/blob/f2af2334/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index ca69e97..259624a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -157,27 +157,6 @@
</site>
</distributionManagement>
- <repositories>
- <repository>
- <id>hyracks-snapshots</id>
- <url>http://obelix.ics.uci.edu/nexus/content/repositories/hyracks-snapshots/</url>
- <snapshots>
- </snapshots>
- </repository>
- <repository>
- <id>hyracks-releases</id>
- <url>http://obelix.ics.uci.edu/nexus/content/repositories/hyracks-releases/</url>
- <releases>
- </releases>
- </repository>
- <repository>
- <id>hyracks-thirdparty</id>
- <url>http://obelix.ics.uci.edu/nexus/content/repositories/hyracks-thirdparty/</url>
- <releases>
- </releases>
- </repository>
- </repositories>
-
<dependencyManagement>
<dependencies>
<dependency>
[07/50] [abbrv] vxquery git commit: Unnesting rule and code additions
to support XMark Query 8.
Posted by sj...@apache.org.
Unnesting rule and code additions to support XMark Query 8.
Project: http://git-wip-us.apache.org/repos/asf/vxquery/repo
Commit: http://git-wip-us.apache.org/repos/asf/vxquery/commit/7fc0d93b
Tree: http://git-wip-us.apache.org/repos/asf/vxquery/tree/7fc0d93b
Diff: http://git-wip-us.apache.org/repos/asf/vxquery/diff/7fc0d93b
Branch: refs/heads/site
Commit: 7fc0d93b4f83fa9ead1f053bf041e1b871ee9f33
Parents: 3e40e5a
Author: Preston Carman <pr...@apache.org>
Authored: Thu Aug 13 14:48:17 2015 -0700
Committer: Preston Carman <pr...@apache.org>
Committed: Thu Aug 13 14:48:17 2015 -0700
----------------------------------------------------------------------
.../java/org/apache/vxquery/cli/VXQuery.java | 54 +-
.../compiler/rewriter/RewriteRuleset.java | 50 +-
.../rewriter/rules/ConsolidateUnnestsRule.java | 79 +-
.../rules/ConvertAssignToUnnestRule.java | 31 +-
.../ConvertFromAlgebricksExpressionsRule.java | 33 +-
.../ConvertToAlgebricksExpressionsRule.java | 16 +-
.../rules/InlineNestedVariablesRule.java | 97 --
.../ExtractFunctionsFromJoinConditionRule.java | 141 ++
.../InlineNestedVariablesRule.java | 97 ++
...oveFreeVariableOperatorOutOfSubplanRule.java | 178 +++
...GeneralComparisonScalarEvaluatorFactory.java | 12 +-
.../IfThenElseScalarEvaluatorFactory.java | 37 +-
.../vxquery/serializer/XMLSerializer.java | 9 +-
.../xmlquery/query/XMLQueryCompiler.java | 10 +-
.../xmlquery/translator/XMLQueryTranslator.java | 42 +-
vxquery-xtest/pom.xml | 1 +
vxquery-xtest/results/xqts.txt | 1480 +++++++++---------
.../org/apache/vxquery/xtest/XTestOptions.java | 38 +-
.../vxquery/xtest/AbstractXQueryTest.java | 6 +-
.../org/apache/vxquery/xtest/VXQueryTest.java | 4 +-
.../apache/vxquery/xtest/VXQueryXMarkTest.java | 55 +
.../org/apache/vxquery/xtest/XMarkTest.java | 5 +-
.../java/org/apache/vxquery/xtest/XQTSTest.java | 2 +-
.../Queries/XQuery/XMark/Modified/q08.xq | 2 +-
24 files changed, 1465 insertions(+), 1014 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/vxquery/blob/7fc0d93b/vxquery-cli/src/main/java/org/apache/vxquery/cli/VXQuery.java
----------------------------------------------------------------------
diff --git a/vxquery-cli/src/main/java/org/apache/vxquery/cli/VXQuery.java b/vxquery-cli/src/main/java/org/apache/vxquery/cli/VXQuery.java
index 5b99978..cf21c76 100644
--- a/vxquery-cli/src/main/java/org/apache/vxquery/cli/VXQuery.java
+++ b/vxquery-cli/src/main/java/org/apache/vxquery/cli/VXQuery.java
@@ -77,7 +77,7 @@ public class VXQuery {
/**
* Constructor to use command line options passed.
- *
+ *
* @param opts
* Command line options object
*/
@@ -87,7 +87,7 @@ public class VXQuery {
/**
* Main method to get command line options and execute query process.
- *
+ *
* @param args
* @throws Exception
*/
@@ -134,7 +134,7 @@ public class VXQuery {
/**
* Creates a new Hyracks connection with: the client IP address and port provided, if IP address is provided in command line. Otherwise create a new virtual
* cluster with Hyracks nodes. Queries passed are run either way. After running queries, if a virtual cluster has been created, it is shut down.
- *
+ *
* @throws Exception
*/
private void execute() throws Exception {
@@ -160,7 +160,7 @@ public class VXQuery {
/**
* Reads the contents of the files passed in the list of arguments to a string. If -showquery argument is passed, output the query as string. Run the query
* for the string.
- *
+ *
* @throws IOException
* @throws SystemException
* @throws Exception
@@ -226,7 +226,7 @@ public class VXQuery {
/**
* Get cluster node configuration.
- *
+ *
* @return Configuration of node controllers as array of Strings.
* @throws Exception
*/
@@ -243,7 +243,7 @@ public class VXQuery {
/**
* Creates a Hyracks dataset, if not already existing with the job frame size, and 1 reader. Allocates a new buffer of size specified in the frame of Hyracks
* node. Creates new dataset reader with the current job ID and result set ID. Outputs the string in buffer for each frame.
- *
+ *
* @param spec
* JobSpecification object, containing frame size. Current specified job.
* @param writer
@@ -274,7 +274,7 @@ public class VXQuery {
/**
* Create a unique result set id to get the correct query back from the cluster.
- *
+ *
* @return Result Set id generated with current system time.
*/
protected ResultSetId createResultSetId() {
@@ -284,7 +284,7 @@ public class VXQuery {
/**
* Start local virtual cluster with cluster controller node and node controller nodes. IP address provided for node controller is localhost. Unassigned ports
* 39000 and 39001 are used for client and cluster port respectively. Creates a new Hyracks connection with the IP address and client ports.
- *
+ *
* @throws Exception
*/
public void startLocalHyracks() throws Exception {
@@ -317,7 +317,7 @@ public class VXQuery {
/**
* Shuts down the virtual cluster, along with all nodes and node execution, network and queue managers.
- *
+ *
* @throws Exception
*/
public void stopLocalHyracks() throws Exception {
@@ -329,7 +329,7 @@ public class VXQuery {
/**
* Reads the contents of file given in query into a String. The file is always closed. For XML files UTF-8 encoding is used.
- *
+ *
* @param query
* The query with filename to be processed
* @return UTF-8 formatted query string
@@ -341,7 +341,7 @@ public class VXQuery {
/**
* Save and print out the timing message.
- *
+ *
* @param message
*/
private static void timingMessage(String message) {
@@ -353,55 +353,55 @@ public class VXQuery {
* Helper class with fields and methods to handle all command line options
*/
private static class CmdLineOptions {
- @Option(name = "-available-processors", usage = "Number of available processors. (default java's available processors)")
+ @Option(name = "-available-processors", usage = "Number of available processors. (default: java's available processors)")
private int availableProcessors = -1;
- @Option(name = "-client-net-ip-address", usage = "IP Address of the ClusterController")
+ @Option(name = "-client-net-ip-address", usage = "IP Address of the ClusterController.")
private String clientNetIpAddress = null;
- @Option(name = "-client-net-port", usage = "Port of the ClusterController (default 1098)")
+ @Option(name = "-client-net-port", usage = "Port of the ClusterController. (default: 1098)")
private int clientNetPort = 1098;
- @Option(name = "-local-node-controllers", usage = "Number of local node controllers (default 1)")
+ @Option(name = "-local-node-controllers", usage = "Number of local node controllers. (default: 1)")
private int localNodeControllers = 1;
- @Option(name = "-frame-size", usage = "Frame size in bytes. (default 65,536)")
+ @Option(name = "-frame-size", usage = "Frame size in bytes. (default: 65,536)")
private int frameSize = 65536;
- @Option(name = "-join-hash-size", usage = "Join hash size in bytes. (default 67,108,864)")
+ @Option(name = "-join-hash-size", usage = "Join hash size in bytes. (default: 67,108,864)")
private long joinHashSize = -1;
- @Option(name = "-maximum-data-size", usage = "Maximum possible data size in bytes. (default 150,323,855,000)")
+ @Option(name = "-maximum-data-size", usage = "Maximum possible data size in bytes. (default: 150,323,855,000)")
private long maximumDataSize = -1;
@Option(name = "-buffer-size", usage = "Disk read buffer size in bytes.")
private int bufferSize = -1;
- @Option(name = "-O", usage = "Optimization Level. Default: Full Optimization")
+ @Option(name = "-O", usage = "Optimization Level. (default: Full Optimization)")
private int optimizationLevel = Integer.MAX_VALUE;
- @Option(name = "-showquery", usage = "Show query string")
+ @Option(name = "-showquery", usage = "Show query string.")
private boolean showQuery;
- @Option(name = "-showast", usage = "Show abstract syntax tree")
+ @Option(name = "-showast", usage = "Show abstract syntax tree.")
private boolean showAST;
- @Option(name = "-showtet", usage = "Show translated expression tree")
+ @Option(name = "-showtet", usage = "Show translated expression tree.")
private boolean showTET;
- @Option(name = "-showoet", usage = "Show optimized expression tree")
+ @Option(name = "-showoet", usage = "Show optimized expression tree.")
private boolean showOET;
- @Option(name = "-showrp", usage = "Show Runtime plan")
+ @Option(name = "-showrp", usage = "Show Runtime plan.")
private boolean showRP;
- @Option(name = "-compileonly", usage = "Compile the query and stop")
+ @Option(name = "-compileonly", usage = "Compile the query and stop.")
private boolean compileOnly;
- @Option(name = "-repeatexec", usage = "Number of times to repeat execution")
+ @Option(name = "-repeatexec", usage = "Number of times to repeat execution.")
private int repeatExec = 1;
- @Option(name = "-timing", usage = "Produce timing information")
+ @Option(name = "-timing", usage = "Produce timing information.")
private boolean timing;
@Option(name = "-timing-ignore-queries", usage = "Ignore the first X number of quereies.")
http://git-wip-us.apache.org/repos/asf/vxquery/blob/7fc0d93b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/RewriteRuleset.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/RewriteRuleset.java b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/RewriteRuleset.java
index 7b55856..c3d0358 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/RewriteRuleset.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/RewriteRuleset.java
@@ -22,13 +22,11 @@ import java.util.List;
import org.apache.vxquery.compiler.rewriter.rules.ConsolidateDescandantChild;
import org.apache.vxquery.compiler.rewriter.rules.ConsolidateAssignAggregateRule;
import org.apache.vxquery.compiler.rewriter.rules.ConvertAssignToUnnestRule;
-import org.apache.vxquery.compiler.rewriter.rules.ReplaceSourceMapInDocExpression;
import org.apache.vxquery.compiler.rewriter.rules.ConvertFromAlgebricksExpressionsRule;
import org.apache.vxquery.compiler.rewriter.rules.ConvertToAlgebricksExpressionsRule;
import org.apache.vxquery.compiler.rewriter.rules.EliminateSubplanForSingleItemsRule;
import org.apache.vxquery.compiler.rewriter.rules.EliminateUnnestAggregateSequencesRule;
import org.apache.vxquery.compiler.rewriter.rules.EliminateUnnestAggregateSubplanRule;
-import org.apache.vxquery.compiler.rewriter.rules.InlineNestedVariablesRule;
import org.apache.vxquery.compiler.rewriter.rules.IntroduceCollectionRule;
import org.apache.vxquery.compiler.rewriter.rules.IntroduceTwoStepAggregateRule;
import org.apache.vxquery.compiler.rewriter.rules.PushChildIntoDataScanRule;
@@ -40,17 +38,24 @@ import org.apache.vxquery.compiler.rewriter.rules.RemoveRedundantPromoteExpressi
import org.apache.vxquery.compiler.rewriter.rules.RemoveRedundantTreatExpressionsRule;
import org.apache.vxquery.compiler.rewriter.rules.RemoveUnusedSortDistinctNodesRule;
import org.apache.vxquery.compiler.rewriter.rules.RemoveUnusedUnnestIterateRule;
+import org.apache.vxquery.compiler.rewriter.rules.ReplaceSourceMapInDocExpression;
import org.apache.vxquery.compiler.rewriter.rules.SetCollectionDataSourceRule;
import org.apache.vxquery.compiler.rewriter.rules.SetVariableIdContextRule;
+import org.apache.vxquery.compiler.rewriter.rules.algebricksalternatives.ExtractFunctionsFromJoinConditionRule;
+import org.apache.vxquery.compiler.rewriter.rules.algebricksalternatives.InlineNestedVariablesRule;
+import org.apache.vxquery.compiler.rewriter.rules.algebricksalternatives.MoveFreeVariableOperatorOutOfSubplanRule;
import edu.uci.ics.hyracks.algebricks.core.rewriter.base.HeuristicOptimizer;
import edu.uci.ics.hyracks.algebricks.core.rewriter.base.IAlgebraicRewriteRule;
import edu.uci.ics.hyracks.algebricks.rewriter.rules.BreakSelectIntoConjunctsRule;
import edu.uci.ics.hyracks.algebricks.rewriter.rules.ComplexJoinInferenceRule;
+import edu.uci.ics.hyracks.algebricks.rewriter.rules.ComplexUnnestToProductRule;
import edu.uci.ics.hyracks.algebricks.rewriter.rules.ConsolidateAssignsRule;
import edu.uci.ics.hyracks.algebricks.rewriter.rules.ConsolidateSelectsRule;
import edu.uci.ics.hyracks.algebricks.rewriter.rules.CopyLimitDownRule;
+import edu.uci.ics.hyracks.algebricks.rewriter.rules.EliminateGroupByEmptyKeyRule;
import edu.uci.ics.hyracks.algebricks.rewriter.rules.EliminateSubplanRule;
+import edu.uci.ics.hyracks.algebricks.rewriter.rules.EliminateSubplanWithInputCardinalityOneRule;
import edu.uci.ics.hyracks.algebricks.rewriter.rules.EnforceStructuralPropertiesRule;
import edu.uci.ics.hyracks.algebricks.rewriter.rules.ExtractCommonOperatorsRule;
import edu.uci.ics.hyracks.algebricks.rewriter.rules.ExtractGbyExpressionsRule;
@@ -58,17 +63,21 @@ import edu.uci.ics.hyracks.algebricks.rewriter.rules.FactorRedundantGroupAndDeco
import edu.uci.ics.hyracks.algebricks.rewriter.rules.InferTypesRule;
import edu.uci.ics.hyracks.algebricks.rewriter.rules.InlineAssignIntoAggregateRule;
import edu.uci.ics.hyracks.algebricks.rewriter.rules.InlineVariablesRule;
+import edu.uci.ics.hyracks.algebricks.rewriter.rules.InsertOuterJoinRule;
+import edu.uci.ics.hyracks.algebricks.rewriter.rules.IntroJoinInsideSubplanRule;
import edu.uci.ics.hyracks.algebricks.rewriter.rules.IntroduceAggregateCombinerRule;
import edu.uci.ics.hyracks.algebricks.rewriter.rules.IntroduceGroupByCombinerRule;
+import edu.uci.ics.hyracks.algebricks.rewriter.rules.IntroduceGroupByForSubplanRule;
import edu.uci.ics.hyracks.algebricks.rewriter.rules.IntroduceProjectsRule;
import edu.uci.ics.hyracks.algebricks.rewriter.rules.IsolateHyracksOperatorsRule;
-import edu.uci.ics.hyracks.algebricks.rewriter.rules.MoveFreeVariableOperatorOutOfSubplanRule;
+import edu.uci.ics.hyracks.algebricks.rewriter.rules.NestedSubplanToJoinRule;
import edu.uci.ics.hyracks.algebricks.rewriter.rules.PullSelectOutOfEqJoin;
import edu.uci.ics.hyracks.algebricks.rewriter.rules.PushMapOperatorDownThroughProductRule;
import edu.uci.ics.hyracks.algebricks.rewriter.rules.PushProjectDownRule;
import edu.uci.ics.hyracks.algebricks.rewriter.rules.PushProjectIntoDataSourceScanRule;
import edu.uci.ics.hyracks.algebricks.rewriter.rules.PushSelectDownRule;
import edu.uci.ics.hyracks.algebricks.rewriter.rules.PushSelectIntoJoinRule;
+import edu.uci.ics.hyracks.algebricks.rewriter.rules.PushSubplanIntoGroupByRule;
import edu.uci.ics.hyracks.algebricks.rewriter.rules.PushSubplanWithAggregateDownThroughProductRule;
import edu.uci.ics.hyracks.algebricks.rewriter.rules.ReinferAllTypesRule;
import edu.uci.ics.hyracks.algebricks.rewriter.rules.RemoveRedundantVariablesRule;
@@ -76,6 +85,7 @@ import edu.uci.ics.hyracks.algebricks.rewriter.rules.RemoveUnusedAssignAndAggreg
import edu.uci.ics.hyracks.algebricks.rewriter.rules.SetAlgebricksPhysicalOperatorsRule;
import edu.uci.ics.hyracks.algebricks.rewriter.rules.SetExecutionModeRule;
import edu.uci.ics.hyracks.algebricks.rewriter.rules.SimpleUnnestToProductRule;
+import edu.uci.ics.hyracks.algebricks.rewriter.rules.SubplanOutOfGroupRule;
public class RewriteRuleset {
/**
@@ -98,7 +108,7 @@ public class RewriteRuleset {
// TODO Fix the group by operator before putting back in the rule set.
// normalization.add(new ConvertAssignSortDistinctNodesToOperatorsRule());
- // Find unnest followed by aggregate in a subplan.
+ // Find unnest followed by aggregate in a subplan.
normalization.add(new EliminateUnnestAggregateSubplanRule());
normalization.add(new RemoveRedundantVariablesRule());
normalization.add(new RemoveUnusedAssignAndAggregateRule());
@@ -199,6 +209,38 @@ public class RewriteRuleset {
return typeInfer;
}
+ /**
+ * Unnest more complex structures.
+ */
+ public final static List<IAlgebraicRewriteRule> buildUnnestingRuleCollection() {
+ List<IAlgebraicRewriteRule> xquery = new LinkedList<IAlgebraicRewriteRule>();
+
+ xquery.add(new PushSelectDownRule());
+ xquery.add(new SimpleUnnestToProductRule());
+ xquery.add(new ComplexUnnestToProductRule());
+ xquery.add(new ComplexJoinInferenceRule());
+ xquery.add(new PushSelectIntoJoinRule());
+ xquery.add(new IntroJoinInsideSubplanRule());
+ xquery.add(new PushMapOperatorDownThroughProductRule());
+ xquery.add(new PushSubplanWithAggregateDownThroughProductRule());
+ xquery.add(new IntroduceGroupByForSubplanRule());
+ xquery.add(new SubplanOutOfGroupRule());
+ xquery.add(new InsertOuterJoinRule());
+ xquery.add(new ExtractFunctionsFromJoinConditionRule());
+
+ xquery.add(new RemoveRedundantVariablesRule());
+ xquery.add(new RemoveUnusedAssignAndAggregateRule());
+
+ xquery.add(new FactorRedundantGroupAndDecorVarsRule());
+ xquery.add(new EliminateSubplanRule());
+ xquery.add(new EliminateGroupByEmptyKeyRule());
+ xquery.add(new PushSubplanIntoGroupByRule());
+ xquery.add(new NestedSubplanToJoinRule());
+ xquery.add(new EliminateSubplanWithInputCardinalityOneRule());
+
+ return xquery;
+ }
+
public final static List<IAlgebraicRewriteRule> buildNormalizationRuleCollection() {
List<IAlgebraicRewriteRule> normalization = new LinkedList<IAlgebraicRewriteRule>();
normalization.add(new EliminateSubplanRule());
http://git-wip-us.apache.org/repos/asf/vxquery/blob/7fc0d93b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/ConsolidateUnnestsRule.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/ConsolidateUnnestsRule.java b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/ConsolidateUnnestsRule.java
index 6a2bb08..f1b2196 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/ConsolidateUnnestsRule.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/ConsolidateUnnestsRule.java
@@ -37,26 +37,26 @@ import edu.uci.ics.hyracks.algebricks.core.algebra.operators.logical.UnnestOpera
* operator (2). XQuery unnest operator (1) must have a scalar implementation
* of the unnest function. If so the two unnest expressions can be merged
* together.
- *
+ *
* <pre>
- * Before
+ * Before
*
* plan__parent
* UNNEST( $v2 : uf2( $v1 ) )
* UNNEST( $v1 : uf1( $v0 ) )
* plan__child
- *
+ *
* Where $v1 is not used in plan__parent and uf1 is not a descendant expression.
- *
+ *
* After
*
* plan__parent
* UNNEST( $v2 : uf2( sf1( $v0 ) ) )
* plan__child
- *
+ *
* uf1 becomes sf1 since it changes from unnesting to scalar expression.
* </pre>
- *
+ *
* @author prestonc
*/
public class ConsolidateUnnestsRule extends AbstractUsedVariablesProcessingRule {
@@ -75,41 +75,42 @@ public class ConsolidateUnnestsRule extends AbstractUsedVariablesProcessingRule
}
UnnestOperator unnest2 = (UnnestOperator) op2;
- if (!usedVariables.contains(unnest2.getVariable())) {
- // Check to see if the unnest2 expression has a scalar implementation.
- ILogicalExpression logicalExpression2 = (ILogicalExpression) unnest2.getExpressionRef().getValue();
- if (logicalExpression2.getExpressionTag() != LogicalExpressionTag.FUNCTION_CALL) {
- return false;
- }
- AbstractFunctionCallExpression functionCall2 = (AbstractFunctionCallExpression) logicalExpression2;
- Function functionInfo2 = (Function) functionCall2.getFunctionInfo();
- if (!functionInfo2.hasScalarEvaluatorFactory()) {
- return false;
- }
- // Exception for specific path expressions.
- if (functionCall2.getFunctionIdentifier().equals(BuiltinOperators.DESCENDANT.getFunctionIdentifier())
- || functionCall2.getFunctionIdentifier().equals(
- BuiltinOperators.DESCENDANT_OR_SELF.getFunctionIdentifier())) {
- return false;
- }
-
- // Find unnest2 variable in unnest1
- Mutable<ILogicalExpression> unnest1Arg = ExpressionToolbox.findVariableExpression(
- unnest1.getExpressionRef(), unnest2.getVariable());
- if (unnest1Arg == null) {
- return false;
- }
+ if (usedVariables.contains(unnest2.getVariable())) {
+ return false;
+ }
- // Replace unnest2 expression in unnest1
- ScalarFunctionCallExpression child = new ScalarFunctionCallExpression(functionInfo2,
- functionCall2.getArguments());
- unnest1Arg.setValue(child);
+ // Check to see if the unnest2 expression has a scalar implementation.
+ ILogicalExpression logicalExpression2 = (ILogicalExpression) unnest2.getExpressionRef().getValue();
+ if (logicalExpression2.getExpressionTag() != LogicalExpressionTag.FUNCTION_CALL) {
+ return false;
+ }
+ AbstractFunctionCallExpression functionCall2 = (AbstractFunctionCallExpression) logicalExpression2;
+ Function functionInfo2 = (Function) functionCall2.getFunctionInfo();
+ if (!functionInfo2.hasScalarEvaluatorFactory()) {
+ return false;
+ }
+ // Exception for specific path expressions.
+ if (functionCall2.getFunctionIdentifier().equals(BuiltinOperators.DESCENDANT.getFunctionIdentifier())
+ || functionCall2.getFunctionIdentifier().equals(
+ BuiltinOperators.DESCENDANT_OR_SELF.getFunctionIdentifier())) {
+ return false;
+ }
- // Move input for unnest2 into unnest1
- unnest1.getInputs().clear();
- unnest1.getInputs().addAll(unnest2.getInputs());
- return true;
+ // Find unnest2 variable in unnest1
+ Mutable<ILogicalExpression> unnest1Arg = ExpressionToolbox.findVariableExpression(unnest1.getExpressionRef(),
+ unnest2.getVariable());
+ if (unnest1Arg == null) {
+ return false;
}
- return false;
+
+ // Replace unnest2 expression in unnest1
+ ScalarFunctionCallExpression child = new ScalarFunctionCallExpression(functionInfo2,
+ functionCall2.getArguments());
+ unnest1Arg.setValue(child);
+
+ // Move input for unnest2 into unnest1
+ unnest1.getInputs().clear();
+ unnest1.getInputs().addAll(unnest2.getInputs());
+ return true;
}
}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/7fc0d93b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/ConvertAssignToUnnestRule.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/ConvertAssignToUnnestRule.java b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/ConvertAssignToUnnestRule.java
index 72f6d03..28e54e4 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/ConvertAssignToUnnestRule.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/ConvertAssignToUnnestRule.java
@@ -31,12 +31,11 @@ import edu.uci.ics.hyracks.algebricks.core.algebra.expressions.UnnestingFunction
import edu.uci.ics.hyracks.algebricks.core.algebra.operators.logical.AbstractLogicalOperator;
import edu.uci.ics.hyracks.algebricks.core.algebra.operators.logical.AssignOperator;
import edu.uci.ics.hyracks.algebricks.core.algebra.operators.logical.UnnestOperator;
-import edu.uci.ics.hyracks.algebricks.core.rewriter.base.IAlgebraicRewriteRule;
/**
* The rule searches for unnest(iterate) operator followed by an assign(child)
* operator and merges the assign into the unnest operator.
- *
+ *
* <pre>
* Before
*
@@ -44,22 +43,23 @@ import edu.uci.ics.hyracks.algebricks.core.rewriter.base.IAlgebraicRewriteRule;
* UNNEST( $v2 : iterate( $v1 ) )
* ASSIGN( $v1 : sf1( $v0 ) )
* plan__child
- *
+ *
* where plan__parent does not use $v1 and $v0 is defined in plan__child.
* sf1 is a scalar function that has a unnesting implementation.
- *
+ *
* After
*
* plan__parent
* UNNEST( $v2 : uf1( $v0 ) )
* plan__child
* </pre>
- *
+ *
* @author prestonc
*/
-public class ConvertAssignToUnnestRule implements IAlgebraicRewriteRule {
+public class ConvertAssignToUnnestRule extends AbstractUsedVariablesProcessingRule {
@Override
- public boolean rewritePre(Mutable<ILogicalOperator> opRef, IOptimizationContext context) throws AlgebricksException {
+ protected boolean processOperator(Mutable<ILogicalOperator> opRef, IOptimizationContext context)
+ throws AlgebricksException {
AbstractLogicalOperator op = (AbstractLogicalOperator) opRef.getValue();
if (op.getOperatorTag() != LogicalOperatorTag.UNNEST) {
return false;
@@ -82,6 +82,10 @@ public class ConvertAssignToUnnestRule implements IAlgebraicRewriteRule {
}
AssignOperator assign = (AssignOperator) op2;
+ if (usedVariables.contains(assign.getVariables())) {
+ return false;
+ }
+
// Check to see if the expression has an unnesting implementation.
ILogicalExpression logicalExpression2 = (ILogicalExpression) assign.getExpressions().get(0).getValue();
if (logicalExpression2.getExpressionTag() != LogicalExpressionTag.FUNCTION_CALL) {
@@ -92,21 +96,16 @@ public class ConvertAssignToUnnestRule implements IAlgebraicRewriteRule {
if (!functionInfo2.hasUnnestingEvaluatorFactory()) {
return false;
}
-
- // TODO add checks for variables used that have now been removed.
// Update the unnest parameters.
unnest.getInputs().clear();
unnest.getInputs().addAll(assign.getInputs());
-
- UnnestingFunctionCallExpression child = new UnnestingFunctionCallExpression(functionInfo2, functionCall2.getArguments());
+
+ UnnestingFunctionCallExpression child = new UnnestingFunctionCallExpression(functionInfo2,
+ functionCall2.getArguments());
unnest.getExpressionRef().setValue(child);
-
+
return true;
}
- @Override
- public boolean rewritePost(Mutable<ILogicalOperator> opRef, IOptimizationContext context) {
- return false;
- }
}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/7fc0d93b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/ConvertFromAlgebricksExpressionsRule.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/ConvertFromAlgebricksExpressionsRule.java b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/ConvertFromAlgebricksExpressionsRule.java
index f77b93b..b363c85 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/ConvertFromAlgebricksExpressionsRule.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/ConvertFromAlgebricksExpressionsRule.java
@@ -45,26 +45,26 @@ import edu.uci.ics.hyracks.algebricks.core.rewriter.base.IAlgebraicRewriteRule;
* The rule searches for where the Algebricks builtin function are temporarly in the plan in place of XQuery function.
* The combination the Algebricks builtin function are replace with boolean XQuery function and the XQuery equivalent
* function.
- *
+ *
* <pre>
* Before
*
* plan__parent
* %OPERATOR( $v1 : algebricks_function( \@input_expression ) )
* plan__child
- *
+ *
* where the function annotation contains a hint on which xquery expression is represented by the algebricks function.
- *
- * After
+ *
+ * After
*
* plan__parent
* %OPERATOR( $v1 :xquery_expression( \@input_expression ) ) )
* plan__child
- *
- * note the xquery_expression may include the boolean function to ensure only a true or false result.
*
+ * note the xquery_expression may include the boolean function to ensure only a true or false result.
+ *
* </pre>
- *
+ *
* @author prestonc, shivanim
*/
public class ConvertFromAlgebricksExpressionsRule implements IAlgebraicRewriteRule {
@@ -77,20 +77,14 @@ public class ConvertFromAlgebricksExpressionsRule implements IAlgebraicRewriteRu
@SuppressWarnings({ "unchecked", "rawtypes" })
public ConvertFromAlgebricksExpressionsRule() {
ALGEBRICKS_MAP.put(AlgebricksBuiltinFunctions.AND, new Pair(BuiltinOperators.AND, null));
- ALGEBRICKS_MAP.put(AlgebricksBuiltinFunctions.EQ, new Pair(BuiltinOperators.VALUE_EQ,
- BuiltinOperators.GENERAL_EQ));
- ALGEBRICKS_MAP.put(AlgebricksBuiltinFunctions.GE, new Pair(BuiltinOperators.VALUE_GE,
- BuiltinOperators.GENERAL_GE));
- ALGEBRICKS_MAP.put(AlgebricksBuiltinFunctions.GT, new Pair(BuiltinOperators.VALUE_GT,
- BuiltinOperators.GENERAL_GT));
+ ALGEBRICKS_MAP.put(AlgebricksBuiltinFunctions.EQ, new Pair(BuiltinOperators.VALUE_EQ, null));
+ ALGEBRICKS_MAP.put(AlgebricksBuiltinFunctions.GE, new Pair(BuiltinOperators.VALUE_GE, null));
+ ALGEBRICKS_MAP.put(AlgebricksBuiltinFunctions.GT, new Pair(BuiltinOperators.VALUE_GT, null));
ALGEBRICKS_MAP.put(AlgebricksBuiltinFunctions.IS_NULL, new Pair(null, BuiltinFunctions.FN_EMPTY_1));
- ALGEBRICKS_MAP.put(AlgebricksBuiltinFunctions.LE, new Pair(BuiltinOperators.VALUE_LE,
- BuiltinOperators.GENERAL_LE));
- ALGEBRICKS_MAP.put(AlgebricksBuiltinFunctions.LT, new Pair(BuiltinOperators.VALUE_LT,
- BuiltinOperators.GENERAL_LT));
+ ALGEBRICKS_MAP.put(AlgebricksBuiltinFunctions.LE, new Pair(BuiltinOperators.VALUE_LE, null));
+ ALGEBRICKS_MAP.put(AlgebricksBuiltinFunctions.LT, new Pair(BuiltinOperators.VALUE_LT, null));
ALGEBRICKS_MAP.put(AlgebricksBuiltinFunctions.NOT, new Pair(null, BuiltinFunctions.FN_NOT_1));
- ALGEBRICKS_MAP.put(AlgebricksBuiltinFunctions.NEQ, new Pair(BuiltinOperators.VALUE_NE,
- BuiltinOperators.GENERAL_NE));
+ ALGEBRICKS_MAP.put(AlgebricksBuiltinFunctions.NEQ, new Pair(BuiltinOperators.VALUE_NE, null));
ALGEBRICKS_MAP.put(AlgebricksBuiltinFunctions.OR, new Pair(BuiltinOperators.OR, null));
}
@@ -109,6 +103,7 @@ public class ConvertFromAlgebricksExpressionsRule implements IAlgebraicRewriteRu
modified = true;
}
}
+ context.computeAndSetTypeEnvironmentForOperator(opRef.getValue());
return modified;
}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/7fc0d93b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/ConvertToAlgebricksExpressionsRule.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/ConvertToAlgebricksExpressionsRule.java b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/ConvertToAlgebricksExpressionsRule.java
index f1747fc..394c622 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/ConvertToAlgebricksExpressionsRule.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/ConvertToAlgebricksExpressionsRule.java
@@ -42,7 +42,7 @@ import edu.uci.ics.hyracks.algebricks.core.rewriter.base.IAlgebraicRewriteRule;
* The rule searches for where the XQuery function are used in place of Algebricks builtin function.
* The combination of the boolean XQuery function and the XQuery equivalent function are replaced with
* the Algebricks builtin function .
- *
+ *
* <pre>
* Before
*
@@ -50,18 +50,18 @@ import edu.uci.ics.hyracks.algebricks.core.rewriter.base.IAlgebraicRewriteRule;
* %OPERATOR( $v1 : xquery_expression( \@input_expression ) )
* plan__child
*
- * where xquery_expression has a known equivalent in Algebricks,
+ * where xquery_expression has a known equivalent in Algebricks,
* such as conditional expressions and a check for null.
* The expression may include the boolean function to ensure only
* a true or false result.
- *
- * After
+ *
+ * After
*
* plan__parent
* %OPERATOR( $v1 : algebricks_function( \@input_expression ) )
* plan__child
* </pre>
- *
+ *
* @author prestonc, shivanim
*/
public class ConvertToAlgebricksExpressionsRule implements IAlgebraicRewriteRule {
@@ -81,12 +81,6 @@ public class ConvertToAlgebricksExpressionsRule implements IAlgebraicRewriteRule
ALGEBRICKS_MAP.put(BuiltinFunctions.FN_EMPTY_1.getFunctionIdentifier(), AlgebricksBuiltinFunctions.IS_NULL);
ALGEBRICKS_MAP.put(BuiltinFunctions.FN_NOT_1.getFunctionIdentifier(), AlgebricksBuiltinFunctions.NOT);
- ALGEBRICKS_MAP.put(BuiltinOperators.GENERAL_EQ.getFunctionIdentifier(), AlgebricksBuiltinFunctions.EQ);
- ALGEBRICKS_MAP.put(BuiltinOperators.GENERAL_GE.getFunctionIdentifier(), AlgebricksBuiltinFunctions.GE);
- ALGEBRICKS_MAP.put(BuiltinOperators.GENERAL_GT.getFunctionIdentifier(), AlgebricksBuiltinFunctions.GT);
- ALGEBRICKS_MAP.put(BuiltinOperators.GENERAL_LE.getFunctionIdentifier(), AlgebricksBuiltinFunctions.LE);
- ALGEBRICKS_MAP.put(BuiltinOperators.GENERAL_LT.getFunctionIdentifier(), AlgebricksBuiltinFunctions.LT);
- ALGEBRICKS_MAP.put(BuiltinOperators.GENERAL_NE.getFunctionIdentifier(), AlgebricksBuiltinFunctions.NEQ);
}
@Override
http://git-wip-us.apache.org/repos/asf/vxquery/blob/7fc0d93b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/InlineNestedVariablesRule.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/InlineNestedVariablesRule.java b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/InlineNestedVariablesRule.java
deleted file mode 100644
index c0c082f..0000000
--- a/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/InlineNestedVariablesRule.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.vxquery.compiler.rewriter.rules;
-
-import java.util.List;
-
-import org.apache.commons.lang3.mutable.Mutable;
-
-import edu.uci.ics.hyracks.algebricks.common.exceptions.AlgebricksException;
-import edu.uci.ics.hyracks.algebricks.core.algebra.base.ILogicalExpression;
-import edu.uci.ics.hyracks.algebricks.core.algebra.base.ILogicalOperator;
-import edu.uci.ics.hyracks.algebricks.core.algebra.base.ILogicalPlan;
-import edu.uci.ics.hyracks.algebricks.core.algebra.base.IOptimizationContext;
-import edu.uci.ics.hyracks.algebricks.core.algebra.base.LogicalExpressionTag;
-import edu.uci.ics.hyracks.algebricks.core.algebra.base.LogicalOperatorTag;
-import edu.uci.ics.hyracks.algebricks.core.algebra.base.LogicalVariable;
-import edu.uci.ics.hyracks.algebricks.core.algebra.expressions.AbstractFunctionCallExpression;
-import edu.uci.ics.hyracks.algebricks.core.algebra.operators.logical.AbstractLogicalOperator;
-import edu.uci.ics.hyracks.algebricks.core.algebra.operators.logical.AbstractOperatorWithNestedPlans;
-import edu.uci.ics.hyracks.algebricks.core.algebra.operators.logical.AssignOperator;
-import edu.uci.ics.hyracks.algebricks.rewriter.rules.InlineVariablesRule;
-
-/**
- * Modifies the InlineVariablesRule to also process nested plans.
- */
-public class InlineNestedVariablesRule extends InlineVariablesRule {
-
- protected boolean inlineVariables(Mutable<ILogicalOperator> opRef, IOptimizationContext context)
- throws AlgebricksException {
- AbstractLogicalOperator op = (AbstractLogicalOperator) opRef.getValue();
-
- // Update mapping from variables to expressions during top-down traversal.
- if (op.getOperatorTag() == LogicalOperatorTag.ASSIGN) {
- AssignOperator assignOp = (AssignOperator) op;
- List<LogicalVariable> vars = assignOp.getVariables();
- List<Mutable<ILogicalExpression>> exprs = assignOp.getExpressions();
- for (int i = 0; i < vars.size(); i++) {
- ILogicalExpression expr = exprs.get(i).getValue();
- // Ignore functions that are either in the doNotInline set or are non-functional
- if (expr.getExpressionTag() == LogicalExpressionTag.FUNCTION_CALL) {
- AbstractFunctionCallExpression funcExpr = (AbstractFunctionCallExpression) expr;
- if (doNotInlineFuncs.contains(funcExpr.getFunctionIdentifier()) || !funcExpr.isFunctional()) {
- continue;
- }
- }
- varAssignRhs.put(vars.get(i), exprs.get(i).getValue());
- }
- }
-
- boolean modified = false;
- // Descend into nested plans inlining along the way.
- if (op.hasNestedPlans()) {
- AbstractOperatorWithNestedPlans nestedOp = (AbstractOperatorWithNestedPlans) op;
- for (ILogicalPlan nestedPlan : nestedOp.getNestedPlans()) {
- for (Mutable<ILogicalOperator> nestedOpRef : nestedPlan.getRoots()) {
- if (inlineVariables(nestedOpRef, context)) {
- modified = true;
- }
- }
- }
- }
-
- // Descend into children inlining along on the way.
- for (Mutable<ILogicalOperator> inputOpRef : op.getInputs()) {
- if (inlineVariables(inputOpRef, context)) {
- modified = true;
- }
- }
-
- if (performBottomUpAction(op)) {
- modified = true;
- }
-
- if (modified) {
- context.computeAndSetTypeEnvironmentForOperator(op);
- context.addToDontApplySet(this, op);
- // Re-enable rules that we may have already tried. They could be applicable now after inlining.
- context.removeFromAlreadyCompared(opRef.getValue());
- }
-
- return modified;
- }
-}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/7fc0d93b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/algebricksalternatives/ExtractFunctionsFromJoinConditionRule.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/algebricksalternatives/ExtractFunctionsFromJoinConditionRule.java b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/algebricksalternatives/ExtractFunctionsFromJoinConditionRule.java
new file mode 100644
index 0000000..9847c7f
--- /dev/null
+++ b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/algebricksalternatives/ExtractFunctionsFromJoinConditionRule.java
@@ -0,0 +1,141 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.vxquery.compiler.rewriter.rules.algebricksalternatives;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.commons.lang3.mutable.Mutable;
+import org.apache.commons.lang3.mutable.MutableObject;
+
+import edu.uci.ics.hyracks.algebricks.common.exceptions.AlgebricksException;
+import edu.uci.ics.hyracks.algebricks.core.algebra.base.ILogicalExpression;
+import edu.uci.ics.hyracks.algebricks.core.algebra.base.ILogicalOperator;
+import edu.uci.ics.hyracks.algebricks.core.algebra.base.IOptimizationContext;
+import edu.uci.ics.hyracks.algebricks.core.algebra.base.LogicalExpressionTag;
+import edu.uci.ics.hyracks.algebricks.core.algebra.base.LogicalOperatorTag;
+import edu.uci.ics.hyracks.algebricks.core.algebra.base.LogicalVariable;
+import edu.uci.ics.hyracks.algebricks.core.algebra.expressions.AbstractFunctionCallExpression;
+import edu.uci.ics.hyracks.algebricks.core.algebra.expressions.VariableReferenceExpression;
+import edu.uci.ics.hyracks.algebricks.core.algebra.functions.AlgebricksBuiltinFunctions;
+import edu.uci.ics.hyracks.algebricks.core.algebra.functions.FunctionIdentifier;
+import edu.uci.ics.hyracks.algebricks.core.algebra.operators.logical.AbstractBinaryJoinOperator;
+import edu.uci.ics.hyracks.algebricks.core.algebra.operators.logical.AbstractLogicalOperator;
+import edu.uci.ics.hyracks.algebricks.core.algebra.operators.logical.AssignOperator;
+import edu.uci.ics.hyracks.algebricks.core.algebra.operators.logical.visitors.VariableUtilities;
+import edu.uci.ics.hyracks.algebricks.core.rewriter.base.IAlgebraicRewriteRule;
+
+/**
+ * Factors out function expressions from each comparison function or similarity function in join condition by assigning them to a variables, and replacing the function expressions with references to those variables.
+ * Examples:
+ * Plan with function expressions in comparison or similarity condition of join expression. Generates one assign operator per extracted function expression.
+ * Example
+ * Before plan:
+ * join ( eq( funcX($$1), funcX($$2) ) )
+ * After plan:
+ * join (eq($$3,$$4))
+ * assign [$$4] <- [funcY($$2)]
+ * assign [$$3] <- [funcX($$1)]
+ */
+public class ExtractFunctionsFromJoinConditionRule implements IAlgebraicRewriteRule {
+
+ @Override
+ public boolean rewritePre(Mutable<ILogicalOperator> opRef, IOptimizationContext context) throws AlgebricksException {
+ return false;
+ }
+
+ @Override
+ public boolean rewritePost(Mutable<ILogicalOperator> opRef, IOptimizationContext context)
+ throws AlgebricksException {
+ AbstractLogicalOperator op = (AbstractLogicalOperator) opRef.getValue();
+
+ if (op.getOperatorTag() != LogicalOperatorTag.INNERJOIN
+ && op.getOperatorTag() != LogicalOperatorTag.LEFTOUTERJOIN) {
+ return false;
+ }
+ AbstractBinaryJoinOperator joinOp = (AbstractBinaryJoinOperator) op;
+ ILogicalExpression expr = joinOp.getCondition().getValue();
+
+ return assignFunctionExpressions(joinOp, expr, context);
+
+ }
+
+ private boolean assignFunctionExpressions(AbstractLogicalOperator joinOp, ILogicalExpression expr,
+ IOptimizationContext context) throws AlgebricksException {
+ if (expr.getExpressionTag() != LogicalExpressionTag.FUNCTION_CALL) {
+ return false;
+ }
+ AbstractFunctionCallExpression fexp = (AbstractFunctionCallExpression) expr;
+ FunctionIdentifier fi = fexp.getFunctionIdentifier();
+
+ boolean modified = false;
+ if (fi.equals(AlgebricksBuiltinFunctions.AND) || fi.equals(AlgebricksBuiltinFunctions.OR)) {
+ for (Mutable<ILogicalExpression> a : fexp.getArguments()) {
+ if (assignFunctionExpressions(joinOp, a.getValue(), context)) {
+ modified = true;
+ }
+ }
+ return modified;
+ } else if (AlgebricksBuiltinFunctions.isComparisonFunction(fi)) {
+ for (Mutable<ILogicalExpression> exprRef : fexp.getArguments()) {
+ if (exprRef.getValue().getExpressionTag() == LogicalExpressionTag.FUNCTION_CALL) {
+ LogicalVariable newVar = context.newVar();
+ AssignOperator newAssign = new AssignOperator(newVar, new MutableObject<ILogicalExpression>(exprRef
+ .getValue().cloneExpression()));
+ newAssign.setExecutionMode(joinOp.getExecutionMode());
+
+ // Place assign below joinOp.
+ List<LogicalVariable> used = new ArrayList<LogicalVariable>();
+ VariableUtilities.getUsedVariables(newAssign, used);
+
+ Mutable<ILogicalOperator> leftBranchRef = joinOp.getInputs().get(0);
+ ILogicalOperator leftBranch = leftBranchRef.getValue();
+ List<LogicalVariable> leftBranchVariables = new ArrayList<LogicalVariable>();
+ VariableUtilities.getLiveVariables(leftBranch, leftBranchVariables);
+ if (leftBranchVariables.containsAll(used)) {
+ // place assign on left branch
+ newAssign.getInputs().add(new MutableObject<ILogicalOperator>(leftBranch));
+ leftBranchRef.setValue(newAssign);
+ modified = true;
+ } else {
+ Mutable<ILogicalOperator> rightBranchRef = joinOp.getInputs().get(1);
+ ILogicalOperator rightBranch = rightBranchRef.getValue();
+ List<LogicalVariable> rightBranchVariables = new ArrayList<LogicalVariable>();
+ VariableUtilities.getLiveVariables(rightBranch, rightBranchVariables);
+ if (rightBranchVariables.containsAll(used)) {
+ // place assign on right branch
+ newAssign.getInputs().add(new MutableObject<ILogicalOperator>(rightBranch));
+ rightBranchRef.setValue(newAssign);
+ modified = true;
+ }
+ }
+
+ if (modified) {
+ // Replace original expr with variable reference.
+ exprRef.setValue(new VariableReferenceExpression(newVar));
+ context.computeAndSetTypeEnvironmentForOperator(newAssign);
+ context.computeAndSetTypeEnvironmentForOperator(joinOp);
+ }
+ }
+ }
+ return modified;
+ } else {
+ return false;
+ }
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/7fc0d93b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/algebricksalternatives/InlineNestedVariablesRule.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/algebricksalternatives/InlineNestedVariablesRule.java b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/algebricksalternatives/InlineNestedVariablesRule.java
new file mode 100644
index 0000000..ca0bc1c
--- /dev/null
+++ b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/algebricksalternatives/InlineNestedVariablesRule.java
@@ -0,0 +1,97 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.vxquery.compiler.rewriter.rules.algebricksalternatives;
+
+import java.util.List;
+
+import org.apache.commons.lang3.mutable.Mutable;
+
+import edu.uci.ics.hyracks.algebricks.common.exceptions.AlgebricksException;
+import edu.uci.ics.hyracks.algebricks.core.algebra.base.ILogicalExpression;
+import edu.uci.ics.hyracks.algebricks.core.algebra.base.ILogicalOperator;
+import edu.uci.ics.hyracks.algebricks.core.algebra.base.ILogicalPlan;
+import edu.uci.ics.hyracks.algebricks.core.algebra.base.IOptimizationContext;
+import edu.uci.ics.hyracks.algebricks.core.algebra.base.LogicalExpressionTag;
+import edu.uci.ics.hyracks.algebricks.core.algebra.base.LogicalOperatorTag;
+import edu.uci.ics.hyracks.algebricks.core.algebra.base.LogicalVariable;
+import edu.uci.ics.hyracks.algebricks.core.algebra.expressions.AbstractFunctionCallExpression;
+import edu.uci.ics.hyracks.algebricks.core.algebra.operators.logical.AbstractLogicalOperator;
+import edu.uci.ics.hyracks.algebricks.core.algebra.operators.logical.AbstractOperatorWithNestedPlans;
+import edu.uci.ics.hyracks.algebricks.core.algebra.operators.logical.AssignOperator;
+import edu.uci.ics.hyracks.algebricks.rewriter.rules.InlineVariablesRule;
+
+/**
+ * Modifies the InlineVariablesRule to also process nested plans.
+ */
+public class InlineNestedVariablesRule extends InlineVariablesRule {
+
+ protected boolean inlineVariables(Mutable<ILogicalOperator> opRef, IOptimizationContext context)
+ throws AlgebricksException {
+ AbstractLogicalOperator op = (AbstractLogicalOperator) opRef.getValue();
+
+ // Update mapping from variables to expressions during top-down traversal.
+ if (op.getOperatorTag() == LogicalOperatorTag.ASSIGN) {
+ AssignOperator assignOp = (AssignOperator) op;
+ List<LogicalVariable> vars = assignOp.getVariables();
+ List<Mutable<ILogicalExpression>> exprs = assignOp.getExpressions();
+ for (int i = 0; i < vars.size(); i++) {
+ ILogicalExpression expr = exprs.get(i).getValue();
+ // Ignore functions that are either in the doNotInline set or are non-functional
+ if (expr.getExpressionTag() == LogicalExpressionTag.FUNCTION_CALL) {
+ AbstractFunctionCallExpression funcExpr = (AbstractFunctionCallExpression) expr;
+ if (doNotInlineFuncs.contains(funcExpr.getFunctionIdentifier()) || !funcExpr.isFunctional()) {
+ continue;
+ }
+ }
+ varAssignRhs.put(vars.get(i), exprs.get(i).getValue());
+ }
+ }
+
+ boolean modified = false;
+ // Descend into nested plans inlining along the way.
+ if (op.hasNestedPlans()) {
+ AbstractOperatorWithNestedPlans nestedOp = (AbstractOperatorWithNestedPlans) op;
+ for (ILogicalPlan nestedPlan : nestedOp.getNestedPlans()) {
+ for (Mutable<ILogicalOperator> nestedOpRef : nestedPlan.getRoots()) {
+ if (inlineVariables(nestedOpRef, context)) {
+ modified = true;
+ }
+ }
+ }
+ }
+
+ // Descend into children inlining along on the way.
+ for (Mutable<ILogicalOperator> inputOpRef : op.getInputs()) {
+ if (inlineVariables(inputOpRef, context)) {
+ modified = true;
+ }
+ }
+
+ if (performBottomUpAction(op)) {
+ modified = true;
+ }
+
+ if (modified) {
+ context.computeAndSetTypeEnvironmentForOperator(op);
+ context.addToDontApplySet(this, op);
+ // Re-enable rules that we may have already tried. They could be applicable now after inlining.
+ context.removeFromAlreadyCompared(opRef.getValue());
+ }
+
+ return modified;
+ }
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/7fc0d93b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/algebricksalternatives/MoveFreeVariableOperatorOutOfSubplanRule.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/algebricksalternatives/MoveFreeVariableOperatorOutOfSubplanRule.java b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/algebricksalternatives/MoveFreeVariableOperatorOutOfSubplanRule.java
new file mode 100644
index 0000000..94b809d
--- /dev/null
+++ b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/algebricksalternatives/MoveFreeVariableOperatorOutOfSubplanRule.java
@@ -0,0 +1,178 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.vxquery.compiler.rewriter.rules.algebricksalternatives;
+
+import java.util.HashSet;
+import java.util.ListIterator;
+import java.util.Set;
+
+import org.apache.commons.lang3.mutable.Mutable;
+
+import edu.uci.ics.hyracks.algebricks.common.exceptions.AlgebricksException;
+import edu.uci.ics.hyracks.algebricks.core.algebra.base.ILogicalOperator;
+import edu.uci.ics.hyracks.algebricks.core.algebra.base.ILogicalPlan;
+import edu.uci.ics.hyracks.algebricks.core.algebra.base.IOptimizationContext;
+import edu.uci.ics.hyracks.algebricks.core.algebra.base.LogicalOperatorTag;
+import edu.uci.ics.hyracks.algebricks.core.algebra.base.LogicalVariable;
+import edu.uci.ics.hyracks.algebricks.core.algebra.operators.logical.AbstractLogicalOperator;
+import edu.uci.ics.hyracks.algebricks.core.algebra.operators.logical.SubplanOperator;
+import edu.uci.ics.hyracks.algebricks.core.algebra.operators.logical.visitors.VariableUtilities;
+import edu.uci.ics.hyracks.algebricks.core.algebra.util.OperatorPropertiesUtil;
+import edu.uci.ics.hyracks.algebricks.rewriter.rules.AbstractDecorrelationRule;
+
+/**
+ * The rule searches for operators that can be moved outside the subplan.
+ *
+ * <pre>
+ * Before
+ *
+ * %PARENT_PLAN
+ * SUBPLAN{
+ * %NESTED_OPERATORS_B+
+ * ASSIGN || %SUBPLAN
+ * %NESTED_OPERATORS_A*
+ * NESTEDTUPLESOURCE
+ * }
+ * %CHILD_PLAN
+ *
+ * where
+ * %SUBPLAN has one nested plan with a root AGGREGATE operator.
+ *
+ * After
+ *
+ * %PARENT_PLAN
+ * SUBPLAN{
+ * %NESTED_OPERATORS_B+
+ * %NESTED_OPERATORS_A*
+ * NESTEDTUPLESOURCE
+ * }
+ * ASSIGN || %SUBPLAN
+ * %CHILD_PLAN
+ * </pre>
+ */
+public class MoveFreeVariableOperatorOutOfSubplanRule extends AbstractDecorrelationRule {
+
+ @Override
+ public boolean rewritePost(Mutable<ILogicalOperator> opRef, IOptimizationContext context)
+ throws AlgebricksException {
+ AbstractLogicalOperator op0 = (AbstractLogicalOperator) opRef.getValue();
+ if (op0.getOperatorTag() != LogicalOperatorTag.SUBPLAN) {
+ return false;
+ }
+ SubplanOperator subplan = (SubplanOperator) op0;
+
+ Mutable<ILogicalOperator> leftRef = subplan.getInputs().get(0);
+ if (((AbstractLogicalOperator) leftRef.getValue()).getOperatorTag() == LogicalOperatorTag.EMPTYTUPLESOURCE) {
+ return false;
+ }
+
+ ListIterator<ILogicalPlan> plansIter = subplan.getNestedPlans().listIterator();
+ ILogicalPlan p = null;
+ while (plansIter.hasNext()) {
+ p = plansIter.next();
+ }
+ if (p == null) {
+ return false;
+ }
+ if (p.getRoots().size() != 1) {
+ return false;
+ }
+ Mutable<ILogicalOperator> opRef1 = p.getRoots().get(0);
+
+ //The root operator will not be movable. Start with the second op
+ AbstractLogicalOperator op1 = (AbstractLogicalOperator) opRef1.getValue();
+ if (op1.getInputs().size() != 1) {
+ return false;
+ }
+ Mutable<ILogicalOperator> op2Ref = op1.getInputs().get(0);
+
+ //Get all variables that come from outside of the loop
+ Set<LogicalVariable> free = new HashSet<LogicalVariable>();
+ OperatorPropertiesUtil.getFreeVariablesInSelfOrDesc(op1, free);
+
+ while (op2Ref != null) {
+ //Get the operator that we want to look at
+ AbstractLogicalOperator op2 = (AbstractLogicalOperator) op2Ref.getValue();
+
+ //Make sure we are looking at subplan with a scan/join
+ if (op2.getInputs().size() != 1 || !descOrSelfIsScanOrJoin(op2)) {
+ return false;
+ }
+ boolean notApplicable = false;
+
+ //Get its used variables
+ Set<LogicalVariable> used = new HashSet<LogicalVariable>();
+
+ //not movable if the operator is not an assign or subplan
+ //Might be helpful in the future for other operations in the future
+ if (op2.getOperatorTag() == LogicalOperatorTag.ASSIGN) {
+ VariableUtilities.getUsedVariables(op2, used);
+ } else if (op2.getOperatorTag() == LogicalOperatorTag.SUBPLAN) {
+ // Nested plan must have an aggregate root.
+ ListIterator<ILogicalPlan> subplansIter = ((SubplanOperator) op2).getNestedPlans().listIterator();
+ ILogicalPlan plan = null;
+ while (subplansIter.hasNext()) {
+ plan = subplansIter.next();
+ }
+ if (plan == null) {
+ return false;
+ }
+ if (plan.getRoots().size() != 1) {
+ return false;
+ }
+ ILogicalOperator op3 = plan.getRoots().get(0).getValue();
+ if (op3.getOperatorTag() != LogicalOperatorTag.AGGREGATE) {
+ return false;
+ }
+ // Used variables do not include ones created in the subplan.
+ VariableUtilities.getUsedVariables(op2, used);
+ Set<LogicalVariable> subplanProducedAndDown = new HashSet<LogicalVariable>();
+ VariableUtilities.getProducedVariablesInDescendantsAndSelf(op3, subplanProducedAndDown);
+ used.removeAll(subplanProducedAndDown);
+ } else {
+ notApplicable = true;
+ }
+
+ //Make sure that all of its used variables come from outside
+ for (LogicalVariable var : used) {
+ if (!free.contains(var)) {
+ notApplicable = true;
+ }
+ }
+
+ if (notApplicable) {
+ op2Ref = op2.getInputs().get(0);
+ } else {
+ //Make the input of op2 be the input of op1
+ op2Ref.setValue(op2.getInputs().get(0).getValue());
+
+ //Make the outside of the subplan the input of op2
+ Mutable<ILogicalOperator> outsideRef = op2.getInputs().get(0);
+ outsideRef.setValue(op0.getInputs().get(0).getValue());
+
+ //Make op2 the input of the subplan
+ Mutable<ILogicalOperator> op2OutsideRef = op0.getInputs().get(0);
+ op2OutsideRef.setValue(op2);
+
+ return true;
+ }
+
+ }
+ return false;
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/7fc0d93b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/comparison/general/AbstractGeneralComparisonScalarEvaluatorFactory.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/comparison/general/AbstractGeneralComparisonScalarEvaluatorFactory.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/comparison/general/AbstractGeneralComparisonScalarEvaluatorFactory.java
index 446b445..99c4faa 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/comparison/general/AbstractGeneralComparisonScalarEvaluatorFactory.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/comparison/general/AbstractGeneralComparisonScalarEvaluatorFactory.java
@@ -146,7 +146,7 @@ public abstract class AbstractGeneralComparisonScalarEvaluatorFactory extends
/**
* Check the second argument for a sequence and loop if required.
- *
+ *
* @param aOp
* @param tvpArg1
* @param tvpArg2
@@ -181,7 +181,7 @@ public abstract class AbstractGeneralComparisonScalarEvaluatorFactory extends
/**
* Transform the values into values supported for general comparison.
- *
+ *
* @param aOp
* @param tvpArg1
* @param tvpArg2
@@ -219,8 +219,16 @@ public abstract class AbstractGeneralComparisonScalarEvaluatorFactory extends
// Set up value comparison tagged value pointables.
if (tid1 == ValueTag.XS_UNTYPED_ATOMIC_TAG && tid2 == ValueTag.XS_UNTYPED_ATOMIC_TAG) {
// Only need to change tag since the storage is the same for untyped atomic and string.
+ dOutInner1.write(tvpTransform1.getByteArray(), tvpTransform1.getStartOffset(),
+ tvpTransform1.getLength());
+ tvpCompare1.set(abvsInner1.getByteArray(), abvsInner1.getStartOffset(), abvsInner1.getLength());
tvpCompare1.getByteArray()[0] = ValueTag.XS_STRING_TAG;
+ tagTransformed1 = true;
+ dOutInner2.write(tvpTransform2.getByteArray(), tvpTransform2.getStartOffset(),
+ tvpTransform2.getLength());
+ tvpCompare2.set(abvsInner2.getByteArray(), abvsInner2.getStartOffset(), abvsInner2.getLength());
tvpCompare2.getByteArray()[0] = ValueTag.XS_STRING_TAG;
+ tagTransformed2 = true;
} else if (tid1 == ValueTag.XS_UNTYPED_ATOMIC_TAG) {
tid1 = tid2;
getCastToOperator(tid2);
http://git-wip-us.apache.org/repos/asf/vxquery/blob/7fc0d93b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/conditional/IfThenElseScalarEvaluatorFactory.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/conditional/IfThenElseScalarEvaluatorFactory.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/conditional/IfThenElseScalarEvaluatorFactory.java
index b0584f8..7cd97e3 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/conditional/IfThenElseScalarEvaluatorFactory.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/conditional/IfThenElseScalarEvaluatorFactory.java
@@ -20,7 +20,6 @@ import org.apache.vxquery.datamodel.accessors.TaggedValuePointable;
import org.apache.vxquery.datamodel.values.ValueTag;
import org.apache.vxquery.exceptions.ErrorCode;
import org.apache.vxquery.exceptions.SystemException;
-import org.apache.vxquery.runtime.functions.base.AbstractTaggedValueArgumentScalarEvaluator;
import org.apache.vxquery.runtime.functions.base.AbstractTaggedValueArgumentScalarEvaluatorFactory;
import edu.uci.ics.hyracks.algebricks.common.exceptions.AlgebricksException;
@@ -29,32 +28,42 @@ import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
import edu.uci.ics.hyracks.api.context.IHyracksTaskContext;
import edu.uci.ics.hyracks.data.std.api.IPointable;
import edu.uci.ics.hyracks.data.std.primitive.BooleanPointable;
+import edu.uci.ics.hyracks.dataflow.common.data.accessors.IFrameTupleReference;
public class IfThenElseScalarEvaluatorFactory extends AbstractTaggedValueArgumentScalarEvaluatorFactory {
private static final long serialVersionUID = 1L;
+ private static final int CONDITION = 0;
+ private static final int TRUE_CONDITION = 1;
+ private static final int FALSE_CONDITION = 2;
public IfThenElseScalarEvaluatorFactory(IScalarEvaluatorFactory[] args) {
super(args);
}
@Override
- protected IScalarEvaluator createEvaluator(IHyracksTaskContext ctx, IScalarEvaluator[] args)
+ protected IScalarEvaluator createEvaluator(IHyracksTaskContext ctx, final IScalarEvaluator[] args)
throws AlgebricksException {
- return new AbstractTaggedValueArgumentScalarEvaluator(args) {
- private final BooleanPointable bp = (BooleanPointable) BooleanPointable.FACTORY.createPointable();
+ final TaggedValuePointable conditionTvp = (TaggedValuePointable) TaggedValuePointable.FACTORY.createPointable();
+ final BooleanPointable bp = (BooleanPointable) BooleanPointable.FACTORY.createPointable();
+ return new IScalarEvaluator() {
@Override
- protected void evaluate(TaggedValuePointable[] args, IPointable result) throws SystemException {
- TaggedValuePointable tvp1 = args[0];
- if (tvp1.getTag() != ValueTag.XS_BOOLEAN_TAG) {
- throw new SystemException(ErrorCode.FORG0006);
- }
- tvp1.getValue(bp);
+ public void evaluate(IFrameTupleReference tuple, IPointable result) throws AlgebricksException {
+ args[CONDITION].evaluate(tuple, conditionTvp);
+
+ try {
+ if (conditionTvp.getTag() != ValueTag.XS_BOOLEAN_TAG) {
+ throw new SystemException(ErrorCode.FORG0006);
+ }
+ conditionTvp.getValue(bp);
- if (bp.getBoolean()) {
- result.set(args[1]);
- } else {
- result.set(args[2]);
+ if (bp.getBoolean()) {
+ args[TRUE_CONDITION].evaluate(tuple, result);
+ } else {
+ args[FALSE_CONDITION].evaluate(tuple, result);
+ }
+ } catch (SystemException e) {
+ throw new AlgebricksException(e);
}
}
};
http://git-wip-us.apache.org/repos/asf/vxquery/blob/7fc0d93b/vxquery-core/src/main/java/org/apache/vxquery/serializer/XMLSerializer.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/serializer/XMLSerializer.java b/vxquery-core/src/main/java/org/apache/vxquery/serializer/XMLSerializer.java
index 189ae24..8a5845d 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/serializer/XMLSerializer.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/serializer/XMLSerializer.java
@@ -366,7 +366,7 @@ public class XMLSerializer implements IPrinter {
enp.getAttributeSequence(ntp, seqp);
if (seqp.getByteArray() != null && seqp.getEntryCount() > 0) {
ps.append(' ');
- printSequence(ps, seqp);
+ printSequence(ps, seqp, " ");
}
enp.getChildrenSequence(ntp, seqp);
@@ -422,12 +422,19 @@ public class XMLSerializer implements IPrinter {
}
private void printSequence(PrintStream ps, SequencePointable seqp) {
+ printSequence(ps, seqp, null);
+ }
+
+ private void printSequence(PrintStream ps, SequencePointable seqp, String between) {
VoidPointable vp = pp.takeOne(VoidPointable.class);
try {
int len = seqp.getEntryCount();
for (int i = 0; i < len; ++i) {
seqp.getEntry(i, vp);
print(vp.getByteArray(), vp.getStartOffset(), vp.getLength(), ps);
+ if (i < len - 1 && between != null) {
+ ps.append(between);
+ }
}
} finally {
pp.giveBack(vp);
http://git-wip-us.apache.org/repos/asf/vxquery/blob/7fc0d93b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/query/XMLQueryCompiler.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/query/XMLQueryCompiler.java b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/query/XMLQueryCompiler.java
index 38272dd..d9c5d01 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/query/XMLQueryCompiler.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/query/XMLQueryCompiler.java
@@ -164,7 +164,13 @@ public class XMLQueryCompiler {
builder.setNullableTypeComputer(new INullableTypeComputer() {
@Override
public Object makeNullableType(Object type) throws AlgebricksException {
- throw new NotImplementedException("NullableTypeComputer is not implented (makeNullableType)");
+ SequenceType st = (SequenceType) type;
+ if (st.getQuantifier().allowsEmptySequence()) {
+ return type;
+ } else if (st.getQuantifier() == Quantifier.QUANT_ONE) {
+ return SequenceType.create(st.getItemType(), Quantifier.QUANT_QUESTION);
+ }
+ return type;
}
@Override
@@ -239,6 +245,8 @@ public class XMLQueryCompiler {
RewriteRuleset.buildNestedDataSourceRuleCollection()));
defaultLogicalRewrites.add(new Pair<AbstractRuleController, List<IAlgebraicRewriteRule>>(seqOnceCtrl,
RewriteRuleset.buildTypeInferenceRuleCollection()));
+ defaultLogicalRewrites.add(new Pair<AbstractRuleController, List<IAlgebraicRewriteRule>>(seqCtrlNoDfs,
+ RewriteRuleset.buildUnnestingRuleCollection()));
defaultLogicalRewrites.add(new Pair<AbstractRuleController, List<IAlgebraicRewriteRule>>(seqCtrlFullDfs,
RewriteRuleset.buildNormalizationRuleCollection()));
defaultLogicalRewrites.add(new Pair<AbstractRuleController, List<IAlgebraicRewriteRule>>(seqCtrlNoDfs,
http://git-wip-us.apache.org/repos/asf/vxquery/blob/7fc0d93b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/translator/XMLQueryTranslator.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/translator/XMLQueryTranslator.java b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/translator/XMLQueryTranslator.java
index 2507d6c..9faefda 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/translator/XMLQueryTranslator.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/translator/XMLQueryTranslator.java
@@ -160,7 +160,9 @@ import edu.uci.ics.hyracks.algebricks.core.algebra.base.ILogicalExpression;
import edu.uci.ics.hyracks.algebricks.core.algebra.base.ILogicalOperator;
import edu.uci.ics.hyracks.algebricks.core.algebra.base.ILogicalPlan;
import edu.uci.ics.hyracks.algebricks.core.algebra.base.LogicalExpressionTag;
+import edu.uci.ics.hyracks.algebricks.core.algebra.base.LogicalOperatorTag;
import edu.uci.ics.hyracks.algebricks.core.algebra.base.LogicalVariable;
+import edu.uci.ics.hyracks.algebricks.core.algebra.expressions.AbstractFunctionCallExpression;
import edu.uci.ics.hyracks.algebricks.core.algebra.expressions.AggregateFunctionCallExpression;
import edu.uci.ics.hyracks.algebricks.core.algebra.expressions.ConstantExpression;
import edu.uci.ics.hyracks.algebricks.core.algebra.expressions.ScalarFunctionCallExpression;
@@ -1501,26 +1503,40 @@ public class XMLQueryTranslator {
ctxExpr = vre(createAssignment(ctxExpr, tCtx));
ctxExpr = sfce(asc ? BuiltinOperators.SORT_DISTINCT_NODES_ASC_OR_ATOMICS
: BuiltinOperators.SORT_DISTINCT_NODES_DESC_OR_ATOMICS, ctxExpr);
+ iterateOver(ctxExpr, tCtx);
+ int i = 0;
+ ILogicalExpression selectCondition = null;
for (ASTNode pn : predicates) {
- tCtx = tCtx.pushContext();
- tCtx.pushVariableScope();
- iterateOver(ctxExpr, tCtx);
+ // Handles integer, boolean expression, path expression exists
+ // TODO Support inner focus between predicates.
LogicalVariable pLVar = translateExpression(pn, tCtx);
ILogicalExpression tTest = instanceOf(vre(pLVar),
SequenceType.create(BuiltinTypeRegistry.XSEXT_NUMERIC, Quantifier.QUANT_ONE));
ILogicalExpression posTest = sfce(BuiltinOperators.VALUE_EQ, vre(pLVar), vre(tCtx.varScope
.lookupVariable(XMLQueryCompilerConstants.POS_VAR_NAME).getLogicalVariable()));
- ILogicalExpression boolTest = sfce(BuiltinFunctions.FN_BOOLEAN_1, vre(pLVar));
-
- SelectOperator select = new SelectOperator(mutable(sfce(BuiltinOperators.IF_THEN_ELSE, tTest,
- posTest, boolTest)), false, null);
- select.getInputs().add(mutable(tCtx.op));
- tCtx.op = select;
- ctxExpr = vre(tCtx.varScope.lookupVariable(XMLQueryCompilerConstants.DOT_VAR_NAME)
- .getLogicalVariable());
- tCtx.popVariableScope();
- tCtx = tCtx.popContext();
+ ILogicalExpression boolTestTmp = vre(pLVar);
+ if (tCtx.op.getOperatorTag() == LogicalOperatorTag.ASSIGN) {
+ ILogicalExpression expression = ((AssignOperator) tCtx.op).getExpressions().get(0)
+ .getValue();
+ if (expression.getExpressionTag() == LogicalExpressionTag.FUNCTION_CALL
+ && ((AbstractFunctionCallExpression) expression).getFunctionIdentifier().equals(
+ BuiltinOperators.CHILD.getFunctionIdentifier())) {
+ boolTestTmp = sfce(BuiltinFunctions.FN_COUNT_1, boolTestTmp);
+ }
+ }
+ ILogicalExpression boolTest = sfce(BuiltinFunctions.FN_BOOLEAN_1, boolTestTmp);
+ ILogicalExpression condition = sfce(BuiltinOperators.IF_THEN_ELSE, tTest, posTest, boolTest);
+ if (i++ == 0) {
+ selectCondition = condition;
+ } else {
+ selectCondition = sfce(BuiltinOperators.AND, selectCondition, condition);
+ }
}
+ SelectOperator select = new SelectOperator(mutable(selectCondition), false, null);
+ select.getInputs().add(mutable(tCtx.op));
+ tCtx.op = select;
+ ctxExpr = vre(tCtx.varScope.lookupVariable(XMLQueryCompilerConstants.DOT_VAR_NAME)
+ .getLogicalVariable());
}
if (popScope) {
tCtx.popVariableScope();
http://git-wip-us.apache.org/repos/asf/vxquery/blob/7fc0d93b/vxquery-xtest/pom.xml
----------------------------------------------------------------------
diff --git a/vxquery-xtest/pom.xml b/vxquery-xtest/pom.xml
index 6fb2798..9e83fd7 100644
--- a/vxquery-xtest/pom.xml
+++ b/vxquery-xtest/pom.xml
@@ -119,6 +119,7 @@
<!-- <argLine>-agentpath:"${yourkit.home}/bin/mac/libyjpagent.jnilib=sampling"</argLine> -->
<excludes>
<exclude>**/AbstractXQueryTest.java</exclude>
+ <exclude>**/VXQueryXMarkTest.java</exclude>
<exclude>**/XMarkTest.java</exclude>
<exclude>**/XQTSTest.java</exclude>
</excludes>
[43/50] [abbrv] vxquery git commit: VXQUERY-131: Support for reading
HDFS XML files.
Posted by sj...@apache.org.
http://git-wip-us.apache.org/repos/asf/vxquery/blob/3fc2d6c2/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/util/FunctionHelper.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/util/FunctionHelper.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/util/FunctionHelper.java
index d8c4e68..d394bbc 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/util/FunctionHelper.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/util/FunctionHelper.java
@@ -19,10 +19,21 @@ package org.apache.vxquery.runtime.functions.util;
import java.io.DataInputStream;
import java.io.DataOutput;
import java.io.File;
+import java.io.FileNotFoundException;
import java.io.IOException;
+import java.io.InputStream;
import java.nio.ByteBuffer;
import java.util.Arrays;
+import org.apache.hadoop.fs.FileSystem;
+import org.apache.hadoop.fs.Path;
+import org.apache.hyracks.api.exceptions.HyracksDataException;
+import org.apache.hyracks.data.std.api.IPointable;
+import org.apache.hyracks.data.std.primitive.DoublePointable;
+import org.apache.hyracks.data.std.primitive.LongPointable;
+import org.apache.hyracks.data.std.primitive.UTF8StringPointable;
+import org.apache.hyracks.data.std.util.ArrayBackedValueStorage;
+import org.apache.hyracks.dataflow.common.comm.util.ByteBufferInputStream;
import org.apache.vxquery.context.DynamicContext;
import org.apache.vxquery.datamodel.accessors.TaggedValuePointable;
import org.apache.vxquery.datamodel.accessors.TypedPointables;
@@ -33,6 +44,7 @@ import org.apache.vxquery.datamodel.util.DateTime;
import org.apache.vxquery.datamodel.values.ValueTag;
import org.apache.vxquery.exceptions.ErrorCode;
import org.apache.vxquery.exceptions.SystemException;
+import org.apache.vxquery.hdfs2.HDFSFunctions;
import org.apache.vxquery.runtime.functions.arithmetic.AbstractArithmeticOperation;
import org.apache.vxquery.runtime.functions.cast.CastToDoubleOperation;
import org.apache.vxquery.runtime.functions.comparison.AbstractValueComparisonOperation;
@@ -42,14 +54,6 @@ import org.apache.vxquery.types.BuiltinTypeConstants;
import org.apache.vxquery.types.BuiltinTypeRegistry;
import org.apache.vxquery.xmlparser.XMLParser;
-import org.apache.hyracks.api.exceptions.HyracksDataException;
-import org.apache.hyracks.data.std.api.IPointable;
-import org.apache.hyracks.data.std.primitive.DoublePointable;
-import org.apache.hyracks.data.std.primitive.LongPointable;
-import org.apache.hyracks.data.std.primitive.UTF8StringPointable;
-import org.apache.hyracks.data.std.util.ArrayBackedValueStorage;
-import org.apache.hyracks.dataflow.common.comm.util.ByteBufferInputStream;
-
public class FunctionHelper {
public static void arithmeticOperation(AbstractArithmeticOperation aOp, DynamicContext dCtx,
@@ -1213,8 +1217,33 @@ public class FunctionHelper {
} catch (SystemException e) {
throw new HyracksDataException(e);
}
- File file = new File(fName);
- parser.parseDocument(file, abvs);
+ if (!fName.contains("hdfs:/")) {
+ File file = new File(fName);
+ if (file.exists()) {
+ parser.parseDocument(file, abvs);
+ }
+ }
+ //else check in HDFS file system
+ else {
+ fName = fName.replaceAll("hdfs:/", "");
+ HDFSFunctions hdfs = new HDFSFunctions(null, null);
+ FileSystem fs = hdfs.getFileSystem();
+ if (fs != null) {
+ Path xmlDocument = new Path(fName);
+ try {
+ if (fs.exists(xmlDocument)) {
+ InputStream in = fs.open(xmlDocument).getWrappedStream();
+ parser.parseHDFSDocument(in, abvs);
+ }
+ } catch (FileNotFoundException e) {
+ // TODO Auto-generated catch block
+ System.err.println(e);
+ } catch (IOException e) {
+ // TODO Auto-generated catch block
+ System.err.println(e);
+ }
+ }
+ }
}
public static boolean transformThenCompareMinMaxTaggedValues(AbstractValueComparisonOperation aOp,
http://git-wip-us.apache.org/repos/asf/vxquery/blob/3fc2d6c2/vxquery-core/src/main/java/org/apache/vxquery/xmlparser/XMLParser.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/xmlparser/XMLParser.java b/vxquery-core/src/main/java/org/apache/vxquery/xmlparser/XMLParser.java
index 77d500c..a62a26c 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/xmlparser/XMLParser.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/xmlparser/XMLParser.java
@@ -19,6 +19,7 @@ import java.io.File;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.IOException;
+import java.io.InputStream;
import java.io.InputStreamReader;
import java.io.Reader;
import java.util.ArrayList;
@@ -28,6 +29,7 @@ import org.apache.hyracks.api.comm.IFrameFieldAppender;
import org.apache.hyracks.api.comm.IFrameWriter;
import org.apache.hyracks.api.exceptions.HyracksDataException;
import org.apache.hyracks.data.std.util.ArrayBackedValueStorage;
+import org.apache.hyracks.dataflow.common.comm.io.FrameTupleAccessor;
import org.apache.vxquery.context.StaticContext;
import org.apache.vxquery.exceptions.VXQueryFileNotFoundException;
import org.apache.vxquery.exceptions.VXQueryParseException;
@@ -98,8 +100,7 @@ public class XMLParser {
}
}
- public void parseElements(File file, IFrameWriter writer, int tupleIndex)
- throws HyracksDataException {
+ public void parseElements(File file, IFrameWriter writer, int tupleIndex) throws HyracksDataException {
try {
Reader input;
if (bufferSize > 0) {
@@ -126,4 +127,48 @@ public class XMLParser {
}
}
+ public void parseHDFSElements(InputStream inputStream, IFrameWriter writer, FrameTupleAccessor fta, int tupleIndex)
+ throws IOException {
+ try {
+ Reader input;
+ if (bufferSize > 0) {
+ input = new BufferedReader(new InputStreamReader(inputStream), bufferSize);
+ } else {
+ input = new InputStreamReader(inputStream);
+ }
+ in.setCharacterStream(input);
+ handler.setupElementWriter(writer, tupleIndex);
+ parser.parse(in);
+ input.close();
+ } catch (IOException e) {
+ HyracksDataException hde = new HyracksDataException(e);
+ hde.setNodeId(nodeId);
+ throw hde;
+ } catch (SAXException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
+ }
+
+ public void parseHDFSDocument(InputStream inputStream, ArrayBackedValueStorage abvs) throws HyracksDataException {
+ try {
+ Reader input;
+ if (bufferSize > 0) {
+ input = new BufferedReader(new InputStreamReader(inputStream), bufferSize);
+ } else {
+ input = new InputStreamReader(inputStream);
+ }
+ in.setCharacterStream(input);
+ parser.parse(in);
+ handler.writeDocument(abvs);
+ input.close();
+ } catch (IOException e) {
+ HyracksDataException hde = new HyracksDataException(e);
+ hde.setNodeId(nodeId);
+ throw hde;
+ } catch (SAXException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
+ }
}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/3fc2d6c2/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/query/XMLQueryCompiler.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/query/XMLQueryCompiler.java b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/query/XMLQueryCompiler.java
index e42caba..8a044ea 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/query/XMLQueryCompiler.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/query/XMLQueryCompiler.java
@@ -17,28 +17,7 @@ package org.apache.vxquery.xmlquery.query;
import java.io.Reader;
import java.util.ArrayList;
import java.util.List;
-
-import org.apache.vxquery.compiler.CompilerControlBlock;
-import org.apache.vxquery.compiler.algebricks.VXQueryBinaryBooleanInspectorFactory;
-import org.apache.vxquery.compiler.algebricks.VXQueryBinaryIntegerInspectorFactory;
-import org.apache.vxquery.compiler.algebricks.VXQueryComparatorFactoryProvider;
-import org.apache.vxquery.compiler.algebricks.VXQueryConstantValue;
-import org.apache.vxquery.compiler.algebricks.VXQueryExpressionRuntimeProvider;
-import org.apache.vxquery.compiler.algebricks.VXQueryNullWriterFactory;
-import org.apache.vxquery.compiler.algebricks.VXQueryPrinterFactoryProvider;
-import org.apache.vxquery.compiler.algebricks.prettyprint.VXQueryLogicalExpressionPrettyPrintVisitor;
-import org.apache.vxquery.compiler.rewriter.RewriteRuleset;
-import org.apache.vxquery.compiler.rewriter.VXQueryOptimizationContext;
-import org.apache.vxquery.exceptions.ErrorCode;
-import org.apache.vxquery.exceptions.SystemException;
-import org.apache.vxquery.metadata.VXQueryMetadataProvider;
-import org.apache.vxquery.runtime.provider.VXQueryBinaryHashFunctionFactoryProvider;
-import org.apache.vxquery.runtime.provider.VXQueryBinaryHashFunctionFamilyProvider;
-import org.apache.vxquery.types.BuiltinTypeRegistry;
-import org.apache.vxquery.types.Quantifier;
-import org.apache.vxquery.types.SequenceType;
-import org.apache.vxquery.xmlquery.ast.ModuleNode;
-import org.apache.vxquery.xmlquery.translator.XMLQueryTranslator;
+import java.util.Map;
import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
import org.apache.hyracks.algebricks.common.exceptions.NotImplementedException;
@@ -67,16 +46,40 @@ import org.apache.hyracks.algebricks.core.rewriter.base.IOptimizationContextFact
import org.apache.hyracks.algebricks.core.rewriter.base.PhysicalOptimizationConfig;
import org.apache.hyracks.algebricks.data.ISerializerDeserializerProvider;
import org.apache.hyracks.algebricks.data.ITypeTraitProvider;
+import org.apache.hyracks.api.client.NodeControllerInfo;
import org.apache.hyracks.api.dataflow.value.ISerializerDeserializer;
import org.apache.hyracks.api.dataflow.value.ITypeTraits;
import org.apache.hyracks.api.job.JobSpecification;
import org.apache.hyracks.data.std.primitive.VoidPointable;
+import org.apache.vxquery.compiler.CompilerControlBlock;
+import org.apache.vxquery.compiler.algebricks.VXQueryBinaryBooleanInspectorFactory;
+import org.apache.vxquery.compiler.algebricks.VXQueryBinaryIntegerInspectorFactory;
+import org.apache.vxquery.compiler.algebricks.VXQueryComparatorFactoryProvider;
+import org.apache.vxquery.compiler.algebricks.VXQueryConstantValue;
+import org.apache.vxquery.compiler.algebricks.VXQueryExpressionRuntimeProvider;
+import org.apache.vxquery.compiler.algebricks.VXQueryNullWriterFactory;
+import org.apache.vxquery.compiler.algebricks.VXQueryPrinterFactoryProvider;
+import org.apache.vxquery.compiler.algebricks.prettyprint.VXQueryLogicalExpressionPrettyPrintVisitor;
+import org.apache.vxquery.compiler.rewriter.RewriteRuleset;
+import org.apache.vxquery.compiler.rewriter.VXQueryOptimizationContext;
+import org.apache.vxquery.exceptions.ErrorCode;
+import org.apache.vxquery.exceptions.SystemException;
+import org.apache.vxquery.metadata.VXQueryMetadataProvider;
+import org.apache.vxquery.runtime.provider.VXQueryBinaryHashFunctionFactoryProvider;
+import org.apache.vxquery.runtime.provider.VXQueryBinaryHashFunctionFamilyProvider;
+import org.apache.vxquery.types.BuiltinTypeRegistry;
+import org.apache.vxquery.types.Quantifier;
+import org.apache.vxquery.types.SequenceType;
+import org.apache.vxquery.xmlquery.ast.ModuleNode;
+import org.apache.vxquery.xmlquery.translator.XMLQueryTranslator;
public class XMLQueryCompiler {
private final XQueryCompilationListener listener;
private final ICompilerFactory cFactory;
+ private final String hdfsConf;
+
private LogicalOperatorPrettyPrintVisitor pprinter;
private ModuleNode moduleNode;
@@ -87,17 +90,27 @@ public class XMLQueryCompiler {
private int frameSize;
+ private Map<String, NodeControllerInfo> nodeControllerInfos;
+
private String[] nodeList;
- public XMLQueryCompiler(XQueryCompilationListener listener, String[] nodeList, int frameSize) {
- this(listener, nodeList, frameSize, -1, -1, -1);
+ public XMLQueryCompiler(XQueryCompilationListener listener, Map<String, NodeControllerInfo> nodeControllerInfos,
+ int frameSize, String hdfsConf) {
+ this(listener, nodeControllerInfos, frameSize, -1, -1, -1, hdfsConf);
+ }
+
+ public XMLQueryCompiler(XQueryCompilationListener listener, Map<String, NodeControllerInfo> nodeControllerInfos,
+ int frameSize) {
+ this(listener, nodeControllerInfos, frameSize, -1, -1, -1, "");
}
- public XMLQueryCompiler(XQueryCompilationListener listener, String[] nodeList, int frameSize,
- int availableProcessors, long joinHashSize, long maximumDataSize) {
+ public XMLQueryCompiler(XQueryCompilationListener listener, Map<String, NodeControllerInfo> nodeControllerInfos,
+ int frameSize, int availableProcessors, long joinHashSize, long maximumDataSize, String hdfsConf) {
this.listener = listener == null ? NoopXQueryCompilationListener.INSTANCE : listener;
this.frameSize = frameSize;
- this.nodeList = nodeList;
+ this.nodeControllerInfos = nodeControllerInfos;
+ setNodeList();
+ this.hdfsConf = hdfsConf;
HeuristicCompilerFactoryBuilder builder = new HeuristicCompilerFactoryBuilder(
new IOptimizationContextFactory() {
@Override
@@ -116,12 +129,12 @@ public class XMLQueryCompiler {
builder.getPhysicalOptimizationConfig().setMaxFramesHybridHash((int) (joinHashSize / this.frameSize));
}
if (maximumDataSize > 0) {
- builder.getPhysicalOptimizationConfig().setMaxFramesLeftInputHybridHash(
- (int) (maximumDataSize / this.frameSize));
+ builder.getPhysicalOptimizationConfig()
+ .setMaxFramesLeftInputHybridHash((int) (maximumDataSize / this.frameSize));
}
- builder.getPhysicalOptimizationConfig().setMaxFramesLeftInputHybridHash(
- (int) (60L * 1024 * 1048576 / this.frameSize));
+ builder.getPhysicalOptimizationConfig()
+ .setMaxFramesLeftInputHybridHash((int) (60L * 1024 * 1048576 / this.frameSize));
builder.setLogicalRewrites(buildDefaultLogicalRewrites());
builder.setPhysicalRewrites(buildDefaultPhysicalRewrites());
@@ -192,15 +205,26 @@ public class XMLQueryCompiler {
cFactory = builder.create();
}
+ /**
+ * Set Configuration of node controllers as array of Strings.
+ */
+ private void setNodeList() {
+ nodeList = new String[nodeControllerInfos.size()];
+ int index = 0;
+ for (String node : nodeControllerInfos.keySet()) {
+ nodeList[index++] = node;
+ }
+ }
+
public void compile(String name, Reader query, CompilerControlBlock ccb, int optimizationLevel)
throws SystemException {
moduleNode = XMLQueryParser.parse(name, query);
listener.notifyParseResult(moduleNode);
module = new XMLQueryTranslator(ccb).translateModule(moduleNode);
- pprinter = new LogicalOperatorPrettyPrintVisitor(new VXQueryLogicalExpressionPrettyPrintVisitor(
- module.getModuleContext()));
+ pprinter = new LogicalOperatorPrettyPrintVisitor(
+ new VXQueryLogicalExpressionPrettyPrintVisitor(module.getModuleContext()));
VXQueryMetadataProvider mdProvider = new VXQueryMetadataProvider(nodeList, ccb.getSourceFileMap(),
- module.getModuleContext());
+ module.getModuleContext(), this.hdfsConf, nodeControllerInfos);
compiler = cFactory.createCompiler(module.getBody(), mdProvider, 0);
listener.notifyTranslationResult(module);
XMLQueryTypeChecker.typeCheckModule(module);
http://git-wip-us.apache.org/repos/asf/vxquery/blob/3fc2d6c2/vxquery-core/src/test/java/org/apache/vxquery/xmlquery/query/SimpleXQueryTest.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/test/java/org/apache/vxquery/xmlquery/query/SimpleXQueryTest.java b/vxquery-core/src/test/java/org/apache/vxquery/xmlquery/query/SimpleXQueryTest.java
index 165b330..13ca921 100644
--- a/vxquery-core/src/test/java/org/apache/vxquery/xmlquery/query/SimpleXQueryTest.java
+++ b/vxquery-core/src/test/java/org/apache/vxquery/xmlquery/query/SimpleXQueryTest.java
@@ -20,16 +20,19 @@ import java.io.FileInputStream;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.StringReader;
+import java.util.HashMap;
+import java.util.Map;
import java.util.zip.GZIPInputStream;
-import junit.framework.Assert;
-
+import org.apache.hyracks.api.client.NodeControllerInfo;
+import org.apache.hyracks.api.comm.NetworkAddress;
+import org.apache.hyracks.api.dataset.ResultSetId;
import org.apache.vxquery.compiler.CompilerControlBlock;
import org.apache.vxquery.context.RootStaticContextImpl;
import org.apache.vxquery.context.StaticContextImpl;
import org.junit.Test;
-import org.apache.hyracks.api.dataset.ResultSetId;
+import junit.framework.Assert;
public class SimpleXQueryTest {
@Test
@@ -96,8 +99,8 @@ public class SimpleXQueryTest {
private static String gunzip(String dir, String filename) {
try {
- GZIPInputStream in = new GZIPInputStream(new BufferedInputStream(new FileInputStream(new File(dir
- + filename + ".gz"))));
+ GZIPInputStream in = new GZIPInputStream(
+ new BufferedInputStream(new FileInputStream(new File(dir + filename + ".gz"))));
File temp = File.createTempFile("vxquery", filename);
temp.deleteOnExit();
FileOutputStream out = new FileOutputStream(temp);
@@ -133,7 +136,11 @@ public class SimpleXQueryTest {
}
private static void runTestInternal(String testName, String query) throws Exception {
- XMLQueryCompiler compiler = new XMLQueryCompiler(null, new String[] { "nc1" }, 65536);
+
+ Map<String, NodeControllerInfo> nodeControllerInfos = new HashMap<String, NodeControllerInfo>();
+ nodeControllerInfos.put("nc1", new NodeControllerInfo("nc1", null, new NetworkAddress("127.0.0.1", 0), null));
+
+ XMLQueryCompiler compiler = new XMLQueryCompiler(null, nodeControllerInfos, 65536);
CompilerControlBlock ccb = new CompilerControlBlock(new StaticContextImpl(RootStaticContextImpl.INSTANCE),
new ResultSetId(System.nanoTime()), null);
compiler.compile(testName, new StringReader(query), ccb, Integer.MAX_VALUE);
http://git-wip-us.apache.org/repos/asf/vxquery/blob/3fc2d6c2/vxquery-server/src/main/resources/conf/cluster.properties
----------------------------------------------------------------------
diff --git a/vxquery-server/src/main/resources/conf/cluster.properties b/vxquery-server/src/main/resources/conf/cluster.properties
index fd015d4..6339fd9 100644
--- a/vxquery-server/src/main/resources/conf/cluster.properties
+++ b/vxquery-server/src/main/resources/conf/cluster.properties
@@ -6,9 +6,9 @@
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
-#
+#
# http://www.apache.org/licenses/LICENSE-2.0
-#
+#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -51,4 +51,4 @@ CCJAVA_OPTS="-server -Xmx500M -Djava.util.logging.config.file=./vxquery-benchmar
NCJAVA_OPTS="-server -Xmx7G -Djava.util.logging.config.file=./vxquery-benchmark/src/main/resources/noaa-ghcn-daily/scripts/testing_logging.properties"
# debug option: NCJAVA_OPTS="-Xdebug -Xrunjdwp:transport=dt_socket,address=7002,server=y,suspend=n -Xmx1g -Djava.util.logging.config.file=logging.properties"
# Yourkit option: -agentpath:/tools/yjp-2014-build-14114/bin/linux-x86-64/libyjpagent.so=port=20001"
-# Yourkit mac option: -agentpath:/Applications/YourKit_Java_Profiler.app/bin/mac/libyjpagent.jnilib=sampling
+# Yourkit mac option: -agentpath:/Applications/YourKit_Java_Profiler.app/bin/mac/libyjpagent.jnilib=sampling
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/vxquery/blob/3fc2d6c2/vxquery-xtest/pom.xml
----------------------------------------------------------------------
diff --git a/vxquery-xtest/pom.xml b/vxquery-xtest/pom.xml
index 0c563e7..4cb7c60 100644
--- a/vxquery-xtest/pom.xml
+++ b/vxquery-xtest/pom.xml
@@ -161,6 +161,21 @@
</dependency>
<dependency>
+ <groupId>org.apache.hyracks</groupId>
+ <artifactId>hyracks-hdfs-2.x</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-hdfs</artifactId>
+ </dependency>
+
+ <dependency>
<groupId>org.mortbay.jetty</groupId>
<artifactId>jetty</artifactId>
<scope>compile</scope>
http://git-wip-us.apache.org/repos/asf/vxquery/blob/3fc2d6c2/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/MiniDFS.java
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/MiniDFS.java b/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/MiniDFS.java
new file mode 100644
index 0000000..0720baa
--- /dev/null
+++ b/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/MiniDFS.java
@@ -0,0 +1,75 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.vxquery.xtest;
+
+import java.io.IOException;
+
+import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.fs.FileSystem;
+import org.apache.hadoop.fs.Path;
+import org.apache.hadoop.hdfs.MiniDFSCluster;
+import org.apache.hadoop.hdfs.server.common.HdfsServerConstants.StartupOption;
+import org.apache.hadoop.mapred.JobConf;
+
+public class MiniDFS {
+
+ private MiniDFSCluster dfsCluster;
+
+ public void miniDFS() {
+
+ }
+
+ public void startHDFS() throws IOException {
+
+ FileSystem lfs = FileSystem.getLocal(new Configuration());
+ JobConf conf = new JobConf();
+ String PATH_TO_HADOOP_CONF = "src/test/resources/hadoop/conf";
+ conf.addResource(new Path(PATH_TO_HADOOP_CONF + "/core-site.xml"));
+ conf.addResource(new Path(PATH_TO_HADOOP_CONF + "/mapred-site.xml"));
+ conf.addResource(new Path(PATH_TO_HADOOP_CONF + "/hdfs-site.xml"));
+ int numDataNodes = 1;
+ int nameNodePort = 40000;
+
+ // cleanup artifacts created on the local file system
+ lfs.delete(new Path("build"), true);
+ System.setProperty("hadoop.log.dir", "logs");
+ MiniDFSCluster.Builder build = new MiniDFSCluster.Builder(conf);
+ build.nameNodePort(nameNodePort);
+ build.nameNodeHttpPort(nameNodePort + 34);
+ build.numDataNodes(numDataNodes);
+ build.checkExitOnShutdown(true);
+ build.startupOption(StartupOption.REGULAR);
+ build.format(true);
+ build.waitSafeMode(true);
+ dfsCluster = build.build();
+
+ FileSystem dfs = FileSystem.get(conf);
+ String DATA_PATH = "src/test/resources/TestSources/ghcnd";
+ Path src = new Path(DATA_PATH);
+ dfs.mkdirs(new Path("/tmp"));
+ Path dest = new Path("/tmp/vxquery-hdfs-test");
+ dfs.copyFromLocalFile(src, dest);
+ if (dfs.exists(dest)) {
+ System.err.println("Test files copied to HDFS successfully");
+ }
+ }
+
+ public void shutdownHDFS() {
+ System.err.println("Tests completed.Shutting down HDFS");
+ dfsCluster.shutdown();
+ }
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/3fc2d6c2/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/TestRunner.java
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/TestRunner.java b/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/TestRunner.java
index 18db5c1..5b6ddff 100644
--- a/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/TestRunner.java
+++ b/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/TestRunner.java
@@ -18,13 +18,16 @@ import java.io.File;
import java.io.FileInputStream;
import java.io.InputStreamReader;
import java.io.Reader;
+import java.net.InetAddress;
import java.util.EnumSet;
+import java.util.Map;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import org.apache.commons.io.IOUtils;
import org.apache.hyracks.api.client.HyracksConnection;
import org.apache.hyracks.api.client.IHyracksClientConnection;
+import org.apache.hyracks.api.client.NodeControllerInfo;
import org.apache.hyracks.api.comm.IFrame;
import org.apache.hyracks.api.comm.IFrameTupleAccessor;
import org.apache.hyracks.api.comm.VSizeFrame;
@@ -63,6 +66,7 @@ public class TestRunner {
private NodeControllerService nc1;
private IHyracksClientConnection hcc;
private IHyracksDataset hds;
+ private final String publicAddress = InetAddress.getLocalHost().getHostAddress();
public TestRunner(XTestOptions opts) throws Exception {
this.opts = opts;
@@ -70,9 +74,9 @@ public class TestRunner {
public void open() throws Exception {
CCConfig ccConfig = new CCConfig();
- ccConfig.clientNetIpAddress = "127.0.0.1";
+ ccConfig.clientNetIpAddress = publicAddress;
ccConfig.clientNetPort = 39000;
- ccConfig.clusterNetIpAddress = "127.0.0.1";
+ ccConfig.clusterNetIpAddress = publicAddress;
ccConfig.clusterNetPort = 39001;
ccConfig.profileDumpPeriod = 10000;
File outDir = new File("target/ClusterController");
@@ -87,9 +91,9 @@ public class TestRunner {
NCConfig ncConfig1 = new NCConfig();
ncConfig1.ccHost = "localhost";
ncConfig1.ccPort = 39001;
- ncConfig1.clusterNetIPAddress = "127.0.0.1";
- ncConfig1.dataIPAddress = "127.0.0.1";
- ncConfig1.resultIPAddress = "127.0.0.1";
+ ncConfig1.clusterNetIPAddress = publicAddress;
+ ncConfig1.dataIPAddress = publicAddress;
+ ncConfig1.resultIPAddress = publicAddress;
ncConfig1.nodeId = "nc1";
nc1 = new NodeControllerService(ncConfig1);
nc1.start();
@@ -115,7 +119,14 @@ public class TestRunner {
VXQueryCompilationListener listener = new VXQueryCompilationListener(opts.showAST, opts.showTET,
opts.showOET, opts.showRP);
- XMLQueryCompiler compiler = new XMLQueryCompiler(listener, new String[] { "nc1" }, opts.frameSize);
+
+ Map<String, NodeControllerInfo> nodeControllerInfos = null;
+ if (hcc != null) {
+ nodeControllerInfos = hcc.getNodeControllerInfos();
+ }
+
+ XMLQueryCompiler compiler = new XMLQueryCompiler(listener, nodeControllerInfos, opts.frameSize,
+ opts.hdfsConf);
Reader in = new InputStreamReader(new FileInputStream(testCase.getXQueryFile()), "UTF-8");
CompilerControlBlock ccb = new CompilerControlBlock(
new StaticContextImpl(RootStaticContextImpl.INSTANCE),
http://git-wip-us.apache.org/repos/asf/vxquery/blob/3fc2d6c2/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/XTestOptions.java
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/XTestOptions.java b/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/XTestOptions.java
index 854cbf8..496b74a 100644
--- a/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/XTestOptions.java
+++ b/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/XTestOptions.java
@@ -76,4 +76,7 @@ public class XTestOptions {
@Option(name = "-showresult", usage = "Show query result.")
boolean showResult;
+
+ @Option(name = "-hdfs-conf", usage = "Directory path to Hadoop configuration files")
+ String hdfsConf;
}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/3fc2d6c2/vxquery-xtest/src/test/java/org/apache/vxquery/xtest/AbstractXQueryTest.java
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/java/org/apache/vxquery/xtest/AbstractXQueryTest.java b/vxquery-xtest/src/test/java/org/apache/vxquery/xtest/AbstractXQueryTest.java
index 12a91a9..5411215 100644
--- a/vxquery-xtest/src/test/java/org/apache/vxquery/xtest/AbstractXQueryTest.java
+++ b/vxquery-xtest/src/test/java/org/apache/vxquery/xtest/AbstractXQueryTest.java
@@ -37,6 +37,7 @@ public abstract class AbstractXQueryTest {
opts.threads = 1;
opts.showQuery = true;
opts.showResult = true;
+ opts.hdfsConf = "src/test/resources/hadoop/conf";
return opts;
}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/3fc2d6c2/vxquery-xtest/src/test/java/org/apache/vxquery/xtest/VXQueryTest.java
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/java/org/apache/vxquery/xtest/VXQueryTest.java b/vxquery-xtest/src/test/java/org/apache/vxquery/xtest/VXQueryTest.java
index 3704d07..4d0ddc0 100644
--- a/vxquery-xtest/src/test/java/org/apache/vxquery/xtest/VXQueryTest.java
+++ b/vxquery-xtest/src/test/java/org/apache/vxquery/xtest/VXQueryTest.java
@@ -17,15 +17,19 @@
package org.apache.vxquery.xtest;
import java.io.File;
+import java.io.IOException;
import java.util.Collection;
import org.apache.commons.lang3.StringUtils;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
import org.junit.runners.Parameterized.Parameters;
@RunWith(Parameterized.class)
public class VXQueryTest extends AbstractXQueryTest {
+ private static MiniDFS dfs;
private static String VXQUERY_CATALOG = StringUtils.join(new String[] { "src", "test", "resources",
"VXQueryCatalog.xml" }, File.separator);
@@ -52,4 +56,19 @@ public class VXQueryTest extends AbstractXQueryTest {
return getOptions();
}
+ @BeforeClass
+ public static void setupHDFS() {
+ dfs = new MiniDFS();
+ try {
+ dfs.startHDFS();
+ } catch (IOException e) {
+ System.err.println(e);
+ }
+ }
+
+ @AfterClass
+ public static void shutdownHDFS() {
+ dfs.shutdownHDFS();
+ }
+
}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/3fc2d6c2/vxquery-xtest/src/test/resources/ExpectedTestResults/HDFS/Aggregate/avgHDFS.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/ExpectedTestResults/HDFS/Aggregate/avgHDFS.txt b/vxquery-xtest/src/test/resources/ExpectedTestResults/HDFS/Aggregate/avgHDFS.txt
new file mode 100644
index 0000000..7ef6ffe
--- /dev/null
+++ b/vxquery-xtest/src/test/resources/ExpectedTestResults/HDFS/Aggregate/avgHDFS.txt
@@ -0,0 +1 @@
+12.5
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/vxquery/blob/3fc2d6c2/vxquery-xtest/src/test/resources/ExpectedTestResults/HDFS/Aggregate/countHDFS.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/ExpectedTestResults/HDFS/Aggregate/countHDFS.txt b/vxquery-xtest/src/test/resources/ExpectedTestResults/HDFS/Aggregate/countHDFS.txt
new file mode 100644
index 0000000..d8263ee
--- /dev/null
+++ b/vxquery-xtest/src/test/resources/ExpectedTestResults/HDFS/Aggregate/countHDFS.txt
@@ -0,0 +1 @@
+2
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/vxquery/blob/3fc2d6c2/vxquery-xtest/src/test/resources/ExpectedTestResults/HDFS/Aggregate/maxHDFS.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/ExpectedTestResults/HDFS/Aggregate/maxHDFS.txt b/vxquery-xtest/src/test/resources/ExpectedTestResults/HDFS/Aggregate/maxHDFS.txt
new file mode 100644
index 0000000..dc7b54a
--- /dev/null
+++ b/vxquery-xtest/src/test/resources/ExpectedTestResults/HDFS/Aggregate/maxHDFS.txt
@@ -0,0 +1 @@
+33
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/vxquery/blob/3fc2d6c2/vxquery-xtest/src/test/resources/ExpectedTestResults/HDFS/Aggregate/maxvalueHDFS.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/ExpectedTestResults/HDFS/Aggregate/maxvalueHDFS.txt b/vxquery-xtest/src/test/resources/ExpectedTestResults/HDFS/Aggregate/maxvalueHDFS.txt
new file mode 100644
index 0000000..e37d32a
--- /dev/null
+++ b/vxquery-xtest/src/test/resources/ExpectedTestResults/HDFS/Aggregate/maxvalueHDFS.txt
@@ -0,0 +1 @@
+1000
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/vxquery/blob/3fc2d6c2/vxquery-xtest/src/test/resources/ExpectedTestResults/HDFS/Aggregate/minHDFS.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/ExpectedTestResults/HDFS/Aggregate/minHDFS.txt b/vxquery-xtest/src/test/resources/ExpectedTestResults/HDFS/Aggregate/minHDFS.txt
new file mode 100644
index 0000000..ea1acb6
--- /dev/null
+++ b/vxquery-xtest/src/test/resources/ExpectedTestResults/HDFS/Aggregate/minHDFS.txt
@@ -0,0 +1 @@
+11.25
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/vxquery/blob/3fc2d6c2/vxquery-xtest/src/test/resources/ExpectedTestResults/HDFS/Aggregate/sumHDFS.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/ExpectedTestResults/HDFS/Aggregate/sumHDFS.txt b/vxquery-xtest/src/test/resources/ExpectedTestResults/HDFS/Aggregate/sumHDFS.txt
new file mode 100644
index 0000000..2b82dfe
--- /dev/null
+++ b/vxquery-xtest/src/test/resources/ExpectedTestResults/HDFS/Aggregate/sumHDFS.txt
@@ -0,0 +1 @@
+60
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/vxquery/blob/3fc2d6c2/vxquery-xtest/src/test/resources/Queries/XQuery/HDFS/Aggregate/avgHDFS.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/Queries/XQuery/HDFS/Aggregate/avgHDFS.xq b/vxquery-xtest/src/test/resources/Queries/XQuery/HDFS/Aggregate/avgHDFS.xq
new file mode 100644
index 0000000..3214b97
--- /dev/null
+++ b/vxquery-xtest/src/test/resources/Queries/XQuery/HDFS/Aggregate/avgHDFS.xq
@@ -0,0 +1,25 @@
+(: Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License. :)
+
+(: XQuery Aggregate Query :)
+(: Find the average minimum temperature. :)
+fn:avg(
+ let $collection := "hdfs://tmp/vxquery-hdfs-test"
+ for $r in collection($collection)/dataCollection/data
+ where $r/dataType eq "TMIN"
+ return $r/value
+)
http://git-wip-us.apache.org/repos/asf/vxquery/blob/3fc2d6c2/vxquery-xtest/src/test/resources/Queries/XQuery/HDFS/Aggregate/countHDFS.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/Queries/XQuery/HDFS/Aggregate/countHDFS.xq b/vxquery-xtest/src/test/resources/Queries/XQuery/HDFS/Aggregate/countHDFS.xq
new file mode 100644
index 0000000..7940b03
--- /dev/null
+++ b/vxquery-xtest/src/test/resources/Queries/XQuery/HDFS/Aggregate/countHDFS.xq
@@ -0,0 +1,25 @@
+(: Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License. :)
+
+(: XQuery Aggregate Query :)
+(: Find the number of wind sensor readings. :)
+fn:count(
+ let $collection := "hdfs://tmp/vxquery-hdfs-test"
+ for $r in collection($collection)/dataCollection/data
+ where $r/dataType eq "AWND"
+ return $r/value
+)
http://git-wip-us.apache.org/repos/asf/vxquery/blob/3fc2d6c2/vxquery-xtest/src/test/resources/Queries/XQuery/HDFS/Aggregate/maxHDFS.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/Queries/XQuery/HDFS/Aggregate/maxHDFS.xq b/vxquery-xtest/src/test/resources/Queries/XQuery/HDFS/Aggregate/maxHDFS.xq
new file mode 100644
index 0000000..0db1980
--- /dev/null
+++ b/vxquery-xtest/src/test/resources/Queries/XQuery/HDFS/Aggregate/maxHDFS.xq
@@ -0,0 +1,25 @@
+(: Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License. :)
+
+(: XQuery Aggregate Query :)
+(: Find the highest max temperature. :)
+fn:max(
+ let $collection := "hdfs://tmp/vxquery-hdfs-test"
+ for $r in collection($collection)/dataCollection/data
+ where $r/dataType eq "TMAX"
+ return $r/value
+)
http://git-wip-us.apache.org/repos/asf/vxquery/blob/3fc2d6c2/vxquery-xtest/src/test/resources/Queries/XQuery/HDFS/Aggregate/maxvalueHDFS.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/Queries/XQuery/HDFS/Aggregate/maxvalueHDFS.xq b/vxquery-xtest/src/test/resources/Queries/XQuery/HDFS/Aggregate/maxvalueHDFS.xq
new file mode 100644
index 0000000..9d04916
--- /dev/null
+++ b/vxquery-xtest/src/test/resources/Queries/XQuery/HDFS/Aggregate/maxvalueHDFS.xq
@@ -0,0 +1,23 @@
+(: Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License. :)
+
+(: XQuery Aggregate Query :)
+(: Find the max value. :)
+fn:max(
+ for $r in collection-with-tag("hdfs://tmp/vxquery-hdfs-test/half_1/quarter_1/sensors", "data")/data
+ return $r/value
+)
http://git-wip-us.apache.org/repos/asf/vxquery/blob/3fc2d6c2/vxquery-xtest/src/test/resources/Queries/XQuery/HDFS/Aggregate/minHDFS.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/Queries/XQuery/HDFS/Aggregate/minHDFS.xq b/vxquery-xtest/src/test/resources/Queries/XQuery/HDFS/Aggregate/minHDFS.xq
new file mode 100644
index 0000000..869e222
--- /dev/null
+++ b/vxquery-xtest/src/test/resources/Queries/XQuery/HDFS/Aggregate/minHDFS.xq
@@ -0,0 +1,25 @@
+(: Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License. :)
+
+(: XQuery Aggregate Query :)
+(: Find the lowest min temperature. :)
+fn:min(
+ let $collection := "hdfs://tmp/vxquery-hdfs-test"
+ for $r in collection($collection)/dataCollection/data
+ where $r/dataType eq "TMIN"
+ return $r/value
+)
http://git-wip-us.apache.org/repos/asf/vxquery/blob/3fc2d6c2/vxquery-xtest/src/test/resources/Queries/XQuery/HDFS/Aggregate/sumHDFS.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/Queries/XQuery/HDFS/Aggregate/sumHDFS.xq b/vxquery-xtest/src/test/resources/Queries/XQuery/HDFS/Aggregate/sumHDFS.xq
new file mode 100644
index 0000000..1fdf743
--- /dev/null
+++ b/vxquery-xtest/src/test/resources/Queries/XQuery/HDFS/Aggregate/sumHDFS.xq
@@ -0,0 +1,25 @@
+(: Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License. :)
+
+(: XQuery Aggregate Query :)
+(: Find the total precipitation. :)
+fn:sum(
+ let $collection := "hdfs://tmp/vxquery-hdfs-test"
+ for $r in collection($collection)/dataCollection/data
+ where $r/dataType eq "PRCP"
+ return $r/value
+)
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/vxquery/blob/3fc2d6c2/vxquery-xtest/src/test/resources/VXQueryCatalog.xml
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/VXQueryCatalog.xml b/vxquery-xtest/src/test/resources/VXQueryCatalog.xml
index 6f7acee..f75ce49 100644
--- a/vxquery-xtest/src/test/resources/VXQueryCatalog.xml
+++ b/vxquery-xtest/src/test/resources/VXQueryCatalog.xml
@@ -40,6 +40,8 @@
<!ENTITY SingleQuery SYSTEM "cat/SingleQuery.xml">
<!ENTITY SingleAlternateQuery SYSTEM "cat/SingleAlternateQuery.xml">
+<!ENTITY HDFSAggregateQueries SYSTEM "cat/HDFSAggregateQueries.xml">
+
]>
<test-suite xmlns="http://www.w3.org/2005/02/query-test-XQTSCatalog"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -193,4 +195,17 @@
&GhcndRecordsPartition4Queries;
</test-group>
</test-group>
+ <test-group name="HDFSAggregateQueries" featureOwner="Efi Kaltirimidou">
+ <GroupInfo>
+ <title>Aggregate Partition Queries in HDFS</title>
+ <description/>
+ </GroupInfo>
+ <test-group name="CollectionReadFromHDFSAggregateTests" featureOwner="Efi Kaltirimidou">
+ <GroupInfo>
+ <title>Aggregate HDFS Execution Tests</title>
+ <description/>
+ </GroupInfo>
+ &HDFSAggregateQueries;
+ </test-group>
+ </test-group>
</test-suite>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/vxquery/blob/3fc2d6c2/vxquery-xtest/src/test/resources/cat/HDFSAggregateQueries.xml
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/cat/HDFSAggregateQueries.xml b/vxquery-xtest/src/test/resources/cat/HDFSAggregateQueries.xml
new file mode 100644
index 0000000..4f925a0
--- /dev/null
+++ b/vxquery-xtest/src/test/resources/cat/HDFSAggregateQueries.xml
@@ -0,0 +1,53 @@
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<test-group xmlns="http://www.w3.org/2005/02/query-test-XQTSCatalog" name="AggregateQueries" featureOwner="VXQuery">
+ <GroupInfo>
+ <title>HDFS Aggregate</title>
+ <description/>
+ </GroupInfo>
+ <test-case name="hdfs-aggregate-avg" FilePath="HDFS/Aggregate/" Creator="Efi Kaltirimidou">
+ <description>Count records in HDFS returned for q02 from the weather benchmark.</description>
+ <query name="avgHDFS" date="2015-06-11"/>
+ <output-file compare="Text">avgHDFS.txt</output-file>
+ </test-case>
+ <test-case name="hdfs-aggregate-count" FilePath="HDFS/Aggregate/" Creator="Efi Kaltirimidou">
+ <description>Count records in HDFS returned for q02 from the weather benchmark.</description>
+ <query name="countHDFS" date="2015-06-11"/>
+ <output-file compare="Text">countHDFS.txt</output-file>
+ </test-case>
+ <test-case name="hdfs-aggregate-min" FilePath="HDFS/Aggregate/" Creator="Efi Kaltirimidou">
+ <description>Count records in HDFS returned for q05 from the weather benchmark.</description>
+ <query name="minHDFS" date="2015-06-11"/>
+ <output-file compare="Text">minHDFS.txt</output-file>
+ </test-case>
+ <test-case name="hdfs-aggregate-max" FilePath="HDFS/Aggregate/" Creator="Efi Kaltirimidou">
+ <description>Count records in HDFS returned for q07 from the weather benchmark.</description>
+ <query name="maxHDFS" date="2015-06-11"/>
+ <output-file compare="Text">maxHDFS.txt</output-file>
+ </test-case>
+ <test-case name="hdfs-aggregate-sum" FilePath="HDFS/Aggregate/" Creator="Efi Kaltirimidou">
+ <description>Count records in HDFS returned for q03 from the weather benchmark.</description>
+ <query name="sumHDFS" date="2015-06-11"/>
+ <output-file compare="Text">sumHDFS.txt</output-file>
+ </test-case>
+ <test-case name="hdfs-aggregate-max-value" FilePath="HDFS/Aggregate/" Creator="Efi Kaltirimidou">
+ <description>Count records in HDFS returned for q03 from the weather benchmark.</description>
+ <query name="maxvalueHDFS" date="2015-10-17"/>
+ <output-file compare="Text">maxvalueHDFS.txt</output-file>
+ </test-case>
+</test-group>
http://git-wip-us.apache.org/repos/asf/vxquery/blob/3fc2d6c2/vxquery-xtest/src/test/resources/hadoop/conf/core-site.xml
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/hadoop/conf/core-site.xml b/vxquery-xtest/src/test/resources/hadoop/conf/core-site.xml
new file mode 100644
index 0000000..b1f576c
--- /dev/null
+++ b/vxquery-xtest/src/test/resources/hadoop/conf/core-site.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<?xml-stylesheet type="text/xsl" href="configuration.xsl"?>
+
+<!-- Put site-specific property overrides in this file. -->
+
+<configuration>
+
+<property>
+ <name>fs.default.name</name>
+ <value>hdfs://localhost:40000</value>
+</property>
+<property>
+ <name>hadoop.tmp.dir</name>
+ <value>/tmp/hadoop</value>
+</property>
+
+
+</configuration>
http://git-wip-us.apache.org/repos/asf/vxquery/blob/3fc2d6c2/vxquery-xtest/src/test/resources/hadoop/conf/hdfs-site.xml
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/hadoop/conf/hdfs-site.xml b/vxquery-xtest/src/test/resources/hadoop/conf/hdfs-site.xml
new file mode 100644
index 0000000..6b6604d
--- /dev/null
+++ b/vxquery-xtest/src/test/resources/hadoop/conf/hdfs-site.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<?xml-stylesheet type="text/xsl" href="configuration.xsl"?>
+
+<!-- Put site-specific property overrides in this file. -->
+
+<configuration>
+
+<property>
+ <name>dfs.replication</name>
+ <value>1</value>
+</property>
+
+<property>
+ <name>dfs.block.size</name>
+ <value>1048576</value>
+</property>
+
+</configuration>
http://git-wip-us.apache.org/repos/asf/vxquery/blob/3fc2d6c2/vxquery-xtest/src/test/resources/hadoop/conf/mapred-site.xml
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/hadoop/conf/mapred-site.xml b/vxquery-xtest/src/test/resources/hadoop/conf/mapred-site.xml
new file mode 100644
index 0000000..e15ec74
--- /dev/null
+++ b/vxquery-xtest/src/test/resources/hadoop/conf/mapred-site.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<?xml-stylesheet type="text/xsl" href="configuration.xsl"?>
+
+<!-- Put site-specific property overrides in this file. -->
+
+<configuration>
+
+ <property>
+ <name>mapred.job.tracker</name>
+ <value>localhost:29007</value>
+ </property>
+ <property>
+ <name>mapred.tasktracker.map.tasks.maximum</name>
+ <value>20</value>
+ </property>
+ <property>
+ <name>mapred.tasktracker.reduce.tasks.maximum</name>
+ <value>20</value>
+ </property>
+ <property>
+ <name>mapred.max.split.size</name>
+ <value>128</value>
+ </property>
+
+</configuration>
[35/50] [abbrv] vxquery git commit: update hyracks version to last
released 0.2.17-incubating
Posted by sj...@apache.org.
update hyracks version to last released 0.2.17-incubating
Project: http://git-wip-us.apache.org/repos/asf/vxquery/repo
Commit: http://git-wip-us.apache.org/repos/asf/vxquery/commit/faec6e44
Tree: http://git-wip-us.apache.org/repos/asf/vxquery/tree/faec6e44
Diff: http://git-wip-us.apache.org/repos/asf/vxquery/diff/faec6e44
Branch: refs/heads/site
Commit: faec6e44e945db8944d73ac8ebe7bbb954330d56
Parents: 4b7e0c7
Author: Till Westmann <ti...@apache.org>
Authored: Thu Apr 7 17:36:53 2016 -0700
Committer: Till Westmann <ti...@apache.org>
Committed: Thu Apr 7 17:36:53 2016 -0700
----------------------------------------------------------------------
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/vxquery/blob/faec6e44/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 6a335d2..fb9df9a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -508,7 +508,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
- <hyracks.version>0.2.16-incubating</hyracks.version>
+ <hyracks.version>0.2.17-incubating</hyracks.version>
<apache-rat-plugin.version>0.11</apache-rat-plugin.version>
</properties>
[26/50] [abbrv] vxquery git commit: update maven site plugins
Posted by sj...@apache.org.
update maven site plugins
maven-site-plugin -> 3.5
maven-project-info-reports-plugin -> 2.8.1
maven-javadoc-plugin -> 2.10.3
maven-fluido-skin -> 1.5
Project: http://git-wip-us.apache.org/repos/asf/vxquery/repo
Commit: http://git-wip-us.apache.org/repos/asf/vxquery/commit/d7c32f87
Tree: http://git-wip-us.apache.org/repos/asf/vxquery/tree/d7c32f87
Diff: http://git-wip-us.apache.org/repos/asf/vxquery/diff/d7c32f87
Branch: refs/heads/site
Commit: d7c32f8744780f7c3bb83e09561e2b3580a6e284
Parents: f2af233
Author: Till Westmann <we...@gmail.com>
Authored: Sat Feb 27 10:49:40 2016 -0800
Committer: Till Westmann <we...@gmail.com>
Committed: Sat Feb 27 10:49:40 2016 -0800
----------------------------------------------------------------------
pom.xml | 6 +++---
src/site/site.xml | 17 +++++++++--------
vxquery-benchmark/src/site/site.xml | 6 +++---
vxquery-cli/src/site/site.xml | 6 +++---
vxquery-core/src/site/site.xml | 6 +++---
vxquery-server/src/site/site.xml | 6 +++---
vxquery-xtest/src/site/site.xml | 6 +++---
7 files changed, 27 insertions(+), 26 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/vxquery/blob/d7c32f87/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 259624a..6a335d2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -332,19 +332,19 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
- <version>3.3</version>
+ <version>3.5</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-project-info-reports-plugin</artifactId>
- <version>2.7</version>
+ <version>2.8.1</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>2.9.1</version>
+ <version>2.10.3</version>
</plugin>
</plugins>
</pluginManagement>
http://git-wip-us.apache.org/repos/asf/vxquery/blob/d7c32f87/src/site/site.xml
----------------------------------------------------------------------
diff --git a/src/site/site.xml b/src/site/site.xml
index b9612c1..5640976 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -28,7 +28,7 @@ limitations under the License.
<skin>
<groupId>org.apache.maven.skins</groupId>
<artifactId>maven-fluido-skin</artifactId>
- <version>1.3.1</version>
+ <version>1.5</version>
</skin>
<body>
<menu name="Apache Software Foundation">
@@ -101,12 +101,13 @@ limitations under the License.
</menu>
<menu ref="reports" />
<menu ref="modules" />
- <footer>
- <div class="row-fluid">Apache VXQuery, VXQuery, Apache, the Apache feather logo, and the Apache VXQuery project logo
- are either registered trademarks or trademarks of The Apache Software Foundation in the United States
- and other countries. All other marks mentioned may be trademarks or registered trademarks of their
- respective owners.
- </div>
- </footer>
+ <footer><![CDATA[
+ <div class="row-fluid">Apache VXQuery, VXQuery, Apache, the Apache
+ feather logo, and the Apache VXQuery project logo are either
+ registered trademarks or trademarks of The Apache Software
+ Foundation in the United States and other countries.
+ All other marks mentioned may be trademarks or registered
+ trademarks of their respective owners.</div>
+ ]]></footer>
</body>
</project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/vxquery/blob/d7c32f87/vxquery-benchmark/src/site/site.xml
----------------------------------------------------------------------
diff --git a/vxquery-benchmark/src/site/site.xml b/vxquery-benchmark/src/site/site.xml
index c74ffb5..4d35a0f 100644
--- a/vxquery-benchmark/src/site/site.xml
+++ b/vxquery-benchmark/src/site/site.xml
@@ -30,19 +30,19 @@ limitations under the License.
<skin>
<groupId>org.apache.maven.skins</groupId>
<artifactId>maven-fluido-skin</artifactId>
- <version>1.3.1</version>
+ <version>1.5</version>
</skin>
<body>
<menu ref="reports"/>
- <footer>
+ <footer><![CDATA[
<div class="row-fluid">Apache VXQuery, VXQuery, Apache, the Apache
feather logo, and the Apache VXQuery project logo are either
registered trademarks or trademarks of The Apache Software
Foundation in the United States and other countries.
All other marks mentioned may be trademarks or registered
trademarks of their respective owners.</div>
- </footer>
+ ]]></footer>
</body>
</project>
http://git-wip-us.apache.org/repos/asf/vxquery/blob/d7c32f87/vxquery-cli/src/site/site.xml
----------------------------------------------------------------------
diff --git a/vxquery-cli/src/site/site.xml b/vxquery-cli/src/site/site.xml
index c74ffb5..4d35a0f 100644
--- a/vxquery-cli/src/site/site.xml
+++ b/vxquery-cli/src/site/site.xml
@@ -30,19 +30,19 @@ limitations under the License.
<skin>
<groupId>org.apache.maven.skins</groupId>
<artifactId>maven-fluido-skin</artifactId>
- <version>1.3.1</version>
+ <version>1.5</version>
</skin>
<body>
<menu ref="reports"/>
- <footer>
+ <footer><![CDATA[
<div class="row-fluid">Apache VXQuery, VXQuery, Apache, the Apache
feather logo, and the Apache VXQuery project logo are either
registered trademarks or trademarks of The Apache Software
Foundation in the United States and other countries.
All other marks mentioned may be trademarks or registered
trademarks of their respective owners.</div>
- </footer>
+ ]]></footer>
</body>
</project>
http://git-wip-us.apache.org/repos/asf/vxquery/blob/d7c32f87/vxquery-core/src/site/site.xml
----------------------------------------------------------------------
diff --git a/vxquery-core/src/site/site.xml b/vxquery-core/src/site/site.xml
index 3bce7d0..e1c90b9 100644
--- a/vxquery-core/src/site/site.xml
+++ b/vxquery-core/src/site/site.xml
@@ -30,7 +30,7 @@ limitations under the License.
<skin>
<groupId>org.apache.maven.skins</groupId>
<artifactId>maven-fluido-skin</artifactId>
- <version>1.3.1</version>
+ <version>1.5</version>
</skin>
<body>
@@ -39,14 +39,14 @@ limitations under the License.
<item name="Missing Functions" href="missing-functions.html"/>
<item name="Missing Operators" href="missing-operators.html"/>
</menu>
- <footer>
+ <footer><![CDATA[
<div class="row-fluid">Apache VXQuery, VXQuery, Apache, the Apache
feather logo, and the Apache VXQuery project logo are either
registered trademarks or trademarks of The Apache Software
Foundation in the United States and other countries.
All other marks mentioned may be trademarks or registered
trademarks of their respective owners.</div>
- </footer>
+ ]]></footer>
</body>
</project>
http://git-wip-us.apache.org/repos/asf/vxquery/blob/d7c32f87/vxquery-server/src/site/site.xml
----------------------------------------------------------------------
diff --git a/vxquery-server/src/site/site.xml b/vxquery-server/src/site/site.xml
index c74ffb5..4d35a0f 100644
--- a/vxquery-server/src/site/site.xml
+++ b/vxquery-server/src/site/site.xml
@@ -30,19 +30,19 @@ limitations under the License.
<skin>
<groupId>org.apache.maven.skins</groupId>
<artifactId>maven-fluido-skin</artifactId>
- <version>1.3.1</version>
+ <version>1.5</version>
</skin>
<body>
<menu ref="reports"/>
- <footer>
+ <footer><![CDATA[
<div class="row-fluid">Apache VXQuery, VXQuery, Apache, the Apache
feather logo, and the Apache VXQuery project logo are either
registered trademarks or trademarks of The Apache Software
Foundation in the United States and other countries.
All other marks mentioned may be trademarks or registered
trademarks of their respective owners.</div>
- </footer>
+ ]]></footer>
</body>
</project>
http://git-wip-us.apache.org/repos/asf/vxquery/blob/d7c32f87/vxquery-xtest/src/site/site.xml
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/site/site.xml b/vxquery-xtest/src/site/site.xml
index c74ffb5..4d35a0f 100644
--- a/vxquery-xtest/src/site/site.xml
+++ b/vxquery-xtest/src/site/site.xml
@@ -30,19 +30,19 @@ limitations under the License.
<skin>
<groupId>org.apache.maven.skins</groupId>
<artifactId>maven-fluido-skin</artifactId>
- <version>1.3.1</version>
+ <version>1.5</version>
</skin>
<body>
<menu ref="reports"/>
- <footer>
+ <footer><![CDATA[
<div class="row-fluid">Apache VXQuery, VXQuery, Apache, the Apache
feather logo, and the Apache VXQuery project logo are either
registered trademarks or trademarks of The Apache Software
Foundation in the United States and other countries.
All other marks mentioned may be trademarks or registered
trademarks of their respective owners.</div>
- </footer>
+ ]]></footer>
</body>
</project>
[02/50] [abbrv] vxquery git commit: More minor edits.
Posted by sj...@apache.org.
More minor edits.
Project: http://git-wip-us.apache.org/repos/asf/vxquery/repo
Commit: http://git-wip-us.apache.org/repos/asf/vxquery/commit/ac7de010
Tree: http://git-wip-us.apache.org/repos/asf/vxquery/tree/ac7de010
Diff: http://git-wip-us.apache.org/repos/asf/vxquery/diff/ac7de010
Branch: refs/heads/site
Commit: ac7de010dce5018c4a89a31149a64c5c40153fe9
Parents: 14a231c
Author: Preston Carman <pr...@apache.org>
Authored: Thu Jul 16 10:42:35 2015 -0700
Committer: Preston Carman <pr...@apache.org>
Committed: Thu Jul 23 15:23:41 2015 -0700
----------------------------------------------------------------------
src/site/apt/development_site_update.apt | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/vxquery/blob/ac7de010/src/site/apt/development_site_update.apt
----------------------------------------------------------------------
diff --git a/src/site/apt/development_site_update.apt b/src/site/apt/development_site_update.apt
index 3783512..7358cdb 100644
--- a/src/site/apt/development_site_update.apt
+++ b/src/site/apt/development_site_update.apt
@@ -41,6 +41,8 @@ $ svn co https://dist.apache.org/repos/dist/release/vxquery dist
$ svn co https://svn.apache.org/repos/asf/vxquery/site
---
+* For each update
+
* update the <<<site>>> branch in git
* New release steps
[22/50] [abbrv] vxquery git commit: VXQUERY-181 - Move to Hyracks
0.2.16
Posted by sj...@apache.org.
VXQUERY-181 - Move to Hyracks 0.2.16
The change is touches a many files since Hyracks is part of an incubating
project now. Otherwise its a pretty small change to make they system work
with 0.2.16 (A changes to the frame classes). Also includes the addition of
benchmark queries for BaseX and images for the website.
Project: http://git-wip-us.apache.org/repos/asf/vxquery/repo
Commit: http://git-wip-us.apache.org/repos/asf/vxquery/commit/4684567b
Tree: http://git-wip-us.apache.org/repos/asf/vxquery/tree/4684567b
Diff: http://git-wip-us.apache.org/repos/asf/vxquery/diff/4684567b
Branch: refs/heads/site
Commit: 4684567b4fe5d683e648f578e3d61fdb7b5b30cf
Parents: ef31a81
Author: Preston Carman <pr...@apache.org>
Authored: Tue Oct 27 13:38:48 2015 -0700
Committer: Preston Carman <pr...@apache.org>
Committed: Tue Oct 27 13:38:48 2015 -0700
----------------------------------------------------------------------
pom.xml | 45 +++--
src/site/apt/developer_get_started.apt | 8 +-
src/site/apt/index.apt | 5 +-
src/site/apt/user_cluster_installation.apt | 30 +++-
.../images/eclipse_xml_editor_screen.png | Bin 0 -> 75948 bytes
src/site/resources/images/vxquery_cluster.png | Bin 0 -> 22024 bytes
.../images/vxquery_cluster_with_hdfs.png | Bin 0 -> 31459 bytes
src/site/resources/images/vxquery_stack.png | Bin 0 -> 13264 bytes
vxquery-benchmark/pom.xml | 1 -
.../noaa-ghcn-daily/other_systems/basex/q00.xq | 32 ++++
.../noaa-ghcn-daily/other_systems/basex/q01.xq | 25 +++
.../noaa-ghcn-daily/other_systems/basex/q02.xq | 31 ++++
.../noaa-ghcn-daily/other_systems/basex/q03.xq | 25 +++
.../noaa-ghcn-daily/other_systems/basex/q04.xq | 30 ++++
.../noaa-ghcn-daily/other_systems/basex/q05.xq | 33 ++++
.../noaa-ghcn-daily/other_systems/basex/q06.xq | 30 ++++
.../noaa-ghcn-daily/other_systems/basex/q07.xq | 32 ++++
.../other_systems/basex_index/q00.xq | 32 ++++
.../other_systems/basex_index/q01.xq | 25 +++
.../other_systems/basex_index/q02.xq | 31 ++++
.../other_systems/basex_index/q03.xq | 25 +++
.../other_systems/basex_index/q04.xq | 30 ++++
.../other_systems/basex_index/q05.xq | 33 ++++
.../other_systems/basex_index/q06.xq | 30 ++++
.../other_systems/basex_index/q07.xq | 32 ++++
.../basex_index/sensors_database_add.bxs | 2 +
.../basex_index/sensors_database_remove.bxs | 1 +
.../basex_index/stations_database_add.bxs | 2 +
.../basex_index/stations_database_remove.bxs | 1 +
.../other_systems/basex_scripts/.basex | 0
.../other_systems/basex_scripts/README | 9 +
.../basex_scripts/run_basex_index_tests.sh | 63 +++++++
.../basex_scripts/run_basex_tests.sh | 45 +++++
.../mrql_scripts/run_group_test.sh | 3 +-
.../mrql_scripts/run_mrql_tests.sh | 2 +-
.../saxon_scripts/run_saxon_tests.sh | 9 +-
vxquery-cli/pom.xml | 16 +-
.../java/org/apache/vxquery/cli/VXQuery.java | 49 +++---
vxquery-core/pom.xml | 12 +-
.../vxquery/collations/CodepointCollation.java | 2 +-
.../apache/vxquery/collations/Collation.java | 2 +-
.../vxquery/compiler/CompilerControlBlock.java | 2 +-
.../VXQueryBinaryBooleanInspectorFactory.java | 10 +-
.../VXQueryBinaryIntegerInspectorFactory.java | 10 +-
.../VXQueryComparatorFactoryProvider.java | 10 +-
.../algebricks/VXQueryConstantValue.java | 4 +-
.../VXQueryExpressionRuntimeProvider.java | 48 ++---
.../algebricks/VXQueryGlobalDataFactory.java | 6 +-
.../algebricks/VXQueryNullWriterFactory.java | 10 +-
.../algebricks/VXQueryPrinterFactory.java | 6 +-
.../VXQueryPrinterFactoryProvider.java | 8 +-
...ueryLogicalExpressionPrettyPrintVisitor.java | 30 ++--
.../compiler/rewriter/RewriteRuleset.java | 84 ++++-----
.../rewriter/VXQueryOptimizationContext.java | 18 +-
.../rewriter/rules/AbstractCollectionRule.java | 30 ++--
...tractRemoveRedundantTypeExpressionsRule.java | 14 +-
.../AbstractUsedVariablesProcessingRule.java | 18 +-
.../rules/AbstractVXQueryAggregateRule.java | 6 +-
.../rewriter/rules/CollectionFileDomain.java | 2 +-
.../rules/ConsolidateAssignAggregateRule.java | 34 ++--
.../rules/ConsolidateDescandantChild.java | 22 +--
.../rewriter/rules/ConsolidateUnnestsRule.java | 20 +--
...tAssignSortDistinctNodesToOperatorsRule.java | 48 ++---
.../rules/ConvertAssignToAggregateRule.java | 36 ++--
.../rules/ConvertAssignToUnnestRule.java | 22 +--
.../ConvertFromAlgebricksExpressionsRule.java | 24 +--
.../ConvertToAlgebricksExpressionsRule.java | 26 +--
.../EliminateSubplanForSingleItemsRule.java | 32 ++--
.../EliminateSubplanForSinglePathsRule.java | 14 +-
.../EliminateUnnestAggregateSequencesRule.java | 28 +--
.../EliminateUnnestAggregateSubplanRule.java | 30 ++--
.../rewriter/rules/IntroduceCollectionRule.java | 16 +-
.../rules/IntroduceTwoStepAggregateRule.java | 28 +--
.../rules/PushChildIntoDataScanRule.java | 20 +--
.../rules/PushFunctionsOntoEqJoinBranches.java | 32 ++--
.../RemoveRedundantBooleanExpressionsRule.java | 2 +-
.../RemoveRedundantCastExpressionsRule.java | 2 +-
.../RemoveRedundantDataExpressionsRule.java | 2 +-
.../RemoveRedundantPromoteExpressionsRule.java | 2 +-
.../RemoveRedundantTreatExpressionsRule.java | 2 +-
.../RemoveUnusedSortDistinctNodesRule.java | 32 ++--
.../rules/RemoveUnusedUnnestIterateRule.java | 28 +--
.../rules/ReplaceSourceMapInDocExpression.java | 26 +--
.../rules/SetCollectionDataSourceRule.java | 6 +-
.../rules/SetVariableIdContextRule.java | 14 +-
.../ExtractFunctionsFromJoinConditionRule.java | 32 ++--
.../InlineNestedVariablesRule.java | 26 +--
...oveFreeVariableOperatorOutOfSubplanRule.java | 22 +--
.../ConstantPropertyPropagationPolicy.java | 2 +-
.../IPropertyPropagationPolicy.java | 2 +-
.../InputPropertyPropagationPolicy.java | 2 +-
.../cardinality/Cardinality.java | 2 +-
.../documentorder/DocumentOrder.java | 2 +-
.../DocumentOrderNOPropagationPolicy.java | 2 +-
.../DocumentOrderYESPropagationPolicy.java | 2 +-
.../uniquenodes/UniqueNodes.java | 2 +-
.../UniqueNodesNOPropagationPolicy.java | 2 +-
.../UniqueNodesYESPropagationPolicy.java | 2 +-
.../rules/util/CardinalityRuleToolbox.java | 8 +-
.../rewriter/rules/util/ExpressionToolbox.java | 24 +--
.../rewriter/rules/util/OperatorToolbox.java | 22 +--
.../context/DefaultDocumentURIResolverImpl.java | 2 +-
.../context/DelegatingStaticContextImpl.java | 2 +-
.../vxquery/context/DocumentURIResolver.java | 2 +-
.../apache/vxquery/context/DynamicContext.java | 6 +-
.../vxquery/context/DynamicContextImpl.java | 8 +-
.../context/DynamicContextImplFactory.java | 8 +-
.../vxquery/context/IDynamicContextFactory.java | 4 +-
.../vxquery/context/IStaticContextFactory.java | 2 +-
.../vxquery/context/ModuleURIResolver.java | 2 +-
.../context/RootStaticContextFactory.java | 2 +-
.../vxquery/context/RootStaticContextImpl.java | 2 +-
.../apache/vxquery/context/StaticContext.java | 2 +-
.../vxquery/context/StaticContextImpl.java | 2 +-
.../context/StaticContextImplFactory.java | 2 +-
.../vxquery/context/ThinStaticContextImpl.java | 2 +-
.../context/ThinStaticContextImplFactory.java | 2 +-
.../apache/vxquery/context/XQueryVariable.java | 4 +-
.../datamodel/accessors/PointableCache.java | 4 +-
.../datamodel/accessors/PointablePool.java | 6 +-
.../accessors/PointablePoolFactory.java | 20 +--
.../datamodel/accessors/SequencePointable.java | 14 +-
.../accessors/TaggedValuePointable.java | 14 +-
.../datamodel/accessors/TypedPointables.java | 16 +-
.../accessors/atomic/CodedQNamePointable.java | 12 +-
.../accessors/atomic/XSBinaryPointable.java | 8 +-
.../accessors/atomic/XSDatePointable.java | 14 +-
.../accessors/atomic/XSDateTimePointable.java | 16 +-
.../accessors/atomic/XSDecimalPointable.java | 20 +--
.../accessors/atomic/XSDurationPointable.java | 14 +-
.../accessors/atomic/XSQNamePointable.java | 10 +-
.../accessors/atomic/XSTimePointable.java | 14 +-
.../accessors/nodes/AbstractNodePointable.java | 4 +-
.../accessors/nodes/AttributeNodePointable.java | 10 +-
.../accessors/nodes/DocumentNodePointable.java | 10 +-
.../accessors/nodes/ElementNodePointable.java | 14 +-
.../accessors/nodes/NodeTreePointable.java | 22 +--
.../accessors/nodes/PINodePointable.java | 12 +-
.../nodes/TextOrCommentNodePointable.java | 10 +-
.../builders/atomic/StringValueBuilder.java | 4 +-
.../builders/atomic/UTF8StringBuilder.java | 6 +-
.../builders/base/AbstractBuilder.java | 4 +-
.../builders/base/AbstractValueBuilder.java | 2 +-
.../datamodel/builders/base/IValueBuilder.java | 2 +-
.../builders/nodes/AbstractNodeBuilder.java | 4 +-
.../builders/nodes/AttributeNodeBuilder.java | 6 +-
.../builders/nodes/CommentNodeBuilder.java | 6 +-
.../builders/nodes/DictionaryBuilder.java | 14 +-
.../builders/nodes/DocumentNodeBuilder.java | 6 +-
.../builders/nodes/ElementNodeBuilder.java | 12 +-
.../builders/nodes/NodeSubTreeBuilder.java | 4 +-
.../datamodel/builders/nodes/PINodeBuilder.java | 6 +-
.../builders/nodes/TextNodeBuilder.java | 6 +-
.../builders/sequence/SequenceBuilder.java | 8 +-
.../vxquery/datamodel/values/ValueTag.java | 2 +-
.../vxquery/datamodel/values/XDMConstants.java | 8 +-
.../DefaultSystemExceptionFactory.java | 2 +-
.../vxquery/exceptions/ErrorReporter.java | 2 +-
.../vxquery/exceptions/SystemException.java | 2 +-
.../exceptions/SystemExceptionFactory.java | 2 +-
.../exceptions/VXQueryDataException.java | 2 +-
.../vxquery/exceptions/WarningReporter.java | 2 +-
.../vxquery/functions/BuiltinFunction.java | 2 +-
.../vxquery/functions/ExternalFunction.java | 2 +-
.../org/apache/vxquery/functions/Function.java | 10 +-
.../org/apache/vxquery/functions/Operator.java | 2 +-
.../org/apache/vxquery/functions/Signature.java | 2 +-
.../functions/UserDefinedXQueryFunction.java | 4 +-
.../vxquery/metadata/QueryResultDataSink.java | 12 +-
.../metadata/QueryResultSetDataSink.java | 12 +-
.../metadata/VXQueryCollectionDataSource.java | 16 +-
.../VXQueryCollectionOperatorDescriptor.java | 42 ++---
.../vxquery/metadata/VXQueryIOFileFilter.java | 2 +-
.../metadata/VXQueryMetadataProvider.java | 58 +++---
.../org/apache/vxquery/result/ResultUtils.java | 6 +-
.../VXQueryRawBinaryHashFunctionFactory.java | 6 +-
...AbstractMaxMinAggregateEvaluatorFactory.java | 14 +-
.../AbstractMaxMinScalarEvaluatorFactory.java | 14 +-
.../AvgGlobalAggregateEvaluatorFactory.java | 16 +-
.../AvgLocalAggregateEvaluatorFactory.java | 14 +-
.../FnAvgAggregateEvaluatorFactory.java | 14 +-
.../aggregate/FnAvgScalarEvaluatorFactory.java | 14 +-
.../FnCountAggregateEvaluatorFactory.java | 14 +-
.../FnCountScalarEvaluatorFactory.java | 14 +-
.../FnMaxAggregateEvaluatorFactory.java | 4 +-
.../aggregate/FnMaxScalarEvaluatorFactory.java | 4 +-
.../FnMinAggregateEvaluatorFactory.java | 4 +-
.../aggregate/FnMinScalarEvaluatorFactory.java | 4 +-
.../FnSumAggregateEvaluatorFactory.java | 14 +-
.../aggregate/FnSumScalarEvaluatorFactory.java | 16 +-
.../arithmetic/AbstractArithmeticOperation.java | 10 +-
...bstractArithmeticScalarEvaluatorFactory.java | 12 +-
.../functions/arithmetic/AddOperation.java | 12 +-
.../arithmetic/AddScalarEvaluatorFactory.java | 4 +-
.../functions/arithmetic/DivideOperation.java | 12 +-
.../DivideScalarEvaluatorFactory.java | 4 +-
.../arithmetic/IntegerDivideOperation.java | 12 +-
.../IntegerDivideScalarEvaluatorFactory.java | 4 +-
.../functions/arithmetic/ModOperation.java | 12 +-
.../arithmetic/ModScalarEvaluatorFactory.java | 4 +-
.../functions/arithmetic/MultiplyOperation.java | 12 +-
.../MultiplyScalarEvaluatorFactory.java | 4 +-
.../functions/arithmetic/SubtractOperation.java | 12 +-
.../SubtractScalarEvaluatorFactory.java | 4 +-
...ctTaggedValueArgumentAggregateEvaluator.java | 10 +-
...dValueArgumentAggregateEvaluatorFactory.java | 14 +-
...tractTaggedValueArgumentScalarEvaluator.java | 10 +-
...ggedValueArgumentScalarEvaluatorFactory.java | 10 +-
...ctTaggedValueArgumentUnnestingEvaluator.java | 10 +-
...dValueArgumentUnnestingEvaluatorFactory.java | 14 +-
.../bool/AndScalarEvaluatorFactory.java | 16 +-
.../bool/FnBooleanScalarEvaluatorFactory.java | 26 +--
.../bool/FnFalseScalarEvaluatorFactory.java | 12 +-
.../bool/FnNotScalarEvaluatorFactory.java | 14 +-
.../bool/FnTrueScalarEvaluatorFactory.java | 12 +-
.../bool/OrScalarEvaluatorFactory.java | 16 +-
.../functions/cast/AbstractCastToOperation.java | 16 +-
.../cast/CastScalarEvaluatorFactory.java | 14 +-
.../functions/cast/CastToAnyURIOperation.java | 4 +-
.../cast/CastToBase64BinaryOperation.java | 6 +-
.../functions/cast/CastToBooleanOperation.java | 12 +-
.../functions/cast/CastToByteOperation.java | 20 +--
.../cast/CastToDTDurationOperation.java | 8 +-
.../functions/cast/CastToDateOperation.java | 4 +-
.../functions/cast/CastToDateTimeOperation.java | 4 +-
.../functions/cast/CastToDecimalOperation.java | 22 +--
.../functions/cast/CastToDoubleOperation.java | 20 +--
.../functions/cast/CastToDurationOperation.java | 8 +-
.../functions/cast/CastToEntityOperation.java | 2 +-
.../functions/cast/CastToFloatOperation.java | 20 +--
.../functions/cast/CastToGDayOperation.java | 4 +-
.../cast/CastToGMonthDayOperation.java | 4 +-
.../functions/cast/CastToGMonthOperation.java | 4 +-
.../cast/CastToGYearMonthOperation.java | 4 +-
.../functions/cast/CastToGYearOperation.java | 4 +-
.../cast/CastToHexBinaryOperation.java | 6 +-
.../functions/cast/CastToIDOperation.java | 2 +-
.../functions/cast/CastToIDREFOperation.java | 2 +-
.../functions/cast/CastToIntOperation.java | 20 +--
.../functions/cast/CastToIntegerOperation.java | 20 +--
.../functions/cast/CastToLanguageOperation.java | 2 +-
.../functions/cast/CastToLongOperation.java | 2 +-
.../functions/cast/CastToNCNameOperation.java | 2 +-
.../functions/cast/CastToNMTokenOperation.java | 2 +-
.../functions/cast/CastToNameOperation.java | 2 +-
.../cast/CastToNegativeIntegerOperation.java | 2 +-
.../cast/CastToNonNegativeIntegerOperation.java | 2 +-
.../cast/CastToNonPositiveIntegerOperation.java | 2 +-
.../cast/CastToNormalizedStringOperation.java | 2 +-
.../functions/cast/CastToNotationOperation.java | 4 +-
.../cast/CastToPositiveIntegerOperation.java | 2 +-
.../functions/cast/CastToQNameOperation.java | 6 +-
.../functions/cast/CastToShortOperation.java | 20 +--
.../functions/cast/CastToStringOperation.java | 22 +--
.../functions/cast/CastToTimeOperation.java | 4 +-
.../functions/cast/CastToTokenOperation.java | 2 +-
.../cast/CastToUnsignedByteOperation.java | 2 +-
.../cast/CastToUnsignedIntOperation.java | 2 +-
.../cast/CastToUnsignedLongOperation.java | 2 +-
.../cast/CastToUnsignedShortOperation.java | 2 +-
.../cast/CastToUntypedAtomicOperation.java | 2 +-
.../cast/CastToYMDurationOperation.java | 8 +-
.../castable/AbstractCastableAsOperation.java | 16 +-
.../castable/CastableAsAnyURIOperation.java | 4 +-
.../CastableAsBase64BinaryOperation.java | 6 +-
.../castable/CastableAsBooleanOperation.java | 14 +-
.../castable/CastableAsByteOperation.java | 16 +-
.../castable/CastableAsDTDurationOperation.java | 10 +-
.../castable/CastableAsDateOperation.java | 6 +-
.../castable/CastableAsDateTimeOperation.java | 6 +-
.../castable/CastableAsDecimalOperation.java | 14 +-
.../castable/CastableAsDoubleOperation.java | 20 +--
.../castable/CastableAsDurationOperation.java | 10 +-
.../castable/CastableAsFloatOperation.java | 20 +--
.../castable/CastableAsGDayOperation.java | 6 +-
.../castable/CastableAsGMonthDayOperation.java | 6 +-
.../castable/CastableAsGMonthOperation.java | 6 +-
.../castable/CastableAsGYearMonthOperation.java | 6 +-
.../castable/CastableAsGYearOperation.java | 6 +-
.../castable/CastableAsHexBinaryOperation.java | 6 +-
.../castable/CastableAsIntOperation.java | 20 +--
.../castable/CastableAsIntegerOperation.java | 20 +--
.../castable/CastableAsLongOperation.java | 2 +-
.../CastableAsNegativeIntegerOperation.java | 2 +-
.../CastableAsNonNegativeIntegerOperation.java | 2 +-
.../CastableAsNonPositiveIntegerOperation.java | 2 +-
.../castable/CastableAsNotationOperation.java | 14 +-
.../CastableAsPositiveIntegerOperation.java | 2 +-
.../castable/CastableAsQNameOperation.java | 4 +-
.../castable/CastableAsShortOperation.java | 18 +-
.../castable/CastableAsStringOperation.java | 14 +-
.../castable/CastableAsTimeOperation.java | 6 +-
.../CastableAsUnsignedByteOperation.java | 2 +-
.../CastableAsUnsignedIntOperation.java | 2 +-
.../CastableAsUnsignedLongOperation.java | 2 +-
.../CastableAsUnsignedShortOperation.java | 2 +-
.../CastableAsUntypedAtomicOperation.java | 2 +-
.../castable/CastableAsYMDurationOperation.java | 10 +-
.../CastableScalarEvaluatorFactory.java | 14 +-
.../AbstractDisjunctiveComparisonOperation.java | 14 +-
.../AbstractNegatingComparisonOperation.java | 14 +-
.../AbstractValueComparisonOperation.java | 14 +-
...ctValueComparisonScalarEvaluatorFactory.java | 16 +-
.../comparison/ValueEqComparisonOperation.java | 16 +-
...ValueEqComparisonScalarEvaluatorFactory.java | 4 +-
.../comparison/ValueGeComparisonOperation.java | 2 +-
...ValueGeComparisonScalarEvaluatorFactory.java | 4 +-
.../comparison/ValueGtComparisonOperation.java | 2 +-
...ValueGtComparisonScalarEvaluatorFactory.java | 4 +-
.../comparison/ValueLeComparisonOperation.java | 2 +-
...ValueLeComparisonScalarEvaluatorFactory.java | 4 +-
.../comparison/ValueLtComparisonOperation.java | 16 +-
...ValueLtComparisonScalarEvaluatorFactory.java | 4 +-
.../comparison/ValueNeComparisonOperation.java | 2 +-
...ValueNeComparisonScalarEvaluatorFactory.java | 4 +-
...GeneralComparisonScalarEvaluatorFactory.java | 18 +-
...neralEqComparisonScalarEvaluatorFactory.java | 4 +-
...neralGeComparisonScalarEvaluatorFactory.java | 4 +-
...neralGtComparisonScalarEvaluatorFactory.java | 4 +-
...neralLeComparisonScalarEvaluatorFactory.java | 4 +-
...neralLtComparisonScalarEvaluatorFactory.java | 4 +-
...neralNeComparisonScalarEvaluatorFactory.java | 4 +-
.../IfThenElseScalarEvaluatorFactory.java | 16 +-
...ValueFromDateTimeScalarEvaluatorFactory.java | 12 +-
...ValueFromDurationScalarEvaluatorFactory.java | 16 +-
...ateTimeToTimezoneScalarEvaluatorFactory.java | 14 +-
...ustDateToTimezoneScalarEvaluatorFactory.java | 14 +-
...ustTimeToTimezoneScalarEvaluatorFactory.java | 14 +-
.../FnCurrentDateScalarEvaluatorFactory.java | 12 +-
...FnCurrentDateTimeScalarEvaluatorFactory.java | 14 +-
.../FnCurrentTimeScalarEvaluatorFactory.java | 14 +-
.../FnDateTimeScalarEvaluatorFactory.java | 12 +-
.../FnDayFromDateScalarEvaluatorFactory.java | 2 +-
...FnDayFromDateTimeScalarEvaluatorFactory.java | 2 +-
...nDaysFromDurationScalarEvaluatorFactory.java | 2 +-
...HoursFromDateTimeScalarEvaluatorFactory.java | 2 +-
...HoursFromDurationScalarEvaluatorFactory.java | 2 +-
.../FnHoursFromTimeScalarEvaluatorFactory.java | 2 +-
...nImplicitTimezoneScalarEvaluatorFactory.java | 12 +-
...nutesFromDateTimeScalarEvaluatorFactory.java | 2 +-
...nutesFromDurationScalarEvaluatorFactory.java | 2 +-
...FnMinutesFromTimeScalarEvaluatorFactory.java | 2 +-
.../FnMonthFromDateScalarEvaluatorFactory.java | 2 +-
...MonthFromDateTimeScalarEvaluatorFactory.java | 2 +-
...onthsFromDurationScalarEvaluatorFactory.java | 2 +-
...condsFromDateTimeScalarEvaluatorFactory.java | 2 +-
...condsFromDurationScalarEvaluatorFactory.java | 2 +-
...FnSecondsFromTimeScalarEvaluatorFactory.java | 2 +-
...nTimezoneFromDateScalarEvaluatorFactory.java | 2 +-
...ezoneFromDateTimeScalarEvaluatorFactory.java | 2 +-
...nTimezoneFromTimeScalarEvaluatorFactory.java | 2 +-
.../FnYearFromDateScalarEvaluatorFactory.java | 2 +-
...nYearFromDateTimeScalarEvaluatorFactory.java | 2 +-
...YearsFromDurationScalarEvaluatorFactory.java | 2 +-
.../error/FnErrorScalarEvaluatorFactory.java | 16 +-
.../misc/FnDataScalarEvaluatorFactory.java | 14 +-
.../AbstractNodeConstructorScalarEvaluator.java | 12 +-
.../AbstractNodePositionalCheckEvaluator.java | 6 +-
...AttributeNodeConstructorScalarEvaluator.java | 10 +-
...teNodeConstructorScalarEvaluatorFactory.java | 10 +-
.../CommentNodeConstructorScalarEvaluator.java | 10 +-
...ntNodeConstructorScalarEvaluatorFactory.java | 10 +-
.../ElementNodeConstructorScalarEvaluator.java | 14 +-
...ntNodeConstructorScalarEvaluatorFactory.java | 10 +-
.../FnDocAvailableScalarEvaluatorFactory.java | 18 +-
.../node/FnDocScalarEvaluatorFactory.java | 18 +-
.../node/FnNumberScalarEvaluatorFactory.java | 12 +-
.../node/IdFromNodeScalarEvaluatorFactory.java | 12 +-
.../LocalIdFromNodeScalarEvaluatorFactory.java | 12 +-
.../functions/node/OpNodeAfterEvaluator.java | 2 +-
.../node/OpNodeAfterEvaluatorFactory.java | 8 +-
.../functions/node/OpNodeBeforeEvaluator.java | 2 +-
.../node/OpNodeBeforeEvaluatorFactory.java | 8 +-
.../node/PINodeConstructorScalarEvaluator.java | 10 +-
...PINodeConstructorScalarEvaluatorFactory.java | 10 +-
.../TextNodeConstructorScalarEvaluator.java | 10 +-
...xtNodeConstructorScalarEvaluatorFactory.java | 10 +-
.../TreeIdFromNodeScalarEvaluatorFactory.java | 12 +-
...NodesAscOrAtomicsScalarEvaluatorFactory.java | 12 +-
.../numeric/AbstractNumericOperation.java | 6 +-
.../AbstractNumericScalarEvaluatorFactory.java | 16 +-
.../functions/numeric/FnAbsOperation.java | 8 +-
.../numeric/FnAbsScalarEvaluatorFactory.java | 4 +-
.../functions/numeric/FnCeilingOperation.java | 8 +-
.../FnCeilingScalarEvaluatorFactory.java | 4 +-
.../functions/numeric/FnFloorOperation.java | 8 +-
.../numeric/FnFloorScalarEvaluatorFactory.java | 4 +-
...FnRoundHalfToEvenScalarEvaluatorFactory.java | 26 +--
.../functions/numeric/FnRoundOperation.java | 8 +-
.../numeric/FnRoundScalarEvaluatorFactory.java | 4 +-
...ocalNameFromQNameScalarEvaluatorFactory.java | 16 +-
...spaceUriFromQNameScalarEvaluatorFactory.java | 16 +-
...FnPrefixFromQNameScalarEvaluatorFactory.java | 16 +-
.../qname/FnQNameScalarEvaluatorFactory.java | 16 +-
.../ConcatenateScalarEvaluatorFactory.java | 16 +-
.../FnDistinctValuesScalarEvaluatorFactory.java | 18 +-
.../sequence/FnEmptyScalarEvaluatorFactory.java | 12 +-
.../FnExactlyOneScalarEvaluatorFactory.java | 12 +-
.../FnExistsScalarEvaluatorFactory.java | 12 +-
.../FnIndexOfScalarEvaluatorFactory.java | 16 +-
.../FnInsertBeforeScalarEvaluatorFactory.java | 18 +-
.../FnOneOrMoreScalarEvaluatorFactory.java | 12 +-
.../FnRemoveScalarEvaluatorFactory.java | 18 +-
.../FnReverseScalarEvaluatorFactory.java | 16 +-
.../FnSubsequenceScalarEvaluatorFactory.java | 20 +--
.../FnUnorderedScalarEvaluatorFactory.java | 12 +-
.../FnZeroOrOneScalarEvaluatorFactory.java | 12 +-
.../IterateUnnestingEvaluatorFactory.java | 14 +-
.../sequence/OpToScalarEvaluatorFactory.java | 16 +-
.../SequenceAggregateEvaluatorFactory.java | 16 +-
...stractDescendantPathStepScalarEvaluator.java | 8 +-
.../step/AbstractForwardAxisPathStep.java | 8 +-
.../step/AbstractPathStepScalarEvaluator.java | 10 +-
.../AbstractSinglePathStepScalarEvaluator.java | 12 +-
.../step/AttributePathStepScalarEvaluator.java | 6 +-
...AttributePathStepScalarEvaluatorFactory.java | 10 +-
.../step/ChildPathStepOperatorDescriptor.java | 8 +-
.../step/ChildPathStepScalarEvaluator.java | 12 +-
.../ChildPathStepScalarEvaluatorFactory.java | 10 +-
.../functions/step/ChildPathStepUnnesting.java | 10 +-
.../step/ChildPathStepUnnestingEvaluator.java | 10 +-
.../ChildPathStepUnnestingEvaluatorFactory.java | 12 +-
...DescendantOrSelfPathStepScalarEvaluator.java | 12 +-
...antOrSelfPathStepScalarEvaluatorFactory.java | 10 +-
.../step/DescendantOrSelfPathStepUnnesting.java | 10 +-
...cendantOrSelfPathStepUnnestingEvaluator.java | 10 +-
...OrSelfPathStepUnnestingEvaluatorFactory.java | 12 +-
.../step/DescendantPathStepScalarEvaluator.java | 12 +-
...escendantPathStepScalarEvaluatorFactory.java | 10 +-
.../DescendantPathStepUnnestingEvaluator.java | 10 +-
...endantPathStepUnnestingEvaluatorFactory.java | 12 +-
.../runtime/functions/step/NodeTestFilter.java | 8 +-
.../step/SelfPathStepScalarEvaluator.java | 10 +-
.../SelfPathStepScalarEvaluatorFactory.java | 10 +-
...stractCharacterIteratorCopyingEvaluator.java | 6 +-
...haracterIteratorCopyingEvaluatorFactory.java | 2 +-
.../FnCodepointEqualEvaluatorFactory.java | 12 +-
.../FnCodepointsToStringEvaluatorFactory.java | 16 +-
.../strings/FnCompareEvaluatorFactory.java | 14 +-
.../strings/FnConcatEvaluatorFactory.java | 14 +-
.../strings/FnContainsEvaluatorFactory.java | 12 +-
.../strings/FnEndsWithEvaluatorFactory.java | 12 +-
.../strings/FnLowerCaseEvaluatorFactory.java | 10 +-
.../strings/FnStartsWithEvaluatorFactory.java | 12 +-
.../strings/FnStringJoinEvaluatorFactory.java | 14 +-
.../strings/FnStringLengthEvaluatorFactory.java | 14 +-
.../strings/FnStringScalarEvaluatorFactory.java | 14 +-
.../FnStringToCodepointsEvaluatorFactory.java | 14 +-
.../FnSubstringAfterEvaluatorFactory.java | 10 +-
.../FnSubstringBeforeEvaluatorFactory.java | 10 +-
.../strings/FnSubstringEvaluatorFactory.java | 16 +-
.../strings/FnUpperCaseEvaluatorFactory.java | 10 +-
.../strings/UTF8StringCharacterIterator.java | 2 +-
.../AbstractTypeScalarEvaluatorFactory.java | 12 +-
.../type/InstanceOfScalarEvaluatorFactory.java | 12 +-
.../type/PromoteScalarEvaluatorFactory.java | 14 +-
.../functions/type/SequenceTypeMatcher.java | 4 +-
.../type/TreatScalarEvaluatorFactory.java | 12 +-
.../unary/AbstractNumericUnaryOperation.java | 6 +-
...tractNumericUnaryScalarEvaluatorFactory.java | 16 +-
.../unary/NumericUnaryMinusOperation.java | 8 +-
...NumericUnaryMinusScalarEvaluatorFactory.java | 4 +-
.../unary/NumericUnaryPlusOperation.java | 8 +-
.../NumericUnaryPlusScalarEvaluatorFactory.java | 4 +-
.../functions/util/ArithmeticHelper.java | 8 +-
.../runtime/functions/util/AtomizeHelper.java | 6 +-
.../runtime/functions/util/FunctionHelper.java | 14 +-
...XQueryBinaryHashFunctionFactoryProvider.java | 6 +-
...VXQueryBinaryHashFunctionFamilyProvider.java | 8 +-
.../vxquery/serializer/XMLSerializer.java | 26 +--
.../apache/vxquery/types/AbstractNodeType.java | 2 +-
.../org/apache/vxquery/types/AnyNodeType.java | 2 +-
.../org/apache/vxquery/types/AnySimpleType.java | 2 +-
.../java/org/apache/vxquery/types/AnyType.java | 2 +-
.../org/apache/vxquery/types/AtomicType.java | 2 +-
.../org/apache/vxquery/types/AttributeType.java | 2 +-
.../apache/vxquery/types/BuiltinAtomicType.java | 2 +-
.../vxquery/types/BuiltinTypeConstants.java | 2 +-
.../apache/vxquery/types/BuiltinTypeQNames.java | 2 +-
.../vxquery/types/BuiltinTypeRegistry.java | 2 +-
.../org/apache/vxquery/types/CommentType.java | 2 +-
.../org/apache/vxquery/types/ComplexType.java | 2 +-
.../apache/vxquery/types/DerivationProcess.java | 2 +-
.../org/apache/vxquery/types/DocumentType.java | 2 +-
.../org/apache/vxquery/types/ElementType.java | 2 +-
.../apache/vxquery/types/EmptySequenceType.java | 2 +-
.../java/org/apache/vxquery/types/ItemType.java | 2 +-
.../java/org/apache/vxquery/types/NameTest.java | 4 +-
.../java/org/apache/vxquery/types/NodeKind.java | 2 +-
.../java/org/apache/vxquery/types/NodeType.java | 2 +-
.../java/org/apache/vxquery/types/NoneType.java | 2 +-
.../types/ProcessingInstructionType.java | 4 +-
.../org/apache/vxquery/types/SchemaType.java | 2 +-
.../org/apache/vxquery/types/SimpleType.java | 2 +-
.../java/org/apache/vxquery/types/TextType.java | 2 +-
.../org/apache/vxquery/types/TypeHelper.java | 2 +-
.../org/apache/vxquery/types/TypeUtils.java | 2 +-
.../java/org/apache/vxquery/types/XQType.java | 2 +-
.../java/org/apache/vxquery/util/Filter.java | 2 +-
.../apache/vxquery/util/GrowableIntArray.java | 2 +-
.../org/apache/vxquery/util/SourceLocation.java | 2 +-
.../vxquery/xmlparser/ITreeNodeIdProvider.java | 2 +-
.../vxquery/xmlparser/SAXContentHandler.java | 77 ++++----
.../vxquery/xmlparser/TreeNodeIdProvider.java | 2 +-
.../org/apache/vxquery/xmlparser/XMLParser.java | 28 ++-
.../apache/vxquery/xmlquery/ast/ASTNode.java | 2 +-
.../org/apache/vxquery/xmlquery/ast/ASTTag.java | 2 +-
.../vxquery/xmlquery/ast/AnyNodeTestNode.java | 2 +-
.../vxquery/xmlquery/ast/AtomicTypeNode.java | 2 +-
.../vxquery/xmlquery/ast/AttributeTestNode.java | 2 +-
.../vxquery/xmlquery/ast/AxisStepNode.java | 2 +-
.../vxquery/xmlquery/ast/BaseUriDeclNode.java | 2 +-
.../xmlquery/ast/BoundarySpaceDeclNode.java | 2 +-
.../vxquery/xmlquery/ast/CDataSectionNode.java | 2 +-
.../vxquery/xmlquery/ast/CaseClauseNode.java | 2 +-
.../vxquery/xmlquery/ast/CommentTestNode.java | 2 +-
.../ast/ComputedAttributeConstructorNode.java | 2 +-
.../ast/ComputedCommentConstructorNode.java | 2 +-
.../ast/ComputedDocumentConstructorNode.java | 2 +-
.../ast/ComputedElementConstructorNode.java | 2 +-
.../xmlquery/ast/ComputedPIConstructorNode.java | 2 +-
.../ast/ComputedTextConstructorNode.java | 2 +-
.../xmlquery/ast/ConstructionDeclNode.java | 2 +-
.../vxquery/xmlquery/ast/ContentCharsNode.java | 2 +-
.../xmlquery/ast/ContextItemExprNode.java | 2 +-
.../xmlquery/ast/CopyNamespacesDeclNode.java | 2 +-
.../ast/DQuotedAttributeContentNode.java | 2 +-
.../xmlquery/ast/DefaultCollationDeclNode.java | 2 +-
.../ast/DefaultElementNamespaceDeclNode.java | 2 +-
.../ast/DefaultFunctionNamespaceDeclNode.java | 2 +-
.../ast/DirectAttributeConstructorNode.java | 2 +-
.../ast/DirectCommentConstructorNode.java | 2 +-
.../ast/DirectElementConstructorNode.java | 2 +-
.../xmlquery/ast/DirectPIConstructorNode.java | 2 +-
.../vxquery/xmlquery/ast/DocumentTestNode.java | 2 +-
.../vxquery/xmlquery/ast/ElementTestNode.java | 2 +-
.../xmlquery/ast/EmptyOrderDeclNode.java | 2 +-
.../xmlquery/ast/EmptySequenceTypeNode.java | 2 +-
.../vxquery/xmlquery/ast/EnclosedExprNode.java | 2 +-
.../apache/vxquery/xmlquery/ast/ExprNode.java | 2 +-
.../vxquery/xmlquery/ast/ExtensionExprNode.java | 2 +-
.../vxquery/xmlquery/ast/FLWORClauseNode.java | 2 +-
.../vxquery/xmlquery/ast/FLWORExprNode.java | 2 +-
.../vxquery/xmlquery/ast/FTOptionDeclNode.java | 2 +-
.../vxquery/xmlquery/ast/FilterExprNode.java | 2 +-
.../vxquery/xmlquery/ast/ForClauseNode.java | 2 +-
.../vxquery/xmlquery/ast/ForVarDeclNode.java | 2 +-
.../vxquery/xmlquery/ast/FunctionDeclNode.java | 2 +-
.../vxquery/xmlquery/ast/FunctionExprNode.java | 2 +-
.../apache/vxquery/xmlquery/ast/IfExprNode.java | 2 +-
.../vxquery/xmlquery/ast/InfixExprNode.java | 2 +-
.../vxquery/xmlquery/ast/ItemTestNode.java | 2 +-
.../vxquery/xmlquery/ast/ItemTypeNode.java | 2 +-
.../vxquery/xmlquery/ast/LetClauseNode.java | 2 +-
.../vxquery/xmlquery/ast/LetVarDeclNode.java | 2 +-
.../vxquery/xmlquery/ast/LibraryModuleNode.java | 2 +-
.../vxquery/xmlquery/ast/LiteralNode.java | 2 +-
.../vxquery/xmlquery/ast/MainModuleNode.java | 2 +-
.../vxquery/xmlquery/ast/ModuleDeclNode.java | 2 +-
.../vxquery/xmlquery/ast/ModuleImportNode.java | 2 +-
.../apache/vxquery/xmlquery/ast/ModuleNode.java | 2 +-
.../apache/vxquery/xmlquery/ast/NCNameNode.java | 2 +-
.../vxquery/xmlquery/ast/NameTestNode.java | 2 +-
.../vxquery/xmlquery/ast/NamespaceDeclNode.java | 2 +-
.../vxquery/xmlquery/ast/OptionDeclNode.java | 2 +-
.../vxquery/xmlquery/ast/OrderSpecNode.java | 2 +-
.../vxquery/xmlquery/ast/OrderbyClauseNode.java | 2 +-
.../vxquery/xmlquery/ast/OrderedExprNode.java | 2 +-
.../xmlquery/ast/OrderingModeDeclNode.java | 2 +-
.../apache/vxquery/xmlquery/ast/PITestNode.java | 2 +-
.../apache/vxquery/xmlquery/ast/ParamNode.java | 2 +-
.../xmlquery/ast/ParenthesizedExprNode.java | 2 +-
.../vxquery/xmlquery/ast/PathExprNode.java | 2 +-
.../apache/vxquery/xmlquery/ast/PragmaNode.java | 2 +-
.../apache/vxquery/xmlquery/ast/PrologNode.java | 2 +-
.../apache/vxquery/xmlquery/ast/QNameNode.java | 2 +-
.../xmlquery/ast/QuantifiedExprNode.java | 2 +-
.../xmlquery/ast/QuantifiedVarDeclNode.java | 2 +-
.../vxquery/xmlquery/ast/QueryBodyNode.java | 2 +-
.../xmlquery/ast/RelativePathExprNode.java | 2 +-
.../ast/SQuotedAttributeContentNode.java | 2 +-
.../xmlquery/ast/SchemaAttributeTestNode.java | 2 +-
.../xmlquery/ast/SchemaElementTestNode.java | 2 +-
.../vxquery/xmlquery/ast/SchemaImportNode.java | 2 +-
.../vxquery/xmlquery/ast/SequenceTypeNode.java | 2 +-
.../vxquery/xmlquery/ast/SingleTypeNode.java | 2 +-
.../vxquery/xmlquery/ast/TextTestNode.java | 2 +-
.../xmlquery/ast/TextualNodeContentNode.java | 2 +-
.../vxquery/xmlquery/ast/TypeDeclNode.java | 2 +-
.../vxquery/xmlquery/ast/TypeExprNode.java | 2 +-
.../xmlquery/ast/TypeswitchExprNode.java | 2 +-
.../vxquery/xmlquery/ast/UnaryExprNode.java | 2 +-
.../vxquery/xmlquery/ast/UnorderedExprNode.java | 2 +-
.../vxquery/xmlquery/ast/ValidateExprNode.java | 2 +-
.../vxquery/xmlquery/ast/VarDeclNode.java | 2 +-
.../apache/vxquery/xmlquery/ast/VarRefNode.java | 2 +-
.../vxquery/xmlquery/ast/VersionDeclNode.java | 2 +-
.../vxquery/xmlquery/ast/WhereClauseNode.java | 2 +-
.../apache/vxquery/xmlquery/query/Module.java | 6 +-
.../query/NoopXQueryCompilationListener.java | 2 +-
.../vxquery/xmlquery/query/PrologVariable.java | 2 +-
.../query/VXQueryCompilationListener.java | 10 +-
.../xmlquery/query/XMLQueryCompiler.java | 64 +++----
.../vxquery/xmlquery/query/XMLQueryParser.java | 2 +-
.../xmlquery/query/XMLQueryTypeChecker.java | 2 +-
.../query/XQueryCompilationListener.java | 2 +-
.../vxquery/xmlquery/query/XQueryConstants.java | 2 +-
.../translator/VXQueryPositionWriter.java | 5 +-
.../xmlquery/translator/XMLQueryTranslator.java | 175 ++++++++++---------
.../src/main/xslt/generate-fn-defns.xsl | 6 +-
.../src/main/xslt/generate-op-defns.xsl | 6 +-
.../xmlquery/query/SimpleXQueryTest.java | 2 +-
vxquery-server/pom.xml | 10 +-
.../vxquery/cli/VXQueryClusterShutdown.java | 4 +-
vxquery-xtest/pom.xml | 10 +-
.../vxquery/xtest/AbstractTestCaseFactory.java | 2 +-
.../apache/vxquery/xtest/ExpectedResult.java | 2 +-
.../vxquery/xtest/HTMLFileReporterImpl.java | 2 +-
.../vxquery/xtest/LineFileReporterImpl.java | 2 +-
.../java/org/apache/vxquery/xtest/Main.java | 2 +-
.../apache/vxquery/xtest/ResultReporter.java | 2 +-
.../vxquery/xtest/ServletReporterImpl.java | 2 +-
.../java/org/apache/vxquery/xtest/TestCase.java | 2 +-
.../apache/vxquery/xtest/TestCaseFactory.java | 2 +-
.../apache/vxquery/xtest/TestCaseResult.java | 2 +-
.../org/apache/vxquery/xtest/TestRunner.java | 56 +++---
.../apache/vxquery/xtest/TestRunnerFactory.java | 2 +-
.../vxquery/xtest/XMLFileReporterImpl.java | 2 +-
.../java/org/apache/vxquery/xtest/XTest.java | 2 +-
.../org/apache/vxquery/xtest/XTestOptions.java | 2 +-
.../vxquery/xtest/util/DiskPerformance.java | 6 +-
.../vxquery/xtest/JUnitTestCaseFactory.java | 2 +-
632 files changed, 3255 insertions(+), 2649 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 1862890..ca69e97 100644
--- a/pom.xml
+++ b/pom.xml
@@ -187,31 +187,31 @@
</dependency>
<dependency>
- <groupId>edu.uci.ics.hyracks</groupId>
+ <groupId>org.apache.hyracks</groupId>
<artifactId>hyracks-client</artifactId>
<version>${hyracks.version}</version>
</dependency>
<dependency>
- <groupId>edu.uci.ics.hyracks</groupId>
+ <groupId>org.apache.hyracks</groupId>
<artifactId>hyracks-control-common</artifactId>
<version>${hyracks.version}</version>
</dependency>
<dependency>
- <groupId>edu.uci.ics.hyracks</groupId>
+ <groupId>org.apache.hyracks</groupId>
<artifactId>hyracks-control-cc</artifactId>
<version>${hyracks.version}</version>
</dependency>
<dependency>
- <groupId>edu.uci.ics.hyracks</groupId>
+ <groupId>org.apache.hyracks</groupId>
<artifactId>hyracks-control-nc</artifactId>
<version>${hyracks.version}</version>
</dependency>
<dependency>
- <groupId>edu.uci.ics.hyracks</groupId>
+ <groupId>org.apache.hyracks</groupId>
<artifactId>algebricks-compiler</artifactId>
<version>${hyracks.version}</version>
</dependency>
@@ -223,55 +223,55 @@
</dependency>
<dependency>
- <groupId>edu.uci.ics.hyracks</groupId>
+ <groupId>org.apache.hyracks</groupId>
<artifactId>algebricks-common</artifactId>
<version>${hyracks.version}</version>
</dependency>
<dependency>
- <groupId>edu.uci.ics.hyracks</groupId>
+ <groupId>org.apache.hyracks</groupId>
<artifactId>algebricks-core</artifactId>
<version>${hyracks.version}</version>
</dependency>
<dependency>
- <groupId>edu.uci.ics.hyracks</groupId>
+ <groupId>org.apache.hyracks</groupId>
<artifactId>algebricks-data</artifactId>
<version>${hyracks.version}</version>
</dependency>
<dependency>
- <groupId>edu.uci.ics.hyracks</groupId>
+ <groupId>org.apache.hyracks</groupId>
<artifactId>algebricks-rewriter</artifactId>
<version>${hyracks.version}</version>
</dependency>
<dependency>
- <groupId>edu.uci.ics.hyracks</groupId>
+ <groupId>org.apache.hyracks</groupId>
<artifactId>algebricks-runtime</artifactId>
<version>${hyracks.version}</version>
</dependency>
<dependency>
- <groupId>edu.uci.ics.hyracks</groupId>
+ <groupId>org.apache.hyracks</groupId>
<artifactId>hyracks-api</artifactId>
<version>${hyracks.version}</version>
</dependency>
<dependency>
- <groupId>edu.uci.ics.hyracks</groupId>
+ <groupId>org.apache.hyracks</groupId>
<artifactId>hyracks-data-std</artifactId>
<version>${hyracks.version}</version>
</dependency>
<dependency>
- <groupId>edu.uci.ics.hyracks</groupId>
+ <groupId>org.apache.hyracks</groupId>
<artifactId>hyracks-dataflow-common</artifactId>
<version>${hyracks.version}</version>
</dependency>
<dependency>
- <groupId>edu.uci.ics.hyracks</groupId>
+ <groupId>org.apache.hyracks</groupId>
<artifactId>hyracks-dataflow-std</artifactId>
<version>${hyracks.version}</version>
</dependency>
@@ -375,8 +375,8 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
- <source>1.6</source>
- <target>1.6</target>
+ <source>1.8</source>
+ <target>1.8</target>
</configuration>
</plugin>
<plugin>
@@ -388,7 +388,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
- <version>2.4.2</version>
<dependencies>
<dependency>
<groupId>org.apache.maven.scm</groupId>
@@ -459,15 +458,15 @@
</plugin>
</reportPlugins>
</configuration>
- <executions>
- <execution>
+ <executions>
+ <execution>
<id>attach-site</id>
<phase>prepare-package</phase>
<goals>
<goal>jar</goal>
- </goals>
- </execution>
- </executions>
+ </goals>
+ </execution>
+ </executions>
</plugin>
-->
<plugin>
@@ -530,7 +529,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
- <hyracks.version>0.2.15</hyracks.version>
+ <hyracks.version>0.2.16-incubating</hyracks.version>
<apache-rat-plugin.version>0.11</apache-rat-plugin.version>
</properties>
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/src/site/apt/developer_get_started.apt
----------------------------------------------------------------------
diff --git a/src/site/apt/developer_get_started.apt b/src/site/apt/developer_get_started.apt
index 7a93d66..6d282f5 100644
--- a/src/site/apt/developer_get_started.apt
+++ b/src/site/apt/developer_get_started.apt
@@ -21,9 +21,9 @@ Get Started as a VXQuery Developer
* Go through the community member steps.
* {{{http://vxquery.apache.org/user_get_started.html}Community steps}}.
-
+
* Setup your eclipse development environment.
-
+
* {{{http://vxquery.apache.org/development_eclipse_setup.html}Setup instructions}}.
* XQuery has a test suite to verify XQuery specifications.
@@ -34,8 +34,8 @@ Get Started as a VXQuery Developer
* Review the test structure.
- * Code is found in the "VXQuery XTest" module.
+ * Code is found in the "VXQuery XTest" module.
* Review open issues for the project.
-
+
* {{{http://vxquery.apache.org/issue-tracking.html}Issues list}}.
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/src/site/apt/index.apt
----------------------------------------------------------------------
diff --git a/src/site/apt/index.apt b/src/site/apt/index.apt
index 8b5777a..3986f81 100644
--- a/src/site/apt/index.apt
+++ b/src/site/apt/index.apt
@@ -22,6 +22,7 @@ Apache VXQuery
There are lots of large collections of relatively small documents like e.g. the {{{http://www.sec.gov/info/edgar/ednews/dissemin.htm}EDGAR dataset}} or the {{{http://wiki.openstreetmap.org/wiki/Download}OpenStreetMap dataset}}.
However there are no XQuery processors available today that are capable of processing these datasets in parallel and making the contained information accessible.
-
-
\ No newline at end of file
+
+[images/vxquery_stack.png] VXQuery Stack Diagram
+
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/src/site/apt/user_cluster_installation.apt
----------------------------------------------------------------------
diff --git a/src/site/apt/user_cluster_installation.apt b/src/site/apt/user_cluster_installation.apt
index 1342908..0e756b0 100644
--- a/src/site/apt/user_cluster_installation.apt
+++ b/src/site/apt/user_cluster_installation.apt
@@ -15,6 +15,18 @@
Cluster Installation
+* Architecture
+
+ The VXQuery cluster is made up of two parts: a single cluster controller (cc) and many node controllers (nc).
+ The VXQuery CLI is used to parse the query and compile the job for the VXQuery cluster to process.
+ The CLI passes the job to the cc which manages the job and returns the result to the CLI.
+ The following diagram depicts the cluster layout.
+
+[images/vxquery_cluster.png] VXQuery Cluster Diagram
+
+ The XML document are distributed between the ncs.
+ The query's collection function will identify XML file path for the ncs.
+
* Requirements
@@ -28,7 +40,7 @@ Cluster Installation
* Steps
* <<Export JAVA_HOME>>
-
+
---
$ export JAVA_HOME=/usr/java/latest
---
@@ -36,7 +48,7 @@ $ export JAVA_HOME=/usr/java/latest
* <<Unzip and build VXQuery>>
----
+---
$ unzip apache-vxquery-X.Y-source-release.zip
$ cd apache-vxquery-X.Y
$ mvn package -DskipTests
@@ -45,7 +57,7 @@ $ cd ..
* <<Create configuration file>>
-
+
Create a configuration xml file containing the information of the vxquery cluster.Here is an example of a VXQuery configuration file for a cluster with 1 master and 3 slaves.
---
@@ -75,7 +87,7 @@ $ cd ..
* Fields that are required:
* name : name of the cluster
-
+
* username : user that will execute commands in all the machines of the cluster. Preferably a user that has passwordless ssh access to the machines.
* id : hostname of the node
@@ -94,12 +106,12 @@ $ cd ..
* <<Deploy cluster>>
To deploy the cluster you need to execute this command in the vxquery installation directory
-
+
---
$python cluster_cli.py -c ../conf/cluster.xml -a deploy -d /apache-vxquery/vxquery-server
---
- * Arguments:
+ * Arguments:
* -c : path to the configuration file you created
@@ -110,16 +122,16 @@ $python cluster_cli.py -c ../conf/cluster.xml -a deploy -d /apache-vxquery/vxque
* <<Start cluster>>
- The command to start the cluster is
+ The command to start the cluster is
---
$python cluster_cli.py -c ../conf/cluster.xml -a start
---
-
+
* <<Stop cluster>>
- The command to stop the cluster is
+ The command to stop the cluster is
---
$python cluster_cli.py -c ../conf/cluster.xml -a stop
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/src/site/resources/images/eclipse_xml_editor_screen.png
----------------------------------------------------------------------
diff --git a/src/site/resources/images/eclipse_xml_editor_screen.png b/src/site/resources/images/eclipse_xml_editor_screen.png
new file mode 100644
index 0000000..db430f5
Binary files /dev/null and b/src/site/resources/images/eclipse_xml_editor_screen.png differ
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/src/site/resources/images/vxquery_cluster.png
----------------------------------------------------------------------
diff --git a/src/site/resources/images/vxquery_cluster.png b/src/site/resources/images/vxquery_cluster.png
new file mode 100644
index 0000000..50cb26b
Binary files /dev/null and b/src/site/resources/images/vxquery_cluster.png differ
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/src/site/resources/images/vxquery_cluster_with_hdfs.png
----------------------------------------------------------------------
diff --git a/src/site/resources/images/vxquery_cluster_with_hdfs.png b/src/site/resources/images/vxquery_cluster_with_hdfs.png
new file mode 100644
index 0000000..2ec42b8
Binary files /dev/null and b/src/site/resources/images/vxquery_cluster_with_hdfs.png differ
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/src/site/resources/images/vxquery_stack.png
----------------------------------------------------------------------
diff --git a/src/site/resources/images/vxquery_stack.png b/src/site/resources/images/vxquery_stack.png
new file mode 100644
index 0000000..01549a5
Binary files /dev/null and b/src/site/resources/images/vxquery_stack.png differ
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-benchmark/pom.xml
----------------------------------------------------------------------
diff --git a/vxquery-benchmark/pom.xml b/vxquery-benchmark/pom.xml
index 81feaf8..d55f05e 100644
--- a/vxquery-benchmark/pom.xml
+++ b/vxquery-benchmark/pom.xml
@@ -49,7 +49,6 @@
</plugin>
<plugin>
<artifactId>maven-resources-plugin</artifactId>
- <version>2.5</version>
<executions>
<execution>
<id>copy-scripts</id>
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/basex/q00.xq
----------------------------------------------------------------------
diff --git a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/basex/q00.xq b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/basex/q00.xq
new file mode 100644
index 0000000..21fc54a
--- /dev/null
+++ b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/basex/q00.xq
@@ -0,0 +1,32 @@
+(: Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License. :)
+
+(:
+XQuery Filter Query
+-------------------
+See historical data for Key West International Airport, FL (USW00012836)
+station by selecting the weather readings for December 25 over the last
+10 years.
+:)
+let $collection := "../../../../../../../weather_data/dataset-tiny-local/data_links/local_speed_up/d0_p1_i0/sensors/"
+for $r in collection($collection)/root/dataCollection/data
+let $datetime := xs:dateTime(fn:data($r/date))
+where $r/station eq "GHCND:USW00012836"
+ and fn:year-from-dateTime($datetime) ge 2003
+ and fn:month-from-dateTime($datetime) eq 12
+ and fn:day-from-dateTime($datetime) eq 25
+return $r
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/basex/q01.xq
----------------------------------------------------------------------
diff --git a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/basex/q01.xq b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/basex/q01.xq
new file mode 100644
index 0000000..ba7f0f9
--- /dev/null
+++ b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/basex/q01.xq
@@ -0,0 +1,25 @@
+(: Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License. :)
+
+(: XQuery Filter Query :)
+(: Find all reading for hurricane force wind warning or extreme wind warning. :)
+(: The warnings occur when the wind speed (AWND) exceeds 110 mph (49.1744 :)
+(: meters per second). (Wind value is in tenth of a meter per second) :)
+let $collection := "../../../../../../../weather_data/dataset-tiny-local/data_links/local_speed_up/d0_p1_i0/sensors/"
+for $r in fn:collection($collection)/root/dataCollection/data
+where $r/dataType eq "AWND" and xs:decimal($r/value) gt 491.744
+return $r
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/basex/q02.xq
----------------------------------------------------------------------
diff --git a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/basex/q02.xq b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/basex/q02.xq
new file mode 100644
index 0000000..b089348
--- /dev/null
+++ b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/basex/q02.xq
@@ -0,0 +1,31 @@
+(: Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License. :)
+
+(:
+XQuery Aggregate Query
+----------------------
+Find the annual precipitation (PRCP) for a Syracuse, NY using the airport
+weather station (USW00014771) report for 1999.
+:)
+fn:sum(
+ let $collection := "../../../../../../../weather_data/dataset-tiny-local/data_links/local_speed_up/d0_p1_i0/sensors/"
+ for $r in collection($collection)/root/dataCollection/data
+ where $r/station eq "GHCND:USW00014771"
+ and $r/dataType eq "PRCP"
+ and fn:year-from-dateTime(xs:dateTime(fn:data($r/date))) eq 1999
+ return $r/value
+) div 10
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/basex/q03.xq
----------------------------------------------------------------------
diff --git a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/basex/q03.xq b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/basex/q03.xq
new file mode 100644
index 0000000..285bf21
--- /dev/null
+++ b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/basex/q03.xq
@@ -0,0 +1,25 @@
+(: Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License. :)
+
+(: XQuery Aggregate Query :)
+(: Find the highest recorded temperature (TMAX) in Celsius. :)
+fn:max(
+ let $collection := "../../../../../../../weather_data/dataset-tiny-local/data_links/local_speed_up/d0_p1_i0/sensors/"
+ for $r in collection($collection)/root/dataCollection/data
+ where $r/dataType eq "TMAX"
+ return $r/value
+) div 10
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/basex/q04.xq
----------------------------------------------------------------------
diff --git a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/basex/q04.xq b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/basex/q04.xq
new file mode 100644
index 0000000..9b69303
--- /dev/null
+++ b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/basex/q04.xq
@@ -0,0 +1,30 @@
+(: Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License. :)
+
+(: XQuery Join Query :)
+(: Find all the weather readings for King county for a specific day :)
+(: 1976/7/4. :)
+let $sensor_collection := "../../../../../../../weather_data/dataset-tiny-local/data_links/local_speed_up/d0_p1_i0/sensors/"
+for $r in collection($sensor_collection)/root/dataCollection/data
+
+let $station_collection := "../../../../../../../weather_data/dataset-tiny-local/data_links/local_speed_up/d0_p1_i0/stations/"
+for $s in collection($station_collection)/root/stationCollection/station
+
+where $s/id eq $r/station
+ and (some $x in $s/locationLabels satisfies ($x/type eq "ST" and fn:upper-case(fn:data($x/displayName)) eq "WASHINGTON"))
+ and xs:dateTime(fn:data($r/date)) eq xs:dateTime("1976-07-04T00:00:00.000")
+return $r
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/basex/q05.xq
----------------------------------------------------------------------
diff --git a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/basex/q05.xq b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/basex/q05.xq
new file mode 100644
index 0000000..68eed3a
--- /dev/null
+++ b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/basex/q05.xq
@@ -0,0 +1,33 @@
+(: Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License. :)
+
+(: XQuery Join Aggregate Query :)
+(: Find the lowest recorded temperature (TMIN) in the state of Oregon for :)
+(: 2001. :)
+fn:min(
+ let $sensor_collection := "../../../../../../../weather_data/dataset-tiny-local/data_links/local_speed_up/d0_p1_i0/sensors/"
+ for $r in collection($sensor_collection)/root/dataCollection/data
+
+ let $station_collection := "../../../../../../../weather_data/dataset-tiny-local/data_links/local_speed_up/d0_p1_i0/stations/"
+ for $s in collection($station_collection)/root/stationCollection/station
+
+ where $s/id eq $r/station
+ and (some $x in $s/locationLabels satisfies ($x/type eq "CNTRY" and $x/id eq "FIPS:US"))
+ and $r/dataType eq "TMIN"
+ and fn:year-from-dateTime(xs:dateTime(fn:data($r/date))) eq 2001
+ return $r/value
+) div 10
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/basex/q06.xq
----------------------------------------------------------------------
diff --git a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/basex/q06.xq b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/basex/q06.xq
new file mode 100644
index 0000000..1e3061c
--- /dev/null
+++ b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/basex/q06.xq
@@ -0,0 +1,30 @@
+(: Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License. :)
+
+(: XQuery Join Query :)
+(: Find the highest recorded temperature (TMAX) for each station for each :)
+(: day over the year 2000. :)
+let $sensor_collection := "../../../../../../../weather_data/dataset-tiny-local/data_links/local_speed_up/d0_p1_i0/sensors/"
+for $r in collection($sensor_collection)/root/dataCollection/data
+
+let $station_collection := "../../../../../../../weather_data/dataset-tiny-local/data_links/local_speed_up/d0_p1_i0/stations/"
+for $s in collection($station_collection)/root/stationCollection/station
+
+where $s/id eq $r/station
+ and $r/dataType eq "TMAX"
+ and fn:year-from-dateTime(xs:dateTime(fn:data($r/date))) eq 2000
+return ($s/displayName, $r/date, $r/value)
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/basex/q07.xq
----------------------------------------------------------------------
diff --git a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/basex/q07.xq b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/basex/q07.xq
new file mode 100644
index 0000000..23d4358
--- /dev/null
+++ b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/basex/q07.xq
@@ -0,0 +1,32 @@
+(: Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License. :)
+
+(: XQuery Join Aggregate Query :)
+(: Self join with all sensor readings after the year 2000. :)
+fn:avg(
+let $sensor_collection_min := "../../../../../../../weather_data/dataset-tiny-local/data_links/local_speed_up/d0_p1_i0/sensors/"
+for $r_min in collection($sensor_collection_min)/root/dataCollection/data
+
+let $sensor_collection_max := "../../../../../../../weather_data/dataset-tiny-local/data_links/local_speed_up/d0_p1_i0/sensors/"
+for $r_max in collection($sensor_collection_max)/root/dataCollection/data
+
+where $r_min/station eq $r_max/station
+ and $r_min/date eq $r_max/date
+ and $r_min/dataType eq "TMIN"
+ and $r_max/dataType eq "TMAX"
+return ($r_max/value - $r_min/value)
+) div 10
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/basex_index/q00.xq
----------------------------------------------------------------------
diff --git a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/basex_index/q00.xq b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/basex_index/q00.xq
new file mode 100644
index 0000000..1d52f26
--- /dev/null
+++ b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/basex_index/q00.xq
@@ -0,0 +1,32 @@
+(: Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License. :)
+
+(:
+XQuery Filter Query
+-------------------
+See historical data for Key West International Airport, FL (USW00012836)
+station by selecting the weather readings for December 25 over the last
+10 years.
+:)
+let $collection := "db_sensors"
+for $r in db:open($collection)/root/dataCollection/data
+let $datetime := xs:dateTime(fn:data($r/date))
+where $r/station eq "GHCND:USW00012836"
+ and fn:year-from-dateTime($datetime) ge 2003
+ and fn:month-from-dateTime($datetime) eq 12
+ and fn:day-from-dateTime($datetime) eq 25
+return $r
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/basex_index/q01.xq
----------------------------------------------------------------------
diff --git a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/basex_index/q01.xq b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/basex_index/q01.xq
new file mode 100644
index 0000000..385689b
--- /dev/null
+++ b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/basex_index/q01.xq
@@ -0,0 +1,25 @@
+(: Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License. :)
+
+(: XQuery Filter Query :)
+(: Find all reading for hurricane force wind warning or extreme wind warning. :)
+(: The warnings occur when the wind speed (AWND) exceeds 110 mph (49.1744 :)
+(: meters per second). (Wind value is in tenth of a meter per second) :)
+let $collection := "db_sensors"
+for $r in fn:db:open($collection)/root/dataCollection/data
+where $r/dataType eq "AWND" and xs:decimal($r/value) gt 491.744
+return $r
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/basex_index/q02.xq
----------------------------------------------------------------------
diff --git a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/basex_index/q02.xq b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/basex_index/q02.xq
new file mode 100644
index 0000000..6a22a3a
--- /dev/null
+++ b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/basex_index/q02.xq
@@ -0,0 +1,31 @@
+(: Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License. :)
+
+(:
+XQuery Aggregate Query
+----------------------
+Find the annual precipitation (PRCP) for a Syracuse, NY using the airport
+weather station (USW00014771) report for 1999.
+:)
+fn:sum(
+ let $collection := "db_sensors"
+ for $r in db:open($collection)/root/dataCollection/data
+ where $r/station eq "GHCND:USW00014771"
+ and $r/dataType eq "PRCP"
+ and fn:year-from-dateTime(xs:dateTime(fn:data($r/date))) eq 1999
+ return $r/value
+) div 10
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/basex_index/q03.xq
----------------------------------------------------------------------
diff --git a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/basex_index/q03.xq b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/basex_index/q03.xq
new file mode 100644
index 0000000..f37bf6e
--- /dev/null
+++ b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/basex_index/q03.xq
@@ -0,0 +1,25 @@
+(: Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License. :)
+
+(: XQuery Aggregate Query :)
+(: Find the highest recorded temperature (TMAX) in Celsius. :)
+fn:max(
+ let $collection := "db_sensors"
+ for $r in db:open($collection)/root/dataCollection/data
+ where $r/dataType eq "TMAX"
+ return $r/value
+) div 10
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/basex_index/q04.xq
----------------------------------------------------------------------
diff --git a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/basex_index/q04.xq b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/basex_index/q04.xq
new file mode 100644
index 0000000..6d4fa48
--- /dev/null
+++ b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/basex_index/q04.xq
@@ -0,0 +1,30 @@
+(: Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License. :)
+
+(: XQuery Join Query :)
+(: Find all the weather readings for King county for a specific day :)
+(: 1976/7/4. :)
+let $sensor_collection := "db_sensors"
+for $r in db:open($sensor_collection)/root/dataCollection/data
+
+let $station_collection := "db_stations"
+for $s in db:open($station_collection)/root/stationCollection/station
+
+where $s/id eq $r/station
+ and (some $x in $s/locationLabels satisfies ($x/type eq "ST" and fn:upper-case(fn:data($x/displayName)) eq "WASHINGTON"))
+ and xs:dateTime(fn:data($r/date)) eq xs:dateTime("1976-07-04T00:00:00.000")
+return $r
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/basex_index/q05.xq
----------------------------------------------------------------------
diff --git a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/basex_index/q05.xq b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/basex_index/q05.xq
new file mode 100644
index 0000000..737d6b4
--- /dev/null
+++ b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/basex_index/q05.xq
@@ -0,0 +1,33 @@
+(: Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License. :)
+
+(: XQuery Join Aggregate Query :)
+(: Find the lowest recorded temperature (TMIN) in the state of Oregon for :)
+(: 2001. :)
+fn:min(
+ let $sensor_collection := "db_sensors"
+ for $r in db:open($sensor_collection)/root/dataCollection/data
+
+ let $station_collection := "db_stations"
+ for $s in db:open($station_collection)/root/stationCollection/station
+
+ where $s/id eq $r/station
+ and (some $x in $s/locationLabels satisfies ($x/type eq "CNTRY" and $x/id eq "FIPS:US"))
+ and $r/dataType eq "TMIN"
+ and fn:year-from-dateTime(xs:dateTime(fn:data($r/date))) eq 2001
+ return $r/value
+) div 10
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/basex_index/q06.xq
----------------------------------------------------------------------
diff --git a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/basex_index/q06.xq b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/basex_index/q06.xq
new file mode 100644
index 0000000..3971d4e
--- /dev/null
+++ b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/basex_index/q06.xq
@@ -0,0 +1,30 @@
+(: Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License. :)
+
+(: XQuery Join Query :)
+(: Find the highest recorded temperature (TMAX) for each station for each :)
+(: day over the year 2000. :)
+let $sensor_collection := "db_sensors"
+for $r in db:open($sensor_collection)/root/dataCollection/data
+
+let $station_collection := "db_stations"
+for $s in db:open($station_collection)/root/stationCollection/station
+
+where $s/id eq $r/station
+ and $r/dataType eq "TMAX"
+ and fn:year-from-dateTime(xs:dateTime(fn:data($r/date))) eq 2000
+return ($s/displayName, $r/date, $r/value)
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/basex_index/q07.xq
----------------------------------------------------------------------
diff --git a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/basex_index/q07.xq b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/basex_index/q07.xq
new file mode 100644
index 0000000..4f6f53a
--- /dev/null
+++ b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/basex_index/q07.xq
@@ -0,0 +1,32 @@
+(: Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License. :)
+
+(: XQuery Join Aggregate Query :)
+(: Self join with all sensor readings after the year 2000. :)
+fn:avg(
+let $sensor_collection_min := "db_sensors"
+for $r_min in db:open($sensor_collection_min)/root/dataCollection/data
+
+let $sensor_collection_max := "db_sensors"
+for $r_max in db:open($sensor_collection_max)/root/dataCollection/data
+
+where $r_min/station eq $r_max/station
+ and $r_min/date eq $r_max/date
+ and $r_min/dataType eq "TMIN"
+ and $r_max/dataType eq "TMAX"
+return ($r_max/value - $r_min/value)
+) div 10
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/basex_index/sensors_database_add.bxs
----------------------------------------------------------------------
diff --git a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/basex_index/sensors_database_add.bxs b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/basex_index/sensors_database_add.bxs
new file mode 100644
index 0000000..b56f86a
--- /dev/null
+++ b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/basex_index/sensors_database_add.bxs
@@ -0,0 +1,2 @@
+CREATE DB db_sensors
+ADD /tmp/1.0_partition_ghcnd_all_xml/
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/basex_index/sensors_database_remove.bxs
----------------------------------------------------------------------
diff --git a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/basex_index/sensors_database_remove.bxs b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/basex_index/sensors_database_remove.bxs
new file mode 100644
index 0000000..f923fd4
--- /dev/null
+++ b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/basex_index/sensors_database_remove.bxs
@@ -0,0 +1 @@
+DROP DB db_sensors
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/basex_index/stations_database_add.bxs
----------------------------------------------------------------------
diff --git a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/basex_index/stations_database_add.bxs b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/basex_index/stations_database_add.bxs
new file mode 100644
index 0000000..cb1ea21
--- /dev/null
+++ b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/basex_index/stations_database_add.bxs
@@ -0,0 +1,2 @@
+CREATE DB db_stations
+ADD ../weather_data/dataset-tiny-local/data_links/local_speed_up/d0_p1_i0/stations/
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/basex_index/stations_database_remove.bxs
----------------------------------------------------------------------
diff --git a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/basex_index/stations_database_remove.bxs b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/basex_index/stations_database_remove.bxs
new file mode 100644
index 0000000..33b9722
--- /dev/null
+++ b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/basex_index/stations_database_remove.bxs
@@ -0,0 +1 @@
+DROP DB db_stations
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/basex_scripts/.basex
----------------------------------------------------------------------
diff --git a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/basex_scripts/.basex b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/basex_scripts/.basex
new file mode 100644
index 0000000..e69de29
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/basex_scripts/README
----------------------------------------------------------------------
diff --git a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/basex_scripts/README b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/basex_scripts/README
new file mode 100644
index 0000000..1b910db
--- /dev/null
+++ b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/basex_scripts/README
@@ -0,0 +1,9 @@
+BaseX local configuration options for the weather benchmark.
+The options attempt to match the processing and output of VXQuery.
+
+
+# Local Options
+CHOP = false
+DBPATH = /path/to/basex/BaseXData
+REPOPATH = /path/to/basex/BaseXRepo
+WEBPATH = /path/to/basex/BaseXWeb
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/basex_scripts/run_basex_index_tests.sh
----------------------------------------------------------------------
diff --git a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/basex_scripts/run_basex_index_tests.sh b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/basex_scripts/run_basex_index_tests.sh
new file mode 100755
index 0000000..63f0533
--- /dev/null
+++ b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/basex_scripts/run_basex_index_tests.sh
@@ -0,0 +1,63 @@
+#!/bin/bash
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+NODES=${2}
+REPEAT=${3}
+DATASET=${4}
+EMAIL=${5}
+
+
+mkdir -p ~/logs/basex_index/
+
+# Add BaseX databases
+for j in $(find ${1} -name '*add.bxs')
+do
+ date
+ echo "Setup BaseX database: ${j}"
+ time JAVA_OPTS="-Xmx8g" java -cp BaseX823.jar org.basex.BaseX -V -x -w -r${REPEAT} ${j} >> ~/logs/basex_index/$(basename "${j}").log 2>&1
+done
+
+
+for j in $(find ${1} -name '*q??.xq')
+do
+ date
+ echo "Running BaseX query: ${j}"
+ time JAVA_OPTS="-Xmx8g" java -cp BaseX823.jar org.basex.BaseX -V -x -w -r${REPEAT} ${j} >> ~/logs/basex_index/$(basename "${j}").log 2>&1
+done
+
+
+# Remove BaseX databases
+for j in $(find ${1} -name '*remove.bxs')
+do
+ date
+ echo "Setup BaseX database: ${j}"
+ time JAVA_OPTS="-Xmx8g" java -cp BaseX823.jar org.basex.BaseX -V -x -w -r${REPEAT} ${j} >> ~/logs/basex_index/$(basename "${j}").log 2>&1
+done
+
+
+if which programname >/dev/null;
+then
+ echo "Sending out e-mail notification."
+ SUBJECT="BaseX Tests Finished (${DATASET})"
+ /bin/mail -s "${SUBJECT}" "${EMAIL}" <<EOM
+ Completed all BaseX tests on ${DATASET}.
+ EOM
+else
+ echo "No mail command to use."
+fi;
[10/50] [abbrv] vxquery git commit: Renamed variable.
Posted by sj...@apache.org.
Renamed variable.
Project: http://git-wip-us.apache.org/repos/asf/vxquery/repo
Commit: http://git-wip-us.apache.org/repos/asf/vxquery/commit/ef31a814
Tree: http://git-wip-us.apache.org/repos/asf/vxquery/tree/ef31a814
Diff: http://git-wip-us.apache.org/repos/asf/vxquery/diff/ef31a814
Branch: refs/heads/site
Commit: ef31a814c9f607e0058354f1f91d962e11f97952
Parents: a849cdc
Author: Preston Carman <pr...@apache.org>
Authored: Fri Sep 11 11:57:00 2015 -0700
Committer: Preston Carman <pr...@apache.org>
Committed: Fri Sep 11 11:57:00 2015 -0700
----------------------------------------------------------------------
vxquery-cli/src/main/java/org/apache/vxquery/cli/VXQuery.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/vxquery/blob/ef31a814/vxquery-cli/src/main/java/org/apache/vxquery/cli/VXQuery.java
----------------------------------------------------------------------
diff --git a/vxquery-cli/src/main/java/org/apache/vxquery/cli/VXQuery.java b/vxquery-cli/src/main/java/org/apache/vxquery/cli/VXQuery.java
index 2a48f84..0e88539 100644
--- a/vxquery-cli/src/main/java/org/apache/vxquery/cli/VXQuery.java
+++ b/vxquery-cli/src/main/java/org/apache/vxquery/cli/VXQuery.java
@@ -202,12 +202,12 @@ public class VXQuery {
DynamicContext dCtx = new DynamicContextImpl(module.getModuleContext());
js.setGlobalJobDataFactory(new VXQueryGlobalDataFactory(dCtx.createFactory()));
- OutputStream resultWriter = System.out;
+ OutputStream resultStream = System.out;
if (opts.resultFile != null) {
- resultWriter = new FileOutputStream(new File(opts.resultFile));
+ resultStream = new FileOutputStream(new File(opts.resultFile));
}
- PrintWriter writer = new PrintWriter(resultWriter, true);
+ PrintWriter writer = new PrintWriter(resultStream, true);
// Repeat execution for number of times provided in -repeatexec argument
for (int i = 0; i < opts.repeatExec; ++i) {
start = opts.timing ? new Date() : null;
[38/50] [abbrv] vxquery git commit: Unit tests for the sequence data
model: pointable and builder classes.
Posted by sj...@apache.org.
Unit tests for the sequence data model: pointable and builder classes.
* Includes changes for IBuilder interface to improve the code reuse and standardization.
Project: http://git-wip-us.apache.org/repos/asf/vxquery/repo
Commit: http://git-wip-us.apache.org/repos/asf/vxquery/commit/7d7ab007
Tree: http://git-wip-us.apache.org/repos/asf/vxquery/tree/7d7ab007
Diff: http://git-wip-us.apache.org/repos/asf/vxquery/diff/7d7ab007
Branch: refs/heads/site
Commit: 7d7ab007efc874f2612f976c88fb09387efb0155
Parents: 0891910
Author: Preston Carman <pr...@apache.org>
Authored: Mon May 16 17:32:50 2016 -0700
Committer: Preston Carman <pr...@apache.org>
Committed: Mon May 16 17:32:50 2016 -0700
----------------------------------------------------------------------
.../builders/atomic/UTF8StringBuilder.java | 9 +-
.../builders/base/AbstractBuilder.java | 14 +-
.../datamodel/builders/base/IBuilder.java | 27 ++++
.../builders/nodes/AbstractNodeBuilder.java | 8 +-
.../builders/nodes/AttributeNodeBuilder.java | 12 +-
.../builders/nodes/CommentNodeBuilder.java | 11 +-
.../builders/nodes/DocumentNodeBuilder.java | 12 +-
.../builders/nodes/ElementNodeBuilder.java | 17 ++-
.../builders/nodes/NodeSubTreeBuilder.java | 17 +--
.../datamodel/builders/nodes/PINodeBuilder.java | 11 +-
.../builders/nodes/TextNodeBuilder.java | 11 +-
.../builders/sequence/SequenceBuilder.java | 11 +-
.../comparison/ValueEqComparisonOperation.java | 128 ++++++++--------
.../runtime/functions/util/FunctionHelper.java | 20 ++-
.../datamodel/AbstractPointableTest.java | 56 +++++++
.../vxquery/datamodel/SequenceByteTest.java | 147 +++++++++++++++++++
16 files changed, 358 insertions(+), 153 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/vxquery/blob/7d7ab007/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/atomic/UTF8StringBuilder.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/atomic/UTF8StringBuilder.java b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/atomic/UTF8StringBuilder.java
index 51c026b..a4d301d 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/atomic/UTF8StringBuilder.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/atomic/UTF8StringBuilder.java
@@ -20,17 +20,15 @@ import java.io.DataOutput;
import java.io.IOException;
import java.io.UTFDataFormatException;
-import org.apache.vxquery.datamodel.builders.base.AbstractBuilder;
-import org.apache.vxquery.runtime.functions.util.FunctionHelper;
-
import org.apache.hyracks.data.std.api.IMutableValueStorage;
import org.apache.hyracks.data.std.primitive.BytePointable;
+import org.apache.vxquery.datamodel.builders.base.IBuilder;
+import org.apache.vxquery.runtime.functions.util.FunctionHelper;
-public class UTF8StringBuilder extends AbstractBuilder {
+public class UTF8StringBuilder implements IBuilder {
private IMutableValueStorage mvs;
private DataOutput out;
- @Override
public void reset(IMutableValueStorage mvs) throws IOException {
this.mvs = mvs;
out = mvs.getDataOutput();
@@ -38,7 +36,6 @@ public class UTF8StringBuilder extends AbstractBuilder {
out.write(0);
}
- @Override
public void finish() throws IOException {
int utflen = mvs.getLength() - 2;
BytePointable.setByte(mvs.getByteArray(), 0, (byte) ((utflen >>> 8) & 0xFF));
http://git-wip-us.apache.org/repos/asf/vxquery/blob/7d7ab007/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/base/AbstractBuilder.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/base/AbstractBuilder.java b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/base/AbstractBuilder.java
index bacad26..c360eed 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/base/AbstractBuilder.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/base/AbstractBuilder.java
@@ -16,12 +16,20 @@
*/
package org.apache.vxquery.datamodel.builders.base;
+import java.io.DataOutput;
import java.io.IOException;
import org.apache.hyracks.data.std.api.IMutableValueStorage;
-public abstract class AbstractBuilder {
- public abstract void reset(IMutableValueStorage mvs) throws IOException;
+public abstract class AbstractBuilder implements IBuilder {
+
+ protected DataOutput out;
+
+ public void reset(IMutableValueStorage mvs) throws IOException {
+ out = mvs.getDataOutput();
+ out.write(getValueTag());
+ }
+
+ public abstract int getValueTag();
- public abstract void finish() throws IOException;
}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/7d7ab007/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/base/IBuilder.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/base/IBuilder.java b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/base/IBuilder.java
new file mode 100644
index 0000000..49df178
--- /dev/null
+++ b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/base/IBuilder.java
@@ -0,0 +1,27 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.vxquery.datamodel.builders.base;
+
+import java.io.IOException;
+
+import org.apache.hyracks.data.std.api.IMutableValueStorage;
+
+public interface IBuilder {
+ public abstract void reset(IMutableValueStorage mvs) throws IOException;
+
+ public abstract void finish() throws IOException;
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/7d7ab007/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/nodes/AbstractNodeBuilder.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/nodes/AbstractNodeBuilder.java b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/nodes/AbstractNodeBuilder.java
index 955668f..eefa834 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/nodes/AbstractNodeBuilder.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/nodes/AbstractNodeBuilder.java
@@ -16,12 +16,8 @@
*/
package org.apache.vxquery.datamodel.builders.nodes;
-import java.io.IOException;
+import org.apache.vxquery.datamodel.builders.base.AbstractBuilder;
-import org.apache.hyracks.data.std.api.IMutableValueStorage;
+public abstract class AbstractNodeBuilder extends AbstractBuilder {
-public abstract class AbstractNodeBuilder {
- public abstract void reset(IMutableValueStorage mvs) throws IOException;
-
- public abstract void finish() throws IOException;
}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/7d7ab007/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/nodes/AttributeNodeBuilder.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/nodes/AttributeNodeBuilder.java b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/nodes/AttributeNodeBuilder.java
index 7743cd8..6d7e0f5 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/nodes/AttributeNodeBuilder.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/nodes/AttributeNodeBuilder.java
@@ -16,21 +16,16 @@
*/
package org.apache.vxquery.datamodel.builders.nodes;
-import java.io.DataOutput;
import java.io.IOException;
-import org.apache.vxquery.datamodel.values.ValueTag;
-
-import org.apache.hyracks.data.std.api.IMutableValueStorage;
import org.apache.hyracks.data.std.api.IValueReference;
+import org.apache.vxquery.datamodel.values.ValueTag;
public class AttributeNodeBuilder extends AbstractNodeBuilder {
- private DataOutput out;
@Override
- public void reset(IMutableValueStorage mvs) throws IOException {
- out = mvs.getDataOutput();
- out.write(ValueTag.ATTRIBUTE_NODE_TAG);
+ public int getValueTag() {
+ return ValueTag.ATTRIBUTE_NODE_TAG;
}
@Override
@@ -56,4 +51,5 @@ public class AttributeNodeBuilder extends AbstractNodeBuilder {
public void setValue(IValueReference value) throws IOException {
out.write(value.getByteArray(), value.getStartOffset(), value.getLength());
}
+
}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/7d7ab007/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/nodes/CommentNodeBuilder.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/nodes/CommentNodeBuilder.java b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/nodes/CommentNodeBuilder.java
index d79bb88..d596c3d 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/nodes/CommentNodeBuilder.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/nodes/CommentNodeBuilder.java
@@ -16,21 +16,16 @@
*/
package org.apache.vxquery.datamodel.builders.nodes;
-import java.io.DataOutput;
import java.io.IOException;
-import org.apache.vxquery.datamodel.values.ValueTag;
-
-import org.apache.hyracks.data.std.api.IMutableValueStorage;
import org.apache.hyracks.data.std.api.IValueReference;
+import org.apache.vxquery.datamodel.values.ValueTag;
public class CommentNodeBuilder extends AbstractNodeBuilder {
- private DataOutput out;
@Override
- public void reset(IMutableValueStorage mvs) throws IOException {
- out = mvs.getDataOutput();
- out.write(ValueTag.COMMENT_NODE_TAG);
+ public int getValueTag() {
+ return ValueTag.COMMENT_NODE_TAG;
}
@Override
http://git-wip-us.apache.org/repos/asf/vxquery/blob/7d7ab007/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/nodes/DocumentNodeBuilder.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/nodes/DocumentNodeBuilder.java b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/nodes/DocumentNodeBuilder.java
index 47c811c..be2cb93 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/nodes/DocumentNodeBuilder.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/nodes/DocumentNodeBuilder.java
@@ -16,22 +16,17 @@
*/
package org.apache.vxquery.datamodel.builders.nodes;
-import java.io.DataOutput;
import java.io.IOException;
+import org.apache.hyracks.data.std.util.ArrayBackedValueStorage;
import org.apache.vxquery.datamodel.values.ValueTag;
import org.apache.vxquery.util.GrowableIntArray;
-import org.apache.hyracks.data.std.api.IMutableValueStorage;
-import org.apache.hyracks.data.std.util.ArrayBackedValueStorage;
-
public class DocumentNodeBuilder extends AbstractNodeBuilder {
private final GrowableIntArray childrenSlots;
private final ArrayBackedValueStorage childrenDataArea;
- private DataOutput out;
-
private int childrenCount;
public DocumentNodeBuilder() {
@@ -40,9 +35,8 @@ public class DocumentNodeBuilder extends AbstractNodeBuilder {
}
@Override
- public void reset(IMutableValueStorage mvs) throws IOException {
- out = mvs.getDataOutput();
- out.write(ValueTag.DOCUMENT_NODE_TAG);
+ public int getValueTag() {
+ return ValueTag.DOCUMENT_NODE_TAG;
}
@Override
http://git-wip-us.apache.org/repos/asf/vxquery/blob/7d7ab007/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/nodes/ElementNodeBuilder.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/nodes/ElementNodeBuilder.java b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/nodes/ElementNodeBuilder.java
index 89aaddc..dcb4b79 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/nodes/ElementNodeBuilder.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/nodes/ElementNodeBuilder.java
@@ -16,18 +16,16 @@
*/
package org.apache.vxquery.datamodel.builders.nodes;
-import java.io.DataOutput;
import java.io.IOException;
-import org.apache.vxquery.datamodel.accessors.nodes.ElementNodePointable;
-import org.apache.vxquery.datamodel.values.ValueTag;
-import org.apache.vxquery.util.GrowableIntArray;
-
import org.apache.hyracks.data.std.api.IMutableValueStorage;
import org.apache.hyracks.data.std.api.IValueReference;
import org.apache.hyracks.data.std.primitive.BytePointable;
import org.apache.hyracks.data.std.primitive.IntegerPointable;
import org.apache.hyracks.data.std.util.ArrayBackedValueStorage;
+import org.apache.vxquery.datamodel.accessors.nodes.ElementNodePointable;
+import org.apache.vxquery.datamodel.values.ValueTag;
+import org.apache.vxquery.util.GrowableIntArray;
public class ElementNodeBuilder extends AbstractNodeBuilder {
private final GrowableIntArray attrSlots;
@@ -40,8 +38,6 @@ public class ElementNodeBuilder extends AbstractNodeBuilder {
private IMutableValueStorage mvs;
- private DataOutput out;
-
private int headerOffset;
private int nsChunkStart;
@@ -60,10 +56,15 @@ public class ElementNodeBuilder extends AbstractNodeBuilder {
}
@Override
+ public int getValueTag() {
+ return ValueTag.ELEMENT_NODE_TAG;
+ }
+
+ @Override
public void reset(IMutableValueStorage mvs) throws IOException {
this.mvs = mvs;
out = mvs.getDataOutput();
- out.write(ValueTag.ELEMENT_NODE_TAG);
+ out.write(getValueTag());
headerOffset = mvs.getLength();
out.write(0);
}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/7d7ab007/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/nodes/NodeSubTreeBuilder.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/nodes/NodeSubTreeBuilder.java b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/nodes/NodeSubTreeBuilder.java
index 5eb08df..a746492 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/nodes/NodeSubTreeBuilder.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/nodes/NodeSubTreeBuilder.java
@@ -16,22 +16,17 @@
*/
package org.apache.vxquery.datamodel.builders.nodes;
-import java.io.DataOutput;
import java.io.IOException;
import org.apache.vxquery.datamodel.accessors.TaggedValuePointable;
import org.apache.vxquery.datamodel.accessors.nodes.NodeTreePointable;
import org.apache.vxquery.datamodel.values.ValueTag;
-import org.apache.hyracks.data.std.api.IMutableValueStorage;
-
public class NodeSubTreeBuilder extends AbstractNodeBuilder {
- private DataOutput mainOut;
@Override
- public void reset(IMutableValueStorage mvs) throws IOException {
- mainOut = mvs.getDataOutput();
- mainOut.write(ValueTag.NODE_TREE_TAG);
+ public int getValueTag() {
+ return ValueTag.NODE_TREE_TAG;
}
@Override
@@ -46,14 +41,14 @@ public class NodeSubTreeBuilder extends AbstractNodeBuilder {
if (hasNodeIds) {
header |= NodeTreePointable.HEADER_NODEID_EXISTS_MASK;
}
- mainOut.write(header);
+ out.write(header);
if (hasNodeIds) {
- mainOut.writeInt(ntp.getRootNodeId());
+ out.writeInt(ntp.getRootNodeId());
}
if (hasDictionary) {
- mainOut.write(ntp.getByteArray(), ntp.getDictionaryOffset(), ntp.getDictionarySize());
+ out.write(ntp.getByteArray(), ntp.getDictionaryOffset(), ntp.getDictionarySize());
}
- mainOut.write(itemTvp.getByteArray(), itemTvp.getStartOffset(), itemTvp.getLength());
+ out.write(itemTvp.getByteArray(), itemTvp.getStartOffset(), itemTvp.getLength());
}
private boolean hasDictionary(byte tag) {
http://git-wip-us.apache.org/repos/asf/vxquery/blob/7d7ab007/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/nodes/PINodeBuilder.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/nodes/PINodeBuilder.java b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/nodes/PINodeBuilder.java
index ee37511..0e62762 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/nodes/PINodeBuilder.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/nodes/PINodeBuilder.java
@@ -16,21 +16,16 @@
*/
package org.apache.vxquery.datamodel.builders.nodes;
-import java.io.DataOutput;
import java.io.IOException;
-import org.apache.vxquery.datamodel.values.ValueTag;
-
-import org.apache.hyracks.data.std.api.IMutableValueStorage;
import org.apache.hyracks.data.std.api.IValueReference;
+import org.apache.vxquery.datamodel.values.ValueTag;
public class PINodeBuilder extends AbstractNodeBuilder {
- private DataOutput out;
@Override
- public void reset(IMutableValueStorage mvs) throws IOException {
- out = mvs.getDataOutput();
- out.write(ValueTag.PI_NODE_TAG);
+ public int getValueTag() {
+ return ValueTag.PI_NODE_TAG;
}
@Override
http://git-wip-us.apache.org/repos/asf/vxquery/blob/7d7ab007/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/nodes/TextNodeBuilder.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/nodes/TextNodeBuilder.java b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/nodes/TextNodeBuilder.java
index 84ee20e..67aa487 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/nodes/TextNodeBuilder.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/nodes/TextNodeBuilder.java
@@ -16,21 +16,16 @@
*/
package org.apache.vxquery.datamodel.builders.nodes;
-import java.io.DataOutput;
import java.io.IOException;
-import org.apache.vxquery.datamodel.values.ValueTag;
-
-import org.apache.hyracks.data.std.api.IMutableValueStorage;
import org.apache.hyracks.data.std.api.IValueReference;
+import org.apache.vxquery.datamodel.values.ValueTag;
public class TextNodeBuilder extends AbstractNodeBuilder {
- private DataOutput out;
@Override
- public void reset(IMutableValueStorage mvs) throws IOException {
- out = mvs.getDataOutput();
- out.write(ValueTag.TEXT_NODE_TAG);
+ public int getValueTag() {
+ return ValueTag.TEXT_NODE_TAG;
}
@Override
http://git-wip-us.apache.org/repos/asf/vxquery/blob/7d7ab007/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/sequence/SequenceBuilder.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/sequence/SequenceBuilder.java b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/sequence/SequenceBuilder.java
index 12f4ad7..fbea148 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/sequence/SequenceBuilder.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/sequence/SequenceBuilder.java
@@ -19,21 +19,18 @@ package org.apache.vxquery.datamodel.builders.sequence;
import java.io.DataOutput;
import java.io.IOException;
-import org.apache.vxquery.datamodel.values.ValueTag;
-import org.apache.vxquery.util.GrowableIntArray;
-
import org.apache.hyracks.data.std.api.IMutableValueStorage;
import org.apache.hyracks.data.std.api.IValueReference;
import org.apache.hyracks.data.std.util.ArrayBackedValueStorage;
+import org.apache.vxquery.datamodel.builders.base.IBuilder;
+import org.apache.vxquery.datamodel.values.ValueTag;
+import org.apache.vxquery.util.GrowableIntArray;
-public class SequenceBuilder {
+public class SequenceBuilder implements IBuilder {
private final GrowableIntArray slots = new GrowableIntArray();
private final ArrayBackedValueStorage dataArea = new ArrayBackedValueStorage();
private IMutableValueStorage mvs;
- public SequenceBuilder() {
- }
-
public void reset(IMutableValueStorage mvs) {
this.mvs = mvs;
slots.clear();
http://git-wip-us.apache.org/repos/asf/vxquery/blob/7d7ab007/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/comparison/ValueEqComparisonOperation.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/comparison/ValueEqComparisonOperation.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/comparison/ValueEqComparisonOperation.java
index f4eb340..fd7bc31 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/comparison/ValueEqComparisonOperation.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/comparison/ValueEqComparisonOperation.java
@@ -29,7 +29,7 @@ import org.apache.vxquery.datamodel.accessors.atomic.XSQNamePointable;
import org.apache.vxquery.datamodel.accessors.atomic.XSTimePointable;
import org.apache.vxquery.datamodel.util.DateTime;
import org.apache.vxquery.exceptions.SystemException;
-
+import org.apache.vxquery.runtime.functions.util.FunctionHelper;
import org.apache.hyracks.data.std.primitive.BooleanPointable;
import org.apache.hyracks.data.std.primitive.DoublePointable;
import org.apache.hyracks.data.std.primitive.FloatPointable;
@@ -52,13 +52,12 @@ public class ValueEqComparisonOperation extends AbstractValueComparisonOperation
@Override
public boolean operateBase64BinaryBase64Binary(XSBinaryPointable binaryp1, XSBinaryPointable binaryp2)
throws SystemException, IOException {
- return arraysEqual(binaryp1.getByteArray(), binaryp1.getStartOffset(), binaryp1.getLength(),
- binaryp2.getByteArray(), binaryp2.getStartOffset(), binaryp2.getLength());
+ return FunctionHelper.arraysEqual(binaryp1, binaryp2);
}
@Override
- public boolean operateBooleanBoolean(BooleanPointable boolp1, BooleanPointable boolp2) throws SystemException,
- IOException {
+ public boolean operateBooleanBoolean(BooleanPointable boolp1, BooleanPointable boolp2)
+ throws SystemException, IOException {
return (boolp1.compareTo(boolp2) == 0);
}
@@ -73,8 +72,8 @@ public class ValueEqComparisonOperation extends AbstractValueComparisonOperation
int startOffset2 = startOffset1 + 1 + XSDateTimePointable.TYPE_TRAITS.getFixedLength();
if (XSDateTimePointable.getYearMonth(abvsInner.getByteArray(), startOffset1) == XSDateTimePointable
.getYearMonth(abvsInner.getByteArray(), startOffset2)
- && XSDateTimePointable.getDay(abvsInner.getByteArray(), startOffset1) == XSDateTimePointable.getDay(
- abvsInner.getByteArray(), startOffset2)) {
+ && XSDateTimePointable.getDay(abvsInner.getByteArray(), startOffset1) == XSDateTimePointable
+ .getDay(abvsInner.getByteArray(), startOffset2)) {
return true;
}
return false;
@@ -99,14 +98,14 @@ public class ValueEqComparisonOperation extends AbstractValueComparisonOperation
}
@Override
- public boolean operateDecimalDecimal(XSDecimalPointable decp1, XSDecimalPointable decp2) throws SystemException,
- IOException {
+ public boolean operateDecimalDecimal(XSDecimalPointable decp1, XSDecimalPointable decp2)
+ throws SystemException, IOException {
return (decp1.compareTo(decp2) == 0);
}
@Override
- public boolean operateDecimalDouble(XSDecimalPointable decp1, DoublePointable doublep2) throws SystemException,
- IOException {
+ public boolean operateDecimalDouble(XSDecimalPointable decp1, DoublePointable doublep2)
+ throws SystemException, IOException {
double double1 = decp1.doubleValue();
double double2 = doublep2.doubleValue();
if (Double.isNaN(doublep2.getDouble())) {
@@ -116,8 +115,8 @@ public class ValueEqComparisonOperation extends AbstractValueComparisonOperation
}
@Override
- public boolean operateDecimalFloat(XSDecimalPointable decp1, FloatPointable floatp2) throws SystemException,
- IOException {
+ public boolean operateDecimalFloat(XSDecimalPointable decp1, FloatPointable floatp2)
+ throws SystemException, IOException {
float float1 = decp1.floatValue();
float float2 = floatp2.floatValue();
if (Float.isNaN(floatp2.getFloat())) {
@@ -127,18 +126,19 @@ public class ValueEqComparisonOperation extends AbstractValueComparisonOperation
}
@Override
- public boolean operateDecimalInteger(XSDecimalPointable decp1, LongPointable longp2) throws SystemException,
- IOException {
+ public boolean operateDecimalInteger(XSDecimalPointable decp1, LongPointable longp2)
+ throws SystemException, IOException {
abvsInner.reset();
XSDecimalPointable decp2 = (XSDecimalPointable) XSDecimalPointable.FACTORY.createPointable();
- decp2.set(abvsInner.getByteArray(), abvsInner.getStartOffset(), XSDecimalPointable.TYPE_TRAITS.getFixedLength());
+ decp2.set(abvsInner.getByteArray(), abvsInner.getStartOffset(),
+ XSDecimalPointable.TYPE_TRAITS.getFixedLength());
decp2.setDecimal(longp2.getLong(), (byte) 0);
return (decp1.compareTo(decp2) == 0);
}
@Override
- public boolean operateDoubleDecimal(DoublePointable doublep1, XSDecimalPointable decp2) throws SystemException,
- IOException {
+ public boolean operateDoubleDecimal(DoublePointable doublep1, XSDecimalPointable decp2)
+ throws SystemException, IOException {
double double1 = doublep1.doubleValue();
double double2 = decp2.doubleValue();
if (Double.isNaN(doublep1.getDouble())) {
@@ -148,8 +148,8 @@ public class ValueEqComparisonOperation extends AbstractValueComparisonOperation
}
@Override
- public boolean operateDoubleDouble(DoublePointable doublep1, DoublePointable doublep2) throws SystemException,
- IOException {
+ public boolean operateDoubleDouble(DoublePointable doublep1, DoublePointable doublep2)
+ throws SystemException, IOException {
if (Double.isNaN(doublep1.getDouble()) || Double.isNaN(doublep2.getDouble())) {
return false;
}
@@ -157,8 +157,8 @@ public class ValueEqComparisonOperation extends AbstractValueComparisonOperation
}
@Override
- public boolean operateDoubleFloat(DoublePointable doublep1, FloatPointable floatp2) throws SystemException,
- IOException {
+ public boolean operateDoubleFloat(DoublePointable doublep1, FloatPointable floatp2)
+ throws SystemException, IOException {
double double1 = doublep1.doubleValue();
double double2 = floatp2.doubleValue();
if (Double.isNaN(doublep1.getDouble()) || Float.isNaN(floatp2.getFloat())) {
@@ -168,8 +168,8 @@ public class ValueEqComparisonOperation extends AbstractValueComparisonOperation
}
@Override
- public boolean operateDoubleInteger(DoublePointable doublep1, LongPointable longp2) throws SystemException,
- IOException {
+ public boolean operateDoubleInteger(DoublePointable doublep1, LongPointable longp2)
+ throws SystemException, IOException {
double double1 = doublep1.doubleValue();
double double2 = longp2.doubleValue();
if (Double.isNaN(doublep1.getDouble())) {
@@ -179,8 +179,8 @@ public class ValueEqComparisonOperation extends AbstractValueComparisonOperation
}
@Override
- public boolean operateDTDurationDTDuration(LongPointable longp1, LongPointable longp2) throws SystemException,
- IOException {
+ public boolean operateDTDurationDTDuration(LongPointable longp1, LongPointable longp2)
+ throws SystemException, IOException {
return (longp1.compareTo(longp2) == 0);
}
@@ -194,8 +194,8 @@ public class ValueEqComparisonOperation extends AbstractValueComparisonOperation
}
@Override
- public boolean operateDTDurationYMDuration(LongPointable longp1, IntegerPointable intp2) throws SystemException,
- IOException {
+ public boolean operateDTDurationYMDuration(LongPointable longp1, IntegerPointable intp2)
+ throws SystemException, IOException {
if (longp1.getLong() == 0 && intp2.getInteger() == 0) {
return true;
}
@@ -214,8 +214,7 @@ public class ValueEqComparisonOperation extends AbstractValueComparisonOperation
@Override
public boolean operateDurationDuration(XSDurationPointable durationp1, XSDurationPointable durationp2)
throws SystemException, IOException {
- return arraysEqual(durationp1.getByteArray(), durationp1.getStartOffset(), durationp1.getLength(),
- durationp2.getByteArray(), durationp2.getStartOffset(), durationp2.getLength());
+ return FunctionHelper.arraysEqual(durationp1, durationp2);
}
@Override
@@ -228,8 +227,8 @@ public class ValueEqComparisonOperation extends AbstractValueComparisonOperation
}
@Override
- public boolean operateFloatDecimal(FloatPointable floatp1, XSDecimalPointable decp2) throws SystemException,
- IOException {
+ public boolean operateFloatDecimal(FloatPointable floatp1, XSDecimalPointable decp2)
+ throws SystemException, IOException {
float float1 = floatp1.floatValue();
float float2 = decp2.floatValue();
if (Float.isNaN(floatp1.getFloat())) {
@@ -239,8 +238,8 @@ public class ValueEqComparisonOperation extends AbstractValueComparisonOperation
}
@Override
- public boolean operateFloatDouble(FloatPointable floatp1, DoublePointable doublep2) throws SystemException,
- IOException {
+ public boolean operateFloatDouble(FloatPointable floatp1, DoublePointable doublep2)
+ throws SystemException, IOException {
double double1 = floatp1.doubleValue();
double double2 = doublep2.doubleValue();
if (Float.isNaN(floatp1.getFloat()) || Double.isNaN(double2)) {
@@ -250,8 +249,8 @@ public class ValueEqComparisonOperation extends AbstractValueComparisonOperation
}
@Override
- public boolean operateFloatFloat(FloatPointable floatp1, FloatPointable floatp2) throws SystemException,
- IOException {
+ public boolean operateFloatFloat(FloatPointable floatp1, FloatPointable floatp2)
+ throws SystemException, IOException {
if (Float.isNaN(floatp1.getFloat()) || Float.isNaN(floatp2.getFloat())) {
return false;
}
@@ -259,8 +258,8 @@ public class ValueEqComparisonOperation extends AbstractValueComparisonOperation
}
@Override
- public boolean operateFloatInteger(FloatPointable floatp1, LongPointable longp2) throws SystemException,
- IOException {
+ public boolean operateFloatInteger(FloatPointable floatp1, LongPointable longp2)
+ throws SystemException, IOException {
float float1 = floatp1.floatValue();
float float2 = longp2.floatValue();
if (Float.isNaN(floatp1.getFloat())) {
@@ -302,23 +301,23 @@ public class ValueEqComparisonOperation extends AbstractValueComparisonOperation
@Override
public boolean operateHexBinaryHexBinary(XSBinaryPointable binaryp1, XSBinaryPointable binaryp2)
throws SystemException, IOException {
- return arraysEqual(binaryp1.getByteArray(), binaryp1.getStartOffset(), binaryp1.getLength(),
- binaryp2.getByteArray(), binaryp2.getStartOffset(), binaryp2.getLength());
+ return FunctionHelper.arraysEqual(binaryp1, binaryp2);
}
@Override
- public boolean operateIntegerDecimal(LongPointable longp1, XSDecimalPointable decp2) throws SystemException,
- IOException {
+ public boolean operateIntegerDecimal(LongPointable longp1, XSDecimalPointable decp2)
+ throws SystemException, IOException {
abvsInner.reset();
XSDecimalPointable decp1 = (XSDecimalPointable) XSDecimalPointable.FACTORY.createPointable();
- decp1.set(abvsInner.getByteArray(), abvsInner.getStartOffset(), XSDecimalPointable.TYPE_TRAITS.getFixedLength());
+ decp1.set(abvsInner.getByteArray(), abvsInner.getStartOffset(),
+ XSDecimalPointable.TYPE_TRAITS.getFixedLength());
decp1.setDecimal(longp1.getLong(), (byte) 0);
return (decp1.compareTo(decp2) == 0);
}
@Override
- public boolean operateIntegerDouble(LongPointable longp1, DoublePointable doublep2) throws SystemException,
- IOException {
+ public boolean operateIntegerDouble(LongPointable longp1, DoublePointable doublep2)
+ throws SystemException, IOException {
double double1 = longp1.doubleValue();
double double2 = doublep2.doubleValue();
if (Double.isNaN(double2)) {
@@ -328,8 +327,8 @@ public class ValueEqComparisonOperation extends AbstractValueComparisonOperation
}
@Override
- public boolean operateIntegerFloat(LongPointable longp1, FloatPointable floatp2) throws SystemException,
- IOException {
+ public boolean operateIntegerFloat(LongPointable longp1, FloatPointable floatp2)
+ throws SystemException, IOException {
float float1 = longp1.floatValue();
float float2 = floatp2.floatValue();
if (Float.isNaN(float2)) {
@@ -339,8 +338,8 @@ public class ValueEqComparisonOperation extends AbstractValueComparisonOperation
}
@Override
- public boolean operateIntegerInteger(LongPointable longp1, LongPointable longp2) throws SystemException,
- IOException {
+ public boolean operateIntegerInteger(LongPointable longp1, LongPointable longp2)
+ throws SystemException, IOException {
return (longp1.compareTo(longp2) == 0);
}
@@ -351,15 +350,16 @@ public class ValueEqComparisonOperation extends AbstractValueComparisonOperation
}
@Override
- public boolean operateQNameQName(XSQNamePointable qnamep1, XSQNamePointable qnamep2) throws SystemException,
- IOException {
+ public boolean operateQNameQName(XSQNamePointable qnamep1, XSQNamePointable qnamep2)
+ throws SystemException, IOException {
int startOffsetLocalName1 = qnamep1.getStartOffset() + qnamep1.getUriLength() + qnamep1.getPrefixLength();
int startOffsetLocalName2 = qnamep2.getStartOffset() + qnamep2.getUriLength() + qnamep2.getPrefixLength();
// Only compare URI and LocalName.
- return arraysEqual(qnamep1.getByteArray(), qnamep1.getStartOffset(), qnamep1.getUriLength(),
+ return FunctionHelper.arraysEqual(qnamep1.getByteArray(), qnamep1.getStartOffset(), qnamep1.getUriLength(),
qnamep2.getByteArray(), qnamep2.getStartOffset(), qnamep2.getUriLength())
- && arraysEqual(qnamep1.getByteArray(), startOffsetLocalName1, qnamep1.getLocalNameLength(),
- qnamep2.getByteArray(), startOffsetLocalName2, qnamep2.getLocalNameLength());
+ && FunctionHelper.arraysEqual(qnamep1.getByteArray(), startOffsetLocalName1,
+ qnamep1.getLocalNameLength(), qnamep2.getByteArray(), startOffsetLocalName2,
+ qnamep2.getLocalNameLength());
}
@Override
@@ -387,8 +387,8 @@ public class ValueEqComparisonOperation extends AbstractValueComparisonOperation
}
@Override
- public boolean operateYMDurationDTDuration(IntegerPointable intp1, LongPointable longp2) throws SystemException,
- IOException {
+ public boolean operateYMDurationDTDuration(IntegerPointable intp1, LongPointable longp2)
+ throws SystemException, IOException {
if (intp1.getInteger() == 0 && longp2.getLong() == 0) {
return true;
}
@@ -405,21 +405,9 @@ public class ValueEqComparisonOperation extends AbstractValueComparisonOperation
}
@Override
- public boolean operateYMDurationYMDuration(IntegerPointable intp1, IntegerPointable intp2) throws SystemException,
- IOException {
+ public boolean operateYMDurationYMDuration(IntegerPointable intp1, IntegerPointable intp2)
+ throws SystemException, IOException {
return (intp1.compareTo(intp2) == 0);
}
- private boolean arraysEqual(byte[] bytes1, int offset1, int length1, byte[] bytes2, int offset2, int length2) {
- if (length1 != length2) {
- return false;
- }
- for (int i = 0; i < length1; ++i) {
- if (bytes1[offset1 + i] != bytes2[offset2 + i]) {
- return false;
- }
- }
- return true;
- }
-
}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/7d7ab007/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/util/FunctionHelper.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/util/FunctionHelper.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/util/FunctionHelper.java
index a57bf72..d8c4e68 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/util/FunctionHelper.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/util/FunctionHelper.java
@@ -456,9 +456,27 @@ public class FunctionHelper {
throw new SystemException(ErrorCode.XPTY0004);
}
+ public static boolean arraysEqual(IPointable p1, IPointable p2) {
+ return arraysEqual(p1.getByteArray(), p1.getStartOffset(), p1.getLength(), p2.getByteArray(),
+ p2.getStartOffset(), p2.getLength());
+ }
+
+ public static boolean arraysEqual(byte[] bytes1, int offset1, int length1, byte[] bytes2, int offset2,
+ int length2) {
+ if (length1 != length2) {
+ return false;
+ }
+ for (int i = 0; i < length1; ++i) {
+ if (bytes1[offset1 + i] != bytes2[offset2 + i]) {
+ return false;
+ }
+ }
+ return true;
+ }
+
public static boolean compareTaggedValues(AbstractValueComparisonOperation aOp, TaggedValuePointable tvp1,
TaggedValuePointable tvp2, DynamicContext dCtx, TypedPointables tp1, TypedPointables tp2)
- throws SystemException {
+ throws SystemException {
int tid1 = getBaseTypeForComparisons(tvp1.getTag());
int tid2 = getBaseTypeForComparisons(tvp2.getTag());
http://git-wip-us.apache.org/repos/asf/vxquery/blob/7d7ab007/vxquery-core/src/test/java/org/apache/vxquery/datamodel/AbstractPointableTest.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/test/java/org/apache/vxquery/datamodel/AbstractPointableTest.java b/vxquery-core/src/test/java/org/apache/vxquery/datamodel/AbstractPointableTest.java
new file mode 100644
index 0000000..9343465
--- /dev/null
+++ b/vxquery-core/src/test/java/org/apache/vxquery/datamodel/AbstractPointableTest.java
@@ -0,0 +1,56 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.vxquery.datamodel;
+
+import java.io.DataOutput;
+import java.io.IOException;
+
+import org.apache.hyracks.data.std.api.IPointable;
+import org.apache.hyracks.data.std.util.ArrayBackedValueStorage;
+import org.apache.vxquery.datamodel.builders.atomic.StringValueBuilder;
+import org.apache.vxquery.datamodel.values.ValueTag;
+
+public class AbstractPointableTest {
+ private final ArrayBackedValueStorage abvsInput = new ArrayBackedValueStorage();
+ private final StringValueBuilder svb = new StringValueBuilder();
+
+ protected void getTaggedValuePointable(Object value, IPointable result) throws IOException {
+ int start = abvsInput.getLength();
+ if (value instanceof java.lang.Long) {
+ writeLong((Long) value, abvsInput.getDataOutput());
+ } else if (value instanceof java.lang.Double) {
+ writeDouble((Double) value, abvsInput.getDataOutput());
+ } else if (value instanceof java.lang.String) {
+ writeString((String) value, abvsInput.getDataOutput());
+ }
+ result.set(abvsInput.getByteArray(), start, abvsInput.getLength() - start);
+ }
+
+ protected void writeLong(Long value, DataOutput dOut) throws IOException {
+ dOut.write(ValueTag.XS_LONG_TAG);
+ dOut.writeLong(value);
+ }
+
+ protected void writeDouble(Double value, DataOutput dOut) throws IOException {
+ dOut.write(ValueTag.XS_DOUBLE_TAG);
+ dOut.writeDouble(value);
+ }
+
+ protected void writeString(String value, DataOutput dOut) throws IOException {
+ dOut.write(ValueTag.XS_STRING_TAG);
+ svb.write(value, dOut);
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/7d7ab007/vxquery-core/src/test/java/org/apache/vxquery/datamodel/SequenceByteTest.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/test/java/org/apache/vxquery/datamodel/SequenceByteTest.java b/vxquery-core/src/test/java/org/apache/vxquery/datamodel/SequenceByteTest.java
new file mode 100644
index 0000000..776b97a
--- /dev/null
+++ b/vxquery-core/src/test/java/org/apache/vxquery/datamodel/SequenceByteTest.java
@@ -0,0 +1,147 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.vxquery.datamodel;
+
+import java.io.IOException;
+
+import org.apache.hyracks.data.std.util.ArrayBackedValueStorage;
+import org.apache.vxquery.datamodel.accessors.SequencePointable;
+import org.apache.vxquery.datamodel.accessors.TaggedValuePointable;
+import org.apache.vxquery.datamodel.builders.sequence.SequenceBuilder;
+import org.apache.vxquery.datamodel.values.ValueTag;
+import org.apache.vxquery.datamodel.values.XDMConstants;
+import org.apache.vxquery.runtime.functions.util.FunctionHelper;
+import org.junit.Test;
+
+import junit.framework.Assert;
+
+/**
+ * The sequence byte test covers empty sequences, single items and multi-item sequences.
+ *
+ * 1. Empty sequence constant
+ * 2. Empty sequence - {}
+ * 3. Single item - "one" (XQuery single item sequences are just the item.)
+ * 4. Many items - {1, 2.0, "three"}
+ */
+public class SequenceByteTest extends AbstractPointableTest {
+ private final ArrayBackedValueStorage abvsResult = new ArrayBackedValueStorage();
+ private final SequenceBuilder sb = new SequenceBuilder();
+ private final TaggedValuePointable tvp = (TaggedValuePointable) TaggedValuePointable.FACTORY.createPointable();
+ private final TaggedValuePointable tvp1 = (TaggedValuePointable) TaggedValuePointable.FACTORY.createPointable();
+ private final TaggedValuePointable tvp2 = (TaggedValuePointable) TaggedValuePointable.FACTORY.createPointable();
+ private final TaggedValuePointable tvp3 = (TaggedValuePointable) TaggedValuePointable.FACTORY.createPointable();
+ private final SequencePointable sp = (SequencePointable) SequencePointable.FACTORY.createPointable();
+
+ @Test
+ public void testEmptySequenceConstant() {
+ // Build test sequence
+ XDMConstants.setEmptySequence(tvp);
+
+ // Check results.
+ if (tvp.getTag() != ValueTag.SEQUENCE_TAG) {
+ Assert.fail("Type tag is incorrect. Expected: " + ValueTag.SEQUENCE_TAG + " Got: " + tvp.getTag());
+ }
+ tvp.getValue(sp);
+ if (sp.getEntryCount() != 0) {
+ Assert.fail("Sequence size is incorrect. Expected: 0 Got: " + sp.getEntryCount());
+ }
+ }
+
+ @Test
+ public void testEmptySequence() {
+ // Build test sequence
+ try {
+ sb.reset(abvsResult);
+ sb.finish();
+ } catch (IOException e) {
+ Assert.fail("Test failed to write the sequence pointable.");
+ }
+ tvp.set(abvsResult);
+
+ // Check results.
+ if (tvp.getTag() != ValueTag.SEQUENCE_TAG) {
+ Assert.fail("Type tag is incorrect. Expected: " + ValueTag.SEQUENCE_TAG + " Got: " + tvp.getTag());
+ }
+ tvp.getValue(sp);
+ if (sp.getEntryCount() != 0) {
+ Assert.fail("Sequence size is incorrect. Expected: 0 Got: " + sp.getEntryCount());
+ }
+ }
+
+ @Test
+ public void testSingleItemSequence() {
+ // Build test sequence
+ try {
+ sb.reset(abvsResult);
+ getTaggedValuePointable("one", tvp1);
+ sb.addItem(tvp1);
+ sb.finish();
+ } catch (IOException e) {
+ Assert.fail("Test failed to write the sequence pointable.");
+ }
+ tvp.set(abvsResult);
+
+ // Check results.
+ if (tvp.getTag() != ValueTag.XS_STRING_TAG) {
+ Assert.fail("Type tag is incorrect. Expected: " + ValueTag.XS_STRING_TAG + " Got: " + tvp.getTag());
+ }
+ if (!FunctionHelper.arraysEqual(tvp, tvp1)) {
+ Assert.fail("Item value is incorrect.");
+ }
+ }
+
+ @Test
+ public void testManyItemSequence() {
+ // Build test sequence
+ try {
+ // Add three items
+ sb.reset(abvsResult);
+ getTaggedValuePointable(1, tvp1);
+ sb.addItem(tvp1);
+ getTaggedValuePointable(2.0, tvp2);
+ sb.addItem(tvp2);
+ getTaggedValuePointable("three", tvp3);
+ sb.addItem(tvp3);
+ sb.finish();
+ } catch (IOException e) {
+ Assert.fail("Test failed to write the sequence pointable.");
+ }
+ tvp.set(abvsResult);
+
+ // Check results.
+ if (tvp.getTag() != ValueTag.SEQUENCE_TAG) {
+ Assert.fail("Sequence tag is incorrect. Expected: " + ValueTag.SEQUENCE_TAG + " Got: " + tvp.getTag());
+ }
+ tvp.getValue(sp);
+ if (sp.getEntryCount() != 3) {
+ Assert.fail("Sequence size is incorrect. Expected: 3 Got: " + sp.getEntryCount());
+ }
+ sp.getEntry(0, tvp);
+ if (!FunctionHelper.arraysEqual(tvp, tvp1)) {
+ Assert.fail("Sequence item one is incorrect. Expected: " + ValueTag.XS_LONG_TAG + " Got: " + tvp.getTag());
+ }
+ sp.getEntry(1, tvp);
+ if (!FunctionHelper.arraysEqual(tvp, tvp2)) {
+ Assert.fail(
+ "Sequence item two is incorrect. Expected: " + ValueTag.XS_DOUBLE_TAG + " Got: " + tvp.getTag());
+ }
+ sp.getEntry(2, tvp);
+ if (!FunctionHelper.arraysEqual(tvp, tvp3)) {
+ Assert.fail(
+ "Sequence item three is incorrect. Expected: " + ValueTag.XS_STRING_TAG + " Got: " + tvp.getTag());
+ }
+ }
+
+}
[34/50] [abbrv] vxquery git commit: return to old ordering of xqts
results
Posted by sj...@apache.org.
return to old ordering of xqts results
Project: http://git-wip-us.apache.org/repos/asf/vxquery/repo
Commit: http://git-wip-us.apache.org/repos/asf/vxquery/commit/4b7e0c76
Tree: http://git-wip-us.apache.org/repos/asf/vxquery/tree/4b7e0c76
Diff: http://git-wip-us.apache.org/repos/asf/vxquery/diff/4b7e0c76
Branch: refs/heads/site
Commit: 4b7e0c766db9a8f33946c4bfd5f2a396d1a6a561
Parents: 47815f8
Author: Till Westmann <ti...@apache.org>
Authored: Mon Mar 14 00:05:43 2016 -0700
Committer: Till Westmann <ti...@apache.org>
Committed: Wed Mar 30 22:19:44 2016 -0700
----------------------------------------------------------------------
vxquery-xtest/results/xqts.txt | 13412 +++++++++++++++++-----------------
1 file changed, 6706 insertions(+), 6706 deletions(-)
----------------------------------------------------------------------
[49/50] [abbrv] vxquery git commit: [maven-release-plugin] prepare
for next development iteration
Posted by sj...@apache.org.
[maven-release-plugin] prepare for next development iteration
Project: http://git-wip-us.apache.org/repos/asf/vxquery/repo
Commit: http://git-wip-us.apache.org/repos/asf/vxquery/commit/fb0328d1
Tree: http://git-wip-us.apache.org/repos/asf/vxquery/tree/fb0328d1
Diff: http://git-wip-us.apache.org/repos/asf/vxquery/diff/fb0328d1
Branch: refs/heads/site
Commit: fb0328d167536c1034245dfa7c820bce2b829755
Parents: a678444
Author: Steven Jacobs <sj...@ucr.edu>
Authored: Thu May 19 16:15:00 2016 -0700
Committer: Steven Jacobs <sj...@ucr.edu>
Committed: Thu May 19 16:15:00 2016 -0700
----------------------------------------------------------------------
pom.xml | 4 ++--
vxquery-benchmark/pom.xml | 2 +-
vxquery-cli/pom.xml | 4 ++--
vxquery-core/pom.xml | 2 +-
vxquery-server/pom.xml | 4 ++--
vxquery-xtest/pom.xml | 4 ++--
6 files changed, 10 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/vxquery/blob/fb0328d1/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index dd7dff9..8f7100c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -26,7 +26,7 @@
<groupId>org.apache.vxquery</groupId>
<artifactId>apache-vxquery</artifactId>
- <version>0.6</version>
+ <version>0.7-SNAPSHOT</version>
<packaging>pom</packaging>
<name>VXQuery</name>
<description>A Versatile XQuery Processor</description>
@@ -50,7 +50,7 @@
<connection>scm:git:https://git-wip-us.apache.org/repos/asf/vxquery.git</connection>
<developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/vxquery.git</developerConnection>
<url>https://git-wip-us.apache.org/repos/asf/vxquery.git</url>
- <tag>apache-vxquery-0.6</tag>
+ <tag>HEAD</tag>
</scm>
<issueManagement>
http://git-wip-us.apache.org/repos/asf/vxquery/blob/fb0328d1/vxquery-benchmark/pom.xml
----------------------------------------------------------------------
diff --git a/vxquery-benchmark/pom.xml b/vxquery-benchmark/pom.xml
index da420f8..71998fa 100644
--- a/vxquery-benchmark/pom.xml
+++ b/vxquery-benchmark/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.vxquery</groupId>
<artifactId>apache-vxquery</artifactId>
- <version>0.6</version>
+ <version>0.7-SNAPSHOT</version>
</parent>
<artifactId>apache-vxquery-benchmark</artifactId>
http://git-wip-us.apache.org/repos/asf/vxquery/blob/fb0328d1/vxquery-cli/pom.xml
----------------------------------------------------------------------
diff --git a/vxquery-cli/pom.xml b/vxquery-cli/pom.xml
index 6e8d240..907bab3 100644
--- a/vxquery-cli/pom.xml
+++ b/vxquery-cli/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.vxquery</groupId>
<artifactId>apache-vxquery</artifactId>
- <version>0.6</version>
+ <version>0.7-SNAPSHOT</version>
</parent>
<artifactId>apache-vxquery-cli</artifactId>
@@ -83,7 +83,7 @@
<dependency>
<groupId>org.apache.vxquery</groupId>
<artifactId>apache-vxquery-core</artifactId>
- <version>0.6</version>
+ <version>0.7-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/vxquery/blob/fb0328d1/vxquery-core/pom.xml
----------------------------------------------------------------------
diff --git a/vxquery-core/pom.xml b/vxquery-core/pom.xml
index d1d1dcb..d8f5f53 100644
--- a/vxquery-core/pom.xml
+++ b/vxquery-core/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.vxquery</groupId>
<artifactId>apache-vxquery</artifactId>
- <version>0.6</version>
+ <version>0.7-SNAPSHOT</version>
</parent>
<artifactId>apache-vxquery-core</artifactId>
http://git-wip-us.apache.org/repos/asf/vxquery/blob/fb0328d1/vxquery-server/pom.xml
----------------------------------------------------------------------
diff --git a/vxquery-server/pom.xml b/vxquery-server/pom.xml
index 5fae1f8..e572c36 100644
--- a/vxquery-server/pom.xml
+++ b/vxquery-server/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.vxquery</groupId>
<artifactId>apache-vxquery</artifactId>
- <version>0.6</version>
+ <version>0.7-SNAPSHOT</version>
</parent>
<artifactId>apache-vxquery-server</artifactId>
@@ -140,7 +140,7 @@
<dependency>
<groupId>org.apache.vxquery</groupId>
<artifactId>apache-vxquery-core</artifactId>
- <version>0.6</version>
+ <version>0.7-SNAPSHOT</version>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/vxquery/blob/fb0328d1/vxquery-xtest/pom.xml
----------------------------------------------------------------------
diff --git a/vxquery-xtest/pom.xml b/vxquery-xtest/pom.xml
index 347d164..23095f1 100644
--- a/vxquery-xtest/pom.xml
+++ b/vxquery-xtest/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.vxquery</groupId>
<artifactId>apache-vxquery</artifactId>
- <version>0.6</version>
+ <version>0.7-SNAPSHOT</version>
</parent>
<artifactId>apache-vxquery-xtest</artifactId>
@@ -129,7 +129,7 @@
<dependency>
<groupId>org.apache.vxquery</groupId>
<artifactId>apache-vxquery-core</artifactId>
- <version>0.6</version>
+ <version>0.7-SNAPSHOT</version>
</dependency>
<dependency>
[50/50] [abbrv] vxquery git commit: Fixed tags
Posted by sj...@apache.org.
Fixed tags
Project: http://git-wip-us.apache.org/repos/asf/vxquery/repo
Commit: http://git-wip-us.apache.org/repos/asf/vxquery/commit/7b0801e2
Tree: http://git-wip-us.apache.org/repos/asf/vxquery/tree/7b0801e2
Diff: http://git-wip-us.apache.org/repos/asf/vxquery/diff/7b0801e2
Branch: refs/heads/site
Commit: 7b0801e2546d2b9452b83adbc1eeeb2a80ed9749
Parents: fb0328d
Author: Steven Glenn Jacobs <sj...@ucr.edu>
Authored: Thu May 26 10:31:31 2016 -0700
Committer: Steven Glenn Jacobs <sj...@ucr.edu>
Committed: Thu May 26 10:31:31 2016 -0700
----------------------------------------------------------------------
pom.xml | 4 ++--
vxquery-cli/pom.xml | 4 ++--
vxquery-core/pom.xml | 2 +-
vxquery-server/pom.xml | 4 ++--
vxquery-xtest/pom.xml | 4 ++--
5 files changed, 9 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/vxquery/blob/7b0801e2/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 8f7100c..dd7dff9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -26,7 +26,7 @@
<groupId>org.apache.vxquery</groupId>
<artifactId>apache-vxquery</artifactId>
- <version>0.7-SNAPSHOT</version>
+ <version>0.6</version>
<packaging>pom</packaging>
<name>VXQuery</name>
<description>A Versatile XQuery Processor</description>
@@ -50,7 +50,7 @@
<connection>scm:git:https://git-wip-us.apache.org/repos/asf/vxquery.git</connection>
<developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/vxquery.git</developerConnection>
<url>https://git-wip-us.apache.org/repos/asf/vxquery.git</url>
- <tag>HEAD</tag>
+ <tag>apache-vxquery-0.6</tag>
</scm>
<issueManagement>
http://git-wip-us.apache.org/repos/asf/vxquery/blob/7b0801e2/vxquery-cli/pom.xml
----------------------------------------------------------------------
diff --git a/vxquery-cli/pom.xml b/vxquery-cli/pom.xml
index 907bab3..6e8d240 100644
--- a/vxquery-cli/pom.xml
+++ b/vxquery-cli/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.vxquery</groupId>
<artifactId>apache-vxquery</artifactId>
- <version>0.7-SNAPSHOT</version>
+ <version>0.6</version>
</parent>
<artifactId>apache-vxquery-cli</artifactId>
@@ -83,7 +83,7 @@
<dependency>
<groupId>org.apache.vxquery</groupId>
<artifactId>apache-vxquery-core</artifactId>
- <version>0.7-SNAPSHOT</version>
+ <version>0.6</version>
<scope>compile</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/vxquery/blob/7b0801e2/vxquery-core/pom.xml
----------------------------------------------------------------------
diff --git a/vxquery-core/pom.xml b/vxquery-core/pom.xml
index d8f5f53..d1d1dcb 100644
--- a/vxquery-core/pom.xml
+++ b/vxquery-core/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.vxquery</groupId>
<artifactId>apache-vxquery</artifactId>
- <version>0.7-SNAPSHOT</version>
+ <version>0.6</version>
</parent>
<artifactId>apache-vxquery-core</artifactId>
http://git-wip-us.apache.org/repos/asf/vxquery/blob/7b0801e2/vxquery-server/pom.xml
----------------------------------------------------------------------
diff --git a/vxquery-server/pom.xml b/vxquery-server/pom.xml
index e572c36..5fae1f8 100644
--- a/vxquery-server/pom.xml
+++ b/vxquery-server/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.vxquery</groupId>
<artifactId>apache-vxquery</artifactId>
- <version>0.7-SNAPSHOT</version>
+ <version>0.6</version>
</parent>
<artifactId>apache-vxquery-server</artifactId>
@@ -140,7 +140,7 @@
<dependency>
<groupId>org.apache.vxquery</groupId>
<artifactId>apache-vxquery-core</artifactId>
- <version>0.7-SNAPSHOT</version>
+ <version>0.6</version>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/vxquery/blob/7b0801e2/vxquery-xtest/pom.xml
----------------------------------------------------------------------
diff --git a/vxquery-xtest/pom.xml b/vxquery-xtest/pom.xml
index 23095f1..347d164 100644
--- a/vxquery-xtest/pom.xml
+++ b/vxquery-xtest/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.vxquery</groupId>
<artifactId>apache-vxquery</artifactId>
- <version>0.7-SNAPSHOT</version>
+ <version>0.6</version>
</parent>
<artifactId>apache-vxquery-xtest</artifactId>
@@ -129,7 +129,7 @@
<dependency>
<groupId>org.apache.vxquery</groupId>
<artifactId>apache-vxquery-core</artifactId>
- <version>0.7-SNAPSHOT</version>
+ <version>0.6</version>
</dependency>
<dependency>
[41/50] [abbrv] vxquery git commit: VXQUERY-191: Fixed sort order for
XQTS text results
Posted by sj...@apache.org.
http://git-wip-us.apache.org/repos/asf/vxquery/blob/7de1fbaa/vxquery-xtest/results/xqts.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/results/xqts.txt b/vxquery-xtest/results/xqts.txt
index 0431f9a..3e5a114 100644
--- a/vxquery-xtest/results/xqts.txt
+++ b/vxquery-xtest/results/xqts.txt
@@ -60,6 +60,13 @@ CondExpr//K2-CondExpr-4, EXPECTED_RESULT_GOT_ERROR
CondExpr//K2-CondExpr-5, EXPECTED_ERROR_GOT_SAME_ERROR
CondExpr//K2-CondExpr-6, EXPECTED_ERROR_GOT_SAME_ERROR
CondExpr//K2-CondExpr-7, EXPECTED_RESULT_GOT_SAME_RESULT
+Construct/ComputeCon/ComputeConAttr//comp-attr-bad-name-1, EXPECTED_ERROR_GOT_RESULT
+Construct/ComputeCon/ComputeConAttr//comp-attr-bad-name-2, EXPECTED_ERROR_GOT_RESULT
+Construct/ComputeCon/ComputeConAttr//comp-attr-bad-name-3, EXPECTED_ERROR_GOT_RESULT
+Construct/ComputeCon/ComputeConAttr//comp-attr-bad-name-4, EXPECTED_ERROR_GOT_RESULT
+Construct/ComputeCon/ComputeConAttr//comp-attr-bad-name-5, EXPECTED_ERROR_GOT_RESULT
+Construct/ComputeCon/ComputeConAttr//comp-attr-bad-name-6, EXPECTED_ERROR_GOT_RESULT
+Construct/ComputeCon/ComputeConAttr//comp-attr-bad-name-7, EXPECTED_ERROR_GOT_RESULT
Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-1, EXPECTED_ERROR_GOT_SAME_ERROR
Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-10, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-11, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
@@ -121,18 +128,17 @@ Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-61, EXPECTED_ERROR_GOT_SA
Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-7, EXPECTED_ERROR_GOT_SAME_ERROR
Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-8, EXPECTED_ERROR_GOT_SAME_ERROR
Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-9, EXPECTED_ERROR_GOT_SAME_ERROR
-Construct/ComputeCon/ComputeConAttr//comp-attr-bad-name-1, EXPECTED_ERROR_GOT_RESULT
-Construct/ComputeCon/ComputeConAttr//comp-attr-bad-name-2, EXPECTED_ERROR_GOT_RESULT
-Construct/ComputeCon/ComputeConAttr//comp-attr-bad-name-3, EXPECTED_ERROR_GOT_RESULT
-Construct/ComputeCon/ComputeConAttr//comp-attr-bad-name-4, EXPECTED_ERROR_GOT_RESULT
-Construct/ComputeCon/ComputeConAttr//comp-attr-bad-name-5, EXPECTED_ERROR_GOT_RESULT
-Construct/ComputeCon/ComputeConAttr//comp-attr-bad-name-6, EXPECTED_ERROR_GOT_RESULT
-Construct/ComputeCon/ComputeConAttr//comp-attr-bad-name-7, EXPECTED_ERROR_GOT_RESULT
Construct/ComputeCon/ComputeConComment//K2-ComputeConComment-1, EXPECTED_ERROR_GOT_SAME_ERROR
Construct/ComputeCon/ComputeConComment//K2-ComputeConComment-2, EXPECTED_ERROR_GOT_SAME_ERROR
Construct/ComputeCon/ComputeConComment//K2-ComputeConComment-3, EXPECTED_RESULT_GOT_ERROR
Construct/ComputeCon/ComputeConComment//K2-ComputeConComment-4, EXPECTED_ERROR_GOT_SAME_ERROR
Construct/ComputeCon/ComputeConComment//K2-ComputeConComment-5, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+Construct/ComputeCon/ComputeConElem//comp-elem-bad-name-1, EXPECTED_ERROR_GOT_RESULT
+Construct/ComputeCon/ComputeConElem//comp-elem-bad-name-2, EXPECTED_ERROR_GOT_RESULT
+Construct/ComputeCon/ComputeConElem//comp-elem-bad-name-3, EXPECTED_ERROR_GOT_RESULT
+Construct/ComputeCon/ComputeConElem//comp-elem-bad-name-4, EXPECTED_ERROR_GOT_RESULT
+Construct/ComputeCon/ComputeConElem//comp-elem-bad-name-5, EXPECTED_ERROR_GOT_RESULT
+Construct/ComputeCon/ComputeConElem//comp-elem-bad-name-6, EXPECTED_ERROR_GOT_RESULT
Construct/ComputeCon/ComputeConElem//K2-ComputeConElem-1, EXPECTED_ERROR_GOT_SAME_ERROR
Construct/ComputeCon/ComputeConElem//K2-ComputeConElem-10, EXPECTED_RESULT_GOT_ERROR
Construct/ComputeCon/ComputeConElem//K2-ComputeConElem-11, EXPECTED_RESULT_GOT_ERROR
@@ -148,12 +154,6 @@ Construct/ComputeCon/ComputeConElem//K2-ComputeConElem-6, EXPECTED_RESULT_GOT_SA
Construct/ComputeCon/ComputeConElem//K2-ComputeConElem-7, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Construct/ComputeCon/ComputeConElem//K2-ComputeConElem-8, EXPECTED_RESULT_GOT_ERROR
Construct/ComputeCon/ComputeConElem//K2-ComputeConElem-9, EXPECTED_RESULT_GOT_ERROR
-Construct/ComputeCon/ComputeConElem//comp-elem-bad-name-1, EXPECTED_ERROR_GOT_RESULT
-Construct/ComputeCon/ComputeConElem//comp-elem-bad-name-2, EXPECTED_ERROR_GOT_RESULT
-Construct/ComputeCon/ComputeConElem//comp-elem-bad-name-3, EXPECTED_ERROR_GOT_RESULT
-Construct/ComputeCon/ComputeConElem//comp-elem-bad-name-4, EXPECTED_ERROR_GOT_RESULT
-Construct/ComputeCon/ComputeConElem//comp-elem-bad-name-5, EXPECTED_ERROR_GOT_RESULT
-Construct/ComputeCon/ComputeConElem//comp-elem-bad-name-6, EXPECTED_ERROR_GOT_RESULT
Construct/ComputeCon/ComputeConPI//K2-ComputeConPI-1, EXPECTED_ERROR_GOT_SAME_ERROR
Construct/ComputeCon/ComputeConPI//K2-ComputeConPI-10, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Construct/ComputeCon/ComputeConPI//K2-ComputeConPI-11, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
@@ -611,6 +611,7 @@ Expressions/CondExpr//K-CondExpr-6, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/CondExpr//K-CondExpr-7, EXPECTED_ERROR_GOT_SAME_ERROR
Expressions/CondExpr//K-CondExpr-8, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/CondExpr//K-CondExpr-9, EXPECTED_RESULT_GOT_SAME_RESULT
+Expressions/Construct/ComputeCon/ComputeConAttr//constattrerr-1, EXPECTED_ERROR_GOT_RESULT
Expressions/Construct/ComputeCon/ComputeConAttr//Constr-compattr-compname-1, EXPECTED_ERROR_GOT_SAME_ERROR
Expressions/Construct/ComputeCon/ComputeConAttr//Constr-compattr-compname-10, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Construct/ComputeCon/ComputeConAttr//Constr-compattr-compname-11, EXPECTED_RESULT_GOT_SAME_RESULT
@@ -643,7 +644,6 @@ Expressions/Construct/ComputeCon/ComputeConAttr//Constr-compattr-name-2, EXPECTE
Expressions/Construct/ComputeCon/ComputeConAttr//Constr-compattr-name-3, EXPECTED_ERROR_GOT_SAME_ERROR
Expressions/Construct/ComputeCon/ComputeConAttr//Constr-compattr-parent-1, EXPECTED_RESULT_GOT_ERROR
Expressions/Construct/ComputeCon/ComputeConAttr//Constr-compattr-string-1, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/Construct/ComputeCon/ComputeConAttr//constattrerr-1, EXPECTED_ERROR_GOT_RESULT
Expressions/Construct/ComputeCon/ComputeConComment//Constr-compcomment-dash-1, EXPECTED_ERROR_GOT_RESULT
Expressions/Construct/ComputeCon/ComputeConComment//Constr-compcomment-dash-2, EXPECTED_ERROR_GOT_RESULT
Expressions/Construct/ComputeCon/ComputeConComment//Constr-compcomment-dash-3, EXPECTED_ERROR_GOT_RESULT
@@ -1108,17483 +1108,9414 @@ Expressions/ContextExpr/InternalContextExpr//internalcontextitem-6, EXPECTED_RES
Expressions/ContextExpr/InternalContextExpr//internalcontextitem-7, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Expressions/ContextExpr/InternalContextExpr//internalcontextitem-8, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Expressions/ContextExpr/InternalContextExpr//internalcontextitem-9, EXPECTED_ERROR_GOT_RESULT
-Expressions/ExtensionExpression//K-ExtensionExpression-1, EXPECTED_ERROR_GOT_SAME_ERROR
-Expressions/ExtensionExpression//K-ExtensionExpression-2, EXPECTED_ERROR_GOT_SAME_ERROR
-Expressions/ExtensionExpression//K-ExtensionExpression-3, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/ExtensionExpression//K-ExtensionExpression-4, EXPECTED_ERROR_GOT_RESULT
-Expressions/ExtensionExpression//K-ExtensionExpression-5, EXPECTED_ERROR_GOT_RESULT
-Expressions/ExtensionExpression//K-ExtensionExpression-6, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/ExtensionExpression//K-ExtensionExpression-7, EXPECTED_ERROR_GOT_SAME_ERROR
-Expressions/ExtensionExpression//K-ExtensionExpression-8, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/ExtensionExpression//extexpr-1, EXPECTED_RESULT_GOT_FAILURE
-Expressions/ExtensionExpression//extexpr-10, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/ExtensionExpression//extexpr-11, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/ExtensionExpression//extexpr-12, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/ExtensionExpression//extexpr-13, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/ExtensionExpression//extexpr-14, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/ExtensionExpression//extexpr-15, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/ExtensionExpression//extexpr-16, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/ExtensionExpression//extexpr-17, EXPECTED_RESULT_GOT_FAILURE
-Expressions/ExtensionExpression//extexpr-18, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/ExtensionExpression//extexpr-19, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/ExtensionExpression//extexpr-2, EXPECTED_ERROR_GOT_SAME_ERROR
-Expressions/ExtensionExpression//extexpr-20, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/ExtensionExpression//extexpr-21, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/ExtensionExpression//extexpr-22, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/ExtensionExpression//extexpr-23, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/ExtensionExpression//extexpr-24, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/ExtensionExpression//extexpr-25, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/ExtensionExpression//extexpr-26, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/ExtensionExpression//extexpr-3, EXPECTED_RESULT_GOT_FAILURE
-Expressions/ExtensionExpression//extexpr-4, EXPECTED_ERROR_GOT_FAILURE
-Expressions/ExtensionExpression//extexpr-5, EXPECTED_RESULT_GOT_FAILURE
-Expressions/ExtensionExpression//extexpr-6, EXPECTED_RESULT_GOT_FAILURE
-Expressions/ExtensionExpression//extexpr-7, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/ExtensionExpression//extexpr-8, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/ExtensionExpression//extexpr-9, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/FLWORExpr/ForExpr//ForExpr001, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/FLWORExpr/ForExpr//ForExpr002, EXPECTED_ERROR_GOT_SAME_ERROR
-Expressions/FLWORExpr/ForExpr//ForExpr003, EXPECTED_RESULT_GOT_FAILURE
-Expressions/FLWORExpr/ForExpr//ForExpr004, EXPECTED_RESULT_GOT_ERROR
-Expressions/FLWORExpr/ForExpr//ForExpr005, EXPECTED_RESULT_GOT_FAILURE
-Expressions/FLWORExpr/ForExpr//ForExpr006, EXPECTED_RESULT_GOT_FAILURE
-Expressions/FLWORExpr/ForExpr//ForExpr007, EXPECTED_RESULT_GOT_FAILURE
-Expressions/FLWORExpr/ForExpr//ForExpr008, EXPECTED_RESULT_GOT_FAILURE
-Expressions/FLWORExpr/ForExpr//ForExpr009, EXPECTED_ERROR_GOT_SAME_ERROR
-Expressions/FLWORExpr/ForExpr//ForExpr010, EXPECTED_RESULT_GOT_FAILURE
-Expressions/FLWORExpr/ForExpr//ForExpr011, EXPECTED_RESULT_GOT_FAILURE
-Expressions/FLWORExpr/ForExpr//ForExpr012, EXPECTED_RESULT_GOT_FAILURE
-Expressions/FLWORExpr/ForExpr//ForExpr013, EXPECTED_RESULT_GOT_FAILURE
-Expressions/FLWORExpr/ForExpr//ForExpr014, EXPECTED_ERROR_GOT_SAME_ERROR
-Expressions/FLWORExpr/ForExpr//ForExpr015, EXPECTED_RESULT_GOT_FAILURE
-Expressions/FLWORExpr/ForExpr//ForExpr016, EXPECTED_RESULT_GOT_FAILURE
-Expressions/FLWORExpr/ForExpr//ForExpr017, EXPECTED_ERROR_GOT_SAME_ERROR
-Expressions/FLWORExpr/ForExpr//ForExpr018, EXPECTED_ERROR_GOT_SAME_ERROR
-Expressions/FLWORExpr/ForExpr//ForExpr019, EXPECTED_ERROR_GOT_SAME_ERROR
-Expressions/FLWORExpr/ForExpr//ForExpr020, EXPECTED_ERROR_GOT_SAME_ERROR
-Expressions/FLWORExpr/ForExpr//ForExpr021, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/FLWORExpr/ForExpr//ForExpr022, EXPECTED_RESULT_GOT_FAILURE
-Expressions/FLWORExpr/ForExpr//ForExpr023, EXPECTED_RESULT_GOT_FAILURE
-Expressions/FLWORExpr/ForExpr//ForExpr024, EXPECTED_ERROR_GOT_FAILURE
-Expressions/FLWORExpr/ForExpr//ForExpr025, EXPECTED_RESULT_GOT_FAILURE
-Expressions/FLWORExpr/ForExpr//ForExpr026, EXPECTED_ERROR_GOT_SAME_ERROR
-Expressions/FLWORExpr/ForExpr//ForExpr027, EXPECTED_ERROR_GOT_SAME_ERROR
-Expressions/FLWORExpr/ForExpr//ForExpr028, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/FLWORExpr/ForExpr//ForExpr029, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/FLWORExpr/ForExpr//ForExpr030, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/FLWORExpr/ForExpr//ForExpr031, EXPECTED_ERROR_GOT_RESULT
-Expressions/FLWORExpr/ForExpr/ForExprPositionalVar//K-ForExprPositionalVar-1, EXPECTED_ERROR_GOT_SAME_ERROR
-Expressions/FLWORExpr/ForExpr/ForExprPositionalVar//K-ForExprPositionalVar-10, EXPECTED_RESULT_GOT_ERROR
-Expressions/FLWORExpr/ForExpr/ForExprPositionalVar//K-ForExprPositionalVar-11, EXPECTED_ERROR_GOT_RESULT
-Expressions/FLWORExpr/ForExpr/ForExprPositionalVar//K-ForExprPositionalVar-12, EXPECTED_RESULT_GOT_ERROR
-Expressions/FLWORExpr/ForExpr/ForExprPositionalVar//K-ForExprPositionalVar-13, EXPECTED_RESULT_GOT_ERROR
-Expressions/FLWORExpr/ForExpr/ForExprPositionalVar//K-ForExprPositionalVar-14, EXPECTED_RESULT_GOT_ERROR
-Expressions/FLWORExpr/ForExpr/ForExprPositionalVar//K-ForExprPositionalVar-15, EXPECTED_RESULT_GOT_ERROR
-Expressions/FLWORExpr/ForExpr/ForExprPositionalVar//K-ForExprPositionalVar-16, EXPECTED_RESULT_GOT_ERROR
-Expressions/FLWORExpr/ForExpr/ForExprPositionalVar//K-ForExprPositionalVar-17, EXPECTED_RESULT_GOT_ERROR
-Expressions/FLWORExpr/ForExpr/ForExprPositionalVar//K-ForExprPositionalVar-18, EXPECTED_RESULT_GOT_ERROR
-Expressions/FLWORExpr/ForExpr/ForExprPositionalVar//K-ForExprPositionalVar-19, EXPECTED_RESULT_GOT_ERROR
-Expressions/FLWORExpr/ForExpr/ForExprPositionalVar//K-ForExprPositionalVar-2, EXPECTED_ERROR_GOT_SAME_ERROR
-Expressions/FLWORExpr/ForExpr/ForExprPositionalVar//K-ForExprPositionalVar-20, EXPECTED_RESULT_GOT_ERROR
-Expressions/FLWORExpr/ForExpr/ForExprPositionalVar//K-ForExprPositionalVar-21, EXPECTED_RESULT_GOT_ERROR
-Expressions/FLWORExpr/ForExpr/ForExprPositionalVar//K-ForExprPositionalVar-22, EXPECTED_RESULT_GOT_ERROR
-Expressions/FLWORExpr/ForExpr/ForExprPositionalVar//K-ForExprPositionalVar-23, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/FLWORExpr/ForExpr/ForExprPositionalVar//K-ForExprPositionalVar-24, EXPECTED_ERROR_GOT_RESULT
-Expressions/FLWORExpr/ForExpr/ForExprPositionalVar//K-ForExprPositionalVar-25, EXPECTED_ERROR_GOT_RESULT
-Expressions/FLWORExpr/ForExpr/ForExprPositionalVar//K-ForExprPositionalVar-26, EXPECTED_RESULT_GOT_ERROR
-Expressions/FLWORExpr/ForExpr/ForExprPositionalVar//K-ForExprPositionalVar-27, EXPECTED_RESULT_GOT_ERROR
-Expressions/FLWORExpr/ForExpr/ForExprPositionalVar//K-ForExprPositionalVar-28, EXPECTED_RESULT_GOT_ERROR
-Expressions/FLWORExpr/ForExpr/ForExprPositionalVar//K-ForExprPositionalVar-29, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/FLWORExpr/ForExpr/ForExprPositionalVar//K-ForExprPositionalVar-3, EXPECTED_ERROR_GOT_SAME_ERROR
-Expressions/FLWORExpr/ForExpr/ForExprPositionalVar//K-ForExprPositionalVar-30, EXPECTED_RESULT_GOT_ERROR
-Expressions/FLWORExpr/ForExpr/ForExprPositionalVar//K-ForExprPositionalVar-4, EXPECTED_ERROR_GOT_SAME_ERROR
-Expressions/FLWORExpr/ForExpr/ForExprPositionalVar//K-ForExprPositionalVar-5, EXPECTED_ERROR_GOT_SAME_ERROR
-Expressions/FLWORExpr/ForExpr/ForExprPositionalVar//K-ForExprPositionalVar-6, EXPECTED_RESULT_GOT_ERROR
-Expressions/FLWORExpr/ForExpr/ForExprPositionalVar//K-ForExprPositionalVar-7, EXPECTED_RESULT_GOT_ERROR
-Expressions/FLWORExpr/ForExpr/ForExprPositionalVar//K-ForExprPositionalVar-8, EXPECTED_ERROR_GOT_SAME_ERROR
-Expressions/FLWORExpr/ForExpr/ForExprPositionalVar//K-ForExprPositionalVar-9, EXPECTED_RESULT_GOT_ERROR
-Expressions/FLWORExpr/ForExpr/ForExprWithout//K-ForExprWithout-1, EXPECTED_ERROR_GOT_SAME_ERROR
-Expressions/FLWORExpr/ForExpr/ForExprWithout//K-ForExprWithout-10, EXPECTED_RESULT_GOT_ERROR
-Expressions/FLWORExpr/ForExpr/ForExprWithout//K-ForExprWithout-11, EXPECTED_RESULT_GOT_ERROR
-Expressions/FLWORExpr/ForExpr/ForExprWithout//K-ForExprWithout-12, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/FLWORExpr/ForExpr/ForExprWithout//K-ForExprWithout-13, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/FLWORExpr/ForExpr/ForExprWithout//K-ForExprWithout-14, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/FLWORExpr/ForExpr/ForExprWithout//K-ForExprWithout-15, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/FLWORExpr/ForExpr/ForExprWithout//K-ForExprWithout-16, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/FLWORExpr/ForExpr/ForExprWithout//K-ForExprWithout-17, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/FLWORExpr/ForExpr/ForExprWithout//K-ForExprWithout-18, EXPECTED_ERROR_GOT_RESULT
-Expressions/FLWORExpr/ForExpr/ForExprWithout//K-ForExprWithout-19, EXPECTED_ERROR_GOT_RESULT
-Expressions/FLWORExpr/ForExpr/ForExprWithout//K-ForExprWithout-2, EXPECTED_ERROR_GOT_SAME_ERROR
-Expressions/FLWORExpr/ForExpr/ForExprWithout//K-ForExprWithout-20, EXPECTED_ERROR_GOT_RESULT
-Expressions/FLWORExpr/ForExpr/ForExprWithout//K-ForExprWithout-21, EXPECTED_ERROR_GOT_RESULT
-Expressions/FLWORExpr/ForExpr/ForExprWithout//K-ForExprWithout-22, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/FLWORExpr/ForExpr/ForExprWithout//K-ForExprWithout-23, EXPECTED_RESULT_GOT_ERROR
-Expressions/FLWORExpr/ForExpr/ForExprWithout//K-ForExprWithout-24, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/FLWORExpr/ForExpr/ForExprWithout//K-ForExprWithout-25, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/FLWORExpr/ForExpr/ForExprWithout//K-ForExprWithout-26, EXPECTED_ERROR_GOT_SAME_ERROR
-Expressions/FLWORExpr/ForExpr/ForExprWithout//K-ForExprWithout-27, EXPECTED_ERROR_GOT_SAME_ERROR
-Expressions/FLWORExpr/ForExpr/ForExprWithout//K-ForExprWithout-28, EXPECTED_ERROR_GOT_SAME_ERROR
-Expressions/FLWORExpr/ForExpr/ForExprWithout//K-ForExprWithout-29, EXPECTED_ERROR_GOT_SAME_ERROR
-Expressions/FLWORExpr/ForExpr/ForExprWithout//K-ForExprWithout-3, EXPECTED_ERROR_GOT_SAME_ERROR
-Expressions/FLWORExpr/ForExpr/ForExprWithout//K-ForExprWithout-30, EXPECTED_ERROR_GOT_SAME_ERROR
-Expressions/FLWORExpr/ForExpr/ForExprWithout//K-ForExprWithout-31, EXPECTED_ERROR_GOT_SAME_ERROR
-Expressions/FLWORExpr/ForExpr/ForExprWithout//K-ForExprWithout-32, EXPECTED_ERROR_GOT_SAME_ERROR
-Expressions/FLWORExpr/ForExpr/ForExprWithout//K-ForExprWithout-33, EXPECTED_ERROR_GOT_SAME_ERROR
-Expressions/FLWORExpr/ForExpr/ForExprWithout//K-ForExprWithout-34, EXPECTED_ERROR_GOT_SAME_ERROR
-Expressions/FLWORExpr/ForExpr/ForExprWithout//K-ForExprWithout-35, EXPECTED_ERROR_GOT_SAME_ERROR
-Expressions/FLWORExpr/ForExpr/ForExprWithout//K-ForExprWithout-36, EXPECTED_ERROR_GOT_SAME_ERROR
-Expressions/FLWORExpr/ForExpr/ForExprWithout//K-ForExprWithout-37, EXPECTED_ERROR_GOT_SAME_ERROR
-Expressions/FLWORExpr/ForExpr/ForExprWithout//K-ForExprWithout-38, EXPECTED_ERROR_GOT_SAME_ERROR
-Expressions/FLWORExpr/ForExpr/ForExprWithout//K-ForExprWithout-39, EXPECTED_ERROR_GOT_SAME_ERROR
-Expressions/FLWORExpr/ForExpr/ForExprWithout//K-ForExprWithout-4, EXPECTED_ERROR_GOT_SAME_ERROR
-Expressions/FLWORExpr/ForExpr/ForExprWithout//K-ForExprWithout-40, EXPECTED_ERROR_GOT_SAME_ERROR
-Expressions/FLWORExpr/ForExpr/ForExprWithout//K-ForExprWithout-41, EXPECTED_ERROR_GOT_SAME_ERROR
-Expressions/FLWORExpr/ForExpr/ForExprWithout//K-ForExprWithout-42, EXPECTED_ERROR_GOT_SAME_ERROR
-Expressions/FLWORExpr/ForExpr/ForExprWithout//K-ForExprWithout-43, EXPECTED_ERROR_GOT_SAME_ERROR
-Expressions/FLWORExpr/ForExpr/ForExprWithout//K-ForExprWithout-44, EXPECTED_ERROR_GOT_SAME_ERROR
-Expressions/FLWORExpr/ForExpr/ForExprWithout//K-ForExprWithout-45, EXPECTED_ERROR_GOT_SAME_ERROR
-Expressions/FLWORExpr/ForExpr/ForExprWithout//K-ForExprWithout-46, EXPECTED_ERROR_GOT_SAME_ERROR
-Expressions/FLWORExpr/ForExpr/ForExprWithout//K-ForExprWithout-47, EXPECTED_ERROR_GOT_SAME_ERROR
-Expressions/FLWORExpr/ForExpr/ForExprWithout//K-ForExprWithout-48, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/FLWORExpr/ForExpr/ForExprWithout//K-ForExprWithout-49, EXPECTED_RESULT_GOT_ERROR
-Expressions/FLWORExpr/ForExpr/ForExprWithout//K-ForExprWithout-5, EXPECTED_RESULT_GOT_ERROR
-Expressions/FLWORExpr/ForExpr/ForExprWithout//K-ForExprWithout-50, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/FLWORExpr/ForExpr/ForExprWithout//K-ForExprWithout-51, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/FLWORExpr/ForExpr/ForExprWithout//K-ForExprWithout-52, EXPECTED_RESULT_GOT_ERROR
-Expressions/FLWORExpr/ForExpr/ForExprWithout//K-ForExprWithout-53, EXPECTED_RESULT_GOT_FAILURE
-Expressions/FLWORExpr/ForExpr/ForExprWithout//K-ForExprWithout-54, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/FLWORExpr/ForExpr/ForExprWithout//K-ForExprWithout-55, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/FLWORExpr/ForExpr/ForExprWithout//K-ForExprWithout-56, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/FLWORExpr/ForExpr/ForExprWithout//K-ForExprWithout-6, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/FLWORExpr/ForExpr/ForExprWithout//K-ForExprWithout-7, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/FLWORExpr/ForExpr/ForExprWithout//K-ForExprWithout-8, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/FLWORExpr/ForExpr/ForExprWithout//K-ForExprWithout-9, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/FLWORExpr/ForExprType//ForExprType001, EXPECTED_RESULT_GOT_ERROR
-Expressions/FLWORExpr/ForExprType//ForExprType002, EXPECTED_RESULT_GOT_FAILURE
-Expressions/FLWORExpr/ForExprType//ForExprType003, EXPECTED_RESULT_GOT_FAILURE
-Expressions/FLWORExpr/ForExprType//ForExprType004, EXPECTED_RESULT_GOT_FAILURE
-Expressions/FLWORExpr/ForExprType//ForExprType005, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/FLWORExpr/ForExprType//ForExprType006, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
-Expressions/FLWORExpr/ForExprType//ForExprType007, EXPECTED_ERROR_GOT_SAME_ERROR
-Expressions/FLWORExpr/ForExprType//ForExprType008, EXPECTED_ERROR_GOT_SAME_ERROR
-Expressions/FLWORExpr/ForExprType//ForExprType009, EXPECTED_RESULT_GOT_FAILURE
-Expressions/FLWORExpr/ForExprType//ForExprType010, EXPECTED_RESULT_GOT_FAILURE
-Expressions/FLWORExpr/ForExprType//ForExprType011, EXPECTED_ERROR_GOT_SAME_ERROR
-Expressions/FLWORExpr/ForExprType//ForExprType012, EXPECTED_ERROR_GOT_SAME_ERROR
-Expressions/FLWORExpr/ForExprType//ForExprType013, EXPECTED_ERROR_GOT_SAME_ERROR
-Expressions/FLWORExpr/ForExprType//ForExprType014, EXPECTED_ERROR_GOT_FAILURE
-Expressions/FLWORExpr/ForExprType//ForExprType015, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/FLWORExpr/ForExprType//ForExprType016, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/FLWORExpr/ForExprType//ForExprType017, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
-Expressions/FLWORExpr/ForExprType//ForExprType018, EXPECTED_RESULT_GOT_FAILURE
-Expressions/FLWORExpr/ForExprType//ForExprType019, EXPECTED_RESULT_GOT_FAILURE
-Expressions/FLWORExpr/ForExprType//ForExprType020, EXPECTED_RESULT_GOT_FAILURE
-Expressions/FLWORExpr/ForExprType//ForExprType021, EXPECTED_RESULT_GOT_FAILURE
-Expressions/FLWORExpr/ForExprType//ForExprType022, EXPECTED_RESULT_GOT_FAILURE
-Expressions/FLWORExpr/ForExprType//ForExprType023, EXPECTED_RESULT_GOT_FAILURE
-Expressions/FLWORExpr/ForExprType//ForExprType024, EXPECTED_RESULT_GOT_FAILURE
-Expressions/FLWORExpr/ForExprType//ForExprType028, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/FLWORExpr/ForExprType//ForExprType029, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/FLWORExpr/ForExprType//ForExprType030, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/FLWORExpr/ForExprType//ForExprType031, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/FLWORExpr/ForExprType//ForExprType032, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/FLWORExpr/ForExprType//ForExprType033, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/FLWORExpr/ForExprType//ForExprType034, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/FLWORExpr/ForExprType//ForExprType035, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/FLWORExpr/ForExprType//ForExprType036, EXPECTED_RESULT_GOT_FAILURE
-Expressions/FLWORExpr/ForExprType//ForExprType045, EXPECTED_ERROR_GOT_SAME_ERROR
-Expressions/FLWORExpr/ForExprType//ForExprType046, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
-Expressions/FLWORExpr/ForExprType//ForExprType047, EXPECTED_ERROR_GOT_SAME_ERROR
-Expressions/FLWORExpr/ForExprType//ForExprType054, EXPECTED_RESULT_GOT_FAILURE
-Expressions/FLWORExpr/ForExprType//ForExprType055, EXPECTED_RESULT_GOT_FAILURE
-Expressions/FLWORExpr/ForExprType//ForExprType056, EXPECTED_RESULT_GOT_FAILURE
-Expressions/FLWORExpr/ForExprType//ForExprType057, EXPECTED_RESULT_GOT_FAILURE
-Expressions/FLWORExpr/ForExprType//ForExprType058, EXPECTED_RESULT_GOT_FAILURE
-Expressions/FLWORExpr/ForExprType//ForExprType059, EXPECTED_RESULT_GOT_FAILURE
-Expressions/FLWORExpr/ForExprType//ForExprType060, EXPECTED_RESULT_GOT_FAILURE
-Expressions/FLWORExpr/ForExprType//ForExprType061, EXPECTED_ERROR_GOT_FAILURE
-Expressions/FLWORExpr/ForExprType//ForExprType062, EXPECTED_RESULT_GOT_FAILURE
-Expressions/FLWORExpr/ForExprType//ForExprType063, EXPECTED_ERROR_GOT_FAILURE
-Expressions/FLWORExpr/ForExprType//ForExprType064, EXPECTED_ERROR_GOT_FAILURE
-Expressions/FLWORExpr/ForExprType//ForExprType065, EXPECTED_ERROR_GOT_FAILURE
-Expressions/FLWORExpr/ForExprType//ForExprType066, EXPECTED_ERROR_GOT_FAILURE
-Expressions/FLWORExpr/ForExprType//ForExprType067, EXPECTED_ERROR_GOT_FAILURE
-Expressions/FLWORExpr/ForExprType//ForExprType068, EXPECTED_ERROR_GOT_FAILURE
-Expressions/FLWORExpr/ForExprType//ForExprType069, EXPECTED_ERROR_GOT_FAILURE
-Expressions/FLWORExpr/ForExprType//ForExprType070, EXPECTED_ERROR_GOT_FAILURE
-Expressions/FLWORExpr/ForExprType//ForExprType071, EXPECTED_ERROR_GOT_FAILURE
-Expressions/FLWORExpr/ForExprType//ForExprType072, EXPECTED_ERROR_GOT_FAILURE
-Expressions/FLWORExpr/ForExprType//ForExprType073, EXPECTED_ERROR_GOT_FAILURE
-Expressions/FLWORExpr/LetExpr//LetExpr001, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/FLWORExpr/LetExpr//LetExpr002, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/FLWORExpr/LetExpr//LetExpr003, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/FLWORExpr/LetExpr//LetExpr004, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/FLWORExpr/LetExpr//LetExpr005, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/FLWORExpr/LetExpr//LetExpr006, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/FLWORExpr/LetExpr//LetExpr007, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/FLWORExpr/LetExpr//LetExpr008, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/FLWORExpr/LetExpr//LetExpr009, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/FLWORExpr/LetExpr//LetExpr010, EXPECTED_ERROR_GOT_SAME_ERROR
-Expressions/FLWORExpr/LetExpr//LetExpr011, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/FLWORExpr/LetExpr//LetExpr012, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/FLWORExpr/LetExpr//LetExpr013, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/FLWORExpr/LetExpr//LetExpr014, EXPECTED_ERROR_GOT_SAME_ERROR
-Expressions/FLWORExpr/LetExpr//LetExpr015, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/FLWORExpr/LetExpr//LetExpr016, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/FLWORExpr/LetExpr//LetExpr017, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/FLWORExpr/LetExpr//LetExpr018, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
-Expressions/FLWORExpr/LetExpr//LetExpr019, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/FLWORExpr/LetExpr//LetExpr020, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/FLWORExpr/LetExpr//LetExpr021, EXPECTED_ERROR_GOT_SAME_ERROR
-Expressions/FLWORExpr/LetExpr//xquery10keywords, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/FLWORExpr/LetExpr//xquery10keywords2, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/FLWORExpr/LetExpr//xquery10keywords3, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/FLWORExpr/LetExpr//xquery11keywords, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/FLWORExpr/LetExpr//xquery11keywords2, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/FLWORExpr/LetExpr//xquery11keywords3, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/FLWORExpr/LetExpr/LetExprWithout//K-LetExprWithout-1, EXPECTED_ERROR_GOT_SAME_ERROR
-Expressions/FLWORExpr/LetExpr/LetExprWithout//K-LetExprWithout-2, EXPECTED_ERROR_GOT_SAME_ERROR
-Expressions/FLWORExpr/LetExpr/LetExprWithout//K-LetExprWithout-3, EXPECTED_ERROR_GOT_SAME_ERROR
-Expressions/FLWORExpr/LetExpr/LetExprWithout//K-LetExprWithout-4, EXPECTED_RESULT_GOT_ERROR
-Expressions/FLWORExpr/LetExprWith//letexprwith-1, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
-Expressions/FLWORExpr/LetExprWith//letexprwith-10, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/FLWORExpr/LetExprWith//letexprwith-11, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/FLWORExpr/LetExprWith//letexprwith-12, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/FLWORExpr/LetExprWith//letexprwith-13, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/FLWORExpr/LetExprWith//letexprwith-14, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/FLWORExpr/LetExprWith//letexprwith-15, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/FLWORExpr/LetExprWith//letexprwith-16, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/FLWORExpr/LetExprWith//letexprwith-17, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/FLWORExpr/LetExprWith//letexprwith-18, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/FLWORExpr/LetExprWith//letexprwith-19, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/FLWORExpr/LetExprWith//letexprwith-2, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/FLWORExpr/LetExprWith//letexprwith-20, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/FLWORExpr/LetExprWith//letexprwith-21, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/FLWORExpr/LetExprWith//letexprwith-22, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/FLWORExpr/LetExprWith//letexprwith-23, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/FLWORExpr/LetExprWith//letexprwith-24, EXPECTED_RESULT_GOT_FAILURE
-Expressions/FLWORExpr/LetExprWith//letexprwith-3, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/FLWORExpr/LetExprWith//letexprwith-4, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/FLWORExpr/LetExprWith//letexprwith-5, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/FLWORExpr/LetExprWith//letexprwith-6, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/FLWORExpr/LetExprWith//letexprwith-7, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/FLWORExpr/LetExprWith//letexprwith-8, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/FLWORExpr/LetExprWith//letexprwith-9, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/FLWORExpr/OrderbyExpr/OrderbyExprWith//orderBy1, EXPECTED_RESULT_GOT_FAILURE
-Expressions/FLWORExpr/OrderbyExpr/OrderbyExprWith//orderBy10, EXPECTED_RESULT_GOT_FAILURE
-Expressions/FLWORExpr/OrderbyExpr/OrderbyExprWith//orderBy11, EXPECTED_RESULT_GOT_FAILURE
-Expressions/FLWORExpr/OrderbyExpr/OrderbyExprWith//orderBy12, EXPECTED_RESULT_GOT_FAILURE
-Expressions/FLWORExpr/OrderbyExpr/OrderbyExprWith//orderBy13, EXPECTED_RESULT_GOT_FAILURE
-Expressions/FLWORExpr/OrderbyExpr/OrderbyExprWith//orderBy14, EXPECTED_RESULT_GOT_ERROR
-Expressions/FLWORExpr/OrderbyExpr/OrderbyExprWith//orderBy15, EXPECTED_RESULT_GOT_ERROR
-Expressions/FLWORExpr/OrderbyExpr/OrderbyExprWith//orderBy16, EXPECTED_RESULT_GOT_FAILURE
-Expressions/FLWORExpr/OrderbyExpr/OrderbyExprWith//orderBy17, EXPECTED_RESULT_GOT_FAILURE
-Expressions/FLWORExpr/OrderbyExpr/OrderbyExprWith//orderBy18, EXPECTED_RESULT_GOT_FAILURE
-Expressions/FLWORExpr/OrderbyExpr/OrderbyExprWith//orderBy19, EXPECTED_RESULT_GOT_FAILURE
-Expressions/FLWORExpr/OrderbyExpr/OrderbyExprWith//orderBy2, EXPECTED_RESULT_GOT_FAILURE
-Expressions/FLWORExpr/OrderbyExpr/OrderbyExprWith//orderBy20, EXPECTED_RESULT_GOT_FAILURE
-Expressions/FLWORExpr/OrderbyExpr/OrderbyExprWith//orderBy21, EXPECTED_RESULT_GOT_FAILURE
-Expressions/FLWORExpr/OrderbyExpr/OrderbyExprWith//orderBy22, EXPECTED_RESULT_GOT_FAILURE
-Expressions/FLWORExpr/OrderbyExpr/OrderbyExprWith//orderBy23, EXPECTED_RESULT_GOT_ERROR
-Expressions/FLWORExpr/OrderbyExpr/OrderbyExprWith//orderBy24, EXPECTED_RESULT_GOT_ERROR
-Expressions/FLWORExpr/OrderbyExpr/OrderbyExprWith//orderBy25, EXPECTED_RESULT_GOT_FAILURE
-Expressions/FLWORExpr/OrderbyExpr/OrderbyExprWith//orderBy26, EXPECTED_RESULT_GOT_FAILURE
-Expressions/FLWORExpr/OrderbyExpr/OrderbyExprWith//orderBy27, EXPECTED_RESULT_GOT_FAILURE
-Expressions/FLWORExpr/OrderbyExpr/OrderbyExprWith//orderBy28, EXPECTED_RESULT_GOT_FAILURE
-Expressions/FLWORExpr/OrderbyExpr/OrderbyExprWith//orderBy29, EXPECTED_RESULT_GOT_FAILURE
-Expressions/FLWORExpr/OrderbyExpr/OrderbyExprWith//orderBy3, EXPECTED_RESULT_GOT_FAILURE
-Expressions/FLWORExpr/OrderbyExpr/OrderbyExprWith//orderBy30, EXPECTED_RESULT_GOT_FAILURE
-Expressions/FLWORExpr/OrderbyExpr/OrderbyExprWith//orderBy31, EXPECTED_RESULT_GOT_FAILURE
-Expressions/FLWORExpr/OrderbyExpr/OrderbyExprWith//orderBy32, EXPECTED_RESULT_GOT_FAILURE
-Expressions/FLWORExpr/OrderbyExpr/OrderbyExprWith//orderBy33, EXPECTED_RESULT_GOT_ERROR
-Expressions/FLWORExpr/OrderbyExpr/OrderbyExprWith//orderBy34, EXPECTED_RESULT_GOT_ERROR
-Expressions/FLWORExpr/OrderbyExpr/OrderbyExprWith//orderBy35, EXPECTED_RESULT_GOT_FAILURE
-Expressions/FLWORExpr/OrderbyExpr/OrderbyExprWith//orderBy36, EXPECTED_RESULT_GOT_FAILURE
-Expressions/FLWORExpr/OrderbyExpr/OrderbyExprWith//orderBy37, EXPECTED_RESULT_GOT_FAILURE
-Expressions/FLWORExpr/OrderbyExpr/OrderbyExprWith//orderBy38, EXPECTED_RESULT_GOT_FAILURE
-Expressions/FLWORExpr/OrderbyExpr/OrderbyExprWith//orderBy39, EXPECTED_RESULT_GOT_FAILURE
-Expressions/FLWORExpr/OrderbyExpr/OrderbyExprWith//orderBy4, EXPECTED_RESULT_GOT_FAILURE
-Expressions/FLWORExpr/OrderbyExpr/OrderbyExprWith//orderBy40, EXPECTED_RESULT_GOT_FAILURE
-Expressions/FLWORExpr/OrderbyExpr/OrderbyExprWith//orderBy41, EXPECTED_RESULT_GOT_FAILURE
-Expressions/FLWORExpr/OrderbyExpr/OrderbyExprWith//orderBy42, EXPECTED_RESULT_GOT_FAILURE
-Expressions/FLWORExpr/OrderbyExpr/OrderbyExprWith//orderBy43, EXPECTED_RESULT_GOT_ERROR
-Expressions/FLWORExpr/OrderbyExpr/OrderbyExprWith//orderBy44, EXPECTED_RESULT_GOT_ERROR
-Expressions/FLWORExpr/OrderbyExpr/OrderbyExprWith//orderBy45, EXPECTED_RESULT_GOT_FAILURE
-Expressions/FLWORExpr/OrderbyExpr/OrderbyExprWith//orderBy46, EXPECTED_RESULT_GOT_FAILURE
-Expressions/FLWORExpr/OrderbyExpr/OrderbyExprWith//orderBy47, EXPECTED_RESULT_GOT_FAILURE
-Expressions/FLWORExpr/OrderbyExpr/OrderbyExprWith//orderBy49, EXPECTED_RESULT_GOT_FAILURE
-Expressions/FLWORExpr/OrderbyExpr/OrderbyExprWith//orderBy5, EXPECTED_RESULT_GOT_FAILURE
-Expressions/FLWORExpr/OrderbyExpr/OrderbyExprWith//orderBy50, EXPECTED_RESULT_GOT_FAILURE
-Expressions/FLWORExpr/OrderbyExpr/OrderbyExprWith//orderBy51, EXPECTED_RESULT_GOT_FAILURE
-Expressions/FLWORExpr/OrderbyExpr/OrderbyExprWith//orderBy52, EXPECTED_RESULT_GOT_FAILURE
-Expressions/FLWORExpr/OrderbyExpr/OrderbyExprWith//orderBy53, EXPECTED_RESULT_GOT_ERROR
-Expressions/FLWORExpr/OrderbyExpr/OrderbyExprWith//orderBy54, EXPECTED_RESULT_GOT_ERROR
-Expressions/FLWORExpr/OrderbyExpr/OrderbyExprWith//orderBy55, EXPECTED_RESULT_GOT_FAILURE
-Expressions/FLWORExpr/OrderbyExpr/OrderbyExprWith//orderBy56, EXPECTED_RESULT_GOT_FAILURE
-Expressions/FLWORExpr/OrderbyExpr/OrderbyExprWith//orderBy57, EXPECTED_RESULT_GOT_FAILURE
-Expressions/FLWORExpr/OrderbyExpr/OrderbyExprWith//orderBy59, EXPECTED_RESULT_GOT_FAILURE
-Expressions/FLWORExpr/OrderbyExpr/OrderbyExprWith//orderBy6, EXPECTED_RESULT_GOT_FAILURE
-Expressions/FLWORExpr/OrderbyExpr/OrderbyExprWith//orderBy60, EXPECTED_RESULT_GOT_FAILURE
-Expressions/FLWORExpr/OrderbyExpr/OrderbyExprWith//orderBy61, EXPECTED_RESULT_GOT_FAILURE
-Expressions/FLWORExpr/OrderbyExpr/OrderbyExprWith//orderBy62, EXPECTED_RESULT_GOT_FAILURE
-Expressions/FLWORExpr/OrderbyExpr/OrderbyExprWith//orderBy7, EXPECTED_RESULT_GOT_FAILURE
-Expressions/FLWORExpr/OrderbyExpr/OrderbyExprWith//orderBy8, EXPECTED_RESULT_GOT_FAILURE
-Expressions/FLWORExpr/OrderbyExpr/OrderbyExprWith//orderBy9, EXPECTED_RESULT_GOT_FAILURE
-Expressions/FLWORExpr/OrderbyExpr/OrderbyExprWith//orderbylocal-1, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/FLWORExpr/OrderbyExpr/OrderbyExprWith//orderbylocal-10, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/FLWORExpr/OrderbyExpr/OrderbyExprWith//orderbylocal-11, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/FLWORExpr/OrderbyExpr/OrderbyExprWith//orderbylocal-12, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/FLWORExpr/OrderbyExpr/OrderbyExprWith//orderbylocal-16, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/FLWORExpr/OrderbyExpr/OrderbyExprWith//orderbylocal-17, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/FLWORExpr/OrderbyExpr/OrderbyExprWith//orderbylocal-18, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/FLWORExpr/OrderbyExpr/OrderbyExprWith//orderbylocal-19, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/FLWORExpr/OrderbyExpr/OrderbyExprWith//orderbylocal-2, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/FLWORExpr/OrderbyExpr/OrderbyExprWith//orderbylocal-20, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/FLWORExpr/OrderbyExpr/OrderbyExprWith//orderbylocal-21, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/FLWORExpr/OrderbyExpr/OrderbyExprWith//orderbylocal-22, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/FLWORExpr/OrderbyExpr/OrderbyExprWith//orderbylocal-25, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/FLWORExpr/OrderbyExpr/OrderbyExprWith//orderbylocal-26, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/FLWORExpr/OrderbyExpr/OrderbyExprWith//orderbylocal-27, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/FLWORExpr/OrderbyExpr/OrderbyExprWith//orderbylocal-28, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/FLWORExpr/OrderbyExpr/OrderbyExprWith//orderbylocal-29, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/FLWORExpr/OrderbyExpr/OrderbyExprWith//orderbylocal-3, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/FLWORExpr/OrderbyExpr/OrderbyExprWith//orderbylocal-30, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/FLWORExpr/OrderbyExpr/OrderbyExprWith//orderbylocal-31, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/FLWORExpr/OrderbyExpr/OrderbyExprWith//orderbylocal-32, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/FLWORExpr/OrderbyExpr/OrderbyExprWith//orderbylocal-35, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/FLWORExpr/OrderbyExpr/OrderbyExprWith//orderbylocal-36, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/FLWORExpr/OrderbyExpr/OrderbyExprWith//orderbylocal-37, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/FLWORExpr/OrderbyExpr/OrderbyExprWith//orderbylocal-38, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/FLWORExpr/OrderbyExpr/OrderbyExprWith//orderbylocal-39, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/FLWORExpr/OrderbyExpr/OrderbyExprWith//orderbylocal-4, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/FLWORExpr/OrderbyExpr/OrderbyExprWith//orderbylocal-40, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/FLWORExpr/OrderbyExpr/OrderbyExprWith//orderbylocal-41, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/FLWORExpr/OrderbyExpr/OrderbyExprWith//orderbylocal-42, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/FLWORExpr/OrderbyExpr/OrderbyExprWith//orderbylocal-43, EXPECTED_RESULT_GOT_ERROR
-Expressions/FLWORExpr/OrderbyExpr/OrderbyExprWith//orderbylocal-44, EXPECTED_RESULT_GOT_ERROR
-Expressions/FLWORExpr/OrderbyExpr/OrderbyExprWith//orderbylocal-45, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/FLWORExpr/OrderbyExpr/OrderbyExprWith//orderbylocal-46, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/FLWORExpr/OrderbyExpr/OrderbyExprWith//orderbylocal-47, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/FLWORExpr/OrderbyExpr/OrderbyExprWith//orderbylocal-49, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/FLWORExpr/OrderbyExpr/OrderbyExprWith//orderbylocal-5, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/FLWORExpr/OrderbyExpr/OrderbyExprWith//orderbylocal-50, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/FLWORExpr/OrderbyExpr/OrderbyExprWith//orderbylocal-51, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/FLWORExpr/OrderbyExpr/OrderbyExprWith//orderbylocal-52, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/FLWORExpr/OrderbyExpr/OrderbyExprWith//orderbylocal-55, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/FLWORExpr/OrderbyExpr/OrderbyExprWith//orderbylocal-56, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/FLWORExpr/OrderbyExpr/OrderbyExprWith//orderbylocal-57, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/FLWORExpr/OrderbyExpr/OrderbyExprWith//orderbylocal-59, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/FLWORExpr/OrderbyExpr/OrderbyExprWith//orderbylocal-6, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/FLWORExpr/OrderbyExpr/OrderbyExprWith//orderbylocal-60, EXPECTED_ERROR_GOT_RESULT
-Expressions/FLWORExpr/OrderbyExpr/OrderbyExprWith//orderbylocal-7, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/FLWORExpr/OrderbyExpr/OrderbyExprWith//orderbylocal-8, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/FLWORExpr/OrderbyExpr/OrderbyExprWith//orderbylocal-9, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/FLWORExpr/OrderbyExpr/OrderbyExprWithout//orderbywithout-1, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/FLWORExpr/OrderbyExpr/OrderbyExprWithout//orderbywithout-10, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/FLWORExpr/OrderbyExpr/OrderbyExprWithout//orderbywithout-11, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/FLWORExpr/OrderbyExpr/OrderbyExprWithout//orderbywithout-12, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/FLWORExpr/OrderbyExpr/OrderbyExprWithout//orderbywithout-13, EXPECTED_RESULT_GOT_ERROR
-Expressions/FLWORExpr/OrderbyExpr/OrderbyExprWithout//orderbywithout-14, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/FLWORExpr/OrderbyExpr/OrderbyExprWithout//orderbywithout-15, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/FLWORExpr/OrderbyExpr/OrderbyExprWithout//orderbywithout-16, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/FLWORExpr/OrderbyExpr/OrderbyExprWithout//orderbywithout-17, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/FLWORExpr/OrderbyExpr/OrderbyExprWithout//orderbywithout-18, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/FLWORExpr/OrderbyExpr/OrderbyExprWithout//orderbywithout-19, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/FLWORExpr/OrderbyExpr/OrderbyExprWithout//orderbywithout-2, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/FLWORExpr/OrderbyExpr/OrderbyExprWithout//orderbywithout-20, EXPECTED_RESULT_GOT_ERROR
-Expressions/FLWORExpr/OrderbyExpr/OrderbyExprWithout//orderbywithout-21, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/FLWORExpr/OrderbyExpr/OrderbyExprWithout//orderbywithout-22, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/FLWORExpr/OrderbyExpr/OrderbyExprWithout//orderbywithout-23, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/FLWORExpr/OrderbyExpr/OrderbyExprWithout//orderbywithout-24, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/FLWORExpr/OrderbyExpr/OrderbyExprWithout//orderbywithout-25, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/FLWORExpr/OrderbyExpr/OrderbyExprWithout//orderbywithout-26, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/FLWORExpr/OrderbyExpr/OrderbyExprWithout//orderbywithout-27, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/FLWORExpr/OrderbyExpr/OrderbyExprWithout//orderbywithout-28, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/FLWORExpr/OrderbyExpr/OrderbyExprWithout//orderbywithout-29, EXPECTED_RESULT_GOT_ERROR
-Expressions/FLWORExpr/OrderbyExpr/OrderbyExprWithout//orderbywithout-3, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/FLWORExpr/OrderbyExpr/OrderbyExprWithout//orderbywithout-30, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/FLWORExpr/OrderbyExpr/OrderbyExprWithout//orderbywithout-31, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/FLWORExpr/OrderbyExpr/OrderbyExprWithout//orderbywithout-32, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/FLWORExpr/OrderbyExpr/OrderbyExprWithout//orderbywithout-33, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/FLWORExpr/OrderbyExpr/OrderbyExprWithout//orderbywithout-34, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/FLWORExpr/OrderbyExpr/OrderbyExprWithout//orderbywithout-35, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/FLWORExpr/OrderbyExpr/OrderbyExprWithout//orderbywithout-36, EXPECTED_RESULT_GOT_ERROR
-Expressions/FLWORExpr/OrderbyExpr/OrderbyExprWithout//orderbywithout-37, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/FLWORExpr/OrderbyExpr/OrderbyExprWithout//orderbywithout-38, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/FLWORExpr/OrderbyExpr/OrderbyExprWithout//orderbywithout-39, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/FLWORExpr/OrderbyExpr/OrderbyExprWithout//orderbywithout-4, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/FLWORExpr/OrderbyExpr/OrderbyExprWithout//orderbywithout-40, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/FLWORExpr/OrderbyExpr/OrderbyExprWithout//orderbywithout-5, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/FLWORExpr/OrderbyExpr/OrderbyExprWithout//orderbywithout-6, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/FLWORExpr/OrderbyExpr/OrderbyExprWithout//orderbywithout-7, EXPECTED_RESULT_GOT_ERROR
-Expressions/FLWORExpr/OrderbyExpr/OrderbyExprWithout//orderbywithout-8, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/FLWORExpr/OrderbyExpr/OrderbyExprWithout//orderbywithout-9, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/FLWORExpr/ReturnExpr//ReturnExpr001, EXPECTED_RESULT_GOT_FAILURE
-Expressions/FLWORExpr/ReturnExpr//ReturnExpr002, EXPECTED_RESULT_GOT_FAILURE
-Expressions/FLWORExpr/ReturnExpr//ReturnExpr003, EXPECTED_RESULT_GOT_FAILURE
-Expressions/FLWORExpr/ReturnExpr//ReturnExpr004, EXPECTED_RESULT_GOT_FAILURE
-Expressions/FLWORExpr/ReturnExpr//ReturnExpr005, EXPECTED_RESULT_GOT_FAILURE
-Expressions/FLWORExpr/ReturnExpr//ReturnExpr006, EXPECTED_RESULT_GOT_FAILURE
-Expressions/FLWORExpr/ReturnExpr//ReturnExpr007, EXPECTED_RESULT_GOT_ERROR
-Expressions/FLWORExpr/ReturnExpr//ReturnExpr008, EXPECTED_RESULT_GOT_FAILURE
-Expressions/FLWORExpr/ReturnExpr//ReturnExpr009, EXPECTED_RESULT_GOT_FAILURE
-Expressions/FLWORExpr/ReturnExpr//ReturnExpr010, EXPECTED_ERROR_GOT_FAILURE
-Expressions/FLWORExpr/ReturnExpr//ReturnExpr011, EXPECTED_RESULT_GOT_FAILURE
-Expressions/FLWORExpr/ReturnExpr//ReturnExpr012, EXPECTED_ERROR_GOT_SAME_ERROR
-Expressions/FLWORExpr/ReturnExpr//ReturnExpr013, EXPECTED_ERROR_GOT_SAME_ERROR
-Expressions/FLWORExpr/ReturnExpr//ReturnExpr014, EXPECTED_ERROR_GOT_SAME_ERROR
-Expressions/FLWORExpr/ReturnExpr//ReturnExpr015, EXPECTED_RESULT_GOT_FAILURE
-Expressions/FLWORExpr/ReturnExpr//ReturnExpr016, EXPECTED_RESULT_GOT_FAILURE
-Expressions/FLWORExpr/ReturnExpr//ReturnExpr017, EXPECTED_RESULT_GOT_FAILURE
-Expressions/FLWORExpr/ReturnExpr//ReturnExpr018, EXPECTED_RESULT_GOT_FAILURE
-Expressions/FLWORExpr/ReturnExpr//ReturnExpr019, EXPECTED_ERROR_GOT_SAME_ERROR
-Expressions/FLWORExpr/ReturnExpr//ReturnExpr020, EXPECTED_RESULT_GOT_FAILURE
-Expressions/FLWORExpr/WhereExpr//K-WhereExpr-1, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/FLWORExpr/WhereExpr//K-WhereExpr-10, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/FLWORExpr/WhereExpr//K-WhereExpr-11, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/FLWORExpr/WhereExpr//K-WhereExpr-2, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/FLWORExpr/WhereExpr//K-WhereExpr-3, EXPECTED_ERROR_GOT_SAME_ERROR
-Expressions/FLWORExpr/WhereExpr//K-WhereExpr-4, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/FLWORExpr/WhereExpr//K-WhereExpr-5, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/FLWORExpr/WhereExpr//K-WhereExpr-6, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/FLWORExpr/WhereExpr//K-WhereExpr-7, EXPECTED_RESULT_GOT_ERROR
-Expressions/FLWORExpr/WhereExpr//K-WhereExpr-8, EXPECTED_RESULT_GOT_ERROR
-Expressions/FLWORExpr/WhereExpr//K-WhereExpr-9, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/FLWORExpr/WhereExpr//WhereExpr001, EXPECTED_RESULT_GOT_FAILURE
-Expressions/FLWORExpr/WhereExpr//WhereExpr002, EXPECTED_ERROR_GOT_SAME_ERROR
-Expressions/FLWORExpr/WhereExpr//WhereExpr003, EXPECTED_RESULT_GOT_FAILURE
-Expressions/FLWORExpr/WhereExpr//WhereExpr004, EXPECTED_RESULT_GOT_FAILURE
-Expressions/FLWORExpr/WhereExpr//WhereExpr005, EXPECTED_ERROR_GOT_RESULT
-Expressions/FLWORExpr/WhereExpr//WhereExpr006, EXPECTED_RESULT_GOT_FAILURE
-Expressions/FLWORExpr/WhereExpr//WhereExpr007, EXPECTED_RESULT_GOT_FAILURE
-Expressions/FLWORExpr/WhereExpr//WhereExpr008, EXPECTED_ERROR_GOT_RESULT
-Expressions/FLWORExpr/WhereExpr//WhereExpr009, EXPECTED_RESULT_GOT_FAILURE
-Expressions/FLWORExpr/WhereExpr//WhereExpr010, EXPECTED_ERROR_GOT_FAILURE
-Expressions/FLWORExpr/WhereExpr//WhereExpr013, EXPECTED_RESULT_GOT_FAILURE
-Expressions/FLWORExpr/WhereExpr//WhereExpr014, EXPECTED_RESULT_GOT_FAILURE
-Expressions/FLWORExpr/WhereExpr//WhereExpr015, EXPECTED_ERROR_GOT_RESULT
-Expressions/FLWORExpr/WhereExpr//WhereExpr016, EXPECTED_RESULT_GOT_FAILURE
-Expressions/FLWORExpr/WhereExpr//WhereExpr017, EXPECTED_ERROR_GOT_SAME_ERROR
-Expressions/FLWORExpr/WhereExpr//WhereExpr018, EXPECTED_ERROR_GOT_SAME_ERROR
-Expressions/FLWORExpr/WhereExpr//WhereExpr019, EXPECTED_ERROR_GOT_SAME_ERROR
-Expressions/FLWORExpr/WhereExpr//WhereExpr020, EXPECTED_ERROR_GOT_SAME_ERROR
-Expressions/FLWORExpr/WhereExpr//whereClause-1, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/FLWORExpr/WhereExpr//whereClause-10, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/FLWORExpr/WhereExpr//whereClause-11, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/FLWORExpr/WhereExpr//whereClause-2, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/FLWORExpr/WhereExpr//whereClause-3, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/FLWORExpr/WhereExpr//whereClause-4, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/FLWORExpr/WhereExpr//whereClause-5, EXPECTED_RESULT_GOT_FAILURE
-Expressions/FLWORExpr/WhereExpr//whereClause-6, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/FLWORExpr/WhereExpr//whereClause-7, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/FLWORExpr/WhereExpr//whereClause-8, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/FLWORExpr/WhereExpr//whereClause-9, EXPECTED_RESULT_GOT_ERROR
-Expressions/FunctionCallExpr//K2-FunctionCallExpr-1, EXPECTED_RESULT_GOT_ERROR
-Expressions/FunctionCallExpr//K2-FunctionCallExpr-10, EXPECTED_RESULT_GOT_ERROR
-Expressions/FunctionCallExpr//K2-FunctionCallExpr-11, EXPECTED_RESULT_GOT_ERROR
-Expressions/FunctionCallExpr//K2-FunctionCallExpr-12, EXPECTED_RESULT_GOT_ERROR
-Expressions/FunctionCallExpr//K2-FunctionCallExpr-13, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/FunctionCallExpr//K2-FunctionCallExpr-2, EXPECTED_ERROR_GOT_SAME_ERROR
-Expressions/FunctionCallExpr//K2-FunctionCallExpr-3, EXPECTED_ERROR_GOT_SAME_ERROR
-Expressions/FunctionCallExpr//K2-FunctionCallExpr-4, EXPECTED_ERROR_GOT_SAME_ERROR
-Expressions/FunctionCallExpr//K2-FunctionCallExpr-5, EXPECTED_ERROR_GOT_SAME_ERROR
-Expressions/FunctionCallExpr//K2-FunctionCallExpr-6, EXPECTED_ERROR_GOT_SAME_ERROR
-Expressions/FunctionCallExpr//K2-FunctionCallExpr-7, EXPECTED_ERROR_GOT_SAME_ERROR
-Expressions/FunctionCallExpr//K2-FunctionCallExpr-8, EXPECTED_ERROR_GOT_SAME_ERROR
-Expressions/FunctionCallExpr//K2-FunctionCallExpr-9, EXPECTED_ERROR_GOT_SAME_ERROR
-Expressions/HigherOrder//hof-001, EXPECTED_ERROR_GOT_SAME_ERROR
-Expressions/HigherOrder//hof-002, EXPECTED_ERROR_GOT_SAME_ERROR
-Expressions/HigherOrder//hof-003, EXPECTED_ERROR_GOT_SAME_ERROR
-Expressions/HigherOrder//hof-004, EXPECTED_ERROR_GOT_SAME_ERROR
-Expressions/HigherOrder//hof-005, EXPECTED_ERROR_GOT_SAME_ERROR
-Expressions/HigherOrder//hof-006, EXPECTED_ERROR_GOT_SAME_ERROR
-Expressions/HigherOrder//hof-007, EXPECTED_ERROR_GOT_SAME_ERROR
-Expressions/HigherOrder//hof-008, EXPECTED_ERROR_GOT_SAME_ERROR
-Expressions/HigherOrder//hof-009, EXPECTED_ERROR_GOT_SAME_ERROR
-Expressions/HigherOrder//hof-010, EXPECTED_ERROR_GOT_SAME_ERROR
-Expressions/HigherOrder//hof-011, EXPECTED_ERROR_GOT_SAME_ERROR
-Expressions/HigherOrder//hof-012, EXPECTED_ERROR_GOT_SAME_ERROR
-Expressions/HigherOrder//hof-013, EXPECTED_ERROR_GOT_SAME_ERROR
-Expressions/HigherOrder//hof-014, EXPECTED_ERROR_GOT_SAME_ERROR
-Expressions/HigherOrder//hof-015, EXPECTED_ERROR_GOT_SAME_ERROR
-Expressions/HigherOrder//hof-016, EXPECTED_ERROR_GOT_SAME_ERROR
-Expressions/HigherOrder//hof-017, EXPECTED_ERROR_GOT_SAME_ERROR
-Expressions/HigherOrder//hof-018, EXPECTED_ERROR_GOT_SAME_ERROR
-Expressions/HigherOrder//hof-019, EXPECTED_ERROR_GOT_SAME_ERROR
-Expressions/HigherOrder//hof-020, EXPECTED_ERROR_GOT_SAME_ERROR
-Expressions/HigherOrder//hof-021, EXPECTED_ERROR_GOT_SAME_ERROR
-Expressions/HigherOrder//hof-022, EXPECTED_ERROR_GOT_SAME_ERROR
-Expressions/HigherOrder//hof-023, EXPECTED_ERROR_GOT_SAME_ERROR
-Expressions/HigherOrder//hof-024, EXPECTED_ERROR_GOT_SAME_ERROR
-Expressions/HigherOrder//hof-025, EXPECTED_ERROR_GOT_SAME_ERROR
-Expressions/HigherOrder//hof-026, EXPECTED_ERROR_GOT_SAME_ERROR
-Expressions/HigherOrder//hof-027, EXPECTED_ERROR_GOT_SAME_ERROR
-Expressions/HigherOrder//hof-028, EXPECTED_ERROR_GOT_SAME_ERROR
-Expressions/HigherOrder//hof-029, EXPECTED_ERROR_GOT_SAME_ERROR
-Expressions/HigherOrder//hof-030, EXPECTED_ERROR_GOT_SAME_ERROR
-Expressions/HigherOrder//hof-031, EXPECTED_ERROR_GOT_SAME_ERROR
-Expressions/HigherOrder//hof-032, EXPECTED_ERROR_GOT_SAME_ERROR
-Expressions/HigherOrder//hof-033, EXPECTED_ERROR_GOT_SAME_ERROR
-Expressions/HigherOrder//hof-034, EXPECTED_ERROR_GOT_SAME_ERROR
-Expressions/HigherOrder//hof-035, EXPECTED_ERROR_GOT_SAME_ERROR
-Expressions/HigherOrder//hof-036, EXPECTED_ERROR_GOT_SAME_ERROR
-Expressions/HigherOrder//hof-037, EXPECTED_ERROR_GOT_SAME_ERROR
-Expressions/HigherOrder//hof-038, EXPECTED_ERROR_GOT_SAME_ERROR
-Expressions/HigherOrder//hof-039, EXPECTED_ERROR_GOT_SAME_ERROR
-Expressions/HigherOrder//hof-040, EXPECTED_ERROR_GOT_SAME_ERROR
-Expressions/HigherOrder//hof-041, EXPECTED_ERROR_GOT_SAME_ERROR
-Expressions/HigherOrder//hof-042, EXPECTED_ERROR_GOT_SAME_ERROR
-Expressions/HigherOrder//hof-043, EXPECTED_ERROR_GOT_SAME_ERROR
-Expressions/HigherOrder//hof-044, EXPECTED_ERROR_GOT_SAME_ERROR
-Expressions/HigherOrder//hof-045, EXPECTED_ERROR_GOT_SAME_ERROR
-Expressions/HigherOrder//hof-046, EXPECTED_ERROR_GOT_SAME_ERROR
-Expressions/HigherOrder//hof-047, EXPECTED_ERROR_GOT_SAME_ERROR
-Expressions/HigherOrder//hof-048, EXPECTED_ERROR_GOT_SAME_ERROR
-Expressions/HigherOrder//hof-901, EXPECTED_ERROR_GOT_SAME_ERROR
-Expressions/HigherOrder//hof-902, EXPECTED_ERROR_GOT_SAME_ERROR
-Expressions/HigherOrder//hof-903, EXPECTED_ERROR_GOT_SAME_ERROR
-Expressions/HigherOrder//hof-904, EXPECTED_ERROR_GOT_SAME_ERROR
-Expressions/HigherOrder//hof-905, EXPECTED_ERROR_GOT_SAME_ERROR
-Expressions/HigherOrder//hof-906, EXPECTED_ERROR_GOT_SAME_ERROR
-Expressions/HigherOrder//hof-907, EXPECTED_ERROR_GOT_SAME_ERROR
-Expressions/HigherOrder//hof-908, EXPECTED_ERROR_GOT_SAME_ERROR
-Expressions/HigherOrder//hof-909, EXPECTED_ERROR_GOT_SAME_ERROR
-Expressions/HigherOrder//hof-910, EXPECTED_ERROR_GOT_SAME_ERROR
-Expressions/HigherOrder//hof-911, EXPECTED_ERROR_GOT_SAME_ERROR
-Expressions/HigherOrder//hof-912, EXPECTED_ERROR_GOT_SAME_ERROR
-Expressions/HigherOrder//hof-913, EXPECTED_ERROR_GOT_SAME_ERROR
-Expressions/HigherOrder//hof-914, EXPECTED_ERROR_GOT_SAME_ERROR
-Expressions/HigherOrder//hof-915, EXPECTED_ERROR_GOT_SAME_ERROR
-Expressions/HigherOrder//hof-916, EXPECTED_ERROR_GOT_SAME_ERROR
-Expressions/HigherOrder//hof-917, EXPECTED_ERROR_GOT_SAME_ERROR
-Expressions/HigherOrder//hof-918, EXPECTED_ERROR_GOT_SAME_ERROR
-Expressions/LogicExpr//K-LogicExpr-1, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/LogicExpr//K-LogicExpr-10, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/LogicExpr//K-LogicExpr-11, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/LogicExpr//K-LogicExpr-12, EXPECTED_RESULT_GOT_ERROR
-Expressions/LogicExpr//K-LogicExpr-13, EXPECTED_RESULT_GOT_ERROR
-Expressions/LogicExpr//K-LogicExpr-14, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/LogicExpr//K-LogicExpr-15, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/LogicExpr//K-LogicExpr-16, EXPECTED_ERROR_GOT_SAME_ERROR
-Expressions/LogicExpr//K-LogicExpr-17, EXPECTED_ERROR_GOT_SAME_ERROR
-Expressions/LogicExpr//K-LogicExpr-18, EXPECTED_ERROR_GOT_SAME_ERROR
-Expressions/LogicExpr//K-LogicExpr-19, EXPECTED_ERROR_GOT_SAME_ERROR
-Expressions/LogicExpr//K-LogicExpr-2, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/LogicExpr//K-LogicExpr-20, EXPECTED_ERROR_GOT_SAME_ERROR
-Expressions/LogicExpr//K-LogicExpr-21, EXPECTED_ERROR_GOT_SAME_ERROR
-Expressions/LogicExpr//K-LogicExpr-22, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/LogicExpr//K-LogicExpr-23, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/LogicExpr//K-LogicExpr-24, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/LogicExpr//K-LogicExpr-25, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/LogicExpr//K-LogicExpr-26, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/LogicExpr//K-LogicExpr-27, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/LogicExpr//K-LogicExpr-28, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/LogicExpr//K-LogicExpr-29, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/LogicExpr//K-LogicExpr-3, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/LogicExpr//K-LogicExpr-30, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/LogicExpr//K-LogicExpr-31, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/LogicExpr//K-LogicExpr-32, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/LogicExpr//K-LogicExpr-33, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/LogicExpr//K-LogicExpr-34, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/LogicExpr//K-LogicExpr-35, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/LogicExpr//K-LogicExpr-36, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/LogicExpr//K-LogicExpr-37, EXPECTED_RESULT_GOT_ERROR
-Expressions/LogicExpr//K-LogicExpr-38, EXPECTED_RESULT_GOT_ERROR
-Expressions/LogicExpr//K-LogicExpr-39, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/LogicExpr//K-LogicExpr-4, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/LogicExpr//K-LogicExpr-40, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/LogicExpr//K-LogicExpr-41, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/LogicExpr//K-LogicExpr-42, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/LogicExpr//K-LogicExpr-43, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/LogicExpr//K-LogicExpr-44, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/LogicExpr//K-LogicExpr-45, EXPECTED_ERROR_GOT_SAME_ERROR
-Expressions/LogicExpr//K-LogicExpr-46, EXPECTED_ERROR_GOT_RESULT
-Expressions/LogicExpr//K-LogicExpr-5, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/LogicExpr//K-LogicExpr-6, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/LogicExpr//K-LogicExpr-7, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/LogicExpr//K-LogicExpr-8, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/LogicExpr//K-LogicExpr-9, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/LogicExpr//op-logical-and-001, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-and-002, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-and-003, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-and-004, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-and-005, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-and-006, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-and-007, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-and-008, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-and-009, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-and-010, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-and-011, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-and-012, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-and-013, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-and-014, EXPECTED_RESULT_GOT_FAILURE
-Expressions/LogicExpr//op-logical-and-015, EXPECTED_RESULT_GOT_FAILURE
-Expressions/LogicExpr//op-logical-and-016, EXPECTED_RESULT_GOT_FAILURE
-Expressions/LogicExpr//op-logical-and-017, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-and-018, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-and-019, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-and-020, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-and-021, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-and-022, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-and-023, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-and-024, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-and-025, EXPECTED_RESULT_GOT_ERROR
-Expressions/LogicExpr//op-logical-and-026, EXPECTED_RESULT_GOT_ERROR
-Expressions/LogicExpr//op-logical-and-027, EXPECTED_RESULT_GOT_ERROR
-Expressions/LogicExpr//op-logical-and-028, EXPECTED_RESULT_GOT_ERROR
-Expressions/LogicExpr//op-logical-and-029, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-and-030, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-and-031, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-and-032, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-and-033, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-and-034, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-and-035, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-and-036, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-and-037, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-and-038, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-and-039, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-and-040, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-and-041, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-and-042, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-and-043, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-and-044, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-and-045, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-and-046, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-and-047, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-and-048, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-and-049, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-and-050, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-and-051, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-and-052, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-and-053, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-and-054, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-and-055, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-and-056, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-and-057, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-and-058, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-and-059, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-and-060, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-and-061, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-and-062, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-and-063, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-and-064, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-and-065, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-and-066, EXPECTED_ERROR_GOT_RESULT
-Expressions/LogicExpr//op-logical-and-067, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-and-068, EXPECTED_ERROR_GOT_RESULT
-Expressions/LogicExpr//op-logical-and-069, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-and-070, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-and-071, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-and-072, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-and-073, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-and-074, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-and-075, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-and-076, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-and-077, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-and-078, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-and-079, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-and-080, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-and-081, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-and-082, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-and-083, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-and-084, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-and-085, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-and-086, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-and-087, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-and-088, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-and-089, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-and-090, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-and-091, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-and-092, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-and-093, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-and-094, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-and-095, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-and-096, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-and-097, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-and-098, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-and-099, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-and-100, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-and-101, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-and-102, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-and-103, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-and-104, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-and-105, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-and-106, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-and-107, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-and-108, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-and-109, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-and-110, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-and-111, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-and-112, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-and-113, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-and-114, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-and-115, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-and-116, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-and-117, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-and-118, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-and-119, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-and-120, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-and-121, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-and-122, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-and-123, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-and-124, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-and-125, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-and-126, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-and-127, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-and-128, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-and-129, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-and-130, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-and-131, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-and-132, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-and-133, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-and-134, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-and-135, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-and-136, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-and-137, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-and-138, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-and-139, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-and-140, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-and-141, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-and-142, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-and-143, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-and-144, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-and-145, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-and-146, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-and-147, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-and-148, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-and-149, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-and-150, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-and-151, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-and-152, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-and-153, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-and-154, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-and-155, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-and-156, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-and-157, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-and-158, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-and-159, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-or-001, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-or-002, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-or-003, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-or-004, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-or-005, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-or-006, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-or-007, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-or-008, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-or-009, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-or-010, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-or-011, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-or-012, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-or-013, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-or-014, EXPECTED_RESULT_GOT_FAILURE
-Expressions/LogicExpr//op-logical-or-015, EXPECTED_RESULT_GOT_FAILURE
-Expressions/LogicExpr//op-logical-or-016, EXPECTED_RESULT_GOT_FAILURE
-Expressions/LogicExpr//op-logical-or-017, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-or-018, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-or-019, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-or-020, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-or-021, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-or-022, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-or-023, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-or-024, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-or-025, EXPECTED_RESULT_GOT_ERROR
-Expressions/LogicExpr//op-logical-or-026, EXPECTED_RESULT_GOT_ERROR
-Expressions/LogicExpr//op-logical-or-027, EXPECTED_RESULT_GOT_ERROR
-Expressions/LogicExpr//op-logical-or-028, EXPECTED_RESULT_GOT_ERROR
-Expressions/LogicExpr//op-logical-or-029, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-or-030, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-or-031, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-or-032, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-or-033, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-or-034, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-or-035, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-or-036, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-or-037, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-or-038, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-or-039, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-or-040, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-or-041, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-or-042, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-or-043, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-or-044, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-or-045, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-or-046, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-or-047, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-or-048, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-or-049, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-or-050, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-or-051, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-or-052, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-or-053, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-or-054, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-or-055, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-or-056, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-or-057, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-or-058, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-or-059, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-or-060, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-or-061, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-or-062, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-or-063, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-or-064, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-or-065, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-or-066, EXPECTED_ERROR_GOT_RESULT
-Expressions/LogicExpr//op-logical-or-067, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-or-068, EXPECTED_ERROR_GOT_RESULT
-Expressions/LogicExpr//op-logical-or-069, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-or-070, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-or-071, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-or-072, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-or-073, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-or-074, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-or-075, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-or-076, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-or-077, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-or-078, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-or-079, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-or-080, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-or-081, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-or-082, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-or-083, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-or-084, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-or-085, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-or-086, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-or-087, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-or-088, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-or-089, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-or-090, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-or-091, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-or-092, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-or-093, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-or-094, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-or-095, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-or-096, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-or-097, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-or-098, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-or-099, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-or-100, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-or-101, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-or-102, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-or-103, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-or-104, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-or-105, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-or-106, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-or-107, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-or-108, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-or-109, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-or-110, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-or-111, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-or-112, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-or-113, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-or-114, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-or-115, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-or-116, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-or-117, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-or-118, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-or-119, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-or-120, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-or-121, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-or-122, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-or-123, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-or-124, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-or-125, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-or-126, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-or-127, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-or-128, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-or-129, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-or-130, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-or-131, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-or-132, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-or-133, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-or-134, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-or-135, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-or-136, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-or-137, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-or-138, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-or-139, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-or-140, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-or-141, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-or-142, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-or-143, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-or-144, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-or-145, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-or-146, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-or-147, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-or-148, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-or-149, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-or-150, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-or-151, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-or-152, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-or-153, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-or-154, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-or-155, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-or-156, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-or-157, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-or-158, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-or-159, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/Operators/ArithExpr/DurationArith/DateAddDTD//op-add-dayTimeDuration-to-date-1, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/Operators/ArithExpr/DurationArith/DateAddDTD//op-add-dayTimeDuration-to-date-10, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/Operators/ArithExpr/DurationArith/DateAddDTD//op-add-dayTimeDuration-to-date-12, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/Operators/ArithExpr/DurationArith/DateAddDTD//op-add-dayTimeDuration-to-date-13, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/Operators/ArithExpr/DurationArith/DateAddDTD//op-add-dayTimeDuration-to-date-14, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/Operators/ArithExpr/DurationArith/DateAddDTD//op-add-dayTimeDuration-to-date-15, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/Operators/ArithExpr/DurationArith/DateAddDTD//op-add-dayTimeDuration-to-date-16, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/Operators/ArithExpr/DurationArith/DateAddDTD//op-add-dayTimeDuration-to-date-3, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/Operators/ArithExpr/DurationArith/DateAddDTD//op-add-dayTimeDuration-to-date-4, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/Operators/ArithExpr/DurationArith/DateAddDTD//op-add-dayTimeDuration-to-date-5, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/Operators/ArithExpr/DurationArith/DateAddDTD//op-add-dayTimeDuration-to-date-6, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/Operators/ArithExpr/DurationArith/DateAddDTD//op-add-dayTimeDuration-to-date-7, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/Operators/ArithExpr/DurationArith/DateAddDTD//op-add-dayTimeDuration-to-date-8, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/Operators/ArithExpr/DurationArith/DateAddDTD//op-add-dayTimeDuration-to-date-9, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/Operators/ArithExpr/DurationArith/DateAddDTD//op-add-dayTimeDuration-to-date2args-1, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/Operators/ArithExpr/DurationArith/DateAddDTD//op-add-dayTimeDuration-to-date2args-2, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/Operators/ArithExpr/DurationArith/DateAddDTD//op-add-dayTimeDuration-to-date2args-3, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/Operators/ArithExpr/DurationArith/DateAddDTD//op-add-dayTimeDuration-to-date2args-4, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/Operators/ArithExpr/DurationArith/DateAddDTD//op-add-dayTimeDuration-to-date2args-5, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/Operators/ArithExpr/DurationArith/DateAddDTD//op-add-dayTimeDuration-to-datealt-2, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/Operators/ArithExpr/DurationArith/DateAddYMD//op-add-yearMonthDuration-to-date-1, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/Operators/ArithExpr/DurationArith/DateAddYMD//op-add-yearMonthDuration-to-date-10, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/Operators/ArithExpr/DurationArith/DateAddYMD//op-add-yearMonthDuration-to-date-12, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/Operators/ArithExpr/DurationArith/DateAddYMD//op-add-yearMonthDuration-to-date-13, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/Operators/ArithExpr/DurationArith/DateAddYMD//op-add-yearMonthDuration-to-date-14, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/Operators/ArithExpr/DurationArith/DateAddYMD//op-add-yearMonthDuration-to-date-15, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/Operators/ArithExpr/DurationArith/DateAddYMD//op-add-yearMonthDuration-to-date-16, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/Operators/ArithExpr/DurationArith/DateAddYMD//op-add-yearMonthDuration-to-date-2, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/Operators/ArithExpr/DurationArith/DateAddYMD//op-add-yearMonthDuration-to-date-3, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/Operators/ArithExpr/DurationArith/DateAddYMD//op-add-yearMonthDuration-to-date-4, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/Operators/ArithExpr/DurationArith/DateAddYMD//op-add-yearMonthDuration-to-date-5, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/Operators/ArithExpr/DurationArith/DateAddYMD//op-add-yearMonthDuration-to-date-6, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/Operators/ArithExpr/DurationArith/DateAddYMD//op-add-yearMonthDuration-to-date-7, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/Operators/ArithExpr/DurationArith/DateAddYMD//op-add-yearMonthDuration-to-date-8, EXPECTED_RESULT_GOT_ERROR
-Expressions/Operators/ArithExpr/DurationArith/DateAddYMD//op-add-yearMonthDuration-to-date-9, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/Operators/ArithExpr/DurationArith/DateAddYMD//op-add-yearMonthDuration-to-date2args-1, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/Operators/ArithExpr/DurationArith/DateAddYMD//op-add-yearMonthDuration-to-date2args-2, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/Operators/ArithExpr/DurationArith/DateAddYMD//op-add-yearMonthDuration-to-date2args-3, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/Operators/ArithExpr/DurationArith/DateAddYMD//op-add-yearMonthDuration-to-date2args-4, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/Operators/ArithExpr/DurationArith/DateAddYMD//op-add-yearMonthDuration-to-date2args-5, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/Operators/ArithExpr/DurationArith/DateSubtractDTD//op-subtract-dayTimeDuration-from-date-1, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/Operators/ArithExpr/DurationArith/DateSubtractDTD//op-subtract-dayTimeDuration-from-date-10, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/Operators/ArithExpr/DurationArith/DateSubtractDTD//op-subtract-dayTimeDuration-from-date-12, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/Operators/ArithExpr/DurationArith/DateSubtractDTD//op-subtract-dayTimeDuration-from-date-13, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/Operators/ArithExpr/DurationArith/DateSubtractDTD//op-subtract-dayTimeDuration-from-date-14, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/Operators/ArithExpr/DurationArith/DateSubtractDTD//op-subtract-dayTimeDuration-from-date-15, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/Operators/ArithExpr/DurationArith/DateSubtractDTD//op-subtract-dayTimeDuration-from-date-16, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/Operators/ArithExpr/DurationArith/DateSubtractDTD//op-subtract-dayTimeDuration-from-date-2, EXPECTED
<TRUNCATED>
[31/50] [abbrv] vxquery git commit: VXQUERY-184: fixed the order by
translator
Posted by sj...@apache.org.
VXQUERY-184: fixed the order by translator
Project: http://git-wip-us.apache.org/repos/asf/vxquery/repo
Commit: http://git-wip-us.apache.org/repos/asf/vxquery/commit/bb39a04f
Tree: http://git-wip-us.apache.org/repos/asf/vxquery/tree/bb39a04f
Diff: http://git-wip-us.apache.org/repos/asf/vxquery/diff/bb39a04f
Branch: refs/heads/site
Commit: bb39a04fc6051c49036e4875d8cec72e2c87a270
Parents: 43852a5
Author: Christina Pavlopoulou <cp...@ucr.edu>
Authored: Thu Mar 3 12:13:50 2016 -0800
Committer: Preston Carman <pr...@apache.org>
Committed: Fri Mar 4 11:24:38 2016 -0800
----------------------------------------------------------------------
.../apache/vxquery/xmlquery/translator/XMLQueryTranslator.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/vxquery/blob/bb39a04f/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/translator/XMLQueryTranslator.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/translator/XMLQueryTranslator.java b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/translator/XMLQueryTranslator.java
index d2ff3da..19ba276 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/translator/XMLQueryTranslator.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/translator/XMLQueryTranslator.java
@@ -1076,7 +1076,8 @@ public class XMLQueryTranslator {
List<org.apache.hyracks.algebricks.common.utils.Pair<OrderOperator.IOrder, Mutable<ILogicalExpression>>> oExprs = new ArrayList<org.apache.hyracks.algebricks.common.utils.Pair<OrderOperator.IOrder, Mutable<ILogicalExpression>>>();
List<String> collations = new ArrayList<String>();
for (OrderSpecNode osNode : ocNode.getOrderSpec()) {
- ILogicalExpression oExpr = vre(translateExpression(osNode.getExpression(), tCtx));
+ ILogicalExpression aExpr = data(vre(translateExpression(osNode.getExpression(), tCtx)));
+ ILogicalExpression oExpr = vre(createAssignment(aExpr, tCtx));
OrderOperator.IOrder o = OrderOperator.ASC_ORDER;
XQueryConstants.OrderDirection oDir = osNode.getDirection();
if (oDir != null) {
[14/50] [abbrv] vxquery git commit: VXQUERY-181 - Move to Hyracks
0.2.16
Posted by sj...@apache.org.
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/qname/FnQNameScalarEvaluatorFactory.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/qname/FnQNameScalarEvaluatorFactory.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/qname/FnQNameScalarEvaluatorFactory.java
index 3aa4035..f35a125 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/qname/FnQNameScalarEvaluatorFactory.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/qname/FnQNameScalarEvaluatorFactory.java
@@ -30,13 +30,13 @@ import org.apache.vxquery.runtime.functions.strings.ICharacterIterator;
import org.apache.vxquery.runtime.functions.strings.UTF8StringCharacterIterator;
import org.apache.vxquery.runtime.functions.util.FunctionHelper;
-import edu.uci.ics.hyracks.algebricks.common.exceptions.AlgebricksException;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluator;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
-import edu.uci.ics.hyracks.api.context.IHyracksTaskContext;
-import edu.uci.ics.hyracks.data.std.api.IPointable;
-import edu.uci.ics.hyracks.data.std.primitive.UTF8StringPointable;
-import edu.uci.ics.hyracks.data.std.util.ArrayBackedValueStorage;
+import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluator;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
+import org.apache.hyracks.api.context.IHyracksTaskContext;
+import org.apache.hyracks.data.std.api.IPointable;
+import org.apache.hyracks.data.std.primitive.UTF8StringPointable;
+import org.apache.hyracks.data.std.util.ArrayBackedValueStorage;
public class FnQNameScalarEvaluatorFactory extends AbstractTaggedValueArgumentScalarEvaluatorFactory {
private static final long serialVersionUID = 1L;
@@ -130,4 +130,4 @@ public class FnQNameScalarEvaluatorFactory extends AbstractTaggedValueArgumentSc
}
};
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/sequence/ConcatenateScalarEvaluatorFactory.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/sequence/ConcatenateScalarEvaluatorFactory.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/sequence/ConcatenateScalarEvaluatorFactory.java
index b6559b9..b74a2b7 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/sequence/ConcatenateScalarEvaluatorFactory.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/sequence/ConcatenateScalarEvaluatorFactory.java
@@ -27,13 +27,13 @@ import org.apache.vxquery.exceptions.SystemException;
import org.apache.vxquery.runtime.functions.base.AbstractTaggedValueArgumentScalarEvaluator;
import org.apache.vxquery.runtime.functions.base.AbstractTaggedValueArgumentScalarEvaluatorFactory;
-import edu.uci.ics.hyracks.algebricks.common.exceptions.AlgebricksException;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluator;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
-import edu.uci.ics.hyracks.api.context.IHyracksTaskContext;
-import edu.uci.ics.hyracks.data.std.api.IPointable;
-import edu.uci.ics.hyracks.data.std.primitive.VoidPointable;
-import edu.uci.ics.hyracks.data.std.util.ArrayBackedValueStorage;
+import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluator;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
+import org.apache.hyracks.api.context.IHyracksTaskContext;
+import org.apache.hyracks.data.std.api.IPointable;
+import org.apache.hyracks.data.std.primitive.VoidPointable;
+import org.apache.hyracks.data.std.util.ArrayBackedValueStorage;
public class ConcatenateScalarEvaluatorFactory extends AbstractTaggedValueArgumentScalarEvaluatorFactory {
private static final long serialVersionUID = 1L;
@@ -76,4 +76,4 @@ public class ConcatenateScalarEvaluatorFactory extends AbstractTaggedValueArgume
}
};
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/sequence/FnDistinctValuesScalarEvaluatorFactory.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/sequence/FnDistinctValuesScalarEvaluatorFactory.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/sequence/FnDistinctValuesScalarEvaluatorFactory.java
index 7929908..cbc1d03 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/sequence/FnDistinctValuesScalarEvaluatorFactory.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/sequence/FnDistinctValuesScalarEvaluatorFactory.java
@@ -32,14 +32,14 @@ import org.apache.vxquery.runtime.functions.comparison.AbstractValueComparisonOp
import org.apache.vxquery.runtime.functions.comparison.ValueEqComparisonOperation;
import org.apache.vxquery.runtime.functions.util.FunctionHelper;
-import edu.uci.ics.hyracks.algebricks.common.exceptions.AlgebricksException;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluator;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
-import edu.uci.ics.hyracks.api.context.IHyracksTaskContext;
-import edu.uci.ics.hyracks.data.std.api.IPointable;
-import edu.uci.ics.hyracks.data.std.primitive.UTF8StringPointable;
-import edu.uci.ics.hyracks.data.std.primitive.VoidPointable;
-import edu.uci.ics.hyracks.data.std.util.ArrayBackedValueStorage;
+import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluator;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
+import org.apache.hyracks.api.context.IHyracksTaskContext;
+import org.apache.hyracks.data.std.api.IPointable;
+import org.apache.hyracks.data.std.primitive.UTF8StringPointable;
+import org.apache.hyracks.data.std.primitive.VoidPointable;
+import org.apache.hyracks.data.std.util.ArrayBackedValueStorage;
public class FnDistinctValuesScalarEvaluatorFactory extends AbstractTaggedValueArgumentScalarEvaluatorFactory {
private static final long serialVersionUID = 1L;
@@ -118,4 +118,4 @@ public class FnDistinctValuesScalarEvaluatorFactory extends AbstractTaggedValueA
}
};
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/sequence/FnEmptyScalarEvaluatorFactory.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/sequence/FnEmptyScalarEvaluatorFactory.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/sequence/FnEmptyScalarEvaluatorFactory.java
index bff87e3..9fbdd4f 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/sequence/FnEmptyScalarEvaluatorFactory.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/sequence/FnEmptyScalarEvaluatorFactory.java
@@ -24,11 +24,11 @@ import org.apache.vxquery.exceptions.SystemException;
import org.apache.vxquery.runtime.functions.base.AbstractTaggedValueArgumentScalarEvaluator;
import org.apache.vxquery.runtime.functions.base.AbstractTaggedValueArgumentScalarEvaluatorFactory;
-import edu.uci.ics.hyracks.algebricks.common.exceptions.AlgebricksException;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluator;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
-import edu.uci.ics.hyracks.api.context.IHyracksTaskContext;
-import edu.uci.ics.hyracks.data.std.api.IPointable;
+import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluator;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
+import org.apache.hyracks.api.context.IHyracksTaskContext;
+import org.apache.hyracks.data.std.api.IPointable;
public class FnEmptyScalarEvaluatorFactory extends AbstractTaggedValueArgumentScalarEvaluatorFactory {
private static final long serialVersionUID = 1L;
@@ -56,4 +56,4 @@ public class FnEmptyScalarEvaluatorFactory extends AbstractTaggedValueArgumentSc
}
};
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/sequence/FnExactlyOneScalarEvaluatorFactory.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/sequence/FnExactlyOneScalarEvaluatorFactory.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/sequence/FnExactlyOneScalarEvaluatorFactory.java
index d6375a1..fb691c1 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/sequence/FnExactlyOneScalarEvaluatorFactory.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/sequence/FnExactlyOneScalarEvaluatorFactory.java
@@ -24,11 +24,11 @@ import org.apache.vxquery.exceptions.SystemException;
import org.apache.vxquery.runtime.functions.base.AbstractTaggedValueArgumentScalarEvaluator;
import org.apache.vxquery.runtime.functions.base.AbstractTaggedValueArgumentScalarEvaluatorFactory;
-import edu.uci.ics.hyracks.algebricks.common.exceptions.AlgebricksException;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluator;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
-import edu.uci.ics.hyracks.api.context.IHyracksTaskContext;
-import edu.uci.ics.hyracks.data.std.api.IPointable;
+import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluator;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
+import org.apache.hyracks.api.context.IHyracksTaskContext;
+import org.apache.hyracks.data.std.api.IPointable;
public class FnExactlyOneScalarEvaluatorFactory extends AbstractTaggedValueArgumentScalarEvaluatorFactory {
private static final long serialVersionUID = 1L;
@@ -58,4 +58,4 @@ public class FnExactlyOneScalarEvaluatorFactory extends AbstractTaggedValueArgum
}
};
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/sequence/FnExistsScalarEvaluatorFactory.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/sequence/FnExistsScalarEvaluatorFactory.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/sequence/FnExistsScalarEvaluatorFactory.java
index 45c9f6e..7392773 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/sequence/FnExistsScalarEvaluatorFactory.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/sequence/FnExistsScalarEvaluatorFactory.java
@@ -24,11 +24,11 @@ import org.apache.vxquery.exceptions.SystemException;
import org.apache.vxquery.runtime.functions.base.AbstractTaggedValueArgumentScalarEvaluator;
import org.apache.vxquery.runtime.functions.base.AbstractTaggedValueArgumentScalarEvaluatorFactory;
-import edu.uci.ics.hyracks.algebricks.common.exceptions.AlgebricksException;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluator;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
-import edu.uci.ics.hyracks.api.context.IHyracksTaskContext;
-import edu.uci.ics.hyracks.data.std.api.IPointable;
+import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluator;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
+import org.apache.hyracks.api.context.IHyracksTaskContext;
+import org.apache.hyracks.data.std.api.IPointable;
public class FnExistsScalarEvaluatorFactory extends AbstractTaggedValueArgumentScalarEvaluatorFactory {
private static final long serialVersionUID = 1L;
@@ -56,4 +56,4 @@ public class FnExistsScalarEvaluatorFactory extends AbstractTaggedValueArgumentS
}
};
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/sequence/FnIndexOfScalarEvaluatorFactory.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/sequence/FnIndexOfScalarEvaluatorFactory.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/sequence/FnIndexOfScalarEvaluatorFactory.java
index f5bb65e..a99406b 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/sequence/FnIndexOfScalarEvaluatorFactory.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/sequence/FnIndexOfScalarEvaluatorFactory.java
@@ -33,13 +33,13 @@ import org.apache.vxquery.runtime.functions.comparison.AbstractValueComparisonOp
import org.apache.vxquery.runtime.functions.comparison.ValueEqComparisonOperation;
import org.apache.vxquery.runtime.functions.util.FunctionHelper;
-import edu.uci.ics.hyracks.algebricks.common.exceptions.AlgebricksException;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluator;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
-import edu.uci.ics.hyracks.api.context.IHyracksTaskContext;
-import edu.uci.ics.hyracks.data.std.api.IPointable;
-import edu.uci.ics.hyracks.data.std.primitive.VoidPointable;
-import edu.uci.ics.hyracks.data.std.util.ArrayBackedValueStorage;
+import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluator;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
+import org.apache.hyracks.api.context.IHyracksTaskContext;
+import org.apache.hyracks.data.std.api.IPointable;
+import org.apache.hyracks.data.std.primitive.VoidPointable;
+import org.apache.hyracks.data.std.util.ArrayBackedValueStorage;
public class FnIndexOfScalarEvaluatorFactory extends AbstractTaggedValueArgumentScalarEvaluatorFactory {
private static final long serialVersionUID = 1L;
@@ -101,4 +101,4 @@ public class FnIndexOfScalarEvaluatorFactory extends AbstractTaggedValueArgument
}
};
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/sequence/FnInsertBeforeScalarEvaluatorFactory.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/sequence/FnInsertBeforeScalarEvaluatorFactory.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/sequence/FnInsertBeforeScalarEvaluatorFactory.java
index 1571899..9f78c9b 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/sequence/FnInsertBeforeScalarEvaluatorFactory.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/sequence/FnInsertBeforeScalarEvaluatorFactory.java
@@ -27,14 +27,14 @@ import org.apache.vxquery.exceptions.SystemException;
import org.apache.vxquery.runtime.functions.base.AbstractTaggedValueArgumentScalarEvaluator;
import org.apache.vxquery.runtime.functions.base.AbstractTaggedValueArgumentScalarEvaluatorFactory;
-import edu.uci.ics.hyracks.algebricks.common.exceptions.AlgebricksException;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluator;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
-import edu.uci.ics.hyracks.api.context.IHyracksTaskContext;
-import edu.uci.ics.hyracks.data.std.api.IPointable;
-import edu.uci.ics.hyracks.data.std.primitive.LongPointable;
-import edu.uci.ics.hyracks.data.std.primitive.VoidPointable;
-import edu.uci.ics.hyracks.data.std.util.ArrayBackedValueStorage;
+import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluator;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
+import org.apache.hyracks.api.context.IHyracksTaskContext;
+import org.apache.hyracks.data.std.api.IPointable;
+import org.apache.hyracks.data.std.primitive.LongPointable;
+import org.apache.hyracks.data.std.primitive.VoidPointable;
+import org.apache.hyracks.data.std.util.ArrayBackedValueStorage;
public class FnInsertBeforeScalarEvaluatorFactory extends AbstractTaggedValueArgumentScalarEvaluatorFactory {
private static final long serialVersionUID = 1L;
@@ -119,4 +119,4 @@ public class FnInsertBeforeScalarEvaluatorFactory extends AbstractTaggedValueArg
}
};
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/sequence/FnOneOrMoreScalarEvaluatorFactory.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/sequence/FnOneOrMoreScalarEvaluatorFactory.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/sequence/FnOneOrMoreScalarEvaluatorFactory.java
index c81c356..24936c7 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/sequence/FnOneOrMoreScalarEvaluatorFactory.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/sequence/FnOneOrMoreScalarEvaluatorFactory.java
@@ -24,11 +24,11 @@ import org.apache.vxquery.exceptions.SystemException;
import org.apache.vxquery.runtime.functions.base.AbstractTaggedValueArgumentScalarEvaluator;
import org.apache.vxquery.runtime.functions.base.AbstractTaggedValueArgumentScalarEvaluatorFactory;
-import edu.uci.ics.hyracks.algebricks.common.exceptions.AlgebricksException;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluator;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
-import edu.uci.ics.hyracks.api.context.IHyracksTaskContext;
-import edu.uci.ics.hyracks.data.std.api.IPointable;
+import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluator;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
+import org.apache.hyracks.api.context.IHyracksTaskContext;
+import org.apache.hyracks.data.std.api.IPointable;
public class FnOneOrMoreScalarEvaluatorFactory extends AbstractTaggedValueArgumentScalarEvaluatorFactory {
private static final long serialVersionUID = 1L;
@@ -58,4 +58,4 @@ public class FnOneOrMoreScalarEvaluatorFactory extends AbstractTaggedValueArgume
}
};
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/sequence/FnRemoveScalarEvaluatorFactory.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/sequence/FnRemoveScalarEvaluatorFactory.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/sequence/FnRemoveScalarEvaluatorFactory.java
index 0673341..72db5c4 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/sequence/FnRemoveScalarEvaluatorFactory.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/sequence/FnRemoveScalarEvaluatorFactory.java
@@ -27,14 +27,14 @@ import org.apache.vxquery.exceptions.SystemException;
import org.apache.vxquery.runtime.functions.base.AbstractTaggedValueArgumentScalarEvaluator;
import org.apache.vxquery.runtime.functions.base.AbstractTaggedValueArgumentScalarEvaluatorFactory;
-import edu.uci.ics.hyracks.algebricks.common.exceptions.AlgebricksException;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluator;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
-import edu.uci.ics.hyracks.api.context.IHyracksTaskContext;
-import edu.uci.ics.hyracks.data.std.api.IPointable;
-import edu.uci.ics.hyracks.data.std.primitive.LongPointable;
-import edu.uci.ics.hyracks.data.std.primitive.VoidPointable;
-import edu.uci.ics.hyracks.data.std.util.ArrayBackedValueStorage;
+import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluator;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
+import org.apache.hyracks.api.context.IHyracksTaskContext;
+import org.apache.hyracks.data.std.api.IPointable;
+import org.apache.hyracks.data.std.primitive.LongPointable;
+import org.apache.hyracks.data.std.primitive.VoidPointable;
+import org.apache.hyracks.data.std.util.ArrayBackedValueStorage;
public class FnRemoveScalarEvaluatorFactory extends AbstractTaggedValueArgumentScalarEvaluatorFactory {
private static final long serialVersionUID = 1L;
@@ -92,4 +92,4 @@ public class FnRemoveScalarEvaluatorFactory extends AbstractTaggedValueArgumentS
}
};
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/sequence/FnReverseScalarEvaluatorFactory.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/sequence/FnReverseScalarEvaluatorFactory.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/sequence/FnReverseScalarEvaluatorFactory.java
index 1591013..cfd8cf3 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/sequence/FnReverseScalarEvaluatorFactory.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/sequence/FnReverseScalarEvaluatorFactory.java
@@ -27,13 +27,13 @@ import org.apache.vxquery.exceptions.SystemException;
import org.apache.vxquery.runtime.functions.base.AbstractTaggedValueArgumentScalarEvaluator;
import org.apache.vxquery.runtime.functions.base.AbstractTaggedValueArgumentScalarEvaluatorFactory;
-import edu.uci.ics.hyracks.algebricks.common.exceptions.AlgebricksException;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluator;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
-import edu.uci.ics.hyracks.api.context.IHyracksTaskContext;
-import edu.uci.ics.hyracks.data.std.api.IPointable;
-import edu.uci.ics.hyracks.data.std.primitive.VoidPointable;
-import edu.uci.ics.hyracks.data.std.util.ArrayBackedValueStorage;
+import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluator;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
+import org.apache.hyracks.api.context.IHyracksTaskContext;
+import org.apache.hyracks.data.std.api.IPointable;
+import org.apache.hyracks.data.std.primitive.VoidPointable;
+import org.apache.hyracks.data.std.util.ArrayBackedValueStorage;
public class FnReverseScalarEvaluatorFactory extends AbstractTaggedValueArgumentScalarEvaluatorFactory {
private static final long serialVersionUID = 1L;
@@ -74,4 +74,4 @@ public class FnReverseScalarEvaluatorFactory extends AbstractTaggedValueArgument
}
};
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/sequence/FnSubsequenceScalarEvaluatorFactory.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/sequence/FnSubsequenceScalarEvaluatorFactory.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/sequence/FnSubsequenceScalarEvaluatorFactory.java
index 6244b4f..690c4a4 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/sequence/FnSubsequenceScalarEvaluatorFactory.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/sequence/FnSubsequenceScalarEvaluatorFactory.java
@@ -29,15 +29,15 @@ import org.apache.vxquery.runtime.functions.base.AbstractTaggedValueArgumentScal
import org.apache.vxquery.runtime.functions.base.AbstractTaggedValueArgumentScalarEvaluatorFactory;
import org.apache.vxquery.runtime.functions.numeric.FnRoundOperation;
-import edu.uci.ics.hyracks.algebricks.common.exceptions.AlgebricksException;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluator;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
-import edu.uci.ics.hyracks.api.context.IHyracksTaskContext;
-import edu.uci.ics.hyracks.data.std.api.IPointable;
-import edu.uci.ics.hyracks.data.std.primitive.DoublePointable;
-import edu.uci.ics.hyracks.data.std.primitive.LongPointable;
-import edu.uci.ics.hyracks.data.std.primitive.VoidPointable;
-import edu.uci.ics.hyracks.data.std.util.ArrayBackedValueStorage;
+import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluator;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
+import org.apache.hyracks.api.context.IHyracksTaskContext;
+import org.apache.hyracks.data.std.api.IPointable;
+import org.apache.hyracks.data.std.primitive.DoublePointable;
+import org.apache.hyracks.data.std.primitive.LongPointable;
+import org.apache.hyracks.data.std.primitive.VoidPointable;
+import org.apache.hyracks.data.std.util.ArrayBackedValueStorage;
public class FnSubsequenceScalarEvaluatorFactory extends AbstractTaggedValueArgumentScalarEvaluatorFactory {
private static final long serialVersionUID = 1L;
@@ -136,4 +136,4 @@ public class FnSubsequenceScalarEvaluatorFactory extends AbstractTaggedValueArgu
}
};
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/sequence/FnUnorderedScalarEvaluatorFactory.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/sequence/FnUnorderedScalarEvaluatorFactory.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/sequence/FnUnorderedScalarEvaluatorFactory.java
index 6f486a3..19506ab 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/sequence/FnUnorderedScalarEvaluatorFactory.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/sequence/FnUnorderedScalarEvaluatorFactory.java
@@ -21,11 +21,11 @@ import org.apache.vxquery.exceptions.SystemException;
import org.apache.vxquery.runtime.functions.base.AbstractTaggedValueArgumentScalarEvaluator;
import org.apache.vxquery.runtime.functions.base.AbstractTaggedValueArgumentScalarEvaluatorFactory;
-import edu.uci.ics.hyracks.algebricks.common.exceptions.AlgebricksException;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluator;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
-import edu.uci.ics.hyracks.api.context.IHyracksTaskContext;
-import edu.uci.ics.hyracks.data.std.api.IPointable;
+import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluator;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
+import org.apache.hyracks.api.context.IHyracksTaskContext;
+import org.apache.hyracks.data.std.api.IPointable;
public class FnUnorderedScalarEvaluatorFactory extends AbstractTaggedValueArgumentScalarEvaluatorFactory {
private static final long serialVersionUID = 1L;
@@ -44,4 +44,4 @@ public class FnUnorderedScalarEvaluatorFactory extends AbstractTaggedValueArgume
}
};
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/sequence/FnZeroOrOneScalarEvaluatorFactory.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/sequence/FnZeroOrOneScalarEvaluatorFactory.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/sequence/FnZeroOrOneScalarEvaluatorFactory.java
index 5620fc0..0eb4a6a 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/sequence/FnZeroOrOneScalarEvaluatorFactory.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/sequence/FnZeroOrOneScalarEvaluatorFactory.java
@@ -24,11 +24,11 @@ import org.apache.vxquery.exceptions.SystemException;
import org.apache.vxquery.runtime.functions.base.AbstractTaggedValueArgumentScalarEvaluator;
import org.apache.vxquery.runtime.functions.base.AbstractTaggedValueArgumentScalarEvaluatorFactory;
-import edu.uci.ics.hyracks.algebricks.common.exceptions.AlgebricksException;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluator;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
-import edu.uci.ics.hyracks.api.context.IHyracksTaskContext;
-import edu.uci.ics.hyracks.data.std.api.IPointable;
+import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluator;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
+import org.apache.hyracks.api.context.IHyracksTaskContext;
+import org.apache.hyracks.data.std.api.IPointable;
public class FnZeroOrOneScalarEvaluatorFactory extends AbstractTaggedValueArgumentScalarEvaluatorFactory {
private static final long serialVersionUID = 1L;
@@ -58,4 +58,4 @@ public class FnZeroOrOneScalarEvaluatorFactory extends AbstractTaggedValueArgume
}
};
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/sequence/IterateUnnestingEvaluatorFactory.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/sequence/IterateUnnestingEvaluatorFactory.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/sequence/IterateUnnestingEvaluatorFactory.java
index aadc1d0..0869179 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/sequence/IterateUnnestingEvaluatorFactory.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/sequence/IterateUnnestingEvaluatorFactory.java
@@ -22,12 +22,12 @@ import org.apache.vxquery.datamodel.values.ValueTag;
import org.apache.vxquery.runtime.functions.base.AbstractTaggedValueArgumentUnnestingEvaluator;
import org.apache.vxquery.runtime.functions.base.AbstractTaggedValueArgumentUnnestingEvaluatorFactory;
-import edu.uci.ics.hyracks.algebricks.common.exceptions.AlgebricksException;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluator;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IUnnestingEvaluator;
-import edu.uci.ics.hyracks.api.context.IHyracksTaskContext;
-import edu.uci.ics.hyracks.data.std.api.IPointable;
+import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluator;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
+import org.apache.hyracks.algebricks.runtime.base.IUnnestingEvaluator;
+import org.apache.hyracks.api.context.IHyracksTaskContext;
+import org.apache.hyracks.data.std.api.IPointable;
public class IterateUnnestingEvaluatorFactory extends AbstractTaggedValueArgumentUnnestingEvaluatorFactory {
private static final long serialVersionUID = 1L;
@@ -74,4 +74,4 @@ public class IterateUnnestingEvaluatorFactory extends AbstractTaggedValueArgumen
}
};
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/sequence/OpToScalarEvaluatorFactory.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/sequence/OpToScalarEvaluatorFactory.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/sequence/OpToScalarEvaluatorFactory.java
index 8410347..5ae76e8 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/sequence/OpToScalarEvaluatorFactory.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/sequence/OpToScalarEvaluatorFactory.java
@@ -28,13 +28,13 @@ import org.apache.vxquery.exceptions.SystemException;
import org.apache.vxquery.runtime.functions.base.AbstractTaggedValueArgumentScalarEvaluator;
import org.apache.vxquery.runtime.functions.base.AbstractTaggedValueArgumentScalarEvaluatorFactory;
-import edu.uci.ics.hyracks.algebricks.common.exceptions.AlgebricksException;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluator;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
-import edu.uci.ics.hyracks.api.context.IHyracksTaskContext;
-import edu.uci.ics.hyracks.data.std.api.IPointable;
-import edu.uci.ics.hyracks.data.std.primitive.LongPointable;
-import edu.uci.ics.hyracks.data.std.util.ArrayBackedValueStorage;
+import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluator;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
+import org.apache.hyracks.api.context.IHyracksTaskContext;
+import org.apache.hyracks.data.std.api.IPointable;
+import org.apache.hyracks.data.std.primitive.LongPointable;
+import org.apache.hyracks.data.std.util.ArrayBackedValueStorage;
public class OpToScalarEvaluatorFactory extends AbstractTaggedValueArgumentScalarEvaluatorFactory {
private static final long serialVersionUID = 1L;
@@ -91,4 +91,4 @@ public class OpToScalarEvaluatorFactory extends AbstractTaggedValueArgumentScala
}
};
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/sequence/SequenceAggregateEvaluatorFactory.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/sequence/SequenceAggregateEvaluatorFactory.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/sequence/SequenceAggregateEvaluatorFactory.java
index 6cff90b..f3c04de 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/sequence/SequenceAggregateEvaluatorFactory.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/sequence/SequenceAggregateEvaluatorFactory.java
@@ -28,13 +28,13 @@ import org.apache.vxquery.runtime.functions.base.AbstractTaggedValueArgumentAggr
import org.apache.vxquery.runtime.functions.base.AbstractTaggedValueArgumentAggregateEvaluatorFactory;
import org.apache.vxquery.util.GrowableIntArray;
-import edu.uci.ics.hyracks.algebricks.common.exceptions.AlgebricksException;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IAggregateEvaluator;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluator;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
-import edu.uci.ics.hyracks.data.std.api.IPointable;
-import edu.uci.ics.hyracks.data.std.primitive.VoidPointable;
-import edu.uci.ics.hyracks.data.std.util.ArrayBackedValueStorage;
+import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
+import org.apache.hyracks.algebricks.runtime.base.IAggregateEvaluator;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluator;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
+import org.apache.hyracks.data.std.api.IPointable;
+import org.apache.hyracks.data.std.primitive.VoidPointable;
+import org.apache.hyracks.data.std.util.ArrayBackedValueStorage;
public class SequenceAggregateEvaluatorFactory extends AbstractTaggedValueArgumentAggregateEvaluatorFactory {
private static final long serialVersionUID = 1L;
@@ -121,4 +121,4 @@ public class SequenceAggregateEvaluatorFactory extends AbstractTaggedValueArgume
}
};
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/step/AbstractDescendantPathStepScalarEvaluator.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/step/AbstractDescendantPathStepScalarEvaluator.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/step/AbstractDescendantPathStepScalarEvaluator.java
index 3322f90..f3442a5 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/step/AbstractDescendantPathStepScalarEvaluator.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/step/AbstractDescendantPathStepScalarEvaluator.java
@@ -26,9 +26,9 @@ import org.apache.vxquery.datamodel.values.ValueTag;
import org.apache.vxquery.exceptions.ErrorCode;
import org.apache.vxquery.exceptions.SystemException;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluator;
-import edu.uci.ics.hyracks.api.context.IHyracksTaskContext;
-import edu.uci.ics.hyracks.data.std.api.IPointable;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluator;
+import org.apache.hyracks.api.context.IHyracksTaskContext;
+import org.apache.hyracks.data.std.api.IPointable;
public abstract class AbstractDescendantPathStepScalarEvaluator extends AbstractPathStepScalarEvaluator {
private final DocumentNodePointable dnp;
@@ -92,4 +92,4 @@ public abstract class AbstractDescendantPathStepScalarEvaluator extends Abstract
}
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/step/AbstractForwardAxisPathStep.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/step/AbstractForwardAxisPathStep.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/step/AbstractForwardAxisPathStep.java
index e0c7931..b8f022c 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/step/AbstractForwardAxisPathStep.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/step/AbstractForwardAxisPathStep.java
@@ -29,9 +29,9 @@ import org.apache.vxquery.datamodel.builders.nodes.NodeSubTreeBuilder;
import org.apache.vxquery.datamodel.values.ValueTag;
import org.apache.vxquery.datamodel.values.XDMConstants;
-import edu.uci.ics.hyracks.api.context.IHyracksTaskContext;
-import edu.uci.ics.hyracks.data.std.api.IPointable;
-import edu.uci.ics.hyracks.data.std.util.ArrayBackedValueStorage;
+import org.apache.hyracks.api.context.IHyracksTaskContext;
+import org.apache.hyracks.data.std.api.IPointable;
+import org.apache.hyracks.data.std.util.ArrayBackedValueStorage;
public abstract class AbstractForwardAxisPathStep {
protected final DynamicContext dCtx;
@@ -73,4 +73,4 @@ public abstract class AbstractForwardAxisPathStep {
nstb.finish();
result.set(nodeAbvs.getByteArray(), nodeAbvs.getStartOffset(), nodeAbvs.getLength());
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/step/AbstractPathStepScalarEvaluator.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/step/AbstractPathStepScalarEvaluator.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/step/AbstractPathStepScalarEvaluator.java
index 0532fda..f277b26 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/step/AbstractPathStepScalarEvaluator.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/step/AbstractPathStepScalarEvaluator.java
@@ -27,10 +27,10 @@ import org.apache.vxquery.runtime.functions.base.AbstractTaggedValueArgumentScal
import org.apache.vxquery.runtime.functions.step.NodeTestFilter.INodeFilter;
import org.apache.vxquery.types.SequenceType;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluator;
-import edu.uci.ics.hyracks.api.context.IHyracksTaskContext;
-import edu.uci.ics.hyracks.data.std.api.IPointable;
-import edu.uci.ics.hyracks.data.std.util.ArrayBackedValueStorage;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluator;
+import org.apache.hyracks.api.context.IHyracksTaskContext;
+import org.apache.hyracks.data.std.api.IPointable;
+import org.apache.hyracks.data.std.util.ArrayBackedValueStorage;
public abstract class AbstractPathStepScalarEvaluator extends AbstractTaggedValueArgumentScalarEvaluator {
protected final SequenceBuilder seqb;
@@ -80,4 +80,4 @@ public abstract class AbstractPathStepScalarEvaluator extends AbstractTaggedValu
setNodeToResult(node);
seqb.addItem(node);
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/step/AbstractSinglePathStepScalarEvaluator.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/step/AbstractSinglePathStepScalarEvaluator.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/step/AbstractSinglePathStepScalarEvaluator.java
index 8686536..d2200c9 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/step/AbstractSinglePathStepScalarEvaluator.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/step/AbstractSinglePathStepScalarEvaluator.java
@@ -27,11 +27,11 @@ import org.apache.vxquery.exceptions.ErrorCode;
import org.apache.vxquery.exceptions.SystemException;
import org.apache.vxquery.types.SequenceType;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluator;
-import edu.uci.ics.hyracks.api.context.IHyracksTaskContext;
-import edu.uci.ics.hyracks.data.std.api.IPointable;
-import edu.uci.ics.hyracks.data.std.primitive.IntegerPointable;
-import edu.uci.ics.hyracks.data.std.util.ArrayBackedValueStorage;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluator;
+import org.apache.hyracks.api.context.IHyracksTaskContext;
+import org.apache.hyracks.data.std.api.IPointable;
+import org.apache.hyracks.data.std.primitive.IntegerPointable;
+import org.apache.hyracks.data.std.util.ArrayBackedValueStorage;
public abstract class AbstractSinglePathStepScalarEvaluator extends AbstractPathStepScalarEvaluator {
protected final DynamicContext dCtx;
@@ -110,4 +110,4 @@ public abstract class AbstractSinglePathStepScalarEvaluator extends AbstractPath
}
}
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/step/AttributePathStepScalarEvaluator.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/step/AttributePathStepScalarEvaluator.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/step/AttributePathStepScalarEvaluator.java
index 30b50e4..b4ef7a1 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/step/AttributePathStepScalarEvaluator.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/step/AttributePathStepScalarEvaluator.java
@@ -24,8 +24,8 @@ import org.apache.vxquery.datamodel.values.ValueTag;
import org.apache.vxquery.datamodel.values.XDMConstants;
import org.apache.vxquery.exceptions.SystemException;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluator;
-import edu.uci.ics.hyracks.api.context.IHyracksTaskContext;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluator;
+import org.apache.hyracks.api.context.IHyracksTaskContext;
public class AttributePathStepScalarEvaluator extends AbstractSinglePathStepScalarEvaluator {
private final TaggedValuePointable rootTVP;
@@ -51,4 +51,4 @@ public class AttributePathStepScalarEvaluator extends AbstractSinglePathStepScal
}
XDMConstants.setEmptySequence(seqp);
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/step/AttributePathStepScalarEvaluatorFactory.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/step/AttributePathStepScalarEvaluatorFactory.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/step/AttributePathStepScalarEvaluatorFactory.java
index da8c9b2..8ce8c0b 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/step/AttributePathStepScalarEvaluatorFactory.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/step/AttributePathStepScalarEvaluatorFactory.java
@@ -18,10 +18,10 @@ package org.apache.vxquery.runtime.functions.step;
import org.apache.vxquery.runtime.functions.base.AbstractTaggedValueArgumentScalarEvaluatorFactory;
-import edu.uci.ics.hyracks.algebricks.common.exceptions.AlgebricksException;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluator;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
-import edu.uci.ics.hyracks.api.context.IHyracksTaskContext;
+import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluator;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
+import org.apache.hyracks.api.context.IHyracksTaskContext;
public class AttributePathStepScalarEvaluatorFactory extends AbstractTaggedValueArgumentScalarEvaluatorFactory {
private static final long serialVersionUID = 1L;
@@ -35,4 +35,4 @@ public class AttributePathStepScalarEvaluatorFactory extends AbstractTaggedValue
throws AlgebricksException {
return new AttributePathStepScalarEvaluator(args, ctx);
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/step/ChildPathStepOperatorDescriptor.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/step/ChildPathStepOperatorDescriptor.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/step/ChildPathStepOperatorDescriptor.java
index 125623c..eed6bc5 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/step/ChildPathStepOperatorDescriptor.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/step/ChildPathStepOperatorDescriptor.java
@@ -29,9 +29,9 @@ import org.apache.vxquery.exceptions.SystemException;
import org.apache.vxquery.runtime.functions.step.NodeTestFilter.INodeFilter;
import org.apache.vxquery.types.SequenceType;
-import edu.uci.ics.hyracks.algebricks.common.exceptions.AlgebricksException;
-import edu.uci.ics.hyracks.api.context.IHyracksTaskContext;
-import edu.uci.ics.hyracks.data.std.api.IPointable;
+import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
+import org.apache.hyracks.api.context.IHyracksTaskContext;
+import org.apache.hyracks.data.std.api.IPointable;
public class ChildPathStepOperatorDescriptor extends AbstractForwardAxisPathStep {
private List<INodeFilter> filter = new ArrayList<INodeFilter>();
@@ -114,4 +114,4 @@ public class ChildPathStepOperatorDescriptor extends AbstractForwardAxisPathStep
pp.giveBack(seqItem);
}
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/step/ChildPathStepScalarEvaluator.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/step/ChildPathStepScalarEvaluator.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/step/ChildPathStepScalarEvaluator.java
index 729f8a2..4162bee 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/step/ChildPathStepScalarEvaluator.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/step/ChildPathStepScalarEvaluator.java
@@ -24,11 +24,11 @@ import org.apache.vxquery.exceptions.ErrorCode;
import org.apache.vxquery.exceptions.SystemException;
import org.apache.vxquery.runtime.functions.base.AbstractTaggedValueArgumentScalarEvaluator;
-import edu.uci.ics.hyracks.algebricks.common.exceptions.AlgebricksException;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluator;
-import edu.uci.ics.hyracks.api.context.IHyracksTaskContext;
-import edu.uci.ics.hyracks.data.std.api.IPointable;
-import edu.uci.ics.hyracks.data.std.util.ArrayBackedValueStorage;
+import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluator;
+import org.apache.hyracks.api.context.IHyracksTaskContext;
+import org.apache.hyracks.data.std.api.IPointable;
+import org.apache.hyracks.data.std.util.ArrayBackedValueStorage;
public class ChildPathStepScalarEvaluator extends AbstractTaggedValueArgumentScalarEvaluator {
private final SequenceBuilder seqb = new SequenceBuilder();
@@ -63,4 +63,4 @@ public class ChildPathStepScalarEvaluator extends AbstractTaggedValueArgumentSca
throw new SystemException(ErrorCode.SYSE0001, e);
}
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/step/ChildPathStepScalarEvaluatorFactory.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/step/ChildPathStepScalarEvaluatorFactory.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/step/ChildPathStepScalarEvaluatorFactory.java
index 31d0141..f10cdf3 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/step/ChildPathStepScalarEvaluatorFactory.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/step/ChildPathStepScalarEvaluatorFactory.java
@@ -18,10 +18,10 @@ package org.apache.vxquery.runtime.functions.step;
import org.apache.vxquery.runtime.functions.base.AbstractTaggedValueArgumentScalarEvaluatorFactory;
-import edu.uci.ics.hyracks.algebricks.common.exceptions.AlgebricksException;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluator;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
-import edu.uci.ics.hyracks.api.context.IHyracksTaskContext;
+import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluator;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
+import org.apache.hyracks.api.context.IHyracksTaskContext;
public class ChildPathStepScalarEvaluatorFactory extends AbstractTaggedValueArgumentScalarEvaluatorFactory {
private static final long serialVersionUID = 1L;
@@ -35,4 +35,4 @@ public class ChildPathStepScalarEvaluatorFactory extends AbstractTaggedValueArgu
throws AlgebricksException {
return new ChildPathStepScalarEvaluator(args, ctx);
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/step/ChildPathStepUnnesting.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/step/ChildPathStepUnnesting.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/step/ChildPathStepUnnesting.java
index dbae9de..682fd7e 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/step/ChildPathStepUnnesting.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/step/ChildPathStepUnnesting.java
@@ -27,10 +27,10 @@ import org.apache.vxquery.exceptions.SystemException;
import org.apache.vxquery.runtime.functions.step.NodeTestFilter.INodeFilter;
import org.apache.vxquery.types.SequenceType;
-import edu.uci.ics.hyracks.algebricks.common.exceptions.AlgebricksException;
-import edu.uci.ics.hyracks.api.context.IHyracksTaskContext;
-import edu.uci.ics.hyracks.data.std.api.IPointable;
-import edu.uci.ics.hyracks.data.std.primitive.IntegerPointable;
+import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
+import org.apache.hyracks.api.context.IHyracksTaskContext;
+import org.apache.hyracks.data.std.api.IPointable;
+import org.apache.hyracks.data.std.primitive.IntegerPointable;
public class ChildPathStepUnnesting extends AbstractForwardAxisPathStep {
private int indexSeqArgs;
@@ -128,4 +128,4 @@ public class ChildPathStepUnnesting extends AbstractForwardAxisPathStep {
return false;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/step/ChildPathStepUnnestingEvaluator.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/step/ChildPathStepUnnestingEvaluator.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/step/ChildPathStepUnnestingEvaluator.java
index 02515c4..b5d0aec 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/step/ChildPathStepUnnestingEvaluator.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/step/ChildPathStepUnnestingEvaluator.java
@@ -20,10 +20,10 @@ import org.apache.vxquery.datamodel.accessors.TaggedValuePointable;
import org.apache.vxquery.exceptions.SystemException;
import org.apache.vxquery.runtime.functions.base.AbstractTaggedValueArgumentUnnestingEvaluator;
-import edu.uci.ics.hyracks.algebricks.common.exceptions.AlgebricksException;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluator;
-import edu.uci.ics.hyracks.api.context.IHyracksTaskContext;
-import edu.uci.ics.hyracks.data.std.api.IPointable;
+import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluator;
+import org.apache.hyracks.api.context.IHyracksTaskContext;
+import org.apache.hyracks.data.std.api.IPointable;
public class ChildPathStepUnnestingEvaluator extends AbstractTaggedValueArgumentUnnestingEvaluator {
final ChildPathStepUnnesting childPathStep;
@@ -41,4 +41,4 @@ public class ChildPathStepUnnestingEvaluator extends AbstractTaggedValueArgument
protected void init(TaggedValuePointable[] args) throws SystemException {
childPathStep.init(args);
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/step/ChildPathStepUnnestingEvaluatorFactory.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/step/ChildPathStepUnnestingEvaluatorFactory.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/step/ChildPathStepUnnestingEvaluatorFactory.java
index fc9844a..db7efc5 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/step/ChildPathStepUnnestingEvaluatorFactory.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/step/ChildPathStepUnnestingEvaluatorFactory.java
@@ -18,11 +18,11 @@ package org.apache.vxquery.runtime.functions.step;
import org.apache.vxquery.runtime.functions.base.AbstractTaggedValueArgumentUnnestingEvaluatorFactory;
-import edu.uci.ics.hyracks.algebricks.common.exceptions.AlgebricksException;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluator;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IUnnestingEvaluator;
-import edu.uci.ics.hyracks.api.context.IHyracksTaskContext;
+import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluator;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
+import org.apache.hyracks.algebricks.runtime.base.IUnnestingEvaluator;
+import org.apache.hyracks.api.context.IHyracksTaskContext;
public class ChildPathStepUnnestingEvaluatorFactory extends AbstractTaggedValueArgumentUnnestingEvaluatorFactory {
private static final long serialVersionUID = 1L;
@@ -36,4 +36,4 @@ public class ChildPathStepUnnestingEvaluatorFactory extends AbstractTaggedValueA
throws AlgebricksException {
return new ChildPathStepUnnestingEvaluator(ctx, args);
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/step/DescendantOrSelfPathStepScalarEvaluator.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/step/DescendantOrSelfPathStepScalarEvaluator.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/step/DescendantOrSelfPathStepScalarEvaluator.java
index 4640dc8..1e48168 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/step/DescendantOrSelfPathStepScalarEvaluator.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/step/DescendantOrSelfPathStepScalarEvaluator.java
@@ -23,11 +23,11 @@ import org.apache.vxquery.datamodel.builders.sequence.SequenceBuilder;
import org.apache.vxquery.exceptions.ErrorCode;
import org.apache.vxquery.exceptions.SystemException;
-import edu.uci.ics.hyracks.algebricks.common.exceptions.AlgebricksException;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluator;
-import edu.uci.ics.hyracks.api.context.IHyracksTaskContext;
-import edu.uci.ics.hyracks.data.std.api.IPointable;
-import edu.uci.ics.hyracks.data.std.util.ArrayBackedValueStorage;
+import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluator;
+import org.apache.hyracks.api.context.IHyracksTaskContext;
+import org.apache.hyracks.data.std.api.IPointable;
+import org.apache.hyracks.data.std.util.ArrayBackedValueStorage;
public class DescendantOrSelfPathStepScalarEvaluator extends AbstractDescendantPathStepScalarEvaluator {
private final SequenceBuilder seqb = new SequenceBuilder();
@@ -63,4 +63,4 @@ public class DescendantOrSelfPathStepScalarEvaluator extends AbstractDescendantP
}
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/step/DescendantOrSelfPathStepScalarEvaluatorFactory.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/step/DescendantOrSelfPathStepScalarEvaluatorFactory.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/step/DescendantOrSelfPathStepScalarEvaluatorFactory.java
index 1a7b000..d7df395 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/step/DescendantOrSelfPathStepScalarEvaluatorFactory.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/step/DescendantOrSelfPathStepScalarEvaluatorFactory.java
@@ -18,10 +18,10 @@ package org.apache.vxquery.runtime.functions.step;
import org.apache.vxquery.runtime.functions.base.AbstractTaggedValueArgumentScalarEvaluatorFactory;
-import edu.uci.ics.hyracks.algebricks.common.exceptions.AlgebricksException;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluator;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
-import edu.uci.ics.hyracks.api.context.IHyracksTaskContext;
+import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluator;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
+import org.apache.hyracks.api.context.IHyracksTaskContext;
public class DescendantOrSelfPathStepScalarEvaluatorFactory extends AbstractTaggedValueArgumentScalarEvaluatorFactory {
private static final long serialVersionUID = 1L;
@@ -35,4 +35,4 @@ public class DescendantOrSelfPathStepScalarEvaluatorFactory extends AbstractTagg
throws AlgebricksException {
return new DescendantOrSelfPathStepScalarEvaluator(args, ctx);
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/step/DescendantOrSelfPathStepUnnesting.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/step/DescendantOrSelfPathStepUnnesting.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/step/DescendantOrSelfPathStepUnnesting.java
index d03e441..2cc6818 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/step/DescendantOrSelfPathStepUnnesting.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/step/DescendantOrSelfPathStepUnnesting.java
@@ -29,10 +29,10 @@ import org.apache.vxquery.exceptions.SystemException;
import org.apache.vxquery.runtime.functions.step.NodeTestFilter.INodeFilter;
import org.apache.vxquery.types.SequenceType;
-import edu.uci.ics.hyracks.algebricks.common.exceptions.AlgebricksException;
-import edu.uci.ics.hyracks.api.context.IHyracksTaskContext;
-import edu.uci.ics.hyracks.data.std.api.IPointable;
-import edu.uci.ics.hyracks.data.std.primitive.IntegerPointable;
+import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
+import org.apache.hyracks.api.context.IHyracksTaskContext;
+import org.apache.hyracks.data.std.api.IPointable;
+import org.apache.hyracks.data.std.primitive.IntegerPointable;
public class DescendantOrSelfPathStepUnnesting extends AbstractForwardAxisPathStep {
private boolean testSelf;
@@ -184,4 +184,4 @@ public class DescendantOrSelfPathStepUnnesting extends AbstractForwardAxisPathSt
pp.giveBack(seqItem);
}
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/step/DescendantOrSelfPathStepUnnestingEvaluator.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/step/DescendantOrSelfPathStepUnnestingEvaluator.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/step/DescendantOrSelfPathStepUnnestingEvaluator.java
index 9c0eb40..ecba5db 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/step/DescendantOrSelfPathStepUnnestingEvaluator.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/step/DescendantOrSelfPathStepUnnestingEvaluator.java
@@ -20,10 +20,10 @@ import org.apache.vxquery.datamodel.accessors.TaggedValuePointable;
import org.apache.vxquery.exceptions.SystemException;
import org.apache.vxquery.runtime.functions.base.AbstractTaggedValueArgumentUnnestingEvaluator;
-import edu.uci.ics.hyracks.algebricks.common.exceptions.AlgebricksException;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluator;
-import edu.uci.ics.hyracks.api.context.IHyracksTaskContext;
-import edu.uci.ics.hyracks.data.std.api.IPointable;
+import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluator;
+import org.apache.hyracks.api.context.IHyracksTaskContext;
+import org.apache.hyracks.data.std.api.IPointable;
public class DescendantOrSelfPathStepUnnestingEvaluator extends AbstractTaggedValueArgumentUnnestingEvaluator {
final DescendantOrSelfPathStepUnnesting descendantOrSelfPathStep;
@@ -41,4 +41,4 @@ public class DescendantOrSelfPathStepUnnestingEvaluator extends AbstractTaggedVa
protected void init(TaggedValuePointable[] args) throws SystemException {
descendantOrSelfPathStep.init(args);
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/step/DescendantOrSelfPathStepUnnestingEvaluatorFactory.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/step/DescendantOrSelfPathStepUnnestingEvaluatorFactory.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/step/DescendantOrSelfPathStepUnnestingEvaluatorFactory.java
index 10e2f3d..947745f 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/step/DescendantOrSelfPathStepUnnestingEvaluatorFactory.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/step/DescendantOrSelfPathStepUnnestingEvaluatorFactory.java
@@ -18,11 +18,11 @@ package org.apache.vxquery.runtime.functions.step;
import org.apache.vxquery.runtime.functions.base.AbstractTaggedValueArgumentUnnestingEvaluatorFactory;
-import edu.uci.ics.hyracks.algebricks.common.exceptions.AlgebricksException;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluator;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IUnnestingEvaluator;
-import edu.uci.ics.hyracks.api.context.IHyracksTaskContext;
+import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluator;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
+import org.apache.hyracks.algebricks.runtime.base.IUnnestingEvaluator;
+import org.apache.hyracks.api.context.IHyracksTaskContext;
public class DescendantOrSelfPathStepUnnestingEvaluatorFactory extends
AbstractTaggedValueArgumentUnnestingEvaluatorFactory {
@@ -37,4 +37,4 @@ public class DescendantOrSelfPathStepUnnestingEvaluatorFactory extends
throws AlgebricksException {
return new DescendantOrSelfPathStepUnnestingEvaluator(ctx, args);
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/step/DescendantPathStepScalarEvaluator.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/step/DescendantPathStepScalarEvaluator.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/step/DescendantPathStepScalarEvaluator.java
index 7672d37..cfa9cc6 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/step/DescendantPathStepScalarEvaluator.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/step/DescendantPathStepScalarEvaluator.java
@@ -23,11 +23,11 @@ import org.apache.vxquery.datamodel.builders.sequence.SequenceBuilder;
import org.apache.vxquery.exceptions.ErrorCode;
import org.apache.vxquery.exceptions.SystemException;
-import edu.uci.ics.hyracks.algebricks.common.exceptions.AlgebricksException;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluator;
-import edu.uci.ics.hyracks.api.context.IHyracksTaskContext;
-import edu.uci.ics.hyracks.data.std.api.IPointable;
-import edu.uci.ics.hyracks.data.std.util.ArrayBackedValueStorage;
+import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluator;
+import org.apache.hyracks.api.context.IHyracksTaskContext;
+import org.apache.hyracks.data.std.api.IPointable;
+import org.apache.hyracks.data.std.util.ArrayBackedValueStorage;
public class DescendantPathStepScalarEvaluator extends AbstractDescendantPathStepScalarEvaluator {
private final SequenceBuilder seqb = new SequenceBuilder();
@@ -63,4 +63,4 @@ public class DescendantPathStepScalarEvaluator extends AbstractDescendantPathSte
}
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/step/DescendantPathStepScalarEvaluatorFactory.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/step/DescendantPathStepScalarEvaluatorFactory.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/step/DescendantPathStepScalarEvaluatorFactory.java
index 1dc108b..f0b38d6 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/step/DescendantPathStepScalarEvaluatorFactory.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/step/DescendantPathStepScalarEvaluatorFactory.java
@@ -18,10 +18,10 @@ package org.apache.vxquery.runtime.functions.step;
import org.apache.vxquery.runtime.functions.base.AbstractTaggedValueArgumentScalarEvaluatorFactory;
-import edu.uci.ics.hyracks.algebricks.common.exceptions.AlgebricksException;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluator;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
-import edu.uci.ics.hyracks.api.context.IHyracksTaskContext;
+import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluator;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
+import org.apache.hyracks.api.context.IHyracksTaskContext;
public class DescendantPathStepScalarEvaluatorFactory extends AbstractTaggedValueArgumentScalarEvaluatorFactory {
private static final long serialVersionUID = 1L;
@@ -35,4 +35,4 @@ public class DescendantPathStepScalarEvaluatorFactory extends AbstractTaggedValu
throws AlgebricksException {
return new DescendantOrSelfPathStepScalarEvaluator(args, ctx);
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/step/DescendantPathStepUnnestingEvaluator.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/step/DescendantPathStepUnnestingEvaluator.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/step/DescendantPathStepUnnestingEvaluator.java
index 25455e8..189e4ad 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/step/DescendantPathStepUnnestingEvaluator.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/step/DescendantPathStepUnnestingEvaluator.java
@@ -20,10 +20,10 @@ import org.apache.vxquery.datamodel.accessors.TaggedValuePointable;
import org.apache.vxquery.exceptions.SystemException;
import org.apache.vxquery.runtime.functions.base.AbstractTaggedValueArgumentUnnestingEvaluator;
-import edu.uci.ics.hyracks.algebricks.common.exceptions.AlgebricksException;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluator;
-import edu.uci.ics.hyracks.api.context.IHyracksTaskContext;
-import edu.uci.ics.hyracks.data.std.api.IPointable;
+import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluator;
+import org.apache.hyracks.api.context.IHyracksTaskContext;
+import org.apache.hyracks.data.std.api.IPointable;
public class DescendantPathStepUnnestingEvaluator extends AbstractTaggedValueArgumentUnnestingEvaluator {
final DescendantOrSelfPathStepUnnesting descendantPathStep;
@@ -41,4 +41,4 @@ public class DescendantPathStepUnnestingEvaluator extends AbstractTaggedValueArg
protected void init(TaggedValuePointable[] args) throws SystemException {
descendantPathStep.init(args);
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/step/DescendantPathStepUnnestingEvaluatorFactory.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/step/DescendantPathStepUnnestingEvaluatorFactory.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/step/DescendantPathStepUnnestingEvaluatorFactory.java
index 357ab42..f6d0c49 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/step/DescendantPathStepUnnestingEvaluatorFactory.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/step/DescendantPathStepUnnestingEvaluatorFactory.java
@@ -18,11 +18,11 @@ package org.apache.vxquery.runtime.functions.step;
import org.apache.vxquery.runtime.functions.base.AbstractTaggedValueArgumentUnnestingEvaluatorFactory;
-import edu.uci.ics.hyracks.algebricks.common.exceptions.AlgebricksException;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluator;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IUnnestingEvaluator;
-import edu.uci.ics.hyracks.api.context.IHyracksTaskContext;
+import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluator;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
+import org.apache.hyracks.algebricks.runtime.base.IUnnestingEvaluator;
+import org.apache.hyracks.api.context.IHyracksTaskContext;
public class DescendantPathStepUnnestingEvaluatorFactory extends AbstractTaggedValueArgumentUnnestingEvaluatorFactory {
private static final long serialVersionUID = 1L;
@@ -36,4 +36,4 @@ public class DescendantPathStepUnnestingEvaluatorFactory extends AbstractTaggedV
throws AlgebricksException {
return new DescendantPathStepUnnestingEvaluator(ctx, args);
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/step/NodeTestFilter.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/step/NodeTestFilter.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/step/NodeTestFilter.java
index 73d2738..7b35e29 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/step/NodeTestFilter.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/step/NodeTestFilter.java
@@ -28,9 +28,9 @@ import org.apache.vxquery.types.NameTest;
import org.apache.vxquery.types.NodeType;
import org.apache.vxquery.types.SequenceType;
-import edu.uci.ics.hyracks.data.std.api.IPointable;
-import edu.uci.ics.hyracks.data.std.primitive.UTF8StringPointable;
-import edu.uci.ics.hyracks.data.std.primitive.VoidPointable;
+import org.apache.hyracks.data.std.api.IPointable;
+import org.apache.hyracks.data.std.primitive.UTF8StringPointable;
+import org.apache.hyracks.data.std.primitive.VoidPointable;
public class NodeTestFilter {
@@ -179,4 +179,4 @@ public class NodeTestFilter {
public interface INodeFilter {
public boolean accept(NodeTreePointable ntp, TaggedValuePointable tvp);
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/step/SelfPathStepScalarEvaluator.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/step/SelfPathStepScalarEvaluator.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/step/SelfPathStepScalarEvaluator.java
index dcd68aa..91d0d2b 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/step/SelfPathStepScalarEvaluator.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/step/SelfPathStepScalarEvaluator.java
@@ -28,10 +28,10 @@ import org.apache.vxquery.types.ElementType;
import org.apache.vxquery.types.Quantifier;
import org.apache.vxquery.types.SequenceType;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluator;
-import edu.uci.ics.hyracks.api.context.IHyracksTaskContext;
-import edu.uci.ics.hyracks.data.std.api.IPointable;
-import edu.uci.ics.hyracks.data.std.util.ArrayBackedValueStorage;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluator;
+import org.apache.hyracks.api.context.IHyracksTaskContext;
+import org.apache.hyracks.data.std.api.IPointable;
+import org.apache.hyracks.data.std.util.ArrayBackedValueStorage;
public class SelfPathStepScalarEvaluator extends AbstractPathStepScalarEvaluator {
private final TaggedValuePointable rootTVP;
@@ -81,4 +81,4 @@ public class SelfPathStepScalarEvaluator extends AbstractPathStepScalarEvaluator
throw new SystemException(ErrorCode.SYSE0001, e);
}
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/step/SelfPathStepScalarEvaluatorFactory.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/step/SelfPathStepScalarEvaluatorFactory.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/step/SelfPathStepScalarEvaluatorFactory.java
index 7204f60..ab6acad 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/step/SelfPathStepScalarEvaluatorFactory.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/step/SelfPathStepScalarEvaluatorFactory.java
@@ -18,10 +18,10 @@ package org.apache.vxquery.runtime.functions.step;
import org.apache.vxquery.runtime.functions.base.AbstractTaggedValueArgumentScalarEvaluatorFactory;
-import edu.uci.ics.hyracks.algebricks.common.exceptions.AlgebricksException;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluator;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
-import edu.uci.ics.hyracks.api.context.IHyracksTaskContext;
+import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluator;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
+import org.apache.hyracks.api.context.IHyracksTaskContext;
public class SelfPathStepScalarEvaluatorFactory extends AbstractTaggedValueArgumentScalarEvaluatorFactory {
private static final long serialVersionUID = 1L;
@@ -35,4 +35,4 @@ public class SelfPathStepScalarEvaluatorFactory extends AbstractTaggedValueArgum
throws AlgebricksException {
return new SelfPathStepScalarEvaluator(args, ctx);
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/strings/AbstractCharacterIteratorCopyingEvaluator.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/strings/AbstractCharacterIteratorCopyingEvaluator.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/strings/AbstractCharacterIteratorCopyingEvaluator.java
index c668987..ef5511b 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/strings/AbstractCharacterIteratorCopyingEvaluator.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/strings/AbstractCharacterIteratorCopyingEvaluator.java
@@ -26,9 +26,9 @@ import org.apache.vxquery.exceptions.SystemException;
import org.apache.vxquery.runtime.functions.base.AbstractTaggedValueArgumentScalarEvaluator;
import org.apache.vxquery.runtime.functions.util.FunctionHelper;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluator;
-import edu.uci.ics.hyracks.data.std.api.IPointable;
-import edu.uci.ics.hyracks.data.std.util.ArrayBackedValueStorage;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluator;
+import org.apache.hyracks.data.std.api.IPointable;
+import org.apache.hyracks.data.std.util.ArrayBackedValueStorage;
public abstract class AbstractCharacterIteratorCopyingEvaluator extends AbstractTaggedValueArgumentScalarEvaluator {
private final ICharacterIterator charIterator;
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/strings/AbstractCharacterIteratorCopyingEvaluatorFactory.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/strings/AbstractCharacterIteratorCopyingEvaluatorFactory.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/strings/AbstractCharacterIteratorCopyingEvaluatorFactory.java
index 2430970..e98a12c 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/strings/AbstractCharacterIteratorCopyingEvaluatorFactory.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/strings/AbstractCharacterIteratorCopyingEvaluatorFactory.java
@@ -18,7 +18,7 @@ package org.apache.vxquery.runtime.functions.strings;
import org.apache.vxquery.runtime.functions.base.AbstractTaggedValueArgumentScalarEvaluatorFactory;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
public abstract class AbstractCharacterIteratorCopyingEvaluatorFactory extends
AbstractTaggedValueArgumentScalarEvaluatorFactory {
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/strings/FnCodepointEqualEvaluatorFactory.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/strings/FnCodepointEqualEvaluatorFactory.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/strings/FnCodepointEqualEvaluatorFactory.java
index 6b8b18b..3782942 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/strings/FnCodepointEqualEvaluatorFactory.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/strings/FnCodepointEqualEvaluatorFactory.java
@@ -26,12 +26,12 @@ import org.apache.vxquery.runtime.functions.base.AbstractTaggedValueArgumentScal
import org.apache.vxquery.runtime.functions.base.AbstractTaggedValueArgumentScalarEvaluatorFactory;
import org.apache.vxquery.runtime.functions.util.FunctionHelper;
-import edu.uci.ics.hyracks.algebricks.common.exceptions.AlgebricksException;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluator;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
-import edu.uci.ics.hyracks.api.context.IHyracksTaskContext;
-import edu.uci.ics.hyracks.data.std.api.IPointable;
-import edu.uci.ics.hyracks.data.std.primitive.UTF8StringPointable;
+import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluator;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
+import org.apache.hyracks.api.context.IHyracksTaskContext;
+import org.apache.hyracks.data.std.api.IPointable;
+import org.apache.hyracks.data.std.primitive.UTF8StringPointable;
public class FnCodepointEqualEvaluatorFactory extends AbstractTaggedValueArgumentScalarEvaluatorFactory {
private static final long serialVersionUID = 1L;
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/strings/FnCodepointsToStringEvaluatorFactory.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/strings/FnCodepointsToStringEvaluatorFactory.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/strings/FnCodepointsToStringEvaluatorFactory.java
index dd1d5b0..be74646 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/strings/FnCodepointsToStringEvaluatorFactory.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/strings/FnCodepointsToStringEvaluatorFactory.java
@@ -28,14 +28,14 @@ import org.apache.vxquery.runtime.functions.base.AbstractTaggedValueArgumentScal
import org.apache.vxquery.runtime.functions.base.AbstractTaggedValueArgumentScalarEvaluatorFactory;
import org.apache.vxquery.runtime.functions.util.FunctionHelper;
-import edu.uci.ics.hyracks.algebricks.common.exceptions.AlgebricksException;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluator;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
-import edu.uci.ics.hyracks.api.context.IHyracksTaskContext;
-import edu.uci.ics.hyracks.data.std.api.IPointable;
-import edu.uci.ics.hyracks.data.std.primitive.LongPointable;
-import edu.uci.ics.hyracks.data.std.primitive.VoidPointable;
-import edu.uci.ics.hyracks.data.std.util.ArrayBackedValueStorage;
+import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluator;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
+import org.apache.hyracks.api.context.IHyracksTaskContext;
+import org.apache.hyracks.data.std.api.IPointable;
+import org.apache.hyracks.data.std.primitive.LongPointable;
+import org.apache.hyracks.data.std.primitive.VoidPointable;
+import org.apache.hyracks.data.std.util.ArrayBackedValueStorage;
public class FnCodepointsToStringEvaluatorFactory extends AbstractTaggedValueArgumentScalarEvaluatorFactory {
private static final long serialVersionUID = 1L;
[42/50] [abbrv] vxquery git commit: VXQUERY-191: Fixed sort order for
XQTS text results
Posted by sj...@apache.org.
VXQUERY-191: Fixed sort order for XQTS text results
used String.CASE_INSENSITIVE comparitor
Author: Menaka
Project: http://git-wip-us.apache.org/repos/asf/vxquery/repo
Commit: http://git-wip-us.apache.org/repos/asf/vxquery/commit/7de1fbaa
Tree: http://git-wip-us.apache.org/repos/asf/vxquery/tree/7de1fbaa
Diff: http://git-wip-us.apache.org/repos/asf/vxquery/diff/7de1fbaa
Branch: refs/heads/site
Commit: 7de1fbaa3196edd00ee4a2ad670862b85076638d
Parents: 015c5f6
Author: Steven Jacobs <sj...@ucr.edu>
Authored: Wed May 18 14:03:56 2016 -0700
Committer: Steven Jacobs <sj...@ucr.edu>
Committed: Wed May 18 14:03:56 2016 -0700
----------------------------------------------------------------------
.../apt/development_update_xqts_results.apt | 14 +-
src/site/apt/user_running_tests.apt | 4 +-
vxquery-xtest/pom.xml | 2 +-
vxquery-xtest/results/xqts.txt | 34992 ++++++++---------
.../vxquery/xtest/LineFileReporterImpl.java | 11 +
.../apache/vxquery/xtest/ResultFileSorter.java | 101 +
.../java/org/apache/vxquery/xtest/XTest.java | 7 +-
7 files changed, 17616 insertions(+), 17515 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/vxquery/blob/7de1fbaa/src/site/apt/development_update_xqts_results.apt
----------------------------------------------------------------------
diff --git a/src/site/apt/development_update_xqts_results.apt b/src/site/apt/development_update_xqts_results.apt
index 50b36d8..289d28e 100644
--- a/src/site/apt/development_update_xqts_results.apt
+++ b/src/site/apt/development_update_xqts_results.apt
@@ -39,17 +39,5 @@ rm vxquery-xtest/results/xqts.txt
* Generate the new XQTS result file and save it in the text format.
----------------------------------------
-sh ./vxquery-xtest/target/appassembler/bin/xtest -catalog vxquery-xtest/test-suites/xqts/XQTSCatalog.xml -textreport vxquery-xtest/results/xqts_temp.txt
-----------------------------------------
-
- * Sort the results so they can be compared with previous results.
-
-----------------------------------------
-sort -V vxquery-xtest/results/xqts_temp.txt --output=vxquery-xtest/results/xqts.txt
-----------------------------------------
-
- * Clean up (remove) the temporary results files.
-
-----------------------------------------
-rm vxquery-xtest/results/xqts_temp.txt
+sh ./vxquery-xtest/target/appassembler/bin/xtest -catalog vxquery-xtest/test-suites/xqts/XQTSCatalog.xml -textreport vxquery-xtest/results/xqts.txt
----------------------------------------
http://git-wip-us.apache.org/repos/asf/vxquery/blob/7de1fbaa/src/site/apt/user_running_tests.apt
----------------------------------------------------------------------
diff --git a/src/site/apt/user_running_tests.apt b/src/site/apt/user_running_tests.apt
index c117785..9bd9e3a 100644
--- a/src/site/apt/user_running_tests.apt
+++ b/src/site/apt/user_running_tests.apt
@@ -79,10 +79,10 @@ $ mkdir -p vxquery-xtest/test-suites
$ cd vxquery-xtest/test-suites
----------------------------------------
- * Get the archive {{{http://dev.w3.org/2006/xquery-test-suite/PublicPagesStagingArea/XQTS_1_0_3.zip}XQTS_1_0_3.zip}} (e.g. using wget),
+ * Get the archive {{{http://dev.w3.org/2006/xquery-test-suite/PublicPagesStagingArea/XQTS_1_0_3.zip}XQTS_1_0_3.zip}} (e.g. using curl),
----------------------------------------
-$ wget http://dev.w3.org/2006/xquery-test-suite/PublicPagesStagingArea/XQTS_1_0_3.zip
+$ curl -O https://dev.w3.org/2006/xquery-test-suite/PublicPagesStagingArea/XQTS_1_0_3.zip
----------------------------------------
* unpack it,
http://git-wip-us.apache.org/repos/asf/vxquery/blob/7de1fbaa/vxquery-xtest/pom.xml
----------------------------------------------------------------------
diff --git a/vxquery-xtest/pom.xml b/vxquery-xtest/pom.xml
index 59da063..0c563e7 100644
--- a/vxquery-xtest/pom.xml
+++ b/vxquery-xtest/pom.xml
@@ -159,7 +159,7 @@
<groupId>org.apache.hyracks</groupId>
<artifactId>hyracks-dataflow-std</artifactId>
</dependency>
-
+
<dependency>
<groupId>org.mortbay.jetty</groupId>
<artifactId>jetty</artifactId>
[12/50] [abbrv] vxquery git commit: VXQUERY-181 - Move to Hyracks
0.2.16
Posted by sj...@apache.org.
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/xmlparser/XMLParser.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/xmlparser/XMLParser.java b/vxquery-core/src/main/java/org/apache/vxquery/xmlparser/XMLParser.java
index 23977d5..77d500c 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/xmlparser/XMLParser.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/xmlparser/XMLParser.java
@@ -21,10 +21,13 @@ import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.InputStreamReader;
import java.io.Reader;
-import java.nio.ByteBuffer;
import java.util.ArrayList;
import java.util.List;
+import org.apache.hyracks.api.comm.IFrameFieldAppender;
+import org.apache.hyracks.api.comm.IFrameWriter;
+import org.apache.hyracks.api.exceptions.HyracksDataException;
+import org.apache.hyracks.data.std.util.ArrayBackedValueStorage;
import org.apache.vxquery.context.StaticContext;
import org.apache.vxquery.exceptions.VXQueryFileNotFoundException;
import org.apache.vxquery.exceptions.VXQueryParseException;
@@ -34,12 +37,6 @@ import org.xml.sax.SAXException;
import org.xml.sax.XMLReader;
import org.xml.sax.helpers.XMLReaderFactory;
-import edu.uci.ics.hyracks.api.comm.IFrameWriter;
-import edu.uci.ics.hyracks.api.exceptions.HyracksDataException;
-import edu.uci.ics.hyracks.data.std.util.ArrayBackedValueStorage;
-import edu.uci.ics.hyracks.dataflow.common.comm.io.FrameTupleAccessor;
-import edu.uci.ics.hyracks.dataflow.common.comm.io.FrameTupleAppender;
-
public class XMLParser {
final XMLReader parser;
final SAXContentHandler handler;
@@ -48,24 +45,23 @@ public class XMLParser {
final int bufferSize;
public XMLParser(boolean attachTypes, ITreeNodeIdProvider idProvider, String nodeId) throws HyracksDataException {
- this(attachTypes, idProvider, nodeId, null, null, null, null);
+ this(attachTypes, idProvider, nodeId, null, null, null);
}
- public XMLParser(boolean attachTypes, ITreeNodeIdProvider idProvider, String nodeId, ByteBuffer frame,
- FrameTupleAppender appender, List<Integer> childSeq, StaticContext staticContext)
- throws HyracksDataException {
+ public XMLParser(boolean attachTypes, ITreeNodeIdProvider idProvider, String nodeId, IFrameFieldAppender appender,
+ List<Integer> childSeq, StaticContext staticContext) throws HyracksDataException {
bufferSize = Integer.parseInt(System.getProperty("vxquery.buffer_size", "-1"));
this.nodeId = nodeId;
try {
parser = XMLReaderFactory.createXMLReader();
- if (frame == null || appender == null) {
+ if (appender == null) {
handler = new SAXContentHandler(attachTypes, idProvider);
} else {
List<SequenceType> childSequenceTypes = new ArrayList<SequenceType>();
for (int typeCode : childSeq) {
childSequenceTypes.add(staticContext.lookupSequenceType(typeCode));
}
- handler = new SAXContentHandler(attachTypes, idProvider, frame, appender, childSequenceTypes);
+ handler = new SAXContentHandler(attachTypes, idProvider, appender, childSequenceTypes);
}
parser.setContentHandler(handler);
parser.setProperty("http://xml.org/sax/properties/lexical-handler", handler);
@@ -102,7 +98,7 @@ public class XMLParser {
}
}
- public void parseElements(File file, IFrameWriter writer, FrameTupleAccessor fta, int tupleIndex)
+ public void parseElements(File file, IFrameWriter writer, int tupleIndex)
throws HyracksDataException {
try {
Reader input;
@@ -112,7 +108,7 @@ public class XMLParser {
input = new InputStreamReader(new FileInputStream(file));
}
in.setCharacterStream(input);
- handler.setupElementWriter(writer, fta, tupleIndex);
+ handler.setupElementWriter(writer, tupleIndex);
parser.parse(in);
input.close();
} catch (FileNotFoundException e) {
@@ -130,4 +126,4 @@ public class XMLParser {
}
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/ASTNode.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/ASTNode.java b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/ASTNode.java
index 9cc076d..ee31758 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/ASTNode.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/ASTNode.java
@@ -35,4 +35,4 @@ public abstract class ASTNode {
public String toString() {
return Debug.toString(this);
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/ASTTag.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/ASTTag.java b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/ASTTag.java
index c069aee..65acb21 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/ASTTag.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/ASTTag.java
@@ -19,4 +19,4 @@ package org.apache.vxquery.xmlquery.ast;
public enum ASTTag {
VERSION_DECL, PROLOG, LIBRARY_MODULE, MODULE_DECLARATION, MAIN_MODULE, QUERY_BODY, BOUNDARY_SPACE_DECLARATION, DEFAULT_ELEMENT_NAMESPACE_DECLARATION, DEFAULT_FUNCTION_NAMESPACE_DECLARATION, OPTION_DECLARATION, FT_OPTION_DECLARATION, ORDERING_MODE_DECLARATION, EMPTY_ORDER_DECLARATION, COPY_NAMESPACES_DECLARATION, DEFAULT_COLLATION_DECLARATION, BASE_URI_DECLARATION, SCHEMA_IMPORT, MODULE_IMPORT, VARIABLE_DECLARATION, TYPE_DECLARATION, SEQUENCE_TYPE, ITEM_TYPE, ATOMIC_TYPE, ANY_NODE_TEST, ITEM_TEST, DOCUMENT_TEST, QNAME, ELEMENT_TEST, SCHEMA_ELEMENT_TEST, ATTRIBUTE_TEST, SCHEMA_ATTRIBUTE_TEST, TEXT_TEST, COMMENT_TEST, PI_TEST, TYPE_NAME, CONSTRUCTION_DECLARATION, FUNCTION_DECLARATION, FUNCTION_PARAMETER, ENCLOSED_EXPRESSION, EXPRESSION, FLWOR_EXPRESSION, FOR_CLAUSE, FOR_VARIABLE_DECLARATION, LET_VARIABLE_DECLARATION, LET_CLAUSE, WHERE_CLAUSE, ORDERBY_CLAUSE, ORDER_SPECIFICATION, QUANTIFIED_EXPRESSION, QUANTIFIED_VARIABLE_DECLARATION, TYPESWITCH_EXPRESSION, CASE_CLAUSE, IF_EXPRESSIO
N, INFIX_EXPRESSION, TYPE_EXPRESSION, UNARY_EXPRESSION, VALIDATE_EXPRESSION, EXTENSION_EXPRESSION, PRAGMA_NODE, PATH_EXPRESSION, AXIS_STEP, NAME_TEST, FILTER_EXPRESSION, LITERAL, VARIABLE_REFERENCE, PARENTHESIZED_EXPRESSION, CONTEXT_ITEM, ORDERED_EXPRESSION, UNORDERED_EXPRESSION, FUNCTION_EXPRESSION, DIRECT_ELEMENT_CONSTRUCTOR, DIRECT_ATTRIBUTE_CONSTRUCTOR, DQUOTED_ATTRIBUTE_CONTENT, SQUOTED_ATTRIBUTE_CONTENT, TEXTUAL_NODE_CONTENT, CDATA_SECTION, DIRECT_COMMENT_CONSTRUCTOR, DIRECT_PI_CONSTRUCTOR, COMPUTED_DOCUMENT_CONSTRUCTOR, COMPUTED_ATTRIBUTE_CONSTRUCTOR, COMPUTED_ELEMENT_CONSTRUCTOR, COMPUTED_TEXT_CONSTRUCTOR, COMPUTED_COMMENT_CONSTRUCTOR, EMPTY_SEQUENCE_TYPE, RELATIVE_PATH_EXPRESSION, COMPUTED_PI_CONSTRUCTOR, NCNAME, CONTENT_CHARS, NAMESPACE_DECLARATION, SINGLE_TYPE
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/AnyNodeTestNode.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/AnyNodeTestNode.java b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/AnyNodeTestNode.java
index 29a8376..34659bd 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/AnyNodeTestNode.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/AnyNodeTestNode.java
@@ -27,4 +27,4 @@ public class AnyNodeTestNode extends ASTNode {
public ASTTag getTag() {
return ASTTag.ANY_NODE_TEST;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/AtomicTypeNode.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/AtomicTypeNode.java b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/AtomicTypeNode.java
index 58b95cb..1c710ae 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/AtomicTypeNode.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/AtomicTypeNode.java
@@ -37,4 +37,4 @@ public class AtomicTypeNode extends ASTNode {
public QNameNode getName() {
return name;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/AttributeTestNode.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/AttributeTestNode.java b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/AttributeTestNode.java
index 195aec8..c25c173 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/AttributeTestNode.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/AttributeTestNode.java
@@ -46,4 +46,4 @@ public class AttributeTestNode extends ASTNode {
public void setTypeName(QNameNode typeName) {
this.typeName = typeName;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/AxisStepNode.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/AxisStepNode.java b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/AxisStepNode.java
index 61833d8..b129508 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/AxisStepNode.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/AxisStepNode.java
@@ -61,4 +61,4 @@ public class AxisStepNode extends ASTNode {
public void setPredicates(List<ASTNode> predicates) {
this.predicates = predicates;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/BaseUriDeclNode.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/BaseUriDeclNode.java b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/BaseUriDeclNode.java
index 5c2ac8d..4f498fc 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/BaseUriDeclNode.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/BaseUriDeclNode.java
@@ -37,4 +37,4 @@ public class BaseUriDeclNode extends ASTNode {
public void setUri(String uri) {
this.uri = uri;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/BoundarySpaceDeclNode.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/BoundarySpaceDeclNode.java b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/BoundarySpaceDeclNode.java
index 808b0ad..2ad09c0 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/BoundarySpaceDeclNode.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/BoundarySpaceDeclNode.java
@@ -38,4 +38,4 @@ public class BoundarySpaceDeclNode extends ASTNode {
public void setMode(StaticContext.BoundarySpaceProperty mode) {
this.mode = mode;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/CDataSectionNode.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/CDataSectionNode.java b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/CDataSectionNode.java
index bbdd26d..3d56ac8 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/CDataSectionNode.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/CDataSectionNode.java
@@ -37,4 +37,4 @@ public class CDataSectionNode extends ASTNode {
public void setContent(String content) {
this.content = content;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/CaseClauseNode.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/CaseClauseNode.java b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/CaseClauseNode.java
index d3e0c08..54ac17d 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/CaseClauseNode.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/CaseClauseNode.java
@@ -55,4 +55,4 @@ public class CaseClauseNode extends ASTNode {
public void setValueExpr(ASTNode valueExpr) {
this.valueExpr = valueExpr;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/CommentTestNode.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/CommentTestNode.java b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/CommentTestNode.java
index c02992a..e5f8145 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/CommentTestNode.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/CommentTestNode.java
@@ -27,4 +27,4 @@ public class CommentTestNode extends ASTNode {
public ASTTag getTag() {
return ASTTag.COMMENT_TEST;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/ComputedAttributeConstructorNode.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/ComputedAttributeConstructorNode.java b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/ComputedAttributeConstructorNode.java
index d3cefef..d210c82 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/ComputedAttributeConstructorNode.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/ComputedAttributeConstructorNode.java
@@ -46,4 +46,4 @@ public class ComputedAttributeConstructorNode extends ASTNode {
public void setContent(ASTNode content) {
this.content = content;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/ComputedCommentConstructorNode.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/ComputedCommentConstructorNode.java b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/ComputedCommentConstructorNode.java
index b033ad7..6270135 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/ComputedCommentConstructorNode.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/ComputedCommentConstructorNode.java
@@ -37,4 +37,4 @@ public class ComputedCommentConstructorNode extends ASTNode {
public void setContent(ASTNode content) {
this.content = content;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/ComputedDocumentConstructorNode.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/ComputedDocumentConstructorNode.java b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/ComputedDocumentConstructorNode.java
index 497a4a4..7f078b0 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/ComputedDocumentConstructorNode.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/ComputedDocumentConstructorNode.java
@@ -37,4 +37,4 @@ public class ComputedDocumentConstructorNode extends ASTNode {
public void setContent(ASTNode content) {
this.content = content;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/ComputedElementConstructorNode.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/ComputedElementConstructorNode.java b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/ComputedElementConstructorNode.java
index af3e35d..99baf35 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/ComputedElementConstructorNode.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/ComputedElementConstructorNode.java
@@ -46,4 +46,4 @@ public class ComputedElementConstructorNode extends ASTNode {
public void setContent(ASTNode content) {
this.content = content;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/ComputedPIConstructorNode.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/ComputedPIConstructorNode.java b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/ComputedPIConstructorNode.java
index faea166..6bfea1e 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/ComputedPIConstructorNode.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/ComputedPIConstructorNode.java
@@ -46,4 +46,4 @@ public class ComputedPIConstructorNode extends ASTNode {
public void setContent(ASTNode content) {
this.content = content;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/ComputedTextConstructorNode.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/ComputedTextConstructorNode.java b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/ComputedTextConstructorNode.java
index 78496f7..5bd281e 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/ComputedTextConstructorNode.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/ComputedTextConstructorNode.java
@@ -37,4 +37,4 @@ public class ComputedTextConstructorNode extends ASTNode {
public void setContent(ASTNode content) {
this.content = content;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/ConstructionDeclNode.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/ConstructionDeclNode.java b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/ConstructionDeclNode.java
index beb15c8..66e4eda 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/ConstructionDeclNode.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/ConstructionDeclNode.java
@@ -38,4 +38,4 @@ public class ConstructionDeclNode extends ASTNode {
public void setMode(StaticContext.ConstructionModeProperty mode) {
this.mode = mode;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/ContentCharsNode.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/ContentCharsNode.java b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/ContentCharsNode.java
index 2c70da0..ac5836a 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/ContentCharsNode.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/ContentCharsNode.java
@@ -37,4 +37,4 @@ public class ContentCharsNode extends ASTNode {
public void setContent(String content) {
this.content = content;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/ContextItemExprNode.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/ContextItemExprNode.java b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/ContextItemExprNode.java
index ca1e1fd..6891b81 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/ContextItemExprNode.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/ContextItemExprNode.java
@@ -27,4 +27,4 @@ public class ContextItemExprNode extends ASTNode {
public ASTTag getTag() {
return ASTTag.CONTEXT_ITEM;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/CopyNamespacesDeclNode.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/CopyNamespacesDeclNode.java b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/CopyNamespacesDeclNode.java
index a4cefba..fdbaa61 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/CopyNamespacesDeclNode.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/CopyNamespacesDeclNode.java
@@ -38,4 +38,4 @@ public class CopyNamespacesDeclNode extends ASTNode {
public void setMode(StaticContext.CopyNamespacesModeProperty mode) {
this.mode = mode;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/DQuotedAttributeContentNode.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/DQuotedAttributeContentNode.java b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/DQuotedAttributeContentNode.java
index dbd2181..0b066d6 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/DQuotedAttributeContentNode.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/DQuotedAttributeContentNode.java
@@ -37,4 +37,4 @@ public class DQuotedAttributeContentNode extends ASTNode {
public void setContent(String content) {
this.content = content;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/DefaultCollationDeclNode.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/DefaultCollationDeclNode.java b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/DefaultCollationDeclNode.java
index 530e4a0..ec2a2b0 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/DefaultCollationDeclNode.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/DefaultCollationDeclNode.java
@@ -37,4 +37,4 @@ public class DefaultCollationDeclNode extends ASTNode {
public void setCollation(String collation) {
this.collation = collation;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/DefaultElementNamespaceDeclNode.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/DefaultElementNamespaceDeclNode.java b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/DefaultElementNamespaceDeclNode.java
index b53df52..06ff436 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/DefaultElementNamespaceDeclNode.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/DefaultElementNamespaceDeclNode.java
@@ -37,4 +37,4 @@ public class DefaultElementNamespaceDeclNode extends ASTNode {
public void setUri(String uri) {
this.uri = uri;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/DefaultFunctionNamespaceDeclNode.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/DefaultFunctionNamespaceDeclNode.java b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/DefaultFunctionNamespaceDeclNode.java
index ac335dd..19c091a 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/DefaultFunctionNamespaceDeclNode.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/DefaultFunctionNamespaceDeclNode.java
@@ -37,4 +37,4 @@ public class DefaultFunctionNamespaceDeclNode extends ASTNode {
public void setUri(String uri) {
this.uri = uri;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/DirectAttributeConstructorNode.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/DirectAttributeConstructorNode.java b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/DirectAttributeConstructorNode.java
index 096a8ce..bd936ec 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/DirectAttributeConstructorNode.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/DirectAttributeConstructorNode.java
@@ -48,4 +48,4 @@ public class DirectAttributeConstructorNode extends ASTNode {
public void setValue(List<ASTNode> value) {
this.value = value;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/DirectCommentConstructorNode.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/DirectCommentConstructorNode.java b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/DirectCommentConstructorNode.java
index 6cc7588..f415fbf 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/DirectCommentConstructorNode.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/DirectCommentConstructorNode.java
@@ -37,4 +37,4 @@ public class DirectCommentConstructorNode extends ASTNode {
public void setContent(String content) {
this.content = content;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/DirectElementConstructorNode.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/DirectElementConstructorNode.java b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/DirectElementConstructorNode.java
index 22c8d68..38f762a 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/DirectElementConstructorNode.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/DirectElementConstructorNode.java
@@ -66,4 +66,4 @@ public class DirectElementConstructorNode extends ASTNode {
public void setContent(List<ASTNode> content) {
this.content = content;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/DirectPIConstructorNode.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/DirectPIConstructorNode.java b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/DirectPIConstructorNode.java
index 5331952..65e82e5 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/DirectPIConstructorNode.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/DirectPIConstructorNode.java
@@ -46,4 +46,4 @@ public class DirectPIConstructorNode extends ASTNode {
public void setContent(String content) {
this.content = content;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/DocumentTestNode.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/DocumentTestNode.java b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/DocumentTestNode.java
index 2c275d6..6a2bb2d 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/DocumentTestNode.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/DocumentTestNode.java
@@ -37,4 +37,4 @@ public class DocumentTestNode extends ASTNode {
public void setElementTest(ASTNode elementTest) {
this.elementTest = elementTest;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/ElementTestNode.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/ElementTestNode.java b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/ElementTestNode.java
index 87aebb4..2c947ad 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/ElementTestNode.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/ElementTestNode.java
@@ -55,4 +55,4 @@ public class ElementTestNode extends ASTNode {
public void setNillable(boolean nillable) {
this.nillable = nillable;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/EmptyOrderDeclNode.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/EmptyOrderDeclNode.java b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/EmptyOrderDeclNode.java
index 7cd0d20..223896e 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/EmptyOrderDeclNode.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/EmptyOrderDeclNode.java
@@ -38,4 +38,4 @@ public class EmptyOrderDeclNode extends ASTNode {
public void setMode(StaticContext.EmptyOrderProperty mode) {
this.mode = mode;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/EmptySequenceTypeNode.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/EmptySequenceTypeNode.java b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/EmptySequenceTypeNode.java
index f6c9926..8856f6a 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/EmptySequenceTypeNode.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/EmptySequenceTypeNode.java
@@ -27,4 +27,4 @@ public class EmptySequenceTypeNode extends ASTNode {
public ASTTag getTag() {
return ASTTag.EMPTY_SEQUENCE_TYPE;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/EnclosedExprNode.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/EnclosedExprNode.java b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/EnclosedExprNode.java
index a3185b7..347db46 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/EnclosedExprNode.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/EnclosedExprNode.java
@@ -37,4 +37,4 @@ public class EnclosedExprNode extends ASTNode {
public ASTNode getExpression() {
return expression;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/ExprNode.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/ExprNode.java b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/ExprNode.java
index 1dfe913..8302df4 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/ExprNode.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/ExprNode.java
@@ -39,4 +39,4 @@ public class ExprNode extends ASTNode {
public void setExpressions(List<ASTNode> expressions) {
this.expressions = expressions;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/ExtensionExprNode.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/ExtensionExprNode.java b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/ExtensionExprNode.java
index fd3ecbe..a9c2a6d 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/ExtensionExprNode.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/ExtensionExprNode.java
@@ -48,4 +48,4 @@ public class ExtensionExprNode extends ASTNode {
public void setPragmas(List<PragmaNode> pragmas) {
this.pragmas = pragmas;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/FLWORClauseNode.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/FLWORClauseNode.java b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/FLWORClauseNode.java
index 625c1f1..1caaf2b 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/FLWORClauseNode.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/FLWORClauseNode.java
@@ -22,4 +22,4 @@ public abstract class FLWORClauseNode extends ASTNode {
public FLWORClauseNode(SourceLocation loc) {
super(loc);
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/FLWORExprNode.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/FLWORExprNode.java b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/FLWORExprNode.java
index 5a89899..c59f1c5 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/FLWORExprNode.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/FLWORExprNode.java
@@ -48,4 +48,4 @@ public class FLWORExprNode extends ASTNode {
public void setReturnExpr(ASTNode returnExpr) {
this.returnExpr = returnExpr;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/FTOptionDeclNode.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/FTOptionDeclNode.java b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/FTOptionDeclNode.java
index e9bde4b..a249913 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/FTOptionDeclNode.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/FTOptionDeclNode.java
@@ -37,4 +37,4 @@ public class FTOptionDeclNode extends ASTNode {
public void setMatchOption(ASTNode matchOption) {
this.matchOption = matchOption;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/FilterExprNode.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/FilterExprNode.java b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/FilterExprNode.java
index 2f740ff..a19749b 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/FilterExprNode.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/FilterExprNode.java
@@ -48,4 +48,4 @@ public class FilterExprNode extends ASTNode {
public void setPredicates(List<ASTNode> predicates) {
this.predicates = predicates;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/ForClauseNode.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/ForClauseNode.java b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/ForClauseNode.java
index 021cee0..6fca1a3 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/ForClauseNode.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/ForClauseNode.java
@@ -39,4 +39,4 @@ public class ForClauseNode extends FLWORClauseNode {
public void setVariables(List<ForVarDeclNode> variables) {
this.variables = variables;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/ForVarDeclNode.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/ForVarDeclNode.java b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/ForVarDeclNode.java
index 226f88f..053db91 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/ForVarDeclNode.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/ForVarDeclNode.java
@@ -73,4 +73,4 @@ public class ForVarDeclNode extends ASTNode {
public void setScoreVar(QNameNode scoreVar) {
this.scoreVar = scoreVar;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/FunctionDeclNode.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/FunctionDeclNode.java b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/FunctionDeclNode.java
index 6e7d908..f1c1a07 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/FunctionDeclNode.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/FunctionDeclNode.java
@@ -66,4 +66,4 @@ public class FunctionDeclNode extends ASTNode {
public void setBody(ASTNode body) {
this.body = body;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/FunctionExprNode.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/FunctionExprNode.java b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/FunctionExprNode.java
index 291be09..32afc32 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/FunctionExprNode.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/FunctionExprNode.java
@@ -48,4 +48,4 @@ public class FunctionExprNode extends ASTNode {
public void setArguments(List<ASTNode> arguments) {
this.arguments = arguments;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/IfExprNode.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/IfExprNode.java b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/IfExprNode.java
index 620022f..f963dec 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/IfExprNode.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/IfExprNode.java
@@ -55,4 +55,4 @@ public class IfExprNode extends ASTNode {
public void setElseExpr(ASTNode elseExpr) {
this.elseExpr = elseExpr;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/InfixExprNode.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/InfixExprNode.java b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/InfixExprNode.java
index 83988bc..e105f1d 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/InfixExprNode.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/InfixExprNode.java
@@ -59,4 +59,4 @@ public class InfixExprNode extends ASTNode {
public void setRightExpr(ASTNode rightExpr) {
this.rightExpr = rightExpr;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/ItemTestNode.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/ItemTestNode.java b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/ItemTestNode.java
index f33f631..35a7209 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/ItemTestNode.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/ItemTestNode.java
@@ -27,4 +27,4 @@ public class ItemTestNode extends ASTNode {
public ASTTag getTag() {
return ASTTag.ITEM_TEST;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/ItemTypeNode.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/ItemTypeNode.java b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/ItemTypeNode.java
index 678511d..6389e97 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/ItemTypeNode.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/ItemTypeNode.java
@@ -27,4 +27,4 @@ public class ItemTypeNode extends ASTNode {
public ASTTag getTag() {
return ASTTag.ITEM_TYPE;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/LetClauseNode.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/LetClauseNode.java b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/LetClauseNode.java
index a92c03e..fd332d8 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/LetClauseNode.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/LetClauseNode.java
@@ -39,4 +39,4 @@ public class LetClauseNode extends FLWORClauseNode {
public void setVariables(List<LetVarDeclNode> variables) {
this.variables = variables;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/LetVarDeclNode.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/LetVarDeclNode.java b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/LetVarDeclNode.java
index b11177c..0644543 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/LetVarDeclNode.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/LetVarDeclNode.java
@@ -64,4 +64,4 @@ public class LetVarDeclNode extends ASTNode {
public QNameNode getScoreVar() {
return scoreVar;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/LibraryModuleNode.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/LibraryModuleNode.java b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/LibraryModuleNode.java
index 7342499..5553ddd 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/LibraryModuleNode.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/LibraryModuleNode.java
@@ -37,4 +37,4 @@ public class LibraryModuleNode extends ModuleNode {
public void setModuleDecl(ModuleDeclNode moduleDecl) {
this.moduleDecl = moduleDecl;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/LiteralNode.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/LiteralNode.java b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/LiteralNode.java
index 04ef09c..774e38a 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/LiteralNode.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/LiteralNode.java
@@ -53,4 +53,4 @@ public class LiteralNode extends ASTNode {
public void setType(LiteralType type) {
this.type = type;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/MainModuleNode.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/MainModuleNode.java b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/MainModuleNode.java
index 0a79847..6416c70 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/MainModuleNode.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/MainModuleNode.java
@@ -37,4 +37,4 @@ public class MainModuleNode extends ModuleNode {
public void setQueryBody(QueryBodyNode queryBody) {
this.queryBody = queryBody;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/ModuleDeclNode.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/ModuleDeclNode.java b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/ModuleDeclNode.java
index 2e342a7..f163f78 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/ModuleDeclNode.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/ModuleDeclNode.java
@@ -46,4 +46,4 @@ public class ModuleDeclNode extends ASTNode {
public void setTargetNS(String targetNS) {
this.targetNS = targetNS;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/ModuleImportNode.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/ModuleImportNode.java b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/ModuleImportNode.java
index c3ba745..fe2b0f8 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/ModuleImportNode.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/ModuleImportNode.java
@@ -57,4 +57,4 @@ public class ModuleImportNode extends ASTNode {
public void setLocations(List<String> locations) {
this.locations = locations;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/ModuleNode.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/ModuleNode.java b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/ModuleNode.java
index bc2faa3..531900d 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/ModuleNode.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/ModuleNode.java
@@ -42,4 +42,4 @@ public abstract class ModuleNode extends ASTNode {
public void setProlog(PrologNode prolog) {
this.prolog = prolog;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/NCNameNode.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/NCNameNode.java b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/NCNameNode.java
index 759a9fe..201773b 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/NCNameNode.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/NCNameNode.java
@@ -37,4 +37,4 @@ public class NCNameNode extends ASTNode {
public void setName(String name) {
this.name = name;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/NameTestNode.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/NameTestNode.java b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/NameTestNode.java
index 6248ed6..e707f83 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/NameTestNode.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/NameTestNode.java
@@ -46,4 +46,4 @@ public class NameTestNode extends ASTNode {
public void setLocalName(String localName) {
this.localName = localName;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/NamespaceDeclNode.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/NamespaceDeclNode.java b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/NamespaceDeclNode.java
index 2e6b625..3b64122 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/NamespaceDeclNode.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/NamespaceDeclNode.java
@@ -46,4 +46,4 @@ public class NamespaceDeclNode extends ASTNode {
public void setUri(String uri) {
this.uri = uri;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/OptionDeclNode.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/OptionDeclNode.java b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/OptionDeclNode.java
index 2dfd4bd..3b33e32 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/OptionDeclNode.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/OptionDeclNode.java
@@ -46,4 +46,4 @@ public class OptionDeclNode extends ASTNode {
public void setValue(String value) {
this.value = value;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/OrderSpecNode.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/OrderSpecNode.java b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/OrderSpecNode.java
index 4d53cab..0c1df93 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/OrderSpecNode.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/OrderSpecNode.java
@@ -66,4 +66,4 @@ public class OrderSpecNode extends ASTNode {
public void setCollation(String collation) {
this.collation = collation;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/OrderbyClauseNode.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/OrderbyClauseNode.java b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/OrderbyClauseNode.java
index 9b9bca4..7510670 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/OrderbyClauseNode.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/OrderbyClauseNode.java
@@ -48,4 +48,4 @@ public class OrderbyClauseNode extends FLWORClauseNode {
public void setStable(boolean stable) {
this.stable = stable;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/OrderedExprNode.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/OrderedExprNode.java b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/OrderedExprNode.java
index a99866c..2510e96 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/OrderedExprNode.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/OrderedExprNode.java
@@ -37,4 +37,4 @@ public class OrderedExprNode extends ASTNode {
public void setExpr(ASTNode expr) {
this.expr = expr;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/OrderingModeDeclNode.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/OrderingModeDeclNode.java b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/OrderingModeDeclNode.java
index cd57b14..1080be4 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/OrderingModeDeclNode.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/OrderingModeDeclNode.java
@@ -38,4 +38,4 @@ public class OrderingModeDeclNode extends ASTNode {
public void setMode(StaticContext.OrderingModeProperty mode) {
this.mode = mode;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/PITestNode.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/PITestNode.java b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/PITestNode.java
index 80a9507..d7bd8bc 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/PITestNode.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/PITestNode.java
@@ -37,4 +37,4 @@ public class PITestNode extends ASTNode {
public void setTarget(String target) {
this.target = target;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/ParamNode.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/ParamNode.java b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/ParamNode.java
index 42201fc..2eb0fcc 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/ParamNode.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/ParamNode.java
@@ -46,4 +46,4 @@ public class ParamNode extends ASTNode {
public void setType(TypeDeclNode type) {
this.type = type;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/ParenthesizedExprNode.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/ParenthesizedExprNode.java b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/ParenthesizedExprNode.java
index 62c7603..da6b5ac 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/ParenthesizedExprNode.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/ParenthesizedExprNode.java
@@ -37,4 +37,4 @@ public class ParenthesizedExprNode extends ASTNode {
public void setExpr(ASTNode expr) {
this.expr = expr;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/PathExprNode.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/PathExprNode.java b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/PathExprNode.java
index f674848..fd2f1a5 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/PathExprNode.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/PathExprNode.java
@@ -49,4 +49,4 @@ public class PathExprNode extends ASTNode {
public void setPaths(List<RelativePathExprNode> paths) {
this.paths = paths;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/PragmaNode.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/PragmaNode.java b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/PragmaNode.java
index cd30ea2..abc9736 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/PragmaNode.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/PragmaNode.java
@@ -46,4 +46,4 @@ public class PragmaNode extends ASTNode {
public void setPragmaValue(String pragmaValue) {
this.pragmaValue = pragmaValue;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/PrologNode.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/PrologNode.java b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/PrologNode.java
index 70e3e41..6410372 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/PrologNode.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/PrologNode.java
@@ -39,4 +39,4 @@ public class PrologNode extends ASTNode {
public void setDecls(List<ASTNode> decls) {
this.decls = decls;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/QNameNode.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/QNameNode.java b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/QNameNode.java
index 7b412aa..8210185 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/QNameNode.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/QNameNode.java
@@ -46,4 +46,4 @@ public class QNameNode extends ASTNode {
public void setLocalName(String localName) {
this.localName = localName;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/QuantifiedExprNode.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/QuantifiedExprNode.java b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/QuantifiedExprNode.java
index be5ef1d..e75ca14 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/QuantifiedExprNode.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/QuantifiedExprNode.java
@@ -61,4 +61,4 @@ public class QuantifiedExprNode extends ASTNode {
public List<QuantifiedVarDeclNode> getVariables() {
return variables;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/QuantifiedVarDeclNode.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/QuantifiedVarDeclNode.java b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/QuantifiedVarDeclNode.java
index 2274e75..6c5cf87 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/QuantifiedVarDeclNode.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/QuantifiedVarDeclNode.java
@@ -55,4 +55,4 @@ public class QuantifiedVarDeclNode extends ASTNode {
public void setSequence(ASTNode sequence) {
this.sequence = sequence;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/QueryBodyNode.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/QueryBodyNode.java b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/QueryBodyNode.java
index 8fc86d3..c5b23f8 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/QueryBodyNode.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/QueryBodyNode.java
@@ -37,4 +37,4 @@ public class QueryBodyNode extends ASTNode {
public ASTNode getExpression() {
return expression;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/RelativePathExprNode.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/RelativePathExprNode.java b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/RelativePathExprNode.java
index 3b7d52b..291a7d6 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/RelativePathExprNode.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/RelativePathExprNode.java
@@ -47,4 +47,4 @@ public class RelativePathExprNode extends ASTNode {
public void setPath(ASTNode path) {
this.path = path;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/SQuotedAttributeContentNode.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/SQuotedAttributeContentNode.java b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/SQuotedAttributeContentNode.java
index d102815..ccdc520 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/SQuotedAttributeContentNode.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/SQuotedAttributeContentNode.java
@@ -37,4 +37,4 @@ public class SQuotedAttributeContentNode extends ASTNode {
public void setContent(String content) {
this.content = content;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/SchemaAttributeTestNode.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/SchemaAttributeTestNode.java b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/SchemaAttributeTestNode.java
index 7a0582f..c20f473 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/SchemaAttributeTestNode.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/SchemaAttributeTestNode.java
@@ -37,4 +37,4 @@ public class SchemaAttributeTestNode extends ASTNode {
public void setName(QNameNode name) {
this.name = name;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/SchemaElementTestNode.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/SchemaElementTestNode.java b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/SchemaElementTestNode.java
index 782daa6..36050a1 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/SchemaElementTestNode.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/SchemaElementTestNode.java
@@ -37,4 +37,4 @@ public class SchemaElementTestNode extends ASTNode {
public void setName(QNameNode name) {
this.name = name;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/SchemaImportNode.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/SchemaImportNode.java b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/SchemaImportNode.java
index 49a263f..39c05b0 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/SchemaImportNode.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/SchemaImportNode.java
@@ -66,4 +66,4 @@ public class SchemaImportNode extends ASTNode {
public boolean isDefaultElementNamespace() {
return defaultElementNamespace;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/SequenceTypeNode.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/SequenceTypeNode.java b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/SequenceTypeNode.java
index 17fb4ee..7cc63cb 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/SequenceTypeNode.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/SequenceTypeNode.java
@@ -47,4 +47,4 @@ public class SequenceTypeNode extends ASTNode {
public void setQuantifier(XQueryConstants.TypeQuantifier quantifier) {
this.quantifier = quantifier;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/SingleTypeNode.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/SingleTypeNode.java b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/SingleTypeNode.java
index 3bc78fa..b8014a4 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/SingleTypeNode.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/SingleTypeNode.java
@@ -46,4 +46,4 @@ public class SingleTypeNode extends ASTNode {
public void setOptional(boolean optional) {
this.optional = optional;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/TextTestNode.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/TextTestNode.java b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/TextTestNode.java
index e08f680..a5552fb 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/TextTestNode.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/TextTestNode.java
@@ -27,4 +27,4 @@ public class TextTestNode extends ASTNode {
public ASTTag getTag() {
return ASTTag.TEXT_TEST;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/TextualNodeContentNode.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/TextualNodeContentNode.java b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/TextualNodeContentNode.java
index 12a6fb7..6b83fd6 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/TextualNodeContentNode.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/TextualNodeContentNode.java
@@ -37,4 +37,4 @@ public class TextualNodeContentNode extends ASTNode {
public void setContent(String content) {
this.content = content;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/TypeDeclNode.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/TypeDeclNode.java b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/TypeDeclNode.java
index 3d54f9a..5b7accc 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/TypeDeclNode.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/TypeDeclNode.java
@@ -37,4 +37,4 @@ public class TypeDeclNode extends ASTNode {
public void setType(SequenceTypeNode type) {
this.type = type;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/TypeExprNode.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/TypeExprNode.java b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/TypeExprNode.java
index 27a3ede..9dc8eb0 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/TypeExprNode.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/TypeExprNode.java
@@ -59,4 +59,4 @@ public class TypeExprNode extends ASTNode {
public void setType(ASTNode type) {
this.type = type;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/TypeswitchExprNode.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/TypeswitchExprNode.java b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/TypeswitchExprNode.java
index 333ae4c..1f75110 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/TypeswitchExprNode.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/TypeswitchExprNode.java
@@ -66,4 +66,4 @@ public class TypeswitchExprNode extends ASTNode {
public void setDefaultClause(ASTNode defaultClause) {
this.defaultClause = defaultClause;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/UnaryExprNode.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/UnaryExprNode.java b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/UnaryExprNode.java
index c6375c3..5313c70 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/UnaryExprNode.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/UnaryExprNode.java
@@ -52,4 +52,4 @@ public class UnaryExprNode extends ASTNode {
public void setSigns(List<Sign> signs) {
this.signs = signs;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/UnorderedExprNode.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/UnorderedExprNode.java b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/UnorderedExprNode.java
index 3343386..52b9ad3 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/UnorderedExprNode.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/UnorderedExprNode.java
@@ -37,4 +37,4 @@ public class UnorderedExprNode extends ASTNode {
public void setExpr(ASTNode expr) {
this.expr = expr;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/ValidateExprNode.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/ValidateExprNode.java b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/ValidateExprNode.java
index 6535591..9971041 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/ValidateExprNode.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/ValidateExprNode.java
@@ -47,4 +47,4 @@ public class ValidateExprNode extends ASTNode {
public XQueryConstants.ValidationMode getMode() {
return mode;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/VarDeclNode.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/VarDeclNode.java b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/VarDeclNode.java
index d860566..41a3ca8 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/VarDeclNode.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/VarDeclNode.java
@@ -55,4 +55,4 @@ public class VarDeclNode extends ASTNode {
public void setValue(ASTNode value) {
this.value = value;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/VarRefNode.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/VarRefNode.java b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/VarRefNode.java
index 82ea5db..b154968 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/VarRefNode.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/VarRefNode.java
@@ -37,4 +37,4 @@ public class VarRefNode extends ASTNode {
public void setVariable(QNameNode variable) {
this.variable = variable;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/VersionDeclNode.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/VersionDeclNode.java b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/VersionDeclNode.java
index 0c866c8..e188767 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/VersionDeclNode.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/VersionDeclNode.java
@@ -47,4 +47,4 @@ public class VersionDeclNode extends ASTNode {
public void setEncoding(String encoding) {
this.encoding = encoding;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/WhereClauseNode.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/WhereClauseNode.java b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/WhereClauseNode.java
index 25f01e6..fdc6c57 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/WhereClauseNode.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/WhereClauseNode.java
@@ -37,4 +37,4 @@ public class WhereClauseNode extends FLWORClauseNode {
public void setCondition(ASTNode condition) {
this.condition = condition;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/query/Module.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/query/Module.java b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/query/Module.java
index 8707a8b..5de3941 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/query/Module.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/query/Module.java
@@ -17,8 +17,8 @@ package org.apache.vxquery.xmlquery.query;
import org.apache.vxquery.compiler.CompilerControlBlock;
import org.apache.vxquery.context.StaticContext;
-import edu.uci.ics.hyracks.algebricks.core.algebra.base.ILogicalPlan;
-import edu.uci.ics.hyracks.api.job.JobSpecification;
+import org.apache.hyracks.algebricks.core.algebra.base.ILogicalPlan;
+import org.apache.hyracks.api.job.JobSpecification;
public class Module {
private ModuleType moduleType;
@@ -87,4 +87,4 @@ public class Module {
public void setHyracksJobSpecification(JobSpecification jobSpec) {
this.jobSpec = jobSpec;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/query/NoopXQueryCompilationListener.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/query/NoopXQueryCompilationListener.java b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/query/NoopXQueryCompilationListener.java
index 6b81593..e4f6837 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/query/NoopXQueryCompilationListener.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/query/NoopXQueryCompilationListener.java
@@ -41,4 +41,4 @@ public class NoopXQueryCompilationListener implements XQueryCompilationListener
@Override
public void notifyParseResult(ModuleNode moduleNode) {
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/query/PrologVariable.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/query/PrologVariable.java b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/query/PrologVariable.java
index 960c931..070529e 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/query/PrologVariable.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/query/PrologVariable.java
@@ -28,4 +28,4 @@ public class PrologVariable {
public XQueryVariable getVariable() {
return variable;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/query/VXQueryCompilationListener.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/query/VXQueryCompilationListener.java b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/query/VXQueryCompilationListener.java
index 621e7a8..b3692b1 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/query/VXQueryCompilationListener.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/query/VXQueryCompilationListener.java
@@ -21,11 +21,11 @@ import org.json.JSONException;
import com.thoughtworks.xstream.XStream;
import com.thoughtworks.xstream.io.xml.DomDriver;
-import edu.uci.ics.hyracks.algebricks.common.exceptions.AlgebricksException;
-import edu.uci.ics.hyracks.algebricks.core.algebra.prettyprint.LogicalOperatorPrettyPrintVisitor;
-import edu.uci.ics.hyracks.algebricks.core.algebra.prettyprint.PlanPrettyPrinter;
-import edu.uci.ics.hyracks.algebricks.core.algebra.visitors.ILogicalExpressionVisitor;
-import edu.uci.ics.hyracks.api.job.JobSpecification;
+import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
+import org.apache.hyracks.algebricks.core.algebra.prettyprint.LogicalOperatorPrettyPrintVisitor;
+import org.apache.hyracks.algebricks.core.algebra.prettyprint.PlanPrettyPrinter;
+import org.apache.hyracks.algebricks.core.algebra.visitors.ILogicalExpressionVisitor;
+import org.apache.hyracks.api.job.JobSpecification;
public class VXQueryCompilationListener implements XQueryCompilationListener {
boolean showTET, showRP, showOET, showAST;
[13/50] [abbrv] vxquery git commit: VXQUERY-181 - Move to Hyracks
0.2.16
Posted by sj...@apache.org.
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/strings/FnCompareEvaluatorFactory.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/strings/FnCompareEvaluatorFactory.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/strings/FnCompareEvaluatorFactory.java
index 11d00c9..76e80b0 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/strings/FnCompareEvaluatorFactory.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/strings/FnCompareEvaluatorFactory.java
@@ -26,13 +26,13 @@ import org.apache.vxquery.runtime.functions.base.AbstractTaggedValueArgumentScal
import org.apache.vxquery.runtime.functions.base.AbstractTaggedValueArgumentScalarEvaluatorFactory;
import org.apache.vxquery.runtime.functions.util.FunctionHelper;
-import edu.uci.ics.hyracks.algebricks.common.exceptions.AlgebricksException;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluator;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
-import edu.uci.ics.hyracks.api.context.IHyracksTaskContext;
-import edu.uci.ics.hyracks.data.std.api.IPointable;
-import edu.uci.ics.hyracks.data.std.primitive.LongPointable;
-import edu.uci.ics.hyracks.data.std.primitive.UTF8StringPointable;
+import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluator;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
+import org.apache.hyracks.api.context.IHyracksTaskContext;
+import org.apache.hyracks.data.std.api.IPointable;
+import org.apache.hyracks.data.std.primitive.LongPointable;
+import org.apache.hyracks.data.std.primitive.UTF8StringPointable;
public class FnCompareEvaluatorFactory extends AbstractTaggedValueArgumentScalarEvaluatorFactory {
private static final long serialVersionUID = 1L;
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/strings/FnConcatEvaluatorFactory.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/strings/FnConcatEvaluatorFactory.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/strings/FnConcatEvaluatorFactory.java
index 053c930..7eef348 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/strings/FnConcatEvaluatorFactory.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/strings/FnConcatEvaluatorFactory.java
@@ -29,13 +29,13 @@ import org.apache.vxquery.runtime.functions.base.AbstractTaggedValueArgumentScal
import org.apache.vxquery.runtime.functions.cast.CastToStringOperation;
import org.apache.vxquery.runtime.functions.util.FunctionHelper;
-import edu.uci.ics.hyracks.algebricks.common.exceptions.AlgebricksException;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluator;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
-import edu.uci.ics.hyracks.api.context.IHyracksTaskContext;
-import edu.uci.ics.hyracks.data.std.api.IPointable;
-import edu.uci.ics.hyracks.data.std.primitive.UTF8StringPointable;
-import edu.uci.ics.hyracks.data.std.util.ArrayBackedValueStorage;
+import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluator;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
+import org.apache.hyracks.api.context.IHyracksTaskContext;
+import org.apache.hyracks.data.std.api.IPointable;
+import org.apache.hyracks.data.std.primitive.UTF8StringPointable;
+import org.apache.hyracks.data.std.util.ArrayBackedValueStorage;
public class FnConcatEvaluatorFactory extends AbstractTaggedValueArgumentScalarEvaluatorFactory {
private static final long serialVersionUID = 1L;
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/strings/FnContainsEvaluatorFactory.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/strings/FnContainsEvaluatorFactory.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/strings/FnContainsEvaluatorFactory.java
index d825371..977ed19 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/strings/FnContainsEvaluatorFactory.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/strings/FnContainsEvaluatorFactory.java
@@ -26,12 +26,12 @@ import org.apache.vxquery.runtime.functions.base.AbstractTaggedValueArgumentScal
import org.apache.vxquery.runtime.functions.base.AbstractTaggedValueArgumentScalarEvaluatorFactory;
import org.apache.vxquery.runtime.functions.util.FunctionHelper;
-import edu.uci.ics.hyracks.algebricks.common.exceptions.AlgebricksException;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluator;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
-import edu.uci.ics.hyracks.api.context.IHyracksTaskContext;
-import edu.uci.ics.hyracks.data.std.api.IPointable;
-import edu.uci.ics.hyracks.data.std.primitive.UTF8StringPointable;
+import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluator;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
+import org.apache.hyracks.api.context.IHyracksTaskContext;
+import org.apache.hyracks.data.std.api.IPointable;
+import org.apache.hyracks.data.std.primitive.UTF8StringPointable;
public class FnContainsEvaluatorFactory extends AbstractTaggedValueArgumentScalarEvaluatorFactory {
private static final long serialVersionUID = 1L;
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/strings/FnEndsWithEvaluatorFactory.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/strings/FnEndsWithEvaluatorFactory.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/strings/FnEndsWithEvaluatorFactory.java
index 88630ed..81062ed 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/strings/FnEndsWithEvaluatorFactory.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/strings/FnEndsWithEvaluatorFactory.java
@@ -26,12 +26,12 @@ import org.apache.vxquery.runtime.functions.base.AbstractTaggedValueArgumentScal
import org.apache.vxquery.runtime.functions.base.AbstractTaggedValueArgumentScalarEvaluatorFactory;
import org.apache.vxquery.runtime.functions.util.FunctionHelper;
-import edu.uci.ics.hyracks.algebricks.common.exceptions.AlgebricksException;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluator;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
-import edu.uci.ics.hyracks.api.context.IHyracksTaskContext;
-import edu.uci.ics.hyracks.data.std.api.IPointable;
-import edu.uci.ics.hyracks.data.std.primitive.UTF8StringPointable;
+import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluator;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
+import org.apache.hyracks.api.context.IHyracksTaskContext;
+import org.apache.hyracks.data.std.api.IPointable;
+import org.apache.hyracks.data.std.primitive.UTF8StringPointable;
public class FnEndsWithEvaluatorFactory extends AbstractTaggedValueArgumentScalarEvaluatorFactory {
private static final long serialVersionUID = 1L;
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/strings/FnLowerCaseEvaluatorFactory.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/strings/FnLowerCaseEvaluatorFactory.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/strings/FnLowerCaseEvaluatorFactory.java
index 1e3ac70..cf431cd 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/strings/FnLowerCaseEvaluatorFactory.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/strings/FnLowerCaseEvaluatorFactory.java
@@ -24,11 +24,11 @@ import org.apache.vxquery.exceptions.ErrorCode;
import org.apache.vxquery.exceptions.SystemException;
import org.apache.vxquery.runtime.functions.util.FunctionHelper;
-import edu.uci.ics.hyracks.algebricks.common.exceptions.AlgebricksException;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluator;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
-import edu.uci.ics.hyracks.api.context.IHyracksTaskContext;
-import edu.uci.ics.hyracks.data.std.primitive.UTF8StringPointable;
+import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluator;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
+import org.apache.hyracks.api.context.IHyracksTaskContext;
+import org.apache.hyracks.data.std.primitive.UTF8StringPointable;
public class FnLowerCaseEvaluatorFactory extends AbstractCharacterIteratorCopyingEvaluatorFactory {
private static final long serialVersionUID = 1L;
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/strings/FnStartsWithEvaluatorFactory.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/strings/FnStartsWithEvaluatorFactory.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/strings/FnStartsWithEvaluatorFactory.java
index 4c4ea2b..7d0cb7a 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/strings/FnStartsWithEvaluatorFactory.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/strings/FnStartsWithEvaluatorFactory.java
@@ -26,12 +26,12 @@ import org.apache.vxquery.runtime.functions.base.AbstractTaggedValueArgumentScal
import org.apache.vxquery.runtime.functions.base.AbstractTaggedValueArgumentScalarEvaluatorFactory;
import org.apache.vxquery.runtime.functions.util.FunctionHelper;
-import edu.uci.ics.hyracks.algebricks.common.exceptions.AlgebricksException;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluator;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
-import edu.uci.ics.hyracks.api.context.IHyracksTaskContext;
-import edu.uci.ics.hyracks.data.std.api.IPointable;
-import edu.uci.ics.hyracks.data.std.primitive.UTF8StringPointable;
+import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluator;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
+import org.apache.hyracks.api.context.IHyracksTaskContext;
+import org.apache.hyracks.data.std.api.IPointable;
+import org.apache.hyracks.data.std.primitive.UTF8StringPointable;
public class FnStartsWithEvaluatorFactory extends AbstractTaggedValueArgumentScalarEvaluatorFactory {
private static final long serialVersionUID = 1L;
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/strings/FnStringJoinEvaluatorFactory.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/strings/FnStringJoinEvaluatorFactory.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/strings/FnStringJoinEvaluatorFactory.java
index 11107d5..576b409 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/strings/FnStringJoinEvaluatorFactory.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/strings/FnStringJoinEvaluatorFactory.java
@@ -28,13 +28,13 @@ import org.apache.vxquery.runtime.functions.base.AbstractTaggedValueArgumentScal
import org.apache.vxquery.runtime.functions.base.AbstractTaggedValueArgumentScalarEvaluatorFactory;
import org.apache.vxquery.runtime.functions.util.FunctionHelper;
-import edu.uci.ics.hyracks.algebricks.common.exceptions.AlgebricksException;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluator;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
-import edu.uci.ics.hyracks.api.context.IHyracksTaskContext;
-import edu.uci.ics.hyracks.data.std.api.IPointable;
-import edu.uci.ics.hyracks.data.std.primitive.UTF8StringPointable;
-import edu.uci.ics.hyracks.data.std.util.ArrayBackedValueStorage;
+import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluator;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
+import org.apache.hyracks.api.context.IHyracksTaskContext;
+import org.apache.hyracks.data.std.api.IPointable;
+import org.apache.hyracks.data.std.primitive.UTF8StringPointable;
+import org.apache.hyracks.data.std.util.ArrayBackedValueStorage;
public class FnStringJoinEvaluatorFactory extends AbstractTaggedValueArgumentScalarEvaluatorFactory {
private static final long serialVersionUID = 1L;
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/strings/FnStringLengthEvaluatorFactory.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/strings/FnStringLengthEvaluatorFactory.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/strings/FnStringLengthEvaluatorFactory.java
index 3388a55..298b45c 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/strings/FnStringLengthEvaluatorFactory.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/strings/FnStringLengthEvaluatorFactory.java
@@ -28,13 +28,13 @@ import org.apache.vxquery.runtime.functions.base.AbstractTaggedValueArgumentScal
import org.apache.vxquery.runtime.functions.base.AbstractTaggedValueArgumentScalarEvaluatorFactory;
import org.apache.vxquery.runtime.functions.util.FunctionHelper;
-import edu.uci.ics.hyracks.algebricks.common.exceptions.AlgebricksException;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluator;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
-import edu.uci.ics.hyracks.api.context.IHyracksTaskContext;
-import edu.uci.ics.hyracks.data.std.api.IPointable;
-import edu.uci.ics.hyracks.data.std.primitive.UTF8StringPointable;
-import edu.uci.ics.hyracks.data.std.util.ArrayBackedValueStorage;
+import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluator;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
+import org.apache.hyracks.api.context.IHyracksTaskContext;
+import org.apache.hyracks.data.std.api.IPointable;
+import org.apache.hyracks.data.std.primitive.UTF8StringPointable;
+import org.apache.hyracks.data.std.util.ArrayBackedValueStorage;
public class FnStringLengthEvaluatorFactory extends AbstractTaggedValueArgumentScalarEvaluatorFactory {
private static final long serialVersionUID = 1L;
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/strings/FnStringScalarEvaluatorFactory.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/strings/FnStringScalarEvaluatorFactory.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/strings/FnStringScalarEvaluatorFactory.java
index fa929da..1f6ba13 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/strings/FnStringScalarEvaluatorFactory.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/strings/FnStringScalarEvaluatorFactory.java
@@ -30,13 +30,13 @@ import org.apache.vxquery.runtime.functions.base.AbstractTaggedValueArgumentScal
import org.apache.vxquery.runtime.functions.cast.CastToStringOperation;
import org.apache.vxquery.runtime.functions.util.AtomizeHelper;
-import edu.uci.ics.hyracks.algebricks.common.exceptions.AlgebricksException;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluator;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
-import edu.uci.ics.hyracks.api.context.IHyracksTaskContext;
-import edu.uci.ics.hyracks.data.std.api.IPointable;
-import edu.uci.ics.hyracks.data.std.primitive.UTF8StringPointable;
-import edu.uci.ics.hyracks.data.std.util.ArrayBackedValueStorage;
+import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluator;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
+import org.apache.hyracks.api.context.IHyracksTaskContext;
+import org.apache.hyracks.data.std.api.IPointable;
+import org.apache.hyracks.data.std.primitive.UTF8StringPointable;
+import org.apache.hyracks.data.std.util.ArrayBackedValueStorage;
public class FnStringScalarEvaluatorFactory extends AbstractTaggedValueArgumentScalarEvaluatorFactory {
private static final long serialVersionUID = 1L;
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/strings/FnStringToCodepointsEvaluatorFactory.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/strings/FnStringToCodepointsEvaluatorFactory.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/strings/FnStringToCodepointsEvaluatorFactory.java
index a57f519..f77d869 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/strings/FnStringToCodepointsEvaluatorFactory.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/strings/FnStringToCodepointsEvaluatorFactory.java
@@ -30,13 +30,13 @@ import org.apache.vxquery.runtime.functions.base.AbstractTaggedValueArgumentScal
import org.apache.vxquery.runtime.functions.base.AbstractTaggedValueArgumentScalarEvaluatorFactory;
import org.apache.vxquery.runtime.functions.util.FunctionHelper;
-import edu.uci.ics.hyracks.algebricks.common.exceptions.AlgebricksException;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluator;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
-import edu.uci.ics.hyracks.api.context.IHyracksTaskContext;
-import edu.uci.ics.hyracks.data.std.api.IPointable;
-import edu.uci.ics.hyracks.data.std.primitive.UTF8StringPointable;
-import edu.uci.ics.hyracks.data.std.util.ArrayBackedValueStorage;
+import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluator;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
+import org.apache.hyracks.api.context.IHyracksTaskContext;
+import org.apache.hyracks.data.std.api.IPointable;
+import org.apache.hyracks.data.std.primitive.UTF8StringPointable;
+import org.apache.hyracks.data.std.util.ArrayBackedValueStorage;
public class FnStringToCodepointsEvaluatorFactory extends AbstractTaggedValueArgumentScalarEvaluatorFactory {
private static final long serialVersionUID = 1L;
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/strings/FnSubstringAfterEvaluatorFactory.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/strings/FnSubstringAfterEvaluatorFactory.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/strings/FnSubstringAfterEvaluatorFactory.java
index b49f121..f069152 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/strings/FnSubstringAfterEvaluatorFactory.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/strings/FnSubstringAfterEvaluatorFactory.java
@@ -24,11 +24,11 @@ import org.apache.vxquery.exceptions.ErrorCode;
import org.apache.vxquery.exceptions.SystemException;
import org.apache.vxquery.runtime.functions.util.FunctionHelper;
-import edu.uci.ics.hyracks.algebricks.common.exceptions.AlgebricksException;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluator;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
-import edu.uci.ics.hyracks.api.context.IHyracksTaskContext;
-import edu.uci.ics.hyracks.data.std.primitive.UTF8StringPointable;
+import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluator;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
+import org.apache.hyracks.api.context.IHyracksTaskContext;
+import org.apache.hyracks.data.std.primitive.UTF8StringPointable;
public class FnSubstringAfterEvaluatorFactory extends AbstractCharacterIteratorCopyingEvaluatorFactory {
private static final long serialVersionUID = 1L;
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/strings/FnSubstringBeforeEvaluatorFactory.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/strings/FnSubstringBeforeEvaluatorFactory.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/strings/FnSubstringBeforeEvaluatorFactory.java
index 3447f91..fb8e937 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/strings/FnSubstringBeforeEvaluatorFactory.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/strings/FnSubstringBeforeEvaluatorFactory.java
@@ -24,11 +24,11 @@ import org.apache.vxquery.exceptions.ErrorCode;
import org.apache.vxquery.exceptions.SystemException;
import org.apache.vxquery.runtime.functions.util.FunctionHelper;
-import edu.uci.ics.hyracks.algebricks.common.exceptions.AlgebricksException;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluator;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
-import edu.uci.ics.hyracks.api.context.IHyracksTaskContext;
-import edu.uci.ics.hyracks.data.std.primitive.UTF8StringPointable;
+import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluator;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
+import org.apache.hyracks.api.context.IHyracksTaskContext;
+import org.apache.hyracks.data.std.primitive.UTF8StringPointable;
public class FnSubstringBeforeEvaluatorFactory extends AbstractCharacterIteratorCopyingEvaluatorFactory {
private static final long serialVersionUID = 1L;
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/strings/FnSubstringEvaluatorFactory.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/strings/FnSubstringEvaluatorFactory.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/strings/FnSubstringEvaluatorFactory.java
index 282caaa..0691a80 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/strings/FnSubstringEvaluatorFactory.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/strings/FnSubstringEvaluatorFactory.java
@@ -24,14 +24,14 @@ import org.apache.vxquery.exceptions.ErrorCode;
import org.apache.vxquery.exceptions.SystemException;
import org.apache.vxquery.runtime.functions.util.FunctionHelper;
-import edu.uci.ics.hyracks.algebricks.common.exceptions.AlgebricksException;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluator;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
-import edu.uci.ics.hyracks.api.context.IHyracksTaskContext;
-import edu.uci.ics.hyracks.data.std.primitive.DoublePointable;
-import edu.uci.ics.hyracks.data.std.primitive.LongPointable;
-import edu.uci.ics.hyracks.data.std.primitive.UTF8StringPointable;
-import edu.uci.ics.hyracks.data.std.util.ArrayBackedValueStorage;
+import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluator;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
+import org.apache.hyracks.api.context.IHyracksTaskContext;
+import org.apache.hyracks.data.std.primitive.DoublePointable;
+import org.apache.hyracks.data.std.primitive.LongPointable;
+import org.apache.hyracks.data.std.primitive.UTF8StringPointable;
+import org.apache.hyracks.data.std.util.ArrayBackedValueStorage;
public class FnSubstringEvaluatorFactory extends AbstractCharacterIteratorCopyingEvaluatorFactory {
private static final long serialVersionUID = 1L;
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/strings/FnUpperCaseEvaluatorFactory.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/strings/FnUpperCaseEvaluatorFactory.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/strings/FnUpperCaseEvaluatorFactory.java
index a8f0f3f..08492ff 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/strings/FnUpperCaseEvaluatorFactory.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/strings/FnUpperCaseEvaluatorFactory.java
@@ -24,11 +24,11 @@ import org.apache.vxquery.exceptions.ErrorCode;
import org.apache.vxquery.exceptions.SystemException;
import org.apache.vxquery.runtime.functions.util.FunctionHelper;
-import edu.uci.ics.hyracks.algebricks.common.exceptions.AlgebricksException;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluator;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
-import edu.uci.ics.hyracks.api.context.IHyracksTaskContext;
-import edu.uci.ics.hyracks.data.std.primitive.UTF8StringPointable;
+import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluator;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
+import org.apache.hyracks.api.context.IHyracksTaskContext;
+import org.apache.hyracks.data.std.primitive.UTF8StringPointable;
public class FnUpperCaseEvaluatorFactory extends AbstractCharacterIteratorCopyingEvaluatorFactory {
private static final long serialVersionUID = 1L;
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/strings/UTF8StringCharacterIterator.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/strings/UTF8StringCharacterIterator.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/strings/UTF8StringCharacterIterator.java
index 7e93469..c170384 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/strings/UTF8StringCharacterIterator.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/strings/UTF8StringCharacterIterator.java
@@ -19,7 +19,7 @@ package org.apache.vxquery.runtime.functions.strings;
import java.util.logging.Level;
import java.util.logging.Logger;
-import edu.uci.ics.hyracks.data.std.primitive.UTF8StringPointable;
+import org.apache.hyracks.data.std.primitive.UTF8StringPointable;
public class UTF8StringCharacterIterator implements ICharacterIterator {
private static final Logger LOGGER = Logger.getLogger(UTF8StringCharacterIterator.class.getName());
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/type/AbstractTypeScalarEvaluatorFactory.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/type/AbstractTypeScalarEvaluatorFactory.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/type/AbstractTypeScalarEvaluatorFactory.java
index 0226172..d45108e 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/type/AbstractTypeScalarEvaluatorFactory.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/type/AbstractTypeScalarEvaluatorFactory.java
@@ -24,11 +24,11 @@ import org.apache.vxquery.runtime.functions.base.AbstractTaggedValueArgumentScal
import org.apache.vxquery.runtime.functions.base.AbstractTaggedValueArgumentScalarEvaluatorFactory;
import org.apache.vxquery.types.SequenceType;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluator;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
-import edu.uci.ics.hyracks.api.context.IHyracksTaskContext;
-import edu.uci.ics.hyracks.data.std.api.IPointable;
-import edu.uci.ics.hyracks.data.std.primitive.IntegerPointable;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluator;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
+import org.apache.hyracks.api.context.IHyracksTaskContext;
+import org.apache.hyracks.data.std.api.IPointable;
+import org.apache.hyracks.data.std.primitive.IntegerPointable;
public abstract class AbstractTypeScalarEvaluatorFactory extends AbstractTaggedValueArgumentScalarEvaluatorFactory {
private static final long serialVersionUID = 1L;
@@ -70,4 +70,4 @@ public abstract class AbstractTypeScalarEvaluatorFactory extends AbstractTaggedV
evaluate(args[0], result);
}
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/type/InstanceOfScalarEvaluatorFactory.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/type/InstanceOfScalarEvaluatorFactory.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/type/InstanceOfScalarEvaluatorFactory.java
index dd7ee61..d9c5796 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/type/InstanceOfScalarEvaluatorFactory.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/type/InstanceOfScalarEvaluatorFactory.java
@@ -21,11 +21,11 @@ import org.apache.vxquery.datamodel.values.XDMConstants;
import org.apache.vxquery.exceptions.SystemException;
import org.apache.vxquery.types.SequenceType;
-import edu.uci.ics.hyracks.algebricks.common.exceptions.AlgebricksException;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluator;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
-import edu.uci.ics.hyracks.api.context.IHyracksTaskContext;
-import edu.uci.ics.hyracks.data.std.api.IPointable;
+import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluator;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
+import org.apache.hyracks.api.context.IHyracksTaskContext;
+import org.apache.hyracks.data.std.api.IPointable;
public class InstanceOfScalarEvaluatorFactory extends AbstractTypeScalarEvaluatorFactory {
private static final long serialVersionUID = 1L;
@@ -56,4 +56,4 @@ public class InstanceOfScalarEvaluatorFactory extends AbstractTypeScalarEvaluato
}
};
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/type/PromoteScalarEvaluatorFactory.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/type/PromoteScalarEvaluatorFactory.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/type/PromoteScalarEvaluatorFactory.java
index 594051d..c1bb24e 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/type/PromoteScalarEvaluatorFactory.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/type/PromoteScalarEvaluatorFactory.java
@@ -30,12 +30,12 @@ import org.apache.vxquery.runtime.functions.cast.CastToStringOperation;
import org.apache.vxquery.types.BuiltinTypeRegistry;
import org.apache.vxquery.types.SequenceType;
-import edu.uci.ics.hyracks.algebricks.common.exceptions.AlgebricksException;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluator;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
-import edu.uci.ics.hyracks.api.context.IHyracksTaskContext;
-import edu.uci.ics.hyracks.data.std.api.IPointable;
-import edu.uci.ics.hyracks.data.std.util.ArrayBackedValueStorage;
+import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluator;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
+import org.apache.hyracks.api.context.IHyracksTaskContext;
+import org.apache.hyracks.data.std.api.IPointable;
+import org.apache.hyracks.data.std.util.ArrayBackedValueStorage;
public class PromoteScalarEvaluatorFactory extends AbstractTypeScalarEvaluatorFactory {
private static final long serialVersionUID = 1L;
@@ -203,4 +203,4 @@ public class PromoteScalarEvaluatorFactory extends AbstractTypeScalarEvaluatorFa
}
};
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/type/SequenceTypeMatcher.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/type/SequenceTypeMatcher.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/type/SequenceTypeMatcher.java
index 12d0d93..19c2f99 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/type/SequenceTypeMatcher.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/type/SequenceTypeMatcher.java
@@ -35,7 +35,7 @@ import org.apache.vxquery.types.Quantifier;
import org.apache.vxquery.types.SchemaType;
import org.apache.vxquery.types.SequenceType;
-import edu.uci.ics.hyracks.data.std.primitive.UTF8StringPointable;
+import org.apache.hyracks.data.std.primitive.UTF8StringPointable;
public class SequenceTypeMatcher {
private final NodeTreePointable ntp = (NodeTreePointable) NodeTreePointable.FACTORY.createPointable();
@@ -201,4 +201,4 @@ public class SequenceTypeMatcher {
public String toString() {
return "sequenceMatcher[" + this.sequenceType + "]";
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/type/TreatScalarEvaluatorFactory.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/type/TreatScalarEvaluatorFactory.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/type/TreatScalarEvaluatorFactory.java
index 1bd6ac1..4913c71 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/type/TreatScalarEvaluatorFactory.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/type/TreatScalarEvaluatorFactory.java
@@ -21,11 +21,11 @@ import org.apache.vxquery.exceptions.ErrorCode;
import org.apache.vxquery.exceptions.SystemException;
import org.apache.vxquery.types.SequenceType;
-import edu.uci.ics.hyracks.algebricks.common.exceptions.AlgebricksException;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluator;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
-import edu.uci.ics.hyracks.api.context.IHyracksTaskContext;
-import edu.uci.ics.hyracks.data.std.api.IPointable;
+import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluator;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
+import org.apache.hyracks.api.context.IHyracksTaskContext;
+import org.apache.hyracks.data.std.api.IPointable;
public class TreatScalarEvaluatorFactory extends AbstractTypeScalarEvaluatorFactory {
private static final long serialVersionUID = 1L;
@@ -55,4 +55,4 @@ public class TreatScalarEvaluatorFactory extends AbstractTypeScalarEvaluatorFact
}
};
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/unary/AbstractNumericUnaryOperation.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/unary/AbstractNumericUnaryOperation.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/unary/AbstractNumericUnaryOperation.java
index cb5a018..70270ab 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/unary/AbstractNumericUnaryOperation.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/unary/AbstractNumericUnaryOperation.java
@@ -22,9 +22,9 @@ import java.io.IOException;
import org.apache.vxquery.datamodel.accessors.atomic.XSDecimalPointable;
import org.apache.vxquery.exceptions.SystemException;
-import edu.uci.ics.hyracks.data.std.primitive.DoublePointable;
-import edu.uci.ics.hyracks.data.std.primitive.FloatPointable;
-import edu.uci.ics.hyracks.data.std.primitive.LongPointable;
+import org.apache.hyracks.data.std.primitive.DoublePointable;
+import org.apache.hyracks.data.std.primitive.FloatPointable;
+import org.apache.hyracks.data.std.primitive.LongPointable;
public abstract class AbstractNumericUnaryOperation {
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/unary/AbstractNumericUnaryScalarEvaluatorFactory.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/unary/AbstractNumericUnaryScalarEvaluatorFactory.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/unary/AbstractNumericUnaryScalarEvaluatorFactory.java
index 922243b..bd8c360 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/unary/AbstractNumericUnaryScalarEvaluatorFactory.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/unary/AbstractNumericUnaryScalarEvaluatorFactory.java
@@ -28,13 +28,13 @@ import org.apache.vxquery.runtime.functions.base.AbstractTaggedValueArgumentScal
import org.apache.vxquery.runtime.functions.util.FunctionHelper;
import org.apache.vxquery.types.BuiltinTypeRegistry;
-import edu.uci.ics.hyracks.algebricks.common.exceptions.AlgebricksException;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluator;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
-import edu.uci.ics.hyracks.api.context.IHyracksTaskContext;
-import edu.uci.ics.hyracks.data.std.api.IPointable;
-import edu.uci.ics.hyracks.data.std.primitive.LongPointable;
-import edu.uci.ics.hyracks.data.std.util.ArrayBackedValueStorage;
+import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluator;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
+import org.apache.hyracks.api.context.IHyracksTaskContext;
+import org.apache.hyracks.data.std.api.IPointable;
+import org.apache.hyracks.data.std.primitive.LongPointable;
+import org.apache.hyracks.data.std.util.ArrayBackedValueStorage;
public abstract class AbstractNumericUnaryScalarEvaluatorFactory extends
AbstractTaggedValueArgumentScalarEvaluatorFactory {
@@ -135,4 +135,4 @@ public abstract class AbstractNumericUnaryScalarEvaluatorFactory extends
}
protected abstract AbstractNumericUnaryOperation createNumericUnaryOperation();
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/unary/NumericUnaryMinusOperation.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/unary/NumericUnaryMinusOperation.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/unary/NumericUnaryMinusOperation.java
index db8a056..2cd9d86 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/unary/NumericUnaryMinusOperation.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/unary/NumericUnaryMinusOperation.java
@@ -23,9 +23,9 @@ import org.apache.vxquery.datamodel.accessors.atomic.XSDecimalPointable;
import org.apache.vxquery.datamodel.values.ValueTag;
import org.apache.vxquery.exceptions.SystemException;
-import edu.uci.ics.hyracks.data.std.primitive.DoublePointable;
-import edu.uci.ics.hyracks.data.std.primitive.FloatPointable;
-import edu.uci.ics.hyracks.data.std.primitive.LongPointable;
+import org.apache.hyracks.data.std.primitive.DoublePointable;
+import org.apache.hyracks.data.std.primitive.FloatPointable;
+import org.apache.hyracks.data.std.primitive.LongPointable;
public class NumericUnaryMinusOperation extends AbstractNumericUnaryOperation {
@@ -53,4 +53,4 @@ public class NumericUnaryMinusOperation extends AbstractNumericUnaryOperation {
dOut.write(ValueTag.XS_INTEGER_TAG);
dOut.writeLong(-longp.getLong());
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/unary/NumericUnaryMinusScalarEvaluatorFactory.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/unary/NumericUnaryMinusScalarEvaluatorFactory.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/unary/NumericUnaryMinusScalarEvaluatorFactory.java
index fd19366..9bf7385 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/unary/NumericUnaryMinusScalarEvaluatorFactory.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/unary/NumericUnaryMinusScalarEvaluatorFactory.java
@@ -16,7 +16,7 @@
*/
package org.apache.vxquery.runtime.functions.unary;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
public class NumericUnaryMinusScalarEvaluatorFactory extends AbstractNumericUnaryScalarEvaluatorFactory {
private static final long serialVersionUID = 1L;
@@ -29,4 +29,4 @@ public class NumericUnaryMinusScalarEvaluatorFactory extends AbstractNumericUnar
protected AbstractNumericUnaryOperation createNumericUnaryOperation() {
return new NumericUnaryMinusOperation();
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/unary/NumericUnaryPlusOperation.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/unary/NumericUnaryPlusOperation.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/unary/NumericUnaryPlusOperation.java
index 6174402..7b29442 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/unary/NumericUnaryPlusOperation.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/unary/NumericUnaryPlusOperation.java
@@ -23,9 +23,9 @@ import org.apache.vxquery.datamodel.accessors.atomic.XSDecimalPointable;
import org.apache.vxquery.datamodel.values.ValueTag;
import org.apache.vxquery.exceptions.SystemException;
-import edu.uci.ics.hyracks.data.std.primitive.DoublePointable;
-import edu.uci.ics.hyracks.data.std.primitive.FloatPointable;
-import edu.uci.ics.hyracks.data.std.primitive.LongPointable;
+import org.apache.hyracks.data.std.primitive.DoublePointable;
+import org.apache.hyracks.data.std.primitive.FloatPointable;
+import org.apache.hyracks.data.std.primitive.LongPointable;
public class NumericUnaryPlusOperation extends AbstractNumericUnaryOperation {
@@ -52,4 +52,4 @@ public class NumericUnaryPlusOperation extends AbstractNumericUnaryOperation {
dOut.write(ValueTag.XS_INTEGER_TAG);
dOut.write(longp.getByteArray(), longp.getStartOffset(), longp.getLength());
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/unary/NumericUnaryPlusScalarEvaluatorFactory.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/unary/NumericUnaryPlusScalarEvaluatorFactory.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/unary/NumericUnaryPlusScalarEvaluatorFactory.java
index 47ce59c..5e99dcc 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/unary/NumericUnaryPlusScalarEvaluatorFactory.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/unary/NumericUnaryPlusScalarEvaluatorFactory.java
@@ -16,7 +16,7 @@
*/
package org.apache.vxquery.runtime.functions.unary;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
public class NumericUnaryPlusScalarEvaluatorFactory extends AbstractNumericUnaryScalarEvaluatorFactory {
private static final long serialVersionUID = 1L;
@@ -29,4 +29,4 @@ public class NumericUnaryPlusScalarEvaluatorFactory extends AbstractNumericUnary
protected AbstractNumericUnaryOperation createNumericUnaryOperation() {
return new NumericUnaryMinusOperation();
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/util/ArithmeticHelper.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/util/ArithmeticHelper.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/util/ArithmeticHelper.java
index 0c2b41a..1647364 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/util/ArithmeticHelper.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/util/ArithmeticHelper.java
@@ -29,10 +29,10 @@ import org.apache.vxquery.runtime.functions.cast.CastToDoubleOperation;
import org.apache.vxquery.types.BuiltinTypeConstants;
import org.apache.vxquery.types.BuiltinTypeRegistry;
-import edu.uci.ics.hyracks.data.std.api.IPointable;
-import edu.uci.ics.hyracks.data.std.primitive.DoublePointable;
-import edu.uci.ics.hyracks.data.std.primitive.LongPointable;
-import edu.uci.ics.hyracks.data.std.util.ArrayBackedValueStorage;
+import org.apache.hyracks.data.std.api.IPointable;
+import org.apache.hyracks.data.std.primitive.DoublePointable;
+import org.apache.hyracks.data.std.primitive.LongPointable;
+import org.apache.hyracks.data.std.util.ArrayBackedValueStorage;
public class ArithmeticHelper {
private final AbstractArithmeticOperation aOp;
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/util/AtomizeHelper.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/util/AtomizeHelper.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/util/AtomizeHelper.java
index ed9cd72..cf70dd2 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/util/AtomizeHelper.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/util/AtomizeHelper.java
@@ -30,9 +30,9 @@ import org.apache.vxquery.datamodel.accessors.nodes.PINodePointable;
import org.apache.vxquery.datamodel.accessors.nodes.TextOrCommentNodePointable;
import org.apache.vxquery.datamodel.values.ValueTag;
-import edu.uci.ics.hyracks.data.std.api.IPointable;
-import edu.uci.ics.hyracks.data.std.primitive.VoidPointable;
-import edu.uci.ics.hyracks.data.std.util.ArrayBackedValueStorage;
+import org.apache.hyracks.data.std.api.IPointable;
+import org.apache.hyracks.data.std.primitive.VoidPointable;
+import org.apache.hyracks.data.std.util.ArrayBackedValueStorage;
public class AtomizeHelper {
AttributeNodePointable anp = (AttributeNodePointable) AttributeNodePointable.FACTORY.createPointable();
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/util/FunctionHelper.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/util/FunctionHelper.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/util/FunctionHelper.java
index 3a20a86..920c815 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/util/FunctionHelper.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/util/FunctionHelper.java
@@ -42,13 +42,13 @@ import org.apache.vxquery.types.BuiltinTypeConstants;
import org.apache.vxquery.types.BuiltinTypeRegistry;
import org.apache.vxquery.xmlparser.XMLParser;
-import edu.uci.ics.hyracks.api.exceptions.HyracksDataException;
-import edu.uci.ics.hyracks.data.std.api.IPointable;
-import edu.uci.ics.hyracks.data.std.primitive.DoublePointable;
-import edu.uci.ics.hyracks.data.std.primitive.LongPointable;
-import edu.uci.ics.hyracks.data.std.primitive.UTF8StringPointable;
-import edu.uci.ics.hyracks.data.std.util.ArrayBackedValueStorage;
-import edu.uci.ics.hyracks.dataflow.common.comm.util.ByteBufferInputStream;
+import org.apache.hyracks.api.exceptions.HyracksDataException;
+import org.apache.hyracks.data.std.api.IPointable;
+import org.apache.hyracks.data.std.primitive.DoublePointable;
+import org.apache.hyracks.data.std.primitive.LongPointable;
+import org.apache.hyracks.data.std.primitive.UTF8StringPointable;
+import org.apache.hyracks.data.std.util.ArrayBackedValueStorage;
+import org.apache.hyracks.dataflow.common.comm.util.ByteBufferInputStream;
public class FunctionHelper {
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/provider/VXQueryBinaryHashFunctionFactoryProvider.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/provider/VXQueryBinaryHashFunctionFactoryProvider.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/provider/VXQueryBinaryHashFunctionFactoryProvider.java
index 91e776d..d4b159d 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/provider/VXQueryBinaryHashFunctionFactoryProvider.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/provider/VXQueryBinaryHashFunctionFactoryProvider.java
@@ -18,9 +18,9 @@ package org.apache.vxquery.runtime.provider;
import org.apache.vxquery.runtime.factory.hashfunction.VXQueryRawBinaryHashFunctionFactory;
-import edu.uci.ics.hyracks.algebricks.common.exceptions.AlgebricksException;
-import edu.uci.ics.hyracks.algebricks.data.IBinaryHashFunctionFactoryProvider;
-import edu.uci.ics.hyracks.api.dataflow.value.IBinaryHashFunctionFactory;
+import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
+import org.apache.hyracks.algebricks.data.IBinaryHashFunctionFactoryProvider;
+import org.apache.hyracks.api.dataflow.value.IBinaryHashFunctionFactory;
public class VXQueryBinaryHashFunctionFactoryProvider implements IBinaryHashFunctionFactoryProvider {
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/provider/VXQueryBinaryHashFunctionFamilyProvider.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/provider/VXQueryBinaryHashFunctionFamilyProvider.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/provider/VXQueryBinaryHashFunctionFamilyProvider.java
index b73cc75..c5276b1 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/provider/VXQueryBinaryHashFunctionFamilyProvider.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/provider/VXQueryBinaryHashFunctionFamilyProvider.java
@@ -16,10 +16,10 @@
*/
package org.apache.vxquery.runtime.provider;
-import edu.uci.ics.hyracks.algebricks.common.exceptions.AlgebricksException;
-import edu.uci.ics.hyracks.algebricks.data.IBinaryHashFunctionFamilyProvider;
-import edu.uci.ics.hyracks.api.dataflow.value.IBinaryHashFunctionFamily;
-import edu.uci.ics.hyracks.data.std.accessors.MurmurHash3BinaryHashFunctionFamily;
+import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
+import org.apache.hyracks.algebricks.data.IBinaryHashFunctionFamilyProvider;
+import org.apache.hyracks.api.dataflow.value.IBinaryHashFunctionFamily;
+import org.apache.hyracks.data.std.accessors.MurmurHash3BinaryHashFunctionFamily;
public class VXQueryBinaryHashFunctionFamilyProvider implements IBinaryHashFunctionFamilyProvider {
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/serializer/XMLSerializer.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/serializer/XMLSerializer.java b/vxquery-core/src/main/java/org/apache/vxquery/serializer/XMLSerializer.java
index 8a5845d..5c55731 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/serializer/XMLSerializer.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/serializer/XMLSerializer.java
@@ -42,18 +42,18 @@ import org.apache.vxquery.datamodel.values.ValueTag;
import org.apache.vxquery.exceptions.SystemException;
import org.apache.vxquery.runtime.functions.cast.CastToStringOperation;
-import edu.uci.ics.hyracks.algebricks.common.exceptions.AlgebricksException;
-import edu.uci.ics.hyracks.algebricks.data.IPrinter;
-import edu.uci.ics.hyracks.data.std.primitive.BooleanPointable;
-import edu.uci.ics.hyracks.data.std.primitive.BytePointable;
-import edu.uci.ics.hyracks.data.std.primitive.DoublePointable;
-import edu.uci.ics.hyracks.data.std.primitive.FloatPointable;
-import edu.uci.ics.hyracks.data.std.primitive.IntegerPointable;
-import edu.uci.ics.hyracks.data.std.primitive.LongPointable;
-import edu.uci.ics.hyracks.data.std.primitive.ShortPointable;
-import edu.uci.ics.hyracks.data.std.primitive.UTF8StringPointable;
-import edu.uci.ics.hyracks.data.std.primitive.VoidPointable;
-import edu.uci.ics.hyracks.data.std.util.ArrayBackedValueStorage;
+import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
+import org.apache.hyracks.algebricks.data.IPrinter;
+import org.apache.hyracks.data.std.primitive.BooleanPointable;
+import org.apache.hyracks.data.std.primitive.BytePointable;
+import org.apache.hyracks.data.std.primitive.DoublePointable;
+import org.apache.hyracks.data.std.primitive.FloatPointable;
+import org.apache.hyracks.data.std.primitive.IntegerPointable;
+import org.apache.hyracks.data.std.primitive.LongPointable;
+import org.apache.hyracks.data.std.primitive.ShortPointable;
+import org.apache.hyracks.data.std.primitive.UTF8StringPointable;
+import org.apache.hyracks.data.std.primitive.VoidPointable;
+import org.apache.hyracks.data.std.util.ArrayBackedValueStorage;
public class XMLSerializer implements IPrinter {
private final PointablePool pp;
@@ -806,4 +806,4 @@ public class XMLSerializer implements IPrinter {
@Override
public void init() throws AlgebricksException {
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/types/AbstractNodeType.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/types/AbstractNodeType.java b/vxquery-core/src/main/java/org/apache/vxquery/types/AbstractNodeType.java
index 1ce1274..8177a06 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/types/AbstractNodeType.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/types/AbstractNodeType.java
@@ -21,4 +21,4 @@ abstract class AbstractNodeType implements NodeType {
public final boolean isAtomicType() {
return false;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/types/AnyNodeType.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/types/AnyNodeType.java b/vxquery-core/src/main/java/org/apache/vxquery/types/AnyNodeType.java
index 2f8ffce..74e6630 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/types/AnyNodeType.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/types/AnyNodeType.java
@@ -41,4 +41,4 @@ public final class AnyNodeType extends AbstractNodeType {
public boolean equals(Object other) {
return other instanceof AnyNodeType;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/types/AnySimpleType.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/types/AnySimpleType.java b/vxquery-core/src/main/java/org/apache/vxquery/types/AnySimpleType.java
index bc5044c..ae4ce25 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/types/AnySimpleType.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/types/AnySimpleType.java
@@ -66,4 +66,4 @@ public final class AnySimpleType implements SimpleType {
public boolean equals(Object other) {
return other instanceof AnySimpleType;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/types/AnyType.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/types/AnyType.java b/vxquery-core/src/main/java/org/apache/vxquery/types/AnyType.java
index 19519c2..92f21ed 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/types/AnyType.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/types/AnyType.java
@@ -66,4 +66,4 @@ public final class AnyType implements ComplexType {
public boolean equals(Object other) {
return other instanceof AnyType;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/types/AtomicType.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/types/AtomicType.java b/vxquery-core/src/main/java/org/apache/vxquery/types/AtomicType.java
index 19830af..e7257e5 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/types/AtomicType.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/types/AtomicType.java
@@ -17,4 +17,4 @@
package org.apache.vxquery.types;
public interface AtomicType extends ItemType, SimpleType {
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/types/AttributeType.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/types/AttributeType.java b/vxquery-core/src/main/java/org/apache/vxquery/types/AttributeType.java
index 0cacd59..b99b349 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/types/AttributeType.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/types/AttributeType.java
@@ -81,4 +81,4 @@ public final class AttributeType extends AbstractNodeType {
return false;
return true;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/types/BuiltinAtomicType.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/types/BuiltinAtomicType.java b/vxquery-core/src/main/java/org/apache/vxquery/types/BuiltinAtomicType.java
index bc5ee48..3df9bac 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/types/BuiltinAtomicType.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/types/BuiltinAtomicType.java
@@ -81,4 +81,4 @@ final class BuiltinAtomicType implements AtomicType {
return false;
return true;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/types/BuiltinTypeConstants.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/types/BuiltinTypeConstants.java b/vxquery-core/src/main/java/org/apache/vxquery/types/BuiltinTypeConstants.java
index 3e78819..eefebcc 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/types/BuiltinTypeConstants.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/types/BuiltinTypeConstants.java
@@ -73,4 +73,4 @@ public class BuiltinTypeConstants {
public static final int XS_ENTITIES_TYPE_ID = 51;
public static final int BUILTIN_TYPE_COUNT = 52;
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/types/BuiltinTypeQNames.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/types/BuiltinTypeQNames.java b/vxquery-core/src/main/java/org/apache/vxquery/types/BuiltinTypeQNames.java
index aafbf16..9f762ff 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/types/BuiltinTypeQNames.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/types/BuiltinTypeQNames.java
@@ -125,4 +125,4 @@ public class BuiltinTypeQNames {
XQueryConstants.XS_PREFIX);
public static final QName XSEXT_TYPE_TYPE_QNAME = new QName(XQueryConstants.XSEXT_NSURI, "type",
XQueryConstants.XSEXT_PREFIX);
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/types/BuiltinTypeRegistry.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/types/BuiltinTypeRegistry.java b/vxquery-core/src/main/java/org/apache/vxquery/types/BuiltinTypeRegistry.java
index a5da4d7..7cfcb5c 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/types/BuiltinTypeRegistry.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/types/BuiltinTypeRegistry.java
@@ -345,4 +345,4 @@ public final class BuiltinTypeRegistry {
typeMap.put(BuiltinTypeQNames.XS_NOTATION_TYPE_QNAME, XS_NOTATION);
TYPE_MAP = Collections.unmodifiableMap(typeMap);
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/types/CommentType.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/types/CommentType.java b/vxquery-core/src/main/java/org/apache/vxquery/types/CommentType.java
index 4ca4a7c..5766a75 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/types/CommentType.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/types/CommentType.java
@@ -41,4 +41,4 @@ public final class CommentType extends AbstractNodeType {
public boolean equals(Object other) {
return other instanceof CommentType;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/types/ComplexType.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/types/ComplexType.java b/vxquery-core/src/main/java/org/apache/vxquery/types/ComplexType.java
index e570589..45dc0cc 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/types/ComplexType.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/types/ComplexType.java
@@ -18,4 +18,4 @@ package org.apache.vxquery.types;
public interface ComplexType extends SchemaType {
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/types/DerivationProcess.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/types/DerivationProcess.java b/vxquery-core/src/main/java/org/apache/vxquery/types/DerivationProcess.java
index cbe0a4a..2204220 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/types/DerivationProcess.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/types/DerivationProcess.java
@@ -18,4 +18,4 @@ package org.apache.vxquery.types;
public enum DerivationProcess {
RESTRICTION, EXTENSION, LIST, UNION
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/types/DocumentType.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/types/DocumentType.java b/vxquery-core/src/main/java/org/apache/vxquery/types/DocumentType.java
index bc02842..66124f8 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/types/DocumentType.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/types/DocumentType.java
@@ -65,4 +65,4 @@ public final class DocumentType extends AbstractNodeType {
return false;
return true;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/types/ElementType.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/types/ElementType.java b/vxquery-core/src/main/java/org/apache/vxquery/types/ElementType.java
index 26dffe9..6f7d431 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/types/ElementType.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/types/ElementType.java
@@ -92,4 +92,4 @@ public final class ElementType extends AbstractNodeType {
return false;
return true;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/types/EmptySequenceType.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/types/EmptySequenceType.java b/vxquery-core/src/main/java/org/apache/vxquery/types/EmptySequenceType.java
index 6eca7c4..61d1c4b 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/types/EmptySequenceType.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/types/EmptySequenceType.java
@@ -36,4 +36,4 @@ public final class EmptySequenceType implements ItemType {
public boolean equals(Object other) {
return other instanceof EmptySequenceType;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/types/ItemType.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/types/ItemType.java b/vxquery-core/src/main/java/org/apache/vxquery/types/ItemType.java
index 1b1ab8f..054657e 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/types/ItemType.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/types/ItemType.java
@@ -18,4 +18,4 @@ package org.apache.vxquery.types;
public interface ItemType extends XQType {
public boolean isAtomicType();
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/types/NameTest.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/types/NameTest.java b/vxquery-core/src/main/java/org/apache/vxquery/types/NameTest.java
index e3fe193..fde6e07 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/types/NameTest.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/types/NameTest.java
@@ -19,7 +19,7 @@ package org.apache.vxquery.types;
import java.io.Serializable;
import java.util.Arrays;
-import edu.uci.ics.hyracks.data.std.primitive.UTF8StringPointable;
+import org.apache.hyracks.data.std.primitive.UTF8StringPointable;
public final class NameTest implements Serializable {
private static final long serialVersionUID = 1L;
@@ -92,4 +92,4 @@ public final class NameTest implements Serializable {
return false;
return true;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/types/NodeKind.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/types/NodeKind.java b/vxquery-core/src/main/java/org/apache/vxquery/types/NodeKind.java
index f03eab8..c7fc25c 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/types/NodeKind.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/types/NodeKind.java
@@ -24,4 +24,4 @@ public enum NodeKind {
ELEMENT,
PI,
TEXT,
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/types/NodeType.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/types/NodeType.java b/vxquery-core/src/main/java/org/apache/vxquery/types/NodeType.java
index 33513a6..cd43f97 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/types/NodeType.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/types/NodeType.java
@@ -18,4 +18,4 @@ package org.apache.vxquery.types;
public interface NodeType extends ItemType {
public NodeKind getNodeKind();
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/types/NoneType.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/types/NoneType.java b/vxquery-core/src/main/java/org/apache/vxquery/types/NoneType.java
index 2eeb1d4..7c58f52 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/types/NoneType.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/types/NoneType.java
@@ -36,4 +36,4 @@ public final class NoneType implements ItemType {
public boolean equals(Object other) {
return other instanceof NoneType;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/types/ProcessingInstructionType.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/types/ProcessingInstructionType.java b/vxquery-core/src/main/java/org/apache/vxquery/types/ProcessingInstructionType.java
index d1f294a..46f847e 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/types/ProcessingInstructionType.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/types/ProcessingInstructionType.java
@@ -18,7 +18,7 @@ package org.apache.vxquery.types;
import java.util.Arrays;
-import edu.uci.ics.hyracks.data.std.primitive.UTF8StringPointable;
+import org.apache.hyracks.data.std.primitive.UTF8StringPointable;
public final class ProcessingInstructionType extends AbstractNodeType {
public static final ProcessingInstructionType ANYPI = new ProcessingInstructionType(null);
@@ -71,4 +71,4 @@ public final class ProcessingInstructionType extends AbstractNodeType {
return false;
return true;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/types/SchemaType.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/types/SchemaType.java b/vxquery-core/src/main/java/org/apache/vxquery/types/SchemaType.java
index 369de64..4e9dce5 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/types/SchemaType.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/types/SchemaType.java
@@ -28,4 +28,4 @@ public interface SchemaType extends XQType {
public boolean isComplexType();
public boolean isAtomicType();
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/types/SimpleType.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/types/SimpleType.java b/vxquery-core/src/main/java/org/apache/vxquery/types/SimpleType.java
index 26b948c..3c02ba7 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/types/SimpleType.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/types/SimpleType.java
@@ -18,4 +18,4 @@ package org.apache.vxquery.types;
public interface SimpleType extends SchemaType {
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/types/TextType.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/types/TextType.java b/vxquery-core/src/main/java/org/apache/vxquery/types/TextType.java
index 0709245..2656775 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/types/TextType.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/types/TextType.java
@@ -41,4 +41,4 @@ public final class TextType extends AbstractNodeType {
public boolean equals(Object other) {
return other instanceof TextType;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/types/TypeHelper.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/types/TypeHelper.java b/vxquery-core/src/main/java/org/apache/vxquery/types/TypeHelper.java
index 2dd0272..5ce1e3a 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/types/TypeHelper.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/types/TypeHelper.java
@@ -28,4 +28,4 @@ public class TypeHelper {
public static boolean isSortable(Class<?> type) {
return false;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/types/TypeUtils.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/types/TypeUtils.java b/vxquery-core/src/main/java/org/apache/vxquery/types/TypeUtils.java
index 09882d0..f76a423 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/types/TypeUtils.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/types/TypeUtils.java
@@ -84,4 +84,4 @@ public class TypeUtils {
subType = (AtomicType) subType.getBaseType();
}
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/types/XQType.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/types/XQType.java b/vxquery-core/src/main/java/org/apache/vxquery/types/XQType.java
index fbde3ed..59e894d 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/types/XQType.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/types/XQType.java
@@ -19,4 +19,4 @@ package org.apache.vxquery.types;
import java.io.Serializable;
public interface XQType extends Serializable {
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/util/Filter.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/util/Filter.java b/vxquery-core/src/main/java/org/apache/vxquery/util/Filter.java
index 5115210..91f42e0 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/util/Filter.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/util/Filter.java
@@ -34,4 +34,4 @@ public interface Filter<T> {
};
public boolean accept(T value) throws SystemException;
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/util/GrowableIntArray.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/util/GrowableIntArray.java b/vxquery-core/src/main/java/org/apache/vxquery/util/GrowableIntArray.java
index 82f2c08..9e7ecc0 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/util/GrowableIntArray.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/util/GrowableIntArray.java
@@ -90,4 +90,4 @@ public class GrowableIntArray {
}
array = Arrays.copyOf(array, array.length + increment);
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/util/SourceLocation.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/util/SourceLocation.java b/vxquery-core/src/main/java/org/apache/vxquery/util/SourceLocation.java
index 3e697ed..0ec195c 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/util/SourceLocation.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/util/SourceLocation.java
@@ -55,4 +55,4 @@ public final class SourceLocation {
public String toString() {
return sourceFileName + " (" + lineNumber + ":" + columnNumber + ")";
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/xmlparser/ITreeNodeIdProvider.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/xmlparser/ITreeNodeIdProvider.java b/vxquery-core/src/main/java/org/apache/vxquery/xmlparser/ITreeNodeIdProvider.java
index 425938f..f5f1830 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/xmlparser/ITreeNodeIdProvider.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/xmlparser/ITreeNodeIdProvider.java
@@ -18,4 +18,4 @@ package org.apache.vxquery.xmlparser;
public interface ITreeNodeIdProvider {
public int getId();
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/xmlparser/SAXContentHandler.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/xmlparser/SAXContentHandler.java b/vxquery-core/src/main/java/org/apache/vxquery/xmlparser/SAXContentHandler.java
index 323b608..03a125b 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/xmlparser/SAXContentHandler.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/xmlparser/SAXContentHandler.java
@@ -16,10 +16,15 @@ package org.apache.vxquery.xmlparser;
import java.io.DataOutput;
import java.io.IOException;
-import java.nio.ByteBuffer;
import java.util.ArrayList;
import java.util.List;
+import org.apache.hyracks.api.comm.IFrameFieldAppender;
+import org.apache.hyracks.api.comm.IFrameWriter;
+import org.apache.hyracks.api.exceptions.HyracksDataException;
+import org.apache.hyracks.data.std.primitive.UTF8StringPointable;
+import org.apache.hyracks.data.std.util.ArrayBackedValueStorage;
+import org.apache.hyracks.dataflow.common.comm.util.FrameUtils;
import org.apache.vxquery.datamodel.accessors.TaggedValuePointable;
import org.apache.vxquery.datamodel.accessors.nodes.NodeTreePointable;
import org.apache.vxquery.datamodel.builders.atomic.UTF8StringBuilder;
@@ -44,14 +49,6 @@ import org.xml.sax.Locator;
import org.xml.sax.SAXException;
import org.xml.sax.ext.LexicalHandler;
-import edu.uci.ics.hyracks.api.comm.IFrameWriter;
-import edu.uci.ics.hyracks.api.exceptions.HyracksDataException;
-import edu.uci.ics.hyracks.data.std.primitive.UTF8StringPointable;
-import edu.uci.ics.hyracks.data.std.util.ArrayBackedValueStorage;
-import edu.uci.ics.hyracks.dataflow.common.comm.io.FrameTupleAccessor;
-import edu.uci.ics.hyracks.dataflow.common.comm.io.FrameTupleAppender;
-import edu.uci.ics.hyracks.dataflow.common.comm.util.FrameUtils;
-
public class SAXContentHandler implements ContentHandler, LexicalHandler {
// XML node builders
private final AttributeNodeBuilder anb;
@@ -65,9 +62,7 @@ public class SAXContentHandler implements ContentHandler, LexicalHandler {
private final List<ElementNodeBuilder> freeENBList;
// Frame writing variables
- private FrameTupleAppender appender;
- private ByteBuffer frame;
- private FrameTupleAccessor fta;
+ private IFrameFieldAppender appender;
private int tupleIndex;
private IFrameWriter writer;
@@ -117,12 +112,11 @@ public class SAXContentHandler implements ContentHandler, LexicalHandler {
textABVS = new ArrayBackedValueStorage();
}
- public SAXContentHandler(boolean attachTypes, ITreeNodeIdProvider nodeIdProvider, ByteBuffer frame,
- FrameTupleAppender appender, List<SequenceType> childSequenceTypes) {
+ public SAXContentHandler(boolean attachTypes, ITreeNodeIdProvider nodeIdProvider, IFrameFieldAppender appender,
+ List<SequenceType> childSequenceTypes) {
this(attachTypes, nodeIdProvider);
// Frame writing variables
- this.frame = frame;
this.appender = appender;
setChildPathSteps(childSequenceTypes);
}
@@ -145,9 +139,8 @@ public class SAXContentHandler implements ContentHandler, LexicalHandler {
}
}
- public void setupElementWriter(IFrameWriter writer, FrameTupleAccessor fta, int tupleIndex) {
+ public void setupElementWriter(IFrameWriter writer, int tupleIndex) {
this.writer = writer;
- this.fta = fta;
this.tupleIndex = tupleIndex;
}
@@ -174,7 +167,7 @@ public class SAXContentHandler implements ContentHandler, LexicalHandler {
flushText();
docb.endChildrenChunk();
docb.finish();
- if (frame != null && appender != null) {
+ if (appender != null) {
writeElement();
}
} catch (IOException e) {
@@ -284,7 +277,7 @@ public class SAXContentHandler implements ContentHandler, LexicalHandler {
/**
* The filter settings here are similar to one in the class linked below.
- *
+ *
* @see org.apache.vxquery.runtime.functions.step.NodeTestFilter.java
*/
private boolean startElementChildPathStep(String uri, String localName) {
@@ -523,27 +516,29 @@ public class SAXContentHandler implements ContentHandler, LexicalHandler {
}
private void addNodeToTuple(TaggedValuePointable result, int t) throws HyracksDataException {
- // Send to the writer.
- if (!addNodeToTupleAppender(result, t)) {
- FrameUtils.flushFrame(frame, writer);
- appender.reset(frame, true);
- if (!addNodeToTupleAppender(result, t)) {
- throw new HyracksDataException("Could not write frame.");
- }
- }
- }
-
- private boolean addNodeToTupleAppender(TaggedValuePointable result, int t) throws HyracksDataException {
- // First copy all new fields over.
- if (fta.getFieldCount() > 0) {
- for (int f = 0; f < fta.getFieldCount(); ++f) {
- if (!appender.appendField(fta, t, f)) {
- return false;
- }
- }
- }
- return appender.appendField(result.getByteArray(), result.getStartOffset(), result.getLength());
- }
+ FrameUtils.appendFieldToWriter(writer, appender, result.getByteArray(), result.getStartOffset(),
+ result.getLength());
+ // // Send to the writer.
+ // if (!addNodeToTupleAppender(result, t)) {
+ // FrameUtils.flushFrame(frame, writer);
+ // appender.reset(frame, true);
+ // if (!addNodeToTupleAppender(result, t)) {
+ // throw new HyracksDataException("Could not write frame.");
+ // }
+ // }
+ }
+ //
+ // private boolean addNodeToTupleAppender(TaggedValuePointable result, int t) throws HyracksDataException {
+ // // First copy all new fields over.
+ // if (fta.getFieldCount() > 0) {
+ // for (int f = 0; f < fta.getFieldCount(); ++f) {
+ // if (!appender.appendField(fta, t, f)) {
+ // return false;
+ // }
+ // }
+ // }
+ // return appender.appendField(result.getByteArray(), result.getStartOffset(), result.getLength());
+ // }
private String getStringFromBytes(byte[] bytes) {
if (bytes == null) {
@@ -571,4 +566,4 @@ public class SAXContentHandler implements ContentHandler, LexicalHandler {
return true;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/xmlparser/TreeNodeIdProvider.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/xmlparser/TreeNodeIdProvider.java b/vxquery-core/src/main/java/org/apache/vxquery/xmlparser/TreeNodeIdProvider.java
index 7f1f3f3..957b91e 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/xmlparser/TreeNodeIdProvider.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/xmlparser/TreeNodeIdProvider.java
@@ -51,4 +51,4 @@ public class TreeNodeIdProvider implements ITreeNodeIdProvider {
}
return count;
}
-}
\ No newline at end of file
+}
[40/50] [abbrv] vxquery git commit: VXQUERY-191: Fixed sort order for
XQTS text results
Posted by sj...@apache.org.
http://git-wip-us.apache.org/repos/asf/vxquery/blob/7de1fbaa/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/LineFileReporterImpl.java
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/LineFileReporterImpl.java b/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/LineFileReporterImpl.java
index dce59b0..12a69c3 100644
--- a/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/LineFileReporterImpl.java
+++ b/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/LineFileReporterImpl.java
@@ -17,13 +17,16 @@
package org.apache.vxquery.xtest;
import java.io.File;
+import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.PrintWriter;
public class LineFileReporterImpl implements ResultReporter {
private PrintWriter out;
+ private File file;
public LineFileReporterImpl(File file) throws IOException {
+ this.file = file;
out = new PrintWriter(file);
}
@@ -36,6 +39,14 @@ public class LineFileReporterImpl implements ResultReporter {
@Override
public void close() {
+ //Perform the sorting process.
out.close();
+ try {
+ ResultFileSorter sorter = new ResultFileSorter(file.getPath());
+ sorter.sortFile();
+ } catch (FileNotFoundException e) {
+ e.printStackTrace();
+ }
}
}
+
http://git-wip-us.apache.org/repos/asf/vxquery/blob/7de1fbaa/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/ResultFileSorter.java
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/ResultFileSorter.java b/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/ResultFileSorter.java
new file mode 100644
index 0000000..c048138
--- /dev/null
+++ b/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/ResultFileSorter.java
@@ -0,0 +1,101 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.vxquery.xtest;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.FileReader;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+/**
+ * Class to sort the final test results.
+ */
+
+//TODO : Optimize for large files.
+public class ResultFileSorter {
+
+ private final String path;
+ private static final Logger LOGGER = Logger.getLogger(ResultFileSorter.class.getName());
+
+ public ResultFileSorter(String path) throws FileNotFoundException {
+ this.path = path;
+ }
+
+ /**
+ * The method to sort the test case results.
+ */
+ public void sortFile() {
+ File resultFile = new File(path);
+ try {
+ FileReader fileReader = new FileReader(resultFile);
+ BufferedReader reader = new BufferedReader(fileReader);
+ String line;
+ ArrayList<String> fullText = new ArrayList<>();
+ while ((line = reader.readLine()) != null) {
+ fullText.add(line);
+ }
+ if (LOGGER.isLoggable(Level.INFO)) {
+ LOGGER.log(Level.INFO, "Sorting.....");
+ }
+ Collections.sort(fullText, String.CASE_INSENSITIVE_ORDER);
+ String[] sortedText = fullText.toArray(new String[fullText.size()]);
+ this.eraseFile(resultFile);
+ this.writeToFile(sortedText);
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+ }
+
+ /**
+ * Method to delete existing the file.
+ *
+ * @throws FileNotFoundException
+ */
+ private boolean eraseFile(File file) throws FileNotFoundException {
+ return file.delete();
+ }
+
+ /**
+ * Method to write the sorted content to the new file.
+ *
+ * @param text
+ * : The sorted array of test case results.
+ * @throws FileNotFoundException
+ */
+ private void writeToFile(String[] text) throws FileNotFoundException {
+ File newFile = new File(path);
+ PrintWriter writer = new PrintWriter(newFile);
+ if (LOGGER.isLoggable(Level.INFO)) {
+ LOGGER.log(Level.INFO, "Writing to file started.");
+ }
+
+ for (String s : text) {
+ writer.write(s + "\n");
+ }
+ writer.close();
+ if (LOGGER.isLoggable(Level.INFO)) {
+ LOGGER.log(Level.INFO, "Writing to file finished successfully.");
+ }
+
+ }
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/7de1fbaa/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/XTest.java
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/XTest.java b/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/XTest.java
index b216240..17dea60 100644
--- a/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/XTest.java
+++ b/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/XTest.java
@@ -16,6 +16,8 @@
*/
package org.apache.vxquery.xtest;
+import org.mortbay.jetty.Server;
+
import java.io.File;
import java.util.ArrayList;
import java.util.List;
@@ -23,8 +25,6 @@ import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.TimeUnit;
-import org.mortbay.jetty.Server;
-
public class XTest {
private XTestOptions opts;
private Server server;
@@ -36,7 +36,7 @@ public class XTest {
XTest(XTestOptions opts) {
this.opts = opts;
- reporters = new ArrayList<ResultReporter>();
+ reporters = new ArrayList<>();
}
void init() throws Exception {
@@ -100,6 +100,7 @@ public class XTest {
eSvc.awaitTermination(opts.keepalive, TimeUnit.MILLISECONDS);
} finally {
try {
+
if (server != null) {
server.stop();
}
[15/50] [abbrv] vxquery git commit: VXQUERY-181 - Move to Hyracks
0.2.16
Posted by sj...@apache.org.
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/datetime/FnMinutesFromDurationScalarEvaluatorFactory.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/datetime/FnMinutesFromDurationScalarEvaluatorFactory.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/datetime/FnMinutesFromDurationScalarEvaluatorFactory.java
index 8737da8..32549aa 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/datetime/FnMinutesFromDurationScalarEvaluatorFactory.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/datetime/FnMinutesFromDurationScalarEvaluatorFactory.java
@@ -18,7 +18,7 @@ package org.apache.vxquery.runtime.functions.datetime;
import org.apache.vxquery.datamodel.util.DateTime;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
public class FnMinutesFromDurationScalarEvaluatorFactory extends AbstractValueFromDurationScalarEvaluatorFactory {
private static final long serialVersionUID = 1L;
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/datetime/FnMinutesFromTimeScalarEvaluatorFactory.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/datetime/FnMinutesFromTimeScalarEvaluatorFactory.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/datetime/FnMinutesFromTimeScalarEvaluatorFactory.java
index c2c1431..37b8dd4 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/datetime/FnMinutesFromTimeScalarEvaluatorFactory.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/datetime/FnMinutesFromTimeScalarEvaluatorFactory.java
@@ -20,7 +20,7 @@ import org.apache.vxquery.datamodel.accessors.TaggedValuePointable;
import org.apache.vxquery.datamodel.accessors.atomic.XSTimePointable;
import org.apache.vxquery.datamodel.values.ValueTag;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
public class FnMinutesFromTimeScalarEvaluatorFactory extends AbstractValueFromDateTimeScalarEvaluatorFactory {
private static final long serialVersionUID = 1L;
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/datetime/FnMonthFromDateScalarEvaluatorFactory.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/datetime/FnMonthFromDateScalarEvaluatorFactory.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/datetime/FnMonthFromDateScalarEvaluatorFactory.java
index 10d4e64..5c91f46 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/datetime/FnMonthFromDateScalarEvaluatorFactory.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/datetime/FnMonthFromDateScalarEvaluatorFactory.java
@@ -20,7 +20,7 @@ import org.apache.vxquery.datamodel.accessors.TaggedValuePointable;
import org.apache.vxquery.datamodel.accessors.atomic.XSDatePointable;
import org.apache.vxquery.datamodel.values.ValueTag;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
public class FnMonthFromDateScalarEvaluatorFactory extends AbstractValueFromDateTimeScalarEvaluatorFactory {
private static final long serialVersionUID = 1L;
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/datetime/FnMonthFromDateTimeScalarEvaluatorFactory.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/datetime/FnMonthFromDateTimeScalarEvaluatorFactory.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/datetime/FnMonthFromDateTimeScalarEvaluatorFactory.java
index 7f7334d..0fab0f0 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/datetime/FnMonthFromDateTimeScalarEvaluatorFactory.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/datetime/FnMonthFromDateTimeScalarEvaluatorFactory.java
@@ -20,7 +20,7 @@ import org.apache.vxquery.datamodel.accessors.TaggedValuePointable;
import org.apache.vxquery.datamodel.accessors.atomic.XSDateTimePointable;
import org.apache.vxquery.datamodel.values.ValueTag;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
public class FnMonthFromDateTimeScalarEvaluatorFactory extends AbstractValueFromDateTimeScalarEvaluatorFactory {
private static final long serialVersionUID = 1L;
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/datetime/FnMonthsFromDurationScalarEvaluatorFactory.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/datetime/FnMonthsFromDurationScalarEvaluatorFactory.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/datetime/FnMonthsFromDurationScalarEvaluatorFactory.java
index 3a3a61f..56fc455 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/datetime/FnMonthsFromDurationScalarEvaluatorFactory.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/datetime/FnMonthsFromDurationScalarEvaluatorFactory.java
@@ -16,7 +16,7 @@
*/
package org.apache.vxquery.runtime.functions.datetime;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
public class FnMonthsFromDurationScalarEvaluatorFactory extends AbstractValueFromDurationScalarEvaluatorFactory {
private static final long serialVersionUID = 1L;
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/datetime/FnSecondsFromDateTimeScalarEvaluatorFactory.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/datetime/FnSecondsFromDateTimeScalarEvaluatorFactory.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/datetime/FnSecondsFromDateTimeScalarEvaluatorFactory.java
index a18b357..b79891a 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/datetime/FnSecondsFromDateTimeScalarEvaluatorFactory.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/datetime/FnSecondsFromDateTimeScalarEvaluatorFactory.java
@@ -20,7 +20,7 @@ import org.apache.vxquery.datamodel.accessors.TaggedValuePointable;
import org.apache.vxquery.datamodel.accessors.atomic.XSDateTimePointable;
import org.apache.vxquery.datamodel.values.ValueTag;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
public class FnSecondsFromDateTimeScalarEvaluatorFactory extends AbstractValueFromDateTimeScalarEvaluatorFactory {
private static final long serialVersionUID = 1L;
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/datetime/FnSecondsFromDurationScalarEvaluatorFactory.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/datetime/FnSecondsFromDurationScalarEvaluatorFactory.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/datetime/FnSecondsFromDurationScalarEvaluatorFactory.java
index 443423b..075bdcd 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/datetime/FnSecondsFromDurationScalarEvaluatorFactory.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/datetime/FnSecondsFromDurationScalarEvaluatorFactory.java
@@ -19,7 +19,7 @@ package org.apache.vxquery.runtime.functions.datetime;
import org.apache.vxquery.datamodel.util.DateTime;
import org.apache.vxquery.datamodel.values.ValueTag;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
public class FnSecondsFromDurationScalarEvaluatorFactory extends AbstractValueFromDurationScalarEvaluatorFactory {
private static final long serialVersionUID = 1L;
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/datetime/FnSecondsFromTimeScalarEvaluatorFactory.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/datetime/FnSecondsFromTimeScalarEvaluatorFactory.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/datetime/FnSecondsFromTimeScalarEvaluatorFactory.java
index fadb339..ccdb255 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/datetime/FnSecondsFromTimeScalarEvaluatorFactory.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/datetime/FnSecondsFromTimeScalarEvaluatorFactory.java
@@ -20,7 +20,7 @@ import org.apache.vxquery.datamodel.accessors.TaggedValuePointable;
import org.apache.vxquery.datamodel.accessors.atomic.XSTimePointable;
import org.apache.vxquery.datamodel.values.ValueTag;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
public class FnSecondsFromTimeScalarEvaluatorFactory extends AbstractValueFromDateTimeScalarEvaluatorFactory {
private static final long serialVersionUID = 1L;
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/datetime/FnTimezoneFromDateScalarEvaluatorFactory.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/datetime/FnTimezoneFromDateScalarEvaluatorFactory.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/datetime/FnTimezoneFromDateScalarEvaluatorFactory.java
index b524d22..5e27591 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/datetime/FnTimezoneFromDateScalarEvaluatorFactory.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/datetime/FnTimezoneFromDateScalarEvaluatorFactory.java
@@ -21,7 +21,7 @@ import org.apache.vxquery.datamodel.accessors.atomic.XSDatePointable;
import org.apache.vxquery.datamodel.values.ValueTag;
import org.apache.vxquery.runtime.functions.util.FunctionHelper;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
public class FnTimezoneFromDateScalarEvaluatorFactory extends AbstractValueFromDateTimeScalarEvaluatorFactory {
private static final long serialVersionUID = 1L;
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/datetime/FnTimezoneFromDateTimeScalarEvaluatorFactory.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/datetime/FnTimezoneFromDateTimeScalarEvaluatorFactory.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/datetime/FnTimezoneFromDateTimeScalarEvaluatorFactory.java
index e8d0907..06d6780 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/datetime/FnTimezoneFromDateTimeScalarEvaluatorFactory.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/datetime/FnTimezoneFromDateTimeScalarEvaluatorFactory.java
@@ -21,7 +21,7 @@ import org.apache.vxquery.datamodel.accessors.atomic.XSDateTimePointable;
import org.apache.vxquery.datamodel.values.ValueTag;
import org.apache.vxquery.runtime.functions.util.FunctionHelper;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
public class FnTimezoneFromDateTimeScalarEvaluatorFactory extends AbstractValueFromDateTimeScalarEvaluatorFactory {
private static final long serialVersionUID = 1L;
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/datetime/FnTimezoneFromTimeScalarEvaluatorFactory.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/datetime/FnTimezoneFromTimeScalarEvaluatorFactory.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/datetime/FnTimezoneFromTimeScalarEvaluatorFactory.java
index 6a46e67..ae5b50f 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/datetime/FnTimezoneFromTimeScalarEvaluatorFactory.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/datetime/FnTimezoneFromTimeScalarEvaluatorFactory.java
@@ -21,7 +21,7 @@ import org.apache.vxquery.datamodel.accessors.atomic.XSTimePointable;
import org.apache.vxquery.datamodel.values.ValueTag;
import org.apache.vxquery.runtime.functions.util.FunctionHelper;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
public class FnTimezoneFromTimeScalarEvaluatorFactory extends AbstractValueFromDateTimeScalarEvaluatorFactory {
private static final long serialVersionUID = 1L;
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/datetime/FnYearFromDateScalarEvaluatorFactory.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/datetime/FnYearFromDateScalarEvaluatorFactory.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/datetime/FnYearFromDateScalarEvaluatorFactory.java
index 5aaa25e..f701f62 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/datetime/FnYearFromDateScalarEvaluatorFactory.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/datetime/FnYearFromDateScalarEvaluatorFactory.java
@@ -20,7 +20,7 @@ import org.apache.vxquery.datamodel.accessors.TaggedValuePointable;
import org.apache.vxquery.datamodel.accessors.atomic.XSDatePointable;
import org.apache.vxquery.datamodel.values.ValueTag;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
public class FnYearFromDateScalarEvaluatorFactory extends AbstractValueFromDateTimeScalarEvaluatorFactory {
private static final long serialVersionUID = 1L;
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/datetime/FnYearFromDateTimeScalarEvaluatorFactory.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/datetime/FnYearFromDateTimeScalarEvaluatorFactory.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/datetime/FnYearFromDateTimeScalarEvaluatorFactory.java
index 4949013..bd86639 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/datetime/FnYearFromDateTimeScalarEvaluatorFactory.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/datetime/FnYearFromDateTimeScalarEvaluatorFactory.java
@@ -20,7 +20,7 @@ import org.apache.vxquery.datamodel.accessors.TaggedValuePointable;
import org.apache.vxquery.datamodel.accessors.atomic.XSDateTimePointable;
import org.apache.vxquery.datamodel.values.ValueTag;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
public class FnYearFromDateTimeScalarEvaluatorFactory extends AbstractValueFromDateTimeScalarEvaluatorFactory {
private static final long serialVersionUID = 1L;
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/datetime/FnYearsFromDurationScalarEvaluatorFactory.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/datetime/FnYearsFromDurationScalarEvaluatorFactory.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/datetime/FnYearsFromDurationScalarEvaluatorFactory.java
index e076046..9aad480 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/datetime/FnYearsFromDurationScalarEvaluatorFactory.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/datetime/FnYearsFromDurationScalarEvaluatorFactory.java
@@ -16,7 +16,7 @@
*/
package org.apache.vxquery.runtime.functions.datetime;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
public class FnYearsFromDurationScalarEvaluatorFactory extends AbstractValueFromDurationScalarEvaluatorFactory {
private static final long serialVersionUID = 1L;
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/error/FnErrorScalarEvaluatorFactory.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/error/FnErrorScalarEvaluatorFactory.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/error/FnErrorScalarEvaluatorFactory.java
index d596dbd..e879378 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/error/FnErrorScalarEvaluatorFactory.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/error/FnErrorScalarEvaluatorFactory.java
@@ -28,13 +28,13 @@ import org.apache.vxquery.runtime.functions.base.AbstractTaggedValueArgumentScal
import org.apache.vxquery.runtime.functions.base.AbstractTaggedValueArgumentScalarEvaluatorFactory;
import org.apache.vxquery.runtime.functions.util.FunctionHelper;
-import edu.uci.ics.hyracks.algebricks.common.exceptions.AlgebricksException;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluator;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
-import edu.uci.ics.hyracks.api.context.IHyracksTaskContext;
-import edu.uci.ics.hyracks.data.std.api.IPointable;
-import edu.uci.ics.hyracks.data.std.primitive.UTF8StringPointable;
-import edu.uci.ics.hyracks.dataflow.common.comm.util.ByteBufferInputStream;
+import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluator;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
+import org.apache.hyracks.api.context.IHyracksTaskContext;
+import org.apache.hyracks.data.std.api.IPointable;
+import org.apache.hyracks.data.std.primitive.UTF8StringPointable;
+import org.apache.hyracks.dataflow.common.comm.util.ByteBufferInputStream;
public class FnErrorScalarEvaluatorFactory extends AbstractTaggedValueArgumentScalarEvaluatorFactory {
private static final long serialVersionUID = 1L;
@@ -121,4 +121,4 @@ public class FnErrorScalarEvaluatorFactory extends AbstractTaggedValueArgumentSc
}
};
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/misc/FnDataScalarEvaluatorFactory.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/misc/FnDataScalarEvaluatorFactory.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/misc/FnDataScalarEvaluatorFactory.java
index 1a05efc..dac91cc 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/misc/FnDataScalarEvaluatorFactory.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/misc/FnDataScalarEvaluatorFactory.java
@@ -28,12 +28,12 @@ import org.apache.vxquery.runtime.functions.base.AbstractTaggedValueArgumentScal
import org.apache.vxquery.runtime.functions.base.AbstractTaggedValueArgumentScalarEvaluatorFactory;
import org.apache.vxquery.runtime.functions.util.AtomizeHelper;
-import edu.uci.ics.hyracks.algebricks.common.exceptions.AlgebricksException;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluator;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
-import edu.uci.ics.hyracks.api.context.IHyracksTaskContext;
-import edu.uci.ics.hyracks.data.std.api.IPointable;
-import edu.uci.ics.hyracks.data.std.util.ArrayBackedValueStorage;
+import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluator;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
+import org.apache.hyracks.api.context.IHyracksTaskContext;
+import org.apache.hyracks.data.std.api.IPointable;
+import org.apache.hyracks.data.std.util.ArrayBackedValueStorage;
public class FnDataScalarEvaluatorFactory extends AbstractTaggedValueArgumentScalarEvaluatorFactory {
private static final long serialVersionUID = 1L;
@@ -87,4 +87,4 @@ public class FnDataScalarEvaluatorFactory extends AbstractTaggedValueArgumentSca
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/node/AbstractNodeConstructorScalarEvaluator.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/node/AbstractNodeConstructorScalarEvaluator.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/node/AbstractNodeConstructorScalarEvaluator.java
index 93aa75c..dba3594 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/node/AbstractNodeConstructorScalarEvaluator.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/node/AbstractNodeConstructorScalarEvaluator.java
@@ -27,11 +27,11 @@ import org.apache.vxquery.exceptions.ErrorCode;
import org.apache.vxquery.exceptions.SystemException;
import org.apache.vxquery.runtime.functions.base.AbstractTaggedValueArgumentScalarEvaluator;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluator;
-import edu.uci.ics.hyracks.api.context.IHyracksTaskContext;
-import edu.uci.ics.hyracks.data.std.api.IMutableValueStorage;
-import edu.uci.ics.hyracks.data.std.api.IPointable;
-import edu.uci.ics.hyracks.data.std.util.ArrayBackedValueStorage;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluator;
+import org.apache.hyracks.api.context.IHyracksTaskContext;
+import org.apache.hyracks.data.std.api.IMutableValueStorage;
+import org.apache.hyracks.data.std.api.IPointable;
+import org.apache.hyracks.data.std.util.ArrayBackedValueStorage;
public abstract class AbstractNodeConstructorScalarEvaluator extends AbstractTaggedValueArgumentScalarEvaluator {
protected final IHyracksTaskContext ctx;
@@ -74,4 +74,4 @@ public abstract class AbstractNodeConstructorScalarEvaluator extends AbstractTag
throws IOException, SystemException;
protected abstract boolean createsDictionary();
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/node/AbstractNodePositionalCheckEvaluator.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/node/AbstractNodePositionalCheckEvaluator.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/node/AbstractNodePositionalCheckEvaluator.java
index 953b72d..df808f7 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/node/AbstractNodePositionalCheckEvaluator.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/node/AbstractNodePositionalCheckEvaluator.java
@@ -26,8 +26,8 @@ import org.apache.vxquery.exceptions.SystemException;
import org.apache.vxquery.runtime.functions.base.AbstractTaggedValueArgumentScalarEvaluator;
import org.apache.vxquery.runtime.functions.util.FunctionHelper;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluator;
-import edu.uci.ics.hyracks.data.std.api.IPointable;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluator;
+import org.apache.hyracks.data.std.api.IPointable;
public abstract class AbstractNodePositionalCheckEvaluator extends AbstractTaggedValueArgumentScalarEvaluator {
@@ -55,4 +55,4 @@ public abstract class AbstractNodePositionalCheckEvaluator extends AbstractTagge
}
abstract protected boolean nodeCompare(int firstId, int secondId);
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/node/AttributeNodeConstructorScalarEvaluator.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/node/AttributeNodeConstructorScalarEvaluator.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/node/AttributeNodeConstructorScalarEvaluator.java
index c4abe0c..39216f4 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/node/AttributeNodeConstructorScalarEvaluator.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/node/AttributeNodeConstructorScalarEvaluator.java
@@ -26,10 +26,10 @@ import org.apache.vxquery.datamodel.values.ValueTag;
import org.apache.vxquery.exceptions.ErrorCode;
import org.apache.vxquery.exceptions.SystemException;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluator;
-import edu.uci.ics.hyracks.api.context.IHyracksTaskContext;
-import edu.uci.ics.hyracks.data.std.api.IMutableValueStorage;
-import edu.uci.ics.hyracks.data.std.primitive.UTF8StringPointable;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluator;
+import org.apache.hyracks.api.context.IHyracksTaskContext;
+import org.apache.hyracks.data.std.api.IMutableValueStorage;
+import org.apache.hyracks.data.std.primitive.UTF8StringPointable;
public class AttributeNodeConstructorScalarEvaluator extends AbstractNodeConstructorScalarEvaluator {
private final AttributeNodeBuilder anb;
@@ -70,4 +70,4 @@ public class AttributeNodeConstructorScalarEvaluator extends AbstractNodeConstru
protected boolean createsDictionary() {
return true;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/node/AttributeNodeConstructorScalarEvaluatorFactory.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/node/AttributeNodeConstructorScalarEvaluatorFactory.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/node/AttributeNodeConstructorScalarEvaluatorFactory.java
index 1467956..4b1a5a1 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/node/AttributeNodeConstructorScalarEvaluatorFactory.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/node/AttributeNodeConstructorScalarEvaluatorFactory.java
@@ -18,10 +18,10 @@ package org.apache.vxquery.runtime.functions.node;
import org.apache.vxquery.runtime.functions.base.AbstractTaggedValueArgumentScalarEvaluatorFactory;
-import edu.uci.ics.hyracks.algebricks.common.exceptions.AlgebricksException;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluator;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
-import edu.uci.ics.hyracks.api.context.IHyracksTaskContext;
+import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluator;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
+import org.apache.hyracks.api.context.IHyracksTaskContext;
public class AttributeNodeConstructorScalarEvaluatorFactory extends AbstractTaggedValueArgumentScalarEvaluatorFactory {
private static final long serialVersionUID = 1L;
@@ -35,4 +35,4 @@ public class AttributeNodeConstructorScalarEvaluatorFactory extends AbstractTagg
throws AlgebricksException {
return new AttributeNodeConstructorScalarEvaluator(ctx, args);
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/node/CommentNodeConstructorScalarEvaluator.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/node/CommentNodeConstructorScalarEvaluator.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/node/CommentNodeConstructorScalarEvaluator.java
index 7b187db..917600a 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/node/CommentNodeConstructorScalarEvaluator.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/node/CommentNodeConstructorScalarEvaluator.java
@@ -25,10 +25,10 @@ import org.apache.vxquery.datamodel.values.ValueTag;
import org.apache.vxquery.exceptions.ErrorCode;
import org.apache.vxquery.exceptions.SystemException;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluator;
-import edu.uci.ics.hyracks.api.context.IHyracksTaskContext;
-import edu.uci.ics.hyracks.data.std.api.IMutableValueStorage;
-import edu.uci.ics.hyracks.data.std.primitive.VoidPointable;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluator;
+import org.apache.hyracks.api.context.IHyracksTaskContext;
+import org.apache.hyracks.data.std.api.IMutableValueStorage;
+import org.apache.hyracks.data.std.primitive.VoidPointable;
public class CommentNodeConstructorScalarEvaluator extends AbstractNodeConstructorScalarEvaluator {
private final CommentNodeBuilder cnb;
@@ -58,4 +58,4 @@ public class CommentNodeConstructorScalarEvaluator extends AbstractNodeConstruct
protected boolean createsDictionary() {
return false;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/node/CommentNodeConstructorScalarEvaluatorFactory.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/node/CommentNodeConstructorScalarEvaluatorFactory.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/node/CommentNodeConstructorScalarEvaluatorFactory.java
index abddc43..8bc3d32 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/node/CommentNodeConstructorScalarEvaluatorFactory.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/node/CommentNodeConstructorScalarEvaluatorFactory.java
@@ -18,10 +18,10 @@ package org.apache.vxquery.runtime.functions.node;
import org.apache.vxquery.runtime.functions.base.AbstractTaggedValueArgumentScalarEvaluatorFactory;
-import edu.uci.ics.hyracks.algebricks.common.exceptions.AlgebricksException;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluator;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
-import edu.uci.ics.hyracks.api.context.IHyracksTaskContext;
+import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluator;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
+import org.apache.hyracks.api.context.IHyracksTaskContext;
public class CommentNodeConstructorScalarEvaluatorFactory extends AbstractTaggedValueArgumentScalarEvaluatorFactory {
private static final long serialVersionUID = 1L;
@@ -35,4 +35,4 @@ public class CommentNodeConstructorScalarEvaluatorFactory extends AbstractTagged
throws AlgebricksException {
return new CommentNodeConstructorScalarEvaluator(ctx, args);
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/node/ElementNodeConstructorScalarEvaluator.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/node/ElementNodeConstructorScalarEvaluator.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/node/ElementNodeConstructorScalarEvaluator.java
index 9f9120a..cfcdd13 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/node/ElementNodeConstructorScalarEvaluator.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/node/ElementNodeConstructorScalarEvaluator.java
@@ -40,12 +40,12 @@ import org.apache.vxquery.datamodel.values.ValueTag;
import org.apache.vxquery.exceptions.ErrorCode;
import org.apache.vxquery.exceptions.SystemException;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluator;
-import edu.uci.ics.hyracks.api.context.IHyracksTaskContext;
-import edu.uci.ics.hyracks.data.std.api.IMutableValueStorage;
-import edu.uci.ics.hyracks.data.std.primitive.UTF8StringPointable;
-import edu.uci.ics.hyracks.data.std.primitive.VoidPointable;
-import edu.uci.ics.hyracks.data.std.util.ArrayBackedValueStorage;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluator;
+import org.apache.hyracks.api.context.IHyracksTaskContext;
+import org.apache.hyracks.data.std.api.IMutableValueStorage;
+import org.apache.hyracks.data.std.primitive.UTF8StringPointable;
+import org.apache.hyracks.data.std.primitive.VoidPointable;
+import org.apache.hyracks.data.std.util.ArrayBackedValueStorage;
public class ElementNodeConstructorScalarEvaluator extends AbstractNodeConstructorScalarEvaluator {
@@ -435,4 +435,4 @@ public class ElementNodeConstructorScalarEvaluator extends AbstractNodeConstruct
ppool.giveBack(vp);
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/node/ElementNodeConstructorScalarEvaluatorFactory.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/node/ElementNodeConstructorScalarEvaluatorFactory.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/node/ElementNodeConstructorScalarEvaluatorFactory.java
index aa61061..bf9c156 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/node/ElementNodeConstructorScalarEvaluatorFactory.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/node/ElementNodeConstructorScalarEvaluatorFactory.java
@@ -18,10 +18,10 @@ package org.apache.vxquery.runtime.functions.node;
import org.apache.vxquery.runtime.functions.base.AbstractTaggedValueArgumentScalarEvaluatorFactory;
-import edu.uci.ics.hyracks.algebricks.common.exceptions.AlgebricksException;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluator;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
-import edu.uci.ics.hyracks.api.context.IHyracksTaskContext;
+import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluator;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
+import org.apache.hyracks.api.context.IHyracksTaskContext;
public class ElementNodeConstructorScalarEvaluatorFactory extends AbstractTaggedValueArgumentScalarEvaluatorFactory {
private static final long serialVersionUID = 1L;
@@ -35,4 +35,4 @@ public class ElementNodeConstructorScalarEvaluatorFactory extends AbstractTagged
throws AlgebricksException {
return new ElementNodeConstructorScalarEvaluator(ctx, args);
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/node/FnDocAvailableScalarEvaluatorFactory.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/node/FnDocAvailableScalarEvaluatorFactory.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/node/FnDocAvailableScalarEvaluatorFactory.java
index 3f74a4f..8820234 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/node/FnDocAvailableScalarEvaluatorFactory.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/node/FnDocAvailableScalarEvaluatorFactory.java
@@ -31,14 +31,14 @@ import org.apache.vxquery.xmlparser.ITreeNodeIdProvider;
import org.apache.vxquery.xmlparser.TreeNodeIdProvider;
import org.apache.vxquery.xmlparser.XMLParser;
-import edu.uci.ics.hyracks.algebricks.common.exceptions.AlgebricksException;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluator;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
-import edu.uci.ics.hyracks.api.context.IHyracksTaskContext;
-import edu.uci.ics.hyracks.data.std.api.IPointable;
-import edu.uci.ics.hyracks.data.std.primitive.UTF8StringPointable;
-import edu.uci.ics.hyracks.data.std.util.ArrayBackedValueStorage;
-import edu.uci.ics.hyracks.dataflow.common.comm.util.ByteBufferInputStream;
+import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluator;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
+import org.apache.hyracks.api.context.IHyracksTaskContext;
+import org.apache.hyracks.data.std.api.IPointable;
+import org.apache.hyracks.data.std.primitive.UTF8StringPointable;
+import org.apache.hyracks.data.std.util.ArrayBackedValueStorage;
+import org.apache.hyracks.dataflow.common.comm.util.ByteBufferInputStream;
public class FnDocAvailableScalarEvaluatorFactory extends AbstractTaggedValueArgumentScalarEvaluatorFactory {
private static final long serialVersionUID = 1L;
@@ -86,4 +86,4 @@ public class FnDocAvailableScalarEvaluatorFactory extends AbstractTaggedValueArg
}
};
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/node/FnDocScalarEvaluatorFactory.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/node/FnDocScalarEvaluatorFactory.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/node/FnDocScalarEvaluatorFactory.java
index 2d957b6..038a185 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/node/FnDocScalarEvaluatorFactory.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/node/FnDocScalarEvaluatorFactory.java
@@ -31,14 +31,14 @@ import org.apache.vxquery.xmlparser.ITreeNodeIdProvider;
import org.apache.vxquery.xmlparser.TreeNodeIdProvider;
import org.apache.vxquery.xmlparser.XMLParser;
-import edu.uci.ics.hyracks.algebricks.common.exceptions.AlgebricksException;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluator;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
-import edu.uci.ics.hyracks.api.context.IHyracksTaskContext;
-import edu.uci.ics.hyracks.data.std.api.IPointable;
-import edu.uci.ics.hyracks.data.std.primitive.UTF8StringPointable;
-import edu.uci.ics.hyracks.data.std.util.ArrayBackedValueStorage;
-import edu.uci.ics.hyracks.dataflow.common.comm.util.ByteBufferInputStream;
+import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluator;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
+import org.apache.hyracks.api.context.IHyracksTaskContext;
+import org.apache.hyracks.data.std.api.IPointable;
+import org.apache.hyracks.data.std.primitive.UTF8StringPointable;
+import org.apache.hyracks.data.std.util.ArrayBackedValueStorage;
+import org.apache.hyracks.dataflow.common.comm.util.ByteBufferInputStream;
public class FnDocScalarEvaluatorFactory extends AbstractTaggedValueArgumentScalarEvaluatorFactory {
private static final long serialVersionUID = 1L;
@@ -87,4 +87,4 @@ public class FnDocScalarEvaluatorFactory extends AbstractTaggedValueArgumentScal
}
};
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/node/FnNumberScalarEvaluatorFactory.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/node/FnNumberScalarEvaluatorFactory.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/node/FnNumberScalarEvaluatorFactory.java
index 51826b2..80f0c42 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/node/FnNumberScalarEvaluatorFactory.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/node/FnNumberScalarEvaluatorFactory.java
@@ -28,12 +28,12 @@ import org.apache.vxquery.runtime.functions.base.AbstractTaggedValueArgumentScal
import org.apache.vxquery.runtime.functions.base.AbstractTaggedValueArgumentScalarEvaluatorFactory;
import org.apache.vxquery.runtime.functions.cast.CastToDoubleOperation;
-import edu.uci.ics.hyracks.algebricks.common.exceptions.AlgebricksException;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluator;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
-import edu.uci.ics.hyracks.api.context.IHyracksTaskContext;
-import edu.uci.ics.hyracks.data.std.api.IPointable;
-import edu.uci.ics.hyracks.data.std.util.ArrayBackedValueStorage;
+import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluator;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
+import org.apache.hyracks.api.context.IHyracksTaskContext;
+import org.apache.hyracks.data.std.api.IPointable;
+import org.apache.hyracks.data.std.util.ArrayBackedValueStorage;
public class FnNumberScalarEvaluatorFactory extends AbstractTaggedValueArgumentScalarEvaluatorFactory {
private static final long serialVersionUID = 1L;
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/node/IdFromNodeScalarEvaluatorFactory.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/node/IdFromNodeScalarEvaluatorFactory.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/node/IdFromNodeScalarEvaluatorFactory.java
index b3b4d67..64da253 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/node/IdFromNodeScalarEvaluatorFactory.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/node/IdFromNodeScalarEvaluatorFactory.java
@@ -29,12 +29,12 @@ import org.apache.vxquery.runtime.functions.base.AbstractTaggedValueArgumentScal
import org.apache.vxquery.runtime.functions.base.AbstractTaggedValueArgumentScalarEvaluatorFactory;
import org.apache.vxquery.runtime.functions.util.FunctionHelper;
-import edu.uci.ics.hyracks.algebricks.common.exceptions.AlgebricksException;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluator;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
-import edu.uci.ics.hyracks.api.context.IHyracksTaskContext;
-import edu.uci.ics.hyracks.data.std.api.IPointable;
-import edu.uci.ics.hyracks.data.std.util.ArrayBackedValueStorage;
+import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluator;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
+import org.apache.hyracks.api.context.IHyracksTaskContext;
+import org.apache.hyracks.data.std.api.IPointable;
+import org.apache.hyracks.data.std.util.ArrayBackedValueStorage;
public class IdFromNodeScalarEvaluatorFactory extends AbstractTaggedValueArgumentScalarEvaluatorFactory {
private static final long serialVersionUID = 1L;
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/node/LocalIdFromNodeScalarEvaluatorFactory.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/node/LocalIdFromNodeScalarEvaluatorFactory.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/node/LocalIdFromNodeScalarEvaluatorFactory.java
index b8aad52..4042326 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/node/LocalIdFromNodeScalarEvaluatorFactory.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/node/LocalIdFromNodeScalarEvaluatorFactory.java
@@ -28,12 +28,12 @@ import org.apache.vxquery.runtime.functions.base.AbstractTaggedValueArgumentScal
import org.apache.vxquery.runtime.functions.base.AbstractTaggedValueArgumentScalarEvaluatorFactory;
import org.apache.vxquery.runtime.functions.util.FunctionHelper;
-import edu.uci.ics.hyracks.algebricks.common.exceptions.AlgebricksException;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluator;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
-import edu.uci.ics.hyracks.api.context.IHyracksTaskContext;
-import edu.uci.ics.hyracks.data.std.api.IPointable;
-import edu.uci.ics.hyracks.data.std.util.ArrayBackedValueStorage;
+import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluator;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
+import org.apache.hyracks.api.context.IHyracksTaskContext;
+import org.apache.hyracks.data.std.api.IPointable;
+import org.apache.hyracks.data.std.util.ArrayBackedValueStorage;
public class LocalIdFromNodeScalarEvaluatorFactory extends AbstractTaggedValueArgumentScalarEvaluatorFactory {
private static final long serialVersionUID = 1L;
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/node/OpNodeAfterEvaluator.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/node/OpNodeAfterEvaluator.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/node/OpNodeAfterEvaluator.java
index acc2714..0356280 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/node/OpNodeAfterEvaluator.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/node/OpNodeAfterEvaluator.java
@@ -17,7 +17,7 @@
package org.apache.vxquery.runtime.functions.node;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluator;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluator;
public class OpNodeAfterEvaluator extends AbstractNodePositionalCheckEvaluator {
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/node/OpNodeAfterEvaluatorFactory.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/node/OpNodeAfterEvaluatorFactory.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/node/OpNodeAfterEvaluatorFactory.java
index 71ada1c..20ce65a 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/node/OpNodeAfterEvaluatorFactory.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/node/OpNodeAfterEvaluatorFactory.java
@@ -19,10 +19,10 @@ package org.apache.vxquery.runtime.functions.node;
import org.apache.vxquery.runtime.functions.base.AbstractTaggedValueArgumentScalarEvaluatorFactory;
-import edu.uci.ics.hyracks.algebricks.common.exceptions.AlgebricksException;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluator;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
-import edu.uci.ics.hyracks.api.context.IHyracksTaskContext;
+import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluator;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
+import org.apache.hyracks.api.context.IHyracksTaskContext;
public class OpNodeAfterEvaluatorFactory extends AbstractTaggedValueArgumentScalarEvaluatorFactory {
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/node/OpNodeBeforeEvaluator.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/node/OpNodeBeforeEvaluator.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/node/OpNodeBeforeEvaluator.java
index ce9e496..f3a43fb 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/node/OpNodeBeforeEvaluator.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/node/OpNodeBeforeEvaluator.java
@@ -17,7 +17,7 @@
package org.apache.vxquery.runtime.functions.node;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluator;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluator;
public class OpNodeBeforeEvaluator extends AbstractNodePositionalCheckEvaluator {
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/node/OpNodeBeforeEvaluatorFactory.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/node/OpNodeBeforeEvaluatorFactory.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/node/OpNodeBeforeEvaluatorFactory.java
index 5791cb4..0205a50 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/node/OpNodeBeforeEvaluatorFactory.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/node/OpNodeBeforeEvaluatorFactory.java
@@ -19,10 +19,10 @@ package org.apache.vxquery.runtime.functions.node;
import org.apache.vxquery.runtime.functions.base.AbstractTaggedValueArgumentScalarEvaluatorFactory;
-import edu.uci.ics.hyracks.algebricks.common.exceptions.AlgebricksException;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluator;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
-import edu.uci.ics.hyracks.api.context.IHyracksTaskContext;
+import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluator;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
+import org.apache.hyracks.api.context.IHyracksTaskContext;
public class OpNodeBeforeEvaluatorFactory extends AbstractTaggedValueArgumentScalarEvaluatorFactory {
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/node/PINodeConstructorScalarEvaluator.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/node/PINodeConstructorScalarEvaluator.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/node/PINodeConstructorScalarEvaluator.java
index 66ee93c..839b79b 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/node/PINodeConstructorScalarEvaluator.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/node/PINodeConstructorScalarEvaluator.java
@@ -23,10 +23,10 @@ import org.apache.vxquery.datamodel.builders.nodes.DictionaryBuilder;
import org.apache.vxquery.datamodel.builders.nodes.PINodeBuilder;
import org.apache.vxquery.exceptions.SystemException;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluator;
-import edu.uci.ics.hyracks.api.context.IHyracksTaskContext;
-import edu.uci.ics.hyracks.data.std.api.IMutableValueStorage;
-import edu.uci.ics.hyracks.data.std.primitive.VoidPointable;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluator;
+import org.apache.hyracks.api.context.IHyracksTaskContext;
+import org.apache.hyracks.data.std.api.IMutableValueStorage;
+import org.apache.hyracks.data.std.primitive.VoidPointable;
public class PINodeConstructorScalarEvaluator extends AbstractNodeConstructorScalarEvaluator {
private final PINodeBuilder pinb;
@@ -56,4 +56,4 @@ public class PINodeConstructorScalarEvaluator extends AbstractNodeConstructorSca
protected boolean createsDictionary() {
return false;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/node/PINodeConstructorScalarEvaluatorFactory.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/node/PINodeConstructorScalarEvaluatorFactory.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/node/PINodeConstructorScalarEvaluatorFactory.java
index b0bf7ec..c8d9ddd 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/node/PINodeConstructorScalarEvaluatorFactory.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/node/PINodeConstructorScalarEvaluatorFactory.java
@@ -18,10 +18,10 @@ package org.apache.vxquery.runtime.functions.node;
import org.apache.vxquery.runtime.functions.base.AbstractTaggedValueArgumentScalarEvaluatorFactory;
-import edu.uci.ics.hyracks.algebricks.common.exceptions.AlgebricksException;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluator;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
-import edu.uci.ics.hyracks.api.context.IHyracksTaskContext;
+import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluator;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
+import org.apache.hyracks.api.context.IHyracksTaskContext;
public class PINodeConstructorScalarEvaluatorFactory extends AbstractTaggedValueArgumentScalarEvaluatorFactory {
private static final long serialVersionUID = 1L;
@@ -35,4 +35,4 @@ public class PINodeConstructorScalarEvaluatorFactory extends AbstractTaggedValue
throws AlgebricksException {
return new PINodeConstructorScalarEvaluator(ctx, args);
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/node/TextNodeConstructorScalarEvaluator.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/node/TextNodeConstructorScalarEvaluator.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/node/TextNodeConstructorScalarEvaluator.java
index c27684e..7d69a14 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/node/TextNodeConstructorScalarEvaluator.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/node/TextNodeConstructorScalarEvaluator.java
@@ -25,10 +25,10 @@ import org.apache.vxquery.datamodel.values.ValueTag;
import org.apache.vxquery.exceptions.ErrorCode;
import org.apache.vxquery.exceptions.SystemException;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluator;
-import edu.uci.ics.hyracks.api.context.IHyracksTaskContext;
-import edu.uci.ics.hyracks.data.std.api.IMutableValueStorage;
-import edu.uci.ics.hyracks.data.std.primitive.VoidPointable;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluator;
+import org.apache.hyracks.api.context.IHyracksTaskContext;
+import org.apache.hyracks.data.std.api.IMutableValueStorage;
+import org.apache.hyracks.data.std.primitive.VoidPointable;
public class TextNodeConstructorScalarEvaluator extends AbstractNodeConstructorScalarEvaluator {
private final TextNodeBuilder tnb;
@@ -58,4 +58,4 @@ public class TextNodeConstructorScalarEvaluator extends AbstractNodeConstructorS
protected boolean createsDictionary() {
return false;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/node/TextNodeConstructorScalarEvaluatorFactory.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/node/TextNodeConstructorScalarEvaluatorFactory.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/node/TextNodeConstructorScalarEvaluatorFactory.java
index 984a9f4..1cbfb95 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/node/TextNodeConstructorScalarEvaluatorFactory.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/node/TextNodeConstructorScalarEvaluatorFactory.java
@@ -18,10 +18,10 @@ package org.apache.vxquery.runtime.functions.node;
import org.apache.vxquery.runtime.functions.base.AbstractTaggedValueArgumentScalarEvaluatorFactory;
-import edu.uci.ics.hyracks.algebricks.common.exceptions.AlgebricksException;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluator;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
-import edu.uci.ics.hyracks.api.context.IHyracksTaskContext;
+import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluator;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
+import org.apache.hyracks.api.context.IHyracksTaskContext;
public class TextNodeConstructorScalarEvaluatorFactory extends AbstractTaggedValueArgumentScalarEvaluatorFactory {
private static final long serialVersionUID = 1L;
@@ -35,4 +35,4 @@ public class TextNodeConstructorScalarEvaluatorFactory extends AbstractTaggedVal
throws AlgebricksException {
return new TextNodeConstructorScalarEvaluator(ctx, args);
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/node/TreeIdFromNodeScalarEvaluatorFactory.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/node/TreeIdFromNodeScalarEvaluatorFactory.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/node/TreeIdFromNodeScalarEvaluatorFactory.java
index 4b4a1db..e83c5d6 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/node/TreeIdFromNodeScalarEvaluatorFactory.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/node/TreeIdFromNodeScalarEvaluatorFactory.java
@@ -27,12 +27,12 @@ import org.apache.vxquery.exceptions.SystemException;
import org.apache.vxquery.runtime.functions.base.AbstractTaggedValueArgumentScalarEvaluator;
import org.apache.vxquery.runtime.functions.base.AbstractTaggedValueArgumentScalarEvaluatorFactory;
-import edu.uci.ics.hyracks.algebricks.common.exceptions.AlgebricksException;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluator;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
-import edu.uci.ics.hyracks.api.context.IHyracksTaskContext;
-import edu.uci.ics.hyracks.data.std.api.IPointable;
-import edu.uci.ics.hyracks.data.std.util.ArrayBackedValueStorage;
+import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluator;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
+import org.apache.hyracks.api.context.IHyracksTaskContext;
+import org.apache.hyracks.data.std.api.IPointable;
+import org.apache.hyracks.data.std.util.ArrayBackedValueStorage;
public class TreeIdFromNodeScalarEvaluatorFactory extends AbstractTaggedValueArgumentScalarEvaluatorFactory {
private static final long serialVersionUID = 1L;
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/nodeid/SortDistinctNodesAscOrAtomicsScalarEvaluatorFactory.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/nodeid/SortDistinctNodesAscOrAtomicsScalarEvaluatorFactory.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/nodeid/SortDistinctNodesAscOrAtomicsScalarEvaluatorFactory.java
index 02eeaae..09fa3b0 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/nodeid/SortDistinctNodesAscOrAtomicsScalarEvaluatorFactory.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/nodeid/SortDistinctNodesAscOrAtomicsScalarEvaluatorFactory.java
@@ -21,11 +21,11 @@ import org.apache.vxquery.exceptions.SystemException;
import org.apache.vxquery.runtime.functions.base.AbstractTaggedValueArgumentScalarEvaluator;
import org.apache.vxquery.runtime.functions.base.AbstractTaggedValueArgumentScalarEvaluatorFactory;
-import edu.uci.ics.hyracks.algebricks.common.exceptions.AlgebricksException;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluator;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
-import edu.uci.ics.hyracks.api.context.IHyracksTaskContext;
-import edu.uci.ics.hyracks.data.std.api.IPointable;
+import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluator;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
+import org.apache.hyracks.api.context.IHyracksTaskContext;
+import org.apache.hyracks.data.std.api.IPointable;
public class SortDistinctNodesAscOrAtomicsScalarEvaluatorFactory extends
AbstractTaggedValueArgumentScalarEvaluatorFactory {
@@ -45,4 +45,4 @@ public class SortDistinctNodesAscOrAtomicsScalarEvaluatorFactory extends
}
};
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/numeric/AbstractNumericOperation.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/numeric/AbstractNumericOperation.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/numeric/AbstractNumericOperation.java
index 2d44077..b8eea36 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/numeric/AbstractNumericOperation.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/numeric/AbstractNumericOperation.java
@@ -22,9 +22,9 @@ import java.io.IOException;
import org.apache.vxquery.datamodel.accessors.atomic.XSDecimalPointable;
import org.apache.vxquery.exceptions.SystemException;
-import edu.uci.ics.hyracks.data.std.primitive.DoublePointable;
-import edu.uci.ics.hyracks.data.std.primitive.FloatPointable;
-import edu.uci.ics.hyracks.data.std.primitive.LongPointable;
+import org.apache.hyracks.data.std.primitive.DoublePointable;
+import org.apache.hyracks.data.std.primitive.FloatPointable;
+import org.apache.hyracks.data.std.primitive.LongPointable;
public abstract class AbstractNumericOperation {
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/numeric/AbstractNumericScalarEvaluatorFactory.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/numeric/AbstractNumericScalarEvaluatorFactory.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/numeric/AbstractNumericScalarEvaluatorFactory.java
index e8ee449..1a6ccc9 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/numeric/AbstractNumericScalarEvaluatorFactory.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/numeric/AbstractNumericScalarEvaluatorFactory.java
@@ -29,13 +29,13 @@ import org.apache.vxquery.runtime.functions.base.AbstractTaggedValueArgumentScal
import org.apache.vxquery.runtime.functions.util.FunctionHelper;
import org.apache.vxquery.types.BuiltinTypeRegistry;
-import edu.uci.ics.hyracks.algebricks.common.exceptions.AlgebricksException;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluator;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
-import edu.uci.ics.hyracks.api.context.IHyracksTaskContext;
-import edu.uci.ics.hyracks.data.std.api.IPointable;
-import edu.uci.ics.hyracks.data.std.primitive.LongPointable;
-import edu.uci.ics.hyracks.data.std.util.ArrayBackedValueStorage;
+import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluator;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
+import org.apache.hyracks.api.context.IHyracksTaskContext;
+import org.apache.hyracks.data.std.api.IPointable;
+import org.apache.hyracks.data.std.primitive.LongPointable;
+import org.apache.hyracks.data.std.util.ArrayBackedValueStorage;
public abstract class AbstractNumericScalarEvaluatorFactory extends AbstractTaggedValueArgumentScalarEvaluatorFactory {
private static final long serialVersionUID = 1L;
@@ -141,4 +141,4 @@ public abstract class AbstractNumericScalarEvaluatorFactory extends AbstractTagg
}
protected abstract AbstractNumericOperation createNumericOperation();
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/numeric/FnAbsOperation.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/numeric/FnAbsOperation.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/numeric/FnAbsOperation.java
index f8494aa..6102bee 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/numeric/FnAbsOperation.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/numeric/FnAbsOperation.java
@@ -23,9 +23,9 @@ import org.apache.vxquery.datamodel.accessors.atomic.XSDecimalPointable;
import org.apache.vxquery.datamodel.values.ValueTag;
import org.apache.vxquery.exceptions.SystemException;
-import edu.uci.ics.hyracks.data.std.primitive.DoublePointable;
-import edu.uci.ics.hyracks.data.std.primitive.FloatPointable;
-import edu.uci.ics.hyracks.data.std.primitive.LongPointable;
+import org.apache.hyracks.data.std.primitive.DoublePointable;
+import org.apache.hyracks.data.std.primitive.FloatPointable;
+import org.apache.hyracks.data.std.primitive.LongPointable;
public class FnAbsOperation extends AbstractNumericOperation {
@@ -53,4 +53,4 @@ public class FnAbsOperation extends AbstractNumericOperation {
dOut.write(ValueTag.XS_INTEGER_TAG);
dOut.writeLong(Math.abs(longp.getLong()));
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/numeric/FnAbsScalarEvaluatorFactory.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/numeric/FnAbsScalarEvaluatorFactory.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/numeric/FnAbsScalarEvaluatorFactory.java
index db7eeb2..02f9a09 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/numeric/FnAbsScalarEvaluatorFactory.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/numeric/FnAbsScalarEvaluatorFactory.java
@@ -16,7 +16,7 @@
*/
package org.apache.vxquery.runtime.functions.numeric;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
public class FnAbsScalarEvaluatorFactory extends AbstractNumericScalarEvaluatorFactory {
private static final long serialVersionUID = 1L;
@@ -29,4 +29,4 @@ public class FnAbsScalarEvaluatorFactory extends AbstractNumericScalarEvaluatorF
protected AbstractNumericOperation createNumericOperation() {
return new FnAbsOperation();
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/numeric/FnCeilingOperation.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/numeric/FnCeilingOperation.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/numeric/FnCeilingOperation.java
index 5916348..e27e79b 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/numeric/FnCeilingOperation.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/numeric/FnCeilingOperation.java
@@ -23,9 +23,9 @@ import org.apache.vxquery.datamodel.accessors.atomic.XSDecimalPointable;
import org.apache.vxquery.datamodel.values.ValueTag;
import org.apache.vxquery.exceptions.SystemException;
-import edu.uci.ics.hyracks.data.std.primitive.DoublePointable;
-import edu.uci.ics.hyracks.data.std.primitive.FloatPointable;
-import edu.uci.ics.hyracks.data.std.primitive.LongPointable;
+import org.apache.hyracks.data.std.primitive.DoublePointable;
+import org.apache.hyracks.data.std.primitive.FloatPointable;
+import org.apache.hyracks.data.std.primitive.LongPointable;
public class FnCeilingOperation extends AbstractNumericOperation {
@@ -57,4 +57,4 @@ public class FnCeilingOperation extends AbstractNumericOperation {
dOut.write(ValueTag.XS_INTEGER_TAG);
dOut.writeLong(longp.getLong());
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/numeric/FnCeilingScalarEvaluatorFactory.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/numeric/FnCeilingScalarEvaluatorFactory.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/numeric/FnCeilingScalarEvaluatorFactory.java
index 0f31013..a1168b0 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/numeric/FnCeilingScalarEvaluatorFactory.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/numeric/FnCeilingScalarEvaluatorFactory.java
@@ -16,7 +16,7 @@
*/
package org.apache.vxquery.runtime.functions.numeric;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
public class FnCeilingScalarEvaluatorFactory extends AbstractNumericScalarEvaluatorFactory {
private static final long serialVersionUID = 1L;
@@ -29,4 +29,4 @@ public class FnCeilingScalarEvaluatorFactory extends AbstractNumericScalarEvalua
protected AbstractNumericOperation createNumericOperation() {
return new FnCeilingOperation();
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/numeric/FnFloorOperation.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/numeric/FnFloorOperation.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/numeric/FnFloorOperation.java
index 6bdeeec..55fd732 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/numeric/FnFloorOperation.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/numeric/FnFloorOperation.java
@@ -23,9 +23,9 @@ import org.apache.vxquery.datamodel.accessors.atomic.XSDecimalPointable;
import org.apache.vxquery.datamodel.values.ValueTag;
import org.apache.vxquery.exceptions.SystemException;
-import edu.uci.ics.hyracks.data.std.primitive.DoublePointable;
-import edu.uci.ics.hyracks.data.std.primitive.FloatPointable;
-import edu.uci.ics.hyracks.data.std.primitive.LongPointable;
+import org.apache.hyracks.data.std.primitive.DoublePointable;
+import org.apache.hyracks.data.std.primitive.FloatPointable;
+import org.apache.hyracks.data.std.primitive.LongPointable;
public class FnFloorOperation extends AbstractNumericOperation {
@@ -57,4 +57,4 @@ public class FnFloorOperation extends AbstractNumericOperation {
dOut.write(ValueTag.XS_INTEGER_TAG);
dOut.writeLong(longp.getLong());
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/numeric/FnFloorScalarEvaluatorFactory.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/numeric/FnFloorScalarEvaluatorFactory.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/numeric/FnFloorScalarEvaluatorFactory.java
index 4424464..f8a8c87 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/numeric/FnFloorScalarEvaluatorFactory.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/numeric/FnFloorScalarEvaluatorFactory.java
@@ -16,7 +16,7 @@
*/
package org.apache.vxquery.runtime.functions.numeric;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
public class FnFloorScalarEvaluatorFactory extends AbstractNumericScalarEvaluatorFactory {
private static final long serialVersionUID = 1L;
@@ -29,4 +29,4 @@ public class FnFloorScalarEvaluatorFactory extends AbstractNumericScalarEvaluato
protected AbstractNumericOperation createNumericOperation() {
return new FnFloorOperation();
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/numeric/FnRoundHalfToEvenScalarEvaluatorFactory.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/numeric/FnRoundHalfToEvenScalarEvaluatorFactory.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/numeric/FnRoundHalfToEvenScalarEvaluatorFactory.java
index fbb07ab..b811a10 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/numeric/FnRoundHalfToEvenScalarEvaluatorFactory.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/numeric/FnRoundHalfToEvenScalarEvaluatorFactory.java
@@ -30,18 +30,18 @@ import org.apache.vxquery.runtime.functions.base.AbstractTaggedValueArgumentScal
import org.apache.vxquery.runtime.functions.cast.CastToDecimalOperation;
import org.apache.vxquery.types.BuiltinTypeRegistry;
-import edu.uci.ics.hyracks.algebricks.common.exceptions.AlgebricksException;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluator;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
-import edu.uci.ics.hyracks.api.context.IHyracksTaskContext;
-import edu.uci.ics.hyracks.data.std.api.IPointable;
-import edu.uci.ics.hyracks.data.std.primitive.BytePointable;
-import edu.uci.ics.hyracks.data.std.primitive.DoublePointable;
-import edu.uci.ics.hyracks.data.std.primitive.FloatPointable;
-import edu.uci.ics.hyracks.data.std.primitive.IntegerPointable;
-import edu.uci.ics.hyracks.data.std.primitive.LongPointable;
-import edu.uci.ics.hyracks.data.std.primitive.ShortPointable;
-import edu.uci.ics.hyracks.data.std.util.ArrayBackedValueStorage;
+import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluator;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
+import org.apache.hyracks.api.context.IHyracksTaskContext;
+import org.apache.hyracks.data.std.api.IPointable;
+import org.apache.hyracks.data.std.primitive.BytePointable;
+import org.apache.hyracks.data.std.primitive.DoublePointable;
+import org.apache.hyracks.data.std.primitive.FloatPointable;
+import org.apache.hyracks.data.std.primitive.IntegerPointable;
+import org.apache.hyracks.data.std.primitive.LongPointable;
+import org.apache.hyracks.data.std.primitive.ShortPointable;
+import org.apache.hyracks.data.std.util.ArrayBackedValueStorage;
public class FnRoundHalfToEvenScalarEvaluatorFactory extends AbstractTaggedValueArgumentScalarEvaluatorFactory {
private static final long serialVersionUID = 1L;
@@ -276,4 +276,4 @@ public class FnRoundHalfToEvenScalarEvaluatorFactory extends AbstractTaggedValue
};
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/numeric/FnRoundOperation.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/numeric/FnRoundOperation.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/numeric/FnRoundOperation.java
index 28ff1c4..7b2572d 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/numeric/FnRoundOperation.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/numeric/FnRoundOperation.java
@@ -23,9 +23,9 @@ import org.apache.vxquery.datamodel.accessors.atomic.XSDecimalPointable;
import org.apache.vxquery.datamodel.values.ValueTag;
import org.apache.vxquery.exceptions.SystemException;
-import edu.uci.ics.hyracks.data.std.primitive.DoublePointable;
-import edu.uci.ics.hyracks.data.std.primitive.FloatPointable;
-import edu.uci.ics.hyracks.data.std.primitive.LongPointable;
+import org.apache.hyracks.data.std.primitive.DoublePointable;
+import org.apache.hyracks.data.std.primitive.FloatPointable;
+import org.apache.hyracks.data.std.primitive.LongPointable;
public class FnRoundOperation extends AbstractNumericOperation {
@@ -65,4 +65,4 @@ public class FnRoundOperation extends AbstractNumericOperation {
dOut.write(ValueTag.XS_INTEGER_TAG);
dOut.writeLong(longp.getLong());
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/numeric/FnRoundScalarEvaluatorFactory.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/numeric/FnRoundScalarEvaluatorFactory.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/numeric/FnRoundScalarEvaluatorFactory.java
index 3457ff4..68fa3bd 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/numeric/FnRoundScalarEvaluatorFactory.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/numeric/FnRoundScalarEvaluatorFactory.java
@@ -16,7 +16,7 @@
*/
package org.apache.vxquery.runtime.functions.numeric;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
public class FnRoundScalarEvaluatorFactory extends AbstractNumericScalarEvaluatorFactory {
private static final long serialVersionUID = 1L;
@@ -29,4 +29,4 @@ public class FnRoundScalarEvaluatorFactory extends AbstractNumericScalarEvaluato
protected AbstractNumericOperation createNumericOperation() {
return new FnRoundOperation();
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/qname/FnLocalNameFromQNameScalarEvaluatorFactory.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/qname/FnLocalNameFromQNameScalarEvaluatorFactory.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/qname/FnLocalNameFromQNameScalarEvaluatorFactory.java
index 3f1065f..560bc09 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/qname/FnLocalNameFromQNameScalarEvaluatorFactory.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/qname/FnLocalNameFromQNameScalarEvaluatorFactory.java
@@ -28,13 +28,13 @@ import org.apache.vxquery.exceptions.SystemException;
import org.apache.vxquery.runtime.functions.base.AbstractTaggedValueArgumentScalarEvaluator;
import org.apache.vxquery.runtime.functions.base.AbstractTaggedValueArgumentScalarEvaluatorFactory;
-import edu.uci.ics.hyracks.algebricks.common.exceptions.AlgebricksException;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluator;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
-import edu.uci.ics.hyracks.api.context.IHyracksTaskContext;
-import edu.uci.ics.hyracks.data.std.api.IPointable;
-import edu.uci.ics.hyracks.data.std.primitive.UTF8StringPointable;
-import edu.uci.ics.hyracks.data.std.util.ArrayBackedValueStorage;
+import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluator;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
+import org.apache.hyracks.api.context.IHyracksTaskContext;
+import org.apache.hyracks.data.std.api.IPointable;
+import org.apache.hyracks.data.std.primitive.UTF8StringPointable;
+import org.apache.hyracks.data.std.util.ArrayBackedValueStorage;
public class FnLocalNameFromQNameScalarEvaluatorFactory extends AbstractTaggedValueArgumentScalarEvaluatorFactory {
private static final long serialVersionUID = 1L;
@@ -83,4 +83,4 @@ public class FnLocalNameFromQNameScalarEvaluatorFactory extends AbstractTaggedVa
}
};
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/qname/FnNamespaceUriFromQNameScalarEvaluatorFactory.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/qname/FnNamespaceUriFromQNameScalarEvaluatorFactory.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/qname/FnNamespaceUriFromQNameScalarEvaluatorFactory.java
index 2131dd1..7a8851b 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/qname/FnNamespaceUriFromQNameScalarEvaluatorFactory.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/qname/FnNamespaceUriFromQNameScalarEvaluatorFactory.java
@@ -28,13 +28,13 @@ import org.apache.vxquery.exceptions.SystemException;
import org.apache.vxquery.runtime.functions.base.AbstractTaggedValueArgumentScalarEvaluator;
import org.apache.vxquery.runtime.functions.base.AbstractTaggedValueArgumentScalarEvaluatorFactory;
-import edu.uci.ics.hyracks.algebricks.common.exceptions.AlgebricksException;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluator;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
-import edu.uci.ics.hyracks.api.context.IHyracksTaskContext;
-import edu.uci.ics.hyracks.data.std.api.IPointable;
-import edu.uci.ics.hyracks.data.std.primitive.UTF8StringPointable;
-import edu.uci.ics.hyracks.data.std.util.ArrayBackedValueStorage;
+import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluator;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
+import org.apache.hyracks.api.context.IHyracksTaskContext;
+import org.apache.hyracks.data.std.api.IPointable;
+import org.apache.hyracks.data.std.primitive.UTF8StringPointable;
+import org.apache.hyracks.data.std.util.ArrayBackedValueStorage;
public class FnNamespaceUriFromQNameScalarEvaluatorFactory extends AbstractTaggedValueArgumentScalarEvaluatorFactory {
private static final long serialVersionUID = 1L;
@@ -87,4 +87,4 @@ public class FnNamespaceUriFromQNameScalarEvaluatorFactory extends AbstractTagge
}
};
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/qname/FnPrefixFromQNameScalarEvaluatorFactory.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/qname/FnPrefixFromQNameScalarEvaluatorFactory.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/qname/FnPrefixFromQNameScalarEvaluatorFactory.java
index 9fd1117..1a2820b 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/qname/FnPrefixFromQNameScalarEvaluatorFactory.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/qname/FnPrefixFromQNameScalarEvaluatorFactory.java
@@ -28,13 +28,13 @@ import org.apache.vxquery.exceptions.SystemException;
import org.apache.vxquery.runtime.functions.base.AbstractTaggedValueArgumentScalarEvaluator;
import org.apache.vxquery.runtime.functions.base.AbstractTaggedValueArgumentScalarEvaluatorFactory;
-import edu.uci.ics.hyracks.algebricks.common.exceptions.AlgebricksException;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluator;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
-import edu.uci.ics.hyracks.api.context.IHyracksTaskContext;
-import edu.uci.ics.hyracks.data.std.api.IPointable;
-import edu.uci.ics.hyracks.data.std.primitive.UTF8StringPointable;
-import edu.uci.ics.hyracks.data.std.util.ArrayBackedValueStorage;
+import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluator;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
+import org.apache.hyracks.api.context.IHyracksTaskContext;
+import org.apache.hyracks.data.std.api.IPointable;
+import org.apache.hyracks.data.std.primitive.UTF8StringPointable;
+import org.apache.hyracks.data.std.util.ArrayBackedValueStorage;
public class FnPrefixFromQNameScalarEvaluatorFactory extends AbstractTaggedValueArgumentScalarEvaluatorFactory {
private static final long serialVersionUID = 1L;
@@ -88,4 +88,4 @@ public class FnPrefixFromQNameScalarEvaluatorFactory extends AbstractTaggedValue
}
};
}
-}
\ No newline at end of file
+}
[33/50] [abbrv] vxquery git commit: return to old ordering of xqts
results
Posted by sj...@apache.org.
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4b7e0c76/vxquery-xtest/results/xqts.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/results/xqts.txt b/vxquery-xtest/results/xqts.txt
index 9e38137..0431f9a 100644
--- a/vxquery-xtest/results/xqts.txt
+++ b/vxquery-xtest/results/xqts.txt
@@ -30,14 +30,6 @@ Basics/EQNames//eqname-902, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
Basics/EQNames//eqname-903, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
Basics/StaticContext//static-context-1, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
Basics/Types/SequenceTypeSyntax//sequence-type-1, EXPECTED_RESULT_GOT_SAME_RESULT
-Basics/Types/SequenceTypeSyntax//sequence-type-2, EXPECTED_RESULT_GOT_SAME_RESULT
-Basics/Types/SequenceTypeSyntax//sequence-type-3, EXPECTED_RESULT_GOT_SAME_RESULT
-Basics/Types/SequenceTypeSyntax//sequence-type-4, EXPECTED_RESULT_GOT_SAME_RESULT
-Basics/Types/SequenceTypeSyntax//sequence-type-5, EXPECTED_RESULT_GOT_SAME_RESULT
-Basics/Types/SequenceTypeSyntax//sequence-type-6, EXPECTED_RESULT_GOT_SAME_RESULT
-Basics/Types/SequenceTypeSyntax//sequence-type-7, EXPECTED_RESULT_GOT_SAME_RESULT
-Basics/Types/SequenceTypeSyntax//sequence-type-8, EXPECTED_RESULT_GOT_SAME_RESULT
-Basics/Types/SequenceTypeSyntax//sequence-type-9, EXPECTED_RESULT_GOT_SAME_RESULT
Basics/Types/SequenceTypeSyntax//sequence-type-10, EXPECTED_RESULT_GOT_SAME_RESULT
Basics/Types/SequenceTypeSyntax//sequence-type-11, EXPECTED_RESULT_GOT_SAME_RESULT
Basics/Types/SequenceTypeSyntax//sequence-type-12, EXPECTED_RESULT_GOT_SAME_RESULT
@@ -48,8 +40,16 @@ Basics/Types/SequenceTypeSyntax//sequence-type-16, EXPECTED_RESULT_GOT_SAME_RESU
Basics/Types/SequenceTypeSyntax//sequence-type-17, EXPECTED_RESULT_GOT_SAME_RESULT
Basics/Types/SequenceTypeSyntax//sequence-type-18, EXPECTED_RESULT_GOT_SAME_RESULT
Basics/Types/SequenceTypeSyntax//sequence-type-19, EXPECTED_RESULT_GOT_SAME_RESULT
+Basics/Types/SequenceTypeSyntax//sequence-type-2, EXPECTED_RESULT_GOT_SAME_RESULT
Basics/Types/SequenceTypeSyntax//sequence-type-20, EXPECTED_RESULT_GOT_SAME_RESULT
Basics/Types/SequenceTypeSyntax//sequence-type-21, EXPECTED_RESULT_GOT_SAME_RESULT
+Basics/Types/SequenceTypeSyntax//sequence-type-3, EXPECTED_RESULT_GOT_SAME_RESULT
+Basics/Types/SequenceTypeSyntax//sequence-type-4, EXPECTED_RESULT_GOT_SAME_RESULT
+Basics/Types/SequenceTypeSyntax//sequence-type-5, EXPECTED_RESULT_GOT_SAME_RESULT
+Basics/Types/SequenceTypeSyntax//sequence-type-6, EXPECTED_RESULT_GOT_SAME_RESULT
+Basics/Types/SequenceTypeSyntax//sequence-type-7, EXPECTED_RESULT_GOT_SAME_RESULT
+Basics/Types/SequenceTypeSyntax//sequence-type-8, EXPECTED_RESULT_GOT_SAME_RESULT
+Basics/Types/SequenceTypeSyntax//sequence-type-9, EXPECTED_RESULT_GOT_SAME_RESULT
Catalog//Catalog001, EXPECTED_RESULT_GOT_ERROR
Catalog//Catalog002, EXPECTED_RESULT_GOT_FAILURE
Catalog//Catalog003, EXPECTED_RESULT_GOT_FAILURE
@@ -61,14 +61,6 @@ CondExpr//K2-CondExpr-5, EXPECTED_ERROR_GOT_SAME_ERROR
CondExpr//K2-CondExpr-6, EXPECTED_ERROR_GOT_SAME_ERROR
CondExpr//K2-CondExpr-7, EXPECTED_RESULT_GOT_SAME_RESULT
Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-1, EXPECTED_ERROR_GOT_SAME_ERROR
-Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-2, EXPECTED_ERROR_GOT_SAME_ERROR
-Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-3, EXPECTED_ERROR_GOT_SAME_ERROR
-Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-4, EXPECTED_ERROR_GOT_SAME_ERROR
-Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-5, EXPECTED_ERROR_GOT_SAME_ERROR
-Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-6, EXPECTED_ERROR_GOT_SAME_ERROR
-Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-7, EXPECTED_ERROR_GOT_SAME_ERROR
-Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-8, EXPECTED_ERROR_GOT_SAME_ERROR
-Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-9, EXPECTED_ERROR_GOT_SAME_ERROR
Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-10, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-11, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-12, EXPECTED_ERROR_GOT_SAME_ERROR
@@ -79,6 +71,7 @@ Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-16, EXPECTED_ERROR_GOT_DI
Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-17, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-18, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-19, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
+Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-2, EXPECTED_ERROR_GOT_SAME_ERROR
Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-20, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-21, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-22, EXPECTED_ERROR_GOT_FAILURE
@@ -89,6 +82,7 @@ Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-26, EXPECTED_RESULT_GOT_E
Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-27, EXPECTED_RESULT_GOT_ERROR
Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-28, EXPECTED_ERROR_GOT_FAILURE
Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-29, EXPECTED_ERROR_GOT_FAILURE
+Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-3, EXPECTED_ERROR_GOT_SAME_ERROR
Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-30, EXPECTED_RESULT_GOT_FAILURE
Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-31, EXPECTED_RESULT_GOT_ERROR
Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-32, EXPECTED_RESULT_GOT_ERROR
@@ -99,6 +93,7 @@ Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-36, EXPECTED_RESULT_GOT_D
Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-37, EXPECTED_ERROR_GOT_SAME_ERROR
Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-38, EXPECTED_ERROR_GOT_RESULT
Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-39, EXPECTED_ERROR_GOT_SAME_ERROR
+Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-4, EXPECTED_ERROR_GOT_SAME_ERROR
Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-40, EXPECTED_ERROR_GOT_RESULT
Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-41, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-42, EXPECTED_ERROR_GOT_RESULT
@@ -109,6 +104,7 @@ Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-46, EXPECTED_ERROR_GOT_RE
Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-47, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-48, EXPECTED_ERROR_GOT_RESULT
Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-49, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
+Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-5, EXPECTED_ERROR_GOT_SAME_ERROR
Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-50, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-51, EXPECTED_RESULT_GOT_ERROR
Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-52, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
@@ -119,8 +115,12 @@ Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-56, EXPECTED_RESULT_GOT_E
Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-57, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-58, EXPECTED_RESULT_GOT_ERROR
Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-59, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
+Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-6, EXPECTED_ERROR_GOT_SAME_ERROR
Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-60, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-61, EXPECTED_ERROR_GOT_SAME_ERROR
+Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-7, EXPECTED_ERROR_GOT_SAME_ERROR
+Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-8, EXPECTED_ERROR_GOT_SAME_ERROR
+Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-9, EXPECTED_ERROR_GOT_SAME_ERROR
Construct/ComputeCon/ComputeConAttr//comp-attr-bad-name-1, EXPECTED_ERROR_GOT_RESULT
Construct/ComputeCon/ComputeConAttr//comp-attr-bad-name-2, EXPECTED_ERROR_GOT_RESULT
Construct/ComputeCon/ComputeConAttr//comp-attr-bad-name-3, EXPECTED_ERROR_GOT_RESULT
@@ -134,6 +134,12 @@ Construct/ComputeCon/ComputeConComment//K2-ComputeConComment-3, EXPECTED_RESULT_
Construct/ComputeCon/ComputeConComment//K2-ComputeConComment-4, EXPECTED_ERROR_GOT_SAME_ERROR
Construct/ComputeCon/ComputeConComment//K2-ComputeConComment-5, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Construct/ComputeCon/ComputeConElem//K2-ComputeConElem-1, EXPECTED_ERROR_GOT_SAME_ERROR
+Construct/ComputeCon/ComputeConElem//K2-ComputeConElem-10, EXPECTED_RESULT_GOT_ERROR
+Construct/ComputeCon/ComputeConElem//K2-ComputeConElem-11, EXPECTED_RESULT_GOT_ERROR
+Construct/ComputeCon/ComputeConElem//K2-ComputeConElem-12, EXPECTED_RESULT_GOT_ERROR
+Construct/ComputeCon/ComputeConElem//K2-ComputeConElem-13, EXPECTED_RESULT_GOT_SAME_RESULT
+Construct/ComputeCon/ComputeConElem//K2-ComputeConElem-14, EXPECTED_RESULT_GOT_ERROR
+Construct/ComputeCon/ComputeConElem//K2-ComputeConElem-15, EXPECTED_RESULT_GOT_FAILURE
Construct/ComputeCon/ComputeConElem//K2-ComputeConElem-2, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Construct/ComputeCon/ComputeConElem//K2-ComputeConElem-3, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Construct/ComputeCon/ComputeConElem//K2-ComputeConElem-4, EXPECTED_ERROR_GOT_RESULT
@@ -142,12 +148,6 @@ Construct/ComputeCon/ComputeConElem//K2-ComputeConElem-6, EXPECTED_RESULT_GOT_SA
Construct/ComputeCon/ComputeConElem//K2-ComputeConElem-7, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Construct/ComputeCon/ComputeConElem//K2-ComputeConElem-8, EXPECTED_RESULT_GOT_ERROR
Construct/ComputeCon/ComputeConElem//K2-ComputeConElem-9, EXPECTED_RESULT_GOT_ERROR
-Construct/ComputeCon/ComputeConElem//K2-ComputeConElem-10, EXPECTED_RESULT_GOT_ERROR
-Construct/ComputeCon/ComputeConElem//K2-ComputeConElem-11, EXPECTED_RESULT_GOT_ERROR
-Construct/ComputeCon/ComputeConElem//K2-ComputeConElem-12, EXPECTED_RESULT_GOT_ERROR
-Construct/ComputeCon/ComputeConElem//K2-ComputeConElem-13, EXPECTED_RESULT_GOT_SAME_RESULT
-Construct/ComputeCon/ComputeConElem//K2-ComputeConElem-14, EXPECTED_RESULT_GOT_ERROR
-Construct/ComputeCon/ComputeConElem//K2-ComputeConElem-15, EXPECTED_RESULT_GOT_FAILURE
Construct/ComputeCon/ComputeConElem//comp-elem-bad-name-1, EXPECTED_ERROR_GOT_RESULT
Construct/ComputeCon/ComputeConElem//comp-elem-bad-name-2, EXPECTED_ERROR_GOT_RESULT
Construct/ComputeCon/ComputeConElem//comp-elem-bad-name-3, EXPECTED_ERROR_GOT_RESULT
@@ -155,6 +155,8 @@ Construct/ComputeCon/ComputeConElem//comp-elem-bad-name-4, EXPECTED_ERROR_GOT_RE
Construct/ComputeCon/ComputeConElem//comp-elem-bad-name-5, EXPECTED_ERROR_GOT_RESULT
Construct/ComputeCon/ComputeConElem//comp-elem-bad-name-6, EXPECTED_ERROR_GOT_RESULT
Construct/ComputeCon/ComputeConPI//K2-ComputeConPI-1, EXPECTED_ERROR_GOT_SAME_ERROR
+Construct/ComputeCon/ComputeConPI//K2-ComputeConPI-10, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+Construct/ComputeCon/ComputeConPI//K2-ComputeConPI-11, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Construct/ComputeCon/ComputeConPI//K2-ComputeConPI-2, EXPECTED_ERROR_GOT_RESULT
Construct/ComputeCon/ComputeConPI//K2-ComputeConPI-3, EXPECTED_ERROR_GOT_RESULT
Construct/ComputeCon/ComputeConPI//K2-ComputeConPI-4, EXPECTED_RESULT_GOT_ERROR
@@ -163,17 +165,7 @@ Construct/ComputeCon/ComputeConPI//K2-ComputeConPI-6, EXPECTED_ERROR_GOT_RESULT
Construct/ComputeCon/ComputeConPI//K2-ComputeConPI-7, EXPECTED_ERROR_GOT_RESULT
Construct/ComputeCon/ComputeConPI//K2-ComputeConPI-8, EXPECTED_RESULT_GOT_SAME_RESULT
Construct/ComputeCon/ComputeConPI//K2-ComputeConPI-9, EXPECTED_RESULT_GOT_SAME_RESULT
-Construct/ComputeCon/ComputeConPI//K2-ComputeConPI-10, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Construct/ComputeCon/ComputeConPI//K2-ComputeConPI-11, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Construct/ComputeCon/ConDocNode//K2-ConDocNode-1, EXPECTED_ERROR_GOT_SAME_ERROR
-Construct/ComputeCon/ConDocNode//K2-ConDocNode-2, EXPECTED_ERROR_GOT_SAME_ERROR
-Construct/ComputeCon/ConDocNode//K2-ConDocNode-3, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
-Construct/ComputeCon/ConDocNode//K2-ConDocNode-4, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
-Construct/ComputeCon/ConDocNode//K2-ConDocNode-5, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
-Construct/ComputeCon/ConDocNode//K2-ConDocNode-6, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
-Construct/ComputeCon/ConDocNode//K2-ConDocNode-7, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
-Construct/ComputeCon/ConDocNode//K2-ConDocNode-8, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
-Construct/ComputeCon/ConDocNode//K2-ConDocNode-9, EXPECTED_RESULT_GOT_ERROR
Construct/ComputeCon/ConDocNode//K2-ConDocNode-10, EXPECTED_RESULT_GOT_ERROR
Construct/ComputeCon/ConDocNode//K2-ConDocNode-11, EXPECTED_RESULT_GOT_ERROR
Construct/ComputeCon/ConDocNode//K2-ConDocNode-12, EXPECTED_RESULT_GOT_ERROR
@@ -184,6 +176,7 @@ Construct/ComputeCon/ConDocNode//K2-ConDocNode-16, EXPECTED_RESULT_GOT_ERROR
Construct/ComputeCon/ConDocNode//K2-ConDocNode-17, EXPECTED_RESULT_GOT_ERROR
Construct/ComputeCon/ConDocNode//K2-ConDocNode-18, EXPECTED_RESULT_GOT_ERROR
Construct/ComputeCon/ConDocNode//K2-ConDocNode-19, EXPECTED_RESULT_GOT_ERROR
+Construct/ComputeCon/ConDocNode//K2-ConDocNode-2, EXPECTED_ERROR_GOT_SAME_ERROR
Construct/ComputeCon/ConDocNode//K2-ConDocNode-20, EXPECTED_RESULT_GOT_ERROR
Construct/ComputeCon/ConDocNode//K2-ConDocNode-21, EXPECTED_RESULT_GOT_ERROR
Construct/ComputeCon/ConDocNode//K2-ConDocNode-22, EXPECTED_RESULT_GOT_ERROR
@@ -194,10 +187,23 @@ Construct/ComputeCon/ConDocNode//K2-ConDocNode-26, EXPECTED_ERROR_GOT_DIFFERENT_
Construct/ComputeCon/ConDocNode//K2-ConDocNode-27, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
Construct/ComputeCon/ConDocNode//K2-ConDocNode-28, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
Construct/ComputeCon/ConDocNode//K2-ConDocNode-29, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
+Construct/ComputeCon/ConDocNode//K2-ConDocNode-3, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
Construct/ComputeCon/ConDocNode//K2-ConDocNode-30, EXPECTED_RESULT_GOT_ERROR
Construct/ComputeCon/ConDocNode//K2-ConDocNode-31, EXPECTED_RESULT_GOT_ERROR
Construct/ComputeCon/ConDocNode//K2-ConDocNode-32, EXPECTED_RESULT_GOT_ERROR
+Construct/ComputeCon/ConDocNode//K2-ConDocNode-4, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
+Construct/ComputeCon/ConDocNode//K2-ConDocNode-5, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
+Construct/ComputeCon/ConDocNode//K2-ConDocNode-6, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
+Construct/ComputeCon/ConDocNode//K2-ConDocNode-7, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
+Construct/ComputeCon/ConDocNode//K2-ConDocNode-8, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
+Construct/ComputeCon/ConDocNode//K2-ConDocNode-9, EXPECTED_RESULT_GOT_ERROR
Construct/ComputeCon/ConText//K2-ConText-1, EXPECTED_ERROR_GOT_SAME_ERROR
+Construct/ComputeCon/ConText//K2-ConText-10, EXPECTED_RESULT_GOT_SAME_RESULT
+Construct/ComputeCon/ConText//K2-ConText-11, EXPECTED_ERROR_GOT_SAME_ERROR
+Construct/ComputeCon/ConText//K2-ConText-12, EXPECTED_ERROR_GOT_SAME_ERROR
+Construct/ComputeCon/ConText//K2-ConText-13, EXPECTED_ERROR_GOT_SAME_ERROR
+Construct/ComputeCon/ConText//K2-ConText-14, EXPECTED_RESULT_GOT_SAME_RESULT
+Construct/ComputeCon/ConText//K2-ConText-15, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Construct/ComputeCon/ConText//K2-ConText-2, EXPECTED_ERROR_GOT_SAME_ERROR
Construct/ComputeCon/ConText//K2-ConText-3, EXPECTED_RESULT_GOT_SAME_RESULT
Construct/ComputeCon/ConText//K2-ConText-4, EXPECTED_RESULT_GOT_ERROR
@@ -206,24 +212,64 @@ Construct/ComputeCon/ConText//K2-ConText-6, EXPECTED_RESULT_GOT_SAME_RESULT
Construct/ComputeCon/ConText//K2-ConText-7, EXPECTED_RESULT_GOT_SAME_RESULT
Construct/ComputeCon/ConText//K2-ConText-8, EXPECTED_RESULT_GOT_SAME_RESULT
Construct/ComputeCon/ConText//K2-ConText-9, EXPECTED_RESULT_GOT_SAME_RESULT
-Construct/ComputeCon/ConText//K2-ConText-10, EXPECTED_RESULT_GOT_SAME_RESULT
-Construct/ComputeCon/ConText//K2-ConText-11, EXPECTED_ERROR_GOT_SAME_ERROR
-Construct/ComputeCon/ConText//K2-ConText-12, EXPECTED_ERROR_GOT_SAME_ERROR
-Construct/ComputeCon/ConText//K2-ConText-13, EXPECTED_ERROR_GOT_SAME_ERROR
-Construct/ComputeCon/ConText//K2-ConText-14, EXPECTED_RESULT_GOT_SAME_RESULT
-Construct/ComputeCon/ConText//K2-ConText-15, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Construct/ConInScopeNamespace//K2-ConInScopeNamespace-1, EXPECTED_RESULT_GOT_ERROR
+Construct/DirectConElem//K2-DirectConElem-1, EXPECTED_RESULT_GOT_SAME_RESULT
+Construct/DirectConElem//K2-DirectConElem-10, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
+Construct/DirectConElem//K2-DirectConElem-11, EXPECTED_ERROR_GOT_SAME_ERROR
+Construct/DirectConElem//K2-DirectConElem-12, EXPECTED_ERROR_GOT_SAME_ERROR
+Construct/DirectConElem//K2-DirectConElem-13, EXPECTED_ERROR_GOT_SAME_ERROR
+Construct/DirectConElem//K2-DirectConElem-14, EXPECTED_ERROR_GOT_SAME_ERROR
+Construct/DirectConElem//K2-DirectConElem-15, EXPECTED_ERROR_GOT_SAME_ERROR
+Construct/DirectConElem//K2-DirectConElem-16, EXPECTED_ERROR_GOT_SAME_ERROR
+Construct/DirectConElem//K2-DirectConElem-17, EXPECTED_ERROR_GOT_SAME_ERROR
+Construct/DirectConElem//K2-DirectConElem-18, EXPECTED_ERROR_GOT_SAME_ERROR
+Construct/DirectConElem//K2-DirectConElem-19, EXPECTED_ERROR_GOT_SAME_ERROR
+Construct/DirectConElem//K2-DirectConElem-2, EXPECTED_RESULT_GOT_SAME_RESULT
+Construct/DirectConElem//K2-DirectConElem-20, EXPECTED_ERROR_GOT_SAME_ERROR
+Construct/DirectConElem//K2-DirectConElem-21, EXPECTED_ERROR_GOT_SAME_ERROR
+Construct/DirectConElem//K2-DirectConElem-22, EXPECTED_ERROR_GOT_SAME_ERROR
+Construct/DirectConElem//K2-DirectConElem-23, EXPECTED_ERROR_GOT_SAME_ERROR
+Construct/DirectConElem//K2-DirectConElem-24, EXPECTED_ERROR_GOT_SAME_ERROR
+Construct/DirectConElem//K2-DirectConElem-25, EXPECTED_ERROR_GOT_SAME_ERROR
+Construct/DirectConElem//K2-DirectConElem-26, EXPECTED_ERROR_GOT_SAME_ERROR
+Construct/DirectConElem//K2-DirectConElem-27, EXPECTED_ERROR_GOT_SAME_ERROR
+Construct/DirectConElem//K2-DirectConElem-28, EXPECTED_RESULT_GOT_SAME_RESULT
+Construct/DirectConElem//K2-DirectConElem-29, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+Construct/DirectConElem//K2-DirectConElem-3, EXPECTED_ERROR_GOT_SAME_ERROR
+Construct/DirectConElem//K2-DirectConElem-30, EXPECTED_RESULT_GOT_SAME_RESULT
+Construct/DirectConElem//K2-DirectConElem-31, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+Construct/DirectConElem//K2-DirectConElem-32, EXPECTED_RESULT_GOT_SAME_RESULT
+Construct/DirectConElem//K2-DirectConElem-33, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+Construct/DirectConElem//K2-DirectConElem-34, EXPECTED_RESULT_GOT_ERROR
+Construct/DirectConElem//K2-DirectConElem-35, EXPECTED_ERROR_GOT_RESULT
+Construct/DirectConElem//K2-DirectConElem-36, EXPECTED_ERROR_GOT_RESULT
+Construct/DirectConElem//K2-DirectConElem-37, EXPECTED_ERROR_GOT_RESULT
+Construct/DirectConElem//K2-DirectConElem-38, EXPECTED_RESULT_GOT_SAME_RESULT
+Construct/DirectConElem//K2-DirectConElem-39, EXPECTED_ERROR_GOT_RESULT
+Construct/DirectConElem//K2-DirectConElem-4, EXPECTED_ERROR_GOT_SAME_ERROR
+Construct/DirectConElem//K2-DirectConElem-40, EXPECTED_ERROR_GOT_RESULT
+Construct/DirectConElem//K2-DirectConElem-41, EXPECTED_ERROR_GOT_RESULT
+Construct/DirectConElem//K2-DirectConElem-42, EXPECTED_RESULT_GOT_ERROR
+Construct/DirectConElem//K2-DirectConElem-43, EXPECTED_RESULT_GOT_ERROR
+Construct/DirectConElem//K2-DirectConElem-44, EXPECTED_RESULT_GOT_SAME_RESULT
+Construct/DirectConElem//K2-DirectConElem-45, EXPECTED_RESULT_GOT_SAME_RESULT
+Construct/DirectConElem//K2-DirectConElem-46, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+Construct/DirectConElem//K2-DirectConElem-47, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
+Construct/DirectConElem//K2-DirectConElem-48, EXPECTED_RESULT_GOT_SAME_RESULT
+Construct/DirectConElem//K2-DirectConElem-49, EXPECTED_RESULT_GOT_SAME_RESULT
+Construct/DirectConElem//K2-DirectConElem-5, EXPECTED_ERROR_GOT_SAME_ERROR
+Construct/DirectConElem//K2-DirectConElem-50, EXPECTED_ERROR_GOT_SAME_ERROR
+Construct/DirectConElem//K2-DirectConElem-51, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+Construct/DirectConElem//K2-DirectConElem-52, EXPECTED_RESULT_GOT_SAME_RESULT
+Construct/DirectConElem//K2-DirectConElem-53, EXPECTED_ERROR_GOT_SAME_ERROR
+Construct/DirectConElem//K2-DirectConElem-54, EXPECTED_ERROR_GOT_SAME_ERROR
+Construct/DirectConElem//K2-DirectConElem-6, EXPECTED_ERROR_GOT_SAME_ERROR
+Construct/DirectConElem//K2-DirectConElem-7, EXPECTED_ERROR_GOT_SAME_ERROR
+Construct/DirectConElem//K2-DirectConElem-8, EXPECTED_ERROR_GOT_SAME_ERROR
+Construct/DirectConElem//K2-DirectConElem-9, EXPECTED_ERROR_GOT_SAME_ERROR
Construct/DirectConElem/DirectConElemAttr//DirectConElemAttr-1, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Construct/DirectConElem/DirectConElemAttr//DirectConElemAttr-2, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-1, EXPECTED_ERROR_GOT_SAME_ERROR
-Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-2, EXPECTED_ERROR_GOT_SAME_ERROR
-Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-3, EXPECTED_ERROR_GOT_SAME_ERROR
-Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-4, EXPECTED_ERROR_GOT_SAME_ERROR
-Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-5, EXPECTED_RESULT_GOT_SAME_RESULT
-Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-6, EXPECTED_ERROR_GOT_SAME_ERROR
-Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-7, EXPECTED_ERROR_GOT_SAME_ERROR
-Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-8, EXPECTED_ERROR_GOT_SAME_ERROR
-Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-9, EXPECTED_ERROR_GOT_SAME_ERROR
Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-10, EXPECTED_ERROR_GOT_SAME_ERROR
Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-11, EXPECTED_ERROR_GOT_SAME_ERROR
Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-12, EXPECTED_ERROR_GOT_SAME_ERROR
@@ -234,6 +280,7 @@ Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-16, EXPECTED_ERR
Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-17, EXPECTED_ERROR_GOT_SAME_ERROR
Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-18, EXPECTED_ERROR_GOT_SAME_ERROR
Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-19, EXPECTED_ERROR_GOT_SAME_ERROR
+Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-2, EXPECTED_ERROR_GOT_SAME_ERROR
Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-20, EXPECTED_ERROR_GOT_SAME_ERROR
Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-21, EXPECTED_ERROR_GOT_SAME_ERROR
Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-22, EXPECTED_ERROR_GOT_SAME_ERROR
@@ -244,6 +291,7 @@ Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-26, EXPECTED_ERR
Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-27, EXPECTED_ERROR_GOT_SAME_ERROR
Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-28, EXPECTED_ERROR_GOT_SAME_ERROR
Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-29, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-3, EXPECTED_ERROR_GOT_SAME_ERROR
Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-30, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-31, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-32, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
@@ -254,6 +302,7 @@ Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-36, EXPECTED_RES
Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-37, EXPECTED_RESULT_GOT_ERROR
Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-38, EXPECTED_RESULT_GOT_ERROR
Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-39, EXPECTED_RESULT_GOT_SAME_RESULT
+Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-4, EXPECTED_ERROR_GOT_SAME_ERROR
Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-40, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-41, EXPECTED_RESULT_GOT_FAILURE
Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-42, EXPECTED_RESULT_GOT_SAME_RESULT
@@ -264,6 +313,7 @@ Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-46, EXPECTED_RES
Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-47, EXPECTED_RESULT_GOT_SAME_RESULT
Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-48, EXPECTED_ERROR_GOT_SAME_ERROR
Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-49, EXPECTED_RESULT_GOT_SAME_RESULT
+Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-5, EXPECTED_RESULT_GOT_SAME_RESULT
Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-50, EXPECTED_RESULT_GOT_SAME_RESULT
Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-51, EXPECTED_ERROR_GOT_SAME_ERROR
Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-52, EXPECTED_RESULT_GOT_SAME_RESULT
@@ -274,6 +324,7 @@ Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-56, EXPECTED_ERR
Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-57, EXPECTED_ERROR_GOT_SAME_ERROR
Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-58, EXPECTED_ERROR_GOT_SAME_ERROR
Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-59, EXPECTED_ERROR_GOT_SAME_ERROR
+Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-6, EXPECTED_ERROR_GOT_SAME_ERROR
Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-60, EXPECTED_ERROR_GOT_SAME_ERROR
Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-61, EXPECTED_ERROR_GOT_SAME_ERROR
Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-62, EXPECTED_ERROR_GOT_SAME_ERROR
@@ -284,6 +335,7 @@ Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-66, EXPECTED_ERR
Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-67, EXPECTED_ERROR_GOT_SAME_ERROR
Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-68, EXPECTED_ERROR_GOT_RESULT
Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-69, EXPECTED_ERROR_GOT_RESULT
+Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-7, EXPECTED_ERROR_GOT_SAME_ERROR
Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-70, EXPECTED_RESULT_GOT_ERROR
Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-71, EXPECTED_RESULT_GOT_ERROR
Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-72, EXPECTED_RESULT_GOT_ERROR
@@ -291,15 +343,9 @@ Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-73, EXPECTED_RES
Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-74, EXPECTED_RESULT_GOT_SAME_RESULT
Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-75, EXPECTED_RESULT_GOT_ERROR
Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-76, EXPECTED_RESULT_GOT_ERROR
+Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-8, EXPECTED_ERROR_GOT_SAME_ERROR
+Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-9, EXPECTED_ERROR_GOT_SAME_ERROR
Construct/DirectConElem/DirectConElemContent//K2-DirectConElemContent-1, EXPECTED_ERROR_GOT_FAILURE
-Construct/DirectConElem/DirectConElemContent//K2-DirectConElemContent-2, EXPECTED_ERROR_GOT_FAILURE
-Construct/DirectConElem/DirectConElemContent//K2-DirectConElemContent-3, EXPECTED_ERROR_GOT_FAILURE
-Construct/DirectConElem/DirectConElemContent//K2-DirectConElemContent-4, EXPECTED_ERROR_GOT_FAILURE
-Construct/DirectConElem/DirectConElemContent//K2-DirectConElemContent-5, EXPECTED_RESULT_GOT_SAME_RESULT
-Construct/DirectConElem/DirectConElemContent//K2-DirectConElemContent-6, EXPECTED_RESULT_GOT_SAME_RESULT
-Construct/DirectConElem/DirectConElemContent//K2-DirectConElemContent-7, EXPECTED_RESULT_GOT_SAME_RESULT
-Construct/DirectConElem/DirectConElemContent//K2-DirectConElemContent-8, EXPECTED_RESULT_GOT_SAME_RESULT
-Construct/DirectConElem/DirectConElemContent//K2-DirectConElemContent-9, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Construct/DirectConElem/DirectConElemContent//K2-DirectConElemContent-10, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Construct/DirectConElem/DirectConElemContent//K2-DirectConElemContent-11, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Construct/DirectConElem/DirectConElemContent//K2-DirectConElemContent-12, EXPECTED_RESULT_GOT_SAME_RESULT
@@ -310,6 +356,7 @@ Construct/DirectConElem/DirectConElemContent//K2-DirectConElemContent-16, EXPECT
Construct/DirectConElem/DirectConElemContent//K2-DirectConElemContent-17, EXPECTED_RESULT_GOT_SAME_RESULT
Construct/DirectConElem/DirectConElemContent//K2-DirectConElemContent-18, EXPECTED_ERROR_GOT_SAME_ERROR
Construct/DirectConElem/DirectConElemContent//K2-DirectConElemContent-19, EXPECTED_ERROR_GOT_SAME_ERROR
+Construct/DirectConElem/DirectConElemContent//K2-DirectConElemContent-2, EXPECTED_ERROR_GOT_FAILURE
Construct/DirectConElem/DirectConElemContent//K2-DirectConElemContent-20, EXPECTED_ERROR_GOT_SAME_ERROR
Construct/DirectConElem/DirectConElemContent//K2-DirectConElemContent-21, EXPECTED_ERROR_GOT_SAME_ERROR
Construct/DirectConElem/DirectConElemContent//K2-DirectConElemContent-22, EXPECTED_ERROR_GOT_SAME_ERROR
@@ -320,6 +367,7 @@ Construct/DirectConElem/DirectConElemContent//K2-DirectConElemContent-26, EXPECT
Construct/DirectConElem/DirectConElemContent//K2-DirectConElemContent-27, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Construct/DirectConElem/DirectConElemContent//K2-DirectConElemContent-28, EXPECTED_RESULT_GOT_SAME_RESULT
Construct/DirectConElem/DirectConElemContent//K2-DirectConElemContent-29, EXPECTED_RESULT_GOT_SAME_RESULT
+Construct/DirectConElem/DirectConElemContent//K2-DirectConElemContent-3, EXPECTED_ERROR_GOT_FAILURE
Construct/DirectConElem/DirectConElemContent//K2-DirectConElemContent-30, EXPECTED_RESULT_GOT_SAME_RESULT
Construct/DirectConElem/DirectConElemContent//K2-DirectConElemContent-31, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Construct/DirectConElem/DirectConElemContent//K2-DirectConElemContent-32, EXPECTED_RESULT_GOT_SAME_RESULT
@@ -330,6 +378,7 @@ Construct/DirectConElem/DirectConElemContent//K2-DirectConElemContent-36, EXPECT
Construct/DirectConElem/DirectConElemContent//K2-DirectConElemContent-37, EXPECTED_RESULT_GOT_ERROR
Construct/DirectConElem/DirectConElemContent//K2-DirectConElemContent-38, EXPECTED_RESULT_GOT_ERROR
Construct/DirectConElem/DirectConElemContent//K2-DirectConElemContent-39, EXPECTED_RESULT_GOT_SAME_RESULT
+Construct/DirectConElem/DirectConElemContent//K2-DirectConElemContent-4, EXPECTED_ERROR_GOT_FAILURE
Construct/DirectConElem/DirectConElemContent//K2-DirectConElemContent-40, EXPECTED_RESULT_GOT_SAME_RESULT
Construct/DirectConElem/DirectConElemContent//K2-DirectConElemContent-41, EXPECTED_RESULT_GOT_SAME_RESULT
Construct/DirectConElem/DirectConElemContent//K2-DirectConElemContent-42, EXPECTED_RESULT_GOT_SAME_RESULT
@@ -339,19 +388,16 @@ Construct/DirectConElem/DirectConElemContent//K2-DirectConElemContent-45, EXPECT
Construct/DirectConElem/DirectConElemContent//K2-DirectConElemContent-46, EXPECTED_RESULT_GOT_ERROR
Construct/DirectConElem/DirectConElemContent//K2-DirectConElemContent-47, EXPECTED_RESULT_GOT_SAME_RESULT
Construct/DirectConElem/DirectConElemContent//K2-DirectConElemContent-48, EXPECTED_RESULT_GOT_ERROR
+Construct/DirectConElem/DirectConElemContent//K2-DirectConElemContent-5, EXPECTED_RESULT_GOT_SAME_RESULT
+Construct/DirectConElem/DirectConElemContent//K2-DirectConElemContent-6, EXPECTED_RESULT_GOT_SAME_RESULT
+Construct/DirectConElem/DirectConElemContent//K2-DirectConElemContent-7, EXPECTED_RESULT_GOT_SAME_RESULT
+Construct/DirectConElem/DirectConElemContent//K2-DirectConElemContent-8, EXPECTED_RESULT_GOT_SAME_RESULT
+Construct/DirectConElem/DirectConElemContent//K2-DirectConElemContent-9, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Construct/DirectConElem/DirectConElemNamespace//DirectConElemNamespace-3, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
Construct/DirectConElem/DirectConElemNamespace//DirectConElemNamespace-4, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
Construct/DirectConElem/DirectConElemNamespace//DirectConElemNamespace-5, EXPECTED_RESULT_GOT_ERROR
Construct/DirectConElem/DirectConElemNamespace//DirectConElemNamespace-6, EXPECTED_RESULT_GOT_ERROR
Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-1, EXPECTED_ERROR_GOT_SAME_ERROR
-Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-2, EXPECTED_ERROR_GOT_SAME_ERROR
-Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-3, EXPECTED_ERROR_GOT_SAME_ERROR
-Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-4, EXPECTED_ERROR_GOT_FAILURE
-Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-5, EXPECTED_RESULT_GOT_ERROR
-Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-6, EXPECTED_RESULT_GOT_ERROR
-Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-7, EXPECTED_ERROR_GOT_SAME_ERROR
-Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-8, EXPECTED_ERROR_GOT_SAME_ERROR
-Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-9, EXPECTED_ERROR_GOT_SAME_ERROR
Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-10, EXPECTED_ERROR_GOT_SAME_ERROR
Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-11, EXPECTED_ERROR_GOT_FAILURE
Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-12, EXPECTED_ERROR_GOT_FAILURE
@@ -362,6 +408,7 @@ Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-16, EX
Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-17, EXPECTED_ERROR_GOT_RESULT
Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-18, EXPECTED_ERROR_GOT_SAME_ERROR
Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-19, EXPECTED_RESULT_GOT_ERROR
+Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-2, EXPECTED_ERROR_GOT_SAME_ERROR
Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-20, EXPECTED_RESULT_GOT_ERROR
Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-21, EXPECTED_RESULT_GOT_ERROR
Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-22, EXPECTED_RESULT_GOT_ERROR
@@ -372,6 +419,7 @@ Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-26, EX
Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-27, EXPECTED_RESULT_GOT_ERROR
Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-28, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-29, EXPECTED_RESULT_GOT_ERROR
+Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-3, EXPECTED_ERROR_GOT_SAME_ERROR
Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-30, EXPECTED_RESULT_GOT_ERROR
Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-31, EXPECTED_RESULT_GOT_ERROR
Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-32, EXPECTED_RESULT_GOT_ERROR
@@ -382,6 +430,7 @@ Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-36, EX
Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-37, EXPECTED_ERROR_GOT_RESULT
Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-38, EXPECTED_ERROR_GOT_SAME_ERROR
Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-39, EXPECTED_RESULT_GOT_ERROR
+Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-4, EXPECTED_ERROR_GOT_FAILURE
Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-40, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-41, EXPECTED_RESULT_GOT_ERROR
Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-42, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
@@ -392,6 +441,7 @@ Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-46, EX
Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-47, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-48, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-49, EXPECTED_RESULT_GOT_SAME_RESULT
+Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-5, EXPECTED_RESULT_GOT_ERROR
Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-50, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-51, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-52, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
@@ -402,6 +452,7 @@ Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-56, EX
Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-57, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-58, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-59, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
+Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-6, EXPECTED_RESULT_GOT_ERROR
Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-61, EXPECTED_ERROR_GOT_SAME_ERROR
Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-62, EXPECTED_ERROR_GOT_SAME_ERROR
Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-63, EXPECTED_ERROR_GOT_SAME_ERROR
@@ -410,6 +461,7 @@ Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-65, EX
Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-67, EXPECTED_ERROR_GOT_SAME_ERROR
Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-68, EXPECTED_ERROR_GOT_SAME_ERROR
Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-69, EXPECTED_ERROR_GOT_SAME_ERROR
+Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-7, EXPECTED_ERROR_GOT_SAME_ERROR
Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-70, EXPECTED_ERROR_GOT_SAME_ERROR
Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-71, EXPECTED_ERROR_GOT_SAME_ERROR
Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-72, EXPECTED_ERROR_GOT_RESULT
@@ -420,15 +472,9 @@ Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-76, EX
Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-77, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-78, EXPECTED_RESULT_GOT_FAILURE
Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-79, EXPECTED_ERROR_GOT_FAILURE
+Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-8, EXPECTED_ERROR_GOT_SAME_ERROR
+Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-9, EXPECTED_ERROR_GOT_SAME_ERROR
Construct/DirectConElem/DirectConElemWhitespace//K2-DirectConElemWhitespace-1, EXPECTED_RESULT_GOT_SAME_RESULT
-Construct/DirectConElem/DirectConElemWhitespace//K2-DirectConElemWhitespace-2, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Construct/DirectConElem/DirectConElemWhitespace//K2-DirectConElemWhitespace-3, EXPECTED_RESULT_GOT_SAME_RESULT
-Construct/DirectConElem/DirectConElemWhitespace//K2-DirectConElemWhitespace-4, EXPECTED_RESULT_GOT_SAME_RESULT
-Construct/DirectConElem/DirectConElemWhitespace//K2-DirectConElemWhitespace-5, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Construct/DirectConElem/DirectConElemWhitespace//K2-DirectConElemWhitespace-6, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Construct/DirectConElem/DirectConElemWhitespace//K2-DirectConElemWhitespace-7, EXPECTED_RESULT_GOT_SAME_RESULT
-Construct/DirectConElem/DirectConElemWhitespace//K2-DirectConElemWhitespace-8, EXPECTED_RESULT_GOT_SAME_RESULT
-Construct/DirectConElem/DirectConElemWhitespace//K2-DirectConElemWhitespace-9, EXPECTED_RESULT_GOT_SAME_RESULT
Construct/DirectConElem/DirectConElemWhitespace//K2-DirectConElemWhitespace-10, EXPECTED_RESULT_GOT_SAME_RESULT
Construct/DirectConElem/DirectConElemWhitespace//K2-DirectConElemWhitespace-11, EXPECTED_RESULT_GOT_SAME_RESULT
Construct/DirectConElem/DirectConElemWhitespace//K2-DirectConElemWhitespace-12, EXPECTED_RESULT_GOT_SAME_RESULT
@@ -439,6 +485,7 @@ Construct/DirectConElem/DirectConElemWhitespace//K2-DirectConElemWhitespace-16,
Construct/DirectConElem/DirectConElemWhitespace//K2-DirectConElemWhitespace-17, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Construct/DirectConElem/DirectConElemWhitespace//K2-DirectConElemWhitespace-18, EXPECTED_RESULT_GOT_SAME_RESULT
Construct/DirectConElem/DirectConElemWhitespace//K2-DirectConElemWhitespace-19, EXPECTED_RESULT_GOT_SAME_RESULT
+Construct/DirectConElem/DirectConElemWhitespace//K2-DirectConElemWhitespace-2, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Construct/DirectConElem/DirectConElemWhitespace//K2-DirectConElemWhitespace-20, EXPECTED_RESULT_GOT_SAME_RESULT
Construct/DirectConElem/DirectConElemWhitespace//K2-DirectConElemWhitespace-21, EXPECTED_RESULT_GOT_SAME_RESULT
Construct/DirectConElem/DirectConElemWhitespace//K2-DirectConElemWhitespace-22, EXPECTED_RESULT_GOT_SAME_RESULT
@@ -446,69 +493,14 @@ Construct/DirectConElem/DirectConElemWhitespace//K2-DirectConElemWhitespace-23,
Construct/DirectConElem/DirectConElemWhitespace//K2-DirectConElemWhitespace-24, EXPECTED_RESULT_GOT_SAME_RESULT
Construct/DirectConElem/DirectConElemWhitespace//K2-DirectConElemWhitespace-25, EXPECTED_RESULT_GOT_SAME_RESULT
Construct/DirectConElem/DirectConElemWhitespace//K2-DirectConElemWhitespace-26, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Construct/DirectConElem//K2-DirectConElem-1, EXPECTED_RESULT_GOT_SAME_RESULT
-Construct/DirectConElem//K2-DirectConElem-2, EXPECTED_RESULT_GOT_SAME_RESULT
-Construct/DirectConElem//K2-DirectConElem-3, EXPECTED_ERROR_GOT_SAME_ERROR
-Construct/DirectConElem//K2-DirectConElem-4, EXPECTED_ERROR_GOT_SAME_ERROR
-Construct/DirectConElem//K2-DirectConElem-5, EXPECTED_ERROR_GOT_SAME_ERROR
-Construct/DirectConElem//K2-DirectConElem-6, EXPECTED_ERROR_GOT_SAME_ERROR
-Construct/DirectConElem//K2-DirectConElem-7, EXPECTED_ERROR_GOT_SAME_ERROR
-Construct/DirectConElem//K2-DirectConElem-8, EXPECTED_ERROR_GOT_SAME_ERROR
-Construct/DirectConElem//K2-DirectConElem-9, EXPECTED_ERROR_GOT_SAME_ERROR
-Construct/DirectConElem//K2-DirectConElem-10, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
-Construct/DirectConElem//K2-DirectConElem-11, EXPECTED_ERROR_GOT_SAME_ERROR
-Construct/DirectConElem//K2-DirectConElem-12, EXPECTED_ERROR_GOT_SAME_ERROR
-Construct/DirectConElem//K2-DirectConElem-13, EXPECTED_ERROR_GOT_SAME_ERROR
-Construct/DirectConElem//K2-DirectConElem-14, EXPECTED_ERROR_GOT_SAME_ERROR
-Construct/DirectConElem//K2-DirectConElem-15, EXPECTED_ERROR_GOT_SAME_ERROR
-Construct/DirectConElem//K2-DirectConElem-16, EXPECTED_ERROR_GOT_SAME_ERROR
-Construct/DirectConElem//K2-DirectConElem-17, EXPECTED_ERROR_GOT_SAME_ERROR
-Construct/DirectConElem//K2-DirectConElem-18, EXPECTED_ERROR_GOT_SAME_ERROR
-Construct/DirectConElem//K2-DirectConElem-19, EXPECTED_ERROR_GOT_SAME_ERROR
-Construct/DirectConElem//K2-DirectConElem-20, EXPECTED_ERROR_GOT_SAME_ERROR
-Construct/DirectConElem//K2-DirectConElem-21, EXPECTED_ERROR_GOT_SAME_ERROR
-Construct/DirectConElem//K2-DirectConElem-22, EXPECTED_ERROR_GOT_SAME_ERROR
-Construct/DirectConElem//K2-DirectConElem-23, EXPECTED_ERROR_GOT_SAME_ERROR
-Construct/DirectConElem//K2-DirectConElem-24, EXPECTED_ERROR_GOT_SAME_ERROR
-Construct/DirectConElem//K2-DirectConElem-25, EXPECTED_ERROR_GOT_SAME_ERROR
-Construct/DirectConElem//K2-DirectConElem-26, EXPECTED_ERROR_GOT_SAME_ERROR
-Construct/DirectConElem//K2-DirectConElem-27, EXPECTED_ERROR_GOT_SAME_ERROR
-Construct/DirectConElem//K2-DirectConElem-28, EXPECTED_RESULT_GOT_SAME_RESULT
-Construct/DirectConElem//K2-DirectConElem-29, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Construct/DirectConElem//K2-DirectConElem-30, EXPECTED_RESULT_GOT_SAME_RESULT
-Construct/DirectConElem//K2-DirectConElem-31, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Construct/DirectConElem//K2-DirectConElem-32, EXPECTED_RESULT_GOT_SAME_RESULT
-Construct/DirectConElem//K2-DirectConElem-33, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Construct/DirectConElem//K2-DirectConElem-34, EXPECTED_RESULT_GOT_ERROR
-Construct/DirectConElem//K2-DirectConElem-35, EXPECTED_ERROR_GOT_RESULT
-Construct/DirectConElem//K2-DirectConElem-36, EXPECTED_ERROR_GOT_RESULT
-Construct/DirectConElem//K2-DirectConElem-37, EXPECTED_ERROR_GOT_RESULT
-Construct/DirectConElem//K2-DirectConElem-38, EXPECTED_RESULT_GOT_SAME_RESULT
-Construct/DirectConElem//K2-DirectConElem-39, EXPECTED_ERROR_GOT_RESULT
-Construct/DirectConElem//K2-DirectConElem-40, EXPECTED_ERROR_GOT_RESULT
-Construct/DirectConElem//K2-DirectConElem-41, EXPECTED_ERROR_GOT_RESULT
-Construct/DirectConElem//K2-DirectConElem-42, EXPECTED_RESULT_GOT_ERROR
-Construct/DirectConElem//K2-DirectConElem-43, EXPECTED_RESULT_GOT_ERROR
-Construct/DirectConElem//K2-DirectConElem-44, EXPECTED_RESULT_GOT_SAME_RESULT
-Construct/DirectConElem//K2-DirectConElem-45, EXPECTED_RESULT_GOT_SAME_RESULT
-Construct/DirectConElem//K2-DirectConElem-46, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Construct/DirectConElem//K2-DirectConElem-47, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
-Construct/DirectConElem//K2-DirectConElem-48, EXPECTED_RESULT_GOT_SAME_RESULT
-Construct/DirectConElem//K2-DirectConElem-49, EXPECTED_RESULT_GOT_SAME_RESULT
-Construct/DirectConElem//K2-DirectConElem-50, EXPECTED_ERROR_GOT_SAME_ERROR
-Construct/DirectConElem//K2-DirectConElem-51, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Construct/DirectConElem//K2-DirectConElem-52, EXPECTED_RESULT_GOT_SAME_RESULT
-Construct/DirectConElem//K2-DirectConElem-53, EXPECTED_ERROR_GOT_SAME_ERROR
-Construct/DirectConElem//K2-DirectConElem-54, EXPECTED_ERROR_GOT_SAME_ERROR
+Construct/DirectConElem/DirectConElemWhitespace//K2-DirectConElemWhitespace-3, EXPECTED_RESULT_GOT_SAME_RESULT
+Construct/DirectConElem/DirectConElemWhitespace//K2-DirectConElemWhitespace-4, EXPECTED_RESULT_GOT_SAME_RESULT
+Construct/DirectConElem/DirectConElemWhitespace//K2-DirectConElemWhitespace-5, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+Construct/DirectConElem/DirectConElemWhitespace//K2-DirectConElemWhitespace-6, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+Construct/DirectConElem/DirectConElemWhitespace//K2-DirectConElemWhitespace-7, EXPECTED_RESULT_GOT_SAME_RESULT
+Construct/DirectConElem/DirectConElemWhitespace//K2-DirectConElemWhitespace-8, EXPECTED_RESULT_GOT_SAME_RESULT
+Construct/DirectConElem/DirectConElemWhitespace//K2-DirectConElemWhitespace-9, EXPECTED_RESULT_GOT_SAME_RESULT
Construct/DirectConOther//K2-DirectConOther-1, EXPECTED_RESULT_GOT_SAME_RESULT
-Construct/DirectConOther//K2-DirectConOther-2, EXPECTED_ERROR_GOT_SAME_ERROR
-Construct/DirectConOther//K2-DirectConOther-3, EXPECTED_ERROR_GOT_SAME_ERROR
-Construct/DirectConOther//K2-DirectConOther-4, EXPECTED_ERROR_GOT_SAME_ERROR
-Construct/DirectConOther//K2-DirectConOther-5, EXPECTED_ERROR_GOT_SAME_ERROR
-Construct/DirectConOther//K2-DirectConOther-6, EXPECTED_ERROR_GOT_SAME_ERROR
-Construct/DirectConOther//K2-DirectConOther-7, EXPECTED_ERROR_GOT_SAME_ERROR
-Construct/DirectConOther//K2-DirectConOther-8, EXPECTED_ERROR_GOT_SAME_ERROR
-Construct/DirectConOther//K2-DirectConOther-9, EXPECTED_ERROR_GOT_SAME_ERROR
Construct/DirectConOther//K2-DirectConOther-10, EXPECTED_ERROR_GOT_SAME_ERROR
Construct/DirectConOther//K2-DirectConOther-11, EXPECTED_ERROR_GOT_SAME_ERROR
Construct/DirectConOther//K2-DirectConOther-12, EXPECTED_ERROR_GOT_SAME_ERROR
@@ -519,6 +511,7 @@ Construct/DirectConOther//K2-DirectConOther-16, EXPECTED_ERROR_GOT_SAME_ERROR
Construct/DirectConOther//K2-DirectConOther-17, EXPECTED_ERROR_GOT_SAME_ERROR
Construct/DirectConOther//K2-DirectConOther-18, EXPECTED_ERROR_GOT_SAME_ERROR
Construct/DirectConOther//K2-DirectConOther-19, EXPECTED_ERROR_GOT_SAME_ERROR
+Construct/DirectConOther//K2-DirectConOther-2, EXPECTED_ERROR_GOT_SAME_ERROR
Construct/DirectConOther//K2-DirectConOther-20, EXPECTED_ERROR_GOT_SAME_ERROR
Construct/DirectConOther//K2-DirectConOther-21, EXPECTED_ERROR_GOT_SAME_ERROR
Construct/DirectConOther//K2-DirectConOther-22, EXPECTED_ERROR_GOT_SAME_ERROR
@@ -529,6 +522,7 @@ Construct/DirectConOther//K2-DirectConOther-26, EXPECTED_ERROR_GOT_SAME_ERROR
Construct/DirectConOther//K2-DirectConOther-27, EXPECTED_ERROR_GOT_SAME_ERROR
Construct/DirectConOther//K2-DirectConOther-28, EXPECTED_ERROR_GOT_SAME_ERROR
Construct/DirectConOther//K2-DirectConOther-29, EXPECTED_RESULT_GOT_ERROR
+Construct/DirectConOther//K2-DirectConOther-3, EXPECTED_ERROR_GOT_SAME_ERROR
Construct/DirectConOther//K2-DirectConOther-30, EXPECTED_RESULT_GOT_ERROR
Construct/DirectConOther//K2-DirectConOther-31, EXPECTED_RESULT_GOT_ERROR
Construct/DirectConOther//K2-DirectConOther-32, EXPECTED_RESULT_GOT_SAME_RESULT
@@ -539,6 +533,7 @@ Construct/DirectConOther//K2-DirectConOther-36, EXPECTED_RESULT_GOT_SAME_RESULT
Construct/DirectConOther//K2-DirectConOther-37, EXPECTED_RESULT_GOT_SAME_RESULT
Construct/DirectConOther//K2-DirectConOther-38, EXPECTED_RESULT_GOT_SAME_RESULT
Construct/DirectConOther//K2-DirectConOther-39, EXPECTED_RESULT_GOT_SAME_RESULT
+Construct/DirectConOther//K2-DirectConOther-4, EXPECTED_ERROR_GOT_SAME_ERROR
Construct/DirectConOther//K2-DirectConOther-40, EXPECTED_RESULT_GOT_SAME_RESULT
Construct/DirectConOther//K2-DirectConOther-41, EXPECTED_RESULT_GOT_SAME_RESULT
Construct/DirectConOther//K2-DirectConOther-42, EXPECTED_ERROR_GOT_SAME_ERROR
@@ -549,6 +544,7 @@ Construct/DirectConOther//K2-DirectConOther-46, EXPECTED_RESULT_GOT_DIFFERENT_RE
Construct/DirectConOther//K2-DirectConOther-47, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Construct/DirectConOther//K2-DirectConOther-48, EXPECTED_ERROR_GOT_RESULT
Construct/DirectConOther//K2-DirectConOther-49, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+Construct/DirectConOther//K2-DirectConOther-5, EXPECTED_ERROR_GOT_SAME_ERROR
Construct/DirectConOther//K2-DirectConOther-50, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Construct/DirectConOther//K2-DirectConOther-51, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Construct/DirectConOther//K2-DirectConOther-52, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
@@ -559,6 +555,7 @@ Construct/DirectConOther//K2-DirectConOther-56, EXPECTED_ERROR_GOT_SAME_ERROR
Construct/DirectConOther//K2-DirectConOther-57, EXPECTED_ERROR_GOT_SAME_ERROR
Construct/DirectConOther//K2-DirectConOther-58, EXPECTED_RESULT_GOT_SAME_RESULT
Construct/DirectConOther//K2-DirectConOther-59, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+Construct/DirectConOther//K2-DirectConOther-6, EXPECTED_ERROR_GOT_SAME_ERROR
Construct/DirectConOther//K2-DirectConOther-60, EXPECTED_RESULT_GOT_SAME_RESULT
Construct/DirectConOther//K2-DirectConOther-61, EXPECTED_ERROR_GOT_SAME_ERROR
Construct/DirectConOther//K2-DirectConOther-62, EXPECTED_ERROR_GOT_SAME_ERROR
@@ -569,8 +566,11 @@ Construct/DirectConOther//K2-DirectConOther-66, EXPECTED_RESULT_GOT_ERROR
Construct/DirectConOther//K2-DirectConOther-67, EXPECTED_RESULT_GOT_ERROR
Construct/DirectConOther//K2-DirectConOther-68, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Construct/DirectConOther//K2-DirectConOther-69, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+Construct/DirectConOther//K2-DirectConOther-7, EXPECTED_ERROR_GOT_SAME_ERROR
Construct/DirectConOther//K2-DirectConOther-70, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Construct/DirectConOther//K2-DirectConOther-71, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+Construct/DirectConOther//K2-DirectConOther-8, EXPECTED_ERROR_GOT_SAME_ERROR
+Construct/DirectConOther//K2-DirectConOther-9, EXPECTED_ERROR_GOT_SAME_ERROR
ErrorsAndOptimization//errors-and-optimization-1, EXPECTED_RESULT_GOT_SAME_RESULT
ErrorsAndOptimization//errors-and-optimization-2, EXPECTED_ERROR_GOT_SAME_ERROR
ErrorsAndOptimization//errors-and-optimization-3, EXPECTED_RESULT_GOT_ERROR
@@ -600,6 +600,9 @@ Expressions/CondExpr//CondExpr020, EXPECTED_RESULT_GOT_FAILURE
Expressions/CondExpr//CondExpr021, EXPECTED_RESULT_GOT_FAILURE
Expressions/CondExpr//CondExpr022, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/CondExpr//K-CondExpr-1, EXPECTED_RESULT_GOT_SAME_RESULT
+Expressions/CondExpr//K-CondExpr-10, EXPECTED_RESULT_GOT_SAME_RESULT
+Expressions/CondExpr//K-CondExpr-11, EXPECTED_RESULT_GOT_SAME_RESULT
+Expressions/CondExpr//K-CondExpr-12, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/CondExpr//K-CondExpr-2, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/CondExpr//K-CondExpr-3, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/CondExpr//K-CondExpr-4, EXPECTED_RESULT_GOT_SAME_RESULT
@@ -608,18 +611,7 @@ Expressions/CondExpr//K-CondExpr-6, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/CondExpr//K-CondExpr-7, EXPECTED_ERROR_GOT_SAME_ERROR
Expressions/CondExpr//K-CondExpr-8, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/CondExpr//K-CondExpr-9, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/CondExpr//K-CondExpr-10, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/CondExpr//K-CondExpr-11, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/CondExpr//K-CondExpr-12, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Construct/ComputeCon/ComputeConAttr//Constr-compattr-compname-1, EXPECTED_ERROR_GOT_SAME_ERROR
-Expressions/Construct/ComputeCon/ComputeConAttr//Constr-compattr-compname-2, EXPECTED_ERROR_GOT_SAME_ERROR
-Expressions/Construct/ComputeCon/ComputeConAttr//Constr-compattr-compname-3, EXPECTED_ERROR_GOT_SAME_ERROR
-Expressions/Construct/ComputeCon/ComputeConAttr//Constr-compattr-compname-4, EXPECTED_ERROR_GOT_FAILURE
-Expressions/Construct/ComputeCon/ComputeConAttr//Constr-compattr-compname-5, EXPECTED_ERROR_GOT_SAME_ERROR
-Expressions/Construct/ComputeCon/ComputeConAttr//Constr-compattr-compname-6, EXPECTED_ERROR_GOT_SAME_ERROR
-Expressions/Construct/ComputeCon/ComputeConAttr//Constr-compattr-compname-7, EXPECTED_ERROR_GOT_SAME_ERROR
-Expressions/Construct/ComputeCon/ComputeConAttr//Constr-compattr-compname-8, EXPECTED_RESULT_GOT_FAILURE
-Expressions/Construct/ComputeCon/ComputeConAttr//Constr-compattr-compname-9, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Construct/ComputeCon/ComputeConAttr//Constr-compattr-compname-10, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Construct/ComputeCon/ComputeConAttr//Constr-compattr-compname-11, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Construct/ComputeCon/ComputeConAttr//Constr-compattr-compname-12, EXPECTED_RESULT_GOT_SAME_RESULT
@@ -630,6 +622,14 @@ Expressions/Construct/ComputeCon/ComputeConAttr//Constr-compattr-compname-16, EX
Expressions/Construct/ComputeCon/ComputeConAttr//Constr-compattr-compname-17, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
Expressions/Construct/ComputeCon/ComputeConAttr//Constr-compattr-compname-18, EXPECTED_ERROR_GOT_RESULT
Expressions/Construct/ComputeCon/ComputeConAttr//Constr-compattr-compname-19, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
+Expressions/Construct/ComputeCon/ComputeConAttr//Constr-compattr-compname-2, EXPECTED_ERROR_GOT_SAME_ERROR
+Expressions/Construct/ComputeCon/ComputeConAttr//Constr-compattr-compname-3, EXPECTED_ERROR_GOT_SAME_ERROR
+Expressions/Construct/ComputeCon/ComputeConAttr//Constr-compattr-compname-4, EXPECTED_ERROR_GOT_FAILURE
+Expressions/Construct/ComputeCon/ComputeConAttr//Constr-compattr-compname-5, EXPECTED_ERROR_GOT_SAME_ERROR
+Expressions/Construct/ComputeCon/ComputeConAttr//Constr-compattr-compname-6, EXPECTED_ERROR_GOT_SAME_ERROR
+Expressions/Construct/ComputeCon/ComputeConAttr//Constr-compattr-compname-7, EXPECTED_ERROR_GOT_SAME_ERROR
+Expressions/Construct/ComputeCon/ComputeConAttr//Constr-compattr-compname-8, EXPECTED_RESULT_GOT_FAILURE
+Expressions/Construct/ComputeCon/ComputeConAttr//Constr-compattr-compname-9, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Construct/ComputeCon/ComputeConAttr//Constr-compattr-data-1, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Expressions/Construct/ComputeCon/ComputeConAttr//Constr-compattr-doc-1, EXPECTED_RESULT_GOT_FAILURE
Expressions/Construct/ComputeCon/ComputeConAttr//Constr-compattr-enclexpr-1, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
@@ -676,14 +676,6 @@ Expressions/Construct/ComputeCon/ComputeConElem//Constr-compelem-baseuri-1, EXPE
Expressions/Construct/ComputeCon/ComputeConElem//Constr-compelem-baseuri-2, EXPECTED_RESULT_GOT_ERROR
Expressions/Construct/ComputeCon/ComputeConElem//Constr-compelem-baseuri-3, EXPECTED_RESULT_GOT_ERROR
Expressions/Construct/ComputeCon/ComputeConElem//Constr-compelem-compname-1, EXPECTED_ERROR_GOT_SAME_ERROR
-Expressions/Construct/ComputeCon/ComputeConElem//Constr-compelem-compname-2, EXPECTED_ERROR_GOT_SAME_ERROR
-Expressions/Construct/ComputeCon/ComputeConElem//Constr-compelem-compname-3, EXPECTED_ERROR_GOT_SAME_ERROR
-Expressions/Construct/ComputeCon/ComputeConElem//Constr-compelem-compname-4, EXPECTED_ERROR_GOT_FAILURE
-Expressions/Construct/ComputeCon/ComputeConElem//Constr-compelem-compname-5, EXPECTED_ERROR_GOT_SAME_ERROR
-Expressions/Construct/ComputeCon/ComputeConElem//Constr-compelem-compname-6, EXPECTED_ERROR_GOT_SAME_ERROR
-Expressions/Construct/ComputeCon/ComputeConElem//Constr-compelem-compname-7, EXPECTED_ERROR_GOT_SAME_ERROR
-Expressions/Construct/ComputeCon/ComputeConElem//Constr-compelem-compname-8, EXPECTED_RESULT_GOT_FAILURE
-Expressions/Construct/ComputeCon/ComputeConElem//Constr-compelem-compname-9, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Construct/ComputeCon/ComputeConElem//Constr-compelem-compname-10, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Construct/ComputeCon/ComputeConElem//Constr-compelem-compname-11, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Construct/ComputeCon/ComputeConElem//Constr-compelem-compname-12, EXPECTED_RESULT_GOT_SAME_RESULT
@@ -694,6 +686,14 @@ Expressions/Construct/ComputeCon/ComputeConElem//Constr-compelem-compname-16, EX
Expressions/Construct/ComputeCon/ComputeConElem//Constr-compelem-compname-17, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
Expressions/Construct/ComputeCon/ComputeConElem//Constr-compelem-compname-18, EXPECTED_ERROR_GOT_RESULT
Expressions/Construct/ComputeCon/ComputeConElem//Constr-compelem-compname-19, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
+Expressions/Construct/ComputeCon/ComputeConElem//Constr-compelem-compname-2, EXPECTED_ERROR_GOT_SAME_ERROR
+Expressions/Construct/ComputeCon/ComputeConElem//Constr-compelem-compname-3, EXPECTED_ERROR_GOT_SAME_ERROR
+Expressions/Construct/ComputeCon/ComputeConElem//Constr-compelem-compname-4, EXPECTED_ERROR_GOT_FAILURE
+Expressions/Construct/ComputeCon/ComputeConElem//Constr-compelem-compname-5, EXPECTED_ERROR_GOT_SAME_ERROR
+Expressions/Construct/ComputeCon/ComputeConElem//Constr-compelem-compname-6, EXPECTED_ERROR_GOT_SAME_ERROR
+Expressions/Construct/ComputeCon/ComputeConElem//Constr-compelem-compname-7, EXPECTED_ERROR_GOT_SAME_ERROR
+Expressions/Construct/ComputeCon/ComputeConElem//Constr-compelem-compname-8, EXPECTED_RESULT_GOT_FAILURE
+Expressions/Construct/ComputeCon/ComputeConElem//Constr-compelem-compname-9, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Construct/ComputeCon/ComputeConElem//Constr-compelem-constrmod-3, EXPECTED_ERROR_GOT_FAILURE
Expressions/Construct/ComputeCon/ComputeConElem//Constr-compelem-constrmod-4, EXPECTED_ERROR_GOT_FAILURE
Expressions/Construct/ComputeCon/ComputeConElem//Constr-compelem-constrmod-7, EXPECTED_ERROR_GOT_FAILURE
@@ -717,14 +717,6 @@ Expressions/Construct/ComputeCon/ComputeConElem//Constr-compelem-nodeid-5, EXPEC
Expressions/Construct/ComputeCon/ComputeConElem//Constr-compelem-parent-1, EXPECTED_RESULT_GOT_ERROR
Expressions/Construct/ComputeCon/ComputeConElem//Constr-compelem-string-1, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Expressions/Construct/ComputeCon/ComputeConPI//Constr-comppi-compname-1, EXPECTED_ERROR_GOT_RESULT
-Expressions/Construct/ComputeCon/ComputeConPI//Constr-comppi-compname-2, EXPECTED_ERROR_GOT_RESULT
-Expressions/Construct/ComputeCon/ComputeConPI//Constr-comppi-compname-3, EXPECTED_ERROR_GOT_RESULT
-Expressions/Construct/ComputeCon/ComputeConPI//Constr-comppi-compname-4, EXPECTED_ERROR_GOT_FAILURE
-Expressions/Construct/ComputeCon/ComputeConPI//Constr-comppi-compname-5, EXPECTED_ERROR_GOT_RESULT
-Expressions/Construct/ComputeCon/ComputeConPI//Constr-comppi-compname-6, EXPECTED_ERROR_GOT_RESULT
-Expressions/Construct/ComputeCon/ComputeConPI//Constr-comppi-compname-7, EXPECTED_ERROR_GOT_RESULT
-Expressions/Construct/ComputeCon/ComputeConPI//Constr-comppi-compname-8, EXPECTED_RESULT_GOT_FAILURE
-Expressions/Construct/ComputeCon/ComputeConPI//Constr-comppi-compname-9, EXPECTED_ERROR_GOT_FAILURE
Expressions/Construct/ComputeCon/ComputeConPI//Constr-comppi-compname-10, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Construct/ComputeCon/ComputeConPI//Constr-comppi-compname-11, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Construct/ComputeCon/ComputeConPI//Constr-comppi-compname-12, EXPECTED_RESULT_GOT_SAME_RESULT
@@ -733,6 +725,14 @@ Expressions/Construct/ComputeCon/ComputeConPI//Constr-comppi-compname-15, EXPECT
Expressions/Construct/ComputeCon/ComputeConPI//Constr-comppi-compname-16, EXPECTED_ERROR_GOT_RESULT
Expressions/Construct/ComputeCon/ComputeConPI//Constr-comppi-compname-18, EXPECTED_ERROR_GOT_RESULT
Expressions/Construct/ComputeCon/ComputeConPI//Constr-comppi-compname-19, EXPECTED_ERROR_GOT_RESULT
+Expressions/Construct/ComputeCon/ComputeConPI//Constr-comppi-compname-2, EXPECTED_ERROR_GOT_RESULT
+Expressions/Construct/ComputeCon/ComputeConPI//Constr-comppi-compname-3, EXPECTED_ERROR_GOT_RESULT
+Expressions/Construct/ComputeCon/ComputeConPI//Constr-comppi-compname-4, EXPECTED_ERROR_GOT_FAILURE
+Expressions/Construct/ComputeCon/ComputeConPI//Constr-comppi-compname-5, EXPECTED_ERROR_GOT_RESULT
+Expressions/Construct/ComputeCon/ComputeConPI//Constr-comppi-compname-6, EXPECTED_ERROR_GOT_RESULT
+Expressions/Construct/ComputeCon/ComputeConPI//Constr-comppi-compname-7, EXPECTED_ERROR_GOT_RESULT
+Expressions/Construct/ComputeCon/ComputeConPI//Constr-comppi-compname-8, EXPECTED_RESULT_GOT_FAILURE
+Expressions/Construct/ComputeCon/ComputeConPI//Constr-comppi-compname-9, EXPECTED_ERROR_GOT_FAILURE
Expressions/Construct/ComputeCon/ComputeConPI//Constr-comppi-data-1, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Expressions/Construct/ComputeCon/ComputeConPI//Constr-comppi-doc-1, EXPECTED_RESULT_GOT_FAILURE
Expressions/Construct/ComputeCon/ComputeConPI//Constr-comppi-empty-1, EXPECTED_RESULT_GOT_SAME_RESULT
@@ -745,12 +745,12 @@ Expressions/Construct/ComputeCon/ComputeConPI//Constr-comppi-enclexpr-5, EXPECTE
Expressions/Construct/ComputeCon/ComputeConPI//Constr-comppi-invalid-1, EXPECTED_ERROR_GOT_RESULT
Expressions/Construct/ComputeCon/ComputeConPI//Constr-comppi-invalid-2, EXPECTED_ERROR_GOT_RESULT
Expressions/Construct/ComputeCon/ComputeConPI//Constr-comppi-invalid-3, EXPECTED_ERROR_GOT_RESULT
+Expressions/Construct/ComputeCon/ComputeConPI//Constr-comppi-name-1, EXPECTED_RESULT_GOT_SAME_RESULT
+Expressions/Construct/ComputeCon/ComputeConPI//Constr-comppi-name-2, EXPECTED_ERROR_GOT_SAME_ERROR
Expressions/Construct/ComputeCon/ComputeConPI//Constr-comppi-namexml-1, EXPECTED_ERROR_GOT_RESULT
Expressions/Construct/ComputeCon/ComputeConPI//Constr-comppi-namexml-2, EXPECTED_ERROR_GOT_RESULT
Expressions/Construct/ComputeCon/ComputeConPI//Constr-comppi-namexml-3, EXPECTED_ERROR_GOT_RESULT
Expressions/Construct/ComputeCon/ComputeConPI//Constr-comppi-namexml-4, EXPECTED_ERROR_GOT_RESULT
-Expressions/Construct/ComputeCon/ComputeConPI//Constr-comppi-name-1, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/Construct/ComputeCon/ComputeConPI//Constr-comppi-name-2, EXPECTED_ERROR_GOT_SAME_ERROR
Expressions/Construct/ComputeCon/ComputeConPI//Constr-comppi-parent-1, EXPECTED_RESULT_GOT_ERROR
Expressions/Construct/ComputeCon/ComputeConPI//Constr-comppi-space-1, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Expressions/Construct/ComputeCon/ComputeConPI//Constr-comppi-space-2, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
@@ -804,14 +804,6 @@ Expressions/Construct/ComputeCon/ConText//Constr-text-nested-3, EXPECTED_RESULT_
Expressions/Construct/ComputeCon/ConText//Constr-text-parent-1, EXPECTED_RESULT_GOT_ERROR
Expressions/Construct/ComputeCon/ConText//Constr-text-string-1, EXPECTED_RESULT_GOT_ERROR
Expressions/Construct/ConInScopeNamespace//Constr-inscope-1, EXPECTED_RESULT_GOT_FAILURE
-Expressions/Construct/ConInScopeNamespace//Constr-inscope-2, EXPECTED_RESULT_GOT_FAILURE
-Expressions/Construct/ConInScopeNamespace//Constr-inscope-3, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/Construct/ConInScopeNamespace//Constr-inscope-4, EXPECTED_RESULT_GOT_FAILURE
-Expressions/Construct/ConInScopeNamespace//Constr-inscope-5, EXPECTED_RESULT_GOT_FAILURE
-Expressions/Construct/ConInScopeNamespace//Constr-inscope-6, EXPECTED_RESULT_GOT_FAILURE
-Expressions/Construct/ConInScopeNamespace//Constr-inscope-7, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/Construct/ConInScopeNamespace//Constr-inscope-8, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/Construct/ConInScopeNamespace//Constr-inscope-9, EXPECTED_RESULT_GOT_FAILURE
Expressions/Construct/ConInScopeNamespace//Constr-inscope-10, EXPECTED_RESULT_GOT_FAILURE
Expressions/Construct/ConInScopeNamespace//Constr-inscope-11, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Expressions/Construct/ConInScopeNamespace//Constr-inscope-12, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
@@ -822,7 +814,28 @@ Expressions/Construct/ConInScopeNamespace//Constr-inscope-16, EXPECTED_RESULT_GO
Expressions/Construct/ConInScopeNamespace//Constr-inscope-17, EXPECTED_RESULT_GOT_FAILURE
Expressions/Construct/ConInScopeNamespace//Constr-inscope-18, EXPECTED_RESULT_GOT_FAILURE
Expressions/Construct/ConInScopeNamespace//Constr-inscope-19, EXPECTED_RESULT_GOT_FAILURE
+Expressions/Construct/ConInScopeNamespace//Constr-inscope-2, EXPECTED_RESULT_GOT_FAILURE
Expressions/Construct/ConInScopeNamespace//Constr-inscope-20, EXPECTED_RESULT_GOT_FAILURE
+Expressions/Construct/ConInScopeNamespace//Constr-inscope-3, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+Expressions/Construct/ConInScopeNamespace//Constr-inscope-4, EXPECTED_RESULT_GOT_FAILURE
+Expressions/Construct/ConInScopeNamespace//Constr-inscope-5, EXPECTED_RESULT_GOT_FAILURE
+Expressions/Construct/ConInScopeNamespace//Constr-inscope-6, EXPECTED_RESULT_GOT_FAILURE
+Expressions/Construct/ConInScopeNamespace//Constr-inscope-7, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+Expressions/Construct/ConInScopeNamespace//Constr-inscope-8, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+Expressions/Construct/ConInScopeNamespace//Constr-inscope-9, EXPECTED_RESULT_GOT_FAILURE
+Expressions/Construct/DirectConElem//Constr-elem-curlybr-1, EXPECTED_RESULT_GOT_SAME_RESULT
+Expressions/Construct/DirectConElem//Constr-elem-curlybr-2, EXPECTED_RESULT_GOT_SAME_RESULT
+Expressions/Construct/DirectConElem//Constr-elem-curlybr-3, EXPECTED_RESULT_GOT_SAME_RESULT
+Expressions/Construct/DirectConElem//Constr-elem-curlybr-4, EXPECTED_RESULT_GOT_SAME_RESULT
+Expressions/Construct/DirectConElem//Constr-elem-curlybr-5, EXPECTED_ERROR_GOT_SAME_ERROR
+Expressions/Construct/DirectConElem//Constr-elem-curlybr-6, EXPECTED_ERROR_GOT_SAME_ERROR
+Expressions/Construct/DirectConElem//Constr-elem-empty-1, EXPECTED_RESULT_GOT_SAME_RESULT
+Expressions/Construct/DirectConElem//Constr-elem-empty-2, EXPECTED_RESULT_GOT_SAME_RESULT
+Expressions/Construct/DirectConElem//Constr-elem-empty-3, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+Expressions/Construct/DirectConElem//Constr-elem-empty-4, EXPECTED_ERROR_GOT_RESULT
+Expressions/Construct/DirectConElem//Constr-elem-empty-5, EXPECTED_RESULT_GOT_SAME_RESULT
+Expressions/Construct/DirectConElem//Constr-elem-matchtag-1, EXPECTED_ERROR_GOT_SAME_ERROR
+Expressions/Construct/DirectConElem//Constr-elem-matchtag-2, EXPECTED_ERROR_GOT_SAME_ERROR
Expressions/Construct/DirectConElem/DirectConElemAttr//Constr-attr-charref-1, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Construct/DirectConElem/DirectConElemAttr//Constr-attr-content-1, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Construct/DirectConElem/DirectConElemAttr//Constr-attr-content-2, EXPECTED_ERROR_GOT_SAME_ERROR
@@ -847,12 +860,13 @@ Expressions/Construct/DirectConElem/DirectConElemAttr//Constr-attr-id-1, EXPECTE
Expressions/Construct/DirectConElem/DirectConElemAttr//Constr-attr-id-2, EXPECTED_ERROR_GOT_RESULT
Expressions/Construct/DirectConElem/DirectConElemAttr//Constr-attr-nsdecl-1, EXPECTED_RESULT_GOT_FAILURE
Expressions/Construct/DirectConElem/DirectConElemAttr//Constr-attr-nsdecl-2, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/Construct/DirectConElem/DirectConElemAttr//Constr-attr-nsprein-1, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/Construct/DirectConElem/DirectConElemAttr//Constr-attr-nsprein-2, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Expressions/Construct/DirectConElem/DirectConElemAttr//Constr-attr-nspre-1, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Expressions/Construct/DirectConElem/DirectConElemAttr//Constr-attr-nspre-2, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+Expressions/Construct/DirectConElem/DirectConElemAttr//Constr-attr-nsprein-1, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+Expressions/Construct/DirectConElem/DirectConElemAttr//Constr-attr-nsprein-2, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Expressions/Construct/DirectConElem/DirectConElemAttr//Constr-attr-parent-1, EXPECTED_RESULT_GOT_ERROR
Expressions/Construct/DirectConElem/DirectConElemAttr//Constr-attr-syntax-1, EXPECTED_RESULT_GOT_SAME_RESULT
+Expressions/Construct/DirectConElem/DirectConElemAttr//Constr-attr-syntax-10, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Construct/DirectConElem/DirectConElemAttr//Constr-attr-syntax-2, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Construct/DirectConElem/DirectConElemAttr//Constr-attr-syntax-3, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Construct/DirectConElem/DirectConElemAttr//Constr-attr-syntax-4, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
@@ -861,7 +875,6 @@ Expressions/Construct/DirectConElem/DirectConElemAttr//Constr-attr-syntax-6, EXP
Expressions/Construct/DirectConElem/DirectConElemAttr//Constr-attr-syntax-7, EXPECTED_ERROR_GOT_SAME_ERROR
Expressions/Construct/DirectConElem/DirectConElemAttr//Constr-attr-syntax-8, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Construct/DirectConElem/DirectConElemAttr//Constr-attr-syntax-9, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/Construct/DirectConElem/DirectConElemAttr//Constr-attr-syntax-10, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Construct/DirectConElem/DirectConElemAttr//Constr-attr-ws-1, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Expressions/Construct/DirectConElem/DirectConElemAttr//Constr-attr-ws-2, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Expressions/Construct/DirectConElem/DirectConElemAttr//Constr-attr-ws-3, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
@@ -895,12 +908,12 @@ Expressions/Construct/DirectConElem/DirectConElemContent//Constr-cont-constrmod-
Expressions/Construct/DirectConElem/DirectConElemContent//Constr-cont-constrmod-7, EXPECTED_ERROR_GOT_FAILURE
Expressions/Construct/DirectConElem/DirectConElemContent//Constr-cont-constrmod-8, EXPECTED_ERROR_GOT_FAILURE
Expressions/Construct/DirectConElem/DirectConElemContent//Constr-cont-data-1, EXPECTED_RESULT_GOT_SAME_RESULT
+Expressions/Construct/DirectConElem/DirectConElemContent//Constr-cont-doc-1, EXPECTED_RESULT_GOT_FAILURE
Expressions/Construct/DirectConElem/DirectConElemContent//Constr-cont-document-1, EXPECTED_RESULT_GOT_ERROR
Expressions/Construct/DirectConElem/DirectConElemContent//Constr-cont-document-2, EXPECTED_RESULT_GOT_ERROR
Expressions/Construct/DirectConElem/DirectConElemContent//Constr-cont-document-3, EXPECTED_RESULT_GOT_FAILURE
Expressions/Construct/DirectConElem/DirectConElemContent//Constr-cont-document-4, EXPECTED_RESULT_GOT_ERROR
Expressions/Construct/DirectConElem/DirectConElemContent//Constr-cont-document-5, EXPECTED_RESULT_GOT_ERROR
-Expressions/Construct/DirectConElem/DirectConElemContent//Constr-cont-doc-1, EXPECTED_RESULT_GOT_FAILURE
Expressions/Construct/DirectConElem/DirectConElemContent//Constr-cont-enclexpr-1, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Construct/DirectConElem/DirectConElemContent//Constr-cont-enclexpr-2, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Expressions/Construct/DirectConElem/DirectConElemContent//Constr-cont-enclexpr-3, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
@@ -930,6 +943,8 @@ Expressions/Construct/DirectConElem/DirectConElemContent//Constr-cont-nodeid-3,
Expressions/Construct/DirectConElem/DirectConElemContent//Constr-cont-nodeid-4, EXPECTED_RESULT_GOT_ERROR
Expressions/Construct/DirectConElem/DirectConElemContent//Constr-cont-nodeid-5, EXPECTED_RESULT_GOT_ERROR
Expressions/Construct/DirectConElem/DirectConElemContent//Constr-cont-nsmode-1, EXPECTED_RESULT_GOT_FAILURE
+Expressions/Construct/DirectConElem/DirectConElemContent//Constr-cont-nsmode-10, EXPECTED_ERROR_GOT_FAILURE
+Expressions/Construct/DirectConElem/DirectConElemContent//Constr-cont-nsmode-11, EXPECTED_RESULT_GOT_ERROR
Expressions/Construct/DirectConElem/DirectConElemContent//Constr-cont-nsmode-2, EXPECTED_RESULT_GOT_FAILURE
Expressions/Construct/DirectConElem/DirectConElemContent//Constr-cont-nsmode-3, EXPECTED_RESULT_GOT_FAILURE
Expressions/Construct/DirectConElem/DirectConElemContent//Constr-cont-nsmode-4, EXPECTED_RESULT_GOT_FAILURE
@@ -938,22 +953,12 @@ Expressions/Construct/DirectConElem/DirectConElemContent//Constr-cont-nsmode-6,
Expressions/Construct/DirectConElem/DirectConElemContent//Constr-cont-nsmode-7, EXPECTED_ERROR_GOT_FAILURE
Expressions/Construct/DirectConElem/DirectConElemContent//Constr-cont-nsmode-8, EXPECTED_ERROR_GOT_FAILURE
Expressions/Construct/DirectConElem/DirectConElemContent//Constr-cont-nsmode-9, EXPECTED_RESULT_GOT_FAILURE
-Expressions/Construct/DirectConElem/DirectConElemContent//Constr-cont-nsmode-10, EXPECTED_ERROR_GOT_FAILURE
-Expressions/Construct/DirectConElem/DirectConElemContent//Constr-cont-nsmode-11, EXPECTED_RESULT_GOT_ERROR
Expressions/Construct/DirectConElem/DirectConElemContent//Constr-cont-parent-1, EXPECTED_RESULT_GOT_ERROR
Expressions/Construct/DirectConElem/DirectConElemContent//Constr-cont-string-1, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Construct/DirectConElem/DirectConElemContent//Constr-cont-text-1, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Construct/DirectConElem/DirectConElemContent//Constr-cont-text-2, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Construct/DirectConElem/DirectConElemContent//Constr-cont-uripres-1, EXPECTED_RESULT_GOT_ERROR
Expressions/Construct/DirectConElem/DirectConElemNamespace//Constr-namespace-1, EXPECTED_ERROR_GOT_SAME_ERROR
-Expressions/Construct/DirectConElem/DirectConElemNamespace//Constr-namespace-2, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/Construct/DirectConElem/DirectConElemNamespace//Constr-namespace-3, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/Construct/DirectConElem/DirectConElemNamespace//Constr-namespace-4, EXPECTED_ERROR_GOT_RESULT
-Expressions/Construct/DirectConElem/DirectConElemNamespace//Constr-namespace-5, EXPECTED_ERROR_GOT_RESULT
-Expressions/Construct/DirectConElem/DirectConElemNamespace//Constr-namespace-6, EXPECTED_ERROR_GOT_RESULT
-Expressions/Construct/DirectConElem/DirectConElemNamespace//Constr-namespace-7, EXPECTED_ERROR_GOT_RESULT
-Expressions/Construct/DirectConElem/DirectConElemNamespace//Constr-namespace-8, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/Construct/DirectConElem/DirectConElemNamespace//Constr-namespace-9, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Expressions/Construct/DirectConElem/DirectConElemNamespace//Constr-namespace-10, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Expressions/Construct/DirectConElem/DirectConElemNamespace//Constr-namespace-11, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Expressions/Construct/DirectConElem/DirectConElemNamespace//Constr-namespace-12, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
@@ -964,6 +969,7 @@ Expressions/Construct/DirectConElem/DirectConElemNamespace//Constr-namespace-16,
Expressions/Construct/DirectConElem/DirectConElemNamespace//Constr-namespace-17, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Expressions/Construct/DirectConElem/DirectConElemNamespace//Constr-namespace-18, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Construct/DirectConElem/DirectConElemNamespace//Constr-namespace-19, EXPECTED_RESULT_GOT_SAME_RESULT
+Expressions/Construct/DirectConElem/DirectConElemNamespace//Constr-namespace-2, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Expressions/Construct/DirectConElem/DirectConElemNamespace//Constr-namespace-20, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Expressions/Construct/DirectConElem/DirectConElemNamespace//Constr-namespace-21, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Expressions/Construct/DirectConElem/DirectConElemNamespace//Constr-namespace-22, EXPECTED_RESULT_GOT_SAME_RESULT
@@ -973,6 +979,13 @@ Expressions/Construct/DirectConElem/DirectConElemNamespace//Constr-namespace-25,
Expressions/Construct/DirectConElem/DirectConElemNamespace//Constr-namespace-26, EXPECTED_RESULT_GOT_FAILURE
Expressions/Construct/DirectConElem/DirectConElemNamespace//Constr-namespace-27, EXPECTED_RESULT_GOT_FAILURE
Expressions/Construct/DirectConElem/DirectConElemNamespace//Constr-namespace-29, EXPECTED_ERROR_GOT_SAME_ERROR
+Expressions/Construct/DirectConElem/DirectConElemNamespace//Constr-namespace-3, EXPECTED_RESULT_GOT_SAME_RESULT
+Expressions/Construct/DirectConElem/DirectConElemNamespace//Constr-namespace-4, EXPECTED_ERROR_GOT_RESULT
+Expressions/Construct/DirectConElem/DirectConElemNamespace//Constr-namespace-5, EXPECTED_ERROR_GOT_RESULT
+Expressions/Construct/DirectConElem/DirectConElemNamespace//Constr-namespace-6, EXPECTED_ERROR_GOT_RESULT
+Expressions/Construct/DirectConElem/DirectConElemNamespace//Constr-namespace-7, EXPECTED_ERROR_GOT_RESULT
+Expressions/Construct/DirectConElem/DirectConElemNamespace//Constr-namespace-8, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+Expressions/Construct/DirectConElem/DirectConElemNamespace//Constr-namespace-9, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Expressions/Construct/DirectConElem/DirectConElemWhitespace//Constr-ws-adjcdata-1, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Construct/DirectConElem/DirectConElemWhitespace//Constr-ws-adjcdata-2, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Construct/DirectConElem/DirectConElemWhitespace//Constr-ws-adjcdata-3, EXPECTED_RESULT_GOT_SAME_RESULT
@@ -980,14 +993,6 @@ Expressions/Construct/DirectConElem/DirectConElemWhitespace//Constr-ws-adjchref-
Expressions/Construct/DirectConElem/DirectConElemWhitespace//Constr-ws-adjchref-2, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Construct/DirectConElem/DirectConElemWhitespace//Constr-ws-adjchref-3, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Construct/DirectConElem/DirectConElemWhitespace//Constr-ws-enclexpr-1, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/Construct/DirectConElem/DirectConElemWhitespace//Constr-ws-enclexpr-2, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/Construct/DirectConElem/DirectConElemWhitespace//Constr-ws-enclexpr-3, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/Construct/DirectConElem/DirectConElemWhitespace//Constr-ws-enclexpr-4, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/Construct/DirectConElem/DirectConElemWhitespace//Constr-ws-enclexpr-5, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/Construct/DirectConElem/DirectConElemWhitespace//Constr-ws-enclexpr-6, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/Construct/DirectConElem/DirectConElemWhitespace//Constr-ws-enclexpr-7, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/Construct/DirectConElem/DirectConElemWhitespace//Constr-ws-enclexpr-8, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/Construct/DirectConElem/DirectConElemWhitespace//Constr-ws-enclexpr-9, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Expressions/Construct/DirectConElem/DirectConElemWhitespace//Constr-ws-enclexpr-10, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Expressions/Construct/DirectConElem/DirectConElemWhitespace//Constr-ws-enclexpr-11, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Expressions/Construct/DirectConElem/DirectConElemWhitespace//Constr-ws-enclexpr-12, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
@@ -998,11 +1003,19 @@ Expressions/Construct/DirectConElem/DirectConElemWhitespace//Constr-ws-enclexpr-
Expressions/Construct/DirectConElem/DirectConElemWhitespace//Constr-ws-enclexpr-17, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Construct/DirectConElem/DirectConElemWhitespace//Constr-ws-enclexpr-18, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Construct/DirectConElem/DirectConElemWhitespace//Constr-ws-enclexpr-19, EXPECTED_RESULT_GOT_SAME_RESULT
+Expressions/Construct/DirectConElem/DirectConElemWhitespace//Constr-ws-enclexpr-2, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Expressions/Construct/DirectConElem/DirectConElemWhitespace//Constr-ws-enclexpr-20, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Construct/DirectConElem/DirectConElemWhitespace//Constr-ws-enclexpr-21, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Construct/DirectConElem/DirectConElemWhitespace//Constr-ws-enclexpr-22, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Construct/DirectConElem/DirectConElemWhitespace//Constr-ws-enclexpr-23, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Construct/DirectConElem/DirectConElemWhitespace//Constr-ws-enclexpr-24, EXPECTED_RESULT_GOT_SAME_RESULT
+Expressions/Construct/DirectConElem/DirectConElemWhitespace//Constr-ws-enclexpr-3, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+Expressions/Construct/DirectConElem/DirectConElemWhitespace//Constr-ws-enclexpr-4, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+Expressions/Construct/DirectConElem/DirectConElemWhitespace//Constr-ws-enclexpr-5, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+Expressions/Construct/DirectConElem/DirectConElemWhitespace//Constr-ws-enclexpr-6, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+Expressions/Construct/DirectConElem/DirectConElemWhitespace//Constr-ws-enclexpr-7, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+Expressions/Construct/DirectConElem/DirectConElemWhitespace//Constr-ws-enclexpr-8, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+Expressions/Construct/DirectConElem/DirectConElemWhitespace//Constr-ws-enclexpr-9, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Expressions/Construct/DirectConElem/DirectConElemWhitespace//Constr-ws-gencdata-1, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Construct/DirectConElem/DirectConElemWhitespace//Constr-ws-gencdata-3, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Construct/DirectConElem/DirectConElemWhitespace//Constr-ws-genchref-1, EXPECTED_RESULT_GOT_SAME_RESULT
@@ -1019,6 +1032,7 @@ Expressions/Construct/DirectConElem/DirectConElemWhitespace//Constr-ws-nobound-4
Expressions/Construct/DirectConElem/DirectConElemWhitespace//Constr-ws-nobound-5, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Construct/DirectConElem/DirectConElemWhitespace//Constr-ws-nobound-6, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Construct/DirectConElem/DirectConElemWhitespace//Constr-ws-tag-1, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+Expressions/Construct/DirectConElem/DirectConElemWhitespace//Constr-ws-tag-10, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Expressions/Construct/DirectConElem/DirectConElemWhitespace//Constr-ws-tag-2, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Expressions/Construct/DirectConElem/DirectConElemWhitespace//Constr-ws-tag-3, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Expressions/Construct/DirectConElem/DirectConElemWhitespace//Constr-ws-tag-4, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
@@ -1027,22 +1041,8 @@ Expressions/Construct/DirectConElem/DirectConElemWhitespace//Constr-ws-tag-6, EX
Expressions/Construct/DirectConElem/DirectConElemWhitespace//Constr-ws-tag-7, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Construct/DirectConElem/DirectConElemWhitespace//Constr-ws-tag-8, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Construct/DirectConElem/DirectConElemWhitespace//Constr-ws-tag-9, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/Construct/DirectConElem/DirectConElemWhitespace//Constr-ws-tag-10, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Expressions/Construct/DirectConElem/DirectConElemWhitespace//Constr-ws-xmlspace-1, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Expressions/Construct/DirectConElem/DirectConElemWhitespace//Constr-ws-xmlspace-2, EXPECTED_ERROR_GOT_RESULT
-Expressions/Construct/DirectConElem//Constr-elem-curlybr-1, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/Construct/DirectConElem//Constr-elem-curlybr-2, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/Construct/DirectConElem//Constr-elem-curlybr-3, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/Construct/DirectConElem//Constr-elem-curlybr-4, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/Construct/DirectConElem//Constr-elem-curlybr-5, EXPECTED_ERROR_GOT_SAME_ERROR
-Expressions/Construct/DirectConElem//Constr-elem-curlybr-6, EXPECTED_ERROR_GOT_SAME_ERROR
-Expressions/Construct/DirectConElem//Constr-elem-empty-1, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/Construct/DirectConElem//Constr-elem-empty-2, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/Construct/DirectConElem//Constr-elem-empty-3, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/Construct/DirectConElem//Constr-elem-empty-4, EXPECTED_ERROR_GOT_RESULT
-Expressions/Construct/DirectConElem//Constr-elem-empty-5, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/Construct/DirectConElem//Constr-elem-matchtag-1, EXPECTED_ERROR_GOT_SAME_ERROR
-Expressions/Construct/DirectConElem//Constr-elem-matchtag-2, EXPECTED_ERROR_GOT_SAME_ERROR
Expressions/Construct/DirectConOther//Constr-comment-1, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Construct/DirectConOther//Constr-comment-2, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Construct/DirectConOther//Constr-comment-3, EXPECTED_RESULT_GOT_SAME_RESULT
@@ -1064,14 +1064,6 @@ Expressions/Construct/DirectConOther//Constr-pi-target-2, EXPECTED_ERROR_GOT_SAM
Expressions/Construct/DirectConOther//Constr-pi-target-3, EXPECTED_ERROR_GOT_SAME_ERROR
Expressions/Construct/DirectConOther//Constr-pi-target-4, EXPECTED_ERROR_GOT_SAME_ERROR
Expressions/ContextExpr/ExternalContextExpr//externalcontextitem-1, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
-Expressions/ContextExpr/ExternalContextExpr//externalcontextitem-2, EXPECTED_RESULT_GOT_FAILURE
-Expressions/ContextExpr/ExternalContextExpr//externalcontextitem-3, EXPECTED_RESULT_GOT_FAILURE
-Expressions/ContextExpr/ExternalContextExpr//externalcontextitem-4, EXPECTED_RESULT_GOT_FAILURE
-Expressions/ContextExpr/ExternalContextExpr//externalcontextitem-5, EXPECTED_RESULT_GOT_FAILURE
-Expressions/ContextExpr/ExternalContextExpr//externalcontextitem-6, EXPECTED_RESULT_GOT_FAILURE
-Expressions/ContextExpr/ExternalContextExpr//externalcontextitem-7, EXPECTED_RESULT_GOT_FAILURE
-Expressions/ContextExpr/ExternalContextExpr//externalcontextitem-8, EXPECTED_RESULT_GOT_FAILURE
-Expressions/ContextExpr/ExternalContextExpr//externalcontextitem-9, EXPECTED_RESULT_GOT_FAILURE
Expressions/ContextExpr/ExternalContextExpr//externalcontextitem-10, EXPECTED_RESULT_GOT_FAILURE
Expressions/ContextExpr/ExternalContextExpr//externalcontextitem-11, EXPECTED_RESULT_GOT_FAILURE
Expressions/ContextExpr/ExternalContextExpr//externalcontextitem-12, EXPECTED_RESULT_GOT_FAILURE
@@ -1082,20 +1074,20 @@ Expressions/ContextExpr/ExternalContextExpr//externalcontextitem-16, EXPECTED_RE
Expressions/ContextExpr/ExternalContextExpr//externalcontextitem-17, EXPECTED_RESULT_GOT_FAILURE
Expressions/ContextExpr/ExternalContextExpr//externalcontextitem-18, EXPECTED_RESULT_GOT_FAILURE
Expressions/ContextExpr/ExternalContextExpr//externalcontextitem-19, EXPECTED_RESULT_GOT_FAILURE
+Expressions/ContextExpr/ExternalContextExpr//externalcontextitem-2, EXPECTED_RESULT_GOT_FAILURE
Expressions/ContextExpr/ExternalContextExpr//externalcontextitem-20, EXPECTED_RESULT_GOT_FAILURE
Expressions/ContextExpr/ExternalContextExpr//externalcontextitem-21, EXPECTED_RESULT_GOT_FAILURE
Expressions/ContextExpr/ExternalContextExpr//externalcontextitem-22, EXPECTED_RESULT_GOT_FAILURE
Expressions/ContextExpr/ExternalContextExpr//externalcontextitem-23, EXPECTED_ERROR_GOT_FAILURE
Expressions/ContextExpr/ExternalContextExpr//externalcontextitem-24, EXPECTED_RESULT_GOT_FAILURE
+Expressions/ContextExpr/ExternalContextExpr//externalcontextitem-3, EXPECTED_RESULT_GOT_FAILURE
+Expressions/ContextExpr/ExternalContextExpr//externalcontextitem-4, EXPECTED_RESULT_GOT_FAILURE
+Expressions/ContextExpr/ExternalContextExpr//externalcontextitem-5, EXPECTED_RESULT_GOT_FAILURE
+Expressions/ContextExpr/ExternalContextExpr//externalcontextitem-6, EXPECTED_RESULT_GOT_FAILURE
+Expressions/ContextExpr/ExternalContextExpr//externalcontextitem-7, EXPECTED_RESULT_GOT_FAILURE
+Expressions/ContextExpr/ExternalContextExpr//externalcontextitem-8, EXPECTED_RESULT_GOT_FAILURE
+Expressions/ContextExpr/ExternalContextExpr//externalcontextitem-9, EXPECTED_RESULT_GOT_FAILURE
Expressions/ContextExpr/InternalContextExpr//internalcontextitem-1, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
-Expressions/ContextExpr/InternalContextExpr//internalcontextitem-2, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/ContextExpr/InternalContextExpr//internalco
<TRUNCATED>
[18/50] [abbrv] vxquery git commit: VXQUERY-181 - Move to Hyracks
0.2.16
Posted by sj...@apache.org.
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/aggregate/AvgGlobalAggregateEvaluatorFactory.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/aggregate/AvgGlobalAggregateEvaluatorFactory.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/aggregate/AvgGlobalAggregateEvaluatorFactory.java
index 00756bf..828efd4 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/aggregate/AvgGlobalAggregateEvaluatorFactory.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/aggregate/AvgGlobalAggregateEvaluatorFactory.java
@@ -30,13 +30,13 @@ import org.apache.vxquery.runtime.functions.base.AbstractTaggedValueArgumentAggr
import org.apache.vxquery.runtime.functions.base.AbstractTaggedValueArgumentAggregateEvaluatorFactory;
import org.apache.vxquery.runtime.functions.util.ArithmeticHelper;
-import edu.uci.ics.hyracks.algebricks.common.exceptions.AlgebricksException;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IAggregateEvaluator;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluator;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
-import edu.uci.ics.hyracks.data.std.api.IPointable;
-import edu.uci.ics.hyracks.data.std.primitive.LongPointable;
-import edu.uci.ics.hyracks.data.std.util.ArrayBackedValueStorage;
+import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
+import org.apache.hyracks.algebricks.runtime.base.IAggregateEvaluator;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluator;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
+import org.apache.hyracks.data.std.api.IPointable;
+import org.apache.hyracks.data.std.primitive.LongPointable;
+import org.apache.hyracks.data.std.util.ArrayBackedValueStorage;
public class AvgGlobalAggregateEvaluatorFactory extends AbstractTaggedValueArgumentAggregateEvaluatorFactory {
private static final long serialVersionUID = 1L;
@@ -122,4 +122,4 @@ public class AvgGlobalAggregateEvaluatorFactory extends AbstractTaggedValueArgum
}
};
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/aggregate/AvgLocalAggregateEvaluatorFactory.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/aggregate/AvgLocalAggregateEvaluatorFactory.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/aggregate/AvgLocalAggregateEvaluatorFactory.java
index 010b96f..db2aa57 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/aggregate/AvgLocalAggregateEvaluatorFactory.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/aggregate/AvgLocalAggregateEvaluatorFactory.java
@@ -28,12 +28,12 @@ import org.apache.vxquery.runtime.functions.base.AbstractTaggedValueArgumentAggr
import org.apache.vxquery.runtime.functions.base.AbstractTaggedValueArgumentAggregateEvaluatorFactory;
import org.apache.vxquery.runtime.functions.util.ArithmeticHelper;
-import edu.uci.ics.hyracks.algebricks.common.exceptions.AlgebricksException;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IAggregateEvaluator;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluator;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
-import edu.uci.ics.hyracks.data.std.api.IPointable;
-import edu.uci.ics.hyracks.data.std.util.ArrayBackedValueStorage;
+import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
+import org.apache.hyracks.algebricks.runtime.base.IAggregateEvaluator;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluator;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
+import org.apache.hyracks.data.std.api.IPointable;
+import org.apache.hyracks.data.std.util.ArrayBackedValueStorage;
public class AvgLocalAggregateEvaluatorFactory extends AbstractTaggedValueArgumentAggregateEvaluatorFactory {
private static final long serialVersionUID = 1L;
@@ -109,4 +109,4 @@ public class AvgLocalAggregateEvaluatorFactory extends AbstractTaggedValueArgume
}
};
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/aggregate/FnAvgAggregateEvaluatorFactory.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/aggregate/FnAvgAggregateEvaluatorFactory.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/aggregate/FnAvgAggregateEvaluatorFactory.java
index 6489fe3..09a611f 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/aggregate/FnAvgAggregateEvaluatorFactory.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/aggregate/FnAvgAggregateEvaluatorFactory.java
@@ -30,12 +30,12 @@ import org.apache.vxquery.runtime.functions.base.AbstractTaggedValueArgumentAggr
import org.apache.vxquery.runtime.functions.base.AbstractTaggedValueArgumentAggregateEvaluatorFactory;
import org.apache.vxquery.runtime.functions.util.ArithmeticHelper;
-import edu.uci.ics.hyracks.algebricks.common.exceptions.AlgebricksException;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IAggregateEvaluator;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluator;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
-import edu.uci.ics.hyracks.data.std.api.IPointable;
-import edu.uci.ics.hyracks.data.std.util.ArrayBackedValueStorage;
+import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
+import org.apache.hyracks.algebricks.runtime.base.IAggregateEvaluator;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluator;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
+import org.apache.hyracks.data.std.api.IPointable;
+import org.apache.hyracks.data.std.util.ArrayBackedValueStorage;
public class FnAvgAggregateEvaluatorFactory extends AbstractTaggedValueArgumentAggregateEvaluatorFactory {
private static final long serialVersionUID = 1L;
@@ -109,4 +109,4 @@ public class FnAvgAggregateEvaluatorFactory extends AbstractTaggedValueArgumentA
}
};
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/aggregate/FnAvgScalarEvaluatorFactory.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/aggregate/FnAvgScalarEvaluatorFactory.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/aggregate/FnAvgScalarEvaluatorFactory.java
index daa7715..9a511cd 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/aggregate/FnAvgScalarEvaluatorFactory.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/aggregate/FnAvgScalarEvaluatorFactory.java
@@ -31,12 +31,12 @@ import org.apache.vxquery.runtime.functions.base.AbstractTaggedValueArgumentScal
import org.apache.vxquery.runtime.functions.base.AbstractTaggedValueArgumentScalarEvaluatorFactory;
import org.apache.vxquery.runtime.functions.util.ArithmeticHelper;
-import edu.uci.ics.hyracks.algebricks.common.exceptions.AlgebricksException;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluator;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
-import edu.uci.ics.hyracks.api.context.IHyracksTaskContext;
-import edu.uci.ics.hyracks.data.std.api.IPointable;
-import edu.uci.ics.hyracks.data.std.util.ArrayBackedValueStorage;
+import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluator;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
+import org.apache.hyracks.api.context.IHyracksTaskContext;
+import org.apache.hyracks.data.std.api.IPointable;
+import org.apache.hyracks.data.std.util.ArrayBackedValueStorage;
public class FnAvgScalarEvaluatorFactory extends AbstractTaggedValueArgumentScalarEvaluatorFactory {
private static final long serialVersionUID = 1L;
@@ -101,4 +101,4 @@ public class FnAvgScalarEvaluatorFactory extends AbstractTaggedValueArgumentScal
}
};
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/aggregate/FnCountAggregateEvaluatorFactory.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/aggregate/FnCountAggregateEvaluatorFactory.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/aggregate/FnCountAggregateEvaluatorFactory.java
index fbde38c..8c55630 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/aggregate/FnCountAggregateEvaluatorFactory.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/aggregate/FnCountAggregateEvaluatorFactory.java
@@ -24,12 +24,12 @@ import org.apache.vxquery.exceptions.SystemException;
import org.apache.vxquery.runtime.functions.base.AbstractTaggedValueArgumentAggregateEvaluator;
import org.apache.vxquery.runtime.functions.base.AbstractTaggedValueArgumentAggregateEvaluatorFactory;
-import edu.uci.ics.hyracks.algebricks.common.exceptions.AlgebricksException;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IAggregateEvaluator;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluator;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
-import edu.uci.ics.hyracks.data.std.api.IPointable;
-import edu.uci.ics.hyracks.data.std.util.ArrayBackedValueStorage;
+import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
+import org.apache.hyracks.algebricks.runtime.base.IAggregateEvaluator;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluator;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
+import org.apache.hyracks.data.std.api.IPointable;
+import org.apache.hyracks.data.std.util.ArrayBackedValueStorage;
public class FnCountAggregateEvaluatorFactory extends AbstractTaggedValueArgumentAggregateEvaluatorFactory {
private static final long serialVersionUID = 1L;
@@ -74,4 +74,4 @@ public class FnCountAggregateEvaluatorFactory extends AbstractTaggedValueArgumen
};
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/aggregate/FnCountScalarEvaluatorFactory.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/aggregate/FnCountScalarEvaluatorFactory.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/aggregate/FnCountScalarEvaluatorFactory.java
index c96ea6e..0912f29 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/aggregate/FnCountScalarEvaluatorFactory.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/aggregate/FnCountScalarEvaluatorFactory.java
@@ -26,12 +26,12 @@ import org.apache.vxquery.exceptions.SystemException;
import org.apache.vxquery.runtime.functions.base.AbstractTaggedValueArgumentScalarEvaluator;
import org.apache.vxquery.runtime.functions.base.AbstractTaggedValueArgumentScalarEvaluatorFactory;
-import edu.uci.ics.hyracks.algebricks.common.exceptions.AlgebricksException;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluator;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
-import edu.uci.ics.hyracks.api.context.IHyracksTaskContext;
-import edu.uci.ics.hyracks.data.std.api.IPointable;
-import edu.uci.ics.hyracks.data.std.util.ArrayBackedValueStorage;
+import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluator;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
+import org.apache.hyracks.api.context.IHyracksTaskContext;
+import org.apache.hyracks.data.std.api.IPointable;
+import org.apache.hyracks.data.std.util.ArrayBackedValueStorage;
public class FnCountScalarEvaluatorFactory extends AbstractTaggedValueArgumentScalarEvaluatorFactory {
private static final long serialVersionUID = 1L;
@@ -69,4 +69,4 @@ public class FnCountScalarEvaluatorFactory extends AbstractTaggedValueArgumentSc
}
};
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/aggregate/FnMaxAggregateEvaluatorFactory.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/aggregate/FnMaxAggregateEvaluatorFactory.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/aggregate/FnMaxAggregateEvaluatorFactory.java
index b4af077..4a4d0bc 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/aggregate/FnMaxAggregateEvaluatorFactory.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/aggregate/FnMaxAggregateEvaluatorFactory.java
@@ -19,7 +19,7 @@ package org.apache.vxquery.runtime.functions.aggregate;
import org.apache.vxquery.runtime.functions.comparison.AbstractValueComparisonOperation;
import org.apache.vxquery.runtime.functions.comparison.ValueGtComparisonOperation;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
public class FnMaxAggregateEvaluatorFactory extends AbstractMaxMinAggregateEvaluatorFactory {
private static final long serialVersionUID = 1L;
@@ -33,4 +33,4 @@ public class FnMaxAggregateEvaluatorFactory extends AbstractMaxMinAggregateEvalu
return new ValueGtComparisonOperation();
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/aggregate/FnMaxScalarEvaluatorFactory.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/aggregate/FnMaxScalarEvaluatorFactory.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/aggregate/FnMaxScalarEvaluatorFactory.java
index 5f7dd54..83966ec 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/aggregate/FnMaxScalarEvaluatorFactory.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/aggregate/FnMaxScalarEvaluatorFactory.java
@@ -19,7 +19,7 @@ package org.apache.vxquery.runtime.functions.aggregate;
import org.apache.vxquery.runtime.functions.comparison.AbstractValueComparisonOperation;
import org.apache.vxquery.runtime.functions.comparison.ValueGtComparisonOperation;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
public class FnMaxScalarEvaluatorFactory extends AbstractMaxMinScalarEvaluatorFactory {
private static final long serialVersionUID = 1L;
@@ -33,4 +33,4 @@ public class FnMaxScalarEvaluatorFactory extends AbstractMaxMinScalarEvaluatorFa
return new ValueGtComparisonOperation();
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/aggregate/FnMinAggregateEvaluatorFactory.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/aggregate/FnMinAggregateEvaluatorFactory.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/aggregate/FnMinAggregateEvaluatorFactory.java
index 06557b2..32fa553 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/aggregate/FnMinAggregateEvaluatorFactory.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/aggregate/FnMinAggregateEvaluatorFactory.java
@@ -19,7 +19,7 @@ package org.apache.vxquery.runtime.functions.aggregate;
import org.apache.vxquery.runtime.functions.comparison.AbstractValueComparisonOperation;
import org.apache.vxquery.runtime.functions.comparison.ValueLtComparisonOperation;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
public class FnMinAggregateEvaluatorFactory extends AbstractMaxMinAggregateEvaluatorFactory {
private static final long serialVersionUID = 1L;
@@ -33,4 +33,4 @@ public class FnMinAggregateEvaluatorFactory extends AbstractMaxMinAggregateEvalu
return new ValueLtComparisonOperation();
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/aggregate/FnMinScalarEvaluatorFactory.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/aggregate/FnMinScalarEvaluatorFactory.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/aggregate/FnMinScalarEvaluatorFactory.java
index 1ff6e4b..90368db 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/aggregate/FnMinScalarEvaluatorFactory.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/aggregate/FnMinScalarEvaluatorFactory.java
@@ -19,7 +19,7 @@ package org.apache.vxquery.runtime.functions.aggregate;
import org.apache.vxquery.runtime.functions.comparison.AbstractValueComparisonOperation;
import org.apache.vxquery.runtime.functions.comparison.ValueLtComparisonOperation;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
public class FnMinScalarEvaluatorFactory extends AbstractMaxMinScalarEvaluatorFactory {
private static final long serialVersionUID = 1L;
@@ -33,4 +33,4 @@ public class FnMinScalarEvaluatorFactory extends AbstractMaxMinScalarEvaluatorFa
return new ValueLtComparisonOperation();
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/aggregate/FnSumAggregateEvaluatorFactory.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/aggregate/FnSumAggregateEvaluatorFactory.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/aggregate/FnSumAggregateEvaluatorFactory.java
index 6e96fe7..b4fdcdc 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/aggregate/FnSumAggregateEvaluatorFactory.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/aggregate/FnSumAggregateEvaluatorFactory.java
@@ -27,12 +27,12 @@ import org.apache.vxquery.runtime.functions.base.AbstractTaggedValueArgumentAggr
import org.apache.vxquery.runtime.functions.base.AbstractTaggedValueArgumentAggregateEvaluatorFactory;
import org.apache.vxquery.runtime.functions.util.ArithmeticHelper;
-import edu.uci.ics.hyracks.algebricks.common.exceptions.AlgebricksException;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IAggregateEvaluator;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluator;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
-import edu.uci.ics.hyracks.data.std.api.IPointable;
-import edu.uci.ics.hyracks.data.std.util.ArrayBackedValueStorage;
+import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
+import org.apache.hyracks.algebricks.runtime.base.IAggregateEvaluator;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluator;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
+import org.apache.hyracks.data.std.api.IPointable;
+import org.apache.hyracks.data.std.util.ArrayBackedValueStorage;
public class FnSumAggregateEvaluatorFactory extends AbstractTaggedValueArgumentAggregateEvaluatorFactory {
private static final long serialVersionUID = 1L;
@@ -82,4 +82,4 @@ public class FnSumAggregateEvaluatorFactory extends AbstractTaggedValueArgumentA
}
};
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/aggregate/FnSumScalarEvaluatorFactory.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/aggregate/FnSumScalarEvaluatorFactory.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/aggregate/FnSumScalarEvaluatorFactory.java
index 2088e1f..635fa8a 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/aggregate/FnSumScalarEvaluatorFactory.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/aggregate/FnSumScalarEvaluatorFactory.java
@@ -29,13 +29,13 @@ import org.apache.vxquery.runtime.functions.base.AbstractTaggedValueArgumentScal
import org.apache.vxquery.runtime.functions.base.AbstractTaggedValueArgumentScalarEvaluatorFactory;
import org.apache.vxquery.runtime.functions.util.ArithmeticHelper;
-import edu.uci.ics.hyracks.algebricks.common.exceptions.AlgebricksException;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluator;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
-import edu.uci.ics.hyracks.api.context.IHyracksTaskContext;
-import edu.uci.ics.hyracks.data.std.api.IPointable;
-import edu.uci.ics.hyracks.data.std.primitive.VoidPointable;
-import edu.uci.ics.hyracks.data.std.util.ArrayBackedValueStorage;
+import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluator;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
+import org.apache.hyracks.api.context.IHyracksTaskContext;
+import org.apache.hyracks.data.std.api.IPointable;
+import org.apache.hyracks.data.std.primitive.VoidPointable;
+import org.apache.hyracks.data.std.util.ArrayBackedValueStorage;
public class FnSumScalarEvaluatorFactory extends AbstractTaggedValueArgumentScalarEvaluatorFactory {
private static final long serialVersionUID = 1L;
@@ -101,4 +101,4 @@ public class FnSumScalarEvaluatorFactory extends AbstractTaggedValueArgumentScal
}
};
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/arithmetic/AbstractArithmeticOperation.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/arithmetic/AbstractArithmeticOperation.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/arithmetic/AbstractArithmeticOperation.java
index 51539d9..db4099b 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/arithmetic/AbstractArithmeticOperation.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/arithmetic/AbstractArithmeticOperation.java
@@ -26,10 +26,10 @@ import org.apache.vxquery.datamodel.accessors.atomic.XSDecimalPointable;
import org.apache.vxquery.datamodel.accessors.atomic.XSTimePointable;
import org.apache.vxquery.exceptions.SystemException;
-import edu.uci.ics.hyracks.data.std.primitive.DoublePointable;
-import edu.uci.ics.hyracks.data.std.primitive.FloatPointable;
-import edu.uci.ics.hyracks.data.std.primitive.IntegerPointable;
-import edu.uci.ics.hyracks.data.std.primitive.LongPointable;
+import org.apache.hyracks.data.std.primitive.DoublePointable;
+import org.apache.hyracks.data.std.primitive.FloatPointable;
+import org.apache.hyracks.data.std.primitive.IntegerPointable;
+import org.apache.hyracks.data.std.primitive.LongPointable;
public abstract class AbstractArithmeticOperation {
public abstract void operateDateDate(XSDatePointable datep1, XSDatePointable datep2, DynamicContext dCtx,
@@ -172,4 +172,4 @@ public abstract class AbstractArithmeticOperation {
public abstract void operateYMDurationYMDuration(IntegerPointable intp1, IntegerPointable intp2, DataOutput dOut)
throws SystemException, IOException;
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/arithmetic/AbstractArithmeticScalarEvaluatorFactory.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/arithmetic/AbstractArithmeticScalarEvaluatorFactory.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/arithmetic/AbstractArithmeticScalarEvaluatorFactory.java
index 90e1c4e..eb253a6 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/arithmetic/AbstractArithmeticScalarEvaluatorFactory.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/arithmetic/AbstractArithmeticScalarEvaluatorFactory.java
@@ -26,11 +26,11 @@ import org.apache.vxquery.runtime.functions.base.AbstractTaggedValueArgumentScal
import org.apache.vxquery.runtime.functions.base.AbstractTaggedValueArgumentScalarEvaluatorFactory;
import org.apache.vxquery.runtime.functions.util.ArithmeticHelper;
-import edu.uci.ics.hyracks.algebricks.common.exceptions.AlgebricksException;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluator;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
-import edu.uci.ics.hyracks.api.context.IHyracksTaskContext;
-import edu.uci.ics.hyracks.data.std.api.IPointable;
+import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluator;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
+import org.apache.hyracks.api.context.IHyracksTaskContext;
+import org.apache.hyracks.data.std.api.IPointable;
public abstract class AbstractArithmeticScalarEvaluatorFactory extends
AbstractTaggedValueArgumentScalarEvaluatorFactory {
@@ -74,4 +74,4 @@ public abstract class AbstractArithmeticScalarEvaluatorFactory extends
}
protected abstract AbstractArithmeticOperation createArithmeticOperation();
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/arithmetic/AddOperation.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/arithmetic/AddOperation.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/arithmetic/AddOperation.java
index b5fdd67..d6d3b7e 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/arithmetic/AddOperation.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/arithmetic/AddOperation.java
@@ -29,11 +29,11 @@ import org.apache.vxquery.datamodel.values.ValueTag;
import org.apache.vxquery.exceptions.ErrorCode;
import org.apache.vxquery.exceptions.SystemException;
-import edu.uci.ics.hyracks.data.std.primitive.DoublePointable;
-import edu.uci.ics.hyracks.data.std.primitive.FloatPointable;
-import edu.uci.ics.hyracks.data.std.primitive.IntegerPointable;
-import edu.uci.ics.hyracks.data.std.primitive.LongPointable;
-import edu.uci.ics.hyracks.data.std.util.ArrayBackedValueStorage;
+import org.apache.hyracks.data.std.primitive.DoublePointable;
+import org.apache.hyracks.data.std.primitive.FloatPointable;
+import org.apache.hyracks.data.std.primitive.IntegerPointable;
+import org.apache.hyracks.data.std.primitive.LongPointable;
+import org.apache.hyracks.data.std.util.ArrayBackedValueStorage;
public class AddOperation extends AbstractArithmeticOperation {
protected final ArrayBackedValueStorage abvsInner = new ArrayBackedValueStorage();
@@ -485,4 +485,4 @@ public class AddOperation extends AbstractArithmeticOperation {
decp2.setDecimal(value1, place1);
return decp2.longValue();
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/arithmetic/AddScalarEvaluatorFactory.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/arithmetic/AddScalarEvaluatorFactory.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/arithmetic/AddScalarEvaluatorFactory.java
index d701171..728bd71 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/arithmetic/AddScalarEvaluatorFactory.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/arithmetic/AddScalarEvaluatorFactory.java
@@ -16,7 +16,7 @@
*/
package org.apache.vxquery.runtime.functions.arithmetic;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
public class AddScalarEvaluatorFactory extends AbstractArithmeticScalarEvaluatorFactory {
private static final long serialVersionUID = 1L;
@@ -29,4 +29,4 @@ public class AddScalarEvaluatorFactory extends AbstractArithmeticScalarEvaluator
protected AbstractArithmeticOperation createArithmeticOperation() {
return new AddOperation();
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/arithmetic/DivideOperation.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/arithmetic/DivideOperation.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/arithmetic/DivideOperation.java
index f28c978..315c761 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/arithmetic/DivideOperation.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/arithmetic/DivideOperation.java
@@ -29,11 +29,11 @@ import org.apache.vxquery.exceptions.ErrorCode;
import org.apache.vxquery.exceptions.SystemException;
import org.apache.vxquery.runtime.functions.cast.CastToDecimalOperation;
-import edu.uci.ics.hyracks.data.std.primitive.DoublePointable;
-import edu.uci.ics.hyracks.data.std.primitive.FloatPointable;
-import edu.uci.ics.hyracks.data.std.primitive.IntegerPointable;
-import edu.uci.ics.hyracks.data.std.primitive.LongPointable;
-import edu.uci.ics.hyracks.data.std.util.ArrayBackedValueStorage;
+import org.apache.hyracks.data.std.primitive.DoublePointable;
+import org.apache.hyracks.data.std.primitive.FloatPointable;
+import org.apache.hyracks.data.std.primitive.IntegerPointable;
+import org.apache.hyracks.data.std.primitive.LongPointable;
+import org.apache.hyracks.data.std.util.ArrayBackedValueStorage;
public class DivideOperation extends AbstractArithmeticOperation {
protected final ArrayBackedValueStorage abvsInner = new ArrayBackedValueStorage();
@@ -499,4 +499,4 @@ public class DivideOperation extends AbstractArithmeticOperation {
return (int) value1;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/arithmetic/DivideScalarEvaluatorFactory.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/arithmetic/DivideScalarEvaluatorFactory.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/arithmetic/DivideScalarEvaluatorFactory.java
index 6caea85..df427ab 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/arithmetic/DivideScalarEvaluatorFactory.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/arithmetic/DivideScalarEvaluatorFactory.java
@@ -16,7 +16,7 @@
*/
package org.apache.vxquery.runtime.functions.arithmetic;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
public class DivideScalarEvaluatorFactory extends AbstractArithmeticScalarEvaluatorFactory {
private static final long serialVersionUID = 1L;
@@ -29,4 +29,4 @@ public class DivideScalarEvaluatorFactory extends AbstractArithmeticScalarEvalua
protected AbstractArithmeticOperation createArithmeticOperation() {
return new DivideOperation();
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/arithmetic/IntegerDivideOperation.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/arithmetic/IntegerDivideOperation.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/arithmetic/IntegerDivideOperation.java
index c9854f0..3253606 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/arithmetic/IntegerDivideOperation.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/arithmetic/IntegerDivideOperation.java
@@ -28,11 +28,11 @@ import org.apache.vxquery.datamodel.values.ValueTag;
import org.apache.vxquery.exceptions.ErrorCode;
import org.apache.vxquery.exceptions.SystemException;
-import edu.uci.ics.hyracks.data.std.primitive.DoublePointable;
-import edu.uci.ics.hyracks.data.std.primitive.FloatPointable;
-import edu.uci.ics.hyracks.data.std.primitive.IntegerPointable;
-import edu.uci.ics.hyracks.data.std.primitive.LongPointable;
-import edu.uci.ics.hyracks.data.std.util.ArrayBackedValueStorage;
+import org.apache.hyracks.data.std.primitive.DoublePointable;
+import org.apache.hyracks.data.std.primitive.FloatPointable;
+import org.apache.hyracks.data.std.primitive.IntegerPointable;
+import org.apache.hyracks.data.std.primitive.LongPointable;
+import org.apache.hyracks.data.std.util.ArrayBackedValueStorage;
public class IntegerDivideOperation extends AbstractArithmeticOperation {
protected final ArrayBackedValueStorage abvsInner = new ArrayBackedValueStorage();
@@ -457,4 +457,4 @@ public class IntegerDivideOperation extends AbstractArithmeticOperation {
throw new SystemException(ErrorCode.XPTY0004);
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/arithmetic/IntegerDivideScalarEvaluatorFactory.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/arithmetic/IntegerDivideScalarEvaluatorFactory.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/arithmetic/IntegerDivideScalarEvaluatorFactory.java
index 1920ce4..0ab2626 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/arithmetic/IntegerDivideScalarEvaluatorFactory.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/arithmetic/IntegerDivideScalarEvaluatorFactory.java
@@ -16,7 +16,7 @@
*/
package org.apache.vxquery.runtime.functions.arithmetic;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
public class IntegerDivideScalarEvaluatorFactory extends AbstractArithmeticScalarEvaluatorFactory {
private static final long serialVersionUID = 1L;
@@ -29,4 +29,4 @@ public class IntegerDivideScalarEvaluatorFactory extends AbstractArithmeticScala
protected AbstractArithmeticOperation createArithmeticOperation() {
return new IntegerDivideOperation();
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/arithmetic/ModOperation.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/arithmetic/ModOperation.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/arithmetic/ModOperation.java
index 4ff2476..577b659 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/arithmetic/ModOperation.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/arithmetic/ModOperation.java
@@ -28,11 +28,11 @@ import org.apache.vxquery.datamodel.values.ValueTag;
import org.apache.vxquery.exceptions.ErrorCode;
import org.apache.vxquery.exceptions.SystemException;
-import edu.uci.ics.hyracks.data.std.primitive.DoublePointable;
-import edu.uci.ics.hyracks.data.std.primitive.FloatPointable;
-import edu.uci.ics.hyracks.data.std.primitive.IntegerPointable;
-import edu.uci.ics.hyracks.data.std.primitive.LongPointable;
-import edu.uci.ics.hyracks.data.std.util.ArrayBackedValueStorage;
+import org.apache.hyracks.data.std.primitive.DoublePointable;
+import org.apache.hyracks.data.std.primitive.FloatPointable;
+import org.apache.hyracks.data.std.primitive.IntegerPointable;
+import org.apache.hyracks.data.std.primitive.LongPointable;
+import org.apache.hyracks.data.std.util.ArrayBackedValueStorage;
public class ModOperation extends AbstractArithmeticOperation {
protected final ArrayBackedValueStorage abvsInner = new ArrayBackedValueStorage();
@@ -393,4 +393,4 @@ public class ModOperation extends AbstractArithmeticOperation {
throw new SystemException(ErrorCode.XPTY0004);
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/arithmetic/ModScalarEvaluatorFactory.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/arithmetic/ModScalarEvaluatorFactory.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/arithmetic/ModScalarEvaluatorFactory.java
index 5e300ea..f5cdc13 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/arithmetic/ModScalarEvaluatorFactory.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/arithmetic/ModScalarEvaluatorFactory.java
@@ -16,7 +16,7 @@
*/
package org.apache.vxquery.runtime.functions.arithmetic;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
public class ModScalarEvaluatorFactory extends AbstractArithmeticScalarEvaluatorFactory {
private static final long serialVersionUID = 1L;
@@ -29,4 +29,4 @@ public class ModScalarEvaluatorFactory extends AbstractArithmeticScalarEvaluator
protected AbstractArithmeticOperation createArithmeticOperation() {
return new ModOperation();
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/arithmetic/MultiplyOperation.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/arithmetic/MultiplyOperation.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/arithmetic/MultiplyOperation.java
index 8be9077..d4704cb 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/arithmetic/MultiplyOperation.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/arithmetic/MultiplyOperation.java
@@ -28,11 +28,11 @@ import org.apache.vxquery.datamodel.values.ValueTag;
import org.apache.vxquery.exceptions.ErrorCode;
import org.apache.vxquery.exceptions.SystemException;
-import edu.uci.ics.hyracks.data.std.primitive.DoublePointable;
-import edu.uci.ics.hyracks.data.std.primitive.FloatPointable;
-import edu.uci.ics.hyracks.data.std.primitive.IntegerPointable;
-import edu.uci.ics.hyracks.data.std.primitive.LongPointable;
-import edu.uci.ics.hyracks.data.std.util.ArrayBackedValueStorage;
+import org.apache.hyracks.data.std.primitive.DoublePointable;
+import org.apache.hyracks.data.std.primitive.FloatPointable;
+import org.apache.hyracks.data.std.primitive.IntegerPointable;
+import org.apache.hyracks.data.std.primitive.LongPointable;
+import org.apache.hyracks.data.std.util.ArrayBackedValueStorage;
public class MultiplyOperation extends AbstractArithmeticOperation {
protected final ArrayBackedValueStorage abvsInner = new ArrayBackedValueStorage();
@@ -403,4 +403,4 @@ public class MultiplyOperation extends AbstractArithmeticOperation {
return decp1.longValue();
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/arithmetic/MultiplyScalarEvaluatorFactory.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/arithmetic/MultiplyScalarEvaluatorFactory.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/arithmetic/MultiplyScalarEvaluatorFactory.java
index 20e2f57..fb5abb9 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/arithmetic/MultiplyScalarEvaluatorFactory.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/arithmetic/MultiplyScalarEvaluatorFactory.java
@@ -16,7 +16,7 @@
*/
package org.apache.vxquery.runtime.functions.arithmetic;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
public class MultiplyScalarEvaluatorFactory extends AbstractArithmeticScalarEvaluatorFactory {
private static final long serialVersionUID = 1L;
@@ -29,4 +29,4 @@ public class MultiplyScalarEvaluatorFactory extends AbstractArithmeticScalarEval
protected AbstractArithmeticOperation createArithmeticOperation() {
return new MultiplyOperation();
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/arithmetic/SubtractOperation.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/arithmetic/SubtractOperation.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/arithmetic/SubtractOperation.java
index 4311e04..9ac37ca 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/arithmetic/SubtractOperation.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/arithmetic/SubtractOperation.java
@@ -29,11 +29,11 @@ import org.apache.vxquery.datamodel.values.ValueTag;
import org.apache.vxquery.exceptions.ErrorCode;
import org.apache.vxquery.exceptions.SystemException;
-import edu.uci.ics.hyracks.data.std.primitive.DoublePointable;
-import edu.uci.ics.hyracks.data.std.primitive.FloatPointable;
-import edu.uci.ics.hyracks.data.std.primitive.IntegerPointable;
-import edu.uci.ics.hyracks.data.std.primitive.LongPointable;
-import edu.uci.ics.hyracks.data.std.util.ArrayBackedValueStorage;
+import org.apache.hyracks.data.std.primitive.DoublePointable;
+import org.apache.hyracks.data.std.primitive.FloatPointable;
+import org.apache.hyracks.data.std.primitive.IntegerPointable;
+import org.apache.hyracks.data.std.primitive.LongPointable;
+import org.apache.hyracks.data.std.util.ArrayBackedValueStorage;
public class SubtractOperation extends AbstractArithmeticOperation {
protected final ArrayBackedValueStorage abvsInner1 = new ArrayBackedValueStorage();
@@ -651,4 +651,4 @@ public class SubtractOperation extends AbstractArithmeticOperation {
return decp2.longValue();
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/arithmetic/SubtractScalarEvaluatorFactory.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/arithmetic/SubtractScalarEvaluatorFactory.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/arithmetic/SubtractScalarEvaluatorFactory.java
index a1e73c9..ce97a57 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/arithmetic/SubtractScalarEvaluatorFactory.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/arithmetic/SubtractScalarEvaluatorFactory.java
@@ -16,7 +16,7 @@
*/
package org.apache.vxquery.runtime.functions.arithmetic;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
public class SubtractScalarEvaluatorFactory extends AbstractArithmeticScalarEvaluatorFactory {
private static final long serialVersionUID = 1L;
@@ -29,4 +29,4 @@ public class SubtractScalarEvaluatorFactory extends AbstractArithmeticScalarEval
protected AbstractArithmeticOperation createArithmeticOperation() {
return new SubtractOperation();
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/base/AbstractTaggedValueArgumentAggregateEvaluator.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/base/AbstractTaggedValueArgumentAggregateEvaluator.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/base/AbstractTaggedValueArgumentAggregateEvaluator.java
index 78faf89..965e110 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/base/AbstractTaggedValueArgumentAggregateEvaluator.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/base/AbstractTaggedValueArgumentAggregateEvaluator.java
@@ -21,10 +21,10 @@ import org.apache.vxquery.datamodel.accessors.PointablePoolFactory;
import org.apache.vxquery.datamodel.accessors.TaggedValuePointable;
import org.apache.vxquery.exceptions.SystemException;
-import edu.uci.ics.hyracks.algebricks.common.exceptions.AlgebricksException;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IAggregateEvaluator;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluator;
-import edu.uci.ics.hyracks.dataflow.common.data.accessors.IFrameTupleReference;
+import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
+import org.apache.hyracks.algebricks.runtime.base.IAggregateEvaluator;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluator;
+import org.apache.hyracks.dataflow.common.data.accessors.IFrameTupleReference;
public abstract class AbstractTaggedValueArgumentAggregateEvaluator implements IAggregateEvaluator {
private final IScalarEvaluator[] args;
@@ -54,4 +54,4 @@ public abstract class AbstractTaggedValueArgumentAggregateEvaluator implements I
}
protected abstract void step(TaggedValuePointable[] args) throws SystemException;
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/base/AbstractTaggedValueArgumentAggregateEvaluatorFactory.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/base/AbstractTaggedValueArgumentAggregateEvaluatorFactory.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/base/AbstractTaggedValueArgumentAggregateEvaluatorFactory.java
index b2eaa5b..2ab0b66 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/base/AbstractTaggedValueArgumentAggregateEvaluatorFactory.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/base/AbstractTaggedValueArgumentAggregateEvaluatorFactory.java
@@ -18,12 +18,12 @@ package org.apache.vxquery.runtime.functions.base;
import org.apache.vxquery.context.DynamicContext;
-import edu.uci.ics.hyracks.algebricks.common.exceptions.AlgebricksException;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IAggregateEvaluator;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IAggregateEvaluatorFactory;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluator;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
-import edu.uci.ics.hyracks.api.context.IHyracksTaskContext;
+import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
+import org.apache.hyracks.algebricks.runtime.base.IAggregateEvaluator;
+import org.apache.hyracks.algebricks.runtime.base.IAggregateEvaluatorFactory;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluator;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
+import org.apache.hyracks.api.context.IHyracksTaskContext;
public abstract class AbstractTaggedValueArgumentAggregateEvaluatorFactory implements IAggregateEvaluatorFactory {
private static final long serialVersionUID = 1L;
@@ -47,4 +47,4 @@ public abstract class AbstractTaggedValueArgumentAggregateEvaluatorFactory imple
}
protected abstract IAggregateEvaluator createEvaluator(IScalarEvaluator[] args) throws AlgebricksException;
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/base/AbstractTaggedValueArgumentScalarEvaluator.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/base/AbstractTaggedValueArgumentScalarEvaluator.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/base/AbstractTaggedValueArgumentScalarEvaluator.java
index e3ea702..e0229c2 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/base/AbstractTaggedValueArgumentScalarEvaluator.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/base/AbstractTaggedValueArgumentScalarEvaluator.java
@@ -21,10 +21,10 @@ import org.apache.vxquery.datamodel.accessors.PointablePoolFactory;
import org.apache.vxquery.datamodel.accessors.TaggedValuePointable;
import org.apache.vxquery.exceptions.SystemException;
-import edu.uci.ics.hyracks.algebricks.common.exceptions.AlgebricksException;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluator;
-import edu.uci.ics.hyracks.data.std.api.IPointable;
-import edu.uci.ics.hyracks.dataflow.common.data.accessors.IFrameTupleReference;
+import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluator;
+import org.apache.hyracks.data.std.api.IPointable;
+import org.apache.hyracks.dataflow.common.data.accessors.IFrameTupleReference;
public abstract class AbstractTaggedValueArgumentScalarEvaluator implements IScalarEvaluator {
private final IScalarEvaluator[] args;
@@ -54,4 +54,4 @@ public abstract class AbstractTaggedValueArgumentScalarEvaluator implements ISca
}
protected abstract void evaluate(TaggedValuePointable[] args, IPointable result) throws SystemException;
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/base/AbstractTaggedValueArgumentScalarEvaluatorFactory.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/base/AbstractTaggedValueArgumentScalarEvaluatorFactory.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/base/AbstractTaggedValueArgumentScalarEvaluatorFactory.java
index 35781cb..d07361b 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/base/AbstractTaggedValueArgumentScalarEvaluatorFactory.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/base/AbstractTaggedValueArgumentScalarEvaluatorFactory.java
@@ -16,10 +16,10 @@
*/
package org.apache.vxquery.runtime.functions.base;
-import edu.uci.ics.hyracks.algebricks.common.exceptions.AlgebricksException;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluator;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
-import edu.uci.ics.hyracks.api.context.IHyracksTaskContext;
+import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluator;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
+import org.apache.hyracks.api.context.IHyracksTaskContext;
public abstract class AbstractTaggedValueArgumentScalarEvaluatorFactory implements IScalarEvaluatorFactory {
private static final long serialVersionUID = 1L;
@@ -41,4 +41,4 @@ public abstract class AbstractTaggedValueArgumentScalarEvaluatorFactory implemen
protected abstract IScalarEvaluator createEvaluator(IHyracksTaskContext ctx, IScalarEvaluator[] args)
throws AlgebricksException;
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/base/AbstractTaggedValueArgumentUnnestingEvaluator.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/base/AbstractTaggedValueArgumentUnnestingEvaluator.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/base/AbstractTaggedValueArgumentUnnestingEvaluator.java
index aba2501..4aa30d7 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/base/AbstractTaggedValueArgumentUnnestingEvaluator.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/base/AbstractTaggedValueArgumentUnnestingEvaluator.java
@@ -21,10 +21,10 @@ import org.apache.vxquery.datamodel.accessors.PointablePoolFactory;
import org.apache.vxquery.datamodel.accessors.TaggedValuePointable;
import org.apache.vxquery.exceptions.SystemException;
-import edu.uci.ics.hyracks.algebricks.common.exceptions.AlgebricksException;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluator;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IUnnestingEvaluator;
-import edu.uci.ics.hyracks.dataflow.common.data.accessors.IFrameTupleReference;
+import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluator;
+import org.apache.hyracks.algebricks.runtime.base.IUnnestingEvaluator;
+import org.apache.hyracks.dataflow.common.data.accessors.IFrameTupleReference;
public abstract class AbstractTaggedValueArgumentUnnestingEvaluator implements IUnnestingEvaluator {
private final IScalarEvaluator[] args;
@@ -54,4 +54,4 @@ public abstract class AbstractTaggedValueArgumentUnnestingEvaluator implements I
}
protected abstract void init(TaggedValuePointable[] args) throws SystemException;
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/base/AbstractTaggedValueArgumentUnnestingEvaluatorFactory.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/base/AbstractTaggedValueArgumentUnnestingEvaluatorFactory.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/base/AbstractTaggedValueArgumentUnnestingEvaluatorFactory.java
index 312efea..f32a734 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/base/AbstractTaggedValueArgumentUnnestingEvaluatorFactory.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/base/AbstractTaggedValueArgumentUnnestingEvaluatorFactory.java
@@ -17,12 +17,12 @@
package org.apache.vxquery.runtime.functions.base;
-import edu.uci.ics.hyracks.algebricks.common.exceptions.AlgebricksException;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluator;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IUnnestingEvaluator;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IUnnestingEvaluatorFactory;
-import edu.uci.ics.hyracks.api.context.IHyracksTaskContext;
+import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluator;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
+import org.apache.hyracks.algebricks.runtime.base.IUnnestingEvaluator;
+import org.apache.hyracks.algebricks.runtime.base.IUnnestingEvaluatorFactory;
+import org.apache.hyracks.api.context.IHyracksTaskContext;
public abstract class AbstractTaggedValueArgumentUnnestingEvaluatorFactory implements IUnnestingEvaluatorFactory {
private static final long serialVersionUID = 1L;
@@ -46,4 +46,4 @@ public abstract class AbstractTaggedValueArgumentUnnestingEvaluatorFactory imple
}
protected abstract IUnnestingEvaluator createEvaluator(IHyracksTaskContext ctx, IScalarEvaluator[] args) throws AlgebricksException;
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/bool/AndScalarEvaluatorFactory.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/bool/AndScalarEvaluatorFactory.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/bool/AndScalarEvaluatorFactory.java
index c66261c..599a4d7 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/bool/AndScalarEvaluatorFactory.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/bool/AndScalarEvaluatorFactory.java
@@ -20,13 +20,13 @@ import org.apache.vxquery.datamodel.accessors.TaggedValuePointable;
import org.apache.vxquery.datamodel.values.XDMConstants;
import org.apache.vxquery.runtime.functions.base.AbstractTaggedValueArgumentScalarEvaluatorFactory;
-import edu.uci.ics.hyracks.algebricks.common.exceptions.AlgebricksException;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluator;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
-import edu.uci.ics.hyracks.api.context.IHyracksTaskContext;
-import edu.uci.ics.hyracks.data.std.api.IPointable;
-import edu.uci.ics.hyracks.data.std.primitive.BooleanPointable;
-import edu.uci.ics.hyracks.dataflow.common.data.accessors.IFrameTupleReference;
+import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluator;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
+import org.apache.hyracks.api.context.IHyracksTaskContext;
+import org.apache.hyracks.data.std.api.IPointable;
+import org.apache.hyracks.data.std.primitive.BooleanPointable;
+import org.apache.hyracks.dataflow.common.data.accessors.IFrameTupleReference;
public class AndScalarEvaluatorFactory extends AbstractTaggedValueArgumentScalarEvaluatorFactory {
private static final long serialVersionUID = 1L;
@@ -66,4 +66,4 @@ public class AndScalarEvaluatorFactory extends AbstractTaggedValueArgumentScalar
}
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/bool/FnBooleanScalarEvaluatorFactory.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/bool/FnBooleanScalarEvaluatorFactory.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/bool/FnBooleanScalarEvaluatorFactory.java
index b9c8c6f..d749130 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/bool/FnBooleanScalarEvaluatorFactory.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/bool/FnBooleanScalarEvaluatorFactory.java
@@ -26,18 +26,18 @@ import org.apache.vxquery.exceptions.SystemException;
import org.apache.vxquery.runtime.functions.base.AbstractTaggedValueArgumentScalarEvaluator;
import org.apache.vxquery.runtime.functions.base.AbstractTaggedValueArgumentScalarEvaluatorFactory;
-import edu.uci.ics.hyracks.algebricks.common.exceptions.AlgebricksException;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluator;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
-import edu.uci.ics.hyracks.api.context.IHyracksTaskContext;
-import edu.uci.ics.hyracks.data.std.api.IPointable;
-import edu.uci.ics.hyracks.data.std.primitive.BytePointable;
-import edu.uci.ics.hyracks.data.std.primitive.DoublePointable;
-import edu.uci.ics.hyracks.data.std.primitive.FloatPointable;
-import edu.uci.ics.hyracks.data.std.primitive.IntegerPointable;
-import edu.uci.ics.hyracks.data.std.primitive.LongPointable;
-import edu.uci.ics.hyracks.data.std.primitive.ShortPointable;
-import edu.uci.ics.hyracks.data.std.primitive.UTF8StringPointable;
+import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluator;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
+import org.apache.hyracks.api.context.IHyracksTaskContext;
+import org.apache.hyracks.data.std.api.IPointable;
+import org.apache.hyracks.data.std.primitive.BytePointable;
+import org.apache.hyracks.data.std.primitive.DoublePointable;
+import org.apache.hyracks.data.std.primitive.FloatPointable;
+import org.apache.hyracks.data.std.primitive.IntegerPointable;
+import org.apache.hyracks.data.std.primitive.LongPointable;
+import org.apache.hyracks.data.std.primitive.ShortPointable;
+import org.apache.hyracks.data.std.primitive.UTF8StringPointable;
public class FnBooleanScalarEvaluatorFactory extends AbstractTaggedValueArgumentScalarEvaluatorFactory {
private static final long serialVersionUID = 1L;
@@ -168,4 +168,4 @@ public class FnBooleanScalarEvaluatorFactory extends AbstractTaggedValueArgument
}
}
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/bool/FnFalseScalarEvaluatorFactory.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/bool/FnFalseScalarEvaluatorFactory.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/bool/FnFalseScalarEvaluatorFactory.java
index 07e92ee..53778d2 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/bool/FnFalseScalarEvaluatorFactory.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/bool/FnFalseScalarEvaluatorFactory.java
@@ -22,11 +22,11 @@ import org.apache.vxquery.exceptions.SystemException;
import org.apache.vxquery.runtime.functions.base.AbstractTaggedValueArgumentScalarEvaluator;
import org.apache.vxquery.runtime.functions.base.AbstractTaggedValueArgumentScalarEvaluatorFactory;
-import edu.uci.ics.hyracks.algebricks.common.exceptions.AlgebricksException;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluator;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
-import edu.uci.ics.hyracks.api.context.IHyracksTaskContext;
-import edu.uci.ics.hyracks.data.std.api.IPointable;
+import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluator;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
+import org.apache.hyracks.api.context.IHyracksTaskContext;
+import org.apache.hyracks.data.std.api.IPointable;
public class FnFalseScalarEvaluatorFactory extends AbstractTaggedValueArgumentScalarEvaluatorFactory {
private static final long serialVersionUID = 1L;
@@ -45,4 +45,4 @@ public class FnFalseScalarEvaluatorFactory extends AbstractTaggedValueArgumentSc
}
};
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/bool/FnNotScalarEvaluatorFactory.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/bool/FnNotScalarEvaluatorFactory.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/bool/FnNotScalarEvaluatorFactory.java
index 94b03f1..b9d4585 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/bool/FnNotScalarEvaluatorFactory.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/bool/FnNotScalarEvaluatorFactory.java
@@ -22,12 +22,12 @@ import org.apache.vxquery.exceptions.SystemException;
import org.apache.vxquery.runtime.functions.base.AbstractTaggedValueArgumentScalarEvaluator;
import org.apache.vxquery.runtime.functions.base.AbstractTaggedValueArgumentScalarEvaluatorFactory;
-import edu.uci.ics.hyracks.algebricks.common.exceptions.AlgebricksException;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluator;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
-import edu.uci.ics.hyracks.api.context.IHyracksTaskContext;
-import edu.uci.ics.hyracks.data.std.api.IPointable;
-import edu.uci.ics.hyracks.data.std.primitive.BooleanPointable;
+import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluator;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
+import org.apache.hyracks.api.context.IHyracksTaskContext;
+import org.apache.hyracks.data.std.api.IPointable;
+import org.apache.hyracks.data.std.primitive.BooleanPointable;
public class FnNotScalarEvaluatorFactory extends AbstractTaggedValueArgumentScalarEvaluatorFactory {
private static final long serialVersionUID = 1L;
@@ -54,4 +54,4 @@ public class FnNotScalarEvaluatorFactory extends AbstractTaggedValueArgumentScal
}
};
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/bool/FnTrueScalarEvaluatorFactory.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/bool/FnTrueScalarEvaluatorFactory.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/bool/FnTrueScalarEvaluatorFactory.java
index 33acf51..a94d2df 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/bool/FnTrueScalarEvaluatorFactory.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/bool/FnTrueScalarEvaluatorFactory.java
@@ -22,11 +22,11 @@ import org.apache.vxquery.exceptions.SystemException;
import org.apache.vxquery.runtime.functions.base.AbstractTaggedValueArgumentScalarEvaluator;
import org.apache.vxquery.runtime.functions.base.AbstractTaggedValueArgumentScalarEvaluatorFactory;
-import edu.uci.ics.hyracks.algebricks.common.exceptions.AlgebricksException;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluator;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
-import edu.uci.ics.hyracks.api.context.IHyracksTaskContext;
-import edu.uci.ics.hyracks.data.std.api.IPointable;
+import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluator;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
+import org.apache.hyracks.api.context.IHyracksTaskContext;
+import org.apache.hyracks.data.std.api.IPointable;
public class FnTrueScalarEvaluatorFactory extends AbstractTaggedValueArgumentScalarEvaluatorFactory {
private static final long serialVersionUID = 1L;
@@ -45,4 +45,4 @@ public class FnTrueScalarEvaluatorFactory extends AbstractTaggedValueArgumentSca
}
};
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/bool/OrScalarEvaluatorFactory.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/bool/OrScalarEvaluatorFactory.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/bool/OrScalarEvaluatorFactory.java
index 23d7ad9..da31e14 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/bool/OrScalarEvaluatorFactory.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/bool/OrScalarEvaluatorFactory.java
@@ -20,13 +20,13 @@ import org.apache.vxquery.datamodel.accessors.TaggedValuePointable;
import org.apache.vxquery.datamodel.values.XDMConstants;
import org.apache.vxquery.runtime.functions.base.AbstractTaggedValueArgumentScalarEvaluatorFactory;
-import edu.uci.ics.hyracks.algebricks.common.exceptions.AlgebricksException;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluator;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
-import edu.uci.ics.hyracks.api.context.IHyracksTaskContext;
-import edu.uci.ics.hyracks.data.std.api.IPointable;
-import edu.uci.ics.hyracks.data.std.primitive.BooleanPointable;
-import edu.uci.ics.hyracks.dataflow.common.data.accessors.IFrameTupleReference;
+import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluator;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
+import org.apache.hyracks.api.context.IHyracksTaskContext;
+import org.apache.hyracks.data.std.api.IPointable;
+import org.apache.hyracks.data.std.primitive.BooleanPointable;
+import org.apache.hyracks.dataflow.common.data.accessors.IFrameTupleReference;
public class OrScalarEvaluatorFactory extends AbstractTaggedValueArgumentScalarEvaluatorFactory {
private static final long serialVersionUID = 1L;
@@ -65,4 +65,4 @@ public class OrScalarEvaluatorFactory extends AbstractTaggedValueArgumentScalarE
XDMConstants.setFalse(result);
}
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/AbstractCastToOperation.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/AbstractCastToOperation.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/AbstractCastToOperation.java
index c9cb11b..f58a39a 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/AbstractCastToOperation.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/AbstractCastToOperation.java
@@ -29,14 +29,14 @@ import org.apache.vxquery.datamodel.accessors.atomic.XSTimePointable;
import org.apache.vxquery.exceptions.ErrorCode;
import org.apache.vxquery.exceptions.SystemException;
-import edu.uci.ics.hyracks.data.std.primitive.BooleanPointable;
-import edu.uci.ics.hyracks.data.std.primitive.BytePointable;
-import edu.uci.ics.hyracks.data.std.primitive.DoublePointable;
-import edu.uci.ics.hyracks.data.std.primitive.FloatPointable;
-import edu.uci.ics.hyracks.data.std.primitive.IntegerPointable;
-import edu.uci.ics.hyracks.data.std.primitive.LongPointable;
-import edu.uci.ics.hyracks.data.std.primitive.ShortPointable;
-import edu.uci.ics.hyracks.data.std.primitive.UTF8StringPointable;
+import org.apache.hyracks.data.std.primitive.BooleanPointable;
+import org.apache.hyracks.data.std.primitive.BytePointable;
+import org.apache.hyracks.data.std.primitive.DoublePointable;
+import org.apache.hyracks.data.std.primitive.FloatPointable;
+import org.apache.hyracks.data.std.primitive.IntegerPointable;
+import org.apache.hyracks.data.std.primitive.LongPointable;
+import org.apache.hyracks.data.std.primitive.ShortPointable;
+import org.apache.hyracks.data.std.primitive.UTF8StringPointable;
public abstract class AbstractCastToOperation {
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/CastScalarEvaluatorFactory.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/CastScalarEvaluatorFactory.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/CastScalarEvaluatorFactory.java
index 7c76eea..01e5d14 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/CastScalarEvaluatorFactory.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/CastScalarEvaluatorFactory.java
@@ -27,12 +27,12 @@ import org.apache.vxquery.runtime.functions.type.AbstractTypeScalarEvaluatorFact
import org.apache.vxquery.types.BuiltinTypeRegistry;
import org.apache.vxquery.types.SequenceType;
-import edu.uci.ics.hyracks.algebricks.common.exceptions.AlgebricksException;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluator;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
-import edu.uci.ics.hyracks.api.context.IHyracksTaskContext;
-import edu.uci.ics.hyracks.data.std.api.IPointable;
-import edu.uci.ics.hyracks.data.std.util.ArrayBackedValueStorage;
+import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluator;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
+import org.apache.hyracks.api.context.IHyracksTaskContext;
+import org.apache.hyracks.data.std.api.IPointable;
+import org.apache.hyracks.data.std.util.ArrayBackedValueStorage;
public class CastScalarEvaluatorFactory extends AbstractTypeScalarEvaluatorFactory {
private static final long serialVersionUID = 1L;
@@ -435,4 +435,4 @@ public class CastScalarEvaluatorFactory extends AbstractTypeScalarEvaluatorFacto
};
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/CastToAnyURIOperation.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/CastToAnyURIOperation.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/CastToAnyURIOperation.java
index c6f2d74..ff49362 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/CastToAnyURIOperation.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/CastToAnyURIOperation.java
@@ -22,7 +22,7 @@ import java.io.IOException;
import org.apache.vxquery.datamodel.values.ValueTag;
import org.apache.vxquery.exceptions.SystemException;
-import edu.uci.ics.hyracks.data.std.primitive.UTF8StringPointable;
+import org.apache.hyracks.data.std.primitive.UTF8StringPointable;
public class CastToAnyURIOperation extends AbstractCastToOperation {
@@ -43,4 +43,4 @@ public class CastToAnyURIOperation extends AbstractCastToOperation {
convertString(stringp, dOut);
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/CastToBase64BinaryOperation.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/CastToBase64BinaryOperation.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/CastToBase64BinaryOperation.java
index de1148a..e2d33a5 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/CastToBase64BinaryOperation.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/CastToBase64BinaryOperation.java
@@ -24,8 +24,8 @@ import org.apache.vxquery.datamodel.accessors.atomic.XSBinaryPointable;
import org.apache.vxquery.datamodel.values.ValueTag;
import org.apache.vxquery.exceptions.SystemException;
-import edu.uci.ics.hyracks.data.std.primitive.UTF8StringPointable;
-import edu.uci.ics.hyracks.data.std.util.ByteArrayAccessibleOutputStream;
+import org.apache.hyracks.data.std.primitive.UTF8StringPointable;
+import org.apache.hyracks.data.std.util.ByteArrayAccessibleOutputStream;
public class CastToBase64BinaryOperation extends AbstractCastToOperation {
private ByteArrayAccessibleOutputStream baaos = new ByteArrayAccessibleOutputStream();
@@ -58,4 +58,4 @@ public class CastToBase64BinaryOperation extends AbstractCastToOperation {
public void convertUntypedAtomic(UTF8StringPointable stringp, DataOutput dOut) throws SystemException, IOException {
convertString(stringp, dOut);
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/CastToBooleanOperation.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/CastToBooleanOperation.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/CastToBooleanOperation.java
index e62f8f0..edfae66 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/CastToBooleanOperation.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/CastToBooleanOperation.java
@@ -27,11 +27,11 @@ import org.apache.vxquery.runtime.functions.strings.ICharacterIterator;
import org.apache.vxquery.runtime.functions.strings.LowerCaseCharacterIterator;
import org.apache.vxquery.runtime.functions.strings.UTF8StringCharacterIterator;
-import edu.uci.ics.hyracks.data.std.primitive.BooleanPointable;
-import edu.uci.ics.hyracks.data.std.primitive.DoublePointable;
-import edu.uci.ics.hyracks.data.std.primitive.FloatPointable;
-import edu.uci.ics.hyracks.data.std.primitive.LongPointable;
-import edu.uci.ics.hyracks.data.std.primitive.UTF8StringPointable;
+import org.apache.hyracks.data.std.primitive.BooleanPointable;
+import org.apache.hyracks.data.std.primitive.DoublePointable;
+import org.apache.hyracks.data.std.primitive.FloatPointable;
+import org.apache.hyracks.data.std.primitive.LongPointable;
+import org.apache.hyracks.data.std.primitive.UTF8StringPointable;
public class CastToBooleanOperation extends AbstractCastToOperation {
@@ -116,4 +116,4 @@ public class CastToBooleanOperation extends AbstractCastToOperation {
public void convertUntypedAtomic(UTF8StringPointable stringp, DataOutput dOut) throws SystemException, IOException {
convertString(stringp, dOut);
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/CastToByteOperation.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/CastToByteOperation.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/CastToByteOperation.java
index ab9b4f4..cc9b88e 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/CastToByteOperation.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/CastToByteOperation.java
@@ -26,15 +26,15 @@ import org.apache.vxquery.exceptions.SystemException;
import org.apache.vxquery.runtime.functions.strings.ICharacterIterator;
import org.apache.vxquery.runtime.functions.strings.UTF8StringCharacterIterator;
-import edu.uci.ics.hyracks.data.std.api.INumeric;
-import edu.uci.ics.hyracks.data.std.primitive.BooleanPointable;
-import edu.uci.ics.hyracks.data.std.primitive.BytePointable;
-import edu.uci.ics.hyracks.data.std.primitive.DoublePointable;
-import edu.uci.ics.hyracks.data.std.primitive.FloatPointable;
-import edu.uci.ics.hyracks.data.std.primitive.IntegerPointable;
-import edu.uci.ics.hyracks.data.std.primitive.LongPointable;
-import edu.uci.ics.hyracks.data.std.primitive.ShortPointable;
-import edu.uci.ics.hyracks.data.std.primitive.UTF8StringPointable;
+import org.apache.hyracks.data.std.api.INumeric;
+import org.apache.hyracks.data.std.primitive.BooleanPointable;
+import org.apache.hyracks.data.std.primitive.BytePointable;
+import org.apache.hyracks.data.std.primitive.DoublePointable;
+import org.apache.hyracks.data.std.primitive.FloatPointable;
+import org.apache.hyracks.data.std.primitive.IntegerPointable;
+import org.apache.hyracks.data.std.primitive.LongPointable;
+import org.apache.hyracks.data.std.primitive.ShortPointable;
+import org.apache.hyracks.data.std.primitive.UTF8StringPointable;
public class CastToByteOperation extends AbstractCastToOperation {
boolean negativeAllowed = true;
@@ -188,4 +188,4 @@ public class CastToByteOperation extends AbstractCastToOperation {
dOut.write(returnTag);
dOut.write(numericp.byteValue());
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/CastToDTDurationOperation.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/CastToDTDurationOperation.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/CastToDTDurationOperation.java
index e5f1b4c..709043d 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/CastToDTDurationOperation.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/CastToDTDurationOperation.java
@@ -27,9 +27,9 @@ import org.apache.vxquery.exceptions.SystemException;
import org.apache.vxquery.runtime.functions.strings.ICharacterIterator;
import org.apache.vxquery.runtime.functions.strings.UTF8StringCharacterIterator;
-import edu.uci.ics.hyracks.data.std.primitive.IntegerPointable;
-import edu.uci.ics.hyracks.data.std.primitive.LongPointable;
-import edu.uci.ics.hyracks.data.std.primitive.UTF8StringPointable;
+import org.apache.hyracks.data.std.primitive.IntegerPointable;
+import org.apache.hyracks.data.std.primitive.LongPointable;
+import org.apache.hyracks.data.std.primitive.UTF8StringPointable;
public class CastToDTDurationOperation extends AbstractCastToOperation {
@@ -116,4 +116,4 @@ public class CastToDTDurationOperation extends AbstractCastToOperation {
convertString(stringp, dOut);
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/CastToDateOperation.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/CastToDateOperation.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/CastToDateOperation.java
index b845362..81919d9 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/CastToDateOperation.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/CastToDateOperation.java
@@ -28,7 +28,7 @@ import org.apache.vxquery.exceptions.SystemException;
import org.apache.vxquery.runtime.functions.strings.ICharacterIterator;
import org.apache.vxquery.runtime.functions.strings.UTF8StringCharacterIterator;
-import edu.uci.ics.hyracks.data.std.primitive.UTF8StringPointable;
+import org.apache.hyracks.data.std.primitive.UTF8StringPointable;
public class CastToDateOperation extends AbstractCastToOperation {
@@ -114,4 +114,4 @@ public class CastToDateOperation extends AbstractCastToOperation {
public void convertUntypedAtomic(UTF8StringPointable stringp, DataOutput dOut) throws SystemException, IOException {
convertString(stringp, dOut);
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/CastToDateTimeOperation.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/CastToDateTimeOperation.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/CastToDateTimeOperation.java
index a62c661..4d191b7 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/CastToDateTimeOperation.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/CastToDateTimeOperation.java
@@ -28,7 +28,7 @@ import org.apache.vxquery.exceptions.SystemException;
import org.apache.vxquery.runtime.functions.strings.ICharacterIterator;
import org.apache.vxquery.runtime.functions.strings.UTF8StringCharacterIterator;
-import edu.uci.ics.hyracks.data.std.primitive.UTF8StringPointable;
+import org.apache.hyracks.data.std.primitive.UTF8StringPointable;
public class CastToDateTimeOperation extends AbstractCastToOperation {
@@ -137,4 +137,4 @@ public class CastToDateTimeOperation extends AbstractCastToOperation {
convertString(stringp, dOut);
}
-}
\ No newline at end of file
+}
[46/50] [abbrv] vxquery git commit: Merged Site branch
Posted by sj...@apache.org.
Merged Site branch
Project: http://git-wip-us.apache.org/repos/asf/vxquery/repo
Commit: http://git-wip-us.apache.org/repos/asf/vxquery/commit/39c4aca9
Tree: http://git-wip-us.apache.org/repos/asf/vxquery/tree/39c4aca9
Diff: http://git-wip-us.apache.org/repos/asf/vxquery/diff/39c4aca9
Branch: refs/heads/site
Commit: 39c4aca9b2b70913458c3844fed453902cdc6f82
Parents: 9deade9 a506d05
Author: Steven Jacobs <sj...@ucr.edu>
Authored: Thu May 19 11:55:09 2016 -0700
Committer: Steven Jacobs <sj...@ucr.edu>
Committed: Thu May 19 11:55:09 2016 -0700
----------------------------------------------------------------------
----------------------------------------------------------------------
[20/50] [abbrv] vxquery git commit: VXQUERY-181 - Move to Hyracks
0.2.16
Posted by sj...@apache.org.
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/EliminateSubplanForSinglePathsRule.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/EliminateSubplanForSinglePathsRule.java b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/EliminateSubplanForSinglePathsRule.java
index 16bc20d..f4ed7de 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/EliminateSubplanForSinglePathsRule.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/EliminateSubplanForSinglePathsRule.java
@@ -21,13 +21,13 @@ import org.apache.vxquery.compiler.rewriter.VXQueryOptimizationContext;
import org.apache.vxquery.compiler.rewriter.rules.propagationpolicies.cardinality.Cardinality;
import org.apache.vxquery.compiler.rewriter.rules.util.CardinalityRuleToolbox;
-import edu.uci.ics.hyracks.algebricks.common.exceptions.AlgebricksException;
-import edu.uci.ics.hyracks.algebricks.core.algebra.base.ILogicalOperator;
-import edu.uci.ics.hyracks.algebricks.core.algebra.base.IOptimizationContext;
-import edu.uci.ics.hyracks.algebricks.core.algebra.base.LogicalOperatorTag;
-import edu.uci.ics.hyracks.algebricks.core.algebra.operators.logical.AbstractLogicalOperator;
-import edu.uci.ics.hyracks.algebricks.core.algebra.operators.logical.SubplanOperator;
-import edu.uci.ics.hyracks.algebricks.core.rewriter.base.IAlgebraicRewriteRule;
+import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
+import org.apache.hyracks.algebricks.core.algebra.base.ILogicalOperator;
+import org.apache.hyracks.algebricks.core.algebra.base.IOptimizationContext;
+import org.apache.hyracks.algebricks.core.algebra.base.LogicalOperatorTag;
+import org.apache.hyracks.algebricks.core.algebra.operators.logical.AbstractLogicalOperator;
+import org.apache.hyracks.algebricks.core.algebra.operators.logical.SubplanOperator;
+import org.apache.hyracks.algebricks.core.rewriter.base.IAlgebraicRewriteRule;
/**
* The rule searches for subplans that only have one path of execution.
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/EliminateUnnestAggregateSequencesRule.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/EliminateUnnestAggregateSequencesRule.java b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/EliminateUnnestAggregateSequencesRule.java
index 0acd154..3dc412f 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/EliminateUnnestAggregateSequencesRule.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/EliminateUnnestAggregateSequencesRule.java
@@ -19,20 +19,20 @@ package org.apache.vxquery.compiler.rewriter.rules;
import org.apache.commons.lang3.mutable.Mutable;
import org.apache.vxquery.functions.BuiltinOperators;
-import edu.uci.ics.hyracks.algebricks.common.exceptions.AlgebricksException;
-import edu.uci.ics.hyracks.algebricks.core.algebra.base.ILogicalExpression;
-import edu.uci.ics.hyracks.algebricks.core.algebra.base.ILogicalOperator;
-import edu.uci.ics.hyracks.algebricks.core.algebra.base.IOptimizationContext;
-import edu.uci.ics.hyracks.algebricks.core.algebra.base.LogicalExpressionTag;
-import edu.uci.ics.hyracks.algebricks.core.algebra.base.LogicalOperatorTag;
-import edu.uci.ics.hyracks.algebricks.core.algebra.base.LogicalVariable;
-import edu.uci.ics.hyracks.algebricks.core.algebra.expressions.AbstractFunctionCallExpression;
-import edu.uci.ics.hyracks.algebricks.core.algebra.expressions.VariableReferenceExpression;
-import edu.uci.ics.hyracks.algebricks.core.algebra.operators.logical.AbstractLogicalOperator;
-import edu.uci.ics.hyracks.algebricks.core.algebra.operators.logical.AggregateOperator;
-import edu.uci.ics.hyracks.algebricks.core.algebra.operators.logical.AssignOperator;
-import edu.uci.ics.hyracks.algebricks.core.algebra.operators.logical.UnnestOperator;
-import edu.uci.ics.hyracks.algebricks.core.rewriter.base.IAlgebraicRewriteRule;
+import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
+import org.apache.hyracks.algebricks.core.algebra.base.ILogicalExpression;
+import org.apache.hyracks.algebricks.core.algebra.base.ILogicalOperator;
+import org.apache.hyracks.algebricks.core.algebra.base.IOptimizationContext;
+import org.apache.hyracks.algebricks.core.algebra.base.LogicalExpressionTag;
+import org.apache.hyracks.algebricks.core.algebra.base.LogicalOperatorTag;
+import org.apache.hyracks.algebricks.core.algebra.base.LogicalVariable;
+import org.apache.hyracks.algebricks.core.algebra.expressions.AbstractFunctionCallExpression;
+import org.apache.hyracks.algebricks.core.algebra.expressions.VariableReferenceExpression;
+import org.apache.hyracks.algebricks.core.algebra.operators.logical.AbstractLogicalOperator;
+import org.apache.hyracks.algebricks.core.algebra.operators.logical.AggregateOperator;
+import org.apache.hyracks.algebricks.core.algebra.operators.logical.AssignOperator;
+import org.apache.hyracks.algebricks.core.algebra.operators.logical.UnnestOperator;
+import org.apache.hyracks.algebricks.core.rewriter.base.IAlgebraicRewriteRule;
/**
* The rule searches for unnest followed by an aggregate operator with a
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/EliminateUnnestAggregateSubplanRule.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/EliminateUnnestAggregateSubplanRule.java b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/EliminateUnnestAggregateSubplanRule.java
index 193b53d..faf6e09 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/EliminateUnnestAggregateSubplanRule.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/EliminateUnnestAggregateSubplanRule.java
@@ -20,21 +20,21 @@ import org.apache.commons.lang3.mutable.Mutable;
import org.apache.vxquery.compiler.rewriter.rules.util.OperatorToolbox;
import org.apache.vxquery.functions.BuiltinOperators;
-import edu.uci.ics.hyracks.algebricks.common.exceptions.AlgebricksException;
-import edu.uci.ics.hyracks.algebricks.core.algebra.base.ILogicalExpression;
-import edu.uci.ics.hyracks.algebricks.core.algebra.base.ILogicalOperator;
-import edu.uci.ics.hyracks.algebricks.core.algebra.base.IOptimizationContext;
-import edu.uci.ics.hyracks.algebricks.core.algebra.base.LogicalExpressionTag;
-import edu.uci.ics.hyracks.algebricks.core.algebra.base.LogicalOperatorTag;
-import edu.uci.ics.hyracks.algebricks.core.algebra.base.LogicalVariable;
-import edu.uci.ics.hyracks.algebricks.core.algebra.expressions.AbstractFunctionCallExpression;
-import edu.uci.ics.hyracks.algebricks.core.algebra.expressions.VariableReferenceExpression;
-import edu.uci.ics.hyracks.algebricks.core.algebra.operators.logical.AbstractLogicalOperator;
-import edu.uci.ics.hyracks.algebricks.core.algebra.operators.logical.AggregateOperator;
-import edu.uci.ics.hyracks.algebricks.core.algebra.operators.logical.AssignOperator;
-import edu.uci.ics.hyracks.algebricks.core.algebra.operators.logical.SubplanOperator;
-import edu.uci.ics.hyracks.algebricks.core.algebra.operators.logical.UnnestOperator;
-import edu.uci.ics.hyracks.algebricks.core.rewriter.base.IAlgebraicRewriteRule;
+import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
+import org.apache.hyracks.algebricks.core.algebra.base.ILogicalExpression;
+import org.apache.hyracks.algebricks.core.algebra.base.ILogicalOperator;
+import org.apache.hyracks.algebricks.core.algebra.base.IOptimizationContext;
+import org.apache.hyracks.algebricks.core.algebra.base.LogicalExpressionTag;
+import org.apache.hyracks.algebricks.core.algebra.base.LogicalOperatorTag;
+import org.apache.hyracks.algebricks.core.algebra.base.LogicalVariable;
+import org.apache.hyracks.algebricks.core.algebra.expressions.AbstractFunctionCallExpression;
+import org.apache.hyracks.algebricks.core.algebra.expressions.VariableReferenceExpression;
+import org.apache.hyracks.algebricks.core.algebra.operators.logical.AbstractLogicalOperator;
+import org.apache.hyracks.algebricks.core.algebra.operators.logical.AggregateOperator;
+import org.apache.hyracks.algebricks.core.algebra.operators.logical.AssignOperator;
+import org.apache.hyracks.algebricks.core.algebra.operators.logical.SubplanOperator;
+import org.apache.hyracks.algebricks.core.algebra.operators.logical.UnnestOperator;
+import org.apache.hyracks.algebricks.core.rewriter.base.IAlgebraicRewriteRule;
/**
* The rule searches for unnest followed by subplan with the root operator an
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/IntroduceCollectionRule.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/IntroduceCollectionRule.java b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/IntroduceCollectionRule.java
index 9daafed..c7dd2ee 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/IntroduceCollectionRule.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/IntroduceCollectionRule.java
@@ -23,13 +23,13 @@ import org.apache.vxquery.types.AnyItemType;
import org.apache.vxquery.types.Quantifier;
import org.apache.vxquery.types.SequenceType;
-import edu.uci.ics.hyracks.algebricks.common.exceptions.AlgebricksException;
-import edu.uci.ics.hyracks.algebricks.core.algebra.base.ILogicalOperator;
-import edu.uci.ics.hyracks.algebricks.core.algebra.base.IOptimizationContext;
-import edu.uci.ics.hyracks.algebricks.core.algebra.operators.logical.AbstractLogicalOperator;
-import edu.uci.ics.hyracks.algebricks.core.algebra.operators.logical.AssignOperator;
-import edu.uci.ics.hyracks.algebricks.core.algebra.operators.logical.DataSourceScanOperator;
-import edu.uci.ics.hyracks.algebricks.core.algebra.operators.logical.UnnestOperator;
+import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
+import org.apache.hyracks.algebricks.core.algebra.base.ILogicalOperator;
+import org.apache.hyracks.algebricks.core.algebra.base.IOptimizationContext;
+import org.apache.hyracks.algebricks.core.algebra.operators.logical.AbstractLogicalOperator;
+import org.apache.hyracks.algebricks.core.algebra.operators.logical.AssignOperator;
+import org.apache.hyracks.algebricks.core.algebra.operators.logical.DataSourceScanOperator;
+import org.apache.hyracks.algebricks.core.algebra.operators.logical.UnnestOperator;
/**
* Find the default query plan created for collection and updated it to use
@@ -90,4 +90,4 @@ public class IntroduceCollectionRule extends AbstractCollectionRule {
return false;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/IntroduceTwoStepAggregateRule.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/IntroduceTwoStepAggregateRule.java b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/IntroduceTwoStepAggregateRule.java
index d6f302c..4343522 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/IntroduceTwoStepAggregateRule.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/IntroduceTwoStepAggregateRule.java
@@ -23,20 +23,20 @@ import org.apache.commons.lang3.mutable.Mutable;
import org.apache.vxquery.functions.BuiltinFunctions;
import org.apache.vxquery.functions.BuiltinOperators;
-import edu.uci.ics.hyracks.algebricks.common.exceptions.AlgebricksException;
-import edu.uci.ics.hyracks.algebricks.common.utils.Pair;
-import edu.uci.ics.hyracks.algebricks.core.algebra.base.ILogicalExpression;
-import edu.uci.ics.hyracks.algebricks.core.algebra.base.ILogicalOperator;
-import edu.uci.ics.hyracks.algebricks.core.algebra.base.IOptimizationContext;
-import edu.uci.ics.hyracks.algebricks.core.algebra.base.LogicalExpressionTag;
-import edu.uci.ics.hyracks.algebricks.core.algebra.base.LogicalOperatorTag;
-import edu.uci.ics.hyracks.algebricks.core.algebra.expressions.AbstractFunctionCallExpression;
-import edu.uci.ics.hyracks.algebricks.core.algebra.expressions.AggregateFunctionCallExpression;
-import edu.uci.ics.hyracks.algebricks.core.algebra.functions.FunctionIdentifier;
-import edu.uci.ics.hyracks.algebricks.core.algebra.functions.IFunctionInfo;
-import edu.uci.ics.hyracks.algebricks.core.algebra.operators.logical.AbstractLogicalOperator;
-import edu.uci.ics.hyracks.algebricks.core.algebra.operators.logical.AggregateOperator;
-import edu.uci.ics.hyracks.algebricks.core.rewriter.base.IAlgebraicRewriteRule;
+import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
+import org.apache.hyracks.algebricks.common.utils.Pair;
+import org.apache.hyracks.algebricks.core.algebra.base.ILogicalExpression;
+import org.apache.hyracks.algebricks.core.algebra.base.ILogicalOperator;
+import org.apache.hyracks.algebricks.core.algebra.base.IOptimizationContext;
+import org.apache.hyracks.algebricks.core.algebra.base.LogicalExpressionTag;
+import org.apache.hyracks.algebricks.core.algebra.base.LogicalOperatorTag;
+import org.apache.hyracks.algebricks.core.algebra.expressions.AbstractFunctionCallExpression;
+import org.apache.hyracks.algebricks.core.algebra.expressions.AggregateFunctionCallExpression;
+import org.apache.hyracks.algebricks.core.algebra.functions.FunctionIdentifier;
+import org.apache.hyracks.algebricks.core.algebra.functions.IFunctionInfo;
+import org.apache.hyracks.algebricks.core.algebra.operators.logical.AbstractLogicalOperator;
+import org.apache.hyracks.algebricks.core.algebra.operators.logical.AggregateOperator;
+import org.apache.hyracks.algebricks.core.rewriter.base.IAlgebraicRewriteRule;
/**
* The rule searches for aggregate operators with an aggregate function
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/PushChildIntoDataScanRule.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/PushChildIntoDataScanRule.java b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/PushChildIntoDataScanRule.java
index 6b052bc..3ad068d 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/PushChildIntoDataScanRule.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/PushChildIntoDataScanRule.java
@@ -28,16 +28,16 @@ import org.apache.vxquery.metadata.VXQueryCollectionDataSource;
import org.apache.vxquery.metadata.VXQueryMetadataProvider;
import org.apache.vxquery.types.ElementType;
-import edu.uci.ics.hyracks.algebricks.common.exceptions.AlgebricksException;
-import edu.uci.ics.hyracks.algebricks.core.algebra.base.ILogicalExpression;
-import edu.uci.ics.hyracks.algebricks.core.algebra.base.ILogicalOperator;
-import edu.uci.ics.hyracks.algebricks.core.algebra.base.IOptimizationContext;
-import edu.uci.ics.hyracks.algebricks.core.algebra.base.LogicalOperatorTag;
-import edu.uci.ics.hyracks.algebricks.core.algebra.metadata.IMetadataProvider;
-import edu.uci.ics.hyracks.algebricks.core.algebra.operators.logical.AbstractLogicalOperator;
-import edu.uci.ics.hyracks.algebricks.core.algebra.operators.logical.AssignOperator;
-import edu.uci.ics.hyracks.algebricks.core.algebra.operators.logical.DataSourceScanOperator;
-import edu.uci.ics.hyracks.algebricks.core.algebra.operators.logical.UnnestOperator;
+import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
+import org.apache.hyracks.algebricks.core.algebra.base.ILogicalExpression;
+import org.apache.hyracks.algebricks.core.algebra.base.ILogicalOperator;
+import org.apache.hyracks.algebricks.core.algebra.base.IOptimizationContext;
+import org.apache.hyracks.algebricks.core.algebra.base.LogicalOperatorTag;
+import org.apache.hyracks.algebricks.core.algebra.metadata.IMetadataProvider;
+import org.apache.hyracks.algebricks.core.algebra.operators.logical.AbstractLogicalOperator;
+import org.apache.hyracks.algebricks.core.algebra.operators.logical.AssignOperator;
+import org.apache.hyracks.algebricks.core.algebra.operators.logical.DataSourceScanOperator;
+import org.apache.hyracks.algebricks.core.algebra.operators.logical.UnnestOperator;
/**
* The rule searches for an unnest operator immediately following a data scan
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/PushFunctionsOntoEqJoinBranches.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/PushFunctionsOntoEqJoinBranches.java b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/PushFunctionsOntoEqJoinBranches.java
index 96b36a5..d713c59 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/PushFunctionsOntoEqJoinBranches.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/PushFunctionsOntoEqJoinBranches.java
@@ -22,22 +22,22 @@ import org.apache.commons.lang3.mutable.Mutable;
import org.apache.commons.lang3.mutable.MutableObject;
import org.apache.vxquery.compiler.rewriter.rules.util.ExpressionToolbox;
-import edu.uci.ics.hyracks.algebricks.common.exceptions.AlgebricksException;
-import edu.uci.ics.hyracks.algebricks.core.algebra.base.ILogicalExpression;
-import edu.uci.ics.hyracks.algebricks.core.algebra.base.ILogicalOperator;
-import edu.uci.ics.hyracks.algebricks.core.algebra.base.IOptimizationContext;
-import edu.uci.ics.hyracks.algebricks.core.algebra.base.LogicalExpressionTag;
-import edu.uci.ics.hyracks.algebricks.core.algebra.base.LogicalOperatorTag;
-import edu.uci.ics.hyracks.algebricks.core.algebra.base.LogicalVariable;
-import edu.uci.ics.hyracks.algebricks.core.algebra.expressions.AbstractFunctionCallExpression;
-import edu.uci.ics.hyracks.algebricks.core.algebra.expressions.VariableReferenceExpression;
-import edu.uci.ics.hyracks.algebricks.core.algebra.functions.AlgebricksBuiltinFunctions;
-import edu.uci.ics.hyracks.algebricks.core.algebra.functions.FunctionIdentifier;
-import edu.uci.ics.hyracks.algebricks.core.algebra.operators.logical.AbstractBinaryJoinOperator;
-import edu.uci.ics.hyracks.algebricks.core.algebra.operators.logical.AbstractLogicalOperator;
-import edu.uci.ics.hyracks.algebricks.core.algebra.operators.logical.AssignOperator;
-import edu.uci.ics.hyracks.algebricks.core.algebra.operators.logical.visitors.VariableUtilities;
-import edu.uci.ics.hyracks.algebricks.core.rewriter.base.IAlgebraicRewriteRule;
+import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
+import org.apache.hyracks.algebricks.core.algebra.base.ILogicalExpression;
+import org.apache.hyracks.algebricks.core.algebra.base.ILogicalOperator;
+import org.apache.hyracks.algebricks.core.algebra.base.IOptimizationContext;
+import org.apache.hyracks.algebricks.core.algebra.base.LogicalExpressionTag;
+import org.apache.hyracks.algebricks.core.algebra.base.LogicalOperatorTag;
+import org.apache.hyracks.algebricks.core.algebra.base.LogicalVariable;
+import org.apache.hyracks.algebricks.core.algebra.expressions.AbstractFunctionCallExpression;
+import org.apache.hyracks.algebricks.core.algebra.expressions.VariableReferenceExpression;
+import org.apache.hyracks.algebricks.core.algebra.functions.AlgebricksBuiltinFunctions;
+import org.apache.hyracks.algebricks.core.algebra.functions.FunctionIdentifier;
+import org.apache.hyracks.algebricks.core.algebra.operators.logical.AbstractBinaryJoinOperator;
+import org.apache.hyracks.algebricks.core.algebra.operators.logical.AbstractLogicalOperator;
+import org.apache.hyracks.algebricks.core.algebra.operators.logical.AssignOperator;
+import org.apache.hyracks.algebricks.core.algebra.operators.logical.visitors.VariableUtilities;
+import org.apache.hyracks.algebricks.core.rewriter.base.IAlgebraicRewriteRule;
public class PushFunctionsOntoEqJoinBranches implements IAlgebraicRewriteRule {
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/RemoveRedundantBooleanExpressionsRule.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/RemoveRedundantBooleanExpressionsRule.java b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/RemoveRedundantBooleanExpressionsRule.java
index ba129c0..ee0032a 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/RemoveRedundantBooleanExpressionsRule.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/RemoveRedundantBooleanExpressionsRule.java
@@ -22,7 +22,7 @@ import org.apache.vxquery.types.BuiltinTypeRegistry;
import org.apache.vxquery.types.Quantifier;
import org.apache.vxquery.types.SequenceType;
-import edu.uci.ics.hyracks.algebricks.core.algebra.functions.FunctionIdentifier;
+import org.apache.hyracks.algebricks.core.algebra.functions.FunctionIdentifier;
/**
* The rule searches for where the xquery boolean function is used. When the
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/RemoveRedundantCastExpressionsRule.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/RemoveRedundantCastExpressionsRule.java b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/RemoveRedundantCastExpressionsRule.java
index 339feea..d3e3c1d 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/RemoveRedundantCastExpressionsRule.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/RemoveRedundantCastExpressionsRule.java
@@ -19,7 +19,7 @@ package org.apache.vxquery.compiler.rewriter.rules;
import org.apache.vxquery.functions.BuiltinOperators;
import org.apache.vxquery.types.SequenceType;
-import edu.uci.ics.hyracks.algebricks.core.algebra.functions.FunctionIdentifier;
+import org.apache.hyracks.algebricks.core.algebra.functions.FunctionIdentifier;
/**
* The rule searches for where the xquery cast function is used. When the
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/RemoveRedundantDataExpressionsRule.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/RemoveRedundantDataExpressionsRule.java b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/RemoveRedundantDataExpressionsRule.java
index 97f98f5..e779601 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/RemoveRedundantDataExpressionsRule.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/RemoveRedundantDataExpressionsRule.java
@@ -19,7 +19,7 @@ package org.apache.vxquery.compiler.rewriter.rules;
import org.apache.vxquery.functions.BuiltinFunctions;
import org.apache.vxquery.types.SequenceType;
-import edu.uci.ics.hyracks.algebricks.core.algebra.functions.FunctionIdentifier;
+import org.apache.hyracks.algebricks.core.algebra.functions.FunctionIdentifier;
/**
* The rule searches for where the xquery data function is used. When the
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/RemoveRedundantPromoteExpressionsRule.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/RemoveRedundantPromoteExpressionsRule.java b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/RemoveRedundantPromoteExpressionsRule.java
index 3700abf..1ae5b46 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/RemoveRedundantPromoteExpressionsRule.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/RemoveRedundantPromoteExpressionsRule.java
@@ -20,7 +20,7 @@ import org.apache.vxquery.functions.BuiltinOperators;
import org.apache.vxquery.types.BuiltinTypeRegistry;
import org.apache.vxquery.types.SequenceType;
-import edu.uci.ics.hyracks.algebricks.core.algebra.functions.FunctionIdentifier;
+import org.apache.hyracks.algebricks.core.algebra.functions.FunctionIdentifier;
/**
* The rule searches for where the xquery promote function is used. When the
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/RemoveRedundantTreatExpressionsRule.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/RemoveRedundantTreatExpressionsRule.java b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/RemoveRedundantTreatExpressionsRule.java
index 60058bc..b7c5fea 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/RemoveRedundantTreatExpressionsRule.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/RemoveRedundantTreatExpressionsRule.java
@@ -20,7 +20,7 @@ import org.apache.vxquery.functions.BuiltinOperators;
import org.apache.vxquery.runtime.functions.type.SequenceTypeMatcher;
import org.apache.vxquery.types.SequenceType;
-import edu.uci.ics.hyracks.algebricks.core.algebra.functions.FunctionIdentifier;
+import org.apache.hyracks.algebricks.core.algebra.functions.FunctionIdentifier;
/**
* The rule searches for where the xquery treat function is used. When the
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/RemoveUnusedSortDistinctNodesRule.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/RemoveUnusedSortDistinctNodesRule.java b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/RemoveUnusedSortDistinctNodesRule.java
index 43e2603..55c8de0 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/RemoveUnusedSortDistinctNodesRule.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/RemoveUnusedSortDistinctNodesRule.java
@@ -30,22 +30,22 @@ import org.apache.vxquery.compiler.rewriter.rules.util.CardinalityRuleToolbox;
import org.apache.vxquery.functions.BuiltinOperators;
import org.apache.vxquery.functions.Function;
-import edu.uci.ics.hyracks.algebricks.common.exceptions.AlgebricksException;
-import edu.uci.ics.hyracks.algebricks.core.algebra.base.ILogicalExpression;
-import edu.uci.ics.hyracks.algebricks.core.algebra.base.ILogicalOperator;
-import edu.uci.ics.hyracks.algebricks.core.algebra.base.IOptimizationContext;
-import edu.uci.ics.hyracks.algebricks.core.algebra.base.LogicalExpressionTag;
-import edu.uci.ics.hyracks.algebricks.core.algebra.base.LogicalOperatorTag;
-import edu.uci.ics.hyracks.algebricks.core.algebra.expressions.AbstractFunctionCallExpression;
-import edu.uci.ics.hyracks.algebricks.core.algebra.expressions.VariableReferenceExpression;
-import edu.uci.ics.hyracks.algebricks.core.algebra.operators.logical.AbstractLogicalOperator;
-import edu.uci.ics.hyracks.algebricks.core.algebra.operators.logical.AggregateOperator;
-import edu.uci.ics.hyracks.algebricks.core.algebra.operators.logical.AssignOperator;
-import edu.uci.ics.hyracks.algebricks.core.algebra.operators.logical.NestedTupleSourceOperator;
-import edu.uci.ics.hyracks.algebricks.core.algebra.operators.logical.OrderOperator;
-import edu.uci.ics.hyracks.algebricks.core.algebra.operators.logical.SubplanOperator;
-import edu.uci.ics.hyracks.algebricks.core.algebra.operators.logical.UnnestOperator;
-import edu.uci.ics.hyracks.algebricks.core.rewriter.base.IAlgebraicRewriteRule;
+import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
+import org.apache.hyracks.algebricks.core.algebra.base.ILogicalExpression;
+import org.apache.hyracks.algebricks.core.algebra.base.ILogicalOperator;
+import org.apache.hyracks.algebricks.core.algebra.base.IOptimizationContext;
+import org.apache.hyracks.algebricks.core.algebra.base.LogicalExpressionTag;
+import org.apache.hyracks.algebricks.core.algebra.base.LogicalOperatorTag;
+import org.apache.hyracks.algebricks.core.algebra.expressions.AbstractFunctionCallExpression;
+import org.apache.hyracks.algebricks.core.algebra.expressions.VariableReferenceExpression;
+import org.apache.hyracks.algebricks.core.algebra.operators.logical.AbstractLogicalOperator;
+import org.apache.hyracks.algebricks.core.algebra.operators.logical.AggregateOperator;
+import org.apache.hyracks.algebricks.core.algebra.operators.logical.AssignOperator;
+import org.apache.hyracks.algebricks.core.algebra.operators.logical.NestedTupleSourceOperator;
+import org.apache.hyracks.algebricks.core.algebra.operators.logical.OrderOperator;
+import org.apache.hyracks.algebricks.core.algebra.operators.logical.SubplanOperator;
+import org.apache.hyracks.algebricks.core.algebra.operators.logical.UnnestOperator;
+import org.apache.hyracks.algebricks.core.rewriter.base.IAlgebraicRewriteRule;
/**
* The rule searches for where the xquery sort distinct function is used and
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/RemoveUnusedUnnestIterateRule.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/RemoveUnusedUnnestIterateRule.java b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/RemoveUnusedUnnestIterateRule.java
index ceab6a9..946f854 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/RemoveUnusedUnnestIterateRule.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/RemoveUnusedUnnestIterateRule.java
@@ -21,20 +21,20 @@ import org.apache.vxquery.compiler.rewriter.rules.propagationpolicies.documentor
import org.apache.vxquery.compiler.rewriter.rules.propagationpolicies.uniquenodes.UniqueNodes;
import org.apache.vxquery.functions.BuiltinOperators;
-import edu.uci.ics.hyracks.algebricks.common.exceptions.AlgebricksException;
-import edu.uci.ics.hyracks.algebricks.core.algebra.base.ILogicalExpression;
-import edu.uci.ics.hyracks.algebricks.core.algebra.base.ILogicalOperator;
-import edu.uci.ics.hyracks.algebricks.core.algebra.base.IOptimizationContext;
-import edu.uci.ics.hyracks.algebricks.core.algebra.base.LogicalExpressionTag;
-import edu.uci.ics.hyracks.algebricks.core.algebra.base.LogicalOperatorTag;
-import edu.uci.ics.hyracks.algebricks.core.algebra.base.LogicalVariable;
-import edu.uci.ics.hyracks.algebricks.core.algebra.expressions.AbstractFunctionCallExpression;
-import edu.uci.ics.hyracks.algebricks.core.algebra.expressions.VariableReferenceExpression;
-import edu.uci.ics.hyracks.algebricks.core.algebra.operators.logical.AbstractLogicalOperator;
-import edu.uci.ics.hyracks.algebricks.core.algebra.operators.logical.AbstractScanOperator;
-import edu.uci.ics.hyracks.algebricks.core.algebra.operators.logical.AssignOperator;
-import edu.uci.ics.hyracks.algebricks.core.algebra.operators.logical.DataSourceScanOperator;
-import edu.uci.ics.hyracks.algebricks.core.algebra.operators.logical.UnnestOperator;
+import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
+import org.apache.hyracks.algebricks.core.algebra.base.ILogicalExpression;
+import org.apache.hyracks.algebricks.core.algebra.base.ILogicalOperator;
+import org.apache.hyracks.algebricks.core.algebra.base.IOptimizationContext;
+import org.apache.hyracks.algebricks.core.algebra.base.LogicalExpressionTag;
+import org.apache.hyracks.algebricks.core.algebra.base.LogicalOperatorTag;
+import org.apache.hyracks.algebricks.core.algebra.base.LogicalVariable;
+import org.apache.hyracks.algebricks.core.algebra.expressions.AbstractFunctionCallExpression;
+import org.apache.hyracks.algebricks.core.algebra.expressions.VariableReferenceExpression;
+import org.apache.hyracks.algebricks.core.algebra.operators.logical.AbstractLogicalOperator;
+import org.apache.hyracks.algebricks.core.algebra.operators.logical.AbstractScanOperator;
+import org.apache.hyracks.algebricks.core.algebra.operators.logical.AssignOperator;
+import org.apache.hyracks.algebricks.core.algebra.operators.logical.DataSourceScanOperator;
+import org.apache.hyracks.algebricks.core.algebra.operators.logical.UnnestOperator;
/**
* The rule searches for an unnest operator (1) immediately following an unnest
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/ReplaceSourceMapInDocExpression.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/ReplaceSourceMapInDocExpression.java b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/ReplaceSourceMapInDocExpression.java
index ba6c2c0..c3cee5e 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/ReplaceSourceMapInDocExpression.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/ReplaceSourceMapInDocExpression.java
@@ -35,18 +35,18 @@ import org.apache.vxquery.types.BuiltinTypeRegistry;
import org.apache.vxquery.types.Quantifier;
import org.apache.vxquery.types.SequenceType;
-import edu.uci.ics.hyracks.algebricks.common.exceptions.AlgebricksException;
-import edu.uci.ics.hyracks.algebricks.core.algebra.base.ILogicalExpression;
-import edu.uci.ics.hyracks.algebricks.core.algebra.base.ILogicalOperator;
-import edu.uci.ics.hyracks.algebricks.core.algebra.base.IOptimizationContext;
-import edu.uci.ics.hyracks.algebricks.core.algebra.base.LogicalExpressionTag;
-import edu.uci.ics.hyracks.algebricks.core.algebra.expressions.AbstractFunctionCallExpression;
-import edu.uci.ics.hyracks.algebricks.core.algebra.expressions.ConstantExpression;
-import edu.uci.ics.hyracks.algebricks.core.algebra.expressions.VariableReferenceExpression;
-import edu.uci.ics.hyracks.algebricks.core.rewriter.base.IAlgebraicRewriteRule;
-import edu.uci.ics.hyracks.data.std.primitive.UTF8StringPointable;
-import edu.uci.ics.hyracks.data.std.util.ArrayBackedValueStorage;
-import edu.uci.ics.hyracks.dataflow.common.comm.util.ByteBufferInputStream;
+import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
+import org.apache.hyracks.algebricks.core.algebra.base.ILogicalExpression;
+import org.apache.hyracks.algebricks.core.algebra.base.ILogicalOperator;
+import org.apache.hyracks.algebricks.core.algebra.base.IOptimizationContext;
+import org.apache.hyracks.algebricks.core.algebra.base.LogicalExpressionTag;
+import org.apache.hyracks.algebricks.core.algebra.expressions.AbstractFunctionCallExpression;
+import org.apache.hyracks.algebricks.core.algebra.expressions.ConstantExpression;
+import org.apache.hyracks.algebricks.core.algebra.expressions.VariableReferenceExpression;
+import org.apache.hyracks.algebricks.core.rewriter.base.IAlgebraicRewriteRule;
+import org.apache.hyracks.data.std.primitive.UTF8StringPointable;
+import org.apache.hyracks.data.std.util.ArrayBackedValueStorage;
+import org.apache.hyracks.dataflow.common.comm.util.ByteBufferInputStream;
/**
* The rule searches for where the function_doc1 function is in the plan in place of XQuery function.
@@ -165,4 +165,4 @@ public class ReplaceSourceMapInDocExpression implements IAlgebraicRewriteRule {
constantExpression.setValue(vxqcv);
return true;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/SetCollectionDataSourceRule.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/SetCollectionDataSourceRule.java b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/SetCollectionDataSourceRule.java
index 496a99c..936a12a 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/SetCollectionDataSourceRule.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/SetCollectionDataSourceRule.java
@@ -19,9 +19,9 @@ package org.apache.vxquery.compiler.rewriter.rules;
import org.apache.commons.lang3.mutable.Mutable;
import org.apache.vxquery.compiler.rewriter.VXQueryOptimizationContext;
-import edu.uci.ics.hyracks.algebricks.common.exceptions.AlgebricksException;
-import edu.uci.ics.hyracks.algebricks.core.algebra.base.ILogicalOperator;
-import edu.uci.ics.hyracks.algebricks.core.algebra.base.IOptimizationContext;
+import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
+import org.apache.hyracks.algebricks.core.algebra.base.ILogicalOperator;
+import org.apache.hyracks.algebricks.core.algebra.base.IOptimizationContext;
/**
* Find the collection functions and generate the data source objects.
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/SetVariableIdContextRule.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/SetVariableIdContextRule.java b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/SetVariableIdContextRule.java
index b810e39..82be94c 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/SetVariableIdContextRule.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/SetVariableIdContextRule.java
@@ -18,13 +18,13 @@ package org.apache.vxquery.compiler.rewriter.rules;
import org.apache.commons.lang3.mutable.Mutable;
-import edu.uci.ics.hyracks.algebricks.common.exceptions.AlgebricksException;
-import edu.uci.ics.hyracks.algebricks.core.algebra.base.ILogicalOperator;
-import edu.uci.ics.hyracks.algebricks.core.algebra.base.IOptimizationContext;
-import edu.uci.ics.hyracks.algebricks.core.algebra.operators.logical.AbstractAssignOperator;
-import edu.uci.ics.hyracks.algebricks.core.algebra.operators.logical.AbstractLogicalOperator;
-import edu.uci.ics.hyracks.algebricks.core.algebra.operators.logical.UnnestOperator;
-import edu.uci.ics.hyracks.algebricks.core.rewriter.base.IAlgebraicRewriteRule;
+import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
+import org.apache.hyracks.algebricks.core.algebra.base.ILogicalOperator;
+import org.apache.hyracks.algebricks.core.algebra.base.IOptimizationContext;
+import org.apache.hyracks.algebricks.core.algebra.operators.logical.AbstractAssignOperator;
+import org.apache.hyracks.algebricks.core.algebra.operators.logical.AbstractLogicalOperator;
+import org.apache.hyracks.algebricks.core.algebra.operators.logical.UnnestOperator;
+import org.apache.hyracks.algebricks.core.rewriter.base.IAlgebraicRewriteRule;
/**
* Set the default context for the variable id in the optimization context.
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/algebricksalternatives/ExtractFunctionsFromJoinConditionRule.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/algebricksalternatives/ExtractFunctionsFromJoinConditionRule.java b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/algebricksalternatives/ExtractFunctionsFromJoinConditionRule.java
index 9847c7f..9ae19f5 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/algebricksalternatives/ExtractFunctionsFromJoinConditionRule.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/algebricksalternatives/ExtractFunctionsFromJoinConditionRule.java
@@ -22,22 +22,22 @@ import java.util.List;
import org.apache.commons.lang3.mutable.Mutable;
import org.apache.commons.lang3.mutable.MutableObject;
-import edu.uci.ics.hyracks.algebricks.common.exceptions.AlgebricksException;
-import edu.uci.ics.hyracks.algebricks.core.algebra.base.ILogicalExpression;
-import edu.uci.ics.hyracks.algebricks.core.algebra.base.ILogicalOperator;
-import edu.uci.ics.hyracks.algebricks.core.algebra.base.IOptimizationContext;
-import edu.uci.ics.hyracks.algebricks.core.algebra.base.LogicalExpressionTag;
-import edu.uci.ics.hyracks.algebricks.core.algebra.base.LogicalOperatorTag;
-import edu.uci.ics.hyracks.algebricks.core.algebra.base.LogicalVariable;
-import edu.uci.ics.hyracks.algebricks.core.algebra.expressions.AbstractFunctionCallExpression;
-import edu.uci.ics.hyracks.algebricks.core.algebra.expressions.VariableReferenceExpression;
-import edu.uci.ics.hyracks.algebricks.core.algebra.functions.AlgebricksBuiltinFunctions;
-import edu.uci.ics.hyracks.algebricks.core.algebra.functions.FunctionIdentifier;
-import edu.uci.ics.hyracks.algebricks.core.algebra.operators.logical.AbstractBinaryJoinOperator;
-import edu.uci.ics.hyracks.algebricks.core.algebra.operators.logical.AbstractLogicalOperator;
-import edu.uci.ics.hyracks.algebricks.core.algebra.operators.logical.AssignOperator;
-import edu.uci.ics.hyracks.algebricks.core.algebra.operators.logical.visitors.VariableUtilities;
-import edu.uci.ics.hyracks.algebricks.core.rewriter.base.IAlgebraicRewriteRule;
+import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
+import org.apache.hyracks.algebricks.core.algebra.base.ILogicalExpression;
+import org.apache.hyracks.algebricks.core.algebra.base.ILogicalOperator;
+import org.apache.hyracks.algebricks.core.algebra.base.IOptimizationContext;
+import org.apache.hyracks.algebricks.core.algebra.base.LogicalExpressionTag;
+import org.apache.hyracks.algebricks.core.algebra.base.LogicalOperatorTag;
+import org.apache.hyracks.algebricks.core.algebra.base.LogicalVariable;
+import org.apache.hyracks.algebricks.core.algebra.expressions.AbstractFunctionCallExpression;
+import org.apache.hyracks.algebricks.core.algebra.expressions.VariableReferenceExpression;
+import org.apache.hyracks.algebricks.core.algebra.functions.AlgebricksBuiltinFunctions;
+import org.apache.hyracks.algebricks.core.algebra.functions.FunctionIdentifier;
+import org.apache.hyracks.algebricks.core.algebra.operators.logical.AbstractBinaryJoinOperator;
+import org.apache.hyracks.algebricks.core.algebra.operators.logical.AbstractLogicalOperator;
+import org.apache.hyracks.algebricks.core.algebra.operators.logical.AssignOperator;
+import org.apache.hyracks.algebricks.core.algebra.operators.logical.visitors.VariableUtilities;
+import org.apache.hyracks.algebricks.core.rewriter.base.IAlgebraicRewriteRule;
/**
* Factors out function expressions from each comparison function or similarity function in join condition by assigning them to a variables, and replacing the function expressions with references to those variables.
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/algebricksalternatives/InlineNestedVariablesRule.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/algebricksalternatives/InlineNestedVariablesRule.java b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/algebricksalternatives/InlineNestedVariablesRule.java
index ca0bc1c..16e3e98 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/algebricksalternatives/InlineNestedVariablesRule.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/algebricksalternatives/InlineNestedVariablesRule.java
@@ -20,19 +20,19 @@ import java.util.List;
import org.apache.commons.lang3.mutable.Mutable;
-import edu.uci.ics.hyracks.algebricks.common.exceptions.AlgebricksException;
-import edu.uci.ics.hyracks.algebricks.core.algebra.base.ILogicalExpression;
-import edu.uci.ics.hyracks.algebricks.core.algebra.base.ILogicalOperator;
-import edu.uci.ics.hyracks.algebricks.core.algebra.base.ILogicalPlan;
-import edu.uci.ics.hyracks.algebricks.core.algebra.base.IOptimizationContext;
-import edu.uci.ics.hyracks.algebricks.core.algebra.base.LogicalExpressionTag;
-import edu.uci.ics.hyracks.algebricks.core.algebra.base.LogicalOperatorTag;
-import edu.uci.ics.hyracks.algebricks.core.algebra.base.LogicalVariable;
-import edu.uci.ics.hyracks.algebricks.core.algebra.expressions.AbstractFunctionCallExpression;
-import edu.uci.ics.hyracks.algebricks.core.algebra.operators.logical.AbstractLogicalOperator;
-import edu.uci.ics.hyracks.algebricks.core.algebra.operators.logical.AbstractOperatorWithNestedPlans;
-import edu.uci.ics.hyracks.algebricks.core.algebra.operators.logical.AssignOperator;
-import edu.uci.ics.hyracks.algebricks.rewriter.rules.InlineVariablesRule;
+import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
+import org.apache.hyracks.algebricks.core.algebra.base.ILogicalExpression;
+import org.apache.hyracks.algebricks.core.algebra.base.ILogicalOperator;
+import org.apache.hyracks.algebricks.core.algebra.base.ILogicalPlan;
+import org.apache.hyracks.algebricks.core.algebra.base.IOptimizationContext;
+import org.apache.hyracks.algebricks.core.algebra.base.LogicalExpressionTag;
+import org.apache.hyracks.algebricks.core.algebra.base.LogicalOperatorTag;
+import org.apache.hyracks.algebricks.core.algebra.base.LogicalVariable;
+import org.apache.hyracks.algebricks.core.algebra.expressions.AbstractFunctionCallExpression;
+import org.apache.hyracks.algebricks.core.algebra.operators.logical.AbstractLogicalOperator;
+import org.apache.hyracks.algebricks.core.algebra.operators.logical.AbstractOperatorWithNestedPlans;
+import org.apache.hyracks.algebricks.core.algebra.operators.logical.AssignOperator;
+import org.apache.hyracks.algebricks.rewriter.rules.InlineVariablesRule;
/**
* Modifies the InlineVariablesRule to also process nested plans.
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/algebricksalternatives/MoveFreeVariableOperatorOutOfSubplanRule.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/algebricksalternatives/MoveFreeVariableOperatorOutOfSubplanRule.java b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/algebricksalternatives/MoveFreeVariableOperatorOutOfSubplanRule.java
index 94b809d..34b10d6 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/algebricksalternatives/MoveFreeVariableOperatorOutOfSubplanRule.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/algebricksalternatives/MoveFreeVariableOperatorOutOfSubplanRule.java
@@ -22,17 +22,17 @@ import java.util.Set;
import org.apache.commons.lang3.mutable.Mutable;
-import edu.uci.ics.hyracks.algebricks.common.exceptions.AlgebricksException;
-import edu.uci.ics.hyracks.algebricks.core.algebra.base.ILogicalOperator;
-import edu.uci.ics.hyracks.algebricks.core.algebra.base.ILogicalPlan;
-import edu.uci.ics.hyracks.algebricks.core.algebra.base.IOptimizationContext;
-import edu.uci.ics.hyracks.algebricks.core.algebra.base.LogicalOperatorTag;
-import edu.uci.ics.hyracks.algebricks.core.algebra.base.LogicalVariable;
-import edu.uci.ics.hyracks.algebricks.core.algebra.operators.logical.AbstractLogicalOperator;
-import edu.uci.ics.hyracks.algebricks.core.algebra.operators.logical.SubplanOperator;
-import edu.uci.ics.hyracks.algebricks.core.algebra.operators.logical.visitors.VariableUtilities;
-import edu.uci.ics.hyracks.algebricks.core.algebra.util.OperatorPropertiesUtil;
-import edu.uci.ics.hyracks.algebricks.rewriter.rules.AbstractDecorrelationRule;
+import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
+import org.apache.hyracks.algebricks.core.algebra.base.ILogicalOperator;
+import org.apache.hyracks.algebricks.core.algebra.base.ILogicalPlan;
+import org.apache.hyracks.algebricks.core.algebra.base.IOptimizationContext;
+import org.apache.hyracks.algebricks.core.algebra.base.LogicalOperatorTag;
+import org.apache.hyracks.algebricks.core.algebra.base.LogicalVariable;
+import org.apache.hyracks.algebricks.core.algebra.operators.logical.AbstractLogicalOperator;
+import org.apache.hyracks.algebricks.core.algebra.operators.logical.SubplanOperator;
+import org.apache.hyracks.algebricks.core.algebra.operators.logical.visitors.VariableUtilities;
+import org.apache.hyracks.algebricks.core.algebra.util.OperatorPropertiesUtil;
+import org.apache.hyracks.algebricks.rewriter.rules.AbstractDecorrelationRule;
/**
* The rule searches for operators that can be moved outside the subplan.
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/propagationpolicies/ConstantPropertyPropagationPolicy.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/propagationpolicies/ConstantPropertyPropagationPolicy.java b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/propagationpolicies/ConstantPropertyPropagationPolicy.java
index fdf555f..3b5266d 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/propagationpolicies/ConstantPropertyPropagationPolicy.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/propagationpolicies/ConstantPropertyPropagationPolicy.java
@@ -34,4 +34,4 @@ public class ConstantPropertyPropagationPolicy<P> implements IPropertyPropagatio
return property;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/propagationpolicies/IPropertyPropagationPolicy.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/propagationpolicies/IPropertyPropagationPolicy.java b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/propagationpolicies/IPropertyPropagationPolicy.java
index ee17378..4d37b3b 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/propagationpolicies/IPropertyPropagationPolicy.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/propagationpolicies/IPropertyPropagationPolicy.java
@@ -22,4 +22,4 @@ public interface IPropertyPropagationPolicy<P> {
public P propagate(List<P> argProperties);
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/propagationpolicies/InputPropertyPropagationPolicy.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/propagationpolicies/InputPropertyPropagationPolicy.java b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/propagationpolicies/InputPropertyPropagationPolicy.java
index 5f4a382..4f0780a 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/propagationpolicies/InputPropertyPropagationPolicy.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/propagationpolicies/InputPropertyPropagationPolicy.java
@@ -34,4 +34,4 @@ public class InputPropertyPropagationPolicy<P> implements IPropertyPropagationPo
return argProperties.get(inputIndex);
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/propagationpolicies/cardinality/Cardinality.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/propagationpolicies/cardinality/Cardinality.java b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/propagationpolicies/cardinality/Cardinality.java
index d906f0d..c4288ac 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/propagationpolicies/cardinality/Cardinality.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/propagationpolicies/cardinality/Cardinality.java
@@ -21,4 +21,4 @@ public enum Cardinality {
ONE,
MANY;
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/propagationpolicies/documentorder/DocumentOrder.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/propagationpolicies/documentorder/DocumentOrder.java b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/propagationpolicies/documentorder/DocumentOrder.java
index b142014..c01d5e6 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/propagationpolicies/documentorder/DocumentOrder.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/propagationpolicies/documentorder/DocumentOrder.java
@@ -21,4 +21,4 @@ public enum DocumentOrder {
YES,
NO;
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/propagationpolicies/documentorder/DocumentOrderNOPropagationPolicy.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/propagationpolicies/documentorder/DocumentOrderNOPropagationPolicy.java b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/propagationpolicies/documentorder/DocumentOrderNOPropagationPolicy.java
index 572e3dc..a09b741 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/propagationpolicies/documentorder/DocumentOrderNOPropagationPolicy.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/propagationpolicies/documentorder/DocumentOrderNOPropagationPolicy.java
@@ -24,4 +24,4 @@ public class DocumentOrderNOPropagationPolicy extends ConstantPropertyPropagatio
super(DocumentOrder.NO);
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/propagationpolicies/documentorder/DocumentOrderYESPropagationPolicy.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/propagationpolicies/documentorder/DocumentOrderYESPropagationPolicy.java b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/propagationpolicies/documentorder/DocumentOrderYESPropagationPolicy.java
index c72a736..9641de6 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/propagationpolicies/documentorder/DocumentOrderYESPropagationPolicy.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/propagationpolicies/documentorder/DocumentOrderYESPropagationPolicy.java
@@ -24,4 +24,4 @@ public class DocumentOrderYESPropagationPolicy extends ConstantPropertyPropagati
super(DocumentOrder.YES);
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/propagationpolicies/uniquenodes/UniqueNodes.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/propagationpolicies/uniquenodes/UniqueNodes.java b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/propagationpolicies/uniquenodes/UniqueNodes.java
index fca5864..a0ea383 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/propagationpolicies/uniquenodes/UniqueNodes.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/propagationpolicies/uniquenodes/UniqueNodes.java
@@ -21,4 +21,4 @@ public enum UniqueNodes {
YES,
NO;
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/propagationpolicies/uniquenodes/UniqueNodesNOPropagationPolicy.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/propagationpolicies/uniquenodes/UniqueNodesNOPropagationPolicy.java b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/propagationpolicies/uniquenodes/UniqueNodesNOPropagationPolicy.java
index 85d9856..a5b8ac1 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/propagationpolicies/uniquenodes/UniqueNodesNOPropagationPolicy.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/propagationpolicies/uniquenodes/UniqueNodesNOPropagationPolicy.java
@@ -24,4 +24,4 @@ public class UniqueNodesNOPropagationPolicy extends ConstantPropertyPropagationP
super(UniqueNodes.NO);
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/propagationpolicies/uniquenodes/UniqueNodesYESPropagationPolicy.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/propagationpolicies/uniquenodes/UniqueNodesYESPropagationPolicy.java b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/propagationpolicies/uniquenodes/UniqueNodesYESPropagationPolicy.java
index 4c4b7b9..f21a5cc 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/propagationpolicies/uniquenodes/UniqueNodesYESPropagationPolicy.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/propagationpolicies/uniquenodes/UniqueNodesYESPropagationPolicy.java
@@ -24,4 +24,4 @@ public class UniqueNodesYESPropagationPolicy extends ConstantPropertyPropagation
super(UniqueNodes.YES);
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/util/CardinalityRuleToolbox.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/util/CardinalityRuleToolbox.java b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/util/CardinalityRuleToolbox.java
index 5b4594e..7744eb2 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/util/CardinalityRuleToolbox.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/util/CardinalityRuleToolbox.java
@@ -19,10 +19,10 @@ package org.apache.vxquery.compiler.rewriter.rules.util;
import org.apache.vxquery.compiler.rewriter.VXQueryOptimizationContext;
import org.apache.vxquery.compiler.rewriter.rules.propagationpolicies.cardinality.Cardinality;
-import edu.uci.ics.hyracks.algebricks.core.algebra.base.ILogicalOperator;
-import edu.uci.ics.hyracks.algebricks.core.algebra.operators.logical.AbstractLogicalOperator;
-import edu.uci.ics.hyracks.algebricks.core.algebra.operators.logical.AbstractOperatorWithNestedPlans;
-import edu.uci.ics.hyracks.algebricks.core.algebra.operators.logical.NestedTupleSourceOperator;
+import org.apache.hyracks.algebricks.core.algebra.base.ILogicalOperator;
+import org.apache.hyracks.algebricks.core.algebra.operators.logical.AbstractLogicalOperator;
+import org.apache.hyracks.algebricks.core.algebra.operators.logical.AbstractOperatorWithNestedPlans;
+import org.apache.hyracks.algebricks.core.algebra.operators.logical.NestedTupleSourceOperator;
public class CardinalityRuleToolbox {
/**
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/util/ExpressionToolbox.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/util/ExpressionToolbox.java b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/util/ExpressionToolbox.java
index 7e916d7..10a8dca 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/util/ExpressionToolbox.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/util/ExpressionToolbox.java
@@ -29,18 +29,18 @@ import org.apache.vxquery.types.AnyNodeType;
import org.apache.vxquery.types.Quantifier;
import org.apache.vxquery.types.SequenceType;
-import edu.uci.ics.hyracks.algebricks.core.algebra.base.ILogicalExpression;
-import edu.uci.ics.hyracks.algebricks.core.algebra.base.ILogicalOperator;
-import edu.uci.ics.hyracks.algebricks.core.algebra.base.LogicalExpressionTag;
-import edu.uci.ics.hyracks.algebricks.core.algebra.base.LogicalVariable;
-import edu.uci.ics.hyracks.algebricks.core.algebra.expressions.AbstractFunctionCallExpression;
-import edu.uci.ics.hyracks.algebricks.core.algebra.expressions.ConstantExpression;
-import edu.uci.ics.hyracks.algebricks.core.algebra.expressions.VariableReferenceExpression;
-import edu.uci.ics.hyracks.algebricks.core.algebra.functions.FunctionIdentifier;
-import edu.uci.ics.hyracks.algebricks.core.algebra.operators.logical.AbstractAssignOperator;
-import edu.uci.ics.hyracks.algebricks.core.algebra.operators.logical.AbstractLogicalOperator;
-import edu.uci.ics.hyracks.algebricks.core.algebra.operators.logical.UnnestOperator;
-import edu.uci.ics.hyracks.data.std.primitive.IntegerPointable;
+import org.apache.hyracks.algebricks.core.algebra.base.ILogicalExpression;
+import org.apache.hyracks.algebricks.core.algebra.base.ILogicalOperator;
+import org.apache.hyracks.algebricks.core.algebra.base.LogicalExpressionTag;
+import org.apache.hyracks.algebricks.core.algebra.base.LogicalVariable;
+import org.apache.hyracks.algebricks.core.algebra.expressions.AbstractFunctionCallExpression;
+import org.apache.hyracks.algebricks.core.algebra.expressions.ConstantExpression;
+import org.apache.hyracks.algebricks.core.algebra.expressions.VariableReferenceExpression;
+import org.apache.hyracks.algebricks.core.algebra.functions.FunctionIdentifier;
+import org.apache.hyracks.algebricks.core.algebra.operators.logical.AbstractAssignOperator;
+import org.apache.hyracks.algebricks.core.algebra.operators.logical.AbstractLogicalOperator;
+import org.apache.hyracks.algebricks.core.algebra.operators.logical.UnnestOperator;
+import org.apache.hyracks.data.std.primitive.IntegerPointable;
public class ExpressionToolbox {
public static Mutable<ILogicalExpression> findVariableExpression(Mutable<ILogicalExpression> mutableLe,
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/util/OperatorToolbox.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/util/OperatorToolbox.java b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/util/OperatorToolbox.java
index 78cd80f..2c57c32 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/util/OperatorToolbox.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/util/OperatorToolbox.java
@@ -21,17 +21,17 @@ import java.util.List;
import org.apache.commons.lang3.mutable.Mutable;
-import edu.uci.ics.hyracks.algebricks.core.algebra.base.ILogicalExpression;
-import edu.uci.ics.hyracks.algebricks.core.algebra.base.ILogicalOperator;
-import edu.uci.ics.hyracks.algebricks.core.algebra.base.LogicalOperatorTag;
-import edu.uci.ics.hyracks.algebricks.core.algebra.base.LogicalVariable;
-import edu.uci.ics.hyracks.algebricks.core.algebra.operators.logical.AbstractAssignOperator;
-import edu.uci.ics.hyracks.algebricks.core.algebra.operators.logical.AbstractBinaryJoinOperator;
-import edu.uci.ics.hyracks.algebricks.core.algebra.operators.logical.AbstractLogicalOperator;
-import edu.uci.ics.hyracks.algebricks.core.algebra.operators.logical.AbstractScanOperator;
-import edu.uci.ics.hyracks.algebricks.core.algebra.operators.logical.AbstractUnnestOperator;
-import edu.uci.ics.hyracks.algebricks.core.algebra.operators.logical.NestedTupleSourceOperator;
-import edu.uci.ics.hyracks.algebricks.core.algebra.operators.logical.SelectOperator;
+import org.apache.hyracks.algebricks.core.algebra.base.ILogicalExpression;
+import org.apache.hyracks.algebricks.core.algebra.base.ILogicalOperator;
+import org.apache.hyracks.algebricks.core.algebra.base.LogicalOperatorTag;
+import org.apache.hyracks.algebricks.core.algebra.base.LogicalVariable;
+import org.apache.hyracks.algebricks.core.algebra.operators.logical.AbstractAssignOperator;
+import org.apache.hyracks.algebricks.core.algebra.operators.logical.AbstractBinaryJoinOperator;
+import org.apache.hyracks.algebricks.core.algebra.operators.logical.AbstractLogicalOperator;
+import org.apache.hyracks.algebricks.core.algebra.operators.logical.AbstractScanOperator;
+import org.apache.hyracks.algebricks.core.algebra.operators.logical.AbstractUnnestOperator;
+import org.apache.hyracks.algebricks.core.algebra.operators.logical.NestedTupleSourceOperator;
+import org.apache.hyracks.algebricks.core.algebra.operators.logical.SelectOperator;
public class OperatorToolbox {
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/context/DefaultDocumentURIResolverImpl.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/context/DefaultDocumentURIResolverImpl.java b/vxquery-core/src/main/java/org/apache/vxquery/context/DefaultDocumentURIResolverImpl.java
index 84bde33..3d763d5 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/context/DefaultDocumentURIResolverImpl.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/context/DefaultDocumentURIResolverImpl.java
@@ -33,4 +33,4 @@ public class DefaultDocumentURIResolverImpl implements DocumentURIResolver {
if (! file.isAbsolute()) file = new File(base + "/" + href);
return new FileInputStream(file);
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/context/DelegatingStaticContextImpl.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/context/DelegatingStaticContextImpl.java b/vxquery-core/src/main/java/org/apache/vxquery/context/DelegatingStaticContextImpl.java
index dec7d81..bffcd25 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/context/DelegatingStaticContextImpl.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/context/DelegatingStaticContextImpl.java
@@ -295,4 +295,4 @@ public abstract class DelegatingStaticContextImpl implements StaticContext {
public void setOrderingModeProperty(OrderingModeProperty orderingMode) {
parent.setOrderingModeProperty(orderingMode);
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/context/DocumentURIResolver.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/context/DocumentURIResolver.java b/vxquery-core/src/main/java/org/apache/vxquery/context/DocumentURIResolver.java
index de68016..5df5a86 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/context/DocumentURIResolver.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/context/DocumentURIResolver.java
@@ -21,4 +21,4 @@ import java.io.InputStream;
public interface DocumentURIResolver {
public InputStream resolveDocumentURI(String base, String href) throws IOException;
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/context/DynamicContext.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/context/DynamicContext.java b/vxquery-core/src/main/java/org/apache/vxquery/context/DynamicContext.java
index da85b33..2b3ec8a 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/context/DynamicContext.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/context/DynamicContext.java
@@ -18,8 +18,8 @@ package org.apache.vxquery.context;
import javax.xml.namespace.QName;
-import edu.uci.ics.hyracks.data.std.api.IPointable;
-import edu.uci.ics.hyracks.data.std.api.IValueReference;
+import org.apache.hyracks.data.std.api.IPointable;
+import org.apache.hyracks.data.std.api.IValueReference;
public interface DynamicContext {
public IDynamicContextFactory createFactory();
@@ -33,4 +33,4 @@ public interface DynamicContext {
public void bindVariable(QName var, IValueReference vReference);
public void lookupVariable(QName var, IPointable value);
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/context/DynamicContextImpl.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/context/DynamicContextImpl.java b/vxquery-core/src/main/java/org/apache/vxquery/context/DynamicContextImpl.java
index 9f59644..6a2a930 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/context/DynamicContextImpl.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/context/DynamicContextImpl.java
@@ -21,9 +21,9 @@ import java.util.Map;
import javax.xml.namespace.QName;
-import edu.uci.ics.hyracks.data.std.api.IPointable;
-import edu.uci.ics.hyracks.data.std.api.IValueReference;
-import edu.uci.ics.hyracks.data.std.util.ArrayBackedValueStorage;
+import org.apache.hyracks.data.std.api.IPointable;
+import org.apache.hyracks.data.std.api.IValueReference;
+import org.apache.hyracks.data.std.util.ArrayBackedValueStorage;
public class DynamicContextImpl implements DynamicContext {
private StaticContext sCtx;
@@ -82,4 +82,4 @@ public class DynamicContextImpl implements DynamicContext {
Map<QName, ArrayBackedValueStorage> getVariableMap() {
return variables;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/context/DynamicContextImplFactory.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/context/DynamicContextImplFactory.java b/vxquery-core/src/main/java/org/apache/vxquery/context/DynamicContextImplFactory.java
index a8fd821..a30c5ad 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/context/DynamicContextImplFactory.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/context/DynamicContextImplFactory.java
@@ -23,9 +23,9 @@ import javax.xml.namespace.QName;
import org.apache.vxquery.datamodel.accessors.atomic.XSDateTimePointable;
-import edu.uci.ics.hyracks.api.context.IHyracksJobletContext;
-import edu.uci.ics.hyracks.data.std.primitive.VoidPointable;
-import edu.uci.ics.hyracks.data.std.util.ArrayBackedValueStorage;
+import org.apache.hyracks.api.context.IHyracksJobletContext;
+import org.apache.hyracks.data.std.primitive.VoidPointable;
+import org.apache.hyracks.data.std.util.ArrayBackedValueStorage;
class DynamicContextImplFactory implements IDynamicContextFactory {
private static final long serialVersionUID = 1L;
@@ -91,4 +91,4 @@ class DynamicContextImplFactory implements IDynamicContextFactory {
return new DynamicContextImplFactory(scFactory, currentDateTime, variableNames, valueOffsets,
Arrays.copyOfRange(abvs.getByteArray(), abvs.getStartOffset(), abvs.getLength()));
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/context/IDynamicContextFactory.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/context/IDynamicContextFactory.java b/vxquery-core/src/main/java/org/apache/vxquery/context/IDynamicContextFactory.java
index c004357..2e8a7b3 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/context/IDynamicContextFactory.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/context/IDynamicContextFactory.java
@@ -18,8 +18,8 @@ package org.apache.vxquery.context;
import java.io.Serializable;
-import edu.uci.ics.hyracks.api.context.IHyracksJobletContext;
+import org.apache.hyracks.api.context.IHyracksJobletContext;
public interface IDynamicContextFactory extends Serializable {
public DynamicContext createDynamicContext(IHyracksJobletContext ctx);
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/context/IStaticContextFactory.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/context/IStaticContextFactory.java b/vxquery-core/src/main/java/org/apache/vxquery/context/IStaticContextFactory.java
index bf46935..c74ddd7 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/context/IStaticContextFactory.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/context/IStaticContextFactory.java
@@ -20,4 +20,4 @@ import java.io.Serializable;
public interface IStaticContextFactory extends Serializable {
public StaticContext createStaticContext();
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/context/ModuleURIResolver.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/context/ModuleURIResolver.java b/vxquery-core/src/main/java/org/apache/vxquery/context/ModuleURIResolver.java
index 9b5d927..20ca42a 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/context/ModuleURIResolver.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/context/ModuleURIResolver.java
@@ -20,4 +20,4 @@ import java.io.InputStream;
public interface ModuleURIResolver {
public InputStream[] resolve(String moduleUri, String baseUri, String[] locationHints);
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/context/RootStaticContextFactory.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/context/RootStaticContextFactory.java b/vxquery-core/src/main/java/org/apache/vxquery/context/RootStaticContextFactory.java
index 48ddbcf..b766f05 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/context/RootStaticContextFactory.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/context/RootStaticContextFactory.java
@@ -28,4 +28,4 @@ public class RootStaticContextFactory implements IStaticContextFactory {
public StaticContext createStaticContext() {
return RootStaticContextImpl.INSTANCE;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/context/RootStaticContextImpl.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/context/RootStaticContextImpl.java b/vxquery-core/src/main/java/org/apache/vxquery/context/RootStaticContextImpl.java
index a219dab..cd80824 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/context/RootStaticContextImpl.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/context/RootStaticContextImpl.java
@@ -218,4 +218,4 @@ public final class RootStaticContextImpl extends StaticContextImpl {
public IStaticContextFactory createFactory() {
return RootStaticContextFactory.INSTANCE;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/context/StaticContext.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/context/StaticContext.java b/vxquery-core/src/main/java/org/apache/vxquery/context/StaticContext.java
index 31693ee..815cf78 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/context/StaticContext.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/context/StaticContext.java
@@ -162,4 +162,4 @@ public interface StaticContext {
}
public IStaticContextFactory createFactory();
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/context/StaticContextImpl.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/context/StaticContextImpl.java b/vxquery-core/src/main/java/org/apache/vxquery/context/StaticContextImpl.java
index 09cfaff..c3aeda9 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/context/StaticContextImpl.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/context/StaticContextImpl.java
@@ -654,4 +654,4 @@ public class StaticContextImpl implements StaticContext {
}
}
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/context/StaticContextImplFactory.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/context/StaticContextImplFactory.java b/vxquery-core/src/main/java/org/apache/vxquery/context/StaticContextImplFactory.java
index 879c84d..12d3c33 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/context/StaticContextImplFactory.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/context/StaticContextImplFactory.java
@@ -47,4 +47,4 @@ class StaticContextImplFactory implements IStaticContextFactory {
return new StaticContextImplFactory(parentSCFactory, new ArrayList<SequenceType>(
staticContextImpl.getSequenceTypeList()));
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/context/ThinStaticContextImpl.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/context/ThinStaticContextImpl.java b/vxquery-core/src/main/java/org/apache/vxquery/context/ThinStaticContextImpl.java
index ea87dda..5873fcb 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/context/ThinStaticContextImpl.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/context/ThinStaticContextImpl.java
@@ -47,4 +47,4 @@ public class ThinStaticContextImpl extends DelegatingStaticContextImpl {
public IStaticContextFactory createFactory() {
return ThinStaticContextImplFactory.createInstance(this);
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/context/ThinStaticContextImplFactory.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/context/ThinStaticContextImplFactory.java b/vxquery-core/src/main/java/org/apache/vxquery/context/ThinStaticContextImplFactory.java
index 079f4af..b0fe514 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/context/ThinStaticContextImplFactory.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/context/ThinStaticContextImplFactory.java
@@ -34,4 +34,4 @@ class ThinStaticContextImplFactory implements IStaticContextFactory {
IStaticContextFactory delegateSCFactory = staticContextImpl.getParent().createFactory();
return new ThinStaticContextImplFactory(delegateSCFactory);
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/context/XQueryVariable.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/context/XQueryVariable.java b/vxquery-core/src/main/java/org/apache/vxquery/context/XQueryVariable.java
index cdd79b2..15c7fc5 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/context/XQueryVariable.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/context/XQueryVariable.java
@@ -20,7 +20,7 @@ import javax.xml.namespace.QName;
import org.apache.vxquery.types.SequenceType;
-import edu.uci.ics.hyracks.algebricks.core.algebra.base.LogicalVariable;
+import org.apache.hyracks.algebricks.core.algebra.base.LogicalVariable;
public class XQueryVariable {
private final QName name;
@@ -46,4 +46,4 @@ public class XQueryVariable {
public LogicalVariable getLogicalVariable() {
return var;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/PointableCache.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/PointableCache.java b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/PointableCache.java
index c362e7d..adbe097 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/PointableCache.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/PointableCache.java
@@ -19,7 +19,7 @@ package org.apache.vxquery.datamodel.accessors;
import java.util.ArrayList;
import java.util.List;
-import edu.uci.ics.hyracks.data.std.api.IPointable;
+import org.apache.hyracks.data.std.api.IPointable;
public class PointableCache<T extends IPointable> {
private final List<T> list;
@@ -38,4 +38,4 @@ public class PointableCache<T extends IPointable> {
public void giveBack(T pointable) {
list.add(pointable);
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/PointablePool.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/PointablePool.java b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/PointablePool.java
index 4eccf33..1a85781 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/PointablePool.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/PointablePool.java
@@ -19,8 +19,8 @@ package org.apache.vxquery.datamodel.accessors;
import java.util.HashMap;
import java.util.Map;
-import edu.uci.ics.hyracks.data.std.api.IPointable;
-import edu.uci.ics.hyracks.data.std.api.IPointableFactory;
+import org.apache.hyracks.data.std.api.IPointable;
+import org.apache.hyracks.data.std.api.IPointableFactory;
public class PointablePool {
private final Map<Class<? extends IPointable>, IPointableFactory> pfMap;
@@ -53,4 +53,4 @@ public class PointablePool {
PointableCache<T> pc = (PointableCache<T>) pcMap.get(pointable.getClass());
pc.giveBack(pointable);
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/PointablePoolFactory.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/PointablePoolFactory.java b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/PointablePoolFactory.java
index 7a5b6e8..9ec9bab 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/PointablePoolFactory.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/PointablePoolFactory.java
@@ -31,15 +31,15 @@ import org.apache.vxquery.datamodel.accessors.nodes.NodeTreePointable;
import org.apache.vxquery.datamodel.accessors.nodes.PINodePointable;
import org.apache.vxquery.datamodel.accessors.nodes.TextOrCommentNodePointable;
-import edu.uci.ics.hyracks.data.std.primitive.BooleanPointable;
-import edu.uci.ics.hyracks.data.std.primitive.BytePointable;
-import edu.uci.ics.hyracks.data.std.primitive.DoublePointable;
-import edu.uci.ics.hyracks.data.std.primitive.FloatPointable;
-import edu.uci.ics.hyracks.data.std.primitive.IntegerPointable;
-import edu.uci.ics.hyracks.data.std.primitive.LongPointable;
-import edu.uci.ics.hyracks.data.std.primitive.ShortPointable;
-import edu.uci.ics.hyracks.data.std.primitive.UTF8StringPointable;
-import edu.uci.ics.hyracks.data.std.primitive.VoidPointable;
+import org.apache.hyracks.data.std.primitive.BooleanPointable;
+import org.apache.hyracks.data.std.primitive.BytePointable;
+import org.apache.hyracks.data.std.primitive.DoublePointable;
+import org.apache.hyracks.data.std.primitive.FloatPointable;
+import org.apache.hyracks.data.std.primitive.IntegerPointable;
+import org.apache.hyracks.data.std.primitive.LongPointable;
+import org.apache.hyracks.data.std.primitive.ShortPointable;
+import org.apache.hyracks.data.std.primitive.UTF8StringPointable;
+import org.apache.hyracks.data.std.primitive.VoidPointable;
public class PointablePoolFactory {
public static final PointablePoolFactory INSTANCE = new PointablePoolFactory();
@@ -79,4 +79,4 @@ public class PointablePoolFactory {
return pp;
}
-}
\ No newline at end of file
+}
[08/50] [abbrv] vxquery git commit: Shivani's changes for fixing an
additional XMark query, adding XMark query documentation,
and updating the XMark test suite.
Posted by sj...@apache.org.
Shivani's changes for fixing an additional XMark query, adding XMark query documentation, and updating the XMark test suite.
Project: http://git-wip-us.apache.org/repos/asf/vxquery/repo
Commit: http://git-wip-us.apache.org/repos/asf/vxquery/commit/44717b26
Tree: http://git-wip-us.apache.org/repos/asf/vxquery/tree/44717b26
Diff: http://git-wip-us.apache.org/repos/asf/vxquery/diff/44717b26
Branch: refs/heads/site
Commit: 44717b2673aa4cf616a1639067535197aea543ea
Parents: 7fc0d93
Author: Preston Carman <pr...@apache.org>
Authored: Tue Aug 18 19:17:33 2015 -0700
Committer: Preston Carman <pr...@apache.org>
Committed: Tue Aug 18 19:17:33 2015 -0700
----------------------------------------------------------------------
src/site/apt/development_xmark_status.apt | 76 ++++++++++++++++++++
src/site/site.xml | 27 +++----
.../rules/PushChildIntoDataScanRule.java | 49 +++++++------
.../metadata/VXQueryMetadataProvider.java | 14 +++-
.../xmlquery/query/XMLQueryCompiler.java | 3 +-
.../ExpectedTestResults/Simple/fn_doc.txt | 2 +-
.../ExpectedTestResults/XMark/Modified/q13.txt | 34 ++++-----
.../ExpectedTestResults/XMark/Modified/q14.txt | 5 +-
.../ExpectedTestResults/XMark/Original/q13.txt | 34 ++++-----
.../ExpectedTestResults/XMark/Original/q14.txt | 5 +-
.../XMark/Original/simple_query1.txt | 1 -
.../XMark/Original/simple_query2.txt | 4 --
12 files changed, 156 insertions(+), 98 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/vxquery/blob/44717b26/src/site/apt/development_xmark_status.apt
----------------------------------------------------------------------
diff --git a/src/site/apt/development_xmark_status.apt b/src/site/apt/development_xmark_status.apt
new file mode 100644
index 0000000..a7a6f6c
--- /dev/null
+++ b/src/site/apt/development_xmark_status.apt
@@ -0,0 +1,76 @@
+~~ Licensed to the Apache Software Foundation (ASF) under one or more
+~~ contributor license agreements. See the NOTICE file distributed with
+~~ this work for additional information regarding copyright ownership.
+~~ The ASF licenses this file to You under the Apache License, Version 2.0
+~~ (the "License"); you may not use this file except in compliance with
+~~ the License. You may obtain a copy of the License at
+~~
+~~ http://www.apache.org/licenses/LICENSE-2.0
+~~
+~~ Unless required by applicable law or agreed to in writing, software
+~~ distributed under the License is distributed on an "AS IS" BASIS,
+~~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+~~ See the License for the specific language governing permissions and
+~~ limitations under the License.
+
+
+XMark Benchmark Documentation
+
+ In the following table, XMark queries are listed to show the current status of
+ each query in VXQuery. The <Query Number> column represents the XMark query
+ number. <Original Query> column represents the original XMark query from the XMark Benchmark site. Original query
+ works if it has a <Working> status in the column. If the original query does not work, then
+ the column displays the error type. <Optimized Query> column represents
+ the parallel optimized version for the original XMark query. The optimized version of the query
+ has been written to increase performance. Optimized query
+ works if it has a <Working> status in the column. If the optimized query does not work, then
+ the column displays the error or displays <Same Error as Original Query>.
+ <Frame Size> column represents the frame size that VXQuery needs to run the query.
+ The <Issues> column represents the JIRA issues for the query or are related to the query.
+ All queries that do not work with the default frame size
+ are related to {{{https://issues.apache.org/jira/browse/VXQUERY-167} VXQuery Issue 167 }}.
+
+
+*------------------+--------------------+---------------------+-----------------+-----------+
+| <<Query Number>> | <<Original Query>> | <<Optimized Query>> | <<Frame Size>> | <<Issues>> |
+*------------------+--------------------+---------------------+-----------------+-----------:
+| 1 | Working | Working | Working with default size | None |
+*------------------+--------------------+---------------------+-----------------+-----------:
+| 2 | Working | Working | Working with default size | None |
+*------------------+--------------------+---------------------+-----------------+-----------:
+| 3 | Working | Working | Working with default size | None |
+*------------------+--------------------+---------------------+-----------------+-----------:
+| 4 | Working | Working| Working with default size | None |
+*------------------+--------------------+---------------------+-----------------+-----------:
+| 5 | Working | Working | Working with default size | None |
+*------------------+--------------------+---------------------+-----------------+-----------:
+| 6 | Error in the Query Plan | Same Error as Original Query | Cannot be determined | {{{https://issues.apache.org/jira/browse/VXQUERY-170} VXQuery Issue 170 }} |
+*------------------+--------------------+---------------------+-----------------+-----------:
+| 7 | Error in the Query Plan | Same Error as Original Query | Cannot be determined | {{{https://issues.apache.org/jira/browse/VXQUERY-170} VXQuery Issue 170 }} |
+*------------------+--------------------+---------------------+-----------------+-----------:
+| 8 | Working | Working | Working with default size | {{{https://issues.apache.org/jira/browse/VXQUERY-171} VXQuery Issue 171 }} |
+*------------------+--------------------+---------------------+-----------------+-----------:
+| 9 | Array Out Of bounds Exception | Same Error as Original Query | Cannot be determined | {{{https://issues.apache.org/jira/browse/VXQUERY-173} VXQuery Issue 173 }} |
+*------------------+--------------------+---------------------+-----------------+-----------:
+| 10 | Times out while execution | Same Error as Original Query | Cannot be determined | {{{https://issues.apache.org/jira/browse/VXQUERY-176} VXQuery Issue 176 }} |
+*------------------+--------------------+---------------------+-----------------+-----------:
+| 11 | Working | Working | Working with default size | {{{https://issues.apache.org/jira/browse/VXQUERY-171} VXQuery Issue 171 }} |
+*------------------+--------------------+---------------------+-----------------+-----------:
+| 12 | Working | Working |Working with default size | {{{https://issues.apache.org/jira/browse/VXQUERY-172} VXQuery Issue 172 }} |
+*------------------+--------------------+---------------------+-----------------+-----------:
+| 13 | Working | Working |Working with default size | None |
+*------------------+--------------------+---------------------+-----------------+-----------:
+| 14 | Working | Working |Working with max size | None |
+*------------------+--------------------+---------------------+-----------------+-----------:
+| 15 | Working | Working | Working with max size | {{{https://issues.apache.org/jira/browse/VXQUERY-174} VXQuery Issue 174 }} |
+*------------------+--------------------+---------------------+-----------------+-----------:
+| 16 | Working | Working |Working with max size | None |
+*------------------+--------------------+---------------------+-----------------+-----------:
+| 17 | Working | Working | Working with default size | {{{https://issues.apache.org/jira/browse/VXQUERY-171} VXQuery Issue 171 }} |
+*------------------+--------------------+---------------------+-----------------+-----------:
+| 18 | Use defined functions | Same Error as Original Query | Cannot be determined | {{{https://issues.apache.org/jira/browse/VXQUERY-154} VXQuery Issue 154 }} |
+*------------------+--------------------+---------------------+-----------------+-----------:
+| 19 | Working | Working | Working with default size | {{{https://issues.apache.org/jira/browse/VXQUERY-172} VXQuery Issue 172 }} |
+*------------------+--------------------+---------------------+-----------------+-----------:
+| 20 | Empty results | Same Error as Original Query | Working with frame size | {{{https://issues.apache.org/jira/browse/VXQUERY-175} VXQuery Issue 175 }} |
+*------------------+--------------------+---------------------+-----------------+-----------:
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/vxquery/blob/44717b26/src/site/site.xml
----------------------------------------------------------------------
diff --git a/src/site/site.xml b/src/site/site.xml
index 08e4522..b9612c1 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -20,19 +20,16 @@ limitations under the License.
<src>images/VXQuery.png</src>
<href>http://vxquery.apache.org/</href>
</bannerLeft>
-
<bannerRight>
<name>Apache Software Foundation</name>
<src>images/asf_logo_wide.png</src>
<href>http://www.apache.org/</href>
</bannerRight>
-
<skin>
<groupId>org.apache.maven.skins</groupId>
<artifactId>maven-fluido-skin</artifactId>
<version>1.3.1</version>
</skin>
-
<body>
<menu name="Apache Software Foundation">
<item
@@ -48,13 +45,11 @@ limitations under the License.
name="Security"
href="http://www.apache.org/security/" />
</menu>
-
<menu name="Get VXQuery">
<item
name="Download"
href="http://www.apache.org/dyn/closer.cgi/vxquery/" />
</menu>
-
<menu name="For Users">
<item
name="Get Started"
@@ -72,7 +67,6 @@ limitations under the License.
name="Running the Test Suite"
href="user_running_tests.html" />
</menu>
-
<menu name="For Developers">
<item
name="Get Started"
@@ -96,28 +90,23 @@ limitations under the License.
name="Update Local Git XQTS Results"
href="development_update_xqts_results.html" />
<item
+ name="XMark Benchmark Status"
+ href="development_xmark_status.html" />
+ <item
name="XML Data and Node Types"
href="development_xml_node_details.html" />
<item
name="XML Data Model Example"
href="development_xml_document.html" />
- <!-- <item
- name="XQuery Benchmarks"
- href="development_benchmarks.html" /> -->
</menu>
-
<menu ref="reports" />
<menu ref="modules" />
-
<footer>
- <div class="row-fluid">Apache VXQuery, VXQuery, Apache, the Apache
- feather logo, and the Apache VXQuery project logo are either
- registered trademarks or trademarks of The Apache Software
- Foundation in the United States and other countries.
- All other marks mentioned may be trademarks or registered
- trademarks of their respective owners.
+ <div class="row-fluid">Apache VXQuery, VXQuery, Apache, the Apache feather logo, and the Apache VXQuery project logo
+ are either registered trademarks or trademarks of The Apache Software Foundation in the United States
+ and other countries. All other marks mentioned may be trademarks or registered trademarks of their
+ respective owners.
</div>
</footer>
</body>
-</project>
-
+</project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/vxquery/blob/44717b26/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/PushChildIntoDataScanRule.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/PushChildIntoDataScanRule.java b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/PushChildIntoDataScanRule.java
index 3c23731..6b052bc 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/PushChildIntoDataScanRule.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/PushChildIntoDataScanRule.java
@@ -18,67 +18,64 @@ package org.apache.vxquery.compiler.rewriter.rules;
import java.util.ArrayList;
import java.util.List;
-import java.util.ListIterator;
import org.apache.commons.lang3.mutable.Mutable;
-import org.apache.commons.lang3.mutable.MutableObject;
+import org.apache.vxquery.compiler.rewriter.VXQueryOptimizationContext;
import org.apache.vxquery.compiler.rewriter.rules.util.ExpressionToolbox;
-import org.apache.vxquery.context.RootStaticContextImpl;
-import org.apache.vxquery.context.StaticContextImpl;
-import org.apache.vxquery.datamodel.accessors.TaggedValuePointable;
-import org.apache.vxquery.functions.BuiltinFunctions;
+import org.apache.vxquery.context.StaticContext;
import org.apache.vxquery.functions.BuiltinOperators;
-import org.apache.vxquery.functions.Function;
import org.apache.vxquery.metadata.VXQueryCollectionDataSource;
-import org.apache.vxquery.types.SequenceType;
+import org.apache.vxquery.metadata.VXQueryMetadataProvider;
+import org.apache.vxquery.types.ElementType;
import edu.uci.ics.hyracks.algebricks.common.exceptions.AlgebricksException;
import edu.uci.ics.hyracks.algebricks.core.algebra.base.ILogicalExpression;
import edu.uci.ics.hyracks.algebricks.core.algebra.base.ILogicalOperator;
import edu.uci.ics.hyracks.algebricks.core.algebra.base.IOptimizationContext;
-import edu.uci.ics.hyracks.algebricks.core.algebra.base.LogicalExpressionTag;
import edu.uci.ics.hyracks.algebricks.core.algebra.base.LogicalOperatorTag;
-import edu.uci.ics.hyracks.algebricks.core.algebra.expressions.AbstractFunctionCallExpression;
-import edu.uci.ics.hyracks.algebricks.core.algebra.expressions.ConstantExpression;
+import edu.uci.ics.hyracks.algebricks.core.algebra.metadata.IMetadataProvider;
import edu.uci.ics.hyracks.algebricks.core.algebra.operators.logical.AbstractLogicalOperator;
import edu.uci.ics.hyracks.algebricks.core.algebra.operators.logical.AssignOperator;
import edu.uci.ics.hyracks.algebricks.core.algebra.operators.logical.DataSourceScanOperator;
import edu.uci.ics.hyracks.algebricks.core.algebra.operators.logical.UnnestOperator;
-import edu.uci.ics.hyracks.data.std.primitive.IntegerPointable;
/**
* The rule searches for an unnest operator immediately following a data scan
* operator.
- *
+ *
* <pre>
- * Before
- *
+ * Before
+ *
* plan__parent
* UNNEST( $v2 : child( $v1 ) )
* DATASCAN( $source : $v1 )
* plan__child
- *
+ *
* Where $v1 is not used in plan__parent.
- *
+ *
* After
- *
+ *
* plan__parent
* DATASCAN( $source : $v1 )
* plan__child
- *
+ *
* $source is encoded with the child parameters.
* </pre>
- *
+ *
* @author prestonc
*/
public class PushChildIntoDataScanRule extends AbstractUsedVariablesProcessingRule {
- final StaticContextImpl dCtx = new StaticContextImpl(RootStaticContextImpl.INSTANCE);
+ StaticContext dCtx = null;
final int ARG_DATA = 0;
final int ARG_TYPE = 1;
protected boolean processOperator(Mutable<ILogicalOperator> opRef, IOptimizationContext context)
throws AlgebricksException {
- AbstractLogicalOperator op1 = (AbstractLogicalOperator) opRef.getValue();;
+ if (dCtx == null) {
+ IMetadataProvider metadataProvider = ((VXQueryOptimizationContext) context).getMetadataProvider();
+ dCtx = ((VXQueryMetadataProvider) metadataProvider).getStaticContext();
+ }
+ AbstractLogicalOperator op1 = (AbstractLogicalOperator) opRef.getValue();
if (op1.getOperatorTag() != LogicalOperatorTag.UNNEST) {
return false;
}
@@ -110,7 +107,7 @@ public class PushChildIntoDataScanRule extends AbstractUsedVariablesProcessingRu
/**
* In reverse add them to the data source.
- *
+ *
* @param ds
* @param expression
*/
@@ -121,8 +118,10 @@ public class PushChildIntoDataScanRule extends AbstractUsedVariablesProcessingRu
for (int i = finds.size(); i > 0; --i) {
int typeId = ExpressionToolbox.getTypeExpressionTypeArgument(finds.get(i - 1));
if (typeId > 0) {
- ds.addChildSeq(typeId);
- added = true;
+ if (dCtx.lookupSequenceType(typeId).getItemType().equals(ElementType.ANYELEMENT) && typeId > 0) {
+ ds.addChildSeq(typeId);
+ added = true;
+ }
}
}
return added;
http://git-wip-us.apache.org/repos/asf/vxquery/blob/44717b26/vxquery-core/src/main/java/org/apache/vxquery/metadata/VXQueryMetadataProvider.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/metadata/VXQueryMetadataProvider.java b/vxquery-core/src/main/java/org/apache/vxquery/metadata/VXQueryMetadataProvider.java
index b2ab17c..ea4bdb1 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/metadata/VXQueryMetadataProvider.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/metadata/VXQueryMetadataProvider.java
@@ -22,6 +22,8 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Map;
+import org.apache.vxquery.context.StaticContext;
+
import edu.uci.ics.hyracks.algebricks.common.constraints.AlgebricksAbsolutePartitionConstraint;
import edu.uci.ics.hyracks.algebricks.common.constraints.AlgebricksPartitionConstraint;
import edu.uci.ics.hyracks.algebricks.common.exceptions.AlgebricksException;
@@ -52,12 +54,14 @@ import edu.uci.ics.hyracks.api.job.JobSpecification;
import edu.uci.ics.hyracks.dataflow.std.result.ResultWriterOperatorDescriptor;
public class VXQueryMetadataProvider implements IMetadataProvider<String, String> {
- String[] nodeList;
- Map<String, File> sourceFileMap;
+ private final String[] nodeList;
+ private final Map<String, File> sourceFileMap;
+ private final StaticContext staticCtx;
- public VXQueryMetadataProvider(String[] nodeList, Map<String, File> sourceFileMap) {
+ public VXQueryMetadataProvider(String[] nodeList, Map<String, File> sourceFileMap, StaticContext staticCtx) {
this.nodeList = nodeList;
this.sourceFileMap = sourceFileMap;
+ this.staticCtx = staticCtx;
}
@Override
@@ -69,6 +73,10 @@ public class VXQueryMetadataProvider implements IMetadataProvider<String, String
return sourceFileMap;
}
+ public StaticContext getStaticContext() {
+ return staticCtx;
+ }
+
@Override
public Pair<IOperatorDescriptor, AlgebricksPartitionConstraint> getScannerRuntime(IDataSource<String> dataSource,
List<LogicalVariable> scanVariables, List<LogicalVariable> projectVariables, boolean projectPushed,
http://git-wip-us.apache.org/repos/asf/vxquery/blob/44717b26/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/query/XMLQueryCompiler.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/query/XMLQueryCompiler.java b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/query/XMLQueryCompiler.java
index d9c5d01..aea6ef7 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/query/XMLQueryCompiler.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/query/XMLQueryCompiler.java
@@ -199,7 +199,8 @@ public class XMLQueryCompiler {
module = new XMLQueryTranslator(ccb).translateModule(moduleNode);
pprinter = new LogicalOperatorPrettyPrintVisitor(new VXQueryLogicalExpressionPrettyPrintVisitor(
module.getModuleContext()));
- VXQueryMetadataProvider mdProvider = new VXQueryMetadataProvider(nodeList, ccb.getSourceFileMap());
+ VXQueryMetadataProvider mdProvider = new VXQueryMetadataProvider(nodeList, ccb.getSourceFileMap(),
+ module.getModuleContext());
compiler = cFactory.createCompiler(module.getBody(), mdProvider, 0);
listener.notifyTranslationResult(module);
XMLQueryTypeChecker.typeCheckModule(module);
http://git-wip-us.apache.org/repos/asf/vxquery/blob/44717b26/vxquery-xtest/src/test/resources/ExpectedTestResults/Simple/fn_doc.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/ExpectedTestResults/Simple/fn_doc.txt b/vxquery-xtest/src/test/resources/ExpectedTestResults/Simple/fn_doc.txt
index 169a175..3b9d17a 100644
--- a/vxquery-xtest/src/test/resources/ExpectedTestResults/Simple/fn_doc.txt
+++ b/vxquery-xtest/src/test/resources/ExpectedTestResults/Simple/fn_doc.txt
@@ -1 +1 @@
-<stationCollection pageSize="100"pageCount="1"totalCount="1"><station><id>GHCND:US000000001</id><displayName>Station 1</displayName><latitude>10.000</latitude><longitude>-10.000</longitude><elevation>1000.0</elevation><locationLabels><type>ST</type><id>FIPS:1</id><displayName>State 1</displayName></locationLabels><locationLabels><type>CNTY</type><id>FIPS:-9999</id><displayName>County 1</displayName></locationLabels><locationLabels><type>CNTRY</type><id>FIPS:US</id><displayName>UNITED STATES</displayName></locationLabels></station></stationCollection>
\ No newline at end of file
+<stationCollection pageSize="100" pageCount="1" totalCount="1"><station><id>GHCND:US000000001</id><displayName>Station 1</displayName><latitude>10.000</latitude><longitude>-10.000</longitude><elevation>1000.0</elevation><locationLabels><type>ST</type><id>FIPS:1</id><displayName>State 1</displayName></locationLabels><locationLabels><type>CNTY</type><id>FIPS:-9999</id><displayName>County 1</displayName></locationLabels><locationLabels><type>CNTRY</type><id>FIPS:US</id><displayName>UNITED STATES</displayName></locationLabels></station></stationCollection>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/vxquery/blob/44717b26/vxquery-xtest/src/test/resources/ExpectedTestResults/XMark/Modified/q13.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/ExpectedTestResults/XMark/Modified/q13.txt b/vxquery-xtest/src/test/resources/ExpectedTestResults/XMark/Modified/q13.txt
index 6b7bf95..cce306b 100644
--- a/vxquery-xtest/src/test/resources/ExpectedTestResults/XMark/Modified/q13.txt
+++ b/vxquery-xtest/src/test/resources/ExpectedTestResults/XMark/Modified/q13.txt
@@ -1,14 +1,11 @@
-<item name="cockatrice approves money">
- <description>
- <text>clothes edmund doubtful fool torments ropes contrive lecher ardea
+<item name="cockatrice approves money"><description>
+ <text>clothes edmund doubtful fool torments ropes contrive lecher ardea
happiness fertile treads constable defences<keyword>lion
neighbour ourself</keyword>marshal disordered moderate venus
afeard article rot hazards craft crowns<emph>plainness patient</emph>lying knowledge diseases meritorious medicine</text>
- </description>
-</item>
-<item name="answer misdoubt">
- <description>
- <text>delay brutish rage alexandria trumpet god wet resolve pursue colour
+ </description></item>
+<item name="answer misdoubt"><description>
+ <text>delay brutish rage alexandria trumpet god wet resolve pursue colour
body walk month writing beside profane left declining coach through
protectorship congruent confusion favours following populous
exercise timon shoots function fourscore mangled favorably slain
@@ -27,17 +24,13 @@
holly walk inform moods deck bulk begin action school nobles
antique people unkennel stomach into petitions jack assail yongrey
ages betimes golden sink droop kernel hoppedance perfection weight<emph>whining safe english rod other featur</emph>
- </text>
- </description>
-</item>
-<item name="prosperity dine yon debate">
- <description>
- <text>visitation strangely mab spirit forgot bargain holds</text>
- </description>
-</item>
-<item name="congeal pawned alack">
- <description>
- <text>white obey<bold>calling neighbour office afternoon drum embowell
+ </text>
+ </description></item>
+<item name="prosperity dine yon debate"><description>
+ <text>visitation strangely mab spirit forgot bargain holds</text>
+ </description></item>
+<item name="congeal pawned alack"><description>
+ <text>white obey<bold>calling neighbour office afternoon drum embowell
touch sue lifeless leapt shun called</bold>weary congregation
yield check falling wives challenge mental fatal hard ancient
stands cor dishes therein gramercy discipline farewell dire tricks
@@ -51,5 +44,4 @@
verona</keyword>waters triumphing officer hastily<emph>resign
subject figure hay thwart written signs gout bred distance period
glove players change folly</emph>going wat lost</text>
- </description>
-</item>
\ No newline at end of file
+ </description></item>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/vxquery/blob/44717b26/vxquery-xtest/src/test/resources/ExpectedTestResults/XMark/Modified/q14.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/ExpectedTestResults/XMark/Modified/q14.txt b/vxquery-xtest/src/test/resources/ExpectedTestResults/XMark/Modified/q14.txt
index d201f0a..8a313a5 100644
--- a/vxquery-xtest/src/test/resources/ExpectedTestResults/XMark/Modified/q14.txt
+++ b/vxquery-xtest/src/test/resources/ExpectedTestResults/XMark/Modified/q14.txt
@@ -1 +1,4 @@
-condemnanswer misdoubtnearest sighswronged revels swell coz
\ No newline at end of file
+condemn
+answer misdoubt
+nearest sighs
+wronged revels swell coz
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/vxquery/blob/44717b26/vxquery-xtest/src/test/resources/ExpectedTestResults/XMark/Original/q13.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/ExpectedTestResults/XMark/Original/q13.txt b/vxquery-xtest/src/test/resources/ExpectedTestResults/XMark/Original/q13.txt
index 6b7bf95..cce306b 100644
--- a/vxquery-xtest/src/test/resources/ExpectedTestResults/XMark/Original/q13.txt
+++ b/vxquery-xtest/src/test/resources/ExpectedTestResults/XMark/Original/q13.txt
@@ -1,14 +1,11 @@
-<item name="cockatrice approves money">
- <description>
- <text>clothes edmund doubtful fool torments ropes contrive lecher ardea
+<item name="cockatrice approves money"><description>
+ <text>clothes edmund doubtful fool torments ropes contrive lecher ardea
happiness fertile treads constable defences<keyword>lion
neighbour ourself</keyword>marshal disordered moderate venus
afeard article rot hazards craft crowns<emph>plainness patient</emph>lying knowledge diseases meritorious medicine</text>
- </description>
-</item>
-<item name="answer misdoubt">
- <description>
- <text>delay brutish rage alexandria trumpet god wet resolve pursue colour
+ </description></item>
+<item name="answer misdoubt"><description>
+ <text>delay brutish rage alexandria trumpet god wet resolve pursue colour
body walk month writing beside profane left declining coach through
protectorship congruent confusion favours following populous
exercise timon shoots function fourscore mangled favorably slain
@@ -27,17 +24,13 @@
holly walk inform moods deck bulk begin action school nobles
antique people unkennel stomach into petitions jack assail yongrey
ages betimes golden sink droop kernel hoppedance perfection weight<emph>whining safe english rod other featur</emph>
- </text>
- </description>
-</item>
-<item name="prosperity dine yon debate">
- <description>
- <text>visitation strangely mab spirit forgot bargain holds</text>
- </description>
-</item>
-<item name="congeal pawned alack">
- <description>
- <text>white obey<bold>calling neighbour office afternoon drum embowell
+ </text>
+ </description></item>
+<item name="prosperity dine yon debate"><description>
+ <text>visitation strangely mab spirit forgot bargain holds</text>
+ </description></item>
+<item name="congeal pawned alack"><description>
+ <text>white obey<bold>calling neighbour office afternoon drum embowell
touch sue lifeless leapt shun called</bold>weary congregation
yield check falling wives challenge mental fatal hard ancient
stands cor dishes therein gramercy discipline farewell dire tricks
@@ -51,5 +44,4 @@
verona</keyword>waters triumphing officer hastily<emph>resign
subject figure hay thwart written signs gout bred distance period
glove players change folly</emph>going wat lost</text>
- </description>
-</item>
\ No newline at end of file
+ </description></item>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/vxquery/blob/44717b26/vxquery-xtest/src/test/resources/ExpectedTestResults/XMark/Original/q14.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/ExpectedTestResults/XMark/Original/q14.txt b/vxquery-xtest/src/test/resources/ExpectedTestResults/XMark/Original/q14.txt
index d201f0a..8a313a5 100644
--- a/vxquery-xtest/src/test/resources/ExpectedTestResults/XMark/Original/q14.txt
+++ b/vxquery-xtest/src/test/resources/ExpectedTestResults/XMark/Original/q14.txt
@@ -1 +1,4 @@
-condemnanswer misdoubtnearest sighswronged revels swell coz
\ No newline at end of file
+condemn
+answer misdoubt
+nearest sighs
+wronged revels swell coz
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/vxquery/blob/44717b26/vxquery-xtest/src/test/resources/ExpectedTestResults/XMark/Original/simple_query1.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/ExpectedTestResults/XMark/Original/simple_query1.txt b/vxquery-xtest/src/test/resources/ExpectedTestResults/XMark/Original/simple_query1.txt
deleted file mode 100644
index 9043899..0000000
--- a/vxquery-xtest/src/test/resources/ExpectedTestResults/XMark/Original/simple_query1.txt
+++ /dev/null
@@ -1 +0,0 @@
-TestSources/XMark/SingleFile/auction.xml
http://git-wip-us.apache.org/repos/asf/vxquery/blob/44717b26/vxquery-xtest/src/test/resources/ExpectedTestResults/XMark/Original/simple_query2.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/ExpectedTestResults/XMark/Original/simple_query2.txt b/vxquery-xtest/src/test/resources/ExpectedTestResults/XMark/Original/simple_query2.txt
deleted file mode 100644
index d8f9c8a..0000000
--- a/vxquery-xtest/src/test/resources/ExpectedTestResults/XMark/Original/simple_query2.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-<catgraph>
- <edge from="category0" to="category0"/>
- <edge from="category0" to="category0"/>
-</catgraph>
[16/50] [abbrv] vxquery git commit: VXQUERY-181 - Move to Hyracks
0.2.16
Posted by sj...@apache.org.
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsNotationOperation.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsNotationOperation.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsNotationOperation.java
index 6219305..b5ea6e2 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsNotationOperation.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsNotationOperation.java
@@ -29,12 +29,12 @@ import org.apache.vxquery.datamodel.accessors.atomic.XSTimePointable;
import org.apache.vxquery.exceptions.ErrorCode;
import org.apache.vxquery.exceptions.SystemException;
-import edu.uci.ics.hyracks.data.std.primitive.BooleanPointable;
-import edu.uci.ics.hyracks.data.std.primitive.DoublePointable;
-import edu.uci.ics.hyracks.data.std.primitive.FloatPointable;
-import edu.uci.ics.hyracks.data.std.primitive.IntegerPointable;
-import edu.uci.ics.hyracks.data.std.primitive.LongPointable;
-import edu.uci.ics.hyracks.data.std.primitive.UTF8StringPointable;
+import org.apache.hyracks.data.std.primitive.BooleanPointable;
+import org.apache.hyracks.data.std.primitive.DoublePointable;
+import org.apache.hyracks.data.std.primitive.FloatPointable;
+import org.apache.hyracks.data.std.primitive.IntegerPointable;
+import org.apache.hyracks.data.std.primitive.LongPointable;
+import org.apache.hyracks.data.std.primitive.UTF8StringPointable;
public class CastableAsNotationOperation extends AbstractCastableAsOperation {
public void convertAnyURI(UTF8StringPointable stringp, DataOutput dOut) throws SystemException, IOException {
@@ -128,4 +128,4 @@ public class CastableAsNotationOperation extends AbstractCastableAsOperation {
public void convertYMDuration(IntegerPointable intp, DataOutput dOut) throws SystemException, IOException {
throw new SystemException(ErrorCode.XPTY0004);
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsPositiveIntegerOperation.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsPositiveIntegerOperation.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsPositiveIntegerOperation.java
index af55a52..f75a254 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsPositiveIntegerOperation.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsPositiveIntegerOperation.java
@@ -18,4 +18,4 @@ package org.apache.vxquery.runtime.functions.castable;
public class CastableAsPositiveIntegerOperation extends CastableAsIntegerOperation {
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsQNameOperation.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsQNameOperation.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsQNameOperation.java
index 25bafbe..6c2c9ef 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsQNameOperation.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsQNameOperation.java
@@ -23,7 +23,7 @@ import org.apache.vxquery.datamodel.accessors.atomic.XSQNamePointable;
import org.apache.vxquery.datamodel.values.ValueTag;
import org.apache.vxquery.exceptions.SystemException;
-import edu.uci.ics.hyracks.data.std.primitive.UTF8StringPointable;
+import org.apache.hyracks.data.std.primitive.UTF8StringPointable;
public class CastableAsQNameOperation extends AbstractCastableAsOperation {
@@ -39,4 +39,4 @@ public class CastableAsQNameOperation extends AbstractCastableAsOperation {
dOut.write((byte) 1);
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsShortOperation.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsShortOperation.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsShortOperation.java
index 2754ea5..444e4c9 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsShortOperation.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsShortOperation.java
@@ -24,14 +24,14 @@ import org.apache.vxquery.datamodel.values.ValueTag;
import org.apache.vxquery.exceptions.SystemException;
import org.apache.vxquery.runtime.functions.cast.CastToShortOperation;
-import edu.uci.ics.hyracks.data.std.primitive.BooleanPointable;
-import edu.uci.ics.hyracks.data.std.primitive.BytePointable;
-import edu.uci.ics.hyracks.data.std.primitive.DoublePointable;
-import edu.uci.ics.hyracks.data.std.primitive.FloatPointable;
-import edu.uci.ics.hyracks.data.std.primitive.LongPointable;
-import edu.uci.ics.hyracks.data.std.primitive.ShortPointable;
-import edu.uci.ics.hyracks.data.std.primitive.UTF8StringPointable;
-import edu.uci.ics.hyracks.data.std.util.ArrayBackedValueStorage;
+import org.apache.hyracks.data.std.primitive.BooleanPointable;
+import org.apache.hyracks.data.std.primitive.BytePointable;
+import org.apache.hyracks.data.std.primitive.DoublePointable;
+import org.apache.hyracks.data.std.primitive.FloatPointable;
+import org.apache.hyracks.data.std.primitive.LongPointable;
+import org.apache.hyracks.data.std.primitive.ShortPointable;
+import org.apache.hyracks.data.std.primitive.UTF8StringPointable;
+import org.apache.hyracks.data.std.util.ArrayBackedValueStorage;
public class CastableAsShortOperation extends AbstractCastableAsOperation {
private ArrayBackedValueStorage abvsInner = new ArrayBackedValueStorage();
@@ -119,4 +119,4 @@ public class CastableAsShortOperation extends AbstractCastableAsOperation {
dOut.write(ValueTag.XS_BOOLEAN_TAG);
dOut.write((byte) 1);
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsStringOperation.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsStringOperation.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsStringOperation.java
index 2a34c62..ae6abdf 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsStringOperation.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsStringOperation.java
@@ -29,12 +29,12 @@ import org.apache.vxquery.datamodel.accessors.atomic.XSTimePointable;
import org.apache.vxquery.datamodel.values.ValueTag;
import org.apache.vxquery.exceptions.SystemException;
-import edu.uci.ics.hyracks.data.std.primitive.BooleanPointable;
-import edu.uci.ics.hyracks.data.std.primitive.DoublePointable;
-import edu.uci.ics.hyracks.data.std.primitive.FloatPointable;
-import edu.uci.ics.hyracks.data.std.primitive.IntegerPointable;
-import edu.uci.ics.hyracks.data.std.primitive.LongPointable;
-import edu.uci.ics.hyracks.data.std.primitive.UTF8StringPointable;
+import org.apache.hyracks.data.std.primitive.BooleanPointable;
+import org.apache.hyracks.data.std.primitive.DoublePointable;
+import org.apache.hyracks.data.std.primitive.FloatPointable;
+import org.apache.hyracks.data.std.primitive.IntegerPointable;
+import org.apache.hyracks.data.std.primitive.LongPointable;
+import org.apache.hyracks.data.std.primitive.UTF8StringPointable;
public class CastableAsStringOperation extends AbstractCastableAsOperation {
@@ -174,4 +174,4 @@ public class CastableAsStringOperation extends AbstractCastableAsOperation {
dOut.write(ValueTag.XS_BOOLEAN_TAG);
dOut.write((byte) 1);
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsTimeOperation.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsTimeOperation.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsTimeOperation.java
index c9a8030..5c435c2 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsTimeOperation.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsTimeOperation.java
@@ -25,8 +25,8 @@ import org.apache.vxquery.datamodel.values.ValueTag;
import org.apache.vxquery.exceptions.SystemException;
import org.apache.vxquery.runtime.functions.cast.CastToTimeOperation;
-import edu.uci.ics.hyracks.data.std.primitive.UTF8StringPointable;
-import edu.uci.ics.hyracks.data.std.util.ArrayBackedValueStorage;
+import org.apache.hyracks.data.std.primitive.UTF8StringPointable;
+import org.apache.hyracks.data.std.util.ArrayBackedValueStorage;
public class CastableAsTimeOperation extends AbstractCastableAsOperation {
private ArrayBackedValueStorage abvsInner = new ArrayBackedValueStorage();
@@ -63,4 +63,4 @@ public class CastableAsTimeOperation extends AbstractCastableAsOperation {
convertString(stringp, dOut);
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsUnsignedByteOperation.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsUnsignedByteOperation.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsUnsignedByteOperation.java
index be8eb17..0b7446b 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsUnsignedByteOperation.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsUnsignedByteOperation.java
@@ -18,4 +18,4 @@ package org.apache.vxquery.runtime.functions.castable;
public class CastableAsUnsignedByteOperation extends CastableAsShortOperation {
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsUnsignedIntOperation.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsUnsignedIntOperation.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsUnsignedIntOperation.java
index 63c69e1..0b96f5f 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsUnsignedIntOperation.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsUnsignedIntOperation.java
@@ -18,4 +18,4 @@ package org.apache.vxquery.runtime.functions.castable;
public class CastableAsUnsignedIntOperation extends CastableAsIntegerOperation {
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsUnsignedLongOperation.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsUnsignedLongOperation.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsUnsignedLongOperation.java
index 17a1ce4..3ab5278 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsUnsignedLongOperation.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsUnsignedLongOperation.java
@@ -18,4 +18,4 @@ package org.apache.vxquery.runtime.functions.castable;
public class CastableAsUnsignedLongOperation extends CastableAsIntegerOperation {
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsUnsignedShortOperation.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsUnsignedShortOperation.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsUnsignedShortOperation.java
index c3a7441..3445bcf 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsUnsignedShortOperation.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsUnsignedShortOperation.java
@@ -18,4 +18,4 @@ package org.apache.vxquery.runtime.functions.castable;
public class CastableAsUnsignedShortOperation extends CastableAsIntOperation {
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsUntypedAtomicOperation.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsUntypedAtomicOperation.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsUntypedAtomicOperation.java
index 8d31990..b22185c 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsUntypedAtomicOperation.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsUntypedAtomicOperation.java
@@ -17,4 +17,4 @@
package org.apache.vxquery.runtime.functions.castable;
public class CastableAsUntypedAtomicOperation extends CastableAsStringOperation {
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsYMDurationOperation.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsYMDurationOperation.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsYMDurationOperation.java
index 2beef20..46876bf 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsYMDurationOperation.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsYMDurationOperation.java
@@ -24,10 +24,10 @@ import org.apache.vxquery.datamodel.values.ValueTag;
import org.apache.vxquery.exceptions.SystemException;
import org.apache.vxquery.runtime.functions.cast.CastToYMDurationOperation;
-import edu.uci.ics.hyracks.data.std.primitive.IntegerPointable;
-import edu.uci.ics.hyracks.data.std.primitive.LongPointable;
-import edu.uci.ics.hyracks.data.std.primitive.UTF8StringPointable;
-import edu.uci.ics.hyracks.data.std.util.ArrayBackedValueStorage;
+import org.apache.hyracks.data.std.primitive.IntegerPointable;
+import org.apache.hyracks.data.std.primitive.LongPointable;
+import org.apache.hyracks.data.std.primitive.UTF8StringPointable;
+import org.apache.hyracks.data.std.util.ArrayBackedValueStorage;
public class CastableAsYMDurationOperation extends AbstractCastableAsOperation {
private ArrayBackedValueStorage abvsInner = new ArrayBackedValueStorage();
@@ -70,4 +70,4 @@ public class CastableAsYMDurationOperation extends AbstractCastableAsOperation {
dOut.write((byte) 1);
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableScalarEvaluatorFactory.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableScalarEvaluatorFactory.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableScalarEvaluatorFactory.java
index e93bb5c..b76c74a 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableScalarEvaluatorFactory.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableScalarEvaluatorFactory.java
@@ -28,12 +28,12 @@ import org.apache.vxquery.runtime.functions.type.AbstractTypeScalarEvaluatorFact
import org.apache.vxquery.types.BuiltinTypeRegistry;
import org.apache.vxquery.types.SequenceType;
-import edu.uci.ics.hyracks.algebricks.common.exceptions.AlgebricksException;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluator;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
-import edu.uci.ics.hyracks.api.context.IHyracksTaskContext;
-import edu.uci.ics.hyracks.data.std.api.IPointable;
-import edu.uci.ics.hyracks.data.std.util.ArrayBackedValueStorage;
+import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluator;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
+import org.apache.hyracks.api.context.IHyracksTaskContext;
+import org.apache.hyracks.data.std.api.IPointable;
+import org.apache.hyracks.data.std.util.ArrayBackedValueStorage;
public class CastableScalarEvaluatorFactory extends AbstractTypeScalarEvaluatorFactory {
private static final long serialVersionUID = 1L;
@@ -358,4 +358,4 @@ public class CastableScalarEvaluatorFactory extends AbstractTypeScalarEvaluatorF
};
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/comparison/AbstractDisjunctiveComparisonOperation.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/comparison/AbstractDisjunctiveComparisonOperation.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/comparison/AbstractDisjunctiveComparisonOperation.java
index f00479b..05bf961 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/comparison/AbstractDisjunctiveComparisonOperation.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/comparison/AbstractDisjunctiveComparisonOperation.java
@@ -28,12 +28,12 @@ import org.apache.vxquery.datamodel.accessors.atomic.XSQNamePointable;
import org.apache.vxquery.datamodel.accessors.atomic.XSTimePointable;
import org.apache.vxquery.exceptions.SystemException;
-import edu.uci.ics.hyracks.data.std.primitive.BooleanPointable;
-import edu.uci.ics.hyracks.data.std.primitive.DoublePointable;
-import edu.uci.ics.hyracks.data.std.primitive.FloatPointable;
-import edu.uci.ics.hyracks.data.std.primitive.IntegerPointable;
-import edu.uci.ics.hyracks.data.std.primitive.LongPointable;
-import edu.uci.ics.hyracks.data.std.primitive.UTF8StringPointable;
+import org.apache.hyracks.data.std.primitive.BooleanPointable;
+import org.apache.hyracks.data.std.primitive.DoublePointable;
+import org.apache.hyracks.data.std.primitive.FloatPointable;
+import org.apache.hyracks.data.std.primitive.IntegerPointable;
+import org.apache.hyracks.data.std.primitive.LongPointable;
+import org.apache.hyracks.data.std.primitive.UTF8StringPointable;
public abstract class AbstractDisjunctiveComparisonOperation extends AbstractValueComparisonOperation {
final AbstractValueComparisonOperation aOp1 = createBaseComparisonOperation1();
@@ -326,4 +326,4 @@ public abstract class AbstractDisjunctiveComparisonOperation extends AbstractVal
IOException {
return (aOp1.operateYMDurationYMDuration(intp1, intp2) || aOp2.operateYMDurationYMDuration(intp1, intp2));
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/comparison/AbstractNegatingComparisonOperation.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/comparison/AbstractNegatingComparisonOperation.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/comparison/AbstractNegatingComparisonOperation.java
index 9976270..1c0b7ef 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/comparison/AbstractNegatingComparisonOperation.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/comparison/AbstractNegatingComparisonOperation.java
@@ -28,12 +28,12 @@ import org.apache.vxquery.datamodel.accessors.atomic.XSQNamePointable;
import org.apache.vxquery.datamodel.accessors.atomic.XSTimePointable;
import org.apache.vxquery.exceptions.SystemException;
-import edu.uci.ics.hyracks.data.std.primitive.BooleanPointable;
-import edu.uci.ics.hyracks.data.std.primitive.DoublePointable;
-import edu.uci.ics.hyracks.data.std.primitive.FloatPointable;
-import edu.uci.ics.hyracks.data.std.primitive.IntegerPointable;
-import edu.uci.ics.hyracks.data.std.primitive.LongPointable;
-import edu.uci.ics.hyracks.data.std.primitive.UTF8StringPointable;
+import org.apache.hyracks.data.std.primitive.BooleanPointable;
+import org.apache.hyracks.data.std.primitive.DoublePointable;
+import org.apache.hyracks.data.std.primitive.FloatPointable;
+import org.apache.hyracks.data.std.primitive.IntegerPointable;
+import org.apache.hyracks.data.std.primitive.LongPointable;
+import org.apache.hyracks.data.std.primitive.UTF8StringPointable;
public abstract class AbstractNegatingComparisonOperation extends AbstractValueComparisonOperation {
final AbstractValueComparisonOperation aOp = createBaseComparisonOperation();
@@ -316,4 +316,4 @@ public abstract class AbstractNegatingComparisonOperation extends AbstractValueC
return !aOp.operateYMDurationYMDuration(intp1, intp2);
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/comparison/AbstractValueComparisonOperation.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/comparison/AbstractValueComparisonOperation.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/comparison/AbstractValueComparisonOperation.java
index 7f29a25..61383ff 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/comparison/AbstractValueComparisonOperation.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/comparison/AbstractValueComparisonOperation.java
@@ -28,12 +28,12 @@ import org.apache.vxquery.datamodel.accessors.atomic.XSQNamePointable;
import org.apache.vxquery.datamodel.accessors.atomic.XSTimePointable;
import org.apache.vxquery.exceptions.SystemException;
-import edu.uci.ics.hyracks.data.std.primitive.BooleanPointable;
-import edu.uci.ics.hyracks.data.std.primitive.DoublePointable;
-import edu.uci.ics.hyracks.data.std.primitive.FloatPointable;
-import edu.uci.ics.hyracks.data.std.primitive.IntegerPointable;
-import edu.uci.ics.hyracks.data.std.primitive.LongPointable;
-import edu.uci.ics.hyracks.data.std.primitive.UTF8StringPointable;
+import org.apache.hyracks.data.std.primitive.BooleanPointable;
+import org.apache.hyracks.data.std.primitive.DoublePointable;
+import org.apache.hyracks.data.std.primitive.FloatPointable;
+import org.apache.hyracks.data.std.primitive.IntegerPointable;
+import org.apache.hyracks.data.std.primitive.LongPointable;
+import org.apache.hyracks.data.std.primitive.UTF8StringPointable;
public abstract class AbstractValueComparisonOperation {
public abstract boolean operateAnyURIAnyURI(UTF8StringPointable stringp, UTF8StringPointable stringp2)
@@ -155,4 +155,4 @@ public abstract class AbstractValueComparisonOperation {
public abstract boolean operateYMDurationYMDuration(IntegerPointable intp1, IntegerPointable intp2)
throws SystemException, IOException;
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/comparison/AbstractValueComparisonScalarEvaluatorFactory.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/comparison/AbstractValueComparisonScalarEvaluatorFactory.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/comparison/AbstractValueComparisonScalarEvaluatorFactory.java
index a1ae69e..4d5eca2 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/comparison/AbstractValueComparisonScalarEvaluatorFactory.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/comparison/AbstractValueComparisonScalarEvaluatorFactory.java
@@ -30,13 +30,13 @@ import org.apache.vxquery.runtime.functions.base.AbstractTaggedValueArgumentScal
import org.apache.vxquery.runtime.functions.base.AbstractTaggedValueArgumentScalarEvaluatorFactory;
import org.apache.vxquery.runtime.functions.util.FunctionHelper;
-import edu.uci.ics.hyracks.algebricks.common.exceptions.AlgebricksException;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluator;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
-import edu.uci.ics.hyracks.api.context.IHyracksTaskContext;
-import edu.uci.ics.hyracks.data.std.api.IPointable;
-import edu.uci.ics.hyracks.data.std.primitive.LongPointable;
-import edu.uci.ics.hyracks.data.std.util.ArrayBackedValueStorage;
+import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluator;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
+import org.apache.hyracks.api.context.IHyracksTaskContext;
+import org.apache.hyracks.data.std.api.IPointable;
+import org.apache.hyracks.data.std.primitive.LongPointable;
+import org.apache.hyracks.data.std.util.ArrayBackedValueStorage;
public abstract class AbstractValueComparisonScalarEvaluatorFactory extends
AbstractTaggedValueArgumentScalarEvaluatorFactory {
@@ -138,4 +138,4 @@ public abstract class AbstractValueComparisonScalarEvaluatorFactory extends
}
protected abstract AbstractValueComparisonOperation createValueComparisonOperation();
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/comparison/ValueEqComparisonOperation.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/comparison/ValueEqComparisonOperation.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/comparison/ValueEqComparisonOperation.java
index 9e007b1..f4eb340 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/comparison/ValueEqComparisonOperation.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/comparison/ValueEqComparisonOperation.java
@@ -30,13 +30,13 @@ import org.apache.vxquery.datamodel.accessors.atomic.XSTimePointable;
import org.apache.vxquery.datamodel.util.DateTime;
import org.apache.vxquery.exceptions.SystemException;
-import edu.uci.ics.hyracks.data.std.primitive.BooleanPointable;
-import edu.uci.ics.hyracks.data.std.primitive.DoublePointable;
-import edu.uci.ics.hyracks.data.std.primitive.FloatPointable;
-import edu.uci.ics.hyracks.data.std.primitive.IntegerPointable;
-import edu.uci.ics.hyracks.data.std.primitive.LongPointable;
-import edu.uci.ics.hyracks.data.std.primitive.UTF8StringPointable;
-import edu.uci.ics.hyracks.data.std.util.ArrayBackedValueStorage;
+import org.apache.hyracks.data.std.primitive.BooleanPointable;
+import org.apache.hyracks.data.std.primitive.DoublePointable;
+import org.apache.hyracks.data.std.primitive.FloatPointable;
+import org.apache.hyracks.data.std.primitive.IntegerPointable;
+import org.apache.hyracks.data.std.primitive.LongPointable;
+import org.apache.hyracks.data.std.primitive.UTF8StringPointable;
+import org.apache.hyracks.data.std.util.ArrayBackedValueStorage;
public class ValueEqComparisonOperation extends AbstractValueComparisonOperation {
protected final ArrayBackedValueStorage abvsInner = new ArrayBackedValueStorage();
@@ -422,4 +422,4 @@ public class ValueEqComparisonOperation extends AbstractValueComparisonOperation
return true;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/comparison/ValueEqComparisonScalarEvaluatorFactory.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/comparison/ValueEqComparisonScalarEvaluatorFactory.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/comparison/ValueEqComparisonScalarEvaluatorFactory.java
index fdddcb5..2ba5056 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/comparison/ValueEqComparisonScalarEvaluatorFactory.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/comparison/ValueEqComparisonScalarEvaluatorFactory.java
@@ -16,7 +16,7 @@
*/
package org.apache.vxquery.runtime.functions.comparison;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
public class ValueEqComparisonScalarEvaluatorFactory extends AbstractValueComparisonScalarEvaluatorFactory {
private static final long serialVersionUID = 1L;
@@ -29,4 +29,4 @@ public class ValueEqComparisonScalarEvaluatorFactory extends AbstractValueCompar
protected AbstractValueComparisonOperation createValueComparisonOperation() {
return new ValueEqComparisonOperation();
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/comparison/ValueGeComparisonOperation.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/comparison/ValueGeComparisonOperation.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/comparison/ValueGeComparisonOperation.java
index 4138572..d3197da 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/comparison/ValueGeComparisonOperation.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/comparison/ValueGeComparisonOperation.java
@@ -23,4 +23,4 @@ public class ValueGeComparisonOperation extends AbstractNegatingComparisonOperat
return new ValueLtComparisonOperation();
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/comparison/ValueGeComparisonScalarEvaluatorFactory.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/comparison/ValueGeComparisonScalarEvaluatorFactory.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/comparison/ValueGeComparisonScalarEvaluatorFactory.java
index 88e890d..3bbddfa 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/comparison/ValueGeComparisonScalarEvaluatorFactory.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/comparison/ValueGeComparisonScalarEvaluatorFactory.java
@@ -16,7 +16,7 @@
*/
package org.apache.vxquery.runtime.functions.comparison;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
public class ValueGeComparisonScalarEvaluatorFactory extends AbstractValueComparisonScalarEvaluatorFactory {
private static final long serialVersionUID = 1L;
@@ -29,4 +29,4 @@ public class ValueGeComparisonScalarEvaluatorFactory extends AbstractValueCompar
protected AbstractValueComparisonOperation createValueComparisonOperation() {
return new ValueGeComparisonOperation();
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/comparison/ValueGtComparisonOperation.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/comparison/ValueGtComparisonOperation.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/comparison/ValueGtComparisonOperation.java
index 2852d2e..9017de2 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/comparison/ValueGtComparisonOperation.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/comparison/ValueGtComparisonOperation.java
@@ -23,4 +23,4 @@ public class ValueGtComparisonOperation extends AbstractNegatingComparisonOperat
return new ValueLeComparisonOperation();
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/comparison/ValueGtComparisonScalarEvaluatorFactory.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/comparison/ValueGtComparisonScalarEvaluatorFactory.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/comparison/ValueGtComparisonScalarEvaluatorFactory.java
index 0e39f72..7b87dce 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/comparison/ValueGtComparisonScalarEvaluatorFactory.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/comparison/ValueGtComparisonScalarEvaluatorFactory.java
@@ -16,7 +16,7 @@
*/
package org.apache.vxquery.runtime.functions.comparison;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
public class ValueGtComparisonScalarEvaluatorFactory extends AbstractValueComparisonScalarEvaluatorFactory {
private static final long serialVersionUID = 1L;
@@ -29,4 +29,4 @@ public class ValueGtComparisonScalarEvaluatorFactory extends AbstractValueCompar
protected AbstractValueComparisonOperation createValueComparisonOperation() {
return new ValueGtComparisonOperation();
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/comparison/ValueLeComparisonOperation.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/comparison/ValueLeComparisonOperation.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/comparison/ValueLeComparisonOperation.java
index 1810cec..6849e7a 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/comparison/ValueLeComparisonOperation.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/comparison/ValueLeComparisonOperation.java
@@ -28,4 +28,4 @@ public class ValueLeComparisonOperation extends AbstractDisjunctiveComparisonOpe
return new ValueEqComparisonOperation();
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/comparison/ValueLeComparisonScalarEvaluatorFactory.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/comparison/ValueLeComparisonScalarEvaluatorFactory.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/comparison/ValueLeComparisonScalarEvaluatorFactory.java
index eb464e8..00032be 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/comparison/ValueLeComparisonScalarEvaluatorFactory.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/comparison/ValueLeComparisonScalarEvaluatorFactory.java
@@ -16,7 +16,7 @@
*/
package org.apache.vxquery.runtime.functions.comparison;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
public class ValueLeComparisonScalarEvaluatorFactory extends AbstractValueComparisonScalarEvaluatorFactory {
private static final long serialVersionUID = 1L;
@@ -29,4 +29,4 @@ public class ValueLeComparisonScalarEvaluatorFactory extends AbstractValueCompar
protected AbstractValueComparisonOperation createValueComparisonOperation() {
return new ValueLeComparisonOperation();
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/comparison/ValueLtComparisonOperation.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/comparison/ValueLtComparisonOperation.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/comparison/ValueLtComparisonOperation.java
index 512aa83..baa41a1 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/comparison/ValueLtComparisonOperation.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/comparison/ValueLtComparisonOperation.java
@@ -31,13 +31,13 @@ import org.apache.vxquery.datamodel.util.DateTime;
import org.apache.vxquery.exceptions.ErrorCode;
import org.apache.vxquery.exceptions.SystemException;
-import edu.uci.ics.hyracks.data.std.primitive.BooleanPointable;
-import edu.uci.ics.hyracks.data.std.primitive.DoublePointable;
-import edu.uci.ics.hyracks.data.std.primitive.FloatPointable;
-import edu.uci.ics.hyracks.data.std.primitive.IntegerPointable;
-import edu.uci.ics.hyracks.data.std.primitive.LongPointable;
-import edu.uci.ics.hyracks.data.std.primitive.UTF8StringPointable;
-import edu.uci.ics.hyracks.data.std.util.ArrayBackedValueStorage;
+import org.apache.hyracks.data.std.primitive.BooleanPointable;
+import org.apache.hyracks.data.std.primitive.DoublePointable;
+import org.apache.hyracks.data.std.primitive.FloatPointable;
+import org.apache.hyracks.data.std.primitive.IntegerPointable;
+import org.apache.hyracks.data.std.primitive.LongPointable;
+import org.apache.hyracks.data.std.primitive.UTF8StringPointable;
+import org.apache.hyracks.data.std.util.ArrayBackedValueStorage;
public class ValueLtComparisonOperation extends AbstractValueComparisonOperation {
protected final ArrayBackedValueStorage abvsInner = new ArrayBackedValueStorage();
@@ -388,4 +388,4 @@ public class ValueLtComparisonOperation extends AbstractValueComparisonOperation
return (intp1.compareTo(intp2) == -1);
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/comparison/ValueLtComparisonScalarEvaluatorFactory.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/comparison/ValueLtComparisonScalarEvaluatorFactory.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/comparison/ValueLtComparisonScalarEvaluatorFactory.java
index dab381e..2182626 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/comparison/ValueLtComparisonScalarEvaluatorFactory.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/comparison/ValueLtComparisonScalarEvaluatorFactory.java
@@ -16,7 +16,7 @@
*/
package org.apache.vxquery.runtime.functions.comparison;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
public class ValueLtComparisonScalarEvaluatorFactory extends AbstractValueComparisonScalarEvaluatorFactory {
private static final long serialVersionUID = 1L;
@@ -29,4 +29,4 @@ public class ValueLtComparisonScalarEvaluatorFactory extends AbstractValueCompar
protected AbstractValueComparisonOperation createValueComparisonOperation() {
return new ValueLtComparisonOperation();
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/comparison/ValueNeComparisonOperation.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/comparison/ValueNeComparisonOperation.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/comparison/ValueNeComparisonOperation.java
index d82b38d..8d36055 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/comparison/ValueNeComparisonOperation.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/comparison/ValueNeComparisonOperation.java
@@ -23,4 +23,4 @@ public class ValueNeComparisonOperation extends AbstractNegatingComparisonOperat
return new ValueEqComparisonOperation();
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/comparison/ValueNeComparisonScalarEvaluatorFactory.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/comparison/ValueNeComparisonScalarEvaluatorFactory.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/comparison/ValueNeComparisonScalarEvaluatorFactory.java
index 93e951c..5427f77 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/comparison/ValueNeComparisonScalarEvaluatorFactory.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/comparison/ValueNeComparisonScalarEvaluatorFactory.java
@@ -16,7 +16,7 @@
*/
package org.apache.vxquery.runtime.functions.comparison;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
public class ValueNeComparisonScalarEvaluatorFactory extends AbstractValueComparisonScalarEvaluatorFactory {
private static final long serialVersionUID = 1L;
@@ -29,4 +29,4 @@ public class ValueNeComparisonScalarEvaluatorFactory extends AbstractValueCompar
protected AbstractValueComparisonOperation createValueComparisonOperation() {
return new ValueNeComparisonOperation();
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/comparison/general/AbstractGeneralComparisonScalarEvaluatorFactory.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/comparison/general/AbstractGeneralComparisonScalarEvaluatorFactory.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/comparison/general/AbstractGeneralComparisonScalarEvaluatorFactory.java
index 99c4faa..cc1e117 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/comparison/general/AbstractGeneralComparisonScalarEvaluatorFactory.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/comparison/general/AbstractGeneralComparisonScalarEvaluatorFactory.java
@@ -66,14 +66,14 @@ import org.apache.vxquery.runtime.functions.comparison.AbstractValueComparisonOp
import org.apache.vxquery.runtime.functions.util.AtomizeHelper;
import org.apache.vxquery.runtime.functions.util.FunctionHelper;
-import edu.uci.ics.hyracks.algebricks.common.exceptions.AlgebricksException;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluator;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
-import edu.uci.ics.hyracks.api.context.IHyracksTaskContext;
-import edu.uci.ics.hyracks.data.std.api.IPointable;
-import edu.uci.ics.hyracks.data.std.primitive.DoublePointable;
-import edu.uci.ics.hyracks.data.std.primitive.VoidPointable;
-import edu.uci.ics.hyracks.data.std.util.ArrayBackedValueStorage;
+import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluator;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
+import org.apache.hyracks.api.context.IHyracksTaskContext;
+import org.apache.hyracks.data.std.api.IPointable;
+import org.apache.hyracks.data.std.primitive.DoublePointable;
+import org.apache.hyracks.data.std.primitive.VoidPointable;
+import org.apache.hyracks.data.std.util.ArrayBackedValueStorage;
public abstract class AbstractGeneralComparisonScalarEvaluatorFactory extends
AbstractTaggedValueArgumentScalarEvaluatorFactory {
@@ -384,4 +384,4 @@ public abstract class AbstractGeneralComparisonScalarEvaluatorFactory extends
}
protected abstract AbstractValueComparisonOperation createValueComparisonOperation();
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/comparison/general/GeneralEqComparisonScalarEvaluatorFactory.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/comparison/general/GeneralEqComparisonScalarEvaluatorFactory.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/comparison/general/GeneralEqComparisonScalarEvaluatorFactory.java
index d79c6b2..f30e262 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/comparison/general/GeneralEqComparisonScalarEvaluatorFactory.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/comparison/general/GeneralEqComparisonScalarEvaluatorFactory.java
@@ -19,7 +19,7 @@ package org.apache.vxquery.runtime.functions.comparison.general;
import org.apache.vxquery.runtime.functions.comparison.AbstractValueComparisonOperation;
import org.apache.vxquery.runtime.functions.comparison.ValueEqComparisonOperation;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
public class GeneralEqComparisonScalarEvaluatorFactory extends AbstractGeneralComparisonScalarEvaluatorFactory {
private static final long serialVersionUID = 1L;
@@ -32,4 +32,4 @@ public class GeneralEqComparisonScalarEvaluatorFactory extends AbstractGeneralCo
protected AbstractValueComparisonOperation createValueComparisonOperation() {
return new ValueEqComparisonOperation();
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/comparison/general/GeneralGeComparisonScalarEvaluatorFactory.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/comparison/general/GeneralGeComparisonScalarEvaluatorFactory.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/comparison/general/GeneralGeComparisonScalarEvaluatorFactory.java
index a9a1761..2829803 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/comparison/general/GeneralGeComparisonScalarEvaluatorFactory.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/comparison/general/GeneralGeComparisonScalarEvaluatorFactory.java
@@ -19,7 +19,7 @@ package org.apache.vxquery.runtime.functions.comparison.general;
import org.apache.vxquery.runtime.functions.comparison.AbstractValueComparisonOperation;
import org.apache.vxquery.runtime.functions.comparison.ValueGeComparisonOperation;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
public class GeneralGeComparisonScalarEvaluatorFactory extends AbstractGeneralComparisonScalarEvaluatorFactory {
private static final long serialVersionUID = 1L;
@@ -32,4 +32,4 @@ public class GeneralGeComparisonScalarEvaluatorFactory extends AbstractGeneralCo
protected AbstractValueComparisonOperation createValueComparisonOperation() {
return new ValueGeComparisonOperation();
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/comparison/general/GeneralGtComparisonScalarEvaluatorFactory.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/comparison/general/GeneralGtComparisonScalarEvaluatorFactory.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/comparison/general/GeneralGtComparisonScalarEvaluatorFactory.java
index 8ecf4b8..bcec218 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/comparison/general/GeneralGtComparisonScalarEvaluatorFactory.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/comparison/general/GeneralGtComparisonScalarEvaluatorFactory.java
@@ -19,7 +19,7 @@ package org.apache.vxquery.runtime.functions.comparison.general;
import org.apache.vxquery.runtime.functions.comparison.AbstractValueComparisonOperation;
import org.apache.vxquery.runtime.functions.comparison.ValueGtComparisonOperation;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
public class GeneralGtComparisonScalarEvaluatorFactory extends AbstractGeneralComparisonScalarEvaluatorFactory {
private static final long serialVersionUID = 1L;
@@ -32,4 +32,4 @@ public class GeneralGtComparisonScalarEvaluatorFactory extends AbstractGeneralCo
protected AbstractValueComparisonOperation createValueComparisonOperation() {
return new ValueGtComparisonOperation();
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/comparison/general/GeneralLeComparisonScalarEvaluatorFactory.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/comparison/general/GeneralLeComparisonScalarEvaluatorFactory.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/comparison/general/GeneralLeComparisonScalarEvaluatorFactory.java
index 84ce2a8..13239d6 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/comparison/general/GeneralLeComparisonScalarEvaluatorFactory.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/comparison/general/GeneralLeComparisonScalarEvaluatorFactory.java
@@ -19,7 +19,7 @@ package org.apache.vxquery.runtime.functions.comparison.general;
import org.apache.vxquery.runtime.functions.comparison.AbstractValueComparisonOperation;
import org.apache.vxquery.runtime.functions.comparison.ValueLeComparisonOperation;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
public class GeneralLeComparisonScalarEvaluatorFactory extends AbstractGeneralComparisonScalarEvaluatorFactory {
private static final long serialVersionUID = 1L;
@@ -32,4 +32,4 @@ public class GeneralLeComparisonScalarEvaluatorFactory extends AbstractGeneralCo
protected AbstractValueComparisonOperation createValueComparisonOperation() {
return new ValueLeComparisonOperation();
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/comparison/general/GeneralLtComparisonScalarEvaluatorFactory.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/comparison/general/GeneralLtComparisonScalarEvaluatorFactory.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/comparison/general/GeneralLtComparisonScalarEvaluatorFactory.java
index 0f9f7ba..33f91ad 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/comparison/general/GeneralLtComparisonScalarEvaluatorFactory.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/comparison/general/GeneralLtComparisonScalarEvaluatorFactory.java
@@ -19,7 +19,7 @@ package org.apache.vxquery.runtime.functions.comparison.general;
import org.apache.vxquery.runtime.functions.comparison.AbstractValueComparisonOperation;
import org.apache.vxquery.runtime.functions.comparison.ValueLtComparisonOperation;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
public class GeneralLtComparisonScalarEvaluatorFactory extends AbstractGeneralComparisonScalarEvaluatorFactory {
private static final long serialVersionUID = 1L;
@@ -32,4 +32,4 @@ public class GeneralLtComparisonScalarEvaluatorFactory extends AbstractGeneralCo
protected AbstractValueComparisonOperation createValueComparisonOperation() {
return new ValueLtComparisonOperation();
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/comparison/general/GeneralNeComparisonScalarEvaluatorFactory.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/comparison/general/GeneralNeComparisonScalarEvaluatorFactory.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/comparison/general/GeneralNeComparisonScalarEvaluatorFactory.java
index 8390846..f54b7a9 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/comparison/general/GeneralNeComparisonScalarEvaluatorFactory.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/comparison/general/GeneralNeComparisonScalarEvaluatorFactory.java
@@ -19,7 +19,7 @@ package org.apache.vxquery.runtime.functions.comparison.general;
import org.apache.vxquery.runtime.functions.comparison.AbstractValueComparisonOperation;
import org.apache.vxquery.runtime.functions.comparison.ValueNeComparisonOperation;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
public class GeneralNeComparisonScalarEvaluatorFactory extends AbstractGeneralComparisonScalarEvaluatorFactory {
private static final long serialVersionUID = 1L;
@@ -32,4 +32,4 @@ public class GeneralNeComparisonScalarEvaluatorFactory extends AbstractGeneralCo
protected AbstractValueComparisonOperation createValueComparisonOperation() {
return new ValueNeComparisonOperation();
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/conditional/IfThenElseScalarEvaluatorFactory.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/conditional/IfThenElseScalarEvaluatorFactory.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/conditional/IfThenElseScalarEvaluatorFactory.java
index 7cd97e3..a7df0cb 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/conditional/IfThenElseScalarEvaluatorFactory.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/conditional/IfThenElseScalarEvaluatorFactory.java
@@ -22,13 +22,13 @@ import org.apache.vxquery.exceptions.ErrorCode;
import org.apache.vxquery.exceptions.SystemException;
import org.apache.vxquery.runtime.functions.base.AbstractTaggedValueArgumentScalarEvaluatorFactory;
-import edu.uci.ics.hyracks.algebricks.common.exceptions.AlgebricksException;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluator;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
-import edu.uci.ics.hyracks.api.context.IHyracksTaskContext;
-import edu.uci.ics.hyracks.data.std.api.IPointable;
-import edu.uci.ics.hyracks.data.std.primitive.BooleanPointable;
-import edu.uci.ics.hyracks.dataflow.common.data.accessors.IFrameTupleReference;
+import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluator;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
+import org.apache.hyracks.api.context.IHyracksTaskContext;
+import org.apache.hyracks.data.std.api.IPointable;
+import org.apache.hyracks.data.std.primitive.BooleanPointable;
+import org.apache.hyracks.dataflow.common.data.accessors.IFrameTupleReference;
public class IfThenElseScalarEvaluatorFactory extends AbstractTaggedValueArgumentScalarEvaluatorFactory {
private static final long serialVersionUID = 1L;
@@ -68,4 +68,4 @@ public class IfThenElseScalarEvaluatorFactory extends AbstractTaggedValueArgumen
}
};
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/datetime/AbstractValueFromDateTimeScalarEvaluatorFactory.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/datetime/AbstractValueFromDateTimeScalarEvaluatorFactory.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/datetime/AbstractValueFromDateTimeScalarEvaluatorFactory.java
index 57d8867..8c8a091 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/datetime/AbstractValueFromDateTimeScalarEvaluatorFactory.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/datetime/AbstractValueFromDateTimeScalarEvaluatorFactory.java
@@ -28,12 +28,12 @@ import org.apache.vxquery.exceptions.SystemException;
import org.apache.vxquery.runtime.functions.base.AbstractTaggedValueArgumentScalarEvaluator;
import org.apache.vxquery.runtime.functions.base.AbstractTaggedValueArgumentScalarEvaluatorFactory;
-import edu.uci.ics.hyracks.algebricks.common.exceptions.AlgebricksException;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluator;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
-import edu.uci.ics.hyracks.api.context.IHyracksTaskContext;
-import edu.uci.ics.hyracks.data.std.api.IPointable;
-import edu.uci.ics.hyracks.data.std.util.ArrayBackedValueStorage;
+import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluator;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
+import org.apache.hyracks.api.context.IHyracksTaskContext;
+import org.apache.hyracks.data.std.api.IPointable;
+import org.apache.hyracks.data.std.util.ArrayBackedValueStorage;
public abstract class AbstractValueFromDateTimeScalarEvaluatorFactory extends
AbstractTaggedValueArgumentScalarEvaluatorFactory {
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/datetime/AbstractValueFromDurationScalarEvaluatorFactory.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/datetime/AbstractValueFromDurationScalarEvaluatorFactory.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/datetime/AbstractValueFromDurationScalarEvaluatorFactory.java
index 2f11115..e7479b0 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/datetime/AbstractValueFromDurationScalarEvaluatorFactory.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/datetime/AbstractValueFromDurationScalarEvaluatorFactory.java
@@ -29,14 +29,14 @@ import org.apache.vxquery.exceptions.SystemException;
import org.apache.vxquery.runtime.functions.base.AbstractTaggedValueArgumentScalarEvaluator;
import org.apache.vxquery.runtime.functions.base.AbstractTaggedValueArgumentScalarEvaluatorFactory;
-import edu.uci.ics.hyracks.algebricks.common.exceptions.AlgebricksException;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluator;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
-import edu.uci.ics.hyracks.api.context.IHyracksTaskContext;
-import edu.uci.ics.hyracks.data.std.api.IPointable;
-import edu.uci.ics.hyracks.data.std.primitive.IntegerPointable;
-import edu.uci.ics.hyracks.data.std.primitive.LongPointable;
-import edu.uci.ics.hyracks.data.std.util.ArrayBackedValueStorage;
+import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluator;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
+import org.apache.hyracks.api.context.IHyracksTaskContext;
+import org.apache.hyracks.data.std.api.IPointable;
+import org.apache.hyracks.data.std.primitive.IntegerPointable;
+import org.apache.hyracks.data.std.primitive.LongPointable;
+import org.apache.hyracks.data.std.util.ArrayBackedValueStorage;
public abstract class AbstractValueFromDurationScalarEvaluatorFactory extends
AbstractTaggedValueArgumentScalarEvaluatorFactory {
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/datetime/FnAdjustDateTimeToTimezoneScalarEvaluatorFactory.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/datetime/FnAdjustDateTimeToTimezoneScalarEvaluatorFactory.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/datetime/FnAdjustDateTimeToTimezoneScalarEvaluatorFactory.java
index b9f530a..f645fe6 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/datetime/FnAdjustDateTimeToTimezoneScalarEvaluatorFactory.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/datetime/FnAdjustDateTimeToTimezoneScalarEvaluatorFactory.java
@@ -29,13 +29,13 @@ import org.apache.vxquery.exceptions.SystemException;
import org.apache.vxquery.runtime.functions.base.AbstractTaggedValueArgumentScalarEvaluator;
import org.apache.vxquery.runtime.functions.base.AbstractTaggedValueArgumentScalarEvaluatorFactory;
-import edu.uci.ics.hyracks.algebricks.common.exceptions.AlgebricksException;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluator;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
-import edu.uci.ics.hyracks.api.context.IHyracksTaskContext;
-import edu.uci.ics.hyracks.data.std.api.IPointable;
-import edu.uci.ics.hyracks.data.std.primitive.LongPointable;
-import edu.uci.ics.hyracks.data.std.util.ArrayBackedValueStorage;
+import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluator;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
+import org.apache.hyracks.api.context.IHyracksTaskContext;
+import org.apache.hyracks.data.std.api.IPointable;
+import org.apache.hyracks.data.std.primitive.LongPointable;
+import org.apache.hyracks.data.std.util.ArrayBackedValueStorage;
public class FnAdjustDateTimeToTimezoneScalarEvaluatorFactory extends AbstractTaggedValueArgumentScalarEvaluatorFactory {
private static final long serialVersionUID = 1L;
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/datetime/FnAdjustDateToTimezoneScalarEvaluatorFactory.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/datetime/FnAdjustDateToTimezoneScalarEvaluatorFactory.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/datetime/FnAdjustDateToTimezoneScalarEvaluatorFactory.java
index 20c89c9..21d08d1 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/datetime/FnAdjustDateToTimezoneScalarEvaluatorFactory.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/datetime/FnAdjustDateToTimezoneScalarEvaluatorFactory.java
@@ -30,13 +30,13 @@ import org.apache.vxquery.exceptions.SystemException;
import org.apache.vxquery.runtime.functions.base.AbstractTaggedValueArgumentScalarEvaluator;
import org.apache.vxquery.runtime.functions.base.AbstractTaggedValueArgumentScalarEvaluatorFactory;
-import edu.uci.ics.hyracks.algebricks.common.exceptions.AlgebricksException;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluator;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
-import edu.uci.ics.hyracks.api.context.IHyracksTaskContext;
-import edu.uci.ics.hyracks.data.std.api.IPointable;
-import edu.uci.ics.hyracks.data.std.primitive.LongPointable;
-import edu.uci.ics.hyracks.data.std.util.ArrayBackedValueStorage;
+import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluator;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
+import org.apache.hyracks.api.context.IHyracksTaskContext;
+import org.apache.hyracks.data.std.api.IPointable;
+import org.apache.hyracks.data.std.primitive.LongPointable;
+import org.apache.hyracks.data.std.util.ArrayBackedValueStorage;
public class FnAdjustDateToTimezoneScalarEvaluatorFactory extends AbstractTaggedValueArgumentScalarEvaluatorFactory {
private static final long serialVersionUID = 1L;
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/datetime/FnAdjustTimeToTimezoneScalarEvaluatorFactory.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/datetime/FnAdjustTimeToTimezoneScalarEvaluatorFactory.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/datetime/FnAdjustTimeToTimezoneScalarEvaluatorFactory.java
index 62007ae..80a519b 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/datetime/FnAdjustTimeToTimezoneScalarEvaluatorFactory.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/datetime/FnAdjustTimeToTimezoneScalarEvaluatorFactory.java
@@ -30,13 +30,13 @@ import org.apache.vxquery.exceptions.SystemException;
import org.apache.vxquery.runtime.functions.base.AbstractTaggedValueArgumentScalarEvaluator;
import org.apache.vxquery.runtime.functions.base.AbstractTaggedValueArgumentScalarEvaluatorFactory;
-import edu.uci.ics.hyracks.algebricks.common.exceptions.AlgebricksException;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluator;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
-import edu.uci.ics.hyracks.api.context.IHyracksTaskContext;
-import edu.uci.ics.hyracks.data.std.api.IPointable;
-import edu.uci.ics.hyracks.data.std.primitive.LongPointable;
-import edu.uci.ics.hyracks.data.std.util.ArrayBackedValueStorage;
+import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluator;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
+import org.apache.hyracks.api.context.IHyracksTaskContext;
+import org.apache.hyracks.data.std.api.IPointable;
+import org.apache.hyracks.data.std.primitive.LongPointable;
+import org.apache.hyracks.data.std.util.ArrayBackedValueStorage;
public class FnAdjustTimeToTimezoneScalarEvaluatorFactory extends AbstractTaggedValueArgumentScalarEvaluatorFactory {
private static final long serialVersionUID = 1L;
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/datetime/FnCurrentDateScalarEvaluatorFactory.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/datetime/FnCurrentDateScalarEvaluatorFactory.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/datetime/FnCurrentDateScalarEvaluatorFactory.java
index 1e7eee6..965ce08 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/datetime/FnCurrentDateScalarEvaluatorFactory.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/datetime/FnCurrentDateScalarEvaluatorFactory.java
@@ -28,12 +28,12 @@ import org.apache.vxquery.runtime.functions.base.AbstractTaggedValueArgumentScal
import org.apache.vxquery.runtime.functions.base.AbstractTaggedValueArgumentScalarEvaluatorFactory;
import org.apache.vxquery.runtime.functions.cast.CastToDateOperation;
-import edu.uci.ics.hyracks.algebricks.common.exceptions.AlgebricksException;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluator;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
-import edu.uci.ics.hyracks.api.context.IHyracksTaskContext;
-import edu.uci.ics.hyracks.data.std.api.IPointable;
-import edu.uci.ics.hyracks.data.std.util.ArrayBackedValueStorage;
+import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluator;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
+import org.apache.hyracks.api.context.IHyracksTaskContext;
+import org.apache.hyracks.data.std.api.IPointable;
+import org.apache.hyracks.data.std.util.ArrayBackedValueStorage;
public class FnCurrentDateScalarEvaluatorFactory extends AbstractTaggedValueArgumentScalarEvaluatorFactory {
private static final long serialVersionUID = 1L;
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/datetime/FnCurrentDateTimeScalarEvaluatorFactory.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/datetime/FnCurrentDateTimeScalarEvaluatorFactory.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/datetime/FnCurrentDateTimeScalarEvaluatorFactory.java
index 53f3238..8ad2af0 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/datetime/FnCurrentDateTimeScalarEvaluatorFactory.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/datetime/FnCurrentDateTimeScalarEvaluatorFactory.java
@@ -28,12 +28,12 @@ import org.apache.vxquery.runtime.functions.base.AbstractTaggedValueArgumentScal
import org.apache.vxquery.runtime.functions.base.AbstractTaggedValueArgumentScalarEvaluatorFactory;
import org.apache.vxquery.runtime.functions.cast.CastToDateTimeOperation;
-import edu.uci.ics.hyracks.algebricks.common.exceptions.AlgebricksException;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluator;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
-import edu.uci.ics.hyracks.api.context.IHyracksTaskContext;
-import edu.uci.ics.hyracks.data.std.api.IPointable;
-import edu.uci.ics.hyracks.data.std.util.ArrayBackedValueStorage;
+import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluator;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
+import org.apache.hyracks.api.context.IHyracksTaskContext;
+import org.apache.hyracks.data.std.api.IPointable;
+import org.apache.hyracks.data.std.util.ArrayBackedValueStorage;
public class FnCurrentDateTimeScalarEvaluatorFactory extends AbstractTaggedValueArgumentScalarEvaluatorFactory {
private static final long serialVersionUID = 1L;
@@ -65,4 +65,4 @@ public class FnCurrentDateTimeScalarEvaluatorFactory extends AbstractTaggedValue
}
};
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/datetime/FnCurrentTimeScalarEvaluatorFactory.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/datetime/FnCurrentTimeScalarEvaluatorFactory.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/datetime/FnCurrentTimeScalarEvaluatorFactory.java
index 46f1db1..1c22c37 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/datetime/FnCurrentTimeScalarEvaluatorFactory.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/datetime/FnCurrentTimeScalarEvaluatorFactory.java
@@ -28,12 +28,12 @@ import org.apache.vxquery.runtime.functions.base.AbstractTaggedValueArgumentScal
import org.apache.vxquery.runtime.functions.base.AbstractTaggedValueArgumentScalarEvaluatorFactory;
import org.apache.vxquery.runtime.functions.cast.CastToTimeOperation;
-import edu.uci.ics.hyracks.algebricks.common.exceptions.AlgebricksException;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluator;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
-import edu.uci.ics.hyracks.api.context.IHyracksTaskContext;
-import edu.uci.ics.hyracks.data.std.api.IPointable;
-import edu.uci.ics.hyracks.data.std.util.ArrayBackedValueStorage;
+import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluator;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
+import org.apache.hyracks.api.context.IHyracksTaskContext;
+import org.apache.hyracks.data.std.api.IPointable;
+import org.apache.hyracks.data.std.util.ArrayBackedValueStorage;
public class FnCurrentTimeScalarEvaluatorFactory extends AbstractTaggedValueArgumentScalarEvaluatorFactory {
private static final long serialVersionUID = 1L;
@@ -65,4 +65,4 @@ public class FnCurrentTimeScalarEvaluatorFactory extends AbstractTaggedValueArgu
}
};
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/datetime/FnDateTimeScalarEvaluatorFactory.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/datetime/FnDateTimeScalarEvaluatorFactory.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/datetime/FnDateTimeScalarEvaluatorFactory.java
index 44795c6..07436ea 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/datetime/FnDateTimeScalarEvaluatorFactory.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/datetime/FnDateTimeScalarEvaluatorFactory.java
@@ -32,12 +32,12 @@ import org.apache.vxquery.exceptions.SystemException;
import org.apache.vxquery.runtime.functions.base.AbstractTaggedValueArgumentScalarEvaluator;
import org.apache.vxquery.runtime.functions.base.AbstractTaggedValueArgumentScalarEvaluatorFactory;
-import edu.uci.ics.hyracks.algebricks.common.exceptions.AlgebricksException;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluator;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
-import edu.uci.ics.hyracks.api.context.IHyracksTaskContext;
-import edu.uci.ics.hyracks.data.std.api.IPointable;
-import edu.uci.ics.hyracks.data.std.util.ArrayBackedValueStorage;
+import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluator;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
+import org.apache.hyracks.api.context.IHyracksTaskContext;
+import org.apache.hyracks.data.std.api.IPointable;
+import org.apache.hyracks.data.std.util.ArrayBackedValueStorage;
public class FnDateTimeScalarEvaluatorFactory extends AbstractTaggedValueArgumentScalarEvaluatorFactory {
private static final long serialVersionUID = 1L;
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/datetime/FnDayFromDateScalarEvaluatorFactory.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/datetime/FnDayFromDateScalarEvaluatorFactory.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/datetime/FnDayFromDateScalarEvaluatorFactory.java
index 33aff29..dbf3789 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/datetime/FnDayFromDateScalarEvaluatorFactory.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/datetime/FnDayFromDateScalarEvaluatorFactory.java
@@ -20,7 +20,7 @@ import org.apache.vxquery.datamodel.accessors.TaggedValuePointable;
import org.apache.vxquery.datamodel.accessors.atomic.XSDatePointable;
import org.apache.vxquery.datamodel.values.ValueTag;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
public class FnDayFromDateScalarEvaluatorFactory extends AbstractValueFromDateTimeScalarEvaluatorFactory {
private static final long serialVersionUID = 1L;
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/datetime/FnDayFromDateTimeScalarEvaluatorFactory.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/datetime/FnDayFromDateTimeScalarEvaluatorFactory.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/datetime/FnDayFromDateTimeScalarEvaluatorFactory.java
index 6747656..0a9bdcb 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/datetime/FnDayFromDateTimeScalarEvaluatorFactory.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/datetime/FnDayFromDateTimeScalarEvaluatorFactory.java
@@ -20,7 +20,7 @@ import org.apache.vxquery.datamodel.accessors.TaggedValuePointable;
import org.apache.vxquery.datamodel.accessors.atomic.XSDateTimePointable;
import org.apache.vxquery.datamodel.values.ValueTag;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
public class FnDayFromDateTimeScalarEvaluatorFactory extends AbstractValueFromDateTimeScalarEvaluatorFactory {
private static final long serialVersionUID = 1L;
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/datetime/FnDaysFromDurationScalarEvaluatorFactory.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/datetime/FnDaysFromDurationScalarEvaluatorFactory.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/datetime/FnDaysFromDurationScalarEvaluatorFactory.java
index e9e0518..47e646d 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/datetime/FnDaysFromDurationScalarEvaluatorFactory.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/datetime/FnDaysFromDurationScalarEvaluatorFactory.java
@@ -18,7 +18,7 @@ package org.apache.vxquery.runtime.functions.datetime;
import org.apache.vxquery.datamodel.util.DateTime;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
public class FnDaysFromDurationScalarEvaluatorFactory extends AbstractValueFromDurationScalarEvaluatorFactory {
private static final long serialVersionUID = 1L;
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/datetime/FnHoursFromDateTimeScalarEvaluatorFactory.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/datetime/FnHoursFromDateTimeScalarEvaluatorFactory.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/datetime/FnHoursFromDateTimeScalarEvaluatorFactory.java
index 2cd5102..90b5411 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/datetime/FnHoursFromDateTimeScalarEvaluatorFactory.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/datetime/FnHoursFromDateTimeScalarEvaluatorFactory.java
@@ -20,7 +20,7 @@ import org.apache.vxquery.datamodel.accessors.TaggedValuePointable;
import org.apache.vxquery.datamodel.accessors.atomic.XSDateTimePointable;
import org.apache.vxquery.datamodel.values.ValueTag;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
public class FnHoursFromDateTimeScalarEvaluatorFactory extends AbstractValueFromDateTimeScalarEvaluatorFactory {
private static final long serialVersionUID = 1L;
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/datetime/FnHoursFromDurationScalarEvaluatorFactory.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/datetime/FnHoursFromDurationScalarEvaluatorFactory.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/datetime/FnHoursFromDurationScalarEvaluatorFactory.java
index 46e3b3d..1591ec8 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/datetime/FnHoursFromDurationScalarEvaluatorFactory.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/datetime/FnHoursFromDurationScalarEvaluatorFactory.java
@@ -18,7 +18,7 @@ package org.apache.vxquery.runtime.functions.datetime;
import org.apache.vxquery.datamodel.util.DateTime;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
public class FnHoursFromDurationScalarEvaluatorFactory extends AbstractValueFromDurationScalarEvaluatorFactory {
private static final long serialVersionUID = 1L;
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/datetime/FnHoursFromTimeScalarEvaluatorFactory.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/datetime/FnHoursFromTimeScalarEvaluatorFactory.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/datetime/FnHoursFromTimeScalarEvaluatorFactory.java
index 5ed2784..f4c1428 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/datetime/FnHoursFromTimeScalarEvaluatorFactory.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/datetime/FnHoursFromTimeScalarEvaluatorFactory.java
@@ -20,7 +20,7 @@ import org.apache.vxquery.datamodel.accessors.TaggedValuePointable;
import org.apache.vxquery.datamodel.accessors.atomic.XSTimePointable;
import org.apache.vxquery.datamodel.values.ValueTag;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
public class FnHoursFromTimeScalarEvaluatorFactory extends AbstractValueFromDateTimeScalarEvaluatorFactory {
private static final long serialVersionUID = 1L;
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/datetime/FnImplicitTimezoneScalarEvaluatorFactory.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/datetime/FnImplicitTimezoneScalarEvaluatorFactory.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/datetime/FnImplicitTimezoneScalarEvaluatorFactory.java
index 2efcefb..8172d2e 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/datetime/FnImplicitTimezoneScalarEvaluatorFactory.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/datetime/FnImplicitTimezoneScalarEvaluatorFactory.java
@@ -29,12 +29,12 @@ import org.apache.vxquery.exceptions.SystemException;
import org.apache.vxquery.runtime.functions.base.AbstractTaggedValueArgumentScalarEvaluator;
import org.apache.vxquery.runtime.functions.base.AbstractTaggedValueArgumentScalarEvaluatorFactory;
-import edu.uci.ics.hyracks.algebricks.common.exceptions.AlgebricksException;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluator;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
-import edu.uci.ics.hyracks.api.context.IHyracksTaskContext;
-import edu.uci.ics.hyracks.data.std.api.IPointable;
-import edu.uci.ics.hyracks.data.std.util.ArrayBackedValueStorage;
+import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluator;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
+import org.apache.hyracks.api.context.IHyracksTaskContext;
+import org.apache.hyracks.data.std.api.IPointable;
+import org.apache.hyracks.data.std.util.ArrayBackedValueStorage;
public class FnImplicitTimezoneScalarEvaluatorFactory extends AbstractTaggedValueArgumentScalarEvaluatorFactory {
private static final long serialVersionUID = 1L;
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/datetime/FnMinutesFromDateTimeScalarEvaluatorFactory.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/datetime/FnMinutesFromDateTimeScalarEvaluatorFactory.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/datetime/FnMinutesFromDateTimeScalarEvaluatorFactory.java
index 370f564..045fc9b 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/datetime/FnMinutesFromDateTimeScalarEvaluatorFactory.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/datetime/FnMinutesFromDateTimeScalarEvaluatorFactory.java
@@ -20,7 +20,7 @@ import org.apache.vxquery.datamodel.accessors.TaggedValuePointable;
import org.apache.vxquery.datamodel.accessors.atomic.XSDateTimePointable;
import org.apache.vxquery.datamodel.values.ValueTag;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
public class FnMinutesFromDateTimeScalarEvaluatorFactory extends AbstractValueFromDateTimeScalarEvaluatorFactory {
private static final long serialVersionUID = 1L;
[29/50] [abbrv] vxquery git commit: Switched the xqts fiel to use
version sort order. Easier to read.
Posted by sj...@apache.org.
http://git-wip-us.apache.org/repos/asf/vxquery/blob/43852a54/vxquery-xtest/results/xqts.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/results/xqts.txt b/vxquery-xtest/results/xqts.txt
index 0431f9a..9e38137 100644
--- a/vxquery-xtest/results/xqts.txt
+++ b/vxquery-xtest/results/xqts.txt
@@ -30,6 +30,14 @@ Basics/EQNames//eqname-902, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
Basics/EQNames//eqname-903, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
Basics/StaticContext//static-context-1, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
Basics/Types/SequenceTypeSyntax//sequence-type-1, EXPECTED_RESULT_GOT_SAME_RESULT
+Basics/Types/SequenceTypeSyntax//sequence-type-2, EXPECTED_RESULT_GOT_SAME_RESULT
+Basics/Types/SequenceTypeSyntax//sequence-type-3, EXPECTED_RESULT_GOT_SAME_RESULT
+Basics/Types/SequenceTypeSyntax//sequence-type-4, EXPECTED_RESULT_GOT_SAME_RESULT
+Basics/Types/SequenceTypeSyntax//sequence-type-5, EXPECTED_RESULT_GOT_SAME_RESULT
+Basics/Types/SequenceTypeSyntax//sequence-type-6, EXPECTED_RESULT_GOT_SAME_RESULT
+Basics/Types/SequenceTypeSyntax//sequence-type-7, EXPECTED_RESULT_GOT_SAME_RESULT
+Basics/Types/SequenceTypeSyntax//sequence-type-8, EXPECTED_RESULT_GOT_SAME_RESULT
+Basics/Types/SequenceTypeSyntax//sequence-type-9, EXPECTED_RESULT_GOT_SAME_RESULT
Basics/Types/SequenceTypeSyntax//sequence-type-10, EXPECTED_RESULT_GOT_SAME_RESULT
Basics/Types/SequenceTypeSyntax//sequence-type-11, EXPECTED_RESULT_GOT_SAME_RESULT
Basics/Types/SequenceTypeSyntax//sequence-type-12, EXPECTED_RESULT_GOT_SAME_RESULT
@@ -40,16 +48,8 @@ Basics/Types/SequenceTypeSyntax//sequence-type-16, EXPECTED_RESULT_GOT_SAME_RESU
Basics/Types/SequenceTypeSyntax//sequence-type-17, EXPECTED_RESULT_GOT_SAME_RESULT
Basics/Types/SequenceTypeSyntax//sequence-type-18, EXPECTED_RESULT_GOT_SAME_RESULT
Basics/Types/SequenceTypeSyntax//sequence-type-19, EXPECTED_RESULT_GOT_SAME_RESULT
-Basics/Types/SequenceTypeSyntax//sequence-type-2, EXPECTED_RESULT_GOT_SAME_RESULT
Basics/Types/SequenceTypeSyntax//sequence-type-20, EXPECTED_RESULT_GOT_SAME_RESULT
Basics/Types/SequenceTypeSyntax//sequence-type-21, EXPECTED_RESULT_GOT_SAME_RESULT
-Basics/Types/SequenceTypeSyntax//sequence-type-3, EXPECTED_RESULT_GOT_SAME_RESULT
-Basics/Types/SequenceTypeSyntax//sequence-type-4, EXPECTED_RESULT_GOT_SAME_RESULT
-Basics/Types/SequenceTypeSyntax//sequence-type-5, EXPECTED_RESULT_GOT_SAME_RESULT
-Basics/Types/SequenceTypeSyntax//sequence-type-6, EXPECTED_RESULT_GOT_SAME_RESULT
-Basics/Types/SequenceTypeSyntax//sequence-type-7, EXPECTED_RESULT_GOT_SAME_RESULT
-Basics/Types/SequenceTypeSyntax//sequence-type-8, EXPECTED_RESULT_GOT_SAME_RESULT
-Basics/Types/SequenceTypeSyntax//sequence-type-9, EXPECTED_RESULT_GOT_SAME_RESULT
Catalog//Catalog001, EXPECTED_RESULT_GOT_ERROR
Catalog//Catalog002, EXPECTED_RESULT_GOT_FAILURE
Catalog//Catalog003, EXPECTED_RESULT_GOT_FAILURE
@@ -61,6 +61,14 @@ CondExpr//K2-CondExpr-5, EXPECTED_ERROR_GOT_SAME_ERROR
CondExpr//K2-CondExpr-6, EXPECTED_ERROR_GOT_SAME_ERROR
CondExpr//K2-CondExpr-7, EXPECTED_RESULT_GOT_SAME_RESULT
Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-1, EXPECTED_ERROR_GOT_SAME_ERROR
+Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-2, EXPECTED_ERROR_GOT_SAME_ERROR
+Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-3, EXPECTED_ERROR_GOT_SAME_ERROR
+Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-4, EXPECTED_ERROR_GOT_SAME_ERROR
+Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-5, EXPECTED_ERROR_GOT_SAME_ERROR
+Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-6, EXPECTED_ERROR_GOT_SAME_ERROR
+Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-7, EXPECTED_ERROR_GOT_SAME_ERROR
+Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-8, EXPECTED_ERROR_GOT_SAME_ERROR
+Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-9, EXPECTED_ERROR_GOT_SAME_ERROR
Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-10, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-11, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-12, EXPECTED_ERROR_GOT_SAME_ERROR
@@ -71,7 +79,6 @@ Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-16, EXPECTED_ERROR_GOT_DI
Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-17, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-18, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-19, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
-Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-2, EXPECTED_ERROR_GOT_SAME_ERROR
Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-20, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-21, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-22, EXPECTED_ERROR_GOT_FAILURE
@@ -82,7 +89,6 @@ Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-26, EXPECTED_RESULT_GOT_E
Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-27, EXPECTED_RESULT_GOT_ERROR
Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-28, EXPECTED_ERROR_GOT_FAILURE
Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-29, EXPECTED_ERROR_GOT_FAILURE
-Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-3, EXPECTED_ERROR_GOT_SAME_ERROR
Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-30, EXPECTED_RESULT_GOT_FAILURE
Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-31, EXPECTED_RESULT_GOT_ERROR
Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-32, EXPECTED_RESULT_GOT_ERROR
@@ -93,7 +99,6 @@ Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-36, EXPECTED_RESULT_GOT_D
Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-37, EXPECTED_ERROR_GOT_SAME_ERROR
Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-38, EXPECTED_ERROR_GOT_RESULT
Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-39, EXPECTED_ERROR_GOT_SAME_ERROR
-Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-4, EXPECTED_ERROR_GOT_SAME_ERROR
Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-40, EXPECTED_ERROR_GOT_RESULT
Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-41, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-42, EXPECTED_ERROR_GOT_RESULT
@@ -104,7 +109,6 @@ Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-46, EXPECTED_ERROR_GOT_RE
Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-47, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-48, EXPECTED_ERROR_GOT_RESULT
Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-49, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
-Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-5, EXPECTED_ERROR_GOT_SAME_ERROR
Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-50, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-51, EXPECTED_RESULT_GOT_ERROR
Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-52, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
@@ -115,12 +119,8 @@ Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-56, EXPECTED_RESULT_GOT_E
Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-57, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-58, EXPECTED_RESULT_GOT_ERROR
Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-59, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
-Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-6, EXPECTED_ERROR_GOT_SAME_ERROR
Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-60, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-61, EXPECTED_ERROR_GOT_SAME_ERROR
-Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-7, EXPECTED_ERROR_GOT_SAME_ERROR
-Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-8, EXPECTED_ERROR_GOT_SAME_ERROR
-Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-9, EXPECTED_ERROR_GOT_SAME_ERROR
Construct/ComputeCon/ComputeConAttr//comp-attr-bad-name-1, EXPECTED_ERROR_GOT_RESULT
Construct/ComputeCon/ComputeConAttr//comp-attr-bad-name-2, EXPECTED_ERROR_GOT_RESULT
Construct/ComputeCon/ComputeConAttr//comp-attr-bad-name-3, EXPECTED_ERROR_GOT_RESULT
@@ -134,12 +134,6 @@ Construct/ComputeCon/ComputeConComment//K2-ComputeConComment-3, EXPECTED_RESULT_
Construct/ComputeCon/ComputeConComment//K2-ComputeConComment-4, EXPECTED_ERROR_GOT_SAME_ERROR
Construct/ComputeCon/ComputeConComment//K2-ComputeConComment-5, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Construct/ComputeCon/ComputeConElem//K2-ComputeConElem-1, EXPECTED_ERROR_GOT_SAME_ERROR
-Construct/ComputeCon/ComputeConElem//K2-ComputeConElem-10, EXPECTED_RESULT_GOT_ERROR
-Construct/ComputeCon/ComputeConElem//K2-ComputeConElem-11, EXPECTED_RESULT_GOT_ERROR
-Construct/ComputeCon/ComputeConElem//K2-ComputeConElem-12, EXPECTED_RESULT_GOT_ERROR
-Construct/ComputeCon/ComputeConElem//K2-ComputeConElem-13, EXPECTED_RESULT_GOT_SAME_RESULT
-Construct/ComputeCon/ComputeConElem//K2-ComputeConElem-14, EXPECTED_RESULT_GOT_ERROR
-Construct/ComputeCon/ComputeConElem//K2-ComputeConElem-15, EXPECTED_RESULT_GOT_FAILURE
Construct/ComputeCon/ComputeConElem//K2-ComputeConElem-2, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Construct/ComputeCon/ComputeConElem//K2-ComputeConElem-3, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Construct/ComputeCon/ComputeConElem//K2-ComputeConElem-4, EXPECTED_ERROR_GOT_RESULT
@@ -148,6 +142,12 @@ Construct/ComputeCon/ComputeConElem//K2-ComputeConElem-6, EXPECTED_RESULT_GOT_SA
Construct/ComputeCon/ComputeConElem//K2-ComputeConElem-7, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Construct/ComputeCon/ComputeConElem//K2-ComputeConElem-8, EXPECTED_RESULT_GOT_ERROR
Construct/ComputeCon/ComputeConElem//K2-ComputeConElem-9, EXPECTED_RESULT_GOT_ERROR
+Construct/ComputeCon/ComputeConElem//K2-ComputeConElem-10, EXPECTED_RESULT_GOT_ERROR
+Construct/ComputeCon/ComputeConElem//K2-ComputeConElem-11, EXPECTED_RESULT_GOT_ERROR
+Construct/ComputeCon/ComputeConElem//K2-ComputeConElem-12, EXPECTED_RESULT_GOT_ERROR
+Construct/ComputeCon/ComputeConElem//K2-ComputeConElem-13, EXPECTED_RESULT_GOT_SAME_RESULT
+Construct/ComputeCon/ComputeConElem//K2-ComputeConElem-14, EXPECTED_RESULT_GOT_ERROR
+Construct/ComputeCon/ComputeConElem//K2-ComputeConElem-15, EXPECTED_RESULT_GOT_FAILURE
Construct/ComputeCon/ComputeConElem//comp-elem-bad-name-1, EXPECTED_ERROR_GOT_RESULT
Construct/ComputeCon/ComputeConElem//comp-elem-bad-name-2, EXPECTED_ERROR_GOT_RESULT
Construct/ComputeCon/ComputeConElem//comp-elem-bad-name-3, EXPECTED_ERROR_GOT_RESULT
@@ -155,8 +155,6 @@ Construct/ComputeCon/ComputeConElem//comp-elem-bad-name-4, EXPECTED_ERROR_GOT_RE
Construct/ComputeCon/ComputeConElem//comp-elem-bad-name-5, EXPECTED_ERROR_GOT_RESULT
Construct/ComputeCon/ComputeConElem//comp-elem-bad-name-6, EXPECTED_ERROR_GOT_RESULT
Construct/ComputeCon/ComputeConPI//K2-ComputeConPI-1, EXPECTED_ERROR_GOT_SAME_ERROR
-Construct/ComputeCon/ComputeConPI//K2-ComputeConPI-10, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Construct/ComputeCon/ComputeConPI//K2-ComputeConPI-11, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Construct/ComputeCon/ComputeConPI//K2-ComputeConPI-2, EXPECTED_ERROR_GOT_RESULT
Construct/ComputeCon/ComputeConPI//K2-ComputeConPI-3, EXPECTED_ERROR_GOT_RESULT
Construct/ComputeCon/ComputeConPI//K2-ComputeConPI-4, EXPECTED_RESULT_GOT_ERROR
@@ -165,7 +163,17 @@ Construct/ComputeCon/ComputeConPI//K2-ComputeConPI-6, EXPECTED_ERROR_GOT_RESULT
Construct/ComputeCon/ComputeConPI//K2-ComputeConPI-7, EXPECTED_ERROR_GOT_RESULT
Construct/ComputeCon/ComputeConPI//K2-ComputeConPI-8, EXPECTED_RESULT_GOT_SAME_RESULT
Construct/ComputeCon/ComputeConPI//K2-ComputeConPI-9, EXPECTED_RESULT_GOT_SAME_RESULT
+Construct/ComputeCon/ComputeConPI//K2-ComputeConPI-10, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+Construct/ComputeCon/ComputeConPI//K2-ComputeConPI-11, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Construct/ComputeCon/ConDocNode//K2-ConDocNode-1, EXPECTED_ERROR_GOT_SAME_ERROR
+Construct/ComputeCon/ConDocNode//K2-ConDocNode-2, EXPECTED_ERROR_GOT_SAME_ERROR
+Construct/ComputeCon/ConDocNode//K2-ConDocNode-3, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
+Construct/ComputeCon/ConDocNode//K2-ConDocNode-4, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
+Construct/ComputeCon/ConDocNode//K2-ConDocNode-5, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
+Construct/ComputeCon/ConDocNode//K2-ConDocNode-6, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
+Construct/ComputeCon/ConDocNode//K2-ConDocNode-7, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
+Construct/ComputeCon/ConDocNode//K2-ConDocNode-8, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
+Construct/ComputeCon/ConDocNode//K2-ConDocNode-9, EXPECTED_RESULT_GOT_ERROR
Construct/ComputeCon/ConDocNode//K2-ConDocNode-10, EXPECTED_RESULT_GOT_ERROR
Construct/ComputeCon/ConDocNode//K2-ConDocNode-11, EXPECTED_RESULT_GOT_ERROR
Construct/ComputeCon/ConDocNode//K2-ConDocNode-12, EXPECTED_RESULT_GOT_ERROR
@@ -176,7 +184,6 @@ Construct/ComputeCon/ConDocNode//K2-ConDocNode-16, EXPECTED_RESULT_GOT_ERROR
Construct/ComputeCon/ConDocNode//K2-ConDocNode-17, EXPECTED_RESULT_GOT_ERROR
Construct/ComputeCon/ConDocNode//K2-ConDocNode-18, EXPECTED_RESULT_GOT_ERROR
Construct/ComputeCon/ConDocNode//K2-ConDocNode-19, EXPECTED_RESULT_GOT_ERROR
-Construct/ComputeCon/ConDocNode//K2-ConDocNode-2, EXPECTED_ERROR_GOT_SAME_ERROR
Construct/ComputeCon/ConDocNode//K2-ConDocNode-20, EXPECTED_RESULT_GOT_ERROR
Construct/ComputeCon/ConDocNode//K2-ConDocNode-21, EXPECTED_RESULT_GOT_ERROR
Construct/ComputeCon/ConDocNode//K2-ConDocNode-22, EXPECTED_RESULT_GOT_ERROR
@@ -187,23 +194,10 @@ Construct/ComputeCon/ConDocNode//K2-ConDocNode-26, EXPECTED_ERROR_GOT_DIFFERENT_
Construct/ComputeCon/ConDocNode//K2-ConDocNode-27, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
Construct/ComputeCon/ConDocNode//K2-ConDocNode-28, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
Construct/ComputeCon/ConDocNode//K2-ConDocNode-29, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
-Construct/ComputeCon/ConDocNode//K2-ConDocNode-3, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
Construct/ComputeCon/ConDocNode//K2-ConDocNode-30, EXPECTED_RESULT_GOT_ERROR
Construct/ComputeCon/ConDocNode//K2-ConDocNode-31, EXPECTED_RESULT_GOT_ERROR
Construct/ComputeCon/ConDocNode//K2-ConDocNode-32, EXPECTED_RESULT_GOT_ERROR
-Construct/ComputeCon/ConDocNode//K2-ConDocNode-4, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
-Construct/ComputeCon/ConDocNode//K2-ConDocNode-5, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
-Construct/ComputeCon/ConDocNode//K2-ConDocNode-6, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
-Construct/ComputeCon/ConDocNode//K2-ConDocNode-7, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
-Construct/ComputeCon/ConDocNode//K2-ConDocNode-8, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
-Construct/ComputeCon/ConDocNode//K2-ConDocNode-9, EXPECTED_RESULT_GOT_ERROR
Construct/ComputeCon/ConText//K2-ConText-1, EXPECTED_ERROR_GOT_SAME_ERROR
-Construct/ComputeCon/ConText//K2-ConText-10, EXPECTED_RESULT_GOT_SAME_RESULT
-Construct/ComputeCon/ConText//K2-ConText-11, EXPECTED_ERROR_GOT_SAME_ERROR
-Construct/ComputeCon/ConText//K2-ConText-12, EXPECTED_ERROR_GOT_SAME_ERROR
-Construct/ComputeCon/ConText//K2-ConText-13, EXPECTED_ERROR_GOT_SAME_ERROR
-Construct/ComputeCon/ConText//K2-ConText-14, EXPECTED_RESULT_GOT_SAME_RESULT
-Construct/ComputeCon/ConText//K2-ConText-15, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Construct/ComputeCon/ConText//K2-ConText-2, EXPECTED_ERROR_GOT_SAME_ERROR
Construct/ComputeCon/ConText//K2-ConText-3, EXPECTED_RESULT_GOT_SAME_RESULT
Construct/ComputeCon/ConText//K2-ConText-4, EXPECTED_RESULT_GOT_ERROR
@@ -212,64 +206,24 @@ Construct/ComputeCon/ConText//K2-ConText-6, EXPECTED_RESULT_GOT_SAME_RESULT
Construct/ComputeCon/ConText//K2-ConText-7, EXPECTED_RESULT_GOT_SAME_RESULT
Construct/ComputeCon/ConText//K2-ConText-8, EXPECTED_RESULT_GOT_SAME_RESULT
Construct/ComputeCon/ConText//K2-ConText-9, EXPECTED_RESULT_GOT_SAME_RESULT
+Construct/ComputeCon/ConText//K2-ConText-10, EXPECTED_RESULT_GOT_SAME_RESULT
+Construct/ComputeCon/ConText//K2-ConText-11, EXPECTED_ERROR_GOT_SAME_ERROR
+Construct/ComputeCon/ConText//K2-ConText-12, EXPECTED_ERROR_GOT_SAME_ERROR
+Construct/ComputeCon/ConText//K2-ConText-13, EXPECTED_ERROR_GOT_SAME_ERROR
+Construct/ComputeCon/ConText//K2-ConText-14, EXPECTED_RESULT_GOT_SAME_RESULT
+Construct/ComputeCon/ConText//K2-ConText-15, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Construct/ConInScopeNamespace//K2-ConInScopeNamespace-1, EXPECTED_RESULT_GOT_ERROR
-Construct/DirectConElem//K2-DirectConElem-1, EXPECTED_RESULT_GOT_SAME_RESULT
-Construct/DirectConElem//K2-DirectConElem-10, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
-Construct/DirectConElem//K2-DirectConElem-11, EXPECTED_ERROR_GOT_SAME_ERROR
-Construct/DirectConElem//K2-DirectConElem-12, EXPECTED_ERROR_GOT_SAME_ERROR
-Construct/DirectConElem//K2-DirectConElem-13, EXPECTED_ERROR_GOT_SAME_ERROR
-Construct/DirectConElem//K2-DirectConElem-14, EXPECTED_ERROR_GOT_SAME_ERROR
-Construct/DirectConElem//K2-DirectConElem-15, EXPECTED_ERROR_GOT_SAME_ERROR
-Construct/DirectConElem//K2-DirectConElem-16, EXPECTED_ERROR_GOT_SAME_ERROR
-Construct/DirectConElem//K2-DirectConElem-17, EXPECTED_ERROR_GOT_SAME_ERROR
-Construct/DirectConElem//K2-DirectConElem-18, EXPECTED_ERROR_GOT_SAME_ERROR
-Construct/DirectConElem//K2-DirectConElem-19, EXPECTED_ERROR_GOT_SAME_ERROR
-Construct/DirectConElem//K2-DirectConElem-2, EXPECTED_RESULT_GOT_SAME_RESULT
-Construct/DirectConElem//K2-DirectConElem-20, EXPECTED_ERROR_GOT_SAME_ERROR
-Construct/DirectConElem//K2-DirectConElem-21, EXPECTED_ERROR_GOT_SAME_ERROR
-Construct/DirectConElem//K2-DirectConElem-22, EXPECTED_ERROR_GOT_SAME_ERROR
-Construct/DirectConElem//K2-DirectConElem-23, EXPECTED_ERROR_GOT_SAME_ERROR
-Construct/DirectConElem//K2-DirectConElem-24, EXPECTED_ERROR_GOT_SAME_ERROR
-Construct/DirectConElem//K2-DirectConElem-25, EXPECTED_ERROR_GOT_SAME_ERROR
-Construct/DirectConElem//K2-DirectConElem-26, EXPECTED_ERROR_GOT_SAME_ERROR
-Construct/DirectConElem//K2-DirectConElem-27, EXPECTED_ERROR_GOT_SAME_ERROR
-Construct/DirectConElem//K2-DirectConElem-28, EXPECTED_RESULT_GOT_SAME_RESULT
-Construct/DirectConElem//K2-DirectConElem-29, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Construct/DirectConElem//K2-DirectConElem-3, EXPECTED_ERROR_GOT_SAME_ERROR
-Construct/DirectConElem//K2-DirectConElem-30, EXPECTED_RESULT_GOT_SAME_RESULT
-Construct/DirectConElem//K2-DirectConElem-31, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Construct/DirectConElem//K2-DirectConElem-32, EXPECTED_RESULT_GOT_SAME_RESULT
-Construct/DirectConElem//K2-DirectConElem-33, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Construct/DirectConElem//K2-DirectConElem-34, EXPECTED_RESULT_GOT_ERROR
-Construct/DirectConElem//K2-DirectConElem-35, EXPECTED_ERROR_GOT_RESULT
-Construct/DirectConElem//K2-DirectConElem-36, EXPECTED_ERROR_GOT_RESULT
-Construct/DirectConElem//K2-DirectConElem-37, EXPECTED_ERROR_GOT_RESULT
-Construct/DirectConElem//K2-DirectConElem-38, EXPECTED_RESULT_GOT_SAME_RESULT
-Construct/DirectConElem//K2-DirectConElem-39, EXPECTED_ERROR_GOT_RESULT
-Construct/DirectConElem//K2-DirectConElem-4, EXPECTED_ERROR_GOT_SAME_ERROR
-Construct/DirectConElem//K2-DirectConElem-40, EXPECTED_ERROR_GOT_RESULT
-Construct/DirectConElem//K2-DirectConElem-41, EXPECTED_ERROR_GOT_RESULT
-Construct/DirectConElem//K2-DirectConElem-42, EXPECTED_RESULT_GOT_ERROR
-Construct/DirectConElem//K2-DirectConElem-43, EXPECTED_RESULT_GOT_ERROR
-Construct/DirectConElem//K2-DirectConElem-44, EXPECTED_RESULT_GOT_SAME_RESULT
-Construct/DirectConElem//K2-DirectConElem-45, EXPECTED_RESULT_GOT_SAME_RESULT
-Construct/DirectConElem//K2-DirectConElem-46, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Construct/DirectConElem//K2-DirectConElem-47, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
-Construct/DirectConElem//K2-DirectConElem-48, EXPECTED_RESULT_GOT_SAME_RESULT
-Construct/DirectConElem//K2-DirectConElem-49, EXPECTED_RESULT_GOT_SAME_RESULT
-Construct/DirectConElem//K2-DirectConElem-5, EXPECTED_ERROR_GOT_SAME_ERROR
-Construct/DirectConElem//K2-DirectConElem-50, EXPECTED_ERROR_GOT_SAME_ERROR
-Construct/DirectConElem//K2-DirectConElem-51, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Construct/DirectConElem//K2-DirectConElem-52, EXPECTED_RESULT_GOT_SAME_RESULT
-Construct/DirectConElem//K2-DirectConElem-53, EXPECTED_ERROR_GOT_SAME_ERROR
-Construct/DirectConElem//K2-DirectConElem-54, EXPECTED_ERROR_GOT_SAME_ERROR
-Construct/DirectConElem//K2-DirectConElem-6, EXPECTED_ERROR_GOT_SAME_ERROR
-Construct/DirectConElem//K2-DirectConElem-7, EXPECTED_ERROR_GOT_SAME_ERROR
-Construct/DirectConElem//K2-DirectConElem-8, EXPECTED_ERROR_GOT_SAME_ERROR
-Construct/DirectConElem//K2-DirectConElem-9, EXPECTED_ERROR_GOT_SAME_ERROR
Construct/DirectConElem/DirectConElemAttr//DirectConElemAttr-1, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Construct/DirectConElem/DirectConElemAttr//DirectConElemAttr-2, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-1, EXPECTED_ERROR_GOT_SAME_ERROR
+Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-2, EXPECTED_ERROR_GOT_SAME_ERROR
+Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-3, EXPECTED_ERROR_GOT_SAME_ERROR
+Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-4, EXPECTED_ERROR_GOT_SAME_ERROR
+Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-5, EXPECTED_RESULT_GOT_SAME_RESULT
+Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-6, EXPECTED_ERROR_GOT_SAME_ERROR
+Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-7, EXPECTED_ERROR_GOT_SAME_ERROR
+Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-8, EXPECTED_ERROR_GOT_SAME_ERROR
+Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-9, EXPECTED_ERROR_GOT_SAME_ERROR
Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-10, EXPECTED_ERROR_GOT_SAME_ERROR
Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-11, EXPECTED_ERROR_GOT_SAME_ERROR
Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-12, EXPECTED_ERROR_GOT_SAME_ERROR
@@ -280,7 +234,6 @@ Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-16, EXPECTED_ERR
Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-17, EXPECTED_ERROR_GOT_SAME_ERROR
Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-18, EXPECTED_ERROR_GOT_SAME_ERROR
Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-19, EXPECTED_ERROR_GOT_SAME_ERROR
-Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-2, EXPECTED_ERROR_GOT_SAME_ERROR
Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-20, EXPECTED_ERROR_GOT_SAME_ERROR
Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-21, EXPECTED_ERROR_GOT_SAME_ERROR
Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-22, EXPECTED_ERROR_GOT_SAME_ERROR
@@ -291,7 +244,6 @@ Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-26, EXPECTED_ERR
Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-27, EXPECTED_ERROR_GOT_SAME_ERROR
Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-28, EXPECTED_ERROR_GOT_SAME_ERROR
Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-29, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-3, EXPECTED_ERROR_GOT_SAME_ERROR
Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-30, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-31, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-32, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
@@ -302,7 +254,6 @@ Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-36, EXPECTED_RES
Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-37, EXPECTED_RESULT_GOT_ERROR
Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-38, EXPECTED_RESULT_GOT_ERROR
Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-39, EXPECTED_RESULT_GOT_SAME_RESULT
-Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-4, EXPECTED_ERROR_GOT_SAME_ERROR
Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-40, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-41, EXPECTED_RESULT_GOT_FAILURE
Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-42, EXPECTED_RESULT_GOT_SAME_RESULT
@@ -313,7 +264,6 @@ Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-46, EXPECTED_RES
Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-47, EXPECTED_RESULT_GOT_SAME_RESULT
Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-48, EXPECTED_ERROR_GOT_SAME_ERROR
Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-49, EXPECTED_RESULT_GOT_SAME_RESULT
-Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-5, EXPECTED_RESULT_GOT_SAME_RESULT
Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-50, EXPECTED_RESULT_GOT_SAME_RESULT
Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-51, EXPECTED_ERROR_GOT_SAME_ERROR
Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-52, EXPECTED_RESULT_GOT_SAME_RESULT
@@ -324,7 +274,6 @@ Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-56, EXPECTED_ERR
Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-57, EXPECTED_ERROR_GOT_SAME_ERROR
Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-58, EXPECTED_ERROR_GOT_SAME_ERROR
Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-59, EXPECTED_ERROR_GOT_SAME_ERROR
-Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-6, EXPECTED_ERROR_GOT_SAME_ERROR
Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-60, EXPECTED_ERROR_GOT_SAME_ERROR
Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-61, EXPECTED_ERROR_GOT_SAME_ERROR
Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-62, EXPECTED_ERROR_GOT_SAME_ERROR
@@ -335,7 +284,6 @@ Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-66, EXPECTED_ERR
Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-67, EXPECTED_ERROR_GOT_SAME_ERROR
Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-68, EXPECTED_ERROR_GOT_RESULT
Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-69, EXPECTED_ERROR_GOT_RESULT
-Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-7, EXPECTED_ERROR_GOT_SAME_ERROR
Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-70, EXPECTED_RESULT_GOT_ERROR
Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-71, EXPECTED_RESULT_GOT_ERROR
Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-72, EXPECTED_RESULT_GOT_ERROR
@@ -343,9 +291,15 @@ Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-73, EXPECTED_RES
Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-74, EXPECTED_RESULT_GOT_SAME_RESULT
Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-75, EXPECTED_RESULT_GOT_ERROR
Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-76, EXPECTED_RESULT_GOT_ERROR
-Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-8, EXPECTED_ERROR_GOT_SAME_ERROR
-Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-9, EXPECTED_ERROR_GOT_SAME_ERROR
Construct/DirectConElem/DirectConElemContent//K2-DirectConElemContent-1, EXPECTED_ERROR_GOT_FAILURE
+Construct/DirectConElem/DirectConElemContent//K2-DirectConElemContent-2, EXPECTED_ERROR_GOT_FAILURE
+Construct/DirectConElem/DirectConElemContent//K2-DirectConElemContent-3, EXPECTED_ERROR_GOT_FAILURE
+Construct/DirectConElem/DirectConElemContent//K2-DirectConElemContent-4, EXPECTED_ERROR_GOT_FAILURE
+Construct/DirectConElem/DirectConElemContent//K2-DirectConElemContent-5, EXPECTED_RESULT_GOT_SAME_RESULT
+Construct/DirectConElem/DirectConElemContent//K2-DirectConElemContent-6, EXPECTED_RESULT_GOT_SAME_RESULT
+Construct/DirectConElem/DirectConElemContent//K2-DirectConElemContent-7, EXPECTED_RESULT_GOT_SAME_RESULT
+Construct/DirectConElem/DirectConElemContent//K2-DirectConElemContent-8, EXPECTED_RESULT_GOT_SAME_RESULT
+Construct/DirectConElem/DirectConElemContent//K2-DirectConElemContent-9, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Construct/DirectConElem/DirectConElemContent//K2-DirectConElemContent-10, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Construct/DirectConElem/DirectConElemContent//K2-DirectConElemContent-11, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Construct/DirectConElem/DirectConElemContent//K2-DirectConElemContent-12, EXPECTED_RESULT_GOT_SAME_RESULT
@@ -356,7 +310,6 @@ Construct/DirectConElem/DirectConElemContent//K2-DirectConElemContent-16, EXPECT
Construct/DirectConElem/DirectConElemContent//K2-DirectConElemContent-17, EXPECTED_RESULT_GOT_SAME_RESULT
Construct/DirectConElem/DirectConElemContent//K2-DirectConElemContent-18, EXPECTED_ERROR_GOT_SAME_ERROR
Construct/DirectConElem/DirectConElemContent//K2-DirectConElemContent-19, EXPECTED_ERROR_GOT_SAME_ERROR
-Construct/DirectConElem/DirectConElemContent//K2-DirectConElemContent-2, EXPECTED_ERROR_GOT_FAILURE
Construct/DirectConElem/DirectConElemContent//K2-DirectConElemContent-20, EXPECTED_ERROR_GOT_SAME_ERROR
Construct/DirectConElem/DirectConElemContent//K2-DirectConElemContent-21, EXPECTED_ERROR_GOT_SAME_ERROR
Construct/DirectConElem/DirectConElemContent//K2-DirectConElemContent-22, EXPECTED_ERROR_GOT_SAME_ERROR
@@ -367,7 +320,6 @@ Construct/DirectConElem/DirectConElemContent//K2-DirectConElemContent-26, EXPECT
Construct/DirectConElem/DirectConElemContent//K2-DirectConElemContent-27, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Construct/DirectConElem/DirectConElemContent//K2-DirectConElemContent-28, EXPECTED_RESULT_GOT_SAME_RESULT
Construct/DirectConElem/DirectConElemContent//K2-DirectConElemContent-29, EXPECTED_RESULT_GOT_SAME_RESULT
-Construct/DirectConElem/DirectConElemContent//K2-DirectConElemContent-3, EXPECTED_ERROR_GOT_FAILURE
Construct/DirectConElem/DirectConElemContent//K2-DirectConElemContent-30, EXPECTED_RESULT_GOT_SAME_RESULT
Construct/DirectConElem/DirectConElemContent//K2-DirectConElemContent-31, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Construct/DirectConElem/DirectConElemContent//K2-DirectConElemContent-32, EXPECTED_RESULT_GOT_SAME_RESULT
@@ -378,7 +330,6 @@ Construct/DirectConElem/DirectConElemContent//K2-DirectConElemContent-36, EXPECT
Construct/DirectConElem/DirectConElemContent//K2-DirectConElemContent-37, EXPECTED_RESULT_GOT_ERROR
Construct/DirectConElem/DirectConElemContent//K2-DirectConElemContent-38, EXPECTED_RESULT_GOT_ERROR
Construct/DirectConElem/DirectConElemContent//K2-DirectConElemContent-39, EXPECTED_RESULT_GOT_SAME_RESULT
-Construct/DirectConElem/DirectConElemContent//K2-DirectConElemContent-4, EXPECTED_ERROR_GOT_FAILURE
Construct/DirectConElem/DirectConElemContent//K2-DirectConElemContent-40, EXPECTED_RESULT_GOT_SAME_RESULT
Construct/DirectConElem/DirectConElemContent//K2-DirectConElemContent-41, EXPECTED_RESULT_GOT_SAME_RESULT
Construct/DirectConElem/DirectConElemContent//K2-DirectConElemContent-42, EXPECTED_RESULT_GOT_SAME_RESULT
@@ -388,16 +339,19 @@ Construct/DirectConElem/DirectConElemContent//K2-DirectConElemContent-45, EXPECT
Construct/DirectConElem/DirectConElemContent//K2-DirectConElemContent-46, EXPECTED_RESULT_GOT_ERROR
Construct/DirectConElem/DirectConElemContent//K2-DirectConElemContent-47, EXPECTED_RESULT_GOT_SAME_RESULT
Construct/DirectConElem/DirectConElemContent//K2-DirectConElemContent-48, EXPECTED_RESULT_GOT_ERROR
-Construct/DirectConElem/DirectConElemContent//K2-DirectConElemContent-5, EXPECTED_RESULT_GOT_SAME_RESULT
-Construct/DirectConElem/DirectConElemContent//K2-DirectConElemContent-6, EXPECTED_RESULT_GOT_SAME_RESULT
-Construct/DirectConElem/DirectConElemContent//K2-DirectConElemContent-7, EXPECTED_RESULT_GOT_SAME_RESULT
-Construct/DirectConElem/DirectConElemContent//K2-DirectConElemContent-8, EXPECTED_RESULT_GOT_SAME_RESULT
-Construct/DirectConElem/DirectConElemContent//K2-DirectConElemContent-9, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Construct/DirectConElem/DirectConElemNamespace//DirectConElemNamespace-3, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
Construct/DirectConElem/DirectConElemNamespace//DirectConElemNamespace-4, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
Construct/DirectConElem/DirectConElemNamespace//DirectConElemNamespace-5, EXPECTED_RESULT_GOT_ERROR
Construct/DirectConElem/DirectConElemNamespace//DirectConElemNamespace-6, EXPECTED_RESULT_GOT_ERROR
Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-1, EXPECTED_ERROR_GOT_SAME_ERROR
+Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-2, EXPECTED_ERROR_GOT_SAME_ERROR
+Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-3, EXPECTED_ERROR_GOT_SAME_ERROR
+Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-4, EXPECTED_ERROR_GOT_FAILURE
+Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-5, EXPECTED_RESULT_GOT_ERROR
+Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-6, EXPECTED_RESULT_GOT_ERROR
+Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-7, EXPECTED_ERROR_GOT_SAME_ERROR
+Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-8, EXPECTED_ERROR_GOT_SAME_ERROR
+Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-9, EXPECTED_ERROR_GOT_SAME_ERROR
Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-10, EXPECTED_ERROR_GOT_SAME_ERROR
Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-11, EXPECTED_ERROR_GOT_FAILURE
Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-12, EXPECTED_ERROR_GOT_FAILURE
@@ -408,7 +362,6 @@ Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-16, EX
Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-17, EXPECTED_ERROR_GOT_RESULT
Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-18, EXPECTED_ERROR_GOT_SAME_ERROR
Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-19, EXPECTED_RESULT_GOT_ERROR
-Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-2, EXPECTED_ERROR_GOT_SAME_ERROR
Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-20, EXPECTED_RESULT_GOT_ERROR
Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-21, EXPECTED_RESULT_GOT_ERROR
Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-22, EXPECTED_RESULT_GOT_ERROR
@@ -419,7 +372,6 @@ Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-26, EX
Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-27, EXPECTED_RESULT_GOT_ERROR
Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-28, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-29, EXPECTED_RESULT_GOT_ERROR
-Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-3, EXPECTED_ERROR_GOT_SAME_ERROR
Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-30, EXPECTED_RESULT_GOT_ERROR
Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-31, EXPECTED_RESULT_GOT_ERROR
Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-32, EXPECTED_RESULT_GOT_ERROR
@@ -430,7 +382,6 @@ Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-36, EX
Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-37, EXPECTED_ERROR_GOT_RESULT
Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-38, EXPECTED_ERROR_GOT_SAME_ERROR
Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-39, EXPECTED_RESULT_GOT_ERROR
-Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-4, EXPECTED_ERROR_GOT_FAILURE
Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-40, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-41, EXPECTED_RESULT_GOT_ERROR
Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-42, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
@@ -441,7 +392,6 @@ Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-46, EX
Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-47, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-48, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-49, EXPECTED_RESULT_GOT_SAME_RESULT
-Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-5, EXPECTED_RESULT_GOT_ERROR
Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-50, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-51, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-52, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
@@ -452,7 +402,6 @@ Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-56, EX
Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-57, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-58, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-59, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
-Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-6, EXPECTED_RESULT_GOT_ERROR
Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-61, EXPECTED_ERROR_GOT_SAME_ERROR
Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-62, EXPECTED_ERROR_GOT_SAME_ERROR
Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-63, EXPECTED_ERROR_GOT_SAME_ERROR
@@ -461,7 +410,6 @@ Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-65, EX
Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-67, EXPECTED_ERROR_GOT_SAME_ERROR
Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-68, EXPECTED_ERROR_GOT_SAME_ERROR
Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-69, EXPECTED_ERROR_GOT_SAME_ERROR
-Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-7, EXPECTED_ERROR_GOT_SAME_ERROR
Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-70, EXPECTED_ERROR_GOT_SAME_ERROR
Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-71, EXPECTED_ERROR_GOT_SAME_ERROR
Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-72, EXPECTED_ERROR_GOT_RESULT
@@ -472,9 +420,15 @@ Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-76, EX
Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-77, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-78, EXPECTED_RESULT_GOT_FAILURE
Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-79, EXPECTED_ERROR_GOT_FAILURE
-Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-8, EXPECTED_ERROR_GOT_SAME_ERROR
-Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-9, EXPECTED_ERROR_GOT_SAME_ERROR
Construct/DirectConElem/DirectConElemWhitespace//K2-DirectConElemWhitespace-1, EXPECTED_RESULT_GOT_SAME_RESULT
+Construct/DirectConElem/DirectConElemWhitespace//K2-DirectConElemWhitespace-2, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+Construct/DirectConElem/DirectConElemWhitespace//K2-DirectConElemWhitespace-3, EXPECTED_RESULT_GOT_SAME_RESULT
+Construct/DirectConElem/DirectConElemWhitespace//K2-DirectConElemWhitespace-4, EXPECTED_RESULT_GOT_SAME_RESULT
+Construct/DirectConElem/DirectConElemWhitespace//K2-DirectConElemWhitespace-5, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+Construct/DirectConElem/DirectConElemWhitespace//K2-DirectConElemWhitespace-6, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+Construct/DirectConElem/DirectConElemWhitespace//K2-DirectConElemWhitespace-7, EXPECTED_RESULT_GOT_SAME_RESULT
+Construct/DirectConElem/DirectConElemWhitespace//K2-DirectConElemWhitespace-8, EXPECTED_RESULT_GOT_SAME_RESULT
+Construct/DirectConElem/DirectConElemWhitespace//K2-DirectConElemWhitespace-9, EXPECTED_RESULT_GOT_SAME_RESULT
Construct/DirectConElem/DirectConElemWhitespace//K2-DirectConElemWhitespace-10, EXPECTED_RESULT_GOT_SAME_RESULT
Construct/DirectConElem/DirectConElemWhitespace//K2-DirectConElemWhitespace-11, EXPECTED_RESULT_GOT_SAME_RESULT
Construct/DirectConElem/DirectConElemWhitespace//K2-DirectConElemWhitespace-12, EXPECTED_RESULT_GOT_SAME_RESULT
@@ -485,7 +439,6 @@ Construct/DirectConElem/DirectConElemWhitespace//K2-DirectConElemWhitespace-16,
Construct/DirectConElem/DirectConElemWhitespace//K2-DirectConElemWhitespace-17, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Construct/DirectConElem/DirectConElemWhitespace//K2-DirectConElemWhitespace-18, EXPECTED_RESULT_GOT_SAME_RESULT
Construct/DirectConElem/DirectConElemWhitespace//K2-DirectConElemWhitespace-19, EXPECTED_RESULT_GOT_SAME_RESULT
-Construct/DirectConElem/DirectConElemWhitespace//K2-DirectConElemWhitespace-2, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Construct/DirectConElem/DirectConElemWhitespace//K2-DirectConElemWhitespace-20, EXPECTED_RESULT_GOT_SAME_RESULT
Construct/DirectConElem/DirectConElemWhitespace//K2-DirectConElemWhitespace-21, EXPECTED_RESULT_GOT_SAME_RESULT
Construct/DirectConElem/DirectConElemWhitespace//K2-DirectConElemWhitespace-22, EXPECTED_RESULT_GOT_SAME_RESULT
@@ -493,14 +446,69 @@ Construct/DirectConElem/DirectConElemWhitespace//K2-DirectConElemWhitespace-23,
Construct/DirectConElem/DirectConElemWhitespace//K2-DirectConElemWhitespace-24, EXPECTED_RESULT_GOT_SAME_RESULT
Construct/DirectConElem/DirectConElemWhitespace//K2-DirectConElemWhitespace-25, EXPECTED_RESULT_GOT_SAME_RESULT
Construct/DirectConElem/DirectConElemWhitespace//K2-DirectConElemWhitespace-26, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Construct/DirectConElem/DirectConElemWhitespace//K2-DirectConElemWhitespace-3, EXPECTED_RESULT_GOT_SAME_RESULT
-Construct/DirectConElem/DirectConElemWhitespace//K2-DirectConElemWhitespace-4, EXPECTED_RESULT_GOT_SAME_RESULT
-Construct/DirectConElem/DirectConElemWhitespace//K2-DirectConElemWhitespace-5, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Construct/DirectConElem/DirectConElemWhitespace//K2-DirectConElemWhitespace-6, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Construct/DirectConElem/DirectConElemWhitespace//K2-DirectConElemWhitespace-7, EXPECTED_RESULT_GOT_SAME_RESULT
-Construct/DirectConElem/DirectConElemWhitespace//K2-DirectConElemWhitespace-8, EXPECTED_RESULT_GOT_SAME_RESULT
-Construct/DirectConElem/DirectConElemWhitespace//K2-DirectConElemWhitespace-9, EXPECTED_RESULT_GOT_SAME_RESULT
+Construct/DirectConElem//K2-DirectConElem-1, EXPECTED_RESULT_GOT_SAME_RESULT
+Construct/DirectConElem//K2-DirectConElem-2, EXPECTED_RESULT_GOT_SAME_RESULT
+Construct/DirectConElem//K2-DirectConElem-3, EXPECTED_ERROR_GOT_SAME_ERROR
+Construct/DirectConElem//K2-DirectConElem-4, EXPECTED_ERROR_GOT_SAME_ERROR
+Construct/DirectConElem//K2-DirectConElem-5, EXPECTED_ERROR_GOT_SAME_ERROR
+Construct/DirectConElem//K2-DirectConElem-6, EXPECTED_ERROR_GOT_SAME_ERROR
+Construct/DirectConElem//K2-DirectConElem-7, EXPECTED_ERROR_GOT_SAME_ERROR
+Construct/DirectConElem//K2-DirectConElem-8, EXPECTED_ERROR_GOT_SAME_ERROR
+Construct/DirectConElem//K2-DirectConElem-9, EXPECTED_ERROR_GOT_SAME_ERROR
+Construct/DirectConElem//K2-DirectConElem-10, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
+Construct/DirectConElem//K2-DirectConElem-11, EXPECTED_ERROR_GOT_SAME_ERROR
+Construct/DirectConElem//K2-DirectConElem-12, EXPECTED_ERROR_GOT_SAME_ERROR
+Construct/DirectConElem//K2-DirectConElem-13, EXPECTED_ERROR_GOT_SAME_ERROR
+Construct/DirectConElem//K2-DirectConElem-14, EXPECTED_ERROR_GOT_SAME_ERROR
+Construct/DirectConElem//K2-DirectConElem-15, EXPECTED_ERROR_GOT_SAME_ERROR
+Construct/DirectConElem//K2-DirectConElem-16, EXPECTED_ERROR_GOT_SAME_ERROR
+Construct/DirectConElem//K2-DirectConElem-17, EXPECTED_ERROR_GOT_SAME_ERROR
+Construct/DirectConElem//K2-DirectConElem-18, EXPECTED_ERROR_GOT_SAME_ERROR
+Construct/DirectConElem//K2-DirectConElem-19, EXPECTED_ERROR_GOT_SAME_ERROR
+Construct/DirectConElem//K2-DirectConElem-20, EXPECTED_ERROR_GOT_SAME_ERROR
+Construct/DirectConElem//K2-DirectConElem-21, EXPECTED_ERROR_GOT_SAME_ERROR
+Construct/DirectConElem//K2-DirectConElem-22, EXPECTED_ERROR_GOT_SAME_ERROR
+Construct/DirectConElem//K2-DirectConElem-23, EXPECTED_ERROR_GOT_SAME_ERROR
+Construct/DirectConElem//K2-DirectConElem-24, EXPECTED_ERROR_GOT_SAME_ERROR
+Construct/DirectConElem//K2-DirectConElem-25, EXPECTED_ERROR_GOT_SAME_ERROR
+Construct/DirectConElem//K2-DirectConElem-26, EXPECTED_ERROR_GOT_SAME_ERROR
+Construct/DirectConElem//K2-DirectConElem-27, EXPECTED_ERROR_GOT_SAME_ERROR
+Construct/DirectConElem//K2-DirectConElem-28, EXPECTED_RESULT_GOT_SAME_RESULT
+Construct/DirectConElem//K2-DirectConElem-29, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+Construct/DirectConElem//K2-DirectConElem-30, EXPECTED_RESULT_GOT_SAME_RESULT
+Construct/DirectConElem//K2-DirectConElem-31, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+Construct/DirectConElem//K2-DirectConElem-32, EXPECTED_RESULT_GOT_SAME_RESULT
+Construct/DirectConElem//K2-DirectConElem-33, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+Construct/DirectConElem//K2-DirectConElem-34, EXPECTED_RESULT_GOT_ERROR
+Construct/DirectConElem//K2-DirectConElem-35, EXPECTED_ERROR_GOT_RESULT
+Construct/DirectConElem//K2-DirectConElem-36, EXPECTED_ERROR_GOT_RESULT
+Construct/DirectConElem//K2-DirectConElem-37, EXPECTED_ERROR_GOT_RESULT
+Construct/DirectConElem//K2-DirectConElem-38, EXPECTED_RESULT_GOT_SAME_RESULT
+Construct/DirectConElem//K2-DirectConElem-39, EXPECTED_ERROR_GOT_RESULT
+Construct/DirectConElem//K2-DirectConElem-40, EXPECTED_ERROR_GOT_RESULT
+Construct/DirectConElem//K2-DirectConElem-41, EXPECTED_ERROR_GOT_RESULT
+Construct/DirectConElem//K2-DirectConElem-42, EXPECTED_RESULT_GOT_ERROR
+Construct/DirectConElem//K2-DirectConElem-43, EXPECTED_RESULT_GOT_ERROR
+Construct/DirectConElem//K2-DirectConElem-44, EXPECTED_RESULT_GOT_SAME_RESULT
+Construct/DirectConElem//K2-DirectConElem-45, EXPECTED_RESULT_GOT_SAME_RESULT
+Construct/DirectConElem//K2-DirectConElem-46, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+Construct/DirectConElem//K2-DirectConElem-47, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
+Construct/DirectConElem//K2-DirectConElem-48, EXPECTED_RESULT_GOT_SAME_RESULT
+Construct/DirectConElem//K2-DirectConElem-49, EXPECTED_RESULT_GOT_SAME_RESULT
+Construct/DirectConElem//K2-DirectConElem-50, EXPECTED_ERROR_GOT_SAME_ERROR
+Construct/DirectConElem//K2-DirectConElem-51, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+Construct/DirectConElem//K2-DirectConElem-52, EXPECTED_RESULT_GOT_SAME_RESULT
+Construct/DirectConElem//K2-DirectConElem-53, EXPECTED_ERROR_GOT_SAME_ERROR
+Construct/DirectConElem//K2-DirectConElem-54, EXPECTED_ERROR_GOT_SAME_ERROR
Construct/DirectConOther//K2-DirectConOther-1, EXPECTED_RESULT_GOT_SAME_RESULT
+Construct/DirectConOther//K2-DirectConOther-2, EXPECTED_ERROR_GOT_SAME_ERROR
+Construct/DirectConOther//K2-DirectConOther-3, EXPECTED_ERROR_GOT_SAME_ERROR
+Construct/DirectConOther//K2-DirectConOther-4, EXPECTED_ERROR_GOT_SAME_ERROR
+Construct/DirectConOther//K2-DirectConOther-5, EXPECTED_ERROR_GOT_SAME_ERROR
+Construct/DirectConOther//K2-DirectConOther-6, EXPECTED_ERROR_GOT_SAME_ERROR
+Construct/DirectConOther//K2-DirectConOther-7, EXPECTED_ERROR_GOT_SAME_ERROR
+Construct/DirectConOther//K2-DirectConOther-8, EXPECTED_ERROR_GOT_SAME_ERROR
+Construct/DirectConOther//K2-DirectConOther-9, EXPECTED_ERROR_GOT_SAME_ERROR
Construct/DirectConOther//K2-DirectConOther-10, EXPECTED_ERROR_GOT_SAME_ERROR
Construct/DirectConOther//K2-DirectConOther-11, EXPECTED_ERROR_GOT_SAME_ERROR
Construct/DirectConOther//K2-DirectConOther-12, EXPECTED_ERROR_GOT_SAME_ERROR
@@ -511,7 +519,6 @@ Construct/DirectConOther//K2-DirectConOther-16, EXPECTED_ERROR_GOT_SAME_ERROR
Construct/DirectConOther//K2-DirectConOther-17, EXPECTED_ERROR_GOT_SAME_ERROR
Construct/DirectConOther//K2-DirectConOther-18, EXPECTED_ERROR_GOT_SAME_ERROR
Construct/DirectConOther//K2-DirectConOther-19, EXPECTED_ERROR_GOT_SAME_ERROR
-Construct/DirectConOther//K2-DirectConOther-2, EXPECTED_ERROR_GOT_SAME_ERROR
Construct/DirectConOther//K2-DirectConOther-20, EXPECTED_ERROR_GOT_SAME_ERROR
Construct/DirectConOther//K2-DirectConOther-21, EXPECTED_ERROR_GOT_SAME_ERROR
Construct/DirectConOther//K2-DirectConOther-22, EXPECTED_ERROR_GOT_SAME_ERROR
@@ -522,7 +529,6 @@ Construct/DirectConOther//K2-DirectConOther-26, EXPECTED_ERROR_GOT_SAME_ERROR
Construct/DirectConOther//K2-DirectConOther-27, EXPECTED_ERROR_GOT_SAME_ERROR
Construct/DirectConOther//K2-DirectConOther-28, EXPECTED_ERROR_GOT_SAME_ERROR
Construct/DirectConOther//K2-DirectConOther-29, EXPECTED_RESULT_GOT_ERROR
-Construct/DirectConOther//K2-DirectConOther-3, EXPECTED_ERROR_GOT_SAME_ERROR
Construct/DirectConOther//K2-DirectConOther-30, EXPECTED_RESULT_GOT_ERROR
Construct/DirectConOther//K2-DirectConOther-31, EXPECTED_RESULT_GOT_ERROR
Construct/DirectConOther//K2-DirectConOther-32, EXPECTED_RESULT_GOT_SAME_RESULT
@@ -533,7 +539,6 @@ Construct/DirectConOther//K2-DirectConOther-36, EXPECTED_RESULT_GOT_SAME_RESULT
Construct/DirectConOther//K2-DirectConOther-37, EXPECTED_RESULT_GOT_SAME_RESULT
Construct/DirectConOther//K2-DirectConOther-38, EXPECTED_RESULT_GOT_SAME_RESULT
Construct/DirectConOther//K2-DirectConOther-39, EXPECTED_RESULT_GOT_SAME_RESULT
-Construct/DirectConOther//K2-DirectConOther-4, EXPECTED_ERROR_GOT_SAME_ERROR
Construct/DirectConOther//K2-DirectConOther-40, EXPECTED_RESULT_GOT_SAME_RESULT
Construct/DirectConOther//K2-DirectConOther-41, EXPECTED_RESULT_GOT_SAME_RESULT
Construct/DirectConOther//K2-DirectConOther-42, EXPECTED_ERROR_GOT_SAME_ERROR
@@ -544,7 +549,6 @@ Construct/DirectConOther//K2-DirectConOther-46, EXPECTED_RESULT_GOT_DIFFERENT_RE
Construct/DirectConOther//K2-DirectConOther-47, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Construct/DirectConOther//K2-DirectConOther-48, EXPECTED_ERROR_GOT_RESULT
Construct/DirectConOther//K2-DirectConOther-49, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Construct/DirectConOther//K2-DirectConOther-5, EXPECTED_ERROR_GOT_SAME_ERROR
Construct/DirectConOther//K2-DirectConOther-50, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Construct/DirectConOther//K2-DirectConOther-51, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Construct/DirectConOther//K2-DirectConOther-52, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
@@ -555,7 +559,6 @@ Construct/DirectConOther//K2-DirectConOther-56, EXPECTED_ERROR_GOT_SAME_ERROR
Construct/DirectConOther//K2-DirectConOther-57, EXPECTED_ERROR_GOT_SAME_ERROR
Construct/DirectConOther//K2-DirectConOther-58, EXPECTED_RESULT_GOT_SAME_RESULT
Construct/DirectConOther//K2-DirectConOther-59, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Construct/DirectConOther//K2-DirectConOther-6, EXPECTED_ERROR_GOT_SAME_ERROR
Construct/DirectConOther//K2-DirectConOther-60, EXPECTED_RESULT_GOT_SAME_RESULT
Construct/DirectConOther//K2-DirectConOther-61, EXPECTED_ERROR_GOT_SAME_ERROR
Construct/DirectConOther//K2-DirectConOther-62, EXPECTED_ERROR_GOT_SAME_ERROR
@@ -566,11 +569,8 @@ Construct/DirectConOther//K2-DirectConOther-66, EXPECTED_RESULT_GOT_ERROR
Construct/DirectConOther//K2-DirectConOther-67, EXPECTED_RESULT_GOT_ERROR
Construct/DirectConOther//K2-DirectConOther-68, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Construct/DirectConOther//K2-DirectConOther-69, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Construct/DirectConOther//K2-DirectConOther-7, EXPECTED_ERROR_GOT_SAME_ERROR
Construct/DirectConOther//K2-DirectConOther-70, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Construct/DirectConOther//K2-DirectConOther-71, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Construct/DirectConOther//K2-DirectConOther-8, EXPECTED_ERROR_GOT_SAME_ERROR
-Construct/DirectConOther//K2-DirectConOther-9, EXPECTED_ERROR_GOT_SAME_ERROR
ErrorsAndOptimization//errors-and-optimization-1, EXPECTED_RESULT_GOT_SAME_RESULT
ErrorsAndOptimization//errors-and-optimization-2, EXPECTED_ERROR_GOT_SAME_ERROR
ErrorsAndOptimization//errors-and-optimization-3, EXPECTED_RESULT_GOT_ERROR
@@ -600,9 +600,6 @@ Expressions/CondExpr//CondExpr020, EXPECTED_RESULT_GOT_FAILURE
Expressions/CondExpr//CondExpr021, EXPECTED_RESULT_GOT_FAILURE
Expressions/CondExpr//CondExpr022, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/CondExpr//K-CondExpr-1, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/CondExpr//K-CondExpr-10, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/CondExpr//K-CondExpr-11, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/CondExpr//K-CondExpr-12, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/CondExpr//K-CondExpr-2, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/CondExpr//K-CondExpr-3, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/CondExpr//K-CondExpr-4, EXPECTED_RESULT_GOT_SAME_RESULT
@@ -611,7 +608,18 @@ Expressions/CondExpr//K-CondExpr-6, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/CondExpr//K-CondExpr-7, EXPECTED_ERROR_GOT_SAME_ERROR
Expressions/CondExpr//K-CondExpr-8, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/CondExpr//K-CondExpr-9, EXPECTED_RESULT_GOT_SAME_RESULT
+Expressions/CondExpr//K-CondExpr-10, EXPECTED_RESULT_GOT_SAME_RESULT
+Expressions/CondExpr//K-CondExpr-11, EXPECTED_RESULT_GOT_SAME_RESULT
+Expressions/CondExpr//K-CondExpr-12, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Construct/ComputeCon/ComputeConAttr//Constr-compattr-compname-1, EXPECTED_ERROR_GOT_SAME_ERROR
+Expressions/Construct/ComputeCon/ComputeConAttr//Constr-compattr-compname-2, EXPECTED_ERROR_GOT_SAME_ERROR
+Expressions/Construct/ComputeCon/ComputeConAttr//Constr-compattr-compname-3, EXPECTED_ERROR_GOT_SAME_ERROR
+Expressions/Construct/ComputeCon/ComputeConAttr//Constr-compattr-compname-4, EXPECTED_ERROR_GOT_FAILURE
+Expressions/Construct/ComputeCon/ComputeConAttr//Constr-compattr-compname-5, EXPECTED_ERROR_GOT_SAME_ERROR
+Expressions/Construct/ComputeCon/ComputeConAttr//Constr-compattr-compname-6, EXPECTED_ERROR_GOT_SAME_ERROR
+Expressions/Construct/ComputeCon/ComputeConAttr//Constr-compattr-compname-7, EXPECTED_ERROR_GOT_SAME_ERROR
+Expressions/Construct/ComputeCon/ComputeConAttr//Constr-compattr-compname-8, EXPECTED_RESULT_GOT_FAILURE
+Expressions/Construct/ComputeCon/ComputeConAttr//Constr-compattr-compname-9, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Construct/ComputeCon/ComputeConAttr//Constr-compattr-compname-10, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Construct/ComputeCon/ComputeConAttr//Constr-compattr-compname-11, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Construct/ComputeCon/ComputeConAttr//Constr-compattr-compname-12, EXPECTED_RESULT_GOT_SAME_RESULT
@@ -622,14 +630,6 @@ Expressions/Construct/ComputeCon/ComputeConAttr//Constr-compattr-compname-16, EX
Expressions/Construct/ComputeCon/ComputeConAttr//Constr-compattr-compname-17, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
Expressions/Construct/ComputeCon/ComputeConAttr//Constr-compattr-compname-18, EXPECTED_ERROR_GOT_RESULT
Expressions/Construct/ComputeCon/ComputeConAttr//Constr-compattr-compname-19, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
-Expressions/Construct/ComputeCon/ComputeConAttr//Constr-compattr-compname-2, EXPECTED_ERROR_GOT_SAME_ERROR
-Expressions/Construct/ComputeCon/ComputeConAttr//Constr-compattr-compname-3, EXPECTED_ERROR_GOT_SAME_ERROR
-Expressions/Construct/ComputeCon/ComputeConAttr//Constr-compattr-compname-4, EXPECTED_ERROR_GOT_FAILURE
-Expressions/Construct/ComputeCon/ComputeConAttr//Constr-compattr-compname-5, EXPECTED_ERROR_GOT_SAME_ERROR
-Expressions/Construct/ComputeCon/ComputeConAttr//Constr-compattr-compname-6, EXPECTED_ERROR_GOT_SAME_ERROR
-Expressions/Construct/ComputeCon/ComputeConAttr//Constr-compattr-compname-7, EXPECTED_ERROR_GOT_SAME_ERROR
-Expressions/Construct/ComputeCon/ComputeConAttr//Constr-compattr-compname-8, EXPECTED_RESULT_GOT_FAILURE
-Expressions/Construct/ComputeCon/ComputeConAttr//Constr-compattr-compname-9, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Construct/ComputeCon/ComputeConAttr//Constr-compattr-data-1, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Expressions/Construct/ComputeCon/ComputeConAttr//Constr-compattr-doc-1, EXPECTED_RESULT_GOT_FAILURE
Expressions/Construct/ComputeCon/ComputeConAttr//Constr-compattr-enclexpr-1, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
@@ -676,6 +676,14 @@ Expressions/Construct/ComputeCon/ComputeConElem//Constr-compelem-baseuri-1, EXPE
Expressions/Construct/ComputeCon/ComputeConElem//Constr-compelem-baseuri-2, EXPECTED_RESULT_GOT_ERROR
Expressions/Construct/ComputeCon/ComputeConElem//Constr-compelem-baseuri-3, EXPECTED_RESULT_GOT_ERROR
Expressions/Construct/ComputeCon/ComputeConElem//Constr-compelem-compname-1, EXPECTED_ERROR_GOT_SAME_ERROR
+Expressions/Construct/ComputeCon/ComputeConElem//Constr-compelem-compname-2, EXPECTED_ERROR_GOT_SAME_ERROR
+Expressions/Construct/ComputeCon/ComputeConElem//Constr-compelem-compname-3, EXPECTED_ERROR_GOT_SAME_ERROR
+Expressions/Construct/ComputeCon/ComputeConElem//Constr-compelem-compname-4, EXPECTED_ERROR_GOT_FAILURE
+Expressions/Construct/ComputeCon/ComputeConElem//Constr-compelem-compname-5, EXPECTED_ERROR_GOT_SAME_ERROR
+Expressions/Construct/ComputeCon/ComputeConElem//Constr-compelem-compname-6, EXPECTED_ERROR_GOT_SAME_ERROR
+Expressions/Construct/ComputeCon/ComputeConElem//Constr-compelem-compname-7, EXPECTED_ERROR_GOT_SAME_ERROR
+Expressions/Construct/ComputeCon/ComputeConElem//Constr-compelem-compname-8, EXPECTED_RESULT_GOT_FAILURE
+Expressions/Construct/ComputeCon/ComputeConElem//Constr-compelem-compname-9, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Construct/ComputeCon/ComputeConElem//Constr-compelem-compname-10, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Construct/ComputeCon/ComputeConElem//Constr-compelem-compname-11, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Construct/ComputeCon/ComputeConElem//Constr-compelem-compname-12, EXPECTED_RESULT_GOT_SAME_RESULT
@@ -686,14 +694,6 @@ Expressions/Construct/ComputeCon/ComputeConElem//Constr-compelem-compname-16, EX
Expressions/Construct/ComputeCon/ComputeConElem//Constr-compelem-compname-17, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
Expressions/Construct/ComputeCon/ComputeConElem//Constr-compelem-compname-18, EXPECTED_ERROR_GOT_RESULT
Expressions/Construct/ComputeCon/ComputeConElem//Constr-compelem-compname-19, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
-Expressions/Construct/ComputeCon/ComputeConElem//Constr-compelem-compname-2, EXPECTED_ERROR_GOT_SAME_ERROR
-Expressions/Construct/ComputeCon/ComputeConElem//Constr-compelem-compname-3, EXPECTED_ERROR_GOT_SAME_ERROR
-Expressions/Construct/ComputeCon/ComputeConElem//Constr-compelem-compname-4, EXPECTED_ERROR_GOT_FAILURE
-Expressions/Construct/ComputeCon/ComputeConElem//Constr-compelem-compname-5, EXPECTED_ERROR_GOT_SAME_ERROR
-Expressions/Construct/ComputeCon/ComputeConElem//Constr-compelem-compname-6, EXPECTED_ERROR_GOT_SAME_ERROR
-Expressions/Construct/ComputeCon/ComputeConElem//Constr-compelem-compname-7, EXPECTED_ERROR_GOT_SAME_ERROR
-Expressions/Construct/ComputeCon/ComputeConElem//Constr-compelem-compname-8, EXPECTED_RESULT_GOT_FAILURE
-Expressions/Construct/ComputeCon/ComputeConElem//Constr-compelem-compname-9, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Construct/ComputeCon/ComputeConElem//Constr-compelem-constrmod-3, EXPECTED_ERROR_GOT_FAILURE
Expressions/Construct/ComputeCon/ComputeConElem//Constr-compelem-constrmod-4, EXPECTED_ERROR_GOT_FAILURE
Expressions/Construct/ComputeCon/ComputeConElem//Constr-compelem-constrmod-7, EXPECTED_ERROR_GOT_FAILURE
@@ -717,14 +717,6 @@ Expressions/Construct/ComputeCon/ComputeConElem//Constr-compelem-nodeid-5, EXPEC
Expressions/Construct/ComputeCon/ComputeConElem//Constr-compelem-parent-1, EXPECTED_RESULT_GOT_ERROR
Expressions/Construct/ComputeCon/ComputeConElem//Constr-compelem-string-1, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Expressions/Construct/ComputeCon/ComputeConPI//Constr-comppi-compname-1, EXPECTED_ERROR_GOT_RESULT
-Expressions/Construct/ComputeCon/ComputeConPI//Constr-comppi-compname-10, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/Construct/ComputeCon/ComputeConPI//Constr-comppi-compname-11, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/Construct/ComputeCon/ComputeConPI//Constr-comppi-compname-12, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/Construct/ComputeCon/ComputeConPI//Constr-comppi-compname-13, EXPECTED_ERROR_GOT_RESULT
-Expressions/Construct/ComputeCon/ComputeConPI//Constr-comppi-compname-15, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/Construct/ComputeCon/ComputeConPI//Constr-comppi-compname-16, EXPECTED_ERROR_GOT_RESULT
-Expressions/Construct/ComputeCon/ComputeConPI//Constr-comppi-compname-18, EXPECTED_ERROR_GOT_RESULT
-Expressions/Construct/ComputeCon/ComputeConPI//Constr-comppi-compname-19, EXPECTED_ERROR_GOT_RESULT
Expressions/Construct/ComputeCon/ComputeConPI//Constr-comppi-compname-2, EXPECTED_ERROR_GOT_RESULT
Expressions/Construct/ComputeCon/ComputeConPI//Constr-comppi-compname-3, EXPECTED_ERROR_GOT_RESULT
Expressions/Construct/ComputeCon/ComputeConPI//Constr-comppi-compname-4, EXPECTED_ERROR_GOT_FAILURE
@@ -733,6 +725,14 @@ Expressions/Construct/ComputeCon/ComputeConPI//Constr-comppi-compname-6, EXPECTE
Expressions/Construct/ComputeCon/ComputeConPI//Constr-comppi-compname-7, EXPECTED_ERROR_GOT_RESULT
Expressions/Construct/ComputeCon/ComputeConPI//Constr-comppi-compname-8, EXPECTED_RESULT_GOT_FAILURE
Expressions/Construct/ComputeCon/ComputeConPI//Constr-comppi-compname-9, EXPECTED_ERROR_GOT_FAILURE
+Expressions/Construct/ComputeCon/ComputeConPI//Constr-comppi-compname-10, EXPECTED_RESULT_GOT_SAME_RESULT
+Expressions/Construct/ComputeCon/ComputeConPI//Constr-comppi-compname-11, EXPECTED_RESULT_GOT_SAME_RESULT
+Expressions/Construct/ComputeCon/ComputeConPI//Constr-comppi-compname-12, EXPECTED_RESULT_GOT_SAME_RESULT
+Expressions/Construct/ComputeCon/ComputeConPI//Constr-comppi-compname-13, EXPECTED_ERROR_GOT_RESULT
+Expressions/Construct/ComputeCon/ComputeConPI//Constr-comppi-compname-15, EXPECTED_RESULT_GOT_SAME_RESULT
+Expressions/Construct/ComputeCon/ComputeConPI//Constr-comppi-compname-16, EXPECTED_ERROR_GOT_RESULT
+Expressions/Construct/ComputeCon/ComputeConPI//Constr-comppi-compname-18, EXPECTED_ERROR_GOT_RESULT
+Expressions/Construct/ComputeCon/ComputeConPI//Constr-comppi-compname-19, EXPECTED_ERROR_GOT_RESULT
Expressions/Construct/ComputeCon/ComputeConPI//Constr-comppi-data-1, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Expressions/Construct/ComputeCon/ComputeConPI//Constr-comppi-doc-1, EXPECTED_RESULT_GOT_FAILURE
Expressions/Construct/ComputeCon/ComputeConPI//Constr-comppi-empty-1, EXPECTED_RESULT_GOT_SAME_RESULT
@@ -745,12 +745,12 @@ Expressions/Construct/ComputeCon/ComputeConPI//Constr-comppi-enclexpr-5, EXPECTE
Expressions/Construct/ComputeCon/ComputeConPI//Constr-comppi-invalid-1, EXPECTED_ERROR_GOT_RESULT
Expressions/Construct/ComputeCon/ComputeConPI//Constr-comppi-invalid-2, EXPECTED_ERROR_GOT_RESULT
Expressions/Construct/ComputeCon/ComputeConPI//Constr-comppi-invalid-3, EXPECTED_ERROR_GOT_RESULT
-Expressions/Construct/ComputeCon/ComputeConPI//Constr-comppi-name-1, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/Construct/ComputeCon/ComputeConPI//Constr-comppi-name-2, EXPECTED_ERROR_GOT_SAME_ERROR
Expressions/Construct/ComputeCon/ComputeConPI//Constr-comppi-namexml-1, EXPECTED_ERROR_GOT_RESULT
Expressions/Construct/ComputeCon/ComputeConPI//Constr-comppi-namexml-2, EXPECTED_ERROR_GOT_RESULT
Expressions/Construct/ComputeCon/ComputeConPI//Constr-comppi-namexml-3, EXPECTED_ERROR_GOT_RESULT
Expressions/Construct/ComputeCon/ComputeConPI//Constr-comppi-namexml-4, EXPECTED_ERROR_GOT_RESULT
+Expressions/Construct/ComputeCon/ComputeConPI//Constr-comppi-name-1, EXPECTED_RESULT_GOT_SAME_RESULT
+Expressions/Construct/ComputeCon/ComputeConPI//Constr-comppi-name-2, EXPECTED_ERROR_GOT_SAME_ERROR
Expressions/Construct/ComputeCon/ComputeConPI//Constr-comppi-parent-1, EXPECTED_RESULT_GOT_ERROR
Expressions/Construct/ComputeCon/ComputeConPI//Constr-comppi-space-1, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Expressions/Construct/ComputeCon/ComputeConPI//Constr-comppi-space-2, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
@@ -804,6 +804,14 @@ Expressions/Construct/ComputeCon/ConText//Constr-text-nested-3, EXPECTED_RESULT_
Expressions/Construct/ComputeCon/ConText//Constr-text-parent-1, EXPECTED_RESULT_GOT_ERROR
Expressions/Construct/ComputeCon/ConText//Constr-text-string-1, EXPECTED_RESULT_GOT_ERROR
Expressions/Construct/ConInScopeNamespace//Constr-inscope-1, EXPECTED_RESULT_GOT_FAILURE
+Expressions/Construct/ConInScopeNamespace//Constr-inscope-2, EXPECTED_RESULT_GOT_FAILURE
+Expressions/Construct/ConInScopeNamespace//Constr-inscope-3, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+Expressions/Construct/ConInScopeNamespace//Constr-inscope-4, EXPECTED_RESULT_GOT_FAILURE
+Expressions/Construct/ConInScopeNamespace//Constr-inscope-5, EXPECTED_RESULT_GOT_FAILURE
+Expressions/Construct/ConInScopeNamespace//Constr-inscope-6, EXPECTED_RESULT_GOT_FAILURE
+Expressions/Construct/ConInScopeNamespace//Constr-inscope-7, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+Expressions/Construct/ConInScopeNamespace//Constr-inscope-8, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+Expressions/Construct/ConInScopeNamespace//Constr-inscope-9, EXPECTED_RESULT_GOT_FAILURE
Expressions/Construct/ConInScopeNamespace//Constr-inscope-10, EXPECTED_RESULT_GOT_FAILURE
Expressions/Construct/ConInScopeNamespace//Constr-inscope-11, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Expressions/Construct/ConInScopeNamespace//Constr-inscope-12, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
@@ -814,28 +822,7 @@ Expressions/Construct/ConInScopeNamespace//Constr-inscope-16, EXPECTED_RESULT_GO
Expressions/Construct/ConInScopeNamespace//Constr-inscope-17, EXPECTED_RESULT_GOT_FAILURE
Expressions/Construct/ConInScopeNamespace//Constr-inscope-18, EXPECTED_RESULT_GOT_FAILURE
Expressions/Construct/ConInScopeNamespace//Constr-inscope-19, EXPECTED_RESULT_GOT_FAILURE
-Expressions/Construct/ConInScopeNamespace//Constr-inscope-2, EXPECTED_RESULT_GOT_FAILURE
Expressions/Construct/ConInScopeNamespace//Constr-inscope-20, EXPECTED_RESULT_GOT_FAILURE
-Expressions/Construct/ConInScopeNamespace//Constr-inscope-3, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/Construct/ConInScopeNamespace//Constr-inscope-4, EXPECTED_RESULT_GOT_FAILURE
-Expressions/Construct/ConInScopeNamespace//Constr-inscope-5, EXPECTED_RESULT_GOT_FAILURE
-Expressions/Construct/ConInScopeNamespace//Constr-inscope-6, EXPECTED_RESULT_GOT_FAILURE
-Expressions/Construct/ConInScopeNamespace//Constr-inscope-7, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/Construct/ConInScopeNamespace//Constr-inscope-8, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/Construct/ConInScopeNamespace//Constr-inscope-9, EXPECTED_RESULT_GOT_FAILURE
-Expressions/Construct/DirectConElem//Constr-elem-curlybr-1, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/Construct/DirectConElem//Constr-elem-curlybr-2, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/Construct/DirectConElem//Constr-elem-curlybr-3, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/Construct/DirectConElem//Constr-elem-curlybr-4, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/Construct/DirectConElem//Constr-elem-curlybr-5, EXPECTED_ERROR_GOT_SAME_ERROR
-Expressions/Construct/DirectConElem//Constr-elem-curlybr-6, EXPECTED_ERROR_GOT_SAME_ERROR
-Expressions/Construct/DirectConElem//Constr-elem-empty-1, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/Construct/DirectConElem//Constr-elem-empty-2, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/Construct/DirectConElem//Constr-elem-empty-3, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/Construct/DirectConElem//Constr-elem-empty-4, EXPECTED_ERROR_GOT_RESULT
-Expressions/Construct/DirectConElem//Constr-elem-empty-5, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/Construct/DirectConElem//Constr-elem-matchtag-1, EXPECTED_ERROR_GOT_SAME_ERROR
-Expressions/Construct/DirectConElem//Constr-elem-matchtag-2, EXPECTED_ERROR_GOT_SAME_ERROR
Expressions/Construct/DirectConElem/DirectConElemAttr//Constr-attr-charref-1, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Construct/DirectConElem/DirectConElemAttr//Constr-attr-content-1, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Construct/DirectConElem/DirectConElemAttr//Constr-attr-content-2, EXPECTED_ERROR_GOT_SAME_ERROR
@@ -860,13 +847,12 @@ Expressions/Construct/DirectConElem/DirectConElemAttr//Constr-attr-id-1, EXPECTE
Expressions/Construct/DirectConElem/DirectConElemAttr//Constr-attr-id-2, EXPECTED_ERROR_GOT_RESULT
Expressions/Construct/DirectConElem/DirectConElemAttr//Constr-attr-nsdecl-1, EXPECTED_RESULT_GOT_FAILURE
Expressions/Construct/DirectConElem/DirectConElemAttr//Constr-attr-nsdecl-2, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/Construct/DirectConElem/DirectConElemAttr//Constr-attr-nspre-1, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/Construct/DirectConElem/DirectConElemAttr//Constr-attr-nspre-2, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Expressions/Construct/DirectConElem/DirectConElemAttr//Constr-attr-nsprein-1, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Expressions/Construct/DirectConElem/DirectConElemAttr//Constr-attr-nsprein-2, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+Expressions/Construct/DirectConElem/DirectConElemAttr//Constr-attr-nspre-1, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+Expressions/Construct/DirectConElem/DirectConElemAttr//Constr-attr-nspre-2, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Expressions/Construct/DirectConElem/DirectConElemAttr//Constr-attr-parent-1, EXPECTED_RESULT_GOT_ERROR
Expressions/Construct/DirectConElem/DirectConElemAttr//Constr-attr-syntax-1, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/Construct/DirectConElem/DirectConElemAttr//Constr-attr-syntax-10, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Construct/DirectConElem/DirectConElemAttr//Constr-attr-syntax-2, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Construct/DirectConElem/DirectConElemAttr//Constr-attr-syntax-3, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Construct/DirectConElem/DirectConElemAttr//Constr-attr-syntax-4, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
@@ -875,6 +861,7 @@ Expressions/Construct/DirectConElem/DirectConElemAttr//Constr-attr-syntax-6, EXP
Expressions/Construct/DirectConElem/DirectConElemAttr//Constr-attr-syntax-7, EXPECTED_ERROR_GOT_SAME_ERROR
Expressions/Construct/DirectConElem/DirectConElemAttr//Constr-attr-syntax-8, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Construct/DirectConElem/DirectConElemAttr//Constr-attr-syntax-9, EXPECTED_RESULT_GOT_SAME_RESULT
+Expressions/Construct/DirectConElem/DirectConElemAttr//Constr-attr-syntax-10, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Construct/DirectConElem/DirectConElemAttr//Constr-attr-ws-1, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Expressions/Construct/DirectConElem/DirectConElemAttr//Constr-attr-ws-2, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Expressions/Construct/DirectConElem/DirectConElemAttr//Constr-attr-ws-3, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
@@ -908,12 +895,12 @@ Expressions/Construct/DirectConElem/DirectConElemContent//Constr-cont-constrmod-
Expressions/Construct/DirectConElem/DirectConElemContent//Constr-cont-constrmod-7, EXPECTED_ERROR_GOT_FAILURE
Expressions/Construct/DirectConElem/DirectConElemContent//Constr-cont-constrmod-8, EXPECTED_ERROR_GOT_FAILURE
Expressions/Construct/DirectConElem/DirectConElemContent//Constr-cont-data-1, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/Construct/DirectConElem/DirectConElemContent//Constr-cont-doc-1, EXPECTED_RESULT_GOT_FAILURE
Expressions/Construct/DirectConElem/DirectConElemContent//Constr-cont-document-1, EXPECTED_RESULT_GOT_ERROR
Expressions/Construct/DirectConElem/DirectConElemContent//Constr-cont-document-2, EXPECTED_RESULT_GOT_ERROR
Expressions/Construct/DirectConElem/DirectConElemContent//Constr-cont-document-3, EXPECTED_RESULT_GOT_FAILURE
Expressions/Construct/DirectConElem/DirectConElemContent//Constr-cont-document-4, EXPECTED_RESULT_GOT_ERROR
Expressions/Construct/DirectConElem/DirectConElemContent//Constr-cont-document-5, EXPECTED_RESULT_GOT_ERROR
+Expressions/Construct/DirectConElem/DirectConElemContent//Constr-cont-doc-1, EXPECTED_RESULT_GOT_FAILURE
Expressions/Construct/DirectConElem/DirectConElemContent//Constr-cont-enclexpr-1, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Construct/DirectConElem/DirectConElemContent//Constr-cont-enclexpr-2, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Expressions/Construct/DirectConElem/DirectConElemContent//Constr-cont-enclexpr-3, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
@@ -943,8 +930,6 @@ Expressions/Construct/DirectConElem/DirectConElemContent//Constr-cont-nodeid-3,
Expressions/Construct/DirectConElem/DirectConElemContent//Constr-cont-nodeid-4, EXPECTED_RESULT_GOT_ERROR
Expressions/Construct/DirectConElem/DirectConElemContent//Constr-cont-nodeid-5, EXPECTED_RESULT_GOT_ERROR
Expressions/Construct/DirectConElem/DirectConElemContent//Constr-cont-nsmode-1, EXPECTED_RESULT_GOT_FAILURE
-Expressions/Construct/DirectConElem/DirectConElemContent//Constr-cont-nsmode-10, EXPECTED_ERROR_GOT_FAILURE
-Expressions/Construct/DirectConElem/DirectConElemContent//Constr-cont-nsmode-11, EXPECTED_RESULT_GOT_ERROR
Expressions/Construct/DirectConElem/DirectConElemContent//Constr-cont-nsmode-2, EXPECTED_RESULT_GOT_FAILURE
Expressions/Construct/DirectConElem/DirectConElemContent//Constr-cont-nsmode-3, EXPECTED_RESULT_GOT_FAILURE
Expressions/Construct/DirectConElem/DirectConElemContent//Constr-cont-nsmode-4, EXPECTED_RESULT_GOT_FAILURE
@@ -953,12 +938,22 @@ Expressions/Construct/DirectConElem/DirectConElemContent//Constr-cont-nsmode-6,
Expressions/Construct/DirectConElem/DirectConElemContent//Constr-cont-nsmode-7, EXPECTED_ERROR_GOT_FAILURE
Expressions/Construct/DirectConElem/DirectConElemContent//Constr-cont-nsmode-8, EXPECTED_ERROR_GOT_FAILURE
Expressions/Construct/DirectConElem/DirectConElemContent//Constr-cont-nsmode-9, EXPECTED_RESULT_GOT_FAILURE
+Expressions/Construct/DirectConElem/DirectConElemContent//Constr-cont-nsmode-10, EXPECTED_ERROR_GOT_FAILURE
+Expressions/Construct/DirectConElem/DirectConElemContent//Constr-cont-nsmode-11, EXPECTED_RESULT_GOT_ERROR
Expressions/Construct/DirectConElem/DirectConElemContent//Constr-cont-parent-1, EXPECTED_RESULT_GOT_ERROR
Expressions/Construct/DirectConElem/DirectConElemContent//Constr-cont-string-1, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Construct/DirectConElem/DirectConElemContent//Constr-cont-text-1, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Construct/DirectConElem/DirectConElemContent//Constr-cont-text-2, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Construct/DirectConElem/DirectConElemContent//Constr-cont-uripres-1, EXPECTED_RESULT_GOT_ERROR
Expressions/Construct/DirectConElem/DirectConElemNamespace//Constr-namespace-1, EXPECTED_ERROR_GOT_SAME_ERROR
+Expressions/Construct/DirectConElem/DirectConElemNamespace//Constr-namespace-2, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+Expressions/Construct/DirectConElem/DirectConElemNamespace//Constr-namespace-3, EXPECTED_RESULT_GOT_SAME_RESULT
+Expressions/Construct/DirectConElem/DirectConElemNamespace//Constr-namespace-4, EXPECTED_ERROR_GOT_RESULT
+Expressions/Construct/DirectConElem/DirectConElemNamespace//Constr-namespace-5, EXPECTED_ERROR_GOT_RESULT
+Expressions/Construct/DirectConElem/DirectConElemNamespace//Constr-namespace-6, EXPECTED_ERROR_GOT_RESULT
+Expressions/Construct/DirectConElem/DirectConElemNamespace//Constr-namespace-7, EXPECTED_ERROR_GOT_RESULT
+Expressions/Construct/DirectConElem/DirectConElemNamespace//Constr-namespace-8, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+Expressions/Construct/DirectConElem/DirectConElemNamespace//Constr-namespace-9, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Expressions/Construct/DirectConElem/DirectConElemNamespace//Constr-namespace-10, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Expressions/Construct/DirectConElem/DirectConElemNamespace//Constr-namespace-11, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Expressions/Construct/DirectConElem/DirectConElemNamespace//Constr-namespace-12, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
@@ -969,7 +964,6 @@ Expressions/Construct/DirectConElem/DirectConElemNamespace//Constr-namespace-16,
Expressions/Construct/DirectConElem/DirectConElemNamespace//Constr-namespace-17, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Expressions/Construct/DirectConElem/DirectConElemNamespace//Constr-namespace-18, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Construct/DirectConElem/DirectConElemNamespace//Constr-namespace-19, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/Construct/DirectConElem/DirectConElemNamespace//Constr-namespace-2, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Expressions/Construct/DirectConElem/DirectConElemNamespace//Constr-namespace-20, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Expressions/Construct/DirectConElem/DirectConElemNamespace//Constr-namespace-21, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Expressions/Construct/DirectConElem/DirectConElemNamespace//Constr-namespace-22, EXPECTED_RESULT_GOT_SAME_RESULT
@@ -979,13 +973,6 @@ Expressions/Construct/DirectConElem/DirectConElemNamespace//Constr-namespace-25,
Expressions/Construct/DirectConElem/DirectConElemNamespace//Constr-namespace-26, EXPECTED_RESULT_GOT_FAILURE
Expressions/Construct/DirectConElem/DirectConElemNamespace//Constr-namespace-27, EXPECTED_RESULT_GOT_FAILURE
Expressions/Construct/DirectConElem/DirectConElemNamespace//Constr-namespace-29, EXPECTED_ERROR_GOT_SAME_ERROR
-Expressions/Construct/DirectConElem/DirectConElemNamespace//Constr-namespace-3, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/Construct/DirectConElem/DirectConElemNamespace//Constr-namespace-4, EXPECTED_ERROR_GOT_RESULT
-Expressions/Construct/DirectConElem/DirectConElemNamespace//Constr-namespace-5, EXPECTED_ERROR_GOT_RESULT
-Expressions/Construct/DirectConElem/DirectConElemNamespace//Constr-namespace-6, EXPECTED_ERROR_GOT_RESULT
-Expressions/Construct/DirectConElem/DirectConElemNamespace//Constr-namespace-7, EXPECTED_ERROR_GOT_RESULT
-Expressions/Construct/DirectConElem/DirectConElemNamespace//Constr-namespace-8, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/Construct/DirectConElem/DirectConElemNamespace//Constr-namespace-9, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Expressions/Construct/DirectConElem/DirectConElemWhitespace//Constr-ws-adjcdata-1, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Construct/DirectConElem/DirectConElemWhitespace//Constr-ws-adjcdata-2, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Construct/DirectConElem/DirectConElemWhitespace//Constr-ws-adjcdata-3, EXPECTED_RESULT_GOT_SAME_RESULT
@@ -993,6 +980,14 @@ Expressions/Construct/DirectConElem/DirectConElemWhitespace//Constr-ws-adjchref-
Expressions/Construct/DirectConElem/DirectConElemWhitespace//Constr-ws-adjchref-2, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Construct/DirectConElem/DirectConElemWhitespace//Constr-ws-adjchref-3, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Construct/DirectConElem/DirectConElemWhitespace//Constr-ws-enclexpr-1, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+Expressions/Construct/DirectConElem/DirectConElemWhitespace//Constr-ws-enclexpr-2, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+Expressions/Construct/DirectConElem/DirectConElemWhitespace//Constr-ws-enclexpr-3, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+Expressions/Construct/DirectConElem/DirectConElemWhitespace//Constr-ws-enclexpr-4, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+Expressions/Construct/DirectConElem/DirectConElemWhitespace//Constr-ws-enclexpr-5, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+Expressions/Construct/DirectConElem/DirectConElemWhitespace//Constr-ws-enclexpr-6, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+Expressions/Construct/DirectConElem/DirectConElemWhitespace//Constr-ws-enclexpr-7, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+Expressions/Construct/DirectConElem/DirectConElemWhitespace//Constr-ws-enclexpr-8, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+Expressions/Construct/DirectConElem/DirectConElemWhitespace//Constr-ws-enclexpr-9, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Expressions/Construct/DirectConElem/DirectConElemWhitespace//Constr-ws-enclexpr-10, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Expressions/Construct/DirectConElem/DirectConElemWhitespace//Constr-ws-enclexpr-11, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Expressions/Construct/DirectConElem/DirectConElemWhitespace//Constr-ws-enclexpr-12, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
@@ -1003,19 +998,11 @@ Expressions/Construct/DirectConElem/DirectConElemWhitespace//Constr-ws-enclexpr-
Expressions/Construct/DirectConElem/DirectConElemWhitespace//Constr-ws-enclexpr-17, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Construct/DirectConElem/DirectConElemWhitespace//Constr-ws-enclexpr-18, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Construct/DirectConElem/DirectConElemWhitespace//Constr-ws-enclexpr-19, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/Construct/DirectConElem/DirectConElemWhitespace//Constr-ws-enclexpr-2, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Expressions/Construct/DirectConElem/DirectConElemWhitespace//Constr-ws-enclexpr-20, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Construct/DirectConElem/DirectConElemWhitespace//Constr-ws-enclexpr-21, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Construct/DirectConElem/DirectConElemWhitespace//Constr-ws-enclexpr-22, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Construct/DirectConElem/DirectConElemWhitespace//Constr-ws-enclexpr-23, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Construct/DirectConElem/DirectConElemWhitespace//Constr-ws-enclexpr-24, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/Construct/DirectConElem/DirectConElemWhitespace//Constr-ws-enclexpr-3, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/Construct/DirectConElem/DirectConElemWhitespace//Constr-ws-enclexpr-4, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/Construct/DirectConElem/DirectConElemWhitespace//Constr-ws-enclexpr-5, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/Construct/DirectConElem/DirectConElemWhitespace//Constr-ws-enclexpr-6, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/Construct/DirectConElem/DirectConElemWhitespace//Constr-ws-enclexpr-7, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/Construct/DirectConElem/DirectConElemWhitespace//Constr-ws-enclexpr-8, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/Construct/DirectConElem/DirectConElemWhitespace//Constr-ws-enclexpr-9, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Expressions/Construct/DirectConElem/DirectConElemWhitespace//Constr-ws-gencdata-1, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Construct/DirectConElem/DirectConElemWhitespace//Constr-ws-gencdata-3, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Construct/DirectConElem/DirectConElemWhitespace//Constr-ws-genchref-1, EXPECTED_RESULT_GOT_SAME_RESULT
@@ -1032,7 +1019,6 @@ Expressions/Construct/DirectConElem/DirectConElemWhitespace//Constr-ws-nobound-4
Expressions/Construct/DirectConElem/DirectConElemWhitespace//Constr-ws-nobound-5, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Construct/DirectConElem/DirectConElemWhitespace//Constr-ws-nobound-6, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Construct/DirectConElem/DirectConElemWhitespace//Constr-ws-tag-1, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/Construct/DirectConElem/DirectConElemWhitespace//Constr-ws-tag-10, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Expressions/Construct/DirectConElem/DirectConElemWhitespace//Constr-ws-tag-2, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Expressions/Construct/DirectConElem/DirectConElemWhitespace//Constr-ws-tag-3, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Expressions/Construct/DirectConElem/DirectConElemWhitespace//Constr-ws-tag-4, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
@@ -1041,8 +1027,22 @@ Expressions/Construct/DirectConElem/DirectConElemWhitespace//Constr-ws-tag-6, EX
Expressions/Construct/DirectConElem/DirectConElemWhitespace//Constr-ws-tag-7, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Construct/DirectConElem/DirectConElemWhitespace//Constr-ws-tag-8, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Construct/DirectConElem/DirectConElemWhitespace//Constr-ws-tag-9, EXPECTED_RESULT_GOT_SAME_RESULT
+Expressions/Construct/DirectConElem/DirectConElemWhitespace//Constr-ws-tag-10, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Expressions/Construct/DirectConElem/DirectConElemWhitespace//Constr-ws-xmlspace-1, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Expressions/Construct/DirectConElem/DirectConElemWhitespace//Constr-ws-xmlspace-2, EXPECTED_ERROR_GOT_RESULT
+Expressions/Construct/DirectConElem//Constr-elem-curlybr-1, EXPECTED_RESULT_GOT_SAME_RESULT
+Expressions/Construct/DirectConElem//Constr-elem-curlybr-2, EXPECTED_RESULT_GOT_SAME_RESULT
+Expressions/Construct/DirectConElem//Constr-elem-curlybr-3, EXPECTED_RESULT_GOT_SAME_RESULT
+Expressions/Construct/DirectConElem//Constr-elem-curlybr-4, EXPECTED_RESULT_GOT_SAME_RESULT
+Expressions/Construct/DirectConElem//Constr-elem-curlybr-5, EXPECTED_ERROR_GOT_SAME_ERROR
+Expressions/Construct/DirectConElem//Constr-elem-curlybr-6, EXPECTED_ERROR_GOT_SAME_ERROR
+Expressions/Construct/DirectConElem//Constr-elem-empty-1, EXPECTED_RESULT_GOT_SAME_RESULT
+Expressions/Construct/DirectConElem//Constr-elem-empty-2, EXPECTED_RESULT_GOT_SAME_RESULT
+Expressions/Construct/DirectConElem//Constr-elem-empty-3, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+Expressions/Construct/DirectConElem//Constr-elem-empty-4, EXPECTED_ERROR_GOT_RESULT
+Expressions/Construct/DirectConElem//Constr-elem-empty-5, EXPECTED_RESULT_GOT_SAME_RESULT
+Expressions/Construct/DirectConElem//Constr-elem-matchtag-1, EXPECTED_ERROR_GOT_SAME_ERROR
+Expressions/Construct/DirectConElem//Constr-elem-matchtag-2, EXPECTED_ERROR_GOT_SAME_ERROR
Expressions/Construct/DirectConOther//Constr-comment-1, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Construct/DirectConOther//Constr-comment-2, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Construct/DirectConOther//Constr-comment-3, EXPECTED_RESULT_GOT_SAME_RESULT
@@ -1064,6 +1064,14 @@ Expressions/Construct/DirectConOther//Constr-pi-target-2, EXPECTED_ERROR_GOT_SAM
Expressions/Construct/DirectConOther//Constr-pi-target-3, EXPECTED_ERROR_GOT_SAME_ERROR
Expressions/Construct/DirectConOther//Constr-pi-target-4, EXPECTED_ERROR_GOT_SAME_ERROR
Expressions/ContextExpr/ExternalContextExpr//externalcontextitem-1, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
+Expressions/ContextExpr/ExternalContextExpr//externalcontextitem-2, EXPECTED_RESULT_GOT_FAILURE
+Expressions/ContextExpr/ExternalContextExpr//externalcontextitem-3, EXPECTED_RESULT_GOT_FAILURE
+Expressions/ContextExpr/ExternalContextExpr//externalcontextitem-4, EXPECTED_RESULT_GOT_FAILURE
+Expressions/ContextExpr/ExternalContextExpr//externalcontextitem-5, EXPECTED_RESULT_GOT_FAILURE
+Expressions/ContextExpr/ExternalContextExpr//externalcontextitem-6, EXPECTED_RESULT_GOT_FAILURE
+Expressions/ContextExpr/ExternalContextExpr//externalcontextitem-7, EXPECTED_RESULT_GOT_FAILURE
+Expressions/ContextExpr/ExternalContextExpr//externalcontextitem-8, EXPECTED_RESULT_GOT_FAILURE
+Expressions/ContextExpr/ExternalContextExpr//externalcontextitem-9, EXPECTED_RESULT_GOT_FAILURE
Expressions/ContextExpr/ExternalContextExpr//externalcontextitem-10, EXPECTED_RESULT_GOT_FAILURE
Expressions/ContextExpr/ExternalContextExpr//externalcontextitem-11, EXPECTED_RESULT_GOT_FAILURE
Expressions/ContextExpr/ExternalContextExpr//externalcontextitem-12, EXPECTED_RESULT_GOT_FAILURE
@@ -1074,20 +1082,20 @@ Expressions/ContextExpr/ExternalContextExpr//externalcontextitem-16, EXPECTED_RE
Expressions/ContextExpr/ExternalContextExpr//externalcontextitem-17, EXPECTED_RESULT_GOT_FAILURE
Expressions/ContextExpr/ExternalContextExpr//externalcontextitem-18, EXPECTED_RESULT_GOT_FAILURE
Expressions/ContextExpr/ExternalContextExpr//externalcontextitem-19, EXPECTED_RESULT_GOT_FAILURE
-Expressions/ContextExpr/ExternalContextExpr//externalcontextitem-2, EXPECTED_RESULT_GOT_FAILURE
Expressions/ContextExpr/ExternalContextExpr//externalcontextitem-20, EXPECTED_RESULT_GOT_FAILURE
Expressions/ContextExpr/ExternalContextExpr//externalcontextitem-21, EXPECTED_RESULT_GOT_FAILURE
Expressions/ContextExpr/ExternalContextExpr//externalcontextitem-22, EXPECTED_RESULT_GOT_FAILURE
Expressions/ContextExpr/ExternalContextExpr//externalcontextitem-23, EXPECTED_ERROR_GOT_FAILURE
Expressions/ContextExpr/ExternalContextExpr//externalcontextitem-24, EXPECTED_RESULT_GOT_FAILURE
-Expressions/ContextExpr/ExternalContextExpr//externalcontextitem-3, EXPECTED_RESULT_GOT_FAILURE
-Expressions/ContextExpr/ExternalContextExpr//externalcontextitem-4, EXPECTED_RESULT_GOT_FAILURE
-Expressions/ContextExpr/ExternalContextExpr//externalcontextitem-5, EXPECTED_RESULT_GOT_FAILURE
-Expressions/ContextExpr/ExternalContextExpr//externalcontextitem-6, EXPECTED_RESULT_GOT_FAILURE
-Expressions/ContextExpr/ExternalContextExpr//externalcontextitem-7, EXPECTED_RESULT_GOT_FAILURE
-Expressions/ContextExpr/ExternalContextExpr//externalcontextitem-8, EXPECTED_RESULT_GOT_FAILURE
-Expressions/ContextExpr/ExternalContextExpr//externalcontextitem-9, EXPECTED_RESULT_GOT_FAILURE
Expressions/ContextExpr/InternalContextExpr//internalcontextitem-1, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
+Expressions/ContextExpr/InternalContextExpr//internalcontextitem-2, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+Expressions/ContextExpr
<TRUNCATED>
[36/50] [abbrv] vxquery git commit: Updated the VXQuery contributors
list.
Posted by sj...@apache.org.
Updated the VXQuery contributors list.
Project: http://git-wip-us.apache.org/repos/asf/vxquery/repo
Commit: http://git-wip-us.apache.org/repos/asf/vxquery/commit/0ad460aa
Tree: http://git-wip-us.apache.org/repos/asf/vxquery/tree/0ad460aa
Diff: http://git-wip-us.apache.org/repos/asf/vxquery/diff/0ad460aa
Branch: refs/heads/site
Commit: 0ad460aaa702768e5567760f18db2a8eea386972
Parents: faec6e4
Author: Preston Carman <pr...@apache.org>
Authored: Sun May 15 13:45:30 2016 -0700
Committer: Preston Carman <pr...@apache.org>
Committed: Sun May 15 13:45:30 2016 -0700
----------------------------------------------------------------------
pom.xml | 39 +++++++++++++++++++++++++++++++++++++++
1 file changed, 39 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/vxquery/blob/0ad460aa/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index fb9df9a..8a97a92 100644
--- a/pom.xml
+++ b/pom.xml
@@ -132,6 +132,45 @@
</developer>
</developers>
+ <contributors>
+ <contributor>
+ <name>Ankit Ladhania</name>
+ <email />
+ <organization />
+ <roles>
+ <role>Developer</role>
+ </roles>
+ <timezone>+5:30</timezone>
+ </contributor>
+ <contributor>
+ <name>Christina Pavlopoulou</name>
+ <email />
+ <organization />
+ <roles>
+ <role>Developer</role>
+ </roles>
+ <timezone>-8</timezone>
+ </contributor>
+ <contributor>
+ <name>Efi Kaltirimidou</name>
+ <email />
+ <organization />
+ <roles>
+ <role>Developer</role>
+ </roles>
+ <timezone>+3</timezone>
+ </contributor>
+ <contributor>
+ <name>Shivani Mall</name>
+ <email />
+ <organization />
+ <roles>
+ <role>Developer</role>
+ </roles>
+ <timezone>-8</timezone>
+ </contributor>
+ </contributors>
+
<mailingLists>
<mailingList>
<name>dev</name>
[44/50] [abbrv] vxquery git commit: VXQUERY-131: Support for reading
HDFS XML files.
Posted by sj...@apache.org.
VXQUERY-131: Support for reading HDFS XML files.
1. User can choose between local and HDFS file systems for data input
2. New collection-with-tag function that reads from HDFS by blocks
3. Collection and Document can both read HDFS
4. Custom InputFormatClass for XML in HDFS
5. Parsing of data from HDFS as whole files
6. Unit tests for HDFS
7. MiniDFS cluster for unit tests
8. Documentation
9. Allow user to pass HDFS config folder as a param to queries
Author: Efi Kaltirimidou github: efikalti
Project: http://git-wip-us.apache.org/repos/asf/vxquery/repo
Commit: http://git-wip-us.apache.org/repos/asf/vxquery/commit/3fc2d6c2
Tree: http://git-wip-us.apache.org/repos/asf/vxquery/tree/3fc2d6c2
Diff: http://git-wip-us.apache.org/repos/asf/vxquery/diff/3fc2d6c2
Branch: refs/heads/site
Commit: 3fc2d6c2f74083513f5a45ccdef2bde8ad23d9a8
Parents: 7de1fba
Author: Steven Jacobs <sj...@ucr.edu>
Authored: Wed May 18 14:56:53 2016 -0700
Committer: Steven Jacobs <sj...@ucr.edu>
Committed: Wed May 18 14:56:53 2016 -0700
----------------------------------------------------------------------
pom.xml | 83 +++-
src/site/apt/user_cluster_installation.apt | 2 +-
src/site/apt/user_query.apt | 1 +
src/site/apt/user_query_hdfs.apt | 180 ++++++++
src/site/site.xml | 3 +
vxquery-cli/pom.xml | 12 +
.../java/org/apache/vxquery/cli/VXQuery.java | 46 +-
vxquery-core/pom.xml | 61 ++-
.../compiler/rewriter/RewriteRuleset.java | 2 +-
.../rewriter/rules/AbstractCollectionRule.java | 50 ++-
.../rewriter/rules/IntroduceCollectionRule.java | 11 +-
.../vxquery/functions/builtin-functions.xml | 8 +
.../org/apache/vxquery/hdfs2/HDFSFunctions.java | 428 +++++++++++++++++++
.../hdfs2/XmlCollectionWithTagInputFormat.java | 217 ++++++++++
.../metadata/VXQueryCollectionDataSource.java | 12 +-
.../VXQueryCollectionOperatorDescriptor.java | 190 +++++++-
.../metadata/VXQueryMetadataProvider.java | 20 +-
.../runtime/functions/util/FunctionHelper.java | 49 ++-
.../org/apache/vxquery/xmlparser/XMLParser.java | 49 ++-
.../xmlquery/query/XMLQueryCompiler.java | 92 ++--
.../xmlquery/query/SimpleXQueryTest.java | 19 +-
.../src/main/resources/conf/cluster.properties | 6 +-
vxquery-xtest/pom.xml | 15 +
.../java/org/apache/vxquery/xtest/MiniDFS.java | 75 ++++
.../org/apache/vxquery/xtest/TestRunner.java | 23 +-
.../org/apache/vxquery/xtest/XTestOptions.java | 3 +
.../vxquery/xtest/AbstractXQueryTest.java | 1 +
.../org/apache/vxquery/xtest/VXQueryTest.java | 19 +
.../HDFS/Aggregate/avgHDFS.txt | 1 +
.../HDFS/Aggregate/countHDFS.txt | 1 +
.../HDFS/Aggregate/maxHDFS.txt | 1 +
.../HDFS/Aggregate/maxvalueHDFS.txt | 1 +
.../HDFS/Aggregate/minHDFS.txt | 1 +
.../HDFS/Aggregate/sumHDFS.txt | 1 +
.../Queries/XQuery/HDFS/Aggregate/avgHDFS.xq | 25 ++
.../Queries/XQuery/HDFS/Aggregate/countHDFS.xq | 25 ++
.../Queries/XQuery/HDFS/Aggregate/maxHDFS.xq | 25 ++
.../XQuery/HDFS/Aggregate/maxvalueHDFS.xq | 23 +
.../Queries/XQuery/HDFS/Aggregate/minHDFS.xq | 25 ++
.../Queries/XQuery/HDFS/Aggregate/sumHDFS.xq | 25 ++
.../src/test/resources/VXQueryCatalog.xml | 15 +
.../test/resources/cat/HDFSAggregateQueries.xml | 53 +++
.../test/resources/hadoop/conf/core-site.xml | 34 ++
.../test/resources/hadoop/conf/hdfs-site.xml | 34 ++
.../test/resources/hadoop/conf/mapred-site.xml | 41 ++
45 files changed, 1844 insertions(+), 164 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/vxquery/blob/3fc2d6c2/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 8a97a92..911206d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,7 +14,8 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
@@ -169,6 +170,24 @@
</roles>
<timezone>-8</timezone>
</contributor>
+ <contributor>
+ <name>Menaka Madushanka</name>
+ <email />
+ <organization />
+ <roles>
+ <role>Developer</role>
+ </roles>
+ <timezone>+5:30</timezone>
+ </contributor>
+ <contributor>
+ <name>Riyafa Abdul Hameed</name>
+ <email />
+ <organization />
+ <roles>
+ <role>Developer</role>
+ </roles>
+ <timezone>+5:30</timezone>
+ </contributor>
</contributors>
<mailingLists>
@@ -295,6 +314,25 @@
</dependency>
<dependency>
+ <groupId>org.apache.hyracks</groupId>
+ <artifactId>hyracks-hdfs-2.x</artifactId>
+ <version>${hyracks.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.hyracks</groupId>
+ <artifactId>hyracks-hdfs-core</artifactId>
+ <version>${hyracks.version}</version>
+ <type>jar</type>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-hdfs</artifactId>
+ <version>2.7.0</version>
+ </dependency>
+
+ <dependency>
<groupId>ant</groupId>
<artifactId>ant-trax</artifactId>
<version>1.6.5</version>
@@ -340,7 +378,7 @@
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
- <version>1.3.2</version>
+ <version>2.4</version>
</dependency>
<dependency>
@@ -359,9 +397,10 @@
<dependency>
<groupId>org.mortbay.jetty</groupId>
<artifactId>jetty</artifactId>
- <version>6.1.4</version>
+ <version>6.1.22</version>
<scope>compile</scope>
</dependency>
+
</dependencies>
</dependencyManagement>
@@ -437,19 +476,21 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
- <!-- We override the configuration plugin to override the descriptor to use for building
- the source release zip. Specifically, we would like to control the inclusions/exclusions.
- For example, we exclude the KEYS file from the zip -->
+ <!-- We override the configuration plugin to override the descriptor
+ to use for building the source release zip. Specifically, we would like to
+ control the inclusions/exclusions. For example, we exclude the KEYS file
+ from the zip -->
<executions>
<execution>
- <!-- Use this id to match the id mentioned in the assembly plugin configuration in
- the apache parent POM under the apache-release profile -->
+ <!-- Use this id to match the id mentioned in the assembly plugin configuration
+ in the apache parent POM under the apache-release profile -->
<id>source-release-assembly</id>
<phase>package</phase>
<goals>
<goal>single</goal>
</goals>
- <!-- combine.self should be override to replace the configuration in the parent POM -->
+ <!-- combine.self should be override to replace the configuration in
+ the parent POM -->
<configuration combine.self="override">
<runOnlyAtExecutionRoot>true</runOnlyAtExecutionRoot>
<descriptors>
@@ -491,6 +532,29 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
</plugin>
+ <plugin>
+ <groupId>com.google.code.maven-replacer-plugin</groupId>
+ <artifactId>replacer</artifactId>
+ <version>1.5.3</version>
+ <executions>
+ <execution>
+ <phase>prepare-package</phase>
+ <goals>
+ <goal>replace</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <ignoreMissingFile>true</ignoreMissingFile>
+ <file>vxquery-server/src/main/resources/conf/cluster.properties</file>
+ <outputFile>
+ vxquery-server/src/main/resources/conf/cluster.properties
+ </outputFile>
+ <regex>false</regex>
+ <token>$CONF_PATH$</token>
+ <value>${basedir}/vxquery-xtest/src/test/resources/hadoop/conf</value>
+ </configuration>
+ </plugin>
</plugins>
</build>
@@ -541,6 +605,7 @@
<maxmemory>2g</maxmemory>
</configuration>
</plugin>
+
</plugins>
</reporting>
http://git-wip-us.apache.org/repos/asf/vxquery/blob/3fc2d6c2/src/site/apt/user_cluster_installation.apt
----------------------------------------------------------------------
diff --git a/src/site/apt/user_cluster_installation.apt b/src/site/apt/user_cluster_installation.apt
index 0e756b0..19e20ed 100644
--- a/src/site/apt/user_cluster_installation.apt
+++ b/src/site/apt/user_cluster_installation.apt
@@ -32,7 +32,7 @@ Cluster Installation
* Apache VXQuery\x99 source archive (apache-vxquery-X.Y-source-release.zip)
- * JDK >= 1.7
+ * JDK >= 1.8
* Apache Maven >= 3.2
http://git-wip-us.apache.org/repos/asf/vxquery/blob/3fc2d6c2/src/site/apt/user_query.apt
----------------------------------------------------------------------
diff --git a/src/site/apt/user_query.apt b/src/site/apt/user_query.apt
index 8ea6429..c5132c3 100644
--- a/src/site/apt/user_query.apt
+++ b/src/site/apt/user_query.apt
@@ -49,6 +49,7 @@ vxq "path-to"\test.xq
-showrp : Show Runtime plan
-showtet : Show translated expression tree
-timing : Produce timing information
+-hdfs-conf VAL : The folder containing the HDFS configuration files
----------------------------------------
* Java Options
http://git-wip-us.apache.org/repos/asf/vxquery/blob/3fc2d6c2/src/site/apt/user_query_hdfs.apt
----------------------------------------------------------------------
diff --git a/src/site/apt/user_query_hdfs.apt b/src/site/apt/user_query_hdfs.apt
new file mode 100644
index 0000000..fa736b8
--- /dev/null
+++ b/src/site/apt/user_query_hdfs.apt
@@ -0,0 +1,180 @@
+~~ Licensed to the Apache Software Foundation (ASF) under one or more
+~~ contributor license agreements. See the NOTICE file distributed with
+~~ this work for additional information regarding copyright ownership.
+~~ The ASF licenses this file to You under the Apache License, Version 2.0
+~~ (the "License"); you may not use this file except in compliance with
+~~ the License. You may obtain a copy of the License at
+~~
+~~ http://www.apache.org/licenses/LICENSE-2.0
+~~
+~~ Unless required by applicable law or agreed to in writing, software
+~~ distributed under the License is distributed on an "AS IS" BASIS,
+~~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+~~ See the License for the specific language governing permissions and
+~~ limitations under the License.
+
+Executing a Query in HDFS
+
+
+* 1. Connecting VXQuery with HDFS
+
+ In order to read HDFS data, VXQuery needs access to the HDFS configuration
+ directory, which contains:
+
+ core-site.xml
+ hdfs-site.xml
+ mapred-site.xml
+
+ Some systems may automatically set this directory as a system environment
+ variable ("HADOOP_CONF_DIR"). If this is the case, VXQuery will retrieve
+ this automatically when attempting to perform HDFS queries.
+
+ When this variable is not set, users will need to provide this directory as
+ a Command Line Option when executing VXQuery:
+ -hdfs-conf /path/to/hdfs/conf_folder
+
+
+* 2. Running the Query
+
+
+ For files stored in HDFS there are 2 ways to access them from VXQuery.
+
+
+ [[a]] Reading them as whole files.
+
+
+ [[b]] Reading them block by block.
+
+
+** a. Reading them as whole files.
+
+ For this option you only need to change the path to files. To define that your
+ file(s) exist and should be read from HDFS you must add <"hdfs:/"> in front
+ of the path. VXQuery will read the path of the files you request in your query
+ and try to locate them.
+
+
+ So in order to run a query that will read the input files from HDFS you need
+ to make sure that
+
+
+ a) The environmental variable is set for "HADOOP_CONF_DIR" or you pass the
+ directory location using -hdfs-conf
+
+
+ b) The path defined in your query begins with <hdfs://> and the full path to
+ the file(s).
+
+
+ c) The path exists on HDFS and the user that runs the query has read permission
+ to these files.
+
+
+*** Example
+
+ I want to find all the <books> that are published after 2004.
+
+
+ The file is located in HDFS in this path </user/hduser/store/books.xml>
+
+
+ My query will look like this:
+
+
+----------
+for $x in collection("hdfs://user/hduser/store")
+where $x/year>2004
+return $x/title
+----------
+
+
+ If I want only one file, the <<books.xml>> to be parsed from HDFS, my query will
+ look like this:
+
+
+----------
+for $x in doc("hdfs://user/hduser/store/books.xml")
+where $x/year>2004
+return $x/title
+----------
+
+
+** b. Reading them block by block
+
+
+ In order to use that option you need to modify your query. Instead of using the
+ <collection> or <doc> function to define your input file(s) you need to use
+ <collection-with-tag>.
+
+
+ <collection-with-tag> accepts two arguments, one is the path to the HDFS directory
+ you have stored your input files, and the second is a specific <<tag>> that exists
+ in the input file(s). This is the tag of the element that contains the fields that
+ your query is looking for.
+
+ Other than these arguments, you do not need to change anything else in the query.
+
+ Note: since this strategy is optimized to read block by block, the result will
+ include all elements with the given tag, regardless of depth within the xml tree.
+
+
+*** Example
+
+ The same example, using <<collection-with-tag>>.
+
+ My input file <books.xml>:
+
+-----------------------------
+<?xml version="1.0" encoding="UTF-8"?>
+<bookstore>
+
+<book>
+ <title lang="en">Everyday Italian</title>
+ <author>Giada De Laurentiis</author>
+ <year>2005</year>
+ <price>30.00</price>
+</book>
+
+<book>
+ <title lang="en">Harry Potter</title>
+ <author>J K. Rowling</author>
+ <year>2005</year>
+ <price>29.99</price>
+</book>
+
+<book>
+ <title lang="en">XQuery Kick Start</title>
+ <author>James McGovern</author>
+ <author>Per Bothner</author>
+ <author>Kurt Cagle</author>
+ <author>James Linn</author>
+ <author>Vaidyanathan Nagarajan</author>
+ <year>2003</year>
+ <price>49.99</price>
+</book>
+
+<book>
+ <title lang="en">Learning XML</title>
+ <author>Erik T. Ray</author>
+ <year>2003</year>
+ <price>39.95</price>
+</book>
+
+</bookstore>
+----------------------------
+
+
+ My query will look like this:
+
+
+----------------------------
+for $x in collection-with-tag("hdfs://user/hduser/store","book")/book
+where $x/year>2004
+return $x/title
+----------------------------
+
+
+ Take notice that I defined the path to the directory containing the file(s)
+ and not the file, <collection-with-tag> expects the path to the directory. I also
+ added the </book> after the function. This is also needed, like <collection> and
+ <doc> functions, for the query to be parsed correctly.
http://git-wip-us.apache.org/repos/asf/vxquery/blob/3fc2d6c2/src/site/site.xml
----------------------------------------------------------------------
diff --git a/src/site/site.xml b/src/site/site.xml
index 5640976..d64fe0d 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -64,6 +64,9 @@ limitations under the License.
name="Executing a Query"
href="user_query.html" />
<item
+ name="Using HDFS with VXQuery"
+ href="user_query_hdfs.html" />
+ <item
name="Running the Test Suite"
href="user_running_tests.html" />
</menu>
http://git-wip-us.apache.org/repos/asf/vxquery/blob/3fc2d6c2/vxquery-cli/pom.xml
----------------------------------------------------------------------
diff --git a/vxquery-cli/pom.xml b/vxquery-cli/pom.xml
index 7bf1ff9..c4e11cb 100644
--- a/vxquery-cli/pom.xml
+++ b/vxquery-cli/pom.xml
@@ -126,7 +126,19 @@
<groupId>org.apache.hyracks</groupId>
<artifactId>hyracks-dataflow-std</artifactId>
</dependency>
+
+ <dependency>
+ <groupId>org.apache.hyracks</groupId>
+ <artifactId>hyracks-hdfs-core</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.hyracks</groupId>
+ <artifactId>hyracks-hdfs-2.x</artifactId>
+ </dependency>
</dependencies>
+
+
<reporting>
<plugins>
http://git-wip-us.apache.org/repos/asf/vxquery/blob/3fc2d6c2/vxquery-cli/src/main/java/org/apache/vxquery/cli/VXQuery.java
----------------------------------------------------------------------
diff --git a/vxquery-cli/src/main/java/org/apache/vxquery/cli/VXQuery.java b/vxquery-cli/src/main/java/org/apache/vxquery/cli/VXQuery.java
index a02c65d..17287c6 100644
--- a/vxquery-cli/src/main/java/org/apache/vxquery/cli/VXQuery.java
+++ b/vxquery-cli/src/main/java/org/apache/vxquery/cli/VXQuery.java
@@ -81,7 +81,8 @@ public class VXQuery {
/**
* Constructor to use command line options passed.
*
- * @param opts Command line options object
+ * @param opts
+ * Command line options object
*/
public VXQuery(CmdLineOptions opts) {
this.opts = opts;
@@ -181,8 +182,13 @@ public class VXQuery {
opts.showOET, opts.showRP);
start = opts.timing ? new Date() : null;
- XMLQueryCompiler compiler = new XMLQueryCompiler(listener, getNodeList(), opts.frameSize,
- opts.availableProcessors, opts.joinHashSize, opts.maximumDataSize);
+
+ Map<String, NodeControllerInfo> nodeControllerInfos = null;
+ if (hcc != null) {
+ nodeControllerInfos = hcc.getNodeControllerInfos();
+ }
+ XMLQueryCompiler compiler = new XMLQueryCompiler(listener, nodeControllerInfos, opts.frameSize,
+ opts.availableProcessors, opts.joinHashSize, opts.maximumDataSize, opts.hdfsConf);
resultSetId = createResultSetId();
CompilerControlBlock ccb = new CompilerControlBlock(new StaticContextImpl(RootStaticContextImpl.INSTANCE),
resultSetId, null);
@@ -233,30 +239,13 @@ public class VXQuery {
}
/**
- * Get cluster node configuration.
- *
- * @return Configuration of node controllers as array of Strings.
- * @throws Exception
- */
- private String[] getNodeList() throws Exception {
- if (hcc != null) {
- Map<String, NodeControllerInfo> nodeControllerInfos = hcc.getNodeControllerInfos();
- String[] nodeList = new String[nodeControllerInfos.size()];
- int index = 0;
- for (String node : nodeControllerInfos.keySet()) {
- nodeList[index++] = node;
- }
- return nodeList;
- }
- return new String[0];
- }
-
- /**
* Creates a Hyracks dataset, if not already existing with the job frame size, and 1 reader. Allocates a new buffer of size specified in the frame of Hyracks
* node. Creates new dataset reader with the current job ID and result set ID. Outputs the string in buffer for each frame.
*
- * @param spec JobSpecification object, containing frame size. Current specified job.
- * @param writer Writer for output of job.
+ * @param spec
+ * JobSpecification object, containing frame size. Current specified job.
+ * @param writer
+ * Writer for output of job.
* @throws Exception
*/
private void runJob(JobSpecification spec, PrintWriter writer) throws Exception {
@@ -339,7 +328,8 @@ public class VXQuery {
/**
* Reads the contents of file given in query into a String. The file is always closed. For XML files UTF-8 encoding is used.
*
- * @param query The query with filename to be processed
+ * @param query
+ * The query with filename to be processed
* @return UTF-8 formatted query string
* @throws IOException
*/
@@ -361,8 +351,7 @@ public class VXQuery {
* Helper class with fields and methods to handle all command line options
*/
private static class CmdLineOptions {
- @Option(name = "-available-processors",
- usage = "Number of available processors. (default: java's available processors)")
+ @Option(name = "-available-processors", usage = "Number of available processors. (default: java's available processors)")
private int availableProcessors = -1;
@Option(name = "-client-net-ip-address", usage = "IP Address of the ClusterController.")
@@ -422,6 +411,9 @@ public class VXQuery {
@Option(name = "-x", usage = "Bind an external variable")
private Map<String, String> bindings = new HashMap<String, String>();
+ @Option(name = "-hdfs-conf", usage = "Directory path to Hadoop configuration files")
+ private String hdfsConf = null;
+
@Argument
private List<String> arguments = new ArrayList<String>();
}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/3fc2d6c2/vxquery-core/pom.xml
----------------------------------------------------------------------
diff --git a/vxquery-core/pom.xml b/vxquery-core/pom.xml
index 59cc987..d244818 100644
--- a/vxquery-core/pom.xml
+++ b/vxquery-core/pom.xml
@@ -14,7 +14,8 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
@@ -63,7 +64,8 @@
<configuration>
<target>
<ant antfile="build-xslt.xml" target="build">
- <property name="build.gen-src.dir" value="${project.build.directory}/generated-sources/main/java" />
+ <property name="build.gen-src.dir"
+ value="${project.build.directory}/generated-sources/main/java" />
<property name="src.code.dir" value="${basedir}/src/main/java" />
<property name="xslt.dir" value="${basedir}/src/main/xslt" />
<property name="classpath.xslt" refid="maven.compile.classpath" />
@@ -80,7 +82,8 @@
<configuration>
<target>
<ant antfile="build-site.xml" target="build">
- <property name="build.gen-site.dir" value="${project.build.directory}/generated-site/apt" />
+ <property name="build.gen-site.dir"
+ value="${project.build.directory}/generated-site/apt" />
<property name="src.code.dir" value="${basedir}/src/main/java" />
<property name="xslt.dir" value="${basedir}/src/main/xslt" />
<property name="classpath.xslt" refid="maven.compile.classpath" />
@@ -121,16 +124,13 @@
<redirectTestOutputToFile>true</redirectTestOutputToFile>
</configuration>
</plugin>
- <!--
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-site-plugin</artifactId>
- </plugin>
- -->
+ <!-- <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-site-plugin</artifactId>
+ </plugin> -->
</plugins>
<pluginManagement>
<plugins>
- <!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
+ <!--This plugin's configuration is used to store Eclipse m2e settings
+ only. It has no influence on the Maven build itself. -->
<plugin>
<groupId>org.eclipse.m2e</groupId>
<artifactId>lifecycle-mapping</artifactId>
@@ -209,6 +209,16 @@
</dependency>
<dependency>
+ <groupId>org.apache.hyracks</groupId>
+ <artifactId>hyracks-hdfs-2.x</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.hyracks</groupId>
+ <artifactId>hyracks-hdfs-core</artifactId>
+ </dependency>
+
+ <dependency>
<groupId>ant</groupId>
<artifactId>ant-trax</artifactId>
<scope>provided</scope>
@@ -259,6 +269,21 @@
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
+
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-mapreduce-client-core</artifactId>
+ <version>2.7.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-common</artifactId>
+ <version>2.7.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-hdfs</artifactId>
+ </dependency>
</dependencies>
<reporting>
@@ -290,18 +315,10 @@
<dependencyLocationsEnabled>false</dependencyLocationsEnabled>
</configuration>
</plugin>
- <!--
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>findbugs-maven-plugin</artifactId>
- <version>2.5.2</version>
- <configuration>
- <effort>Min</effort>
- <threshold>Normal</threshold>
- <excludeFilterFile>findbugs-exclude.xml</excludeFilterFile>
- </configuration>
- </plugin>
- -->
+ <!-- <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>findbugs-maven-plugin</artifactId>
+ <version>2.5.2</version> <configuration> <effort>Min</effort> <threshold>Normal</threshold>
+ <excludeFilterFile>findbugs-exclude.xml</excludeFilterFile> </configuration>
+ </plugin> -->
<plugin>
<groupId>org.apache.rat</groupId>
<artifactId>apache-rat-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/vxquery/blob/3fc2d6c2/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/RewriteRuleset.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/RewriteRuleset.java b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/RewriteRuleset.java
index fd20465..205e0b2 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/RewriteRuleset.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/RewriteRuleset.java
@@ -19,8 +19,8 @@ package org.apache.vxquery.compiler.rewriter;
import java.util.LinkedList;
import java.util.List;
-import org.apache.vxquery.compiler.rewriter.rules.ConsolidateDescandantChild;
import org.apache.vxquery.compiler.rewriter.rules.ConsolidateAssignAggregateRule;
+import org.apache.vxquery.compiler.rewriter.rules.ConsolidateDescandantChild;
import org.apache.vxquery.compiler.rewriter.rules.ConvertAssignToUnnestRule;
import org.apache.vxquery.compiler.rewriter.rules.ConvertFromAlgebricksExpressionsRule;
import org.apache.vxquery.compiler.rewriter.rules.ConvertToAlgebricksExpressionsRule;
http://git-wip-us.apache.org/repos/asf/vxquery/blob/3fc2d6c2/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/AbstractCollectionRule.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/AbstractCollectionRule.java b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/AbstractCollectionRule.java
index 53011d2..74220da 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/AbstractCollectionRule.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/AbstractCollectionRule.java
@@ -22,16 +22,6 @@ import java.nio.ByteBuffer;
import java.util.Arrays;
import org.apache.commons.lang3.mutable.Mutable;
-import org.apache.vxquery.compiler.algebricks.VXQueryConstantValue;
-import org.apache.vxquery.compiler.rewriter.rules.util.OperatorToolbox;
-import org.apache.vxquery.datamodel.accessors.TaggedValuePointable;
-import org.apache.vxquery.datamodel.values.ValueTag;
-import org.apache.vxquery.functions.BuiltinFunctions;
-import org.apache.vxquery.types.BuiltinTypeRegistry;
-import org.apache.vxquery.types.Quantifier;
-import org.apache.vxquery.types.SequenceType;
-
-import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
import org.apache.hyracks.algebricks.core.algebra.base.ILogicalExpression;
import org.apache.hyracks.algebricks.core.algebra.base.ILogicalOperator;
import org.apache.hyracks.algebricks.core.algebra.base.IOptimizationContext;
@@ -46,6 +36,14 @@ import org.apache.hyracks.algebricks.core.algebra.operators.logical.UnnestOperat
import org.apache.hyracks.algebricks.core.rewriter.base.IAlgebraicRewriteRule;
import org.apache.hyracks.data.std.primitive.UTF8StringPointable;
import org.apache.hyracks.dataflow.common.comm.util.ByteBufferInputStream;
+import org.apache.vxquery.compiler.algebricks.VXQueryConstantValue;
+import org.apache.vxquery.compiler.rewriter.rules.util.OperatorToolbox;
+import org.apache.vxquery.datamodel.accessors.TaggedValuePointable;
+import org.apache.vxquery.datamodel.values.ValueTag;
+import org.apache.vxquery.functions.BuiltinFunctions;
+import org.apache.vxquery.types.BuiltinTypeRegistry;
+import org.apache.vxquery.types.Quantifier;
+import org.apache.vxquery.types.SequenceType;
public abstract class AbstractCollectionRule implements IAlgebraicRewriteRule {
final ByteBufferInputStream bbis = new ByteBufferInputStream();
@@ -54,14 +52,13 @@ public abstract class AbstractCollectionRule implements IAlgebraicRewriteRule {
final TaggedValuePointable tvp = (TaggedValuePointable) TaggedValuePointable.FACTORY.createPointable();
/**
- * Get the constant value for the collection. Return null for not a collection.
+ * Get the arguments for the collection and collection-with-tag. Return null for not a collection.
*
* @param opRef
* Logical operator
* @return collection name
*/
- protected String getCollectionName(Mutable<ILogicalOperator> opRef) {
- VXQueryConstantValue constantValue;
+ protected String[] getCollectionName(Mutable<ILogicalOperator> opRef) {
AbstractLogicalOperator op = (AbstractLogicalOperator) opRef.getValue();
if (op.getOperatorTag() != LogicalOperatorTag.UNNEST) {
@@ -82,13 +79,32 @@ public abstract class AbstractCollectionRule implements IAlgebraicRewriteRule {
return null;
}
AbstractFunctionCallExpression functionCall = (AbstractFunctionCallExpression) logicalExpression;
- if (!functionCall.getFunctionIdentifier().equals(BuiltinFunctions.FN_COLLECTION_1.getFunctionIdentifier())) {
+ if (!functionCall.getFunctionIdentifier()
+ .equals(BuiltinFunctions.FN_COLLECTION_WITH_TAG_2.getFunctionIdentifier())
+ && !functionCall.getFunctionIdentifier()
+ .equals(BuiltinFunctions.FN_COLLECTION_1.getFunctionIdentifier())) {
return null;
}
- ILogicalExpression logicalExpression2 = (ILogicalExpression) functionCall.getArguments().get(0).getValue();
+ // Get arguments
+ int size = functionCall.getArguments().size();
+ if (size > 0) {
+ String args[] = new String[size];
+ for (int i = 0; i < size; i++) {
+ args[i] = getArgument(functionCall, opRef, i);
+ }
+ return args;
+ }
+ return null;
+ }
+
+ private String getArgument(AbstractFunctionCallExpression functionCall, Mutable<ILogicalOperator> opRef, int pos) {
+ VXQueryConstantValue constantValue;
+ ILogicalExpression logicalExpression2 = (ILogicalExpression) functionCall.getArguments().get(pos).getValue();
if (logicalExpression2.getExpressionTag() != LogicalExpressionTag.VARIABLE) {
return null;
+ } else if (logicalExpression2 == null) {
+ return null;
}
VariableReferenceExpression vre = (VariableReferenceExpression) logicalExpression2;
Mutable<ILogicalOperator> opRef3 = OperatorToolbox.findProducerOf(opRef, vre.getVariableReference());
@@ -111,7 +127,6 @@ public abstract class AbstractCollectionRule implements IAlgebraicRewriteRule {
} else {
return null;
}
-
// Constant value is now in a TaggedValuePointable. Convert the value into a java String.
tvp.set(constantValue.getValue(), 0, constantValue.getValue().length);
String collectionName = null;
@@ -121,11 +136,12 @@ public abstract class AbstractCollectionRule implements IAlgebraicRewriteRule {
bbis.setByteBuffer(ByteBuffer.wrap(Arrays.copyOfRange(stringp.getByteArray(), stringp.getStartOffset(),
stringp.getLength() + stringp.getStartOffset())), 0);
collectionName = di.readUTF();
+ return collectionName;
} catch (IOException e) {
e.printStackTrace();
}
}
- return collectionName;
+ return null;
}
@Override
http://git-wip-us.apache.org/repos/asf/vxquery/blob/3fc2d6c2/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/IntroduceCollectionRule.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/IntroduceCollectionRule.java b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/IntroduceCollectionRule.java
index cc857a1..8ed8bb1 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/IntroduceCollectionRule.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/IntroduceCollectionRule.java
@@ -64,9 +64,10 @@ public class IntroduceCollectionRule extends AbstractCollectionRule {
@Override
public boolean rewritePre(Mutable<ILogicalOperator> opRef, IOptimizationContext context) {
VXQueryOptimizationContext vxqueryContext = (VXQueryOptimizationContext) context;
- String collectionName = getCollectionName(opRef);
+ String args[] = getCollectionName(opRef);
- if (collectionName != null) {
+ if (args != null) {
+ String collectionName = args[0];
// Build the new operator and update the query plan.
int collectionId = vxqueryContext.newCollectionId();
VXQueryCollectionDataSource ds = VXQueryCollectionDataSource.create(collectionId, collectionName,
@@ -74,6 +75,12 @@ public class IntroduceCollectionRule extends AbstractCollectionRule {
if (ds != null) {
ds.setTotalDataSources(vxqueryContext.getTotalDataSources());
+ // Check if the call is for collection-with-tag
+ if (args.length == 2) {
+ ds.setTotalDataSources(vxqueryContext.getTotalDataSources());
+ ds.setTag(args[1]);
+ }
+
// Known to be true because of collection name.
AbstractLogicalOperator op = (AbstractLogicalOperator) opRef.getValue();
UnnestOperator unnest = (UnnestOperator) op;
http://git-wip-us.apache.org/repos/asf/vxquery/blob/3fc2d6c2/vxquery-core/src/main/java/org/apache/vxquery/functions/builtin-functions.xml
----------------------------------------------------------------------
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 38f03a4..3b9371d 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
@@ -128,6 +128,14 @@
<!-- Collection operator is added during the rewrite rules phase. -->
</function>
+ <!-- fn:collection-with-tag($arg1 as xs:string?, $arg2 as xs:string?) as node()* -->
+ <function name="fn:collection-with-tag">
+ <param name="arg1" type="xs:string?"/>
+ <param name="arg2" type="xs:string?"/>
+ <return type="node()*"/>
+ <!-- CollectionWithTag operator is added during the rewrite rules phase. -->
+ </function>
+
<!-- fn:compare($comparand1 as xs:string?, $comparand2 as xs:string?) as xs:integer? -->
<function name="fn:compare">
<param name="comparand1" type="xs:string?"/>
http://git-wip-us.apache.org/repos/asf/vxquery/blob/3fc2d6c2/vxquery-core/src/main/java/org/apache/vxquery/hdfs2/HDFSFunctions.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/hdfs2/HDFSFunctions.java b/vxquery-core/src/main/java/org/apache/vxquery/hdfs2/HDFSFunctions.java
new file mode 100644
index 0000000..dcbfe94
--- /dev/null
+++ b/vxquery-core/src/main/java/org/apache/vxquery/hdfs2/HDFSFunctions.java
@@ -0,0 +1,428 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.vxquery.hdfs2;
+
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.io.StringReader;
+import java.io.UnsupportedEncodingException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
+
+import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.fs.FileSystem;
+import org.apache.hadoop.fs.LocatedFileStatus;
+import org.apache.hadoop.fs.Path;
+import org.apache.hadoop.fs.RemoteIterator;
+import org.apache.hadoop.mapred.SplitLocationInfo;
+import org.apache.hadoop.mapreduce.InputFormat;
+import org.apache.hadoop.mapreduce.InputSplit;
+import org.apache.hadoop.mapreduce.Job;
+import org.apache.hadoop.mapreduce.RecordReader;
+import org.apache.hadoop.mapreduce.TaskAttemptContext;
+import org.apache.hadoop.mapreduce.lib.input.FileInputFormat;
+import org.apache.hadoop.mapreduce.lib.input.FileSplit;
+import org.apache.hadoop.util.ReflectionUtils;
+import org.apache.hyracks.api.client.NodeControllerInfo;
+import org.apache.hyracks.api.exceptions.HyracksDataException;
+import org.apache.hyracks.hdfs.ContextFactory;
+import org.apache.hyracks.hdfs2.dataflow.FileSplitsFactory;
+import org.w3c.dom.Document;
+import org.xml.sax.InputSource;
+import org.xml.sax.SAXException;
+
+public class HDFSFunctions {
+
+ private Configuration conf;
+ private FileSystem fs;
+ private String conf_path;
+ private Job job;
+ private InputFormat inputFormat;
+ private List<InputSplit> splits;
+ private ArrayList<ArrayList<String>> nodes;
+ private HashMap<Integer, String> schedule;
+ private final String TEMP = "java.io.tmpdir";
+ private final String dfs_path = "vxquery_splits_schedule.txt";
+ private final String filepath = System.getProperty(TEMP) + "splits_schedule.txt";
+ protected static final Logger LOGGER = Logger.getLogger(HDFSFunctions.class.getName());
+ private final Map<String, NodeControllerInfo> nodeControllerInfos;
+
+ /**
+ * Create the configuration and add the paths for core-site and hdfs-site as resources.
+ * Initialize an instance of HDFS FileSystem for this configuration.
+ *
+ * @param nodeControllerInfos
+ * @param hdfsConf
+ */
+ public HDFSFunctions(Map<String, NodeControllerInfo> nodeControllerInfos, String hdfsConf) {
+ this.conf = new Configuration();
+ this.nodeControllerInfos = nodeControllerInfos;
+ this.conf_path = hdfsConf;
+ }
+
+ /**
+ * Create the needed objects for reading the splits of the filepath given as argument.
+ * This method should run before the scheduleSplits method.
+ *
+ * @param filepath
+ */
+ @SuppressWarnings({ "deprecation", "unchecked" })
+ public void setJob(String filepath, String tag) {
+ try {
+ conf.set("start_tag", "<" + tag + ">");
+ conf.set("end_tag", "</" + tag + ">");
+ job = new Job(conf, "Read from HDFS");
+ Path input = new Path(filepath);
+ FileInputFormat.addInputPath(job, input);
+ job.setInputFormatClass(XmlCollectionWithTagInputFormat.class);
+ inputFormat = ReflectionUtils.newInstance(job.getInputFormatClass(), job.getConfiguration());
+ splits = inputFormat.getSplits(job);
+ } catch (IOException | ClassNotFoundException | InterruptedException e) {
+ if (LOGGER.isLoggable(Level.SEVERE)) {
+ LOGGER.severe(e.getMessage());
+ }
+ }
+ }
+
+ /**
+ * Returns true if the file path exists or it is located somewhere in the home directory of the user that called the function.
+ * Searches in subdirectories of the home directory too.
+ *
+ * @param filename
+ * @return
+ * @throws IOException
+ * @throws IllegalArgumentException
+ */
+ public boolean isLocatedInHDFS(String filename) throws IllegalArgumentException, IOException {
+ //search file path
+ if (fs.exists(new Path(filename))) {
+ return true;
+ }
+ return searchInDirectory(fs.getHomeDirectory(), filename) != null;
+ }
+
+ /**
+ * Searches the given directory for the file.
+ *
+ * @param directory
+ * to search
+ * @param filename
+ * of file we want
+ * @return path if file exists in this directory.else return null.
+ */
+ public Path searchInDirectory(Path directory, String filename) {
+ //Search the files and folder in this Path to find the one matching the filename.
+ try {
+ RemoteIterator<LocatedFileStatus> it = fs.listFiles(directory, true);
+ String[] parts;
+ Path path;
+ while (it.hasNext()) {
+ path = it.next().getPath();
+ parts = path.toString().split("/");
+ if (parts[parts.length - 1].equals(filename)) {
+ return path;
+ }
+ }
+ } catch (IOException e) {
+ if (LOGGER.isLoggable(Level.SEVERE)) {
+ LOGGER.severe(e.getMessage());
+ }
+ }
+ return null;
+ }
+
+ /**
+ * Read the cluster properties file and locate the HDFS_CONF variable that is the directory path for the
+ * hdfs configuration if the system environment variable HDFS_CONF is not set.
+ *
+ * @return true if is successfully finds the Hadoop/HDFS home directory
+ */
+ private boolean locateConf() {
+ if (this.conf_path == null) {
+ //As a last resort, try getting the configuration from the system environment
+ //Some systems won't have this set.
+ this.conf_path = System.getenv("HADOOP_CONF_DIR");
+ }
+ return this.conf_path != null;
+ }
+
+ /**
+ * Upload a file/directory to HDFS.Filepath is the path in the local file system.dir is the destination path.
+ *
+ * @param filepath
+ * @param dir
+ * @return
+ */
+ public boolean put(String filepath, String dir) {
+ if (this.fs != null) {
+ Path path = new Path(filepath);
+ Path dest = new Path(dir);
+ try {
+ if (fs.exists(dest)) {
+ fs.delete(dest, true); //recursive delete
+ }
+ } catch (IOException e) {
+ if (LOGGER.isLoggable(Level.SEVERE)) {
+ LOGGER.severe(e.getMessage());
+ }
+ }
+ try {
+ fs.copyFromLocalFile(path, dest);
+ } catch (IOException e) {
+ if (LOGGER.isLoggable(Level.SEVERE)) {
+ LOGGER.severe(e.getMessage());
+ }
+ }
+ }
+ return false;
+ }
+
+ /**
+ * Get instance of the HDFSfile system if it is configured correctly.
+ * Return null if there is no instance.
+ *
+ * @return
+ */
+ public FileSystem getFileSystem() {
+ if (locateConf()) {
+ conf.addResource(new Path(this.conf_path + "/core-site.xml"));
+ conf.addResource(new Path(this.conf_path + "/hdfs-site.xml"));
+ try {
+ fs = FileSystem.get(conf);
+ return this.fs;
+ } catch (IOException e) {
+ if (LOGGER.isLoggable(Level.SEVERE)) {
+ LOGGER.severe(e.getMessage());
+ }
+ }
+ } else {
+ if (LOGGER.isLoggable(Level.SEVERE)) {
+ LOGGER.severe("Could not locate HDFS configuration folder.");
+ }
+ }
+ return null;
+ }
+
+ /**
+ * Create a HashMap that has as key the hostname and values the splits that belong to this hostname;
+ *
+ * @return
+ * @throws IOException
+ */
+ public HashMap<String, ArrayList<Integer>> getLocationsOfSplits() throws IOException {
+ HashMap<String, ArrayList<Integer>> splits_map = new HashMap<String, ArrayList<Integer>>();
+ ArrayList<Integer> temp;
+ int i = 0;
+ String hostname;
+ for (InputSplit s : this.splits) {
+ SplitLocationInfo info[] = s.getLocationInfo();
+ hostname = info[0].getLocation();
+ if (splits_map.containsKey(hostname)) {
+ temp = splits_map.get(hostname);
+ temp.add(i);
+ } else {
+ temp = new ArrayList<Integer>();
+ temp.add(i);
+ splits_map.put(hostname, temp);
+ }
+ i++;
+ }
+
+ return splits_map;
+ }
+
+ public void scheduleSplits() throws IOException, ParserConfigurationException, SAXException {
+ schedule = new HashMap<Integer, String>();
+ ArrayList<String> empty = new ArrayList<String>();
+ HashMap<String, ArrayList<Integer>> splits_map = this.getLocationsOfSplits();
+ readNodesFromXML();
+ int count = this.splits.size();
+
+ ArrayList<Integer> splits;
+ String node;
+ for (ArrayList<String> info : this.nodes) {
+ node = info.get(1);
+ if (splits_map.containsKey(node)) {
+ splits = splits_map.get(node);
+ for (Integer split : splits) {
+ schedule.put(split, node);
+ count--;
+ }
+ splits_map.remove(node);
+ } else {
+ empty.add(node);
+ }
+ }
+
+ //Check if every split got assigned to a node
+ if (count != 0) {
+ ArrayList<Integer> remaining = new ArrayList<Integer>();
+ // Find remaining splits
+ for (InputSplit s : this.splits) {
+ int i = 0;
+ if (!schedule.containsKey(i)) {
+ remaining.add(i);
+ }
+ }
+
+ if (empty.size() != 0) {
+ int node_number = 0;
+ for (int split : remaining) {
+ if (node_number == empty.size()) {
+ node_number = 0;
+ }
+ schedule.put(split, empty.get(node_number));
+ node_number++;
+ }
+ }
+ }
+ }
+
+ /**
+ * Read the hostname and the ip address of every node from the xml cluster configuration file.
+ * Save the information inside nodes.
+ *
+ * @throws ParserConfigurationException
+ * @throws IOException
+ * @throws SAXException
+ */
+ public void readNodesFromXML() throws ParserConfigurationException, SAXException, IOException {
+ DocumentBuilderFactory dbFactory = DocumentBuilderFactory.newInstance();
+ DocumentBuilder dBuilder;
+ dBuilder = dbFactory.newDocumentBuilder();
+ nodes = new ArrayList<ArrayList<String>>();
+ for (NodeControllerInfo ncInfo : nodeControllerInfos.values()) {
+ //Will this include the master node? Is that bad?
+ ArrayList<String> info = new ArrayList<String>();
+ info.add(ncInfo.getNodeId());
+ info.add(ncInfo.getNetworkAddress().getAddress());
+ nodes.add(info);
+ }
+ }
+
+ /**
+ * Writes the schedule to a temporary file, then uploads the file to the HDFS.
+ *
+ * @throws UnsupportedEncodingException
+ * @throws FileNotFoundException
+ */
+ public void addScheduleToDistributedCache() throws FileNotFoundException, UnsupportedEncodingException {
+ PrintWriter writer;
+ writer = new PrintWriter(filepath, "UTF-8");
+ for (int split : this.schedule.keySet()) {
+ writer.write(split + "," + this.schedule.get(split));
+ }
+ writer.close();
+ // Add file to HDFS
+ this.put(filepath, dfs_path);
+ }
+
+ public RecordReader getReader() {
+
+ List<FileSplit> fileSplits = new ArrayList<FileSplit>();
+ for (int i = 0; i < splits.size(); i++) {
+ fileSplits.add((FileSplit) splits.get(i));
+ }
+ FileSplitsFactory splitsFactory;
+ try {
+ splitsFactory = new FileSplitsFactory(fileSplits);
+ List<FileSplit> inputSplits = splitsFactory.getSplits();
+ ContextFactory ctxFactory = new ContextFactory();
+ int size = inputSplits.size();
+ for (int i = 0; i < size; i++) {
+ /**
+ * read the split
+ */
+ TaskAttemptContext context;
+ try {
+ context = ctxFactory.createContext(job.getConfiguration(), i);
+ RecordReader reader = inputFormat.createRecordReader(inputSplits.get(i), context);
+ reader.initialize(inputSplits.get(i), context);
+ return reader;
+ } catch (IOException | InterruptedException e) {
+ if (LOGGER.isLoggable(Level.SEVERE)) {
+ LOGGER.severe(e.getMessage());
+ }
+ }
+ }
+ } catch (HyracksDataException e) {
+ if (LOGGER.isLoggable(Level.SEVERE)) {
+ LOGGER.severe(e.getMessage());
+ }
+ }
+ return null;
+ }
+
+ /**
+ * @return schedule.
+ */
+ public HashMap<Integer, String> getSchedule() {
+ return this.schedule;
+ }
+
+ /**
+ * Return the splits belonging to this node for the existing schedule.
+ *
+ * @param node
+ * @return
+ */
+ public ArrayList<Integer> getScheduleForNode(String node) {
+ ArrayList<Integer> node_schedule = new ArrayList<Integer>();
+ for (int split : this.schedule.keySet()) {
+ if (node.equals(this.schedule.get(split))) {
+ node_schedule.add(split);
+ }
+ }
+ return node_schedule;
+ }
+
+ public List<InputSplit> getSplits() {
+ return this.splits;
+ }
+
+ public Job getJob() {
+ return this.job;
+ }
+
+ public InputFormat getinputFormat() {
+ return this.inputFormat;
+ }
+
+ public Document convertStringToDocument(String xmlStr) {
+ DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
+ DocumentBuilder builder;
+ try {
+ builder = factory.newDocumentBuilder();
+ Document doc = builder.parse(new InputSource(new StringReader(xmlStr)));
+ return doc;
+ } catch (Exception e) {
+ if (LOGGER.isLoggable(Level.SEVERE)) {
+ LOGGER.severe(e.getMessage());
+ }
+ }
+ return null;
+ }
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/3fc2d6c2/vxquery-core/src/main/java/org/apache/vxquery/hdfs2/XmlCollectionWithTagInputFormat.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/hdfs2/XmlCollectionWithTagInputFormat.java b/vxquery-core/src/main/java/org/apache/vxquery/hdfs2/XmlCollectionWithTagInputFormat.java
new file mode 100644
index 0000000..1d053b6
--- /dev/null
+++ b/vxquery-core/src/main/java/org/apache/vxquery/hdfs2/XmlCollectionWithTagInputFormat.java
@@ -0,0 +1,217 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.vxquery.hdfs2;
+
+import com.google.common.io.Closeables;
+import org.apache.commons.io.Charsets;
+import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.fs.FSDataInputStream;
+import org.apache.hadoop.fs.FileSystem;
+import org.apache.hadoop.fs.Path;
+import org.apache.hadoop.io.DataOutputBuffer;
+import org.apache.hadoop.io.LongWritable;
+import org.apache.hadoop.io.Text;
+import org.apache.hadoop.mapreduce.InputSplit;
+import org.apache.hadoop.mapreduce.RecordReader;
+import org.apache.hadoop.mapreduce.TaskAttemptContext;
+import org.apache.hadoop.mapreduce.lib.input.FileSplit;
+import org.apache.hadoop.mapreduce.lib.input.TextInputFormat;
+
+import java.io.IOException;
+import org.apache.hadoop.fs.BlockLocation;
+import org.apache.hadoop.fs.FileStatus;
+
+/**
+ * Reads records that are delimited by a specific begin/end tag.
+ */
+public class XmlCollectionWithTagInputFormat extends TextInputFormat {
+
+ public static String STARTING_TAG;
+ public static String ENDING_TAG;
+
+ @Override
+ public RecordReader<LongWritable, Text> createRecordReader(InputSplit split, TaskAttemptContext context) {
+ try {
+ STARTING_TAG = context.getConfiguration().get("start_tag");
+ ENDING_TAG = context.getConfiguration().get("end_tag");
+ return new XmlRecordReader((FileSplit) split, context.getConfiguration());
+ } catch (IOException ioe) {
+ return null;
+ }
+ }
+
+ /**
+ * XMLRecordReader class to read through a given xml document to output xml blocks as records as specified
+ * by the end tag
+ */
+ public static class XmlRecordReader extends RecordReader<LongWritable, Text> {
+
+ private final byte[] end_tag;
+ private final byte[] start_tag;
+ private final long start;
+ private final long end;
+ private final FSDataInputStream fsin;
+ private final DataOutputBuffer buffer = new DataOutputBuffer();
+ private LongWritable currentKey;
+ private Text currentValue;
+ BlockLocation[] blocks;
+ public static byte[] nl = "\n".getBytes();
+
+ public XmlRecordReader(FileSplit split, Configuration conf) throws IOException {
+ end_tag = ENDING_TAG.getBytes(Charsets.UTF_8);
+ start_tag = STARTING_TAG.getBytes(Charsets.UTF_8);
+
+ // open the file and seek to the start of the split
+ start = split.getStart();
+ // set the end of the file
+ end = start + split.getLength();
+ Path file = split.getPath();
+ FileSystem fs = file.getFileSystem(conf);
+ FileStatus fStatus = fs.getFileStatus(file);
+ blocks = fs.getFileBlockLocations(fStatus, 0, fStatus.getLen());
+ // seek the start of file
+ fsin = fs.open(split.getPath());
+ fsin.seek(start);
+ }
+
+ /**
+ * Get next block item
+ *
+ * @param key
+ * @param value
+ * @return
+ * @throws IOException
+ */
+ private boolean next(LongWritable key, Text value) throws IOException {
+ if (fsin.getPos() < end) {
+ try {
+ if (readBlock(true)) {
+ key.set(fsin.getPos());
+ value.set(buffer.getData(), 0, buffer.getLength());
+ return true;
+ }
+ } finally {
+ buffer.reset();
+ }
+ }
+ return false;
+ }
+
+ @Override
+ public void close() throws IOException {
+ Closeables.close(fsin, true);
+ }
+
+ @Override
+ public float getProgress() throws IOException {
+ return (fsin.getPos() - start) / (float) (end - start);
+ }
+
+ /**
+ * Read the block from start till end and after that until you find a closing tag
+ *
+ * @param withinBlock
+ * @return
+ * @throws IOException
+ */
+ private boolean readBlock(boolean withinBlock) throws IOException {
+ boolean read = false;
+
+ while (true) {
+ if (fsin.getPos() < end) {
+ if (readUntilMatch(start_tag, false)) {
+ buffer.write(start_tag);
+ readUntilMatch(end_tag, true);
+ read = true;
+ }
+ } else {
+ return read;
+ }
+ }
+ }
+
+ /**
+ * Read from block(s) until you reach the end of file or find a matching bytes with match[]
+ *
+ * @param match
+ * @param withinBlock
+ * @return
+ * @throws IOException
+ */
+ private boolean readUntilMatch(byte[] match, boolean withinBlock) throws IOException {
+ int i = 0;
+ while (true) {
+ int b = fsin.read();
+ // end of file:
+ if (b == -1) {
+ return false;
+ }
+ // save to buffer:
+ if (withinBlock) {
+ buffer.write(b);
+ }
+
+ // check if we're matching:
+ if (b == match[i]) {
+ i++;
+ if (i >= match.length) {
+ return true;
+ }
+ } else {
+ i = 0;
+ }
+ // see if we've passed the stop point:
+ if (!withinBlock && i == 0 && fsin.getPos() >= end) {
+ return false;
+ }
+ }
+ }
+
+ private int nextBlock() throws IOException {
+ long pos = fsin.getPos();
+ long block_length;
+ for (int i = 0; i < blocks.length; i++) {
+ block_length = blocks[i].getOffset() + blocks[i].getLength();
+ if (pos == block_length) {
+ return i + 1;
+ }
+ }
+ return 0;
+ }
+
+ @Override
+ public LongWritable getCurrentKey() throws IOException, InterruptedException {
+ return currentKey;
+ }
+
+ @Override
+ public Text getCurrentValue() throws IOException, InterruptedException {
+ return currentValue;
+ }
+
+ @Override
+ public void initialize(InputSplit split, TaskAttemptContext context) throws IOException, InterruptedException {
+ }
+
+ @Override
+ public boolean nextKeyValue() throws IOException, InterruptedException {
+ currentKey = new LongWritable();
+ currentValue = new Text();
+ return next(currentKey, currentValue);
+ }
+ }
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/3fc2d6c2/vxquery-core/src/main/java/org/apache/vxquery/metadata/VXQueryCollectionDataSource.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/metadata/VXQueryCollectionDataSource.java b/vxquery-core/src/main/java/org/apache/vxquery/metadata/VXQueryCollectionDataSource.java
index 62d1ca7..3c2d6aa 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/metadata/VXQueryCollectionDataSource.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/metadata/VXQueryCollectionDataSource.java
@@ -37,6 +37,7 @@ public class VXQueryCollectionDataSource implements IDataSource<String> {
private String[] collectionPartitions;
private final List<Integer> childSeq;
private int totalDataSources;
+ private String tag;
private final Object[] types;
@@ -60,6 +61,7 @@ public class VXQueryCollectionDataSource implements IDataSource<String> {
}
};
this.childSeq = new ArrayList<Integer>();
+ this.tag = null;
}
public int getTotalDataSources() {
@@ -77,7 +79,7 @@ public class VXQueryCollectionDataSource implements IDataSource<String> {
public String[] getPartitions() {
return collectionPartitions;
}
-
+
public void setPartitions(String[] collectionPartitions) {
this.collectionPartitions = collectionPartitions;
}
@@ -86,6 +88,14 @@ public class VXQueryCollectionDataSource implements IDataSource<String> {
return collectionPartitions.length;
}
+ public String getTag() {
+ return this.tag;
+ }
+
+ public void setTag(String tag) {
+ this.tag = tag;
+ }
+
@Override
public String getId() {
return collectionName;
http://git-wip-us.apache.org/repos/asf/vxquery/blob/3fc2d6c2/vxquery-core/src/main/java/org/apache/vxquery/metadata/VXQueryCollectionOperatorDescriptor.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/metadata/VXQueryCollectionOperatorDescriptor.java b/vxquery-core/src/main/java/org/apache/vxquery/metadata/VXQueryCollectionOperatorDescriptor.java
index d5966b8..b8dca63 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/metadata/VXQueryCollectionOperatorDescriptor.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/metadata/VXQueryCollectionOperatorDescriptor.java
@@ -16,15 +16,37 @@
*/
package org.apache.vxquery.metadata;
+import java.io.ByteArrayInputStream;
import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.InetAddress;
import java.nio.ByteBuffer;
+import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
+import java.util.Map;
import java.util.logging.Level;
import java.util.logging.Logger;
+import javax.xml.parsers.ParserConfigurationException;
+
import org.apache.commons.io.FileUtils;
import org.apache.commons.io.filefilter.TrueFileFilter;
+import org.apache.commons.lang.StringUtils;
+import org.apache.hadoop.fs.FileSystem;
+import org.apache.hadoop.fs.LocatedFileStatus;
+import org.apache.hadoop.fs.Path;
+import org.apache.hadoop.fs.RemoteIterator;
+import org.apache.hadoop.mapreduce.InputFormat;
+import org.apache.hadoop.mapreduce.InputSplit;
+import org.apache.hadoop.mapreduce.Job;
+import org.apache.hadoop.mapreduce.RecordReader;
+import org.apache.hadoop.mapreduce.TaskAttemptContext;
+import org.apache.hadoop.mapreduce.lib.input.FileSplit;
+import org.apache.hyracks.api.client.NodeControllerInfo;
import org.apache.hyracks.api.comm.IFrame;
import org.apache.hyracks.api.comm.IFrameFieldAppender;
import org.apache.hyracks.api.comm.VSizeFrame;
@@ -38,10 +60,14 @@ import org.apache.hyracks.dataflow.common.comm.io.FrameFixedFieldTupleAppender;
import org.apache.hyracks.dataflow.common.comm.io.FrameTupleAccessor;
import org.apache.hyracks.dataflow.std.base.AbstractSingleActivityOperatorDescriptor;
import org.apache.hyracks.dataflow.std.base.AbstractUnaryInputUnaryOutputOperatorNodePushable;
+import org.apache.hyracks.hdfs.ContextFactory;
+import org.apache.hyracks.hdfs2.dataflow.FileSplitsFactory;
import org.apache.vxquery.context.DynamicContext;
+import org.apache.vxquery.hdfs2.HDFSFunctions;
import org.apache.vxquery.xmlparser.ITreeNodeIdProvider;
import org.apache.vxquery.xmlparser.TreeNodeIdProvider;
import org.apache.vxquery.xmlparser.XMLParser;
+import org.xml.sax.SAXException;
public class VXQueryCollectionOperatorDescriptor extends AbstractSingleActivityOperatorDescriptor {
private static final long serialVersionUID = 1L;
@@ -50,15 +76,23 @@ public class VXQueryCollectionOperatorDescriptor extends AbstractSingleActivityO
private String[] collectionPartitions;
private List<Integer> childSeq;
protected static final Logger LOGGER = Logger.getLogger(VXQueryCollectionOperatorDescriptor.class.getName());
+ private HDFSFunctions hdfs;
+ private String tag;
+ private final String START_TAG = "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>\n";
+ private final String hdfsConf;
+ private final Map<String, NodeControllerInfo> nodeControllerInfos;
public VXQueryCollectionOperatorDescriptor(IOperatorDescriptorRegistry spec, VXQueryCollectionDataSource ds,
- RecordDescriptor rDesc) {
+ RecordDescriptor rDesc, String hdfsConf, Map<String, NodeControllerInfo> nodeControllerInfos) {
super(spec, 1, 1);
collectionPartitions = ds.getPartitions();
dataSourceId = (short) ds.getDataSourceId();
totalDataSources = (short) ds.getTotalDataSources();
childSeq = ds.getChildSeq();
recordDescriptors[0] = rDesc;
+ this.tag = ds.getTag();
+ this.hdfsConf = hdfsConf;
+ this.nodeControllerInfos = nodeControllerInfos;
}
@Override
@@ -83,31 +117,155 @@ public class VXQueryCollectionOperatorDescriptor extends AbstractSingleActivityO
public void open() throws HyracksDataException {
appender.reset(frame, true);
writer.open();
+ hdfs = new HDFSFunctions(nodeControllerInfos, hdfsConf);
}
@Override
public void nextFrame(ByteBuffer buffer) throws HyracksDataException {
fta.reset(buffer);
String collectionModifiedName = collectionName.replace("${nodeId}", nodeId);
- File collectionDirectory = new File(collectionModifiedName);
-
- // Go through each tuple.
- if (collectionDirectory.isDirectory()) {
- for (int tupleIndex = 0; tupleIndex < fta.getTupleCount(); ++tupleIndex) {
- @SuppressWarnings("unchecked")
- Iterator<File> it = FileUtils.iterateFiles(collectionDirectory, new VXQueryIOFileFilter(),
- TrueFileFilter.INSTANCE);
- while (it.hasNext()) {
- File xmlDocument = it.next();
- if (LOGGER.isLoggable(Level.FINE)) {
- LOGGER.fine("Starting to read XML document: " + xmlDocument.getAbsolutePath());
+ if (!collectionModifiedName.contains("hdfs:/")) {
+ File collectionDirectory = new File(collectionModifiedName);
+ //check if directory is in the local file system
+ if (collectionDirectory.exists()) {
+ // Go through each tuple.
+ if (collectionDirectory.isDirectory()) {
+ for (int tupleIndex = 0; tupleIndex < fta.getTupleCount(); ++tupleIndex) {
+ Iterator<File> it = FileUtils.iterateFiles(collectionDirectory,
+ new VXQueryIOFileFilter(), TrueFileFilter.INSTANCE);
+ while (it.hasNext()) {
+ File xmlDocument = it.next();
+ if (LOGGER.isLoggable(Level.FINE)) {
+ LOGGER.fine("Starting to read XML document: " + xmlDocument.getAbsolutePath());
+ }
+ parser.parseElements(xmlDocument, writer, tupleIndex);
+ }
}
- parser.parseElements(xmlDocument, writer, tupleIndex);
+ } else {
+ throw new HyracksDataException("Invalid directory parameter (" + nodeId + ":"
+ + collectionDirectory.getAbsolutePath() + ") passed to collection.");
}
}
} else {
- throw new HyracksDataException("Invalid directory parameter (" + nodeId + ":"
- + collectionDirectory.getAbsolutePath() + ") passed to collection.");
+ // Else check in HDFS file system
+ // Get instance of the HDFS filesystem
+ FileSystem fs = hdfs.getFileSystem();
+ if (fs != null) {
+ collectionModifiedName = collectionModifiedName.replaceAll("hdfs:/", "");
+ Path directory = new Path(collectionModifiedName);
+ Path xmlDocument;
+ if (tag != null) {
+ hdfs.setJob(directory.toString(), tag);
+ tag = "<" + tag + ">";
+ Job job = hdfs.getJob();
+ InputFormat inputFormat = hdfs.getinputFormat();
+ try {
+ hdfs.scheduleSplits();
+ ArrayList<Integer> schedule = hdfs
+ .getScheduleForNode(InetAddress.getLocalHost().getHostAddress());
+ List<InputSplit> splits = hdfs.getSplits();
+ List<FileSplit> fileSplits = new ArrayList<FileSplit>();
+ for (int i : schedule) {
+ fileSplits.add((FileSplit) splits.get(i));
+ }
+ FileSplitsFactory splitsFactory = new FileSplitsFactory(fileSplits);
+ List<FileSplit> inputSplits = splitsFactory.getSplits();
+ ContextFactory ctxFactory = new ContextFactory();
+ int size = inputSplits.size();
+ InputStream stream;
+ String value;
+ RecordReader reader;
+ TaskAttemptContext context;
+ for (int i = 0; i < size; i++) {
+ //read split
+ context = ctxFactory.createContext(job.getConfiguration(), i);
+ try {
+ reader = inputFormat.createRecordReader(inputSplits.get(i), context);
+ reader.initialize(inputSplits.get(i), context);
+ while (reader.nextKeyValue()) {
+ value = reader.getCurrentValue().toString();
+ //Split value if it contains more than one item with the tag
+ if (StringUtils.countMatches(value, tag) > 1) {
+ String items[] = value.split(tag);
+ for (String item : items) {
+ if (item.length() > 0) {
+ item = START_TAG + tag + item;
+ stream = new ByteArrayInputStream(
+ item.getBytes(StandardCharsets.UTF_8));
+ parser.parseHDFSElements(stream, writer, fta, i);
+ }
+ }
+ } else {
+ value = START_TAG + value;
+ //create an input stream to the file currently reading and send it to parser
+ stream = new ByteArrayInputStream(
+ value.getBytes(StandardCharsets.UTF_8));
+ parser.parseHDFSElements(stream, writer, fta, i);
+ }
+ }
+
+ } catch (InterruptedException e) {
+ if (LOGGER.isLoggable(Level.SEVERE)) {
+ LOGGER.severe(e.getMessage());
+ }
+ }
+ }
+
+ } catch (IOException e) {
+ if (LOGGER.isLoggable(Level.SEVERE)) {
+ LOGGER.severe(e.getMessage());
+ }
+ } catch (ParserConfigurationException e) {
+ if (LOGGER.isLoggable(Level.SEVERE)) {
+ LOGGER.severe(e.getMessage());
+ }
+ } catch (SAXException e) {
+ if (LOGGER.isLoggable(Level.SEVERE)) {
+ LOGGER.severe(e.getMessage());
+ }
+ }
+ } else {
+ try {
+ //check if the path exists and is a directory
+ if (fs.exists(directory) && fs.isDirectory(directory)) {
+ for (int tupleIndex = 0; tupleIndex < fta.getTupleCount(); ++tupleIndex) {
+ //read every file in the directory
+ RemoteIterator<LocatedFileStatus> it = fs.listFiles(directory, true);
+ while (it.hasNext()) {
+ xmlDocument = it.next().getPath();
+ if (fs.isFile(xmlDocument)) {
+ if (LOGGER.isLoggable(Level.FINE)) {
+ LOGGER.fine(
+ "Starting to read XML document: " + xmlDocument.getName());
+ }
+ //create an input stream to the file currently reading and send it to parser
+ InputStream in = fs.open(xmlDocument).getWrappedStream();
+ parser.parseHDFSElements(in, writer, fta, tupleIndex);
+ }
+ }
+ }
+ } else {
+ throw new HyracksDataException("Invalid HDFS directory parameter (" + nodeId + ":"
+ + directory + ") passed to collection.");
+ }
+ } catch (FileNotFoundException e) {
+ if (LOGGER.isLoggable(Level.SEVERE)) {
+ LOGGER.severe(e.getMessage());
+ }
+ } catch (IOException e) {
+ if (LOGGER.isLoggable(Level.SEVERE)) {
+ LOGGER.severe(e.getMessage());
+ }
+ }
+ }
+ try {
+ fs.close();
+ } catch (IOException e) {
+ if (LOGGER.isLoggable(Level.SEVERE)) {
+ LOGGER.severe(e.getMessage());
+ }
+ }
+ }
}
}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/3fc2d6c2/vxquery-core/src/main/java/org/apache/vxquery/metadata/VXQueryMetadataProvider.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/metadata/VXQueryMetadataProvider.java b/vxquery-core/src/main/java/org/apache/vxquery/metadata/VXQueryMetadataProvider.java
index 238f6d3..820c365 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/metadata/VXQueryMetadataProvider.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/metadata/VXQueryMetadataProvider.java
@@ -22,8 +22,6 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Map;
-import org.apache.vxquery.context.StaticContext;
-
import org.apache.hyracks.algebricks.common.constraints.AlgebricksAbsolutePartitionConstraint;
import org.apache.hyracks.algebricks.common.constraints.AlgebricksPartitionConstraint;
import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
@@ -45,6 +43,7 @@ import org.apache.hyracks.algebricks.data.IResultSerializerFactoryProvider;
import org.apache.hyracks.algebricks.runtime.base.IPushRuntimeFactory;
import org.apache.hyracks.algebricks.runtime.serializer.ResultSerializerFactoryProvider;
import org.apache.hyracks.algebricks.runtime.writers.PrinterBasedWriterFactory;
+import org.apache.hyracks.api.client.NodeControllerInfo;
import org.apache.hyracks.api.dataflow.IOperatorDescriptor;
import org.apache.hyracks.api.dataflow.value.IResultSerializerFactory;
import org.apache.hyracks.api.dataflow.value.ISerializerDeserializer;
@@ -52,16 +51,22 @@ import org.apache.hyracks.api.dataflow.value.RecordDescriptor;
import org.apache.hyracks.api.dataset.ResultSetId;
import org.apache.hyracks.api.job.JobSpecification;
import org.apache.hyracks.dataflow.std.result.ResultWriterOperatorDescriptor;
+import org.apache.vxquery.context.StaticContext;
public class VXQueryMetadataProvider implements IMetadataProvider<String, String> {
private final String[] nodeList;
private final Map<String, File> sourceFileMap;
private final StaticContext staticCtx;
+ private final String hdfsConf;
+ private final Map<String, NodeControllerInfo> nodeControllerInfos;
- public VXQueryMetadataProvider(String[] nodeList, Map<String, File> sourceFileMap, StaticContext staticCtx) {
+ public VXQueryMetadataProvider(String[] nodeList, Map<String, File> sourceFileMap, StaticContext staticCtx,
+ String hdfsConf, Map<String, NodeControllerInfo> nodeControllerInfos) {
this.nodeList = nodeList;
this.sourceFileMap = sourceFileMap;
this.staticCtx = staticCtx;
+ this.hdfsConf = hdfsConf;
+ this.nodeControllerInfos = nodeControllerInfos;
}
@Override
@@ -82,7 +87,7 @@ public class VXQueryMetadataProvider implements IMetadataProvider<String, String
List<LogicalVariable> scanVariables, List<LogicalVariable> projectVariables, boolean projectPushed,
List<LogicalVariable> minFilterVars, List<LogicalVariable> maxFilterVars, IOperatorSchema opSchema,
IVariableTypeEnvironment typeEnv, JobGenContext context, JobSpecification jobSpec, Object implConfig)
- throws AlgebricksException {
+ throws AlgebricksException {
VXQueryCollectionDataSource ds = (VXQueryCollectionDataSource) dataSource;
if (sourceFileMap != null) {
final int len = ds.getPartitions().length;
@@ -95,7 +100,8 @@ public class VXQueryMetadataProvider implements IMetadataProvider<String, String
ds.setPartitions(collectionPartitions);
}
RecordDescriptor rDesc = new RecordDescriptor(new ISerializerDeserializer[opSchema.getSize()]);
- IOperatorDescriptor scanner = new VXQueryCollectionOperatorDescriptor(jobSpec, ds, rDesc);
+ IOperatorDescriptor scanner = new VXQueryCollectionOperatorDescriptor(jobSpec, ds, rDesc, this.hdfsConf,
+ this.nodeControllerInfos);
AlgebricksPartitionConstraint constraint = getClusterLocations(nodeList, ds.getPartitionCount());
return new Pair<IOperatorDescriptor, AlgebricksPartitionConstraint>(scanner, constraint);
@@ -129,7 +135,7 @@ public class VXQueryMetadataProvider implements IMetadataProvider<String, String
@Override
public Pair<IPushRuntimeFactory, AlgebricksPartitionConstraint> getWriteFileRuntime(IDataSink sink,
int[] printColumns, IPrinterFactory[] printerFactories, RecordDescriptor inputDesc)
- throws AlgebricksException {
+ throws AlgebricksException {
throw new UnsupportedOperationException();
}
@@ -155,7 +161,7 @@ public class VXQueryMetadataProvider implements IMetadataProvider<String, String
IOperatorSchema[] inputSchemas, IVariableTypeEnvironment typeEnv, List<LogicalVariable> primaryKeys,
List<LogicalVariable> secondaryKeys, List<LogicalVariable> additionalNonKeyFields,
ILogicalExpression filterExpr, RecordDescriptor recordDesc, JobGenContext context, JobSpecification spec)
- throws AlgebricksException {
+ throws AlgebricksException {
throw new UnsupportedOperationException();
}
[03/50] [abbrv] vxquery git commit: Updated xqts test results.
Posted by sj...@apache.org.
Updated xqts test results.
Project: http://git-wip-us.apache.org/repos/asf/vxquery/repo
Commit: http://git-wip-us.apache.org/repos/asf/vxquery/commit/d94c51f4
Tree: http://git-wip-us.apache.org/repos/asf/vxquery/tree/d94c51f4
Diff: http://git-wip-us.apache.org/repos/asf/vxquery/diff/d94c51f4
Branch: refs/heads/site
Commit: d94c51f41c909342aed663cf9a7d8e7a91c971f7
Parents: ac7de01
Author: Preston Carman <pr...@apache.org>
Authored: Thu Jul 16 22:38:56 2015 -0700
Committer: Preston Carman <pr...@apache.org>
Committed: Thu Jul 23 15:23:48 2015 -0700
----------------------------------------------------------------------
vxquery-xtest/results/xqts.txt | 144 ++++++++++++++++++------------------
1 file changed, 72 insertions(+), 72 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/vxquery/blob/d94c51f4/vxquery-xtest/results/xqts.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/results/xqts.txt b/vxquery-xtest/results/xqts.txt
index 5b59e65..8b76ab6 100644
--- a/vxquery-xtest/results/xqts.txt
+++ b/vxquery-xtest/results/xqts.txt
@@ -295,7 +295,7 @@ Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-3, EXPECTED_ERRO
Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-30, EXPECTED_RESULT_GOT_ERROR
Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-31, EXPECTED_RESULT_GOT_ERROR
Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-32, EXPECTED_RESULT_GOT_ERROR
-Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-33, EXPECTED_RESULT_GOT_FAILURE
+Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-33, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-34, EXPECTED_RESULT_GOT_ERROR
Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-35, EXPECTED_RESULT_GOT_ERROR
Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-36, EXPECTED_RESULT_GOT_ERROR
@@ -305,8 +305,8 @@ Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-39, EXPECTED_RES
Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-4, EXPECTED_ERROR_GOT_SAME_ERROR
Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-40, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-41, EXPECTED_RESULT_GOT_FAILURE
-Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-42, EXPECTED_RESULT_GOT_FAILURE
-Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-43, EXPECTED_RESULT_GOT_FAILURE
+Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-42, EXPECTED_RESULT_GOT_SAME_RESULT
+Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-43, EXPECTED_RESULT_GOT_SAME_RESULT
Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-44, EXPECTED_RESULT_GOT_ERROR
Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-45, EXPECTED_RESULT_GOT_ERROR
Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-46, EXPECTED_RESULT_GOT_FAILURE
@@ -412,8 +412,8 @@ Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-2, EXP
Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-20, EXPECTED_RESULT_GOT_ERROR
Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-21, EXPECTED_RESULT_GOT_ERROR
Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-22, EXPECTED_RESULT_GOT_ERROR
-Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-23, EXPECTED_RESULT_GOT_FAILURE
-Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-24, EXPECTED_RESULT_GOT_FAILURE
+Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-23, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-24, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-25, EXPECTED_ERROR_GOT_RESULT
Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-26, EXPECTED_ERROR_GOT_SAME_ERROR
Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-27, EXPECTED_RESULT_GOT_ERROR
@@ -847,12 +847,12 @@ Expressions/Construct/DirectConElem/DirectConElemAttr//Constr-attr-distnames-2,
Expressions/Construct/DirectConElem/DirectConElemAttr//Constr-attr-distnames-3, EXPECTED_ERROR_GOT_RESULT
Expressions/Construct/DirectConElem/DirectConElemAttr//Constr-attr-distnames-4, EXPECTED_ERROR_GOT_RESULT
Expressions/Construct/DirectConElem/DirectConElemAttr//Constr-attr-enclexpr-1, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/Construct/DirectConElem/DirectConElemAttr//Constr-attr-enclexpr-2, EXPECTED_RESULT_GOT_FAILURE
+Expressions/Construct/DirectConElem/DirectConElemAttr//Constr-attr-enclexpr-2, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Expressions/Construct/DirectConElem/DirectConElemAttr//Constr-attr-enclexpr-3, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/Construct/DirectConElem/DirectConElemAttr//Constr-attr-enclexpr-4, EXPECTED_RESULT_GOT_FAILURE
+Expressions/Construct/DirectConElem/DirectConElemAttr//Constr-attr-enclexpr-4, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Expressions/Construct/DirectConElem/DirectConElemAttr//Constr-attr-enclexpr-5, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Construct/DirectConElem/DirectConElemAttr//Constr-attr-enclexpr-6, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/Construct/DirectConElem/DirectConElemAttr//Constr-attr-enclexpr-7, EXPECTED_RESULT_GOT_FAILURE
+Expressions/Construct/DirectConElem/DirectConElemAttr//Constr-attr-enclexpr-7, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Expressions/Construct/DirectConElem/DirectConElemAttr//Constr-attr-enclexpr-8, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Expressions/Construct/DirectConElem/DirectConElemAttr//Constr-attr-entref-1, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Construct/DirectConElem/DirectConElemAttr//Constr-attr-entref-2, EXPECTED_RESULT_GOT_ERROR
@@ -14788,19 +14788,19 @@ Functions/NumericFunc/ABSFunc//K2-ABSFunc-31, EXPECTED_RESULT_GOT_SAME_RESULT
Functions/NumericFunc/ABSFunc//K2-ABSFunc-32, EXPECTED_RESULT_GOT_SAME_RESULT
Functions/NumericFunc/ABSFunc//K2-ABSFunc-33, EXPECTED_RESULT_GOT_SAME_RESULT
Functions/NumericFunc/ABSFunc//K2-ABSFunc-34, EXPECTED_RESULT_GOT_SAME_RESULT
-Functions/NumericFunc/ABSFunc//K2-ABSFunc-35, EXPECTED_RESULT_GOT_ERROR
-Functions/NumericFunc/ABSFunc//K2-ABSFunc-36, EXPECTED_RESULT_GOT_ERROR
-Functions/NumericFunc/ABSFunc//K2-ABSFunc-37, EXPECTED_RESULT_GOT_ERROR
-Functions/NumericFunc/ABSFunc//K2-ABSFunc-38, EXPECTED_RESULT_GOT_ERROR
-Functions/NumericFunc/ABSFunc//K2-ABSFunc-39, EXPECTED_RESULT_GOT_ERROR
+Functions/NumericFunc/ABSFunc//K2-ABSFunc-35, EXPECTED_RESULT_GOT_SAME_RESULT
+Functions/NumericFunc/ABSFunc//K2-ABSFunc-36, EXPECTED_RESULT_GOT_SAME_RESULT
+Functions/NumericFunc/ABSFunc//K2-ABSFunc-37, EXPECTED_RESULT_GOT_SAME_RESULT
+Functions/NumericFunc/ABSFunc//K2-ABSFunc-38, EXPECTED_RESULT_GOT_SAME_RESULT
+Functions/NumericFunc/ABSFunc//K2-ABSFunc-39, EXPECTED_RESULT_GOT_SAME_RESULT
Functions/NumericFunc/ABSFunc//K2-ABSFunc-4, EXPECTED_RESULT_GOT_SAME_RESULT
-Functions/NumericFunc/ABSFunc//K2-ABSFunc-40, EXPECTED_RESULT_GOT_ERROR
-Functions/NumericFunc/ABSFunc//K2-ABSFunc-41, EXPECTED_RESULT_GOT_ERROR
-Functions/NumericFunc/ABSFunc//K2-ABSFunc-42, EXPECTED_RESULT_GOT_ERROR
-Functions/NumericFunc/ABSFunc//K2-ABSFunc-43, EXPECTED_RESULT_GOT_ERROR
-Functions/NumericFunc/ABSFunc//K2-ABSFunc-44, EXPECTED_RESULT_GOT_ERROR
-Functions/NumericFunc/ABSFunc//K2-ABSFunc-45, EXPECTED_RESULT_GOT_ERROR
-Functions/NumericFunc/ABSFunc//K2-ABSFunc-46, EXPECTED_RESULT_GOT_ERROR
+Functions/NumericFunc/ABSFunc//K2-ABSFunc-40, EXPECTED_RESULT_GOT_SAME_RESULT
+Functions/NumericFunc/ABSFunc//K2-ABSFunc-41, EXPECTED_RESULT_GOT_SAME_RESULT
+Functions/NumericFunc/ABSFunc//K2-ABSFunc-42, EXPECTED_RESULT_GOT_SAME_RESULT
+Functions/NumericFunc/ABSFunc//K2-ABSFunc-43, EXPECTED_RESULT_GOT_SAME_RESULT
+Functions/NumericFunc/ABSFunc//K2-ABSFunc-44, EXPECTED_RESULT_GOT_SAME_RESULT
+Functions/NumericFunc/ABSFunc//K2-ABSFunc-45, EXPECTED_RESULT_GOT_SAME_RESULT
+Functions/NumericFunc/ABSFunc//K2-ABSFunc-46, EXPECTED_RESULT_GOT_SAME_RESULT
Functions/NumericFunc/ABSFunc//K2-ABSFunc-47, EXPECTED_RESULT_GOT_SAME_RESULT
Functions/NumericFunc/ABSFunc//K2-ABSFunc-48, EXPECTED_RESULT_GOT_SAME_RESULT
Functions/NumericFunc/ABSFunc//K2-ABSFunc-49, EXPECTED_RESULT_GOT_SAME_RESULT
@@ -14942,18 +14942,18 @@ Functions/NumericFunc/CeilingFunc//K-CeilingFunc-3, EXPECTED_RESULT_GOT_FAILURE
Functions/NumericFunc/CeilingFunc//K-CeilingFunc-4, EXPECTED_RESULT_GOT_SAME_RESULT
Functions/NumericFunc/CeilingFunc//K-CeilingFunc-5, EXPECTED_RESULT_GOT_SAME_RESULT
Functions/NumericFunc/CeilingFunc//K-CeilingFunc-6, EXPECTED_ERROR_GOT_SAME_ERROR
-Functions/NumericFunc/CeilingFunc//K2-CeilingFunc-1, EXPECTED_RESULT_GOT_ERROR
-Functions/NumericFunc/CeilingFunc//K2-CeilingFunc-10, EXPECTED_RESULT_GOT_ERROR
-Functions/NumericFunc/CeilingFunc//K2-CeilingFunc-11, EXPECTED_RESULT_GOT_ERROR
-Functions/NumericFunc/CeilingFunc//K2-CeilingFunc-12, EXPECTED_RESULT_GOT_ERROR
-Functions/NumericFunc/CeilingFunc//K2-CeilingFunc-2, EXPECTED_RESULT_GOT_ERROR
-Functions/NumericFunc/CeilingFunc//K2-CeilingFunc-3, EXPECTED_RESULT_GOT_ERROR
-Functions/NumericFunc/CeilingFunc//K2-CeilingFunc-4, EXPECTED_RESULT_GOT_ERROR
-Functions/NumericFunc/CeilingFunc//K2-CeilingFunc-5, EXPECTED_RESULT_GOT_ERROR
-Functions/NumericFunc/CeilingFunc//K2-CeilingFunc-6, EXPECTED_RESULT_GOT_ERROR
-Functions/NumericFunc/CeilingFunc//K2-CeilingFunc-7, EXPECTED_RESULT_GOT_ERROR
-Functions/NumericFunc/CeilingFunc//K2-CeilingFunc-8, EXPECTED_RESULT_GOT_ERROR
-Functions/NumericFunc/CeilingFunc//K2-CeilingFunc-9, EXPECTED_RESULT_GOT_ERROR
+Functions/NumericFunc/CeilingFunc//K2-CeilingFunc-1, EXPECTED_RESULT_GOT_SAME_RESULT
+Functions/NumericFunc/CeilingFunc//K2-CeilingFunc-10, EXPECTED_RESULT_GOT_SAME_RESULT
+Functions/NumericFunc/CeilingFunc//K2-CeilingFunc-11, EXPECTED_RESULT_GOT_SAME_RESULT
+Functions/NumericFunc/CeilingFunc//K2-CeilingFunc-12, EXPECTED_RESULT_GOT_SAME_RESULT
+Functions/NumericFunc/CeilingFunc//K2-CeilingFunc-2, EXPECTED_RESULT_GOT_SAME_RESULT
+Functions/NumericFunc/CeilingFunc//K2-CeilingFunc-3, EXPECTED_RESULT_GOT_SAME_RESULT
+Functions/NumericFunc/CeilingFunc//K2-CeilingFunc-4, EXPECTED_RESULT_GOT_SAME_RESULT
+Functions/NumericFunc/CeilingFunc//K2-CeilingFunc-5, EXPECTED_RESULT_GOT_SAME_RESULT
+Functions/NumericFunc/CeilingFunc//K2-CeilingFunc-6, EXPECTED_RESULT_GOT_SAME_RESULT
+Functions/NumericFunc/CeilingFunc//K2-CeilingFunc-7, EXPECTED_RESULT_GOT_SAME_RESULT
+Functions/NumericFunc/CeilingFunc//K2-CeilingFunc-8, EXPECTED_RESULT_GOT_SAME_RESULT
+Functions/NumericFunc/CeilingFunc//K2-CeilingFunc-9, EXPECTED_RESULT_GOT_SAME_RESULT
Functions/NumericFunc/CeilingFunc//fn-ceiling-1, EXPECTED_RESULT_GOT_FAILURE
Functions/NumericFunc/CeilingFunc//fn-ceilingdbl1args-1, EXPECTED_RESULT_GOT_SAME_RESULT
Functions/NumericFunc/CeilingFunc//fn-ceilingdbl1args-2, EXPECTED_RESULT_GOT_SAME_RESULT
@@ -15000,19 +15000,19 @@ Functions/NumericFunc/FloorFunc//K-FloorFunc-3, EXPECTED_RESULT_GOT_FAILURE
Functions/NumericFunc/FloorFunc//K-FloorFunc-4, EXPECTED_RESULT_GOT_SAME_RESULT
Functions/NumericFunc/FloorFunc//K-FloorFunc-5, EXPECTED_RESULT_GOT_SAME_RESULT
Functions/NumericFunc/FloorFunc//K-FloorFunc-6, EXPECTED_ERROR_GOT_SAME_ERROR
-Functions/NumericFunc/FloorFunc//K2-FloorFunc-1, EXPECTED_RESULT_GOT_ERROR
-Functions/NumericFunc/FloorFunc//K2-FloorFunc-10, EXPECTED_RESULT_GOT_ERROR
-Functions/NumericFunc/FloorFunc//K2-FloorFunc-11, EXPECTED_RESULT_GOT_ERROR
-Functions/NumericFunc/FloorFunc//K2-FloorFunc-12, EXPECTED_RESULT_GOT_ERROR
-Functions/NumericFunc/FloorFunc//K2-FloorFunc-13, EXPECTED_RESULT_GOT_ERROR
-Functions/NumericFunc/FloorFunc//K2-FloorFunc-2, EXPECTED_RESULT_GOT_ERROR
-Functions/NumericFunc/FloorFunc//K2-FloorFunc-3, EXPECTED_RESULT_GOT_ERROR
-Functions/NumericFunc/FloorFunc//K2-FloorFunc-4, EXPECTED_RESULT_GOT_ERROR
-Functions/NumericFunc/FloorFunc//K2-FloorFunc-5, EXPECTED_RESULT_GOT_ERROR
-Functions/NumericFunc/FloorFunc//K2-FloorFunc-6, EXPECTED_RESULT_GOT_ERROR
-Functions/NumericFunc/FloorFunc//K2-FloorFunc-7, EXPECTED_RESULT_GOT_ERROR
-Functions/NumericFunc/FloorFunc//K2-FloorFunc-8, EXPECTED_RESULT_GOT_ERROR
-Functions/NumericFunc/FloorFunc//K2-FloorFunc-9, EXPECTED_RESULT_GOT_ERROR
+Functions/NumericFunc/FloorFunc//K2-FloorFunc-1, EXPECTED_RESULT_GOT_SAME_RESULT
+Functions/NumericFunc/FloorFunc//K2-FloorFunc-10, EXPECTED_RESULT_GOT_SAME_RESULT
+Functions/NumericFunc/FloorFunc//K2-FloorFunc-11, EXPECTED_RESULT_GOT_SAME_RESULT
+Functions/NumericFunc/FloorFunc//K2-FloorFunc-12, EXPECTED_RESULT_GOT_SAME_RESULT
+Functions/NumericFunc/FloorFunc//K2-FloorFunc-13, EXPECTED_RESULT_GOT_SAME_RESULT
+Functions/NumericFunc/FloorFunc//K2-FloorFunc-2, EXPECTED_RESULT_GOT_SAME_RESULT
+Functions/NumericFunc/FloorFunc//K2-FloorFunc-3, EXPECTED_RESULT_GOT_SAME_RESULT
+Functions/NumericFunc/FloorFunc//K2-FloorFunc-4, EXPECTED_RESULT_GOT_SAME_RESULT
+Functions/NumericFunc/FloorFunc//K2-FloorFunc-5, EXPECTED_RESULT_GOT_SAME_RESULT
+Functions/NumericFunc/FloorFunc//K2-FloorFunc-6, EXPECTED_RESULT_GOT_SAME_RESULT
+Functions/NumericFunc/FloorFunc//K2-FloorFunc-7, EXPECTED_RESULT_GOT_SAME_RESULT
+Functions/NumericFunc/FloorFunc//K2-FloorFunc-8, EXPECTED_RESULT_GOT_SAME_RESULT
+Functions/NumericFunc/FloorFunc//K2-FloorFunc-9, EXPECTED_RESULT_GOT_SAME_RESULT
Functions/NumericFunc/FloorFunc//fn-floor-1, EXPECTED_RESULT_GOT_FAILURE
Functions/NumericFunc/FloorFunc//fn-floordbl1args-1, EXPECTED_RESULT_GOT_SAME_RESULT
Functions/NumericFunc/FloorFunc//fn-floordbl1args-2, EXPECTED_RESULT_GOT_SAME_RESULT
@@ -15066,19 +15066,19 @@ Functions/NumericFunc/RoundEvenFunc//K2-RoundEvenFunc-13, EXPECTED_RESULT_GOT_SA
Functions/NumericFunc/RoundEvenFunc//K2-RoundEvenFunc-14, EXPECTED_RESULT_GOT_SAME_RESULT
Functions/NumericFunc/RoundEvenFunc//K2-RoundEvenFunc-15, EXPECTED_RESULT_GOT_SAME_RESULT
Functions/NumericFunc/RoundEvenFunc//K2-RoundEvenFunc-16, EXPECTED_RESULT_GOT_SAME_RESULT
-Functions/NumericFunc/RoundEvenFunc//K2-RoundEvenFunc-17, EXPECTED_RESULT_GOT_ERROR
-Functions/NumericFunc/RoundEvenFunc//K2-RoundEvenFunc-18, EXPECTED_RESULT_GOT_ERROR
-Functions/NumericFunc/RoundEvenFunc//K2-RoundEvenFunc-19, EXPECTED_RESULT_GOT_ERROR
+Functions/NumericFunc/RoundEvenFunc//K2-RoundEvenFunc-17, EXPECTED_RESULT_GOT_SAME_RESULT
+Functions/NumericFunc/RoundEvenFunc//K2-RoundEvenFunc-18, EXPECTED_RESULT_GOT_SAME_RESULT
+Functions/NumericFunc/RoundEvenFunc//K2-RoundEvenFunc-19, EXPECTED_RESULT_GOT_SAME_RESULT
Functions/NumericFunc/RoundEvenFunc//K2-RoundEvenFunc-2, EXPECTED_RESULT_GOT_SAME_RESULT
-Functions/NumericFunc/RoundEvenFunc//K2-RoundEvenFunc-20, EXPECTED_RESULT_GOT_ERROR
-Functions/NumericFunc/RoundEvenFunc//K2-RoundEvenFunc-21, EXPECTED_RESULT_GOT_ERROR
-Functions/NumericFunc/RoundEvenFunc//K2-RoundEvenFunc-22, EXPECTED_RESULT_GOT_ERROR
-Functions/NumericFunc/RoundEvenFunc//K2-RoundEvenFunc-23, EXPECTED_RESULT_GOT_ERROR
-Functions/NumericFunc/RoundEvenFunc//K2-RoundEvenFunc-24, EXPECTED_RESULT_GOT_ERROR
-Functions/NumericFunc/RoundEvenFunc//K2-RoundEvenFunc-25, EXPECTED_RESULT_GOT_ERROR
-Functions/NumericFunc/RoundEvenFunc//K2-RoundEvenFunc-26, EXPECTED_RESULT_GOT_ERROR
-Functions/NumericFunc/RoundEvenFunc//K2-RoundEvenFunc-27, EXPECTED_RESULT_GOT_ERROR
-Functions/NumericFunc/RoundEvenFunc//K2-RoundEvenFunc-28, EXPECTED_RESULT_GOT_ERROR
+Functions/NumericFunc/RoundEvenFunc//K2-RoundEvenFunc-20, EXPECTED_RESULT_GOT_SAME_RESULT
+Functions/NumericFunc/RoundEvenFunc//K2-RoundEvenFunc-21, EXPECTED_RESULT_GOT_SAME_RESULT
+Functions/NumericFunc/RoundEvenFunc//K2-RoundEvenFunc-22, EXPECTED_RESULT_GOT_SAME_RESULT
+Functions/NumericFunc/RoundEvenFunc//K2-RoundEvenFunc-23, EXPECTED_RESULT_GOT_SAME_RESULT
+Functions/NumericFunc/RoundEvenFunc//K2-RoundEvenFunc-24, EXPECTED_RESULT_GOT_SAME_RESULT
+Functions/NumericFunc/RoundEvenFunc//K2-RoundEvenFunc-25, EXPECTED_RESULT_GOT_SAME_RESULT
+Functions/NumericFunc/RoundEvenFunc//K2-RoundEvenFunc-26, EXPECTED_RESULT_GOT_SAME_RESULT
+Functions/NumericFunc/RoundEvenFunc//K2-RoundEvenFunc-27, EXPECTED_RESULT_GOT_SAME_RESULT
+Functions/NumericFunc/RoundEvenFunc//K2-RoundEvenFunc-28, EXPECTED_RESULT_GOT_SAME_RESULT
Functions/NumericFunc/RoundEvenFunc//K2-RoundEvenFunc-3, EXPECTED_RESULT_GOT_SAME_RESULT
Functions/NumericFunc/RoundEvenFunc//K2-RoundEvenFunc-4, EXPECTED_RESULT_GOT_SAME_RESULT
Functions/NumericFunc/RoundEvenFunc//K2-RoundEvenFunc-5, EXPECTED_RESULT_GOT_SAME_RESULT
@@ -15136,8 +15136,8 @@ Functions/NumericFunc/RoundFunc//K-RoundFunc-6, EXPECTED_RESULT_GOT_SAME_RESULT
Functions/NumericFunc/RoundFunc//K-RoundFunc-7, EXPECTED_RESULT_GOT_SAME_RESULT
Functions/NumericFunc/RoundFunc//K-RoundFunc-8, EXPECTED_RESULT_GOT_SAME_RESULT
Functions/NumericFunc/RoundFunc//K-RoundFunc-9, EXPECTED_RESULT_GOT_SAME_RESULT
-Functions/NumericFunc/RoundFunc//K2-RoundFunc-1, EXPECTED_RESULT_GOT_ERROR
-Functions/NumericFunc/RoundFunc//K2-RoundFunc-10, EXPECTED_RESULT_GOT_ERROR
+Functions/NumericFunc/RoundFunc//K2-RoundFunc-1, EXPECTED_RESULT_GOT_SAME_RESULT
+Functions/NumericFunc/RoundFunc//K2-RoundFunc-10, EXPECTED_RESULT_GOT_SAME_RESULT
Functions/NumericFunc/RoundFunc//K2-RoundFunc-100, EXPECTED_RESULT_GOT_SAME_RESULT
Functions/NumericFunc/RoundFunc//K2-RoundFunc-101, EXPECTED_RESULT_GOT_SAME_RESULT
Functions/NumericFunc/RoundFunc//K2-RoundFunc-102, EXPECTED_RESULT_GOT_SAME_RESULT
@@ -15148,7 +15148,7 @@ Functions/NumericFunc/RoundFunc//K2-RoundFunc-106, EXPECTED_RESULT_GOT_SAME_RESU
Functions/NumericFunc/RoundFunc//K2-RoundFunc-107, EXPECTED_RESULT_GOT_SAME_RESULT
Functions/NumericFunc/RoundFunc//K2-RoundFunc-108, EXPECTED_RESULT_GOT_SAME_RESULT
Functions/NumericFunc/RoundFunc//K2-RoundFunc-109, EXPECTED_RESULT_GOT_SAME_RESULT
-Functions/NumericFunc/RoundFunc//K2-RoundFunc-11, EXPECTED_RESULT_GOT_ERROR
+Functions/NumericFunc/RoundFunc//K2-RoundFunc-11, EXPECTED_RESULT_GOT_SAME_RESULT
Functions/NumericFunc/RoundFunc//K2-RoundFunc-110, EXPECTED_RESULT_GOT_SAME_RESULT
Functions/NumericFunc/RoundFunc//K2-RoundFunc-111, EXPECTED_RESULT_GOT_SAME_RESULT
Functions/NumericFunc/RoundFunc//K2-RoundFunc-112, EXPECTED_RESULT_GOT_SAME_RESULT
@@ -15159,7 +15159,7 @@ Functions/NumericFunc/RoundFunc//K2-RoundFunc-116, EXPECTED_RESULT_GOT_SAME_RESU
Functions/NumericFunc/RoundFunc//K2-RoundFunc-117, EXPECTED_RESULT_GOT_SAME_RESULT
Functions/NumericFunc/RoundFunc//K2-RoundFunc-118, EXPECTED_RESULT_GOT_SAME_RESULT
Functions/NumericFunc/RoundFunc//K2-RoundFunc-119, EXPECTED_RESULT_GOT_SAME_RESULT
-Functions/NumericFunc/RoundFunc//K2-RoundFunc-12, EXPECTED_RESULT_GOT_ERROR
+Functions/NumericFunc/RoundFunc//K2-RoundFunc-12, EXPECTED_RESULT_GOT_SAME_RESULT
Functions/NumericFunc/RoundFunc//K2-RoundFunc-120, EXPECTED_RESULT_GOT_SAME_RESULT
Functions/NumericFunc/RoundFunc//K2-RoundFunc-121, EXPECTED_RESULT_GOT_SAME_RESULT
Functions/NumericFunc/RoundFunc//K2-RoundFunc-122, EXPECTED_RESULT_GOT_SAME_RESULT
@@ -15238,7 +15238,7 @@ Functions/NumericFunc/RoundFunc//K2-RoundFunc-188, EXPECTED_RESULT_GOT_SAME_RESU
Functions/NumericFunc/RoundFunc//K2-RoundFunc-189, EXPECTED_RESULT_GOT_SAME_RESULT
Functions/NumericFunc/RoundFunc//K2-RoundFunc-19, EXPECTED_RESULT_GOT_SAME_RESULT
Functions/NumericFunc/RoundFunc//K2-RoundFunc-190, EXPECTED_RESULT_GOT_SAME_RESULT
-Functions/NumericFunc/RoundFunc//K2-RoundFunc-2, EXPECTED_RESULT_GOT_ERROR
+Functions/NumericFunc/RoundFunc//K2-RoundFunc-2, EXPECTED_RESULT_GOT_SAME_RESULT
Functions/NumericFunc/RoundFunc//K2-RoundFunc-20, EXPECTED_RESULT_GOT_SAME_RESULT
Functions/NumericFunc/RoundFunc//K2-RoundFunc-21, EXPECTED_RESULT_GOT_SAME_RESULT
Functions/NumericFunc/RoundFunc//K2-RoundFunc-22, EXPECTED_RESULT_GOT_SAME_RESULT
@@ -15249,7 +15249,7 @@ Functions/NumericFunc/RoundFunc//K2-RoundFunc-26, EXPECTED_RESULT_GOT_SAME_RESUL
Functions/NumericFunc/RoundFunc//K2-RoundFunc-27, EXPECTED_RESULT_GOT_SAME_RESULT
Functions/NumericFunc/RoundFunc//K2-RoundFunc-28, EXPECTED_RESULT_GOT_SAME_RESULT
Functions/NumericFunc/RoundFunc//K2-RoundFunc-29, EXPECTED_RESULT_GOT_SAME_RESULT
-Functions/NumericFunc/RoundFunc//K2-RoundFunc-3, EXPECTED_RESULT_GOT_ERROR
+Functions/NumericFunc/RoundFunc//K2-RoundFunc-3, EXPECTED_RESULT_GOT_SAME_RESULT
Functions/NumericFunc/RoundFunc//K2-RoundFunc-30, EXPECTED_RESULT_GOT_SAME_RESULT
Functions/NumericFunc/RoundFunc//K2-RoundFunc-31, EXPECTED_RESULT_GOT_SAME_RESULT
Functions/NumericFunc/RoundFunc//K2-RoundFunc-32, EXPECTED_RESULT_GOT_SAME_RESULT
@@ -15260,7 +15260,7 @@ Functions/NumericFunc/RoundFunc//K2-RoundFunc-36, EXPECTED_RESULT_GOT_SAME_RESUL
Functions/NumericFunc/RoundFunc//K2-RoundFunc-37, EXPECTED_RESULT_GOT_SAME_RESULT
Functions/NumericFunc/RoundFunc//K2-RoundFunc-38, EXPECTED_RESULT_GOT_SAME_RESULT
Functions/NumericFunc/RoundFunc//K2-RoundFunc-39, EXPECTED_RESULT_GOT_SAME_RESULT
-Functions/NumericFunc/RoundFunc//K2-RoundFunc-4, EXPECTED_RESULT_GOT_ERROR
+Functions/NumericFunc/RoundFunc//K2-RoundFunc-4, EXPECTED_RESULT_GOT_SAME_RESULT
Functions/NumericFunc/RoundFunc//K2-RoundFunc-40, EXPECTED_RESULT_GOT_SAME_RESULT
Functions/NumericFunc/RoundFunc//K2-RoundFunc-41, EXPECTED_RESULT_GOT_SAME_RESULT
Functions/NumericFunc/RoundFunc//K2-RoundFunc-42, EXPECTED_RESULT_GOT_SAME_RESULT
@@ -15271,7 +15271,7 @@ Functions/NumericFunc/RoundFunc//K2-RoundFunc-46, EXPECTED_RESULT_GOT_SAME_RESUL
Functions/NumericFunc/RoundFunc//K2-RoundFunc-47, EXPECTED_RESULT_GOT_SAME_RESULT
Functions/NumericFunc/RoundFunc//K2-RoundFunc-48, EXPECTED_RESULT_GOT_SAME_RESULT
Functions/NumericFunc/RoundFunc//K2-RoundFunc-49, EXPECTED_RESULT_GOT_SAME_RESULT
-Functions/NumericFunc/RoundFunc//K2-RoundFunc-5, EXPECTED_RESULT_GOT_ERROR
+Functions/NumericFunc/RoundFunc//K2-RoundFunc-5, EXPECTED_RESULT_GOT_SAME_RESULT
Functions/NumericFunc/RoundFunc//K2-RoundFunc-50, EXPECTED_RESULT_GOT_SAME_RESULT
Functions/NumericFunc/RoundFunc//K2-RoundFunc-51, EXPECTED_RESULT_GOT_SAME_RESULT
Functions/NumericFunc/RoundFunc//K2-RoundFunc-52, EXPECTED_RESULT_GOT_SAME_RESULT
@@ -15282,7 +15282,7 @@ Functions/NumericFunc/RoundFunc//K2-RoundFunc-56, EXPECTED_RESULT_GOT_SAME_RESUL
Functions/NumericFunc/RoundFunc//K2-RoundFunc-57, EXPECTED_RESULT_GOT_SAME_RESULT
Functions/NumericFunc/RoundFunc//K2-RoundFunc-58, EXPECTED_RESULT_GOT_SAME_RESULT
Functions/NumericFunc/RoundFunc//K2-RoundFunc-59, EXPECTED_RESULT_GOT_SAME_RESULT
-Functions/NumericFunc/RoundFunc//K2-RoundFunc-6, EXPECTED_RESULT_GOT_ERROR
+Functions/NumericFunc/RoundFunc//K2-RoundFunc-6, EXPECTED_RESULT_GOT_SAME_RESULT
Functions/NumericFunc/RoundFunc//K2-RoundFunc-60, EXPECTED_RESULT_GOT_SAME_RESULT
Functions/NumericFunc/RoundFunc//K2-RoundFunc-61, EXPECTED_RESULT_GOT_SAME_RESULT
Functions/NumericFunc/RoundFunc//K2-RoundFunc-62, EXPECTED_RESULT_GOT_SAME_RESULT
@@ -15293,7 +15293,7 @@ Functions/NumericFunc/RoundFunc//K2-RoundFunc-66, EXPECTED_RESULT_GOT_SAME_RESUL
Functions/NumericFunc/RoundFunc//K2-RoundFunc-67, EXPECTED_RESULT_GOT_SAME_RESULT
Functions/NumericFunc/RoundFunc//K2-RoundFunc-68, EXPECTED_RESULT_GOT_SAME_RESULT
Functions/NumericFunc/RoundFunc//K2-RoundFunc-69, EXPECTED_RESULT_GOT_SAME_RESULT
-Functions/NumericFunc/RoundFunc//K2-RoundFunc-7, EXPECTED_RESULT_GOT_ERROR
+Functions/NumericFunc/RoundFunc//K2-RoundFunc-7, EXPECTED_RESULT_GOT_SAME_RESULT
Functions/NumericFunc/RoundFunc//K2-RoundFunc-70, EXPECTED_RESULT_GOT_SAME_RESULT
Functions/NumericFunc/RoundFunc//K2-RoundFunc-71, EXPECTED_RESULT_GOT_SAME_RESULT
Functions/NumericFunc/RoundFunc//K2-RoundFunc-72, EXPECTED_RESULT_GOT_SAME_RESULT
@@ -15304,7 +15304,7 @@ Functions/NumericFunc/RoundFunc//K2-RoundFunc-76, EXPECTED_RESULT_GOT_SAME_RESUL
Functions/NumericFunc/RoundFunc//K2-RoundFunc-77, EXPECTED_RESULT_GOT_SAME_RESULT
Functions/NumericFunc/RoundFunc//K2-RoundFunc-78, EXPECTED_RESULT_GOT_SAME_RESULT
Functions/NumericFunc/RoundFunc//K2-RoundFunc-79, EXPECTED_RESULT_GOT_SAME_RESULT
-Functions/NumericFunc/RoundFunc//K2-RoundFunc-8, EXPECTED_RESULT_GOT_ERROR
+Functions/NumericFunc/RoundFunc//K2-RoundFunc-8, EXPECTED_RESULT_GOT_SAME_RESULT
Functions/NumericFunc/RoundFunc//K2-RoundFunc-80, EXPECTED_RESULT_GOT_SAME_RESULT
Functions/NumericFunc/RoundFunc//K2-RoundFunc-81, EXPECTED_RESULT_GOT_SAME_RESULT
Functions/NumericFunc/RoundFunc//K2-RoundFunc-82, EXPECTED_RESULT_GOT_SAME_RESULT
@@ -15315,7 +15315,7 @@ Functions/NumericFunc/RoundFunc//K2-RoundFunc-86, EXPECTED_RESULT_GOT_SAME_RESUL
Functions/NumericFunc/RoundFunc//K2-RoundFunc-87, EXPECTED_RESULT_GOT_SAME_RESULT
Functions/NumericFunc/RoundFunc//K2-RoundFunc-88, EXPECTED_RESULT_GOT_SAME_RESULT
Functions/NumericFunc/RoundFunc//K2-RoundFunc-89, EXPECTED_RESULT_GOT_SAME_RESULT
-Functions/NumericFunc/RoundFunc//K2-RoundFunc-9, EXPECTED_RESULT_GOT_ERROR
+Functions/NumericFunc/RoundFunc//K2-RoundFunc-9, EXPECTED_RESULT_GOT_SAME_RESULT
Functions/NumericFunc/RoundFunc//K2-RoundFunc-90, EXPECTED_RESULT_GOT_SAME_RESULT
Functions/NumericFunc/RoundFunc//K2-RoundFunc-91, EXPECTED_RESULT_GOT_SAME_RESULT
Functions/NumericFunc/RoundFunc//K2-RoundFunc-92, EXPECTED_RESULT_GOT_SAME_RESULT
@@ -15866,7 +15866,7 @@ Functions/SeqFunc/AggregateSeqFunc/SeqMAXFunc//K2-SeqMAXFunc-3, EXPECTED_RESULT_
Functions/SeqFunc/AggregateSeqFunc/SeqMAXFunc//K2-SeqMAXFunc-4, EXPECTED_ERROR_GOT_RESULT
Functions/SeqFunc/AggregateSeqFunc/SeqMAXFunc//K2-SeqMAXFunc-5, EXPECTED_ERROR_GOT_SAME_ERROR
Functions/SeqFunc/AggregateSeqFunc/SeqMAXFunc//K2-SeqMAXFunc-6, EXPECTED_ERROR_GOT_RESULT
-Functions/SeqFunc/AggregateSeqFunc/SeqMAXFunc//K2-SeqMAXFunc-7, EXPECTED_RESULT_GOT_ERROR
+Functions/SeqFunc/AggregateSeqFunc/SeqMAXFunc//K2-SeqMAXFunc-7, EXPECTED_RESULT_GOT_SAME_RESULT
Functions/SeqFunc/AggregateSeqFunc/SeqMAXFunc//fn-max-1, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
Functions/SeqFunc/AggregateSeqFunc/SeqMAXFunc//fn-max-10, EXPECTED_RESULT_GOT_FAILURE
Functions/SeqFunc/AggregateSeqFunc/SeqMAXFunc//fn-max-2, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
@@ -16038,7 +16038,7 @@ Functions/SeqFunc/AggregateSeqFunc/SeqMINFunc//K2-SeqMINFunc-11, EXPECTED_RESULT
Functions/SeqFunc/AggregateSeqFunc/SeqMINFunc//K2-SeqMINFunc-12, EXPECTED_RESULT_GOT_SAME_RESULT
Functions/SeqFunc/AggregateSeqFunc/SeqMINFunc//K2-SeqMINFunc-13, EXPECTED_RESULT_GOT_SAME_RESULT
Functions/SeqFunc/AggregateSeqFunc/SeqMINFunc//K2-SeqMINFunc-14, EXPECTED_RESULT_GOT_SAME_RESULT
-Functions/SeqFunc/AggregateSeqFunc/SeqMINFunc//K2-SeqMINFunc-15, EXPECTED_RESULT_GOT_ERROR
+Functions/SeqFunc/AggregateSeqFunc/SeqMINFunc//K2-SeqMINFunc-15, EXPECTED_RESULT_GOT_SAME_RESULT
Functions/SeqFunc/AggregateSeqFunc/SeqMINFunc//K2-SeqMINFunc-2, EXPECTED_RESULT_GOT_SAME_RESULT
Functions/SeqFunc/AggregateSeqFunc/SeqMINFunc//K2-SeqMINFunc-3, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Functions/SeqFunc/AggregateSeqFunc/SeqMINFunc//K2-SeqMINFunc-4, EXPECTED_ERROR_GOT_RESULT
@@ -16197,7 +16197,7 @@ Functions/SeqFunc/AggregateSeqFunc/SeqSUMFunc//K-SeqSUMFunc-9, EXPECTED_RESULT_G
Functions/SeqFunc/AggregateSeqFunc/SeqSUMFunc//K2-SeqSUMFunc-1, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Functions/SeqFunc/AggregateSeqFunc/SeqSUMFunc//K2-SeqSUMFunc-2, EXPECTED_RESULT_GOT_SAME_RESULT
Functions/SeqFunc/AggregateSeqFunc/SeqSUMFunc//K2-SeqSUMFunc-3, EXPECTED_RESULT_GOT_SAME_RESULT
-Functions/SeqFunc/AggregateSeqFunc/SeqSUMFunc//K2-SeqSUMFunc-4, EXPECTED_RESULT_GOT_ERROR
+Functions/SeqFunc/AggregateSeqFunc/SeqSUMFunc//K2-SeqSUMFunc-4, EXPECTED_RESULT_GOT_SAME_RESULT
Functions/SeqFunc/AggregateSeqFunc/SeqSUMFunc//fn-sum-1, EXPECTED_RESULT_GOT_SAME_RESULT
Functions/SeqFunc/AggregateSeqFunc/SeqSUMFunc//fn-sum-10, EXPECTED_ERROR_GOT_RESULT
Functions/SeqFunc/AggregateSeqFunc/SeqSUMFunc//fn-sum-2, EXPECTED_RESULT_GOT_SAME_RESULT
[05/50] [abbrv] vxquery git commit: Unnesting rule and code additions
to support XMark Query 8.
Posted by sj...@apache.org.
http://git-wip-us.apache.org/repos/asf/vxquery/blob/7fc0d93b/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/XTestOptions.java
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/XTestOptions.java b/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/XTestOptions.java
index 53403f2..80fdd65 100644
--- a/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/XTestOptions.java
+++ b/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/XTestOptions.java
@@ -17,63 +17,63 @@ package org.apache.vxquery.xtest;
import org.kohsuke.args4j.Option;
public class XTestOptions {
- @Option(name = "-O", required = false, usage = "Optimization level")
+ @Option(name = "-O", required = false, usage = "Optimization level. (default: Full Optimization)")
int optimizationLevel = Integer.MAX_VALUE;
- @Option(name = "-frameSize", required = false, usage = "Setting frame size")
+ @Option(name = "-frame-size", required = false, usage = "Setting frame size. (default: 65,536)")
int frameSize = 65536;
- @Option(name = "-port", required = false, usage = "Port for web server to listen on")
+ @Option(name = "-port", required = false, usage = "Port for web server to listen on.")
int port;
- @Option(name = "-catalog", required = true, usage = "Test catalog XML")
+ @Option(name = "-catalog", required = true, usage = "Test catalog XML.")
String catalog;
- @Option(name = "-threads", required = false, usage = "Number of threads")
+ @Option(name = "-threads", required = false, usage = "Number of threads. (default: 1)")
int threads;
- @Option(name = "-include", required = false, usage = "Include filter regular expression")
+ @Option(name = "-include", required = false, usage = "Include filter regular expression.")
String include;
- @Option(name = "-exclude", required = false, usage = "Exclude filter regular expression")
+ @Option(name = "-exclude", required = false, usage = "Exclude filter regular expression.")
String exclude;
- @Option(name = "-previous-test-results", required = false, usage = "File path to previous test results (text report output file)")
+ @Option(name = "-previous-test-results", required = false, usage = "File path to previous test results. (text report output file)")
String previousTestResults;
@Option(name = "-v", required = false, usage = "Verbose")
boolean verbose;
- @Option(name = "-keepalive", required = false, usage = "Milliseconds to keep server alive after tests have completed")
+ @Option(name = "-keepalive", required = false, usage = "Milliseconds to keep server alive after tests have completed.")
long keepalive;
- @Option(name = "-textreport", required = false, usage = "Text report output file")
+ @Option(name = "-textreport", required = false, usage = "Text report output file.")
String diffable;
- @Option(name = "-xmlreport", required = false, usage = "XML report output file")
+ @Option(name = "-xmlreport", required = false, usage = "XML report output file.")
String xmlReport;
- @Option(name = "-htmlreport", required = false, usage = "HTML report output file")
+ @Option(name = "-htmlreport", required = false, usage = "HTML report output file.")
String htmlReport;
- @Option(name = "-showquery", usage = "Show query string")
+ @Option(name = "-showquery", usage = "Show query string.")
boolean showQuery;
- @Option(name = "-showast", usage = "Show abstract syntax tree")
+ @Option(name = "-showast", usage = "Show abstract syntax tree.")
boolean showAST;
- @Option(name = "-showtet", usage = "Show translated expression tree")
+ @Option(name = "-showtet", usage = "Show translated expression tree.")
boolean showTET;
- @Option(name = "-showoet", usage = "Show optimized expression tree")
+ @Option(name = "-showoet", usage = "Show optimized expression tree.")
boolean showOET;
- @Option(name = "-showrp", usage = "Show runtime plan")
+ @Option(name = "-showrp", usage = "Show runtime plan.")
boolean showRP;
- @Option(name = "-compileonly", usage = "Compile the query and stop")
+ @Option(name = "-compileonly", usage = "Compile the query and stop.")
boolean compileOnly;
- @Option(name = "-showresult", usage = "Show query result")
+ @Option(name = "-showresult", usage = "Show query result.")
boolean showResult;
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/vxquery/blob/7fc0d93b/vxquery-xtest/src/test/java/org/apache/vxquery/xtest/AbstractXQueryTest.java
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/java/org/apache/vxquery/xtest/AbstractXQueryTest.java b/vxquery-xtest/src/test/java/org/apache/vxquery/xtest/AbstractXQueryTest.java
index 9cae8e8..12a91a9 100644
--- a/vxquery-xtest/src/test/java/org/apache/vxquery/xtest/AbstractXQueryTest.java
+++ b/vxquery-xtest/src/test/java/org/apache/vxquery/xtest/AbstractXQueryTest.java
@@ -30,7 +30,7 @@ public abstract class AbstractXQueryTest {
private TestRunner tr;
protected abstract XTestOptions getTestOptions();
-
+
protected static XTestOptions getDefaultTestOptions() {
XTestOptions opts = new XTestOptions();
opts.verbose = false;
@@ -40,10 +40,6 @@ public abstract class AbstractXQueryTest {
return opts;
}
- protected static void setCatalogToTestOptions(XTestOptions opts, String catalog) {
- opts.catalog = catalog;
- }
-
public AbstractXQueryTest(TestCase tc) throws Exception {
this.tc = tc;
tr = new TestRunner(getTestOptions());
http://git-wip-us.apache.org/repos/asf/vxquery/blob/7fc0d93b/vxquery-xtest/src/test/java/org/apache/vxquery/xtest/VXQueryTest.java
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/java/org/apache/vxquery/xtest/VXQueryTest.java b/vxquery-xtest/src/test/java/org/apache/vxquery/xtest/VXQueryTest.java
index 91adbbf..3704d07 100644
--- a/vxquery-xtest/src/test/java/org/apache/vxquery/xtest/VXQueryTest.java
+++ b/vxquery-xtest/src/test/java/org/apache/vxquery/xtest/VXQueryTest.java
@@ -25,7 +25,7 @@ import org.junit.runners.Parameterized;
import org.junit.runners.Parameterized.Parameters;
@RunWith(Parameterized.class)
-public class VXQueryTest extends AbstractXQueryTest{
+public class VXQueryTest extends AbstractXQueryTest {
private static String VXQUERY_CATALOG = StringUtils.join(new String[] { "src", "test", "resources",
"VXQueryCatalog.xml" }, File.separator);
@@ -43,7 +43,7 @@ public class VXQueryTest extends AbstractXQueryTest{
public static XTestOptions getOptions() {
XTestOptions options = getDefaultTestOptions();
- setCatalogToTestOptions(options, VXQUERY_CATALOG);
+ options.catalog = VXQUERY_CATALOG;
return options;
}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/7fc0d93b/vxquery-xtest/src/test/java/org/apache/vxquery/xtest/VXQueryXMarkTest.java
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/java/org/apache/vxquery/xtest/VXQueryXMarkTest.java b/vxquery-xtest/src/test/java/org/apache/vxquery/xtest/VXQueryXMarkTest.java
new file mode 100644
index 0000000..ac35a0c
--- /dev/null
+++ b/vxquery-xtest/src/test/java/org/apache/vxquery/xtest/VXQueryXMarkTest.java
@@ -0,0 +1,55 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements. See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You under the Apache License, Version 2.0
+* (the "License"); you may not use this file except in compliance with
+* the License. You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+package org.apache.vxquery.xtest;
+
+import java.io.File;
+import java.util.Collection;
+
+import org.apache.commons.lang3.StringUtils;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.junit.runners.Parameterized.Parameters;
+
+@RunWith(Parameterized.class)
+public class VXQueryXMarkTest extends AbstractXQueryTest {
+
+ private static String VXQUERY_XMARK_CATALOG = StringUtils.join(new String[] { "src", "test", "resources",
+ "VXQueryXMarkCatalog.xml" }, File.separator);
+
+ public VXQueryXMarkTest(TestCase tc) throws Exception {
+ super(tc);
+ }
+
+ @Parameters
+ public static Collection<Object[]> tests() throws Exception {
+ JUnitTestCaseFactory jtcf_vxquery = new JUnitTestCaseFactory(getOptions());
+ Collection<Object[]> tests = jtcf_vxquery.getList();
+ return tests;
+ }
+
+ public static XTestOptions getOptions() {
+ XTestOptions options = getDefaultTestOptions();
+ options.catalog = VXQUERY_XMARK_CATALOG;
+ return options;
+ }
+
+ @Override
+ protected XTestOptions getTestOptions() {
+ return getOptions();
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/7fc0d93b/vxquery-xtest/src/test/java/org/apache/vxquery/xtest/XMarkTest.java
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/java/org/apache/vxquery/xtest/XMarkTest.java b/vxquery-xtest/src/test/java/org/apache/vxquery/xtest/XMarkTest.java
index 0e7838f..0753a79 100644
--- a/vxquery-xtest/src/test/java/org/apache/vxquery/xtest/XMarkTest.java
+++ b/vxquery-xtest/src/test/java/org/apache/vxquery/xtest/XMarkTest.java
@@ -28,7 +28,7 @@ import org.junit.runners.Parameterized.Parameters;
public class XMarkTest extends AbstractXQueryTest {
private static String XMARK_CATALOG = StringUtils.join(new String[] { "src", "test", "resources",
- "VXQueryXMarkCatalog.xml" }, File.separator);
+ "XMarkCatalog.xml" }, File.separator);
public XMarkTest(TestCase tc) throws Exception {
super(tc);
@@ -43,7 +43,8 @@ public class XMarkTest extends AbstractXQueryTest {
public static XTestOptions getOptions() {
XTestOptions options = getDefaultTestOptions();
- setCatalogToTestOptions(options, XMARK_CATALOG);
+ options.catalog = XMARK_CATALOG;
+ options.frameSize = (int) Math.pow(2, 23);
return options;
}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/7fc0d93b/vxquery-xtest/src/test/java/org/apache/vxquery/xtest/XQTSTest.java
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/java/org/apache/vxquery/xtest/XQTSTest.java b/vxquery-xtest/src/test/java/org/apache/vxquery/xtest/XQTSTest.java
index 68f00a3..0dc356b 100644
--- a/vxquery-xtest/src/test/java/org/apache/vxquery/xtest/XQTSTest.java
+++ b/vxquery-xtest/src/test/java/org/apache/vxquery/xtest/XQTSTest.java
@@ -43,7 +43,7 @@ public class XQTSTest extends AbstractXQueryTest {
public static XTestOptions getOptions() {
XTestOptions options = getDefaultTestOptions();
- setCatalogToTestOptions(options, XQTS_CATALOG);
+ options.catalog = XQTS_CATALOG;
options.previousTestResults = StringUtils.join(new String[] { "results", "xqts.txt" }, File.separator);
return options;
}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/7fc0d93b/vxquery-xtest/src/test/resources/Queries/XQuery/XMark/Modified/q08.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/Queries/XQuery/XMark/Modified/q08.xq b/vxquery-xtest/src/test/resources/Queries/XQuery/XMark/Modified/q08.xq
index 1f0045a..dc1af0e 100644
--- a/vxquery-xtest/src/test/resources/Queries/XQuery/XMark/Modified/q08.xq
+++ b/vxquery-xtest/src/test/resources/Queries/XQuery/XMark/Modified/q08.xq
@@ -22,7 +22,7 @@ for $p in collection($collection1)/site/people/person
let $a := count(
let $collection2 := "closed_auctions"
for $t in collection($collection2)/site/closed_auctions/closed_auction
- where $t/buyer/@person = $p/@id
+ where $t/buyer/@person eq $p/@id
return $t
)
return <item person="{$p/name/text()}">{$a}</item>
[27/50] [abbrv] vxquery git commit: Updated the XQTS stored results.
Posted by sj...@apache.org.
http://git-wip-us.apache.org/repos/asf/vxquery/blob/bf8ab735/vxquery-xtest/results/xqts.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/results/xqts.txt b/vxquery-xtest/results/xqts.txt
index 8054c36..0431f9a 100644
--- a/vxquery-xtest/results/xqts.txt
+++ b/vxquery-xtest/results/xqts.txt
@@ -50,13 +50,13 @@ Basics/Types/SequenceTypeSyntax//sequence-type-6, EXPECTED_RESULT_GOT_SAME_RESUL
Basics/Types/SequenceTypeSyntax//sequence-type-7, EXPECTED_RESULT_GOT_SAME_RESULT
Basics/Types/SequenceTypeSyntax//sequence-type-8, EXPECTED_RESULT_GOT_SAME_RESULT
Basics/Types/SequenceTypeSyntax//sequence-type-9, EXPECTED_RESULT_GOT_SAME_RESULT
-Catalog//Catalog001, EXPECTED_RESULT_GOT_FAILURE
+Catalog//Catalog001, EXPECTED_RESULT_GOT_ERROR
Catalog//Catalog002, EXPECTED_RESULT_GOT_FAILURE
Catalog//Catalog003, EXPECTED_RESULT_GOT_FAILURE
CondExpr//K2-CondExpr-1, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
CondExpr//K2-CondExpr-2, EXPECTED_RESULT_GOT_ERROR
CondExpr//K2-CondExpr-3, EXPECTED_RESULT_GOT_ERROR
-CondExpr//K2-CondExpr-4, EXPECTED_RESULT_GOT_FAILURE
+CondExpr//K2-CondExpr-4, EXPECTED_RESULT_GOT_ERROR
CondExpr//K2-CondExpr-5, EXPECTED_ERROR_GOT_SAME_ERROR
CondExpr//K2-CondExpr-6, EXPECTED_ERROR_GOT_SAME_ERROR
CondExpr//K2-CondExpr-7, EXPECTED_RESULT_GOT_SAME_RESULT
@@ -102,7 +102,7 @@ Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-44, EXPECTED_ERROR_GOT_RE
Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-45, EXPECTED_ERROR_GOT_RESULT
Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-46, EXPECTED_ERROR_GOT_RESULT
Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-47, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-48, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
+Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-48, EXPECTED_ERROR_GOT_RESULT
Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-49, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-5, EXPECTED_ERROR_GOT_SAME_ERROR
Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-50, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
@@ -163,8 +163,8 @@ Construct/ComputeCon/ComputeConPI//K2-ComputeConPI-4, EXPECTED_RESULT_GOT_ERROR
Construct/ComputeCon/ComputeConPI//K2-ComputeConPI-5, EXPECTED_RESULT_GOT_ERROR
Construct/ComputeCon/ComputeConPI//K2-ComputeConPI-6, EXPECTED_ERROR_GOT_RESULT
Construct/ComputeCon/ComputeConPI//K2-ComputeConPI-7, EXPECTED_ERROR_GOT_RESULT
-Construct/ComputeCon/ComputeConPI//K2-ComputeConPI-8, EXPECTED_RESULT_GOT_ERROR
-Construct/ComputeCon/ComputeConPI//K2-ComputeConPI-9, EXPECTED_RESULT_GOT_ERROR
+Construct/ComputeCon/ComputeConPI//K2-ComputeConPI-8, EXPECTED_RESULT_GOT_SAME_RESULT
+Construct/ComputeCon/ComputeConPI//K2-ComputeConPI-9, EXPECTED_RESULT_GOT_SAME_RESULT
Construct/ComputeCon/ConDocNode//K2-ConDocNode-1, EXPECTED_ERROR_GOT_SAME_ERROR
Construct/ComputeCon/ConDocNode//K2-ConDocNode-10, EXPECTED_RESULT_GOT_ERROR
Construct/ComputeCon/ConDocNode//K2-ConDocNode-11, EXPECTED_RESULT_GOT_ERROR
@@ -175,20 +175,20 @@ Construct/ComputeCon/ConDocNode//K2-ConDocNode-15, EXPECTED_RESULT_GOT_ERROR
Construct/ComputeCon/ConDocNode//K2-ConDocNode-16, EXPECTED_RESULT_GOT_ERROR
Construct/ComputeCon/ConDocNode//K2-ConDocNode-17, EXPECTED_RESULT_GOT_ERROR
Construct/ComputeCon/ConDocNode//K2-ConDocNode-18, EXPECTED_RESULT_GOT_ERROR
-Construct/ComputeCon/ConDocNode//K2-ConDocNode-19, EXPECTED_RESULT_GOT_FAILURE
+Construct/ComputeCon/ConDocNode//K2-ConDocNode-19, EXPECTED_RESULT_GOT_ERROR
Construct/ComputeCon/ConDocNode//K2-ConDocNode-2, EXPECTED_ERROR_GOT_SAME_ERROR
-Construct/ComputeCon/ConDocNode//K2-ConDocNode-20, EXPECTED_RESULT_GOT_FAILURE
-Construct/ComputeCon/ConDocNode//K2-ConDocNode-21, EXPECTED_RESULT_GOT_FAILURE
-Construct/ComputeCon/ConDocNode//K2-ConDocNode-22, EXPECTED_RESULT_GOT_FAILURE
+Construct/ComputeCon/ConDocNode//K2-ConDocNode-20, EXPECTED_RESULT_GOT_ERROR
+Construct/ComputeCon/ConDocNode//K2-ConDocNode-21, EXPECTED_RESULT_GOT_ERROR
+Construct/ComputeCon/ConDocNode//K2-ConDocNode-22, EXPECTED_RESULT_GOT_ERROR
Construct/ComputeCon/ConDocNode//K2-ConDocNode-23, EXPECTED_RESULT_GOT_ERROR
-Construct/ComputeCon/ConDocNode//K2-ConDocNode-24, EXPECTED_RESULT_GOT_FAILURE
-Construct/ComputeCon/ConDocNode//K2-ConDocNode-25, EXPECTED_RESULT_GOT_FAILURE
+Construct/ComputeCon/ConDocNode//K2-ConDocNode-24, EXPECTED_RESULT_GOT_ERROR
+Construct/ComputeCon/ConDocNode//K2-ConDocNode-25, EXPECTED_RESULT_GOT_ERROR
Construct/ComputeCon/ConDocNode//K2-ConDocNode-26, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
Construct/ComputeCon/ConDocNode//K2-ConDocNode-27, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
Construct/ComputeCon/ConDocNode//K2-ConDocNode-28, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
Construct/ComputeCon/ConDocNode//K2-ConDocNode-29, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
Construct/ComputeCon/ConDocNode//K2-ConDocNode-3, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
-Construct/ComputeCon/ConDocNode//K2-ConDocNode-30, EXPECTED_RESULT_GOT_FAILURE
+Construct/ComputeCon/ConDocNode//K2-ConDocNode-30, EXPECTED_RESULT_GOT_ERROR
Construct/ComputeCon/ConDocNode//K2-ConDocNode-31, EXPECTED_RESULT_GOT_ERROR
Construct/ComputeCon/ConDocNode//K2-ConDocNode-32, EXPECTED_RESULT_GOT_ERROR
Construct/ComputeCon/ConDocNode//K2-ConDocNode-4, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
@@ -203,9 +203,9 @@ Construct/ComputeCon/ConText//K2-ConText-11, EXPECTED_ERROR_GOT_SAME_ERROR
Construct/ComputeCon/ConText//K2-ConText-12, EXPECTED_ERROR_GOT_SAME_ERROR
Construct/ComputeCon/ConText//K2-ConText-13, EXPECTED_ERROR_GOT_SAME_ERROR
Construct/ComputeCon/ConText//K2-ConText-14, EXPECTED_RESULT_GOT_SAME_RESULT
-Construct/ComputeCon/ConText//K2-ConText-15, EXPECTED_RESULT_GOT_ERROR
+Construct/ComputeCon/ConText//K2-ConText-15, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Construct/ComputeCon/ConText//K2-ConText-2, EXPECTED_ERROR_GOT_SAME_ERROR
-Construct/ComputeCon/ConText//K2-ConText-3, EXPECTED_RESULT_GOT_ERROR
+Construct/ComputeCon/ConText//K2-ConText-3, EXPECTED_RESULT_GOT_SAME_RESULT
Construct/ComputeCon/ConText//K2-ConText-4, EXPECTED_RESULT_GOT_ERROR
Construct/ComputeCon/ConText//K2-ConText-5, EXPECTED_ERROR_GOT_SAME_ERROR
Construct/ComputeCon/ConText//K2-ConText-6, EXPECTED_RESULT_GOT_SAME_RESULT
@@ -213,7 +213,7 @@ Construct/ComputeCon/ConText//K2-ConText-7, EXPECTED_RESULT_GOT_SAME_RESULT
Construct/ComputeCon/ConText//K2-ConText-8, EXPECTED_RESULT_GOT_SAME_RESULT
Construct/ComputeCon/ConText//K2-ConText-9, EXPECTED_RESULT_GOT_SAME_RESULT
Construct/ConInScopeNamespace//K2-ConInScopeNamespace-1, EXPECTED_RESULT_GOT_ERROR
-Construct/DirectConElem//K2-DirectConElem-1, EXPECTED_RESULT_GOT_ERROR
+Construct/DirectConElem//K2-DirectConElem-1, EXPECTED_RESULT_GOT_SAME_RESULT
Construct/DirectConElem//K2-DirectConElem-10, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
Construct/DirectConElem//K2-DirectConElem-11, EXPECTED_ERROR_GOT_SAME_ERROR
Construct/DirectConElem//K2-DirectConElem-12, EXPECTED_ERROR_GOT_SAME_ERROR
@@ -224,7 +224,7 @@ Construct/DirectConElem//K2-DirectConElem-16, EXPECTED_ERROR_GOT_SAME_ERROR
Construct/DirectConElem//K2-DirectConElem-17, EXPECTED_ERROR_GOT_SAME_ERROR
Construct/DirectConElem//K2-DirectConElem-18, EXPECTED_ERROR_GOT_SAME_ERROR
Construct/DirectConElem//K2-DirectConElem-19, EXPECTED_ERROR_GOT_SAME_ERROR
-Construct/DirectConElem//K2-DirectConElem-2, EXPECTED_RESULT_GOT_ERROR
+Construct/DirectConElem//K2-DirectConElem-2, EXPECTED_RESULT_GOT_SAME_RESULT
Construct/DirectConElem//K2-DirectConElem-20, EXPECTED_ERROR_GOT_SAME_ERROR
Construct/DirectConElem//K2-DirectConElem-21, EXPECTED_ERROR_GOT_SAME_ERROR
Construct/DirectConElem//K2-DirectConElem-22, EXPECTED_ERROR_GOT_SAME_ERROR
@@ -251,10 +251,10 @@ Construct/DirectConElem//K2-DirectConElem-40, EXPECTED_ERROR_GOT_RESULT
Construct/DirectConElem//K2-DirectConElem-41, EXPECTED_ERROR_GOT_RESULT
Construct/DirectConElem//K2-DirectConElem-42, EXPECTED_RESULT_GOT_ERROR
Construct/DirectConElem//K2-DirectConElem-43, EXPECTED_RESULT_GOT_ERROR
-Construct/DirectConElem//K2-DirectConElem-44, EXPECTED_RESULT_GOT_ERROR
+Construct/DirectConElem//K2-DirectConElem-44, EXPECTED_RESULT_GOT_SAME_RESULT
Construct/DirectConElem//K2-DirectConElem-45, EXPECTED_RESULT_GOT_SAME_RESULT
Construct/DirectConElem//K2-DirectConElem-46, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Construct/DirectConElem//K2-DirectConElem-47, EXPECTED_ERROR_GOT_FAILURE
+Construct/DirectConElem//K2-DirectConElem-47, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
Construct/DirectConElem//K2-DirectConElem-48, EXPECTED_RESULT_GOT_SAME_RESULT
Construct/DirectConElem//K2-DirectConElem-49, EXPECTED_RESULT_GOT_SAME_RESULT
Construct/DirectConElem//K2-DirectConElem-5, EXPECTED_ERROR_GOT_SAME_ERROR
@@ -290,18 +290,18 @@ Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-25, EXPECTED_ERR
Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-26, EXPECTED_ERROR_GOT_SAME_ERROR
Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-27, EXPECTED_ERROR_GOT_SAME_ERROR
Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-28, EXPECTED_ERROR_GOT_SAME_ERROR
-Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-29, EXPECTED_RESULT_GOT_ERROR
+Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-29, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-3, EXPECTED_ERROR_GOT_SAME_ERROR
-Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-30, EXPECTED_RESULT_GOT_ERROR
-Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-31, EXPECTED_RESULT_GOT_ERROR
-Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-32, EXPECTED_RESULT_GOT_ERROR
+Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-30, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-31, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-32, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-33, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-34, EXPECTED_RESULT_GOT_ERROR
+Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-34, EXPECTED_RESULT_GOT_SAME_RESULT
Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-35, EXPECTED_RESULT_GOT_ERROR
-Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-36, EXPECTED_RESULT_GOT_ERROR
+Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-36, EXPECTED_RESULT_GOT_SAME_RESULT
Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-37, EXPECTED_RESULT_GOT_ERROR
Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-38, EXPECTED_RESULT_GOT_ERROR
-Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-39, EXPECTED_RESULT_GOT_ERROR
+Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-39, EXPECTED_RESULT_GOT_SAME_RESULT
Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-4, EXPECTED_ERROR_GOT_SAME_ERROR
Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-40, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-41, EXPECTED_RESULT_GOT_FAILURE
@@ -309,8 +309,8 @@ Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-42, EXPECTED_RES
Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-43, EXPECTED_RESULT_GOT_SAME_RESULT
Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-44, EXPECTED_RESULT_GOT_ERROR
Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-45, EXPECTED_RESULT_GOT_ERROR
-Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-46, EXPECTED_RESULT_GOT_FAILURE
-Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-47, EXPECTED_RESULT_GOT_FAILURE
+Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-46, EXPECTED_RESULT_GOT_ERROR
+Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-47, EXPECTED_RESULT_GOT_SAME_RESULT
Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-48, EXPECTED_ERROR_GOT_SAME_ERROR
Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-49, EXPECTED_RESULT_GOT_SAME_RESULT
Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-5, EXPECTED_RESULT_GOT_SAME_RESULT
@@ -362,14 +362,14 @@ Construct/DirectConElem/DirectConElemContent//K2-DirectConElemContent-21, EXPECT
Construct/DirectConElem/DirectConElemContent//K2-DirectConElemContent-22, EXPECTED_ERROR_GOT_SAME_ERROR
Construct/DirectConElem/DirectConElemContent//K2-DirectConElemContent-23, EXPECTED_ERROR_GOT_SAME_ERROR
Construct/DirectConElem/DirectConElemContent//K2-DirectConElemContent-24, EXPECTED_ERROR_GOT_SAME_ERROR
-Construct/DirectConElem/DirectConElemContent//K2-DirectConElemContent-25, EXPECTED_RESULT_GOT_ERROR
+Construct/DirectConElem/DirectConElemContent//K2-DirectConElemContent-25, EXPECTED_RESULT_GOT_SAME_RESULT
Construct/DirectConElem/DirectConElemContent//K2-DirectConElemContent-26, EXPECTED_ERROR_GOT_SAME_ERROR
-Construct/DirectConElem/DirectConElemContent//K2-DirectConElemContent-27, EXPECTED_RESULT_GOT_ERROR
-Construct/DirectConElem/DirectConElemContent//K2-DirectConElemContent-28, EXPECTED_RESULT_GOT_ERROR
+Construct/DirectConElem/DirectConElemContent//K2-DirectConElemContent-27, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+Construct/DirectConElem/DirectConElemContent//K2-DirectConElemContent-28, EXPECTED_RESULT_GOT_SAME_RESULT
Construct/DirectConElem/DirectConElemContent//K2-DirectConElemContent-29, EXPECTED_RESULT_GOT_SAME_RESULT
Construct/DirectConElem/DirectConElemContent//K2-DirectConElemContent-3, EXPECTED_ERROR_GOT_FAILURE
Construct/DirectConElem/DirectConElemContent//K2-DirectConElemContent-30, EXPECTED_RESULT_GOT_SAME_RESULT
-Construct/DirectConElem/DirectConElemContent//K2-DirectConElemContent-31, EXPECTED_RESULT_GOT_ERROR
+Construct/DirectConElem/DirectConElemContent//K2-DirectConElemContent-31, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Construct/DirectConElem/DirectConElemContent//K2-DirectConElemContent-32, EXPECTED_RESULT_GOT_SAME_RESULT
Construct/DirectConElem/DirectConElemContent//K2-DirectConElemContent-33, EXPECTED_RESULT_GOT_SAME_RESULT
Construct/DirectConElem/DirectConElemContent//K2-DirectConElemContent-34, EXPECTED_RESULT_GOT_ERROR
@@ -436,8 +436,8 @@ Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-41, EX
Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-42, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-43, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-44, EXPECTED_ERROR_GOT_SAME_ERROR
-Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-45, EXPECTED_RESULT_GOT_FAILURE
-Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-46, EXPECTED_RESULT_GOT_FAILURE
+Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-45, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-46, EXPECTED_RESULT_GOT_SAME_RESULT
Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-47, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-48, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-49, EXPECTED_RESULT_GOT_SAME_RESULT
@@ -446,7 +446,7 @@ Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-50, EX
Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-51, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-52, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-53, EXPECTED_RESULT_GOT_ERROR
-Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-54, EXPECTED_RESULT_GOT_FAILURE
+Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-54, EXPECTED_RESULT_GOT_ERROR
Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-55, EXPECTED_RESULT_GOT_ERROR
Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-56, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-57, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
@@ -474,33 +474,33 @@ Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-78, EX
Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-79, EXPECTED_ERROR_GOT_FAILURE
Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-8, EXPECTED_ERROR_GOT_SAME_ERROR
Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-9, EXPECTED_ERROR_GOT_SAME_ERROR
-Construct/DirectConElem/DirectConElemWhitespace//K2-DirectConElemWhitespace-1, EXPECTED_RESULT_GOT_ERROR
-Construct/DirectConElem/DirectConElemWhitespace//K2-DirectConElemWhitespace-10, EXPECTED_RESULT_GOT_ERROR
-Construct/DirectConElem/DirectConElemWhitespace//K2-DirectConElemWhitespace-11, EXPECTED_RESULT_GOT_ERROR
-Construct/DirectConElem/DirectConElemWhitespace//K2-DirectConElemWhitespace-12, EXPECTED_RESULT_GOT_ERROR
-Construct/DirectConElem/DirectConElemWhitespace//K2-DirectConElemWhitespace-13, EXPECTED_RESULT_GOT_ERROR
-Construct/DirectConElem/DirectConElemWhitespace//K2-DirectConElemWhitespace-14, EXPECTED_RESULT_GOT_ERROR
+Construct/DirectConElem/DirectConElemWhitespace//K2-DirectConElemWhitespace-1, EXPECTED_RESULT_GOT_SAME_RESULT
+Construct/DirectConElem/DirectConElemWhitespace//K2-DirectConElemWhitespace-10, EXPECTED_RESULT_GOT_SAME_RESULT
+Construct/DirectConElem/DirectConElemWhitespace//K2-DirectConElemWhitespace-11, EXPECTED_RESULT_GOT_SAME_RESULT
+Construct/DirectConElem/DirectConElemWhitespace//K2-DirectConElemWhitespace-12, EXPECTED_RESULT_GOT_SAME_RESULT
+Construct/DirectConElem/DirectConElemWhitespace//K2-DirectConElemWhitespace-13, EXPECTED_RESULT_GOT_SAME_RESULT
+Construct/DirectConElem/DirectConElemWhitespace//K2-DirectConElemWhitespace-14, EXPECTED_RESULT_GOT_SAME_RESULT
Construct/DirectConElem/DirectConElemWhitespace//K2-DirectConElemWhitespace-15, EXPECTED_RESULT_GOT_SAME_RESULT
-Construct/DirectConElem/DirectConElemWhitespace//K2-DirectConElemWhitespace-16, EXPECTED_RESULT_GOT_FAILURE
-Construct/DirectConElem/DirectConElemWhitespace//K2-DirectConElemWhitespace-17, EXPECTED_RESULT_GOT_FAILURE
-Construct/DirectConElem/DirectConElemWhitespace//K2-DirectConElemWhitespace-18, EXPECTED_RESULT_GOT_ERROR
-Construct/DirectConElem/DirectConElemWhitespace//K2-DirectConElemWhitespace-19, EXPECTED_RESULT_GOT_ERROR
+Construct/DirectConElem/DirectConElemWhitespace//K2-DirectConElemWhitespace-16, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+Construct/DirectConElem/DirectConElemWhitespace//K2-DirectConElemWhitespace-17, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+Construct/DirectConElem/DirectConElemWhitespace//K2-DirectConElemWhitespace-18, EXPECTED_RESULT_GOT_SAME_RESULT
+Construct/DirectConElem/DirectConElemWhitespace//K2-DirectConElemWhitespace-19, EXPECTED_RESULT_GOT_SAME_RESULT
Construct/DirectConElem/DirectConElemWhitespace//K2-DirectConElemWhitespace-2, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Construct/DirectConElem/DirectConElemWhitespace//K2-DirectConElemWhitespace-20, EXPECTED_RESULT_GOT_SAME_RESULT
Construct/DirectConElem/DirectConElemWhitespace//K2-DirectConElemWhitespace-21, EXPECTED_RESULT_GOT_SAME_RESULT
-Construct/DirectConElem/DirectConElemWhitespace//K2-DirectConElemWhitespace-22, EXPECTED_RESULT_GOT_ERROR
-Construct/DirectConElem/DirectConElemWhitespace//K2-DirectConElemWhitespace-23, EXPECTED_RESULT_GOT_ERROR
-Construct/DirectConElem/DirectConElemWhitespace//K2-DirectConElemWhitespace-24, EXPECTED_RESULT_GOT_ERROR
-Construct/DirectConElem/DirectConElemWhitespace//K2-DirectConElemWhitespace-25, EXPECTED_RESULT_GOT_ERROR
-Construct/DirectConElem/DirectConElemWhitespace//K2-DirectConElemWhitespace-26, EXPECTED_RESULT_GOT_ERROR
-Construct/DirectConElem/DirectConElemWhitespace//K2-DirectConElemWhitespace-3, EXPECTED_RESULT_GOT_ERROR
+Construct/DirectConElem/DirectConElemWhitespace//K2-DirectConElemWhitespace-22, EXPECTED_RESULT_GOT_SAME_RESULT
+Construct/DirectConElem/DirectConElemWhitespace//K2-DirectConElemWhitespace-23, EXPECTED_RESULT_GOT_SAME_RESULT
+Construct/DirectConElem/DirectConElemWhitespace//K2-DirectConElemWhitespace-24, EXPECTED_RESULT_GOT_SAME_RESULT
+Construct/DirectConElem/DirectConElemWhitespace//K2-DirectConElemWhitespace-25, EXPECTED_RESULT_GOT_SAME_RESULT
+Construct/DirectConElem/DirectConElemWhitespace//K2-DirectConElemWhitespace-26, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+Construct/DirectConElem/DirectConElemWhitespace//K2-DirectConElemWhitespace-3, EXPECTED_RESULT_GOT_SAME_RESULT
Construct/DirectConElem/DirectConElemWhitespace//K2-DirectConElemWhitespace-4, EXPECTED_RESULT_GOT_SAME_RESULT
-Construct/DirectConElem/DirectConElemWhitespace//K2-DirectConElemWhitespace-5, EXPECTED_RESULT_GOT_ERROR
+Construct/DirectConElem/DirectConElemWhitespace//K2-DirectConElemWhitespace-5, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Construct/DirectConElem/DirectConElemWhitespace//K2-DirectConElemWhitespace-6, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Construct/DirectConElem/DirectConElemWhitespace//K2-DirectConElemWhitespace-7, EXPECTED_RESULT_GOT_ERROR
+Construct/DirectConElem/DirectConElemWhitespace//K2-DirectConElemWhitespace-7, EXPECTED_RESULT_GOT_SAME_RESULT
Construct/DirectConElem/DirectConElemWhitespace//K2-DirectConElemWhitespace-8, EXPECTED_RESULT_GOT_SAME_RESULT
-Construct/DirectConElem/DirectConElemWhitespace//K2-DirectConElemWhitespace-9, EXPECTED_RESULT_GOT_ERROR
-Construct/DirectConOther//K2-DirectConOther-1, EXPECTED_RESULT_GOT_ERROR
+Construct/DirectConElem/DirectConElemWhitespace//K2-DirectConElemWhitespace-9, EXPECTED_RESULT_GOT_SAME_RESULT
+Construct/DirectConOther//K2-DirectConOther-1, EXPECTED_RESULT_GOT_SAME_RESULT
Construct/DirectConOther//K2-DirectConOther-10, EXPECTED_ERROR_GOT_SAME_ERROR
Construct/DirectConOther//K2-DirectConOther-11, EXPECTED_ERROR_GOT_SAME_ERROR
Construct/DirectConOther//K2-DirectConOther-12, EXPECTED_ERROR_GOT_SAME_ERROR
@@ -531,22 +531,22 @@ Construct/DirectConOther//K2-DirectConOther-34, EXPECTED_RESULT_GOT_SAME_RESULT
Construct/DirectConOther//K2-DirectConOther-35, EXPECTED_RESULT_GOT_SAME_RESULT
Construct/DirectConOther//K2-DirectConOther-36, EXPECTED_RESULT_GOT_SAME_RESULT
Construct/DirectConOther//K2-DirectConOther-37, EXPECTED_RESULT_GOT_SAME_RESULT
-Construct/DirectConOther//K2-DirectConOther-38, EXPECTED_RESULT_GOT_ERROR
+Construct/DirectConOther//K2-DirectConOther-38, EXPECTED_RESULT_GOT_SAME_RESULT
Construct/DirectConOther//K2-DirectConOther-39, EXPECTED_RESULT_GOT_SAME_RESULT
Construct/DirectConOther//K2-DirectConOther-4, EXPECTED_ERROR_GOT_SAME_ERROR
-Construct/DirectConOther//K2-DirectConOther-40, EXPECTED_RESULT_GOT_ERROR
-Construct/DirectConOther//K2-DirectConOther-41, EXPECTED_RESULT_GOT_ERROR
+Construct/DirectConOther//K2-DirectConOther-40, EXPECTED_RESULT_GOT_SAME_RESULT
+Construct/DirectConOther//K2-DirectConOther-41, EXPECTED_RESULT_GOT_SAME_RESULT
Construct/DirectConOther//K2-DirectConOther-42, EXPECTED_ERROR_GOT_SAME_ERROR
Construct/DirectConOther//K2-DirectConOther-43, EXPECTED_ERROR_GOT_SAME_ERROR
Construct/DirectConOther//K2-DirectConOther-44, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Construct/DirectConOther//K2-DirectConOther-45, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Construct/DirectConOther//K2-DirectConOther-46, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Construct/DirectConOther//K2-DirectConOther-47, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Construct/DirectConOther//K2-DirectConOther-48, EXPECTED_ERROR_GOT_FAILURE
+Construct/DirectConOther//K2-DirectConOther-48, EXPECTED_ERROR_GOT_RESULT
Construct/DirectConOther//K2-DirectConOther-49, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Construct/DirectConOther//K2-DirectConOther-5, EXPECTED_ERROR_GOT_SAME_ERROR
-Construct/DirectConOther//K2-DirectConOther-50, EXPECTED_RESULT_GOT_ERROR
-Construct/DirectConOther//K2-DirectConOther-51, EXPECTED_RESULT_GOT_ERROR
+Construct/DirectConOther//K2-DirectConOther-50, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+Construct/DirectConOther//K2-DirectConOther-51, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Construct/DirectConOther//K2-DirectConOther-52, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Construct/DirectConOther//K2-DirectConOther-53, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Construct/DirectConOther//K2-DirectConOther-54, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
@@ -641,8 +641,8 @@ Expressions/Construct/ComputeCon/ComputeConAttr//Constr-compattr-id-2, EXPECTED_
Expressions/Construct/ComputeCon/ComputeConAttr//Constr-compattr-name-1, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Construct/ComputeCon/ComputeConAttr//Constr-compattr-name-2, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Expressions/Construct/ComputeCon/ComputeConAttr//Constr-compattr-name-3, EXPECTED_ERROR_GOT_SAME_ERROR
-Expressions/Construct/ComputeCon/ComputeConAttr//Constr-compattr-parent-1, EXPECTED_RESULT_GOT_FAILURE
-Expressions/Construct/ComputeCon/ComputeConAttr//Constr-compattr-string-1, EXPECTED_RESULT_GOT_ERROR
+Expressions/Construct/ComputeCon/ComputeConAttr//Constr-compattr-parent-1, EXPECTED_RESULT_GOT_ERROR
+Expressions/Construct/ComputeCon/ComputeConAttr//Constr-compattr-string-1, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Expressions/Construct/ComputeCon/ComputeConAttr//constattrerr-1, EXPECTED_ERROR_GOT_RESULT
Expressions/Construct/ComputeCon/ComputeConComment//Constr-compcomment-dash-1, EXPECTED_ERROR_GOT_RESULT
Expressions/Construct/ComputeCon/ComputeConComment//Constr-compcomment-dash-2, EXPECTED_ERROR_GOT_RESULT
@@ -663,7 +663,7 @@ Expressions/Construct/ComputeCon/ComputeConComment//Constr-compcomment-enclexpr-
Expressions/Construct/ComputeCon/ComputeConComment//Constr-compcomment-nested-1, EXPECTED_RESULT_GOT_ERROR
Expressions/Construct/ComputeCon/ComputeConComment//Constr-compcomment-nested-2, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Construct/ComputeCon/ComputeConComment//Constr-compcomment-nested-3, EXPECTED_RESULT_GOT_ERROR
-Expressions/Construct/ComputeCon/ComputeConComment//Constr-compcomment-parent-1, EXPECTED_RESULT_GOT_FAILURE
+Expressions/Construct/ComputeCon/ComputeConComment//Constr-compcomment-parent-1, EXPECTED_RESULT_GOT_ERROR
Expressions/Construct/ComputeCon/ComputeConComment//Constr-compcomment-string-1, EXPECTED_RESULT_GOT_ERROR
Expressions/Construct/ComputeCon/ComputeConElem//Constr-compelem-adjtext-1, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Construct/ComputeCon/ComputeConElem//Constr-compelem-adjtext-2, EXPECTED_RESULT_GOT_FAILURE
@@ -711,11 +711,11 @@ Expressions/Construct/ComputeCon/ComputeConElem//Constr-compelem-nested-1, EXPEC
Expressions/Construct/ComputeCon/ComputeConElem//Constr-compelem-nested-2, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Construct/ComputeCon/ComputeConElem//Constr-compelem-nodeid-1, EXPECTED_RESULT_GOT_ERROR
Expressions/Construct/ComputeCon/ComputeConElem//Constr-compelem-nodeid-2, EXPECTED_RESULT_GOT_ERROR
-Expressions/Construct/ComputeCon/ComputeConElem//Constr-compelem-nodeid-3, EXPECTED_RESULT_GOT_FAILURE
-Expressions/Construct/ComputeCon/ComputeConElem//Constr-compelem-nodeid-4, EXPECTED_RESULT_GOT_FAILURE
+Expressions/Construct/ComputeCon/ComputeConElem//Constr-compelem-nodeid-3, EXPECTED_RESULT_GOT_ERROR
+Expressions/Construct/ComputeCon/ComputeConElem//Constr-compelem-nodeid-4, EXPECTED_RESULT_GOT_ERROR
Expressions/Construct/ComputeCon/ComputeConElem//Constr-compelem-nodeid-5, EXPECTED_RESULT_GOT_ERROR
-Expressions/Construct/ComputeCon/ComputeConElem//Constr-compelem-parent-1, EXPECTED_RESULT_GOT_FAILURE
-Expressions/Construct/ComputeCon/ComputeConElem//Constr-compelem-string-1, EXPECTED_RESULT_GOT_ERROR
+Expressions/Construct/ComputeCon/ComputeConElem//Constr-compelem-parent-1, EXPECTED_RESULT_GOT_ERROR
+Expressions/Construct/ComputeCon/ComputeConElem//Constr-compelem-string-1, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Expressions/Construct/ComputeCon/ComputeConPI//Constr-comppi-compname-1, EXPECTED_ERROR_GOT_RESULT
Expressions/Construct/ComputeCon/ComputeConPI//Constr-comppi-compname-10, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Construct/ComputeCon/ComputeConPI//Constr-comppi-compname-11, EXPECTED_RESULT_GOT_SAME_RESULT
@@ -751,37 +751,37 @@ Expressions/Construct/ComputeCon/ComputeConPI//Constr-comppi-namexml-1, EXPECTED
Expressions/Construct/ComputeCon/ComputeConPI//Constr-comppi-namexml-2, EXPECTED_ERROR_GOT_RESULT
Expressions/Construct/ComputeCon/ComputeConPI//Constr-comppi-namexml-3, EXPECTED_ERROR_GOT_RESULT
Expressions/Construct/ComputeCon/ComputeConPI//Constr-comppi-namexml-4, EXPECTED_ERROR_GOT_RESULT
-Expressions/Construct/ComputeCon/ComputeConPI//Constr-comppi-parent-1, EXPECTED_RESULT_GOT_FAILURE
+Expressions/Construct/ComputeCon/ComputeConPI//Constr-comppi-parent-1, EXPECTED_RESULT_GOT_ERROR
Expressions/Construct/ComputeCon/ComputeConPI//Constr-comppi-space-1, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Expressions/Construct/ComputeCon/ComputeConPI//Constr-comppi-space-2, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Expressions/Construct/ComputeCon/ComputeConPI//Constr-comppi-space-3, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Expressions/Construct/ComputeCon/ComputeConPI//Constr-comppi-space-4, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/Construct/ComputeCon/ComputeConPI//Constr-comppi-string-1, EXPECTED_RESULT_GOT_ERROR
+Expressions/Construct/ComputeCon/ComputeConPI//Constr-comppi-string-1, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Expressions/Construct/ComputeCon/ConDocNode//Constr-docnode-adjtext-1, EXPECTED_RESULT_GOT_ERROR
Expressions/Construct/ComputeCon/ConDocNode//Constr-docnode-adjtext-2, EXPECTED_RESULT_GOT_ERROR
Expressions/Construct/ComputeCon/ConDocNode//Constr-docnode-adjtext-3, EXPECTED_RESULT_GOT_ERROR
Expressions/Construct/ComputeCon/ConDocNode//Constr-docnode-attr-1, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
Expressions/Construct/ComputeCon/ConDocNode//Constr-docnode-attr-2, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
Expressions/Construct/ComputeCon/ConDocNode//Constr-docnode-attr-3, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
-Expressions/Construct/ComputeCon/ConDocNode//Constr-docnode-constrmod-1, EXPECTED_RESULT_GOT_FAILURE
-Expressions/Construct/ComputeCon/ConDocNode//Constr-docnode-constrmod-2, EXPECTED_RESULT_GOT_FAILURE
-Expressions/Construct/ComputeCon/ConDocNode//Constr-docnode-constrmod-3, EXPECTED_ERROR_GOT_FAILURE
-Expressions/Construct/ComputeCon/ConDocNode//Constr-docnode-constrmod-4, EXPECTED_ERROR_GOT_FAILURE
+Expressions/Construct/ComputeCon/ConDocNode//Constr-docnode-constrmod-1, EXPECTED_RESULT_GOT_ERROR
+Expressions/Construct/ComputeCon/ConDocNode//Constr-docnode-constrmod-2, EXPECTED_RESULT_GOT_ERROR
+Expressions/Construct/ComputeCon/ConDocNode//Constr-docnode-constrmod-3, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
+Expressions/Construct/ComputeCon/ConDocNode//Constr-docnode-constrmod-4, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
Expressions/Construct/ComputeCon/ConDocNode//Constr-docnode-data-1, EXPECTED_RESULT_GOT_ERROR
Expressions/Construct/ComputeCon/ConDocNode//Constr-docnode-doc-1, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
Expressions/Construct/ComputeCon/ConDocNode//Constr-docnode-enclexpr-1, EXPECTED_RESULT_GOT_ERROR
Expressions/Construct/ComputeCon/ConDocNode//Constr-docnode-enclexpr-2, EXPECTED_RESULT_GOT_ERROR
-Expressions/Construct/ComputeCon/ConDocNode//Constr-docnode-enclexpr-3, EXPECTED_RESULT_GOT_FAILURE
+Expressions/Construct/ComputeCon/ConDocNode//Constr-docnode-enclexpr-3, EXPECTED_RESULT_GOT_ERROR
Expressions/Construct/ComputeCon/ConDocNode//Constr-docnode-enclexpr-4, EXPECTED_RESULT_GOT_ERROR
Expressions/Construct/ComputeCon/ConDocNode//Constr-docnode-nested-1, EXPECTED_RESULT_GOT_ERROR
Expressions/Construct/ComputeCon/ConDocNode//Constr-docnode-nested-2, EXPECTED_RESULT_GOT_ERROR
Expressions/Construct/ComputeCon/ConDocNode//Constr-docnode-nested-3, EXPECTED_RESULT_GOT_ERROR
Expressions/Construct/ComputeCon/ConDocNode//Constr-docnode-nested-4, EXPECTED_RESULT_GOT_ERROR
Expressions/Construct/ComputeCon/ConDocNode//Constr-docnode-nodeid-1, EXPECTED_RESULT_GOT_ERROR
-Expressions/Construct/ComputeCon/ConDocNode//Constr-docnode-nodeid-3, EXPECTED_RESULT_GOT_FAILURE
-Expressions/Construct/ComputeCon/ConDocNode//Constr-docnode-nodeid-4, EXPECTED_RESULT_GOT_FAILURE
+Expressions/Construct/ComputeCon/ConDocNode//Constr-docnode-nodeid-3, EXPECTED_RESULT_GOT_ERROR
+Expressions/Construct/ComputeCon/ConDocNode//Constr-docnode-nodeid-4, EXPECTED_RESULT_GOT_ERROR
Expressions/Construct/ComputeCon/ConDocNode//Constr-docnode-nodeid-5, EXPECTED_RESULT_GOT_ERROR
-Expressions/Construct/ComputeCon/ConDocNode//Constr-docnode-parent-1, EXPECTED_ERROR_GOT_FAILURE
+Expressions/Construct/ComputeCon/ConDocNode//Constr-docnode-parent-1, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
Expressions/Construct/ComputeCon/ConDocNode//Constr-docnode-string-1, EXPECTED_RESULT_GOT_ERROR
Expressions/Construct/ComputeCon/ConText//Constr-text-adjtext-1, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Construct/ComputeCon/ConText//Constr-text-adjtext-2, EXPECTED_RESULT_GOT_ERROR
@@ -801,7 +801,7 @@ Expressions/Construct/ComputeCon/ConText//Constr-text-enclexpr-5, EXPECTED_RESUL
Expressions/Construct/ComputeCon/ConText//Constr-text-nested-1, EXPECTED_RESULT_GOT_ERROR
Expressions/Construct/ComputeCon/ConText//Constr-text-nested-2, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Construct/ComputeCon/ConText//Constr-text-nested-3, EXPECTED_RESULT_GOT_ERROR
-Expressions/Construct/ComputeCon/ConText//Constr-text-parent-1, EXPECTED_RESULT_GOT_FAILURE
+Expressions/Construct/ComputeCon/ConText//Constr-text-parent-1, EXPECTED_RESULT_GOT_ERROR
Expressions/Construct/ComputeCon/ConText//Constr-text-string-1, EXPECTED_RESULT_GOT_ERROR
Expressions/Construct/ConInScopeNamespace//Constr-inscope-1, EXPECTED_RESULT_GOT_FAILURE
Expressions/Construct/ConInScopeNamespace//Constr-inscope-10, EXPECTED_RESULT_GOT_FAILURE
@@ -831,8 +831,8 @@ Expressions/Construct/DirectConElem//Constr-elem-curlybr-5, EXPECTED_ERROR_GOT_S
Expressions/Construct/DirectConElem//Constr-elem-curlybr-6, EXPECTED_ERROR_GOT_SAME_ERROR
Expressions/Construct/DirectConElem//Constr-elem-empty-1, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Construct/DirectConElem//Constr-elem-empty-2, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/Construct/DirectConElem//Constr-elem-empty-3, EXPECTED_RESULT_GOT_FAILURE
-Expressions/Construct/DirectConElem//Constr-elem-empty-4, EXPECTED_ERROR_GOT_FAILURE
+Expressions/Construct/DirectConElem//Constr-elem-empty-3, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+Expressions/Construct/DirectConElem//Constr-elem-empty-4, EXPECTED_ERROR_GOT_RESULT
Expressions/Construct/DirectConElem//Constr-elem-empty-5, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Construct/DirectConElem//Constr-elem-matchtag-1, EXPECTED_ERROR_GOT_SAME_ERROR
Expressions/Construct/DirectConElem//Constr-elem-matchtag-2, EXPECTED_ERROR_GOT_SAME_ERROR
@@ -855,16 +855,16 @@ Expressions/Construct/DirectConElem/DirectConElemAttr//Constr-attr-enclexpr-6, E
Expressions/Construct/DirectConElem/DirectConElemAttr//Constr-attr-enclexpr-7, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Expressions/Construct/DirectConElem/DirectConElemAttr//Constr-attr-enclexpr-8, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Expressions/Construct/DirectConElem/DirectConElemAttr//Constr-attr-entref-1, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/Construct/DirectConElem/DirectConElemAttr//Constr-attr-entref-2, EXPECTED_RESULT_GOT_ERROR
+Expressions/Construct/DirectConElem/DirectConElemAttr//Constr-attr-entref-2, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Construct/DirectConElem/DirectConElemAttr//Constr-attr-id-1, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Construct/DirectConElem/DirectConElemAttr//Constr-attr-id-2, EXPECTED_ERROR_GOT_RESULT
Expressions/Construct/DirectConElem/DirectConElemAttr//Constr-attr-nsdecl-1, EXPECTED_RESULT_GOT_FAILURE
-Expressions/Construct/DirectConElem/DirectConElemAttr//Constr-attr-nsdecl-2, EXPECTED_RESULT_GOT_FAILURE
+Expressions/Construct/DirectConElem/DirectConElemAttr//Constr-attr-nsdecl-2, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Expressions/Construct/DirectConElem/DirectConElemAttr//Constr-attr-nspre-1, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Expressions/Construct/DirectConElem/DirectConElemAttr//Constr-attr-nspre-2, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Expressions/Construct/DirectConElem/DirectConElemAttr//Constr-attr-nsprein-1, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Expressions/Construct/DirectConElem/DirectConElemAttr//Constr-attr-nsprein-2, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/Construct/DirectConElem/DirectConElemAttr//Constr-attr-parent-1, EXPECTED_RESULT_GOT_FAILURE
+Expressions/Construct/DirectConElem/DirectConElemAttr//Constr-attr-parent-1, EXPECTED_RESULT_GOT_ERROR
Expressions/Construct/DirectConElem/DirectConElemAttr//Constr-attr-syntax-1, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Construct/DirectConElem/DirectConElemAttr//Constr-attr-syntax-10, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Construct/DirectConElem/DirectConElemAttr//Constr-attr-syntax-2, EXPECTED_RESULT_GOT_SAME_RESULT
@@ -909,11 +909,11 @@ Expressions/Construct/DirectConElem/DirectConElemContent//Constr-cont-constrmod-
Expressions/Construct/DirectConElem/DirectConElemContent//Constr-cont-constrmod-8, EXPECTED_ERROR_GOT_FAILURE
Expressions/Construct/DirectConElem/DirectConElemContent//Constr-cont-data-1, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Construct/DirectConElem/DirectConElemContent//Constr-cont-doc-1, EXPECTED_RESULT_GOT_FAILURE
-Expressions/Construct/DirectConElem/DirectConElemContent//Constr-cont-document-1, EXPECTED_RESULT_GOT_FAILURE
-Expressions/Construct/DirectConElem/DirectConElemContent//Constr-cont-document-2, EXPECTED_RESULT_GOT_FAILURE
+Expressions/Construct/DirectConElem/DirectConElemContent//Constr-cont-document-1, EXPECTED_RESULT_GOT_ERROR
+Expressions/Construct/DirectConElem/DirectConElemContent//Constr-cont-document-2, EXPECTED_RESULT_GOT_ERROR
Expressions/Construct/DirectConElem/DirectConElemContent//Constr-cont-document-3, EXPECTED_RESULT_GOT_FAILURE
-Expressions/Construct/DirectConElem/DirectConElemContent//Constr-cont-document-4, EXPECTED_RESULT_GOT_FAILURE
-Expressions/Construct/DirectConElem/DirectConElemContent//Constr-cont-document-5, EXPECTED_RESULT_GOT_FAILURE
+Expressions/Construct/DirectConElem/DirectConElemContent//Constr-cont-document-4, EXPECTED_RESULT_GOT_ERROR
+Expressions/Construct/DirectConElem/DirectConElemContent//Constr-cont-document-5, EXPECTED_RESULT_GOT_ERROR
Expressions/Construct/DirectConElem/DirectConElemContent//Constr-cont-enclexpr-1, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Construct/DirectConElem/DirectConElemContent//Constr-cont-enclexpr-2, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Expressions/Construct/DirectConElem/DirectConElemContent//Constr-cont-enclexpr-3, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
@@ -939,8 +939,8 @@ Expressions/Construct/DirectConElem/DirectConElemContent//Constr-cont-nested-4,
Expressions/Construct/DirectConElem/DirectConElemContent//Constr-cont-nested-5, EXPECTED_RESULT_GOT_FAILURE
Expressions/Construct/DirectConElem/DirectConElemContent//Constr-cont-nodeid-1, EXPECTED_RESULT_GOT_ERROR
Expressions/Construct/DirectConElem/DirectConElemContent//Constr-cont-nodeid-2, EXPECTED_RESULT_GOT_ERROR
-Expressions/Construct/DirectConElem/DirectConElemContent//Constr-cont-nodeid-3, EXPECTED_RESULT_GOT_FAILURE
-Expressions/Construct/DirectConElem/DirectConElemContent//Constr-cont-nodeid-4, EXPECTED_RESULT_GOT_FAILURE
+Expressions/Construct/DirectConElem/DirectConElemContent//Constr-cont-nodeid-3, EXPECTED_RESULT_GOT_ERROR
+Expressions/Construct/DirectConElem/DirectConElemContent//Constr-cont-nodeid-4, EXPECTED_RESULT_GOT_ERROR
Expressions/Construct/DirectConElem/DirectConElemContent//Constr-cont-nodeid-5, EXPECTED_RESULT_GOT_ERROR
Expressions/Construct/DirectConElem/DirectConElemContent//Constr-cont-nsmode-1, EXPECTED_RESULT_GOT_FAILURE
Expressions/Construct/DirectConElem/DirectConElemContent//Constr-cont-nsmode-10, EXPECTED_ERROR_GOT_FAILURE
@@ -953,8 +953,8 @@ Expressions/Construct/DirectConElem/DirectConElemContent//Constr-cont-nsmode-6,
Expressions/Construct/DirectConElem/DirectConElemContent//Constr-cont-nsmode-7, EXPECTED_ERROR_GOT_FAILURE
Expressions/Construct/DirectConElem/DirectConElemContent//Constr-cont-nsmode-8, EXPECTED_ERROR_GOT_FAILURE
Expressions/Construct/DirectConElem/DirectConElemContent//Constr-cont-nsmode-9, EXPECTED_RESULT_GOT_FAILURE
-Expressions/Construct/DirectConElem/DirectConElemContent//Constr-cont-parent-1, EXPECTED_RESULT_GOT_FAILURE
-Expressions/Construct/DirectConElem/DirectConElemContent//Constr-cont-string-1, EXPECTED_RESULT_GOT_ERROR
+Expressions/Construct/DirectConElem/DirectConElemContent//Constr-cont-parent-1, EXPECTED_RESULT_GOT_ERROR
+Expressions/Construct/DirectConElem/DirectConElemContent//Constr-cont-string-1, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Construct/DirectConElem/DirectConElemContent//Constr-cont-text-1, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Construct/DirectConElem/DirectConElemContent//Constr-cont-text-2, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Construct/DirectConElem/DirectConElemContent//Constr-cont-uripres-1, EXPECTED_RESULT_GOT_ERROR
@@ -1145,7 +1145,7 @@ Expressions/ExtensionExpression//extexpr-9, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/FLWORExpr/ForExpr//ForExpr001, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Expressions/FLWORExpr/ForExpr//ForExpr002, EXPECTED_ERROR_GOT_SAME_ERROR
Expressions/FLWORExpr/ForExpr//ForExpr003, EXPECTED_RESULT_GOT_FAILURE
-Expressions/FLWORExpr/ForExpr//ForExpr004, EXPECTED_RESULT_GOT_FAILURE
+Expressions/FLWORExpr/ForExpr//ForExpr004, EXPECTED_RESULT_GOT_ERROR
Expressions/FLWORExpr/ForExpr//ForExpr005, EXPECTED_RESULT_GOT_FAILURE
Expressions/FLWORExpr/ForExpr//ForExpr006, EXPECTED_RESULT_GOT_FAILURE
Expressions/FLWORExpr/ForExpr//ForExpr007, EXPECTED_RESULT_GOT_FAILURE
@@ -5641,11 +5641,11 @@ Expressions/Operators/SeqOp/SeqExcept//fn-except-node-args-001, EXPECTED_RESULT_
Expressions/Operators/SeqOp/SeqExcept//fn-except-node-args-002, EXPECTED_RESULT_GOT_ERROR
Expressions/Operators/SeqOp/SeqExcept//fn-except-node-args-003, EXPECTED_RESULT_GOT_ERROR
Expressions/Operators/SeqOp/SeqExcept//fn-except-node-args-004, EXPECTED_RESULT_GOT_ERROR
-Expressions/Operators/SeqOp/SeqExcept//fn-except-node-args-005, EXPECTED_RESULT_GOT_FAILURE
-Expressions/Operators/SeqOp/SeqExcept//fn-except-node-args-006, EXPECTED_RESULT_GOT_FAILURE
-Expressions/Operators/SeqOp/SeqExcept//fn-except-node-args-007, EXPECTED_RESULT_GOT_FAILURE
+Expressions/Operators/SeqOp/SeqExcept//fn-except-node-args-005, EXPECTED_RESULT_GOT_ERROR
+Expressions/Operators/SeqOp/SeqExcept//fn-except-node-args-006, EXPECTED_RESULT_GOT_ERROR
+Expressions/Operators/SeqOp/SeqExcept//fn-except-node-args-007, EXPECTED_RESULT_GOT_ERROR
Expressions/Operators/SeqOp/SeqExcept//fn-except-node-args-008, EXPECTED_RESULT_GOT_ERROR
-Expressions/Operators/SeqOp/SeqExcept//fn-except-node-args-009, EXPECTED_RESULT_GOT_FAILURE
+Expressions/Operators/SeqOp/SeqExcept//fn-except-node-args-009, EXPECTED_RESULT_GOT_ERROR
Expressions/Operators/SeqOp/SeqExcept//fn-except-node-args-010, EXPECTED_RESULT_GOT_ERROR
Expressions/Operators/SeqOp/SeqExcept//fn-except-node-args-011, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
Expressions/Operators/SeqOp/SeqExcept//fn-except-node-args-012, EXPECTED_RESULT_GOT_ERROR
@@ -5664,11 +5664,11 @@ Expressions/Operators/SeqOp/SeqIntersect//fn-intersect-node-args-001, EXPECTED_R
Expressions/Operators/SeqOp/SeqIntersect//fn-intersect-node-args-002, EXPECTED_RESULT_GOT_ERROR
Expressions/Operators/SeqOp/SeqIntersect//fn-intersect-node-args-003, EXPECTED_RESULT_GOT_ERROR
Expressions/Operators/SeqOp/SeqIntersect//fn-intersect-node-args-004, EXPECTED_RESULT_GOT_ERROR
-Expressions/Operators/SeqOp/SeqIntersect//fn-intersect-node-args-005, EXPECTED_RESULT_GOT_FAILURE
-Expressions/Operators/SeqOp/SeqIntersect//fn-intersect-node-args-006, EXPECTED_RESULT_GOT_FAILURE
-Expressions/Operators/SeqOp/SeqIntersect//fn-intersect-node-args-007, EXPECTED_RESULT_GOT_FAILURE
+Expressions/Operators/SeqOp/SeqIntersect//fn-intersect-node-args-005, EXPECTED_RESULT_GOT_ERROR
+Expressions/Operators/SeqOp/SeqIntersect//fn-intersect-node-args-006, EXPECTED_RESULT_GOT_ERROR
+Expressions/Operators/SeqOp/SeqIntersect//fn-intersect-node-args-007, EXPECTED_RESULT_GOT_ERROR
Expressions/Operators/SeqOp/SeqIntersect//fn-intersect-node-args-008, EXPECTED_RESULT_GOT_ERROR
-Expressions/Operators/SeqOp/SeqIntersect//fn-intersect-node-args-009, EXPECTED_RESULT_GOT_FAILURE
+Expressions/Operators/SeqOp/SeqIntersect//fn-intersect-node-args-009, EXPECTED_RESULT_GOT_ERROR
Expressions/Operators/SeqOp/SeqIntersect//fn-intersect-node-args-010, EXPECTED_RESULT_GOT_ERROR
Expressions/Operators/SeqOp/SeqIntersect//fn-intersect-node-args-011, EXPECTED_RESULT_GOT_ERROR
Expressions/Operators/SeqOp/SeqIntersect//fn-intersect-node-args-012, EXPECTED_RESULT_GOT_ERROR
@@ -5687,13 +5687,13 @@ Expressions/Operators/SeqOp/SeqUnion//fn-union-node-args-001, EXPECTED_RESULT_GO
Expressions/Operators/SeqOp/SeqUnion//fn-union-node-args-002, EXPECTED_RESULT_GOT_ERROR
Expressions/Operators/SeqOp/SeqUnion//fn-union-node-args-003, EXPECTED_RESULT_GOT_ERROR
Expressions/Operators/SeqOp/SeqUnion//fn-union-node-args-004, EXPECTED_RESULT_GOT_ERROR
-Expressions/Operators/SeqOp/SeqUnion//fn-union-node-args-005, EXPECTED_RESULT_GOT_FAILURE
+Expressions/Operators/SeqOp/SeqUnion//fn-union-node-args-005, EXPECTED_RESULT_GOT_ERROR
Expressions/Operators/SeqOp/SeqUnion//fn-union-node-args-006, EXPECTED_RESULT_GOT_ERROR
-Expressions/Operators/SeqOp/SeqUnion//fn-union-node-args-007, EXPECTED_RESULT_GOT_FAILURE
+Expressions/Operators/SeqOp/SeqUnion//fn-union-node-args-007, EXPECTED_RESULT_GOT_ERROR
Expressions/Operators/SeqOp/SeqUnion//fn-union-node-args-008, EXPECTED_RESULT_GOT_ERROR
-Expressions/Operators/SeqOp/SeqUnion//fn-union-node-args-009, EXPECTED_RESULT_GOT_FAILURE
+Expressions/Operators/SeqOp/SeqUnion//fn-union-node-args-009, EXPECTED_RESULT_GOT_ERROR
Expressions/Operators/SeqOp/SeqUnion//fn-union-node-args-010, EXPECTED_RESULT_GOT_ERROR
-Expressions/Operators/SeqOp/SeqUnion//fn-union-node-args-011, EXPECTED_RESULT_GOT_FAILURE
+Expressions/Operators/SeqOp/SeqUnion//fn-union-node-args-011, EXPECTED_RESULT_GOT_ERROR
Expressions/Operators/SeqOp/SeqUnion//fn-union-node-args-012, EXPECTED_RESULT_GOT_ERROR
Expressions/Operators/SeqOp/SeqUnion//fn-union-node-args-013, EXPECTED_RESULT_GOT_ERROR
Expressions/Operators/SeqOp/SeqUnion//fn-union-node-args-014, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
@@ -5736,7 +5736,7 @@ Expressions/PathExpr/AbbrAxes//abbreviatedSyntax-1, EXPECTED_RESULT_GOT_FAILURE
Expressions/PathExpr/AbbrAxes//abbreviatedSyntax-10, EXPECTED_RESULT_GOT_FAILURE
Expressions/PathExpr/AbbrAxes//abbreviatedSyntax-12, EXPECTED_RESULT_GOT_FAILURE
Expressions/PathExpr/AbbrAxes//abbreviatedSyntax-13, EXPECTED_RESULT_GOT_FAILURE
-Expressions/PathExpr/AbbrAxes//abbreviatedSyntax-14, EXPECTED_RESULT_GOT_FAILURE
+Expressions/PathExpr/AbbrAxes//abbreviatedSyntax-14, EXPECTED_RESULT_GOT_ERROR
Expressions/PathExpr/AbbrAxes//abbreviatedSyntax-16, EXPECTED_RESULT_GOT_FAILURE
Expressions/PathExpr/AbbrAxes//abbreviatedSyntax-17, EXPECTED_RESULT_GOT_FAILURE
Expressions/PathExpr/AbbrAxes//abbreviatedSyntax-18, EXPECTED_RESULT_GOT_FAILURE
@@ -5851,13 +5851,13 @@ Expressions/PathExpr/Steps/Axes//Axes011, EXPECTED_RESULT_GOT_FAILURE
Expressions/PathExpr/Steps/Axes//Axes011, EXPECTED_RESULT_GOT_FAILURE
Expressions/PathExpr/Steps/Axes//Axes011, EXPECTED_RESULT_GOT_FAILURE
Expressions/PathExpr/Steps/Axes//Axes012, EXPECTED_ERROR_GOT_SAME_ERROR
-Expressions/PathExpr/Steps/Axes//Axes013, EXPECTED_RESULT_GOT_FAILURE
-Expressions/PathExpr/Steps/Axes//Axes014, EXPECTED_RESULT_GOT_FAILURE
+Expressions/PathExpr/Steps/Axes//Axes013, EXPECTED_RESULT_GOT_ERROR
+Expressions/PathExpr/Steps/Axes//Axes014, EXPECTED_RESULT_GOT_ERROR
Expressions/PathExpr/Steps/Axes//Axes015, EXPECTED_RESULT_GOT_ERROR
Expressions/PathExpr/Steps/Axes//Axes016, EXPECTED_RESULT_GOT_ERROR
-Expressions/PathExpr/Steps/Axes//Axes017, EXPECTED_RESULT_GOT_FAILURE
-Expressions/PathExpr/Steps/Axes//Axes018, EXPECTED_RESULT_GOT_FAILURE
-Expressions/PathExpr/Steps/Axes//Axes019, EXPECTED_RESULT_GOT_FAILURE
+Expressions/PathExpr/Steps/Axes//Axes017, EXPECTED_RESULT_GOT_ERROR
+Expressions/PathExpr/Steps/Axes//Axes018, EXPECTED_RESULT_GOT_ERROR
+Expressions/PathExpr/Steps/Axes//Axes019, EXPECTED_RESULT_GOT_ERROR
Expressions/PathExpr/Steps/Axes//Axes020, EXPECTED_RESULT_GOT_FAILURE
Expressions/PathExpr/Steps/Axes//Axes021, EXPECTED_RESULT_GOT_FAILURE
Expressions/PathExpr/Steps/Axes//Axes023, EXPECTED_RESULT_GOT_FAILURE
@@ -5995,8 +5995,8 @@ Expressions/PathExpr/Steps/Axes//Axes084, EXPECTED_RESULT_GOT_FAILURE
Expressions/PathExpr/Steps/Axes//Axes084, EXPECTED_RESULT_GOT_FAILURE
Expressions/PathExpr/Steps/Axes//Axes084, EXPECTED_RESULT_GOT_FAILURE
Expressions/PathExpr/Steps/Axes//Axes085, EXPECTED_RESULT_GOT_FAILURE
-Expressions/PathExpr/Steps/Axes//Axes086, EXPECTED_RESULT_GOT_FAILURE
-Expressions/PathExpr/Steps/Axes//Axes087, EXPECTED_RESULT_GOT_FAILURE
+Expressions/PathExpr/Steps/Axes//Axes086, EXPECTED_RESULT_GOT_ERROR
+Expressions/PathExpr/Steps/Axes//Axes087, EXPECTED_RESULT_GOT_ERROR
Expressions/PathExpr/Steps/Axes//Axes088, EXPECTED_ERROR_GOT_SAME_ERROR
Expressions/PathExpr/Steps/Axes//Axes089, EXPECTED_RESULT_GOT_ERROR
Expressions/PathExpr/Steps/Axes//Axes090, EXPECTED_ERROR_GOT_FAILURE
@@ -6012,11 +6012,11 @@ Expressions/PathExpr/Steps/Axes//Axes099, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
Expressions/PathExpr/Steps/Axes//Axes100, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
Expressions/PathExpr/Steps/Axes//Axes101, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
Expressions/PathExpr/Steps/Axes//Axes102, EXPECTED_RESULT_GOT_ERROR
-Expressions/PathExpr/Steps/Axes//Axes103, EXPECTED_ERROR_GOT_FAILURE
+Expressions/PathExpr/Steps/Axes//Axes103, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
Expressions/PathExpr/Steps/Axes//Axes104, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
Expressions/PathExpr/Steps/Axes//Axes105, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
Expressions/PathExpr/Steps/Axes//Axes106, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
-Expressions/PathExpr/Steps/Axes//Axes107, EXPECTED_ERROR_GOT_FAILURE
+Expressions/PathExpr/Steps/Axes//Axes107, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
Expressions/PathExpr/Steps/Axes//Axes108, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
Expressions/PathExpr/Steps/Axes//Axes109, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
Expressions/PathExpr/Steps/Axes//Axes110, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
@@ -6049,12 +6049,12 @@ Expressions/PathExpr/Steps/NodeTest//NodeTesthc-5, EXPECTED_RESULT_GOT_FAILURE
Expressions/PathExpr/Steps/NodeTest//NodeTesthc-6, EXPECTED_RESULT_GOT_FAILURE
Expressions/PathExpr/Steps/NodeTest//NodeTesthc-7, EXPECTED_RESULT_GOT_FAILURE
Expressions/PathExpr/Steps/NodeTest//NodeTesthc-8, EXPECTED_RESULT_GOT_FAILURE
-Expressions/PathExpr/Steps/NodeTest//nametest-1, EXPECTED_RESULT_GOT_FAILURE
+Expressions/PathExpr/Steps/NodeTest//nametest-1, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/PathExpr/Steps/NodeTest//nametest-10, EXPECTED_RESULT_GOT_ERROR
Expressions/PathExpr/Steps/NodeTest//nametest-11, EXPECTED_RESULT_GOT_ERROR
Expressions/PathExpr/Steps/NodeTest//nametest-12, EXPECTED_RESULT_GOT_ERROR
-Expressions/PathExpr/Steps/NodeTest//nametest-13, EXPECTED_RESULT_GOT_FAILURE
-Expressions/PathExpr/Steps/NodeTest//nametest-14, EXPECTED_RESULT_GOT_FAILURE
+Expressions/PathExpr/Steps/NodeTest//nametest-13, EXPECTED_RESULT_GOT_ERROR
+Expressions/PathExpr/Steps/NodeTest//nametest-14, EXPECTED_RESULT_GOT_ERROR
Expressions/PathExpr/Steps/NodeTest//nametest-15, EXPECTED_RESULT_GOT_FAILURE
Expressions/PathExpr/Steps/NodeTest//nametest-16, EXPECTED_RESULT_GOT_FAILURE
Expressions/PathExpr/Steps/NodeTest//nametest-17, EXPECTED_RESULT_GOT_FAILURE
@@ -6102,7 +6102,7 @@ Expressions/PathExpr/UnabbrAxes//unabbreviatedSyntax-32, EXPECTED_RESULT_GOT_FAI
Expressions/PathExpr/UnabbrAxes//unabbreviatedSyntax-33, EXPECTED_RESULT_GOT_FAILURE
Expressions/PathExpr/UnabbrAxes//unabbreviatedSyntax-4, EXPECTED_RESULT_GOT_FAILURE
Expressions/PathExpr/UnabbrAxes//unabbreviatedSyntax-5, EXPECTED_RESULT_GOT_FAILURE
-Expressions/PathExpr/UnabbrAxes//unabbreviatedSyntax-8, EXPECTED_RESULT_GOT_FAILURE
+Expressions/PathExpr/UnabbrAxes//unabbreviatedSyntax-8, EXPECTED_RESULT_GOT_ERROR
Expressions/PathExpr/UnabbrAxes//unabbreviatedSyntax-9, EXPECTED_RESULT_GOT_FAILURE
Expressions/PrimaryExpr/FunctionCallExpr//K-FunctionCallExpr-1, EXPECTED_ERROR_GOT_SAME_ERROR
Expressions/PrimaryExpr/FunctionCallExpr//K-FunctionCallExpr-10, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
@@ -6296,13 +6296,13 @@ Expressions/PrimaryExpr/ParenExpr//Parenexpr-11, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/PrimaryExpr/ParenExpr//Parenexpr-12, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Expressions/PrimaryExpr/ParenExpr//Parenexpr-13, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/PrimaryExpr/ParenExpr//Parenexpr-14, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/PrimaryExpr/ParenExpr//Parenexpr-15, EXPECTED_RESULT_GOT_FAILURE
-Expressions/PrimaryExpr/ParenExpr//Parenexpr-16, EXPECTED_RESULT_GOT_FAILURE
+Expressions/PrimaryExpr/ParenExpr//Parenexpr-15, EXPECTED_RESULT_GOT_ERROR
+Expressions/PrimaryExpr/ParenExpr//Parenexpr-16, EXPECTED_RESULT_GOT_ERROR
Expressions/PrimaryExpr/ParenExpr//Parenexpr-17, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/PrimaryExpr/ParenExpr//Parenexpr-18, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/PrimaryExpr/ParenExpr//Parenexpr-19, EXPECTED_RESULT_GOT_FAILURE
Expressions/PrimaryExpr/ParenExpr//Parenexpr-2, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/PrimaryExpr/ParenExpr//Parenexpr-20, EXPECTED_RESULT_GOT_FAILURE
+Expressions/PrimaryExpr/ParenExpr//Parenexpr-20, EXPECTED_RESULT_GOT_ERROR
Expressions/PrimaryExpr/ParenExpr//Parenexpr-3, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/PrimaryExpr/ParenExpr//Parenexpr-4, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/PrimaryExpr/ParenExpr//Parenexpr-5, EXPECTED_RESULT_GOT_SAME_RESULT
@@ -6415,14 +6415,14 @@ Expressions/PrologExpr/CopyNamespacesProlog//copynamespace-16, EXPECTED_RESULT_G
Expressions/PrologExpr/CopyNamespacesProlog//copynamespace-17, EXPECTED_RESULT_GOT_ERROR
Expressions/PrologExpr/CopyNamespacesProlog//copynamespace-18, EXPECTED_RESULT_GOT_ERROR
Expressions/PrologExpr/CopyNamespacesProlog//copynamespace-19, EXPECTED_RESULT_GOT_ERROR
-Expressions/PrologExpr/CopyNamespacesProlog//copynamespace-2, EXPECTED_RESULT_GOT_FAILURE
+Expressions/PrologExpr/CopyNamespacesProlog//copynamespace-2, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Expressions/PrologExpr/CopyNamespacesProlog//copynamespace-20, EXPECTED_RESULT_GOT_ERROR
Expressions/PrologExpr/CopyNamespacesProlog//copynamespace-21, EXPECTED_RESULT_GOT_ERROR
Expressions/PrologExpr/CopyNamespacesProlog//copynamespace-22, EXPECTED_RESULT_GOT_ERROR
-Expressions/PrologExpr/CopyNamespacesProlog//copynamespace-3, EXPECTED_RESULT_GOT_FAILURE
-Expressions/PrologExpr/CopyNamespacesProlog//copynamespace-4, EXPECTED_RESULT_GOT_FAILURE
-Expressions/PrologExpr/CopyNamespacesProlog//copynamespace-5, EXPECTED_RESULT_GOT_FAILURE
-Expressions/PrologExpr/CopyNamespacesProlog//copynamespace-6, EXPECTED_RESULT_GOT_FAILURE
+Expressions/PrologExpr/CopyNamespacesProlog//copynamespace-3, EXPECTED_RESULT_GOT_ERROR
+Expressions/PrologExpr/CopyNamespacesProlog//copynamespace-4, EXPECTED_RESULT_GOT_ERROR
+Expressions/PrologExpr/CopyNamespacesProlog//copynamespace-5, EXPECTED_RESULT_GOT_ERROR
+Expressions/PrologExpr/CopyNamespacesProlog//copynamespace-6, EXPECTED_RESULT_GOT_ERROR
Expressions/PrologExpr/CopyNamespacesProlog//copynamespace-7, EXPECTED_RESULT_GOT_ERROR
Expressions/PrologExpr/CopyNamespacesProlog//copynamespace-8, EXPECTED_RESULT_GOT_ERROR
Expressions/PrologExpr/CopyNamespacesProlog//copynamespace-9, EXPECTED_RESULT_GOT_ERROR
@@ -6475,7 +6475,7 @@ Expressions/PrologExpr/DefaultOrderingProlog//orderDecl-17, EXPECTED_RESULT_GOT_
Expressions/PrologExpr/DefaultOrderingProlog//orderDecl-18, EXPECTED_RESULT_GOT_ERROR
Expressions/PrologExpr/DefaultOrderingProlog//orderDecl-2, EXPECTED_RESULT_GOT_ERROR
Expressions/PrologExpr/DefaultOrderingProlog//orderDecl-20, EXPECTED_RESULT_GOT_FAILURE
-Expressions/PrologExpr/DefaultOrderingProlog//orderDecl-21, EXPECTED_RESULT_GOT_FAILURE
+Expressions/PrologExpr/DefaultOrderingProlog//orderDecl-21, EXPECTED_RESULT_GOT_ERROR
Expressions/PrologExpr/DefaultOrderingProlog//orderDecl-22, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
Expressions/PrologExpr/DefaultOrderingProlog//orderDecl-23, EXPECTED_RESULT_GOT_FAILURE
Expressions/PrologExpr/DefaultOrderingProlog//orderDecl-4, EXPECTED_RESULT_GOT_ERROR
@@ -8218,7 +8218,7 @@ Expressions/exprSeqTypes/SeqExprCast//K-SeqExprCast-1206, EXPECTED_ERROR_GOT_SAM
Expressions/exprSeqTypes/SeqExprCast//K-SeqExprCast-1207, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/exprSeqTypes/SeqExprCast//K-SeqExprCast-1208, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
Expressions/exprSeqTypes/SeqExprCast//K-SeqExprCast-1209, EXPECTED_ERROR_GOT_FAILURE
-Expressions/exprSeqTypes/SeqExprCast//K-SeqExprCast-121, EXPECTED_ERROR_GOT_RESULT
+Expressions/exprSeqTypes/SeqExprCast//K-SeqExprCast-121, EXPECTED_ERROR_GOT_FAILURE
Expressions/exprSeqTypes/SeqExprCast//K-SeqExprCast-1210, EXPECTED_ERROR_GOT_SAME_ERROR
Expressions/exprSeqTypes/SeqExprCast//K-SeqExprCast-1211, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/exprSeqTypes/SeqExprCast//K-SeqExprCast-1212, EXPECTED_RESULT_GOT_ERROR
@@ -8229,7 +8229,7 @@ Expressions/exprSeqTypes/SeqExprCast//K-SeqExprCast-1216, EXPECTED_RESULT_GOT_SA
Expressions/exprSeqTypes/SeqExprCast//K-SeqExprCast-1217, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/exprSeqTypes/SeqExprCast//K-SeqExprCast-1218, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/exprSeqTypes/SeqExprCast//K-SeqExprCast-1219, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/exprSeqTypes/SeqExprCast//K-SeqExprCast-122, EXPECTED_ERROR_GOT_RESULT
+Expressions/exprSeqTypes/SeqExprCast//K-SeqExprCast-122, EXPECTED_ERROR_GOT_FAILURE
Expressions/exprSeqTypes/SeqExprCast//K-SeqExprCast-1220, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/exprSeqTypes/SeqExprCast//K-SeqExprCast-1221, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/exprSeqTypes/SeqExprCast//K-SeqExprCast-1222, EXPECTED_RESULT_GOT_SAME_RESULT
@@ -10525,7 +10525,7 @@ FLWORExpr/ForExpr/ForExprWithout//K2-ForExprWithout-1, EXPECTED_ERROR_GOT_SAME_E
FLWORExpr/ForExpr/ForExprWithout//K2-ForExprWithout-10, EXPECTED_ERROR_GOT_RESULT
FLWORExpr/ForExpr/ForExprWithout//K2-ForExprWithout-11, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
FLWORExpr/ForExpr/ForExprWithout//K2-ForExprWithout-12, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-FLWORExpr/ForExpr/ForExprWithout//K2-ForExprWithout-13, EXPECTED_RESULT_GOT_FAILURE
+FLWORExpr/ForExpr/ForExprWithout//K2-ForExprWithout-13, EXPECTED_RESULT_GOT_SAME_RESULT
FLWORExpr/ForExpr/ForExprWithout//K2-ForExprWithout-14, EXPECTED_RESULT_GOT_FAILURE
FLWORExpr/ForExpr/ForExprWithout//K2-ForExprWithout-15, EXPECTED_RESULT_GOT_SAME_RESULT
FLWORExpr/ForExpr/ForExprWithout//K2-ForExprWithout-16, EXPECTED_RESULT_GOT_SAME_RESULT
@@ -10580,11 +10580,11 @@ FLWORExpr/LetExpr/LetExprWithout//K2-LetExprWithout-19, EXPECTED_ERROR_GOT_RESUL
FLWORExpr/LetExpr/LetExprWithout//K2-LetExprWithout-2, EXPECTED_RESULT_GOT_ERROR
FLWORExpr/LetExpr/LetExprWithout//K2-LetExprWithout-20, EXPECTED_RESULT_GOT_FAILURE
FLWORExpr/LetExpr/LetExprWithout//K2-LetExprWithout-21, EXPECTED_RESULT_GOT_FAILURE
-FLWORExpr/LetExpr/LetExprWithout//K2-LetExprWithout-22, EXPECTED_RESULT_GOT_FAILURE
-FLWORExpr/LetExpr/LetExprWithout//K2-LetExprWithout-23, EXPECTED_RESULT_GOT_ERROR
+FLWORExpr/LetExpr/LetExprWithout//K2-LetExprWithout-22, EXPECTED_RESULT_GOT_SAME_RESULT
+FLWORExpr/LetExpr/LetExprWithout//K2-LetExprWithout-23, EXPECTED_RESULT_GOT_FAILURE
FLWORExpr/LetExpr/LetExprWithout//K2-LetExprWithout-24, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
FLWORExpr/LetExpr/LetExprWithout//K2-LetExprWithout-25, EXPECTED_RESULT_GOT_SAME_RESULT
-FLWORExpr/LetExpr/LetExprWithout//K2-LetExprWithout-26, EXPECTED_ERROR_GOT_FAILURE
+FLWORExpr/LetExpr/LetExprWithout//K2-LetExprWithout-26, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
FLWORExpr/LetExpr/LetExprWithout//K2-LetExprWithout-3, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
FLWORExpr/LetExpr/LetExprWithout//K2-LetExprWithout-4, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
FLWORExpr/LetExpr/LetExprWithout//K2-LetExprWithout-5, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
@@ -10629,7 +10629,7 @@ FLWORExpr/OrderbyExpr/OrderbyExprWithout//K2-OrderbyExprWithout-4, EXPECTED_ERRO
FLWORExpr/OrderbyExpr/OrderbyExprWithout//K2-OrderbyExprWithout-40, EXPECTED_ERROR_GOT_RESULT
FLWORExpr/OrderbyExpr/OrderbyExprWithout//K2-OrderbyExprWithout-41, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
FLWORExpr/OrderbyExpr/OrderbyExprWithout//K2-OrderbyExprWithout-42, NO_RESULT_FILE
-FLWORExpr/OrderbyExpr/OrderbyExprWithout//K2-OrderbyExprWithout-43, EXPECTED_RESULT_GOT_FAILURE
+FLWORExpr/OrderbyExpr/OrderbyExprWithout//K2-OrderbyExprWithout-43, EXPECTED_RESULT_GOT_SAME_RESULT
FLWORExpr/OrderbyExpr/OrderbyExprWithout//K2-OrderbyExprWithout-44, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
FLWORExpr/OrderbyExpr/OrderbyExprWithout//K2-OrderbyExprWithout-45, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
FLWORExpr/OrderbyExpr/OrderbyExprWithout//K2-OrderbyExprWithout-46, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
@@ -10644,10 +10644,10 @@ FLWORExpr/OrderbyExpr/OrderbyExprWithout//K2-OrderbyExprWithout-9, EXPECTED_ERRO
FLWORExpr/ReturnExpr//K2-ReturnExpr-1, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
FLWORExpr/WhereExpr//K2-WhereExpr-1, EXPECTED_ERROR_GOT_SAME_ERROR
FLWORExpr/WhereExpr//K2-WhereExpr-2, EXPECTED_ERROR_GOT_SAME_ERROR
-FullAxis/ancestor-or-selfAxis//ancestorself-1, EXPECTED_ERROR_GOT_FAILURE
+FullAxis/ancestor-or-selfAxis//ancestorself-1, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
FullAxis/ancestor-or-selfAxis//ancestorself-10, EXPECTED_RESULT_GOT_ERROR
-FullAxis/ancestor-or-selfAxis//ancestorself-11, EXPECTED_RESULT_GOT_FAILURE
-FullAxis/ancestor-or-selfAxis//ancestorself-12, EXPECTED_RESULT_GOT_FAILURE
+FullAxis/ancestor-or-selfAxis//ancestorself-11, EXPECTED_RESULT_GOT_ERROR
+FullAxis/ancestor-or-selfAxis//ancestorself-12, EXPECTED_RESULT_GOT_ERROR
FullAxis/ancestor-or-selfAxis//ancestorself-13, EXPECTED_RESULT_GOT_ERROR
FullAxis/ancestor-or-selfAxis//ancestorself-14, EXPECTED_RESULT_GOT_ERROR
FullAxis/ancestor-or-selfAxis//ancestorself-15, EXPECTED_RESULT_GOT_ERROR
@@ -10657,7 +10657,7 @@ FullAxis/ancestor-or-selfAxis//ancestorself-18, EXPECTED_RESULT_GOT_ERROR
FullAxis/ancestor-or-selfAxis//ancestorself-19, EXPECTED_RESULT_GOT_ERROR
FullAxis/ancestor-or-selfAxis//ancestorself-2, EXPECTED_RESULT_GOT_ERROR
FullAxis/ancestor-or-selfAxis//ancestorself-20, EXPECTED_RESULT_GOT_ERROR
-FullAxis/ancestor-or-selfAxis//ancestorself-21, EXPECTED_RESULT_GOT_FAILURE
+FullAxis/ancestor-or-selfAxis//ancestorself-21, EXPECTED_RESULT_GOT_ERROR
FullAxis/ancestor-or-selfAxis//ancestorself-3, EXPECTED_RESULT_GOT_ERROR
FullAxis/ancestor-or-selfAxis//ancestorself-4, EXPECTED_RESULT_GOT_ERROR
FullAxis/ancestor-or-selfAxis//ancestorself-5, EXPECTED_RESULT_GOT_ERROR
@@ -10666,10 +10666,10 @@ FullAxis/ancestor-or-selfAxis//ancestorself-7, EXPECTED_RESULT_GOT_ERROR
FullAxis/ancestor-or-selfAxis//ancestorself-8, EXPECTED_RESULT_GOT_ERROR
FullAxis/ancestor-or-selfAxis//ancestorself-9, EXPECTED_RESULT_GOT_ERROR
FullAxis/ancestor-or-selfAxis//unabbreviatedSyntax-11, EXPECTED_RESULT_GOT_ERROR
-FullAxis/ancestorAxis//ancestor-1, EXPECTED_ERROR_GOT_FAILURE
+FullAxis/ancestorAxis//ancestor-1, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
FullAxis/ancestorAxis//ancestor-10, EXPECTED_RESULT_GOT_ERROR
-FullAxis/ancestorAxis//ancestor-11, EXPECTED_RESULT_GOT_FAILURE
-FullAxis/ancestorAxis//ancestor-12, EXPECTED_RESULT_GOT_FAILURE
+FullAxis/ancestorAxis//ancestor-11, EXPECTED_RESULT_GOT_ERROR
+FullAxis/ancestorAxis//ancestor-12, EXPECTED_RESULT_GOT_ERROR
FullAxis/ancestorAxis//ancestor-13, EXPECTED_RESULT_GOT_ERROR
FullAxis/ancestorAxis//ancestor-14, EXPECTED_RESULT_GOT_ERROR
FullAxis/ancestorAxis//ancestor-15, EXPECTED_RESULT_GOT_ERROR
@@ -10679,7 +10679,7 @@ FullAxis/ancestorAxis//ancestor-18, EXPECTED_RESULT_GOT_ERROR
FullAxis/ancestorAxis//ancestor-19, EXPECTED_RESULT_GOT_ERROR
FullAxis/ancestorAxis//ancestor-2, EXPECTED_RESULT_GOT_ERROR
FullAxis/ancestorAxis//ancestor-20, EXPECTED_RESULT_GOT_ERROR
-FullAxis/ancestorAxis//ancestor-21, EXPECTED_RESULT_GOT_FAILURE
+FullAxis/ancestorAxis//ancestor-21, EXPECTED_RESULT_GOT_ERROR
FullAxis/ancestorAxis//ancestor-3, EXPECTED_RESULT_GOT_ERROR
FullAxis/ancestorAxis//ancestor-4, EXPECTED_RESULT_GOT_ERROR
FullAxis/ancestorAxis//ancestor-5, EXPECTED_RESULT_GOT_ERROR
@@ -10688,10 +10688,10 @@ FullAxis/ancestorAxis//ancestor-7, EXPECTED_RESULT_GOT_ERROR
FullAxis/ancestorAxis//ancestor-8, EXPECTED_RESULT_GOT_ERROR
FullAxis/ancestorAxis//ancestor-9, EXPECTED_RESULT_GOT_ERROR
FullAxis/ancestorAxis//unabbreviatedSyntax-10, EXPECTED_RESULT_GOT_ERROR
-FullAxis/following-siblingAxis//followingsibling-1, EXPECTED_ERROR_GOT_FAILURE
+FullAxis/following-siblingAxis//followingsibling-1, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
FullAxis/following-siblingAxis//followingsibling-10, EXPECTED_RESULT_GOT_ERROR
-FullAxis/following-siblingAxis//followingsibling-11, EXPECTED_RESULT_GOT_FAILURE
-FullAxis/following-siblingAxis//followingsibling-12, EXPECTED_RESULT_GOT_FAILURE
+FullAxis/following-siblingAxis//followingsibling-11, EXPECTED_RESULT_GOT_ERROR
+FullAxis/following-siblingAxis//followingsibling-12, EXPECTED_RESULT_GOT_ERROR
FullAxis/following-siblingAxis//followingsibling-13, EXPECTED_RESULT_GOT_ERROR
FullAxis/following-siblingAxis//followingsibling-14, EXPECTED_RESULT_GOT_ERROR
FullAxis/following-siblingAxis//followingsibling-15, EXPECTED_RESULT_GOT_ERROR
@@ -10701,7 +10701,7 @@ FullAxis/following-siblingAxis//followingsibling-18, EXPECTED_RESULT_GOT_ERROR
FullAxis/following-siblingAxis//followingsibling-19, EXPECTED_RESULT_GOT_ERROR
FullAxis/following-siblingAxis//followingsibling-2, EXPECTED_RESULT_GOT_ERROR
FullAxis/following-siblingAxis//followingsibling-20, EXPECTED_RESULT_GOT_ERROR
-FullAxis/following-siblingAxis//followingsibling-21, EXPECTED_RESULT_GOT_FAILURE
+FullAxis/following-siblingAxis//followingsibling-21, EXPECTED_RESULT_GOT_ERROR
FullAxis/following-siblingAxis//followingsibling-3, EXPECTED_RESULT_GOT_ERROR
FullAxis/following-siblingAxis//followingsibling-4, EXPECTED_RESULT_GOT_ERROR
FullAxis/following-siblingAxis//followingsibling-5, EXPECTED_RESULT_GOT_ERROR
@@ -10710,10 +10710,10 @@ FullAxis/following-siblingAxis//followingsibling-7, EXPECTED_RESULT_GOT_ERROR
FullAxis/following-siblingAxis//followingsibling-8, EXPECTED_RESULT_GOT_ERROR
FullAxis/following-siblingAxis//followingsibling-9, EXPECTED_RESULT_GOT_ERROR
FullAxis/following-siblingAxis//unabbreviatedSyntax-24, EXPECTED_RESULT_GOT_ERROR
-FullAxis/followingAxis//following-1, EXPECTED_ERROR_GOT_FAILURE
+FullAxis/followingAxis//following-1, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
FullAxis/followingAxis//following-10, EXPECTED_RESULT_GOT_ERROR
-FullAxis/followingAxis//following-11, EXPECTED_RESULT_GOT_FAILURE
-FullAxis/followingAxis//following-12, EXPECTED_RESULT_GOT_FAILURE
+FullAxis/followingAxis//following-11, EXPECTED_RESULT_GOT_ERROR
+FullAxis/followingAxis//following-12, EXPECTED_RESULT_GOT_ERROR
FullAxis/followingAxis//following-13, EXPECTED_RESULT_GOT_ERROR
FullAxis/followingAxis//following-14, EXPECTED_RESULT_GOT_ERROR
FullAxis/followingAxis//following-15, EXPECTED_RESULT_GOT_ERROR
@@ -10723,7 +10723,7 @@ FullAxis/followingAxis//following-18, EXPECTED_RESULT_GOT_ERROR
FullAxis/followingAxis//following-19, EXPECTED_RESULT_GOT_ERROR
FullAxis/followingAxis//following-2, EXPECTED_RESULT_GOT_ERROR
FullAxis/followingAxis//following-20, EXPECTED_RESULT_GOT_ERROR
-FullAxis/followingAxis//following-21, EXPECTED_RESULT_GOT_FAILURE
+FullAxis/followingAxis//following-21, EXPECTED_RESULT_GOT_ERROR
FullAxis/followingAxis//following-3, EXPECTED_RESULT_GOT_ERROR
FullAxis/followingAxis//following-4, EXPECTED_RESULT_GOT_ERROR
FullAxis/followingAxis//following-5, EXPECTED_RESULT_GOT_ERROR
@@ -10731,10 +10731,10 @@ FullAxis/followingAxis//following-6, EXPECTED_RESULT_GOT_ERROR
FullAxis/followingAxis//following-7, EXPECTED_RESULT_GOT_ERROR
FullAxis/followingAxis//following-8, EXPECTED_RESULT_GOT_ERROR
FullAxis/followingAxis//following-9, EXPECTED_RESULT_GOT_ERROR
-FullAxis/preceding-siblingAxis//preceding-sibling-1, EXPECTED_ERROR_GOT_FAILURE
+FullAxis/preceding-siblingAxis//preceding-sibling-1, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
FullAxis/preceding-siblingAxis//preceding-sibling-10, EXPECTED_RESULT_GOT_ERROR
-FullAxis/preceding-siblingAxis//preceding-sibling-11, EXPECTED_RESULT_GOT_FAILURE
-FullAxis/preceding-siblingAxis//preceding-sibling-12, EXPECTED_RESULT_GOT_FAILURE
+FullAxis/preceding-siblingAxis//preceding-sibling-11, EXPECTED_RESULT_GOT_ERROR
+FullAxis/preceding-siblingAxis//preceding-sibling-12, EXPECTED_RESULT_GOT_ERROR
FullAxis/preceding-siblingAxis//preceding-sibling-13, EXPECTED_RESULT_GOT_ERROR
FullAxis/preceding-siblingAxis//preceding-sibling-14, EXPECTED_RESULT_GOT_ERROR
FullAxis/preceding-siblingAxis//preceding-sibling-15, EXPECTED_RESULT_GOT_ERROR
@@ -10744,7 +10744,7 @@ FullAxis/preceding-siblingAxis//preceding-sibling-18, EXPECTED_RESULT_GOT_ERROR
FullAxis/preceding-siblingAxis//preceding-sibling-19, EXPECTED_RESULT_GOT_ERROR
FullAxis/preceding-siblingAxis//preceding-sibling-2, EXPECTED_RESULT_GOT_ERROR
FullAxis/preceding-siblingAxis//preceding-sibling-20, EXPECTED_RESULT_GOT_ERROR
-FullAxis/preceding-siblingAxis//preceding-sibling-21, EXPECTED_RESULT_GOT_FAILURE
+FullAxis/preceding-siblingAxis//preceding-sibling-21, EXPECTED_RESULT_GOT_ERROR
FullAxis/preceding-siblingAxis//preceding-sibling-3, EXPECTED_RESULT_GOT_ERROR
FullAxis/preceding-siblingAxis//preceding-sibling-4, EXPECTED_RESULT_GOT_ERROR
FullAxis/preceding-siblingAxis//preceding-sibling-5, EXPECTED_RESULT_GOT_ERROR
@@ -10753,10 +10753,10 @@ FullAxis/preceding-siblingAxis//preceding-sibling-7, EXPECTED_RESULT_GOT_ERROR
FullAxis/preceding-siblingAxis//preceding-sibling-8, EXPECTED_RESULT_GOT_ERROR
FullAxis/preceding-siblingAxis//preceding-sibling-9, EXPECTED_RESULT_GOT_ERROR
FullAxis/preceding-siblingAxis//unabbreviatedSyntax-25, EXPECTED_RESULT_GOT_ERROR
-FullAxis/precedingAxis//preceding-1, EXPECTED_ERROR_GOT_FAILURE
+FullAxis/precedingAxis//preceding-1, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
FullAxis/precedingAxis//preceding-10, EXPECTED_RESULT_GOT_ERROR
-FullAxis/precedingAxis//preceding-11, EXPECTED_RESULT_GOT_FAILURE
-FullAxis/precedingAxis//preceding-12, EXPECTED_RESULT_GOT_FAILURE
+FullAxis/precedingAxis//preceding-11, EXPECTED_RESULT_GOT_ERROR
+FullAxis/precedingAxis//preceding-12, EXPECTED_RESULT_GOT_ERROR
FullAxis/precedingAxis//preceding-13, EXPECTED_RESULT_GOT_ERROR
FullAxis/precedingAxis//preceding-14, EXPECTED_RESULT_GOT_ERROR
FullAxis/precedingAxis//preceding-15, EXPECTED_RESULT_GOT_ERROR
@@ -10766,9 +10766,9 @@ FullAxis/precedingAxis//preceding-18, EXPECTED_RESULT_GOT_ERROR
FullAxis/precedingAxis//preceding-19, EXPECTED_RESULT_GOT_ERROR
FullAxis/precedingAxis//preceding-2, EXPECTED_RESULT_GOT_ERROR
FullAxis/precedingAxis//preceding-20, EXPECTED_RESULT_GOT_ERROR
-FullAxis/precedingAxis//preceding-21, EXPECTED_RESULT_GOT_FAILURE
-FullAxis/precedingAxis//preceding-22, EXPECTED_RESULT_GOT_FAILURE
-FullAxis/precedingAxis//preceding-23, EXPECTED_RESULT_GOT_FAILURE
+FullAxis/precedingAxis//preceding-21, EXPECTED_RESULT_GOT_ERROR
+FullAxis/precedingAxis//preceding-22, EXPECTED_RESULT_GOT_ERROR
+FullAxis/precedingAxis//preceding-23, EXPECTED_RESULT_GOT_ERROR
FullAxis/precedingAxis//preceding-3, EXPECTED_RESULT_GOT_ERROR
FullAxis/precedingAxis//preceding-4, EXPECTED_RESULT_GOT_ERROR
FullAxis/precedingAxis//preceding-5, EXPECTED_RESULT_GOT_ERROR
@@ -10890,9 +10890,9 @@ FunctX/functx-fn-distinct-values//functx-fn-distinct-values-1, EXPECTED_RESULT_G
FunctX/functx-fn-distinct-values//functx-fn-distinct-values-2, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
FunctX/functx-fn-distinct-values//functx-fn-distinct-values-3, EXPECTED_RESULT_GOT_ERROR
FunctX/functx-fn-distinct-values//functx-fn-distinct-values-4, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-FunctX/functx-fn-distinct-values//functx-fn-distinct-values-5, EXPECTED_RESULT_GOT_FAILURE
+FunctX/functx-fn-distinct-values//functx-fn-distinct-values-5, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
FunctX/functx-fn-distinct-values//functx-fn-distinct-values-6, EXPECTED_RESULT_GOT_SAME_RESULT
-FunctX/functx-fn-distinct-values//functx-fn-distinct-values-all, EXPECTED_RESULT_GOT_FAILURE
+FunctX/functx-fn-distinct-values//functx-fn-distinct-values-all, EXPECTED_RESULT_GOT_ERROR
FunctX/functx-fn-doc-available//functx-fn-doc-available-1, EXPECTED_RESULT_GOT_FAILURE
FunctX/functx-fn-empty//functx-fn-empty-1, EXPECTED_RESULT_GOT_SAME_RESULT
FunctX/functx-fn-empty//functx-fn-empty-2, EXPECTED_RESULT_GOT_SAME_RESULT
@@ -11085,10 +11085,10 @@ FunctX/functx-fn-number//functx-fn-number-all, EXPECTED_RESULT_GOT_FAILURE
FunctX/functx-fn-one-or-more//functx-fn-one-or-more-1, EXPECTED_RESULT_GOT_SAME_RESULT
FunctX/functx-fn-one-or-more//functx-fn-one-or-more-2, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
FunctX/functx-fn-one-or-more//functx-fn-one-or-more-all, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-FunctX/functx-fn-position//functx-fn-position-1, EXPECTED_RESULT_GOT_FAILURE
+FunctX/functx-fn-position//functx-fn-position-1, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
FunctX/functx-fn-position//functx-fn-position-2, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
FunctX/functx-fn-position//functx-fn-position-3, EXPECTED_RESULT_GOT_SAME_RESULT
-FunctX/functx-fn-position//functx-fn-position-all, EXPECTED_RESULT_GOT_FAILURE
+FunctX/functx-fn-position//functx-fn-position-all, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
FunctX/functx-fn-prefix-from-QName//functx-fn-prefix-from-QName-1, EXPECTED_RESULT_GOT_ERROR
FunctX/functx-fn-prefix-from-QName//functx-fn-prefix-from-QName-2, EXPECTED_RESULT_GOT_ERROR
FunctX/functx-fn-prefix-from-QName//functx-fn-prefix-from-QName-3, EXPECTED_RESULT_GOT_ERROR
@@ -11182,10 +11182,10 @@ FunctX/functx-fn-string-to-codepoints//functx-fn-string-to-codepoints-1, EXPECTE
FunctX/functx-fn-string-to-codepoints//functx-fn-string-to-codepoints-2, EXPECTED_RESULT_GOT_SAME_RESULT
FunctX/functx-fn-string-to-codepoints//functx-fn-string-to-codepoints-3, EXPECTED_RESULT_GOT_SAME_RESULT
FunctX/functx-fn-string-to-codepoints//functx-fn-string-to-codepoints-all, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-FunctX/functx-fn-string//functx-fn-string-1, EXPECTED_RESULT_GOT_ERROR
-FunctX/functx-fn-string//functx-fn-string-2, EXPECTED_RESULT_GOT_ERROR
-FunctX/functx-fn-string//functx-fn-string-3, EXPECTED_RESULT_GOT_ERROR
-FunctX/functx-fn-string//functx-fn-string-all, EXPECTED_RESULT_GOT_ERROR
+FunctX/functx-fn-string//functx-fn-string-1, EXPECTED_RESULT_GOT_SAME_RESULT
+FunctX/functx-fn-string//functx-fn-string-2, EXPECTED_RESULT_GOT_SAME_RESULT
+FunctX/functx-fn-string//functx-fn-string-3, EXPECTED_RESULT_GOT_SAME_RESULT
+FunctX/functx-fn-string//functx-fn-string-all, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
FunctX/functx-fn-subsequence//functx-fn-subsequence-1, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
FunctX/functx-fn-subsequence//functx-fn-subsequence-2, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
FunctX/functx-fn-subsequence//functx-fn-subsequence-3, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
@@ -11406,9 +11406,9 @@ FunctX/functx-functx-distinct-element-names//functx-functx-distinct-element-name
FunctX/functx-functx-distinct-element-paths//functx-functx-distinct-element-paths-1, EXPECTED_RESULT_GOT_ERROR
FunctX/functx-functx-distinct-element-paths//functx-functx-distinct-element-paths-2, EXPECTED_RESULT_GOT_ERROR
FunctX/functx-functx-distinct-element-paths//functx-functx-distinct-element-paths-all, EXPECTED_RESULT_GOT_ERROR
-FunctX/functx-functx-distinct-nodes//functx-functx-distinct-nodes-1, EXPECTED_RESULT_GOT_FAILURE
-FunctX/functx-functx-distinct-nodes//functx-functx-distinct-nodes-2, EXPECTED_RESULT_GOT_FAILURE
-FunctX/functx-functx-distinct-nodes//functx-functx-distinct-nodes-all, EXPECTED_RESULT_GOT_FAILURE
+FunctX/functx-functx-distinct-nodes//functx-functx-distinct-nodes-1, EXPECTED_RESULT_GOT_ERROR
+FunctX/functx-functx-distinct-nodes//functx-functx-distinct-nodes-2, EXPECTED_RESULT_GOT_ERROR
+FunctX/functx-functx-distinct-nodes//functx-functx-distinct-nodes-all, EXPECTED_RESULT_GOT_ERROR
FunctX/functx-functx-duration-from-timezone//functx-functx-duration-from-timezone-1, EXPECTED_RESULT_GOT_ERROR
FunctX/functx-functx-duration-from-timezone//functx-functx-duration-from-timezone-2, EXPECTED_RESULT_GOT_ERROR
FunctX/functx-functx-duration-from-timezone//functx-functx-duration-from-timezone-3, EXPECTED_RESULT_GOT_ERROR
@@ -11618,18 +11618,18 @@ FunctX/functx-functx-max-line-length//functx-functx-max-line-length-1, EXPECTED_
FunctX/functx-functx-max-line-length//functx-functx-max-line-length-2, EXPECTED_RESULT_GOT_ERROR
FunctX/functx-functx-max-line-length//functx-functx-max-line-length-all, EXPECTED_RESULT_GOT_ERROR
FunctX/functx-functx-max-node//functx-functx-max-node-1, EXPECTED_RESULT_GOT_ERROR
-FunctX/functx-functx-max-string//functx-functx-max-string-1, EXPECTED_RESULT_GOT_FAILURE
+FunctX/functx-functx-max-string//functx-functx-max-string-1, EXPECTED_RESULT_GOT_ERROR
FunctX/functx-functx-max-string//functx-functx-max-string-2, EXPECTED_RESULT_GOT_ERROR
-FunctX/functx-functx-max-string//functx-functx-max-string-all, EXPECTED_RESULT_GOT_FAILURE
+FunctX/functx-functx-max-string//functx-functx-max-string-all, EXPECTED_RESULT_GOT_ERROR
FunctX/functx-functx-min-determine-type//functx-functx-min-determine-type-1, EXPECTED_RESULT_GOT_ERROR
FunctX/functx-functx-min-determine-type//functx-functx-min-determine-type-2, EXPECTED_RESULT_GOT_ERROR
FunctX/functx-functx-min-determine-type//functx-functx-min-determine-type-3, EXPECTED_RESULT_GOT_ERROR
FunctX/functx-functx-min-determine-type//functx-functx-min-determine-type-all, EXPECTED_RESULT_GOT_ERROR
FunctX/functx-functx-min-node//functx-functx-min-node-1, EXPECTED_RESULT_GOT_ERROR
FunctX/functx-functx-min-non-empty-string//functx-functx-min-non-empty-string-1, EXPECTED_RESULT_GOT_ERROR
-FunctX/functx-functx-min-string//functx-functx-min-string-1, EXPECTED_RESULT_GOT_FAILURE
+FunctX/functx-functx-min-string//functx-functx-min-string-1, EXPECTED_RESULT_GOT_ERROR
FunctX/functx-functx-min-string//functx-functx-min-string-2, EXPECTED_RESULT_GOT_ERROR
-FunctX/functx-functx-min-string//functx-functx-min-string-all, EXPECTED_RESULT_GOT_FAILURE
+FunctX/functx-functx-min-string//functx-functx-min-string-all, EXPECTED_RESULT_GOT_ERROR
FunctX/functx-functx-mmddyyyy-to-date//functx-functx-mmddyyyy-to-date-1, EXPECTED_RESULT_GOT_ERROR
FunctX/functx-functx-mmddyyyy-to-date//functx-functx-mmddyyyy-to-date-2, EXPECTED_RESULT_GOT_ERROR
FunctX/functx-functx-mmddyyyy-to-date//functx-functx-mmddyyyy-to-date-3, EXPECTED_RESULT_GOT_ERROR
@@ -11654,11 +11654,11 @@ FunctX/functx-functx-next-day//functx-functx-next-day-2, EXPECTED_RESULT_GOT_ERR
FunctX/functx-functx-next-day//functx-functx-next-day-all, EXPECTED_RESULT_GOT_ERROR
FunctX/functx-functx-node-kind//functx-functx-node-kind-1, EXPECTED_RESULT_GOT_ERROR
FunctX/functx-functx-node-kind//functx-functx-node-kind-2, EXPECTED_RESULT_GOT_ERROR
-FunctX/functx-functx-node-kind//functx-functx-node-kind-3, EXPECTED_RESULT_GOT_FAILURE
-FunctX/functx-functx-node-kind//functx-functx-node-kind-4, EXPECTED_RESULT_GOT_FAILURE
+FunctX/functx-functx-node-kind//functx-functx-node-kind-3, EXPECTED_RESULT_GOT_ERROR
+FunctX/functx-functx-node-kind//functx-functx-node-kind-4, EXPECTED_RESULT_GOT_ERROR
FunctX/functx-functx-node-kind//functx-functx-node-kind-5, EXPECTED_RESULT_GOT_ERROR
FunctX/functx-functx-node-kind//functx-functx-node-kind-6, EXPECTED_RESULT_GOT_ERROR
-FunctX/functx-functx-node-kind//functx-functx-node-kind-all, EXPECTED_RESULT_GOT_FAILURE
+FunctX/functx-functx-node-kind//functx-functx-node-kind-all, EXPECTED_RESULT_GOT_ERROR
FunctX/functx-functx-non-distinct-values//functx-functx-non-distinct-values-1, EXPECTED_RESULT_GOT_ERROR
FunctX/functx-functx-non-distinct-values//functx-functx-non-distinct-values-2, EXPECTED_RESULT_GOT_ERROR
FunctX/functx-functx-non-distinct-values//functx-functx-non-distinct-values-3, EXPECTED_RESULT_GOT_ERROR
@@ -11679,11 +11679,11 @@ FunctX/functx-functx-pad-string-to-length//functx-functx-pad-string-to-length-2,
FunctX/functx-functx-pad-string-to-length//functx-functx-pad-string-to-length-3, EXPECTED_RESULT_GOT_ERROR
FunctX/functx-functx-pad-string-to-length//functx-functx-pad-string-to-length-all, EXPECTED_RESULT_GOT_ERROR
FunctX/functx-functx-path-to-node-with-pos//functx-functx-path-to-node-with-pos-1, EXPECTED_RESULT_GOT_ERROR
-FunctX/functx-functx-path-to-node-with-pos//functx-functx-path-to-node-with-pos-2, EXPECTED_RESULT_GOT_FAILURE
-FunctX/functx-functx-path-to-node-with-pos//functx-functx-path-to-node-with-pos-all, EXPECTED_RESULT_GOT_FAILURE
+FunctX/functx-functx-path-to-node-with-pos//functx-functx-path-to-node-with-pos-2, EXPECTED_RESULT_GOT_ERROR
+FunctX/functx-functx-path-to-node-with-pos//functx-functx-path-to-node-with-pos-all, EXPECTED_RESULT_GOT_ERROR
FunctX/functx-functx-path-to-node//functx-functx-path-to-node-1, EXPECTED_RESULT_GOT_ERROR
-FunctX/functx-functx-path-to-node//functx-functx-path-to-node-2, EXPECTED_RESULT_GOT_FAILURE
-FunctX/functx-functx-path-to-node//functx-functx-path-to-node-all, EXPECTED_RESULT_GOT_FAILURE
+FunctX/functx-functx-path-to-node//functx-functx-path-to-node-2, EXPECTED_RESULT_GOT_ERROR
+FunctX/functx-functx-path-to-node//functx-functx-path-to-node-all, EXPECTED_RESULT_GOT_ERROR
FunctX/functx-functx-precedes-not-ancestor//functx-functx-precedes-not-ancestor-1, EXPECTED_RESULT_GOT_ERROR
FunctX/functx-functx-precedes-not-ancestor//functx-functx-precedes-not-ancestor-2, EXPECTED_RESULT_GOT_ERROR
FunctX/functx-functx-precedes-not-ancestor//functx-functx-precedes-not-ancestor-3, EXPECTED_RESULT_GOT_ERROR
@@ -11745,30 +11745,30 @@ FunctX/functx-functx-scheme-from-uri//functx-functx-scheme-from-uri-3, EXPECTED_
FunctX/functx-functx-scheme-from-uri//functx-functx-scheme-from-uri-4, EXPECTED_RESULT_GOT_ERROR
FunctX/functx-functx-scheme-from-uri//functx-functx-scheme-from-uri-5, EXPECTED_RESULT_GOT_ERROR
FunctX/functx-functx-scheme-from-uri//functx-functx-scheme-from-uri-all, EXPECTED_RESULT_GOT_ERROR
-FunctX/functx-functx-sequence-deep-equal//functx-functx-sequence-deep-equal-1, EXPECTED_RESULT_GOT_FAILURE
+FunctX/functx-functx-sequence-deep-equal//functx-functx-sequence-deep-equal-1, EXPECTED_RESULT_GOT_ERROR
FunctX/functx-functx-sequence-deep-equal//functx-functx-sequence-deep-equal-2, EXPECTED_RESULT_GOT_ERROR
FunctX/functx-functx-sequence-deep-equal//functx-functx-sequence-deep-equal-3, EXPECTED_RESULT_GOT_ERROR
-FunctX/functx-functx-sequence-deep-equal//functx-functx-sequence-deep-equal-all, EXPECTED_RESULT_GOT_FAILURE
-FunctX/functx-functx-sequence-node-equal-any-order//functx-functx-sequence-node-equal-any-order-1, EXPECTED_RESULT_GOT_FAILURE
+FunctX/functx-functx-sequence-deep-equal//functx-functx-sequence-deep-equal-all, EXPECTED_RESULT_GOT_ERROR
+FunctX/functx-functx-sequence-node-equal-any-order//functx-functx-sequence-node-equal-any-order-1, EXPECTED_RESULT_GOT_ERROR
FunctX/functx-functx-sequence-node-equal-any-order//functx-functx-sequence-node-equal-any-order-2, EXPECTED_RESULT_GOT_ERROR
FunctX/functx-functx-sequence-node-equal-any-order//functx-functx-sequence-node-equal-any-order-3, EXPECTED_RESULT_GOT_ERROR
-FunctX/functx-functx-sequence-node-equal-any-order//functx-functx-sequence-node-equal-any-order-all, EXPECTED_RESULT_GOT_FAILURE
-FunctX/functx-functx-sequence-node-equal//functx-functx-sequence-node-equal-1, EXPECTED_RESULT_GOT_FAILURE
+FunctX/functx-functx-sequence-node-equal-any-order//functx-functx-sequence-node-equal-any-order-all, EXPECTED_RESULT_GOT_ERROR
+FunctX/functx-functx-sequence-node-equal//functx-functx-sequence-node-equal-1, EXPECTED_RESULT_GOT_ERROR
FunctX/functx-functx-sequence-node-equal//functx-functx-sequence-node-equal-2, EXPECTED_RESULT_GOT_ERROR
FunctX/functx-functx-sequence-node-equal//functx-functx-sequence-node-equal-3, EXPECTED_RESULT_GOT_ERROR
-FunctX/functx-functx-sequence-node-equal//functx-functx-sequence-node-equal-all, EXPECTED_RESULT_GOT_FAILURE
+FunctX/functx-functx-sequence-node-equal//functx-functx-sequence-node-equal-all, EXPECTED_RESULT_GOT_ERROR
FunctX/functx-functx-sequence-type//functx-functx-sequence-type-1, EXPECTED_RESULT_GOT_ERROR
-FunctX/functx-functx-sequence-type//functx-functx-sequence-type-10, EXPECTED_RESULT_GOT_FAILURE
-FunctX/functx-functx-sequence-type//functx-functx-sequence-type-11, EXPECTED_RESULT_GOT_FAILURE
+FunctX/functx-functx-sequence-type//functx-functx-sequence-type-10, EXPECTED_RESULT_GOT_ERROR
+FunctX/functx-functx-sequence-type//functx-functx-sequence-type-11, EXPECTED_RESULT_GOT_ERROR
FunctX/functx-functx-sequence-type//functx-functx-sequence-type-2, EXPECTED_RESULT_GOT_ERROR
FunctX/functx-functx-sequence-type//functx-functx-sequence-type-3, EXPECTED_RESULT_GOT_ERROR
FunctX/functx-functx-sequence-type//functx-functx-sequence-type-4, EXPECTED_RESULT_GOT_ERROR
-FunctX/functx-functx-sequence-type//functx-functx-sequence-type-5, EXPECTED_RESULT_GOT_FAILURE
-FunctX/functx-functx-sequence-type//functx-functx-sequence-type-6, EXPECTED_RESULT_GOT_FAILURE
-FunctX/functx-functx-sequence-type//functx-functx-sequence-type-7, EXPECTED_RESULT_GOT_FAILURE
-FunctX/functx-functx-sequence-type//functx-functx-sequence-type-8, EXPECTED_RESULT_GOT_FAILURE
-FunctX/functx-functx-sequence-type//functx-functx-sequence-type-9, EXPECTED_RESULT_GOT_FAILURE
-FunctX/functx-functx-sequence-type//functx-functx-sequence-type-all, EXPECTED_RESULT_GOT_FAILURE
+FunctX/functx-functx-sequence-type//functx-functx-sequence-type-5, EXPECTED_RESULT_GOT_ERROR
+FunctX/functx-functx-sequence-type//functx-functx-sequence-type-6, EXPECTED_RESULT_GOT_ERROR
+FunctX/functx-functx-sequence-type//functx-functx-sequence-type-7, EXPECTED_RESULT_GOT_ERROR
+FunctX/functx-functx-sequence-type//functx-functx-sequence-type-8, EXPECTED_RESULT_GOT_ERROR
+FunctX/functx-functx-sequence-type//functx-functx-sequence-type-9, EXPECTED_RESULT_GOT_ERROR
+FunctX/functx-functx-sequence-type//functx-functx-sequence-type-all, EXPECTED_RESULT_GOT_ERROR
FunctX/functx-functx-siblings-same-name//functx-functx-siblings-same-name-1, EXPECTED_RESULT_GOT_ERROR
FunctX/functx-functx-siblings-same-name//functx-functx-siblings-same-name-2, EXPECTED_RESULT_GOT_ERROR
FunctX/functx-functx-siblings-same-name//functx-functx-siblings-same-name-all, EXPECTED_RESULT_GOT_ERROR
@@ -11776,15 +11776,15 @@ FunctX/functx-functx-siblings//functx-functx-siblings-1, EXPECTED_RESULT_GOT_ERR
FunctX/functx-functx-siblings//functx-functx-siblings-2, EXPECTED_RESULT_GOT_ERROR
FunctX/functx-functx-siblings//functx-functx-siblings-all, EXPECTED_RESULT_GOT_ERROR
FunctX/functx-functx-sort-as-numeric//functx-functx-sort-as-numeric-1, EXPECTED_RESULT_GOT_ERROR
-FunctX/functx-functx-sort-as-numeric//functx-functx-sort-as-numeric-2, EXPECTED_RESULT_GOT_FAILURE
-FunctX/functx-functx-sort-as-numeric//functx-functx-sort-as-numeric-all, EXPECTED_RESULT_GOT_FAILURE
+FunctX/functx-functx-sort-as-numeric//functx-functx-sort-as-numeric-2, EXPECTED_RESULT_GOT_ERROR
+FunctX/functx-functx-sort-as-numeric//functx-functx-sort-as-numeric-all, EXPECTED_RESULT_GOT_ERROR
FunctX/functx-functx-sort-case-insensitive//functx-functx-sort-case-insensitive-1, EXPECTED_RESULT_GOT_ERROR
-FunctX/functx-functx-sort-case-insensitive//functx-functx-sort-case-insensitive-2, EXPECTED_RESULT_GOT_FAILURE
-FunctX/functx-functx-sort-case-insensitive//functx-functx-sort-case-insensitive-all, EXPECTED_RESULT_GOT_FAILURE
+FunctX/functx-functx-sort-case-insensitive//functx-functx-sort-case-insensitive-2, EXPECTED_RESULT_GOT_ERROR
+FunctX/functx-functx-sort-case-insensitive//functx-functx-sort-case-insensitive-all, EXPECTED_RESULT_GOT_ERROR
FunctX/functx-functx-sort-document-order//functx-functx-sort-document-order-1, EXPECTED_RESULT_GOT_ERROR
FunctX/functx-functx-sort//functx-functx-sort-1, EXPECTED_RESULT_GOT_ERROR
-FunctX/functx-functx-sort//functx-functx-sort-2, EXPECTED_RESULT_GOT_FAILURE
-FunctX/functx-functx-sort//functx-functx-sort-all, EXPECTED_RESULT_GOT_FAILURE
+FunctX/functx-functx-sort//functx-functx-sort-2, EXPECTED_RESULT_GOT_ERROR
+FunctX/functx-functx-sort//functx-functx-sort-all, EXPECTED_RESULT_GOT_ERROR
FunctX/functx-functx-substring-after-if-contains//functx-functx-substring-after-if-contains-1, EXPECTED_RESULT_GOT_ERROR
FunctX/functx-functx-substring-after-if-contains//functx-functx-substring-after-if-contains-2, EXPECTED_RESULT_GOT_ERROR
FunctX/functx-functx-substring-after-if-contains//functx-functx-substring-after-if-contains-all, EXPECTED_RESULT_GOT_ERROR
@@ -11906,9 +11906,9 @@ FunctX/functx-functx-yyyymmdd-to-date//functx-functx-yyyymmdd-to-date-all, EXPEC
Functions/AccessorFunc/BaseURIFunc//K-BaseURIFun
<TRUNCATED>
[28/50] [abbrv] vxquery git commit: Updated the XQTS stored results.
Posted by sj...@apache.org.
Updated the XQTS stored results.
Project: http://git-wip-us.apache.org/repos/asf/vxquery/repo
Commit: http://git-wip-us.apache.org/repos/asf/vxquery/commit/bf8ab735
Tree: http://git-wip-us.apache.org/repos/asf/vxquery/tree/bf8ab735
Diff: http://git-wip-us.apache.org/repos/asf/vxquery/diff/bf8ab735
Branch: refs/heads/site
Commit: bf8ab7356271910778c1fe636e706f9c6c86c87a
Parents: d7c32f8
Author: Preston Carman <pr...@apache.org>
Authored: Fri Mar 4 10:21:11 2016 -0800
Committer: Preston Carman <pr...@apache.org>
Committed: Fri Mar 4 10:21:11 2016 -0800
----------------------------------------------------------------------
vxquery-xtest/results/xqts.txt | 742 ++++++++++++++++++------------------
1 file changed, 371 insertions(+), 371 deletions(-)
----------------------------------------------------------------------
[45/50] [abbrv] vxquery git commit: Updated release doc
Posted by sj...@apache.org.
Updated release doc
Project: http://git-wip-us.apache.org/repos/asf/vxquery/repo
Commit: http://git-wip-us.apache.org/repos/asf/vxquery/commit/9deade93
Tree: http://git-wip-us.apache.org/repos/asf/vxquery/tree/9deade93
Diff: http://git-wip-us.apache.org/repos/asf/vxquery/diff/9deade93
Branch: refs/heads/site
Commit: 9deade9386c655b44913e17bf6c53c37d09fb783
Parents: 3fc2d6c
Author: Steven Jacobs <sj...@ucr.edu>
Authored: Thu May 19 11:38:03 2016 -0700
Committer: Steven Jacobs <sj...@ucr.edu>
Committed: Thu May 19 11:38:03 2016 -0700
----------------------------------------------------------------------
src/site/apt/development_release.apt | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/vxquery/blob/9deade93/src/site/apt/development_release.apt
----------------------------------------------------------------------
diff --git a/src/site/apt/development_release.apt b/src/site/apt/development_release.apt
index 5c0d83a..9181964 100644
--- a/src/site/apt/development_release.apt
+++ b/src/site/apt/development_release.apt
@@ -45,13 +45,14 @@ $ svn co https://svn.apache.org/repos/asf/vxquery/site
---
* create a code signing key with the Apache {{{http://www.apache.org/dev/openpgp.html#generate-key}instructions}} and example settings
+ * Note: this guide may be helpful for installing {{{http://macgpg.sourceforge.net/docs/howto-build-gpg-osx.txt.asc}gpg}}
* add your key to the <<<KEYS>>> file
Change into the <<<dist>>> directory and run
---
-(gpg2 --list-sigs <your name> && gpg2 --armor --export <your name>) >> KEYS
+$ (gpg2 --list-sigs <your name> && gpg2 --armor --export <your name>) >> KEYS
---
and then check the new <<<KEYS>>> file into svn
@@ -62,11 +63,11 @@ $ svn ci -m "add [YOUR NAME]'s key to KEYS file"
* create an encrypted version of your Apache LDAP password for the nexus repository at {{{https://repository.apache.org/}https://repository.apache.org/}}
- Follow the steps in the {{{http://maven.apache.org/guides/mini/guide-encryption.html}Password Encryption}}
+ Follow the steps in the {{{http://maven.apache.org/guides/mini/guide-encryption.html}How to create a master password}}
guide to encrypt a master password and to encrypt your Apache LDAP password.
(It's nicer if you have maven > 3.2.1 to do this.)
- * add to <<<~/.m2/settings.xml>>>
+ * add the following xml to <<<~/.m2/settings.xml>>>
* for the upload to the nexus repository
@@ -127,7 +128,7 @@ $ mvn clean
* run rat (always do this on a clean source folder):
---
-$ java -jar ~/Downloads/apache-rat-0.11/apache-rat-0.11.jar -d . -E .rat-excludes
+$ java -jar ~/<DOWLOADS FOLDER>/apache-rat-0.11/apache-rat-0.11.jar -d . -E .rat-excludes
---
* test your setup
[32/50] [abbrv] vxquery git commit: VXQUERY-139: Fixed the NPE for
the compile only flag.
Posted by sj...@apache.org.
VXQUERY-139: Fixed the NPE for the compile only flag.
Previously executing queries with compileonly flag gave NPE, which was due to null value of IHyracksClientConnection.
Submitted by: ankitladhania (on github)
Project: http://git-wip-us.apache.org/repos/asf/vxquery/repo
Commit: http://git-wip-us.apache.org/repos/asf/vxquery/commit/47815f89
Tree: http://git-wip-us.apache.org/repos/asf/vxquery/tree/47815f89
Diff: http://git-wip-us.apache.org/repos/asf/vxquery/diff/47815f89
Branch: refs/heads/site
Commit: 47815f899547f5e23a2d12a7da3ab038649d307f
Parents: bb39a04
Author: Preston Carman <pr...@apache.org>
Authored: Tue Mar 22 17:29:24 2016 -0700
Committer: Preston Carman <pr...@apache.org>
Committed: Tue Mar 22 17:29:24 2016 -0700
----------------------------------------------------------------------
.gitignore | 1 +
.../java/org/apache/vxquery/cli/VXQuery.java | 30 ++++++++++----------
2 files changed, 16 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/vxquery/blob/47815f89/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
index fdde96a..65263b3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,6 @@
.project
.settings
.classpath
+.idea
target
/ClusterControllerService/
http://git-wip-us.apache.org/repos/asf/vxquery/blob/47815f89/vxquery-cli/src/main/java/org/apache/vxquery/cli/VXQuery.java
----------------------------------------------------------------------
diff --git a/vxquery-cli/src/main/java/org/apache/vxquery/cli/VXQuery.java b/vxquery-cli/src/main/java/org/apache/vxquery/cli/VXQuery.java
index 53b352f..a02c65d 100644
--- a/vxquery-cli/src/main/java/org/apache/vxquery/cli/VXQuery.java
+++ b/vxquery-cli/src/main/java/org/apache/vxquery/cli/VXQuery.java
@@ -81,8 +81,7 @@ public class VXQuery {
/**
* Constructor to use command line options passed.
*
- * @param opts
- * Command line options object
+ * @param opts Command line options object
*/
public VXQuery(CmdLineOptions opts) {
this.opts = opts;
@@ -240,23 +239,24 @@ public class VXQuery {
* @throws Exception
*/
private String[] getNodeList() throws Exception {
- Map<String, NodeControllerInfo> nodeControllerInfos = hcc.getNodeControllerInfos();
- String[] nodeList = new String[nodeControllerInfos.size()];
- int index = 0;
- for (String node : nodeControllerInfos.keySet()) {
- nodeList[index++] = node;
+ if (hcc != null) {
+ Map<String, NodeControllerInfo> nodeControllerInfos = hcc.getNodeControllerInfos();
+ String[] nodeList = new String[nodeControllerInfos.size()];
+ int index = 0;
+ for (String node : nodeControllerInfos.keySet()) {
+ nodeList[index++] = node;
+ }
+ return nodeList;
}
- return nodeList;
+ return new String[0];
}
/**
* Creates a Hyracks dataset, if not already existing with the job frame size, and 1 reader. Allocates a new buffer of size specified in the frame of Hyracks
* node. Creates new dataset reader with the current job ID and result set ID. Outputs the string in buffer for each frame.
*
- * @param spec
- * JobSpecification object, containing frame size. Current specified job.
- * @param writer
- * Writer for output of job.
+ * @param spec JobSpecification object, containing frame size. Current specified job.
+ * @param writer Writer for output of job.
* @throws Exception
*/
private void runJob(JobSpecification spec, PrintWriter writer) throws Exception {
@@ -339,8 +339,7 @@ public class VXQuery {
/**
* Reads the contents of file given in query into a String. The file is always closed. For XML files UTF-8 encoding is used.
*
- * @param query
- * The query with filename to be processed
+ * @param query The query with filename to be processed
* @return UTF-8 formatted query string
* @throws IOException
*/
@@ -362,7 +361,8 @@ public class VXQuery {
* Helper class with fields and methods to handle all command line options
*/
private static class CmdLineOptions {
- @Option(name = "-available-processors", usage = "Number of available processors. (default: java's available processors)")
+ @Option(name = "-available-processors",
+ usage = "Number of available processors. (default: java's available processors)")
private int availableProcessors = -1;
@Option(name = "-client-net-ip-address", usage = "IP Address of the ClusterController.")
[24/50] [abbrv] vxquery git commit: Updated all the javadoc comments
for java 1.8's new doclint.
Posted by sj...@apache.org.
Updated all the javadoc comments for java 1.8's new doclint.
The new JavaDocs now have a format checker in Java 1.8. The site would not build without these changes. If JavaDoc exists for a method certain attributes must exists (@param, @return, @throws, etc.). Also, any HTML must be formatted correctly. I also added a few ignore options to help clean up eclipse warnings.
Project: http://git-wip-us.apache.org/repos/asf/vxquery/repo
Commit: http://git-wip-us.apache.org/repos/asf/vxquery/commit/51a98938
Tree: http://git-wip-us.apache.org/repos/asf/vxquery/tree/51a98938
Diff: http://git-wip-us.apache.org/repos/asf/vxquery/diff/51a98938
Branch: refs/heads/site
Commit: 51a989382be8b5340ae84214dff9dc16807234c6
Parents: 4684567
Author: Preston Carman <pr...@apache.org>
Authored: Thu Oct 29 10:56:50 2015 -0700
Committer: Preston Carman <pr...@apache.org>
Committed: Thu Oct 29 10:56:50 2015 -0700
----------------------------------------------------------------------
.../VXQueryComparatorFactoryProvider.java | 1 +
.../compiler/rewriter/RewriteRuleset.java | 5 +
.../rewriter/rules/AbstractCollectionRule.java | 11 +-
...tAssignSortDistinctNodesToOperatorsRule.java | 7 +-
.../rewriter/rules/IntroduceCollectionRule.java | 20 +-
.../rules/PushChildIntoDataScanRule.java | 20 +-
.../RemoveUnusedSortDistinctNodesRule.java | 48 ++---
.../rules/RemoveUnusedUnnestIterateRule.java | 20 +-
.../rules/SetCollectionDataSourceRule.java | 9 +-
.../ExtractFunctionsFromJoinConditionRule.java | 15 +-
.../rules/util/CardinalityRuleToolbox.java | 14 +-
.../rewriter/rules/util/ExpressionToolbox.java | 12 ++
.../apache/vxquery/datamodel/util/DateTime.java | 44 +++-
.../org/apache/vxquery/functions/Signature.java | 2 +
.../functions/cast/AbstractCastToOperation.java | 22 +-
.../cast/CastToBase64BinaryOperation.java | 1 +
.../castable/AbstractCastableAsOperation.java | 6 +-
.../error/FnErrorScalarEvaluatorFactory.java | 16 +-
.../FnSubsequenceScalarEvaluatorFactory.java | 4 +-
...stractDescendantPathStepScalarEvaluator.java | 4 +-
.../step/ChildPathStepOperatorDescriptor.java | 16 ++
.../functions/step/ChildPathStepUnnesting.java | 12 +-
.../step/DescendantOrSelfPathStepUnnesting.java | 13 +-
.../runtime/functions/util/FunctionHelper.java | 33 ++-
.../apache/vxquery/types/AbstractNodeType.java | 2 +
.../org/apache/vxquery/types/AnyItemType.java | 1 +
.../org/apache/vxquery/types/AnyNodeType.java | 1 +
.../org/apache/vxquery/types/AnySimpleType.java | 1 +
.../java/org/apache/vxquery/types/AnyType.java | 1 +
.../org/apache/vxquery/types/AttributeType.java | 2 +
.../org/apache/vxquery/types/CommentType.java | 1 +
.../org/apache/vxquery/types/DocumentType.java | 2 +
.../org/apache/vxquery/types/ElementType.java | 2 +
.../apache/vxquery/types/EmptySequenceType.java | 1 +
.../java/org/apache/vxquery/types/NoneType.java | 1 +
.../types/ProcessingInstructionType.java | 2 +
.../java/org/apache/vxquery/types/TextType.java | 1 +
.../xmlquery/query/XMLQueryCompiler.java | 2 +-
.../org/apache/vxquery/xtest/TestRunner.java | 25 +--
.../vxquery/xtest/util/DiskPerformance.java | 215 -------------------
.../xtest/util/tests/AbstractDiskTest.java | 90 --------
.../tests/BufferedParsedCharacterStream.java | 45 ----
.../tests/BufferedReaderBufferedStream.java | 48 -----
.../xtest/util/tests/BufferedReaderStream.java | 46 ----
.../xtest/util/tests/BufferedStream.java | 45 ----
.../vxquery/xtest/util/tests/IDiskTest.java | 31 ---
.../util/tests/ParsedBufferedByteStream.java | 48 -----
.../tests/ParsedBufferedCharacterStream.java | 48 -----
.../xtest/util/tests/ParsedByteStream.java | 46 ----
.../xtest/util/tests/ParsedCharacterStream.java | 47 ----
.../xtest/util/tests/ReaderBufferedStream.java | 46 ----
.../vxquery/xtest/util/tests/ReaderStream.java | 45 ----
.../apache/vxquery/xtest/util/tests/Stream.java | 44 ----
53 files changed, 262 insertions(+), 982 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/vxquery/blob/51a98938/vxquery-core/src/main/java/org/apache/vxquery/compiler/algebricks/VXQueryComparatorFactoryProvider.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/compiler/algebricks/VXQueryComparatorFactoryProvider.java b/vxquery-core/src/main/java/org/apache/vxquery/compiler/algebricks/VXQueryComparatorFactoryProvider.java
index 2643dc5..b7196cf 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/compiler/algebricks/VXQueryComparatorFactoryProvider.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/compiler/algebricks/VXQueryComparatorFactoryProvider.java
@@ -33,6 +33,7 @@ public class VXQueryComparatorFactoryProvider implements IBinaryComparatorFactor
private static class BinaryComparatorFactory implements IBinaryComparatorFactory {
private static final long serialVersionUID = 1L;
+ @SuppressWarnings("unused")
private final boolean ascending;
public BinaryComparatorFactory(Object type, boolean ascending) {
http://git-wip-us.apache.org/repos/asf/vxquery/blob/51a98938/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/RewriteRuleset.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/RewriteRuleset.java b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/RewriteRuleset.java
index 075fb3e..6f09543 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/RewriteRuleset.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/RewriteRuleset.java
@@ -90,6 +90,7 @@ import org.apache.hyracks.algebricks.rewriter.rules.SubplanOutOfGroupRule;
public class RewriteRuleset {
/**
* Optimizations specific to XQuery.
+ * @return List of algebraic rewrite rules.
*/
public final static List<IAlgebraicRewriteRule> buildPathStepNormalizationRuleCollection() {
List<IAlgebraicRewriteRule> normalization = new LinkedList<IAlgebraicRewriteRule>();
@@ -146,6 +147,7 @@ public class RewriteRuleset {
/**
* Optimizations specific to XQuery.
+ * @return List of algebraic rewrite rules.
*/
public final static List<IAlgebraicRewriteRule> buildXQueryNormalizationRuleCollection() {
List<IAlgebraicRewriteRule> normalization = new LinkedList<IAlgebraicRewriteRule>();
@@ -170,6 +172,7 @@ public class RewriteRuleset {
/**
* Remove expressions known to be redundant.
+ * @return List of algebraic rewrite rules.
*/
public final static List<IAlgebraicRewriteRule> buildInlineRedundantExpressionNormalizationRuleCollection() {
List<IAlgebraicRewriteRule> normalization = new LinkedList<IAlgebraicRewriteRule>();
@@ -188,6 +191,7 @@ public class RewriteRuleset {
/**
* When a nested data sources exist, convert the plan to use the join operator.
+ * @return List of algebraic rewrite rules.
*/
public final static List<IAlgebraicRewriteRule> buildNestedDataSourceRuleCollection() {
List<IAlgebraicRewriteRule> xquery = new LinkedList<IAlgebraicRewriteRule>();
@@ -211,6 +215,7 @@ public class RewriteRuleset {
/**
* Unnest more complex structures.
+ * @return List of algebraic rewrite rules.
*/
public final static List<IAlgebraicRewriteRule> buildUnnestingRuleCollection() {
List<IAlgebraicRewriteRule> xquery = new LinkedList<IAlgebraicRewriteRule>();
http://git-wip-us.apache.org/repos/asf/vxquery/blob/51a98938/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/AbstractCollectionRule.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/AbstractCollectionRule.java b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/AbstractCollectionRule.java
index f343b41..53011d2 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/AbstractCollectionRule.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/AbstractCollectionRule.java
@@ -55,8 +55,12 @@ public abstract class AbstractCollectionRule implements IAlgebraicRewriteRule {
/**
* Get the constant value for the collection. Return null for not a collection.
+ *
+ * @param opRef
+ * Logical operator
+ * @return collection name
*/
- protected String getCollectionName(Mutable<ILogicalOperator> opRef) throws AlgebricksException {
+ protected String getCollectionName(Mutable<ILogicalOperator> opRef) {
VXQueryConstantValue constantValue;
AbstractLogicalOperator op = (AbstractLogicalOperator) opRef.getValue();
@@ -114,9 +118,8 @@ public abstract class AbstractCollectionRule implements IAlgebraicRewriteRule {
if (tvp.getTag() == ValueTag.XS_STRING_TAG) {
tvp.getValue(stringp);
try {
- bbis.setByteBuffer(
- ByteBuffer.wrap(Arrays.copyOfRange(stringp.getByteArray(), stringp.getStartOffset(),
- stringp.getLength() + stringp.getStartOffset())), 0);
+ bbis.setByteBuffer(ByteBuffer.wrap(Arrays.copyOfRange(stringp.getByteArray(), stringp.getStartOffset(),
+ stringp.getLength() + stringp.getStartOffset())), 0);
collectionName = di.readUTF();
} catch (IOException e) {
e.printStackTrace();
http://git-wip-us.apache.org/repos/asf/vxquery/blob/51a98938/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/ConvertAssignSortDistinctNodesToOperatorsRule.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/ConvertAssignSortDistinctNodesToOperatorsRule.java b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/ConvertAssignSortDistinctNodesToOperatorsRule.java
index f70e656..f928209 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/ConvertAssignSortDistinctNodesToOperatorsRule.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/ConvertAssignSortDistinctNodesToOperatorsRule.java
@@ -21,8 +21,6 @@ import java.util.List;
import org.apache.commons.lang3.mutable.Mutable;
import org.apache.commons.lang3.mutable.MutableObject;
-import org.apache.vxquery.functions.BuiltinOperators;
-
import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
import org.apache.hyracks.algebricks.common.utils.Pair;
import org.apache.hyracks.algebricks.core.algebra.base.ILogicalExpression;
@@ -47,6 +45,7 @@ import org.apache.hyracks.algebricks.core.algebra.operators.logical.OrderOperato
import org.apache.hyracks.algebricks.core.algebra.operators.logical.SubplanOperator;
import org.apache.hyracks.algebricks.core.algebra.operators.logical.UnnestOperator;
import org.apache.hyracks.algebricks.core.rewriter.base.IAlgebraicRewriteRule;
+import org.apache.vxquery.functions.BuiltinOperators;
public class ConvertAssignSortDistinctNodesToOperatorsRule implements IAlgebraicRewriteRule {
@@ -59,6 +58,7 @@ public class ConvertAssignSortDistinctNodesToOperatorsRule implements IAlgebraic
* Find where a sort distinct nodes is being used and not required based on input parameters.
* Search pattern: assign [function-call: sort-distinct-nodes-asc-or-atomics]
*/
+ @SuppressWarnings("unused")
@Override
public boolean rewritePost(Mutable<ILogicalOperator> opRef, IOptimizationContext context) {
Mutable<ILogicalOperator> nextOperatorRef;
@@ -160,7 +160,7 @@ public class ConvertAssignSortDistinctNodesToOperatorsRule implements IAlgebraic
Mutable<ILogicalExpression> unnestVariableRef = new MutableObject<ILogicalExpression>(
new VariableReferenceExpression(unnestVariable));
aggregateSequenceArgs.add(unnestVariableRef);
-
+
List<Mutable<ILogicalExpression>> exprs = new ArrayList<Mutable<ILogicalExpression>>();
ILogicalExpression aggregateExp = new AggregateFunctionCallExpression(BuiltinOperators.SEQUENCE, false,
aggregateSequenceArgs);
@@ -199,6 +199,7 @@ public class ConvertAssignSortDistinctNodesToOperatorsRule implements IAlgebraic
}
}
+ @SuppressWarnings("unused")
private OrderOperator getOrderOperator(Mutable<ILogicalExpression> variableRef) {
List<Pair<IOrder, Mutable<ILogicalExpression>>> orderArgs = new ArrayList<Pair<IOrder, Mutable<ILogicalExpression>>>();
orderArgs.add(new Pair<IOrder, Mutable<ILogicalExpression>>(OrderOperator.ASC_ORDER, variableRef));
http://git-wip-us.apache.org/repos/asf/vxquery/blob/51a98938/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/IntroduceCollectionRule.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/IntroduceCollectionRule.java b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/IntroduceCollectionRule.java
index c7dd2ee..cc857a1 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/IntroduceCollectionRule.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/IntroduceCollectionRule.java
@@ -36,33 +36,33 @@ import org.apache.hyracks.algebricks.core.algebra.operators.logical.UnnestOperat
* parallelization. The rule searches for unnest followed by an assign for the
* collection function expression. When this plan block exists the data source
* scan operator added in the blocks place.
- *
+ *
* <pre>
* Before
- *
+ *
* plan__parent
* UNNEST( $v2 : exp($v1) )
* ASSIGN( $v1 : collection( $v0 ) )
* ASSIGN( $v0 : constant )
* plan__child
- *
- * After
- *
+ *
+ * After
+ *
* plan__parent
* UNNEST( $v2 : exp($v1) )
* DATASCAN( collection( $v0 ) , $v1 )
* plan__child
- *
- * Where DATASCAN operator is configured to use the collection( $v0) for
- * data represented by the "constant" and $v1 represents the xml document
+ *
+ * Where DATASCAN operator is configured to use the collection( $v0) for
+ * data represented by the "constant" and $v1 represents the xml document
* nodes from the collection.
* </pre>
- *
+ *
* @author prestonc
*/
public class IntroduceCollectionRule extends AbstractCollectionRule {
@Override
- public boolean rewritePre(Mutable<ILogicalOperator> opRef, IOptimizationContext context) throws AlgebricksException {
+ public boolean rewritePre(Mutable<ILogicalOperator> opRef, IOptimizationContext context) {
VXQueryOptimizationContext vxqueryContext = (VXQueryOptimizationContext) context;
String collectionName = getCollectionName(opRef);
http://git-wip-us.apache.org/repos/asf/vxquery/blob/51a98938/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/PushChildIntoDataScanRule.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/PushChildIntoDataScanRule.java b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/PushChildIntoDataScanRule.java
index 3ad068d..7ffcd90 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/PushChildIntoDataScanRule.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/PushChildIntoDataScanRule.java
@@ -20,24 +20,22 @@ import java.util.ArrayList;
import java.util.List;
import org.apache.commons.lang3.mutable.Mutable;
-import org.apache.vxquery.compiler.rewriter.VXQueryOptimizationContext;
-import org.apache.vxquery.compiler.rewriter.rules.util.ExpressionToolbox;
-import org.apache.vxquery.context.StaticContext;
-import org.apache.vxquery.functions.BuiltinOperators;
-import org.apache.vxquery.metadata.VXQueryCollectionDataSource;
-import org.apache.vxquery.metadata.VXQueryMetadataProvider;
-import org.apache.vxquery.types.ElementType;
-
import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
import org.apache.hyracks.algebricks.core.algebra.base.ILogicalExpression;
import org.apache.hyracks.algebricks.core.algebra.base.ILogicalOperator;
import org.apache.hyracks.algebricks.core.algebra.base.IOptimizationContext;
import org.apache.hyracks.algebricks.core.algebra.base.LogicalOperatorTag;
-import org.apache.hyracks.algebricks.core.algebra.metadata.IMetadataProvider;
import org.apache.hyracks.algebricks.core.algebra.operators.logical.AbstractLogicalOperator;
import org.apache.hyracks.algebricks.core.algebra.operators.logical.AssignOperator;
import org.apache.hyracks.algebricks.core.algebra.operators.logical.DataSourceScanOperator;
import org.apache.hyracks.algebricks.core.algebra.operators.logical.UnnestOperator;
+import org.apache.vxquery.compiler.rewriter.VXQueryOptimizationContext;
+import org.apache.vxquery.compiler.rewriter.rules.util.ExpressionToolbox;
+import org.apache.vxquery.context.StaticContext;
+import org.apache.vxquery.functions.BuiltinOperators;
+import org.apache.vxquery.metadata.VXQueryCollectionDataSource;
+import org.apache.vxquery.metadata.VXQueryMetadataProvider;
+import org.apache.vxquery.types.ElementType;
/**
* The rule searches for an unnest operator immediately following a data scan
@@ -72,8 +70,8 @@ public class PushChildIntoDataScanRule extends AbstractUsedVariablesProcessingRu
protected boolean processOperator(Mutable<ILogicalOperator> opRef, IOptimizationContext context)
throws AlgebricksException {
if (dCtx == null) {
- IMetadataProvider metadataProvider = ((VXQueryOptimizationContext) context).getMetadataProvider();
- dCtx = ((VXQueryMetadataProvider) metadataProvider).getStaticContext();
+ VXQueryOptimizationContext vxqueryCtx = (VXQueryOptimizationContext) context;
+ dCtx = ((VXQueryMetadataProvider) vxqueryCtx.getMetadataProvider()).getStaticContext();
}
AbstractLogicalOperator op1 = (AbstractLogicalOperator) opRef.getValue();
if (op1.getOperatorTag() != LogicalOperatorTag.UNNEST) {
http://git-wip-us.apache.org/repos/asf/vxquery/blob/51a98938/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/RemoveUnusedSortDistinctNodesRule.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/RemoveUnusedSortDistinctNodesRule.java b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/RemoveUnusedSortDistinctNodesRule.java
index 55c8de0..69940ad 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/RemoveUnusedSortDistinctNodesRule.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/RemoveUnusedSortDistinctNodesRule.java
@@ -51,43 +51,43 @@ import org.apache.hyracks.algebricks.core.rewriter.base.IAlgebraicRewriteRule;
* The rule searches for where the xquery sort distinct function is used and
* determines if the sort and distinct is necessary. The plan is modified if
* any of these items is not required.
- *
+ *
* <pre>
* Before
- *
+ *
* plan__parent
* ASSIGN( $v1 : sort_distinct_nodes_asc_or_atomics( $v0 ) )
* plan__child
- *
+ *
* Where $v0 is a variable defined in plan__child.
- *
- * After
- *
- * if ( $v0 is unique nodes && $v0 is in document order )
- *
+ *
+ * After
+ *
+ * if ( $v0 is unique nodes && $v0 is in document order )
+ *
* plan__parent
* ASSIGN( $v1 : $v0 )
* plan__child
- *
- * if ( $v0 is NOT unique nodes && $v0 is in document order )
- *
+ *
+ * if ( $v0 is NOT unique nodes && $v0 is in document order )
+ *
* plan__parent
* ASSIGN( $v1 : distinct_nodes_or_atomics( $v0 ) )
* plan__child
- *
- * if ( $v0 is unique nodes && $v0 is NOT in document order )
- *
+ *
+ * if ( $v0 is unique nodes && $v0 is NOT in document order )
+ *
* plan__parent
* ASSIGN( $v1 : sort_nodes_asc( $v0 ) )
* plan__child
- *
- * if ( $v0 is NOT unique nodes && $v0 is NOT in document order )
- *
+ *
+ * if ( $v0 is NOT unique nodes && $v0 is NOT in document order )
+ *
* plan__parent
* ASSIGN( $v1 : sort_distinct_nodes_asc_or_atomics( $v0 ) )
* plan__child
* </pre>
- *
+ *
* @author prestonc
*/
@@ -123,7 +123,7 @@ public class RemoveUnusedSortDistinctNodesRule implements IAlgebraicRewriteRule
int variableId = getOperatorSortDistinctNodesAscOrAtomicsArgumentVariableId(opRef);
if (variableId > 0) {
// Find the function expression.
- // All the checks for these variable assigns and casting were done in the
+ // All the checks for these variable assigns and casting were done in the
// getOperatorSortDistinctNodesAscOrAtomicsArgumentVariableId function.
AssignOperator assign = (AssignOperator) op;
ILogicalExpression logicalExpression = (ILogicalExpression) assign.getExpressions().get(0).getValue();
@@ -194,7 +194,7 @@ public class RemoveUnusedSortDistinctNodesRule implements IAlgebraicRewriteRule
/**
* Get the DocumentOrder variable map of the parent operator.
- *
+ *
* @param op
* @param vxqueryContext
* @return
@@ -217,10 +217,10 @@ public class RemoveUnusedSortDistinctNodesRule implements IAlgebraicRewriteRule
/**
* Get the UniqueNodes variable map of the parent operator.
- *
+ *
* @param op
* @param vxqueryContext
- * @return
+ * @return Hash map of variables to unique nodes.
*/
private HashMap<Integer, UniqueNodes> getProducerUniqueNodesVariableMap(ILogicalOperator op,
VXQueryOptimizationContext vxqueryContext) {
@@ -297,7 +297,7 @@ public class RemoveUnusedSortDistinctNodesRule implements IAlgebraicRewriteRule
/**
* Sets all the variables to DocumentOrder.
- *
+ *
* @param documentOrderVariables
* @param documentOrder
*/
@@ -310,7 +310,7 @@ public class RemoveUnusedSortDistinctNodesRule implements IAlgebraicRewriteRule
/**
* Sets all the variables to UniqueNodes.
- *
+ *
* @param uniqueNodesVariables
* @param uniqueNodes
*/
http://git-wip-us.apache.org/repos/asf/vxquery/blob/51a98938/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/RemoveUnusedUnnestIterateRule.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/RemoveUnusedUnnestIterateRule.java b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/RemoveUnusedUnnestIterateRule.java
index 946f854..1da93b9 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/RemoveUnusedUnnestIterateRule.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/RemoveUnusedUnnestIterateRule.java
@@ -17,10 +17,6 @@
package org.apache.vxquery.compiler.rewriter.rules;
import org.apache.commons.lang3.mutable.Mutable;
-import org.apache.vxquery.compiler.rewriter.rules.propagationpolicies.documentorder.DocumentOrder;
-import org.apache.vxquery.compiler.rewriter.rules.propagationpolicies.uniquenodes.UniqueNodes;
-import org.apache.vxquery.functions.BuiltinOperators;
-
import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
import org.apache.hyracks.algebricks.core.algebra.base.ILogicalExpression;
import org.apache.hyracks.algebricks.core.algebra.base.ILogicalOperator;
@@ -33,32 +29,32 @@ import org.apache.hyracks.algebricks.core.algebra.expressions.VariableReferenceE
import org.apache.hyracks.algebricks.core.algebra.operators.logical.AbstractLogicalOperator;
import org.apache.hyracks.algebricks.core.algebra.operators.logical.AbstractScanOperator;
import org.apache.hyracks.algebricks.core.algebra.operators.logical.AssignOperator;
-import org.apache.hyracks.algebricks.core.algebra.operators.logical.DataSourceScanOperator;
import org.apache.hyracks.algebricks.core.algebra.operators.logical.UnnestOperator;
+import org.apache.vxquery.functions.BuiltinOperators;
/**
* The rule searches for an unnest operator (1) immediately following an unnest
* or data scan operator (2). If the variable is only used in unnest (1) then
* unnest (1) can be removed.
- *
+ *
* <pre>
- * Before
- *
+ * Before
+ *
* plan__parent
* UNNEST( $v2 : iterate( $v1 ) )
* UNNEST( $v1 : $v )
* plan__child
- *
+ *
* Where $v1 is not used in plan__parent.
- *
+ *
* After
- *
+ *
* plan__parent
* ASSIGN( $v2 : $v1 )
* UNNEST( $v1 : $v )
* plan__child
* </pre>
- *
+ *
* @author prestonc
*/
public class RemoveUnusedUnnestIterateRule extends AbstractUsedVariablesProcessingRule {
http://git-wip-us.apache.org/repos/asf/vxquery/blob/51a98938/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/SetCollectionDataSourceRule.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/SetCollectionDataSourceRule.java b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/SetCollectionDataSourceRule.java
index 936a12a..f4ebde7 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/SetCollectionDataSourceRule.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/SetCollectionDataSourceRule.java
@@ -25,11 +25,16 @@ import org.apache.hyracks.algebricks.core.algebra.base.IOptimizationContext;
/**
* Find the collection functions and generate the data source objects.
- * Search pattern: unnest <- assign [function-call: collection] <- assign [constant: string]
+ *
+ * <pre>
+ * Search pattern:
+ * unnest <- assign [function-call: collection] <- assign [constant: string]
+ * </pre>
*/
public class SetCollectionDataSourceRule extends AbstractCollectionRule {
@Override
- public boolean rewritePre(Mutable<ILogicalOperator> opRef, IOptimizationContext context) throws AlgebricksException {
+ public boolean rewritePre(Mutable<ILogicalOperator> opRef, IOptimizationContext context)
+ throws AlgebricksException {
if (context.checkIfInDontApplySet(this, opRef.getValue())) {
return false;
}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/51a98938/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/algebricksalternatives/ExtractFunctionsFromJoinConditionRule.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/algebricksalternatives/ExtractFunctionsFromJoinConditionRule.java b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/algebricksalternatives/ExtractFunctionsFromJoinConditionRule.java
index 9ae19f5..80ff036 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/algebricksalternatives/ExtractFunctionsFromJoinConditionRule.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/algebricksalternatives/ExtractFunctionsFromJoinConditionRule.java
@@ -43,13 +43,18 @@ import org.apache.hyracks.algebricks.core.rewriter.base.IAlgebraicRewriteRule;
* Factors out function expressions from each comparison function or similarity function in join condition by assigning them to a variables, and replacing the function expressions with references to those variables.
* Examples:
* Plan with function expressions in comparison or similarity condition of join expression. Generates one assign operator per extracted function expression.
- * Example
+ *
+ * <pre>
* Before plan:
- * join ( eq( funcX($$1), funcX($$2) ) )
+ *
+ * join ( eq( funcX($$1), funcX($$2) ) )
+ *
* After plan:
- * join (eq($$3,$$4))
- * assign [$$4] <- [funcY($$2)]
- * assign [$$3] <- [funcX($$1)]
+ *
+ * join (eq($$3,$$4))
+ * assign [$$4] <- [funcY($$2)]
+ * assign [$$3] <- [funcX($$1)]
+ * </pre>
*/
public class ExtractFunctionsFromJoinConditionRule implements IAlgebraicRewriteRule {
http://git-wip-us.apache.org/repos/asf/vxquery/blob/51a98938/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/util/CardinalityRuleToolbox.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/util/CardinalityRuleToolbox.java b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/util/CardinalityRuleToolbox.java
index 7744eb2..fe18204 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/util/CardinalityRuleToolbox.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/util/CardinalityRuleToolbox.java
@@ -27,10 +27,12 @@ import org.apache.hyracks.algebricks.core.algebra.operators.logical.NestedTupleS
public class CardinalityRuleToolbox {
/**
* Get the Cardinality variable of the parent operator.
- *
+ *
* @param op
+ * Logical operator
* @param vxqueryContext
- * @return
+ * VXQuery context
+ * @return Cardinality of the producer.
*/
public static Cardinality getProducerCardinality(ILogicalOperator op, VXQueryOptimizationContext vxqueryContext) {
AbstractLogicalOperator producerOp = (AbstractLogicalOperator) op.getInputs().get(0).getValue();
@@ -55,8 +57,8 @@ public class CardinalityRuleToolbox {
case SUBPLAN:
// Find the last operator to set a variable and call this function again.
AbstractOperatorWithNestedPlans operatorWithNestedPlan = (AbstractOperatorWithNestedPlans) op;
- AbstractLogicalOperator lastOperator = (AbstractLogicalOperator) operatorWithNestedPlan
- .getNestedPlans().get(0).getRoots().get(0).getValue();
+ AbstractLogicalOperator lastOperator = (AbstractLogicalOperator) operatorWithNestedPlan.getNestedPlans()
+ .get(0).getRoots().get(0).getValue();
cardinalityVariable = vxqueryContext.getCardinalityOperatorMap(lastOperator);
break;
case DATASOURCESCAN:
@@ -82,8 +84,8 @@ public class CardinalityRuleToolbox {
// The following operators' analysis has not yet been implemented.
default:
- throw new RuntimeException("Operator (" + op.getOperatorTag()
- + ") has not been implemented in rewrite rule.");
+ throw new RuntimeException(
+ "Operator (" + op.getOperatorTag() + ") has not been implemented in rewrite rule.");
}
return cardinalityVariable;
}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/51a98938/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/util/ExpressionToolbox.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/util/ExpressionToolbox.java b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/util/ExpressionToolbox.java
index 10a8dca..0dd3b31 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/util/ExpressionToolbox.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/util/ExpressionToolbox.java
@@ -131,6 +131,11 @@ public class ExpressionToolbox {
/**
* Finds all functions for a given expression.
+ *
+ * @param mutableLe
+ * Search logical expression
+ * @param finds
+ * Logical expressions found
*/
public static void findAllFunctionExpressions(Mutable<ILogicalExpression> mutableLe,
List<Mutable<ILogicalExpression>> finds) {
@@ -146,6 +151,13 @@ public class ExpressionToolbox {
/**
* Finds all functions for a given expression and function identifier.
+ *
+ * @param mutableLe
+ * Search logical expression
+ * @param fi
+ * Function indentifier
+ * @param finds
+ * Logical expressions found
*/
public static void findAllFunctionExpressions(Mutable<ILogicalExpression> mutableLe, FunctionIdentifier fi,
List<Mutable<ILogicalExpression>> finds) {
http://git-wip-us.apache.org/repos/asf/vxquery/blob/51a98938/vxquery-core/src/main/java/org/apache/vxquery/datamodel/util/DateTime.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/datamodel/util/DateTime.java b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/util/DateTime.java
index 1850dd1..16c350f 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/datamodel/util/DateTime.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/util/DateTime.java
@@ -63,9 +63,10 @@ public class DateTime {
/**
* Check whether a given year is a leap year.
- *
+ *
* @param year
- * @return
+ * A long for year.
+ * @return Boolean for leap year.
*/
public static boolean isLeapYear(long year) {
return ((year & 3) == 0) && ((year % 100) != 0 || (year % 400) == 0);
@@ -73,9 +74,24 @@ public class DateTime {
/**
* Check whether a given year is a leap year.
- *
+ *
* @param year
- * @return
+ * year
+ * @param month
+ * month
+ * @param day
+ * day
+ * @param hour
+ * hour
+ * @param minute
+ * minute
+ * @param millisecond
+ * millisecond
+ * @param timezoneHour
+ * timezoneHour
+ * @param timezoneMinute
+ * timezoneMinute
+ * @return Boolean for valid date.
*/
public static boolean valid(long year, long month, long day, long hour, long minute, long millisecond,
long timezoneHour, long timezoneMinute) {
@@ -115,6 +131,19 @@ public class DateTime {
/**
* Return a normalized time.
+ *
+ * @param yearMonth
+ * Months
+ * @param dayTime
+ * Time
+ * @param timezoneHour
+ * timezoneHour
+ * @param timezoneMinute
+ * timezoneMinute
+ * @param dOut
+ * Data out
+ * @throws IOException
+ * Could not write result.
*/
public static void normalizeDateTime(long yearMonth, long dayTime, long timezoneHour, long timezoneMinute,
DataOutput dOut) throws IOException {
@@ -221,7 +250,8 @@ public class DateTime {
DateTime.normalizeDateTime(timezonep.getYearMonth(), dayTime, 0, 0, dOut);
}
- public static void adjustDateTimeToTimezone(ITimezone timezonep, long timezone, DataOutput dOut) throws IOException {
+ public static void adjustDateTimeToTimezone(ITimezone timezonep, long timezone, DataOutput dOut)
+ throws IOException {
long timezoneHour = timezone / 60;
long timezoneMinute = timezone % 60;
long dayTime = timezonep.getDayTime();
@@ -229,8 +259,8 @@ public class DateTime {
|| timezonep.getTimezoneMinute() == DateTime.TIMEZONE_MINUTE_NULL) {
// No change.
} else {
- dayTime -= (timezonep.getTimezoneHour() * DateTime.CHRONON_OF_HOUR + timezonep.getTimezoneMinute()
- * DateTime.CHRONON_OF_MINUTE);
+ dayTime -= (timezonep.getTimezoneHour() * DateTime.CHRONON_OF_HOUR
+ + timezonep.getTimezoneMinute() * DateTime.CHRONON_OF_MINUTE);
dayTime += (timezoneHour * DateTime.CHRONON_OF_HOUR + timezoneMinute * DateTime.CHRONON_OF_MINUTE);
}
DateTime.normalizeDateTime(timezonep.getYearMonth(), dayTime, timezoneHour, timezoneMinute, dOut);
http://git-wip-us.apache.org/repos/asf/vxquery/blob/51a98938/vxquery-core/src/main/java/org/apache/vxquery/functions/Signature.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/functions/Signature.java b/vxquery-core/src/main/java/org/apache/vxquery/functions/Signature.java
index 8604212..d8d0a85 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/functions/Signature.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/functions/Signature.java
@@ -27,10 +27,12 @@ public final class Signature {
private SequenceType[] parameterTypes;
private SequenceType rType;
+ @SuppressWarnings("unchecked")
public Signature(SequenceType rType, Pair<QName, SequenceType>... parameters) {
this(rType, false, parameters);
}
+ @SuppressWarnings("unchecked")
public Signature(SequenceType rType, boolean varArgs, Pair<QName, SequenceType>... parameters) {
int len = parameters.length;
this.varArgs = varArgs;
http://git-wip-us.apache.org/repos/asf/vxquery/blob/51a98938/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/AbstractCastToOperation.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/AbstractCastToOperation.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/AbstractCastToOperation.java
index f58a39a..f686361 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/AbstractCastToOperation.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/AbstractCastToOperation.java
@@ -40,9 +40,9 @@ import org.apache.hyracks.data.std.primitive.UTF8StringPointable;
public abstract class AbstractCastToOperation {
- /**
- * Primitive Datatypes
- */
+ //
+ // Primitive Datatypes
+ //
public void convertAnyURI(UTF8StringPointable stringp, DataOutput dOut) throws SystemException, IOException {
throw new SystemException(ErrorCode.XPTY0004);
}
@@ -135,9 +135,9 @@ public abstract class AbstractCastToOperation {
throw new SystemException(ErrorCode.XPTY0004);
}
- /**
- * Derived Numeric Datatypes
- */
+ //
+ // Derived Numeric Datatypes
+ //
public void convertByte(BytePointable bytep, DataOutput dOut) throws SystemException, IOException {
throw new SystemException(ErrorCode.XPTY0004);
}
@@ -186,9 +186,9 @@ public abstract class AbstractCastToOperation {
throw new SystemException(ErrorCode.XPTY0004);
}
- /**
- * Derived String Datatypes
- */
+ //
+ // Derived String Datatypes
+ //
public void convertEntity(UTF8StringPointable stringp, DataOutput dOut) throws SystemException, IOException {
throw new SystemException(ErrorCode.XPTY0004);
@@ -218,8 +218,8 @@ public abstract class AbstractCastToOperation {
throw new SystemException(ErrorCode.XPTY0004);
}
- public void convertNormalizedString(UTF8StringPointable stringp, DataOutput dOut) throws SystemException,
- IOException {
+ public void convertNormalizedString(UTF8StringPointable stringp, DataOutput dOut)
+ throws SystemException, IOException {
throw new SystemException(ErrorCode.XPTY0004);
}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/51a98938/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/CastToBase64BinaryOperation.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/CastToBase64BinaryOperation.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/CastToBase64BinaryOperation.java
index e2d33a5..680ce08 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/CastToBase64BinaryOperation.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/CastToBase64BinaryOperation.java
@@ -47,6 +47,7 @@ public class CastToBase64BinaryOperation extends AbstractCastToOperation {
baaos.reset();
Base64OutputStream b64os = new Base64OutputStream(baaos, false);
b64os.write(stringp.getByteArray(), stringp.getStartOffset() + 2, stringp.getLength() - 2);
+ b64os.close();
dOut.write(ValueTag.XS_BASE64_BINARY_TAG);
dOut.write((byte) ((baaos.size() >>> 8) & 0xFF));
http://git-wip-us.apache.org/repos/asf/vxquery/blob/51a98938/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/AbstractCastableAsOperation.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/AbstractCastableAsOperation.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/AbstractCastableAsOperation.java
index 2c042e7..8076191 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/AbstractCastableAsOperation.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/AbstractCastableAsOperation.java
@@ -154,9 +154,9 @@ public abstract class AbstractCastableAsOperation {
dOut.write((byte) 0);
}
- /**
- * Derived Datatypes
- */
+ //
+ // Derived Datatypes
+ //
public void convertByte(BytePointable bytep, DataOutput dOut) throws SystemException, IOException {
dOut.write(ValueTag.XS_BOOLEAN_TAG);
dOut.write((byte) 0);
http://git-wip-us.apache.org/repos/asf/vxquery/blob/51a98938/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/error/FnErrorScalarEvaluatorFactory.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/error/FnErrorScalarEvaluatorFactory.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/error/FnErrorScalarEvaluatorFactory.java
index e879378..0588820 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/error/FnErrorScalarEvaluatorFactory.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/error/FnErrorScalarEvaluatorFactory.java
@@ -18,6 +18,13 @@ package org.apache.vxquery.runtime.functions.error;
import java.io.DataInputStream;
+import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluator;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
+import org.apache.hyracks.api.context.IHyracksTaskContext;
+import org.apache.hyracks.data.std.api.IPointable;
+import org.apache.hyracks.data.std.primitive.UTF8StringPointable;
+import org.apache.hyracks.dataflow.common.comm.util.ByteBufferInputStream;
import org.apache.vxquery.datamodel.accessors.SequencePointable;
import org.apache.vxquery.datamodel.accessors.TaggedValuePointable;
import org.apache.vxquery.datamodel.accessors.atomic.XSQNamePointable;
@@ -28,14 +35,6 @@ import org.apache.vxquery.runtime.functions.base.AbstractTaggedValueArgumentScal
import org.apache.vxquery.runtime.functions.base.AbstractTaggedValueArgumentScalarEvaluatorFactory;
import org.apache.vxquery.runtime.functions.util.FunctionHelper;
-import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
-import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluator;
-import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
-import org.apache.hyracks.api.context.IHyracksTaskContext;
-import org.apache.hyracks.data.std.api.IPointable;
-import org.apache.hyracks.data.std.primitive.UTF8StringPointable;
-import org.apache.hyracks.dataflow.common.comm.util.ByteBufferInputStream;
-
public class FnErrorScalarEvaluatorFactory extends AbstractTaggedValueArgumentScalarEvaluatorFactory {
private static final long serialVersionUID = 1L;
@@ -43,6 +42,7 @@ public class FnErrorScalarEvaluatorFactory extends AbstractTaggedValueArgumentSc
super(args);
}
+ @SuppressWarnings("unused")
@Override
protected IScalarEvaluator createEvaluator(IHyracksTaskContext ctx, IScalarEvaluator[] args)
throws AlgebricksException {
http://git-wip-us.apache.org/repos/asf/vxquery/blob/51a98938/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/sequence/FnSubsequenceScalarEvaluatorFactory.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/sequence/FnSubsequenceScalarEvaluatorFactory.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/sequence/FnSubsequenceScalarEvaluatorFactory.java
index 690c4a4..6c21169 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/sequence/FnSubsequenceScalarEvaluatorFactory.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/sequence/FnSubsequenceScalarEvaluatorFactory.java
@@ -110,9 +110,9 @@ public class FnSubsequenceScalarEvaluatorFactory extends AbstractTaggedValueArgu
/**
* XQuery Specification calls for double value. Integer and Decimal are allowed to cut down on casting.
- *
+ *
* @param tvp
- * @return
+ * @return long
* @throws SystemException
* @throws IOException
*/
http://git-wip-us.apache.org/repos/asf/vxquery/blob/51a98938/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/step/AbstractDescendantPathStepScalarEvaluator.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/step/AbstractDescendantPathStepScalarEvaluator.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/step/AbstractDescendantPathStepScalarEvaluator.java
index f3442a5..adee6f2 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/step/AbstractDescendantPathStepScalarEvaluator.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/step/AbstractDescendantPathStepScalarEvaluator.java
@@ -46,9 +46,11 @@ public abstract class AbstractDescendantPathStepScalarEvaluator extends Abstract
/**
* Search through all tree children and children's children.
- *
+ *
* @param nodePointable
+ * Node pointable
* @throws SystemException
+ * Could not save result.
*/
protected void searchSubtree(TaggedValuePointable nodePointable) throws SystemException {
try {
http://git-wip-us.apache.org/repos/asf/vxquery/blob/51a98938/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/step/ChildPathStepOperatorDescriptor.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/step/ChildPathStepOperatorDescriptor.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/step/ChildPathStepOperatorDescriptor.java
index eed6bc5..a90963b 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/step/ChildPathStepOperatorDescriptor.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/step/ChildPathStepOperatorDescriptor.java
@@ -66,6 +66,12 @@ public class ChildPathStepOperatorDescriptor extends AbstractForwardAxisPathStep
/**
* Single node tree input.
* Requirement: "ntp" must be the node tree.
+ *
+ * @param result
+ * Node tree pointable
+ * @return found result
+ * @throws AlgebricksException
+ * Could not save result.
*/
public boolean step(IPointable result) throws AlgebricksException {
ntp.getRootNode(tvpStep);
@@ -77,6 +83,16 @@ public class ChildPathStepOperatorDescriptor extends AbstractForwardAxisPathStep
/**
* Find the next node to return.
+ *
+ * @param tvpInput
+ * pointable
+ * @param level
+ * level
+ * @param result
+ * result
+ * @return found result
+ * @throws AlgebricksException
+ * Could not save result.
*/
protected boolean stepNodeTree(TaggedValuePointable tvpInput, int level, IPointable result)
throws AlgebricksException {
http://git-wip-us.apache.org/repos/asf/vxquery/blob/51a98938/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/step/ChildPathStepUnnesting.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/step/ChildPathStepUnnesting.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/step/ChildPathStepUnnesting.java
index 682fd7e..74ec91b 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/step/ChildPathStepUnnesting.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/step/ChildPathStepUnnesting.java
@@ -62,7 +62,7 @@ public class ChildPathStepUnnesting extends AbstractForwardAxisPathStep {
SequenceType sType = dCtx.getStaticContext().lookupSequenceType(ip.getInteger());
filter = NodeTestFilter.getNodeTestFilter(sType);
}
-
+
if (args[0].getTag() == ValueTag.SEQUENCE_TAG) {
args[0].getValue(seqNtp);
seqArgsLength = seqNtp.getEntryCount();
@@ -101,6 +101,16 @@ public class ChildPathStepUnnesting extends AbstractForwardAxisPathStep {
/**
* Find the next node to return.
+ *
+ * @param tvpInput
+ * pointable
+ * @param level
+ * level
+ * @param result
+ * result
+ * @return found result
+ * @throws AlgebricksException
+ * Could not save result.
*/
protected boolean stepNodeTree(TaggedValuePointable tvpInput, int level, IPointable result)
throws AlgebricksException {
http://git-wip-us.apache.org/repos/asf/vxquery/blob/51a98938/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/step/DescendantOrSelfPathStepUnnesting.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/step/DescendantOrSelfPathStepUnnesting.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/step/DescendantOrSelfPathStepUnnesting.java
index 2cc6818..37cd400 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/step/DescendantOrSelfPathStepUnnesting.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/step/DescendantOrSelfPathStepUnnesting.java
@@ -133,9 +133,16 @@ public class DescendantOrSelfPathStepUnnesting extends AbstractForwardAxisPathSt
/**
* Search through all tree children and children's children.
- *
- * @param nodePointable
- * @throws SystemException
+ *
+ * @param tvpInput
+ * pointable
+ * @param level
+ * level
+ * @param result
+ * result
+ * @return found result
+ * @throws AlgebricksException
+ * Could not save result.
*/
protected boolean stepNodeTree(TaggedValuePointable tvpInput, int level, IPointable result)
throws AlgebricksException {
http://git-wip-us.apache.org/repos/asf/vxquery/blob/51a98938/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/util/FunctionHelper.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/util/FunctionHelper.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/util/FunctionHelper.java
index 920c815..a57bf72 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/util/FunctionHelper.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/util/FunctionHelper.java
@@ -458,7 +458,7 @@ public class FunctionHelper {
public static boolean compareTaggedValues(AbstractValueComparisonOperation aOp, TaggedValuePointable tvp1,
TaggedValuePointable tvp2, DynamicContext dCtx, TypedPointables tp1, TypedPointables tp2)
- throws SystemException {
+ throws SystemException {
int tid1 = getBaseTypeForComparisons(tvp1.getTag());
int tid2 = getBaseTypeForComparisons(tvp2.getTag());
@@ -1028,6 +1028,12 @@ public class FunctionHelper {
/**
* Get the local node id from a tagged value pointable when available.
+ *
+ * @param tvp1
+ * pointable
+ * @param tp
+ * Typed pointable
+ * @return local node id
*/
public static int getLocalNodeId(TaggedValuePointable tvp1, TypedPointables tp) {
final TaggedValuePointable tvp = (TaggedValuePointable) TaggedValuePointable.FACTORY.createPointable();
@@ -1067,6 +1073,10 @@ public class FunctionHelper {
/**
* Returns the number of digits in a long. A few special cases that needed attention.
+ *
+ * @param value
+ * value
+ * @return Number of digits
*/
public static int getNumberOfDigits(long value) {
if (value == 0) {
@@ -1095,9 +1105,8 @@ public class FunctionHelper {
public static String getStringFromPointable(UTF8StringPointable stringp, ByteBufferInputStream bbis,
DataInputStream di) throws SystemException {
try {
- bbis.setByteBuffer(
- ByteBuffer.wrap(Arrays.copyOfRange(stringp.getByteArray(), stringp.getStartOffset(),
- stringp.getLength() + stringp.getStartOffset())), 0);
+ bbis.setByteBuffer(ByteBuffer.wrap(Arrays.copyOfRange(stringp.getByteArray(), stringp.getStartOffset(),
+ stringp.getLength() + stringp.getStartOffset())), 0);
return di.readUTF();
} catch (IOException e) {
throw new SystemException(ErrorCode.SYSE0001, e);
@@ -1105,8 +1114,8 @@ public class FunctionHelper {
}
public static long getTimezone(ITimezone timezonep) {
- return timezonep.getTimezoneHour() * DateTime.CHRONON_OF_HOUR + timezonep.getTimezoneMinute()
- * DateTime.CHRONON_OF_MINUTE;
+ return timezonep.getTimezoneHour() * DateTime.CHRONON_OF_HOUR
+ + timezonep.getTimezoneMinute() * DateTime.CHRONON_OF_MINUTE;
}
public static boolean isDerivedFromDouble(int tid) {
@@ -1159,9 +1168,10 @@ public class FunctionHelper {
/**
* Returns 0 if positive, nonzero if negative.
- *
+ *
* @param value
- * @return
+ * value
+ * @return boolean
*/
public static boolean isNumberPostive(long value) {
return ((value & 0x8000000000000000L) == 0 ? true : false);
@@ -1281,12 +1291,15 @@ public class FunctionHelper {
/**
* Writes a number to the DataOutput with zeros as place holders if the number is too small to fill the padding.
- *
+ *
* @param value
+ * value
* @param padding
+ * padding
* @param dOut
- * @throws IOException
+ * data output
*/
+
public static void writeNumberWithPadding(long value, int padding, DataOutput dOut) {
if (value < 0) {
writeChar('-', dOut);
http://git-wip-us.apache.org/repos/asf/vxquery/blob/51a98938/vxquery-core/src/main/java/org/apache/vxquery/types/AbstractNodeType.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/types/AbstractNodeType.java b/vxquery-core/src/main/java/org/apache/vxquery/types/AbstractNodeType.java
index 8177a06..c7180ae 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/types/AbstractNodeType.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/types/AbstractNodeType.java
@@ -17,6 +17,8 @@
package org.apache.vxquery.types;
abstract class AbstractNodeType implements NodeType {
+ private static final long serialVersionUID = 1L;
+
@Override
public final boolean isAtomicType() {
return false;
http://git-wip-us.apache.org/repos/asf/vxquery/blob/51a98938/vxquery-core/src/main/java/org/apache/vxquery/types/AnyItemType.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/types/AnyItemType.java b/vxquery-core/src/main/java/org/apache/vxquery/types/AnyItemType.java
index c6db3ad..a2cb3ab 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/types/AnyItemType.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/types/AnyItemType.java
@@ -17,6 +17,7 @@
package org.apache.vxquery.types;
public final class AnyItemType implements ItemType {
+ private static final long serialVersionUID = 1L;
public static final AnyItemType INSTANCE = new AnyItemType();
private AnyItemType() {
http://git-wip-us.apache.org/repos/asf/vxquery/blob/51a98938/vxquery-core/src/main/java/org/apache/vxquery/types/AnyNodeType.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/types/AnyNodeType.java b/vxquery-core/src/main/java/org/apache/vxquery/types/AnyNodeType.java
index 74e6630..1e85eb6 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/types/AnyNodeType.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/types/AnyNodeType.java
@@ -17,6 +17,7 @@
package org.apache.vxquery.types;
public final class AnyNodeType extends AbstractNodeType {
+ private static final long serialVersionUID = 1L;
public static final AnyNodeType INSTANCE = new AnyNodeType();
private AnyNodeType() {
http://git-wip-us.apache.org/repos/asf/vxquery/blob/51a98938/vxquery-core/src/main/java/org/apache/vxquery/types/AnySimpleType.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/types/AnySimpleType.java b/vxquery-core/src/main/java/org/apache/vxquery/types/AnySimpleType.java
index ae4ce25..ee6193f 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/types/AnySimpleType.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/types/AnySimpleType.java
@@ -17,6 +17,7 @@
package org.apache.vxquery.types;
public final class AnySimpleType implements SimpleType {
+ private static final long serialVersionUID = 1L;
public static final SimpleType INSTANCE = new AnySimpleType();
private AnySimpleType() {
http://git-wip-us.apache.org/repos/asf/vxquery/blob/51a98938/vxquery-core/src/main/java/org/apache/vxquery/types/AnyType.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/types/AnyType.java b/vxquery-core/src/main/java/org/apache/vxquery/types/AnyType.java
index 92f21ed..2cb9672 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/types/AnyType.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/types/AnyType.java
@@ -17,6 +17,7 @@
package org.apache.vxquery.types;
public final class AnyType implements ComplexType {
+ private static final long serialVersionUID = 1L;
public static final SchemaType INSTANCE = new AnyType();
private AnyType() {
http://git-wip-us.apache.org/repos/asf/vxquery/blob/51a98938/vxquery-core/src/main/java/org/apache/vxquery/types/AttributeType.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/types/AttributeType.java b/vxquery-core/src/main/java/org/apache/vxquery/types/AttributeType.java
index b99b349..72b9497 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/types/AttributeType.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/types/AttributeType.java
@@ -17,6 +17,8 @@
package org.apache.vxquery.types;
public final class AttributeType extends AbstractNodeType {
+ private static final long serialVersionUID = 1L;
+
public static final AttributeType ANYATTRIBUTE = new AttributeType(NameTest.STAR_NAMETEST,
BuiltinTypeRegistry.XS_ANY_ATOMIC);
http://git-wip-us.apache.org/repos/asf/vxquery/blob/51a98938/vxquery-core/src/main/java/org/apache/vxquery/types/CommentType.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/types/CommentType.java b/vxquery-core/src/main/java/org/apache/vxquery/types/CommentType.java
index 5766a75..d84d848 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/types/CommentType.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/types/CommentType.java
@@ -17,6 +17,7 @@
package org.apache.vxquery.types;
public final class CommentType extends AbstractNodeType {
+ private static final long serialVersionUID = 1L;
public static final CommentType INSTANCE = new CommentType();
private CommentType() {
http://git-wip-us.apache.org/repos/asf/vxquery/blob/51a98938/vxquery-core/src/main/java/org/apache/vxquery/types/DocumentType.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/types/DocumentType.java b/vxquery-core/src/main/java/org/apache/vxquery/types/DocumentType.java
index 66124f8..aa62ebd 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/types/DocumentType.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/types/DocumentType.java
@@ -17,6 +17,8 @@
package org.apache.vxquery.types;
public final class DocumentType extends AbstractNodeType {
+ private static final long serialVersionUID = 1L;
+
public static final DocumentType ANYDOCUMENT = new DocumentType(ElementType.ANYELEMENT);
private ElementType elementType;
http://git-wip-us.apache.org/repos/asf/vxquery/blob/51a98938/vxquery-core/src/main/java/org/apache/vxquery/types/ElementType.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/types/ElementType.java b/vxquery-core/src/main/java/org/apache/vxquery/types/ElementType.java
index 6f7d431..0fd1594 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/types/ElementType.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/types/ElementType.java
@@ -17,6 +17,8 @@
package org.apache.vxquery.types;
public final class ElementType extends AbstractNodeType {
+ private static final long serialVersionUID = 1L;
+
public static final ElementType ANYELEMENT = new ElementType(NameTest.STAR_NAMETEST, AnyType.INSTANCE, true);
private NameTest nameTest;
http://git-wip-us.apache.org/repos/asf/vxquery/blob/51a98938/vxquery-core/src/main/java/org/apache/vxquery/types/EmptySequenceType.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/types/EmptySequenceType.java b/vxquery-core/src/main/java/org/apache/vxquery/types/EmptySequenceType.java
index 61d1c4b..4afeb40 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/types/EmptySequenceType.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/types/EmptySequenceType.java
@@ -17,6 +17,7 @@
package org.apache.vxquery.types;
public final class EmptySequenceType implements ItemType {
+ private static final long serialVersionUID = 1L;
public static final EmptySequenceType INSTANCE = new EmptySequenceType();
private EmptySequenceType() {
http://git-wip-us.apache.org/repos/asf/vxquery/blob/51a98938/vxquery-core/src/main/java/org/apache/vxquery/types/NoneType.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/types/NoneType.java b/vxquery-core/src/main/java/org/apache/vxquery/types/NoneType.java
index 7c58f52..70c0a0a 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/types/NoneType.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/types/NoneType.java
@@ -17,6 +17,7 @@
package org.apache.vxquery.types;
public final class NoneType implements ItemType {
+ private static final long serialVersionUID = 1L;
public static final NoneType INSTANCE = new NoneType();
private NoneType() {
http://git-wip-us.apache.org/repos/asf/vxquery/blob/51a98938/vxquery-core/src/main/java/org/apache/vxquery/types/ProcessingInstructionType.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/types/ProcessingInstructionType.java b/vxquery-core/src/main/java/org/apache/vxquery/types/ProcessingInstructionType.java
index 46f847e..c445ba7 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/types/ProcessingInstructionType.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/types/ProcessingInstructionType.java
@@ -21,6 +21,8 @@ import java.util.Arrays;
import org.apache.hyracks.data.std.primitive.UTF8StringPointable;
public final class ProcessingInstructionType extends AbstractNodeType {
+ private static final long serialVersionUID = 1L;
+
public static final ProcessingInstructionType ANYPI = new ProcessingInstructionType(null);
private byte[] target;
http://git-wip-us.apache.org/repos/asf/vxquery/blob/51a98938/vxquery-core/src/main/java/org/apache/vxquery/types/TextType.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/types/TextType.java b/vxquery-core/src/main/java/org/apache/vxquery/types/TextType.java
index 2656775..7c7fec7 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/types/TextType.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/types/TextType.java
@@ -17,6 +17,7 @@
package org.apache.vxquery.types;
public final class TextType extends AbstractNodeType {
+ private static final long serialVersionUID = 1L;
public static final TextType INSTANCE = new TextType();
private TextType() {
http://git-wip-us.apache.org/repos/asf/vxquery/blob/51a98938/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/query/XMLQueryCompiler.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/query/XMLQueryCompiler.java b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/query/XMLQueryCompiler.java
index e9efa11..e42caba 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/query/XMLQueryCompiler.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/query/XMLQueryCompiler.java
@@ -126,7 +126,7 @@ public class XMLQueryCompiler {
builder.setLogicalRewrites(buildDefaultLogicalRewrites());
builder.setPhysicalRewrites(buildDefaultPhysicalRewrites());
builder.setSerializerDeserializerProvider(new ISerializerDeserializerProvider() {
- @SuppressWarnings("unchecked")
+ @SuppressWarnings("rawtypes")
@Override
public ISerializerDeserializer getSerializerDeserializer(Object type) throws AlgebricksException {
return null;
http://git-wip-us.apache.org/repos/asf/vxquery/blob/51a98938/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/TestRunner.java
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/TestRunner.java b/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/TestRunner.java
index d8543f5..18db5c1 100644
--- a/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/TestRunner.java
+++ b/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/TestRunner.java
@@ -18,27 +18,13 @@ import java.io.File;
import java.io.FileInputStream;
import java.io.InputStreamReader;
import java.io.Reader;
-import java.nio.ByteBuffer;
import java.util.EnumSet;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import org.apache.commons.io.IOUtils;
-import org.apache.vxquery.compiler.CompilerControlBlock;
-import org.apache.vxquery.compiler.algebricks.VXQueryGlobalDataFactory;
-import org.apache.vxquery.context.DynamicContext;
-import org.apache.vxquery.context.DynamicContextImpl;
-import org.apache.vxquery.context.RootStaticContextImpl;
-import org.apache.vxquery.context.StaticContextImpl;
-import org.apache.vxquery.exceptions.ErrorCode;
-import org.apache.vxquery.exceptions.SystemException;
-import org.apache.vxquery.result.ResultUtils;
-import org.apache.vxquery.xmlquery.query.VXQueryCompilationListener;
-import org.apache.vxquery.xmlquery.query.XMLQueryCompiler;
-
import org.apache.hyracks.api.client.HyracksConnection;
import org.apache.hyracks.api.client.IHyracksClientConnection;
-import org.apache.hyracks.api.comm.FixedSizeFrame;
import org.apache.hyracks.api.comm.IFrame;
import org.apache.hyracks.api.comm.IFrameTupleAccessor;
import org.apache.hyracks.api.comm.VSizeFrame;
@@ -56,6 +42,17 @@ import org.apache.hyracks.control.common.controllers.NCConfig;
import org.apache.hyracks.control.nc.NodeControllerService;
import org.apache.hyracks.control.nc.resources.memory.FrameManager;
import org.apache.hyracks.dataflow.common.comm.io.ResultFrameTupleAccessor;
+import org.apache.vxquery.compiler.CompilerControlBlock;
+import org.apache.vxquery.compiler.algebricks.VXQueryGlobalDataFactory;
+import org.apache.vxquery.context.DynamicContext;
+import org.apache.vxquery.context.DynamicContextImpl;
+import org.apache.vxquery.context.RootStaticContextImpl;
+import org.apache.vxquery.context.StaticContextImpl;
+import org.apache.vxquery.exceptions.ErrorCode;
+import org.apache.vxquery.exceptions.SystemException;
+import org.apache.vxquery.result.ResultUtils;
+import org.apache.vxquery.xmlquery.query.VXQueryCompilationListener;
+import org.apache.vxquery.xmlquery.query.XMLQueryCompiler;
public class TestRunner {
private static final Pattern EMBEDDED_SYSERROR_PATTERN = Pattern
http://git-wip-us.apache.org/repos/asf/vxquery/blob/51a98938/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/util/DiskPerformance.java
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/util/DiskPerformance.java b/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/util/DiskPerformance.java
deleted file mode 100644
index 63fce8b..0000000
--- a/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/util/DiskPerformance.java
+++ /dev/null
@@ -1,215 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.vxquery.xtest.util;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Date;
-import java.util.Iterator;
-import java.util.List;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.TimeUnit;
-
-import org.apache.commons.io.FileUtils;
-import org.apache.commons.io.filefilter.TrueFileFilter;
-import org.apache.vxquery.datamodel.builders.atomic.StringValueBuilder;
-import org.apache.vxquery.metadata.VXQueryIOFileFilter;
-import org.apache.vxquery.types.AnyType;
-import org.apache.vxquery.types.ElementType;
-import org.apache.vxquery.types.NameTest;
-import org.apache.vxquery.types.Quantifier;
-import org.apache.vxquery.types.SequenceType;
-import org.apache.vxquery.xmlparser.SAXContentHandler;
-import org.apache.vxquery.xmlparser.TreeNodeIdProvider;
-import org.apache.vxquery.xtest.util.tests.BufferedParsedCharacterStream;
-import org.apache.vxquery.xtest.util.tests.BufferedReaderBufferedStream;
-import org.apache.vxquery.xtest.util.tests.BufferedReaderStream;
-import org.apache.vxquery.xtest.util.tests.BufferedStream;
-import org.apache.vxquery.xtest.util.tests.IDiskTest;
-import org.apache.vxquery.xtest.util.tests.ParsedBufferedByteStream;
-import org.apache.vxquery.xtest.util.tests.ParsedBufferedCharacterStream;
-import org.apache.vxquery.xtest.util.tests.ParsedByteStream;
-import org.apache.vxquery.xtest.util.tests.ParsedCharacterStream;
-import org.apache.vxquery.xtest.util.tests.ReaderBufferedStream;
-import org.apache.vxquery.xtest.util.tests.ReaderStream;
-import org.apache.vxquery.xtest.util.tests.Stream;
-import org.xml.sax.XMLReader;
-import org.xml.sax.helpers.XMLReaderFactory;
-
-import org.apache.hyracks.algebricks.common.utils.Pair;
-import org.apache.hyracks.data.std.util.ArrayBackedValueStorage;
-
-public class DiskPerformance {
- XMLReader parser;
- SAXContentHandler handler;
- Collection<File> cTestFiles;
- Iterator<File> testFilesIt;
-
- public DiskPerformance() {
- Pair<XMLReader, SAXContentHandler> p = getNewParser();
- parser = p.first;
- handler = p.second;
- cTestFiles = null;
- }
-
- public Pair<XMLReader, SAXContentHandler> getNewParser() {
- XMLReader parser;
- SAXContentHandler handler;
-
- try {
- parser = XMLReaderFactory.createXMLReader();
- List<SequenceType> childSeq = new ArrayList<SequenceType>();
- NameTest nt = new NameTest(createUTF8String(""), createUTF8String("data"));
- childSeq.add(SequenceType.create(new ElementType(nt, AnyType.INSTANCE, false), Quantifier.QUANT_ONE));
- handler = new SAXContentHandler(false, new TreeNodeIdProvider((short) 0), null, childSeq);
- parser.setContentHandler(handler);
- parser.setProperty("http://xml.org/sax/properties/lexical-handler", handler);
- return new Pair<XMLReader, SAXContentHandler>(parser, handler);
- } catch (Exception e) {
- e.printStackTrace();
- }
- return null;
- }
-
- public void setDirectory(String filename) {
- File directory = new File(filename);
- if (directory.isDirectory()) {
- cTestFiles = FileUtils.listFiles(directory, new VXQueryIOFileFilter(), TrueFileFilter.INSTANCE);
- if (cTestFiles.size() < 1) {
- System.err.println("No XML files found in given directory.");
- return;
- }
- }
- testFilesIt = cTestFiles.iterator();
- }
-
- public File getNextFile() {
- if (!testFilesIt.hasNext()) {
- testFilesIt = cTestFiles.iterator();
- }
- return testFilesIt.next();
- }
-
- private byte[] createUTF8String(String str) {
- ArrayBackedValueStorage abvs = new ArrayBackedValueStorage();
- StringValueBuilder svb = new StringValueBuilder();
- try {
- svb.write(str, abvs.getDataOutput());
- } catch (IOException e) {
- throw new IllegalStateException(e);
- }
- return Arrays.copyOf(abvs.getByteArray(), abvs.getLength());
- }
-
- public static void main(String... args) throws IOException {
- // First Argument (XML folder)
- if (args.length < 1) {
- System.err.println("Please provide a directory for the test XML documents.");
- return;
- }
- // Second argument (threads)
- int threads = 1;
- if (args.length > 1) {
- threads = Integer.parseInt(args[1]);
- }
-
- // Third argument (repeat)
- int repeat = 1;
- if (args.length > 2) {
- repeat = Integer.parseInt(args[2]);
- }
-
- // Fourth argument (buffer size)
- int bufferSize = -1;
- if (args.length > 3) {
- bufferSize = Integer.parseInt(args[3]);
- }
-
- DiskPerformance dp = new DiskPerformance();
- dp.setDirectory(args[0]);
-
- ArrayList<Class> tests = new ArrayList<Class>();
- // Parsed Character Streams
- tests.add(ParsedBufferedCharacterStream.class);
- // tests.add(BufferedParsedCharacterStream.class);
- // tests.add(ParsedCharacterStream.class);
- // Parsed Byte Streams
- // tests.add(ParsedBufferedByteStream.class);
- // tests.add(ParsedByteStream.class);
- // Character Streams
- // tests.add(BufferedReaderBufferedStream.class);
- // tests.add(BufferedReaderStream.class);
- // tests.add(ReaderBufferedStream.class);
- // tests.add(ReaderStream.class);
- // Byte Streams
- // tests.add(BufferedStream.class);
- // tests.add(Stream.class);
-
- System.out.println("------");
- System.out.println("Started Test Group: " + new Date());
- System.out.println("Thread: " + threads);
- System.out.println("Repeat: " + repeat);
- System.out.println("Buffer: " + bufferSize);
- System.out.println("------");
-
- for (Class<IDiskTest> testClass : tests) {
- for (int r = 0; r < repeat; ++r) {
- try {
- if (threads > 1) {
- runThreadTest(testClass, dp, threads, bufferSize);
- } else {
- IDiskTest test = testClass.newInstance();
- test.setFile(dp.getNextFile());
- test.setBufferSize(bufferSize);
- test.setParser(dp.parser);
- test.run();
- }
- } catch (InstantiationException e) {
- e.printStackTrace();
- } catch (IllegalAccessException e) {
- e.printStackTrace();
- }
-
- }
- }
-
- }
-
- static <T> void runThreadTest(Class<T> testType, DiskPerformance dp, int threads, int bufferSize)
- throws InstantiationException, IllegalAccessException {
- ExecutorService es = Executors.newCachedThreadPool();
- ArrayList<IDiskTest> threadTests = new ArrayList<IDiskTest>();
- for (int i = 0; i < threads; ++i) {
- threadTests.add((IDiskTest) testType.newInstance());
- }
- for (IDiskTest test : threadTests) {
- test.setFile(dp.getNextFile());
- test.setBufferSize(bufferSize);
- test.setParser(dp.getNewParser().first);
- es.execute((Runnable) test);
- }
- es.shutdown();
- try {
- es.awaitTermination(60, TimeUnit.MINUTES);
- } catch (InterruptedException e) {
- e.printStackTrace();
- }
- // System.out.println("Completed thread batch: " + new Date());
- }
-}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/51a98938/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/util/tests/AbstractDiskTest.java
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/util/tests/AbstractDiskTest.java b/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/util/tests/AbstractDiskTest.java
deleted file mode 100644
index f41a02b..0000000
--- a/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/util/tests/AbstractDiskTest.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.vxquery.xtest.util.tests;
-
-import java.io.File;
-import java.io.IOException;
-import java.net.InetAddress;
-import java.net.UnknownHostException;
-
-import org.xml.sax.XMLReader;
-
-abstract class AbstractDiskTest implements IDiskTest, Runnable {
- private String filename;
- private int bufferSize;
- protected XMLReader parser;
-
- public void setFile(File file) {
- this.filename = file.getAbsolutePath();
- }
-
- public String getPrintFilename() {
- return filename.substring(filename.length() - 20);
- }
-
- public void setBufferSize(int bufferSize) {
- this.bufferSize = bufferSize;
- }
-
- public void setParser(XMLReader parser) {
- this.parser = parser;
- }
-
- public void start() {
- run();
- }
-
- public void run() {
- long size = -1;
- // System.out.printf(getPrintFilename() + "\t" + getMessage() + " - Starting%n");
- long start = System.nanoTime();
- try {
- size = test(filename, bufferSize);
- } catch (IOException e) {
- e.printStackTrace();
- }
- long end = System.nanoTime();
- long timeDelta = end - start;
- double speed = 0;
- if (size > 0) {
- speed = (size * 1e3) / timeDelta;
- }
- // System.out.printf("checkSum: %d%n", checkSum);
- // System.out.printf(getPrintFilename() + "\t" + getMessage() + "%.1f ms\t%.2f MB/s\t%.2f MB/s",
- // (timeDelta) / 1e6, 1024 * 1024 * 1e6 / (timeDelta), speed);
- // CSV output of the results.
- try {
- System.out.printf("%s,", InetAddress.getLocalHost().getHostName());
- } catch (UnknownHostException e) {
- e.printStackTrace();
- }
- System.out.printf("%s,%s,%.1f,%.2f", filename, getMessage(), (timeDelta) / 1e6,
- 1024 * 1024 * 1e6 / (timeDelta), speed);
- if (isBuffered() && bufferSize > 0) {
- System.out.printf(",%.1f", bufferSize / 1024.0);
- } else {
- System.out.printf(",0");
- }
- System.out.println();
- }
-
- public boolean isBuffered() {
- return true;
- }
-
- abstract public String getMessage();
-
- abstract public long test(String filename, int bufferSize) throws IOException;
-}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/51a98938/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/util/tests/BufferedParsedCharacterStream.java
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/util/tests/BufferedParsedCharacterStream.java b/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/util/tests/BufferedParsedCharacterStream.java
deleted file mode 100644
index 8a9ee18..0000000
--- a/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/util/tests/BufferedParsedCharacterStream.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.vxquery.xtest.util.tests;
-
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStreamReader;
-
-import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
-
-public class BufferedParsedCharacterStream extends AbstractDiskTest {
- @Override
- public String getMessage() {
- return "Buffered Parsed - Character Stream";
- }
-
- @Override
- public long test(String filename, int bufferSize) throws IOException {
- try {
- if (bufferSize > 0) {
- parser.setProperty("http://apache.org/xml/properties/input-buffer-size", new Integer(bufferSize));
- }
- InputStreamReader f = new InputStreamReader(new FileInputStream(filename));
- InputSource in = new InputSource();
- in.setCharacterStream(f);
- parser.parse(in);
- } catch (SAXException e) {
- e.printStackTrace();
- }
- return -1;
- }
-}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/51a98938/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/util/tests/BufferedReaderBufferedStream.java
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/util/tests/BufferedReaderBufferedStream.java b/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/util/tests/BufferedReaderBufferedStream.java
deleted file mode 100644
index d964241..0000000
--- a/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/util/tests/BufferedReaderBufferedStream.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.vxquery.xtest.util.tests;
-
-import java.io.BufferedInputStream;
-import java.io.BufferedReader;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStreamReader;
-
-public class BufferedReaderBufferedStream extends AbstractDiskTest {
- @Override
- public String getMessage() {
- return "Buffered Reader - Buffered Stream";
- }
-
- @Override
- public long test(String filename, int bufferSize) throws IOException {
- BufferedReader f;
- if (bufferSize > 0) {
- f = new BufferedReader(new InputStreamReader(new BufferedInputStream(new FileInputStream(filename),
- bufferSize)), bufferSize);
- } else {
- f = new BufferedReader(new InputStreamReader(new BufferedInputStream(new FileInputStream(filename))));
- }
- int b;
- long byteCount = 0L;
- long checkSum = 0L;
- while ((b = f.read()) != -1) {
- checkSum += b;
- byteCount++;
- }
- f.close();
- return byteCount;
- }
-}
[11/50] [abbrv] vxquery git commit: VXQUERY-181 - Move to Hyracks
0.2.16
Posted by sj...@apache.org.
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/query/XMLQueryCompiler.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/query/XMLQueryCompiler.java b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/query/XMLQueryCompiler.java
index aea6ef7..e9efa11 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/query/XMLQueryCompiler.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/query/XMLQueryCompiler.java
@@ -40,37 +40,37 @@ import org.apache.vxquery.types.SequenceType;
import org.apache.vxquery.xmlquery.ast.ModuleNode;
import org.apache.vxquery.xmlquery.translator.XMLQueryTranslator;
-import edu.uci.ics.hyracks.algebricks.common.exceptions.AlgebricksException;
-import edu.uci.ics.hyracks.algebricks.common.exceptions.NotImplementedException;
-import edu.uci.ics.hyracks.algebricks.common.utils.Pair;
-import edu.uci.ics.hyracks.algebricks.compiler.api.HeuristicCompilerFactoryBuilder;
-import edu.uci.ics.hyracks.algebricks.compiler.api.ICompiler;
-import edu.uci.ics.hyracks.algebricks.compiler.api.ICompilerFactory;
-import edu.uci.ics.hyracks.algebricks.compiler.rewriter.rulecontrollers.PrioritizedRuleController;
-import edu.uci.ics.hyracks.algebricks.compiler.rewriter.rulecontrollers.SequentialFixpointRuleController;
-import edu.uci.ics.hyracks.algebricks.compiler.rewriter.rulecontrollers.SequentialOnceRuleController;
-import edu.uci.ics.hyracks.algebricks.core.algebra.base.ILogicalExpression;
-import edu.uci.ics.hyracks.algebricks.core.algebra.base.IOptimizationContext;
-import edu.uci.ics.hyracks.algebricks.core.algebra.base.LogicalExpressionTag;
-import edu.uci.ics.hyracks.algebricks.core.algebra.expressions.ConstantExpression;
-import edu.uci.ics.hyracks.algebricks.core.algebra.expressions.IAlgebricksConstantValue;
-import edu.uci.ics.hyracks.algebricks.core.algebra.expressions.IExpressionEvalSizeComputer;
-import edu.uci.ics.hyracks.algebricks.core.algebra.expressions.IExpressionTypeComputer;
-import edu.uci.ics.hyracks.algebricks.core.algebra.expressions.IMergeAggregationExpressionFactory;
-import edu.uci.ics.hyracks.algebricks.core.algebra.expressions.INullableTypeComputer;
-import edu.uci.ics.hyracks.algebricks.core.algebra.expressions.IVariableTypeEnvironment;
-import edu.uci.ics.hyracks.algebricks.core.algebra.metadata.IMetadataProvider;
-import edu.uci.ics.hyracks.algebricks.core.algebra.prettyprint.LogicalOperatorPrettyPrintVisitor;
-import edu.uci.ics.hyracks.algebricks.core.rewriter.base.AbstractRuleController;
-import edu.uci.ics.hyracks.algebricks.core.rewriter.base.IAlgebraicRewriteRule;
-import edu.uci.ics.hyracks.algebricks.core.rewriter.base.IOptimizationContextFactory;
-import edu.uci.ics.hyracks.algebricks.core.rewriter.base.PhysicalOptimizationConfig;
-import edu.uci.ics.hyracks.algebricks.data.ISerializerDeserializerProvider;
-import edu.uci.ics.hyracks.algebricks.data.ITypeTraitProvider;
-import edu.uci.ics.hyracks.api.dataflow.value.ISerializerDeserializer;
-import edu.uci.ics.hyracks.api.dataflow.value.ITypeTraits;
-import edu.uci.ics.hyracks.api.job.JobSpecification;
-import edu.uci.ics.hyracks.data.std.primitive.VoidPointable;
+import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
+import org.apache.hyracks.algebricks.common.exceptions.NotImplementedException;
+import org.apache.hyracks.algebricks.common.utils.Pair;
+import org.apache.hyracks.algebricks.compiler.api.HeuristicCompilerFactoryBuilder;
+import org.apache.hyracks.algebricks.compiler.api.ICompiler;
+import org.apache.hyracks.algebricks.compiler.api.ICompilerFactory;
+import org.apache.hyracks.algebricks.compiler.rewriter.rulecontrollers.PrioritizedRuleController;
+import org.apache.hyracks.algebricks.compiler.rewriter.rulecontrollers.SequentialFixpointRuleController;
+import org.apache.hyracks.algebricks.compiler.rewriter.rulecontrollers.SequentialOnceRuleController;
+import org.apache.hyracks.algebricks.core.algebra.base.ILogicalExpression;
+import org.apache.hyracks.algebricks.core.algebra.base.IOptimizationContext;
+import org.apache.hyracks.algebricks.core.algebra.base.LogicalExpressionTag;
+import org.apache.hyracks.algebricks.core.algebra.expressions.ConstantExpression;
+import org.apache.hyracks.algebricks.core.algebra.expressions.IAlgebricksConstantValue;
+import org.apache.hyracks.algebricks.core.algebra.expressions.IExpressionEvalSizeComputer;
+import org.apache.hyracks.algebricks.core.algebra.expressions.IExpressionTypeComputer;
+import org.apache.hyracks.algebricks.core.algebra.expressions.IMergeAggregationExpressionFactory;
+import org.apache.hyracks.algebricks.core.algebra.expressions.INullableTypeComputer;
+import org.apache.hyracks.algebricks.core.algebra.expressions.IVariableTypeEnvironment;
+import org.apache.hyracks.algebricks.core.algebra.metadata.IMetadataProvider;
+import org.apache.hyracks.algebricks.core.algebra.prettyprint.LogicalOperatorPrettyPrintVisitor;
+import org.apache.hyracks.algebricks.core.rewriter.base.AbstractRuleController;
+import org.apache.hyracks.algebricks.core.rewriter.base.IAlgebraicRewriteRule;
+import org.apache.hyracks.algebricks.core.rewriter.base.IOptimizationContextFactory;
+import org.apache.hyracks.algebricks.core.rewriter.base.PhysicalOptimizationConfig;
+import org.apache.hyracks.algebricks.data.ISerializerDeserializerProvider;
+import org.apache.hyracks.algebricks.data.ITypeTraitProvider;
+import org.apache.hyracks.api.dataflow.value.ISerializerDeserializer;
+import org.apache.hyracks.api.dataflow.value.ITypeTraits;
+import org.apache.hyracks.api.job.JobSpecification;
+import org.apache.hyracks.data.std.primitive.VoidPointable;
public class XMLQueryCompiler {
private final XQueryCompilationListener listener;
@@ -276,4 +276,4 @@ public class XMLQueryCompiler {
return defaultPhysicalRewrites;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/query/XMLQueryParser.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/query/XMLQueryParser.java b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/query/XMLQueryParser.java
index f2a97cc..04690f5 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/query/XMLQueryParser.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/query/XMLQueryParser.java
@@ -44,4 +44,4 @@ public class XMLQueryParser {
private XMLQueryParser() {
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/query/XMLQueryTypeChecker.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/query/XMLQueryTypeChecker.java b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/query/XMLQueryTypeChecker.java
index fdf3a53..aee9812 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/query/XMLQueryTypeChecker.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/query/XMLQueryTypeChecker.java
@@ -20,4 +20,4 @@ final class XMLQueryTypeChecker {
static void typeCheckModule(Module module) {
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/query/XQueryCompilationListener.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/query/XQueryCompilationListener.java b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/query/XQueryCompilationListener.java
index 94aedb6..48bc7e6 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/query/XQueryCompilationListener.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/query/XQueryCompilationListener.java
@@ -26,4 +26,4 @@ public interface XQueryCompilationListener {
public void notifyCodegenResult(Module module);
public void notifyOptimizedResult(Module module);
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/query/XQueryConstants.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/query/XQueryConstants.java b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/query/XQueryConstants.java
index 00997b9..d8fdf94 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/query/XQueryConstants.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/query/XQueryConstants.java
@@ -62,4 +62,4 @@ public final class XQueryConstants {
SLASH,
SLASH_SLASH,
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/translator/VXQueryPositionWriter.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/translator/VXQueryPositionWriter.java b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/translator/VXQueryPositionWriter.java
index f8a3c65..e4e222d 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/translator/VXQueryPositionWriter.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/translator/VXQueryPositionWriter.java
@@ -18,14 +18,13 @@ import java.io.DataOutput;
import java.io.IOException;
import java.io.Serializable;
+import org.apache.hyracks.algebricks.runtime.base.IUnnestingPositionWriter;
import org.apache.vxquery.datamodel.values.ValueTag;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IUnnestingPositionWriter;
-
public class VXQueryPositionWriter implements IUnnestingPositionWriter, Serializable {
private static final long serialVersionUID = 1L;
- public void write(DataOutput dataOutput, int position) throws IOException {
+ public void write(DataOutput dataOutput, long position) throws IOException {
dataOutput.writeByte(ValueTag.XS_INTEGER_TAG);
dataOutput.writeLong(position);
}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/translator/XMLQueryTranslator.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/translator/XMLQueryTranslator.java b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/translator/XMLQueryTranslator.java
index 9faefda..d2ff3da 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/translator/XMLQueryTranslator.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/translator/XMLQueryTranslator.java
@@ -33,6 +33,31 @@ import javax.xml.namespace.QName;
import org.apache.commons.lang3.mutable.Mutable;
import org.apache.commons.lang3.mutable.MutableObject;
import org.apache.commons.lang3.tuple.Pair;
+import org.apache.hyracks.algebricks.core.algebra.base.ILogicalExpression;
+import org.apache.hyracks.algebricks.core.algebra.base.ILogicalOperator;
+import org.apache.hyracks.algebricks.core.algebra.base.ILogicalPlan;
+import org.apache.hyracks.algebricks.core.algebra.base.LogicalExpressionTag;
+import org.apache.hyracks.algebricks.core.algebra.base.LogicalOperatorTag;
+import org.apache.hyracks.algebricks.core.algebra.base.LogicalVariable;
+import org.apache.hyracks.algebricks.core.algebra.expressions.AbstractFunctionCallExpression;
+import org.apache.hyracks.algebricks.core.algebra.expressions.AggregateFunctionCallExpression;
+import org.apache.hyracks.algebricks.core.algebra.expressions.ConstantExpression;
+import org.apache.hyracks.algebricks.core.algebra.expressions.ScalarFunctionCallExpression;
+import org.apache.hyracks.algebricks.core.algebra.expressions.UnnestingFunctionCallExpression;
+import org.apache.hyracks.algebricks.core.algebra.expressions.VariableReferenceExpression;
+import org.apache.hyracks.algebricks.core.algebra.operators.logical.AggregateOperator;
+import org.apache.hyracks.algebricks.core.algebra.operators.logical.AssignOperator;
+import org.apache.hyracks.algebricks.core.algebra.operators.logical.DistributeResultOperator;
+import org.apache.hyracks.algebricks.core.algebra.operators.logical.EmptyTupleSourceOperator;
+import org.apache.hyracks.algebricks.core.algebra.operators.logical.NestedTupleSourceOperator;
+import org.apache.hyracks.algebricks.core.algebra.operators.logical.OrderOperator;
+import org.apache.hyracks.algebricks.core.algebra.operators.logical.SelectOperator;
+import org.apache.hyracks.algebricks.core.algebra.operators.logical.SubplanOperator;
+import org.apache.hyracks.algebricks.core.algebra.operators.logical.UnnestOperator;
+import org.apache.hyracks.algebricks.core.algebra.plan.ALogicalPlanImpl;
+import org.apache.hyracks.data.std.primitive.DoublePointable;
+import org.apache.hyracks.data.std.util.ArrayBackedValueStorage;
+import org.apache.hyracks.data.std.util.ByteArrayAccessibleOutputStream;
import org.apache.vxquery.compiler.CompilerControlBlock;
import org.apache.vxquery.compiler.algebricks.VXQueryConstantValue;
import org.apache.vxquery.context.StaticContext;
@@ -156,32 +181,6 @@ import org.apache.vxquery.xmlquery.query.XQueryConstants;
import org.apache.vxquery.xmlquery.query.XQueryConstants.PathType;
import org.apache.vxquery.xmlquery.query.XQueryConstants.TypeQuantifier;
-import edu.uci.ics.hyracks.algebricks.core.algebra.base.ILogicalExpression;
-import edu.uci.ics.hyracks.algebricks.core.algebra.base.ILogicalOperator;
-import edu.uci.ics.hyracks.algebricks.core.algebra.base.ILogicalPlan;
-import edu.uci.ics.hyracks.algebricks.core.algebra.base.LogicalExpressionTag;
-import edu.uci.ics.hyracks.algebricks.core.algebra.base.LogicalOperatorTag;
-import edu.uci.ics.hyracks.algebricks.core.algebra.base.LogicalVariable;
-import edu.uci.ics.hyracks.algebricks.core.algebra.expressions.AbstractFunctionCallExpression;
-import edu.uci.ics.hyracks.algebricks.core.algebra.expressions.AggregateFunctionCallExpression;
-import edu.uci.ics.hyracks.algebricks.core.algebra.expressions.ConstantExpression;
-import edu.uci.ics.hyracks.algebricks.core.algebra.expressions.ScalarFunctionCallExpression;
-import edu.uci.ics.hyracks.algebricks.core.algebra.expressions.UnnestingFunctionCallExpression;
-import edu.uci.ics.hyracks.algebricks.core.algebra.expressions.VariableReferenceExpression;
-import edu.uci.ics.hyracks.algebricks.core.algebra.operators.logical.AggregateOperator;
-import edu.uci.ics.hyracks.algebricks.core.algebra.operators.logical.AssignOperator;
-import edu.uci.ics.hyracks.algebricks.core.algebra.operators.logical.DistributeResultOperator;
-import edu.uci.ics.hyracks.algebricks.core.algebra.operators.logical.EmptyTupleSourceOperator;
-import edu.uci.ics.hyracks.algebricks.core.algebra.operators.logical.NestedTupleSourceOperator;
-import edu.uci.ics.hyracks.algebricks.core.algebra.operators.logical.OrderOperator;
-import edu.uci.ics.hyracks.algebricks.core.algebra.operators.logical.SelectOperator;
-import edu.uci.ics.hyracks.algebricks.core.algebra.operators.logical.SubplanOperator;
-import edu.uci.ics.hyracks.algebricks.core.algebra.operators.logical.UnnestOperator;
-import edu.uci.ics.hyracks.algebricks.core.algebra.plan.ALogicalPlanImpl;
-import edu.uci.ics.hyracks.data.std.primitive.DoublePointable;
-import edu.uci.ics.hyracks.data.std.util.ArrayBackedValueStorage;
-import edu.uci.ics.hyracks.data.std.util.ByteArrayAccessibleOutputStream;
-
public class XMLQueryTranslator {
private static final Pattern UNQUOTER = Pattern
.compile("(<)|(>)|(')|(&)|(")|(\"\")|('')|(&#\\d+;)|(&#x(?:[A-Fa-f0-9])+;)");
@@ -226,8 +225,8 @@ public class XMLQueryTranslator {
Module module = new Module();
moduleCtx = new StaticContextImpl(rootCtx);
- moduleCtx.registerVariable(new XQueryVariable(XMLQueryCompilerConstants.DOT_VAR_NAME, SequenceType.create(
- AnyItemType.INSTANCE, Quantifier.QUANT_ONE), newLogicalVariable()));
+ moduleCtx.registerVariable(new XQueryVariable(XMLQueryCompilerConstants.DOT_VAR_NAME,
+ SequenceType.create(AnyItemType.INSTANCE, Quantifier.QUANT_ONE), newLogicalVariable()));
rootVarScope = new RootVariableScope();
currCtx = moduleCtx;
module.setModuleContext(moduleCtx);
@@ -403,8 +402,8 @@ public class XMLQueryTranslator {
paramTypes[i] = Pair.<QName, SequenceType> of(pName, pType);
}
Signature sign = new Signature(rType, paramTypes);
- Function f = external ? new ExternalFunction(name, sign) : new UserDefinedXQueryFunction(name,
- sign, null);
+ Function f = external ? new ExternalFunction(name, sign)
+ : new UserDefinedXQueryFunction(name, sign, null);
moduleCtx.registerFunction(f);
break;
}
@@ -512,8 +511,8 @@ public class XMLQueryTranslator {
case SINGLE_TYPE: {
SingleTypeNode stNode = (SingleTypeNode) type;
ItemType iType = createItemType(stNode.getAtomicType());
- return SequenceType.create(iType, stNode.isOptional() ? Quantifier.QUANT_QUESTION
- : Quantifier.QUANT_ONE);
+ return SequenceType.create(iType,
+ stNode.isOptional() ? Quantifier.QUANT_QUESTION : Quantifier.QUANT_ONE);
}
default:
@@ -764,7 +763,7 @@ public class XMLQueryTranslator {
return translateQuantifiedExprNode(tCtx, qeNode);
}
- /*
+ /*
case TYPESWITCH_EXPRESSION: {
TypeswitchExprNode teNode = (TypeswitchExprNode) value;
Expression sExpr = translateExpression(teNode.getSwitchExpr());
@@ -900,9 +899,9 @@ public class XMLQueryTranslator {
tCtx.popVariableScope();
}
tCtx = tCtx.popContext();
- LogicalVariable lVar = createAssignment(
- sfce(qeNode.getQuant() == QuantifierType.EVERY ? BuiltinFunctions.FN_EMPTY_1
- : BuiltinFunctions.FN_EXISTS_1, vre(var)), tCtx);
+ LogicalVariable lVar = createAssignment(sfce(
+ qeNode.getQuant() == QuantifierType.EVERY ? BuiltinFunctions.FN_EMPTY_1 : BuiltinFunctions.FN_EXISTS_1,
+ vre(var)), tCtx);
return lVar;
}
@@ -922,10 +921,10 @@ public class XMLQueryTranslator {
private LogicalVariable translateCDataSectionNode(TranslationContext tCtx, CDataSectionNode cdsNode)
throws SystemException {
- LogicalVariable lVar = createAssignment(
- sfce(BuiltinOperators.TEXT_CONSTRUCTOR,
- ce(SequenceType.create(BuiltinTypeRegistry.XS_UNTYPED_ATOMIC, Quantifier.QUANT_ONE),
- cdsNode.getContent())), tCtx);
+ LogicalVariable lVar = createAssignment(sfce(BuiltinOperators.TEXT_CONSTRUCTOR,
+ ce(SequenceType.create(BuiltinTypeRegistry.XS_UNTYPED_ATOMIC, Quantifier.QUANT_ONE),
+ cdsNode.getContent())),
+ tCtx);
return lVar;
}
@@ -944,8 +943,8 @@ public class XMLQueryTranslator {
private LogicalVariable translateValidateExprNode(TranslationContext tCtx, ValidateExprNode vNode)
throws SystemException {
XQueryConstants.ValidationMode mode = vNode.getMode();
- Function fn = mode == null || XQueryConstants.ValidationMode.STRICT.equals(mode) ? BuiltinOperators.VALIDATE_STRICT
- : BuiltinOperators.VALIDATE_LAX;
+ Function fn = mode == null || XQueryConstants.ValidationMode.STRICT.equals(mode)
+ ? BuiltinOperators.VALIDATE_STRICT : BuiltinOperators.VALIDATE_LAX;
LogicalVariable lVar = createAssignment(sfce(fn, vre(translateExpression(vNode.getExpr(), tCtx))), tCtx);
return lVar;
}
@@ -955,8 +954,8 @@ public class XMLQueryTranslator {
ILogicalExpression name = cast(vre(translateExpression(cNode.getName(), tCtx)),
SequenceType.create(BuiltinTypeRegistry.XS_QNAME, Quantifier.QUANT_ONE));
ASTNode content = cNode.getContent();
- ILogicalExpression cExpr = content == null ? sfce(BuiltinOperators.CONCATENATE) : vre(translateExpression(
- content, tCtx));
+ ILogicalExpression cExpr = content == null ? sfce(BuiltinOperators.CONCATENATE)
+ : vre(translateExpression(content, tCtx));
LogicalVariable lVar = createAssignment(sfce(BuiltinOperators.ATTRIBUTE_CONSTRUCTOR, name, cExpr), tCtx);
return lVar;
}
@@ -966,8 +965,8 @@ public class XMLQueryTranslator {
ILogicalExpression name = cast(vre(translateExpression(cNode.getName(), tCtx)),
SequenceType.create(BuiltinTypeRegistry.XS_QNAME, Quantifier.QUANT_ONE));
ASTNode content = cNode.getContent();
- ILogicalExpression cExpr = content == null ? sfce(BuiltinOperators.CONCATENATE) : vre(translateExpression(
- content, tCtx));
+ ILogicalExpression cExpr = content == null ? sfce(BuiltinOperators.CONCATENATE)
+ : vre(translateExpression(content, tCtx));
LogicalVariable lVar = createAssignment(sfce(BuiltinOperators.ELEMENT_CONSTRUCTOR, name, cExpr), tCtx);
return lVar;
}
@@ -983,8 +982,9 @@ public class XMLQueryTranslator {
ComputedCommentConstructorNode cNode) throws SystemException {
ASTNode content = cNode.getContent();
LogicalVariable lVar = createAssignment(
- sfce(BuiltinOperators.COMMENT_CONSTRUCTOR, content == null ? sfce(BuiltinOperators.CONCATENATE)
- : vre(translateExpression(content, tCtx))), tCtx);
+ sfce(BuiltinOperators.COMMENT_CONSTRUCTOR,
+ content == null ? sfce(BuiltinOperators.CONCATENATE) : vre(translateExpression(content, tCtx))),
+ tCtx);
return lVar;
}
@@ -1001,15 +1001,16 @@ public class XMLQueryTranslator {
private LogicalVariable translateComputedTextConstructorNode(TranslationContext tCtx,
ComputedTextConstructorNode cNode) throws SystemException {
ASTNode content = cNode.getContent();
- LogicalVariable lVar = createAssignment(
- sfce(BuiltinOperators.TEXT_CONSTRUCTOR,
- content == null ? ce(
- SequenceType.create(BuiltinTypeRegistry.XS_UNTYPED_ATOMIC, Quantifier.QUANT_ONE), "")
- : vre(translateExpression(content, tCtx))), tCtx);
+ LogicalVariable lVar = createAssignment(sfce(BuiltinOperators.TEXT_CONSTRUCTOR,
+ content == null
+ ? ce(SequenceType.create(BuiltinTypeRegistry.XS_UNTYPED_ATOMIC, Quantifier.QUANT_ONE), "")
+ : vre(translateExpression(content, tCtx))),
+ tCtx);
return lVar;
}
- private LogicalVariable translateFLWORExprNode(TranslationContext tCtx, FLWORExprNode fNode) throws SystemException {
+ private LogicalVariable translateFLWORExprNode(TranslationContext tCtx, FLWORExprNode fNode)
+ throws SystemException {
tCtx = tCtx.pushContext();
List<FLWORClauseNode> cNodes = fNode.getClauses();
int pushCount = 0;
@@ -1034,8 +1035,8 @@ public class XMLQueryTranslator {
tCtx.varScope.registerVariable(forVar);
XQueryVariable posVar = null;
if (fvdNode.getPosVar() != null) {
- posVar = new XQueryVariable(createQName(fvdNode.getPosVar()), SequenceType.create(
- BuiltinTypeRegistry.XS_INTEGER, Quantifier.QUANT_ONE), posLVar);
+ posVar = new XQueryVariable(createQName(fvdNode.getPosVar()),
+ SequenceType.create(BuiltinTypeRegistry.XS_INTEGER, Quantifier.QUANT_ONE), posLVar);
tCtx.varScope.registerVariable(posVar);
}
assert fvdNode.getScoreVar() == null;
@@ -1054,7 +1055,8 @@ public class XMLQueryTranslator {
if (lvdNode.getType() != null) {
letVarType = createSequenceType(lvdNode.getType());
}
- XQueryVariable letVar = new XQueryVariable(createQName(lvdNode.getLetVar()), letVarType, seqVar);
+ XQueryVariable letVar = new XQueryVariable(createQName(lvdNode.getLetVar()), letVarType,
+ seqVar);
tCtx.varScope.registerVariable(letVar);
++pushCount;
}
@@ -1071,7 +1073,7 @@ public class XMLQueryTranslator {
}
case ORDERBY_CLAUSE: {
OrderbyClauseNode ocNode = (OrderbyClauseNode) cNode;
- List<edu.uci.ics.hyracks.algebricks.common.utils.Pair<OrderOperator.IOrder, Mutable<ILogicalExpression>>> oExprs = new ArrayList<edu.uci.ics.hyracks.algebricks.common.utils.Pair<OrderOperator.IOrder, Mutable<ILogicalExpression>>>();
+ List<org.apache.hyracks.algebricks.common.utils.Pair<OrderOperator.IOrder, Mutable<ILogicalExpression>>> oExprs = new ArrayList<org.apache.hyracks.algebricks.common.utils.Pair<OrderOperator.IOrder, Mutable<ILogicalExpression>>>();
List<String> collations = new ArrayList<String>();
for (OrderSpecNode osNode : ocNode.getOrderSpec()) {
ILogicalExpression oExpr = vre(translateExpression(osNode.getExpression(), tCtx));
@@ -1103,8 +1105,9 @@ public class XMLQueryTranslator {
}
collations.add(osNode.getCollation());
*/
- oExprs.add(new edu.uci.ics.hyracks.algebricks.common.utils.Pair<OrderOperator.IOrder, Mutable<ILogicalExpression>>(
- o, mutable(oExpr)));
+ oExprs.add(
+ new org.apache.hyracks.algebricks.common.utils.Pair<OrderOperator.IOrder, Mutable<ILogicalExpression>>(
+ o, mutable(oExpr)));
}
OrderOperator order = new OrderOperator(oExprs);
order.getInputs().add(mutable(tCtx.op));
@@ -1170,8 +1173,8 @@ public class XMLQueryTranslator {
content.add(data(vre(translateExpression(aVal, tCtx))));
}
}
- ILogicalExpression contentExpr = content.size() == 1 ? content.get(0) : sfce(BuiltinOperators.CONCATENATE,
- content.toArray(new ILogicalExpression[content.size()]));
+ ILogicalExpression contentExpr = content.size() == 1 ? content.get(0)
+ : sfce(BuiltinOperators.CONCATENATE, content.toArray(new ILogicalExpression[content.size()]));
LogicalVariable lVar = createAssignment(sfce(BuiltinOperators.ATTRIBUTE_CONSTRUCTOR, name, contentExpr), tCtx);
return lVar;
}
@@ -1180,9 +1183,8 @@ public class XMLQueryTranslator {
DirectElementConstructorNode decNode) throws SystemException {
QNameNode startName = decNode.getStartTagName();
QNameNode endName = decNode.getEndTagName();
- if (endName != null
- && (!startName.getPrefix().equals(endName.getPrefix()) || !startName.getLocalName().equals(
- endName.getLocalName()))) {
+ if (endName != null && (!startName.getPrefix().equals(endName.getPrefix())
+ || !startName.getLocalName().equals(endName.getLocalName()))) {
throw new SystemException(ErrorCode.XPST0003, endName.getSourceLocation());
}
pushContext();
@@ -1223,8 +1225,8 @@ public class XMLQueryTranslator {
}
}
popContext();
- ILogicalExpression contentExpr = content.size() == 1 ? content.get(0) : sfce(BuiltinOperators.CONCATENATE,
- content.toArray(new ILogicalExpression[content.size()]));
+ ILogicalExpression contentExpr = content.size() == 1 ? content.get(0)
+ : sfce(BuiltinOperators.CONCATENATE, content.toArray(new ILogicalExpression[content.size()]));
LogicalVariable lVar = createAssignment(sfce(BuiltinOperators.ELEMENT_CONSTRUCTOR, name, contentExpr), tCtx);
return lVar;
}
@@ -1232,9 +1234,8 @@ public class XMLQueryTranslator {
private LogicalVariable translateDirectCommentConstructorNode(TranslationContext tCtx,
DirectCommentConstructorNode dccNode) throws SystemException {
String content = dccNode.getContent();
- LogicalVariable lVar = createAssignment(
- sfce(BuiltinOperators.COMMENT_CONSTRUCTOR,
- ce(SequenceType.create(BuiltinTypeRegistry.XS_STRING, Quantifier.QUANT_ONE), content)), tCtx);
+ LogicalVariable lVar = createAssignment(sfce(BuiltinOperators.COMMENT_CONSTRUCTOR,
+ ce(SequenceType.create(BuiltinTypeRegistry.XS_STRING, Quantifier.QUANT_ONE), content)), tCtx);
return lVar;
}
@@ -1242,10 +1243,9 @@ public class XMLQueryTranslator {
throws SystemException {
String target = dpicNode.getTarget();
String content = dpicNode.getContent();
- LogicalVariable lVar = createAssignment(
- sfce(BuiltinOperators.PI_CONSTRUCTOR,
- ce(SequenceType.create(BuiltinTypeRegistry.XS_STRING, Quantifier.QUANT_ONE), target),
- ce(SequenceType.create(BuiltinTypeRegistry.XS_STRING, Quantifier.QUANT_ONE), content)), tCtx);
+ LogicalVariable lVar = createAssignment(sfce(BuiltinOperators.PI_CONSTRUCTOR,
+ ce(SequenceType.create(BuiltinTypeRegistry.XS_STRING, Quantifier.QUANT_ONE), target),
+ ce(SequenceType.create(BuiltinTypeRegistry.XS_STRING, Quantifier.QUANT_ONE), content)), tCtx);
return lVar;
}
@@ -1339,8 +1339,9 @@ public class XMLQueryTranslator {
if (!type.isAtomicType()) {
throw new SystemException(ErrorCode.XPST0051, fnNode.getName().getSourceLocation());
}
- LogicalVariable var = args.isEmpty() ? tCtx.varScope.lookupVariable(XMLQueryCompilerConstants.DOT_VAR_NAME)
- .getLogicalVariable() : args.get(0);
+ LogicalVariable var = args.isEmpty()
+ ? tCtx.varScope.lookupVariable(XMLQueryCompilerConstants.DOT_VAR_NAME).getLogicalVariable()
+ : args.get(0);
ILogicalExpression expr = cast(vre(var), SequenceType.create((ItemType) type, Quantifier.QUANT_QUESTION));
return createAssignment(expr, tCtx);
}
@@ -1417,8 +1418,8 @@ public class XMLQueryTranslator {
}
LogicalVariable var = translateExpression(ueNode.getExpr(), tCtx);
if (neg) {
- ILogicalExpression nExpr = normalize(vre(var), BuiltinOperators.NUMERIC_UNARY_MINUS.getSignature()
- .getParameterType(0));
+ ILogicalExpression nExpr = normalize(vre(var),
+ BuiltinOperators.NUMERIC_UNARY_MINUS.getSignature().getParameterType(0));
ILogicalExpression negExpr = sfce(BuiltinOperators.NUMERIC_UNARY_MINUS, nExpr);
var = createAssignment(negExpr, tCtx);
}
@@ -1450,8 +1451,8 @@ public class XMLQueryTranslator {
tCtx = tCtx.pushContext();
tCtx.pushVariableScope();
iterateOver(ctxExpr, tCtx);
- ctxExpr = vre(tCtx.varScope.lookupVariable(XMLQueryCompilerConstants.DOT_VAR_NAME)
- .getLogicalVariable());
+ ctxExpr = vre(
+ tCtx.varScope.lookupVariable(XMLQueryCompilerConstants.DOT_VAR_NAME).getLogicalVariable());
ctxExpr = sfce(BuiltinOperators.DESCENDANT_OR_SELF,
treat(ctxExpr, SequenceType.create(AnyNodeType.INSTANCE, Quantifier.QUANT_STAR)));
List<LogicalVariable> vars = new ArrayList<LogicalVariable>();
@@ -1519,8 +1520,8 @@ public class XMLQueryTranslator {
ILogicalExpression expression = ((AssignOperator) tCtx.op).getExpressions().get(0)
.getValue();
if (expression.getExpressionTag() == LogicalExpressionTag.FUNCTION_CALL
- && ((AbstractFunctionCallExpression) expression).getFunctionIdentifier().equals(
- BuiltinOperators.CHILD.getFunctionIdentifier())) {
+ && ((AbstractFunctionCallExpression) expression).getFunctionIdentifier()
+ .equals(BuiltinOperators.CHILD.getFunctionIdentifier())) {
boolTestTmp = sfce(BuiltinFunctions.FN_COUNT_1, boolTestTmp);
}
}
@@ -1535,8 +1536,8 @@ public class XMLQueryTranslator {
SelectOperator select = new SelectOperator(mutable(selectCondition), false, null);
select.getInputs().add(mutable(tCtx.op));
tCtx.op = select;
- ctxExpr = vre(tCtx.varScope.lookupVariable(XMLQueryCompilerConstants.DOT_VAR_NAME)
- .getLogicalVariable());
+ ctxExpr = vre(
+ tCtx.varScope.lookupVariable(XMLQueryCompilerConstants.DOT_VAR_NAME).getLogicalVariable());
}
if (popScope) {
tCtx.popVariableScope();
@@ -1562,8 +1563,8 @@ public class XMLQueryTranslator {
private void iterateOver(ILogicalExpression ctxExpr, TranslationContext tCtx) {
LogicalVariable seqLVar = createAssignment(ctxExpr, tCtx);
LogicalVariable lastLVar = createAssignment(sfce(BuiltinFunctions.FN_COUNT_1, vre(seqLVar)), tCtx);
- tCtx.varScope.registerVariable(new XQueryVariable(XMLQueryCompilerConstants.LAST_VAR_NAME, SequenceType.create(
- BuiltinTypeRegistry.XS_INTEGER, Quantifier.QUANT_ONE), lastLVar));
+ tCtx.varScope.registerVariable(new XQueryVariable(XMLQueryCompilerConstants.LAST_VAR_NAME,
+ SequenceType.create(BuiltinTypeRegistry.XS_INTEGER, Quantifier.QUANT_ONE), lastLVar));
LogicalVariable forLVar = newLogicalVariable();
LogicalVariable posLVar = newLogicalVariable();
UnnestOperator unnest = new UnnestOperator(forLVar, mutable(ufce(BuiltinOperators.ITERATE, vre(seqLVar))),
@@ -2146,4 +2147,4 @@ public class XMLQueryTranslator {
varMap.put(var.getName(), var);
}
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/xslt/generate-fn-defns.xsl
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/xslt/generate-fn-defns.xsl b/vxquery-core/src/main/xslt/generate-fn-defns.xsl
index 1206d25..eb53582 100644
--- a/vxquery-core/src/main/xslt/generate-fn-defns.xsl
+++ b/vxquery-core/src/main/xslt/generate-fn-defns.xsl
@@ -80,17 +80,17 @@
</xsl:if>
<xsl:for-each select="runtime">
<xsl:if test="@type = 'scalar'">
- public edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory createScalarEvaluatorFactory(edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory[] args) {
+ public org.apache.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory createScalarEvaluatorFactory(org.apache.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory[] args) {
return new <xsl:value-of select="@class"/>(args);
}
</xsl:if>
<xsl:if test="@type = 'aggregate'">
- public edu.uci.ics.hyracks.algebricks.runtime.base.IAggregateEvaluatorFactory createAggregateEvaluatorFactory(edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory[] args) {
+ public org.apache.hyracks.algebricks.runtime.base.IAggregateEvaluatorFactory createAggregateEvaluatorFactory(org.apache.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory[] args) {
return new <xsl:value-of select="@class"/>(args);
}
</xsl:if>
<xsl:if test="@type = 'unnesting'">
- public edu.uci.ics.hyracks.algebricks.runtime.base.IUnnestingEvaluatorFactory createUnnestingEvaluatorFactory(edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory[] args) {
+ public org.apache.hyracks.algebricks.runtime.base.IUnnestingEvaluatorFactory createUnnestingEvaluatorFactory(org.apache.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory[] args) {
return new <xsl:value-of select="@class"/>(args);
}
</xsl:if>
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/xslt/generate-op-defns.xsl
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/xslt/generate-op-defns.xsl b/vxquery-core/src/main/xslt/generate-op-defns.xsl
index 1ee8c08..f706370 100644
--- a/vxquery-core/src/main/xslt/generate-op-defns.xsl
+++ b/vxquery-core/src/main/xslt/generate-op-defns.xsl
@@ -72,17 +72,17 @@
</xsl:if>
<xsl:for-each select="runtime">
<xsl:if test="@type = 'scalar'">
- public edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory createScalarEvaluatorFactory(edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory[] args) {
+ public org.apache.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory createScalarEvaluatorFactory(org.apache.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory[] args) {
return new <xsl:value-of select="@class"/>(args);
}
</xsl:if>
<xsl:if test="@type = 'aggregate'">
- public edu.uci.ics.hyracks.algebricks.runtime.base.IAggregateEvaluatorFactory createAggregateEvaluatorFactory(edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory[] args) {
+ public org.apache.hyracks.algebricks.runtime.base.IAggregateEvaluatorFactory createAggregateEvaluatorFactory(org.apache.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory[] args) {
return new <xsl:value-of select="@class"/>(args);
}
</xsl:if>
<xsl:if test="@type = 'unnesting'">
- public edu.uci.ics.hyracks.algebricks.runtime.base.IUnnestingEvaluatorFactory createUnnestingEvaluatorFactory(edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory[] args) {
+ public org.apache.hyracks.algebricks.runtime.base.IUnnestingEvaluatorFactory createUnnestingEvaluatorFactory(org.apache.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory[] args) {
return new <xsl:value-of select="@class"/>(args);
}
</xsl:if>
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/test/java/org/apache/vxquery/xmlquery/query/SimpleXQueryTest.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/test/java/org/apache/vxquery/xmlquery/query/SimpleXQueryTest.java b/vxquery-core/src/test/java/org/apache/vxquery/xmlquery/query/SimpleXQueryTest.java
index 37b529b..165b330 100644
--- a/vxquery-core/src/test/java/org/apache/vxquery/xmlquery/query/SimpleXQueryTest.java
+++ b/vxquery-core/src/test/java/org/apache/vxquery/xmlquery/query/SimpleXQueryTest.java
@@ -29,7 +29,7 @@ import org.apache.vxquery.context.RootStaticContextImpl;
import org.apache.vxquery.context.StaticContextImpl;
import org.junit.Test;
-import edu.uci.ics.hyracks.api.dataset.ResultSetId;
+import org.apache.hyracks.api.dataset.ResultSetId;
public class SimpleXQueryTest {
@Test
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-server/pom.xml
----------------------------------------------------------------------
diff --git a/vxquery-server/pom.xml b/vxquery-server/pom.xml
index 4d5d9a1..04ea34a 100644
--- a/vxquery-server/pom.xml
+++ b/vxquery-server/pom.xml
@@ -51,11 +51,11 @@
<name>vxqueryshutdown</name>
</program>
<program>
- <mainClass>edu.uci.ics.hyracks.control.cc.CCDriver</mainClass>
+ <mainClass>org.apache.hyracks.control.cc.CCDriver</mainClass>
<name>vxquerycc</name>
</program>
<program>
- <mainClass>edu.uci.ics.hyracks.control.nc.NCDriver</mainClass>
+ <mainClass>org.apache.hyracks.control.nc.NCDriver</mainClass>
<name>vxquerync</name>
</program>
</programs>
@@ -71,7 +71,6 @@
</plugin>
<plugin>
<artifactId>maven-resources-plugin</artifactId>
- <version>2.5</version>
<executions>
<execution>
<id>copy-scripts</id>
@@ -107,7 +106,6 @@
</plugin>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
- <version>2.4</version>
<executions>
<execution>
<configuration>
@@ -146,12 +144,12 @@
</dependency>
<dependency>
- <groupId>edu.uci.ics.hyracks</groupId>
+ <groupId>org.apache.hyracks</groupId>
<artifactId>hyracks-control-cc</artifactId>
</dependency>
<dependency>
- <groupId>edu.uci.ics.hyracks</groupId>
+ <groupId>org.apache.hyracks</groupId>
<artifactId>hyracks-control-nc</artifactId>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-server/src/main/java/org/apache/vxquery/cli/VXQueryClusterShutdown.java
----------------------------------------------------------------------
diff --git a/vxquery-server/src/main/java/org/apache/vxquery/cli/VXQueryClusterShutdown.java b/vxquery-server/src/main/java/org/apache/vxquery/cli/VXQueryClusterShutdown.java
index 37fe4f6..ced608a 100644
--- a/vxquery-server/src/main/java/org/apache/vxquery/cli/VXQueryClusterShutdown.java
+++ b/vxquery-server/src/main/java/org/apache/vxquery/cli/VXQueryClusterShutdown.java
@@ -21,8 +21,8 @@ import org.kohsuke.args4j.Argument;
import org.kohsuke.args4j.CmdLineParser;
import org.kohsuke.args4j.Option;
-import edu.uci.ics.hyracks.api.client.HyracksConnection;
-import edu.uci.ics.hyracks.api.client.IHyracksClientConnection;
+import org.apache.hyracks.api.client.HyracksConnection;
+import org.apache.hyracks.api.client.IHyracksClientConnection;
public class VXQueryClusterShutdown {
/**
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-xtest/pom.xml
----------------------------------------------------------------------
diff --git a/vxquery-xtest/pom.xml b/vxquery-xtest/pom.xml
index 9e83fd7..59da063 100644
--- a/vxquery-xtest/pom.xml
+++ b/vxquery-xtest/pom.xml
@@ -136,27 +136,27 @@
</dependency>
<dependency>
- <groupId>edu.uci.ics.hyracks</groupId>
+ <groupId>org.apache.hyracks</groupId>
<artifactId>hyracks-api</artifactId>
</dependency>
<dependency>
- <groupId>edu.uci.ics.hyracks</groupId>
+ <groupId>org.apache.hyracks</groupId>
<artifactId>hyracks-client</artifactId>
</dependency>
<dependency>
- <groupId>edu.uci.ics.hyracks</groupId>
+ <groupId>org.apache.hyracks</groupId>
<artifactId>hyracks-control-cc</artifactId>
</dependency>
<dependency>
- <groupId>edu.uci.ics.hyracks</groupId>
+ <groupId>org.apache.hyracks</groupId>
<artifactId>hyracks-control-nc</artifactId>
</dependency>
<dependency>
- <groupId>edu.uci.ics.hyracks</groupId>
+ <groupId>org.apache.hyracks</groupId>
<artifactId>hyracks-dataflow-std</artifactId>
</dependency>
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/AbstractTestCaseFactory.java
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/AbstractTestCaseFactory.java b/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/AbstractTestCaseFactory.java
index dea6b8d..b38f0ab 100644
--- a/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/AbstractTestCaseFactory.java
+++ b/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/AbstractTestCaseFactory.java
@@ -269,4 +269,4 @@ public abstract class AbstractTestCaseFactory {
public void startPrefixMapping(String prefix, String uri) throws SAXException {
}
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/ExpectedResult.java
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/ExpectedResult.java b/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/ExpectedResult.java
index 2a0982e..cf85d85 100644
--- a/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/ExpectedResult.java
+++ b/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/ExpectedResult.java
@@ -22,4 +22,4 @@ public class ExpectedResult {
public ExpectedResult(String fileName) {
this.fileName = fileName;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/HTMLFileReporterImpl.java
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/HTMLFileReporterImpl.java b/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/HTMLFileReporterImpl.java
index bc17bba..6548287 100644
--- a/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/HTMLFileReporterImpl.java
+++ b/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/HTMLFileReporterImpl.java
@@ -358,4 +358,4 @@ class ResultManager {
return start > 0 ? sb.toString() : s;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/LineFileReporterImpl.java
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/LineFileReporterImpl.java b/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/LineFileReporterImpl.java
index 03e47eb..dce59b0 100644
--- a/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/LineFileReporterImpl.java
+++ b/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/LineFileReporterImpl.java
@@ -38,4 +38,4 @@ public class LineFileReporterImpl implements ResultReporter {
public void close() {
out.close();
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/Main.java
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/Main.java b/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/Main.java
index dcb1b7e..616a114 100644
--- a/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/Main.java
+++ b/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/Main.java
@@ -33,4 +33,4 @@ public class Main {
xts.init();
xts.waitForCompletion();
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/ResultReporter.java
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/ResultReporter.java b/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/ResultReporter.java
index b3dd60d..349f292 100644
--- a/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/ResultReporter.java
+++ b/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/ResultReporter.java
@@ -20,4 +20,4 @@ public interface ResultReporter {
public void reportResult(TestCaseResult result);
public void close();
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/ServletReporterImpl.java
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/ServletReporterImpl.java b/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/ServletReporterImpl.java
index df18b53..6a79a4a 100644
--- a/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/ServletReporterImpl.java
+++ b/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/ServletReporterImpl.java
@@ -53,4 +53,4 @@ public class ServletReporterImpl extends AbstractHandler implements ResultReport
public void close() {
reporter.close();
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/TestCase.java
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/TestCase.java b/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/TestCase.java
index fbfc566..b7295c7 100644
--- a/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/TestCase.java
+++ b/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/TestCase.java
@@ -108,4 +108,4 @@ public class TestCase {
buffer.append("}");
return buffer.toString();
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/TestCaseFactory.java
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/TestCaseFactory.java b/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/TestCaseFactory.java
index d168185..a948e23 100644
--- a/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/TestCaseFactory.java
+++ b/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/TestCaseFactory.java
@@ -37,4 +37,4 @@ public class TestCaseFactory extends AbstractTestCaseFactory {
}
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/TestCaseResult.java
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/TestCaseResult.java b/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/TestCaseResult.java
index bb28177..86c8530 100644
--- a/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/TestCaseResult.java
+++ b/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/TestCaseResult.java
@@ -218,4 +218,4 @@ public class TestCaseResult {
private static final String RED = "#FF9900";
private static final String ORANGE = "#FFCC00";
private static final String GREEN = "#99CC00";
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/TestRunner.java
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/TestRunner.java b/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/TestRunner.java
index 8ca43e2..d8543f5 100644
--- a/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/TestRunner.java
+++ b/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/TestRunner.java
@@ -36,22 +36,26 @@ import org.apache.vxquery.result.ResultUtils;
import org.apache.vxquery.xmlquery.query.VXQueryCompilationListener;
import org.apache.vxquery.xmlquery.query.XMLQueryCompiler;
-import edu.uci.ics.hyracks.api.client.HyracksConnection;
-import edu.uci.ics.hyracks.api.client.IHyracksClientConnection;
-import edu.uci.ics.hyracks.api.comm.IFrameTupleAccessor;
-import edu.uci.ics.hyracks.api.dataset.IHyracksDataset;
-import edu.uci.ics.hyracks.api.dataset.IHyracksDatasetReader;
-import edu.uci.ics.hyracks.api.dataset.ResultSetId;
-import edu.uci.ics.hyracks.api.exceptions.HyracksException;
-import edu.uci.ics.hyracks.api.job.JobFlag;
-import edu.uci.ics.hyracks.api.job.JobId;
-import edu.uci.ics.hyracks.api.job.JobSpecification;
-import edu.uci.ics.hyracks.client.dataset.HyracksDataset;
-import edu.uci.ics.hyracks.control.cc.ClusterControllerService;
-import edu.uci.ics.hyracks.control.common.controllers.CCConfig;
-import edu.uci.ics.hyracks.control.common.controllers.NCConfig;
-import edu.uci.ics.hyracks.control.nc.NodeControllerService;
-import edu.uci.ics.hyracks.dataflow.common.comm.io.ResultFrameTupleAccessor;
+import org.apache.hyracks.api.client.HyracksConnection;
+import org.apache.hyracks.api.client.IHyracksClientConnection;
+import org.apache.hyracks.api.comm.FixedSizeFrame;
+import org.apache.hyracks.api.comm.IFrame;
+import org.apache.hyracks.api.comm.IFrameTupleAccessor;
+import org.apache.hyracks.api.comm.VSizeFrame;
+import org.apache.hyracks.api.dataset.IHyracksDataset;
+import org.apache.hyracks.api.dataset.IHyracksDatasetReader;
+import org.apache.hyracks.api.dataset.ResultSetId;
+import org.apache.hyracks.api.exceptions.HyracksException;
+import org.apache.hyracks.api.job.JobFlag;
+import org.apache.hyracks.api.job.JobId;
+import org.apache.hyracks.api.job.JobSpecification;
+import org.apache.hyracks.client.dataset.HyracksDataset;
+import org.apache.hyracks.control.cc.ClusterControllerService;
+import org.apache.hyracks.control.common.controllers.CCConfig;
+import org.apache.hyracks.control.common.controllers.NCConfig;
+import org.apache.hyracks.control.nc.NodeControllerService;
+import org.apache.hyracks.control.nc.resources.memory.FrameManager;
+import org.apache.hyracks.dataflow.common.comm.io.ResultFrameTupleAccessor;
public class TestRunner {
private static final Pattern EMBEDDED_SYSERROR_PATTERN = Pattern
@@ -116,9 +120,9 @@ public class TestRunner {
opts.showOET, opts.showRP);
XMLQueryCompiler compiler = new XMLQueryCompiler(listener, new String[] { "nc1" }, opts.frameSize);
Reader in = new InputStreamReader(new FileInputStream(testCase.getXQueryFile()), "UTF-8");
- CompilerControlBlock ccb = new CompilerControlBlock(new StaticContextImpl(
- RootStaticContextImpl.INSTANCE), new ResultSetId(testCase.getXQueryDisplayName().hashCode()),
- testCase.getSourceFileMap());
+ CompilerControlBlock ccb = new CompilerControlBlock(
+ new StaticContextImpl(RootStaticContextImpl.INSTANCE),
+ new ResultSetId(testCase.getXQueryDisplayName().hashCode()), testCase.getSourceFileMap());
compiler.compile(testCase.getXQueryDisplayName(), in, ccb, opts.optimizationLevel);
JobSpecification spec = compiler.getModule().getHyracksJobSpecification();
in.close();
@@ -132,14 +136,14 @@ public class TestRunner {
if (hds == null) {
hds = new HyracksDataset(hcc, spec.getFrameSize(), opts.threads);
}
- ByteBuffer buffer = ByteBuffer.allocate(spec.getFrameSize());
+ FrameManager resultDisplayFrameMgr = new FrameManager(spec.getFrameSize());
+ IFrame frame = new VSizeFrame(resultDisplayFrameMgr);
IHyracksDatasetReader reader = hds.createReader(jobId, ccb.getResultSetId());
- IFrameTupleAccessor frameTupleAccessor = new ResultFrameTupleAccessor(spec.getFrameSize());
- buffer.clear();
+ IFrameTupleAccessor frameTupleAccessor = new ResultFrameTupleAccessor();
res.result = "";
- while (reader.read(buffer) > 0) {
- buffer.clear();
- res.result += ResultUtils.getStringFromBuffer(buffer, frameTupleAccessor);
+ while (reader.read(frame) > 0) {
+ res.result += ResultUtils.getStringFromBuffer(frame.getBuffer(), frameTupleAccessor);
+ frame.getBuffer().clear();
}
res.result.trim();
hcc.waitForCompletion(jobId);
@@ -196,4 +200,4 @@ public class TestRunner {
nc1.stop();
cc.stop();
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/TestRunnerFactory.java
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/TestRunnerFactory.java b/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/TestRunnerFactory.java
index 1910f84..197e9ae 100644
--- a/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/TestRunnerFactory.java
+++ b/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/TestRunnerFactory.java
@@ -56,4 +56,4 @@ public class TestRunnerFactory {
public void close() throws Exception {
tr.close();
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/XMLFileReporterImpl.java
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/XMLFileReporterImpl.java b/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/XMLFileReporterImpl.java
index c7c3b2c..530befc 100644
--- a/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/XMLFileReporterImpl.java
+++ b/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/XMLFileReporterImpl.java
@@ -48,4 +48,4 @@ public class XMLFileReporterImpl implements ResultReporter {
out.println("</results>");
out.close();
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/XTest.java
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/XTest.java b/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/XTest.java
index 0e2a6e0..b216240 100644
--- a/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/XTest.java
+++ b/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/XTest.java
@@ -109,4 +109,4 @@ public class XTest {
}
}
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/XTestOptions.java
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/XTestOptions.java b/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/XTestOptions.java
index 80fdd65..854cbf8 100644
--- a/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/XTestOptions.java
+++ b/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/XTestOptions.java
@@ -76,4 +76,4 @@ public class XTestOptions {
@Option(name = "-showresult", usage = "Show query result.")
boolean showResult;
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/util/DiskPerformance.java
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/util/DiskPerformance.java b/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/util/DiskPerformance.java
index 5d05035..63fce8b 100644
--- a/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/util/DiskPerformance.java
+++ b/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/util/DiskPerformance.java
@@ -52,8 +52,8 @@ import org.apache.vxquery.xtest.util.tests.Stream;
import org.xml.sax.XMLReader;
import org.xml.sax.helpers.XMLReaderFactory;
-import edu.uci.ics.hyracks.algebricks.common.utils.Pair;
-import edu.uci.ics.hyracks.data.std.util.ArrayBackedValueStorage;
+import org.apache.hyracks.algebricks.common.utils.Pair;
+import org.apache.hyracks.data.std.util.ArrayBackedValueStorage;
public class DiskPerformance {
XMLReader parser;
@@ -77,7 +77,7 @@ public class DiskPerformance {
List<SequenceType> childSeq = new ArrayList<SequenceType>();
NameTest nt = new NameTest(createUTF8String(""), createUTF8String("data"));
childSeq.add(SequenceType.create(new ElementType(nt, AnyType.INSTANCE, false), Quantifier.QUANT_ONE));
- handler = new SAXContentHandler(false, new TreeNodeIdProvider((short) 0), null, null, childSeq);
+ handler = new SAXContentHandler(false, new TreeNodeIdProvider((short) 0), null, childSeq);
parser.setContentHandler(handler);
parser.setProperty("http://xml.org/sax/properties/lexical-handler", handler);
return new Pair<XMLReader, SAXContentHandler>(parser, handler);
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-xtest/src/test/java/org/apache/vxquery/xtest/JUnitTestCaseFactory.java
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/java/org/apache/vxquery/xtest/JUnitTestCaseFactory.java b/vxquery-xtest/src/test/java/org/apache/vxquery/xtest/JUnitTestCaseFactory.java
index e1ea215..fea80e8 100644
--- a/vxquery-xtest/src/test/java/org/apache/vxquery/xtest/JUnitTestCaseFactory.java
+++ b/vxquery-xtest/src/test/java/org/apache/vxquery/xtest/JUnitTestCaseFactory.java
@@ -41,4 +41,4 @@ public class JUnitTestCaseFactory extends AbstractTestCaseFactory {
return testCases;
}
-}
\ No newline at end of file
+}